From cc1879aa0e5ac025bb89d21da97ad3c40df68819 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 25 Jul 2016 21:03:18 +0200
Subject: [PATCH 001/808] Version bump to 5.0.0-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 39a4341d7e..d1d67ebb44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>biz.paluch.redis</groupId>
     <artifactId>lettuce</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>lettuce</name>

From aac999acc4c163eeacf1b67517df68c817b35e66 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 25 Jul 2016 21:49:08 +0200
Subject: [PATCH 002/808] Remove deprecated interfaces and methods #156

Interfaces

RedisClusterAsyncConnection
RedisClusterConnection
RedisAsyncConnection
RedisConnection
BaseRedisAsyncConnection
BaseRedisConnection
RedisGeoAsyncConnection
RedisGeoConnection
RedisHashesAsyncConnection
RedisHashesConnection
RedisHLLAsyncConnection
RedisHLLConnection
RedisKeysAsyncConnection
RedisKeysConnection
RedisListsAsyncConnection
RedisListsConnection
RedisScriptingAsyncConnection
RedisScriptingConnection
RedisSentinelAsyncConnection
RedisServerAsyncConnection
RedisServerConnection
RedisSetsAsyncConnection
RedisSetsConnection
RedisSortedSetsAsyncConnection
RedisSortedSetsConnection
RedisStringsAsyncConnection
RedisStringsConnection

RedisClient Methods

public RedisClient constructors
RedisClient.connectAsync
RedisClient.connectSentinelAsync
RedisClusterClient Methods

public RedisClusterClient constructors
RedisClusterClient.connectCluster
RedisClusterClient.connectClusterAsync

deprecated methods on interfaces
---
 .../redis/AbstractRedisAsyncCommands.java     |  47 +-
 .../redis/AbstractRedisClient.java            |  26 +-
 .../redis/AbstractRedisReactiveCommands.java  |  27 +-
 .../redis/BaseRedisAsyncConnection.java       | 200 -----
 .../redis/BaseRedisConnection.java            | 195 -----
 .../com/lambdaworks/redis/ClientOptions.java  |   6 +-
 .../com/lambdaworks/redis/Connections.java    | 112 ---
 .../redis/RedisAsyncCommandsImpl.java         |   4 +-
 .../redis/RedisAsyncConnection.java           |  53 --
 .../com/lambdaworks/redis/RedisClient.java    | 369 +-------
 .../redis/RedisClusterAsyncConnection.java    | 266 ------
 .../redis/RedisClusterConnection.java         | 268 ------
 .../redis/RedisCommandBuilder.java            |   5 -
 .../lambdaworks/redis/RedisConnection.java    |  52 --
 .../redis/RedisConnectionPool.java            | 231 -----
 .../redis/RedisGeoAsyncConnection.java        | 155 ----
 .../lambdaworks/redis/RedisGeoConnection.java | 151 ----
 .../redis/RedisHLLAsyncConnection.java        |  52 --
 .../lambdaworks/redis/RedisHLLConnection.java |  52 --
 .../redis/RedisHashesAsyncConnection.java     | 281 ------
 .../redis/RedisHashesConnection.java          | 278 ------
 .../redis/RedisKeysAsyncConnection.java       | 411 ---------
 .../redis/RedisKeysConnection.java            | 406 ---------
 .../redis/RedisListsAsyncConnection.java      | 222 -----
 .../redis/RedisListsConnection.java           | 220 -----
 .../redis/RedisScriptingAsyncConnection.java  |  96 ---
 .../redis/RedisScriptingConnection.java       |  95 --
 .../redis/RedisSentinelAsyncConnection.java   | 114 ---
 .../redis/RedisServerAsyncConnection.java     | 304 -------
 .../redis/RedisServerConnection.java          | 304 -------
 .../redis/RedisSetsAsyncConnection.java       | 292 -------
 .../redis/RedisSetsConnection.java            | 291 -------
 .../redis/RedisSortedSetsAsyncConnection.java | 812 ------------------
 .../redis/RedisSortedSetsConnection.java      | 807 -----------------
 .../redis/RedisStringsAsyncConnection.java    | 347 --------
 .../redis/RedisStringsConnection.java         | 343 --------
 .../java/com/lambdaworks/redis/RedisURI.java  |   6 +-
 .../api/async/BaseRedisAsyncCommands.java     |  15 +
 .../redis/api/async/RedisAsyncCommands.java   |   3 +-
 .../api/async/RedisListAsyncCommands.java     |  20 -
 .../api/async/RedisServerAsyncCommands.java   |  10 +-
 .../api/async/RedisStringAsyncCommands.java   | 107 ++-
 .../api/rx/BaseRedisReactiveCommands.java     |  25 +-
 .../api/rx/RedisListReactiveCommands.java     |  20 -
 .../api/rx/RedisServerReactiveCommands.java   |   9 -
 .../api/rx/RedisStringReactiveCommands.java   | 104 +--
 .../redis/api/sync/RedisCommands.java         |   3 +-
 .../redis/api/sync/RedisHLLCommands.java      |   1 -
 .../redis/api/sync/RedisListCommands.java     |  20 -
 .../redis/api/sync/RedisServerCommands.java   |  12 +-
 .../redis/api/sync/RedisStringCommands.java   |  98 +--
 .../redis/cluster/ClusterClientOptions.java   |  58 +-
 .../ClusterTopologyRefreshOptions.java        |   6 +-
 ...RedisAdvancedClusterAsyncCommandsImpl.java |  19 +-
 .../RedisAdvancedClusterAsyncConnection.java  |  59 --
 .../RedisAdvancedClusterConnection.java       |  57 --
 ...isAdvancedClusterReactiveCommandsImpl.java |  15 +-
 .../redis/cluster/RedisClusterClient.java     |  79 +-
 .../StatefulRedisClusterConnectionImpl.java   |  11 +-
 .../async/BaseNodeSelectionAsyncCommands.java |  40 +-
 .../async/NodeSelectionListAsyncCommands.java |  20 -
 .../NodeSelectionServerAsyncCommands.java     |   8 -
 .../NodeSelectionStringAsyncCommands.java     | 106 +--
 .../RedisAdvancedClusterAsyncCommands.java    |   3 +-
 .../api/async/RedisClusterAsyncCommands.java  |   3 +-
 .../api/sync/BaseNodeSelectionCommands.java   |  19 +-
 .../api/sync/NodeSelectionListCommands.java   |  20 -
 .../api/sync/NodeSelectionServerCommands.java |   8 -
 .../sync/RedisAdvancedClusterCommands.java    |   3 +-
 .../api/sync/RedisClusterCommands.java        |  13 +-
 .../models/slots/ClusterSlotRange.java        |  82 +-
 .../MasterSlaveConnectionProvider.java        |   9 -
 ...DefaultCommandLatencyCollectorOptions.java |   7 +-
 .../pubsub/RedisPubSubAsyncCommandsImpl.java  |  14 +-
 .../redis/pubsub/RedisPubSubConnection.java   |  62 --
 .../StatefulRedisPubSubConnectionImpl.java    |   9 +-
 .../api/async/RedisPubSubAsyncCommands.java   |   4 +-
 .../pubsub/api/sync/RedisPubSubCommands.java  |   1 -
 .../resource/DefaultClientResources.java      |   6 +-
 .../RedisSentinelAsyncCommandsImpl.java       |   4 +-
 .../RedisSentinelReactiveCommandsImpl.java    |   4 +-
 .../api/async/RedisSentinelAsyncCommands.java |   4 +-
 .../api/rx/RedisSentinelReactiveCommands.java |   3 +-
 .../api/sync/RedisSentinelCommands.java       |   3 +-
 .../support/ClientResourcesFactoryBean.java   |   2 +-
 .../redis/support/PoolingProxyFactory.java    |  41 -
 .../TransparentPoolingInvocationHandler.java  |  48 --
 .../redis/support/WithConnection.java         |  35 -
 .../redis/api/BaseRedisCommands.java          |  14 +
 .../redis/api/RedisListCommands.java          |  22 -
 .../redis/api/RedisSentinelCommands.java      |   5 +-
 .../redis/api/RedisServerCommands.java        |   9 -
 .../redis/extensibility/LettuceGeoDemo.java   |   7 +-
 .../extensibility/MyExtendedRedisClient.java  |  21 +-
 .../MyExtendedRedisClientTest.java            |  21 +-
 .../java/com/lambdaworks/Connections.java     |  20 +
 .../com/lambdaworks/TestClientResources.java  |   2 +-
 .../apigenerator/CreateAsyncApi.java          |  19 +-
 .../CreateAsyncNodeSelectionClusterApi.java   |   2 +-
 .../apigenerator/CreateReactiveApi.java       |   2 +-
 .../apigenerator/CreateSyncApi.java           |  25 +-
 .../lambdaworks/examples/ConnectToRedis.java  |   2 -
 .../examples/ConnectToRedisCluster.java       |   3 -
 .../lambdaworks/examples/SpringExample.java   |   5 +-
 .../com/lambdaworks/redis/AllTheAPIsTest.java | 100 +--
 .../redis/AsyncConnectionTest.java            |  16 +-
 .../lambdaworks/redis/ClientOptionsTest.java  |  31 +-
 .../com/lambdaworks/redis/ClientTest.java     |  23 +-
 .../redis/ConnectionCommandTest.java          | 109 +--
 .../redis/LettucePerformanceTest.java         |  15 +-
 .../redis/MultiConnectionTest.java            |  28 -
 .../lambdaworks/redis/PoolConnectionTest.java | 224 -----
 .../redis/RedisClientConnectionTest.java      |  82 --
 .../java/com/lambdaworks/redis/TimeTest.java  |  29 -
 .../redis/UnixDomainSocketTest.java           |  23 +-
 .../redis/cluster/AbstractClusterTest.java    |   7 +-
 .../cluster/AdvancedClusterClientTest.java    |  26 +-
 .../cluster/AdvancedClusterReactiveTest.java  |   6 +-
 .../redis/cluster/ByteCodecClusterTest.java   |  20 -
 .../cluster/ClusterClientOptionsTest.java     |  15 +-
 .../redis/cluster/ClusterCommandTest.java     |  48 +-
 .../cluster/ClusterReactiveCommandTest.java   |  17 +-
 .../redis/cluster/ClusterSetup.java           |   4 +-
 .../redis/cluster/ClusterTestUtil.java        |   1 -
 .../redis/cluster/NodeSelectionAsyncTest.java |   5 +-
 .../redis/cluster/RedisClusterClientTest.java | 101 +--
 .../cluster/RedisClusterReadFromTest.java     |  15 +-
 .../redis/cluster/RedisClusterSetupTest.java  |  34 +-
 .../RedisClusterStressScenariosTest.java      |  10 +-
 .../commands/CustomClusterCommandTest.java    |   2 +-
 .../commands/GeoClusterCommandTest.java       |   4 +-
 .../commands/HashClusterCommandTest.java      |   6 +-
 .../commands/ListClusterCommandTest.java      |   6 +-
 .../commands/StringClusterCommandTest.java    |   4 +-
 .../commands/rx/HashClusterRxCommandTest.java |  10 +-
 .../commands/rx/ListClusterRxCommandTest.java |   8 +-
 .../rx/StringClusterRxCommandTest.java        |  10 +-
 .../models/slots/ClusterSlotsParserTest.java  |  51 --
 .../redis/commands/BitCommandPoolTest.java    |  29 -
 .../redis/commands/BitCommandTest.java        |   4 +-
 .../redis/commands/HLLCommandTest.java        |  29 -
 .../redis/commands/HashCommandPoolTest.java   |  25 -
 .../redis/commands/KeyCommandTest.java        |   4 +-
 .../RunOnlyOnceServerCommandTest.java         |  41 +-
 .../redis/commands/ScriptingCommandTest.java  |   8 +-
 .../redis/commands/ServerCommandPoolTest.java |  27 -
 .../redis/commands/ServerCommandTest.java     |   8 +-
 .../commands/TransactionCommandTest.java      |   8 +-
 .../redis/commands/rx/BitRxCommandTest.java   |   4 +-
 .../commands/rx/CustomRxCommandTest.java      |   2 +-
 .../redis/commands/rx/GeoRxCommandTest.java   |   4 +-
 .../redis/commands/rx/HLLRxCommandTest.java   |  17 +-
 .../redis/commands/rx/HashRxCommandTest.java  |   2 +-
 .../redis/commands/rx/KeyRxCommandTest.java   |   2 +-
 .../redis/commands/rx/ListRxCommandTest.java  |   2 +-
 .../commands/rx/NumericRxCommandTest.java     |   2 +-
 .../commands/rx/ScriptingRxCommandTest.java   |   3 +-
 .../commands/rx/ServerRxCommandTest.java      |  14 +-
 .../redis/commands/rx/SetRxCommandTest.java   |   2 +-
 .../redis/commands/rx/SortRxCommandTest.java  |   2 +-
 .../commands/rx/SortedSetRxCommandTest.java   |   2 +-
 .../commands/rx/StringRxCommandTest.java      |  10 +-
 .../commands/rx/TransactionRxCommandTest.java |  10 +-
 .../redis/issue42/BreakClientBase.java        |  99 ---
 .../redis/issue42/BreakClientTest.java        |  45 -
 .../redis/issue42/BreakClusterClientTest.java |  76 --
 .../redis/masterslave/MasterSlaveTest.java    |   4 +-
 .../redis/protocol/ConnectionFailureTest.java |  22 +-
 .../redis/pubsub/PubSubCommandTest.java       |   2 +-
 .../redis/reliability/AtLeastOnceTest.java    | 194 ++---
 .../redis/reliability/AtMostOnceTest.java     | 147 ++--
 .../resource/DefaultClientResourcesTest.java  |   9 +-
 .../redis/sentinel/SentinelCommandTest.java   |  37 +-
 .../sentinel/SentinelConnectionTest.java      |  18 +-
 .../redis/sentinel/SentinelFailoverTest.java  |  85 --
 .../redis/sentinel/SentinelRule.java          |   2 +-
 .../sentinel/rx/SentinelRxCommandTest.java    |   2 +-
 .../support/PoolingProxyFactoryTest.java      |  55 --
 .../redis/support/WithConnectionTest.java     |  65 --
 .../cluster/EmptyRedisClusterClient.java      |   3 +-
 180 files changed, 957 insertions(+), 10670 deletions(-)
 delete mode 100644 src/main/java/com/lambdaworks/redis/BaseRedisAsyncConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/BaseRedisConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/Connections.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisAsyncConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisClusterAsyncConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisClusterConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisConnectionPool.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisGeoAsyncConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisGeoConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisHLLAsyncConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisHLLConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisHashesAsyncConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisHashesConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisKeysAsyncConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisKeysConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisListsAsyncConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisListsConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisScriptingAsyncConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisScriptingConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisSentinelAsyncConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisServerAsyncConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisServerConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisSetsAsyncConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisSetsConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisSortedSetsAsyncConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisSortedSetsConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisStringsAsyncConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/RedisStringsConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubConnection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/support/PoolingProxyFactory.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/support/TransparentPoolingInvocationHandler.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/support/WithConnection.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/MultiConnectionTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/PoolConnectionTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/TimeTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/commands/BitCommandPoolTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/commands/HashCommandPoolTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/commands/ServerCommandPoolTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/issue42/BreakClientBase.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/issue42/BreakClientTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/issue42/BreakClusterClientTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/sentinel/SentinelFailoverTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/support/PoolingProxyFactoryTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/support/WithConnectionTest.java

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
index bb49c23a11..862ef8ef69 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
@@ -27,12 +27,7 @@
  * @author Will Glozer
  */
 public abstract class AbstractRedisAsyncCommands<K, V>
-        implements RedisHashesAsyncConnection<K, V>, RedisKeysAsyncConnection<K, V>, RedisStringsAsyncConnection<K, V>,
-        RedisListsAsyncConnection<K, V>, RedisSetsAsyncConnection<K, V>, RedisSortedSetsAsyncConnection<K, V>,
-        RedisScriptingAsyncConnection<K, V>, RedisServerAsyncConnection<K, V>, RedisHLLAsyncConnection<K, V>,
-        BaseRedisAsyncConnection<K, V>, RedisClusterAsyncConnection<K, V>, RedisGeoAsyncConnection<K, V>,
-
-        RedisHashAsyncCommands<K, V>, RedisKeyAsyncCommands<K, V>, RedisStringAsyncCommands<K, V>, RedisListAsyncCommands<K, V>,
+        implements RedisHashAsyncCommands<K, V>, RedisKeyAsyncCommands<K, V>, RedisStringAsyncCommands<K, V>, RedisListAsyncCommands<K, V>,
         RedisSetAsyncCommands<K, V>, RedisSortedSetAsyncCommands<K, V>, RedisScriptingAsyncCommands<K, V>,
         RedisServerAsyncCommands<K, V>, RedisHLLAsyncCommands<K, V>, BaseRedisAsyncCommands<K, V>,
         RedisTransactionalAsyncCommands<K, V>, RedisGeoAsyncCommands<K, V>, RedisClusterAsyncCommands<K, V> {
@@ -326,11 +321,6 @@ public <T> RedisFuture<T> evalsha(String digest, ScriptOutputType type, K[] keys
         return (RedisFuture<T>) dispatch(commandBuilder.evalsha(digest, type, keys, values));
     }
 
-    @Override
-    public RedisFuture<Boolean> exists(K key) {
-        return dispatch(commandBuilder.exists(key));
-    }
-
     @Override
     public RedisFuture<Long> exists(K... keys) {
         return dispatch(commandBuilder.exists(keys));
@@ -555,11 +545,6 @@ public RedisFuture<Long> lpush(K key, V... values) {
         return dispatch(commandBuilder.lpush(key, values));
     }
 
-    @Override
-    public RedisFuture<Long> lpushx(K key, V value) {
-        return dispatch(commandBuilder.lpushx(key, value));
-    }
-
     @Override
     public RedisFuture<Long> lpushx(K key, V... values) {
         return dispatch(commandBuilder.lpushx(key, values));
@@ -765,11 +750,6 @@ public RedisFuture<Long> rpush(K key, V... values) {
         return dispatch(commandBuilder.rpush(key, values));
     }
 
-    @Override
-    public RedisFuture<Long> rpushx(K key, V value) {
-        return dispatch(commandBuilder.rpushx(key, value));
-    }
-
     @Override
     public RedisFuture<Long> rpushx(K key, V... values) {
         return dispatch(commandBuilder.rpushx(key, values));
@@ -870,11 +850,6 @@ public RedisFuture<Long> setrange(K key, long offset, V value) {
         return dispatch(commandBuilder.setrange(key, offset, value));
     }
 
-    @Deprecated
-    public void shutdown() {
-        dispatch(commandBuilder.shutdown());
-    }
-
     @Override
     public void shutdown(boolean save) {
         dispatch(commandBuilder.shutdown(save));
@@ -1015,11 +990,6 @@ public RedisFuture<Long> sunionstore(K destination, K... keys) {
         return dispatch(commandBuilder.sunionstore(destination, keys));
     }
 
-    @Override
-    public RedisFuture<String> sync() {
-        return dispatch(commandBuilder.sync());
-    }
-
     @Override
     public RedisFuture<Long> strlen(K key) {
         return dispatch(commandBuilder.strlen(key));
@@ -1549,31 +1519,16 @@ public RedisFuture<Long> waitForReplication(int replicas, long timeout) {
         return dispatch(commandBuilder.wait(replicas, timeout));
     }
 
-    @Override
-    public RedisFuture<Long> pfadd(K key, V value, V... moreValues) {
-        return dispatch(commandBuilder.pfadd(key, value, moreValues));
-    }
-
     @Override
     public RedisFuture<Long> pfadd(K key, V... values) {
         return dispatch(commandBuilder.pfadd(key, values));
     }
 
-    @Override
-    public RedisFuture<String> pfmerge(K destkey, K sourcekey, K... moreSourceKeys) {
-        return dispatch(commandBuilder.pfmerge(destkey, sourcekey, moreSourceKeys));
-    }
-
     @Override
     public RedisFuture<String> pfmerge(K destkey, K... sourcekeys) {
         return dispatch(commandBuilder.pfmerge(destkey, sourcekeys));
     }
 
-    @Override
-    public RedisFuture<Long> pfcount(K key, K... moreKeys) {
-        return dispatch(commandBuilder.pfcount(key, moreKeys));
-    }
-
     @Override
     public RedisFuture<Long> pfcount(K... keys) {
         return dispatch(commandBuilder.pfcount(keys));
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
index 95ce06eacc..aae45992ba 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
@@ -6,7 +6,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
 
@@ -50,11 +52,6 @@ public abstract class AbstractRedisClient {
     protected static final PooledByteBufAllocator BUF_ALLOCATOR = PooledByteBufAllocator.DEFAULT;
     protected static final InternalLogger logger = InternalLoggerFactory.getInstance(RedisClient.class);
 
-    /**
-     * @deprecated use map eventLoopGroups instead.
-     */
-    @Deprecated
-    protected EventLoopGroup eventLoopGroup;
     protected EventExecutorGroup genericWorkerPool;
 
     protected final Map<Class<? extends EventLoopGroup>, EventLoopGroup> eventLoopGroups = new ConcurrentHashMap<>(2);
@@ -71,14 +68,6 @@ public abstract class AbstractRedisClient {
     private final boolean sharedResources;
     private final AtomicBoolean shutdown = new AtomicBoolean();
 
-    /**
-     * @deprecated use {@link #AbstractRedisClient(ClientResources)}
-     */
-    @Deprecated
-    protected AbstractRedisClient() {
-        this(null);
-    }
-
     /**
      * Create a new instance with client resources.
      *
@@ -103,7 +92,7 @@ protected AbstractRedisClient(ClientResources clientResources) {
     }
 
     /**
-     * Set the default timeout for {@link com.lambdaworks.redis.RedisConnection connections} created by this client. The timeout
+     * Set the default timeout for connections created by this client. The timeout
      * applies to connection attempts and non-blocking commands.
      * 
      * @param timeout Default connection timeout.
@@ -179,12 +168,7 @@ private synchronized EventLoopGroup getEventLoopGroup(ConnectionPoint connection
 
         if ((connectionPoint == null || connectionPoint.getSocket() == null)
                 && !eventLoopGroups.containsKey(NioEventLoopGroup.class)) {
-
-            if (eventLoopGroup == null) {
-                eventLoopGroup = clientResources.eventLoopGroupProvider().allocate(NioEventLoopGroup.class);
-            }
-
-            eventLoopGroups.put(NioEventLoopGroup.class, eventLoopGroup);
+            eventLoopGroups.put(NioEventLoopGroup.class, clientResources.eventLoopGroupProvider().allocate(NioEventLoopGroup.class));
         }
 
         if (connectionPoint != null && connectionPoint.getSocket() != null) {
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
index 8d9326fc10..194c4d50f0 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
@@ -546,11 +546,6 @@ public Observable<Long> lpush(K key, V... values) {
         return createObservable(() -> commandBuilder.lpush(key, values));
     }
 
-    @Override
-    public Observable<Long> lpushx(K key, V value) {
-        return createObservable(() -> commandBuilder.lpushx(key, value));
-    }
-
     @Override
     public Observable<Long> lpushx(K key, V... values) {
         return createObservable(() -> commandBuilder.lpushx(key, values));
@@ -754,11 +749,6 @@ public Observable<Long> rpush(K key, V... values) {
         return createObservable(() -> commandBuilder.rpush(key, values));
     }
 
-    @Override
-    public Observable<Long> rpushx(K key, V value) {
-        return createObservable(() -> commandBuilder.rpushx(key, value));
-    }
-
     @Override
     public Observable<Long> rpushx(K key, V... values) {
         return createObservable(() -> commandBuilder.rpushx(key, values));
@@ -993,11 +983,6 @@ public Observable<Long> sunionstore(K destination, K... keys) {
         return createObservable(() -> commandBuilder.sunionstore(destination, keys));
     }
 
-    @Override
-    public Observable<String> sync() {
-        return createObservable(commandBuilder::sync);
-    }
-
     @Override
     public Observable<Long> strlen(K key) {
         return createObservable(() -> commandBuilder.strlen(key));
@@ -1760,7 +1745,6 @@ public Observable<Double> geodist(K key, V from, V to, GeoArgs.Unit unit) {
         return createDissolvingObservable(() -> commandBuilder.geodist(key, from, to, unit));
     }
 
-    @Override
     public <T> Observable<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output) {
 
         LettuceAssert.notNull(type, "Command type must not be null");
@@ -1769,7 +1753,6 @@ public <T> Observable<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> o
         return createDissolvingObservable(() -> new Command<>(type, output));
     }
 
-    @Override
     public <T> Observable<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output, CommandArgs<K, V> args) {
 
         LettuceAssert.notNull(type, "Command type must not be null");
@@ -1853,4 +1836,14 @@ public void reset() {
     public StatefulConnection<K, V> getConnection() {
         return connection;
     }
+
+    @Override
+    public void setAutoFlushCommands(boolean autoFlush) {
+        connection.setAutoFlushCommands(autoFlush);
+    }
+
+    @Override
+    public void flushCommands() {
+        connection.flushCommands();
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/BaseRedisAsyncConnection.java b/src/main/java/com/lambdaworks/redis/BaseRedisAsyncConnection.java
deleted file mode 100644
index c1062301a8..0000000000
--- a/src/main/java/com/lambdaworks/redis/BaseRedisAsyncConnection.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.io.Closeable;
-import java.util.List;
-import java.util.Map;
-
-import com.lambdaworks.redis.api.async.BaseRedisAsyncCommands;
-import com.lambdaworks.redis.output.CommandOutput;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
-
-/**
- * 
- * Basic asynchronous executed commands.
- * 
- * @author Mark Paluch
- * @param <K> Key type.
- * @param <V> Value type.
- * @since 3.0
- * @deprecated Use {@link BaseRedisAsyncCommands}
- */
-@Deprecated
-public interface BaseRedisAsyncConnection<K, V> extends Closeable, BaseRedisAsyncCommands<K, V> {
-
-    /**
-     * Post a message to a channel.
-     * 
-     * @param channel the channel type: key
-     * @param message the message type: value
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of clients that received the message.
-     */
-    RedisFuture<Long> publish(K channel, V message);
-
-    /**
-     * Lists the currently *active channels*.
-     * 
-     * @return RedisFuture&lt;List&lt;K&gt;&gt; array-reply a list of active channels, optionally matching the specified
-     *         pattern.
-     */
-    RedisFuture<List<K>> pubsubChannels();
-
-    /**
-     * Lists the currently *active channels*.
-     * 
-     * @param channel the key
-     * @return RedisFuture&lt;List&lt;K&gt;&gt; array-reply a list of active channels, optionally matching the specified
-     *         pattern.
-     */
-    RedisFuture<List<K>> pubsubChannels(K channel);
-
-    /**
-     * Returns the number of subscribers (not counting clients subscribed to patterns) for the specified channels.
-     *
-     * @param channels channel keys
-     * @return array-reply a list of channels and number of subscribers for every channel.
-     */
-    RedisFuture<Map<K, Long>> pubsubNumsub(K... channels);
-
-    /**
-     * Returns the number of subscriptions to patterns.
-     * 
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of patterns all the clients are subscribed to.
-     */
-    RedisFuture<Long> pubsubNumpat();
-
-    /**
-     * Echo the given string.
-     * 
-     * @param msg the message type: value
-     * @return RedisFuture&lt;V&gt; bulk-string-reply
-     */
-    RedisFuture<V> echo(V msg);
-
-    /**
-     * Return the role of the instance in the context of replication.
-     *
-     * @return RedisFuture&lt;List&lt;Object&gt;&gt; array-reply where the first element is one of master, slave, sentinel and
-     *         the additional elements are role-specific.
-     */
-    RedisFuture<List<Object>> role();
-
-    /**
-     * Ping the server.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply
-     */
-    RedisFuture<String> ping();
-
-    /**
-     * Close the connection.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply always OK.
-     */
-    RedisFuture<String> quit();
-
-    /**
-     * Create a SHA1 digest from a Lua script.
-     * 
-     * @param script script content
-     * @return the SHA1 value
-     */
-    String digest(V script);
-
-    /**
-     * Discard all commands issued after MULTI.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply always {@code OK}.
-     */
-    RedisFuture<String> discard();
-
-    /**
-     * Execute all commands issued after MULTI.
-     * 
-     * @return RedisFuture&lt;List&lt;Object&gt;&gt; array-reply each element being the reply to each of the commands in the
-     *         atomic transaction.
-     * 
-     *         When using {@code WATCH}, {@code EXEC} can return a
-     */
-    RedisFuture<List<Object>> exec();
-
-    /**
-     * Mark the start of a transaction block.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply always {@code OK}.
-     */
-    RedisFuture<String> multi();
-
-    /**
-     * Watch the given keys to determine execution of the MULTI/EXEC block.
-     * 
-     * @param keys the key
-     * @return RedisFuture&lt;String&gt; simple-string-reply always {@code OK}.
-     */
-    RedisFuture<String> watch(K... keys);
-
-    /**
-     * Forget about all watched keys.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply always {@code OK}.
-     */
-    RedisFuture<String> unwatch();
-
-    /**
-     * Wait for replication.
-     * 
-     * @param replicas minimum number of replicas
-     * @param timeout timeout in milliseconds
-     * @return number of replicas
-     */
-    RedisFuture<Long> waitForReplication(int replicas, long timeout);
-
-    /**
-     * Dispatch a command to the Redis Server. Please note the command output type must fit to the command response.
-     *
-     * @param type the command, must not be {@literal null}.
-     * @param output the command output, must not be {@literal null}.
-     * @param <T> response type
-     * @return the command response
-     */
-    <T> RedisFuture<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output);
-
-    /**
-     * Dispatch a command to the Redis Server. Please note the command output type must fit to the command response.
-     *
-     * @param type the command, must not be {@literal null}.
-     * @param output the command output, must not be {@literal null}.
-     * @param args the command arguments, must not be {@literal null}.
-     * @param <T> response type
-     * @return the command response
-     */
-    <T> RedisFuture<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args);
-
-    /**
-     * Close the connection. The connection will become not usable anymore as soon as this method was called.
-     */
-    @Override
-    void close();
-
-    /**
-     * 
-     * @return true if the connection is open (connected and not closed).
-     */
-    boolean isOpen();
-
-    /**
-     * Disable or enable auto-flush behavior. Default is {@literal true}. If autoFlushCommands is disabled, multiple commands
-     * can be issued without writing them actually to the transport. Commands are buffered until a {@link #flushCommands()} is
-     * issued. After calling {@link #flushCommands()} commands are sent to the transport and executed by Redis.
-     * 
-     * @param autoFlush state of autoFlush.
-     */
-    void setAutoFlushCommands(boolean autoFlush);
-
-    /**
-     * Flush pending commands. This commands forces a flush on the channel and can be used to buffer ("pipeline") commands to
-     * achieve batching. No-op if channel is not connected.
-     */
-    void flushCommands();
-
-}
diff --git a/src/main/java/com/lambdaworks/redis/BaseRedisConnection.java b/src/main/java/com/lambdaworks/redis/BaseRedisConnection.java
deleted file mode 100644
index e8418d786a..0000000000
--- a/src/main/java/com/lambdaworks/redis/BaseRedisConnection.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.io.Closeable;
-import java.util.List;
-import java.util.Map;
-
-import com.lambdaworks.redis.output.CommandOutput;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
-
-/**
- * 
- * Basic synchronous executed commands.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link com.lambdaworks.redis.api.sync.BaseRedisCommands}
- */
-@Deprecated
-public interface BaseRedisConnection<K, V> extends Closeable {
-
-    /**
-     * Post a message to a channel.
-     * 
-     * @param channel the channel type: key
-     * @param message the message type: value
-     * @return Long integer-reply the number of clients that received the message.
-     */
-    Long publish(K channel, V message);
-
-    /**
-     * Lists the currently *active channels*.
-     * 
-     * @return List&lt;K&gt; array-reply a list of active channels, optionally matching the specified pattern.
-     */
-    List<K> pubsubChannels();
-
-    /**
-     * Lists the currently *active channels*.
-     * 
-     * @param channel the key
-     * @return List&lt;K&gt; array-reply a list of active channels, optionally matching the specified pattern.
-     */
-    List<K> pubsubChannels(K channel);
-
-    /**
-     * Returns the number of subscribers (not counting clients subscribed to patterns) for the specified channels.
-     *
-     * @param channels channel keys
-     * @return array-reply a list of channels and number of subscribers for every channel.
-     */
-    Map<K, Long> pubsubNumsub(K... channels);
-
-    /**
-     * Returns the number of subscriptions to patterns.
-     * 
-     * @return Long integer-reply the number of patterns all the clients are subscribed to.
-     */
-    Long pubsubNumpat();
-
-    /**
-     * Echo the given string.
-     * 
-     * @param msg the message type: value
-     * @return V bulk-string-reply
-     */
-    V echo(V msg);
-
-    /**
-     * Return the role of the instance in the context of replication.
-     *
-     * @return List&lt;Object&gt; array-reply where the first element is one of master, slave, sentinel and the additional
-     *         elements are role-specific.
-     */
-    List<Object> role();
-
-    /**
-     * Ping the server.
-     * 
-     * @return String simple-string-reply
-     */
-    String ping();
-
-    /**
-     * Switch connection to Read-Only mode when connecting to a cluster.
-     *
-     * @return String simple-string-reply.
-     */
-    String readOnly();
-
-    /**
-     * Switch connection to Read-Write mode (default) when connecting to a cluster.
-     *
-     * @return String simple-string-reply.
-     */
-    String readWrite();
-
-    /**
-     * Close the connection.
-     * 
-     * @return String simple-string-reply always OK.
-     */
-    String quit();
-
-    /**
-     * Create a SHA1 digest from a Lua script.
-     * 
-     * @param script script content
-     * @return the SHA1 value
-     */
-    String digest(V script);
-
-    /**
-     * Discard all commands issued after MULTI.
-     * 
-     * @return String simple-string-reply always {@code OK}.
-     */
-    String discard();
-
-    /**
-     * Execute all commands issued after MULTI.
-     * 
-     * @return List&lt;Object&gt; array-reply each element being the reply to each of the commands in the atomic transaction.
-     * 
-     *         When using {@code WATCH}, {@code EXEC} can return a
-     */
-    List<Object> exec();
-
-    /**
-     * Mark the start of a transaction block.
-     * 
-     * @return String simple-string-reply always {@code OK}.
-     */
-    String multi();
-
-    /**
-     * Watch the given keys to determine execution of the MULTI/EXEC block.
-     * 
-     * @param keys the key
-     * @return String simple-string-reply always {@code OK}.
-     */
-    String watch(K... keys);
-
-    /**
-     * Forget about all watched keys.
-     * 
-     * @return String simple-string-reply always {@code OK}.
-     */
-    String unwatch();
-
-    /**
-     * Wait for replication.
-     * 
-     * @param replicas minimum number of replicas
-     * @param timeout timeout in milliseconds
-     * @return number of replicas
-     */
-    Long waitForReplication(int replicas, long timeout);
-
-    /**
-     * Dispatch a command to the Redis Server. Please note the command output type must fit to the command response.
-     *
-     * @param type the command, must not be {@literal null}.
-     * @param output the command output, must not be {@literal null}.
-     * @param <T> response type
-     * @return the command response
-     */
-    <T> T dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output);
-
-    /**
-     * Dispatch a command to the Redis Server. Please note the command output type must fit to the command response.
-     *
-     * @param type the command, must not be {@literal null}.
-     * @param output the command output, must not be {@literal null}.
-     * @param args the command arguments, must not be {@literal null}.
-     * @param <T> response type
-     * @return the command response
-     */
-    <T> T dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args);
-
-    /**
-     * Close the connection. The connection will become not usable anymore as soon as this method was called.
-     */
-    @Override
-    void close();
-
-    /**
-     * 
-     * @return true if the connection is open (connected and not closed).
-     */
-    boolean isOpen();
-
-}
diff --git a/src/main/java/com/lambdaworks/redis/ClientOptions.java b/src/main/java/com/lambdaworks/redis/ClientOptions.java
index 64039f1ac9..bd9f162f39 100644
--- a/src/main/java/com/lambdaworks/redis/ClientOptions.java
+++ b/src/main/java/com/lambdaworks/redis/ClientOptions.java
@@ -93,11 +93,7 @@ public static class Builder {
         private SocketOptions socketOptions = DEFAULT_SOCKET_OPTIONS;
         private SslOptions sslOptions = DEFAULT_SSL_OPTIONS;
 
-        /**
-         * @deprecated Use {@link ClientOptions#builder()}
-         */
-        @Deprecated
-        public Builder() {
+        protected Builder() {
         }
 
         /**
diff --git a/src/main/java/com/lambdaworks/redis/Connections.java b/src/main/java/com/lambdaworks/redis/Connections.java
deleted file mode 100644
index 20d95eb58b..0000000000
--- a/src/main/java/com/lambdaworks/redis/Connections.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.concurrent.ExecutionException;
-
-import com.lambdaworks.redis.internal.LettuceAssert;
-
-/**
- * Utility for checking a connection's state.
- * 
- * @author Mark Paluch
- * @since 3.0
- */
-class Connections {
-
-    /**
-     * Utility constructor.
-     */
-    private Connections() {
-
-    }
-
-    /**
-     * 
-     * @param connection must be either a {@link com.lambdaworks.redis.RedisAsyncConnection} or
-     *        {@link com.lambdaworks.redis.RedisConnection} and must not be {@literal null}
-     * @return true if the connection is valid (ping works)
-     * @throws java.lang.NullPointerException if connection is null
-     * @throws java.lang.IllegalArgumentException if connection is not a supported type
-     */
-    public static final boolean isValid(Object connection) {
-
-        LettuceAssert.notNull(connection, "Connection must not be null");
-        if (connection instanceof RedisAsyncConnection<?, ?>) {
-            RedisAsyncConnection<?, ?> redisAsyncConnection = (RedisAsyncConnection<?, ?>) connection;
-            try {
-                redisAsyncConnection.ping().get();
-                return true;
-            } catch (ExecutionException | RuntimeException e) {
-                return false;
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                throw new RedisCommandInterruptedException(e);
-            }
-        }
-
-        if (connection instanceof RedisConnection<?, ?>) {
-            RedisConnection<?, ?> redisConnection = (RedisConnection<?, ?>) connection;
-            try {
-                redisConnection.ping();
-                return true;
-            } catch (RuntimeException e) {
-                return false;
-            }
-        }
-
-        throw new IllegalArgumentException("Connection class " + connection.getClass() + " not supported");
-    }
-
-    /**
-     * 
-     * @param connection must be either a {@link com.lambdaworks.redis.RedisAsyncConnection} or
-     *        {@link com.lambdaworks.redis.RedisConnection} and must not be {@literal null}
-     * @return true if the connection is open.
-     * @throws java.lang.NullPointerException if connection is null
-     * @throws java.lang.IllegalArgumentException if connection is not a supported type
-     */
-    public static final boolean isOpen(Object connection) {
-
-        LettuceAssert.notNull(connection, "Connection must not be null");
-        if (connection instanceof RedisAsyncConnection<?, ?>) {
-            RedisAsyncConnection<?, ?> redisAsyncConnection = (RedisAsyncConnection<?, ?>) connection;
-            return redisAsyncConnection.isOpen();
-        }
-
-        if (connection instanceof RedisConnection<?, ?>) {
-            RedisConnection<?, ?> redisConnection = (RedisConnection<?, ?>) connection;
-            return redisConnection.isOpen();
-        }
-
-        throw new IllegalArgumentException("Connection class " + connection.getClass() + " not supported");
-    }
-
-    /**
-     * Closes silently a connection.
-     * 
-     * @param connection must be either a {@link com.lambdaworks.redis.RedisAsyncConnection} or
-     *        {@link com.lambdaworks.redis.RedisConnection} and must not be {@literal null}
-     * @throws java.lang.NullPointerException if connection is null
-     * @throws java.lang.IllegalArgumentException if connection is not a supported type
-     */
-    public static void close(Object connection) {
-
-        LettuceAssert.notNull(connection, "Connection must not be null");
-        try {
-            if (connection instanceof RedisAsyncConnection<?, ?>) {
-                RedisAsyncConnection<?, ?> redisAsyncConnection = (RedisAsyncConnection<?, ?>) connection;
-                redisAsyncConnection.close();
-                return;
-            }
-
-            if (connection instanceof RedisConnection<?, ?>) {
-                RedisConnection<?, ?> redisConnection = (RedisConnection<?, ?>) connection;
-                redisConnection.close();
-                return;
-            }
-        } catch (RuntimeException e) {
-            return;
-        }
-        throw new IllegalArgumentException("Connection class " + connection.getClass() + " not supported");
-
-    }
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java
index bd223a9928..41c17da718 100644
--- a/src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java
@@ -14,8 +14,8 @@
  * @param <V> Value type.
  * @author Mark Paluch
  */
-public class RedisAsyncCommandsImpl<K, V> extends AbstractRedisAsyncCommands<K, V> implements RedisAsyncConnection<K, V>,
-        RedisClusterAsyncConnection<K, V>, RedisAsyncCommands<K, V>, RedisClusterAsyncCommands<K, V> {
+public class RedisAsyncCommandsImpl<K, V> extends AbstractRedisAsyncCommands<K, V>
+        implements RedisAsyncCommands<K, V>, RedisClusterAsyncCommands<K, V> {
 
     /**
      * Initialize a new instance.
diff --git a/src/main/java/com/lambdaworks/redis/RedisAsyncConnection.java b/src/main/java/com/lambdaworks/redis/RedisAsyncConnection.java
deleted file mode 100644
index dc68fe22e9..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisAsyncConnection.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.concurrent.TimeUnit;
-
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.async.RedisTransactionalAsyncCommands;
-
-/**
- * A complete asynchronous and thread-safe Redis API with 400+ Methods.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link RedisAsyncCommands}
- */
-@Deprecated
-public interface RedisAsyncConnection<K, V> extends RedisHashesAsyncConnection<K, V>, RedisKeysAsyncConnection<K, V>,
-        RedisStringsAsyncConnection<K, V>, RedisListsAsyncConnection<K, V>, RedisSetsAsyncConnection<K, V>,
-        RedisSortedSetsAsyncConnection<K, V>, RedisScriptingAsyncConnection<K, V>, RedisServerAsyncConnection<K, V>,
-        RedisHLLAsyncConnection<K, V>, RedisGeoAsyncConnection<K, V>, BaseRedisAsyncConnection<K, V>,
-        RedisClusterAsyncConnection<K, V> {
-    /**
-     * Set the default timeout for operations.
-     * 
-     * @param timeout the timeout value
-     * @param unit the unit of the timeout value
-     */
-    void setTimeout(long timeout, TimeUnit unit);
-
-    /**
-     * Authenticate to the server.
-     * 
-     * @param password the password
-     * @return String simple-string-reply
-     */
-    String auth(String password);
-
-    /**
-     * Change the selected database for the current connection.
-     * 
-     * @param db the database number
-     * @return String simple-string-reply
-     */
-    String select(int db);
-
-    /**
-     * @return the underlying connection.
-     */
-    StatefulRedisConnection<K, V> getStatefulConnection();
-
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/com/lambdaworks/redis/RedisClient.java
index 7564015e89..eaf06353d4 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClient.java
@@ -2,12 +2,22 @@
 
 package com.lambdaworks.redis;
 
+import static com.lambdaworks.redis.LettuceStrings.isEmpty;
+import static com.lambdaworks.redis.LettuceStrings.isNotEmpty;
+import static com.lambdaworks.redis.internal.LettuceClassUtils.isPresent;
+
+import java.net.ConnectException;
+import java.net.SocketAddress;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Supplier;
+
 import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.internal.LettuceFactories;
 import com.lambdaworks.redis.protocol.CommandHandler;
@@ -19,20 +29,6 @@
 import com.lambdaworks.redis.resource.SocketAddressResolver;
 import com.lambdaworks.redis.sentinel.StatefulRedisSentinelConnectionImpl;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
-import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
-
-import java.net.ConnectException;
-import java.net.SocketAddress;
-import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Supplier;
-
-import static com.lambdaworks.redis.LettuceStrings.isEmpty;
-import static com.lambdaworks.redis.LettuceStrings.isNotEmpty;
-import static com.lambdaworks.redis.internal.LettuceClassUtils.isPresent;
 
 /**
  * A scalable thread-safe <a href="http://redis.io/">Redis</a> client. Multiple threads may share one connection if they avoid
@@ -62,48 +58,9 @@ protected RedisClient(ClientResources clientResources, RedisURI redisURI) {
     /**
      * Creates a uri-less RedisClient. You can connect to different Redis servers but you must supply a {@link RedisURI} on
      * connecting. Methods without having a {@link RedisURI} will fail with a {@link java.lang.IllegalStateException}.
-     *
-     * @deprecated Use the factory method {@link #create()}
-     */
-    @Deprecated
-    public RedisClient() {
-        this(EMPTY_URI);
-    }
-
-    /**
-     * Create a new client that connects to the supplied host on the default port.
-     * 
-     * @param host Server hostname.
-     * @deprecated Use the factory method {@link #create(String)}
-     */
-    @Deprecated
-    public RedisClient(String host) {
-        this(host, RedisURI.DEFAULT_REDIS_PORT);
-    }
-
-    /**
-     * Create a new client that connects to the supplied host and port. Connection attempts and non-blocking commands will
-     * {@link #setDefaultTimeout timeout} after 60 seconds.
-     * 
-     * @param host Server hostname.
-     * @param port Server port.
-     * @deprecated Use the factory method {@link #create(RedisURI)}
-     */
-    @Deprecated
-    public RedisClient(String host, int port) {
-        this(RedisURI.Builder.redis(host, port).build());
-    }
-
-    /**
-     * Create a new client that connects to the supplied host and port. Connection attempts and non-blocking commands will
-     * {@link #setDefaultTimeout timeout} after 60 seconds.
-     * 
-     * @param redisURI Redis URI.
-     * @deprecated Use the factory method {@link #create(RedisURI)}
      */
-    @Deprecated
-    public RedisClient(RedisURI redisURI) {
-        this(null, redisURI);
+    protected RedisClient() {
+        this(null, EMPTY_URI);
     }
 
     /**
@@ -185,136 +142,6 @@ public static RedisClient create(ClientResources clientResources, RedisURI redis
         return new RedisClient(clientResources, redisURI);
     }
 
-    /**
-     * Creates a connection pool for synchronous connections. 5 max idle connections and 20 max active connections. Please keep
-     * in mind to free all collections and close the pool once you do not need it anymore. Requires Apache commons-pool2
-     * dependency.
-     * 
-     * @return a new {@link RedisConnectionPool} instance
-     */
-    public RedisConnectionPool<RedisCommands<String, String>> pool() {
-        return pool(5, 20);
-    }
-
-    /**
-     * Creates a connection pool for synchronous connections. Please keep in mind to free all collections and close the pool
-     * once you do not need it anymore. Requires Apache commons-pool2 dependency.
-     * 
-     * @param maxIdle max idle connections in pool
-     * @param maxActive max active connections in pool
-     * @return a new {@link RedisConnectionPool} instance
-     */
-    public RedisConnectionPool<RedisCommands<String, String>> pool(int maxIdle, int maxActive) {
-        return pool(newStringStringCodec(), maxIdle, maxActive);
-    }
-
-    /**
-     * Creates a connection pool for synchronous connections. Please keep in mind to free all collections and close the pool
-     * once you do not need it anymore. Requires Apache commons-pool2 dependency.
-     * 
-     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
-     * @param maxIdle max idle connections in pool
-     * @param maxActive max active connections in pool
-     * @param <K> Key type
-     * @param <V> Value type
-     * @return a new {@link RedisConnectionPool} instance
-     */
-    @SuppressWarnings("unchecked")
-    public <K, V> RedisConnectionPool<RedisCommands<K, V>> pool(final RedisCodec<K, V> codec, int maxIdle, int maxActive) {
-
-        checkPoolDependency();
-        checkForRedisURI();
-        LettuceAssert.notNull(codec, "RedisCodec must not be null");
-
-        long maxWait = makeTimeout();
-        RedisConnectionPool<RedisCommands<K, V>> pool = new RedisConnectionPool<>(
-                new RedisConnectionPool.RedisConnectionProvider<RedisCommands<K, V>>() {
-                    @Override
-                    public RedisCommands<K, V> createConnection() {
-                        return connect(codec, redisURI).sync();
-                    }
-
-                    @Override
-                    @SuppressWarnings("rawtypes")
-                    public Class<? extends RedisCommands<K, V>> getComponentType() {
-                        return (Class) RedisCommands.class;
-                    }
-                }, maxActive, maxIdle, maxWait);
-
-        pool.addListener(closeableResources::remove);
-
-        closeableResources.add(pool);
-
-        return pool;
-    }
-
-    protected long makeTimeout() {
-        return TimeUnit.MILLISECONDS.convert(timeout, unit);
-    }
-
-    /**
-     * Creates a connection pool for asynchronous connections. 5 max idle connections and 20 max active connections. Please keep
-     * in mind to free all collections and close the pool once you do not need it anymore. Requires Apache commons-pool2
-     * dependency.
-     *
-     * @return a new {@link RedisConnectionPool} instance
-     */
-    public RedisConnectionPool<RedisAsyncCommands<String, String>> asyncPool() {
-        return asyncPool(5, 20);
-    }
-
-    /**
-     * Creates a connection pool for asynchronous connections. Please keep in mind to free all collections and close the pool
-     * once you do not need it anymore. Requires Apache commons-pool2 dependency.
-     *
-     * @param maxIdle max idle connections in pool
-     * @param maxActive max active connections in pool
-     * @return a new {@link RedisConnectionPool} instance
-     */
-    public RedisConnectionPool<RedisAsyncCommands<String, String>> asyncPool(int maxIdle, int maxActive) {
-        return asyncPool(newStringStringCodec(), maxIdle, maxActive);
-    }
-
-    /**
-     * Creates a connection pool for asynchronous connections. Please keep in mind to free all collections and close the pool
-     * once you do not need it anymore. Requires Apache commons-pool2 dependency.
-     *
-     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
-     * @param maxIdle max idle connections in pool
-     * @param maxActive max active connections in pool
-     * @param <K> Key type
-     * @param <V> Value type
-     * @return a new {@link RedisConnectionPool} instance
-     */
-    public <K, V> RedisConnectionPool<RedisAsyncCommands<K, V>> asyncPool(final RedisCodec<K, V> codec, int maxIdle,
-            int maxActive) {
-
-        checkPoolDependency();
-        checkForRedisURI();
-        LettuceAssert.notNull(codec, "RedisCodec must not be null");
-
-        long maxWait = makeTimeout();
-        RedisConnectionPool<RedisAsyncCommands<K, V>> pool = new RedisConnectionPool<>(
-                new RedisConnectionPool.RedisConnectionProvider<RedisAsyncCommands<K, V>>() {
-                    @Override
-                    public RedisAsyncCommands<K, V> createConnection() {
-                        return connectStandalone(codec, redisURI, defaultTimeout()).async();
-                    }
-
-                    @Override
-                    @SuppressWarnings({ "rawtypes", "unchecked" })
-                    public Class<? extends RedisAsyncCommands<K, V>> getComponentType() {
-                        return (Class) RedisAsyncCommands.class;
-                    }
-                }, maxActive, maxIdle, maxWait);
-
-        pool.addListener(closeableResources::remove);
-
-        closeableResources.add(pool);
-
-        return pool;
-    }
-
     /**
      * Open a new connection to a Redis server that treats keys and values as UTF-8 strings.
      *
@@ -361,59 +188,6 @@ public <K, V> StatefulRedisConnection<K, V> connect(RedisCodec<K, V> codec, Redi
         return connectStandalone(codec, redisURI, Timeout.from(redisURI));
     }
 
-    /**
-     * Open a new asynchronous connection to a Redis server that treats keys and values as UTF-8 strings.
-     *
-     * @return A new connection
-     */
-    @Deprecated
-    public RedisAsyncCommands<String, String> connectAsync() {
-        return connect(newStringStringCodec()).async();
-    }
-
-    /**
-     * Open a new asynchronous connection to a Redis server. Use the supplied {@link RedisCodec codec} to encode/decode keys and
-     * values.
-     *
-     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
-     * @param <K> Key type
-     * @param <V> Value type
-     * @return A new connection
-     * @deprecated Use {@code connect(codec).async()}
-     */
-    @Deprecated
-    public <K, V> RedisAsyncCommands<K, V> connectAsync(RedisCodec<K, V> codec) {
-        return connectStandalone(codec, redisURI, defaultTimeout()).async();
-    }
-
-    /**
-     * Open a new asynchronous connection to a Redis server using the supplied {@link RedisURI} that treats keys and values as
-     * UTF-8 strings.
-     *
-     * @param redisURI the Redis server to connect to, must not be {@literal null}
-     * @return A new connection
-     * @deprecated Use {@code connect(redisURI).async()}
-     */
-    @Deprecated
-    public RedisAsyncCommands<String, String> connectAsync(RedisURI redisURI) {
-        return connectStandalone(newStringStringCodec(), redisURI, Timeout.from(redisURI)).async();
-    }
-
-    /**
-     * Open a new asynchronous connection to a Redis server using the supplied {@link RedisURI} and the supplied
-     * {@link RedisCodec codec} to encode/decode keys.
-     *
-     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
-     * @param redisURI the Redis server to connect to, must not be {@literal null}
-     * @param <K> Key type
-     * @param <V> Value type
-     * @return A new connection
-     * @deprecated Use {@code connect(codec, redisURI).async()}
-     */
-    @Deprecated
-    public <K, V> RedisAsyncCommands<K, V> connectAsync(RedisCodec<K, V> codec, RedisURI redisURI) {
-        return connectStandalone(codec, redisURI, Timeout.from(redisURI)).async();
-    }
 
     private <K, V> StatefulRedisConnection<K, V> connectStandalone(RedisCodec<K, V> codec, RedisURI redisURI, Timeout timeout) {
 
@@ -571,64 +345,6 @@ public <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K
         return connectSentinel(codec, redisURI, Timeout.from(redisURI));
     }
 
-    /**
-     * Open a new asynchronous connection to a Redis Sentinel that treats keys and values as UTF-8 strings. You must supply a
-     * valid RedisURI containing one or more sentinels.
-     *
-     * @return a new connection
-     * @deprecated Use {@code connectSentinel().async()}
-     */
-    @Deprecated
-    public RedisSentinelAsyncCommands<String, String> connectSentinelAsync() {
-        return connectSentinel(newStringStringCodec(), redisURI, defaultTimeout()).async();
-    }
-
-    /**
-     * Open a new asynchronous connection to a Redis Sentinela nd use the supplied {@link RedisCodec codec} to encode/decode
-     * keys and values. You must supply a valid RedisURI containing one or more sentinels.
-     *
-     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
-     * @param <K> Key type
-     * @param <V> Value type
-     * @return a new connection
-     * @deprecated Use {@code connectSentinel(codec).async()}
-     */
-    @Deprecated
-    public <K, V> RedisSentinelAsyncCommands<K, V> connectSentinelAsync(RedisCodec<K, V> codec) {
-        checkForRedisURI();
-        return connectSentinel(codec, redisURI, defaultTimeout()).async();
-    }
-
-    /**
-     * Open a new asynchronous connection to a Redis Sentinel using the supplied {@link RedisURI} that treats keys and values as
-     * UTF-8 strings. You must supply a valid RedisURI containing a redis host or one or more sentinels.
-     *
-     * @param redisURI the Redis server to connect to, must not be {@literal null}
-     * @return A new connection
-     * @deprecated Use {@code connectSentinel(redisURI).async()}
-     */
-    @Deprecated
-    public RedisSentinelAsyncCommands<String, String> connectSentinelAsync(RedisURI redisURI) {
-        return connectSentinel(newStringStringCodec(), redisURI, Timeout.from(redisURI)).async();
-    }
-
-    /**
-     * Open a new asynchronous connection to a Redis Sentinel using the supplied {@link RedisURI} and use the supplied
-     * {@link RedisCodec codec} to encode/decode keys and values. You must supply a valid RedisURI containing a redis host or
-     * one or more sentinels.
-     *
-     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
-     * @param redisURI the Redis server to connect to, must not be {@literal null}
-     * @param <K> Key type
-     * @param <V> Value type
-     * @return A new connection
-     * @deprecated Use {@code connectSentinel(codec, redisURI).async()}
-     */
-    @Deprecated
-    public <K, V> RedisSentinelAsyncCommands<K, V> connectSentinelAsync(RedisCodec<K, V> codec, RedisURI redisURI) {
-        return connectSentinel(codec, redisURI, Timeout.from(redisURI)).async();
-    }
-
     private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K, V> codec, RedisURI redisURI,
             Timeout timeout) {
         assertNotNull(codec);
@@ -689,22 +405,6 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
         return connection;
     }
 
-    /**
-     * Create a new instance of {@link StatefulRedisPubSubConnectionImpl} or a subclass.
-     *
-     * @param commandHandler the command handler
-     * @param codec codec
-     * @param <K> Key-Type
-     * @param <V> Value Type
-     * @return new instance of StatefulRedisPubSubConnectionImpl
-     * @deprecated Use {@link #newStatefulRedisPubSubConnection(PubSubCommandHandler, RedisCodec, long, TimeUnit)}
-     */
-    @Deprecated
-    protected <K, V> StatefulRedisPubSubConnectionImpl<K, V> newStatefulRedisPubSubConnection(
-            PubSubCommandHandler<K, V> commandHandler, RedisCodec<K, V> codec) {
-        return newStatefulRedisPubSubConnection(commandHandler, codec, timeout, unit);
-    }
-
     /**
      * Create a new instance of {@link StatefulRedisPubSubConnectionImpl} or a subclass.
      *
@@ -721,22 +421,6 @@ protected <K, V> StatefulRedisPubSubConnectionImpl<K, V> newStatefulRedisPubSubC
         return new StatefulRedisPubSubConnectionImpl<>(commandHandler, codec, timeout, unit);
     }
 
-    /**
-     * Create a new instance of {@link StatefulRedisSentinelConnectionImpl} or a subclass.
-     *
-     * @param commandHandler the command handler
-     * @param codec codec
-     * @param <K> Key-Type
-     * @param <V> Value Type
-     * @return new instance of StatefulRedisSentinelConnectionImpl
-     * @deprecated Use {@link #newStatefulRedisSentinelConnection(CommandHandler, RedisCodec, long, TimeUnit)}
-     */
-    @Deprecated
-    protected <K, V> StatefulRedisSentinelConnectionImpl<K, V> newStatefulRedisSentinelConnection(
-            CommandHandler<K, V> commandHandler, RedisCodec<K, V> codec) {
-        return newStatefulRedisSentinelConnection(commandHandler, codec, timeout, unit);
-    }
-
     /**
      * Create a new instance of {@link StatefulRedisSentinelConnectionImpl} or a subclass.
      *
@@ -753,22 +437,6 @@ protected <K, V> StatefulRedisSentinelConnectionImpl<K, V> newStatefulRedisSenti
         return new StatefulRedisSentinelConnectionImpl<>(commandHandler, codec, timeout, unit);
     }
 
-    /**
-     * Create a new instance of {@link StatefulRedisConnectionImpl} or a subclass.
-     *
-     * @param commandHandler the command handler
-     * @param codec codec
-     * @param <K> Key-Type
-     * @param <V> Value Type
-     * @return new instance of StatefulRedisConnectionImpl
-     * @deprecated use {@link #newStatefulRedisConnection(CommandHandler, RedisCodec, long, TimeUnit)}
-     */
-    @Deprecated
-    protected <K, V> StatefulRedisConnectionImpl<K, V> newStatefulRedisConnection(CommandHandler<K, V> commandHandler,
-            RedisCodec<K, V> codec) {
-        return newStatefulRedisConnection(commandHandler, codec, timeout, unit);
-    }
-
     /**
      * Create a new instance of {@link StatefulRedisConnectionImpl} or a subclass.
      *
@@ -826,7 +494,7 @@ public ClientResources getResources() {
         return clientResources;
     }
 
-    protected SocketAddress getSocketAddress(RedisURI redisURI)
+    private SocketAddress getSocketAddress(RedisURI redisURI)
             throws InterruptedException, TimeoutException, ExecutionException {
         SocketAddress redisAddress;
 
@@ -847,9 +515,10 @@ protected SocketAddress getSocketAddress(RedisURI redisURI)
     }
 
     private SocketAddress lookupRedis(RedisURI sentinelUri) throws InterruptedException, TimeoutException, ExecutionException {
-        RedisSentinelAsyncCommands<String, String> connection = connectSentinel(sentinelUri).async();
+        StatefulRedisSentinelConnection<String, String> connection = connectSentinel(
+                sentinelUri);
         try {
-            return connection.getMasterAddrByName(sentinelUri.getSentinelMasterId()).get(timeout, unit);
+            return connection.async().getMasterAddrByName(sentinelUri.getSentinelMasterId()).get(timeout, unit);
         } finally {
             connection.close();
         }
diff --git a/src/main/java/com/lambdaworks/redis/RedisClusterAsyncConnection.java b/src/main/java/com/lambdaworks/redis/RedisClusterAsyncConnection.java
deleted file mode 100644
index 4cc2a4435e..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisClusterAsyncConnection.java
+++ /dev/null
@@ -1,266 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
-
-/**
- * A complete asynchronous and thread-safe cluster Redis API with 400+ Methods.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link RedisClusterAsyncCommands}
- */
-@Deprecated
-public interface RedisClusterAsyncConnection<K, V> extends RedisHashesAsyncConnection<K, V>, RedisKeysAsyncConnection<K, V>,
-        RedisStringsAsyncConnection<K, V>, RedisListsAsyncConnection<K, V>, RedisSetsAsyncConnection<K, V>,
-        RedisSortedSetsAsyncConnection<K, V>, RedisScriptingAsyncConnection<K, V>, RedisServerAsyncConnection<K, V>,
-        RedisHLLAsyncConnection<K, V>, RedisGeoAsyncConnection<K, V>, BaseRedisAsyncConnection<K, V> {
-
-    /**
-     * Set the default timeout for operations.
-     *
-     * @param timeout the timeout value
-     * @param unit the unit of the timeout value
-     */
-    void setTimeout(long timeout, TimeUnit unit);
-
-    /**
-     * Authenticate to the server.
-     *
-     * @param password the password
-     * @return String simple-string-reply
-     */
-    String auth(String password);
-
-    /**
-     * Meet another cluster node to include the node into the cluster. The command starts the cluster handshake and returns with
-     * {@literal OK} when the node was added to the cluster.
-     *
-     * @param ip IP address of the host
-     * @param port port number.
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> clusterMeet(String ip, int port);
-
-    /**
-     * Blacklist and remove the cluster node from the cluster.
-     *
-     * @param nodeId the node Id
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> clusterForget(String nodeId);
-
-    /**
-     * Adds slots to the cluster node. The current node will become the master for the specified slots.
-     *
-     * @param slots one or more slots from {@literal 0} to {@literal 16384}
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> clusterAddSlots(int... slots);
-
-    /**
-     * Removes slots from the cluster node.
-     *
-     * @param slots one or more slots from {@literal 0} to {@literal 16384}
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> clusterDelSlots(int... slots);
-
-    /**
-     * Assign a slot to a node. The command migrates the specified slot from the current node to the specified node in
-     * {@code nodeId}
-     *
-     * @param slot the slot
-     * @param nodeId the id of the node that will become the master for the slot
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> clusterSetSlotNode(int slot, String nodeId);
-
-    /**
-     * Clears migrating / importing state from the slot.
-     *
-     * @param slot the slot
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> clusterSetSlotStable(int slot);
-
-    /**
-     * Flag a slot as {@literal MIGRATING} (outgoing) towards the node specified in {@code nodeId}. The slot must be handled by
-     * the current node in order to be migrated.
-     *
-     * @param slot the slot
-     * @param nodeId the id of the node is targeted to become the master for the slot
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> clusterSetSlotMigrating(int slot, String nodeId);
-
-    /**
-     * Flag a slot as {@literal IMPORTING} (incoming) from the node specified in {@code nodeId}.
-     *
-     * @param slot the slot
-     * @param nodeId the id of the node is the master of the slot
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> clusterSetSlotImporting(int slot, String nodeId);
-
-    /**
-     * Get information and statistics about the cluster viewed by the current node.
-     *
-     * @return String bulk-string-reply as a collection of text lines.
-     */
-    RedisFuture<String> clusterInfo();
-
-    /**
-     * Obtain the nodeId for the currently connected node.
-     *
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> clusterMyId();
-
-    /**
-     * Obtain details about all cluster nodes. Can be parsed using
-     * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
-     *
-     * @return String bulk-string-reply as a collection of text lines
-     */
-    RedisFuture<String> clusterNodes();
-
-    /**
-     * List slaves for a certain node identified by its {@code nodeId}. Can be parsed using
-     * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
-     *
-     * @param nodeId node id of the master node
-     * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as
-     *         {@link #clusterNodes()} but one line per slave.
-     */
-    RedisFuture<List<String>> clusterSlaves(String nodeId);
-
-    /**
-     * Retrieve the list of keys within the {@code slot}.
-     *
-     * @param slot the slot
-     * @param count maximal number of keys
-     * @return List&lt;K&gt; array-reply list of keys
-     */
-    RedisFuture<List<K>> clusterGetKeysInSlot(int slot, int count);
-
-    /**
-     * Returns the number of keys in the specified Redis Cluster hash {@code slot}.
-     *
-     * @param slot the slot
-     * @return Integer reply: The number of keys in the specified hash slot, or an error if the hash slot is invalid.
-     */
-    RedisFuture<Long> clusterCountKeysInSlot(int slot);
-
-    /**
-     * Returns the number of failure reports for the specified node. Failure reports are the way Redis Cluster uses in order to
-     * promote a {@literal PFAIL} state, that means a node is not reachable, to a {@literal FAIL} state, that means that the
-     * majority of masters in the cluster agreed within a window of time that the node is not reachable.
-     *
-     * @param nodeId the node id
-     * @return Integer reply: The number of active failure reports for the node.
-     */
-    RedisFuture<Long> clusterCountFailureReports(String nodeId);
-
-    /**
-     * Returns an integer identifying the hash slot the specified key hashes to. This command is mainly useful for debugging and
-     * testing, since it exposes via an API the underlying Redis implementation of the hashing algorithm. Basically the same as
-     * {@link com.lambdaworks.redis.cluster.SlotHash#getSlot(byte[])}. If not, call Houston and report that we've got a problem.
-     *
-     * @param key the key.
-     * @return Integer reply: The hash slot number.
-     */
-    RedisFuture<Long> clusterKeyslot(K key);
-
-    /**
-     * Forces a node to save the nodes.conf configuration on disk.
-     *
-     * @return String simple-string-reply: {@code OK} or an error if the operation fails.
-     */
-    RedisFuture<String> clusterSaveconfig();
-
-    /**
-     * This command sets a specific config epoch in a fresh node. It only works when:
-     * <ul>
-     * <li>The nodes table of the node is empty.</li>
-     * <li>The node current config epoch is zero.</li>
-     * </ul>
-     *
-     * @param configEpoch the config epoch
-     * @return String simple-string-reply: {@code OK} or an error if the operation fails.
-     */
-    RedisFuture<String> clusterSetConfigEpoch(long configEpoch);
-
-    /**
-     * Get array of cluster slots to node mappings.
-     *
-     * @return RedisFuture&lt;List&lt;Object&gt;&gt; array-reply nested list of slot ranges with IP/Port mappings.
-     */
-    RedisFuture<List<Object>> clusterSlots();
-
-    /**
-     *
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> asking();
-
-    /**
-     * Turn this node into a slave of the node with the id {@code nodeId}.
-     *
-     * @param nodeId master node id
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> clusterReplicate(String nodeId);
-
-    /**
-     * Failover a cluster node. Turns the currently connected node into a master and the master into its slave.
-     *
-     * @param force do not coordinate with master if {@literal true}
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> clusterFailover(boolean force);
-
-    /**
-     * Reset a node performing a soft or hard reset:
-     * <ul>
-     * <li>All other nodes are forgotten</li>
-     * <li>All the assigned / open slots are released</li>
-     * <li>If the node is a slave, it turns into a master</li>
-     * <li>Only for hard reset: a new Node ID is generated</li>
-     * <li>Only for hard reset: currentEpoch and configEpoch are set to 0</li>
-     * <li>The new configuration is saved and the cluster state updated</li>
-     * <li>If the node was a slave, the whole data set is flushed away</li>
-     * </ul>
-     *
-     * @param hard {@literal true} for hard reset. Generates a new nodeId and currentEpoch/configEpoch are set to 0
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> clusterReset(boolean hard);
-
-    /**
-     * Delete all the slots associated with the specified node. The number of deleted slots is returned.
-     *
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> clusterFlushslots();
-
-    /**
-     * Tells a Redis cluster slave node that the client is ok reading possibly stale data and is not interested in running write
-     * queries.
-     *
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> readOnly();
-
-    /**
-     * Resets readOnly flag.
-     *
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> readWrite();
-
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisClusterConnection.java b/src/main/java/com/lambdaworks/redis/RedisClusterConnection.java
deleted file mode 100644
index 6ddc5654f6..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisClusterConnection.java
+++ /dev/null
@@ -1,268 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import com.lambdaworks.redis.api.sync.BaseRedisCommands;
-
-/**
- * A complete synchronous and thread-safe cluster Redis API with 400+ Methods.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands}
- */
-@Deprecated
-public interface RedisClusterConnection<K, V> extends RedisHashesConnection<K, V>, RedisKeysConnection<K, V>,
-        RedisStringsConnection<K, V>, RedisListsConnection<K, V>, RedisSetsConnection<K, V>, RedisSortedSetsConnection<K, V>,
-        RedisScriptingConnection<K, V>, RedisServerConnection<K, V>, RedisHLLConnection<K, V>, RedisGeoConnection<K, V>,
-        BaseRedisConnection<K, V>, AutoCloseable {
-
-    /**
-     * Set the default timeout for operations.
-     *
-     * @param timeout the timeout value
-     * @param unit the unit of the timeout value
-     */
-    void setTimeout(long timeout, TimeUnit unit);
-
-    /**
-     * Authenticate to the server.
-     *
-     * @param password the password
-     * @return String simple-string-reply
-     */
-    String auth(String password);
-
-    /**
-     * Meet another cluster node to include the node into the cluster. The command starts the cluster handshake and returns with
-     * {@literal OK} when the node was added to the cluster.
-     *
-     * @param ip IP address of the host
-     * @param port port number.
-     * @return String simple-string-reply
-     */
-    String clusterMeet(String ip, int port);
-
-    /**
-     * Blacklist and remove the cluster node from the cluster.
-     *
-     * @param nodeId the node Id
-     * @return String simple-string-reply
-     */
-    String clusterForget(String nodeId);
-
-    /**
-     * Adds slots to the cluster node. The current node will become the master for the specified slots.
-     *
-     * @param slots one or more slots from {@literal 0} to {@literal 16384}
-     * @return String simple-string-reply
-     */
-    String clusterAddSlots(int... slots);
-
-    /**
-     * Removes slots from the cluster node.
-     *
-     * @param slots one or more slots from {@literal 0} to {@literal 16384}
-     * @return String simple-string-reply
-     */
-    String clusterDelSlots(int... slots);
-
-    /**
-     * Assign a slot to a node. The command migrates the specified slot from the current node to the specified node in
-     * {@code nodeId}
-     *
-     * @param slot the slot
-     * @param nodeId the id of the node that will become the master for the slot
-     * @return String simple-string-reply
-     */
-    String clusterSetSlotNode(int slot, String nodeId);
-
-    /**
-     * Clears migrating / importing state from the slot.
-     *
-     * @param slot the slot
-     * @return String simple-string-reply
-     */
-    String clusterSetSlotStable(int slot);
-
-    /**
-     * Flag a slot as {@literal MIGRATING} (outgoing) towards the node specified in {@code nodeId}. The slot must be handled by
-     * the current node in order to be migrated.
-     *
-     * @param slot the slot
-     * @param nodeId the id of the node is targeted to become the master for the slot
-     * @return String simple-string-reply
-     */
-    String clusterSetSlotMigrating(int slot, String nodeId);
-
-    /**
-     * Flag a slot as {@literal IMPORTING} (incoming) from the node specified in {@code nodeId}.
-     *
-     * @param slot the slot
-     * @param nodeId the id of the node is the master of the slot
-     * @return String simple-string-reply
-     */
-    String clusterSetSlotImporting(int slot, String nodeId);
-
-    /**
-     * Get information and statistics about the cluster viewed by the current node.
-     *
-     * @return String bulk-string-reply as a collection of text lines.
-     */
-    String clusterInfo();
-
-    /**
-     * Obtain the nodeId for the currently connected node.
-     *
-     * @return String simple-string-reply
-     */
-    String clusterMyId();
-
-    /**
-     * Obtain details about all cluster nodes. Can be parsed using
-     * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
-     *
-     * @return String bulk-string-reply as a collection of text lines
-     */
-    String clusterNodes();
-
-    /**
-     * List slaves for a certain node identified by its {@code nodeId}. Can be parsed using
-     * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
-     *
-     * @param nodeId node id of the master node
-     * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as
-     *         {@link #clusterNodes()} but one line per slave.
-     */
-    List<String> clusterSlaves(String nodeId);
-
-    /**
-     * Retrieve the list of keys within the {@code slot}.
-     *
-     * @param slot the slot
-     * @param count maximal number of keys
-     * @return List&lt;K&gt; array-reply list of keys
-     */
-    List<K> clusterGetKeysInSlot(int slot, int count);
-
-    /**
-     * Returns the number of keys in the specified Redis Cluster hash {@code slot}.
-     *
-     * @param slot the slot
-     * @return Integer reply: The number of keys in the specified hash slot, or an error if the hash slot is invalid.
-     */
-    Long clusterCountKeysInSlot(int slot);
-
-    /**
-     * Returns the number of failure reports for the specified node. Failure reports are the way Redis Cluster uses in order to
-     * promote a {@literal PFAIL} state, that means a node is not reachable, to a {@literal FAIL} state, that means that the
-     * majority of masters in the cluster agreed within a window of time that the node is not reachable.
-     *
-     * @param nodeId the node id
-     * @return Integer reply: The number of active failure reports for the node.
-     */
-    Long clusterCountFailureReports(String nodeId);
-
-    /**
-     * Returns an integer identifying the hash slot the specified key hashes to. This command is mainly useful for debugging and
-     * testing, since it exposes via an API the underlying Redis implementation of the hashing algorithm. Basically the same as
-     * {@link com.lambdaworks.redis.cluster.SlotHash#getSlot(byte[])}. If not, call Houston and report that we've got a problem.
-     *
-     * @param key the key.
-     * @return Integer reply: The hash slot number.
-     */
-    Long clusterKeyslot(K key);
-
-    /**
-     * Forces a node to save the nodes.conf configuration on disk.
-     *
-     * @return String simple-string-reply: {@code OK} or an error if the operation fails.
-     */
-    String clusterSaveconfig();
-
-    /**
-     * This command sets a specific config epoch in a fresh node. It only works when:
-     * <ul>
-     * <li>The nodes table of the node is empty.</li>
-     * <li>The node current config epoch is zero.</li>
-     * </ul>
-     *
-     * @param configEpoch the config epoch
-     * @return String simple-string-reply: {@code OK} or an error if the operation fails.
-     */
-    String clusterSetConfigEpoch(long configEpoch);
-
-    /**
-     * Get array of cluster slots to node mappings.
-     *
-     * @return List&lt;Object&gt; array-reply nested list of slot ranges with IP/Port mappings.
-     */
-    List<Object> clusterSlots();
-
-    /**
-     * The asking command is required after a {@code -ASK} redirection. The client should issue {@code ASKING} before to
-     * actually send the command to the target instance. See the Redis Cluster specification for more information.
-     * 
-     * @return String simple-string-reply
-     */
-    String asking();
-
-    /**
-     * Turn this node into a slave of the node with the id {@code nodeId}.
-     *
-     * @param nodeId master node id
-     * @return String simple-string-reply
-     */
-    String clusterReplicate(String nodeId);
-
-    /**
-     * Failover a cluster node. Turns the currently connected node into a master and the master into its slave.
-     *
-     * @param force do not coordinate with master if {@literal true}
-     * @return String simple-string-reply
-     */
-    String clusterFailover(boolean force);
-
-    /**
-     * Reset a node performing a soft or hard reset:
-     * <ul>
-     * <li>All other nodes are forgotten</li>
-     * <li>All the assigned / open slots are released</li>
-     * <li>If the node is a slave, it turns into a master</li>
-     * <li>Only for hard reset: a new Node ID is generated</li>
-     * <li>Only for hard reset: currentEpoch and configEpoch are set to 0</li>
-     * <li>The new configuration is saved and the cluster state updated</li>
-     * <li>If the node was a slave, the whole data set is flushed away</li>
-     * </ul>
-     *
-     * @param hard {@literal true} for hard reset. Generates a new nodeId and currentEpoch/configEpoch are set to 0
-     * @return String simple-string-reply
-     */
-    String clusterReset(boolean hard);
-
-    /**
-     * Delete all the slots associated with the specified node. The number of deleted slots is returned.
-     *
-     * @return String simple-string-reply
-     */
-    String clusterFlushslots();
-
-    /**
-     * Tells a Redis cluster slave node that the client is ok reading possibly stale data and is not interested in running write
-     * queries.
-     * 
-     * @return String simple-string-reply
-     */
-    String readOnly();
-
-    /**
-     * Resets readOnly flag.
-     * 
-     * @return String simple-string-reply
-     */
-    String readWrite();
-
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
index 10fd532db5..fa4317ff40 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
@@ -1115,11 +1115,6 @@ public Command<K, V, Long> setrange(K key, long offset, V value) {
         return createCommand(SETRANGE, new IntegerOutput<K, V>(codec), args);
     }
 
-    @Deprecated
-    public Command<K, V, String> shutdown() {
-        return createCommand(SHUTDOWN, new StatusOutput<K, V>(codec));
-    }
-
     public Command<K, V, String> shutdown(boolean save) {
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
         return createCommand(SHUTDOWN, new StatusOutput<K, V>(codec), save ? args.add(SAVE) : args.add(NOSAVE));
diff --git a/src/main/java/com/lambdaworks/redis/RedisConnection.java b/src/main/java/com/lambdaworks/redis/RedisConnection.java
deleted file mode 100644
index 007c3a9c54..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisConnection.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.concurrent.TimeUnit;
-
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.*;
-
-/**
- * 
- * A complete synchronous and thread-safe Redis API with 400+ Methods.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link RedisCommands}
- */
-@Deprecated
-public interface RedisConnection<K, V> extends RedisHashesConnection<K, V>, RedisKeysConnection<K, V>,
-        RedisStringsConnection<K, V>, RedisListsConnection<K, V>, RedisSetsConnection<K, V>, RedisSortedSetsConnection<K, V>,
-        RedisScriptingConnection<K, V>, RedisServerConnection<K, V>, RedisHLLConnection<K, V>, RedisGeoConnection<K, V>,
-        BaseRedisConnection<K, V>, RedisClusterConnection<K, V>, RedisTransactionalCommands<K, V> {
-
-    /**
-     * Set the default timeout for operations.
-     * 
-     * @param timeout the timeout value
-     * @param unit the unit of the timeout value
-     */
-    void setTimeout(long timeout, TimeUnit unit);
-
-    /**
-     * Authenticate to the server.
-     * 
-     * @param password the password
-     * @return String simple-string-reply
-     */
-    String auth(String password);
-
-    /**
-     * Change the selected database for the current connection.
-     * 
-     * @param db the database number
-     * @return String simple-string-reply
-     */
-    String select(int db);
-
-    /**
-     * @return the underlying connection.
-     */
-    StatefulRedisConnection<K, V> getStatefulConnection();
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisConnectionPool.java b/src/main/java/com/lambdaworks/redis/RedisConnectionPool.java
deleted file mode 100644
index a3051da4b4..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisConnectionPool.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.io.Closeable;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Collections;
-import java.util.Set;
-
-import com.lambdaworks.redis.internal.AbstractInvocationHandler;
-import org.apache.commons.pool2.BasePooledObjectFactory;
-import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.PooledObjectFactory;
-import org.apache.commons.pool2.impl.DefaultPooledObject;
-import org.apache.commons.pool2.impl.GenericObjectPool;
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-
-/**
- * Connection pool for redis connections.
- * 
- * @author Mark Paluch
- * @param <T> Connection type.
- * @since 3.0
- */
-public class RedisConnectionPool<T> implements Closeable {
-
-    private final RedisConnectionProvider<T> redisConnectionProvider;
-    private GenericObjectPool<T> objectPool;
-    private CloseEvents closeEvents = new CloseEvents();
-
-    /**
-     * Create a new connection pool
-     * 
-     * @param redisConnectionProvider the connection provider
-     * @param maxActive max active connections
-     * @param maxIdle max idle connections
-     * @param maxWait max wait time (ms) for a connection
-     */
-    public RedisConnectionPool(RedisConnectionProvider<T> redisConnectionProvider, int maxActive, int maxIdle, long maxWait) {
-        this.redisConnectionProvider = redisConnectionProvider;
-
-        GenericObjectPoolConfig config = new GenericObjectPoolConfig();
-        config.setMaxIdle(maxIdle);
-        config.setMaxTotal(maxActive);
-        config.setMaxWaitMillis(maxWait);
-        config.setTestOnBorrow(true);
-
-        objectPool = new GenericObjectPool<T>(createFactory(redisConnectionProvider), config);
-    }
-
-    private PooledObjectFactory<T> createFactory(final RedisConnectionProvider<T> redisConnectionProvider) {
-        return new BasePooledObjectFactory<T>() {
-
-            @SuppressWarnings("unchecked")
-            @Override
-            public T create() throws Exception {
-
-                T connection = redisConnectionProvider.createConnection();
-                PooledConnectionInvocationHandler<T> h = new PooledConnectionInvocationHandler<T>(connection,
-                        RedisConnectionPool.this);
-
-                Object proxy = Proxy.newProxyInstance(getClass().getClassLoader(),
-                        new Class<?>[] { redisConnectionProvider.getComponentType() }, h);
-
-                return (T) proxy;
-            }
-
-            @Override
-            public PooledObject<T> wrap(T obj) {
-                return new DefaultPooledObject<T>(obj);
-            }
-
-            @Override
-            public boolean validateObject(PooledObject<T> p) {
-                return Connections.isOpen(p.getObject());
-            }
-
-            @Override
-            @SuppressWarnings("unchecked")
-            public void destroyObject(PooledObject<T> p) throws Exception {
-
-                T object = p.getObject();
-                if (Proxy.isProxyClass(object.getClass())) {
-                    PooledConnectionInvocationHandler<T> invocationHandler = (PooledConnectionInvocationHandler<T>) Proxy
-                            .getInvocationHandler(object);
-
-                    object = invocationHandler.getConnection();
-                }
-
-                Connections.close(object);
-            }
-        };
-    }
-
-    /**
-     * Allocate a connection from the pool. It must be returned using freeConnection (or alternatively call {@code close()} on
-     * the connection).
-     *
-     * The connections returned by this method are proxies to the underlying connections.
-     *
-     * @return a pooled connection.
-     */
-    public T allocateConnection() {
-        try {
-            return objectPool.borrowObject();
-        } catch (RedisException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new RedisException(e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Return a connection into the pool.
-     * 
-     * @param t the connection.
-     */
-    public void freeConnection(T t) {
-        objectPool.returnObject(t);
-    }
-
-    /**
-     * 
-     * @return the number of idle connections
-     */
-    public int getNumIdle() {
-        return objectPool.getNumIdle();
-    }
-
-    /**
-     * 
-     * @return the number of active connections.
-     */
-    public int getNumActive() {
-        return objectPool.getNumActive();
-    }
-
-    /**
-     * Close the pool and close all idle connections. Active connections won't be closed.
-     */
-    @Override
-    public void close() {
-        objectPool.close();
-        objectPool = null;
-
-        closeEvents.fireEventClosed(this);
-        closeEvents = null;
-    }
-
-    /**
-     * 
-     * @return the component type (pool resource type).
-     */
-    public Class<? extends T> getComponentType() {
-        return redisConnectionProvider.getComponentType();
-    }
-
-    /**
-     * Adds a CloseListener.
-     * 
-     * @param listener the listener
-     */
-    void addListener(CloseEvents.CloseListener listener) {
-        closeEvents.addListener(listener);
-    }
-
-    /**
-     * Invocation handler which takes care of connection.close(). Connections are returned to the pool on a close()-call.
-     *
-     * @author Mark Paluch
-     * @param <T> Connection type.
-     * @since 3.0
-     */
-    static class PooledConnectionInvocationHandler<T> extends AbstractInvocationHandler {
-        public static final Set<String> DISABLED_METHODS = Collections.singleton("getStatefulConnection");
-
-        private T connection;
-        private final RedisConnectionPool<T> pool;
-
-        public PooledConnectionInvocationHandler(T connection, RedisConnectionPool<T> pool) {
-            this.connection = connection;
-            this.pool = pool;
-
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
-
-            if (DISABLED_METHODS.contains(method.getName())) {
-                throw new UnsupportedOperationException(
-                        "Calls to " + method.getName() + " are not supported on pooled connections");
-            }
-
-            if (connection == null) {
-                throw new RedisException("Connection is deallocated and cannot be used anymore.");
-            }
-
-            if (method.getName().equals("close")) {
-                if (pool.objectPool == null) {
-                    return method.invoke(connection, args);
-                }
-                pool.freeConnection((T) proxy);
-                return null;
-            }
-
-            try {
-                return method.invoke(connection, args);
-            } catch (InvocationTargetException e) {
-                throw e.getTargetException();
-            }
-        }
-
-        public T getConnection() {
-            return connection;
-        }
-    }
-
-    /**
-     * Connection provider for redis connections.
-     *
-     * @author Mark Paluch
-     * @param <T> Connection type.
-     * @since 3.0
-     */
-    interface RedisConnectionProvider<T> {
-        T createConnection();
-
-        Class<? extends T> getComponentType();
-    }
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisGeoAsyncConnection.java b/src/main/java/com/lambdaworks/redis/RedisGeoAsyncConnection.java
deleted file mode 100644
index b1adf42531..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisGeoAsyncConnection.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.List;
-import java.util.Set;
-
-import com.lambdaworks.redis.GeoArgs.Unit;
-
-/**
- * Asynchronous executed commands for Geo-Commands.
- *
- * @author Mark Paluch
- * @since 3.3
- * @deprecated Use {@link com.lambdaworks.redis.api.async.RedisGeoAsyncCommands}
- */
-@Deprecated
-public interface RedisGeoAsyncConnection<K, V> {
-
-    /**
-     * Single geo add.
-     *
-     * @param key the key of the geo set
-     * @param longitude the longitude coordinate according to WGS84
-     * @param latitude the latitude coordinate according to WGS84
-     * @param member the member to add
-     * @return Long integer-reply the number of elements that were added to the set
-     */
-    RedisFuture<Long> geoadd(K key, double longitude, double latitude, V member);
-
-    /**
-     * Multi geo add.
-     *
-     * @param key the key of the geo set
-     * @param lngLatMember triplets of double longitude, double latitude and V member
-     * @return Long integer-reply the number of elements that were added to the set
-     */
-    RedisFuture<Long> geoadd(K key, Object... lngLatMember);
-
-    /**
-     * Retrieve Geohash strings representing the position of one or more elements in a sorted set value representing a geospatial index.
-     *
-     * @param key the key of the geo set
-     * @param members the members
-     * @return bulk reply Geohash strings in the order of {@code members}. Returns {@literal null} if a member is not found.
-     */
-    RedisFuture<List<String>> geohash(K key, V... members);
-
-    /**
-     * Retrieve members selected by distance with the center of {@code longitude} and {@code latitude}.
-     *
-     * @param key the key of the geo set
-     * @param longitude the longitude coordinate according to WGS84
-     * @param latitude the latitude coordinate according to WGS84
-     * @param distance radius distance
-     * @param unit distance unit
-     * @return bulk reply
-     */
-    RedisFuture<Set<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit);
-
-    /**
-     * Retrieve members selected by distance with the center of {@code longitude} and {@code latitude}.
-     *
-     * @param key the key of the geo set
-     * @param longitude the longitude coordinate according to WGS84
-     * @param latitude the latitude coordinate according to WGS84
-     * @param distance radius distance
-     * @param unit distance unit
-     * @param geoArgs args to control the result
-     * @return nested multi-bulk reply. The {@link GeoWithin} contains only fields which were requested by {@link GeoArgs}
-     */
-    RedisFuture<List<GeoWithin<V>>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit,
-            GeoArgs geoArgs);
-
-    /**
-     * Perform a {@link #georadius(Object, double, double, double, GeoArgs.Unit, GeoArgs)} query and store the results in a
-     * sorted set.
-     *
-     * @param key the key of the geo set
-     * @param longitude the longitude coordinate according to WGS84
-     * @param latitude the latitude coordinate according to WGS84
-     * @param distance radius distance
-     * @param unit distance unit
-     * @param geoRadiusStoreArgs args to store either the resulting elements with their distance or the resulting elements with
-     *        their locations a sorted set.
-     * @return Long integer-reply the number of elements in the result
-     */
-    RedisFuture<Long> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit,
-            GeoRadiusStoreArgs<K> geoRadiusStoreArgs);
-
-    /**
-     * Retrieve members selected by distance with the center of {@code member}. The member itself is always contained in the
-     * results.
-     *
-     * @param key the key of the geo set
-     * @param member reference member
-     * @param distance radius distance
-     * @param unit distance unit
-     * @return set of members
-     */
-    RedisFuture<Set<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit);
-
-    /**
-     *
-     * Retrieve members selected by distance with the center of {@code member}. The member itself is always contained in the
-     * results.
-     *
-     * @param key the key of the geo set
-     * @param member reference member
-     * @param distance radius distance
-     * @param unit distance unit
-     * @param geoArgs args to control the result
-     * @return nested multi-bulk reply. The {@link GeoWithin} contains only fields which were requested by {@link GeoArgs}
-     */
-    RedisFuture<List<GeoWithin<V>>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
-
-    /**
-     * Perform a {@link #georadiusbymember(Object, Object, double, GeoArgs.Unit, GeoArgs)} query and store the results in a
-     * sorted set.
-     *
-     * @param key the key of the geo set
-     * @param member reference member
-     * @param distance radius distance
-     * @param unit distance unit
-     * @param geoRadiusStoreArgs args to store either the resulting elements with their distance or the resulting elements with
-     *        their locations a sorted set.
-     * @return Long integer-reply the number of elements in the result
-     */
-    RedisFuture<Long> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit,
-            GeoRadiusStoreArgs<K> geoRadiusStoreArgs);
-
-    /**
-     * Get geo coordinates for the {@code members}.
-     *
-     * @param key the key of the geo set
-     * @param members the members
-     *
-     * @return a list of {@link GeoCoordinates}s representing the x,y position of each element specified in the arguments. For
-     *         missing elements {@literal null} is returned.
-     */
-    RedisFuture<List<GeoCoordinates>> geopos(K key, V... members);
-
-    /**
-     *
-     * Retrieve distance between points {@code from} and {@code to}. If one or more elements are missing {@literal null} is
-     * returned. Default in meters by , otherwise according to {@code unit}
-     *
-     * @param key the key of the geo set
-     * @param from from member
-     * @param to to member
-     * @param unit distance unit
-     *
-     * @return distance between points {@code from} and {@code to}. If one or more elements are missing {@literal null} is
-     *         returned.
-     */
-    RedisFuture<Double> geodist(K key, V from, V to, GeoArgs.Unit unit);
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisGeoConnection.java b/src/main/java/com/lambdaworks/redis/RedisGeoConnection.java
deleted file mode 100644
index c973bbef4e..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisGeoConnection.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.List;
-import java.util.Set;
-
-import com.lambdaworks.redis.GeoArgs.Unit;
-
-/**
- * Synchronous executed commands for Geo-Commands.
- *
- * @author Mark Paluch
- * @since 3.3
- * @deprecated Use {@link com.lambdaworks.redis.api.sync.RedisGeoCommands}
- */
-@Deprecated
-public interface RedisGeoConnection<K, V> {
-
-    /**
-     * Single geo add.
-     *
-     * @param key the key of the geo set
-     * @param longitude the longitude coordinate according to WGS84
-     * @param latitude the latitude coordinate according to WGS84
-     * @param member the member to add
-     * @return Long integer-reply the number of elements that were added to the set
-     */
-    Long geoadd(K key, double longitude, double latitude, V member);
-
-    /**
-     * Multi geo add.
-     *
-     * @param key the key of the geo set
-     * @param lngLatMember triplets of double longitude, double latitude and V member
-     * @return Long integer-reply the number of elements that were added to the set
-     */
-    Long geoadd(K key, Object... lngLatMember);
-
-    /**
-     * Retrieve Geohash strings representing the position of one or more elements in a sorted set value representing a geospatial index.
-     *
-     * @param key the key of the geo set
-     * @param members the members
-     * @return bulk reply Geohash strings in the order of {@code members}. Returns {@literal null} if a member is not found.
-     */
-    List<String> geohash(K key, V... members);
-
-    /**
-     * Retrieve members selected by distance with the center of {@code longitude} and {@code latitude}.
-     *
-     * @param key the key of the geo set
-     * @param longitude the longitude coordinate according to WGS84
-     * @param latitude the latitude coordinate according to WGS84
-     * @param distance radius distance
-     * @param unit distance unit
-     * @return bulk reply
-     */
-    Set<V> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit);
-
-    /**
-     * Retrieve members selected by distance with the center of {@code longitude} and {@code latitude}.
-     *
-     * @param key the key of the geo set
-     * @param longitude the longitude coordinate according to WGS84
-     * @param latitude the latitude coordinate according to WGS84
-     * @param distance radius distance
-     * @param unit distance unit
-     * @param geoArgs args to control the result
-     * @return nested multi-bulk reply. The {@link GeoWithin} contains only fields which were requested by {@link GeoArgs}
-     */
-    List<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
-
-    /**
-     * Perform a {@link #georadius(Object, double, double, double, Unit)} query and store the results in a sorted set.
-     *
-     * @param key the key of the geo set
-     * @param longitude the longitude coordinate according to WGS84
-     * @param latitude the latitude coordinate according to WGS84
-     * @param distance radius distance
-     * @param unit distance unit
-     * @param geoRadiusStoreArgs args to store either the resulting elements with their distance or the resulting elements with
-     *        their locations a sorted set.
-     * @return Long integer-reply the number of elements in the result
-     */
-    Long georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit,
-            GeoRadiusStoreArgs<K> geoRadiusStoreArgs);
-
-    /**
-     * Retrieve members selected by distance with the center of {@code member}. The member itself is always contained in the
-     * results.
-     *
-     * @param key the key of the geo set
-     * @param member reference member
-     * @param distance radius distance
-     * @param unit distance unit
-     * @return set of members
-     */
-    Set<V> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit);
-
-    /**
-     *
-     * Retrieve members selected by distance with the center of {@code member}. The member itself is always contained in the
-     * results.
-     *
-     * @param key the key of the geo set
-     * @param member reference member
-     * @param distance radius distance
-     * @param unit distance unit
-     * @param geoArgs args to control the result
-     * @return nested multi-bulk reply. The {@link GeoWithin} contains only fields which were requested by {@link GeoArgs}
-     */
-    List<GeoWithin<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
-
-    /**
-     * Perform a {@link #georadiusbymember(Object, Object, double, Unit, GeoArgs)} query and store the results in a sorted set.
-     *
-     * @param key the key of the geo set
-     * @param member reference member
-     * @param distance radius distance
-     * @param unit distance unit
-     * @param geoRadiusStoreArgs args to store either the resulting elements with their distance or the resulting elements with
-     *        their locations a sorted set.
-     * @return Long integer-reply the number of elements in the result
-     */
-    Long georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoRadiusStoreArgs<K> geoRadiusStoreArgs);
-
-    /**
-     * Get geo coordinates for the {@code members}.
-     *
-     * @param key the key of the geo set
-     * @param members the members
-     *
-     * @return a list of {@link GeoCoordinates}s representing the x,y position of each element specified in the arguments. For
-     *         missing elements {@literal null} is returned.
-     */
-    List<GeoCoordinates> geopos(K key, V... members);
-
-    /**
-     *
-     * Retrieve distance between points {@code from} and {@code to}. If one or more elements are missing {@literal null} is
-     * returned. Default in meters by, otherwise according to {@code unit}
-     *
-     * @param key the key of the geo set
-     * @param from from member
-     * @param to to member
-     * @param unit distance unit
-     *
-     * @return distance between points {@code from} and {@code to}. If one or more elements are missing {@literal null} is
-     *         returned.
-     */
-    Double geodist(K key, V from, V to, GeoArgs.Unit unit);
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisHLLAsyncConnection.java b/src/main/java/com/lambdaworks/redis/RedisHLLAsyncConnection.java
deleted file mode 100644
index 9ba08ec3ba..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisHLLAsyncConnection.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.lambdaworks.redis;
-
-import com.lambdaworks.redis.api.async.RedisHLLAsyncCommands;
-
-/**
- * Asynchronous executed commands for HyperLogLog (PF* commands).
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link RedisHLLAsyncCommands}
- */
-@Deprecated
-public interface RedisHLLAsyncConnection<K, V> {
-    /**
-     * Adds the specified elements to the specified HyperLogLog.
-     *
-     * @param key the key
-     * @param value the value
-     * @param moreValues more values
-     *
-     * @return RedisFuture&lt;Long&gt; integer-reply specifically:
-     *
-     *         1 if at least 1 HyperLogLog internal register was altered. 0 otherwise.
-     */
-    RedisFuture<Long> pfadd(K key, V value, V... moreValues);
-
-    /**
-     * Merge N different HyperLogLogs into a single one.
-     *
-     * @param destkey the destination key
-     * @param sourcekey the source key
-     * @param moreSourceKeys more source keys
-     *
-     * @return RedisFuture&lt;String&gt; simple-string-reply The command just returns {@code OK}.
-     */
-    RedisFuture<String> pfmerge(K destkey, K sourcekey, K... moreSourceKeys);
-
-    /**
-     * Return the approximated cardinality of the set(s) observed by the HyperLogLog at key(s).
-     *
-     * @param key the key
-     * @param moreKeys more keys
-     *
-     * @return RedisFuture&lt;Long&gt; integer-reply specifically:
-     *
-     *         The approximated number of unique elements observed via {@code PFADD}.
-     */
-    RedisFuture<Long> pfcount(K key, K... moreKeys);
-
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisHLLConnection.java b/src/main/java/com/lambdaworks/redis/RedisHLLConnection.java
deleted file mode 100644
index 18053be98d..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisHLLConnection.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.lambdaworks.redis;
-
-import com.lambdaworks.redis.api.sync.RedisHLLCommands;
-
-/**
- * Synchronous executed commands for HyperLogLog (PF* commands).
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link RedisHLLCommands}
- */
-@Deprecated
-public interface RedisHLLConnection<K, V> {
-    /**
-     * Adds the specified elements to the specified HyperLogLog.
-     *
-     * @param key the key
-     * @param value the value
-     * @param moreValues more values
-     *
-     * @return Long integer-reply specifically:
-     *
-     *         1 if at least 1 HyperLogLog internal register was altered. 0 otherwise.
-     */
-    Long pfadd(K key, V value, V... moreValues);
-
-    /**
-     * Merge N different HyperLogLogs into a single one.
-     *
-     * @param destkey the destination key
-     * @param sourcekey the source key
-     * @param moreSourceKeys more source keys
-     *
-     * @return Long simple-string-reply The command just returns {@code OK}.
-     */
-    String pfmerge(K destkey, K sourcekey, K... moreSourceKeys);
-
-    /**
-     * Return the approximated cardinality of the set(s) observed by the HyperLogLog at key(s).
-     *
-     * @param key the key
-     * @param moreKeys more keys
-     *
-     * @return Long integer-reply specifically:
-     *
-     *         The approximated number of unique elements observed via {@code PFADD}.
-     */
-    Long pfcount(K key, K... moreKeys);
-
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisHashesAsyncConnection.java b/src/main/java/com/lambdaworks/redis/RedisHashesAsyncConnection.java
deleted file mode 100644
index 39a3c3fd7a..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisHashesAsyncConnection.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.List;
-import java.util.Map;
-
-import com.lambdaworks.redis.api.async.RedisHashAsyncCommands;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
-
-/**
- * Asynchronous executed commands for Hashes (Key-Value pairs).
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link RedisHashAsyncCommands}
- */
-@Deprecated
-public interface RedisHashesAsyncConnection<K, V> {
-
-    /**
-     * Delete one or more hash fields.
-     *
-     * @param key the key
-     * @param fields the field type: key
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of fields that were removed from the hash, not including
-     *         specified but non existing fields.
-     */
-    RedisFuture<Long> hdel(K key, K... fields);
-
-    /**
-     * Determine if a hash field exists.
-     *
-     * @param key the key
-     * @param field the field type: key
-     * @return RedisFuture&lt;Boolean&gt; integer-reply specifically:
-     *
-     *         {@literal true} if the hash contains {@code field}. {@literal false} if the hash does not contain {@code field},
-     *         or {@code key} does not exist.
-     */
-    RedisFuture<Boolean> hexists(K key, K field);
-
-    /**
-     * Get the value of a hash field.
-     *
-     * @param key the key
-     * @param field the field type: key
-     * @return RedisFuture&lt;V&gt; bulk-string-reply the value associated with {@code field}, or {@code null} when
-     *         {@code field} is not present in the hash or {@code key} does not exist.
-     */
-    RedisFuture<V> hget(K key, K field);
-
-    /**
-     * Increment the integer value of a hash field by the given number.
-     *
-     * @param key the key
-     * @param field the field type: key
-     * @param amount the increment type: long
-     * @return RedisFuture&lt;Long&gt; integer-reply the value at {@code field} after the increment operation.
-     */
-    RedisFuture<Long> hincrby(K key, K field, long amount);
-
-    /**
-     * Increment the float value of a hash field by the given amount.
-     *
-     * @param key the key
-     * @param field the field type: key
-     * @param amount the increment type: double
-     * @return RedisFuture&lt;Double;&gt; bulk-string-reply the value of {@code field} after the increment.
-     */
-    RedisFuture<Double> hincrbyfloat(K key, K field, double amount);
-
-    /**
-     * Get all the fields and values in a hash.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;Map&lt;K,V&gt;&gt; array-reply list of fields and their values stored in the hash, or an empty
-     *         list when {@code key} does not exist.
-     */
-    RedisFuture<Map<K, V>> hgetall(K key);
-
-    /**
-     * Stream over all the fields and values in a hash.
-     *
-     * @param channel the channel
-     * @param key the key
-     *
-     * @return RedisFuture&lt;Long&gt; count of the keys.
-     */
-    RedisFuture<Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key);
-
-    /**
-     * Get all the fields in a hash.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;List&lt;K&gt;&gt; array-reply list of fields in the hash, or an empty list when {@code key} does
-     *         not exist.
-     */
-    RedisFuture<List<K>> hkeys(K key);
-
-    /**
-     * Get all the fields in a hash.
-     *
-     * @param channel the channel
-     * @param key the key
-     *
-     * @return RedisFuture&lt;Long&gt; count of the keys.
-     */
-    RedisFuture<Long> hkeys(KeyStreamingChannel<K> channel, K key);
-
-    /**
-     * Get the number of fields in a hash.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;Long&gt; integer-reply number of fields in the hash, or {@literal false} when {@code key} does not
-     *         exist.
-     */
-    RedisFuture<Long> hlen(K key);
-
-    /**
-     * Get the values of all the given hash fields.
-     *
-     * @param key the key
-     * @param fields the field type: key
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of values associated with the given fields, in the same
-     */
-    RedisFuture<List<V>> hmget(K key, K... fields);
-
-    /**
-     * Stream over the values of all the given hash fields.
-     *
-     * @param channel the channel
-     * @param key the key
-     * @param fields the fields
-     *
-     * @return RedisFuture&lt;Long&gt; count of the keys
-     */
-    RedisFuture<Long> hmget(ValueStreamingChannel<V> channel, K key, K... fields);
-
-    /**
-     * Set multiple hash fields to multiple values.
-     *
-     * @param key the key
-     * @param map the null
-     * @return RedisFuture&lt;String&gt; simple-string-reply
-     */
-    RedisFuture<String> hmset(K key, Map<K, V> map);
-
-    /**
-     * Incrementally iterate hash fields and associated values.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;MapScanCursor&lt;K, V&gt;&gt; scan cursor.
-     */
-    RedisFuture<MapScanCursor<K, V>> hscan(K key);
-
-    /**
-     * Incrementally iterate hash fields and associated values.
-     *
-     * @param key the key
-     * @param scanArgs scan arguments
-     * @return RedisFuture&lt;MapScanCursor&lt;K, V&gt;&gt; scan cursor.
-     */
-    RedisFuture<MapScanCursor<K, V>> hscan(K key, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate hash fields and associated values.
-     *
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @param scanArgs scan arguments
-     * @return RedisFuture&lt;MapScanCursor&lt;K, V&gt;&gt; scan cursor.
-     */
-    RedisFuture<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate hash fields and associated values.
-     *
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @return RedisFuture&lt;MapScanCursor&lt;K, V&gt;&gt; scan cursor.
-     */
-    RedisFuture<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor);
-
-    /**
-     * Incrementally iterate hash fields and associated values.
-     *
-     * @param channel streaming channel that receives a call for every key-value pair
-     * @param key the key
-     * @return RedisFuture&lt;StreamScanCursor&gt; scan cursor.
-     */
-    RedisFuture<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key);
-
-    /**
-     * Incrementally iterate hash fields and associated values.
-     *
-     * @param channel streaming channel that receives a call for every key-value pair
-     * @param key the key
-     * @param scanArgs scan arguments
-     * @return RedisFuture&lt;StreamScanCursor&gt; scan cursor.
-     */
-    RedisFuture<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate hash fields and associated values.
-     *
-     * @param channel streaming channel that receives a call for every key-value pair
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @param scanArgs scan arguments
-     * @return RedisFuture&lt;StreamScanCursor&gt; scan cursor.
-     */
-    RedisFuture<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate hash fields and associated values.
-     *
-     * @param channel streaming channel that receives a call for every key-value pair
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @return RedisFuture&lt;StreamScanCursor&gt; scan cursor.
-     */
-    RedisFuture<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor);
-
-    /**
-     * Set the string value of a hash field.
-     *
-     * @param key the key
-     * @param field the field type: key
-     * @param value the value
-     * @return RedisFuture&lt;Boolean&gt; integer-reply specifically:
-     *
-     *         {@literal true} if {@code field} is a new field in the hash and {@code value} was set. {@literal false} if
-     *         {@code field} already exists in the hash and the value was updated.
-     */
-    RedisFuture<Boolean> hset(K key, K field, V value);
-
-    /**
-     * Set the value of a hash field, only if the field does not exist.
-     *
-     * @param key the key
-     * @param field the field type: key
-     * @param value the value
-     * @return RedisFuture&lt;Boolean&gt; integer-reply specifically:
-     *
-     *         {@code 1} if {@code field} is a new field in the hash and {@code value} was set. {@code 0} if {@code field}
-     *         already exists in the hash and no operation was performed.
-     */
-    RedisFuture<Boolean> hsetnx(K key, K field, V value);
-
-    /**
-     * Get the string length of the field value in a hash.
-     *
-     * @param key the key
-     * @param field the field type: key
-     * @return RedisFuture&lt;Long&gt; integer-reply the string length of the {@code field} value, or {@code 0} when
-     *         {@code field} is not present in the hash or {@code key} does not exist at all.
-     */
-    RedisFuture<Long> hstrlen(K key, K field);
-
-    /**
-     * Get all the values in a hash.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of values in the hash, or an empty list when {@code key} does
-     *         not exist.
-     */
-    RedisFuture<List<V>> hvals(K key);
-
-    /**
-     * Stream over all the values in a hash.
-     *
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     *
-     * @return RedisFuture&lt;Long&gt; count of the keys.
-     */
-    RedisFuture<Long> hvals(ValueStreamingChannel<V> channel, K key);
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisHashesConnection.java b/src/main/java/com/lambdaworks/redis/RedisHashesConnection.java
deleted file mode 100644
index 99e2520b1e..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisHashesConnection.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.List;
-import java.util.Map;
-
-import com.lambdaworks.redis.api.sync.RedisHashCommands;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
-
-/**
- * Synchronous executed commands for Hashes (Key-Value pairs).
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link RedisHashCommands}
- */
-@Deprecated
-public interface RedisHashesConnection<K, V> {
-
-    /**
-     * Delete one or more hash fields.
-     *
-     * @param key the key
-     * @param fields the field type: key
-     * @return Long integer-reply the number of fields that were removed from the hash, not including specified but non existing
-     *         fields.
-     */
-    Long hdel(K key, K... fields);
-
-    /**
-     * Determine if a hash field exists.
-     *
-     * @param key the key
-     * @param field the field type: key
-     * @return Boolean integer-reply specifically:
-     *
-     *         {@literal true} if the hash contains {@code field}. {@literal false} if the hash does not contain {@code field},
-     *         or {@code key} does not exist.
-     */
-    Boolean hexists(K key, K field);
-
-    /**
-     * Get the value of a hash field.
-     *
-     * @param key the key
-     * @param field the field type: key
-     * @return V bulk-string-reply the value associated with {@code field}, or {@literal null} when {@code field} is not present
-     *         in the hash or {@code key} does not exist.
-     */
-    V hget(K key, K field);
-
-    /**
-     * Increment the integer value of a hash field by the given number.
-     *
-     * @param key the key
-     * @param field the field type: key
-     * @param amount the increment type: long
-     * @return Long integer-reply the value at {@code field} after the increment operation.
-     */
-    Long hincrby(K key, K field, long amount);
-
-    /**
-     * Increment the float value of a hash field by the given amount.
-     *
-     * @param key the key
-     * @param field the field type: key
-     * @param amount the increment type: double
-     * @return Double bulk-string-reply the value of {@code field} after the increment.
-     */
-    Double hincrbyfloat(K key, K field, double amount);
-
-    /**
-     * Get all the fields and values in a hash.
-     *
-     * @param key the key
-     * @return Map&lt;K,V&gt; array-reply list of fields and their values stored in the hash, or an empty list when {@code key}
-     *         does not exist.
-     */
-    Map<K, V> hgetall(K key);
-
-    /**
-     * Stream over all the fields and values in a hash.
-     *
-     * @param channel the channel
-     * @param key the key
-     *
-     * @return Long count of the keys.
-     */
-    Long hgetall(KeyValueStreamingChannel<K, V> channel, K key);
-
-    /**
-     * Get all the fields in a hash.
-     *
-     * @param key the key
-     * @return List&lt;K&gt; array-reply list of fields in the hash, or an empty list when {@code key} does not exist.
-     */
-    List<K> hkeys(K key);
-
-    /**
-     * Stream over all the fields in a hash.
-     *
-     * @param channel the channel
-     * @param key the key
-     *
-     * @return Long count of the keys.
-     */
-    Long hkeys(KeyStreamingChannel<K> channel, K key);
-
-    /**
-     * Get the number of fields in a hash.
-     *
-     * @param key the key
-     * @return Long integer-reply number of fields in the hash, or {@code 0} when {@code key} does not exist.
-     */
-    Long hlen(K key);
-
-    /**
-     * Get the values of all the given hash fields.
-     *
-     * @param key the key
-     * @param fields the field type: key
-     * @return List&lt;V&gt; array-reply list of values associated with the given fields, in the same
-     */
-    List<V> hmget(K key, K... fields);
-
-    /**
-     * Stream over the values of all the given hash fields.
-     *
-     * @param channel the channel
-     * @param key the key
-     * @param fields the fields
-     *
-     * @return Long count of the keys
-     */
-    Long hmget(ValueStreamingChannel<V> channel, K key, K... fields);
-
-    /**
-     * Set multiple hash fields to multiple values.
-     *
-     * @param key the key
-     * @param map the null
-     * @return String simple-string-reply
-     */
-    String hmset(K key, Map<K, V> map);
-
-    /**
-     * Incrementally iterate hash fields and associated values.
-     *
-     * @param key the key
-     * @return MapScanCursor&lt;K, V&gt; map scan cursor.
-     */
-    MapScanCursor<K, V> hscan(K key);
-
-    /**
-     * Incrementally iterate hash fields and associated values.
-     *
-     * @param key the key
-     * @param scanArgs scan arguments
-     * @return MapScanCursor&lt;K, V&gt; map scan cursor.
-     */
-    MapScanCursor<K, V> hscan(K key, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate hash fields and associated values.
-     *
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @param scanArgs scan arguments
-     * @return MapScanCursor&lt;K, V&gt; map scan cursor.
-     */
-    MapScanCursor<K, V> hscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate hash fields and associated values.
-     *
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @return MapScanCursor&lt;K, V&gt; map scan cursor.
-     */
-    MapScanCursor<K, V> hscan(K key, ScanCursor scanCursor);
-
-    /**
-     * Incrementally iterate hash fields and associated values.
-     *
-     * @param channel streaming channel that receives a call for every key-value pair
-     * @param key the key
-     * @return StreamScanCursor scan cursor.
-     */
-    StreamScanCursor hscan(KeyValueStreamingChannel<K, V> channel, K key);
-
-    /**
-     * Incrementally iterate hash fields and associated values.
-     *
-     * @param channel streaming channel that receives a call for every key-value pair
-     * @param key the key
-     * @param scanArgs scan arguments
-     * @return StreamScanCursor scan cursor.
-     */
-    StreamScanCursor hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate hash fields and associated values.
-     *
-     * @param channel streaming channel that receives a call for every key-value pair
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @param scanArgs scan arguments
-     * @return StreamScanCursor scan cursor.
-     */
-    StreamScanCursor hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate hash fields and associated values.
-     *
-     * @param channel streaming channel that receives a call for every key-value pair
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @return StreamScanCursor scan cursor.
-     */
-    StreamScanCursor hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor);
-
-    /**
-     * Set the string value of a hash field.
-     *
-     * @param key the key
-     * @param field the field type: key
-     * @param value the value
-     * @return Boolean integer-reply specifically:
-     *
-     *         {@literal true} if {@code field} is a new field in the hash and {@code value} was set. {@literal false} if
-     *         {@code field} already exists in the hash and the value was updated.
-     */
-    Boolean hset(K key, K field, V value);
-
-    /**
-     * Set the value of a hash field, only if the field does not exist.
-     *
-     * @param key the key
-     * @param field the field type: key
-     * @param value the value
-     * @return Boolean integer-reply specifically:
-     *
-     *         {@code 1} if {@code field} is a new field in the hash and {@code value} was set. {@code 0} if {@code field}
-     *         already exists in the hash and no operation was performed.
-     */
-    Boolean hsetnx(K key, K field, V value);
-
-    /**
-     * Get the string length of the field value in a hash.
-     *
-     * @param key the key
-     * @param field the field type: key
-     * @return Long integer-reply the string length of the {@code field} value, or {@code 0} when {@code field} is not present
-     *         in the hash or {@code key} does not exist at all.
-     */
-    Long hstrlen(K key, K field);
-
-    /**
-     * Get all the values in a hash.
-     *
-     * @param key the key
-     * @return List&lt;V&gt; array-reply list of values in the hash, or an empty list when {@code key} does not exist.
-     */
-    List<V> hvals(K key);
-
-    /**
-     * Stream over all the values in a hash.
-     *
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     *
-     * @return Long count of the keys.
-     */
-    Long hvals(ValueStreamingChannel<V> channel, K key);
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisKeysAsyncConnection.java b/src/main/java/com/lambdaworks/redis/RedisKeysAsyncConnection.java
deleted file mode 100644
index bcd7a3efa6..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisKeysAsyncConnection.java
+++ /dev/null
@@ -1,411 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.Date;
-import java.util.List;
-
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
-
-/**
- * Asynchronous executed commands for Keys (Key manipulation/querying).
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@literal RedisKeyAsyncCommands}
- */
-@Deprecated
-public interface RedisKeysAsyncConnection<K, V> {
-
-    /**
-     * Delete one or more keys.
-     *
-     * @param keys the keys
-     * @return RedisFuture&lt;Long&gt; integer-reply The number of keys that were removed.
-     */
-    RedisFuture<Long> del(K... keys);
-
-    /**
-     * Unlink one or more keys (non blocking DEL).
-     *
-     * @param keys the keys
-     * @return RedisFuture&lt;Long&gt; integer-reply The number of keys that were removed.
-     */
-    RedisFuture<Long> unlink(K... keys);
-
-    /**
-     * Return a serialized version of the value stored at the specified key.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;byte[]&gt;bulk-string-reply the serialized value.
-     */
-    RedisFuture<byte[]> dump(K key);
-
-    /**
-     * Determine if a key exists.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;Boolean&gt; integer-reply specifically:
-     *
-     *         {@literal true} if the key exists. {@literal false} if the key does not exist.
-     * @deprecated Use {@link #exists(Object[])} instead
-     */
-    @Deprecated
-    RedisFuture<Boolean> exists(K key);
-
-    /**
-     * Determine how many keys exist.
-     *
-     * @param keys the keys
-     * @return Long integer-reply specifically: Number of existing keys
-     */
-    RedisFuture<Long> exists(K... keys);
-
-    /**
-     * Set a key's time to live in seconds.
-     *
-     * @param key the key
-     * @param seconds the seconds type: long
-     * @return RedisFuture&lt;Boolean&gt; integer-reply specifically:
-     *
-     *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
-     *         be set.
-     */
-    RedisFuture<Boolean> expire(K key, long seconds);
-
-    /**
-     * Set the expiration for a key as a UNIX timestamp.
-     *
-     * @param key the key
-     * @param timestamp the timestamp type: posix time
-     * @return RedisFuture&lt;Boolean&gt; integer-reply specifically:
-     *
-     *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
-     *         be set (see: {@code EXPIRE}).
-     */
-    RedisFuture<Boolean> expireat(K key, Date timestamp);
-
-    /**
-     * Set the expiration for a key as a UNIX timestamp.
-     *
-     * @param key the key
-     * @param timestamp the timestamp type: posix time
-     * @return RedisFuture&lt;Boolean&gt; integer-reply specifically:
-     *
-     *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
-     *         be set (see: {@code EXPIRE}).
-     */
-    RedisFuture<Boolean> expireat(K key, long timestamp);
-
-    /**
-     * Find all keys matching the given pattern.
-     *
-     * @param pattern the pattern type: patternkey (pattern)
-     * @return RedisFuture&lt;List&lt;K&gt;&gt; array-reply list of keys matching {@code pattern}.
-     */
-    RedisFuture<List<K>> keys(K pattern);
-
-    /**
-     * Find all keys matching the given pattern.
-     *
-     * @param channel the channel
-     * @param pattern the pattern
-     *
-     * @return RedisFuture&lt;Long&gt; array-reply list of keys matching {@code pattern}.
-     */
-    RedisFuture<Long> keys(KeyStreamingChannel<K> channel, K pattern);
-
-    /**
-     * Atomically transfer a key from a Redis instance to another one.
-     *
-     * @param host the host
-     * @param port the port
-     * @param key the key
-     * @param db the database
-     * @param timeout the timeout in milliseconds
-     *
-     * @return RedisFuture&lt;String&gt; simple-string-reply The command returns OK on success.
-     */
-    RedisFuture<String> migrate(String host, int port, K key, int db, long timeout);
-
-    /**
-     * Atomically transfer one or more keys from a Redis instance to another one.
-     *
-     * @param host the host
-     * @param port the port
-     * @param db the database
-     * @param timeout the timeout in milliseconds
-     * @param migrateArgs migrate args that allow to configure further options
-     * @return String simple-string-reply The command returns OK on success.
-     */
-    RedisFuture<String> migrate(String host, int port, int db, long timeout, MigrateArgs<K> migrateArgs);
-
-    /**
-     * Move a key to another database.
-     *
-     * @param key the key
-     * @param db the db type: long
-     * @return RedisFuture&lt;Boolean&gt; integer-reply specifically:
-     */
-    RedisFuture<Boolean> move(K key, int db);
-
-    /**
-     * returns the kind of internal representation used in order to store the value associated with a key.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;String&gt;
-     */
-    RedisFuture<String> objectEncoding(K key);
-
-    /**
-     * returns the number of seconds since the object stored at the specified key is idle (not requested by read or write
-     * operations).
-     *
-     * @param key the key
-     * @return RedisFuture&lt;Long&gt; number of seconds since the object stored at the specified key is idle.
-     */
-    RedisFuture<Long> objectIdletime(K key);
-
-    /**
-     * returns the number of references of the value associated with the specified key.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;Long&gt;
-     */
-    RedisFuture<Long> objectRefcount(K key);
-
-    /**
-     * Remove the expiration from a key.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;Boolean&gt; integer-reply specifically:
-     *
-     *         {@literal true} if the timeout was removed. {@literal false} if {@code key} does not exist or does not have an
-     *         associated timeout.
-     */
-    RedisFuture<Boolean> persist(K key);
-
-    /**
-     * Set a key's time to live in milliseconds.
-     *
-     * @param key the key
-     * @param milliseconds the milliseconds type: long
-     * @return integer-reply, specifically:
-     *
-     *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
-     *         be set.
-     */
-    RedisFuture<Boolean> pexpire(K key, long milliseconds);
-
-    /**
-     * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
-     *
-     * @param key the key
-     * @param timestamp the milliseconds-timestamp type: posix time
-     * @return RedisFuture&lt;Boolean&gt; integer-reply specifically:
-     *
-     *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
-     *         be set (see: {@code EXPIRE}).
-     */
-    RedisFuture<Boolean> pexpireat(K key, Date timestamp);
-
-    /**
-     * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
-     *
-     * @param key the key
-     * @param timestamp the milliseconds-timestamp type: posix time
-     * @return RedisFuture&lt;Boolean&gt; integer-reply specifically:
-     *
-     *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
-     *         be set (see: {@code EXPIRE}).
-     */
-    RedisFuture<Boolean> pexpireat(K key, long timestamp);
-
-    /**
-     * Get the time to live for a key in milliseconds.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;Long&gt; integer-reply TTL in milliseconds, or a negative value in order to signal an error (see
-     *         the description above).
-     */
-    RedisFuture<Long> pttl(K key);
-
-    /**
-     * Return a random key from the keyspace.
-     *
-     * @return RedisFuture&lt;V&gt; bulk-string-reply the random key, or {@literal null} when the database is empty.
-     */
-    RedisFuture<V> randomkey();
-
-    /**
-     * Rename a key.
-     *
-     * @param key the key
-     * @param newKey the newkey type: key
-     * @return RedisFuture&lt;String&gt; simple-string-reply
-     */
-    RedisFuture<String> rename(K key, K newKey);
-
-    /**
-     * Rename a key, only if the new key does not exist.
-     *
-     * @param key the key
-     * @param newKey the newkey type: key
-     * @return RedisFuture&lt;Boolean&gt; integer-reply specifically:
-     *
-     *         {@literal true} if {@code key} was renamed to {@code newkey}. {@literal false} if {@code newkey} already exists.
-     */
-    RedisFuture<Boolean> renamenx(K key, K newKey);
-
-    /**
-     * Create a key using the provided serialized value, previously obtained using DUMP.
-     *
-     * @param key the key
-     * @param ttl the ttl type: long
-     * @param value the serialized-value type: string
-     * @return RedisFuture&lt;String&gt; simple-string-reply The command returns OK on success.
-     */
-    RedisFuture<String> restore(K key, long ttl, byte[] value);
-
-    /**
-     * Sort the elements in a list, set or sorted set.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of sorted elements.
-     */
-    RedisFuture<List<V>> sort(K key);
-
-    /**
-     * Sort the elements in a list, set or sorted set.
-     *
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @return RedisFuture&lt;Long&gt; number of values.
-     */
-    RedisFuture<Long> sort(ValueStreamingChannel<V> channel, K key);
-
-    /**
-     * Sort the elements in a list, set or sorted set.
-     *
-     * @param key the key
-     * @param sortArgs sort arguments
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of sorted elements.
-     */
-    RedisFuture<List<V>> sort(K key, SortArgs sortArgs);
-
-    /**
-     * Sort the elements in a list, set or sorted set.
-     *
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param sortArgs sort arguments
-     * @return RedisFuture&lt;Long&gt; number of values.
-     */
-    RedisFuture<Long> sort(ValueStreamingChannel<V> channel, K key, SortArgs sortArgs);
-
-    /**
-     * Sort the elements in a list, set or sorted set.
-     *
-     * @param key the key
-     * @param sortArgs sort arguments
-     * @param destination the destination key to store sort results
-     * @return RedisFuture&lt;Long&gt; number of values.
-     */
-    RedisFuture<Long> sortStore(K key, SortArgs sortArgs, K destination);
-
-    /**
-     * Touch one or more keys. Touch sets the last accessed time for a key. Non-exsitent keys wont get created.
-     *
-     * @param keys the keys
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of found keys.
-     */
-    RedisFuture<Long> touch(K... keys);
-
-    /**
-     * Get the time to live for a key.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;Long&gt; integer-reply TTL in seconds, or a negative value in order to signal an error (see the
-     *         description above).
-     */
-    RedisFuture<Long> ttl(K key);
-
-    /**
-     * Determine the type stored at key.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;String&gt; simple-string-reply type of {@code key}, or {@code none} when {@code key} does not
-     *         exist.
-     */
-    RedisFuture<String> type(K key);
-
-    /**
-     * Incrementally iterate the keys space.
-     *
-     * @return RedisFuture&lt;KeyScanCursor&lt;K&gt;&gt; scan cursor.
-     */
-    RedisFuture<KeyScanCursor<K>> scan();
-
-    /**
-     * Incrementally iterate the keys space.
-     *
-     * @param scanArgs scan arguments
-     * @return RedisFuture&lt;KeyScanCursor&lt;K&gt;&gt; scan cursor.
-     */
-    RedisFuture<KeyScanCursor<K>> scan(ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate the keys space.
-     *
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @param scanArgs scan arguments
-     * @return RedisFuture&lt;KeyScanCursor&lt;K&gt;&gt; scan cursor.
-     */
-    RedisFuture<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate the keys space.
-     *
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @return RedisFuture&lt;KeyScanCursor&lt;K&gt;&gt; scan cursor.
-     */
-    RedisFuture<KeyScanCursor<K>> scan(ScanCursor scanCursor);
-
-    /**
-     * Incrementally iterate the keys space.
-     *
-     * @param channel streaming channel that receives a call for every key
-     * @return RedisFuture&lt;StreamScanCursor&gt; scan cursor.
-     */
-    RedisFuture<StreamScanCursor> scan(KeyStreamingChannel<K> channel);
-
-    /**
-     * Incrementally iterate the keys space.
-     *
-     * @param channel streaming channel that receives a call for every key
-     * @param scanArgs scan arguments
-     * @return RedisFuture&lt;StreamScanCursor&gt; scan cursor.
-     */
-    RedisFuture<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate the keys space.
-     *
-     * @param channel streaming channel that receives a call for every key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @param scanArgs scan arguments
-     * @return RedisFuture&lt;StreamScanCursor&gt; scan cursor.
-     */
-    RedisFuture<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate the keys space.
-     *
-     * @param channel streaming channel that receives a call for every key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @return RedisFuture&lt;StreamScanCursor&gt; scan cursor.
-     */
-    RedisFuture<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor);
-
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisKeysConnection.java b/src/main/java/com/lambdaworks/redis/RedisKeysConnection.java
deleted file mode 100644
index 93855efdeb..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisKeysConnection.java
+++ /dev/null
@@ -1,406 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.Date;
-import java.util.List;
-
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
-
-/**
- * Synchronous executed commands for Keys (Key manipulation/querying).
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@literal RedisKeyCommands}
- */
-@Deprecated
-public interface RedisKeysConnection<K, V> {
-
-    /**
-     * Delete one or more keys.
-     * 
-     * @param keys the keys
-     * @return Long integer-reply The number of keys that were removed.
-     */
-    Long del(K... keys);
-
-    /**
-     * Unlink one or more keys (non blocking DEL).
-     *
-     * @param keys the keys
-     * @return Long integer-reply The number of keys that were removed.
-     */
-    Long unlink(K... keys);
-
-    /**
-     * Return a serialized version of the value stored at the specified key.
-     * 
-     * @param key the key
-     * @return byte[] bulk-string-reply the serialized value.
-     */
-    byte[] dump(K key);
-
-    /**
-     * Determine if a key exists.
-     * 
-     * @param key the key
-     * @return Boolean integer-reply specifically:
-     * 
-     *         {@literal true} if the key exists. {@literal false} if the key does not exist.
-     * @deprecated Use {@link #exists(Object[])} instead
-     */
-    @Deprecated
-    Boolean exists(K key);
-
-    /**
-     * Determine how many keys exist.
-     *
-     * @param keys the keys
-     * @return Long integer-reply specifically: Number of existing keys
-     */
-    Long exists(K... keys);
-
-    /**
-     * Set a key's time to live in seconds.
-     * 
-     * @param key the key
-     * @param seconds the seconds type: long
-     * @return Boolean integer-reply specifically:
-     * 
-     *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
-     *         be set.
-     */
-    Boolean expire(K key, long seconds);
-
-    /**
-     * Set the expiration for a key as a UNIX timestamp.
-     * 
-     * @param key the key
-     * @param timestamp the timestamp type: posix time
-     * @return Boolean integer-reply specifically:
-     * 
-     *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
-     *         be set (see: {@code EXPIRE}).
-     */
-    Boolean expireat(K key, Date timestamp);
-
-    /**
-     * Set the expiration for a key as a UNIX timestamp.
-     * 
-     * @param key the key
-     * @param timestamp the timestamp type: posix time
-     * @return Boolean integer-reply specifically:
-     * 
-     *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
-     *         be set (see: {@code EXPIRE}).
-     */
-    Boolean expireat(K key, long timestamp);
-
-    /**
-     * Find all keys matching the given pattern.
-     * 
-     * @param pattern the pattern type: patternkey (pattern)
-     * @return List&lt;K&gt; array-reply list of keys matching {@code pattern}.
-     */
-    List<K> keys(K pattern);
-
-    /**
-     * Find all keys matching the given pattern.
-     * 
-     * @param channel the channel
-     * @param pattern the pattern
-     * @return Long array-reply list of keys matching {@code pattern}.
-     */
-    Long keys(KeyStreamingChannel<K> channel, K pattern);
-
-    /**
-     * Atomically transfer a key from a Redis instance to another one.
-     * 
-     * @param host the host
-     * @param port the port
-     * @param key the key
-     * @param db the database
-     * @param timeout the timeout in milliseconds
-     * @return String simple-string-reply The command returns OK on success.
-     */
-    String migrate(String host, int port, K key, int db, long timeout);
-
-    /**
-     * Atomically transfer one or more keys from a Redis instance to another one.
-     *
-     * @param host the host
-     * @param port the port
-     * @param db the database
-     * @param timeout the timeout in milliseconds
-     * @param migrateArgs migrate args that allow to configure further options
-     * @return String simple-string-reply The command returns OK on success.
-     */
-    String migrate(String host, int port, int db, long timeout, MigrateArgs<K> migrateArgs);
-
-    /**
-     * Move a key to another database.
-     * 
-     * @param key the key
-     * @param db the db type: long
-     * @return Boolean integer-reply specifically:
-     */
-    Boolean move(K key, int db);
-
-    /**
-     * returns the kind of internal representation used in order to store the value associated with a key.
-     * 
-     * @param key the key
-     * @return String
-     */
-    String objectEncoding(K key);
-
-    /**
-     * returns the number of seconds since the object stored at the specified key is idle (not requested by read or write
-     * operations).
-     * 
-     * @param key the key
-     * @return number of seconds since the object stored at the specified key is idle.
-     */
-    Long objectIdletime(K key);
-
-    /**
-     * returns the number of references of the value associated with the specified key.
-     * 
-     * @param key the key
-     * @return Long
-     */
-    Long objectRefcount(K key);
-
-    /**
-     * Remove the expiration from a key.
-     * 
-     * @param key the key
-     * @return Boolean integer-reply specifically:
-     * 
-     *         {@literal true} if the timeout was removed. {@literal false} if {@code key} does not exist or does not have an
-     *         associated timeout.
-     */
-    Boolean persist(K key);
-
-    /**
-     * Set a key's time to live in milliseconds.
-     * 
-     * @param key the key
-     * @param milliseconds the milliseconds type: long
-     * @return integer-reply, specifically:
-     * 
-     *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
-     *         be set.
-     */
-    Boolean pexpire(K key, long milliseconds);
-
-    /**
-     * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
-     * 
-     * @param key the key
-     * @param timestamp the milliseconds-timestamp type: posix time
-     * @return Boolean integer-reply specifically:
-     * 
-     *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
-     *         be set (see: {@code EXPIRE}).
-     */
-    Boolean pexpireat(K key, Date timestamp);
-
-    /**
-     * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
-     * 
-     * @param key the key
-     * @param timestamp the milliseconds-timestamp type: posix time
-     * @return Boolean integer-reply specifically:
-     * 
-     *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
-     *         be set (see: {@code EXPIRE}).
-     */
-    Boolean pexpireat(K key, long timestamp);
-
-    /**
-     * Get the time to live for a key in milliseconds.
-     * 
-     * @param key the key
-     * @return Long integer-reply TTL in milliseconds, or a negative value in order to signal an error (see the description
-     *         above).
-     */
-    Long pttl(K key);
-
-    /**
-     * Return a random key from the keyspace.
-     * 
-     * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
-     */
-    V randomkey();
-
-    /**
-     * Rename a key.
-     * 
-     * @param key the key
-     * @param newKey the newkey type: key
-     * @return String simple-string-reply
-     */
-    String rename(K key, K newKey);
-
-    /**
-     * Rename a key, only if the new key does not exist.
-     * 
-     * @param key the key
-     * @param newKey the newkey type: key
-     * @return Boolean integer-reply specifically:
-     * 
-     *         {@literal true} if {@code key} was renamed to {@code newkey}. {@literal false} if {@code newkey} already exists.
-     */
-    Boolean renamenx(K key, K newKey);
-
-    /**
-     * Create a key using the provided serialized value, previously obtained using DUMP.
-     * 
-     * @param key the key
-     * @param ttl the ttl type: long
-     * @param value the serialized-value type: string
-     * @return String simple-string-reply The command returns OK on success.
-     */
-    String restore(K key, long ttl, byte[] value);
-
-    /**
-     * Sort the elements in a list, set or sorted set.
-     * 
-     * @param key the key
-     * @return List&lt;V&gt; array-reply list of sorted elements.
-     */
-    List<V> sort(K key);
-
-    /**
-     * Sort the elements in a list, set or sorted set.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @return Long number of values.
-     */
-    Long sort(ValueStreamingChannel<V> channel, K key);
-
-    /**
-     * Sort the elements in a list, set or sorted set.
-     * 
-     * @param key the key
-     * @param sortArgs sort arguments
-     * @return List&lt;V&gt; array-reply list of sorted elements.
-     */
-    List<V> sort(K key, SortArgs sortArgs);
-
-    /**
-     * Sort the elements in a list, set or sorted set.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param sortArgs sort arguments
-     * @return Long number of values.
-     */
-    Long sort(ValueStreamingChannel<V> channel, K key, SortArgs sortArgs);
-
-    /**
-     * Sort the elements in a list, set or sorted set.
-     * 
-     * @param key the key
-     * @param sortArgs sort arguments
-     * @param destination the destination key to store sort results
-     * @return Long number of values.
-     */
-    Long sortStore(K key, SortArgs sortArgs, K destination);
-
-    /**
-     * Touch one or more keys. Touch sets the last accessed time for a key. Non-exsitent keys wont get created.
-     *
-     * @param keys the keys
-     * @return Long integer-reply the number of found keys.
-     */
-    Long touch(K... keys);
-
-    /**
-     * Get the time to live for a key.
-     * 
-     * @param key the key
-     * @return Long integer-reply TTL in seconds, or a negative value in order to signal an error (see the description above).
-     */
-    Long ttl(K key);
-
-    /**
-     * Determine the type stored at key.
-     * 
-     * @param key the key
-     * @return String simple-string-reply type of {@code key}, or {@code none} when {@code key} does not exist.
-     */
-    String type(K key);
-
-    /**
-     * Incrementally iterate the keys space.
-     * 
-     * @return KeyScanCursor&lt;K&gt; scan cursor.
-     */
-    KeyScanCursor<K> scan();
-
-    /**
-     * Incrementally iterate the keys space.
-     * 
-     * @param scanArgs scan arguments
-     * @return KeyScanCursor&lt;K&gt; scan cursor.
-     */
-    KeyScanCursor<K> scan(ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate the keys space.
-     * 
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @param scanArgs scan arguments
-     * @return KeyScanCursor&lt;K&gt; scan cursor.
-     */
-    KeyScanCursor<K> scan(ScanCursor scanCursor, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate the keys space.
-     * 
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @return KeyScanCursor&lt;K&gt; scan cursor.
-     */
-    KeyScanCursor<K> scan(ScanCursor scanCursor);
-
-    /**
-     * Incrementally iterate the keys space.
-     * 
-     * @param channel streaming channel that receives a call for every key
-     * @return StreamScanCursor scan cursor.
-     */
-    StreamScanCursor scan(KeyStreamingChannel<K> channel);
-
-    /**
-     * Incrementally iterate the keys space.
-     * 
-     * @param channel streaming channel that receives a call for every key
-     * @param scanArgs scan arguments
-     * @return StreamScanCursor scan cursor.
-     */
-    StreamScanCursor scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate the keys space.
-     * 
-     * @param channel streaming channel that receives a call for every key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @param scanArgs scan arguments
-     * @return StreamScanCursor scan cursor.
-     */
-    StreamScanCursor scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate the keys space.
-     * 
-     * @param channel streaming channel that receives a call for every key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @return StreamScanCursor scan cursor.
-     */
-    StreamScanCursor scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor);
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisListsAsyncConnection.java b/src/main/java/com/lambdaworks/redis/RedisListsAsyncConnection.java
deleted file mode 100644
index 8bf311ff88..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisListsAsyncConnection.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.List;
-
-import com.lambdaworks.redis.api.async.RedisListAsyncCommands;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
-
-/**
- * Asynchronous executed commands for Lists.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link RedisListAsyncCommands}
- */
-@Deprecated
-public interface RedisListsAsyncConnection<K, V> {
-
-    /**
-     * Remove and get the first element in a list, or block until one is available.
-     * 
-     * @param timeout the timeout in seconds
-     * @param keys the keys
-     * @return RedisFuture&lt;KeyValue&lt;K,V&gt;&gt; array-reply specifically:
-     * 
-     *         A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk
-     *         with the first element being the name of the key where an element was popped and the second element being the
-     *         value of the popped element.
-     */
-    RedisFuture<KeyValue<K, V>> blpop(long timeout, K... keys);
-
-    /**
-     * Remove and get the last element in a list, or block until one is available.
-     * 
-     * @param timeout the timeout in seconds
-     * @param keys the keys
-     * @return RedisFuture&lt;KeyValue&lt;K,V&gt;&gt; array-reply specifically:
-     * 
-     *         A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk
-     *         with the first element being the name of the key where an element was popped and the second element being the
-     *         value of the popped element.
-     */
-    RedisFuture<KeyValue<K, V>> brpop(long timeout, K... keys);
-
-    /**
-     * Pop a value from a list, push it to another list and return it; or block until one is available.
-     * 
-     * @param timeout the timeout in seconds
-     * @param source the source key
-     * @param destination the destination type: key
-     * @return RedisFuture&lt;V&gt; bulk-string-reply the element being popped from {@code source} and pushed to
-     *         {@code destination}. If {@code timeout} is reached, a
-     */
-    RedisFuture<V> brpoplpush(long timeout, K source, K destination);
-
-    /**
-     * Get an element from a list by its index.
-     * 
-     * @param key the key
-     * @param index the index type: long
-     * @return RedisFuture&lt;V&gt; bulk-string-reply the requested element, or {@literal null} when {@code index} is out of
-     *         range.
-     */
-    RedisFuture<V> lindex(K key, long index);
-
-    /**
-     * Insert an element before or after another element in a list.
-     * 
-     * @param key the key
-     * @param before the before
-     * @param pivot the pivot
-     * @param value the value
-     * @return RedisFuture&lt;Long&gt; integer-reply the length of the list after the insert operation, or {@code -1} when the
-     *         value {@code pivot} was not found.
-     */
-    RedisFuture<Long> linsert(K key, boolean before, V pivot, V value);
-
-    /**
-     * Get the length of a list.
-     * 
-     * @param key the key
-     * @return RedisFuture&lt;Long&gt; integer-reply the length of the list at {@code key}.
-     */
-    RedisFuture<Long> llen(K key);
-
-    /**
-     * Remove and get the first element in a list.
-     * 
-     * @param key the key
-     * @return RedisFuture&lt;V&gt; bulk-string-reply the value of the first element, or {@literal null} when {@code key} does
-     *         not exist.
-     */
-    RedisFuture<V> lpop(K key);
-
-    /**
-     * Prepend one or multiple values to a list.
-     * 
-     * @param key the key
-     * @param values the value
-     * @return RedisFuture&lt;Long&gt; integer-reply the length of the list after the push operations.
-     */
-    RedisFuture<Long> lpush(K key, V... values);
-
-    /**
-     * Prepend a value to a list, only if the list exists.
-     * 
-     * @param key the key
-     * @param value the value
-     * @return RedisFuture&lt;Long&gt; integer-reply the length of the list after the push operation.
-     * @deprecated Use {@link #lpushx(Object, Object[])}
-     */
-    @Deprecated
-    RedisFuture<Long> lpushx(K key, V value);
-
-    /**
-     * Prepend values to a list, only if the list exists.
-     *
-     * @param key the key
-     * @param values the values
-     * @return Long integer-reply the length of the list after the push operation.
-     */
-    RedisFuture<Long> lpushx(K key, V... values);
-
-    /**
-     * Get a range of elements from a list.
-     * 
-     * @param key the key
-     * @param start the start type: long
-     * @param stop the stop type: long
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of elements in the specified range.
-     */
-    RedisFuture<List<V>> lrange(K key, long start, long stop);
-
-    /**
-     * Get a range of elements from a list.
-     * 
-     * @param channel the channel
-     * @param key the key
-     * @param start the start type: long
-     * @param stop the stop type: long
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified range.
-     */
-    RedisFuture<Long> lrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Remove elements from a list.
-     * 
-     * @param key the key
-     * @param count the count type: long
-     * @param value the value
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of removed elements.
-     */
-    RedisFuture<Long> lrem(K key, long count, V value);
-
-    /**
-     * Set the value of an element in a list by its index.
-     * 
-     * @param key the key
-     * @param index the index type: long
-     * @param value the value
-     * @return RedisFuture&lt;String&gt; simple-string-reply
-     */
-    RedisFuture<String> lset(K key, long index, V value);
-
-    /**
-     * Trim a list to the specified range.
-     * 
-     * @param key the key
-     * @param start the start type: long
-     * @param stop the stop type: long
-     * @return RedisFuture&lt;String&gt; simple-string-reply
-     */
-    RedisFuture<String> ltrim(K key, long start, long stop);
-
-    /**
-     * Remove and get the last element in a list.
-     * 
-     * @param key the key
-     * @return RedisFuture&lt;V&gt; bulk-string-reply the value of the last element, or {@literal null} when {@code key} does
-     *         not exist.
-     */
-    RedisFuture<V> rpop(K key);
-
-    /**
-     * Remove the last element in a list, append it to another list and return it.
-     * 
-     * @param source the source key
-     * @param destination the destination type: key
-     * @return RedisFuture&lt;V&gt; bulk-string-reply the element being popped and pushed.
-     */
-    RedisFuture<V> rpoplpush(K source, K destination);
-
-    /**
-     * Append one or multiple values to a list.
-     * 
-     * @param key the key
-     * @param values the value
-     * @return RedisFuture&lt;Long&gt; integer-reply the length of the list after the push operation.
-     */
-    RedisFuture<Long> rpush(K key, V... values);
-
-    /**
-     * Append a value to a list, only if the list exists.
-     * 
-     * @param key the key
-     * @param value the value
-     * @return RedisFuture&lt;Long&gt; integer-reply the length of the list after the push operation.
-     * @deprecated Use {@link #rpushx(java.lang.Object, java.lang.Object[])}
-     */
-    @Deprecated
-    RedisFuture<Long> rpushx(K key, V value);
-
-    /**
-     * Append values to a list, only if the list exists.
-     *
-     * @param key the key
-     * @param values the values
-     * @return RedisFuture&lt;Long&gt; integer-reply the length of the list after the push operation.
-     */
-    RedisFuture<Long> rpushx(K key, V... values);
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisListsConnection.java b/src/main/java/com/lambdaworks/redis/RedisListsConnection.java
deleted file mode 100644
index bcdd3b9124..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisListsConnection.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.List;
-
-import com.lambdaworks.redis.api.sync.RedisListCommands;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
-
-/**
- * 
- * Synchronous executed commands for Lists.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@literal RedisListCommands}
- */
-@Deprecated
-public interface RedisListsConnection<K, V> {
-
-    /**
-     * Remove and get the first element in a list, or block until one is available.
-     * 
-     * @param timeout the timeout in seconds
-     * @param keys the keys
-     * @return KeyValue&lt;K,V&gt; array-reply specifically:
-     * 
-     *         A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk
-     *         with the first element being the name of the key where an element was popped and the second element being the
-     *         value of the popped element.
-     */
-    KeyValue<K, V> blpop(long timeout, K... keys);
-
-    /**
-     * Remove and get the last element in a list, or block until one is available.
-     * 
-     * @param timeout the timeout in seconds
-     * @param keys the keys
-     * @return KeyValue&lt;K,V&gt; array-reply specifically:
-     * 
-     *         A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk
-     *         with the first element being the name of the key where an element was popped and the second element being the
-     *         value of the popped element.
-     */
-    KeyValue<K, V> brpop(long timeout, K... keys);
-
-    /**
-     * Pop a value from a list, push it to another list and return it; or block until one is available.
-     * 
-     * @param timeout the timeout in seconds
-     * @param source the source key
-     * @param destination the destination type: key
-     * @return V bulk-string-reply the element being popped from {@code source} and pushed to {@code destination}. If
-     *         {@code timeout} is reached, a
-     */
-    V brpoplpush(long timeout, K source, K destination);
-
-    /**
-     * Get an element from a list by its index.
-     * 
-     * @param key the key
-     * @param index the index type: long
-     * @return V bulk-string-reply the requested element, or {@literal null} when {@code index} is out of range.
-     */
-    V lindex(K key, long index);
-
-    /**
-     * Insert an element before or after another element in a list.
-     * 
-     * @param key the key
-     * @param before the before
-     * @param pivot the pivot
-     * @param value the value
-     * @return Long integer-reply the length of the list after the insert operation, or {@code -1} when the value {@code pivot}
-     *         was not found.
-     */
-    Long linsert(K key, boolean before, V pivot, V value);
-
-    /**
-     * Get the length of a list.
-     * 
-     * @param key the key
-     * @return Long integer-reply the length of the list at {@code key}.
-     */
-    Long llen(K key);
-
-    /**
-     * Remove and get the first element in a list.
-     * 
-     * @param key the key
-     * @return V bulk-string-reply the value of the first element, or {@literal null} when {@code key} does not exist.
-     */
-    V lpop(K key);
-
-    /**
-     * Prepend one or multiple values to a list.
-     * 
-     * @param key the key
-     * @param values the value
-     * @return Long integer-reply the length of the list after the push operations.
-     */
-    Long lpush(K key, V... values);
-
-    /**
-     * Prepend a value to a list, only if the list exists.
-     * 
-     * @param key the key
-     * @param value the value
-     * @return Long integer-reply the length of the list after the push operation.
-     * @deprecated Use {@link #lpushx(Object, Object[])}
-     */
-    @Deprecated
-    Long lpushx(K key, V value);
-
-    /**
-     * Prepend values to a list, only if the list exists.
-     *
-     * @param key the key
-     * @param values the values
-     * @return Long integer-reply the length of the list after the push operation.
-     */
-    Long lpushx(K key, V... values);
-
-    /**
-     * Get a range of elements from a list.
-     * 
-     * @param key the key
-     * @param start the start type: long
-     * @param stop the stop type: long
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     */
-    List<V> lrange(K key, long start, long stop);
-
-    /**
-     * Get a range of elements from a list.
-     * 
-     * @param channel the channel
-     * @param key the key
-     * @param start the start type: long
-     * @param stop the stop type: long
-     * @return Long count of elements in the specified range.
-     */
-    Long lrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Remove elements from a list.
-     * 
-     * @param key the key
-     * @param count the count type: long
-     * @param value the value
-     * @return Long integer-reply the number of removed elements.
-     */
-    Long lrem(K key, long count, V value);
-
-    /**
-     * Set the value of an element in a list by its index.
-     * 
-     * @param key the key
-     * @param index the index type: long
-     * @param value the value
-     * @return String simple-string-reply
-     */
-    String lset(K key, long index, V value);
-
-    /**
-     * Trim a list to the specified range.
-     * 
-     * @param key the key
-     * @param start the start type: long
-     * @param stop the stop type: long
-     * @return String simple-string-reply
-     */
-    String ltrim(K key, long start, long stop);
-
-    /**
-     * Remove and get the last element in a list.
-     * 
-     * @param key the key
-     * @return V bulk-string-reply the value of the last element, or {@literal null} when {@code key} does not exist.
-     */
-    V rpop(K key);
-
-    /**
-     * Remove the last element in a list, append it to another list and return it.
-     * 
-     * @param source the source key
-     * @param destination the destination type: key
-     * @return V bulk-string-reply the element being popped and pushed.
-     */
-    V rpoplpush(K source, K destination);
-
-    /**
-     * Append one or multiple values to a list.
-     * 
-     * @param key the key
-     * @param values the value
-     * @return Long integer-reply the length of the list after the push operation.
-     */
-    Long rpush(K key, V... values);
-
-    /**
-     * Append a value to a list, only if the list exists.
-     * 
-     * @param key the key
-     * @param value the value
-     * @return Long integer-reply the length of the list after the push operation.
-     * @deprecated Use {@link #rpushx(Object, Object[])}
-     */
-    @Deprecated
-    Long rpushx(K key, V value);
-
-    /**
-     * Append values to a list, only if the list exists.
-     *
-     * @param key the key
-     * @param values the values
-     * @return Long integer-reply the length of the list after the push operation.
-     */
-    Long rpushx(K key, V... values);
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisScriptingAsyncConnection.java b/src/main/java/com/lambdaworks/redis/RedisScriptingAsyncConnection.java
deleted file mode 100644
index 52cb17b7c1..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisScriptingAsyncConnection.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.List;
-
-import com.lambdaworks.redis.api.async.RedisScriptingAsyncCommands;
-
-/**
- * Asynchronous executed commands for Scripting.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@literal RedisScriptingAsyncCommands}
- */
-@Deprecated
-public interface RedisScriptingAsyncConnection<K, V> {
-    /**
-     * Execute a Lua script server side.
-     * 
-     * @param script Lua 5.1 script.
-     * @param type output type
-     * @param keys key names
-     * @param <T> expected return type
-     * @return script result
-     */
-    <T> RedisFuture<T> eval(String script, ScriptOutputType type, K... keys);
-
-    /**
-     * Execute a Lua script server side.
-     * 
-     * @param script Lua 5.1 script.
-     * @param type the type
-     * @param keys the keys
-     * @param values the values
-     * @param <T> expected return type
-     * @return script result
-     */
-    <T> RedisFuture<T> eval(String script, ScriptOutputType type, K[] keys, V... values);
-
-    /**
-     * Evaluates a script cached on the server side by its SHA1 digest
-     * 
-     * @param digest SHA1 of the script
-     * @param type the type
-     * @param keys the keys
-     * @param <T> expected return type
-     * @return script result
-     */
-    <T> RedisFuture<T> evalsha(String digest, ScriptOutputType type, K... keys);
-
-    /**
-     * Execute a Lua script server side.
-     * 
-     * @param digest SHA1 of the script
-     * @param type the type
-     * @param keys the keys
-     * @param values the values
-     * @param <T> expected return type
-     * @return script result
-     */
-    <T> RedisFuture<T> evalsha(String digest, ScriptOutputType type, K[] keys, V... values);
-
-    /**
-     * Check existence of scripts in the script cache.
-     * 
-     * @param digests script digests
-     * @return RedisFuture&lt;List&lt;Boolean&gt;&gt; array-reply The command returns an array of integers that correspond to
-     *         the specified SHA1 digest arguments. For every corresponding SHA1 digest of a script that actually exists in the
-     *         script cache, an 1 is returned, otherwise 0 is returned.
-     */
-    RedisFuture<List<Boolean>> scriptExists(String... digests);
-
-    /**
-     * Remove all the scripts from the script cache.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply
-     */
-    RedisFuture<String> scriptFlush();
-
-    /**
-     * Kill the script currently in execution.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply
-     */
-    RedisFuture<String> scriptKill();
-
-    /**
-     * Load the specified Lua script into the script cache.
-     * 
-     * @param script script content
-     * @return RedisFuture&lt;String&gt; bulk-string-reply This command returns the SHA1 digest of the script added into the
-     *         script cache.
-     */
-    RedisFuture<String> scriptLoad(V script);
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisScriptingConnection.java b/src/main/java/com/lambdaworks/redis/RedisScriptingConnection.java
deleted file mode 100644
index 04e3fd8b75..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisScriptingConnection.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.List;
-
-import com.lambdaworks.redis.api.sync.RedisScriptingCommands;
-
-/**
- * Synchronous executed commands for Scripting.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link RedisScriptingCommands}
- */
-@Deprecated
-public interface RedisScriptingConnection<K, V> {
-    /**
-     * Execute a Lua script server side.
-     * 
-     * @param script Lua 5.1 script.
-     * @param type output type
-     * @param keys key names
-     * @param <T> expected return type
-     * @return script result
-     */
-    <T> T eval(String script, ScriptOutputType type, K... keys);
-
-    /**
-     * Execute a Lua script server side.
-     * 
-     * @param script Lua 5.1 script.
-     * @param type the type
-     * @param keys the keys
-     * @param values the values
-     * @param <T> expected return type
-     * @return script result
-     */
-    <T> T eval(String script, ScriptOutputType type, K[] keys, V... values);
-
-    /**
-     * Evaluates a script cached on the server side by its SHA1 digest
-     * 
-     * @param digest SHA1 of the script
-     * @param type the type
-     * @param keys the keys
-     * @param <T> expected return type
-     * @return script result
-     */
-    <T> T evalsha(String digest, ScriptOutputType type, K... keys);
-
-    /**
-     * Execute a Lua script server side.
-     * 
-     * @param digest SHA1 of the script
-     * @param type the type
-     * @param keys the keys
-     * @param values the values
-     * @param <T> expected return type
-     * @return script result
-     */
-    <T> T evalsha(String digest, ScriptOutputType type, K[] keys, V... values);
-
-    /**
-     * Check existence of scripts in the script cache.
-     * 
-     * @param digests script digests
-     * @return List&lt;Boolean&gt; array-reply The command returns an array of integers that correspond to the specified SHA1
-     *         digest arguments. For every corresponding SHA1 digest of a script that actually exists in the script cache, an 1
-     *         is returned, otherwise 0 is returned.
-     */
-    List<Boolean> scriptExists(String... digests);
-
-    /**
-     * Remove all the scripts from the script cache.
-     * 
-     * @return String simple-string-reply
-     */
-    String scriptFlush();
-
-    /**
-     * Kill the script currently in execution.
-     * 
-     * @return String simple-string-reply
-     */
-    String scriptKill();
-
-    /**
-     * Load the specified Lua script into the script cache.
-     * 
-     * @param script script content
-     * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
-     */
-    String scriptLoad(V script);
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisSentinelAsyncConnection.java b/src/main/java/com/lambdaworks/redis/RedisSentinelAsyncConnection.java
deleted file mode 100644
index 051b210fb6..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisSentinelAsyncConnection.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.io.Closeable;
-import java.net.SocketAddress;
-import java.util.List;
-import java.util.Map;
-
-import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
-
-/**
- * Asynchronous executed commands for Sentinel.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link RedisSentinelAsyncCommands}
- */
-@Deprecated
-public interface RedisSentinelAsyncConnection<K, V> extends Closeable {
-
-    /**
-     * Return the ip and port number of the master with that name.
-     * 
-     * @param key the key
-     * @return Future&lt;SocketAddress&gt;
-     */
-    RedisFuture<SocketAddress> getMasterAddrByName(K key);
-
-    /**
-     * Enumerates all the monitored masters and their states.
-     * 
-     * @return RedisFuture&lt;Map&lt;K, V&gt;&gt;
-     */
-    RedisFuture<List<Map<K, V>>> masters();
-
-    /**
-     * Show the state and info of the specified master.
-     * 
-     * @param key the key
-     * @return RedisFuture&lt;Map&lt;K, V&gt;&gt;
-     */
-    RedisFuture<Map<K, V>> master(K key);
-
-    /**
-     * Provides a list of slaves for the master with the specified name.
-     * 
-     * @param key the key
-     * @return RedisFuture&lt;List&lt;Map&lt;K, V&gt;&gt;&gt;
-     */
-    RedisFuture<List<Map<K, V>>> slaves(K key);
-
-    /**
-     * This command will reset all the masters with matching name.
-     * 
-     * @param key the key
-     * @return RedisFuture&lt;Long&gt;
-     */
-    RedisFuture<Long> reset(K key);
-
-    /**
-     * Perform a failover.
-     * 
-     * @param key the master id
-     * @return RedisFuture&lt;String&gt;
-     */
-    RedisFuture<String> failover(K key);
-
-    /**
-     * This command tells the Sentinel to start monitoring a new master with the specified name, ip, port, and quorum.
-     * 
-     * @param key the key
-     * @param ip the IP address
-     * @param port the port
-     * @param quorum the quorum count
-     * @return RedisFuture&lt;String&gt;
-     */
-    RedisFuture<String> monitor(K key, String ip, int port, int quorum);
-
-    /**
-     * Multiple option / value pairs can be specified (or none at all).
-     * 
-     * @param key the key
-     * @param option the option
-     * @param value the value
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply {@code OK} if {@code SET} was executed correctly.
-     */
-    RedisFuture<String> set(K key, String option, V value);
-
-    /**
-     * remove the specified master.
-     * 
-     * @param key the key
-     * @return RedisFuture&lt;String&gt;
-     */
-    RedisFuture<String> remove(K key);
-
-    /**
-     * Ping the server.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply
-     */
-    RedisFuture<String> ping();
-
-    @Override
-    void close();
-
-    /**
-     *
-     * @return true if the connection is open (connected and not closed).
-     */
-    boolean isOpen();
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisServerAsyncConnection.java b/src/main/java/com/lambdaworks/redis/RedisServerAsyncConnection.java
deleted file mode 100644
index b4ca65b0c2..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisServerAsyncConnection.java
+++ /dev/null
@@ -1,304 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.Date;
-import java.util.List;
-
-import com.lambdaworks.redis.api.async.RedisServerAsyncCommands;
-import com.lambdaworks.redis.protocol.CommandType;
-
-/**
- * Asynchronous executed commands for Server Control.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link RedisServerAsyncCommands}
- */
-@Deprecated
-public interface RedisServerAsyncConnection<K, V> {
-    /**
-     * Asynchronously rewrite the append-only file.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply always {@code OK}.
-     */
-    RedisFuture<String> bgrewriteaof();
-
-    /**
-     * Asynchronously save the dataset to disk.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply
-     */
-    RedisFuture<String> bgsave();
-
-    /**
-     * Get the current connection name.
-     * 
-     * @return RedisFuture&lt;K&gt; bulk-string-reply The connection name, or a null bulk reply if no name is set.
-     */
-    RedisFuture<K> clientGetname();
-
-    /**
-     * Set the current connection name.
-     * 
-     * @param name the client name
-     * @return RedisFuture&lt;String&gt; simple-string-reply {@code OK} if the connection name was successfully set.
-     */
-    RedisFuture<String> clientSetname(K name);
-
-    /**
-     * Kill the connection of a client identified by ip:port.
-     * 
-     * @param addr the addr in format ip:port
-     * @return RedisFuture&lt;String&gt; simple-string-reply {@code OK} if the connection exists and has been closed
-     */
-    RedisFuture<String> clientKill(String addr);
-
-    /**
-     * Kill connections of clients which are filtered by {@code killArgs}
-     *
-     * @param killArgs args for the kill operation
-     * @return RedisFuture&lt;Long&gt; integer-reply number of killed connections
-     */
-    RedisFuture<Long> clientKill(KillArgs killArgs);
-
-    /**
-     * Stop processing commands from clients for some time.
-     * 
-     * @param timeout the timeout value in milliseconds
-     * @return RedisFuture&lt;String&gt; simple-string-reply The command returns OK or an error if the timeout is invalid.
-     */
-    RedisFuture<String> clientPause(long timeout);
-
-    /**
-     * Get the list of client connections.
-     * 
-     * @return RedisFuture&lt;String&gt; bulk-string-reply a unique string, formatted as follows: One client connection per line
-     *         (separated by LF), each line is composed of a succession of property=value fields separated by a space character.
-     */
-    RedisFuture<String> clientList();
-
-    /**
-     * Returns an array reply of details about all Redis commands.
-     * 
-     * @return RedisFuture&lt;List&lt;Object&gt;&gt; array-reply
-     */
-    RedisFuture<List<Object>> command();
-
-    /**
-     * Returns an array reply of details about the requested commands.
-     *
-     * @param commands the commands to query for
-     * @return RedisFuture&lt;List&lt;Object&gt;&gt; array-reply
-     */
-    RedisFuture<List<Object>> commandInfo(String... commands);
-
-    /**
-     * Returns an array reply of details about the requested commands.
-     *
-     * @param commands the commands to query for
-     * @return RedisFuture&lt;List&lt;Object&gt;&gt; array-reply
-     */
-    RedisFuture<List<Object>> commandInfo(CommandType... commands);
-
-    /**
-     * Get total number of Redis commands.
-     * 
-     * @return RedisFuture&lt;Long&gt; integer-reply of number of total commands in this Redis server.
-     */
-    RedisFuture<Long> commandCount();
-
-    /**
-     * Get the value of a configuration parameter.
-     * 
-     * @param parameter the parameter
-     * @return RedisFuture&lt;List&lt;String&gt;&gt; bulk-string-reply
-     */
-    RedisFuture<List<String>> configGet(String parameter);
-
-    /**
-     * Reset the stats returned by INFO.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply always {@code OK}.
-     */
-    RedisFuture<String> configResetstat();
-
-    /**
-     * Rewrite the configuration file with the in memory configuration.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply {@code OK} when the configuration was rewritten properly. Otherwise
-     *         an error is returned.
-     */
-    RedisFuture<String> configRewrite();
-
-    /**
-     * Set a configuration parameter to the given value.
-     * 
-     * @param parameter the parameter name
-     * @param value the parameter value
-     * @return RedisFuture&lt;String&gt; simple-string-reply: {@code OK} when the configuration was set properly. Otherwise an
-     *         error is returned.
-     */
-    RedisFuture<String> configSet(String parameter, String value);
-
-    /**
-     * Return the number of keys in the selected database.
-     * 
-     * @return RedisFuture&lt;Long&gt; integer-reply
-     */
-    RedisFuture<Long> dbsize();
-
-    /**
-     * Get debugging information about a key.
-     * 
-     * @param key the key
-     * @return RedisFuture&lt;String&gt; simple-string-reply
-     */
-    RedisFuture<String> debugObject(K key);
-
-    /**
-     * Make the server crash: Invalid pointer access.
-     */
-    void debugSegfault();
-
-    /**
-     * Make the server crash: Out of memory.
-     */
-    void debugOom();
-
-    /**
-     * Get debugging information about the internal hash-table state.
-     *
-     * @param db the database number
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> debugHtstats(int db);
-
-    /**
-     * Remove all keys from all databases.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply
-     */
-    RedisFuture<String> flushall();
-
-    /**
-     * Remove all keys asynchronously from all databases.
-     *
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> flushallAsync();
-
-    /**
-     * Remove all keys from the current database.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply
-     */
-    RedisFuture<String> flushdb();
-
-    /**
-     * Remove all keys asynchronously from the current database.
-     *
-     * @return String simple-string-reply
-     */
-    RedisFuture<String> flushdbAsync();
-
-    /**
-     * Get information and statistics about the server.
-     * 
-     * @return RedisFuture&lt;String&gt; bulk-string-reply as a collection of text lines.
-     */
-    RedisFuture<String> info();
-
-    /**
-     * Get information and statistics about the server.
-     * 
-     * @param section the section type: string
-     * @return RedisFuture&lt;String&gt; bulk-string-reply as a collection of text lines.
-     */
-    RedisFuture<String> info(String section);
-
-    /**
-     * Get the UNIX time stamp of the last successful save to disk.
-     * 
-     * @return RedisFuture&lt;Date&gt; integer-reply an UNIX time stamp.
-     */
-    RedisFuture<Date> lastsave();
-
-    /**
-     * Synchronously save the dataset to disk.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply The commands returns OK on success.
-     */
-    RedisFuture<String> save();
-
-    /**
-     * Synchronously save the dataset to disk and then shut down the server.
-     * 
-     * @param save {@literal true} force save operation
-     */
-    void shutdown(boolean save);
-
-    /**
-     * Make the server a slave of another instance.
-     * 
-     * @param host the host type: string
-     * @param port the port type: string
-     * @return RedisFuture&lt;String&gt; simple-string-reply
-     */
-    RedisFuture<String> slaveof(String host, int port);
-
-    /**
-     * Promote server as master.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply
-     */
-    RedisFuture<String> slaveofNoOne();
-
-    /**
-     * Read the slow log.
-     * 
-     * @return List&lt;Object&gt; deeply nested multi bulk replies
-     */
-    RedisFuture<List<Object>> slowlogGet();
-
-    /**
-     * Read the slow log.
-     * 
-     * @param count the count
-     * @return List&lt;Object&gt; deeply nested multi bulk replies
-     */
-    RedisFuture<List<Object>> slowlogGet(int count);
-
-    /**
-     * Obtaining the current length of the slow log.
-     * 
-     * @return RedisFuture&lt;Long&gt; length of the slow log.
-     */
-    RedisFuture<Long> slowlogLen();
-
-    /**
-     * Resetting the slow log.
-     * 
-     * @return RedisFuture&lt;String&gt; simple-string-reply The commands returns OK on success.
-     */
-    RedisFuture<String> slowlogReset();
-
-    /**
-     * Internal command used for replication.
-     * 
-     * @return RedisFuture&lt;String&gt;
-     */
-    @Deprecated
-    RedisFuture<String> sync();
-
-    /**
-     * Return the current server time.
-     * 
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply specifically:
-     * 
-     *         A multi bulk reply containing two elements:
-     * 
-     *         unix time in seconds. microseconds.
-     */
-    RedisFuture<List<V>> time();
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisServerConnection.java b/src/main/java/com/lambdaworks/redis/RedisServerConnection.java
deleted file mode 100644
index 0a3f393fa0..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisServerConnection.java
+++ /dev/null
@@ -1,304 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.Date;
-import java.util.List;
-
-import com.lambdaworks.redis.api.sync.RedisServerCommands;
-import com.lambdaworks.redis.protocol.CommandType;
-
-/**
- * Synchronous executed commands for Server Control.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link RedisServerCommands}
- */
-@Deprecated
-public interface RedisServerConnection<K, V> extends RedisServerCommands<K, V> {
-    /**
-     * Asynchronously rewrite the append-only file.
-     * 
-     * @return String simple-string-reply always {@code OK}.
-     */
-    String bgrewriteaof();
-
-    /**
-     * Asynchronously save the dataset to disk.
-     * 
-     * @return String simple-string-reply
-     */
-    String bgsave();
-
-    /**
-     * Get the current connection name.
-     * 
-     * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set.
-     */
-    K clientGetname();
-
-    /**
-     * Set the current connection name.
-     * 
-     * @param name the client name
-     * @return simple-string-reply {@code OK} if the connection name was successfully set.
-     */
-    String clientSetname(K name);
-
-    /**
-     * Kill the connection of a client identified by ip:port.
-     * 
-     * @param addr ip:port
-     * @return String simple-string-reply {@code OK} if the connection exists and has been closed
-     */
-    String clientKill(String addr);
-
-    /**
-     * Kill connections of clients which are filtered by {@code killArgs}
-     *
-     * @param killArgs args for the kill operation
-     * @return Long integer-reply number of killed connections
-     */
-    Long clientKill(KillArgs killArgs);
-
-    /**
-     * Stop processing commands from clients for some time.
-     * 
-     * @param timeout the timeout value in milliseconds
-     * @return String simple-string-reply The command returns OK or an error if the timeout is invalid.
-     */
-    String clientPause(long timeout);
-
-    /**
-     * Get the list of client connections.
-     * 
-     * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF),
-     *         each line is composed of a succession of property=value fields separated by a space character.
-     */
-    String clientList();
-
-    /**
-     * Returns an array reply of details about all Redis commands.
-     * 
-     * @return List&lt;Object&gt; array-reply
-     */
-    List<Object> command();
-
-    /**
-     * Returns an array reply of details about the requested commands.
-     * 
-     * @param commands the commands to query for
-     * @return List&lt;Object&gt; array-reply
-     */
-    List<Object> commandInfo(String... commands);
-
-    /**
-     * Returns an array reply of details about the requested commands.
-     * 
-     * @param commands the commands to query for
-     * @return List&lt;Object&gt; array-reply
-     */
-    List<Object> commandInfo(CommandType... commands);
-
-    /**
-     * Get total number of Redis commands.
-     * 
-     * @return Long integer-reply of number of total commands in this Redis server.
-     */
-    Long commandCount();
-
-    /**
-     * Get the value of a configuration parameter.
-     * 
-     * @param parameter name of the parameter
-     * @return List&lt;String&gt; bulk-string-reply
-     */
-    List<String> configGet(String parameter);
-
-    /**
-     * Reset the stats returned by INFO.
-     * 
-     * @return String simple-string-reply always {@code OK}.
-     */
-    String configResetstat();
-
-    /**
-     * Rewrite the configuration file with the in memory configuration.
-     * 
-     * @return String simple-string-reply {@code OK} when the configuration was rewritten properly. Otherwise an error is
-     *         returned.
-     */
-    String configRewrite();
-
-    /**
-     * Set a configuration parameter to the given value.
-     * 
-     * @param parameter the parameter name
-     * @param value the parameter value
-     * @return String simple-string-reply: {@code OK} when the configuration was set properly. Otherwise an error is returned.
-     */
-    String configSet(String parameter, String value);
-
-    /**
-     * Return the number of keys in the selected database.
-     * 
-     * @return Long integer-reply
-     */
-    Long dbsize();
-
-    /**
-     * Get debugging information about a key.
-     * 
-     * @param key the key
-     * @return String simple-string-reply
-     */
-    String debugObject(K key);
-
-    /**
-     * Make the server crash: Invalid pointer access.
-     */
-    void debugSegfault();
-
-    /**
-     * Make the server crash: Out of memory.
-     */
-    void debugOom();
-
-    /**
-     * Get debugging information about the internal hash-table state.
-     *
-     * @param db the database number
-     * @return String simple-string-reply
-     */
-    String debugHtstats(int db);
-
-    /**
-     * Remove all keys from all databases.
-     * 
-     * @return String simple-string-reply
-     */
-    String flushall();
-
-    /**
-     * Remove all keys asynchronously from all databases.
-     *
-     * @return String simple-string-reply
-     */
-    String flushallAsync();
-
-    /**
-     * Remove all keys from the current database.
-     * 
-     * @return String simple-string-reply
-     */
-    String flushdb();
-
-    /**
-     * Remove all keys asynchronously from the current database.
-     *
-     * @return String simple-string-reply
-     */
-    String flushdbAsync();
-
-    /**
-     * Get information and statistics about the server.
-     * 
-     * @return String bulk-string-reply as a collection of text lines.
-     */
-    String info();
-
-    /**
-     * Get information and statistics about the server.
-     * 
-     * @param section the section type: string
-     * @return String bulk-string-reply as a collection of text lines.
-     */
-    String info(String section);
-
-    /**
-     * Get the UNIX time stamp of the last successful save to disk.
-     * 
-     * @return Date integer-reply an UNIX time stamp.
-     */
-    Date lastsave();
-
-    /**
-     * Synchronously save the dataset to disk.
-     * 
-     * @return String simple-string-reply The commands returns OK on success.
-     */
-    String save();
-
-    /**
-     * Synchronously save the dataset to disk and then shut down the server.
-     * 
-     * @param save {@literal true} force save operation
-     */
-    void shutdown(boolean save);
-
-    /**
-     * Make the server a slave of another instance, or promote it as master.
-     * 
-     * @param host the host type: string
-     * @param port the port type: string
-     * @return String simple-string-reply
-     */
-    String slaveof(String host, int port);
-
-    /**
-     * Promote server as master.
-     * 
-     * @return String simple-string-reply
-     */
-    String slaveofNoOne();
-
-    /**
-     * Read the slow log.
-     * 
-     * @return List&lt;Object&gt; deeply nested multi bulk replies
-     */
-    List<Object> slowlogGet();
-
-    /**
-     * Read the slow log.
-     * 
-     * @param count the count
-     * @return List&lt;Object&gt; deeply nested multi bulk replies
-     */
-    List<Object> slowlogGet(int count);
-
-    /**
-     * Obtaining the current length of the slow log.
-     * 
-     * @return Long length of the slow log.
-     */
-    Long slowlogLen();
-
-    /**
-     * Resetting the slow log.
-     * 
-     * @return String simple-string-reply The commands returns OK on success.
-     */
-    String slowlogReset();
-
-    /**
-     * Internal command used for replication.
-     * 
-     * @return String simple-string-reply
-     */
-    @Deprecated
-    String sync();
-
-    /**
-     * Return the current server time.
-     * 
-     * @return List&lt;V&gt; array-reply specifically:
-     * 
-     *         A multi bulk reply containing two elements:
-     * 
-     *         unix time in seconds. microseconds.
-     */
-    List<V> time();
-
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisSetsAsyncConnection.java b/src/main/java/com/lambdaworks/redis/RedisSetsAsyncConnection.java
deleted file mode 100644
index 1a5c4aa759..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisSetsAsyncConnection.java
+++ /dev/null
@@ -1,292 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.List;
-import java.util.Set;
-
-import com.lambdaworks.redis.api.async.RedisSetAsyncCommands;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
-
-/**
- * Asynchronous executed commands for Sets.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link RedisSetAsyncCommands}
- */
-@Deprecated
-public interface RedisSetsAsyncConnection<K, V> {
-
-    /**
-     * Add one or more members to a set.
-     * 
-     * @param key the key
-     * @param members the member type: value
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of elements that were added to the set, not including all the
-     *         elements already present into the set.
-     */
-    RedisFuture<Long> sadd(K key, V... members);
-
-    /**
-     * Get the number of members in a set.
-     * 
-     * @param key the key
-     * @return RedisFuture&lt;Long&gt; integer-reply the cardinality (number of elements) of the set, or {@literal false} if
-     *         {@code key} does not exist.
-     */
-    RedisFuture<Long> scard(K key);
-
-    /**
-     * Subtract multiple sets.
-     * 
-     * @param keys the key
-     * @return RedisFuture&lt;Set&lt;V&gt;&gt; array-reply list with members of the resulting set.
-     */
-    RedisFuture<Set<V>> sdiff(K... keys);
-
-    /**
-     * Subtract multiple sets.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param keys the keys
-     * @return RedisFuture&lt;Long&gt; count of members of the resulting set.
-     */
-    RedisFuture<Long> sdiff(ValueStreamingChannel<V> channel, K... keys);
-
-    /**
-     * Subtract multiple sets and store the resulting set in a key.
-     * 
-     * @param destination the destination type: key
-     * @param keys the key
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of elements in the resulting set.
-     */
-    RedisFuture<Long> sdiffstore(K destination, K... keys);
-
-    /**
-     * Intersect multiple sets.
-     * 
-     * @param keys the key
-     * @return RedisFuture&lt;Set&lt;V&gt;&gt; array-reply list with members of the resulting set.
-     */
-    RedisFuture<Set<V>> sinter(K... keys);
-
-    /**
-     * Intersect multiple sets.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param keys the keys
-     * @return RedisFuture&lt;Long&gt; count of members of the resulting set.
-     */
-    RedisFuture<Long> sinter(ValueStreamingChannel<V> channel, K... keys);
-
-    /**
-     * Intersect multiple sets and store the resulting set in a key.
-     * 
-     * @param destination the destination type: key
-     * @param keys the key
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of elements in the resulting set.
-     */
-    RedisFuture<Long> sinterstore(K destination, K... keys);
-
-    /**
-     * Determine if a given value is a member of a set.
-     * 
-     * @param key the key
-     * @param member the member type: value
-     * @return RedisFuture&lt;Boolean&gt; integer-reply specifically:
-     * 
-     *         {@literal true} if the element is a member of the set. {@literal false} if the element is not a member of the
-     *         set, or if {@code key} does not exist.
-     */
-    RedisFuture<Boolean> sismember(K key, V member);
-
-    /**
-     * Move a member from one set to another.
-     * 
-     * @param source the source key
-     * @param destination the destination type: key
-     * @param member the member type: value
-     * @return RedisFuture&lt;Boolean&gt; integer-reply specifically:
-     * 
-     *         {@literal true} if the element is moved. {@literal false} if the element is not a member of {@code source} and no
-     *         operation was performed.
-     */
-    RedisFuture<Boolean> smove(K source, K destination, V member);
-
-    /**
-     * Get all the members in a set.
-     * 
-     * @param key the key
-     * @return RedisFuture&lt;Set&lt;V&gt;&gt; array-reply all elements of the set.
-     */
-    RedisFuture<Set<V>> smembers(K key);
-
-    /**
-     * Get all the members in a set.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @return RedisFuture&lt;Long&gt; count of members of the resulting set.
-     */
-    RedisFuture<Long> smembers(ValueStreamingChannel<V> channel, K key);
-
-    /**
-     * Remove and return a random member from a set.
-     * 
-     * @param key the key
-     * @return RedisFuture&lt;V&gt; bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist.
-     */
-    RedisFuture<V> spop(K key);
-
-    /**
-     * Remove and return one or multiple random members from a set.
-     *
-     * @param key the key
-     * @param count number of members to pop
-     * @return RedisFuture&lt;Set&lt;V&gt;&gt; bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist.
-     */
-    RedisFuture<Set<V>> spop(K key, long count);
-
-    /**
-     * Get one or multiple random members from a set.
-     * 
-     * @param key the key
-     * 
-     * @return RedisFuture&lt;V&gt; bulk-string-reply without the additional {@code count} argument the command returns a Bulk
-     *         Reply with the randomly selected element, or {@literal null} when {@code key} does not exist.
-     */
-    RedisFuture<V> srandmember(K key);
-
-    /**
-     * Get one or multiple random members from a set.
-     *
-     * @param key the key
-     * @param count the count type: long
-     * @return RedisFuture&lt;Set&lt;V&gt;&gt; bulk-string-reply without the additional {@code count} argument the command
-     *         returns a Bulk Reply with the randomly selected element, or {@literal null} when {@code key} does not exist.
-     */
-    RedisFuture<List<V>> srandmember(K key, long count);
-
-    /**
-     * Get one or multiple random members from a set.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param count the count
-     * @return RedisFuture&lt;Long&gt; count of members of the resulting set.
-     */
-    RedisFuture<Long> srandmember(ValueStreamingChannel<V> channel, K key, long count);
-
-    /**
-     * Remove one or more members from a set.
-     * 
-     * @param key the key
-     * @param members the member type: value
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of members that were removed from the set, not including non
-     *         existing members.
-     */
-    RedisFuture<Long> srem(K key, V... members);
-
-    /**
-     * Add multiple sets.
-     * 
-     * @param keys the key
-     * @return RedisFuture&lt;Set&lt;V&gt;&gt; array-reply list with members of the resulting set.
-     */
-    RedisFuture<Set<V>> sunion(K... keys);
-
-    /**
-     * Add multiple sets.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param keys the key
-     * @return RedisFuture&lt;Long&gt; count of members of the resulting set.
-     */
-    RedisFuture<Long> sunion(ValueStreamingChannel<V> channel, K... keys);
-
-    /**
-     * Add multiple sets and store the resulting set in a key.
-     * 
-     * @param destination the destination type: key
-     * @param keys the key
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of elements in the resulting set.
-     */
-    RedisFuture<Long> sunionstore(K destination, K... keys);
-
-    /**
-     * Incrementally iterate Set elements.
-     * 
-     * @param key the key
-     * @return RedisFuture&lt;ValueScanCursor&gt;V&lt;&gt; scan cursor.
-     */
-    RedisFuture<ValueScanCursor<V>> sscan(K key);
-
-    /**
-     * Incrementally iterate Set elements.
-     * 
-     * @param key the key
-     * @param scanArgs scan arguments
-     * @return RedisFuture&lt;ValueScanCursor&gt;V&lt;&gt; scan cursor.
-     */
-    RedisFuture<ValueScanCursor<V>> sscan(K key, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate Set elements.
-     * 
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @param scanArgs scan arguments
-     * @return RedisFuture&lt;ValueScanCursor&gt;V&lt;&gt; scan cursor.
-     */
-    RedisFuture<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate Set elements.
-     * 
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @return RedisFuture&lt;ValueScanCursor&gt;V&lt;&gt; scan cursor.
-     */
-    RedisFuture<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor);
-
-    /**
-     * Incrementally iterate Set elements.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @return RedisFuture&lt;StreamScanCursor&gt; scan cursor.
-     */
-    RedisFuture<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key);
-
-    /**
-     * Incrementally iterate Set elements.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param scanArgs scan arguments
-     * @return RedisFuture&lt;StreamScanCursor&gt; scan cursor.
-     */
-    RedisFuture<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate Set elements.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @param scanArgs scan arguments
-     * @return RedisFuture&lt;StreamScanCursor&gt; scan cursor.
-     */
-    RedisFuture<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate Set elements.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @return RedisFuture&lt;StreamScanCursor&gt; scan cursor.
-     */
-    RedisFuture<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisSetsConnection.java b/src/main/java/com/lambdaworks/redis/RedisSetsConnection.java
deleted file mode 100644
index 9104cb8d02..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisSetsConnection.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.List;
-import java.util.Set;
-
-import com.lambdaworks.redis.api.sync.RedisSetCommands;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
-
-/**
- * Synchronous executed commands for Sets.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link RedisSetCommands}
- */
-@Deprecated
-public interface RedisSetsConnection<K, V> {
-
-    /**
-     * Add one or more members to a set.
-     * 
-     * @param key the key
-     * @param members the member type: value
-     * @return Long integer-reply the number of elements that were added to the set, not including all the elements already
-     *         present into the set.
-     */
-    Long sadd(K key, V... members);
-
-    /**
-     * Get the number of members in a set.
-     * 
-     * @param key the key
-     * @return Long integer-reply the cardinality (number of elements) of the set, or {@literal false} if {@code key} does not
-     *         exist.
-     */
-    Long scard(K key);
-
-    /**
-     * Subtract multiple sets.
-     * 
-     * @param keys the key
-     * @return Set&lt;V&gt; array-reply list with members of the resulting set.
-     */
-    Set<V> sdiff(K... keys);
-
-    /**
-     * Subtract multiple sets.
-     * 
-     * @param channel the channel
-     * @param keys the keys
-     * @return Long count of members of the resulting set.
-     */
-    Long sdiff(ValueStreamingChannel<V> channel, K... keys);
-
-    /**
-     * Subtract multiple sets and store the resulting set in a key.
-     * 
-     * @param destination the destination type: key
-     * @param keys the key
-     * @return Long integer-reply the number of elements in the resulting set.
-     */
-    Long sdiffstore(K destination, K... keys);
-
-    /**
-     * Intersect multiple sets.
-     * 
-     * @param keys the key
-     * @return Set&lt;V&gt; array-reply list with members of the resulting set.
-     */
-    Set<V> sinter(K... keys);
-
-    /**
-     * Intersect multiple sets.
-     * 
-     * @param channel the channel
-     * @param keys the keys
-     * @return Long count of members of the resulting set.
-     */
-    Long sinter(ValueStreamingChannel<V> channel, K... keys);
-
-    /**
-     * Intersect multiple sets and store the resulting set in a key.
-     * 
-     * @param destination the destination type: key
-     * @param keys the key
-     * @return Long integer-reply the number of elements in the resulting set.
-     */
-    Long sinterstore(K destination, K... keys);
-
-    /**
-     * Determine if a given value is a member of a set.
-     * 
-     * @param key the key
-     * @param member the member type: value
-     * @return Boolean integer-reply specifically:
-     * 
-     *         {@literal true} if the element is a member of the set. {@literal false} if the element is not a member of the
-     *         set, or if {@code key} does not exist.
-     */
-    Boolean sismember(K key, V member);
-
-    /**
-     * Move a member from one set to another.
-     * 
-     * @param source the source key
-     * @param destination the destination type: key
-     * @param member the member type: value
-     * @return Boolean integer-reply specifically:
-     * 
-     *         {@literal true} if the element is moved. {@literal false} if the element is not a member of {@code source} and no
-     *         operation was performed.
-     */
-    Boolean smove(K source, K destination, V member);
-
-    /**
-     * Get all the members in a set.
-     * 
-     * @param key the key
-     * @return Set&lt;V&gt; array-reply all elements of the set.
-     */
-    Set<V> smembers(K key);
-
-    /**
-     * Get all the members in a set.
-     * 
-     * @param channel the channel
-     * @param key the keys
-     * @return Long count of members of the resulting set.
-     */
-    Long smembers(ValueStreamingChannel<V> channel, K key);
-
-    /**
-     * Remove and return a random member from a set.
-     * 
-     * @param key the key
-     * @return V bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist.
-     */
-    V spop(K key);
-
-    /**
-     * Remove and return one or multiple random members from a set.
-     *
-     * @param key the key
-     * @param count number of members to pop
-     * @return Set&lt;V&gt; bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist.
-     */
-    Set<V> spop(K key, long count);
-
-    /**
-     * Get one or multiple random members from a set.
-     * 
-     * @param key the key
-     * 
-     * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply with the
-     *         randomly selected element, or {@literal null} when {@code key} does not exist.
-     */
-    V srandmember(K key);
-
-    /**
-     * Get one or multiple random members from a set.
-     * 
-     * @param key the key
-     * @param count the count type: long
-     * @return Set&lt;V&gt; bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply
-     *         with the randomly selected element, or {@literal null} when {@code key} does not exist.
-     */
-    List<V> srandmember(K key, long count);
-
-    /**
-     * Get one or multiple random members from a set.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param count the count
-     * @return Long count of members of the resulting set.
-     */
-    Long srandmember(ValueStreamingChannel<V> channel, K key, long count);
-
-    /**
-     * Remove one or more members from a set.
-     * 
-     * @param key the key
-     * @param members the member type: value
-     * @return Long integer-reply the number of members that were removed from the set, not including non existing members.
-     */
-    Long srem(K key, V... members);
-
-    /**
-     * Add multiple sets.
-     * 
-     * @param keys the key
-     * @return Set&lt;V&gt; array-reply list with members of the resulting set.
-     */
-    Set<V> sunion(K... keys);
-
-    /**
-     * Add multiple sets.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param keys the keys
-     * @return Long count of members of the resulting set.
-     */
-    Long sunion(ValueStreamingChannel<V> channel, K... keys);
-
-    /**
-     * Add multiple sets and store the resulting set in a key.
-     * 
-     * @param destination the destination type: key
-     * @param keys the key
-     * @return Long integer-reply the number of elements in the resulting set.
-     */
-    Long sunionstore(K destination, K... keys);
-
-    /**
-     * Incrementally iterate Set elements.
-     * 
-     * @param key the key
-     * @return ValueScanCursor&lt;V&gt; scan cursor.
-     */
-    ValueScanCursor<V> sscan(K key);
-
-    /**
-     * Incrementally iterate Set elements.
-     * 
-     * @param key the key
-     * @param scanArgs scan arguments
-     * @return ValueScanCursor&lt;V&gt; scan cursor.
-     */
-    ValueScanCursor<V> sscan(K key, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate Set elements.
-     * 
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @param scanArgs scan arguments
-     * @return ValueScanCursor&lt;V&gt; scan cursor.
-     */
-    ValueScanCursor<V> sscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate Set elements.
-     * 
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @return ValueScanCursor&lt;V&gt; scan cursor.
-     */
-    ValueScanCursor<V> sscan(K key, ScanCursor scanCursor);
-
-    /**
-     * Incrementally iterate Set elements.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @return StreamScanCursor scan cursor.
-     */
-    StreamScanCursor sscan(ValueStreamingChannel<V> channel, K key);
-
-    /**
-     * Incrementally iterate Set elements.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param scanArgs scan arguments
-     * @return StreamScanCursor scan cursor.
-     */
-    StreamScanCursor sscan(ValueStreamingChannel<V> channel, K key, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate Set elements.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @param scanArgs scan arguments
-     * @return StreamScanCursor scan cursor.
-     */
-    StreamScanCursor sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate Set elements.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @return StreamScanCursor scan cursor.
-     */
-    StreamScanCursor sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisSortedSetsAsyncConnection.java b/src/main/java/com/lambdaworks/redis/RedisSortedSetsAsyncConnection.java
deleted file mode 100644
index e30e008c01..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisSortedSetsAsyncConnection.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.List;
-
-import com.lambdaworks.redis.api.async.RedisSortedSetAsyncCommands;
-import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
-
-/**
- * Asynchronous executed commands for Sorted Sets.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@literal RedisSortedSetAsyncCommands}
- */
-@Deprecated
-public interface RedisSortedSetsAsyncConnection<K, V> {
-    /**
-     * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
-     * @param key the key
-     * @param score the score
-     * @param member the member
-     * 
-     * @return RedisFuture&lt;Long&gt; integer-reply specifically:
-     * 
-     *         The number of elements added to the sorted sets, not including elements already existing for which the score was
-     *         updated.
-     */
-    RedisFuture<Long> zadd(K key, double score, V member);
-
-    /**
-     * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
-     * @param key the key
-     * @param scoresAndValues the scoresAndValue tuples (score,value,score,value,...)
-     * @return RedisFuture&lt;Long&gt; integer-reply specifically:
-     * 
-     *         The number of elements added to the sorted sets, not including elements already existing for which the score was
-     *         updated.
-     */
-    RedisFuture<Long> zadd(K key, Object... scoresAndValues);
-
-    /**
-     * Add one or more members to a sorted set, or update its score if it already exists.
-     *
-     * @param key the key
-     * @param zAddArgs arguments for zadd
-     * @param score the score
-     * @param member the member
-     *
-     * @return RedisFuture&lt;Long&gt; integer-reply specifically:
-     *
-     *         The number of elements added to the sorted sets, not including elements already existing for which the score was
-     *         updated.
-     */
-    RedisFuture<Long> zadd(K key, ZAddArgs zAddArgs, double score, V member);
-
-    /**
-     * Add one or more members to a sorted set, or update its score if it already exists.
-     *
-     * @param key the key
-     * @param zAddArgs arguments for zadd
-     * @param scoresAndValues the scoresAndValue tuples (score,value,score,value,...)
-     * @return RedisFuture&lt;Long&gt; integer-reply specifically:
-     *
-     *         The number of elements added to the sorted sets, not including elements already existing for which the score was
-     *         updated.
-     */
-    RedisFuture<Long> zadd(K key, ZAddArgs zAddArgs, Object... scoresAndValues);
-
-    /**
-     * ZADD acts like ZINCRBY
-     *
-     * @param key the key
-     * @param score the score
-     * @param member the member
-     *
-     * @return RedisFuture&lt;Long&gt; integer-reply specifically:
-     *
-     *         The total number of elements changed
-     */
-    RedisFuture<Double> zaddincr(K key, double score, V member);
-
-    /**
-     * Get the number of members in a sorted set.
-     * 
-     * @param key the key
-     * @return RedisFuture&lt;Long&gt; integer-reply the cardinality (number of elements) of the sorted set, or {@literal false}
-     *         if {@code key} does not exist.
-     */
-    RedisFuture<Long> zcard(K key);
-
-    /**
-     * Count the members in a sorted set with scores within the given values.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of elements in the specified score range.
-     */
-    RedisFuture<Long> zcount(K key, double min, double max);
-
-    /**
-     * Count the members in a sorted set with scores within the given values.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of elements in the specified score range.
-     */
-    RedisFuture<Long> zcount(K key, String min, String max);
-
-    /**
-     * Increment the score of a member in a sorted set.
-     * 
-     * @param key the key
-     * @param amount the increment type: long
-     * @param member the member type: key
-     * @return RedisFuture&lt;Double;&gt; bulk-string-reply the new score of {@code member} (a double precision floating point
-     *         number), represented as string.
-     */
-    RedisFuture<Double> zincrby(K key, double amount, K member);
-
-    /**
-     * Intersect multiple sorted sets and store the resulting sorted set in a new key.
-     * 
-     * @param destination the destination
-     * @param keys the keys
-     * 
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    RedisFuture<Long> zinterstore(K destination, K... keys);
-
-    /**
-     * Intersect multiple sorted sets and store the resulting sorted set in a new key.
-     * 
-     * @param destination the destination
-     * @param storeArgs the storeArgs
-     * @param keys the keys
-     * 
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    RedisFuture<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys);
-
-    /**
-     * Return a range of members in a sorted set, by index.
-     * 
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of elements in the specified range.
-     */
-    RedisFuture<List<V>> zrange(K key, long start, long stop);
-
-    /**
-     * Return a range of members in a sorted set, by index.
-     * 
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return RedisFuture&lt;List&lt;ScoredValue&lt;V&gt;&gt;&gt; array-reply list of elements in the specified range.
-     */
-    RedisFuture<List<ScoredValue<V>>> zrangeWithScores(K key, long start, long stop);
-
-    /**
-     * Return a range of members in a sorted set, by score.
-     *
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<V>> zrangebyscore(K key, double min, double max);
-
-    /**
-     * Return a range of members in a sorted set, by score.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<V>> zrangebyscore(K key, String min, String max);
-
-    /**
-     * Return a range of members in a sorted set, by score.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<V>> zrangebyscore(K key, double min, double max, long offset, long count);
-
-    /**
-     * Return a range of members in a sorted set, by score.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<V>> zrangebyscore(K key, String min, String max, long offset, long count);
-
-    /**
-     * Return a range of members with score in a sorted set, by score.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;List&lt;ScoredValue&lt;V&gt;&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max);
-
-    /**
-     * Return a range of members with score in a sorted set, by score.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;List&lt;ScoredValue&lt;V&gt;&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max);
-
-    /**
-     * Return a range of members with score in a sorted set, by score.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;List&lt;ScoredValue&lt;V&gt;&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
-
-    /**
-     * Return a range of members with score in a sorted set, by score.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;List&lt;ScoredValue&lt;V&gt;&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
-
-    /**
-     * Stream over a range of members in a sorted set, by index.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified range.
-     */
-    RedisFuture<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by index.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified range.
-     */
-    RedisFuture<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified score range.
-     */
-    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
-
-    /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified score range.
-     */
-    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
-
-    /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified score range.
-     */
-    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
-
-    /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified score range.
-     */
-    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified score range.
-     */
-    RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified score range.
-     */
-    RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified score range.
-     */
-    RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max,
-            long offset, long count);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified score range.
-     */
-    RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max,
-            long offset, long count);
-
-    /**
-     * Determine the index of a member in a sorted set.
-     * 
-     * @param key the key
-     * @param member the member type: value
-     * @return RedisFuture&lt;Long&gt; integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted
-     *         set or {@code key} does not exist,
-     */
-    RedisFuture<Long> zrank(K key, V member);
-
-    /**
-     * Remove one or more members from a sorted set.
-     * 
-     * @param key the key
-     * @param members the member type: value
-     * @return RedisFuture&lt;Long&gt; integer-reply specifically:
-     * 
-     *         The number of members removed from the sorted set, not including non existing members.
-     */
-    RedisFuture<Long> zrem(K key, V... members);
-
-    /**
-     * Remove all members in a sorted set within the given indexes.
-     * 
-     * @param key the key
-     * @param start the start type: long
-     * @param stop the stop type: long
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of elements removed.
-     */
-    RedisFuture<Long> zremrangebyrank(K key, long start, long stop);
-
-    /**
-     * Remove all members in a sorted set within the given scores.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of elements removed.
-     */
-    RedisFuture<Long> zremrangebyscore(K key, double min, double max);
-
-    /**
-     * Remove all members in a sorted set within the given scores.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of elements removed.
-     */
-    RedisFuture<Long> zremrangebyscore(K key, String min, String max);
-
-    /**
-     * Return a range of members in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of elements in the specified range.
-     */
-    RedisFuture<List<V>> zrevrange(K key, long start, long stop);
-
-    /**
-     * Return a range of members with scores in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of elements in the specified range.
-     */
-    RedisFuture<List<ScoredValue<V>>> zrevrangeWithScores(K key, long start, long stop);
-
-    /**
-     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<V>> zrevrangebyscore(K key, double max, double min);
-
-    /**
-     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<V>> zrevrangebyscore(K key, String max, String min);
-
-    /**
-     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<V>> zrevrangebyscore(K key, double max, double min, long offset, long count);
-
-    /**
-     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param max max score
-     * @param min min score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<V>> zrevrangebyscore(K key, String max, String min, long offset, long count);
-
-    /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param max max score
-     * @param min min score
-     * @return RedisFuture&lt;List&lt;ScoredValue&lt;V&gt;&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min);
-
-    /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param max max score
-     * @param min min score
-     * @return RedisFuture&lt;List&lt;ScoredValue&lt;V&gt;&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min);
-
-    /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param max max score
-     * @param min min score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;List&lt;ScoredValue&lt;V&gt;&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
-
-    /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param max max score
-     * @param min min score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;List&lt;ScoredValue&lt;V&gt;&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
-
-    /**
-     * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified range.
-     */
-    RedisFuture<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified range.
-     */
-    RedisFuture<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param max max score
-     * @param min min score
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified range.
-     */
-    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
-
-    /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified range.
-     */
-    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
-
-    /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified range.
-     */
-    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
-
-    /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified range.
-     */
-    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified range.
-     */
-    RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified range.
-     */
-    RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified range.
-     */
-    RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min,
-            long offset, long count);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;Long&gt; count of elements in the specified range.
-     */
-    RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min,
-            long offset, long count);
-
-    /**
-     * Determine the index of a member in a sorted set, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param member the member type: value
-     * @return RedisFuture&lt;Long&gt; integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted
-     *         set or {@code key} does not exist,
-     */
-    RedisFuture<Long> zrevrank(K key, V member);
-
-    /**
-     * Get the score associated with the given member in a sorted set.
-     * 
-     * @param key the key
-     * @param member the member type: value
-     * @return RedisFuture&lt;Double;&gt; bulk-string-reply the score of {@code member} (a double precision floating point
-     *         number), represented as string.
-     */
-    RedisFuture<Double> zscore(K key, V member);
-
-    /**
-     * Add multiple sorted sets and store the resulting sorted set in a new key.
-     *
-     * @param destination destination key
-     * @param keys source keys
-     * 
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    RedisFuture<Long> zunionstore(K destination, K... keys);
-
-    /**
-     * Add multiple sorted sets and store the resulting sorted set in a new key.
-     * 
-     * @param destination the destination
-     * @param storeArgs the storeArgs
-     * @param keys the keys
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    RedisFuture<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
-
-    /**
-     * Incrementally iterate sorted sets elements and associated scores.
-     * 
-     * @param key the key
-     * @return RedisFuture&lt;ScoredValueScanCursor&lt;V&gt;&gt; scan cursor.
-     */
-    RedisFuture<ScoredValueScanCursor<V>> zscan(K key);
-
-    /**
-     * Incrementally iterate sorted sets elements and associated scores.
-     * 
-     * @param key the key
-     * @param scanArgs scan arguments
-     * @return RedisFuture&lt;ScoredValueScanCursor&lt;V&gt;&gt; scan cursor.
-     */
-    RedisFuture<ScoredValueScanCursor<V>> zscan(K key, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate sorted sets elements and associated scores.
-     * 
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @param scanArgs scan arguments
-     * @return RedisFuture&lt;ScoredValueScanCursor&lt;V&gt;&gt; scan cursor.
-     */
-    RedisFuture<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate sorted sets elements and associated scores.
-     * 
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @return RedisFuture&lt;ScoredValueScanCursor&lt;V&gt;&gt; scan cursor.
-     */
-    RedisFuture<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor);
-
-    /**
-     * Incrementally iterate sorted sets elements and associated scores.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @return RedisFuture&lt;StreamScanCursor&gt; scan cursor.
-     */
-    RedisFuture<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key);
-
-    /**
-     * Incrementally iterate sorted sets elements and associated scores.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param scanArgs scan arguments
-     * @return RedisFuture&lt;StreamScanCursor&gt; scan cursor.
-     */
-    RedisFuture<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate sorted sets elements and associated scores.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @param scanArgs scan arguments
-     * @return RedisFuture&lt;StreamScanCursor&gt; scan cursor.
-     */
-    RedisFuture<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate sorted sets elements and associated scores.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @return RedisFuture&lt;StreamScanCursor&gt; scan cursor.
-     */
-    RedisFuture<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
-
-    /**
-     * Count the number of members in a sorted set between a given lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of elements in the specified score range.
-     */
-    RedisFuture<Long> zlexcount(K key, String min, String max);
-
-    /**
-     * Remove all members in a sorted set between the given lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;Long&gt; integer-reply the number of elements removed.
-     */
-    RedisFuture<Long> zremrangebylex(K key, String min, String max);
-
-    /**
-     * Return a range of members in a sorted set, by lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<V>> zrangebylex(K key, String min, String max);
-
-    /**
-     * Return a range of members in a sorted set, by lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    RedisFuture<List<V>> zrangebylex(K key, String min, String max, long offset, long count);
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisSortedSetsConnection.java b/src/main/java/com/lambdaworks/redis/RedisSortedSetsConnection.java
deleted file mode 100644
index 97867a80e0..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisSortedSetsConnection.java
+++ /dev/null
@@ -1,807 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.List;
-
-import com.lambdaworks.redis.api.sync.RedisSortedSetCommands;
-import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
-
-/**
- * Synchronous executed commands for Sorted Sets.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@literal RedisSortedSetCommands}
- */
-@Deprecated
-public interface RedisSortedSetsConnection<K, V> {
-    /**
-     * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
-     * @param key the key
-     * @param score the score
-     * @param member the member
-     * 
-     * @return Long integer-reply specifically:
-     * 
-     *         The number of elements added to the sorted sets, not including elements already existing for which the score was
-     *         updated.
-     */
-    Long zadd(K key, double score, V member);
-
-    /**
-     * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
-     * @param key the key
-     * @param scoresAndValues the scoresAndValue tuples (score,value,score,value,...)
-     * @return Long integer-reply specifically:
-     * 
-     *         The number of elements added to the sorted sets, not including elements already existing for which the score was
-     *         updated.
-     */
-    Long zadd(K key, Object... scoresAndValues);
-
-    /**
-     * Add one or more members to a sorted set, or update its score if it already exists.
-     *
-     * @param key the key
-     * @param zAddArgs arguments for zadd
-     * @param score the score
-     * @param member the member
-     *
-     * @return Long integer-reply specifically:
-     *
-     *         The number of elements added to the sorted sets, not including elements already existing for which the score was
-     *         updated.
-     */
-    Long zadd(K key, ZAddArgs zAddArgs, double score, V member);
-
-    /**
-     * Add one or more members to a sorted set, or update its score if it already exists.
-     *
-     * @param key the key
-     * @param zAddArgs arguments for zadd
-     * @param scoresAndValues the scoresAndValue tuples (score,value,score,value,...)
-     * @return Long integer-reply specifically:
-     *
-     *         The number of elements added to the sorted sets, not including elements already existing for which the score was
-     *         updated.
-     */
-    Long zadd(K key, ZAddArgs zAddArgs, Object... scoresAndValues);
-
-    /**
-     * ZADD acts like ZINCRBY
-     *
-     * @param key the key
-     * @param score the score
-     * @param member the member
-     *
-     * @return Long integer-reply specifically:
-     *
-     *         The total number of elements changed
-     */
-    Double zaddincr(K key, double score, V member);
-
-    /**
-     * Get the number of members in a sorted set.
-     * 
-     * @param key the key
-     * @return Long integer-reply the cardinality (number of elements) of the sorted set, or {@literal false} if {@code key}
-     *         does not exist.
-     */
-    Long zcard(K key);
-
-    /**
-     * Count the members in a sorted set with scores within the given values.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements in the specified score range.
-     */
-    Long zcount(K key, double min, double max);
-
-    /**
-     * Count the members in a sorted set with scores within the given values.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements in the specified score range.
-     */
-    Long zcount(K key, String min, String max);
-
-    /**
-     * Increment the score of a member in a sorted set.
-     * 
-     * @param key the key
-     * @param amount the increment type: long
-     * @param member the member type: key
-     * @return Double bulk-string-reply the new score of {@code member} (a double precision floating point number), represented
-     *         as string.
-     */
-    Double zincrby(K key, double amount, K member);
-
-    /**
-     * Intersect multiple sorted sets and store the resulting sorted set in a new key.
-     * 
-     * @param destination the destination
-     * @param keys the keys
-     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    Long zinterstore(K destination, K... keys);
-
-    /**
-     * Intersect multiple sorted sets and store the resulting sorted set in a new key.
-     * 
-     * @param destination the destination
-     * @param storeArgs the storeArgs
-     * @param keys the keys
-     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    Long zinterstore(K destination, ZStoreArgs storeArgs, K... keys);
-
-    /**
-     * Return a range of members in a sorted set, by index.
-     * 
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     */
-    List<V> zrange(K key, long start, long stop);
-
-    /**
-     * Return a range of members with scores in a sorted set, by index.
-     * 
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     */
-    List<ScoredValue<V>> zrangeWithScores(K key, long start, long stop);
-
-    /**
-     * Return a range of members in a sorted set, by score.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     */
-    List<V> zrangebyscore(K key, double min, double max);
-
-    /**
-     * Return a range of members in a sorted set, by score.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     */
-    List<V> zrangebyscore(K key, String min, String max);
-
-    /**
-     * Return a range of members in a sorted set, by score.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     */
-    List<V> zrangebyscore(K key, double min, double max, long offset, long count);
-
-    /**
-     * Return a range of members in a sorted set, by score.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     */
-    List<V> zrangebyscore(K key, String min, String max, long offset, long count);
-
-    /**
-     * Return a range of members with score in a sorted set, by score.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    List<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max);
-
-    /**
-     * Return a range of members with score in a sorted set, by score.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    List<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max);
-
-    /**
-     * Return a range of members with score in a sorted set, by score.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    List<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
-
-    /**
-     * Return a range of members with score in a sorted set, by score.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    List<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
-
-    /**
-     * Return a range of members in a sorted set, by index.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    Long zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by index.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    Long zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long count of elements in the specified score range.
-     */
-    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
-
-    /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long count of elements in the specified score range.
-     */
-    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
-
-    /**
-     * Stream over range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return Long count of elements in the specified score range.
-     */
-    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
-
-    /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return Long count of elements in the specified score range.
-     */
-    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long count of elements in the specified score range.
-     */
-    Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long count of elements in the specified score range.
-     */
-    Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return Long count of elements in the specified score range.
-     */
-    Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return Long count of elements in the specified score range.
-     */
-    Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
-
-    /**
-     * Determine the index of a member in a sorted set.
-     * 
-     * @param key the key
-     * @param member the member type: value
-     * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
-     *         does not exist,
-     */
-    Long zrank(K key, V member);
-
-    /**
-     * Remove one or more members from a sorted set.
-     * 
-     * @param key the key
-     * @param members the member type: value
-     * @return Long integer-reply specifically:
-     * 
-     *         The number of members removed from the sorted set, not including non existing members.
-     */
-    Long zrem(K key, V... members);
-
-    /**
-     * Remove all members in a sorted set within the given indexes.
-     * 
-     * @param key the key
-     * @param start the start type: long
-     * @param stop the stop type: long
-     * @return Long integer-reply the number of elements removed.
-     */
-    Long zremrangebyrank(K key, long start, long stop);
-
-    /**
-     * Remove all members in a sorted set within the given scores.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements removed.
-     */
-    Long zremrangebyscore(K key, double min, double max);
-
-    /**
-     * Remove all members in a sorted set within the given scores.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements removed.
-     */
-    Long zremrangebyscore(K key, String min, String max);
-
-    /**
-     * Return a range of members in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     */
-    List<V> zrevrange(K key, long start, long stop);
-
-    /**
-     * Return a range of members with scores in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     */
-    List<ScoredValue<V>> zrevrangeWithScores(K key, long start, long stop);
-
-    /**
-     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     */
-    List<V> zrevrangebyscore(K key, double max, double min);
-
-    /**
-     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     */
-    List<V> zrevrangebyscore(K key, String max, String min);
-
-    /**
-     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param max max score
-     * @param min min score
-     * @param offset the withscores
-     * @param count the null
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     */
-    List<V> zrevrangebyscore(K key, double max, double min, long offset, long count);
-
-    /**
-     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param max max score
-     * @param min min score
-     * @param offset the offset
-     * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     */
-    List<V> zrevrangebyscore(K key, String max, String min, long offset, long count);
-
-    /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param max max score
-     * @param min min score
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     */
-    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min);
-
-    /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param max max score
-     * @param min min score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min);
-
-    /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param max max score
-     * @param min min score
-     * @param offset the offset
-     * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     */
-    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
-
-    /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param max max score
-     * @param min min score
-     * @param offset the offset
-     * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     */
-    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
-
-    /**
-     * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    Long zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    Long zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param max max score
-     * @param min min score
-     * @return Long count of elements in the specified range.
-     */
-    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
-
-    /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long count of elements in the specified range.
-     */
-    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
-
-    /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return Long count of elements in the specified range.
-     */
-    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
-
-    /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return Long count of elements in the specified range.
-     */
-    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long count of elements in the specified range.
-     */
-    Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long count of elements in the specified range.
-     */
-    Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return Long count of elements in the specified range.
-     */
-    Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min, long offset,
-            long count);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return Long count of elements in the specified range.
-     */
-    Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min, long offset,
-            long count);
-
-    /**
-     * Determine the index of a member in a sorted set, with scores ordered from high to low.
-     * 
-     * @param key the key
-     * @param member the member type: value
-     * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
-     *         does not exist,
-     */
-    Long zrevrank(K key, V member);
-
-    /**
-     * Get the score associated with the given member in a sorted set.
-     * 
-     * @param key the key
-     * @param member the member type: value
-     * @return Double bulk-string-reply the score of {@code member} (a double precision floating point number), represented as
-     *         string.
-     */
-    Double zscore(K key, V member);
-
-    /**
-     * Add multiple sorted sets and store the resulting sorted set in a new key.
-     *
-     * @param destination destination key
-     * @param keys source keys
-     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    Long zunionstore(K destination, K... keys);
-
-    /**
-     * Add multiple sorted sets and store the resulting sorted set in a new key.
-     * 
-     * @param destination the destination
-     * @param storeArgs the storeArgs
-     * @param keys the keys
-     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    Long zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
-
-    /**
-     * Incrementally iterate sorted sets elements and associated scores.
-     *
-     * @param key the key
-     * @return ScoredValueScanCursor&lt;V&gt; scan cursor.
-     */
-    ScoredValueScanCursor<V> zscan(K key);
-
-    /**
-     * Incrementally iterate sorted sets elements and associated scores.
-     *
-     * @param key the key
-     * @param scanArgs scan arguments
-     * @return ScoredValueScanCursor&lt;V&gt; scan cursor.
-     */
-    ScoredValueScanCursor<V> zscan(K key, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate sorted sets elements and associated scores.
-     *
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @param scanArgs scan arguments
-     * @return ScoredValueScanCursor&lt;V&gt; scan cursor.
-     */
-    ScoredValueScanCursor<V> zscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate sorted sets elements and associated scores.
-     *
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @return ScoredValueScanCursor&lt;V&gt; scan cursor.
-     */
-    ScoredValueScanCursor<V> zscan(K key, ScanCursor scanCursor);
-
-    /**
-     * Incrementally iterate sorted sets elements and associated scores.
-     *
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @return StreamScanCursor scan cursor.
-     */
-    StreamScanCursor zscan(ScoredValueStreamingChannel<V> channel, K key);
-
-    /**
-     * Incrementally iterate sorted sets elements and associated scores.
-     *
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param scanArgs scan arguments
-     * @return StreamScanCursor scan cursor.
-     */
-    StreamScanCursor zscan(ScoredValueStreamingChannel<V> channel, K key, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate sorted sets elements and associated scores.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @param scanArgs scan arguments
-     * @return StreamScanCursor scan cursor.
-     */
-    StreamScanCursor zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
-
-    /**
-     * Incrementally iterate sorted sets elements and associated scores.
-     *
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
-     * @return StreamScanCursor scan cursor.
-     */
-    StreamScanCursor zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
-
-    /**
-     * Count the number of members in a sorted set between a given lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements in the specified score range.
-     */
-    Long zlexcount(K key, String min, String max);
-
-    /**
-     * Remove all members in a sorted set between the given lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements removed.
-     */
-    Long zremrangebylex(K key, String min, String max);
-
-    /**
-     * Return a range of members in a sorted set, by lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     */
-    List<V> zrangebylex(K key, String min, String max);
-
-    /**
-     * Return a range of members in a sorted set, by lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     */
-    List<V> zrangebylex(K key, String min, String max, long offset, long count);
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisStringsAsyncConnection.java b/src/main/java/com/lambdaworks/redis/RedisStringsAsyncConnection.java
deleted file mode 100644
index df1bb95452..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisStringsAsyncConnection.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package com.lambdaworks.redis;
-
-import com.lambdaworks.redis.output.ValueStreamingChannel;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Asynchronous executed commands for Strings.
- *
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@literal RedisStringAsyncCommands}
- */
-@Deprecated
-public interface RedisStringsAsyncConnection<K, V> {
-
-    /**
-     * Append a value to a key.
-     *
-     * @param key the key
-     * @param value the value
-     * @return RedisFuture&lt;Long&gt; integer-reply the length of the string after the append operation.
-     */
-    RedisFuture<Long> append(K key, V value);
-
-    /**
-     * Count set bits in a string.
-     *
-     * @param key the key
-     *
-     * @return RedisFuture&lt;Long&gt; integer-reply The number of bits set to 1.
-     */
-    RedisFuture<Long> bitcount(K key);
-
-    /**
-     * Count set bits in a string.
-     *
-     * @param key the key
-     * @param start the start
-     * @param end the end
-     *
-     * @return RedisFuture&lt;Long&gt; integer-reply The number of bits set to 1.
-     */
-    RedisFuture<Long> bitcount(K key, long start, long end);
-
-    /**
-     * Execute {@code BITFIELD} with its subcommands.
-     *
-     * @param key the key
-     * @param bitFieldArgs the args containing subcommands, must not be {@literal null}.
-     *
-     * @return Long bulk-reply the results from the bitfield commands.
-     */
-    RedisFuture<List<Long>> bitfield(K key, BitFieldArgs bitFieldArgs);
-
-    /**
-     * Find first bit set or clear in a string.
-     *
-     * @param key the key
-     * @param state the state
-     *
-     * @return RedisFuture&lt;Long&gt; integer-reply The command returns the position of the first bit set to 1 or 0 according
-     *         to the request.
-     *
-     *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
-     *         returned.
-     *
-     *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
-     *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
-     *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     *
-     *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
-     *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
-     *         However this behavior changes if you are looking for clear bits and specify a range with both
-     *         <strong>end</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
-     *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
-     */
-    RedisFuture<Long> bitpos(K key, boolean state);
-
-    /**
-     * Find first bit set or clear in a string.
-     *
-     * @param key the key
-     * @param state the bit type: long
-     * @param start the start type: long
-     * @param end the end type: long
-     * @return RedisFuture&lt;Long&gt; integer-reply The command returns the position of the first bit set to 1 or 0 according
-     *         to the request.
-     *
-     *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
-     *         returned.
-     *
-     *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
-     *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
-     *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     *
-     *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
-     *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
-     *         However this behavior changes if you are looking for clear bits and specify a range with both
-     *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
-     *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
-     */
-    RedisFuture<Long> bitpos(K key, boolean state, long start, long end);
-
-    /**
-     * Perform bitwise AND between strings.
-     *
-     * @param destination result key of the operation
-     * @param keys operation input key names
-     * @return RedisFuture&lt;Long&gt; integer-reply The size of the string stored in the destination key, that is equal to the
-     *         size of the longest input string.
-     */
-    RedisFuture<Long> bitopAnd(K destination, K... keys);
-
-    /**
-     * Perform bitwise NOT between strings.
-     *
-     * @param destination result key of the operation
-     * @param source operation input key names
-     * @return RedisFuture&lt;Long&gt; integer-reply The size of the string stored in the destination key, that is equal to the
-     *         size of the longest input string.
-     */
-    RedisFuture<Long> bitopNot(K destination, K source);
-
-    /**
-     * Perform bitwise OR between strings.
-     *
-     * @param destination result key of the operation
-     * @param keys operation input key names
-     * @return RedisFuture&lt;Long&gt; integer-reply The size of the string stored in the destination key, that is equal to the
-     *         size of the longest input string.
-     */
-    RedisFuture<Long> bitopOr(K destination, K... keys);
-
-    /**
-     * Perform bitwise XOR between strings.
-     *
-     * @param destination result key of the operation
-     * @param keys operation input key names
-     * @return RedisFuture&lt;Long&gt; integer-reply The size of the string stored in the destination key, that is equal to the
-     *         size of the longest input string.
-     */
-    RedisFuture<Long> bitopXor(K destination, K... keys);
-
-    /**
-     * Decrement the integer value of a key by one.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;Long&gt; integer-reply the value of {@code key} after the decrement
-     */
-    RedisFuture<Long> decr(K key);
-
-    /**
-     * Decrement the integer value of a key by the given number.
-     *
-     * @param key the key
-     * @param amount the decrement type: long
-     * @return RedisFuture&lt;Long&gt; integer-reply the value of {@code key} after the decrement
-     */
-    RedisFuture<Long> decrby(K key, long amount);
-
-    /**
-     * Get the value of a key.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;V&gt; bulk-string-reply the value of {@code key}, or {@literal null} when {@code key} does not
-     *         exist.
-     */
-    RedisFuture<V> get(K key);
-
-    /**
-     * Returns the bit value at offset in the string value stored at key.
-     *
-     * @param key the key
-     * @param offset the offset type: long
-     * @return RedisFuture&lt;Long&gt; integer-reply the bit value stored at <em>offset</em>.
-     */
-    RedisFuture<Long> getbit(K key, long offset);
-
-    /**
-     * Get a substring of the string stored at a key.
-     *
-     * @param key the key
-     * @param start the start type: long
-     * @param end the end type: long
-     * @return RedisFuture&lt;V&gt; bulk-string-reply
-     */
-    RedisFuture<V> getrange(K key, long start, long end);
-
-    /**
-     * Set the string value of a key and return its old value.
-     *
-     * @param key the key
-     * @param value the value
-     * @return RedisFuture&lt;V&gt; bulk-string-reply the old value stored at {@code key}, or {@literal null} when {@code key}
-     *         did not exist.
-     */
-    RedisFuture<V> getset(K key, V value);
-
-    /**
-     * Increment the integer value of a key by one.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;Long&gt; integer-reply the value of {@code key} after the increment
-     */
-    RedisFuture<Long> incr(K key);
-
-    /**
-     * Increment the integer value of a key by the given amount.
-     *
-     * @param key the key
-     * @param amount the increment type: long
-     * @return RedisFuture&lt;Long&gt; integer-reply the value of {@code key} after the increment
-     */
-    RedisFuture<Long> incrby(K key, long amount);
-
-    /**
-     * Increment the float value of a key by the given amount.
-     *
-     * @param key the key
-     * @param amount the increment type: double
-     * @return RedisFuture&lt;Double;&gt; bulk-string-reply the value of {@code key} after the increment.
-     */
-    RedisFuture<Double> incrbyfloat(K key, double amount);
-
-    /**
-     * Get the values of all the given keys.
-     *
-     * @param keys the key
-     * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of values at the specified keys.
-     */
-    RedisFuture<List<V>> mget(K... keys);
-
-    /**
-     * Stream the values of all the given keys.
-     *
-     * @param channel the channel
-     * @param keys the keys
-     *
-     * @return RedisFuture&lt;Long&gt; array-reply list of values at the specified keys.
-     */
-    RedisFuture<Long> mget(ValueStreamingChannel<V> channel, K... keys);
-
-    /**
-     * Set multiple keys to multiple values.
-     *
-     * @param map the null
-     * @return RedisFuture&lt;String&gt; simple-string-reply always {@code OK} since {@code MSET} can't fail.
-     */
-    RedisFuture<String> mset(Map<K, V> map);
-
-    /**
-     * Set multiple keys to multiple values, only if none of the keys exist.
-     *
-     * @param map the null
-     * @return RedisFuture&lt;Boolean&gt; integer-reply specifically:
-     *
-     *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
-     */
-    RedisFuture<Boolean> msetnx(Map<K, V> map);
-
-    /**
-     * Set the string value of a key.
-     *
-     * @param key the key
-     * @param value the value
-     *
-     * @return RedisFuture&lt;String&gt; simple-string-reply {@code OK} if {@code SET} was executed correctly.
-     */
-    RedisFuture<String> set(K key, V value);
-
-    /**
-     * Set the string value of a key.
-     *
-     * @param key the key
-     * @param value the value
-     * @param setArgs the setArgs
-     *
-     * @return RedisFuture&lt;V&gt; simple-string-reply {@code OK} if {@code SET} was executed correctly.
-     */
-    RedisFuture<String> set(K key, V value, SetArgs setArgs);
-
-    /**
-     * Sets or clears the bit at offset in the string value stored at key.
-     *
-     * @param key the key
-     * @param offset the offset type: long
-     * @param value the value type: string
-     * @return RedisFuture&lt;Long&gt; integer-reply the original bit value stored at <em>offset</em>.
-     */
-    RedisFuture<Long> setbit(K key, long offset, int value);
-
-    /**
-     * Set the value and expiration of a key.
-     *
-     * @param key the key
-     * @param seconds the seconds type: long
-     * @param value the value
-     * @return RedisFuture&lt;String&gt; simple-string-reply
-     */
-    RedisFuture<String> setex(K key, long seconds, V value);
-
-    /**
-     * Set the value and expiration in milliseconds of a key.
-     *
-     * @param key the key
-     * @param milliseconds the milliseconds type: long
-     * @param value the value
-     * @return RedisFuture&lt;String&gt; simple-string-reply
-     */
-    RedisFuture<String> psetex(K key, long milliseconds, V value);
-
-    /**
-     * Set the value of a key, only if the key does not exist.
-     *
-     * @param key the key
-     * @param value the value
-     * @return RedisFuture&lt;Boolean&gt; integer-reply specifically:
-     *
-     *         {@code 1} if the key was set {@code 0} if the key was not set
-     */
-    RedisFuture<Boolean> setnx(K key, V value);
-
-    /**
-     * Overwrite part of a string at key starting at the specified offset.
-     *
-     * @param key the key
-     * @param offset the offset type: long
-     * @param value the value
-     * @return RedisFuture&lt;Long&gt; integer-reply the length of the string after it was modified by the command.
-     */
-    RedisFuture<Long> setrange(K key, long offset, V value);
-
-    /**
-     * Get the length of the value stored in a key.
-     *
-     * @param key the key
-     * @return RedisFuture&lt;Long&gt; integer-reply the length of the string at {@code key}, or {@code 0} when {@code key} does
-     *         not exist.
-     */
-    RedisFuture<Long> strlen(K key);
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisStringsConnection.java b/src/main/java/com/lambdaworks/redis/RedisStringsConnection.java
deleted file mode 100644
index 96799fbc14..0000000000
--- a/src/main/java/com/lambdaworks/redis/RedisStringsConnection.java
+++ /dev/null
@@ -1,343 +0,0 @@
-package com.lambdaworks.redis;
-
-import com.lambdaworks.redis.api.sync.RedisStringCommands;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Synchronous executed commands for Strings.
- *
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link RedisStringCommands}
- */
-@Deprecated
-public interface RedisStringsConnection<K, V> {
-
-    /**
-     * Append a value to a key.
-     *
-     * @param key the key
-     * @param value the value
-     * @return Long integer-reply the length of the string after the append operation.
-     */
-    Long append(K key, V value);
-
-    /**
-     * Count set bits in a string.
-     *
-     * @param key the key
-     *
-     * @return Long integer-reply The number of bits set to 1.
-     */
-    Long bitcount(K key);
-
-    /**
-     * Count set bits in a string.
-     *
-     * @param key the key
-     * @param start the start
-     * @param end the end
-     *
-     * @return Long integer-reply The number of bits set to 1.
-     */
-    Long bitcount(K key, long start, long end);
-
-    /**
-     * Execute {@code BITFIELD} with its subcommands.
-     *
-     * @param key the key
-     * @param bitFieldArgs the args containing subcommands, must not be {@literal null}.
-     *
-     * @return Long bulk-reply the results from the bitfield commands.
-     */
-    List<Long> bitfield(K key, BitFieldArgs bitFieldArgs);
-
-    /**
-     * Find first bit set or clear in a string.
-     *
-     * @param key the key
-     * @param state the state
-     *
-     * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     *
-     *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
-     *         returned.
-     *
-     *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
-     *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
-     *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     *
-     *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
-     *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
-     *         However this behavior changes if you are looking for clear bits and specify a range with both
-     *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
-     *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
-     */
-    Long bitpos(K key, boolean state);
-
-    /**
-     * Find first bit set or clear in a string.
-     *
-     * @param key the key
-     * @param state the bit type: long
-     * @param start the start type: long
-     * @param end the end type: long
-     * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     *
-     *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
-     *         returned.
-     *
-     *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
-     *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
-     *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     *
-     *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
-     *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
-     *         However this behavior changes if you are looking for clear bits and specify a range with both
-     *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
-     *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
-     */
-    Long bitpos(K key, boolean state, long start, long end);
-
-    /**
-     * Perform bitwise AND between strings.
-     *
-     * @param destination result key of the operation
-     * @param keys operation input key names
-     * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
-     *         input string.
-     */
-    Long bitopAnd(K destination, K... keys);
-
-    /**
-     * Perform bitwise NOT between strings.
-     *
-     * @param destination result key of the operation
-     * @param source operation input key names
-     * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
-     *         input string.
-     */
-    Long bitopNot(K destination, K source);
-
-    /**
-     * Perform bitwise OR between strings.
-     *
-     * @param destination result key of the operation
-     * @param keys operation input key names
-     * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
-     *         input string.
-     */
-    Long bitopOr(K destination, K... keys);
-
-    /**
-     * Perform bitwise XOR between strings.
-     *
-     * @param destination result key of the operation
-     * @param keys operation input key names
-     * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
-     *         input string.
-     */
-    Long bitopXor(K destination, K... keys);
-
-    /**
-     * Decrement the integer value of a key by one.
-     *
-     * @param key the key
-     * @return Long integer-reply the value of {@code key} after the decrement
-     */
-    Long decr(K key);
-
-    /**
-     * Decrement the integer value of a key by the given number.
-     *
-     * @param key the key
-     * @param amount the decrement type: long
-     * @return Long integer-reply the value of {@code key} after the decrement
-     */
-    Long decrby(K key, long amount);
-
-    /**
-     * Get the value of a key.
-     *
-     * @param key the key
-     * @return V bulk-string-reply the value of {@code key}, or {@literal null} when {@code key} does not exist.
-     */
-    V get(K key);
-
-    /**
-     * Returns the bit value at offset in the string value stored at key.
-     *
-     * @param key the key
-     * @param offset the offset type: long
-     * @return Long integer-reply the bit value stored at <em>offset</em>.
-     */
-    Long getbit(K key, long offset);
-
-    /**
-     * Get a substring of the string stored at a key.
-     *
-     * @param key the key
-     * @param start the start type: long
-     * @param end the end type: long
-     * @return V bulk-string-reply
-     */
-    V getrange(K key, long start, long end);
-
-    /**
-     * Set the string value of a key and return its old value.
-     *
-     * @param key the key
-     * @param value the value
-     * @return V bulk-string-reply the old value stored at {@code key}, or {@literal null} when {@code key} did not exist.
-     */
-    V getset(K key, V value);
-
-    /**
-     * Increment the integer value of a key by one.
-     *
-     * @param key the key
-     * @return Long integer-reply the value of {@code key} after the increment
-     */
-    Long incr(K key);
-
-    /**
-     * Increment the integer value of a key by the given amount.
-     *
-     * @param key the key
-     * @param amount the increment type: long
-     * @return Long integer-reply the value of {@code key} after the increment
-     */
-    Long incrby(K key, long amount);
-
-    /**
-     * Increment the float value of a key by the given amount.
-     *
-     * @param key the key
-     * @param amount the increment type: double
-     * @return Double bulk-string-reply the value of {@code key} after the increment.
-     */
-    Double incrbyfloat(K key, double amount);
-
-    /**
-     * Get the values of all the given keys.
-     *
-     * @param keys the key
-     * @return List&lt;V&gt; array-reply list of values at the specified keys.
-     */
-    List<V> mget(K... keys);
-
-    /**
-     * Stream over the values of all the given keys.
-     *
-     * @param channel the channel
-     * @param keys the keys
-     *
-     * @return Long array-reply list of values at the specified keys.
-     */
-    Long mget(ValueStreamingChannel<V> channel, K... keys);
-
-    /**
-     * Set multiple keys to multiple values.
-     *
-     * @param map the null
-     * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail.
-     */
-    String mset(Map<K, V> map);
-
-    /**
-     * Set multiple keys to multiple values, only if none of the keys exist.
-     *
-     * @param map the null
-     * @return Boolean integer-reply specifically:
-     *
-     *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
-     */
-    Boolean msetnx(Map<K, V> map);
-
-    /**
-     * Set the string value of a key.
-     *
-     * @param key the key
-     * @param value the value
-     *
-     * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
-     */
-    String set(K key, V value);
-
-    /**
-     * Set the string value of a key.
-     *
-     * @param key the key
-     * @param value the value
-     * @param setArgs the setArgs
-     *
-     * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
-     */
-    String set(K key, V value, SetArgs setArgs);
-
-    /**
-     * Sets or clears the bit at offset in the string value stored at key.
-     *
-     * @param key the key
-     * @param offset the offset type: long
-     * @param value the value type: string
-     * @return Long integer-reply the original bit value stored at <em>offset</em>.
-     */
-    Long setbit(K key, long offset, int value);
-
-    /**
-     * Set the value and expiration of a key.
-     *
-     * @param key the key
-     * @param seconds the seconds type: long
-     * @param value the value
-     * @return String simple-string-reply
-     */
-    String setex(K key, long seconds, V value);
-
-    /**
-     * Set the value and expiration in milliseconds of a key.
-     *
-     * @param key the key
-     * @param milliseconds the milliseconds type: long
-     * @param value the value
-     * @return String simple-string-reply
-     */
-    String psetex(K key, long milliseconds, V value);
-
-    /**
-     * Set the value of a key, only if the key does not exist.
-     *
-     * @param key the key
-     * @param value the value
-     * @return Boolean integer-reply specifically:
-     *
-     *         {@code 1} if the key was set {@code 0} if the key was not set
-     */
-    Boolean setnx(K key, V value);
-
-    /**
-     * Overwrite part of a string at key starting at the specified offset.
-     *
-     * @param key the key
-     * @param offset the offset type: long
-     * @param value the value
-     * @return Long integer-reply the length of the string after it was modified by the command.
-     */
-    Long setrange(K key, long offset, V value);
-
-    /**
-     * Get the length of the value stored in a key.
-     *
-     * @param key the key
-     * @return Long integer-reply the length of the string at {@code key}, or {@code 0} when {@code key} does not exist.
-     */
-    Long strlen(K key);
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisURI.java b/src/main/java/com/lambdaworks/redis/RedisURI.java
index 905edfd399..68993ce9f3 100644
--- a/src/main/java/com/lambdaworks/redis/RedisURI.java
+++ b/src/main/java/com/lambdaworks/redis/RedisURI.java
@@ -850,11 +850,7 @@ public static class Builder {
         private TimeUnit unit = TimeUnit.SECONDS;
         private final List<HostAndPort> sentinels = new ArrayList<>();
 
-        /**
-         * @deprecated Use {@link RedisURI#builder()}
-         */
-        @Deprecated
-        public Builder() {
+        private Builder() {
         }
 
         /**
diff --git a/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java
index f52953b96b..fb4acd1f55 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java
@@ -148,4 +148,19 @@ public interface BaseRedisAsyncCommands<K, V> extends AutoCloseable {
      * internal state machine gets out of sync with the connection.
      */
     void reset();
+
+    /**
+     * Disable or enable auto-flush behavior. Default is {@literal true}. If autoFlushCommands is disabled, multiple commands
+     * can be issued without writing them actually to the transport. Commands are buffered until a {@link #flushCommands()} is
+     * issued. After calling {@link #flushCommands()} commands are sent to the transport and executed by Redis.
+     *
+     * @param autoFlush state of autoFlush.
+     */
+    void setAutoFlushCommands(boolean autoFlush);
+
+    /**
+     * Flush pending commands. This commands forces a flush on the channel and can be used to buffer ("pipeline") commands to
+     * achieve batching. No-op if channel is not connected.
+     */
+    void flushCommands();
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java
index e3c57e540c..31adaa7a6f 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java
@@ -2,7 +2,6 @@
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.RedisAsyncConnection;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
 
@@ -18,7 +17,7 @@ public interface RedisAsyncCommands<K, V> extends RedisHashAsyncCommands<K, V>,
         RedisStringAsyncCommands<K, V>, RedisListAsyncCommands<K, V>, RedisSetAsyncCommands<K, V>,
         RedisSortedSetAsyncCommands<K, V>, RedisScriptingAsyncCommands<K, V>, RedisServerAsyncCommands<K, V>,
         RedisHLLAsyncCommands<K, V>, BaseRedisAsyncCommands<K, V>, RedisClusterAsyncCommands<K, V>,
-        RedisTransactionalAsyncCommands<K, V>, RedisGeoAsyncCommands<K, V>, RedisAsyncConnection<K, V> {
+        RedisTransactionalAsyncCommands<K, V>, RedisGeoAsyncCommands<K, V> {
 
     /**
      * Set the default timeout for operations.
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java
index 5627680465..7a719ffbff 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java
@@ -99,16 +99,6 @@ public interface RedisListAsyncCommands<K, V> {
      */
     RedisFuture<Long> lpush(K key, V... values);
 
-    /**
-     * Prepend a value to a list, only if the list exists.
-     * 
-     * @param key the key
-     * @param value the value
-     * @return Long integer-reply the length of the list after the push operation.
-     * @deprecated Use {@link #lpushx(Object, Object[])}
-     */
-    RedisFuture<Long> lpushx(K key, V value);
-
     /**
      * Prepend values to a list, only if the list exists.
      *
@@ -195,16 +185,6 @@ public interface RedisListAsyncCommands<K, V> {
      */
     RedisFuture<Long> rpush(K key, V... values);
 
-    /**
-     * Append a value to a list, only if the list exists.
-     * 
-     * @param key the key
-     * @param value the value
-     * @return Long integer-reply the length of the list after the push operation.
-     * @deprecated Use {@link #rpushx(java.lang.Object, java.lang.Object[])}
-     */
-    RedisFuture<Long> rpushx(K key, V value);
-
     /**
      * Append values to a list, only if the list exists.
      *
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
index 9cfd71cedc..3d40677882 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
@@ -173,12 +173,14 @@ public interface RedisServerAsyncCommands<K, V> {
     /**
      * Make the server crash: Out of memory.
      *
+     * @return nothing, because the server crashes before returning.
      */
     void debugOom();
 
     /**
      * Make the server crash: Invalid pointer access.
      *
+     * @return nothing, because the server crashes before returning.
      */
     void debugSegfault();
 
@@ -313,14 +315,6 @@ public interface RedisServerAsyncCommands<K, V> {
      */
     RedisFuture<String> slowlogReset();
 
-    /**
-     * Internal command used for replication.
-     * 
-     * @return String simple-string-reply
-     */
-    @Deprecated
-    RedisFuture<String> sync();
-
     /**
      * Return the current server time.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
index 4ef6e72599..ed2aee7fbf 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
@@ -1,16 +1,15 @@
 package com.lambdaworks.redis.api.async;
 
-import com.lambdaworks.redis.BitFieldArgs;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.SetArgs;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
-
 import java.util.List;
 import java.util.Map;
+import com.lambdaworks.redis.output.ValueStreamingChannel;
+import com.lambdaworks.redis.BitFieldArgs;
+import com.lambdaworks.redis.SetArgs;
+import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands for Strings.
- *
+ * 
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -21,7 +20,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Append a value to a key.
-     *
+     * 
      * @param key the key
      * @param value the value
      * @return Long integer-reply the length of the string after the append operation.
@@ -30,52 +29,52 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Count set bits in a string.
-     *
+     * 
      * @param key the key
-     *
+     * 
      * @return Long integer-reply The number of bits set to 1.
      */
     RedisFuture<Long> bitcount(K key);
 
     /**
      * Count set bits in a string.
-     *
+     * 
      * @param key the key
      * @param start the start
      * @param end the end
-     *
+     * 
      * @return Long integer-reply The number of bits set to 1.
      */
     RedisFuture<Long> bitcount(K key, long start, long end);
 
     /**
      * Execute {@code BITFIELD} with its subcommands.
-     *
+     * 
      * @param key the key
      * @param bitFieldArgs the args containing subcommands, must not be {@literal null}.
-     *
+     * 
      * @return Long bulk-reply the results from the bitfield commands.
      */
     RedisFuture<List<Long>> bitfield(K key, BitFieldArgs bitFieldArgs);
 
     /**
      * Find first bit set or clear in a string.
-     *
+     * 
      * @param key the key
      * @param state the state
-     *
+     * 
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     *
+     * 
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     *
+     * 
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     *
+     * 
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
+     * 
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -84,23 +83,23 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Find first bit set or clear in a string.
-     *
+     * 
      * @param key the key
      * @param state the bit type: long
      * @param start the start type: long
      * @param end the end type: long
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     *
+     * 
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     *
+     * 
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     *
+     * 
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
+     * 
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -109,7 +108,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Perform bitwise AND between strings.
-     *
+     * 
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -119,7 +118,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Perform bitwise NOT between strings.
-     *
+     * 
      * @param destination result key of the operation
      * @param source operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -129,7 +128,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Perform bitwise OR between strings.
-     *
+     * 
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -139,7 +138,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Perform bitwise XOR between strings.
-     *
+     * 
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -149,7 +148,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by one.
-     *
+     * 
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the decrement
      */
@@ -157,7 +156,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by the given number.
-     *
+     * 
      * @param key the key
      * @param amount the decrement type: long
      * @return Long integer-reply the value of {@code key} after the decrement
@@ -166,7 +165,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Get the value of a key.
-     *
+     * 
      * @param key the key
      * @return V bulk-string-reply the value of {@code key}, or {@literal null} when {@code key} does not exist.
      */
@@ -174,7 +173,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Returns the bit value at offset in the string value stored at key.
-     *
+     * 
      * @param key the key
      * @param offset the offset type: long
      * @return Long integer-reply the bit value stored at <em>offset</em>.
@@ -183,7 +182,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Get a substring of the string stored at a key.
-     *
+     * 
      * @param key the key
      * @param start the start type: long
      * @param end the end type: long
@@ -193,7 +192,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Set the string value of a key and return its old value.
-     *
+     * 
      * @param key the key
      * @param value the value
      * @return V bulk-string-reply the old value stored at {@code key}, or {@literal null} when {@code key} did not exist.
@@ -202,7 +201,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Increment the integer value of a key by one.
-     *
+     * 
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the increment
      */
@@ -210,7 +209,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Increment the integer value of a key by the given amount.
-     *
+     * 
      * @param key the key
      * @param amount the increment type: long
      * @return Long integer-reply the value of {@code key} after the increment
@@ -219,7 +218,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Increment the float value of a key by the given amount.
-     *
+     * 
      * @param key the key
      * @param amount the increment type: double
      * @return Double bulk-string-reply the value of {@code key} after the increment.
@@ -228,7 +227,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Get the values of all the given keys.
-     *
+     * 
      * @param keys the key
      * @return List&lt;V&gt; array-reply list of values at the specified keys.
      */
@@ -236,17 +235,17 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Stream over the values of all the given keys.
-     *
+     * 
      * @param channel the channel
      * @param keys the keys
-     *
+     * 
      * @return Long array-reply list of values at the specified keys.
      */
     RedisFuture<Long> mget(ValueStreamingChannel<V> channel, K... keys);
 
     /**
      * Set multiple keys to multiple values.
-     *
+     * 
      * @param map the null
      * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail.
      */
@@ -254,38 +253,38 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Set multiple keys to multiple values, only if none of the keys exist.
-     *
+     * 
      * @param map the null
      * @return Boolean integer-reply specifically:
-     *
+     * 
      *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
      */
     RedisFuture<Boolean> msetnx(Map<K, V> map);
 
     /**
      * Set the string value of a key.
-     *
+     * 
      * @param key the key
      * @param value the value
-     *
+     * 
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     RedisFuture<String> set(K key, V value);
 
     /**
      * Set the string value of a key.
-     *
+     * 
      * @param key the key
      * @param value the value
      * @param setArgs the setArgs
-     *
+     * 
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     RedisFuture<String> set(K key, V value, SetArgs setArgs);
 
     /**
      * Sets or clears the bit at offset in the string value stored at key.
-     *
+     * 
      * @param key the key
      * @param offset the offset type: long
      * @param value the value type: string
@@ -295,7 +294,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Set the value and expiration of a key.
-     *
+     * 
      * @param key the key
      * @param seconds the seconds type: long
      * @param value the value
@@ -305,7 +304,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Set the value and expiration in milliseconds of a key.
-     *
+     * 
      * @param key the key
      * @param milliseconds the milliseconds type: long
      * @param value the value
@@ -315,18 +314,18 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Set the value of a key, only if the key does not exist.
-     *
+     * 
      * @param key the key
      * @param value the value
      * @return Boolean integer-reply specifically:
-     *
+     * 
      *         {@code 1} if the key was set {@code 0} if the key was not set
      */
     RedisFuture<Boolean> setnx(K key, V value);
 
     /**
      * Overwrite part of a string at key starting at the specified offset.
-     *
+     * 
      * @param key the key
      * @param offset the offset type: long
      * @param value the value
@@ -336,7 +335,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Get the length of the value stored in a key.
-     *
+     * 
      * @param key the key
      * @return Long integer-reply the length of the string at {@code key}, or {@code 0} when {@code key} does not exist.
      */
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/BaseRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/BaseRedisReactiveCommands.java
index e6b4312175..e257c522b8 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/BaseRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/BaseRedisReactiveCommands.java
@@ -1,12 +1,10 @@
 package com.lambdaworks.redis.api.rx;
 
-import java.util.Collection;
+import java.util.List;
 import java.util.Map;
-
-import com.lambdaworks.redis.output.CommandOutput;
 import com.lambdaworks.redis.protocol.CommandArgs;
 import com.lambdaworks.redis.protocol.ProtocolKeyword;
-
+import com.lambdaworks.redis.output.CommandOutput;
 import rx.Observable;
 
 /**
@@ -71,8 +69,8 @@ public interface BaseRedisReactiveCommands<K, V> extends AutoCloseable {
     /**
      * Return the role of the instance in the context of replication.
      *
-     * @return Object array-reply where the first element is one of master, slave, sentinel and the additional elements are
-     *         role-specific.
+     * @return Object array-reply where the first element is one of master, slave, sentinel and the additional
+     *         elements are role-specific.
      */
     Observable<Object> role();
 
@@ -150,4 +148,19 @@ public interface BaseRedisReactiveCommands<K, V> extends AutoCloseable {
      * internal state machine gets out of sync with the connection.
      */
     void reset();
+
+    /**
+     * Disable or enable auto-flush behavior. Default is {@literal true}. If autoFlushCommands is disabled, multiple commands
+     * can be issued without writing them actually to the transport. Commands are buffered until a {@link #flushCommands()} is
+     * issued. After calling {@link #flushCommands()} commands are sent to the transport and executed by Redis.
+     *
+     * @param autoFlush state of autoFlush.
+     */
+    void setAutoFlushCommands(boolean autoFlush);
+
+    /**
+     * Flush pending commands. This commands forces a flush on the channel and can be used to buffer ("pipeline") commands to
+     * achieve batching. No-op if channel is not connected.
+     */
+    void flushCommands();
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisListReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisListReactiveCommands.java
index 552f9de0e8..4f9b4d4832 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisListReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisListReactiveCommands.java
@@ -99,16 +99,6 @@ public interface RedisListReactiveCommands<K, V> {
      */
     Observable<Long> lpush(K key, V... values);
 
-    /**
-     * Prepend a value to a list, only if the list exists.
-     * 
-     * @param key the key
-     * @param value the value
-     * @return Long integer-reply the length of the list after the push operation.
-     * @deprecated Use {@link #lpushx(Object, Object[])}
-     */
-    Observable<Long> lpushx(K key, V value);
-
     /**
      * Prepend values to a list, only if the list exists.
      *
@@ -195,16 +185,6 @@ public interface RedisListReactiveCommands<K, V> {
      */
     Observable<Long> rpush(K key, V... values);
 
-    /**
-     * Append a value to a list, only if the list exists.
-     * 
-     * @param key the key
-     * @param value the value
-     * @return Long integer-reply the length of the list after the push operation.
-     * @deprecated Use {@link #rpushx(java.lang.Object, java.lang.Object[])}
-     */
-    Observable<Long> rpushx(K key, V value);
-
     /**
      * Append values to a list, only if the list exists.
      *
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisServerReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisServerReactiveCommands.java
index 22993104f3..bcf8575949 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisServerReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisServerReactiveCommands.java
@@ -267,7 +267,6 @@ public interface RedisServerReactiveCommands<K, V> {
      * Synchronously save the dataset to disk and then shut down the server.
      * 
      * @param save {@literal true} force save operation
-     * @return nothing because the server shuts down before returning a value
      */
     Observable<Success> shutdown(boolean save);
 
@@ -316,14 +315,6 @@ public interface RedisServerReactiveCommands<K, V> {
      */
     Observable<String> slowlogReset();
 
-    /**
-     * Internal command used for replication.
-     * 
-     * @return String simple-string-reply
-     */
-    @Deprecated
-    Observable<String> sync();
-
     /**
      * Return the current server time.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisStringReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisStringReactiveCommands.java
index cf522e63ac..1d26d273d9 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisStringReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisStringReactiveCommands.java
@@ -1,15 +1,15 @@
 package com.lambdaworks.redis.api.rx;
 
+import java.util.List;
+import java.util.Map;
+import com.lambdaworks.redis.output.ValueStreamingChannel;
 import com.lambdaworks.redis.BitFieldArgs;
 import com.lambdaworks.redis.SetArgs;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
 import rx.Observable;
 
-import java.util.Map;
-
 /**
  * Observable commands for Strings.
- *
+ * 
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -20,7 +20,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Append a value to a key.
-     *
+     * 
      * @param key the key
      * @param value the value
      * @return Long integer-reply the length of the string after the append operation.
@@ -29,52 +29,52 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Count set bits in a string.
-     *
+     * 
      * @param key the key
-     *
+     * 
      * @return Long integer-reply The number of bits set to 1.
      */
     Observable<Long> bitcount(K key);
 
     /**
      * Count set bits in a string.
-     *
+     * 
      * @param key the key
      * @param start the start
      * @param end the end
-     *
+     * 
      * @return Long integer-reply The number of bits set to 1.
      */
     Observable<Long> bitcount(K key, long start, long end);
 
     /**
      * Execute {@code BITFIELD} with its subcommands.
-     *
+     * 
      * @param key the key
      * @param bitFieldArgs the args containing subcommands, must not be {@literal null}.
-     *
+     * 
      * @return Long bulk-reply the results from the bitfield commands.
      */
     Observable<Long> bitfield(K key, BitFieldArgs bitFieldArgs);
 
     /**
      * Find first bit set or clear in a string.
-     *
+     * 
      * @param key the key
      * @param state the state
-     *
+     * 
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     *
+     * 
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     *
+     * 
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     *
+     * 
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
+     * 
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -83,23 +83,23 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Find first bit set or clear in a string.
-     *
+     * 
      * @param key the key
      * @param state the bit type: long
      * @param start the start type: long
      * @param end the end type: long
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     *
+     * 
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     *
+     * 
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     *
+     * 
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
+     * 
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -108,7 +108,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Perform bitwise AND between strings.
-     *
+     * 
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -118,7 +118,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Perform bitwise NOT between strings.
-     *
+     * 
      * @param destination result key of the operation
      * @param source operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -128,7 +128,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Perform bitwise OR between strings.
-     *
+     * 
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -138,7 +138,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Perform bitwise XOR between strings.
-     *
+     * 
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -148,7 +148,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by one.
-     *
+     * 
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the decrement
      */
@@ -156,7 +156,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by the given number.
-     *
+     * 
      * @param key the key
      * @param amount the decrement type: long
      * @return Long integer-reply the value of {@code key} after the decrement
@@ -165,7 +165,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Get the value of a key.
-     *
+     * 
      * @param key the key
      * @return V bulk-string-reply the value of {@code key}, or {@literal null} when {@code key} does not exist.
      */
@@ -173,7 +173,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Returns the bit value at offset in the string value stored at key.
-     *
+     * 
      * @param key the key
      * @param offset the offset type: long
      * @return Long integer-reply the bit value stored at <em>offset</em>.
@@ -182,7 +182,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Get a substring of the string stored at a key.
-     *
+     * 
      * @param key the key
      * @param start the start type: long
      * @param end the end type: long
@@ -192,7 +192,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Set the string value of a key and return its old value.
-     *
+     * 
      * @param key the key
      * @param value the value
      * @return V bulk-string-reply the old value stored at {@code key}, or {@literal null} when {@code key} did not exist.
@@ -201,7 +201,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Increment the integer value of a key by one.
-     *
+     * 
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the increment
      */
@@ -209,7 +209,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Increment the integer value of a key by the given amount.
-     *
+     * 
      * @param key the key
      * @param amount the increment type: long
      * @return Long integer-reply the value of {@code key} after the increment
@@ -218,7 +218,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Increment the float value of a key by the given amount.
-     *
+     * 
      * @param key the key
      * @param amount the increment type: double
      * @return Double bulk-string-reply the value of {@code key} after the increment.
@@ -227,7 +227,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Get the values of all the given keys.
-     *
+     * 
      * @param keys the key
      * @return V array-reply list of values at the specified keys.
      */
@@ -235,17 +235,17 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Stream over the values of all the given keys.
-     *
+     * 
      * @param channel the channel
      * @param keys the keys
-     *
+     * 
      * @return Long array-reply list of values at the specified keys.
      */
     Observable<Long> mget(ValueStreamingChannel<V> channel, K... keys);
 
     /**
      * Set multiple keys to multiple values.
-     *
+     * 
      * @param map the null
      * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail.
      */
@@ -253,38 +253,38 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Set multiple keys to multiple values, only if none of the keys exist.
-     *
+     * 
      * @param map the null
      * @return Boolean integer-reply specifically:
-     *
+     * 
      *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
      */
     Observable<Boolean> msetnx(Map<K, V> map);
 
     /**
      * Set the string value of a key.
-     *
+     * 
      * @param key the key
      * @param value the value
-     *
+     * 
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     Observable<String> set(K key, V value);
 
     /**
      * Set the string value of a key.
-     *
+     * 
      * @param key the key
      * @param value the value
      * @param setArgs the setArgs
-     *
+     * 
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     Observable<String> set(K key, V value, SetArgs setArgs);
 
     /**
      * Sets or clears the bit at offset in the string value stored at key.
-     *
+     * 
      * @param key the key
      * @param offset the offset type: long
      * @param value the value type: string
@@ -294,7 +294,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Set the value and expiration of a key.
-     *
+     * 
      * @param key the key
      * @param seconds the seconds type: long
      * @param value the value
@@ -304,7 +304,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Set the value and expiration in milliseconds of a key.
-     *
+     * 
      * @param key the key
      * @param milliseconds the milliseconds type: long
      * @param value the value
@@ -314,18 +314,18 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Set the value of a key, only if the key does not exist.
-     *
+     * 
      * @param key the key
      * @param value the value
      * @return Boolean integer-reply specifically:
-     *
+     * 
      *         {@code 1} if the key was set {@code 0} if the key was not set
      */
     Observable<Boolean> setnx(K key, V value);
 
     /**
      * Overwrite part of a string at key starting at the specified offset.
-     *
+     * 
      * @param key the key
      * @param offset the offset type: long
      * @param value the value
@@ -335,7 +335,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Get the length of the value stored in a key.
-     *
+     * 
      * @param key the key
      * @return Long integer-reply the length of the string at {@code key}, or {@code 0} when {@code key} does not exist.
      */
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java
index 00e40e5125..3a84e48bf8 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java
@@ -2,7 +2,6 @@
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.RedisConnection;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
 
@@ -18,7 +17,7 @@
 public interface RedisCommands<K, V> extends RedisHashCommands<K, V>, RedisKeyCommands<K, V>, RedisStringCommands<K, V>,
         RedisListCommands<K, V>, RedisSetCommands<K, V>, RedisSortedSetCommands<K, V>, RedisScriptingCommands<K, V>,
         RedisServerCommands<K, V>, RedisHLLCommands<K, V>, BaseRedisCommands<K, V>, RedisClusterCommands<K, V>,
-        RedisTransactionalCommands<K, V>, RedisGeoCommands<K, V>, RedisConnection<K, V> {
+        RedisTransactionalCommands<K, V>, RedisGeoCommands<K, V> {
 
     /**
      * Set the default timeout for operations.
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisHLLCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisHLLCommands.java
index 3151281632..1c2f72a1f6 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisHLLCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisHLLCommands.java
@@ -1,6 +1,5 @@
 package com.lambdaworks.redis.api.sync;
 
-
 /**
  * Synchronous executed commands for HyperLogLog (PF* commands).
  * 
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java
index db469ea64c..6baa624022 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java
@@ -98,16 +98,6 @@ public interface RedisListCommands<K, V> {
      */
     Long lpush(K key, V... values);
 
-    /**
-     * Prepend a value to a list, only if the list exists.
-     * 
-     * @param key the key
-     * @param value the value
-     * @return Long integer-reply the length of the list after the push operation.
-     * @deprecated Use {@link #lpushx(Object, Object[])}
-     */
-    Long lpushx(K key, V value);
-
     /**
      * Prepend values to a list, only if the list exists.
      *
@@ -194,16 +184,6 @@ public interface RedisListCommands<K, V> {
      */
     Long rpush(K key, V... values);
 
-    /**
-     * Append a value to a list, only if the list exists.
-     * 
-     * @param key the key
-     * @param value the value
-     * @return Long integer-reply the length of the list after the push operation.
-     * @deprecated Use {@link #rpushx(java.lang.Object, java.lang.Object[])}
-     */
-    Long rpushx(K key, V value);
-
     /**
      * Append values to a list, only if the list exists.
      *
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
index 7dd5ac1321..1d82353e5d 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
@@ -171,11 +171,15 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Make the server crash: Out of memory.
+     *
+     * @return nothing, because the server crashes before returning.
      */
     void debugOom();
 
     /**
      * Make the server crash: Invalid pointer access.
+     *
+     * @return nothing, because the server crashes before returning.
      */
     void debugSegfault();
 
@@ -310,14 +314,6 @@ public interface RedisServerCommands<K, V> {
      */
     String slowlogReset();
 
-    /**
-     * Internal command used for replication.
-     * 
-     * @return String simple-string-reply
-     *
-     * @Deprecated/
-    String sync();
-
     /**
      * Return the current server time.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
index 4daf15764e..f23685f16f 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
@@ -8,7 +8,7 @@
 
 /**
  * Synchronous executed commands for Strings.
- *
+ * 
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -19,7 +19,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Append a value to a key.
-     *
+     * 
      * @param key the key
      * @param value the value
      * @return Long integer-reply the length of the string after the append operation.
@@ -28,52 +28,52 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Count set bits in a string.
-     *
+     * 
      * @param key the key
-     *
+     * 
      * @return Long integer-reply The number of bits set to 1.
      */
     Long bitcount(K key);
 
     /**
      * Count set bits in a string.
-     *
+     * 
      * @param key the key
      * @param start the start
      * @param end the end
-     *
+     * 
      * @return Long integer-reply The number of bits set to 1.
      */
     Long bitcount(K key, long start, long end);
 
     /**
      * Execute {@code BITFIELD} with its subcommands.
-     *
+     * 
      * @param key the key
      * @param bitFieldArgs the args containing subcommands, must not be {@literal null}.
-     *
+     * 
      * @return Long bulk-reply the results from the bitfield commands.
      */
     List<Long> bitfield(K key, BitFieldArgs bitFieldArgs);
 
     /**
      * Find first bit set or clear in a string.
-     *
+     * 
      * @param key the key
      * @param state the state
-     *
+     * 
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     *
+     * 
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     *
+     * 
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     *
+     * 
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
+     * 
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -82,23 +82,23 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Find first bit set or clear in a string.
-     *
+     * 
      * @param key the key
      * @param state the bit type: long
      * @param start the start type: long
      * @param end the end type: long
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     *
+     * 
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     *
+     * 
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     *
+     * 
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
+     * 
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -107,7 +107,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Perform bitwise AND between strings.
-     *
+     * 
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -117,7 +117,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Perform bitwise NOT between strings.
-     *
+     * 
      * @param destination result key of the operation
      * @param source operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -127,7 +127,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Perform bitwise OR between strings.
-     *
+     * 
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -137,7 +137,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Perform bitwise XOR between strings.
-     *
+     * 
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -147,7 +147,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by one.
-     *
+     * 
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the decrement
      */
@@ -155,7 +155,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by the given number.
-     *
+     * 
      * @param key the key
      * @param amount the decrement type: long
      * @return Long integer-reply the value of {@code key} after the decrement
@@ -164,7 +164,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Get the value of a key.
-     *
+     * 
      * @param key the key
      * @return V bulk-string-reply the value of {@code key}, or {@literal null} when {@code key} does not exist.
      */
@@ -172,7 +172,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Returns the bit value at offset in the string value stored at key.
-     *
+     * 
      * @param key the key
      * @param offset the offset type: long
      * @return Long integer-reply the bit value stored at <em>offset</em>.
@@ -181,7 +181,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Get a substring of the string stored at a key.
-     *
+     * 
      * @param key the key
      * @param start the start type: long
      * @param end the end type: long
@@ -191,7 +191,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set the string value of a key and return its old value.
-     *
+     * 
      * @param key the key
      * @param value the value
      * @return V bulk-string-reply the old value stored at {@code key}, or {@literal null} when {@code key} did not exist.
@@ -200,7 +200,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Increment the integer value of a key by one.
-     *
+     * 
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the increment
      */
@@ -208,7 +208,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Increment the integer value of a key by the given amount.
-     *
+     * 
      * @param key the key
      * @param amount the increment type: long
      * @return Long integer-reply the value of {@code key} after the increment
@@ -217,7 +217,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Increment the float value of a key by the given amount.
-     *
+     * 
      * @param key the key
      * @param amount the increment type: double
      * @return Double bulk-string-reply the value of {@code key} after the increment.
@@ -226,7 +226,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Get the values of all the given keys.
-     *
+     * 
      * @param keys the key
      * @return List&lt;V&gt; array-reply list of values at the specified keys.
      */
@@ -234,17 +234,17 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Stream over the values of all the given keys.
-     *
+     * 
      * @param channel the channel
      * @param keys the keys
-     *
+     * 
      * @return Long array-reply list of values at the specified keys.
      */
     Long mget(ValueStreamingChannel<V> channel, K... keys);
 
     /**
      * Set multiple keys to multiple values.
-     *
+     * 
      * @param map the null
      * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail.
      */
@@ -252,38 +252,38 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set multiple keys to multiple values, only if none of the keys exist.
-     *
+     * 
      * @param map the null
      * @return Boolean integer-reply specifically:
-     *
+     * 
      *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
      */
     Boolean msetnx(Map<K, V> map);
 
     /**
      * Set the string value of a key.
-     *
+     * 
      * @param key the key
      * @param value the value
-     *
+     * 
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     String set(K key, V value);
 
     /**
      * Set the string value of a key.
-     *
+     * 
      * @param key the key
      * @param value the value
      * @param setArgs the setArgs
-     *
+     * 
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     String set(K key, V value, SetArgs setArgs);
 
     /**
      * Sets or clears the bit at offset in the string value stored at key.
-     *
+     * 
      * @param key the key
      * @param offset the offset type: long
      * @param value the value type: string
@@ -293,7 +293,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set the value and expiration of a key.
-     *
+     * 
      * @param key the key
      * @param seconds the seconds type: long
      * @param value the value
@@ -303,7 +303,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set the value and expiration in milliseconds of a key.
-     *
+     * 
      * @param key the key
      * @param milliseconds the milliseconds type: long
      * @param value the value
@@ -313,18 +313,18 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set the value of a key, only if the key does not exist.
-     *
+     * 
      * @param key the key
      * @param value the value
      * @return Boolean integer-reply specifically:
-     *
+     * 
      *         {@code 1} if the key was set {@code 0} if the key was not set
      */
     Boolean setnx(K key, V value);
 
     /**
      * Overwrite part of a string at key starting at the specified offset.
-     *
+     * 
      * @param key the key
      * @param offset the offset type: long
      * @param value the value
@@ -334,7 +334,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Get the length of the value stored in a key.
-     *
+     * 
      * @param key the key
      * @return Long integer-reply the length of the string at {@code key}, or {@code 0} when {@code key} does not exist.
      */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java
index c3150c832d..9e573f5cdf 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java
@@ -33,7 +33,7 @@ protected ClusterClientOptions(Builder builder) {
         ClusterTopologyRefreshOptions refreshOptions = builder.topologyRefreshOptions;
 
         if (refreshOptions == null) {
-            refreshOptions = new ClusterTopologyRefreshOptions.Builder()//
+            refreshOptions = ClusterTopologyRefreshOptions.builder() //
                     .enablePeriodicRefresh(builder.refreshClusterView)//
                     .refreshPeriod(builder.refreshPeriod, builder.refreshPeriodUnit)//
                     .closeStaleConnections(builder.closeStaleConnections)//
@@ -93,61 +93,7 @@ public static class Builder extends ClientOptions.Builder {
         private int maxRedirects = DEFAULT_MAX_REDIRECTS;
         private ClusterTopologyRefreshOptions topologyRefreshOptions = null;
 
-        /**
-         * @deprecated Use {@link ClusterClientOptions#builder()}
-         */
-        @Deprecated
-        public Builder() {
-        }
-
-        /**
-         * Enable regular cluster topology updates. The client starts updating the cluster topology in the intervals of
-         * {@link Builder#refreshPeriod} /{@link Builder#refreshPeriodUnit}. Defaults to {@literal false}. See
-         * {@link #DEFAULT_REFRESH_CLUSTER_VIEW}.
-         *
-         * @param refreshClusterView {@literal true} enable regular cluster topology updates or {@literal false} to disable
-         *        auto-updating
-         * @return {@code this}
-         * @deprecated Use {@link #topologyRefreshOptions}, see
-         *             {@link com.lambdaworks.redis.cluster.ClusterTopologyRefreshOptions.Builder#enablePeriodicRefresh(boolean)}
-         */
-        @Deprecated
-        public Builder refreshClusterView(boolean refreshClusterView) {
-            this.refreshClusterView = refreshClusterView;
-            return this;
-        }
-
-        /**
-         * Set the refresh period. Defaults to {@literal 60 SECONDS}. See {@link #DEFAULT_REFRESH_PERIOD} and
-         * {@link #DEFAULT_REFRESH_PERIOD_UNIT}.
-         *
-         * @param refreshPeriod period for triggering topology updates
-         * @param refreshPeriodUnit unit for {@code refreshPeriod}
-         * @return {@code this}
-         * @deprecated Use {@link #topologyRefreshOptions}, see
-         *             {@link com.lambdaworks.redis.cluster.ClusterTopologyRefreshOptions.Builder#refreshPeriod(long, TimeUnit)}
-         */
-        @Deprecated
-        public Builder refreshPeriod(long refreshPeriod, TimeUnit refreshPeriodUnit) {
-            this.refreshPeriod = refreshPeriod;
-            this.refreshPeriodUnit = refreshPeriodUnit;
-            return this;
-        }
-
-        /**
-         * Flag, whether to close stale connections when refreshing the cluster topology. Defaults to {@literal true}. Comes
-         * only into effect if {@link #isRefreshClusterView()} is {@literal true}. See
-         * {@link ClusterClientOptions#DEFAULT_CLOSE_STALE_CONNECTIONS}.
-         *
-         * @param closeStaleConnections {@literal true} if stale connections are cleaned up after cluster topology updates
-         * @return {@code this}
-         * @deprecated Use {@link #topologyRefreshOptions}, see
-         *             {@link com.lambdaworks.redis.cluster.ClusterTopologyRefreshOptions.Builder#closeStaleConnections(boolean)}
-         */
-        @Deprecated
-        public Builder closeStaleConnections(boolean closeStaleConnections) {
-            this.closeStaleConnections = closeStaleConnections;
-            return this;
+        protected Builder() {
         }
 
         /**
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptions.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptions.java
index ccd113e3ce..25838259a8 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptions.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptions.java
@@ -111,11 +111,7 @@ public static class Builder {
         private TimeUnit adaptiveRefreshTimeoutUnit = DEFAULT_ADAPTIVE_REFRESH_TIMEOUT_UNIT;
         private int refreshTriggersReconnectAttempts = DEFAULT_REFRESH_TRIGGERS_RECONNECT_ATTEMPTS;
 
-        /**
-         * @deprecated Use {@link ClusterTopologyRefreshOptions#builder()}
-         */
-        @Deprecated
-        public Builder() {
+        private Builder() {
         }
 
         /**
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index 89a2b5fd17..e207d69155 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -11,6 +11,7 @@
 import java.util.function.Predicate;
 
 import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
 import com.lambdaworks.redis.api.async.RedisKeyAsyncCommands;
 import com.lambdaworks.redis.api.async.RedisScriptingAsyncCommands;
@@ -40,7 +41,7 @@
  */
 @SuppressWarnings("unchecked")
 public class RedisAdvancedClusterAsyncCommandsImpl<K, V> extends AbstractRedisAsyncCommands<K, V> implements
-        RedisAdvancedClusterAsyncConnection<K, V>, RedisAdvancedClusterAsyncCommands<K, V> {
+         RedisAdvancedClusterAsyncCommands<K, V> {
 
     private Random random = new Random();
 
@@ -239,15 +240,15 @@ public RedisFuture<String> clientSetname(K name) {
         Map<String, RedisFuture<String>> executions = new HashMap<>();
 
         for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
-            RedisClusterAsyncCommands<K, V> byNodeId = getConnection(redisClusterNode.getNodeId());
+            StatefulRedisConnection<K, V> byNodeId = getStatefulConnection().getConnection(redisClusterNode.getNodeId());
             if (byNodeId.isOpen()) {
-                executions.put("NodeId: " + redisClusterNode.getNodeId(), byNodeId.clientSetname(name));
+                executions.put("NodeId: " + redisClusterNode.getNodeId(), byNodeId.async().clientSetname(name));
             }
 
             RedisURI uri = redisClusterNode.getUri();
-            RedisClusterAsyncCommands<K, V> byHost = getConnection(uri.getHost(), uri.getPort());
+            StatefulRedisConnection<K, V> byHost = getStatefulConnection().getConnection(uri.getHost(), uri.getPort());
             if (byHost.isOpen()) {
-                executions.put("HostAndPort: " + redisClusterNode.getNodeId(), byHost.clientSetname(name));
+                executions.put("HostAndPort: " + redisClusterNode.getNodeId(), byHost.async().clientSetname(name));
             }
         }
 
@@ -374,7 +375,7 @@ public RedisFuture<Long> touch(Iterable<K> keys) {
 
     /**
      * Run a command on all available masters,
-     * 
+     *
      * @param function function producing the command
      * @param <T> result type
      * @return map of a key (counter) and commands.
@@ -386,7 +387,7 @@ protected <T> Map<String, RedisFuture<T>> executeOnMasters(
 
     /**
      * Run a command on all available nodes that match {@code filter}.
-     * 
+     *
      * @param function function producing the command
      * @param filter filter function for the node selection
      * @param <T> result type
@@ -403,9 +404,9 @@ protected <T> Map<String, RedisFuture<T>> executeOnNodes(
             }
 
             RedisURI uri = redisClusterNode.getUri();
-            RedisClusterAsyncCommands<K, V> connection = getConnection(uri.getHost(), uri.getPort());
+            StatefulRedisConnection<K, V> connection = getStatefulConnection().getConnection(uri.getHost(), uri.getPort());
             if (connection.isOpen()) {
-                executions.put(redisClusterNode.getNodeId(), function.apply(connection));
+                executions.put(redisClusterNode.getNodeId(), function.apply(connection.async()));
             }
         }
         return executions;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncConnection.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncConnection.java
deleted file mode 100644
index 4bbc480aa6..0000000000
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncConnection.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.lambdaworks.redis.cluster;
-
-import com.lambdaworks.redis.RedisClusterAsyncConnection;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-
-/**
- * Advanced asynchronous and thread-safe cluster API.
- * 
- * @author Mark Paluch
- * @since 3.3
- * @deprecated Use {@link com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands}
- */
-@Deprecated
-public interface RedisAdvancedClusterAsyncConnection<K, V> extends RedisClusterAsyncConnection<K, V> {
-
-    /**
-     * Retrieve a connection to the specified cluster node using the nodeId. Host and port are looked up in the node list. This
-     * connection is bound to the node id. Once the cluster topology view is updated, the connection will try to reconnect the
-     * to the node with the specified {@code nodeId}, that behavior can also lead to a closed connection once the node with the
-     * specified {@code nodeId} is no longer part of the cluster.
-     *
-     * Do not close the connections. Otherwise, unpredictable behavior will occur. The nodeId must be part of the cluster and is
-     * validated against the current topology view in {@link com.lambdaworks.redis.cluster.models.partitions.Partitions}.
-     *
-     * In contrast to the {@link RedisAdvancedClusterAsyncConnection}, node-connections do not route commands to other cluster
-     * nodes.
-     * 
-     * @param nodeId the node Id
-     * @return a connection to the requested cluster node
-     * @throws RedisException if the requested node identified by {@code nodeId} is not part of the cluster
-     */
-    RedisClusterAsyncConnection<K, V> getConnection(String nodeId);
-
-    /**
-     * Retrieve a connection to the specified cluster node using the nodeId. This connection is bound to a host and port.
-     * Updates to the cluster topology view can close the connection once the host, identified by {@code host} and {@code port},
-     * are no longer part of the cluster.
-     * 
-     * Do not close the connections. Otherwise, unpredictable behavior will occur. The node must be part of the cluster and
-     * host/port are validated (exact check) against the current topology view in
-     * {@link com.lambdaworks.redis.cluster.models.partitions.Partitions}.
-     *
-     * In contrast to the {@link RedisAdvancedClusterAsyncConnection}, node-connections do not route commands to other cluster
-     * nodes.
-     * 
-     * @param host the host
-     * @param port the port
-     * @return a connection to the requested cluster node
-     * @throws RedisException if the requested node identified by {@code host} and {@code port} is not part of the cluster
-     */
-    RedisClusterAsyncConnection<K, V> getConnection(String host, int port);
-
-    /**
-     * @return the underlying connection.
-     */
-    StatefulRedisClusterConnection<K, V> getStatefulConnection();
-
-}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterConnection.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterConnection.java
deleted file mode 100644
index 30f30ba03a..0000000000
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterConnection.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.lambdaworks.redis.cluster;
-
-import com.lambdaworks.redis.RedisClusterConnection;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-
-/**
- * Advanced synchronous and thread-safe cluster API.
- * 
- * @author Mark Paluch
- * @since 3.3
- * @deprecated Use {@link com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands}
- */
-@Deprecated
-public interface RedisAdvancedClusterConnection<K, V> extends RedisClusterConnection<K, V> {
-
-    /**
-     * Retrieve a connection to the specified cluster node using the nodeId. Host and port are looked up in the node list. This
-     * connection is bound to the node id. Once the cluster topology view is updated, the connection will try to reconnect the
-     * to the node with the specified {@code nodeId}, that behavior can also lead to a closed connection once the node with the
-     * specified {@code nodeId} is no longer part of the cluster.
-     *
-     * Do not close the connections. Otherwise, unpredictable behavior will occur. The nodeId must be part of the cluster and is
-     * validated against the current topology view in {@link com.lambdaworks.redis.cluster.models.partitions.Partitions}.
-     *
-     * In contrast to the {@link RedisAdvancedClusterConnection}, node-connections do not route commands to other cluster nodes.
-     *
-     * @param nodeId the node Id
-     * @return a connection to the requested cluster node
-     * @throws RedisException if the requested node identified by {@code nodeId} is not part of the cluster
-     */
-    RedisClusterConnection<K, V> getConnection(String nodeId);
-
-    /**
-     * Retrieve a connection to the specified cluster node using the nodeId. This connection is bound to a host and port.
-     * Updates to the cluster topology view can close the connection once the host, identified by {@code host} and {@code port},
-     * are no longer part of the cluster.
-     * 
-     * Do not close the connections. Otherwise, unpredictable behavior will occur. The node must be part of the cluster and
-     * host/port are validated (exact check) against the current topology view in
-     * {@link com.lambdaworks.redis.cluster.models.partitions.Partitions}.
-     *
-     * In contrast to the {@link RedisAdvancedClusterConnection}, node-connections do not route commands to other cluster nodes.
-     * 
-     * @param host the host
-     * @param port the port
-     * @return a connection to the requested cluster node
-     * @throws RedisException if the requested node identified by {@code host} and {@code port} is not part of the cluster
-     */
-    RedisClusterConnection<K, V> getConnection(String host, int port);
-
-    /**
-     * @return the underlying connection.
-     */
-    StatefulRedisClusterConnection<K, V> getStatefulConnection();
-
-}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index ce559f0390..219487850a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -13,6 +13,7 @@
 import rx.Observable;
 
 import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.rx.RedisKeyReactiveCommands;
 import com.lambdaworks.redis.api.rx.RedisScriptingReactiveCommands;
 import com.lambdaworks.redis.api.rx.RedisServerReactiveCommands;
@@ -26,6 +27,8 @@
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 
+import rx.Observable;
+
 /**
  * An advanced reactive and thread-safe API to a Redis Cluster connection.
  *
@@ -224,15 +227,15 @@ public Observable<String> clientSetname(K name) {
         List<Observable<String>> observables = new ArrayList<>();
 
         for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
-            RedisClusterReactiveCommands<K, V> byNodeId = getConnection(redisClusterNode.getNodeId());
+            StatefulRedisConnection<K, V> byNodeId = getStatefulConnection().getConnection(redisClusterNode.getNodeId());
             if (byNodeId.isOpen()) {
-                observables.add(byNodeId.clientSetname(name));
+                observables.add(byNodeId.reactive().clientSetname(name));
             }
 
-            RedisClusterReactiveCommands<K, V> byHost = getConnection(redisClusterNode.getUri().getHost(), redisClusterNode
+            StatefulRedisConnection<K, V> byHost = getStatefulConnection().getConnection(redisClusterNode.getUri().getHost(), redisClusterNode
                     .getUri().getPort());
             if (byHost.isOpen()) {
-                observables.add(byHost.clientSetname(name));
+                observables.add(byHost.reactive().clientSetname(name));
             }
         }
 
@@ -354,9 +357,9 @@ protected <T> Map<String, Observable<T>> executeOnNodes(
             }
 
             RedisURI uri = redisClusterNode.getUri();
-            RedisClusterReactiveCommands<K, V> connection = getConnection(uri.getHost(), uri.getPort());
+            StatefulRedisConnection<K, V> connection = getStatefulConnection().getConnection(uri.getHost(), uri.getPort());
             if (connection.isOpen()) {
-                executions.put(redisClusterNode.getNodeId(), function.apply(connection));
+                executions.put(redisClusterNode.getNodeId(), function.apply(connection.reactive()));
             }
         }
         return executions;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index 0dbe3163e7..824a0ade39 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -125,32 +125,9 @@ public class RedisClusterClient extends AbstractRedisClient {
 
     private RedisClusterClient() {
 
-        setOptions(ClusterClientOptions.create());
-        this.initialUris = Collections.emptyList();
-    }
-
-    /**
-     * Initialize the client with an initial cluster URI.
-     *
-     * @param initialUri initial cluster URI
-     * @deprecated Use {@link #create(RedisURI)}
-     */
-    @Deprecated
-    public RedisClusterClient(RedisURI initialUri) {
-        this(Collections.singletonList(assertNotNull(initialUri)));
-    }
+        super(null);
 
-    /**
-     * Initialize the client with a list of cluster URI's. All uris are tried in sequence for connecting initially to the
-     * cluster. If any uri is successful for connection, the others are not tried anymore. The initial uri is needed to discover
-     * the cluster structure for distributing the requests.
-     *
-     * @param redisURIs iterable of initial {@link RedisURI cluster URIs}. Must not be {@literal null} and not empty.
-     * @deprecated Use {@link #create(Iterable)}
-     */
-    @Deprecated
-    public RedisClusterClient(List<RedisURI> redisURIs) {
-        this(null, redisURIs);
+        initialUris = Collections.emptyList();
     }
 
     /**
@@ -378,58 +355,6 @@ public <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V>
         return connectClusterPubSubImpl(codec);
     }
 
-    /**
-     * Open a new synchronous connection to a Redis Cluster that treats keys and values as UTF-8 strings.
-     *
-     * @return A new connection
-     * @deprecated Use {@code connect().sync()}
-     */
-    @Deprecated
-    public RedisAdvancedClusterCommands<String, String> connectCluster() {
-        return connectCluster(newStringStringCodec());
-    }
-
-    /**
-     * Open a new synchronous connection to a Redis Cluster. Use the supplied {@link RedisCodec codec} to encode/decode keys and
-     * values.
-     *
-     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
-     * @param <K> Key type
-     * @param <V> Value type
-     * @return A new connection
-     * @deprecated @deprecated Use {@code connect(codec).sync()}
-     */
-    @SuppressWarnings("unchecked")
-    @Deprecated
-    public <K, V> RedisAdvancedClusterCommands<K, V> connectCluster(RedisCodec<K, V> codec) {
-        return connectClusterImpl(codec).sync();
-    }
-
-    /**
-     * Open a new asynchronous connection to a Redis Cluster that treats keys and values as UTF-8 strings.
-     *
-     * @return A new connection
-     * @deprecated Use {@code connect().async()}
-     */
-    @Deprecated
-    public RedisAdvancedClusterAsyncCommands<String, String> connectClusterAsync() {
-        return connectClusterImpl(newStringStringCodec()).async();
-    }
-
-    /**
-     * Open a new asynchronous connection to a Redis Cluster. Use the supplied {@link RedisCodec codec} to encode/decode keys
-     * and values.
-     *
-     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
-     * @param <K> Key type
-     * @param <V> Value type
-     * @return A new connection
-     * @deprecated @deprecated Use {@code connect(codec).async()}
-     */
-    @Deprecated
-    public <K, V> RedisAdvancedClusterAsyncCommands<K, V> connectClusterAsync(RedisCodec<K, V> codec) {
-        return connectClusterImpl(codec).async();
-    }
 
     protected StatefulRedisConnection<String, String> connectToNode(final SocketAddress socketAddress) {
         return connectToNode(newStringStringCodec(), socketAddress.toString(), null, new Supplier<SocketAddress>() {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
index e36a7f97bc..2503df6dbe 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
@@ -1,6 +1,8 @@
 package com.lambdaworks.redis.cluster;
 
-import static com.lambdaworks.redis.protocol.CommandType.*;
+import static com.lambdaworks.redis.protocol.CommandType.AUTH;
+import static com.lambdaworks.redis.protocol.CommandType.READONLY;
+import static com.lambdaworks.redis.protocol.CommandType.READWRITE;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -71,7 +73,7 @@ public StatefulRedisClusterConnectionImpl(RedisChannelWriter<K, V> writer, Redis
 
         this.async = new RedisAdvancedClusterAsyncCommandsImpl<>(this, codec);
         this.sync = (RedisAdvancedClusterCommands) Proxy.newProxyInstance(AbstractRedisClient.class.getClassLoader(),
-                new Class<?>[] { RedisAdvancedClusterConnection.class, RedisAdvancedClusterCommands.class }, syncInvocationHandler());
+                new Class<?>[] { RedisAdvancedClusterCommands.class }, syncInvocationHandler());
         this.reactive = new RedisAdvancedClusterReactiveCommandsImpl<>(this, codec);
     }
 
@@ -94,11 +96,6 @@ public RedisAdvancedClusterReactiveCommands<K, V> reactive() {
         return reactive;
     }
 
-    @Deprecated
-    protected RedisAdvancedClusterReactiveCommandsImpl<K, V> getReactiveCommands() {
-        return reactive;
-    }
-
     private RedisURI lookup(String nodeId) {
 
         for (RedisClusterNode partition : partitions) {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
index 70f16aa8c8..4aa308f69f 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
@@ -1,8 +1,10 @@
 package com.lambdaworks.redis.cluster.api.async;
 
-import java.lang.AutoCloseable;
 import java.util.List;
 import java.util.Map;
+import com.lambdaworks.redis.protocol.CommandArgs;
+import com.lambdaworks.redis.protocol.ProtocolKeyword;
+import com.lambdaworks.redis.output.CommandOutput;
 import com.lambdaworks.redis.RedisFuture;
 
 /**
@@ -94,4 +96,40 @@ public interface BaseNodeSelectionAsyncCommands<K, V> extends AutoCloseable {
      * @return number of replicas
      */
     AsyncExecutions<Long> waitForReplication(int replicas, long timeout);
+
+    /**
+     * Dispatch a command to the Redis Server. Please note the command output type must fit to the command response.
+     *
+     * @param type the command, must not be {@literal null}.
+     * @param output the command output, must not be {@literal null}.
+     * @param <T> response type
+     * @return the command response
+     */
+    <T> AsyncExecutions<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output);
+
+    /**
+     * Dispatch a command to the Redis Server. Please note the command output type must fit to the command response.
+     *
+     * @param type the command, must not be {@literal null}.
+     * @param output the command output, must not be {@literal null}.
+     * @param args the command arguments, must not be {@literal null}.
+     * @param <T> response type
+     * @return the command response
+     */
+    <T> AsyncExecutions<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args);
+
+    /**
+     * Disable or enable auto-flush behavior. Default is {@literal true}. If autoFlushCommands is disabled, multiple commands
+     * can be issued without writing them actually to the transport. Commands are buffered until a {@link #flushCommands()} is
+     * issued. After calling {@link #flushCommands()} commands are sent to the transport and executed by Redis.
+     *
+     * @param autoFlush state of autoFlush.
+     */
+    AsyncExecutions<Void> setAutoFlushCommands(boolean autoFlush);
+
+    /**
+     * Flush pending commands. This commands forces a flush on the channel and can be used to buffer ("pipeline") commands to
+     * achieve batching. No-op if channel is not connected.
+     */
+    AsyncExecutions<Void> flushCommands();
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java
index c99450d89b..083f1b89ff 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java
@@ -99,16 +99,6 @@ public interface NodeSelectionListAsyncCommands<K, V> {
      */
     AsyncExecutions<Long> lpush(K key, V... values);
 
-    /**
-     * Prepend a value to a list, only if the list exists.
-     * 
-     * @param key the key
-     * @param value the value
-     * @return Long integer-reply the length of the list after the push operation.
-     * @deprecated Use {@link #lpushx(Object, Object[])}
-     */
-    AsyncExecutions<Long> lpushx(K key, V value);
-
     /**
      * Prepend values to a list, only if the list exists.
      *
@@ -195,16 +185,6 @@ public interface NodeSelectionListAsyncCommands<K, V> {
      */
     AsyncExecutions<Long> rpush(K key, V... values);
 
-    /**
-     * Append a value to a list, only if the list exists.
-     * 
-     * @param key the key
-     * @param value the value
-     * @return Long integer-reply the length of the list after the push operation.
-     * @deprecated Use {@link #rpushx(java.lang.Object, java.lang.Object[])}
-     */
-    AsyncExecutions<Long> rpushx(K key, V value);
-
     /**
      * Append values to a list, only if the list exists.
      *
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java
index bf47db28d0..7dcf7fd256 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java
@@ -294,14 +294,6 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
      */
     AsyncExecutions<String> slowlogReset();
 
-    /**
-     * Internal command used for replication.
-     * 
-     * @return String simple-string-reply
-     */
-    @Deprecated
-    AsyncExecutions<String> sync();
-
     /**
      * Return the current server time.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
index 21228dbf78..841a6bea7a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
@@ -1,15 +1,15 @@
 package com.lambdaworks.redis.cluster.api.async;
 
-import com.lambdaworks.redis.BitFieldArgs;
-import com.lambdaworks.redis.SetArgs;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
-
 import java.util.List;
 import java.util.Map;
+import com.lambdaworks.redis.output.ValueStreamingChannel;
+import com.lambdaworks.redis.BitFieldArgs;
+import com.lambdaworks.redis.SetArgs;
+import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands on a node selection for Strings.
- *
+ * 
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -20,7 +20,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Append a value to a key.
-     *
+     * 
      * @param key the key
      * @param value the value
      * @return Long integer-reply the length of the string after the append operation.
@@ -29,52 +29,52 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Count set bits in a string.
-     *
+     * 
      * @param key the key
-     *
+     * 
      * @return Long integer-reply The number of bits set to 1.
      */
     AsyncExecutions<Long> bitcount(K key);
 
     /**
      * Count set bits in a string.
-     *
+     * 
      * @param key the key
      * @param start the start
      * @param end the end
-     *
+     * 
      * @return Long integer-reply The number of bits set to 1.
      */
     AsyncExecutions<Long> bitcount(K key, long start, long end);
 
     /**
      * Execute {@code BITFIELD} with its subcommands.
-     *
+     * 
      * @param key the key
      * @param bitFieldArgs the args containing subcommands, must not be {@literal null}.
-     *
+     * 
      * @return Long bulk-reply the results from the bitfield commands.
      */
     AsyncExecutions<List<Long>> bitfield(K key, BitFieldArgs bitFieldArgs);
 
     /**
      * Find first bit set or clear in a string.
-     *
+     * 
      * @param key the key
      * @param state the state
-     *
+     * 
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     *
+     * 
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     *
+     * 
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     *
+     * 
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
+     * 
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -83,23 +83,23 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Find first bit set or clear in a string.
-     *
+     * 
      * @param key the key
      * @param state the bit type: long
      * @param start the start type: long
      * @param end the end type: long
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     *
+     * 
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     *
+     * 
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     *
+     * 
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
+     * 
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -108,7 +108,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Perform bitwise AND between strings.
-     *
+     * 
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -118,7 +118,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Perform bitwise NOT between strings.
-     *
+     * 
      * @param destination result key of the operation
      * @param source operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -128,7 +128,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Perform bitwise OR between strings.
-     *
+     * 
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -138,7 +138,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Perform bitwise XOR between strings.
-     *
+     * 
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -148,7 +148,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by one.
-     *
+     * 
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the decrement
      */
@@ -156,7 +156,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by the given number.
-     *
+     * 
      * @param key the key
      * @param amount the decrement type: long
      * @return Long integer-reply the value of {@code key} after the decrement
@@ -165,7 +165,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Get the value of a key.
-     *
+     * 
      * @param key the key
      * @return V bulk-string-reply the value of {@code key}, or {@literal null} when {@code key} does not exist.
      */
@@ -173,7 +173,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Returns the bit value at offset in the string value stored at key.
-     *
+     * 
      * @param key the key
      * @param offset the offset type: long
      * @return Long integer-reply the bit value stored at <em>offset</em>.
@@ -182,7 +182,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Get a substring of the string stored at a key.
-     *
+     * 
      * @param key the key
      * @param start the start type: long
      * @param end the end type: long
@@ -192,7 +192,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Set the string value of a key and return its old value.
-     *
+     * 
      * @param key the key
      * @param value the value
      * @return V bulk-string-reply the old value stored at {@code key}, or {@literal null} when {@code key} did not exist.
@@ -201,7 +201,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Increment the integer value of a key by one.
-     *
+     * 
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the increment
      */
@@ -209,7 +209,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Increment the integer value of a key by the given amount.
-     *
+     * 
      * @param key the key
      * @param amount the increment type: long
      * @return Long integer-reply the value of {@code key} after the increment
@@ -218,7 +218,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Increment the float value of a key by the given amount.
-     *
+     * 
      * @param key the key
      * @param amount the increment type: double
      * @return Double bulk-string-reply the value of {@code key} after the increment.
@@ -227,7 +227,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Get the values of all the given keys.
-     *
+     * 
      * @param keys the key
      * @return List&lt;V&gt; array-reply list of values at the specified keys.
      */
@@ -235,17 +235,17 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Stream over the values of all the given keys.
-     *
+     * 
      * @param channel the channel
      * @param keys the keys
-     *
+     * 
      * @return Long array-reply list of values at the specified keys.
      */
     AsyncExecutions<Long> mget(ValueStreamingChannel<V> channel, K... keys);
 
     /**
      * Set multiple keys to multiple values.
-     *
+     * 
      * @param map the null
      * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail.
      */
@@ -253,38 +253,38 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Set multiple keys to multiple values, only if none of the keys exist.
-     *
+     * 
      * @param map the null
      * @return Boolean integer-reply specifically:
-     *
+     * 
      *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
      */
     AsyncExecutions<Boolean> msetnx(Map<K, V> map);
 
     /**
      * Set the string value of a key.
-     *
+     * 
      * @param key the key
      * @param value the value
-     *
+     * 
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     AsyncExecutions<String> set(K key, V value);
 
     /**
      * Set the string value of a key.
-     *
+     * 
      * @param key the key
      * @param value the value
      * @param setArgs the setArgs
-     *
+     * 
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     AsyncExecutions<String> set(K key, V value, SetArgs setArgs);
 
     /**
      * Sets or clears the bit at offset in the string value stored at key.
-     *
+     * 
      * @param key the key
      * @param offset the offset type: long
      * @param value the value type: string
@@ -294,7 +294,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Set the value and expiration of a key.
-     *
+     * 
      * @param key the key
      * @param seconds the seconds type: long
      * @param value the value
@@ -304,7 +304,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Set the value and expiration in milliseconds of a key.
-     *
+     * 
      * @param key the key
      * @param milliseconds the milliseconds type: long
      * @param value the value
@@ -314,18 +314,18 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Set the value of a key, only if the key does not exist.
-     *
+     * 
      * @param key the key
      * @param value the value
      * @return Boolean integer-reply specifically:
-     *
+     * 
      *         {@code 1} if the key was set {@code 0} if the key was not set
      */
     AsyncExecutions<Boolean> setnx(K key, V value);
 
     /**
      * Overwrite part of a string at key starting at the specified offset.
-     *
+     * 
      * @param key the key
      * @param offset the offset type: long
      * @param value the value
@@ -335,7 +335,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Get the length of the value stored in a key.
-     *
+     * 
      * @param key the key
      * @return Long integer-reply the length of the string at {@code key}, or {@code 0} when {@code key} does not exist.
      */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
index 4ed24b0adf..33fe6f5432 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
@@ -10,7 +10,6 @@
 import com.lambdaworks.redis.api.async.RedisServerAsyncCommands;
 import com.lambdaworks.redis.api.async.RedisStringAsyncCommands;
 import com.lambdaworks.redis.cluster.ClusterClientOptions;
-import com.lambdaworks.redis.cluster.RedisAdvancedClusterAsyncConnection;
 import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
@@ -23,7 +22,7 @@
  * @since 4.0
  */
 public interface RedisAdvancedClusterAsyncCommands<K, V>
-        extends RedisClusterAsyncCommands<K, V>, RedisAdvancedClusterAsyncConnection<K, V> {
+        extends RedisClusterAsyncCommands<K, V> {
 
     /**
      * Retrieve a connection to the specified cluster node using the nodeId. Host and port are looked up in the node list.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java
index afeec58229..dced1f67ce 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java
@@ -4,7 +4,6 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.RedisClusterAsyncConnection;
 import com.lambdaworks.redis.RedisFuture;
 import com.lambdaworks.redis.api.async.*;
 
@@ -20,7 +19,7 @@ public interface RedisClusterAsyncCommands<K, V>
         extends RedisHashAsyncCommands<K, V>, RedisKeyAsyncCommands<K, V>, RedisStringAsyncCommands<K, V>,
         RedisListAsyncCommands<K, V>, RedisSetAsyncCommands<K, V>, RedisSortedSetAsyncCommands<K, V>,
         RedisScriptingAsyncCommands<K, V>, RedisServerAsyncCommands<K, V>, RedisHLLAsyncCommands<K, V>,
-        RedisGeoAsyncCommands<K, V>, BaseRedisAsyncCommands<K, V>, RedisClusterAsyncConnection<K, V> {
+        RedisGeoAsyncCommands<K, V>, BaseRedisAsyncCommands<K, V> {
 
     /**
      * Set the default timeout for operations.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
index 3d38f61c10..31cbb13e8b 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
@@ -1,8 +1,10 @@
 package com.lambdaworks.redis.cluster.api.sync;
 
-import java.lang.AutoCloseable;
 import java.util.List;
 import java.util.Map;
+import com.lambdaworks.redis.protocol.CommandArgs;
+import com.lambdaworks.redis.protocol.ProtocolKeyword;
+import com.lambdaworks.redis.output.CommandOutput;
 
 /**
  * 
@@ -93,4 +95,19 @@ public interface BaseNodeSelectionCommands<K, V> extends AutoCloseable {
      * @return number of replicas
      */
     Executions<Long> waitForReplication(int replicas, long timeout);
+
+    /**
+     * Disable or enable auto-flush behavior. Default is {@literal true}. If autoFlushCommands is disabled, multiple commands
+     * can be issued without writing them actually to the transport. Commands are buffered until a {@link #flushCommands()} is
+     * issued. After calling {@link #flushCommands()} commands are sent to the transport and executed by Redis.
+     *
+     * @param autoFlush state of autoFlush.
+     */
+    Executions<Void> setAutoFlushCommands(boolean autoFlush);
+
+    /**
+     * Flush pending commands. This commands forces a flush on the channel and can be used to buffer ("pipeline") commands to
+     * achieve batching. No-op if channel is not connected.
+     */
+    Executions<Void> flushCommands();
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java
index a8a1dafe1d..9d4830c0ba 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java
@@ -98,16 +98,6 @@ public interface NodeSelectionListCommands<K, V> {
      */
     Executions<Long> lpush(K key, V... values);
 
-    /**
-     * Prepend a value to a list, only if the list exists.
-     * 
-     * @param key the key
-     * @param value the value
-     * @return Long integer-reply the length of the list after the push operation.
-     * @deprecated Use {@link #lpushx(Object, Object[])}
-     */
-    Executions<Long> lpushx(K key, V value);
-
     /**
      * Prepend values to a list, only if the list exists.
      *
@@ -194,16 +184,6 @@ public interface NodeSelectionListCommands<K, V> {
      */
     Executions<Long> rpush(K key, V... values);
 
-    /**
-     * Append a value to a list, only if the list exists.
-     * 
-     * @param key the key
-     * @param value the value
-     * @return Long integer-reply the length of the list after the push operation.
-     * @deprecated Use {@link #rpushx(java.lang.Object, java.lang.Object[])}
-     */
-    Executions<Long> rpushx(K key, V value);
-
     /**
      * Append values to a list, only if the list exists.
      *
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java
index 7599ee4809..c0554cdbf9 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java
@@ -293,14 +293,6 @@ public interface NodeSelectionServerCommands<K, V> {
      */
     Executions<String> slowlogReset();
 
-    /**
-     * Internal command used for replication.
-     * 
-     * @return String simple-string-reply
-     */
-    @Deprecated
-    Executions<String> sync();
-
     /**
      * Return the current server time.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java
index 5bf7a14e68..19bb507013 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java
@@ -10,7 +10,6 @@
 import com.lambdaworks.redis.api.sync.RedisServerCommands;
 import com.lambdaworks.redis.api.sync.RedisStringCommands;
 import com.lambdaworks.redis.cluster.ClusterClientOptions;
-import com.lambdaworks.redis.cluster.RedisAdvancedClusterConnection;
 import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
@@ -22,7 +21,7 @@
  * @author Mark Paluch
  * @since 4.0
  */
-public interface RedisAdvancedClusterCommands<K, V> extends RedisClusterCommands<K, V>, RedisAdvancedClusterConnection<K, V> {
+public interface RedisAdvancedClusterCommands<K, V> extends RedisClusterCommands<K, V> {
 
     /**
      * Retrieve a connection to the specified cluster node using the nodeId. Host and port are looked up in the node list. In
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java
index 611c9e1a1a..4d9dcf08d3 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java
@@ -3,7 +3,6 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.RedisClusterConnection;
 import com.lambdaworks.redis.api.sync.*;
 
 /**
@@ -16,8 +15,7 @@
  */
 public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, RedisKeyCommands<K, V>, RedisStringCommands<K, V>,
         RedisListCommands<K, V>, RedisSetCommands<K, V>, RedisSortedSetCommands<K, V>, RedisScriptingCommands<K, V>,
-        RedisServerCommands<K, V>, RedisHLLCommands<K, V>, RedisGeoCommands<K, V>, BaseRedisCommands<K, V>, AutoCloseable,
-        RedisClusterConnection<K, V> {
+        RedisServerCommands<K, V>, RedisHLLCommands<K, V>, RedisGeoCommands<K, V>, BaseRedisCommands<K, V> {
 
     /**
      * Set the default timeout for operations.
@@ -34,7 +32,7 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
      * @return String simple-string-reply
      */
     String auth(String password);
-    
+
     /**
      * Generate a new config epoch, incrementing the current epoch, assign the new epoch to this node, WITHOUT any consensus and
      * persist the configuration on disk before sending packets with the new configuration.
@@ -272,11 +270,4 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
      * @return String simple-string-reply
      */
     String readWrite();
-
-    /**
-     * Close the connection. The connection will become not usable anymore as soon as this method was called.
-     */
-    @Override
-    void close();
-
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java b/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java
index 750287f6b7..eed08503f0 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java
@@ -22,41 +22,10 @@ public class ClusterSlotRange implements Serializable {
     private int from;
     private int to;
 
-    @Deprecated
-    private HostAndPort master;
-
     private RedisClusterNode masterNode;
-
-    @Deprecated
-    private List<HostAndPort> slaves = Collections.emptyList();
-
     private List<RedisClusterNode> slaveNodes = Collections.emptyList();
 
     public ClusterSlotRange() {
-
-    }
-
-    /**
-     * Constructs a {@link ClusterSlotRange}
-     * 
-     * @param from from slot
-     * @param to to slot
-     * @param master master for the slots, may be {@literal null}
-     * @param slaves list of slaves must not be {@literal null} but may be empty
-     * @deprecated Use {@link #ClusterSlotRange(int, int, RedisClusterNode, List)}
-     */
-    @Deprecated
-    public ClusterSlotRange(int from, int to, HostAndPort master, List<HostAndPort> slaves) {
-
-        LettuceAssert.notNull(master, "Master must not be null");
-        LettuceAssert.notNull(slaves, "Slaves must not be null");
-
-        this.from = from;
-        this.to = to;
-        this.masterNode = toRedisClusterNode(master, null, Collections.singleton(RedisClusterNode.NodeFlag.MASTER));
-        this.slaveNodes = toRedisClusterNodes(slaves, null, Collections.singleton(RedisClusterNode.NodeFlag.SLAVE));
-        this.master = master;
-        this.slaves = slaves;
     }
 
     /**
@@ -74,35 +43,21 @@ public ClusterSlotRange(int from, int to, RedisClusterNode masterNode, List<Redi
 
         this.from = from;
         this.to = to;
-        this.master = toHostAndPort(masterNode);
-        this.slaves = toHostAndPorts(slaveNodes);
         this.masterNode = masterNode;
         this.slaveNodes = slaveNodes;
     }
 
-    private HostAndPort toHostAndPort(RedisClusterNode redisClusterNode) {
-        RedisURI uri = redisClusterNode.getUri();
-        return HostAndPort.fromParts(uri.getHost(), uri.getPort());
-    }
-
-    private List<HostAndPort> toHostAndPorts(List<RedisClusterNode> nodes) {
-        List<HostAndPort> result = new ArrayList<>();
-        for (RedisClusterNode node : nodes) {
-            result.add(toHostAndPort(node));
-        }
-        return result;
-    }
-
     private RedisClusterNode toRedisClusterNode(HostAndPort hostAndPort, String slaveOf, Set<RedisClusterNode.NodeFlag> flags) {
         RedisClusterNode redisClusterNode = new RedisClusterNode();
-        redisClusterNode.setUri(RedisURI
-                .create(hostAndPort.getHostText(), hostAndPort.getPortOrDefault(RedisURI.DEFAULT_REDIS_PORT)));
+        redisClusterNode
+                .setUri(RedisURI.create(hostAndPort.getHostText(), hostAndPort.getPortOrDefault(RedisURI.DEFAULT_REDIS_PORT)));
         redisClusterNode.setSlaveOf(slaveOf);
         redisClusterNode.setFlags(flags);
         return redisClusterNode;
     }
 
-    private List<RedisClusterNode> toRedisClusterNodes(List<HostAndPort> hostAndPorts, String slaveOf, Set<RedisClusterNode.NodeFlag> flags) {
+    private List<RedisClusterNode> toRedisClusterNodes(List<HostAndPort> hostAndPorts, String slaveOf,
+            Set<RedisClusterNode.NodeFlag> flags) {
         List<RedisClusterNode> result = new ArrayList<>();
         for (HostAndPort hostAndPort : hostAndPorts) {
             result.add(toRedisClusterNode(hostAndPort, slaveOf, flags));
@@ -118,24 +73,6 @@ public int getTo() {
         return to;
     }
 
-    /**
-     * @deprecated Use {@link #getMasterNode()} to retrieve the {@code nodeId} and the {@code slaveOf} details.
-     * @return the master host and port
-     */
-    @Deprecated
-    public HostAndPort getMaster() {
-        return master;
-    }
-
-    /**
-     * @deprecated Use {@link #getSlaveNodes()} to retrieve the {@code nodeId} and the {@code slaveOf} details.
-     * @return the master host and port
-     */
-    @Deprecated
-    public List<HostAndPort> getSlaves() {
-        return slaves;
-    }
-
     public RedisClusterNode getMasterNode() {
         return masterNode;
     }
@@ -160,17 +97,6 @@ public void setTo(int to) {
         this.to = to;
     }
 
-    public void setMaster(HostAndPort master) {
-        LettuceAssert.notNull(master, "Master must not be null");
-        this.master = master;
-    }
-
-    public void setSlaves(List<HostAndPort> slaves) {
-
-        LettuceAssert.notNull(slaves, "Slaves must not be null");
-        this.slaves = slaves;
-    }
-
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder();
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
index 3350621229..cf181b96de 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
@@ -43,15 +43,6 @@ public class MasterSlaveConnectionProvider<K, V> {
     private Object stateLock = new Object();
     private ReadFrom readFrom;
 
-    @Deprecated
-    public MasterSlaveConnectionProvider(RedisClient redisClient, RedisCodec<K, V> redisCodec,
-            StatefulRedisConnection<K, V> masterConnection, RedisURI initialRedisUri) {
-        this.initialRedisUri = initialRedisUri;
-        this.debugEnabled = logger.isDebugEnabled();
-        this.connectionFactory = new ConnectionFactory<>(redisClient, redisCodec);
-        connections.put(toConnectionKey(initialRedisUri), masterConnection);
-    }
-
     MasterSlaveConnectionProvider(RedisClient redisClient, RedisCodec<K, V> redisCodec, RedisURI initialRedisUri,
             Map<RedisURI, StatefulRedisConnection<K, V>> initialConnections) {
 
diff --git a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorOptions.java b/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorOptions.java
index eb4fa60ac9..6723979266 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorOptions.java
+++ b/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorOptions.java
@@ -2,7 +2,6 @@
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.ClientOptions;
 import com.lambdaworks.redis.internal.LettuceAssert;
 
 /**
@@ -74,11 +73,7 @@ public static class Builder {
         private boolean localDistinction = DEFAULT_LOCAL_DISTINCTION;
         private boolean enabled = DEFAULT_ENABLED;
 
-        /**
-         * @deprecated Use {@link ClientOptions#builder()}
-         */
-        @Deprecated
-        public Builder() {
+        private Builder() {
         }
 
         /**
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
index a22398e1ed..7a74854617 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
@@ -2,20 +2,13 @@
 
 package com.lambdaworks.redis.pubsub;
 
-import static com.lambdaworks.redis.protocol.CommandType.PSUBSCRIBE;
-import static com.lambdaworks.redis.protocol.CommandType.PUNSUBSCRIBE;
-import static com.lambdaworks.redis.protocol.CommandType.SUBSCRIBE;
-import static com.lambdaworks.redis.protocol.CommandType.UNSUBSCRIBE;
+import java.util.List;
+import java.util.Map;
 
 import com.lambdaworks.redis.RedisAsyncCommandsImpl;
 import com.lambdaworks.redis.RedisFuture;
 import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.protocol.CommandArgs;
 import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
-import rx.Observable;
-
-import java.util.List;
-import java.util.Map;
 
 /**
  * An asynchronous and thread-safe API for a Redis pub/sub connection.
@@ -24,8 +17,7 @@
  * @param <V> Value type.
  * @author Will Glozer
  */
-public class RedisPubSubAsyncCommandsImpl<K, V> extends RedisAsyncCommandsImpl<K, V> implements RedisPubSubConnection<K, V>,
-        RedisPubSubAsyncCommands<K, V> {
+public class RedisPubSubAsyncCommandsImpl<K, V> extends RedisAsyncCommandsImpl<K, V> implements RedisPubSubAsyncCommands<K, V> {
 
     private PubSubCommandBuilder<K, V> commandBuilder;
 
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubConnection.java b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubConnection.java
deleted file mode 100644
index ed47ea1d1d..0000000000
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubConnection.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.lambdaworks.redis.pubsub;
-
-import com.lambdaworks.redis.RedisAsyncConnection;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
-
-/**
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- * @deprecated Use {@link RedisPubSubAsyncCommands}
- */
-@Deprecated
-public interface RedisPubSubConnection<K, V> extends RedisAsyncConnection<K, V> {
-
-    /**
-     * Add a new listener.
-     * 
-     * @param listener Listener.
-     */
-    void addListener(RedisPubSubListener<K, V> listener);
-
-    /**
-     * Remove an existing listener.
-     * 
-     * @param listener Listener.
-     */
-    void removeListener(RedisPubSubListener<K, V> listener);
-
-    /**
-     * Listen for messages published to channels matching the given patterns.
-     * 
-     * @param patterns the patterns
-     * @return RedisFuture&lt;Void&gt; Future to synchronize {@code psubscribe} completion
-     */
-    RedisFuture<Void> psubscribe(K... patterns);
-
-    /**
-     * Stop listening for messages posted to channels matching the given patterns.
-     * 
-     * @param patterns the patterns
-     * @return RedisFuture&lt;Void&gt; Future to synchronize {@code punsubscribe} completion
-     */
-    RedisFuture<Void> punsubscribe(K... patterns);
-
-    /**
-     * Listen for messages published to the given channels.
-     * 
-     * @param channels the channels
-     * @return RedisFuture&lt;Void&gt; Future to synchronize {@code subscribe} completion
-     */
-    RedisFuture<Void> subscribe(K... channels);
-
-    /**
-     * Stop listening for messages posted to the given channels.
-     * 
-     * @param channels the channels
-     * @return RedisFuture&lt;Void&gt; Future to synchronize {@code unsubscribe} completion.
-     */
-    RedisFuture<Void> unsubscribe(K... channels);
-}
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
index 8916cef152..6652c69577 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
@@ -8,14 +8,15 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
+import com.lambdaworks.redis.RedisChannelWriter;
+import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.StatefulRedisConnectionImpl;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.protocol.ConnectionWatchdog;
 import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
 import com.lambdaworks.redis.pubsub.api.rx.RedisPubSubReactiveCommands;
 import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
+
 import io.netty.channel.ChannelHandler;
 import io.netty.util.internal.ConcurrentSet;
 
@@ -91,7 +92,7 @@ public RedisPubSubCommands<K, V> sync() {
 
     @Override
     protected RedisPubSubCommands<K, V> newRedisSyncCommandsImpl() {
-        return syncHandler(async(), RedisConnection.class, RedisClusterConnection.class, RedisPubSubCommands.class);
+        return syncHandler(async(), RedisPubSubCommands.class);
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java b/src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java
index 3e2f94a696..68a7f2d2a4 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java
@@ -1,9 +1,7 @@
 package com.lambdaworks.redis.pubsub.api.async;
 
-import com.lambdaworks.redis.RedisAsyncConnection;
 import com.lambdaworks.redis.RedisFuture;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.pubsub.RedisPubSubConnection;
 import com.lambdaworks.redis.pubsub.RedisPubSubListener;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
 
@@ -15,7 +13,7 @@
  * @author Mark Paluch
  * @since 3.0
  */
-public interface RedisPubSubAsyncCommands<K, V> extends RedisAsyncCommands<K, V>, RedisPubSubConnection<K, V> {
+public interface RedisPubSubAsyncCommands<K, V> extends RedisAsyncCommands<K, V> {
 
     /**
      * Add a new listener.
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java b/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java
index 7b19319903..f124325d46 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java
@@ -1,6 +1,5 @@
 package com.lambdaworks.redis.pubsub.api.sync;
 
-import com.lambdaworks.redis.RedisConnection;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.pubsub.RedisPubSubListener;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
index 8589bfa0c5..b39290f882 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
@@ -195,11 +195,7 @@ public static class Builder {
         private DnsResolver dnsResolver = DnsResolvers.JVM_DEFAULT;
         private Delay reconnectDelay = DEFAULT_RECONNECT_DELAY;
 
-        /**
-         * @deprecated Use {@link DefaultClientResources#builder()}
-         */
-        @Deprecated
-        public Builder() {
+        private Builder() {
         }
 
         /**
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
index c97abe7f29..5c3aeeb1e9 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
@@ -8,7 +8,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.RedisSentinelAsyncConnection;
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.internal.LettuceAssert;
@@ -26,8 +25,7 @@
  * @author Mark Paluch
  * @since 3.0
  */
-public class RedisSentinelAsyncCommandsImpl<K, V> implements RedisSentinelAsyncCommands<K, V>,
-        RedisSentinelAsyncConnection<K, V> {
+public class RedisSentinelAsyncCommandsImpl<K, V> implements RedisSentinelAsyncCommands<K, V> {
 
     private final SentinelCommandBuilder<K, V> commandBuilder;
     private final StatefulConnection<K, V> connection;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
index a9bd5400d7..6f70f3de72 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
@@ -94,12 +94,12 @@ public Observable<String> ping() {
         return createObservable(() -> commandBuilder.ping());
     }
 
-    @Override
+    //@Override
     public void close() {
         connection.close();
     }
 
-    @Override
+    //@Override
     public boolean isOpen() {
         return connection.isOpen();
     }
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java b/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java
index 1204d29648..677012500d 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java
@@ -1,12 +1,10 @@
 package com.lambdaworks.redis.sentinel.api.async;
 
-import java.io.Closeable;
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
 import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.RedisSentinelAsyncConnection;
 
 /**
  * Asynchronous executed commands for Redis Sentinel.
@@ -17,7 +15,7 @@
  * @since 4.0
  * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
  */
-public interface RedisSentinelAsyncCommands<K, V> extends Closeable, RedisSentinelAsyncConnection<K, V> {
+public interface RedisSentinelAsyncCommands<K, V> {
 
     /**
      * Return the ip and port number of the master with that name.
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/rx/RedisSentinelReactiveCommands.java b/src/main/java/com/lambdaworks/redis/sentinel/api/rx/RedisSentinelReactiveCommands.java
index be0217cfe2..74add9e9ef 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/rx/RedisSentinelReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/rx/RedisSentinelReactiveCommands.java
@@ -1,6 +1,5 @@
 package com.lambdaworks.redis.sentinel.api.rx;
 
-import java.io.Closeable;
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
@@ -16,7 +15,7 @@
  * @since 4.0
  * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
  */
-public interface RedisSentinelReactiveCommands<K, V> extends Closeable {
+public interface RedisSentinelReactiveCommands<K, V> {
 
     /**
      * Return the ip and port number of the master with that name.
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java b/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java
index aacb8a89b0..918bf1f92b 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java
@@ -1,6 +1,5 @@
 package com.lambdaworks.redis.sentinel.api.sync;
 
-import java.io.Closeable;
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
@@ -15,7 +14,7 @@
  * @since 4.0
  * @generated by com.lambdaworks.apigenerator.CreateSyncApi
  */
-public interface RedisSentinelCommands<K, V> extends Closeable {
+public interface RedisSentinelCommands<K, V> {
 
     /**
      * Return the ip and port number of the master with that name.
diff --git a/src/main/java/com/lambdaworks/redis/support/ClientResourcesFactoryBean.java b/src/main/java/com/lambdaworks/redis/support/ClientResourcesFactoryBean.java
index c48ae6a619..dfa01b6d71 100644
--- a/src/main/java/com/lambdaworks/redis/support/ClientResourcesFactoryBean.java
+++ b/src/main/java/com/lambdaworks/redis/support/ClientResourcesFactoryBean.java
@@ -50,7 +50,7 @@ public Class<?> getObjectType() {
 
     @Override
     protected ClientResources createInstance() throws Exception {
-        return new DefaultClientResources.Builder().computationThreadPoolSize(computationThreadPoolSize)
+        return DefaultClientResources.builder().computationThreadPoolSize(computationThreadPoolSize)
                 .ioThreadPoolSize(ioThreadPoolSize).build();
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/support/PoolingProxyFactory.java b/src/main/java/com/lambdaworks/redis/support/PoolingProxyFactory.java
deleted file mode 100644
index 237085bf59..0000000000
--- a/src/main/java/com/lambdaworks/redis/support/PoolingProxyFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.lambdaworks.redis.support;
-
-import java.lang.reflect.Proxy;
-
-import com.lambdaworks.redis.RedisConnectionPool;
-
-/**
- * Pooling proxy factory to create transparent pooling proxies. These proxies will allocate internally connections and use
- * always valid connections. You don't need to allocate/free the connections anymore.
- * 
- * @author Mark Paluch
- * @since 3.0
- */
-public class PoolingProxyFactory {
-
-    /**
-     * Utility constructor.
-     */
-    private PoolingProxyFactory() {
-
-    }
-
-    /**
-     * Creates a transparent connection pooling proxy. Will re-check the connection every 5 secs.
-     * 
-     * @param connectionPool The Redis connection pool
-     * @param <T> Type of the connection.
-     * @return Transparent pooling proxy.
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> T create(RedisConnectionPool<T> connectionPool) {
-        Class<?> componentType = connectionPool.getComponentType();
-
-        TransparentPoolingInvocationHandler<T> h = new TransparentPoolingInvocationHandler<T>(connectionPool);
-
-        Object o = Proxy.newProxyInstance(PoolingProxyFactory.class.getClassLoader(), new Class<?>[] { componentType }, h);
-
-        return (T) o;
-    }
-
-}
diff --git a/src/main/java/com/lambdaworks/redis/support/TransparentPoolingInvocationHandler.java b/src/main/java/com/lambdaworks/redis/support/TransparentPoolingInvocationHandler.java
deleted file mode 100644
index 5234c45ccd..0000000000
--- a/src/main/java/com/lambdaworks/redis/support/TransparentPoolingInvocationHandler.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.lambdaworks.redis.support;
-
-import java.lang.reflect.Method;
-
-import com.lambdaworks.redis.RedisConnectionPool;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.internal.AbstractInvocationHandler;
-
-/**
- * Invocation Handler with transparent pooling. This handler is thread-safe.
- * 
- * @author Mark Paluch
- * @since 3.0
- */
-public class TransparentPoolingInvocationHandler<T> extends AbstractInvocationHandler {
-
-    private RedisConnectionPool<T> pool;
-
-    public TransparentPoolingInvocationHandler(RedisConnectionPool<T> pool) {
-        this.pool = pool;
-    }
-
-    @Override
-    protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
-
-        if (pool == null) {
-            throw new RedisException("Connection pool is closed");
-        }
-
-        if (method.getName().equals("close")) {
-            pool.close();
-            pool = null;
-            return null;
-        }
-
-        T connection = pool.allocateConnection();
-        try {
-            return method.invoke(connection, args);
-        } finally {
-            pool.freeConnection(connection);
-        }
-    }
-
-    public RedisConnectionPool<T> getPool() {
-        return pool;
-    }
-
-}
diff --git a/src/main/java/com/lambdaworks/redis/support/WithConnection.java b/src/main/java/com/lambdaworks/redis/support/WithConnection.java
deleted file mode 100644
index 70c0a2f58b..0000000000
--- a/src/main/java/com/lambdaworks/redis/support/WithConnection.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.lambdaworks.redis.support;
-
-import com.lambdaworks.redis.RedisConnectionPool;
-
-/**
- * Execution-Template which allocates a connection around the run()-call. Use this class as adapter template and implement your
- * redis calls within the run-method.
- * 
- * @param <T> Connection type.
- * @author Mark Paluch
- * @since 3.0
- */
-public abstract class WithConnection<T> {
-
-    /**
-     * Performs connection handling and invokes the run-method with a valid Redis connection.
-     * 
-     * @param pool the connection pool.
-     */
-    public WithConnection(RedisConnectionPool<T> pool) {
-        T connection = pool.allocateConnection();
-        try {
-            run(connection);
-        } finally {
-            pool.freeConnection(connection);
-        }
-    }
-
-    /**
-     * Execution method. Will be called with a valid redis connection.
-     * 
-     * @param connection the connection
-     */
-    protected abstract void run(T connection);
-}
diff --git a/src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java b/src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java
index d6b280fa16..8242dfaf0d 100644
--- a/src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java
@@ -149,4 +149,18 @@ public interface BaseRedisCommands<K, V> extends AutoCloseable {
      */
     void reset();
 
+    /**
+     * Disable or enable auto-flush behavior. Default is {@literal true}. If autoFlushCommands is disabled, multiple commands
+     * can be issued without writing them actually to the transport. Commands are buffered until a {@link #flushCommands()} is
+     * issued. After calling {@link #flushCommands()} commands are sent to the transport and executed by Redis.
+     *
+     * @param autoFlush state of autoFlush.
+     */
+    void setAutoFlushCommands(boolean autoFlush);
+
+    /**
+     * Flush pending commands. This commands forces a flush on the channel and can be used to buffer ("pipeline") commands to
+     * achieve batching. No-op if channel is not connected.
+     */
+    void flushCommands();
 }
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisListCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisListCommands.java
index ec2b74f3e5..d1dbee8ac2 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisListCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisListCommands.java
@@ -98,17 +98,6 @@ public interface RedisListCommands<K, V> {
      */
     Long lpush(K key, V... values);
 
-    /**
-     * Prepend a value to a list, only if the list exists.
-     * 
-     * @param key the key
-     * @param value the value
-     * @return Long integer-reply the length of the list after the push operation.
-     * @deprecated Use {@link #lpushx(Object, Object[])}
-     */
-    @Deprecated
-    Long lpushx(K key, V value);
-
     /**
      * Prepend values to a list, only if the list exists.
      *
@@ -195,17 +184,6 @@ public interface RedisListCommands<K, V> {
      */
     Long rpush(K key, V... values);
 
-    /**
-     * Append a value to a list, only if the list exists.
-     * 
-     * @param key the key
-     * @param value the value
-     * @return Long integer-reply the length of the list after the push operation.
-     * @deprecated Use {@link #rpushx(java.lang.Object, java.lang.Object[])}
-     */
-    @Deprecated
-    Long rpushx(K key, V value);
-
     /**
      * Append values to a list, only if the list exists.
      *
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java
index 8020e24a0f..ac71032723 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java
@@ -1,9 +1,9 @@
 package com.lambdaworks.redis;
 
-import java.io.Closeable;
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
+
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
 
 /**
@@ -14,7 +14,7 @@
  * @author Mark Paluch
  * @since 4.0
  */
-public interface RedisSentinelCommands<K, V> extends Closeable{
+public interface RedisSentinelCommands<K, V> {
 
     /**
      * Return the ip and port number of the master with that name.
@@ -103,7 +103,6 @@ public interface RedisSentinelCommands<K, V> extends Closeable{
     /**
      * close the underlying connection.
      */
-    @Override
     void close();
 
     /**
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisServerCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisServerCommands.java
index 2c33a0b905..790e7a0087 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisServerCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisServerCommands.java
@@ -314,14 +314,6 @@ public interface RedisServerCommands<K, V> {
      */
     String slowlogReset();
 
-    /**
-     * Internal command used for replication.
-     * 
-     * @return String simple-string-reply
-     */
-    @Deprecated
-    String sync();
-
     /**
      * Return the current server time.
      * 
@@ -332,5 +324,4 @@ public interface RedisServerCommands<K, V> {
      *         unix time in seconds. microseconds.
      */
     List<V> time();
-
 }
diff --git a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
index 6e7f515d0b..fad1917949 100644
--- a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
+++ b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
@@ -1,14 +1,17 @@
 package biz.paluch.redis.extensibility;
 
-import java.util.*;
+import java.util.List;
+import java.util.Set;
+
 import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.api.sync.RedisCommands;
 
 public class LettuceGeoDemo {
 
     public static void main(String[] args) {
 
         RedisClient redisClient = RedisClient.create(RedisURI.Builder.redis("localhost", 6379).build());
-        RedisConnection<String, String> redis = (RedisConnection<String, String>) redisClient.connect();
+        RedisCommands<String, String> redis = redisClient.connect().sync();
         String key = "my-geo-set";
 
         redis.geoadd(key, 8.6638775, 49.5282537, "Weinheim", 8.3796281, 48.9978127, "Office tower", 8.665351, 49.553302,
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
index f1c2014db6..42be2f7f2f 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
@@ -1,13 +1,15 @@
 package biz.paluch.redis.extensibility;
 
+import java.util.concurrent.TimeUnit;
+
+import javax.enterprise.inject.Alternative;
+
 import com.lambdaworks.redis.RedisClient;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.pubsub.PubSubCommandHandler;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl;
-
-import javax.enterprise.inject.Alternative;
-import java.util.concurrent.TimeUnit;
+import com.lambdaworks.redis.resource.ClientResources;
 
 /**
  * Demo code for extending a RedisClient.
@@ -16,19 +18,12 @@
  */
 @Alternative
 public class MyExtendedRedisClient extends RedisClient {
-    public MyExtendedRedisClient() {
-    }
 
-    public MyExtendedRedisClient(String host) {
-        super(host);
+    public MyExtendedRedisClient(ClientResources clientResources, RedisURI redisURI) {
+        super(clientResources, redisURI);
     }
 
-    public MyExtendedRedisClient(String host, int port) {
-        super(host, port);
-    }
-
-    public MyExtendedRedisClient(RedisURI redisURI) {
-        super(redisURI);
+    public MyExtendedRedisClient() {
     }
 
     @Override
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
index a2d1db7ae7..a28f804d20 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
@@ -1,15 +1,17 @@
 package biz.paluch.redis.extensibility;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisConnection;
+import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.TestSettings;
+import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.pubsub.RedisPubSubAsyncCommandsImpl;
+import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
 import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
 
 /**
@@ -20,7 +22,7 @@ public class MyExtendedRedisClientTest {
     public static final int port = TestSettings.port();
 
     protected static MyExtendedRedisClient client;
-    protected RedisConnection<String, String> redis;
+    protected RedisCommands<String, String> redis;
     protected String key = "key";
     protected String value = "value";
 
@@ -30,7 +32,7 @@ public static void setupClient() {
     }
 
     protected static MyExtendedRedisClient getRedisClient() {
-        return new MyExtendedRedisClient(host, port);
+        return new MyExtendedRedisClient(null, RedisURI.create(host, port));
     }
 
     @AfterClass
@@ -40,11 +42,12 @@ public static void shutdownClient() {
 
     @Test
     public void testPubsub() throws Exception {
-        RedisPubSubAsyncCommands<String, String> connection = client.connectPubSub().async();
-        assertThat(connection).isInstanceOf(RedisPubSubAsyncCommandsImpl.class);
-        assertThat(connection.getStatefulConnection()).isInstanceOf(MyPubSubConnection.class);
-        connection.set("key", "value").get();
+        StatefulRedisPubSubConnection<String, String> connection = client
+                .connectPubSub();
+        RedisPubSubAsyncCommands<String, String> commands = connection.async();
+        assertThat(commands).isInstanceOf(RedisPubSubAsyncCommandsImpl.class);
+        assertThat(commands.getStatefulConnection()).isInstanceOf(MyPubSubConnection.class);
+        commands.set("key", "value").get();
         connection.close();
-
     }
 }
diff --git a/src/test/java/com/lambdaworks/Connections.java b/src/test/java/com/lambdaworks/Connections.java
index ea11e61cf7..f54947a246 100644
--- a/src/test/java/com/lambdaworks/Connections.java
+++ b/src/test/java/com/lambdaworks/Connections.java
@@ -1,8 +1,11 @@
 package com.lambdaworks;
 
+import java.util.Queue;
+
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.lambdaworks.redis.RedisChannelHandler;
+import com.lambdaworks.redis.RedisChannelWriter;
 import com.lambdaworks.redis.StatefulRedisConnectionImpl;
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
@@ -31,4 +34,21 @@ public static ConnectionWatchdog getConnectionWatchdog(StatefulConnection<?, ?>
     public static <K, V> StatefulRedisConnectionImpl<K, V> getStatefulConnection(RedisAsyncCommands<K, V> connection) {
         return (StatefulRedisConnectionImpl<K, V>) connection.getStatefulConnection();
     }
+
+    public static <K, V> RedisChannelWriter<K, V> getChannelWriter(StatefulConnection<K, V> connection) {
+        return ((RedisChannelHandler<K, V>) connection).getChannelWriter();
+    }
+
+
+    public static Queue<Object> getQueue(StatefulConnection<?, ?> connection) {
+        return (Queue<Object>) ReflectionTestUtils.getField(Connections.getChannelWriter(connection), "queue");
+    }
+
+    public static Queue<Object> getCommandBuffer(StatefulConnection<?, ?> connection) {
+        return (Queue<Object>) ReflectionTestUtils.getField(Connections.getChannelWriter(connection), "commandBuffer");
+    }
+
+    public static String getConnectionState(StatefulConnection<?, ?> connection) {
+        return ReflectionTestUtils.getField(Connections.getChannelWriter(connection), "lifecycleState").toString();
+    }
 }
diff --git a/src/test/java/com/lambdaworks/TestClientResources.java b/src/test/java/com/lambdaworks/TestClientResources.java
index 89478cc9a1..165adec08b 100644
--- a/src/test/java/com/lambdaworks/TestClientResources.java
+++ b/src/test/java/com/lambdaworks/TestClientResources.java
@@ -16,7 +16,7 @@
 public class TestClientResources {
 
     public static ClientResources create() {
-        final DefaultClientResources resources = new DefaultClientResources.Builder().eventLoopGroupProvider(
+        final DefaultClientResources resources = DefaultClientResources.builder().eventLoopGroupProvider(
                 new TestEventLoopGroupProvider()).build();
 
         Runtime.getRuntime().addShutdownHook(new Thread() {
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java
index e2f784b4cd..914aac2530 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java
@@ -61,24 +61,7 @@ public CreateAsyncApi(String templateName) {
         }
 
         factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(),
-                methodTypeMutator(), methodDeclaration -> true, importSupplier(), typeMutator(), null);
-    }
-
-    private Consumer<ClassOrInterfaceDeclaration> typeMutator() {
-        return type -> {
-
-            if (type.getName().contains("SentinelAsyncCommands")) {
-                type.getExtends().add(new ClassOrInterfaceType("RedisSentinelAsyncConnection<K, V>"));
-                CompilationUnit compilationUnit = (CompilationUnit) type.getParentNode();
-                if (compilationUnit.getImports() == null) {
-                    compilationUnit.setImports(new ArrayList<>());
-                }
-                compilationUnit.getImports()
-                        .add(new ImportDeclaration(new NameExpr("com.lambdaworks.redis.RedisSentinelAsyncConnection"), false,
-                                false));
-            }
-
-        };
+                methodTypeMutator(), methodDeclaration -> true, importSupplier(), null, null);
     }
 
     /**
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
index 0f83a7d863..5ee043a9fe 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
@@ -69,7 +69,7 @@ protected Function<String, String> commentMutator() {
     }
 
     /**
-     * Mutate type to async result.
+     * Method filter
      *
      * @return
      */
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
index 832ae8c9a9..d128097853 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
@@ -27,7 +27,7 @@ public class CreateReactiveApi {
 
     private Set<String> KEEP_METHOD_RESULT_TYPE = LettuceSets.unmodifiableSet(
             "digest", "close", "isOpen", "BaseRedisCommands.reset",
-            "getStatefulConnection");
+            "getStatefulConnection", "setAutoFlushCommands", "flushCommands");
 
     private CompilationUnitFactory factory;
 
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java
index ab04430a5c..9ac6075046 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java
@@ -4,9 +4,13 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 
+import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
+import com.lambdaworks.redis.internal.LettuceSets;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -22,6 +26,8 @@
 @RunWith(Parameterized.class)
 public class CreateSyncApi {
 
+    private Set<String> FILTER_METHODS = LettuceSets.unmodifiableSet("setAutoFlushCommands", "flushCommands");
+
     private CompilationUnitFactory factory;
 
     @Parameterized.Parameters(name = "Create {0}")
@@ -52,7 +58,7 @@ public CreateSyncApi(String templateName) {
         }
 
         factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(),
-                methodTypeMutator(), methodDeclaration -> true, importSupplier(), null, null);
+                methodTypeMutator(), methodFilter(), importSupplier(), null, null);
     }
 
     /**
@@ -65,6 +71,23 @@ protected Function<String, String> commentMutator() {
                 + getClass().getName() + "\r\n ";
     }
 
+    /**
+     * Method filter
+     *
+     * @return
+     */
+    protected Predicate<MethodDeclaration> methodFilter() {
+        return method -> {
+            ClassOrInterfaceDeclaration classOfMethod = (ClassOrInterfaceDeclaration) method.getParentNode();
+            if (FILTER_METHODS.contains(method.getName())
+                    || FILTER_METHODS.contains(classOfMethod.getName() + "." + method.getName())) {
+                return false;
+            }
+
+            return true;
+        };
+    }
+
     /**
      * Mutate type to async result.
      * 
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedis.java b/src/test/java/com/lambdaworks/examples/ConnectToRedis.java
index a7448257f8..b8b3d66237 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToRedis.java
+++ b/src/test/java/com/lambdaworks/examples/ConnectToRedis.java
@@ -1,8 +1,6 @@
 package com.lambdaworks.examples;
 
 import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisConnection;
-import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 
 /**
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedisCluster.java b/src/test/java/com/lambdaworks/examples/ConnectToRedisCluster.java
index 9e57c28fa6..2eb5701ad7 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToRedisCluster.java
+++ b/src/test/java/com/lambdaworks/examples/ConnectToRedisCluster.java
@@ -1,8 +1,5 @@
 package com.lambdaworks.examples;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.RedisAdvancedClusterConnection;
 import com.lambdaworks.redis.cluster.RedisClusterClient;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 
diff --git a/src/test/java/com/lambdaworks/examples/SpringExample.java b/src/test/java/com/lambdaworks/examples/SpringExample.java
index 5eedd2c601..9ac1c334c8 100644
--- a/src/test/java/com/lambdaworks/examples/SpringExample.java
+++ b/src/test/java/com/lambdaworks/examples/SpringExample.java
@@ -1,11 +1,10 @@
 package com.lambdaworks.examples;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisConnection;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.api.sync.RedisCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java b/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java
index 05df78814d..e7ed946c03 100644
--- a/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java
+++ b/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java
@@ -37,12 +37,12 @@ public void standaloneSync() throws Exception {
 
     @Test
     public void standaloneAsync() throws Exception {
-        redisClient.connect().async().close();
+        redisClient.connect().async().getStatefulConnection().close();
     }
 
     @Test
     public void standaloneReactive() throws Exception {
-        redisClient.connect().reactive().close();
+        redisClient.connect().reactive().getStatefulConnection().close();
     }
 
     @Test
@@ -50,21 +50,6 @@ public void standaloneStateful() throws Exception {
         redisClient.connect().close();
     }
 
-    @Test
-    public void deprecatedStandaloneAsync() throws Exception {
-        redisClient.connectAsync().close();
-    }
-
-    @Test
-    public void deprecatedStandaloneReactive() throws Exception {
-        redisClient.connectAsync().getStatefulConnection().reactive().close();
-    }
-
-    @Test
-    public void deprecatedStandaloneStateful() throws Exception {
-        redisClient.connectAsync().getStatefulConnection().close();
-    }
-
     // PubSub
     @Test
     public void pubsubSync() throws Exception {
@@ -94,12 +79,12 @@ public void sentinelSync() throws Exception {
 
     @Test
     public void sentinelAsync() throws Exception {
-        redisClient.connectSentinel().async().close();
+        redisClient.connectSentinel().async().getStatefulConnection().close();
     }
 
     @Test
     public void sentinelReactive() throws Exception {
-        redisClient.connectSentinel().reactive().close();
+        redisClient.connectSentinel().reactive().getStatefulConnection().close();
     }
 
     @Test
@@ -107,51 +92,20 @@ public void sentinelStateful() throws Exception {
         redisClient.connectSentinel().close();
     }
 
-    @Test
-    public void deprecatedSentinelSync() throws Exception {
-        redisClient.connectSentinelAsync().getStatefulConnection().sync().close();
-    }
-
-    @Test
-    public void deprecatedSentinelAsync() throws Exception {
-        redisClient.connectSentinelAsync().getStatefulConnection().async().close();
-    }
-
-    @Test
-    public void deprecatedSentinelReactive() throws Exception {
-        redisClient.connectSentinelAsync().getStatefulConnection().reactive().close();
-    }
-
-    @Test
-    public void deprecatedSentinelStateful() throws Exception {
-        redisClient.connectSentinelAsync().getStatefulConnection().close();
-    }
-
-    // Pool
-    @Test
-    public void poolSync() throws Exception {
-        redisClient.pool().close();
-    }
-
-    @Test
-    public void poolAsync() throws Exception {
-        redisClient.asyncPool().close();
-    }
-
     // Cluster
     @Test
     public void clusterSync() throws Exception {
-        clusterClient.connect().sync().close();
+        clusterClient.connect().sync().getStatefulConnection().close();
     }
 
     @Test
     public void clusterAsync() throws Exception {
-        clusterClient.connect().async().close();
+        clusterClient.connect().async().getStatefulConnection().close();
     }
 
     @Test
     public void clusterReactive() throws Exception {
-        clusterClient.connect().reactive().close();
+        clusterClient.connect().reactive().getStatefulConnection().close();
     }
 
     @Test
@@ -161,17 +115,17 @@ public void clusterStateful() throws Exception {
 
     @Test
     public void clusterPubSubSync() throws Exception {
-        clusterClient.connectPubSub().sync().close();
+        clusterClient.connectPubSub().sync().getStatefulConnection().close();
     }
 
     @Test
     public void clusterPubSubAsync() throws Exception {
-        clusterClient.connectPubSub().async().close();
+        clusterClient.connectPubSub().async().getStatefulConnection().close();
     }
 
     @Test
     public void clusterPubSubReactive() throws Exception {
-        clusterClient.connectPubSub().reactive().close();
+        clusterClient.connectPubSub().reactive().getStatefulConnection().close();
     }
 
     @Test
@@ -179,31 +133,10 @@ public void clusterPubSubStateful() throws Exception {
         clusterClient.connectPubSub().close();
     }
 
-    @Test
-    public void deprecatedClusterSync() throws Exception {
-        clusterClient.connectCluster().getStatefulConnection().sync().close();
-    }
-
-    @Test
-    public void deprecatedClusterAsync() throws Exception {
-        clusterClient.connectCluster().getStatefulConnection().async().close();
-    }
-
-    @Test
-    public void deprecatedClusterReactive() throws Exception {
-        clusterClient.connectCluster().getStatefulConnection().reactive().close();
-    }
-
-    @Test
-    public void deprecatedClusterStateful() throws Exception {
-        clusterClient.connectCluster().getStatefulConnection().close();
-    }
-
     // Advanced Cluster
     @Test
     public void advancedClusterSync() throws Exception {
-        StatefulRedisClusterConnection<String, String> statefulConnection = clusterClient.connectCluster()
-                .getStatefulConnection();
+        StatefulRedisClusterConnection<String, String> statefulConnection = clusterClient.connect();
         RedisURI uri = clusterClient.getPartitions().getPartition(0).getUri();
         statefulConnection.getConnection(uri.getHost(), uri.getPort()).sync();
         statefulConnection.close();
@@ -211,8 +144,7 @@ public void advancedClusterSync() throws Exception {
 
     @Test
     public void advancedClusterAsync() throws Exception {
-        StatefulRedisClusterConnection<String, String> statefulConnection = clusterClient.connectCluster()
-                .getStatefulConnection();
+        StatefulRedisClusterConnection<String, String> statefulConnection = clusterClient.connect();
         RedisURI uri = clusterClient.getPartitions().getPartition(0).getUri();
         statefulConnection.getConnection(uri.getHost(), uri.getPort()).sync();
         statefulConnection.close();
@@ -220,8 +152,7 @@ public void advancedClusterAsync() throws Exception {
 
     @Test
     public void advancedClusterReactive() throws Exception {
-        StatefulRedisClusterConnection<String, String> statefulConnection = clusterClient.connectCluster()
-                .getStatefulConnection();
+        StatefulRedisClusterConnection<String, String> statefulConnection = clusterClient.connect();
         RedisURI uri = clusterClient.getPartitions().getPartition(0).getUri();
         statefulConnection.getConnection(uri.getHost(), uri.getPort()).reactive();
         statefulConnection.close();
@@ -232,11 +163,6 @@ public void advancedClusterStateful() throws Exception {
         clusterClient.connect().close();
     }
 
-    @Test
-    public void deprecatedAvancedClusterStateful() throws Exception {
-        clusterClient.connectCluster().getStatefulConnection().close();
-    }
-
     // Cluster node selection
     @Test
     public void nodeSelectionClusterAsync() throws Exception {
diff --git a/src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java b/src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java
index 6ea4e377ef..00bd094582 100644
--- a/src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java
@@ -15,20 +15,22 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import com.lambdaworks.redis.api.async.RedisAsyncCommands;
+
 public class AsyncConnectionTest extends AbstractRedisClientTest {
-    private RedisAsyncConnection<String, String> async;
+    private RedisAsyncCommands<String, String> async;
 
     @Rule
     public ExpectedException exception = ExpectedException.none();
 
     @Before
     public void openAsyncConnection() throws Exception {
-        async = client.connectAsync();
+        async = client.connect().async();
     }
 
     @After
     public void closeAsyncConnection() throws Exception {
-        async.close();
+        async.getStatefulConnection().close();
     }
 
     @Test(timeout = 10000)
@@ -76,7 +78,7 @@ public void run() {
             redis.lpush(key, "" + i);
         }
 
-        RedisAsyncConnection<String, String> connection = client.connectAsync();
+        RedisAsyncCommands<String, String> connection = client.connect().async();
 
         Long len = connection.llen(key).get();
         assertThat(len.intValue()).isEqualTo(1000);
@@ -91,7 +93,7 @@ public void run() {
 
         assertThat(run).hasSize(1);
 
-        connection.close();
+        connection.getStatefulConnection().close();
 
     }
 
@@ -107,7 +109,7 @@ public void run() {
             }
         };
 
-        RedisAsyncConnection<String, String> connection = client.connectAsync();
+        RedisAsyncCommands<String, String> connection = client.connect().async();
 
         RedisFuture<String> set = connection.set(key, value);
         set.get();
@@ -116,7 +118,7 @@ public void run() {
 
         assertThat(run).hasSize(1);
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test(timeout = 500)
diff --git a/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java b/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
index b81efa0e22..785090adae 100644
--- a/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
@@ -61,8 +61,8 @@ public void variousClientOptions() throws Exception {
 
         assertThat(getStatefulConnection(plain).getOptions().isAutoReconnect()).isTrue();
 
-        plain.close();
-        connection.close();
+        plain.getStatefulConnection().close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
@@ -75,7 +75,7 @@ public void requestQueueSize() throws Exception {
 
         connection.quit();
 
-        Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
+        Wait.untilTrue(() -> !connection.getStatefulConnection().isOpen()).waitOrTimeout();
 
         for (int i = 0; i < 10; i++) {
             connection.ping();
@@ -88,7 +88,7 @@ public void requestQueueSize() throws Exception {
             assertThat(e).hasMessageContaining("Request queue size exceeded");
         }
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
@@ -99,13 +99,13 @@ public void disconnectedWithoutReconnect() throws Exception {
         RedisAsyncCommands<String, String> connection = client.connect().async();
 
         connection.quit();
-        Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
+        Wait.untilTrue(() -> !connection.getStatefulConnection().isOpen()).waitOrTimeout();
         try {
             connection.get(key);
         } catch (Exception e) {
             assertThat(e).isInstanceOf(RedisException.class).hasMessageContaining("not connected");
         } finally {
-            connection.close();
+            connection.getStatefulConnection().close();
         }
     }
 
@@ -119,13 +119,13 @@ public void disconnectedRejectCommands() throws Exception {
 
         getConnectionWatchdog(connection.getStatefulConnection()).setListenOnChannelInactive(false);
         connection.quit();
-        Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
+        Wait.untilTrue(() -> !connection.getStatefulConnection().isOpen()).waitOrTimeout();
         try {
             connection.get(key);
         } catch (Exception e) {
             assertThat(e).isInstanceOf(RedisException.class).hasMessageContaining("not connected");
         } finally {
-            connection.close();
+            connection.getStatefulConnection().close();
         }
     }
 
@@ -138,9 +138,9 @@ public void disconnectedAcceptCommands() throws Exception {
         RedisAsyncCommands<String, String> connection = client.connect().async();
 
         connection.quit();
-        Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
+        Wait.untilTrue(() -> !connection.getStatefulConnection().isOpen()).waitOrTimeout();
         connection.get(key);
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test(timeout = 10000)
@@ -154,7 +154,7 @@ public void pingBeforeConnect() throws Exception {
             String result = connection.get(key);
             assertThat(result).isEqualTo(value);
         } finally {
-            connection.close();
+            connection.getStatefulConnection().close();
         }
     }
 
@@ -174,7 +174,7 @@ protected void run(RedisClient client) throws Exception {
                     String result = connection.info();
                     assertThat(result).contains("memory");
                 } finally {
-                    connection.close();
+                    connection.getStatefulConnection().close();
                 }
 
             }
@@ -198,7 +198,7 @@ protected void run(RedisClient client) throws Exception {
                     String result = connection.info();
                     assertThat(result).contains("memory");
                 } finally {
-                    connection.close();
+                    connection.getStatefulConnection().close();
                 }
 
             }
@@ -241,7 +241,6 @@ protected void run(RedisClient client) throws Exception {
                 } catch (RedisConnectionException e) {
                     assertThat(e).hasRootCauseInstanceOf(RedisCommandExecutionException.class);
                 }
-
             }
         };
     }
@@ -251,7 +250,7 @@ public void pingBeforeConnectWithQueuedCommandsAndReconnect() throws Exception {
 
         StatefulRedisConnection<String, String> controlConnection = client.connect();
 
-        client.setOptions(new ClientOptions.Builder().pingBeforeActivateConnection(true).build());
+        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
 
         Utf8StringCodec codec = new Utf8StringCodec();
 
@@ -298,7 +297,7 @@ protected void run(RedisClient client) throws Exception {
                 RedisURI redisURI = RedisURI.Builder.redis(host, port).withPassword(passwd).withDatabase(5).build();
                 StatefulRedisConnection<String, String> controlConnection = client.connect(redisURI);
 
-                client.setOptions(new ClientOptions.Builder().pingBeforeActivateConnection(true).build());
+                client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
 
                 Utf8StringCodec codec = new Utf8StringCodec();
 
diff --git a/src/test/java/com/lambdaworks/redis/ClientTest.java b/src/test/java/com/lambdaworks/redis/ClientTest.java
index 470d332d39..8e8b8a4ac7 100644
--- a/src/test/java/com/lambdaworks/redis/ClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientTest.java
@@ -4,13 +4,9 @@
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
 import static com.google.code.tempusfugit.temporal.WaitFor.waitOrTimeout;
-import static com.lambdaworks.Connections.getConnectionWatchdog;
 import static com.lambdaworks.Connections.getStatefulConnection;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
 
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.FixMethodOrder;
@@ -18,17 +14,11 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runners.MethodSorters;
-import org.springframework.test.util.ReflectionTestUtils;
 
 import com.google.code.tempusfugit.temporal.Condition;
 import com.google.code.tempusfugit.temporal.Timeout;
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.ClientOptions.DisconnectedBehavior;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.protocol.ConnectionWatchdog;
-import com.lambdaworks.redis.server.RandomResponseServer;
-import io.netty.channel.Channel;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ClientTest extends AbstractRedisClientTest {
@@ -165,18 +155,20 @@ public void interrupt() throws Exception {
 
     @Test
     public void connectFailure() throws Exception {
-        RedisClient client = new RedisClient("invalid");
+        RedisClient client = RedisClient.create("redis://invalid");
         exception.expect(RedisException.class);
         exception.expectMessage("Unable to connect");
         client.connect();
+        FastShutdown.shutdown(client);
     }
 
     @Test
     public void connectPubSubFailure() throws Exception {
-        RedisClient client = new RedisClient("invalid");
+        RedisClient client = RedisClient.create("redis://invalid");
         exception.expect(RedisException.class);
         exception.expectMessage("Unable to connect");
         client.connectPubSub();
+        FastShutdown.shutdown(client);
     }
 
     private class TestConnectionListener implements RedisConnectionStateListener {
@@ -205,7 +197,7 @@ public void onRedisExceptionCaught(RedisChannelHandler<?, ?> connection, Throwab
     @Test
     public void emptyClient() throws Exception {
 
-        RedisClient client = new RedisClient();
+        RedisClient client = RedisClient.create();
         try {
             client.connect();
         } catch (IllegalStateException e) {
@@ -224,11 +216,6 @@ public void emptyClient() throws Exception {
             assertThat(e).hasMessageContaining("RedisURI");
         }
 
-        try {
-            client.connectAsync((RedisURI) null);
-        } catch (IllegalArgumentException e) {
-            assertThat(e).hasMessageContaining("RedisURI");
-        }
         FastShutdown.shutdown(client);
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java b/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
index ccc3893d4f..964f603320 100644
--- a/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
@@ -4,11 +4,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.concurrent.ExecutionException;
 
 import org.assertj.core.api.Assertions;
 import org.junit.FixMethodOrder;
@@ -17,8 +12,8 @@
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.protocol.BaseRedisCommandBuilder;
-import com.lambdaworks.redis.protocol.CommandHandler;
+import com.lambdaworks.redis.api.async.RedisAsyncCommands;
+import com.lambdaworks.redis.api.sync.RedisCommands;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ConnectionCommandTest extends AbstractRedisClientTest {
@@ -27,7 +22,7 @@ public void auth() throws Exception {
         new WithPasswordRequired() {
             @Override
             public void run(RedisClient client) {
-                RedisConnection<String, String> connection = client.connect().sync();
+                RedisCommands<String, String> connection = client.connect().sync();
                 try {
                     connection.ping();
                     fail("Server doesn't require authentication");
@@ -38,10 +33,10 @@ public void run(RedisClient client) {
                 }
 
                 RedisURI redisURI = RedisURI.Builder.redis(host, port).withDatabase(2).withPassword(passwd).build();
-                RedisClient redisClient = new RedisClient(redisURI);
-                RedisConnection<String, String> authConnection = redisClient.connect().sync();
+                RedisClient redisClient = RedisClient.create(redisURI);
+                RedisCommands<String, String> authConnection = redisClient.connect().sync();
                 authConnection.ping();
-                authConnection.close();
+                authConnection.getStatefulConnection().close();
                 FastShutdown.shutdown(redisClient);
             }
         };
@@ -79,7 +74,7 @@ public void authReconnect() throws Exception {
         new WithPasswordRequired() {
             @Override
             public void run(RedisClient client) {
-                RedisConnection<String, String> connection = client.connect().sync();
+                RedisCommands<String, String> connection = client.connect().sync();
                 assertThat(connection.auth(passwd)).isEqualTo("OK");
                 assertThat(connection.set(key, value)).isEqualTo("OK");
                 connection.quit();
@@ -96,78 +91,6 @@ public void selectReconnect() throws Exception {
         assertThat(redis.get(key)).isEqualTo(value);
     }
 
-    @Test
-    public void isValid() throws Exception {
-
-        assertThat(Connections.isValid(redis)).isTrue();
-        RedisAsyncCommandsImpl<String, String> asyncConnection = (RedisAsyncCommandsImpl<String, String>) client.connectAsync();
-        RedisChannelHandler<String, String> channelHandler = (RedisChannelHandler<String, String>) asyncConnection
-                .getStatefulConnection();
-
-        assertThat(Connections.isValid(asyncConnection)).isTrue();
-        assertThat(Connections.isOpen(asyncConnection)).isTrue();
-        assertThat(asyncConnection.isOpen()).isTrue();
-        assertThat(channelHandler.isClosed()).isFalse();
-
-        CommandHandler<String, String> channelWriter = (CommandHandler<String, String>) channelHandler.getChannelWriter();
-        assertThat(channelWriter.isClosed()).isFalse();
-        assertThat(channelWriter.isSharable()).isTrue();
-
-        Connections.close(asyncConnection);
-        assertThat(Connections.isOpen(asyncConnection)).isFalse();
-        assertThat(Connections.isValid(asyncConnection)).isFalse();
-
-        assertThat(asyncConnection.isOpen()).isFalse();
-        assertThat(channelHandler.isClosed()).isTrue();
-
-        assertThat(channelWriter.isClosed()).isTrue();
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void isValidAsyncExceptions() throws Exception {
-
-        RedisAsyncConnection<?, ?> connection = mock(RedisAsyncConnection.class);
-        RedisFuture<String> future = mock(RedisFuture.class);
-        when(connection.ping()).thenReturn(future);
-
-        when(future.get()).thenThrow(new ExecutionException(new RuntimeException()));
-        assertThat(Connections.isValid(connection)).isFalse();
-
-    }
-
-    @Test
-    public void isValidSyncExceptions() throws Exception {
-
-        RedisConnection<?, ?> connection = mock(RedisConnection.class);
-
-        when(connection.ping()).thenThrow(new RuntimeException());
-        assertThat(Connections.isValid(connection)).isFalse();
-    }
-
-    @Test
-    public void closeExceptions() throws Exception {
-
-        RedisConnection<?, ?> connection = mock(RedisConnection.class);
-        doThrow(new RuntimeException()).when(connection).close();
-        Connections.close(connection);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void isValidWrongObject() throws Exception {
-        Connections.isValid(new Object());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void isOpenWrongObject() throws Exception {
-        Connections.isOpen(new Object());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void closeWrongObject() throws Exception {
-        Connections.close(new Object());
-    }
-
     @Test
     public void getSetReconnect() throws Exception {
         redis.set(key, value);
@@ -178,34 +101,32 @@ public void getSetReconnect() throws Exception {
     @Test
     @SuppressWarnings("unchecked")
     public void authInvalidPassword() throws Exception {
-        RedisAsyncConnection<String, String> async = client.connectAsync();
+        RedisAsyncCommands<String, String> async = client.connect().async();
         try {
             async.auth("invalid");
             fail("Authenticated with invalid password");
         } catch (RedisException e) {
             assertThat(e.getMessage()).isEqualTo("ERR Client sent AUTH, but no password is set");
-            StatefulRedisConnection<String, String> statefulRedisConnection = (StatefulRedisConnection<String, String>) ReflectionTestUtils
-                    .getField(async, "connection");
-            assertThat(ReflectionTestUtils.getField(statefulRedisConnection, "password")).isNull();
+            StatefulRedisConnection<String, String> statefulRedisCommands = async.getStatefulConnection();
+            assertThat(ReflectionTestUtils.getField(statefulRedisCommands, "password")).isNull();
         } finally {
-            async.close();
+            async.getStatefulConnection().close();
         }
     }
 
     @Test
     @SuppressWarnings("unchecked")
     public void selectInvalid() throws Exception {
-        RedisAsyncConnection<String, String> async = client.connectAsync();
+        RedisAsyncCommands<String, String> async = client.connect().async();
         try {
             async.select(1024);
             fail("Selected invalid db index");
         } catch (RedisException e) {
             assertThat(e.getMessage()).isEqualTo("ERR invalid DB index");
-            StatefulRedisConnection<String, String> statefulRedisConnection = (StatefulRedisConnection<String, String>) ReflectionTestUtils
-                    .getField(async, "connection");
-            assertThat(ReflectionTestUtils.getField(statefulRedisConnection, "db")).isEqualTo(0);
+            StatefulRedisConnection<String, String> statefulRedisCommands = async.getStatefulConnection();
+            assertThat(ReflectionTestUtils.getField(statefulRedisCommands, "db")).isEqualTo(0);
         } finally {
-            async.close();
+            async.getStatefulConnection().close();
         }
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java b/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java
index fa7069eb3f..17f994f4ba 100644
--- a/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java
+++ b/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java
@@ -11,6 +11,7 @@
 import org.junit.*;
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.api.async.RedisAsyncCommands;
 import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
 
 import rx.Observable;
@@ -21,7 +22,7 @@
 @Ignore
 public class LettucePerformanceTest {
 
-    private static RedisClient redisClient = new RedisClient(TestSettings.host(), TestSettings.port());
+    private static RedisClient redisClient = RedisClient.create(RedisURI.create(TestSettings.host(), TestSettings.port()));
     private ExecutorService executor;
     private CountDownLatch latch = new CountDownLatch(1);
 
@@ -107,9 +108,9 @@ public void testSyncAsyncPerformance() throws Exception {
 
     protected void submitExecutionTasks(int threads, List<Future<List<CompletableFuture<String>>>> futurama,
             final int callsPerThread, final boolean connectionPerThread) {
-        final RedisAsyncConnection<String, String> sharedConnection;
+        final RedisAsyncCommands<String, String> sharedConnection;
         if (!connectionPerThread) {
-            sharedConnection = redisClient.connectAsync();
+            sharedConnection = redisClient.connect().async();
         } else {
             sharedConnection = null;
         }
@@ -117,9 +118,9 @@ protected void submitExecutionTasks(int threads, List<Future<List<CompletableFut
         for (int i = 0; i < threads; i++) {
             Future<List<CompletableFuture<String>>> submit = executor.submit(() -> {
 
-                RedisAsyncConnection<String, String> connection = sharedConnection;
+                RedisAsyncCommands<String, String> connection = sharedConnection;
                 if (connectionPerThread) {
-                    connection = redisClient.connectAsync();
+                    connection = redisClient.connect().async();
                 }
                 connection.ping().get();
 
@@ -193,7 +194,7 @@ protected void submitObservableTasks(int threads, List<Future<List<Observable<St
             final boolean connectionPerThread) {
         final StatefulRedisConnection<String, String> sharedConnection;
         if (!connectionPerThread) {
-            sharedConnection = redisClient.connectAsync().getStatefulConnection();
+            sharedConnection = redisClient.connect();
         } else {
             sharedConnection = null;
         }
@@ -203,7 +204,7 @@ protected void submitObservableTasks(int threads, List<Future<List<Observable<St
 
                 StatefulRedisConnection<String, String> connection = sharedConnection;
                 if (connectionPerThread) {
-                    connection = redisClient.connectAsync().getStatefulConnection();
+                    connection = redisClient.connect();
                 }
                 RedisReactiveCommands<String, String> reactive = connection.reactive();
 
diff --git a/src/test/java/com/lambdaworks/redis/MultiConnectionTest.java b/src/test/java/com/lambdaworks/redis/MultiConnectionTest.java
deleted file mode 100644
index 4d50c0b3ba..0000000000
--- a/src/test/java/com/lambdaworks/redis/MultiConnectionTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.lambdaworks.redis;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.Set;
-import java.util.concurrent.Future;
-
-import org.junit.Test;
-
-public class MultiConnectionTest extends AbstractRedisClientTest {
-
-    @Test
-    public void twoConnections() throws Exception {
-
-        RedisAsyncConnection<String, String> connection1 = client.connectAsync();
-
-        RedisAsyncConnection<String, String> connection2 = client.connectAsync();
-
-        connection1.sadd("key", "member1", "member2").get();
-
-        Future<Set<String>> members = connection2.smembers("key");
-
-        assertThat(members.get()).hasSize(2);
-
-        connection1.close();
-        connection2.close();
-    }
-}
diff --git a/src/test/java/com/lambdaworks/redis/PoolConnectionTest.java b/src/test/java/com/lambdaworks/redis/PoolConnectionTest.java
deleted file mode 100644
index fc374c10f6..0000000000
--- a/src/test/java/com/lambdaworks/redis/PoolConnectionTest.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package com.lambdaworks.redis;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
-import java.lang.reflect.Proxy;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Test;
-
-import com.google.common.base.Stopwatch;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-
-public class PoolConnectionTest extends AbstractRedisClientTest {
-
-    @Test
-    public void twoConnections() throws Exception {
-
-        RedisConnectionPool<RedisCommands<String, String>> pool = client.pool();
-        RedisCommands<String, String> c1 = pool.allocateConnection();
-        RedisConnection<String, String> c2 = pool.allocateConnection();
-
-        String result1 = c1.ping();
-        String result2 = c2.ping();
-        assertThat(result1).isEqualTo("PONG");
-        assertThat(result2).isEqualTo("PONG");
-
-        c1.close();
-        c2.close();
-        pool.close();
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void getStatefulConnection() throws Exception {
-
-        RedisConnectionPool<RedisCommands<String, String>> pool = client.pool();
-        RedisCommands<String, String> c1 = pool.allocateConnection();
-
-        try {
-            c1.getStatefulConnection();
-        } finally {
-            c1.close();
-            pool.close();
-        }
-    }
-
-    @Test
-    public void sameConnectionAfterFree() throws Exception {
-        RedisConnectionPool<RedisCommands<String, String>> pool = client.pool();
-        RedisCommands<String, String> c1 = pool.allocateConnection();
-        pool.freeConnection(c1);
-        assertConnectionStillThere(c1);
-
-        RedisConnection<String, String> c2 = pool.allocateConnection();
-        assertThat(c2).isSameAs(c1);
-
-        c2.close();
-        pool.close();
-    }
-
-    @Test
-    public void connectionCloseDoesNotClose() throws Exception {
-        RedisConnectionPool<RedisCommands<String, String>> pool = client.pool();
-        RedisConnection<String, String> c1 = pool.allocateConnection();
-        c1.close();
-        RedisConnection<String, String> actualConnection1 = assertConnectionStillThere(c1);
-
-        RedisConnection<String, String> c2 = pool.allocateConnection();
-        assertThat(c2).isSameAs(c1);
-
-        RedisConnection<String, String> actualConnection2 = assertConnectionStillThere(c2);
-        assertThat(actualConnection1).isSameAs(actualConnection2);
-
-        c2.close();
-        pool.close();
-    }
-
-    @SuppressWarnings("unchecked")
-    private RedisConnection<String, String> assertConnectionStillThere(RedisConnection<String, String> c1) {
-        // unwrap code from RedisConnectionPool destroyObject
-        if (Proxy.isProxyClass(c1.getClass())) {
-            RedisConnectionPool.PooledConnectionInvocationHandler<RedisConnection<String, String>> invocationHandler;
-            invocationHandler = (RedisConnectionPool.PooledConnectionInvocationHandler<RedisConnection<String, String>>) Proxy
-                    .getInvocationHandler(c1);
-
-            RedisConnection<String, String> connection = invocationHandler.getConnection();
-            assertThat(connection).isNotNull();
-            return connection;
-        }
-        return null;
-    }
-
-    @Test
-    public void releaseConnectionWithClose() throws Exception {
-
-        RedisConnectionPool<RedisCommands<String, String>> pool = client.pool();
-        RedisConnection<String, String> c1 = pool.allocateConnection();
-        assertThat(pool.getNumActive()).isEqualTo(1);
-        c1.close();
-        assertThat(pool.getNumActive()).isEqualTo(0);
-
-        pool.allocateConnection();
-        assertThat(pool.getNumActive()).isEqualTo(1);
-    }
-
-    @Test
-    public void connectionsClosedAfterPoolClose() throws Exception {
-
-        RedisConnectionPool<RedisCommands<String, String>> pool = client.pool();
-        RedisCommands<String, String> c1 = pool.allocateConnection();
-        pool.freeConnection(c1);
-        pool.close();
-
-        try {
-            c1.ping();
-            fail("Missing Exception: Connection closed");
-        } catch (Exception e) {
-        }
-    }
-
-    @Test
-    public void connectionNotClosedWhenBorrowed() throws Exception {
-
-        RedisConnectionPool<RedisCommands<String, String>> pool = client.pool();
-        RedisConnection<String, String> c1 = pool.allocateConnection();
-        pool.close();
-
-        c1.ping();
-        c1.close();
-    }
-
-    @Test
-    public void connectionNotClosedWhenBorrowed2() throws Exception {
-
-        RedisConnectionPool<RedisCommands<String, String>> pool = client.pool();
-        RedisCommands<String, String> c1 = pool.allocateConnection();
-        pool.freeConnection(c1);
-        c1 = pool.allocateConnection();
-        pool.close();
-
-        c1.ping();
-        c1.close();
-    }
-
-    @Test
-    public void testResourceCleaning() throws Exception {
-
-        RedisClient redisClient = newRedisClient();
-
-        assertThat(redisClient.getChannelCount()).isEqualTo(0);
-        assertThat(redisClient.getResourceCount()).isEqualTo(0);
-
-        RedisConnectionPool<RedisAsyncCommands<String, String>> pool1 = redisClient.asyncPool();
-
-        assertThat(redisClient.getChannelCount()).isEqualTo(0);
-        assertThat(redisClient.getResourceCount()).isEqualTo(1);
-
-        pool1.allocateConnection();
-
-        assertThat(redisClient.getChannelCount()).isEqualTo(1);
-        assertThat(redisClient.getResourceCount()).isEqualTo(2);
-
-        RedisConnectionPool<RedisCommands<String, String>> pool2 = redisClient.pool();
-
-        assertThat(redisClient.getResourceCount()).isEqualTo(3);
-
-        pool2.allocateConnection();
-
-        assertThat(redisClient.getResourceCount()).isEqualTo(4);
-
-        redisClient.pool().close();
-        assertThat(redisClient.getResourceCount()).isEqualTo(4);
-
-        FastShutdown.shutdown(redisClient);
-
-        assertThat(redisClient.getChannelCount()).isEqualTo(0);
-        assertThat(redisClient.getResourceCount()).isEqualTo(0);
-
-    }
-
-    @Test
-    public void syncPoolPerformanceTest() throws Exception {
-
-        RedisConnectionPool<RedisCommands<String, String>> pool = client.pool();
-        RedisConnection<String, String> c1 = pool.allocateConnection();
-
-        c1.ping();
-        Stopwatch stopwatch = Stopwatch.createStarted();
-
-        for (int i = 0; i < 1000; i++) {
-            c1.ping();
-        }
-
-        long elapsed = stopwatch.stop().elapsed(TimeUnit.MILLISECONDS);
-
-        log.info("syncPoolPerformanceTest Duration: " + elapsed + "ms");
-
-        c1.close();
-        pool.close();
-
-    }
-
-    @Test
-    public void asyncPoolPerformanceTest() throws Exception {
-
-        RedisConnectionPool<RedisAsyncCommands<String, String>> pool = client.asyncPool();
-        RedisAsyncConnection<String, String> c1 = pool.allocateConnection();
-
-        c1.ping();
-        Stopwatch stopwatch = Stopwatch.createStarted();
-
-        for (int i = 0; i < 1000; i++) {
-            c1.ping();
-        }
-
-        long elapsed = stopwatch.stop().elapsed(TimeUnit.MILLISECONDS);
-
-        log.info("asyncPoolPerformanceTest Duration: " + elapsed + "ms");
-
-        c1.close();
-        pool.close();
-    }
-}
diff --git a/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java b/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java
index 0a0c935496..81b713dd5b 100644
--- a/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java
@@ -29,42 +29,6 @@ public void before() throws Exception {
         client.setDefaultTimeout(EXPECTED_TIMEOUT, EXPECTED_TIME_UNIT);
     }
 
-    /*
-     * Pool/Sync
-     */
-    @Test
-    public void poolClientUri() throws Exception {
-        client.pool().close();
-    }
-
-    @Test
-    public void poolClientUriConfig() throws Exception {
-        client.pool(1, 1).close();
-    }
-
-    @Test
-    public void poolCodecClientUriConfig() throws Exception {
-        client.pool(CODEC, 1, 1).close();
-    }
-
-    /*
-     * Pool/Async
-     */
-    @Test
-    public void asyncPoolClientUri() throws Exception {
-        client.asyncPool().close();
-    }
-
-    @Test
-    public void asyncPoolClientUriConfig() throws Exception {
-        client.asyncPool(1, 1).close();
-    }
-
-    @Test
-    public void asyncPoolCodecClientUriConfig() throws Exception {
-        client.asyncPool(CODEC, 1, 1).close();
-    }
-
     /*
      * Standalone/Stateful
      */
@@ -119,29 +83,6 @@ public void connectcodecSentinelMissingHostAndSocketUri() throws Exception {
         client.connect(CODEC, invalidSentinel());
     }
 
-    /*
-     * Deprecated: Standalone/Async
-     */
-    @Test
-    public void connectAsyncClientUri() throws Exception {
-        client.connectAsync().close();
-    }
-
-    @Test
-    public void connectAsyncCodecClientUri() throws Exception {
-        client.connectAsync(CODEC).close();
-    }
-
-    @Test
-    public void connectAsyncOwnUri() throws Exception {
-        client.connectAsync(redis(host, port).build()).close();
-    }
-
-    @Test
-    public void connectAsyncCodecOwnUri() throws Exception {
-        client.connectAsync(CODEC, redis(host, port).build()).close();
-    }
-
     /*
      * Standalone/PubSub Stateful
      */
@@ -248,29 +189,6 @@ public void connectSentinelCodecSentinelMissingHostAndSocketUri() throws Excepti
         client.connectSentinel(CODEC, invalidSentinel());
     }
 
-    /*
-     * Deprecated: Sentinel/Async
-     */
-    @Test
-    public void connectSentinelAsyncClientUri() throws Exception {
-        client.connectSentinelAsync().close();
-    }
-
-    @Test
-    public void connectSentinelAsyncCodecClientUri() throws Exception {
-        client.connectSentinelAsync(CODEC).close();
-    }
-
-    @Test
-    public void connectSentineAsynclOwnUri() throws Exception {
-        client.connectSentinelAsync(redis(host, port).build()).close();
-    }
-
-    @Test
-    public void connectSentinelAsyncCodecOwnUri() throws Exception {
-        client.connectSentinelAsync(CODEC, redis(host, port).build()).close();
-    }
-
     private RedisURI invalidSentinel() {
         RedisURI redisURI = new RedisURI();
         redisURI.getSentinels().add(new RedisURI());
diff --git a/src/test/java/com/lambdaworks/redis/TimeTest.java b/src/test/java/com/lambdaworks/redis/TimeTest.java
deleted file mode 100644
index cdba0183bd..0000000000
--- a/src/test/java/com/lambdaworks/redis/TimeTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.concurrent.TimeUnit;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class TimeTest {
-    RedisClient client = RedisClient.create();
-
-    @Before
-    public void setUp() throws Exception {
-        client.setDefaultTimeout(15, TimeUnit.SECONDS);
-    }
-
-    @After
-    public void after() throws Exception {
-        FastShutdown.shutdown(client);
-    }
-
-    @Test
-    public void testTime() throws Exception {
-        assertThat(client.makeTimeout()).isEqualTo(15000);
-    }
-}
diff --git a/src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java b/src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java
index ad1555467d..a7aeb5f8ef 100644
--- a/src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java
+++ b/src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java
@@ -16,7 +16,10 @@
 import org.junit.Test;
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.sentinel.SentinelRule;
+import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
+
 import io.netty.util.internal.SystemPropertyUtil;
 
 /**
@@ -112,9 +115,9 @@ public void sentinel_Linux_x86_64_RedisClientWithSocket() throws Exception {
 
         connection.close();
 
-        RedisSentinelAsyncConnection<String, String> sentinelConnection = redisClient.connectSentinelAsync();
+        StatefulRedisSentinelConnection<String, String> sentinelConnection = redisClient.connectSentinel();
 
-        assertThat(sentinelConnection.ping().get()).isEqualTo("PONG");
+        assertThat(sentinelConnection.sync().ping()).isEqualTo("PONG");
         sentinelConnection.close();
 
         FastShutdown.shutdown(redisClient);
@@ -137,9 +140,9 @@ public void sentinel_Linux_x86_64_ConnectToSocket() throws Exception {
 
         connection.close();
 
-        RedisSentinelAsyncConnection<String, String> sentinelConnection = redisClient.connectSentinelAsync(uri);
+        StatefulRedisSentinelConnection<String, String> sentinelConnection = redisClient.connectSentinel(uri);
 
-        assertThat(sentinelConnection.ping().get()).isEqualTo("PONG");
+        assertThat(sentinelConnection.sync().ping()).isEqualTo("PONG");
         sentinelConnection.close();
 
         FastShutdown.shutdown(redisClient);
@@ -156,11 +159,11 @@ public void sentinel_Linux_x86_64_socket_and_inet() throws Exception {
         uri.getSentinels().add(RedisURI.create(RedisURI.URI_SCHEME_REDIS + "://" + TestSettings.host() + ":26379"));
         uri.setSentinelMasterId(MASTER_ID);
 
-        RedisClient redisClient = new RedisClient(uri);
+        RedisClient redisClient = RedisClient.create(uri);
 
-        RedisSentinelAsyncConnection<String, String> sentinelConnection = redisClient
-                .connectSentinelAsync(getSentinelSocketRedisUri());
-        log.info("Masters: " + sentinelConnection.masters().get());
+        StatefulRedisSentinelConnection<String, String> sentinelConnection = redisClient
+                .connectSentinel(getSentinelSocketRedisUri());
+        log.info("Masters: " + sentinelConnection.sync().masters());
 
         try {
             redisClient.connect();
@@ -173,7 +176,7 @@ public void sentinel_Linux_x86_64_socket_and_inet() throws Exception {
 
     }
 
-    private void someRedisAction(RedisConnection<String, String> connection) {
+    private void someRedisAction(RedisCommands<String, String> connection) {
         connection.set(key, value);
         String result = connection.get(key);
 
@@ -181,6 +184,6 @@ private void someRedisAction(RedisConnection<String, String> connection) {
     }
 
     protected static RedisClient getRedisSentinelClient() {
-        return new RedisClient(RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
+        return RedisClient.create(RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java b/src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java
index 5d31ed5a29..a18a73cbc8 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java
@@ -1,16 +1,14 @@
 package com.lambdaworks.redis.cluster;
 
-import java.util.concurrent.TimeUnit;
-
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.internal.LettuceLists;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 
 import com.lambdaworks.redis.AbstractTest;
+import com.lambdaworks.redis.FastShutdown;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.TestSettings;
+import com.lambdaworks.redis.internal.LettuceLists;
 
 /**
  * @author Mark Paluch
@@ -37,6 +35,7 @@ public class AbstractClusterTest extends AbstractTest {
     public static final int port7 = port1 + 6;
     public static final String KEY_A = "a";
     public static final String KEY_B = "b";
+    public static final String KEY_D = "d";
 
     protected static RedisClusterClient clusterClient;
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
index deb08b9808..3a1b7ff77f 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
@@ -16,6 +16,7 @@
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
+import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
 import com.lambdaworks.redis.cluster.api.rx.RedisAdvancedClusterReactiveCommands;
 import com.lambdaworks.redis.cluster.api.rx.RedisClusterReactiveCommands;
 import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
@@ -55,7 +56,7 @@ public void nodeConnections() throws Exception {
         assertThat(clusterClient.getPartitions()).hasSize(4);
 
         for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
-            RedisClusterAsyncConnection<String, String> nodeConnection = commands.getConnection(redisClusterNode.getNodeId());
+            RedisClusterAsyncCommands<String, String> nodeConnection = commands.getConnection(redisClusterNode.getNodeId());
 
             String myid = nodeConnection.clusterMyId().get();
             assertThat(myid).isEqualTo(redisClusterNode.getNodeId());
@@ -86,11 +87,11 @@ public void doWeirdThingsWithClusterconnections() throws Exception {
         assertThat(clusterClient.getPartitions()).hasSize(4);
 
         for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
-            RedisClusterAsyncConnection<String, String> nodeConnection = commands.getConnection(redisClusterNode.getNodeId());
+            RedisClusterAsyncCommands<String, String> nodeConnection = commands.getConnection(redisClusterNode.getNodeId());
 
             nodeConnection.close();
 
-            RedisClusterAsyncConnection<String, String> nextConnection = commands.getConnection(redisClusterNode.getNodeId());
+            RedisClusterAsyncCommands<String, String> nextConnection = commands.getConnection(redisClusterNode.getNodeId());
             assertThat(commands).isNotSameAs(nextConnection);
         }
     }
@@ -99,8 +100,8 @@ public void doWeirdThingsWithClusterconnections() throws Exception {
     public void differentConnections() throws Exception {
 
         for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
-            RedisClusterAsyncConnection<String, String> nodeId = commands.getConnection(redisClusterNode.getNodeId());
-            RedisClusterAsyncConnection<String, String> hostAndPort = commands
+            RedisClusterAsyncCommands<String, String> nodeId = commands.getConnection(redisClusterNode.getNodeId());
+            RedisClusterAsyncCommands<String, String> hostAndPort = commands
                     .getConnection(redisClusterNode.getUri().getHost(), redisClusterNode.getUri().getPort());
 
             assertThat(nodeId).isNotSameAs(hostAndPort);
@@ -439,7 +440,7 @@ public void routeCommandToForbiddenHostOnRedirect() throws Exception {
     @Test
     public void getConnectionToNotAClusterMemberForbidden() throws Exception {
 
-        RedisAdvancedClusterConnection<String, String> sync = clusterClient.connectCluster();
+        StatefulRedisClusterConnection<String, String> sync = clusterClient.connect();
         try {
             sync.getConnection(TestSettings.host(), TestSettings.port());
         } catch (RedisException e) {
@@ -485,19 +486,6 @@ public void pipelining() throws Exception {
         }
 
         verificationConnection.close();
-
-    }
-
-    @Test
-    public void transactions() throws Exception {
-
-        commands.multi();
-        commands.set(key, value);
-        commands.discard();
-
-        commands.multi();
-        commands.set(key, value);
-        commands.exec();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
index 760a08e030..7b6059cdc4 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
@@ -15,8 +15,6 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import rx.Observable;
-
 import com.lambdaworks.RandomKeys;
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.sync.RedisCommands;
@@ -29,6 +27,8 @@
 import com.lambdaworks.redis.commands.rx.RxSyncInvocationHandler;
 import com.lambdaworks.redis.internal.LettuceLists;
 
+import rx.Observable;
+
 /**
  * @author Mark Paluch
  */
@@ -42,7 +42,7 @@ public class AdvancedClusterReactiveTest extends AbstractClusterTest {
 
     @Before
     public void before() throws Exception {
-        commands = clusterClient.connectClusterAsync().getStatefulConnection().reactive();
+        commands = clusterClient.connect().reactive();
         syncCommands = RxSyncInvocationHandler.sync(commands.getStatefulConnection());
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ByteCodecClusterTest.java b/src/test/java/com/lambdaworks/redis/cluster/ByteCodecClusterTest.java
index 448d4f623c..c7ba6665fa 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ByteCodecClusterTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ByteCodecClusterTest.java
@@ -5,8 +5,6 @@
 import org.junit.Test;
 
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 
 /**
@@ -22,22 +20,4 @@ public void testByteCodec() throws Exception {
         connection.sync().set(key.getBytes(), value.getBytes());
         assertThat(connection.sync().get(key.getBytes())).isEqualTo(value.getBytes());
     }
-
-    @Test
-    public void deprecatedTestByteCodec() throws Exception {
-
-        RedisAdvancedClusterCommands<byte[], byte[]> commands = clusterClient.connectCluster(new ByteArrayCodec());
-
-        commands.set(key.getBytes(), value.getBytes());
-        assertThat(commands.get(key.getBytes())).isEqualTo(value.getBytes());
-    }
-
-    @Test
-    public void deprecatedTestAsyncByteCodec() throws Exception {
-
-        RedisAdvancedClusterAsyncCommands<byte[], byte[]> commands = clusterClient.connectClusterAsync(new ByteArrayCodec());
-
-        commands.set(key.getBytes(), value.getBytes()).get();
-        assertThat(commands.get(key.getBytes()).get()).isEqualTo(value.getBytes());
-    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterClientOptionsTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterClientOptionsTest.java
index 7697c4b78a..79e0e893e8 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterClientOptionsTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterClientOptionsTest.java
@@ -2,8 +2,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.concurrent.TimeUnit;
-
 import org.junit.Test;
 
 /**
@@ -14,7 +12,7 @@ public class ClusterClientOptionsTest {
     @Test
     public void testCopy() throws Exception {
 
-        ClusterClientOptions options = ClusterClientOptions.builder().closeStaleConnections(true).refreshClusterView(true)
+        ClusterClientOptions options = ClusterClientOptions.builder()
                 .autoReconnect(false).requestQueueSize(100).suspendReconnectOnProtocolFailure(true).maxRedirects(1234)
                 .validateClusterNodeMembership(false).build();
 
@@ -31,15 +29,4 @@ public void testCopy() throws Exception {
         assertThat(copy.isSuspendReconnectOnProtocolFailure()).isEqualTo(options.isSuspendReconnectOnProtocolFailure());
         assertThat(copy.getMaxRedirects()).isEqualTo(options.getMaxRedirects());
     }
-
-    @Test
-    public void enablesRefreshUsingDeprecatedMethods() throws Exception {
-
-        ClusterClientOptions options = ClusterClientOptions.builder().refreshClusterView(true)
-                .refreshPeriod(10, TimeUnit.MINUTES).build();
-
-        assertThat(options.getRefreshPeriod()).isEqualTo(10);
-        assertThat(options.getRefreshPeriodUnit()).isEqualTo(TimeUnit.MINUTES);
-        assertThat(options.isRefreshClusterView()).isEqualTo(true);
-    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java
index 3cdce47aa1..81694bea2b 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java
@@ -13,10 +13,14 @@
 import org.junit.runners.MethodSorters;
 
 import com.google.code.tempusfugit.temporal.WaitFor;
-import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.FastShutdown;
+import com.lambdaworks.redis.RedisClient;
+import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
 import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
 import com.lambdaworks.redis.cluster.models.slots.ClusterSlotRange;
 import com.lambdaworks.redis.cluster.models.slots.ClusterSlotsParser;
@@ -61,18 +65,6 @@ public void after() throws Exception {
         connection.close();
     }
 
-    @Test
-    public void statefulConnectionFromSync() throws Exception {
-        RedisAdvancedClusterConnection<String, String> sync = clusterClient.connectCluster();
-        assertThat(sync.getStatefulConnection().sync()).isSameAs(sync);
-    }
-
-    @Test
-    public void statefulConnectionFromAsync() throws Exception {
-        RedisAsyncConnection<String, String> async = client.connectAsync();
-        assertThat(async.getStatefulConnection().async()).isSameAs(async);
-    }
-
     @Test
     public void testClusterBumpEpoch() throws Exception {
 
@@ -108,9 +100,9 @@ public void testClusterNodes() throws Exception {
     @Test
     public void testClusterNodesSync() throws Exception {
 
-        RedisClusterConnection<String, String> connection = clusterClient.connectCluster();
+        StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
 
-        String string = connection.clusterNodes();
+        String string = connection.sync().clusterNodes();
         connection.close();
 
         assertThat(string).contains("connected");
@@ -135,15 +127,16 @@ public void testAsking() throws Exception {
     public void testReset() throws Exception {
 
         clusterClient.reloadPartitions();
-        RedisAdvancedClusterAsyncCommandsImpl<String, String> connection = (RedisAdvancedClusterAsyncCommandsImpl) clusterClient
-                .connectClusterAsync();
 
-        RedisFuture<String> setA = connection.set("a", "myValue1");
+        StatefulRedisClusterConnection<String, String> clusterConnection = clusterClient
+                .connect();
+
+        RedisFuture<String> setA = clusterConnection.async().set("a", "myValue1");
         setA.get();
 
-        connection.reset();
+        clusterConnection.reset();
 
-        setA = connection.set("a", "myValue1");
+        setA = clusterConnection.async().set("a", "myValue1");
 
         assertThat(setA.getError()).isNull();
         assertThat(setA.get()).isEqualTo("OK");
@@ -165,10 +158,7 @@ public void testClusterSlots() throws Exception {
         assertThat(clusterSlotRange.getFrom()).isEqualTo(0);
         assertThat(clusterSlotRange.getTo()).isEqualTo(11999);
 
-        assertThat(clusterSlotRange.getMaster()).isNotNull();
-        assertThat(clusterSlotRange.getSlaves()).isNotNull();
         assertThat(clusterSlotRange.toString()).contains(ClusterSlotRange.class.getSimpleName());
-
     }
 
     @Test
@@ -180,7 +170,7 @@ public void readOnly() throws Exception {
         prepareReadonlyTest(key);
 
         // assume cluster node 3 is a slave for the master 1
-        RedisConnection<String, String> connect3 = client.connect(RedisURI.Builder.redis(host, port3).build()).sync();
+        RedisCommands<String, String> connect3 = client.connect(RedisURI.Builder.redis(host, port3).build()).sync();
 
         assertThat(connect3.readOnly()).isEqualTo("OK");
         waitUntilValueIsVisible(key, connect3);
@@ -203,7 +193,7 @@ public void readOnlyWithReconnect() throws Exception {
         prepareReadonlyTest(key);
 
         // assume cluster node 3 is a slave for the master 1
-        RedisConnection<String, String> connect3 = client.connect(RedisURI.Builder.redis(host, port3).build()).sync();
+        RedisCommands<String, String> connect3 = client.connect(RedisURI.Builder.redis(host, port3).build()).sync();
 
         assertThat(connect3.readOnly()).isEqualTo("OK");
         connect3.quit();
@@ -214,9 +204,9 @@ public void readOnlyWithReconnect() throws Exception {
 
     }
 
-    protected void waitUntilValueIsVisible(String key, RedisConnection<String, String> connection) throws InterruptedException,
+    protected void waitUntilValueIsVisible(String key, RedisCommands<String, String> commands) throws InterruptedException,
             TimeoutException {
-        WaitFor.waitOrTimeout(() -> connection.get(key) != null, timeout(seconds(5)));
+        WaitFor.waitOrTimeout(() -> commands.get(key) != null, timeout(seconds(5)));
     }
 
     protected void prepareReadonlyTest(String key) throws InterruptedException, TimeoutException,
@@ -238,7 +228,7 @@ public void readOnlyReadWrite() throws Exception {
         prepareReadonlyTest(key);
 
         // assume cluster node 3 is a slave for the master 1
-        final RedisConnection<String, String> connect3 = client.connect(RedisURI.Builder.redis(host, port3).build()).sync();
+        final RedisCommands<String, String> connect3 = client.connect(RedisURI.Builder.redis(host, port3).build()).sync();
 
         try {
             connect3.get("b");
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
index cd37113a31..6479c85278 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
@@ -5,17 +5,9 @@
 
 import java.util.List;
 
-import com.lambdaworks.redis.internal.LettuceLists;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
+import org.junit.*;
 import org.junit.runners.MethodSorters;
 
-import rx.Observable;
-
 import com.lambdaworks.redis.FastShutdown;
 import com.lambdaworks.redis.RedisClient;
 import com.lambdaworks.redis.RedisURI;
@@ -23,6 +15,9 @@
 import com.lambdaworks.redis.cluster.api.rx.RedisClusterReactiveCommands;
 import com.lambdaworks.redis.cluster.models.slots.ClusterSlotRange;
 import com.lambdaworks.redis.cluster.models.slots.ClusterSlotsParser;
+import com.lambdaworks.redis.internal.LettuceLists;
+
+import rx.Observable;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SuppressWarnings("unchecked")
@@ -53,7 +48,7 @@ public void before() throws Exception {
 
         clusterRule.getClusterClient().reloadPartitions();
 
-        async = client.connectAsync(RedisURI.Builder.redis(host, port1).build());
+        async = client.connect(RedisURI.Builder.redis(host, port1).build()).async();
         reactive = async.getStatefulConnection().reactive();
     }
 
@@ -125,8 +120,6 @@ public void testClusterSlots() throws Exception {
         assertThat(clusterSlotRange.getFrom()).isEqualTo(0);
         assertThat(clusterSlotRange.getTo()).isEqualTo(11999);
 
-        assertThat(clusterSlotRange.getMaster()).isNotNull();
-        assertThat(clusterSlotRange.getSlaves()).isNotNull();
         assertThat(clusterSlotRange.toString()).contains(ClusterSlotRange.class.getSimpleName());
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java
index 6ed809d13d..e2c9b93964 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java
@@ -33,7 +33,7 @@ public static void setup2Masters(ClusterRule clusterRule) throws InterruptedExce
         clusterRule.meet(AbstractClusterTest.host, AbstractClusterTest.port5);
         clusterRule.meet(AbstractClusterTest.host, AbstractClusterTest.port6);
 
-        RedisAdvancedClusterAsyncCommands<String, String> connection = clusterRule.getClusterClient().connectClusterAsync();
+        RedisAdvancedClusterAsyncCommands<String, String> connection = clusterRule.getClusterClient().connect().async();
         Wait.untilTrue(() -> {
 
             clusterRule.getClusterClient().reloadPartitions();
@@ -96,7 +96,7 @@ public static void setupMasterWithSlave(ClusterRule clusterRule) throws Interrup
         clusterRule.meet(AbstractClusterTest.host, AbstractClusterTest.port5);
         clusterRule.meet(AbstractClusterTest.host, AbstractClusterTest.port6);
 
-        RedisAdvancedClusterAsyncCommands<String, String> connection = clusterRule.getClusterClient().connectClusterAsync();
+        RedisAdvancedClusterAsyncCommands<String, String> connection = clusterRule.getClusterClient().connect().async();
         StatefulRedisClusterConnection<String, String> statefulConnection = connection.getStatefulConnection();
 
         Wait.untilEquals(2, () -> {
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java
index 4803a39788..fd12451b4e 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java
@@ -3,7 +3,6 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
 
-import com.lambdaworks.redis.RedisClusterConnection;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java b/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java
index 1544c755dc..c6c38a2bbe 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java
@@ -7,8 +7,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import com.google.code.tempusfugit.temporal.WaitFor;
-import com.lambdaworks.redis.internal.LettuceSets;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -23,6 +21,7 @@
 import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.redis.internal.LettuceSets;
 
 /**
  * @author Mark Paluch
@@ -148,7 +147,7 @@ public void testStaticNodeSelection() throws Exception {
     @Test
     public void testAsynchronicityOfMultiNodeExecution() throws Exception {
 
-        RedisAdvancedClusterAsyncCommands<String, String> connection2 = clusterClient.connectClusterAsync();
+        RedisAdvancedClusterAsyncCommands<String, String> connection2 = clusterClient.connect().async();
 
         AsyncNodeSelection<String, String> masters = connection2.masters();
         CompletableFuture.allOf(masters.commands().configSet("lua-time-limit", "10").futures()).get();
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
index 8d1a9fc6b9..5a6f91fb4e 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
@@ -33,15 +33,15 @@ public class RedisClusterClientTest extends AbstractClusterTest {
 
     protected static RedisClient client;
 
-    protected StatefulRedisConnection<String, String> redis1;
-    protected StatefulRedisConnection<String, String> redis2;
-    protected StatefulRedisConnection<String, String> redis3;
-    protected StatefulRedisConnection<String, String> redis4;
+    private StatefulRedisConnection<String, String> redis1;
+    private StatefulRedisConnection<String, String> redis2;
+    private StatefulRedisConnection<String, String> redis3;
+    private StatefulRedisConnection<String, String> redis4;
 
-    protected RedisClusterCommands<String, String> redissync1;
-    protected RedisClusterCommands<String, String> redissync2;
-    protected RedisClusterCommands<String, String> redissync3;
-    protected RedisClusterCommands<String, String> redissync4;
+    private RedisClusterCommands<String, String> redissync1;
+    private RedisClusterCommands<String, String> redissync2;
+    private RedisClusterCommands<String, String> redissync3;
+    private RedisClusterCommands<String, String> redissync4;
 
     protected RedisAdvancedClusterCommands<String, String> sync;
 
@@ -76,7 +76,7 @@ public void before() throws Exception {
         redissync4 = redis4.sync();
 
         clusterClient.reloadPartitions();
-        sync = clusterClient.connectCluster();
+        sync = clusterClient.connect().sync();
     }
 
     @After
@@ -92,14 +92,14 @@ public void after() throws Exception {
 
     @Test
     public void statefulConnectionFromSync() throws Exception {
-        RedisAdvancedClusterConnection<String, String> sync = clusterClient.connectCluster();
+        RedisAdvancedClusterCommands<String, String> sync = clusterClient.connect().sync();
         assertThat(sync.getStatefulConnection().sync()).isSameAs(sync);
         sync.close();
     }
 
     @Test
     public void statefulConnectionFromAsync() throws Exception {
-        RedisAsyncConnection<String, String> async = client.connectAsync();
+        RedisAdvancedClusterAsyncCommands<String, String> async = clusterClient.connect().async();
         assertThat(async.getStatefulConnection().async()).isSameAs(async);
         async.close();
     }
@@ -187,19 +187,12 @@ public void testClusteredOperations() throws Exception {
         }
 
         clusterClient.reloadPartitions();
-        RedisClusterAsyncConnection<String, String> connection = clusterClient.connectClusterAsync();
+        RedisClusterCommands<String, String> connection = clusterClient.connect().sync();
 
-        RedisFuture<String> setA = connection.set(KEY_A, value);
-        setA.get();
-
-        assertThat(setA.getError()).isNull();
-        assertThat(setA.get()).isEqualTo("OK");
 
-        RedisFuture<String> setB = connection.set(KEY_B, "myValue2");
-        assertThat(setB.get()).isEqualTo("OK");
-
-        RedisFuture<String> setD = connection.set("d", "myValue2");
-        assertThat(setD.get()).isEqualTo("OK");
+        assertThat(connection.set(KEY_A, value)).isEqualTo("OK");
+        assertThat(connection.set(KEY_B, "myValue2")).isEqualTo("OK");
+        assertThat(connection.set(KEY_D, "myValue2")).isEqualTo("OK");
 
         connection.close();
 
@@ -209,21 +202,13 @@ public void testClusteredOperations() throws Exception {
     public void testReset() throws Exception {
 
         clusterClient.reloadPartitions();
-        RedisAdvancedClusterAsyncCommandsImpl<String, String> connection = (RedisAdvancedClusterAsyncCommandsImpl) clusterClient
-                .connectClusterAsync();
-
-        RedisFuture<String> setA = connection.set(KEY_A, value);
-        setA.get();
+        StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
 
+        connection.sync().set(KEY_A, value);
         connection.reset();
 
-        setA = connection.set(KEY_A, "myValue1");
-
-        assertThat(setA.getError()).isNull();
-        assertThat(setA.get()).isEqualTo("OK");
-
+        assertThat(connection.sync().set(KEY_A, value)).isEqualTo("OK");
         connection.close();
-
     }
 
     @Test
@@ -327,37 +312,40 @@ public void closeConnection() throws Exception {
     @Test
     public void clusterAuth() throws Exception {
 
-        RedisClusterClient clusterClient = new RedisClusterClient(
-                RedisURI.Builder.redis(TestSettings.host(), port7).withPassword("foobared").build());
+        RedisClusterClient clusterClient = RedisClusterClient
+                .create(RedisURI.Builder.redis(TestSettings.host(), port7).withPassword("foobared").build());
 
-        try (RedisAdvancedClusterConnection<String, String> connection = clusterClient.connectCluster()) {
+        StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
+        RedisAdvancedClusterCommands<String, String> sync = connection.sync();
 
-            List<String> time = connection.time();
-            assertThat(time).hasSize(2);
+        List<String> time = sync.time();
+        assertThat(time).hasSize(2);
 
-            connection.getStatefulConnection().async().quit().get();
+        connection.async().quit().get();
 
-            time = connection.time();
-            assertThat(time).hasSize(2);
+        time = sync.time();
+        assertThat(time).hasSize(2);
 
-            char[] password = (char[]) ReflectionTestUtils.getField(connection.getStatefulConnection(), "password");
-            assertThat(new String(password)).isEqualTo("foobared");
-        } finally {
-            FastShutdown.shutdown(clusterClient);
+        char[] password = (char[]) ReflectionTestUtils.getField(connection, "password");
+        assertThat(new String(password)).isEqualTo("foobared");
 
-        }
+        connection.close();
+        FastShutdown.shutdown(clusterClient);
     }
 
     @Test(expected = RedisException.class)
     public void clusterNeedsAuthButNotSupplied() throws Exception {
 
-        RedisClusterClient clusterClient = new RedisClusterClient(RedisURI.Builder.redis(TestSettings.host(), port7).build());
+        RedisClusterClient clusterClient = RedisClusterClient
+                .create(RedisURI.Builder.redis(TestSettings.host(), port7).build());
 
-        try (RedisClusterCommands<String, String> connection = clusterClient.connectCluster()) {
+        StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
 
-            List<String> time = connection.time();
+        try {
+            List<String> time = connection.sync().time();
             assertThat(time).hasSize(2);
         } finally {
+            connection.close();
             FastShutdown.shutdown(clusterClient);
         }
     }
@@ -365,12 +353,14 @@ public void clusterNeedsAuthButNotSupplied() throws Exception {
     @Test
     public void noClusterNodeAvailable() throws Exception {
 
-        RedisClusterClient clusterClient = new RedisClusterClient(RedisURI.Builder.redis(host, 40400).build());
+        RedisClusterClient clusterClient = RedisClusterClient.create(RedisURI.Builder.redis(host, 40400).build());
         try {
-            clusterClient.connectCluster();
+            clusterClient.connect();
             fail("Missing RedisException");
         } catch (RedisException e) {
             assertThat(e).isInstanceOf(RedisException.class);
+        }finally {
+            FastShutdown.shutdown(clusterClient);
         }
     }
 
@@ -442,12 +432,14 @@ public void readOnlyOnCluster() throws Exception {
         sync.readWrite();
 
         assertThat(ReflectionTestUtils.getField(sync.getStatefulConnection(), "readOnly")).isEqualTo(Boolean.FALSE);
-        RedisClusterClient clusterClient = new RedisClusterClient(RedisURI.Builder.redis(host, 40400).build());
+        RedisClusterClient clusterClient = RedisClusterClient.create(RedisURI.Builder.redis(host, 40400).build());
         try {
-            clusterClient.connectCluster();
+            clusterClient.connect();
             fail("Missing RedisException");
         } catch (RedisException e) {
             assertThat(e).isInstanceOf(RedisException.class);
+        }finally {
+            FastShutdown.shutdown(clusterClient);
         }
     }
 
@@ -526,7 +518,8 @@ public void testReadFromNull() throws Exception {
 
     @Test
     public void testPfmerge() throws Exception {
-        RedisAdvancedClusterConnection<String, String> connection = clusterClient.connectCluster();
+
+        RedisAdvancedClusterCommands<String, String> connection = clusterClient.connect().sync();
 
         assertThat(SlotHash.getSlot("key2660")).isEqualTo(SlotHash.getSlot("key7112")).isEqualTo(SlotHash.getSlot("key8885"));
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
index e5898beef5..bd7b01293a 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
@@ -2,22 +2,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.lambdaworks.redis.ReadFrom;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
+import java.util.Collections;
+
+import org.junit.*;
 import org.junit.runners.MethodSorters;
 
 import com.lambdaworks.redis.FastShutdown;
+import com.lambdaworks.redis.ReadFrom;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
 
-import java.util.Collections;
-
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SuppressWarnings("unchecked")
 public class RedisClusterReadFromTest extends AbstractClusterTest {
@@ -28,7 +23,7 @@ public class RedisClusterReadFromTest extends AbstractClusterTest {
     @BeforeClass
     public static void setupClient() throws Exception {
         setupClusterClient();
-        clusterClient = new RedisClusterClient(Collections.singletonList(RedisURI.Builder.redis(host, port1).build()));
+        clusterClient = RedisClusterClient.create(Collections.singletonList(RedisURI.Builder.redis(host, port1).build()));
     }
 
     @AfterClass
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
index c69617085b..90a323b3d3 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
@@ -42,7 +42,10 @@
 @SlowTests
 public class RedisClusterSetupTest extends AbstractTest {
 
-    public static final String host = TestSettings.hostAddr();
+    private static final String host = TestSettings.hostAddr();
+
+    private static final ClusterTopologyRefreshOptions PERIODIC_REFRESH_ENABLED = ClusterTopologyRefreshOptions.builder()
+            .enablePeriodicRefresh(1, TimeUnit.SECONDS).build();
 
     private static RedisClusterClient clusterClient;
     private static RedisClient client = DefaultRedisClient.get();
@@ -166,8 +169,7 @@ public void clusterSlotMigrationImport() throws Exception {
     @Test
     public void clusterTopologyRefresh() throws Exception {
 
-        clusterClient.setOptions(
-                ClusterClientOptions.builder().refreshClusterView(true).refreshPeriod(5, TimeUnit.SECONDS).build());
+        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED).build());
         clusterClient.reloadPartitions();
 
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
@@ -187,8 +189,7 @@ public void changeTopologyWhileOperations() throws Exception {
         ClusterTopologyRefreshOptions clusterTopologyRefreshOptions = ClusterTopologyRefreshOptions.builder()
                 .enableAllAdaptiveRefreshTriggers().build();
 
-        clusterClient
-                .setOptions(ClusterClientOptions.builder().topologyRefreshOptions(clusterTopologyRefreshOptions).build());
+        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(clusterTopologyRefreshOptions).build());
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
         RedisAdvancedClusterCommands<String, String> sync = connection.sync();
         RedisAdvancedClusterAsyncCommands<String, String> async = connection.async();
@@ -251,11 +252,11 @@ public void slotMigrationShouldUseAsking() throws Exception {
     @Test
     public void disconnectedConnectionRejectTest() throws Exception {
 
-        clusterClient.setOptions(ClusterClientOptions.builder().refreshClusterView(true).refreshPeriod(1, TimeUnit.SECONDS)
+        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED)
                 .disconnectedBehavior(ClientOptions.DisconnectedBehavior.REJECT_COMMANDS).build());
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
         clusterClient.setOptions(ClusterClientOptions.builder()
-                .disconnectedBehavior(ClientOptions.DisconnectedBehavior.REJECT_COMMANDS).refreshClusterView(false).build());
+                .disconnectedBehavior(ClientOptions.DisconnectedBehavior.REJECT_COMMANDS).build());
         ClusterSetup.setup2Masters(clusterRule);
 
         assertRoutedExecution(clusterConnection);
@@ -284,10 +285,9 @@ public void disconnectedConnectionRejectTest() throws Exception {
     @Test
     public void atLeastOnceForgetNodeFailover() throws Exception {
 
-        clusterClient.setOptions(
-                ClusterClientOptions.builder().refreshClusterView(true).refreshPeriod(1, TimeUnit.SECONDS).build());
-        RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connectClusterAsync();
-        clusterClient.setOptions(ClusterClientOptions.builder().refreshClusterView(false).build());
+        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED).build());
+        RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
+        clusterClient.setOptions(ClusterClientOptions.create());
         ClusterSetup.setup2Masters(clusterRule);
 
         assertRoutedExecution(clusterConnection);
@@ -315,7 +315,7 @@ public void atLeastOnceForgetNodeFailover() throws Exception {
         redis1.clusterForget(partition2.getNodeId());
         redis2.clusterForget(partition1.getNodeId());
 
-        clusterClient.setOptions(ClusterClientOptions.builder().refreshClusterView(true).build());
+        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED).build());
         waitUntilOnlyOnePartition();
 
         Wait.untilTrue(() -> Futures.areAllCompleted(futures)).waitOrTimeout();
@@ -329,9 +329,8 @@ public void atLeastOnceForgetNodeFailover() throws Exception {
     @Test
     public void expireStaleNodeIdConnections() throws Exception {
 
-        clusterClient.setOptions(
-                ClusterClientOptions.builder().refreshClusterView(true).refreshPeriod(1, TimeUnit.SECONDS).build());
-        RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connectClusterAsync();
+        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED).build());
+        RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
 
         ClusterSetup.setup2Masters(clusterRule);
 
@@ -374,7 +373,8 @@ private void assertRoutedExecution(RedisClusterAsyncCommands<String, String> clu
     @Test
     public void doNotExpireStaleNodeIdConnections() throws Exception {
 
-        clusterClient.setOptions(ClusterClientOptions.builder().closeStaleConnections(false).build());
+        clusterClient.setOptions(ClusterClientOptions.builder()
+                .topologyRefreshOptions(ClusterTopologyRefreshOptions.builder().closeStaleConnections(false).build()).build());
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
 
         ClusterSetup.setup2Masters(clusterRule);
@@ -414,7 +414,7 @@ public void doNotExpireStaleNodeIdConnections() throws Exception {
     public void expireStaleHostAndPortConnections() throws Exception {
 
         clusterClient.setOptions(ClusterClientOptions.builder().build());
-        RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connectClusterAsync();
+        RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
 
         ClusterSetup.setup2Masters(clusterRule);
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
index 11a946771b..286d7deac6 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
@@ -21,6 +21,8 @@
 import com.lambdaworks.category.SlowTests;
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.api.async.RedisAsyncCommands;
+import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
 import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 
@@ -118,7 +120,7 @@ public void testClusterFailover() throws Exception {
     public void testClusterConnectionStability() throws Exception {
 
         RedisAdvancedClusterAsyncCommandsImpl<String, String> connection = (RedisAdvancedClusterAsyncCommandsImpl<String, String>) clusterClient
-                .connectClusterAsync();
+                .connect().async();
 
         RedisChannelHandler<String, String> statefulConnection = (RedisChannelHandler) connection.getStatefulConnection();
 
@@ -129,7 +131,7 @@ public void testClusterConnectionStability() throws Exception {
         StatefulRedisConnectionImpl<Object, Object> statefulSlotConnection = (StatefulRedisConnectionImpl) writer
                 .getClusterConnectionProvider().getConnection(ClusterConnectionProvider.Intent.WRITE, 3300);
 
-        final RedisAsyncConnection<Object, Object> slotConnection = statefulSlotConnection.async();
+        final RedisAsyncCommands<Object, Object> slotConnection = statefulSlotConnection.async();
 
         slotConnection.set("a", "b");
         slotConnection.close();
@@ -156,7 +158,7 @@ public void testClusterConnectionStability() throws Exception {
     @Test(timeout = 20000)
     public void distributedClusteredAccessAsync() throws Exception {
 
-        RedisClusterAsyncConnection<String, String> connection = clusterClient.connectClusterAsync();
+        RedisClusterAsyncCommands<String, String> connection = clusterClient.connect().async();
 
         List<RedisFuture<?>> futures = new ArrayList<>();
         for (int i = 0; i < 100; i++) {
@@ -193,7 +195,7 @@ public void distributedClusteredAccessAsync() throws Exception {
     @Test
     public void distributedClusteredAccessSync() throws Exception {
 
-        RedisClusterConnection<String, String> connection = clusterClient.connectCluster();
+        RedisClusterCommands<String, String> connection = clusterClient.connect().sync();
 
         for (int i = 0; i < 100; i++) {
             connection.set("a" + i, "myValue1" + i);
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
index aa4ce06e5f..23abe9b280 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
@@ -32,7 +32,7 @@ public class CustomClusterCommandTest extends AbstractClusterTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = new RedisClusterClient(
+        redisClusterClient = RedisClusterClient.create(
                 RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java
index a5db0e2d21..281edb8c21 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java
@@ -25,7 +25,7 @@ public class GeoClusterCommandTest extends GeoCommandTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = new RedisClusterClient(
+        redisClusterClient = RedisClusterClient.create(
                 RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
@@ -43,7 +43,7 @@ public void openConnection() throws Exception {
     @Override
     @SuppressWarnings("unchecked")
     protected RedisCommands<String, String> connect() {
-        clusterConnection = redisClusterClient.connectCluster().getStatefulConnection();
+        clusterConnection = redisClusterClient.connect();
         return ClusterTestUtil.redisCommandsOverCluster(clusterConnection);
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java
index 0e51560adf..50dce303c7 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java
@@ -1,10 +1,10 @@
 package com.lambdaworks.redis.cluster.commands;
 
-import com.lambdaworks.redis.FastShutdown;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 
+import com.lambdaworks.redis.FastShutdown;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.TestSettings;
 import com.lambdaworks.redis.api.sync.RedisCommands;
@@ -23,7 +23,7 @@ public class HashClusterCommandTest extends HashCommandTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = new RedisClusterClient(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
+        redisClusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
     @AfterClass
@@ -40,7 +40,7 @@ public void openConnection() throws Exception {
     @Override
     @SuppressWarnings("unchecked")
     protected RedisCommands<String, String> connect() {
-        clusterConnection = redisClusterClient.connectCluster().getStatefulConnection();
+        clusterConnection = redisClusterClient.connect();
         return ClusterTestUtil.redisCommandsOverCluster(clusterConnection);
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java
index 7fafa83c66..7457bf7da6 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java
@@ -1,12 +1,12 @@
 package com.lambdaworks.redis.cluster.commands;
 
-import com.lambdaworks.redis.FastShutdown;
 import org.assertj.core.api.Assertions;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import com.lambdaworks.redis.FastShutdown;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.TestSettings;
 import com.lambdaworks.redis.api.sync.RedisCommands;
@@ -26,7 +26,7 @@ public class ListClusterCommandTest extends ListCommandTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = new RedisClusterClient(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
+        redisClusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
     @AfterClass
@@ -43,7 +43,7 @@ public void openConnection() throws Exception {
     @Override
     @SuppressWarnings("unchecked")
     protected RedisCommands<String, String> connect() {
-        clusterConnection = redisClusterClient.connectCluster().getStatefulConnection();
+        clusterConnection = redisClusterClient.connect();
         return ClusterTestUtil.redisCommandsOverCluster(clusterConnection);
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
index 9d4691090c..a97e2a5305 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
@@ -30,7 +30,7 @@ public class StringClusterCommandTest extends StringCommandTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = new RedisClusterClient(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
+        redisClusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
     @AfterClass
@@ -47,7 +47,7 @@ public void openConnection() throws Exception {
     @Override
     @SuppressWarnings("unchecked")
     protected RedisCommands<String, String> connect() {
-        clusterConnection = redisClusterClient.connectCluster().getStatefulConnection();
+        clusterConnection = redisClusterClient.connect();
         return ClusterTestUtil.redisCommandsOverCluster(clusterConnection);
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/HashClusterRxCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/HashClusterRxCommandTest.java
index b597b9ebaa..0c63ba0d2a 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/HashClusterRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/HashClusterRxCommandTest.java
@@ -1,14 +1,14 @@
 package com.lambdaworks.redis.cluster.commands.rx;
 
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.cluster.ClusterTestUtil;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 
+import com.lambdaworks.redis.FastShutdown;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.TestSettings;
 import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.cluster.ClusterTestUtil;
 import com.lambdaworks.redis.cluster.RedisClusterClient;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.commands.HashCommandTest;
@@ -24,7 +24,7 @@ public class HashClusterRxCommandTest extends HashCommandTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = new RedisClusterClient(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
+        redisClusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
     @AfterClass
@@ -40,7 +40,7 @@ public void openConnection() throws Exception {
 
     @Override
     protected RedisCommands<String, String> connect() {
-        clusterConnection = redisClusterClient.connectCluster().getStatefulConnection();
-        return RxSyncInvocationHandler.sync(redisClusterClient.connectCluster().getStatefulConnection());
+        clusterConnection = redisClusterClient.connect();
+        return RxSyncInvocationHandler.sync(redisClusterClient.connect());
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/ListClusterRxCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/ListClusterRxCommandTest.java
index 24c76669a3..228314d201 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/ListClusterRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/ListClusterRxCommandTest.java
@@ -1,12 +1,12 @@
 package com.lambdaworks.redis.cluster.commands.rx;
 
-import com.lambdaworks.redis.FastShutdown;
 import org.assertj.core.api.Assertions;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import com.lambdaworks.redis.FastShutdown;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.TestSettings;
 import com.lambdaworks.redis.api.sync.RedisCommands;
@@ -27,7 +27,7 @@ public class ListClusterRxCommandTest extends ListCommandTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = new RedisClusterClient(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
+        redisClusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
     @AfterClass
@@ -43,8 +43,8 @@ public void openConnection() throws Exception {
 
     @Override
     protected RedisCommands<String, String> connect() {
-        clusterConnection = redisClusterClient.connectCluster().getStatefulConnection();
-        return RxSyncInvocationHandler.sync(redisClusterClient.connectCluster().getStatefulConnection());
+        clusterConnection = redisClusterClient.connect();
+        return RxSyncInvocationHandler.sync(redisClusterClient.connect());
     }
 
     // re-implementation because keys have to be on the same slot
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/StringClusterRxCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/StringClusterRxCommandTest.java
index f9fcff9f30..38bb7b794d 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/StringClusterRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/StringClusterRxCommandTest.java
@@ -10,8 +10,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import rx.Observable;
-
 import com.lambdaworks.redis.FastShutdown;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.TestSettings;
@@ -23,6 +21,8 @@
 import com.lambdaworks.redis.commands.StringCommandTest;
 import com.lambdaworks.redis.commands.rx.RxSyncInvocationHandler;
 
+import rx.Observable;
+
 /**
  * @author Mark Paluch
  */
@@ -32,7 +32,7 @@ public class StringClusterRxCommandTest extends StringCommandTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = new RedisClusterClient(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
+        redisClusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
     @AfterClass
@@ -48,8 +48,8 @@ public void openConnection() throws Exception {
 
     @Override
     protected RedisCommands<String, String> connect() {
-        clusterConnection = redisClusterClient.connectCluster().getStatefulConnection();
-        return RxSyncInvocationHandler.sync(redisClusterClient.connectCluster().getStatefulConnection());
+        clusterConnection = redisClusterClient.connect();
+        return RxSyncInvocationHandler.sync(redisClusterClient.connect());
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParserTest.java b/src/test/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParserTest.java
index 7a27c29b40..2766f5e80f 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParserTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParserTest.java
@@ -8,7 +8,6 @@
 
 import org.junit.Test;
 
-import com.google.common.net.HostAndPort;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 import com.lambdaworks.redis.internal.LettuceLists;
 
@@ -40,7 +39,6 @@ public void testParse() throws Exception {
         List<ClusterSlotRange> result = ClusterSlotsParser.parse(list);
         assertThat(result).hasSize(1);
 
-        assertThat(result.get(0).getMaster()).isNotNull();
         assertThat(result.get(0).getMasterNode()).isNotNull();
     }
 
@@ -52,10 +50,6 @@ public void testParseWithSlave() throws Exception {
         assertThat(result).hasSize(1);
         ClusterSlotRange clusterSlotRange = result.get(0);
 
-        assertThat(clusterSlotRange.getMaster()).isNotNull();
-        assertThat(clusterSlotRange.getMaster().getHostText()).isEqualTo("1");
-        assertThat(clusterSlotRange.getMaster().getPort()).isEqualTo(2);
-
         RedisClusterNode masterNode = clusterSlotRange.getMasterNode();
         assertThat(masterNode).isNotNull();
         assertThat(masterNode.getNodeId()).isEqualTo("nodeId1");
@@ -66,14 +60,8 @@ public void testParseWithSlave() throws Exception {
         assertThat(masterNode.getSlots()).doesNotContain(99, 201);
         assertThat(masterNode.getSlots()).hasSize(101);
 
-
-        assertThat(clusterSlotRange.getSlaves()).hasSize(1);
         assertThat(clusterSlotRange.getSlaveNodes()).hasSize(1);
 
-        HostAndPort slave = clusterSlotRange.getSlaves().get(0);
-        assertThat(slave.getHostText()).isEqualTo("1");
-        assertThat(slave.getPort()).isEqualTo(2);
-
         RedisClusterNode slaveNode = clusterSlotRange.getSlaveNodes().get(0);
 
         assertThat(slaveNode.getNodeId()).isEqualTo("nodeId2");
@@ -105,43 +93,6 @@ public void testSameNode() throws Exception {
         assertThat(masterNode.getSlots()).hasSize(201);
     }
 
-    @Test
-    public void testHostAndPortConstructor() throws Exception {
-
-        ClusterSlotRange clusterSlotRange = new ClusterSlotRange(100, 200, HostAndPort.fromParts("1", 2), LettuceLists.newList(
-                HostAndPort.fromParts("1", 2)));
-
-        RedisClusterNode masterNode = clusterSlotRange.getMasterNode();
-        assertThat(masterNode).isNotNull();
-        assertThat(masterNode.getNodeId()).isNull();
-        assertThat(masterNode.getUri().getHost()).isEqualTo("1");
-        assertThat(masterNode.getUri().getPort()).isEqualTo(2);
-        assertThat(masterNode.getFlags()).contains(RedisClusterNode.NodeFlag.MASTER);
-
-        assertThat(clusterSlotRange.getSlaves()).hasSize(1);
-        assertThat(clusterSlotRange.getSlaveNodes()).hasSize(1);
-
-        HostAndPort slave = clusterSlotRange.getSlaves().get(0);
-        assertThat(slave.getHostText()).isEqualTo("1");
-        assertThat(slave.getPort()).isEqualTo(2);
-
-        RedisClusterNode slaveNode = clusterSlotRange.getSlaveNodes().get(0);
-
-        assertThat(slaveNode.getNodeId()).isNull();
-        assertThat(slaveNode.getSlaveOf()).isNull();
-        assertThat(slaveNode.getFlags()).contains(RedisClusterNode.NodeFlag.SLAVE);
-
-    }
-
-    @Test
-    public void testParseWithSlaveAndNodeIds() throws Exception {
-        List<?> list = Arrays.asList(LettuceLists.newList("0", "1", LettuceLists.newList("1", "2"), LettuceLists.newList("1", 2)));
-        List<ClusterSlotRange> result = ClusterSlotsParser.parse(list);
-        assertThat(result).hasSize(1);
-        assertThat(result.get(0).getMaster()).isNotNull();
-        assertThat(result.get(0).getSlaves()).hasSize(1);
-    }
-
     @Test(expected = IllegalArgumentException.class)
     public void testParseInvalidMaster() throws Exception {
         List<?> list = Arrays.asList(LettuceLists.newList("0", "1", LettuceLists.newList("1")));
@@ -160,8 +111,6 @@ public void testModel() throws Exception {
         ClusterSlotRange range = new ClusterSlotRange();
         range.setFrom(1);
         range.setTo(2);
-        range.setSlaves(new ArrayList<>());
-        range.setMaster(HostAndPort.fromHost("localhost"));
 
         assertThat(range.toString()).contains(ClusterSlotRange.class.getSimpleName());
     }
diff --git a/src/test/java/com/lambdaworks/redis/commands/BitCommandPoolTest.java b/src/test/java/com/lambdaworks/redis/commands/BitCommandPoolTest.java
deleted file mode 100644
index 879ef88349..0000000000
--- a/src/test/java/com/lambdaworks/redis/commands/BitCommandPoolTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2012 - Will Glozer.  All rights reserved.
-
-package com.lambdaworks.redis.commands;
-
-import com.lambdaworks.redis.RedisConnection;
-import com.lambdaworks.redis.RedisConnectionPool;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-
-public class BitCommandPoolTest extends BitCommandTest {
-    RedisConnectionPool<RedisCommands<String, String>> pool;
-    RedisConnectionPool<RedisCommands<String, String>> bitpool;
-
-    @Override
-    protected RedisCommands<String, String> connect() {
-        pool = client.pool(new BitStringCodec(), 1, 5);
-        bitpool = client.pool(new BitStringCodec(), 1, 5);
-        bitstring = bitpool.allocateConnection();
-        return pool.allocateConnection();
-    }
-
-    @Override
-    public void closeConnection() throws Exception {
-        pool.freeConnection(redis);
-        bitpool.freeConnection(bitstring);
-
-        pool.close();
-        bitpool.close();
-    }
-}
diff --git a/src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java
index 2365c6597d..6369343a6e 100644
--- a/src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java
@@ -2,9 +2,9 @@
 
 package com.lambdaworks.redis.commands;
 
-import static com.lambdaworks.redis.BitFieldArgs.OverflowType.WRAP;
 import static com.lambdaworks.redis.BitFieldArgs.signed;
 import static com.lambdaworks.redis.BitFieldArgs.unsigned;
+import static com.lambdaworks.redis.BitFieldArgs.OverflowType.WRAP;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.nio.ByteBuffer;
@@ -34,7 +34,7 @@ protected void connectBitString() {
 
     @Override
     public void closeConnection() throws Exception {
-        bitstring.close();
+        bitstring.getStatefulConnection().close();
         super.closeConnection();
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java
index 5213d51cf6..ca64bf3ba5 100644
--- a/src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java
@@ -8,7 +8,6 @@
 import org.junit.rules.ExpectedException;
 
 import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.RedisHLLConnection;
 import com.lambdaworks.redis.api.sync.RedisHLLCommands;
 
 public class HLLCommandTest extends AbstractRedisClientTest {
@@ -19,10 +18,6 @@ private RedisHLLCommands<String, String> commands() {
         return redis;
     }
 
-    private RedisHLLConnection<String, String> connection() {
-        return redis;
-    }
-
     @Test
     public void pfadd() throws Exception {
 
@@ -31,13 +26,6 @@ public void pfadd() throws Exception {
         assertThat(commands().pfadd(key, value)).isEqualTo(0);
     }
 
-    @Test
-    public void pfaddDeprecated() throws Exception {
-        assertThat(connection().pfadd(key, value, value)).isEqualTo(1);
-        assertThat(connection().pfadd(key, value, value)).isEqualTo(0);
-        assertThat(connection().pfadd(key, value)).isEqualTo(0);
-    }
-
     @Test(expected = IllegalArgumentException.class)
     public void pfaddNoValues() throws Exception {
         commands().pfadd(key);
@@ -74,15 +62,6 @@ public void pfmerge() throws Exception {
         assertThat(commands().pfcount("key8885")).isEqualTo(3);
     }
 
-    @Test
-    public void pfmergeDeprecated() throws Exception {
-        connection().pfadd(key, value);
-        connection().pfadd("key2", "value2");
-        connection().pfadd("key3", "value3");
-
-        assertThat(connection().pfmerge(key, "key2", "key3")).isEqualTo("OK");
-    }
-
     @Test(expected = IllegalArgumentException.class)
     public void pfmergeNoKeys() throws Exception {
         commands().pfmerge(key);
@@ -96,14 +75,6 @@ public void pfcount() throws Exception {
         assertThat(commands().pfcount(key, "key2")).isEqualTo(2);
     }
 
-    @Test
-    public void pfcountDeprecated() throws Exception {
-        connection().pfadd(key, value);
-        connection().pfadd("key2", "value2");
-        assertThat(connection().pfcount(key)).isEqualTo(1);
-        assertThat(connection().pfcount(key, "key2")).isEqualTo(2);
-    }
-
     @Test(expected = IllegalArgumentException.class)
     public void pfcountNoKeys() throws Exception {
         commands().pfcount();
diff --git a/src/test/java/com/lambdaworks/redis/commands/HashCommandPoolTest.java b/src/test/java/com/lambdaworks/redis/commands/HashCommandPoolTest.java
deleted file mode 100644
index 7c72df3061..0000000000
--- a/src/test/java/com/lambdaworks/redis/commands/HashCommandPoolTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.lambdaworks.redis.commands;
-
-import com.lambdaworks.redis.RedisConnection;
-import com.lambdaworks.redis.RedisConnectionPool;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-
-/**
- * @author Mark Paluch
- */
-public class HashCommandPoolTest extends HashCommandTest {
-
-    RedisConnectionPool<RedisCommands<String, String>> pool;
-
-    @Override
-    protected RedisCommands<String, String> connect() {
-        pool = client.pool();
-        return pool.allocateConnection();
-    }
-
-    @Override
-    public void closeConnection() throws Exception {
-        pool.freeConnection(redis);
-        pool.close();
-    }
-}
diff --git a/src/test/java/com/lambdaworks/redis/commands/KeyCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/KeyCommandTest.java
index 993b5f5e37..5920de93a9 100644
--- a/src/test/java/com/lambdaworks/redis/commands/KeyCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/KeyCommandTest.java
@@ -46,9 +46,9 @@ public void dump() throws Exception {
 
     @Test
     public void exists() throws Exception {
-        assertThat(redis.exists(key)).isFalse();
+        assertThat(redis.exists(key)).isEqualTo(0);
         redis.set(key, value);
-        assertThat(redis.exists(key)).isTrue();
+        assertThat(redis.exists(key)).isEqualTo(1);
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/RunOnlyOnceServerCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/RunOnlyOnceServerCommandTest.java
index d7264296bb..650e182609 100644
--- a/src/test/java/com/lambdaworks/redis/commands/RunOnlyOnceServerCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/RunOnlyOnceServerCommandTest.java
@@ -9,18 +9,19 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
 
-import com.lambdaworks.CanConnect;
-import com.lambdaworks.redis.*;
+import java.util.Arrays;
+
 import org.junit.FixMethodOrder;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
-import com.google.code.tempusfugit.temporal.Condition;
 import com.google.code.tempusfugit.temporal.WaitFor;
-import org.springframework.util.SocketUtils;
-
-import java.util.Arrays;
+import com.lambdaworks.CanConnect;
+import com.lambdaworks.redis.AbstractRedisClientTest;
+import com.lambdaworks.redis.MigrateArgs;
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.TestSettings;
+import com.lambdaworks.redis.api.async.RedisAsyncCommands;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class RunOnlyOnceServerCommandTest extends AbstractRedisClientTest {
@@ -36,15 +37,15 @@ public void debugSegfault() throws Exception {
 
         assumeTrue(CanConnect.to(host(), port(1)));
 
-        final RedisAsyncConnection<String, String> connection = client.connectAsync(RedisURI.Builder.redis(host(), port(1))
-                .build());
+        final RedisAsyncCommands<String, String> commands = client.connect(RedisURI.Builder.redis(host(), port(1))
+                .build()).async();
         try {
-            connection.debugSegfault();
+            commands.debugSegfault();
 
-            WaitFor.waitOrTimeout(() -> !connection.isOpen(), timeout(seconds(5)));
-            assertThat(connection.isOpen()).isFalse();
+            WaitFor.waitOrTimeout(() -> !commands.getStatefulConnection().isOpen(), timeout(seconds(5)));
+            assertThat(commands.getStatefulConnection().isOpen()).isFalse();
         } finally {
-            connection.close();
+            commands.getStatefulConnection().close();
         }
     }
 
@@ -96,18 +97,18 @@ public void shutdown() throws Exception {
 
         assumeTrue(CanConnect.to(host(), port(2)));
 
-        final RedisAsyncConnection<String, String> connection = client.connectAsync(RedisURI.Builder.redis(host(), port(2))
-                .build());
+        final RedisAsyncCommands<String, String> commands = client.connect(RedisURI.Builder.redis(host(), port(2))
+                .build()).async();
         try {
 
-            connection.shutdown(true);
-            connection.shutdown(false);
-            WaitFor.waitOrTimeout(() -> !connection.isOpen(), timeout(seconds(5)));
+            commands.shutdown(true);
+            commands.shutdown(false);
+            WaitFor.waitOrTimeout(() -> !commands.getStatefulConnection().isOpen(), timeout(seconds(5)));
 
-            assertThat(connection.isOpen()).isFalse();
+            assertThat(commands.getStatefulConnection().isOpen()).isFalse();
 
         } finally {
-            connection.close();
+            commands.getStatefulConnection().close();
         }
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/ScriptingCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/ScriptingCommandTest.java
index 4cb1ffdbd9..ffbd5cc800 100644
--- a/src/test/java/com/lambdaworks/redis/commands/ScriptingCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/ScriptingCommandTest.java
@@ -16,8 +16,8 @@
 
 import com.lambdaworks.Wait;
 import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.RedisAsyncConnection;
 import com.lambdaworks.redis.RedisException;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ScriptingCommandTest extends AbstractRedisClientTest {
@@ -112,13 +112,13 @@ public void script() throws Exception {
         assertThat(redis.scriptExists(digest1, digest2)).isEqualTo(list(false, false));
 
         redis.configSet("lua-time-limit", "10");
-        RedisAsyncConnection<String, String> async = client.connectAsync();
+        StatefulRedisConnection<String, String> connection = client.connect();
         try {
-            async.eval("while true do end", STATUS, new String[0]);
+            connection.async().eval("while true do end", STATUS, new String[0]);
             Thread.sleep(100);
             assertThat(redis.scriptKill()).isEqualTo("OK");
         } finally {
-            async.close();
+            connection.close();
         }
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/ServerCommandPoolTest.java b/src/test/java/com/lambdaworks/redis/commands/ServerCommandPoolTest.java
deleted file mode 100644
index 494fd43a5b..0000000000
--- a/src/test/java/com/lambdaworks/redis/commands/ServerCommandPoolTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.lambdaworks.redis.commands;
-
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import org.junit.Test;
-
-import com.lambdaworks.redis.RedisConnection;
-import com.lambdaworks.redis.RedisConnectionPool;
-
-/**
- * @author Mark Paluch
- */
-public class ServerCommandPoolTest extends ServerCommandTest {
-
-    RedisConnectionPool<RedisCommands<String, String>> pool;
-
-    @Override
-    protected RedisCommands<String, String> connect() {
-        pool = client.pool();
-        return pool.allocateConnection();
-    }
-
-    @Override
-    public void closeConnection() throws Exception {
-        pool.freeConnection(redis);
-        pool.close();
-    }
-}
diff --git a/src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java
index 641f6b8a24..07a95815d9 100644
--- a/src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java
@@ -3,7 +3,7 @@
 package com.lambdaworks.redis.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;
 
 import java.util.Date;
@@ -18,8 +18,8 @@
 
 import com.lambdaworks.redis.AbstractRedisClientTest;
 import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.RedisConnection;
 import com.lambdaworks.redis.TestSettings;
+import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.models.command.CommandDetail;
 import com.lambdaworks.redis.models.command.CommandDetailParser;
 import com.lambdaworks.redis.models.role.RedisInstance;
@@ -70,7 +70,7 @@ public void clientKill() throws Exception {
     @Test
     public void clientKillExtended() throws Exception {
 
-        RedisConnection<String, String> connection2 = client.connect().sync();
+        RedisCommands<String, String> connection2 = client.connect().sync();
         connection2.clientSetname("killme");
 
         Pattern p = Pattern.compile("^.*addr=([^ ]+).*name=killme.*$", Pattern.MULTILINE | Pattern.DOTALL);
@@ -86,7 +86,7 @@ public void clientKillExtended() throws Exception {
         assertThat(redis.clientKill(KillArgs.Builder.typeNormal().id(4234))).isEqualTo(0);
         assertThat(redis.clientKill(KillArgs.Builder.typePubsub().id(4234))).isEqualTo(0);
 
-        connection2.close();
+        connection2.getStatefulConnection().close();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java
index aca7ad5316..f041c5f8f8 100644
--- a/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java
@@ -2,7 +2,7 @@
 
 package com.lambdaworks.redis.commands;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
 
@@ -13,8 +13,8 @@
 
 import com.lambdaworks.redis.AbstractRedisClientTest;
 import com.lambdaworks.redis.RedisCommandExecutionException;
-import com.lambdaworks.redis.RedisConnection;
 import com.lambdaworks.redis.RedisException;
+import com.lambdaworks.redis.api.sync.RedisCommands;
 
 public class TransactionCommandTest extends AbstractRedisClientTest {
     @Rule
@@ -40,9 +40,9 @@ public void exec() throws Exception {
     public void watch() throws Exception {
         assertThat(redis.watch(key)).isEqualTo("OK");
 
-        RedisConnection<String, String> redis2 = client.connect().sync();
+        RedisCommands<String, String> redis2 = client.connect().sync();
         redis2.set(key, value + "X");
-        redis2.close();
+        redis2.getStatefulConnection().close();
 
         redis.multi();
         redis.append(key, "foo");
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/BitRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/BitRxCommandTest.java
index 89dcfca12a..97c3e35199 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/BitRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/BitRxCommandTest.java
@@ -9,8 +9,8 @@
 public class BitRxCommandTest extends BitCommandTest {
     @Override
     protected RedisCommands<String, String> connect() {
-        bitstring = RxSyncInvocationHandler.sync(client.connectAsync(new BitStringCodec()).getStatefulConnection());
-        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
+        bitstring = RxSyncInvocationHandler.sync(client.connect(new BitStringCodec()));
+        return RxSyncInvocationHandler.sync(client.connect());
     }
 
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/CustomRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/CustomRxCommandTest.java
index 62db9f778e..45e08589bc 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/CustomRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/CustomRxCommandTest.java
@@ -20,7 +20,7 @@ public class CustomRxCommandTest extends CustomCommandTest {
 
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
+        return RxSyncInvocationHandler.sync(client.connect());
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/GeoRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/GeoRxCommandTest.java
index 605bcae85e..d90ec8abdf 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/GeoRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/GeoRxCommandTest.java
@@ -1,12 +1,12 @@
 package com.lambdaworks.redis.commands.rx;
 
-import com.lambdaworks.redis.commands.GeoCommandTest;
 import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.GeoCommandTest;
 
 public class GeoRxCommandTest extends GeoCommandTest {
 
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
+        return RxSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/HLLRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/HLLRxCommandTest.java
index 7d122d6f29..5ed77472e4 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/HLLRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/HLLRxCommandTest.java
@@ -7,21 +7,6 @@ public class HLLRxCommandTest extends HLLCommandTest {
 
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
-    }
-
-    @Override
-    public void pfaddDeprecated() throws Exception {
-        // Not available on reactive connection
-    }
-
-    @Override
-    public void pfmergeDeprecated() throws Exception {
-        // Not available on reactive connection
-    }
-
-    @Override
-    public void pfcountDeprecated() throws Exception {
-        // Not available on reactive connection
+        return RxSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/HashRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/HashRxCommandTest.java
index cc97c4c67e..4b93ca8a1f 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/HashRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/HashRxCommandTest.java
@@ -7,7 +7,7 @@ public class HashRxCommandTest extends HashCommandTest {
 
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
+        return RxSyncInvocationHandler.sync(client.connect());
     }
 
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/KeyRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/KeyRxCommandTest.java
index 668d687a84..679a259b3b 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/KeyRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/KeyRxCommandTest.java
@@ -6,6 +6,6 @@
 public class KeyRxCommandTest extends KeyCommandTest {
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
+        return RxSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/ListRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/ListRxCommandTest.java
index 9b702b7bc7..034ae0f54f 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/ListRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/ListRxCommandTest.java
@@ -6,6 +6,6 @@
 public class ListRxCommandTest extends ListCommandTest {
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
+        return RxSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/NumericRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/NumericRxCommandTest.java
index 5c29c38bc0..04bf948fc8 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/NumericRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/NumericRxCommandTest.java
@@ -6,6 +6,6 @@
 public class NumericRxCommandTest extends NumericCommandTest {
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
+        return RxSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/ScriptingRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/ScriptingRxCommandTest.java
index e38f75ff99..0674bc083e 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/ScriptingRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/ScriptingRxCommandTest.java
@@ -1,6 +1,5 @@
 package com.lambdaworks.redis.commands.rx;
 
-import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.ScriptingCommandTest;
 
@@ -9,6 +8,6 @@ public class ScriptingRxCommandTest extends ScriptingCommandTest {
 
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
+        return RxSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/ServerRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/ServerRxCommandTest.java
index f5e011f6da..c1cf9f3bf3 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/ServerRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/ServerRxCommandTest.java
@@ -1,6 +1,6 @@
 package com.lambdaworks.redis.commands.rx;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -21,7 +21,7 @@ public void openConnection() throws Exception {
 
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
+        return RxSyncInvocationHandler.sync(client.connect());
     }
 
     /**
@@ -30,30 +30,30 @@ protected RedisCommands<String, String> connect() {
     @Test
     public void shutdown() throws Exception {
         reactive.shutdown(true);
-        assertThat(reactive.isOpen()).isTrue();
+        assertThat(reactive.getStatefulConnection().isOpen()).isTrue();
     }
 
     @Test
     public void debugOom() throws Exception {
         reactive.debugOom();
-        assertThat(reactive.isOpen()).isTrue();
+        assertThat(reactive.getStatefulConnection().isOpen()).isTrue();
     }
 
     @Test
     public void debugSegfault() throws Exception {
         reactive.debugSegfault();
-        assertThat(reactive.isOpen()).isTrue();
+        assertThat(reactive.getStatefulConnection().isOpen()).isTrue();
     }
 
     @Test
     public void debugRestart() throws Exception {
         reactive.debugRestart(1L);
-        assertThat(reactive.isOpen()).isTrue();
+        assertThat(reactive.getStatefulConnection().isOpen()).isTrue();
     }
 
     @Test
     public void migrate() throws Exception {
         reactive.migrate("host", 1234, "key", 1, 10);
-        assertThat(reactive.isOpen()).isTrue();
+        assertThat(reactive.getStatefulConnection().isOpen()).isTrue();
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/SetRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/SetRxCommandTest.java
index 6d585e2b8c..d69b345aa6 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/SetRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/SetRxCommandTest.java
@@ -7,7 +7,7 @@ public class SetRxCommandTest extends SetCommandTest {
 
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
+        return RxSyncInvocationHandler.sync(client.connect());
     }
 
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/SortRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/SortRxCommandTest.java
index 78aee42251..166522560a 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/SortRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/SortRxCommandTest.java
@@ -6,6 +6,6 @@
 public class SortRxCommandTest extends SortCommandTest {
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
+        return RxSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/SortedSetRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/SortedSetRxCommandTest.java
index ff5acd805f..4c10f21f18 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/SortedSetRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/SortedSetRxCommandTest.java
@@ -6,6 +6,6 @@
 public class SortedSetRxCommandTest extends SortedSetCommandTest {
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
+        return RxSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/StringRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/StringRxCommandTest.java
index ce2552f0ee..f18481bd99 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/StringRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/StringRxCommandTest.java
@@ -1,17 +1,19 @@
 package com.lambdaworks.redis.commands.rx;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.StringCommandTest;
-import org.junit.Test;
-import rx.Observable;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import rx.Observable;
 
 public class StringRxCommandTest extends StringCommandTest {
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
+        return RxSyncInvocationHandler.sync(client.connect());
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
index 0649a67602..b269fae367 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
@@ -9,10 +9,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import rx.Observable;
-import rx.observables.BlockingObservable;
-import rx.observers.TestSubscriber;
-
 import com.lambdaworks.redis.ClientOptions;
 import com.lambdaworks.redis.RedisException;
 import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
@@ -20,13 +16,17 @@
 import com.lambdaworks.redis.commands.TransactionCommandTest;
 import com.lambdaworks.redis.internal.LettuceLists;
 
+import rx.Observable;
+import rx.observables.BlockingObservable;
+import rx.observers.TestSubscriber;
+
 public class TransactionRxCommandTest extends TransactionCommandTest {
 
     private RedisReactiveCommands<String, String> commands;
 
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
+        return RxSyncInvocationHandler.sync(client.connect());
     }
 
     @Before
diff --git a/src/test/java/com/lambdaworks/redis/issue42/BreakClientBase.java b/src/test/java/com/lambdaworks/redis/issue42/BreakClientBase.java
deleted file mode 100644
index 8baa2f0597..0000000000
--- a/src/test/java/com/lambdaworks/redis/issue42/BreakClientBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.lambdaworks.redis.issue42;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
-
-import java.nio.ByteBuffer;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import com.lambdaworks.redis.RedisCommandTimeoutException;
-import com.lambdaworks.redis.api.sync.RedisHashCommands;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-
-/**
- * Base for simulating slow connections/commands running into timeouts.
- */
-public abstract class BreakClientBase {
-
-    public static int TIMEOUT = 1;
-
-    public static final String TEST_KEY = "taco";
-    public volatile boolean sleep = false;
-
-    protected Logger log = LogManager.getLogger(getClass());
-
-    public void testSingle(RedisHashCommands<String, String> client) throws InterruptedException {
-        populateTest(0, client);
-
-        assertThat(client.hvals(TEST_KEY)).hasSize(16385);
-
-        breakClient(client);
-
-        assertThat(client.hvals(TEST_KEY)).hasSize(16385);
-    }
-
-    public void testLoop(RedisHashCommands<String, String> client) throws InterruptedException {
-        populateTest(100, client);
-
-        assertThat(client.hvals(TEST_KEY)).hasSize(16485);
-
-        breakClient(client);
-
-        assertExtraKeys(100, client);
-    }
-
-    public void assertExtraKeys(int howmany, RedisHashCommands<String, String> target) {
-        for (int x = 0; x < howmany; x++) {
-            int i = Integer.parseInt(target.hget(TEST_KEY, "GET-" + x));
-            assertThat(x).isEqualTo(i);
-        }
-    }
-
-    protected void breakClient(RedisHashCommands<String, String> target) throws InterruptedException {
-        try {
-            this.sleep = true;
-            log.info("This should timeout");
-            target.hgetall(TEST_KEY);
-            fail();
-        } catch (RedisCommandTimeoutException expected) {
-            log.info("got expected timeout");
-        }
-    }
-
-    protected void populateTest(int loopFor, RedisHashCommands<String, String> target) {
-        log.info("populating hash");
-        target.hset(TEST_KEY, TEST_KEY, TEST_KEY);
-
-        for (int x = 0; x < loopFor; x++) {
-            target.hset(TEST_KEY, "GET-" + x, Integer.toString(x));
-        }
-
-        for (int i = 0; i < 16384; i++) {
-            target.hset(TEST_KEY, Integer.toString(i), TEST_KEY);
-        }
-        assertThat(target.hvals(TEST_KEY)).hasSize(16385 + loopFor);
-        log.info("done");
-
-    }
-
-    public Utf8StringCodec slowCodec = new Utf8StringCodec() {
-        public String decodeValue(ByteBuffer bytes) {
-
-            if (sleep) {
-                log.info("Sleeping for " + (TIMEOUT + 2) + " seconds in slowCodec");
-                sleep = false;
-                try {
-                    TimeUnit.SECONDS.sleep(TIMEOUT + 2);
-                } catch (InterruptedException e) {
-                    throw new RuntimeException(e);
-                }
-                log.info("Done sleeping in slowCodec");
-            }
-
-            return super.decodeValue(bytes);
-        }
-    };
-}
diff --git a/src/test/java/com/lambdaworks/redis/issue42/BreakClientTest.java b/src/test/java/com/lambdaworks/redis/issue42/BreakClientTest.java
deleted file mode 100644
index 70c85c7da0..0000000000
--- a/src/test/java/com/lambdaworks/redis/issue42/BreakClientTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.lambdaworks.redis.issue42;
-
-import java.util.concurrent.TimeUnit;
-
-import com.lambdaworks.category.SlowTests;
-import com.lambdaworks.redis.DefaultRedisClient;
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@SlowTests
-@Ignore("Run me manually")
-public class BreakClientTest extends BreakClientBase {
-
-    protected static RedisClient client = DefaultRedisClient.get();
-
-    protected RedisCommands<String, String> redis;
-
-    @Before
-    public void setUp() throws Exception {
-        client.setDefaultTimeout(TIMEOUT, TimeUnit.SECONDS);
-        redis = client.connect(this.slowCodec).sync();
-        redis.flushall();
-        redis.flushdb();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        redis.close();
-    }
-
-    @Test
-    public void testStandAlone() throws Exception {
-        testSingle(redis);
-    }
-
-    @Test
-    public void testLooping() throws Exception {
-        testLoop(redis);
-    }
-
-}
diff --git a/src/test/java/com/lambdaworks/redis/issue42/BreakClusterClientTest.java b/src/test/java/com/lambdaworks/redis/issue42/BreakClusterClientTest.java
deleted file mode 100644
index d1685cb2a7..0000000000
--- a/src/test/java/com/lambdaworks/redis/issue42/BreakClusterClientTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.lambdaworks.redis.issue42;
-
-import static com.google.code.tempusfugit.temporal.Duration.*;
-import static com.google.code.tempusfugit.temporal.Timeout.*;
-
-import java.util.concurrent.TimeUnit;
-
-import com.lambdaworks.category.SlowTests;
-import com.lambdaworks.redis.FastShutdown;
-import org.junit.*;
-
-import com.google.code.tempusfugit.temporal.Condition;
-import com.google.code.tempusfugit.temporal.Duration;
-import com.google.code.tempusfugit.temporal.ThreadSleep;
-import com.google.code.tempusfugit.temporal.WaitFor;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.cluster.ClusterRule;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
-
-@SlowTests
-@Ignore("Run me manually")
-public class BreakClusterClientTest extends BreakClientBase {
-    public static final String host = TestSettings.hostAddr();
-    public static final int port1 = 7379;
-    public static final int port2 = 7380;
-    public static final int port3 = 7381;
-    public static final int port4 = 7382;
-
-    private static RedisClusterClient clusterClient;
-    private RedisClusterCommands<String, String> clusterConnection;
-
-    @Rule
-    public ClusterRule clusterRule = new ClusterRule(clusterClient, port1, port2, port3, port4);
-
-    @BeforeClass
-    public static void setupClient() {
-        clusterClient = new RedisClusterClient(RedisURI.Builder.redis(host, port1).withTimeout(TIMEOUT, TimeUnit.SECONDS)
-                .build());
-    }
-
-    @AfterClass
-    public static void shutdownClient() {
-        FastShutdown.shutdown(clusterClient);
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        WaitFor.waitOrTimeout(new Condition() {
-            @Override
-            public boolean isSatisfied() {
-                return clusterRule.isStable();
-            }
-        }, timeout(seconds(5)), new ThreadSleep(Duration.millis(500)));
-
-        clusterConnection = clusterClient.connectCluster(this.slowCodec);
-
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        clusterConnection.close();
-    }
-
-    @Test
-    public void testStandAlone() throws Exception {
-        testSingle(clusterConnection);
-    }
-
-    @Test
-    public void testLooping() throws Exception {
-        testLoop(clusterConnection);
-    }
-
-}
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java
index 5b072f18fc..f5229e7f16 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java
@@ -77,13 +77,13 @@ public void after() throws Exception {
         if (connectionToNode1 != null) {
             connectionToNode1.configSet("requirepass", "");
             connectionToNode1.configSet("masterauth", "").get(1, TimeUnit.SECONDS);
-            connectionToNode1.close();
+            connectionToNode1.getStatefulConnection().close();
         }
 
         if (connectionToNode2 != null) {
             connectionToNode2.configSet("requirepass", "");
             connectionToNode2.configSet("masterauth", "").get(1, TimeUnit.SECONDS);
-            connectionToNode2.close();
+            connectionToNode2.getStatefulConnection().close();
         }
 
         if (connection != null) {
diff --git a/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java b/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java
index e611f35fe6..db3266d137 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java
+++ b/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java
@@ -4,13 +4,13 @@
 
 import java.util.concurrent.*;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
 import org.junit.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.lambdaworks.Connections;
 import com.lambdaworks.Wait;
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
 import com.lambdaworks.redis.server.RandomResponseServer;
 
@@ -68,7 +68,7 @@ public void pingBeforeConnectFailOnReconnect() throws Exception {
         redisUri.setUnit(TimeUnit.SECONDS);
 
         try {
-            RedisAsyncCommands<String, String> connection = client.connectAsync(redisUri);
+            RedisAsyncCommands<String, String> connection = client.connect(redisUri).async();
             ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection.getStatefulConnection());
 
             assertThat(connectionWatchdog.isListenOnChannelInactive()).isTrue();
@@ -89,7 +89,7 @@ public void pingBeforeConnectFailOnReconnect() throws Exception {
                 assertThat(e).hasRootCauseExactlyInstanceOf(RedisException.class);
                 assertThat(e.getCause()).hasMessageStartingWith("Invalid first byte");
             }
-            connection.close();
+            connection.getStatefulConnection().close();
         } finally {
             ts.shutdown();
         }
@@ -117,7 +117,7 @@ public void pingBeforeConnectFailOnReconnectShouldSendEvents() throws Exception
         try {
             final BlockingQueue<ConnectionEvents.Reconnect> events = new LinkedBlockingDeque<>();
 
-            RedisAsyncCommands<String, String> connection = client.connectAsync(redisUri);
+            RedisAsyncCommands<String, String> connection = client.connect(redisUri).async();
             ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection.getStatefulConnection());
 
             ReconnectionListener reconnectionListener = new ReconnectionListener() {
@@ -133,7 +133,7 @@ public void onReconnect(ConnectionEvents.Reconnect reconnect) {
 
             connection.quit();
             Wait.untilTrue(() -> events.size() > 1).waitOrTimeout();
-            connection.close();
+            connection.getStatefulConnection().close();
 
             ConnectionEvents.Reconnect event1 = events.take();
             assertThat(event1.getAttempt()).isEqualTo(1);
@@ -166,7 +166,7 @@ public void cancelCommandsOnReconnectFailure() throws Exception {
 
         try {
             RedisAsyncCommandsImpl<String, String> connection = (RedisAsyncCommandsImpl<String, String>) client
-                    .connectAsync(redisUri);
+                    .connect(redisUri).async();
             ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection.getStatefulConnection());
 
             assertThat(connectionWatchdog.isListenOnChannelInactive()).isTrue();
@@ -175,7 +175,7 @@ public void cancelCommandsOnReconnectFailure() throws Exception {
             redisUri.setPort(TestSettings.nonexistentPort());
 
             connection.quit();
-            Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
+            Wait.untilTrue(() -> !connection.getStatefulConnection().isOpen()).waitOrTimeout();
 
             RedisFuture<String> set1 = connection.set(key, value);
             RedisFuture<String> set2 = connection.set(key, value);
@@ -183,11 +183,11 @@ public void cancelCommandsOnReconnectFailure() throws Exception {
             assertThat(set1.isDone()).isFalse();
             assertThat(set1.isCancelled()).isFalse();
 
-            assertThat(connection.isOpen()).isFalse();
+            assertThat(connection.getStatefulConnection().isOpen()).isFalse();
             connectionWatchdog.setReconnectSuspended(false);
             connectionWatchdog.run(null);
             Thread.sleep(500);
-            assertThat(connection.isOpen()).isFalse();
+            assertThat(connection.getStatefulConnection().isOpen()).isFalse();
 
             try {
                 set1.get();
@@ -208,7 +208,7 @@ public void cancelCommandsOnReconnectFailure() throws Exception {
                 assertThat(e.getCause()).hasMessageStartingWith("Invalid first byte");
             }
 
-            connection.close();
+            connection.getStatefulConnection().close();
         } finally {
             ts.shutdown();
         }
diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java b/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
index 2dc501bd9c..57b38b8a5f 100644
--- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
@@ -98,7 +98,7 @@ public void message() throws Exception {
     public void pipelinedMessage() throws Exception {
         pubsub.subscribe(channel);
         assertThat(channels.take()).isEqualTo(channel);
-        RedisAsyncCommands<String, String> connection = client.connectAsync();
+        RedisAsyncCommands<String, String> connection = client.connect().async();
 
         connection.setAutoFlushCommands(false);
         connection.publish(channel, message);
diff --git a/src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java b/src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java
index fe3818e2d3..4c5808da73 100644
--- a/src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java
+++ b/src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java
@@ -3,42 +3,27 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
 
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-import java.util.Queue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.Connections;
-import io.netty.handler.codec.EncoderException;
-import io.netty.util.Version;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.test.util.ReflectionTestUtils;
 
+import com.lambdaworks.Connections;
 import com.lambdaworks.Wait;
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.ClientOptions;
-import com.lambdaworks.redis.RedisAsyncConnection;
-import com.lambdaworks.redis.RedisChannelHandler;
-import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.RedisCommandTimeoutException;
-import com.lambdaworks.redis.RedisConnection;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.codec.Utf8StringCodec;
 import com.lambdaworks.redis.output.IntegerOutput;
 import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.AsyncCommand;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.redis.protocol.ConnectionWatchdog;
+import com.lambdaworks.redis.protocol.*;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
+import io.netty.handler.codec.EncoderException;
+import io.netty.util.Version;
 
 /**
  * @author Mark Paluch
@@ -58,15 +43,15 @@ public void before() throws Exception {
         RedisCommands<String, String> connection = client.connect().sync();
         connection.flushall();
         connection.flushdb();
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
     public void connectionIsConnectedAfterConnect() throws Exception {
 
-        RedisCommands<String, String> connection = client.connect().sync();
+        StatefulRedisConnection<String, String> connection = client.connect();
 
-        assertThat(getConnectionState(getRedisChannelHandler(connection)));
+        assertThat(Connections.getConnectionState(connection));
 
         connection.close();
     }
@@ -81,7 +66,7 @@ public void reconnectIsActiveHandler() throws Exception {
         assertThat(connectionWatchdog.isListenOnChannelInactive()).isTrue();
         assertThat(connectionWatchdog.isReconnectSuspended()).isFalse();
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
@@ -92,7 +77,7 @@ public void basicOperations() throws Exception {
         connection.set(key, "1");
         assertThat(connection.get("key")).isEqualTo("1");
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
@@ -102,10 +87,10 @@ public void noBufferedCommandsAfterExecute() throws Exception {
 
         connection.set(key, "1");
 
-        assertThat(getQueue(getRedisChannelHandler(connection))).isEmpty();
-        assertThat(getCommandBuffer(getRedisChannelHandler(connection))).isEmpty();
+        assertThat(Connections.getQueue(connection.getStatefulConnection())).isEmpty();
+        assertThat(Connections.getCommandBuffer(connection.getStatefulConnection())).isEmpty();
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
@@ -123,25 +108,26 @@ public void commandIsExecutedOnce() throws Exception {
         connection.incr(key);
         assertThat(connection.get(key)).isEqualTo("4");
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
     public void commandFailsWhenFailOnEncode() throws Exception {
 
-        RedisCommands<String, String> connection = client.connect().sync();
-        RedisChannelWriter<String, String> channelWriter = getRedisChannelHandler(connection).getChannelWriter();
+        StatefulRedisConnection<String, String> connection = client.connect();
+        RedisCommands<String, String> sync = connection.sync();
+        RedisChannelWriter<String, String> channelWriter = Connections.getChannelWriter(connection);
         RedisCommands<String, String> verificationConnection = client.connect().sync();
 
-        connection.set(key, "1");
-        AsyncCommand<String, String, String> working = new AsyncCommand<>(new Command<>(CommandType.INCR, new IntegerOutput(
-                CODEC), new CommandArgs<>(CODEC).addKey(key)));
+        sync.set(key, "1");
+        AsyncCommand<String, String, String> working = new AsyncCommand<>(
+                new Command<>(CommandType.INCR, new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key)));
         channelWriter.write(working);
         assertThat(working.await(2, TimeUnit.SECONDS)).isTrue();
-        assertThat(connection.get(key)).isEqualTo("2");
+        assertThat(sync.get(key)).isEqualTo("2");
 
-        AsyncCommand<String, String, Object> command = new AsyncCommand(new Command<>(CommandType.INCR,
-                new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key))) {
+        AsyncCommand<String, String, Object> command = new AsyncCommand(
+                new Command<>(CommandType.INCR, new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key))) {
 
             @Override
             public void encode(ByteBuf buf) {
@@ -157,9 +143,9 @@ public void encode(ByteBuf buf) {
 
         assertThat(verificationConnection.get(key)).isEqualTo("2");
 
-        assertThat(getQueue(getRedisChannelHandler(connection))).isNotEmpty();
+        assertThat(Connections.getQueue(connection)).isNotEmpty();
 
-        connection.close();
+        sync.getStatefulConnection().close();
     }
 
     @Test
@@ -167,16 +153,17 @@ public void commandNotFailedChannelClosesWhileFlush() throws Exception {
 
         assumeTrue(Version.identify().get("netty-transport").artifactVersion().startsWith("4.0.2"));
 
-        RedisCommands<String, String> connection = client.connect().sync();
+        StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> verificationConnection = client.connect().sync();
-        RedisChannelWriter<String, String> channelWriter = getRedisChannelHandler(connection).getChannelWriter();
+        RedisChannelWriter<String, String> channelWriter = Connections.getChannelWriter(connection);
 
-        connection.set(key, "1");
+        RedisCommands<String, String> sync = connection.sync();
+        sync.set(key, "1");
         assertThat(verificationConnection.get(key)).isEqualTo("1");
 
         final CountDownLatch block = new CountDownLatch(1);
 
-        ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection.getStatefulConnection());
+        ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection);
 
         AsyncCommand<String, String, Object> command = getBlockOnEncodeCommand(block);
 
@@ -184,7 +171,7 @@ public void commandNotFailedChannelClosesWhileFlush() throws Exception {
 
         connectionWatchdog.setReconnectSuspended(true);
 
-        Channel channel = getChannel(getRedisChannelHandler(connection));
+        Channel channel = Connections.getChannel(connection);
         channel.unsafe().disconnect(channel.newPromise());
 
         assertThat(channel.isOpen()).isFalse();
@@ -197,8 +184,8 @@ public void commandNotFailedChannelClosesWhileFlush() throws Exception {
 
         assertThat(verificationConnection.get(key)).isEqualTo("1");
 
-        assertThat(getQueue(getRedisChannelHandler(connection))).isEmpty();
-        assertThat(getCommandBuffer(getRedisChannelHandler(connection))).isNotEmpty().contains(command);
+        assertThat(Connections.getQueue(connection)).isEmpty();
+        assertThat(Connections.getCommandBuffer(connection)).isNotEmpty().contains(command);
 
         connection.close();
     }
@@ -208,16 +195,17 @@ public void commandRetriedChannelClosesWhileFlush() throws Exception {
 
         assumeTrue(Version.identify().get("netty-transport").artifactVersion().startsWith("4.0.2"));
 
-        RedisCommands<String, String> connection = client.connect().sync();
+        StatefulRedisConnection<String, String> connection = client.connect();
+        RedisCommands<String, String> sync = connection.sync();
         RedisCommands<String, String> verificationConnection = client.connect().sync();
-        RedisChannelWriter<String, String> channelWriter = getRedisChannelHandler(connection).getChannelWriter();
+        RedisChannelWriter<String, String> channelWriter = Connections.getChannelWriter(connection);
 
-        connection.set(key, "1");
+        sync.set(key, "1");
         assertThat(verificationConnection.get(key)).isEqualTo("1");
 
         final CountDownLatch block = new CountDownLatch(1);
 
-        ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection.getStatefulConnection());
+        ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(sync.getStatefulConnection());
 
         AsyncCommand<String, String, Object> command = getBlockOnEncodeCommand(block);
 
@@ -225,7 +213,7 @@ public void commandRetriedChannelClosesWhileFlush() throws Exception {
 
         connectionWatchdog.setReconnectSuspended(true);
 
-        Channel channel = getChannel(getRedisChannelHandler(connection));
+        Channel channel = Connections.getChannel(sync.getStatefulConnection());
         channel.unsafe().disconnect(channel.newPromise());
 
         assertThat(channel.isOpen()).isFalse();
@@ -243,16 +231,16 @@ public void commandRetriedChannelClosesWhileFlush() throws Exception {
 
         assertThat(verificationConnection.get(key)).isEqualTo("2");
 
-        assertThat(getQueue(getRedisChannelHandler(connection))).isEmpty();
-        assertThat(getCommandBuffer(getRedisChannelHandler(connection))).isEmpty();
+        assertThat(Connections.getQueue(sync.getStatefulConnection())).isEmpty();
+        assertThat(Connections.getCommandBuffer(sync.getStatefulConnection())).isEmpty();
 
-        connection.close();
-        verificationConnection.close();
+        sync.getStatefulConnection().close();
+        verificationConnection.getStatefulConnection().close();
     }
 
     protected AsyncCommand<String, String, Object> getBlockOnEncodeCommand(final CountDownLatch block) {
-        return new AsyncCommand<String, String, Object>(new Command<>(CommandType.INCR, new IntegerOutput(CODEC),
-                new CommandArgs<>(CODEC).addKey(key))) {
+        return new AsyncCommand<String, String, Object>(
+                new Command<>(CommandType.INCR, new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key))) {
 
             @Override
             public void encode(ByteBuf buf) {
@@ -268,14 +256,15 @@ public void encode(ByteBuf buf) {
     @Test
     public void commandFailsDuringDecode() throws Exception {
 
-        RedisCommands<String, String> connection = client.connect().sync();
-        RedisChannelWriter<String, String> channelWriter = getRedisChannelHandler(connection).getChannelWriter();
+        StatefulRedisConnection<String, String> connection = client.connect();
+        RedisCommands<String, String> sync = connection.sync();
+        RedisChannelWriter<String, String> channelWriter = Connections.getChannelWriter(connection);
         RedisCommands<String, String> verificationConnection = client.connect().sync();
 
-        connection.set(key, "1");
+        sync.set(key, "1");
 
-        AsyncCommand<String, String, String> command = new AsyncCommand(new Command<>(CommandType.INCR, new StatusOutput<>(
-                CODEC), new CommandArgs<>(CODEC).addKey(key)));
+        AsyncCommand<String, String, String> command = new AsyncCommand(
+                new Command<>(CommandType.INCR, new StatusOutput<>(CODEC), new CommandArgs<>(CODEC).addKey(key)));
 
         channelWriter.write(command);
 
@@ -285,87 +274,86 @@ public void commandFailsDuringDecode() throws Exception {
         assertThat(getException(command)).isInstanceOf(IllegalStateException.class);
 
         assertThat(verificationConnection.get(key)).isEqualTo("2");
-        assertThat(connection.get(key)).isEqualTo("2");
+        assertThat(sync.get(key)).isEqualTo("2");
 
-        connection.close();
-        verificationConnection.close();
+        sync.getStatefulConnection().close();
+        verificationConnection.getStatefulConnection().close();
     }
 
     @Test
     public void commandCancelledOverSyncAPIAfterConnectionIsDisconnected() throws Exception {
 
-        RedisCommands<String, String> connection = client.connect().sync();
+        StatefulRedisConnection<String, String> connection = client.connect();
+        RedisCommands<String, String> sync = connection.sync();
         RedisCommands<String, String> verificationConnection = client.connect().sync();
 
-        connection.set(key, "1");
+        sync.set(key, "1");
 
-        ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection.getStatefulConnection());
+        ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(sync.getStatefulConnection());
         connectionWatchdog.setListenOnChannelInactive(false);
 
-        connection.quit();
-        Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
+        sync.quit();
+        Wait.untilTrue(() -> !sync.getStatefulConnection().isOpen()).waitOrTimeout();
 
         try {
-            connection.incr(key);
+            sync.incr(key);
         } catch (RedisException e) {
             assertThat(e).isExactlyInstanceOf(RedisCommandTimeoutException.class);
         }
 
         assertThat(verificationConnection.get("key")).isEqualTo("1");
 
-        assertThat(getQueue(getRedisChannelHandler(connection))).isEmpty();
-        assertThat(getCommandBuffer(getRedisChannelHandler(connection)).size()).isGreaterThan(0);
+        assertThat(Connections.getQueue(connection)).isEmpty();
+        assertThat(Connections.getCommandBuffer(connection).size()).isGreaterThan(0);
 
         connectionWatchdog.setListenOnChannelInactive(true);
         connectionWatchdog.scheduleReconnect();
 
-        while (!getCommandBuffer(getRedisChannelHandler(connection)).isEmpty()
-                || !getQueue(getRedisChannelHandler(connection)).isEmpty()) {
+        while (!Connections.getCommandBuffer(connection).isEmpty() || !Connections.getQueue(connection).isEmpty()) {
             Thread.sleep(10);
         }
 
-        assertThat(connection.get(key)).isEqualTo("1");
+        assertThat(sync.get(key)).isEqualTo("1");
 
-        connection.close();
-        verificationConnection.close();
+        sync.getStatefulConnection().close();
+        verificationConnection.getStatefulConnection().close();
     }
 
     @Test
     public void retryAfterConnectionIsDisconnected() throws Exception {
 
-        RedisAsyncConnection<String, String> connection = client.connectAsync();
-        RedisChannelHandler<String, String> redisChannelHandler = (RedisChannelHandler) connection.getStatefulConnection();
+        StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> verificationConnection = client.connect().sync();
 
-        connection.set(key, "1").get();
+        connection.sync().set(key, "1");
 
-        ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection.getStatefulConnection());
+        ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection);
         connectionWatchdog.setListenOnChannelInactive(false);
 
-        connection.quit();
+        connection.async().quit();
         while (connection.isOpen()) {
             Thread.sleep(100);
         }
 
-        assertThat(connection.incr(key).await(1, TimeUnit.SECONDS)).isFalse();
+        assertThat(connection.async().incr(key).await(1, TimeUnit.SECONDS)).isFalse();
 
         assertThat(verificationConnection.get("key")).isEqualTo("1");
 
-        assertThat(getQueue(redisChannelHandler)).isEmpty();
-        assertThat(getCommandBuffer(redisChannelHandler).size()).isGreaterThan(0);
+        assertThat(Connections.getQueue(connection)).isEmpty();
+        assertThat(Connections.getCommandBuffer(connection).size()).isGreaterThan(0);
 
         connectionWatchdog.setListenOnChannelInactive(true);
         connectionWatchdog.scheduleReconnect();
 
-        while (!getCommandBuffer(redisChannelHandler).isEmpty() || !getQueue(redisChannelHandler).isEmpty()) {
+        while (!Connections.getCommandBuffer(connection).isEmpty() || !Connections.getQueue(connection).isEmpty()) {
             Thread.sleep(10);
         }
 
-        assertThat(connection.get(key).get()).isEqualTo("2");
+        assertThat(connection.sync().get(key)).isEqualTo("2");
         assertThat(verificationConnection.get(key)).isEqualTo("2");
 
         connection.close();
-        verificationConnection.close();
+        verificationConnection.getStatefulConnection().close();
     }
 
     private Throwable getException(RedisFuture<?> command) {
@@ -379,30 +367,4 @@ private Throwable getException(RedisFuture<?> command) {
         return null;
     }
 
-    private <K, V> RedisChannelHandler<K, V> getRedisChannelHandler(RedisConnection<K, V> sync) {
-
-        InvocationHandler invocationHandler = Proxy.getInvocationHandler(sync);
-        return (RedisChannelHandler<K, V>) ReflectionTestUtils.getField(invocationHandler, "connection");
-    }
-
-    private <T> T getHandler(Class<T> handlerType, RedisChannelHandler<?, ?> channelHandler) {
-        Channel channel = getChannel(channelHandler);
-        return (T) channel.pipeline().get((Class) handlerType);
-    }
-
-    private Channel getChannel(RedisChannelHandler<?, ?> channelHandler) {
-        return (Channel) ReflectionTestUtils.getField(channelHandler.getChannelWriter(), "channel");
-    }
-
-    private Queue<Object> getQueue(RedisChannelHandler<?, ?> channelHandler) {
-        return (Queue<Object>) ReflectionTestUtils.getField(channelHandler.getChannelWriter(), "queue");
-    }
-
-    private Queue<Object> getCommandBuffer(RedisChannelHandler<?, ?> channelHandler) {
-        return (Queue<Object>) ReflectionTestUtils.getField(channelHandler.getChannelWriter(), "commandBuffer");
-    }
-
-    private String getConnectionState(RedisChannelHandler<?, ?> channelHandler) {
-        return ReflectionTestUtils.getField(channelHandler.getChannelWriter(), "lifecycleState").toString();
-    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java b/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java
index b3e738f930..9efe88b3df 100644
--- a/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java
+++ b/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java
@@ -1,42 +1,31 @@
 package com.lambdaworks.redis.reliability;
 
+import static com.lambdaworks.Connections.getCommandBuffer;
+import static com.lambdaworks.Connections.getQueue;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
 
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-import java.util.Queue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
 
-import io.netty.handler.codec.EncoderException;
-import io.netty.util.Version;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.test.util.ReflectionTestUtils;
 
+import com.lambdaworks.Connections;
 import com.lambdaworks.Wait;
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.ClientOptions;
-import com.lambdaworks.redis.RedisChannelHandler;
-import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.RedisConnection;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.codec.Utf8StringCodec;
 import com.lambdaworks.redis.output.IntegerOutput;
 import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.AsyncCommand;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.redis.protocol.ConnectionWatchdog;
+import com.lambdaworks.redis.protocol.*;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
+import io.netty.handler.codec.EncoderException;
+import io.netty.util.Version;
 
 /**
  * @author Mark Paluch
@@ -57,15 +46,15 @@ public void before() throws Exception {
         RedisCommands<String, String> connection = client.connect().sync();
         connection.flushall();
         connection.flushdb();
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
     public void connectionIsConnectedAfterConnect() throws Exception {
 
-        RedisCommands<String, String> connection = client.connect().sync();
+        StatefulRedisConnection<String, String> connection = client.connect();
 
-        assertThat(getConnectionState(getRedisChannelHandler(connection)));
+        assertThat(Connections.getConnectionState(connection));
 
         connection.close();
     }
@@ -75,10 +64,10 @@ public void noReconnectHandler() throws Exception {
 
         RedisCommands<String, String> connection = client.connect().sync();
 
-        assertThat(getHandler(RedisChannelWriter.class, getRedisChannelHandler(connection))).isNotNull();
-        assertThat(getHandler(ConnectionWatchdog.class, getRedisChannelHandler(connection))).isNull();
+        ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection.getStatefulConnection());
+        assertThat(connectionWatchdog).isNull();
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
@@ -89,18 +78,19 @@ public void basicOperations() throws Exception {
         connection.set(key, "1");
         assertThat(connection.get("key")).isEqualTo("1");
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
     public void noBufferedCommandsAfterExecute() throws Exception {
 
-        RedisCommands<String, String> connection = client.connect().sync();
+        StatefulRedisConnection<String, String> connection = client.connect();
+        RedisCommands<String, String> sync = connection.sync();
 
-        connection.set(key, "1");
+        sync.set(key, "1");
 
-        assertThat(getQueue(getRedisChannelHandler(connection))).isEmpty();
-        assertThat(getCommandBuffer(getRedisChannelHandler(connection))).isEmpty();
+        assertThat(getQueue(connection)).isEmpty();
+        assertThat(getCommandBuffer(connection)).isEmpty();
 
         connection.close();
     }
@@ -108,17 +98,18 @@ public void noBufferedCommandsAfterExecute() throws Exception {
     @Test
     public void commandIsExecutedOnce() throws Exception {
 
-        RedisCommands<String, String> connection = client.connect().sync();
+        StatefulRedisConnection<String, String> connection = client.connect();
+        RedisCommands<String, String> sync = connection.sync();
 
-        connection.set(key, "1");
-        connection.incr(key);
-        assertThat(connection.get(key)).isEqualTo("2");
+        sync.set(key, "1");
+        sync.incr(key);
+        assertThat(sync.get(key)).isEqualTo("2");
 
-        connection.incr(key);
-        assertThat(connection.get(key)).isEqualTo("3");
+        sync.incr(key);
+        assertThat(sync.get(key)).isEqualTo("3");
 
-        connection.incr(key);
-        assertThat(connection.get(key)).isEqualTo("4");
+        sync.incr(key);
+        assertThat(sync.get(key)).isEqualTo("4");
 
         connection.close();
     }
@@ -126,15 +117,16 @@ public void commandIsExecutedOnce() throws Exception {
     @Test
     public void commandNotExecutedFailsOnEncode() throws Exception {
 
-        RedisCommands<String, String> connection = client.connect().sync();
-        RedisChannelWriter<String, String> channelWriter = getRedisChannelHandler(connection).getChannelWriter();
+        StatefulRedisConnection<String, String> connection = client.connect();
+        RedisCommands<String, String> sync = connection.sync();
+        RedisChannelWriter<String, String> channelWriter = Connections.getChannelWriter(connection);
 
-        connection.set(key, "1");
+        sync.set(key, "1");
         AsyncCommand<String, String, String> working = new AsyncCommand<>(new Command<String, String, String>(CommandType.INCR,
                 new IntegerOutput(CODEC), new CommandArgs<String, String>(CODEC).addKey(key)));
         channelWriter.write(working);
         assertThat(working.await(2, TimeUnit.SECONDS)).isTrue();
-        assertThat(connection.get(key)).isEqualTo("2");
+        assertThat(sync.get(key)).isEqualTo("2");
 
         AsyncCommand<String, String, Object> command = new AsyncCommand<String, String, Object>(
                 new Command<String, String, Object>(CommandType.INCR, new IntegerOutput(CODEC),
@@ -151,13 +143,13 @@ public void encode(ByteBuf buf) {
         assertThat(command.await(2, TimeUnit.SECONDS)).isTrue();
         assertThat(command.isCancelled()).isFalse();
         assertThat(getException(command)).isInstanceOf(EncoderException.class);
-        assertThat(getQueue(getRedisChannelHandler(connection))).isNotEmpty();
-        getQueue(getRedisChannelHandler(connection)).clear();
+        assertThat(getQueue(connection)).isNotEmpty();
+        getQueue(connection).clear();
 
-        assertThat(connection.get(key)).isEqualTo("2");
+        assertThat(sync.get(key)).isEqualTo("2");
 
-        assertThat(getQueue(getRedisChannelHandler(connection))).isEmpty();
-        assertThat(getCommandBuffer(getRedisChannelHandler(connection))).isEmpty();
+        assertThat(getQueue(connection)).isEmpty();
+        assertThat(getCommandBuffer(connection)).isEmpty();
 
         connection.close();
     }
@@ -167,11 +159,12 @@ public void commandNotExecutedChannelClosesWhileFlush() throws Exception {
 
         assumeTrue(Version.identify().get("netty-transport").artifactVersion().startsWith("4.0.2"));
 
-        RedisCommands<String, String> connection = client.connect().sync();
+        StatefulRedisConnection<String, String> connection = client.connect();
+        RedisCommands<String, String> sync = connection.sync();
         RedisCommands<String, String> verificationConnection = client.connect().sync();
-        RedisChannelWriter<String, String> channelWriter = getRedisChannelHandler(connection).getChannelWriter();
+        RedisChannelWriter<String, String> channelWriter = Connections.getChannelWriter(connection);
 
-        connection.set(key, "1");
+        sync.set(key, "1");
         assertThat(verificationConnection.get(key)).isEqualTo("1");
 
         final CountDownLatch block = new CountDownLatch(1);
@@ -191,7 +184,7 @@ public void encode(ByteBuf buf) {
 
         channelWriter.write(command);
 
-        Channel channel = getChannel(getRedisChannelHandler(connection));
+        Channel channel = Connections.getChannel(connection);
         channel.unsafe().disconnect(channel.newPromise());
 
         assertThat(channel.isOpen()).isFalse();
@@ -204,8 +197,8 @@ public void encode(ByteBuf buf) {
 
         assertThat(verificationConnection.get(key)).isEqualTo("1");
 
-        assertThat(getQueue(getRedisChannelHandler(connection))).isEmpty();
-        assertThat(getCommandBuffer(getRedisChannelHandler(connection))).isEmpty();
+        assertThat(getQueue(connection)).isEmpty();
+        assertThat(getCommandBuffer(connection)).isEmpty();
 
         connection.close();
     }
@@ -213,11 +206,12 @@ public void encode(ByteBuf buf) {
     @Test
     public void commandFailsDuringDecode() throws Exception {
 
-        RedisCommands<String, String> connection = client.connect().sync();
-        RedisChannelWriter<String, String> channelWriter = getRedisChannelHandler(connection).getChannelWriter();
+        StatefulRedisConnection<String, String> connection = client.connect();
+        RedisCommands<String, String> sync = connection.sync();
+        RedisChannelWriter<String, String> channelWriter = Connections.getChannelWriter(connection);
         RedisCommands<String, String> verificationConnection = client.connect().sync();
 
-        connection.set(key, "1");
+        sync.set(key, "1");
 
         AsyncCommand<String, String, String> command = new AsyncCommand<>(new Command<>(CommandType.INCR, new StatusOutput<>(
                 CODEC), new CommandArgs<>(CODEC).addKey(key)));
@@ -229,7 +223,7 @@ public void commandFailsDuringDecode() throws Exception {
         assertThat(getException(command)).isInstanceOf(IllegalStateException.class);
 
         assertThat(verificationConnection.get(key)).isEqualTo("2");
-        assertThat(connection.get(key)).isEqualTo("2");
+        assertThat(sync.get(key)).isEqualTo("2");
 
         connection.close();
     }
@@ -237,27 +231,27 @@ public void commandFailsDuringDecode() throws Exception {
     @Test
     public void noCommandsExecutedAfterConnectionIsDisconnected() throws Exception {
 
-        RedisCommands<String, String> connection = client.connect().sync();
-        connection.quit();
+        StatefulRedisConnection<String, String> connection = client.connect();
+        connection.sync().quit();
 
         Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
 
         try {
-            connection.incr(key);
+            connection.sync().incr(key);
         } catch (RedisException e) {
             assertThat(e).isInstanceOf(RedisException.class);
         }
 
         connection.close();
 
-        RedisCommands<String, String> connection2 = client.connect().sync();
-        connection2.quit();
+        StatefulRedisConnection<String, String> connection2 = client.connect();
+        connection2.async().quit();
 
         try {
 
             Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
 
-            connection2.incr(key);
+            connection2.sync().incr(key);
         } catch (Exception e) {
             assertThat(e).isExactlyInstanceOf(RedisException.class).hasMessageContaining("not connected");
         }
@@ -275,31 +269,4 @@ private Throwable getException(RedisFuture<?> command) {
         }
         return null;
     }
-
-    private <K, V> RedisChannelHandler<K, V> getRedisChannelHandler(RedisConnection<K, V> sync) {
-
-        InvocationHandler invocationHandler = Proxy.getInvocationHandler(sync);
-        return (RedisChannelHandler<K, V>) ReflectionTestUtils.getField(invocationHandler, "connection");
-    }
-
-    private <T> T getHandler(Class<T> handlerType, RedisChannelHandler<?, ?> channelHandler) {
-        Channel channel = getChannel(channelHandler);
-        return (T) channel.pipeline().get((Class) handlerType);
-    }
-
-    private Channel getChannel(RedisChannelHandler<?, ?> channelHandler) {
-        return (Channel) ReflectionTestUtils.getField(channelHandler.getChannelWriter(), "channel");
-    }
-
-    private Queue<?> getQueue(RedisChannelHandler<?, ?> channelHandler) {
-        return (Queue<?>) ReflectionTestUtils.getField(channelHandler.getChannelWriter(), "queue");
-    }
-
-    private Queue<?> getCommandBuffer(RedisChannelHandler<?, ?> channelHandler) {
-        return (Queue<?>) ReflectionTestUtils.getField(channelHandler.getChannelWriter(), "commandBuffer");
-    }
-
-    private String getConnectionState(RedisChannelHandler<?, ?> channelHandler) {
-        return ReflectionTestUtils.getField(channelHandler.getChannelWriter(), "lifecycleState").toString();
-    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java b/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
index f52cda10e7..3a3035226c 100644
--- a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
@@ -57,7 +57,7 @@ public void testDefaults() throws Exception {
     @Test
     public void testBuilder() throws Exception {
 
-        DefaultClientResources sut = new DefaultClientResources.Builder().ioThreadPoolSize(4).computationThreadPoolSize(4)
+        DefaultClientResources sut = DefaultClientResources.builder().ioThreadPoolSize(4).computationThreadPoolSize(4)
                 .commandLatencyCollectorOptions(DefaultCommandLatencyCollectorOptions.disabled()).build();
 
         EventExecutorGroup eventExecutors = sut.eventExecutorGroup();
@@ -77,7 +77,7 @@ public void testDnsResolver() throws Exception {
 
         DirContextDnsResolver dirContextDnsResolver = new DirContextDnsResolver("8.8.8.8");
 
-        DefaultClientResources sut = new DefaultClientResources.Builder().dnsResolver(dirContextDnsResolver).build();
+        DefaultClientResources sut = DefaultClientResources.builder().dnsResolver(dirContextDnsResolver).build();
 
         assertThat(sut.dnsResolver()).isEqualTo(dirContextDnsResolver);
     }
@@ -90,7 +90,7 @@ public void testProvidedResources() throws Exception {
         EventBus eventBusMock = mock(EventBus.class);
         CommandLatencyCollector latencyCollectorMock = mock(CommandLatencyCollector.class);
 
-        DefaultClientResources sut = new DefaultClientResources.Builder().eventExecutorGroup(executorMock)
+        DefaultClientResources sut = DefaultClientResources.builder().eventExecutorGroup(executorMock)
                 .eventLoopGroupProvider(groupProviderMock).eventBus(eventBusMock).commandLatencyCollector(latencyCollectorMock)
                 .build();
 
@@ -109,8 +109,7 @@ public void testProvidedResources() throws Exception {
     @Test
     public void testSmallPoolSize() throws Exception {
 
-        DefaultClientResources sut = new DefaultClientResources.Builder().ioThreadPoolSize(1).computationThreadPoolSize(1)
-                .build();
+        DefaultClientResources sut = DefaultClientResources.builder().ioThreadPoolSize(1).computationThreadPoolSize(1).build();
 
         EventExecutorGroup eventExecutors = sut.eventExecutorGroup();
         NioEventLoopGroup eventLoopGroup = sut.eventLoopGroupProvider().allocate(NioEventLoopGroup.class);
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
index f60fa730e4..853f46f378 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
@@ -17,7 +17,8 @@
 import com.lambdaworks.Wait;
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
 
 public class SentinelCommandTest extends AbstractSentinelTest {
 
@@ -26,7 +27,7 @@ public class SentinelCommandTest extends AbstractSentinelTest {
 
     @BeforeClass
     public static void setupClient() {
-        sentinelClient = new RedisClient(RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
+        sentinelClient = RedisClient.create(RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
     }
 
     @Before
@@ -75,29 +76,29 @@ public void masters() throws Exception {
     @Test
     public void sentinelConnectWith() throws Exception {
 
-        RedisClient client = new RedisClient(
+        RedisClient client = RedisClient.create(
                 RedisURI.Builder.sentinel(TestSettings.host(), 1234, MASTER_ID).withSentinel(TestSettings.host()).build());
 
-        RedisSentinelAsyncCommands<String, String> sentinelConnection = client.connectSentinelAsync();
-        assertThat(sentinelConnection.ping().get()).isEqualTo("PONG");
+        RedisSentinelCommands<String, String> sentinelConnection = client.connectSentinel().sync();
+        assertThat(sentinelConnection.ping()).isEqualTo("PONG");
 
         sentinelConnection.close();
 
-        RedisConnection<String, String> connection2 = client.connect().sync();
+        RedisCommands<String, String> connection2 = client.connect().sync();
         assertThat(connection2.ping()).isEqualTo("PONG");
         connection2.quit();
 
-        Wait.untilTrue(connection2::isOpen).waitOrTimeout();
+        Wait.untilTrue(() -> connection2.getStatefulConnection().isOpen()).waitOrTimeout();
 
         assertThat(connection2.ping()).isEqualTo("PONG");
-        connection2.close();
+        connection2.getStatefulConnection().close();
         FastShutdown.shutdown(client);
     }
 
     @Test
     public void sentinelConnectWrongMaster() throws Exception {
 
-        RedisClient client = new RedisClient(
+        RedisClient client = RedisClient.create(
                 RedisURI.Builder.sentinel(TestSettings.host(), 1234, "nonexistent").withSentinel(TestSettings.host()).build());
         try {
             client.connect();
@@ -111,12 +112,12 @@ public void sentinelConnectWrongMaster() throws Exception {
     @Test
     public void sentinelConnect() throws Exception {
 
-        RedisClient client = new RedisClient(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port()).build());
+        RedisClient client = RedisClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port()).build());
 
-        RedisSentinelAsyncCommands<String, String> connection = client.connectSentinelAsync();
-        assertThat(connection.ping().get()).isEqualTo("PONG");
+        RedisSentinelCommands<String, String> connection = client.connectSentinel().sync();
+        assertThat(connection.ping()).isEqualTo("PONG");
 
-        connection.close();
+        connection.getStatefulConnection().close();
         FastShutdown.shutdown(client);
     }
 
@@ -143,7 +144,7 @@ public void role() throws Exception {
             assertThat(objects.get(0)).isEqualTo("sentinel");
             assertThat(objects.get(1).toString()).isEqualTo("[" + MASTER_ID + "]");
         } finally {
-            connection.close();
+            connection.getStatefulConnection().close();
         }
     }
 
@@ -200,17 +201,17 @@ public void set() throws Exception {
 
     @Test
     public void connectToRedisUsingSentinel() throws Exception {
-        RedisConnection<String, String> connect = sentinelClient.connect().sync();
+        RedisCommands<String, String> connect = sentinelClient.connect().sync();
         connect.ping();
-        connect.close();
+        connect.getStatefulConnection().close();
     }
 
     @Test
     public void connectToRedisUsingSentinelWithReconnect() throws Exception {
-        RedisConnection<String, String> connect = sentinelClient.connect().sync();
+        RedisCommands<String, String> connect = sentinelClient.connect().sync();
         connect.ping();
         connect.quit();
         connect.ping();
-        connect.close();
+        connect.getStatefulConnection().close();
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
index 7b76e46d59..2fabac5a1d 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
@@ -28,7 +28,7 @@ public class SentinelConnectionTest extends AbstractSentinelTest {
 
     @BeforeClass
     public static void setupClient() {
-        sentinelClient = new RedisClient(RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
+        sentinelClient = RedisClient.create(RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
     }
 
     @Before
@@ -121,26 +121,10 @@ public void connectToOneNode() throws Exception {
         assertThat(connection.ping()).isEqualTo("PONG");
         connection.close();
     }
-
-    @Test
-    public void deprecatedConnectToOneNode() throws Exception {
-        RedisSentinelAsyncCommands<String, String> connection = sentinelClient
-                .connectSentinelAsync(RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
-        assertThat(connection.ping().get()).isEqualTo("PONG");
-        connection.close();
-    }
-
     @Test
     public void connectWithByteCodec() throws Exception {
         RedisSentinelCommands<byte[], byte[]> connection = sentinelClient.connectSentinel(new ByteArrayCodec()).sync();
         assertThat(connection.master(MASTER_ID.getBytes())).isNotNull();
         connection.close();
     }
-
-    @Test
-    public void deprecatedConnectWithByteCodec() throws Exception {
-        RedisSentinelAsyncCommands<byte[], byte[]> connection = sentinelClient.connectSentinelAsync(new ByteArrayCodec());
-        assertThat(connection.master(MASTER_ID.getBytes())).isNotNull();
-        connection.close();
-    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelFailoverTest.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelFailoverTest.java
deleted file mode 100644
index b5f1f10c27..0000000000
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelFailoverTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.lambdaworks.redis.sentinel;
-
-import static com.google.code.tempusfugit.temporal.Duration.seconds;
-import static com.lambdaworks.Delay.delay;
-import static com.lambdaworks.redis.TestSettings.port;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.lambdaworks.redis.FastShutdown;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-
-@Ignore("For manual runs only. Fails too often due to slow sentinel sync")
-public class SentinelFailoverTest extends AbstractSentinelTest {
-
-    @Rule
-    public SentinelRule sentinelRule = new SentinelRule(sentinelClient, false, 26379, 26380);
-
-    @BeforeClass
-    public static void setupClient() {
-        sentinelClient = new RedisClient(RedisURI.Builder.sentinel(TestSettings.host(), 26380, MASTER_ID).build());
-    }
-
-    @Before
-    public void openConnection() throws Exception {
-        sentinel = sentinelClient.connectSentinelAsync().getStatefulConnection().sync();
-        sentinelRule.needMasterWithSlave(MASTER_ID, port(3), port(4));
-    }
-
-    @Test
-    public void connectToRedisUsingSentinel() throws Exception {
-
-        RedisCommands<String, String> connect = sentinelClient.connect().sync();
-        assertThat(connect.ping()).isEqualToIgnoringCase("PONG");
-
-        connect.close();
-    }
-
-    @Test
-    public void failover() throws Exception {
-
-        RedisClient redisClient = new RedisClient(RedisURI.Builder.redis(TestSettings.host(), port(3)).build());
-
-        String tcpPort1 = connectUsingSentinelAndGetPort();
-
-        sentinelRule.waitForConnectedSlaves(MASTER_ID);
-        sentinel.failover(MASTER_ID);
-
-        delay(seconds(5));
-
-        sentinelRule.waitForConnectedSlaves(MASTER_ID);
-
-        String tcpPort2 = connectUsingSentinelAndGetPort();
-        assertThat(tcpPort1).isNotEqualTo(tcpPort2);
-        FastShutdown.shutdown(redisClient);
-    }
-
-    protected String connectUsingSentinelAndGetPort() {
-        RedisCommands<String, String> connectAfterFailover = sentinelClient.connect().sync();
-        String tcpPort2 = getTcpPort(connectAfterFailover);
-        connectAfterFailover.close();
-        return tcpPort2;
-    }
-
-    protected String getTcpPort(RedisCommands<String, String> commands) {
-        Pattern pattern = Pattern.compile(".*tcp_port\\:(\\d+).*", Pattern.DOTALL);
-
-        Matcher matcher = pattern.matcher(commands.info("server"));
-        if (matcher.lookingAt()) {
-            return matcher.group(1);
-        }
-        return null;
-    }
-
-}
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
index da16d629be..ebc42698da 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
@@ -58,7 +58,7 @@ public SentinelRule(RedisClient redisClient, boolean flushBeforeTest, int... sen
         log.info("[Sentinel] Connecting to sentinels: " + Arrays.toString(sentinelPorts));
         for (int port : sentinelPorts) {
             RedisSentinelAsyncCommands<String, String> connection = redisClient
-                    .connectSentinelAsync(RedisURI.Builder.redis(TestSettings.host(), port).build());
+                    .connectSentinel(RedisURI.Builder.redis(TestSettings.host(), port).build()).async();
             sentinelConnections.put(port, connection.getStatefulConnection().sync());
         }
     }
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/rx/SentinelRxCommandTest.java b/src/test/java/com/lambdaworks/redis/sentinel/rx/SentinelRxCommandTest.java
index 1d796863b2..cf6e5ed6a5 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/rx/SentinelRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/rx/SentinelRxCommandTest.java
@@ -17,7 +17,7 @@ public class SentinelRxCommandTest extends SentinelCommandTest {
     @Override
     public void openConnection() throws Exception {
 
-        RedisSentinelAsyncCommands<String, String> async = sentinelClient.connectSentinelAsync();
+        RedisSentinelAsyncCommands<String, String> async = sentinelClient.connectSentinel().async();
         RedisSentinelReactiveCommands<String, String> reactive = async.getStatefulConnection().reactive();
         sentinel = RxSyncInvocationHandler.sync(async.getStatefulConnection());
 
diff --git a/src/test/java/com/lambdaworks/redis/support/PoolingProxyFactoryTest.java b/src/test/java/com/lambdaworks/redis/support/PoolingProxyFactoryTest.java
deleted file mode 100644
index ab64a9868c..0000000000
--- a/src/test/java/com/lambdaworks/redis/support/PoolingProxyFactoryTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.lambdaworks.redis.support;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import org.junit.Test;
-
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.RedisConnection;
-import com.lambdaworks.redis.RedisConnectionPool;
-import com.lambdaworks.redis.RedisException;
-
-public class PoolingProxyFactoryTest extends AbstractRedisClientTest {
-
-    @Test
-    public void testCreateDefault() throws Exception {
-
-        RedisConnectionPool<RedisCommands<String, String>> pool = client.pool();
-        RedisConnection<String, String> connection = PoolingProxyFactory.create(pool);
-
-        connection.set("a", "b");
-        connection.set("x", "y");
-
-        pool.close();
-    }
-
-    @Test
-    public void testCloseReturnsConnection() throws Exception {
-
-        RedisConnectionPool<RedisCommands<String, String>> pool = client.pool();
-        assertThat(pool.getNumActive()).isEqualTo(0);
-        RedisConnection<String, String> connection = pool.allocateConnection();
-        assertThat(pool.getNumActive()).isEqualTo(1);
-        connection.close();
-        assertThat(pool.getNumActive()).isEqualTo(0);
-    }
-
-    @Test
-    public void testCreate() throws Exception {
-
-        RedisConnection<String, String> connection = PoolingProxyFactory.create(client.pool());
-
-        connection.set("a", "b");
-        connection.close();
-
-        try {
-            connection.set("x", "y");
-            fail("missing exception");
-        } catch (RedisException e) {
-            assertThat(e.getMessage()).isEqualTo("Connection pool is closed");
-
-        }
-    }
-}
diff --git a/src/test/java/com/lambdaworks/redis/support/WithConnectionTest.java b/src/test/java/com/lambdaworks/redis/support/WithConnectionTest.java
deleted file mode 100644
index 74ef53584f..0000000000
--- a/src/test/java/com/lambdaworks/redis/support/WithConnectionTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.lambdaworks.redis.support;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import org.junit.Test;
-
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.RedisConnection;
-import com.lambdaworks.redis.RedisConnectionPool;
-
-public class WithConnectionTest extends AbstractRedisClientTest {
-
-    @Test
-    public void testPooling() throws Exception {
-        final RedisConnectionPool<RedisCommands<String, String>> pool = client.pool();
-
-        assertThat(pool.getNumActive()).isEqualTo(0);
-        assertThat(pool.getNumIdle()).isEqualTo(0);
-
-        new WithConnection<RedisCommands<String, String>>(pool) {
-
-            @Override
-            protected void run(RedisCommands<String, String> connection) {
-                connection.set("key", "value");
-                String result = connection.get("key");
-                assertThat(result).isEqualTo("value");
-
-                assertThat(pool.getNumActive()).isEqualTo(1);
-                assertThat(pool.getNumIdle()).isEqualTo(0);
-            }
-        };
-
-        assertThat(pool.getNumActive()).isEqualTo(0);
-        assertThat(pool.getNumIdle()).isEqualTo(1);
-
-    }
-
-    @Test
-    public void testPoolingWithException() throws Exception {
-        final RedisConnectionPool<RedisCommands<String, String>> pool = client.pool();
-
-        assertThat(pool.getNumActive()).isEqualTo(0);
-        assertThat(pool.getNumIdle()).isEqualTo(0);
-
-        try {
-            new WithConnection<RedisCommands<String, String>>(pool) {
-
-                @Override
-                protected void run(RedisCommands<String, String> connection) {
-                    connection.set("key", "value");
-                    throw new IllegalStateException("test");
-                }
-            };
-
-            fail("Missing Exception");
-        } catch (Exception e) {
-        }
-
-        assertThat(pool.getNumActive()).isEqualTo(0);
-        assertThat(pool.getNumIdle()).isEqualTo(1);
-
-    }
-}
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java
index cd08ee3a3b..dfa02c93ee 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java
+++ b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java
@@ -1,6 +1,7 @@
 package com.lambdaworks.redis.cluster;
 
 import java.net.SocketAddress;
+import java.util.Collections;
 import java.util.function.Supplier;
 
 import com.lambdaworks.redis.RedisChannelWriter;
@@ -15,7 +16,7 @@ public class EmptyRedisClusterClient extends RedisClusterClient {
     private final static EmptyStatefulRedisConnection CONNECTION = new EmptyStatefulRedisConnection();
 
     public EmptyRedisClusterClient(RedisURI initialUri) {
-        super(initialUri);
+        super(null, Collections.singleton(initialUri));
     }
 
     <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, String nodeId,

From c12e39c2912c79ed2ae9445ebacd1ec45b55f71c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 25 Jul 2016 22:21:06 +0200
Subject: [PATCH 003/808] Remove Google Guava usage #217

---
 pom.xml                                       |   6 -
 .../models/slots/ClusterSlotRange.java        |   7 +-
 .../redis/models/role/ReplicationPartner.java |   2 +-
 .../redis/models/role/RoleParser.java         |   6 +-
 .../redis/resource/DirContextDnsResolver.java | 152 +++++++++++++++++-
 .../lambdaworks/redis/LettuceFuturesTest.java |  10 +-
 .../redis/LettucePerformanceTest.java         |   2 +
 .../redis/models/role/RoleParserTest.java     |   4 +-
 8 files changed, 166 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index d1d67ebb44..c02e5cbc7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,12 +117,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>18.0</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java b/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java
index eed08503f0..a0fdb55191 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java
@@ -6,9 +6,9 @@
 import java.util.List;
 import java.util.Set;
 
-import com.google.common.net.HostAndPort;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.redis.internal.HostAndPort;
 import com.lambdaworks.redis.internal.LettuceAssert;
 
 /**
@@ -48,9 +48,10 @@ public ClusterSlotRange(int from, int to, RedisClusterNode masterNode, List<Redi
     }
 
     private RedisClusterNode toRedisClusterNode(HostAndPort hostAndPort, String slaveOf, Set<RedisClusterNode.NodeFlag> flags) {
+
+        int port = hostAndPort.hasPort() ? hostAndPort.getPort() : RedisURI.DEFAULT_REDIS_PORT;
         RedisClusterNode redisClusterNode = new RedisClusterNode();
-        redisClusterNode
-                .setUri(RedisURI.create(hostAndPort.getHostText(), hostAndPort.getPortOrDefault(RedisURI.DEFAULT_REDIS_PORT)));
+        redisClusterNode.setUri(RedisURI.create(hostAndPort.getHostText(), port));
         redisClusterNode.setSlaveOf(slaveOf);
         redisClusterNode.setFlags(flags);
         return redisClusterNode;
diff --git a/src/main/java/com/lambdaworks/redis/models/role/ReplicationPartner.java b/src/main/java/com/lambdaworks/redis/models/role/ReplicationPartner.java
index dd0c85f46f..aa7f7cad76 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/ReplicationPartner.java
+++ b/src/main/java/com/lambdaworks/redis/models/role/ReplicationPartner.java
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import com.google.common.net.HostAndPort;
+import com.lambdaworks.redis.internal.HostAndPort;
 import com.lambdaworks.redis.internal.LettuceAssert;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/models/role/RoleParser.java b/src/main/java/com/lambdaworks/redis/models/role/RoleParser.java
index 3a9f2c0f7d..0f14b00a8a 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/RoleParser.java
+++ b/src/main/java/com/lambdaworks/redis/models/role/RoleParser.java
@@ -2,7 +2,7 @@
 
 import java.util.*;
 
-import com.google.common.net.HostAndPort;
+import com.lambdaworks.redis.internal.HostAndPort;
 import com.lambdaworks.redis.internal.LettuceAssert;
 
 /**
@@ -90,7 +90,7 @@ private static RedisInstance parseSlave(List<?> roleOutput) {
         String stateString = getStringFromIterator(iterator, null);
         long replicationOffset = getLongFromIterator(iterator, 0);
 
-        ReplicationPartner master = new ReplicationPartner(HostAndPort.fromParts(ip, Math.toIntExact(port)), replicationOffset);
+        ReplicationPartner master = new ReplicationPartner(HostAndPort.of(ip, Math.toIntExact(port)), replicationOffset);
 
         RedisSlaveInstance.State state = SLAVE_STATE_MAPPING.get(stateString);
 
@@ -155,7 +155,7 @@ private static ReplicationPartner getMasterSlaveReplicationPartner(Collection<?>
         long port = getLongFromIterator(iterator, 0);
         long replicationOffset = getLongFromIterator(iterator, 0);
 
-        return new ReplicationPartner(HostAndPort.fromParts(ip, Math.toIntExact(port)), replicationOffset);
+        return new ReplicationPartner(HostAndPort.of(ip, Math.toIntExact(port)), replicationOffset);
     }
 
     private static long getLongFromIterator(Iterator<?> iterator, long defaultValue) {
diff --git a/src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java b/src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java
index 2dfb3d7deb..6bb81e7110 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -17,7 +18,6 @@
 import javax.naming.directory.Attributes;
 import javax.naming.directory.InitialDirContext;
 
-import com.google.common.net.InetAddresses;
 import com.lambdaworks.redis.LettuceStrings;
 import com.lambdaworks.redis.internal.LettuceAssert;
 
@@ -39,6 +39,9 @@ public class DirContextDnsResolver implements DnsResolver, Closeable {
     final static String PREFER_IPV4_KEY = "java.net.preferIPv4Stack";
     final static String PREFER_IPV6_KEY = "java.net.preferIPv6Stack";
 
+    private static final int IPV4_PART_COUNT = 4;
+    private static final int IPV6_PART_COUNT = 8;
+
     private static final String CTX_FACTORY_NAME = "com.sun.jndi.dns.DnsContextFactory";
     private static final String INITIAL_TIMEOUT = "com.sun.jndi.dns.timeout.initial";
     private static final String LOOKUP_RETRIES = "com.sun.jndi.dns.timeout.retries";
@@ -140,8 +143,8 @@ public void close() throws IOException {
     @Override
     public InetAddress[] resolve(String host) throws UnknownHostException {
 
-        if (InetAddresses.isInetAddress(host)) {
-            return new InetAddress[] { InetAddresses.forString(host) };
+        if (ipStringToBytes(host) != null) {
+            return new InetAddress[] { InetAddress.getByAddress(ipStringToBytes(host)) };
         }
 
         List<InetAddress> inetAddresses = new ArrayList<>();
@@ -318,4 +321,147 @@ public StackPreference() {
             this.preferIpv6 = preferIpv6;
         }
     }
+
+    private static byte[] ipStringToBytes(String ipString) {
+        // Make a first pass to categorize the characters in this string.
+        boolean hasColon = false;
+        boolean hasDot = false;
+        for (int i = 0; i < ipString.length(); i++) {
+            char c = ipString.charAt(i);
+            if (c == '.') {
+                hasDot = true;
+            } else if (c == ':') {
+                if (hasDot) {
+                    return null; // Colons must not appear after dots.
+                }
+                hasColon = true;
+            } else if (Character.digit(c, 16) == -1) {
+                return null; // Everything else must be a decimal or hex digit.
+            }
+        }
+
+        // Now decide which address family to parse.
+        if (hasColon) {
+            if (hasDot) {
+                ipString = convertDottedQuadToHex(ipString);
+                if (ipString == null) {
+                    return null;
+                }
+            }
+            return textToNumericFormatV6(ipString);
+        } else if (hasDot) {
+            return textToNumericFormatV4(ipString);
+        }
+        return null;
+    }
+
+    private static byte[] textToNumericFormatV4(String ipString) {
+        byte[] bytes = new byte[IPV4_PART_COUNT];
+        int i = 0;
+        try {
+            for (String octet : ipString.split("\\.", IPV4_PART_COUNT)) {
+                bytes[i++] = parseOctet(octet);
+            }
+        } catch (NumberFormatException ex) {
+            return null;
+        }
+
+        return i == IPV4_PART_COUNT ? bytes : null;
+    }
+
+    private static byte[] textToNumericFormatV6(String ipString) {
+        // An address can have [2..8] colons, and N colons make N+1 parts.
+        String[] parts = ipString.split(":", IPV6_PART_COUNT + 2);
+        if (parts.length < 3 || parts.length > IPV6_PART_COUNT + 1) {
+            return null;
+        }
+
+        // Disregarding the endpoints, find "::" with nothing in between.
+        // This indicates that a run of zeroes has been skipped.
+        int skipIndex = -1;
+        for (int i = 1; i < parts.length - 1; i++) {
+            if (parts[i].length() == 0) {
+                if (skipIndex >= 0) {
+                    return null; // Can't have more than one ::
+                }
+                skipIndex = i;
+            }
+        }
+
+        int partsHi; // Number of parts to copy from above/before the "::"
+        int partsLo; // Number of parts to copy from below/after the "::"
+        if (skipIndex >= 0) {
+            // If we found a "::", then check if it also covers the endpoints.
+            partsHi = skipIndex;
+            partsLo = parts.length - skipIndex - 1;
+            if (parts[0].length() == 0 && --partsHi != 0) {
+                return null; // ^: requires ^::
+            }
+            if (parts[parts.length - 1].length() == 0 && --partsLo != 0) {
+                return null; // :$ requires ::$
+            }
+        } else {
+            // Otherwise, allocate the entire address to partsHi. The endpoints
+            // could still be empty, but parseHextet() will check for that.
+            partsHi = parts.length;
+            partsLo = 0;
+        }
+
+        // If we found a ::, then we must have skipped at least one part.
+        // Otherwise, we must have exactly the right number of parts.
+        int partsSkipped = IPV6_PART_COUNT - (partsHi + partsLo);
+        if (!(skipIndex >= 0 ? partsSkipped >= 1 : partsSkipped == 0)) {
+            return null;
+        }
+
+        // Now parse the hextets into a byte array.
+        ByteBuffer rawBytes = ByteBuffer.allocate(2 * IPV6_PART_COUNT);
+        try {
+            for (int i = 0; i < partsHi; i++) {
+                rawBytes.putShort(parseHextet(parts[i]));
+            }
+            for (int i = 0; i < partsSkipped; i++) {
+                rawBytes.putShort((short) 0);
+            }
+            for (int i = partsLo; i > 0; i--) {
+                rawBytes.putShort(parseHextet(parts[parts.length - i]));
+            }
+        } catch (NumberFormatException ex) {
+            return null;
+        }
+        return rawBytes.array();
+    }
+
+    private static String convertDottedQuadToHex(String ipString) {
+        int lastColon = ipString.lastIndexOf(':');
+        String initialPart = ipString.substring(0, lastColon + 1);
+        String dottedQuad = ipString.substring(lastColon + 1);
+        byte[] quad = textToNumericFormatV4(dottedQuad);
+        if (quad == null) {
+            return null;
+        }
+        String penultimate = Integer.toHexString(((quad[0] & 0xff) << 8) | (quad[1] & 0xff));
+        String ultimate = Integer.toHexString(((quad[2] & 0xff) << 8) | (quad[3] & 0xff));
+        return initialPart + penultimate + ":" + ultimate;
+    }
+
+    private static byte parseOctet(String ipPart) {
+        // Note: we already verified that this string contains only hex digits.
+        int octet = Integer.parseInt(ipPart);
+        // Disallow leading zeroes, because no clear standard exists on
+        // whether these should be interpreted as decimal or octal.
+        if (octet > 255 || (ipPart.startsWith("0") && ipPart.length() > 1)) {
+            throw new NumberFormatException();
+        }
+        return (byte) octet;
+    }
+
+    private static short parseHextet(String ipPart) {
+        // Note: we already verified that this string contains only hex digits.
+        int hextet = Integer.parseInt(ipPart, 16);
+        if (hextet > 0xffff) {
+            throw new NumberFormatException();
+        }
+        return (short) hextet;
+    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/LettuceFuturesTest.java b/src/test/java/com/lambdaworks/redis/LettuceFuturesTest.java
index e553957c0c..7e833be163 100644
--- a/src/test/java/com/lambdaworks/redis/LettuceFuturesTest.java
+++ b/src/test/java/com/lambdaworks/redis/LettuceFuturesTest.java
@@ -1,9 +1,9 @@
 package com.lambdaworks.redis;
 
-import com.google.common.util.concurrent.SettableFuture;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -21,8 +21,8 @@ public void setUp() throws Exception {
     @Test(expected = RedisCommandExecutionException.class)
     public void awaitAllShouldThrowRedisCommandExecutionException() throws Exception {
 
-        SettableFuture<String> f = SettableFuture.create();
-        f.setException(new RedisCommandExecutionException("error"));
+        CompletableFuture<String> f = new CompletableFuture<>();
+        f.completeExceptionally(new RedisCommandExecutionException("error"));
 
         LettuceFutures.awaitAll(1, TimeUnit.SECONDS, f);
     }
@@ -30,7 +30,7 @@ public void awaitAllShouldThrowRedisCommandExecutionException() throws Exception
     @Test(expected = RedisCommandInterruptedException.class)
     public void awaitAllShouldThrowRedisCommandInterruptedException() throws Exception {
 
-        SettableFuture<String> f = SettableFuture.create();
+        CompletableFuture<String> f = new CompletableFuture<>();
         Thread.currentThread().interrupt();
 
         LettuceFutures.awaitAll(1, TimeUnit.SECONDS, f);
@@ -39,7 +39,7 @@ public void awaitAllShouldThrowRedisCommandInterruptedException() throws Excepti
     @Test
     public void awaitAllShouldSetInterruptedBit() throws Exception {
 
-        SettableFuture<String> f = SettableFuture.create();
+        CompletableFuture<String> f = new CompletableFuture<>();
         Thread.currentThread().interrupt();
 
         try {
diff --git a/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java b/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java
index 17f994f4ba..39190be0c7 100644
--- a/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java
+++ b/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java
@@ -16,6 +16,8 @@
 
 import rx.Observable;
 
+import javax.annotation.Resources;
+
 /**
  * @author Mark Paluch
  */
diff --git a/src/test/java/com/lambdaworks/redis/models/role/RoleParserTest.java b/src/test/java/com/lambdaworks/redis/models/role/RoleParserTest.java
index 436cef5b57..2a70cc9ad2 100644
--- a/src/test/java/com/lambdaworks/redis/models/role/RoleParserTest.java
+++ b/src/test/java/com/lambdaworks/redis/models/role/RoleParserTest.java
@@ -5,9 +5,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lambdaworks.redis.internal.HostAndPort;
 import org.junit.Test;
 
-import com.google.common.net.HostAndPort;
 import com.lambdaworks.redis.internal.LettuceLists;
 
 public class RoleParserTest {
@@ -146,7 +146,7 @@ public void testModelTest() throws Exception {
         assertThat(sentinel.toString()).contains(RedisSentinelInstance.class.getSimpleName());
 
         ReplicationPartner partner = new ReplicationPartner();
-        partner.setHost(HostAndPort.fromHost("localhost"));
+        partner.setHost(HostAndPort.parse("localhost"));
         partner.setReplicationOffset(12);
 
         assertThat(partner.toString()).contains(ReplicationPartner.class.getSimpleName());

From 6cb3fc0211fdebabca70cd9eb5ed09b2156967ad Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 25 Jul 2016 22:48:37 +0200
Subject: [PATCH 004/808] Consolidate ClientResources usage in tests

---
 .../redis/AbstractRedisClient.java            |  5 +++
 src/test/java/com/lambdaworks/SslTest.java    |  7 +---
 .../com/lambdaworks/TestClientResources.java  |  7 ++++
 .../redis/AbstractRedisClientTest.java        |  3 +-
 .../com/lambdaworks/redis/AllTheAPIsTest.java |  4 +-
 .../lambdaworks/redis/ClientMetricsTest.java  |  3 +-
 .../com/lambdaworks/redis/ClientTest.java     |  9 ++---
 .../redis/ConnectionCommandTest.java          |  5 +--
 .../redis/RedisClientFactoryTest.java         | 21 +++--------
 .../redis/UnixDomainSocketTest.java           | 13 ++++---
 .../redis/cluster/AbstractClusterTest.java    |  4 +-
 .../redis/cluster/ClusterCommandTest.java     |  6 ++-
 .../cluster/ClusterReactiveCommandTest.java   |  5 ++-
 .../RedisClusterClientFactoryTest.java        | 37 ++++++-------------
 .../redis/cluster/RedisClusterClientTest.java |  9 +++--
 .../RedisClusterPasswordSecuredSslTest.java   |  7 ++--
 .../cluster/RedisClusterReadFromTest.java     |  4 +-
 .../redis/cluster/RedisClusterSetupTest.java  |  4 +-
 .../RedisClusterStressScenariosTest.java      |  5 ++-
 .../cluster/RedisRxClusterClientTest.java     |  5 ++-
 .../commands/CustomClusterCommandTest.java    |  3 +-
 .../commands/GeoClusterCommandTest.java       |  3 +-
 .../commands/HashClusterCommandTest.java      |  4 +-
 .../commands/KeyClusterCommandTest.java       |  8 ++--
 .../commands/ListClusterCommandTest.java      |  4 +-
 .../commands/StringClusterCommandTest.java    |  4 +-
 .../commands/rx/KeyClusterRxCommandTest.java  |  3 +-
 .../masterslave/MasterSlaveSentinelTest.java  |  2 +-
 .../redis/pubsub/PubSubCommandTest.java       |  3 +-
 .../redis/pubsub/PubSubRxTest.java            |  4 +-
 .../redis/sentinel/SentinelCommandTest.java   | 12 +++---
 .../sentinel/SentinelConnectionTest.java      |  3 +-
 32 files changed, 114 insertions(+), 102 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
index aae45992ba..5e98512311 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
@@ -201,6 +201,11 @@ protected <K, V, T extends RedisChannelHandler<K, V>> T initializeChannel(Connec
 
         RedisChannelHandler<?, ?> connection = connectionBuilder.connection();
         SocketAddress redisAddress = connectionBuilder.socketAddress();
+
+        if(connectionBuilder.workerPool().isShuttingDown()){
+            throw new IllegalStateException("Cannot connect. Worker pool not running");
+        }
+
         try {
 
             logger.debug("Connecting to Redis at {}", redisAddress);
diff --git a/src/test/java/com/lambdaworks/SslTest.java b/src/test/java/com/lambdaworks/SslTest.java
index 2b3fb2e288..95969ce31f 100644
--- a/src/test/java/com/lambdaworks/SslTest.java
+++ b/src/test/java/com/lambdaworks/SslTest.java
@@ -31,7 +31,7 @@ public class SslTest extends AbstractTest {
 
     private static final String KEYSTORE = "work/keystore.jks";
     private static final String LOCALHOST_KEYSTORE = "work/keystore-localhost.jks";
-    private static final RedisClient redisClient = RedisClient.create();
+    private static final RedisClient redisClient = DefaultRedisClient.get();
 
     private static final RedisURI URI_NO_VERIFY = RedisURI.Builder.redis(host(), sslPort()) //
             .withSsl(true) //
@@ -53,11 +53,6 @@ public void before() throws Exception {
         redisClient.setOptions(ClientOptions.create());
     }
 
-    @AfterClass
-    public static void afterClass() {
-        FastShutdown.shutdown(redisClient);
-    }
-
     @Test
     public void standaloneWithSsl() throws Exception {
 
diff --git a/src/test/java/com/lambdaworks/TestClientResources.java b/src/test/java/com/lambdaworks/TestClientResources.java
index 165adec08b..8820292dfc 100644
--- a/src/test/java/com/lambdaworks/TestClientResources.java
+++ b/src/test/java/com/lambdaworks/TestClientResources.java
@@ -15,6 +15,9 @@
  */
 public class TestClientResources {
 
+    private final static TestClientResources instance = new TestClientResources();
+    private ClientResources clientResources = create();
+
     public static ClientResources create() {
         final DefaultClientResources resources = DefaultClientResources.builder().eventLoopGroupProvider(
                 new TestEventLoopGroupProvider()).build();
@@ -32,4 +35,8 @@ public void run() {
 
         return resources;
     }
+
+    public static ClientResources get() {
+        return instance.clientResources;
+    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java b/src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java
index 6a65140f46..f64084f7a0 100644
--- a/src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java
@@ -2,6 +2,7 @@
 
 package com.lambdaworks.redis;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -20,7 +21,7 @@ public static void setupClient() {
     }
 
     protected static RedisClient newRedisClient() {
-        return RedisClient.create(RedisURI.Builder.redis(host, port).build());
+        return RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port).build());
     }
 
     protected RedisCommands<String, String> connect() {
diff --git a/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java b/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java
index e7ed946c03..f71741a34b 100644
--- a/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java
+++ b/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java
@@ -1,5 +1,6 @@
 package com.lambdaworks.redis;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -19,7 +20,8 @@ public class AllTheAPIsTest {
     @BeforeClass
     public static void beforeClass() throws Exception {
         clusterPort = TestSettings.port(900);
-        clusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), clusterPort).build());
+        clusterClient = RedisClusterClient.create(
+                TestClientResources.get(), RedisURI.Builder.redis(TestSettings.host(), clusterPort).build());
     }
 
     @BeforeClass
diff --git a/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java b/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
index 30fa45d35f..ca3a9443ad 100644
--- a/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
@@ -5,6 +5,7 @@
 import static com.lambdaworks.redis.AbstractRedisClientTest.client;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.lambdaworks.TestClientResources;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.metrics.CommandLatencyId;
 import com.lambdaworks.redis.metrics.CommandMetrics;
@@ -35,7 +36,7 @@ public class ClientMetricsTest extends AbstractTest {
 
     @BeforeClass
     public static void setupClient() {
-        client = RedisClient.create(RedisURI.Builder.redis(host, port).build());
+        client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port).build());
     }
 
     @Before
diff --git a/src/test/java/com/lambdaworks/redis/ClientTest.java b/src/test/java/com/lambdaworks/redis/ClientTest.java
index 8e8b8a4ac7..ea10cdfd9c 100644
--- a/src/test/java/com/lambdaworks/redis/ClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientTest.java
@@ -9,6 +9,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.FixMethodOrder;
 import org.junit.Rule;
 import org.junit.Test;
@@ -155,7 +156,7 @@ public void interrupt() throws Exception {
 
     @Test
     public void connectFailure() throws Exception {
-        RedisClient client = RedisClient.create("redis://invalid");
+        RedisClient client = RedisClient.create(TestClientResources.get(), "redis://invalid");
         exception.expect(RedisException.class);
         exception.expectMessage("Unable to connect");
         client.connect();
@@ -164,7 +165,7 @@ public void connectFailure() throws Exception {
 
     @Test
     public void connectPubSubFailure() throws Exception {
-        RedisClient client = RedisClient.create("redis://invalid");
+        RedisClient client = RedisClient.create(TestClientResources.get(), "redis://invalid");
         exception.expect(RedisException.class);
         exception.expectMessage("Unable to connect");
         client.connectPubSub();
@@ -197,7 +198,7 @@ public void onRedisExceptionCaught(RedisChannelHandler<?, ?> connection, Throwab
     @Test
     public void emptyClient() throws Exception {
 
-        RedisClient client = RedisClient.create();
+        RedisClient client = DefaultRedisClient.get();
         try {
             client.connect();
         } catch (IllegalStateException e) {
@@ -215,8 +216,6 @@ public void emptyClient() throws Exception {
         } catch (IllegalArgumentException e) {
             assertThat(e).hasMessageContaining("RedisURI");
         }
-
-        FastShutdown.shutdown(client);
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java b/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
index 964f603320..53d821d79a 100644
--- a/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
@@ -33,11 +33,10 @@ public void run(RedisClient client) {
                 }
 
                 RedisURI redisURI = RedisURI.Builder.redis(host, port).withDatabase(2).withPassword(passwd).build();
-                RedisClient redisClient = RedisClient.create(redisURI);
-                RedisCommands<String, String> authConnection = redisClient.connect().sync();
+                RedisClient redisClient = DefaultRedisClient.get();
+                RedisCommands<String, String> authConnection = redisClient.connect(redisURI).sync();
                 authConnection.ping();
                 authConnection.getStatefulConnection().close();
-                FastShutdown.shutdown(redisClient);
             }
         };
     }
diff --git a/src/test/java/com/lambdaworks/redis/RedisClientFactoryTest.java b/src/test/java/com/lambdaworks/redis/RedisClientFactoryTest.java
index ecb6f4d786..6a1e0a9a10 100644
--- a/src/test/java/com/lambdaworks/redis/RedisClientFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/RedisClientFactoryTest.java
@@ -15,17 +15,6 @@ public class RedisClientFactoryTest {
 
     private final static String URI = "redis://" + TestSettings.host() + ":" + TestSettings.port();
     private final static RedisURI REDIS_URI = RedisURI.create(URI);
-    private static ClientResources DEFAULT_RESOURCES;
-
-    @BeforeClass
-    public static void beforeClass() throws Exception {
-        DEFAULT_RESOURCES = TestClientResources.create();
-    }
-
-    @AfterClass
-    public static void afterClass() throws Exception {
-        FastShutdown.shutdown(DEFAULT_RESOURCES);
-    }
 
     @Test
     public void plain() throws Exception {
@@ -54,7 +43,7 @@ public void withUriNull() throws Exception {
 
     @Test
     public void clientResources() throws Exception {
-        FastShutdown.shutdown(RedisClient.create(DEFAULT_RESOURCES));
+        FastShutdown.shutdown(RedisClient.create(TestClientResources.get()));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -64,12 +53,12 @@ public void clientResourcesNull() throws Exception {
 
     @Test
     public void clientResourcesWithStringUri() throws Exception {
-        FastShutdown.shutdown(RedisClient.create(DEFAULT_RESOURCES, URI));
+        FastShutdown.shutdown(RedisClient.create(TestClientResources.get(), URI));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void clientResourcesWithStringUriNull() throws Exception {
-        RedisClient.create(DEFAULT_RESOURCES, (String) null);
+        RedisClient.create(TestClientResources.get(), (String) null);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -79,12 +68,12 @@ public void clientResourcesNullWithStringUri() throws Exception {
 
     @Test
     public void clientResourcesWithUri() throws Exception {
-        FastShutdown.shutdown(RedisClient.create(DEFAULT_RESOURCES, REDIS_URI));
+        FastShutdown.shutdown(RedisClient.create(TestClientResources.get(),  REDIS_URI));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void clientResourcesWithUriNull() throws Exception {
-        RedisClient.create(DEFAULT_RESOURCES, (RedisURI) null);
+        RedisClient.create(TestClientResources.get(), (RedisURI) null);
     }
 
     @Test(expected = IllegalArgumentException.class)
diff --git a/src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java b/src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java
index a7aeb5f8ef..91bf46432e 100644
--- a/src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java
+++ b/src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java
@@ -8,6 +8,7 @@
 import java.io.IOException;
 import java.util.Locale;
 
+import com.lambdaworks.TestClientResources;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.AfterClass;
@@ -56,7 +57,7 @@ public void standalone_Linux_x86_64_RedisClientWithSocket() throws Exception {
 
         RedisURI redisURI = getSocketRedisUri();
 
-        RedisClient redisClient = RedisClient.create(redisURI);
+        RedisClient redisClient = RedisClient.create(TestClientResources.get(), redisURI);
 
         StatefulRedisConnection<String, String> connection = redisClient.connect();
 
@@ -73,7 +74,7 @@ public void standalone_Linux_x86_64_ConnectToSocket() throws Exception {
 
         RedisURI redisURI = getSocketRedisUri();
 
-        RedisClient redisClient = RedisClient.create();
+        RedisClient redisClient = RedisClient.create(TestClientResources.get());
 
         StatefulRedisConnection<String, String> connection = redisClient.connect(redisURI);
 
@@ -107,7 +108,7 @@ public void sentinel_Linux_x86_64_RedisClientWithSocket() throws Exception {
         uri.getSentinels().add(getSentinelSocketRedisUri());
         uri.setSentinelMasterId("mymaster");
 
-        RedisClient redisClient = RedisClient.create(uri);
+        RedisClient redisClient = RedisClient.create(TestClientResources.get(), uri);
 
         StatefulRedisConnection<String, String> connection = redisClient.connect();
 
@@ -132,7 +133,7 @@ public void sentinel_Linux_x86_64_ConnectToSocket() throws Exception {
         uri.getSentinels().add(getSentinelSocketRedisUri());
         uri.setSentinelMasterId("mymaster");
 
-        RedisClient redisClient = RedisClient.create();
+        RedisClient redisClient = RedisClient.create(TestClientResources.get());
 
         StatefulRedisConnection<String, String> connection = redisClient.connect(uri);
 
@@ -159,7 +160,7 @@ public void sentinel_Linux_x86_64_socket_and_inet() throws Exception {
         uri.getSentinels().add(RedisURI.create(RedisURI.URI_SCHEME_REDIS + "://" + TestSettings.host() + ":26379"));
         uri.setSentinelMasterId(MASTER_ID);
 
-        RedisClient redisClient = RedisClient.create(uri);
+        RedisClient redisClient = RedisClient.create(TestClientResources.get(), uri);
 
         StatefulRedisSentinelConnection<String, String> sentinelConnection = redisClient
                 .connectSentinel(getSentinelSocketRedisUri());
@@ -184,6 +185,6 @@ private void someRedisAction(RedisCommands<String, String> connection) {
     }
 
     protected static RedisClient getRedisSentinelClient() {
-        return RedisClient.create(RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
+        return RedisClient.create(TestClientResources.get(), RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java b/src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java
index a18a73cbc8..ca2f927d9f 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java
@@ -1,5 +1,6 @@
 package com.lambdaworks.redis.cluster;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -44,7 +45,8 @@ public class AbstractClusterTest extends AbstractTest {
 
     @BeforeClass
     public static void setupClusterClient() throws Exception {
-        clusterClient = RedisClusterClient.create(LettuceLists.unmodifiableList(RedisURI.Builder.redis(host, port1).build()));
+        clusterClient = RedisClusterClient.create(
+                TestClientResources.get(), LettuceLists.unmodifiableList(RedisURI.Builder.redis(host, port1).build()));
     }
 
     @AfterClass
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java
index 81694bea2b..61c29e1a75 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java
@@ -9,6 +9,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.*;
 import org.junit.runners.MethodSorters;
 
@@ -39,8 +40,9 @@ public class ClusterCommandTest extends AbstractClusterTest {
 
     @BeforeClass
     public static void setupClient() throws Exception {
-        client = RedisClient.create(RedisURI.Builder.redis(host, port1).build());
-        clusterClient = RedisClusterClient.create(LettuceLists.newList(RedisURI.Builder.redis(host, port1).build()));
+        client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port1).build());
+        clusterClient = RedisClusterClient.create(TestClientResources.get(), LettuceLists.newList(RedisURI.Builder.redis(host, port1).build()));
+
     }
 
     @AfterClass
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
index 6479c85278..044025b522 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
@@ -5,6 +5,7 @@
 
 import java.util.List;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.*;
 import org.junit.runners.MethodSorters;
 
@@ -31,8 +32,8 @@ public class ClusterReactiveCommandTest extends AbstractClusterTest {
     @BeforeClass
     public static void setupClient() throws Exception {
         setupClusterClient();
-        client = RedisClient.create(RedisURI.Builder.redis(host, port1).build());
-        clusterClient = RedisClusterClient.create(LettuceLists.unmodifiableList(RedisURI.Builder.redis(host, port1).build()));
+        client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port1).build());
+        clusterClient = RedisClusterClient.create(TestClientResources.get(), LettuceLists.unmodifiableList(RedisURI.Builder.redis(host, port1).build()));
 
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientFactoryTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientFactoryTest.java
index 7dafc83502..271f0120a0 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientFactoryTest.java
@@ -2,10 +2,7 @@
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.lambdaworks.TestClientResources;
@@ -13,7 +10,6 @@
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.TestSettings;
 import com.lambdaworks.redis.internal.LettuceLists;
-import com.lambdaworks.redis.resource.ClientResources;
 
 /**
  * @author Mark Paluch
@@ -23,21 +19,10 @@ public class RedisClusterClientFactoryTest {
     private final static String URI = "redis://" + TestSettings.host() + ":" + TestSettings.port();
     private final static RedisURI REDIS_URI = RedisURI.create(URI);
     private static final List<RedisURI> REDIS_URIS = LettuceLists.newList(REDIS_URI);
-    private static ClientResources DEFAULT_RESOURCES;
-
-    @BeforeClass
-    public static void beforeClass() throws Exception {
-        DEFAULT_RESOURCES = TestClientResources.create();
-    }
-
-    @AfterClass
-    public static void afterClass() throws Exception {
-        DEFAULT_RESOURCES.shutdown(100, 100, TimeUnit.MILLISECONDS).get();
-    }
 
     @Test
     public void withStringUri() throws Exception {
-        FastShutdown.shutdown(RedisClusterClient.create(URI));
+        FastShutdown.shutdown(RedisClusterClient.create(TestClientResources.get(), URI));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -67,12 +52,12 @@ public void withUriIterableNull() throws Exception {
 
     @Test
     public void clientResourcesWithStringUri() throws Exception {
-        FastShutdown.shutdown(RedisClusterClient.create(DEFAULT_RESOURCES, URI));
+        FastShutdown.shutdown(RedisClusterClient.create(TestClientResources.get(), URI));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void clientResourcesWithStringUriNull() throws Exception {
-        RedisClusterClient.create(DEFAULT_RESOURCES, (String) null);
+        RedisClusterClient.create(TestClientResources.get(), (String) null);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -82,12 +67,12 @@ public void clientResourcesNullWithStringUri() throws Exception {
 
     @Test
     public void clientResourcesWithUri() throws Exception {
-        FastShutdown.shutdown(RedisClusterClient.create(DEFAULT_RESOURCES, REDIS_URI));
+        FastShutdown.shutdown(RedisClusterClient.create(TestClientResources.get(), REDIS_URI));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void clientResourcesWithUriNull() throws Exception {
-        RedisClusterClient.create(DEFAULT_RESOURCES, (RedisURI) null);
+        RedisClusterClient.create(TestClientResources.get(), (RedisURI) null);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -97,34 +82,34 @@ public void clientResourcesWithUriUri() throws Exception {
 
     @Test
     public void clientResourcesWithUriIterable() throws Exception {
-        FastShutdown.shutdown(RedisClusterClient.create(DEFAULT_RESOURCES, LettuceLists.newList(REDIS_URI)));
+        FastShutdown.shutdown(RedisClusterClient.create(TestClientResources.get(), LettuceLists.newList(REDIS_URI)));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void clientResourcesWithUriIterableNull() throws Exception {
-        RedisClusterClient.create(DEFAULT_RESOURCES, (Iterable<RedisURI>) null);
+        RedisClusterClient.create(TestClientResources.get(), (Iterable<RedisURI>) null);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void clientResourcesNullWithUriIterable() throws Exception {
         RedisClusterClient.create(null, REDIS_URIS);
     }
-    
+
     @Test(expected = IllegalArgumentException.class)
     public void clientWithDifferentSslSettings() throws Exception {
         RedisClusterClient.create(Arrays.asList(RedisURI.create("redis://host1"), RedisURI.create("redis+ssl://host1")));
     }
-    
+
     @Test(expected = IllegalArgumentException.class)
     public void clientWithDifferentTlsSettings() throws Exception {
         RedisClusterClient.create(Arrays.asList(RedisURI.create("rediss://host1"), RedisURI.create("redis+tls://host1")));
     }
-    
+
     @Test(expected = IllegalArgumentException.class)
     public void clientWithDifferentVerifyPeerSettings() throws Exception {
         RedisURI redisURI = RedisURI.create("rediss://host1");
         redisURI.setVerifyPeer(false);
-        
+
         RedisClusterClient.create(Arrays.asList(redisURI, RedisURI.create("rediss://host1")));
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
index 5a6f91fb4e..a9d6519b4c 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import com.lambdaworks.TestClientResources;
 import org.assertj.core.api.AssertionsForClassTypes;
 import org.junit.*;
 import org.junit.runners.MethodSorters;
@@ -48,8 +49,8 @@ public class RedisClusterClientTest extends AbstractClusterTest {
     @BeforeClass
     public static void setupClient() throws Exception {
         setupClusterClient();
-        client = RedisClient.create(RedisURI.Builder.redis(host, port1).build());
-        clusterClient = RedisClusterClient.create(Collections.singletonList(RedisURI.Builder.redis(host, port1).build()));
+        client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port1).build());
+        clusterClient = RedisClusterClient.create(TestClientResources.get(), Collections.singletonList(RedisURI.Builder.redis(host, port1).build()));
     }
 
     @AfterClass
@@ -353,7 +354,7 @@ public void clusterNeedsAuthButNotSupplied() throws Exception {
     @Test
     public void noClusterNodeAvailable() throws Exception {
 
-        RedisClusterClient clusterClient = RedisClusterClient.create(RedisURI.Builder.redis(host, 40400).build());
+        RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, 40400).build());
         try {
             clusterClient.connect();
             fail("Missing RedisException");
@@ -432,7 +433,7 @@ public void readOnlyOnCluster() throws Exception {
         sync.readWrite();
 
         assertThat(ReflectionTestUtils.getField(sync.getStatefulConnection(), "readOnly")).isEqualTo(Boolean.FALSE);
-        RedisClusterClient clusterClient = RedisClusterClient.create(RedisURI.Builder.redis(host, 40400).build());
+        RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, 40400).build());
         try {
             clusterClient.connect();
             fail("Missing RedisException");
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterPasswordSecuredSslTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterPasswordSecuredSslTest.java
index 111b1b0304..3fff656970 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterPasswordSecuredSslTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterPasswordSecuredSslTest.java
@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
@@ -39,7 +40,7 @@ public class RedisClusterPasswordSecuredSslTest extends AbstractTest {
 
     public static RedisURI redisURI = RedisURI.builder().redis(host(), CLUSTER_PORT_SSL_1).withPassword("foobared")
             .withSsl(true).withVerifyPeer(false).build();
-    public static RedisClusterClient redisClient = RedisClusterClient.create(redisURI);
+    public static RedisClusterClient redisClient = RedisClusterClient.create(TestClientResources.get(), redisURI);
 
     @Before
     public void before() throws Exception {
@@ -123,7 +124,7 @@ public void connectionWithoutPasswordShouldFail() throws Exception {
 
         RedisURI redisURI = RedisURI.builder().redis(host(), CLUSTER_PORT_SSL_1).withSsl(true).withVerifyPeer(false)
                 .build();
-        RedisClusterClient redisClusterClient = RedisClusterClient.create(redisURI);
+        RedisClusterClient redisClusterClient = RedisClusterClient.create(TestClientResources.get(), redisURI);
 
         try {
             redisClusterClient.reloadPartitions();
@@ -139,7 +140,7 @@ public void connectionWithoutPasswordShouldFail2() throws Exception {
 
         RedisURI redisURI = RedisURI.builder().redis(host(), CLUSTER_PORT_SSL_1).withSsl(true).withVerifyPeer(false)
                 .build();
-        RedisClusterClient redisClusterClient = RedisClusterClient.create(redisURI);
+        RedisClusterClient redisClusterClient = RedisClusterClient.create(TestClientResources.get(), redisURI);
 
         try {
             redisClusterClient.connect();
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
index bd7b01293a..0f9aef7397 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
@@ -4,6 +4,7 @@
 
 import java.util.Collections;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.*;
 import org.junit.runners.MethodSorters;
 
@@ -23,7 +24,8 @@ public class RedisClusterReadFromTest extends AbstractClusterTest {
     @BeforeClass
     public static void setupClient() throws Exception {
         setupClusterClient();
-        clusterClient = RedisClusterClient.create(Collections.singletonList(RedisURI.Builder.redis(host, port1).build()));
+        clusterClient = RedisClusterClient.create(
+                TestClientResources.get(), Collections.singletonList(RedisURI.Builder.redis(host, port1).build()));
     }
 
     @AfterClass
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
index 90a323b3d3..dfe8a71cc5 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
@@ -13,6 +13,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.*;
 
 import com.google.code.tempusfugit.temporal.Condition;
@@ -58,7 +59,8 @@ public class RedisClusterSetupTest extends AbstractTest {
 
     @BeforeClass
     public static void setupClient() {
-        clusterClient = RedisClusterClient.create(RedisURI.Builder.redis(host, AbstractClusterTest.port5).build());
+        clusterClient = RedisClusterClient.create(
+                TestClientResources.get(), RedisURI.Builder.redis(host, AbstractClusterTest.port5).build());
     }
 
     @AfterClass
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
index 286d7deac6..abafa964be 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
@@ -11,6 +11,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import com.lambdaworks.TestClientResources;
 import org.junit.*;
 import org.junit.runners.MethodSorters;
 
@@ -52,8 +53,8 @@ public class RedisClusterStressScenariosTest extends AbstractTest {
 
     @BeforeClass
     public static void setupClient() throws Exception {
-        client = RedisClient.create(RedisURI.Builder.redis(host, AbstractClusterTest.port5).build());
-        clusterClient = RedisClusterClient.create(
+        client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, AbstractClusterTest.port5).build());
+        clusterClient = RedisClusterClient.create(TestClientResources.get(),
                 Collections.singletonList(RedisURI.Builder.redis(host, AbstractClusterTest.port5)
                 .build()));
     }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisRxClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisRxClusterClientTest.java
index 626dac4ef7..5200e8188a 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisRxClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisRxClusterClientTest.java
@@ -6,6 +6,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -38,8 +39,8 @@ public class RedisRxClusterClientTest extends AbstractClusterTest {
     @BeforeClass
     public static void setupClient() throws Exception {
         setupClusterClient();
-        client = RedisClient.create(RedisURI.Builder.redis(host, port1).build());
-        clusterClient = RedisClusterClient.create(Collections.singletonList(RedisURI.Builder.redis(host, port1).build()));
+        client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port1).build());
+        clusterClient = RedisClusterClient.create(TestClientResources.get(), Collections.singletonList(RedisURI.Builder.redis(host, port1).build()));
     }
 
     @AfterClass
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
index 23abe9b280..34c3b98a3a 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -32,7 +33,7 @@ public class CustomClusterCommandTest extends AbstractClusterTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(
+        redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java
index 281edb8c21..5d4f01c8a5 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java
@@ -2,6 +2,7 @@
 
 import static com.lambdaworks.redis.cluster.ClusterTestUtil.flushDatabaseOfAllNodes;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -25,7 +26,7 @@ public class GeoClusterCommandTest extends GeoCommandTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(
+        redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java
index 50dce303c7..31c4a576fd 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java
@@ -1,5 +1,6 @@
 package com.lambdaworks.redis.cluster.commands;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -23,7 +24,8 @@ public class HashClusterCommandTest extends HashCommandTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
+        redisClusterClient = RedisClusterClient.create(
+                TestClientResources.get(), RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
     @AfterClass
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/KeyClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/KeyClusterCommandTest.java
index 0539530639..2b4bfb3bed 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/KeyClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/KeyClusterCommandTest.java
@@ -56,9 +56,9 @@ public void del() throws Exception {
         redis.set("b", "value");
 
         assertThat(redis.del(key, "a", "b")).isEqualTo(3);
-        assertThat(redis.exists(key)).isFalse();
-        assertThat(redis.exists("a")).isFalse();
-        assertThat(redis.exists("b")).isFalse();
+        assertThat(redis.exists(key)).isEqualTo(0);
+        assertThat(redis.exists("a")).isEqualTo(0);
+        assertThat(redis.exists("b")).isEqualTo(0);
     }
 
     @Test
@@ -92,7 +92,7 @@ public void unlink() throws Exception {
         redis.set("b", "value");
 
         assertThat(redis.unlink(key, "a", "b")).isEqualTo(3);
-        assertThat(redis.exists(key)).isFalse();
+        assertThat(redis.exists(key)).isEqualTo(0);
     }
 
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java
index 7457bf7da6..8be0f120a0 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java
@@ -1,5 +1,6 @@
 package com.lambdaworks.redis.cluster.commands;
 
+import com.lambdaworks.TestClientResources;
 import org.assertj.core.api.Assertions;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -26,7 +27,8 @@ public class ListClusterCommandTest extends ListCommandTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
+        redisClusterClient = RedisClusterClient.create(
+                TestClientResources.get(), RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
     @AfterClass
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
index a97e2a5305..b791f47b26 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
@@ -5,6 +5,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -30,7 +31,8 @@ public class StringClusterCommandTest extends StringCommandTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
+        redisClusterClient = RedisClusterClient.create(
+                TestClientResources.get(), RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
     @AfterClass
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/KeyClusterRxCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/KeyClusterRxCommandTest.java
index 7b79a2baf6..d7f93062a6 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/KeyClusterRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/KeyClusterRxCommandTest.java
@@ -1,5 +1,6 @@
 package com.lambdaworks.redis.cluster.commands.rx;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -23,7 +24,7 @@ public class KeyClusterRxCommandTest extends KeyClusterCommandTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = new RedisClusterClient(
+        redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java
index 523f3adcf8..55aac7e02c 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java
@@ -28,7 +28,7 @@
 public class MasterSlaveSentinelTest extends AbstractSentinelTest {
 
     static {
-        sentinelClient = RedisClient.create(TestClientResources.create(),
+        sentinelClient = RedisClient.create(TestClientResources.get(),
                 RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java b/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
index 57b38b8a5f..471d0463b7 100644
--- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
@@ -13,6 +13,7 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -257,7 +258,7 @@ public void unsubscribe() throws Exception {
     @Test
     public void pubsubCloseOnClientShutdown() throws Exception {
 
-        RedisClient redisClient = RedisClient.create(RedisURI.Builder.redis(host, port).build());
+        RedisClient redisClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port).build());
 
         RedisPubSubAsyncCommands<String, String> connection = redisClient.connectPubSub().async();
 
diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubRxTest.java b/src/test/java/com/lambdaworks/redis/pubsub/PubSubRxTest.java
index 135ce84ec9..3f5da62c6c 100644
--- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubRxTest.java
+++ b/src/test/java/com/lambdaworks/redis/pubsub/PubSubRxTest.java
@@ -10,6 +10,7 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -286,7 +287,8 @@ public void unsubscribe() throws Exception {
     @Test
     public void pubsubCloseOnClientShutdown() throws Exception {
 
-        RedisClient redisClient = RedisClient.create(RedisURI.Builder.redis(host, port).build());
+        RedisClient redisClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port).build());
+
         RedisPubSubCommands<String, String> connection = redisClient.connectPubSub().sync();
         FastShutdown.shutdown(redisClient);
 
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
index 853f46f378..76f19d3869 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -76,7 +77,7 @@ public void masters() throws Exception {
     @Test
     public void sentinelConnectWith() throws Exception {
 
-        RedisClient client = RedisClient.create(
+        RedisClient client = RedisClient.create(TestClientResources.get(),
                 RedisURI.Builder.sentinel(TestSettings.host(), 1234, MASTER_ID).withSentinel(TestSettings.host()).build());
 
         RedisSentinelCommands<String, String> sentinelConnection = client.connectSentinel().sync();
@@ -98,7 +99,7 @@ public void sentinelConnectWith() throws Exception {
     @Test
     public void sentinelConnectWrongMaster() throws Exception {
 
-        RedisClient client = RedisClient.create(
+        RedisClient client = RedisClient.create(TestClientResources.get(),
                 RedisURI.Builder.sentinel(TestSettings.host(), 1234, "nonexistent").withSentinel(TestSettings.host()).build());
         try {
             client.connect();
@@ -112,13 +113,14 @@ public void sentinelConnectWrongMaster() throws Exception {
     @Test
     public void sentinelConnect() throws Exception {
 
-        RedisClient client = RedisClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port()).build());
+        RedisClient client = DefaultRedisClient.get();
 
-        RedisSentinelCommands<String, String> connection = client.connectSentinel().sync();
+        RedisURI redisURI = RedisURI.Builder.redis(TestSettings.host(), TestSettings.port()).build();
+        RedisSentinelCommands<String, String> connection = client
+                .connectSentinel(redisURI).sync();
         assertThat(connection.ping()).isEqualTo("PONG");
 
         connection.getStatefulConnection().close();
-        FastShutdown.shutdown(client);
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
index 2fabac5a1d..fb5cae9f88 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
@@ -7,6 +7,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import com.lambdaworks.TestClientResources;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -28,7 +29,7 @@ public class SentinelConnectionTest extends AbstractSentinelTest {
 
     @BeforeClass
     public static void setupClient() {
-        sentinelClient = RedisClient.create(RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
+        sentinelClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
     }
 
     @Before

From 8a77ea031977da8aebbbc4f35264ba1f975506b4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 25 Jul 2016 22:50:50 +0200
Subject: [PATCH 005/808] Make DefaultEventPublisherOptions.Builder constructor
 private and expose builder() method

---
 .../redis/event/DefaultEventPublisherOptions.java   | 13 +++++++++++--
 .../event/DefaultEventPublisherOptionsTest.java     |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/event/DefaultEventPublisherOptions.java b/src/main/java/com/lambdaworks/redis/event/DefaultEventPublisherOptions.java
index 80b634e63c..c05ca16c91 100644
--- a/src/main/java/com/lambdaworks/redis/event/DefaultEventPublisherOptions.java
+++ b/src/main/java/com/lambdaworks/redis/event/DefaultEventPublisherOptions.java
@@ -20,11 +20,20 @@ public class DefaultEventPublisherOptions implements EventPublisherOptions {
     private final long eventEmitInterval;
     private final TimeUnit eventEmitIntervalUnit;
 
-    protected DefaultEventPublisherOptions(Builder builder) {
+    private DefaultEventPublisherOptions(Builder builder) {
         this.eventEmitInterval = builder.eventEmitInterval;
         this.eventEmitIntervalUnit = builder.eventEmitIntervalUnit;
     }
 
+    /**
+     * Returns a new {@link DefaultEventPublisherOptions.Builder} to construct {@link DefaultEventPublisherOptions}.
+     *
+     * @return a new {@link DefaultEventPublisherOptions.Builder} to construct {@link DefaultEventPublisherOptions}.
+     */
+    public static Builder builder(){
+        return new Builder();
+    }
+
     /**
      * Builder for {@link DefaultEventPublisherOptions}.
      */
@@ -33,7 +42,7 @@ public static class Builder {
         private long eventEmitInterval = DEFAULT_EMIT_INTERVAL;
         private TimeUnit eventEmitIntervalUnit = DEFAULT_EMIT_INTERVAL_UNIT;
 
-        public Builder() {
+        private Builder() {
         }
 
         /**
diff --git a/src/test/java/com/lambdaworks/redis/event/DefaultEventPublisherOptionsTest.java b/src/test/java/com/lambdaworks/redis/event/DefaultEventPublisherOptionsTest.java
index 004e909587..ccb0ce6621 100644
--- a/src/test/java/com/lambdaworks/redis/event/DefaultEventPublisherOptionsTest.java
+++ b/src/test/java/com/lambdaworks/redis/event/DefaultEventPublisherOptionsTest.java
@@ -32,7 +32,7 @@ public void testDisabled() throws Exception {
     @Test
     public void testBuilder() throws Exception {
 
-        DefaultEventPublisherOptions sut = new DefaultEventPublisherOptions.Builder().eventEmitInterval(1, TimeUnit.SECONDS)
+        DefaultEventPublisherOptions sut = DefaultEventPublisherOptions.builder().eventEmitInterval(1, TimeUnit.SECONDS)
                 .build();
 
         assertThat(sut.eventEmitInterval()).isEqualTo(1);

From 8a3656953636e33889d03557b72dc71182d0723c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 26 Jul 2016 00:49:29 +0200
Subject: [PATCH 006/808] Use Single and Completable types in RxJava reactive
 API #214

---
 .../redis/AbstractRedisReactiveCommands.java  | 1102 +++++++++--------
 .../redis/ReactiveCommandDispatcher.java      |  170 ++-
 .../api/rx/BaseRedisReactiveCommands.java     |   20 +-
 .../api/rx/RedisGeoReactiveCommands.java      |   12 +-
 .../api/rx/RedisHLLReactiveCommands.java      |    8 +-
 .../api/rx/RedisHashReactiveCommands.java     |   48 +-
 .../api/rx/RedisKeyReactiveCommands.java      |   76 +-
 .../api/rx/RedisListReactiveCommands.java     |   36 +-
 .../redis/api/rx/RedisReactiveCommands.java   |    5 +-
 .../rx/RedisScriptingReactiveCommands.java    |    8 +-
 .../api/rx/RedisServerReactiveCommands.java   |   70 +-
 .../api/rx/RedisSetReactiveCommands.java      |   48 +-
 .../rx/RedisSortedSetReactiveCommands.java    |  106 +-
 .../api/rx/RedisStringReactiveCommands.java   |   60 +-
 .../RedisTransactionalReactiveCommands.java   |   10 +-
 .../redis/cluster/ClusterScanSupport.java     |   36 +-
 ...isAdvancedClusterReactiveCommandsImpl.java |  160 +--
 .../RedisAdvancedClusterReactiveCommands.java |   48 +-
 .../api/rx/RedisClusterReactiveCommands.java  |   57 +-
 .../redis/protocol/CommandHandler.java        |    2 +-
 .../RedisPubSubReactiveCommandsImpl.java      |   26 +-
 .../api/rx/RedisPubSubReactiveCommands.java   |    9 +-
 .../RedisSentinelReactiveCommandsImpl.java    |   51 +-
 .../api/rx/RedisSentinelReactiveCommands.java |   18 +-
 .../CreateAsyncNodeSelectionClusterApi.java   |    1 -
 .../apigenerator/CreateReactiveApi.java       |   44 +-
 .../redis/LettucePerformanceTest.java         |   15 +-
 .../redis/ReactiveConnectionTest.java         |   50 +-
 .../cluster/AdvancedClusterReactiveTest.java  |   70 +-
 .../cluster/ClusterReactiveCommandTest.java   |   18 +-
 .../cluster/RedisRxClusterClientTest.java     |   29 +-
 .../commands/CustomClusterCommandTest.java    |    3 +-
 .../redis/commands/CustomCommandTest.java     |    2 +-
 .../commands/rx/RxSyncInvocationHandler.java  |   65 +-
 .../commands/rx/TransactionRxCommandTest.java |   23 +-
 .../redis/pubsub/PubSubRxTest.java            |   31 +-
 .../redis/reliability/AtMostOnceTest.java     |    4 +
 37 files changed, 1398 insertions(+), 1143 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
index 194c4d50f0..b637ec3d24 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
@@ -9,7 +9,9 @@
 
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.protocol.*;
+import rx.Completable;
 import rx.Observable;
+import rx.Single;
 import rx.Subscriber;
 
 import com.lambdaworks.redis.GeoArgs.Unit;
@@ -51,34 +53,34 @@ public AbstractRedisReactiveCommands(StatefulConnection<K, V> connection, RedisC
     }
 
     @Override
-    public Observable<Long> append(K key, V value) {
-        return createObservable(() -> commandBuilder.append(key, value));
+    public Single<Long> append(K key, V value) {
+        return createSingle(() -> commandBuilder.append(key, value));
     }
 
     @Override
-    public Observable<String> auth(String password) {
-        return createObservable(() -> commandBuilder.auth(password));
+    public Single<String> auth(String password) {
+        return createSingle(() -> commandBuilder.auth(password));
 
     }
 
     @Override
-    public Observable<String> bgrewriteaof() {
-        return createObservable(commandBuilder::bgrewriteaof);
+    public Single<String> bgrewriteaof() {
+        return createSingle(commandBuilder::bgrewriteaof);
     }
 
     @Override
-    public Observable<String> bgsave() {
-        return createObservable(commandBuilder::bgsave);
+    public Single<String> bgsave() {
+        return createSingle(commandBuilder::bgsave);
     }
 
     @Override
-    public Observable<Long> bitcount(K key) {
-        return createObservable(() -> commandBuilder.bitcount(key));
+    public Single<Long> bitcount(K key) {
+        return createSingle(() -> commandBuilder.bitcount(key));
     }
 
     @Override
-    public Observable<Long> bitcount(K key, long start, long end) {
-        return createObservable(() -> commandBuilder.bitcount(key, start, end));
+    public Single<Long> bitcount(K key, long start, long end) {
+        return createSingle(() -> commandBuilder.bitcount(key, start, end));
     }
 
     @Override
@@ -87,78 +89,78 @@ public Observable<Long> bitfield(K key, BitFieldArgs args) {
     }
 
     @Override
-    public Observable<Long> bitpos(K key, boolean state) {
-        return createObservable(() -> commandBuilder.bitpos(key, state));
+    public Single<Long> bitpos(K key, boolean state) {
+        return createSingle(() -> commandBuilder.bitpos(key, state));
     }
 
     @Override
-    public Observable<Long> bitpos(K key, boolean state, long start, long end) {
-        return createObservable(() -> commandBuilder.bitpos(key, state, start, end));
+    public Single<Long> bitpos(K key, boolean state, long start, long end) {
+        return createSingle(() -> commandBuilder.bitpos(key, state, start, end));
     }
 
     @Override
-    public Observable<Long> bitopAnd(K destination, K... keys) {
-        return createObservable(() -> commandBuilder.bitopAnd(destination, keys));
+    public Single<Long> bitopAnd(K destination, K... keys) {
+        return createSingle(() -> commandBuilder.bitopAnd(destination, keys));
     }
 
     @Override
-    public Observable<Long> bitopNot(K destination, K source) {
-        return createObservable(() -> commandBuilder.bitopNot(destination, source));
+    public Single<Long> bitopNot(K destination, K source) {
+        return createSingle(() -> commandBuilder.bitopNot(destination, source));
     }
 
     @Override
-    public Observable<Long> bitopOr(K destination, K... keys) {
-        return createObservable(() -> commandBuilder.bitopOr(destination, keys));
+    public Single<Long> bitopOr(K destination, K... keys) {
+        return createSingle(() -> commandBuilder.bitopOr(destination, keys));
     }
 
     @Override
-    public Observable<Long> bitopXor(K destination, K... keys) {
-        return createObservable(() -> commandBuilder.bitopXor(destination, keys));
+    public Single<Long> bitopXor(K destination, K... keys) {
+        return createSingle(() -> commandBuilder.bitopXor(destination, keys));
     }
 
     @Override
-    public Observable<KeyValue<K, V>> blpop(long timeout, K... keys) {
-        return createObservable(() -> commandBuilder.blpop(timeout, keys));
+    public Single<KeyValue<K, V>> blpop(long timeout, K... keys) {
+        return createSingle(() -> commandBuilder.blpop(timeout, keys));
     }
 
     @Override
-    public Observable<KeyValue<K, V>> brpop(long timeout, K... keys) {
-        return createObservable(() -> commandBuilder.brpop(timeout, keys));
+    public Single<KeyValue<K, V>> brpop(long timeout, K... keys) {
+        return createSingle(() -> commandBuilder.brpop(timeout, keys));
     }
 
     @Override
-    public Observable<V> brpoplpush(long timeout, K source, K destination) {
-        return createObservable(() -> commandBuilder.brpoplpush(timeout, source, destination));
+    public Single<V> brpoplpush(long timeout, K source, K destination) {
+        return createSingle(() -> commandBuilder.brpoplpush(timeout, source, destination));
     }
 
     @Override
-    public Observable<K> clientGetname() {
-        return createObservable(commandBuilder::clientGetname);
+    public Single<K> clientGetname() {
+        return createSingle(commandBuilder::clientGetname);
     }
 
     @Override
-    public Observable<String> clientSetname(K name) {
-        return createObservable(() -> commandBuilder.clientSetname(name));
+    public Single<String> clientSetname(K name) {
+        return createSingle(() -> commandBuilder.clientSetname(name));
     }
 
     @Override
-    public Observable<String> clientKill(String addr) {
-        return createObservable(() -> commandBuilder.clientKill(addr));
+    public Single<String> clientKill(String addr) {
+        return createSingle(() -> commandBuilder.clientKill(addr));
     }
 
     @Override
-    public Observable<Long> clientKill(KillArgs killArgs) {
-        return createObservable(() -> commandBuilder.clientKill(killArgs));
+    public Single<Long> clientKill(KillArgs killArgs) {
+        return createSingle(() -> commandBuilder.clientKill(killArgs));
     }
 
     @Override
-    public Observable<String> clientPause(long timeout) {
-        return createObservable(() -> commandBuilder.clientPause(timeout));
+    public Single<String> clientPause(long timeout) {
+        return createSingle(() -> commandBuilder.clientPause(timeout));
     }
 
     @Override
-    public Observable<String> clientList() {
-        return createObservable(commandBuilder::clientList);
+    public Single<String> clientList() {
+        return createSingle(commandBuilder::clientList);
     }
 
     @Override
@@ -182,8 +184,8 @@ public Observable<Object> commandInfo(CommandType... commands) {
     }
 
     @Override
-    public Observable<Long> commandCount() {
-        return createObservable(commandBuilder::commandCount);
+    public Single<Long> commandCount() {
+        return createSingle(commandBuilder::commandCount);
     }
 
     @Override
@@ -192,106 +194,106 @@ public Observable<String> configGet(String parameter) {
     }
 
     @Override
-    public Observable<String> configResetstat() {
-        return createObservable(commandBuilder::configResetstat);
+    public Single<String> configResetstat() {
+        return createSingle(commandBuilder::configResetstat);
     }
 
     @Override
-    public Observable<String> configSet(String parameter, String value) {
-        return createObservable(() -> commandBuilder.configSet(parameter, value));
+    public Single<String> configSet(String parameter, String value) {
+        return createSingle(() -> commandBuilder.configSet(parameter, value));
     }
 
     @Override
-    public Observable<String> configRewrite() {
-        return createObservable(commandBuilder::configRewrite);
+    public Single<String> configRewrite() {
+        return createSingle(commandBuilder::configRewrite);
     }
 
     @Override
-    public Observable<Long> dbsize() {
-        return createObservable(commandBuilder::dbsize);
+    public Single<Long> dbsize() {
+        return createSingle(commandBuilder::dbsize);
     }
 
     @Override
-    public Observable<String> debugCrashAndRecover(Long delay) {
-        return createObservable(() -> (commandBuilder.debugCrashAndRecover(delay)));
+    public Single<String> debugCrashAndRecover(Long delay) {
+        return createSingle(() -> (commandBuilder.debugCrashAndRecover(delay)));
     }
 
     @Override
-    public Observable<String> debugHtstats(int db) {
-        return createObservable(() -> commandBuilder.debugHtstats(db));
+    public Single<String> debugHtstats(int db) {
+        return createSingle(() -> commandBuilder.debugHtstats(db));
     }
 
     @Override
-    public Observable<String> debugObject(K key) {
-        return createObservable(() -> commandBuilder.debugObject(key));
+    public Single<String> debugObject(K key) {
+        return createSingle(() -> commandBuilder.debugObject(key));
     }
 
     @Override
-    public Observable<Success> debugOom() {
-        return Observable.just(Success.Success).doOnCompleted(commandBuilder::debugOom);
+    public Completable debugOom() {
+        return Completable.fromObservable(createObservable(commandBuilder::debugOom));
     }
 
     @Override
-    public Observable<String> debugReload() {
-        return createObservable(() -> (commandBuilder.debugReload()));
+    public Single<String> debugReload() {
+        return createSingle(() -> (commandBuilder.debugReload()));
     }
 
     @Override
-    public Observable<String> debugRestart(Long delay) {
-        return createObservable(() -> (commandBuilder.debugRestart(delay)));
+    public Single<String> debugRestart(Long delay) {
+        return createSingle(() -> (commandBuilder.debugRestart(delay)));
     }
 
     @Override
-    public Observable<String> debugSdslen(K key) {
-        return createObservable(() -> (commandBuilder.debugSdslen(key)));
+    public Single<String> debugSdslen(K key) {
+        return createSingle(() -> (commandBuilder.debugSdslen(key)));
     }
 
     @Override
-    public Observable<Success> debugSegfault() {
-        return Observable.just(Success.Success).doOnCompleted(commandBuilder::debugSegfault);
+    public Completable debugSegfault() {
+        return Completable.fromObservable(createObservable(commandBuilder::debugSegfault));
     }
 
     @Override
-    public Observable<Long> decr(K key) {
-        return createObservable(() -> commandBuilder.decr(key));
+    public Single<Long> decr(K key) {
+        return createSingle(() -> commandBuilder.decr(key));
     }
 
     @Override
-    public Observable<Long> decrby(K key, long amount) {
-        return createObservable(() -> commandBuilder.decrby(key, amount));
+    public Single<Long> decrby(K key, long amount) {
+        return createSingle(() -> commandBuilder.decrby(key, amount));
     }
 
     @Override
-    public Observable<Long> del(K... keys) {
-        return createObservable(() -> commandBuilder.del(keys));
+    public Single<Long> del(K... keys) {
+        return createSingle(() -> commandBuilder.del(keys));
     }
 
-    public Observable<Long> del(Iterable<K> keys) {
-        return createObservable(() -> commandBuilder.del(keys));
+    public Single<Long> del(Iterable<K> keys) {
+        return createSingle(() -> commandBuilder.del(keys));
     }
 
     @Override
-    public Observable<Long> unlink(K... keys) {
-        return createObservable(() -> commandBuilder.unlink(keys));
+    public Single<Long> unlink(K... keys) {
+        return createSingle(() -> commandBuilder.unlink(keys));
     }
 
-    public Observable<Long> unlink(Iterable<K> keys) {
-        return createObservable(() -> commandBuilder.unlink(keys));
+    public Single<Long> unlink(Iterable<K> keys) {
+        return createSingle(() -> commandBuilder.unlink(keys));
     }
 
     @Override
-    public Observable<String> discard() {
-        return createObservable(commandBuilder::discard);
+    public Single<String> discard() {
+        return createSingle(commandBuilder::discard);
     }
 
     @Override
-    public Observable<byte[]> dump(K key) {
-        return createObservable(() -> commandBuilder.dump(key));
+    public Single<byte[]> dump(K key) {
+        return createSingle(() -> commandBuilder.dump(key));
     }
 
     @Override
-    public Observable<V> echo(V msg) {
-        return createObservable(() -> commandBuilder.echo(msg));
+    public Single<V> echo(V msg) {
+        return createSingle(() -> commandBuilder.echo(msg));
     }
 
     @Override
@@ -318,31 +320,31 @@ public <T> Observable<T> evalsha(String digest, ScriptOutputType type, K[] keys,
         return (Observable<T>) createObservable(() -> commandBuilder.evalsha(digest, type, keys, values));
     }
 
-    public Observable<Boolean> exists(K key) {
-        return createObservable(() -> commandBuilder.exists(key));
+    public Single<Boolean> exists(K key) {
+        return createSingle(() -> commandBuilder.exists(key));
     }
 
     @Override
-    public Observable<Long> exists(K... keys) {
-        return createObservable(() -> commandBuilder.exists(keys));
+    public Single<Long> exists(K... keys) {
+        return createSingle(() -> commandBuilder.exists(keys));
     }
 
-    public Observable<Long> exists(Iterable<K> keys) {
-        return createObservable(() -> commandBuilder.exists(keys));
+    public Single<Long> exists(Iterable<K> keys) {
+        return createSingle(() -> commandBuilder.exists(keys));
     }
 
     @Override
-    public Observable<Boolean> expire(K key, long seconds) {
-        return createObservable(() -> commandBuilder.expire(key, seconds));
+    public Single<Boolean> expire(K key, long seconds) {
+        return createSingle(() -> commandBuilder.expire(key, seconds));
     }
 
     @Override
-    public Observable<Boolean> expireat(K key, long timestamp) {
-        return createObservable(() -> commandBuilder.expireat(key, timestamp));
+    public Single<Boolean> expireat(K key, long timestamp) {
+        return createSingle(() -> commandBuilder.expireat(key, timestamp));
     }
 
     @Override
-    public Observable<Boolean> expireat(K key, Date timestamp) {
+    public Single<Boolean> expireat(K key, Date timestamp) {
         return expireat(key, timestamp.getTime() / 1000);
     }
 
@@ -352,78 +354,78 @@ public Observable<Object> exec() {
     }
 
     @Override
-    public Observable<String> flushall() {
-        return createObservable(commandBuilder::flushall);
+    public Single<String> flushall() {
+        return createSingle(commandBuilder::flushall);
     }
 
     @Override
-    public Observable<String> flushallAsync() {
-        return createObservable(commandBuilder::flushallAsync);
+    public Single<String> flushallAsync() {
+        return createSingle(commandBuilder::flushallAsync);
     }
 
     @Override
-    public Observable<String> flushdb() {
-        return createObservable(commandBuilder::flushdb);
+    public Single<String> flushdb() {
+        return createSingle(commandBuilder::flushdb);
     }
 
     @Override
-    public Observable<String> flushdbAsync() {
-        return createObservable(commandBuilder::flushdbAsync);
+    public Single<String> flushdbAsync() {
+        return createSingle(commandBuilder::flushdbAsync);
     }
 
     @Override
-    public Observable<V> get(K key) {
-        return createObservable(() -> commandBuilder.get(key));
+    public Single<V> get(K key) {
+        return createSingle(() -> commandBuilder.get(key));
     }
 
     @Override
-    public Observable<Long> getbit(K key, long offset) {
-        return createObservable(() -> commandBuilder.getbit(key, offset));
+    public Single<Long> getbit(K key, long offset) {
+        return createSingle(() -> commandBuilder.getbit(key, offset));
     }
 
     @Override
-    public Observable<V> getrange(K key, long start, long end) {
-        return createObservable(() -> commandBuilder.getrange(key, start, end));
+    public Single<V> getrange(K key, long start, long end) {
+        return createSingle(() -> commandBuilder.getrange(key, start, end));
     }
 
     @Override
-    public Observable<V> getset(K key, V value) {
-        return createObservable(() -> commandBuilder.getset(key, value));
+    public Single<V> getset(K key, V value) {
+        return createSingle(() -> commandBuilder.getset(key, value));
     }
 
     @Override
-    public Observable<Long> hdel(K key, K... fields) {
-        return createObservable(() -> commandBuilder.hdel(key, fields));
+    public Single<Long> hdel(K key, K... fields) {
+        return createSingle(() -> commandBuilder.hdel(key, fields));
     }
 
     @Override
-    public Observable<Boolean> hexists(K key, K field) {
-        return createObservable(() -> commandBuilder.hexists(key, field));
+    public Single<Boolean> hexists(K key, K field) {
+        return createSingle(() -> commandBuilder.hexists(key, field));
     }
 
     @Override
-    public Observable<V> hget(K key, K field) {
-        return createObservable(() -> commandBuilder.hget(key, field));
+    public Single<V> hget(K key, K field) {
+        return createSingle(() -> commandBuilder.hget(key, field));
     }
 
     @Override
-    public Observable<Long> hincrby(K key, K field, long amount) {
-        return createObservable(() -> commandBuilder.hincrby(key, field, amount));
+    public Single<Long> hincrby(K key, K field, long amount) {
+        return createSingle(() -> commandBuilder.hincrby(key, field, amount));
     }
 
     @Override
-    public Observable<Double> hincrbyfloat(K key, K field, double amount) {
-        return createObservable(() -> commandBuilder.hincrbyfloat(key, field, amount));
+    public Single<Double> hincrbyfloat(K key, K field, double amount) {
+        return createSingle(() -> commandBuilder.hincrbyfloat(key, field, amount));
     }
 
     @Override
-    public Observable<Map<K, V>> hgetall(K key) {
-        return createObservable(() -> commandBuilder.hgetall(key));
+    public Single<Map<K, V>> hgetall(K key) {
+        return createSingle(() -> commandBuilder.hgetall(key));
     }
 
     @Override
-    public Observable<Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key) {
-        return createObservable(() -> commandBuilder.hgetall(channel, key));
+    public Single<Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key) {
+        return createSingle(() -> commandBuilder.hgetall(channel, key));
     }
 
     @Override
@@ -432,18 +434,18 @@ public Observable<K> hkeys(K key) {
     }
 
     @Override
-    public Observable<Long> hkeys(KeyStreamingChannel<K> channel, K key) {
-        return createObservable(() -> commandBuilder.hkeys(channel, key));
+    public Single<Long> hkeys(KeyStreamingChannel<K> channel, K key) {
+        return createSingle(() -> commandBuilder.hkeys(channel, key));
     }
 
     @Override
-    public Observable<Long> hlen(K key) {
-        return createObservable(() -> commandBuilder.hlen(key));
+    public Single<Long> hlen(K key) {
+        return createSingle(() -> commandBuilder.hlen(key));
     }
 
     @Override
-    public Observable<Long> hstrlen(K key, K field) {
-        return createObservable(() -> commandBuilder.hstrlen(key, field));
+    public Single<Long> hstrlen(K key, K field) {
+        return createSingle(() -> commandBuilder.hstrlen(key, field));
     }
 
     @Override
@@ -452,23 +454,23 @@ public Observable<V> hmget(K key, K... fields) {
     }
 
     @Override
-    public Observable<Long> hmget(ValueStreamingChannel<V> channel, K key, K... fields) {
-        return createObservable(() -> commandBuilder.hmget(channel, key, fields));
+    public Single<Long> hmget(ValueStreamingChannel<V> channel, K key, K... fields) {
+        return createSingle(() -> commandBuilder.hmget(channel, key, fields));
     }
 
     @Override
-    public Observable<String> hmset(K key, Map<K, V> map) {
-        return createObservable(() -> commandBuilder.hmset(key, map));
+    public Single<String> hmset(K key, Map<K, V> map) {
+        return createSingle(() -> commandBuilder.hmset(key, map));
     }
 
     @Override
-    public Observable<Boolean> hset(K key, K field, V value) {
-        return createObservable(() -> commandBuilder.hset(key, field, value));
+    public Single<Boolean> hset(K key, K field, V value) {
+        return createSingle(() -> commandBuilder.hset(key, field, value));
     }
 
     @Override
-    public Observable<Boolean> hsetnx(K key, K field, V value) {
-        return createObservable(() -> commandBuilder.hsetnx(key, field, value));
+    public Single<Boolean> hsetnx(K key, K field, V value) {
+        return createSingle(() -> commandBuilder.hsetnx(key, field, value));
     }
 
     @Override
@@ -477,33 +479,33 @@ public Observable<V> hvals(K key) {
     }
 
     @Override
-    public Observable<Long> hvals(ValueStreamingChannel<V> channel, K key) {
-        return createObservable(() -> commandBuilder.hvals(channel, key));
+    public Single<Long> hvals(ValueStreamingChannel<V> channel, K key) {
+        return createSingle(() -> commandBuilder.hvals(channel, key));
     }
 
     @Override
-    public Observable<Long> incr(K key) {
-        return createObservable(() -> commandBuilder.incr(key));
+    public Single<Long> incr(K key) {
+        return createSingle(() -> commandBuilder.incr(key));
     }
 
     @Override
-    public Observable<Long> incrby(K key, long amount) {
-        return createObservable(() -> commandBuilder.incrby(key, amount));
+    public Single<Long> incrby(K key, long amount) {
+        return createSingle(() -> commandBuilder.incrby(key, amount));
     }
 
     @Override
-    public Observable<Double> incrbyfloat(K key, double amount) {
-        return createObservable(() -> commandBuilder.incrbyfloat(key, amount));
+    public Single<Double> incrbyfloat(K key, double amount) {
+        return createSingle(() -> commandBuilder.incrbyfloat(key, amount));
     }
 
     @Override
-    public Observable<String> info() {
-        return createObservable(commandBuilder::info);
+    public Single<String> info() {
+        return createSingle(commandBuilder::info);
     }
 
     @Override
-    public Observable<String> info(String section) {
-        return createObservable(() -> commandBuilder.info(section));
+    public Single<String> info(String section) {
+        return createSingle(() -> commandBuilder.info(section));
     }
 
     @Override
@@ -512,43 +514,43 @@ public Observable<K> keys(K pattern) {
     }
 
     @Override
-    public Observable<Long> keys(KeyStreamingChannel<K> channel, K pattern) {
-        return createObservable(() -> commandBuilder.keys(channel, pattern));
+    public Single<Long> keys(KeyStreamingChannel<K> channel, K pattern) {
+        return createSingle(() -> commandBuilder.keys(channel, pattern));
     }
 
     @Override
-    public Observable<Date> lastsave() {
-        return createObservable(commandBuilder::lastsave);
+    public Single<Date> lastsave() {
+        return createSingle(commandBuilder::lastsave);
     }
 
     @Override
-    public Observable<V> lindex(K key, long index) {
-        return createObservable(() -> commandBuilder.lindex(key, index));
+    public Single<V> lindex(K key, long index) {
+        return createSingle(() -> commandBuilder.lindex(key, index));
     }
 
     @Override
-    public Observable<Long> linsert(K key, boolean before, V pivot, V value) {
-        return createObservable(() -> commandBuilder.linsert(key, before, pivot, value));
+    public Single<Long> linsert(K key, boolean before, V pivot, V value) {
+        return createSingle(() -> commandBuilder.linsert(key, before, pivot, value));
     }
 
     @Override
-    public Observable<Long> llen(K key) {
-        return createObservable(() -> commandBuilder.llen(key));
+    public Single<Long> llen(K key) {
+        return createSingle(() -> commandBuilder.llen(key));
     }
 
     @Override
-    public Observable<V> lpop(K key) {
-        return createObservable(() -> commandBuilder.lpop(key));
+    public Single<V> lpop(K key) {
+        return createSingle(() -> commandBuilder.lpop(key));
     }
 
     @Override
-    public Observable<Long> lpush(K key, V... values) {
-        return createObservable(() -> commandBuilder.lpush(key, values));
+    public Single<Long> lpush(K key, V... values) {
+        return createSingle(() -> commandBuilder.lpush(key, values));
     }
 
     @Override
-    public Observable<Long> lpushx(K key, V... values) {
-        return createObservable(() -> commandBuilder.lpushx(key, values));
+    public Single<Long> lpushx(K key, V... values) {
+        return createSingle(() -> commandBuilder.lpushx(key, values));
     }
 
     @Override
@@ -557,33 +559,33 @@ public Observable<V> lrange(K key, long start, long stop) {
     }
 
     @Override
-    public Observable<Long> lrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return createObservable(() -> commandBuilder.lrange(channel, key, start, stop));
+    public Single<Long> lrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return createSingle(() -> commandBuilder.lrange(channel, key, start, stop));
     }
 
     @Override
-    public Observable<Long> lrem(K key, long count, V value) {
-        return createObservable(() -> commandBuilder.lrem(key, count, value));
+    public Single<Long> lrem(K key, long count, V value) {
+        return createSingle(() -> commandBuilder.lrem(key, count, value));
     }
 
     @Override
-    public Observable<String> lset(K key, long index, V value) {
-        return createObservable(() -> commandBuilder.lset(key, index, value));
+    public Single<String> lset(K key, long index, V value) {
+        return createSingle(() -> commandBuilder.lset(key, index, value));
     }
 
     @Override
-    public Observable<String> ltrim(K key, long start, long stop) {
-        return createObservable(() -> commandBuilder.ltrim(key, start, stop));
+    public Single<String> ltrim(K key, long start, long stop) {
+        return createSingle(() -> commandBuilder.ltrim(key, start, stop));
     }
 
     @Override
-    public Observable<String> migrate(String host, int port, K key, int db, long timeout) {
-        return createObservable(() -> commandBuilder.migrate(host, port, key, db, timeout));
+    public Single<String> migrate(String host, int port, K key, int db, long timeout) {
+        return createSingle(() -> commandBuilder.migrate(host, port, key, db, timeout));
     }
 
     @Override
-    public Observable<String> migrate(String host, int port, int db, long timeout, MigrateArgs<K> migrateArgs) {
-        return createObservable(() -> commandBuilder.migrate(host, port, db, timeout, migrateArgs));
+    public Single<String> migrate(String host, int port, int db, long timeout, MigrateArgs<K> migrateArgs) {
+        return createSingle(() -> commandBuilder.migrate(host, port, db, timeout, migrateArgs));
     }
 
     @Override
@@ -596,92 +598,92 @@ public Observable<V> mget(Iterable<K> keys) {
     }
 
     @Override
-    public Observable<Long> mget(ValueStreamingChannel<V> channel, K... keys) {
-        return createObservable(() -> commandBuilder.mget(channel, keys));
+    public Single<Long> mget(ValueStreamingChannel<V> channel, K... keys) {
+        return createSingle(() -> commandBuilder.mget(channel, keys));
     }
 
-    public Observable<Long> mget(ValueStreamingChannel<V> channel, Iterable<K> keys) {
-        return createObservable(() -> commandBuilder.mget(channel, keys));
+    public Single<Long> mget(ValueStreamingChannel<V> channel, Iterable<K> keys) {
+        return createSingle(() -> commandBuilder.mget(channel, keys));
     }
 
     @Override
-    public Observable<Boolean> move(K key, int db) {
-        return createObservable(() -> commandBuilder.move(key, db));
+    public Single<Boolean> move(K key, int db) {
+        return createSingle(() -> commandBuilder.move(key, db));
     }
 
     @Override
-    public Observable<String> multi() {
-        return createObservable(commandBuilder::multi);
+    public Single<String> multi() {
+        return createSingle(commandBuilder::multi);
     }
 
     @Override
-    public Observable<String> mset(Map<K, V> map) {
-        return createObservable(() -> commandBuilder.mset(map));
+    public Single<String> mset(Map<K, V> map) {
+        return createSingle(() -> commandBuilder.mset(map));
     }
 
     @Override
-    public Observable<Boolean> msetnx(Map<K, V> map) {
-        return createObservable(() -> commandBuilder.msetnx(map));
+    public Single<Boolean> msetnx(Map<K, V> map) {
+        return createSingle(() -> commandBuilder.msetnx(map));
     }
 
     @Override
-    public Observable<String> objectEncoding(K key) {
-        return createObservable(() -> commandBuilder.objectEncoding(key));
+    public Single<String> objectEncoding(K key) {
+        return createSingle(() -> commandBuilder.objectEncoding(key));
     }
 
     @Override
-    public Observable<Long> objectIdletime(K key) {
-        return createObservable(() -> commandBuilder.objectIdletime(key));
+    public Single<Long> objectIdletime(K key) {
+        return createSingle(() -> commandBuilder.objectIdletime(key));
     }
 
     @Override
-    public Observable<Long> objectRefcount(K key) {
-        return createObservable(() -> commandBuilder.objectRefcount(key));
+    public Single<Long> objectRefcount(K key) {
+        return createSingle(() -> commandBuilder.objectRefcount(key));
     }
 
     @Override
-    public Observable<Boolean> persist(K key) {
-        return createObservable(() -> commandBuilder.persist(key));
+    public Single<Boolean> persist(K key) {
+        return createSingle(() -> commandBuilder.persist(key));
     }
 
     @Override
-    public Observable<Boolean> pexpire(K key, long milliseconds) {
-        return createObservable(() -> commandBuilder.pexpire(key, milliseconds));
+    public Single<Boolean> pexpire(K key, long milliseconds) {
+        return createSingle(() -> commandBuilder.pexpire(key, milliseconds));
     }
 
     @Override
-    public Observable<Boolean> pexpireat(K key, Date timestamp) {
+    public Single<Boolean> pexpireat(K key, Date timestamp) {
         return pexpireat(key, timestamp.getTime());
     }
 
     @Override
-    public Observable<Boolean> pexpireat(K key, long timestamp) {
-        return createObservable(() -> commandBuilder.pexpireat(key, timestamp));
+    public Single<Boolean> pexpireat(K key, long timestamp) {
+        return createSingle(() -> commandBuilder.pexpireat(key, timestamp));
     }
 
     @Override
-    public Observable<String> ping() {
-        return createObservable(commandBuilder::ping);
+    public Single<String> ping() {
+        return createSingle(commandBuilder::ping);
     }
 
     @Override
-    public Observable<String> readOnly() {
-        return createObservable(commandBuilder::readOnly);
+    public Single<String> readOnly() {
+        return createSingle(commandBuilder::readOnly);
     }
 
     @Override
-    public Observable<String> readWrite() {
-        return createObservable(commandBuilder::readWrite);
+    public Single<String> readWrite() {
+        return createSingle(commandBuilder::readWrite);
     }
 
     @Override
-    public Observable<Long> pttl(K key) {
-        return createObservable(() -> commandBuilder.pttl(key));
+    public Single<Long> pttl(K key) {
+        return createSingle(() -> commandBuilder.pttl(key));
     }
 
     @Override
-    public Observable<Long> publish(K channel, V message) {
-        return createObservable(() -> commandBuilder.publish(channel, message));
+    public Single<Long> publish(K channel, V message) {
+        return createSingle(() -> commandBuilder.publish(channel, message));
     }
 
     @Override
@@ -695,18 +697,18 @@ public Observable<K> pubsubChannels(K channel) {
     }
 
     @Override
-    public Observable<Map<K, Long>> pubsubNumsub(K... channels) {
-        return createObservable(() -> commandBuilder.pubsubNumsub(channels));
+    public Single<Map<K, Long>> pubsubNumsub(K... channels) {
+        return createSingle(() -> commandBuilder.pubsubNumsub(channels));
     }
 
     @Override
-    public Observable<Long> pubsubNumpat() {
-        return createObservable(commandBuilder::pubsubNumpat);
+    public Single<Long> pubsubNumpat() {
+        return createSingle(commandBuilder::pubsubNumpat);
     }
 
     @Override
-    public Observable<String> quit() {
-        return createObservable(commandBuilder::quit);
+    public Single<String> quit() {
+        return createSingle(commandBuilder::quit);
     }
 
     @Override
@@ -715,58 +717,58 @@ public Observable<Object> role() {
     }
 
     @Override
-    public Observable<V> randomkey() {
-        return createObservable(commandBuilder::randomkey);
+    public Single<V> randomkey() {
+        return createSingle(commandBuilder::randomkey);
     }
 
     @Override
-    public Observable<String> rename(K key, K newKey) {
-        return createObservable(() -> commandBuilder.rename(key, newKey));
+    public Single<String> rename(K key, K newKey) {
+        return createSingle(() -> commandBuilder.rename(key, newKey));
     }
 
     @Override
-    public Observable<Boolean> renamenx(K key, K newKey) {
-        return createObservable(() -> commandBuilder.renamenx(key, newKey));
+    public Single<Boolean> renamenx(K key, K newKey) {
+        return createSingle(() -> commandBuilder.renamenx(key, newKey));
     }
 
     @Override
-    public Observable<String> restore(K key, long ttl, byte[] value) {
-        return createObservable(() -> commandBuilder.restore(key, ttl, value));
+    public Single<String> restore(K key, long ttl, byte[] value) {
+        return createSingle(() -> commandBuilder.restore(key, ttl, value));
     }
 
     @Override
-    public Observable<V> rpop(K key) {
-        return createObservable(() -> commandBuilder.rpop(key));
+    public Single<V> rpop(K key) {
+        return createSingle(() -> commandBuilder.rpop(key));
     }
 
     @Override
-    public Observable<V> rpoplpush(K source, K destination) {
-        return createObservable(() -> commandBuilder.rpoplpush(source, destination));
+    public Single<V> rpoplpush(K source, K destination) {
+        return createSingle(() -> commandBuilder.rpoplpush(source, destination));
     }
 
     @Override
-    public Observable<Long> rpush(K key, V... values) {
-        return createObservable(() -> commandBuilder.rpush(key, values));
+    public Single<Long> rpush(K key, V... values) {
+        return createSingle(() -> commandBuilder.rpush(key, values));
     }
 
     @Override
-    public Observable<Long> rpushx(K key, V... values) {
-        return createObservable(() -> commandBuilder.rpushx(key, values));
+    public Single<Long> rpushx(K key, V... values) {
+        return createSingle(() -> commandBuilder.rpushx(key, values));
     }
 
     @Override
-    public Observable<Long> sadd(K key, V... members) {
-        return createObservable(() -> commandBuilder.sadd(key, members));
+    public Single<Long> sadd(K key, V... members) {
+        return createSingle(() -> commandBuilder.sadd(key, members));
     }
 
     @Override
-    public Observable<String> save() {
-        return createObservable(commandBuilder::save);
+    public Single<String> save() {
+        return createSingle(commandBuilder::save);
     }
 
     @Override
-    public Observable<Long> scard(K key) {
-        return createObservable(() -> commandBuilder.scard(key));
+    public Single<Long> scard(K key) {
+        return createSingle(() -> commandBuilder.scard(key));
     }
 
     @Override
@@ -775,18 +777,18 @@ public Observable<Boolean> scriptExists(String... digests) {
     }
 
     @Override
-    public Observable<String> scriptFlush() {
-        return createObservable(commandBuilder::scriptFlush);
+    public Single<String> scriptFlush() {
+        return createSingle(commandBuilder::scriptFlush);
     }
 
     @Override
-    public Observable<String> scriptKill() {
-        return createObservable(commandBuilder::scriptKill);
+    public Single<String> scriptKill() {
+        return createSingle(commandBuilder::scriptKill);
     }
 
     @Override
-    public Observable<String> scriptLoad(V script) {
-        return createObservable(() -> commandBuilder.scriptLoad(script));
+    public Single<String> scriptLoad(V script) {
+        return createSingle(() -> commandBuilder.scriptLoad(script));
     }
 
     @Override
@@ -795,57 +797,57 @@ public Observable<V> sdiff(K... keys) {
     }
 
     @Override
-    public Observable<Long> sdiff(ValueStreamingChannel<V> channel, K... keys) {
-        return createObservable(() -> commandBuilder.sdiff(channel, keys));
+    public Single<Long> sdiff(ValueStreamingChannel<V> channel, K... keys) {
+        return createSingle(() -> commandBuilder.sdiff(channel, keys));
     }
 
     @Override
-    public Observable<Long> sdiffstore(K destination, K... keys) {
-        return createObservable(() -> commandBuilder.sdiffstore(destination, keys));
+    public Single<Long> sdiffstore(K destination, K... keys) {
+        return createSingle(() -> commandBuilder.sdiffstore(destination, keys));
     }
 
-    public Observable<String> select(int db) {
-        return createObservable(() -> commandBuilder.select(db));
+    public Single<String> select(int db) {
+        return createSingle(() -> commandBuilder.select(db));
     }
 
     @Override
-    public Observable<String> set(K key, V value) {
-        return createObservable(() -> commandBuilder.set(key, value));
+    public Single<String> set(K key, V value) {
+        return createSingle(() -> commandBuilder.set(key, value));
     }
 
     @Override
-    public Observable<String> set(K key, V value, SetArgs setArgs) {
-        return createObservable(() -> commandBuilder.set(key, value, setArgs));
+    public Single<String> set(K key, V value, SetArgs setArgs) {
+        return createSingle(() -> commandBuilder.set(key, value, setArgs));
     }
 
     @Override
-    public Observable<Long> setbit(K key, long offset, int value) {
-        return createObservable(() -> commandBuilder.setbit(key, offset, value));
+    public Single<Long> setbit(K key, long offset, int value) {
+        return createSingle(() -> commandBuilder.setbit(key, offset, value));
     }
 
     @Override
-    public Observable<String> setex(K key, long seconds, V value) {
-        return createObservable(() -> commandBuilder.setex(key, seconds, value));
+    public Single<String> setex(K key, long seconds, V value) {
+        return createSingle(() -> commandBuilder.setex(key, seconds, value));
     }
 
     @Override
-    public Observable<String> psetex(K key, long milliseconds, V value) {
-        return createObservable(() -> commandBuilder.psetex(key, milliseconds, value));
+    public Single<String> psetex(K key, long milliseconds, V value) {
+        return createSingle(() -> commandBuilder.psetex(key, milliseconds, value));
     }
 
     @Override
-    public Observable<Boolean> setnx(K key, V value) {
-        return createObservable(() -> commandBuilder.setnx(key, value));
+    public Single<Boolean> setnx(K key, V value) {
+        return createSingle(() -> commandBuilder.setnx(key, value));
     }
 
     @Override
-    public Observable<Long> setrange(K key, long offset, V value) {
-        return createObservable(() -> commandBuilder.setrange(key, offset, value));
+    public Single<Long> setrange(K key, long offset, V value) {
+        return createSingle(() -> commandBuilder.setrange(key, offset, value));
     }
 
     @Override
-    public Observable<Success> shutdown(boolean save) {
-        return getSuccessObservable(createObservable(() -> commandBuilder.shutdown(save)));
+    public Completable shutdown(boolean save) {
+        return Completable.fromObservable(createObservable(() -> commandBuilder.shutdown(save)));
     }
 
     @Override
@@ -854,33 +856,33 @@ public Observable<V> sinter(K... keys) {
     }
 
     @Override
-    public Observable<Long> sinter(ValueStreamingChannel<V> channel, K... keys) {
-        return createObservable(() -> commandBuilder.sinter(channel, keys));
+    public Single<Long> sinter(ValueStreamingChannel<V> channel, K... keys) {
+        return createSingle(() -> commandBuilder.sinter(channel, keys));
     }
 
     @Override
-    public Observable<Long> sinterstore(K destination, K... keys) {
-        return createObservable(() -> commandBuilder.sinterstore(destination, keys));
+    public Single<Long> sinterstore(K destination, K... keys) {
+        return createSingle(() -> commandBuilder.sinterstore(destination, keys));
     }
 
     @Override
-    public Observable<Boolean> sismember(K key, V member) {
-        return createObservable(() -> commandBuilder.sismember(key, member));
+    public Single<Boolean> sismember(K key, V member) {
+        return createSingle(() -> commandBuilder.sismember(key, member));
     }
 
     @Override
-    public Observable<Boolean> smove(K source, K destination, V member) {
-        return createObservable(() -> commandBuilder.smove(source, destination, member));
+    public Single<Boolean> smove(K source, K destination, V member) {
+        return createSingle(() -> commandBuilder.smove(source, destination, member));
     }
 
     @Override
-    public Observable<String> slaveof(String host, int port) {
-        return createObservable(() -> commandBuilder.slaveof(host, port));
+    public Single<String> slaveof(String host, int port) {
+        return createSingle(() -> commandBuilder.slaveof(host, port));
     }
 
     @Override
-    public Observable<String> slaveofNoOne() {
-        return createObservable(() -> commandBuilder.slaveofNoOne());
+    public Single<String> slaveofNoOne() {
+        return createSingle(() -> commandBuilder.slaveofNoOne());
     }
 
     @Override
@@ -894,13 +896,13 @@ public Observable<Object> slowlogGet(int count) {
     }
 
     @Override
-    public Observable<Long> slowlogLen() {
-        return createObservable(() -> commandBuilder.slowlogLen());
+    public Single<Long> slowlogLen() {
+        return createSingle(() -> commandBuilder.slowlogLen());
     }
 
     @Override
-    public Observable<String> slowlogReset() {
-        return createObservable(() -> commandBuilder.slowlogReset());
+    public Single<String> slowlogReset() {
+        return createSingle(() -> commandBuilder.slowlogReset());
     }
 
     @Override
@@ -909,8 +911,8 @@ public Observable<V> smembers(K key) {
     }
 
     @Override
-    public Observable<Long> smembers(ValueStreamingChannel<V> channel, K key) {
-        return createObservable(() -> commandBuilder.smembers(channel, key));
+    public Single<Long> smembers(ValueStreamingChannel<V> channel, K key) {
+        return createSingle(() -> commandBuilder.smembers(channel, key));
     }
 
     @Override
@@ -919,8 +921,8 @@ public Observable<V> sort(K key) {
     }
 
     @Override
-    public Observable<Long> sort(ValueStreamingChannel<V> channel, K key) {
-        return createObservable(() -> commandBuilder.sort(channel, key));
+    public Single<Long> sort(ValueStreamingChannel<V> channel, K key) {
+        return createSingle(() -> commandBuilder.sort(channel, key));
     }
 
     @Override
@@ -929,18 +931,18 @@ public Observable<V> sort(K key, SortArgs sortArgs) {
     }
 
     @Override
-    public Observable<Long> sort(ValueStreamingChannel<V> channel, K key, SortArgs sortArgs) {
-        return createObservable(() -> commandBuilder.sort(channel, key, sortArgs));
+    public Single<Long> sort(ValueStreamingChannel<V> channel, K key, SortArgs sortArgs) {
+        return createSingle(() -> commandBuilder.sort(channel, key, sortArgs));
     }
 
     @Override
-    public Observable<Long> sortStore(K key, SortArgs sortArgs, K destination) {
-        return createObservable(() -> commandBuilder.sortStore(key, sortArgs, destination));
+    public Single<Long> sortStore(K key, SortArgs sortArgs, K destination) {
+        return createSingle(() -> commandBuilder.sortStore(key, sortArgs, destination));
     }
 
     @Override
-    public Observable<V> spop(K key) {
-        return createObservable(() -> commandBuilder.spop(key));
+    public Single<V> spop(K key) {
+        return createSingle(() -> commandBuilder.spop(key));
     }
 
     @Override
@@ -949,8 +951,8 @@ public Observable<V> spop(K key, long count) {
     }
 
     @Override
-    public Observable<V> srandmember(K key) {
-        return createObservable(() -> commandBuilder.srandmember(key));
+    public Single<V> srandmember(K key) {
+        return createSingle(() -> commandBuilder.srandmember(key));
     }
 
     @Override
@@ -959,13 +961,13 @@ public Observable<V> srandmember(K key, long count) {
     }
 
     @Override
-    public Observable<Long> srandmember(ValueStreamingChannel<V> channel, K key, long count) {
-        return createObservable(() -> commandBuilder.srandmember(channel, key, count));
+    public Single<Long> srandmember(ValueStreamingChannel<V> channel, K key, long count) {
+        return createSingle(() -> commandBuilder.srandmember(channel, key, count));
     }
 
     @Override
-    public Observable<Long> srem(K key, V... members) {
-        return createObservable(() -> commandBuilder.srem(key, members));
+    public Single<Long> srem(K key, V... members) {
+        return createSingle(() -> commandBuilder.srem(key, members));
     }
 
     @Override
@@ -974,112 +976,112 @@ public Observable<V> sunion(K... keys) {
     }
 
     @Override
-    public Observable<Long> sunion(ValueStreamingChannel<V> channel, K... keys) {
-        return createObservable(() -> commandBuilder.sunion(channel, keys));
+    public Single<Long> sunion(ValueStreamingChannel<V> channel, K... keys) {
+        return createSingle(() -> commandBuilder.sunion(channel, keys));
     }
 
     @Override
-    public Observable<Long> sunionstore(K destination, K... keys) {
-        return createObservable(() -> commandBuilder.sunionstore(destination, keys));
+    public Single<Long> sunionstore(K destination, K... keys) {
+        return createSingle(() -> commandBuilder.sunionstore(destination, keys));
     }
 
     @Override
-    public Observable<Long> strlen(K key) {
-        return createObservable(() -> commandBuilder.strlen(key));
+    public Single<Long> strlen(K key) {
+        return createSingle(() -> commandBuilder.strlen(key));
     }
 
     @Override
-    public Observable<Long> touch(K... keys) {
-        return createObservable(() -> commandBuilder.touch(keys));
+    public Single<Long> touch(K... keys) {
+        return createSingle(() -> commandBuilder.touch(keys));
     }
 
-    public Observable<Long> touch(Iterable<K> keys) {
-        return createObservable(() -> commandBuilder.touch(keys));
+    public Single<Long> touch(Iterable<K> keys) {
+        return createSingle(() -> commandBuilder.touch(keys));
     }
 
     @Override
-    public Observable<Long> ttl(K key) {
-        return createObservable(() -> commandBuilder.ttl(key));
+    public Single<Long> ttl(K key) {
+        return createSingle(() -> commandBuilder.ttl(key));
     }
 
     @Override
-    public Observable<String> type(K key) {
-        return createObservable(() -> commandBuilder.type(key));
+    public Single<String> type(K key) {
+        return createSingle(() -> commandBuilder.type(key));
     }
 
     @Override
-    public Observable<String> watch(K... keys) {
-        return createObservable(() -> commandBuilder.watch(keys));
+    public Single<String> watch(K... keys) {
+        return createSingle(() -> commandBuilder.watch(keys));
     }
 
     @Override
-    public Observable<String> unwatch() {
-        return createObservable(commandBuilder::unwatch);
+    public Single<String> unwatch() {
+        return createSingle(commandBuilder::unwatch);
     }
 
     @Override
-    public Observable<Long> zadd(K key, double score, V member) {
-        return createObservable(() -> commandBuilder.zadd(key, null, score, member));
+    public Single<Long> zadd(K key, double score, V member) {
+        return createSingle(() -> commandBuilder.zadd(key, null, score, member));
     }
 
     @Override
-    public Observable<Long> zadd(K key, Object... scoresAndValues) {
-        return createObservable(() -> commandBuilder.zadd(key, null, scoresAndValues));
+    public Single<Long> zadd(K key, Object... scoresAndValues) {
+        return createSingle(() -> commandBuilder.zadd(key, null, scoresAndValues));
     }
 
     @Override
-    public Observable<Long> zadd(K key, ScoredValue<V>... scoredValues) {
-        return createObservable(() -> commandBuilder.zadd(key, null, scoredValues));
+    public Single<Long> zadd(K key, ScoredValue<V>... scoredValues) {
+        return createSingle(() -> commandBuilder.zadd(key, null, scoredValues));
     }
 
     @Override
-    public Observable<Long> zadd(K key, ZAddArgs zAddArgs, double score, V member) {
-        return createObservable(() -> commandBuilder.zadd(key, zAddArgs, score, member));
+    public Single<Long> zadd(K key, ZAddArgs zAddArgs, double score, V member) {
+        return createSingle(() -> commandBuilder.zadd(key, zAddArgs, score, member));
     }
 
     @Override
-    public Observable<Long> zadd(K key, ZAddArgs zAddArgs, Object... scoresAndValues) {
-        return createObservable(() -> commandBuilder.zadd(key, zAddArgs, scoresAndValues));
+    public Single<Long> zadd(K key, ZAddArgs zAddArgs, Object... scoresAndValues) {
+        return createSingle(() -> commandBuilder.zadd(key, zAddArgs, scoresAndValues));
     }
 
     @Override
-    public Observable<Long> zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues) {
-        return createObservable(() -> commandBuilder.zadd(key, zAddArgs, scoredValues));
+    public Single<Long> zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues) {
+        return createSingle(() -> commandBuilder.zadd(key, zAddArgs, scoredValues));
     }
 
     @Override
-    public Observable<Double> zaddincr(K key, double score, V member) {
-        return createObservable(() -> commandBuilder.zaddincr(key, score, member));
+    public Single<Double> zaddincr(K key, double score, V member) {
+        return createSingle(() -> commandBuilder.zaddincr(key, score, member));
     }
 
     @Override
-    public Observable<Long> zcard(K key) {
-        return createObservable(() -> commandBuilder.zcard(key));
+    public Single<Long> zcard(K key) {
+        return createSingle(() -> commandBuilder.zcard(key));
     }
 
     @Override
-    public Observable<Long> zcount(K key, double min, double max) {
-        return createObservable(() -> commandBuilder.zcount(key, min, max));
+    public Single<Long> zcount(K key, double min, double max) {
+        return createSingle(() -> commandBuilder.zcount(key, min, max));
     }
 
     @Override
-    public Observable<Long> zcount(K key, String min, String max) {
-        return createObservable(() -> commandBuilder.zcount(key, min, max));
+    public Single<Long> zcount(K key, String min, String max) {
+        return createSingle(() -> commandBuilder.zcount(key, min, max));
     }
 
     @Override
-    public Observable<Double> zincrby(K key, double amount, K member) {
-        return createObservable(() -> commandBuilder.zincrby(key, amount, member));
+    public Single<Double> zincrby(K key, double amount, K member) {
+        return createSingle(() -> commandBuilder.zincrby(key, amount, member));
     }
 
     @Override
-    public Observable<Long> zinterstore(K destination, K... keys) {
-        return createObservable(() -> commandBuilder.zinterstore(destination, keys));
+    public Single<Long> zinterstore(K destination, K... keys) {
+        return createSingle(() -> commandBuilder.zinterstore(destination, keys));
     }
 
     @Override
-    public Observable<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys) {
-        return createObservable(() -> commandBuilder.zinterstore(destination, storeArgs, keys));
+    public Single<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys) {
+        return createSingle(() -> commandBuilder.zinterstore(destination, storeArgs, keys));
     }
 
     @Override
@@ -1133,82 +1135,82 @@ public Observable<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, Str
     }
 
     @Override
-    public Observable<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return createObservable(() -> commandBuilder.zrange(channel, key, start, stop));
+    public Single<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return createSingle(() -> commandBuilder.zrange(channel, key, start, stop));
     }
 
     @Override
-    public Observable<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return createObservable(() -> commandBuilder.zrangeWithScores(channel, key, start, stop));
+    public Single<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return createSingle(() -> commandBuilder.zrangeWithScores(channel, key, start, stop));
     }
 
     @Override
-    public Observable<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max) {
-        return createObservable(() -> commandBuilder.zrangebyscore(channel, key, min, max));
+    public Single<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max) {
+        return createSingle(() -> commandBuilder.zrangebyscore(channel, key, min, max));
     }
 
     @Override
-    public Observable<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max) {
-        return createObservable(() -> commandBuilder.zrangebyscore(channel, key, min, max));
+    public Single<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max) {
+        return createSingle(() -> commandBuilder.zrangebyscore(channel, key, min, max));
     }
 
     @Override
-    public Observable<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset,
+    public Single<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset,
             long count) {
-        return createObservable(() -> commandBuilder.zrangebyscore(channel, key, min, max, offset, count));
+        return createSingle(() -> commandBuilder.zrangebyscore(channel, key, min, max, offset, count));
     }
 
     @Override
-    public Observable<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset,
+    public Single<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset,
             long count) {
-        return createObservable(() -> commandBuilder.zrangebyscore(channel, key, min, max, offset, count));
+        return createSingle(() -> commandBuilder.zrangebyscore(channel, key, min, max, offset, count));
     }
 
     @Override
-    public Observable<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max) {
-        return createObservable(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max));
+    public Single<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max) {
+        return createSingle(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max));
     }
 
     @Override
-    public Observable<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max) {
-        return createObservable(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max));
+    public Single<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max) {
+        return createSingle(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max));
     }
 
     @Override
-    public Observable<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max,
+    public Single<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max,
             long offset, long count) {
-        return createObservable(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max, offset, count));
+        return createSingle(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max, offset, count));
     }
 
     @Override
-    public Observable<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max,
+    public Single<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max,
             long offset, long count) {
-        return createObservable(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max, offset, count));
+        return createSingle(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max, offset, count));
     }
 
     @Override
-    public Observable<Long> zrank(K key, V member) {
-        return createObservable(() -> commandBuilder.zrank(key, member));
+    public Single<Long> zrank(K key, V member) {
+        return createSingle(() -> commandBuilder.zrank(key, member));
     }
 
     @Override
-    public Observable<Long> zrem(K key, V... members) {
-        return createObservable(() -> commandBuilder.zrem(key, members));
+    public Single<Long> zrem(K key, V... members) {
+        return createSingle(() -> commandBuilder.zrem(key, members));
     }
 
     @Override
-    public Observable<Long> zremrangebyrank(K key, long start, long stop) {
-        return createObservable(() -> commandBuilder.zremrangebyrank(key, start, stop));
+    public Single<Long> zremrangebyrank(K key, long start, long stop) {
+        return createSingle(() -> commandBuilder.zremrangebyrank(key, start, stop));
     }
 
     @Override
-    public Observable<Long> zremrangebyscore(K key, double min, double max) {
-        return createObservable(() -> commandBuilder.zremrangebyscore(key, min, max));
+    public Single<Long> zremrangebyscore(K key, double min, double max) {
+        return createSingle(() -> commandBuilder.zremrangebyscore(key, min, max));
     }
 
     @Override
-    public Observable<Long> zremrangebyscore(K key, String min, String max) {
-        return createObservable(() -> commandBuilder.zremrangebyscore(key, min, max));
+    public Single<Long> zremrangebyscore(K key, String min, String max) {
+        return createSingle(() -> commandBuilder.zremrangebyscore(key, min, max));
     }
 
     @Override
@@ -1262,239 +1264,239 @@ public Observable<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max,
     }
 
     @Override
-    public Observable<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return createObservable(() -> commandBuilder.zrevrange(channel, key, start, stop));
+    public Single<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return createSingle(() -> commandBuilder.zrevrange(channel, key, start, stop));
     }
 
     @Override
-    public Observable<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return createObservable(() -> commandBuilder.zrevrangeWithScores(channel, key, start, stop));
+    public Single<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return createSingle(() -> commandBuilder.zrevrangeWithScores(channel, key, start, stop));
     }
 
     @Override
-    public Observable<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min) {
-        return createObservable(() -> commandBuilder.zrevrangebyscore(channel, key, max, min));
+    public Single<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min) {
+        return createSingle(() -> commandBuilder.zrevrangebyscore(channel, key, max, min));
     }
 
     @Override
-    public Observable<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min) {
-        return createObservable(() -> commandBuilder.zrevrangebyscore(channel, key, max, min));
+    public Single<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min) {
+        return createSingle(() -> commandBuilder.zrevrangebyscore(channel, key, max, min));
     }
 
     @Override
-    public Observable<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset,
+    public Single<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset,
             long count) {
-        return createObservable(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
+        return createSingle(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
     }
 
     @Override
-    public Observable<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset,
+    public Single<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset,
             long count) {
-        return createObservable(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
+        return createSingle(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
     }
 
     @Override
-    public Observable<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min) {
-        return createObservable(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min));
+    public Single<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min) {
+        return createSingle(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min));
     }
 
     @Override
-    public Observable<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min) {
-        return createObservable(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min));
+    public Single<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min) {
+        return createSingle(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min));
     }
 
     @Override
-    public Observable<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min,
+    public Single<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min,
             long offset, long count) {
-        return createObservable(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min, offset, count));
+        return createSingle(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min, offset, count));
     }
 
     @Override
-    public Observable<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min,
+    public Single<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min,
             long offset, long count) {
-        return createObservable(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min, offset, count));
+        return createSingle(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min, offset, count));
     }
 
     @Override
-    public Observable<Long> zrevrank(K key, V member) {
-        return createObservable(() -> commandBuilder.zrevrank(key, member));
+    public Single<Long> zrevrank(K key, V member) {
+        return createSingle(() -> commandBuilder.zrevrank(key, member));
     }
 
     @Override
-    public Observable<Double> zscore(K key, V member) {
-        return createObservable(() -> commandBuilder.zscore(key, member));
+    public Single<Double> zscore(K key, V member) {
+        return createSingle(() -> commandBuilder.zscore(key, member));
     }
 
     @Override
-    public Observable<Long> zunionstore(K destination, K... keys) {
-        return createObservable(() -> commandBuilder.zunionstore(destination, keys));
+    public Single<Long> zunionstore(K destination, K... keys) {
+        return createSingle(() -> commandBuilder.zunionstore(destination, keys));
     }
 
     @Override
-    public Observable<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
-        return createObservable(() -> commandBuilder.zunionstore(destination, storeArgs, keys));
+    public Single<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
+        return createSingle(() -> commandBuilder.zunionstore(destination, storeArgs, keys));
     }
 
     @Override
-    public Observable<KeyScanCursor<K>> scan() {
-        return createObservable(commandBuilder::scan);
+    public Single<KeyScanCursor<K>> scan() {
+        return createSingle(commandBuilder::scan);
     }
 
     @Override
-    public Observable<KeyScanCursor<K>> scan(ScanArgs scanArgs) {
-        return createObservable(() -> commandBuilder.scan(scanArgs));
+    public Single<KeyScanCursor<K>> scan(ScanArgs scanArgs) {
+        return createSingle(() -> commandBuilder.scan(scanArgs));
     }
 
     @Override
-    public Observable<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createObservable(() -> commandBuilder.scan(scanCursor, scanArgs));
+    public Single<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createSingle(() -> commandBuilder.scan(scanCursor, scanArgs));
     }
 
     @Override
-    public Observable<KeyScanCursor<K>> scan(ScanCursor scanCursor) {
-        return createObservable(() -> commandBuilder.scan(scanCursor));
+    public Single<KeyScanCursor<K>> scan(ScanCursor scanCursor) {
+        return createSingle(() -> commandBuilder.scan(scanCursor));
     }
 
     @Override
-    public Observable<StreamScanCursor> scan(KeyStreamingChannel<K> channel) {
-        return createObservable(() -> commandBuilder.scanStreaming(channel));
+    public Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel) {
+        return createSingle(() -> commandBuilder.scanStreaming(channel));
     }
 
     @Override
-    public Observable<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs) {
-        return createObservable(() -> commandBuilder.scanStreaming(channel, scanArgs));
+    public Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs) {
+        return createSingle(() -> commandBuilder.scanStreaming(channel, scanArgs));
     }
 
     @Override
-    public Observable<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createObservable(() -> commandBuilder.scanStreaming(channel, scanCursor, scanArgs));
+    public Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createSingle(() -> commandBuilder.scanStreaming(channel, scanCursor, scanArgs));
     }
 
     @Override
-    public Observable<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor) {
-        return createObservable(() -> commandBuilder.scanStreaming(channel, scanCursor));
+    public Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor) {
+        return createSingle(() -> commandBuilder.scanStreaming(channel, scanCursor));
     }
 
     @Override
-    public Observable<ValueScanCursor<V>> sscan(K key) {
-        return createObservable(() -> commandBuilder.sscan(key));
+    public Single<ValueScanCursor<V>> sscan(K key) {
+        return createSingle(() -> commandBuilder.sscan(key));
     }
 
     @Override
-    public Observable<ValueScanCursor<V>> sscan(K key, ScanArgs scanArgs) {
-        return createObservable(() -> commandBuilder.sscan(key, scanArgs));
+    public Single<ValueScanCursor<V>> sscan(K key, ScanArgs scanArgs) {
+        return createSingle(() -> commandBuilder.sscan(key, scanArgs));
     }
 
     @Override
-    public Observable<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createObservable(() -> commandBuilder.sscan(key, scanCursor, scanArgs));
+    public Single<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createSingle(() -> commandBuilder.sscan(key, scanCursor, scanArgs));
     }
 
     @Override
-    public Observable<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor) {
-        return createObservable(() -> commandBuilder.sscan(key, scanCursor));
+    public Single<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor) {
+        return createSingle(() -> commandBuilder.sscan(key, scanCursor));
     }
 
     @Override
-    public Observable<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key) {
-        return createObservable(() -> commandBuilder.sscanStreaming(channel, key));
+    public Single<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key) {
+        return createSingle(() -> commandBuilder.sscanStreaming(channel, key));
     }
 
     @Override
-    public Observable<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanArgs scanArgs) {
-        return createObservable(() -> commandBuilder.sscanStreaming(channel, key, scanArgs));
+    public Single<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanArgs scanArgs) {
+        return createSingle(() -> commandBuilder.sscanStreaming(channel, key, scanArgs));
     }
 
     @Override
-    public Observable<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createObservable(() -> commandBuilder.sscanStreaming(channel, key, scanCursor, scanArgs));
+    public Single<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createSingle(() -> commandBuilder.sscanStreaming(channel, key, scanCursor, scanArgs));
     }
 
     @Override
-    public Observable<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
-        return createObservable(() -> commandBuilder.sscanStreaming(channel, key, scanCursor));
+    public Single<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
+        return createSingle(() -> commandBuilder.sscanStreaming(channel, key, scanCursor));
     }
 
     @Override
-    public Observable<MapScanCursor<K, V>> hscan(K key) {
-        return createObservable(() -> commandBuilder.hscan(key));
+    public Single<MapScanCursor<K, V>> hscan(K key) {
+        return createSingle(() -> commandBuilder.hscan(key));
     }
 
     @Override
-    public Observable<MapScanCursor<K, V>> hscan(K key, ScanArgs scanArgs) {
-        return createObservable(() -> commandBuilder.hscan(key, scanArgs));
+    public Single<MapScanCursor<K, V>> hscan(K key, ScanArgs scanArgs) {
+        return createSingle(() -> commandBuilder.hscan(key, scanArgs));
     }
 
     @Override
-    public Observable<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createObservable(() -> commandBuilder.hscan(key, scanCursor, scanArgs));
+    public Single<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createSingle(() -> commandBuilder.hscan(key, scanCursor, scanArgs));
     }
 
     @Override
-    public Observable<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor) {
-        return createObservable(() -> commandBuilder.hscan(key, scanCursor));
+    public Single<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor) {
+        return createSingle(() -> commandBuilder.hscan(key, scanCursor));
     }
 
     @Override
-    public Observable<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key) {
-        return createObservable(() -> commandBuilder.hscanStreaming(channel, key));
+    public Single<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key) {
+        return createSingle(() -> commandBuilder.hscanStreaming(channel, key));
     }
 
     @Override
-    public Observable<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanArgs scanArgs) {
-        return createObservable(() -> commandBuilder.hscanStreaming(channel, key, scanArgs));
+    public Single<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanArgs scanArgs) {
+        return createSingle(() -> commandBuilder.hscanStreaming(channel, key, scanArgs));
     }
 
     @Override
-    public Observable<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor,
+    public Single<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor,
             ScanArgs scanArgs) {
-        return createObservable(() -> commandBuilder.hscanStreaming(channel, key, scanCursor, scanArgs));
+        return createSingle(() -> commandBuilder.hscanStreaming(channel, key, scanCursor, scanArgs));
     }
 
     @Override
-    public Observable<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor) {
-        return createObservable(() -> commandBuilder.hscanStreaming(channel, key, scanCursor));
+    public Single<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor) {
+        return createSingle(() -> commandBuilder.hscanStreaming(channel, key, scanCursor));
     }
 
     @Override
-    public Observable<ScoredValueScanCursor<V>> zscan(K key) {
-        return createObservable(() -> commandBuilder.zscan(key));
+    public Single<ScoredValueScanCursor<V>> zscan(K key) {
+        return createSingle(() -> commandBuilder.zscan(key));
     }
 
     @Override
-    public Observable<ScoredValueScanCursor<V>> zscan(K key, ScanArgs scanArgs) {
-        return createObservable(() -> commandBuilder.zscan(key, scanArgs));
+    public Single<ScoredValueScanCursor<V>> zscan(K key, ScanArgs scanArgs) {
+        return createSingle(() -> commandBuilder.zscan(key, scanArgs));
     }
 
     @Override
-    public Observable<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createObservable(() -> commandBuilder.zscan(key, scanCursor, scanArgs));
+    public Single<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createSingle(() -> commandBuilder.zscan(key, scanCursor, scanArgs));
     }
 
     @Override
-    public Observable<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor) {
-        return createObservable(() -> commandBuilder.zscan(key, scanCursor));
+    public Single<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor) {
+        return createSingle(() -> commandBuilder.zscan(key, scanCursor));
     }
 
     @Override
-    public Observable<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key) {
-        return createObservable(() -> commandBuilder.zscanStreaming(channel, key));
+    public Single<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key) {
+        return createSingle(() -> commandBuilder.zscanStreaming(channel, key));
     }
 
     @Override
-    public Observable<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanArgs scanArgs) {
-        return createObservable(() -> commandBuilder.zscanStreaming(channel, key, scanArgs));
+    public Single<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanArgs scanArgs) {
+        return createSingle(() -> commandBuilder.zscanStreaming(channel, key, scanArgs));
     }
 
     @Override
-    public Observable<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor,
+    public Single<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor,
             ScanArgs scanArgs) {
-        return createObservable(() -> commandBuilder.zscanStreaming(channel, key, scanCursor, scanArgs));
+        return createSingle(() -> commandBuilder.zscanStreaming(channel, key, scanCursor, scanArgs));
     }
 
     @Override
-    public Observable<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
-        return createObservable(() -> commandBuilder.zscanStreaming(channel, key, scanCursor));
+    public Single<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
+        return createSingle(() -> commandBuilder.zscanStreaming(channel, key, scanCursor));
     }
 
     @Override
@@ -1508,75 +1510,75 @@ public Observable<V> time() {
     }
 
     @Override
-    public Observable<Long> waitForReplication(int replicas, long timeout) {
-        return createObservable(() -> commandBuilder.wait(replicas, timeout));
+    public Single<Long> waitForReplication(int replicas, long timeout) {
+        return createSingle(() -> commandBuilder.wait(replicas, timeout));
     }
 
     @Override
-    public Observable<Long> pfadd(K key, V... values) {
-        return createObservable(() -> commandBuilder.pfadd(key, values));
+    public Single<Long> pfadd(K key, V... values) {
+        return createSingle(() -> commandBuilder.pfadd(key, values));
     }
 
-    public Observable<Long> pfadd(K key, V value, V... values) {
-        return createObservable(() -> commandBuilder.pfadd(key, value, values));
+    public Single<Long> pfadd(K key, V value, V... values) {
+        return createSingle(() -> commandBuilder.pfadd(key, value, values));
     }
 
     @Override
-    public Observable<String> pfmerge(K destkey, K... sourcekeys) {
-        return createObservable(() -> commandBuilder.pfmerge(destkey, sourcekeys));
+    public Single<String> pfmerge(K destkey, K... sourcekeys) {
+        return createSingle(() -> commandBuilder.pfmerge(destkey, sourcekeys));
     }
 
-    public Observable<String> pfmerge(K destkey, K sourceKey, K... sourcekeys) {
-        return createObservable(() -> commandBuilder.pfmerge(destkey, sourceKey, sourcekeys));
+    public Single<String> pfmerge(K destkey, K sourceKey, K... sourcekeys) {
+        return createSingle(() -> commandBuilder.pfmerge(destkey, sourceKey, sourcekeys));
     }
 
     @Override
-    public Observable<Long> pfcount(K... keys) {
-        return createObservable(() -> commandBuilder.pfcount(keys));
+    public Single<Long> pfcount(K... keys) {
+        return createSingle(() -> commandBuilder.pfcount(keys));
     }
 
-    public Observable<Long> pfcount(K key, K... keys) {
-        return createObservable(() -> commandBuilder.pfcount(key, keys));
+    public Single<Long> pfcount(K key, K... keys) {
+        return createSingle(() -> commandBuilder.pfcount(key, keys));
     }
 
     @Override
-    public Observable<String> clusterBumpepoch() {
-        return createObservable(() -> commandBuilder.clusterBumpepoch());
+    public Single<String> clusterBumpepoch() {
+        return createSingle(() -> commandBuilder.clusterBumpepoch());
     }
 
     @Override
-    public Observable<String> clusterMeet(String ip, int port) {
-        return createObservable(() -> commandBuilder.clusterMeet(ip, port));
+    public Single<String> clusterMeet(String ip, int port) {
+        return createSingle(() -> commandBuilder.clusterMeet(ip, port));
     }
 
     @Override
-    public Observable<String> clusterForget(String nodeId) {
-        return createObservable(() -> commandBuilder.clusterForget(nodeId));
+    public Single<String> clusterForget(String nodeId) {
+        return createSingle(() -> commandBuilder.clusterForget(nodeId));
     }
 
     @Override
-    public Observable<String> clusterAddSlots(int... slots) {
-        return createObservable(() -> commandBuilder.clusterAddslots(slots));
+    public Single<String> clusterAddSlots(int... slots) {
+        return createSingle(() -> commandBuilder.clusterAddslots(slots));
     }
 
     @Override
-    public Observable<String> clusterDelSlots(int... slots) {
-        return createObservable(() -> commandBuilder.clusterDelslots(slots));
+    public Single<String> clusterDelSlots(int... slots) {
+        return createSingle(() -> commandBuilder.clusterDelslots(slots));
     }
 
     @Override
-    public Observable<String> clusterInfo() {
-        return createObservable(commandBuilder::clusterInfo);
+    public Single<String> clusterInfo() {
+        return createSingle(commandBuilder::clusterInfo);
     }
 
     @Override
-    public Observable<String> clusterMyId() {
-        return createObservable(commandBuilder::clusterMyId);
+    public Single<String> clusterMyId() {
+        return createSingle(commandBuilder::clusterMyId);
     }
 
     @Override
-    public Observable<String> clusterNodes() {
-        return createObservable(commandBuilder::clusterNodes);
+    public Single<String> clusterNodes() {
+        return createSingle(commandBuilder::clusterNodes);
     }
 
     @Override
@@ -1585,28 +1587,28 @@ public Observable<K> clusterGetKeysInSlot(int slot, int count) {
     }
 
     @Override
-    public Observable<Long> clusterCountKeysInSlot(int slot) {
-        return createObservable(() -> commandBuilder.clusterCountKeysInSlot(slot));
+    public Single<Long> clusterCountKeysInSlot(int slot) {
+        return createSingle(() -> commandBuilder.clusterCountKeysInSlot(slot));
     }
 
     @Override
-    public Observable<Long> clusterCountFailureReports(String nodeId) {
-        return createObservable(() -> commandBuilder.clusterCountFailureReports(nodeId));
+    public Single<Long> clusterCountFailureReports(String nodeId) {
+        return createSingle(() -> commandBuilder.clusterCountFailureReports(nodeId));
     }
 
     @Override
-    public Observable<Long> clusterKeyslot(K key) {
-        return createObservable(() -> commandBuilder.clusterKeyslot(key));
+    public Single<Long> clusterKeyslot(K key) {
+        return createSingle(() -> commandBuilder.clusterKeyslot(key));
     }
 
     @Override
-    public Observable<String> clusterSaveconfig() {
-        return createObservable(() -> commandBuilder.clusterSaveconfig());
+    public Single<String> clusterSaveconfig() {
+        return createSingle(() -> commandBuilder.clusterSaveconfig());
     }
 
     @Override
-    public Observable<String> clusterSetConfigEpoch(long configEpoch) {
-        return createObservable(() -> commandBuilder.clusterSetConfigEpoch(configEpoch));
+    public Single<String> clusterSetConfigEpoch(long configEpoch) {
+        return createSingle(() -> commandBuilder.clusterSetConfigEpoch(configEpoch));
     }
 
     @Override
@@ -1615,48 +1617,48 @@ public Observable<Object> clusterSlots() {
     }
 
     @Override
-    public Observable<String> clusterSetSlotNode(int slot, String nodeId) {
-        return createObservable(() -> commandBuilder.clusterSetSlotNode(slot, nodeId));
+    public Single<String> clusterSetSlotNode(int slot, String nodeId) {
+        return createSingle(() -> commandBuilder.clusterSetSlotNode(slot, nodeId));
     }
 
     @Override
-    public Observable<String> clusterSetSlotStable(int slot) {
-        return createObservable(() -> commandBuilder.clusterSetSlotStable(slot));
+    public Single<String> clusterSetSlotStable(int slot) {
+        return createSingle(() -> commandBuilder.clusterSetSlotStable(slot));
     }
 
     @Override
-    public Observable<String> clusterSetSlotMigrating(int slot, String nodeId) {
-        return createObservable(() -> commandBuilder.clusterSetSlotMigrating(slot, nodeId));
+    public Single<String> clusterSetSlotMigrating(int slot, String nodeId) {
+        return createSingle(() -> commandBuilder.clusterSetSlotMigrating(slot, nodeId));
     }
 
     @Override
-    public Observable<String> clusterSetSlotImporting(int slot, String nodeId) {
-        return createObservable(() -> commandBuilder.clusterSetSlotImporting(slot, nodeId));
+    public Single<String> clusterSetSlotImporting(int slot, String nodeId) {
+        return createSingle(() -> commandBuilder.clusterSetSlotImporting(slot, nodeId));
     }
 
     @Override
-    public Observable<String> clusterFailover(boolean force) {
-        return createObservable(() -> commandBuilder.clusterFailover(force));
+    public Single<String> clusterFailover(boolean force) {
+        return createSingle(() -> commandBuilder.clusterFailover(force));
     }
 
     @Override
-    public Observable<String> clusterReset(boolean hard) {
-        return createObservable(() -> commandBuilder.clusterReset(hard));
+    public Single<String> clusterReset(boolean hard) {
+        return createSingle(() -> commandBuilder.clusterReset(hard));
     }
 
     @Override
-    public Observable<String> asking() {
-        return createObservable(commandBuilder::asking);
+    public Single<String> asking() {
+        return createSingle(commandBuilder::asking);
     }
 
     @Override
-    public Observable<String> clusterReplicate(String nodeId) {
-        return createObservable(() -> commandBuilder.clusterReplicate(nodeId));
+    public Single<String> clusterReplicate(String nodeId) {
+        return createSingle(() -> commandBuilder.clusterReplicate(nodeId));
     }
 
     @Override
-    public Observable<String> clusterFlushslots() {
-        return createObservable(commandBuilder::clusterFlushslots);
+    public Single<String> clusterFlushslots() {
+        return createSingle(commandBuilder::clusterFlushslots);
     }
 
     @Override
@@ -1665,13 +1667,13 @@ public Observable<String> clusterSlaves(String nodeId) {
     }
 
     @Override
-    public Observable<Long> zlexcount(K key, String min, String max) {
-        return createObservable(() -> commandBuilder.zlexcount(key, min, max));
+    public Single<Long> zlexcount(K key, String min, String max) {
+        return createSingle(() -> commandBuilder.zlexcount(key, min, max));
     }
 
     @Override
-    public Observable<Long> zremrangebylex(K key, String min, String max) {
-        return createObservable(() -> commandBuilder.zremrangebylex(key, min, max));
+    public Single<Long> zremrangebylex(K key, String min, String max) {
+        return createSingle(() -> commandBuilder.zremrangebylex(key, min, max));
     }
 
     @Override
@@ -1685,13 +1687,13 @@ public Observable<V> zrangebylex(K key, String min, String max, long offset, lon
     }
 
     @Override
-    public Observable<Long> geoadd(K key, double longitude, double latitude, V member) {
-        return createObservable(() -> commandBuilder.geoadd(key, longitude, latitude, member));
+    public Single<Long> geoadd(K key, double longitude, double latitude, V member) {
+        return createSingle(() -> commandBuilder.geoadd(key, longitude, latitude, member));
     }
 
     @Override
-    public Observable<Long> geoadd(K key, Object... lngLatMember) {
-        return createDissolvingObservable(() -> commandBuilder.geoadd(key, lngLatMember));
+    public Single<Long> geoadd(K key, Object... lngLatMember) {
+        return createSingle(() -> commandBuilder.geoadd(key, lngLatMember));
     }
 
     @Override
@@ -1712,9 +1714,9 @@ public Observable<GeoWithin<V>> georadius(K key, double longitude, double latitu
     }
 
     @Override
-    public Observable<Long> georadius(K key, double longitude, double latitude, double distance, Unit unit,
+    public Single<Long> georadius(K key, double longitude, double latitude, double distance, Unit unit,
             GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
-        return createDissolvingObservable(
+        return createSingle(
                 () -> commandBuilder.georadius(key, longitude, latitude, distance, unit.name(), geoRadiusStoreArgs));
     }
 
@@ -1729,9 +1731,9 @@ public Observable<GeoWithin<V>> georadiusbymember(K key, V member, double distan
     }
 
     @Override
-    public Observable<Long> georadiusbymember(K key, V member, double distance, Unit unit,
+    public Single<Long> georadiusbymember(K key, V member, double distance, Unit unit,
             GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
-        return createDissolvingObservable(
+        return createSingle(
                 () -> commandBuilder.georadiusbymember(key, member, distance, unit.name(), geoRadiusStoreArgs));
     }
 
@@ -1741,8 +1743,8 @@ public Observable<GeoCoordinates> geopos(K key, V... members) {
     }
 
     @Override
-    public Observable<Double> geodist(K key, V from, V to, GeoArgs.Unit unit) {
-        return createDissolvingObservable(() -> commandBuilder.geodist(key, from, to, unit));
+    public Single<Double> geodist(K key, V from, V to, GeoArgs.Unit unit) {
+        return createSingle(() -> commandBuilder.geodist(key, from, to, unit));
     }
 
     public <T> Observable<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output) {
@@ -1767,18 +1769,26 @@ protected <T> Observable<T> createObservable(CommandType type, CommandOutput<K,
     }
 
     public <T> Observable<T> createObservable(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return Observable.create(new ReactiveCommandDispatcher<K, V, T>(commandSupplier, connection, false));
+        return Observable.create(new ReactiveCommandDispatcher<K, V, T>(commandSupplier, connection, false).getObservableSubscriber());
     }
 
+    protected <T> Single<T> createSingle(CommandType type, CommandOutput<K, V, T> output, CommandArgs<K, V> args) {
+        return createSingle(() -> new Command<>(type, output, args));
+    }
+
+    public <T> Single<T> createSingle(Supplier<RedisCommand<K, V, T>> commandSupplier) {
+        return Single.create(new ReactiveCommandDispatcher<K, V, T>(commandSupplier, connection, false).getSingleSubscriber());
+    }
+    
     @SuppressWarnings("unchecked")
-    public <T, R> R createDissolvingObservable(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return (R) Observable.create(new ReactiveCommandDispatcher<>(commandSupplier, connection, true));
+    public <T, R> Observable<R> createDissolvingObservable(Supplier<RedisCommand<K, V, T>> commandSupplier) {
+        return (Observable<R>) Observable.create(new ReactiveCommandDispatcher<>(commandSupplier, connection, true).getObservableSubscriber());
     }
 
     @SuppressWarnings("unchecked")
     public <T, R> R createDissolvingObservable(CommandType type, CommandOutput<K, V, T> output, CommandArgs<K, V> args) {
         return (R) Observable.create(new ReactiveCommandDispatcher<K, V, T>(() -> new Command<>(type, output, args),
-                connection, true));
+                connection, true).getObservableSubscriber());
     }
 
     /**
diff --git a/src/main/java/com/lambdaworks/redis/ReactiveCommandDispatcher.java b/src/main/java/com/lambdaworks/redis/ReactiveCommandDispatcher.java
index dbacd78b53..985b3df83e 100644
--- a/src/main/java/com/lambdaworks/redis/ReactiveCommandDispatcher.java
+++ b/src/main/java/com/lambdaworks/redis/ReactiveCommandDispatcher.java
@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.concurrent.CancellationException;
 import java.util.function.Supplier;
 
 import com.lambdaworks.redis.api.StatefulConnection;
@@ -11,7 +12,10 @@
 import com.lambdaworks.redis.protocol.CommandWrapper;
 import com.lambdaworks.redis.protocol.RedisCommand;
 
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
 import rx.Observable;
+import rx.Single;
 import rx.Subscriber;
 
 /**
@@ -19,7 +23,9 @@
  *
  * @author Mark Paluch
  */
-public class ReactiveCommandDispatcher<K, V, T> implements Observable.OnSubscribe<T> {
+public class ReactiveCommandDispatcher<K, V, T> {
+
+    private final static InternalLogger LOG = InternalLoggerFactory.getInstance(ReactiveCommandDispatcher.class);
 
     private Supplier<? extends RedisCommand<K, V, T>> commandSupplier;
     private volatile RedisCommand<K, V, T> command;
@@ -53,32 +59,71 @@ public ReactiveCommandDispatcher(Supplier<RedisCommand<K, V, T>> commandSupplier
         this.connection = connection;
         this.dissolve = dissolve;
         this.command = commandSupplier.get();
+
     }
 
-    @Override
-    public void call(Subscriber<? super T> subscriber) {
+    public Single.OnSubscribe<T> getSingleSubscriber() {
+        return new SingleSubscriber();
+    }
 
-        // Reuse the first command but then discard it.
-        RedisCommand<K, V, T> command = this.command;
-        if (command == null) {
-            command = commandSupplier.get();
-        }
+    public Observable.OnSubscribe<T> getObservableSubscriber() {
+        return new ObservableSubscriber();
+    }
 
-        if (command.getOutput() instanceof StreamingOutput<?>) {
-            StreamingOutput<T> streamingOutput = (StreamingOutput<T>) command.getOutput();
+    private class ObservableSubscriber implements Observable.OnSubscribe<T> {
 
-            if (connection instanceof StatefulRedisConnection<?, ?> && ((StatefulRedisConnection) connection).isMulti()) {
-                streamingOutput.setSubscriber(new DelegatingWrapper<T>(
-                        Arrays.asList(new ObservableSubscriberWrapper<>(subscriber), streamingOutput.getSubscriber())));
-            } else {
-                streamingOutput.setSubscriber(new ObservableSubscriberWrapper<>(subscriber));
+        @Override
+        public void call(Subscriber<? super T> subscriber) {
+
+            // Reuse the first command but then discard it.
+            RedisCommand<K, V, T> command = ReactiveCommandDispatcher.this.command;
+            if (command == null) {
+                command = commandSupplier.get();
+            }
+
+            if (command.getOutput() instanceof StreamingOutput<?>) {
+                StreamingOutput<T> streamingOutput = (StreamingOutput<T>) command.getOutput();
+
+                if (connection instanceof StatefulRedisConnection<?, ?> && ((StatefulRedisConnection) connection).isMulti()) {
+                    streamingOutput.setSubscriber(new DelegatingWrapper<T>(
+                            Arrays.asList(new ObservableSubscriberWrapper<>(subscriber), streamingOutput.getSubscriber())));
+                } else {
+                    streamingOutput.setSubscriber(new ObservableSubscriberWrapper<>(subscriber));
+                }
             }
+
+            connection.dispatch(new ObservableCommand<>(command, subscriber, dissolve));
+
+            ReactiveCommandDispatcher.this.command = null;
         }
+    }
+
+    private class SingleSubscriber implements Single.OnSubscribe<T> {
+
+        @Override
+        public void call(rx.SingleSubscriber<? super T> subscriber) {
+
+            // Reuse the first command but then discard it.
+            RedisCommand<K, V, T> command = ReactiveCommandDispatcher.this.command;
+            if (command == null) {
+                command = commandSupplier.get();
+            }
 
-        connection.dispatch(new ObservableCommand<>(command, subscriber, dissolve));
+            if (command.getOutput() instanceof StreamingOutput<?>) {
+                StreamingOutput<T> streamingOutput = (StreamingOutput<T>) command.getOutput();
+
+                if (connection instanceof StatefulRedisConnection<?, ?> && ((StatefulRedisConnection) connection).isMulti()) {
+                    streamingOutput.setSubscriber(new DelegatingWrapper<T>(
+                            Arrays.asList(new SingleSubscriberWrapper<T>(subscriber), streamingOutput.getSubscriber())));
+                } else {
+                    streamingOutput.setSubscriber(new SingleSubscriberWrapper<T>(subscriber));
+                }
+            }
 
-        this.command = null;
+            connection.dispatch(new SingleCommand<>(command, subscriber));
 
+            ReactiveCommandDispatcher.this.command = null;
+        }
     }
 
     private static class ObservableCommand<K, V, T> extends CommandWrapper<K, V, T> {
@@ -105,6 +150,7 @@ public void complete() {
 
                 if (getOutput() != null) {
                     Object result = getOutput().get();
+
                     if (!(getOutput() instanceof StreamingOutput<?>) && result != null) {
 
                         if (dissolve && result instanceof Collection) {
@@ -118,7 +164,7 @@ public void complete() {
                     }
 
                     if (getOutput().hasError()) {
-                        subscriber.onError(new RedisCommandExecutionException(getOutput().getError()));
+                        onError(new RedisCommandExecutionException(getOutput().getError()));
                         completed = true;
                         return;
                     }
@@ -142,21 +188,91 @@ public void cancel() {
             }
 
             super.cancel();
-            subscriber.onCompleted();
+
+            onError(new CancellationException());
             completed = true;
         }
 
         @Override
         public boolean completeExceptionally(Throwable throwable) {
+
             if (completed || subscriber.isUnsubscribed()) {
                 return false;
             }
 
             boolean b = super.completeExceptionally(throwable);
+            onError(throwable);
+            completed = true;
+            return b;
+        }
+
+        private void onError(Throwable throwable) {
             subscriber.onError(throwable);
+        }
+    }
+
+    private static class SingleCommand<K, V, T> extends CommandWrapper<K, V, T> {
+
+        private final rx.SingleSubscriber<? super T> subscriber;
+        private boolean completed = false;
+
+        public SingleCommand(RedisCommand<K, V, T> command, rx.SingleSubscriber<? super T> subscriber) {
+            super(command);
+            this.subscriber = subscriber;
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public void complete() {
+            if (completed) {
+                return;
+            }
+
+            super.complete();
+
+            if (getOutput() != null) {
+                Object result = getOutput().get();
+
+                if (getOutput().hasError()) {
+                    onError(new RedisCommandExecutionException(getOutput().getError()));
+                    completed = true;
+                    return;
+                } else if (!(getOutput() instanceof StreamingOutput<?>)) {
+                    subscriber.onSuccess((T) result);
+                }
+            }
+
+            completed = true;
+        }
+
+        @Override
+        public void cancel() {
+
+            if (completed) {
+                return;
+            }
+
+            super.cancel();
+            onError(new CancellationException());
+            completed = true;
+        }
+
+        @Override
+        public boolean completeExceptionally(Throwable throwable) {
+
+            if (completed) {
+                return false;
+            }
+
+            boolean b = super.completeExceptionally(throwable);
+            onError(throwable);
             completed = true;
             return b;
         }
+
+        private void onError(Throwable throwable) {
+            subscriber.onError(throwable);
+        }
     }
 
     static class ObservableSubscriberWrapper<T> implements StreamingOutput.Subscriber<T> {
@@ -170,7 +286,7 @@ public ObservableSubscriberWrapper(Subscriber<? super T> subscriber) {
         @Override
         public void onNext(T t) {
 
-            if(subscriber.isUnsubscribed()) {
+            if (subscriber.isUnsubscribed()) {
                 return;
             }
 
@@ -178,6 +294,20 @@ public void onNext(T t) {
         }
     }
 
+    static class SingleSubscriberWrapper<T> implements StreamingOutput.Subscriber<T> {
+
+        private rx.SingleSubscriber<? super T> subscriber;
+
+        public SingleSubscriberWrapper(rx.SingleSubscriber<? super T> subscriber) {
+            this.subscriber = subscriber;
+        }
+
+        @Override
+        public void onNext(T t) {
+            subscriber.onSuccess(t);
+        }
+    }
+
     static class DelegatingWrapper<T> implements StreamingOutput.Subscriber<T> {
 
         private Collection<StreamingOutput.Subscriber<T>> subscribers;
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/BaseRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/BaseRedisReactiveCommands.java
index e257c522b8..b5945b7ae1 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/BaseRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/BaseRedisReactiveCommands.java
@@ -6,6 +6,8 @@
 import com.lambdaworks.redis.protocol.ProtocolKeyword;
 import com.lambdaworks.redis.output.CommandOutput;
 import rx.Observable;
+import rx.Single;
+import rx.Completable;
 
 /**
  * 
@@ -26,7 +28,7 @@ public interface BaseRedisReactiveCommands<K, V> extends AutoCloseable {
      * @param message the message type: value
      * @return Long integer-reply the number of clients that received the message.
      */
-    Observable<Long> publish(K channel, V message);
+    Single<Long> publish(K channel, V message);
 
     /**
      * Lists the currently *active channels*.
@@ -49,14 +51,14 @@ public interface BaseRedisReactiveCommands<K, V> extends AutoCloseable {
      * @param channels channel keys
      * @return array-reply a list of channels and number of subscribers for every channel.
      */
-    Observable<Map<K, Long>> pubsubNumsub(K... channels);
+    Single<Map<K, Long>> pubsubNumsub(K... channels);
 
     /**
      * Returns the number of subscriptions to patterns.
      * 
      * @return Long integer-reply the number of patterns all the clients are subscribed to.
      */
-    Observable<Long> pubsubNumpat();
+    Single<Long> pubsubNumpat();
 
     /**
      * Echo the given string.
@@ -64,7 +66,7 @@ public interface BaseRedisReactiveCommands<K, V> extends AutoCloseable {
      * @param msg the message type: value
      * @return V bulk-string-reply
      */
-    Observable<V> echo(V msg);
+    Single<V> echo(V msg);
 
     /**
      * Return the role of the instance in the context of replication.
@@ -79,28 +81,28 @@ public interface BaseRedisReactiveCommands<K, V> extends AutoCloseable {
      * 
      * @return String simple-string-reply
      */
-    Observable<String> ping();
+    Single<String> ping();
 
     /**
      * Switch connection to Read-Only mode when connecting to a cluster.
      *
      * @return String simple-string-reply.
      */
-    Observable<String> readOnly();
+    Single<String> readOnly();
 
     /**
      * Switch connection to Read-Write mode (default) when connecting to a cluster.
      *
      * @return String simple-string-reply.
      */
-    Observable<String> readWrite();
+    Single<String> readWrite();
 
     /**
      * Close the connection.
      * 
      * @return String simple-string-reply always OK.
      */
-    Observable<String> quit();
+    Single<String> quit();
 
     /**
      * Wait for replication.
@@ -109,7 +111,7 @@ public interface BaseRedisReactiveCommands<K, V> extends AutoCloseable {
      * @param timeout timeout in milliseconds
      * @return number of replicas
      */
-    Observable<Long> waitForReplication(int replicas, long timeout);
+    Single<Long> waitForReplication(int replicas, long timeout);
 
     /**
      * Dispatch a command to the Redis Server. Please note the command output type must fit to the command response.
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisGeoReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisGeoReactiveCommands.java
index abd49e4011..855b949edc 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisGeoReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisGeoReactiveCommands.java
@@ -7,6 +7,8 @@
 import java.util.List;
 import java.util.Set;
 import rx.Observable;
+import rx.Single;
+import rx.Completable;
 
 /**
  * Observable commands for the Geo-API.
@@ -26,7 +28,7 @@ public interface RedisGeoReactiveCommands<K, V> {
      * @param member the member to add
      * @return Long integer-reply the number of elements that were added to the set
      */
-    Observable<Long> geoadd(K key, double longitude, double latitude, V member);
+    Single<Long> geoadd(K key, double longitude, double latitude, V member);
 
     /**
      * Multi geo add.
@@ -35,7 +37,7 @@ public interface RedisGeoReactiveCommands<K, V> {
      * @param lngLatMember triplets of double longitude, double latitude and V member
      * @return Long integer-reply the number of elements that were added to the set
      */
-    Observable<Long> geoadd(K key, Object... lngLatMember);
+    Single<Long> geoadd(K key, Object... lngLatMember);
 
     /**
      * Retrieve Geohash strings representing the position of one or more elements in a sorted set value representing a geospatial index.
@@ -83,7 +85,7 @@ public interface RedisGeoReactiveCommands<K, V> {
      *        their locations a sorted set.
      * @return Long integer-reply the number of elements in the result
      */
-    Observable<Long> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit, GeoRadiusStoreArgs<K> geoRadiusStoreArgs);
+    Single<Long> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit, GeoRadiusStoreArgs<K> geoRadiusStoreArgs);
 
     /**
      * Retrieve members selected by distance with the center of {@code member}. The member itself is always contained in the
@@ -122,7 +124,7 @@ public interface RedisGeoReactiveCommands<K, V> {
      *        their locations a sorted set.
      * @return Long integer-reply the number of elements in the result
      */
-    Observable<Long> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoRadiusStoreArgs<K> geoRadiusStoreArgs);
+    Single<Long> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoRadiusStoreArgs<K> geoRadiusStoreArgs);
 
     /**
      * Get geo coordinates for the {@code members}.
@@ -148,5 +150,5 @@ public interface RedisGeoReactiveCommands<K, V> {
      * @return distance between points {@code from} and {@code to}. If one or more elements are missing {@literal null} is
      *         returned.
      */
-    Observable<Double> geodist(K key, V from, V to, GeoArgs.Unit unit);
+    Single<Double> geodist(K key, V from, V to, GeoArgs.Unit unit);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisHLLReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisHLLReactiveCommands.java
index dd8bd8a351..dc2e8a367c 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisHLLReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisHLLReactiveCommands.java
@@ -1,6 +1,8 @@
 package com.lambdaworks.redis.api.rx;
 
 import rx.Observable;
+import rx.Single;
+import rx.Completable;
 
 /**
  * Observable commands for HyperLogLog (PF* commands).
@@ -23,7 +25,7 @@ public interface RedisHLLReactiveCommands<K, V> {
      *
      *         1 if at least 1 HyperLogLog internal register was altered. 0 otherwise.
      */
-    Observable<Long> pfadd(K key, V... values);
+    Single<Long> pfadd(K key, V... values);
 
     /**
      * Merge N different HyperLogLogs into a single one.
@@ -33,7 +35,7 @@ public interface RedisHLLReactiveCommands<K, V> {
      *
      * @return String simple-string-reply The command just returns {@code OK}.
      */
-    Observable<String> pfmerge(K destkey, K... sourcekeys);
+    Single<String> pfmerge(K destkey, K... sourcekeys);
 
     /**
      * Return the approximated cardinality of the set(s) observed by the HyperLogLog at key(s).
@@ -44,5 +46,5 @@ public interface RedisHLLReactiveCommands<K, V> {
      *
      *         The approximated number of unique elements observed via {@code PFADD}.
      */
-    Observable<Long> pfcount(K... keys);
+    Single<Long> pfcount(K... keys);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisHashReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisHashReactiveCommands.java
index e10d080d61..21e575bcf8 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisHashReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisHashReactiveCommands.java
@@ -10,6 +10,8 @@
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 import rx.Observable;
+import rx.Single;
+import rx.Completable;
 
 /**
  * Observable commands for Hashes (Key-Value pairs).
@@ -30,7 +32,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @return Long integer-reply the number of fields that were removed from the hash, not including specified but non existing
      *         fields.
      */
-    Observable<Long> hdel(K key, K... fields);
+    Single<Long> hdel(K key, K... fields);
 
     /**
      * Determine if a hash field exists.
@@ -42,7 +44,7 @@ public interface RedisHashReactiveCommands<K, V> {
      *         {@literal true} if the hash contains {@code field}. {@literal false} if the hash does not contain {@code field},
      *         or {@code key} does not exist.
      */
-    Observable<Boolean> hexists(K key, K field);
+    Single<Boolean> hexists(K key, K field);
 
     /**
      * Get the value of a hash field.
@@ -52,7 +54,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @return V bulk-string-reply the value associated with {@code field}, or {@literal null} when {@code field} is not present
      *         in the hash or {@code key} does not exist.
      */
-    Observable<V> hget(K key, K field);
+    Single<V> hget(K key, K field);
 
     /**
      * Increment the integer value of a hash field by the given number.
@@ -62,7 +64,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param amount the increment type: long
      * @return Long integer-reply the value at {@code field} after the increment operation.
      */
-    Observable<Long> hincrby(K key, K field, long amount);
+    Single<Long> hincrby(K key, K field, long amount);
 
     /**
      * Increment the float value of a hash field by the given amount.
@@ -72,7 +74,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param amount the increment type: double
      * @return Double bulk-string-reply the value of {@code field} after the increment.
      */
-    Observable<Double> hincrbyfloat(K key, K field, double amount);
+    Single<Double> hincrbyfloat(K key, K field, double amount);
 
     /**
      * Get all the fields and values in a hash.
@@ -81,7 +83,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @return Map&lt;K,V&gt; array-reply list of fields and their values stored in the hash, or an empty list when {@code key}
      *         does not exist.
      */
-    Observable<Map<K, V>> hgetall(K key);
+    Single<Map<K, V>> hgetall(K key);
 
     /**
      * Stream over all the fields and values in a hash.
@@ -91,7 +93,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * 
      * @return Long count of the keys.
      */
-    Observable<Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key);
+    Single<Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key);
 
     /**
      * Get all the fields in a hash.
@@ -109,7 +111,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * 
      * @return Long count of the keys.
      */
-    Observable<Long> hkeys(KeyStreamingChannel<K> channel, K key);
+    Single<Long> hkeys(KeyStreamingChannel<K> channel, K key);
 
     /**
      * Get the number of fields in a hash.
@@ -117,7 +119,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param key the key
      * @return Long integer-reply number of fields in the hash, or {@code 0} when {@code key} does not exist.
      */
-    Observable<Long> hlen(K key);
+    Single<Long> hlen(K key);
 
     /**
      * Get the values of all the given hash fields.
@@ -137,7 +139,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * 
      * @return Long count of the keys
      */
-    Observable<Long> hmget(ValueStreamingChannel<V> channel, K key, K... fields);
+    Single<Long> hmget(ValueStreamingChannel<V> channel, K key, K... fields);
 
     /**
      * Set multiple hash fields to multiple values.
@@ -146,7 +148,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param map the null
      * @return String simple-string-reply
      */
-    Observable<String> hmset(K key, Map<K, V> map);
+    Single<String> hmset(K key, Map<K, V> map);
 
     /**
      * Incrementally iterate hash fields and associated values.
@@ -154,7 +156,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param key the key
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
      */
-    Observable<MapScanCursor<K, V>> hscan(K key);
+    Single<MapScanCursor<K, V>> hscan(K key);
 
     /**
      * Incrementally iterate hash fields and associated values.
@@ -163,7 +165,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
      */
-    Observable<MapScanCursor<K, V>> hscan(K key, ScanArgs scanArgs);
+    Single<MapScanCursor<K, V>> hscan(K key, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate hash fields and associated values.
@@ -173,7 +175,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
      */
-    Observable<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
+    Single<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate hash fields and associated values.
@@ -182,7 +184,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
      */
-    Observable<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor);
+    Single<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor);
 
     /**
      * Incrementally iterate hash fields and associated values.
@@ -191,7 +193,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param key the key
      * @return StreamScanCursor scan cursor.
      */
-    Observable<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key);
+    Single<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key);
 
     /**
      * Incrementally iterate hash fields and associated values.
@@ -201,7 +203,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
      */
-    Observable<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanArgs scanArgs);
+    Single<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate hash fields and associated values.
@@ -212,7 +214,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
      */
-    Observable<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
+    Single<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate hash fields and associated values.
@@ -222,7 +224,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return StreamScanCursor scan cursor.
      */
-    Observable<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor);
+    Single<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor);
 
     /**
      * Set the string value of a hash field.
@@ -235,7 +237,7 @@ public interface RedisHashReactiveCommands<K, V> {
      *         {@literal true} if {@code field} is a new field in the hash and {@code value} was set. {@literal false} if
      *         {@code field} already exists in the hash and the value was updated.
      */
-    Observable<Boolean> hset(K key, K field, V value);
+    Single<Boolean> hset(K key, K field, V value);
 
     /**
      * Set the value of a hash field, only if the field does not exist.
@@ -248,7 +250,7 @@ public interface RedisHashReactiveCommands<K, V> {
      *         {@code 1} if {@code field} is a new field in the hash and {@code value} was set. {@code 0} if {@code field}
      *         already exists in the hash and no operation was performed.
      */
-    Observable<Boolean> hsetnx(K key, K field, V value);
+    Single<Boolean> hsetnx(K key, K field, V value);
 
     /**
      * Get the string length of the field value in a hash.
@@ -258,7 +260,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @return Long integer-reply the string length of the {@code field} value, or {@code 0} when {@code field} is not present
      *         in the hash or {@code key} does not exist at all.
      */
-    Observable<Long> hstrlen(K key, K field);
+    Single<Long> hstrlen(K key, K field);
 
     /**
      * Get all the values in a hash.
@@ -276,5 +278,5 @@ public interface RedisHashReactiveCommands<K, V> {
      *
      * @return Long count of the keys.
      */
-    Observable<Long> hvals(ValueStreamingChannel<V> channel, K key);
+    Single<Long> hvals(ValueStreamingChannel<V> channel, K key);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisKeyReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisKeyReactiveCommands.java
index 5fd66b53f5..8cc15286cc 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisKeyReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisKeyReactiveCommands.java
@@ -11,6 +11,8 @@
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 import rx.Observable;
+import rx.Single;
+import rx.Completable;
 
 /**
  * Observable commands for Keys (Key manipulation/querying).
@@ -29,7 +31,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long integer-reply The number of keys that were removed.
      */
-    Observable<Long> del(K... keys);
+    Single<Long> del(K... keys);
 
     /**
      * Unlink one or more keys (non blocking DEL).
@@ -37,7 +39,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long integer-reply The number of keys that were removed.
      */
-    Observable<Long> unlink(K... keys);
+    Single<Long> unlink(K... keys);
 
     /**
      * Return a serialized version of the value stored at the specified key.
@@ -45,7 +47,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param key the key
      * @return byte[] bulk-string-reply the serialized value.
      */
-    Observable<byte[]> dump(K key);
+    Single<byte[]> dump(K key);
 
     /**
      * Determine how many keys exist.
@@ -53,7 +55,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long integer-reply specifically: Number of existing keys
      */
-    Observable<Long> exists(K... keys);
+    Single<Long> exists(K... keys);
 
     /**
      * Set a key's time to live in seconds.
@@ -65,7 +67,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set.
      */
-    Observable<Boolean> expire(K key, long seconds);
+    Single<Boolean> expire(K key, long seconds);
 
     /**
      * Set the expiration for a key as a UNIX timestamp.
@@ -77,7 +79,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
-    Observable<Boolean> expireat(K key, Date timestamp);
+    Single<Boolean> expireat(K key, Date timestamp);
 
     /**
      * Set the expiration for a key as a UNIX timestamp.
@@ -89,7 +91,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
-    Observable<Boolean> expireat(K key, long timestamp);
+    Single<Boolean> expireat(K key, long timestamp);
 
     /**
      * Find all keys matching the given pattern.
@@ -106,7 +108,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param pattern the pattern
      * @return Long array-reply list of keys matching {@code pattern}.
      */
-    Observable<Long> keys(KeyStreamingChannel<K> channel, K pattern);
+    Single<Long> keys(KeyStreamingChannel<K> channel, K pattern);
 
     /**
      * Atomically transfer a key from a Redis instance to another one.
@@ -118,7 +120,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param timeout the timeout in milliseconds
      * @return String simple-string-reply The command returns OK on success.
      */
-    Observable<String> migrate(String host, int port, K key, int db, long timeout);
+    Single<String> migrate(String host, int port, K key, int db, long timeout);
 
     /**
      * Atomically transfer one or more keys from a Redis instance to another one.
@@ -130,7 +132,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param migrateArgs migrate args that allow to configure further options
      * @return String simple-string-reply The command returns OK on success.
      */
-    Observable<String> migrate(String host, int port, int db, long timeout, MigrateArgs<K> migrateArgs);
+    Single<String> migrate(String host, int port, int db, long timeout, MigrateArgs<K> migrateArgs);
 
     /**
      * Move a key to another database.
@@ -139,7 +141,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param db the db type: long
      * @return Boolean integer-reply specifically:
      */
-    Observable<Boolean> move(K key, int db);
+    Single<Boolean> move(K key, int db);
 
     /**
      * returns the kind of internal representation used in order to store the value associated with a key.
@@ -147,7 +149,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param key the key
      * @return String
      */
-    Observable<String> objectEncoding(K key);
+    Single<String> objectEncoding(K key);
 
     /**
      * returns the number of seconds since the object stored at the specified key is idle (not requested by read or write
@@ -156,7 +158,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param key the key
      * @return number of seconds since the object stored at the specified key is idle.
      */
-    Observable<Long> objectIdletime(K key);
+    Single<Long> objectIdletime(K key);
 
     /**
      * returns the number of references of the value associated with the specified key.
@@ -164,7 +166,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param key the key
      * @return Long
      */
-    Observable<Long> objectRefcount(K key);
+    Single<Long> objectRefcount(K key);
 
     /**
      * Remove the expiration from a key.
@@ -175,7 +177,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      *         {@literal true} if the timeout was removed. {@literal false} if {@code key} does not exist or does not have an
      *         associated timeout.
      */
-    Observable<Boolean> persist(K key);
+    Single<Boolean> persist(K key);
 
     /**
      * Set a key's time to live in milliseconds.
@@ -187,7 +189,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set.
      */
-    Observable<Boolean> pexpire(K key, long milliseconds);
+    Single<Boolean> pexpire(K key, long milliseconds);
 
     /**
      * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
@@ -199,7 +201,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
-    Observable<Boolean> pexpireat(K key, Date timestamp);
+    Single<Boolean> pexpireat(K key, Date timestamp);
 
     /**
      * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
@@ -211,7 +213,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
-    Observable<Boolean> pexpireat(K key, long timestamp);
+    Single<Boolean> pexpireat(K key, long timestamp);
 
     /**
      * Get the time to live for a key in milliseconds.
@@ -220,14 +222,14 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @return Long integer-reply TTL in milliseconds, or a negative value in order to signal an error (see the description
      *         above).
      */
-    Observable<Long> pttl(K key);
+    Single<Long> pttl(K key);
 
     /**
      * Return a random key from the keyspace.
      * 
      * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
      */
-    Observable<V> randomkey();
+    Single<V> randomkey();
 
     /**
      * Rename a key.
@@ -236,7 +238,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param newKey the newkey type: key
      * @return String simple-string-reply
      */
-    Observable<String> rename(K key, K newKey);
+    Single<String> rename(K key, K newKey);
 
     /**
      * Rename a key, only if the new key does not exist.
@@ -247,7 +249,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * 
      *         {@literal true} if {@code key} was renamed to {@code newkey}. {@literal false} if {@code newkey} already exists.
      */
-    Observable<Boolean> renamenx(K key, K newKey);
+    Single<Boolean> renamenx(K key, K newKey);
 
     /**
      * Create a key using the provided serialized value, previously obtained using DUMP.
@@ -257,7 +259,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param value the serialized-value type: string
      * @return String simple-string-reply The command returns OK on success.
      */
-    Observable<String> restore(K key, long ttl, byte[] value);
+    Single<String> restore(K key, long ttl, byte[] value);
 
     /**
      * Sort the elements in a list, set or sorted set.
@@ -274,7 +276,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param key the key
      * @return Long number of values.
      */
-    Observable<Long> sort(ValueStreamingChannel<V> channel, K key);
+    Single<Long> sort(ValueStreamingChannel<V> channel, K key);
 
     /**
      * Sort the elements in a list, set or sorted set.
@@ -293,7 +295,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param sortArgs sort arguments
      * @return Long number of values.
      */
-    Observable<Long> sort(ValueStreamingChannel<V> channel, K key, SortArgs sortArgs);
+    Single<Long> sort(ValueStreamingChannel<V> channel, K key, SortArgs sortArgs);
 
     /**
      * Sort the elements in a list, set or sorted set.
@@ -303,7 +305,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param destination the destination key to store sort results
      * @return Long number of values.
      */
-    Observable<Long> sortStore(K key, SortArgs sortArgs, K destination);
+    Single<Long> sortStore(K key, SortArgs sortArgs, K destination);
 
     /**
      * Touch one or more keys. Touch sets the last accessed time for a key. Non-exsitent keys wont get created.
@@ -311,7 +313,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long integer-reply the number of found keys.
      */
-    Observable<Long> touch(K... keys);
+    Single<Long> touch(K... keys);
 
     /**
      * Get the time to live for a key.
@@ -319,7 +321,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param key the key
      * @return Long integer-reply TTL in seconds, or a negative value in order to signal an error (see the description above).
      */
-    Observable<Long> ttl(K key);
+    Single<Long> ttl(K key);
 
     /**
      * Determine the type stored at key.
@@ -327,14 +329,14 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param key the key
      * @return String simple-string-reply type of {@code key}, or {@code none} when {@code key} does not exist.
      */
-    Observable<String> type(K key);
+    Single<String> type(K key);
 
     /**
      * Incrementally iterate the keys space.
      * 
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
-    Observable<KeyScanCursor<K>> scan();
+    Single<KeyScanCursor<K>> scan();
 
     /**
      * Incrementally iterate the keys space.
@@ -342,7 +344,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
-    Observable<KeyScanCursor<K>> scan(ScanArgs scanArgs);
+    Single<KeyScanCursor<K>> scan(ScanArgs scanArgs);
 
     /**
      * Incrementally iterate the keys space.
@@ -351,7 +353,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
-    Observable<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs);
+    Single<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate the keys space.
@@ -359,7 +361,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
-    Observable<KeyScanCursor<K>> scan(ScanCursor scanCursor);
+    Single<KeyScanCursor<K>> scan(ScanCursor scanCursor);
 
     /**
      * Incrementally iterate the keys space.
@@ -367,7 +369,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param channel streaming channel that receives a call for every key
      * @return StreamScanCursor scan cursor.
      */
-    Observable<StreamScanCursor> scan(KeyStreamingChannel<K> channel);
+    Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel);
 
     /**
      * Incrementally iterate the keys space.
@@ -376,7 +378,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
      */
-    Observable<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs);
+    Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate the keys space.
@@ -386,7 +388,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
      */
-    Observable<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs);
+    Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate the keys space.
@@ -395,5 +397,5 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return StreamScanCursor scan cursor.
      */
-    Observable<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor);
+    Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisListReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisListReactiveCommands.java
index 4f9b4d4832..24f98351e9 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisListReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisListReactiveCommands.java
@@ -4,6 +4,8 @@
 import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 import rx.Observable;
+import rx.Single;
+import rx.Completable;
 
 /**
  * Observable commands for Lists.
@@ -27,7 +29,7 @@ public interface RedisListReactiveCommands<K, V> {
      *         with the first element being the name of the key where an element was popped and the second element being the
      *         value of the popped element.
      */
-    Observable<KeyValue<K, V>> blpop(long timeout, K... keys);
+    Single<KeyValue<K, V>> blpop(long timeout, K... keys);
 
     /**
      * Remove and get the last element in a list, or block until one is available.
@@ -40,7 +42,7 @@ public interface RedisListReactiveCommands<K, V> {
      *         with the first element being the name of the key where an element was popped and the second element being the
      *         value of the popped element.
      */
-    Observable<KeyValue<K, V>> brpop(long timeout, K... keys);
+    Single<KeyValue<K, V>> brpop(long timeout, K... keys);
 
     /**
      * Pop a value from a list, push it to another list and return it; or block until one is available.
@@ -51,7 +53,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @return V bulk-string-reply the element being popped from {@code source} and pushed to {@code destination}. If
      *         {@code timeout} is reached, a
      */
-    Observable<V> brpoplpush(long timeout, K source, K destination);
+    Single<V> brpoplpush(long timeout, K source, K destination);
 
     /**
      * Get an element from a list by its index.
@@ -60,7 +62,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param index the index type: long
      * @return V bulk-string-reply the requested element, or {@literal null} when {@code index} is out of range.
      */
-    Observable<V> lindex(K key, long index);
+    Single<V> lindex(K key, long index);
 
     /**
      * Insert an element before or after another element in a list.
@@ -72,7 +74,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @return Long integer-reply the length of the list after the insert operation, or {@code -1} when the value {@code pivot}
      *         was not found.
      */
-    Observable<Long> linsert(K key, boolean before, V pivot, V value);
+    Single<Long> linsert(K key, boolean before, V pivot, V value);
 
     /**
      * Get the length of a list.
@@ -80,7 +82,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param key the key
      * @return Long integer-reply the length of the list at {@code key}.
      */
-    Observable<Long> llen(K key);
+    Single<Long> llen(K key);
 
     /**
      * Remove and get the first element in a list.
@@ -88,7 +90,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param key the key
      * @return V bulk-string-reply the value of the first element, or {@literal null} when {@code key} does not exist.
      */
-    Observable<V> lpop(K key);
+    Single<V> lpop(K key);
 
     /**
      * Prepend one or multiple values to a list.
@@ -97,7 +99,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param values the value
      * @return Long integer-reply the length of the list after the push operations.
      */
-    Observable<Long> lpush(K key, V... values);
+    Single<Long> lpush(K key, V... values);
 
     /**
      * Prepend values to a list, only if the list exists.
@@ -106,7 +108,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param values the values
      * @return Long integer-reply the length of the list after the push operation.
      */
-    Observable<Long> lpushx(K key, V... values);
+    Single<Long> lpushx(K key, V... values);
 
     /**
      * Get a range of elements from a list.
@@ -127,7 +129,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param stop the stop type: long
      * @return Long count of elements in the specified range.
      */
-    Observable<Long> lrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+    Single<Long> lrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
 
     /**
      * Remove elements from a list.
@@ -137,7 +139,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param value the value
      * @return Long integer-reply the number of removed elements.
      */
-    Observable<Long> lrem(K key, long count, V value);
+    Single<Long> lrem(K key, long count, V value);
 
     /**
      * Set the value of an element in a list by its index.
@@ -147,7 +149,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param value the value
      * @return String simple-string-reply
      */
-    Observable<String> lset(K key, long index, V value);
+    Single<String> lset(K key, long index, V value);
 
     /**
      * Trim a list to the specified range.
@@ -157,7 +159,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param stop the stop type: long
      * @return String simple-string-reply
      */
-    Observable<String> ltrim(K key, long start, long stop);
+    Single<String> ltrim(K key, long start, long stop);
 
     /**
      * Remove and get the last element in a list.
@@ -165,7 +167,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param key the key
      * @return V bulk-string-reply the value of the last element, or {@literal null} when {@code key} does not exist.
      */
-    Observable<V> rpop(K key);
+    Single<V> rpop(K key);
 
     /**
      * Remove the last element in a list, append it to another list and return it.
@@ -174,7 +176,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param destination the destination type: key
      * @return V bulk-string-reply the element being popped and pushed.
      */
-    Observable<V> rpoplpush(K source, K destination);
+    Single<V> rpoplpush(K source, K destination);
 
     /**
      * Append one or multiple values to a list.
@@ -183,7 +185,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param values the value
      * @return Long integer-reply the length of the list after the push operation.
      */
-    Observable<Long> rpush(K key, V... values);
+    Single<Long> rpush(K key, V... values);
 
     /**
      * Append values to a list, only if the list exists.
@@ -192,5 +194,5 @@ public interface RedisListReactiveCommands<K, V> {
      * @param values the values
      * @return Long integer-reply the length of the list after the push operation.
      */
-    Observable<Long> rpushx(K key, V... values);
+    Single<Long> rpushx(K key, V... values);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisReactiveCommands.java
index 01182aa4b8..1c3901423a 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisReactiveCommands.java
@@ -6,6 +6,7 @@
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.cluster.api.rx.RedisClusterReactiveCommands;
+import rx.Single;
 
 /**
  * A complete reactive and thread-safe Redis API with 400+ Methods.
@@ -35,7 +36,7 @@ public interface RedisReactiveCommands<K, V> extends RedisHashReactiveCommands<K
      * @param password the password
      * @return String simple-string-reply
      */
-    Observable<String> auth(String password);
+    Single<String> auth(String password);
 
     /**
      * Change the selected database for the current connection.
@@ -43,7 +44,7 @@ public interface RedisReactiveCommands<K, V> extends RedisHashReactiveCommands<K
      * @param db the database number
      * @return String simple-string-reply
      */
-    Observable<String> select(int db);
+    Single<String> select(int db);
 
     /**
      * @return the underlying connection.
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisScriptingReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisScriptingReactiveCommands.java
index c20b82292d..ceb47dee70 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisScriptingReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisScriptingReactiveCommands.java
@@ -3,6 +3,8 @@
 import java.util.List;
 import com.lambdaworks.redis.ScriptOutputType;
 import rx.Observable;
+import rx.Single;
+import rx.Completable;
 
 /**
  * Observable commands for Scripting.
@@ -76,14 +78,14 @@ public interface RedisScriptingReactiveCommands<K, V> {
      * 
      * @return String simple-string-reply
      */
-    Observable<String> scriptFlush();
+    Single<String> scriptFlush();
 
     /**
      * Kill the script currently in execution.
      * 
      * @return String simple-string-reply
      */
-    Observable<String> scriptKill();
+    Single<String> scriptKill();
 
     /**
      * Load the specified Lua script into the script cache.
@@ -91,7 +93,7 @@ public interface RedisScriptingReactiveCommands<K, V> {
      * @param script script content
      * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
      */
-    Observable<String> scriptLoad(V script);
+    Single<String> scriptLoad(V script);
 
     /**
      * Create a SHA1 digest from a Lua script.
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisServerReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisServerReactiveCommands.java
index bcf8575949..883904d090 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisServerReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisServerReactiveCommands.java
@@ -5,6 +5,8 @@
 import com.lambdaworks.redis.KillArgs;
 import com.lambdaworks.redis.protocol.CommandType;
 import rx.Observable;
+import rx.Single;
+import rx.Completable;
 
 /**
  * Observable commands for Server Control.
@@ -22,21 +24,21 @@ public interface RedisServerReactiveCommands<K, V> {
      * 
      * @return String simple-string-reply always {@code OK}.
      */
-    Observable<String> bgrewriteaof();
+    Single<String> bgrewriteaof();
 
     /**
      * Asynchronously save the dataset to disk.
      * 
      * @return String simple-string-reply
      */
-    Observable<String> bgsave();
+    Single<String> bgsave();
 
     /**
      * Get the current connection name.
      * 
      * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set.
      */
-    Observable<K> clientGetname();
+    Single<K> clientGetname();
 
     /**
      * Set the current connection name.
@@ -44,7 +46,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param name the client name
      * @return simple-string-reply {@code OK} if the connection name was successfully set.
      */
-    Observable<String> clientSetname(K name);
+    Single<String> clientSetname(K name);
 
     /**
      * Kill the connection of a client identified by ip:port.
@@ -52,7 +54,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param addr ip:port
      * @return String simple-string-reply {@code OK} if the connection exists and has been closed
      */
-    Observable<String> clientKill(String addr);
+    Single<String> clientKill(String addr);
 
     /**
      * Kill connections of clients which are filtered by {@code killArgs}
@@ -60,7 +62,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param killArgs args for the kill operation
      * @return Long integer-reply number of killed connections
      */
-    Observable<Long> clientKill(KillArgs killArgs);
+    Single<Long> clientKill(KillArgs killArgs);
 
     /**
      * Stop processing commands from clients for some time.
@@ -68,7 +70,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param timeout the timeout value in milliseconds
      * @return String simple-string-reply The command returns OK or an error if the timeout is invalid.
      */
-    Observable<String> clientPause(long timeout);
+    Single<String> clientPause(long timeout);
 
     /**
      * Get the list of client connections.
@@ -76,7 +78,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF),
      *         each line is composed of a succession of property=value fields separated by a space character.
      */
-    Observable<String> clientList();
+    Single<String> clientList();
 
     /**
      * Returns an array reply of details about all Redis commands.
@@ -106,7 +108,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * 
      * @return Long integer-reply of number of total commands in this Redis server.
      */
-    Observable<Long> commandCount();
+    Single<Long> commandCount();
 
     /**
      * Get the value of a configuration parameter.
@@ -121,7 +123,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * 
      * @return String simple-string-reply always {@code OK}.
      */
-    Observable<String> configResetstat();
+    Single<String> configResetstat();
 
     /**
      * Rewrite the configuration file with the in memory configuration.
@@ -129,7 +131,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * @return String simple-string-reply {@code OK} when the configuration was rewritten properly. Otherwise an error is
      *         returned.
      */
-    Observable<String> configRewrite();
+    Single<String> configRewrite();
 
     /**
      * Set a configuration parameter to the given value.
@@ -138,21 +140,21 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param value the parameter value
      * @return String simple-string-reply: {@code OK} when the configuration was set properly. Otherwise an error is returned.
      */
-    Observable<String> configSet(String parameter, String value);
+    Single<String> configSet(String parameter, String value);
 
     /**
      * Return the number of keys in the selected database.
      * 
      * @return Long integer-reply
      */
-    Observable<Long> dbsize();
+    Single<Long> dbsize();
 
     /**
      * Crash and recover
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
-    Observable<String> debugCrashAndRecover(Long delay);
+    Single<String> debugCrashAndRecover(Long delay);
 
     /**
      * Get debugging information about the internal hash-table state.
@@ -160,7 +162,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param db the database number
      * @return String simple-string-reply
      */
-    Observable<String> debugHtstats(int db);
+    Single<String> debugHtstats(int db);
 
     /**
      * Get debugging information about a key.
@@ -168,35 +170,35 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param key the key
      * @return String simple-string-reply
      */
-    Observable<String> debugObject(K key);
+    Single<String> debugObject(K key);
 
     /**
      * Make the server crash: Out of memory.
      *
      * @return nothing, because the server crashes before returning.
      */
-    Observable<Success> debugOom();
+    Completable debugOom();
 
     /**
      * Make the server crash: Invalid pointer access.
      *
      * @return nothing, because the server crashes before returning.
      */
-    Observable<Success> debugSegfault();
+    Completable debugSegfault();
 
     /**
      * Save RDB, clear the database and reload RDB.
      *
      * @return String simple-string-reply The commands returns OK on success.
      */
-    Observable<String> debugReload();
+    Single<String> debugReload();
 
     /**
      * Restart the server gracefully.
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
-    Observable<String> debugRestart(Long delay);
+    Single<String> debugRestart(Long delay);
 
     /**
      * Get debugging information about the internal SDS length.
@@ -204,42 +206,42 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param key the key
      * @return String simple-string-reply
      */
-    Observable<String> debugSdslen(K key);
+    Single<String> debugSdslen(K key);
 
     /**
      * Remove all keys from all databases.
      * 
      * @return String simple-string-reply
      */
-    Observable<String> flushall();
+    Single<String> flushall();
 
     /**
      * Remove all keys asynchronously from all databases.
      *
      * @return String simple-string-reply
      */
-    Observable<String> flushallAsync();
+    Single<String> flushallAsync();
 
     /**
      * Remove all keys from the current database.
      * 
      * @return String simple-string-reply
      */
-    Observable<String> flushdb();
+    Single<String> flushdb();
 
     /**
      * Remove all keys asynchronously from the current database.
      *
      * @return String simple-string-reply
      */
-    Observable<String> flushdbAsync();
+    Single<String> flushdbAsync();
 
     /**
      * Get information and statistics about the server.
      * 
      * @return String bulk-string-reply as a collection of text lines.
      */
-    Observable<String> info();
+    Single<String> info();
 
     /**
      * Get information and statistics about the server.
@@ -247,28 +249,28 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param section the section type: string
      * @return String bulk-string-reply as a collection of text lines.
      */
-    Observable<String> info(String section);
+    Single<String> info(String section);
 
     /**
      * Get the UNIX time stamp of the last successful save to disk.
      * 
      * @return Date integer-reply an UNIX time stamp.
      */
-    Observable<Date> lastsave();
+    Single<Date> lastsave();
 
     /**
      * Synchronously save the dataset to disk.
      * 
      * @return String simple-string-reply The commands returns OK on success.
      */
-    Observable<String> save();
+    Single<String> save();
 
     /**
      * Synchronously save the dataset to disk and then shut down the server.
      * 
      * @param save {@literal true} force save operation
      */
-    Observable<Success> shutdown(boolean save);
+    Completable shutdown(boolean save);
 
     /**
      * Make the server a slave of another instance, or promote it as master.
@@ -277,14 +279,14 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param port the port type: string
      * @return String simple-string-reply
      */
-    Observable<String> slaveof(String host, int port);
+    Single<String> slaveof(String host, int port);
 
     /**
      * Promote server as master.
      * 
      * @return String simple-string-reply
      */
-    Observable<String> slaveofNoOne();
+    Single<String> slaveofNoOne();
 
     /**
      * Read the slow log.
@@ -306,14 +308,14 @@ public interface RedisServerReactiveCommands<K, V> {
      * 
      * @return Long length of the slow log.
      */
-    Observable<Long> slowlogLen();
+    Single<Long> slowlogLen();
 
     /**
      * Resetting the slow log.
      * 
      * @return String simple-string-reply The commands returns OK on success.
      */
-    Observable<String> slowlogReset();
+    Single<String> slowlogReset();
 
     /**
      * Return the current server time.
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisSetReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisSetReactiveCommands.java
index 5ddcb7c9c1..15bce1cc47 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisSetReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisSetReactiveCommands.java
@@ -7,6 +7,8 @@
 import com.lambdaworks.redis.ValueScanCursor;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 import rx.Observable;
+import rx.Single;
+import rx.Completable;
 
 /**
  * Observable commands for Sets.
@@ -27,7 +29,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @return Long integer-reply the number of elements that were added to the set, not including all the elements already
      *         present into the set.
      */
-    Observable<Long> sadd(K key, V... members);
+    Single<Long> sadd(K key, V... members);
 
     /**
      * Get the number of members in a set.
@@ -36,7 +38,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @return Long integer-reply the cardinality (number of elements) of the set, or {@literal false} if {@code key} does not
      *         exist.
      */
-    Observable<Long> scard(K key);
+    Single<Long> scard(K key);
 
     /**
      * Subtract multiple sets.
@@ -53,7 +55,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long count of members of the resulting set.
      */
-    Observable<Long> sdiff(ValueStreamingChannel<V> channel, K... keys);
+    Single<Long> sdiff(ValueStreamingChannel<V> channel, K... keys);
 
     /**
      * Subtract multiple sets and store the resulting set in a key.
@@ -62,7 +64,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
      */
-    Observable<Long> sdiffstore(K destination, K... keys);
+    Single<Long> sdiffstore(K destination, K... keys);
 
     /**
      * Intersect multiple sets.
@@ -79,7 +81,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long count of members of the resulting set.
      */
-    Observable<Long> sinter(ValueStreamingChannel<V> channel, K... keys);
+    Single<Long> sinter(ValueStreamingChannel<V> channel, K... keys);
 
     /**
      * Intersect multiple sets and store the resulting set in a key.
@@ -88,7 +90,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
      */
-    Observable<Long> sinterstore(K destination, K... keys);
+    Single<Long> sinterstore(K destination, K... keys);
 
     /**
      * Determine if a given value is a member of a set.
@@ -100,7 +102,7 @@ public interface RedisSetReactiveCommands<K, V> {
      *         {@literal true} if the element is a member of the set. {@literal false} if the element is not a member of the
      *         set, or if {@code key} does not exist.
      */
-    Observable<Boolean> sismember(K key, V member);
+    Single<Boolean> sismember(K key, V member);
 
     /**
      * Move a member from one set to another.
@@ -113,7 +115,7 @@ public interface RedisSetReactiveCommands<K, V> {
      *         {@literal true} if the element is moved. {@literal false} if the element is not a member of {@code source} and no
      *         operation was performed.
      */
-    Observable<Boolean> smove(K source, K destination, V member);
+    Single<Boolean> smove(K source, K destination, V member);
 
     /**
      * Get all the members in a set.
@@ -130,7 +132,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param key the keys
      * @return Long count of members of the resulting set.
      */
-    Observable<Long> smembers(ValueStreamingChannel<V> channel, K key);
+    Single<Long> smembers(ValueStreamingChannel<V> channel, K key);
 
     /**
      * Remove and return a random member from a set.
@@ -138,7 +140,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param key the key
      * @return V bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist.
      */
-    Observable<V> spop(K key);
+    Single<V> spop(K key);
 
     /**
      * Remove and return one or multiple random members from a set.
@@ -157,7 +159,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply with the
      *         randomly selected element, or {@literal null} when {@code key} does not exist.
      */
-    Observable<V> srandmember(K key);
+    Single<V> srandmember(K key);
 
     /**
      * Get one or multiple random members from a set.
@@ -177,7 +179,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of members of the resulting set.
      */
-    Observable<Long> srandmember(ValueStreamingChannel<V> channel, K key, long count);
+    Single<Long> srandmember(ValueStreamingChannel<V> channel, K key, long count);
 
     /**
      * Remove one or more members from a set.
@@ -186,7 +188,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param members the member type: value
      * @return Long integer-reply the number of members that were removed from the set, not including non existing members.
      */
-    Observable<Long> srem(K key, V... members);
+    Single<Long> srem(K key, V... members);
 
     /**
      * Add multiple sets.
@@ -203,7 +205,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long count of members of the resulting set.
      */
-    Observable<Long> sunion(ValueStreamingChannel<V> channel, K... keys);
+    Single<Long> sunion(ValueStreamingChannel<V> channel, K... keys);
 
     /**
      * Add multiple sets and store the resulting set in a key.
@@ -212,7 +214,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
      */
-    Observable<Long> sunionstore(K destination, K... keys);
+    Single<Long> sunionstore(K destination, K... keys);
 
     /**
      * Incrementally iterate Set elements.
@@ -220,7 +222,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param key the key
      * @return ValueScanCursor&lt;V&gt; scan cursor.
      */
-    Observable<ValueScanCursor<V>> sscan(K key);
+    Single<ValueScanCursor<V>> sscan(K key);
 
     /**
      * Incrementally iterate Set elements.
@@ -229,7 +231,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return ValueScanCursor&lt;V&gt; scan cursor.
      */
-    Observable<ValueScanCursor<V>> sscan(K key, ScanArgs scanArgs);
+    Single<ValueScanCursor<V>> sscan(K key, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate Set elements.
@@ -239,7 +241,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return ValueScanCursor&lt;V&gt; scan cursor.
      */
-    Observable<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
+    Single<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate Set elements.
@@ -248,7 +250,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return ValueScanCursor&lt;V&gt; scan cursor.
      */
-    Observable<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor);
+    Single<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor);
 
     /**
      * Incrementally iterate Set elements.
@@ -257,7 +259,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param key the key
      * @return StreamScanCursor scan cursor.
      */
-    Observable<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key);
+    Single<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key);
 
     /**
      * Incrementally iterate Set elements.
@@ -267,7 +269,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
      */
-    Observable<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanArgs scanArgs);
+    Single<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate Set elements.
@@ -278,7 +280,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
      */
-    Observable<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
+    Single<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate Set elements.
@@ -288,5 +290,5 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return StreamScanCursor scan cursor.
      */
-    Observable<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
+    Single<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisSortedSetReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisSortedSetReactiveCommands.java
index bdc42ded83..0da8841703 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisSortedSetReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisSortedSetReactiveCommands.java
@@ -11,6 +11,8 @@
 import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 import rx.Observable;
+import rx.Single;
+import rx.Completable;
 
 /**
  * Observable commands for Sorted Sets.
@@ -35,7 +37,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
-    Observable<Long> zadd(K key, double score, V member);
+    Single<Long> zadd(K key, double score, V member);
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
@@ -47,7 +49,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
-    Observable<Long> zadd(K key, Object... scoresAndValues);
+    Single<Long> zadd(K key, Object... scoresAndValues);
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
@@ -59,7 +61,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
-    Observable<Long> zadd(K key, ScoredValue<V>... scoredValues);
+    Single<Long> zadd(K key, ScoredValue<V>... scoredValues);
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
@@ -74,7 +76,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
-    Observable<Long> zadd(K key, ZAddArgs zAddArgs, double score, V member);
+    Single<Long> zadd(K key, ZAddArgs zAddArgs, double score, V member);
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
@@ -87,7 +89,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
-    Observable<Long> zadd(K key, ZAddArgs zAddArgs, Object... scoresAndValues);
+    Single<Long> zadd(K key, ZAddArgs zAddArgs, Object... scoresAndValues);
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
@@ -100,7 +102,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
-    Observable<Long> zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues);
+    Single<Long> zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues);
 
     /**
      * ZADD acts like ZINCRBY
@@ -113,7 +115,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      *
      *         The total number of elements changed
      */
-    Observable<Double> zaddincr(K key, double score, V member);
+    Single<Double> zaddincr(K key, double score, V member);
 
     /**
      * Get the number of members in a sorted set.
@@ -122,7 +124,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @return Long integer-reply the cardinality (number of elements) of the sorted set, or {@literal false} if {@code key}
      *         does not exist.
      */
-    Observable<Long> zcard(K key);
+    Single<Long> zcard(K key);
 
     /**
      * Count the members in a sorted set with scores within the given values.
@@ -132,7 +134,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
      */
-    Observable<Long> zcount(K key, double min, double max);
+    Single<Long> zcount(K key, double min, double max);
 
     /**
      * Count the members in a sorted set with scores within the given values.
@@ -142,7 +144,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
      */
-    Observable<Long> zcount(K key, String min, String max);
+    Single<Long> zcount(K key, String min, String max);
 
     /**
      * Increment the score of a member in a sorted set.
@@ -153,7 +155,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @return Double bulk-string-reply the new score of {@code member} (a double precision floating point number), represented
      *         as string.
      */
-    Observable<Double> zincrby(K key, double amount, K member);
+    Single<Double> zincrby(K key, double amount, K member);
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
@@ -162,7 +164,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    Observable<Long> zinterstore(K destination, K... keys);
+    Single<Long> zinterstore(K destination, K... keys);
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
@@ -172,7 +174,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    Observable<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys);
+    Single<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys);
 
     /**
      * Return a range of members in a sorted set, by index.
@@ -291,7 +293,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param stop the stop
      * @return Long count of elements in the specified range.
      */
-    Observable<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+    Single<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
 
     /**
      * Stream over a range of members with scores in a sorted set, by index.
@@ -302,7 +304,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param stop the stop
      * @return Long count of elements in the specified range.
      */
-    Observable<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+    Single<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
 
     /**
      * Stream over a range of members in a sorted set, by score.
@@ -313,7 +315,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long count of elements in the specified score range.
      */
-    Observable<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
+    Single<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
      * Stream over a range of members in a sorted set, by score.
@@ -324,7 +326,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long count of elements in the specified score range.
      */
-    Observable<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
+    Single<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
 
     /**
      * Stream over range of members in a sorted set, by score.
@@ -337,7 +339,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of elements in the specified score range.
      */
-    Observable<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
+    Single<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
      * Stream over a range of members in a sorted set, by score.
@@ -350,7 +352,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of elements in the specified score range.
      */
-    Observable<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
+    Single<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
@@ -361,7 +363,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long count of elements in the specified score range.
      */
-    Observable<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max);
+    Single<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
@@ -372,7 +374,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long count of elements in the specified score range.
      */
-    Observable<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max);
+    Single<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
@@ -385,7 +387,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of elements in the specified score range.
      */
-    Observable<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
+    Single<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
@@ -398,7 +400,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of elements in the specified score range.
      */
-    Observable<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
+    Single<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
     /**
      * Determine the index of a member in a sorted set.
@@ -408,7 +410,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
      *         does not exist,
      */
-    Observable<Long> zrank(K key, V member);
+    Single<Long> zrank(K key, V member);
 
     /**
      * Remove one or more members from a sorted set.
@@ -419,7 +421,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * 
      *         The number of members removed from the sorted set, not including non existing members.
      */
-    Observable<Long> zrem(K key, V... members);
+    Single<Long> zrem(K key, V... members);
 
     /**
      * Remove all members in a sorted set within the given indexes.
@@ -429,7 +431,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param stop the stop type: long
      * @return Long integer-reply the number of elements removed.
      */
-    Observable<Long> zremrangebyrank(K key, long start, long stop);
+    Single<Long> zremrangebyrank(K key, long start, long stop);
 
     /**
      * Remove all members in a sorted set within the given scores.
@@ -439,7 +441,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long integer-reply the number of elements removed.
      */
-    Observable<Long> zremrangebyscore(K key, double min, double max);
+    Single<Long> zremrangebyscore(K key, double min, double max);
 
     /**
      * Remove all members in a sorted set within the given scores.
@@ -449,7 +451,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long integer-reply the number of elements removed.
      */
-    Observable<Long> zremrangebyscore(K key, String min, String max);
+    Single<Long> zremrangebyscore(K key, String min, String max);
 
     /**
      * Return a range of members in a sorted set, by index, with scores ordered from high to low.
@@ -568,7 +570,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param stop the stop
      * @return Long count of elements in the specified range.
      */
-    Observable<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+    Single<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
 
     /**
      * Stream over a range of members with scores in a sorted set, by index, with scores ordered from high to low.
@@ -579,7 +581,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param stop the stop
      * @return Long count of elements in the specified range.
      */
-    Observable<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+    Single<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
 
     /**
      * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
@@ -590,7 +592,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @return Long count of elements in the specified range.
      */
-    Observable<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
+    Single<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
      * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
@@ -601,7 +603,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long count of elements in the specified range.
      */
-    Observable<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
+    Single<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
 
     /**
      * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
@@ -614,7 +616,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of elements in the specified range.
      */
-    Observable<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
+    Single<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
      * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
@@ -627,7 +629,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of elements in the specified range.
      */
-    Observable<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
+    Single<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
@@ -638,7 +640,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long count of elements in the specified range.
      */
-    Observable<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min);
+    Single<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
@@ -649,7 +651,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long count of elements in the specified range.
      */
-    Observable<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min);
+    Single<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
@@ -662,7 +664,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of elements in the specified range.
      */
-    Observable<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
+    Single<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
@@ -675,7 +677,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of elements in the specified range.
      */
-    Observable<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
+    Single<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
     /**
      * Determine the index of a member in a sorted set, with scores ordered from high to low.
@@ -685,7 +687,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
      *         does not exist,
      */
-    Observable<Long> zrevrank(K key, V member);
+    Single<Long> zrevrank(K key, V member);
 
     /**
      * Get the score associated with the given member in a sorted set.
@@ -695,7 +697,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @return Double bulk-string-reply the score of {@code member} (a double precision floating point number), represented as
      *         string.
      */
-    Observable<Double> zscore(K key, V member);
+    Single<Double> zscore(K key, V member);
 
     /**
      * Add multiple sorted sets and store the resulting sorted set in a new key.
@@ -704,7 +706,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param keys source keys
      * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    Observable<Long> zunionstore(K destination, K... keys);
+    Single<Long> zunionstore(K destination, K... keys);
 
     /**
      * Add multiple sorted sets and store the resulting sorted set in a new key.
@@ -714,7 +716,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    Observable<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
+    Single<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
@@ -722,7 +724,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param key the key
      * @return ScoredValueScanCursor&lt;V&gt; scan cursor.
      */
-    Observable<ScoredValueScanCursor<V>> zscan(K key);
+    Single<ScoredValueScanCursor<V>> zscan(K key);
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
@@ -731,7 +733,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return ScoredValueScanCursor&lt;V&gt; scan cursor.
      */
-    Observable<ScoredValueScanCursor<V>> zscan(K key, ScanArgs scanArgs);
+    Single<ScoredValueScanCursor<V>> zscan(K key, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
@@ -741,7 +743,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return ScoredValueScanCursor&lt;V&gt; scan cursor.
      */
-    Observable<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
+    Single<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
@@ -750,7 +752,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return ScoredValueScanCursor&lt;V&gt; scan cursor.
      */
-    Observable<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor);
+    Single<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor);
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
@@ -759,7 +761,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param key the key
      * @return StreamScanCursor scan cursor.
      */
-    Observable<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key);
+    Single<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key);
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
@@ -769,7 +771,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
      */
-    Observable<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanArgs scanArgs);
+    Single<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
@@ -780,7 +782,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
      */
-    Observable<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
+    Single<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
@@ -790,7 +792,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return StreamScanCursor scan cursor.
      */
-    Observable<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
+    Single<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
 
     /**
      * Count the number of members in a sorted set between a given lexicographical range.
@@ -800,7 +802,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
      */
-    Observable<Long> zlexcount(K key, String min, String max);
+    Single<Long> zlexcount(K key, String min, String max);
 
     /**
      * Remove all members in a sorted set between the given lexicographical range.
@@ -810,7 +812,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long integer-reply the number of elements removed.
      */
-    Observable<Long> zremrangebylex(K key, String min, String max);
+    Single<Long> zremrangebylex(K key, String min, String max);
 
     /**
      * Return a range of members in a sorted set, by lexicographical range.
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisStringReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisStringReactiveCommands.java
index 1d26d273d9..347e825982 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisStringReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisStringReactiveCommands.java
@@ -6,6 +6,8 @@
 import com.lambdaworks.redis.BitFieldArgs;
 import com.lambdaworks.redis.SetArgs;
 import rx.Observable;
+import rx.Single;
+import rx.Completable;
 
 /**
  * Observable commands for Strings.
@@ -25,7 +27,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param value the value
      * @return Long integer-reply the length of the string after the append operation.
      */
-    Observable<Long> append(K key, V value);
+    Single<Long> append(K key, V value);
 
     /**
      * Count set bits in a string.
@@ -34,7 +36,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * 
      * @return Long integer-reply The number of bits set to 1.
      */
-    Observable<Long> bitcount(K key);
+    Single<Long> bitcount(K key);
 
     /**
      * Count set bits in a string.
@@ -45,7 +47,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * 
      * @return Long integer-reply The number of bits set to 1.
      */
-    Observable<Long> bitcount(K key, long start, long end);
+    Single<Long> bitcount(K key, long start, long end);
 
     /**
      * Execute {@code BITFIELD} with its subcommands.
@@ -79,7 +81,7 @@ public interface RedisStringReactiveCommands<K, V> {
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
      */
-    Observable<Long> bitpos(K key, boolean state);
+    Single<Long> bitpos(K key, boolean state);
 
     /**
      * Find first bit set or clear in a string.
@@ -104,7 +106,7 @@ public interface RedisStringReactiveCommands<K, V> {
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
      */
-    Observable<Long> bitpos(K key, boolean state, long start, long end);
+    Single<Long> bitpos(K key, boolean state, long start, long end);
 
     /**
      * Perform bitwise AND between strings.
@@ -114,7 +116,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
      *         input string.
      */
-    Observable<Long> bitopAnd(K destination, K... keys);
+    Single<Long> bitopAnd(K destination, K... keys);
 
     /**
      * Perform bitwise NOT between strings.
@@ -124,7 +126,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
      *         input string.
      */
-    Observable<Long> bitopNot(K destination, K source);
+    Single<Long> bitopNot(K destination, K source);
 
     /**
      * Perform bitwise OR between strings.
@@ -134,7 +136,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
      *         input string.
      */
-    Observable<Long> bitopOr(K destination, K... keys);
+    Single<Long> bitopOr(K destination, K... keys);
 
     /**
      * Perform bitwise XOR between strings.
@@ -144,7 +146,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
      *         input string.
      */
-    Observable<Long> bitopXor(K destination, K... keys);
+    Single<Long> bitopXor(K destination, K... keys);
 
     /**
      * Decrement the integer value of a key by one.
@@ -152,7 +154,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the decrement
      */
-    Observable<Long> decr(K key);
+    Single<Long> decr(K key);
 
     /**
      * Decrement the integer value of a key by the given number.
@@ -161,7 +163,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param amount the decrement type: long
      * @return Long integer-reply the value of {@code key} after the decrement
      */
-    Observable<Long> decrby(K key, long amount);
+    Single<Long> decrby(K key, long amount);
 
     /**
      * Get the value of a key.
@@ -169,7 +171,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param key the key
      * @return V bulk-string-reply the value of {@code key}, or {@literal null} when {@code key} does not exist.
      */
-    Observable<V> get(K key);
+    Single<V> get(K key);
 
     /**
      * Returns the bit value at offset in the string value stored at key.
@@ -178,7 +180,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param offset the offset type: long
      * @return Long integer-reply the bit value stored at <em>offset</em>.
      */
-    Observable<Long> getbit(K key, long offset);
+    Single<Long> getbit(K key, long offset);
 
     /**
      * Get a substring of the string stored at a key.
@@ -188,7 +190,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param end the end type: long
      * @return V bulk-string-reply
      */
-    Observable<V> getrange(K key, long start, long end);
+    Single<V> getrange(K key, long start, long end);
 
     /**
      * Set the string value of a key and return its old value.
@@ -197,7 +199,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param value the value
      * @return V bulk-string-reply the old value stored at {@code key}, or {@literal null} when {@code key} did not exist.
      */
-    Observable<V> getset(K key, V value);
+    Single<V> getset(K key, V value);
 
     /**
      * Increment the integer value of a key by one.
@@ -205,7 +207,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the increment
      */
-    Observable<Long> incr(K key);
+    Single<Long> incr(K key);
 
     /**
      * Increment the integer value of a key by the given amount.
@@ -214,7 +216,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param amount the increment type: long
      * @return Long integer-reply the value of {@code key} after the increment
      */
-    Observable<Long> incrby(K key, long amount);
+    Single<Long> incrby(K key, long amount);
 
     /**
      * Increment the float value of a key by the given amount.
@@ -223,7 +225,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param amount the increment type: double
      * @return Double bulk-string-reply the value of {@code key} after the increment.
      */
-    Observable<Double> incrbyfloat(K key, double amount);
+    Single<Double> incrbyfloat(K key, double amount);
 
     /**
      * Get the values of all the given keys.
@@ -241,7 +243,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * 
      * @return Long array-reply list of values at the specified keys.
      */
-    Observable<Long> mget(ValueStreamingChannel<V> channel, K... keys);
+    Single<Long> mget(ValueStreamingChannel<V> channel, K... keys);
 
     /**
      * Set multiple keys to multiple values.
@@ -249,7 +251,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param map the null
      * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail.
      */
-    Observable<String> mset(Map<K, V> map);
+    Single<String> mset(Map<K, V> map);
 
     /**
      * Set multiple keys to multiple values, only if none of the keys exist.
@@ -259,7 +261,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * 
      *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
      */
-    Observable<Boolean> msetnx(Map<K, V> map);
+    Single<Boolean> msetnx(Map<K, V> map);
 
     /**
      * Set the string value of a key.
@@ -269,7 +271,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * 
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
-    Observable<String> set(K key, V value);
+    Single<String> set(K key, V value);
 
     /**
      * Set the string value of a key.
@@ -280,7 +282,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * 
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
-    Observable<String> set(K key, V value, SetArgs setArgs);
+    Single<String> set(K key, V value, SetArgs setArgs);
 
     /**
      * Sets or clears the bit at offset in the string value stored at key.
@@ -290,7 +292,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param value the value type: string
      * @return Long integer-reply the original bit value stored at <em>offset</em>.
      */
-    Observable<Long> setbit(K key, long offset, int value);
+    Single<Long> setbit(K key, long offset, int value);
 
     /**
      * Set the value and expiration of a key.
@@ -300,7 +302,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param value the value
      * @return String simple-string-reply
      */
-    Observable<String> setex(K key, long seconds, V value);
+    Single<String> setex(K key, long seconds, V value);
 
     /**
      * Set the value and expiration in milliseconds of a key.
@@ -310,7 +312,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param value the value
      * @return String simple-string-reply
      */
-    Observable<String> psetex(K key, long milliseconds, V value);
+    Single<String> psetex(K key, long milliseconds, V value);
 
     /**
      * Set the value of a key, only if the key does not exist.
@@ -321,7 +323,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * 
      *         {@code 1} if the key was set {@code 0} if the key was not set
      */
-    Observable<Boolean> setnx(K key, V value);
+    Single<Boolean> setnx(K key, V value);
 
     /**
      * Overwrite part of a string at key starting at the specified offset.
@@ -331,7 +333,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param value the value
      * @return Long integer-reply the length of the string after it was modified by the command.
      */
-    Observable<Long> setrange(K key, long offset, V value);
+    Single<Long> setrange(K key, long offset, V value);
 
     /**
      * Get the length of the value stored in a key.
@@ -339,5 +341,5 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param key the key
      * @return Long integer-reply the length of the string at {@code key}, or {@code 0} when {@code key} does not exist.
      */
-    Observable<Long> strlen(K key);
+    Single<Long> strlen(K key);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisTransactionalReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisTransactionalReactiveCommands.java
index 3cc1f8e776..5472ecff6d 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisTransactionalReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisTransactionalReactiveCommands.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 import rx.Observable;
+import rx.Single;
+import rx.Completable;
 
 /**
  * Observable commands for Transactions.
@@ -19,7 +21,7 @@ public interface RedisTransactionalReactiveCommands<K, V> {
      * 
      * @return String simple-string-reply always {@code OK}.
      */
-    Observable<String> discard();
+    Single<String> discard();
 
     /**
      * Execute all commands issued after MULTI.
@@ -35,7 +37,7 @@ public interface RedisTransactionalReactiveCommands<K, V> {
      *
      * @return String simple-string-reply always {@code OK}.
      */
-    Observable<String> multi();
+    Single<String> multi();
 
     /**
      * Watch the given keys to determine execution of the MULTI/EXEC block.
@@ -43,12 +45,12 @@ public interface RedisTransactionalReactiveCommands<K, V> {
      * @param keys the key
      * @return String simple-string-reply always {@code OK}.
      */
-    Observable<String> watch(K... keys);
+    Single<String> watch(K... keys);
 
     /**
      * Forget about all watched keys.
      *
      * @return String simple-string-reply always {@code OK}.
      */
-    Observable<String> unwatch();
+    Single<String> unwatch();
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java
index 991b9076c3..2151558aac 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java
@@ -5,14 +5,15 @@
 import java.util.List;
 import java.util.function.Function;
 
-import rx.Observable;
-import rx.functions.Func1;
-
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 import com.lambdaworks.redis.models.role.RedisNodeDescription;
 
+import rx.Observable;
+import rx.Single;
+import rx.functions.Func1;
+
 /**
  * Methods to support a Cluster-wide SCAN operation over multiple hosts.
  * 
@@ -53,34 +54,21 @@ public StreamScanCursor apply(StreamScanCursor result) {
     };
 
     /**
-     * Map a {@link Observable} of {@link KeyScanCursor} to a {@link Observable} of {@link ClusterKeyScanCursor}.
+     * Map a {@link Single} of {@link KeyScanCursor} to a {@link Observable} of {@link ClusterKeyScanCursor}.
      */
-    final static ScanCursorMapper<Observable<KeyScanCursor<?>>> reactiveKeyScanCursorMapper = new ScanCursorMapper<Observable<KeyScanCursor<?>>>() {
-        @Override
-        public Observable<KeyScanCursor<?>> map(List<String> nodeIds, String currentNodeId, Observable<KeyScanCursor<?>> cursor) {
-            return cursor.map(new Func1<KeyScanCursor<?>, KeyScanCursor<?>>() {
-                @Override
-                public KeyScanCursor<?> call(KeyScanCursor<?> keyScanCursor) {
-                    return new ClusterKeyScanCursor<>(nodeIds, currentNodeId, keyScanCursor);
-                }
-            });
-        }
-    };
+    final static ScanCursorMapper<Single<KeyScanCursor<?>>> reactiveKeyScanCursorMapper = (nodeIds, currentNodeId,
+            cursor) -> cursor.map(keyScanCursor -> new ClusterKeyScanCursor<>(nodeIds, currentNodeId, keyScanCursor));
 
     /**
-     * Map a {@link Observable} of {@link StreamScanCursor} to a {@link Observable} of {@link ClusterStreamScanCursor}.
+     * Map a {@link Single} of {@link StreamScanCursor} to a {@link Observable} of {@link ClusterStreamScanCursor}.
      */
-    final static ScanCursorMapper<Observable<StreamScanCursor>> reactiveStreamScanCursorMapper = new ScanCursorMapper<Observable<StreamScanCursor>>() {
-        @Override
-        public Observable<StreamScanCursor> map(List<String> nodeIds, String currentNodeId, Observable<StreamScanCursor> cursor) {
-            return cursor.map(new Func1<StreamScanCursor, StreamScanCursor>() {
+    final static ScanCursorMapper<Single<StreamScanCursor>> reactiveStreamScanCursorMapper = (nodeIds, currentNodeId,
+            cursor) -> cursor.map(new Func1<StreamScanCursor, StreamScanCursor>() {
                 @Override
                 public StreamScanCursor call(StreamScanCursor streamScanCursor) {
                     return new ClusterStreamScanCursor(nodeIds, currentNodeId, streamScanCursor);
                 }
             });
-        }
-    };
 
     /**
      * Retrieve the cursor to continue the scan.
@@ -202,11 +190,11 @@ static ScanCursorMapper<RedisFuture<StreamScanCursor>> asyncClusterStreamScanCur
         return futureStreamScanCursorMapper;
     }
 
-    static <K> ScanCursorMapper<Observable<KeyScanCursor<K>>> reactiveClusterKeyScanCursorMapper() {
+    static <K> ScanCursorMapper<Single<KeyScanCursor<K>>> reactiveClusterKeyScanCursorMapper() {
         return (ScanCursorMapper) reactiveKeyScanCursorMapper;
     }
 
-    static ScanCursorMapper<Observable<StreamScanCursor>> reactiveClusterStreamScanCursorMapper() {
+    static ScanCursorMapper<Single<StreamScanCursor>> reactiveClusterStreamScanCursorMapper() {
         return reactiveStreamScanCursorMapper;
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index 219487850a..f112c4f181 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -15,9 +15,6 @@
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.rx.RedisKeyReactiveCommands;
-import com.lambdaworks.redis.api.rx.RedisScriptingReactiveCommands;
-import com.lambdaworks.redis.api.rx.RedisServerReactiveCommands;
-import com.lambdaworks.redis.api.rx.Success;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.api.rx.RedisAdvancedClusterReactiveCommands;
 import com.lambdaworks.redis.cluster.api.rx.RedisClusterReactiveCommands;
@@ -27,7 +24,9 @@
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 
+import rx.Completable;
 import rx.Observable;
+import rx.Single;
 
 /**
  * An advanced reactive and thread-safe API to a Redis Cluster connection.
@@ -35,8 +34,8 @@
  * @author Mark Paluch
  * @since 4.0
  */
-public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedisReactiveCommands<K, V> implements
-        RedisAdvancedClusterReactiveCommands<K, V> {
+public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedisReactiveCommands<K, V>
+        implements RedisAdvancedClusterReactiveCommands<K, V> {
 
     private Random random = new Random();
 
@@ -46,17 +45,18 @@ public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedi
      * @param connection the stateful connection
      * @param codec Codec used to encode/decode keys and values.
      */
-    public RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnectionImpl<K, V> connection, RedisCodec<K, V> codec) {
+    public RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnectionImpl<K, V> connection,
+            RedisCodec<K, V> codec) {
         super(connection, codec);
     }
 
     @Override
-    public Observable<Long> del(K... keys) {
+    public Single<Long> del(K... keys) {
         return del(Arrays.asList(keys));
     }
 
     @Override
-    public Observable<Long> del(Iterable<K> keys) {
+    public Single<Long> del(Iterable<K> keys) {
 
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
 
@@ -67,19 +67,19 @@ public Observable<Long> del(Iterable<K> keys) {
         List<Observable<Long>> observables = new ArrayList<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            observables.add(super.del(entry.getValue()));
+            observables.add(super.del(entry.getValue()).toObservable());
         }
 
-        return Observable.merge(observables).reduce((accu, next) -> accu + next);
+        return Observable.merge(observables).reduce((accu, next) -> accu + next).last().toSingle();
     }
 
     @Override
-    public Observable<Long> unlink(K... keys) {
+    public Single<Long> unlink(K... keys) {
         return unlink(Arrays.asList(keys));
     }
 
     @Override
-    public Observable<Long> unlink(Iterable<K> keys) {
+    public Single<Long> unlink(Iterable<K> keys) {
 
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
 
@@ -90,32 +90,34 @@ public Observable<Long> unlink(Iterable<K> keys) {
         List<Observable<Long>> observables = new ArrayList<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            observables.add(super.unlink(entry.getValue()));
+            observables.add(super.unlink(entry.getValue()).toObservable());
         }
 
-        return Observable.merge(observables).reduce((accu, next) -> accu + next);
+        return Observable.merge(observables).reduce((accu, next) -> accu + next).last().toSingle();
     }
 
     @Override
-    public Observable<Long> exists(K... keys) {
+    public Single<Long> exists(K... keys) {
         return exists(Arrays.asList(keys));
     }
 
-    public Observable<Long> exists(Iterable<K> keys) {
+    public Single<Long> exists(Iterable<K> keys) {
 
-        Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
+        List<K> keyList = LettuceLists.newList(keys);
+
+        Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keyList);
 
         if (partitioned.size() < 2) {
-            return super.exists(keys);
+            return super.exists(keyList);
         }
 
         List<Observable<Long>> observables = new ArrayList<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            observables.add(super.exists(entry.getValue()));
+            observables.add(super.exists(entry.getValue()).toObservable());
         }
 
-        return Observable.merge(observables).reduce((accu, next) -> accu + next);
+        return Observable.merge(observables).reduce((accu, next) -> accu + next).toSingle();
     }
 
     @Override
@@ -166,13 +168,15 @@ public Observable<V> mget(Iterable<K> keys) {
     }
 
     @Override
-    public Observable<Long> mget(ValueStreamingChannel<V> channel, K... keys) {
+    public Single<Long> mget(ValueStreamingChannel<V> channel, K... keys) {
         return mget(channel, Arrays.asList(keys));
     }
 
-    public Observable<Long> mget(ValueStreamingChannel<V> channel, Iterable<K> keys) {
+    @Override
+    public Single<Long> mget(ValueStreamingChannel<V> channel, Iterable<K> keys) {
 
         List<K> keyList = LettuceLists.newList(keys);
+
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keyList);
 
         if (partitioned.size() < 2) {
@@ -182,22 +186,22 @@ public Observable<Long> mget(ValueStreamingChannel<V> channel, Iterable<K> keys)
         List<Observable<Long>> observables = new ArrayList<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            observables.add(super.mget(channel, entry.getValue()));
+            observables.add(super.mget(channel, entry.getValue()).toObservable());
         }
 
-        return Observable.merge(observables).reduce((accu, next) -> accu + next);
+        return Observable.merge(observables).reduce((accu, next) -> accu + next).last().toSingle();
     }
 
     @Override
-    public Observable<Boolean> msetnx(Map<K, V> map) {
+    public Single<Boolean> msetnx(Map<K, V> map) {
 
-        return pipeliningWithMap(map, kvMap -> super.msetnx(kvMap),
-                booleanObservable -> booleanObservable.reduce((accu, next) -> accu || next));
+        return pipeliningWithMap(map, kvMap -> super.msetnx(kvMap).toObservable(),
+                booleanObservable -> booleanObservable.reduce((accu, next) -> accu || next)).last().toSingle();
     }
 
     @Override
-    public Observable<String> mset(Map<K, V> map) {
-        return pipeliningWithMap(map, kvMap -> super.mset(kvMap), Observable::last);
+    public Single<String> mset(Map<K, V> map) {
+        return pipeliningWithMap(map, kvMap -> super.mset(kvMap).toObservable(), Observable::last).last().toSingle();
     }
 
     @Override
@@ -212,7 +216,7 @@ public Observable<K> clusterGetKeysInSlot(int slot, int count) {
     }
 
     @Override
-    public Observable<Long> clusterCountKeysInSlot(int slot) {
+    public Single<Long> clusterCountKeysInSlot(int slot) {
         RedisClusterReactiveCommands<K, V> connectionBySlot = findConnectionBySlot(slot);
 
         if (connectionBySlot != null) {
@@ -223,41 +227,42 @@ public Observable<Long> clusterCountKeysInSlot(int slot) {
     }
 
     @Override
-    public Observable<String> clientSetname(K name) {
+    public Single<String> clientSetname(K name) {
         List<Observable<String>> observables = new ArrayList<>();
 
         for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
             StatefulRedisConnection<K, V> byNodeId = getStatefulConnection().getConnection(redisClusterNode.getNodeId());
             if (byNodeId.isOpen()) {
-                observables.add(byNodeId.reactive().clientSetname(name));
+                observables.add(byNodeId.reactive().clientSetname(name).toObservable());
             }
 
-            StatefulRedisConnection<K, V> byHost = getStatefulConnection().getConnection(redisClusterNode.getUri().getHost(), redisClusterNode
-                    .getUri().getPort());
+            StatefulRedisConnection<K, V> byHost = getStatefulConnection().getConnection(redisClusterNode.getUri().getHost(),
+                    redisClusterNode.getUri().getPort());
             if (byHost.isOpen()) {
-                observables.add(byHost.reactive().clientSetname(name));
+                observables.add(byHost.reactive().clientSetname(name).toObservable());
             }
         }
 
-        return Observable.merge(observables).last();
+        return Observable.merge(observables).last().last().toSingle();
     }
 
     @Override
-    public Observable<Long> dbsize() {
-        Map<String, Observable<Long>> observables = executeOnMasters(RedisServerReactiveCommands::dbsize);
-        return Observable.merge(observables.values()).reduce((accu, next) -> accu + next);
+    public Single<Long> dbsize() {
+        Map<String, Observable<Long>> observables = executeOnMasters((commands) -> commands.dbsize().toObservable());
+        return Observable.merge(observables.values()).reduce((accu, next) -> accu + next).toSingle();
     }
 
     @Override
-    public Observable<String> flushall() {
-        Map<String, Observable<String>> observables = executeOnMasters(RedisServerReactiveCommands::flushall);
-        return Observable.merge(observables.values()).last();
+    public Single<String> flushall() {
+        Map<String, Observable<String>> observables = executeOnMasters(
+                (kvRedisClusterReactiveCommancommandss) -> kvRedisClusterReactiveCommancommandss.flushall().toObservable());
+        return Observable.merge(observables.values()).last().last().toSingle();
     }
 
     @Override
-    public Observable<String> flushdb() {
-        Map<String, Observable<String>> observables = executeOnMasters(RedisServerReactiveCommands::flushdb);
-        return Observable.merge(observables.values()).last();
+    public Single<String> flushdb() {
+        Map<String, Observable<String>> observables = executeOnMasters((commands) -> commands.flushdb().toObservable());
+        return Observable.merge(observables.values()).last().last().toSingle();
     }
 
     @Override
@@ -267,13 +272,14 @@ public Observable<K> keys(K pattern) {
     }
 
     @Override
-    public Observable<Long> keys(KeyStreamingChannel<K> channel, K pattern) {
-        Map<String, Observable<Long>> observables = executeOnMasters(commands -> commands.keys(channel, pattern));
-        return Observable.merge(observables.values()).reduce((accu, next) -> accu + next);
+    public Single<Long> keys(KeyStreamingChannel<K> channel, K pattern) {
+        Map<String, Observable<Long>> observables = executeOnMasters(
+                commands -> commands.keys(channel, pattern).toObservable());
+        return Observable.merge(observables.values()).reduce((accu, next) -> accu + next).last().toSingle();
     }
 
     @Override
-    public Observable<V> randomkey() {
+    public Single<V> randomkey() {
 
         Partitions partitions = getStatefulConnection().getPartitions();
         int index = random.nextInt(partitions.size());
@@ -283,32 +289,32 @@ public Observable<V> randomkey() {
     }
 
     @Override
-    public Observable<String> scriptFlush() {
-        Map<String, Observable<String>> observables = executeOnNodes(RedisScriptingReactiveCommands::scriptFlush,
+    public Single<String> scriptFlush() {
+        Map<String, Observable<String>> observables = executeOnNodes((commands) -> commands.scriptFlush().toObservable(),
                 redisClusterNode -> true);
-        return Observable.merge(observables.values()).last();
+        return Observable.merge(observables.values()).last().last().toSingle();
     }
 
     @Override
-    public Observable<String> scriptKill() {
-        Map<String, Observable<String>> observables = executeOnNodes(RedisScriptingReactiveCommands::scriptFlush,
+    public Single<String> scriptKill() {
+        Map<String, Observable<String>> observables = executeOnNodes((commands) -> commands.scriptFlush().toObservable(),
                 redisClusterNode -> true);
-        return Observable.merge(observables.values()).onErrorReturn(throwable -> "OK").last();
+        return Observable.merge(observables.values()).onErrorReturn(throwable -> "OK").last().toSingle();
     }
 
     @Override
-    public Observable<Success> shutdown(boolean save) {
-        Map<String, Observable<Success>> observables = executeOnNodes(commands -> commands.shutdown(save),
+    public Completable shutdown(boolean save) {
+        Map<String, Observable<Boolean>> observables = executeOnNodes(commands -> commands.shutdown(save).toObservable(),
                 redisClusterNode -> true);
-        return Observable.merge(observables.values()).onErrorReturn(throwable -> null).last();
+        return Completable.fromObservable(Observable.merge(observables.values()).onErrorReturn(throwable -> null).last());
     }
 
     @Override
-    public Observable<Long> touch(K... keys) {
+    public Single<Long> touch(K... keys) {
         return touch(Arrays.asList(keys));
     }
 
-    public Observable<Long> touch(Iterable<K> keys) {
+    public Single<Long> touch(Iterable<K> keys) {
 
         List<K> keyList = LettuceLists.newList(keys);
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keyList);
@@ -320,10 +326,10 @@ public Observable<Long> touch(Iterable<K> keys) {
         List<Observable<Long>> observables = new ArrayList<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            observables.add(super.touch(entry.getValue()));
+            observables.add(super.touch(entry.getValue()).toObservable());
         }
 
-        return Observable.merge(observables).reduce((accu, next) -> accu + next);
+        return Observable.merge(observables).reduce((accu, next) -> accu + next).toSingle();
     }
 
     /**
@@ -390,54 +396,54 @@ public RedisClusterReactiveCommands<K, V> getConnection(String host, int port) {
     }
 
     @Override
-    public Observable<KeyScanCursor<K>> scan() {
+    public Single<KeyScanCursor<K>> scan() {
         return clusterScan(ScanCursor.INITIAL, (connection, cursor) -> connection.scan(), reactiveClusterKeyScanCursorMapper());
     }
 
     @Override
-    public Observable<KeyScanCursor<K>> scan(ScanArgs scanArgs) {
+    public Single<KeyScanCursor<K>> scan(ScanArgs scanArgs) {
         return clusterScan(ScanCursor.INITIAL, (connection, cursor) -> connection.scan(scanArgs),
                 reactiveClusterKeyScanCursorMapper());
     }
 
     @Override
-    public Observable<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs) {
+    public Single<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs) {
         return clusterScan(scanCursor, (connection, cursor) -> connection.scan(cursor, scanArgs),
                 reactiveClusterKeyScanCursorMapper());
     }
 
     @Override
-    public Observable<KeyScanCursor<K>> scan(ScanCursor scanCursor) {
+    public Single<KeyScanCursor<K>> scan(ScanCursor scanCursor) {
         return clusterScan(scanCursor, (connection, cursor) -> connection.scan(cursor), reactiveClusterKeyScanCursorMapper());
     }
 
     @Override
-    public Observable<StreamScanCursor> scan(KeyStreamingChannel<K> channel) {
+    public Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel) {
         return clusterScan(ScanCursor.INITIAL, (connection, cursor) -> connection.scan(channel),
                 reactiveClusterStreamScanCursorMapper());
     }
 
     @Override
-    public Observable<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs) {
+    public Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs) {
         return clusterScan(ScanCursor.INITIAL, (connection, cursor) -> connection.scan(channel, scanArgs),
                 reactiveClusterStreamScanCursorMapper());
     }
 
     @Override
-    public Observable<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs) {
+    public Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs) {
         return clusterScan(scanCursor, (connection, cursor) -> connection.scan(channel, cursor, scanArgs),
                 reactiveClusterStreamScanCursorMapper());
     }
 
     @Override
-    public Observable<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor) {
+    public Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor) {
         return clusterScan(scanCursor, (connection, cursor) -> connection.scan(channel, cursor),
                 reactiveClusterStreamScanCursorMapper());
     }
 
-    private <T extends ScanCursor> Observable<T> clusterScan(ScanCursor cursor,
-            BiFunction<RedisKeyReactiveCommands<K, V>, ScanCursor, Observable<T>> scanFunction,
-            ClusterScanSupport.ScanCursorMapper<Observable<T>> resultMapper) {
+    private <T extends ScanCursor> Single<T> clusterScan(ScanCursor cursor,
+            BiFunction<RedisKeyReactiveCommands<K, V>, ScanCursor, Single<T>> scanFunction,
+            ClusterScanSupport.ScanCursorMapper<Single<T>> resultMapper) {
 
         return clusterScan(getStatefulConnection(), cursor, scanFunction, (ClusterScanSupport.ScanCursorMapper) resultMapper);
     }
@@ -446,15 +452,15 @@ private <T extends ScanCursor> Observable<T> clusterScan(ScanCursor cursor,
      * Perform a SCAN in the cluster.
      * 
      */
-    static <T extends ScanCursor, K, V> Observable<T> clusterScan(StatefulRedisClusterConnection<K, V> connection,
-            ScanCursor cursor, BiFunction<RedisKeyReactiveCommands<K, V>, ScanCursor, Observable<T>> scanFunction,
-            ClusterScanSupport.ScanCursorMapper<Observable<T>> mapper) {
+    static <T extends ScanCursor, K, V> Single<T> clusterScan(StatefulRedisClusterConnection<K, V> connection,
+            ScanCursor cursor, BiFunction<RedisKeyReactiveCommands<K, V>, ScanCursor, Single<T>> scanFunction,
+            ClusterScanSupport.ScanCursorMapper<Single<T>> mapper) {
 
         List<String> nodeIds = ClusterScanSupport.getNodeIds(connection, cursor);
         String currentNodeId = ClusterScanSupport.getCurrentNodeId(cursor, nodeIds);
         ScanCursor continuationCursor = ClusterScanSupport.getContinuationCursor(cursor);
 
-        Observable<T> scanCursor = scanFunction.apply(connection.getConnection(currentNodeId).reactive(), continuationCursor);
+        Single<T> scanCursor = scanFunction.apply(connection.getConnection(currentNodeId).reactive(), continuationCursor);
         return mapper.map(nodeIds, currentNodeId, scanCursor);
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisAdvancedClusterReactiveCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisAdvancedClusterReactiveCommands.java
index 9e038feae3..c4d571c884 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisAdvancedClusterReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisAdvancedClusterReactiveCommands.java
@@ -8,7 +8,9 @@
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 
+import rx.Completable;
 import rx.Observable;
+import rx.Single;
 
 /**
  * Advanced reactive and thread-safe Redis Cluster API.
@@ -52,7 +54,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return Long integer-reply The number of keys that were removed.
      * @see RedisKeyReactiveCommands#del(Object[])
      */
-    Observable<Long> del(K... keys);
+    Single<Long> del(K... keys);
 
     /**
      * Unlink one or more keys with pipelining. Cross-slot keys will result in multiple calls to the particular cluster nodes.
@@ -61,7 +63,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return Long integer-reply The number of keys that were removed.
      * @see RedisKeyReactiveCommands#unlink(Object[])
      */
-    Observable<Long> unlink(K... keys);
+    Single<Long> unlink(K... keys);
 
     /**
      * Determine how many keys exist with pipelining. Cross-slot keys will result in multiple calls to the particular cluster nodes.
@@ -69,7 +71,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @param keys the keys
      * @return Long integer-reply specifically: Number of existing keys
      */
-    Observable<Long> exists(K... keys);
+    Single<Long> exists(K... keys);
 
     /**
      * Get the values of all the given keys with pipelining. Cross-slot keys will result in multiple calls to the particular
@@ -89,7 +91,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail.
      * @see RedisStringReactiveCommands#mset(Map)
      */
-    Observable<String> mset(Map<K, V> map);
+    Single<String> mset(Map<K, V> map);
 
     /**
      * Set multiple keys to multiple values, only if none of the keys exist with pipelining. Cross-slot keys will result in
@@ -102,7 +104,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      *
      * @see RedisStringReactiveCommands#msetnx(Map)
      */
-    Observable<Boolean> msetnx(Map<K, V> map);
+    Single<Boolean> msetnx(Map<K, V> map);
 
     /**
      * Set the current connection name on all cluster nodes with pipelining.
@@ -111,7 +113,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return simple-string-reply {@code OK} if the connection name was successfully set.
      * @see RedisServerReactiveCommands#clientSetname(Object)
      */
-    Observable<String> clientSetname(K name);
+    Single<String> clientSetname(K name);
 
     /**
      * Remove all keys from all databases on all cluster masters with pipelining.
@@ -119,7 +121,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return String simple-string-reply
      * @see RedisServerReactiveCommands#flushall()
      */
-    Observable<String> flushall();
+    Single<String> flushall();
 
     /**
      * Remove all keys from the current database on all cluster masters with pipelining.
@@ -127,7 +129,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return String simple-string-reply
      * @see RedisServerReactiveCommands#flushdb()
      */
-    Observable<String> flushdb();
+    Single<String> flushdb();
 
     /**
      * Return the number of keys in the selected database on all cluster masters.
@@ -135,7 +137,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return Long integer-reply
      * @see RedisServerReactiveCommands#dbsize()
      */
-    Observable<Long> dbsize();
+    Single<Long> dbsize();
 
     /**
      * Find all keys matching the given pattern on all cluster masters.
@@ -154,7 +156,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return Long array-reply list of keys matching {@code pattern}.
      * @see RedisKeyReactiveCommands#keys(KeyStreamingChannel, Object)
      */
-    Observable<Long> keys(KeyStreamingChannel<K> channel, K pattern);
+    Single<Long> keys(KeyStreamingChannel<K> channel, K pattern);
 
     /**
      * Return a random key from the keyspace on a random master.
@@ -162,7 +164,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
      * @see RedisKeyReactiveCommands#randomkey()
      */
-    Observable<V> randomkey();
+    Single<V> randomkey();
 
     /**
      * Remove all the scripts from the script cache on all cluster nodes.
@@ -170,7 +172,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return String simple-string-reply
      * @see RedisScriptingReactiveCommands#scriptFlush()
      */
-    Observable<String> scriptFlush();
+    Single<String> scriptFlush();
 
     /**
      * Kill the script currently in execution on all cluster nodes. This call does not fail even if no scripts are running.
@@ -178,7 +180,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return String simple-string-reply, always {@literal OK}.
      * @see RedisScriptingReactiveCommands#scriptKill()
      */
-    Observable<String> scriptKill();
+    Single<String> scriptKill();
 
     /**
      * Synchronously save the dataset to disk and then shut down all nodes of the cluster.
@@ -186,7 +188,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @param save {@literal true} force save operation
      * @see RedisServerReactiveCommands#shutdown(boolean)
      */
-    Observable<Success> shutdown(boolean save);
+    Completable shutdown(boolean save);
 
     /**
      * Incrementally iterate the keys space over the whole Cluster.
@@ -194,7 +196,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      * @see RedisKeyReactiveCommands#scan(ScanArgs)
      */
-    Observable<KeyScanCursor<K>> scan();
+    Single<KeyScanCursor<K>> scan();
 
     /**
      * Incrementally iterate the keys space over the whole Cluster.
@@ -203,7 +205,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      * @see RedisKeyReactiveCommands#scan(ScanArgs)
      */
-    Observable<KeyScanCursor<K>> scan(ScanArgs scanArgs);
+    Single<KeyScanCursor<K>> scan(ScanArgs scanArgs);
 
     /**
      * Incrementally iterate the keys space over the whole Cluster.
@@ -214,7 +216,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      * @see RedisKeyReactiveCommands#scan(ScanCursor, ScanArgs)
      */
-    Observable<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs);
+    Single<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate the keys space over the whole Cluster.
@@ -224,7 +226,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      * @see RedisKeyReactiveCommands#scan(ScanCursor)
      */
-    Observable<KeyScanCursor<K>> scan(ScanCursor scanCursor);
+    Single<KeyScanCursor<K>> scan(ScanCursor scanCursor);
 
     /**
      * Incrementally iterate the keys space over the whole Cluster.
@@ -233,7 +235,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return StreamScanCursor scan cursor.
      * @see RedisKeyReactiveCommands#scan(KeyStreamingChannel)
      */
-    Observable<StreamScanCursor> scan(KeyStreamingChannel<K> channel);
+    Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel);
 
     /**
      * Incrementally iterate the keys space over the whole Cluster.
@@ -243,7 +245,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return StreamScanCursor scan cursor.
      * @see RedisKeyReactiveCommands#scan(KeyStreamingChannel, ScanArgs)
      */
-    Observable<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs);
+    Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate the keys space over the whole Cluster.
@@ -255,7 +257,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return StreamScanCursor scan cursor.
      * @see RedisKeyReactiveCommands#scan(KeyStreamingChannel, ScanCursor, ScanArgs)
      */
-    Observable<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs);
+    Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate the keys space over the whole Cluster.
@@ -266,7 +268,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return StreamScanCursor scan cursor.
      * @see RedisKeyReactiveCommands#scan(ScanCursor, ScanArgs)
      */
-    Observable<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor);
+    Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor);
 
     /**
      * Touch one or more keys with pipelining. Touch sets the last accessed time for a key. Non-exsitent keys wont get created.
@@ -275,6 +277,6 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @param keys the keys
      * @return Long integer-reply the number of found keys.
      */
-    Observable<Long> touch(K... keys);
+    Single<Long> touch(K... keys);
 
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java
index 68b7d483ce..4a209ce319 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java
@@ -6,6 +6,7 @@
 import rx.Observable;
 
 import com.lambdaworks.redis.api.rx.*;
+import rx.Single;
 
 /**
  * A complete reactive and thread-safe cluster Redis API with 400+ Methods.
@@ -34,7 +35,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param password the password
      * @return String simple-string-reply
      */
-    Observable<String> auth(String password);
+    Single<String> auth(String password);
 
     /**
      * Generate a new config epoch, incrementing the current epoch, assign the new epoch to this node, WITHOUT any consensus and
@@ -43,7 +44,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @return String simple-string-reply If the new config epoch is generated and assigned either BUMPED (epoch) or STILL
      *         (epoch) are returned.
      */
-    Observable<String> clusterBumpepoch();
+    Single<String> clusterBumpepoch();
 
     /**
      * Meet another cluster node to include the node into the cluster. The command starts the cluster handshake and returns with
@@ -53,7 +54,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param port port number.
      * @return String simple-string-reply
      */
-    Observable<String> clusterMeet(String ip, int port);
+    Single<String> clusterMeet(String ip, int port);
 
     /**
      * Blacklist and remove the cluster node from the cluster.
@@ -61,7 +62,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param nodeId the node Id
      * @return String simple-string-reply
      */
-    Observable<String> clusterForget(String nodeId);
+    Single<String> clusterForget(String nodeId);
 
     /**
      * Adds slots to the cluster node. The current node will become the master for the specified slots.
@@ -69,7 +70,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param slots one or more slots from {@literal 0} to {@literal 16384}
      * @return String simple-string-reply
      */
-    Observable<String> clusterAddSlots(int... slots);
+    Single<String> clusterAddSlots(int... slots);
 
     /**
      * Removes slots from the cluster node.
@@ -77,7 +78,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param slots one or more slots from {@literal 0} to {@literal 16384}
      * @return String simple-string-reply
      */
-    Observable<String> clusterDelSlots(int... slots);
+    Single<String> clusterDelSlots(int... slots);
 
     /**
      * Assign a slot to a node. The command migrates the specified slot from the current node to the specified node in
@@ -87,7 +88,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param nodeId the id of the node that will become the master for the slot
      * @return String simple-string-reply
      */
-    Observable<String> clusterSetSlotNode(int slot, String nodeId);
+    Single<String> clusterSetSlotNode(int slot, String nodeId);
 
     /**
      * Clears migrating / importing state from the slot.
@@ -95,7 +96,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param slot the slot
      * @return String simple-string-reply
      */
-    Observable<String> clusterSetSlotStable(int slot);
+    Single<String> clusterSetSlotStable(int slot);
 
     /**
      * Flag a slot as {@literal MIGRATING} (outgoing) towards the node specified in {@code nodeId}. The slot must be handled by
@@ -105,7 +106,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param nodeId the id of the node is targeted to become the master for the slot
      * @return String simple-string-reply
      */
-    Observable<String> clusterSetSlotMigrating(int slot, String nodeId);
+    Single<String> clusterSetSlotMigrating(int slot, String nodeId);
 
     /**
      * Flag a slot as {@literal IMPORTING} (incoming) from the node specified in {@code nodeId}.
@@ -114,21 +115,21 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param nodeId the id of the node is the master of the slot
      * @return String simple-string-reply
      */
-    Observable<String> clusterSetSlotImporting(int slot, String nodeId);
+    Single<String> clusterSetSlotImporting(int slot, String nodeId);
 
     /**
      * Get information and statistics about the cluster viewed by the current node.
      *
      * @return String bulk-string-reply as a collection of text lines.
      */
-    Observable<String> clusterInfo();
+    Single<String> clusterInfo();
 
     /**
      * Obtain the nodeId for the currently connected node.
      *
      * @return String simple-string-reply
      */
-    Observable<String> clusterMyId();
+    Single<String> clusterMyId();
 
     /**
      * Obtain details about all cluster nodes. Can be parsed using
@@ -136,7 +137,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      *
      * @return String bulk-string-reply as a collection of text lines
      */
-    Observable<String> clusterNodes();
+    Single<String> clusterNodes();
 
     /**
      * List slaves for a certain node identified by its {@code nodeId}. Can be parsed using
@@ -163,7 +164,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param slot the slot
      * @return Integer reply: The number of keys in the specified hash slot, or an error if the hash slot is invalid.
      */
-    Observable<Long> clusterCountKeysInSlot(int slot);
+    Single<Long> clusterCountKeysInSlot(int slot);
 
     /**
      * Returns the number of failure reports for the specified node. Failure reports are the way Redis Cluster uses in order to
@@ -173,7 +174,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param nodeId the node id
      * @return Integer reply: The number of active failure reports for the node.
      */
-    Observable<Long> clusterCountFailureReports(String nodeId);
+    Single<Long> clusterCountFailureReports(String nodeId);
 
     /**
      * Returns an integer identifying the hash slot the specified key hashes to. This command is mainly useful for debugging and
@@ -183,14 +184,14 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param key the key.
      * @return Integer reply: The hash slot number.
      */
-    Observable<Long> clusterKeyslot(K key);
+    Single<Long> clusterKeyslot(K key);
 
     /**
      * Forces a node to save the nodes.conf configuration on disk.
      *
      * @return String simple-string-reply: {@code OK} or an error if the operation fails.
      */
-    Observable<String> clusterSaveconfig();
+    Single<String> clusterSaveconfig();
 
     /**
      * This command sets a specific config epoch in a fresh node. It only works when:
@@ -202,7 +203,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param configEpoch the config epoch
      * @return String simple-string-reply: {@code OK} or an error if the operation fails.
      */
-    Observable<String> clusterSetConfigEpoch(long configEpoch);
+    Single<String> clusterSetConfigEpoch(long configEpoch);
 
     /**
      * Get array of cluster slots to node mappings.
@@ -217,7 +218,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      *
      * @return String simple-string-reply
      */
-    Observable<String> asking();
+    Single<String> asking();
 
     /**
      * Turn this node into a slave of the node with the id {@code nodeId}.
@@ -225,7 +226,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param nodeId master node id
      * @return String simple-string-reply
      */
-    Observable<String> clusterReplicate(String nodeId);
+    Single<String> clusterReplicate(String nodeId);
 
     /**
      * Failover a cluster node. Turns the currently connected node into a master and the master into its slave.
@@ -233,7 +234,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param force do not coordinate with master if {@literal true}
      * @return String simple-string-reply
      */
-    Observable<String> clusterFailover(boolean force);
+    Single<String> clusterFailover(boolean force);
 
     /**
      * Reset a node performing a soft or hard reset:
@@ -250,14 +251,14 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param hard {@literal true} for hard reset. Generates a new nodeId and currentEpoch/configEpoch are set to 0
      * @return String simple-string-reply
      */
-    Observable<String> clusterReset(boolean hard);
+    Single<String> clusterReset(boolean hard);
 
     /**
      * Delete all the slots associated with the specified node. The number of deleted slots is returned.
      *
      * @return String simple-string-reply
      */
-    Observable<String> clusterFlushslots();
+    Single<String> clusterFlushslots();
 
     /**
      * Tells a Redis cluster slave node that the client is ok reading possibly stale data and is not interested in running write
@@ -265,14 +266,14 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      *
      * @return String simple-string-reply
      */
-    Observable<String> readOnly();
+    Single<String> readOnly();
 
     /**
      * Resets readOnly flag.
      *
      * @return String simple-string-reply
      */
-    Observable<String> readWrite();
+    Single<String> readWrite();
 
     /**
      * Delete a key with pipelining. Cross-slot keys will result in multiple calls to the particular cluster nodes.
@@ -280,7 +281,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param keys the key
      * @return Observable&lt;Long&gt; integer-reply The number of keys that were removed.
      */
-    Observable<Long> del(K... keys);
+    Single<Long> del(K... keys);
 
     /**
      * Get the values of all the given keys with pipelining. Cross-slot keys will result in multiple calls to the particular
@@ -298,7 +299,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param map the null
      * @return Observable&lt;String&gt; simple-string-reply always {@code OK} since {@code MSET} can't fail.
      */
-    Observable<String> mset(Map<K, V> map);
+    Single<String> mset(Map<K, V> map);
 
     /**
      * Set multiple keys to multiple values, only if none of the keys exist with pipelining. Cross-slot keys will result in
@@ -309,5 +310,5 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      *
      *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
      */
-    Observable<Boolean> msetnx(Map<K, V> map);
+    Single<Boolean> msetnx(Map<K, V> map);
 }
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java b/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
index f20c72e57b..64f58ce217 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
@@ -210,7 +210,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
             try {
                 command.complete();
             } catch (Exception e) {
-                logger.warn("{} Unexpected exception during command completion: {}", logPrefix, e.toString(), e);
+                logger.warn("{} Unexpected exception during request: {}", logPrefix, e.toString(), e);
             }
 
             if (buffer.refCnt() != 0) {
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
index e6b89ced0d..afc9b50b5b 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
@@ -3,7 +3,9 @@
 import static com.lambdaworks.redis.protocol.CommandType.*;
 
 import com.lambdaworks.redis.protocol.Command;
+import rx.Completable;
 import rx.Observable;
+import rx.Single;
 import rx.Subscriber;
 
 import com.lambdaworks.redis.RedisReactiveCommandsImpl;
@@ -109,28 +111,28 @@ public void removeListener(RedisPubSubListener<K, V> listener) {
     }
 
     @Override
-    public Observable<Success> psubscribe(K... patterns) {
-        return getSuccessObservable(createObservable(() -> commandBuilder.psubscribe(patterns)));
+    public Completable psubscribe(K... patterns) {
+        return Completable.fromObservable(createObservable(() -> commandBuilder.psubscribe(patterns)));
     }
 
     @Override
-    public Observable<Success> punsubscribe(K... patterns) {
-        return getSuccessObservable(createObservable(() -> commandBuilder.punsubscribe(patterns)));
+    public Completable punsubscribe(K... patterns) {
+        return Completable.fromObservable(createObservable(() -> commandBuilder.punsubscribe(patterns)));
     }
 
     @Override
-    public Observable<Success> subscribe(K... channels) {
-        return getSuccessObservable(createObservable(() -> commandBuilder.subscribe(channels)));
+    public Completable subscribe(K... channels) {
+        return Completable.fromObservable(createObservable(() -> commandBuilder.subscribe(channels)));
     }
 
     @Override
-    public Observable<Success> unsubscribe(K... channels) {
-        return getSuccessObservable(createObservable(() -> commandBuilder.unsubscribe(channels)));
+    public Completable unsubscribe(K... channels) {
+        return Completable.fromObservable(createObservable(() -> commandBuilder.unsubscribe(channels)));
     }
 
     @Override
-    public Observable<Long> publish(K channel, V message) {
-        return createObservable(() -> commandBuilder.publish(channel, message));
+    public Single<Long> publish(K channel, V message) {
+        return createSingle(() -> commandBuilder.publish(channel, message));
     }
 
     @Override
@@ -139,8 +141,8 @@ public Observable<K> pubsubChannels(K channel) {
     }
 
     @Override
-    public Observable<Map<K, Long>> pubsubNumsub(K... channels) {
-        return createObservable(() -> commandBuilder.pubsubNumsub(channels));
+    public Single<Map<K, Long>> pubsubNumsub(K... channels) {
+        return createSingle(() -> commandBuilder.pubsubNumsub(channels));
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/rx/RedisPubSubReactiveCommands.java b/src/main/java/com/lambdaworks/redis/pubsub/api/rx/RedisPubSubReactiveCommands.java
index 80866821f8..1d67dee71a 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/rx/RedisPubSubReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/rx/RedisPubSubReactiveCommands.java
@@ -1,6 +1,7 @@
 package com.lambdaworks.redis.pubsub.api.rx;
 
 import com.lambdaworks.redis.api.rx.Success;
+import rx.Completable;
 import rx.Observable;
 
 import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
@@ -53,7 +54,7 @@ public interface RedisPubSubReactiveCommands<K, V> extends RedisReactiveCommands
      * @param patterns the patterns
      * @return Observable&lt;Success&gt; Observable for {@code psubscribe} command
      */
-    Observable<Success> psubscribe(K... patterns);
+    Completable psubscribe(K... patterns);
 
     /**
      * Stop listening for messages posted to channels matching the given patterns.
@@ -61,7 +62,7 @@ public interface RedisPubSubReactiveCommands<K, V> extends RedisReactiveCommands
      * @param patterns the patterns
      * @return Observable&lt;Success&gt; Observable for {@code punsubscribe} command
      */
-    Observable<Success> punsubscribe(K... patterns);
+    Completable punsubscribe(K... patterns);
 
     /**
      * Listen for messages published to the given channels.
@@ -69,7 +70,7 @@ public interface RedisPubSubReactiveCommands<K, V> extends RedisReactiveCommands
      * @param channels the channels
      * @return Observable&lt;Success&gt; Observable for {@code subscribe} command
      */
-    Observable<Success> subscribe(K... channels);
+    Completable subscribe(K... channels);
 
     /**
      * Stop listening for messages posted to the given channels.
@@ -77,7 +78,7 @@ public interface RedisPubSubReactiveCommands<K, V> extends RedisReactiveCommands
      * @param channels the channels
      * @return Observable&lt;Success&gt; Observable for {@code unsubscribe} command.
      */
-    Observable<Success> unsubscribe(K... channels);
+    Completable unsubscribe(K... channels);
 
     /**
      * @return the underlying connection.
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
index 6f70f3de72..fc1335f4b0 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
@@ -5,8 +5,6 @@
 import java.util.Map;
 import java.util.function.Supplier;
 
-import rx.Observable;
-
 import com.lambdaworks.redis.ReactiveCommandDispatcher;
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.codec.RedisCodec;
@@ -15,6 +13,9 @@
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
 import com.lambdaworks.redis.sentinel.api.rx.RedisSentinelReactiveCommands;
 
+import rx.Observable;
+import rx.Single;
+
 /**
  * A reactive and thread-safe API for a Redis Sentinel connection.
  *
@@ -34,7 +35,7 @@ public RedisSentinelReactiveCommandsImpl(StatefulConnection<K, V> connection, Re
     }
 
     @Override
-    public Observable<SocketAddress> getMasterAddrByName(K key) {
+    public Single<SocketAddress> getMasterAddrByName(K key) {
 
         Observable<V> observable = createDissolvingObservable(() -> commandBuilder.getMasterAddrByKey(key));
         return observable.buffer(2).map(list -> {
@@ -46,7 +47,7 @@ public Observable<SocketAddress> getMasterAddrByName(K key) {
             String hostname = (String) list.get(0);
             String port = (String) list.get(1);
             return new InetSocketAddress(hostname, Integer.parseInt(port));
-        });
+        }).lastOrDefault(null).cast(SocketAddress.class).toSingle();
     }
 
     @Override
@@ -55,8 +56,8 @@ public Observable<Map<K, V>> masters() {
     }
 
     @Override
-    public Observable<Map<K, V>> master(K key) {
-        return createObservable(() -> commandBuilder.master(key));
+    public Single<Map<K, V>> master(K key) {
+        return createSingle(() -> commandBuilder.master(key));
     }
 
     @Override
@@ -65,41 +66,41 @@ public Observable<Map<K, V>> slaves(K key) {
     }
 
     @Override
-    public Observable<Long> reset(K key) {
-        return createObservable(() -> commandBuilder.reset(key));
+    public Single<Long> reset(K key) {
+        return createSingle(() -> commandBuilder.reset(key));
     }
 
     @Override
-    public Observable<String> failover(K key) {
-        return createObservable(() -> commandBuilder.failover(key));
+    public Single<String> failover(K key) {
+        return createSingle(() -> commandBuilder.failover(key));
     }
 
     @Override
-    public Observable<String> monitor(K key, String ip, int port, int quorum) {
-        return createObservable(() -> commandBuilder.monitor(key, ip, port, quorum));
+    public Single<String> monitor(K key, String ip, int port, int quorum) {
+        return createSingle(() -> commandBuilder.monitor(key, ip, port, quorum));
     }
 
     @Override
-    public Observable<String> set(K key, String option, V value) {
-        return createObservable(() -> commandBuilder.set(key, option, value));
+    public Single<String> set(K key, String option, V value) {
+        return createSingle(() -> commandBuilder.set(key, option, value));
     }
 
     @Override
-    public Observable<String> remove(K key) {
-        return createObservable(() -> commandBuilder.remove(key));
+    public Single<String> remove(K key) {
+        return createSingle(() -> commandBuilder.remove(key));
     }
 
     @Override
-    public Observable<String> ping() {
-        return createObservable(() -> commandBuilder.ping());
+    public Single<String> ping() {
+        return createSingle(() -> commandBuilder.ping());
     }
 
-    //@Override
+    // @Override
     public void close() {
         connection.close();
     }
 
-    //@Override
+    // @Override
     public boolean isOpen() {
         return connection.isOpen();
     }
@@ -110,11 +111,17 @@ public StatefulRedisSentinelConnection<K, V> getStatefulConnection() {
     }
 
     public <T> Observable<T> createObservable(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return Observable.create(new ReactiveCommandDispatcher<K, V, T>(commandSupplier, connection, false));
+        return Observable
+                .create(new ReactiveCommandDispatcher<K, V, T>(commandSupplier, connection, false).getObservableSubscriber());
+    }
+
+    public <T> Single<T> createSingle(Supplier<RedisCommand<K, V, T>> commandSupplier) {
+        return Single.create(new ReactiveCommandDispatcher<K, V, T>(commandSupplier, connection, false).getSingleSubscriber());
     }
 
     @SuppressWarnings("unchecked")
     public <T, R> R createDissolvingObservable(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return (R) Observable.create(new ReactiveCommandDispatcher<>(commandSupplier, connection, true));
+        return (R) Observable
+                .create(new ReactiveCommandDispatcher<>(commandSupplier, connection, true).getObservableSubscriber());
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/rx/RedisSentinelReactiveCommands.java b/src/main/java/com/lambdaworks/redis/sentinel/api/rx/RedisSentinelReactiveCommands.java
index 74add9e9ef..2bfc480db9 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/rx/RedisSentinelReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/rx/RedisSentinelReactiveCommands.java
@@ -5,6 +5,8 @@
 import java.util.Map;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
 import rx.Observable;
+import rx.Single;
+import rx.Completable;
 
 /**
  * Observable commands for Redis Sentinel.
@@ -23,7 +25,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
      * @param key the key
      * @return SocketAddress;
      */
-    Observable<SocketAddress> getMasterAddrByName(K key);
+    Single<SocketAddress> getMasterAddrByName(K key);
 
     /**
      * Enumerates all the monitored masters and their states.
@@ -38,7 +40,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
      * @param key the key
      * @return Map&lt;K, V&gt;
      */
-    Observable<Map<K, V>> master(K key);
+    Single<Map<K, V>> master(K key);
 
     /**
      * Provides a list of slaves for the master with the specified name.
@@ -54,7 +56,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
      * @param key the key
      * @return Long
      */
-    Observable<Long> reset(K key);
+    Single<Long> reset(K key);
 
     /**
      * Perform a failover.
@@ -62,7 +64,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
      * @param key the master id
      * @return String
      */
-    Observable<String> failover(K key);
+    Single<String> failover(K key);
 
     /**
      * This command tells the Sentinel to start monitoring a new master with the specified name, ip, port, and quorum.
@@ -73,7 +75,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
      * @param quorum the quorum count
      * @return String
      */
-    Observable<String> monitor(K key, String ip, int port, int quorum);
+    Single<String> monitor(K key, String ip, int port, int quorum);
 
     /**
      * Multiple option / value pairs can be specified (or none at all).
@@ -84,7 +86,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
      * 
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
-    Observable<String> set(K key, String option, V value);
+    Single<String> set(K key, String option, V value);
 
     /**
      * remove the specified master.
@@ -92,14 +94,14 @@ public interface RedisSentinelReactiveCommands<K, V> {
      * @param key the key
      * @return String
      */
-    Observable<String> remove(K key);
+    Single<String> remove(K key);
 
     /**
      * Ping the server.
      * 
      * @return String simple-string-reply
      */
-    Observable<String> ping();
+    Single<String> ping();
 
     /**
      * close the underlying connection.
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
index 5ee043a9fe..7ae6d2cfca 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
@@ -53,7 +53,6 @@ public CreateAsyncNodeSelectionClusterApi(String templateName) {
         File templateFile = new File(Constants.TEMPLATES, "com/lambdaworks/redis/api/" + templateName + ".java");
         String targetPackage = "com.lambdaworks.redis.cluster.api.async";
 
-        // todo: remove AutoCloseable from BaseNodeSelectionAsyncCommands
         factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(),
                 methodTypeMutator(), methodFilter(), importSupplier(), null, null);
     }
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
index d128097853..fce0f00fb0 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
@@ -5,7 +5,6 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.internal.LettuceSets;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -16,6 +15,7 @@
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.ast.type.ReferenceType;
 import com.github.javaparser.ast.type.Type;
+import com.lambdaworks.redis.internal.LettuceSets;
 
 /**
  * Create reactive API based on the templates.
@@ -25,9 +25,10 @@
 @RunWith(Parameterized.class)
 public class CreateReactiveApi {
 
-    private Set<String> KEEP_METHOD_RESULT_TYPE = LettuceSets.unmodifiableSet(
-            "digest", "close", "isOpen", "BaseRedisCommands.reset",
-            "getStatefulConnection", "setAutoFlushCommands", "flushCommands");
+    private Set<String> KEEP_METHOD_RESULT_TYPE = LettuceSets.unmodifiableSet("digest", "close", "isOpen",
+            "BaseRedisCommands.reset", "getStatefulConnection", "setAutoFlushCommands", "flushCommands");
+
+    private Set<String> FORCE_OBSERVABLE_RESULT = LettuceSets.unmodifiableSet("eval", "evalsha");
 
     private CompilationUnitFactory factory;
 
@@ -74,8 +75,9 @@ protected Function<String, String> commentMutator() {
 
     protected Function<Comment, Comment> methodCommentMutator() {
         return comment -> {
-            if(comment != null && comment.getContent() != null){
-                comment.setContent(comment.getContent().replaceAll("List&lt;(.*)&gt;", "$1").replaceAll("Set&lt;(.*)&gt;", "$1"));
+            if (comment != null && comment.getContent() != null) {
+                comment.setContent(
+                        comment.getContent().replaceAll("List&lt;(.*)&gt;", "$1").replaceAll("Set&lt;(.*)&gt;", "$1"));
             }
             return comment;
         };
@@ -90,33 +92,39 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
         return method -> {
 
             ClassOrInterfaceDeclaration classOfMethod = (ClassOrInterfaceDeclaration) method.getParentNode();
-            if (KEEP_METHOD_RESULT_TYPE.contains(method.getName())
-                    || KEEP_METHOD_RESULT_TYPE.contains(classOfMethod.getName() + "." + method.getName())) {
+            if (methodMatch(KEEP_METHOD_RESULT_TYPE, method, classOfMethod)) {
                 return method.getType();
             }
 
             String typeAsString = method.getType().toStringWithoutComments().trim();
-            if (typeAsString.equals("void")) {
-                typeAsString = "Success";
-            }
-
-            if (typeAsString.startsWith("List<")) {
-                typeAsString = typeAsString.substring(5, typeAsString.length() - 1);
+            if (methodMatch(FORCE_OBSERVABLE_RESULT, method, classOfMethod)) {
+                typeAsString = "Observable<" + typeAsString + ">";
+            } if (typeAsString.equals("void")) {
+                typeAsString = "Completable";
+            } else if (typeAsString.startsWith("List<")) {
+                typeAsString = "Observable<" + typeAsString.substring(5, typeAsString.length() - 1) + ">";
             } else if (typeAsString.startsWith("Set<")) {
-                typeAsString = typeAsString.substring(4, typeAsString.length() - 1);
+                typeAsString = "Observable<" + typeAsString.substring(4, typeAsString.length() - 1) + ">";
+            } else {
+                typeAsString = "Single<" + typeAsString + ">";
             }
 
-            return new ReferenceType(new ClassOrInterfaceType("Observable<" + typeAsString + ">"));
+            return new ReferenceType(new ClassOrInterfaceType(typeAsString));
         };
     }
 
+    private boolean methodMatch(Collection<String> methodNames, MethodDeclaration method,
+            ClassOrInterfaceDeclaration classOfMethod) {
+        return methodNames.contains(method.getName()) || methodNames.contains(classOfMethod.getName() + "." + method.getName());
+    }
+
     /**
-     * Supply addititional imports.
+     * Supply additional imports.
      * 
      * @return
      */
     protected Supplier<List<String>> importSupplier() {
-        return () -> Collections.singletonList("rx.Observable");
+        return () -> Arrays.asList("rx.Observable", "rx.Single", "rx.Completable");
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java b/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java
index 39190be0c7..7df56f4634 100644
--- a/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java
+++ b/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java
@@ -15,6 +15,7 @@
 import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
 
 import rx.Observable;
+import rx.Single;
 
 import javax.annotation.Resources;
 
@@ -161,7 +162,7 @@ public void testObservablePerformance() throws Exception {
 
         executor = new ThreadPoolExecutor(threads, threads, 1, TimeUnit.MINUTES, new ArrayBlockingQueue<Runnable>(totalCalls));
 
-        List<Future<List<Observable<String>>>> futurama = new ArrayList<>();
+        List<Future<List<Single<String>>>> futurama = new ArrayList<>();
 
         preheat(threads);
         final int callsPerThread = totalCalls / threads;
@@ -172,10 +173,10 @@ public void testObservablePerformance() throws Exception {
         long start = System.currentTimeMillis();
         latch.countDown();
 
-        for (Future<List<Observable<String>>> listFuture : futurama) {
-            for (Observable<String> future : listFuture.get()) {
+        for (Future<List<Single<String>>> listFuture : futurama) {
+            for (Single<String> future : listFuture.get()) {
                 if (waitForCompletion) {
-                    future.toBlocking().last();
+                    future.toBlocking().value();
                 } else {
                     future.subscribe();
                 }
@@ -192,7 +193,7 @@ public void testObservablePerformance() throws Exception {
 
     }
 
-    protected void submitObservableTasks(int threads, List<Future<List<Observable<String>>>> futurama, final int callsPerThread,
+    protected void submitObservableTasks(int threads, List<Future<List<Single<String>>>> futurama, final int callsPerThread,
             final boolean connectionPerThread) {
         final StatefulRedisConnection<String, String> sharedConnection;
         if (!connectionPerThread) {
@@ -202,7 +203,7 @@ protected void submitObservableTasks(int threads, List<Future<List<Observable<St
         }
 
         for (int i = 0; i < threads; i++) {
-            Future<List<Observable<String>>> submit = executor.submit(() -> {
+            Future<List<Single<String>>> submit = executor.submit(() -> {
 
                 StatefulRedisConnection<String, String> connection = sharedConnection;
                 if (connectionPerThread) {
@@ -212,7 +213,7 @@ protected void submitObservableTasks(int threads, List<Future<List<Observable<St
 
                 connection.sync().ping();
 
-                List<Observable<String>> observables = new ArrayList<>(callsPerThread);
+                List<Single<String>> observables = new ArrayList<>(callsPerThread);
                 latch.await();
                 for (int i1 = 0; i1 < callsPerThread; i1++) {
                     observables.add(reactive.ping());
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
index b9df3f08d2..3b63e65350 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
@@ -7,6 +7,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -16,10 +17,15 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import rx.Observable;
+import rx.Single;
+import rx.Subscriber;
+
 import com.lambdaworks.Delay;
 import com.lambdaworks.Wait;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
+import rx.observers.TestSubscriber;
 
 import rx.Observable;
 import rx.Subscriber;
@@ -47,7 +53,7 @@ public void closeReactiveConnection() throws Exception {
 
     @Test
     public void doNotFireCommandUntilObservation() throws Exception {
-        Observable<String> set = reactive.set(key, value);
+        Single<String> set = reactive.set(key, value);
         Delay.delay(millis(200));
         assertThat(redis.get(key)).isNull();
         set.subscribe();
@@ -58,7 +64,7 @@ public void doNotFireCommandUntilObservation() throws Exception {
 
     @Test
     public void fireCommandAfterObserve() throws Exception {
-        assertThat(reactive.set(key, value).toBlocking().first()).isEqualTo("OK");
+        assertThat(reactive.set(key, value).toBlocking().value()).isEqualTo("OK");
         assertThat(redis.get(key)).isEqualTo(value);
     }
 
@@ -76,40 +82,60 @@ public void getStatefulConnection() throws Exception {
     public void testCancelCommand() throws Exception {
 
         List<Object> result = new ArrayList<>();
-        reactive.clientPause(1000).subscribe();
+        reactive.clientPause(2000).subscribe(TestSubscriber.create());
+        Delay.delay(millis(100));
+
         reactive.set(key, value).subscribe(new CompletionSubscriber(result));
         Delay.delay(millis(100));
 
         reactive.reset();
-        assertThat(result).hasSize(1).contains("completed");
+        assertThat(result).hasSize(1).hasOnlyElementsOfType(CancellationException.class);
     }
 
     @Test
     public void testEcho() throws Exception {
-        String result = reactive.echo("echo").toBlocking().first();
+        String result = reactive.echo("echo").toBlocking().value();
         assertThat(result).isEqualTo("echo");
     }
 
     @Test
-    public void testMultiCancel() throws Exception {
+    public void testSingleMultiCancel() throws Exception {
 
         List<Object> result = new ArrayList<>();
         reactive.clientPause(1000).subscribe();
+        Delay.delay(millis(100));
 
-        Observable<String> set = reactive.set(key, value);
+        Single<String> set = reactive.set(key, value);
         set.subscribe(new CompletionSubscriber(result));
         set.subscribe(new CompletionSubscriber(result));
         set.subscribe(new CompletionSubscriber(result));
+        Delay.delay(millis(100));
+
+        reactive.reset();
+        assertThat(result).hasSize(3);
+    }
+
+    @Test
+    public void testObservableMultiCancel() throws Exception {
 
+        List<Object> result = new ArrayList<>();
+        reactive.clientPause(1000).subscribe();
         Delay.delay(millis(100));
+
+        Observable<String> set = reactive.mget(key, value);
+        set.subscribe(new CompletionSubscriber(result));
+        set.subscribe(new CompletionSubscriber(result));
+        set.subscribe(new CompletionSubscriber(result));
+        Delay.delay(millis(100));
+
         reactive.reset();
-        assertThat(result).hasSize(3).contains("completed");
+        assertThat(result).hasSize(3);
     }
 
     @Test
     public void multiSubscribe() throws Exception {
         reactive.set(key, "1").subscribe();
-        Observable<Long> incr = reactive.incr(key);
+        Single<Long> incr = reactive.incr(key);
         incr.subscribe();
         incr.subscribe();
         incr.subscribe();
@@ -147,9 +173,9 @@ public void reactiveChain() throws Exception {
         map.put(key, value);
         map.put("key1", "value1");
 
-        reactive.mset(map).toBlocking().first();
+        reactive.mset(map).toBlocking().value();
 
-        List<String> values = reactive.keys("*").flatMap(s -> reactive.get(s)).toList().subscribeOn(Schedulers.immediate())
+        List<String> values = reactive.keys("*").flatMap(s -> reactive.get(s).toObservable()).toList().subscribeOn(Schedulers.immediate())
                 .toBlocking().first();
 
         assertThat(values).hasSize(2).contains(value, "value1");
@@ -166,7 +192,7 @@ public void auth() throws Exception {
     @Test
     public void subscriberCompletingWithExceptionShouldBeHandledSafely() throws Exception {
 
-        Observable.concat(reactive.set("keyA", "valueA"), reactive.set("keyB", "valueB")).toBlocking().last();
+        Single.concat(reactive.set("keyA", "valueA"), reactive.set("keyB", "valueB")).toBlocking().last();
 
         reactive.get("keyA").subscribe(createSubscriberWithExceptionOnComplete());
         reactive.get("keyA").subscribe(createSubscriberWithExceptionOnComplete());
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
index 7b6059cdc4..3ee8c4e1c0 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
@@ -25,9 +25,9 @@
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 import com.lambdaworks.redis.codec.Utf8StringCodec;
 import com.lambdaworks.redis.commands.rx.RxSyncInvocationHandler;
-import com.lambdaworks.redis.internal.LettuceLists;
 
 import rx.Observable;
+import rx.Single;
 
 /**
  * @author Mark Paluch
@@ -80,9 +80,8 @@ public void doWeirdThingsWithClusterconnections() throws Exception {
     @Test
     public void msetCrossSlot() throws Exception {
 
-        Observable<String> mset = commands.mset(RandomKeys.MAP);
-        List<String> result = LettuceLists.newList(mset.toBlocking().toIterable());
-        assertThat(result).hasSize(1).contains("OK");
+        Single<String> mset = commands.mset(RandomKeys.MAP);
+        assertThat(block(mset)).isEqualTo("OK");
 
         for (String mykey : RandomKeys.KEYS) {
             String s1 = syncCommands.get(mykey);
@@ -93,9 +92,7 @@ public void msetCrossSlot() throws Exception {
     @Test
     public void msetnxCrossSlot() throws Exception {
 
-        List<Boolean> result = LettuceLists.newList(commands.msetnx(RandomKeys.MAP).toBlocking().toIterable());
-
-        assertThat(result).hasSize(1).contains(true);
+        assertThat(block(commands.msetnx(RandomKeys.MAP))).isTrue();
 
         for (String mykey : RandomKeys.KEYS) {
             String s1 = syncCommands.get(mykey);
@@ -125,8 +122,8 @@ public void mgetCrossSlotStreaming() throws Exception {
 
         ListStreamingAdapter<String> result = new ListStreamingAdapter<>();
 
-        Observable<Long> observable = commands.mget(result, RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
-        Long count = getSingle(observable);
+        Single<Long> single = commands.mget(result, RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
+        Long count = block(single);
 
         assertThat(result.getList()).hasSize(RandomKeys.COUNT);
         assertThat(count).isEqualTo(RandomKeys.COUNT);
@@ -137,8 +134,8 @@ public void delCrossSlot() throws Exception {
 
         msetCrossSlot();
 
-        Observable<Long> observable = commands.del(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
-        Long result = getSingle(observable);
+        Single<Long> single = commands.del(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
+        Long result = block(single);
 
         assertThat(result).isEqualTo(RandomKeys.COUNT);
 
@@ -153,8 +150,8 @@ public void unlinkCrossSlot() throws Exception {
 
         msetCrossSlot();
 
-        Observable<Long> observable = commands.unlink(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
-        Long result = getSingle(observable);
+        Single<Long> single = commands.unlink(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
+        Long result = block(single);
 
         assertThat(result).isEqualTo(RandomKeys.COUNT);
 
@@ -171,7 +168,7 @@ public void clientSetname() throws Exception {
 
         assertThat(clusterClient.getPartitions().size()).isGreaterThan(0);
 
-        getSingle(commands.clientSetname(name));
+        block(commands.clientSetname(name));
 
         for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
             RedisClusterCommands<String, String> nodeConnection = commands.getStatefulConnection().sync()
@@ -182,7 +179,7 @@ public void clientSetname() throws Exception {
 
     @Test(expected = Exception.class)
     public void clientSetnameRunOnError() throws Exception {
-        getSingle(commands.clientSetname("not allowed"));
+        block(commands.clientSetname("not allowed"));
     }
 
     @Test
@@ -190,7 +187,7 @@ public void dbSize() throws Exception {
 
         writeKeysToTwoNodes();
 
-        Long dbsize = getSingle(commands.dbsize());
+        Long dbsize = block(commands.dbsize());
         assertThat(dbsize).isEqualTo(2);
     }
 
@@ -199,7 +196,7 @@ public void flushall() throws Exception {
 
         writeKeysToTwoNodes();
 
-        assertThat(getSingle(commands.flushall())).isEqualTo("OK");
+        assertThat(block(commands.flushall())).isEqualTo("OK");
 
         Long dbsize = syncCommands.dbsize();
         assertThat(dbsize).isEqualTo(0);
@@ -210,7 +207,7 @@ public void flushdb() throws Exception {
 
         writeKeysToTwoNodes();
 
-        assertThat(getSingle(commands.flushdb())).isEqualTo("OK");
+        assertThat(block(commands.flushdb())).isEqualTo("OK");
 
         Long dbsize = syncCommands.dbsize();
         assertThat(dbsize).isEqualTo(0);
@@ -232,7 +229,7 @@ public void keysStreaming() throws Exception {
         writeKeysToTwoNodes();
         ListStreamingAdapter<String> result = new ListStreamingAdapter<>();
 
-        assertThat(getSingle(commands.keys(result, "*"))).isEqualTo(2);
+        assertThat(block(commands.keys(result, "*"))).isEqualTo(2);
         assertThat(result.getList()).contains(KEY_ON_NODE_1, KEY_ON_NODE_2);
     }
 
@@ -241,17 +238,17 @@ public void randomKey() throws Exception {
 
         writeKeysToTwoNodes();
 
-        assertThat(getSingle(commands.randomkey())).isIn(KEY_ON_NODE_1, KEY_ON_NODE_2);
+        assertThat(block(commands.randomkey())).isIn(KEY_ON_NODE_1, KEY_ON_NODE_2);
     }
 
     @Test
     public void scriptFlush() throws Exception {
-        assertThat(getSingle(commands.scriptFlush())).isEqualTo("OK");
+        assertThat(block(commands.scriptFlush())).isEqualTo("OK");
     }
 
     @Test
     public void scriptKill() throws Exception {
-        assertThat(getSingle(commands.scriptKill())).isEqualTo("OK");
+        assertThat(block(commands.scriptKill())).isEqualTo("OK");
     }
 
     @Test
@@ -264,8 +261,8 @@ public void shutdown() throws Exception {
     public void readFromSlaves() throws Exception {
 
         RedisClusterReactiveCommands<String, String> connection = commands.getConnection(host, port4);
-        connection.readOnly().toBlocking().first();
-        commands.set(key, value).toBlocking().first();
+        block(connection.readOnly());
+        block(commands.set(key, value));
         NodeSelectionAsyncTest.waitForReplication(commands.getStatefulConnection().async(), key, port4);
 
         AtomicBoolean error = new AtomicBoolean();
@@ -273,10 +270,10 @@ public void readFromSlaves() throws Exception {
 
         assertThat(error.get()).isFalse();
 
-        connection.readWrite().toBlocking().first();
+        block(connection.readWrite());
 
         try {
-            connection.get(key).doOnError(throwable -> error.set(true)).toBlocking().first();
+            block(connection.get(key).doOnError(throwable -> error.set(true)));
             fail("Missing exception");
         } catch (Exception e) {
             assertThat(error.get()).isTrue();
@@ -295,9 +292,9 @@ public void clusterScan() throws Exception {
         do {
 
             if (scanCursor == null) {
-                scanCursor = getSingle(commands.scan());
+                scanCursor = block(commands.scan());
             } else {
-                scanCursor = getSingle(commands.scan(scanCursor));
+                scanCursor = block(commands.scan(scanCursor));
             }
             allKeys.addAll(scanCursor.getKeys());
         } while (!scanCursor.isFinished());
@@ -318,9 +315,9 @@ public void clusterScanWithArgs() throws Exception {
         do {
 
             if (scanCursor == null) {
-                scanCursor = getSingle(commands.scan(ScanArgs.Builder.matches("a*")));
+                scanCursor = block(commands.scan(ScanArgs.Builder.matches("a*")));
             } else {
-                scanCursor = getSingle(commands.scan(scanCursor, ScanArgs.Builder.matches("a*")));
+                scanCursor = block(commands.scan(scanCursor, ScanArgs.Builder.matches("a*")));
             }
             allKeys.addAll(scanCursor.getKeys());
         } while (!scanCursor.isFinished());
@@ -341,9 +338,9 @@ public void clusterScanStreaming() throws Exception {
         do {
 
             if (scanCursor == null) {
-                scanCursor = getSingle(commands.scan(adapter));
+                scanCursor = block(commands.scan(adapter));
             } else {
-                scanCursor = getSingle(commands.scan(adapter, scanCursor));
+                scanCursor = block(commands.scan(adapter, scanCursor));
             }
         } while (!scanCursor.isFinished());
 
@@ -363,9 +360,9 @@ public void clusterScanStreamingWithArgs() throws Exception {
         do {
 
             if (scanCursor == null) {
-                scanCursor = getSingle(commands.scan(adapter, ScanArgs.Builder.matches("a*")));
+                scanCursor = block(commands.scan(adapter, ScanArgs.Builder.matches("a*")));
             } else {
-                scanCursor = getSingle(commands.scan(adapter, scanCursor, ScanArgs.Builder.matches("a*")));
+                scanCursor = block(commands.scan(adapter, scanCursor, ScanArgs.Builder.matches("a*")));
             }
         } while (!scanCursor.isFinished());
 
@@ -374,10 +371,11 @@ public void clusterScanStreamingWithArgs() throws Exception {
 
     }
 
-    private <T> T getSingle(Observable<T> observable) {
-        return observable.toBlocking().single();
+    private <T> T block(Single<T> single) {
+        return single.toBlocking().value();
     }
 
+
     private void writeKeysToTwoNodes() {
         syncCommands.set(KEY_ON_NODE_1, value);
         syncCommands.set(KEY_ON_NODE_2, value);
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
index 044025b522..82f2b9ca39 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
@@ -18,7 +18,7 @@
 import com.lambdaworks.redis.cluster.models.slots.ClusterSlotsParser;
 import com.lambdaworks.redis.internal.LettuceLists;
 
-import rx.Observable;
+import rx.Single;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SuppressWarnings("unchecked")
@@ -61,7 +61,7 @@ public void after() throws Exception {
     @Test
     public void testClusterBumpEpoch() throws Exception {
 
-        String result = first(reactive.clusterBumpepoch());
+        String result = block(reactive.clusterBumpepoch());
 
         assertThat(result).matches("(BUMPED|STILL).*");
     }
@@ -69,7 +69,7 @@ public void testClusterBumpEpoch() throws Exception {
     @Test
     public void testClusterInfo() throws Exception {
 
-        String status = first(reactive.clusterInfo());
+        String status = block(reactive.clusterInfo());
 
         assertThat(status).contains("cluster_known_nodes:");
         assertThat(status).contains("cluster_slots_fail:0");
@@ -79,7 +79,7 @@ public void testClusterInfo() throws Exception {
     @Test
     public void testClusterNodes() throws Exception {
 
-        String string = first(reactive.clusterNodes());
+        String string = block(reactive.clusterNodes());
 
         assertThat(string).contains("connected");
         assertThat(string).contains("master");
@@ -89,7 +89,7 @@ public void testClusterNodes() throws Exception {
     @Test
     public void testClusterNodesSync() throws Exception {
 
-        String string = first(reactive.clusterNodes());
+        String string = block(reactive.clusterNodes());
 
         assertThat(string).contains("connected");
         assertThat(string).contains("master");
@@ -99,13 +99,13 @@ public void testClusterNodesSync() throws Exception {
     @Test
     public void testClusterSlaves() throws Exception {
 
-        Long replication = first(reactive.waitForReplication(1, 5));
+        Long replication = block(reactive.waitForReplication(1, 5));
         assertThat(replication).isNotNull();
     }
 
     @Test
     public void testAsking() throws Exception {
-        assertThat(first(reactive.asking())).isEqualTo("OK");
+        assertThat(block(reactive.asking())).isEqualTo("OK");
     }
 
     @Test
@@ -133,8 +133,8 @@ public void clusterSlaves() throws Exception {
         assertThat(result.size()).isGreaterThan(0);
     }
 
-    private <T> T first(Observable<T> observable) {
-        return observable.toBlocking().first();
+    private <T> T block(Single<T> single) {
+        return single.toBlocking().value();
     }
 
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisRxClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisRxClusterClientTest.java
index 5200e8188a..0981e4b517 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisRxClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisRxClusterClientTest.java
@@ -25,6 +25,7 @@
 import com.lambdaworks.redis.cluster.api.rx.RedisAdvancedClusterReactiveCommands;
 import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import rx.Single;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SuppressWarnings("unchecked")
@@ -69,10 +70,10 @@ public void after() throws Exception {
     @Test
     public void testClusterCommandRedirection() throws Exception {
         // Command on node within the default connection
-        assertThat(getSingle(rx.set(KEY_B, "myValue1"))).isEqualTo("OK");
+        assertThat(block(rx.set(KEY_B, "myValue1"))).isEqualTo("OK");
 
         // gets redirection to node 3
-        assertThat(getSingle(rx.set(KEY_A, "myValue1"))).isEqualTo("OK");
+        assertThat(block(rx.set(KEY_A, "myValue1"))).isEqualTo("OK");
     }
 
     @Test
@@ -81,10 +82,10 @@ public void getKeysInSlot() throws Exception {
         sync.set(KEY_A, value);
         sync.set(KEY_B, value);
 
-        List<String> keysA = getSingle(rx.clusterGetKeysInSlot(SLOT_A, 10).toList());
+        List<String> keysA = block(rx.clusterGetKeysInSlot(SLOT_A, 10).toList());
         assertThat(keysA).isEqualTo(Collections.singletonList(KEY_A));
 
-        List<String> keysB = getSingle(rx.clusterGetKeysInSlot(SLOT_B, 10).toList());
+        List<String> keysB = block(rx.clusterGetKeysInSlot(SLOT_B, 10).toList());
         assertThat(keysB).isEqualTo(Collections.singletonList(KEY_B));
     }
 
@@ -94,45 +95,49 @@ public void countKeysInSlot() throws Exception {
         sync.set(KEY_A, value);
         sync.set(KEY_B, value);
 
-        Long result = getSingle(rx.clusterCountKeysInSlot(SLOT_A));
+        Long result = block(rx.clusterCountKeysInSlot(SLOT_A));
         assertThat(result).isEqualTo(1L);
 
-        result = getSingle(rx.clusterCountKeysInSlot(SLOT_B));
+        result = block(rx.clusterCountKeysInSlot(SLOT_B));
         assertThat(result).isEqualTo(1L);
 
         int slotZZZ = SlotHash.getSlot("ZZZ".getBytes());
-        result = getSingle(rx.clusterCountKeysInSlot(slotZZZ));
+        result = block(rx.clusterCountKeysInSlot(slotZZZ));
         assertThat(result).isEqualTo(0L);
     }
 
     @Test
     public void testClusterCountFailureReports() throws Exception {
         RedisClusterNode ownPartition = getOwnPartition(sync);
-        assertThat(getSingle(rx.clusterCountFailureReports(ownPartition.getNodeId()))).isGreaterThanOrEqualTo(0);
+        assertThat(block(rx.clusterCountFailureReports(ownPartition.getNodeId()))).isGreaterThanOrEqualTo(0);
     }
 
     @Test
     public void testClusterKeyslot() throws Exception {
-        assertThat(getSingle(rx.clusterKeyslot(KEY_A))).isEqualTo(SLOT_A);
+        assertThat(block(rx.clusterKeyslot(KEY_A))).isEqualTo(SLOT_A);
         assertThat(SlotHash.getSlot(KEY_A)).isEqualTo(SLOT_A);
     }
 
     @Test
     public void testClusterSaveconfig() throws Exception {
-        assertThat(getSingle(rx.clusterSaveconfig())).isEqualTo("OK");
+        assertThat(block(rx.clusterSaveconfig())).isEqualTo("OK");
     }
 
     @Test
     public void testClusterSetConfigEpoch() throws Exception {
         try {
-            getSingle(rx.clusterSetConfigEpoch(1L));
+            block(rx.clusterSetConfigEpoch(1L));
         } catch (RedisException e) {
             assertThat(e).hasMessageContaining("ERR The user can assign a config epoch only");
         }
     }
 
-    private <T> T getSingle(Observable<T> observable) {
+    private <T> T block(Observable<T> observable) {
         return observable.toBlocking().single();
     }
 
+    private <T> T block(Single<T> observable) {
+        return observable.toBlocking().value();
+    }
+
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
index 34c3b98a3a..d0da760ad7 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
@@ -20,6 +20,7 @@
 import com.lambdaworks.redis.protocol.*;
 
 import rx.Observable;
+import rx.Single;
 
 /**
  * @author Mark Paluch
@@ -103,7 +104,7 @@ public void standaloneReactivePing() throws Exception {
         ReactiveCommandDispatcher<String, String, String> dispatcher = new ReactiveCommandDispatcher<>(command,
                 redisClusterConnection, false);
 
-        String result = Observable.create(dispatcher).toBlocking().first();
+        String result = Single.create(dispatcher.getSingleSubscriber()).toBlocking().value();
 
         assertThat(result).isEqualTo("PONG");
     }
diff --git a/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
index 41d7ef2160..a9ff76e586 100644
--- a/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
@@ -92,7 +92,7 @@ public void standaloneReactivePing() throws Exception {
         ReactiveCommandDispatcher<String, String, String> dispatcher = new ReactiveCommandDispatcher<>(command,
                 getStandaloneConnection(), false);
 
-        String result = Observable.create(dispatcher).toBlocking().first();
+        String result = Observable.create(dispatcher.getObservableSubscriber()).toBlocking().first();
 
         assertThat(result).isEqualTo("PONG");
     }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/RxSyncInvocationHandler.java b/src/test/java/com/lambdaworks/redis/commands/rx/RxSyncInvocationHandler.java
index ea5ef08d62..1a7730d729 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/RxSyncInvocationHandler.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/RxSyncInvocationHandler.java
@@ -6,21 +6,25 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-
-import com.lambdaworks.redis.internal.AbstractInvocationHandler;
-import rx.Observable;
+import java.util.concurrent.TimeUnit;
 
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
+import com.lambdaworks.redis.internal.AbstractInvocationHandler;
 import com.lambdaworks.redis.internal.LettuceLists;
 import com.lambdaworks.redis.internal.LettuceSets;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
 import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
 
+import rx.Completable;
+import rx.Observable;
+import rx.Single;
+
 /**
  * Invocation handler for testing purposes.
+ *
  * @param <K>
  * @param <V>
  */
@@ -44,33 +48,58 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
 
             Object result = targetMethod.invoke(rxApi, args);
 
-            if (result == null || !(result instanceof Observable<?>)) {
+            if (result == null) {
                 return result;
             }
-            Observable<?> observable = (Observable<?>) result;
 
-            if (!method.getName().equals("exec") && !method.getName().equals("multi")) {
-                if (connection instanceof StatefulRedisConnection && ((StatefulRedisConnection) connection).isMulti()) {
-                    observable.subscribe();
-                    return null;
+            if (result instanceof Observable<?>) {
+                Observable<?> observable = (Observable<?>) result;
+
+                if (!method.getName().equals("exec") && !method.getName().equals("multi")) {
+                    if (connection instanceof StatefulRedisConnection && ((StatefulRedisConnection) connection)
+                            .isMulti()) {
+                        observable.subscribe();
+                        return null;
+                    }
                 }
-            }
 
-            List<?> value = observable.toList().toBlocking().first();
+                List<?> value = observable.toList().toBlocking().first();
 
-            if (method.getReturnType().equals(List.class)) {
-                return value;
+                if (method.getReturnType().equals(List.class)) {
+                    return value;
+                }
+
+                if (method.getReturnType().equals(Set.class)) {
+                    return LettuceSets.newHashSet(value);
+                }
+
+                if (!value.isEmpty()) {
+                    return value.get(0);
+                }
             }
 
-            if (method.getReturnType().equals(Set.class)) {
-                return LettuceSets.newHashSet(value);
+            if (result instanceof Single<?>) {
+                Single<?> single = (Single<?>) result;
+
+                if (!method.getName().equals("exec") && !method.getName().equals("multi")) {
+                    if (connection instanceof StatefulRedisConnection && ((StatefulRedisConnection) connection).isMulti()) {
+                        single.subscribe();
+                        return null;
+                    }
+                }
+
+                return single.toBlocking().value();
             }
 
-            if (!value.isEmpty()) {
-                return value.get(0);
+            if (result instanceof Completable) {
+                Completable completable = (Completable) result;
+                completable.await(5, TimeUnit.SECONDS);
+                if (completable.get() != null) {
+                    throw completable.get();
+                }
             }
 
-            return null;
+            return result;
 
         } catch (InvocationTargetException e) {
             throw e.getTargetException();
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
index b269fae367..a83f006b02 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
@@ -17,6 +17,7 @@
 import com.lambdaworks.redis.internal.LettuceLists;
 
 import rx.Observable;
+import rx.Single;
 import rx.observables.BlockingObservable;
 import rx.observers.TestSubscriber;
 
@@ -46,31 +47,31 @@ public void closeConnection() throws Exception {
 
     @Test
     public void discard() throws Exception {
-        assertThat(first(commands.multi())).isEqualTo("OK");
+        assertThat(block(commands.multi())).isEqualTo("OK");
 
         commands.set(key, value);
 
-        assertThat(first(commands.discard())).isEqualTo("OK");
-        assertThat(first(commands.get(key))).isNull();
+        assertThat(block(commands.discard())).isEqualTo("OK");
+        assertThat(block(commands.get(key))).isNull();
     }
 
     @Test
     public void execSingular() throws Exception {
 
-        assertThat(first(commands.multi())).isEqualTo("OK");
+        assertThat(block(commands.multi())).isEqualTo("OK");
 
         redis.set(key, value);
 
         assertThat(first(commands.exec())).isEqualTo("OK");
-        assertThat(first(commands.get(key))).isEqualTo(value);
+        assertThat(block(commands.get(key))).isEqualTo(value);
     }
 
     @Test
     public void errorInMulti() throws Exception {
-        commands.multi().subscribe();
-        commands.set(key, value).subscribe();
-        commands.lpop(key).onExceptionResumeNext(Observable.<String> empty()).subscribe();
-        commands.get(key).subscribe();
+        commands.multi().subscribe(TestSubscriber.create());
+        commands.set(key, value).subscribe(TestSubscriber.create());
+        commands.lpop(key).subscribe(TestSubscriber.create());
+        commands.get(key).subscribe(TestSubscriber.create());
 
         List<Object> values = all(commands.exec());
         assertThat(values.get(0)).isEqualTo("OK");
@@ -128,6 +129,10 @@ protected <T> T first(Observable<T> observable) {
         return null;
     }
 
+    protected <T> T block(Single<T> single) {
+        return single.toBlocking().value();
+    }
+
     protected <T> List<T> all(Observable<T> observable) {
         BlockingObservable<T> blocking = observable.toBlocking();
         Iterator<T> iterator = blocking.getIterator();
diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubRxTest.java b/src/test/java/com/lambdaworks/redis/pubsub/PubSubRxTest.java
index 3f5da62c6c..b91e62b11e 100644
--- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubRxTest.java
+++ b/src/test/java/com/lambdaworks/redis/pubsub/PubSubRxTest.java
@@ -29,7 +29,9 @@
 import com.lambdaworks.redis.pubsub.api.rx.RedisPubSubReactiveCommands;
 import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
 
+import rx.Completable;
 import rx.Observable;
+import rx.Single;
 import rx.Subscription;
 import rx.observables.BlockingObservable;
 
@@ -189,8 +191,7 @@ public void pmessage() throws Exception {
     @Test(timeout = 2000)
     public void psubscribe() throws Exception {
 
-        Success sucess = first(pubsub.psubscribe(pattern));
-        assertThat(sucess).isEqualTo(Success.Success);
+        block(pubsub.psubscribe(pattern));
 
         assertThat(patterns.take()).isEqualTo(pattern);
         assertThat((long) counts.take()).isEqualTo(1);
@@ -207,7 +208,7 @@ public void pubsubEmptyChannels() throws Exception {
     public void pubsubChannels() throws Exception {
 
         block(pubsub.subscribe(channel));
-        List<String> result = first(pubsub2.pubsubChannels().toList());
+        List<String> result = single(pubsub2.pubsubChannels().toList());
         assertThat(result).contains(channel);
     }
 
@@ -216,7 +217,7 @@ public void pubsubMultipleChannels() throws Exception {
 
         block(pubsub.subscribe(channel, "channel1", "channel3"));
 
-        List<String> result = first(pubsub2.pubsubChannels().toList());
+        List<String> result = single(pubsub2.pubsubChannels().toList());
         assertThat(result).contains(channel, "channel1", "channel3");
     }
 
@@ -224,9 +225,9 @@ public void pubsubMultipleChannels() throws Exception {
     public void pubsubChannelsWithArg() throws Exception {
 
         pubsub.subscribe(channel).subscribe();
-        Wait.untilTrue(() -> first(pubsub2.pubsubChannels(pattern).filter(s -> channel.equals(s))) != null).waitOrTimeout();
+        Wait.untilTrue(() -> single(pubsub2.pubsubChannels(pattern).filter(s -> channel.equals(s))) != null).waitOrTimeout();
 
-        String result = first(pubsub2.pubsubChannels(pattern).filter(s -> channel.equals(s)));
+        String result = single(pubsub2.pubsubChannels(pattern).filter(s -> channel.equals(s)));
         assertThat(result).isEqualToIgnoringCase(channel);
     }
 
@@ -234,9 +235,9 @@ public void pubsubChannelsWithArg() throws Exception {
     public void pubsubNumsub() throws Exception {
 
         pubsub.subscribe(channel).subscribe();
-        Wait.untilEquals(1, () -> first(pubsub2.pubsubNumsub(channel).toList()).size()).waitOrTimeout();
+        Wait.untilEquals(1, () -> block(pubsub2.pubsubNumsub(channel)).size()).waitOrTimeout();
 
-        Map<String, Long> result = first(pubsub2.pubsubNumsub(channel));
+        Map<String, Long> result = block(pubsub2.pubsubNumsub(channel));
         assertThat(result).hasSize(1);
         assertThat(result.get(channel)).isGreaterThan(0);
     }
@@ -244,12 +245,12 @@ public void pubsubNumsub() throws Exception {
     @Test
     public void pubsubNumpat() throws Exception {
 
-        Wait.untilEquals(0L, () -> first(pubsub2.pubsubNumpat())).waitOrTimeout();
+        Wait.untilEquals(0L, () -> block(pubsub2.pubsubNumpat())).waitOrTimeout();
 
         pubsub.psubscribe(pattern).subscribe();
         Wait.untilEquals(1L, () -> redis.pubsubNumpat()).waitOrTimeout();
 
-        Long result = first(pubsub2.pubsubNumpat());
+        Long result = block(pubsub2.pubsubNumpat());
         assertThat(result.longValue()).isGreaterThan(0);
     }
 
@@ -434,11 +435,15 @@ public void punsubscribed(String pattern, long count) {
         counts.add(count);
     }
 
-    protected <T> void block(Observable<T> observable) {
-        observable.toBlocking().last();
+    protected <T> T block(Single<T> single) {
+        return single.toBlocking().value();
+    }
+
+    protected <T> void block(Completable completable) {
+        completable.get();
     }
 
-    protected <T> T first(Observable<T> observable) {
+    protected <T> T single(Observable<T> observable) {
 
         BlockingObservable<T> blocking = observable.toBlocking();
         Iterator<T> iterator = blocking.getIterator();
diff --git a/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java b/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java
index 9efe88b3df..072b3c787c 100644
--- a/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java
+++ b/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java
@@ -1,5 +1,6 @@
 package com.lambdaworks.redis.reliability;
 
+import static com.google.code.tempusfugit.temporal.Duration.millis;
 import static com.lambdaworks.Connections.getCommandBuffer;
 import static com.lambdaworks.Connections.getQueue;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -9,6 +10,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
+import com.google.code.tempusfugit.temporal.Duration;
+import com.lambdaworks.Delay;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -246,6 +249,7 @@ public void noCommandsExecutedAfterConnectionIsDisconnected() throws Exception {
 
         StatefulRedisConnection<String, String> connection2 = client.connect();
         connection2.async().quit();
+        Delay.delay(millis(100));
 
         try {
 

From 048ee89eda96ffc1a76f95535ea3225886ca01a4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 26 Jul 2016 17:32:40 +0200
Subject: [PATCH 007/808] Remove closeable from API interfaces

---
 .../redis/AbstractRedisAsyncCommands.java     |  5 --
 .../redis/AbstractRedisReactiveCommands.java  |  1 -
 .../api/async/BaseRedisAsyncCommands.java     |  7 +--
 .../api/async/RedisStringAsyncCommands.java   |  4 +-
 .../api/rx/BaseRedisReactiveCommands.java     |  7 +--
 .../redis/api/sync/BaseRedisCommands.java     |  7 +--
 .../redis/api/sync/RedisStringCommands.java   |  5 +-
 .../NodeSelectionStringAsyncCommands.java     |  4 +-
 .../api/sync/NodeSelectionStringCommands.java |  8 ++--
 .../redis/api/BaseRedisCommands.java          |  8 +---
 .../redis/extensibility/LettuceGeoDemo.java   |  2 +-
 .../java/com/lambdaworks/Connections.java     | 16 +++++--
 src/test/java/com/lambdaworks/SslTest.java    | 12 ++---
 .../redis/AbstractRedisClientTest.java        |  3 +-
 .../com/lambdaworks/redis/ClientTest.java     |  8 ++--
 .../lambdaworks/redis/CustomCodecTest.java    |  8 ++--
 .../redis/ReactiveConnectionTest.java         |  2 +-
 .../redis/ReactiveStreamingOutputTest.java    |  2 +-
 .../cluster/AdvancedClusterClientTest.java    | 29 +++---------
 .../cluster/AdvancedClusterReactiveTest.java  | 19 +-------
 .../cluster/ClusterReactiveCommandTest.java   |  2 +-
 .../redis/cluster/ClusterSetup.java           |  4 +-
 .../redis/cluster/ClusterTestUtil.java        |  5 +-
 .../redis/cluster/NodeSelectionAsyncTest.java |  2 +-
 .../redis/cluster/NodeSelectionSyncTest.java  |  2 +-
 .../redis/cluster/RedisClusterClientTest.java | 40 ++++++++--------
 .../cluster/RedisClusterReadFromTest.java     |  2 +-
 .../redis/cluster/RedisClusterSetupTest.java  | 29 ++++++------
 .../RedisClusterStressScenariosTest.java      | 23 ++++++----
 .../commands/rx/HashClusterRxCommandTest.java |  2 +-
 .../commands/rx/ListClusterRxCommandTest.java |  2 +-
 .../rx/StringClusterRxCommandTest.java        |  2 +-
 .../cluster/topology/TopologyRefreshTest.java | 42 +++++++++--------
 .../redis/commands/rx/BitRxCommandTest.java   |  1 +
 .../commands/rx/CustomRxCommandTest.java      |  1 +
 .../redis/commands/rx/GeoRxCommandTest.java   |  1 +
 .../redis/commands/rx/HLLRxCommandTest.java   |  1 +
 .../redis/commands/rx/HashRxCommandTest.java  |  1 +
 .../redis/commands/rx/KeyRxCommandTest.java   |  1 +
 .../redis/commands/rx/ListRxCommandTest.java  |  1 +
 .../commands/rx/NumericRxCommandTest.java     |  1 +
 .../commands/rx/ScriptingRxCommandTest.java   |  1 +
 .../commands/rx/ServerRxCommandTest.java      |  1 +
 .../redis/commands/rx/SetRxCommandTest.java   |  1 +
 .../redis/commands/rx/SortRxCommandTest.java  |  1 +
 .../commands/rx/SortedSetRxCommandTest.java   |  1 +
 .../commands/rx/StringRxCommandTest.java      |  1 +
 .../commands/rx/TransactionRxCommandTest.java |  3 +-
 .../masterslave/StaticMasterSlaveTest.java    |  4 +-
 .../redis/pubsub/PubSubCommandTest.java       |  4 +-
 .../redis/pubsub/PubSubRxTest.java            |  4 +-
 .../redis/sentinel/SentinelRule.java          |  4 +-
 .../sentinel/rx/SentinelRxCommandTest.java    |  2 +-
 .../redis/support/InjectedClient.java         |  2 +-
 ...ConnectionDecoratingInvocationHandler.java | 46 +++++++++++++++++++
 .../util/RoutingInvocationHandler.java        | 27 +++++++++++
 .../rx => util}/RxSyncInvocationHandler.java  | 13 ++++--
 57 files changed, 247 insertions(+), 190 deletions(-)
 create mode 100644 src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java
 create mode 100644 src/test/java/com/lambdaworks/util/RoutingInvocationHandler.java
 rename src/test/java/com/lambdaworks/{redis/commands/rx => util}/RxSyncInvocationHandler.java (93%)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
index 862ef8ef69..07820e0551 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
@@ -1778,11 +1778,6 @@ public void setTimeout(long timeout, TimeUnit unit) {
         connection.setTimeout(timeout, unit);
     }
 
-    @Override
-    public void close() {
-        connection.close();
-    }
-
     @Override
     public boolean isOpen() {
         return connection.isOpen();
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
index b637ec3d24..18a7638fba 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
@@ -1828,7 +1828,6 @@ public void setTimeout(long timeout, TimeUnit unit) {
         connection.setTimeout(timeout, unit);
     }
 
-    @Override
     public void close() {
         connection.close();
     }
diff --git a/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java
index fb4acd1f55..eecb1630d4 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java
@@ -17,7 +17,7 @@
  * @since 4.0
  * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
  */
-public interface BaseRedisAsyncCommands<K, V> extends AutoCloseable {
+public interface BaseRedisAsyncCommands<K, V> {
 
     /**
      * Post a message to a channel.
@@ -132,11 +132,6 @@ public interface BaseRedisAsyncCommands<K, V> extends AutoCloseable {
      */
     <T> RedisFuture<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args);
 
-    /**
-     * Close the connection. The connection will become not usable anymore as soon as this method was called.
-     */
-    void close();
-
     /**
      * 
      * @return true if the connection is open (connected and not closed).
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
index ed2aee7fbf..946ed52717 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
@@ -235,10 +235,10 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Stream over the values of all the given keys.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
-     * 
+     *
      * @return Long array-reply list of values at the specified keys.
      */
     RedisFuture<Long> mget(ValueStreamingChannel<V> channel, K... keys);
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/BaseRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/BaseRedisReactiveCommands.java
index b5945b7ae1..e31eab0a78 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/BaseRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/BaseRedisReactiveCommands.java
@@ -19,7 +19,7 @@
  * @since 4.0
  * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
  */
-public interface BaseRedisReactiveCommands<K, V> extends AutoCloseable {
+public interface BaseRedisReactiveCommands<K, V> {
 
     /**
      * Post a message to a channel.
@@ -134,11 +134,6 @@ public interface BaseRedisReactiveCommands<K, V> extends AutoCloseable {
      */
     <T> Observable<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output, CommandArgs<K, V> args);
 
-    /**
-     * Close the connection. The connection will become not usable anymore as soon as this method was called.
-     */
-    void close();
-
     /**
      * 
      * @return true if the connection is open (connected and not closed).
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java
index a88c2b84dc..f1484d0192 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java
@@ -16,7 +16,7 @@
  * @since 4.0
  * @generated by com.lambdaworks.apigenerator.CreateSyncApi
  */
-public interface BaseRedisCommands<K, V> extends AutoCloseable {
+public interface BaseRedisCommands<K, V> {
 
     /**
      * Post a message to a channel.
@@ -131,11 +131,6 @@ public interface BaseRedisCommands<K, V> extends AutoCloseable {
      */
     <T> T dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args);
 
-    /**
-     * Close the connection. The connection will become not usable anymore as soon as this method was called.
-     */
-    void close();
-
     /**
      * 
      * @return true if the connection is open (connected and not closed).
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
index f23685f16f..aa15ad93c4 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
@@ -4,6 +4,7 @@
 import java.util.Map;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 import com.lambdaworks.redis.BitFieldArgs;
+import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.SetArgs;
 
 /**
@@ -234,10 +235,10 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Stream over the values of all the given keys.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
-     * 
+     *
      * @return Long array-reply list of values at the specified keys.
      */
     Long mget(ValueStreamingChannel<V> channel, K... keys);
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
index 841a6bea7a..adf5d11c91 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
@@ -235,10 +235,10 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Stream over the values of all the given keys.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
-     * 
+     *
      * @return Long array-reply list of values at the specified keys.
      */
     AsyncExecutions<Long> mget(ValueStreamingChannel<V> channel, K... keys);
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
index f85d35899e..9539cb5b9b 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
@@ -230,17 +230,17 @@ public interface NodeSelectionStringCommands<K, V> {
      * @param keys the key
      * @return List&lt;V&gt; array-reply list of values at the specified keys.
      */
-    Executions<List<V>> mget(K... keys);
+    Executions<List<KeyValue<K, V>>> mget(K... keys);
 
     /**
      * Stream over the values of all the given keys.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
-     * 
+     *
      * @return Long array-reply list of values at the specified keys.
      */
-    Executions<Long> mget(ValueStreamingChannel<V> channel, K... keys);
+    Executions<Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys);
 
     /**
      * Set multiple keys to multiple values.
diff --git a/src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java b/src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java
index 8242dfaf0d..38731b21dd 100644
--- a/src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java
@@ -16,7 +16,7 @@
  * @author Mark Paluch
  * @since 4.0
  */
-public interface BaseRedisCommands<K, V> extends AutoCloseable {
+public interface BaseRedisCommands<K, V>  {
 
     /**
      * Post a message to a channel.
@@ -131,12 +131,6 @@ public interface BaseRedisCommands<K, V> extends AutoCloseable {
      */
     <T> T dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args);
 
-    /**
-     * Close the connection. The connection will become not usable anymore as soon as this method was called.
-     */
-    @Override
-    void close();
-
     /**
      * 
      * @return true if the connection is open (connected and not closed).
diff --git a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
index fad1917949..770b244fd8 100644
--- a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
+++ b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
@@ -44,7 +44,7 @@ public static void main(String[] args) {
         GeoCoordinates weinheimGeopos = geopos.get(0);
         System.out.println("Coordinates: " + weinheimGeopos.x + "/" + weinheimGeopos.y);
 
-        redis.close();
+        redis.getStatefulConnection().close();
         redisClient.shutdown();
     }
 }
diff --git a/src/test/java/com/lambdaworks/Connections.java b/src/test/java/com/lambdaworks/Connections.java
index f54947a246..7e13bb0b8a 100644
--- a/src/test/java/com/lambdaworks/Connections.java
+++ b/src/test/java/com/lambdaworks/Connections.java
@@ -2,6 +2,7 @@
 
 import java.util.Queue;
 
+import com.lambdaworks.redis.api.StatefulRedisConnection;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.lambdaworks.redis.RedisChannelHandler;
@@ -18,13 +19,23 @@
  */
 public class Connections {
 
+    /**
+     * Extract the {@link Channel} from a stateful connection.
+     * 
+     * @param connection
+     * @return
+     */
     public static Channel getChannel(StatefulConnection<?, ?> connection) {
         RedisChannelHandler<?, ?> channelHandler = (RedisChannelHandler<?, ?>) connection;
 
-        Channel channel = (Channel) ReflectionTestUtils.getField(channelHandler.getChannelWriter(), "channel");
-        return channel;
+        return (Channel) ReflectionTestUtils.getField(channelHandler.getChannelWriter(), "channel");
     }
 
+    /**
+     * Extract the {@link ConnectionWatchdog} from a stateful connection.
+     * @param connection
+     * @return
+     */
     public static ConnectionWatchdog getConnectionWatchdog(StatefulConnection<?, ?> connection) {
 
         Channel channel = getChannel(connection);
@@ -39,7 +50,6 @@ public static <K, V> RedisChannelWriter<K, V> getChannelWriter(StatefulConnectio
         return ((RedisChannelHandler<K, V>) connection).getChannelWriter();
     }
 
-
     public static Queue<Object> getQueue(StatefulConnection<?, ?> connection) {
         return (Queue<Object>) ReflectionTestUtils.getField(Connections.getChannelWriter(connection), "queue");
     }
diff --git a/src/test/java/com/lambdaworks/SslTest.java b/src/test/java/com/lambdaworks/SslTest.java
index 95969ce31f..de0baa3158 100644
--- a/src/test/java/com/lambdaworks/SslTest.java
+++ b/src/test/java/com/lambdaworks/SslTest.java
@@ -59,7 +59,7 @@ public void standaloneWithSsl() throws Exception {
         RedisCommands<String, String> connection = redisClient.connect(URI_NO_VERIFY).sync();
         connection.set("key", "value");
         assertThat(connection.get("key")).isEqualTo("value");
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
@@ -148,7 +148,7 @@ public void regularSslWithReconnect() throws Exception {
         connection.quit();
         Thread.sleep(200);
         assertThat(connection.ping()).isEqualTo("PONG");
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test(expected = RedisConnectionException.class)
@@ -176,8 +176,8 @@ public void pubSubSsl() throws Exception {
 
         assertThat(connection2.pubsubChannels()).contains("c1", "c2");
 
-        connection.close();
-        connection2.close();
+        connection.getStatefulConnection().close();
+        connection2.getStatefulConnection().close();
     }
 
     @Test
@@ -219,8 +219,8 @@ public void pubSubSslAndBreakConnection() throws Exception {
 
         assertThat(defectFuture.isDone()).isEqualTo(true);
 
-        connection.close();
-        connection2.close();
+        connection.getStatefulConnection().close();
+        connection2.getStatefulConnection().close();
     }
 
     private void setOptions(SslOptions sslOptions) {
diff --git a/src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java b/src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java
index f64084f7a0..b93781465d 100644
--- a/src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java
@@ -3,6 +3,7 @@
 package com.lambdaworks.redis;
 
 import com.lambdaworks.TestClientResources;
+import com.lambdaworks.redis.api.StatefulConnection;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -58,7 +59,7 @@ public void openConnection() throws Exception {
     @After
     public void closeConnection() throws Exception {
         if (redis != null) {
-            redis.close();
+            redis.getStatefulConnection().close();
         }
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/ClientTest.java b/src/test/java/com/lambdaworks/redis/ClientTest.java
index ea10cdfd9c..b024ade1d6 100644
--- a/src/test/java/com/lambdaworks/redis/ClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientTest.java
@@ -38,7 +38,7 @@ public void closeConnection() throws Exception {
 
     @Test(expected = RedisException.class)
     public void close() throws Exception {
-        redis.close();
+        redis.getStatefulConnection().close();
         redis.get(key);
     }
 
@@ -51,14 +51,14 @@ public void statefulConnectionFromSync() throws Exception {
     public void statefulConnectionFromAsync() throws Exception {
         RedisAsyncCommands<String, String> async = client.connect().async();
         assertThat(async.getStatefulConnection().async()).isSameAs(async);
-        async.close();
+        async.getStatefulConnection().close();
     }
 
     @Test
     public void statefulConnectionFromReactive() throws Exception {
         RedisAsyncCommands<String, String> async = client.connect().async();
         assertThat(async.getStatefulConnection().reactive().getStatefulConnection()).isSameAs(async.getStatefulConnection());
-        async.close();
+        async.getStatefulConnection().close();
     }
 
     @Test
@@ -84,7 +84,7 @@ public void listenerTest() throws Exception {
         assertThat(listener.onDisconnected).isNull();
 
         connection.set(key, value).get();
-        connection.close();
+        connection.getStatefulConnection().close();
 
         waitOrTimeout(new Condition() {
 
diff --git a/src/test/java/com/lambdaworks/redis/CustomCodecTest.java b/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
index a729c17187..693959379f 100644
--- a/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
+++ b/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
@@ -63,7 +63,7 @@ public void testDeflateCompressedJavaSerializer() throws Exception {
         connection.set(key, list);
         assertThat(connection.get(key)).isEqualTo(list);
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
@@ -74,7 +74,7 @@ public void testGzipompressedJavaSerializer() throws Exception {
         connection.set(key, list);
         assertThat(connection.get(key)).isEqualTo(list);
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
@@ -89,7 +89,7 @@ public void testByteCodec() throws Exception {
         List<byte[]> keys = connection.keys(key.getBytes());
         assertThat(keys).contains(key.getBytes());
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
@@ -103,7 +103,7 @@ public void testExperimentalByteCodec() throws Exception {
 
         List<byte[]> keys = connection.keys(key.getBytes());
         assertThat(keys).contains(key.getBytes());
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     public class SerializedObjectCodec implements RedisCodec<String, Object> {
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
index 3b63e65350..d865d30dcf 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
@@ -48,7 +48,7 @@ public void openReactiveConnection() throws Exception {
 
     @After
     public void closeReactiveConnection() throws Exception {
-        reactive.close();
+        reactive.getStatefulConnection().close();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java b/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
index 263a793fad..8e057d5eba 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
@@ -32,7 +32,7 @@ public void openReactiveConnection() throws Exception {
 
     @After
     public void closeReactiveConnection() throws Exception {
-        reactive.close();
+        reactive.getStatefulConnection().close();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
index 3a1b7ff77f..aa9b6fa00b 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
@@ -47,7 +47,7 @@ public void before() throws Exception {
 
     @After
     public void after() throws Exception {
-        commands.close();
+        commands.getStatefulConnection().close();
     }
 
     @Test
@@ -81,21 +81,6 @@ public void partitions() throws Exception {
         assertThat(partitions).hasSize(4);
     }
 
-    @Test
-    public void doWeirdThingsWithClusterconnections() throws Exception {
-
-        assertThat(clusterClient.getPartitions()).hasSize(4);
-
-        for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
-            RedisClusterAsyncCommands<String, String> nodeConnection = commands.getConnection(redisClusterNode.getNodeId());
-
-            nodeConnection.close();
-
-            RedisClusterAsyncCommands<String, String> nextConnection = commands.getConnection(redisClusterNode.getNodeId());
-            assertThat(commands).isNotSameAs(nextConnection);
-        }
-    }
-
     @Test
     public void differentConnections() throws Exception {
 
@@ -391,7 +376,7 @@ public void testSync() throws Exception {
     @Test
     public void routeCommandTonoAddrPartition() throws Exception {
 
-        RedisClusterCommands<String, String> sync = clusterClient.connect().sync();
+        RedisAdvancedClusterCommands<String, String> sync = clusterClient.connect().sync();
         try {
 
             Partitions partitions = clusterClient.getPartitions();
@@ -406,13 +391,13 @@ public void routeCommandTonoAddrPartition() throws Exception {
             clusterClient.getPartitions().clear();
             clusterClient.reloadPartitions();
         }
-        sync.close();
+        sync.getStatefulConnection().close();
     }
 
     @Test
     public void routeCommandToForbiddenHostOnRedirect() throws Exception {
 
-        RedisClusterCommands<String, String> sync = clusterClient.connect().sync();
+        RedisAdvancedClusterCommands<String, String> sync = clusterClient.connect().sync();
         try {
 
             Partitions partitions = clusterClient.getPartitions();
@@ -434,7 +419,7 @@ public void routeCommandToForbiddenHostOnRedirect() throws Exception {
             clusterClient.getPartitions().clear();
             clusterClient.reloadPartitions();
         }
-        sync.close();
+        sync.getStatefulConnection().close();
     }
 
     @Test
@@ -461,7 +446,7 @@ public void getConnectionToNotAClusterMemberAllowed() throws Exception {
     @Test
     public void pipelining() throws Exception {
 
-        RedisClusterCommands<String, String> verificationConnection = clusterClient.connect().sync();
+        RedisAdvancedClusterCommands<String, String> verificationConnection = clusterClient.connect().sync();
 
         // preheat the first connection
         commands.get(key(0)).get();
@@ -485,7 +470,7 @@ public void pipelining() throws Exception {
             assertThat(verificationConnection.get(key(i))).as("Key " + key(i) + " must be " + value(i)).isEqualTo(value(i));
         }
 
-        verificationConnection.close();
+        verificationConnection.getStatefulConnection().close();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
index 3ee8c4e1c0..92b585eaec 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
@@ -24,7 +24,7 @@
 import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.commands.rx.RxSyncInvocationHandler;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 
 import rx.Observable;
 import rx.Single;
@@ -48,7 +48,7 @@ public void before() throws Exception {
 
     @After
     public void after() throws Exception {
-        commands.close();
+        commands.getStatefulConnection().close();
     }
 
     @Test(expected = RedisException.class)
@@ -62,21 +62,6 @@ public void invalidHost() throws Exception {
         commands.getConnection("invalid-host", -1);
     }
 
-    @Test
-    public void doWeirdThingsWithClusterconnections() throws Exception {
-
-        assertThat(clusterClient.getPartitions()).hasSize(4);
-
-        for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
-            RedisClusterReactiveCommands<String, String> nodeConnection = commands.getConnection(redisClusterNode.getNodeId());
-
-            nodeConnection.close();
-
-            RedisClusterReactiveCommands<String, String> nextConnection = commands.getConnection(redisClusterNode.getNodeId());
-            assertThat(commands).isNotSameAs(nextConnection);
-        }
-    }
-
     @Test
     public void msetCrossSlot() throws Exception {
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
index 82f2b9ca39..dba6a999ff 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
@@ -55,7 +55,7 @@ public void before() throws Exception {
 
     @After
     public void after() throws Exception {
-        async.close();
+        async.getStatefulConnection().close();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java
index e2c9b93964..d098ca6203 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java
@@ -77,7 +77,7 @@ public static void setup2Masters(ClusterRule clusterRule) throws InterruptedExce
                             redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.MASTER)).count();
                 }).waitOrTimeout();
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     /**
@@ -131,7 +131,7 @@ public static void setupMasterWithSlave(ClusterRule clusterRule) throws Interrup
                             redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE)).count();
                 }).waitOrTimeout();
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     protected static Stream<RedisClusterNode> partitionStream(ClusterRule clusterRule) {
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java
index fd12451b4e..fd3405d370 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java
@@ -9,6 +9,7 @@
 import com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser;
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.util.RoutingInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -73,7 +74,9 @@ public static void flushDatabaseOfAllNodes(StatefulRedisClusterConnection<?, ?>
     public static RedisCommands<String, String> redisCommandsOverCluster(
             StatefulRedisClusterConnection<String, String> connection) {
         StatefulRedisClusterConnectionImpl clusterConnection = (StatefulRedisClusterConnectionImpl) connection;
-        InvocationHandler h = clusterConnection.syncInvocationHandler();
+
+        InvocationHandler h = new RoutingInvocationHandler(connection.async(),
+                clusterConnection.syncInvocationHandler());
         return (RedisCommands<String, String>) Proxy.newProxyInstance(ClusterTestUtil.class.getClassLoader(),
                 new Class[] { RedisCommands.class }, h);
     }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java b/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java
index c6c38a2bbe..f04f440e1f 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java
@@ -42,7 +42,7 @@ public void before() throws Exception {
 
     @After
     public void after() throws Exception {
-        commands.close();
+        commands.getStatefulConnection().close();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionSyncTest.java b/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionSyncTest.java
index c14a497ea3..ff491e4211 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionSyncTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionSyncTest.java
@@ -40,7 +40,7 @@ public void before() throws Exception {
 
     @After
     public void after() throws Exception {
-        commands.close();
+        commands.getStatefulConnection().close();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
index a9d6519b4c..1b6cfbc7dd 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
@@ -11,6 +11,7 @@
 import java.util.concurrent.TimeUnit;
 
 import com.lambdaworks.TestClientResources;
+import com.lambdaworks.redis.api.sync.RedisCommands;
 import org.assertj.core.api.AssertionsForClassTypes;
 import org.junit.*;
 import org.junit.runners.MethodSorters;
@@ -39,10 +40,10 @@ public class RedisClusterClientTest extends AbstractClusterTest {
     private StatefulRedisConnection<String, String> redis3;
     private StatefulRedisConnection<String, String> redis4;
 
-    private RedisClusterCommands<String, String> redissync1;
-    private RedisClusterCommands<String, String> redissync2;
-    private RedisClusterCommands<String, String> redissync3;
-    private RedisClusterCommands<String, String> redissync4;
+    private RedisCommands<String, String> redissync1;
+    private RedisCommands<String, String> redissync2;
+    private RedisCommands<String, String> redissync3;
+    private RedisCommands<String, String> redissync4;
 
     protected RedisAdvancedClusterCommands<String, String> sync;
 
@@ -82,27 +83,27 @@ public void before() throws Exception {
 
     @After
     public void after() throws Exception {
-        sync.close();
+        sync.getStatefulConnection().close();
         redis1.close();
 
-        redissync1.close();
-        redissync2.close();
-        redissync3.close();
-        redissync4.close();
+        redissync1.getStatefulConnection().close();
+        redissync2.getStatefulConnection().close();
+        redissync3.getStatefulConnection().close();
+        redissync4.getStatefulConnection().close();
     }
 
     @Test
     public void statefulConnectionFromSync() throws Exception {
         RedisAdvancedClusterCommands<String, String> sync = clusterClient.connect().sync();
         assertThat(sync.getStatefulConnection().sync()).isSameAs(sync);
-        sync.close();
+        sync.getStatefulConnection().close();
     }
 
     @Test
     public void statefulConnectionFromAsync() throws Exception {
         RedisAdvancedClusterAsyncCommands<String, String> async = clusterClient.connect().async();
         assertThat(async.getStatefulConnection().async()).isSameAs(async);
-        async.close();
+        async.getStatefulConnection().close();
     }
 
     @Test
@@ -188,14 +189,14 @@ public void testClusteredOperations() throws Exception {
         }
 
         clusterClient.reloadPartitions();
-        RedisClusterCommands<String, String> connection = clusterClient.connect().sync();
+        RedisAdvancedClusterCommands<String, String> connection = clusterClient.connect().sync();
 
 
         assertThat(connection.set(KEY_A, value)).isEqualTo("OK");
         assertThat(connection.set(KEY_B, "myValue2")).isEqualTo("OK");
         assertThat(connection.set(KEY_D, "myValue2")).isEqualTo("OK");
 
-        connection.close();
+        connection.getStatefulConnection().close();
 
     }
 
@@ -223,7 +224,7 @@ public void testClusterCommandRedirection() throws Exception {
 
         // gets redirection to node 3
         assertThat(connection.set(KEY_A, value).get()).isEqualTo("OK");
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
@@ -263,7 +264,7 @@ public void testClusterRedirection() throws Exception {
         assertThat(setA.getError()).isNull();
         assertThat(setA.get()).isEqualTo("OK");
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
@@ -293,21 +294,20 @@ public void testClusterRedirectionLimit() throws Exception {
         setA.await(10, TimeUnit.SECONDS);
         assertThat(setA.getError()).isEqualTo("MOVED 15495 127.0.0.1:7380");
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test(expected = RedisException.class)
     public void closeConnection() throws Exception {
 
-        try (RedisAdvancedClusterCommands<String, String> connection = clusterClient.connect().sync()) {
+        RedisAdvancedClusterCommands<String, String> connection = clusterClient.connect().sync();
 
             List<String> time = connection.time();
             assertThat(time).hasSize(2);
 
-            connection.close();
+            connection.getStatefulConnection().close();
 
             connection.time();
-        }
     }
 
     @Test
@@ -531,7 +531,7 @@ public void testPfmerge() throws Exception {
 
         assertThat(connection.pfcount("key8885")).isEqualTo(3);
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     private void assertTimeout(StatefulConnection<?, ?> connection, long expectedTimeout, TimeUnit expectedTimeUnit) {
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
index 0f9aef7397..d873a27916 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
@@ -43,7 +43,7 @@ public void before() throws Exception {
 
     @After
     public void after() throws Exception {
-        sync.close();
+        sync.getStatefulConnection().close();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
index dfe8a71cc5..9cb11224ed 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
@@ -14,6 +14,7 @@
 import java.util.concurrent.TimeoutException;
 
 import com.lambdaworks.TestClientResources;
+import com.lambdaworks.redis.api.sync.RedisCommands;
 import org.junit.*;
 
 import com.google.code.tempusfugit.temporal.Condition;
@@ -51,8 +52,8 @@ public class RedisClusterSetupTest extends AbstractTest {
     private static RedisClusterClient clusterClient;
     private static RedisClient client = DefaultRedisClient.get();
 
-    private RedisClusterCommands<String, String> redis1;
-    private RedisClusterCommands<String, String> redis2;
+    private RedisCommands<String, String> redis1;
+    private RedisCommands<String, String> redis2;
 
     @Rule
     public ClusterRule clusterRule = new ClusterRule(clusterClient, AbstractClusterTest.port5, AbstractClusterTest.port6);
@@ -77,8 +78,8 @@ public void openConnection() throws Exception {
 
     @After
     public void closeConnection() throws Exception {
-        redis1.close();
-        redis2.close();
+        redis1.getStatefulConnection().close();
+        redis2.getStatefulConnection().close();
     }
 
     @Test
@@ -180,7 +181,7 @@ public void clusterTopologyRefresh() throws Exception {
         ClusterSetup.setup2Masters(clusterRule);
         assertThat(clusterClient.getPartitions()).hasSize(2);
 
-        clusterConnection.close();
+        clusterConnection.getStatefulConnection().close();
     }
 
     @Test
@@ -226,7 +227,7 @@ public void changeTopologyWhileOperations() throws Exception {
         assertThat(sync.get("t")).isEqualTo("value");
         assertThat(sync.get("p")).isEqualTo("value");
 
-        async.close();
+        async.getStatefulConnection().close();
     }
 
     @Test
@@ -248,7 +249,7 @@ public void slotMigrationShouldUseAsking() throws Exception {
 
         assertThat(sync.get("b")).isNull();
 
-        async.close();
+        async.getStatefulConnection().close();
     }
 
     @Test
@@ -280,7 +281,7 @@ public void disconnectedConnectionRejectTest() throws Exception {
         } catch (ExecutionException e) {
             assertThat(e).hasRootCauseInstanceOf(RedisException.class).hasMessageContaining("not connected");
         } finally {
-            clusterConnection.close();
+            clusterConnection.getStatefulConnection().close();
         }
     }
 
@@ -324,7 +325,7 @@ public void atLeastOnceForgetNodeFailover() throws Exception {
 
         assertRoutedExecution(clusterConnection);
 
-        clusterConnection.close();
+        clusterConnection.getStatefulConnection().close();
 
     }
 
@@ -362,7 +363,7 @@ public void expireStaleNodeIdConnections() throws Exception {
         Wait.untilEquals(1, () -> clusterClient.getPartitions().size()).waitOrTimeout();
         Wait.untilEquals(1, () -> clusterConnectionProvider.getConnectionCount()).waitOrTimeout();
 
-        clusterConnection.close();
+        clusterConnection.getStatefulConnection().close();
 
     }
 
@@ -408,7 +409,7 @@ public void doNotExpireStaleNodeIdConnections() throws Exception {
 
         assertThat(clusterConnectionProvider.getConnectionCount()).isEqualTo(2);
 
-        clusterConnection.close();
+        clusterConnection.getStatefulConnection().close();
 
     }
 
@@ -454,7 +455,7 @@ public void expireStaleHostAndPortConnections() throws Exception {
         Wait.untilEquals(1, () -> clusterClient.getPartitions().size()).waitOrTimeout();
         Wait.untilEquals(2L, () -> clusterConnectionProvider.getConnectionCount()).waitOrTimeout();
 
-        clusterConnection.close();
+        clusterConnection.getStatefulConnection().close();
     }
 
     @Test
@@ -472,7 +473,7 @@ public void readFromSlaveTest() throws Exception {
             assertThat(e).hasMessageContaining("Cannot determine a partition to read for slot");
         }
 
-        clusterConnection.close();
+        clusterConnection.getStatefulConnection().close();
     }
 
     @Test
@@ -486,7 +487,7 @@ public void readFromNearestTest() throws Exception {
 
         assertThat(clusterConnection.get(key)).isEqualTo(value);
 
-        clusterConnection.close();
+        clusterConnection.getStatefulConnection().close();
     }
 
     protected PooledClusterConnectionProvider<String, String> getPooledClusterConnectionProvider(
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
index abafa964be..29b7e2ff76 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
@@ -13,6 +13,9 @@
 import org.apache.logging.log4j.Logger;
 import com.lambdaworks.TestClientResources;
 import org.junit.*;
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
+import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
 import org.junit.runners.MethodSorters;
 
 import com.google.code.tempusfugit.temporal.Duration;
@@ -42,8 +45,8 @@ public class RedisClusterStressScenariosTest extends AbstractTest {
     protected StatefulRedisConnection<String, String> redis5;
     protected StatefulRedisConnection<String, String> redis6;
 
-    protected RedisClusterCommands<String, String> redissync5;
-    protected RedisClusterCommands<String, String> redissync6;
+    protected RedisCommands<String, String> redissync5;
+    protected RedisCommands<String, String> redissync6;
 
     protected String key = "key";
     protected String value = "value";
@@ -86,8 +89,8 @@ public void before() throws Exception {
     public void after() throws Exception {
         redis5.close();
 
-        redissync5.close();
-        redissync6.close();
+        redissync5.getStatefulConnection().close();
+        redissync6.getStatefulConnection().close();
     }
 
     @Test
@@ -135,7 +138,7 @@ public void testClusterConnectionStability() throws Exception {
         final RedisAsyncCommands<Object, Object> slotConnection = statefulSlotConnection.async();
 
         slotConnection.set("a", "b");
-        slotConnection.close();
+        slotConnection.getStatefulConnection().close();
 
         WaitFor.waitOrTimeout(() -> !slotConnection.isOpen(), timeout(seconds(5)));
 
@@ -152,14 +155,14 @@ public void testClusterConnectionStability() throws Exception {
             assertThat(e).hasMessageContaining("Connection is closed");
         }
 
-        connection.close();
+        connection.getStatefulConnection().close();
 
     }
 
     @Test(timeout = 20000)
     public void distributedClusteredAccessAsync() throws Exception {
 
-        RedisClusterAsyncCommands<String, String> connection = clusterClient.connect().async();
+        RedisAdvancedClusterAsyncCommands<String, String> connection = clusterClient.connect().async();
 
         List<RedisFuture<?>> futures = new ArrayList<>();
         for (int i = 0; i < 100; i++) {
@@ -190,13 +193,13 @@ public void distributedClusteredAccessAsync() throws Exception {
             assertThat(setD.get()).isEqualTo("myValue3" + i);
         }
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
     public void distributedClusteredAccessSync() throws Exception {
 
-        RedisClusterCommands<String, String> connection = clusterClient.connect().sync();
+        RedisAdvancedClusterCommands<String, String> connection = clusterClient.connect().sync();
 
         for (int i = 0; i < 100; i++) {
             connection.set("a" + i, "myValue1" + i);
@@ -211,7 +214,7 @@ public void distributedClusteredAccessSync() throws Exception {
             assertThat(connection.get("d" + i)).isEqualTo("myValue3" + i);
         }
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/HashClusterRxCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/HashClusterRxCommandTest.java
index 0c63ba0d2a..bdbcd39d3e 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/HashClusterRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/HashClusterRxCommandTest.java
@@ -12,7 +12,7 @@
 import com.lambdaworks.redis.cluster.RedisClusterClient;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.commands.HashCommandTest;
-import com.lambdaworks.redis.commands.rx.RxSyncInvocationHandler;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/ListClusterRxCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/ListClusterRxCommandTest.java
index 228314d201..340526ec1a 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/ListClusterRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/ListClusterRxCommandTest.java
@@ -14,7 +14,7 @@
 import com.lambdaworks.redis.cluster.RedisClusterClient;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.commands.ListCommandTest;
-import com.lambdaworks.redis.commands.rx.RxSyncInvocationHandler;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/StringClusterRxCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/StringClusterRxCommandTest.java
index 38bb7b794d..fc0edb35b0 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/StringClusterRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/StringClusterRxCommandTest.java
@@ -19,7 +19,7 @@
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.api.rx.RedisAdvancedClusterReactiveCommands;
 import com.lambdaworks.redis.commands.StringCommandTest;
-import com.lambdaworks.redis.commands.rx.RxSyncInvocationHandler;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 
 import rx.Observable;
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyRefreshTest.java b/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyRefreshTest.java
index a16e817159..35f5024717 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyRefreshTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyRefreshTest.java
@@ -7,15 +7,16 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiFunction;
 
-import io.netty.util.concurrent.ScheduledFuture;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import com.lambdaworks.Wait;
 import com.lambdaworks.category.SlowTests;
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.async.BaseRedisAsyncCommands;
+import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.cluster.AbstractClusterTest;
 import com.lambdaworks.redis.cluster.ClusterClientOptions;
 import com.lambdaworks.redis.cluster.ClusterTopologyRefreshOptions;
@@ -23,10 +24,11 @@
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
 import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
+import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import org.springframework.test.util.ReflectionTestUtils;
+
+import io.netty.util.concurrent.ScheduledFuture;
 
 /**
  * Test for topology refreshing.
@@ -41,8 +43,8 @@ public class TopologyRefreshTest extends AbstractTest {
     private static RedisClient client = DefaultRedisClient.get();
 
     private RedisClusterClient clusterClient;
-    private RedisClusterCommands<String, String> redis1;
-    private RedisClusterCommands<String, String> redis2;
+    private RedisCommands<String, String> redis1;
+    private RedisCommands<String, String> redis2;
 
     @Before
     public void openConnection() throws Exception {
@@ -54,8 +56,8 @@ public void openConnection() throws Exception {
 
     @After
     public void closeConnection() throws Exception {
-        redis1.close();
-        redis2.close();
+        redis1.getStatefulConnection().close();
+        redis2.getStatefulConnection().close();
         FastShutdown.shutdown(clusterClient);
     }
 
@@ -69,8 +71,8 @@ public void shouldUnsubscribeTopologyRefresh() throws Exception {
 
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
 
-        AtomicBoolean clusterTopologyRefreshActivated = (AtomicBoolean) ReflectionTestUtils
-                .getField(clusterClient, "clusterTopologyRefreshActivated");
+        AtomicBoolean clusterTopologyRefreshActivated = (AtomicBoolean) ReflectionTestUtils.getField(clusterClient,
+                "clusterTopologyRefreshActivated");
 
         AtomicReference<ScheduledFuture<?>> clusterTopologyRefreshFuture = (AtomicReference) ReflectionTestUtils
                 .getField(clusterClient, "clusterTopologyRefreshFuture");
@@ -80,7 +82,7 @@ public void shouldUnsubscribeTopologyRefresh() throws Exception {
 
         ScheduledFuture<?> scheduledFuture = clusterTopologyRefreshFuture.get();
 
-        clusterConnection.close();
+        clusterConnection.getStatefulConnection().close();
 
         FastShutdown.shutdown(clusterClient);
 
@@ -106,7 +108,7 @@ public void changeTopologyWhileOperations() throws Exception {
             return !clusterClient.getPartitions().isEmpty();
         }).waitOrTimeout();
 
-        clusterConnection.close();
+        clusterConnection.getStatefulConnection().close();
     }
 
     @Test
@@ -123,7 +125,7 @@ public void dynamicSourcesProvidesClientCountForAllNodes() throws Exception {
             assertThat(snapshot.getConnectedClients()).isNotNull().isGreaterThanOrEqualTo(0);
         }
 
-        clusterConnection.close();
+        clusterConnection.getStatefulConnection().close();
     }
 
     @Test
@@ -141,7 +143,7 @@ public void staticSourcesProvidesClientCountForSeedNodes() throws Exception {
         RedisClusterNodeSnapshot node2 = (RedisClusterNodeSnapshot) partitions.getPartitionBySlot(15000);
         assertThat(node2.getConnectedClients()).isNull();
 
-        clusterConnection.close();
+        clusterConnection.getStatefulConnection().close();
     }
 
     @Test
@@ -199,7 +201,7 @@ public void adaptiveTopologyUpdateIsRateLimited() throws Exception {
 
         assertThat(clusterClient.getPartitions()).isEmpty();
 
-        clusterConnection.close();
+        clusterConnection.getStatefulConnection().close();
     }
 
     @Test
@@ -227,7 +229,7 @@ public void adaptiveTopologyUpdatetUsesTimeout() throws Exception {
             return !clusterClient.getPartitions().isEmpty();
         }).waitOrTimeout();
 
-        clusterConnection.close();
+        clusterConnection.getStatefulConnection().close();
     }
 
     @Test
@@ -245,7 +247,7 @@ public void adaptiveTriggerDoesNotFireOnSingleReconnect() throws Exception {
         Thread.sleep(500);
 
         assertThat(clusterClient.getPartitions()).isEmpty();
-        clusterConnection.close();
+        clusterConnection.getStatefulConnection().close();
     }
 
     @Test
@@ -281,7 +283,7 @@ public Integer get() throws Exception {
 
         assertThat(clusterClient.getPartitions().getPartitionByNodeId(node1.getNodeId()).getSlots()).hasSize(12000);
         assertThat(clusterClient.getPartitions().getPartitionByNodeId(node2.getNodeId()).getSlots()).hasSize(4384);
-        clusterConnection.close();
+        clusterConnection.getStatefulConnection().close();
     }
 
     private void runReconnectTest(
@@ -305,7 +307,9 @@ private void runReconnectTest(
             return !clusterClient.getPartitions().isEmpty();
         }).waitOrTimeout();
 
-        closeable.close();
-        clusterConnection.close();
+        if (closeable instanceof RedisAdvancedClusterCommands) {
+            ((RedisAdvancedClusterCommands) closeable).getStatefulConnection().close();
+        }
+        clusterConnection.getStatefulConnection().close();
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/BitRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/BitRxCommandTest.java
index 97c3e35199..4bcf9c148d 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/BitRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/BitRxCommandTest.java
@@ -2,6 +2,7 @@
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.BitCommandTest;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/CustomRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/CustomRxCommandTest.java
index 45e08589bc..5ccbe933c9 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/CustomRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/CustomRxCommandTest.java
@@ -1,5 +1,6 @@
 package com.lambdaworks.redis.commands.rx;
 
+import com.lambdaworks.util.RxSyncInvocationHandler;
 import org.junit.Test;
 
 import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/GeoRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/GeoRxCommandTest.java
index d90ec8abdf..685ade80c4 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/GeoRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/GeoRxCommandTest.java
@@ -2,6 +2,7 @@
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.GeoCommandTest;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 
 public class GeoRxCommandTest extends GeoCommandTest {
 
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/HLLRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/HLLRxCommandTest.java
index 5ed77472e4..2b26e3fea9 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/HLLRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/HLLRxCommandTest.java
@@ -2,6 +2,7 @@
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.HLLCommandTest;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 
 public class HLLRxCommandTest extends HLLCommandTest {
 
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/HashRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/HashRxCommandTest.java
index 4b93ca8a1f..a6786af741 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/HashRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/HashRxCommandTest.java
@@ -2,6 +2,7 @@
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.HashCommandTest;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 
 public class HashRxCommandTest extends HashCommandTest {
 
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/KeyRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/KeyRxCommandTest.java
index 679a259b3b..92c51ed297 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/KeyRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/KeyRxCommandTest.java
@@ -2,6 +2,7 @@
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.KeyCommandTest;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 
 public class KeyRxCommandTest extends KeyCommandTest {
     @Override
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/ListRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/ListRxCommandTest.java
index 034ae0f54f..7c25c7ce56 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/ListRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/ListRxCommandTest.java
@@ -2,6 +2,7 @@
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.ListCommandTest;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 
 public class ListRxCommandTest extends ListCommandTest {
     @Override
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/NumericRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/NumericRxCommandTest.java
index 04bf948fc8..e93c0496c9 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/NumericRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/NumericRxCommandTest.java
@@ -2,6 +2,7 @@
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.NumericCommandTest;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 
 public class NumericRxCommandTest extends NumericCommandTest {
     @Override
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/ScriptingRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/ScriptingRxCommandTest.java
index 0674bc083e..33f4c9225e 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/ScriptingRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/ScriptingRxCommandTest.java
@@ -2,6 +2,7 @@
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.ScriptingCommandTest;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 
 public class ScriptingRxCommandTest extends ScriptingCommandTest {
 
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/ServerRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/ServerRxCommandTest.java
index c1cf9f3bf3..f90eef80ca 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/ServerRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/ServerRxCommandTest.java
@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.lambdaworks.util.RxSyncInvocationHandler;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/SetRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/SetRxCommandTest.java
index d69b345aa6..091520bfb1 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/SetRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/SetRxCommandTest.java
@@ -2,6 +2,7 @@
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.SetCommandTest;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 
 public class SetRxCommandTest extends SetCommandTest {
 
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/SortRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/SortRxCommandTest.java
index 166522560a..37d1d05719 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/SortRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/SortRxCommandTest.java
@@ -2,6 +2,7 @@
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.SortCommandTest;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 
 public class SortRxCommandTest extends SortCommandTest {
     @Override
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/SortedSetRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/SortedSetRxCommandTest.java
index 4c10f21f18..2e5a153e1d 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/SortedSetRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/SortedSetRxCommandTest.java
@@ -2,6 +2,7 @@
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.SortedSetCommandTest;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 
 public class SortedSetRxCommandTest extends SortedSetCommandTest {
     @Override
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/StringRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/StringRxCommandTest.java
index f18481bd99..5157f6deff 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/StringRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/StringRxCommandTest.java
@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.lambdaworks.util.RxSyncInvocationHandler;
 import org.junit.Test;
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
index a83f006b02..24741dd299 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
@@ -5,6 +5,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import com.lambdaworks.util.RxSyncInvocationHandler;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -42,7 +43,7 @@ public void openConnection() throws Exception {
 
     @After
     public void closeConnection() throws Exception {
-        redis.close();
+        redis.getStatefulConnection().close();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java b/src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java
index 2a6c6399ee..31942a6faf 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java
@@ -79,13 +79,13 @@ public void after() throws Exception {
         if (connectionToNode1 != null) {
             connectionToNode1.configSet("requirepass", "");
             connectionToNode1.configSet("masterauth", "").get(1, TimeUnit.SECONDS);
-            connectionToNode1.close();
+            connectionToNode1.getStatefulConnection().close();
         }
 
         if (connectionToNode2 != null) {
             connectionToNode2.configSet("requirepass", "");
             connectionToNode2.configSet("masterauth", "").get(1, TimeUnit.SECONDS);
-            connectionToNode2.close();
+            connectionToNode2.getStatefulConnection().close();
         }
 
         if (connection != null) {
diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java b/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
index 471d0463b7..ae6e4fde2e 100644
--- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
@@ -48,7 +48,7 @@ public void openPubSubConnection() throws Exception {
 
     @After
     public void closePubSubConnection() throws Exception {
-        pubsub.close();
+        pubsub.getStatefulConnection().close();
     }
 
     @Test
@@ -111,7 +111,7 @@ public void pipelinedMessage() throws Exception {
         assertThat(channels.take()).isEqualTo(channel);
         assertThat(messages.take()).isEqualTo(message);
 
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 
     @Test(timeout = 2000)
diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubRxTest.java b/src/test/java/com/lambdaworks/redis/pubsub/PubSubRxTest.java
index b91e62b11e..636aa3c57b 100644
--- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubRxTest.java
+++ b/src/test/java/com/lambdaworks/redis/pubsub/PubSubRxTest.java
@@ -66,8 +66,8 @@ public void openPubSubConnection() throws Exception {
 
     @After
     public void closePubSubConnection() throws Exception {
-        pubsub.close();
-        pubsub2.close();
+        pubsub.getStatefulConnection().close();
+        pubsub2.getStatefulConnection().close();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
index ebc42698da..a9c9c4486a 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
@@ -230,7 +230,7 @@ public boolean hasMaster(int... redisPorts) {
             }
         } finally {
             for (RedisCommands<String, String> commands : connections.values()) {
-                commands.close();
+                commands.getStatefulConnection().close();
             }
         }
 
@@ -312,7 +312,7 @@ public int setupMasterSlave(int... redisPorts) {
             }
         } finally {
             for (RedisCommands<String, String> commands : connections.values()) {
-                commands.close();
+                commands.getStatefulConnection().close();
             }
         }
 
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/rx/SentinelRxCommandTest.java b/src/test/java/com/lambdaworks/redis/sentinel/rx/SentinelRxCommandTest.java
index cf6e5ed6a5..6d0e139289 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/rx/SentinelRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/rx/SentinelRxCommandTest.java
@@ -4,7 +4,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.commands.rx.RxSyncInvocationHandler;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 import com.lambdaworks.redis.sentinel.SentinelCommandTest;
 import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
 import com.lambdaworks.redis.sentinel.api.rx.RedisSentinelReactiveCommands;
diff --git a/src/test/java/com/lambdaworks/redis/support/InjectedClient.java b/src/test/java/com/lambdaworks/redis/support/InjectedClient.java
index b1897c7ec3..0a81ac8d1e 100644
--- a/src/test/java/com/lambdaworks/redis/support/InjectedClient.java
+++ b/src/test/java/com/lambdaworks/redis/support/InjectedClient.java
@@ -42,7 +42,7 @@ public void pingRedis() {
     @PreDestroy
     public void preDestroy() {
         if (connection != null) {
-            connection.close();
+            connection.getStatefulConnection().close();
         }
     }
 }
diff --git a/src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java b/src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java
new file mode 100644
index 0000000000..378bdc3b30
--- /dev/null
+++ b/src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java
@@ -0,0 +1,46 @@
+package com.lambdaworks.util;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+import com.lambdaworks.redis.api.StatefulConnection;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
+import com.lambdaworks.redis.internal.AbstractInvocationHandler;
+
+/**
+ * @author Mark Paluch
+ */
+public class ConnectionDecoratingInvocationHandler extends AbstractInvocationHandler {
+
+    private final Object target;
+
+    public ConnectionDecoratingInvocationHandler(Object target) {
+        this.target = target;
+    }
+
+    @Override
+    protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
+
+        Method targetMethod = target.getClass().getMethod(method.getName(), method.getParameterTypes());
+        Method proxyMethod = proxy.getClass().getMethod(method.getName(), method.getParameterTypes());
+
+        Object result = targetMethod.invoke(target, args);
+
+        if (result instanceof StatefulConnection) {
+
+            Class[] interfaces;
+            if (result instanceof StatefulRedisClusterConnection
+                    && proxyMethod.getReturnType().isAssignableFrom(StatefulRedisClusterConnection.class)) {
+                interfaces = new Class[] { StatefulConnection.class, StatefulRedisClusterConnection.class };
+            } else {
+                interfaces = new Class[] { StatefulConnection.class, StatefulRedisConnection.class };
+            }
+
+            return Proxy.newProxyInstance(getClass().getClassLoader(), interfaces,
+                    new ConnectionDecoratingInvocationHandler(result));
+        }
+
+        return result;
+    }
+}
diff --git a/src/test/java/com/lambdaworks/util/RoutingInvocationHandler.java b/src/test/java/com/lambdaworks/util/RoutingInvocationHandler.java
new file mode 100644
index 0000000000..df73250a24
--- /dev/null
+++ b/src/test/java/com/lambdaworks/util/RoutingInvocationHandler.java
@@ -0,0 +1,27 @@
+package com.lambdaworks.util;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+
+/**
+ * @author Mark Paluch
+ */
+public class RoutingInvocationHandler extends ConnectionDecoratingInvocationHandler {
+
+    private final InvocationHandler delegate;
+
+    public RoutingInvocationHandler(Object target, InvocationHandler delegate) {
+        super(target);
+        this.delegate = delegate;
+    }
+
+    @Override
+    protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
+
+        if (method.getName().equals("getStatefulConnection")) {
+            return super.handleInvocation(proxy, method, args);
+        }
+
+        return delegate.invoke(proxy, method, args);
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/RxSyncInvocationHandler.java b/src/test/java/com/lambdaworks/util/RxSyncInvocationHandler.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/commands/rx/RxSyncInvocationHandler.java
rename to src/test/java/com/lambdaworks/util/RxSyncInvocationHandler.java
index 1a7730d729..46bd2f18bd 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/RxSyncInvocationHandler.java
+++ b/src/test/java/com/lambdaworks/util/RxSyncInvocationHandler.java
@@ -1,4 +1,4 @@
-package com.lambdaworks.redis.commands.rx;
+package com.lambdaworks.util;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -28,12 +28,13 @@
  * @param <K>
  * @param <V>
  */
-public class RxSyncInvocationHandler<K, V> extends AbstractInvocationHandler {
+public class RxSyncInvocationHandler<K, V> extends ConnectionDecoratingInvocationHandler {
 
     private final StatefulConnection<?, ?> connection;
     private final Object rxApi;
 
     public RxSyncInvocationHandler(StatefulConnection<?, ?> connection, Object rxApi) {
+        super(rxApi);
         this.connection = connection;
         this.rxApi = rxApi;
     }
@@ -44,14 +45,16 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
 
         try {
 
-            Method targetMethod = rxApi.getClass().getMethod(method.getName(), method.getParameterTypes());
-
-            Object result = targetMethod.invoke(rxApi, args);
+            Object result = super.handleInvocation(proxy, method, args);
 
             if (result == null) {
                 return result;
             }
 
+            if (result instanceof StatefulConnection) {
+                return result;
+            }
+
             if (result instanceof Observable<?>) {
                 Observable<?> observable = (Observable<?>) result;
 

From 849cf20bbb6201a697f0da08216dd2985c276dad Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 26 Jul 2016 20:34:33 +0200
Subject: [PATCH 008/808] Provide Value types #350

Value, KeyValue and ScoredValue now share a common hierarchy that allows transformation and mapping of values. Value types can have either a value or the value can be empty.

Value.just("a value")
Value.fromNullable(nullableVariable)
Value.from(optional)

KeyValue.just(key, "value")
KeyValue.fromNullable(key, nullableVariable)
KeyValue.from(key, optional)
---
 .../java/com/lambdaworks/redis/KeyValue.java  | 153 +++++++++--
 .../redis/RedisCommandBuilder.java            |   4 +-
 .../com/lambdaworks/redis/ScoredValue.java    | 155 ++++++++++-
 .../java/com/lambdaworks/redis/Value.java     | 247 ++++++++++++++++++
 .../redis/output/KeyValueOutput.java          |   2 +-
 .../redis/output/ScoredValueListOutput.java   |   2 +-
 .../redis/output/ScoredValueScanOutput.java   |   2 +-
 .../ScoredValueScanStreamingOutput.java       |   2 +-
 .../output/ScoredValueStreamingOutput.java    |   2 +-
 .../com/lambdaworks/redis/AbstractTest.java   |   4 +-
 .../com/lambdaworks/redis/KeyValueTest.java   |  98 ++++++-
 .../redis/ListStreamingAdapter.java           |   4 +-
 .../lambdaworks/redis/ScoredValueTest.java    | 101 ++++++-
 .../java/com/lambdaworks/redis/ValueTest.java | 203 ++++++++++++++
 .../redis/commands/GeoCommandTest.java        |   6 +-
 .../redis/commands/SortedSetCommandTest.java  |  10 +-
 .../output/ScoredValueListOutputTest.java     |   2 +-
 17 files changed, 921 insertions(+), 76 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/Value.java
 create mode 100644 src/test/java/com/lambdaworks/redis/ValueTest.java

diff --git a/src/main/java/com/lambdaworks/redis/KeyValue.java b/src/main/java/com/lambdaworks/redis/KeyValue.java
index 5a1e3f3492..0146734468 100644
--- a/src/main/java/com/lambdaworks/redis/KeyValue.java
+++ b/src/main/java/com/lambdaworks/redis/KeyValue.java
@@ -1,45 +1,162 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
 package com.lambdaworks.redis;
 
+import java.util.Optional;
+import java.util.function.Function;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+
 /**
- * A key-value pair.
- * 
+ * A key-value container extension to {@link Value}. A {@link KeyValue} requires always a non-null key on construction.
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
+ * @author Mark Paluch
  */
-public class KeyValue<K, V> {
+public class KeyValue<K, V> extends Value<V> {
 
-    public final K key;
-    public final V value;
+    private final K key;
 
     /**
-     * 
-     * @param key the key
-     * @param value the value
+     * Serializable constructor.
      */
-    public KeyValue(K key, V value) {
+    protected KeyValue() {
+        super(null);
+        this.key = null;
+    }
+
+    private KeyValue(K key, V value) {
+
+        super(value);
+
+        LettuceAssert.notNull(key, "Key must not be null");
         this.key = key;
-        this.value = value;
+    }
+
+    /**
+     * Creates a {@link KeyValue} from a {@code key} and an {@link Optional}. The resulting value contains the value from the
+     * {@link Optional} if a value is present. Value is empty if the {@link Optional} is empty.
+     *
+     * @param key the key, must not be {@literal null}.
+     * @param optional the optional. May be empty but never {@literal null}.
+     * @param <K>
+     * @param <T>
+     * @param <V>
+     * @return the {@link KeyValue}
+     */
+    public static <K, T extends V, V> KeyValue<K, V> from(K key, Optional<T> optional) {
+
+        LettuceAssert.notNull(optional, "Optional must not be null");
+
+        if (optional.isPresent()) {
+            return new KeyValue<K, V>(key, optional.get());
+        }
+
+        return empty(key);
+    }
+
+    /**
+     * Creates a {@link KeyValue} from a {@code key} and{@code value}. The resulting value contains the value if the
+     * {@code value} is not null.
+     *
+     * @param key the key, must not be {@literal null}.
+     * @param value the value. May be {@literal null}.
+     * @param <K>
+     * @param <T>
+     * @param <V>
+     * @return the {@link KeyValue}
+     */
+    public static <K, T extends V, V> KeyValue<K, V> fromNullable(K key, T value) {
+
+        if (value == null) {
+            return empty(key);
+        }
+
+        return new KeyValue<K, V>(key, value);
+    }
+
+    /**
+     * Returns an empty {@code KeyValue} instance with the {@code key} set. No value is present for this instance.
+     *
+     * @param key the key, must not be {@literal null}.
+     * @param <K>
+     * @param <V>
+     * @return the {@link KeyValue}
+     */
+    public static <K, V> KeyValue<K, V> empty(K key) {
+        return new KeyValue<K, V>(key, null);
+    }
+
+    /**
+     * Creates a {@link KeyValue} from a {@code key} and {@code value}. The resulting value contains the value.
+     *
+     * @param key the key. Must not be {@literal null}.
+     * @param value the value. Must not be {@literal null}.
+     * @param <K>
+     * @param <T>
+     * @param <V>
+     * @return the {@link KeyValue}
+     */
+    public static <K, T extends V, V> KeyValue<K, V> just(K key, T value) {
+
+        LettuceAssert.notNull(value, "Value must not be null");
+
+        return new KeyValue<K, V>(key, value);
     }
 
     @Override
     public boolean equals(Object o) {
-        if (o == null || getClass() != o.getClass()) {
+
+        if (this == o)
+            return true;
+        if (!(o instanceof KeyValue))
             return false;
-        }
-        KeyValue<?, ?> that = (KeyValue<?, ?>) o;
-        return key.equals(that.key) && value.equals(that.value);
+
+        KeyValue<?, ?> keyValue = (KeyValue<?, ?>) o;
+
+        if (!key.equals(keyValue.key))
+            return false;
+        return getValue() != null ? getValue().equals(keyValue.getValue()) : keyValue.getValue() == null;
+
     }
 
     @Override
     public int hashCode() {
-        return 31 * key.hashCode() + value.hashCode();
+        int result = key.hashCode();
+        result = 31 * result + (hasValue() ? getValue().hashCode() : 0);
+        return result;
     }
 
     @Override
     public String toString() {
-        return String.format("(%s, %s)", key, value);
+        return hasValue() ? String.format("KeyValue[%s, %s]", key, getValue()) : String.format("KeyValue[%s].empty", key);
+    }
+
+    /**
+     *
+     * @return the key
+     */
+    public K getKey() {
+        return key;
+    }
+
+    /**
+     * Returns a {@link KeyValue} consisting of the results of applying the given function to the value of this element. Mapping
+     * is performed only if a {@link #hasValue() value is present}.
+     *
+     * @param <R> The element type of the new {@link KeyValue}
+     * @param mapper a stateless function to apply to each element
+     * @return the new {@link KeyValue}
+     */
+    @SuppressWarnings("unchecked")
+    <R> KeyValue<K, R> map(Function<? super V, ? extends R> mapper) {
+
+        LettuceAssert.notNull(mapper, "Mapper function must not be null");
+
+        if (hasValue()) {
+            return new KeyValue<>(getKey(), mapper.apply(getValue()));
+        }
+
+        return (KeyValue<K, R>) this;
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
index fa4317ff40..47d6d57573 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
@@ -1402,8 +1402,8 @@ public Command<K, V, Long> zadd(K key, ZAddArgs zAddArgs, Object... scoresAndVal
             for (Object o : scoresAndValues) {
                 ScoredValue<V> scoredValue = (ScoredValue<V>) o;
 
-                args.add(scoredValue.score);
-                args.addValue(scoredValue.value);
+                args.add(scoredValue.getScore());
+                args.addValue(scoredValue.getValue());
             }
 
         } else {
diff --git a/src/main/java/com/lambdaworks/redis/ScoredValue.java b/src/main/java/com/lambdaworks/redis/ScoredValue.java
index dd6e9679e9..54b902aaf1 100644
--- a/src/main/java/com/lambdaworks/redis/ScoredValue.java
+++ b/src/main/java/com/lambdaworks/redis/ScoredValue.java
@@ -1,29 +1,118 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
 package com.lambdaworks.redis;
 
+import java.util.Optional;
+import java.util.function.Function;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+
 /**
- * A value and its associated score from a ZSET.
+ * A scored-value extension to {@link Value}.
  * 
  * @param <V> Value type.
  * @author Will Glozer
+ * @author Mark Paluch
  */
-public class ScoredValue<V> {
-    public final double score;
-    public final V value;
+public class ScoredValue<V> extends Value<V> {
 
-    public ScoredValue(double score, V value) {
+    private final static ScoredValue<Object> EMPTY = new ScoredValue<>(0, null);
+
+    private final double score;
+
+    /**
+     * Serializable constructor.
+     */
+    protected ScoredValue() {
+        super(null);
+        this.score = 0;
+    }
+
+    private ScoredValue(double score, V value) {
+        super(value);
         this.score = score;
-        this.value = value;
+    }
+
+    /**
+     * Creates a {@link ScoredValue} from a {@code key} and an {@link Optional}. The resulting value contains the value from the
+     * {@link Optional} if a value is present. Value is empty if the {@link Optional} is empty.
+     *
+     * @param score the score
+     * @param optional the optional. May be empty but never {@literal null}.
+     * @param <T>
+     * @param <V>
+     * @return the {@link ScoredValue}
+     */
+    public static <T extends V, V> ScoredValue<V> from(double score, Optional<T> optional) {
+
+        LettuceAssert.notNull(optional, "Optional must not be null");
+
+        if (optional.isPresent()) {
+            return new ScoredValue<V>(score, optional.get());
+        }
+
+        return fromNullable(score, null);
+    }
+
+    /**
+     * Creates a {@link ScoredValue} from a {@code score} and {@code value}. The resulting value contains the value if the
+     * {@code value} is not null.
+     *
+     * @param score the score
+     * @param value the value. May be {@literal null}.
+     * @param <T>
+     * @param <V>
+     * @return the {@link ScoredValue}
+     */
+    public static <T extends V, V> ScoredValue<V> fromNullable(double score, T value) {
+
+        if (value == null) {
+            return new ScoredValue<V>(score, null);
+        }
+
+        return new ScoredValue<V>(score, value);
+    }
+
+    /**
+     * Returns an empty {@code ScoredValue} instance. No value is present for this instance.
+     *
+     * @param <V>
+     * @return the {@link ScoredValue}
+     */
+    public static <V> ScoredValue<V> empty() {
+        return (ScoredValue<V>) EMPTY;
+    }
+
+    /**
+     * Creates a {@link ScoredValue} from a {@code key} and {@code value}. The resulting value contains the value.
+     *
+     * @param score the score
+     * @param value the value. Must not be {@literal null}.
+     * @param <T>
+     * @param <V>
+     * @return the {@link ScoredValue}
+     */
+    public static <T extends V, V> ScoredValue<V> just(double score, T value) {
+
+        LettuceAssert.notNull(value, "Value must not be null");
+
+        return new ScoredValue<V>(score, value);
+    }
+
+    public double getScore() {
+        return score;
     }
 
     @Override
     public boolean equals(Object o) {
-        if (o == null || getClass() != o.getClass()) {
+        if (this == o)
+            return true;
+        if (!(o instanceof ScoredValue))
             return false;
-        }
+        if (!super.equals(o))
+            return false;
+
         ScoredValue<?> that = (ScoredValue<?>) o;
-        return Double.compare(that.score, score) == 0 && value.equals(that.value);
+
+        return Double.compare(that.score, score) == 0;
     }
 
     @Override
@@ -31,12 +120,52 @@ public int hashCode() {
 
         long temp = Double.doubleToLongBits(score);
         int result = (int) (temp ^ (temp >>> 32));
-        result = 31 * result + (value != null ? value.hashCode() : 0);
+        result = 31 * result + (hasValue() ? getValue().hashCode() : 0);
         return result;
     }
 
     @Override
     public String toString() {
-        return String.format("(%f, %s)", score, value);
+        return hasValue() ? String.format("ScoredValue[%f, %s]", score, getValue())
+                : String.format("ScoredValue[%f].empty", score);
+    }
+
+    /**
+     * Returns a {@link ScoredValue} consisting of the results of applying the given function to the value of this element.
+     * Mapping is performed only if a {@link #hasValue() value is present}.
+     *
+     * @param <R> The element type of the new stream
+     * @param mapper a stateless function to apply to each element
+     * @return the new {@link ScoredValue}
+     */
+    @SuppressWarnings("unchecked")
+    <R> ScoredValue<R> map(Function<? super V, ? extends R> mapper) {
+
+        LettuceAssert.notNull(mapper, "Mapper function must not be null");
+
+        if (hasValue()) {
+            return new ScoredValue<>(score, mapper.apply(getValue()));
+        }
+
+        return (ScoredValue<R>) this;
+    }
+
+    /**
+     * Returns a {@link ScoredValue} consisting of the results of applying the given function to the score of this element.
+     * Mapping is performed only if a {@link #hasValue() value is present}.
+     *
+     * @param mapper a stateless function to apply to each element
+     * @return the new {@link ScoredValue}
+     */
+    @SuppressWarnings("unchecked")
+    ScoredValue<V> mapScore(Function<? super Number, ? extends Number> mapper) {
+
+        LettuceAssert.notNull(mapper, "Mapper function must not be null");
+
+        if (hasValue()) {
+            return new ScoredValue<V>(mapper.apply(score).doubleValue(), getValue());
+        }
+
+        return this;
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/Value.java b/src/main/java/com/lambdaworks/redis/Value.java
new file mode 100644
index 0000000000..6f2af1204d
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/Value.java
@@ -0,0 +1,247 @@
+package com.lambdaworks.redis;
+
+import java.io.Serializable;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * A value container object which may or may not contain a non-null value. If a value is present, {@code isPresent()} will
+ * return {@code true} and {@code get()} will return the value.
+ *
+ * <p>
+ * Additional methods that depend on the presence or absence of a contained value are provided, such as
+ * {@link #getValueOrElse(java.lang.Object) getValueOrElse()} (return a default value if value not present).
+ * 
+ * @param <V> Value type.
+ * @author Mark Paluch
+ */
+public class Value<V> implements Serializable {
+
+    private final static Value<Object> EMPTY = new Value<>(null);
+
+    private final V value;
+
+    /**
+     * {@link Serializable} constructor.
+     */
+    protected Value() {
+        this.value = null;
+    }
+
+    /**
+     *
+     * @param value the value, may be {@literal null}.
+     */
+    protected Value(V value) {
+        this.value = value;
+    }
+
+    /**
+     * Creates a {@link Value} from an {@link Optional}. The resulting value contains the value from the {@link Optional} if a
+     * value is present. Value is empty if the {@link Optional} is empty.
+     * 
+     * @param optional the optional. May be empty but never {@literal null}.
+     * @param <T>
+     * @param <V>
+     * @return the {@link Value}
+     */
+    public static <T extends V, V> Value<V> from(Optional<T> optional) {
+
+        LettuceAssert.notNull(optional, "Optional must not be null");
+
+        if (optional.isPresent()) {
+            return new Value<V>(optional.get());
+        }
+
+        return (Value<V>) EMPTY;
+    }
+
+    /**
+     * Creates a {@link Value} from a {@code value}. The resulting value contains the value if the {@code value} is not null.
+     *
+     * @param value the value. May be {@literal null}.
+     * @param <T>
+     * @param <V>
+     * @return the {@link Value}
+     */
+    public static <T extends V, V> Value<V> fromNullable(T value) {
+
+        if (value == null) {
+            return empty();
+        }
+
+        return new Value<V>(value);
+    }
+
+    /**
+     * Returns an empty {@code Value} instance. No value is present for this instance.
+     *
+     * @param <V>
+     * @return the {@link Value}
+     */
+    public static <V> Value<V> empty() {
+        return (Value<V>) EMPTY;
+    }
+
+    /**
+     * Creates a {@link Value} from a {@code value}. The resulting value contains the value.
+     *
+     * @param value the value. Must not be {@literal null}.
+     * @param <T>
+     * @param <V>
+     * @return the {@link Value}
+     */
+    public static <T extends V, V> Value<V> just(T value) {
+
+        LettuceAssert.notNull(value, "Value must not be null");
+
+        return new Value<V>(value);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof Value))
+            return false;
+
+        Value<?> value1 = (Value<?>) o;
+
+        return value != null ? value.equals(value1.value) : value1.value == null;
+
+    }
+
+    @Override
+    public int hashCode() {
+        return value != null ? value.hashCode() : 0;
+    }
+
+    @Override
+    public String toString() {
+        return hasValue() ? String.format("Value[%s]", value) : "Value.empty";
+    }
+
+    /**
+     * If a value is present in this {@code Value}, returns the value, otherwise throws {@code NoSuchElementException}.
+     *
+     * @return the non-null value held by this {@code Optional}
+     * @throws NoSuchElementException if there is no value present
+     *
+     * @see Value#hasValue()
+     */
+    public V getValue() {
+
+        if (!hasValue()) {
+            throw new NoSuchElementException();
+        }
+
+        return value;
+    }
+
+    /**
+     * Return {@code true} if there is a value present, otherwise {@code false}.
+     *
+     * @return {@code true} if there is a value present, otherwise {@code false}
+     */
+    public boolean hasValue() {
+        return value != null;
+    }
+
+    /**
+     * Return the value if present, otherwise invoke {@code other} and return the result of that invocation.
+     *
+     * @param otherSupplier a {@code Supplier} whose result is returned if no value is present. Must not be {@literal null}.
+     * @return the value if present otherwise the result of {@code other.get()}
+     * @throws NullPointerException if value is not present and {@code other} is null
+     */
+    public V getValueOrElseGet(Supplier<V> otherSupplier) {
+
+        LettuceAssert.notNull(otherSupplier, "Supplier must not be null");
+
+        if (hasValue()) {
+            return value;
+        }
+        return otherSupplier.get();
+    }
+
+    /**
+     * Return the value if present, otherwise return {@code other}.
+     *
+     * @param other the value to be returned if there is no value present, may be null
+     * @return the value, if present, otherwise {@code other}
+     */
+    public V getValueOrElse(V other) {
+
+        if (hasValue()) {
+            return this.value;
+        }
+
+        return other;
+    }
+
+    /**
+     * Return the contained value, if present, otherwise throw an exception to be created by the provided supplier.
+     *
+     * @param <X> Type of the exception to be thrown
+     * @param exceptionSupplier The supplier which will return the exception to be thrown, must not be {@literal null}.
+     * @return the present value
+     * @throws X if there is no value present
+     */
+    public <X extends Throwable> V getValueOrElseThrow(Supplier<? extends X> exceptionSupplier) throws X {
+
+        LettuceAssert.notNull(exceptionSupplier, "Supplier function must not be null");
+
+        if (hasValue()) {
+            return value;
+        }
+
+        throw exceptionSupplier.get();
+    }
+
+    /**
+     * Returns a {@link Value} consisting of the results of applying the given function to the value of this element. Mapping is
+     * performed only if a {@link #hasValue() value is present}.
+     *
+     * @param <R> The element type of the new value
+     * @param mapper a stateless function to apply to each element
+     * @return the new {@link Value}
+     */
+    @SuppressWarnings("unchecked")
+    <R> Value<R> map(Function<? super V, ? extends R> mapper) {
+        LettuceAssert.notNull(mapper, "Mapper function must not be null");
+
+        if (hasValue()) {
+            return new Value<R>(mapper.apply(getValue()));
+        }
+
+        return (Value<R>) this;
+    }
+
+    /**
+     * Returns an {@link Optional} wrapper for the value.
+     * 
+     * @return {@link Optional} wrapper for the value.
+     */
+    public Optional<V> optional() {
+        return Optional.ofNullable(value);
+    }
+
+    /**
+     * Returns a {@link Stream} wrapper for the value. The resulting stream contains either the value if a this value
+     * {@link #hasValue() has a value} or it is empty if the value is empty.
+     *
+     * @return {@link Stream} wrapper for the value.
+     */
+    public Stream<V> stream() {
+
+        if (hasValue()) {
+            return Stream.of(value);
+        }
+        return Stream.empty();
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueOutput.java b/src/main/java/com/lambdaworks/redis/output/KeyValueOutput.java
index 127ae29d98..b3519b9c48 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyValueOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/KeyValueOutput.java
@@ -29,7 +29,7 @@ public void set(ByteBuffer bytes) {
                 key = codec.decodeKey(bytes);
             } else {
                 V value = codec.decodeValue(bytes);
-                output = new KeyValue<K, V>(key, value);
+                output = KeyValue.fromNullable(key, value);
             }
         }
     }
diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueListOutput.java b/src/main/java/com/lambdaworks/redis/output/ScoredValueListOutput.java
index c79f2e72cd..26ee186a43 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScoredValueListOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ScoredValueListOutput.java
@@ -36,7 +36,7 @@ public void set(ByteBuffer bytes) {
         }
 
         double score = Double.parseDouble(decodeAscii(bytes));
-        subscriber.onNext(new ScoredValue<>(score, value));
+        subscriber.onNext(ScoredValue.fromNullable(score, value));
         value = null;
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueScanOutput.java b/src/main/java/com/lambdaworks/redis/output/ScoredValueScanOutput.java
index bc9087e2ef..bb59960891 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScoredValueScanOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ScoredValueScanOutput.java
@@ -30,7 +30,7 @@ protected void setOutput(ByteBuffer bytes) {
         }
 
         double score = Double.parseDouble(decodeAscii(bytes));
-        output.getValues().add(new ScoredValue<V>(score, value));
+        output.getValues().add(ScoredValue.fromNullable(score, value));
         value = null;
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueScanStreamingOutput.java b/src/main/java/com/lambdaworks/redis/output/ScoredValueScanStreamingOutput.java
index 831159abdf..571284884a 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScoredValueScanStreamingOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ScoredValueScanStreamingOutput.java
@@ -31,7 +31,7 @@ protected void setOutput(ByteBuffer bytes) {
         }
 
         double score = Double.parseDouble(decodeAscii(bytes));
-        channel.onValue(new ScoredValue<V>(score, value));
+        channel.onValue(ScoredValue.fromNullable(score, value));
         value = null;
         output.setCount(output.getCount() + 1);
     }
diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingOutput.java b/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingOutput.java
index 8c60f3e0c1..90ac7cca3f 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingOutput.java
@@ -30,7 +30,7 @@ public void set(ByteBuffer bytes) {
         }
 
         double score = Double.parseDouble(decodeAscii(bytes));
-        channel.onValue(new ScoredValue<V>(score, value));
+        channel.onValue(ScoredValue.fromNullable(score, value));
         value = null;
         output = output.longValue() + 1;
     }
diff --git a/src/test/java/com/lambdaworks/redis/AbstractTest.java b/src/test/java/com/lambdaworks/redis/AbstractTest.java
index d9c6c086e1..a1d693e015 100644
--- a/src/test/java/com/lambdaworks/redis/AbstractTest.java
+++ b/src/test/java/com/lambdaworks/redis/AbstractTest.java
@@ -40,11 +40,11 @@ public static List<ScoredValue<String>> svlist(ScoredValue<String>... args) {
     }
 
     public static KeyValue<String, String> kv(String key, String value) {
-        return new KeyValue<>(key, value);
+        return KeyValue.fromNullable(key, value);
     }
 
     public static ScoredValue<String> sv(double score, String value) {
-        return new ScoredValue<String>(score, value);
+        return ScoredValue.fromNullable(score, value);
     }
 
     public static Set<String> set(String... args) {
diff --git a/src/test/java/com/lambdaworks/redis/KeyValueTest.java b/src/test/java/com/lambdaworks/redis/KeyValueTest.java
index 1a9a26a589..59a81ba8c2 100644
--- a/src/test/java/com/lambdaworks/redis/KeyValueTest.java
+++ b/src/test/java/com/lambdaworks/redis/KeyValueTest.java
@@ -1,36 +1,108 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
 
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.Optional;
+
 import org.junit.Test;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class KeyValueTest {
-    protected String key = "key";
-    protected String value = "value";
+
+    @Test
+    public void shouldCreateEmptyKeyValueFromOptional() {
+
+        KeyValue<String, String> value = KeyValue.from("key", Optional.<String> empty());
+
+        assertThat(value.hasValue()).isFalse();
+    }
+
+    @Test
+    public void shouldCreateEmptyValue() {
+
+        KeyValue<String, String> value = KeyValue.empty("key");
+
+        assertThat(value.hasValue()).isFalse();
+    }
+
+    @Test
+    public void shouldCreateNonEmptyValueFromOptional() {
+
+        KeyValue<Long, String> value = KeyValue.from(1L, Optional.of("hello"));
+
+        assertThat(value.hasValue()).isTrue();
+        assertThat(value.getValue()).isEqualTo("hello");
+    }
+
+    @Test
+    public void shouldCreateEmptyValueFromValue() {
+
+        KeyValue<String, String> value = KeyValue.fromNullable("key", null);
+
+        assertThat(value.hasValue()).isFalse();
+    }
+
+    @Test
+    public void shouldCreateNonEmptyValueFromValue() {
+
+        KeyValue<String, String> value = KeyValue.fromNullable("key", "hello");
+
+        assertThat(value.hasValue()).isTrue();
+        assertThat(value.getValue()).isEqualTo("hello");
+    }
+
+    @Test
+    public void justShouldCreateValueFromValue() {
+
+        KeyValue<String, String> value = KeyValue.just("key", "hello");
+
+        assertThat(value.hasValue()).isTrue();
+        assertThat(value.getKey()).isEqualTo("key");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void justShouldRejectEmptyValueFromValue() {
+        Value.just(null);
+    }
+
+    @Test
+    public void shouldCreateNonEmptyValue() {
+
+        KeyValue<String, String> value = KeyValue.from("key", Optional.of("hello"));
+
+        assertThat(value.hasValue()).isTrue();
+        assertThat(value.getValue()).isEqualTo("hello");
+    }
 
     @Test
     public void equals() throws Exception {
-        KeyValue<String, String> kv = kv(key, value);
-        assertThat(kv.equals(kv(key, value))).isTrue();
+        KeyValue<String, String> kv = kv("key", "value");
+        assertThat(kv.equals(kv("key", "value"))).isTrue();
         assertThat(kv.equals(null)).isFalse();
-        assertThat(kv.equals(kv("a", value))).isFalse();
-        assertThat(kv.equals(kv(key, "b"))).isFalse();
+        assertThat(kv.equals(kv("a", "value"))).isFalse();
+        assertThat(kv.equals(kv("key", "b"))).isFalse();
     }
 
     @Test
-    public void testToString() throws Exception {
-        KeyValue<String, String> kv = kv(key, value);
-        assertThat(kv.toString()).isEqualTo(String.format("(%s, %s)", kv.key, kv.value));
+    public void testHashCode() throws Exception {
+        assertThat(kv("key", "value").hashCode() != 0).isTrue();
     }
 
     @Test
-    public void testHashCode() throws Exception {
-        assertThat(kv(key, value).hashCode() != 0).isTrue();
+    public void toStringShouldRenderCorrectly() {
+
+        KeyValue<String, String> value = KeyValue.from("key", Optional.of("hello"));
+        KeyValue<String, String> empty = KeyValue.fromNullable("key", null);
+
+        assertThat(value.toString()).isEqualTo("KeyValue[key, hello]");
+        assertThat(empty.toString()).isEqualTo("KeyValue[key].empty");
     }
 
     protected KeyValue<String, String> kv(String key, String value) {
-        return new KeyValue<String, String>(key, value);
+        return KeyValue.just(key, value);
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/ListStreamingAdapter.java b/src/test/java/com/lambdaworks/redis/ListStreamingAdapter.java
index 4abe4ce10f..c4be19abc9 100644
--- a/src/test/java/com/lambdaworks/redis/ListStreamingAdapter.java
+++ b/src/test/java/com/lambdaworks/redis/ListStreamingAdapter.java
@@ -13,7 +13,7 @@
  * ValueStreamingChannels.
  * 
  * @author Mark Paluch
- * @param <T> Valu-Type.
+ * @param <T> Value-Type.
  * @since 3.0
  */
 public class ListStreamingAdapter<T> implements KeyStreamingChannel<T>, ValueStreamingChannel<T>,
@@ -37,6 +37,6 @@ public List<T> getList() {
 
     @Override
     public void onValue(ScoredValue<T> value) {
-        list.add(value.value);
+        list.add(value.getValue());
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/ScoredValueTest.java b/src/test/java/com/lambdaworks/redis/ScoredValueTest.java
index 33d843f585..f711d9a354 100644
--- a/src/test/java/com/lambdaworks/redis/ScoredValueTest.java
+++ b/src/test/java/com/lambdaworks/redis/ScoredValueTest.java
@@ -1,31 +1,108 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
 
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.offset;
+
+import java.util.Optional;
 
 import org.junit.Test;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class ScoredValueTest {
+
+    @Test
+    public void shouldCreateEmptyScoredValueFromOptional() {
+
+        ScoredValue<String> value = ScoredValue.from(42, Optional.<String> empty());
+
+        assertThat(value.hasValue()).isFalse();
+    }
+
+    @Test
+    public void shouldCreateEmptyValue() {
+
+        ScoredValue<String> value = ScoredValue.empty();
+
+        assertThat(value.hasValue()).isFalse();
+    }
+
+    @Test
+    public void shouldCreateNonEmptyValueFromOptional() {
+
+        ScoredValue<String> value = ScoredValue.from(4.2, Optional.of("hello"));
+
+        assertThat(value.hasValue()).isTrue();
+        assertThat(value.getValue()).isEqualTo("hello");
+        assertThat(value.getScore()).isCloseTo(4.2, offset(0.01));
+    }
+
+    @Test
+    public void shouldCreateEmptyValueFromValue() {
+
+        ScoredValue<String> value = ScoredValue.fromNullable(42, null);
+
+        assertThat(value.hasValue()).isFalse();
+    }
+
+    @Test
+    public void shouldCreateNonEmptyValueFromValue() {
+
+        ScoredValue<String> value = ScoredValue.fromNullable(42, "hello");
+
+        assertThat(value.hasValue()).isTrue();
+        assertThat(value.getValue()).isEqualTo("hello");
+    }
+
+    @Test
+    public void justShouldCreateValueFromValue() {
+
+        ScoredValue<String> value = ScoredValue.just(42, "hello");
+
+        assertThat(value.hasValue()).isTrue();
+        assertThat(value.getValue()).isEqualTo("hello");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void justShouldRejectEmptyValueFromValue() {
+        Value.just(null);
+    }
+
+    @Test
+    public void shouldCreateNonEmptyValue() {
+
+        ScoredValue<String> value = ScoredValue.from(12, Optional.of("hello"));
+
+        assertThat(value.hasValue()).isTrue();
+        assertThat(value.getValue()).isEqualTo("hello");
+    }
+
     @Test
     public void equals() throws Exception {
-        ScoredValue<String> sv1 = new ScoredValue<String>(1.0, "a");
-        assertThat(sv1.equals(new ScoredValue<String>(1.0, "a"))).isTrue();
+        ScoredValue<String> sv1 = ScoredValue.fromNullable(1.0, "a");
+        assertThat(sv1.equals(ScoredValue.fromNullable(1.0, "a"))).isTrue();
         assertThat(sv1.equals(null)).isFalse();
-        assertThat(sv1.equals(new ScoredValue<String>(1.1, "a"))).isFalse();
-        assertThat(sv1.equals(new ScoredValue<String>(1.0, "b"))).isFalse();
+        assertThat(sv1.equals(ScoredValue.fromNullable(1.1, "a"))).isFalse();
+        assertThat(sv1.equals(ScoredValue.fromNullable(1.0, "b"))).isFalse();
     }
 
     @Test
-    public void testToString() throws Exception {
-        ScoredValue<String> sv1 = new ScoredValue<String>(1.0, "a");
-        assertThat(sv1.toString()).isEqualTo(String.format("(%f, %s)", sv1.score, sv1.value));
+    public void testHashCode() throws Exception {
+        assertThat(ScoredValue.fromNullable(1.0, "a").hashCode() != 0).isTrue();
+        assertThat(ScoredValue.fromNullable(0.0, "a").hashCode() != 0).isTrue();
+        assertThat(ScoredValue.fromNullable(0.0, null).hashCode() == 0).isTrue();
     }
 
     @Test
-    public void testHashCode() throws Exception {
-        assertThat(new ScoredValue<String>(1.0, "a").hashCode() != 0).isTrue();
-        assertThat(new ScoredValue<String>(0.0, "a").hashCode() != 0).isTrue();
-        assertThat(new ScoredValue<String>(0.0, null).hashCode() == 0).isTrue();
+    public void toStringShouldRenderCorrectly() {
+
+        ScoredValue<String> value = ScoredValue.from(12.34, Optional.of("hello"));
+        ScoredValue<String> empty = ScoredValue.fromNullable(34, null);
+
+        assertThat(value.toString()).contains("ScoredValue[12").contains("340000, hello]");
+        assertThat(empty.toString()).contains("ScoredValue[34").contains("000000].empty");
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/ValueTest.java b/src/test/java/com/lambdaworks/redis/ValueTest.java
new file mode 100644
index 0000000000..40563b35ba
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/ValueTest.java
@@ -0,0 +1,203 @@
+package com.lambdaworks.redis;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.NoSuchElementException;
+import java.util.Optional;
+
+import org.junit.Test;
+
+/**
+ * @author Mark Paluch
+ */
+public class ValueTest {
+
+    @Test
+    public void shouldCreateEmptyValueFromOptional() {
+
+        Value<String> value = Value.from(Optional.<String> empty());
+
+        assertThat(value.hasValue()).isFalse();
+    }
+
+    @Test
+    public void shouldCreateEmptyValue() {
+
+        Value<String> value = Value.empty();
+
+        assertThat(value.hasValue()).isFalse();
+    }
+
+    @Test
+    public void shouldCreateNonEmptyValueFromOptional() {
+
+        Value<String> value = Value.from(Optional.of("hello"));
+
+        assertThat(value.hasValue()).isTrue();
+        assertThat(value.getValue()).isEqualTo("hello");
+    }
+
+    @Test
+    public void shouldCreateEmptyValueFromValue() {
+
+        Value<String> value = Value.fromNullable(null);
+
+        assertThat(value.hasValue()).isFalse();
+    }
+
+    @Test
+    public void shouldCreateNonEmptyValueFromValue() {
+
+        Value<String> value = Value.fromNullable("hello");
+
+        assertThat(value.hasValue()).isTrue();
+        assertThat(value.getValue()).isEqualTo("hello");
+    }
+
+    @Test
+    public void justShouldCreateValueFromValue() {
+
+        Value<String> value = Value.just("hello");
+
+        assertThat(value.hasValue()).isTrue();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void justShouldRejectEmptyValueFromValue() {
+        Value.just(null);
+    }
+
+    @Test
+    public void shouldCreateNonEmptyValue() {
+
+        Value<String> value = Value.from(Optional.of("hello"));
+
+        assertThat(value.hasValue()).isTrue();
+        assertThat(value.getValue()).isEqualTo("hello");
+    }
+
+    @Test
+    public void optionalShouldReturnOptional() {
+
+        Value<String> value = Value.from(Optional.of("hello"));
+
+        assertThat(value.optional()).hasValue("hello");
+    }
+
+    @Test
+    public void emptyValueOptionalShouldReturnOptional() {
+
+        Value<String> value = Value.from(Optional.empty());
+
+        assertThat(value.optional()).isEmpty();
+    }
+
+    @Test
+    public void getValueOrElseShouldReturnValue() {
+
+        Value<String> value = Value.from(Optional.of("hello"));
+
+        assertThat(value.getValueOrElse("world")).isEqualTo("hello");
+    }
+
+    @Test
+    public void getValueOrElseShouldReturnOtherValue() {
+
+        Value<String> value = Value.from(Optional.empty());
+
+        assertThat(value.getValueOrElse("world")).isEqualTo("world");
+    }
+
+    @Test
+    public void orElseThrowShouldReturnValue() {
+
+        Value<String> value = Value.from(Optional.of("hello"));
+
+        assertThat(value.getValueOrElseThrow(IllegalArgumentException::new)).isEqualTo("hello");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void emptyValueGetValueOrElseShouldThrowException() {
+
+        Value<String> value = Value.from(Optional.empty());
+
+        value.getValueOrElseThrow(IllegalArgumentException::new);
+    }
+
+    @Test
+    public void getValueOrElseGetShouldReturnValue() {
+
+        Value<String> value = Value.from(Optional.of("hello"));
+
+        assertThat(value.getValueOrElseGet(() -> "world")).isEqualTo("hello");
+    }
+
+    @Test
+    public void emptyValueGetValueOrElseGetShouldReturnOtherValue() {
+
+        Value<String> value = Value.from(Optional.empty());
+
+        assertThat(value.getValueOrElseGet(() -> "world")).isEqualTo("world");
+    }
+
+    @Test
+    public void mapShouldMapValue() {
+
+        Value<String> value = Value.from(Optional.of("hello"));
+
+        assertThat(value.map(s -> s + "-world").getValue()).isEqualTo("hello-world");
+    }
+
+    @Test
+    public void emptyValueMapShouldNotMapEmptyValue() {
+
+        Value<String> value = Value.from(Optional.empty());
+
+        assertThat(value.map(s -> s + "-world")).isSameAs(value);
+    }
+
+    @Test(expected = NoSuchElementException.class)
+    public void emptyValueGetEmptyValueShouldThrowException() {
+        Value.from(Optional.<String> empty()).getValue();
+    }
+
+    @Test
+    public void shouldBeEquals() {
+
+        Value<String> value = Value.from(Optional.of("hello"));
+        Value<String> other = Value.fromNullable("hello");
+        Value<String> different = Value.fromNullable("different");
+
+        assertThat(value).isEqualTo(other);
+        assertThat(value).isNotEqualTo(different);
+
+        assertThat(value.hashCode()).isEqualTo(other.hashCode());
+        assertThat(value.hashCode()).isNotEqualTo(different.hashCode());
+    }
+
+    @Test
+    public void toStringShouldRenderCorrectly() {
+
+        Value<String> value = Value.from(Optional.of("hello"));
+        Value<String> empty = Value.fromNullable(null);
+
+        assertThat(value.toString()).isEqualTo("Value[hello]");
+        assertThat(empty.toString()).isEqualTo("Value.empty");
+    }
+
+    @Test
+    public void emptyValueStreamShouldCreateEmptyStream() {
+
+        Value<String> empty = Value.fromNullable(null);
+
+        assertThat(empty.stream().count()).isEqualTo(0);
+    }
+
+    @Test
+    public void streamShouldCreateAStream() {
+
+        Value<String> empty = Value.fromNullable("hello");
+
+        assertThat(empty.stream().count()).isEqualTo(1);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
index 7f90e0d2da..67a58fb959 100644
--- a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
@@ -275,7 +275,7 @@ public void georadiusStoreWithCountAndSort() throws Exception {
 
         List<ScoredValue<String>> results = redis.zrangeWithScores(resultKey, 0, -1);
         assertThat(results).hasSize(1);
-        assertThat(results.get(0).score).isGreaterThan(99999);
+        assertThat(results.get(0).getScore()).isGreaterThan(99999);
     }
 
     @Test
@@ -305,7 +305,7 @@ public void georadiusStoreDistWithCountAndSort() throws Exception {
         List<ScoredValue<String>> dist = redis.zrangeWithScores(resultKey, 0, -1);
         assertThat(dist).hasSize(1);
 
-        assertThat(dist.get(0).score).isBetween(2d, 3d);
+        assertThat(dist.get(0).getScore()).isBetween(2d, 3d);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -343,7 +343,7 @@ public void georadiusbymemberStoreDistWithCountAndSort() throws Exception {
         List<ScoredValue<String>> dist = redis.zrangeWithScores(resultKey, 0, -1);
         assertThat(dist).hasSize(1);
 
-        assertThat(dist.get(0).score).isBetween(2d, 3d);
+        assertThat(dist.get(0).getScore()).isBetween(2d, 3d);
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
index 884c5b0db2..a8b872e667 100644
--- a/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
@@ -33,20 +33,20 @@ public void zadd() throws Exception {
     
     @Test
     public void zaddScoredValue() throws Exception {
-        assertThat(redis.zadd(key, new ScoredValue<String>(1.0, "a"))).isEqualTo(1);
-        assertThat(redis.zadd(key, new ScoredValue<String>(1.0, "a"))).isEqualTo(0);
+        assertThat(redis.zadd(key, ScoredValue.fromNullable(1.0, "a"))).isEqualTo(1);
+        assertThat(redis.zadd(key, ScoredValue.fromNullable(1.0, "a"))).isEqualTo(0);
 
         assertThat(redis.zrange(key, 0, -1)).isEqualTo(list("a"));
-        assertThat(redis.zadd(key, new ScoredValue<String>(2.0, "b"), new ScoredValue<String>(3.0, "c"))).isEqualTo(2);
+        assertThat(redis.zadd(key, ScoredValue.fromNullable(2.0, "b"), ScoredValue.fromNullable(3.0, "c"))).isEqualTo(2);
         assertThat(redis.zrange(key, 0, -1)).isEqualTo(list("a", "b", "c"));
     }
 
     @Test
     public void zaddnx() throws Exception {
         assertThat(redis.zadd(key, 1.0, "a")).isEqualTo(1);
-        assertThat(redis.zadd(key, ZAddArgs.Builder.nx(), new ScoredValue<String>(2.0, "a"))).isEqualTo(0);
+        assertThat(redis.zadd(key, ZAddArgs.Builder.nx(), ScoredValue.fromNullable(2.0, "a"))).isEqualTo(0);
 
-        assertThat(redis.zadd(key, ZAddArgs.Builder.nx(), new ScoredValue<String>(2.0, "b"))).isEqualTo(1);
+        assertThat(redis.zadd(key, ZAddArgs.Builder.nx(), ScoredValue.fromNullable(2.0, "b"))).isEqualTo(1);
 
         assertThat(redis.zadd(key, ZAddArgs.Builder.nx(), new Object[] { 2.0, "b", 3.0, "c" })).isEqualTo(1);
 
diff --git a/src/test/java/com/lambdaworks/redis/output/ScoredValueListOutputTest.java b/src/test/java/com/lambdaworks/redis/output/ScoredValueListOutputTest.java
index 44050ecbed..dc0436d725 100644
--- a/src/test/java/com/lambdaworks/redis/output/ScoredValueListOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/output/ScoredValueListOutputTest.java
@@ -33,6 +33,6 @@ public void commandOutputCorrectlyDecoded() throws Exception {
         sut.set(ByteBuffer.wrap("4.567".getBytes()));
         sut.multi(-1);
 
-        assertThat(sut.get()).contains(new ScoredValue<>(4.567, "key"));
+        assertThat(sut.get()).contains(ScoredValue.fromNullable(4.567, "key"));
     }
 }
\ No newline at end of file

From 8a0b24fd171a81424c51a8e08e353ff1eb5d6d9c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 26 Jul 2016 22:21:12 +0200
Subject: [PATCH 009/808] Use KeyValue in mget, hmget and
 KeyValueStreamingChannel in mget and hmget #350

---
 .../redis/AbstractRedisAsyncCommands.java     | 18 ++---
 .../redis/AbstractRedisReactiveCommands.java  | 24 ++++---
 .../java/com/lambdaworks/redis/KeyValue.java  |  8 +--
 .../redis/ReactiveCommandDispatcher.java      |  4 +-
 .../redis/RedisCommandBuilder.java            | 67 +++++++++++++++++--
 .../api/async/RedisHashAsyncCommands.java     |  6 +-
 .../api/async/RedisKeyAsyncCommands.java      |  1 +
 .../api/async/RedisStringAsyncCommands.java   | 10 +--
 .../api/rx/RedisHashReactiveCommands.java     |  6 +-
 .../api/rx/RedisKeyReactiveCommands.java      |  1 +
 .../api/rx/RedisStringReactiveCommands.java   | 11 +--
 .../redis/api/sync/RedisHashCommands.java     |  6 +-
 .../redis/api/sync/RedisKeyCommands.java      |  1 +
 .../redis/api/sync/RedisStringCommands.java   |  8 ++-
 ...RedisAdvancedClusterAsyncCommandsImpl.java | 17 ++---
 ...isAdvancedClusterReactiveCommandsImpl.java | 19 +++---
 .../async/BaseNodeSelectionAsyncCommands.java |  2 +-
 .../async/NodeSelectionHashAsyncCommands.java |  6 +-
 .../async/NodeSelectionKeyAsyncCommands.java  |  1 +
 .../NodeSelectionStringAsyncCommands.java     | 10 +--
 .../RedisAdvancedClusterAsyncCommands.java    |  2 +-
 .../api/async/RedisClusterAsyncCommands.java  |  3 +-
 .../RedisAdvancedClusterReactiveCommands.java |  2 +-
 .../api/rx/RedisClusterReactiveCommands.java  |  3 +-
 .../api/sync/BaseNodeSelectionCommands.java   |  2 +-
 .../api/sync/NodeSelectionHashCommands.java   |  6 +-
 .../api/sync/NodeSelectionKeyCommands.java    |  1 +
 .../api/sync/NodeSelectionStringCommands.java |  4 ++
 .../sync/RedisAdvancedClusterCommands.java    |  2 +-
 .../redis/output/KeyStreamingChannel.java     |  2 +-
 .../redis/output/KeyValueListOutput.java      | 53 +++++++++++++++
 .../output/KeyValueStreamingChannel.java      | 11 ++-
 .../redis/output/KeyValueStreamingOutput.java | 23 ++++++-
 .../output/ScoredValueStreamingChannel.java   |  2 +-
 .../redis/output/StreamingChannel.java        | 10 +++
 .../redis/output/ValueValueListOutput.java    | 49 ++++++++++++++
 .../redis/api/RedisHashCommands.java          |  6 +-
 .../redis/api/RedisKeyCommands.java           |  1 +
 .../redis/api/RedisStringCommands.java        | 11 +--
 .../apigenerator/CreateReactiveApi.java       | 11 ++-
 .../redis/ReactiveConnectionTest.java         |  2 +-
 .../redis/ReactiveStreamingOutputTest.java    | 16 +++--
 .../cluster/AdvancedClusterClientTest.java    |  8 +--
 .../cluster/AdvancedClusterReactiveTest.java  | 10 +--
 .../commands/StringClusterCommandTest.java    |  9 +--
 .../commands/rx/KeyClusterRxCommandTest.java  |  2 +-
 .../rx/StringClusterRxCommandTest.java        |  7 +-
 .../redis/commands/HashCommandTest.java       | 19 +++---
 .../redis/commands/StringCommandTest.java     | 18 ++---
 .../commands/TransactionCommandTest.java      |  2 +-
 .../commands/rx/StringRxCommandTest.java      | 21 +++++-
 .../commands/rx/TransactionRxCommandTest.java | 10 +--
 52 files changed, 404 insertions(+), 150 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/output/KeyValueListOutput.java
 create mode 100644 src/main/java/com/lambdaworks/redis/output/StreamingChannel.java
 create mode 100644 src/main/java/com/lambdaworks/redis/output/ValueValueListOutput.java

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
index 07820e0551..c383cc75a8 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
@@ -446,12 +446,12 @@ public RedisFuture<Long> hstrlen(K key, K field) {
     }
 
     @Override
-    public RedisFuture<List<V>> hmget(K key, K... fields) {
-        return dispatch(commandBuilder.hmget(key, fields));
+    public RedisFuture<List<KeyValue<K, V>>> hmget(K key, K... fields) {
+        return dispatch(commandBuilder.hmgetKeyValue(key, fields));
     }
 
     @Override
-    public RedisFuture<Long> hmget(ValueStreamingChannel<V> channel, K key, K... fields) {
+    public RedisFuture<Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields) {
         return dispatch(commandBuilder.hmget(channel, key, fields));
     }
 
@@ -586,20 +586,20 @@ public RedisFuture<String> migrate(String host, int port, int db, long timeout,
     }
 
     @Override
-    public RedisFuture<List<V>> mget(K... keys) {
-        return dispatch(commandBuilder.mget(keys));
+    public RedisFuture<List<KeyValue<K, V>>> mget(K... keys) {
+        return dispatch(commandBuilder.mgetKeyValue(keys));
     }
 
-    public RedisFuture<List<V>> mget(Iterable<K> keys) {
-        return dispatch(commandBuilder.mget(keys));
+    public RedisFuture<List<KeyValue<K, V>>> mget(Iterable<K> keys) {
+        return dispatch(commandBuilder.mgetKeyValue(keys));
     }
 
     @Override
-    public RedisFuture<Long> mget(ValueStreamingChannel<V> channel, K... keys) {
+    public RedisFuture<Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys) {
         return dispatch(commandBuilder.mget(channel, keys));
     }
 
-    public RedisFuture<Long> mget(ValueStreamingChannel<V> channel, Iterable<K> keys) {
+    public RedisFuture<Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K> keys) {
         return dispatch(commandBuilder.mget(channel, keys));
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
index 18a7638fba..e2094cd235 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
@@ -449,12 +449,12 @@ public Single<Long> hstrlen(K key, K field) {
     }
 
     @Override
-    public Observable<V> hmget(K key, K... fields) {
-        return createDissolvingObservable(() -> commandBuilder.hmget(key, fields));
+    public Observable<KeyValue<K, V>> hmget(K key, K... fields) {
+        return createDissolvingObservable(() -> commandBuilder.hmgetKeyValue(key, fields));
     }
 
     @Override
-    public Single<Long> hmget(ValueStreamingChannel<V> channel, K key, K... fields) {
+    public Single<Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields) {
         return createSingle(() -> commandBuilder.hmget(channel, key, fields));
     }
 
@@ -589,16 +589,16 @@ public Single<String> migrate(String host, int port, int db, long timeout, Migra
     }
 
     @Override
-    public Observable<V> mget(K... keys) {
-        return createDissolvingObservable(() -> commandBuilder.mget(keys));
+    public Observable<KeyValue<K, V>> mget(K... keys) {
+        return createDissolvingObservable(() -> commandBuilder.mgetKeyValue(keys));
     }
 
-    public Observable<V> mget(Iterable<K> keys) {
-        return createDissolvingObservable(() -> commandBuilder.mget(keys));
+    public Observable<KeyValue<K, V>> mget(Iterable<K> keys) {
+        return createDissolvingObservable(() -> commandBuilder.mgetKeyValue(keys));
     }
 
     @Override
-    public Single<Long> mget(ValueStreamingChannel<V> channel, K... keys) {
+    public Single<Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys) {
         return createSingle(() -> commandBuilder.mget(channel, keys));
     }
 
@@ -606,6 +606,10 @@ public Single<Long> mget(ValueStreamingChannel<V> channel, Iterable<K> keys) {
         return createSingle(() -> commandBuilder.mget(channel, keys));
     }
 
+    public Single<Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K> keys) {
+        return createSingle(() -> commandBuilder.mget(channel, keys));
+    }
+
     @Override
     public Single<Boolean> move(K key, int db) {
         return createSingle(() -> commandBuilder.move(key, db));
@@ -1031,7 +1035,7 @@ public Single<Long> zadd(K key, Object... scoresAndValues) {
 
     @Override
     public Single<Long> zadd(K key, ScoredValue<V>... scoredValues) {
-        return createSingle(() -> commandBuilder.zadd(key, null, scoredValues));
+        return createSingle(() -> commandBuilder.zadd(key, null, (Object[]) scoredValues));
     }
 
     @Override
@@ -1046,7 +1050,7 @@ public Single<Long> zadd(K key, ZAddArgs zAddArgs, Object... scoresAndValues) {
 
     @Override
     public Single<Long> zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues) {
-        return createSingle(() -> commandBuilder.zadd(key, zAddArgs, scoredValues));
+        return createSingle(() -> commandBuilder.zadd(key, zAddArgs, (Object[]) scoredValues));
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/KeyValue.java b/src/main/java/com/lambdaworks/redis/KeyValue.java
index 0146734468..2120f3d01b 100644
--- a/src/main/java/com/lambdaworks/redis/KeyValue.java
+++ b/src/main/java/com/lambdaworks/redis/KeyValue.java
@@ -112,12 +112,12 @@ public boolean equals(Object o) {
         if (!(o instanceof KeyValue))
             return false;
 
-        KeyValue<?, ?> keyValue = (KeyValue<?, ?>) o;
-
-        if (!key.equals(keyValue.key))
+        if (!super.equals(o))
             return false;
-        return getValue() != null ? getValue().equals(keyValue.getValue()) : keyValue.getValue() == null;
 
+        KeyValue<?, ?> keyValue = (KeyValue<?, ?>) o;
+
+        return key.equals(keyValue.key);
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/ReactiveCommandDispatcher.java b/src/main/java/com/lambdaworks/redis/ReactiveCommandDispatcher.java
index 985b3df83e..d9c6fc41cc 100644
--- a/src/main/java/com/lambdaworks/redis/ReactiveCommandDispatcher.java
+++ b/src/main/java/com/lambdaworks/redis/ReactiveCommandDispatcher.java
@@ -156,7 +156,9 @@ public void complete() {
                         if (dissolve && result instanceof Collection) {
                             Collection<T> collection = (Collection<T>) result;
                             for (T t : collection) {
-                                subscriber.onNext(t);
+                                if (t != null) {
+                                    subscriber.onNext(t);
+                                }
                             }
                         } else {
                             subscriber.onNext((T) result);
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
index 47d6d57573..4691172768 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
@@ -4,13 +4,11 @@
 import static com.lambdaworks.redis.protocol.CommandKeyword.*;
 import static com.lambdaworks.redis.protocol.CommandType.*;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.internal.LettuceLists;
 import com.lambdaworks.redis.output.*;
 import com.lambdaworks.redis.protocol.BaseRedisCommandBuilder;
 import com.lambdaworks.redis.protocol.Command;
@@ -82,6 +80,18 @@ public Command<K, V, List<Long>> bitfield(K key, BitFieldArgs bitFieldArgs) {
         return createCommand(BITFIELD, (CommandOutput) new ArrayOutput<K, V>(codec), args);
     }
 
+    public Command<K, V, List<Value<Long>>> bitfieldValue(K key, BitFieldArgs bitFieldArgs) {
+        notNullKey(key);
+        LettuceAssert.notNull(bitFieldArgs, "BitFieldArgs must not be null");
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        args.addKey(key);
+
+        bitFieldArgs.build(args);
+
+        return createCommand(BITFIELD, (CommandOutput) new ValueValueListOutput<K, V>(codec), args);
+    }
+
     public Command<K, V, Long> bitpos(K key, boolean state) {
         notNullKey(key);
 
@@ -571,6 +581,15 @@ public Command<K, V, List<V>> hmget(K key, K... fields) {
         return createCommand(HMGET, new ValueListOutput<K, V>(codec), args);
     }
 
+    public Command<K, V, List<KeyValue<K, V>>> hmgetKeyValue(K key, K... fields) {
+        notNullKey(key);
+        LettuceAssert.notNull(fields, "Fields " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(fields, "Fields " + MUST_NOT_BE_EMPTY);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKeys(fields);
+        return createCommand(HMGET, new KeyValueListOutput<K, V>(codec, Arrays.asList(fields)), args);
+    }
+
     public Command<K, V, Long> hmget(ValueStreamingChannel<V> channel, K key, K... fields) {
         notNullKey(key);
         LettuceAssert.notNull(fields, "Fields " + MUST_NOT_BE_NULL);
@@ -581,6 +600,16 @@ public Command<K, V, Long> hmget(ValueStreamingChannel<V> channel, K key, K... f
         return createCommand(HMGET, new ValueStreamingOutput<K, V>(codec, channel), args);
     }
 
+    public Command<K, V, Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields) {
+        notNullKey(key);
+        LettuceAssert.notNull(fields, "Fields " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(fields, "Fields " + MUST_NOT_BE_EMPTY);
+        notNull(channel);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKeys(fields);
+        return createCommand(HMGET, new KeyValueStreamingOutput<K, V>(codec, channel, Arrays.asList(fields)), args);
+    }
+
     public Command<K, V, String> hmset(K key, Map<K, V> map) {
         notNullKey(key);
         LettuceAssert.notNull(map, "Map " + MUST_NOT_BE_NULL);
@@ -784,6 +813,13 @@ public Command<K, V, List<V>> mget(K... keys) {
         return createCommand(MGET, new ValueListOutput<K, V>(codec), args);
     }
 
+    public Command<K, V, List<KeyValue<K, V>>> mgetKeyValue(K... keys) {
+        notEmpty(keys);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
+        return createCommand(MGET, new KeyValueListOutput<K, V>(codec, Arrays.asList(keys)), args);
+    }
+
     public Command<K, V, List<V>> mget(Iterable<K> keys) {
         LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
 
@@ -791,6 +827,13 @@ public Command<K, V, List<V>> mget(Iterable<K> keys) {
         return createCommand(MGET, new ValueListOutput<K, V>(codec), args);
     }
 
+    public Command<K, V, List<KeyValue<K, V>>> mgetKeyValue(Iterable<K> keys) {
+        LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
+        return createCommand(MGET, new KeyValueListOutput<K, V>(codec, keys), args);
+    }
+
     public Command<K, V, Long> mget(ValueStreamingChannel<V> channel, K... keys) {
         notEmpty(keys);
         notNull(channel);
@@ -799,6 +842,14 @@ public Command<K, V, Long> mget(ValueStreamingChannel<V> channel, K... keys) {
         return createCommand(MGET, new ValueStreamingOutput<K, V>(codec, channel), args);
     }
 
+    public Command<K, V, Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys) {
+        notEmpty(keys);
+        notNull(channel);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
+        return createCommand(MGET, new KeyValueStreamingOutput<K, V>(codec, channel, Arrays.asList(keys)), args);
+    }
+
     public Command<K, V, Long> mget(ValueStreamingChannel<V> channel, Iterable<K> keys) {
         LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
         notNull(channel);
@@ -807,6 +858,14 @@ public Command<K, V, Long> mget(ValueStreamingChannel<V> channel, Iterable<K> ke
         return createCommand(MGET, new ValueStreamingOutput<K, V>(codec, channel), args);
     }
 
+    public Command<K, V, Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K> keys) {
+        LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
+        notNull(channel);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
+        return createCommand(MGET, new KeyValueStreamingOutput<K, V>(codec, channel, keys), args);
+    }
+
     public Command<K, V, Boolean> move(K key, int db) {
         notNullKey(key);
 
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java
index 295be6ba7c..03fb42c057 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 import java.util.Map;
+import com.lambdaworks.redis.KeyValue;
+import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.MapScanCursor;
 import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.ScanCursor;
@@ -126,7 +128,7 @@ public interface RedisHashAsyncCommands<K, V> {
      * @param fields the field type: key
      * @return List&lt;V&gt; array-reply list of values associated with the given fields, in the same
      */
-    RedisFuture<List<V>> hmget(K key, K... fields);
+    RedisFuture<List<KeyValue<K, V>>> hmget(K key, K... fields);
 
     /**
      * Stream over the values of all the given hash fields.
@@ -137,7 +139,7 @@ public interface RedisHashAsyncCommands<K, V> {
      * 
      * @return Long count of the keys
      */
-    RedisFuture<Long> hmget(ValueStreamingChannel<V> channel, K key, K... fields);
+    RedisFuture<Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields);
 
     /**
      * Set multiple hash fields to multiple values.
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java
index 252db0a0c8..dcd7436618 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java
@@ -2,6 +2,7 @@
 
 import java.util.Date;
 import java.util.List;
+import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.KeyScanCursor;
 import com.lambdaworks.redis.MigrateArgs;
 import com.lambdaworks.redis.ScanArgs;
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
index 946ed52717..87f7da7c16 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
@@ -2,10 +2,10 @@
 
 import java.util.List;
 import java.util.Map;
+
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
-import com.lambdaworks.redis.BitFieldArgs;
-import com.lambdaworks.redis.SetArgs;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands for Strings.
@@ -231,7 +231,7 @@ public interface RedisStringAsyncCommands<K, V> {
      * @param keys the key
      * @return List&lt;V&gt; array-reply list of values at the specified keys.
      */
-    RedisFuture<List<V>> mget(K... keys);
+    RedisFuture<List<KeyValue<K, V>>> mget(K... keys);
 
     /**
      * Stream over the values of all the given keys.
@@ -241,7 +241,7 @@ public interface RedisStringAsyncCommands<K, V> {
      *
      * @return Long array-reply list of values at the specified keys.
      */
-    RedisFuture<Long> mget(ValueStreamingChannel<V> channel, K... keys);
+    RedisFuture<Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys);
 
     /**
      * Set multiple keys to multiple values.
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisHashReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisHashReactiveCommands.java
index 21e575bcf8..01b399bcec 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisHashReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisHashReactiveCommands.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 import java.util.Map;
+import com.lambdaworks.redis.KeyValue;
+import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.MapScanCursor;
 import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.ScanCursor;
@@ -128,7 +130,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param fields the field type: key
      * @return V array-reply list of values associated with the given fields, in the same
      */
-    Observable<V> hmget(K key, K... fields);
+    Observable<KeyValue<K, V>> hmget(K key, K... fields);
 
     /**
      * Stream over the values of all the given hash fields.
@@ -139,7 +141,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * 
      * @return Long count of the keys
      */
-    Single<Long> hmget(ValueStreamingChannel<V> channel, K key, K... fields);
+    Single<Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields);
 
     /**
      * Set multiple hash fields to multiple values.
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisKeyReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisKeyReactiveCommands.java
index 8cc15286cc..18411f7af7 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisKeyReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisKeyReactiveCommands.java
@@ -2,6 +2,7 @@
 
 import java.util.Date;
 import java.util.List;
+import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.KeyScanCursor;
 import com.lambdaworks.redis.MigrateArgs;
 import com.lambdaworks.redis.ScanArgs;
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisStringReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisStringReactiveCommands.java
index 347e825982..5abf9b1b9f 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisStringReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisStringReactiveCommands.java
@@ -2,9 +2,12 @@
 
 import java.util.List;
 import java.util.Map;
+import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 import com.lambdaworks.redis.BitFieldArgs;
+import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.SetArgs;
+import com.lambdaworks.redis.Value;
 import rx.Observable;
 import rx.Single;
 import rx.Completable;
@@ -233,17 +236,17 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param keys the key
      * @return V array-reply list of values at the specified keys.
      */
-    Observable<V> mget(K... keys);
+    Observable<KeyValue<K, V>> mget(K... keys);
 
     /**
      * Stream over the values of all the given keys.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
-     * 
+     *
      * @return Long array-reply list of values at the specified keys.
      */
-    Single<Long> mget(ValueStreamingChannel<V> channel, K... keys);
+    Single<Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys);
 
     /**
      * Set multiple keys to multiple values.
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java
index 9fdc19c7fe..1460f29266 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 import java.util.Map;
+import com.lambdaworks.redis.KeyValue;
+import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.MapScanCursor;
 import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.ScanCursor;
@@ -125,7 +127,7 @@ public interface RedisHashCommands<K, V> {
      * @param fields the field type: key
      * @return List&lt;V&gt; array-reply list of values associated with the given fields, in the same
      */
-    List<V> hmget(K key, K... fields);
+    List<KeyValue<K, V>> hmget(K key, K... fields);
 
     /**
      * Stream over the values of all the given hash fields.
@@ -136,7 +138,7 @@ public interface RedisHashCommands<K, V> {
      * 
      * @return Long count of the keys
      */
-    Long hmget(ValueStreamingChannel<V> channel, K key, K... fields);
+    Long hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields);
 
     /**
      * Set multiple hash fields to multiple values.
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java
index e4c2b825dc..f1b618feb0 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java
@@ -2,6 +2,7 @@
 
 import java.util.Date;
 import java.util.List;
+import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.KeyScanCursor;
 import com.lambdaworks.redis.MigrateArgs;
 import com.lambdaworks.redis.ScanArgs;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
index aa15ad93c4..d965a8194d 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
@@ -2,10 +2,14 @@
 
 import java.util.List;
 import java.util.Map;
+
+import com.lambdaworks.redis.KeyValue;
+import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 import com.lambdaworks.redis.BitFieldArgs;
 import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.SetArgs;
+import com.lambdaworks.redis.Value;
 
 /**
  * Synchronous executed commands for Strings.
@@ -231,7 +235,7 @@ public interface RedisStringCommands<K, V> {
      * @param keys the key
      * @return List&lt;V&gt; array-reply list of values at the specified keys.
      */
-    List<V> mget(K... keys);
+    List<KeyValue<K, V>> mget(K... keys);
 
     /**
      * Stream over the values of all the given keys.
@@ -241,7 +245,7 @@ public interface RedisStringCommands<K, V> {
      *
      * @return Long array-reply list of values at the specified keys.
      */
-    Long mget(ValueStreamingChannel<V> channel, K... keys);
+    Long mget(KeyValueStreamingChannel<K, V> channel, K... keys);
 
     /**
      * Set multiple keys to multiple values.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index e207d69155..3db9c0ff02 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -28,6 +28,7 @@
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.output.IntegerOutput;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
+import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 import com.lambdaworks.redis.protocol.AsyncCommand;
 import com.lambdaworks.redis.protocol.Command;
@@ -124,12 +125,12 @@ public RedisFuture<Long> exists(Iterable<K> keys) {
     }
 
     @Override
-    public RedisFuture<List<V>> mget(K... keys) {
+    public RedisFuture<List<KeyValue<K, V>>> mget(K... keys) {
         return mget(Arrays.asList(keys));
     }
 
     @Override
-    public RedisFuture<List<V>> mget(Iterable<K> keys) {
+    public RedisFuture<List<KeyValue<K, V>>> mget(Iterable<K> keys) {
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
 
         if (partitioned.size() < 2) {
@@ -137,21 +138,21 @@ public RedisFuture<List<V>> mget(Iterable<K> keys) {
         }
 
         Map<K, Integer> slots = SlotHash.getSlots(partitioned);
-        Map<Integer, RedisFuture<List<V>>> executions = new HashMap<>();
+        Map<Integer, RedisFuture<List<KeyValue<K, V>>>> executions = new HashMap<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            RedisFuture<List<V>> mget = super.mget(entry.getValue());
+            RedisFuture<List<KeyValue<K, V>>> mget = super.mget(entry.getValue());
             executions.put(entry.getKey(), mget);
         }
 
         // restore order of key
         return new PipelinedRedisFuture<>(executions, objectPipelinedRedisFuture -> {
-            List<V> result = new ArrayList<>();
+            List<KeyValue<K, V>> result = new ArrayList<>();
             for (K opKey : keys) {
                 int slot = slots.get(opKey);
 
                 int position = partitioned.get(slot).indexOf(opKey);
-                RedisFuture<List<V>> listRedisFuture = executions.get(slot);
+                RedisFuture<List<KeyValue<K, V>>> listRedisFuture = executions.get(slot);
                 result.add(MultiNodeExecution.execute(() -> listRedisFuture.get().get(position)));
             }
 
@@ -160,12 +161,12 @@ public RedisFuture<List<V>> mget(Iterable<K> keys) {
     }
 
     @Override
-    public RedisFuture<Long> mget(ValueStreamingChannel<V> channel, K... keys) {
+    public RedisFuture<Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys) {
        return mget(channel, Arrays.asList(keys));
     }
 
     @Override
-    public RedisFuture<Long> mget(ValueStreamingChannel<V> channel, Iterable<K> keys) {
+    public RedisFuture<Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K> keys) {
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
 
         if (partitioned.size() < 2) {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index f112c4f181..1127e06056 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -22,6 +22,7 @@
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
+import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 
 import rx.Completable;
@@ -121,11 +122,11 @@ public Single<Long> exists(Iterable<K> keys) {
     }
 
     @Override
-    public Observable<V> mget(K... keys) {
+    public Observable<KeyValue<K, V>> mget(K... keys) {
         return mget(Arrays.asList(keys));
     }
 
-    public Observable<V> mget(Iterable<K> keys) {
+    public Observable<KeyValue<K, V>> mget(Iterable<K> keys) {
 
         List<K> keyList = LettuceLists.newList(keys);
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keyList);
@@ -134,16 +135,16 @@ public Observable<V> mget(Iterable<K> keys) {
             return super.mget(keyList);
         }
 
-        List<Observable<V>> observables = new ArrayList<>();
+        List<Observable<KeyValue<K, V>>> observables = new ArrayList<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
             observables.add(super.mget(entry.getValue()));
         }
-        Observable<V> observable = Observable.concat(Observable.from(observables));
+        Observable<KeyValue<K, V>> observable = Observable.concat(Observable.from(observables));
 
-        Observable<List<V>> map = observable.toList().map(vs -> {
+        Observable<List<KeyValue<K, V>>> map = observable.toList().map(vs -> {
 
-            Object[] values = new Object[vs.size()];
+            KeyValue<K, V>[] values = new KeyValue[vs.size()];
             int offset = 0;
             for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
 
@@ -160,7 +161,7 @@ public Observable<V> mget(Iterable<K> keys) {
                 offset += entry.getValue().size();
             }
 
-            List<V> objects = (List<V>) new ArrayList<>(Arrays.asList(values));
+            List<KeyValue<K, V>> objects = new ArrayList<>(Arrays.asList(values));
             return objects;
         });
 
@@ -168,12 +169,12 @@ public Observable<V> mget(Iterable<K> keys) {
     }
 
     @Override
-    public Single<Long> mget(ValueStreamingChannel<V> channel, K... keys) {
+    public Single<Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys) {
         return mget(channel, Arrays.asList(keys));
     }
 
     @Override
-    public Single<Long> mget(ValueStreamingChannel<V> channel, Iterable<K> keys) {
+    public Single<Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K> keys) {
 
         List<K> keyList = LettuceLists.newList(keys);
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
index 4aa308f69f..9d87be0ee8 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
@@ -17,7 +17,7 @@
  * @since 4.0
  * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi
  */
-public interface BaseNodeSelectionAsyncCommands<K, V> extends AutoCloseable {
+public interface BaseNodeSelectionAsyncCommands<K, V> {
 
     /**
      * Post a message to a channel.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java
index dec72c511f..43d9b3935f 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 import java.util.Map;
+import com.lambdaworks.redis.KeyValue;
+import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.MapScanCursor;
 import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.ScanCursor;
@@ -126,7 +128,7 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
      * @param fields the field type: key
      * @return List&lt;V&gt; array-reply list of values associated with the given fields, in the same
      */
-    AsyncExecutions<List<V>> hmget(K key, K... fields);
+    AsyncExecutions<List<KeyValue<K, V>>> hmget(K key, K... fields);
 
     /**
      * Stream over the values of all the given hash fields.
@@ -137,7 +139,7 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
      * 
      * @return Long count of the keys
      */
-    AsyncExecutions<Long> hmget(ValueStreamingChannel<V> channel, K key, K... fields);
+    AsyncExecutions<Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields);
 
     /**
      * Set multiple hash fields to multiple values.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java
index 184e953757..a6d7633c2d 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java
@@ -2,6 +2,7 @@
 
 import java.util.Date;
 import java.util.List;
+import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.KeyScanCursor;
 import com.lambdaworks.redis.MigrateArgs;
 import com.lambdaworks.redis.ScanArgs;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
index adf5d11c91..25d70d1654 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
@@ -2,10 +2,10 @@
 
 import java.util.List;
 import java.util.Map;
+
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
-import com.lambdaworks.redis.BitFieldArgs;
-import com.lambdaworks.redis.SetArgs;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands on a node selection for Strings.
@@ -231,7 +231,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
      * @param keys the key
      * @return List&lt;V&gt; array-reply list of values at the specified keys.
      */
-    AsyncExecutions<List<V>> mget(K... keys);
+    AsyncExecutions<List<KeyValue<K, V>>> mget(K... keys);
 
     /**
      * Stream over the values of all the given keys.
@@ -241,7 +241,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
      *
      * @return Long array-reply list of values at the specified keys.
      */
-    AsyncExecutions<Long> mget(ValueStreamingChannel<V> channel, K... keys);
+    AsyncExecutions<Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys);
 
     /**
      * Set multiple keys to multiple values.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
index 33fe6f5432..0bdacab505 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
@@ -152,7 +152,7 @@ default AsyncNodeSelection<K, V> all() {
      * @return List&lt;V&gt; array-reply list of values at the specified keys.
      * @see RedisStringAsyncCommands#mget(Object[])
      */
-    RedisFuture<List<V>> mget(K... keys);
+    RedisFuture<List<KeyValue<K, V>>> mget(K... keys);
 
     /**
      * Set multiple keys to multiple values with pipelining. Cross-slot keys will result in multiple calls to the particular
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java
index dced1f67ce..6f3c8dd841 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java
@@ -4,6 +4,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.RedisFuture;
 import com.lambdaworks.redis.api.async.*;
 
@@ -290,7 +291,7 @@ public interface RedisClusterAsyncCommands<K, V>
      * @param keys the key
      * @return RedisFuture&lt;List&lt;V&gt;&gt; array-reply list of values at the specified keys.
      */
-    RedisFuture<List<V>> mget(K... keys);
+    RedisFuture<List<KeyValue<K, V>>> mget(K... keys);
 
     /**
      * Set multiple keys to multiple values with pipelining. Cross-slot keys will result in multiple calls to the particular
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisAdvancedClusterReactiveCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisAdvancedClusterReactiveCommands.java
index c4d571c884..8afbd0e3ca 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisAdvancedClusterReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisAdvancedClusterReactiveCommands.java
@@ -81,7 +81,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return V array-reply list of values at the specified keys.
      * @see RedisStringReactiveCommands#mget(Object[])
      */
-    Observable<V> mget(K... keys);
+    Observable<KeyValue<K, V>> mget(K... keys);
 
     /**
      * Set multiple keys to multiple values with pipelining. Cross-slot keys will result in multiple calls to the particular
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java
index 4a209ce319..f3365643a3 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java
@@ -3,6 +3,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import com.lambdaworks.redis.KeyValue;
 import rx.Observable;
 
 import com.lambdaworks.redis.api.rx.*;
@@ -290,7 +291,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param keys the key
      * @return Observable&lt;List&lt;V&gt;&gt; array-reply list of values at the specified keys.
      */
-    Observable<V> mget(K... keys);
+    Observable<KeyValue<K, V>> mget(K... keys);
 
     /**
      * Set multiple keys to multiple values with pipelining. Cross-slot keys will result in multiple calls to the particular
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
index 31cbb13e8b..e81667ebc6 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
@@ -16,7 +16,7 @@
  * @since 4.0
  * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi
  */
-public interface BaseNodeSelectionCommands<K, V> extends AutoCloseable {
+public interface BaseNodeSelectionCommands<K, V> {
 
     /**
      * Post a message to a channel.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java
index 924acb1aaf..07942954d7 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 import java.util.Map;
+import com.lambdaworks.redis.KeyValue;
+import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.MapScanCursor;
 import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.ScanCursor;
@@ -125,7 +127,7 @@ public interface NodeSelectionHashCommands<K, V> {
      * @param fields the field type: key
      * @return List&lt;V&gt; array-reply list of values associated with the given fields, in the same
      */
-    Executions<List<V>> hmget(K key, K... fields);
+    Executions<List<KeyValue<K, V>>> hmget(K key, K... fields);
 
     /**
      * Stream over the values of all the given hash fields.
@@ -136,7 +138,7 @@ public interface NodeSelectionHashCommands<K, V> {
      * 
      * @return Long count of the keys
      */
-    Executions<Long> hmget(ValueStreamingChannel<V> channel, K key, K... fields);
+    Executions<Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields);
 
     /**
      * Set multiple hash fields to multiple values.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java
index d43d141f9e..24b28c25f8 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java
@@ -2,6 +2,7 @@
 
 import java.util.Date;
 import java.util.List;
+import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.KeyScanCursor;
 import com.lambdaworks.redis.MigrateArgs;
 import com.lambdaworks.redis.ScanArgs;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
index 9539cb5b9b..041140dd53 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
@@ -2,9 +2,13 @@
 
 import java.util.List;
 import java.util.Map;
+
+import com.lambdaworks.redis.KeyValue;
+import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 import com.lambdaworks.redis.BitFieldArgs;
 import com.lambdaworks.redis.SetArgs;
+import com.lambdaworks.redis.Value;
 
 /**
  * Synchronous executed commands on a node selection for Strings.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java
index 19bb507013..72492ab8ac 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java
@@ -149,7 +149,7 @@ default NodeSelection<K, V> all() {
      * @return List&lt;V&gt; array-reply list of values at the specified keys.
      * @see RedisStringCommands#mget(Object[])
      */
-    List<V> mget(K... keys);
+    List<KeyValue<K, V>> mget(K... keys);
 
     /**
      * Set multiple keys to multiple values with pipelining. Cross-slot keys will result in multiple calls to the particular
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyStreamingChannel.java b/src/main/java/com/lambdaworks/redis/output/KeyStreamingChannel.java
index 296a0186e0..bf97f8ff6b 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyStreamingChannel.java
+++ b/src/main/java/com/lambdaworks/redis/output/KeyStreamingChannel.java
@@ -9,7 +9,7 @@
  * @since 3.0
  */
 @FunctionalInterface
-public interface KeyStreamingChannel<K> {
+public interface KeyStreamingChannel<K> extends StreamingChannel{
     /**
      * Called on every incoming key.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueListOutput.java b/src/main/java/com/lambdaworks/redis/output/KeyValueListOutput.java
new file mode 100644
index 0000000000..2da58e2714
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/output/KeyValueListOutput.java
@@ -0,0 +1,53 @@
+package com.lambdaworks.redis.output;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import com.lambdaworks.redis.KeyValue;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * {@link List} of values output.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ *
+ * @author Mark Paluch
+ */
+public class KeyValueListOutput<K, V> extends CommandOutput<K, V, List<KeyValue<K, V>>>
+        implements StreamingOutput<KeyValue<K, V>> {
+
+    private Subscriber<KeyValue<K, V>> subscriber;
+    private Iterable<K> keys;
+    private Iterator<K> keyIterator;
+
+    public KeyValueListOutput(RedisCodec<K, V> codec, Iterable<K> keys) {
+        super(codec, new ArrayList<>());
+        setSubscriber(ListSubscriber.of(output));
+        this.keys = keys;
+    }
+
+    @Override
+    public void set(ByteBuffer bytes) {
+
+        if(keyIterator == null) {
+            keyIterator = keys.iterator();
+        }
+
+        subscriber.onNext(KeyValue.fromNullable(keyIterator.next(), bytes == null ? null : codec.decodeValue(bytes)));
+    }
+
+    @Override
+    public void setSubscriber(Subscriber<KeyValue<K, V>> subscriber) {
+        LettuceAssert.notNull(subscriber, "Subscriber must not be null");
+        this.subscriber = subscriber;
+    }
+
+    @Override
+    public Subscriber<KeyValue<K, V>> getSubscriber() {
+        return subscriber;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingChannel.java b/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingChannel.java
index 40f3cdd30f..73ab97729b 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingChannel.java
+++ b/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingChannel.java
@@ -1,18 +1,17 @@
 package com.lambdaworks.redis.output;
 
 /**
- * Streaming API for multiple Key-Values. You can implement this interface in order to receive a call to {@code onKeyValue} on
- * every key-value pair. Key uniqueness is not guaranteed.
+ * Streaming API for multiple keys and values (tuples). You can implement this interface in order to receive a call to
+ * {@code onKeyValue} on every key-value.
  * 
- * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
- * @since 3.0
+ * @since 5.0
  */
 @FunctionalInterface
-public interface KeyValueStreamingChannel<K, V> {
+public interface KeyValueStreamingChannel<K, V> extends StreamingChannel {
+
     /**
-     * 
      * Called on every incoming key/value pair.
      * 
      * @param key the key
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingOutput.java b/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingOutput.java
index c6d023c0d2..567b84e8de 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingOutput.java
@@ -3,6 +3,7 @@
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
+import java.util.Iterator;
 
 import com.lambdaworks.redis.codec.RedisCodec;
 
@@ -15,6 +16,9 @@
  * @author Mark Paluch
  */
 public class KeyValueStreamingOutput<K, V> extends CommandOutput<K, V, Long> {
+
+    private Iterable<K> keys;
+    private Iterator<K> keyIterator;
     private K key;
     private KeyValueStreamingChannel<K, V> channel;
 
@@ -23,11 +27,24 @@ public KeyValueStreamingOutput(RedisCodec<K, V> codec, KeyValueStreamingChannel<
         this.channel = channel;
     }
 
+    public KeyValueStreamingOutput(RedisCodec<K, V> codec, KeyValueStreamingChannel<K, V> channel, Iterable<K> keys) {
+        super(codec, Long.valueOf(0));
+        this.channel = channel;
+        this.keys = keys;
+    }
+
     @Override
     public void set(ByteBuffer bytes) {
-        if (key == null) {
-            key = codec.decodeKey(bytes);
-            return;
+        if (keys == null) {
+            if (key == null) {
+                key = codec.decodeKey(bytes);
+                return;
+            }
+        } else {
+            if (keyIterator == null) {
+                keyIterator = keys.iterator();
+            }
+            key = keyIterator.next();
         }
 
         V value = (bytes == null) ? null : codec.decodeValue(bytes);
diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingChannel.java b/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingChannel.java
index 95fb429128..ba7db3c2ba 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingChannel.java
+++ b/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingChannel.java
@@ -11,7 +11,7 @@
  * @since 3.0
  */
 @FunctionalInterface
-public interface ScoredValueStreamingChannel<V> {
+public interface ScoredValueStreamingChannel<V> extends StreamingChannel {
     /**
      * Called on every incoming ScoredValue.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/output/StreamingChannel.java b/src/main/java/com/lambdaworks/redis/output/StreamingChannel.java
new file mode 100644
index 0000000000..91aca606b9
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/output/StreamingChannel.java
@@ -0,0 +1,10 @@
+package com.lambdaworks.redis.output;
+
+/**
+ * Marker interface for streaming channels.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public interface StreamingChannel {
+}
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueValueListOutput.java b/src/main/java/com/lambdaworks/redis/output/ValueValueListOutput.java
new file mode 100644
index 0000000000..1f0b4d6d9a
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/output/ValueValueListOutput.java
@@ -0,0 +1,49 @@
+
+package com.lambdaworks.redis.output;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * {@link List} of {@link Value} wrapped values output.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ *
+ * @author Mark Paluch
+ */
+public class ValueValueListOutput<K, V> extends CommandOutput<K, V, List<Value<V>>> implements StreamingOutput<Value<V>> {
+
+    private Subscriber<Value<V>> subscriber;
+
+    public ValueValueListOutput(RedisCodec<K, V> codec) {
+        super(codec, new ArrayList<>());
+        setSubscriber(ListSubscriber.of(output));
+    }
+
+    @Override
+    public void set(ByteBuffer bytes) {
+        subscriber.onNext(Value.fromNullable(bytes == null ? null : codec.decodeValue(bytes)));
+    }
+
+    @Override
+    public void set(long integer) {
+        subscriber.onNext(Value.fromNullable((V) Long.valueOf(integer)));
+    }
+
+    @Override
+    public void setSubscriber(Subscriber<Value<V>> subscriber) {
+        LettuceAssert.notNull(subscriber, "Subscriber must not be null");
+        this.subscriber = subscriber;
+    }
+
+    @Override
+    public Subscriber<Value<V>> getSubscriber() {
+        return subscriber;
+    }
+}
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java
index e180cd2c81..340de0b50b 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java
@@ -3,6 +3,8 @@
 import java.util.List;
 import java.util.Map;
 
+import com.lambdaworks.redis.KeyValue;
+import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.MapScanCursor;
 import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.ScanCursor;
@@ -125,7 +127,7 @@ public interface RedisHashCommands<K, V> {
      * @param fields the field type: key
      * @return List&lt;V&gt; array-reply list of values associated with the given fields, in the same
      */
-    List<V> hmget(K key, K... fields);
+    List<KeyValue<K, V>> hmget(K key, K... fields);
 
     /**
      * Stream over the values of all the given hash fields.
@@ -136,7 +138,7 @@ public interface RedisHashCommands<K, V> {
      * 
      * @return Long count of the keys
      */
-    Long hmget(ValueStreamingChannel<V> channel, K key, K... fields);
+    Long hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields);
 
     /**
      * Set multiple hash fields to multiple values.
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java
index e835b6c082..bcf563fc1c 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java
@@ -3,6 +3,7 @@
 import java.util.Date;
 import java.util.List;
 
+import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.KeyScanCursor;
 import com.lambdaworks.redis.MigrateArgs;
 import com.lambdaworks.redis.ScanArgs;
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java
index e45d23bff8..c087d0aca6 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java
@@ -3,9 +3,12 @@
 import java.util.List;
 import java.util.Map;
 
+import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 import com.lambdaworks.redis.BitFieldArgs;
+import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.SetArgs;
+import com.lambdaworks.redis.Value;
 
 /**
  * ${intent} for Strings.
@@ -230,17 +233,17 @@ public interface RedisStringCommands<K, V> {
      * @param keys the key
      * @return List&lt;V&gt; array-reply list of values at the specified keys.
      */
-    List<V> mget(K... keys);
+    List<KeyValue<K, V>> mget(K... keys);
 
     /**
      * Stream over the values of all the given keys.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
-     * 
+     *
      * @return Long array-reply list of values at the specified keys.
      */
-    Long mget(ValueStreamingChannel<V> channel, K... keys);
+    Long mget(KeyValueStreamingChannel<K, V> channel, K... keys);
 
     /**
      * Set multiple keys to multiple values.
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
index fce0f00fb0..1dbf8a61ad 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
@@ -25,10 +25,10 @@
 @RunWith(Parameterized.class)
 public class CreateReactiveApi {
 
-    private Set<String> KEEP_METHOD_RESULT_TYPE = LettuceSets.unmodifiableSet("digest", "close", "isOpen",
+    private static Set<String> KEEP_METHOD_RESULT_TYPE = LettuceSets.unmodifiableSet("digest", "close", "isOpen",
             "BaseRedisCommands.reset", "getStatefulConnection", "setAutoFlushCommands", "flushCommands");
 
-    private Set<String> FORCE_OBSERVABLE_RESULT = LettuceSets.unmodifiableSet("eval", "evalsha");
+    private static Set<String> FORCE_OBSERVABLE_RESULT = LettuceSets.unmodifiableSet("eval", "evalsha", "dispatch");
 
     private CompilationUnitFactory factory;
 
@@ -96,10 +96,15 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
                 return method.getType();
             }
 
+            if (method.getName().equals("sort")) {
+                System.out.println();
+            }
+
             String typeAsString = method.getType().toStringWithoutComments().trim();
+
             if (methodMatch(FORCE_OBSERVABLE_RESULT, method, classOfMethod)) {
                 typeAsString = "Observable<" + typeAsString + ">";
-            } if (typeAsString.equals("void")) {
+            } else if (typeAsString.equals("void")) {
                 typeAsString = "Completable";
             } else if (typeAsString.startsWith("List<")) {
                 typeAsString = "Observable<" + typeAsString.substring(5, typeAsString.length() - 1) + ">";
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
index d865d30dcf..409d702bb4 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
@@ -122,7 +122,7 @@ public void testObservableMultiCancel() throws Exception {
         reactive.clientPause(1000).subscribe();
         Delay.delay(millis(100));
 
-        Observable<String> set = reactive.mget(key, value);
+        Observable<KeyValue<String, String>> set = reactive.mget(key, value);
         set.subscribe(new CompletionSubscriber(result));
         set.subscribe(new CompletionSubscriber(result));
         set.subscribe(new CompletionSubscriber(result));
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java b/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
index 8e057d5eba..f0809a4641 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
@@ -1,6 +1,7 @@
 package com.lambdaworks.redis;
 
-import static org.assertj.core.api.Assertions.*;
+
+import java.util.stream.Collectors;
 
 import org.junit.After;
 import org.junit.Before;
@@ -8,13 +9,15 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import rx.observers.TestSubscriber;
-
 import com.lambdaworks.RandomKeys;
 import com.lambdaworks.redis.GeoArgs.Unit;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
 
+import rx.observers.TestSubscriber;
+
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+
 public class ReactiveStreamingOutputTest extends AbstractRedisClientTest {
 
     private RedisReactiveCommands<String, String> reactive;
@@ -51,10 +54,15 @@ public void valueListCommandShouldReturnAllElements() throws Exception {
 
         redis.mset(RandomKeys.MAP);
 
+        TestSubscriber<KeyValue<String, String>> subscriber = TestSubscriber.create();
+
         reactive.mget(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT])).subscribe(subscriber);
         subscriber.awaitTerminalEvent();
 
-        assertThat(subscriber.getOnNextEvents()).containsAll(RandomKeys.VALUES);
+        assertThat(subscriber.getOnNextEvents().stream().map(KeyValue::getValue).collect(Collectors.toList()))
+                .containsAll(RandomKeys.VALUES);
+        assertThat(subscriber.getOnNextEvents().stream().map(KeyValue::getKey).collect(Collectors.toList()))
+                .containsAll(RandomKeys.KEYS);
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
index aa9b6fa00b..a9f1f643b6 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
@@ -177,7 +177,7 @@ public void msetnxCrossSlot() throws Exception {
     public void mgetRegular() throws Exception {
 
         msetRegular();
-        List<String> result = syncCommands.mget(key);
+        List<KeyValue<String, String>> result = syncCommands.mget(key);
 
         assertThat(result).hasSize(1);
     }
@@ -187,14 +187,14 @@ public void mgetCrossSlot() throws Exception {
 
         msetCrossSlot();
         List<String> keys = new ArrayList<>();
-        List<String> expectation = new ArrayList<>();
+        List<KeyValue<String, String>> expectation = new ArrayList<>();
         for (char c = 'a'; c < 'z'; c++) {
             String key = new String(new char[] { c, c, c });
             keys.add(key);
-            expectation.add("value-" + key);
+            expectation.add(kv(key, "value-" + key));
         }
 
-        List<String> result = syncCommands.mget(keys.toArray(new String[keys.size()]));
+        List<KeyValue<String, String>> result = syncCommands.mget(keys.toArray(new String[keys.size()]));
 
         assertThat(result).hasSize(keys.size());
         assertThat(result).isEqualTo(expectation);
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
index 92b585eaec..f6608daf4c 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
@@ -93,11 +93,11 @@ public void mgetCrossSlot() throws Exception {
         Map<Integer, List<String>> partitioned = SlotHash.partition(new Utf8StringCodec(), RandomKeys.KEYS);
         assertThat(partitioned.size()).isGreaterThan(100);
 
-        Observable<String> observable = commands.mget(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
-        List<String> result = observable.toList().toBlocking().single();
+        Observable<KeyValue<String, String>> observable = commands.mget(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
+        List<KeyValue<String, String>> result = observable.toList().toBlocking().single();
 
         assertThat(result).hasSize(RandomKeys.COUNT);
-        assertThat(result).isEqualTo(RandomKeys.VALUES);
+        assertThat(result.stream().map(Value::getValue).collect(Collectors.toList())).isEqualTo(RandomKeys.VALUES);
     }
 
     @Test
@@ -105,12 +105,12 @@ public void mgetCrossSlotStreaming() throws Exception {
 
         msetCrossSlot();
 
-        ListStreamingAdapter<String> result = new ListStreamingAdapter<>();
+        KeyValueStreamingAdapter<String, String> result = new KeyValueStreamingAdapter<>();
 
         Single<Long> single = commands.mget(result, RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
         Long count = block(single);
 
-        assertThat(result.getList()).hasSize(RandomKeys.COUNT);
+        assertThat(result.getMap()).hasSize(RandomKeys.COUNT);
         assertThat(count).isEqualTo(RandomKeys.COUNT);
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
index b791f47b26..3739ed8a87 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
@@ -6,15 +6,12 @@
 import java.util.Map;
 
 import com.lambdaworks.TestClientResources;
+import com.lambdaworks.redis.*;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.ListStreamingAdapter;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.cluster.ClusterTestUtil;
 import com.lambdaworks.redis.cluster.RedisClusterClient;
@@ -69,10 +66,10 @@ public void msetnx() throws Exception {
     public void mgetStreaming() throws Exception {
         setupMget();
 
-        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
+        KeyValueStreamingAdapter<String, String> streamingAdapter = new KeyValueStreamingAdapter<>();
         Long count = redis.mget(streamingAdapter, "one", "two");
 
-        assertThat(LettuceSets.newHashSet(streamingAdapter.getList())).isEqualTo(LettuceSets.newHashSet(list("1", "2")));
+        assertThat(streamingAdapter.getMap()).containsEntry("one", "1").containsEntry("two", "2");
 
         assertThat(count.intValue()).isEqualTo(2);
     }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/KeyClusterRxCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/KeyClusterRxCommandTest.java
index d7f93062a6..dc89c09554 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/KeyClusterRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/KeyClusterRxCommandTest.java
@@ -1,6 +1,7 @@
 package com.lambdaworks.redis.cluster.commands.rx;
 
 import com.lambdaworks.TestClientResources;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -13,7 +14,6 @@
 import com.lambdaworks.redis.cluster.RedisClusterClient;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.commands.KeyClusterCommandTest;
-import com.lambdaworks.redis.commands.rx.RxSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/StringClusterRxCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/StringClusterRxCommandTest.java
index fc0edb35b0..127a8938a7 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/StringClusterRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/StringClusterRxCommandTest.java
@@ -5,6 +5,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import com.lambdaworks.redis.KeyValue;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -73,9 +74,9 @@ public void mget() throws Exception {
 
         RedisAdvancedClusterReactiveCommands<String, String> reactive = clusterConnection.reactive();
 
-        Observable<String> mget = reactive.mget(key, "key1", "key2");
-        String first = mget.toBlocking().first();
-        assertThat(first).isEqualTo(value);
+        Observable<KeyValue<String, String>> mget = reactive.mget(key, "key1", "key2");
+        KeyValue<String, String> first = mget.toBlocking().first();
+        assertThat(first).isEqualTo(KeyValue.just(key, value));
     }
 
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/HashCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/HashCommandTest.java
index 430fa5e06a..0a60e32a06 100644
--- a/src/test/java/com/lambdaworks/redis/commands/HashCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/HashCommandTest.java
@@ -5,6 +5,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.offset;
 
+import java.security.Key;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -130,13 +131,13 @@ public void hstrlen() throws Exception {
     @Test
     public void hmget() throws Exception {
         setupHmget();
-        List<String> values = redis.hmget(key, "one", "two");
+        List<KeyValue<String, String>> values = redis.hmget(key, "one", "two");
         assertThat(values).hasSize(2);
-        assertThat(values.containsAll(list("1", "1"))).isTrue();
+        assertThat(values.containsAll(list(kv("one", "1"), kv("two", "2")))).isTrue();
     }
 
     private void setupHmget() {
-        assertThat(redis.hmget(key, "one", "two")).isEqualTo(list(null, null));
+        assertThat(redis.hmget(key, "one", "two")).isEqualTo(list(KeyValue.empty("one"), KeyValue.empty("two")));
         redis.hset(key, "one", "1");
         redis.hset(key, "two", "2");
     }
@@ -145,12 +146,12 @@ private void setupHmget() {
     public void hmgetStreaming() throws Exception {
         setupHmget();
 
-        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
+        KeyValueStreamingAdapter<String, String> streamingAdapter = new KeyValueStreamingAdapter<>();
         Long count = redis.hmget(streamingAdapter, key, "one", "two");
-        List<String> values = streamingAdapter.getList();
+        Map<String, String> values = streamingAdapter.getMap();
         assertThat(count.intValue()).isEqualTo(2);
         assertThat(values).hasSize(2);
-        assertThat(values.containsAll(list("1", "1"))).isTrue();
+        assertThat(values).containsEntry("one", "1").containsEntry("two", "2");
     }
 
     @Test
@@ -159,7 +160,7 @@ public void hmset() throws Exception {
         hash.put("one", "1");
         hash.put("two", "2");
         assertThat(redis.hmset(key, hash)).isEqualTo("OK");
-        assertThat(redis.hmget(key, "one", "two")).isEqualTo(list("1", "2"));
+        assertThat(redis.hmget(key, "one", "two")).isEqualTo(list(kv("one", "1"), kv("two", "2")));
     }
 
     @Test
@@ -167,11 +168,11 @@ public void hmsetWithNulls() throws Exception {
         Map<String, String> hash = new LinkedHashMap<>();
         hash.put("one", null);
         assertThat(redis.hmset(key, hash)).isEqualTo("OK");
-        assertThat(redis.hmget(key, "one")).isEqualTo(list(""));
+        assertThat(redis.hmget(key, "one")).isEqualTo(list(kv("one", "")));
 
         hash.put("one", "");
         assertThat(redis.hmset(key, hash)).isEqualTo("OK");
-        assertThat(redis.hmget(key, "one")).isEqualTo(list(""));
+        assertThat(redis.hmget(key, "one")).isEqualTo(list(kv("one", "")));
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/StringCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/StringCommandTest.java
index 533da3a708..0b4455505e 100644
--- a/src/test/java/com/lambdaworks/redis/commands/StringCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/StringCommandTest.java
@@ -12,16 +12,12 @@
 import java.util.List;
 import java.util.Map;
 
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.ListStreamingAdapter;
-import com.lambdaworks.redis.RedisCommandExecutionException;
-import com.lambdaworks.redis.RedisException;
-
 public class StringCommandTest extends AbstractRedisClientTest {
     @Rule
     public ExpectedException exception = ExpectedException.none();
@@ -64,11 +60,11 @@ public void getset() throws Exception {
     @Test
     public void mget() throws Exception {
         setupMget();
-        assertThat(redis.mget("one", "two")).isEqualTo(list("1", "2") );
+        assertThat(redis.mget("one", "two")).isEqualTo(list(kv("one", "1"), kv("two", "2")));
     }
 
     protected void setupMget() {
-        assertThat(redis.mget(key)).isEqualTo(list((String) null));
+        assertThat(redis.mget(key)).isEqualTo(list(KeyValue.empty("key")));
         redis.set("one", "1");
         redis.set("two", "2");
     }
@@ -77,21 +73,21 @@ protected void setupMget() {
     public void mgetStreaming() throws Exception {
         setupMget();
 
-        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
+        KeyValueStreamingAdapter<String, String> streamingAdapter = new KeyValueStreamingAdapter<>();
         Long count = redis.mget(streamingAdapter, "one", "two");
         assertThat(count.intValue()).isEqualTo(2);
 
-        assertThat(streamingAdapter.getList()).isEqualTo(list("1", "2"));
+        assertThat(streamingAdapter.getMap()).containsEntry("one", "1").containsEntry("two", "2");
     }
 
     @Test
     public void mset() throws Exception {
-        assertThat(redis.mget("one", "two")).isEqualTo(list(null, null));
+        assertThat(redis.mget("one", "two")).isEqualTo(list(KeyValue.empty("one"), KeyValue.empty("two")));
         Map<String, String> map = new LinkedHashMap<>();
         map.put("one", "1");
         map.put("two", "2");
         assertThat(redis.mset(map)).isEqualTo("OK");
-        assertThat(redis.mget("one", "two")).isEqualTo(list("1", "2"));
+        assertThat(redis.mget("one", "two")).isEqualTo(list(kv("one", "1"), kv("two", "2")));
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java
index f041c5f8f8..a280093076 100644
--- a/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java
@@ -71,7 +71,7 @@ public void execmulti() throws Exception {
         redis.set("two", "2");
         redis.mget("one", "two");
         redis.llen(key);
-        assertThat(redis.exec()).isEqualTo(list("OK", "OK", list("1", "2"), 0L));
+        assertThat(redis.exec()).isEqualTo(list("OK", "OK", list(kv("one", "1"), kv("two", "2")), 0L));
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/StringRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/StringRxCommandTest.java
index 5157f6deff..0392f10e40 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/StringRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/StringRxCommandTest.java
@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.util.RxSyncInvocationHandler;
 import org.junit.Test;
 
@@ -26,9 +27,23 @@ public void mget() throws Exception {
         connection.sync().set("key1", value);
         connection.sync().set("key2", value);
 
-        Observable<String> mget = connection.reactive().mget(key, "key1", "key2");
-        String first = mget.toBlocking().first();
-        assertThat(first).isEqualTo(value);
+        Observable<KeyValue<String, String>> mget = connection.reactive().mget(key, "key1", "key2");
+        KeyValue<String, String> first = mget.toBlocking().first();
+        assertThat(first).isEqualTo(KeyValue.just(key, value));
+
+        connection.close();
+    }
+
+    @Test
+    public void mgetEmpty() throws Exception {
+
+        StatefulRedisConnection<String, String> connection = client.connect();
+
+        connection.sync().set(key, value);
+
+        Observable<KeyValue<String, String>> mget = connection.reactive().mget("unknown");
+        KeyValue<String, String> first = mget.toBlocking().first();
+        assertThat(first).isEqualTo(KeyValue.empty("unknown"));
 
         connection.close();
     }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
index 24741dd299..487f9eea93 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
@@ -5,17 +5,18 @@
 import java.util.Iterator;
 import java.util.List;
 
-import com.lambdaworks.util.RxSyncInvocationHandler;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.lambdaworks.redis.ClientOptions;
+import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.RedisException;
 import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.TransactionCommandTest;
 import com.lambdaworks.redis.internal.LettuceLists;
+import com.lambdaworks.util.RxSyncInvocationHandler;
 
 import rx.Observable;
 import rx.Single;
@@ -85,7 +86,7 @@ public void resultOfMultiIsContainedInCommandObservables() throws Exception {
 
         TestSubscriber<String> set1 = TestSubscriber.create();
         TestSubscriber<String> set2 = TestSubscriber.create();
-        TestSubscriber<String> mget = TestSubscriber.create();
+        TestSubscriber<KeyValue<String, String>> mget = TestSubscriber.create();
         TestSubscriber<Long> llen = TestSubscriber.create();
         TestSubscriber<Object> exec = TestSubscriber.create();
 
@@ -100,7 +101,7 @@ public void resultOfMultiIsContainedInCommandObservables() throws Exception {
 
         set1.assertValue("OK");
         set2.assertValue("OK");
-        mget.assertValues("value1", "value2");
+        mget.assertValues(KeyValue.just("key1", "value1"), KeyValue.just("key2", "value2"));
         llen.assertValue(0L);
     }
 
@@ -118,7 +119,8 @@ public void resultOfMultiIsContainedInExecObservable() throws Exception {
 
         exec.awaitTerminalEvent();
 
-        assertThat(exec.getOnNextEvents()).hasSize(4).containsExactly("OK", "OK", list("value1", "value2"), 0L);
+        assertThat(exec.getOnNextEvents()).hasSize(4).containsExactly("OK", "OK",
+                list(kv("key1", "value1"), kv("key2", "value2")), 0L);
     }
 
     protected <T> T first(Observable<T> observable) {

From 703e1e6e5550f258f5573a25e43d11f4f65f9bfc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 27 Jul 2016 23:15:50 +0200
Subject: [PATCH 010/808] Use TransactionResult for transaction results #320

Use TransactionResult instead of List<Object> to encapsulate transactional results. TransactionResult carries the details about rollback and the transaction responses. Using TransactionResult avoids a null response in case the transaction was rolled back.
---
 .../redis/AbstractRedisAsyncCommands.java     |  2 +-
 .../redis/AbstractRedisReactiveCommands.java  |  4 +-
 .../lambdaworks/redis/TransactionResult.java  | 51 ++++++++++++++
 .../RedisTransactionalAsyncCommands.java      |  4 +-
 .../RedisTransactionalReactiveCommands.java   |  4 +-
 .../api/sync/RedisTransactionalCommands.java  |  4 +-
 .../output/DefaultTransactionResult.java      | 68 +++++++++++++++++++
 .../lambdaworks/redis/output/MultiOutput.java | 24 ++++++-
 .../redis/api/RedisTransactionalCommands.java |  3 +-
 .../redis/AsyncConnectionTest.java            |  4 +-
 .../redis/commands/CustomCommandTest.java     |  3 +-
 .../redis/commands/GeoCommandTest.java        | 36 +++++-----
 .../commands/TransactionCommandTest.java      | 34 +++++++---
 .../commands/rx/TransactionRxCommandTest.java | 13 ++--
 .../util/RxSyncInvocationHandler.java         |  2 -
 15 files changed, 207 insertions(+), 49 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/TransactionResult.java
 create mode 100644 src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
index c383cc75a8..1d94b78a6b 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
@@ -346,7 +346,7 @@ public RedisFuture<Boolean> expireat(K key, long timestamp) {
     }
 
     @Override
-    public RedisFuture<List<Object>> exec() {
+    public RedisFuture<TransactionResult> exec() {
         return dispatch(EXEC, null);
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
index e2094cd235..d1e64e471e 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
@@ -349,8 +349,8 @@ public Single<Boolean> expireat(K key, Date timestamp) {
     }
 
     @Override
-    public Observable<Object> exec() {
-        return createDissolvingObservable(EXEC, null, null);
+    public Single<TransactionResult> exec() {
+        return createSingle(EXEC, null, null);
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/TransactionResult.java b/src/main/java/com/lambdaworks/redis/TransactionResult.java
new file mode 100644
index 0000000000..0bb9afdef8
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/TransactionResult.java
@@ -0,0 +1,51 @@
+package com.lambdaworks.redis;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+/**
+ * Value interface for a {@code MULTI} transaction result. {@link TransactionResult} contains whether the transaction was rolled
+ * back (i.e. conditional transaction using {@code WATCH}) and the {@link List} of transaction responses.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public interface TransactionResult extends Iterable<Object> {
+
+    /**
+     *
+     * @return {@literal true} if the transaction was rolled back
+     */
+    boolean wasRolledBack();
+
+    /**
+     * Returns the number of elements in this collection. If this {@link TransactionResult} contains more than
+     * {@link Integer#MAX_VALUE} elements, returns {@link Integer#MAX_VALUE}.
+     *
+     * @return the number of elements in this collection
+     */
+    int size();
+
+    /**
+     * Returns {@literal true} if this {@link TransactionResult} contains no elements.
+     *
+     * @return {@literal true} if this {@link TransactionResult} contains no elements
+     */
+    boolean isEmpty();
+
+    /**
+     * Returns the element at the specified position in this {@link TransactionResult}.
+     *
+     * @param index index of the element to return
+     * @return the element at the specified position in this {@link TransactionResult}
+     * @throws IndexOutOfBoundsException if the index is out of range (<tt>index &lt; 0 || index &gt;= size()</tt>)
+     */
+    <T> T get(int index);
+
+    /**
+     * Returns a sequential {@code Stream} with this {@link TransactionResult} as its source.
+     *
+     * @return a sequential {@code Stream} over the elements in this {@link TransactionResult}
+     */
+    Stream<Object> stream();
+}
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java
index bd35a19d01..d0cf372d5c 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java
@@ -1,7 +1,7 @@
 package com.lambdaworks.redis.api.async;
 
-import java.util.List;
 import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.TransactionResult;
 
 /**
  * Asynchronous executed commands for Transactions.
@@ -28,7 +28,7 @@ public interface RedisTransactionalAsyncCommands<K, V> {
      *
      *         When using {@code WATCH}, {@code EXEC} can return a
      */
-    RedisFuture<List<Object>> exec();
+    RedisFuture<TransactionResult> exec();
 
     /**
      * Mark the start of a transaction block.
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisTransactionalReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisTransactionalReactiveCommands.java
index 5472ecff6d..aa8b83033c 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisTransactionalReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisTransactionalReactiveCommands.java
@@ -1,6 +1,8 @@
 package com.lambdaworks.redis.api.rx;
 
 import java.util.List;
+
+import com.lambdaworks.redis.TransactionResult;
 import rx.Observable;
 import rx.Single;
 import rx.Completable;
@@ -30,7 +32,7 @@ public interface RedisTransactionalReactiveCommands<K, V> {
      *
      *         When using {@code WATCH}, {@code EXEC} can return a
      */
-    Observable<Object> exec();
+    Single<TransactionResult> exec();
 
     /**
      * Mark the start of a transaction block.
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java
index 9867968dd3..0c2add2174 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java
@@ -1,6 +1,6 @@
 package com.lambdaworks.redis.api.sync;
 
-import java.util.List;
+import com.lambdaworks.redis.TransactionResult;
 
 /**
  * Synchronous executed commands for Transactions.
@@ -27,7 +27,7 @@ public interface RedisTransactionalCommands<K, V> {
      *
      *         When using {@code WATCH}, {@code EXEC} can return a
      */
-    List<Object> exec();
+    TransactionResult exec();
 
     /**
      * Mark the start of a transaction block.
diff --git a/src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java b/src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java
new file mode 100644
index 0000000000..3e73fdf480
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java
@@ -0,0 +1,68 @@
+package com.lambdaworks.redis.output;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Stream;
+
+import com.lambdaworks.redis.TransactionResult;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Result of a {@code MULTI} transaction.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class DefaultTransactionResult implements Iterable<Object>, TransactionResult {
+
+    private final boolean wasRolledBack;
+    private final List<Object> result;
+
+    /**
+     * Creates a new {@link DefaultTransactionResult}.
+     * 
+     * @param wasRolledBack {@literal true} if the transaction was rolled back.
+     * @param result the transaction result, must not be {@literal null}.
+     */
+    public DefaultTransactionResult(boolean wasRolledBack, List<Object> result) {
+
+        LettuceAssert.notNull(result, "Result must not be null");
+
+        this.wasRolledBack = wasRolledBack;
+        this.result = result;
+    }
+
+    /**
+     *
+     * @return {@literal true} if the transaction was rolled back
+     */
+    @Override
+    public boolean wasRolledBack() {
+        return wasRolledBack;
+    }
+
+    @Override
+    public Iterator<Object> iterator() {
+        return result.iterator();
+    }
+
+    @Override
+    public int size() {
+        return result.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return result.isEmpty();
+    }
+
+    @Override
+    public <T> T get(int index) {
+        return (T) result.get(index);
+    }
+
+    @Override
+    public Stream<Object> stream() {
+        return result.stream();
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/output/MultiOutput.java b/src/main/java/com/lambdaworks/redis/output/MultiOutput.java
index 953fe37200..77aec87804 100644
--- a/src/main/java/com/lambdaworks/redis/output/MultiOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/MultiOutput.java
@@ -8,6 +8,7 @@
 import java.util.Queue;
 
 import com.lambdaworks.redis.RedisCommandExecutionException;
+import com.lambdaworks.redis.TransactionResult;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.internal.LettuceFactories;
 import com.lambdaworks.redis.protocol.RedisCommand;
@@ -18,12 +19,16 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
+ * @author Mark Paluch
  */
-public class MultiOutput<K, V> extends CommandOutput<K, V, List<Object>> {
+public class MultiOutput<K, V> extends CommandOutput<K, V, TransactionResult> {
+
     private final Queue<RedisCommand<K, V, ?>> queue;
+    private List<Object> responses = new ArrayList<>();
+    private Boolean rolledBack;
 
     public MultiOutput(RedisCodec<K, V> codec) {
-        super(codec, new ArrayList<>());
+        super(codec, null);
         queue = LettuceFactories.newSpScQueue();
     }
 
@@ -56,6 +61,14 @@ public void set(ByteBuffer bytes) {
     @Override
     public void multi(int count) {
 
+        if (rolledBack == null) {
+            if (count == -1) {
+                rolledBack = true;
+            } else {
+                rolledBack = false;
+            }
+        }
+
         if (count == -1 && !queue.isEmpty()) {
             queue.peek().getOutput().multi(count);
         }
@@ -82,7 +95,7 @@ public void complete(int depth) {
         if (depth == 1) {
             RedisCommand<K, V, ?> cmd = queue.remove();
             CommandOutput<K, V, ?> o = cmd.getOutput();
-            output.add(!o.hasError() ? o.get() : new RedisCommandExecutionException(o.getError()));
+            responses.add(!o.hasError() ? o.get() : new RedisCommandExecutionException(o.getError()));
             cmd.complete();
         } else if (depth == 0 && !queue.isEmpty()) {
             for (RedisCommand<K, V, ?> cmd : queue) {
@@ -90,4 +103,9 @@ public void complete(int depth) {
             }
         }
     }
+
+    @Override
+    public TransactionResult get() {
+        return new DefaultTransactionResult(rolledBack == null ? false : rolledBack, responses);
+    }
 }
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisTransactionalCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisTransactionalCommands.java
index 5da386726d..e6ef5e1c36 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisTransactionalCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisTransactionalCommands.java
@@ -1,6 +1,7 @@
 package com.lambdaworks.redis.api;
 
 import java.util.List;
+import com.lambdaworks.redis.TransactionResult;
 
 /**
  * ${intent} for Transactions.
@@ -26,7 +27,7 @@ public interface RedisTransactionalCommands<K, V> {
      *
      *         When using {@code WATCH}, {@code EXEC} can return a
      */
-    List<Object> exec();
+    TransactionResult exec();
 
     /**
      * Mark the start of a transaction block.
diff --git a/src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java b/src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java
index 00bd094582..052535163c 100644
--- a/src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java
@@ -41,7 +41,7 @@ public void multi() throws Exception {
         Future<List<String>> lrange = async.lrange("list", 0, -1);
 
         assertThat(!set.isDone() && !rpush.isDone() && !rpush.isDone()).isTrue();
-        assertThat(async.exec().get()).isEqualTo(list("OK", 2L, list("1", "2")));
+        assertThat(async.exec().get()).contains("OK", 2L, list("1", "2"));
 
         assertThat(set.get()).isEqualTo("OK");
         assertThat((long) rpush.get()).isEqualTo(2L);
@@ -57,7 +57,7 @@ public void watch() throws Exception {
         async.multi();
         Future<String> set = async.set(key, value);
         Future<Long> append = async.append(key, "foo");
-        assertThat(async.exec().get()).isEqualTo(list());
+        assertThat(async.exec().get()).isEmpty();
         assertThat(set.get()).isNull();
         assertThat(append.get()).isNull();
     }
diff --git a/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
index a9ff76e586..6299f62558 100644
--- a/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
@@ -5,6 +5,7 @@
 
 import java.util.List;
 
+import com.lambdaworks.redis.TransactionResult;
 import org.junit.Test;
 
 import com.lambdaworks.redis.AbstractRedisClientTest;
@@ -56,7 +57,7 @@ public void dispatchTransactions() throws Exception {
         String response = redis.dispatch(CommandType.SET, new StatusOutput<>(utf8StringCodec),
                 new CommandArgs<>(utf8StringCodec).addKey(key).addValue(value));
 
-        List<Object> exec = redis.exec();
+        TransactionResult exec = redis.exec();
 
         assertThat(response).isNull();
         assertThat(exec).hasSize(1).contains("OK");
diff --git a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
index 67a58fb959..43b2c813fa 100644
--- a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
@@ -85,9 +85,9 @@ public void georadiusWithTransaction() throws Exception {
         redis.georadius(key, 8.6582861, 49.5285695, 1, GeoArgs.Unit.km);
         redis.georadius(key, 8.6582861, 49.5285695, 5, GeoArgs.Unit.km);
 
-        List<Object> exec = redis.exec();
-        Set<String> georadius = (Set<String>) exec.get(0);
-        Set<String> largerGeoradius = (Set<String>) exec.get(1);
+        TransactionResult exec = redis.exec();
+        Set<String> georadius = exec.get(0);
+        Set<String> largerGeoradius = exec.get(1);
 
         assertThat(georadius).hasSize(1).contains("Weinheim");
         assertThat(largerGeoradius).hasSize(2).contains("Weinheim").contains("Bahn");
@@ -186,11 +186,11 @@ public void georadiusWithArgsAndTransaction() throws Exception {
         GeoArgs geoArgs = new GeoArgs().withHash().withCoordinates().withDistance().withCount(1).desc();
         redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, geoArgs);
         redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, geoArgs);
-        List<Object> exec = redis.exec();
+        TransactionResult exec = redis.exec();
 
         assertThat(exec).hasSize(2);
 
-        List<GeoWithin<String>> result = (List) exec.get(1);
+        List<GeoWithin<String>> result = exec.get(1);
         assertThat(result).hasSize(1);
 
         GeoWithin<String> weinheim = result.get(0);
@@ -242,9 +242,9 @@ public void geohashWithTransaction() throws Exception {
         redis.multi();
         redis.geohash(key, "Weinheim", "Bahn", "dunno");
         redis.geohash(key, "Weinheim", "Bahn", "dunno");
-        List<Object> exec = redis.exec();
+        TransactionResult exec = redis.exec();
 
-        List<String> geohash = (List) exec.get(1);
+        List<String> geohash = exec.get(1);
 
         assertThat(geohash).containsSequence("u0y1v0kffz0", "u0y1vhvuvm0", null);
     }
@@ -269,8 +269,8 @@ public void georadiusStoreWithCountAndSort() throws Exception {
         prepareGeo();
 
         String resultKey = "38o54"; // yields in same slot as "key"
-        Long result = redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, new GeoRadiusStoreArgs<>().withCount(1)
-                .desc().withStore(resultKey));
+        Long result = redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km,
+                new GeoRadiusStoreArgs<>().withCount(1).desc().withStore(resultKey));
         assertThat(result).isEqualTo(1);
 
         List<ScoredValue<String>> results = redis.zrangeWithScores(resultKey, 0, -1);
@@ -298,8 +298,8 @@ public void georadiusStoreDistWithCountAndSort() throws Exception {
         prepareGeo();
 
         String resultKey = "38o54"; // yields in same slot as "key"
-        Long result = redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, new GeoRadiusStoreArgs<>().withCount(1)
-                .desc().withStoreDist("38o54"));
+        Long result = redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km,
+                new GeoRadiusStoreArgs<>().withCount(1).desc().withStoreDist("38o54"));
         assertThat(result).isEqualTo(1);
 
         List<ScoredValue<String>> dist = redis.zrangeWithScores(resultKey, 0, -1);
@@ -336,8 +336,8 @@ public void georadiusbymemberStoreDistWithCountAndSort() throws Exception {
         prepareGeo();
 
         String resultKey = "38o54"; // yields in same slot as "key"
-        Long result = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km, new GeoRadiusStoreArgs<>().withCount(1).desc()
-                .withStoreDist("38o54"));
+        Long result = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km,
+                new GeoRadiusStoreArgs<>().withCount(1).desc().withStoreDist("38o54"));
         assertThat(result).isEqualTo(1);
 
         List<ScoredValue<String>> dist = redis.zrangeWithScores(resultKey, 0, -1);
@@ -398,12 +398,12 @@ public void georadiusbymemberWithArgsAndTransaction() throws Exception {
         redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km, new GeoArgs().withDistance().withHash().desc());
         redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km, new GeoArgs().withCoordinates().desc());
 
-        List<Object> exec = redis.exec();
+        TransactionResult exec = redis.exec();
 
-        List<GeoWithin<String>> empty = (List) exec.get(0);
+        List<GeoWithin<String>> empty = exec.get(0);
         assertThat(empty).isNotEmpty();
 
-        List<GeoWithin<String>> withDistanceAndCoordinates = (List) exec.get(1);
+        List<GeoWithin<String>> withDistanceAndCoordinates = exec.get(1);
         assertThat(withDistanceAndCoordinates).hasSize(2);
 
         GeoWithin<String> weinheim = withDistanceAndCoordinates.get(0);
@@ -412,7 +412,7 @@ public void georadiusbymemberWithArgsAndTransaction() throws Exception {
         assertThat(weinheim.distance).isNotNull();
         assertThat(weinheim.coordinates).isNotNull();
 
-        List<GeoWithin<String>> withDistanceAndHash = (List) exec.get(2);
+        List<GeoWithin<String>> withDistanceAndHash = exec.get(2);
         assertThat(withDistanceAndHash).hasSize(2);
 
         GeoWithin<String> weinheimDistanceHash = withDistanceAndHash.get(0);
@@ -421,7 +421,7 @@ public void georadiusbymemberWithArgsAndTransaction() throws Exception {
         assertThat(weinheimDistanceHash.distance).isNotNull();
         assertThat(weinheimDistanceHash.coordinates).isNull();
 
-        List<GeoWithin<String>> withCoordinates = (List) exec.get(3);
+        List<GeoWithin<String>> withCoordinates = exec.get(3);
         assertThat(withCoordinates).hasSize(2);
 
         GeoWithin<String> weinheimCoordinates = withCoordinates.get(0);
diff --git a/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java
index a280093076..9b89a9a946 100644
--- a/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java
@@ -6,6 +6,7 @@
 
 import java.util.List;
 
+import com.lambdaworks.redis.TransactionResult;
 import org.assertj.core.api.Assertions;
 import org.junit.Rule;
 import org.junit.Test;
@@ -32,7 +33,7 @@ public void discard() throws Exception {
     public void exec() throws Exception {
         assertThat(redis.multi()).isEqualTo("OK");
         redis.set(key, value);
-        assertThat(redis.exec()).isEqualTo(list("OK"));
+        assertThat(redis.exec()).contains("OK");
         assertThat(redis.get(key)).isEqualTo(value);
     }
 
@@ -46,7 +47,11 @@ public void watch() throws Exception {
 
         redis.multi();
         redis.append(key, "foo");
-        assertThat(redis.exec()).isEqualTo(list());
+
+        TransactionResult transactionResult = redis.exec();
+
+        assertThat(transactionResult.wasRolledBack()).isTrue();
+        assertThat(transactionResult).isEmpty();
 
     }
 
@@ -57,10 +62,15 @@ public void unwatch() throws Exception {
 
     @Test
     public void commandsReturnNullInMulti() throws Exception {
+
         assertThat(redis.multi()).isEqualTo("OK");
         assertThat(redis.set(key, value)).isNull();
         assertThat(redis.get(key)).isNull();
-        assertThat(redis.exec()).isEqualTo(list("OK", value));
+
+        TransactionResult exec = redis.exec();
+        assertThat(exec.wasRolledBack()).isFalse();
+        assertThat(exec).contains("OK", value);
+
         assertThat(redis.get(key)).isEqualTo(value);
     }
 
@@ -71,7 +81,15 @@ public void execmulti() throws Exception {
         redis.set("two", "2");
         redis.mget("one", "two");
         redis.llen(key);
-        assertThat(redis.exec()).isEqualTo(list("OK", "OK", list(kv("one", "1"), kv("two", "2")), 0L));
+        assertThat(redis.exec()).contains("OK", "OK", list(kv("one", "1"), kv("two", "2")), 0L);
+    }
+
+    @Test
+    public void emptyMulti() throws Exception {
+        redis.multi();
+        TransactionResult exec = redis.exec();
+        assertThat(exec.wasRolledBack()).isFalse();
+        assertThat(exec).isEmpty();
     }
 
     @Test
@@ -80,10 +98,11 @@ public void errorInMulti() throws Exception {
         redis.set(key, value);
         redis.lpop(key);
         redis.get(key);
-        List<Object> values = redis.exec();
-        assertThat(values.get(0)).isEqualTo("OK");
+        TransactionResult values = redis.exec();
+        assertThat(values.wasRolledBack()).isFalse();
+        assertThat((String) values.get(0)).isEqualTo("OK");
         assertThat(values.get(1) instanceof RedisException).isTrue();
-        assertThat(values.get(2)).isEqualTo(value);
+        assertThat((String) values.get(2)).isEqualTo(value);
     }
 
     @Test
@@ -92,5 +111,4 @@ public void execWithoutMulti() throws Exception {
         exception.expectMessage("ERR EXEC without MULTI");
         redis.exec();
     }
-
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
index 487f9eea93..6eebbd37e7 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
@@ -5,6 +5,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import com.lambdaworks.redis.TransactionResult;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -64,7 +65,7 @@ public void execSingular() throws Exception {
 
         redis.set(key, value);
 
-        assertThat(first(commands.exec())).isEqualTo("OK");
+        assertThat(block(commands.exec())).contains("OK");
         assertThat(block(commands.get(key))).isEqualTo(value);
     }
 
@@ -75,10 +76,10 @@ public void errorInMulti() throws Exception {
         commands.lpop(key).subscribe(TestSubscriber.create());
         commands.get(key).subscribe(TestSubscriber.create());
 
-        List<Object> values = all(commands.exec());
-        assertThat(values.get(0)).isEqualTo("OK");
+        TransactionResult values = block(commands.exec());
+        assertThat((String) values.get(0)).isEqualTo("OK");
         assertThat(values.get(1) instanceof RedisException).isTrue();
-        assertThat(values.get(2)).isEqualTo(value);
+        assertThat((String) values.get(2)).isEqualTo(value);
     }
 
     @Test
@@ -108,7 +109,7 @@ public void resultOfMultiIsContainedInCommandObservables() throws Exception {
     @Test
     public void resultOfMultiIsContainedInExecObservable() throws Exception {
 
-        TestSubscriber<Object> exec = TestSubscriber.create();
+        TestSubscriber<TransactionResult> exec = TestSubscriber.create();
 
         commands.multi().subscribe();
         commands.set("key1", "value1").subscribe();
@@ -119,7 +120,7 @@ public void resultOfMultiIsContainedInExecObservable() throws Exception {
 
         exec.awaitTerminalEvent();
 
-        assertThat(exec.getOnNextEvents()).hasSize(4).containsExactly("OK", "OK",
+        assertThat(exec.getOnNextEvents().get(0)).hasSize(4).containsExactly("OK", "OK",
                 list(kv("key1", "value1"), kv("key2", "value2")), 0L);
     }
 
diff --git a/src/test/java/com/lambdaworks/util/RxSyncInvocationHandler.java b/src/test/java/com/lambdaworks/util/RxSyncInvocationHandler.java
index 46bd2f18bd..1b93cc6f4e 100644
--- a/src/test/java/com/lambdaworks/util/RxSyncInvocationHandler.java
+++ b/src/test/java/com/lambdaworks/util/RxSyncInvocationHandler.java
@@ -31,12 +31,10 @@
 public class RxSyncInvocationHandler<K, V> extends ConnectionDecoratingInvocationHandler {
 
     private final StatefulConnection<?, ?> connection;
-    private final Object rxApi;
 
     public RxSyncInvocationHandler(StatefulConnection<?, ?> connection, Object rxApi) {
         super(rxApi);
         this.connection = connection;
-        this.rxApi = rxApi;
     }
 
     @Override

From d450ce78bcd9eec86dac5d24561fae235601c355 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 31 Aug 2016 15:59:00 +0200
Subject: [PATCH 011/808] Migrate lettuce reactive API to Reactive Streams #349

---
 pom.xml                                       |   26 +-
 .../redis/AbstractRedisAsyncCommands.java     |    4 +-
 .../redis/AbstractRedisReactiveCommands.java  | 1422 ++++++++---------
 .../lambdaworks/redis/BackpressureUtils.java  |  146 ++
 .../redis/ReactiveCommandDispatcher.java      |  329 ----
 .../redis/RedisCommandBuilder.java            |    6 +-
 .../com/lambdaworks/redis/RedisPublisher.java |  578 +++++++
 .../redis/RedisReactiveCommandsImpl.java      |    4 +-
 .../redis/StatefulRedisConnectionImpl.java    |    2 +-
 .../redis/api/StatefulRedisConnection.java    |    2 +-
 .../api/async/RedisGeoAsyncCommands.java      |   11 +-
 .../api/async/RedisStringAsyncCommands.java   |    7 +-
 .../RedisTransactionalAsyncCommands.java      |    3 +-
 .../BaseRedisReactiveCommands.java            |   37 +-
 .../RedisGeoReactiveCommands.java             |   37 +-
 .../RedisHLLReactiveCommands.java             |   15 +-
 .../RedisHashReactiveCommands.java            |   61 +-
 .../RedisKeyReactiveCommands.java             |   89 +-
 .../RedisListReactiveCommands.java            |   45 +-
 .../RedisReactiveCommands.java                |   15 +-
 .../RedisScriptingReactiveCommands.java       |   25 +-
 .../RedisServerReactiveCommands.java          |   91 +-
 .../RedisSetReactiveCommands.java             |   67 +-
 .../RedisSortedSetReactiveCommands.java       |  157 +-
 .../RedisStringReactiveCommands.java          |   71 +-
 .../RedisTransactionalReactiveCommands.java   |   20 +-
 .../api/{rx => reactive}/package-info.java    |    2 +-
 .../com/lambdaworks/redis/api/rx/Success.java |   10 -
 .../redis/api/sync/RedisGeoCommands.java      |   12 +-
 .../redis/api/sync/RedisStringCommands.java   |    2 -
 .../api/sync/RedisTransactionalCommands.java  |    1 +
 .../redis/cluster/ClusterScanSupport.java     |   20 +-
 ...isAdvancedClusterReactiveCommandsImpl.java |  214 ++-
 .../StatefulRedisClusterConnectionImpl.java   |    2 +-
 .../api/StatefulRedisClusterConnection.java   |    2 +-
 .../async/NodeSelectionGeoAsyncCommands.java  |   11 +-
 .../async/NodeSelectionSetAsyncCommands.java  |    1 -
 .../NodeSelectionStringAsyncCommands.java     |    7 +-
 .../RedisAdvancedClusterReactiveCommands.java |   69 +-
 .../RedisClusterReactiveCommands.java         |   84 +-
 .../api/{rx => reactive}/package-info.java    |    2 +-
 .../api/sync/NodeSelectionGeoCommands.java    |   10 +-
 .../api/sync/NodeSelectionStringCommands.java |    3 +-
 .../redis/event/DefaultEventBus.java          |   19 +-
 .../com/lambdaworks/redis/event/EventBus.java |    6 +-
 .../output/GeoCoordinatesListOutput.java      |   13 +-
 .../redis/output/StringValueListOutput.java   |   46 +
 .../RedisPubSubReactiveCommandsImpl.java      |  145 +-
 .../pubsub/StatefulRedisPubSubConnection.java |    2 +-
 .../StatefulRedisPubSubConnectionImpl.java    |    2 +-
 .../api/{rx => reactive}/ChannelMessage.java  |    2 +-
 .../api/{rx => reactive}/PatternMessage.java  |    2 +-
 .../reactive/RedisPubSubReactiveCommands.java |  116 ++
 .../api/{rx => reactive}/package-info.java    |    2 +-
 .../api/rx/RedisPubSubReactiveCommands.java   |   87 -
 .../resource/DefaultClientResources.java      |    3 +-
 .../RxJavaEventExecutorGroupScheduler.java    |  106 --
 .../RedisSentinelReactiveCommandsImpl.java    |   79 +-
 .../StatefulRedisSentinelConnectionImpl.java  |    2 +-
 .../api/StatefulRedisSentinelConnection.java  |    6 +-
 .../RedisSentinelReactiveCommands.java        |   29 +-
 .../redis/sentinel/api/rx/package-info.java   |    4 -
 .../redis/api/RedisGeoCommands.java           |    9 +-
 .../redis/api/RedisSetCommands.java           |    1 +
 src/site/markdown/download.md.vm              |    3 +-
 src/site/markdown/index.md.vm                 |    8 +-
 .../redis/extensibility/LettuceGeoDemo.java   |    4 +-
 .../apigenerator/CreateReactiveApi.java       |   22 +-
 .../lambdaworks/redis/ClientMetricsTest.java  |   70 +-
 .../lambdaworks/redis/CustomCodecTest.java    |    8 +-
 .../redis/LettucePerformanceTest.java         |   39 +-
 .../redis/ReactiveConnectionTest.java         |   68 +-
 .../redis/ReactiveStreamingOutputTest.java    |   53 +-
 .../cluster/AdvancedClusterClientTest.java    |    4 +-
 .../cluster/AdvancedClusterReactiveTest.java  |   38 +-
 .../cluster/ClusterReactiveCommandTest.java   |   12 +-
 ...va => RedisReactiveClusterClientTest.java} |   55 +-
 .../commands/CustomClusterCommandTest.java    |   16 -
 .../HashClusterReactiveCommandTest.java}      |    8 +-
 .../KeyClusterReativeCommandTest.java}        |    8 +-
 .../ListClusterRxCommandTest.java             |    7 +-
 .../StringClusterReactiveCommandTest.java}    |   16 +-
 .../redis/commands/CustomCommandTest.java     |   21 +-
 .../redis/commands/GeoCommandTest.java        |   26 +-
 .../reactive/BitReactiveCommandTest.java      |   17 +
 .../reactive/CustomReactiveCommandTest.java   |   57 +
 .../reactive/GeoReactiveCommandTest.java      |   13 +
 .../reactive/HLLReactiveCommandTest.java      |   13 +
 .../reactive/HashReactiveCommandTest.java     |   14 +
 .../reactive/KeyReactiveCommandTest.java      |   12 +
 .../reactive/ListReactiveCommandTest.java     |   12 +
 .../reactive/NumericReactiveCommandTest.java  |   12 +
 .../ScriptingReactiveCommandTest.java         |   14 +
 .../ServerReactiveCommandTest.java}           |   10 +-
 .../reactive/SetReactiveCommandTest.java      |   14 +
 .../reactive/SortReactiveCommandTest.java     |   12 +
 .../SortedSetReactiveCommandTest.java         |   12 +
 .../StringReactiveCommandTest.java}           |   19 +-
 .../TransactionReactiveCommandTest.java}      |   77 +-
 .../redis/commands/rx/BitRxCommandTest.java   |   17 -
 .../commands/rx/CustomRxCommandTest.java      |   61 -
 .../redis/commands/rx/GeoRxCommandTest.java   |   13 -
 .../redis/commands/rx/HLLRxCommandTest.java   |   13 -
 .../redis/commands/rx/HashRxCommandTest.java  |   14 -
 .../redis/commands/rx/KeyRxCommandTest.java   |   12 -
 .../redis/commands/rx/ListRxCommandTest.java  |   12 -
 .../commands/rx/NumericRxCommandTest.java     |   12 -
 .../commands/rx/ScriptingRxCommandTest.java   |   14 -
 .../redis/commands/rx/SetRxCommandTest.java   |   14 -
 .../redis/commands/rx/SortRxCommandTest.java  |   12 -
 .../commands/rx/SortedSetRxCommandTest.java   |   12 -
 .../event/ConnectionEventsTriggeredTest.java  |   16 +-
 .../redis/event/DefaultEventBusTest.java      |   30 +-
 .../output/GeoCoordinatesListOutputTest.java  |    3 +-
 ...SubRxTest.java => PubSubReactiveTest.java} |   67 +-
 .../resource/DefaultClientResourcesTest.java  |   20 +-
 .../SentinelRxCommandTest.java                |    8 +-
 ...ava => ReactiveSyncInvocationHandler.java} |   43 +-
 118 files changed, 2873 insertions(+), 2717 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/BackpressureUtils.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/ReactiveCommandDispatcher.java
 create mode 100644 src/main/java/com/lambdaworks/redis/RedisPublisher.java
 rename src/main/java/com/lambdaworks/redis/api/{rx => reactive}/BaseRedisReactiveCommands.java (84%)
 rename src/main/java/com/lambdaworks/redis/api/{rx => reactive}/RedisGeoReactiveCommands.java (78%)
 rename src/main/java/com/lambdaworks/redis/api/{rx => reactive}/RedisHLLReactiveCommands.java (77%)
 rename src/main/java/com/lambdaworks/redis/api/{rx => reactive}/RedisHashReactiveCommands.java (81%)
 rename src/main/java/com/lambdaworks/redis/api/{rx => reactive}/RedisKeyReactiveCommands.java (82%)
 rename src/main/java/com/lambdaworks/redis/api/{rx => reactive}/RedisListReactiveCommands.java (83%)
 rename src/main/java/com/lambdaworks/redis/api/{rx => reactive}/RedisReactiveCommands.java (85%)
 rename src/main/java/com/lambdaworks/redis/api/{rx => reactive}/RedisScriptingReactiveCommands.java (78%)
 rename src/main/java/com/lambdaworks/redis/api/{rx => reactive}/RedisServerReactiveCommands.java (80%)
 rename src/main/java/com/lambdaworks/redis/api/{rx => reactive}/RedisSetReactiveCommands.java (80%)
 rename src/main/java/com/lambdaworks/redis/api/{rx => reactive}/RedisSortedSetReactiveCommands.java (79%)
 rename src/main/java/com/lambdaworks/redis/api/{rx => reactive}/RedisStringReactiveCommands.java (86%)
 rename src/main/java/com/lambdaworks/redis/api/{rx => reactive}/RedisTransactionalReactiveCommands.java (78%)
 rename src/main/java/com/lambdaworks/redis/api/{rx => reactive}/package-info.java (56%)
 delete mode 100644 src/main/java/com/lambdaworks/redis/api/rx/Success.java
 rename src/main/java/com/lambdaworks/redis/cluster/api/{rx => reactive}/RedisAdvancedClusterReactiveCommands.java (84%)
 rename src/main/java/com/lambdaworks/redis/cluster/api/{rx => reactive}/RedisClusterReactiveCommands.java (82%)
 rename src/main/java/com/lambdaworks/redis/cluster/api/{rx => reactive}/package-info.java (50%)
 create mode 100644 src/main/java/com/lambdaworks/redis/output/StringValueListOutput.java
 rename src/main/java/com/lambdaworks/redis/pubsub/api/{rx => reactive}/ChannelMessage.java (92%)
 rename src/main/java/com/lambdaworks/redis/pubsub/api/{rx => reactive}/PatternMessage.java (94%)
 create mode 100644 src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java
 rename src/main/java/com/lambdaworks/redis/pubsub/api/{rx => reactive}/package-info.java (50%)
 delete mode 100644 src/main/java/com/lambdaworks/redis/pubsub/api/rx/RedisPubSubReactiveCommands.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/resource/RxJavaEventExecutorGroupScheduler.java
 rename src/main/java/com/lambdaworks/redis/sentinel/api/{rx => reactive}/RedisSentinelReactiveCommands.java (79%)
 delete mode 100644 src/main/java/com/lambdaworks/redis/sentinel/api/rx/package-info.java
 rename src/test/java/com/lambdaworks/redis/cluster/{RedisRxClusterClientTest.java => RedisReactiveClusterClientTest.java} (68%)
 rename src/test/java/com/lambdaworks/redis/cluster/commands/{rx/HashClusterRxCommandTest.java => reactive/HashClusterReactiveCommandTest.java} (82%)
 rename src/test/java/com/lambdaworks/redis/cluster/commands/{rx/KeyClusterRxCommandTest.java => reactive/KeyClusterReativeCommandTest.java} (83%)
 rename src/test/java/com/lambdaworks/redis/cluster/commands/{rx => reactive}/ListClusterRxCommandTest.java (93%)
 rename src/test/java/com/lambdaworks/redis/cluster/commands/{rx/StringClusterRxCommandTest.java => reactive/StringClusterReactiveCommandTest.java} (80%)
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java
 rename src/test/java/com/lambdaworks/redis/commands/{rx/ServerRxCommandTest.java => reactive/ServerReactiveCommandTest.java} (82%)
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java
 rename src/test/java/com/lambdaworks/redis/commands/{rx/StringRxCommandTest.java => reactive/StringReactiveCommandTest.java} (63%)
 rename src/test/java/com/lambdaworks/redis/commands/{rx/TransactionRxCommandTest.java => reactive/TransactionReactiveCommandTest.java} (66%)
 delete mode 100644 src/test/java/com/lambdaworks/redis/commands/rx/BitRxCommandTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/commands/rx/CustomRxCommandTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/commands/rx/GeoRxCommandTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/commands/rx/HLLRxCommandTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/commands/rx/HashRxCommandTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/commands/rx/KeyRxCommandTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/commands/rx/ListRxCommandTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/commands/rx/NumericRxCommandTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/commands/rx/ScriptingRxCommandTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/commands/rx/SetRxCommandTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/commands/rx/SortRxCommandTest.java
 delete mode 100644 src/test/java/com/lambdaworks/redis/commands/rx/SortedSetRxCommandTest.java
 rename src/test/java/com/lambdaworks/redis/pubsub/{PubSubRxTest.java => PubSubReactiveTest.java} (87%)
 rename src/test/java/com/lambdaworks/redis/sentinel/{rx => reactive}/SentinelRxCommandTest.java (78%)
 rename src/test/java/com/lambdaworks/util/{RxSyncInvocationHandler.java => ReactiveSyncInvocationHandler.java} (68%)

diff --git a/pom.xml b/pom.xml
index c02e5cbc7b..f6245f6b33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,11 +73,10 @@
     <dependencies>
 
         <!-- Start of Core Dependencies -->
-
         <dependency>
-            <groupId>io.reactivex</groupId>
-            <artifactId>rxjava</artifactId>
-            <version>1.1.9</version>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core</artifactId>
+            <version>3.0.0.RC1</version>
         </dependency>
 
         <!-- Netty -->
@@ -484,10 +483,9 @@
                 <configuration>
                     <level>public</level>
                     <links>
-                        <link>http://netty.io/4.0/api/</link>
+                        <link>http://netty.io/4.1/api/</link>
                         <link>http://commons.apache.org/proper/commons-pool/api-2.4.2/</link>
-                        <link>http://docs.guava-libraries.googlecode.com/git/javadoc/</link>
-                        <link>http://reactivex.io/RxJava/javadoc/</link>
+                        <link>https://docs.oracle.com/javase/8/docs/api/</link>
                     </links>
                     <additionalparam>-Xdoclint:all -Xdoclint:-html -Xdoclint:-syntax</additionalparam>
                     <tags>
@@ -622,20 +620,6 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <filters>
-                                <filter>
-                                    <artifact>com.google.guava:guava</artifact>
-                                    <excludes>
-                                        <exclude>com/google/common/escape/**</exclude>
-                                        <exclude>com/google/common/eventbus/**</exclude>
-                                        <exclude>com/google/common/hash/**</exclude>
-                                        <exclude>com/google/common/html/**</exclude>
-                                        <exclude>com/google/common/math/**</exclude>
-                                        <exclude>com/google/common/xml/**</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-
                             <relocations>
                                 <relocation>
                                     <pattern>rx</pattern>
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
index 1d94b78a6b..be5c55e2c5 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
@@ -1690,7 +1690,7 @@ public RedisFuture<Long> geoadd(K key, Object... lngLatMember) {
     }
 
     @Override
-    public RedisFuture<List<String>> geohash(K key, V... members) {
+    public RedisFuture<List<Value<String>>> geohash(K key, V... members) {
         return dispatch(commandBuilder.geohash(key, members));
     }
 
@@ -1729,7 +1729,7 @@ public RedisFuture<Long> georadiusbymember(K key, V member, double distance, Uni
     }
 
     @Override
-    public RedisFuture<List<GeoCoordinates>> geopos(K key, V... members) {
+    public RedisFuture<List<Value<GeoCoordinates>>> geopos(K key, V... members) {
         return dispatch(commandBuilder.geopos(key, members));
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
index d1e64e471e..01e6ccd96e 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
@@ -7,19 +7,16 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.*;
-import rx.Completable;
-import rx.Observable;
-import rx.Single;
-import rx.Subscriber;
-
 import com.lambdaworks.redis.GeoArgs.Unit;
 import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.rx.*;
-import com.lambdaworks.redis.cluster.api.rx.RedisClusterReactiveCommands;
+import com.lambdaworks.redis.api.reactive.*;
+import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands;
 import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.output.*;
+import com.lambdaworks.redis.protocol.*;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
  * A reactive and thread-safe API for a Redis connection.
@@ -53,128 +50,128 @@ public AbstractRedisReactiveCommands(StatefulConnection<K, V> connection, RedisC
     }
 
     @Override
-    public Single<Long> append(K key, V value) {
-        return createSingle(() -> commandBuilder.append(key, value));
+    public Mono<Long> append(K key, V value) {
+        return createMono(() -> commandBuilder.append(key, value));
     }
 
     @Override
-    public Single<String> auth(String password) {
-        return createSingle(() -> commandBuilder.auth(password));
+    public Mono<String> auth(String password) {
+        return createMono(() -> commandBuilder.auth(password));
 
     }
 
     @Override
-    public Single<String> bgrewriteaof() {
-        return createSingle(commandBuilder::bgrewriteaof);
+    public Mono<String> bgrewriteaof() {
+        return createMono(commandBuilder::bgrewriteaof);
     }
 
     @Override
-    public Single<String> bgsave() {
-        return createSingle(commandBuilder::bgsave);
+    public Mono<String> bgsave() {
+        return createMono(commandBuilder::bgsave);
     }
 
     @Override
-    public Single<Long> bitcount(K key) {
-        return createSingle(() -> commandBuilder.bitcount(key));
+    public Mono<Long> bitcount(K key) {
+        return createMono(() -> commandBuilder.bitcount(key));
     }
 
     @Override
-    public Single<Long> bitcount(K key, long start, long end) {
-        return createSingle(() -> commandBuilder.bitcount(key, start, end));
+    public Mono<Long> bitcount(K key, long start, long end) {
+        return createMono(() -> commandBuilder.bitcount(key, start, end));
     }
 
     @Override
-    public Observable<Long> bitfield(K key, BitFieldArgs args) {
-        return createDissolvingObservable(() -> commandBuilder.bitfield(key, args));
+    public Flux<Long> bitfield(K key, BitFieldArgs args) {
+        return createDissolvingFlux(() -> commandBuilder.bitfield(key, args));
     }
 
     @Override
-    public Single<Long> bitpos(K key, boolean state) {
-        return createSingle(() -> commandBuilder.bitpos(key, state));
+    public Mono<Long> bitpos(K key, boolean state) {
+        return createMono(() -> commandBuilder.bitpos(key, state));
     }
 
     @Override
-    public Single<Long> bitpos(K key, boolean state, long start, long end) {
-        return createSingle(() -> commandBuilder.bitpos(key, state, start, end));
+    public Mono<Long> bitpos(K key, boolean state, long start, long end) {
+        return createMono(() -> commandBuilder.bitpos(key, state, start, end));
     }
 
     @Override
-    public Single<Long> bitopAnd(K destination, K... keys) {
-        return createSingle(() -> commandBuilder.bitopAnd(destination, keys));
+    public Mono<Long> bitopAnd(K destination, K... keys) {
+        return createMono(() -> commandBuilder.bitopAnd(destination, keys));
     }
 
     @Override
-    public Single<Long> bitopNot(K destination, K source) {
-        return createSingle(() -> commandBuilder.bitopNot(destination, source));
+    public Mono<Long> bitopNot(K destination, K source) {
+        return createMono(() -> commandBuilder.bitopNot(destination, source));
     }
 
     @Override
-    public Single<Long> bitopOr(K destination, K... keys) {
-        return createSingle(() -> commandBuilder.bitopOr(destination, keys));
+    public Mono<Long> bitopOr(K destination, K... keys) {
+        return createMono(() -> commandBuilder.bitopOr(destination, keys));
     }
 
     @Override
-    public Single<Long> bitopXor(K destination, K... keys) {
-        return createSingle(() -> commandBuilder.bitopXor(destination, keys));
+    public Mono<Long> bitopXor(K destination, K... keys) {
+        return createMono(() -> commandBuilder.bitopXor(destination, keys));
     }
 
     @Override
-    public Single<KeyValue<K, V>> blpop(long timeout, K... keys) {
-        return createSingle(() -> commandBuilder.blpop(timeout, keys));
+    public Mono<KeyValue<K, V>> blpop(long timeout, K... keys) {
+        return createMono(() -> commandBuilder.blpop(timeout, keys));
     }
 
     @Override
-    public Single<KeyValue<K, V>> brpop(long timeout, K... keys) {
-        return createSingle(() -> commandBuilder.brpop(timeout, keys));
+    public Mono<KeyValue<K, V>> brpop(long timeout, K... keys) {
+        return createMono(() -> commandBuilder.brpop(timeout, keys));
     }
 
     @Override
-    public Single<V> brpoplpush(long timeout, K source, K destination) {
-        return createSingle(() -> commandBuilder.brpoplpush(timeout, source, destination));
+    public Mono<V> brpoplpush(long timeout, K source, K destination) {
+        return createMono(() -> commandBuilder.brpoplpush(timeout, source, destination));
     }
 
     @Override
-    public Single<K> clientGetname() {
-        return createSingle(commandBuilder::clientGetname);
+    public Mono<K> clientGetname() {
+        return createMono(commandBuilder::clientGetname);
     }
 
     @Override
-    public Single<String> clientSetname(K name) {
-        return createSingle(() -> commandBuilder.clientSetname(name));
+    public Mono<String> clientSetname(K name) {
+        return createMono(() -> commandBuilder.clientSetname(name));
     }
 
     @Override
-    public Single<String> clientKill(String addr) {
-        return createSingle(() -> commandBuilder.clientKill(addr));
+    public Mono<String> clientKill(String addr) {
+        return createMono(() -> commandBuilder.clientKill(addr));
     }
 
     @Override
-    public Single<Long> clientKill(KillArgs killArgs) {
-        return createSingle(() -> commandBuilder.clientKill(killArgs));
+    public Mono<Long> clientKill(KillArgs killArgs) {
+        return createMono(() -> commandBuilder.clientKill(killArgs));
     }
 
     @Override
-    public Single<String> clientPause(long timeout) {
-        return createSingle(() -> commandBuilder.clientPause(timeout));
+    public Mono<String> clientPause(long timeout) {
+        return createMono(() -> commandBuilder.clientPause(timeout));
     }
 
     @Override
-    public Single<String> clientList() {
-        return createSingle(commandBuilder::clientList);
+    public Mono<String> clientList() {
+        return createMono(commandBuilder::clientList);
     }
 
     @Override
-    public Observable<Object> command() {
-        return createDissolvingObservable(commandBuilder::command);
+    public Flux<Object> command() {
+        return createDissolvingFlux(commandBuilder::command);
     }
 
     @Override
-    public Observable<Object> commandInfo(String... commands) {
-        return createDissolvingObservable(() -> commandBuilder.commandInfo(commands));
+    public Flux<Object> commandInfo(String... commands) {
+        return createDissolvingFlux(() -> commandBuilder.commandInfo(commands));
     }
 
     @Override
-    public Observable<Object> commandInfo(CommandType... commands) {
+    public Flux<Object> commandInfo(CommandType... commands) {
         String[] stringCommands = new String[commands.length];
         for (int i = 0; i < commands.length; i++) {
             stringCommands[i] = commands[i].name();
@@ -184,1323 +181,1323 @@ public Observable<Object> commandInfo(CommandType... commands) {
     }
 
     @Override
-    public Single<Long> commandCount() {
-        return createSingle(commandBuilder::commandCount);
+    public Mono<Long> commandCount() {
+        return createMono(commandBuilder::commandCount);
     }
 
     @Override
-    public Observable<String> configGet(String parameter) {
-        return createDissolvingObservable(() -> commandBuilder.configGet(parameter));
+    public Flux<String> configGet(String parameter) {
+        return createDissolvingFlux(() -> commandBuilder.configGet(parameter));
     }
 
     @Override
-    public Single<String> configResetstat() {
-        return createSingle(commandBuilder::configResetstat);
+    public Mono<String> configResetstat() {
+        return createMono(commandBuilder::configResetstat);
     }
 
     @Override
-    public Single<String> configSet(String parameter, String value) {
-        return createSingle(() -> commandBuilder.configSet(parameter, value));
+    public Mono<String> configSet(String parameter, String value) {
+        return createMono(() -> commandBuilder.configSet(parameter, value));
     }
 
     @Override
-    public Single<String> configRewrite() {
-        return createSingle(commandBuilder::configRewrite);
+    public Mono<String> configRewrite() {
+        return createMono(commandBuilder::configRewrite);
     }
 
     @Override
-    public Single<Long> dbsize() {
-        return createSingle(commandBuilder::dbsize);
+    public Mono<Long> dbsize() {
+        return createMono(commandBuilder::dbsize);
     }
 
     @Override
-    public Single<String> debugCrashAndRecover(Long delay) {
-        return createSingle(() -> (commandBuilder.debugCrashAndRecover(delay)));
+    public Mono<String> debugCrashAndRecover(Long delay) {
+        return createMono(() -> (commandBuilder.debugCrashAndRecover(delay)));
     }
 
     @Override
-    public Single<String> debugHtstats(int db) {
-        return createSingle(() -> commandBuilder.debugHtstats(db));
+    public Mono<String> debugHtstats(int db) {
+        return createMono(() -> commandBuilder.debugHtstats(db));
     }
 
     @Override
-    public Single<String> debugObject(K key) {
-        return createSingle(() -> commandBuilder.debugObject(key));
+    public Mono<String> debugObject(K key) {
+        return createMono(() -> commandBuilder.debugObject(key));
     }
 
     @Override
-    public Completable debugOom() {
-        return Completable.fromObservable(createObservable(commandBuilder::debugOom));
+    public Mono<Void> debugOom() {
+        return createMono(commandBuilder::debugOom).then();
     }
 
     @Override
-    public Single<String> debugReload() {
-        return createSingle(() -> (commandBuilder.debugReload()));
+    public Mono<String> debugReload() {
+        return createMono(() -> (commandBuilder.debugReload()));
     }
 
     @Override
-    public Single<String> debugRestart(Long delay) {
-        return createSingle(() -> (commandBuilder.debugRestart(delay)));
+    public Mono<String> debugRestart(Long delay) {
+        return createMono(() -> (commandBuilder.debugRestart(delay)));
     }
 
     @Override
-    public Single<String> debugSdslen(K key) {
-        return createSingle(() -> (commandBuilder.debugSdslen(key)));
+    public Mono<String> debugSdslen(K key) {
+        return createMono(() -> (commandBuilder.debugSdslen(key)));
     }
 
     @Override
-    public Completable debugSegfault() {
-        return Completable.fromObservable(createObservable(commandBuilder::debugSegfault));
+    public Mono<Void> debugSegfault() {
+        return createFlux(commandBuilder::debugSegfault).then();
     }
 
     @Override
-    public Single<Long> decr(K key) {
-        return createSingle(() -> commandBuilder.decr(key));
+    public Mono<Long> decr(K key) {
+        return createMono(() -> commandBuilder.decr(key));
     }
 
     @Override
-    public Single<Long> decrby(K key, long amount) {
-        return createSingle(() -> commandBuilder.decrby(key, amount));
+    public Mono<Long> decrby(K key, long amount) {
+        return createMono(() -> commandBuilder.decrby(key, amount));
     }
 
     @Override
-    public Single<Long> del(K... keys) {
-        return createSingle(() -> commandBuilder.del(keys));
+    public Mono<Long> del(K... keys) {
+        return createMono(() -> commandBuilder.del(keys));
     }
 
-    public Single<Long> del(Iterable<K> keys) {
-        return createSingle(() -> commandBuilder.del(keys));
+    public Mono<Long> del(Iterable<K> keys) {
+        return createMono(() -> commandBuilder.del(keys));
     }
 
     @Override
-    public Single<Long> unlink(K... keys) {
-        return createSingle(() -> commandBuilder.unlink(keys));
+    public Mono<Long> unlink(K... keys) {
+        return createMono(() -> commandBuilder.unlink(keys));
     }
 
-    public Single<Long> unlink(Iterable<K> keys) {
-        return createSingle(() -> commandBuilder.unlink(keys));
+    public Mono<Long> unlink(Iterable<K> keys) {
+        return createMono(() -> commandBuilder.unlink(keys));
     }
 
     @Override
-    public Single<String> discard() {
-        return createSingle(commandBuilder::discard);
+    public Mono<String> discard() {
+        return createMono(commandBuilder::discard);
     }
 
     @Override
-    public Single<byte[]> dump(K key) {
-        return createSingle(() -> commandBuilder.dump(key));
+    public Mono<byte[]> dump(K key) {
+        return createMono(() -> commandBuilder.dump(key));
     }
 
     @Override
-    public Single<V> echo(V msg) {
-        return createSingle(() -> commandBuilder.echo(msg));
+    public Mono<V> echo(V msg) {
+        return createMono(() -> commandBuilder.echo(msg));
     }
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> Observable<T> eval(String script, ScriptOutputType type, K... keys) {
-        return (Observable<T>) createObservable(() -> commandBuilder.eval(script, type, keys));
+    public <T> Flux<T> eval(String script, ScriptOutputType type, K... keys) {
+        return (Flux<T>) createFlux(() -> commandBuilder.eval(script, type, keys));
     }
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> Observable<T> eval(String script, ScriptOutputType type, K[] keys, V... values) {
-        return (Observable<T>) createObservable(() -> commandBuilder.eval(script, type, keys, values));
+    public <T> Flux<T> eval(String script, ScriptOutputType type, K[] keys, V... values) {
+        return (Flux<T>) createFlux(() -> commandBuilder.eval(script, type, keys, values));
     }
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> Observable<T> evalsha(String digest, ScriptOutputType type, K... keys) {
-        return (Observable<T>) createObservable(() -> commandBuilder.evalsha(digest, type, keys));
+    public <T> Flux<T> evalsha(String digest, ScriptOutputType type, K... keys) {
+        return (Flux<T>) createFlux(() -> commandBuilder.evalsha(digest, type, keys));
     }
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> Observable<T> evalsha(String digest, ScriptOutputType type, K[] keys, V... values) {
-        return (Observable<T>) createObservable(() -> commandBuilder.evalsha(digest, type, keys, values));
+    public <T> Flux<T> evalsha(String digest, ScriptOutputType type, K[] keys, V... values) {
+        return (Flux<T>) createFlux(() -> commandBuilder.evalsha(digest, type, keys, values));
     }
 
-    public Single<Boolean> exists(K key) {
-        return createSingle(() -> commandBuilder.exists(key));
+    public Mono<Boolean> exists(K key) {
+        return createMono(() -> commandBuilder.exists(key));
     }
 
     @Override
-    public Single<Long> exists(K... keys) {
-        return createSingle(() -> commandBuilder.exists(keys));
+    public Mono<Long> exists(K... keys) {
+        return createMono(() -> commandBuilder.exists(keys));
     }
 
-    public Single<Long> exists(Iterable<K> keys) {
-        return createSingle(() -> commandBuilder.exists(keys));
+    public Mono<Long> exists(Iterable<K> keys) {
+        return createMono(() -> commandBuilder.exists(keys));
     }
 
     @Override
-    public Single<Boolean> expire(K key, long seconds) {
-        return createSingle(() -> commandBuilder.expire(key, seconds));
+    public Mono<Boolean> expire(K key, long seconds) {
+        return createMono(() -> commandBuilder.expire(key, seconds));
     }
 
     @Override
-    public Single<Boolean> expireat(K key, long timestamp) {
-        return createSingle(() -> commandBuilder.expireat(key, timestamp));
+    public Mono<Boolean> expireat(K key, long timestamp) {
+        return createMono(() -> commandBuilder.expireat(key, timestamp));
     }
 
     @Override
-    public Single<Boolean> expireat(K key, Date timestamp) {
+    public Mono<Boolean> expireat(K key, Date timestamp) {
         return expireat(key, timestamp.getTime() / 1000);
     }
 
     @Override
-    public Single<TransactionResult> exec() {
-        return createSingle(EXEC, null, null);
+    public Mono<TransactionResult> exec() {
+        return createMono(EXEC, null, null);
     }
 
     @Override
-    public Single<String> flushall() {
-        return createSingle(commandBuilder::flushall);
+    public Mono<String> flushall() {
+        return createMono(commandBuilder::flushall);
     }
 
     @Override
-    public Single<String> flushallAsync() {
-        return createSingle(commandBuilder::flushallAsync);
+    public Mono<String> flushallAsync() {
+        return createMono(commandBuilder::flushallAsync);
     }
 
     @Override
-    public Single<String> flushdb() {
-        return createSingle(commandBuilder::flushdb);
+    public Mono<String> flushdb() {
+        return createMono(commandBuilder::flushdb);
     }
 
     @Override
-    public Single<String> flushdbAsync() {
-        return createSingle(commandBuilder::flushdbAsync);
+    public Mono<String> flushdbAsync() {
+        return createMono(commandBuilder::flushdbAsync);
     }
 
     @Override
-    public Single<V> get(K key) {
-        return createSingle(() -> commandBuilder.get(key));
+    public Mono<V> get(K key) {
+        return createMono(() -> commandBuilder.get(key));
     }
 
     @Override
-    public Single<Long> getbit(K key, long offset) {
-        return createSingle(() -> commandBuilder.getbit(key, offset));
+    public Mono<Long> getbit(K key, long offset) {
+        return createMono(() -> commandBuilder.getbit(key, offset));
     }
 
     @Override
-    public Single<V> getrange(K key, long start, long end) {
-        return createSingle(() -> commandBuilder.getrange(key, start, end));
+    public Mono<V> getrange(K key, long start, long end) {
+        return createMono(() -> commandBuilder.getrange(key, start, end));
     }
 
     @Override
-    public Single<V> getset(K key, V value) {
-        return createSingle(() -> commandBuilder.getset(key, value));
+    public Mono<V> getset(K key, V value) {
+        return createMono(() -> commandBuilder.getset(key, value));
     }
 
     @Override
-    public Single<Long> hdel(K key, K... fields) {
-        return createSingle(() -> commandBuilder.hdel(key, fields));
+    public Mono<Long> hdel(K key, K... fields) {
+        return createMono(() -> commandBuilder.hdel(key, fields));
     }
 
     @Override
-    public Single<Boolean> hexists(K key, K field) {
-        return createSingle(() -> commandBuilder.hexists(key, field));
+    public Mono<Boolean> hexists(K key, K field) {
+        return createMono(() -> commandBuilder.hexists(key, field));
     }
 
     @Override
-    public Single<V> hget(K key, K field) {
-        return createSingle(() -> commandBuilder.hget(key, field));
+    public Mono<V> hget(K key, K field) {
+        return createMono(() -> commandBuilder.hget(key, field));
     }
 
     @Override
-    public Single<Long> hincrby(K key, K field, long amount) {
-        return createSingle(() -> commandBuilder.hincrby(key, field, amount));
+    public Mono<Long> hincrby(K key, K field, long amount) {
+        return createMono(() -> commandBuilder.hincrby(key, field, amount));
     }
 
     @Override
-    public Single<Double> hincrbyfloat(K key, K field, double amount) {
-        return createSingle(() -> commandBuilder.hincrbyfloat(key, field, amount));
+    public Mono<Double> hincrbyfloat(K key, K field, double amount) {
+        return createMono(() -> commandBuilder.hincrbyfloat(key, field, amount));
     }
 
     @Override
-    public Single<Map<K, V>> hgetall(K key) {
-        return createSingle(() -> commandBuilder.hgetall(key));
+    public Mono<Map<K, V>> hgetall(K key) {
+        return createMono(() -> commandBuilder.hgetall(key));
     }
 
     @Override
-    public Single<Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key) {
-        return createSingle(() -> commandBuilder.hgetall(channel, key));
+    public Mono<Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key) {
+        return createMono(() -> commandBuilder.hgetall(channel, key));
     }
 
     @Override
-    public Observable<K> hkeys(K key) {
-        return createDissolvingObservable(() -> commandBuilder.hkeys(key));
+    public Flux<K> hkeys(K key) {
+        return createDissolvingFlux(() -> commandBuilder.hkeys(key));
     }
 
     @Override
-    public Single<Long> hkeys(KeyStreamingChannel<K> channel, K key) {
-        return createSingle(() -> commandBuilder.hkeys(channel, key));
+    public Mono<Long> hkeys(KeyStreamingChannel<K> channel, K key) {
+        return createMono(() -> commandBuilder.hkeys(channel, key));
     }
 
     @Override
-    public Single<Long> hlen(K key) {
-        return createSingle(() -> commandBuilder.hlen(key));
+    public Mono<Long> hlen(K key) {
+        return createMono(() -> commandBuilder.hlen(key));
     }
 
     @Override
-    public Single<Long> hstrlen(K key, K field) {
-        return createSingle(() -> commandBuilder.hstrlen(key, field));
+    public Mono<Long> hstrlen(K key, K field) {
+        return createMono(() -> commandBuilder.hstrlen(key, field));
     }
 
     @Override
-    public Observable<KeyValue<K, V>> hmget(K key, K... fields) {
-        return createDissolvingObservable(() -> commandBuilder.hmgetKeyValue(key, fields));
+    public Flux<KeyValue<K, V>> hmget(K key, K... fields) {
+        return createDissolvingFlux(() -> commandBuilder.hmgetKeyValue(key, fields));
     }
 
     @Override
-    public Single<Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields) {
-        return createSingle(() -> commandBuilder.hmget(channel, key, fields));
+    public Mono<Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields) {
+        return createMono(() -> commandBuilder.hmget(channel, key, fields));
     }
 
     @Override
-    public Single<String> hmset(K key, Map<K, V> map) {
-        return createSingle(() -> commandBuilder.hmset(key, map));
+    public Mono<String> hmset(K key, Map<K, V> map) {
+        return createMono(() -> commandBuilder.hmset(key, map));
     }
 
     @Override
-    public Single<Boolean> hset(K key, K field, V value) {
-        return createSingle(() -> commandBuilder.hset(key, field, value));
+    public Mono<Boolean> hset(K key, K field, V value) {
+        return createMono(() -> commandBuilder.hset(key, field, value));
     }
 
     @Override
-    public Single<Boolean> hsetnx(K key, K field, V value) {
-        return createSingle(() -> commandBuilder.hsetnx(key, field, value));
+    public Mono<Boolean> hsetnx(K key, K field, V value) {
+        return createMono(() -> commandBuilder.hsetnx(key, field, value));
     }
 
     @Override
-    public Observable<V> hvals(K key) {
-        return createDissolvingObservable(() -> commandBuilder.hvals(key));
+    public Flux<V> hvals(K key) {
+        return createDissolvingFlux(() -> commandBuilder.hvals(key));
     }
 
     @Override
-    public Single<Long> hvals(ValueStreamingChannel<V> channel, K key) {
-        return createSingle(() -> commandBuilder.hvals(channel, key));
+    public Mono<Long> hvals(ValueStreamingChannel<V> channel, K key) {
+        return createMono(() -> commandBuilder.hvals(channel, key));
     }
 
     @Override
-    public Single<Long> incr(K key) {
-        return createSingle(() -> commandBuilder.incr(key));
+    public Mono<Long> incr(K key) {
+        return createMono(() -> commandBuilder.incr(key));
     }
 
     @Override
-    public Single<Long> incrby(K key, long amount) {
-        return createSingle(() -> commandBuilder.incrby(key, amount));
+    public Mono<Long> incrby(K key, long amount) {
+        return createMono(() -> commandBuilder.incrby(key, amount));
     }
 
     @Override
-    public Single<Double> incrbyfloat(K key, double amount) {
-        return createSingle(() -> commandBuilder.incrbyfloat(key, amount));
+    public Mono<Double> incrbyfloat(K key, double amount) {
+        return createMono(() -> commandBuilder.incrbyfloat(key, amount));
     }
 
     @Override
-    public Single<String> info() {
-        return createSingle(commandBuilder::info);
+    public Mono<String> info() {
+        return createMono(commandBuilder::info);
     }
 
     @Override
-    public Single<String> info(String section) {
-        return createSingle(() -> commandBuilder.info(section));
+    public Mono<String> info(String section) {
+        return createMono(() -> commandBuilder.info(section));
     }
 
     @Override
-    public Observable<K> keys(K pattern) {
-        return createDissolvingObservable(() -> commandBuilder.keys(pattern));
+    public Flux<K> keys(K pattern) {
+        return createDissolvingFlux(() -> commandBuilder.keys(pattern));
     }
 
     @Override
-    public Single<Long> keys(KeyStreamingChannel<K> channel, K pattern) {
-        return createSingle(() -> commandBuilder.keys(channel, pattern));
+    public Mono<Long> keys(KeyStreamingChannel<K> channel, K pattern) {
+        return createMono(() -> commandBuilder.keys(channel, pattern));
     }
 
     @Override
-    public Single<Date> lastsave() {
-        return createSingle(commandBuilder::lastsave);
+    public Mono<Date> lastsave() {
+        return createMono(commandBuilder::lastsave);
     }
 
     @Override
-    public Single<V> lindex(K key, long index) {
-        return createSingle(() -> commandBuilder.lindex(key, index));
+    public Mono<V> lindex(K key, long index) {
+        return createMono(() -> commandBuilder.lindex(key, index));
     }
 
     @Override
-    public Single<Long> linsert(K key, boolean before, V pivot, V value) {
-        return createSingle(() -> commandBuilder.linsert(key, before, pivot, value));
+    public Mono<Long> linsert(K key, boolean before, V pivot, V value) {
+        return createMono(() -> commandBuilder.linsert(key, before, pivot, value));
     }
 
     @Override
-    public Single<Long> llen(K key) {
-        return createSingle(() -> commandBuilder.llen(key));
+    public Mono<Long> llen(K key) {
+        return createMono(() -> commandBuilder.llen(key));
     }
 
     @Override
-    public Single<V> lpop(K key) {
-        return createSingle(() -> commandBuilder.lpop(key));
+    public Mono<V> lpop(K key) {
+        return createMono(() -> commandBuilder.lpop(key));
     }
 
     @Override
-    public Single<Long> lpush(K key, V... values) {
-        return createSingle(() -> commandBuilder.lpush(key, values));
+    public Mono<Long> lpush(K key, V... values) {
+        return createMono(() -> commandBuilder.lpush(key, values));
     }
 
     @Override
-    public Single<Long> lpushx(K key, V... values) {
-        return createSingle(() -> commandBuilder.lpushx(key, values));
+    public Mono<Long> lpushx(K key, V... values) {
+        return createMono(() -> commandBuilder.lpushx(key, values));
     }
 
     @Override
-    public Observable<V> lrange(K key, long start, long stop) {
-        return createDissolvingObservable(() -> commandBuilder.lrange(key, start, stop));
+    public Flux<V> lrange(K key, long start, long stop) {
+        return createDissolvingFlux(() -> commandBuilder.lrange(key, start, stop));
     }
 
     @Override
-    public Single<Long> lrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return createSingle(() -> commandBuilder.lrange(channel, key, start, stop));
+    public Mono<Long> lrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return createMono(() -> commandBuilder.lrange(channel, key, start, stop));
     }
 
     @Override
-    public Single<Long> lrem(K key, long count, V value) {
-        return createSingle(() -> commandBuilder.lrem(key, count, value));
+    public Mono<Long> lrem(K key, long count, V value) {
+        return createMono(() -> commandBuilder.lrem(key, count, value));
     }
 
     @Override
-    public Single<String> lset(K key, long index, V value) {
-        return createSingle(() -> commandBuilder.lset(key, index, value));
+    public Mono<String> lset(K key, long index, V value) {
+        return createMono(() -> commandBuilder.lset(key, index, value));
     }
 
     @Override
-    public Single<String> ltrim(K key, long start, long stop) {
-        return createSingle(() -> commandBuilder.ltrim(key, start, stop));
+    public Mono<String> ltrim(K key, long start, long stop) {
+        return createMono(() -> commandBuilder.ltrim(key, start, stop));
     }
 
     @Override
-    public Single<String> migrate(String host, int port, K key, int db, long timeout) {
-        return createSingle(() -> commandBuilder.migrate(host, port, key, db, timeout));
+    public Mono<String> migrate(String host, int port, K key, int db, long timeout) {
+        return createMono(() -> commandBuilder.migrate(host, port, key, db, timeout));
     }
 
     @Override
-    public Single<String> migrate(String host, int port, int db, long timeout, MigrateArgs<K> migrateArgs) {
-        return createSingle(() -> commandBuilder.migrate(host, port, db, timeout, migrateArgs));
+    public Mono<String> migrate(String host, int port, int db, long timeout, MigrateArgs<K> migrateArgs) {
+        return createMono(() -> commandBuilder.migrate(host, port, db, timeout, migrateArgs));
     }
 
     @Override
-    public Observable<KeyValue<K, V>> mget(K... keys) {
-        return createDissolvingObservable(() -> commandBuilder.mgetKeyValue(keys));
+    public Flux<KeyValue<K, V>> mget(K... keys) {
+        return createDissolvingFlux(() -> commandBuilder.mgetKeyValue(keys));
     }
 
-    public Observable<KeyValue<K, V>> mget(Iterable<K> keys) {
-        return createDissolvingObservable(() -> commandBuilder.mgetKeyValue(keys));
+    public Flux<KeyValue<K, V>> mget(Iterable<K> keys) {
+        return createDissolvingFlux(() -> commandBuilder.mgetKeyValue(keys));
     }
 
     @Override
-    public Single<Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys) {
-        return createSingle(() -> commandBuilder.mget(channel, keys));
+    public Mono<Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys) {
+        return createMono(() -> commandBuilder.mget(channel, keys));
     }
 
-    public Single<Long> mget(ValueStreamingChannel<V> channel, Iterable<K> keys) {
-        return createSingle(() -> commandBuilder.mget(channel, keys));
+    public Mono<Long> mget(ValueStreamingChannel<V> channel, Iterable<K> keys) {
+        return createMono(() -> commandBuilder.mget(channel, keys));
     }
 
-    public Single<Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K> keys) {
-        return createSingle(() -> commandBuilder.mget(channel, keys));
+    public Mono<Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K> keys) {
+        return createMono(() -> commandBuilder.mget(channel, keys));
     }
 
     @Override
-    public Single<Boolean> move(K key, int db) {
-        return createSingle(() -> commandBuilder.move(key, db));
+    public Mono<Boolean> move(K key, int db) {
+        return createMono(() -> commandBuilder.move(key, db));
     }
 
     @Override
-    public Single<String> multi() {
-        return createSingle(commandBuilder::multi);
+    public Mono<String> multi() {
+        return createMono(commandBuilder::multi);
     }
 
     @Override
-    public Single<String> mset(Map<K, V> map) {
-        return createSingle(() -> commandBuilder.mset(map));
+    public Mono<String> mset(Map<K, V> map) {
+        return createMono(() -> commandBuilder.mset(map));
     }
 
     @Override
-    public Single<Boolean> msetnx(Map<K, V> map) {
-        return createSingle(() -> commandBuilder.msetnx(map));
+    public Mono<Boolean> msetnx(Map<K, V> map) {
+        return createMono(() -> commandBuilder.msetnx(map));
     }
 
     @Override
-    public Single<String> objectEncoding(K key) {
-        return createSingle(() -> commandBuilder.objectEncoding(key));
+    public Mono<String> objectEncoding(K key) {
+        return createMono(() -> commandBuilder.objectEncoding(key));
     }
 
     @Override
-    public Single<Long> objectIdletime(K key) {
-        return createSingle(() -> commandBuilder.objectIdletime(key));
+    public Mono<Long> objectIdletime(K key) {
+        return createMono(() -> commandBuilder.objectIdletime(key));
     }
 
     @Override
-    public Single<Long> objectRefcount(K key) {
-        return createSingle(() -> commandBuilder.objectRefcount(key));
+    public Mono<Long> objectRefcount(K key) {
+        return createMono(() -> commandBuilder.objectRefcount(key));
     }
 
     @Override
-    public Single<Boolean> persist(K key) {
-        return createSingle(() -> commandBuilder.persist(key));
+    public Mono<Boolean> persist(K key) {
+        return createMono(() -> commandBuilder.persist(key));
     }
 
     @Override
-    public Single<Boolean> pexpire(K key, long milliseconds) {
-        return createSingle(() -> commandBuilder.pexpire(key, milliseconds));
+    public Mono<Boolean> pexpire(K key, long milliseconds) {
+        return createMono(() -> commandBuilder.pexpire(key, milliseconds));
     }
 
     @Override
-    public Single<Boolean> pexpireat(K key, Date timestamp) {
+    public Mono<Boolean> pexpireat(K key, Date timestamp) {
         return pexpireat(key, timestamp.getTime());
     }
 
     @Override
-    public Single<Boolean> pexpireat(K key, long timestamp) {
-        return createSingle(() -> commandBuilder.pexpireat(key, timestamp));
+    public Mono<Boolean> pexpireat(K key, long timestamp) {
+        return createMono(() -> commandBuilder.pexpireat(key, timestamp));
     }
 
     @Override
-    public Single<String> ping() {
-        return createSingle(commandBuilder::ping);
+    public Mono<String> ping() {
+        return createMono(commandBuilder::ping);
     }
 
     @Override
-    public Single<String> readOnly() {
-        return createSingle(commandBuilder::readOnly);
+    public Mono<String> readOnly() {
+        return createMono(commandBuilder::readOnly);
     }
 
     @Override
-    public Single<String> readWrite() {
-        return createSingle(commandBuilder::readWrite);
+    public Mono<String> readWrite() {
+        return createMono(commandBuilder::readWrite);
     }
 
     @Override
-    public Single<Long> pttl(K key) {
-        return createSingle(() -> commandBuilder.pttl(key));
+    public Mono<Long> pttl(K key) {
+        return createMono(() -> commandBuilder.pttl(key));
     }
 
     @Override
-    public Single<Long> publish(K channel, V message) {
-        return createSingle(() -> commandBuilder.publish(channel, message));
+    public Mono<Long> publish(K channel, V message) {
+        return createMono(() -> commandBuilder.publish(channel, message));
     }
 
     @Override
-    public Observable<K> pubsubChannels() {
-        return createDissolvingObservable(commandBuilder::pubsubChannels);
+    public Flux<K> pubsubChannels() {
+        return createDissolvingFlux(commandBuilder::pubsubChannels);
     }
 
     @Override
-    public Observable<K> pubsubChannels(K channel) {
-        return createDissolvingObservable(() -> commandBuilder.pubsubChannels(channel));
+    public Flux<K> pubsubChannels(K channel) {
+        return createDissolvingFlux(() -> commandBuilder.pubsubChannels(channel));
     }
 
     @Override
-    public Single<Map<K, Long>> pubsubNumsub(K... channels) {
-        return createSingle(() -> commandBuilder.pubsubNumsub(channels));
+    public Mono<Map<K, Long>> pubsubNumsub(K... channels) {
+        return createMono(() -> commandBuilder.pubsubNumsub(channels));
     }
 
     @Override
-    public Single<Long> pubsubNumpat() {
-        return createSingle(commandBuilder::pubsubNumpat);
+    public Mono<Long> pubsubNumpat() {
+        return createMono(commandBuilder::pubsubNumpat);
     }
 
     @Override
-    public Single<String> quit() {
-        return createSingle(commandBuilder::quit);
+    public Mono<String> quit() {
+        return createMono(commandBuilder::quit);
     }
 
     @Override
-    public Observable<Object> role() {
-        return createDissolvingObservable(commandBuilder::role);
+    public Flux<Object> role() {
+        return createDissolvingFlux(commandBuilder::role);
     }
 
     @Override
-    public Single<V> randomkey() {
-        return createSingle(commandBuilder::randomkey);
+    public Mono<V> randomkey() {
+        return createMono(commandBuilder::randomkey);
     }
 
     @Override
-    public Single<String> rename(K key, K newKey) {
-        return createSingle(() -> commandBuilder.rename(key, newKey));
+    public Mono<String> rename(K key, K newKey) {
+        return createMono(() -> commandBuilder.rename(key, newKey));
     }
 
     @Override
-    public Single<Boolean> renamenx(K key, K newKey) {
-        return createSingle(() -> commandBuilder.renamenx(key, newKey));
+    public Mono<Boolean> renamenx(K key, K newKey) {
+        return createMono(() -> commandBuilder.renamenx(key, newKey));
     }
 
     @Override
-    public Single<String> restore(K key, long ttl, byte[] value) {
-        return createSingle(() -> commandBuilder.restore(key, ttl, value));
+    public Mono<String> restore(K key, long ttl, byte[] value) {
+        return createMono(() -> commandBuilder.restore(key, ttl, value));
     }
 
     @Override
-    public Single<V> rpop(K key) {
-        return createSingle(() -> commandBuilder.rpop(key));
+    public Mono<V> rpop(K key) {
+        return createMono(() -> commandBuilder.rpop(key));
     }
 
     @Override
-    public Single<V> rpoplpush(K source, K destination) {
-        return createSingle(() -> commandBuilder.rpoplpush(source, destination));
+    public Mono<V> rpoplpush(K source, K destination) {
+        return createMono(() -> commandBuilder.rpoplpush(source, destination));
     }
 
     @Override
-    public Single<Long> rpush(K key, V... values) {
-        return createSingle(() -> commandBuilder.rpush(key, values));
+    public Mono<Long> rpush(K key, V... values) {
+        return createMono(() -> commandBuilder.rpush(key, values));
     }
 
     @Override
-    public Single<Long> rpushx(K key, V... values) {
-        return createSingle(() -> commandBuilder.rpushx(key, values));
+    public Mono<Long> rpushx(K key, V... values) {
+        return createMono(() -> commandBuilder.rpushx(key, values));
     }
 
     @Override
-    public Single<Long> sadd(K key, V... members) {
-        return createSingle(() -> commandBuilder.sadd(key, members));
+    public Mono<Long> sadd(K key, V... members) {
+        return createMono(() -> commandBuilder.sadd(key, members));
     }
 
     @Override
-    public Single<String> save() {
-        return createSingle(commandBuilder::save);
+    public Mono<String> save() {
+        return createMono(commandBuilder::save);
     }
 
     @Override
-    public Single<Long> scard(K key) {
-        return createSingle(() -> commandBuilder.scard(key));
+    public Mono<Long> scard(K key) {
+        return createMono(() -> commandBuilder.scard(key));
     }
 
     @Override
-    public Observable<Boolean> scriptExists(String... digests) {
-        return createDissolvingObservable(() -> commandBuilder.scriptExists(digests));
+    public Flux<Boolean> scriptExists(String... digests) {
+        return createDissolvingFlux(() -> commandBuilder.scriptExists(digests));
     }
 
     @Override
-    public Single<String> scriptFlush() {
-        return createSingle(commandBuilder::scriptFlush);
+    public Mono<String> scriptFlush() {
+        return createMono(commandBuilder::scriptFlush);
     }
 
     @Override
-    public Single<String> scriptKill() {
-        return createSingle(commandBuilder::scriptKill);
+    public Mono<String> scriptKill() {
+        return createMono(commandBuilder::scriptKill);
     }
 
     @Override
-    public Single<String> scriptLoad(V script) {
-        return createSingle(() -> commandBuilder.scriptLoad(script));
+    public Mono<String> scriptLoad(V script) {
+        return createMono(() -> commandBuilder.scriptLoad(script));
     }
 
     @Override
-    public Observable<V> sdiff(K... keys) {
-        return createDissolvingObservable(() -> commandBuilder.sdiff(keys));
+    public Flux<V> sdiff(K... keys) {
+        return createDissolvingFlux(() -> commandBuilder.sdiff(keys));
     }
 
     @Override
-    public Single<Long> sdiff(ValueStreamingChannel<V> channel, K... keys) {
-        return createSingle(() -> commandBuilder.sdiff(channel, keys));
+    public Mono<Long> sdiff(ValueStreamingChannel<V> channel, K... keys) {
+        return createMono(() -> commandBuilder.sdiff(channel, keys));
     }
 
     @Override
-    public Single<Long> sdiffstore(K destination, K... keys) {
-        return createSingle(() -> commandBuilder.sdiffstore(destination, keys));
+    public Mono<Long> sdiffstore(K destination, K... keys) {
+        return createMono(() -> commandBuilder.sdiffstore(destination, keys));
     }
 
-    public Single<String> select(int db) {
-        return createSingle(() -> commandBuilder.select(db));
+    public Mono<String> select(int db) {
+        return createMono(() -> commandBuilder.select(db));
     }
 
     @Override
-    public Single<String> set(K key, V value) {
-        return createSingle(() -> commandBuilder.set(key, value));
+    public Mono<String> set(K key, V value) {
+        return createMono(() -> commandBuilder.set(key, value));
     }
 
     @Override
-    public Single<String> set(K key, V value, SetArgs setArgs) {
-        return createSingle(() -> commandBuilder.set(key, value, setArgs));
+    public Mono<String> set(K key, V value, SetArgs setArgs) {
+        return createMono(() -> commandBuilder.set(key, value, setArgs));
     }
 
     @Override
-    public Single<Long> setbit(K key, long offset, int value) {
-        return createSingle(() -> commandBuilder.setbit(key, offset, value));
+    public Mono<Long> setbit(K key, long offset, int value) {
+        return createMono(() -> commandBuilder.setbit(key, offset, value));
     }
 
     @Override
-    public Single<String> setex(K key, long seconds, V value) {
-        return createSingle(() -> commandBuilder.setex(key, seconds, value));
+    public Mono<String> setex(K key, long seconds, V value) {
+        return createMono(() -> commandBuilder.setex(key, seconds, value));
     }
 
     @Override
-    public Single<String> psetex(K key, long milliseconds, V value) {
-        return createSingle(() -> commandBuilder.psetex(key, milliseconds, value));
+    public Mono<String> psetex(K key, long milliseconds, V value) {
+        return createMono(() -> commandBuilder.psetex(key, milliseconds, value));
     }
 
     @Override
-    public Single<Boolean> setnx(K key, V value) {
-        return createSingle(() -> commandBuilder.setnx(key, value));
+    public Mono<Boolean> setnx(K key, V value) {
+        return createMono(() -> commandBuilder.setnx(key, value));
     }
 
     @Override
-    public Single<Long> setrange(K key, long offset, V value) {
-        return createSingle(() -> commandBuilder.setrange(key, offset, value));
+    public Mono<Long> setrange(K key, long offset, V value) {
+        return createMono(() -> commandBuilder.setrange(key, offset, value));
     }
 
     @Override
-    public Completable shutdown(boolean save) {
-        return Completable.fromObservable(createObservable(() -> commandBuilder.shutdown(save)));
+    public Mono<Void> shutdown(boolean save) {
+        return createMono(() -> commandBuilder.shutdown(save)).then();
     }
 
     @Override
-    public Observable<V> sinter(K... keys) {
-        return createDissolvingObservable(() -> commandBuilder.sinter(keys));
+    public Flux<V> sinter(K... keys) {
+        return createDissolvingFlux(() -> commandBuilder.sinter(keys));
     }
 
     @Override
-    public Single<Long> sinter(ValueStreamingChannel<V> channel, K... keys) {
-        return createSingle(() -> commandBuilder.sinter(channel, keys));
+    public Mono<Long> sinter(ValueStreamingChannel<V> channel, K... keys) {
+        return createMono(() -> commandBuilder.sinter(channel, keys));
     }
 
     @Override
-    public Single<Long> sinterstore(K destination, K... keys) {
-        return createSingle(() -> commandBuilder.sinterstore(destination, keys));
+    public Mono<Long> sinterstore(K destination, K... keys) {
+        return createMono(() -> commandBuilder.sinterstore(destination, keys));
     }
 
     @Override
-    public Single<Boolean> sismember(K key, V member) {
-        return createSingle(() -> commandBuilder.sismember(key, member));
+    public Mono<Boolean> sismember(K key, V member) {
+        return createMono(() -> commandBuilder.sismember(key, member));
     }
 
     @Override
-    public Single<Boolean> smove(K source, K destination, V member) {
-        return createSingle(() -> commandBuilder.smove(source, destination, member));
+    public Mono<Boolean> smove(K source, K destination, V member) {
+        return createMono(() -> commandBuilder.smove(source, destination, member));
     }
 
     @Override
-    public Single<String> slaveof(String host, int port) {
-        return createSingle(() -> commandBuilder.slaveof(host, port));
+    public Mono<String> slaveof(String host, int port) {
+        return createMono(() -> commandBuilder.slaveof(host, port));
     }
 
     @Override
-    public Single<String> slaveofNoOne() {
-        return createSingle(() -> commandBuilder.slaveofNoOne());
+    public Mono<String> slaveofNoOne() {
+        return createMono(() -> commandBuilder.slaveofNoOne());
     }
 
     @Override
-    public Observable<Object> slowlogGet() {
-        return createDissolvingObservable(() -> commandBuilder.slowlogGet());
+    public Flux<Object> slowlogGet() {
+        return createDissolvingFlux(() -> commandBuilder.slowlogGet());
     }
 
     @Override
-    public Observable<Object> slowlogGet(int count) {
-        return createDissolvingObservable(() -> commandBuilder.slowlogGet(count));
+    public Flux<Object> slowlogGet(int count) {
+        return createDissolvingFlux(() -> commandBuilder.slowlogGet(count));
     }
 
     @Override
-    public Single<Long> slowlogLen() {
-        return createSingle(() -> commandBuilder.slowlogLen());
+    public Mono<Long> slowlogLen() {
+        return createMono(() -> commandBuilder.slowlogLen());
     }
 
     @Override
-    public Single<String> slowlogReset() {
-        return createSingle(() -> commandBuilder.slowlogReset());
+    public Mono<String> slowlogReset() {
+        return createMono(() -> commandBuilder.slowlogReset());
     }
 
     @Override
-    public Observable<V> smembers(K key) {
-        return createDissolvingObservable(() -> commandBuilder.smembers(key));
+    public Flux<V> smembers(K key) {
+        return createDissolvingFlux(() -> commandBuilder.smembers(key));
     }
 
     @Override
-    public Single<Long> smembers(ValueStreamingChannel<V> channel, K key) {
-        return createSingle(() -> commandBuilder.smembers(channel, key));
+    public Mono<Long> smembers(ValueStreamingChannel<V> channel, K key) {
+        return createMono(() -> commandBuilder.smembers(channel, key));
     }
 
     @Override
-    public Observable<V> sort(K key) {
-        return createDissolvingObservable(() -> commandBuilder.sort(key));
+    public Flux<V> sort(K key) {
+        return createDissolvingFlux(() -> commandBuilder.sort(key));
     }
 
     @Override
-    public Single<Long> sort(ValueStreamingChannel<V> channel, K key) {
-        return createSingle(() -> commandBuilder.sort(channel, key));
+    public Mono<Long> sort(ValueStreamingChannel<V> channel, K key) {
+        return createMono(() -> commandBuilder.sort(channel, key));
     }
 
     @Override
-    public Observable<V> sort(K key, SortArgs sortArgs) {
-        return createDissolvingObservable(() -> commandBuilder.sort(key, sortArgs));
+    public Flux<V> sort(K key, SortArgs sortArgs) {
+        return createDissolvingFlux(() -> commandBuilder.sort(key, sortArgs));
     }
 
     @Override
-    public Single<Long> sort(ValueStreamingChannel<V> channel, K key, SortArgs sortArgs) {
-        return createSingle(() -> commandBuilder.sort(channel, key, sortArgs));
+    public Mono<Long> sort(ValueStreamingChannel<V> channel, K key, SortArgs sortArgs) {
+        return createMono(() -> commandBuilder.sort(channel, key, sortArgs));
     }
 
     @Override
-    public Single<Long> sortStore(K key, SortArgs sortArgs, K destination) {
-        return createSingle(() -> commandBuilder.sortStore(key, sortArgs, destination));
+    public Mono<Long> sortStore(K key, SortArgs sortArgs, K destination) {
+        return createMono(() -> commandBuilder.sortStore(key, sortArgs, destination));
     }
 
     @Override
-    public Single<V> spop(K key) {
-        return createSingle(() -> commandBuilder.spop(key));
+    public Mono<V> spop(K key) {
+        return createMono(() -> commandBuilder.spop(key));
     }
 
     @Override
-    public Observable<V> spop(K key, long count) {
-        return createDissolvingObservable(() -> commandBuilder.spop(key, count));
+    public Flux<V> spop(K key, long count) {
+        return createDissolvingFlux(() -> commandBuilder.spop(key, count));
     }
 
     @Override
-    public Single<V> srandmember(K key) {
-        return createSingle(() -> commandBuilder.srandmember(key));
+    public Mono<V> srandmember(K key) {
+        return createMono(() -> commandBuilder.srandmember(key));
     }
 
     @Override
-    public Observable<V> srandmember(K key, long count) {
-        return createDissolvingObservable(() -> commandBuilder.srandmember(key, count));
+    public Flux<V> srandmember(K key, long count) {
+        return createDissolvingFlux(() -> commandBuilder.srandmember(key, count));
     }
 
     @Override
-    public Single<Long> srandmember(ValueStreamingChannel<V> channel, K key, long count) {
-        return createSingle(() -> commandBuilder.srandmember(channel, key, count));
+    public Mono<Long> srandmember(ValueStreamingChannel<V> channel, K key, long count) {
+        return createMono(() -> commandBuilder.srandmember(channel, key, count));
     }
 
     @Override
-    public Single<Long> srem(K key, V... members) {
-        return createSingle(() -> commandBuilder.srem(key, members));
+    public Mono<Long> srem(K key, V... members) {
+        return createMono(() -> commandBuilder.srem(key, members));
     }
 
     @Override
-    public Observable<V> sunion(K... keys) {
-        return createDissolvingObservable(() -> commandBuilder.sunion(keys));
+    public Flux<V> sunion(K... keys) {
+        return createDissolvingFlux(() -> commandBuilder.sunion(keys));
     }
 
     @Override
-    public Single<Long> sunion(ValueStreamingChannel<V> channel, K... keys) {
-        return createSingle(() -> commandBuilder.sunion(channel, keys));
+    public Mono<Long> sunion(ValueStreamingChannel<V> channel, K... keys) {
+        return createMono(() -> commandBuilder.sunion(channel, keys));
     }
 
     @Override
-    public Single<Long> sunionstore(K destination, K... keys) {
-        return createSingle(() -> commandBuilder.sunionstore(destination, keys));
+    public Mono<Long> sunionstore(K destination, K... keys) {
+        return createMono(() -> commandBuilder.sunionstore(destination, keys));
     }
 
     @Override
-    public Single<Long> strlen(K key) {
-        return createSingle(() -> commandBuilder.strlen(key));
+    public Mono<Long> strlen(K key) {
+        return createMono(() -> commandBuilder.strlen(key));
     }
 
     @Override
-    public Single<Long> touch(K... keys) {
-        return createSingle(() -> commandBuilder.touch(keys));
+    public Mono<Long> touch(K... keys) {
+        return createMono(() -> commandBuilder.touch(keys));
     }
 
-    public Single<Long> touch(Iterable<K> keys) {
-        return createSingle(() -> commandBuilder.touch(keys));
+    public Mono<Long> touch(Iterable<K> keys) {
+        return createMono(() -> commandBuilder.touch(keys));
     }
 
     @Override
-    public Single<Long> ttl(K key) {
-        return createSingle(() -> commandBuilder.ttl(key));
+    public Mono<Long> ttl(K key) {
+        return createMono(() -> commandBuilder.ttl(key));
     }
 
     @Override
-    public Single<String> type(K key) {
-        return createSingle(() -> commandBuilder.type(key));
+    public Mono<String> type(K key) {
+        return createMono(() -> commandBuilder.type(key));
     }
 
     @Override
-    public Single<String> watch(K... keys) {
-        return createSingle(() -> commandBuilder.watch(keys));
+    public Mono<String> watch(K... keys) {
+        return createMono(() -> commandBuilder.watch(keys));
     }
 
     @Override
-    public Single<String> unwatch() {
-        return createSingle(commandBuilder::unwatch);
+    public Mono<String> unwatch() {
+        return createMono(commandBuilder::unwatch);
     }
 
     @Override
-    public Single<Long> zadd(K key, double score, V member) {
-        return createSingle(() -> commandBuilder.zadd(key, null, score, member));
+    public Mono<Long> zadd(K key, double score, V member) {
+        return createMono(() -> commandBuilder.zadd(key, null, score, member));
     }
 
     @Override
-    public Single<Long> zadd(K key, Object... scoresAndValues) {
-        return createSingle(() -> commandBuilder.zadd(key, null, scoresAndValues));
+    public Mono<Long> zadd(K key, Object... scoresAndValues) {
+        return createMono(() -> commandBuilder.zadd(key, null, scoresAndValues));
     }
 
     @Override
-    public Single<Long> zadd(K key, ScoredValue<V>... scoredValues) {
-        return createSingle(() -> commandBuilder.zadd(key, null, (Object[]) scoredValues));
+    public Mono<Long> zadd(K key, ScoredValue<V>... scoredValues) {
+        return createMono(() -> commandBuilder.zadd(key, null, (Object[]) scoredValues));
     }
 
     @Override
-    public Single<Long> zadd(K key, ZAddArgs zAddArgs, double score, V member) {
-        return createSingle(() -> commandBuilder.zadd(key, zAddArgs, score, member));
+    public Mono<Long> zadd(K key, ZAddArgs zAddArgs, double score, V member) {
+        return createMono(() -> commandBuilder.zadd(key, zAddArgs, score, member));
     }
 
     @Override
-    public Single<Long> zadd(K key, ZAddArgs zAddArgs, Object... scoresAndValues) {
-        return createSingle(() -> commandBuilder.zadd(key, zAddArgs, scoresAndValues));
+    public Mono<Long> zadd(K key, ZAddArgs zAddArgs, Object... scoresAndValues) {
+        return createMono(() -> commandBuilder.zadd(key, zAddArgs, scoresAndValues));
     }
 
     @Override
-    public Single<Long> zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues) {
-        return createSingle(() -> commandBuilder.zadd(key, zAddArgs, (Object[]) scoredValues));
+    public Mono<Long> zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues) {
+        return createMono(() -> commandBuilder.zadd(key, zAddArgs, (Object[]) scoredValues));
     }
 
     @Override
-    public Single<Double> zaddincr(K key, double score, V member) {
-        return createSingle(() -> commandBuilder.zaddincr(key, score, member));
+    public Mono<Double> zaddincr(K key, double score, V member) {
+        return createMono(() -> commandBuilder.zaddincr(key, score, member));
     }
 
     @Override
-    public Single<Long> zcard(K key) {
-        return createSingle(() -> commandBuilder.zcard(key));
+    public Mono<Long> zcard(K key) {
+        return createMono(() -> commandBuilder.zcard(key));
     }
 
     @Override
-    public Single<Long> zcount(K key, double min, double max) {
-        return createSingle(() -> commandBuilder.zcount(key, min, max));
+    public Mono<Long> zcount(K key, double min, double max) {
+        return createMono(() -> commandBuilder.zcount(key, min, max));
     }
 
     @Override
-    public Single<Long> zcount(K key, String min, String max) {
-        return createSingle(() -> commandBuilder.zcount(key, min, max));
+    public Mono<Long> zcount(K key, String min, String max) {
+        return createMono(() -> commandBuilder.zcount(key, min, max));
     }
 
     @Override
-    public Single<Double> zincrby(K key, double amount, K member) {
-        return createSingle(() -> commandBuilder.zincrby(key, amount, member));
+    public Mono<Double> zincrby(K key, double amount, K member) {
+        return createMono(() -> commandBuilder.zincrby(key, amount, member));
     }
 
     @Override
-    public Single<Long> zinterstore(K destination, K... keys) {
-        return createSingle(() -> commandBuilder.zinterstore(destination, keys));
+    public Mono<Long> zinterstore(K destination, K... keys) {
+        return createMono(() -> commandBuilder.zinterstore(destination, keys));
     }
 
     @Override
-    public Single<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys) {
-        return createSingle(() -> commandBuilder.zinterstore(destination, storeArgs, keys));
+    public Mono<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys) {
+        return createMono(() -> commandBuilder.zinterstore(destination, storeArgs, keys));
     }
 
     @Override
-    public Observable<V> zrange(K key, long start, long stop) {
-        return createDissolvingObservable(() -> commandBuilder.zrange(key, start, stop));
+    public Flux<V> zrange(K key, long start, long stop) {
+        return createDissolvingFlux(() -> commandBuilder.zrange(key, start, stop));
     }
 
     @Override
-    public Observable<ScoredValue<V>> zrangeWithScores(K key, long start, long stop) {
-        return createDissolvingObservable(() -> commandBuilder.zrangeWithScores(key, start, stop));
+    public Flux<ScoredValue<V>> zrangeWithScores(K key, long start, long stop) {
+        return createDissolvingFlux(() -> commandBuilder.zrangeWithScores(key, start, stop));
     }
 
     @Override
-    public Observable<V> zrangebyscore(K key, double min, double max) {
-        return createDissolvingObservable(() -> commandBuilder.zrangebyscore(key, min, max));
+    public Flux<V> zrangebyscore(K key, double min, double max) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, min, max));
     }
 
     @Override
-    public Observable<V> zrangebyscore(K key, String min, String max) {
-        return createDissolvingObservable(() -> commandBuilder.zrangebyscore(key, min, max));
+    public Flux<V> zrangebyscore(K key, String min, String max) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, min, max));
     }
 
     @Override
-    public Observable<V> zrangebyscore(K key, double min, double max, long offset, long count) {
-        return createDissolvingObservable(() -> commandBuilder.zrangebyscore(key, min, max, offset, count));
+    public Flux<V> zrangebyscore(K key, double min, double max, long offset, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, min, max, offset, count));
     }
 
     @Override
-    public Observable<V> zrangebyscore(K key, String min, String max, long offset, long count) {
-        return createDissolvingObservable(() -> commandBuilder.zrangebyscore(key, min, max, offset, count));
+    public Flux<V> zrangebyscore(K key, String min, String max, long offset, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, min, max, offset, count));
     }
 
     @Override
-    public Observable<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max) {
-        return createDissolvingObservable(() -> commandBuilder.zrangebyscoreWithScores(key, min, max));
+    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, min, max));
     }
 
     @Override
-    public Observable<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max) {
-        return createDissolvingObservable(() -> commandBuilder.zrangebyscoreWithScores(key, min, max));
+    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, min, max));
     }
 
     @Override
-    public Observable<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count) {
-        return createDissolvingObservable(() -> commandBuilder.zrangebyscoreWithScores(key, min, max, offset, count));
+    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, min, max, offset, count));
     }
 
     @Override
-    public Observable<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count) {
-        return createDissolvingObservable(() -> commandBuilder.zrangebyscoreWithScores(key, min, max, offset, count));
+    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, min, max, offset, count));
     }
 
     @Override
-    public Single<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return createSingle(() -> commandBuilder.zrange(channel, key, start, stop));
+    public Mono<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return createMono(() -> commandBuilder.zrange(channel, key, start, stop));
     }
 
     @Override
-    public Single<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return createSingle(() -> commandBuilder.zrangeWithScores(channel, key, start, stop));
+    public Mono<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return createMono(() -> commandBuilder.zrangeWithScores(channel, key, start, stop));
     }
 
     @Override
-    public Single<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max) {
-        return createSingle(() -> commandBuilder.zrangebyscore(channel, key, min, max));
+    public Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max) {
+        return createMono(() -> commandBuilder.zrangebyscore(channel, key, min, max));
     }
 
     @Override
-    public Single<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max) {
-        return createSingle(() -> commandBuilder.zrangebyscore(channel, key, min, max));
+    public Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max) {
+        return createMono(() -> commandBuilder.zrangebyscore(channel, key, min, max));
     }
 
     @Override
-    public Single<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset,
+    public Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset,
             long count) {
-        return createSingle(() -> commandBuilder.zrangebyscore(channel, key, min, max, offset, count));
+        return createMono(() -> commandBuilder.zrangebyscore(channel, key, min, max, offset, count));
     }
 
     @Override
-    public Single<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset,
+    public Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset,
             long count) {
-        return createSingle(() -> commandBuilder.zrangebyscore(channel, key, min, max, offset, count));
+        return createMono(() -> commandBuilder.zrangebyscore(channel, key, min, max, offset, count));
     }
 
     @Override
-    public Single<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max) {
-        return createSingle(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max));
+    public Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max) {
+        return createMono(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max));
     }
 
     @Override
-    public Single<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max) {
-        return createSingle(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max));
+    public Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max) {
+        return createMono(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max));
     }
 
     @Override
-    public Single<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max,
+    public Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max,
             long offset, long count) {
-        return createSingle(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max, offset, count));
+        return createMono(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max, offset, count));
     }
 
     @Override
-    public Single<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max,
+    public Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max,
             long offset, long count) {
-        return createSingle(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max, offset, count));
+        return createMono(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max, offset, count));
     }
 
     @Override
-    public Single<Long> zrank(K key, V member) {
-        return createSingle(() -> commandBuilder.zrank(key, member));
+    public Mono<Long> zrank(K key, V member) {
+        return createMono(() -> commandBuilder.zrank(key, member));
     }
 
     @Override
-    public Single<Long> zrem(K key, V... members) {
-        return createSingle(() -> commandBuilder.zrem(key, members));
+    public Mono<Long> zrem(K key, V... members) {
+        return createMono(() -> commandBuilder.zrem(key, members));
     }
 
     @Override
-    public Single<Long> zremrangebyrank(K key, long start, long stop) {
-        return createSingle(() -> commandBuilder.zremrangebyrank(key, start, stop));
+    public Mono<Long> zremrangebyrank(K key, long start, long stop) {
+        return createMono(() -> commandBuilder.zremrangebyrank(key, start, stop));
     }
 
     @Override
-    public Single<Long> zremrangebyscore(K key, double min, double max) {
-        return createSingle(() -> commandBuilder.zremrangebyscore(key, min, max));
+    public Mono<Long> zremrangebyscore(K key, double min, double max) {
+        return createMono(() -> commandBuilder.zremrangebyscore(key, min, max));
     }
 
     @Override
-    public Single<Long> zremrangebyscore(K key, String min, String max) {
-        return createSingle(() -> commandBuilder.zremrangebyscore(key, min, max));
+    public Mono<Long> zremrangebyscore(K key, String min, String max) {
+        return createMono(() -> commandBuilder.zremrangebyscore(key, min, max));
     }
 
     @Override
-    public Observable<V> zrevrange(K key, long start, long stop) {
-        return createDissolvingObservable(() -> commandBuilder.zrevrange(key, start, stop));
+    public Flux<V> zrevrange(K key, long start, long stop) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrange(key, start, stop));
     }
 
     @Override
-    public Observable<ScoredValue<V>> zrevrangeWithScores(K key, long start, long stop) {
-        return createDissolvingObservable(() -> commandBuilder.zrevrangeWithScores(key, start, stop));
+    public Flux<ScoredValue<V>> zrevrangeWithScores(K key, long start, long stop) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangeWithScores(key, start, stop));
     }
 
     @Override
-    public Observable<V> zrevrangebyscore(K key, double max, double min) {
-        return createDissolvingObservable(() -> commandBuilder.zrevrangebyscore(key, max, min));
+    public Flux<V> zrevrangebyscore(K key, double max, double min) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscore(key, max, min));
     }
 
     @Override
-    public Observable<V> zrevrangebyscore(K key, String max, String min) {
-        return createDissolvingObservable(() -> commandBuilder.zrevrangebyscore(key, max, min));
+    public Flux<V> zrevrangebyscore(K key, String max, String min) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscore(key, max, min));
     }
 
     @Override
-    public Observable<V> zrevrangebyscore(K key, double max, double min, long offset, long count) {
-        return createDissolvingObservable(() -> commandBuilder.zrevrangebyscore(key, max, min, offset, count));
+    public Flux<V> zrevrangebyscore(K key, double max, double min, long offset, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscore(key, max, min, offset, count));
     }
 
     @Override
-    public Observable<V> zrevrangebyscore(K key, String max, String min, long offset, long count) {
-        return createDissolvingObservable(() -> commandBuilder.zrevrangebyscore(key, max, min, offset, count));
+    public Flux<V> zrevrangebyscore(K key, String max, String min, long offset, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscore(key, max, min, offset, count));
     }
 
     @Override
-    public Observable<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min) {
-        return createDissolvingObservable(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min));
+    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min));
     }
 
     @Override
-    public Observable<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min) {
-        return createDissolvingObservable(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min));
+    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min));
     }
 
     @Override
-    public Observable<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count) {
-        return createDissolvingObservable(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
+    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
     }
 
     @Override
-    public Observable<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count) {
-        return createDissolvingObservable(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
+    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
     }
 
     @Override
-    public Single<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return createSingle(() -> commandBuilder.zrevrange(channel, key, start, stop));
+    public Mono<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return createMono(() -> commandBuilder.zrevrange(channel, key, start, stop));
     }
 
     @Override
-    public Single<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return createSingle(() -> commandBuilder.zrevrangeWithScores(channel, key, start, stop));
+    public Mono<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return createMono(() -> commandBuilder.zrevrangeWithScores(channel, key, start, stop));
     }
 
     @Override
-    public Single<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min) {
-        return createSingle(() -> commandBuilder.zrevrangebyscore(channel, key, max, min));
+    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min) {
+        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min));
     }
 
     @Override
-    public Single<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min) {
-        return createSingle(() -> commandBuilder.zrevrangebyscore(channel, key, max, min));
+    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min) {
+        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min));
     }
 
     @Override
-    public Single<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset,
+    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset,
             long count) {
-        return createSingle(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
+        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
     }
 
     @Override
-    public Single<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset,
+    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset,
             long count) {
-        return createSingle(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
+        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
     }
 
     @Override
-    public Single<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min) {
-        return createSingle(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min));
+    public Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min) {
+        return createMono(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min));
     }
 
     @Override
-    public Single<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min) {
-        return createSingle(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min));
+    public Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min) {
+        return createMono(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min));
     }
 
     @Override
-    public Single<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min,
+    public Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min,
             long offset, long count) {
-        return createSingle(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min, offset, count));
+        return createMono(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min, offset, count));
     }
 
     @Override
-    public Single<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min,
+    public Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min,
             long offset, long count) {
-        return createSingle(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min, offset, count));
+        return createMono(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min, offset, count));
     }
 
     @Override
-    public Single<Long> zrevrank(K key, V member) {
-        return createSingle(() -> commandBuilder.zrevrank(key, member));
+    public Mono<Long> zrevrank(K key, V member) {
+        return createMono(() -> commandBuilder.zrevrank(key, member));
     }
 
     @Override
-    public Single<Double> zscore(K key, V member) {
-        return createSingle(() -> commandBuilder.zscore(key, member));
+    public Mono<Double> zscore(K key, V member) {
+        return createMono(() -> commandBuilder.zscore(key, member));
     }
 
     @Override
-    public Single<Long> zunionstore(K destination, K... keys) {
-        return createSingle(() -> commandBuilder.zunionstore(destination, keys));
+    public Mono<Long> zunionstore(K destination, K... keys) {
+        return createMono(() -> commandBuilder.zunionstore(destination, keys));
     }
 
     @Override
-    public Single<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
-        return createSingle(() -> commandBuilder.zunionstore(destination, storeArgs, keys));
+    public Mono<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
+        return createMono(() -> commandBuilder.zunionstore(destination, storeArgs, keys));
     }
 
     @Override
-    public Single<KeyScanCursor<K>> scan() {
-        return createSingle(commandBuilder::scan);
+    public Mono<KeyScanCursor<K>> scan() {
+        return createMono(commandBuilder::scan);
     }
 
     @Override
-    public Single<KeyScanCursor<K>> scan(ScanArgs scanArgs) {
-        return createSingle(() -> commandBuilder.scan(scanArgs));
+    public Mono<KeyScanCursor<K>> scan(ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.scan(scanArgs));
     }
 
     @Override
-    public Single<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createSingle(() -> commandBuilder.scan(scanCursor, scanArgs));
+    public Mono<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.scan(scanCursor, scanArgs));
     }
 
     @Override
-    public Single<KeyScanCursor<K>> scan(ScanCursor scanCursor) {
-        return createSingle(() -> commandBuilder.scan(scanCursor));
+    public Mono<KeyScanCursor<K>> scan(ScanCursor scanCursor) {
+        return createMono(() -> commandBuilder.scan(scanCursor));
     }
 
     @Override
-    public Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel) {
-        return createSingle(() -> commandBuilder.scanStreaming(channel));
+    public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel) {
+        return createMono(() -> commandBuilder.scanStreaming(channel));
     }
 
     @Override
-    public Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs) {
-        return createSingle(() -> commandBuilder.scanStreaming(channel, scanArgs));
+    public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.scanStreaming(channel, scanArgs));
     }
 
     @Override
-    public Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createSingle(() -> commandBuilder.scanStreaming(channel, scanCursor, scanArgs));
+    public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.scanStreaming(channel, scanCursor, scanArgs));
     }
 
     @Override
-    public Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor) {
-        return createSingle(() -> commandBuilder.scanStreaming(channel, scanCursor));
+    public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor) {
+        return createMono(() -> commandBuilder.scanStreaming(channel, scanCursor));
     }
 
     @Override
-    public Single<ValueScanCursor<V>> sscan(K key) {
-        return createSingle(() -> commandBuilder.sscan(key));
+    public Mono<ValueScanCursor<V>> sscan(K key) {
+        return createMono(() -> commandBuilder.sscan(key));
     }
 
     @Override
-    public Single<ValueScanCursor<V>> sscan(K key, ScanArgs scanArgs) {
-        return createSingle(() -> commandBuilder.sscan(key, scanArgs));
+    public Mono<ValueScanCursor<V>> sscan(K key, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.sscan(key, scanArgs));
     }
 
     @Override
-    public Single<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createSingle(() -> commandBuilder.sscan(key, scanCursor, scanArgs));
+    public Mono<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.sscan(key, scanCursor, scanArgs));
     }
 
     @Override
-    public Single<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor) {
-        return createSingle(() -> commandBuilder.sscan(key, scanCursor));
+    public Mono<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor) {
+        return createMono(() -> commandBuilder.sscan(key, scanCursor));
     }
 
     @Override
-    public Single<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key) {
-        return createSingle(() -> commandBuilder.sscanStreaming(channel, key));
+    public Mono<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key) {
+        return createMono(() -> commandBuilder.sscanStreaming(channel, key));
     }
 
     @Override
-    public Single<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanArgs scanArgs) {
-        return createSingle(() -> commandBuilder.sscanStreaming(channel, key, scanArgs));
+    public Mono<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.sscanStreaming(channel, key, scanArgs));
     }
 
     @Override
-    public Single<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createSingle(() -> commandBuilder.sscanStreaming(channel, key, scanCursor, scanArgs));
+    public Mono<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.sscanStreaming(channel, key, scanCursor, scanArgs));
     }
 
     @Override
-    public Single<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
-        return createSingle(() -> commandBuilder.sscanStreaming(channel, key, scanCursor));
+    public Mono<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
+        return createMono(() -> commandBuilder.sscanStreaming(channel, key, scanCursor));
     }
 
     @Override
-    public Single<MapScanCursor<K, V>> hscan(K key) {
-        return createSingle(() -> commandBuilder.hscan(key));
+    public Mono<MapScanCursor<K, V>> hscan(K key) {
+        return createMono(() -> commandBuilder.hscan(key));
     }
 
     @Override
-    public Single<MapScanCursor<K, V>> hscan(K key, ScanArgs scanArgs) {
-        return createSingle(() -> commandBuilder.hscan(key, scanArgs));
+    public Mono<MapScanCursor<K, V>> hscan(K key, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.hscan(key, scanArgs));
     }
 
     @Override
-    public Single<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createSingle(() -> commandBuilder.hscan(key, scanCursor, scanArgs));
+    public Mono<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.hscan(key, scanCursor, scanArgs));
     }
 
     @Override
-    public Single<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor) {
-        return createSingle(() -> commandBuilder.hscan(key, scanCursor));
+    public Mono<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor) {
+        return createMono(() -> commandBuilder.hscan(key, scanCursor));
     }
 
     @Override
-    public Single<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key) {
-        return createSingle(() -> commandBuilder.hscanStreaming(channel, key));
+    public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key) {
+        return createMono(() -> commandBuilder.hscanStreaming(channel, key));
     }
 
     @Override
-    public Single<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanArgs scanArgs) {
-        return createSingle(() -> commandBuilder.hscanStreaming(channel, key, scanArgs));
+    public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.hscanStreaming(channel, key, scanArgs));
     }
 
     @Override
-    public Single<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor,
+    public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor,
             ScanArgs scanArgs) {
-        return createSingle(() -> commandBuilder.hscanStreaming(channel, key, scanCursor, scanArgs));
+        return createMono(() -> commandBuilder.hscanStreaming(channel, key, scanCursor, scanArgs));
     }
 
     @Override
-    public Single<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor) {
-        return createSingle(() -> commandBuilder.hscanStreaming(channel, key, scanCursor));
+    public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor) {
+        return createMono(() -> commandBuilder.hscanStreaming(channel, key, scanCursor));
     }
 
     @Override
-    public Single<ScoredValueScanCursor<V>> zscan(K key) {
-        return createSingle(() -> commandBuilder.zscan(key));
+    public Mono<ScoredValueScanCursor<V>> zscan(K key) {
+        return createMono(() -> commandBuilder.zscan(key));
     }
 
     @Override
-    public Single<ScoredValueScanCursor<V>> zscan(K key, ScanArgs scanArgs) {
-        return createSingle(() -> commandBuilder.zscan(key, scanArgs));
+    public Mono<ScoredValueScanCursor<V>> zscan(K key, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.zscan(key, scanArgs));
     }
 
     @Override
-    public Single<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createSingle(() -> commandBuilder.zscan(key, scanCursor, scanArgs));
+    public Mono<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.zscan(key, scanCursor, scanArgs));
     }
 
     @Override
-    public Single<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor) {
-        return createSingle(() -> commandBuilder.zscan(key, scanCursor));
+    public Mono<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor) {
+        return createMono(() -> commandBuilder.zscan(key, scanCursor));
     }
 
     @Override
-    public Single<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key) {
-        return createSingle(() -> commandBuilder.zscanStreaming(channel, key));
+    public Mono<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key) {
+        return createMono(() -> commandBuilder.zscanStreaming(channel, key));
     }
 
     @Override
-    public Single<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanArgs scanArgs) {
-        return createSingle(() -> commandBuilder.zscanStreaming(channel, key, scanArgs));
+    public Mono<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.zscanStreaming(channel, key, scanArgs));
     }
 
     @Override
-    public Single<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor,
+    public Mono<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor,
             ScanArgs scanArgs) {
-        return createSingle(() -> commandBuilder.zscanStreaming(channel, key, scanCursor, scanArgs));
+        return createMono(() -> commandBuilder.zscanStreaming(channel, key, scanCursor, scanArgs));
     }
 
     @Override
-    public Single<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
-        return createSingle(() -> commandBuilder.zscanStreaming(channel, key, scanCursor));
+    public Mono<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
+        return createMono(() -> commandBuilder.zscanStreaming(channel, key, scanCursor));
     }
 
     @Override
@@ -1509,323 +1506,282 @@ public String digest(V script) {
     }
 
     @Override
-    public Observable<V> time() {
-        return createDissolvingObservable(commandBuilder::time);
+    public Flux<V> time() {
+        return createDissolvingFlux(commandBuilder::time);
     }
 
     @Override
-    public Single<Long> waitForReplication(int replicas, long timeout) {
-        return createSingle(() -> commandBuilder.wait(replicas, timeout));
+    public Mono<Long> waitForReplication(int replicas, long timeout) {
+        return createMono(() -> commandBuilder.wait(replicas, timeout));
     }
 
     @Override
-    public Single<Long> pfadd(K key, V... values) {
-        return createSingle(() -> commandBuilder.pfadd(key, values));
+    public Mono<Long> pfadd(K key, V... values) {
+        return createMono(() -> commandBuilder.pfadd(key, values));
     }
 
-    public Single<Long> pfadd(K key, V value, V... values) {
-        return createSingle(() -> commandBuilder.pfadd(key, value, values));
+    public Mono<Long> pfadd(K key, V value, V... values) {
+        return createMono(() -> commandBuilder.pfadd(key, value, values));
     }
 
     @Override
-    public Single<String> pfmerge(K destkey, K... sourcekeys) {
-        return createSingle(() -> commandBuilder.pfmerge(destkey, sourcekeys));
+    public Mono<String> pfmerge(K destkey, K... sourcekeys) {
+        return createMono(() -> commandBuilder.pfmerge(destkey, sourcekeys));
     }
 
-    public Single<String> pfmerge(K destkey, K sourceKey, K... sourcekeys) {
-        return createSingle(() -> commandBuilder.pfmerge(destkey, sourceKey, sourcekeys));
+    public Mono<String> pfmerge(K destkey, K sourceKey, K... sourcekeys) {
+        return createMono(() -> commandBuilder.pfmerge(destkey, sourceKey, sourcekeys));
     }
 
     @Override
-    public Single<Long> pfcount(K... keys) {
-        return createSingle(() -> commandBuilder.pfcount(keys));
+    public Mono<Long> pfcount(K... keys) {
+        return createMono(() -> commandBuilder.pfcount(keys));
     }
 
-    public Single<Long> pfcount(K key, K... keys) {
-        return createSingle(() -> commandBuilder.pfcount(key, keys));
+    public Mono<Long> pfcount(K key, K... keys) {
+        return createMono(() -> commandBuilder.pfcount(key, keys));
     }
 
     @Override
-    public Single<String> clusterBumpepoch() {
-        return createSingle(() -> commandBuilder.clusterBumpepoch());
+    public Mono<String> clusterBumpepoch() {
+        return createMono(() -> commandBuilder.clusterBumpepoch());
     }
 
     @Override
-    public Single<String> clusterMeet(String ip, int port) {
-        return createSingle(() -> commandBuilder.clusterMeet(ip, port));
+    public Mono<String> clusterMeet(String ip, int port) {
+        return createMono(() -> commandBuilder.clusterMeet(ip, port));
     }
 
     @Override
-    public Single<String> clusterForget(String nodeId) {
-        return createSingle(() -> commandBuilder.clusterForget(nodeId));
+    public Mono<String> clusterForget(String nodeId) {
+        return createMono(() -> commandBuilder.clusterForget(nodeId));
     }
 
     @Override
-    public Single<String> clusterAddSlots(int... slots) {
-        return createSingle(() -> commandBuilder.clusterAddslots(slots));
+    public Mono<String> clusterAddSlots(int... slots) {
+        return createMono(() -> commandBuilder.clusterAddslots(slots));
     }
 
     @Override
-    public Single<String> clusterDelSlots(int... slots) {
-        return createSingle(() -> commandBuilder.clusterDelslots(slots));
+    public Mono<String> clusterDelSlots(int... slots) {
+        return createMono(() -> commandBuilder.clusterDelslots(slots));
     }
 
     @Override
-    public Single<String> clusterInfo() {
-        return createSingle(commandBuilder::clusterInfo);
+    public Mono<String> clusterInfo() {
+        return createMono(commandBuilder::clusterInfo);
     }
 
     @Override
-    public Single<String> clusterMyId() {
-        return createSingle(commandBuilder::clusterMyId);
+    public Mono<String> clusterMyId() {
+        return createMono(commandBuilder::clusterMyId);
     }
 
     @Override
-    public Single<String> clusterNodes() {
-        return createSingle(commandBuilder::clusterNodes);
+    public Mono<String> clusterNodes() {
+        return createMono(commandBuilder::clusterNodes);
     }
 
     @Override
-    public Observable<K> clusterGetKeysInSlot(int slot, int count) {
-        return createDissolvingObservable(() -> commandBuilder.clusterGetKeysInSlot(slot, count));
+    public Flux<K> clusterGetKeysInSlot(int slot, int count) {
+        return createDissolvingFlux(() -> commandBuilder.clusterGetKeysInSlot(slot, count));
     }
 
     @Override
-    public Single<Long> clusterCountKeysInSlot(int slot) {
-        return createSingle(() -> commandBuilder.clusterCountKeysInSlot(slot));
+    public Mono<Long> clusterCountKeysInSlot(int slot) {
+        return createMono(() -> commandBuilder.clusterCountKeysInSlot(slot));
     }
 
     @Override
-    public Single<Long> clusterCountFailureReports(String nodeId) {
-        return createSingle(() -> commandBuilder.clusterCountFailureReports(nodeId));
+    public Mono<Long> clusterCountFailureReports(String nodeId) {
+        return createMono(() -> commandBuilder.clusterCountFailureReports(nodeId));
     }
 
     @Override
-    public Single<Long> clusterKeyslot(K key) {
-        return createSingle(() -> commandBuilder.clusterKeyslot(key));
+    public Mono<Long> clusterKeyslot(K key) {
+        return createMono(() -> commandBuilder.clusterKeyslot(key));
     }
 
     @Override
-    public Single<String> clusterSaveconfig() {
-        return createSingle(() -> commandBuilder.clusterSaveconfig());
+    public Mono<String> clusterSaveconfig() {
+        return createMono(() -> commandBuilder.clusterSaveconfig());
     }
 
     @Override
-    public Single<String> clusterSetConfigEpoch(long configEpoch) {
-        return createSingle(() -> commandBuilder.clusterSetConfigEpoch(configEpoch));
+    public Mono<String> clusterSetConfigEpoch(long configEpoch) {
+        return createMono(() -> commandBuilder.clusterSetConfigEpoch(configEpoch));
     }
 
     @Override
-    public Observable<Object> clusterSlots() {
-        return createDissolvingObservable(commandBuilder::clusterSlots);
+    public Flux<Object> clusterSlots() {
+        return createDissolvingFlux(commandBuilder::clusterSlots);
     }
 
     @Override
-    public Single<String> clusterSetSlotNode(int slot, String nodeId) {
-        return createSingle(() -> commandBuilder.clusterSetSlotNode(slot, nodeId));
+    public Mono<String> clusterSetSlotNode(int slot, String nodeId) {
+        return createMono(() -> commandBuilder.clusterSetSlotNode(slot, nodeId));
     }
 
     @Override
-    public Single<String> clusterSetSlotStable(int slot) {
-        return createSingle(() -> commandBuilder.clusterSetSlotStable(slot));
+    public Mono<String> clusterSetSlotStable(int slot) {
+        return createMono(() -> commandBuilder.clusterSetSlotStable(slot));
     }
 
     @Override
-    public Single<String> clusterSetSlotMigrating(int slot, String nodeId) {
-        return createSingle(() -> commandBuilder.clusterSetSlotMigrating(slot, nodeId));
+    public Mono<String> clusterSetSlotMigrating(int slot, String nodeId) {
+        return createMono(() -> commandBuilder.clusterSetSlotMigrating(slot, nodeId));
     }
 
     @Override
-    public Single<String> clusterSetSlotImporting(int slot, String nodeId) {
-        return createSingle(() -> commandBuilder.clusterSetSlotImporting(slot, nodeId));
+    public Mono<String> clusterSetSlotImporting(int slot, String nodeId) {
+        return createMono(() -> commandBuilder.clusterSetSlotImporting(slot, nodeId));
     }
 
     @Override
-    public Single<String> clusterFailover(boolean force) {
-        return createSingle(() -> commandBuilder.clusterFailover(force));
+    public Mono<String> clusterFailover(boolean force) {
+        return createMono(() -> commandBuilder.clusterFailover(force));
     }
 
     @Override
-    public Single<String> clusterReset(boolean hard) {
-        return createSingle(() -> commandBuilder.clusterReset(hard));
+    public Mono<String> clusterReset(boolean hard) {
+        return createMono(() -> commandBuilder.clusterReset(hard));
     }
 
     @Override
-    public Single<String> asking() {
-        return createSingle(commandBuilder::asking);
+    public Mono<String> asking() {
+        return createMono(commandBuilder::asking);
     }
 
     @Override
-    public Single<String> clusterReplicate(String nodeId) {
-        return createSingle(() -> commandBuilder.clusterReplicate(nodeId));
+    public Mono<String> clusterReplicate(String nodeId) {
+        return createMono(() -> commandBuilder.clusterReplicate(nodeId));
     }
 
     @Override
-    public Single<String> clusterFlushslots() {
-        return createSingle(commandBuilder::clusterFlushslots);
+    public Mono<String> clusterFlushslots() {
+        return createMono(commandBuilder::clusterFlushslots);
     }
 
     @Override
-    public Observable<String> clusterSlaves(String nodeId) {
-        return createDissolvingObservable(() -> commandBuilder.clusterSlaves(nodeId));
+    public Flux<String> clusterSlaves(String nodeId) {
+        return createDissolvingFlux(() -> commandBuilder.clusterSlaves(nodeId));
     }
 
     @Override
-    public Single<Long> zlexcount(K key, String min, String max) {
-        return createSingle(() -> commandBuilder.zlexcount(key, min, max));
+    public Mono<Long> zlexcount(K key, String min, String max) {
+        return createMono(() -> commandBuilder.zlexcount(key, min, max));
     }
 
     @Override
-    public Single<Long> zremrangebylex(K key, String min, String max) {
-        return createSingle(() -> commandBuilder.zremrangebylex(key, min, max));
+    public Mono<Long> zremrangebylex(K key, String min, String max) {
+        return createMono(() -> commandBuilder.zremrangebylex(key, min, max));
     }
 
     @Override
-    public Observable<V> zrangebylex(K key, String min, String max) {
-        return createDissolvingObservable(() -> commandBuilder.zrangebylex(key, min, max));
+    public Flux<V> zrangebylex(K key, String min, String max) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebylex(key, min, max));
     }
 
     @Override
-    public Observable<V> zrangebylex(K key, String min, String max, long offset, long count) {
-        return createDissolvingObservable(() -> commandBuilder.zrangebylex(key, min, max, offset, count));
+    public Flux<V> zrangebylex(K key, String min, String max, long offset, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebylex(key, min, max, offset, count));
     }
 
     @Override
-    public Single<Long> geoadd(K key, double longitude, double latitude, V member) {
-        return createSingle(() -> commandBuilder.geoadd(key, longitude, latitude, member));
+    public Mono<Long> geoadd(K key, double longitude, double latitude, V member) {
+        return createMono(() -> commandBuilder.geoadd(key, longitude, latitude, member));
     }
 
     @Override
-    public Single<Long> geoadd(K key, Object... lngLatMember) {
-        return createSingle(() -> commandBuilder.geoadd(key, lngLatMember));
+    public Mono<Long> geoadd(K key, Object... lngLatMember) {
+        return createMono(() -> commandBuilder.geoadd(key, lngLatMember));
     }
 
     @Override
-    public Observable<String> geohash(K key, V... members) {
-        return createDissolvingObservable(() -> commandBuilder.geohash(key, members));
+    public Flux<Value<String>> geohash(K key, V... members) {
+        return createDissolvingFlux(() -> commandBuilder.geohash(key, members));
     }
 
     @Override
-    public Observable<V> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
-        return createDissolvingObservable(() -> commandBuilder.georadius(key, longitude, latitude, distance, unit.name()));
+    public Flux<V> georadius(K key, double longitude, double latitude, double distance, Unit unit) {
+        return createDissolvingFlux(() -> commandBuilder.georadius(key, longitude, latitude, distance, unit.name()));
     }
 
     @Override
-    public Observable<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit,
+    public Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, Unit unit,
             GeoArgs geoArgs) {
-        return createDissolvingObservable(() -> commandBuilder.georadius(key, longitude, latitude, distance, unit.name(),
+        return createDissolvingFlux(() -> commandBuilder.georadius(key, longitude, latitude, distance, unit.name(),
                 geoArgs));
     }
 
     @Override
-    public Single<Long> georadius(K key, double longitude, double latitude, double distance, Unit unit,
+    public Mono<Long> georadius(K key, double longitude, double latitude, double distance, Unit unit,
             GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
-        return createSingle(
+        return createMono(
                 () -> commandBuilder.georadius(key, longitude, latitude, distance, unit.name(), geoRadiusStoreArgs));
     }
 
     @Override
-    public Observable<V> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit) {
-        return createDissolvingObservable(() -> commandBuilder.georadiusbymember(key, member, distance, unit.name()));
+    public Flux<V> georadiusbymember(K key, V member, double distance, Unit unit) {
+        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(key, member, distance, unit.name()));
     }
 
     @Override
-    public Observable<GeoWithin<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs) {
-        return createDissolvingObservable(() -> commandBuilder.georadiusbymember(key, member, distance, unit.name(), geoArgs));
+    public Flux<GeoWithin<V>> georadiusbymember(K key, V member, double distance, Unit unit, GeoArgs geoArgs) {
+        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(key, member, distance, unit.name(), geoArgs));
     }
 
     @Override
-    public Single<Long> georadiusbymember(K key, V member, double distance, Unit unit,
+    public Mono<Long> georadiusbymember(K key, V member, double distance, Unit unit,
             GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
-        return createSingle(
+        return createMono(
                 () -> commandBuilder.georadiusbymember(key, member, distance, unit.name(), geoRadiusStoreArgs));
     }
 
     @Override
-    public Observable<GeoCoordinates> geopos(K key, V... members) {
-        return createDissolvingObservable(() -> commandBuilder.geopos(key, members));
+    public Flux<Value<GeoCoordinates>> geopos(K key, V... members) {
+        return createDissolvingFlux(() -> commandBuilder.geopos(key, members));
     }
 
     @Override
-    public Single<Double> geodist(K key, V from, V to, GeoArgs.Unit unit) {
-        return createSingle(() -> commandBuilder.geodist(key, from, to, unit));
+    public Mono<Double> geodist(K key, V from, V to, Unit unit) {
+        return createMono(() -> commandBuilder.geodist(key, from, to, unit));
     }
 
-    public <T> Observable<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output) {
+    @SuppressWarnings("unchecked")
+    public <T> Flux<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output) {
 
         LettuceAssert.notNull(type, "Command type must not be null");
         LettuceAssert.notNull(output, "CommandOutput type must not be null");
 
-        return createDissolvingObservable(() -> new Command<>(type, output));
+        return (Flux) createFlux(() -> new Command<>(type, output));
     }
 
-    public <T> Observable<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output, CommandArgs<K, V> args) {
+    @SuppressWarnings("unchecked")
+    public <T> Flux<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output, CommandArgs<K, V> args) {
 
         LettuceAssert.notNull(type, "Command type must not be null");
         LettuceAssert.notNull(output, "CommandOutput type must not be null");
         LettuceAssert.notNull(args, "CommandArgs type must not be null");
 
-        return createDissolvingObservable(() -> new Command<>(type, output, args));
-    }
-
-    protected <T> Observable<T> createObservable(CommandType type, CommandOutput<K, V, T> output, CommandArgs<K, V> args) {
-        return createObservable(() -> new Command<>(type, output, args));
+        return (Flux) createFlux(() -> new Command<>(type, output, args));
     }
 
-    public <T> Observable<T> createObservable(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return Observable.create(new ReactiveCommandDispatcher<K, V, T>(commandSupplier, connection, false).getObservableSubscriber());
+    public <T> Flux<T> createFlux(Supplier<RedisCommand<K, V, T>> commandSupplier) {
+        return Flux.from(new RedisPublisher(commandSupplier, connection, false));
     }
 
-    protected <T> Single<T> createSingle(CommandType type, CommandOutput<K, V, T> output, CommandArgs<K, V> args) {
-        return createSingle(() -> new Command<>(type, output, args));
+    protected <T> Mono<T> createMono(CommandType type, CommandOutput<K, V, T> output, CommandArgs<K, V> args) {
+        return createMono(() -> new Command<>(type, output, args));
     }
 
-    public <T> Single<T> createSingle(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return Single.create(new ReactiveCommandDispatcher<K, V, T>(commandSupplier, connection, false).getSingleSubscriber());
+    public <T> Mono<T> createMono(Supplier<RedisCommand<K, V, T>> commandSupplier) {
+        return Mono.from(new RedisPublisher(commandSupplier, connection, false));
     }
     
     @SuppressWarnings("unchecked")
-    public <T, R> Observable<R> createDissolvingObservable(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return (Observable<R>) Observable.create(new ReactiveCommandDispatcher<>(commandSupplier, connection, true).getObservableSubscriber());
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T, R> R createDissolvingObservable(CommandType type, CommandOutput<K, V, T> output, CommandArgs<K, V> args) {
-        return (R) Observable.create(new ReactiveCommandDispatcher<K, V, T>(() -> new Command<>(type, output, args),
-                connection, true).getObservableSubscriber());
-    }
-
-    /**
-     * Emits just {@link Success#Success} or the {@link Throwable} after the inner observable is completed.
-     *
-     * @param observable inner observable
-     * @param <T> used for type inference
-     * @return Success observable
-     */
-    protected <T> Observable<Success> getSuccessObservable(final Observable<T> observable) {
-        return Observable.create(new Observable.OnSubscribe<Success>() {
-            @Override
-            public void call(Subscriber<? super Success> subscriber) {
-
-                observable.subscribe(new Subscriber<Object>() {
-                    @Override
-                    public void onCompleted() {
-                        subscriber.onNext(Success.Success);
-                        subscriber.onCompleted();
-                    }
-
-                    @Override
-                    public void onError(Throwable throwable) {
-                        subscriber.onError(throwable);
-                    }
-
-                    @Override
-                    public void onNext(Object k) {
-
-                    }
-                });
-            }
-        });
+    public <T, R> Flux<R> createDissolvingFlux(Supplier<RedisCommand<K, V, T>> commandSupplier) {
+        return (Flux<R>) Flux.from(new RedisPublisher(commandSupplier, connection, true));
     }
 
     public void setTimeout(long timeout, TimeUnit unit) {
diff --git a/src/main/java/com/lambdaworks/redis/BackpressureUtils.java b/src/main/java/com/lambdaworks/redis/BackpressureUtils.java
new file mode 100644
index 0000000000..3a211e789d
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/BackpressureUtils.java
@@ -0,0 +1,146 @@
+package com.lambdaworks.redis;
+
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+
+import reactor.core.Exceptions;
+
+enum BackpressureUtils {
+    ;
+
+    /**
+     * Check Subscription current state and cancel new Subscription if different null, returning true if ready to subscribe.
+     *
+     * @param current current Subscription, expected to be null
+     * @param next new Subscription
+     * @return true if Subscription can be used
+     */
+    public static boolean validate(Subscription current, Subscription next) {
+        Objects.requireNonNull(next, "Subscription cannot be null");
+        if (current != null) {
+            next.cancel();
+            // reportSubscriptionSet();
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Evaluate if a request is strictly positive otherwise {@link #reportBadRequest(long)}
+     * 
+     * @param n the request value
+     * @return true if valid
+     */
+    public static boolean validate(long n) {
+        if (n < 0) {
+            reportBadRequest(n);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Throws an exception if request is 0 or negative as specified in rule 3.09 of Reactive Streams
+     *
+     * @param n demand to check
+     * @param subscriber Subscriber to onError if non strict positive n
+     *
+     * @return true if valid or false if specification exception occured
+     *
+     * @throws IllegalArgumentException if subscriber is null and demand is negative or 0.
+     */
+    public static boolean checkRequest(long n, Subscriber<?> subscriber) {
+        if (n <= 0L) {
+            if (null != subscriber) {
+                subscriber.onError(Exceptions.nullOrNegativeRequestException(n));
+            } else {
+                throw Exceptions.nullOrNegativeRequestException(n);
+            }
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Cap an addition to Long.MAX_VALUE
+     *
+     * @param a left operand
+     * @param b right operand
+     * @return Addition result or Long.MAX_VALUE if overflow
+     */
+    public static long addCap(long a, long b) {
+        long res = a + b;
+        if (res < 0L) {
+            return Long.MAX_VALUE;
+        }
+        return res;
+    }
+
+    /**
+     * Cap a substraction to 0
+     *
+     * @param a left operand
+     * @param b right operand
+     * @return Subscription result or 0 if overflow
+     */
+    public static long subOrZero(long a, long b) {
+        long res = a - b;
+        if (res < 0L) {
+            return 0;
+        }
+        return res;
+    }
+
+    /**
+     * Concurrent addition bound to Long.MAX_VALUE. Any concurrent write will "happen" before this operation.
+     *
+     * @param current current atomic to update
+     * @param toAdd delta to add
+     * @return Addition result or Long.MAX_VALUE
+     */
+    public static long addAndGet(AtomicLong current, long toAdd) {
+        long u, r;
+        do {
+            r = current.get();
+            if (r == Long.MAX_VALUE) {
+                return Long.MAX_VALUE;
+            }
+            u = addCap(r, toAdd);
+        } while (!current.compareAndSet(r, u));
+
+        return u;
+    }
+
+    /**
+     * Concurrent substraction bound to 0 and Long.MAX_VALUE. Any concurrent write will "happen" before this operation.
+     *
+     * @param sequence current atomic to update
+     * @param toSub delta to sub
+     * @return value before subscription, 0 or Long.MAX_VALUE
+     */
+    public static long getAndSub(AtomicLong sequence, long toSub) {
+        long r, u;
+        do {
+            r = sequence.get();
+            if (r == 0 || r == Long.MAX_VALUE) {
+                return r;
+            }
+            u = subOrZero(r, toSub);
+        } while (!sequence.compareAndSet(r, u));
+
+        return r;
+    }
+
+    /**
+     * Throw {@link IllegalArgumentException}
+     * 
+     * @param n the demand to evaluate
+     */
+    public static void reportBadRequest(long n) {
+        throw Exceptions.nullOrNegativeRequestException(n);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/ReactiveCommandDispatcher.java b/src/main/java/com/lambdaworks/redis/ReactiveCommandDispatcher.java
deleted file mode 100644
index d9c6fc41cc..0000000000
--- a/src/main/java/com/lambdaworks/redis/ReactiveCommandDispatcher.java
+++ /dev/null
@@ -1,329 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.concurrent.CancellationException;
-import java.util.function.Supplier;
-
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.output.StreamingOutput;
-import com.lambdaworks.redis.protocol.CommandWrapper;
-import com.lambdaworks.redis.protocol.RedisCommand;
-
-import io.netty.util.internal.logging.InternalLogger;
-import io.netty.util.internal.logging.InternalLoggerFactory;
-import rx.Observable;
-import rx.Single;
-import rx.Subscriber;
-
-/**
- * Reactive command dispatcher.
- *
- * @author Mark Paluch
- */
-public class ReactiveCommandDispatcher<K, V, T> {
-
-    private final static InternalLogger LOG = InternalLoggerFactory.getInstance(ReactiveCommandDispatcher.class);
-
-    private Supplier<? extends RedisCommand<K, V, T>> commandSupplier;
-    private volatile RedisCommand<K, V, T> command;
-    private StatefulConnection<K, V> connection;
-    private boolean dissolve;
-
-    /**
-     *
-     * @param staticCommand static command, must not be {@literal null}
-     * @param connection the connection, must not be {@literal null}
-     * @param dissolve dissolve collections into particular elements
-     */
-    public ReactiveCommandDispatcher(RedisCommand<K, V, T> staticCommand, StatefulConnection<K, V> connection,
-            boolean dissolve) {
-        this(() -> staticCommand, connection, dissolve);
-    }
-
-    /**
-     *
-     * @param commandSupplier command supplier, must not be {@literal null}
-     * @param connection the connection, must not be {@literal null}
-     * @param dissolve dissolve collections into particular elements
-     */
-    public ReactiveCommandDispatcher(Supplier<RedisCommand<K, V, T>> commandSupplier, StatefulConnection<K, V> connection,
-            boolean dissolve) {
-
-        LettuceAssert.notNull(commandSupplier, "CommandSupplier must not be null");
-        LettuceAssert.notNull(connection, "StatefulConnection must not be null");
-
-        this.commandSupplier = commandSupplier;
-        this.connection = connection;
-        this.dissolve = dissolve;
-        this.command = commandSupplier.get();
-
-    }
-
-    public Single.OnSubscribe<T> getSingleSubscriber() {
-        return new SingleSubscriber();
-    }
-
-    public Observable.OnSubscribe<T> getObservableSubscriber() {
-        return new ObservableSubscriber();
-    }
-
-    private class ObservableSubscriber implements Observable.OnSubscribe<T> {
-
-        @Override
-        public void call(Subscriber<? super T> subscriber) {
-
-            // Reuse the first command but then discard it.
-            RedisCommand<K, V, T> command = ReactiveCommandDispatcher.this.command;
-            if (command == null) {
-                command = commandSupplier.get();
-            }
-
-            if (command.getOutput() instanceof StreamingOutput<?>) {
-                StreamingOutput<T> streamingOutput = (StreamingOutput<T>) command.getOutput();
-
-                if (connection instanceof StatefulRedisConnection<?, ?> && ((StatefulRedisConnection) connection).isMulti()) {
-                    streamingOutput.setSubscriber(new DelegatingWrapper<T>(
-                            Arrays.asList(new ObservableSubscriberWrapper<>(subscriber), streamingOutput.getSubscriber())));
-                } else {
-                    streamingOutput.setSubscriber(new ObservableSubscriberWrapper<>(subscriber));
-                }
-            }
-
-            connection.dispatch(new ObservableCommand<>(command, subscriber, dissolve));
-
-            ReactiveCommandDispatcher.this.command = null;
-        }
-    }
-
-    private class SingleSubscriber implements Single.OnSubscribe<T> {
-
-        @Override
-        public void call(rx.SingleSubscriber<? super T> subscriber) {
-
-            // Reuse the first command but then discard it.
-            RedisCommand<K, V, T> command = ReactiveCommandDispatcher.this.command;
-            if (command == null) {
-                command = commandSupplier.get();
-            }
-
-            if (command.getOutput() instanceof StreamingOutput<?>) {
-                StreamingOutput<T> streamingOutput = (StreamingOutput<T>) command.getOutput();
-
-                if (connection instanceof StatefulRedisConnection<?, ?> && ((StatefulRedisConnection) connection).isMulti()) {
-                    streamingOutput.setSubscriber(new DelegatingWrapper<T>(
-                            Arrays.asList(new SingleSubscriberWrapper<T>(subscriber), streamingOutput.getSubscriber())));
-                } else {
-                    streamingOutput.setSubscriber(new SingleSubscriberWrapper<T>(subscriber));
-                }
-            }
-
-            connection.dispatch(new SingleCommand<>(command, subscriber));
-
-            ReactiveCommandDispatcher.this.command = null;
-        }
-    }
-
-    private static class ObservableCommand<K, V, T> extends CommandWrapper<K, V, T> {
-
-        private final Subscriber<? super T> subscriber;
-        private final boolean dissolve;
-        private boolean completed = false;
-
-        public ObservableCommand(RedisCommand<K, V, T> command, Subscriber<? super T> subscriber, boolean dissolve) {
-            super(command);
-            this.subscriber = subscriber;
-            this.dissolve = dissolve;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public void complete() {
-            if (completed || subscriber.isUnsubscribed()) {
-                return;
-            }
-
-            try {
-                super.complete();
-
-                if (getOutput() != null) {
-                    Object result = getOutput().get();
-
-                    if (!(getOutput() instanceof StreamingOutput<?>) && result != null) {
-
-                        if (dissolve && result instanceof Collection) {
-                            Collection<T> collection = (Collection<T>) result;
-                            for (T t : collection) {
-                                if (t != null) {
-                                    subscriber.onNext(t);
-                                }
-                            }
-                        } else {
-                            subscriber.onNext((T) result);
-                        }
-                    }
-
-                    if (getOutput().hasError()) {
-                        onError(new RedisCommandExecutionException(getOutput().getError()));
-                        completed = true;
-                        return;
-                    }
-                }
-
-                try {
-                    subscriber.onCompleted();
-                } catch (Exception e) {
-                   completeExceptionally(e);
-                }
-            } finally {
-                completed = true;
-            }
-        }
-
-        @Override
-        public void cancel() {
-
-            if (completed || subscriber.isUnsubscribed()) {
-                return;
-            }
-
-            super.cancel();
-
-            onError(new CancellationException());
-            completed = true;
-        }
-
-        @Override
-        public boolean completeExceptionally(Throwable throwable) {
-
-            if (completed || subscriber.isUnsubscribed()) {
-                return false;
-            }
-
-            boolean b = super.completeExceptionally(throwable);
-            onError(throwable);
-            completed = true;
-            return b;
-        }
-
-        private void onError(Throwable throwable) {
-            subscriber.onError(throwable);
-        }
-    }
-
-    private static class SingleCommand<K, V, T> extends CommandWrapper<K, V, T> {
-
-        private final rx.SingleSubscriber<? super T> subscriber;
-        private boolean completed = false;
-
-        public SingleCommand(RedisCommand<K, V, T> command, rx.SingleSubscriber<? super T> subscriber) {
-            super(command);
-            this.subscriber = subscriber;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public void complete() {
-            if (completed) {
-                return;
-            }
-
-            super.complete();
-
-            if (getOutput() != null) {
-                Object result = getOutput().get();
-
-                if (getOutput().hasError()) {
-                    onError(new RedisCommandExecutionException(getOutput().getError()));
-                    completed = true;
-                    return;
-                } else if (!(getOutput() instanceof StreamingOutput<?>)) {
-                    subscriber.onSuccess((T) result);
-                }
-            }
-
-            completed = true;
-        }
-
-        @Override
-        public void cancel() {
-
-            if (completed) {
-                return;
-            }
-
-            super.cancel();
-            onError(new CancellationException());
-            completed = true;
-        }
-
-        @Override
-        public boolean completeExceptionally(Throwable throwable) {
-
-            if (completed) {
-                return false;
-            }
-
-            boolean b = super.completeExceptionally(throwable);
-            onError(throwable);
-            completed = true;
-            return b;
-        }
-
-        private void onError(Throwable throwable) {
-            subscriber.onError(throwable);
-        }
-    }
-
-    static class ObservableSubscriberWrapper<T> implements StreamingOutput.Subscriber<T> {
-
-        private Subscriber<? super T> subscriber;
-
-        public ObservableSubscriberWrapper(Subscriber<? super T> subscriber) {
-            this.subscriber = subscriber;
-        }
-
-        @Override
-        public void onNext(T t) {
-
-            if (subscriber.isUnsubscribed()) {
-                return;
-            }
-
-            subscriber.onNext(t);
-        }
-    }
-
-    static class SingleSubscriberWrapper<T> implements StreamingOutput.Subscriber<T> {
-
-        private rx.SingleSubscriber<? super T> subscriber;
-
-        public SingleSubscriberWrapper(rx.SingleSubscriber<? super T> subscriber) {
-            this.subscriber = subscriber;
-        }
-
-        @Override
-        public void onNext(T t) {
-            subscriber.onSuccess(t);
-        }
-    }
-
-    static class DelegatingWrapper<T> implements StreamingOutput.Subscriber<T> {
-
-        private Collection<StreamingOutput.Subscriber<T>> subscribers;
-
-        public DelegatingWrapper(Collection<StreamingOutput.Subscriber<T>> subscribers) {
-            this.subscribers = subscribers;
-        }
-
-        @Override
-        public void onNext(T t) {
-
-            for (StreamingOutput.Subscriber<T> subscriber : subscribers) {
-                subscriber.onNext(t);
-            }
-        }
-    }
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
index 4691172768..449704ed3f 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
@@ -2438,13 +2438,13 @@ public Command<K, V, Long> geoadd(K key, Object[] lngLatMember) {
         return createCommand(GEOADD, new IntegerOutput<K, V>(codec), args);
     }
 
-    public Command<K, V, List<String>> geohash(K key, V... members) {
+    public Command<K, V, List<Value<String>>> geohash(K key, V... members) {
         notNullKey(key);
         LettuceAssert.notNull(members, "Members " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(members, "Members " + MUST_NOT_BE_EMPTY);
 
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValues(members);
-        return createCommand(GEOHASH, new StringListOutput<K, V>(codec), args);
+        return createCommand(GEOHASH, new StringValueListOutput<K, V>(codec), args);
     }
 
     public Command<K, V, Set<V>> georadius(K key, double longitude, double latitude, double distance, String unit) {
@@ -2527,7 +2527,7 @@ public Command<K, V, Long> georadiusbymember(K key, V member, double distance, S
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public Command<K, V, List<GeoCoordinates>> geopos(K key, V[] members) {
+    public Command<K, V, List<Value<GeoCoordinates>>> geopos(K key, V[] members) {
         notNullKey(key);
         LettuceAssert.notNull(members, "Members " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(members, "Members " + MUST_NOT_BE_EMPTY);
diff --git a/src/main/java/com/lambdaworks/redis/RedisPublisher.java b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
new file mode 100644
index 0000000000..f01f0c94db
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
@@ -0,0 +1,578 @@
+package com.lambdaworks.redis;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+
+import com.lambdaworks.redis.api.StatefulConnection;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.output.StreamingOutput;
+import com.lambdaworks.redis.protocol.CommandWrapper;
+import com.lambdaworks.redis.protocol.RedisCommand;
+
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+/**
+ * Reactive command {@link Publisher} using ReactiveStreams.
+ *
+ * This publisher handles command execution and response propagation to a {@link Subscriber}. Collections can be dissolved into
+ * individual elements instead of emitting collections. This publisher allows multiple subscriptions if it's backed by a
+ * {@link Supplier command supplier}.
+ * <p>
+ * When using streaming outputs ({@link com.lambdaworks.redis.output.CommandOutput} that implement {@link StreamingOutput})
+ * elements are emitted as they are decoded. Otherwise, results are processed at command completion.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class RedisPublisher<K, V, T> implements Publisher<T> {
+
+    private final static InternalLogger LOG = InternalLoggerFactory.getInstance(RedisPublisher.class);
+
+    private final boolean traceEnabled = LOG.isTraceEnabled();
+
+    private final Supplier<? extends RedisCommand<K, V, T>> commandSupplier;
+    private final AtomicReference<RedisCommand<K, V, T>> ref;
+    private final StatefulConnection<K, V> connection;
+    private final boolean dissolve;
+
+    /**
+     * Creates a new {@link RedisPublisher} for a static command.
+     *
+     * @param staticCommand static command, must not be {@literal null}
+     * @param connection the connection, must not be {@literal null}
+     * @param dissolve dissolve collections into particular elements
+     */
+    public RedisPublisher(RedisCommand<K, V, T> staticCommand, StatefulConnection<K, V> connection, boolean dissolve) {
+        this(() -> staticCommand, connection, dissolve);
+    }
+
+    /**
+     * Creates a new {@link RedisPublisher} for a command supplier.
+     *
+     * @param commandSupplier command supplier, must not be {@literal null}
+     * @param connection the connection, must not be {@literal null}
+     * @param dissolve dissolve collections into particular elements
+     */
+    public RedisPublisher(Supplier<RedisCommand<K, V, T>> commandSupplier, StatefulConnection<K, V> connection,
+            boolean dissolve) {
+
+        LettuceAssert.notNull(commandSupplier, "CommandSupplier must not be null");
+        LettuceAssert.notNull(connection, "StatefulConnection must not be null");
+
+        this.commandSupplier = commandSupplier;
+        this.connection = connection;
+        this.dissolve = dissolve;
+        this.ref = new AtomicReference<>(commandSupplier.get());
+    }
+
+    @Override
+    public void subscribe(Subscriber<? super T> subscriber) {
+
+        if (this.traceEnabled) {
+            LOG.trace("subscribe: {}@{}", subscriber.getClass().getName(), Objects.hashCode(subscriber));
+        }
+
+        // Reuse the first command but then discard it.
+        RedisCommand<K, V, T> command = ref.get();
+
+        if (command != null) {
+            if (!ref.compareAndSet(command, null)) {
+                command = commandSupplier.get();
+            }
+        } else {
+            command = commandSupplier.get();
+        }
+
+        RedisSubscription<T> redisSubscription = new RedisSubscription<>(connection, command, dissolve);
+        redisSubscription.subscribe(subscriber);
+    }
+
+    /**
+     * Implementation of {@link Subscription}. This subscription can receive demand for data signals with {@link #request(long)}
+     * . It maintains a {@link State} to react on pull signals like demand for data or push signals as soon as data is
+     * available. Subscription behavior and state transitions are kept inside the {@link State}.
+     *
+     * @param <T> data element type
+     */
+    private static class RedisSubscription<T> implements Subscription, StreamingOutput.Subscriber<T> {
+
+        private final static InternalLogger LOG = InternalLoggerFactory.getInstance(RedisPublisher.class);
+        private final boolean traceEnabled = LOG.isTraceEnabled();
+
+        private final AtomicLong demand = new AtomicLong();
+        private final Queue<T> data = new ConcurrentLinkedQueue<T>();
+        private final AtomicBoolean dispatched = new AtomicBoolean();
+
+        private final StatefulConnection<?, ?> connection;
+        private final RedisCommand<?, ?, T> command;
+        private final boolean dissolve;
+
+        private Subscriber<? super T> subscriber;
+
+        private final AtomicReference<State> state = new AtomicReference<>(State.UNSUBSCRIBED);
+
+        RedisSubscription(StatefulConnection<?, ?> connection, RedisCommand<?, ?, T> command, boolean dissolve) {
+
+            LettuceAssert.notNull(connection, "Connection must not be null");
+            LettuceAssert.notNull(command, "RedisCommand must not be null");
+
+            this.connection = connection;
+            this.command = command;
+            this.dissolve = dissolve;
+        }
+
+        /**
+         * Subscription procedure called by a {@link Publisher}
+         *
+         * @param subscriber the subscriber, must not be {@literal null}.
+         */
+        void subscribe(Subscriber<? super T> subscriber) {
+
+            LettuceAssert.notNull(subscriber, "Subscriber must not be null");
+
+            if (traceEnabled) {
+                LOG.trace("{} subscribe: {}@{}", state(), subscriber.getClass().getName(), Objects.hashCode(subscriber));
+            }
+
+            state().subscribe(this, subscriber);
+        }
+
+        /**
+         * Signal for data demand.
+         *
+         * @param n number of requested elements
+         */
+        @Override
+        public final void request(long n) {
+
+            if (traceEnabled) {
+                LOG.trace("{} request: {}", state(), n);
+            }
+
+            state().request(this, n);
+        }
+
+        /**
+         * Cancels a command.
+         */
+        @Override
+        public final void cancel() {
+
+            if (traceEnabled) {
+                LOG.trace("{} cancel", state());
+            }
+
+            state().cancel(this);
+        }
+
+        private RedisPublisher.State state() {
+            return this.state.get();
+        }
+
+        /**
+         * Called by {@link StreamingOutput} to dispatch data (push).
+         *
+         * @param t element
+         */
+        @Override
+        public void onNext(T t) {
+
+            LettuceAssert.notNull(t, "Data must not be null");
+
+            data.add(t);
+            onDataAvailable();
+        }
+
+        /**
+         * Called via a listener interface to indicate that reading is possible.
+         *
+         */
+        final void onDataAvailable() {
+
+            if (traceEnabled) {
+                LOG.trace("{} onDataAvailable()", state());
+            }
+
+            this.state.get().onDataAvailable(this);
+        }
+
+        /**
+         * Called via a listener interface to indicate that all data has been read.
+         *
+         */
+        final void onAllDataRead() {
+
+            if (traceEnabled) {
+                LOG.trace("{} onAllDataRead()", state());
+            }
+            this.state.get().onAllDataRead(this);
+        }
+
+        /**
+         * Called by a listener interface to indicate that as error has occured.
+         *
+         * @param t the error
+         */
+        final void onError(Throwable t) {
+
+            if (LOG.isErrorEnabled()) {
+                LOG.trace("{} onError(): {}", state(), t.toString(), t);
+            }
+            this.state.get().onError(this, t);
+        }
+
+        /**
+         * Reads and publishes data from the input. Continues until either there is no more demand, or until there is no more
+         * data to be read.
+         *
+         * @return {@literal true} if there is more demand, {@literal false} otherwise
+         */
+        private boolean readAndPublish() throws IOException {
+
+            while (hasDemand()) {
+                T data = read();
+
+                if (data != null) {
+                    BackpressureUtils.getAndSub(this.demand, 1L);
+                    this.subscriber.onNext(data);
+                } else {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /**
+         * Reads data from the input, if possible.
+         * 
+         * @return the data that was read or {@literal null}
+         */
+        protected T read() {
+            return data.poll();
+        }
+
+        private boolean hasDemand() {
+            return this.demand.get() > 0;
+        }
+
+        private boolean changeState(State oldState, State newState) {
+            return this.state.compareAndSet(oldState, newState);
+        }
+
+        void checkCommandDispatch() {
+
+            if (!dispatched.get() && dispatched.compareAndSet(false, true)) {
+                dispatchCommand();
+            }
+        }
+
+        @SuppressWarnings("unchecked")
+        private void dispatchCommand() {
+            if (command.getOutput() instanceof StreamingOutput<?>) {
+                StreamingOutput<T> streamingOutput = (StreamingOutput<T>) command.getOutput();
+
+                if (connection instanceof StatefulRedisConnection<?, ?> && ((StatefulRedisConnection) connection).isMulti()) {
+                    streamingOutput
+                            .setSubscriber(new CompositeSubscriber<T>(Arrays.asList(this, streamingOutput.getSubscriber())));
+                } else {
+                    streamingOutput.setSubscriber(this);
+                }
+            }
+
+            connection.dispatch(new SubscriptionCommand(command, this, dissolve));
+        }
+
+        void checkOnDataAvailable() {
+
+            if (!data.isEmpty()) {
+                onDataAvailable();
+            }
+        }
+    }
+
+    /**
+     * Represents a state for the {@link Subscription} to be in. The following figure indicate the four different states that
+     * exist, and the relationships between them.
+     *
+     * <pre>
+     *       UNSUBSCRIBED
+     *        |
+     *        v
+     * NO_DEMAND -------------------> DEMAND
+     *    |    ^                      ^    |
+     *    |    |                      |    |
+     *    |    --------- READING <-----    |
+     *    |                 |              |
+     *    |                 v              |
+     *    ------------> COMPLETED <---------
+     * </pre>
+     * 
+     * Refer to the individual states for more information.
+     */
+    private enum State {
+
+        /**
+         * The initial unsubscribed state. Will respond to {@link #subscribe(RedisSubscription, Subscriber)} by changing state
+         * to {@link #NO_DEMAND}.
+         */
+        UNSUBSCRIBED {
+            @SuppressWarnings("unchecked")
+            @Override
+            void subscribe(RedisSubscription<?> subscription, Subscriber<?> subscriber) {
+
+                LettuceAssert.notNull(subscriber, "Subscriber must not be null");
+
+                if (subscription.changeState(this, NO_DEMAND)) {
+                    subscription.subscriber = (Subscriber) subscriber;
+                    subscriber.onSubscribe(subscription);
+                } else {
+                    throw new IllegalStateException(toString());
+                }
+            }
+        },
+
+        /**
+         * State that gets entered when there is no demand. Responds to {@link #request(RedisSubscription, long)}
+         * (RedisPublisher, long)} by increasing the demand, changing state to {@link #DEMAND} and will check whether there is
+         * data available for reading.
+         */
+        NO_DEMAND {
+            @Override
+            void request(RedisSubscription<?> subscription, long n) {
+
+                if (BackpressureUtils.checkRequest(n, subscription.subscriber)) {
+                    BackpressureUtils.addAndGet(subscription.demand, n);
+
+                    if (subscription.changeState(this, DEMAND)) {
+                        subscription.checkCommandDispatch();
+                        subscription.checkOnDataAvailable();
+                    }
+                }
+            }
+        },
+
+        /**
+         * State that gets entered when there is demand. Responds to {@link #onDataAvailable(RedisSubscription)} by reading the
+         * available data. The state will be changed to {@link #NO_DEMAND} if there is no demand.
+         */
+        DEMAND {
+            @Override
+            void onDataAvailable(RedisSubscription<?> subscription) {
+
+                if (subscription.changeState(this, READING)) {
+
+                    try {
+
+                        boolean demandAvailable = subscription.readAndPublish();
+                        if (demandAvailable) {
+                            subscription.changeState(READING, DEMAND);
+                            subscription.checkOnDataAvailable();
+                        } else {
+                            subscription.changeState(READING, NO_DEMAND);
+                        }
+                    } catch (IOException ex) {
+                        subscription.onError(ex);
+                    }
+                }
+            }
+        },
+
+        READING {
+            @Override
+            void request(RedisSubscription<?> subscription, long n) {
+
+                if (BackpressureUtils.checkRequest(n, subscription.subscriber)) {
+                    BackpressureUtils.addAndGet(subscription.demand, n);
+                }
+            }
+        },
+
+        /**
+         * The terminal completed state. Does not respond to any events.
+         */
+        COMPLETED {
+
+            @Override
+            void request(RedisSubscription<?> subscription, long n) {
+                // ignore
+            }
+
+            @Override
+            void cancel(RedisSubscription<?> subscription) {
+                // ignore
+            }
+
+            @Override
+            void onAllDataRead(RedisSubscription<?> subscription) {
+                // ignore
+            }
+
+            @Override
+            void onError(RedisSubscription<?> subscription, Throwable t) {
+                // ignore
+            }
+        };
+
+        void subscribe(RedisSubscription<?> subscription, Subscriber<?> subscriber) {
+            throw new IllegalStateException(toString());
+        }
+
+        void request(RedisSubscription<?> subscription, long n) {
+            throw new IllegalStateException(toString());
+        }
+
+        void cancel(RedisSubscription<?> subscription) {
+
+            subscription.command.cancel();
+            subscription.changeState(this, COMPLETED);
+        }
+
+        void onDataAvailable(RedisSubscription<?> subscription) {
+            // ignore
+        }
+
+        void onAllDataRead(RedisSubscription<?> subscription) {
+
+            if (subscription.changeState(this, COMPLETED)) {
+                if (subscription.subscriber != null) {
+                    subscription.subscriber.onComplete();
+                }
+            }
+        }
+
+        void onError(RedisSubscription<?> subscription, Throwable t) {
+
+            if (subscription.changeState(this, COMPLETED)) {
+                if (subscription.subscriber != null) {
+                    subscription.subscriber.onError(t);
+                }
+            }
+        }
+    }
+
+    /**
+     * Command that emits it data after completion to a {@link RedisSubscription}.
+     *
+     * @param <K> key type
+     * @param <V> value type
+     * @param <T> response type
+     */
+    private static class SubscriptionCommand<K, V, T> extends CommandWrapper<K, V, T> {
+
+        private final boolean dissolve;
+        private final RedisSubscription<T> subscription;
+        private boolean completed = false;
+
+        public SubscriptionCommand(RedisCommand<K, V, T> command, RedisSubscription<T> subscription, boolean dissolve) {
+
+            super(command);
+
+            this.subscription = subscription;
+            this.dissolve = dissolve;
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public void complete() {
+
+            if (completed) {
+                return;
+            }
+
+            try {
+                super.complete();
+
+                if (getOutput() != null) {
+                    Object result = getOutput().get();
+
+                    if (getOutput().hasError()) {
+                        onError(new RedisCommandExecutionException(getOutput().getError()));
+                        completed = true;
+                        return;
+                    }
+
+                    if (!(getOutput() instanceof StreamingOutput<?>) && result != null) {
+
+                        if (dissolve && result instanceof Collection) {
+                            Collection<T> collection = (Collection<T>) result;
+                            for (T t : collection) {
+                                if (t != null) {
+                                    subscription.onNext(t);
+                                }
+                            }
+                        } else {
+                            subscription.onNext((T) result);
+                        }
+                    }
+
+                }
+
+                subscription.onAllDataRead();
+            } finally {
+                completed = true;
+            }
+        }
+
+        @Override
+        public void cancel() {
+
+            if (completed) {
+                return;
+            }
+
+            super.cancel();
+
+            completed = true;
+        }
+
+        @Override
+        public boolean completeExceptionally(Throwable throwable) {
+
+            if (completed) {
+                return false;
+            }
+
+            boolean b = super.completeExceptionally(throwable);
+            onError(throwable);
+            completed = true;
+            return b;
+        }
+
+        private void onError(Throwable throwable) {
+            subscription.onError(throwable);
+        }
+    }
+
+    /**
+     * Composite {@link com.lambdaworks.redis.output.StreamingOutput.Subscriber} that can notify multiple nested subscribers.
+     *
+     * @param <T> element type
+     */
+    private static class CompositeSubscriber<T> implements StreamingOutput.Subscriber<T> {
+
+        private final Collection<StreamingOutput.Subscriber<T>> subscribers;
+
+        CompositeSubscriber(Collection<StreamingOutput.Subscriber<T>> subscribers) {
+            this.subscribers = subscribers;
+        }
+
+        @Override
+        public void onNext(T t) {
+            subscribers.forEach(subscriber -> subscriber.onNext(t));
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java
index 16f29388d4..08f9e1e394 100644
--- a/src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java
@@ -1,8 +1,8 @@
 package com.lambdaworks.redis;
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
-import com.lambdaworks.redis.cluster.api.rx.RedisClusterReactiveCommands;
+import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
+import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands;
 import com.lambdaworks.redis.codec.RedisCodec;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java b/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
index 65911a1c3a..96fda2aaa3 100644
--- a/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
@@ -13,7 +13,7 @@
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
+import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
 import com.lambdaworks.redis.codec.RedisCodec;
diff --git a/src/main/java/com/lambdaworks/redis/api/StatefulRedisConnection.java b/src/main/java/com/lambdaworks/redis/api/StatefulRedisConnection.java
index 4c59cbe967..94cbdeb24a 100644
--- a/src/main/java/com/lambdaworks/redis/api/StatefulRedisConnection.java
+++ b/src/main/java/com/lambdaworks/redis/api/StatefulRedisConnection.java
@@ -1,7 +1,7 @@
 package com.lambdaworks.redis.api;
 
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
+import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.protocol.ConnectionWatchdog;
 
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
index cdc9b54bba..0709b14176 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
@@ -1,12 +1,9 @@
 package com.lambdaworks.redis.api.async;
 
-import com.lambdaworks.redis.GeoArgs;
-import com.lambdaworks.redis.GeoCoordinates;
-import com.lambdaworks.redis.GeoRadiusStoreArgs;
-import com.lambdaworks.redis.GeoWithin;
+import com.lambdaworks.redis.*;
+
 import java.util.List;
 import java.util.Set;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands for the Geo-API.
@@ -44,7 +41,7 @@ public interface RedisGeoAsyncCommands<K, V> {
      * @param members the members
      * @return bulk reply Geohash strings in the order of {@code members}. Returns {@literal null} if a member is not found.
      */
-    RedisFuture<List<String>> geohash(K key, V... members);
+    RedisFuture<List<Value<String>>> geohash(K key, V... members);
 
     /**
      * Retrieve members selected by distance with the center of {@code longitude} and {@code latitude}.
@@ -133,7 +130,7 @@ public interface RedisGeoAsyncCommands<K, V> {
      * @return a list of {@link GeoCoordinates}s representing the x,y position of each element specified in the arguments. For
      *         missing elements {@literal null} is returned.
      */
-    RedisFuture<List<GeoCoordinates>> geopos(K key, V... members);
+    RedisFuture<List<Value<GeoCoordinates>>> geopos(K key, V... members);
 
     /**
      *
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
index 87f7da7c16..25cc1523db 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
@@ -2,10 +2,13 @@
 
 import java.util.List;
 import java.util.Map;
-
-import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
+import com.lambdaworks.redis.BitFieldArgs;
+import com.lambdaworks.redis.KeyValue;
+import com.lambdaworks.redis.SetArgs;
+import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands for Strings.
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java
index d0cf372d5c..815b350750 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java
@@ -1,7 +1,8 @@
 package com.lambdaworks.redis.api.async;
 
-import com.lambdaworks.redis.RedisFuture;
+import java.util.List;
 import com.lambdaworks.redis.TransactionResult;
+import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands for Transactions.
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/BaseRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java
similarity index 84%
rename from src/main/java/com/lambdaworks/redis/api/rx/BaseRedisReactiveCommands.java
rename to src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java
index e31eab0a78..e2ff194e50 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/BaseRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java
@@ -1,17 +1,16 @@
-package com.lambdaworks.redis.api.rx;
+package com.lambdaworks.redis.api.reactive;
 
 import java.util.List;
 import java.util.Map;
 import com.lambdaworks.redis.protocol.CommandArgs;
 import com.lambdaworks.redis.protocol.ProtocolKeyword;
 import com.lambdaworks.redis.output.CommandOutput;
-import rx.Observable;
-import rx.Single;
-import rx.Completable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
  * 
- * Observable commands for basic commands.
+ * Reactive executed commands for basic commands.
  * 
  * @param <K> Key type.
  * @param <V> Value type.
@@ -28,14 +27,14 @@ public interface BaseRedisReactiveCommands<K, V> {
      * @param message the message type: value
      * @return Long integer-reply the number of clients that received the message.
      */
-    Single<Long> publish(K channel, V message);
+    Mono<Long> publish(K channel, V message);
 
     /**
      * Lists the currently *active channels*.
      * 
      * @return K array-reply a list of active channels, optionally matching the specified pattern.
      */
-    Observable<K> pubsubChannels();
+    Flux<K> pubsubChannels();
 
     /**
      * Lists the currently *active channels*.
@@ -43,7 +42,7 @@ public interface BaseRedisReactiveCommands<K, V> {
      * @param channel the key
      * @return K array-reply a list of active channels, optionally matching the specified pattern.
      */
-    Observable<K> pubsubChannels(K channel);
+    Flux<K> pubsubChannels(K channel);
 
     /**
      * Returns the number of subscribers (not counting clients subscribed to patterns) for the specified channels.
@@ -51,14 +50,14 @@ public interface BaseRedisReactiveCommands<K, V> {
      * @param channels channel keys
      * @return array-reply a list of channels and number of subscribers for every channel.
      */
-    Single<Map<K, Long>> pubsubNumsub(K... channels);
+    Mono<Map<K, Long>> pubsubNumsub(K... channels);
 
     /**
      * Returns the number of subscriptions to patterns.
      * 
      * @return Long integer-reply the number of patterns all the clients are subscribed to.
      */
-    Single<Long> pubsubNumpat();
+    Mono<Long> pubsubNumpat();
 
     /**
      * Echo the given string.
@@ -66,7 +65,7 @@ public interface BaseRedisReactiveCommands<K, V> {
      * @param msg the message type: value
      * @return V bulk-string-reply
      */
-    Single<V> echo(V msg);
+    Mono<V> echo(V msg);
 
     /**
      * Return the role of the instance in the context of replication.
@@ -74,35 +73,35 @@ public interface BaseRedisReactiveCommands<K, V> {
      * @return Object array-reply where the first element is one of master, slave, sentinel and the additional
      *         elements are role-specific.
      */
-    Observable<Object> role();
+    Flux<Object> role();
 
     /**
      * Ping the server.
      * 
      * @return String simple-string-reply
      */
-    Single<String> ping();
+    Mono<String> ping();
 
     /**
      * Switch connection to Read-Only mode when connecting to a cluster.
      *
      * @return String simple-string-reply.
      */
-    Single<String> readOnly();
+    Mono<String> readOnly();
 
     /**
      * Switch connection to Read-Write mode (default) when connecting to a cluster.
      *
      * @return String simple-string-reply.
      */
-    Single<String> readWrite();
+    Mono<String> readWrite();
 
     /**
      * Close the connection.
      * 
      * @return String simple-string-reply always OK.
      */
-    Single<String> quit();
+    Mono<String> quit();
 
     /**
      * Wait for replication.
@@ -111,7 +110,7 @@ public interface BaseRedisReactiveCommands<K, V> {
      * @param timeout timeout in milliseconds
      * @return number of replicas
      */
-    Single<Long> waitForReplication(int replicas, long timeout);
+    Mono<Long> waitForReplication(int replicas, long timeout);
 
     /**
      * Dispatch a command to the Redis Server. Please note the command output type must fit to the command response.
@@ -121,7 +120,7 @@ public interface BaseRedisReactiveCommands<K, V> {
      * @param <T> response type
      * @return the command response
      */
-    <T> Observable<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output);
+    <T> Flux<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output);
 
     /**
      * Dispatch a command to the Redis Server. Please note the command output type must fit to the command response.
@@ -132,7 +131,7 @@ public interface BaseRedisReactiveCommands<K, V> {
      * @param <T> response type
      * @return the command response
      */
-    <T> Observable<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output, CommandArgs<K, V> args);
+    <T> Flux<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output, CommandArgs<K, V> args);
 
     /**
      * 
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisGeoReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java
similarity index 78%
rename from src/main/java/com/lambdaworks/redis/api/rx/RedisGeoReactiveCommands.java
rename to src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java
index 855b949edc..aea256d2c8 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisGeoReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java
@@ -1,17 +1,14 @@
-package com.lambdaworks.redis.api.rx;
+package com.lambdaworks.redis.api.reactive;
+
+import com.lambdaworks.redis.*;
 
-import com.lambdaworks.redis.GeoArgs;
-import com.lambdaworks.redis.GeoCoordinates;
-import com.lambdaworks.redis.GeoRadiusStoreArgs;
-import com.lambdaworks.redis.GeoWithin;
 import java.util.List;
 import java.util.Set;
-import rx.Observable;
-import rx.Single;
-import rx.Completable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
- * Observable commands for the Geo-API.
+ * Reactive executed commands for the Geo-API.
  *
  * @author Mark Paluch
  * @since 4.0
@@ -28,7 +25,7 @@ public interface RedisGeoReactiveCommands<K, V> {
      * @param member the member to add
      * @return Long integer-reply the number of elements that were added to the set
      */
-    Single<Long> geoadd(K key, double longitude, double latitude, V member);
+    Mono<Long> geoadd(K key, double longitude, double latitude, V member);
 
     /**
      * Multi geo add.
@@ -37,7 +34,7 @@ public interface RedisGeoReactiveCommands<K, V> {
      * @param lngLatMember triplets of double longitude, double latitude and V member
      * @return Long integer-reply the number of elements that were added to the set
      */
-    Single<Long> geoadd(K key, Object... lngLatMember);
+    Mono<Long> geoadd(K key, Object... lngLatMember);
 
     /**
      * Retrieve Geohash strings representing the position of one or more elements in a sorted set value representing a geospatial index.
@@ -46,7 +43,7 @@ public interface RedisGeoReactiveCommands<K, V> {
      * @param members the members
      * @return bulk reply Geohash strings in the order of {@code members}. Returns {@literal null} if a member is not found.
      */
-    Observable<String> geohash(K key, V... members);
+    Flux<Value<String>> geohash(K key, V... members);
 
     /**
      * Retrieve members selected by distance with the center of {@code longitude} and {@code latitude}.
@@ -58,7 +55,7 @@ public interface RedisGeoReactiveCommands<K, V> {
      * @param unit distance unit
      * @return bulk reply
      */
-    Observable<V> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit);
+    Flux<V> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit);
 
     /**
      * Retrieve members selected by distance with the center of {@code longitude} and {@code latitude}.
@@ -71,7 +68,7 @@ public interface RedisGeoReactiveCommands<K, V> {
      * @param geoArgs args to control the result
      * @return nested multi-bulk reply. The {@link GeoWithin} contains only fields which were requested by {@link GeoArgs}
      */
-    Observable<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
+    Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
 
     /**
      * Perform a {@link #georadius(Object, double, double, double, Unit, GeoArgs)} query and store the results in a sorted set.
@@ -85,7 +82,7 @@ public interface RedisGeoReactiveCommands<K, V> {
      *        their locations a sorted set.
      * @return Long integer-reply the number of elements in the result
      */
-    Single<Long> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit, GeoRadiusStoreArgs<K> geoRadiusStoreArgs);
+    Mono<Long> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit, GeoRadiusStoreArgs<K> geoRadiusStoreArgs);
 
     /**
      * Retrieve members selected by distance with the center of {@code member}. The member itself is always contained in the
@@ -97,7 +94,7 @@ public interface RedisGeoReactiveCommands<K, V> {
      * @param unit distance unit
      * @return set of members
      */
-    Observable<V> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit);
+    Flux<V> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit);
 
     /**
      *
@@ -111,7 +108,7 @@ public interface RedisGeoReactiveCommands<K, V> {
      * @param geoArgs args to control the result
      * @return nested multi-bulk reply. The {@link GeoWithin} contains only fields which were requested by {@link GeoArgs}
      */
-    Observable<GeoWithin<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
+    Flux<GeoWithin<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
 
     /**
      * Perform a {@link #georadiusbymember(Object, Object, double, Unit, GeoArgs)} query and store the results in a sorted set.
@@ -124,7 +121,7 @@ public interface RedisGeoReactiveCommands<K, V> {
      *        their locations a sorted set.
      * @return Long integer-reply the number of elements in the result
      */
-    Single<Long> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoRadiusStoreArgs<K> geoRadiusStoreArgs);
+    Mono<Long> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoRadiusStoreArgs<K> geoRadiusStoreArgs);
 
     /**
      * Get geo coordinates for the {@code members}.
@@ -135,7 +132,7 @@ public interface RedisGeoReactiveCommands<K, V> {
      * @return a list of {@link GeoCoordinates}s representing the x,y position of each element specified in the arguments. For
      *         missing elements {@literal null} is returned.
      */
-    Observable<GeoCoordinates> geopos(K key, V... members);
+    Flux<Value<GeoCoordinates>> geopos(K key, V... members);
 
     /**
      *
@@ -150,5 +147,5 @@ public interface RedisGeoReactiveCommands<K, V> {
      * @return distance between points {@code from} and {@code to}. If one or more elements are missing {@literal null} is
      *         returned.
      */
-    Single<Double> geodist(K key, V from, V to, GeoArgs.Unit unit);
+    Mono<Double> geodist(K key, V from, V to, GeoArgs.Unit unit);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisHLLReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java
similarity index 77%
rename from src/main/java/com/lambdaworks/redis/api/rx/RedisHLLReactiveCommands.java
rename to src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java
index dc2e8a367c..9e8696b8bf 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisHLLReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java
@@ -1,11 +1,10 @@
-package com.lambdaworks.redis.api.rx;
+package com.lambdaworks.redis.api.reactive;
 
-import rx.Observable;
-import rx.Single;
-import rx.Completable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
- * Observable commands for HyperLogLog (PF* commands).
+ * Reactive executed commands for HyperLogLog (PF* commands).
  * 
  * @param <K> Key type.
  * @param <V> Value type.
@@ -25,7 +24,7 @@ public interface RedisHLLReactiveCommands<K, V> {
      *
      *         1 if at least 1 HyperLogLog internal register was altered. 0 otherwise.
      */
-    Single<Long> pfadd(K key, V... values);
+    Mono<Long> pfadd(K key, V... values);
 
     /**
      * Merge N different HyperLogLogs into a single one.
@@ -35,7 +34,7 @@ public interface RedisHLLReactiveCommands<K, V> {
      *
      * @return String simple-string-reply The command just returns {@code OK}.
      */
-    Single<String> pfmerge(K destkey, K... sourcekeys);
+    Mono<String> pfmerge(K destkey, K... sourcekeys);
 
     /**
      * Return the approximated cardinality of the set(s) observed by the HyperLogLog at key(s).
@@ -46,5 +45,5 @@ public interface RedisHLLReactiveCommands<K, V> {
      *
      *         The approximated number of unique elements observed via {@code PFADD}.
      */
-    Single<Long> pfcount(K... keys);
+    Mono<Long> pfcount(K... keys);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisHashReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java
similarity index 81%
rename from src/main/java/com/lambdaworks/redis/api/rx/RedisHashReactiveCommands.java
rename to src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java
index 01b399bcec..fe3c4ce58e 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisHashReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java
@@ -1,4 +1,4 @@
-package com.lambdaworks.redis.api.rx;
+package com.lambdaworks.redis.api.reactive;
 
 import java.util.List;
 import java.util.Map;
@@ -11,12 +11,11 @@
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
-import rx.Observable;
-import rx.Single;
-import rx.Completable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
- * Observable commands for Hashes (Key-Value pairs).
+ * Reactive executed commands for Hashes (Key-Value pairs).
  * 
  * @param <K> Key type.
  * @param <V> Value type.
@@ -34,7 +33,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @return Long integer-reply the number of fields that were removed from the hash, not including specified but non existing
      *         fields.
      */
-    Single<Long> hdel(K key, K... fields);
+    Mono<Long> hdel(K key, K... fields);
 
     /**
      * Determine if a hash field exists.
@@ -46,7 +45,7 @@ public interface RedisHashReactiveCommands<K, V> {
      *         {@literal true} if the hash contains {@code field}. {@literal false} if the hash does not contain {@code field},
      *         or {@code key} does not exist.
      */
-    Single<Boolean> hexists(K key, K field);
+    Mono<Boolean> hexists(K key, K field);
 
     /**
      * Get the value of a hash field.
@@ -56,7 +55,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @return V bulk-string-reply the value associated with {@code field}, or {@literal null} when {@code field} is not present
      *         in the hash or {@code key} does not exist.
      */
-    Single<V> hget(K key, K field);
+    Mono<V> hget(K key, K field);
 
     /**
      * Increment the integer value of a hash field by the given number.
@@ -66,7 +65,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param amount the increment type: long
      * @return Long integer-reply the value at {@code field} after the increment operation.
      */
-    Single<Long> hincrby(K key, K field, long amount);
+    Mono<Long> hincrby(K key, K field, long amount);
 
     /**
      * Increment the float value of a hash field by the given amount.
@@ -76,7 +75,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param amount the increment type: double
      * @return Double bulk-string-reply the value of {@code field} after the increment.
      */
-    Single<Double> hincrbyfloat(K key, K field, double amount);
+    Mono<Double> hincrbyfloat(K key, K field, double amount);
 
     /**
      * Get all the fields and values in a hash.
@@ -85,7 +84,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @return Map&lt;K,V&gt; array-reply list of fields and their values stored in the hash, or an empty list when {@code key}
      *         does not exist.
      */
-    Single<Map<K, V>> hgetall(K key);
+    Mono<Map<K, V>> hgetall(K key);
 
     /**
      * Stream over all the fields and values in a hash.
@@ -95,7 +94,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * 
      * @return Long count of the keys.
      */
-    Single<Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key);
+    Mono<Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key);
 
     /**
      * Get all the fields in a hash.
@@ -103,7 +102,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param key the key
      * @return K array-reply list of fields in the hash, or an empty list when {@code key} does not exist.
      */
-    Observable<K> hkeys(K key);
+    Flux<K> hkeys(K key);
 
     /**
      * Stream over all the fields in a hash.
@@ -113,7 +112,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * 
      * @return Long count of the keys.
      */
-    Single<Long> hkeys(KeyStreamingChannel<K> channel, K key);
+    Mono<Long> hkeys(KeyStreamingChannel<K> channel, K key);
 
     /**
      * Get the number of fields in a hash.
@@ -121,7 +120,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param key the key
      * @return Long integer-reply number of fields in the hash, or {@code 0} when {@code key} does not exist.
      */
-    Single<Long> hlen(K key);
+    Mono<Long> hlen(K key);
 
     /**
      * Get the values of all the given hash fields.
@@ -130,7 +129,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param fields the field type: key
      * @return V array-reply list of values associated with the given fields, in the same
      */
-    Observable<KeyValue<K, V>> hmget(K key, K... fields);
+    Flux<KeyValue<K, V>> hmget(K key, K... fields);
 
     /**
      * Stream over the values of all the given hash fields.
@@ -141,7 +140,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * 
      * @return Long count of the keys
      */
-    Single<Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields);
+    Mono<Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields);
 
     /**
      * Set multiple hash fields to multiple values.
@@ -150,7 +149,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param map the null
      * @return String simple-string-reply
      */
-    Single<String> hmset(K key, Map<K, V> map);
+    Mono<String> hmset(K key, Map<K, V> map);
 
     /**
      * Incrementally iterate hash fields and associated values.
@@ -158,7 +157,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param key the key
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
      */
-    Single<MapScanCursor<K, V>> hscan(K key);
+    Mono<MapScanCursor<K, V>> hscan(K key);
 
     /**
      * Incrementally iterate hash fields and associated values.
@@ -167,7 +166,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
      */
-    Single<MapScanCursor<K, V>> hscan(K key, ScanArgs scanArgs);
+    Mono<MapScanCursor<K, V>> hscan(K key, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate hash fields and associated values.
@@ -177,7 +176,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
      */
-    Single<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
+    Mono<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate hash fields and associated values.
@@ -186,7 +185,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
      */
-    Single<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor);
+    Mono<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor);
 
     /**
      * Incrementally iterate hash fields and associated values.
@@ -195,7 +194,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param key the key
      * @return StreamScanCursor scan cursor.
      */
-    Single<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key);
+    Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key);
 
     /**
      * Incrementally iterate hash fields and associated values.
@@ -205,7 +204,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
      */
-    Single<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanArgs scanArgs);
+    Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate hash fields and associated values.
@@ -216,7 +215,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
      */
-    Single<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
+    Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate hash fields and associated values.
@@ -226,7 +225,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return StreamScanCursor scan cursor.
      */
-    Single<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor);
+    Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor);
 
     /**
      * Set the string value of a hash field.
@@ -239,7 +238,7 @@ public interface RedisHashReactiveCommands<K, V> {
      *         {@literal true} if {@code field} is a new field in the hash and {@code value} was set. {@literal false} if
      *         {@code field} already exists in the hash and the value was updated.
      */
-    Single<Boolean> hset(K key, K field, V value);
+    Mono<Boolean> hset(K key, K field, V value);
 
     /**
      * Set the value of a hash field, only if the field does not exist.
@@ -252,7 +251,7 @@ public interface RedisHashReactiveCommands<K, V> {
      *         {@code 1} if {@code field} is a new field in the hash and {@code value} was set. {@code 0} if {@code field}
      *         already exists in the hash and no operation was performed.
      */
-    Single<Boolean> hsetnx(K key, K field, V value);
+    Mono<Boolean> hsetnx(K key, K field, V value);
 
     /**
      * Get the string length of the field value in a hash.
@@ -262,7 +261,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @return Long integer-reply the string length of the {@code field} value, or {@code 0} when {@code field} is not present
      *         in the hash or {@code key} does not exist at all.
      */
-    Single<Long> hstrlen(K key, K field);
+    Mono<Long> hstrlen(K key, K field);
 
     /**
      * Get all the values in a hash.
@@ -270,7 +269,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param key the key
      * @return V array-reply list of values in the hash, or an empty list when {@code key} does not exist.
      */
-    Observable<V> hvals(K key);
+    Flux<V> hvals(K key);
 
     /**
      * Stream over all the values in a hash.
@@ -280,5 +279,5 @@ public interface RedisHashReactiveCommands<K, V> {
      *
      * @return Long count of the keys.
      */
-    Single<Long> hvals(ValueStreamingChannel<V> channel, K key);
+    Mono<Long> hvals(ValueStreamingChannel<V> channel, K key);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisKeyReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java
similarity index 82%
rename from src/main/java/com/lambdaworks/redis/api/rx/RedisKeyReactiveCommands.java
rename to src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java
index 18411f7af7..bf31d9fd27 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisKeyReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java
@@ -1,4 +1,4 @@
-package com.lambdaworks.redis.api.rx;
+package com.lambdaworks.redis.api.reactive;
 
 import java.util.Date;
 import java.util.List;
@@ -11,12 +11,11 @@
 import com.lambdaworks.redis.StreamScanCursor;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
-import rx.Observable;
-import rx.Single;
-import rx.Completable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
- * Observable commands for Keys (Key manipulation/querying).
+ * Reactive executed commands for Keys (Key manipulation/querying).
  * 
  * @param <K> Key type.
  * @param <V> Value type.
@@ -32,7 +31,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long integer-reply The number of keys that were removed.
      */
-    Single<Long> del(K... keys);
+    Mono<Long> del(K... keys);
 
     /**
      * Unlink one or more keys (non blocking DEL).
@@ -40,7 +39,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long integer-reply The number of keys that were removed.
      */
-    Single<Long> unlink(K... keys);
+    Mono<Long> unlink(K... keys);
 
     /**
      * Return a serialized version of the value stored at the specified key.
@@ -48,7 +47,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param key the key
      * @return byte[] bulk-string-reply the serialized value.
      */
-    Single<byte[]> dump(K key);
+    Mono<byte[]> dump(K key);
 
     /**
      * Determine how many keys exist.
@@ -56,7 +55,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long integer-reply specifically: Number of existing keys
      */
-    Single<Long> exists(K... keys);
+    Mono<Long> exists(K... keys);
 
     /**
      * Set a key's time to live in seconds.
@@ -68,7 +67,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set.
      */
-    Single<Boolean> expire(K key, long seconds);
+    Mono<Boolean> expire(K key, long seconds);
 
     /**
      * Set the expiration for a key as a UNIX timestamp.
@@ -80,7 +79,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
-    Single<Boolean> expireat(K key, Date timestamp);
+    Mono<Boolean> expireat(K key, Date timestamp);
 
     /**
      * Set the expiration for a key as a UNIX timestamp.
@@ -92,7 +91,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
-    Single<Boolean> expireat(K key, long timestamp);
+    Mono<Boolean> expireat(K key, long timestamp);
 
     /**
      * Find all keys matching the given pattern.
@@ -100,7 +99,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param pattern the pattern type: patternkey (pattern)
      * @return K array-reply list of keys matching {@code pattern}.
      */
-    Observable<K> keys(K pattern);
+    Flux<K> keys(K pattern);
 
     /**
      * Find all keys matching the given pattern.
@@ -109,7 +108,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param pattern the pattern
      * @return Long array-reply list of keys matching {@code pattern}.
      */
-    Single<Long> keys(KeyStreamingChannel<K> channel, K pattern);
+    Mono<Long> keys(KeyStreamingChannel<K> channel, K pattern);
 
     /**
      * Atomically transfer a key from a Redis instance to another one.
@@ -121,7 +120,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param timeout the timeout in milliseconds
      * @return String simple-string-reply The command returns OK on success.
      */
-    Single<String> migrate(String host, int port, K key, int db, long timeout);
+    Mono<String> migrate(String host, int port, K key, int db, long timeout);
 
     /**
      * Atomically transfer one or more keys from a Redis instance to another one.
@@ -133,7 +132,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param migrateArgs migrate args that allow to configure further options
      * @return String simple-string-reply The command returns OK on success.
      */
-    Single<String> migrate(String host, int port, int db, long timeout, MigrateArgs<K> migrateArgs);
+    Mono<String> migrate(String host, int port, int db, long timeout, MigrateArgs<K> migrateArgs);
 
     /**
      * Move a key to another database.
@@ -142,7 +141,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param db the db type: long
      * @return Boolean integer-reply specifically:
      */
-    Single<Boolean> move(K key, int db);
+    Mono<Boolean> move(K key, int db);
 
     /**
      * returns the kind of internal representation used in order to store the value associated with a key.
@@ -150,7 +149,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param key the key
      * @return String
      */
-    Single<String> objectEncoding(K key);
+    Mono<String> objectEncoding(K key);
 
     /**
      * returns the number of seconds since the object stored at the specified key is idle (not requested by read or write
@@ -159,7 +158,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param key the key
      * @return number of seconds since the object stored at the specified key is idle.
      */
-    Single<Long> objectIdletime(K key);
+    Mono<Long> objectIdletime(K key);
 
     /**
      * returns the number of references of the value associated with the specified key.
@@ -167,7 +166,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param key the key
      * @return Long
      */
-    Single<Long> objectRefcount(K key);
+    Mono<Long> objectRefcount(K key);
 
     /**
      * Remove the expiration from a key.
@@ -178,7 +177,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      *         {@literal true} if the timeout was removed. {@literal false} if {@code key} does not exist or does not have an
      *         associated timeout.
      */
-    Single<Boolean> persist(K key);
+    Mono<Boolean> persist(K key);
 
     /**
      * Set a key's time to live in milliseconds.
@@ -190,7 +189,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set.
      */
-    Single<Boolean> pexpire(K key, long milliseconds);
+    Mono<Boolean> pexpire(K key, long milliseconds);
 
     /**
      * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
@@ -202,7 +201,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
-    Single<Boolean> pexpireat(K key, Date timestamp);
+    Mono<Boolean> pexpireat(K key, Date timestamp);
 
     /**
      * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
@@ -214,7 +213,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
-    Single<Boolean> pexpireat(K key, long timestamp);
+    Mono<Boolean> pexpireat(K key, long timestamp);
 
     /**
      * Get the time to live for a key in milliseconds.
@@ -223,14 +222,14 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @return Long integer-reply TTL in milliseconds, or a negative value in order to signal an error (see the description
      *         above).
      */
-    Single<Long> pttl(K key);
+    Mono<Long> pttl(K key);
 
     /**
      * Return a random key from the keyspace.
      * 
      * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
      */
-    Single<V> randomkey();
+    Mono<V> randomkey();
 
     /**
      * Rename a key.
@@ -239,7 +238,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param newKey the newkey type: key
      * @return String simple-string-reply
      */
-    Single<String> rename(K key, K newKey);
+    Mono<String> rename(K key, K newKey);
 
     /**
      * Rename a key, only if the new key does not exist.
@@ -250,7 +249,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * 
      *         {@literal true} if {@code key} was renamed to {@code newkey}. {@literal false} if {@code newkey} already exists.
      */
-    Single<Boolean> renamenx(K key, K newKey);
+    Mono<Boolean> renamenx(K key, K newKey);
 
     /**
      * Create a key using the provided serialized value, previously obtained using DUMP.
@@ -260,7 +259,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param value the serialized-value type: string
      * @return String simple-string-reply The command returns OK on success.
      */
-    Single<String> restore(K key, long ttl, byte[] value);
+    Mono<String> restore(K key, long ttl, byte[] value);
 
     /**
      * Sort the elements in a list, set or sorted set.
@@ -268,7 +267,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param key the key
      * @return V array-reply list of sorted elements.
      */
-    Observable<V> sort(K key);
+    Flux<V> sort(K key);
 
     /**
      * Sort the elements in a list, set or sorted set.
@@ -277,7 +276,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param key the key
      * @return Long number of values.
      */
-    Single<Long> sort(ValueStreamingChannel<V> channel, K key);
+    Mono<Long> sort(ValueStreamingChannel<V> channel, K key);
 
     /**
      * Sort the elements in a list, set or sorted set.
@@ -286,7 +285,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param sortArgs sort arguments
      * @return V array-reply list of sorted elements.
      */
-    Observable<V> sort(K key, SortArgs sortArgs);
+    Flux<V> sort(K key, SortArgs sortArgs);
 
     /**
      * Sort the elements in a list, set or sorted set.
@@ -296,7 +295,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param sortArgs sort arguments
      * @return Long number of values.
      */
-    Single<Long> sort(ValueStreamingChannel<V> channel, K key, SortArgs sortArgs);
+    Mono<Long> sort(ValueStreamingChannel<V> channel, K key, SortArgs sortArgs);
 
     /**
      * Sort the elements in a list, set or sorted set.
@@ -306,7 +305,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param destination the destination key to store sort results
      * @return Long number of values.
      */
-    Single<Long> sortStore(K key, SortArgs sortArgs, K destination);
+    Mono<Long> sortStore(K key, SortArgs sortArgs, K destination);
 
     /**
      * Touch one or more keys. Touch sets the last accessed time for a key. Non-exsitent keys wont get created.
@@ -314,7 +313,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long integer-reply the number of found keys.
      */
-    Single<Long> touch(K... keys);
+    Mono<Long> touch(K... keys);
 
     /**
      * Get the time to live for a key.
@@ -322,7 +321,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param key the key
      * @return Long integer-reply TTL in seconds, or a negative value in order to signal an error (see the description above).
      */
-    Single<Long> ttl(K key);
+    Mono<Long> ttl(K key);
 
     /**
      * Determine the type stored at key.
@@ -330,14 +329,14 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param key the key
      * @return String simple-string-reply type of {@code key}, or {@code none} when {@code key} does not exist.
      */
-    Single<String> type(K key);
+    Mono<String> type(K key);
 
     /**
      * Incrementally iterate the keys space.
      * 
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
-    Single<KeyScanCursor<K>> scan();
+    Mono<KeyScanCursor<K>> scan();
 
     /**
      * Incrementally iterate the keys space.
@@ -345,7 +344,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
-    Single<KeyScanCursor<K>> scan(ScanArgs scanArgs);
+    Mono<KeyScanCursor<K>> scan(ScanArgs scanArgs);
 
     /**
      * Incrementally iterate the keys space.
@@ -354,7 +353,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
-    Single<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs);
+    Mono<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate the keys space.
@@ -362,7 +361,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
-    Single<KeyScanCursor<K>> scan(ScanCursor scanCursor);
+    Mono<KeyScanCursor<K>> scan(ScanCursor scanCursor);
 
     /**
      * Incrementally iterate the keys space.
@@ -370,7 +369,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param channel streaming channel that receives a call for every key
      * @return StreamScanCursor scan cursor.
      */
-    Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel);
+    Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel);
 
     /**
      * Incrementally iterate the keys space.
@@ -379,7 +378,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
      */
-    Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs);
+    Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate the keys space.
@@ -389,7 +388,7 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
      */
-    Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs);
+    Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate the keys space.
@@ -398,5 +397,5 @@ public interface RedisKeyReactiveCommands<K, V> {
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return StreamScanCursor scan cursor.
      */
-    Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor);
+    Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisListReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java
similarity index 83%
rename from src/main/java/com/lambdaworks/redis/api/rx/RedisListReactiveCommands.java
rename to src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java
index 24f98351e9..c9f8cbbc37 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisListReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java
@@ -1,14 +1,13 @@
-package com.lambdaworks.redis.api.rx;
+package com.lambdaworks.redis.api.reactive;
 
 import java.util.List;
 import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
-import rx.Observable;
-import rx.Single;
-import rx.Completable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
- * Observable commands for Lists.
+ * Reactive executed commands for Lists.
  * 
  * @param <K> Key type.
  * @param <V> Value type.
@@ -29,7 +28,7 @@ public interface RedisListReactiveCommands<K, V> {
      *         with the first element being the name of the key where an element was popped and the second element being the
      *         value of the popped element.
      */
-    Single<KeyValue<K, V>> blpop(long timeout, K... keys);
+    Mono<KeyValue<K, V>> blpop(long timeout, K... keys);
 
     /**
      * Remove and get the last element in a list, or block until one is available.
@@ -42,7 +41,7 @@ public interface RedisListReactiveCommands<K, V> {
      *         with the first element being the name of the key where an element was popped and the second element being the
      *         value of the popped element.
      */
-    Single<KeyValue<K, V>> brpop(long timeout, K... keys);
+    Mono<KeyValue<K, V>> brpop(long timeout, K... keys);
 
     /**
      * Pop a value from a list, push it to another list and return it; or block until one is available.
@@ -53,7 +52,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @return V bulk-string-reply the element being popped from {@code source} and pushed to {@code destination}. If
      *         {@code timeout} is reached, a
      */
-    Single<V> brpoplpush(long timeout, K source, K destination);
+    Mono<V> brpoplpush(long timeout, K source, K destination);
 
     /**
      * Get an element from a list by its index.
@@ -62,7 +61,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param index the index type: long
      * @return V bulk-string-reply the requested element, or {@literal null} when {@code index} is out of range.
      */
-    Single<V> lindex(K key, long index);
+    Mono<V> lindex(K key, long index);
 
     /**
      * Insert an element before or after another element in a list.
@@ -74,7 +73,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @return Long integer-reply the length of the list after the insert operation, or {@code -1} when the value {@code pivot}
      *         was not found.
      */
-    Single<Long> linsert(K key, boolean before, V pivot, V value);
+    Mono<Long> linsert(K key, boolean before, V pivot, V value);
 
     /**
      * Get the length of a list.
@@ -82,7 +81,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param key the key
      * @return Long integer-reply the length of the list at {@code key}.
      */
-    Single<Long> llen(K key);
+    Mono<Long> llen(K key);
 
     /**
      * Remove and get the first element in a list.
@@ -90,7 +89,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param key the key
      * @return V bulk-string-reply the value of the first element, or {@literal null} when {@code key} does not exist.
      */
-    Single<V> lpop(K key);
+    Mono<V> lpop(K key);
 
     /**
      * Prepend one or multiple values to a list.
@@ -99,7 +98,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param values the value
      * @return Long integer-reply the length of the list after the push operations.
      */
-    Single<Long> lpush(K key, V... values);
+    Mono<Long> lpush(K key, V... values);
 
     /**
      * Prepend values to a list, only if the list exists.
@@ -108,7 +107,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param values the values
      * @return Long integer-reply the length of the list after the push operation.
      */
-    Single<Long> lpushx(K key, V... values);
+    Mono<Long> lpushx(K key, V... values);
 
     /**
      * Get a range of elements from a list.
@@ -118,7 +117,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param stop the stop type: long
      * @return V array-reply list of elements in the specified range.
      */
-    Observable<V> lrange(K key, long start, long stop);
+    Flux<V> lrange(K key, long start, long stop);
 
     /**
      * Get a range of elements from a list.
@@ -129,7 +128,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param stop the stop type: long
      * @return Long count of elements in the specified range.
      */
-    Single<Long> lrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+    Mono<Long> lrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
 
     /**
      * Remove elements from a list.
@@ -139,7 +138,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param value the value
      * @return Long integer-reply the number of removed elements.
      */
-    Single<Long> lrem(K key, long count, V value);
+    Mono<Long> lrem(K key, long count, V value);
 
     /**
      * Set the value of an element in a list by its index.
@@ -149,7 +148,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param value the value
      * @return String simple-string-reply
      */
-    Single<String> lset(K key, long index, V value);
+    Mono<String> lset(K key, long index, V value);
 
     /**
      * Trim a list to the specified range.
@@ -159,7 +158,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param stop the stop type: long
      * @return String simple-string-reply
      */
-    Single<String> ltrim(K key, long start, long stop);
+    Mono<String> ltrim(K key, long start, long stop);
 
     /**
      * Remove and get the last element in a list.
@@ -167,7 +166,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param key the key
      * @return V bulk-string-reply the value of the last element, or {@literal null} when {@code key} does not exist.
      */
-    Single<V> rpop(K key);
+    Mono<V> rpop(K key);
 
     /**
      * Remove the last element in a list, append it to another list and return it.
@@ -176,7 +175,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param destination the destination type: key
      * @return V bulk-string-reply the element being popped and pushed.
      */
-    Single<V> rpoplpush(K source, K destination);
+    Mono<V> rpoplpush(K source, K destination);
 
     /**
      * Append one or multiple values to a list.
@@ -185,7 +184,7 @@ public interface RedisListReactiveCommands<K, V> {
      * @param values the value
      * @return Long integer-reply the length of the list after the push operation.
      */
-    Single<Long> rpush(K key, V... values);
+    Mono<Long> rpush(K key, V... values);
 
     /**
      * Append values to a list, only if the list exists.
@@ -194,5 +193,5 @@ public interface RedisListReactiveCommands<K, V> {
      * @param values the values
      * @return Long integer-reply the length of the list after the push operation.
      */
-    Single<Long> rpushx(K key, V... values);
+    Mono<Long> rpushx(K key, V... values);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java
similarity index 85%
rename from src/main/java/com/lambdaworks/redis/api/rx/RedisReactiveCommands.java
rename to src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java
index 1c3901423a..cc8a08962c 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java
@@ -1,12 +1,11 @@
-package com.lambdaworks.redis.api.rx;
+package com.lambdaworks.redis.api.reactive;
 
 import java.util.concurrent.TimeUnit;
 
-import rx.Observable;
-
 import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.api.rx.RedisClusterReactiveCommands;
-import rx.Single;
+import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands;
+
+import reactor.core.publisher.Mono;
 
 /**
  * A complete reactive and thread-safe Redis API with 400+ Methods.
@@ -14,7 +13,7 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
- * @since 4.0
+ * @since 5.0
  */
 public interface RedisReactiveCommands<K, V> extends RedisHashReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>,
         RedisStringReactiveCommands<K, V>, RedisListReactiveCommands<K, V>, RedisSetReactiveCommands<K, V>,
@@ -36,7 +35,7 @@ public interface RedisReactiveCommands<K, V> extends RedisHashReactiveCommands<K
      * @param password the password
      * @return String simple-string-reply
      */
-    Single<String> auth(String password);
+    Mono<String> auth(String password);
 
     /**
      * Change the selected database for the current connection.
@@ -44,7 +43,7 @@ public interface RedisReactiveCommands<K, V> extends RedisHashReactiveCommands<K
      * @param db the database number
      * @return String simple-string-reply
      */
-    Single<String> select(int db);
+    Mono<String> select(int db);
 
     /**
      * @return the underlying connection.
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisScriptingReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisScriptingReactiveCommands.java
similarity index 78%
rename from src/main/java/com/lambdaworks/redis/api/rx/RedisScriptingReactiveCommands.java
rename to src/main/java/com/lambdaworks/redis/api/reactive/RedisScriptingReactiveCommands.java
index ceb47dee70..56e3a2ed3a 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisScriptingReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisScriptingReactiveCommands.java
@@ -1,13 +1,12 @@
-package com.lambdaworks.redis.api.rx;
+package com.lambdaworks.redis.api.reactive;
 
 import java.util.List;
 import com.lambdaworks.redis.ScriptOutputType;
-import rx.Observable;
-import rx.Single;
-import rx.Completable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
- * Observable commands for Scripting.
+ * Reactive executed commands for Scripting.
  * 
  * @param <K> Key type.
  * @param <V> Value type.
@@ -26,7 +25,7 @@ public interface RedisScriptingReactiveCommands<K, V> {
      * @param <T> expected return type
      * @return script result
      */
-    <T> Observable<T> eval(String script, ScriptOutputType type, K... keys);
+    <T> Flux<T> eval(String script, ScriptOutputType type, K... keys);
 
     /**
      * Execute a Lua script server side.
@@ -38,7 +37,7 @@ public interface RedisScriptingReactiveCommands<K, V> {
      * @param <T> expected return type
      * @return script result
      */
-    <T> Observable<T> eval(String script, ScriptOutputType type, K[] keys, V... values);
+    <T> Flux<T> eval(String script, ScriptOutputType type, K[] keys, V... values);
 
     /**
      * Evaluates a script cached on the server side by its SHA1 digest
@@ -49,7 +48,7 @@ public interface RedisScriptingReactiveCommands<K, V> {
      * @param <T> expected return type
      * @return script result
      */
-    <T> Observable<T> evalsha(String digest, ScriptOutputType type, K... keys);
+    <T> Flux<T> evalsha(String digest, ScriptOutputType type, K... keys);
 
     /**
      * Execute a Lua script server side.
@@ -61,7 +60,7 @@ public interface RedisScriptingReactiveCommands<K, V> {
      * @param <T> expected return type
      * @return script result
      */
-    <T> Observable<T> evalsha(String digest, ScriptOutputType type, K[] keys, V... values);
+    <T> Flux<T> evalsha(String digest, ScriptOutputType type, K[] keys, V... values);
 
     /**
      * Check existence of scripts in the script cache.
@@ -71,21 +70,21 @@ public interface RedisScriptingReactiveCommands<K, V> {
      *         digest arguments. For every corresponding SHA1 digest of a script that actually exists in the script cache, an 1
      *         is returned, otherwise 0 is returned.
      */
-    Observable<Boolean> scriptExists(String... digests);
+    Flux<Boolean> scriptExists(String... digests);
 
     /**
      * Remove all the scripts from the script cache.
      * 
      * @return String simple-string-reply
      */
-    Single<String> scriptFlush();
+    Mono<String> scriptFlush();
 
     /**
      * Kill the script currently in execution.
      * 
      * @return String simple-string-reply
      */
-    Single<String> scriptKill();
+    Mono<String> scriptKill();
 
     /**
      * Load the specified Lua script into the script cache.
@@ -93,7 +92,7 @@ public interface RedisScriptingReactiveCommands<K, V> {
      * @param script script content
      * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
      */
-    Single<String> scriptLoad(V script);
+    Mono<String> scriptLoad(V script);
 
     /**
      * Create a SHA1 digest from a Lua script.
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisServerReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
similarity index 80%
rename from src/main/java/com/lambdaworks/redis/api/rx/RedisServerReactiveCommands.java
rename to src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
index 883904d090..788b88b074 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisServerReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
@@ -1,15 +1,14 @@
-package com.lambdaworks.redis.api.rx;
+package com.lambdaworks.redis.api.reactive;
 
 import java.util.Date;
 import java.util.List;
 import com.lambdaworks.redis.KillArgs;
 import com.lambdaworks.redis.protocol.CommandType;
-import rx.Observable;
-import rx.Single;
-import rx.Completable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
- * Observable commands for Server Control.
+ * Reactive executed commands for Server Control.
  * 
  * @param <K> Key type.
  * @param <V> Value type.
@@ -24,21 +23,21 @@ public interface RedisServerReactiveCommands<K, V> {
      * 
      * @return String simple-string-reply always {@code OK}.
      */
-    Single<String> bgrewriteaof();
+    Mono<String> bgrewriteaof();
 
     /**
      * Asynchronously save the dataset to disk.
      * 
      * @return String simple-string-reply
      */
-    Single<String> bgsave();
+    Mono<String> bgsave();
 
     /**
      * Get the current connection name.
      * 
      * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set.
      */
-    Single<K> clientGetname();
+    Mono<K> clientGetname();
 
     /**
      * Set the current connection name.
@@ -46,7 +45,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param name the client name
      * @return simple-string-reply {@code OK} if the connection name was successfully set.
      */
-    Single<String> clientSetname(K name);
+    Mono<String> clientSetname(K name);
 
     /**
      * Kill the connection of a client identified by ip:port.
@@ -54,7 +53,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param addr ip:port
      * @return String simple-string-reply {@code OK} if the connection exists and has been closed
      */
-    Single<String> clientKill(String addr);
+    Mono<String> clientKill(String addr);
 
     /**
      * Kill connections of clients which are filtered by {@code killArgs}
@@ -62,7 +61,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param killArgs args for the kill operation
      * @return Long integer-reply number of killed connections
      */
-    Single<Long> clientKill(KillArgs killArgs);
+    Mono<Long> clientKill(KillArgs killArgs);
 
     /**
      * Stop processing commands from clients for some time.
@@ -70,7 +69,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param timeout the timeout value in milliseconds
      * @return String simple-string-reply The command returns OK or an error if the timeout is invalid.
      */
-    Single<String> clientPause(long timeout);
+    Mono<String> clientPause(long timeout);
 
     /**
      * Get the list of client connections.
@@ -78,14 +77,14 @@ public interface RedisServerReactiveCommands<K, V> {
      * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF),
      *         each line is composed of a succession of property=value fields separated by a space character.
      */
-    Single<String> clientList();
+    Mono<String> clientList();
 
     /**
      * Returns an array reply of details about all Redis commands.
      * 
      * @return Object array-reply
      */
-    Observable<Object> command();
+    Flux<Object> command();
 
     /**
      * Returns an array reply of details about the requested commands.
@@ -93,7 +92,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param commands the commands to query for
      * @return Object array-reply
      */
-    Observable<Object> commandInfo(String... commands);
+    Flux<Object> commandInfo(String... commands);
 
     /**
      * Returns an array reply of details about the requested commands.
@@ -101,14 +100,14 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param commands the commands to query for
      * @return Object array-reply
      */
-    Observable<Object> commandInfo(CommandType... commands);
+    Flux<Object> commandInfo(CommandType... commands);
 
     /**
      * Get total number of Redis commands.
      * 
      * @return Long integer-reply of number of total commands in this Redis server.
      */
-    Single<Long> commandCount();
+    Mono<Long> commandCount();
 
     /**
      * Get the value of a configuration parameter.
@@ -116,14 +115,14 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param parameter name of the parameter
      * @return String bulk-string-reply
      */
-    Observable<String> configGet(String parameter);
+    Flux<String> configGet(String parameter);
 
     /**
      * Reset the stats returned by INFO.
      * 
      * @return String simple-string-reply always {@code OK}.
      */
-    Single<String> configResetstat();
+    Mono<String> configResetstat();
 
     /**
      * Rewrite the configuration file with the in memory configuration.
@@ -131,7 +130,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * @return String simple-string-reply {@code OK} when the configuration was rewritten properly. Otherwise an error is
      *         returned.
      */
-    Single<String> configRewrite();
+    Mono<String> configRewrite();
 
     /**
      * Set a configuration parameter to the given value.
@@ -140,21 +139,21 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param value the parameter value
      * @return String simple-string-reply: {@code OK} when the configuration was set properly. Otherwise an error is returned.
      */
-    Single<String> configSet(String parameter, String value);
+    Mono<String> configSet(String parameter, String value);
 
     /**
      * Return the number of keys in the selected database.
      * 
      * @return Long integer-reply
      */
-    Single<Long> dbsize();
+    Mono<Long> dbsize();
 
     /**
      * Crash and recover
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
-    Single<String> debugCrashAndRecover(Long delay);
+    Mono<String> debugCrashAndRecover(Long delay);
 
     /**
      * Get debugging information about the internal hash-table state.
@@ -162,7 +161,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param db the database number
      * @return String simple-string-reply
      */
-    Single<String> debugHtstats(int db);
+    Mono<String> debugHtstats(int db);
 
     /**
      * Get debugging information about a key.
@@ -170,35 +169,35 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param key the key
      * @return String simple-string-reply
      */
-    Single<String> debugObject(K key);
+    Mono<String> debugObject(K key);
 
     /**
      * Make the server crash: Out of memory.
      *
      * @return nothing, because the server crashes before returning.
      */
-    Completable debugOom();
+    Mono<Void> debugOom();
 
     /**
      * Make the server crash: Invalid pointer access.
      *
      * @return nothing, because the server crashes before returning.
      */
-    Completable debugSegfault();
+    Mono<Void> debugSegfault();
 
     /**
      * Save RDB, clear the database and reload RDB.
      *
      * @return String simple-string-reply The commands returns OK on success.
      */
-    Single<String> debugReload();
+    Mono<String> debugReload();
 
     /**
      * Restart the server gracefully.
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
-    Single<String> debugRestart(Long delay);
+    Mono<String> debugRestart(Long delay);
 
     /**
      * Get debugging information about the internal SDS length.
@@ -206,42 +205,42 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param key the key
      * @return String simple-string-reply
      */
-    Single<String> debugSdslen(K key);
+    Mono<String> debugSdslen(K key);
 
     /**
      * Remove all keys from all databases.
      * 
      * @return String simple-string-reply
      */
-    Single<String> flushall();
+    Mono<String> flushall();
 
     /**
      * Remove all keys asynchronously from all databases.
      *
      * @return String simple-string-reply
      */
-    Single<String> flushallAsync();
+    Mono<String> flushallAsync();
 
     /**
      * Remove all keys from the current database.
      * 
      * @return String simple-string-reply
      */
-    Single<String> flushdb();
+    Mono<String> flushdb();
 
     /**
      * Remove all keys asynchronously from the current database.
      *
      * @return String simple-string-reply
      */
-    Single<String> flushdbAsync();
+    Mono<String> flushdbAsync();
 
     /**
      * Get information and statistics about the server.
      * 
      * @return String bulk-string-reply as a collection of text lines.
      */
-    Single<String> info();
+    Mono<String> info();
 
     /**
      * Get information and statistics about the server.
@@ -249,28 +248,28 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param section the section type: string
      * @return String bulk-string-reply as a collection of text lines.
      */
-    Single<String> info(String section);
+    Mono<String> info(String section);
 
     /**
      * Get the UNIX time stamp of the last successful save to disk.
      * 
      * @return Date integer-reply an UNIX time stamp.
      */
-    Single<Date> lastsave();
+    Mono<Date> lastsave();
 
     /**
      * Synchronously save the dataset to disk.
      * 
      * @return String simple-string-reply The commands returns OK on success.
      */
-    Single<String> save();
+    Mono<String> save();
 
     /**
      * Synchronously save the dataset to disk and then shut down the server.
      * 
      * @param save {@literal true} force save operation
      */
-    Completable shutdown(boolean save);
+    Mono<Void> shutdown(boolean save);
 
     /**
      * Make the server a slave of another instance, or promote it as master.
@@ -279,21 +278,21 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param port the port type: string
      * @return String simple-string-reply
      */
-    Single<String> slaveof(String host, int port);
+    Mono<String> slaveof(String host, int port);
 
     /**
      * Promote server as master.
      * 
      * @return String simple-string-reply
      */
-    Single<String> slaveofNoOne();
+    Mono<String> slaveofNoOne();
 
     /**
      * Read the slow log.
      * 
      * @return Object deeply nested multi bulk replies
      */
-    Observable<Object> slowlogGet();
+    Flux<Object> slowlogGet();
 
     /**
      * Read the slow log.
@@ -301,21 +300,21 @@ public interface RedisServerReactiveCommands<K, V> {
      * @param count the count
      * @return Object deeply nested multi bulk replies
      */
-    Observable<Object> slowlogGet(int count);
+    Flux<Object> slowlogGet(int count);
 
     /**
      * Obtaining the current length of the slow log.
      * 
      * @return Long length of the slow log.
      */
-    Single<Long> slowlogLen();
+    Mono<Long> slowlogLen();
 
     /**
      * Resetting the slow log.
      * 
      * @return String simple-string-reply The commands returns OK on success.
      */
-    Single<String> slowlogReset();
+    Mono<String> slowlogReset();
 
     /**
      * Return the current server time.
@@ -326,5 +325,5 @@ public interface RedisServerReactiveCommands<K, V> {
      * 
      *         unix time in seconds. microseconds.
      */
-    Observable<V> time();
+    Flux<V> time();
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisSetReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java
similarity index 80%
rename from src/main/java/com/lambdaworks/redis/api/rx/RedisSetReactiveCommands.java
rename to src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java
index 15bce1cc47..23fbbf65a3 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisSetReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java
@@ -1,4 +1,4 @@
-package com.lambdaworks.redis.api.rx;
+package com.lambdaworks.redis.api.reactive;
 
 import java.util.Set;
 import com.lambdaworks.redis.ScanArgs;
@@ -6,12 +6,11 @@
 import com.lambdaworks.redis.StreamScanCursor;
 import com.lambdaworks.redis.ValueScanCursor;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
-import rx.Observable;
-import rx.Single;
-import rx.Completable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
- * Observable commands for Sets.
+ * Reactive executed commands for Sets.
  * 
  * @param <K> Key type.
  * @param <V> Value type.
@@ -29,7 +28,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @return Long integer-reply the number of elements that were added to the set, not including all the elements already
      *         present into the set.
      */
-    Single<Long> sadd(K key, V... members);
+    Mono<Long> sadd(K key, V... members);
 
     /**
      * Get the number of members in a set.
@@ -38,7 +37,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @return Long integer-reply the cardinality (number of elements) of the set, or {@literal false} if {@code key} does not
      *         exist.
      */
-    Single<Long> scard(K key);
+    Mono<Long> scard(K key);
 
     /**
      * Subtract multiple sets.
@@ -46,7 +45,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param keys the key
      * @return V array-reply list with members of the resulting set.
      */
-    Observable<V> sdiff(K... keys);
+    Flux<V> sdiff(K... keys);
 
     /**
      * Subtract multiple sets.
@@ -55,7 +54,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long count of members of the resulting set.
      */
-    Single<Long> sdiff(ValueStreamingChannel<V> channel, K... keys);
+    Mono<Long> sdiff(ValueStreamingChannel<V> channel, K... keys);
 
     /**
      * Subtract multiple sets and store the resulting set in a key.
@@ -64,7 +63,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
      */
-    Single<Long> sdiffstore(K destination, K... keys);
+    Mono<Long> sdiffstore(K destination, K... keys);
 
     /**
      * Intersect multiple sets.
@@ -72,7 +71,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param keys the key
      * @return V array-reply list with members of the resulting set.
      */
-    Observable<V> sinter(K... keys);
+    Flux<V> sinter(K... keys);
 
     /**
      * Intersect multiple sets.
@@ -81,7 +80,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long count of members of the resulting set.
      */
-    Single<Long> sinter(ValueStreamingChannel<V> channel, K... keys);
+    Mono<Long> sinter(ValueStreamingChannel<V> channel, K... keys);
 
     /**
      * Intersect multiple sets and store the resulting set in a key.
@@ -90,7 +89,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
      */
-    Single<Long> sinterstore(K destination, K... keys);
+    Mono<Long> sinterstore(K destination, K... keys);
 
     /**
      * Determine if a given value is a member of a set.
@@ -102,7 +101,7 @@ public interface RedisSetReactiveCommands<K, V> {
      *         {@literal true} if the element is a member of the set. {@literal false} if the element is not a member of the
      *         set, or if {@code key} does not exist.
      */
-    Single<Boolean> sismember(K key, V member);
+    Mono<Boolean> sismember(K key, V member);
 
     /**
      * Move a member from one set to another.
@@ -115,7 +114,7 @@ public interface RedisSetReactiveCommands<K, V> {
      *         {@literal true} if the element is moved. {@literal false} if the element is not a member of {@code source} and no
      *         operation was performed.
      */
-    Single<Boolean> smove(K source, K destination, V member);
+    Mono<Boolean> smove(K source, K destination, V member);
 
     /**
      * Get all the members in a set.
@@ -123,7 +122,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param key the key
      * @return V array-reply all elements of the set.
      */
-    Observable<V> smembers(K key);
+    Flux<V> smembers(K key);
 
     /**
      * Get all the members in a set.
@@ -132,7 +131,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param key the keys
      * @return Long count of members of the resulting set.
      */
-    Single<Long> smembers(ValueStreamingChannel<V> channel, K key);
+    Mono<Long> smembers(ValueStreamingChannel<V> channel, K key);
 
     /**
      * Remove and return a random member from a set.
@@ -140,7 +139,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param key the key
      * @return V bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist.
      */
-    Single<V> spop(K key);
+    Mono<V> spop(K key);
 
     /**
      * Remove and return one or multiple random members from a set.
@@ -149,7 +148,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param count number of members to pop
      * @return V bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist.
      */
-    Observable<V> spop(K key, long count);
+    Flux<V> spop(K key, long count);
 
     /**
      * Get one random member from a set.
@@ -159,7 +158,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply with the
      *         randomly selected element, or {@literal null} when {@code key} does not exist.
      */
-    Single<V> srandmember(K key);
+    Mono<V> srandmember(K key);
 
     /**
      * Get one or multiple random members from a set.
@@ -169,7 +168,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply
      *         with the randomly selected element, or {@literal null} when {@code key} does not exist.
      */
-    Observable<V> srandmember(K key, long count);
+    Flux<V> srandmember(K key, long count);
 
     /**
      * Get one or multiple random members from a set.
@@ -179,7 +178,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of members of the resulting set.
      */
-    Single<Long> srandmember(ValueStreamingChannel<V> channel, K key, long count);
+    Mono<Long> srandmember(ValueStreamingChannel<V> channel, K key, long count);
 
     /**
      * Remove one or more members from a set.
@@ -188,7 +187,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param members the member type: value
      * @return Long integer-reply the number of members that were removed from the set, not including non existing members.
      */
-    Single<Long> srem(K key, V... members);
+    Mono<Long> srem(K key, V... members);
 
     /**
      * Add multiple sets.
@@ -196,7 +195,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param keys the key
      * @return V array-reply list with members of the resulting set.
      */
-    Observable<V> sunion(K... keys);
+    Flux<V> sunion(K... keys);
 
     /**
      * Add multiple sets.
@@ -205,7 +204,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long count of members of the resulting set.
      */
-    Single<Long> sunion(ValueStreamingChannel<V> channel, K... keys);
+    Mono<Long> sunion(ValueStreamingChannel<V> channel, K... keys);
 
     /**
      * Add multiple sets and store the resulting set in a key.
@@ -214,7 +213,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
      */
-    Single<Long> sunionstore(K destination, K... keys);
+    Mono<Long> sunionstore(K destination, K... keys);
 
     /**
      * Incrementally iterate Set elements.
@@ -222,7 +221,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param key the key
      * @return ValueScanCursor&lt;V&gt; scan cursor.
      */
-    Single<ValueScanCursor<V>> sscan(K key);
+    Mono<ValueScanCursor<V>> sscan(K key);
 
     /**
      * Incrementally iterate Set elements.
@@ -231,7 +230,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return ValueScanCursor&lt;V&gt; scan cursor.
      */
-    Single<ValueScanCursor<V>> sscan(K key, ScanArgs scanArgs);
+    Mono<ValueScanCursor<V>> sscan(K key, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate Set elements.
@@ -241,7 +240,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return ValueScanCursor&lt;V&gt; scan cursor.
      */
-    Single<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
+    Mono<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate Set elements.
@@ -250,7 +249,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return ValueScanCursor&lt;V&gt; scan cursor.
      */
-    Single<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor);
+    Mono<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor);
 
     /**
      * Incrementally iterate Set elements.
@@ -259,7 +258,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param key the key
      * @return StreamScanCursor scan cursor.
      */
-    Single<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key);
+    Mono<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key);
 
     /**
      * Incrementally iterate Set elements.
@@ -269,7 +268,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
      */
-    Single<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanArgs scanArgs);
+    Mono<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate Set elements.
@@ -280,7 +279,7 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
      */
-    Single<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
+    Mono<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate Set elements.
@@ -290,5 +289,5 @@ public interface RedisSetReactiveCommands<K, V> {
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return StreamScanCursor scan cursor.
      */
-    Single<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
+    Mono<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisSortedSetReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
similarity index 79%
rename from src/main/java/com/lambdaworks/redis/api/rx/RedisSortedSetReactiveCommands.java
rename to src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
index 0da8841703..ca9c6ca24c 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisSortedSetReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
@@ -1,4 +1,4 @@
-package com.lambdaworks.redis.api.rx;
+package com.lambdaworks.redis.api.reactive;
 
 import java.util.List;
 import com.lambdaworks.redis.ScanArgs;
@@ -10,12 +10,11 @@
 import com.lambdaworks.redis.ZStoreArgs;
 import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
-import rx.Observable;
-import rx.Single;
-import rx.Completable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
- * Observable commands for Sorted Sets.
+ * Reactive executed commands for Sorted Sets.
  * 
  * @param <K> Key type.
  * @param <V> Value type.
@@ -37,7 +36,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
-    Single<Long> zadd(K key, double score, V member);
+    Mono<Long> zadd(K key, double score, V member);
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
@@ -49,7 +48,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
-    Single<Long> zadd(K key, Object... scoresAndValues);
+    Mono<Long> zadd(K key, Object... scoresAndValues);
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
@@ -61,7 +60,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
-    Single<Long> zadd(K key, ScoredValue<V>... scoredValues);
+    Mono<Long> zadd(K key, ScoredValue<V>... scoredValues);
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
@@ -76,7 +75,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
-    Single<Long> zadd(K key, ZAddArgs zAddArgs, double score, V member);
+    Mono<Long> zadd(K key, ZAddArgs zAddArgs, double score, V member);
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
@@ -89,7 +88,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
-    Single<Long> zadd(K key, ZAddArgs zAddArgs, Object... scoresAndValues);
+    Mono<Long> zadd(K key, ZAddArgs zAddArgs, Object... scoresAndValues);
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
@@ -102,7 +101,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
-    Single<Long> zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues);
+    Mono<Long> zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues);
 
     /**
      * ZADD acts like ZINCRBY
@@ -115,7 +114,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      *
      *         The total number of elements changed
      */
-    Single<Double> zaddincr(K key, double score, V member);
+    Mono<Double> zaddincr(K key, double score, V member);
 
     /**
      * Get the number of members in a sorted set.
@@ -124,7 +123,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @return Long integer-reply the cardinality (number of elements) of the sorted set, or {@literal false} if {@code key}
      *         does not exist.
      */
-    Single<Long> zcard(K key);
+    Mono<Long> zcard(K key);
 
     /**
      * Count the members in a sorted set with scores within the given values.
@@ -134,7 +133,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
      */
-    Single<Long> zcount(K key, double min, double max);
+    Mono<Long> zcount(K key, double min, double max);
 
     /**
      * Count the members in a sorted set with scores within the given values.
@@ -144,7 +143,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
      */
-    Single<Long> zcount(K key, String min, String max);
+    Mono<Long> zcount(K key, String min, String max);
 
     /**
      * Increment the score of a member in a sorted set.
@@ -155,7 +154,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @return Double bulk-string-reply the new score of {@code member} (a double precision floating point number), represented
      *         as string.
      */
-    Single<Double> zincrby(K key, double amount, K member);
+    Mono<Double> zincrby(K key, double amount, K member);
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
@@ -164,7 +163,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    Single<Long> zinterstore(K destination, K... keys);
+    Mono<Long> zinterstore(K destination, K... keys);
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
@@ -174,7 +173,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    Single<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys);
+    Mono<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys);
 
     /**
      * Return a range of members in a sorted set, by index.
@@ -184,7 +183,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param stop the stop
      * @return V array-reply list of elements in the specified range.
      */
-    Observable<V> zrange(K key, long start, long stop);
+    Flux<V> zrange(K key, long start, long stop);
 
     /**
      * Return a range of members with scores in a sorted set, by index.
@@ -194,7 +193,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param stop the stop
      * @return V array-reply list of elements in the specified range.
      */
-    Observable<ScoredValue<V>> zrangeWithScores(K key, long start, long stop);
+    Flux<ScoredValue<V>> zrangeWithScores(K key, long start, long stop);
 
     /**
      * Return a range of members in a sorted set, by score.
@@ -204,7 +203,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return V array-reply list of elements in the specified score range.
      */
-    Observable<V> zrangebyscore(K key, double min, double max);
+    Flux<V> zrangebyscore(K key, double min, double max);
 
     /**
      * Return a range of members in a sorted set, by score.
@@ -214,7 +213,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return V array-reply list of elements in the specified score range.
      */
-    Observable<V> zrangebyscore(K key, String min, String max);
+    Flux<V> zrangebyscore(K key, String min, String max);
 
     /**
      * Return a range of members in a sorted set, by score.
@@ -226,7 +225,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return V array-reply list of elements in the specified score range.
      */
-    Observable<V> zrangebyscore(K key, double min, double max, long offset, long count);
+    Flux<V> zrangebyscore(K key, double min, double max, long offset, long count);
 
     /**
      * Return a range of members in a sorted set, by score.
@@ -238,7 +237,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return V array-reply list of elements in the specified score range.
      */
-    Observable<V> zrangebyscore(K key, String min, String max, long offset, long count);
+    Flux<V> zrangebyscore(K key, String min, String max, long offset, long count);
 
     /**
      * Return a range of members with score in a sorted set, by score.
@@ -248,7 +247,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
      */
-    Observable<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max);
+    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max);
 
     /**
      * Return a range of members with score in a sorted set, by score.
@@ -258,7 +257,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
      */
-    Observable<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max);
+    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max);
 
     /**
      * Return a range of members with score in a sorted set, by score.
@@ -270,7 +269,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
      */
-    Observable<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
+    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
     /**
      * Return a range of members with score in a sorted set, by score.
@@ -282,7 +281,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
      */
-    Observable<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
+    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
 
     /**
      * Return a range of members in a sorted set, by index.
@@ -293,7 +292,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param stop the stop
      * @return Long count of elements in the specified range.
      */
-    Single<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+    Mono<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
 
     /**
      * Stream over a range of members with scores in a sorted set, by index.
@@ -304,7 +303,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param stop the stop
      * @return Long count of elements in the specified range.
      */
-    Single<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+    Mono<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
 
     /**
      * Stream over a range of members in a sorted set, by score.
@@ -315,7 +314,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long count of elements in the specified score range.
      */
-    Single<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
+    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
      * Stream over a range of members in a sorted set, by score.
@@ -326,7 +325,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long count of elements in the specified score range.
      */
-    Single<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
+    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
 
     /**
      * Stream over range of members in a sorted set, by score.
@@ -339,7 +338,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of elements in the specified score range.
      */
-    Single<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
+    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
      * Stream over a range of members in a sorted set, by score.
@@ -352,7 +351,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of elements in the specified score range.
      */
-    Single<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
+    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
@@ -363,7 +362,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long count of elements in the specified score range.
      */
-    Single<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max);
+    Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
@@ -374,7 +373,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long count of elements in the specified score range.
      */
-    Single<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max);
+    Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
@@ -387,7 +386,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of elements in the specified score range.
      */
-    Single<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
+    Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
@@ -400,7 +399,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of elements in the specified score range.
      */
-    Single<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
+    Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
     /**
      * Determine the index of a member in a sorted set.
@@ -410,7 +409,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
      *         does not exist,
      */
-    Single<Long> zrank(K key, V member);
+    Mono<Long> zrank(K key, V member);
 
     /**
      * Remove one or more members from a sorted set.
@@ -421,7 +420,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * 
      *         The number of members removed from the sorted set, not including non existing members.
      */
-    Single<Long> zrem(K key, V... members);
+    Mono<Long> zrem(K key, V... members);
 
     /**
      * Remove all members in a sorted set within the given indexes.
@@ -431,7 +430,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param stop the stop type: long
      * @return Long integer-reply the number of elements removed.
      */
-    Single<Long> zremrangebyrank(K key, long start, long stop);
+    Mono<Long> zremrangebyrank(K key, long start, long stop);
 
     /**
      * Remove all members in a sorted set within the given scores.
@@ -441,7 +440,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long integer-reply the number of elements removed.
      */
-    Single<Long> zremrangebyscore(K key, double min, double max);
+    Mono<Long> zremrangebyscore(K key, double min, double max);
 
     /**
      * Remove all members in a sorted set within the given scores.
@@ -451,7 +450,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long integer-reply the number of elements removed.
      */
-    Single<Long> zremrangebyscore(K key, String min, String max);
+    Mono<Long> zremrangebyscore(K key, String min, String max);
 
     /**
      * Return a range of members in a sorted set, by index, with scores ordered from high to low.
@@ -461,7 +460,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param stop the stop
      * @return V array-reply list of elements in the specified range.
      */
-    Observable<V> zrevrange(K key, long start, long stop);
+    Flux<V> zrevrange(K key, long start, long stop);
 
     /**
      * Return a range of members with scores in a sorted set, by index, with scores ordered from high to low.
@@ -471,7 +470,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param stop the stop
      * @return V array-reply list of elements in the specified range.
      */
-    Observable<ScoredValue<V>> zrevrangeWithScores(K key, long start, long stop);
+    Flux<ScoredValue<V>> zrevrangeWithScores(K key, long start, long stop);
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
@@ -481,7 +480,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return V array-reply list of elements in the specified score range.
      */
-    Observable<V> zrevrangebyscore(K key, double max, double min);
+    Flux<V> zrevrangebyscore(K key, double max, double min);
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
@@ -491,7 +490,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return V array-reply list of elements in the specified score range.
      */
-    Observable<V> zrevrangebyscore(K key, String max, String min);
+    Flux<V> zrevrangebyscore(K key, String max, String min);
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
@@ -503,7 +502,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the null
      * @return V array-reply list of elements in the specified score range.
      */
-    Observable<V> zrevrangebyscore(K key, double max, double min, long offset, long count);
+    Flux<V> zrevrangebyscore(K key, double max, double min, long offset, long count);
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
@@ -515,7 +514,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return V array-reply list of elements in the specified score range.
      */
-    Observable<V> zrevrangebyscore(K key, String max, String min, long offset, long count);
+    Flux<V> zrevrangebyscore(K key, String max, String min, long offset, long count);
 
     /**
      * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
@@ -525,7 +524,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @return V array-reply list of elements in the specified score range.
      */
-    Observable<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min);
+    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min);
 
     /**
      * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
@@ -535,7 +534,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
      */
-    Observable<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min);
+    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min);
 
     /**
      * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
@@ -547,7 +546,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
      */
-    Observable<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
+    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
 
     /**
      * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
@@ -559,7 +558,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return V array-reply list of elements in the specified score range.
      */
-    Observable<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
+    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
 
     /**
      * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
@@ -570,7 +569,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param stop the stop
      * @return Long count of elements in the specified range.
      */
-    Single<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+    Mono<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
 
     /**
      * Stream over a range of members with scores in a sorted set, by index, with scores ordered from high to low.
@@ -581,7 +580,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param stop the stop
      * @return Long count of elements in the specified range.
      */
-    Single<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+    Mono<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
 
     /**
      * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
@@ -592,7 +591,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @return Long count of elements in the specified range.
      */
-    Single<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
+    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
      * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
@@ -603,7 +602,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long count of elements in the specified range.
      */
-    Single<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
+    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
 
     /**
      * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
@@ -616,7 +615,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of elements in the specified range.
      */
-    Single<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
+    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
      * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
@@ -629,7 +628,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of elements in the specified range.
      */
-    Single<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
+    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
@@ -640,7 +639,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long count of elements in the specified range.
      */
-    Single<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min);
+    Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
@@ -651,7 +650,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long count of elements in the specified range.
      */
-    Single<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min);
+    Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
@@ -664,7 +663,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of elements in the specified range.
      */
-    Single<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
+    Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
@@ -677,7 +676,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return Long count of elements in the specified range.
      */
-    Single<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
+    Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
     /**
      * Determine the index of a member in a sorted set, with scores ordered from high to low.
@@ -687,7 +686,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
      *         does not exist,
      */
-    Single<Long> zrevrank(K key, V member);
+    Mono<Long> zrevrank(K key, V member);
 
     /**
      * Get the score associated with the given member in a sorted set.
@@ -697,7 +696,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @return Double bulk-string-reply the score of {@code member} (a double precision floating point number), represented as
      *         string.
      */
-    Single<Double> zscore(K key, V member);
+    Mono<Double> zscore(K key, V member);
 
     /**
      * Add multiple sorted sets and store the resulting sorted set in a new key.
@@ -706,7 +705,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param keys source keys
      * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    Single<Long> zunionstore(K destination, K... keys);
+    Mono<Long> zunionstore(K destination, K... keys);
 
     /**
      * Add multiple sorted sets and store the resulting sorted set in a new key.
@@ -716,7 +715,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param keys the keys
      * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    Single<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
+    Mono<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
@@ -724,7 +723,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param key the key
      * @return ScoredValueScanCursor&lt;V&gt; scan cursor.
      */
-    Single<ScoredValueScanCursor<V>> zscan(K key);
+    Mono<ScoredValueScanCursor<V>> zscan(K key);
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
@@ -733,7 +732,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return ScoredValueScanCursor&lt;V&gt; scan cursor.
      */
-    Single<ScoredValueScanCursor<V>> zscan(K key, ScanArgs scanArgs);
+    Mono<ScoredValueScanCursor<V>> zscan(K key, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
@@ -743,7 +742,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return ScoredValueScanCursor&lt;V&gt; scan cursor.
      */
-    Single<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
+    Mono<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
@@ -752,7 +751,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return ScoredValueScanCursor&lt;V&gt; scan cursor.
      */
-    Single<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor);
+    Mono<ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor);
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
@@ -761,7 +760,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param key the key
      * @return StreamScanCursor scan cursor.
      */
-    Single<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key);
+    Mono<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key);
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
@@ -771,7 +770,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
      */
-    Single<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanArgs scanArgs);
+    Mono<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
@@ -782,7 +781,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
      */
-    Single<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
+    Mono<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
@@ -792,7 +791,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return StreamScanCursor scan cursor.
      */
-    Single<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
+    Mono<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
 
     /**
      * Count the number of members in a sorted set between a given lexicographical range.
@@ -802,7 +801,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
      */
-    Single<Long> zlexcount(K key, String min, String max);
+    Mono<Long> zlexcount(K key, String min, String max);
 
     /**
      * Remove all members in a sorted set between the given lexicographical range.
@@ -812,7 +811,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return Long integer-reply the number of elements removed.
      */
-    Single<Long> zremrangebylex(K key, String min, String max);
+    Mono<Long> zremrangebylex(K key, String min, String max);
 
     /**
      * Return a range of members in a sorted set, by lexicographical range.
@@ -822,7 +821,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @return V array-reply list of elements in the specified score range.
      */
-    Observable<V> zrangebylex(K key, String min, String max);
+    Flux<V> zrangebylex(K key, String min, String max);
 
     /**
      * Return a range of members in a sorted set, by lexicographical range.
@@ -834,5 +833,5 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param count the count
      * @return V array-reply list of elements in the specified score range.
      */
-    Observable<V> zrangebylex(K key, String min, String max, long offset, long count);
+    Flux<V> zrangebylex(K key, String min, String max, long offset, long count);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisStringReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java
similarity index 86%
rename from src/main/java/com/lambdaworks/redis/api/rx/RedisStringReactiveCommands.java
rename to src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java
index 5abf9b1b9f..b6934b126f 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisStringReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java
@@ -1,4 +1,4 @@
-package com.lambdaworks.redis.api.rx;
+package com.lambdaworks.redis.api.reactive;
 
 import java.util.List;
 import java.util.Map;
@@ -8,12 +8,11 @@
 import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.SetArgs;
 import com.lambdaworks.redis.Value;
-import rx.Observable;
-import rx.Single;
-import rx.Completable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
- * Observable commands for Strings.
+ * Reactive executed commands for Strings.
  * 
  * @param <K> Key type.
  * @param <V> Value type.
@@ -30,7 +29,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param value the value
      * @return Long integer-reply the length of the string after the append operation.
      */
-    Single<Long> append(K key, V value);
+    Mono<Long> append(K key, V value);
 
     /**
      * Count set bits in a string.
@@ -39,7 +38,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * 
      * @return Long integer-reply The number of bits set to 1.
      */
-    Single<Long> bitcount(K key);
+    Mono<Long> bitcount(K key);
 
     /**
      * Count set bits in a string.
@@ -50,7 +49,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * 
      * @return Long integer-reply The number of bits set to 1.
      */
-    Single<Long> bitcount(K key, long start, long end);
+    Mono<Long> bitcount(K key, long start, long end);
 
     /**
      * Execute {@code BITFIELD} with its subcommands.
@@ -60,7 +59,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * 
      * @return Long bulk-reply the results from the bitfield commands.
      */
-    Observable<Long> bitfield(K key, BitFieldArgs bitFieldArgs);
+    Flux<Long> bitfield(K key, BitFieldArgs bitFieldArgs);
 
     /**
      * Find first bit set or clear in a string.
@@ -84,7 +83,7 @@ public interface RedisStringReactiveCommands<K, V> {
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
      */
-    Single<Long> bitpos(K key, boolean state);
+    Mono<Long> bitpos(K key, boolean state);
 
     /**
      * Find first bit set or clear in a string.
@@ -109,7 +108,7 @@ public interface RedisStringReactiveCommands<K, V> {
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
      */
-    Single<Long> bitpos(K key, boolean state, long start, long end);
+    Mono<Long> bitpos(K key, boolean state, long start, long end);
 
     /**
      * Perform bitwise AND between strings.
@@ -119,7 +118,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
      *         input string.
      */
-    Single<Long> bitopAnd(K destination, K... keys);
+    Mono<Long> bitopAnd(K destination, K... keys);
 
     /**
      * Perform bitwise NOT between strings.
@@ -129,7 +128,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
      *         input string.
      */
-    Single<Long> bitopNot(K destination, K source);
+    Mono<Long> bitopNot(K destination, K source);
 
     /**
      * Perform bitwise OR between strings.
@@ -139,7 +138,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
      *         input string.
      */
-    Single<Long> bitopOr(K destination, K... keys);
+    Mono<Long> bitopOr(K destination, K... keys);
 
     /**
      * Perform bitwise XOR between strings.
@@ -149,7 +148,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
      *         input string.
      */
-    Single<Long> bitopXor(K destination, K... keys);
+    Mono<Long> bitopXor(K destination, K... keys);
 
     /**
      * Decrement the integer value of a key by one.
@@ -157,7 +156,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the decrement
      */
-    Single<Long> decr(K key);
+    Mono<Long> decr(K key);
 
     /**
      * Decrement the integer value of a key by the given number.
@@ -166,7 +165,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param amount the decrement type: long
      * @return Long integer-reply the value of {@code key} after the decrement
      */
-    Single<Long> decrby(K key, long amount);
+    Mono<Long> decrby(K key, long amount);
 
     /**
      * Get the value of a key.
@@ -174,7 +173,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param key the key
      * @return V bulk-string-reply the value of {@code key}, or {@literal null} when {@code key} does not exist.
      */
-    Single<V> get(K key);
+    Mono<V> get(K key);
 
     /**
      * Returns the bit value at offset in the string value stored at key.
@@ -183,7 +182,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param offset the offset type: long
      * @return Long integer-reply the bit value stored at <em>offset</em>.
      */
-    Single<Long> getbit(K key, long offset);
+    Mono<Long> getbit(K key, long offset);
 
     /**
      * Get a substring of the string stored at a key.
@@ -193,7 +192,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param end the end type: long
      * @return V bulk-string-reply
      */
-    Single<V> getrange(K key, long start, long end);
+    Mono<V> getrange(K key, long start, long end);
 
     /**
      * Set the string value of a key and return its old value.
@@ -202,7 +201,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param value the value
      * @return V bulk-string-reply the old value stored at {@code key}, or {@literal null} when {@code key} did not exist.
      */
-    Single<V> getset(K key, V value);
+    Mono<V> getset(K key, V value);
 
     /**
      * Increment the integer value of a key by one.
@@ -210,7 +209,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the increment
      */
-    Single<Long> incr(K key);
+    Mono<Long> incr(K key);
 
     /**
      * Increment the integer value of a key by the given amount.
@@ -219,7 +218,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param amount the increment type: long
      * @return Long integer-reply the value of {@code key} after the increment
      */
-    Single<Long> incrby(K key, long amount);
+    Mono<Long> incrby(K key, long amount);
 
     /**
      * Increment the float value of a key by the given amount.
@@ -228,7 +227,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param amount the increment type: double
      * @return Double bulk-string-reply the value of {@code key} after the increment.
      */
-    Single<Double> incrbyfloat(K key, double amount);
+    Mono<Double> incrbyfloat(K key, double amount);
 
     /**
      * Get the values of all the given keys.
@@ -236,7 +235,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param keys the key
      * @return V array-reply list of values at the specified keys.
      */
-    Observable<KeyValue<K, V>> mget(K... keys);
+    Flux<KeyValue<K, V>> mget(K... keys);
 
     /**
      * Stream over the values of all the given keys.
@@ -246,7 +245,7 @@ public interface RedisStringReactiveCommands<K, V> {
      *
      * @return Long array-reply list of values at the specified keys.
      */
-    Single<Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys);
+    Mono<Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys);
 
     /**
      * Set multiple keys to multiple values.
@@ -254,7 +253,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param map the null
      * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail.
      */
-    Single<String> mset(Map<K, V> map);
+    Mono<String> mset(Map<K, V> map);
 
     /**
      * Set multiple keys to multiple values, only if none of the keys exist.
@@ -264,7 +263,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * 
      *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
      */
-    Single<Boolean> msetnx(Map<K, V> map);
+    Mono<Boolean> msetnx(Map<K, V> map);
 
     /**
      * Set the string value of a key.
@@ -274,7 +273,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * 
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
-    Single<String> set(K key, V value);
+    Mono<String> set(K key, V value);
 
     /**
      * Set the string value of a key.
@@ -285,7 +284,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * 
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
-    Single<String> set(K key, V value, SetArgs setArgs);
+    Mono<String> set(K key, V value, SetArgs setArgs);
 
     /**
      * Sets or clears the bit at offset in the string value stored at key.
@@ -295,7 +294,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param value the value type: string
      * @return Long integer-reply the original bit value stored at <em>offset</em>.
      */
-    Single<Long> setbit(K key, long offset, int value);
+    Mono<Long> setbit(K key, long offset, int value);
 
     /**
      * Set the value and expiration of a key.
@@ -305,7 +304,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param value the value
      * @return String simple-string-reply
      */
-    Single<String> setex(K key, long seconds, V value);
+    Mono<String> setex(K key, long seconds, V value);
 
     /**
      * Set the value and expiration in milliseconds of a key.
@@ -315,7 +314,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param value the value
      * @return String simple-string-reply
      */
-    Single<String> psetex(K key, long milliseconds, V value);
+    Mono<String> psetex(K key, long milliseconds, V value);
 
     /**
      * Set the value of a key, only if the key does not exist.
@@ -326,7 +325,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * 
      *         {@code 1} if the key was set {@code 0} if the key was not set
      */
-    Single<Boolean> setnx(K key, V value);
+    Mono<Boolean> setnx(K key, V value);
 
     /**
      * Overwrite part of a string at key starting at the specified offset.
@@ -336,7 +335,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param value the value
      * @return Long integer-reply the length of the string after it was modified by the command.
      */
-    Single<Long> setrange(K key, long offset, V value);
+    Mono<Long> setrange(K key, long offset, V value);
 
     /**
      * Get the length of the value stored in a key.
@@ -344,5 +343,5 @@ public interface RedisStringReactiveCommands<K, V> {
      * @param key the key
      * @return Long integer-reply the length of the string at {@code key}, or {@code 0} when {@code key} does not exist.
      */
-    Single<Long> strlen(K key);
+    Mono<Long> strlen(K key);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisTransactionalReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java
similarity index 78%
rename from src/main/java/com/lambdaworks/redis/api/rx/RedisTransactionalReactiveCommands.java
rename to src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java
index aa8b83033c..561816b98f 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisTransactionalReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java
@@ -1,14 +1,12 @@
-package com.lambdaworks.redis.api.rx;
+package com.lambdaworks.redis.api.reactive;
 
 import java.util.List;
-
 import com.lambdaworks.redis.TransactionResult;
-import rx.Observable;
-import rx.Single;
-import rx.Completable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
- * Observable commands for Transactions.
+ * Reactive executed commands for Transactions.
  * 
  * @param <K> Key type.
  * @param <V> Value type.
@@ -23,7 +21,7 @@ public interface RedisTransactionalReactiveCommands<K, V> {
      * 
      * @return String simple-string-reply always {@code OK}.
      */
-    Single<String> discard();
+    Mono<String> discard();
 
     /**
      * Execute all commands issued after MULTI.
@@ -32,14 +30,14 @@ public interface RedisTransactionalReactiveCommands<K, V> {
      *
      *         When using {@code WATCH}, {@code EXEC} can return a
      */
-    Single<TransactionResult> exec();
+    Mono<TransactionResult> exec();
 
     /**
      * Mark the start of a transaction block.
      *
      * @return String simple-string-reply always {@code OK}.
      */
-    Single<String> multi();
+    Mono<String> multi();
 
     /**
      * Watch the given keys to determine execution of the MULTI/EXEC block.
@@ -47,12 +45,12 @@ public interface RedisTransactionalReactiveCommands<K, V> {
      * @param keys the key
      * @return String simple-string-reply always {@code OK}.
      */
-    Single<String> watch(K... keys);
+    Mono<String> watch(K... keys);
 
     /**
      * Forget about all watched keys.
      *
      * @return String simple-string-reply always {@code OK}.
      */
-    Single<String> unwatch();
+    Mono<String> unwatch();
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/package-info.java b/src/main/java/com/lambdaworks/redis/api/reactive/package-info.java
similarity index 56%
rename from src/main/java/com/lambdaworks/redis/api/rx/package-info.java
rename to src/main/java/com/lambdaworks/redis/api/reactive/package-info.java
index 36be73a34f..70d9f046c8 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Standalone Redis API for reactive commands.
  */
-package com.lambdaworks.redis.api.rx;
\ No newline at end of file
+package com.lambdaworks.redis.api.reactive;
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/Success.java b/src/main/java/com/lambdaworks/redis/api/rx/Success.java
deleted file mode 100644
index 37e1c6906f..0000000000
--- a/src/main/java/com/lambdaworks/redis/api/rx/Success.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.lambdaworks.redis.api.rx;
-
-/**
- * An enum representing a successful operation.
- * @author Mark Paluch
- * @since 4.0
- */
-public enum Success {
-    Success;
-}
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
index b7c5ba2100..1f5dff8cf5 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
@@ -1,9 +1,7 @@
 package com.lambdaworks.redis.api.sync;
 
-import com.lambdaworks.redis.GeoArgs;
-import com.lambdaworks.redis.GeoCoordinates;
-import com.lambdaworks.redis.GeoRadiusStoreArgs;
-import com.lambdaworks.redis.GeoWithin;
+import com.lambdaworks.redis.*;
+
 import java.util.List;
 import java.util.Set;
 
@@ -43,7 +41,7 @@ public interface RedisGeoCommands<K, V> {
      * @param members the members
      * @return bulk reply Geohash strings in the order of {@code members}. Returns {@literal null} if a member is not found.
      */
-    List<String> geohash(K key, V... members);
+    List<Value<String>> geohash(K key, V... members);
 
     /**
      * Retrieve members selected by distance with the center of {@code longitude} and {@code latitude}.
@@ -71,7 +69,7 @@ public interface RedisGeoCommands<K, V> {
     List<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
 
     /**
-     * Perform a {@link #georadius(Object, double, double, double, Unit, GeoArgs)} query and store the results in a sorted set.
+     * Perform a {@link #georadius(Object, double, double, double, GeoArgs.Unit, GeoArgs)} query and store the results in a sorted set.
      *
      * @param key the key of the geo set
      * @param longitude the longitude coordinate according to WGS84
@@ -132,7 +130,7 @@ public interface RedisGeoCommands<K, V> {
      * @return a list of {@link GeoCoordinates}s representing the x,y position of each element specified in the arguments. For
      *         missing elements {@literal null} is returned.
      */
-    List<GeoCoordinates> geopos(K key, V... members);
+    List<Value<GeoCoordinates>> geopos(K key, V... members);
 
     /**
      *
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
index d965a8194d..6b689e6f2f 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 import java.util.Map;
-
-import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 import com.lambdaworks.redis.BitFieldArgs;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java
index 0c2add2174..197c205807 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java
@@ -1,5 +1,6 @@
 package com.lambdaworks.redis.api.sync;
 
+import java.util.List;
 import com.lambdaworks.redis.TransactionResult;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java
index 2151558aac..9838f51779 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java
@@ -10,9 +10,7 @@
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 import com.lambdaworks.redis.models.role.RedisNodeDescription;
 
-import rx.Observable;
-import rx.Single;
-import rx.functions.Func1;
+import reactor.core.publisher.Mono;
 
 /**
  * Methods to support a Cluster-wide SCAN operation over multiple hosts.
@@ -54,18 +52,18 @@ public StreamScanCursor apply(StreamScanCursor result) {
     };
 
     /**
-     * Map a {@link Single} of {@link KeyScanCursor} to a {@link Observable} of {@link ClusterKeyScanCursor}.
+     * Map a {@link Mono} of {@link KeyScanCursor} to a {@link Mono} of {@link ClusterKeyScanCursor}.
      */
-    final static ScanCursorMapper<Single<KeyScanCursor<?>>> reactiveKeyScanCursorMapper = (nodeIds, currentNodeId,
+    final static ScanCursorMapper<Mono<KeyScanCursor<?>>> reactiveKeyScanCursorMapper = (nodeIds, currentNodeId,
             cursor) -> cursor.map(keyScanCursor -> new ClusterKeyScanCursor<>(nodeIds, currentNodeId, keyScanCursor));
 
     /**
-     * Map a {@link Single} of {@link StreamScanCursor} to a {@link Observable} of {@link ClusterStreamScanCursor}.
+     * Map a {@link Mono} of {@link StreamScanCursor} to a {@link Mono} of {@link ClusterStreamScanCursor}.
      */
-    final static ScanCursorMapper<Single<StreamScanCursor>> reactiveStreamScanCursorMapper = (nodeIds, currentNodeId,
-            cursor) -> cursor.map(new Func1<StreamScanCursor, StreamScanCursor>() {
+    final static ScanCursorMapper<Mono<StreamScanCursor>> reactiveStreamScanCursorMapper = (nodeIds, currentNodeId,
+            cursor) -> cursor.map(new Function<StreamScanCursor, StreamScanCursor>() {
                 @Override
-                public StreamScanCursor call(StreamScanCursor streamScanCursor) {
+                public StreamScanCursor apply(StreamScanCursor streamScanCursor) {
                     return new ClusterStreamScanCursor(nodeIds, currentNodeId, streamScanCursor);
                 }
             });
@@ -190,11 +188,11 @@ static ScanCursorMapper<RedisFuture<StreamScanCursor>> asyncClusterStreamScanCur
         return futureStreamScanCursorMapper;
     }
 
-    static <K> ScanCursorMapper<Single<KeyScanCursor<K>>> reactiveClusterKeyScanCursorMapper() {
+    static <K> ScanCursorMapper<Mono<KeyScanCursor<K>>> reactiveClusterKeyScanCursorMapper() {
         return (ScanCursorMapper) reactiveKeyScanCursorMapper;
     }
 
-    static ScanCursorMapper<Single<StreamScanCursor>> reactiveClusterStreamScanCursorMapper() {
+    static ScanCursorMapper<Mono<StreamScanCursor>> reactiveClusterStreamScanCursorMapper() {
         return reactiveStreamScanCursorMapper;
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index 1127e06056..f2eb5c4cc0 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -9,25 +9,23 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.internal.LettuceLists;
-import rx.Observable;
+import org.reactivestreams.Publisher;
 
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.rx.RedisKeyReactiveCommands;
+import com.lambdaworks.redis.api.reactive.RedisKeyReactiveCommands;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.rx.RedisAdvancedClusterReactiveCommands;
-import com.lambdaworks.redis.cluster.api.rx.RedisClusterReactiveCommands;
+import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
+import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands;
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.internal.LettuceLists;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
 
-import rx.Completable;
-import rx.Observable;
-import rx.Single;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
  * An advanced reactive and thread-safe API to a Redis Cluster connection.
@@ -52,12 +50,12 @@ public RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnectionIm
     }
 
     @Override
-    public Single<Long> del(K... keys) {
+    public Mono<Long> del(K... keys) {
         return del(Arrays.asList(keys));
     }
 
     @Override
-    public Single<Long> del(Iterable<K> keys) {
+    public Mono<Long> del(Iterable<K> keys) {
 
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
 
@@ -65,22 +63,22 @@ public Single<Long> del(Iterable<K> keys) {
             return super.del(keys);
         }
 
-        List<Observable<Long>> observables = new ArrayList<>();
+        List<Publisher<Long>> publishers = new ArrayList<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            observables.add(super.del(entry.getValue()).toObservable());
+            publishers.add(super.del(entry.getValue()));
         }
 
-        return Observable.merge(observables).reduce((accu, next) -> accu + next).last().toSingle();
+        return Flux.merge(publishers).reduce((accu, next) -> accu + next);
     }
 
     @Override
-    public Single<Long> unlink(K... keys) {
+    public Mono<Long> unlink(K... keys) {
         return unlink(Arrays.asList(keys));
     }
 
     @Override
-    public Single<Long> unlink(Iterable<K> keys) {
+    public Mono<Long> unlink(Iterable<K> keys) {
 
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
 
@@ -88,21 +86,21 @@ public Single<Long> unlink(Iterable<K> keys) {
             return super.unlink(keys);
         }
 
-        List<Observable<Long>> observables = new ArrayList<>();
+        List<Publisher<Long>> publishers = new ArrayList<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            observables.add(super.unlink(entry.getValue()).toObservable());
+            publishers.add(super.unlink(entry.getValue()));
         }
 
-        return Observable.merge(observables).reduce((accu, next) -> accu + next).last().toSingle();
+        return Flux.merge(publishers).reduce((accu, next) -> accu + next);
     }
 
     @Override
-    public Single<Long> exists(K... keys) {
+    public Mono<Long> exists(K... keys) {
         return exists(Arrays.asList(keys));
     }
 
-    public Single<Long> exists(Iterable<K> keys) {
+    public Mono<Long> exists(Iterable<K> keys) {
 
         List<K> keyList = LettuceLists.newList(keys);
 
@@ -112,21 +110,21 @@ public Single<Long> exists(Iterable<K> keys) {
             return super.exists(keyList);
         }
 
-        List<Observable<Long>> observables = new ArrayList<>();
+        List<Publisher<Long>> publishers = new ArrayList<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            observables.add(super.exists(entry.getValue()).toObservable());
+            publishers.add(super.exists(entry.getValue()));
         }
 
-        return Observable.merge(observables).reduce((accu, next) -> accu + next).toSingle();
+        return Flux.merge(publishers).reduce((accu, next) -> accu + next);
     }
 
     @Override
-    public Observable<KeyValue<K, V>> mget(K... keys) {
+    public Flux<KeyValue<K, V>> mget(K... keys) {
         return mget(Arrays.asList(keys));
     }
 
-    public Observable<KeyValue<K, V>> mget(Iterable<K> keys) {
+    public Flux<KeyValue<K, V>> mget(Iterable<K> keys) {
 
         List<K> keyList = LettuceLists.newList(keys);
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keyList);
@@ -135,14 +133,15 @@ public Observable<KeyValue<K, V>> mget(Iterable<K> keys) {
             return super.mget(keyList);
         }
 
-        List<Observable<KeyValue<K, V>>> observables = new ArrayList<>();
+        List<Publisher<KeyValue<K, V>>> publishers = new ArrayList<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            observables.add(super.mget(entry.getValue()));
+            publishers.add(super.mget(entry.getValue()));
         }
-        Observable<KeyValue<K, V>> observable = Observable.concat(Observable.from(observables));
 
-        Observable<List<KeyValue<K, V>>> map = observable.toList().map(vs -> {
+        Flux<KeyValue<K, V>> fluxes = Flux.concat(publishers);
+
+        Mono<List<KeyValue<K, V>>> map = fluxes.collectList().map(vs -> {
 
             KeyValue<K, V>[] values = new KeyValue[vs.size()];
             int offset = 0;
@@ -165,16 +164,16 @@ public Observable<KeyValue<K, V>> mget(Iterable<K> keys) {
             return objects;
         });
 
-        return map.compose(new FlattenTransform<>());
+        return map.flatMap(Flux::fromIterable);
     }
 
     @Override
-    public Single<Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys) {
+    public Mono<Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys) {
         return mget(channel, Arrays.asList(keys));
     }
 
     @Override
-    public Single<Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K> keys) {
+    public Mono<Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K> keys) {
 
         List<K> keyList = LettuceLists.newList(keys);
 
@@ -184,29 +183,30 @@ public Single<Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K> key
             return super.mget(channel, keyList);
         }
 
-        List<Observable<Long>> observables = new ArrayList<>();
+        List<Publisher<Long>> publishers = new ArrayList<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            observables.add(super.mget(channel, entry.getValue()).toObservable());
+            publishers.add(super.mget(channel, entry.getValue()));
         }
 
-        return Observable.merge(observables).reduce((accu, next) -> accu + next).last().toSingle();
+        return Flux.merge(publishers).reduce((accu, next) -> accu + next);
     }
 
     @Override
-    public Single<Boolean> msetnx(Map<K, V> map) {
+    public Mono<Boolean> msetnx(Map<K, V> map) {
 
-        return pipeliningWithMap(map, kvMap -> super.msetnx(kvMap).toObservable(),
-                booleanObservable -> booleanObservable.reduce((accu, next) -> accu || next)).last().toSingle();
+        return pipeliningWithMap(map, kvMap -> RedisAdvancedClusterReactiveCommandsImpl.super.msetnx(kvMap).flux(),
+                booleanFlux -> booleanFlux).reduce((accu, next) -> accu || next);
     }
 
     @Override
-    public Single<String> mset(Map<K, V> map) {
-        return pipeliningWithMap(map, kvMap -> super.mset(kvMap).toObservable(), Observable::last).last().toSingle();
+    public Mono<String> mset(Map<K, V> map) {
+        return pipeliningWithMap(map, kvMap -> RedisAdvancedClusterReactiveCommandsImpl.super.mset(kvMap).flux(),
+                booleanFlux -> booleanFlux).last();
     }
 
     @Override
-    public Observable<K> clusterGetKeysInSlot(int slot, int count) {
+    public Flux<K> clusterGetKeysInSlot(int slot, int count) {
         RedisClusterReactiveCommands<K, V> connectionBySlot = findConnectionBySlot(slot);
 
         if (connectionBySlot != null) {
@@ -217,7 +217,7 @@ public Observable<K> clusterGetKeysInSlot(int slot, int count) {
     }
 
     @Override
-    public Single<Long> clusterCountKeysInSlot(int slot) {
+    public Mono<Long> clusterCountKeysInSlot(int slot) {
         RedisClusterReactiveCommands<K, V> connectionBySlot = findConnectionBySlot(slot);
 
         if (connectionBySlot != null) {
@@ -228,59 +228,58 @@ public Single<Long> clusterCountKeysInSlot(int slot) {
     }
 
     @Override
-    public Single<String> clientSetname(K name) {
-        List<Observable<String>> observables = new ArrayList<>();
+    public Mono<String> clientSetname(K name) {
+        List<Publisher<String>> publishers = new ArrayList<>();
 
         for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
             StatefulRedisConnection<K, V> byNodeId = getStatefulConnection().getConnection(redisClusterNode.getNodeId());
             if (byNodeId.isOpen()) {
-                observables.add(byNodeId.reactive().clientSetname(name).toObservable());
+                publishers.add(byNodeId.reactive().clientSetname(name));
             }
 
             StatefulRedisConnection<K, V> byHost = getStatefulConnection().getConnection(redisClusterNode.getUri().getHost(),
                     redisClusterNode.getUri().getPort());
             if (byHost.isOpen()) {
-                observables.add(byHost.reactive().clientSetname(name).toObservable());
+                publishers.add(byHost.reactive().clientSetname(name));
             }
         }
 
-        return Observable.merge(observables).last().last().toSingle();
+        return Flux.merge(publishers).last();
     }
 
     @Override
-    public Single<Long> dbsize() {
-        Map<String, Observable<Long>> observables = executeOnMasters((commands) -> commands.dbsize().toObservable());
-        return Observable.merge(observables.values()).reduce((accu, next) -> accu + next).toSingle();
+    public Mono<Long> dbsize() {
+        Map<String, Flux<Long>> publishers = executeOnMasters((commands) -> commands.dbsize().flux());
+        return Flux.merge(publishers.values()).reduce((accu, next) -> accu + next);
     }
 
     @Override
-    public Single<String> flushall() {
-        Map<String, Observable<String>> observables = executeOnMasters(
-                (kvRedisClusterReactiveCommancommandss) -> kvRedisClusterReactiveCommancommandss.flushall().toObservable());
-        return Observable.merge(observables.values()).last().last().toSingle();
+    public Mono<String> flushall() {
+        Map<String, Flux<String>> publishers = executeOnMasters(
+                (kvRedisClusterReactiveCommancommandss) -> kvRedisClusterReactiveCommancommandss.flushall().flux());
+        return Flux.merge(publishers.values()).last();
     }
 
     @Override
-    public Single<String> flushdb() {
-        Map<String, Observable<String>> observables = executeOnMasters((commands) -> commands.flushdb().toObservable());
-        return Observable.merge(observables.values()).last().last().toSingle();
+    public Mono<String> flushdb() {
+        Map<String, Flux<String>> publishers = executeOnMasters((commands) -> commands.flushdb().flux());
+        return Flux.merge(publishers.values()).last();
     }
 
     @Override
-    public Observable<K> keys(K pattern) {
-        Map<String, Observable<K>> observables = executeOnMasters(commands -> commands.keys(pattern));
-        return Observable.merge(observables.values());
+    public Flux<K> keys(K pattern) {
+        Map<String, Flux<K>> publishers = executeOnMasters(commands -> commands.keys(pattern));
+        return Flux.merge(publishers.values());
     }
 
     @Override
-    public Single<Long> keys(KeyStreamingChannel<K> channel, K pattern) {
-        Map<String, Observable<Long>> observables = executeOnMasters(
-                commands -> commands.keys(channel, pattern).toObservable());
-        return Observable.merge(observables.values()).reduce((accu, next) -> accu + next).last().toSingle();
+    public Mono<Long> keys(KeyStreamingChannel<K> channel, K pattern) {
+        Map<String, Flux<Long>> publishers = executeOnMasters(commands -> commands.keys(channel, pattern).flux());
+        return Flux.merge(publishers.values()).reduce((accu, next) -> accu + next);
     }
 
     @Override
-    public Single<V> randomkey() {
+    public Mono<V> randomkey() {
 
         Partitions partitions = getStatefulConnection().getPartitions();
         int index = random.nextInt(partitions.size());
@@ -290,32 +289,32 @@ public Single<V> randomkey() {
     }
 
     @Override
-    public Single<String> scriptFlush() {
-        Map<String, Observable<String>> observables = executeOnNodes((commands) -> commands.scriptFlush().toObservable(),
+    public Mono<String> scriptFlush() {
+        Map<String, Flux<String>> publishers = executeOnNodes((commands) -> commands.scriptFlush().flux(),
                 redisClusterNode -> true);
-        return Observable.merge(observables.values()).last().last().toSingle();
+        return Flux.merge(publishers.values()).last();
     }
 
     @Override
-    public Single<String> scriptKill() {
-        Map<String, Observable<String>> observables = executeOnNodes((commands) -> commands.scriptFlush().toObservable(),
+    public Mono<String> scriptKill() {
+        Map<String, Flux<String>> publishers = executeOnNodes((commands) -> commands.scriptFlush().flux(),
                 redisClusterNode -> true);
-        return Observable.merge(observables.values()).onErrorReturn(throwable -> "OK").last().toSingle();
+        return Flux.merge(publishers.values()).onErrorReturn("OK").last();
     }
 
     @Override
-    public Completable shutdown(boolean save) {
-        Map<String, Observable<Boolean>> observables = executeOnNodes(commands -> commands.shutdown(save).toObservable(),
+    public Mono<Void> shutdown(boolean save) {
+        Map<String, Flux<Void>> publishers = executeOnNodes(commands -> commands.shutdown(save).flux(),
                 redisClusterNode -> true);
-        return Completable.fromObservable(Observable.merge(observables.values()).onErrorReturn(throwable -> null).last());
+        return Flux.merge(publishers.values()).then();
     }
 
     @Override
-    public Single<Long> touch(K... keys) {
+    public Mono<Long> touch(K... keys) {
         return touch(Arrays.asList(keys));
     }
 
-    public Single<Long> touch(Iterable<K> keys) {
+    public Mono<Long> touch(Iterable<K> keys) {
 
         List<K> keyList = LettuceLists.newList(keys);
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keyList);
@@ -324,13 +323,13 @@ public Single<Long> touch(Iterable<K> keys) {
             return super.touch(keyList);
         }
 
-        List<Observable<Long>> observables = new ArrayList<>();
+        List<Publisher<Long>> publishers = new ArrayList<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            observables.add(super.touch(entry.getValue()).toObservable());
+            publishers.add(super.touch(entry.getValue()).flux());
         }
 
-        return Observable.merge(observables).reduce((accu, next) -> accu + next).toSingle();
+        return Flux.merge(publishers).reduce((accu, next) -> accu + next);
     }
 
     /**
@@ -340,8 +339,7 @@ public Single<Long> touch(Iterable<K> keys) {
      * @param <T> result type
      * @return map of a key (counter) and commands.
      */
-    protected <T> Map<String, Observable<T>> executeOnMasters(
-            Function<RedisClusterReactiveCommands<K, V>, Observable<T>> function) {
+    protected <T> Map<String, Flux<T>> executeOnMasters(Function<RedisClusterReactiveCommands<K, V>, Flux<T>> function) {
         return executeOnNodes(function, redisClusterNode -> redisClusterNode.is(MASTER));
     }
 
@@ -353,9 +351,9 @@ protected <T> Map<String, Observable<T>> executeOnMasters(
      * @param <T> result type
      * @return map of a key (counter) and commands.
      */
-    protected <T> Map<String, Observable<T>> executeOnNodes(
-            Function<RedisClusterReactiveCommands<K, V>, Observable<T>> function, Function<RedisClusterNode, Boolean> filter) {
-        Map<String, Observable<T>> executions = new HashMap<>();
+    protected <T> Map<String, Flux<T>> executeOnNodes(Function<RedisClusterReactiveCommands<K, V>, Flux<T>> function,
+            Function<RedisClusterNode, Boolean> filter) {
+        Map<String, Flux<T>> executions = new HashMap<>();
 
         for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
 
@@ -397,54 +395,54 @@ public RedisClusterReactiveCommands<K, V> getConnection(String host, int port) {
     }
 
     @Override
-    public Single<KeyScanCursor<K>> scan() {
+    public Mono<KeyScanCursor<K>> scan() {
         return clusterScan(ScanCursor.INITIAL, (connection, cursor) -> connection.scan(), reactiveClusterKeyScanCursorMapper());
     }
 
     @Override
-    public Single<KeyScanCursor<K>> scan(ScanArgs scanArgs) {
+    public Mono<KeyScanCursor<K>> scan(ScanArgs scanArgs) {
         return clusterScan(ScanCursor.INITIAL, (connection, cursor) -> connection.scan(scanArgs),
                 reactiveClusterKeyScanCursorMapper());
     }
 
     @Override
-    public Single<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs) {
+    public Mono<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs) {
         return clusterScan(scanCursor, (connection, cursor) -> connection.scan(cursor, scanArgs),
                 reactiveClusterKeyScanCursorMapper());
     }
 
     @Override
-    public Single<KeyScanCursor<K>> scan(ScanCursor scanCursor) {
+    public Mono<KeyScanCursor<K>> scan(ScanCursor scanCursor) {
         return clusterScan(scanCursor, (connection, cursor) -> connection.scan(cursor), reactiveClusterKeyScanCursorMapper());
     }
 
     @Override
-    public Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel) {
+    public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel) {
         return clusterScan(ScanCursor.INITIAL, (connection, cursor) -> connection.scan(channel),
                 reactiveClusterStreamScanCursorMapper());
     }
 
     @Override
-    public Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs) {
+    public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs) {
         return clusterScan(ScanCursor.INITIAL, (connection, cursor) -> connection.scan(channel, scanArgs),
                 reactiveClusterStreamScanCursorMapper());
     }
 
     @Override
-    public Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs) {
+    public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs) {
         return clusterScan(scanCursor, (connection, cursor) -> connection.scan(channel, cursor, scanArgs),
                 reactiveClusterStreamScanCursorMapper());
     }
 
     @Override
-    public Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor) {
+    public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor) {
         return clusterScan(scanCursor, (connection, cursor) -> connection.scan(channel, cursor),
                 reactiveClusterStreamScanCursorMapper());
     }
 
-    private <T extends ScanCursor> Single<T> clusterScan(ScanCursor cursor,
-            BiFunction<RedisKeyReactiveCommands<K, V>, ScanCursor, Single<T>> scanFunction,
-            ClusterScanSupport.ScanCursorMapper<Single<T>> resultMapper) {
+    private <T extends ScanCursor> Mono<T> clusterScan(ScanCursor cursor,
+            BiFunction<RedisKeyReactiveCommands<K, V>, ScanCursor, Mono<T>> scanFunction,
+            ClusterScanSupport.ScanCursorMapper<Mono<T>> resultMapper) {
 
         return clusterScan(getStatefulConnection(), cursor, scanFunction, (ClusterScanSupport.ScanCursorMapper) resultMapper);
     }
@@ -453,20 +451,20 @@ private <T extends ScanCursor> Single<T> clusterScan(ScanCursor cursor,
      * Perform a SCAN in the cluster.
      * 
      */
-    static <T extends ScanCursor, K, V> Single<T> clusterScan(StatefulRedisClusterConnection<K, V> connection,
-            ScanCursor cursor, BiFunction<RedisKeyReactiveCommands<K, V>, ScanCursor, Single<T>> scanFunction,
-            ClusterScanSupport.ScanCursorMapper<Single<T>> mapper) {
+    static <T extends ScanCursor, K, V> Mono<T> clusterScan(StatefulRedisClusterConnection<K, V> connection, ScanCursor cursor,
+            BiFunction<RedisKeyReactiveCommands<K, V>, ScanCursor, Mono<T>> scanFunction,
+            ClusterScanSupport.ScanCursorMapper<Mono<T>> mapper) {
 
         List<String> nodeIds = ClusterScanSupport.getNodeIds(connection, cursor);
         String currentNodeId = ClusterScanSupport.getCurrentNodeId(cursor, nodeIds);
         ScanCursor continuationCursor = ClusterScanSupport.getContinuationCursor(cursor);
 
-        Single<T> scanCursor = scanFunction.apply(connection.getConnection(currentNodeId).reactive(), continuationCursor);
+        Mono<T> scanCursor = scanFunction.apply(connection.getConnection(currentNodeId).reactive(), continuationCursor);
         return mapper.map(nodeIds, currentNodeId, scanCursor);
     }
 
-    private <T> Observable<T> pipeliningWithMap(Map<K, V> map, Function<Map<K, V>, Observable<T>> function,
-            Function<Observable<T>, Observable<T>> resultFunction) {
+    private <T> Flux<T> pipeliningWithMap(Map<K, V> map, Function<Map<K, V>, Flux<T>> function,
+            Function<Flux<T>, Flux<T>> resultFunction) {
 
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, map.keySet());
 
@@ -474,21 +472,13 @@ private <T> Observable<T> pipeliningWithMap(Map<K, V> map, Function<Map<K, V>, O
             return function.apply(map);
         }
 
-        List<Observable<T>> observables = partitioned.values().stream().map(ks -> {
+        List<Flux<T>> publishers = partitioned.values().stream().map(ks -> {
             Map<K, V> op = new HashMap<>();
             ks.forEach(k -> op.put(k, map.get(k)));
             return function.apply(op);
         }).collect(Collectors.toList());
 
-        return resultFunction.apply(Observable.merge(observables));
-    }
-
-    static class FlattenTransform<T> implements Observable.Transformer<Iterable<T>, T> {
-
-        @Override
-        public Observable<T> call(Observable<Iterable<T>> source) {
-            return source.flatMap(values -> Observable.from(values));
-        }
+        return resultFunction.apply(Flux.merge(publishers));
     }
 
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
index 2503df6dbe..c352a4b069 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
@@ -19,7 +19,7 @@
 import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.rx.RedisAdvancedClusterReactiveCommands;
+import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
 import com.lambdaworks.redis.cluster.api.sync.NodeSelection;
 import com.lambdaworks.redis.cluster.api.sync.NodeSelectionCommands;
 import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java b/src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java
index b6a4502f18..b1dea48a96 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java
@@ -6,7 +6,7 @@
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.cluster.ClusterClientOptions;
 import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.rx.RedisAdvancedClusterReactiveCommands;
+import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
 import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
index e303c012df..3f923c0bcb 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
@@ -1,12 +1,9 @@
 package com.lambdaworks.redis.cluster.api.async;
 
-import com.lambdaworks.redis.GeoArgs;
-import com.lambdaworks.redis.GeoCoordinates;
-import com.lambdaworks.redis.GeoRadiusStoreArgs;
-import com.lambdaworks.redis.GeoWithin;
+import com.lambdaworks.redis.*;
+
 import java.util.List;
 import java.util.Set;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands on a node selection for the Geo-API.
@@ -44,7 +41,7 @@ public interface NodeSelectionGeoAsyncCommands<K, V> {
      * @param members the members
      * @return bulk reply Geohash strings in the order of {@code members}. Returns {@literal null} if a member is not found.
      */
-    AsyncExecutions<List<String>> geohash(K key, V... members);
+    AsyncExecutions<List<Value<String>>> geohash(K key, V... members);
 
     /**
      * Retrieve members selected by distance with the center of {@code longitude} and {@code latitude}.
@@ -133,7 +130,7 @@ public interface NodeSelectionGeoAsyncCommands<K, V> {
      * @return a list of {@link GeoCoordinates}s representing the x,y position of each element specified in the arguments. For
      *         missing elements {@literal null} is returned.
      */
-    AsyncExecutions<List<GeoCoordinates>> geopos(K key, V... members);
+    AsyncExecutions<List<Value<GeoCoordinates>>> geopos(K key, V... members);
 
     /**
      *
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java
index 6e9d1c6337..e12c0d5207 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java
@@ -7,7 +7,6 @@
 import com.lambdaworks.redis.StreamScanCursor;
 import com.lambdaworks.redis.ValueScanCursor;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands on a node selection for Sets.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
index 25d70d1654..ef554b017f 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
@@ -2,10 +2,13 @@
 
 import java.util.List;
 import java.util.Map;
-
-import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
+import com.lambdaworks.redis.BitFieldArgs;
+import com.lambdaworks.redis.KeyValue;
+import com.lambdaworks.redis.SetArgs;
+import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands on a node selection for Strings.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisAdvancedClusterReactiveCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
similarity index 84%
rename from src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisAdvancedClusterReactiveCommands.java
rename to src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
index 8afbd0e3ca..1987f1d6a0 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisAdvancedClusterReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
@@ -1,22 +1,24 @@
-package com.lambdaworks.redis.cluster.api.rx;
+package com.lambdaworks.redis.cluster.api.reactive;
 
 import java.util.Map;
 
 import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.rx.*;
+import com.lambdaworks.redis.api.reactive.RedisKeyReactiveCommands;
+import com.lambdaworks.redis.api.reactive.RedisScriptingReactiveCommands;
+import com.lambdaworks.redis.api.reactive.RedisServerReactiveCommands;
+import com.lambdaworks.redis.api.reactive.RedisStringReactiveCommands;
 import com.lambdaworks.redis.cluster.ClusterClientOptions;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 
-import rx.Completable;
-import rx.Observable;
-import rx.Single;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
  * Advanced reactive and thread-safe Redis Cluster API.
  *
  * @author Mark Paluch
- * @since 4.0
+ * @since 5.0
  */
 public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisClusterReactiveCommands<K, V> {
 
@@ -54,7 +56,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return Long integer-reply The number of keys that were removed.
      * @see RedisKeyReactiveCommands#del(Object[])
      */
-    Single<Long> del(K... keys);
+    Mono<Long> del(K... keys);
 
     /**
      * Unlink one or more keys with pipelining. Cross-slot keys will result in multiple calls to the particular cluster nodes.
@@ -63,15 +65,16 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return Long integer-reply The number of keys that were removed.
      * @see RedisKeyReactiveCommands#unlink(Object[])
      */
-    Single<Long> unlink(K... keys);
+    Mono<Long> unlink(K... keys);
 
     /**
-     * Determine how many keys exist with pipelining. Cross-slot keys will result in multiple calls to the particular cluster nodes.
+     * Determine how many keys exist with pipelining. Cross-slot keys will result in multiple calls to the particular cluster
+     * nodes.
      *
      * @param keys the keys
      * @return Long integer-reply specifically: Number of existing keys
      */
-    Single<Long> exists(K... keys);
+    Mono<Long> exists(K... keys);
 
     /**
      * Get the values of all the given keys with pipelining. Cross-slot keys will result in multiple calls to the particular
@@ -81,7 +84,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return V array-reply list of values at the specified keys.
      * @see RedisStringReactiveCommands#mget(Object[])
      */
-    Observable<KeyValue<K, V>> mget(K... keys);
+    Flux<KeyValue<K, V>> mget(K... keys);
 
     /**
      * Set multiple keys to multiple values with pipelining. Cross-slot keys will result in multiple calls to the particular
@@ -91,7 +94,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail.
      * @see RedisStringReactiveCommands#mset(Map)
      */
-    Single<String> mset(Map<K, V> map);
+    Mono<String> mset(Map<K, V> map);
 
     /**
      * Set multiple keys to multiple values, only if none of the keys exist with pipelining. Cross-slot keys will result in
@@ -104,7 +107,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      *
      * @see RedisStringReactiveCommands#msetnx(Map)
      */
-    Single<Boolean> msetnx(Map<K, V> map);
+    Mono<Boolean> msetnx(Map<K, V> map);
 
     /**
      * Set the current connection name on all cluster nodes with pipelining.
@@ -113,7 +116,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return simple-string-reply {@code OK} if the connection name was successfully set.
      * @see RedisServerReactiveCommands#clientSetname(Object)
      */
-    Single<String> clientSetname(K name);
+    Mono<String> clientSetname(K name);
 
     /**
      * Remove all keys from all databases on all cluster masters with pipelining.
@@ -121,7 +124,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return String simple-string-reply
      * @see RedisServerReactiveCommands#flushall()
      */
-    Single<String> flushall();
+    Mono<String> flushall();
 
     /**
      * Remove all keys from the current database on all cluster masters with pipelining.
@@ -129,7 +132,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return String simple-string-reply
      * @see RedisServerReactiveCommands#flushdb()
      */
-    Single<String> flushdb();
+    Mono<String> flushdb();
 
     /**
      * Return the number of keys in the selected database on all cluster masters.
@@ -137,7 +140,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return Long integer-reply
      * @see RedisServerReactiveCommands#dbsize()
      */
-    Single<Long> dbsize();
+    Mono<Long> dbsize();
 
     /**
      * Find all keys matching the given pattern on all cluster masters.
@@ -146,7 +149,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return List&lt;K&gt; array-reply list of keys matching {@code pattern}.
      * @see RedisKeyReactiveCommands#keys(Object)
      */
-    Observable<K> keys(K pattern);
+    Flux<K> keys(K pattern);
 
     /**
      * Find all keys matching the given pattern on all cluster masters.
@@ -156,7 +159,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return Long array-reply list of keys matching {@code pattern}.
      * @see RedisKeyReactiveCommands#keys(KeyStreamingChannel, Object)
      */
-    Single<Long> keys(KeyStreamingChannel<K> channel, K pattern);
+    Mono<Long> keys(KeyStreamingChannel<K> channel, K pattern);
 
     /**
      * Return a random key from the keyspace on a random master.
@@ -164,7 +167,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
      * @see RedisKeyReactiveCommands#randomkey()
      */
-    Single<V> randomkey();
+    Mono<V> randomkey();
 
     /**
      * Remove all the scripts from the script cache on all cluster nodes.
@@ -172,7 +175,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return String simple-string-reply
      * @see RedisScriptingReactiveCommands#scriptFlush()
      */
-    Single<String> scriptFlush();
+    Mono<String> scriptFlush();
 
     /**
      * Kill the script currently in execution on all cluster nodes. This call does not fail even if no scripts are running.
@@ -180,7 +183,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return String simple-string-reply, always {@literal OK}.
      * @see RedisScriptingReactiveCommands#scriptKill()
      */
-    Single<String> scriptKill();
+    Mono<String> scriptKill();
 
     /**
      * Synchronously save the dataset to disk and then shut down all nodes of the cluster.
@@ -188,7 +191,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @param save {@literal true} force save operation
      * @see RedisServerReactiveCommands#shutdown(boolean)
      */
-    Completable shutdown(boolean save);
+    Mono<Void> shutdown(boolean save);
 
     /**
      * Incrementally iterate the keys space over the whole Cluster.
@@ -196,7 +199,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      * @see RedisKeyReactiveCommands#scan(ScanArgs)
      */
-    Single<KeyScanCursor<K>> scan();
+    Mono<KeyScanCursor<K>> scan();
 
     /**
      * Incrementally iterate the keys space over the whole Cluster.
@@ -205,7 +208,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      * @see RedisKeyReactiveCommands#scan(ScanArgs)
      */
-    Single<KeyScanCursor<K>> scan(ScanArgs scanArgs);
+    Mono<KeyScanCursor<K>> scan(ScanArgs scanArgs);
 
     /**
      * Incrementally iterate the keys space over the whole Cluster.
@@ -216,7 +219,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      * @see RedisKeyReactiveCommands#scan(ScanCursor, ScanArgs)
      */
-    Single<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs);
+    Mono<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate the keys space over the whole Cluster.
@@ -226,7 +229,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      * @see RedisKeyReactiveCommands#scan(ScanCursor)
      */
-    Single<KeyScanCursor<K>> scan(ScanCursor scanCursor);
+    Mono<KeyScanCursor<K>> scan(ScanCursor scanCursor);
 
     /**
      * Incrementally iterate the keys space over the whole Cluster.
@@ -235,7 +238,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return StreamScanCursor scan cursor.
      * @see RedisKeyReactiveCommands#scan(KeyStreamingChannel)
      */
-    Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel);
+    Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel);
 
     /**
      * Incrementally iterate the keys space over the whole Cluster.
@@ -245,7 +248,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return StreamScanCursor scan cursor.
      * @see RedisKeyReactiveCommands#scan(KeyStreamingChannel, ScanArgs)
      */
-    Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs);
+    Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate the keys space over the whole Cluster.
@@ -257,7 +260,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return StreamScanCursor scan cursor.
      * @see RedisKeyReactiveCommands#scan(KeyStreamingChannel, ScanCursor, ScanArgs)
      */
-    Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs);
+    Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs);
 
     /**
      * Incrementally iterate the keys space over the whole Cluster.
@@ -268,7 +271,7 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @return StreamScanCursor scan cursor.
      * @see RedisKeyReactiveCommands#scan(ScanCursor, ScanArgs)
      */
-    Single<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor);
+    Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor);
 
     /**
      * Touch one or more keys with pipelining. Touch sets the last accessed time for a key. Non-exsitent keys wont get created.
@@ -277,6 +280,6 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      * @param keys the keys
      * @return Long integer-reply the number of found keys.
      */
-    Single<Long> touch(K... keys);
+    Mono<Long> touch(K... keys);
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisClusterReactiveCommands.java
similarity index 82%
rename from src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java
rename to src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisClusterReactiveCommands.java
index f3365643a3..97f4289a34 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisClusterReactiveCommands.java
@@ -1,13 +1,13 @@
-package com.lambdaworks.redis.cluster.api.rx;
+package com.lambdaworks.redis.cluster.api.reactive;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import com.lambdaworks.redis.KeyValue;
-import rx.Observable;
+import com.lambdaworks.redis.api.reactive.*;
 
-import com.lambdaworks.redis.api.rx.*;
-import rx.Single;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
  * A complete reactive and thread-safe cluster Redis API with 400+ Methods.
@@ -15,7 +15,7 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
- * @since 4.0
+ * @since 5.0
  */
 public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>,
         RedisStringReactiveCommands<K, V>, RedisListReactiveCommands<K, V>, RedisSetReactiveCommands<K, V>,
@@ -36,7 +36,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param password the password
      * @return String simple-string-reply
      */
-    Single<String> auth(String password);
+    Mono<String> auth(String password);
 
     /**
      * Generate a new config epoch, incrementing the current epoch, assign the new epoch to this node, WITHOUT any consensus and
@@ -45,7 +45,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @return String simple-string-reply If the new config epoch is generated and assigned either BUMPED (epoch) or STILL
      *         (epoch) are returned.
      */
-    Single<String> clusterBumpepoch();
+    Mono<String> clusterBumpepoch();
 
     /**
      * Meet another cluster node to include the node into the cluster. The command starts the cluster handshake and returns with
@@ -55,7 +55,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param port port number.
      * @return String simple-string-reply
      */
-    Single<String> clusterMeet(String ip, int port);
+    Mono<String> clusterMeet(String ip, int port);
 
     /**
      * Blacklist and remove the cluster node from the cluster.
@@ -63,7 +63,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param nodeId the node Id
      * @return String simple-string-reply
      */
-    Single<String> clusterForget(String nodeId);
+    Mono<String> clusterForget(String nodeId);
 
     /**
      * Adds slots to the cluster node. The current node will become the master for the specified slots.
@@ -71,7 +71,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param slots one or more slots from {@literal 0} to {@literal 16384}
      * @return String simple-string-reply
      */
-    Single<String> clusterAddSlots(int... slots);
+    Mono<String> clusterAddSlots(int... slots);
 
     /**
      * Removes slots from the cluster node.
@@ -79,7 +79,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param slots one or more slots from {@literal 0} to {@literal 16384}
      * @return String simple-string-reply
      */
-    Single<String> clusterDelSlots(int... slots);
+    Mono<String> clusterDelSlots(int... slots);
 
     /**
      * Assign a slot to a node. The command migrates the specified slot from the current node to the specified node in
@@ -89,7 +89,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param nodeId the id of the node that will become the master for the slot
      * @return String simple-string-reply
      */
-    Single<String> clusterSetSlotNode(int slot, String nodeId);
+    Mono<String> clusterSetSlotNode(int slot, String nodeId);
 
     /**
      * Clears migrating / importing state from the slot.
@@ -97,7 +97,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param slot the slot
      * @return String simple-string-reply
      */
-    Single<String> clusterSetSlotStable(int slot);
+    Mono<String> clusterSetSlotStable(int slot);
 
     /**
      * Flag a slot as {@literal MIGRATING} (outgoing) towards the node specified in {@code nodeId}. The slot must be handled by
@@ -107,7 +107,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param nodeId the id of the node is targeted to become the master for the slot
      * @return String simple-string-reply
      */
-    Single<String> clusterSetSlotMigrating(int slot, String nodeId);
+    Mono<String> clusterSetSlotMigrating(int slot, String nodeId);
 
     /**
      * Flag a slot as {@literal IMPORTING} (incoming) from the node specified in {@code nodeId}.
@@ -116,21 +116,21 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param nodeId the id of the node is the master of the slot
      * @return String simple-string-reply
      */
-    Single<String> clusterSetSlotImporting(int slot, String nodeId);
+    Mono<String> clusterSetSlotImporting(int slot, String nodeId);
 
     /**
      * Get information and statistics about the cluster viewed by the current node.
      *
      * @return String bulk-string-reply as a collection of text lines.
      */
-    Single<String> clusterInfo();
+    Mono<String> clusterInfo();
 
     /**
      * Obtain the nodeId for the currently connected node.
      *
      * @return String simple-string-reply
      */
-    Single<String> clusterMyId();
+    Mono<String> clusterMyId();
 
     /**
      * Obtain details about all cluster nodes. Can be parsed using
@@ -138,7 +138,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      *
      * @return String bulk-string-reply as a collection of text lines
      */
-    Single<String> clusterNodes();
+    Mono<String> clusterNodes();
 
     /**
      * List slaves for a certain node identified by its {@code nodeId}. Can be parsed using
@@ -148,7 +148,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as
      *         {@link #clusterNodes()} but one line per slave.
      */
-    Observable<String> clusterSlaves(String nodeId);
+    Flux<String> clusterSlaves(String nodeId);
 
     /**
      * Retrieve the list of keys within the {@code slot}.
@@ -157,7 +157,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param count maximal number of keys
      * @return List&lt;K&gt; array-reply list of keys
      */
-    Observable<K> clusterGetKeysInSlot(int slot, int count);
+    Flux<K> clusterGetKeysInSlot(int slot, int count);
 
     /**
      * Returns the number of keys in the specified Redis Cluster hash {@code slot}.
@@ -165,7 +165,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param slot the slot
      * @return Integer reply: The number of keys in the specified hash slot, or an error if the hash slot is invalid.
      */
-    Single<Long> clusterCountKeysInSlot(int slot);
+    Mono<Long> clusterCountKeysInSlot(int slot);
 
     /**
      * Returns the number of failure reports for the specified node. Failure reports are the way Redis Cluster uses in order to
@@ -175,7 +175,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param nodeId the node id
      * @return Integer reply: The number of active failure reports for the node.
      */
-    Single<Long> clusterCountFailureReports(String nodeId);
+    Mono<Long> clusterCountFailureReports(String nodeId);
 
     /**
      * Returns an integer identifying the hash slot the specified key hashes to. This command is mainly useful for debugging and
@@ -185,14 +185,14 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param key the key.
      * @return Integer reply: The hash slot number.
      */
-    Single<Long> clusterKeyslot(K key);
+    Mono<Long> clusterKeyslot(K key);
 
     /**
      * Forces a node to save the nodes.conf configuration on disk.
      *
      * @return String simple-string-reply: {@code OK} or an error if the operation fails.
      */
-    Single<String> clusterSaveconfig();
+    Mono<String> clusterSaveconfig();
 
     /**
      * This command sets a specific config epoch in a fresh node. It only works when:
@@ -204,14 +204,14 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param configEpoch the config epoch
      * @return String simple-string-reply: {@code OK} or an error if the operation fails.
      */
-    Single<String> clusterSetConfigEpoch(long configEpoch);
+    Mono<String> clusterSetConfigEpoch(long configEpoch);
 
     /**
      * Get array of cluster slots to node mappings.
      *
      * @return List&lt;Object&gt; array-reply nested list of slot ranges with IP/Port mappings.
      */
-    Observable<Object> clusterSlots();
+    Flux<Object> clusterSlots();
 
     /**
      * The asking command is required after a {@code -ASK} redirection. The client should issue {@code ASKING} before to
@@ -219,7 +219,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      *
      * @return String simple-string-reply
      */
-    Single<String> asking();
+    Mono<String> asking();
 
     /**
      * Turn this node into a slave of the node with the id {@code nodeId}.
@@ -227,7 +227,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param nodeId master node id
      * @return String simple-string-reply
      */
-    Single<String> clusterReplicate(String nodeId);
+    Mono<String> clusterReplicate(String nodeId);
 
     /**
      * Failover a cluster node. Turns the currently connected node into a master and the master into its slave.
@@ -235,7 +235,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param force do not coordinate with master if {@literal true}
      * @return String simple-string-reply
      */
-    Single<String> clusterFailover(boolean force);
+    Mono<String> clusterFailover(boolean force);
 
     /**
      * Reset a node performing a soft or hard reset:
@@ -252,14 +252,14 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * @param hard {@literal true} for hard reset. Generates a new nodeId and currentEpoch/configEpoch are set to 0
      * @return String simple-string-reply
      */
-    Single<String> clusterReset(boolean hard);
+    Mono<String> clusterReset(boolean hard);
 
     /**
      * Delete all the slots associated with the specified node. The number of deleted slots is returned.
      *
      * @return String simple-string-reply
      */
-    Single<String> clusterFlushslots();
+    Mono<String> clusterFlushslots();
 
     /**
      * Tells a Redis cluster slave node that the client is ok reading possibly stale data and is not interested in running write
@@ -267,49 +267,49 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      *
      * @return String simple-string-reply
      */
-    Single<String> readOnly();
+    Mono<String> readOnly();
 
     /**
      * Resets readOnly flag.
      *
      * @return String simple-string-reply
      */
-    Single<String> readWrite();
+    Mono<String> readWrite();
 
     /**
      * Delete a key with pipelining. Cross-slot keys will result in multiple calls to the particular cluster nodes.
      *
      * @param keys the key
-     * @return Observable&lt;Long&gt; integer-reply The number of keys that were removed.
+     * @return Flux&lt;Long&gt; integer-reply The number of keys that were removed.
      */
-    Single<Long> del(K... keys);
+    Mono<Long> del(K... keys);
 
     /**
      * Get the values of all the given keys with pipelining. Cross-slot keys will result in multiple calls to the particular
      * cluster nodes.
      *
      * @param keys the key
-     * @return Observable&lt;List&lt;V&gt;&gt; array-reply list of values at the specified keys.
+     * @return Flux&lt;List&lt;V&gt;&gt; array-reply list of values at the specified keys.
      */
-    Observable<KeyValue<K, V>> mget(K... keys);
+    Flux<KeyValue<K, V>> mget(K... keys);
 
     /**
      * Set multiple keys to multiple values with pipelining. Cross-slot keys will result in multiple calls to the particular
      * cluster nodes.
      *
      * @param map the null
-     * @return Observable&lt;String&gt; simple-string-reply always {@code OK} since {@code MSET} can't fail.
+     * @return Flux&lt;String&gt; simple-string-reply always {@code OK} since {@code MSET} can't fail.
      */
-    Single<String> mset(Map<K, V> map);
+    Mono<String> mset(Map<K, V> map);
 
     /**
      * Set multiple keys to multiple values, only if none of the keys exist with pipelining. Cross-slot keys will result in
      * multiple calls to the particular cluster nodes.
      *
      * @param map the null
-     * @return Observable&lt;Boolean&gt; integer-reply specifically:
+     * @return Flux&lt;Boolean&gt; integer-reply specifically:
      *
      *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
      */
-    Single<Boolean> msetnx(Map<K, V> map);
-}
+    Mono<Boolean> msetnx(Map<K, V> map);
+}
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/rx/package-info.java b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java
similarity index 50%
rename from src/main/java/com/lambdaworks/redis/cluster/api/rx/package-info.java
rename to src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java
index 240604692c..1477849c97 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/rx/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Cluster API for reactive commands.
  */
-package com.lambdaworks.redis.cluster.api.rx;
\ No newline at end of file
+package com.lambdaworks.redis.cluster.api.reactive;
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
index 950ef1d1fb..d502ba9011 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
@@ -1,9 +1,7 @@
 package com.lambdaworks.redis.cluster.api.sync;
 
-import com.lambdaworks.redis.GeoArgs;
-import com.lambdaworks.redis.GeoCoordinates;
-import com.lambdaworks.redis.GeoRadiusStoreArgs;
-import com.lambdaworks.redis.GeoWithin;
+import com.lambdaworks.redis.*;
+
 import java.util.List;
 import java.util.Set;
 
@@ -43,7 +41,7 @@ public interface NodeSelectionGeoCommands<K, V> {
      * @param members the members
      * @return bulk reply Geohash strings in the order of {@code members}. Returns {@literal null} if a member is not found.
      */
-    Executions<List<String>> geohash(K key, V... members);
+    Executions<List<Value<String>>> geohash(K key, V... members);
 
     /**
      * Retrieve members selected by distance with the center of {@code longitude} and {@code latitude}.
@@ -132,7 +130,7 @@ public interface NodeSelectionGeoCommands<K, V> {
      * @return a list of {@link GeoCoordinates}s representing the x,y position of each element specified in the arguments. For
      *         missing elements {@literal null} is returned.
      */
-    Executions<List<GeoCoordinates>> geopos(K key, V... members);
+    Executions<List<Value<GeoCoordinates>>> geopos(K key, V... members);
 
     /**
      *
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
index 041140dd53..98fecb27e7 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
@@ -2,11 +2,10 @@
 
 import java.util.List;
 import java.util.Map;
-
-import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 import com.lambdaworks.redis.BitFieldArgs;
+import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.SetArgs;
 import com.lambdaworks.redis.Value;
 
diff --git a/src/main/java/com/lambdaworks/redis/event/DefaultEventBus.java b/src/main/java/com/lambdaworks/redis/event/DefaultEventBus.java
index 1d16240069..08dea5b637 100644
--- a/src/main/java/com/lambdaworks/redis/event/DefaultEventBus.java
+++ b/src/main/java/com/lambdaworks/redis/event/DefaultEventBus.java
@@ -1,9 +1,8 @@
 package com.lambdaworks.redis.event;
 
-import rx.Observable;
-import rx.Scheduler;
-import rx.subjects.PublishSubject;
-import rx.subjects.Subject;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.TopicProcessor;
+import reactor.core.scheduler.Scheduler;
 
 /**
  * Default implementation for an {@link EventBus}. Events are published using a {@link Scheduler}.
@@ -13,23 +12,21 @@
  */
 public class DefaultEventBus implements EventBus {
 
-    private final Subject<Event, Event> bus;
+    private final TopicProcessor<Event> bus;
     private final Scheduler scheduler;
 
     public DefaultEventBus(Scheduler scheduler) {
-        this.bus = PublishSubject.<Event> create().toSerialized();
+        this.bus = TopicProcessor.create();
         this.scheduler = scheduler;
     }
 
     @Override
-    public Observable<Event> get() {
-        return bus.onBackpressureDrop().observeOn(scheduler);
+    public Flux<Event> get() {
+        return bus.onBackpressureDrop().publishOn(scheduler);
     }
 
     @Override
     public void publish(Event event) {
-        if (bus.hasObservers()) {
-            bus.onNext(event);
-        }
+        bus.onNext(event);
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/event/EventBus.java b/src/main/java/com/lambdaworks/redis/event/EventBus.java
index e5475fc6d5..7f65d7d0e4 100644
--- a/src/main/java/com/lambdaworks/redis/event/EventBus.java
+++ b/src/main/java/com/lambdaworks/redis/event/EventBus.java
@@ -1,6 +1,6 @@
 package com.lambdaworks.redis.event;
 
-import rx.Observable;
+import reactor.core.publisher.Flux;
 
 /**
  * Interface for an EventBus. Events can be published over the bus that are delivered to the subscribers.
@@ -11,11 +11,11 @@
 public interface EventBus {
 
     /**
-     * Subscribe to the event bus and {@link Event}s. The {@link Observable} drops events on backpressure to avoid contention.
+     * Subscribe to the event bus and {@link Event}s. The {@link Flux} drops events on backpressure to avoid contention.
      *
      * @return the observable to obtain events.
      */
-    Observable<Event> get();
+    Flux<Event> get();
 
     /**
      * Publish a {@link Event} to the bus.
diff --git a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java b/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java
index 191b4e7e6c..e348611f2d 100644
--- a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java
@@ -7,6 +7,7 @@
 import java.util.List;
 
 import com.lambdaworks.redis.GeoCoordinates;
+import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.internal.LettuceAssert;
 
@@ -15,10 +16,10 @@
  *
  * @author Mark Paluch
  */
-public class GeoCoordinatesListOutput<K, V> extends CommandOutput<K, V, List<GeoCoordinates>> implements StreamingOutput<GeoCoordinates> {
+public class GeoCoordinatesListOutput<K, V> extends CommandOutput<K, V, List<Value<GeoCoordinates>>> implements StreamingOutput<Value<GeoCoordinates>> {
 
     private Double x;
-	private Subscriber<GeoCoordinates> subscriber;
+	private Subscriber<Value<GeoCoordinates>> subscriber;
 
 	public GeoCoordinatesListOutput(RedisCodec<K, V> codec) {
         super(codec, new ArrayList<>());
@@ -35,25 +36,25 @@ public void set(ByteBuffer bytes) {
             return;
         }
 
-        subscriber.onNext(new GeoCoordinates(x, value));
+        subscriber.onNext(Value.fromNullable(new GeoCoordinates(x, value)));
         x = null;
     }
 
     @Override
     public void multi(int count) {
         if (count == -1) {
-            subscriber.onNext(null);
+            subscriber.onNext(Value.empty());
         }
     }
 
 	@Override
-	public void setSubscriber(Subscriber<GeoCoordinates> subscriber) {
+	public void setSubscriber(Subscriber<Value<GeoCoordinates>> subscriber) {
         LettuceAssert.notNull(subscriber, "Subscriber must not be null");
 		this.subscriber = subscriber;
 	}
 
 	@Override
-	public Subscriber<GeoCoordinates> getSubscriber() {
+	public Subscriber<Value<GeoCoordinates>> getSubscriber() {
 		return subscriber;
 	}
 }
diff --git a/src/main/java/com/lambdaworks/redis/output/StringValueListOutput.java b/src/main/java/com/lambdaworks/redis/output/StringValueListOutput.java
new file mode 100644
index 0000000000..14b18755f0
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/output/StringValueListOutput.java
@@ -0,0 +1,46 @@
+// Copyright (C) 2011 - Will Glozer.  All rights reserved.
+
+package com.lambdaworks.redis.output;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * {@link List} of {@link com.lambdaworks.redis.Value} output.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public class StringValueListOutput<K, V> extends CommandOutput<K, V, List<Value<String>>>
+        implements StreamingOutput<Value<String>> {
+
+    private Subscriber<Value<String>> subscriber;
+
+    public StringValueListOutput(RedisCodec<K, V> codec) {
+        super(codec, new ArrayList<>());
+        setSubscriber(ListSubscriber.of(output));
+    }
+
+    @Override
+    public void set(ByteBuffer bytes) {
+        subscriber.onNext(bytes == null ? Value.empty() : Value.fromNullable(decodeAscii(bytes)));
+    }
+
+    @Override
+    public void setSubscriber(Subscriber<Value<String>> subscriber) {
+        LettuceAssert.notNull(subscriber, "Subscriber must not be null");
+        this.subscriber = subscriber;
+    }
+
+    @Override
+    public Subscriber<Value<String>> getSubscriber() {
+        return subscriber;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
index afc9b50b5b..6677f6cbdc 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
@@ -1,22 +1,16 @@
 package com.lambdaworks.redis.pubsub;
 
-import static com.lambdaworks.redis.protocol.CommandType.*;
-
-import com.lambdaworks.redis.protocol.Command;
-import rx.Completable;
-import rx.Observable;
-import rx.Single;
-import rx.Subscriber;
+import java.util.Map;
 
 import com.lambdaworks.redis.RedisReactiveCommandsImpl;
-import com.lambdaworks.redis.api.rx.Success;
 import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.pubsub.api.rx.ChannelMessage;
-import com.lambdaworks.redis.pubsub.api.rx.PatternMessage;
-import com.lambdaworks.redis.pubsub.api.rx.RedisPubSubReactiveCommands;
+import com.lambdaworks.redis.pubsub.api.reactive.ChannelMessage;
+import com.lambdaworks.redis.pubsub.api.reactive.PatternMessage;
+import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands;
 
-import java.util.Map;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.FluxSink;
+import reactor.core.publisher.Mono;
 
 /**
  * A reactive and thread-safe API for a Redis pub/sub connection.
@@ -25,8 +19,8 @@
  * @param <V> Value type.
  * @author Mark Paluch
  */
-public class RedisPubSubReactiveCommandsImpl<K, V> extends RedisReactiveCommandsImpl<K, V> implements
-        RedisPubSubReactiveCommands<K, V> {
+public class RedisPubSubReactiveCommandsImpl<K, V> extends RedisReactiveCommandsImpl<K, V>
+        implements RedisPubSubReactiveCommands<K, V> {
 
     private PubSubCommandBuilder<K, V> commandBuilder;
 
@@ -53,51 +47,55 @@ public void addListener(RedisPubSubListener<K, V> listener) {
     }
 
     @Override
-    public Observable<PatternMessage<K, V>> observePatterns() {
+    public Flux<PatternMessage<K, V>> observePatterns() {
+        return observePatterns(FluxSink.OverflowStrategy.BUFFER);
+    }
 
-        SubscriptionPubSubListener<K, V, PatternMessage<K, V>> listener = new SubscriptionPubSubListener<K, V, PatternMessage<K, V>>() {
-            @Override
-            public void message(K pattern, K channel, V message) {
-                if (subscriber == null) {
-                    return;
-                }
+    @Override
+    public Flux<PatternMessage<K, V>> observePatterns(FluxSink.OverflowStrategy overflowStrategy) {
+        return Flux.create(sink -> {
+
+            RedisPubSubAdapter<K, V> listener = new RedisPubSubAdapter<K, V>() {
 
-                if (subscriber.isUnsubscribed()) {
-                    subscriber.onCompleted();
-                    removeListener(this);
-                    subscriber = null;
-                    return;
+                @Override
+                public void message(K pattern, K channel, V message) {
+                    sink.next(new PatternMessage<>(pattern, channel, message));
                 }
+            };
 
-                subscriber.onNext(new PatternMessage<>(pattern, channel, message));
-            }
-        };
+            addListener(listener);
+            sink.setCancellation(() -> {
+                removeListener(listener);
+            });
 
-        return Observable.create(new PubSubObservable<>(listener));
+        }, overflowStrategy);
     }
 
     @Override
-    public Observable<ChannelMessage<K, V>> observeChannels() {
+    public Flux<ChannelMessage<K, V>> observeChannels() {
+        return observeChannels(FluxSink.OverflowStrategy.BUFFER);
+    }
 
-        SubscriptionPubSubListener<K, V, ChannelMessage<K, V>> listener = new SubscriptionPubSubListener<K, V, ChannelMessage<K, V>>() {
-            @Override
-            public void message(K channel, V message) {
-                if (subscriber == null) {
-                    return;
-                }
+    @Override
+    public Flux<ChannelMessage<K, V>> observeChannels(FluxSink.OverflowStrategy overflowStrategy) {
+
+        return Flux.create(sink -> {
+
+            RedisPubSubAdapter<K, V> listener = new RedisPubSubAdapter<K, V>() {
 
-                if (subscriber.isUnsubscribed()) {
-                    subscriber.onCompleted();
-                    removeListener(this);
-                    subscriber = null;
-                    return;
+                @Override
+                public void message(K channel, V message) {
+                    sink.next(new ChannelMessage<>(channel, message));
                 }
+            };
 
-                subscriber.onNext(new ChannelMessage<>(channel, message));
-            }
-        };
+            addListener(listener);
+
+            sink.setCancellation(() -> {
+                removeListener(listener);
+            });
 
-        return Observable.create(new PubSubObservable<>(listener));
+        }, overflowStrategy);
     }
 
     /**
@@ -111,38 +109,38 @@ public void removeListener(RedisPubSubListener<K, V> listener) {
     }
 
     @Override
-    public Completable psubscribe(K... patterns) {
-        return Completable.fromObservable(createObservable(() -> commandBuilder.psubscribe(patterns)));
+    public Mono<Void> psubscribe(K... patterns) {
+        return createMono(() -> commandBuilder.psubscribe(patterns)).then();
     }
 
     @Override
-    public Completable punsubscribe(K... patterns) {
-        return Completable.fromObservable(createObservable(() -> commandBuilder.punsubscribe(patterns)));
+    public Mono<Void> punsubscribe(K... patterns) {
+        return createFlux(() -> commandBuilder.punsubscribe(patterns)).then();
     }
 
     @Override
-    public Completable subscribe(K... channels) {
-        return Completable.fromObservable(createObservable(() -> commandBuilder.subscribe(channels)));
+    public Mono<Void> subscribe(K... channels) {
+        return createFlux(() -> commandBuilder.subscribe(channels)).then();
     }
 
     @Override
-    public Completable unsubscribe(K... channels) {
-        return Completable.fromObservable(createObservable(() -> commandBuilder.unsubscribe(channels)));
+    public Mono<Void> unsubscribe(K... channels) {
+        return createFlux(() -> commandBuilder.unsubscribe(channels)).then();
     }
 
     @Override
-    public Single<Long> publish(K channel, V message) {
-        return createSingle(() -> commandBuilder.publish(channel, message));
+    public Mono<Long> publish(K channel, V message) {
+        return createMono(() -> commandBuilder.publish(channel, message));
     }
 
     @Override
-    public Observable<K> pubsubChannels(K channel) {
-        return createDissolvingObservable(() -> commandBuilder.pubsubChannels(channel));
+    public Flux<K> pubsubChannels(K channel) {
+        return createDissolvingFlux(() -> commandBuilder.pubsubChannels(channel));
     }
 
     @Override
-    public Single<Map<K, Long>> pubsubNumsub(K... channels) {
-        return createSingle(() -> commandBuilder.pubsubNumsub(channels));
+    public Mono<Map<K, Long>> pubsubNumsub(K... channels) {
+        return createMono(() -> commandBuilder.pubsubNumsub(channels));
     }
 
     @Override
@@ -151,29 +149,4 @@ public StatefulRedisPubSubConnection<K, V> getStatefulConnection() {
         return (StatefulRedisPubSubConnection<K, V>) super.getStatefulConnection();
     }
 
-    private class PubSubObservable<T> implements Observable.OnSubscribe<T> {
-
-        private SubscriptionPubSubListener<K, V, T> listener;
-
-        public PubSubObservable(SubscriptionPubSubListener<K, V, T> listener) {
-            this.listener = listener;
-        }
-
-        @Override
-        public void call(Subscriber<? super T> subscriber) {
-
-            listener.activate(subscriber);
-            subscriber.onStart();
-            addListener(listener);
-
-        }
-    }
-
-    private static class SubscriptionPubSubListener<K, V, T> extends RedisPubSubAdapter<K, V> {
-        protected Subscriber<? super T> subscriber;
-
-        public void activate(Subscriber<? super T> subscriber) {
-            this.subscriber = subscriber;
-        }
-    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java
index 92e42ff701..f71b755729 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java
@@ -2,7 +2,7 @@
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
-import com.lambdaworks.redis.pubsub.api.rx.RedisPubSubReactiveCommands;
+import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands;
 import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
index 6652c69577..123ebcf193 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
@@ -14,7 +14,7 @@
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.protocol.ConnectionWatchdog;
 import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
-import com.lambdaworks.redis.pubsub.api.rx.RedisPubSubReactiveCommands;
+import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands;
 import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
 
 import io.netty.channel.ChannelHandler;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/rx/ChannelMessage.java b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/ChannelMessage.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/pubsub/api/rx/ChannelMessage.java
rename to src/main/java/com/lambdaworks/redis/pubsub/api/reactive/ChannelMessage.java
index d1b8d49071..ee2e2f3e37 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/rx/ChannelMessage.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/ChannelMessage.java
@@ -1,4 +1,4 @@
-package com.lambdaworks.redis.pubsub.api.rx;
+package com.lambdaworks.redis.pubsub.api.reactive;
 
 /**
  * Message payload for a subscription to a channel.
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/rx/PatternMessage.java b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/PatternMessage.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/pubsub/api/rx/PatternMessage.java
rename to src/main/java/com/lambdaworks/redis/pubsub/api/reactive/PatternMessage.java
index 019c6b4bee..d210c5b7d7 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/rx/PatternMessage.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/PatternMessage.java
@@ -1,4 +1,4 @@
-package com.lambdaworks.redis.pubsub.api.rx;
+package com.lambdaworks.redis.pubsub.api.reactive;
 
 /**
  * Message payload for a subscription to a pattern.
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java
new file mode 100644
index 0000000000..d4dc4d613d
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java
@@ -0,0 +1,116 @@
+package com.lambdaworks.redis.pubsub.api.reactive;
+
+import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
+import com.lambdaworks.redis.pubsub.RedisPubSubListener;
+import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.FluxSink;
+import reactor.core.publisher.Mono;
+
+/**
+ * Asynchronous and thread-safe Redis PubSub API.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public interface RedisPubSubReactiveCommands<K, V> extends RedisReactiveCommands<K, V> {
+
+    /**
+     * Add a new listener.
+     * 
+     * @param listener Listener.
+     */
+    void addListener(RedisPubSubListener<K, V> listener);
+
+    /**
+     * Remove an existing listener.
+     * 
+     * @param listener Listener.
+     */
+    void removeListener(RedisPubSubListener<K, V> listener);
+
+    /**
+     * Flux for messages ({@literal pmessage}) received though pattern subscriptions. The connection needs to be subscribed to
+     * one or more patterns using {@link #psubscribe(Object[])}.
+     * <p>
+     * Warning! This method uses {@link reactor.core.publisher.FluxSink.OverflowStrategy#BUFFER} This does unbounded buffering
+     * and may lead to {@link OutOfMemoryError}. Use {@link #observePatterns(FluxSink.OverflowStrategy)} to specify a different
+     * strategy.
+     * </p>
+     *
+     * @return hot Flux for subscriptions to {@literal pmessage}'s.
+     */
+    Flux<PatternMessage<K, V>> observePatterns();
+
+    /**
+     * Flux for messages ({@literal pmessage}) received though pattern subscriptions. The connection needs to be subscribed to
+     * one or more patterns using {@link #psubscribe(Object[])}.
+     *
+     * @param overflowStrategy the overflow strategy to use.
+     * @return hot Flux for subscriptions to {@literal pmessage}'s.
+     */
+    Flux<PatternMessage<K, V>> observePatterns(FluxSink.OverflowStrategy overflowStrategy);
+
+    /**
+     * Flux for messages ({@literal message}) received though channel subscriptions. The connection needs to be subscribed to
+     * one or more channels using {@link #subscribe(Object[])}.
+     *
+     * <p>
+     * Warning! This method uses {@link reactor.core.publisher.FluxSink.OverflowStrategy#BUFFER} This does unbounded buffering
+     * and may lead to {@link OutOfMemoryError}. Use {@link #observeChannels(FluxSink.OverflowStrategy)} to specify a different
+     * strategy.
+     * </p>
+     * 
+     * @return hot Flux for subscriptions to {@literal message}'s.
+     */
+    Flux<ChannelMessage<K, V>> observeChannels();
+
+    /**
+     * Flux for messages ({@literal message}) received though channel subscriptions. The connection needs to be subscribed to
+     * one or more channels using {@link #subscribe(Object[])}.
+     *
+     * @param overflowStrategy the overflow strategy to use.
+     * @return hot Flux for subscriptions to {@literal message}'s.
+     */
+    Flux<ChannelMessage<K, V>> observeChannels(FluxSink.OverflowStrategy overflowStrategy);
+
+    /**
+     * Listen for messages published to channels matching the given patterns.
+     * 
+     * @param patterns the patterns
+     * @return Flux&lt;Success&gt; Flux for {@code psubscribe} command
+     */
+    Mono<Void> psubscribe(K... patterns);
+
+    /**
+     * Stop listening for messages posted to channels matching the given patterns.
+     * 
+     * @param patterns the patterns
+     * @return Flux&lt;Success&gt; Flux for {@code punsubscribe} command
+     */
+    Mono<Void> punsubscribe(K... patterns);
+
+    /**
+     * Listen for messages published to the given channels.
+     * 
+     * @param channels the channels
+     * @return Flux&lt;Success&gt; Flux for {@code subscribe} command
+     */
+    Mono<Void> subscribe(K... channels);
+
+    /**
+     * Stop listening for messages posted to the given channels.
+     * 
+     * @param channels the channels
+     * @return Flux&lt;Success&gt; Flux for {@code unsubscribe} command.
+     */
+    Mono<Void> unsubscribe(K... channels);
+
+    /**
+     * @return the underlying connection.
+     */
+    StatefulRedisPubSubConnection<K, V> getStatefulConnection();
+}
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/rx/package-info.java b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java
similarity index 50%
rename from src/main/java/com/lambdaworks/redis/pubsub/api/rx/package-info.java
rename to src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java
index 96ad27db25..8e45ee225b 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/rx/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Pub/Sub Redis API for reactive commands.
  */
-package com.lambdaworks.redis.pubsub.api.rx;
\ No newline at end of file
+package com.lambdaworks.redis.pubsub.api.reactive;
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/rx/RedisPubSubReactiveCommands.java b/src/main/java/com/lambdaworks/redis/pubsub/api/rx/RedisPubSubReactiveCommands.java
deleted file mode 100644
index 1d67dee71a..0000000000
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/rx/RedisPubSubReactiveCommands.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.lambdaworks.redis.pubsub.api.rx;
-
-import com.lambdaworks.redis.api.rx.Success;
-import rx.Completable;
-import rx.Observable;
-
-import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
-import com.lambdaworks.redis.pubsub.RedisPubSubListener;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
-
-/**
- * Asynchronous and thread-safe Redis PubSub API.
- *
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 3.0
- */
-public interface RedisPubSubReactiveCommands<K, V> extends RedisReactiveCommands<K, V> {
-
-    /**
-     * Add a new listener.
-     * 
-     * @param listener Listener.
-     */
-    void addListener(RedisPubSubListener<K, V> listener);
-
-    /**
-     * Remove an existing listener.
-     * 
-     * @param listener Listener.
-     */
-    void removeListener(RedisPubSubListener<K, V> listener);
-
-    /**
-     * Observable for messages ({@literal pmessage}) received though pattern subscriptions. The connection needs to be
-     * subscribed to one or more patterns using {@link #psubscribe(Object[])}.
-     * 
-     * @return hot observable for subscriptions to {@literal pmessage}'s.
-     */
-    Observable<PatternMessage<K, V>> observePatterns();
-
-    /**
-     * Observable for messages ({@literal message}) received though channel subscriptions. The connection needs to be subscribed
-     * to one or more channels using {@link #subscribe(Object[])}.
-     * 
-     * @return hot observable for subscriptions to {@literal message}'s.
-     */
-    Observable<ChannelMessage<K, V>> observeChannels();
-
-    /**
-     * Listen for messages published to channels matching the given patterns.
-     * 
-     * @param patterns the patterns
-     * @return Observable&lt;Success&gt; Observable for {@code psubscribe} command
-     */
-    Completable psubscribe(K... patterns);
-
-    /**
-     * Stop listening for messages posted to channels matching the given patterns.
-     * 
-     * @param patterns the patterns
-     * @return Observable&lt;Success&gt; Observable for {@code punsubscribe} command
-     */
-    Completable punsubscribe(K... patterns);
-
-    /**
-     * Listen for messages published to the given channels.
-     * 
-     * @param channels the channels
-     * @return Observable&lt;Success&gt; Observable for {@code subscribe} command
-     */
-    Completable subscribe(K... channels);
-
-    /**
-     * Stop listening for messages posted to the given channels.
-     * 
-     * @param channels the channels
-     * @return Observable&lt;Success&gt; Observable for {@code unsubscribe} command.
-     */
-    Completable unsubscribe(K... channels);
-
-    /**
-     * @return the underlying connection.
-     */
-    StatefulRedisPubSubConnection<K, V> getStatefulConnection();
-}
diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
index b39290f882..cd193c49f4 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
@@ -21,6 +21,7 @@
 import io.netty.util.internal.SystemPropertyUtil;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
+import reactor.core.scheduler.Schedulers;
 
 /**
  * Default instance of the client resources.
@@ -118,7 +119,7 @@ protected DefaultClientResources(Builder builder) {
         }
 
         if (builder.eventBus == null) {
-            eventBus = new DefaultEventBus(new RxJavaEventExecutorGroupScheduler(eventExecutorGroup));
+            eventBus = new DefaultEventBus(Schedulers.fromExecutor(eventExecutorGroup));
         } else {
             eventBus = builder.eventBus;
         }
diff --git a/src/main/java/com/lambdaworks/redis/resource/RxJavaEventExecutorGroupScheduler.java b/src/main/java/com/lambdaworks/redis/resource/RxJavaEventExecutorGroupScheduler.java
deleted file mode 100644
index 581a7b68e3..0000000000
--- a/src/main/java/com/lambdaworks/redis/resource/RxJavaEventExecutorGroupScheduler.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.lambdaworks.redis.resource;
-
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import rx.Scheduler;
-import rx.Subscription;
-import rx.functions.Action0;
-import rx.internal.schedulers.ScheduledAction;
-import rx.internal.util.SubscriptionList;
-import rx.subscriptions.CompositeSubscription;
-import rx.subscriptions.Subscriptions;
-import io.netty.util.concurrent.EventExecutor;
-import io.netty.util.concurrent.EventExecutorGroup;
-
-/**
- * A scheduler that uses a provided {@link EventExecutorGroup} instance to schedule tasks. This should typically be used as a
- * computation scheduler or any other scheduler that do not schedule blocking tasks. See also
- * https://github.com/ReactiveX/RxNetty
- * /blob/0.5.x/rxnetty-common/src/main/java/io/reactivex/netty/threads/RxJavaEventloopScheduler.java
- */
-public class RxJavaEventExecutorGroupScheduler extends Scheduler {
-
-    private final EventExecutorGroup eventLoopGroup;
-
-    public RxJavaEventExecutorGroupScheduler(EventExecutorGroup eventLoopGroup) {
-        this.eventLoopGroup = eventLoopGroup;
-    }
-
-    @Override
-    public Worker createWorker() {
-        final EventExecutor eventLoop = eventLoopGroup.next();
-        return new ScheduledExecutorServiceWorker(eventLoop);
-    }
-
-    /**
-     * This code is more or less copied from rx-netty's EventloopWorker worker code.
-     **/
-    private static class ScheduledExecutorServiceWorker extends Worker {
-
-        /**
-         * Why are there two subscription holders?
-         *
-         * The serial subscriptions are used for non-delayed schedules which are always executed (and hence removed) in order.
-         * Since SubscriptionList holds the subs as a linked list, removals are optimal for serial removes. OTOH, delayed
-         * schedules are executed (and hence removed) out of order and hence a CompositeSubscription, that stores the subs in a
-         * hash structure is more optimal for removals.
-         */
-        private final SubscriptionList serial;
-        private final CompositeSubscription timed;
-        private final SubscriptionList both;
-        private final ScheduledExecutorService scheduledExecutor;
-
-        public ScheduledExecutorServiceWorker(EventExecutor scheduledExecutor) {
-            this.scheduledExecutor = scheduledExecutor;
-            serial = new SubscriptionList();
-            timed = new CompositeSubscription();
-            both = new SubscriptionList(serial, timed);
-        }
-
-        @Override
-        public Subscription schedule(final Action0 action) {
-            return schedule(action, 0, TimeUnit.DAYS);
-        }
-
-        @Override
-        public Subscription schedule(final Action0 action, long delayTime, TimeUnit unit) {
-
-            if (isUnsubscribed()) {
-                return Subscriptions.unsubscribed();
-            }
-
-            final ScheduledAction sa;
-
-            if (delayTime <= 0) {
-                sa = new ScheduledAction(action, serial);
-                serial.add(sa);
-            } else {
-                sa = new ScheduledAction(action, timed);
-                timed.add(sa);
-            }
-
-            final Future<?> result = scheduledExecutor.schedule(sa, delayTime, unit);
-            Subscription cancelFuture = Subscriptions.create(new Action0() {
-                @Override
-                public void call() {
-                    result.cancel(false);
-                }
-            });
-            sa.add(cancelFuture); /* An unsubscribe of the returned sub should cancel the future */
-            return sa;
-        }
-
-        @Override
-        public void unsubscribe() {
-            both.unsubscribe();
-        }
-
-        @Override
-        public boolean isUnsubscribed() {
-            return both.isUnsubscribed();
-        }
-
-    }
-}
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
index fc1335f4b0..2a168de5f4 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
@@ -3,18 +3,16 @@
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.Map;
-import java.util.function.Supplier;
 
-import com.lambdaworks.redis.ReactiveCommandDispatcher;
+import com.lambdaworks.redis.AbstractRedisReactiveCommands;
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.RedisCommand;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
-import com.lambdaworks.redis.sentinel.api.rx.RedisSentinelReactiveCommands;
+import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands;
 
-import rx.Observable;
-import rx.Single;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
  * A reactive and thread-safe API for a Redis Sentinel connection.
@@ -24,75 +22,79 @@
  * @author Mark Paluch
  * @since 3.0
  */
-public class RedisSentinelReactiveCommandsImpl<K, V> implements RedisSentinelReactiveCommands<K, V> {
+public class RedisSentinelReactiveCommandsImpl<K, V> extends AbstractRedisReactiveCommands<K, V>
+        implements RedisSentinelReactiveCommands<K, V> {
 
     private final SentinelCommandBuilder<K, V> commandBuilder;
     private final StatefulConnection<K, V> connection;
 
     public RedisSentinelReactiveCommandsImpl(StatefulConnection<K, V> connection, RedisCodec<K, V> codec) {
+        super(connection, codec);
         this.connection = connection;
         commandBuilder = new SentinelCommandBuilder<K, V>(codec);
     }
 
     @Override
-    public Single<SocketAddress> getMasterAddrByName(K key) {
+    public Mono<SocketAddress> getMasterAddrByName(K key) {
+
+        Flux<V> flux = createDissolvingFlux(() -> commandBuilder.getMasterAddrByKey(key));
+
+        return flux.collectList().flatMap(list -> {
 
-        Observable<V> observable = createDissolvingObservable(() -> commandBuilder.getMasterAddrByKey(key));
-        return observable.buffer(2).map(list -> {
             if (list.isEmpty()) {
-                return null;
+                return Flux.empty();
             }
 
             LettuceAssert.isTrue(list.size() == 2, "List must contain exact 2 entries (Hostname, Port)");
             String hostname = (String) list.get(0);
             String port = (String) list.get(1);
-            return new InetSocketAddress(hostname, Integer.parseInt(port));
-        }).lastOrDefault(null).cast(SocketAddress.class).toSingle();
+            return Mono.just(new InetSocketAddress(hostname, Integer.parseInt(port)));
+        }).cast(SocketAddress.class).next();
     }
 
     @Override
-    public Observable<Map<K, V>> masters() {
-        return createDissolvingObservable(() -> commandBuilder.masters());
+    public Flux<Map<K, V>> masters() {
+        return createDissolvingFlux(commandBuilder::masters);
     }
 
     @Override
-    public Single<Map<K, V>> master(K key) {
-        return createSingle(() -> commandBuilder.master(key));
+    public Mono<Map<K, V>> master(K key) {
+        return createMono(() -> commandBuilder.master(key));
     }
 
     @Override
-    public Observable<Map<K, V>> slaves(K key) {
-        return createDissolvingObservable(() -> commandBuilder.slaves(key));
+    public Flux<Map<K, V>> slaves(K key) {
+        return createDissolvingFlux(() -> commandBuilder.slaves(key));
     }
 
     @Override
-    public Single<Long> reset(K key) {
-        return createSingle(() -> commandBuilder.reset(key));
+    public Mono<Long> reset(K key) {
+        return createMono(() -> commandBuilder.reset(key));
     }
 
     @Override
-    public Single<String> failover(K key) {
-        return createSingle(() -> commandBuilder.failover(key));
+    public Mono<String> failover(K key) {
+        return createMono(() -> commandBuilder.failover(key));
     }
 
     @Override
-    public Single<String> monitor(K key, String ip, int port, int quorum) {
-        return createSingle(() -> commandBuilder.monitor(key, ip, port, quorum));
+    public Mono<String> monitor(K key, String ip, int port, int quorum) {
+        return createMono(() -> commandBuilder.monitor(key, ip, port, quorum));
     }
 
     @Override
-    public Single<String> set(K key, String option, V value) {
-        return createSingle(() -> commandBuilder.set(key, option, value));
+    public Mono<String> set(K key, String option, V value) {
+        return createMono(() -> commandBuilder.set(key, option, value));
     }
 
     @Override
-    public Single<String> remove(K key) {
-        return createSingle(() -> commandBuilder.remove(key));
+    public Mono<String> remove(K key) {
+        return createMono(() -> commandBuilder.remove(key));
     }
 
     @Override
-    public Single<String> ping() {
-        return createSingle(() -> commandBuilder.ping());
+    public Mono<String> ping() {
+        return createMono(commandBuilder::ping);
     }
 
     // @Override
@@ -109,19 +111,4 @@ public boolean isOpen() {
     public StatefulRedisSentinelConnection<K, V> getStatefulConnection() {
         return (StatefulRedisSentinelConnection<K, V>) connection;
     }
-
-    public <T> Observable<T> createObservable(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return Observable
-                .create(new ReactiveCommandDispatcher<K, V, T>(commandSupplier, connection, false).getObservableSubscriber());
-    }
-
-    public <T> Single<T> createSingle(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return Single.create(new ReactiveCommandDispatcher<K, V, T>(commandSupplier, connection, false).getSingleSubscriber());
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T, R> R createDissolvingObservable(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return (R) Observable
-                .create(new ReactiveCommandDispatcher<>(commandSupplier, connection, true).getObservableSubscriber());
-    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java b/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
index feea14bb95..9f852dc829 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
@@ -8,7 +8,7 @@
 import com.lambdaworks.redis.protocol.RedisCommand;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
 import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
-import com.lambdaworks.redis.sentinel.api.rx.RedisSentinelReactiveCommands;
+import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands;
 import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
 import io.netty.channel.ChannelHandler;
 
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/StatefulRedisSentinelConnection.java b/src/main/java/com/lambdaworks/redis/sentinel/api/StatefulRedisSentinelConnection.java
index c09f00f444..034ba3396e 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/StatefulRedisSentinelConnection.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/StatefulRedisSentinelConnection.java
@@ -3,7 +3,7 @@
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.protocol.ConnectionWatchdog;
 import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
-import com.lambdaworks.redis.sentinel.api.rx.RedisSentinelReactiveCommands;
+import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands;
 import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
 
 /**
@@ -27,14 +27,14 @@ public interface StatefulRedisSentinelConnection<K, V> extends StatefulConnectio
     RedisSentinelCommands<K, V> sync();
 
     /**
-     * Returns the {@link RedisSentinelAsyncCommands} API for the current connection. Does not create a new connection. *
+     * Returns the {@link RedisSentinelAsyncCommands} API for the current connection. Does not create a new connection.
      * 
      * @return the asynchronous API for the underlying connection.
      */
     RedisSentinelAsyncCommands<K, V> async();
 
     /**
-     * Returns the {@link RedisSentinelReactiveCommands} API for the current connection. Does not create a new connection. *
+     * Returns the {@link RedisSentinelReactiveCommands} API for the current connection. Does not create a new connection.
      *
      * @return the reactive API for the underlying connection.
      */
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/rx/RedisSentinelReactiveCommands.java b/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java
similarity index 79%
rename from src/main/java/com/lambdaworks/redis/sentinel/api/rx/RedisSentinelReactiveCommands.java
rename to src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java
index 2bfc480db9..ab430d1d4d 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/rx/RedisSentinelReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java
@@ -1,15 +1,14 @@
-package com.lambdaworks.redis.sentinel.api.rx;
+package com.lambdaworks.redis.sentinel.api.reactive;
 
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
-import rx.Observable;
-import rx.Single;
-import rx.Completable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
- * Observable commands for Redis Sentinel.
+ * Reactive executed commands for Redis Sentinel.
  * 
  * @param <K> Key type.
  * @param <V> Value type.
@@ -25,14 +24,14 @@ public interface RedisSentinelReactiveCommands<K, V> {
      * @param key the key
      * @return SocketAddress;
      */
-    Single<SocketAddress> getMasterAddrByName(K key);
+    Mono<SocketAddress> getMasterAddrByName(K key);
 
     /**
      * Enumerates all the monitored masters and their states.
      * 
      * @return Map&lt;K, V&gt;&gt;
      */
-    Observable<Map<K, V>> masters();
+    Flux<Map<K, V>> masters();
 
     /**
      * Show the state and info of the specified master.
@@ -40,7 +39,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
      * @param key the key
      * @return Map&lt;K, V&gt;
      */
-    Single<Map<K, V>> master(K key);
+    Mono<Map<K, V>> master(K key);
 
     /**
      * Provides a list of slaves for the master with the specified name.
@@ -48,7 +47,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
      * @param key the key
      * @return Map&lt;K, V&gt;
      */
-    Observable<Map<K, V>> slaves(K key);
+    Flux<Map<K, V>> slaves(K key);
 
     /**
      * This command will reset all the masters with matching name.
@@ -56,7 +55,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
      * @param key the key
      * @return Long
      */
-    Single<Long> reset(K key);
+    Mono<Long> reset(K key);
 
     /**
      * Perform a failover.
@@ -64,7 +63,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
      * @param key the master id
      * @return String
      */
-    Single<String> failover(K key);
+    Mono<String> failover(K key);
 
     /**
      * This command tells the Sentinel to start monitoring a new master with the specified name, ip, port, and quorum.
@@ -75,7 +74,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
      * @param quorum the quorum count
      * @return String
      */
-    Single<String> monitor(K key, String ip, int port, int quorum);
+    Mono<String> monitor(K key, String ip, int port, int quorum);
 
     /**
      * Multiple option / value pairs can be specified (or none at all).
@@ -86,7 +85,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
      * 
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
-    Single<String> set(K key, String option, V value);
+    Mono<String> set(K key, String option, V value);
 
     /**
      * remove the specified master.
@@ -94,14 +93,14 @@ public interface RedisSentinelReactiveCommands<K, V> {
      * @param key the key
      * @return String
      */
-    Single<String> remove(K key);
+    Mono<String> remove(K key);
 
     /**
      * Ping the server.
      * 
      * @return String simple-string-reply
      */
-    Single<String> ping();
+    Mono<String> ping();
 
     /**
      * close the underlying connection.
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/rx/package-info.java b/src/main/java/com/lambdaworks/redis/sentinel/api/rx/package-info.java
deleted file mode 100644
index e126b5d5ab..0000000000
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/rx/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Redis Sentinel API for reactive commands.
- */
-package com.lambdaworks.redis.sentinel.api.rx;
\ No newline at end of file
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java
index 583599f7af..765b7a0ae4 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java
@@ -4,6 +4,7 @@
 import com.lambdaworks.redis.GeoCoordinates;
 import com.lambdaworks.redis.GeoRadiusStoreArgs;
 import com.lambdaworks.redis.GeoWithin;
+import com.lambdaworks.redis.Value;
 import java.util.List;
 import java.util.Set;
 
@@ -42,7 +43,7 @@ public interface RedisGeoCommands<K, V> {
      * @param members the members
      * @return bulk reply Geohash strings in the order of {@code members}. Returns {@literal null} if a member is not found.
      */
-    List<String> geohash(K key, V... members);
+    List<Value<String>> geohash(K key, V... members);
 
     /**
      * Retrieve members selected by distance with the center of {@code longitude} and {@code latitude}.
@@ -70,7 +71,7 @@ public interface RedisGeoCommands<K, V> {
     List<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
 
     /**
-     * Perform a {@link #georadius(Object, double, double, double, Unit, GeoArgs)} query and store the results in a sorted set.
+     * Perform a {@link #georadius(Object, double, double, double, GeoArgs.Unit, GeoArgs)} query and store the results in a sorted set.
      *
      * @param key the key of the geo set
      * @param longitude the longitude coordinate according to WGS84
@@ -110,7 +111,7 @@ public interface RedisGeoCommands<K, V> {
     List<GeoWithin<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
 
     /**
-     * Perform a {@link #georadiusbymember(Object, Object, double, Unit, GeoArgs)} query and store the results in a sorted set.
+     * Perform a {@link #georadiusbymember(Object, Object, double, GeoArgs.Unit, GeoArgs)} query and store the results in a sorted set.
      *
      * @param key the key of the geo set
      * @param member reference member
@@ -131,7 +132,7 @@ public interface RedisGeoCommands<K, V> {
      * @return a list of {@link GeoCoordinates}s representing the x,y position of each element specified in the arguments. For
      *         missing elements {@literal null} is returned.
      */
-    List<GeoCoordinates> geopos(K key, V... members);
+    List<Value<GeoCoordinates>> geopos(K key, V... members);
 
     /**
      *
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSetCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisSetCommands.java
index 56efcb1a10..17025aa0f2 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisSetCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisSetCommands.java
@@ -1,5 +1,6 @@
 package com.lambdaworks.redis.api;
 
+import java.util.List;
 import java.util.Set;
 
 import com.lambdaworks.redis.ScanArgs;
diff --git a/src/site/markdown/download.md.vm b/src/site/markdown/download.md.vm
index 250140c85a..eeee9ca6a8 100644
--- a/src/site/markdown/download.md.vm
+++ b/src/site/markdown/download.md.vm
@@ -66,8 +66,7 @@ Using lettuce on your classpath
     netty-transport-${netty-version}.jar
     netty-transport-native-epoll-${netty-version}.jar
     netty-handler-${netty-version}.jar
-    guava-17.0.jar
-    rxjava-1.1.9.jar
+    reactor-3.0.0.RELEASE.jar
     LatencyUtils-2.0.3.jar
     HdrHistogram-2.1.8.jar
     commons-pool2-2.4.2.jar
diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm
index 25a4d5792f..8ec6b81d05 100644
--- a/src/site/markdown/index.md.vm
+++ b/src/site/markdown/index.md.vm
@@ -72,8 +72,8 @@ Shaded JAR-File (packaged dependencies  and relocated to the `com.lambdaworks` p
   
   <exclusions>
     <exclusion>
-      <groupId>io.reactivex</groupId>
-      <artifactId>rxjava</artifactId>
+      <groupId>io.projectreactor</groupId>
+      <artifactId>reactor-core</artifactId>
     </exclusion>
     <exclusion>
       <groupId>org.latencyutils</groupId>
@@ -95,10 +95,6 @@ Shaded JAR-File (packaged dependencies  and relocated to the `com.lambdaworks` p
       <groupId>io.netty</groupId>
       <artifactId>netty-codec</artifactId>
     </exclusion>
-    <exclusion>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </exclusion>
     <exclusion>
       <groupId>io.netty</groupId>
       <artifactId>netty-transport-native-epoll</artifactId>
diff --git a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
index 770b244fd8..0c61a3e500 100644
--- a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
+++ b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
@@ -40,8 +40,8 @@ public static void main(String[] args) {
         System.out.println("Distance: " + weinheim.distance);
         System.out.println("Coordinates: " + weinheim.coordinates.x + "/" + weinheim.coordinates.y);
 
-        List<GeoCoordinates> geopos = redis.geopos(key, "Weinheim", "Train station");
-        GeoCoordinates weinheimGeopos = geopos.get(0);
+        List<Value<GeoCoordinates>> geopos = redis.geopos(key, "Weinheim", "Train station");
+        GeoCoordinates weinheimGeopos = geopos.get(0).getValue();
         System.out.println("Coordinates: " + weinheimGeopos.x + "/" + weinheimGeopos.y);
 
         redis.getStatefulConnection().close();
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
index 1dbf8a61ad..8ab4f7bcac 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
@@ -28,7 +28,7 @@ public class CreateReactiveApi {
     private static Set<String> KEEP_METHOD_RESULT_TYPE = LettuceSets.unmodifiableSet("digest", "close", "isOpen",
             "BaseRedisCommands.reset", "getStatefulConnection", "setAutoFlushCommands", "flushCommands");
 
-    private static Set<String> FORCE_OBSERVABLE_RESULT = LettuceSets.unmodifiableSet("eval", "evalsha", "dispatch");
+    private static Set<String> FORCE_FLUX_RESULT = LettuceSets.unmodifiableSet("eval", "evalsha", "dispatch");
 
     private CompilationUnitFactory factory;
 
@@ -54,9 +54,9 @@ public CreateReactiveApi(String templateName) {
         String targetPackage;
 
         if (templateName.contains("RedisSentinel")) {
-            targetPackage = "com.lambdaworks.redis.sentinel.api.rx";
+            targetPackage = "com.lambdaworks.redis.sentinel.api.reactive";
         } else {
-            targetPackage = "com.lambdaworks.redis.api.rx";
+            targetPackage = "com.lambdaworks.redis.api.reactive";
         }
 
         factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(),
@@ -69,7 +69,7 @@ public CreateReactiveApi(String templateName) {
      * @return
      */
     protected Function<String, String> commentMutator() {
-        return s -> s.replaceAll("\\$\\{intent\\}", "Observable commands").replaceAll("@since 3.0", "@since 4.0")
+        return s -> s.replaceAll("\\$\\{intent\\}", "Reactive executed commands").replaceAll("@since 3.0", "@since 4.0")
                 + "* @generated by " + getClass().getName() + "\r\n ";
     }
 
@@ -102,16 +102,16 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
 
             String typeAsString = method.getType().toStringWithoutComments().trim();
 
-            if (methodMatch(FORCE_OBSERVABLE_RESULT, method, classOfMethod)) {
-                typeAsString = "Observable<" + typeAsString + ">";
+            if (methodMatch(FORCE_FLUX_RESULT, method, classOfMethod)) {
+                typeAsString = "Flux<" + typeAsString + ">";
             } else if (typeAsString.equals("void")) {
-                typeAsString = "Completable";
+                typeAsString = "Mono<Void>";
             } else if (typeAsString.startsWith("List<")) {
-                typeAsString = "Observable<" + typeAsString.substring(5, typeAsString.length() - 1) + ">";
+                typeAsString = "Flux<" + typeAsString.substring(5, typeAsString.length() - 1) + ">";
             } else if (typeAsString.startsWith("Set<")) {
-                typeAsString = "Observable<" + typeAsString.substring(4, typeAsString.length() - 1) + ">";
+                typeAsString = "Flux<" + typeAsString.substring(4, typeAsString.length() - 1) + ">";
             } else {
-                typeAsString = "Single<" + typeAsString + ">";
+                typeAsString = "Mono<" + typeAsString + ">";
             }
 
             return new ReferenceType(new ClassOrInterfaceType(typeAsString));
@@ -129,7 +129,7 @@ private boolean methodMatch(Collection<String> methodNames, MethodDeclaration me
      * @return
      */
     protected Supplier<List<String>> importSupplier() {
-        return () -> Arrays.asList("rx.Observable", "rx.Single", "rx.Completable");
+        return () -> Arrays.asList("reactor.core.publisher.Flux", "reactor.core.publisher.Mono");
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java b/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
index ca3a9443ad..647ec54f77 100644
--- a/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
@@ -1,31 +1,29 @@
 package com.lambdaworks.redis;
 
-import static com.google.code.tempusfugit.temporal.Duration.seconds;
-import static com.google.code.tempusfugit.temporal.Timeout.timeout;
 import static com.lambdaworks.redis.AbstractRedisClientTest.client;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.metrics.CommandLatencyId;
-import com.lambdaworks.redis.metrics.CommandMetrics;
-import org.junit.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import com.lambdaworks.Wait;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.google.code.tempusfugit.temporal.Condition;
-import com.google.code.tempusfugit.temporal.WaitFor;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.event.Event;
+import com.lambdaworks.TestClientResources;
+import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.event.EventBus;
 import com.lambdaworks.redis.event.metrics.CommandLatencyEvent;
 import com.lambdaworks.redis.event.metrics.MetricEventPublisher;
+import com.lambdaworks.redis.metrics.CommandLatencyId;
+import com.lambdaworks.redis.metrics.CommandMetrics;
 
-import rx.Subscription;
-import rx.functions.Func1;
-import rx.observers.TestSubscriber;
-
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
+import reactor.test.TestSubscriber;
 
 /**
  * @author Mark Paluch
@@ -52,22 +50,26 @@ public static void afterClass() {
     @Test
     public void testMetricsEvent() throws Exception {
 
+        List<CommandLatencyEvent> events = new ArrayList<>();
         EventBus eventBus = client.getResources().eventBus();
         MetricEventPublisher publisher = (MetricEventPublisher) ReflectionTestUtils.getField(client.getResources(),
                 "metricEventPublisher");
         publisher.emitMetricsEvent();
 
-        TestSubscriber<CommandLatencyEvent> subscriber = new TestSubscriber<CommandLatencyEvent>();
-        Subscription subscription = eventBus.get().filter(redisEvent -> redisEvent instanceof CommandLatencyEvent).cast(CommandLatencyEvent.class).subscribe(subscriber);
+        TestSubscriber<CommandLatencyEvent> subscriber = TestSubscriber.create();
+        eventBus.get().filter(redisEvent -> redisEvent instanceof CommandLatencyEvent).cast(CommandLatencyEvent.class)
+                .doOnNext(events::add).subscribe(subscriber);
 
         generateTestData();
         publisher.emitMetricsEvent();
 
-        WaitFor.waitOrTimeout(() -> !subscriber.getOnNextEvents().isEmpty(), timeout(seconds(5)));
+        subscriber.request(1);
+        Wait.untilTrue(() -> !events.isEmpty()).waitOrTimeout();
 
-        subscription.unsubscribe();
+        assertThat(events).isNotEmpty();
 
-        subscriber.assertValueCount(1);
+        subscriber.assertNotComplete();
+        subscriber.cancel();
     }
 
     @Test
@@ -78,26 +80,24 @@ public void testMetrics() throws Exception {
                 "metricEventPublisher");
         publisher.emitMetricsEvent();
 
-        TestSubscriber<CommandLatencyEvent> subscriber = new TestSubscriber<CommandLatencyEvent>();
-        Subscription subscription = eventBus.get().filter(redisEvent -> redisEvent instanceof CommandLatencyEvent).cast(CommandLatencyEvent.class).subscribe(subscriber);
+        TestSubscriber<CommandLatencyEvent> subscriber = TestSubscriber.create();
+        eventBus.get().filter(redisEvent -> redisEvent instanceof CommandLatencyEvent).cast(CommandLatencyEvent.class)
+                .subscribe(subscriber);
 
         generateTestData();
         publisher.emitMetricsEvent();
 
-        WaitFor.waitOrTimeout(() -> !subscriber.getOnNextEvents().isEmpty(), timeout(seconds(5)));
-        subscription.unsubscribe();
-
-        subscriber.assertValueCount(1);
+        subscriber.awaitAndAssertNextValuesWith(event -> {
 
-        CommandLatencyEvent event = subscriber.getOnNextEvents().get(0);
+            Set<CommandLatencyId> ids = event.getLatencies().keySet();
+            CommandMetrics commandMetrics = event.getLatencies().get(ids.iterator().next());
+            assertThat(commandMetrics.getCompletion().getMin()).isBetween(0L, TimeUnit.MILLISECONDS.toMicros(100));
+            assertThat(commandMetrics.getCompletion().getMax()).isBetween(0L, TimeUnit.MILLISECONDS.toMicros(200));
 
-        Set<CommandLatencyId> ids = event.getLatencies().keySet();
-        CommandMetrics commandMetrics = event.getLatencies().get(ids.iterator().next());
-        assertThat(commandMetrics.getCompletion().getMin()).isBetween(0L, TimeUnit.MILLISECONDS.toMicros(100));
-        assertThat(commandMetrics.getCompletion().getMax()).isBetween(0L, TimeUnit.MILLISECONDS.toMicros(200));
+            assertThat(commandMetrics.getFirstResponse().getMin()).isBetween(0L, TimeUnit.MILLISECONDS.toMicros(100));
+            assertThat(commandMetrics.getFirstResponse().getMax()).isBetween(0L, TimeUnit.MILLISECONDS.toMicros(200));
+        });
 
-        assertThat(commandMetrics.getFirstResponse().getMin()).isBetween(0L, TimeUnit.MILLISECONDS.toMicros(100));
-        assertThat(commandMetrics.getFirstResponse().getMax()).isBetween(0L, TimeUnit.MILLISECONDS.toMicros(200));
     }
 
     private void generateTestData() {
diff --git a/src/test/java/com/lambdaworks/redis/CustomCodecTest.java b/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
index 693959379f..29463bc4f2 100644
--- a/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
+++ b/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
@@ -22,7 +22,7 @@
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.codec.CompressionCodec;
 import com.lambdaworks.redis.codec.RedisCodec;
-import rx.observers.TestSubscriber;
+import reactor.test.TestSubscriber;
 
 public class CustomCodecTest extends AbstractRedisClientTest {
 
@@ -41,16 +41,14 @@ public void testJavaSerializer() throws Exception {
     }
 
     @Test
-    public void testJavaSerializerRx() throws Exception {
+    public void testJavaSerializerReactive() throws Exception {
         StatefulRedisConnection<String, Object> redisConnection = client.connect(new SerializedObjectCodec());
         List<String> list = list("one", "two");
 
         TestSubscriber<String> subscriber = TestSubscriber.create();
 
         redisConnection.reactive().set(key, list, SetArgs.Builder.ex(1)).subscribe(subscriber);
-        subscriber.awaitTerminalEvent(1, TimeUnit.SECONDS);
-        subscriber.assertCompleted();
-        subscriber.assertValue("OK");
+        subscriber.awaitAndAssertNextValues("OK").assertComplete().assertNoError();
 
         redisConnection.close();
     }
diff --git a/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java b/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java
index 7df56f4634..5c1de4cd35 100644
--- a/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java
+++ b/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java
@@ -12,12 +12,10 @@
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
+import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
 
-import rx.Observable;
-import rx.Single;
-
-import javax.annotation.Resources;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
  * @author Mark Paluch
@@ -149,7 +147,7 @@ protected void submitExecutionTasks(int threads, List<Future<List<CompletableFut
      * @throws Exception
      */
     @Test
-    public void testObservablePerformance() throws Exception {
+    public void testReactivePerformance() throws Exception {
 
         // TWEAK ME
         int threads = 4;
@@ -162,25 +160,26 @@ public void testObservablePerformance() throws Exception {
 
         executor = new ThreadPoolExecutor(threads, threads, 1, TimeUnit.MINUTES, new ArrayBlockingQueue<Runnable>(totalCalls));
 
-        List<Future<List<Single<String>>>> futurama = new ArrayList<>();
+        List<Future<List<Mono<String>>>> futurama = new ArrayList<>();
 
         preheat(threads);
         final int callsPerThread = totalCalls / threads;
 
-        submitObservableTasks(threads, futurama, callsPerThread, connectionPerThread);
+        submitFluxTasks(threads, futurama, callsPerThread, connectionPerThread);
         Thread.sleep(800);
 
         long start = System.currentTimeMillis();
         latch.countDown();
 
-        for (Future<List<Single<String>>> listFuture : futurama) {
-            for (Single<String> future : listFuture.get()) {
-                if (waitForCompletion) {
-                    future.toBlocking().value();
-                } else {
-                    future.subscribe();
+        for (Future<List<Mono<String>>> listFuture : futurama) {
+
+            if (waitForCompletion) {
+                Flux.concat(listFuture.get()).last().subscribe().request(Long.MAX_VALUE);
+
+            } else
+                for (Mono<String> mono : listFuture.get()) {
+                    mono.subscribe().request(Long.MAX_VALUE);
                 }
-            }
         }
 
         long end = System.currentTimeMillis();
@@ -193,7 +192,7 @@ public void testObservablePerformance() throws Exception {
 
     }
 
-    protected void submitObservableTasks(int threads, List<Future<List<Single<String>>>> futurama, final int callsPerThread,
+    protected void submitFluxTasks(int threads, List<Future<List<Mono<String>>>> futurama, final int callsPerThread,
             final boolean connectionPerThread) {
         final StatefulRedisConnection<String, String> sharedConnection;
         if (!connectionPerThread) {
@@ -203,7 +202,7 @@ protected void submitObservableTasks(int threads, List<Future<List<Single<String
         }
 
         for (int i = 0; i < threads; i++) {
-            Future<List<Single<String>>> submit = executor.submit(() -> {
+            Future<List<Mono<String>>> submit = executor.submit(() -> {
 
                 StatefulRedisConnection<String, String> connection = sharedConnection;
                 if (connectionPerThread) {
@@ -213,13 +212,13 @@ protected void submitObservableTasks(int threads, List<Future<List<Single<String
 
                 connection.sync().ping();
 
-                List<Single<String>> observables = new ArrayList<>(callsPerThread);
+                List<Mono<String>> monos = new ArrayList<>(callsPerThread);
                 latch.await();
                 for (int i1 = 0; i1 < callsPerThread; i1++) {
-                    observables.add(reactive.ping());
+                    monos.add(reactive.ping());
                 }
 
-                return observables;
+                return monos;
             });
 
             futurama.add(submit);
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
index 409d702bb4..395de86637 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
@@ -16,21 +16,18 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-
-import rx.Observable;
-import rx.Single;
-import rx.Subscriber;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
 
 import com.lambdaworks.Delay;
 import com.lambdaworks.Wait;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
-import rx.observers.TestSubscriber;
+import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
 
-import rx.Observable;
-import rx.Subscriber;
-import rx.observers.TestSubscriber;
-import rx.schedulers.Schedulers;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
+import reactor.test.TestSubscriber;
 
 public class ReactiveConnectionTest extends AbstractRedisClientTest {
 
@@ -53,7 +50,7 @@ public void closeReactiveConnection() throws Exception {
 
     @Test
     public void doNotFireCommandUntilObservation() throws Exception {
-        Single<String> set = reactive.set(key, value);
+        Mono<String> set = reactive.set(key, value);
         Delay.delay(millis(200));
         assertThat(redis.get(key)).isNull();
         set.subscribe();
@@ -64,7 +61,7 @@ public void doNotFireCommandUntilObservation() throws Exception {
 
     @Test
     public void fireCommandAfterObserve() throws Exception {
-        assertThat(reactive.set(key, value).toBlocking().value()).isEqualTo("OK");
+        assertThat(reactive.set(key, value).block()).isEqualTo("OK");
         assertThat(redis.get(key)).isEqualTo(value);
     }
 
@@ -89,53 +86,53 @@ public void testCancelCommand() throws Exception {
         Delay.delay(millis(100));
 
         reactive.reset();
-        assertThat(result).hasSize(1).hasOnlyElementsOfType(CancellationException.class);
+        assertThat(result).isEmpty();
     }
 
     @Test
     public void testEcho() throws Exception {
-        String result = reactive.echo("echo").toBlocking().value();
+        String result = reactive.echo("echo").block();
         assertThat(result).isEqualTo("echo");
     }
 
     @Test
-    public void testSingleMultiCancel() throws Exception {
+    public void testMonoMultiCancel() throws Exception {
 
         List<Object> result = new ArrayList<>();
         reactive.clientPause(1000).subscribe();
         Delay.delay(millis(100));
 
-        Single<String> set = reactive.set(key, value);
+        Mono<String> set = reactive.set(key, value);
         set.subscribe(new CompletionSubscriber(result));
         set.subscribe(new CompletionSubscriber(result));
         set.subscribe(new CompletionSubscriber(result));
         Delay.delay(millis(100));
 
         reactive.reset();
-        assertThat(result).hasSize(3);
+        assertThat(result).isEmpty();
     }
 
     @Test
-    public void testObservableMultiCancel() throws Exception {
+    public void testFluxCancel() throws Exception {
 
         List<Object> result = new ArrayList<>();
         reactive.clientPause(1000).subscribe();
         Delay.delay(millis(100));
 
-        Observable<KeyValue<String, String>> set = reactive.mget(key, value);
+        Flux<KeyValue<String, String>> set = reactive.mget(key, value);
         set.subscribe(new CompletionSubscriber(result));
         set.subscribe(new CompletionSubscriber(result));
         set.subscribe(new CompletionSubscriber(result));
         Delay.delay(millis(100));
 
         reactive.reset();
-        assertThat(result).hasSize(3);
+        assertThat(result).isEmpty();
     }
 
     @Test
     public void multiSubscribe() throws Exception {
         reactive.set(key, "1").subscribe();
-        Single<Long> incr = reactive.incr(key);
+        Mono<Long> incr = reactive.incr(key);
         incr.subscribe();
         incr.subscribe();
         incr.subscribe();
@@ -173,10 +170,10 @@ public void reactiveChain() throws Exception {
         map.put(key, value);
         map.put("key1", "value1");
 
-        reactive.mset(map).toBlocking().value();
+        reactive.mset(map).block();
 
-        List<String> values = reactive.keys("*").flatMap(s -> reactive.get(s).toObservable()).toList().subscribeOn(Schedulers.immediate())
-                .toBlocking().first();
+        List<String> values = reactive.keys("*").flatMap(s -> reactive.get(s)).collectList().subscribeOn(Schedulers.immediate())
+                .block();
 
         assertThat(values).hasSize(2).contains(value, "value1");
     }
@@ -184,7 +181,7 @@ public void reactiveChain() throws Exception {
     @Test
     public void auth() throws Exception {
         List<Throwable> errors = new ArrayList<>();
-        reactive.auth("error").doOnError(errors::add).subscribe(new TestSubscriber<>());
+        reactive.auth("error").doOnError(errors::add).subscribe(TestSubscriber.create());
         Delay.delay(millis(50));
         assertThat(errors).hasSize(1);
     }
@@ -192,19 +189,25 @@ public void auth() throws Exception {
     @Test
     public void subscriberCompletingWithExceptionShouldBeHandledSafely() throws Exception {
 
-        Single.concat(reactive.set("keyA", "valueA"), reactive.set("keyB", "valueB")).toBlocking().last();
+        Flux.concat(reactive.set("keyA", "valueA"), reactive.set("keyB", "valueB")).collectList().block();
 
         reactive.get("keyA").subscribe(createSubscriberWithExceptionOnComplete());
         reactive.get("keyA").subscribe(createSubscriberWithExceptionOnComplete());
 
-        String valueB = reactive.get("keyB").toBlocking().toFuture().get();
+        String valueB = reactive.get("keyB").block();
         assertThat(valueB).isEqualTo("valueB");
     }
 
     private static Subscriber<String> createSubscriberWithExceptionOnComplete() {
         return new Subscriber<String>() {
+
+            @Override
+            public void onSubscribe(Subscription s) {
+                s.request(1000);
+            }
+
             @Override
-            public void onCompleted() {
+            public void onComplete() {
                 throw new RuntimeException("throwing something");
             }
 
@@ -218,7 +221,7 @@ public void onNext(String s) {
         };
     }
 
-    private static class CompletionSubscriber extends Subscriber<Object> {
+    private static class CompletionSubscriber implements Subscriber<Object> {
 
         private final List<Object> result;
 
@@ -227,7 +230,12 @@ public CompletionSubscriber(List<Object> result) {
         }
 
         @Override
-        public void onCompleted() {
+        public void onSubscribe(Subscription s) {
+            s.request(1000);
+        }
+
+        @Override
+        public void onComplete() {
             result.add("completed");
         }
 
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java b/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
index f0809a4641..d528f58d51 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
@@ -1,6 +1,7 @@
 package com.lambdaworks.redis;
 
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 import org.junit.After;
@@ -12,9 +13,9 @@
 import com.lambdaworks.RandomKeys;
 import com.lambdaworks.redis.GeoArgs.Unit;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
-
-import rx.observers.TestSubscriber;
+import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
+import org.springframework.test.util.ReflectionTestUtils;
+import reactor.test.TestSubscriber;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
@@ -44,9 +45,17 @@ public void keyListCommandShouldReturnAllElements() throws Exception {
         redis.mset(RandomKeys.MAP);
 
         reactive.keys("*").subscribe(subscriber);
-        subscriber.awaitTerminalEvent();
+        subscriber.await();
+
+        assertThat(getValues()).containsAll(RandomKeys.KEYS);
+    }
+
+    public  List<String> getValues() {
+        return (List) ReflectionTestUtils.getField(subscriber, "values");
+    }
 
-        assertThat(subscriber.getOnNextEvents()).containsAll(RandomKeys.KEYS);
+    public  <T> List<T> getValues(TestSubscriber<T> subscriber) {
+        return (List) ReflectionTestUtils.getField(subscriber, "values");
     }
 
     @Test
@@ -57,11 +66,11 @@ public void valueListCommandShouldReturnAllElements() throws Exception {
         TestSubscriber<KeyValue<String, String>> subscriber = TestSubscriber.create();
 
         reactive.mget(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT])).subscribe(subscriber);
-        subscriber.awaitTerminalEvent();
+        subscriber.await();
 
-        assertThat(subscriber.getOnNextEvents().stream().map(KeyValue::getValue).collect(Collectors.toList()))
+        assertThat(getValues(subscriber).stream().map(KeyValue::getValue).collect(Collectors.toList()))
                 .containsAll(RandomKeys.VALUES);
-        assertThat(subscriber.getOnNextEvents().stream().map(KeyValue::getKey).collect(Collectors.toList()))
+        assertThat(getValues(subscriber).stream().map(KeyValue::getKey).collect(Collectors.toList()))
                 .containsAll(RandomKeys.KEYS);
     }
 
@@ -69,9 +78,9 @@ public void valueListCommandShouldReturnAllElements() throws Exception {
     public void stringListCommandShouldReturnAllElements() throws Exception {
 
         reactive.configGet("*").subscribe(subscriber);
-        subscriber.awaitTerminalEvent();
+        subscriber.await();
 
-        assertThat(subscriber.getOnNextEvents().size()).isGreaterThan(120);
+        assertThat(getValues().size()).isGreaterThan(120);
     }
 
     @Test
@@ -80,22 +89,20 @@ public void booleanListCommandShouldReturnAllElements() throws Exception {
         TestSubscriber<Boolean> subscriber = TestSubscriber.create();
 
         reactive.scriptExists("a", "b", "c").subscribe(subscriber);
-        subscriber.awaitTerminalEvent();
-
-        assertThat(subscriber.getOnNextEvents()).hasSize(3).doesNotContainNull();
+        subscriber.awaitAndAssertNextValueCount(3);
     }
 
     @Test
     public void scoredValueListCommandShouldReturnAllElements() throws Exception {
 
-        TestSubscriber<ScoredValue<String>> subscriber = TestSubscriber.create();
+        TestSubscriber<List<ScoredValue<String>>> subscriber = TestSubscriber.create();
 
         redis.zadd(key, 1d, "v1", 2d, "v2", 3d, "v3");
 
-        reactive.zrangeWithScores(key, 0, -1).subscribe(subscriber);
-        subscriber.awaitTerminalEvent();
-
-        assertThat(subscriber.getOnNextEvents()).hasSize(3).contains(sv(1, "v1"), sv(2, "v2"), sv(3, "v3"));
+        reactive.zrangeWithScores(key, 0, -1).collectList().subscribe(subscriber);
+        subscriber.awaitAndAssertNextValuesWith(scoredValues -> {
+            assertThat(scoredValues).hasSize(3).contains(sv(1, "v1"), sv(2, "v2"), sv(3, "v3"));
+        });
     }
 
     @Test
@@ -107,9 +114,9 @@ public void geoWithinListCommandShouldReturnAllElements() throws Exception {
         redis.geoadd(key, 50, 21, "value2");
 
         reactive.georadius(key, 50, 20, 1000, Unit.km, new GeoArgs().withHash()).subscribe(subscriber);
-        subscriber.awaitTerminalEvent();
+        subscriber.await();
 
-        assertThat(subscriber.getOnNextEvents()).hasSize(2).contains(
+        assertThat(getValues(subscriber)).hasSize(2).contains(
                 new GeoWithin<String>("value1", null, 3542523898362974L, null),
                 new GeoWithin<>("value2", null, 3542609801095198L, null));
     }
@@ -117,15 +124,13 @@ public void geoWithinListCommandShouldReturnAllElements() throws Exception {
     @Test
     public void geoCoordinatesListCommandShouldReturnAllElements() throws Exception {
 
-        TestSubscriber<GeoCoordinates> subscriber = TestSubscriber.create();
+        TestSubscriber<Value<GeoCoordinates>> subscriber = TestSubscriber.create();
 
         redis.geoadd(key, 50, 20, "value1");
         redis.geoadd(key, 50, 21, "value2");
 
         reactive.geopos(key, "value1", "value2").subscribe(subscriber);
-        subscriber.awaitTerminalEvent();
-
-        assertThat(subscriber.getOnNextEvents()).hasSize(2).doesNotContainNull();
+        subscriber.awaitAndAssertNextValueCount(2);
     }
 
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
index a9f1f643b6..341be73b36 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
@@ -17,8 +17,8 @@
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
 import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.rx.RedisAdvancedClusterReactiveCommands;
-import com.lambdaworks.redis.cluster.api.rx.RedisClusterReactiveCommands;
+import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
+import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands;
 import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
 import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
index f6608daf4c..34b248f439 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
@@ -18,16 +18,16 @@
 import com.lambdaworks.RandomKeys;
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.rx.RedisAdvancedClusterReactiveCommands;
-import com.lambdaworks.redis.cluster.api.rx.RedisClusterReactiveCommands;
+import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
+import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands;
 import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
 import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.util.RxSyncInvocationHandler;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
-import rx.Observable;
-import rx.Single;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
  * @author Mark Paluch
@@ -43,7 +43,7 @@ public class AdvancedClusterReactiveTest extends AbstractClusterTest {
     @Before
     public void before() throws Exception {
         commands = clusterClient.connect().reactive();
-        syncCommands = RxSyncInvocationHandler.sync(commands.getStatefulConnection());
+        syncCommands = ReactiveSyncInvocationHandler.sync(commands.getStatefulConnection());
     }
 
     @After
@@ -65,7 +65,7 @@ public void invalidHost() throws Exception {
     @Test
     public void msetCrossSlot() throws Exception {
 
-        Single<String> mset = commands.mset(RandomKeys.MAP);
+        Mono<String> mset = commands.mset(RandomKeys.MAP);
         assertThat(block(mset)).isEqualTo("OK");
 
         for (String mykey : RandomKeys.KEYS) {
@@ -93,8 +93,8 @@ public void mgetCrossSlot() throws Exception {
         Map<Integer, List<String>> partitioned = SlotHash.partition(new Utf8StringCodec(), RandomKeys.KEYS);
         assertThat(partitioned.size()).isGreaterThan(100);
 
-        Observable<KeyValue<String, String>> observable = commands.mget(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
-        List<KeyValue<String, String>> result = observable.toList().toBlocking().single();
+        Flux<KeyValue<String, String>> flux = commands.mget(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
+        List<KeyValue<String, String>> result = flux.collectList().block();
 
         assertThat(result).hasSize(RandomKeys.COUNT);
         assertThat(result.stream().map(Value::getValue).collect(Collectors.toList())).isEqualTo(RandomKeys.VALUES);
@@ -107,8 +107,8 @@ public void mgetCrossSlotStreaming() throws Exception {
 
         KeyValueStreamingAdapter<String, String> result = new KeyValueStreamingAdapter<>();
 
-        Single<Long> single = commands.mget(result, RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
-        Long count = block(single);
+        Mono<Long> mono = commands.mget(result, RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
+        Long count = block(mono);
 
         assertThat(result.getMap()).hasSize(RandomKeys.COUNT);
         assertThat(count).isEqualTo(RandomKeys.COUNT);
@@ -119,8 +119,8 @@ public void delCrossSlot() throws Exception {
 
         msetCrossSlot();
 
-        Single<Long> single = commands.del(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
-        Long result = block(single);
+        Mono<Long> mono = commands.del(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
+        Long result = block(mono);
 
         assertThat(result).isEqualTo(RandomKeys.COUNT);
 
@@ -135,8 +135,8 @@ public void unlinkCrossSlot() throws Exception {
 
         msetCrossSlot();
 
-        Single<Long> single = commands.unlink(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
-        Long result = block(single);
+        Mono<Long> mono = commands.unlink(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
+        Long result = block(mono);
 
         assertThat(result).isEqualTo(RandomKeys.COUNT);
 
@@ -203,7 +203,7 @@ public void keys() throws Exception {
 
         writeKeysToTwoNodes();
 
-        List<String> result = commands.keys("*").toList().toBlocking().single();
+        List<String> result = commands.keys("*").collectList().block();
 
         assertThat(result).contains(KEY_ON_NODE_1, KEY_ON_NODE_2);
     }
@@ -251,7 +251,7 @@ public void readFromSlaves() throws Exception {
         NodeSelectionAsyncTest.waitForReplication(commands.getStatefulConnection().async(), key, port4);
 
         AtomicBoolean error = new AtomicBoolean();
-        connection.get(key).doOnError(throwable -> error.set(true)).toBlocking().toFuture().get();
+        connection.get(key).doOnError(throwable -> error.set(true)).block();
 
         assertThat(error.get()).isFalse();
 
@@ -356,8 +356,8 @@ public void clusterScanStreamingWithArgs() throws Exception {
 
     }
 
-    private <T> T block(Single<T> single) {
-        return single.toBlocking().value();
+    private <T> T block(Mono<T> mono) {
+        return mono.block();
     }
 
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
index dba6a999ff..c0f5d2a81a 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
@@ -13,12 +13,12 @@
 import com.lambdaworks.redis.RedisClient;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.cluster.api.rx.RedisClusterReactiveCommands;
+import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands;
 import com.lambdaworks.redis.cluster.models.slots.ClusterSlotRange;
 import com.lambdaworks.redis.cluster.models.slots.ClusterSlotsParser;
 import com.lambdaworks.redis.internal.LettuceLists;
 
-import rx.Single;
+import reactor.core.publisher.Mono;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SuppressWarnings("unchecked")
@@ -111,7 +111,7 @@ public void testAsking() throws Exception {
     @Test
     public void testClusterSlots() throws Exception {
 
-        List<Object> reply = reactive.clusterSlots().toList().toBlocking().first();
+        List<Object> reply = reactive.clusterSlots().collectList().block();
         assertThat(reply.size()).isGreaterThan(1);
 
         List<ClusterSlotRange> parse = ClusterSlotsParser.parse(reply);
@@ -128,13 +128,13 @@ public void testClusterSlots() throws Exception {
     public void clusterSlaves() throws Exception {
 
         String nodeId = getNodeId(async.getStatefulConnection().sync());
-        List<String> result = reactive.clusterSlaves(nodeId).toList().toBlocking().first();
+        List<String> result = reactive.clusterSlaves(nodeId).collectList().block();
 
         assertThat(result.size()).isGreaterThan(0);
     }
 
-    private <T> T block(Single<T> single) {
-        return single.toBlocking().value();
+    private <T> T block(Mono<T> mono) {
+        return mono.block();
     }
 
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisRxClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java
similarity index 68%
rename from src/test/java/com/lambdaworks/redis/cluster/RedisRxClusterClientTest.java
rename to src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java
index 0981e4b517..f194e990d9 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisRxClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java
@@ -6,42 +6,37 @@
 import java.util.Collections;
 import java.util.List;
 
-import com.lambdaworks.TestClientResources;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
+import org.junit.*;
 import org.junit.runners.MethodSorters;
 
-import rx.Observable;
-
+import com.lambdaworks.TestClientResources;
 import com.lambdaworks.redis.FastShutdown;
 import com.lambdaworks.redis.RedisClient;
 import com.lambdaworks.redis.RedisException;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.rx.RedisAdvancedClusterReactiveCommands;
+import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
 import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import rx.Single;
+
+import reactor.core.publisher.Mono;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SuppressWarnings("unchecked")
-public class RedisRxClusterClientTest extends AbstractClusterTest {
+public class RedisReactiveClusterClientTest extends AbstractClusterTest {
 
     protected static RedisClient client;
 
     protected StatefulRedisClusterConnection<String, String> connection;
     protected RedisAdvancedClusterCommands<String, String> sync;
-    protected RedisAdvancedClusterReactiveCommands<String, String> rx;
+    protected RedisAdvancedClusterReactiveCommands<String, String> reactive;
 
     @BeforeClass
     public static void setupClient() throws Exception {
         setupClusterClient();
         client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port1).build());
-        clusterClient = RedisClusterClient.create(TestClientResources.get(), Collections.singletonList(RedisURI.Builder.redis(host, port1).build()));
+        clusterClient = RedisClusterClient.create(TestClientResources.get(),
+                Collections.singletonList(RedisURI.Builder.redis(host, port1).build()));
     }
 
     @AfterClass
@@ -59,7 +54,7 @@ public void before() throws Exception {
         clusterClient.reloadPartitions();
         connection = clusterClient.connect();
         sync = connection.sync();
-        rx = connection.reactive();
+        reactive = connection.reactive();
     }
 
     @After
@@ -70,10 +65,10 @@ public void after() throws Exception {
     @Test
     public void testClusterCommandRedirection() throws Exception {
         // Command on node within the default connection
-        assertThat(block(rx.set(KEY_B, "myValue1"))).isEqualTo("OK");
+        assertThat(block(reactive.set(KEY_B, "myValue1"))).isEqualTo("OK");
 
         // gets redirection to node 3
-        assertThat(block(rx.set(KEY_A, "myValue1"))).isEqualTo("OK");
+        assertThat(block(reactive.set(KEY_A, "myValue1"))).isEqualTo("OK");
     }
 
     @Test
@@ -82,10 +77,10 @@ public void getKeysInSlot() throws Exception {
         sync.set(KEY_A, value);
         sync.set(KEY_B, value);
 
-        List<String> keysA = block(rx.clusterGetKeysInSlot(SLOT_A, 10).toList());
+        List<String> keysA = block(reactive.clusterGetKeysInSlot(SLOT_A, 10).collectList());
         assertThat(keysA).isEqualTo(Collections.singletonList(KEY_A));
 
-        List<String> keysB = block(rx.clusterGetKeysInSlot(SLOT_B, 10).toList());
+        List<String> keysB = block(reactive.clusterGetKeysInSlot(SLOT_B, 10).collectList());
         assertThat(keysB).isEqualTo(Collections.singletonList(KEY_B));
     }
 
@@ -95,49 +90,45 @@ public void countKeysInSlot() throws Exception {
         sync.set(KEY_A, value);
         sync.set(KEY_B, value);
 
-        Long result = block(rx.clusterCountKeysInSlot(SLOT_A));
+        Long result = block(reactive.clusterCountKeysInSlot(SLOT_A));
         assertThat(result).isEqualTo(1L);
 
-        result = block(rx.clusterCountKeysInSlot(SLOT_B));
+        result = block(reactive.clusterCountKeysInSlot(SLOT_B));
         assertThat(result).isEqualTo(1L);
 
         int slotZZZ = SlotHash.getSlot("ZZZ".getBytes());
-        result = block(rx.clusterCountKeysInSlot(slotZZZ));
+        result = block(reactive.clusterCountKeysInSlot(slotZZZ));
         assertThat(result).isEqualTo(0L);
     }
 
     @Test
     public void testClusterCountFailureReports() throws Exception {
         RedisClusterNode ownPartition = getOwnPartition(sync);
-        assertThat(block(rx.clusterCountFailureReports(ownPartition.getNodeId()))).isGreaterThanOrEqualTo(0);
+        assertThat(block(reactive.clusterCountFailureReports(ownPartition.getNodeId()))).isGreaterThanOrEqualTo(0);
     }
 
     @Test
     public void testClusterKeyslot() throws Exception {
-        assertThat(block(rx.clusterKeyslot(KEY_A))).isEqualTo(SLOT_A);
+        assertThat(block(reactive.clusterKeyslot(KEY_A))).isEqualTo(SLOT_A);
         assertThat(SlotHash.getSlot(KEY_A)).isEqualTo(SLOT_A);
     }
 
     @Test
     public void testClusterSaveconfig() throws Exception {
-        assertThat(block(rx.clusterSaveconfig())).isEqualTo("OK");
+        assertThat(block(reactive.clusterSaveconfig())).isEqualTo("OK");
     }
 
     @Test
     public void testClusterSetConfigEpoch() throws Exception {
         try {
-            block(rx.clusterSetConfigEpoch(1L));
+            block(reactive.clusterSetConfigEpoch(1L));
         } catch (RedisException e) {
             assertThat(e).hasMessageContaining("ERR The user can assign a config epoch only");
         }
     }
 
-    private <T> T block(Observable<T> observable) {
-        return observable.toBlocking().single();
-    }
-
-    private <T> T block(Single<T> observable) {
-        return observable.toBlocking().value();
+    private <T> T block(Mono<T> mono) {
+        return mono.block();
     }
 
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
index d0da760ad7..aa1283f099 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
@@ -19,9 +19,6 @@
 import com.lambdaworks.redis.output.StatusOutput;
 import com.lambdaworks.redis.protocol.*;
 
-import rx.Observable;
-import rx.Single;
-
 /**
  * @author Mark Paluch
  */
@@ -96,19 +93,6 @@ public void standaloneFireAndForget() throws Exception {
 
     }
 
-    @Test
-    public void standaloneReactivePing() throws Exception {
-
-        RedisCommand<String, String, String> command = new Command<>(CustomCommandTest.MyCommands.PING,
-                new StatusOutput<>(new Utf8StringCodec()), null);
-        ReactiveCommandDispatcher<String, String, String> dispatcher = new ReactiveCommandDispatcher<>(command,
-                redisClusterConnection, false);
-
-        String result = Single.create(dispatcher.getSingleSubscriber()).toBlocking().value();
-
-        assertThat(result).isEqualTo("PONG");
-    }
-
     public enum MyCommands implements ProtocolKeyword {
         PING, SET, INFO;
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/HashClusterRxCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/HashClusterReactiveCommandTest.java
similarity index 82%
rename from src/test/java/com/lambdaworks/redis/cluster/commands/rx/HashClusterRxCommandTest.java
rename to src/test/java/com/lambdaworks/redis/cluster/commands/reactive/HashClusterReactiveCommandTest.java
index bdbcd39d3e..d6f2d98be3 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/HashClusterRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/HashClusterReactiveCommandTest.java
@@ -1,4 +1,4 @@
-package com.lambdaworks.redis.cluster.commands.rx;
+package com.lambdaworks.redis.cluster.commands.reactive;
 
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -12,12 +12,12 @@
 import com.lambdaworks.redis.cluster.RedisClusterClient;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.commands.HashCommandTest;
-import com.lambdaworks.util.RxSyncInvocationHandler;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
  */
-public class HashClusterRxCommandTest extends HashCommandTest {
+public class HashClusterReactiveCommandTest extends HashCommandTest {
 
     private static RedisClusterClient redisClusterClient;
     private StatefulRedisClusterConnection<String, String> clusterConnection;
@@ -41,6 +41,6 @@ public void openConnection() throws Exception {
     @Override
     protected RedisCommands<String, String> connect() {
         clusterConnection = redisClusterClient.connect();
-        return RxSyncInvocationHandler.sync(redisClusterClient.connect());
+        return ReactiveSyncInvocationHandler.sync(redisClusterClient.connect());
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/KeyClusterRxCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/KeyClusterReativeCommandTest.java
similarity index 83%
rename from src/test/java/com/lambdaworks/redis/cluster/commands/rx/KeyClusterRxCommandTest.java
rename to src/test/java/com/lambdaworks/redis/cluster/commands/reactive/KeyClusterReativeCommandTest.java
index dc89c09554..aa3f4c15b1 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/KeyClusterRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/KeyClusterReativeCommandTest.java
@@ -1,7 +1,7 @@
-package com.lambdaworks.redis.cluster.commands.rx;
+package com.lambdaworks.redis.cluster.commands.reactive;
 
 import com.lambdaworks.TestClientResources;
-import com.lambdaworks.util.RxSyncInvocationHandler;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -18,7 +18,7 @@
 /**
  * @author Mark Paluch
  */
-public class KeyClusterRxCommandTest extends KeyClusterCommandTest {
+public class KeyClusterReativeCommandTest extends KeyClusterCommandTest {
     private static RedisClusterClient redisClusterClient;
     private StatefulRedisClusterConnection<String, String> clusterConnection;
 
@@ -41,7 +41,7 @@ public void openConnection() throws Exception {
 
     protected RedisCommands<String, String> connect() {
         clusterConnection = redisClusterClient.connect();
-        return RxSyncInvocationHandler.sync(redisClusterClient.connect());
+        return ReactiveSyncInvocationHandler.sync(redisClusterClient.connect());
     }
 
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/ListClusterRxCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterRxCommandTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/cluster/commands/rx/ListClusterRxCommandTest.java
rename to src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterRxCommandTest.java
index 340526ec1a..a1d265693a 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/ListClusterRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterRxCommandTest.java
@@ -1,6 +1,5 @@
-package com.lambdaworks.redis.cluster.commands.rx;
+package com.lambdaworks.redis.cluster.commands.reactive;
 
-import org.assertj.core.api.Assertions;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -14,7 +13,7 @@
 import com.lambdaworks.redis.cluster.RedisClusterClient;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.commands.ListCommandTest;
-import com.lambdaworks.util.RxSyncInvocationHandler;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -44,7 +43,7 @@ public void openConnection() throws Exception {
     @Override
     protected RedisCommands<String, String> connect() {
         clusterConnection = redisClusterClient.connect();
-        return RxSyncInvocationHandler.sync(redisClusterClient.connect());
+        return ReactiveSyncInvocationHandler.sync(redisClusterClient.connect());
     }
 
     // re-implementation because keys have to be on the same slot
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/StringClusterRxCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java
similarity index 80%
rename from src/test/java/com/lambdaworks/redis/cluster/commands/rx/StringClusterRxCommandTest.java
rename to src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java
index 127a8938a7..e44abe0626 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/StringClusterRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java
@@ -1,4 +1,4 @@
-package com.lambdaworks.redis.cluster.commands.rx;
+package com.lambdaworks.redis.cluster.commands.reactive;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -18,16 +18,16 @@
 import com.lambdaworks.redis.cluster.ClusterTestUtil;
 import com.lambdaworks.redis.cluster.RedisClusterClient;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.rx.RedisAdvancedClusterReactiveCommands;
+import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
 import com.lambdaworks.redis.commands.StringCommandTest;
-import com.lambdaworks.util.RxSyncInvocationHandler;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
-import rx.Observable;
+import reactor.core.publisher.Flux;
 
 /**
  * @author Mark Paluch
  */
-public class StringClusterRxCommandTest extends StringCommandTest {
+public class StringClusterReactiveCommandTest extends StringCommandTest {
     private static RedisClusterClient redisClusterClient;
     private StatefulRedisClusterConnection<String, String> clusterConnection;
 
@@ -50,7 +50,7 @@ public void openConnection() throws Exception {
     @Override
     protected RedisCommands<String, String> connect() {
         clusterConnection = redisClusterClient.connect();
-        return RxSyncInvocationHandler.sync(redisClusterClient.connect());
+        return ReactiveSyncInvocationHandler.sync(redisClusterClient.connect());
     }
 
     @Test
@@ -74,8 +74,8 @@ public void mget() throws Exception {
 
         RedisAdvancedClusterReactiveCommands<String, String> reactive = clusterConnection.reactive();
 
-        Observable<KeyValue<String, String>> mget = reactive.mget(key, "key1", "key2");
-        KeyValue<String, String> first = mget.toBlocking().first();
+        Flux<KeyValue<String, String>> mget = reactive.mget(key, "key1", "key2");
+        KeyValue<String, String> first = mget.next().block();
         assertThat(first).isEqualTo(KeyValue.just(key, value));
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
index 6299f62558..e92e3c5a3c 100644
--- a/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
@@ -3,22 +3,16 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
 
-import java.util.List;
-
-import com.lambdaworks.redis.TransactionResult;
 import org.junit.Test;
 
 import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.ReactiveCommandDispatcher;
 import com.lambdaworks.redis.RedisCommandExecutionException;
+import com.lambdaworks.redis.TransactionResult;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.codec.Utf8StringCodec;
 import com.lambdaworks.redis.output.StatusOutput;
 import com.lambdaworks.redis.protocol.*;
 
-import rx.Observable;
-
 /**
  * @author Mark Paluch
  */
@@ -85,19 +79,6 @@ public void standaloneFireAndForget() throws Exception {
 
     }
 
-    @Test
-    public void standaloneReactivePing() throws Exception {
-
-        RedisCommand<String, String, String> command = new Command<>(MyCommands.PING, new StatusOutput<>(new Utf8StringCodec()),
-                null);
-        ReactiveCommandDispatcher<String, String, String> dispatcher = new ReactiveCommandDispatcher<>(command,
-                getStandaloneConnection(), false);
-
-        String result = Observable.create(dispatcher.getObservableSubscriber()).toBlocking().first();
-
-        assertThat(result).isEqualTo("PONG");
-    }
-
     private StatefulRedisConnection<String, String> getStandaloneConnection() {
 
         assumeTrue(redis.getStatefulConnection() instanceof StatefulRedisConnection);
diff --git a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
index 43b2c813fa..c79cbe8f38 100644
--- a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
@@ -122,12 +122,12 @@ public void geopos() throws Exception {
 
         prepareGeo();
 
-        List<GeoCoordinates> geopos = redis.geopos(key, "Weinheim", "foobar", "Bahn");
+        List<Value<GeoCoordinates>> geopos = redis.geopos(key, "Weinheim", "foobar", "Bahn");
 
         assertThat(geopos).hasSize(3);
-        assertThat(geopos.get(0).x.doubleValue()).isEqualTo(8.6638, offset(0.001));
-        assertThat(geopos.get(1)).isNull();
-        assertThat(geopos.get(2)).isNotNull();
+        assertThat(geopos.get(0).getValue().x.doubleValue()).isEqualTo(8.6638, offset(0.001));
+        assertThat(geopos.get(1).hasValue()).isFalse();
+        assertThat(geopos.get(2).hasValue()).isTrue();
     }
 
     @Test
@@ -138,12 +138,12 @@ public void geoposWithTransaction() throws Exception {
         redis.multi();
         redis.geopos(key, "Weinheim", "foobar", "Bahn");
         redis.geopos(key, "Weinheim", "foobar", "Bahn");
-        List<GeoCoordinates> geopos = (List) redis.exec().get(1);
+        List<Value<GeoCoordinates>> geopos = redis.exec().get(1);
 
         assertThat(geopos).hasSize(3);
-        assertThat(geopos.get(0).x.doubleValue()).isEqualTo(8.6638, offset(0.001));
-        assertThat(geopos.get(1)).isNull();
-        assertThat(geopos.get(2)).isNotNull();
+        assertThat(geopos.get(0).getValue().x.doubleValue()).isEqualTo(8.6638, offset(0.001));
+        assertThat(geopos.get(1).hasValue()).isFalse();
+        assertThat(geopos.get(2).hasValue()).isTrue();
     }
 
     @Test
@@ -219,9 +219,9 @@ public void geohash() throws Exception {
 
         prepareGeo();
 
-        List<String> geohash = redis.geohash(key, "Weinheim", "Bahn", "dunno");
+        List<Value<String>> geohash = redis.geohash(key, "Weinheim", "Bahn", "dunno");
 
-        assertThat(geohash).containsSequence("u0y1v0kffz0", "u0y1vhvuvm0", null);
+        assertThat(geohash).containsSequence(Value.just("u0y1v0kffz0"), Value.just("u0y1vhvuvm0"), Value.empty());
     }
 
     @Test
@@ -229,7 +229,7 @@ public void geohashUnknownKey() throws Exception {
 
         prepareGeo();
 
-        List<String> geohash = redis.geohash("dunno", "member");
+        List<Value<String>> geohash = redis.geohash("dunno", "member");
 
         assertThat(geohash).isEmpty();
     }
@@ -244,9 +244,9 @@ public void geohashWithTransaction() throws Exception {
         redis.geohash(key, "Weinheim", "Bahn", "dunno");
         TransactionResult exec = redis.exec();
 
-        List<String> geohash = exec.get(1);
+        List<Value<String>> geohash = exec.get(1);
 
-        assertThat(geohash).containsSequence("u0y1v0kffz0", "u0y1vhvuvm0", null);
+        assertThat(geohash).containsSequence(Value.just("u0y1v0kffz0"), Value.just("u0y1vhvuvm0"), Value.empty());
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
new file mode 100644
index 0000000000..8a17a22feb
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
@@ -0,0 +1,17 @@
+package com.lambdaworks.redis.commands.reactive;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.BitCommandTest;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+
+/**
+ * @author Mark Paluch
+ */
+public class BitReactiveCommandTest extends BitCommandTest {
+    @Override
+    protected RedisCommands<String, String> connect() {
+        bitstring = ReactiveSyncInvocationHandler.sync(client.connect(new BitStringCodec()));
+        return ReactiveSyncInvocationHandler.sync(client.connect());
+    }
+
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
new file mode 100644
index 0000000000..4dcb02ab84
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
@@ -0,0 +1,57 @@
+package com.lambdaworks.redis.commands.reactive;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.CustomCommandTest;
+import com.lambdaworks.redis.output.ValueListOutput;
+import com.lambdaworks.redis.output.ValueOutput;
+import com.lambdaworks.redis.protocol.CommandArgs;
+import com.lambdaworks.redis.protocol.CommandType;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+
+import reactor.core.publisher.Flux;
+import reactor.test.TestSubscriber;
+
+/**
+ * @author Mark Paluch
+ */
+public class CustomReactiveCommandTest extends CustomCommandTest {
+
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return ReactiveSyncInvocationHandler.sync(client.connect());
+    }
+
+    @Test
+    public void dispatchGetAndSet() throws Exception {
+
+        redis.set(key, value);
+        RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
+
+        Flux<String> flux = reactive.dispatch(CommandType.GET, new ValueOutput<>(utf8StringCodec),
+                new CommandArgs<>(utf8StringCodec).addKey(key));
+
+        TestSubscriber<String> testSubscriber = TestSubscriber.subscribe(flux);
+        testSubscriber.awaitAndAssertNextValues(value).assertComplete().assertNoError();
+    }
+
+    @Test
+    public void dispatchList() throws Exception {
+
+        redis.rpush(key, "a", "b", "c");
+        RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
+
+        Flux<String> flux = reactive.dispatch(CommandType.LRANGE, new ValueListOutput<>(utf8StringCodec),
+                new CommandArgs<>(utf8StringCodec).addKey(key).add(0).add(-1));
+
+        TestSubscriber<String> testSubscriber = TestSubscriber.subscribe(flux);
+        testSubscriber.awaitAndAssertNextValues("a", "b", "c").assertComplete().assertNoError();
+    }
+
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
new file mode 100644
index 0000000000..2ddbdbbc66
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
@@ -0,0 +1,13 @@
+package com.lambdaworks.redis.commands.reactive;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.GeoCommandTest;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+
+public class GeoReactiveCommandTest extends GeoCommandTest {
+
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return ReactiveSyncInvocationHandler.sync(client.connect());
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java
new file mode 100644
index 0000000000..cb54b23aee
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java
@@ -0,0 +1,13 @@
+package com.lambdaworks.redis.commands.reactive;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.HLLCommandTest;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+
+public class HLLReactiveCommandTest extends HLLCommandTest {
+
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return ReactiveSyncInvocationHandler.sync(client.connect());
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java
new file mode 100644
index 0000000000..492f7cf1b8
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java
@@ -0,0 +1,14 @@
+package com.lambdaworks.redis.commands.reactive;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.HashCommandTest;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+
+public class HashReactiveCommandTest extends HashCommandTest {
+
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return ReactiveSyncInvocationHandler.sync(client.connect());
+    }
+
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java
new file mode 100644
index 0000000000..5258ccc205
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java
@@ -0,0 +1,12 @@
+package com.lambdaworks.redis.commands.reactive;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.KeyCommandTest;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+
+public class KeyReactiveCommandTest extends KeyCommandTest {
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return ReactiveSyncInvocationHandler.sync(client.connect());
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java
new file mode 100644
index 0000000000..08aace213c
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java
@@ -0,0 +1,12 @@
+package com.lambdaworks.redis.commands.reactive;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.ListCommandTest;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+
+public class ListReactiveCommandTest extends ListCommandTest {
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return ReactiveSyncInvocationHandler.sync(client.connect());
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java
new file mode 100644
index 0000000000..93b4f43c7f
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java
@@ -0,0 +1,12 @@
+package com.lambdaworks.redis.commands.reactive;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.NumericCommandTest;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+
+public class NumericReactiveCommandTest extends NumericCommandTest {
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return ReactiveSyncInvocationHandler.sync(client.connect());
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java
new file mode 100644
index 0000000000..92546430af
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java
@@ -0,0 +1,14 @@
+package com.lambdaworks.redis.commands.reactive;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.ScriptingCommandTest;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+
+public class ScriptingReactiveCommandTest extends ScriptingCommandTest {
+
+
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return ReactiveSyncInvocationHandler.sync(client.connect());
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/ServerRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java
similarity index 82%
rename from src/test/java/com/lambdaworks/redis/commands/rx/ServerRxCommandTest.java
rename to src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java
index f90eef80ca..150d40a2b6 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/ServerRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java
@@ -1,16 +1,16 @@
-package com.lambdaworks.redis.commands.rx;
+package com.lambdaworks.redis.commands.reactive;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.lambdaworks.util.RxSyncInvocationHandler;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
+import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.ServerCommandTest;
 
-public class ServerRxCommandTest extends ServerCommandTest {
+public class ServerReactiveCommandTest extends ServerCommandTest {
 
     private RedisReactiveCommands<String, String> reactive;
 
@@ -22,7 +22,7 @@ public void openConnection() throws Exception {
 
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connect());
+        return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 
     /**
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java
new file mode 100644
index 0000000000..5b588e81f7
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java
@@ -0,0 +1,14 @@
+package com.lambdaworks.redis.commands.reactive;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.SetCommandTest;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+
+public class SetReactiveCommandTest extends SetCommandTest {
+
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return ReactiveSyncInvocationHandler.sync(client.connect());
+    }
+
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java
new file mode 100644
index 0000000000..87127a1f49
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java
@@ -0,0 +1,12 @@
+package com.lambdaworks.redis.commands.reactive;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.SortCommandTest;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+
+public class SortReactiveCommandTest extends SortCommandTest {
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return ReactiveSyncInvocationHandler.sync(client.connect());
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java
new file mode 100644
index 0000000000..68b190e01a
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java
@@ -0,0 +1,12 @@
+package com.lambdaworks.redis.commands.reactive;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.SortedSetCommandTest;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+
+public class SortedSetReactiveCommandTest extends SortedSetCommandTest {
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return ReactiveSyncInvocationHandler.sync(client.connect());
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/StringRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
similarity index 63%
rename from src/test/java/com/lambdaworks/redis/commands/rx/StringRxCommandTest.java
rename to src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
index 0392f10e40..e3c69eed09 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/StringRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
@@ -1,21 +1,20 @@
-package com.lambdaworks.redis.commands.rx;
+package com.lambdaworks.redis.commands.reactive;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.util.RxSyncInvocationHandler;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 import org.junit.Test;
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.StringCommandTest;
+import reactor.core.publisher.Flux;
 
-import rx.Observable;
-
-public class StringRxCommandTest extends StringCommandTest {
+public class StringReactiveCommandTest extends StringCommandTest {
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connect());
+        return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 
     @Test
@@ -27,8 +26,8 @@ public void mget() throws Exception {
         connection.sync().set("key1", value);
         connection.sync().set("key2", value);
 
-        Observable<KeyValue<String, String>> mget = connection.reactive().mget(key, "key1", "key2");
-        KeyValue<String, String> first = mget.toBlocking().first();
+        Flux<KeyValue<String, String>> mget = connection.reactive().mget(key, "key1", "key2");
+        KeyValue<String, String> first = mget.next().block();
         assertThat(first).isEqualTo(KeyValue.just(key, value));
 
         connection.close();
@@ -41,8 +40,8 @@ public void mgetEmpty() throws Exception {
 
         connection.sync().set(key, value);
 
-        Observable<KeyValue<String, String>> mget = connection.reactive().mget("unknown");
-        KeyValue<String, String> first = mget.toBlocking().first();
+        Flux<KeyValue<String, String>> mget = connection.reactive().mget("unknown");
+        KeyValue<String, String> first = mget.next().block();
         assertThat(first).isEqualTo(KeyValue.empty("unknown"));
 
         connection.close();
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
similarity index 66%
rename from src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
rename to src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
index 6eebbd37e7..a949512c4d 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/TransactionRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
@@ -1,11 +1,9 @@
-package com.lambdaworks.redis.commands.rx;
+package com.lambdaworks.redis.commands.reactive;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.Iterator;
 import java.util.List;
 
-import com.lambdaworks.redis.TransactionResult;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -13,24 +11,24 @@
 import com.lambdaworks.redis.ClientOptions;
 import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
+import com.lambdaworks.redis.TransactionResult;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.TransactionCommandTest;
-import com.lambdaworks.redis.internal.LettuceLists;
-import com.lambdaworks.util.RxSyncInvocationHandler;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
-import rx.Observable;
-import rx.Single;
-import rx.observables.BlockingObservable;
-import rx.observers.TestSubscriber;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.test.TestSubscriber;
 
-public class TransactionRxCommandTest extends TransactionCommandTest {
+public class TransactionReactiveCommandTest extends TransactionCommandTest {
 
     private RedisReactiveCommands<String, String> commands;
 
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connect());
+        return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 
     @Before
@@ -58,6 +56,25 @@ public void discard() throws Exception {
         assertThat(block(commands.get(key))).isNull();
     }
 
+    @Test
+    public void watchRollback() throws Exception {
+
+        StatefulRedisConnection<String, String> otherConnection = client.connect();
+
+        otherConnection.sync().set(key, value);
+
+        assertThat(block(commands.watch(key))).isEqualTo("OK");
+        assertThat(block(commands.multi())).isEqualTo("OK");
+
+        commands.set(key, value);
+
+        otherConnection.sync().del(key);
+
+        TransactionResult transactionResult = block(commands.exec());
+        assertThat(transactionResult).isNotNull();
+        assertThat(transactionResult.wasRolledBack()).isTrue();
+    }
+
     @Test
     public void execSingular() throws Exception {
 
@@ -83,7 +100,7 @@ public void errorInMulti() throws Exception {
     }
 
     @Test
-    public void resultOfMultiIsContainedInCommandObservables() throws Exception {
+    public void resultOfMultiIsContainedInCommandFlux() throws Exception {
 
         TestSubscriber<String> set1 = TestSubscriber.create();
         TestSubscriber<String> set2 = TestSubscriber.create();
@@ -98,12 +115,12 @@ public void resultOfMultiIsContainedInCommandObservables() throws Exception {
         commands.llen("something").subscribe(llen);
         commands.exec().subscribe(exec);
 
-        exec.awaitTerminalEvent();
+        exec.await();
 
-        set1.assertValue("OK");
-        set2.assertValue("OK");
+        set1.awaitAndAssertNextValues("OK");
+        set2.awaitAndAssertNextValues("OK");
         mget.assertValues(KeyValue.just("key1", "value1"), KeyValue.just("key2", "value2"));
-        llen.assertValue(0L);
+        llen.awaitAndAssertNextValues(0L);
     }
 
     @Test
@@ -118,28 +135,16 @@ public void resultOfMultiIsContainedInExecObservable() throws Exception {
         commands.llen("something").subscribe();
         commands.exec().subscribe(exec);
 
-        exec.awaitTerminalEvent();
-
-        assertThat(exec.getOnNextEvents().get(0)).hasSize(4).containsExactly("OK", "OK",
-                list(kv("key1", "value1"), kv("key2", "value2")), 0L);
-    }
-
-    protected <T> T first(Observable<T> observable) {
-        BlockingObservable<T> blocking = observable.toBlocking();
-        Iterator<T> iterator = blocking.getIterator();
-        if (iterator.hasNext()) {
-            return iterator.next();
-        }
-        return null;
+        exec.awaitAndAssertNextValuesWith(object -> {
+            assertThat(object).hasSize(4).containsExactly("OK", "OK", list(kv("key1", "value1"), kv("key2", "value2")), 0L);
+        }).assertNoError();
     }
 
-    protected <T> T block(Single<T> single) {
-        return single.toBlocking().value();
+    protected <T> T block(Mono<T> mono) {
+        return mono.block();
     }
 
-    protected <T> List<T> all(Observable<T> observable) {
-        BlockingObservable<T> blocking = observable.toBlocking();
-        Iterator<T> iterator = blocking.getIterator();
-        return LettuceLists.newList(iterator);
+    protected <T> List<T> all(Flux<T> flux) {
+        return flux.collectList().block();
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/BitRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/BitRxCommandTest.java
deleted file mode 100644
index 4bcf9c148d..0000000000
--- a/src/test/java/com/lambdaworks/redis/commands/rx/BitRxCommandTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.lambdaworks.redis.commands.rx;
-
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.BitCommandTest;
-import com.lambdaworks.util.RxSyncInvocationHandler;
-
-/**
- * @author Mark Paluch
- */
-public class BitRxCommandTest extends BitCommandTest {
-    @Override
-    protected RedisCommands<String, String> connect() {
-        bitstring = RxSyncInvocationHandler.sync(client.connect(new BitStringCodec()));
-        return RxSyncInvocationHandler.sync(client.connect());
-    }
-
-}
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/CustomRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/CustomRxCommandTest.java
deleted file mode 100644
index 5ccbe933c9..0000000000
--- a/src/test/java/com/lambdaworks/redis/commands/rx/CustomRxCommandTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.lambdaworks.redis.commands.rx;
-
-import com.lambdaworks.util.RxSyncInvocationHandler;
-import org.junit.Test;
-
-import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.CustomCommandTest;
-import com.lambdaworks.redis.output.ValueListOutput;
-import com.lambdaworks.redis.output.ValueOutput;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandType;
-
-import rx.Observable;
-import rx.observers.TestSubscriber;
-
-/**
- * @author Mark Paluch
- */
-public class CustomRxCommandTest extends CustomCommandTest {
-
-    @Override
-    protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connect());
-    }
-
-    @Test
-    public void dispatchGetAndSet() throws Exception {
-
-        redis.set(key, value);
-        RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
-
-        Observable<String> observable = reactive.dispatch(CommandType.GET, new ValueOutput<>(utf8StringCodec),
-                new CommandArgs<>(utf8StringCodec).addKey(key));
-
-        TestSubscriber<String> testSubscriber = TestSubscriber.create();
-        observable.subscribe(testSubscriber);
-
-        testSubscriber.awaitTerminalEvent();
-        testSubscriber.assertCompleted();
-        testSubscriber.assertValue(value);
-    }
-
-    @Test
-    public void dispatchList() throws Exception {
-
-        redis.rpush(key, "a", "b", "c");
-        RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
-
-        Observable<String> observable = reactive.dispatch(CommandType.LRANGE, new ValueListOutput<>(utf8StringCodec),
-                new CommandArgs<>(utf8StringCodec).addKey(key).add(0).add(-1));
-
-        TestSubscriber<String> testSubscriber = TestSubscriber.create();
-        observable.subscribe(testSubscriber);
-
-        testSubscriber.awaitTerminalEvent();
-        testSubscriber.assertCompleted();
-        testSubscriber.assertValues("a", "b", "c");
-    }
-
-}
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/GeoRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/GeoRxCommandTest.java
deleted file mode 100644
index 685ade80c4..0000000000
--- a/src/test/java/com/lambdaworks/redis/commands/rx/GeoRxCommandTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.lambdaworks.redis.commands.rx;
-
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.GeoCommandTest;
-import com.lambdaworks.util.RxSyncInvocationHandler;
-
-public class GeoRxCommandTest extends GeoCommandTest {
-
-    @Override
-    protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/HLLRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/HLLRxCommandTest.java
deleted file mode 100644
index 2b26e3fea9..0000000000
--- a/src/test/java/com/lambdaworks/redis/commands/rx/HLLRxCommandTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.lambdaworks.redis.commands.rx;
-
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.HLLCommandTest;
-import com.lambdaworks.util.RxSyncInvocationHandler;
-
-public class HLLRxCommandTest extends HLLCommandTest {
-
-    @Override
-    protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/HashRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/HashRxCommandTest.java
deleted file mode 100644
index a6786af741..0000000000
--- a/src/test/java/com/lambdaworks/redis/commands/rx/HashRxCommandTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.lambdaworks.redis.commands.rx;
-
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.HashCommandTest;
-import com.lambdaworks.util.RxSyncInvocationHandler;
-
-public class HashRxCommandTest extends HashCommandTest {
-
-    @Override
-    protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connect());
-    }
-
-}
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/KeyRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/KeyRxCommandTest.java
deleted file mode 100644
index 92c51ed297..0000000000
--- a/src/test/java/com/lambdaworks/redis/commands/rx/KeyRxCommandTest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.lambdaworks.redis.commands.rx;
-
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.KeyCommandTest;
-import com.lambdaworks.util.RxSyncInvocationHandler;
-
-public class KeyRxCommandTest extends KeyCommandTest {
-    @Override
-    protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/ListRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/ListRxCommandTest.java
deleted file mode 100644
index 7c25c7ce56..0000000000
--- a/src/test/java/com/lambdaworks/redis/commands/rx/ListRxCommandTest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.lambdaworks.redis.commands.rx;
-
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.ListCommandTest;
-import com.lambdaworks.util.RxSyncInvocationHandler;
-
-public class ListRxCommandTest extends ListCommandTest {
-    @Override
-    protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/NumericRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/NumericRxCommandTest.java
deleted file mode 100644
index e93c0496c9..0000000000
--- a/src/test/java/com/lambdaworks/redis/commands/rx/NumericRxCommandTest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.lambdaworks.redis.commands.rx;
-
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.NumericCommandTest;
-import com.lambdaworks.util.RxSyncInvocationHandler;
-
-public class NumericRxCommandTest extends NumericCommandTest {
-    @Override
-    protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/ScriptingRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/ScriptingRxCommandTest.java
deleted file mode 100644
index 33f4c9225e..0000000000
--- a/src/test/java/com/lambdaworks/redis/commands/rx/ScriptingRxCommandTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.lambdaworks.redis.commands.rx;
-
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.ScriptingCommandTest;
-import com.lambdaworks.util.RxSyncInvocationHandler;
-
-public class ScriptingRxCommandTest extends ScriptingCommandTest {
-
-
-    @Override
-    protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/SetRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/SetRxCommandTest.java
deleted file mode 100644
index 091520bfb1..0000000000
--- a/src/test/java/com/lambdaworks/redis/commands/rx/SetRxCommandTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.lambdaworks.redis.commands.rx;
-
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.SetCommandTest;
-import com.lambdaworks.util.RxSyncInvocationHandler;
-
-public class SetRxCommandTest extends SetCommandTest {
-
-    @Override
-    protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connect());
-    }
-
-}
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/SortRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/SortRxCommandTest.java
deleted file mode 100644
index 37d1d05719..0000000000
--- a/src/test/java/com/lambdaworks/redis/commands/rx/SortRxCommandTest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.lambdaworks.redis.commands.rx;
-
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.SortCommandTest;
-import com.lambdaworks.util.RxSyncInvocationHandler;
-
-public class SortRxCommandTest extends SortCommandTest {
-    @Override
-    protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/SortedSetRxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/rx/SortedSetRxCommandTest.java
deleted file mode 100644
index 2e5a153e1d..0000000000
--- a/src/test/java/com/lambdaworks/redis/commands/rx/SortedSetRxCommandTest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.lambdaworks.redis.commands.rx;
-
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.SortedSetCommandTest;
-import com.lambdaworks.util.RxSyncInvocationHandler;
-
-public class SortedSetRxCommandTest extends SortedSetCommandTest {
-    @Override
-    protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java b/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
index a6ba8c04ae..0b385d117d 100644
--- a/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
+++ b/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
@@ -2,18 +2,18 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.assertj.core.api.Condition;
 import org.junit.Test;
 
-import rx.Subscription;
-import rx.observers.TestSubscriber;
-
 import com.lambdaworks.Wait;
 import com.lambdaworks.redis.AbstractRedisClientTest;
 import com.lambdaworks.redis.event.connection.*;
 
+import reactor.test.TestSubscriber;
+
 /**
  * @author Mark Paluch
  */
@@ -23,19 +23,19 @@ public class ConnectionEventsTriggeredTest extends AbstractRedisClientTest {
     public void testConnectionEvents() throws Exception {
 
         TestSubscriber<Object> subscriber = TestSubscriber.create();
+        List<Object> events = new ArrayList<>();
 
-        Subscription subscription = client.getResources().eventBus().get().filter(
-                event -> event instanceof ConnectionEvent)
+        client.getResources().eventBus().get().filter(event -> event instanceof ConnectionEvent).doOnNext(events::add)
                 .subscribe(subscriber);
 
         try {
+            subscriber.request(10);
             client.connect().close();
-            Wait.untilTrue(() -> subscriber.getOnNextEvents().size() > 3).waitOrTimeout();
+            Wait.untilTrue(() -> events.size() > 4).waitOrTimeout();
         } finally {
-            subscription.unsubscribe();
+            subscriber.cancel();
         }
 
-        List<Object> events = subscriber.getOnNextEvents();
         assertThat(events).areAtLeast(1, new ExpectedClassCondition(ConnectedEvent.class));
         assertThat(events).areAtLeast(1, new ExpectedClassCondition(ConnectionActivatedEvent.class));
         assertThat(events).areAtLeast(1, new ExpectedClassCondition(DisconnectedEvent.class));
diff --git a/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java b/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
index b344aef133..f97d331f08 100644
--- a/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
+++ b/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
@@ -8,10 +8,8 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
-
-import rx.observers.TestSubscriber;
-import rx.schedulers.Schedulers;
-import rx.schedulers.TestScheduler;
+import reactor.core.scheduler.Schedulers;
+import reactor.test.TestSubscriber;
 
 /**
  * @author Mark Paluch
@@ -24,16 +22,30 @@ public class DefaultEventBusTest {
 
     @Test
     public void publishToSubscriber() throws Exception {
-        TestScheduler testScheduler = Schedulers.test();
-        EventBus sut = new DefaultEventBus(testScheduler);
 
-        TestSubscriber<Event> subscriber = new TestSubscriber<Event>();
+        EventBus sut = new DefaultEventBus(Schedulers.immediate());
+
+        TestSubscriber<Event> subscriber = TestSubscriber.create();
         sut.get().subscribe(subscriber);
 
         sut.publish(event);
 
-        testScheduler.advanceTimeBy(1, TimeUnit.SECONDS);
+        subscriber.awaitAndAssertNextValues(event);
+    }
+
+    @Test
+    public void publishToMultipleSubscribers() throws Exception {
+
+        EventBus sut = new DefaultEventBus(Schedulers.immediate());
+
+        TestSubscriber<Event> subscriber1 = TestSubscriber.create();
+        TestSubscriber<Event> subscriber2 = TestSubscriber.create();
+        sut.get().subscribe(subscriber1);
+        sut.get().subscribe(subscriber2);
+
+        sut.publish(event);
 
-        assertThat(subscriber.getOnNextEvents()).hasSize(1).contains(event);
+        subscriber1.awaitAndAssertNextValues(event);
+        subscriber2.awaitAndAssertNextValues(event);
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java b/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java
index 4b250a1f2a..e0831df2cb 100644
--- a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java
@@ -4,6 +4,7 @@
 
 import java.nio.ByteBuffer;
 
+import com.lambdaworks.redis.Value;
 import org.junit.Test;
 
 import com.lambdaworks.redis.GeoCoordinates;
@@ -33,6 +34,6 @@ public void commandOutputCorrectlyDecoded() throws Exception {
 		sut.set(ByteBuffer.wrap("4.567".getBytes()));
 		sut.multi(-1);
 
-		assertThat(sut.get()).contains(new GeoCoordinates(1.234, 4.567));
+		assertThat(sut.get()).contains(Value.just(new GeoCoordinates(1.234, 4.567)));
 	}
 }
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubRxTest.java b/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
similarity index 87%
rename from src/test/java/com/lambdaworks/redis/pubsub/PubSubRxTest.java
rename to src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
index 636aa3c57b..656213477a 100644
--- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubRxTest.java
+++ b/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
@@ -4,41 +4,37 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
 
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.TestClientResources;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.lambdaworks.Delay;
+import com.lambdaworks.TestClientResources;
 import com.lambdaworks.Wait;
 import com.lambdaworks.redis.AbstractRedisClientTest;
 import com.lambdaworks.redis.FastShutdown;
 import com.lambdaworks.redis.RedisClient;
 import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.rx.Success;
 import com.lambdaworks.redis.internal.LettuceFactories;
-import com.lambdaworks.redis.internal.LettuceLists;
-import com.lambdaworks.redis.pubsub.api.rx.ChannelMessage;
-import com.lambdaworks.redis.pubsub.api.rx.PatternMessage;
-import com.lambdaworks.redis.pubsub.api.rx.RedisPubSubReactiveCommands;
+import com.lambdaworks.redis.pubsub.api.reactive.ChannelMessage;
+import com.lambdaworks.redis.pubsub.api.reactive.PatternMessage;
+import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands;
 import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
 
-import rx.Completable;
-import rx.Observable;
-import rx.Single;
-import rx.Subscription;
-import rx.observables.BlockingObservable;
+import reactor.core.Cancellation;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.test.TestSubscriber;
 
 /**
  * @author Mark Paluch
  */
-public class PubSubRxTest extends AbstractRedisClientTest implements RedisPubSubListener<String, String> {
+public class PubSubReactiveTest extends AbstractRedisClientTest implements RedisPubSubListener<String, String> {
 
     private RedisPubSubReactiveCommands<String, String> pubsub;
     private RedisPubSubReactiveCommands<String, String> pubsub2;
@@ -76,17 +72,19 @@ public void observeChannels() throws Exception {
         block(pubsub.subscribe(channel));
 
         BlockingQueue<ChannelMessage<String, String>> channelMessages = LettuceFactories.newBlockingQueue();
+        TestSubscriber<ChannelMessage<String, String>> testSubscriber = TestSubscriber.create();
 
-        Subscription subscription = pubsub.observeChannels().doOnNext(channelMessages::add).subscribe();
+        pubsub.observeChannels().doOnNext(channelMessages::add).subscribe(testSubscriber);
 
         redis.publish(channel, message);
         redis.publish(channel, message);
         redis.publish(channel, message);
 
+        testSubscriber.awaitAndAssertNextValueCount(3);
         Wait.untilEquals(3, () -> channelMessages.size()).waitOrTimeout();
         assertThat(channelMessages).hasSize(3);
 
-        subscription.unsubscribe();
+        testSubscriber.cancel();
         redis.publish(channel, message);
         Delay.delay(millis(500));
         assertThat(channelMessages).hasSize(3);
@@ -103,7 +101,7 @@ public void observeChannelsUnsubscribe() throws Exception {
 
         BlockingQueue<ChannelMessage<String, String>> channelMessages = LettuceFactories.newBlockingQueue();
 
-        pubsub.observeChannels().doOnNext(channelMessages::add).subscribe().unsubscribe();
+        pubsub.observeChannels().doOnNext(channelMessages::add).subscribe().dispose();
 
         block(redis.getStatefulConnection().reactive().publish(channel, message));
         block(redis.getStatefulConnection().reactive().publish(channel, message));
@@ -141,7 +139,7 @@ public void observePatternsWithUnsubscribe() throws Exception {
 
         BlockingQueue<PatternMessage<String, String>> patternMessages = LettuceFactories.newBlockingQueue();
 
-        Subscription subscription = pubsub.observePatterns().doOnNext(patternMessages::add).subscribe();
+        Cancellation subscription = pubsub.observePatterns().doOnNext(patternMessages::add).subscribe();
 
         redis.publish(channel, message);
         redis.publish(channel, message);
@@ -149,7 +147,7 @@ public void observePatternsWithUnsubscribe() throws Exception {
 
         Wait.untilTrue(() -> patternMessages.size() == 3).waitOrTimeout();
         assertThat(patternMessages).hasSize(3);
-        subscription.unsubscribe();
+        subscription.dispose();
 
         redis.publish(channel, message);
         redis.publish(channel, message);
@@ -208,7 +206,7 @@ public void pubsubEmptyChannels() throws Exception {
     public void pubsubChannels() throws Exception {
 
         block(pubsub.subscribe(channel));
-        List<String> result = single(pubsub2.pubsubChannels().toList());
+        List<String> result = block(pubsub2.pubsubChannels().collectList());
         assertThat(result).contains(channel);
     }
 
@@ -217,7 +215,7 @@ public void pubsubMultipleChannels() throws Exception {
 
         block(pubsub.subscribe(channel, "channel1", "channel3"));
 
-        List<String> result = single(pubsub2.pubsubChannels().toList());
+        List<String> result = all(pubsub2.pubsubChannels());
         assertThat(result).contains(channel, "channel1", "channel3");
     }
 
@@ -225,9 +223,9 @@ public void pubsubMultipleChannels() throws Exception {
     public void pubsubChannelsWithArg() throws Exception {
 
         pubsub.subscribe(channel).subscribe();
-        Wait.untilTrue(() -> single(pubsub2.pubsubChannels(pattern).filter(s -> channel.equals(s))) != null).waitOrTimeout();
+        Wait.untilTrue(() -> mono(pubsub2.pubsubChannels(pattern).filter(s -> channel.equals(s))) != null).waitOrTimeout();
 
-        String result = single(pubsub2.pubsubChannels(pattern).filter(s -> channel.equals(s)));
+        String result = mono(pubsub2.pubsubChannels(pattern).filter(s -> channel.equals(s)));
         assertThat(result).isEqualToIgnoringCase(channel);
     }
 
@@ -435,28 +433,15 @@ public void punsubscribed(String pattern, long count) {
         counts.add(count);
     }
 
-    protected <T> T block(Single<T> single) {
-        return single.toBlocking().value();
-    }
-
-    protected <T> void block(Completable completable) {
-        completable.get();
+    protected <T> T block(Mono<T> mono) {
+        return mono.block();
     }
 
-    protected <T> T single(Observable<T> observable) {
-
-        BlockingObservable<T> blocking = observable.toBlocking();
-        Iterator<T> iterator = blocking.getIterator();
-        if (iterator.hasNext()) {
-            return iterator.next();
-        }
-        return null;
+    protected <T> T mono(Flux<T> flux) {
+        return flux.next().block();
     }
 
-    protected <T> List<T> all(Observable<T> observable) {
-
-        BlockingObservable<T> blocking = observable.toBlocking();
-        Iterator<T> iterator = blocking.getIterator();
-        return LettuceLists.newList(iterator);
+    protected <T> List<T> all(Flux<T> flux) {
+        return flux.collectList().block();
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java b/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
index 3a3035226c..a6fbeb5d76 100644
--- a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
@@ -1,7 +1,5 @@
 package com.lambdaworks.redis.resource;
 
-import static com.google.code.tempusfugit.temporal.Duration.seconds;
-import static com.google.code.tempusfugit.temporal.Timeout.timeout;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -12,8 +10,6 @@
 
 import org.junit.Test;
 
-import com.google.code.tempusfugit.temporal.Condition;
-import com.google.code.tempusfugit.temporal.WaitFor;
 import com.lambdaworks.redis.event.Event;
 import com.lambdaworks.redis.event.EventBus;
 import com.lambdaworks.redis.metrics.CommandLatencyCollector;
@@ -22,7 +18,7 @@
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.Future;
-import rx.observers.TestSubscriber;
+import reactor.test.TestSubscriber;
 
 /**
  * @author Mark Paluch
@@ -128,21 +124,17 @@ public void testEventBus() throws Exception {
 
         EventBus eventBus = sut.eventBus();
 
-        final TestSubscriber<Event> subject = new TestSubscriber<Event>();
+        final TestSubscriber<Event> testSubscriber = TestSubscriber.create();
 
-        eventBus.get().subscribe(subject);
+        eventBus.get().subscribe(testSubscriber);
 
         Event event = mock(Event.class);
         eventBus.publish(event);
 
-        WaitFor.waitOrTimeout(new Condition() {
-            @Override
-            public boolean isSatisfied() {
-                return !subject.getOnNextEvents().isEmpty();
-            }
-        }, timeout(seconds(2)));
+        testSubscriber.awaitAndAssertNextValuesWith(receivedEvent -> {
+            assertThat(receivedEvent).isEqualTo(event);
+        });
 
-        assertThat(subject.getOnNextEvents()).contains(event);
         assertThat(sut.shutdown(0, 0, TimeUnit.MILLISECONDS).get()).isTrue();
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/rx/SentinelRxCommandTest.java b/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelRxCommandTest.java
similarity index 78%
rename from src/test/java/com/lambdaworks/redis/sentinel/rx/SentinelRxCommandTest.java
rename to src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelRxCommandTest.java
index 6d0e139289..489a004747 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/rx/SentinelRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelRxCommandTest.java
@@ -1,13 +1,13 @@
-package com.lambdaworks.redis.sentinel.rx;
+package com.lambdaworks.redis.sentinel.reactive;
 
 import static com.lambdaworks.redis.TestSettings.hostAddr;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.util.RxSyncInvocationHandler;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 import com.lambdaworks.redis.sentinel.SentinelCommandTest;
 import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
-import com.lambdaworks.redis.sentinel.api.rx.RedisSentinelReactiveCommands;
+import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands;
 
 /**
  * @author Mark Paluch
@@ -19,7 +19,7 @@ public void openConnection() throws Exception {
 
         RedisSentinelAsyncCommands<String, String> async = sentinelClient.connectSentinel().async();
         RedisSentinelReactiveCommands<String, String> reactive = async.getStatefulConnection().reactive();
-        sentinel = RxSyncInvocationHandler.sync(async.getStatefulConnection());
+        sentinel = ReactiveSyncInvocationHandler.sync(async.getStatefulConnection());
 
         try {
             sentinel.master(MASTER_ID);
diff --git a/src/test/java/com/lambdaworks/util/RxSyncInvocationHandler.java b/src/test/java/com/lambdaworks/util/ReactiveSyncInvocationHandler.java
similarity index 68%
rename from src/test/java/com/lambdaworks/util/RxSyncInvocationHandler.java
rename to src/test/java/com/lambdaworks/util/ReactiveSyncInvocationHandler.java
index 1b93cc6f4e..3eec42fb0e 100644
--- a/src/test/java/com/lambdaworks/util/RxSyncInvocationHandler.java
+++ b/src/test/java/com/lambdaworks/util/ReactiveSyncInvocationHandler.java
@@ -3,24 +3,19 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.internal.AbstractInvocationHandler;
-import com.lambdaworks.redis.internal.LettuceLists;
 import com.lambdaworks.redis.internal.LettuceSets;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
 import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
 
-import rx.Completable;
-import rx.Observable;
-import rx.Single;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
  * Invocation handler for testing purposes.
@@ -28,11 +23,11 @@
  * @param <K>
  * @param <V>
  */
-public class RxSyncInvocationHandler<K, V> extends ConnectionDecoratingInvocationHandler {
+public class ReactiveSyncInvocationHandler<K, V> extends ConnectionDecoratingInvocationHandler {
 
     private final StatefulConnection<?, ?> connection;
 
-    public RxSyncInvocationHandler(StatefulConnection<?, ?> connection, Object rxApi) {
+    public ReactiveSyncInvocationHandler(StatefulConnection<?, ?> connection, Object rxApi) {
         super(rxApi);
         this.connection = connection;
     }
@@ -53,18 +48,18 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
                 return result;
             }
 
-            if (result instanceof Observable<?>) {
-                Observable<?> observable = (Observable<?>) result;
+            if (result instanceof Flux<?>) {
+                Flux<?> flux = (Flux<?>) result;
 
                 if (!method.getName().equals("exec") && !method.getName().equals("multi")) {
                     if (connection instanceof StatefulRedisConnection && ((StatefulRedisConnection) connection)
                             .isMulti()) {
-                        observable.subscribe();
+                        flux.subscribe();
                         return null;
                     }
                 }
 
-                List<?> value = observable.toList().toBlocking().first();
+                List<?> value = flux.collectList().block();
 
                 if (method.getReturnType().equals(List.class)) {
                     return value;
@@ -79,25 +74,17 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
                 }
             }
 
-            if (result instanceof Single<?>) {
-                Single<?> single = (Single<?>) result;
+            if (result instanceof Mono<?>) {
+                Mono<?> mono = (Mono<?>) result;
 
                 if (!method.getName().equals("exec") && !method.getName().equals("multi")) {
                     if (connection instanceof StatefulRedisConnection && ((StatefulRedisConnection) connection).isMulti()) {
-                        single.subscribe();
+                        mono.subscribe();
                         return null;
                     }
                 }
 
-                return single.toBlocking().value();
-            }
-
-            if (result instanceof Completable) {
-                Completable completable = (Completable) result;
-                completable.await(5, TimeUnit.SECONDS);
-                if (completable.get() != null) {
-                    throw completable.get();
-                }
+                return mono.block();
             }
 
             return result;
@@ -109,21 +96,21 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
 
     public static <K, V> RedisCommands<K, V> sync(StatefulRedisConnection<K, V> connection) {
 
-        RxSyncInvocationHandler<K, V> handler = new RxSyncInvocationHandler<>(connection, connection.reactive());
+        ReactiveSyncInvocationHandler<K, V> handler = new ReactiveSyncInvocationHandler<>(connection, connection.reactive());
         return (RedisCommands<K, V>) Proxy.newProxyInstance(handler.getClass().getClassLoader(),
                 new Class<?>[] { RedisCommands.class }, handler);
     }
 
     public static <K, V> RedisCommands<K, V> sync(StatefulRedisClusterConnection<K, V> connection) {
 
-        RxSyncInvocationHandler<K, V> handler = new RxSyncInvocationHandler<>(connection, connection.reactive());
+        ReactiveSyncInvocationHandler<K, V> handler = new ReactiveSyncInvocationHandler<>(connection, connection.reactive());
         return (RedisCommands<K, V>) Proxy.newProxyInstance(handler.getClass().getClassLoader(),
                 new Class<?>[] { RedisCommands.class }, handler);
     }
 
     public static <K, V> RedisSentinelCommands<K, V> sync(StatefulRedisSentinelConnection<K, V> connection) {
 
-        RxSyncInvocationHandler<K, V> handler = new RxSyncInvocationHandler<>(connection, connection.reactive());
+        ReactiveSyncInvocationHandler<K, V> handler = new ReactiveSyncInvocationHandler<>(connection, connection.reactive());
         return (RedisSentinelCommands<K, V>) Proxy.newProxyInstance(handler.getClass().getClassLoader(),
                 new Class<?>[] { RedisSentinelCommands.class }, handler);
     }

From 30bbbbdf5884981b7af0687268e4d6c48f885475 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 10 Aug 2016 09:29:57 +0200
Subject: [PATCH 012/808] Decouple CommandHandler #317

Refactoring of CommandHandler and connection handling. Lettuce now uses the Endpoint concept to represent communication with a server. Endpoints may be in a connected or disconnected state and are used by the stateful connection. Channel handlers are no longer reused but registered per channel pipeline. Each CommandHandler has its own queue instance to keep track of alive command processing. Command buffering (disconnected endpoint) is held on endpoint level.

The stateful connection is no longer required to be a command handler but can be notified from endpoints (see PubSubEndpoint).
---
 .../redis/AbstractRedisClient.java            |  41 +-
 .../redis/ChannelGroupListener.java           |   1 -
 .../lambdaworks/redis/ConnectionBuilder.java  |  56 +-
 .../redis/ConnectionEventTrigger.java         |   3 +-
 .../lambdaworks/redis/ConnectionEvents.java   |  13 +-
 .../redis/PlainChannelInitializer.java        |  26 +-
 .../redis/RedisChannelHandler.java            |  35 +-
 .../lambdaworks/redis/RedisChannelWriter.java |  16 +-
 .../com/lambdaworks/redis/RedisClient.java    |  66 +-
 .../redis/SslConnectionBuilder.java           |  28 +-
 .../redis/StatefulRedisConnectionImpl.java    |   3 +-
 .../redis/cluster/AbstractNodeSelection.java  |   2 +-
 .../redis/cluster/ClusterCommand.java         |   4 +-
 .../ClusterDistributionChannelWriter.java     |  32 +-
 ...dHandler.java => ClusterNodeEndpoint.java} |  62 +-
 .../PooledClusterConnectionProvider.java      |  14 +-
 .../redis/cluster/RedisClusterClient.java     |  91 +-
 .../StatefulRedisClusterConnectionImpl.java   |   7 +-
 .../topology/ClusterTopologyRefresh.java      |   6 +-
 .../masterslave/MasterSlaveChannelWriter.java |  10 +-
 .../redis/output/CommandOutput.java           |   7 +-
 .../redis/protocol/CommandEncoder.java        |   3 +-
 .../redis/protocol/CommandHandler.java        | 900 ++++--------------
 .../redis/protocol/ConnectionFacade.java      |  27 +
 .../redis/protocol/ConnectionWatchdog.java    | 133 +--
 .../redis/protocol/DefaultEndpoint.java       | 603 ++++++++++++
 .../lambdaworks/redis/protocol/Endpoint.java  |  64 ++
 .../redis/protocol/HasQueuedCommands.java     |  19 +
 .../redis/protocol/QueuedCommands.java        | 110 +++
 .../redis/protocol/ReconnectionHandler.java   |  38 +-
 .../redis/protocol/RedisStateMachine.java     |  18 +-
 .../redis/protocol/SharedLock.java            | 128 +++
 .../redis/pubsub/PubSubCommandHandler.java    |  46 +-
 .../redis/pubsub/PubSubEndpoint.java          | 117 +++
 .../StatefulRedisPubSubConnectionImpl.java    |  85 +-
 .../StatefulRedisSentinelConnectionImpl.java  |   3 +-
 .../extensibility/MyExtendedRedisClient.java  |   9 +-
 .../extensibility/MyPubSubConnection.java     |  36 +-
 ...nnections.java => ConnectionTestUtil.java} |  38 +-
 .../lambdaworks/redis/ClientOptionsTest.java  |   6 +-
 .../com/lambdaworks/redis/ClientTest.java     |   2 +-
 .../redis/ConnectionCommandTest.java          |   3 +-
 .../redis/LettucePerformanceTest.java         | 251 -----
 .../cluster/ClusterCommandInternalsTest.java  |   2 +-
 ...Test.java => ClusterNodeEndpointTest.java} |  12 +-
 .../redis/cluster/ClusterSetup.java           |  56 +-
 .../PooledClusterConnectionProviderTest.java  |   2 +-
 .../redis/cluster/RedisClusterClientTest.java |   3 +-
 .../redis/cluster/RedisClusterSetupTest.java  |   4 +-
 .../RedisClusterStressScenariosTest.java      |  60 +-
 .../redis/commands/HLLCommandTest.java        |  11 +
 .../redis/protocol/CommandHandlerTest.java    | 428 +--------
 .../redis/protocol/ConnectionFailureTest.java |  15 +-
 .../redis/protocol/DefaultEndpointTest.java   | 338 +++++++
 .../redis/protocol/StateMachineTest.java      |   4 +-
 .../redis/reliability/AtLeastOnceTest.java    |  70 +-
 .../redis/reliability/AtMostOnceTest.java     |  44 +-
 .../cluster/EmptyRedisChannelWriter.java      |   6 +-
 .../cluster/EmptyRedisClusterClient.java      |   2 +-
 .../cluster/EmptyStatefulRedisConnection.java |  13 +-
 .../redis/protocol/CommandBenchmark.java      |  29 +-
 .../protocol/CommandHandlerBenchmark.java     |  62 +-
 .../redis/protocol/EmptyClientResources.java  |  39 +-
 .../lambdaworks/redis/protocol/JmhMain.java   |   3 +-
 .../protocol/RedisEndpointBenchmark.java      |  85 ++
 .../protocol/RedisStateMachineBenchmark.java  |   2 +-
 66 files changed, 2272 insertions(+), 2180 deletions(-)
 rename src/main/java/com/lambdaworks/redis/cluster/{ClusterNodeCommandHandler.java => ClusterNodeEndpoint.java} (59%)
 create mode 100644 src/main/java/com/lambdaworks/redis/protocol/ConnectionFacade.java
 create mode 100644 src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
 create mode 100644 src/main/java/com/lambdaworks/redis/protocol/Endpoint.java
 create mode 100644 src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java
 create mode 100644 src/main/java/com/lambdaworks/redis/protocol/QueuedCommands.java
 create mode 100644 src/main/java/com/lambdaworks/redis/protocol/SharedLock.java
 create mode 100644 src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java
 rename src/test/java/com/lambdaworks/{Connections.java => ConnectionTestUtil.java} (60%)
 delete mode 100644 src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java
 rename src/test/java/com/lambdaworks/redis/cluster/{ClusterNodeCommandHandlerTest.java => ClusterNodeEndpointTest.java} (91%)
 create mode 100644 src/test/java/com/lambdaworks/redis/protocol/DefaultEndpointTest.java
 create mode 100644 src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
index 5e98512311..94bf808c27 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
@@ -13,8 +13,7 @@
 import java.util.function.Supplier;
 
 import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.CommandHandler;
-import com.lambdaworks.redis.pubsub.PubSubCommandHandler;
+import com.lambdaworks.redis.protocol.ConnectionWatchdog;
 import com.lambdaworks.redis.resource.ClientResources;
 import com.lambdaworks.redis.resource.DefaultClientResources;
 
@@ -103,29 +102,15 @@ public void setDefaultTimeout(long timeout, TimeUnit unit) {
         this.unit = unit;
     }
 
-    @SuppressWarnings("unchecked")
-    protected <K, V, T extends RedisChannelHandler<K, V>> T connectAsyncImpl(final CommandHandler<K, V> handler,
-            final T connection, final Supplier<SocketAddress> socketAddressSupplier) {
-
-        ConnectionBuilder connectionBuilder = ConnectionBuilder.connectionBuilder();
-        connectionBuilder.clientOptions(clientOptions);
-        connectionBuilder.clientResources(clientResources);
-        connectionBuilder(handler, connection, socketAddressSupplier, connectionBuilder, null);
-        channelType(connectionBuilder, null);
-        return (T) initializeChannel(connectionBuilder);
-    }
-
     /**
      * Populate connection builder with necessary resources.
      * 
-     * @param handler instance of a CommandHandler for writing redis commands
-     * @param connection implementation of a RedisConnection
      * @param socketAddressSupplier address supplier for initial connect and re-connect
      * @param connectionBuilder connection builder to configure the connection
      * @param redisURI URI of the redis instance
      */
-    protected void connectionBuilder(CommandHandler<?, ?> handler, RedisChannelHandler<?, ?> connection,
-            Supplier<SocketAddress> socketAddressSupplier, ConnectionBuilder connectionBuilder, RedisURI redisURI) {
+    protected void connectionBuilder(Supplier<SocketAddress> socketAddressSupplier, ConnectionBuilder connectionBuilder,
+            RedisURI redisURI) {
 
         Bootstrap redisBootstrap = new Bootstrap();
         redisBootstrap.option(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, 32 * 1024);
@@ -148,8 +133,7 @@ protected void connectionBuilder(CommandHandler<?, ?> handler, RedisChannelHandl
 
         connectionBuilder.bootstrap(redisBootstrap);
         connectionBuilder.channelGroup(channels).connectionEvents(connectionEvents).timer(timer);
-        connectionBuilder.commandHandler(handler).socketAddressSupplier(socketAddressSupplier).connection(connection);
-        connectionBuilder.workerPool(genericWorkerPool);
+        connectionBuilder.socketAddressSupplier(socketAddressSupplier);
     }
 
     protected void channelType(ConnectionBuilder connectionBuilder, ConnectionPoint connectionPoint) {
@@ -202,7 +186,7 @@ protected <K, V, T extends RedisChannelHandler<K, V>> T initializeChannel(Connec
         RedisChannelHandler<?, ?> connection = connectionBuilder.connection();
         SocketAddress redisAddress = connectionBuilder.socketAddress();
 
-        if(connectionBuilder.workerPool().isShuttingDown()){
+        if(clientResources.eventExecutorGroup().isShuttingDown()){
             throw new IllegalStateException("Cannot connect. Worker pool not running");
         }
 
@@ -234,10 +218,10 @@ protected <K, V, T extends RedisChannelHandler<K, V>> T initializeChannel(Connec
 
             return (T) connection;
         } catch (RedisException e) {
-            connectionBuilder.commandHandler().initialState();
+            connectionBuilder.endpoint().initialState();
             throw e;
         } catch (Exception e) {
-            connectionBuilder.commandHandler().initialState();
+            connectionBuilder.endpoint().initialState();
             throw new RedisConnectionException("Unable to connect to " + redisAddress, e);
         }
     }
@@ -279,14 +263,9 @@ public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
             for (Channel c : channels) {
                 ChannelPipeline pipeline = c.pipeline();
 
-                CommandHandler<?, ?> commandHandler = pipeline.get(CommandHandler.class);
-                if (commandHandler != null && !commandHandler.isClosed()) {
-                    commandHandler.close();
-                }
-
-                PubSubCommandHandler<?, ?> psCommandHandler = pipeline.get(PubSubCommandHandler.class);
-                if (psCommandHandler != null && !psCommandHandler.isClosed()) {
-                    psCommandHandler.close();
+                ConnectionWatchdog commandHandler = pipeline.get(ConnectionWatchdog.class);
+                if (commandHandler != null) {
+                    commandHandler.setListenOnChannelInactive(false);
                 }
             }
 
diff --git a/src/main/java/com/lambdaworks/redis/ChannelGroupListener.java b/src/main/java/com/lambdaworks/redis/ChannelGroupListener.java
index 2bd4d42a4b..167301a463 100644
--- a/src/main/java/com/lambdaworks/redis/ChannelGroupListener.java
+++ b/src/main/java/com/lambdaworks/redis/ChannelGroupListener.java
@@ -13,7 +13,6 @@
  * 
  * @author Will Glozer
  */
-@ChannelHandler.Sharable
 class ChannelGroupListener extends ChannelInboundHandlerAdapter {
 
     private ChannelGroup channels;
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java b/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java
index 13cbeafed2..2f6995d25a 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java
@@ -3,14 +3,12 @@
 import java.net.SocketAddress;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
 import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.CommandEncoder;
-import com.lambdaworks.redis.protocol.CommandHandler;
-import com.lambdaworks.redis.protocol.ConnectionWatchdog;
-import com.lambdaworks.redis.protocol.ReconnectionListener;
+import com.lambdaworks.redis.protocol.*;
 import com.lambdaworks.redis.resource.ClientResources;
 
 import io.netty.bootstrap.Bootstrap;
@@ -29,17 +27,18 @@ public class ConnectionBuilder {
     private Supplier<SocketAddress> socketAddressSupplier;
     private ConnectionEvents connectionEvents;
     private RedisChannelHandler<?, ?> connection;
-    private CommandHandler<?, ?> commandHandler;
+    private DefaultEndpoint endpoint;
+    private Supplier<CommandHandler> commandHandlerSupplier;
     private ChannelGroup channelGroup;
     private Timer timer;
     private Bootstrap bootstrap;
     private ClientOptions clientOptions;
-    private EventExecutorGroup workerPool;
     private long timeout;
     private TimeUnit timeUnit;
     private ClientResources clientResources;
     private char[] password;
     private ReconnectionListener reconnectionListener = ReconnectionListener.NO_OP;
+    private ConnectionWatchdog connectionWatchdog;
 
     public static ConnectionBuilder connectionBuilder() {
         return new ConnectionBuilder();
@@ -51,6 +50,7 @@ protected List<ChannelHandler> buildHandlers() {
         LettuceAssert.assertState(connectionEvents != null, "ConnectionEvents must be set");
         LettuceAssert.assertState(connection != null, "Connection must be set");
         LettuceAssert.assertState(clientResources != null, "ClientResources must be set");
+        LettuceAssert.assertState(endpoint != null, "Endpoint must be set");
 
         List<ChannelHandler> handlers = new ArrayList<>();
 
@@ -58,8 +58,14 @@ protected List<ChannelHandler> buildHandlers() {
 
         handlers.add(new ChannelGroupListener(channelGroup));
         handlers.add(new CommandEncoder());
-        handlers.add(commandHandler);
-        handlers.add(connection);
+        handlers.add(commandHandlerSupplier.get());
+
+        if (clientOptions.isAutoReconnect()) {
+            handlers.add(createConnectionWatchdog());
+        } else {
+            endpoint.registerConnectionWatchdog(Optional.empty());
+        }
+
         handlers.add(new ConnectionEventTrigger(connectionEvents, connection, clientResources.eventBus()));
 
         if (clientOptions.isAutoReconnect()) {
@@ -71,19 +77,25 @@ protected List<ChannelHandler> buildHandlers() {
 
     protected ConnectionWatchdog createConnectionWatchdog() {
 
+        if (connectionWatchdog != null) {
+            return connectionWatchdog;
+        }
+
         LettuceAssert.assertState(bootstrap != null, "Bootstrap must be set for autoReconnect=true");
         LettuceAssert.assertState(timer != null, "Timer must be set for autoReconnect=true");
         LettuceAssert.assertState(socketAddressSupplier != null, "SocketAddressSupplier must be set for autoReconnect=true");
 
         ConnectionWatchdog watchdog = new ConnectionWatchdog(clientResources.reconnectDelay(), clientOptions, bootstrap, timer,
-                workerPool, socketAddressSupplier, reconnectionListener);
+                clientResources.eventExecutorGroup(), socketAddressSupplier, reconnectionListener, connection);
+
+        endpoint.registerConnectionWatchdog(Optional.of(watchdog));
 
-        watchdog.setListenOnChannelInactive(true);
+        connectionWatchdog = watchdog;
         return watchdog;
     }
 
     public RedisChannelInitializer build() {
-        return new PlainChannelInitializer(clientOptions.isPingBeforeActivateConnection(), password(), buildHandlers(),
+        return new PlainChannelInitializer(clientOptions.isPingBeforeActivateConnection(), password(), this::buildHandlers,
                 clientResources.eventBus());
     }
 
@@ -123,11 +135,6 @@ public ConnectionBuilder clientOptions(ClientOptions clientOptions) {
         return this;
     }
 
-    public ConnectionBuilder workerPool(EventExecutorGroup workerPool) {
-        this.workerPool = workerPool;
-        return this;
-    }
-
     public ConnectionBuilder connectionEvents(ConnectionEvents connectionEvents) {
         this.connectionEvents = connectionEvents;
         return this;
@@ -143,8 +150,8 @@ public ConnectionBuilder channelGroup(ChannelGroup channelGroup) {
         return this;
     }
 
-    public ConnectionBuilder commandHandler(CommandHandler<?, ?> commandHandler) {
-        this.commandHandler = commandHandler;
+    public ConnectionBuilder commandHandler(Supplier<CommandHandler> supplier) {
+        this.commandHandlerSupplier = supplier;
         return this;
     }
 
@@ -158,6 +165,11 @@ public ConnectionBuilder bootstrap(Bootstrap bootstrap) {
         return this;
     }
 
+    public ConnectionBuilder endpoint(DefaultEndpoint endpoint) {
+        this.endpoint = endpoint;
+        return this;
+    }
+
     public ConnectionBuilder clientResources(ClientResources clientResources) {
         this.clientResources = clientResources;
         return this;
@@ -172,10 +184,6 @@ public ConnectionBuilder password(char[] password) {
         return connection;
     }
 
-    public CommandHandler<?, ?> commandHandler() {
-        return commandHandler;
-    }
-
     public Bootstrap bootstrap() {
         return bootstrap;
     }
@@ -192,7 +200,7 @@ public char[] password() {
         return password;
     }
 
-    public EventExecutorGroup workerPool() {
-        return workerPool;
+    public DefaultEndpoint endpoint() {
+        return endpoint;
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java b/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java
index e2cd48469e..81b73625c7 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java
+++ b/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java
@@ -15,13 +15,12 @@
  * @author Mark Paluch
  * @since 3.0
  */
-@ChannelHandler.Sharable
 class ConnectionEventTrigger extends ChannelInboundHandlerAdapter {
     private final ConnectionEvents connectionEvents;
     private final RedisChannelHandler<?, ?> connection;
     private final EventBus eventBus;
 
-    public ConnectionEventTrigger(ConnectionEvents connectionEvents, RedisChannelHandler<?, ?> connection, EventBus eventBus) {
+    ConnectionEventTrigger(ConnectionEvents connectionEvents, RedisChannelHandler<?, ?> connection, EventBus eventBus) {
         this.connectionEvents = connectionEvents;
         this.connection = connection;
         this.eventBus = eventBus;
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionEvents.java b/src/main/java/com/lambdaworks/redis/ConnectionEvents.java
index 7a470d5183..f4ca0615b5 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionEvents.java
+++ b/src/main/java/com/lambdaworks/redis/ConnectionEvents.java
@@ -40,21 +40,10 @@ public void removeListener(RedisConnectionStateListener listener) {
         listeners.remove(listener);
     }
 
-    /**
-     * Internal event before a channel is closed.
-     */
-    public static class PrepareClose {
-        private CompletableFuture<Boolean> prepareCloseFuture = new CompletableFuture<>();
-
-        public CompletableFuture<Boolean> getPrepareCloseFuture() {
-            return prepareCloseFuture;
-        }
-    }
-
     /**
      * Internal event when a channel is closed.
      */
-    public static class Close {
+    public static class Reset {
     }
 
     /**
diff --git a/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java b/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
index a8db635a0a..d6aa81ef17 100644
--- a/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
+++ b/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
@@ -5,6 +5,7 @@
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
 
 import com.lambdaworks.redis.codec.Utf8StringCodec;
 import com.lambdaworks.redis.event.EventBus;
@@ -12,6 +13,7 @@
 import com.lambdaworks.redis.event.connection.ConnectionActivatedEvent;
 import com.lambdaworks.redis.event.connection.DisconnectedEvent;
 import com.lambdaworks.redis.protocol.AsyncCommand;
+
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
@@ -22,16 +24,18 @@
  */
 class PlainChannelInitializer extends io.netty.channel.ChannelInitializer<Channel> implements RedisChannelInitializer {
 
-    final static RedisCommandBuilder<String, String> INITIALIZING_CMD_BUILDER = new RedisCommandBuilder<>(new Utf8StringCodec());
+    final static RedisCommandBuilder<String, String> INITIALIZING_CMD_BUILDER = new RedisCommandBuilder<>(
+            new Utf8StringCodec());
 
-    protected boolean pingBeforeActivate;
-    protected CompletableFuture<Boolean> initializedFuture = new CompletableFuture<>();
+    private boolean pingBeforeActivate;
+    private CompletableFuture<Boolean> initializedFuture = new CompletableFuture<>();
     protected final char[] password;
-    private final List<ChannelHandler> handlers;
+    private final Supplier<List<ChannelHandler>> handlers;
     private final EventBus eventBus;
 
-    public PlainChannelInitializer(boolean pingBeforeActivateConnection, char[] password, List<ChannelHandler> handlers,
+    PlainChannelInitializer(boolean pingBeforeActivateConnection, char[] password, Supplier<List<ChannelHandler>> handlers,
             EventBus eventBus) {
+
         this.pingBeforeActivate = pingBeforeActivateConnection;
         this.password = password;
         this.handlers = handlers;
@@ -62,11 +66,6 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
 
                 @Override
                 public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-                    if (evt instanceof ConnectionEvents.Close) {
-                        if (ctx.channel().isOpen()) {
-                            ctx.channel().close();
-                        }
-                    }
 
                     if (evt instanceof ConnectionEvents.Activated) {
                         if (!initializedFuture.isDone()) {
@@ -86,7 +85,7 @@ public void channelActive(final ChannelHandlerContext ctx) throws Exception {
                         } else {
                             pingCommand = new AsyncCommand<>(INITIALIZING_CMD_BUILDER.ping());
                         }
-                        pingBeforeActivate(pingCommand, initializedFuture, ctx, handlers);
+                        pingBeforeActivate(pingCommand, initializedFuture, ctx);
                     } else {
                         super.channelActive(ctx);
                     }
@@ -102,14 +101,13 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
             });
         }
 
-        for (ChannelHandler handler : handlers) {
-            removeIfExists(channel.pipeline(), handler.getClass());
+        for (ChannelHandler handler : handlers.get()) {
             channel.pipeline().addLast(handler);
         }
     }
 
     static void pingBeforeActivate(final AsyncCommand<?, ?, ?> cmd, final CompletableFuture<Boolean> initializedFuture,
-            final ChannelHandlerContext ctx, final List<ChannelHandler> handlers) throws Exception {
+            final ChannelHandlerContext ctx) throws Exception {
         cmd.handle((o, throwable) -> {
             if (throwable == null) {
                 initializedFuture.complete(true);
diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java b/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java
index 4d52769182..8be11b9474 100644
--- a/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java
+++ b/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java
@@ -9,10 +9,9 @@
 
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.protocol.ConnectionFacade;
 import com.lambdaworks.redis.protocol.RedisCommand;
 
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -24,7 +23,7 @@
  * @author Mark Paluch
  * @since 3.0
  */
-public abstract class RedisChannelHandler<K, V> extends ChannelInboundHandlerAdapter implements Closeable {
+public abstract class RedisChannelHandler<K, V> implements Closeable, ConnectionFacade {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(RedisChannelHandler.class);
 
@@ -32,7 +31,7 @@ public abstract class RedisChannelHandler<K, V> extends ChannelInboundHandlerAda
     protected TimeUnit unit;
 
     private CloseEvents closeEvents = new CloseEvents();
-    private final RedisChannelWriter<K, V> channelWriter;
+    private final RedisChannelWriter channelWriter;
     private volatile boolean closed;
     private volatile boolean active = true;
     private volatile ClientOptions clientOptions;
@@ -45,20 +44,15 @@ public abstract class RedisChannelHandler<K, V> extends ChannelInboundHandlerAda
      * @param timeout timeout value
      * @param unit unit of the timeout
      */
-    public RedisChannelHandler(RedisChannelWriter<K, V> writer, long timeout, TimeUnit unit) {
+    public RedisChannelHandler(RedisChannelWriter writer, long timeout, TimeUnit unit) {
         
         this.channelWriter = writer;
         debugEnabled = logger.isDebugEnabled();
         
-        writer.setRedisChannelHandler(this);
+        writer.setConnectionFacade(this);
         setTimeout(timeout, unit);
     }
 
-    @Override
-    public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
-        closed = false;
-    }
-
     /**
      * Set the command timeout for this connection.
      * 
@@ -92,21 +86,6 @@ public synchronized void close() {
             closeEvents.fireEventClosed(this);
             closeEvents = new CloseEvents();
         }
-
-    }
-
-    @Override
-    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-        channelRead(msg);
-    }
-
-    /**
-     * Invoked on a channel read.
-     * 
-     * @param msg channel message
-     */
-    public void channelRead(Object msg) {
-
     }
 
     protected <T, C extends RedisCommand<K, V, T>> C dispatch(C cmd) {
@@ -115,7 +94,7 @@ protected <T, C extends RedisCommand<K, V, T>> C dispatch(C cmd) {
             logger.debug("dispatching command {}", cmd);
         }
         
-        return channelWriter.write(cmd);
+        return (C) channelWriter.write(cmd);
     }
 
     /**
@@ -177,7 +156,7 @@ public void deactivated() {
      * 
      * @return the channel writer
      */
-    public RedisChannelWriter<K, V> getChannelWriter() {
+    public RedisChannelWriter getChannelWriter() {
         return channelWriter;
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelWriter.java b/src/main/java/com/lambdaworks/redis/RedisChannelWriter.java
index 214364266a..e9ff98b6c8 100644
--- a/src/main/java/com/lambdaworks/redis/RedisChannelWriter.java
+++ b/src/main/java/com/lambdaworks/redis/RedisChannelWriter.java
@@ -2,28 +2,28 @@
 
 import java.io.Closeable;
 
+import com.lambdaworks.redis.protocol.ConnectionFacade;
 import com.lambdaworks.redis.protocol.RedisCommand;
 
 /**
  * Writer for a channel. Writers push commands on to the communication channel and maintain a state for the commands.
  * 
- * @param <K> Key type.
- * @param <V> Value type.
  * @author Mark Paluch
  * @since 3.0
  */
-public interface RedisChannelWriter<K, V> extends Closeable {
+public interface RedisChannelWriter extends Closeable {
 
     /**
      * Write a command on the channel. The command may be changed/wrapped during write and the written instance is returned
      * after the call.
      * 
      * @param command the redis command
+     * @param <K> key type
+     * @param <V> value type
      * @param <T> result type
-     * @param <C> command type
      * @return the written redis command
      */
-    <T, C extends RedisCommand<K, V, T>> C write(C command);
+    <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command);
 
     @Override
     void close();
@@ -35,11 +35,11 @@ public interface RedisChannelWriter<K, V> extends Closeable {
     void reset();
 
     /**
-     * Set the corresponding connection instance in order to notify it about channel active/inactive state.
+     * Set the corresponding connection facade in order to notify it about channel active/inactive state.
      * 
-     * @param redisChannelHandler the channel handler (external connection object)
+     * @param connection the connection facade (external connection object)
      */
-    void setRedisChannelHandler(RedisChannelHandler<K, V> redisChannelHandler);
+    void setConnectionFacade(ConnectionFacade connection);
 
     /**
      * Disable or enable auto-flush behavior. Default is {@literal true}. If autoFlushCommands is disabled, multiple commands
diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/com/lambdaworks/redis/RedisClient.java
index eaf06353d4..a8ecc2e2fe 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClient.java
@@ -9,7 +9,6 @@
 import java.net.ConnectException;
 import java.net.SocketAddress;
 import java.util.List;
-import java.util.Queue;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -19,16 +18,17 @@
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.codec.StringCodec;
 import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceFactories;
+import com.lambdaworks.redis.protocol.DefaultEndpoint;
 import com.lambdaworks.redis.protocol.CommandHandler;
-import com.lambdaworks.redis.protocol.RedisCommand;
 import com.lambdaworks.redis.pubsub.PubSubCommandHandler;
+import com.lambdaworks.redis.pubsub.PubSubEndpoint;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl;
 import com.lambdaworks.redis.resource.ClientResources;
 import com.lambdaworks.redis.resource.SocketAddressResolver;
 import com.lambdaworks.redis.sentinel.StatefulRedisSentinelConnectionImpl;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
+import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
 
 /**
  * A scalable thread-safe <a href="http://redis.io/">Redis</a> client. Multiple threads may share one connection if they avoid
@@ -194,18 +194,16 @@ private <K, V> StatefulRedisConnection<K, V> connectStandalone(RedisCodec<K, V>
         assertNotNull(codec);
         checkValidRedisURI(redisURI);
 
-        Queue<RedisCommand<K, V, ?>> queue = LettuceFactories.newConcurrentQueue();
+        DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
 
-        CommandHandler<K, V> handler = new CommandHandler<>(clientOptions, clientResources, queue);
-
-        StatefulRedisConnectionImpl<K, V> connection = newStatefulRedisConnection(handler, codec, timeout.timeout,
-                timeout.timeUnit);
-        connectStateful(handler, connection, redisURI);
+        StatefulRedisConnectionImpl<K, V> connection = newStatefulRedisConnection((RedisChannelWriter) endpoint, codec,
+                timeout.timeout, timeout.timeUnit);
+        connectStateful(connection, redisURI, endpoint, () -> new CommandHandler(clientResources, endpoint));
         return connection;
     }
 
-    private <K, V> void connectStateful(CommandHandler<K, V> handler, StatefulRedisConnectionImpl<K, V> connection,
-            RedisURI redisURI) {
+    private <K, V> void connectStateful(StatefulRedisConnectionImpl<K, V> connection, RedisURI redisURI,
+                                        DefaultEndpoint endpoint, Supplier<CommandHandler> commandHandlerSupplier) {
 
         ConnectionBuilder connectionBuilder;
         if (redisURI.isSsl()) {
@@ -216,9 +214,12 @@ private <K, V> void connectStateful(CommandHandler<K, V> handler, StatefulRedisC
             connectionBuilder = ConnectionBuilder.connectionBuilder();
         }
 
+        connectionBuilder.connection(connection);
         connectionBuilder.clientOptions(clientOptions);
         connectionBuilder.clientResources(clientResources);
-        connectionBuilder(handler, connection, getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
+        connectionBuilder.commandHandler(commandHandlerSupplier).endpoint(endpoint);
+
+        connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
         channelType(connectionBuilder, redisURI);
         initializeChannel(connectionBuilder);
 
@@ -286,13 +287,12 @@ private <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V
         assertNotNull(codec);
         checkValidRedisURI(redisURI);
 
-        Queue<RedisCommand<K, V, ?>> queue = LettuceFactories.newConcurrentQueue();
+        PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<K, V>(clientOptions);
 
-        PubSubCommandHandler<K, V> handler = new PubSubCommandHandler<>(clientOptions, clientResources, queue, codec);
-        StatefulRedisPubSubConnectionImpl<K, V> connection = newStatefulRedisPubSubConnection(handler, codec, timeout.timeout,
-                timeout.timeUnit);
+        StatefulRedisPubSubConnectionImpl<K, V> connection = newStatefulRedisPubSubConnection(endpoint,
+                (RedisChannelWriter) endpoint, codec, timeout.timeout, timeout.timeUnit);
 
-        connectStateful(handler, connection, redisURI);
+        connectStateful(connection, redisURI, endpoint, () -> new PubSubCommandHandler(clientResources, codec, endpoint));
 
         return connection;
     }
@@ -350,20 +350,19 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
         assertNotNull(codec);
         checkValidRedisURI(redisURI);
 
-        Queue<RedisCommand<K, V, ?>> queue = LettuceFactories.newConcurrentQueue();
-
         ConnectionBuilder connectionBuilder = ConnectionBuilder.connectionBuilder();
         connectionBuilder.clientOptions(ClientOptions.copyOf(getOptions()));
         connectionBuilder.clientResources(clientResources);
 
-        final CommandHandler<K, V> commandHandler = new CommandHandler<>(clientOptions, clientResources, queue);
+        DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
 
-        StatefulRedisSentinelConnectionImpl<K, V> connection = newStatefulRedisSentinelConnection(commandHandler, codec,
-                timeout.timeout, timeout.timeUnit);
+        StatefulRedisSentinelConnectionImpl<K, V> connection = newStatefulRedisSentinelConnection(endpoint,
+                codec, timeout.timeout, timeout.timeUnit);
 
         logger.debug("Trying to get a Sentinel connection for one of: " + redisURI.getSentinels());
 
-        connectionBuilder(commandHandler, connection, getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
+        connectionBuilder.endpoint(endpoint).commandHandler(() -> new CommandHandler(clientResources, endpoint)).connection(connection);
+        connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
 
         if (redisURI.getSentinels().isEmpty() && (isNotEmpty(redisURI.getHost()) || !isEmpty(redisURI.getSocket()))) {
             channelType(connectionBuilder, redisURI);
@@ -408,7 +407,8 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
     /**
      * Create a new instance of {@link StatefulRedisPubSubConnectionImpl} or a subclass.
      *
-     * @param commandHandler the command handler
+     * @param endpoint the endpoint
+     * @param channelWriter the channel writer
      * @param codec codec
      * @param timeout default timeout
      * @param unit default timeout unit
@@ -416,15 +416,15 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
      * @param <V> Value Type
      * @return new instance of StatefulRedisPubSubConnectionImpl
      */
-    protected <K, V> StatefulRedisPubSubConnectionImpl<K, V> newStatefulRedisPubSubConnection(
-            PubSubCommandHandler<K, V> commandHandler, RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
-        return new StatefulRedisPubSubConnectionImpl<>(commandHandler, codec, timeout, unit);
+    protected <K, V> StatefulRedisPubSubConnectionImpl<K, V> newStatefulRedisPubSubConnection(PubSubEndpoint<K, V> endpoint,
+            RedisChannelWriter channelWriter, RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
+        return new StatefulRedisPubSubConnectionImpl<>(endpoint, channelWriter, codec, timeout, unit);
     }
 
     /**
      * Create a new instance of {@link StatefulRedisSentinelConnectionImpl} or a subclass.
      *
-     * @param commandHandler the command handler
+     * @param channelWriter the channel writer
      * @param codec codec
      * @param timeout default timeout
      * @param unit default timeout unit
@@ -433,14 +433,14 @@ protected <K, V> StatefulRedisPubSubConnectionImpl<K, V> newStatefulRedisPubSubC
      * @return new instance of StatefulRedisSentinelConnectionImpl
      */
     protected <K, V> StatefulRedisSentinelConnectionImpl<K, V> newStatefulRedisSentinelConnection(
-            CommandHandler<K, V> commandHandler, RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
-        return new StatefulRedisSentinelConnectionImpl<>(commandHandler, codec, timeout, unit);
+            RedisChannelWriter channelWriter, RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
+        return new StatefulRedisSentinelConnectionImpl<>(channelWriter, codec, timeout, unit);
     }
 
     /**
      * Create a new instance of {@link StatefulRedisConnectionImpl} or a subclass.
      *
-     * @param commandHandler the command handler
+     * @param channelWriter the channel writer
      * @param codec codec
      * @param timeout default timeout
      * @param unit default timeout unit
@@ -448,9 +448,9 @@ protected <K, V> StatefulRedisSentinelConnectionImpl<K, V> newStatefulRedisSenti
      * @param <V> Value Type
      * @return new instance of StatefulRedisConnectionImpl
      */
-    protected <K, V> StatefulRedisConnectionImpl<K, V> newStatefulRedisConnection(CommandHandler<K, V> commandHandler,
+    protected <K, V> StatefulRedisConnectionImpl<K, V> newStatefulRedisConnection(RedisChannelWriter channelWriter,
             RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
-        return new StatefulRedisConnectionImpl<>(commandHandler, codec, timeout, unit);
+        return new StatefulRedisConnectionImpl<>(channelWriter, codec, timeout, unit);
     }
 
     private void validateUrisAreOfSameConnectionType(List<RedisURI> redisUris) {
diff --git a/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java b/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
index 19cd08dd74..1c256cbb8a 100644
--- a/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
@@ -4,7 +4,6 @@
 import static com.lambdaworks.redis.ConnectionEventTrigger.remote;
 import static com.lambdaworks.redis.PlainChannelInitializer.INITIALIZING_CMD_BUILDER;
 import static com.lambdaworks.redis.PlainChannelInitializer.pingBeforeActivate;
-import static com.lambdaworks.redis.PlainChannelInitializer.removeIfExists;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -12,6 +11,7 @@
 import java.security.KeyStore;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
 
 import javax.net.ssl.*;
 
@@ -22,7 +22,10 @@
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.protocol.AsyncCommand;
 
-import io.netty.channel.*;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.SslHandler;
@@ -57,9 +60,7 @@ protected List<ChannelHandler> buildHandlers() {
     @Override
     public RedisChannelInitializer build() {
 
-        final List<ChannelHandler> channelHandlers = buildHandlers();
-
-        return new SslChannelInitializer(clientOptions().isPingBeforeActivateConnection(), channelHandlers, redisURI,
+        return new SslChannelInitializer(clientOptions().isPingBeforeActivateConnection(), this::buildHandlers, redisURI,
                 clientResources().eventBus(), clientOptions().getSslOptions());
     }
 
@@ -69,13 +70,13 @@ public RedisChannelInitializer build() {
     static class SslChannelInitializer extends io.netty.channel.ChannelInitializer<Channel> implements RedisChannelInitializer {
 
         private final boolean pingBeforeActivate;
-        private final List<ChannelHandler> handlers;
+        private final Supplier<List<ChannelHandler>> handlers;
         private final RedisURI redisURI;
         private final EventBus eventBus;
         private final SslOptions sslOptions;
         private CompletableFuture<Boolean> initializedFuture = new CompletableFuture<>();
 
-        public SslChannelInitializer(boolean pingBeforeActivate, List<ChannelHandler> handlers, RedisURI redisURI,
+        public SslChannelInitializer(boolean pingBeforeActivate, Supplier<List<ChannelHandler>> handlers, RedisURI redisURI,
                 EventBus eventBus, SslOptions sslOptions) {
             this.pingBeforeActivate = pingBeforeActivate;
             this.handlers = handlers;
@@ -108,8 +109,6 @@ protected void initChannel(Channel channel) throws Exception {
             SSLEngine sslEngine = sslContext.newEngine(channel.alloc(), redisURI.getHost(), redisURI.getPort());
             sslEngine.setSSLParameters(sslParams);
 
-            removeIfExists(channel.pipeline(), SslHandler.class);
-
             if (channel.pipeline().get("first") == null) {
                 channel.pipeline().addFirst("first", new ChannelDuplexHandler() {
 
@@ -167,7 +166,7 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
                                     } else {
                                         pingCommand = new AsyncCommand<>(INITIALIZING_CMD_BUILDER.ping());
                                     }
-                                    pingBeforeActivate(pingCommand, initializedFuture, ctx, handlers);
+                                    pingBeforeActivate(pingCommand, initializedFuture, ctx);
                                 } else {
                                     ctx.fireChannelActive();
                                 }
@@ -176,12 +175,6 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
                             }
                         }
 
-                        if (evt instanceof ConnectionEvents.Close) {
-                            if (ctx.channel().isOpen()) {
-                                ctx.channel().close();
-                            }
-                        }
-
                         if (evt instanceof ConnectionEvents.Activated) {
                             if (!initializedFuture.isDone()) {
                                 initializedFuture.complete(true);
@@ -202,8 +195,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
                 });
             }
 
-            for (ChannelHandler handler : handlers) {
-                removeIfExists(channel.pipeline(), handler.getClass());
+            for (ChannelHandler handler : handlers.get()) {
                 channel.pipeline().addLast(handler);
             }
         }
diff --git a/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java b/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
index 96fda2aaa3..1db6921758 100644
--- a/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
@@ -34,7 +34,6 @@
  * @param <V> Value type.
  * @author Mark Paluch
  */
-@ChannelHandler.Sharable
 public class StatefulRedisConnectionImpl<K, V> extends RedisChannelHandler<K, V> implements StatefulRedisConnection<K, V> {
 
     protected final RedisCodec<K, V> codec;
@@ -55,7 +54,7 @@ public class StatefulRedisConnectionImpl<K, V> extends RedisChannelHandler<K, V>
      * @param timeout Maximum time to wait for a response.
      * @param unit Unit of time for the timeout.
      */
-    public StatefulRedisConnectionImpl(RedisChannelWriter<K, V> writer, RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
+    public StatefulRedisConnectionImpl(RedisChannelWriter writer, RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
         super(writer, timeout, unit);
 
         this.codec = codec;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java
index 9f83712db3..93625c45fd 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java
@@ -24,7 +24,7 @@ abstract class AbstractNodeSelection<API, CMD, K, V> implements NodeSelectionSup
 
     protected StatefulRedisClusterConnection<K, V> globalConnection;
     private ClusterConnectionProvider.Intent intent;
-    protected ClusterDistributionChannelWriter<K, V> writer;
+    protected ClusterDistributionChannelWriter writer;
 
     public AbstractNodeSelection(StatefulRedisClusterConnection<K, V> globalConnection, ClusterConnectionProvider.Intent intent) {
         this.globalConnection = globalConnection;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java
index ba0bbf59e1..51375b41d6 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java
@@ -14,7 +14,7 @@
  */
 class ClusterCommand<K, V, T> extends CommandWrapper<K, V, T> implements RedisCommand<K, V, T> {
 
-    private RedisChannelWriter<K, V> retry;
+    private RedisChannelWriter retry;
     private int redirections;
     private int maxRedirections;
     private boolean completed;
@@ -25,7 +25,7 @@ class ClusterCommand<K, V, T> extends CommandWrapper<K, V, T> implements RedisCo
      * @param retry
      * @param maxRedirections
      */
-    ClusterCommand(RedisCommand<K, V, T> command, RedisChannelWriter<K, V> retry, int maxRedirections) {
+    ClusterCommand(RedisCommand<K, V, T> command, RedisChannelWriter retry, int maxRedirections) {
         super(command);
         this.retry = retry;
         this.maxRedirections = maxRedirections;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
index 15415dbee4..cb5c7a77c6 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
@@ -7,24 +7,19 @@
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 import com.lambdaworks.redis.internal.HostAndPort;
 import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandKeyword;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import com.lambdaworks.redis.protocol.*;
 
 import io.netty.util.concurrent.EventExecutorGroup;
 
 /**
  * Channel writer for cluster operation. This writer looks up the right partition by hash/slot for the operation.
- * 
- * @param <K> Key type.
- * @param <V> Value type.
+ *
  * @author Mark Paluch
  * @since 3.0
  */
-class ClusterDistributionChannelWriter<K, V> implements RedisChannelWriter<K, V> {
+class ClusterDistributionChannelWriter implements RedisChannelWriter {
 
-    private final RedisChannelWriter<K, V> defaultWriter;
+    private final RedisChannelWriter defaultWriter;
     private final ClusterEventListener clusterEventListener;
     private final EventExecutorGroup eventExecutors;
     private final int executionLimit;
@@ -34,7 +29,7 @@ class ClusterDistributionChannelWriter<K, V> implements RedisChannelWriter<K, V>
     long p20, p21, p22, p23, p24, p25, p26;
     long p30, p31, p32, p33, p34, p35, p36, p37;
 
-    ClusterDistributionChannelWriter(ClientOptions clientOptions, RedisChannelWriter<K, V> defaultWriter,
+    ClusterDistributionChannelWriter(ClientOptions clientOptions, RedisChannelWriter defaultWriter,
             ClusterEventListener clusterEventListener, EventExecutorGroup eventExecutors) {
 
         if (clientOptions instanceof ClusterClientOptions) {
@@ -49,8 +44,7 @@ class ClusterDistributionChannelWriter<K, V> implements RedisChannelWriter<K, V>
     }
 
     @Override
-    @SuppressWarnings("unchecked")
-    public <T, C extends RedisCommand<K, V, T>> C write(C command) {
+    public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
 
         LettuceAssert.notNull(command, "Command must not be null");
 
@@ -65,7 +59,6 @@ public <T, C extends RedisCommand<K, V, T>> C write(C command) {
             commandToSend = new ClusterCommand<>(command, this, executionLimit);
         }
 
-
         if (commandToSend instanceof ClusterCommand && !commandToSend.isDone()) {
 
             ClusterCommand<K, V, T> clusterCommand = (ClusterCommand<K, V, T>) commandToSend;
@@ -107,7 +100,7 @@ public <T, C extends RedisCommand<K, V, T>> C write(C command) {
             }
         }
 
-        RedisChannelWriter<K, V> channelWriter = null;
+        RedisChannelWriter channelWriter = null;
 
         if (args != null && args.getFirstEncodedKey() != null) {
             int hash = getSlot(args.getFirstEncodedKey());
@@ -120,7 +113,7 @@ public <T, C extends RedisCommand<K, V, T>> C write(C command) {
         }
 
         if (channelWriter instanceof ClusterDistributionChannelWriter) {
-            ClusterDistributionChannelWriter<K, V> writer = (ClusterDistributionChannelWriter<K, V>) channelWriter;
+            ClusterDistributionChannelWriter writer = (ClusterDistributionChannelWriter) channelWriter;
             channelWriter = writer.defaultWriter;
         }
 
@@ -129,10 +122,10 @@ public <T, C extends RedisCommand<K, V, T>> C write(C command) {
         }
 
         if (channelWriter != null && channelWriter != this && channelWriter != defaultWriter) {
-            return channelWriter.write((C) commandToSend);
+            return channelWriter.write(commandToSend);
         }
 
-        defaultWriter.write((C) commandToSend);
+        defaultWriter.write(commandToSend);
 
         return command;
     }
@@ -188,12 +181,11 @@ public void close() {
             clusterConnectionProvider.close();
             clusterConnectionProvider = null;
         }
-
     }
 
     @Override
-    public void setRedisChannelHandler(RedisChannelHandler<K, V> redisChannelHandler) {
-        defaultWriter.setRedisChannelHandler(redisChannelHandler);
+    public void setConnectionFacade(ConnectionFacade redisChannelHandler) {
+        defaultWriter.setConnectionFacade(redisChannelHandler);
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeCommandHandler.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeEndpoint.java
similarity index 59%
rename from src/main/java/com/lambdaworks/redis/cluster/ClusterNodeCommandHandler.java
rename to src/main/java/com/lambdaworks/redis/cluster/ClusterNodeEndpoint.java
index dc28064f2b..3604b146e2 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeCommandHandler.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeEndpoint.java
@@ -2,19 +2,15 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Queue;
-import java.util.Set;
 
 import com.lambdaworks.redis.ClientOptions;
 import com.lambdaworks.redis.RedisChannelWriter;
 import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.internal.LettuceSets;
-import com.lambdaworks.redis.protocol.CommandHandler;
 import com.lambdaworks.redis.protocol.ConnectionWatchdog;
 import com.lambdaworks.redis.protocol.RedisCommand;
+import com.lambdaworks.redis.protocol.DefaultEndpoint;
 import com.lambdaworks.redis.resource.ClientResources;
 
-import io.netty.channel.ChannelHandler;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -25,26 +21,22 @@
  *
  * @author Mark Paluch
  */
-@ChannelHandler.Sharable
-class ClusterNodeCommandHandler<K, V> extends CommandHandler<K, V> {
+class ClusterNodeEndpoint extends DefaultEndpoint {
 
-    private static final InternalLogger logger = InternalLoggerFactory.getInstance(ClusterNodeCommandHandler.class);
-    private static final Set<LifecycleState> CHANNEL_OPEN_STATES = LettuceSets.unmodifiableSet(LifecycleState.ACTIVATING,
-            LifecycleState.ACTIVE, LifecycleState.CONNECTED);
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(ClusterNodeEndpoint.class);
 
-    private final RedisChannelWriter<K, V> clusterChannelWriter;
+    private final RedisChannelWriter clusterChannelWriter;
 
     /**
      * Initialize a new instance that handles commands from the supplied queue.
      *
      * @param clientOptions client options for this connection
      * @param clientResources client resources for this connection
-     * @param queue The command queue
      * @param clusterChannelWriter top-most channel writer.
      */
-    public ClusterNodeCommandHandler(ClientOptions clientOptions, ClientResources clientResources,
-            Queue<RedisCommand<K, V, ?>> queue, RedisChannelWriter<K, V> clusterChannelWriter) {
-        super(clientOptions, clientResources, queue);
+    public ClusterNodeEndpoint(ClientOptions clientOptions, ClientResources clientResources,
+            RedisChannelWriter clusterChannelWriter) {
+        super(clientOptions);
         this.clusterChannelWriter = clusterChannelWriter;
     }
 
@@ -72,28 +64,22 @@ public void close() {
         logger.debug("{} close()", logPrefix());
 
         if (clusterChannelWriter != null) {
-            
-            if (isAutoReconnect() && !CHANNEL_OPEN_STATES.contains(getState())) {
-               
-                Collection<RedisCommand<K, V, ?>> commands = shiftCommands(queue);
-                retriggerCommands(commands);
-            }
 
-            Collection<RedisCommand<K, V, ?>> commands = shiftCommands(commandBuffer);
+            Collection<RedisCommand<?, ?, ?>> commands = shiftCommands(getQueue());
             retriggerCommands(commands);
         }
 
         super.close();
     }
 
-    protected void retriggerCommands(Collection<RedisCommand<K, V, ?>> commands) {
-        
-        for (RedisCommand<K, V, ?> queuedCommand : commands) {
-            
+    protected void retriggerCommands(Collection<RedisCommand<?, ?, ?>> commands) {
+
+        for (RedisCommand<?, ?, ?> queuedCommand : commands) {
+
             if (queuedCommand == null || queuedCommand.isCancelled()) {
                 continue;
             }
-            
+
             try {
                 clusterChannelWriter.write(queuedCommand);
             } catch (RedisException e) {
@@ -105,27 +91,15 @@ protected void retriggerCommands(Collection<RedisCommand<K, V, ?>> commands) {
     /**
      * Retrieve commands within a lock to prevent concurrent modification
      */
-    private Collection<RedisCommand<K, V, ?>> shiftCommands(Collection<RedisCommand<K, V, ?>> source) {
-
-        synchronized (stateLock) {
+    private Collection<RedisCommand<?, ?, ?>> shiftCommands(Collection<? extends RedisCommand<?, ?, ?>> source) {
 
+        return doExclusive(() -> {
             try {
-
-                lockWritersExclusive();
-
-                try {
-                    return new ArrayList<>(source);
-                } finally {
-                    source.clear();
-                }
-
+                return new ArrayList<>(source);
             } finally {
-                unlockWritersExclusive();
+                source.clear();
             }
-        }
+        });
     }
 
-    public boolean isAutoReconnect() {
-        return clientOptions.isAutoReconnect();
-    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java b/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
index b6c7f46ecb..a290f96ba2 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
@@ -49,7 +49,7 @@ class PooledClusterConnectionProvider<K, V> implements ClusterConnectionProvider
     private boolean autoFlushCommands = true;
     private ReadFrom readFrom;
 
-    public PooledClusterConnectionProvider(RedisClusterClient redisClusterClient, RedisChannelWriter<K, V> clusterWriter,
+    public PooledClusterConnectionProvider(RedisClusterClient redisClusterClient, RedisChannelWriter clusterWriter,
             RedisCodec<K, V> redisCodec) {
         this.redisClusterClient = redisClusterClient;
         this.debugEnabled = logger.isDebugEnabled();
@@ -271,12 +271,12 @@ private void reconfigurePartitions() {
         for (ConnectionKey key : staleConnections) {
             StatefulRedisConnection<K, V> connection = connections.get(key);
 
-            RedisChannelHandler<K, V> redisChannelHandler = (RedisChannelHandler<K, V>) connection;
+            RedisChannelHandler<K, V> endpoint = (RedisChannelHandler<K, V>) connection;
 
-            if (redisChannelHandler.getChannelWriter() instanceof ClusterNodeCommandHandler) {
-                ClusterNodeCommandHandler<?, ?> clusterNodeCommandHandler = (ClusterNodeCommandHandler<?, ?>) redisChannelHandler
+            if (endpoint.getChannelWriter() instanceof ClusterNodeEndpoint) {
+                ClusterNodeEndpoint clusterNodeEndpoint = (ClusterNodeEndpoint) endpoint
                         .getChannelWriter();
-                clusterNodeCommandHandler.prepareClose();
+                clusterNodeEndpoint.prepareClose();
             }
         }
 
@@ -478,10 +478,10 @@ private class ConnectionFactory implements Function<ConnectionKey, StatefulRedis
 
         private final RedisClusterClient redisClusterClient;
         private final RedisCodec<K, V> redisCodec;
-        private final RedisChannelWriter<K, V> clusterWriter;
+        private final RedisChannelWriter clusterWriter;
 
         public ConnectionFactory(RedisClusterClient redisClusterClient, RedisCodec<K, V> redisCodec,
-                RedisChannelWriter<K, V> clusterWriter) {
+                RedisChannelWriter clusterWriter) {
             this.redisClusterClient = redisClusterClient;
             this.redisCodec = redisCodec;
             this.clusterWriter = clusterWriter;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index 824a0ade39..d2fb069990 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -26,12 +26,12 @@
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.codec.StringCodec;
 import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceFactories;
 import com.lambdaworks.redis.internal.LettuceLists;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
+import com.lambdaworks.redis.protocol.DefaultEndpoint;
 import com.lambdaworks.redis.protocol.CommandHandler;
-import com.lambdaworks.redis.protocol.RedisCommand;
 import com.lambdaworks.redis.pubsub.PubSubCommandHandler;
+import com.lambdaworks.redis.pubsub.PubSubEndpoint;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl;
 import com.lambdaworks.redis.resource.ClientResources;
@@ -376,8 +376,8 @@ public SocketAddress get() {
      * @param <V> Value type
      * @return A new connection
      */
-    <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, String nodeId,
-            RedisChannelWriter<K, V> clusterWriter, final Supplier<SocketAddress> socketAddressSupplier) {
+    <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, String nodeId, RedisChannelWriter clusterWriter,
+            final Supplier<SocketAddress> socketAddressSupplier) {
 
         assertNotNull(codec);
         assertNotEmpty(initialUris);
@@ -385,14 +385,13 @@ <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, Strin
         LettuceAssert.notNull(socketAddressSupplier, "SocketAddressSupplier must not be null");
 
         logger.debug("connectNode(" + nodeId + ")");
-        Queue<RedisCommand<K, V, ?>> queue = LettuceFactories.newConcurrentQueue();
 
-        ClusterNodeCommandHandler<K, V> handler = new ClusterNodeCommandHandler<K, V>(clientOptions, getResources(), queue,
-                clusterWriter);
-        StatefulRedisConnectionImpl<K, V> connection = new StatefulRedisConnectionImpl<K, V>(handler, codec, timeout, unit);
+        ClusterNodeEndpoint endpoint = new ClusterNodeEndpoint(clientOptions, getResources(), clusterWriter);
+        StatefulRedisConnectionImpl<K, V> connection = new StatefulRedisConnectionImpl<K, V>(endpoint, codec, timeout, unit);
 
         try {
-            connectStateful(handler, connection, getFirstUri(), socketAddressSupplier);
+            connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier,
+                    () -> new CommandHandler(clientResources, endpoint));
 
             connection.registerCloseables(closeableResources, connection);
         } catch (RedisException e) {
@@ -420,14 +419,13 @@ <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K,
         activateTopologyRefreshIfNeeded();
 
         logger.debug("connectCluster(" + initialUris + ")");
-        Queue<RedisCommand<K, V, ?>> queue = LettuceFactories.newConcurrentQueue();
 
         Supplier<SocketAddress> socketAddressSupplier = getSocketAddressSupplier(TopologyComparators::sortByClientCount);
 
-        CommandHandler<K, V> handler = new CommandHandler<K, V>(clientOptions, clientResources, queue);
+        DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
 
-        ClusterDistributionChannelWriter<K, V> clusterWriter = new ClusterDistributionChannelWriter<K, V>(clientOptions,
-                handler, clusterTopologyRefreshScheduler, getResources().eventExecutorGroup());
+        ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions,
+                endpoint, clusterTopologyRefreshScheduler, getResources().eventExecutorGroup());
         PooledClusterConnectionProvider<K, V> pooledClusterConnectionProvider = new PooledClusterConnectionProvider<K, V>(this,
                 clusterWriter, codec);
 
@@ -445,7 +443,8 @@ <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K,
 
         for (int i = 0; i < connectionAttempts; i++) {
             try {
-                connectStateful(handler, connection, getFirstUri(), socketAddressSupplier);
+                connectStateful(endpoint, connection, getFirstUri(), socketAddressSupplier,
+                        () -> new CommandHandler(clientResources, endpoint));
                 connected = true;
                 break;
             } catch (RedisException e) {
@@ -483,21 +482,20 @@ <K, V> StatefulRedisPubSubConnectionImpl<K, V> connectClusterPubSubImpl(RedisCod
         activateTopologyRefreshIfNeeded();
 
         logger.debug("connectClusterPubSub(" + initialUris + ")");
-        Queue<RedisCommand<K, V, ?>> queue = LettuceFactories.newConcurrentQueue();
 
         Supplier<SocketAddress> socketAddressSupplier = getSocketAddressSupplier(TopologyComparators::sortByClientCount);
 
-        PubSubCommandHandler<K, V> handler = new PubSubCommandHandler<K, V>(clientOptions, clientResources, queue, codec);
+        PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<K, V>(clientOptions);
 
-        ClusterDistributionChannelWriter<K, V> clusterWriter = new ClusterDistributionChannelWriter<K, V>(clientOptions,
-                handler, clusterTopologyRefreshScheduler, getResources().eventExecutorGroup());
+        ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, endpoint,
+                clusterTopologyRefreshScheduler, getResources().eventExecutorGroup());
         PooledClusterConnectionProvider<K, V> pooledClusterConnectionProvider = new PooledClusterConnectionProvider<K, V>(this,
                 clusterWriter, codec);
 
         clusterWriter.setClusterConnectionProvider(pooledClusterConnectionProvider);
 
-        StatefulRedisPubSubConnectionImpl<K, V> connection = new StatefulRedisPubSubConnectionImpl<>(clusterWriter, codec,
-                timeout, unit);
+        StatefulRedisPubSubConnectionImpl<K, V> connection = new StatefulRedisPubSubConnectionImpl<>(endpoint, clusterWriter,
+                codec, timeout, unit);
 
         clusterWriter.setPartitions(partitions);
 
@@ -507,7 +505,8 @@ <K, V> StatefulRedisPubSubConnectionImpl<K, V> connectClusterPubSubImpl(RedisCod
 
         for (int i = 0; i < connectionAttempts; i++) {
             try {
-                connectStateful(handler, connection, getFirstUri(), socketAddressSupplier);
+                connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier,
+                        () -> new PubSubCommandHandler<K, V>(clientResources, codec, endpoint));
                 connected = true;
                 break;
             } catch (RedisException e) {
@@ -534,17 +533,12 @@ <K, V> StatefulRedisPubSubConnectionImpl<K, V> connectClusterPubSubImpl(RedisCod
      * Connect to a endpoint provided by {@code socketAddressSupplier} using connection settings (authentication, SSL) from
      * {@code connectionSettings}.
      *
-     * @param handler
-     * @param connection
-     * @param connectionSettings
-     * @param socketAddressSupplier
-     * @param <K>
-     * @param <V>
      */
-    private <K, V> void connectStateful(CommandHandler<K, V> handler, StatefulRedisConnectionImpl<K, V> connection,
-            RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier) {
+    private <K, V> void connectStateful(StatefulRedisConnectionImpl<K, V> connection, DefaultEndpoint endpoint,
+            RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier,
+            Supplier<CommandHandler> commandHandlerSupplier) {
 
-        connectStateful0(handler, connection, connectionSettings, socketAddressSupplier);
+        connectStateful0(connection, endpoint, connectionSettings, socketAddressSupplier, commandHandlerSupplier);
 
         if (connectionSettings.getPassword() != null && connectionSettings.getPassword().length != 0) {
             connection.async().auth(new String(connectionSettings.getPassword()));
@@ -555,17 +549,12 @@ private <K, V> void connectStateful(CommandHandler<K, V> handler, StatefulRedisC
      * Connect to a endpoint provided by {@code socketAddressSupplier} using connection settings (authentication, SSL) from
      * {@code connectionSettings}.
      *
-     * @param handler
-     * @param connection
-     * @param connectionSettings
-     * @param socketAddressSupplier
-     * @param <K>
-     * @param <V>
      */
-    private <K, V> void connectStateful(CommandHandler<K, V> handler, StatefulRedisClusterConnectionImpl<K, V> connection,
-            RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier) {
+    private <K, V> void connectStateful(DefaultEndpoint endpoint, StatefulRedisClusterConnectionImpl<K, V> connection,
+                                        RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier,
+                                        Supplier<CommandHandler> commandHandlerSupplier) {
 
-        connectStateful0(handler, connection, connectionSettings, socketAddressSupplier);
+        connectStateful0(connection, endpoint, connectionSettings, socketAddressSupplier, commandHandlerSupplier);
 
         if (connectionSettings.getPassword() != null && connectionSettings.getPassword().length != 0) {
             connection.async().auth(new String(connectionSettings.getPassword()));
@@ -575,16 +564,10 @@ private <K, V> void connectStateful(CommandHandler<K, V> handler, StatefulRedisC
     /**
      * Connect to a endpoint provided by {@code socketAddressSupplier} using connection settings (SSL) from {@code
      * connectionSettings}.
-     *
-     * @param handler
-     * @param connection
-     * @param connectionSettings
-     * @param socketAddressSupplier
-     * @param <K>
-     * @param <V>
      */
-    private <K, V> void connectStateful0(CommandHandler<K, V> handler, RedisChannelHandler<K, V> connection,
-            RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier) {
+    private <K, V> void connectStateful0(RedisChannelHandler<K, V> connection, DefaultEndpoint endpoint,
+            RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier,
+            Supplier<CommandHandler> commandHandlerSupplier) {
 
         ConnectionBuilder connectionBuilder;
         if (connectionSettings.isSsl()) {
@@ -597,8 +580,11 @@ private <K, V> void connectStateful0(CommandHandler<K, V> handler, RedisChannelH
 
         connectionBuilder.reconnectionListener(new ReconnectEventListener(clusterTopologyRefreshScheduler));
         connectionBuilder.clientOptions(clientOptions);
+        connectionBuilder.connection(connection);
         connectionBuilder.clientResources(clientResources);
-        connectionBuilder(handler, connection, socketAddressSupplier, connectionBuilder, connectionSettings);
+        connectionBuilder.endpoint(endpoint);
+        connectionBuilder.commandHandler(commandHandlerSupplier);
+        connectionBuilder(socketAddressSupplier, connectionBuilder, connectionSettings);
         channelType(connectionBuilder, connectionSettings);
 
         initializeChannel(connectionBuilder);
@@ -696,9 +682,8 @@ private void activateTopologyRefreshIfNeeded() {
             }
 
             if (clusterTopologyRefreshActivated.compareAndSet(false, true)) {
-                ScheduledFuture<?> scheduledFuture = genericWorkerPool
-                        .scheduleAtFixedRate(clusterTopologyRefreshScheduler, options.getRefreshPeriod(),
-                                options.getRefreshPeriod(), options.getRefreshPeriodUnit());
+                ScheduledFuture<?> scheduledFuture = genericWorkerPool.scheduleAtFixedRate(clusterTopologyRefreshScheduler,
+                        options.getRefreshPeriod(), options.getRefreshPeriod(), options.getRefreshPeriodUnit());
                 clusterTopologyRefreshFuture.set(scheduledFuture);
             }
         }
@@ -768,7 +753,7 @@ public ClientResources getResources() {
     @Override
     public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
 
-        if(clusterTopologyRefreshActivated.compareAndSet(true, false)){
+        if (clusterTopologyRefreshActivated.compareAndSet(true, false)) {
 
             ScheduledFuture<?> scheduledFuture = clusterTopologyRefreshFuture.get();
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
index c352a4b069..995b9813d0 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
@@ -44,7 +44,6 @@
  * @author Mark Paluch
  * @since 4.0
  */
-@ChannelHandler.Sharable
 public class StatefulRedisClusterConnectionImpl<K, V> extends RedisChannelHandler<K, V>
         implements StatefulRedisClusterConnection<K, V> {
 
@@ -66,7 +65,7 @@ public class StatefulRedisClusterConnectionImpl<K, V> extends RedisChannelHandle
      * @param timeout Maximum time to wait for a response.
      * @param unit Unit of time for the timeout.
      */
-    public StatefulRedisClusterConnectionImpl(RedisChannelWriter<K, V> writer, RedisCodec<K, V> codec, long timeout,
+    public StatefulRedisClusterConnectionImpl(RedisChannelWriter writer, RedisCodec<K, V> codec, long timeout,
             TimeUnit unit) {
         super(writer, timeout, unit);
         this.codec = codec;
@@ -126,8 +125,8 @@ public StatefulRedisConnection<K, V> getConnection(String host, int port) {
                 .getConnection(ClusterConnectionProvider.Intent.WRITE, host, port);
     }
 
-    public ClusterDistributionChannelWriter<K, V> getClusterDistributionChannelWriter() {
-        return (ClusterDistributionChannelWriter<K, V>) super.getChannelWriter();
+    public ClusterDistributionChannelWriter getClusterDistributionChannelWriter() {
+        return (ClusterDistributionChannelWriter) super.getChannelWriter();
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
index 652d265f00..178bdeebcc 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
@@ -90,8 +90,8 @@ private Set<RedisURI> toSet(Iterable<RedisURI> seed) {
         return StreamSupport.stream(seed.spliterator(), false).collect(Collectors.toCollection(HashSet::new));
     }
 
-    NodeTopologyViews getNodeSpecificViews(Requests requestedTopology, Requests requestedClients,
-                                           long commandTimeoutNs) throws InterruptedException {
+    NodeTopologyViews getNodeSpecificViews(Requests requestedTopology, Requests requestedClients, long commandTimeoutNs)
+            throws InterruptedException {
 
         List<RedisClusterNodeSnapshot> allNodes = new ArrayList<>();
 
@@ -122,7 +122,7 @@ NodeTopologyViews getNodeSpecificViews(Requests requestedTopology, Requests requ
 
                     if (partition.getFlags().contains(RedisClusterNode.NodeFlag.MYSELF)) {
 
-                        if(partition.getUri() == null){
+                        if (partition.getUri() == null) {
                             partition.setUri(node);
                         }
 
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java
index 6216cebc03..a066bd5c4c 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java
@@ -1,11 +1,11 @@
 package com.lambdaworks.redis.masterslave;
 
 import com.lambdaworks.redis.ReadFrom;
-import com.lambdaworks.redis.RedisChannelHandler;
 import com.lambdaworks.redis.RedisChannelWriter;
 import com.lambdaworks.redis.RedisException;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.protocol.ConnectionFacade;
 import com.lambdaworks.redis.protocol.ProtocolKeyword;
 import com.lambdaworks.redis.protocol.RedisCommand;
 
@@ -14,7 +14,7 @@
  * 
  * @author Mark Paluch
  */
-class MasterSlaveChannelWriter<K, V> implements RedisChannelWriter<K, V> {
+class MasterSlaveChannelWriter<K, V> implements RedisChannelWriter {
 
     private MasterSlaveConnectionProvider<K, V> masterSlaveConnectionProvider;
     private boolean closed = false;
@@ -24,7 +24,7 @@ public MasterSlaveChannelWriter(MasterSlaveConnectionProvider<K, V> masterSlaveC
     }
 
     @Override
-    public <T, C extends RedisCommand<K, V, T>> C write(C command) {
+    public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
 
         LettuceAssert.notNull(command, "Command must not be null");
 
@@ -33,7 +33,7 @@ public <T, C extends RedisCommand<K, V, T>> C write(C command) {
         }
 
         MasterSlaveConnectionProvider.Intent intent = getIntent(command.getType());
-        StatefulRedisConnection<K, V> connection = masterSlaveConnectionProvider.getConnection(intent);
+        StatefulRedisConnection<K, V> connection = (StatefulRedisConnection) masterSlaveConnectionProvider.getConnection(intent);
 
         return connection.dispatch(command);
     }
@@ -68,7 +68,7 @@ public MasterSlaveConnectionProvider getMasterSlaveConnectionProvider() {
     }
 
     @Override
-    public void setRedisChannelHandler(RedisChannelHandler<K, V> redisChannelHandler) {
+    public void setConnectionFacade(ConnectionFacade connection) {
 
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/output/CommandOutput.java b/src/main/java/com/lambdaworks/redis/output/CommandOutput.java
index 871a775d7c..46902888b0 100644
--- a/src/main/java/com/lambdaworks/redis/output/CommandOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/CommandOutput.java
@@ -109,7 +109,7 @@ public void complete(int depth) {
     }
 
     protected String decodeAscii(ByteBuffer bytes) {
-        if(bytes == null) {
+        if (bytes == null) {
             return null;
         }
 
@@ -130,6 +130,11 @@ public String toString() {
         return sb.toString();
     }
 
+    /**
+     * Mark the beginning of a multi sequence (array).
+     * 
+     * @param count expected number of elements in this multi sequence.
+     */
     public void multi(int count) {
 
     }
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java b/src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java
index 0b06635aaa..69321f1cef 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java
@@ -19,7 +19,6 @@
  * 
  * @author Mark Paluch
  */
-@ChannelHandler.Sharable
 public class CommandEncoder extends MessageToByteEncoder<Object> {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(CommandEncoder.class);
@@ -101,7 +100,7 @@ private void encode(ChannelHandlerContext ctx, ByteBuf out, RedisCommand<?, ?, ?
     }
 
     private String logPrefix(Channel channel) {
-        StringBuffer buffer = new StringBuffer(64);
+        StringBuilder buffer = new StringBuilder(64);
         buffer.append('[').append(ChannelLogDescriptor.logDescriptor(channel)).append(']');
         return buffer.toString();
     }
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java b/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
index 64f58ce217..e31409700d 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
@@ -1,27 +1,24 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
 package com.lambdaworks.redis.protocol;
 
 import java.io.IOException;
 import java.net.SocketAddress;
-import java.nio.channels.ClosedChannelException;
 import java.nio.charset.Charset;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Queue;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.ConnectionEvents;
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.internal.LettuceFactories;
-import com.lambdaworks.redis.internal.LettuceLists;
 import com.lambdaworks.redis.internal.LettuceSets;
+import com.lambdaworks.redis.output.CommandOutput;
 import com.lambdaworks.redis.resource.ClientResources;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.*;
 import io.netty.channel.local.LocalAddress;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
 import io.netty.util.internal.logging.InternalLogLevel;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -29,74 +26,56 @@
 /**
  * A netty {@link ChannelHandler} responsible for writing redis commands and reading responses from the server.
  *
- * @param <K> Key type.
- * @param <V> Value type.
  * @author Will Glozer
  * @author Mark Paluch
  */
-@ChannelHandler.Sharable
-public class CommandHandler<K, V> extends ChannelDuplexHandler implements RedisChannelWriter<K, V> {
-
-    private static final InternalLogger logger = InternalLoggerFactory.getInstance(CommandHandler.class);
-    private static final WriteLogListener WRITE_LOG_LISTENER = new WriteLogListener();
-    private static final AtomicLong CHANNEL_COUNTER = new AtomicLong();
+public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCommands {
 
     /**
      * When we encounter an unexpected IOException we look for these {@link Throwable#getMessage() messages} (because we have no
      * better way to distinguish) and log them at DEBUG rather than WARN, since they are generally caused by unclean client
      * disconnects rather than an actual problem.
      */
-    private static final Set<String> SUPPRESS_IO_EXCEPTION_MESSAGES = LettuceSets.unmodifiableSet("Connection reset by peer",
+    static final Set<String> SUPPRESS_IO_EXCEPTION_MESSAGES = LettuceSets.unmodifiableSet("Connection reset by peer",
             "Broken pipe", "Connection timed out");
 
-    protected final long commandHandlerId = CHANNEL_COUNTER.incrementAndGet();
-    protected final ClientOptions clientOptions;
-    protected final ClientResources clientResources;
-    protected final Queue<RedisCommand<K, V, ?>> queue;
-    protected final AtomicLong writers = new AtomicLong();
-    protected final Object stateLock = new Object();
-
-    // all access to the commandBuffer is synchronized
-    protected final Deque<RedisCommand<K, V, ?>> commandBuffer = LettuceFactories.newConcurrentQueue();
-    protected final Deque<RedisCommand<K, V, ?>> transportBuffer = LettuceFactories.newConcurrentQueue();
-    protected final ByteBuf buffer = ByteBufAllocator.DEFAULT.directBuffer(8192 * 8);
-    protected final RedisStateMachine<K, V> rsm = new RedisStateMachine<K, V>();
-    protected volatile Channel channel;
-    private volatile ConnectionWatchdog connectionWatchdog;
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(CommandHandler.class);
+    private static final AtomicLong COMMAND_HANDLER_COUNTER = new AtomicLong();
+
+    private final long commandHandlerId = COMMAND_HANDLER_COUNTER.incrementAndGet();
+    private final Queue<RedisCommand<?, ?, ?>> queue = LettuceFactories.newConcurrentQueue();
+    private final RedisStateMachine rsm = new RedisStateMachine();
 
     // If TRACE level logging has been enabled at startup.
     private final boolean traceEnabled;
 
     // If DEBUG level logging has been enabled at startup.
     private final boolean debugEnabled;
-    private final Reliability reliability;
 
-    private volatile LifecycleState lifecycleState = LifecycleState.NOT_CONNECTED;
-    private Thread exclusiveLockOwner;
-    private RedisChannelHandler<K, V> redisChannelHandler;
-    private Throwable connectionError;
+    private final ClientResources clientResources;
+    private final Endpoint endpoint;
+
+    private Channel channel;
+    private ByteBuf buffer;
+    private LifecycleState lifecycleState = LifecycleState.NOT_CONNECTED;
     private String logPrefix;
-    private boolean autoFlushCommands = true;
 
     /**
      * Initialize a new instance that handles commands from the supplied queue.
      *
-     * @param clientOptions client options for this connection, must not be {@literal null}
      * @param clientResources client resources for this connection, must not be {@literal null}
-     * @param queue The command queue, must not be {@literal null}
+     * @param endpoint
      */
-    public CommandHandler(ClientOptions clientOptions, ClientResources clientResources, Queue<RedisCommand<K, V, ?>> queue) {
+    public CommandHandler(ClientResources clientResources, Endpoint endpoint) {
 
-        LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
         LettuceAssert.notNull(clientResources, "ClientResources must not be null");
-        LettuceAssert.notNull(queue, "Queue must not be null");
+        LettuceAssert.notNull(endpoint, "RedisEndpoint must not be null");
 
-        this.clientOptions = clientOptions;
         this.clientResources = clientResources;
-        this.queue = queue;
+        this.endpoint = endpoint;
+
         this.traceEnabled = logger.isTraceEnabled();
         this.debugEnabled = logger.isDebugEnabled();
-        this.reliability = clientOptions.isAutoReconnect() ? Reliability.AT_LEAST_ONCE : Reliability.AT_MOST_ONCE;
     }
 
     /**
@@ -109,9 +88,7 @@ public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
             logger.debug("{} Dropping register for a closed channel", logPrefix());
         }
 
-        synchronized (stateLock) {
-            channel = ctx.channel();
-        }
+        channel = ctx.channel();
 
         if (debugEnabled) {
             logPrefix = null;
@@ -120,8 +97,11 @@ public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
 
         setState(LifecycleState.REGISTERED);
 
-        buffer.clear();
+        endpoint.registerQueue(this);
+
+        buffer = ctx.alloc().directBuffer(8192 * 8);
         ctx.fireChannelRegistered();
+
     }
 
     @Override
@@ -137,15 +117,143 @@ public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
             return;
         }
 
-        if (isClosed()) {
-            cancelCommands("Connection closed");
+        channel = null;
+        buffer.release();
+
+        endpoint.unregisterQueue(this);
+
+        reset();
+
+        setState(LifecycleState.CLOSED);
+        rsm.close();
+
+        ctx.fireChannelUnregistered();
+    }
+
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+
+        if (evt instanceof ConnectionEvents.Reset) {
+            reset();
         }
 
-        synchronized (stateLock) {
-            channel = null;
+        super.userEventTriggered(ctx, evt);
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+
+        InternalLogLevel logLevel = InternalLogLevel.WARN;
+
+        if (!queue.isEmpty()) {
+            RedisCommand<?, ?, ?> command = queue.poll();
+            if (debugEnabled) {
+                logger.debug("{} Storing exception in {}", logPrefix(), command);
+            }
+            logLevel = InternalLogLevel.DEBUG;
+            command.completeExceptionally(cause);
         }
 
-        ctx.fireChannelUnregistered();
+        if (channel == null || !channel.isActive() || !isConnected()) {
+
+            if (debugEnabled) {
+                logger.debug("{} Storing exception in connectionError", logPrefix());
+            }
+
+            logLevel = InternalLogLevel.DEBUG;
+            endpoint.notifyException(cause);
+        }
+
+        if (cause instanceof IOException && logLevel.ordinal() > InternalLogLevel.INFO.ordinal()) {
+            logLevel = InternalLogLevel.INFO;
+            if (SUPPRESS_IO_EXCEPTION_MESSAGES.contains(cause.getMessage())) {
+                logLevel = InternalLogLevel.DEBUG;
+            }
+        }
+
+        logger.log(logLevel, "{} Unexpected exception during request: {}", logPrefix, cause.toString(), cause);
+    }
+
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+
+        logPrefix = null;
+
+        if (debugEnabled) {
+            logger.debug("{} channelActive()", logPrefix());
+        }
+
+        setState(LifecycleState.CONNECTED);
+
+        endpoint.notifyChannelActive(ctx.channel());
+
+        super.channelActive(ctx);
+        if (channel != null) {
+            channel.eventLoop().submit(new Runnable() {
+                @Override
+                public void run() {
+                    channel.pipeline().fireUserEventTriggered(new ConnectionEvents.Activated());
+                }
+            });
+        }
+
+        if (debugEnabled) {
+            logger.debug("{} channelActive() done", logPrefix());
+        }
+    }
+
+    /**
+     * @see io.netty.channel.ChannelInboundHandlerAdapter#channelInactive(io.netty.channel.ChannelHandlerContext)
+     */
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+
+        if (debugEnabled) {
+            logger.debug("{} channelInactive()", logPrefix());
+        }
+
+        if (channel != null && ctx.channel() != channel) {
+            logger.debug("{} My channel and ctx.channel mismatch. Propagating event to other listeners.", logPrefix());
+            super.channelInactive(ctx);
+            return;
+        }
+
+        setState(LifecycleState.DISCONNECTED);
+
+        setState(LifecycleState.DEACTIVATING);
+        endpoint.notifyChannelInactive(ctx.channel());
+        endpoint.notifyDrainQueuedCommands(this);
+
+        setState(LifecycleState.DEACTIVATED);
+
+        rsm.reset();
+
+        if (debugEnabled) {
+            logger.debug("{} channelInactive() done", logPrefix());
+        }
+        super.channelInactive(ctx);
+    }
+
+    /**
+     * @see io.netty.channel.ChannelDuplexHandler#write(io.netty.channel.ChannelHandlerContext, java.lang.Object,
+     *      io.netty.channel.ChannelPromise)
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+
+        if (debugEnabled) {
+            logger.debug("{} write(ctx, {}, promise)", logPrefix(), msg);
+        }
+
+        if (msg instanceof RedisCommand) {
+            writeSingleCommand(ctx, (RedisCommand<?, ?, ?>) msg, promise);
+            return;
+        }
+
+        if (msg instanceof Collection) {
+            writeBatch(ctx, (Collection<RedisCommand<?, ?, ?>>) msg, promise);
+        }
     }
 
     /**
@@ -192,7 +300,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
 
         while (!queue.isEmpty()) {
 
-            RedisCommand<K, V, ?> command = queue.peek();
+            RedisCommand<?, ?, ?> command = queue.peek();
             if (debugEnabled) {
                 logger.debug("{} Queue contains: {} commands", logPrefix(), queue.size());
             }
@@ -219,11 +327,11 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
         }
     }
 
-    private WithLatency getWithLatency(RedisCommand<K, V, ?> command) {
+    private WithLatency getWithLatency(RedisCommand<?, ?, ?> command) {
         WithLatency withLatency = null;
 
         if (clientResources.commandLatencyCollector().isEnabled()) {
-            RedisCommand<K, V, ?> unwrappedCommand = CommandWrapper.unwrap(command);
+            RedisCommand<?, ?, ?> unwrappedCommand = CommandWrapper.unwrap(command);
             if (unwrappedCommand instanceof WithLatency) {
                 withLatency = (WithLatency) unwrappedCommand;
                 if (withLatency.getFirstResponse() == -1) {
@@ -231,9 +339,14 @@ private WithLatency getWithLatency(RedisCommand<K, V, ?> command) {
                 }
             }
         }
+
         return withLatency;
     }
 
+    protected boolean decode(ByteBuf buffer, CommandOutput<?, ?, ?> output) {
+        return rsm.decode(buffer, output);
+    }
+
     private void recordLatency(WithLatency withLatency, ProtocolKeyword commandType) {
 
         if (withLatency != null && clientResources.commandLatencyCollector().isEnabled() && channel != null
@@ -258,280 +371,15 @@ private SocketAddress local() {
         return LocalAddress.ANY;
     }
 
-    @Override
-    public <T, C extends RedisCommand<K, V, T>> C write(C command) {
-
-        LettuceAssert.notNull(command, "Command must not be null");
-
-        try {
-            incrementWriters();
-
-            if (lifecycleState == LifecycleState.CLOSED) {
-                throw new RedisException("Connection is closed");
-            }
-
-            if (clientOptions.getRequestQueueSize() != Integer.MAX_VALUE
-                    && commandBuffer.size() + queue.size() >= clientOptions.getRequestQueueSize()) {
-                throw new RedisException("Request queue size exceeded: " + clientOptions.getRequestQueueSize()
-                        + ". Commands are not accepted until the queue size drops.");
-            }
-
-            if ((channel == null || !isConnected()) && isRejectCommand()) {
-                throw new RedisException("Currently not connected. Commands are rejected.");
-            }
-
-            /**
-             * This lock causes safety for connection activation and somehow netty gets more stable and predictable performance
-             * than without a lock and all threads are hammering towards writeAndFlush.
-             */
-            Channel channel = this.channel;
-            if (autoFlushCommands) {
-
-                if (channel != null && isConnected() && channel.isActive()) {
-                    writeToChannel(command, channel);
-                } else {
-                    writeToBuffer(command);
-                }
-
-            } else {
-                bufferCommand(command);
-            }
-        } finally {
-            decrementWriters();
-            if (debugEnabled) {
-                logger.debug("{} write() done", logPrefix());
-            }
-        }
-
-        return command;
-    }
-
-    protected <C extends RedisCommand<K, V, T>, T> void writeToBuffer(C command) {
-
-        if (commandBuffer.contains(command) || queue.contains(command)) {
-            return;
-        }
-
-        if (connectionError != null) {
-            if (debugEnabled) {
-                logger.debug("{} writeToBuffer() Completing command {} due to connection error", logPrefix(), command);
-            }
-            command.completeExceptionally(connectionError);
-
-            return;
-        }
-
-        bufferCommand(command);
-    }
-
-    protected <C extends RedisCommand<K, V, T>, T> void writeToChannel(C command, Channel channel) {
-
-        if (reliability == Reliability.AT_MOST_ONCE) {
-            // cancel on exceptions and remove from queue, because there is no housekeeping
-            writeAndFlush(command).addListener(new AtMostOnceWriteListener(command, queue));
-        }
-
-        if (reliability == Reliability.AT_LEAST_ONCE) {
-            // commands are ok to stay within the queue, reconnect will retrigger them
-            writeAndFlush(command).addListener(WRITE_LOG_LISTENER);
-        }
-    }
-
-    protected void bufferCommand(RedisCommand<K, V, ?> command) {
-
-        if (debugEnabled) {
-            logger.debug("{} write() buffering command {}", logPrefix(), command);
-        }
-
-        commandBuffer.add(command);
-    }
-
-    /**
-     * Wait for stateLock and increment writers. Will wait if stateLock is locked and if writer counter is negative.
-     */
-    protected void incrementWriters() {
-
-        if (exclusiveLockOwner == Thread.currentThread()) {
-            return;
-        }
-
-        synchronized (stateLock) {
-            for (;;) {
-
-                if (writers.get() >= 0) {
-                    writers.incrementAndGet();
-                    return;
-                }
-            }
-        }
-    }
-
-    /**
-     * Decrement writers without any wait.
-     */
-    protected void decrementWriters() {
-
-        if (exclusiveLockOwner == Thread.currentThread()) {
-            return;
-        }
-
-        writers.decrementAndGet();
-    }
-
-    /**
-     * Wait for stateLock and no writers. Must be used in an outer {@code synchronized} block to prevent interleaving with other
-     * methods using writers. Sets writers to a negative value to create a lock for {@link #incrementWriters()}.
-     */
-    protected void lockWritersExclusive() {
-
-        if (exclusiveLockOwner == Thread.currentThread()) {
-            writers.decrementAndGet();
-            return;
-        }
-
-        synchronized (stateLock) {
-            for (;;) {
-
-                if (writers.compareAndSet(0, -1)) {
-                    exclusiveLockOwner = Thread.currentThread();
-                    return;
-                }
-            }
-        }
-    }
-
-    /**
-     * Unlock writers.
-     */
-    protected void unlockWritersExclusive() {
-
-        if (exclusiveLockOwner == Thread.currentThread()) {
-            if (writers.incrementAndGet() == 0) {
-                exclusiveLockOwner = null;
-            }
-        }
-    }
-
-    private boolean isRejectCommand() {
-
-        if (clientOptions == null) {
-            return false;
-        }
-
-        switch (clientOptions.getDisconnectedBehavior()) {
-            case REJECT_COMMANDS:
-                return true;
-
-            case ACCEPT_COMMANDS:
-                return false;
-
-            default:
-            case DEFAULT:
-                if (!clientOptions.isAutoReconnect()) {
-                    return true;
-                }
-
-                return false;
-        }
-    }
-
     boolean isConnected() {
         return lifecycleState.ordinal() >= LifecycleState.CONNECTED.ordinal()
                 && lifecycleState.ordinal() < LifecycleState.DISCONNECTED.ordinal();
     }
 
-    @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public void flushCommands() {
-
-        if (debugEnabled) {
-            logger.debug("{} flushCommands()", logPrefix());
-        }
-
-        if (channel != null && isConnected()) {
-            List<RedisCommand<K, V, ?>> queuedCommands;
-
-            synchronized (stateLock) {
-                try {
-                    lockWritersExclusive();
-
-                    if (commandBuffer.isEmpty()) {
-                        return;
-                    }
-
-                    queuedCommands = new ArrayList<>(commandBuffer.size());
-                    RedisCommand<K, V, ?> cmd;
-                    while ((cmd = commandBuffer.poll()) != null) {
-                        queuedCommands.add(cmd);
-                    }
-                } finally {
-                    unlockWritersExclusive();
-                }
-            }
-
-            if (debugEnabled) {
-                logger.debug("{} flushCommands() Flushing {} commands", logPrefix(), queuedCommands.size());
-            }
-
-            if (reliability == Reliability.AT_MOST_ONCE) {
-                // cancel on exceptions and remove from queue, because there is no housekeeping
-                writeAndFlush(queuedCommands).addListener(new AtMostOnceWriteListener(queuedCommands, this.queue));
-            }
-
-            if (reliability == Reliability.AT_LEAST_ONCE) {
-                // commands are ok to stay within the queue, reconnect will retrigger them
-                writeAndFlush(queuedCommands).addListener(WRITE_LOG_LISTENER);
-            }
-        }
-    }
-
-    private <C extends RedisCommand<K, V, ?>> ChannelFuture writeAndFlush(List<C> commands) {
-
-        if (debugEnabled) {
-            logger.debug("{} write() writeAndFlush commands {}", logPrefix(), commands);
-        }
-
-        transportBuffer.addAll(commands);
-        return channel.writeAndFlush(commands);
-    }
-
-    private <C extends RedisCommand<K, V, ?>> ChannelFuture writeAndFlush(C command) {
-
-        if (debugEnabled) {
-            logger.debug("{} write() writeAndFlush command {}", logPrefix(), command);
-        }
-
-        transportBuffer.add(command);
-        return channel.writeAndFlush(command);
-    }
-
-    /**
-     * @see io.netty.channel.ChannelDuplexHandler#write(io.netty.channel.ChannelHandlerContext, java.lang.Object,
-     *      io.netty.channel.ChannelPromise)
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-
-        if (debugEnabled) {
-            logger.debug("{} write(ctx, {}, promise)", logPrefix(), msg);
-        }
-
-        if (msg instanceof RedisCommand) {
-            writeSingleCommand(ctx, (RedisCommand<K, V, ?>) msg, promise);
-            return;
-        }
-
-        if (msg instanceof Collection) {
-            writeBatch(ctx, (Collection<RedisCommand<K, V, ?>>) msg, promise);
-        }
-    }
-
-    private void writeSingleCommand(ChannelHandlerContext ctx, RedisCommand<K, V, ?> command, ChannelPromise promise)
+    private void writeSingleCommand(ChannelHandlerContext ctx, RedisCommand<?, ?, ?> command, ChannelPromise promise)
             throws Exception {
 
         if (command.isCancelled()) {
-            transportBuffer.remove(command);
             return;
         }
 
@@ -539,14 +387,13 @@ private void writeSingleCommand(ChannelHandlerContext ctx, RedisCommand<K, V, ?>
         ctx.write(command, promise);
     }
 
-    private void writeBatch(ChannelHandlerContext ctx, Collection<RedisCommand<K, V, ?>> msg, ChannelPromise promise)
+    private void writeBatch(ChannelHandlerContext ctx, Collection<RedisCommand<?, ?, ?>> batch, ChannelPromise promise)
             throws Exception {
 
-        Collection<RedisCommand<K, V, ?>> commands = msg;
-        Collection<RedisCommand<K, V, ?>> toWrite = commands;
+        Collection<RedisCommand<?, ?, ?>> toWrite = batch;
 
         boolean cancelledCommands = false;
-        for (RedisCommand<K, V, ?> command : commands) {
+        for (RedisCommand<?, ?, ?> command : batch) {
             if (command.isCancelled()) {
                 cancelledCommands = true;
                 break;
@@ -555,12 +402,11 @@ private void writeBatch(ChannelHandlerContext ctx, Collection<RedisCommand<K, V,
 
         if (cancelledCommands) {
 
-            toWrite = new ArrayList<>(commands.size());
+            toWrite = new ArrayList<>(batch.size());
 
-            for (RedisCommand<K, V, ?> command : commands) {
+            for (RedisCommand<?, ?, ?> command : batch) {
 
                 if (command.isCancelled()) {
-                    transportBuffer.remove(command);
                     continue;
                 }
 
@@ -569,7 +415,7 @@ private void writeBatch(ChannelHandlerContext ctx, Collection<RedisCommand<K, V,
             }
         } else {
 
-            for (RedisCommand<K, V, ?> command : toWrite) {
+            for (RedisCommand<?, ?, ?> command : toWrite) {
                 queueCommand(command, promise);
             }
         }
@@ -579,7 +425,7 @@ private void writeBatch(ChannelHandlerContext ctx, Collection<RedisCommand<K, V,
         }
     }
 
-    private void queueCommand(RedisCommand<K, V, ?> command, ChannelPromise promise) throws Exception {
+    private void queueCommand(RedisCommand<?, ?, ?> command, ChannelPromise promise) throws Exception {
 
         try {
 
@@ -591,7 +437,7 @@ private void queueCommand(RedisCommand<K, V, ?> command, ChannelPromise promise)
                 queue.add(command);
 
                 if (clientResources.commandLatencyCollector().isEnabled()) {
-                    RedisCommand<K, V, ?> unwrappedCommand = CommandWrapper.unwrap(command);
+                    RedisCommand<?, ?, ?> unwrappedCommand = CommandWrapper.unwrap(command);
                     if (unwrappedCommand instanceof WithLatency) {
                         WithLatency withLatency = (WithLatency) unwrappedCommand;
                         withLatency.firstResponse(-1);
@@ -599,7 +445,6 @@ private void queueCommand(RedisCommand<K, V, ?> command, ChannelPromise promise)
                     }
                 }
             }
-            transportBuffer.remove(command);
         } catch (Exception e) {
             command.completeExceptionally(e);
             promise.setFailure(e);
@@ -611,177 +456,10 @@ private long nanoTime() {
         return System.nanoTime();
     }
 
-    @Override
-    public void channelActive(ChannelHandlerContext ctx) throws Exception {
-
-        logPrefix = null;
-        connectionWatchdog = null;
-
-        if (debugEnabled) {
-            logger.debug("{} channelActive()", logPrefix());
-        }
-
-        if (ctx != null && ctx.pipeline() != null) {
-
-            Map<String, ChannelHandler> map = ctx.pipeline().toMap();
-
-            for (ChannelHandler handler : map.values()) {
-                if (handler instanceof ConnectionWatchdog) {
-                    connectionWatchdog = (ConnectionWatchdog) handler;
-                }
-            }
-        }
-
-        synchronized (stateLock) {
-            try {
-                lockWritersExclusive();
-                setState(LifecycleState.CONNECTED);
-
-                try {
-                    // Move queued commands to buffer before issuing any commands because of connection activation.
-                    // That's necessary to prepend queued commands first as some commands might get into the queue
-                    // after the connection was disconnected. They need to be prepended to the command buffer
-                    moveQueuedCommandsToCommandBuffer();
-                    activateCommandHandlerAndExecuteBufferedCommands(ctx);
-                } catch (Exception e) {
-
-                    if (debugEnabled) {
-                        logger.debug("{} channelActive() ran into an exception", logPrefix());
-                    }
-
-                    if (clientOptions.isCancelCommandsOnReconnectFailure()) {
-                        reset();
-                    }
-
-                    throw e;
-                }
-            } finally {
-                unlockWritersExclusive();
-            }
-        }
-
-        super.channelActive(ctx);
-        if (channel != null) {
-            channel.eventLoop().submit(new Runnable() {
-                @Override
-                public void run() {
-                    channel.pipeline().fireUserEventTriggered(new ConnectionEvents.Activated());
-                }
-            });
-        }
-
-        if (debugEnabled) {
-            logger.debug("{} channelActive() done", logPrefix());
-        }
-    }
-
-    private void moveQueuedCommandsToCommandBuffer() {
-
-        List<RedisCommand<K, V, ?>> queuedCommands = drainCommands(queue);
-        Collections.reverse(queuedCommands);
-
-        List<RedisCommand<K, V, ?>> transportBufferCommands = drainCommands(transportBuffer);
-        Collections.reverse(transportBufferCommands);
-
-        // Queued commands first because they reached the queue before commands that are still in the transport buffer.
-        queuedCommands.addAll(transportBufferCommands);
-
-        logger.debug("{} moveQueuedCommandsToCommandBuffer {} command(s) added to buffer", logPrefix(), queuedCommands.size());
-        for (RedisCommand<K, V, ?> command : queuedCommands) {
-            commandBuffer.addFirst(command);
-        }
-    }
-
-    private List<RedisCommand<K, V, ?>> drainCommands(Collection<RedisCommand<K, V, ?>> source) {
-
-        List<RedisCommand<K, V, ?>> target = new ArrayList<>(source.size());
-        target.addAll(source);
-        source.removeAll(target);
-        return target;
-    }
-
-    protected void activateCommandHandlerAndExecuteBufferedCommands(ChannelHandlerContext ctx) {
-
-        connectionError = null;
-
-        if (debugEnabled) {
-            logger.debug("{} activateCommandHandlerAndExecuteBufferedCommands {} command(s) buffered", logPrefix(),
-                    commandBuffer.size());
-        }
-
-        channel = ctx.channel();
-
-        if (redisChannelHandler != null) {
-
-            if (debugEnabled) {
-                logger.debug("{} activating channel handler", logPrefix());
-            }
-
-            setState(LifecycleState.ACTIVATING);
-            redisChannelHandler.activated();
-        }
-        setState(LifecycleState.ACTIVE);
-
-        flushCommands();
-    }
-
-    /**
-     * @see io.netty.channel.ChannelInboundHandlerAdapter#channelInactive(io.netty.channel.ChannelHandlerContext)
-     */
-    @Override
-    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-
-        if (debugEnabled) {
-            logger.debug("{} channelInactive()", logPrefix());
-        }
-
-        if (channel != null && ctx.channel() != channel) {
-            logger.debug("{} My channel and ctx.channel mismatch. Propagating event to other listeners.", logPrefix());
-            super.channelInactive(ctx);
-            return;
-        }
-
-        synchronized (stateLock) {
-            try {
-                lockWritersExclusive();
-                setState(LifecycleState.DISCONNECTED);
-
-                if (redisChannelHandler != null) {
-
-                    if (debugEnabled) {
-                        logger.debug("{} deactivating channel handler", logPrefix());
-                    }
-
-                    setState(LifecycleState.DEACTIVATING);
-                    redisChannelHandler.deactivated();
-                }
-
-                setState(LifecycleState.DEACTIVATED);
-
-                // Shift all commands to the commandBuffer so the queue is empty.
-                // Allows to run onConnect commands before executing buffered commands
-                commandBuffer.addAll(queue);
-                queue.removeAll(commandBuffer);
-
-            } finally {
-                unlockWritersExclusive();
-            }
-        }
-
-        rsm.reset();
-
-        if (debugEnabled) {
-            logger.debug("{} channelInactive() done", logPrefix());
-        }
-        super.channelInactive(ctx);
-    }
-
     protected void setState(LifecycleState lifecycleState) {
 
         if (this.lifecycleState != LifecycleState.CLOSED) {
-            synchronized (stateLock) {
-                this.lifecycleState = lifecycleState;
-            }
+            this.lifecycleState = lifecycleState;
         }
     }
 
@@ -793,235 +471,41 @@ public boolean isClosed() {
         return lifecycleState == LifecycleState.CLOSED;
     }
 
-    private void cancelCommands(String message) {
+    private void reset() {
 
-        List<RedisCommand<K, V, ?>> toCancel;
-        synchronized (stateLock) {
-            try {
-                lockWritersExclusive();
-                toCancel = prepareReset();
-            } finally {
-                unlockWritersExclusive();
-            }
-        }
+        rsm.reset();
 
-        for (RedisCommand<K, V, ?> cmd : toCancel) {
+        RedisCommand<?, ?, ?> cmd;
+        while ((cmd = queue.poll()) != null) {
             if (cmd.getOutput() != null) {
-                cmd.getOutput().setError(message);
+                cmd.getOutput().setError("Reset");
             }
             cmd.cancel();
         }
-    }
-
-    protected List<RedisCommand<K, V, ?>> prepareReset() {
-
-        int size = 0;
-        if (queue != null) {
-            size += queue.size();
-        }
-
-        if (commandBuffer != null) {
-            size += commandBuffer.size();
-        }
-
-        List<RedisCommand<K, V, ?>> toCancel = new ArrayList<>(size);
-
-        if (queue != null) {
-            toCancel.addAll(queue);
-            queue.clear();
-        }
-
-        if (commandBuffer != null) {
-            toCancel.addAll(commandBuffer);
-            commandBuffer.clear();
-        }
-        return toCancel;
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-
-        InternalLogLevel logLevel = InternalLogLevel.WARN;
-
-        if (!queue.isEmpty()) {
-            RedisCommand<K, V, ?> command = queue.poll();
-            if (debugEnabled) {
-                logger.debug("{} Storing exception in {}", logPrefix(), command);
-            }
-            logLevel = InternalLogLevel.DEBUG;
-            command.completeExceptionally(cause);
-        }
-
-        if (channel == null || !channel.isActive() || !isConnected()) {
-            if (debugEnabled) {
-                logger.debug("{} Storing exception in connectionError", logPrefix());
-            }
-            logLevel = InternalLogLevel.DEBUG;
-            connectionError = cause;
-        }
-
-        if (cause instanceof IOException && logLevel.ordinal() > InternalLogLevel.INFO.ordinal()) {
-            logLevel = InternalLogLevel.INFO;
-            if (SUPPRESS_IO_EXCEPTION_MESSAGES.contains(cause.getMessage())) {
-                logLevel = InternalLogLevel.DEBUG;
-            }
-        }
-
-        logger.log(logLevel, "{} Unexpected exception during request: {}", logPrefix, cause.toString(), cause);
-    }
-
-    /**
-     * Close the connection.
-     */
-    @Override
-    public void close() {
-
-        if (debugEnabled) {
-            logger.debug("{} close()", logPrefix());
-        }
-
-        if (isClosed()) {
-            return;
-        }
-
-        setState(LifecycleState.CLOSED);
-        Channel currentChannel = this.channel;
-        if (currentChannel != null) {
-            currentChannel.pipeline().fireUserEventTriggered(new ConnectionEvents.PrepareClose());
-            currentChannel.pipeline().fireUserEventTriggered(new ConnectionEvents.Close());
-
-            ChannelFuture close = currentChannel.pipeline().close();
-            if (currentChannel.isOpen()) {
-                close.syncUninterruptibly();
-            }
-        } else if (connectionWatchdog != null) {
-            connectionWatchdog.prepareClose(new ConnectionEvents.PrepareClose());
-        }
-
-        rsm.close();
-
-        if (buffer.refCnt() > 0) {
-            buffer.release();
-        }
-    }
-
-    /**
-     * Reset the writer state. Queued commands will be canceled and the internal state will be reset. This is useful when the
-     * internal state machine gets out of sync with the connection.
-     */
-    @Override
-    public void reset() {
-
-        if (debugEnabled) {
-            logger.debug("{} reset()", logPrefix());
-        }
-
-        cancelCommands("Reset");
-
-        rsm.reset();
 
         if (buffer.refCnt() > 0) {
             buffer.clear();
         }
     }
 
-    /**
-     * Reset the command-handler to the initial not-connected state.
-     */
-    public void initialState() {
-
-        setState(LifecycleState.NOT_CONNECTED);
-        queue.clear();
-        commandBuffer.clear();
-
-        Channel currentChannel = this.channel;
-        if (currentChannel != null) {
-            currentChannel.pipeline().fireUserEventTriggered(new ConnectionEvents.PrepareClose());
-            currentChannel.pipeline().fireUserEventTriggered(new ConnectionEvents.Close());
-            currentChannel.pipeline().close();
-        }
-    }
-
-    @Override
-    public void setRedisChannelHandler(RedisChannelHandler<K, V> redisChannelHandler) {
-        this.redisChannelHandler = redisChannelHandler;
-    }
-
-    @Override
-    public void setAutoFlushCommands(boolean autoFlush) {
-        synchronized (stateLock) {
-            this.autoFlushCommands = autoFlush;
-        }
-    }
-
     protected String logPrefix() {
 
         if (logPrefix != null) {
             return logPrefix;
         }
 
-        StringBuffer buffer = new StringBuffer(64);
+        StringBuilder buffer = new StringBuilder(64);
         buffer.append('[').append("chid=0x").append(Long.toHexString(commandHandlerId)).append(", ")
                 .append(ChannelLogDescriptor.logDescriptor(channel)).append(']');
         return logPrefix = buffer.toString();
     }
 
-    public enum LifecycleState {
-        NOT_CONNECTED, REGISTERED, CONNECTED, ACTIVATING, ACTIVE, DISCONNECTED, DEACTIVATING, DEACTIVATED, CLOSED,
-    }
-
-    private enum Reliability {
-        AT_MOST_ONCE, AT_LEAST_ONCE;
-    }
-
-    private static class AtMostOnceWriteListener<K, V, T> implements ChannelFutureListener {
-
-        private final Collection<RedisCommand<K, V, T>> sentCommands;
-        private final Queue<?> queue;
-
-        @SuppressWarnings({ "unchecked", "rawtypes" })
-        public AtMostOnceWriteListener(RedisCommand<K, V, T> sentCommand, Queue<?> queue) {
-            this((Collection) LettuceLists.newList(sentCommand), queue);
-        }
-
-        public AtMostOnceWriteListener(Collection<RedisCommand<K, V, T>> sentCommand, Queue<?> queue) {
-            this.sentCommands = sentCommand;
-            this.queue = queue;
-        }
-
-        @Override
-        public void operationComplete(ChannelFuture future) throws Exception {
-            future.await();
-            if (future.cause() != null) {
-
-                for (RedisCommand<?, ?, ?> sentCommand : sentCommands) {
-                    sentCommand.completeExceptionally(future.cause());
-                }
-
-                queue.removeAll(sentCommands);
-            }
-        }
+    @Override
+    public Queue<RedisCommand<?, ?, ?>> getQueue() {
+        return queue;
     }
 
-    /**
-     * A generic future listener which logs unsuccessful writes.
-     */
-    static class WriteLogListener implements GenericFutureListener<Future<Void>> {
-
-        @Override
-        public void operationComplete(Future<Void> future) throws Exception {
-            Throwable cause = future.cause();
-            if (!future.isSuccess() && !(cause instanceof ClosedChannelException)) {
-
-                String message = "Unexpected exception during request: {}";
-                InternalLogLevel logLevel = InternalLogLevel.WARN;
-
-                if (cause instanceof IOException && SUPPRESS_IO_EXCEPTION_MESSAGES.contains(cause.getMessage())) {
-                    logLevel = InternalLogLevel.DEBUG;
-                }
-
-                logger.log(logLevel, message, cause.toString(), cause);
-            }
-        }
+    public enum LifecycleState {
+        NOT_CONNECTED, REGISTERED, CONNECTED, ACTIVATING, ACTIVE, DISCONNECTED, DEACTIVATING, DEACTIVATED, CLOSED,
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/protocol/ConnectionFacade.java b/src/main/java/com/lambdaworks/redis/protocol/ConnectionFacade.java
new file mode 100644
index 0000000000..5040f9622b
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/protocol/ConnectionFacade.java
@@ -0,0 +1,27 @@
+package com.lambdaworks.redis.protocol;
+
+/**
+ * Represents a stateful connection facade. Connections can be activated and deactivated and particular actions can be executed
+ * upon connection activation/deactivation.
+ * 
+ * @author Mark Paluch
+ */
+public interface ConnectionFacade {
+
+    /**
+     * Callback for a connection activated event. This method may invoke non-blocking connection operations to prepare the
+     * connection after the connection was established.
+     */
+    void activated();
+
+    /**
+     * Callback for a connection deactivated event. This method may invoke non-blocking operations to cleanup the connection
+     * after disconnection.
+     */
+    void deactivated();
+
+    /**
+     * Reset the connection state.
+     */
+    void reset();
+}
diff --git a/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java b/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
index a9175d42f7..b567e8f608 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
@@ -8,11 +8,9 @@
 
 import com.lambdaworks.redis.ClientOptions;
 import com.lambdaworks.redis.ConnectionEvents;
-import com.lambdaworks.redis.RedisChannelHandler;
 import com.lambdaworks.redis.internal.LettuceAssert;
-
-import com.lambdaworks.redis.resource.ClientResources;
 import com.lambdaworks.redis.resource.Delay;
+
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.*;
 import io.netty.channel.group.ChannelGroup;
@@ -31,9 +29,9 @@
  * @author Mark Paluch
  */
 @ChannelHandler.Sharable
-public class ConnectionWatchdog extends ChannelInboundHandlerAdapter implements TimerTask {
+public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
 
-    public static final long LOGGING_QUIET_TIME_MS = TimeUnit.MILLISECONDS.convert(5, TimeUnit.SECONDS);
+    private static final long LOGGING_QUIET_TIME_MS = TimeUnit.MILLISECONDS.convert(5, TimeUnit.SECONDS);
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(ConnectionWatchdog.class);
 
@@ -42,13 +40,12 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter implements
     private final EventExecutorGroup reconnectWorkers;
     private final ReconnectionHandler reconnectionHandler;
     private final ReconnectionListener reconnectionListener;
-
-    private Channel channel;
     private final Timer timer;
 
+    private Channel channel;
     private SocketAddress remoteAddress;
     private long lastReconnectionLogging = -1;
-    private CommandHandler<?, ?> commandHandler;
+    private String logPrefix;
 
     private volatile int attempts;
     private volatile boolean armed;
@@ -66,10 +63,11 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter implements
      * @param reconnectWorkers executor group for reconnect tasks, must not be {@literal null}
      * @param socketAddressSupplier the socket address supplier to obtain an address for reconnection, may be {@literal null}
      * @param reconnectionListener the reconnection listener, must not be {@literal null}
+     * @param connectionFacade the connection facade, must not be {@literal null}
      */
     public ConnectionWatchdog(Delay reconnectDelay, ClientOptions clientOptions, Bootstrap bootstrap, Timer timer,
             EventExecutorGroup reconnectWorkers, Supplier<SocketAddress> socketAddressSupplier,
-            ReconnectionListener reconnectionListener) {
+            ReconnectionListener reconnectionListener, ConnectionFacade connectionFacade) {
 
         LettuceAssert.notNull(reconnectDelay, "Delay must not be null");
         LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
@@ -77,12 +75,14 @@ public ConnectionWatchdog(Delay reconnectDelay, ClientOptions clientOptions, Boo
         LettuceAssert.notNull(timer, "Timer must not be null");
         LettuceAssert.notNull(reconnectWorkers, "ReconnectWorkers must not be null");
         LettuceAssert.notNull(reconnectionListener, "ReconnectionListener must not be null");
+        LettuceAssert.notNull(connectionFacade, "ConnectionFacade must not be null");
 
         this.reconnectDelay = reconnectDelay;
         this.bootstrap = bootstrap;
         this.timer = timer;
         this.reconnectWorkers = reconnectWorkers;
         this.reconnectionListener = reconnectionListener;
+
         Supplier<SocketAddress> wrappedSocketAddressSupplier = new Supplier<SocketAddress>() {
             @Override
             public SocketAddress get() {
@@ -100,19 +100,14 @@ public SocketAddress get() {
             }
         };
 
-        this.reconnectionHandler = new ReconnectionHandler(clientOptions, bootstrap, wrappedSocketAddressSupplier);
+        this.reconnectionHandler = new ReconnectionHandler(clientOptions, bootstrap, wrappedSocketAddressSupplier,
+                connectionFacade);
     }
 
     @Override
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
 
-        logger.debug("{} userEventTriggered({}, {})", commandHandler.logPrefix(), ctx, evt);
-
-        if (evt instanceof ConnectionEvents.PrepareClose) {
-
-            ConnectionEvents.PrepareClose prepareClose = (ConnectionEvents.PrepareClose) evt;
-            prepareClose(prepareClose);
-        }
+        logger.debug("{} userEventTriggered(ctx, {})", logPrefix(), evt);
 
         if (evt instanceof ConnectionEvents.Activated) {
             attempts = 0;
@@ -121,11 +116,10 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
         super.userEventTriggered(ctx, evt);
     }
 
-    void prepareClose(ConnectionEvents.PrepareClose prepareClose) {
+    void prepareClose() {
 
         setListenOnChannelInactive(false);
         setReconnectSuspended(true);
-        prepareClose.getPrepareCloseFuture().complete(true);
 
         reconnectionHandler.prepareClose();
     }
@@ -133,14 +127,11 @@ void prepareClose(ConnectionEvents.PrepareClose prepareClose) {
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
 
-        if(commandHandler == null) {
-            this.commandHandler = ctx.pipeline().get(CommandHandler.class);
-        }
-
-        reconnectScheduleTimeout = null;
         channel = ctx.channel();
-        logger.debug("{} channelActive({})", commandHandler.logPrefix(), ctx);
+        reconnectScheduleTimeout = null;
         remoteAddress = channel.remoteAddress();
+        logPrefix = null;
+        logger.debug("{} channelActive()", logPrefix());
 
         super.channelActive(ctx);
     }
@@ -148,39 +139,45 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
     @Override
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
 
-        logger.debug("{} channelInactive({})", commandHandler.logPrefix(), ctx);
-        channel = null;
+        logger.debug("{} channelInactive()", logPrefix());
+        if (!armed) {
+            logger.debug("{} ConnectionWatchdog not armed", logPrefix());
+            return;
+        }
 
+        channel = null;
 
         if (listenOnChannelInactive && !reconnectionHandler.isReconnectSuspended()) {
-            RedisChannelHandler<?, ?> channelHandler = ctx.pipeline().get(RedisChannelHandler.class);
-            if (channelHandler != null) {
-                reconnectionHandler.setTimeout(channelHandler.getTimeout());
-                reconnectionHandler.setTimeoutUnit(channelHandler.getTimeoutUnit());
-            }
-
             scheduleReconnect();
         } else {
-            logger.debug("{} Reconnect scheduling disabled", commandHandler.logPrefix(), ctx);
+            logger.debug("{} Reconnect scheduling disabled", logPrefix(), ctx);
         }
 
         super.channelInactive(ctx);
     }
 
+    /**
+     * Enable {@link ConnectionWatchdog} to listen for disconnected events.
+     */
+    void arm() {
+        this.armed = true;
+        setListenOnChannelInactive(true);
+    }
+
     /**
      * Schedule reconnect if channel is not available/not active.
      */
     public synchronized void scheduleReconnect() {
 
-        logger.debug("{} scheduleReconnect()", commandHandler.logPrefix());
+        logger.debug("{} scheduleReconnect()", logPrefix());
 
         if (!isEventLoopGroupActive()) {
             logger.debug("isEventLoopGroupActive() == false");
             return;
         }
 
-        if (commandHandler.isClosed()) {
-            logger.debug("Skip reconnect scheduling, CommandHandler is closed");
+        if (!isListenOnChannelInactive()) {
+            logger.debug("Skip reconnect scheduling, listener disabled");
             return;
         }
 
@@ -189,7 +186,7 @@ public synchronized void scheduleReconnect() {
 
             final int attempt = attempts;
             int timeout = (int) reconnectDelay.getTimeUnit().toMillis(reconnectDelay.createDelay(attempt));
-            logger.debug("Reconnect attempt {}, delay {}ms", attempt, timeout);
+            logger.debug("{} Reconnect attempt {}, delay {}ms", logPrefix(), attempt, timeout);
             this.reconnectScheduleTimeout = timer.newTimeout(new TimerTask() {
                 @Override
                 public void run(final Timeout timeout) throws Exception {
@@ -200,13 +197,13 @@ public void run(final Timeout timeout) throws Exception {
                     }
 
                     reconnectWorkers.submit(() -> {
-                        ConnectionWatchdog.this.run(timeout);
+                        ConnectionWatchdog.this.run(attempt);
                         return null;
                     });
                 }
             }, timeout, TimeUnit.MILLISECONDS);
         } else {
-            logger.debug("{} Skipping scheduleReconnect() because I have an active channel", commandHandler.logPrefix());
+            logger.debug("{} Skipping scheduleReconnect() because I have an active channel", logPrefix());
         }
     }
 
@@ -214,12 +211,11 @@ public void run(final Timeout timeout) throws Exception {
      * Reconnect to the remote address that the closed channel was connected to. This creates a new {@link ChannelPipeline} with
      * the same handler instances contained in the old channel's pipeline.
      * 
-     * @param timeout Timer task handle.
+     * @param attempt attempt counter
      *
      * @throws Exception when reconnection fails.
      */
-    @Override
-    public void run(Timeout timeout) throws Exception {
+    public void run(int attempt) throws Exception {
 
         reconnectScheduleTimeout = null;
 
@@ -228,8 +224,8 @@ public void run(Timeout timeout) throws Exception {
             return;
         }
 
-        if (commandHandler.isClosed()) {
-            logger.debug("Skip reconnect scheduling, CommandHandler is closed");
+        if (!isListenOnChannelInactive()) {
+            logger.debug("Skip reconnect scheduling, listener disabled");
             return;
         }
 
@@ -246,7 +242,7 @@ public void run(Timeout timeout) throws Exception {
         }
 
         try {
-            reconnectionListener.onReconnect(new ConnectionEvents.Reconnect(attempts));
+            reconnectionListener.onReconnect(new ConnectionEvents.Reconnect(attempt));
             reconnect(infoLevel, warnLevel);
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
@@ -275,25 +271,20 @@ private boolean isEventLoopGroupActive() {
     }
 
     private boolean isEventLoopGroupActive(EventExecutorGroup executorService) {
-
-        if (executorService.isShutdown() || executorService.isTerminated() || executorService.isShuttingDown()) {
-            return false;
-        }
-
-        return true;
+        return !(executorService.isShutdown() || executorService.isTerminated() || executorService.isShuttingDown());
     }
 
     private boolean shouldLog() {
 
         long quietUntil = lastReconnectionLogging + LOGGING_QUIET_TIME_MS;
-
-        if (quietUntil > System.currentTimeMillis()) {
-            return false;
-        }
-
-        return true;
+        return quietUntil <= System.currentTimeMillis();
     }
 
+    /**
+     * Enable event listener for disconnected events.
+     *
+     * @param listenOnChannelInactive {@literal true} to listen for disconnected events.
+     */
     public void setListenOnChannelInactive(boolean listenOnChannelInactive) {
         this.listenOnChannelInactive = listenOnChannelInactive;
     }
@@ -302,15 +293,33 @@ public boolean isListenOnChannelInactive() {
         return listenOnChannelInactive;
     }
 
-    public boolean isReconnectSuspended() {
-        return reconnectionHandler.isReconnectSuspended();
+    /**
+     * Suspend reconnection temporarily. Reconnect suspension will interrupt reconnection attempts.
+     *
+     * @param reconnectSuspended {@literal true} to suspend reconnection
+     */
+    public void setReconnectSuspended(boolean reconnectSuspended) {
+        reconnectionHandler.setReconnectSuspended(reconnectSuspended);
     }
 
-    public void setReconnectSuspended(boolean reconnectSuspended) {
-        reconnectionHandler.setReconnectSuspended(true);
+    public boolean isReconnectSuspended() {
+        return reconnectionHandler.isReconnectSuspended();
     }
 
     ReconnectionHandler getReconnectionHandler() {
         return reconnectionHandler;
     }
+
+    private String logPrefix() {
+
+        if (logPrefix != null) {
+            return logPrefix;
+        }
+
+        StringBuilder buffer = new StringBuilder(64);
+        buffer.append('[').append("Last known addr=").append(remoteAddress).append(", ")
+                .append(ChannelLogDescriptor.logDescriptor(channel)).append(']');
+        return logPrefix = buffer.toString();
+    }
+
 }
diff --git a/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java b/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
new file mode 100644
index 0000000000..b2c9b67274
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
@@ -0,0 +1,603 @@
+package com.lambdaworks.redis.protocol;
+
+import static com.lambdaworks.redis.protocol.CommandHandler.SUPPRESS_IO_EXCEPTION_MESSAGES;
+
+import java.io.IOException;
+import java.nio.channels.ClosedChannelException;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+
+import com.lambdaworks.redis.ClientOptions;
+import com.lambdaworks.redis.ConnectionEvents;
+import com.lambdaworks.redis.RedisChannelWriter;
+import com.lambdaworks.redis.RedisException;
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.internal.LettuceFactories;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import io.netty.util.internal.logging.InternalLogLevel;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+/**
+ * Default {@link Endpoint} implementation.
+ * 
+ * @author Mark Paluch
+ */
+public class DefaultEndpoint implements RedisChannelWriter, Endpoint, HasQueuedCommands {
+
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(DefaultEndpoint.class);
+    private static final AtomicLong ENDPOINT_COUNTER = new AtomicLong();
+
+    private final long endpointId = ENDPOINT_COUNTER.incrementAndGet();
+    private final AtomicBoolean closed = new AtomicBoolean();
+    private final Deque<RedisCommand<?, ?, ?>> commandBuffer = LettuceFactories.newConcurrentQueue();
+
+    private final SharedLock sharedLock = new SharedLock();
+
+    private final Reliability reliability;
+    private final ClientOptions clientOptions;
+
+    private final QueuedCommands queuedCommands = new QueuedCommands();
+
+    // If TRACE level logging has been enabled at startup.
+    private final boolean traceEnabled;
+
+    // If DEBUG level logging has been enabled at startup.
+    private final boolean debugEnabled;
+
+    protected volatile Channel channel;
+    private String logPrefix;
+    private boolean autoFlushCommands = true;
+
+    private ConnectionWatchdog connectionWatchdog;
+    private ConnectionFacade connectionFacade;
+
+    private Throwable connectionError;
+
+    /**
+     * Create a new {@link DefaultEndpoint}.
+     * 
+     * @param clientOptions client options for this connection, must not be {@literal null}
+     */
+    public DefaultEndpoint(ClientOptions clientOptions) {
+
+        LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
+
+        this.clientOptions = clientOptions;
+        this.traceEnabled = logger.isTraceEnabled();
+        this.debugEnabled = logger.isDebugEnabled();
+        this.reliability = clientOptions.isAutoReconnect() ? Reliability.AT_LEAST_ONCE : Reliability.AT_MOST_ONCE;
+        this.queuedCommands.register(this);
+    }
+
+    @Override
+    public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
+
+        LettuceAssert.notNull(command, "Command must not be null");
+
+        try {
+            sharedLock.incrementWriters();
+
+            if (isClosed()) {
+                throw new RedisException("Connection is closed");
+            }
+
+            if (queuedCommands.exceedsLimit(clientOptions.getRequestQueueSize())) {
+                throw new RedisException("Request queue size exceeded: " + clientOptions.getRequestQueueSize()
+                        + ". Commands are not accepted until the queue size drops.");
+            }
+
+            if ((channel == null || !isConnected()) && isRejectCommand()) {
+                throw new RedisException("Currently not connected. Commands are rejected.");
+            }
+
+            if (autoFlushCommands) {
+
+                if (isConnected()) {
+                    writeToChannel(command);
+                } else {
+                    writeToBuffer(command);
+                }
+
+            } else {
+                writeToBuffer(command);
+            }
+        } finally {
+            sharedLock.decrementWriters();
+            if (debugEnabled) {
+                logger.debug("{} write() done", logPrefix());
+            }
+        }
+
+        return command;
+    }
+
+    private <C extends RedisCommand<?, ?, T>, T> void writeToBuffer(C command) {
+
+        if (commandBuffer.contains(command)) {
+            return;
+        }
+
+        bufferCommand(command);
+    }
+
+    private <C extends RedisCommand<?, ?, T>, T> void writeToChannel(C command) {
+
+        if (reliability == Reliability.AT_MOST_ONCE) {
+            // cancel on exceptions and remove from queue, because there is no housekeeping
+            writeAndFlush(command).addListener(new AtMostOnceWriteListener(command, queuedCommands));
+        }
+
+        if (reliability == Reliability.AT_LEAST_ONCE) {
+            // commands are ok to stay within the queue, reconnect will retrigger them
+            writeAndFlush(command).addListener(new RetryListener(command));
+        }
+    }
+
+    protected void bufferCommand(RedisCommand<?, ?, ?> command) {
+
+        if (debugEnabled) {
+            logger.debug("{} write() buffering command {}", logPrefix(), command);
+        }
+
+        if (connectionError != null) {
+
+            if (debugEnabled) {
+                logger.debug("{} writeToBuffer() Completing command {} due to connection error", logPrefix(), command);
+            }
+            command.completeExceptionally(connectionError);
+
+            return;
+        }
+
+        commandBuffer.add(command);
+    }
+
+    private boolean isRejectCommand() {
+
+        if (clientOptions == null) {
+            return false;
+        }
+
+        switch (clientOptions.getDisconnectedBehavior()) {
+            case REJECT_COMMANDS:
+                return true;
+
+            case ACCEPT_COMMANDS:
+                return false;
+
+            default:
+            case DEFAULT:
+                if (!clientOptions.isAutoReconnect()) {
+                    return true;
+                }
+
+                return false;
+        }
+    }
+
+    @Override
+    public void registerQueue(HasQueuedCommands queueHolder) {
+        queuedCommands.register(queueHolder);
+    }
+
+    @Override
+    public void unregisterQueue(HasQueuedCommands queueHolder) {
+        queuedCommands.unregister(queueHolder);
+    }
+
+    @Override
+    public void notifyChannelActive(Channel channel) {
+
+        this.logPrefix = null;
+        this.channel = channel;
+        this.connectionError = null;
+
+        if (isClosed()) {
+
+            logger.info("{} Closing channel because endpoint is already closed", logPrefix());
+            channel.close();
+            return;
+        }
+
+        if (connectionWatchdog != null) {
+            connectionWatchdog.arm();
+        }
+
+        sharedLock.doExclusive(() -> {
+
+            try {
+                // Move queued commands to buffer before issuing any commands because of connection activation.
+                // That's necessary to prepend queued commands first as some commands might get into the queue
+                // after the connection was disconnected. They need to be prepended to the command buffer
+
+                if (debugEnabled) {
+                    logger.debug("{} activateEndpointAndExecuteBufferedCommands {} command(s) buffered", logPrefix(),
+                            commandBuffer.size());
+                }
+
+                if (debugEnabled) {
+                    logger.debug("{} activating endpoint", logPrefix());
+                }
+
+                connectionFacade.activated();
+
+                flushCommands();
+            } catch (Exception e) {
+
+                if (debugEnabled) {
+                    logger.debug("{} channelActive() ran into an exception", logPrefix());
+                }
+
+                if (clientOptions.isCancelCommandsOnReconnectFailure()) {
+                    reset();
+                }
+
+                throw e;
+            }
+        });
+
+    }
+
+    @Override
+    public void notifyChannelInactive(Channel channel) {
+
+        if (isClosed()) {
+            cancelBufferedCommands("Connection closed");
+        }
+
+        sharedLock.doExclusive(() -> {
+
+            if (debugEnabled) {
+                logger.debug("{} deactivating endpoint handler", logPrefix());
+            }
+
+            connectionFacade.deactivated();
+        });
+
+        if (this.channel == channel) {
+            this.channel = null;
+        }
+    }
+
+    @Override
+    public void notifyException(Throwable t) {
+
+        if (!isConnected()) {
+            connectionError = t;
+        }
+    }
+
+    @Override
+    public void registerConnectionWatchdog(Optional<ConnectionWatchdog> connectionWatchdog) {
+        this.connectionWatchdog = connectionWatchdog.orElse(null);
+    }
+
+    @Override
+    public Queue<RedisCommand<?, ?, ?>> getQueue() {
+        return commandBuffer;
+    }
+
+    @Override
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public void flushCommands() {
+
+        if (debugEnabled) {
+            logger.debug("{} flushCommands()", logPrefix());
+        }
+
+        if (isConnected()) {
+
+            List<RedisCommand<?, ?, ?>> commands = sharedLock.doExclusive(() -> {
+
+                if (commandBuffer.isEmpty()) {
+                    return Collections.<RedisCommand<?, ?, ?>> emptyList();
+                }
+
+                return drainCommands(commandBuffer);
+            });
+
+            if (debugEnabled) {
+                logger.debug("{} flushCommands() Flushing {} commands", logPrefix(), commands.size());
+            }
+
+            if (!commands.isEmpty()) {
+
+                if (reliability == Reliability.AT_MOST_ONCE) {
+                    // cancel on exceptions and remove from queue, because there is no housekeeping
+                    writeAndFlush(commands).addListener(new AtMostOnceWriteListener(commands, queuedCommands));
+                }
+
+                if (reliability == Reliability.AT_LEAST_ONCE) {
+                    // commands are ok to stay within the queue, reconnect will retrigger them
+                    writeAndFlush(commands).addListener(new RetryListener(commands));
+                }
+            }
+        }
+    }
+
+    /**
+     * Close the connection.
+     */
+    @Override
+    public void close() {
+
+        if (debugEnabled) {
+            logger.debug("{} close()", logPrefix());
+        }
+
+        if (isClosed()) {
+            return;
+        }
+
+        if (closed.compareAndSet(false, true)) {
+
+            if (connectionWatchdog != null) {
+                connectionWatchdog.prepareClose();
+            }
+
+            Channel currentChannel = this.channel;
+            if (currentChannel != null) {
+
+                ChannelFuture close = currentChannel.close();
+                if (currentChannel.isOpen()) {
+                    close.syncUninterruptibly();
+                }
+            }
+        }
+    }
+
+    /**
+     * Reset the writer state. Queued commands will be canceled and the internal state will be reset. This is useful when the
+     * internal state machine gets out of sync with the connection.
+     */
+    @Override
+    public void reset() {
+
+        if (debugEnabled) {
+            logger.debug("{} reset()", logPrefix());
+        }
+
+        if (channel != null) {
+            channel.pipeline().fireUserEventTriggered(new ConnectionEvents.Reset());
+        }
+        cancelBufferedCommands("Reset");
+    }
+
+    @Override
+    public void setConnectionFacade(ConnectionFacade connectionFacade) {
+        this.connectionFacade = connectionFacade;
+    }
+
+    @Override
+    public void setAutoFlushCommands(boolean autoFlush) {
+        this.autoFlushCommands = autoFlush;
+    }
+
+    /**
+     * Reset the command-handler to the initial not-connected state.
+     */
+    public void initialState() {
+
+        commandBuffer.clear();
+
+        Channel currentChannel = this.channel;
+        if (currentChannel != null) {
+
+            ChannelFuture close = currentChannel.close();
+            if (currentChannel.isOpen()) {
+                close.syncUninterruptibly();
+            }
+        }
+    }
+
+    @Override
+    public void notifyDrainQueuedCommands(HasQueuedCommands queuedCommands) {
+
+        if (isClosed()) {
+            cancelCommands("Connection closed", queuedCommands.getQueue());
+            return;
+        }
+
+        sharedLock.doExclusive(() -> {
+
+            List<RedisCommand<?, ?, ?>> commands = drainCommands(queuedCommands.getQueue());
+            Collections.reverse(commands);
+
+            logger.debug("{} notifyQueuedCommands {} command(s) added to buffer", logPrefix(), commands.size());
+
+            for (RedisCommand<?, ?, ?> command : commands) {
+                if (!commandBuffer.contains(command)) {
+                    commandBuffer.addFirst(command);
+                }
+            }
+
+            if (isConnected()) {
+                flushCommands();
+            }
+        });
+    }
+
+    public boolean isClosed() {
+        return closed.get();
+    }
+
+    /**
+     * Execute a {@link Supplier} callback guarded by an exclusive lock.
+     * 
+     * @param supplier
+     * @param <T>
+     * @return
+     */
+    protected <T> T doExclusive(Supplier<T> supplier) {
+        return sharedLock.doExclusive(supplier);
+    }
+
+    private ChannelFuture writeAndFlush(List<? extends RedisCommand<?, ?, ?>> commands) {
+
+        if (debugEnabled) {
+            logger.debug("{} write() writeAndFlush commands {}", logPrefix(), commands);
+        }
+
+        return channel.writeAndFlush(commands);
+    }
+
+    private ChannelFuture writeAndFlush(RedisCommand<?, ?, ?> command) {
+
+        if (debugEnabled) {
+            logger.debug("{} write() writeAndFlush command {}", logPrefix(), command);
+        }
+
+        return channel.writeAndFlush(command);
+    }
+
+    private List<RedisCommand<?, ?, ?>> drainCommands(Queue<? extends RedisCommand<?, ?, ?>> source) {
+
+        List<RedisCommand<?, ?, ?>> target = new ArrayList<>(source.size());
+
+        RedisCommand<?, ?, ?> cmd;
+        while ((cmd = source.poll()) != null) {
+            target.add(cmd);
+        }
+
+        return target;
+    }
+
+    private void cancelBufferedCommands(String message) {
+
+        List<RedisCommand<?, ?, ?>> toCancel = sharedLock.doExclusive(queuedCommands::drainCommands);
+        cancelCommands(message, toCancel);
+    }
+
+    private void cancelCommands(String message, Iterable<? extends RedisCommand<?, ?, ?>> toCancel) {
+
+        for (RedisCommand<?, ?, ?> cmd : toCancel) {
+            if (cmd.getOutput() != null) {
+                cmd.getOutput().setError(message);
+            }
+            cmd.cancel();
+        }
+    }
+
+    private boolean isConnected() {
+        return channel != null && channel.isActive();
+    }
+
+    protected String logPrefix() {
+
+        if (logPrefix != null) {
+            return logPrefix;
+        }
+
+        StringBuffer buffer = new StringBuffer(64);
+        buffer.append('[').append("epid=0x").append(Long.toHexString(endpointId)).append(", ")
+                .append(ChannelLogDescriptor.logDescriptor(channel)).append(']');
+        return logPrefix = buffer.toString();
+    }
+
+    private static class AtMostOnceWriteListener implements ChannelFutureListener {
+
+        private final Collection<RedisCommand<?, ?, ?>> sentCommands;
+        private final RedisCommand<?, ?, ?> sentCommand;
+        private final QueuedCommands queuedCommands;
+
+        AtMostOnceWriteListener(RedisCommand<?, ?, ?> sentCommand, QueuedCommands queuedCommands) {
+            this.sentCommand = sentCommand;
+            this.sentCommands = null;
+            this.queuedCommands = queuedCommands;
+        }
+
+        AtMostOnceWriteListener(Collection<RedisCommand<?, ?, ?>> sentCommands, QueuedCommands queuedCommands) {
+            this.sentCommand = null;
+            this.sentCommands = sentCommands;
+            this.queuedCommands = queuedCommands;
+        }
+
+        @Override
+        public void operationComplete(ChannelFuture future) throws Exception {
+            future.await();
+
+            if (future.cause() != null) {
+
+                if (sentCommand != null) {
+
+                    sentCommand.completeExceptionally(future.cause());
+                    queuedCommands.remove(sentCommand);
+                }
+
+                if (sentCommands != null) {
+
+                    for (RedisCommand<?, ?, ?> sentCommand : sentCommands) {
+                        sentCommand.completeExceptionally(future.cause());
+                    }
+                    queuedCommands.removeAll(sentCommands);
+                }
+            }
+        }
+    }
+
+    /**
+     * A generic future listener which retries unsuccessful writes.
+     */
+    private class RetryListener implements GenericFutureListener<Future<Void>> {
+
+        private final Collection<RedisCommand<?, ?, ?>> sentCommands;
+        private final RedisCommand<?, ?, ?> sentCommand;
+
+        RetryListener(Collection<RedisCommand<?, ?, ?>> sentCommands) {
+            this.sentCommands = sentCommands;
+            this.sentCommand = null;
+        }
+
+        RetryListener(RedisCommand<?, ?, ?> sentCommand) {
+            this.sentCommands = null;
+            this.sentCommand = sentCommand;
+        }
+
+        @Override
+        public void operationComplete(Future<Void> future) throws Exception {
+
+            Throwable cause = future.cause();
+
+            if (!future.isSuccess()) {
+                if (sentCommand != null) {
+                    if (!sentCommand.isCancelled() && !sentCommand.isDone()) {
+                        write(sentCommand);
+                    }
+                }
+
+                if (sentCommands != null) {
+                    for (RedisCommand<?, ?, ?> command : sentCommands) {
+                        if (!command.isCancelled() && !command.isDone()) {
+                            write(command);
+                        }
+                    }
+                }
+            }
+
+            if (!future.isSuccess() && !(cause instanceof ClosedChannelException)) {
+
+                String message = "Unexpected exception during request: {}";
+                InternalLogLevel logLevel = InternalLogLevel.WARN;
+
+                if (cause instanceof IOException && SUPPRESS_IO_EXCEPTION_MESSAGES.contains(cause.getMessage())) {
+                    logLevel = InternalLogLevel.DEBUG;
+                }
+
+                logger.log(logLevel, message, cause.toString(), cause);
+            }
+        }
+    }
+
+    private enum Reliability {
+        AT_MOST_ONCE, AT_LEAST_ONCE;
+    }
+
+}
diff --git a/src/main/java/com/lambdaworks/redis/protocol/Endpoint.java b/src/main/java/com/lambdaworks/redis/protocol/Endpoint.java
new file mode 100644
index 0000000000..294257fe67
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/protocol/Endpoint.java
@@ -0,0 +1,64 @@
+package com.lambdaworks.redis.protocol;
+
+import java.util.Optional;
+
+import io.netty.channel.Channel;
+
+/**
+ * Wraps a stateful {@link Endpoint} that abstracts the underlying channel. Endpoints may be connected, disconnected and in
+ * closed states. Endpoints may feature reconnection capabilities with replaying queued commands.
+ *
+ * @author Mark Paluch
+ */
+interface Endpoint {
+
+    /**
+     * Notify about channel activation.
+     * 
+     * @param channel the channel
+     */
+    void notifyChannelActive(Channel channel);
+
+    /**
+     * Notify about channel deactivation.
+     * 
+     * @param channel the channel
+     */
+    void notifyChannelInactive(Channel channel);
+
+    /**
+     * Notify about an exception occured in channel/command processing
+     * 
+     * @param t the Exception
+     */
+    void notifyException(Throwable t);
+
+    /**
+     * Register a component holding a queue.
+     * 
+     * @param queueHolder the queue holder.
+     */
+    void registerQueue(HasQueuedCommands queueHolder);
+
+    /**
+     * Unregister a component holding a queue.
+     *
+     * @param queueHolder the queue holder.
+     */
+    void unregisterQueue(HasQueuedCommands queueHolder);
+
+    /**
+     * Signal the endpoint to drain queued commands from the queue holder.
+     * 
+     * @param queuedCommands the queue holder.
+     */
+    void notifyDrainQueuedCommands(HasQueuedCommands queuedCommands);
+
+    /**
+     * Associate a {@link ConnectionWatchdog} with the {@link Endpoint}.
+     * 
+     * @param connectionWatchdog the connection watchdog, may be empty.
+     */
+    void registerConnectionWatchdog(Optional<ConnectionWatchdog> connectionWatchdog);
+
+}
diff --git a/src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java b/src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java
new file mode 100644
index 0000000000..05eb9bcadf
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java
@@ -0,0 +1,19 @@
+package com.lambdaworks.redis.protocol;
+
+import java.util.Queue;
+
+/**
+ * Interface to be implemented by classes that queue commands. Implementors of this class need to expose their queue to control
+ * all queues by maintenance and cleanup processes.
+ *
+ * @author Mark Paluch
+ */
+interface HasQueuedCommands {
+
+    /**
+     * The queue holding commands.
+     * 
+     * @return the queue
+     */
+    Queue<RedisCommand<?, ?, ?>> getQueue();
+}
diff --git a/src/main/java/com/lambdaworks/redis/protocol/QueuedCommands.java b/src/main/java/com/lambdaworks/redis/protocol/QueuedCommands.java
new file mode 100644
index 0000000000..6353f740e8
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/protocol/QueuedCommands.java
@@ -0,0 +1,110 @@
+package com.lambdaworks.redis.protocol;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+import io.netty.util.internal.ConcurrentSet;
+
+/**
+ * Registry for all queued commands. This class allows to register/unregister {@link HasQueuedCommands queue holders}. It
+ * provides queue maintenance commands.
+ * 
+ * @author Mark Paluch
+ */
+class QueuedCommands {
+
+    private Set<HasQueuedCommands> queues = new ConcurrentSet<>();
+
+    /**
+     * Register queue holder.
+     * 
+     * @param queueHolder the queue holder, must not be {@literal null}.
+     */
+    void register(HasQueuedCommands queueHolder) {
+        queues.add(queueHolder);
+    }
+
+    /**
+     * Unregister queue holder.
+     *
+     * @param queueHolder the queue holder, must not be {@literal null}.
+     */
+    void unregister(HasQueuedCommands queueHolder) {
+        queues.remove(queueHolder);
+    }
+
+    /**
+     * Remove a command from all registered queues.
+     * 
+     * @param command the command.
+     */
+    public void remove(RedisCommand<?, ?, ?> command) {
+
+        for (HasQueuedCommands queue : queues) {
+            queue.getQueue().remove(command);
+        }
+    }
+
+    /**
+     * Remove multiple commands from all registered queues.
+     *
+     * @param commands the commands.
+     */
+    void removeAll(Collection<? extends RedisCommand<?, ?, ?>> commands) {
+
+        for (HasQueuedCommands queue : queues) {
+            queue.getQueue().removeAll(commands);
+        }
+    }
+
+    /**
+     * Drain commands from all queues.
+     * 
+     * @return the commands.
+     */
+    List<RedisCommand<?, ?, ?>> drainCommands() {
+
+        int size = 0;
+
+        for (HasQueuedCommands queue : queues) {
+            size += queue.getQueue().size();
+        }
+
+        List<RedisCommand<?, ?, ?>> target = new ArrayList<>(size);
+
+        RedisCommand<?, ?, ?> cmd;
+        for (HasQueuedCommands queue : queues) {
+            while ((cmd = queue.getQueue().poll()) != null) {
+                target.add(cmd);
+            }
+        }
+
+        return target;
+    }
+
+    /**
+     * Check whether the registered queues exceed a global sized of the {@code requestQueueSize}.
+     * 
+     * @param requestQueueSize the queue size limit.
+     * @return {@literal true} if there are more queued commands than {@code requestQueueSize}
+     */
+    boolean exceedsLimit(int requestQueueSize) {
+
+        if (requestQueueSize == Integer.MAX_VALUE) {
+            return false;
+        }
+
+        int current = 0;
+
+        for (HasQueuedCommands queue : queues) {
+            current += queue.getQueue().size();
+            if (current >= requestQueueSize) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java b/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java
index b48cb7abd4..aac7e43823 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java
@@ -24,25 +24,28 @@ class ReconnectionHandler {
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(ReconnectionHandler.class);
 
     private final Supplier<SocketAddress> socketAddressSupplier;
-    private final Bootstrap bootstrap;
     private final ClientOptions clientOptions;
+    private final Bootstrap bootstrap;
+    private final ConnectionFacade connectionFacade;
 
     private TimeUnit timeoutUnit = TimeUnit.SECONDS;
     private long timeout = 60;
 
     private volatile ChannelFuture currentFuture;
-    private boolean reconnectSuspended;
+    private volatile boolean reconnectSuspended;
 
-    ReconnectionHandler(ClientOptions clientOptions, Bootstrap bootstrap,
-            Supplier<SocketAddress> socketAddressSupplier) {
+    ReconnectionHandler(ClientOptions clientOptions, Bootstrap bootstrap, Supplier<SocketAddress> socketAddressSupplier,
+            ConnectionFacade connectionFacade) {
 
         LettuceAssert.notNull(socketAddressSupplier, "SocketAddressSupplier must not be null");
         LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
         LettuceAssert.notNull(bootstrap, "Bootstrap must not be null");
+        LettuceAssert.notNull(connectionFacade, "ConnectionFacade must not be null");
 
         this.socketAddressSupplier = socketAddressSupplier;
         this.bootstrap = bootstrap;
         this.clientOptions = clientOptions;
+        this.connectionFacade = connectionFacade;
     }
 
     protected boolean reconnect(InternalLogLevel infoLevel) throws Exception {
@@ -68,7 +71,6 @@ protected boolean reconnect(InternalLogLevel infoLevel) throws Exception {
             Channel channel = currentFuture.channel();
 
             RedisChannelInitializer channelInitializer = channel.pipeline().get(RedisChannelInitializer.class);
-            CommandHandler<?, ?> commandHandler = channel.pipeline().get(CommandHandler.class);
 
             if (channelInitializer == null) {
                 logger.warn("Reconnection attempt without a RedisChannelInitializer in the channel pipeline");
@@ -76,12 +78,6 @@ protected boolean reconnect(InternalLogLevel infoLevel) throws Exception {
                 return false;
             }
 
-            if (commandHandler == null) {
-                logger.warn("Reconnection attempt without a CommandHandler in the channel pipeline");
-                close(channel);
-                return false;
-            }
-
             try {
                 timeLeft -= System.nanoTime() - start;
                 channelInitializer.channelInitialized().get(Math.max(0, timeLeft), TimeUnit.NANOSECONDS);
@@ -96,7 +92,7 @@ protected boolean reconnect(InternalLogLevel infoLevel) throws Exception {
                 channelInitializer.channelInitialized().cancel(true);
             } catch (Exception e) {
                 if (clientOptions.isCancelCommandsOnReconnectFailure()) {
-                    commandHandler.reset();
+                    connectionFacade.reset();
                 }
 
                 if (clientOptions.isSuspendReconnectOnProtocolFailure()) {
@@ -120,31 +116,23 @@ private void close(Channel channel) {
         }
     }
 
-    public boolean isReconnectSuspended() {
+    boolean isReconnectSuspended() {
         return reconnectSuspended;
     }
 
-    public void setReconnectSuspended(boolean reconnectSuspended) {
+    void setReconnectSuspended(boolean reconnectSuspended) {
         this.reconnectSuspended = reconnectSuspended;
     }
 
-    public TimeUnit getTimeoutUnit() {
-        return timeoutUnit;
-    }
-
-    public void setTimeoutUnit(TimeUnit timeoutUnit) {
-        this.timeoutUnit = timeoutUnit;
-    }
-
-    public long getTimeout() {
+    long getTimeout() {
         return timeout;
     }
 
-    public void setTimeout(long timeout) {
+    void setTimeout(long timeout) {
         this.timeout = timeout;
     }
 
-    public void prepareClose() {
+    void prepareClose() {
 
         if (currentFuture != null && !currentFuture.isDone()) {
             currentFuture.cancel(true);
diff --git a/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java b/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
index a4677d43e6..ecd0fee04e 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
@@ -23,12 +23,10 @@
  * State machine that decodes redis server responses encoded according to the <a href="http://redis.io/topics/protocol">Unified
  * Request Protocol (RESP)</a>.
  *
- * @param <K> Key type.
- * @param <V> Value type.
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class RedisStateMachine<K, V> {
+public class RedisStateMachine {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(RedisStateMachine.class);
     private static final ByteBuffer QUEUED = buffer("QUEUED");
@@ -87,7 +85,7 @@ public RedisStateMachine() {
      * @param output Current command output.
      * @return true if a complete response was read.
      */
-    public boolean decode(ByteBuf buffer, CommandOutput<K, V, ?> output) {
+    public boolean decode(ByteBuf buffer, CommandOutput<?, ?, ?> output) {
         return decode(buffer, null, output);
     }
 
@@ -99,7 +97,7 @@ public boolean decode(ByteBuf buffer, CommandOutput<K, V, ?> output) {
      * @param output Current command output.
      * @return true if a complete response was read.
      */
-    public boolean decode(ByteBuf buffer, RedisCommand<K, V, ?> command, CommandOutput<K, V, ?> output) {
+    public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutput<?, ?, ?> output) {
         int length, end;
         ByteBuffer bytes;
 
@@ -219,7 +217,7 @@ public void reset() {
      * Close the state machine to free resources.
      */
     public void close() {
-        if(closed.compareAndSet(false, true)) {
+        if (closed.compareAndSet(false, true)) {
             responseElementBuffer.release();
         }
     }
@@ -366,7 +364,7 @@ private boolean isEmpty(State[] stack) {
      * @param integer
      * @param command
      */
-    protected void safeSet(CommandOutput<K, V, ?> output, long integer, RedisCommand<K, V, ?> command) {
+    protected void safeSet(CommandOutput<?, ?, ?> output, long integer, RedisCommand<?, ?, ?> command) {
 
         try {
             output.set(integer);
@@ -382,7 +380,7 @@ protected void safeSet(CommandOutput<K, V, ?> output, long integer, RedisCommand
      * @param bytes
      * @param command
      */
-    protected void safeSet(CommandOutput<K, V, ?> output, ByteBuffer bytes, RedisCommand<K, V, ?> command) {
+    protected void safeSet(CommandOutput<?, ?, ?> output, ByteBuffer bytes, RedisCommand<?, ?, ?> command) {
 
         try {
             output.set(bytes);
@@ -398,7 +396,7 @@ protected void safeSet(CommandOutput<K, V, ?> output, ByteBuffer bytes, RedisCom
      * @param count
      * @param command
      */
-    protected void safeMulti(CommandOutput<K, V, ?> output, int count, RedisCommand<K, V, ?> command) {
+    protected void safeMulti(CommandOutput<?, ?, ?> output, int count, RedisCommand<?, ?, ?> command) {
 
         try {
             output.multi(count);
@@ -414,7 +412,7 @@ protected void safeMulti(CommandOutput<K, V, ?> output, int count, RedisCommand<
      * @param bytes
      * @param command
      */
-    protected void safeSetError(CommandOutput<K, V, ?> output, ByteBuffer bytes, RedisCommand<K, V, ?> command) {
+    protected void safeSetError(CommandOutput<?, ?, ?> output, ByteBuffer bytes, RedisCommand<?, ?, ?> command) {
 
         try {
             output.setError(bytes);
diff --git a/src/main/java/com/lambdaworks/redis/protocol/SharedLock.java b/src/main/java/com/lambdaworks/redis/protocol/SharedLock.java
new file mode 100644
index 0000000000..4a3bce3c33
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/protocol/SharedLock.java
@@ -0,0 +1,128 @@
+package com.lambdaworks.redis.protocol;
+
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Shared locking facade that supports shared and exclusive locking.
+ * <p>
+ * Multiple shared locks (writers) are allowed concurrently to process their work. If an exclusive lock is requested, the
+ * exclusive lock requestor will wait until all shared locks are released and the exclusive worker is permitted.
+ * <p>
+ * Exclusive locking is reentrant. An exclusive lock owner is permitted to acquire and release shared locks. Shared/exclusive
+ * lock requests by other threads than the thread which holds the exclusive lock, are forced to wait until the exclusive lock is
+ * released.
+ * 
+ * @author Mark Paluch
+ */
+class SharedLock {
+
+    private final AtomicLong writers = new AtomicLong();
+    private Thread exclusiveLockOwner;
+
+    /**
+     * Wait for stateLock and increment writers. Will wait if stateLock is locked and if writer counter is negative.
+     */
+    void incrementWriters() {
+
+        if (exclusiveLockOwner == Thread.currentThread()) {
+            return;
+        }
+
+        synchronized (this) {
+            for (;;) {
+
+                if (writers.get() >= 0) {
+                    writers.incrementAndGet();
+                    return;
+                }
+            }
+        }
+    }
+
+    /**
+     * Decrement writers without any wait.
+     */
+    void decrementWriters() {
+
+        if (exclusiveLockOwner == Thread.currentThread()) {
+            return;
+        }
+
+        writers.decrementAndGet();
+    }
+
+    /**
+     * Execute a {@link Runnable} guarded by an exclusive lock.
+     * 
+     * @param runnable the runnable, must not be {@literal null}.
+     */
+    void doExclusive(Runnable runnable) {
+
+        LettuceAssert.notNull(runnable, "Runnable must not be null");
+
+        doExclusive(() -> {
+            runnable.run();
+            return null;
+        });
+    }
+
+    /**
+     * Retrieve a value produced by a {@link Supplier} guarded by an exclusive lock.
+     * 
+     * @param supplier the {@link Supplier}, must not be {@literal null}.
+     * @param <T> the return type
+     * @return the return value
+     */
+    <T> T doExclusive(Supplier<T> supplier) {
+
+        LettuceAssert.notNull(supplier, "Supplier must not be null");
+
+        synchronized (this) {
+
+            try {
+
+                lockWritersExclusive();
+                return supplier.get();
+            } finally {
+                unlockWritersExclusive();
+            }
+        }
+    }
+
+    /**
+     * Wait for stateLock and no writers. Must be used in an outer {@code synchronized} block to prevent interleaving with other
+     * methods using writers. Sets writers to a negative value to create a lock for {@link #incrementWriters()}.
+     */
+    private void lockWritersExclusive() {
+
+        if (exclusiveLockOwner == Thread.currentThread()) {
+            writers.decrementAndGet();
+            return;
+        }
+
+        synchronized (this) {
+            for (;;) {
+
+                if (writers.compareAndSet(0, -1)) {
+                    exclusiveLockOwner = Thread.currentThread();
+                    return;
+                }
+            }
+        }
+    }
+
+    /**
+     * Unlock writers.
+     */
+    private void unlockWritersExclusive() {
+
+        if (exclusiveLockOwner == Thread.currentThread()) {
+            if (writers.incrementAndGet() == 0) {
+                exclusiveLockOwner = null;
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java b/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java
index 2937ce9c61..2877dec55a 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java
@@ -2,15 +2,11 @@
 
 package com.lambdaworks.redis.pubsub;
 
-import java.util.Queue;
-
-import com.lambdaworks.redis.ClientOptions;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.output.CommandOutput;
 import com.lambdaworks.redis.protocol.CommandHandler;
-import com.lambdaworks.redis.protocol.RedisCommand;
-
 import com.lambdaworks.redis.resource.ClientResources;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
@@ -24,44 +20,54 @@
  * 
  * @author Will Glozer
  */
-public class PubSubCommandHandler<K, V> extends CommandHandler<K, V> {
+public class PubSubCommandHandler<K, V> extends CommandHandler {
+
+    private PubSubEndpoint<K, V> endpoint;
     private RedisCodec<K, V> codec;
     private PubSubOutput<K, V, V> output;
 
     /**
      * Initialize a new instance.
      * 
-     * @param clientOptions client options for the connection
      * @param clientResources client resources for this connection
-     * @param queue Command queue.
      * @param codec Codec.
+     * @param endpoint the Pub/Sub endpoint for Pub/Sub callback.
      */
-    public PubSubCommandHandler(ClientOptions clientOptions, ClientResources clientResources,
-            Queue<RedisCommand<K, V, ?>> queue, RedisCodec<K, V> codec) {
-        super(clientOptions, clientResources, queue);
+    public PubSubCommandHandler(ClientResources clientResources, RedisCodec<K, V> codec, PubSubEndpoint<K, V> endpoint) {
+
+        super(clientResources, endpoint);
+
         this.codec = codec;
         this.output = new PubSubOutput<>(codec);
+        this.endpoint = endpoint;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws InterruptedException {
-        while (output.type() == null && !queue.isEmpty()) {
-            CommandOutput<K, V, ?> currentOutput = queue.peek().getOutput();
-            if (!rsm.decode(buffer, currentOutput)) {
+
+        while (output.type() == null && !getQueue().isEmpty()) {
+            CommandOutput<?, ?, ?> currentOutput = getQueue().peek().getOutput();
+
+            if (!super.decode(buffer, currentOutput)) {
                 return;
             }
-            queue.poll().complete();
+
+            getQueue().poll().complete();
+
             buffer.discardReadBytes();
+
             if (currentOutput instanceof PubSubOutput) {
-                ctx.fireChannelRead(currentOutput);
+                endpoint.notifyMessage((PubSubOutput) currentOutput);
             }
         }
 
-        while (rsm.decode(buffer, output)) {
-            ctx.fireChannelRead(output);
-            output = new PubSubOutput<K, V, V>(codec);
+        while (super.decode(buffer, output)) {
+
+            endpoint.notifyMessage(output);
+            output = new PubSubOutput<>(codec);
+
             buffer.discardReadBytes();
         }
     }
-
 }
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java b/src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java
new file mode 100644
index 0000000000..a35ed3c8b8
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java
@@ -0,0 +1,117 @@
+package com.lambdaworks.redis.pubsub;
+
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import com.lambdaworks.redis.ClientOptions;
+import com.lambdaworks.redis.protocol.DefaultEndpoint;
+
+import io.netty.util.internal.ConcurrentSet;
+
+/**
+ * @author Mark Paluch
+ */
+public class PubSubEndpoint<K, V> extends DefaultEndpoint {
+
+    private final List<RedisPubSubListener<K, V>> listeners = new CopyOnWriteArrayList<>();
+    private final Set<K> channels;
+    private final Set<K> patterns;
+
+    /**
+     * Initialize a new instance that handles commands from the supplied queue.
+     *
+     * @param clientOptions client options for this connection, must not be {@literal null}
+     */
+    public PubSubEndpoint(ClientOptions clientOptions) {
+        super(clientOptions);
+
+        this.channels = new ConcurrentSet<>();
+        this.patterns = new ConcurrentSet<>();
+    }
+
+    /**
+     * Add a new listener.
+     *
+     * @param listener Listener.
+     */
+    public void addListener(RedisPubSubListener<K, V> listener) {
+        listeners.add(listener);
+    }
+
+    /**
+     * Remove an existing listener.
+     *
+     * @param listener Listener.
+     */
+    public void removeListener(RedisPubSubListener<K, V> listener) {
+        listeners.remove(listener);
+    }
+
+    public Set<K> getChannels() {
+        return channels;
+    }
+
+    public Set<K> getPatterns() {
+        return patterns;
+    }
+
+    public void notifyMessage(PubSubOutput<K, V, V> output) {
+
+        // drop empty messages
+        if (output.type() == null || (output.pattern() == null && output.channel() == null && output.get() == null)) {
+            return;
+        }
+
+        updateInternalState(output);
+        notifyListeners(output);
+    }
+
+    private void notifyListeners(PubSubOutput<K, V, V> output) {
+        // update listeners
+        for (RedisPubSubListener<K, V> listener : listeners) {
+            switch (output.type()) {
+                case message:
+                    listener.message(output.channel(), output.get());
+                    break;
+                case pmessage:
+                    listener.message(output.pattern(), output.channel(), output.get());
+                    break;
+                case psubscribe:
+                    listener.psubscribed(output.pattern(), output.count());
+                    break;
+                case punsubscribe:
+                    listener.punsubscribed(output.pattern(), output.count());
+                    break;
+                case subscribe:
+                    listener.subscribed(output.channel(), output.count());
+                    break;
+                case unsubscribe:
+                    listener.unsubscribed(output.channel(), output.count());
+                    break;
+                default:
+                    throw new UnsupportedOperationException("Operation " + output.type() + " not supported");
+            }
+        }
+    }
+
+    private void updateInternalState(PubSubOutput<K, V, V> output) {
+        // update internal state
+        switch (output.type()) {
+            case psubscribe:
+                patterns.add(output.pattern());
+                break;
+            case punsubscribe:
+                patterns.remove(output.pattern());
+                break;
+            case subscribe:
+                channels.add(output.channel());
+                break;
+            case unsubscribe:
+                channels.remove(output.channel());
+                break;
+            default:
+                break;
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
index 123ebcf193..fc92f01593 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
@@ -30,13 +30,10 @@
  * @param <V> Value type.
  * @author Mark Paluch
  */
-@ChannelHandler.Sharable
 public class StatefulRedisPubSubConnectionImpl<K, V> extends StatefulRedisConnectionImpl<K, V> implements
         StatefulRedisPubSubConnection<K, V> {
 
-    protected final List<RedisPubSubListener<K, V>> listeners;
-    protected final Set<K> channels;
-    protected final Set<K> patterns;
+    private final PubSubEndpoint<K, V> endpoint;
 
     /**
      * Initialize a new connection.
@@ -46,13 +43,11 @@ public class StatefulRedisPubSubConnectionImpl<K, V> extends StatefulRedisConnec
      * @param timeout Maximum time to wait for a response.
      * @param unit Unit of time for the timeout.
      */
-    public StatefulRedisPubSubConnectionImpl(RedisChannelWriter<K, V> writer, RedisCodec<K, V> codec, long timeout,
+    public StatefulRedisPubSubConnectionImpl(PubSubEndpoint<K, V> endpoint, RedisChannelWriter writer, RedisCodec<K, V> codec, long timeout,
             TimeUnit unit) {
         super(writer, codec, timeout, unit);
 
-        listeners = new CopyOnWriteArrayList<>();
-        channels = new ConcurrentSet<>();
-        patterns = new ConcurrentSet<>();
+        this.endpoint = endpoint;
     }
 
     /**
@@ -62,7 +57,7 @@ public StatefulRedisPubSubConnectionImpl(RedisChannelWriter<K, V> writer, RedisC
      */
     @Override
     public void addListener(RedisPubSubListener<K, V> listener) {
-        listeners.add(listener);
+        endpoint.addListener(listener);
     }
 
     /**
@@ -72,7 +67,7 @@ public void addListener(RedisPubSubListener<K, V> listener) {
      */
     @Override
     public void removeListener(RedisPubSubListener<K, V> listener) {
-        listeners.remove(listener);
+        endpoint.removeListener(listener);
     }
 
     @Override
@@ -105,48 +100,6 @@ protected RedisPubSubReactiveCommandsImpl<K, V> newRedisReactiveCommandsImpl() {
         return new RedisPubSubReactiveCommandsImpl<>(this, codec);
     }
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public void channelRead(Object msg) {
-        PubSubOutput<K, V, V> output = (PubSubOutput<K, V, V>) msg;
-
-        // drop empty messages
-        if (output.type() == null || (output.pattern() == null && output.channel() == null && output.get() == null)) {
-            return;
-        }
-
-        updateInternalState(output);
-        notifyListeners(output);
-    }
-
-    private void notifyListeners(PubSubOutput<K, V, V> output) {
-        // update listeners
-        for (RedisPubSubListener<K, V> listener : listeners) {
-            switch (output.type()) {
-                case message:
-                    listener.message(output.channel(), output.get());
-                    break;
-                case pmessage:
-                    listener.message(output.pattern(), output.channel(), output.get());
-                    break;
-                case psubscribe:
-                    listener.psubscribed(output.pattern(), output.count());
-                    break;
-                case punsubscribe:
-                    listener.punsubscribed(output.pattern(), output.count());
-                    break;
-                case subscribe:
-                    listener.subscribed(output.channel(), output.count());
-                    break;
-                case unsubscribe:
-                    listener.unsubscribed(output.channel(), output.count());
-                    break;
-                default:
-                    throw new UnsupportedOperationException("Operation " + output.type() + " not supported");
-            }
-        }
-    }
-
     /**
      * Re-subscribe to all previously subscribed channels and patterns.
      * 
@@ -156,12 +109,12 @@ protected List<RedisFuture<Void>> resubscribe() {
 
         List<RedisFuture<Void>> result = new ArrayList<>();
 
-        if (!channels.isEmpty()) {
-            result.add(async().subscribe(toArray(channels)));
+        if (!endpoint.getChannels().isEmpty()) {
+            result.add(async().subscribe(toArray(endpoint.getChannels())));
         }
 
-        if (!patterns.isEmpty()) {
-            result.add(async().psubscribe(toArray(patterns)));
+        if (!endpoint.getPatterns().isEmpty()) {
+            result.add(async().psubscribe(toArray(endpoint.getPatterns())));
         }
 
         return result;
@@ -174,25 +127,7 @@ private <T> T[] toArray(Collection<T> c) {
         return c.toArray(array);
     }
 
-    private void updateInternalState(PubSubOutput<K, V, V> output) {
-        // update internal state
-        switch (output.type()) {
-            case psubscribe:
-                patterns.add(output.pattern());
-                break;
-            case punsubscribe:
-                patterns.remove(output.pattern());
-                break;
-            case subscribe:
-                channels.add(output.channel());
-                break;
-            case unsubscribe:
-                channels.remove(output.channel());
-                break;
-            default:
-                break;
-        }
-    }
+
 
     @Override
     public void activated() {
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java b/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
index 9f852dc829..8be3d00d42 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
@@ -15,7 +15,6 @@
 /**
  * @author Mark Paluch
  */
-@ChannelHandler.Sharable
 public class StatefulRedisSentinelConnectionImpl<K, V> extends RedisChannelHandler<K, V> implements
         StatefulRedisSentinelConnection<K, V> {
 
@@ -24,7 +23,7 @@ public class StatefulRedisSentinelConnectionImpl<K, V> extends RedisChannelHandl
     protected final RedisSentinelAsyncCommands<K, V> async;
     protected final RedisSentinelReactiveCommands<K, V> reactive;
 
-    public StatefulRedisSentinelConnectionImpl(RedisChannelWriter<K, V> writer, RedisCodec<K, V> codec, long timeout,
+    public StatefulRedisSentinelConnectionImpl(RedisChannelWriter writer, RedisCodec<K, V> codec, long timeout,
             TimeUnit unit) {
         super(writer, timeout, unit);
 
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
index 42be2f7f2f..76f2487192 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
@@ -4,10 +4,11 @@
 
 import javax.enterprise.inject.Alternative;
 
+import com.lambdaworks.redis.RedisChannelWriter;
 import com.lambdaworks.redis.RedisClient;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.pubsub.PubSubCommandHandler;
+import com.lambdaworks.redis.pubsub.PubSubEndpoint;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl;
 import com.lambdaworks.redis.resource.ClientResources;
 
@@ -27,8 +28,8 @@ public MyExtendedRedisClient() {
     }
 
     @Override
-    protected <K, V> StatefulRedisPubSubConnectionImpl<K, V> newStatefulRedisPubSubConnection(
-            PubSubCommandHandler<K, V> commandHandler, RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
-        return new MyPubSubConnection<>(commandHandler, codec, timeout, unit);
+    protected <K, V> StatefulRedisPubSubConnectionImpl<K, V> newStatefulRedisPubSubConnection(PubSubEndpoint<K, V> endpoint,
+            RedisChannelWriter channelWriter, RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
+        return new MyPubSubConnection<>(endpoint, channelWriter, codec, timeout, unit);
     }
 }
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
index 77d1e9be71..dd3e9933d7 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
@@ -7,6 +7,7 @@
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.protocol.CommandType;
 import com.lambdaworks.redis.protocol.RedisCommand;
+import com.lambdaworks.redis.pubsub.PubSubEndpoint;
 import com.lambdaworks.redis.pubsub.PubSubOutput;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl;
 
@@ -22,14 +23,17 @@ public class MyPubSubConnection<K, V> extends StatefulRedisPubSubConnectionImpl<
 
     /**
      * Initialize a new connection.
-     * 
-     * @param writer
+     *
+     * @param endpoint
+     * @param writer the channel writer
      * @param codec Codec used to encode/decode keys and values.
-     * @param timeout Maximum time to wait for a responses.
+     * @param timeout Maximum time to wait for a response.
      * @param unit Unit of time for the timeout.
      */
-    public MyPubSubConnection(RedisChannelWriter<K, V> writer, RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
-        super(writer, codec, timeout, unit);
+    public MyPubSubConnection(PubSubEndpoint<K, V> endpoint,
+                              RedisChannelWriter writer, RedisCodec<K, V> codec, long timeout,
+                              TimeUnit unit) {
+        super(endpoint, writer, codec, timeout, unit);
     }
 
     @Override
@@ -42,26 +46,4 @@ public <T, C extends RedisCommand<K, V, T>> C dispatch(C cmd) {
         return super.dispatch(cmd);
     }
 
-    public void channelRead(Object msg) {
-        PubSubOutput<K, V, V> output = (PubSubOutput<K, V, V>) msg;
-        // update internal state
-        switch (output.type()) {
-            case psubscribe:
-                patterns.add(output.pattern());
-                break;
-            case punsubscribe:
-                patterns.remove(output.pattern());
-                break;
-            case subscribe:
-                channels.add(output.channel());
-                break;
-            case unsubscribe:
-                channels.remove(output.channel());
-                break;
-            default:
-                break;
-        }
-        super.channelRead(msg);
-    }
-
 }
diff --git a/src/test/java/com/lambdaworks/Connections.java b/src/test/java/com/lambdaworks/ConnectionTestUtil.java
similarity index 60%
rename from src/test/java/com/lambdaworks/Connections.java
rename to src/test/java/com/lambdaworks/ConnectionTestUtil.java
index 7e13bb0b8a..d13c68443b 100644
--- a/src/test/java/com/lambdaworks/Connections.java
+++ b/src/test/java/com/lambdaworks/ConnectionTestUtil.java
@@ -2,7 +2,6 @@
 
 import java.util.Queue;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.lambdaworks.redis.RedisChannelHandler;
@@ -10,14 +9,17 @@
 import com.lambdaworks.redis.StatefulRedisConnectionImpl;
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
+import com.lambdaworks.redis.internal.LettuceFactories;
+import com.lambdaworks.redis.protocol.CommandHandler;
 import com.lambdaworks.redis.protocol.ConnectionWatchdog;
+import com.lambdaworks.redis.protocol.DefaultEndpoint;
 
 import io.netty.channel.Channel;
 
 /**
  * @author Mark Paluch
  */
-public class Connections {
+public class ConnectionTestUtil {
 
     /**
      * Extract the {@link Channel} from a stateful connection.
@@ -33,6 +35,7 @@ public static Channel getChannel(StatefulConnection<?, ?> connection) {
 
     /**
      * Extract the {@link ConnectionWatchdog} from a stateful connection.
+     * 
      * @param connection
      * @return
      */
@@ -46,19 +49,42 @@ public static <K, V> StatefulRedisConnectionImpl<K, V> getStatefulConnection(Red
         return (StatefulRedisConnectionImpl<K, V>) connection.getStatefulConnection();
     }
 
-    public static <K, V> RedisChannelWriter<K, V> getChannelWriter(StatefulConnection<K, V> connection) {
+    public static <K, V> RedisChannelWriter getChannelWriter(StatefulConnection<K, V> connection) {
         return ((RedisChannelHandler<K, V>) connection).getChannelWriter();
     }
 
     public static Queue<Object> getQueue(StatefulConnection<?, ?> connection) {
-        return (Queue<Object>) ReflectionTestUtils.getField(Connections.getChannelWriter(connection), "queue");
+
+        Channel channel = getChannel(connection);
+
+        if (channel != null) {
+            CommandHandler commandHandler = channel.pipeline().get(CommandHandler.class);
+            return (Queue) commandHandler.getQueue();
+        }
+
+        return LettuceFactories.newConcurrentQueue();
+
     }
 
     public static Queue<Object> getCommandBuffer(StatefulConnection<?, ?> connection) {
-        return (Queue<Object>) ReflectionTestUtils.getField(Connections.getChannelWriter(connection), "commandBuffer");
+
+        RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection);
+        if (channelWriter instanceof DefaultEndpoint) {
+            return (Queue) ((DefaultEndpoint) channelWriter).getQueue();
+        }
+
+        return LettuceFactories.newConcurrentQueue();
     }
 
     public static String getConnectionState(StatefulConnection<?, ?> connection) {
-        return ReflectionTestUtils.getField(Connections.getChannelWriter(connection), "lifecycleState").toString();
+
+        Channel channel = getChannel(connection);
+
+        if (channel != null) {
+            CommandHandler commandHandler = channel.pipeline().get(CommandHandler.class);
+            return ReflectionTestUtils.getField(commandHandler, "lifecycleState").toString();
+        }
+
+        return "";
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java b/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
index 785090adae..0777067daf 100644
--- a/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
@@ -1,8 +1,8 @@
 package com.lambdaworks.redis;
 
-import static com.lambdaworks.Connections.getChannel;
-import static com.lambdaworks.Connections.getConnectionWatchdog;
-import static com.lambdaworks.Connections.getStatefulConnection;
+import static com.lambdaworks.ConnectionTestUtil.getChannel;
+import static com.lambdaworks.ConnectionTestUtil.getConnectionWatchdog;
+import static com.lambdaworks.ConnectionTestUtil.getStatefulConnection;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
diff --git a/src/test/java/com/lambdaworks/redis/ClientTest.java b/src/test/java/com/lambdaworks/redis/ClientTest.java
index b024ade1d6..f0f2af52f3 100644
--- a/src/test/java/com/lambdaworks/redis/ClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientTest.java
@@ -4,7 +4,7 @@
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
 import static com.google.code.tempusfugit.temporal.WaitFor.waitOrTimeout;
-import static com.lambdaworks.Connections.getStatefulConnection;
+import static com.lambdaworks.ConnectionTestUtil.getStatefulConnection;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java b/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
index 53d821d79a..a2fa7eab76 100644
--- a/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
@@ -4,8 +4,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
 
-import org.assertj.core.api.Assertions;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
diff --git a/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java b/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java
deleted file mode 100644
index 5c1de4cd35..0000000000
--- a/src/test/java/com/lambdaworks/redis/LettucePerformanceTest.java
+++ /dev/null
@@ -1,251 +0,0 @@
-package com.lambdaworks.redis;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.*;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.Configuration;
-import org.junit.*;
-
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * @author Mark Paluch
- */
-@Ignore
-public class LettucePerformanceTest {
-
-    private static RedisClient redisClient = RedisClient.create(RedisURI.create(TestSettings.host(), TestSettings.port()));
-    private ExecutorService executor;
-    private CountDownLatch latch = new CountDownLatch(1);
-
-    @Before
-    public void before() throws Exception {
-
-        LoggerContext ctx = (LoggerContext) LogManager.getContext();
-        Configuration config = ctx.getConfiguration();
-        config.getLoggerConfig("com.lambdaworks.redis").setLevel(Level.OFF);
-        config.getLoggerConfig("com.lambdaworks.redis.protocol").setLevel(Level.OFF);
-    }
-
-    @After
-    public void after() throws Exception {
-        LoggerContext ctx = (LoggerContext) LogManager.getContext();
-        ctx.reconfigure();
-        executor.shutdown();
-        executor.awaitTermination(1, TimeUnit.MINUTES);
-    }
-
-    @AfterClass
-    public static void afterClass() throws Exception {
-        redisClient.shutdown();
-    }
-
-    /**
-     * Multi-threaded performance test.
-     *
-     * Uses a {@link ThreadPoolExecutor} with thread and connection preheating. Execution tasks are submitted and synchronized
-     * with a {@link CountDownLatch}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void testSyncAsyncPerformance() throws Exception {
-
-        // TWEAK ME
-        int threads = 4;
-        int totalCalls = 250000;
-        boolean waitForFutureCompletion = true;
-        boolean connectionPerThread = false;
-        // Keep in mind, that the size of the event loop threads is CPU count * 4 unless you
-        // set -Dio.netty.eventLoopThreads=...
-        // END OF TWEAK ME
-
-        executor = new ThreadPoolExecutor(threads, threads, 1, TimeUnit.MINUTES, new ArrayBlockingQueue<Runnable>(totalCalls));
-
-        List<Future<List<CompletableFuture<String>>>> futurama = new ArrayList<>();
-
-        preheat(threads);
-
-        final int callsPerThread = totalCalls / threads;
-
-        submitExecutionTasks(threads, futurama, callsPerThread, connectionPerThread);
-        Thread.sleep(800);
-
-        long start = System.currentTimeMillis();
-        latch.countDown();
-
-        for (Future<List<CompletableFuture<String>>> listFuture : futurama) {
-            for (CompletableFuture<String> future : listFuture.get()) {
-                if (waitForFutureCompletion) {
-                    future.get();
-                }
-            }
-        }
-
-        long end = System.currentTimeMillis();
-
-        long duration = end - start;
-        double durationSeconds = duration / 1000d;
-        double opsPerSecond = totalCalls / durationSeconds;
-        System.out.println(String.format("Sync/Async: Duration: %d ms (%.2f sec), operations: %d, %.2f ops/sec ", duration,
-                durationSeconds, totalCalls, opsPerSecond));
-
-        for (Future<List<CompletableFuture<String>>> listFuture : futurama) {
-            for (CompletableFuture<String> future : listFuture.get()) {
-                future.get();
-            }
-        }
-
-    }
-
-    protected void submitExecutionTasks(int threads, List<Future<List<CompletableFuture<String>>>> futurama,
-            final int callsPerThread, final boolean connectionPerThread) {
-        final RedisAsyncCommands<String, String> sharedConnection;
-        if (!connectionPerThread) {
-            sharedConnection = redisClient.connect().async();
-        } else {
-            sharedConnection = null;
-        }
-
-        for (int i = 0; i < threads; i++) {
-            Future<List<CompletableFuture<String>>> submit = executor.submit(() -> {
-
-                RedisAsyncCommands<String, String> connection = sharedConnection;
-                if (connectionPerThread) {
-                    connection = redisClient.connect().async();
-                }
-                connection.ping().get();
-
-                List<CompletableFuture<String>> futures = new ArrayList<>(callsPerThread);
-                latch.await();
-                for (int i1 = 0; i1 < callsPerThread; i1++) {
-                    futures.add(connection.ping().toCompletableFuture());
-                }
-
-                return futures;
-            });
-
-            futurama.add(submit);
-        }
-    }
-
-    /**
-     * Multi-threaded performance using reactive commands.
-     *
-     * Uses a {@link ThreadPoolExecutor} with thread and connection preheating. Execution tasks are submitted and synchronized
-     * with a {@link CountDownLatch}
-     *
-     * @throws Exception
-     */
-    @Test
-    public void testReactivePerformance() throws Exception {
-
-        // TWEAK ME
-        int threads = 4;
-        int totalCalls = 25000;
-        boolean waitForCompletion = true;
-        boolean connectionPerThread = false;
-        // Keep in mind, that the size of the event loop threads is CPU count * 4 unless you
-        // set -Dio.netty.eventLoopThreads=...
-        // END OF TWEAK ME
-
-        executor = new ThreadPoolExecutor(threads, threads, 1, TimeUnit.MINUTES, new ArrayBlockingQueue<Runnable>(totalCalls));
-
-        List<Future<List<Mono<String>>>> futurama = new ArrayList<>();
-
-        preheat(threads);
-        final int callsPerThread = totalCalls / threads;
-
-        submitFluxTasks(threads, futurama, callsPerThread, connectionPerThread);
-        Thread.sleep(800);
-
-        long start = System.currentTimeMillis();
-        latch.countDown();
-
-        for (Future<List<Mono<String>>> listFuture : futurama) {
-
-            if (waitForCompletion) {
-                Flux.concat(listFuture.get()).last().subscribe().request(Long.MAX_VALUE);
-
-            } else
-                for (Mono<String> mono : listFuture.get()) {
-                    mono.subscribe().request(Long.MAX_VALUE);
-                }
-        }
-
-        long end = System.currentTimeMillis();
-
-        long duration = end - start;
-        double durationSeconds = duration / 1000d;
-        double opsPerSecond = totalCalls / durationSeconds;
-        System.out.println(String.format("Reactive Duration: %d ms (%.2f sec), operations: %d, %.2f ops/sec ", duration,
-                durationSeconds, totalCalls, opsPerSecond));
-
-    }
-
-    protected void submitFluxTasks(int threads, List<Future<List<Mono<String>>>> futurama, final int callsPerThread,
-            final boolean connectionPerThread) {
-        final StatefulRedisConnection<String, String> sharedConnection;
-        if (!connectionPerThread) {
-            sharedConnection = redisClient.connect();
-        } else {
-            sharedConnection = null;
-        }
-
-        for (int i = 0; i < threads; i++) {
-            Future<List<Mono<String>>> submit = executor.submit(() -> {
-
-                StatefulRedisConnection<String, String> connection = sharedConnection;
-                if (connectionPerThread) {
-                    connection = redisClient.connect();
-                }
-                RedisReactiveCommands<String, String> reactive = connection.reactive();
-
-                connection.sync().ping();
-
-                List<Mono<String>> monos = new ArrayList<>(callsPerThread);
-                latch.await();
-                for (int i1 = 0; i1 < callsPerThread; i1++) {
-                    monos.add(reactive.ping());
-                }
-
-                return monos;
-            });
-
-            futurama.add(submit);
-        }
-    }
-
-    protected void preheat(int threads) throws Exception {
-
-        List<Future<?>> futures = new ArrayList<>();
-
-        for (int i = 0; i < threads; i++) {
-
-            futures.add(executor.submit(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        Thread.sleep(100);
-                    } catch (InterruptedException e) {
-                        Thread.currentThread().interrupt();
-                    }
-                }
-            }));
-        }
-
-        for (Future<?> future : futures) {
-            future.get();
-        }
-
-    }
-}
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java
index 4b7d8580b3..2a60483451 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java
@@ -25,7 +25,7 @@
 public class ClusterCommandInternalsTest {
 
     @Mock
-    private RedisChannelWriter<String, String> writerMock;
+    private RedisChannelWriter writerMock;
 
     private ClusterCommand<String, String, String> sut;
     private Command<String, String, String> command = new Command<String, String, String>(CommandType.TYPE,
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeCommandHandlerTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java
similarity index 91%
rename from src/test/java/com/lambdaworks/redis/cluster/ClusterNodeCommandHandlerTest.java
rename to src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java
index 0b5e640678..564595e50a 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeCommandHandlerTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java
@@ -9,7 +9,6 @@
 
 import java.util.Queue;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.LinkedBlockingQueue;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -32,12 +31,12 @@
  * @author Mark Paluch
  */
 @RunWith(MockitoJUnitRunner.class)
-public class ClusterNodeCommandHandlerTest {
+public class ClusterNodeEndpointTest {
 
     private AsyncCommand<String, String, String> command = new AsyncCommand<>(
             new Command<>(CommandType.APPEND, new StatusOutput<String, String>(new Utf8StringCodec()), null));
 
-    private Queue<RedisCommand<String, String, ?>> queue = new LinkedBlockingQueue<>();
+    private Queue<RedisCommand<String, String, ?>> queue;
 
     @Mock
     private ClientOptions clientOptions;
@@ -46,14 +45,15 @@ public class ClusterNodeCommandHandlerTest {
     private ClientResources clientResources;
 
     @Mock
-    private RedisChannelWriter<String, String> clusterChannelWriter;
+    private RedisChannelWriter clusterChannelWriter;
 
-    private ClusterNodeCommandHandler sut;
+    private ClusterNodeEndpoint sut;
 
     @Before
     public void before() throws Exception {
 
-        sut = new ClusterNodeCommandHandler(clientOptions, clientResources, queue, clusterChannelWriter);
+        sut = new ClusterNodeEndpoint(clientOptions, clientResources, clusterChannelWriter);
+        queue = (Queue) sut.getQueue();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java
index d098ca6203..ad27046be2 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java
@@ -27,7 +27,8 @@ public class ClusterSetup {
      * @throws ExecutionException
      * @throws TimeoutException
      */
-    public static void setup2Masters(ClusterRule clusterRule) throws InterruptedException, ExecutionException, TimeoutException {
+    public static void setup2Masters(ClusterRule clusterRule)
+            throws InterruptedException, ExecutionException, TimeoutException {
 
         clusterRule.clusterReset();
         clusterRule.meet(AbstractClusterTest.host, AbstractClusterTest.port5);
@@ -48,16 +49,11 @@ public static void setup2Masters(ClusterRule clusterRule) throws InterruptedExce
                 RedisClusterAsyncCommands<String, String> nodeConnection = connection.getConnection(partition.getNodeId());
 
                 for (Integer slot : partition.getSlots()) {
-
-                    try {
-                        nodeConnection.clusterDelSlots(slot);
-                    } catch (Exception e) {
-                    }
+                    nodeConnection.clusterDelSlots(slot);
                 }
             }
         }
 
-
         RedisClusterAsyncCommands<String, String> node1 = connection.getConnection(AbstractClusterTest.host,
                 AbstractClusterTest.port5);
         node1.clusterAddSlots(AbstractClusterTest.createSlots(0, 12000));
@@ -68,14 +64,12 @@ public static void setup2Masters(ClusterRule clusterRule) throws InterruptedExce
 
         Wait.untilTrue(clusterRule::isStable).waitOrTimeout();
 
-        Wait.untilEquals(
-                2L,
-                () -> {
-                    clusterRule.getClusterClient().reloadPartitions();
+        Wait.untilEquals(2L, () -> {
+            clusterRule.getClusterClient().reloadPartitions();
 
-                    return partitionStream(clusterRule).filter(
-                            redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.MASTER)).count();
-                }).waitOrTimeout();
+            return partitionStream(clusterRule)
+                    .filter(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.MASTER)).count();
+        }).waitOrTimeout();
 
         connection.getStatefulConnection().close();
     }
@@ -89,8 +83,8 @@ public static void setup2Masters(ClusterRule clusterRule) throws InterruptedExce
      * @throws ExecutionException
      * @throws TimeoutException
      */
-    public static void setupMasterWithSlave(ClusterRule clusterRule) throws InterruptedException, ExecutionException,
-            TimeoutException {
+    public static void setupMasterWithSlave(ClusterRule clusterRule)
+            throws InterruptedException, ExecutionException, TimeoutException {
 
         clusterRule.clusterReset();
         clusterRule.meet(AbstractClusterTest.host, AbstractClusterTest.port5);
@@ -104,8 +98,8 @@ public static void setupMasterWithSlave(ClusterRule clusterRule) throws Interrup
             return clusterRule.getClusterClient().getPartitions().size();
         }).waitOrTimeout();
 
-        RedisClusterCommands<String, String> node1 = statefulConnection.getConnection(TestSettings.hostAddr(),
-                AbstractClusterTest.port5).sync();
+        RedisClusterCommands<String, String> node1 = statefulConnection
+                .getConnection(TestSettings.hostAddr(), AbstractClusterTest.port5).sync();
         node1.clusterAddSlots(AbstractClusterTest.createSlots(0, 16384));
 
         Wait.untilTrue(clusterRule::isStable).waitOrTimeout();
@@ -115,21 +109,17 @@ public static void setupMasterWithSlave(ClusterRule clusterRule) throws Interrup
 
         clusterRule.getClusterClient().reloadPartitions();
 
-        Wait.untilEquals(
-                1L,
-                () -> {
-                    clusterRule.getClusterClient().reloadPartitions();
-                    return partitionStream(clusterRule).filter(
-                            redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.MASTER)).count();
-                }).waitOrTimeout();
-
-        Wait.untilEquals(
-                1L,
-                () -> {
-                    clusterRule.getClusterClient().reloadPartitions();
-                    return partitionStream(clusterRule).filter(
-                            redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE)).count();
-                }).waitOrTimeout();
+        Wait.untilEquals(1L, () -> {
+            clusterRule.getClusterClient().reloadPartitions();
+            return partitionStream(clusterRule)
+                    .filter(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.MASTER)).count();
+        }).waitOrTimeout();
+
+        Wait.untilEquals(1L, () -> {
+            clusterRule.getClusterClient().reloadPartitions();
+            return partitionStream(clusterRule).filter(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE))
+                    .count();
+        }).waitOrTimeout();
 
         connection.getStatefulConnection().close();
     }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java b/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
index 1cd9a2c0eb..08458f3a59 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
@@ -42,7 +42,7 @@ public class PooledClusterConnectionProviderTest {
     private RedisClusterClient clientMock;
 
     @Mock
-    private RedisChannelWriter<String, String> writerMock;
+    private RedisChannelWriter writerMock;
 
     @Mock
     StatefulRedisConnection<String, String> nodeConnectionMock;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
index 1b6cfbc7dd..eb91de2444 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
@@ -411,8 +411,7 @@ public void getButNoPartitionForSlothash() throws Exception {
             redisClusterNode.setSlots(new ArrayList<>());
         }
         RedisChannelHandler rch = (RedisChannelHandler) sync.getStatefulConnection();
-        ClusterDistributionChannelWriter<String, String> writer = (ClusterDistributionChannelWriter<String, String>) rch
-                .getChannelWriter();
+        ClusterDistributionChannelWriter writer = (ClusterDistributionChannelWriter) rch.getChannelWriter();
         writer.setPartitions(clusterClient.getPartitions());
         clusterClient.getPartitions().reload(clusterClient.getPartitions().getPartitions());
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
index 9cb11224ed..8036310860 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
@@ -19,7 +19,7 @@
 
 import com.google.code.tempusfugit.temporal.Condition;
 import com.google.code.tempusfugit.temporal.WaitFor;
-import com.lambdaworks.Connections;
+import com.lambdaworks.ConnectionTestUtil;
 import com.lambdaworks.Futures;
 import com.lambdaworks.Wait;
 import com.lambdaworks.category.SlowTests;
@@ -524,7 +524,7 @@ private void waitUntilOnlyOnePartition() throws InterruptedException, TimeoutExc
 
     private void suspendConnection(RedisClusterAsyncCommands<String, String> asyncCommands)
             throws InterruptedException, TimeoutException {
-        Connections.getConnectionWatchdog(((RedisAsyncCommands<?, ?>) asyncCommands).getStatefulConnection())
+        ConnectionTestUtil.getConnectionWatchdog(((RedisAsyncCommands<?, ?>) asyncCommands).getStatefulConnection())
                 .setReconnectSuspended(true);
         asyncCommands.quit();
         WaitFor.waitOrTimeout(() -> !asyncCommands.isOpen(), timeout(seconds(6)));
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
index 29b7e2ff76..59c0ff9578 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
@@ -129,7 +129,7 @@ public void testClusterConnectionStability() throws Exception {
         RedisChannelHandler<String, String> statefulConnection = (RedisChannelHandler) connection.getStatefulConnection();
 
         connection.set("a", "b");
-        ClusterDistributionChannelWriter<String, String> writer = (ClusterDistributionChannelWriter) statefulConnection
+        ClusterDistributionChannelWriter writer = (ClusterDistributionChannelWriter) statefulConnection
                 .getChannelWriter();
 
         StatefulRedisConnectionImpl<Object, Object> statefulSlotConnection = (StatefulRedisConnectionImpl) writer
@@ -159,62 +159,4 @@ public void testClusterConnectionStability() throws Exception {
 
     }
 
-    @Test(timeout = 20000)
-    public void distributedClusteredAccessAsync() throws Exception {
-
-        RedisAdvancedClusterAsyncCommands<String, String> connection = clusterClient.connect().async();
-
-        List<RedisFuture<?>> futures = new ArrayList<>();
-        for (int i = 0; i < 100; i++) {
-            futures.add(connection.set("a" + i, "myValue1" + i));
-            futures.add(connection.set("b" + i, "myValue2" + i));
-            futures.add(connection.set("d" + i, "myValue3" + i));
-        }
-
-        for (RedisFuture<?> future : futures) {
-            future.get();
-        }
-
-        for (int i = 0; i < 100; i++) {
-            RedisFuture<String> setA = connection.get("a" + i);
-            RedisFuture<String> setB = connection.get("b" + i);
-            RedisFuture<String> setD = connection.get("d" + i);
-
-            setA.get();
-            setB.get();
-            setD.get();
-
-            assertThat(setA.getError()).isNull();
-            assertThat(setB.getError()).isNull();
-            assertThat(setD.getError()).isNull();
-
-            assertThat(setA.get()).isEqualTo("myValue1" + i);
-            assertThat(setB.get()).isEqualTo("myValue2" + i);
-            assertThat(setD.get()).isEqualTo("myValue3" + i);
-        }
-
-        connection.getStatefulConnection().close();
-    }
-
-    @Test
-    public void distributedClusteredAccessSync() throws Exception {
-
-        RedisAdvancedClusterCommands<String, String> connection = clusterClient.connect().sync();
-
-        for (int i = 0; i < 100; i++) {
-            connection.set("a" + i, "myValue1" + i);
-            connection.set("b" + i, "myValue2" + i);
-            connection.set("d" + i, "myValue3" + i);
-        }
-
-        for (int i = 0; i < 100; i++) {
-
-            assertThat(connection.get("a" + i)).isEqualTo("myValue1" + i);
-            assertThat(connection.get("b" + i)).isEqualTo("myValue2" + i);
-            assertThat(connection.get("d" + i)).isEqualTo("myValue3" + i);
-        }
-
-        connection.getStatefulConnection().close();
-    }
-
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java
index ca64bf3ba5..949f490402 100644
--- a/src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
 
+import com.lambdaworks.redis.cluster.SlotHash;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -80,4 +81,14 @@ public void pfcountNoKeys() throws Exception {
         commands().pfcount();
     }
 
+    @Test
+    public void pfaddPfmergePfCount() throws Exception {
+
+        commands().pfadd("key2660", "rand", "mat");
+        commands().pfadd("key7112", "mat", "perrin");
+
+        commands().pfmerge("key8885", "key2660", "key7112");
+
+        assertThat(commands().pfcount("key8885")).isEqualTo(3);
+    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java b/src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java
index 9034d3b5e9..ab73b1e9dd 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java
+++ b/src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java
@@ -6,11 +6,11 @@
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Queue;
 
-import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollector;
-import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollectorOptions;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
@@ -23,21 +23,16 @@
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.invocation.InvocationOnMock;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.mockito.stubbing.Answer;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.lambdaworks.redis.ClientOptions;
 import com.lambdaworks.redis.ConnectionEvents;
-import com.lambdaworks.redis.RedisChannelHandler;
-import com.lambdaworks.redis.RedisException;
 import com.lambdaworks.redis.codec.Utf8StringCodec;
+import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollector;
+import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollectorOptions;
 import com.lambdaworks.redis.output.StatusOutput;
 import com.lambdaworks.redis.resource.ClientResources;
 
-import edu.umd.cs.mtc.MultithreadedTestCase;
-import edu.umd.cs.mtc.TestFramework;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.*;
@@ -46,9 +41,9 @@
 @RunWith(MockitoJUnitRunner.class)
 public class CommandHandlerTest {
 
-    private Queue<RedisCommand<String, String, ?>> q = new ArrayDeque<>(10);
+    private Queue<RedisCommand<String, String, ?>> q;
 
-    private CommandHandler<String, String> sut;
+    private CommandHandler sut;
 
     private final Command<String, String, String> command = new Command<>(CommandType.APPEND,
             new StatusOutput<String, String>(new Utf8StringCodec()), null);
@@ -72,7 +67,7 @@ public class CommandHandlerTest {
     private ClientResources clientResources;
 
     @Mock
-    private RedisChannelHandler channelHandler;
+    private Endpoint endpoint;
 
     @BeforeClass
     public static void beforeClass() {
@@ -102,8 +97,8 @@ public void before() throws Exception {
             return null;
         });
 
-        when(clientResources.commandLatencyCollector()).thenReturn(new DefaultCommandLatencyCollector(
-                DefaultCommandLatencyCollectorOptions.create()));
+        when(clientResources.commandLatencyCollector())
+                .thenReturn(new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create()));
 
         when(channel.write(any())).thenAnswer(invocation -> {
 
@@ -129,8 +124,8 @@ public void before() throws Exception {
             return new DefaultChannelPromise(channel);
         });
 
-        sut = new CommandHandler<String, String>(ClientOptions.create(), clientResources, q);
-        sut.setRedisChannelHandler(channelHandler);
+        sut = new CommandHandler(clientResources, endpoint);
+        q = (Queue) ReflectionTestUtils.getField(sut, "queue");
     }
 
     @Test
@@ -140,133 +135,6 @@ public void testChannelActive() throws Exception {
         sut.channelActive(context);
 
         verify(pipeline).fireUserEventTriggered(any(ConnectionEvents.Activated.class));
-
-    }
-
-    @Test
-    public void testChannelActiveFailureShouldCancelCommands() throws Exception {
-
-        ClientOptions clientOptions = ClientOptions.builder().cancelCommandsOnReconnectFailure(true).build();
-
-        sut = new CommandHandler<String, String>(clientOptions, clientResources, q);
-        sut.setRedisChannelHandler(channelHandler);
-
-        sut.channelRegistered(context);
-        sut.write(command);
-
-        reset(context);
-        when(context.channel()).thenThrow(new RuntimeException());
-        try {
-            sut.channelActive(context);
-            fail("Missing RuntimeException");
-        } catch (RuntimeException e) {
-        }
-
-        assertThat(command.isCancelled()).isTrue();
-    }
-
-    @Test
-    public void testChannelActiveWithBufferedAndQueuedCommands() throws Exception {
-
-        Command<String, String, String> bufferedCommand = new Command<>(CommandType.GET,
-                new StatusOutput<String, String>(new Utf8StringCodec()), null);
-
-        Command<String, String, String> pingCommand = new Command<>(CommandType.PING,
-                new StatusOutput<String, String>(new Utf8StringCodec()), null);
-        q.add(bufferedCommand);
-
-        AtomicLong atomicLong = (AtomicLong) ReflectionTestUtils.getField(sut, "writers");
-        doAnswer(new Answer() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-
-                assertThat(atomicLong.get()).isEqualTo(-1);
-                assertThat(ReflectionTestUtils.getField(sut, "exclusiveLockOwner")).isNotNull();
-
-                sut.write(pingCommand);
-
-                return null;
-            }
-        }).when(channelHandler).activated();
-        when(channel.isActive()).thenReturn(true);
-
-        sut.channelRegistered(context);
-        sut.channelActive(context);
-
-        assertThat(atomicLong.get()).isEqualTo(0);
-        assertThat(ReflectionTestUtils.getField(sut, "exclusiveLockOwner")).isNull();
-        assertThat(q).containsSequence(pingCommand, bufferedCommand);
-
-        verify(pipeline).fireUserEventTriggered(any(ConnectionEvents.Activated.class));
-    }
-
-    @Test
-    public void testChannelActiveWithBufferedAndQueuedCommandsRetainsOrder() throws Exception {
-
-        Command<String, String, String> bufferedCommand1 = new Command<>(CommandType.SET,
-                new StatusOutput<String, String>(new Utf8StringCodec()), null);
-
-        Command<String, String, String> bufferedCommand2 = new Command<>(CommandType.GET,
-                new StatusOutput<String, String>(new Utf8StringCodec()), null);
-
-        Command<String, String, String> queuedCommand1 = new Command<>(CommandType.PING,
-                new StatusOutput<String, String>(new Utf8StringCodec()), null);
-
-        Command<String, String, String> queuedCommand2 = new Command<>(CommandType.AUTH,
-                new StatusOutput<String, String>(new Utf8StringCodec()), null);
-
-        q.add(queuedCommand1);
-        q.add(queuedCommand2);
-
-        Collection buffer = (Collection) ReflectionTestUtils.getField(sut, "commandBuffer");
-        buffer.add(bufferedCommand1);
-        buffer.add(bufferedCommand2);
-
-        reset(channel);
-        when(channel.writeAndFlush(any())).thenAnswer(invocation -> new DefaultChannelPromise(channel));
-        when(channel.eventLoop()).thenReturn(eventLoop);
-        when(channel.pipeline()).thenReturn(pipeline);
-
-        sut.channelRegistered(context);
-        sut.channelActive(context);
-
-        assertThat(q).isEmpty();
-        assertThat(buffer).isEmpty();
-
-        ArgumentCaptor<Object> objectArgumentCaptor = ArgumentCaptor.forClass(Object.class);
-        verify(channel).writeAndFlush(objectArgumentCaptor.capture());
-
-        assertThat((Collection) objectArgumentCaptor.getValue()).containsSequence(queuedCommand1, queuedCommand2,
-                bufferedCommand1, bufferedCommand2);
-    }
-
-    @Test
-    public void testChannelActiveReplayBufferedCommands() throws Exception {
-
-        Command<String, String, String> bufferedCommand1 = new Command<>(CommandType.SET,
-                new StatusOutput<String, String>(new Utf8StringCodec()), null);
-
-        Command<String, String, String> bufferedCommand2 = new Command<>(CommandType.GET,
-                new StatusOutput<String, String>(new Utf8StringCodec()), null);
-
-        Command<String, String, String> queuedCommand1 = new Command<>(CommandType.PING,
-                new StatusOutput<String, String>(new Utf8StringCodec()), null);
-
-        Command<String, String, String> queuedCommand2 = new Command<>(CommandType.AUTH,
-                new StatusOutput<String, String>(new Utf8StringCodec()), null);
-
-        q.add(queuedCommand1);
-        q.add(queuedCommand2);
-
-        Collection buffer = (Collection) ReflectionTestUtils.getField(sut, "commandBuffer");
-        buffer.add(bufferedCommand1);
-        buffer.add(bufferedCommand2);
-
-        sut.channelRegistered(context);
-        sut.channelActive(context);
-
-        assertThat(q).containsSequence(queuedCommand1, queuedCommand2, bufferedCommand1, bufferedCommand2);
-        assertThat(buffer).isEmpty();
     }
 
     @Test
@@ -289,37 +157,6 @@ public void testIOExceptionChannelActive() throws Exception {
         sut.exceptionCaught(context, new IOException("Connection timed out"));
     }
 
-    @Test
-    public void testWriteChannelDisconnected() throws Exception {
-
-        when(channel.isActive()).thenReturn(true);
-        sut.channelRegistered(context);
-        sut.channelActive(context);
-
-        sut.setState(CommandHandler.LifecycleState.DISCONNECTED);
-
-        sut.write(command);
-
-        Collection buffer = (Collection) ReflectionTestUtils.getField(sut, "commandBuffer");
-        assertThat(buffer).containsOnly(command);
-    }
-
-    @Test(expected = RedisException.class)
-    public void testWriteChannelDisconnectedWithoutReconnect() throws Exception {
-
-        sut = new CommandHandler<String, String>(ClientOptions.builder().autoReconnect(false).build(), clientResources,
-                q);
-        sut.setRedisChannelHandler(channelHandler);
-
-        when(channel.isActive()).thenReturn(true);
-        sut.channelRegistered(context);
-        sut.channelActive(context);
-
-        sut.setState(CommandHandler.LifecycleState.DISCONNECTED);
-
-        sut.write(command);
-    }
-
     @Test
     public void testExceptionChannelInactive() throws Exception {
         sut.setState(CommandHandler.LifecycleState.DISCONNECTED);
@@ -344,14 +181,6 @@ public void testExceptionWithQueue() throws Exception {
         assertThat(ReflectionTestUtils.getField(command, "exception")).isNotNull();
     }
 
-    @Test(expected = RedisException.class)
-    public void testWriteWhenClosed() throws Exception {
-
-        sut.setState(CommandHandler.LifecycleState.CLOSED);
-
-        sut.write(command);
-    }
-
     @Test
     public void testExceptionWhenClosed() throws Exception {
 
@@ -540,235 +369,4 @@ public void shouldSetLatency() throws Exception {
         assertThat(command.firstResponseNs).isEqualTo(-1);
     }
 
-    @Test
-    public void testMTCConcurrentWriteThenReset() throws Throwable {
-        TestFramework.runOnce(new MTCConcurrentWriteThenReset(clientResources, q, command));
-    }
-
-    @Test
-    public void testMTCConcurrentResetThenWrite() throws Throwable {
-        TestFramework.runOnce(new MTCConcurrentResetThenWrite(clientResources, q, command));
-    }
-
-    @Test
-    public void testMTCConcurrentConcurrentWrite() throws Throwable {
-        TestFramework.runOnce(new MTCConcurrentConcurrentWrite(clientResources, q, command));
-    }
-
-    /**
-     * Test of concurrent access to locks. write call wins over reset call.
-     */
-    static class MTCConcurrentWriteThenReset extends MultithreadedTestCase {
-
-        private final Command<String, String, String> command;
-        private TestableCommandHandler handler;
-        private List<Thread> expectedThreadOrder = Collections.synchronizedList(new ArrayList<>());
-        private List<Thread> entryThreadOrder = Collections.synchronizedList(new ArrayList<>());
-        private List<Thread> exitThreadOrder = Collections.synchronizedList(new ArrayList<>());
-
-        public MTCConcurrentWriteThenReset(ClientResources clientResources,
-                                           Queue<RedisCommand<String, String, ?>> queue,
-                                           Command<String, String, String> command) {
-            this.command = command;
-            handler = new TestableCommandHandler(ClientOptions.create(), clientResources, queue) {
-
-                @Override
-                protected void incrementWriters() {
-
-                    waitForTick(2);
-                    super.incrementWriters();
-                    waitForTick(4);
-                }
-
-                @Override
-                protected void lockWritersExclusive() {
-
-                    waitForTick(4);
-                    super.lockWritersExclusive();
-                }
-
-                @Override
-                protected <C extends RedisCommand<String, String, T>, T> void writeToBuffer(C command) {
-
-                    entryThreadOrder.add(Thread.currentThread());
-                    super.writeToBuffer(command);
-                }
-
-                @Override
-                protected List<RedisCommand<String, String, ?>> prepareReset() {
-
-                    entryThreadOrder.add(Thread.currentThread());
-                    return super.prepareReset();
-                }
-
-                @Override
-                protected void unlockWritersExclusive() {
-
-                    exitThreadOrder.add(Thread.currentThread());
-                    super.unlockWritersExclusive();
-                }
-
-                @Override
-                protected void decrementWriters() {
-
-                    exitThreadOrder.add(Thread.currentThread());
-                    super.decrementWriters();
-                }
-            };
-        }
-
-        public void thread1() throws InterruptedException {
-
-            waitForTick(1);
-            expectedThreadOrder.add(Thread.currentThread());
-            handler.write(command);
-
-        }
-
-        public void thread2() throws InterruptedException {
-
-            waitForTick(3);
-            expectedThreadOrder.add(Thread.currentThread());
-            handler.reset();
-        }
-
-        @Override
-        public void finish() {
-
-            assertThat(entryThreadOrder).containsExactlyElementsOf(expectedThreadOrder);
-            assertThat(exitThreadOrder).containsExactlyElementsOf(expectedThreadOrder);
-        }
-    }
-
-    /**
-     * Test of concurrent access to locks. write call wins over flush call.
-     */
-    static class MTCConcurrentResetThenWrite extends MultithreadedTestCase {
-
-        private final Command<String, String, String> command;
-        private TestableCommandHandler handler;
-        private List<Thread> expectedThreadOrder = Collections.synchronizedList(new ArrayList<>());
-        private List<Thread> entryThreadOrder = Collections.synchronizedList(new ArrayList<>());
-        private List<Thread> exitThreadOrder = Collections.synchronizedList(new ArrayList<>());
-
-        public MTCConcurrentResetThenWrite(ClientResources clientResources,
-                                           Queue<RedisCommand<String, String, ?>> queue,
-                                           Command<String, String, String> command) {
-            this.command = command;
-            handler = new TestableCommandHandler(ClientOptions.create(), clientResources, queue) {
-
-                @Override
-                protected void incrementWriters() {
-
-                    waitForTick(4);
-                    super.incrementWriters();
-                }
-
-                @Override
-                protected void lockWritersExclusive() {
-
-                    waitForTick(2);
-                    super.lockWritersExclusive();
-                    waitForTick(4);
-                }
-
-                @Override
-                protected <C extends RedisCommand<String, String, T>, T> void writeToBuffer(C command) {
-
-                    entryThreadOrder.add(Thread.currentThread());
-                    super.writeToBuffer(command);
-                }
-
-                @Override
-                protected List<RedisCommand<String, String, ?>> prepareReset() {
-
-                    entryThreadOrder.add(Thread.currentThread());
-                    return super.prepareReset();
-                }
-
-                @Override
-                protected void unlockWritersExclusive() {
-
-                    exitThreadOrder.add(Thread.currentThread());
-                    super.unlockWritersExclusive();
-                }
-
-                @Override
-                protected void decrementWriters() {
-
-                    exitThreadOrder.add(Thread.currentThread());
-                    super.decrementWriters();
-                }
-            };
-        }
-
-        public void thread1() throws InterruptedException {
-
-            waitForTick(1);
-            expectedThreadOrder.add(Thread.currentThread());
-            handler.reset();
-        }
-
-        public void thread2() throws InterruptedException {
-
-            waitForTick(3);
-            expectedThreadOrder.add(Thread.currentThread());
-            handler.write(command);
-        }
-
-        @Override
-        public void finish() {
-
-            assertThat(entryThreadOrder).containsExactlyElementsOf(expectedThreadOrder);
-            assertThat(exitThreadOrder).containsExactlyElementsOf(expectedThreadOrder);
-        }
-    }
-
-    /**
-     * Test of concurrent access to locks. Two concurrent writes.
-     */
-    static class MTCConcurrentConcurrentWrite extends MultithreadedTestCase {
-
-        private final Command<String, String, String> command;
-        private TestableCommandHandler handler;
-
-        public MTCConcurrentConcurrentWrite(ClientResources clientResources,
-                                            Queue<RedisCommand<String, String, ?>> queue,
-                                            Command<String, String, String> command) {
-            this.command = command;
-            handler = new TestableCommandHandler(ClientOptions.create(), clientResources, queue) {
-
-                @Override
-                protected <C extends RedisCommand<String, String, T>, T> void writeToBuffer(C command) {
-
-                    waitForTick(2);
-                    assertThat(writers.get()).isEqualTo(2);
-                    waitForTick(3);
-                    super.writeToBuffer(command);
-                }
-
-            };
-        }
-
-        public void thread1() throws InterruptedException {
-
-            waitForTick(1);
-            handler.write(command);
-        }
-
-        public void thread2() throws InterruptedException {
-
-            waitForTick(1);
-            handler.write(command);
-        }
-
-    }
-
-    static class TestableCommandHandler extends CommandHandler<String, String> {
-        public TestableCommandHandler(ClientOptions clientOptions, ClientResources clientResources,
-                                      Queue<RedisCommand<String, String, ?>> queue) {
-            super(clientOptions, clientResources, queue);
-        }
-    }
-
 }
diff --git a/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java b/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java
index db3266d137..f41c63fc2b 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java
+++ b/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.lambdaworks.Connections;
+import com.lambdaworks.ConnectionTestUtil;
 import com.lambdaworks.Wait;
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
@@ -69,7 +69,7 @@ public void pingBeforeConnectFailOnReconnect() throws Exception {
 
         try {
             RedisAsyncCommands<String, String> connection = client.connect(redisUri).async();
-            ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection.getStatefulConnection());
+            ConnectionWatchdog connectionWatchdog = ConnectionTestUtil.getConnectionWatchdog(connection.getStatefulConnection());
 
             assertThat(connectionWatchdog.isListenOnChannelInactive()).isTrue();
             assertThat(connectionWatchdog.isReconnectSuspended()).isFalse();
@@ -118,12 +118,12 @@ public void pingBeforeConnectFailOnReconnectShouldSendEvents() throws Exception
             final BlockingQueue<ConnectionEvents.Reconnect> events = new LinkedBlockingDeque<>();
 
             RedisAsyncCommands<String, String> connection = client.connect(redisUri).async();
-            ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection.getStatefulConnection());
+            ConnectionWatchdog connectionWatchdog = ConnectionTestUtil.getConnectionWatchdog(connection.getStatefulConnection());
 
             ReconnectionListener reconnectionListener = new ReconnectionListener() {
                 @Override
                 public void onReconnect(ConnectionEvents.Reconnect reconnect) {
-                    events.add(reconnect);
+                    events.offer(reconnect);
                 }
             };
 
@@ -167,7 +167,7 @@ public void cancelCommandsOnReconnectFailure() throws Exception {
         try {
             RedisAsyncCommandsImpl<String, String> connection = (RedisAsyncCommandsImpl<String, String>) client
                     .connect(redisUri).async();
-            ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection.getStatefulConnection());
+            ConnectionWatchdog connectionWatchdog = ConnectionTestUtil.getConnectionWatchdog(connection.getStatefulConnection());
 
             assertThat(connectionWatchdog.isListenOnChannelInactive()).isTrue();
 
@@ -185,7 +185,7 @@ public void cancelCommandsOnReconnectFailure() throws Exception {
 
             assertThat(connection.getStatefulConnection().isOpen()).isFalse();
             connectionWatchdog.setReconnectSuspended(false);
-            connectionWatchdog.run(null);
+            connectionWatchdog.run(0);
             Thread.sleep(500);
             assertThat(connection.getStatefulConnection().isOpen()).isFalse();
 
@@ -224,13 +224,12 @@ public void closingDisconnectedConnectionShouldDisableConnectionWatchdog() throw
 
         client.setOptions(ClientOptions.create());
 
-
         RedisURI redisUri = RedisURI.Builder.redis(TestSettings.host(), TestSettings.port())
                 .withTimeout(10, TimeUnit.MINUTES).build();
 
         StatefulRedisConnection<String, String> connection = client.connect(redisUri);
 
-        ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection);
+        ConnectionWatchdog connectionWatchdog = ConnectionTestUtil.getConnectionWatchdog(connection);
 
         assertThat(connectionWatchdog.isReconnectSuspended()).isFalse();
         assertThat(connectionWatchdog.isListenOnChannelInactive()).isTrue();
diff --git a/src/test/java/com/lambdaworks/redis/protocol/DefaultEndpointTest.java b/src/test/java/com/lambdaworks/redis/protocol/DefaultEndpointTest.java
new file mode 100644
index 0000000000..44ab5f8702
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/protocol/DefaultEndpointTest.java
@@ -0,0 +1,338 @@
+package com.lambdaworks.redis.protocol;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.anyObject;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.Queue;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.lambdaworks.redis.ClientOptions;
+import com.lambdaworks.redis.RedisException;
+import com.lambdaworks.redis.codec.Utf8StringCodec;
+import com.lambdaworks.redis.internal.LettuceFactories;
+import com.lambdaworks.redis.output.StatusOutput;
+import com.lambdaworks.redis.resource.ClientResources;
+
+import edu.umd.cs.mtc.MultithreadedTestCase;
+import edu.umd.cs.mtc.TestFramework;
+import io.netty.channel.Channel;
+import io.netty.channel.DefaultChannelPromise;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DefaultEndpointTest {
+
+    private Queue<RedisCommand<String, String, ?>> q = LettuceFactories.newConcurrentQueue();
+
+    private DefaultEndpoint sut;
+
+    private final Command<String, String, String> command = new Command<>(CommandType.APPEND,
+            new StatusOutput<String, String>(new Utf8StringCodec()), null);
+
+    @Mock
+    private Channel channel;
+
+    @Mock
+    private ConnectionFacade connectionFacade;
+
+    @Mock
+    private ClientResources clientResources;
+
+    @Mock
+    private ConnectionWatchdog connectionWatchdog;
+
+    @BeforeClass
+    public static void beforeClass() {
+        LoggerContext ctx = (LoggerContext) LogManager.getContext();
+        Configuration config = ctx.getConfiguration();
+        LoggerConfig loggerConfig = config.getLoggerConfig(CommandHandler.class.getName());
+        loggerConfig.setLevel(Level.ALL);
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        LoggerContext ctx = (LoggerContext) LogManager.getContext();
+        Configuration config = ctx.getConfiguration();
+        LoggerConfig loggerConfig = config.getLoggerConfig(CommandHandler.class.getName());
+        loggerConfig.setLevel(null);
+    }
+
+    @Before
+    public void before() throws Exception {
+
+        when(channel.write(any())).thenAnswer(invocation -> {
+
+            if (invocation.getArguments()[0] instanceof RedisCommand) {
+                q.add((RedisCommand) invocation.getArguments()[0]);
+            }
+
+            if (invocation.getArguments()[0] instanceof Collection) {
+                q.addAll((Collection) invocation.getArguments()[0]);
+            }
+
+            return new DefaultChannelPromise(channel);
+        });
+
+        when(channel.writeAndFlush(any())).thenAnswer(invocation -> {
+            if (invocation.getArguments()[0] instanceof RedisCommand) {
+                q.add((RedisCommand) invocation.getArguments()[0]);
+            }
+
+            if (invocation.getArguments()[0] instanceof Collection) {
+                q.addAll((Collection) invocation.getArguments()[0]);
+            }
+            return new DefaultChannelPromise(channel);
+        });
+
+        sut = new DefaultEndpoint(ClientOptions.create());
+        sut.setConnectionFacade(connectionFacade);
+    }
+
+    @Test
+    public void writeConnectedShouldWriteCommandToChannel() throws Exception {
+
+        when(channel.isActive()).thenReturn(true);
+        when(channel.isWritable()).thenReturn(true);
+
+        sut.notifyChannelActive(channel);
+        sut.write(command);
+
+        assertThat(sut.getQueue()).isEmpty();
+        verify(channel).writeAndFlush(command);
+    }
+
+    @Test
+    public void writeDisconnectedShouldBufferCommands() throws Exception {
+
+        when(channel.isActive()).thenReturn(true);
+        when(channel.isWritable()).thenReturn(true);
+
+        sut.write(command);
+
+        assertThat(sut.getQueue()).contains(command);
+
+        verify(channel, never()).writeAndFlush(anyObject(), any());
+    }
+
+    @Test
+    public void notifyChannelActiveActivatesFacade() throws Exception {
+
+        sut.notifyChannelActive(channel);
+
+        verify(connectionFacade).activated();
+    }
+
+    @Test
+    public void notifyChannelActiveArmsConnectionWatchdog() throws Exception {
+
+        sut.registerConnectionWatchdog(Optional.of(connectionWatchdog));
+
+        sut.notifyChannelActive(channel);
+
+        verify(connectionWatchdog).arm();
+    }
+
+    @Test
+    public void notifyChannelInactiveDeactivatesFacade() throws Exception {
+
+        sut.notifyChannelInactive(channel);
+
+        verify(connectionFacade).deactivated();
+    }
+
+    @Test
+    public void notifyExceptionShouldStoreException() throws Exception {
+
+        sut.notifyException(new IllegalStateException());
+        sut.write(command);
+
+        assertThat(command.exception).isInstanceOf(IllegalStateException.class);
+    }
+
+    @Test
+    public void notifyChannelActiveClearsStoredException() throws Exception {
+
+        sut.notifyException(new IllegalStateException());
+        sut.notifyChannelActive(channel);
+        sut.write(command);
+
+        assertThat(command.exception).isNull();
+    }
+
+    @Test
+    public void notifyDrainQueuedCommandsShouldBufferCommands() throws Exception {
+
+        Queue<RedisCommand<?, ?, ?>> q = LettuceFactories.newConcurrentQueue();
+        q.add(command);
+
+        sut.notifyDrainQueuedCommands(() -> q);
+
+        assertThat(q).isEmpty();
+        assertThat(sut.getQueue()).contains(command);
+    }
+
+    @Test
+    public void notifyDrainQueuedCommandsShouldWriteCommands() throws Exception {
+
+        when(channel.isActive()).thenReturn(true);
+        when(channel.isWritable()).thenReturn(true);
+
+        Queue<RedisCommand<?, ?, ?>> q = LettuceFactories.newConcurrentQueue();
+        q.add(command);
+
+        sut.notifyChannelActive(channel);
+        sut.notifyDrainQueuedCommands(() -> q);
+
+        assertThat(q).isEmpty();
+        verify(channel).writeAndFlush(eq(Arrays.asList(command)));
+    }
+
+    @Test
+    public void writeShouldRejectCommandsInDisconnectedState() throws Exception {
+
+        sut = new DefaultEndpoint(ClientOptions.builder() //
+                .disconnectedBehavior(ClientOptions.DisconnectedBehavior.REJECT_COMMANDS) //
+                .build());
+
+        try {
+            sut.write(command);
+            fail("Missing RedisException");
+        } catch (RedisException e) {
+            assertThat(e).hasMessageContaining("Commands are rejected");
+        }
+    }
+
+    @Test
+    public void writeShouldRejectCommandsInClosedState() throws Exception {
+
+        sut.close();
+
+        try {
+            sut.write(command);
+            fail("Missing RedisException");
+        } catch (RedisException e) {
+            assertThat(e).hasMessageContaining("Connection is closed");
+        }
+    }
+
+    @Test
+    public void writeWithoutAutoReconnectShouldRejectCommandsInDisconnectedState() throws Exception {
+
+        sut = new DefaultEndpoint(ClientOptions.builder() //
+                .autoReconnect(false) //
+                .disconnectedBehavior(ClientOptions.DisconnectedBehavior.DEFAULT) //
+                .build());
+
+        try {
+            sut.write(command);
+            fail("Missing RedisException");
+        } catch (RedisException e) {
+            assertThat(e).hasMessageContaining("Commands are rejected");
+        }
+    }
+
+    @Test
+    public void closeCleansUpResources() throws Exception {
+
+        sut.notifyChannelActive(channel);
+        sut.registerConnectionWatchdog(Optional.of(connectionWatchdog));
+
+        sut.close();
+
+        verify(channel).close();
+        verify(connectionWatchdog).prepareClose();
+    }
+
+    @Test
+    public void closeAllowsOnlyOneCall() throws Exception {
+
+        sut.notifyChannelActive(channel);
+        sut.registerConnectionWatchdog(Optional.of(connectionWatchdog));
+
+        sut.close();
+        sut.close();
+
+        verify(channel).close();
+        verify(connectionWatchdog).prepareClose();
+    }
+
+    @Test
+    public void testMTCConcurrentConcurrentWrite() throws Throwable {
+        TestFramework.runOnce(new MTCConcurrentConcurrentWrite(command));
+    }
+
+    /**
+     * Test of concurrent access to locks. Two concurrent writes.
+     */
+    static class MTCConcurrentConcurrentWrite extends MultithreadedTestCase {
+
+        private final Command<String, String, String> command;
+        private TestableEndpoint handler;
+
+        public MTCConcurrentConcurrentWrite(Command<String, String, String> command) {
+
+            this.command = command;
+
+            handler = new TestableEndpoint(ClientOptions.create()) {
+
+                @Override
+                protected void bufferCommand(RedisCommand<?, ?, ?> command) {
+
+                    waitForTick(2);
+
+                    Object sharedLock = ReflectionTestUtils.getField(this, "sharedLock");
+                    AtomicLong writers = (AtomicLong) ReflectionTestUtils.getField(sharedLock, "writers");
+                    assertThat(writers.get()).isEqualTo(2);
+                    waitForTick(3);
+                    super.bufferCommand(command);
+                }
+            };
+        }
+
+        public void thread1() throws InterruptedException {
+
+            waitForTick(1);
+            handler.write(command);
+        }
+
+        public void thread2() throws InterruptedException {
+
+            waitForTick(1);
+            handler.write(command);
+        }
+    }
+
+    static class TestableEndpoint extends DefaultEndpoint {
+
+        /**
+         * Create a new {@link DefaultEndpoint}.
+         *
+         * @param clientOptions client options for this connection, must not be {@literal null}
+         */
+        public TestableEndpoint(ClientOptions clientOptions) {
+            super(clientOptions);
+        }
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/protocol/StateMachineTest.java b/src/test/java/com/lambdaworks/redis/protocol/StateMachineTest.java
index 8d8e3c325c..c71fa41d48 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/StateMachineTest.java
+++ b/src/test/java/com/lambdaworks/redis/protocol/StateMachineTest.java
@@ -31,7 +31,7 @@ public class StateMachineTest {
     protected RedisCodec<String, String> codec = new Utf8StringCodec();
     protected Charset charset = Charset.forName("UTF-8");
     protected CommandOutput<String, String, String> output;
-    protected RedisStateMachine<String, String> rsm;
+    protected RedisStateMachine rsm;
 
     @BeforeClass
     public static void beforeClass() {
@@ -53,7 +53,7 @@ public static void afterClass() {
     @Before
     public final void createStateMachine() throws Exception {
         output = new StatusOutput<String, String>(codec);
-        rsm = new RedisStateMachine<String, String>();
+        rsm = new RedisStateMachine();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java b/src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java
index 4c5808da73..dcb95c560e 100644
--- a/src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java
+++ b/src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java
@@ -10,7 +10,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.Connections;
+import com.lambdaworks.ConnectionTestUtil;
 import com.lambdaworks.Wait;
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
@@ -51,7 +51,7 @@ public void connectionIsConnectedAfterConnect() throws Exception {
 
         StatefulRedisConnection<String, String> connection = client.connect();
 
-        assertThat(Connections.getConnectionState(connection));
+        assertThat(ConnectionTestUtil.getConnectionState(connection)).isEqualTo("CONNECTED");
 
         connection.close();
     }
@@ -61,7 +61,7 @@ public void reconnectIsActiveHandler() throws Exception {
 
         RedisCommands<String, String> connection = client.connect().sync();
 
-        ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection.getStatefulConnection());
+        ConnectionWatchdog connectionWatchdog = ConnectionTestUtil.getConnectionWatchdog(connection.getStatefulConnection());
         assertThat(connectionWatchdog).isNotNull();
         assertThat(connectionWatchdog.isListenOnChannelInactive()).isTrue();
         assertThat(connectionWatchdog.isReconnectSuspended()).isFalse();
@@ -87,8 +87,8 @@ public void noBufferedCommandsAfterExecute() throws Exception {
 
         connection.set(key, "1");
 
-        assertThat(Connections.getQueue(connection.getStatefulConnection())).isEmpty();
-        assertThat(Connections.getCommandBuffer(connection.getStatefulConnection())).isEmpty();
+        assertThat(ConnectionTestUtil.getQueue(connection.getStatefulConnection())).isEmpty();
+        assertThat(ConnectionTestUtil.getCommandBuffer(connection.getStatefulConnection())).isEmpty();
 
         connection.getStatefulConnection().close();
     }
@@ -114,17 +114,16 @@ public void commandIsExecutedOnce() throws Exception {
     @Test
     public void commandFailsWhenFailOnEncode() throws Exception {
 
-        StatefulRedisConnection<String, String> connection = client.connect();
-        RedisCommands<String, String> sync = connection.sync();
-        RedisChannelWriter<String, String> channelWriter = Connections.getChannelWriter(connection);
+        RedisCommands<String, String> connection = client.connect().sync();
+        RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection.getStatefulConnection());
         RedisCommands<String, String> verificationConnection = client.connect().sync();
 
-        sync.set(key, "1");
+        connection.set(key, "1");
         AsyncCommand<String, String, String> working = new AsyncCommand<>(
                 new Command<>(CommandType.INCR, new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key)));
         channelWriter.write(working);
         assertThat(working.await(2, TimeUnit.SECONDS)).isTrue();
-        assertThat(sync.get(key)).isEqualTo("2");
+        assertThat(connection.get(key)).isEqualTo("2");
 
         AsyncCommand<String, String, Object> command = new AsyncCommand(
                 new Command<>(CommandType.INCR, new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key))) {
@@ -143,9 +142,9 @@ public void encode(ByteBuf buf) {
 
         assertThat(verificationConnection.get(key)).isEqualTo("2");
 
-        assertThat(Connections.getQueue(connection)).isNotEmpty();
+        assertThat(ConnectionTestUtil.getQueue(connection.getStatefulConnection())).isNotEmpty();
 
-        sync.getStatefulConnection().close();
+        connection.getStatefulConnection().close();
     }
 
     @Test
@@ -155,7 +154,7 @@ public void commandNotFailedChannelClosesWhileFlush() throws Exception {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> verificationConnection = client.connect().sync();
-        RedisChannelWriter<String, String> channelWriter = Connections.getChannelWriter(connection);
+        RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection);
 
         RedisCommands<String, String> sync = connection.sync();
         sync.set(key, "1");
@@ -163,7 +162,7 @@ public void commandNotFailedChannelClosesWhileFlush() throws Exception {
 
         final CountDownLatch block = new CountDownLatch(1);
 
-        ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection);
+        ConnectionWatchdog connectionWatchdog = ConnectionTestUtil.getConnectionWatchdog(connection);
 
         AsyncCommand<String, String, Object> command = getBlockOnEncodeCommand(block);
 
@@ -171,7 +170,7 @@ public void commandNotFailedChannelClosesWhileFlush() throws Exception {
 
         connectionWatchdog.setReconnectSuspended(true);
 
-        Channel channel = Connections.getChannel(connection);
+        Channel channel = ConnectionTestUtil.getChannel(connection);
         channel.unsafe().disconnect(channel.newPromise());
 
         assertThat(channel.isOpen()).isFalse();
@@ -184,8 +183,8 @@ public void commandNotFailedChannelClosesWhileFlush() throws Exception {
 
         assertThat(verificationConnection.get(key)).isEqualTo("1");
 
-        assertThat(Connections.getQueue(connection)).isEmpty();
-        assertThat(Connections.getCommandBuffer(connection)).isNotEmpty().contains(command);
+        assertThat(ConnectionTestUtil.getQueue(connection)).isEmpty();
+        assertThat(ConnectionTestUtil.getCommandBuffer(connection)).isNotEmpty().contains(command);
 
         connection.close();
     }
@@ -198,14 +197,14 @@ public void commandRetriedChannelClosesWhileFlush() throws Exception {
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> sync = connection.sync();
         RedisCommands<String, String> verificationConnection = client.connect().sync();
-        RedisChannelWriter<String, String> channelWriter = Connections.getChannelWriter(connection);
+        RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection);
 
         sync.set(key, "1");
         assertThat(verificationConnection.get(key)).isEqualTo("1");
 
         final CountDownLatch block = new CountDownLatch(1);
 
-        ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(sync.getStatefulConnection());
+        ConnectionWatchdog connectionWatchdog = ConnectionTestUtil.getConnectionWatchdog(sync.getStatefulConnection());
 
         AsyncCommand<String, String, Object> command = getBlockOnEncodeCommand(block);
 
@@ -213,7 +212,7 @@ public void commandRetriedChannelClosesWhileFlush() throws Exception {
 
         connectionWatchdog.setReconnectSuspended(true);
 
-        Channel channel = Connections.getChannel(sync.getStatefulConnection());
+        Channel channel = ConnectionTestUtil.getChannel(sync.getStatefulConnection());
         channel.unsafe().disconnect(channel.newPromise());
 
         assertThat(channel.isOpen()).isFalse();
@@ -231,8 +230,8 @@ public void commandRetriedChannelClosesWhileFlush() throws Exception {
 
         assertThat(verificationConnection.get(key)).isEqualTo("2");
 
-        assertThat(Connections.getQueue(sync.getStatefulConnection())).isEmpty();
-        assertThat(Connections.getCommandBuffer(sync.getStatefulConnection())).isEmpty();
+        assertThat(ConnectionTestUtil.getQueue(sync.getStatefulConnection())).isEmpty();
+        assertThat(ConnectionTestUtil.getCommandBuffer(sync.getStatefulConnection())).isEmpty();
 
         sync.getStatefulConnection().close();
         verificationConnection.getStatefulConnection().close();
@@ -256,12 +255,11 @@ public void encode(ByteBuf buf) {
     @Test
     public void commandFailsDuringDecode() throws Exception {
 
-        StatefulRedisConnection<String, String> connection = client.connect();
-        RedisCommands<String, String> sync = connection.sync();
-        RedisChannelWriter<String, String> channelWriter = Connections.getChannelWriter(connection);
+        RedisCommands<String, String> connection = client.connect().sync();
+        RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection.getStatefulConnection());
         RedisCommands<String, String> verificationConnection = client.connect().sync();
 
-        sync.set(key, "1");
+        connection.set(key, "1");
 
         AsyncCommand<String, String, String> command = new AsyncCommand(
                 new Command<>(CommandType.INCR, new StatusOutput<>(CODEC), new CommandArgs<>(CODEC).addKey(key)));
@@ -274,9 +272,9 @@ public void commandFailsDuringDecode() throws Exception {
         assertThat(getException(command)).isInstanceOf(IllegalStateException.class);
 
         assertThat(verificationConnection.get(key)).isEqualTo("2");
-        assertThat(sync.get(key)).isEqualTo("2");
+        assertThat(connection.get(key)).isEqualTo("2");
 
-        sync.getStatefulConnection().close();
+        connection.getStatefulConnection().close();
         verificationConnection.getStatefulConnection().close();
     }
 
@@ -289,7 +287,7 @@ public void commandCancelledOverSyncAPIAfterConnectionIsDisconnected() throws Ex
 
         sync.set(key, "1");
 
-        ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(sync.getStatefulConnection());
+        ConnectionWatchdog connectionWatchdog = ConnectionTestUtil.getConnectionWatchdog(sync.getStatefulConnection());
         connectionWatchdog.setListenOnChannelInactive(false);
 
         sync.quit();
@@ -303,13 +301,13 @@ public void commandCancelledOverSyncAPIAfterConnectionIsDisconnected() throws Ex
 
         assertThat(verificationConnection.get("key")).isEqualTo("1");
 
-        assertThat(Connections.getQueue(connection)).isEmpty();
-        assertThat(Connections.getCommandBuffer(connection).size()).isGreaterThan(0);
+        assertThat(ConnectionTestUtil.getQueue(connection)).isEmpty();
+        assertThat(ConnectionTestUtil.getCommandBuffer(connection).size()).isGreaterThan(0);
 
         connectionWatchdog.setListenOnChannelInactive(true);
         connectionWatchdog.scheduleReconnect();
 
-        while (!Connections.getCommandBuffer(connection).isEmpty() || !Connections.getQueue(connection).isEmpty()) {
+        while (!ConnectionTestUtil.getCommandBuffer(connection).isEmpty() || !ConnectionTestUtil.getQueue(connection).isEmpty()) {
             Thread.sleep(10);
         }
 
@@ -327,7 +325,7 @@ public void retryAfterConnectionIsDisconnected() throws Exception {
 
         connection.sync().set(key, "1");
 
-        ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection);
+        ConnectionWatchdog connectionWatchdog = ConnectionTestUtil.getConnectionWatchdog(connection);
         connectionWatchdog.setListenOnChannelInactive(false);
 
         connection.async().quit();
@@ -339,13 +337,13 @@ public void retryAfterConnectionIsDisconnected() throws Exception {
 
         assertThat(verificationConnection.get("key")).isEqualTo("1");
 
-        assertThat(Connections.getQueue(connection)).isEmpty();
-        assertThat(Connections.getCommandBuffer(connection).size()).isGreaterThan(0);
+        assertThat(ConnectionTestUtil.getQueue(connection)).isEmpty();
+        assertThat(ConnectionTestUtil.getCommandBuffer(connection).size()).isGreaterThan(0);
 
         connectionWatchdog.setListenOnChannelInactive(true);
         connectionWatchdog.scheduleReconnect();
 
-        while (!Connections.getCommandBuffer(connection).isEmpty() || !Connections.getQueue(connection).isEmpty()) {
+        while (!ConnectionTestUtil.getCommandBuffer(connection).isEmpty() || !ConnectionTestUtil.getQueue(connection).isEmpty()) {
             Thread.sleep(10);
         }
 
diff --git a/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java b/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java
index 072b3c787c..6561e72ec5 100644
--- a/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java
+++ b/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java
@@ -1,8 +1,8 @@
 package com.lambdaworks.redis.reliability;
 
 import static com.google.code.tempusfugit.temporal.Duration.millis;
-import static com.lambdaworks.Connections.getCommandBuffer;
-import static com.lambdaworks.Connections.getQueue;
+import static com.lambdaworks.ConnectionTestUtil.getCommandBuffer;
+import static com.lambdaworks.ConnectionTestUtil.getQueue;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
 
@@ -10,15 +10,14 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import com.google.code.tempusfugit.temporal.Duration;
 import com.lambdaworks.Delay;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.Connections;
+import com.lambdaworks.ConnectionTestUtil;
 import com.lambdaworks.Wait;
 import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.codec.Utf8StringCodec;
 import com.lambdaworks.redis.output.IntegerOutput;
@@ -57,7 +56,7 @@ public void connectionIsConnectedAfterConnect() throws Exception {
 
         StatefulRedisConnection<String, String> connection = client.connect();
 
-        assertThat(Connections.getConnectionState(connection));
+        assertThat(ConnectionTestUtil.getConnectionState(connection));
 
         connection.close();
     }
@@ -65,12 +64,11 @@ public void connectionIsConnectedAfterConnect() throws Exception {
     @Test
     public void noReconnectHandler() throws Exception {
 
-        RedisCommands<String, String> connection = client.connect().sync();
+        StatefulRedisConnection<String, String> connection = client.connect();
 
-        ConnectionWatchdog connectionWatchdog = Connections.getConnectionWatchdog(connection.getStatefulConnection());
-        assertThat(connectionWatchdog).isNull();
+        assertThat(ConnectionTestUtil.getConnectionWatchdog(connection)).isNull();
 
-        connection.getStatefulConnection().close();
+        connection.close();
     }
 
     @Test
@@ -121,8 +119,8 @@ public void commandIsExecutedOnce() throws Exception {
     public void commandNotExecutedFailsOnEncode() throws Exception {
 
         StatefulRedisConnection<String, String> connection = client.connect();
-        RedisCommands<String, String> sync = connection.sync();
-        RedisChannelWriter<String, String> channelWriter = Connections.getChannelWriter(connection);
+        RedisCommands<String, String> sync = client.connect().sync();
+        RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection);
 
         sync.set(key, "1");
         AsyncCommand<String, String, String> working = new AsyncCommand<>(new Command<String, String, String>(CommandType.INCR,
@@ -146,13 +144,13 @@ public void encode(ByteBuf buf) {
         assertThat(command.await(2, TimeUnit.SECONDS)).isTrue();
         assertThat(command.isCancelled()).isFalse();
         assertThat(getException(command)).isInstanceOf(EncoderException.class);
-        assertThat(getQueue(connection)).isNotEmpty();
-        getQueue(connection).clear();
+        assertThat(ConnectionTestUtil.getQueue(connection)).isNotEmpty();
+        ConnectionTestUtil.getQueue(connection).clear();
 
         assertThat(sync.get(key)).isEqualTo("2");
 
-        assertThat(getQueue(connection)).isEmpty();
-        assertThat(getCommandBuffer(connection)).isEmpty();
+        assertThat(ConnectionTestUtil.getQueue(connection)).isEmpty();
+        assertThat(ConnectionTestUtil.getCommandBuffer(connection)).isEmpty();
 
         connection.close();
     }
@@ -165,15 +163,15 @@ public void commandNotExecutedChannelClosesWhileFlush() throws Exception {
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> sync = connection.sync();
         RedisCommands<String, String> verificationConnection = client.connect().sync();
-        RedisChannelWriter<String, String> channelWriter = Connections.getChannelWriter(connection);
+        RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection);
 
         sync.set(key, "1");
         assertThat(verificationConnection.get(key)).isEqualTo("1");
 
         final CountDownLatch block = new CountDownLatch(1);
 
-        AsyncCommand<String, String, Object> command = new AsyncCommand<String, String, Object>(new Command<>(CommandType.INCR,
-                new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key))) {
+        AsyncCommand<String, String, Object> command = new AsyncCommand<String, String, Object>(
+                new Command<>(CommandType.INCR, new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key))) {
 
             @Override
             public void encode(ByteBuf buf) {
@@ -187,7 +185,7 @@ public void encode(ByteBuf buf) {
 
         channelWriter.write(command);
 
-        Channel channel = Connections.getChannel(connection);
+        Channel channel = ConnectionTestUtil.getChannel(connection);
         channel.unsafe().disconnect(channel.newPromise());
 
         assertThat(channel.isOpen()).isFalse();
@@ -211,13 +209,13 @@ public void commandFailsDuringDecode() throws Exception {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> sync = connection.sync();
-        RedisChannelWriter<String, String> channelWriter = Connections.getChannelWriter(connection);
+        RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection);
         RedisCommands<String, String> verificationConnection = client.connect().sync();
 
         sync.set(key, "1");
 
-        AsyncCommand<String, String, String> command = new AsyncCommand<>(new Command<>(CommandType.INCR, new StatusOutput<>(
-                CODEC), new CommandArgs<>(CODEC).addKey(key)));
+        AsyncCommand<String, String, String> command = new AsyncCommand<>(
+                new Command<>(CommandType.INCR, new StatusOutput<>(CODEC), new CommandArgs<>(CODEC).addKey(key)));
 
         channelWriter.write(command);
 
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisChannelWriter.java b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisChannelWriter.java
index 18b5a66aad..7cecaab844 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisChannelWriter.java
+++ b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisChannelWriter.java
@@ -1,7 +1,7 @@
 package com.lambdaworks.redis.cluster;
 
-import com.lambdaworks.redis.RedisChannelHandler;
 import com.lambdaworks.redis.RedisChannelWriter;
+import com.lambdaworks.redis.protocol.ConnectionFacade;
 import com.lambdaworks.redis.protocol.RedisCommand;
 
 /**
@@ -9,7 +9,7 @@
  */
 public class EmptyRedisChannelWriter implements RedisChannelWriter {
     @Override
-    public RedisCommand write(RedisCommand command) {
+    public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         return null;
     }
 
@@ -24,7 +24,7 @@ public void reset() {
     }
 
     @Override
-    public void setRedisChannelHandler(RedisChannelHandler redisChannelHandler) {
+    public void setConnectionFacade(ConnectionFacade connection) {
 
     }
 
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java
index dfa02c93ee..e6cc25a240 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java
+++ b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java
@@ -20,7 +20,7 @@ public EmptyRedisClusterClient(RedisURI initialUri) {
     }
 
     <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, String nodeId,
-            RedisChannelWriter<K, V> clusterWriter, final Supplier<SocketAddress> socketAddressSupplier) {
+            RedisChannelWriter clusterWriter, final Supplier<SocketAddress> socketAddressSupplier) {
         return CONNECTION;
     }
 }
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyStatefulRedisConnection.java b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyStatefulRedisConnection.java
index 2a67c5c455..fd5d860d80 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyStatefulRedisConnection.java
+++ b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyStatefulRedisConnection.java
@@ -5,6 +5,7 @@
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
 import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.protocol.ConnectionFacade;
 import com.lambdaworks.redis.protocol.RedisCommand;
 
 import java.util.concurrent.TimeUnit;
@@ -12,7 +13,7 @@
 /**
  * @author Mark Paluch
  */
-public class EmptyStatefulRedisConnection implements StatefulRedisConnection {
+public class EmptyStatefulRedisConnection implements StatefulRedisConnection, ConnectionFacade {
     @Override
     public boolean isMulti() {
         return false;
@@ -63,6 +64,16 @@ public ClientOptions getOptions() {
         return null;
     }
 
+    @Override
+    public void activated() {
+
+    }
+
+    @Override
+    public void deactivated() {
+
+    }
+
     @Override
     public void reset() {
 
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java b/src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java
index 03a489848d..82d5b6afd6 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java
@@ -1,14 +1,6 @@
 package com.lambdaworks.redis.protocol;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.channels.GatheringByteChannel;
-import java.nio.channels.ScatteringByteChannel;
-import java.nio.charset.Charset;
-
+import com.lambdaworks.redis.codec.StringCodec;
 import com.lambdaworks.redis.protocol.CommandArgs.ExperimentalByteArrayCodec;
 import org.openjdk.jmh.annotations.*;
 
@@ -17,9 +9,7 @@
 import com.lambdaworks.redis.codec.Utf8StringCodec;
 import com.lambdaworks.redis.output.ValueOutput;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.ByteBufProcessor;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Benchmark for {@link Command}. Test cases:
@@ -35,7 +25,8 @@ public class CommandBenchmark {
 
     private final static ByteArrayCodec BYTE_ARRAY_CODEC = new ByteArrayCodec();
     private final static ExperimentalByteArrayCodec BYTE_ARRAY_CODEC2 = ExperimentalByteArrayCodec.INSTANCE;
-    private final static Utf8StringCodec STRING_CODEC = new Utf8StringCodec();
+    private final static Utf8StringCodec OLD_STRING_CODEC = new Utf8StringCodec();
+    private final static StringCodec NEW_STRING_CODEC = new StringCodec(StandardCharsets.UTF_8);
     private final static EmptyByteBuf DUMMY_BYTE_BUF = new EmptyByteBuf();
 
     private final static String KEY = "key";
@@ -48,7 +39,7 @@ public void createCommandUsingByteArrayCodec() {
 
     @Benchmark
     public void createCommandUsingStringCodec() {
-        createCommand(KEY, STRING_CODEC);
+        createCommand(KEY, OLD_STRING_CODEC);
     }
 
     @Benchmark
@@ -62,8 +53,13 @@ public void encodeCommandUsingByteArrayCodec2() {
     }
 
     @Benchmark
-    public void encodeCommandUsingStringCodec() {
-        createCommand(KEY, STRING_CODEC).encode(DUMMY_BYTE_BUF);
+    public void encodeCommandUsingOldStringCodec() {
+        createCommand(KEY, OLD_STRING_CODEC).encode(DUMMY_BYTE_BUF);
+    }
+
+    @Benchmark
+    public void encodeCommandUsingNewStringCodec() {
+        createCommand(KEY, NEW_STRING_CODEC).encode(DUMMY_BYTE_BUF);
     }
 
     private <K, V, T> Command<K, V, T> createCommand(K key, RedisCodec<K, V> codec) {
@@ -71,5 +67,4 @@ private <K, V, T> Command<K, V, T> createCommand(K key, RedisCodec<K, V> codec)
         return command;
     }
 
-
 }
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/CommandHandlerBenchmark.java b/src/test/jmh/com/lambdaworks/redis/protocol/CommandHandlerBenchmark.java
index cef5462fd1..1ebad7ea84 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/CommandHandlerBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/CommandHandlerBenchmark.java
@@ -1,21 +1,17 @@
 package com.lambdaworks.redis.protocol;
 
-import java.util.ArrayDeque;
-
-import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
 
 import com.lambdaworks.redis.ClientOptions;
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.output.ValueOutput;
 
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelPromise;
-import io.netty.channel.embedded.EmbeddedChannel;
-
 /**
  * Benchmark for {@link CommandHandler}. Test cases:
  * <ul>
- * <li>user command writes</li>
  * <li>netty (in-eventloop) writes</li>
  * </ul>
  * 
@@ -28,7 +24,6 @@ public class CommandHandlerBenchmark {
     private final static ClientOptions CLIENT_OPTIONS = ClientOptions.create();
     private final static EmptyContext CHANNEL_HANDLER_CONTEXT = new EmptyContext();
     private final static byte[] KEY = "key".getBytes();
-    private final static ChannelFuture EMPTY = new EmptyFuture();
 
     private CommandHandler commandHandler;
     private Command command;
@@ -36,59 +31,18 @@ public class CommandHandlerBenchmark {
     @Setup
     public void setup() {
 
-        commandHandler = new CommandHandler(CLIENT_OPTIONS, EmptyClientResources.INSTANCE, new ArrayDeque<>(512));
+        commandHandler = new CommandHandler(EmptyClientResources.INSTANCE, new DefaultEndpoint(CLIENT_OPTIONS));
         command = new Command(CommandType.GET, new ValueOutput<>(CODEC), new CommandArgs(CODEC).addKey(KEY));
 
         commandHandler.setState(CommandHandler.LifecycleState.CONNECTED);
-
-        commandHandler.channel = new MyLocalChannel();
-    }
-
-    @TearDown(Level.Iteration)
-    public void tearDown() {
-        commandHandler.reset();
-    }
-
-    @Benchmark
-    public void measureUserWrite() {
-        commandHandler.write(command);
     }
 
     @Benchmark
     public void measureNettyWrite() throws Exception {
-        commandHandler.write(CHANNEL_HANDLER_CONTEXT, command, null);
-    }
-
-    private final static class MyLocalChannel extends EmbeddedChannel {
-        @Override
-        public boolean isActive() {
-            return true;
-        }
-
-        @Override
-        public boolean isOpen() {
-            return true;
-        }
 
-        @Override
-        public ChannelFuture write(Object msg) {
-            return EMPTY;
-        }
-
-        @Override
-        public ChannelFuture write(Object msg, ChannelPromise promise) {
-            return promise;
-        }
-
-        @Override
-        public ChannelFuture writeAndFlush(Object msg) {
-            return EMPTY;
-        }
+        commandHandler.write(CHANNEL_HANDLER_CONTEXT, command, null);
 
-        @Override
-        public ChannelFuture writeAndFlush(Object msg, ChannelPromise promise) {
-            return promise;
-        }
+        // Prevent OOME
+        commandHandler.getQueue().clear();
     }
-
 }
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java b/src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java
index 4d4d5415e6..7dd3a7d959 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java
@@ -1,16 +1,24 @@
 package com.lambdaworks.redis.protocol;
 
+import java.net.SocketAddress;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
 import com.lambdaworks.redis.event.DefaultEventPublisherOptions;
 import com.lambdaworks.redis.event.EventBus;
 import com.lambdaworks.redis.event.EventPublisherOptions;
 import com.lambdaworks.redis.metrics.CommandLatencyCollector;
+import com.lambdaworks.redis.metrics.CommandLatencyId;
+import com.lambdaworks.redis.metrics.CommandMetrics;
 import com.lambdaworks.redis.resource.ClientResources;
 import com.lambdaworks.redis.resource.Delay;
 import com.lambdaworks.redis.resource.DnsResolver;
 import com.lambdaworks.redis.resource.EventLoopGroupProvider;
-import io.netty.util.concurrent.*;
 
-import java.util.concurrent.TimeUnit;
+import io.netty.util.concurrent.EventExecutorGroup;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GlobalEventExecutor;
+import io.netty.util.concurrent.SucceededFuture;
 
 /**
  * @author Mark Paluch
@@ -18,6 +26,7 @@
 public class EmptyClientResources implements ClientResources {
 
     public static final DefaultEventPublisherOptions PUBLISHER_OPTIONS = DefaultEventPublisherOptions.disabled();
+    public static final EmptyCommandLatencyCollector LATENCY_COLLECTOR = new EmptyCommandLatencyCollector();
     public static final EmptyClientResources INSTANCE = new EmptyClientResources();
 
     @Override
@@ -62,7 +71,7 @@ public EventPublisherOptions commandLatencyPublisherOptions() {
 
     @Override
     public CommandLatencyCollector commandLatencyCollector() {
-        return null;
+        return LATENCY_COLLECTOR;
     }
 
     @Override
@@ -74,4 +83,28 @@ public DnsResolver dnsResolver() {
     public Delay reconnectDelay() {
         return null;
     }
+
+    public static class EmptyCommandLatencyCollector implements CommandLatencyCollector {
+
+        @Override
+        public void shutdown() {
+
+        }
+
+        @Override
+        public Map<CommandLatencyId, CommandMetrics> retrieveMetrics() {
+            return null;
+        }
+
+        @Override
+        public boolean isEnabled() {
+            return false;
+        }
+
+        @Override
+        public void recordCommandLatency(SocketAddress local, SocketAddress remote, ProtocolKeyword commandType,
+                long firstResponseLatency, long completionLatency) {
+
+        }
+    }
 }
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java b/src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java
index 5f405f4d8b..97e41efffa 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java
@@ -25,13 +25,12 @@ public static void main(String... args) throws IOException, RunnerException {
         // runRedisStateMachineBenchmark();
 
         // or all
-        // runBenchmarks();
+        //runBenchmarks();
     }
 
     private static void runBenchmarks() throws RunnerException {
 
         new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).build()).run();
-
     }
 
     private static void runCommandBenchmark() throws RunnerException {
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java b/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java
new file mode 100644
index 0000000000..3f6bb8286b
--- /dev/null
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java
@@ -0,0 +1,85 @@
+package com.lambdaworks.redis.protocol;
+
+import com.lambdaworks.redis.cluster.EmptyStatefulRedisConnection;
+import org.openjdk.jmh.annotations.*;
+
+import com.lambdaworks.redis.ClientOptions;
+import com.lambdaworks.redis.codec.ByteArrayCodec;
+import com.lambdaworks.redis.output.ValueOutput;
+
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.embedded.EmbeddedChannel;
+
+/**
+ * Benchmark for {@link DefaultEndpoint}. Test cases:
+ * <ul>
+ * <li>user command writes</li>
+ * </ul>
+ * 
+ * @author Mark Paluch
+ */
+@State(Scope.Benchmark)
+public class RedisEndpointBenchmark {
+
+    private final static ByteArrayCodec CODEC = new ByteArrayCodec();
+    private final static ClientOptions CLIENT_OPTIONS = ClientOptions.create();
+    private final static byte[] KEY = "key".getBytes();
+    private final static ChannelFuture EMPTY = new EmptyFuture();
+
+    private DefaultEndpoint defaultEndpoint;
+    private Command command;
+
+    @Setup
+    public void setup() {
+
+        defaultEndpoint = new DefaultEndpoint(CLIENT_OPTIONS);
+        command = new Command(CommandType.GET, new ValueOutput<>(CODEC), new CommandArgs(CODEC).addKey(KEY));
+
+        defaultEndpoint.setConnectionFacade(new EmptyStatefulRedisConnection());
+        defaultEndpoint.notifyChannelActive(new MyLocalChannel());
+    }
+
+    @TearDown(Level.Iteration)
+    public void tearDown() {
+        defaultEndpoint.reset();
+    }
+
+    @Benchmark
+    public void measureUserWrite() {
+        defaultEndpoint.write(command);
+    }
+
+    private final static class MyLocalChannel extends EmbeddedChannel {
+        @Override
+        public boolean isActive() {
+            return true;
+        }
+
+        @Override
+        public boolean isOpen() {
+            return true;
+        }
+
+        @Override
+        public ChannelFuture write(Object msg) {
+            return EMPTY;
+        }
+
+        @Override
+        public ChannelFuture write(Object msg, ChannelPromise promise) {
+            return promise;
+        }
+
+        @Override
+        public ChannelFuture writeAndFlush(Object msg) {
+            return EMPTY;
+        }
+
+        @Override
+        public ChannelFuture writeAndFlush(Object msg, ChannelPromise promise) {
+            return promise;
+        }
+    }
+
+}
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java b/src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java
index 83f58c9def..10e39ad6dc 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java
@@ -43,7 +43,7 @@ public void set(long integer) {
 
     private ByteBuf masterBuffer;
 
-    private final RedisStateMachine<byte[], byte[]> stateMachine = new RedisStateMachine<>();
+    private final RedisStateMachine stateMachine = new RedisStateMachine();
     private final byte[] payload = ("*3\r\n" + //
             "$4\r\n" + //
             "LLEN\r\n" + //

From 8723a33865e9289157f75028d2ce96faf744dd47 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 31 Aug 2016 19:51:32 +0200
Subject: [PATCH 013/808] Polishing

Reorder fields. Fix link to reactive API. Fix reactive test names. Improve JavaDoc
---
 .../com/lambdaworks/redis/AbstractRedisClient.java  | 13 ++++++-------
 .../com/lambdaworks/redis/TransactionResult.java    |  1 +
 .../redis/api/async/RedisGeoAsyncCommands.java      |  4 ++--
 .../redis/api/async/RedisServerAsyncCommands.java   |  4 ----
 .../api/reactive/RedisGeoReactiveCommands.java      |  4 ++--
 .../api/reactive/RedisServerReactiveCommands.java   |  1 +
 .../redis/api/reactive/package-info.java            |  2 +-
 .../redis/api/sync/RedisGeoCommands.java            |  2 +-
 .../redis/api/sync/RedisServerCommands.java         |  4 ----
 .../redis/cluster/RedisClusterClient.java           |  5 +++--
 .../api/async/BaseNodeSelectionAsyncCommands.java   |  4 ++--
 .../api/async/NodeSelectionGeoAsyncCommands.java    |  4 ++--
 .../redis/cluster/api/reactive/package-info.java    |  2 +-
 .../cluster/api/sync/BaseNodeSelectionCommands.java |  5 +++--
 .../cluster/api/sync/NodeSelectionGeoCommands.java  |  4 ++--
 .../lambdaworks/redis/internal/LettuceAssert.java   |  1 +
 .../pubsub/StatefulRedisPubSubConnectionImpl.java   |  3 ++-
 .../redis/pubsub/api/reactive/package-info.java     |  2 +-
 .../redis/sentinel/api/reactive/package-info.java   |  4 ++++
 src/main/javadoc/overview.html                      |  2 +-
 ...est.java => ListClusterReactiveCommandTest.java} |  2 +-
 ...ndTest.java => SentinelReactiveCommandTest.java} |  2 +-
 22 files changed, 38 insertions(+), 37 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/sentinel/api/reactive/package-info.java
 rename src/test/java/com/lambdaworks/redis/cluster/commands/reactive/{ListClusterRxCommandTest.java => ListClusterReactiveCommandTest.java} (97%)
 rename src/test/java/com/lambdaworks/redis/sentinel/reactive/{SentinelRxCommandTest.java => SentinelReactiveCommandTest.java} (94%)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
index 94bf808c27..cd651e8151 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
@@ -51,19 +51,19 @@ public abstract class AbstractRedisClient {
     protected static final PooledByteBufAllocator BUF_ALLOCATOR = PooledByteBufAllocator.DEFAULT;
     protected static final InternalLogger logger = InternalLoggerFactory.getInstance(RedisClient.class);
 
-    protected EventExecutorGroup genericWorkerPool;
-
     protected final Map<Class<? extends EventLoopGroup>, EventLoopGroup> eventLoopGroups = new ConcurrentHashMap<>(2);
+    protected final ConnectionEvents connectionEvents = new ConnectionEvents();
+    protected final Set<Closeable> closeableResources = new ConcurrentSet<>();
+    protected final EventExecutorGroup genericWorkerPool;
     protected final HashedWheelTimer timer;
     protected final ChannelGroup channels;
     protected final ClientResources clientResources;
-    protected long timeout = 60;
-    protected TimeUnit unit;
-    protected ConnectionEvents connectionEvents = new ConnectionEvents();
-    protected Set<Closeable> closeableResources = new ConcurrentSet<>();
 
     protected volatile ClientOptions clientOptions = ClientOptions.builder().build();
 
+    protected long timeout = 60;
+    protected TimeUnit unit;
+
     private final boolean sharedResources;
     private final AtomicBoolean shutdown = new AtomicBoolean();
 
@@ -84,7 +84,6 @@ protected AbstractRedisClient(ClientResources clientResources) {
         }
 
         unit = TimeUnit.SECONDS;
-
         genericWorkerPool = this.clientResources.eventExecutorGroup();
         channels = new DefaultChannelGroup(genericWorkerPool.next());
         timer = new HashedWheelTimer();
diff --git a/src/main/java/com/lambdaworks/redis/TransactionResult.java b/src/main/java/com/lambdaworks/redis/TransactionResult.java
index 0bb9afdef8..e4103d4d0e 100644
--- a/src/main/java/com/lambdaworks/redis/TransactionResult.java
+++ b/src/main/java/com/lambdaworks/redis/TransactionResult.java
@@ -37,6 +37,7 @@ public interface TransactionResult extends Iterable<Object> {
      * Returns the element at the specified position in this {@link TransactionResult}.
      *
      * @param index index of the element to return
+     * @param <T> inferred type
      * @return the element at the specified position in this {@link TransactionResult}
      * @throws IndexOutOfBoundsException if the index is out of range (<tt>index &lt; 0 || index &gt;= size()</tt>)
      */
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
index 0709b14176..8c002f57e2 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
@@ -69,7 +69,7 @@ public interface RedisGeoAsyncCommands<K, V> {
     RedisFuture<List<GeoWithin<V>>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
 
     /**
-     * Perform a {@link #georadius(Object, double, double, double, Unit, GeoArgs)} query and store the results in a sorted set.
+     * Perform a {@link #georadius(Object, double, double, double, GeoArgs.Unit, GeoArgs)} query and store the results in a sorted set.
      *
      * @param key the key of the geo set
      * @param longitude the longitude coordinate according to WGS84
@@ -109,7 +109,7 @@ public interface RedisGeoAsyncCommands<K, V> {
     RedisFuture<List<GeoWithin<V>>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
 
     /**
-     * Perform a {@link #georadiusbymember(Object, Object, double, Unit, GeoArgs)} query and store the results in a sorted set.
+     * Perform a {@link #georadiusbymember(Object, Object, double, GeoArgs.Unit, GeoArgs)} query and store the results in a sorted set.
      *
      * @param key the key of the geo set
      * @param member reference member
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
index 3d40677882..18453935e3 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
@@ -172,15 +172,11 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Make the server crash: Out of memory.
-     *
-     * @return nothing, because the server crashes before returning.
      */
     void debugOom();
 
     /**
      * Make the server crash: Invalid pointer access.
-     *
-     * @return nothing, because the server crashes before returning.
      */
     void debugSegfault();
 
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java
index aea256d2c8..f57520c7b4 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java
@@ -71,7 +71,7 @@ public interface RedisGeoReactiveCommands<K, V> {
     Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
 
     /**
-     * Perform a {@link #georadius(Object, double, double, double, Unit, GeoArgs)} query and store the results in a sorted set.
+     * Perform a {@link #georadius(Object, double, double, double, GeoArgs.Unit, GeoArgs)} query and store the results in a sorted set.
      *
      * @param key the key of the geo set
      * @param longitude the longitude coordinate according to WGS84
@@ -111,7 +111,7 @@ public interface RedisGeoReactiveCommands<K, V> {
     Flux<GeoWithin<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
 
     /**
-     * Perform a {@link #georadiusbymember(Object, Object, double, Unit, GeoArgs)} query and store the results in a sorted set.
+     * Perform a {@link #georadiusbymember(Object, Object, double, GeoArgs.Unit, GeoArgs)} query and store the results in a sorted set.
      *
      * @param key the key of the geo set
      * @param member reference member
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
index 788b88b074..ff02fa90f4 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
@@ -268,6 +268,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * Synchronously save the dataset to disk and then shut down the server.
      * 
      * @param save {@literal true} force save operation
+     * @return nothing
      */
     Mono<Void> shutdown(boolean save);
 
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/package-info.java b/src/main/java/com/lambdaworks/redis/api/reactive/package-info.java
index 70d9f046c8..09f535d46b 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
- * Standalone Redis API for reactive commands.
+ * Standalone Redis API for commands executed in a reactive manner.
  */
 package com.lambdaworks.redis.api.reactive;
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
index 1f5dff8cf5..e064b93c81 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
@@ -109,7 +109,7 @@ public interface RedisGeoCommands<K, V> {
     List<GeoWithin<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
 
     /**
-     * Perform a {@link #georadiusbymember(Object, Object, double, Unit, GeoArgs)} query and store the results in a sorted set.
+     * Perform a {@link #georadiusbymember(Object, Object, double, GeoArgs.Unit, GeoArgs)} query and store the results in a sorted set.
      *
      * @param key the key of the geo set
      * @param member reference member
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
index 1d82353e5d..13cccac13e 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
@@ -171,15 +171,11 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Make the server crash: Out of memory.
-     *
-     * @return nothing, because the server crashes before returning.
      */
     void debugOom();
 
     /**
      * Make the server crash: Invalid pointer access.
-     *
-     * @return nothing, because the server crashes before returning.
      */
     void debugSegfault();
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index d2fb069990..01991e40ae 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -27,6 +27,7 @@
 import com.lambdaworks.redis.codec.StringCodec;
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.internal.LettuceLists;
+import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 import com.lambdaworks.redis.protocol.DefaultEndpoint;
 import com.lambdaworks.redis.protocol.CommandHandler;
@@ -53,7 +54,7 @@
  * </p>
  * <p>
  * The Redis cluster client provides a {@link RedisAdvancedClusterCommands sync}, {@link RedisAdvancedClusterAsyncCommands
- * async} and {@link com.lambdaworks.redis.cluster.api.rx.RedisAdvancedClusterReactiveCommands reactive} API.
+ * async} and {@link com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands reactive} API.
  * </p>
  *
  * <p>
@@ -70,7 +71,7 @@
  * <li>{@link RedisAdvancedClusterAsyncCommands#del(Object[]) DEL}</li>
  * <li>{@link RedisAdvancedClusterAsyncCommands#unlink(Object[]) UNLINK}</li>
  * <li>{@link RedisAdvancedClusterAsyncCommands#mget(Object[]) MGET}</li>
- * <li>{@link RedisAdvancedClusterAsyncCommands#mget(ValueStreamingChannel, Object[]) MGET with streaming}</li>
+ * <li>{@link RedisAdvancedClusterAsyncCommands#mget(KeyValueStreamingChannel, Object[])} ) MGET with streaming}</li>
  * <li>{@link RedisAdvancedClusterAsyncCommands#mset(Map) MSET}</li>
  * <li>{@link RedisAdvancedClusterAsyncCommands#msetnx(Map) MSETNX}</li>
  * </ul>
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
index 9d87be0ee8..fd757d0d91 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
@@ -125,11 +125,11 @@ public interface BaseNodeSelectionAsyncCommands<K, V> {
      *
      * @param autoFlush state of autoFlush.
      */
-    AsyncExecutions<Void> setAutoFlushCommands(boolean autoFlush);
+    void setAutoFlushCommands(boolean autoFlush);
 
     /**
      * Flush pending commands. This commands forces a flush on the channel and can be used to buffer ("pipeline") commands to
      * achieve batching. No-op if channel is not connected.
      */
-    AsyncExecutions<Void> flushCommands();
+    void flushCommands();
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
index 3f923c0bcb..1fca498ef7 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
@@ -69,7 +69,7 @@ public interface NodeSelectionGeoAsyncCommands<K, V> {
     AsyncExecutions<List<GeoWithin<V>>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
 
     /**
-     * Perform a {@link #georadius(Object, double, double, double, Unit, GeoArgs)} query and store the results in a sorted set.
+     * Perform a {@link #georadius(Object, double, double, double, GeoArgs.Unit, GeoArgs)} query and store the results in a sorted set.
      *
      * @param key the key of the geo set
      * @param longitude the longitude coordinate according to WGS84
@@ -109,7 +109,7 @@ public interface NodeSelectionGeoAsyncCommands<K, V> {
     AsyncExecutions<List<GeoWithin<V>>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
 
     /**
-     * Perform a {@link #georadiusbymember(Object, Object, double, Unit, GeoArgs)} query and store the results in a sorted set.
+     * Perform a {@link #georadiusbymember(Object, Object, double, GeoArgs.Unit, GeoArgs)} query and store the results in a sorted set.
      *
      * @param key the key of the geo set
      * @param member reference member
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java
index 1477849c97..4cf3456595 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
- * Redis Cluster API for reactive commands.
+ * Redis Cluster API for commands executed in a reactive manner.
  */
 package com.lambdaworks.redis.cluster.api.reactive;
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
index e81667ebc6..d5bc731987 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
@@ -103,11 +103,12 @@ public interface BaseNodeSelectionCommands<K, V> {
      *
      * @param autoFlush state of autoFlush.
      */
-    Executions<Void> setAutoFlushCommands(boolean autoFlush);
+    void setAutoFlushCommands(boolean autoFlush);
 
     /**
      * Flush pending commands. This commands forces a flush on the channel and can be used to buffer ("pipeline") commands to
      * achieve batching. No-op if channel is not connected.
+     *
      */
-    Executions<Void> flushCommands();
+    void flushCommands();
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
index d502ba9011..4db82c42ca 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
@@ -69,7 +69,7 @@ public interface NodeSelectionGeoCommands<K, V> {
     Executions<List<GeoWithin<V>>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
 
     /**
-     * Perform a {@link #georadius(Object, double, double, double, Unit, GeoArgs)} query and store the results in a sorted set.
+     * Perform a {@link #georadius(Object, double, double, double, GeoArgs.Unit, GeoArgs)} query and store the results in a sorted set.
      *
      * @param key the key of the geo set
      * @param longitude the longitude coordinate according to WGS84
@@ -109,7 +109,7 @@ public interface NodeSelectionGeoCommands<K, V> {
     Executions<List<GeoWithin<V>>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs);
 
     /**
-     * Perform a {@link #georadiusbymember(Object, Object, double, Unit, GeoArgs)} query and store the results in a sorted set.
+     * Perform a {@link #georadiusbymember(Object, Object, double, GeoArgs.Unit, GeoArgs)} query and store the results in a sorted set.
      *
      * @param key the key of the geo set
      * @param member reference member
diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceAssert.java b/src/main/java/com/lambdaworks/redis/internal/LettuceAssert.java
index d7116036d7..ae5c415b71 100644
--- a/src/main/java/com/lambdaworks/redis/internal/LettuceAssert.java
+++ b/src/main/java/com/lambdaworks/redis/internal/LettuceAssert.java
@@ -122,6 +122,7 @@ public static void isTrue(boolean value, String message) {
      * calling method.
      *
      * @param condition a boolean expression
+     * @param message the exception message to use if the assertion fails
      * @throws IllegalStateException if {@code expression} is false
      */
     public static void assertState(boolean condition, String message) {
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
index fc92f01593..938b34a0d5 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
@@ -38,7 +38,8 @@ public class StatefulRedisPubSubConnectionImpl<K, V> extends StatefulRedisConnec
     /**
      * Initialize a new connection.
      *
-     * @param writer the channel writer
+     * @param endpoint the {@link PubSubEndpoint}
+     * @param writer the writer used to write commands
      * @param codec Codec used to encode/decode keys and values.
      * @param timeout Maximum time to wait for a response.
      * @param unit Unit of time for the timeout.
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java
index 8e45ee225b..4a134068c8 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
- * Pub/Sub Redis API for reactive commands.
+ * Pub/Sub Redis API for commands executed in a reactive manner.
  */
 package com.lambdaworks.redis.pubsub.api.reactive;
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/package-info.java b/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/package-info.java
new file mode 100644
index 0000000000..fe9fedf806
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Redis Sentinel API for commands executed in a reactive manner.
+ */
+package com.lambdaworks.redis.sentinel.api.reactive;
\ No newline at end of file
diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
index 461f3826c1..aec3a3ec1e 100644
--- a/src/main/javadoc/overview.html
+++ b/src/main/javadoc/overview.html
@@ -3,7 +3,7 @@
 {@link com.lambdaworks.redis.RedisClient RedisClient} providing
 {@link com.lambdaworks.redis.api.sync.RedisCommands synchronous},
 {@link com.lambdaworks.redis.api.async.RedisAsyncCommands asynchronous} and
-{@link com.lambdaworks.redis.api.rx.RedisReactiveCommands reactive} APIs for Redis Standalone, PubSub,
+{@link com.lambdaworks.redis.api.reactive.RedisReactiveCommands reactive} APIs for Redis Standalone, PubSub,
 Redis Sentinel and {@link com.lambdaworks.redis.cluster.RedisClusterClient Redis Cluster}.
 
 Multiple threads may share one connection if they avoid blocking and transactional
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterRxCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterReactiveCommandTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterRxCommandTest.java
rename to src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterReactiveCommandTest.java
index a1d265693a..2eae3213a8 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterReactiveCommandTest.java
@@ -20,7 +20,7 @@
 /**
  * @author Mark Paluch
  */
-public class ListClusterRxCommandTest extends ListCommandTest {
+public class ListClusterReactiveCommandTest extends ListCommandTest {
     private static RedisClusterClient redisClusterClient;
     private StatefulRedisClusterConnection<String, String> clusterConnection;
 
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelRxCommandTest.java b/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelReactiveCommandTest.java
similarity index 94%
rename from src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelRxCommandTest.java
rename to src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelReactiveCommandTest.java
index 489a004747..a7c2ec784a 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelRxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelReactiveCommandTest.java
@@ -12,7 +12,7 @@
 /**
  * @author Mark Paluch
  */
-public class SentinelRxCommandTest extends SentinelCommandTest {
+public class SentinelReactiveCommandTest extends SentinelCommandTest {
 
     @Override
     public void openConnection() throws Exception {

From d721e978f0d1029dc8f41191fd56eddeea3ebd3e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 31 Aug 2016 22:00:09 +0200
Subject: [PATCH 014/808] Integrate Reactive Streams TCK for RedisPublisher
 #349

---
 pom.xml                                       | 20 ++++-
 .../com/lambdaworks/redis/RedisPublisher.java | 28 +++++-
 .../lambdaworks/redis/TestRedisPublisher.java | 21 +++++
 .../reactive/RedisPublisherVerification.java  | 86 +++++++++++++++++++
 4 files changed, 148 insertions(+), 7 deletions(-)
 create mode 100644 src/test/java/com/lambdaworks/redis/TestRedisPublisher.java
 create mode 100644 src/test/java/com/lambdaworks/redis/reactive/RedisPublisherVerification.java

diff --git a/pom.xml b/pom.xml
index f6245f6b33..e9ac882ddf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,7 +180,7 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>com.googlecode.multithreadedtc</groupId>
             <artifactId>multithreadedtc</artifactId>
@@ -251,6 +251,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.reactivestreams</groupId>
+            <artifactId>reactive-streams-tck</artifactId>
+            <version>1.0.0</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
@@ -278,7 +285,7 @@
         <profile>
             <id>netty-40</id>
             <properties>
-               <netty-version>4.0.40.Final</netty-version>
+                <netty-version>4.0.40.Final</netty-version>
             </properties>
         </profile>
         <profile>
@@ -429,7 +436,7 @@
                                     <classpathScope>test</classpathScope>
                                     <arguments>
                                         <argument>-classpath</argument>
-                                        <classpath />
+                                        <classpath/>
                                         <argument>org.openjdk.jmh.Main</argument>
                                         <argument>.*</argument>
                                     </arguments>
@@ -507,6 +514,13 @@
                         <io.netty.eventLoopThreads>4</io.netty.eventLoopThreads>
                     </systemProperties>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit47</artifactId>
+                        <version>2.17</version>
+                    </dependency>
+                </dependencies>
             </plugin>
 
             <plugin>
diff --git a/src/main/java/com/lambdaworks/redis/RedisPublisher.java b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
index f01f0c94db..0617212e00 100644
--- a/src/main/java/com/lambdaworks/redis/RedisPublisher.java
+++ b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
@@ -116,6 +116,7 @@ private static class RedisSubscription<T> implements Subscription, StreamingOutp
         private final AtomicLong demand = new AtomicLong();
         private final Queue<T> data = new ConcurrentLinkedQueue<T>();
         private final AtomicBoolean dispatched = new AtomicBoolean();
+        private volatile boolean allDataRead = false;
 
         private final StatefulConnection<?, ?> connection;
         private final RedisCommand<?, ?, T> command;
@@ -142,7 +143,9 @@ private static class RedisSubscription<T> implements Subscription, StreamingOutp
          */
         void subscribe(Subscriber<? super T> subscriber) {
 
-            LettuceAssert.notNull(subscriber, "Subscriber must not be null");
+            if (subscriber == null) {
+                throw new NullPointerException("Subscriber must not be null");
+            }
 
             if (traceEnabled) {
                 LOG.trace("{} subscribe: {}@{}", state(), subscriber.getClass().getName(), Objects.hashCode(subscriber));
@@ -219,6 +222,8 @@ final void onAllDataRead() {
             if (traceEnabled) {
                 LOG.trace("{} onAllDataRead()", state());
             }
+
+            allDataRead = true;
             this.state.get().onAllDataRead(this);
         }
 
@@ -376,19 +381,32 @@ void onDataAvailable(RedisSubscription<?> subscription) {
                 if (subscription.changeState(this, READING)) {
 
                     try {
-
                         boolean demandAvailable = subscription.readAndPublish();
                         if (demandAvailable) {
                             subscription.changeState(READING, DEMAND);
                             subscription.checkOnDataAvailable();
                         } else {
-                            subscription.changeState(READING, NO_DEMAND);
+
+                            if (subscription.allDataRead && subscription.data.isEmpty()) {
+                                subscription.onAllDataRead();
+                            } else {
+                                subscription.changeState(READING, NO_DEMAND);
+                            }
                         }
                     } catch (IOException ex) {
                         subscription.onError(ex);
                     }
                 }
             }
+
+            @Override
+            void request(RedisSubscription<?> subscription, long n) {
+
+                if (BackpressureUtils.checkRequest(n, subscription.subscriber)) {
+                    BackpressureUtils.addAndGet(subscription.demand, n);
+                }
+            }
+
         },
 
         READING {
@@ -447,7 +465,9 @@ void onDataAvailable(RedisSubscription<?> subscription) {
 
         void onAllDataRead(RedisSubscription<?> subscription) {
 
-            if (subscription.changeState(this, COMPLETED)) {
+            subscription.allDataRead = true;
+
+            if (subscription.data.isEmpty() && subscription.changeState(this, COMPLETED)) {
                 if (subscription.subscriber != null) {
                     subscription.subscriber.onComplete();
                 }
diff --git a/src/test/java/com/lambdaworks/redis/TestRedisPublisher.java b/src/test/java/com/lambdaworks/redis/TestRedisPublisher.java
new file mode 100644
index 0000000000..3f6777ed2d
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/TestRedisPublisher.java
@@ -0,0 +1,21 @@
+package com.lambdaworks.redis;
+
+import java.util.function.Supplier;
+
+import com.lambdaworks.redis.api.StatefulConnection;
+import com.lambdaworks.redis.protocol.RedisCommand;
+
+/**
+ * @author Mark Paluch
+ */
+public class TestRedisPublisher<K, V, T> extends RedisPublisher<K, V, T> {
+
+    public TestRedisPublisher(RedisCommand<K, V, T> staticCommand, StatefulConnection<K, V> connection, boolean dissolve) {
+        super(staticCommand, connection, dissolve);
+    }
+
+    public TestRedisPublisher(Supplier<RedisCommand<K, V, T>> redisCommandSupplier, StatefulConnection<K, V> connection,
+            boolean dissolve) {
+        super(redisCommandSupplier, connection, dissolve);
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/reactive/RedisPublisherVerification.java b/src/test/java/com/lambdaworks/redis/reactive/RedisPublisherVerification.java
new file mode 100644
index 0000000000..7700a7625d
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/reactive/RedisPublisherVerification.java
@@ -0,0 +1,86 @@
+package com.lambdaworks.redis.reactive;
+
+import static com.lambdaworks.redis.protocol.CommandType.LRANGE;
+
+import java.util.List;
+import java.util.UUID;
+import java.util.function.Supplier;
+
+import org.reactivestreams.Publisher;
+import org.reactivestreams.tck.PublisherVerification;
+import org.reactivestreams.tck.TestEnvironment;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+
+import com.lambdaworks.TestClientResources;
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.codec.Utf8StringCodec;
+import com.lambdaworks.redis.output.ValueListOutput;
+import com.lambdaworks.redis.protocol.Command;
+import com.lambdaworks.redis.protocol.CommandArgs;
+
+/**
+ * @author Mark Paluch
+ */
+public class RedisPublisherVerification extends PublisherVerification<String> {
+
+    private static final Utf8StringCodec CODEC = new Utf8StringCodec();
+    private static RedisClient client;
+    private static StatefulRedisConnection<String, String> connection;
+
+    public RedisPublisherVerification() {
+        super(new TestEnvironment(1000));
+    }
+
+    @BeforeClass
+    private static void beforeClass() {
+        client = RedisClient.create(TestClientResources.get(), RedisURI.create(TestSettings.host(), TestSettings.port()));
+        connection = client.connect();
+        connection.sync().flushall();
+    }
+
+    @AfterClass
+    private static void afterClass() {
+        connection.close();
+        FastShutdown.shutdown(client);
+    }
+
+    @Override
+    public Publisher<String> createPublisher(long elements) {
+
+        RedisCommands<String, String> sync = connection.sync();
+
+        if (elements == Long.MAX_VALUE) {
+            return null;
+        }
+
+        String id = UUID.randomUUID().toString();
+        String key = "PublisherVerification-" + id;
+
+        for (int i = 0; i < elements; i++) {
+            sync.lpush(key, "element-" + i);
+        }
+
+        Supplier<Command<String, String, List<String>>> supplier = () -> {
+            CommandArgs<String, String> args = new CommandArgs<>(CODEC).addKey(key).add(0).add(-1);
+            return new Command<>(LRANGE, new ValueListOutput<>(CODEC), args);
+        };
+
+        TestRedisPublisher<String, String, String> publisher = new TestRedisPublisher(supplier, connection, true);
+
+        return publisher;
+    }
+
+    @Override
+    public long maxElementsFromPublisher() {
+        return 1000;
+    }
+
+    @Override
+    public Publisher<String> createFailedPublisher() {
+        return null;
+    }
+
+}
\ No newline at end of file

From 65a58a3e4e33447b08ba8d7777edcc85c90bd5a4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 31 Aug 2016 22:47:21 +0200
Subject: [PATCH 015/808] Use different return types for geopos in reactive and
 other APIs #349

The reactive API requires non-null value emission, therefore commands known to possibly emit null elements require a Value wrapper. The Value wrapper is not necessary for the sync/async APIs as these APIs deal with lists so null values are possible.
---
 .../redis/AbstractRedisAsyncCommands.java     |  2 +-
 .../redis/AbstractRedisReactiveCommands.java  |  2 +-
 .../redis/RedisCommandBuilder.java            | 12 +++-
 .../api/async/RedisGeoAsyncCommands.java      |  2 +-
 .../redis/api/sync/RedisGeoCommands.java      |  2 +-
 .../async/NodeSelectionGeoAsyncCommands.java  |  2 +-
 .../api/sync/NodeSelectionGeoCommands.java    |  2 +-
 .../output/GeoCoordinatesListOutput.java      | 19 +-----
 .../output/GeoCoordinatesValueListOutput.java | 61 +++++++++++++++++++
 .../redis/api/RedisGeoCommands.java           |  2 +-
 .../redis/extensibility/LettuceGeoDemo.java   |  4 +-
 .../apigenerator/CreateReactiveApi.java       | 25 +++++++-
 .../redis/commands/GeoCommandTest.java        | 16 ++---
 .../reactive/GeoReactiveCommandTest.java      | 32 ++++++++++
 .../output/GeoCoordinatesListOutputTest.java  | 20 +++---
 .../GeoCoordinatesValueListOutputTest.java    | 39 ++++++++++++
 16 files changed, 193 insertions(+), 49 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutput.java
 create mode 100644 src/test/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutputTest.java

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
index be5c55e2c5..60c2e9596e 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
@@ -1729,7 +1729,7 @@ public RedisFuture<Long> georadiusbymember(K key, V member, double distance, Uni
     }
 
     @Override
-    public RedisFuture<List<Value<GeoCoordinates>>> geopos(K key, V... members) {
+    public RedisFuture<List<GeoCoordinates>> geopos(K key, V... members) {
         return dispatch(commandBuilder.geopos(key, members));
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
index 01e6ccd96e..87fb9695c3 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
@@ -1740,7 +1740,7 @@ public Mono<Long> georadiusbymember(K key, V member, double distance, Unit unit,
 
     @Override
     public Flux<Value<GeoCoordinates>> geopos(K key, V... members) {
-        return createDissolvingFlux(() -> commandBuilder.geopos(key, members));
+        return createDissolvingFlux(() -> commandBuilder.geoposValues(key, members));
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
index 449704ed3f..b9daa80e32 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
@@ -2527,7 +2527,7 @@ public Command<K, V, Long> georadiusbymember(K key, V member, double distance, S
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public Command<K, V, List<Value<GeoCoordinates>>> geopos(K key, V[] members) {
+    public Command<K, V, List<GeoCoordinates>> geopos(K key, V[] members) {
         notNullKey(key);
         LettuceAssert.notNull(members, "Members " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(members, "Members " + MUST_NOT_BE_EMPTY);
@@ -2536,6 +2536,16 @@ public Command<K, V, List<Value<GeoCoordinates>>> geopos(K key, V[] members) {
         return (Command) createCommand(GEOPOS, new GeoCoordinatesListOutput<K, V>(codec), args);
     }
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public Command<K, V, List<Value<GeoCoordinates>>> geoposValues(K key, V[] members) {
+        notNullKey(key);
+        LettuceAssert.notNull(members, "Members " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(members, "Members " + MUST_NOT_BE_EMPTY);
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValues(members);
+
+        return (Command) createCommand(GEOPOS, new GeoCoordinatesValueListOutput<K, V>(codec), args);
+    }
+
     public Command<K, V, Double> geodist(K key, V from, V to, GeoArgs.Unit unit) {
         notNullKey(key);
         LettuceAssert.notNull(from, "From " + MUST_NOT_BE_NULL);
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
index 8c002f57e2..e4a923d8d1 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
@@ -130,7 +130,7 @@ public interface RedisGeoAsyncCommands<K, V> {
      * @return a list of {@link GeoCoordinates}s representing the x,y position of each element specified in the arguments. For
      *         missing elements {@literal null} is returned.
      */
-    RedisFuture<List<Value<GeoCoordinates>>> geopos(K key, V... members);
+    RedisFuture<List<GeoCoordinates>> geopos(K key, V... members);
 
     /**
      *
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
index e064b93c81..88eea5e100 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
@@ -130,7 +130,7 @@ public interface RedisGeoCommands<K, V> {
      * @return a list of {@link GeoCoordinates}s representing the x,y position of each element specified in the arguments. For
      *         missing elements {@literal null} is returned.
      */
-    List<Value<GeoCoordinates>> geopos(K key, V... members);
+    List<GeoCoordinates> geopos(K key, V... members);
 
     /**
      *
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
index 1fca498ef7..93e0c6e99e 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
@@ -130,7 +130,7 @@ public interface NodeSelectionGeoAsyncCommands<K, V> {
      * @return a list of {@link GeoCoordinates}s representing the x,y position of each element specified in the arguments. For
      *         missing elements {@literal null} is returned.
      */
-    AsyncExecutions<List<Value<GeoCoordinates>>> geopos(K key, V... members);
+    AsyncExecutions<List<GeoCoordinates>> geopos(K key, V... members);
 
     /**
      *
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
index 4db82c42ca..dac1d65873 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
@@ -130,7 +130,7 @@ public interface NodeSelectionGeoCommands<K, V> {
      * @return a list of {@link GeoCoordinates}s representing the x,y position of each element specified in the arguments. For
      *         missing elements {@literal null} is returned.
      */
-    Executions<List<Value<GeoCoordinates>>> geopos(K key, V... members);
+    Executions<List<GeoCoordinates>> geopos(K key, V... members);
 
     /**
      *
diff --git a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java b/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java
index e348611f2d..c080f63555 100644
--- a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java
@@ -16,14 +16,12 @@
  *
  * @author Mark Paluch
  */
-public class GeoCoordinatesListOutput<K, V> extends CommandOutput<K, V, List<Value<GeoCoordinates>>> implements StreamingOutput<Value<GeoCoordinates>> {
+public class GeoCoordinatesListOutput<K, V> extends CommandOutput<K, V, List<GeoCoordinates>>  {
 
     private Double x;
-	private Subscriber<Value<GeoCoordinates>> subscriber;
 
 	public GeoCoordinatesListOutput(RedisCodec<K, V> codec) {
         super(codec, new ArrayList<>());
-		setSubscriber(ListSubscriber.of(output));
 	}
 
     @Override
@@ -36,25 +34,14 @@ public void set(ByteBuffer bytes) {
             return;
         }
 
-        subscriber.onNext(Value.fromNullable(new GeoCoordinates(x, value)));
+        output.add(new GeoCoordinates(x, value));
         x = null;
     }
 
     @Override
     public void multi(int count) {
         if (count == -1) {
-            subscriber.onNext(Value.empty());
+            output.add(null);
         }
     }
-
-	@Override
-	public void setSubscriber(Subscriber<Value<GeoCoordinates>> subscriber) {
-        LettuceAssert.notNull(subscriber, "Subscriber must not be null");
-		this.subscriber = subscriber;
-	}
-
-	@Override
-	public Subscriber<Value<GeoCoordinates>> getSubscriber() {
-		return subscriber;
-	}
 }
diff --git a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutput.java b/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutput.java
new file mode 100644
index 0000000000..66beae9741
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutput.java
@@ -0,0 +1,61 @@
+package com.lambdaworks.redis.output;
+
+import static java.lang.Double.parseDouble;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.lambdaworks.redis.GeoCoordinates;
+import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * A list output that creates a list with {@link GeoCoordinates} {@link Value}s.
+ *
+ * @author Mark Paluch
+ */
+public class GeoCoordinatesValueListOutput<K, V> extends CommandOutput<K, V, List<Value<GeoCoordinates>>>
+        implements StreamingOutput<Value<GeoCoordinates>> {
+
+    private Double x;
+    private Subscriber<Value<GeoCoordinates>> subscriber;
+
+    public GeoCoordinatesValueListOutput(RedisCodec<K, V> codec) {
+        super(codec, new ArrayList<>());
+        setSubscriber(ListSubscriber.of(output));
+    }
+
+    @Override
+    public void set(ByteBuffer bytes) {
+
+        Double value = (bytes == null) ? 0 : parseDouble(decodeAscii(bytes));
+
+        if (x == null) {
+            x = value;
+            return;
+        }
+
+        subscriber.onNext(Value.fromNullable(new GeoCoordinates(x, value)));
+        x = null;
+    }
+
+    @Override
+    public void multi(int count) {
+        if (count == -1) {
+            subscriber.onNext(Value.empty());
+        }
+    }
+
+    @Override
+    public void setSubscriber(Subscriber<Value<GeoCoordinates>> subscriber) {
+        LettuceAssert.notNull(subscriber, "Subscriber must not be null");
+        this.subscriber = subscriber;
+    }
+
+    @Override
+    public Subscriber<Value<GeoCoordinates>> getSubscriber() {
+        return subscriber;
+    }
+}
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java
index 765b7a0ae4..205093706f 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java
@@ -132,7 +132,7 @@ public interface RedisGeoCommands<K, V> {
      * @return a list of {@link GeoCoordinates}s representing the x,y position of each element specified in the arguments. For
      *         missing elements {@literal null} is returned.
      */
-    List<Value<GeoCoordinates>> geopos(K key, V... members);
+    List<GeoCoordinates> geopos(K key, V... members);
 
     /**
      *
diff --git a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
index 0c61a3e500..770b244fd8 100644
--- a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
+++ b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
@@ -40,8 +40,8 @@ public static void main(String[] args) {
         System.out.println("Distance: " + weinheim.distance);
         System.out.println("Coordinates: " + weinheim.coordinates.x + "/" + weinheim.coordinates.y);
 
-        List<Value<GeoCoordinates>> geopos = redis.geopos(key, "Weinheim", "Train station");
-        GeoCoordinates weinheimGeopos = geopos.get(0).getValue();
+        List<GeoCoordinates> geopos = redis.geopos(key, "Weinheim", "Train station");
+        GeoCoordinates weinheimGeopos = geopos.get(0);
         System.out.println("Coordinates: " + weinheimGeopos.x + "/" + weinheimGeopos.y);
 
         redis.getStatefulConnection().close();
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
index 8ab4f7bcac..d1508dde47 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.util.*;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 import org.junit.Test;
@@ -29,6 +30,7 @@ public class CreateReactiveApi {
             "BaseRedisCommands.reset", "getStatefulConnection", "setAutoFlushCommands", "flushCommands");
 
     private static Set<String> FORCE_FLUX_RESULT = LettuceSets.unmodifiableSet("eval", "evalsha", "dispatch");
+    private static Map<String, String> RESULT_SPEC = Collections.singletonMap("geopos", "Flux<Value<GeoCoordinates>>");
 
     private CompilationUnitFactory factory;
 
@@ -101,8 +103,9 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
             }
 
             String typeAsString = method.getType().toStringWithoutComments().trim();
-
-            if (methodMatch(FORCE_FLUX_RESULT, method, classOfMethod)) {
+            if(getResultType(method, classOfMethod) != null){
+                typeAsString = getResultType(method, classOfMethod);
+            }else if (methodMatch(FORCE_FLUX_RESULT, method, classOfMethod)) {
                 typeAsString = "Flux<" + typeAsString + ">";
             } else if (typeAsString.equals("void")) {
                 typeAsString = "Mono<Void>";
@@ -123,6 +126,24 @@ private boolean methodMatch(Collection<String> methodNames, MethodDeclaration me
         return methodNames.contains(method.getName()) || methodNames.contains(classOfMethod.getName() + "." + method.getName());
     }
 
+
+    private String getResultType(MethodDeclaration method,
+            ClassOrInterfaceDeclaration classOfMethod) {
+
+        if(RESULT_SPEC.containsKey(method.getName())){
+            return RESULT_SPEC.get(method.getName());
+        }
+
+        String key = classOfMethod.getName() + "." + method.getName();
+
+        if(RESULT_SPEC.containsKey(key)){
+            return RESULT_SPEC.get(key);
+        }
+
+        return null;
+    }
+
+
     /**
      * Supply additional imports.
      * 
diff --git a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
index c79cbe8f38..429f08a39f 100644
--- a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
@@ -122,12 +122,12 @@ public void geopos() throws Exception {
 
         prepareGeo();
 
-        List<Value<GeoCoordinates>> geopos = redis.geopos(key, "Weinheim", "foobar", "Bahn");
+        List<GeoCoordinates> geopos = redis.geopos(key, "Weinheim", "foobar", "Bahn");
 
         assertThat(geopos).hasSize(3);
-        assertThat(geopos.get(0).getValue().x.doubleValue()).isEqualTo(8.6638, offset(0.001));
-        assertThat(geopos.get(1).hasValue()).isFalse();
-        assertThat(geopos.get(2).hasValue()).isTrue();
+        assertThat(geopos.get(0).x.doubleValue()).isEqualTo(8.6638, offset(0.001));
+        assertThat(geopos.get(1)).isNull();
+        assertThat(geopos.get(2)).isNotNull();
     }
 
     @Test
@@ -138,12 +138,12 @@ public void geoposWithTransaction() throws Exception {
         redis.multi();
         redis.geopos(key, "Weinheim", "foobar", "Bahn");
         redis.geopos(key, "Weinheim", "foobar", "Bahn");
-        List<Value<GeoCoordinates>> geopos = redis.exec().get(1);
+        List<GeoCoordinates> geopos = redis.exec().get(1);
 
         assertThat(geopos).hasSize(3);
-        assertThat(geopos.get(0).getValue().x.doubleValue()).isEqualTo(8.6638, offset(0.001));
-        assertThat(geopos.get(1).hasValue()).isFalse();
-        assertThat(geopos.get(2).hasValue()).isTrue();
+        assertThat(geopos.get(0).x.doubleValue()).isEqualTo(8.6638, offset(0.001));
+        assertThat(geopos.get(1)).isNull();
+        assertThat(geopos.get(2)).isNotNull();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
index 2ddbdbbc66..4a6940458a 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
@@ -1,8 +1,18 @@
 package com.lambdaworks.redis.commands.reactive;
 
+import com.lambdaworks.redis.GeoCoordinates;
+import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.GeoCommandTest;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import org.junit.Ignore;
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.offset;
 
 public class GeoReactiveCommandTest extends GeoCommandTest {
 
@@ -10,4 +20,26 @@ public class GeoReactiveCommandTest extends GeoCommandTest {
     protected RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
+
+    @Test
+    @Override
+    public void geopos() throws Exception {
+
+        RedisReactiveCommands<String, String> reactive = client.connect().reactive();
+
+        prepareGeo();
+
+        List<Value<GeoCoordinates>> geopos = reactive.geopos(key, "Weinheim", "foobar", "Bahn").collectList().block();
+
+        assertThat(geopos).hasSize(3);
+        assertThat(geopos.get(0).getValue().x.doubleValue()).isEqualTo(8.6638, offset(0.001));
+        assertThat(geopos.get(1).hasValue()).isFalse();
+        assertThat(geopos.get(2).hasValue()).isTrue();
+    }
+
+    @Test
+    @Ignore("API differences")
+    @Override
+    public void geoposWithTransaction() throws Exception {
+    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java b/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java
index e0831df2cb..9612ea3462 100644
--- a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java
@@ -4,7 +4,6 @@
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.Value;
 import org.junit.Test;
 
 import com.lambdaworks.redis.GeoCoordinates;
@@ -15,25 +14,20 @@
  */
 public class GeoCoordinatesListOutputTest {
 
-	private GeoCoordinatesListOutput<?, ?> sut = new GeoCoordinatesListOutput<>(new Utf8StringCodec());
-
-	 @Test
-    public void defaultSubscriberIsSet() throws Exception {
-        assertThat(sut.getSubscriber()).isNotNull().isInstanceOf(ListSubscriber.class);
-    }
+    private GeoCoordinatesListOutput<?, ?> sut = new GeoCoordinatesListOutput<>(new Utf8StringCodec());
 
     @Test(expected = IllegalStateException.class)
     public void setIntegerShouldFail() throws Exception {
         sut.set(123L);
     }
 
-	@Test
+    @Test
     public void commandOutputCorrectlyDecoded() throws Exception {
 
-		sut.set(ByteBuffer.wrap("1.234".getBytes()));
-		sut.set(ByteBuffer.wrap("4.567".getBytes()));
-		sut.multi(-1);
+        sut.set(ByteBuffer.wrap("1.234".getBytes()));
+        sut.set(ByteBuffer.wrap("4.567".getBytes()));
+        sut.multi(-1);
 
-		assertThat(sut.get()).contains(Value.just(new GeoCoordinates(1.234, 4.567)));
-	}
+        assertThat(sut.get()).contains(new GeoCoordinates(1.234, 4.567));
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutputTest.java b/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutputTest.java
new file mode 100644
index 0000000000..c6c0bfaa2f
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutputTest.java
@@ -0,0 +1,39 @@
+package com.lambdaworks.redis.output;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.nio.ByteBuffer;
+
+import org.junit.Test;
+
+import com.lambdaworks.redis.GeoCoordinates;
+import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.codec.Utf8StringCodec;
+
+/**
+ * @author Mark Paluch
+ */
+public class GeoCoordinatesValueListOutputTest {
+
+	private GeoCoordinatesValueListOutput<?, ?> sut = new GeoCoordinatesValueListOutput<>(new Utf8StringCodec());
+
+	 @Test
+    public void defaultSubscriberIsSet() throws Exception {
+        assertThat(sut.getSubscriber()).isNotNull().isInstanceOf(ListSubscriber.class);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void setIntegerShouldFail() throws Exception {
+        sut.set(123L);
+    }
+
+	@Test
+    public void commandOutputCorrectlyDecoded() throws Exception {
+
+		sut.set(ByteBuffer.wrap("1.234".getBytes()));
+		sut.set(ByteBuffer.wrap("4.567".getBytes()));
+		sut.multi(-1);
+
+		assertThat(sut.get()).contains(Value.just(new GeoCoordinates(1.234, 4.567)));
+	}
+}
\ No newline at end of file

From 122f33194d9869151cc7d65f5b8d2d0fa1f7ff1f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 1 Sep 2016 23:36:10 +0200
Subject: [PATCH 016/808] Upgrade to Reactor 3.0.1.BUILD-SNAPSHOT

---
 pom.xml                                       |   13 +-
 .../lambdaworks/redis/BackpressureUtils.java  |  104 --
 .../com/lambdaworks/redis/RedisPublisher.java |   13 +-
 .../lambdaworks/redis/ClientMetricsTest.java  |    3 +-
 .../lambdaworks/redis/CustomCodecTest.java    |    3 +-
 .../redis/ReactiveConnectionTest.java         |    2 +-
 .../redis/ReactiveStreamingOutputTest.java    |    2 +-
 .../reactive/CustomReactiveCommandTest.java   |    6 +-
 .../TransactionReactiveCommandTest.java       |    2 +-
 .../event/ConnectionEventsTriggeredTest.java  |    3 +-
 .../redis/event/DefaultEventBusTest.java      |    2 +-
 .../redis/pubsub/PubSubReactiveTest.java      |    2 +-
 .../redis/reactive/TestSubscriber.java        | 1128 +++++++++++++++++
 .../resource/DefaultClientResourcesTest.java  |    2 +-
 14 files changed, 1157 insertions(+), 128 deletions(-)
 create mode 100644 src/test/java/com/lambdaworks/redis/reactive/TestSubscriber.java

diff --git a/pom.xml b/pom.xml
index e9ac882ddf..d582b96756 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>3.0.0.RC1</version>
+            <version>3.0.1.BUILD-SNAPSHOT</version>
         </dependency>
 
         <!-- Netty -->
@@ -700,4 +700,15 @@
             </plugin>
         </plugins>
     </reporting>
+
+    <repositories>
+    <repository>
+        <id>spring-snapshots</id>
+        <name>Spring Snapshots</name>
+        <url>https://repo.spring.io/libs-snapshot</url>
+        <snapshots>
+            <enabled>true</enabled>
+        </snapshots>
+    </repository>
+</repositories>
 </project>
diff --git a/src/main/java/com/lambdaworks/redis/BackpressureUtils.java b/src/main/java/com/lambdaworks/redis/BackpressureUtils.java
index 3a211e789d..df1a872817 100644
--- a/src/main/java/com/lambdaworks/redis/BackpressureUtils.java
+++ b/src/main/java/com/lambdaworks/redis/BackpressureUtils.java
@@ -1,85 +1,10 @@
 package com.lambdaworks.redis;
 
-import java.util.Objects;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.reactivestreams.Subscriber;
-import org.reactivestreams.Subscription;
-
-import reactor.core.Exceptions;
-
 enum BackpressureUtils {
     ;
 
-    /**
-     * Check Subscription current state and cancel new Subscription if different null, returning true if ready to subscribe.
-     *
-     * @param current current Subscription, expected to be null
-     * @param next new Subscription
-     * @return true if Subscription can be used
-     */
-    public static boolean validate(Subscription current, Subscription next) {
-        Objects.requireNonNull(next, "Subscription cannot be null");
-        if (current != null) {
-            next.cancel();
-            // reportSubscriptionSet();
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Evaluate if a request is strictly positive otherwise {@link #reportBadRequest(long)}
-     * 
-     * @param n the request value
-     * @return true if valid
-     */
-    public static boolean validate(long n) {
-        if (n < 0) {
-            reportBadRequest(n);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Throws an exception if request is 0 or negative as specified in rule 3.09 of Reactive Streams
-     *
-     * @param n demand to check
-     * @param subscriber Subscriber to onError if non strict positive n
-     *
-     * @return true if valid or false if specification exception occured
-     *
-     * @throws IllegalArgumentException if subscriber is null and demand is negative or 0.
-     */
-    public static boolean checkRequest(long n, Subscriber<?> subscriber) {
-        if (n <= 0L) {
-            if (null != subscriber) {
-                subscriber.onError(Exceptions.nullOrNegativeRequestException(n));
-            } else {
-                throw Exceptions.nullOrNegativeRequestException(n);
-            }
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Cap an addition to Long.MAX_VALUE
-     *
-     * @param a left operand
-     * @param b right operand
-     * @return Addition result or Long.MAX_VALUE if overflow
-     */
-    public static long addCap(long a, long b) {
-        long res = a + b;
-        if (res < 0L) {
-            return Long.MAX_VALUE;
-        }
-        return res;
-    }
-
     /**
      * Cap a substraction to 0
      *
@@ -95,26 +20,6 @@ public static long subOrZero(long a, long b) {
         return res;
     }
 
-    /**
-     * Concurrent addition bound to Long.MAX_VALUE. Any concurrent write will "happen" before this operation.
-     *
-     * @param current current atomic to update
-     * @param toAdd delta to add
-     * @return Addition result or Long.MAX_VALUE
-     */
-    public static long addAndGet(AtomicLong current, long toAdd) {
-        long u, r;
-        do {
-            r = current.get();
-            if (r == Long.MAX_VALUE) {
-                return Long.MAX_VALUE;
-            }
-            u = addCap(r, toAdd);
-        } while (!current.compareAndSet(r, u));
-
-        return u;
-    }
-
     /**
      * Concurrent substraction bound to 0 and Long.MAX_VALUE. Any concurrent write will "happen" before this operation.
      *
@@ -134,13 +39,4 @@ public static long getAndSub(AtomicLong sequence, long toSub) {
 
         return r;
     }
-
-    /**
-     * Throw {@link IllegalArgumentException}
-     * 
-     * @param n the demand to evaluate
-     */
-    public static void reportBadRequest(long n) {
-        throw Exceptions.nullOrNegativeRequestException(n);
-    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/RedisPublisher.java b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
index 0617212e00..9ab50c4017 100644
--- a/src/main/java/com/lambdaworks/redis/RedisPublisher.java
+++ b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
@@ -24,6 +24,7 @@
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
+import reactor.core.publisher.Operators;
 
 /**
  * Reactive command {@link Publisher} using ReactiveStreams.
@@ -359,8 +360,8 @@ void subscribe(RedisSubscription<?> subscription, Subscriber<?> subscriber) {
             @Override
             void request(RedisSubscription<?> subscription, long n) {
 
-                if (BackpressureUtils.checkRequest(n, subscription.subscriber)) {
-                    BackpressureUtils.addAndGet(subscription.demand, n);
+                if (Operators.checkRequest(n, subscription.subscriber)) {
+                    Operators.addAndGet(subscription.demand, n);
 
                     if (subscription.changeState(this, DEMAND)) {
                         subscription.checkCommandDispatch();
@@ -402,8 +403,8 @@ void onDataAvailable(RedisSubscription<?> subscription) {
             @Override
             void request(RedisSubscription<?> subscription, long n) {
 
-                if (BackpressureUtils.checkRequest(n, subscription.subscriber)) {
-                    BackpressureUtils.addAndGet(subscription.demand, n);
+                if (Operators.checkRequest(n, subscription.subscriber)) {
+                    Operators.addAndGet(subscription.demand, n);
                 }
             }
 
@@ -413,8 +414,8 @@ void request(RedisSubscription<?> subscription, long n) {
             @Override
             void request(RedisSubscription<?> subscription, long n) {
 
-                if (BackpressureUtils.checkRequest(n, subscription.subscriber)) {
-                    BackpressureUtils.addAndGet(subscription.demand, n);
+                if (Operators.checkRequest(n, subscription.subscriber)) {
+                    Operators.addAndGet(subscription.demand, n);
                 }
             }
         },
diff --git a/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java b/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
index 647ec54f77..ddc5c212be 100644
--- a/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
@@ -9,6 +9,7 @@
 import java.util.concurrent.TimeUnit;
 
 import com.lambdaworks.Wait;
+import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -23,8 +24,6 @@
 import com.lambdaworks.redis.metrics.CommandLatencyId;
 import com.lambdaworks.redis.metrics.CommandMetrics;
 
-import reactor.test.TestSubscriber;
-
 /**
  * @author Mark Paluch
  */
diff --git a/src/test/java/com/lambdaworks/redis/CustomCodecTest.java b/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
index 29463bc4f2..f0e71b9308 100644
--- a/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
+++ b/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
@@ -12,17 +12,16 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.protocol.CommandArgs;
+import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.Test;
 
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.codec.CompressionCodec;
 import com.lambdaworks.redis.codec.RedisCodec;
-import reactor.test.TestSubscriber;
 
 public class CustomCodecTest extends AbstractRedisClientTest {
 
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
index 395de86637..9c37e3f5e8 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
@@ -11,6 +11,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -27,7 +28,6 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
-import reactor.test.TestSubscriber;
 
 public class ReactiveConnectionTest extends AbstractRedisClientTest {
 
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java b/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
index d528f58d51..4d39b19e38 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -15,7 +16,6 @@
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
 import org.springframework.test.util.ReflectionTestUtils;
-import reactor.test.TestSubscriber;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
index 4dcb02ab84..6ec73e14b2 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
@@ -1,9 +1,6 @@
 package com.lambdaworks.redis.commands.reactive;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-
+import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.Test;
 
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
@@ -16,7 +13,6 @@
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
 import reactor.core.publisher.Flux;
-import reactor.test.TestSubscriber;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
index a949512c4d..7760a6e294 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
@@ -4,6 +4,7 @@
 
 import java.util.List;
 
+import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -20,7 +21,6 @@
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.test.TestSubscriber;
 
 public class TransactionReactiveCommandTest extends TransactionCommandTest {
 
diff --git a/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java b/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
index 0b385d117d..76fc7650a1 100644
--- a/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
+++ b/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
@@ -5,6 +5,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.assertj.core.api.Condition;
 import org.junit.Test;
 
@@ -12,8 +13,6 @@
 import com.lambdaworks.redis.AbstractRedisClientTest;
 import com.lambdaworks.redis.event.connection.*;
 
-import reactor.test.TestSubscriber;
-
 /**
  * @author Mark Paluch
  */
diff --git a/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java b/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
index f97d331f08..0135d080e5 100644
--- a/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
+++ b/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
@@ -4,12 +4,12 @@
 
 import java.util.concurrent.TimeUnit;
 
+import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import reactor.core.scheduler.Schedulers;
-import reactor.test.TestSubscriber;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java b/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
index 656213477a..5834dda498 100644
--- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
+++ b/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
@@ -9,6 +9,7 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 
+import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -29,7 +30,6 @@
 import reactor.core.Cancellation;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.test.TestSubscriber;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/reactive/TestSubscriber.java b/src/test/java/com/lambdaworks/redis/reactive/TestSubscriber.java
new file mode 100644
index 0000000000..f866135eca
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/reactive/TestSubscriber.java
@@ -0,0 +1,1128 @@
+package com.lambdaworks.redis.reactive;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import java.util.function.BooleanSupplier;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import reactor.core.Fuseable;
+import reactor.core.Receiver;
+import reactor.core.Trackable;
+import reactor.core.publisher.Operators;
+
+/**
+ * A Subscriber implementation that hosts assertion tests for its state and allows
+ * asynchronous cancellation and requesting.
+ *
+ * <p> To create a new instance of {@link TestSubscriber}, you have the choice between
+ * these static methods:
+ * <ul>
+ *     <li>{@link TestSubscriber#subscribe(Publisher)}: create a new {@link TestSubscriber},
+ *     subscribe to it with the specified {@link Publisher} and requests an unbounded
+ *     number of elements.</li>
+ *     <li>{@link TestSubscriber#subscribe(Publisher, long)}: create a new {@link TestSubscriber},
+ *     subscribe to it with the specified {@link Publisher} and requests {@code n} elements
+ *     (can be 0 if you want no initial demand).
+ *     <li>{@link TestSubscriber#create()}: create a new {@link TestSubscriber} and requests
+ *     an unbounded number of elements.</li>
+ *     <li>{@link TestSubscriber#create(long)}: create a new {@link TestSubscriber} and
+ *     requests {@code n} elements (can be 0 if you want no initial demand).
+ * </ul>
+ *
+ * <p>If you are testing asynchronous publishers, don't forget to use one of the
+ * {@code await*()} methods to wait for the data to assert.
+ *
+ * <p> You can extend this class but only the onNext, onError and onComplete can be overridden.
+ * You can call {@link #request(long)} and {@link #cancel()} from any thread or from within
+ * the overridable methods but you should avoid calling the assertXXX methods asynchronously.
+ *
+ * <p>Usage:
+ * <pre>
+ * {@code
+ * TestSubscriber
+ *   .subscribe(publisher)
+ *   .await()
+ *   .assertValues("ABC", "DEF");
+ * }
+ * </pre>
+ *
+ * @param <T> the value type.
+ *
+ * @author Sebastien Deleuze
+ * @author David Karnok
+ * @author Anatoly Kadyshev
+ * @author Stephane Maldini
+ * @author Brian Clozel
+ */
+public class TestSubscriber<T>
+        implements Subscriber<T>, Subscription, Trackable, Receiver {
+
+	/**
+	 * Default timeout for waiting next values to be received
+	 */
+	public static final Duration DEFAULT_VALUES_TIMEOUT = Duration.ofSeconds(3);
+
+	@SuppressWarnings("rawtypes")
+    private static final AtomicLongFieldUpdater<TestSubscriber> REQUESTED =
+			AtomicLongFieldUpdater.newUpdater(TestSubscriber.class, "requested");
+
+	@SuppressWarnings("rawtypes")
+	private static final AtomicReferenceFieldUpdater<TestSubscriber, List> NEXT_VALUES =
+			AtomicReferenceFieldUpdater.newUpdater(TestSubscriber.class, List.class,
+					"values");
+
+	@SuppressWarnings("rawtypes")
+    private static final AtomicReferenceFieldUpdater<TestSubscriber, Subscription> S =
+			AtomicReferenceFieldUpdater.newUpdater(TestSubscriber.class, Subscription.class, "s");
+
+
+	private final List<Throwable> errors = new LinkedList<>();
+
+	private final CountDownLatch cdl = new CountDownLatch(1);
+
+	volatile Subscription s;
+
+	volatile long requested;
+
+	volatile List<T> values = new LinkedList<>();
+
+	/**
+	 * The fusion mode to request.
+	 */
+	private int requestedFusionMode = -1;
+
+	/**
+	 * The established fusion mode.
+	 */
+	private volatile int establishedFusionMode = -1;
+
+	/**
+	 * The fuseable QueueSubscription in case a fusion mode was specified.
+	 */
+	private Fuseable.QueueSubscription<T> qs;
+
+	private int subscriptionCount = 0;
+
+	private int completionCount = 0;
+
+	private volatile long valueCount = 0L;
+
+	private volatile long nextValueAssertedCount = 0L;
+
+	private Duration valuesTimeout = DEFAULT_VALUES_TIMEOUT;
+
+	private boolean valuesStorage = true;
+
+//	 ==============================================================================================================
+//	 Static methods
+//	 ==============================================================================================================
+
+	/**
+	 * Blocking method that waits until {@code conditionSupplier} returns true, or if it
+	 * does not before the specified timeout, throws an {@link AssertionError} with the
+	 * specified error message supplier.
+	 *
+	 * @param timeout the timeout duration
+	 * @param errorMessageSupplier the error message supplier
+	 * @param conditionSupplier condition to break out of the wait loop
+	 *
+	 * @throws AssertionError
+	 */
+	public static void await(Duration timeout, Supplier<String> errorMessageSupplier,
+			BooleanSupplier conditionSupplier) {
+
+		Objects.requireNonNull(errorMessageSupplier);
+		Objects.requireNonNull(conditionSupplier);
+		Objects.requireNonNull(timeout);
+
+		long timeoutNs = timeout.toNanos();
+		long startTime = System.nanoTime();
+		do {
+			if (conditionSupplier.getAsBoolean()) {
+				return;
+			}
+			try {
+				Thread.sleep(100);
+			}
+			catch (InterruptedException e) {
+				Thread.currentThread().interrupt();
+				throw new RuntimeException(e);
+			}
+		}
+		while (System.nanoTime() - startTime < timeoutNs);
+		throw new AssertionError(errorMessageSupplier.get());
+	}
+
+	/**
+	 * Blocking method that waits until {@code conditionSupplier} returns true, or if it
+	 * does not before the specified timeout, throw an {@link AssertionError} with the
+	 * specified error message.
+	 *
+	 * @param timeout the timeout duration
+	 * @param errorMessage the error message
+	 * @param conditionSupplier condition to break out of the wait loop
+	 *
+	 * @throws AssertionError
+	 */
+	public static void await(Duration timeout,
+			final String errorMessage,
+			BooleanSupplier conditionSupplier) {
+		await(timeout, new Supplier<String>() {
+			@Override
+			public String get() {
+				return errorMessage;
+			}
+		}, conditionSupplier);
+	}
+
+	/**
+	 * Create a new {@link TestSubscriber} that requests an unbounded number of elements.
+	 * <p>Be sure at least a publisher has subscribed to it via {@link Publisher#subscribe(Subscriber)}
+	 * before use assert methods.
+	 * @see #subscribe(Publisher)
+	 * @param <T> the observed value type
+	 * @return a fresh TestSubscriber instance
+	 */
+	public static <T> TestSubscriber<T> create() {
+		return new TestSubscriber<>();
+	}
+
+	/**
+	 * Create a new {@link TestSubscriber} that requests initially {@code n} elements. You
+	 * can then manage the demand with {@link Subscription#request(long)}.
+	 * <p>Be sure at least a publisher has subscribed to it via {@link Publisher#subscribe(Subscriber)}
+	 * before use assert methods.
+	 * @param n Number of elements to request (can be 0 if you want no initial demand).
+	 * @see #subscribe(Publisher, long)
+     * @param <T> the observed value type
+     * @return a fresh TestSubscriber instance
+	 */
+	public static <T> TestSubscriber<T> create(long n) {
+		return new TestSubscriber<>(n);
+	}
+
+	/**
+	 * Create a new {@link TestSubscriber} that requests an unbounded number of elements,
+	 * and make the specified {@code publisher} subscribe to it.
+	 * @param publisher The publisher to subscribe with
+     * @param <T> the observed value type
+     * @return a fresh TestSubscriber instance
+	 */
+	public static <T> TestSubscriber<T> subscribe(Publisher<T> publisher) {
+		TestSubscriber<T> subscriber = new TestSubscriber<>();
+		publisher.subscribe(subscriber);
+		return subscriber;
+	}
+
+	/**
+	 * Create a new {@link TestSubscriber} that requests initially {@code n} elements,
+	 * and make the specified {@code publisher} subscribe to it. You can then manage the
+	 * demand with {@link Subscription#request(long)}.
+	 * @param publisher The publisher to subscribe with
+	 * @param n Number of elements to request (can be 0 if you want no initial demand).
+     * @param <T> the observed value type
+     * @return a fresh TestSubscriber instance
+	 */
+	public static <T> TestSubscriber<T> subscribe(Publisher<T> publisher, long n) {
+		TestSubscriber<T> subscriber = new TestSubscriber<>(n);
+		publisher.subscribe(subscriber);
+		return subscriber;
+	}
+
+//	 ==============================================================================================================
+//	 Private constructors
+//	 ==============================================================================================================
+
+	private TestSubscriber() {
+		 this(Long.MAX_VALUE);
+	}
+
+	private TestSubscriber(long n) {
+		if (n < 0) {
+			throw new IllegalArgumentException("initialRequest >= required but it was " + n);
+		}
+		REQUESTED.lazySet(this, n);
+	}
+
+//	 ==============================================================================================================
+//	 Configuration
+//	 ==============================================================================================================
+
+
+	/**
+	 * Enable or disabled the values storage. It is enabled by default, and can be disable
+	 * in order to be able to perform performance benchmarks or tests with a huge amount
+	 * values.
+	 * @param enabled enable value storage?
+	 * @return this
+	 */
+	public final TestSubscriber<T> configureValuesStorage(boolean enabled) {
+		this.valuesStorage = enabled;
+		return this;
+	}
+
+	/**
+	 * Configure the timeout in seconds for waiting next values to be received (3 seconds
+	 * by default).
+	 * @param timeout the new default value timeout duration
+	 * @return this
+	 */
+	public final TestSubscriber<T> configureValuesTimeout(Duration timeout) {
+		this.valuesTimeout = timeout;
+		return this;
+	}
+
+	/**
+	 * Returns the established fusion mode or -1 if it was not enabled
+	 *
+	 * @return the fusion mode, see Fuseable constants
+	 */
+	public final int establishedFusionMode() {
+		return establishedFusionMode;
+	}
+
+//	 ==============================================================================================================
+//	 Assertions
+//	 ==============================================================================================================
+
+	/**
+	 * Assert a complete successfully signal has been received.
+	 * @return this
+	 */
+	public final TestSubscriber<T> assertComplete() {
+		int c = completionCount;
+		if (c == 0) {
+			throw new AssertionError("Not completed", null);
+		}
+		if (c > 1) {
+			throw new AssertionError("Multiple completions: " + c, null);
+		}
+		return this;
+	}
+
+	/**
+	 * Assert the specified values have been received. Values storage should be enabled to
+	 * use this method.
+	 * @param expectedValues the values to assert
+	 * @see #configureValuesStorage(boolean)
+	 * @return this
+	 */
+	public final TestSubscriber<T> assertContainValues(Set<? extends T> expectedValues) {
+		if (!valuesStorage) {
+			throw new IllegalStateException(
+					"Using assertNoValues() requires enabling values storage");
+		}
+		if (expectedValues.size() > values.size()) {
+			throw new AssertionError("Actual contains fewer elements" + values, null);
+		}
+
+		Iterator<? extends T> expected = expectedValues.iterator();
+
+		for (; ; ) {
+			boolean n2 = expected.hasNext();
+			if (n2) {
+				T t2 = expected.next();
+				if (!values.contains(t2)) {
+					throw new AssertionError("The element is not contained in the " +
+							"received resuls" +
+							" = " + valueAndClass(t2), null);
+				}
+			}
+			else{
+				break;
+			}
+		}
+		return this;
+	}
+
+	/**
+	 * Assert an error signal has been received.
+	 * @return this
+	 */
+	public final TestSubscriber<T> assertError() {
+		int s = errors.size();
+		if (s == 0) {
+			throw new AssertionError("No error", null);
+		}
+		if (s > 1) {
+			throw new AssertionError("Multiple errors: " + s, null);
+		}
+		return this;
+	}
+
+	/**
+	 * Assert an error signal has been received.
+	 * @param clazz The class of the exception contained in the error signal
+	 * @return this
+	 */
+	public final TestSubscriber<T> assertError(Class<? extends Throwable> clazz) {
+		 int s = errors.size();
+		if (s == 0) {
+			throw new AssertionError("No error", null);
+		}
+		if (s == 1) {
+			Throwable e = errors.get(0);
+			if (!clazz.isInstance(e)) {
+				throw new AssertionError("Error class incompatible: expected = " +
+						clazz + ", actual = " + e, null);
+			}
+		}
+		if (s > 1) {
+			throw new AssertionError("Multiple errors: " + s, null);
+		}
+		return this;
+	}
+
+	public final TestSubscriber<T> assertErrorMessage(String message) {
+		int s = errors.size();
+		if (s == 0) {
+			assertionError("No error", null);
+		}
+		if (s == 1) {
+			if (!Objects.equals(message,
+					errors.get(0)
+					      .getMessage())) {
+				assertionError("Error class incompatible: expected = \"" + message +
+						"\", actual = \"" + errors.get(0).getMessage() + "\"", null);
+			}
+		}
+		if (s > 1) {
+			assertionError("Multiple errors: " + s, null);
+		}
+
+		return this;
+	}
+
+	/**
+	 * Assert an error signal has been received.
+	 * @param expectation A method that can verify the exception contained in the error signal
+	 * and throw an exception (like an {@link AssertionError}) if the exception is not valid.
+	 * @return this
+	 */
+	public final TestSubscriber<T> assertErrorWith(Consumer<? super Throwable> expectation) {
+		int s = errors.size();
+		if (s == 0) {
+			throw new AssertionError("No error", null);
+		}
+		if (s == 1) {
+			expectation.accept(errors.get(0));
+		}
+		if (s > 1) {
+			throw new AssertionError("Multiple errors: " + s, null);
+		}
+		return this;
+	}
+
+	/**
+	 * Assert that the upstream was a Fuseable source.
+	 *
+	 * @return this
+	 */
+	public final TestSubscriber<T> assertFuseableSource() {
+		if (qs == null) {
+			throw new AssertionError("Upstream was not Fuseable");
+		}
+		return this;
+	}
+
+	/**
+	 * Assert that the fusion mode was granted.
+	 *
+	 * @return this
+	 */
+	public final TestSubscriber<T> assertFusionEnabled() {
+		if (establishedFusionMode != Fuseable.SYNC && establishedFusionMode != Fuseable.ASYNC) {
+			throw new AssertionError("Fusion was not enabled");
+		}
+		return this;
+	}
+
+	public final TestSubscriber<T> assertFusionMode(int expectedMode) {
+		if (establishedFusionMode != expectedMode) {
+			throw new AssertionError("Wrong fusion mode: expected: " + fusionModeName(
+					expectedMode) + ", actual: " + fusionModeName(establishedFusionMode));
+		}
+		return this;
+	}
+
+	/**
+	 * Assert that the fusion mode was granted.
+	 *
+	 * @return this
+	 */
+	public final TestSubscriber<T> assertFusionRejected() {
+		if (establishedFusionMode != Fuseable.NONE) {
+			throw new AssertionError("Fusion was granted");
+		}
+		return this;
+	}
+
+	/**
+	 * Assert no error signal has been received.
+     * @return this
+	 */
+	public final TestSubscriber<T> assertNoError() {
+		int s = errors.size();
+		if (s == 1) {
+			Throwable e = errors.get(0);
+			String valueAndClass = e == null ? null : e + " (" + e.getClass().getSimpleName() + ")";
+			throw new AssertionError("Error present: " + valueAndClass, null);
+		}
+		if (s > 1) {
+			throw new AssertionError("Multiple errors: " + s, null);
+		}
+		return this;
+	}
+
+	/**
+	 * Assert no values have been received.
+	 *
+	 * @return this
+	 */
+	public final TestSubscriber<T> assertNoValues() {
+		if (valueCount != 0) {
+			throw new AssertionError("No values expected but received: [length = " + values.size() + "] " + values,
+					null);
+		}
+		return this;
+	}
+
+	/**
+	 * Assert that the upstream was not a Fuseable source.
+	 * @return this
+	 */
+	public final TestSubscriber<T> assertNonFuseableSource() {
+		if (qs != null) {
+			throw new AssertionError("Upstream was Fuseable");
+		}
+		return this;
+	}
+
+	/**
+	 * Assert no complete successfully signal has been received.
+	 * @return this
+	 */
+	public final TestSubscriber<T> assertNotComplete() {
+		int c = completionCount;
+		if (c == 1) {
+			throw new AssertionError("Completed", null);
+		}
+		if (c > 1) {
+			throw new AssertionError("Multiple completions: " + c, null);
+		}
+		return this;
+	}
+
+	/**
+	 * Assert no subscription occurred.
+	 *
+	 * @return this
+	 */
+	public final TestSubscriber<T> assertNotSubscribed() {
+		int s = subscriptionCount;
+
+		if (s == 1) {
+			throw new AssertionError("OnSubscribe called once", null);
+		}
+		if (s > 1) {
+			throw new AssertionError("OnSubscribe called multiple times: " + s, null);
+		}
+
+		return this;
+	}
+
+	/**
+	 * Assert no complete successfully or error signal has been received.
+	 * @return this
+	 */
+	public final TestSubscriber<T> assertNotTerminated() {
+		if (cdl.getCount() == 0) {
+			throw new AssertionError("Terminated", null);
+		}
+		return this;
+	}
+
+	/**
+	 * Assert subscription occurred (once).
+	 * @return this
+	 */
+	public final TestSubscriber<T> assertSubscribed() {
+		int s = subscriptionCount;
+
+		if (s == 0) {
+			throw new AssertionError("OnSubscribe not called", null);
+		}
+		if (s > 1) {
+			throw new AssertionError("OnSubscribe called multiple times: " + s, null);
+		}
+
+		return this;
+	}
+
+	/**
+	 * Assert either complete successfully or error signal has been received.
+	 * @return this
+	 */
+	public final TestSubscriber<T> assertTerminated() {
+		if (cdl.getCount() != 0) {
+			throw new AssertionError("Not terminated", null);
+		}
+		return this;
+	}
+
+	/**
+	 * Assert {@code n} values has been received.
+	 *
+	 * @param n the expected value count
+	 *
+	 * @return this
+	 */
+	public final TestSubscriber<T> assertValueCount(long n) {
+		if (valueCount != n) {
+			throw new AssertionError("Different value count: expected = " + n + ", actual = " + valueCount,
+					null);
+		}
+		return this;
+	}
+
+	/**
+	 * Assert the specified values have been received in the same order read by the
+	 * passed {@link Iterable}. Values storage
+	 * should be enabled to
+	 * use this method.
+	 * @param expectedSequence the values to assert
+	 * @see #configureValuesStorage(boolean)
+     * @return this
+	 */
+	public final TestSubscriber<T> assertValueSequence(Iterable<? extends T> expectedSequence) {
+		if (!valuesStorage) {
+			throw new IllegalStateException("Using assertNoValues() requires enabling values storage");
+		}
+		Iterator<T> actual = values.iterator();
+		Iterator<? extends T> expected = expectedSequence.iterator();
+		int i = 0;
+		for (; ; ) {
+			boolean n1 = actual.hasNext();
+			boolean n2 = expected.hasNext();
+			if (n1 && n2) {
+				T t1 = actual.next();
+				T t2 = expected.next();
+				if (!Objects.equals(t1, t2)) {
+					throw new AssertionError("The element with index " + i + " does not match: expected = " + valueAndClass(t2) + ", actual = "
+					  + valueAndClass(
+					  t1), null);
+				}
+				i++;
+			} else if (n1 && !n2) {
+				throw new AssertionError("Actual contains more elements" + values, null);
+			} else if (!n1 && n2) {
+				throw new AssertionError("Actual contains fewer elements: " + values, null);
+			} else {
+				break;
+			}
+		}
+		return this;
+	}
+
+	/**
+	 * Assert the specified values have been received in the declared order. Values
+	 * storage should be enabled to use this method.
+	 *
+	 * @param expectedValues the values to assert
+	 *
+	 * @return this
+	 *
+	 * @see #configureValuesStorage(boolean)
+	 */
+	@SafeVarargs
+	public final TestSubscriber<T> assertValues(T... expectedValues) {
+		return assertValueSequence(Arrays.asList(expectedValues));
+	}
+
+	/**
+	 * Assert the specified values have been received in the declared order. Values
+	 * storage should be enabled to use this method.
+	 *
+	 * @param expectations One or more methods that can verify the values and throw a
+	 * exception (like an {@link AssertionError}) if the value is not valid.
+	 *
+	 * @return this
+	 *
+	 * @see #configureValuesStorage(boolean)
+	 */
+	@SafeVarargs
+	public final TestSubscriber<T> assertValuesWith(Consumer<T>... expectations) {
+		if (!valuesStorage) {
+			throw new IllegalStateException(
+					"Using assertNoValues() requires enabling values storage");
+		}
+		final int expectedValueCount = expectations.length;
+		if (expectedValueCount != values.size()) {
+			throw new AssertionError("Different value count: expected = " + expectedValueCount + ", actual = " + valueCount, null);
+		}
+		for (int i = 0; i < expectedValueCount; i++) {
+			Consumer<T> consumer = expectations[i];
+			T actualValue = values.get(i);
+			consumer.accept(actualValue);
+		}
+		return this;
+	}
+
+//	 ==============================================================================================================
+//	 Await methods
+//	 ==============================================================================================================
+
+	/**
+	 * Blocking method that waits until a complete successfully or error signal is received.
+     * @return this
+	 */
+	public final TestSubscriber<T> await() {
+		if (cdl.getCount() == 0) {
+			return this;
+		}
+		try {
+			cdl.await();
+		} catch (InterruptedException ex) {
+			throw new AssertionError("Wait interrupted", ex);
+		}
+		return this;
+	}
+
+	/**
+	 * Blocking method that waits until a complete successfully or error signal is received
+	 * or until a timeout occurs.
+	 * @param timeout The timeout value
+     * @return this
+	 */
+	public final TestSubscriber<T> await(Duration timeout) {
+		if (cdl.getCount() == 0) {
+			return this;
+		}
+		try {
+			if (!cdl.await(timeout.toMillis(), TimeUnit.MILLISECONDS)) {
+				throw new AssertionError("No complete or error signal before timeout");
+			}
+			return this;
+		}
+		catch (InterruptedException ex) {
+			throw new AssertionError("Wait interrupted", ex);
+		}
+	}
+
+	/**
+	 * Blocking method that waits until {@code n} next values have been received.
+	 *
+	 * @param n the value count to assert
+	 *
+	 * @return this
+	 */
+	public final TestSubscriber<T> awaitAndAssertNextValueCount(final long n) {
+		await(valuesTimeout, new Supplier<String>() {
+			@Override
+			public String get() {
+				return String.format("%d out of %d next values received within %d",
+						valueCount - nextValueAssertedCount,
+						n,
+						valuesTimeout.toMillis());
+			}
+		}, () -> valueCount == (nextValueAssertedCount + n));
+		nextValueAssertedCount += n;
+		return this;
+	}
+
+	/**
+	 * Blocking method that waits until {@code n} next values have been received (n is the
+	 * number of values provided) to assert them.
+	 *
+	 * @param values the values to assert
+	 *
+	 * @return this
+	 */
+	@SafeVarargs
+	@SuppressWarnings("unchecked")
+	public final TestSubscriber<T> awaitAndAssertNextValues(T... values) {
+		final int expectedNum = values.length;
+		final List<Consumer<T>> expectations = new ArrayList<>();
+		for (int i = 0; i < expectedNum; i++) {
+			final T expectedValue = values[i];
+			expectations.add(actualValue -> {
+				if (!actualValue.equals(expectedValue)) {
+					throw new AssertionError(String.format(
+							"Expected Next signal: %s, but got: %s",
+							expectedValue,
+							actualValue));
+				}
+			});
+		}
+		awaitAndAssertNextValuesWith(expectations.toArray((Consumer<T>[]) new Consumer[0]));
+		return this;
+	}
+
+	/**
+	 * Blocking method that waits until {@code n} next values have been received
+	 * (n is the number of expectations provided) to assert them.
+	 * @param expectations One or more methods that can verify the values and throw a
+	 * exception (like an {@link AssertionError}) if the value is not valid.
+     * @return this
+	 */
+	@SafeVarargs
+	public final TestSubscriber<T> awaitAndAssertNextValuesWith(Consumer<T>... expectations) {
+		valuesStorage = true;
+		final int expectedValueCount = expectations.length;
+		await(valuesTimeout, () -> {
+			return String.format("%d out of %d next values received within %d ms",
+					valueCount - nextValueAssertedCount,
+					expectedValueCount,
+					valuesTimeout.toMillis());
+		}, () -> valueCount >= (nextValueAssertedCount + expectedValueCount));
+		List<T> nextValuesSnapshot;
+		List<T> empty = new ArrayList<>();
+		for(;;){
+			nextValuesSnapshot = values;
+			if(NEXT_VALUES.compareAndSet(this, values, empty)){
+				break;
+			}
+		}
+		if (nextValuesSnapshot.size() < expectedValueCount) {
+			throw new AssertionError(String.format("Expected %d number of signals but received %d",
+					expectedValueCount,
+					nextValuesSnapshot.size()));
+		}
+		for (int i = 0; i < expectedValueCount; i++) {
+			Consumer<T> consumer = expectations[i];
+			T actualValue = nextValuesSnapshot.get(i);
+			consumer.accept(actualValue);
+		}
+		nextValueAssertedCount += expectedValueCount;
+		return this;
+	}
+
+//	 ==============================================================================================================
+//	 Overrides
+//	 ==============================================================================================================
+
+	@Override
+	public void cancel() {
+		Subscription a = s;
+		if (a != Operators.cancelledSubscription()) {
+			a = S.getAndSet(this, Operators.cancelledSubscription());
+			if (a != null && a != Operators.cancelledSubscription()) {
+				a.cancel();
+			}
+		}
+	}
+
+	@Override
+	public final boolean isCancelled() {
+		return s == Operators.cancelledSubscription();
+	}
+
+	@Override
+	public final boolean isStarted() {
+		return s != null;
+	}
+
+	@Override
+	public final boolean isTerminated() {
+		return isCancelled();
+	}
+
+	@Override
+	public void onComplete() {
+		completionCount++;
+		cdl.countDown();
+	}
+
+	@Override
+	public void onError(Throwable t) {
+		errors.add(t);
+		cdl.countDown();
+	}
+
+	@Override
+	public void onNext(T t) {
+		if (establishedFusionMode == Fuseable.ASYNC) {
+			for (; ; ) {
+				t = qs.poll();
+				if (t == null) {
+					break;
+				}
+				valueCount++;
+				if (valuesStorage) {
+					List<T> nextValuesSnapshot;
+					for (; ; ) {
+						nextValuesSnapshot = values;
+						nextValuesSnapshot.add(t);
+						if (NEXT_VALUES.compareAndSet(this,
+								nextValuesSnapshot,
+								nextValuesSnapshot)) {
+							break;
+						}
+					}
+				}
+			}
+		}
+		else {
+			valueCount++;
+			if (valuesStorage) {
+				List<T> nextValuesSnapshot;
+				for (; ; ) {
+					nextValuesSnapshot = values;
+					nextValuesSnapshot.add(t);
+					if (NEXT_VALUES.compareAndSet(this,
+							nextValuesSnapshot,
+							nextValuesSnapshot)) {
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public void onSubscribe(Subscription s) {
+		subscriptionCount++;
+		int requestMode = requestedFusionMode;
+		if (requestMode >= 0) {
+			if (!setWithoutRequesting(s)) {
+				if (!isCancelled()) {
+					errors.add(new IllegalStateException("Subscription already set: " +
+							subscriptionCount));
+				}
+			} else {
+				if (s instanceof Fuseable.QueueSubscription) {
+					this.qs = (Fuseable.QueueSubscription<T>)s;
+
+					int m = qs.requestFusion(requestMode);
+					establishedFusionMode = m;
+
+					if (m == Fuseable.SYNC) {
+						for (;;) {
+							T v = qs.poll();
+							if (v == null) {
+								onComplete();
+								break;
+							}
+
+							onNext(v);
+						}
+					}
+					else {
+						requestDeferred();
+					}
+				}
+				else {
+					requestDeferred();
+				}
+			}
+		} else {
+			if (!set(s)) {
+				if (!isCancelled()) {
+					errors.add(new IllegalStateException("Subscription already set: " +
+							subscriptionCount));
+				}
+			}
+		}
+	}
+
+	@Override
+	public void request(long n) {
+		if (Operators.validate(n)) {
+			if (establishedFusionMode != Fuseable.SYNC) {
+				normalRequest(n);
+			}
+		}
+	}
+
+	@Override
+	public final long requestedFromDownstream() {
+		return requested;
+	}
+
+	/**
+	 * Setup what fusion mode should be requested from the incomining
+	 * Subscription if it happens to be QueueSubscription
+	 * @param requestMode the mode to request, see Fuseable constants
+	 * @return this
+	 */
+	public final TestSubscriber<T> requestedFusionMode(int requestMode) {
+		this.requestedFusionMode = requestMode;
+		return this;
+	}
+
+	@Override
+	public Subscription upstream() {
+		return s;
+	}
+
+
+//	 ==============================================================================================================
+//	 Non public methods
+//	 ==============================================================================================================
+
+	protected final void normalRequest(long n) {
+		Subscription a = s;
+		if (a != null) {
+			a.request(n);
+		} else {
+			Operators.addAndGet(REQUESTED, this, n);
+
+			a = s;
+
+			if (a != null) {
+				long r = REQUESTED.getAndSet(this, 0L);
+
+				if (r != 0L) {
+					a.request(r);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Requests the deferred amount if not zero.
+	 */
+	protected final void requestDeferred() {
+		long r = REQUESTED.getAndSet(this, 0L);
+
+		if (r != 0L) {
+			s.request(r);
+		}
+	}
+
+	/**
+	 * Atomically sets the single subscription and requests the missed amount from it.
+	 *
+	 * @param s
+	 * @return false if this arbiter is cancelled or there was a subscription already set
+	 */
+	protected final boolean set(Subscription s) {
+		Objects.requireNonNull(s, "s");
+		Subscription a = this.s;
+		if (a == Operators.cancelledSubscription()) {
+			s.cancel();
+			return false;
+		}
+		if (a != null) {
+			s.cancel();
+			Operators.reportSubscriptionSet();
+			return false;
+		}
+
+		if (S.compareAndSet(this, null, s)) {
+
+			long r = REQUESTED.getAndSet(this, 0L);
+
+			if (r != 0L) {
+				s.request(r);
+			}
+
+			return true;
+		}
+
+		a = this.s;
+
+		if (a != Operators.cancelledSubscription()) {
+			s.cancel();
+			return false;
+		}
+
+		Operators.reportSubscriptionSet();
+		return false;
+	}
+
+	/**
+	 * Sets the Subscription once but does not request anything.
+	 * @param s the Subscription to set
+	 * @return true if successful, false if the current subscription is not null
+	 */
+	protected final boolean setWithoutRequesting(Subscription s) {
+		Objects.requireNonNull(s, "s");
+		for (;;) {
+			Subscription a = this.s;
+			if (a == Operators.cancelledSubscription()) {
+				s.cancel();
+				return false;
+			}
+			if (a != null) {
+				s.cancel();
+				Operators.reportSubscriptionSet();
+				return false;
+			}
+
+			if (S.compareAndSet(this, null, s)) {
+				return true;
+			}
+		}
+	}
+
+	/**
+	 * Prepares and throws an AssertionError exception based on the message, cause, the
+	 * active state and the potential errors so far.
+	 *
+	 * @param message the message
+	 * @param cause the optional Throwable cause
+	 *
+	 * @throws AssertionError as expected
+	 */
+	protected final void assertionError(String message, Throwable cause) {
+		StringBuilder b = new StringBuilder();
+
+		if (cdl.getCount() != 0) {
+			b.append("(active) ");
+		}
+		b.append(message);
+
+		List<Throwable> err = errors;
+		if (!err.isEmpty()) {
+			b.append(" (+ ")
+			 .append(err.size())
+			 .append(" errors)");
+		}
+		AssertionError e = new AssertionError(b.toString(), cause);
+
+		for (Throwable t : err) {
+			e.addSuppressed(t);
+		}
+
+		throw e;
+	}
+
+	protected final String fusionModeName(int mode) {
+		switch (mode) {
+			case -1:
+				return "Disabled";
+			case Fuseable.NONE:
+				return "None";
+			case Fuseable.SYNC:
+				return "Sync";
+			case Fuseable.ASYNC:
+				return "Async";
+			default:
+				return "Unknown(" + mode + ")";
+		}
+	}
+
+	protected final String valueAndClass(Object o) {
+		if (o == null) {
+			return null;
+		}
+		return o + " (" + o.getClass().getSimpleName() + ")";
+	}
+
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java b/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
index a6fbeb5d76..05ed927233 100644
--- a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
@@ -8,6 +8,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.Test;
 
 import com.lambdaworks.redis.event.Event;
@@ -18,7 +19,6 @@
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.Future;
-import reactor.test.TestSubscriber;
 
 /**
  * @author Mark Paluch

From 06e49bb5d0fcc6b0f744e08666f3ab5358498b5c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 3 Sep 2016 18:15:33 +0200
Subject: [PATCH 017/808] Encapsulate fields in GeoCoordinates and GeoWithin.

---
 .../com/lambdaworks/redis/GeoCoordinates.java | 34 +++++--
 .../java/com/lambdaworks/redis/GeoWithin.java | 49 ++++++++++-
 .../redis/extensibility/LettuceGeoDemo.java   | 10 +--
 .../com/lambdaworks/redis/GeoModelTest.java   | 11 ---
 .../redis/commands/GeoCommandTest.java        | 88 +++++++++----------
 .../reactive/GeoReactiveCommandTest.java      |  2 +-
 6 files changed, 123 insertions(+), 71 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/GeoCoordinates.java b/src/main/java/com/lambdaworks/redis/GeoCoordinates.java
index d5bbe855c7..4be9bc549a 100644
--- a/src/main/java/com/lambdaworks/redis/GeoCoordinates.java
+++ b/src/main/java/com/lambdaworks/redis/GeoCoordinates.java
@@ -1,6 +1,6 @@
 package com.lambdaworks.redis;
 
-import com.lambdaworks.redis.output.DoubleOutput;
+import com.lambdaworks.redis.internal.LettuceAssert;
 
 /**
  * A tuple consisting of numerical geo data points to describe geo coordinates.
@@ -9,15 +9,39 @@
  */
 public class GeoCoordinates {
 
-    public final Number x;
-    public final Number y;
+    private final Number x;
+    private final Number y;
 
+    /**
+     * Creates new {@link GeoCoordinates}.
+     * @param x the longitude, must not be {@literal null}.
+     * @param y the latitude, must not be {@literal null}.
+     */
     public GeoCoordinates(Number x, Number y) {
 
+        LettuceAssert.notNull(x, "X must not be null");
+        LettuceAssert.notNull(y, "Y must not be null");
+
         this.x = x;
         this.y = y;
     }
 
+    /**
+     *
+     * @return the longitude.
+     */
+    public Number getX() {
+        return x;
+    }
+
+    /**
+     *
+     * @return the latitude.
+     */
+    public Number getY() {
+        return y;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -41,8 +65,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-
-        return String.format("(%s, %s)", x, y);
+        return String.format("(%s, %s)", getX(), getY());
     }
-
 }
diff --git a/src/main/java/com/lambdaworks/redis/GeoWithin.java b/src/main/java/com/lambdaworks/redis/GeoWithin.java
index df546ab179..6d1c765f02 100644
--- a/src/main/java/com/lambdaworks/redis/GeoWithin.java
+++ b/src/main/java/com/lambdaworks/redis/GeoWithin.java
@@ -14,18 +14,59 @@
  */
 public class GeoWithin<V> {
 
-    public final V member;
-    public final Double distance;
-    public final Long geohash;
-    public final GeoCoordinates coordinates;
+    private final V member;
+    private final Double distance;
+    private final Long geohash;
+    private final GeoCoordinates coordinates;
 
+    /**
+     * Creates a new {@link GeoWithin}.
+     *
+     * @param member the member.
+     * @param distance the distance, may be {@literal null}.
+     * @param geohash the geohash, may be {@literal null}.
+     * @param coordinates the coordinates, may be {@literal null}.
+     */
     public GeoWithin(V member, Double distance, Long geohash, GeoCoordinates coordinates) {
+
         this.member = member;
         this.distance = distance;
         this.geohash = geohash;
         this.coordinates = coordinates;
     }
 
+    /**
+     *
+     * @return the member within the Geo set.
+     */
+    public V getMember() {
+        return member;
+    }
+
+    /**
+     *
+     * @return distance if requested otherwise {@literal null}.
+     */
+    public Double getDistance() {
+        return distance;
+    }
+
+    /**
+     *
+     * @return geohash if requested otherwise {@literal null}.
+     */
+    public Long getGeohash() {
+        return geohash;
+    }
+
+    /**
+     *
+     * @return coordinates if requested otherwise {@literal null}.
+     */
+    public GeoCoordinates getCoordinates() {
+        return coordinates;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o)
diff --git a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
index 770b244fd8..cc15040672 100644
--- a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
+++ b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
@@ -35,14 +35,14 @@ public static void main(String[] args) {
         // ordered descending by distance and containing distance/coordinates
         GeoWithin<String> weinheim = georadiusWithArgs.get(0);
 
-        System.out.println("Member: " + weinheim.member);
-        System.out.println("Geo hash: " + weinheim.geohash);
-        System.out.println("Distance: " + weinheim.distance);
-        System.out.println("Coordinates: " + weinheim.coordinates.x + "/" + weinheim.coordinates.y);
+        System.out.println("Member: " + weinheim.getMember());
+        System.out.println("Geo hash: " + weinheim.getGeohash());
+        System.out.println("Distance: " + weinheim.getDistance());
+        System.out.println("Coordinates: " + weinheim.getCoordinates().getX() + "/" + weinheim.getCoordinates().getY());
 
         List<GeoCoordinates> geopos = redis.geopos(key, "Weinheim", "Train station");
         GeoCoordinates weinheimGeopos = geopos.get(0);
-        System.out.println("Coordinates: " + weinheimGeopos.x + "/" + weinheimGeopos.y);
+        System.out.println("Coordinates: " + weinheimGeopos.getX() + "/" + weinheimGeopos.getY());
 
         redis.getStatefulConnection().close();
         redisClient.shutdown();
diff --git a/src/test/java/com/lambdaworks/redis/GeoModelTest.java b/src/test/java/com/lambdaworks/redis/GeoModelTest.java
index a19ec88e32..a6168e7ad9 100644
--- a/src/test/java/com/lambdaworks/redis/GeoModelTest.java
+++ b/src/test/java/com/lambdaworks/redis/GeoModelTest.java
@@ -83,15 +83,4 @@ public void geoCoordinatesSlightlyDifferent() throws Exception {
         assertThat(sut.toString()).isNotEqualTo(slightlyDifferent.toString());
 
     }
-
-    @Test
-    public void geoCoordinatesEmpty() throws Exception {
-
-        GeoCoordinates sut = new GeoCoordinates(null, null);
-        GeoCoordinates equalsToSut = new GeoCoordinates(null, null);
-
-        assertThat(sut).isEqualTo(equalsToSut);
-        assertThat(sut.hashCode()).isEqualTo(equalsToSut.hashCode());
-    }
-
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
index 429f08a39f..01da41a338 100644
--- a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
@@ -125,7 +125,7 @@ public void geopos() throws Exception {
         List<GeoCoordinates> geopos = redis.geopos(key, "Weinheim", "foobar", "Bahn");
 
         assertThat(geopos).hasSize(3);
-        assertThat(geopos.get(0).x.doubleValue()).isEqualTo(8.6638, offset(0.001));
+        assertThat(geopos.get(0).getX().doubleValue()).isEqualTo(8.6638, offset(0.001));
         assertThat(geopos.get(1)).isNull();
         assertThat(geopos.get(2)).isNotNull();
     }
@@ -141,7 +141,7 @@ public void geoposWithTransaction() throws Exception {
         List<GeoCoordinates> geopos = redis.exec().get(1);
 
         assertThat(geopos).hasSize(3);
-        assertThat(geopos.get(0).x.doubleValue()).isEqualTo(8.6638, offset(0.001));
+        assertThat(geopos.get(0).getX().doubleValue()).isEqualTo(8.6638, offset(0.001));
         assertThat(geopos.get(1)).isNull();
         assertThat(geopos.get(2)).isNotNull();
     }
@@ -158,23 +158,23 @@ public void georadiusWithArgs() throws Exception {
 
         GeoWithin<String> weinheim = result.get(0);
 
-        assertThat(weinheim.member).isEqualTo("Weinheim");
-        assertThat(weinheim.geohash).isEqualTo(3666615932941099L);
+        assertThat(weinheim.getMember()).isEqualTo("Weinheim");
+        assertThat(weinheim.getGeohash()).isEqualTo(3666615932941099L);
 
-        assertThat(weinheim.distance).isEqualTo(2.7882, offset(0.5));
-        assertThat(weinheim.coordinates.x.doubleValue()).isEqualTo(8.663875, offset(0.5));
-        assertThat(weinheim.coordinates.y.doubleValue()).isEqualTo(49.52825, offset(0.5));
+        assertThat(weinheim.getDistance()).isEqualTo(2.7882, offset(0.5));
+        assertThat(weinheim.getCoordinates().getX().doubleValue()).isEqualTo(8.663875, offset(0.5));
+        assertThat(weinheim.getCoordinates().getY().doubleValue()).isEqualTo(49.52825, offset(0.5));
 
         result = redis.georadius(key, 8.665351, 49.553302, 1, GeoArgs.Unit.km, new GeoArgs());
         assertThat(result).hasSize(1);
 
         GeoWithin<String> bahn = result.get(0);
 
-        assertThat(bahn.member).isEqualTo("Bahn");
-        assertThat(bahn.geohash).isNull();
+        assertThat(bahn.getMember()).isEqualTo("Bahn");
+        assertThat(bahn.getGeohash()).isNull();
 
-        assertThat(bahn.distance).isNull();
-        assertThat(bahn.coordinates).isNull();
+        assertThat(bahn.getDistance()).isNull();
+        assertThat(bahn.getCoordinates()).isNull();
     }
 
     @Test
@@ -195,23 +195,23 @@ public void georadiusWithArgsAndTransaction() throws Exception {
 
         GeoWithin<String> weinheim = result.get(0);
 
-        assertThat(weinheim.member).isEqualTo("Weinheim");
-        assertThat(weinheim.geohash).isEqualTo(3666615932941099L);
+        assertThat(weinheim.getMember()).isEqualTo("Weinheim");
+        assertThat(weinheim.getGeohash()).isEqualTo(3666615932941099L);
 
-        assertThat(weinheim.distance).isEqualTo(2.7882, offset(0.5));
-        assertThat(weinheim.coordinates.x.doubleValue()).isEqualTo(8.663875, offset(0.5));
-        assertThat(weinheim.coordinates.y.doubleValue()).isEqualTo(49.52825, offset(0.5));
+        assertThat(weinheim.getDistance()).isEqualTo(2.7882, offset(0.5));
+        assertThat(weinheim.getCoordinates().getX().doubleValue()).isEqualTo(8.663875, offset(0.5));
+        assertThat(weinheim.getCoordinates().getY().doubleValue()).isEqualTo(49.52825, offset(0.5));
 
         result = redis.georadius(key, 8.665351, 49.553302, 1, GeoArgs.Unit.km, new GeoArgs());
         assertThat(result).hasSize(1);
 
         GeoWithin<String> bahn = result.get(0);
 
-        assertThat(bahn.member).isEqualTo("Bahn");
-        assertThat(bahn.geohash).isNull();
+        assertThat(bahn.getMember()).isEqualTo("Bahn");
+        assertThat(bahn.getGeohash()).isNull();
 
-        assertThat(bahn.distance).isNull();
-        assertThat(bahn.coordinates).isNull();
+        assertThat(bahn.getDistance()).isNull();
+        assertThat(bahn.getCoordinates()).isNull();
     }
 
     @Test
@@ -360,30 +360,30 @@ public void georadiusbymemberWithArgs() throws Exception {
         assertThat(withDistanceAndCoordinates).hasSize(2);
 
         GeoWithin<String> weinheim = withDistanceAndCoordinates.get(0);
-        assertThat(weinheim.member).isEqualTo("Weinheim");
-        assertThat(weinheim.geohash).isNull();
-        assertThat(weinheim.distance).isNotNull();
-        assertThat(weinheim.coordinates).isNotNull();
+        assertThat(weinheim.getMember()).isEqualTo("Weinheim");
+        assertThat(weinheim.getGeohash()).isNull();
+        assertThat(weinheim.getDistance()).isNotNull();
+        assertThat(weinheim.getCoordinates()).isNotNull();
 
         List<GeoWithin<String>> withDistanceAndHash = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km,
                 new GeoArgs().withDistance().withHash().desc());
         assertThat(withDistanceAndHash).hasSize(2);
 
         GeoWithin<String> weinheimDistanceHash = withDistanceAndHash.get(0);
-        assertThat(weinheimDistanceHash.member).isEqualTo("Weinheim");
-        assertThat(weinheimDistanceHash.geohash).isNotNull();
-        assertThat(weinheimDistanceHash.distance).isNotNull();
-        assertThat(weinheimDistanceHash.coordinates).isNull();
+        assertThat(weinheimDistanceHash.getMember()).isEqualTo("Weinheim");
+        assertThat(weinheimDistanceHash.getGeohash()).isNotNull();
+        assertThat(weinheimDistanceHash.getDistance()).isNotNull();
+        assertThat(weinheimDistanceHash.getCoordinates()).isNull();
 
         List<GeoWithin<String>> withCoordinates = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km,
                 new GeoArgs().withCoordinates().desc());
         assertThat(withCoordinates).hasSize(2);
 
         GeoWithin<String> weinheimCoordinates = withCoordinates.get(0);
-        assertThat(weinheimCoordinates.member).isEqualTo("Weinheim");
-        assertThat(weinheimCoordinates.geohash).isNull();
-        assertThat(weinheimCoordinates.distance).isNull();
-        assertThat(weinheimCoordinates.coordinates).isNotNull();
+        assertThat(weinheimCoordinates.getMember()).isEqualTo("Weinheim");
+        assertThat(weinheimCoordinates.getGeohash()).isNull();
+        assertThat(weinheimCoordinates.getDistance()).isNull();
+        assertThat(weinheimCoordinates.getCoordinates()).isNotNull();
     }
 
     @Test
@@ -407,28 +407,28 @@ public void georadiusbymemberWithArgsAndTransaction() throws Exception {
         assertThat(withDistanceAndCoordinates).hasSize(2);
 
         GeoWithin<String> weinheim = withDistanceAndCoordinates.get(0);
-        assertThat(weinheim.member).isEqualTo("Weinheim");
-        assertThat(weinheim.geohash).isNull();
-        assertThat(weinheim.distance).isNotNull();
-        assertThat(weinheim.coordinates).isNotNull();
+        assertThat(weinheim.getMember()).isEqualTo("Weinheim");
+        assertThat(weinheim.getGeohash()).isNull();
+        assertThat(weinheim.getDistance()).isNotNull();
+        assertThat(weinheim.getCoordinates()).isNotNull();
 
         List<GeoWithin<String>> withDistanceAndHash = exec.get(2);
         assertThat(withDistanceAndHash).hasSize(2);
 
         GeoWithin<String> weinheimDistanceHash = withDistanceAndHash.get(0);
-        assertThat(weinheimDistanceHash.member).isEqualTo("Weinheim");
-        assertThat(weinheimDistanceHash.geohash).isNotNull();
-        assertThat(weinheimDistanceHash.distance).isNotNull();
-        assertThat(weinheimDistanceHash.coordinates).isNull();
+        assertThat(weinheimDistanceHash.getMember()).isEqualTo("Weinheim");
+        assertThat(weinheimDistanceHash.getGeohash()).isNotNull();
+        assertThat(weinheimDistanceHash.getDistance()).isNotNull();
+        assertThat(weinheimDistanceHash.getCoordinates()).isNull();
 
         List<GeoWithin<String>> withCoordinates = exec.get(3);
         assertThat(withCoordinates).hasSize(2);
 
         GeoWithin<String> weinheimCoordinates = withCoordinates.get(0);
-        assertThat(weinheimCoordinates.member).isEqualTo("Weinheim");
-        assertThat(weinheimCoordinates.geohash).isNull();
-        assertThat(weinheimCoordinates.distance).isNull();
-        assertThat(weinheimCoordinates.coordinates).isNotNull();
+        assertThat(weinheimCoordinates.getMember()).isEqualTo("Weinheim");
+        assertThat(weinheimCoordinates.getGeohash()).isNull();
+        assertThat(weinheimCoordinates.getDistance()).isNull();
+        assertThat(weinheimCoordinates.getCoordinates()).isNotNull();
     }
 
     @Test(expected = IllegalArgumentException.class)
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
index 4a6940458a..ee5b74020f 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
@@ -32,7 +32,7 @@ public void geopos() throws Exception {
         List<Value<GeoCoordinates>> geopos = reactive.geopos(key, "Weinheim", "foobar", "Bahn").collectList().block();
 
         assertThat(geopos).hasSize(3);
-        assertThat(geopos.get(0).getValue().x.doubleValue()).isEqualTo(8.6638, offset(0.001));
+        assertThat(geopos.get(0).getValue().getX().doubleValue()).isEqualTo(8.6638, offset(0.001));
         assertThat(geopos.get(1).hasValue()).isFalse();
         assertThat(geopos.get(2).hasValue()).isTrue();
     }

From b7f7e91af9f5ac16643065f09147c61825d45d2c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 3 Sep 2016 19:01:18 +0200
Subject: [PATCH 018/808] Polishing

Reduce field visibility. Replace StringBuffer by StringBuilder. Reorder fields. Move constructor field initialization to field initialization.
---
 .../java/com/lambdaworks/redis/CloseEvents.java   |  1 +
 .../lambdaworks/redis/ConnectionEventTrigger.java |  1 +
 .../com/lambdaworks/redis/ConnectionEvents.java   |  1 +
 .../java/com/lambdaworks/redis/EpollProvider.java |  7 ++++---
 .../java/com/lambdaworks/redis/GeoWithin.java     |  2 +-
 .../java/com/lambdaworks/redis/JavaRuntime.java   |  2 +-
 .../redis/PlainChannelInitializer.java            |  5 +++--
 src/main/java/com/lambdaworks/redis/ReadFrom.java |  8 ++++----
 .../lambdaworks/redis/RedisChannelHandler.java    | 15 +++++++--------
 .../redis/RedisChannelInitializerImpl.java        |  2 +-
 .../java/com/lambdaworks/redis/RedisClient.java   |  4 ++--
 .../redis/RedisConnectionStateListener.java       |  1 +
 .../com/lambdaworks/redis/RedisException.java     |  1 +
 .../com/lambdaworks/redis/RedisPublisher.java     |  4 ++--
 .../java/com/lambdaworks/redis/ScanCursor.java    |  4 ++--
 .../java/com/lambdaworks/redis/ScoredValue.java   |  2 +-
 src/main/java/com/lambdaworks/redis/SetArgs.java  |  1 +
 src/main/java/com/lambdaworks/redis/SortArgs.java |  1 +
 .../lambdaworks/redis/SslConnectionBuilder.java   |  9 +++++----
 src/main/java/com/lambdaworks/redis/Value.java    |  2 +-
 src/main/java/com/lambdaworks/redis/ZAddArgs.java |  1 +
 .../java/com/lambdaworks/redis/ZStoreArgs.java    |  1 +
 .../redis/cluster/AbstractNodeSelection.java      |  3 ++-
 .../lambdaworks/redis/cluster/ClusterCommand.java |  5 +++--
 .../cluster/ClusterDistributionChannelWriter.java |  4 +---
 .../redis/cluster/ClusterScanSupport.java         |  8 ++++----
 .../redis/cluster/MultiNodeExecution.java         |  1 +
 .../cluster/NodeSelectionInvocationHandler.java   | 11 +++++++----
 .../redis/cluster/PipelinedRedisFuture.java       |  2 +-
 .../cluster/PooledClusterConnectionProvider.java  |  5 +++--
 .../redis/cluster/ReadOnlyCommands.java           |  2 +-
 .../RedisAdvancedClusterAsyncCommandsImpl.java    |  2 +-
 .../RedisAdvancedClusterReactiveCommandsImpl.java |  2 +-
 .../redis/cluster/RedisClusterClient.java         |  6 +++---
 .../com/lambdaworks/redis/cluster/RoundRobin.java |  1 +
 .../cluster/RoundRobinSocketAddressSupplier.java  |  2 ++
 .../StatefulRedisClusterConnectionImpl.java       |  2 +-
 .../event/ClusterTopologyChangedEvent.java        |  3 ++-
 .../cluster/models/partitions/Partitions.java     |  3 ++-
 .../cluster/models/slots/ClusterSlotRange.java    |  1 +
 .../lambdaworks/redis/codec/ByteArrayCodec.java   |  4 ++--
 .../com/lambdaworks/redis/codec/StringCodec.java  |  6 +++---
 .../lambdaworks/redis/codec/Utf8StringCodec.java  |  2 +-
 .../event/connection/ConnectionEventSupport.java  | 10 +++-------
 .../redis/event/metrics/CommandLatencyEvent.java  |  2 +-
 .../redis/internal/LettuceFactories.java          |  4 ++--
 .../redis/masterslave/MasterSlave.java            |  2 +-
 .../MasterSlaveConnectionProvider.java            |  3 +--
 .../masterslave/MasterSlaveTopologyProvider.java  | 12 ++++++------
 .../masterslave/MasterSlaveTopologyRefresh.java   |  2 +-
 .../redis/masterslave/ReadOnlyCommands.java       |  2 +-
 .../redis/masterslave/RedisMasterSlaveNode.java   |  2 +-
 .../masterslave/SentinelTopologyRefresh.java      |  2 +-
 .../redis/metrics/CommandLatencyId.java           |  2 +-
 .../lambdaworks/redis/metrics/CommandMetrics.java |  4 ++--
 .../metrics/DefaultCommandLatencyCollector.java   |  2 +-
 .../lambdaworks/redis/protocol/AsyncCommand.java  |  2 +-
 .../redis/protocol/BaseRedisCommandBuilder.java   |  1 +
 .../lambdaworks/redis/protocol/CommandArgs.java   |  6 +++---
 .../redis/protocol/CommandEncoder.java            | 13 ++-----------
 .../redis/protocol/CommandHandler.java            | 11 ++---------
 .../redis/protocol/CommandKeyword.java            |  1 +
 .../redis/protocol/CommandWrapper.java            |  4 ++--
 .../redis/protocol/ConnectionWatchdog.java        |  1 -
 .../redis/protocol/DefaultEndpoint.java           | 10 ++--------
 .../redis/protocol/RedisStateMachine.java         | 11 ++++-------
 .../lambdaworks/redis/protocol/SharedLock.java    |  2 +-
 .../redis/pubsub/PubSubCommandHandler.java        |  4 ++--
 .../lambdaworks/redis/pubsub/PubSubOutput.java    |  1 +
 .../redis/pubsub/RedisPubSubAdapter.java          |  1 +
 .../pubsub/RedisPubSubAsyncCommandsImpl.java      |  2 +-
 .../redis/resource/DirContextDnsResolver.java     |  6 +++---
 72 files changed, 135 insertions(+), 140 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/CloseEvents.java b/src/main/java/com/lambdaworks/redis/CloseEvents.java
index 05476d44ec..0be034dfcd 100644
--- a/src/main/java/com/lambdaworks/redis/CloseEvents.java
+++ b/src/main/java/com/lambdaworks/redis/CloseEvents.java
@@ -11,6 +11,7 @@
  * @since 3.0
  */
 class CloseEvents {
+
     private Set<CloseListener> listeners = new ConcurrentSet<CloseListener>();
 
     public void fireEventClosed(Object resource) {
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java b/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java
index 81b73625c7..1810554d85 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java
+++ b/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java
@@ -16,6 +16,7 @@
  * @since 3.0
  */
 class ConnectionEventTrigger extends ChannelInboundHandlerAdapter {
+
     private final ConnectionEvents connectionEvents;
     private final RedisChannelHandler<?, ?> connection;
     private final EventBus eventBus;
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionEvents.java b/src/main/java/com/lambdaworks/redis/ConnectionEvents.java
index f4ca0615b5..e0309b8b26 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionEvents.java
+++ b/src/main/java/com/lambdaworks/redis/ConnectionEvents.java
@@ -12,6 +12,7 @@
  * @since 3.0
  */
 public class ConnectionEvents {
+
     private final Set<RedisConnectionStateListener> listeners = new ConcurrentSet<>();
 
     protected void fireEventRedisConnected(RedisChannelHandler<?, ?> connection) {
diff --git a/src/main/java/com/lambdaworks/redis/EpollProvider.java b/src/main/java/com/lambdaworks/redis/EpollProvider.java
index 95e1bf6447..b8323666e8 100644
--- a/src/main/java/com/lambdaworks/redis/EpollProvider.java
+++ b/src/main/java/com/lambdaworks/redis/EpollProvider.java
@@ -23,9 +23,10 @@ public class EpollProvider {
 
     protected static final InternalLogger logger = InternalLoggerFactory.getInstance(EpollProvider.class);
 
-    public final static Class<EventLoopGroup> epollEventLoopGroupClass;
-    public final static Class<Channel> epollDomainSocketChannelClass;
-    public final static Class<SocketAddress> domainSocketAddressClass;
+    public static final Class<EventLoopGroup> epollEventLoopGroupClass;
+    public static final Class<Channel> epollDomainSocketChannelClass;
+    public static final Class<SocketAddress> domainSocketAddressClass;
+
     static {
 
         epollEventLoopGroupClass = getClass("io.netty.channel.epoll.EpollEventLoopGroup");
diff --git a/src/main/java/com/lambdaworks/redis/GeoWithin.java b/src/main/java/com/lambdaworks/redis/GeoWithin.java
index 6d1c765f02..a17b9359b5 100644
--- a/src/main/java/com/lambdaworks/redis/GeoWithin.java
+++ b/src/main/java/com/lambdaworks/redis/GeoWithin.java
@@ -96,7 +96,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append(getClass().getSimpleName());
         sb.append(" [member=").append(member);
         sb.append(", distance=").append(distance);
diff --git a/src/main/java/com/lambdaworks/redis/JavaRuntime.java b/src/main/java/com/lambdaworks/redis/JavaRuntime.java
index 46fbfb57a9..ed8ee58eb7 100644
--- a/src/main/java/com/lambdaworks/redis/JavaRuntime.java
+++ b/src/main/java/com/lambdaworks/redis/JavaRuntime.java
@@ -12,6 +12,6 @@ public class JavaRuntime {
     /**
      * Constant whether the current JDK is Java 8 or higher.
      */
-    public final static boolean AT_LEAST_JDK_8 = isPresent("java.lang.FunctionalInterface");
+    public static final boolean AT_LEAST_JDK_8 = isPresent("java.lang.FunctionalInterface");
 
 }
diff --git a/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java b/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
index d6aa81ef17..83131cbf2a 100644
--- a/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
+++ b/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
@@ -24,12 +24,13 @@
  */
 class PlainChannelInitializer extends io.netty.channel.ChannelInitializer<Channel> implements RedisChannelInitializer {
 
-    final static RedisCommandBuilder<String, String> INITIALIZING_CMD_BUILDER = new RedisCommandBuilder<>(
+    static final RedisCommandBuilder<String, String> INITIALIZING_CMD_BUILDER = new RedisCommandBuilder<>(
             new Utf8StringCodec());
 
+    protected final char[] password;
+
     private boolean pingBeforeActivate;
     private CompletableFuture<Boolean> initializedFuture = new CompletableFuture<>();
-    protected final char[] password;
     private final Supplier<List<ChannelHandler>> handlers;
     private final EventBus eventBus;
 
diff --git a/src/main/java/com/lambdaworks/redis/ReadFrom.java b/src/main/java/com/lambdaworks/redis/ReadFrom.java
index ea878616d6..c727c18a78 100644
--- a/src/main/java/com/lambdaworks/redis/ReadFrom.java
+++ b/src/main/java/com/lambdaworks/redis/ReadFrom.java
@@ -15,22 +15,22 @@ public abstract class ReadFrom {
     /**
      * Setting to read from the master only.
      */
-    public final static ReadFrom MASTER = new ReadFromImpl.ReadFromMaster();
+    public static final ReadFrom MASTER = new ReadFromImpl.ReadFromMaster();
 
     /**
      * Setting to read preferred from the master and fall back to a slave if the master is not available.
      */
-    public final static ReadFrom MASTER_PREFERRED = new ReadFromImpl.ReadFromMasterPreferred();
+    public static final ReadFrom MASTER_PREFERRED = new ReadFromImpl.ReadFromMasterPreferred();
 
     /**
      * Setting to read from the slave only.
      */
-    public final static ReadFrom SLAVE = new ReadFromImpl.ReadFromSlave();
+    public static final ReadFrom SLAVE = new ReadFromImpl.ReadFromSlave();
 
     /**
      * Setting to read from the nearest node.
      */
-    public final static ReadFrom NEAREST = new ReadFromImpl.ReadFromNearest();
+    public static final ReadFrom NEAREST = new ReadFromImpl.ReadFromNearest();
 
     /**
      * Chooses the nodes from the matching Redis nodes that match this read selector.
diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java b/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java
index 8be11b9474..f7b2e4c284 100644
--- a/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java
+++ b/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java
@@ -27,17 +27,16 @@ public abstract class RedisChannelHandler<K, V> implements Closeable, Connection
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(RedisChannelHandler.class);
 
-    protected long timeout;
-    protected TimeUnit unit;
-
+    private long timeout;
+    private TimeUnit unit;
     private CloseEvents closeEvents = new CloseEvents();
+
     private final RedisChannelWriter channelWriter;
+    private final boolean debugEnabled = logger.isDebugEnabled();
+
     private volatile boolean closed;
     private volatile boolean active = true;
     private volatile ClientOptions clientOptions;
-    
-    // If DEBUG level logging has been enabled at startup.
-    private final boolean debugEnabled;
 
     /**
      * @param writer the channel writer
@@ -47,8 +46,7 @@ public abstract class RedisChannelHandler<K, V> implements Closeable, Connection
     public RedisChannelHandler(RedisChannelWriter writer, long timeout, TimeUnit unit) {
         
         this.channelWriter = writer;
-        debugEnabled = logger.isDebugEnabled();
-        
+
         writer.setConnectionFacade(this);
         setTimeout(timeout, unit);
     }
@@ -60,6 +58,7 @@ public RedisChannelHandler(RedisChannelWriter writer, long timeout, TimeUnit uni
      * @param unit Unit of time for the timeout.
      */
     public void setTimeout(long timeout, TimeUnit unit) {
+
         this.timeout = timeout;
         this.unit = unit;
     }
diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelInitializerImpl.java b/src/main/java/com/lambdaworks/redis/RedisChannelInitializerImpl.java
index 9381ae63a3..66a7a51601 100644
--- a/src/main/java/com/lambdaworks/redis/RedisChannelInitializerImpl.java
+++ b/src/main/java/com/lambdaworks/redis/RedisChannelInitializerImpl.java
@@ -7,5 +7,5 @@
  * 
  * @author Mark Paluch
  */
-public abstract class RedisChannelInitializerImpl extends ChannelDuplexHandler implements RedisChannelInitializer {
+abstract class RedisChannelInitializerImpl extends ChannelDuplexHandler implements RedisChannelInitializer {
 }
diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/com/lambdaworks/redis/RedisClient.java
index a8ecc2e2fe..cdcc455459 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClient.java
@@ -41,8 +41,8 @@
  */
 public class RedisClient extends AbstractRedisClient {
 
-    private final static RedisURI EMPTY_URI = new RedisURI();
-    private final static boolean POOL_AVAILABLE = isPresent("org.apache.commons.pool2.impl.GenericObjectPool");
+    private static final RedisURI EMPTY_URI = new RedisURI();
+    private static final boolean POOL_AVAILABLE = isPresent("org.apache.commons.pool2.impl.GenericObjectPool");
 
     private final RedisURI redisURI;
 
diff --git a/src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java b/src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java
index 2ebaf139a2..66662c9add 100644
--- a/src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java
+++ b/src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java
@@ -7,6 +7,7 @@
  * @author ze
  */
 public interface RedisConnectionStateListener {
+
     /**
      * Event handler for successful connection event.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/RedisException.java b/src/main/java/com/lambdaworks/redis/RedisException.java
index c9f78826b5..5400e50426 100644
--- a/src/main/java/com/lambdaworks/redis/RedisException.java
+++ b/src/main/java/com/lambdaworks/redis/RedisException.java
@@ -9,6 +9,7 @@
  */
 @SuppressWarnings("serial")
 public class RedisException extends RuntimeException {
+
     public RedisException(String msg) {
         super(msg);
     }
diff --git a/src/main/java/com/lambdaworks/redis/RedisPublisher.java b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
index 9ab50c4017..eb2dfea4e0 100644
--- a/src/main/java/com/lambdaworks/redis/RedisPublisher.java
+++ b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
@@ -41,7 +41,7 @@
  */
 class RedisPublisher<K, V, T> implements Publisher<T> {
 
-    private final static InternalLogger LOG = InternalLoggerFactory.getInstance(RedisPublisher.class);
+    private static final InternalLogger LOG = InternalLoggerFactory.getInstance(RedisPublisher.class);
 
     private final boolean traceEnabled = LOG.isTraceEnabled();
 
@@ -111,7 +111,7 @@ public void subscribe(Subscriber<? super T> subscriber) {
      */
     private static class RedisSubscription<T> implements Subscription, StreamingOutput.Subscriber<T> {
 
-        private final static InternalLogger LOG = InternalLoggerFactory.getInstance(RedisPublisher.class);
+        private static final InternalLogger LOG = InternalLoggerFactory.getInstance(RedisPublisher.class);
         private final boolean traceEnabled = LOG.isTraceEnabled();
 
         private final AtomicLong demand = new AtomicLong();
diff --git a/src/main/java/com/lambdaworks/redis/ScanCursor.java b/src/main/java/com/lambdaworks/redis/ScanCursor.java
index d18082e706..297f8d2ad7 100644
--- a/src/main/java/com/lambdaworks/redis/ScanCursor.java
+++ b/src/main/java/com/lambdaworks/redis/ScanCursor.java
@@ -13,12 +13,12 @@ public class ScanCursor {
     /**
      * Finished cursor.
      */
-    public final static ScanCursor FINISHED = new ImmutableScanCursor("0", true);
+    public static final ScanCursor FINISHED = new ImmutableScanCursor("0", true);
 
     /**
      * Initial cursor.
      */
-    public final static ScanCursor INITIAL = new ImmutableScanCursor("0", false);
+    public static final ScanCursor INITIAL = new ImmutableScanCursor("0", false);
 
     private String cursor;
     private boolean finished;
diff --git a/src/main/java/com/lambdaworks/redis/ScoredValue.java b/src/main/java/com/lambdaworks/redis/ScoredValue.java
index 54b902aaf1..f3530ea243 100644
--- a/src/main/java/com/lambdaworks/redis/ScoredValue.java
+++ b/src/main/java/com/lambdaworks/redis/ScoredValue.java
@@ -14,7 +14,7 @@
  */
 public class ScoredValue<V> extends Value<V> {
 
-    private final static ScoredValue<Object> EMPTY = new ScoredValue<>(0, null);
+    private static final ScoredValue<Object> EMPTY = new ScoredValue<>(0, null);
 
     private final double score;
 
diff --git a/src/main/java/com/lambdaworks/redis/SetArgs.java b/src/main/java/com/lambdaworks/redis/SetArgs.java
index e35cad1c61..53b03b566b 100644
--- a/src/main/java/com/lambdaworks/redis/SetArgs.java
+++ b/src/main/java/com/lambdaworks/redis/SetArgs.java
@@ -12,6 +12,7 @@
  * @author Vincent Rischmann
  */
 public class SetArgs {
+
     private Long ex;
     private Long px;
     private boolean nx = false;
diff --git a/src/main/java/com/lambdaworks/redis/SortArgs.java b/src/main/java/com/lambdaworks/redis/SortArgs.java
index e4219e9fdd..87b6a08942 100644
--- a/src/main/java/com/lambdaworks/redis/SortArgs.java
+++ b/src/main/java/com/lambdaworks/redis/SortArgs.java
@@ -18,6 +18,7 @@
  * @author Will Glozer
  */
 public class SortArgs {
+
     private String by;
     private Long offset, count;
     private List<String> get;
diff --git a/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java b/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
index 1c256cbb8a..3cbf7bbb10 100644
--- a/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
@@ -38,17 +38,18 @@
  * @author Mark Paluch
  */
 public class SslConnectionBuilder extends ConnectionBuilder {
-    private RedisURI redisURI;
 
-    public static SslConnectionBuilder sslConnectionBuilder() {
-        return new SslConnectionBuilder();
-    }
+    private RedisURI redisURI;
 
     public SslConnectionBuilder ssl(RedisURI redisURI) {
         this.redisURI = redisURI;
         return this;
     }
 
+    public static SslConnectionBuilder sslConnectionBuilder() {
+        return new SslConnectionBuilder();
+    }
+
     @Override
     protected List<ChannelHandler> buildHandlers() {
         LettuceAssert.assertState(redisURI != null, "RedisURI must not be null");
diff --git a/src/main/java/com/lambdaworks/redis/Value.java b/src/main/java/com/lambdaworks/redis/Value.java
index 6f2af1204d..7c28f6e1a9 100644
--- a/src/main/java/com/lambdaworks/redis/Value.java
+++ b/src/main/java/com/lambdaworks/redis/Value.java
@@ -22,7 +22,7 @@
  */
 public class Value<V> implements Serializable {
 
-    private final static Value<Object> EMPTY = new Value<>(null);
+    private static final Value<Object> EMPTY = new Value<>(null);
 
     private final V value;
 
diff --git a/src/main/java/com/lambdaworks/redis/ZAddArgs.java b/src/main/java/com/lambdaworks/redis/ZAddArgs.java
index f3c3059615..1a5fd103b8 100644
--- a/src/main/java/com/lambdaworks/redis/ZAddArgs.java
+++ b/src/main/java/com/lambdaworks/redis/ZAddArgs.java
@@ -9,6 +9,7 @@
  * @author Mark Paluch
  */
 public class ZAddArgs {
+
     private boolean nx = false;
     private boolean xx = false;
     private boolean ch = false;
diff --git a/src/main/java/com/lambdaworks/redis/ZStoreArgs.java b/src/main/java/com/lambdaworks/redis/ZStoreArgs.java
index 1117caa92a..a0d74629c8 100644
--- a/src/main/java/com/lambdaworks/redis/ZStoreArgs.java
+++ b/src/main/java/com/lambdaworks/redis/ZStoreArgs.java
@@ -17,6 +17,7 @@
  * @author Will Glozer
  */
 public class ZStoreArgs {
+
     private static enum Aggregate {
         SUM, MIN, MAX
     }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java
index 93625c45fd..f0f3271315 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java
@@ -22,9 +22,10 @@
  */
 abstract class AbstractNodeSelection<API, CMD, K, V> implements NodeSelectionSupport<API, CMD> {
 
+    protected ClusterDistributionChannelWriter writer;
     protected StatefulRedisClusterConnection<K, V> globalConnection;
+
     private ClusterConnectionProvider.Intent intent;
-    protected ClusterDistributionChannelWriter writer;
 
     public AbstractNodeSelection(StatefulRedisClusterConnection<K, V> globalConnection, ClusterConnectionProvider.Intent intent) {
         this.globalConnection = globalConnection;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java
index 51375b41d6..9b8935b299 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java
@@ -14,9 +14,10 @@
  */
 class ClusterCommand<K, V, T> extends CommandWrapper<K, V, T> implements RedisCommand<K, V, T> {
 
-    private RedisChannelWriter retry;
     private int redirections;
-    private int maxRedirections;
+    private final int maxRedirections;
+
+    private final RedisChannelWriter retry;
     private boolean completed;
 
     /**
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
index cb5c7a77c6..6e85bba035 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
@@ -23,12 +23,10 @@ class ClusterDistributionChannelWriter implements RedisChannelWriter {
     private final ClusterEventListener clusterEventListener;
     private final EventExecutorGroup eventExecutors;
     private final int executionLimit;
+
     private ClusterConnectionProvider clusterConnectionProvider;
     private boolean closed = false;
 
-    long p20, p21, p22, p23, p24, p25, p26;
-    long p30, p31, p32, p33, p34, p35, p36, p37;
-
     ClusterDistributionChannelWriter(ClientOptions clientOptions, RedisChannelWriter defaultWriter,
             ClusterEventListener clusterEventListener, EventExecutorGroup eventExecutors) {
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java
index 9838f51779..afa9cb53fb 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java
@@ -22,7 +22,7 @@ class ClusterScanSupport {
     /**
      * Map a {@link RedisFuture} of {@link KeyScanCursor} to a {@link RedisFuture} of {@link ClusterKeyScanCursor}.
      */
-    final static ScanCursorMapper<RedisFuture<KeyScanCursor<?>>> futureKeyScanCursorMapper = new ScanCursorMapper<RedisFuture<KeyScanCursor<?>>>() {
+    static final ScanCursorMapper<RedisFuture<KeyScanCursor<?>>> futureKeyScanCursorMapper = new ScanCursorMapper<RedisFuture<KeyScanCursor<?>>>() {
         @Override
         public RedisFuture<KeyScanCursor<?>> map(List<String> nodeIds, String currentNodeId,
                 RedisFuture<KeyScanCursor<?>> cursor) {
@@ -38,7 +38,7 @@ public KeyScanCursor<?> apply(KeyScanCursor<?> result) {
     /**
      * Map a {@link RedisFuture} of {@link StreamScanCursor} to a {@link RedisFuture} of {@link ClusterStreamScanCursor}.
      */
-    final static ScanCursorMapper<RedisFuture<StreamScanCursor>> futureStreamScanCursorMapper = new ScanCursorMapper<RedisFuture<StreamScanCursor>>() {
+    static final ScanCursorMapper<RedisFuture<StreamScanCursor>> futureStreamScanCursorMapper = new ScanCursorMapper<RedisFuture<StreamScanCursor>>() {
         @Override
         public RedisFuture<StreamScanCursor> map(List<String> nodeIds, String currentNodeId,
                 RedisFuture<StreamScanCursor> cursor) {
@@ -54,13 +54,13 @@ public StreamScanCursor apply(StreamScanCursor result) {
     /**
      * Map a {@link Mono} of {@link KeyScanCursor} to a {@link Mono} of {@link ClusterKeyScanCursor}.
      */
-    final static ScanCursorMapper<Mono<KeyScanCursor<?>>> reactiveKeyScanCursorMapper = (nodeIds, currentNodeId,
+    static final ScanCursorMapper<Mono<KeyScanCursor<?>>> reactiveKeyScanCursorMapper = (nodeIds, currentNodeId,
             cursor) -> cursor.map(keyScanCursor -> new ClusterKeyScanCursor<>(nodeIds, currentNodeId, keyScanCursor));
 
     /**
      * Map a {@link Mono} of {@link StreamScanCursor} to a {@link Mono} of {@link ClusterStreamScanCursor}.
      */
-    final static ScanCursorMapper<Mono<StreamScanCursor>> reactiveStreamScanCursorMapper = (nodeIds, currentNodeId,
+    static final ScanCursorMapper<Mono<StreamScanCursor>> reactiveStreamScanCursorMapper = (nodeIds, currentNodeId,
             cursor) -> cursor.map(new Function<StreamScanCursor, StreamScanCursor>() {
                 @Override
                 public StreamScanCursor apply(StreamScanCursor streamScanCursor) {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/MultiNodeExecution.java b/src/main/java/com/lambdaworks/redis/cluster/MultiNodeExecution.java
index 5417420baf..1418b9f554 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/MultiNodeExecution.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/MultiNodeExecution.java
@@ -24,6 +24,7 @@
  * @author Mark Paluch
  */
 class MultiNodeExecution {
+
     static <T> T execute(Callable<T> function) {
         try {
             return function.call();
diff --git a/src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java b/src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java
index 38d7e95145..dcec2426d4 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java
@@ -23,13 +23,15 @@
  */
 class NodeSelectionInvocationHandler extends AbstractInvocationHandler {
 
+    private static final Method NULL_MARKER_METHOD;
+
+    private final Map<Method, Method> nodeSelectionMethods = new ConcurrentHashMap<>();
+    private final Map<Method, Method> connectionMethod = new ConcurrentHashMap<>();
+
     private AbstractNodeSelection<?, ?, ?, ?> selection;
     private boolean sync;
     private long timeout;
     private TimeUnit unit;
-    private final Map<Method, Method> nodeSelectionMethods = new ConcurrentHashMap<>();
-    private final Map<Method, Method> connectionMethod = new ConcurrentHashMap<>();
-    public final static Method NULL_MARKER_METHOD;
 
     static {
         try {
@@ -44,7 +46,8 @@ public NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selectio
         this(selection, false, 0, null);
     }
 
-    public NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selection, boolean sync, long timeout, TimeUnit unit) {
+    public NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selection, boolean sync, long timeout,
+            TimeUnit unit) {
         if (sync) {
             LettuceAssert.isTrue(timeout > 0, "Timeout must be greater 0 when using sync mode");
             LettuceAssert.notNull(unit, "Unit must not be null when using sync mode");
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PipelinedRedisFuture.java b/src/main/java/com/lambdaworks/redis/cluster/PipelinedRedisFuture.java
index d4090c740c..ae83fbd2da 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PipelinedRedisFuture.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/PipelinedRedisFuture.java
@@ -16,7 +16,7 @@
  */
 class PipelinedRedisFuture<V> extends CompletableFuture<V> implements RedisFuture<V> {
 
-    private CountDownLatch latch = new CountDownLatch(1);
+    private final CountDownLatch latch = new CountDownLatch(1);
 
     public PipelinedRedisFuture(CompletionStage<V> completionStage, Function<V, V> converter) {
         completionStage.thenAccept(v -> complete(converter.apply(v)))
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java b/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
index a290f96ba2..7c4ff9b0e9 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
@@ -34,12 +34,13 @@
  */
 @SuppressWarnings({ "unchecked", "rawtypes" })
 class PooledClusterConnectionProvider<K, V> implements ClusterConnectionProvider {
+
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(PooledClusterConnectionProvider.class);
 
     // Contains NodeId-identified and HostAndPort-identified connections.
     private final Map<ConnectionKey, StatefulRedisConnection<K, V>> connections = new ConcurrentHashMap<>();
     private final Object stateLock = new Object();
-    private final boolean debugEnabled;
+    private final boolean debugEnabled = logger.isDebugEnabled();
     private final StatefulRedisConnection<K, V> writers[] = new StatefulRedisConnection[SlotHash.SLOT_COUNT];
     private final StatefulRedisConnection<K, V> readers[][] = new StatefulRedisConnection[SlotHash.SLOT_COUNT][];
     private final RedisClusterClient redisClusterClient;
@@ -51,8 +52,8 @@ class PooledClusterConnectionProvider<K, V> implements ClusterConnectionProvider
 
     public PooledClusterConnectionProvider(RedisClusterClient redisClusterClient, RedisChannelWriter clusterWriter,
             RedisCodec<K, V> redisCodec) {
+
         this.redisClusterClient = redisClusterClient;
-        this.debugEnabled = logger.isDebugEnabled();
         this.connectionFactory = new ConnectionFactory(redisClusterClient, redisCodec, clusterWriter);
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java b/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
index 22e9846cc6..95088c4c89 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
@@ -13,7 +13,7 @@
  */
 class ReadOnlyCommands {
 
-    public final static ProtocolKeyword READ_ONLY_COMMANDS[];
+    static final ProtocolKeyword READ_ONLY_COMMANDS[];
 
     static {
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index 3db9c0ff02..39882bf075 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -44,7 +44,7 @@
 public class RedisAdvancedClusterAsyncCommandsImpl<K, V> extends AbstractRedisAsyncCommands<K, V> implements
          RedisAdvancedClusterAsyncCommands<K, V> {
 
-    private Random random = new Random();
+    private final Random random = new Random();
 
     /**
      * Initialize a new connection.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index f2eb5c4cc0..4d69878e1e 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -36,7 +36,7 @@
 public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedisReactiveCommands<K, V>
         implements RedisAdvancedClusterReactiveCommands<K, V> {
 
-    private Random random = new Random();
+    private final Random random = new Random();
 
     /**
      * Initialize a new connection.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index 01991e40ae..8137f700a7 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -114,15 +114,15 @@ public class RedisClusterClient extends AbstractRedisClient {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(RedisClusterClient.class);
 
-    protected AtomicBoolean clusterTopologyRefreshActivated = new AtomicBoolean(false);
-    protected AtomicReference<ScheduledFuture<?>> clusterTopologyRefreshFuture = new AtomicReference<>();
+    protected final AtomicBoolean clusterTopologyRefreshActivated = new AtomicBoolean(false);
+    protected final AtomicReference<ScheduledFuture<?>> clusterTopologyRefreshFuture = new AtomicReference<>();
 
     private final ClusterTopologyRefresh refresh = new ClusterTopologyRefresh(new NodeConnectionFactoryImpl(), getResources());
     private final ClusterTopologyRefreshScheduler clusterTopologyRefreshScheduler = new ClusterTopologyRefreshScheduler(this,
             getResources());
+    private final Iterable<RedisURI> initialUris;
 
     private Partitions partitions;
-    private final Iterable<RedisURI> initialUris;
 
     private RedisClusterClient() {
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RoundRobin.java b/src/main/java/com/lambdaworks/redis/cluster/RoundRobin.java
index bb22c99e39..a2c311ffd5 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RoundRobin.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RoundRobin.java
@@ -11,6 +11,7 @@
 class RoundRobin<V> {
 
     protected final Collection<? extends V> collection;
+
     protected V offset;
 
     public RoundRobin(Collection<? extends V> collection) {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java b/src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java
index fc7214d103..167d986f73 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java
@@ -22,10 +22,12 @@
 class RoundRobinSocketAddressSupplier implements Supplier<SocketAddress> {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(RoundRobinSocketAddressSupplier.class);
+
     private final Collection<RedisClusterNode> partitions;
     private final Collection<RedisClusterNode> clusterNodes = new ArrayList<>();
     private final Function<Collection<RedisClusterNode>, Collection<RedisClusterNode>> sortFunction;
     private final ClientResources clientResources;
+
     private RoundRobin<? extends RedisClusterNode> roundRobin;
 
     public RoundRobinSocketAddressSupplier(Collection<RedisClusterNode> partitions,
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
index 995b9813d0..09344249f5 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
@@ -221,7 +221,7 @@ private static class ClusterFutureSyncInvocationHandler<K, V> extends AbstractIn
         private final Map<Method, Method> apiMethodCache = new ConcurrentHashMap<>(RedisClusterCommands.class.getMethods().length, 1);
         private final Map<Method, Method> connectionMethodCache = new ConcurrentHashMap<>(5, 1);
 
-        private final static Constructor<MethodHandles.Lookup> LOOKUP_CONSTRUCTOR;
+        private static final Constructor<MethodHandles.Lookup> LOOKUP_CONSTRUCTOR;
 
         static {
             try {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/event/ClusterTopologyChangedEvent.java b/src/main/java/com/lambdaworks/redis/cluster/event/ClusterTopologyChangedEvent.java
index b735673135..87c31aca4b 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/event/ClusterTopologyChangedEvent.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/event/ClusterTopologyChangedEvent.java
@@ -13,6 +13,7 @@
  * @since 3.4
  */
 public class ClusterTopologyChangedEvent implements Event {
+
     private final List<RedisClusterNode> before;
     private final List<RedisClusterNode> after;
 
@@ -47,7 +48,7 @@ public List<RedisClusterNode> after() {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append(getClass().getSimpleName());
         sb.append(" [before=").append(before.size());
         sb.append(", after=").append(after.size());
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java b/src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java
index 1312eb7ce0..26fd5b2c01 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java
@@ -36,8 +36,9 @@
  */
 public class Partitions implements Collection<RedisClusterNode> {
 
+    private static final RedisClusterNode[] EMPTY = new RedisClusterNode[SlotHash.SLOT_COUNT];
+
     private final List<RedisClusterNode> partitions = new ArrayList<>();
-    private final static RedisClusterNode[] EMPTY = new RedisClusterNode[SlotHash.SLOT_COUNT];
 
     private volatile RedisClusterNode slotCache[] = EMPTY;
     private volatile Collection<RedisClusterNode> nodeReadView = Collections.emptyList();
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java b/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java
index a0fdb55191..fa6e9502de 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java
@@ -19,6 +19,7 @@
  */
 @SuppressWarnings("serial")
 public class ClusterSlotRange implements Serializable {
+
     private int from;
     private int to;
 
diff --git a/src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java b/src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java
index 55d6311da9..23e9d8ee47 100644
--- a/src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java
+++ b/src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java
@@ -10,8 +10,8 @@
  */
 public class ByteArrayCodec implements RedisCodec<byte[], byte[]> {
 
-    public final static ByteArrayCodec INSTANCE = new ByteArrayCodec();
-    private final static byte[] EMPTY = new byte[0];
+    public static final ByteArrayCodec INSTANCE = new ByteArrayCodec();
+    private static final byte[] EMPTY = new byte[0];
 
     @Override
     public byte[] decodeKey(ByteBuffer bytes) {
diff --git a/src/main/java/com/lambdaworks/redis/codec/StringCodec.java b/src/main/java/com/lambdaworks/redis/codec/StringCodec.java
index 4121559729..08a773fd2b 100644
--- a/src/main/java/com/lambdaworks/redis/codec/StringCodec.java
+++ b/src/main/java/com/lambdaworks/redis/codec/StringCodec.java
@@ -24,10 +24,10 @@
  */
 public class StringCodec implements RedisCodec<String, String>, ToByteBufEncoder<String, String> {
 
-    public final static StringCodec UTF8 = new StringCodec(LettuceCharsets.UTF8);
-    public final static StringCodec ASCII = new StringCodec(LettuceCharsets.ASCII);
+    public static final StringCodec UTF8 = new StringCodec(LettuceCharsets.UTF8);
+    public static final StringCodec ASCII = new StringCodec(LettuceCharsets.ASCII);
 
-    private final static byte[] EMPTY = new byte[0];
+    private static final byte[] EMPTY = new byte[0];
 
     private final Charset charset;
     private final boolean ascii;
diff --git a/src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java b/src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java
index 137808a000..5d258cfd71 100644
--- a/src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java
+++ b/src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java
@@ -18,7 +18,7 @@
  */
 public class Utf8StringCodec implements RedisCodec<String, String> {
 
-    private final static byte[] EMPTY = new byte[0];
+    private static final byte[] EMPTY = new byte[0];
 
     private Charset charset;
     private CharsetDecoder decoder;
diff --git a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEventSupport.java b/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEventSupport.java
index 78dfe5bc6e..f07be809e8 100644
--- a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEventSupport.java
+++ b/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEventSupport.java
@@ -41,16 +41,12 @@ public SocketAddress remoteAddress() {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append(getClass().getSimpleName());
         sb.append(" [");
-        appendConnectionId(sb);
-        sb.append(']');
-        return sb.toString();
-    }
-
-    void appendConnectionId(StringBuffer sb) {
         sb.append(local);
         sb.append(" -> ").append(remote);
+        sb.append(']');
+        return sb.toString();
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/event/metrics/CommandLatencyEvent.java b/src/main/java/com/lambdaworks/redis/event/metrics/CommandLatencyEvent.java
index d179c83a29..46494f46b2 100644
--- a/src/main/java/com/lambdaworks/redis/event/metrics/CommandLatencyEvent.java
+++ b/src/main/java/com/lambdaworks/redis/event/metrics/CommandLatencyEvent.java
@@ -30,7 +30,7 @@ public Map<CommandLatencyId, CommandMetrics> getLatencies() {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append(latencies);
         return sb.toString();
     }
diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceFactories.java b/src/main/java/com/lambdaworks/redis/internal/LettuceFactories.java
index 8d6cf9daed..dde084d96d 100644
--- a/src/main/java/com/lambdaworks/redis/internal/LettuceFactories.java
+++ b/src/main/java/com/lambdaworks/redis/internal/LettuceFactories.java
@@ -21,7 +21,7 @@ public class LettuceFactories {
      * @param <T>
      * @return a new, empty {@link ConcurrentLinkedDeque}.
      */
-    public final static <T> Deque<T> newConcurrentQueue() {
+    public static final <T> Deque<T> newConcurrentQueue() {
         return new ConcurrentLinkedDeque<T>();
     }
 
@@ -31,7 +31,7 @@ public final static <T> Deque<T> newConcurrentQueue() {
      * @param <T>
      * @return a new, empty {@link ArrayDeque}.
      */
-    public final static <T> Deque<T> newSpScQueue() {
+    public static final <T> Deque<T> newSpScQueue() {
         return new ArrayDeque<>();
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java
index e1fd9e1698..68c3e81a4d 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java
@@ -72,7 +72,7 @@
  */
 public class MasterSlave {
 
-    private final static InternalLogger LOG = InternalLoggerFactory.getInstance(MasterSlave.class);
+    private static final InternalLogger LOG = InternalLoggerFactory.getInstance(MasterSlave.class);
 
     /**
      * Open a new connection to a Redis Master-Slave server/servers using the supplied {@link RedisURI} and the supplied
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
index cf181b96de..478ba20023 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
@@ -30,7 +30,7 @@
 public class MasterSlaveConnectionProvider<K, V> {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(MasterSlaveConnectionProvider.class);
-    private final boolean debugEnabled;
+    private final boolean debugEnabled = logger.isDebugEnabled();
 
     // Contains HostAndPort-identified connections.
     private final Map<ConnectionKey, StatefulRedisConnection<K, V>> connections = new ConcurrentHashMap<>();
@@ -47,7 +47,6 @@ public class MasterSlaveConnectionProvider<K, V> {
             Map<RedisURI, StatefulRedisConnection<K, V>> initialConnections) {
 
         this.initialRedisUri = initialRedisUri;
-        this.debugEnabled = logger.isDebugEnabled();
         this.connectionFactory = new ConnectionFactory<>(redisClient, redisCodec);
 
         for (Map.Entry<RedisURI, StatefulRedisConnection<K, V>> entry : initialConnections.entrySet()) {
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java
index 83c55186ff..624e177216 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java
@@ -24,13 +24,13 @@
  */
 public class MasterSlaveTopologyProvider implements TopologyProvider {
 
-    public final static Pattern ROLE_PATTERN = Pattern.compile("^role\\:([a-z]+)$", Pattern.MULTILINE);
-    public final static Pattern SLAVE_PATTERN = Pattern.compile("^slave(\\d+)\\:([a-zA-Z\\,\\=\\d\\.\\:]+)$", Pattern.MULTILINE);
-    public final static Pattern MASTER_HOST_PATTERN = Pattern.compile("^master_host\\:([a-zA-Z\\,\\=\\d\\.\\:]+)$",
+    public static final Pattern ROLE_PATTERN = Pattern.compile("^role\\:([a-z]+)$", Pattern.MULTILINE);
+    public static final Pattern SLAVE_PATTERN = Pattern.compile("^slave(\\d+)\\:([a-zA-Z\\,\\=\\d\\.\\:]+)$", Pattern.MULTILINE);
+    public static final Pattern MASTER_HOST_PATTERN = Pattern.compile("^master_host\\:([a-zA-Z\\,\\=\\d\\.\\:]+)$",
             Pattern.MULTILINE);
-    public final static Pattern MASTER_PORT_PATTERN = Pattern.compile("^master_port\\:(\\d+)$", Pattern.MULTILINE);
-    public final static Pattern IP_PATTERN = Pattern.compile("ip\\=([a-zA-Z\\d\\.\\:]+)");
-    public final static Pattern PORT_PATTERN = Pattern.compile("port\\=([\\d]+)");
+    public static final Pattern MASTER_PORT_PATTERN = Pattern.compile("^master_port\\:(\\d+)$", Pattern.MULTILINE);
+    public static final Pattern IP_PATTERN = Pattern.compile("ip\\=([a-zA-Z\\d\\.\\:]+)");
+    public static final Pattern PORT_PATTERN = Pattern.compile("port\\=([\\d]+)");
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(MasterSlaveTopologyProvider.class);
 
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java
index c8cac87356..bdd72922ed 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java
@@ -165,7 +165,7 @@ private Map<RedisURI, StatefulRedisConnection<String, String>> getConnections(It
      */
     static class RedisUriComparator implements Comparator<RedisURI> {
 
-        public final static RedisUriComparator INSTANCE = new RedisUriComparator();
+        public static final RedisUriComparator INSTANCE = new RedisUriComparator();
 
         @Override
         public int compare(RedisURI o1, RedisURI o2) {
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java b/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
index 157f2412e3..ee67adb9ad 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
@@ -13,7 +13,7 @@
  */
 class ReadOnlyCommands {
 
-    public final static ProtocolKeyword READ_ONLY_COMMANDS[];
+    public static final ProtocolKeyword READ_ONLY_COMMANDS[];
 
     static {
 
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/RedisMasterSlaveNode.java b/src/main/java/com/lambdaworks/redis/masterslave/RedisMasterSlaveNode.java
index 74efeac8d4..c92ab7282e 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/RedisMasterSlaveNode.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/RedisMasterSlaveNode.java
@@ -57,7 +57,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append(getClass().getSimpleName());
         sb.append(" [redisURI=").append(redisURI);
         sb.append(", role=").append(role);
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java b/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
index 08acc1ecb8..fa4e605e3a 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
@@ -26,7 +26,7 @@
  */
 class SentinelTopologyRefresh implements Closeable {
 
-    private final static InternalLogger LOG = InternalLoggerFactory.getInstance(SentinelTopologyRefresh.class);
+    private static final InternalLogger LOG = InternalLoggerFactory.getInstance(SentinelTopologyRefresh.class);
 
     private final List<StatefulRedisPubSubConnection<String, String>> pubSubConnections = new ArrayList<>();
     private final RedisClient redisClient;
diff --git a/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyId.java b/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyId.java
index 3312755820..a468385d3a 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyId.java
+++ b/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyId.java
@@ -113,7 +113,7 @@ public int compareTo(CommandLatencyId o) {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("[").append(localAddress);
         sb.append(" -> ").append(remoteAddress);
         sb.append(", commandType=").append(commandType);
diff --git a/src/main/java/com/lambdaworks/redis/metrics/CommandMetrics.java b/src/main/java/com/lambdaworks/redis/metrics/CommandMetrics.java
index c7b4b0770c..49c0f67667 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/CommandMetrics.java
+++ b/src/main/java/com/lambdaworks/redis/metrics/CommandMetrics.java
@@ -56,7 +56,7 @@ public CommandLatency getCompletion() {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("[count=").append(count);
         sb.append(", timeUnit=").append(timeUnit);
         sb.append(", firstResponse=").append(firstResponse);
@@ -102,7 +102,7 @@ public Map<Double, Long> getPercentiles() {
 
         @Override
         public String toString() {
-            final StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             sb.append("[min=").append(min);
             sb.append(", max=").append(max);
             sb.append(", percentiles=").append(percentiles);
diff --git a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java b/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java
index aa65cb45f0..986104373d 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java
+++ b/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java
@@ -206,7 +206,7 @@ public Latencies(PauseDetector pauseDetector) {
     }
 
     private static class PauseDetectorWrapper {
-        public final static AtomicLong counter = new AtomicLong();
+        public static final AtomicLong counter = new AtomicLong();
         PauseDetector pauseDetector;
 
         public void initialize() {
diff --git a/src/main/java/com/lambdaworks/redis/protocol/AsyncCommand.java b/src/main/java/com/lambdaworks/redis/protocol/AsyncCommand.java
index eeb8319109..50773f9923 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/AsyncCommand.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/AsyncCommand.java
@@ -25,8 +25,8 @@
 public class AsyncCommand<K, V, T> extends CompletableFuture<T> implements RedisCommand<K, V, T>, RedisFuture<T>,
         CompleteableCommand<T>, DecoratedCommand<K, V, T> {
 
-    protected RedisCommand<K, V, T> command;
     protected CountDownLatch latch = new CountDownLatch(1);
+    protected RedisCommand<K, V, T> command;
 
     /**
      * 
diff --git a/src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java b/src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java
index 1cd7afb3d8..7aab8637f7 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java
@@ -10,6 +10,7 @@
  * @since 3.0
  */
 public class BaseRedisCommandBuilder<K, V> {
+
     protected RedisCodec<K, V> codec;
 
     public BaseRedisCommandBuilder(RedisCodec<K, V> codec) {
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java b/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
index de2d79da83..14ebb07d77 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
@@ -438,7 +438,7 @@ static void writeInteger(ByteBuf target, long value) {
 
     static class IntegerCache {
 
-        final static IntegerArgument cache[];
+        static final IntegerArgument cache[];
 
         static {
             int high = Integer.getInteger("biz.paluch.redis.CommandArgs.IntegerCache", 128);
@@ -578,9 +578,9 @@ void encode(ByteBuf target) {
      * This codec writes directly {@code byte[]} to the target buffer without wrapping it in a {@link ByteBuffer} to reduce GC
      * pressure.
      */
-    public final static class ExperimentalByteArrayCodec extends ByteArrayCodec {
+    public static final class ExperimentalByteArrayCodec extends ByteArrayCodec {
 
-        public final static ExperimentalByteArrayCodec INSTANCE = new ExperimentalByteArrayCodec();
+        public static final ExperimentalByteArrayCodec INSTANCE = new ExperimentalByteArrayCodec();
 
         private ExperimentalByteArrayCodec() {
 
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java b/src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java
index 69321f1cef..1562f3ea7c 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java
@@ -23,15 +23,8 @@ public class CommandEncoder extends MessageToByteEncoder<Object> {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(CommandEncoder.class);
 
-    /**
-     * If TRACE level logging has been enabled at startup.
-     */
-    private final boolean traceEnabled;
-
-    /**
-     * If DEBUG level logging has been enabled at startup.
-     */
-    private final boolean debugEnabled;
+    private final boolean traceEnabled = logger.isTraceEnabled();
+    private final boolean debugEnabled = logger.isDebugEnabled();
 
     public CommandEncoder() {
         this(true);
@@ -39,8 +32,6 @@ public CommandEncoder() {
 
     public CommandEncoder(boolean preferDirect) {
         super(preferDirect);
-        traceEnabled = logger.isTraceEnabled();
-        debugEnabled = logger.isDebugEnabled();
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java b/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
index e31409700d..13db3aeec8 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
@@ -45,12 +45,8 @@ public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCom
     private final long commandHandlerId = COMMAND_HANDLER_COUNTER.incrementAndGet();
     private final Queue<RedisCommand<?, ?, ?>> queue = LettuceFactories.newConcurrentQueue();
     private final RedisStateMachine rsm = new RedisStateMachine();
-
-    // If TRACE level logging has been enabled at startup.
-    private final boolean traceEnabled;
-
-    // If DEBUG level logging has been enabled at startup.
-    private final boolean debugEnabled;
+    private final boolean traceEnabled = logger.isTraceEnabled();
+    private final boolean debugEnabled = logger.isDebugEnabled();
 
     private final ClientResources clientResources;
     private final Endpoint endpoint;
@@ -73,9 +69,6 @@ public CommandHandler(ClientResources clientResources, Endpoint endpoint) {
 
         this.clientResources = clientResources;
         this.endpoint = endpoint;
-
-        this.traceEnabled = logger.isTraceEnabled();
-        this.debugEnabled = logger.isDebugEnabled();
     }
 
     /**
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandKeyword.java b/src/main/java/com/lambdaworks/redis/protocol/CommandKeyword.java
index 130f85bbeb..de906e0b13 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandKeyword.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandKeyword.java
@@ -8,6 +8,7 @@
  * @author Will Glozer
  */
 public enum CommandKeyword implements ProtocolKeyword {
+
     ADDR, ADDSLOTS, AFTER, AGGREGATE, ALPHA, AND, ASK, ASC, ASYNC, BEFORE, BUMPEPOCH, BY, CHANNELS, COPY, COUNT, COUNTKEYSINSLOT, DELSLOTS, DESC, SOFT, HARD, ENCODING,
 
     FAILOVER, FORGET, FLUSH, FORCE, FLUSHSLOTS, GETNAME, GETKEYSINSLOT, HTSTATS, ID, IDLETIME, KILL, KEYSLOT, LEN, LIMIT, LIST, LOAD, MATCH,
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandWrapper.java b/src/main/java/com/lambdaworks/redis/protocol/CommandWrapper.java
index f3675ed03f..c05f0ea1b4 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandWrapper.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandWrapper.java
@@ -14,8 +14,8 @@
  */
 public class CommandWrapper<K, V, T> implements RedisCommand<K, V, T>, CompleteableCommand<T>, DecoratedCommand<K, V, T> {
 
-    protected RedisCommand<K, V, T> command;
-    private List<Consumer<? super T>> onComplete = new ArrayList<>();
+    protected final RedisCommand<K, V, T> command;
+    private final List<Consumer<? super T>> onComplete = new ArrayList<>();
 
     public CommandWrapper(RedisCommand<K, V, T> command) {
         this.command = command;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java b/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
index b567e8f608..59d96e0497 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
@@ -32,7 +32,6 @@
 public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
 
     private static final long LOGGING_QUIET_TIME_MS = TimeUnit.MILLISECONDS.convert(5, TimeUnit.SECONDS);
-
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(ConnectionWatchdog.class);
 
     private final Delay reconnectDelay;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java b/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
index b2c9b67274..8f0b46b394 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
@@ -45,12 +45,8 @@ public class DefaultEndpoint implements RedisChannelWriter, Endpoint, HasQueuedC
     private final ClientOptions clientOptions;
 
     private final QueuedCommands queuedCommands = new QueuedCommands();
-
-    // If TRACE level logging has been enabled at startup.
-    private final boolean traceEnabled;
-
-    // If DEBUG level logging has been enabled at startup.
-    private final boolean debugEnabled;
+    private final boolean traceEnabled = logger.isTraceEnabled();
+    private final boolean debugEnabled = logger.isDebugEnabled();
 
     protected volatile Channel channel;
     private String logPrefix;
@@ -71,8 +67,6 @@ public DefaultEndpoint(ClientOptions clientOptions) {
         LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
 
         this.clientOptions = clientOptions;
-        this.traceEnabled = logger.isTraceEnabled();
-        this.debugEnabled = logger.isDebugEnabled();
         this.reliability = clientOptions.isAutoReconnect() ? Reliability.AT_LEAST_ONCE : Reliability.AT_MOST_ONCE;
         this.queuedCommands.register(this);
     }
diff --git a/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java b/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
index ecd0fee04e..a8d96f5869 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
@@ -40,21 +40,18 @@ enum Type {
         int count = -1;
     }
 
-    private final State[] stack;
-    private int stackElements;
-
-    // If DEBUG level logging has been enabled at startup.
-    private final boolean debugEnabled;
+    private final State[] stack = new State[32];
+    private final boolean debugEnabled = logger.isDebugEnabled();
     private final LongProcessor longProcessor;
     private final ByteBuf responseElementBuffer = PooledByteBufAllocator.DEFAULT.directBuffer(1024);
     private final AtomicBoolean closed = new AtomicBoolean();
 
+    private int stackElements;
+
     /**
      * Initialize a new instance.
      */
     public RedisStateMachine() {
-        stack = new State[32];
-        debugEnabled = logger.isDebugEnabled();
 
         Version nettyBufferVersion = Version.identify().get("netty-buffer");
 
diff --git a/src/main/java/com/lambdaworks/redis/protocol/SharedLock.java b/src/main/java/com/lambdaworks/redis/protocol/SharedLock.java
index 4a3bce3c33..55956ba3ab 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/SharedLock.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/SharedLock.java
@@ -20,7 +20,7 @@
 class SharedLock {
 
     private final AtomicLong writers = new AtomicLong();
-    private Thread exclusiveLockOwner;
+    private volatile Thread exclusiveLockOwner;
 
     /**
      * Wait for stateLock and increment writers. Will wait if stateLock is locked and if writer counter is negative.
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java b/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java
index 2877dec55a..0b03c2e9fa 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java
@@ -22,8 +22,8 @@
  */
 public class PubSubCommandHandler<K, V> extends CommandHandler {
 
-    private PubSubEndpoint<K, V> endpoint;
-    private RedisCodec<K, V> codec;
+    private final PubSubEndpoint<K, V> endpoint;
+    private final RedisCodec<K, V> codec;
     private PubSubOutput<K, V, V> output;
 
     /**
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubOutput.java b/src/main/java/com/lambdaworks/redis/pubsub/PubSubOutput.java
index 18fecddc70..aace0280c2 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubOutput.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/PubSubOutput.java
@@ -16,6 +16,7 @@
  * @author Will Glozer
  */
 public class PubSubOutput<K, V, T> extends CommandOutput<K, V, T> {
+
     public enum Type {
         message, pmessage, psubscribe, punsubscribe, subscribe, unsubscribe
     }
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAdapter.java b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAdapter.java
index dc699fad82..de04d28b52 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAdapter.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAdapter.java
@@ -11,6 +11,7 @@
  * @author Will Glozer
  */
 public class RedisPubSubAdapter<K, V> implements RedisPubSubListener<K, V> {
+
     @Override
     public void message(K channel, V message) {
         // empty adapter method
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
index 7a74854617..1a11b1e1ed 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
@@ -19,7 +19,7 @@
  */
 public class RedisPubSubAsyncCommandsImpl<K, V> extends RedisAsyncCommandsImpl<K, V> implements RedisPubSubAsyncCommands<K, V> {
 
-    private PubSubCommandBuilder<K, V> commandBuilder;
+    private final PubSubCommandBuilder<K, V> commandBuilder;
 
     /**
      * Initialize a new connection.
diff --git a/src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java b/src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java
index 6bb81e7110..08eaa61798 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java
@@ -36,8 +36,8 @@
  */
 public class DirContextDnsResolver implements DnsResolver, Closeable {
 
-    final static String PREFER_IPV4_KEY = "java.net.preferIPv4Stack";
-    final static String PREFER_IPV6_KEY = "java.net.preferIPv6Stack";
+    static final String PREFER_IPV4_KEY = "java.net.preferIPv4Stack";
+    static final String PREFER_IPV6_KEY = "java.net.preferIPv6Stack";
 
     private static final int IPV4_PART_COUNT = 4;
     private static final int IPV6_PART_COUNT = 8;
@@ -280,7 +280,7 @@ private static Properties getProperties(Iterable<String> dnsServers) {
     /**
      * Stack preference utility.
      */
-    private final static class StackPreference {
+    private static final class StackPreference {
 
         final boolean preferIpv4;
         final boolean preferIpv6;

From 5a8c1baa69d2c87eada3e375b03cf4e2878c0afc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 3 Sep 2016 20:06:56 +0200
Subject: [PATCH 019/808] Fix RandomKeys generation

Make sure that 500 different random keys are generated. Previously, it was possible that duplicate keys were generated.
---
 src/test/java/com/lambdaworks/RandomKeys.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/lambdaworks/RandomKeys.java b/src/test/java/com/lambdaworks/RandomKeys.java
index 0524e3f7e1..95ee0cf500 100644
--- a/src/test/java/com/lambdaworks/RandomKeys.java
+++ b/src/test/java/com/lambdaworks/RandomKeys.java
@@ -36,15 +36,19 @@ public class RandomKeys {
         List<String> keys = new ArrayList<>();
         List<String> values = new ArrayList<>();
         Map<String, String> map = new HashMap<>();
+        Set<String> uniqueKeys = new HashSet<>();
 
-        for (int i = 0; i < COUNT; i++) {
+        while (map.size() < COUNT) {
 
             String key = RandomStringUtils.random(10, true, true);
             String value = RandomStringUtils.random(10, true, true);
 
-            keys.add(key);
-            values.add(value);
-            map.put(key, value);
+            if (uniqueKeys.add(key)) {
+
+                keys.add(key);
+                values.add(value);
+                map.put(key, value);
+            }
         }
 
         KEYS = Collections.unmodifiableList(keys);

From 4507911b8d08750846e5eb3d822b67029a4e74fd Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 3 Sep 2016 20:59:18 +0200
Subject: [PATCH 020/808] Fix race condition in
 ConnectionTestUtil.getConnectionWatchdog #216

Extract ConnectionWatchdog from DefaultEndpoint and not the Channel as channels are reconnected and may enter a state where no handlers are available yet.
---
 .../com/lambdaworks/ConnectionTestUtil.java   | 56 +++++++++++++------
 .../lambdaworks/redis/ClientOptionsTest.java  | 17 +++---
 .../com/lambdaworks/redis/ClientTest.java     |  3 +-
 3 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/src/test/java/com/lambdaworks/ConnectionTestUtil.java b/src/test/java/com/lambdaworks/ConnectionTestUtil.java
index d13c68443b..47fb6216f0 100644
--- a/src/test/java/com/lambdaworks/ConnectionTestUtil.java
+++ b/src/test/java/com/lambdaworks/ConnectionTestUtil.java
@@ -6,9 +6,7 @@
 
 import com.lambdaworks.redis.RedisChannelHandler;
 import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.StatefulRedisConnectionImpl;
 import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
 import com.lambdaworks.redis.internal.LettuceFactories;
 import com.lambdaworks.redis.protocol.CommandHandler;
 import com.lambdaworks.redis.protocol.ConnectionWatchdog;
@@ -19,40 +17,53 @@
 /**
  * @author Mark Paluch
  */
+@SuppressWarnings("unchecked")
 public class ConnectionTestUtil {
 
     /**
-     * Extract the {@link Channel} from a stateful connection.
+     * Extract the {@link Channel} from a {@link StatefulConnection}.
      * 
-     * @param connection
-     * @return
+     * @param connection the connection
+     * @return the {@link Channel}
      */
     public static Channel getChannel(StatefulConnection<?, ?> connection) {
-        RedisChannelHandler<?, ?> channelHandler = (RedisChannelHandler<?, ?>) connection;
 
+        RedisChannelHandler<?, ?> channelHandler = (RedisChannelHandler<?, ?>) connection;
         return (Channel) ReflectionTestUtils.getField(channelHandler.getChannelWriter(), "channel");
     }
 
     /**
-     * Extract the {@link ConnectionWatchdog} from a stateful connection.
+     * Extract the {@link ConnectionWatchdog} from a {@link StatefulConnection}.
      * 
-     * @param connection
-     * @return
+     * @param connection the connection
+     * @return the {@link ConnectionWatchdog}
      */
     public static ConnectionWatchdog getConnectionWatchdog(StatefulConnection<?, ?> connection) {
 
-        Channel channel = getChannel(connection);
-        return channel.pipeline().get(ConnectionWatchdog.class);
-    }
+        RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection);
+        if (channelWriter instanceof DefaultEndpoint) {
+            return (ConnectionWatchdog) ReflectionTestUtils.getField(channelWriter, "connectionWatchdog");
+        }
 
-    public static <K, V> StatefulRedisConnectionImpl<K, V> getStatefulConnection(RedisAsyncCommands<K, V> connection) {
-        return (StatefulRedisConnectionImpl<K, V>) connection.getStatefulConnection();
+        return null;
     }
 
-    public static <K, V> RedisChannelWriter getChannelWriter(StatefulConnection<K, V> connection) {
-        return ((RedisChannelHandler<K, V>) connection).getChannelWriter();
+    /**
+     * Extract the {@link RedisChannelWriter} from a {@link StatefulConnection}.
+     * 
+     * @param connection the connection
+     * @return the {@link RedisChannelWriter}
+     */
+    public static RedisChannelWriter getChannelWriter(StatefulConnection<?, ?> connection) {
+        return ((RedisChannelHandler<?, ?>) connection).getChannelWriter();
     }
 
+    /**
+     * Extract the queue from a from a {@link StatefulConnection}.
+     *
+     * @param connection the connection
+     * @return the queue
+     */
     public static Queue<Object> getQueue(StatefulConnection<?, ?> connection) {
 
         Channel channel = getChannel(connection);
@@ -63,9 +74,14 @@ public static Queue<Object> getQueue(StatefulConnection<?, ?> connection) {
         }
 
         return LettuceFactories.newConcurrentQueue();
-
     }
 
+    /**
+     * Extract the command buffer from a from a {@link StatefulConnection}.
+     * 
+     * @param connection the connection
+     * @return the queue
+     */
     public static Queue<Object> getCommandBuffer(StatefulConnection<?, ?> connection) {
 
         RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection);
@@ -76,6 +92,12 @@ public static Queue<Object> getCommandBuffer(StatefulConnection<?, ?> connection
         return LettuceFactories.newConcurrentQueue();
     }
 
+    /**
+     * Extract the connection state from a from a {@link StatefulConnection}.
+     * 
+     * @param connection the connection
+     * @return the connection state as {@link String}
+     */
     public static String getConnectionState(StatefulConnection<?, ?> connection) {
 
         Channel channel = getChannel(connection);
diff --git a/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java b/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
index 0777067daf..a53dd74b4f 100644
--- a/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
@@ -2,7 +2,6 @@
 
 import static com.lambdaworks.ConnectionTestUtil.getChannel;
 import static com.lambdaworks.ConnectionTestUtil.getConnectionWatchdog;
-import static com.lambdaworks.ConnectionTestUtil.getStatefulConnection;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
@@ -51,18 +50,20 @@ protected void checkAssertions(ClientOptions sut) {
     @Test
     public void variousClientOptions() throws Exception {
 
-        RedisAsyncCommands<String, String> plain = client.connect().async();
+        StatefulRedisConnection<String, String> connection1 = client.connect();
 
-        assertThat(getStatefulConnection(plain).getOptions().isAutoReconnect()).isTrue();
+        assertThat(connection1.getOptions().isAutoReconnect()).isTrue();
+        connection1.close();
 
         client.setOptions(ClientOptions.builder().autoReconnect(false).build());
-        RedisAsyncCommands<String, String> connection = client.connect().async();
-        assertThat(getStatefulConnection(connection).getOptions().isAutoReconnect()).isFalse();
 
-        assertThat(getStatefulConnection(plain).getOptions().isAutoReconnect()).isTrue();
+        StatefulRedisConnection<String, String> connection2 = client.connect();
+        assertThat(connection2.getOptions().isAutoReconnect()).isFalse();
 
-        plain.getStatefulConnection().close();
-        connection.getStatefulConnection().close();
+        assertThat(connection1.getOptions().isAutoReconnect()).isTrue();
+
+        connection1.close();
+        connection2.close();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/ClientTest.java b/src/test/java/com/lambdaworks/redis/ClientTest.java
index f0f2af52f3..47c773cc7f 100644
--- a/src/test/java/com/lambdaworks/redis/ClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientTest.java
@@ -4,7 +4,6 @@
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
 import static com.google.code.tempusfugit.temporal.WaitFor.waitOrTimeout;
-import static com.lambdaworks.ConnectionTestUtil.getStatefulConnection;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.TimeUnit;
@@ -76,7 +75,7 @@ public void listenerTest() throws Exception {
 
         RedisAsyncCommands<String, String> connection = client.connect().async();
 
-        StatefulRedisConnection<String, String> statefulRedisConnection = getStatefulConnection(connection);
+        StatefulRedisConnection<String, String> statefulRedisConnection = connection.getStatefulConnection();
 
         waitOrTimeout(() -> listener.onConnected != null, Timeout.timeout(seconds(2)));
 

From 0e8d53d05666d26da5c91c27b843ae6a3558850e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 3 Sep 2016 21:15:00 +0200
Subject: [PATCH 021/808] Fix error handling on reactive command dispatching
 #349

Command dispatching errors are now dispatched to the subscriber using onError.
---
 .../com/lambdaworks/redis/RedisPublisher.java |  6 ++++-
 .../redis/ReactiveConnectionTest.java         | 25 +++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/RedisPublisher.java b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
index eb2dfea4e0..f145a10ade 100644
--- a/src/main/java/com/lambdaworks/redis/RedisPublisher.java
+++ b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
@@ -364,7 +364,11 @@ void request(RedisSubscription<?> subscription, long n) {
                     Operators.addAndGet(subscription.demand, n);
 
                     if (subscription.changeState(this, DEMAND)) {
-                        subscription.checkCommandDispatch();
+                        try {
+                            subscription.checkCommandDispatch();
+                        } catch (Exception ex) {
+                            subscription.onError(ex);
+                        }
                         subscription.checkOnDataAvailable();
                     }
                 }
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
index 9c37e3f5e8..8ca90b8d21 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
@@ -1,17 +1,16 @@
 package com.lambdaworks.redis;
 
 import static com.google.code.tempusfugit.temporal.Duration.millis;
+import static com.lambdaworks.redis.ClientOptions.DisconnectedBehavior.REJECT_COMMANDS;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CancellationException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -24,6 +23,7 @@
 import com.lambdaworks.Wait;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
+import com.lambdaworks.redis.reactive.TestSubscriber;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -198,6 +198,27 @@ public void subscriberCompletingWithExceptionShouldBeHandledSafely() throws Exce
         assertThat(valueB).isEqualTo("valueB");
     }
 
+    @Test
+    public void subscribeWithDisconnectedClient() throws Exception {
+
+        client.setOptions(ClientOptions.builder().disconnectedBehavior(REJECT_COMMANDS).autoReconnect(false).build());
+
+        try (StatefulRedisConnection<String, String> connection = client.connect()) {
+
+            connection.async().quit();
+            Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
+
+            Mono<String> ping = connection.reactive().ping();
+
+            ping.subscribeWith(TestSubscriber.create()).assertErrorWith(throwable -> {
+
+                assertThat(throwable).isInstanceOf(RedisException.class)
+                        .hasMessageContaining("not connected. Commands are rejected");
+
+            }).await();
+        }
+    }
+
     private static Subscriber<String> createSubscriberWithExceptionOnComplete() {
         return new Subscriber<String>() {
 

From 33852b786f62eee658546b5455b2ab3cdf1681b9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 3 Sep 2016 21:25:57 +0200
Subject: [PATCH 022/808] Upgrade to AssertJ 3.5.2 #352

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d582b96756..5aff840ea4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -219,7 +219,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.2.0</version>
+            <version>3.5.2</version>
             <scope>test</scope>
         </dependency>
 

From 7047cc5ae830839d14416deb7ad6be6bfd7fe319 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 3 Sep 2016 21:35:19 +0200
Subject: [PATCH 023/808] Upgrade netty to 4.0.41.Final and 4.1.5.Final #353

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5aff840ea4..fadd047171 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
         <github.site.upload.skip>true</github.site.upload.skip>
         <lettuce-release-version>4.2.2.Final</lettuce-release-version>
         <lettuce3-release-version>3.5.0.Final</lettuce3-release-version>
-        <netty-version>4.1.4.Final</netty-version>
+        <netty-version>4.1.5.Final</netty-version>
     </properties>
 
     <scm>
@@ -110,7 +110,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative</artifactId>
-            <version>1.1.33.Fork20</version>
+            <version>1.1.33.Fork21</version>
             <classifier>${os.detected.classifier}</classifier>
             <scope>provided</scope>
             <optional>true</optional>
@@ -285,7 +285,7 @@
         <profile>
             <id>netty-40</id>
             <properties>
-                <netty-version>4.0.40.Final</netty-version>
+               <netty-version>4.0.41.Final</netty-version>
             </properties>
         </profile>
         <profile>

From 50f2814348281cccd66933b4a6ab48d609088c54 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 3 Sep 2016 21:40:38 +0200
Subject: [PATCH 024/808] Polishing

---
 .../lambdaworks/redis/AbstractRedisReactiveCommands.java    | 6 +++---
 src/main/java/com/lambdaworks/redis/RedisClient.java        | 4 ++--
 src/main/java/com/lambdaworks/redis/RedisPublisher.java     | 2 +-
 .../cluster/RedisAdvancedClusterReactiveCommandsImpl.java   | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
index 87fb9695c3..9451d3d22f 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
@@ -1768,7 +1768,7 @@ public <T> Flux<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output,
     }
 
     public <T> Flux<T> createFlux(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return Flux.from(new RedisPublisher(commandSupplier, connection, false));
+        return Flux.from(new RedisPublisher<>(commandSupplier, connection, false));
     }
 
     protected <T> Mono<T> createMono(CommandType type, CommandOutput<K, V, T> output, CommandArgs<K, V> args) {
@@ -1776,12 +1776,12 @@ protected <T> Mono<T> createMono(CommandType type, CommandOutput<K, V, T> output
     }
 
     public <T> Mono<T> createMono(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return Mono.from(new RedisPublisher(commandSupplier, connection, false));
+        return Mono.from(new RedisPublisher<>(commandSupplier, connection, false));
     }
     
     @SuppressWarnings("unchecked")
     public <T, R> Flux<R> createDissolvingFlux(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return (Flux<R>) Flux.from(new RedisPublisher(commandSupplier, connection, true));
+        return (Flux<R>) Flux.from(new RedisPublisher<>(commandSupplier, connection, true));
     }
 
     public void setTimeout(long timeout, TimeUnit unit) {
diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/com/lambdaworks/redis/RedisClient.java
index cdcc455459..91292f3391 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClient.java
@@ -290,9 +290,9 @@ private <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V
         PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<K, V>(clientOptions);
 
         StatefulRedisPubSubConnectionImpl<K, V> connection = newStatefulRedisPubSubConnection(endpoint,
-                (RedisChannelWriter) endpoint, codec, timeout.timeout, timeout.timeUnit);
+                endpoint, codec, timeout.timeout, timeout.timeUnit);
 
-        connectStateful(connection, redisURI, endpoint, () -> new PubSubCommandHandler(clientResources, codec, endpoint));
+        connectStateful(connection, redisURI, endpoint, () -> new PubSubCommandHandler<>(clientResources, codec, endpoint));
 
         return connection;
     }
diff --git a/src/main/java/com/lambdaworks/redis/RedisPublisher.java b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
index f145a10ade..9f25888566 100644
--- a/src/main/java/com/lambdaworks/redis/RedisPublisher.java
+++ b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
@@ -286,7 +286,7 @@ void checkCommandDispatch() {
             }
         }
 
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings({"unchecked", "rawtypes"})
         private void dispatchCommand() {
             if (command.getOutput() instanceof StreamingOutput<?>) {
                 StreamingOutput<T> streamingOutput = (StreamingOutput<T>) command.getOutput();
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index 4d69878e1e..985812a43a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -124,6 +124,7 @@ public Flux<KeyValue<K, V>> mget(K... keys) {
         return mget(Arrays.asList(keys));
     }
 
+    @SuppressWarnings("unchecked")
     public Flux<KeyValue<K, V>> mget(Iterable<K> keys) {
 
         List<K> keyList = LettuceLists.newList(keys);

From 3c410bf8d4c0e85cddea17358038102b57fc2d21 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 4 Sep 2016 12:51:06 +0200
Subject: [PATCH 025/808] Provide connection pooling support #264

Lettuce now provides a more generic support to connection pooling. ConnectionPoolSupport requires a connection supplier to construct a connection pool. Pooled connection instances can be either wrapped to release connections back to the pool once they are closed or direct connections that require to be released after usage.

 ConnectionPoolSupport is intended to replace connection pooling on RedisClient entirely. Users get full control over the pool and can set up connection pooling to their needs without being constrained by predefined client methods.
---
 .../com/lambdaworks/redis/RedisClient.java    |   6 -
 .../redis/support/ConnectionPoolSupport.java  | 323 ++++++++++++++++++
 .../support/ConnectionPoolSupportTest.java    | 208 +++++++++++
 3 files changed, 531 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java
 create mode 100644 src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java

diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/com/lambdaworks/redis/RedisClient.java
index 91292f3391..c90d311f2c 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClient.java
@@ -42,7 +42,6 @@
 public class RedisClient extends AbstractRedisClient {
 
     private static final RedisURI EMPTY_URI = new RedisURI();
-    private static final boolean POOL_AVAILABLE = isPresent("org.apache.commons.pool2.impl.GenericObjectPool");
 
     private final RedisURI redisURI;
 
@@ -568,11 +567,6 @@ private void checkForRedisURI() {
         checkValidRedisURI(this.redisURI);
     }
 
-    private void checkPoolDependency() {
-        LettuceAssert.assertState(POOL_AVAILABLE,
-                "Cannot use connection pooling without the optional Apache commons-pool2 library on the class path");
-    }
-
     /**
      * Set the {@link ClientOptions} for the client.
      *
diff --git a/src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java b/src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java
new file mode 100644
index 0000000000..5cb18ea4cb
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java
@@ -0,0 +1,323 @@
+package com.lambdaworks.redis.support;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+
+import com.lambdaworks.redis.RedisClient;
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.cluster.RedisClusterClient;
+import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
+import org.apache.commons.pool2.BasePooledObjectFactory;
+import org.apache.commons.pool2.ObjectPool;
+import org.apache.commons.pool2.PooledObject;
+import org.apache.commons.pool2.impl.DefaultPooledObject;
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+import org.apache.commons.pool2.impl.SoftReferenceObjectPool;
+
+import com.lambdaworks.redis.ClientOptions;
+import com.lambdaworks.redis.RedisException;
+import com.lambdaworks.redis.api.StatefulConnection;
+import com.lambdaworks.redis.internal.AbstractInvocationHandler;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Connection pool support for {@link GenericObjectPool} and {@link SoftReferenceObjectPool}. Connection pool creation requires
+ * a {@link Supplier} that creates Redis connections. The pool can allocate either wrapped or direct connections.
+ * <ul>
+ * <li>Wrapped instances will return the connection back to the pool when called {@link StatefulConnection#close()}.</li>
+ * <li>Regular connections need to be returned to the pool with {@link GenericObjectPool#returnObject(Object)}</li>
+ * </ul>
+ * <p>
+ * Lettuce connections are designed to be thread-safe so one connection can be shared amongst multiple threads and lettuce
+ * connections {@link ClientOptions#isAutoReconnect() auto-reconnect} by default. Connection pooling with lettuce might be
+ * required when you're invoking Redis operations in multiple threads and you use
+ * <ul>
+ * <li>blocking commands such as {@code BLPOP}.</li>
+ * <li>transactions {@code BLPOP}.</li>
+ * <li>{@link StatefulConnection#setAutoFlushCommands(boolean) command batching}.</li>
+ * </ul>
+ *
+ * Transactions and command batching affect connection state. Blocking commands won't propagate queued commands to Redis until
+ * the blocking command is resolved.
+ *
+ * <h2>Example usage</h2>
+ * 
+ * <pre>
+ * // application initialization
+ * RedisClusterClient clusterClient = RedisClusterClient.create(RedisURI.create(host, port));
+ * GenericObjectPool&lt;StatefulRedisClusterConnection&lt;String, String&gt;&gt; pool = ConnectionPoolSupport
+ *         .createGenericObjectPool(() -&gt; clusterClient.connect(), new GenericObjectPoolConfig());
+ * 
+ * // executing work
+ * try (StatefulRedisClusterConnection&lt;String, String&gt; connection = pool.borrowObject()) {
+ *     // perform some work
+ * }
+ * 
+ * // terminating
+ * pool.close();
+ * clusterClient.shutdown();
+ * </pre>
+ *
+ * @author Mark Paluch
+ * @since 4.3
+ */
+public abstract class ConnectionPoolSupport {
+
+    private ConnectionPoolSupport() {
+    }
+
+    /**
+     * Creates a new {@link GenericObjectPool} using the {@link Supplier}. Allocated instances are wrapped and must not be
+     * returned with {@link ObjectPool#returnObject(Object)}.
+     *
+     * @param connectionSupplier must not be {@literal null}.
+     * @param config must not be {@literal null}.
+     * @param <T> connection type.
+     * @return the connection pool.
+     */
+    public static <T extends StatefulConnection<?, ?>> GenericObjectPool<T> createGenericObjectPool(
+            Supplier<T> connectionSupplier, GenericObjectPoolConfig config) {
+        return createGenericObjectPool(connectionSupplier, config, true);
+    }
+
+    /**
+     * Creates a new {@link GenericObjectPool} using the {@link Supplier}.
+     *
+     * @param connectionSupplier must not be {@literal null}.
+     * @param config must not be {@literal null}.
+     * @param wrapConnections {@literal false} to return direct connections that need to be returned to the pool using
+     *        {@link ObjectPool#returnObject(Object)}. {@literal true} to return wrapped connection that are returned to the
+     *        pool when invoking {@link StatefulConnection#close()}.
+     * @param <T> connection type.
+     * @return the connection pool.
+     */
+    public static <T extends StatefulConnection<?, ?>> GenericObjectPool<T> createGenericObjectPool(
+            Supplier<T> connectionSupplier, GenericObjectPoolConfig config, boolean wrapConnections) {
+
+        LettuceAssert.notNull(connectionSupplier, "Connection supplier must not be null");
+        LettuceAssert.notNull(config, "GenericObjectPoolConfig must not be null");
+
+        AtomicReference<ObjectPool<T>> poolRef = new AtomicReference<>();
+        Supplier<T> providerToUse = wrapConnections ? wrappedConnectionSupplier(connectionSupplier, poolRef)
+                : connectionSupplier;
+
+        GenericObjectPool<T> pool = new GenericObjectPool<>(new RedisPooledObjectFactory<T>(providerToUse), config);
+
+        poolRef.set(pool);
+
+        return pool;
+    }
+
+    /**
+     * Creates a new {@link SoftReferenceObjectPool} using the {@link Supplier}. Allocated instances are wrapped and must not be
+     * returned with {@link ObjectPool#returnObject(Object)}.
+     *
+     * @param connectionSupplier must not be {@literal null}.
+     * @param <T> connection type.
+     * @return the connection pool.
+     */
+    public static <T extends StatefulConnection<?, ?>> SoftReferenceObjectPool<T> createSoftReferenceObjectPool(
+            Supplier<T> connectionSupplier) {
+        return createSoftReferenceObjectPool(connectionSupplier, true);
+    }
+
+    /**
+     * Creates a new {@link SoftReferenceObjectPool} using the {@link Supplier}.
+     *
+     * @param connectionSupplier must not be {@literal null}.
+     * @param wrapConnections {@literal false} to return direct connections that need to be returned to the pool using
+     *        {@link ObjectPool#returnObject(Object)}. {@literal true} to return wrapped connection that are returned to the
+     *        pool when invoking {@link StatefulConnection#close()}.
+     * @param <T> connection type.
+     * @return the connection pool.
+     */
+    public static <T extends StatefulConnection<?, ?>> SoftReferenceObjectPool<T> createSoftReferenceObjectPool(
+            Supplier<T> connectionSupplier, boolean wrapConnections) {
+
+        LettuceAssert.notNull(connectionSupplier, "Connection supplier must not be null");
+
+        AtomicReference<ObjectPool<T>> poolRef = new AtomicReference<>();
+        Supplier<T> providerToUse = wrapConnections ? wrappedConnectionSupplier(connectionSupplier, poolRef)
+                : connectionSupplier;
+
+        SoftReferenceObjectPool<T> pool = new SoftReferenceObjectPool<>(new RedisPooledObjectFactory<>(providerToUse));
+        poolRef.set(pool);
+
+        return pool;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <T> Supplier<T> wrappedConnectionSupplier(Supplier<T> connectionSupplier,
+            AtomicReference<ObjectPool<T>> poolRef) {
+
+        return new Supplier<T>() {
+
+            @Override
+            public T get() {
+
+                T connection = connectionSupplier.get();
+                ReturnObjectOnCloseInvocationHandler<T> handler = new ReturnObjectOnCloseInvocationHandler<>(connection,
+                        poolRef.get());
+
+                T proxiedConnection = (T) Proxy.newProxyInstance(getClass().getClassLoader(),
+                        connection.getClass().getInterfaces(), handler);
+                handler.setProxiedConnection(proxiedConnection);
+
+                return proxiedConnection;
+            }
+        };
+    }
+
+    /**
+     * @author Mark Paluch
+     * @since 4.3
+     */
+    private static class RedisPooledObjectFactory<T extends StatefulConnection<?, ?>> extends BasePooledObjectFactory<T> {
+
+        private final Supplier<T> connectionSupplier;
+
+        RedisPooledObjectFactory(Supplier<T> connectionSupplier) {
+            this.connectionSupplier = connectionSupplier;
+        }
+
+        @Override
+        public T create() throws Exception {
+            return connectionSupplier.get();
+        }
+
+        @Override
+        public PooledObject<T> wrap(T obj) {
+            return new DefaultPooledObject<>(obj);
+        }
+
+        @Override
+        public boolean validateObject(PooledObject<T> p) {
+            return p.getObject().isOpen();
+        }
+    }
+
+    /**
+     * Invocation handler that takes care of connection.close(). Connections are returned to the pool on a close()-call.
+     *
+     * @author Mark Paluch
+     * @param <T> Connection type.
+     * @since 4.3
+     */
+    private static class ReturnObjectOnCloseInvocationHandler<T> extends AbstractInvocationHandler {
+
+        private T connection;
+        private T proxiedConnection;
+        private Map<Method, Object> connectionProxies = new ConcurrentHashMap<>(5, 1);
+
+        private final ObjectPool<T> pool;
+
+        ReturnObjectOnCloseInvocationHandler(T connection, ObjectPool<T> pool) {
+            this.connection = connection;
+            this.pool = pool;
+        }
+
+        void setProxiedConnection(T proxiedConnection) {
+            this.proxiedConnection = proxiedConnection;
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
+
+            if (method.getName().equals("getStatefulConnection")) {
+                return proxiedConnection;
+            }
+
+            if (connection == null) {
+                throw new RedisException("Connection is deallocated and cannot be used anymore.");
+            }
+
+            if (method.getName().equals("close")) {
+                pool.returnObject(proxiedConnection);
+                connection = null;
+                proxiedConnection = null;
+                connectionProxies.clear();
+                return null;
+            }
+
+            try {
+
+                if (method.getName().equals("sync") || method.getName().equals("async")
+                        || method.getName().equals("reactive")) {
+                    return connectionProxies.computeIfAbsent(method, m -> {
+
+                        try {
+                            Object result = method.invoke(connection, args);
+
+                            result = Proxy.newProxyInstance(getClass().getClassLoader(), result.getClass().getInterfaces(),
+                                    new DelegateCloseToConnectionInvocationHandler((AutoCloseable) proxiedConnection, result));
+
+                            return result;
+                        } catch (IllegalAccessException e) {
+                            throw new RedisException(e);
+                        } catch (InvocationTargetException e) {
+                            throw new RedisException(e.getTargetException());
+                        }
+                    });
+                }
+
+                return method.invoke(connection, args);
+
+            } catch (InvocationTargetException e) {
+                throw e.getTargetException();
+            }
+        }
+
+        public T getConnection() {
+            return connection;
+        }
+    }
+
+    /**
+     * Invocation handler that takes care of connection.close(). Connections are returned to the pool on a close()-call.
+     *
+     * @author Mark Paluch
+     * @param <T> Connection type.
+     * @since 4.3
+     */
+    private static class DelegateCloseToConnectionInvocationHandler<T extends AutoCloseable> extends AbstractInvocationHandler {
+
+        private final T proxiedConnection;
+        private final Object api;
+
+        DelegateCloseToConnectionInvocationHandler(T proxiedConnection, Object api) {
+
+            this.proxiedConnection = proxiedConnection;
+            this.api = api;
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
+
+            if (method.getName().equals("getStatefulConnection")) {
+                return proxiedConnection;
+            }
+
+            try {
+
+                if (method.getName().equals("close")) {
+                    proxiedConnection.close();
+                    return null;
+                }
+
+                return method.invoke(api, args);
+
+            } catch (InvocationTargetException e) {
+                throw e.getTargetException();
+            }
+        }
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java b/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java
new file mode 100644
index 0000000000..a9bf9246f8
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java
@@ -0,0 +1,208 @@
+package com.lambdaworks.redis.support;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
+import java.lang.reflect.Proxy;
+
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+import org.apache.commons.pool2.impl.SoftReferenceObjectPool;
+import org.junit.Test;
+
+import com.lambdaworks.TestClientResources;
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.api.async.RedisAsyncCommands;
+import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.cluster.RedisAdvancedClusterAsyncCommandsImpl;
+import com.lambdaworks.redis.cluster.RedisAdvancedClusterReactiveCommandsImpl;
+import com.lambdaworks.redis.cluster.RedisClusterClient;
+import com.lambdaworks.redis.cluster.StatefulRedisClusterConnectionImpl;
+import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
+import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
+import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
+import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.masterslave.MasterSlave;
+import com.lambdaworks.redis.masterslave.StatefulRedisMasterSlaveConnection;
+
+/**
+ * @author Mark Paluch
+ */
+public class ConnectionPoolSupportTest extends AbstractRedisClientTest {
+
+    @Test
+    public void genericPoolShouldWorkWithWrappedConnections() throws Exception {
+
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
+                .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig());
+
+        StatefulRedisConnection<String, String> connection = pool.borrowObject();
+        RedisCommands<String, String> sync = connection.sync();
+        sync.ping();
+
+        connection.close();
+        pool.close();
+    }
+
+    @Test
+    public void genericPoolUsingWrappingShouldPropagateExceptionsCorrectly() throws Exception {
+
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
+                .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig());
+
+        StatefulRedisConnection<String, String> connection = pool.borrowObject();
+        RedisCommands<String, String> sync = connection.sync();
+        sync.set(key, value);
+
+        try {
+            sync.hgetall(key);
+            fail("Missing RedisCommandExecutionException");
+        } catch (RedisCommandExecutionException e) {
+            assertThat(e).hasMessageContaining("WRONGTYPE");
+        }
+
+        connection.close();
+        pool.close();
+    }
+
+    @Test
+    public void wrappedConnectionShouldUseWrappers() throws Exception {
+
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
+                .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig());
+
+        StatefulRedisConnection<String, String> connection = pool.borrowObject();
+        RedisCommands<String, String> sync = connection.sync();
+
+        assertThat(connection).isInstanceOf(StatefulRedisConnection.class)
+                .isNotInstanceOf(StatefulRedisClusterConnectionImpl.class);
+        assertThat(Proxy.isProxyClass(connection.getClass())).isTrue();
+
+        assertThat(sync).isInstanceOf(RedisCommands.class);
+        assertThat(connection.async()).isInstanceOf(RedisAsyncCommands.class).isNotInstanceOf(RedisAsyncCommandsImpl.class);
+        assertThat(connection.reactive()).isInstanceOf(RedisReactiveCommands.class)
+                .isNotInstanceOf(RedisReactiveCommandsImpl.class);
+        assertThat(sync.getStatefulConnection()).isInstanceOf(StatefulRedisConnection.class)
+                .isNotInstanceOf(StatefulRedisConnectionImpl.class).isSameAs(connection);
+
+        connection.close();
+        pool.close();
+    }
+
+    @Test
+    public void wrappedMasterSlaveConnectionShouldUseWrappers() throws Exception {
+
+        GenericObjectPool<StatefulRedisMasterSlaveConnection<String, String>> pool = ConnectionPoolSupport
+                .createGenericObjectPool(() -> MasterSlave.connect(client, new StringCodec(), RedisURI.create(host, port)),
+                        new GenericObjectPoolConfig());
+
+        StatefulRedisMasterSlaveConnection<String, String> connection = pool.borrowObject();
+        RedisCommands<String, String> sync = connection.sync();
+
+        assertThat(connection).isInstanceOf(StatefulRedisMasterSlaveConnection.class);
+        assertThat(Proxy.isProxyClass(connection.getClass())).isTrue();
+
+        assertThat(sync).isInstanceOf(RedisCommands.class);
+        assertThat(connection.async()).isInstanceOf(RedisAsyncCommands.class).isNotInstanceOf(RedisAsyncCommandsImpl.class);
+        assertThat(connection.reactive()).isInstanceOf(RedisReactiveCommands.class)
+                .isNotInstanceOf(RedisReactiveCommandsImpl.class);
+        assertThat(sync.getStatefulConnection()).isInstanceOf(StatefulRedisConnection.class)
+                .isNotInstanceOf(StatefulRedisConnectionImpl.class).isSameAs(connection);
+
+        connection.close();
+        pool.close();
+    }
+
+    @Test
+    public void wrappedClusterConnectionShouldUseWrappers() throws Exception {
+
+        RedisClusterClient redisClusterClient = RedisClusterClient.create(TestClientResources.create(),
+                RedisURI.create(TestSettings.host(), 7379));
+
+        GenericObjectPool<StatefulRedisClusterConnection<String, String>> pool = ConnectionPoolSupport
+                .createGenericObjectPool(redisClusterClient::connect, new GenericObjectPoolConfig());
+
+        StatefulRedisClusterConnection<String, String> connection = pool.borrowObject();
+        RedisAdvancedClusterCommands<String, String> sync = connection.sync();
+
+        assertThat(connection).isInstanceOf(StatefulRedisClusterConnection.class)
+                .isNotInstanceOf(StatefulRedisClusterConnectionImpl.class);
+        assertThat(Proxy.isProxyClass(connection.getClass())).isTrue();
+
+        assertThat(sync).isInstanceOf(RedisAdvancedClusterCommands.class);
+        assertThat(connection.async()).isInstanceOf(RedisAdvancedClusterAsyncCommands.class)
+                .isNotInstanceOf(RedisAdvancedClusterAsyncCommandsImpl.class);
+        assertThat(connection.reactive()).isInstanceOf(RedisAdvancedClusterReactiveCommands.class)
+                .isNotInstanceOf(RedisAdvancedClusterReactiveCommandsImpl.class);
+        assertThat(sync.getStatefulConnection()).isInstanceOf(StatefulRedisClusterConnection.class)
+                .isNotInstanceOf(StatefulRedisClusterConnectionImpl.class).isSameAs(connection);
+
+        connection.close();
+        pool.close();
+
+        FastShutdown.shutdown(redisClusterClient);
+    }
+
+    @Test
+    public void plainConnectionShouldNotUseWrappers() throws Exception {
+
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
+                .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig(), false);
+
+        StatefulRedisConnection<String, String> connection = pool.borrowObject();
+        RedisCommands<String, String> sync = connection.sync();
+
+        assertThat(connection).isInstanceOf(StatefulRedisConnection.class)
+                .isNotInstanceOf(StatefulRedisClusterConnectionImpl.class);
+        assertThat(Proxy.isProxyClass(connection.getClass())).isFalse();
+
+        assertThat(sync).isInstanceOf(RedisCommands.class);
+        assertThat(connection.async()).isInstanceOf(RedisAsyncCommands.class).isInstanceOf(RedisAsyncCommandsImpl.class);
+        assertThat(connection.reactive()).isInstanceOf(RedisReactiveCommands.class)
+                .isInstanceOf(RedisReactiveCommandsImpl.class);
+        assertThat(sync.getStatefulConnection()).isInstanceOf(StatefulRedisConnection.class)
+                .isInstanceOf(StatefulRedisConnectionImpl.class);
+
+        pool.returnObject(connection);
+        pool.close();
+    }
+
+    @Test
+    public void softRefPoolShouldWorkWithWrappedConnections() throws Exception {
+
+        SoftReferenceObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
+                .createSoftReferenceObjectPool(() -> client.connect());
+
+        StatefulRedisConnection<String, String> connection = pool.borrowObject();
+        RedisCommands<String, String> sync = connection.sync();
+        sync.ping();
+
+        connection.close();
+        pool.close();
+    }
+
+    @Test
+    public void wrappedObjectClosedAfterReturn() throws Exception {
+
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
+                .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig(), true);
+
+        StatefulRedisConnection<String, String> connection = pool.borrowObject();
+        RedisCommands<String, String> sync = connection.sync();
+        sync.ping();
+
+        connection.close();
+
+        try {
+            connection.isMulti();
+            fail("Missing RedisException");
+        } catch (RedisException e) {
+            assertThat(e).hasMessageContaining("deallocated");
+        }
+
+        pool.close();
+    }
+}
\ No newline at end of file

From 7fe21a7c10be42e2f9ec5dc4425859335f376242 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 18 Sep 2016 15:53:39 +0200
Subject: [PATCH 026/808] Polishing

Add toString method to DefaultTransactionResult.
---
 .../redis/output/DefaultTransactionResult.java        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java b/src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java
index 3e73fdf480..10408b5965 100644
--- a/src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java
+++ b/src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java
@@ -65,4 +65,15 @@ public <T> T get(int index) {
     public Stream<Object> stream() {
         return result.stream();
     }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [wasRolledBack=").append(wasRolledBack);
+        sb.append(", responses=").append(size());
+        sb.append(']');
+        return sb.toString();
+    }
 }

From 4f677a2269c3b182aca681d6f1c85db45b1d8fd9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 16 Sep 2016 17:57:07 +0200
Subject: [PATCH 027/808] Add support for topology consensus #355

Previously, cluster topology refreshing could get stuck on a node that was previously discovered but got removed from the cluster. This was possible because multiple views were obtained and any arbitrary topology view was chosen.

Lettuce now implements two consensus algorithms: Healthy Majority and Known Majority. Healthy Majority is applied on the very first topology retrieval, Known Majority for all subsequent topology refreshes.

Healthy Majority votes for topology views containing the most nodes with healthy flags (without FAIL/PFAIL/NOADDR flags) to use a most healthy view. Known Majority selects topology views that contain nodes that were previously known. This consensus works for adding and removing nodes one-by-one or even multiple nodes. In case a cluster is split into even partitions the client can still get stuck on either side, but that issue can be solved by disabling dynamic refresh sources and specifying stable cluster seed nodes.
---
 .../redis/cluster/PartitionsConsensus.java    |  41 ++++++
 .../cluster/PartitionsConsensusImpl.java      | 103 +++++++++++++++
 .../redis/cluster/RedisClusterClient.java     |  18 ++-
 ...ealthyMajorityPartitionsConsensusTest.java |  97 ++++++++++++++
 .../KnownMajorityPartitionsConsensusTest.java | 123 ++++++++++++++++++
 .../PartitionsConsensusTestSupport.java       |  37 ++++++
 .../redis/cluster/RedisClusterClientTest.java |   8 +-
 .../redis/cluster/RedisClusterSetupTest.java  |   9 --
 8 files changed, 424 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensus.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensusImpl.java
 create mode 100644 src/test/java/com/lambdaworks/redis/cluster/HealthyMajorityPartitionsConsensusTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/cluster/KnownMajorityPartitionsConsensusTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/cluster/PartitionsConsensusTestSupport.java

diff --git a/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensus.java b/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensus.java
new file mode 100644
index 0000000000..47b53d19f3
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensus.java
@@ -0,0 +1,41 @@
+package com.lambdaworks.redis.cluster;
+
+import java.util.Map;
+
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.cluster.models.partitions.Partitions;
+
+/**
+ * Consensus API to decide on the {@link com.lambdaworks.redis.cluster.models.partitions.Partitions topology view} to be used by
+ * {@link RedisClusterClient}.
+ * <p>
+ * {@link PartitionsConsensus} takes the current {@link Partitions} and a {@link java.util.Map} of newly retrieved
+ * {@link Partitions} to determine a view that shall be used. Implementing classes may reuse {@link Partitions} from input
+ * arguments or construct a new {@link Partitions} object.
+ * 
+ * @author Mark Paluch
+ * @since 4.2
+ * @see com.lambdaworks.redis.cluster.models.partitions.Partitions
+ * @see RedisClusterClient
+ */
+abstract class PartitionsConsensus {
+
+    /**
+     * Consensus algorithm to select a partition containing the most previously known nodes.
+     */
+    public static final PartitionsConsensus KNOWN_MAJORITY = new PartitionsConsensusImpl.KnownMajority();
+
+    /**
+     * Consensus algorithm to select a topology view containing the most active nodes.
+     */
+    public static final PartitionsConsensus HEALTHY_MAJORITY = new PartitionsConsensusImpl.HealthyMajority();
+
+    /**
+     * Determine the {@link Partitions} to be used by {@link RedisClusterClient}.
+     * 
+     * @param current the currently used topology view, must not be {@literal null}.
+     * @param topologyViews the newly retrieved views, must not be {@literal null}.
+     * @return the resulting {@link Partitions} to be used by {@link RedisClusterClient}.
+     */
+    abstract Partitions getPartitions(Partitions current, Map<RedisURI, Partitions> topologyViews);
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensusImpl.java b/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensusImpl.java
new file mode 100644
index 0000000000..8fda339be0
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensusImpl.java
@@ -0,0 +1,103 @@
+package com.lambdaworks.redis.cluster;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.cluster.models.partitions.Partitions;
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+
+/**
+ * Implementations for {@link PartitionsConsensus}.
+ * 
+ * @author Mark Paluch
+ * @since 4.2
+ */
+class PartitionsConsensusImpl {
+
+    /**
+     * Votes for {@link Partitions} that contains the most known (previously existing) nodes.
+     */
+    static final class KnownMajority extends PartitionsConsensus {
+
+        @Override
+        Partitions getPartitions(Partitions current, Map<RedisURI, Partitions> topologyViews) {
+
+            if (topologyViews.isEmpty()) {
+                return current;
+            }
+
+            List<VotedPartitions> votedList = new ArrayList<>();
+
+            for (Partitions partitions : topologyViews.values()) {
+
+                int knownNodes = 0;
+                for (RedisClusterNode knownNode : current) {
+
+                    if (partitions.getPartitionByNodeId(knownNode.getNodeId()) != null) {
+                        knownNodes++;
+                    }
+                }
+
+                votedList.add(new VotedPartitions(knownNodes, partitions));
+            }
+
+            Collections.shuffle(votedList);
+            Collections.sort(votedList, (o1, o2) -> Integer.compare(o2.votes, o1.votes));
+
+            return votedList.get(0).partitions;
+        }
+    }
+
+    /**
+     * Votes for {@link Partitions} that contains the most active (in total) nodes.
+     */
+    static final class HealthyMajority extends PartitionsConsensus {
+
+        @Override
+        Partitions getPartitions(Partitions current, Map<RedisURI, Partitions> topologyViews) {
+
+            if (topologyViews.isEmpty()) {
+                return current;
+            }
+
+            List<VotedPartitions> votedList = new ArrayList<>();
+
+            for (Partitions partitions : topologyViews.values()) {
+
+                int votes = 0;
+
+                for (RedisClusterNode node : partitions) {
+
+                    if (node.is(RedisClusterNode.NodeFlag.FAIL) || node.is(RedisClusterNode.NodeFlag.EVENTUAL_FAIL)
+                            || node.is(RedisClusterNode.NodeFlag.NOADDR)) {
+                        continue;
+                    }
+
+                    votes++;
+
+                }
+
+                votedList.add(new VotedPartitions(votes, partitions));
+            }
+
+            Collections.shuffle(votedList);
+            Collections.sort(votedList, (o1, o2) -> Integer.compare(o2.votes, o1.votes));
+
+            return votedList.get(0).partitions;
+        }
+    }
+
+    static final class VotedPartitions {
+
+        final int votes;
+        final Partitions partitions;
+
+        public VotedPartitions(int votes, Partitions partitions) {
+            this.votes = votes;
+            this.partitions = partitions;
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index 8137f700a7..44c97df19c 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -657,7 +657,7 @@ protected Partitions loadPartitions() {
             throw new RedisException("Cannot retrieve initial cluster partitions from initial URIs " + topologyRefreshSource);
         }
 
-        Partitions loadedPartitions = partitions.values().iterator().next();
+        Partitions loadedPartitions = determinePartitions(this.partitions, partitions);
         RedisURI viewedBy = refresh.getViewedBy(partitions, loadedPartitions);
 
         for (RedisClusterNode partition : loadedPartitions) {
@@ -672,6 +672,22 @@ protected Partitions loadPartitions() {
         return loadedPartitions;
     }
 
+    /**
+     * Determines a {@link Partitions topology view} based on the current and the obtain topology views.
+     * 
+     * @param current the current topology view. May be {@literal null} if {@link RedisClusterClient} has no topology view yet.
+     * @param topologyViews the obtain topology views
+     * @return the {@link Partitions topology view} to use.
+     */
+    protected Partitions determinePartitions(Partitions current, Map<RedisURI, Partitions> topologyViews) {
+
+        if (current == null) {
+            return PartitionsConsensus.HEALTHY_MAJORITY.getPartitions(null, topologyViews);
+        }
+
+        return PartitionsConsensus.KNOWN_MAJORITY.getPartitions(current, topologyViews);
+    }
+
     private void activateTopologyRefreshIfNeeded() {
 
         if (getOptions() instanceof ClusterClientOptions) {
diff --git a/src/test/java/com/lambdaworks/redis/cluster/HealthyMajorityPartitionsConsensusTest.java b/src/test/java/com/lambdaworks/redis/cluster/HealthyMajorityPartitionsConsensusTest.java
new file mode 100644
index 0000000000..b8cbd9df5d
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/cluster/HealthyMajorityPartitionsConsensusTest.java
@@ -0,0 +1,97 @@
+package com.lambdaworks.redis.cluster;
+
+import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createMap;
+import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createNode;
+import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createPartitions;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+
+import org.junit.Test;
+
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.cluster.models.partitions.Partitions;
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+
+/**
+ * @author Mark Paluch
+ */
+public class HealthyMajorityPartitionsConsensusTest {
+
+    private RedisClusterNode node1 = createNode(1);
+    private RedisClusterNode node2 = createNode(2);
+    private RedisClusterNode node3 = createNode(3);
+    private RedisClusterNode node4 = createNode(4);
+    private RedisClusterNode node5 = createNode(5);
+
+    @Test
+    public void sameSharedViewShouldDecideForHealthyNodes() throws Exception {
+
+        Partitions partitions1 = createPartitions(node1, node2, node3, node4, node5);
+        Partitions partitions2 = createPartitions(node1, node2, node3, node4, node5);
+        Partitions partitions3 = createPartitions(node1, node2, node3, node4, node5);
+
+        Map<RedisURI, Partitions> map = createMap(partitions1, partitions2, partitions3);
+
+        Partitions result = PartitionsConsensus.HEALTHY_MAJORITY.getPartitions(null, map);
+
+        assertThat(Arrays.asList(partitions1, partitions2, partitions3)).contains(result);
+    }
+
+    @Test
+    public void unhealthyNodeViewShouldDecideForHealthyNodes() throws Exception {
+
+        Partitions partitions1 = createPartitions(node1, node2);
+        Partitions partitions2 = createPartitions(node2, node3, node4, node5);
+        Partitions partitions3 = createPartitions(node2, node3, node4, node5);
+
+        Map<RedisURI, Partitions> map = createMap(partitions1, partitions2, partitions3);
+
+        node2.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.FAIL));
+        node3.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.FAIL));
+        node4.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.FAIL));
+        node5.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.FAIL));
+
+        Partitions result = PartitionsConsensus.HEALTHY_MAJORITY.getPartitions(null, map);
+
+        assertThat(result).isSameAs(partitions1);
+    }
+
+    @Test
+    public void splitNodeViewShouldDecideForHealthyNodes() throws Exception {
+
+        Partitions partitions1 = createPartitions(node1, node2, node3);
+        Partitions partitions2 = createPartitions();
+        Partitions partitions3 = createPartitions(node3, node4, node5);
+
+        Map<RedisURI, Partitions> map = createMap(partitions1, partitions2, partitions3);
+
+        node1.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.FAIL));
+        node2.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.FAIL));
+        node3.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.FAIL));
+
+        Partitions result = PartitionsConsensus.HEALTHY_MAJORITY.getPartitions(null, map);
+
+        assertThat(result).isSameAs(partitions3);
+    }
+
+    @Test
+    public void splitUnhealthyNodeViewShouldDecideForHealthyNodes() throws Exception {
+
+        Partitions partitions1 = createPartitions(node1, node2);
+        Partitions partitions2 = createPartitions(node2, node3);
+        Partitions partitions3 = createPartitions(node3, node4, node5);
+
+        Map<RedisURI, Partitions> map = createMap(partitions1, partitions2, partitions3);
+
+        node2.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.FAIL));
+        node3.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.FAIL));
+        node4.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.FAIL));
+
+        Partitions result = PartitionsConsensus.HEALTHY_MAJORITY.getPartitions(null, map);
+
+        assertThat(Arrays.asList(partitions1, partitions3)).contains(result);
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/cluster/KnownMajorityPartitionsConsensusTest.java b/src/test/java/com/lambdaworks/redis/cluster/KnownMajorityPartitionsConsensusTest.java
new file mode 100644
index 0000000000..08192f04ca
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/cluster/KnownMajorityPartitionsConsensusTest.java
@@ -0,0 +1,123 @@
+package com.lambdaworks.redis.cluster;
+
+import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createMap;
+import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createNode;
+import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createPartitions;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import org.junit.Test;
+
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.cluster.models.partitions.Partitions;
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+
+/**
+ * @author Mark Paluch
+ */
+public class KnownMajorityPartitionsConsensusTest {
+
+    private RedisClusterNode node1 = createNode(1);
+    private RedisClusterNode node2 = createNode(2);
+    private RedisClusterNode node3 = createNode(3);
+    private RedisClusterNode node4 = createNode(4);
+    private RedisClusterNode node5 = createNode(5);
+
+    @Test
+    public void sameSharedViewShouldDecideForKnownMajority() throws Exception {
+
+        Partitions current = createPartitions(node1, node2, node3, node4, node5);
+
+        Partitions partitions1 = createPartitions(node1, node2, node3, node4, node5);
+        Partitions partitions2 = createPartitions(node1, node2, node3, node4, node5);
+        Partitions partitions3 = createPartitions(node1, node2, node3, node4, node5);
+
+        Map<RedisURI, Partitions> map = createMap(partitions1, partitions2, partitions3);
+
+        Partitions result = PartitionsConsensus.KNOWN_MAJORITY.getPartitions(current, map);
+
+        assertThat(Arrays.asList(partitions1, partitions2, partitions3)).contains(result);
+    }
+
+    @Test
+    public void addedNodeViewShouldDecideForKnownMajority() throws Exception {
+
+        Partitions current = createPartitions(node1, node2, node3, node4);
+
+        Partitions partitions1 = createPartitions(node1, node2, node3, node4, node5);
+        Partitions partitions2 = createPartitions(node1, node2, node3, node4, node5);
+        Partitions partitions3 = createPartitions(node1, node2, node3, node4, node5);
+
+        Map<RedisURI, Partitions> map = createMap(partitions1, partitions2, partitions3);
+
+        Partitions result = PartitionsConsensus.KNOWN_MAJORITY.getPartitions(current, map);
+
+        assertThat(Arrays.asList(partitions1, partitions2, partitions3)).contains(result);
+    }
+
+    @Test
+    public void removedNodeViewShouldDecideForKnownMajority() throws Exception {
+
+        Partitions current = createPartitions(node1, node2, node3, node4, node5);
+
+        Partitions partitions1 = createPartitions(node1, node2, node3, node4);
+        Partitions partitions2 = createPartitions(node1, node2, node3, node4);
+        Partitions partitions3 = createPartitions(node1, node2, node3, node4);
+
+        Map<RedisURI, Partitions> map = createMap(partitions1, partitions2, partitions3);
+
+        Partitions result = PartitionsConsensus.KNOWN_MAJORITY.getPartitions(current, map);
+
+        assertThat(Arrays.asList(partitions1, partitions2, partitions3)).contains(result);
+    }
+
+    @Test
+    public void mixedViewShouldDecideForKnownMajority() throws Exception {
+
+        Partitions current = createPartitions(node1, node2, node3, node4, node5);
+
+        Partitions partitions1 = createPartitions(node1, node2, node3, node4);
+        Partitions partitions2 = createPartitions(node1, node2, node3, node5);
+        Partitions partitions3 = createPartitions(node1, node2, node4, node5);
+
+        Map<RedisURI, Partitions> map = createMap(partitions1, partitions2, partitions3);
+
+        Partitions result = PartitionsConsensus.KNOWN_MAJORITY.getPartitions(current, map);
+
+        assertThat(Arrays.asList(partitions1, partitions2, partitions3)).contains(result);
+    }
+
+    @Test
+    public void clusterSplitViewShouldDecideForKnownMajority() throws Exception {
+
+        Partitions current = createPartitions(node1, node2, node3, node4, node5);
+
+        Partitions partitions1 = createPartitions(node1, node2);
+        Partitions partitions2 = createPartitions(node1, node2);
+        Partitions partitions3 = createPartitions(node1, node2, node3, node4, node5);
+
+        Map<RedisURI, Partitions> map = createMap(partitions1, partitions2, partitions3);
+
+        Partitions result = PartitionsConsensus.KNOWN_MAJORITY.getPartitions(current, map);
+
+        assertThat(result).isEqualTo(partitions3).isNotEqualTo(partitions1);
+    }
+
+    @Test
+    public void strangeClusterSplitViewShouldDecideForKnownMajority() throws Exception {
+
+        Partitions current = createPartitions(node1, node2, node3, node4, node5);
+
+        Partitions partitions1 = createPartitions(node1);
+        Partitions partitions2 = createPartitions(node2);
+        Partitions partitions3 = createPartitions(node3);
+
+        Map<RedisURI, Partitions> map = createMap(partitions1, partitions2, partitions3);
+
+        Partitions result = PartitionsConsensus.KNOWN_MAJORITY.getPartitions(current, map);
+
+        assertThat(Arrays.asList(partitions1, partitions2, partitions3)).contains(result);
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/cluster/PartitionsConsensusTestSupport.java b/src/test/java/com/lambdaworks/redis/cluster/PartitionsConsensusTestSupport.java
new file mode 100644
index 0000000000..94bb244045
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/cluster/PartitionsConsensusTestSupport.java
@@ -0,0 +1,37 @@
+package com.lambdaworks.redis.cluster;
+
+import java.util.*;
+
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.cluster.models.partitions.Partitions;
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+
+/**
+ * @author Mark Paluch
+ */
+class PartitionsConsensusTestSupport {
+
+    static RedisClusterNode createNode(int nodeId) {
+        return new RedisClusterNode(RedisURI.create("localhost", 6379 + nodeId), "" + nodeId, true, "", 0, 0, 0,
+                Collections.emptyList(), new HashSet<>());
+    }
+
+    static Partitions createPartitions(RedisClusterNode... nodes) {
+
+        Partitions partitions = new Partitions();
+        partitions.addAll(Arrays.asList(nodes));
+        return partitions;
+    }
+
+    static Map<RedisURI, Partitions> createMap(Partitions... partitionses) {
+
+        Map<RedisURI, Partitions> partitionsMap = new HashMap<>();
+
+        int counter = 0;
+        for (Partitions partitions : partitionses) {
+            partitionsMap.put(createNode(counter++).getUri(), partitions);
+        }
+
+        return partitionsMap;
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
index eb91de2444..755da79b8e 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
@@ -276,13 +276,17 @@ public void testClusterRedirectionLimit() throws Exception {
         Partitions partitions = clusterClient.getPartitions();
 
         for (RedisClusterNode partition : partitions) {
-            partition.setSlots(new ArrayList<>());
-            if (partition.getFlags().contains(RedisClusterNode.NodeFlag.MYSELF)) {
+
+            if (partition.getSlots().contains(15495)) {
+                partition.setSlots(new ArrayList<>());
+            } else {
+                partition.setSlots(new ArrayList<>());
                 int[] slots = createSlots(0, 16384);
                 for (int i = 0; i < slots.length; i++) {
                     partition.getSlots().add(i);
                 }
             }
+
         }
         partitions.updateCache();
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
index 8036310860..f9866abfe1 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
@@ -511,15 +511,6 @@ private void assertExecuted(RedisFuture<String> set) throws Exception {
 
     private void waitUntilOnlyOnePartition() throws InterruptedException, TimeoutException {
         Wait.untilEquals(1, () -> clusterClient.getPartitions().size()).waitOrTimeout();
-        Wait.untilTrue(() -> {
-            for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
-                if (redisClusterNode.getSlots().size() > 16380) {
-                    return true;
-                }
-            }
-
-            return false;
-        }).waitOrTimeout();
     }
 
     private void suspendConnection(RedisClusterAsyncCommands<String, String> asyncCommands)

From e059b38b48d399f8974322ac642792d51dc7793f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 22 Sep 2016 14:12:35 +0200
Subject: [PATCH 028/808] Add test to verify behavior of GEODIST if a geoset is
 unknown #362

---
 .../redis/commands/GeoCommandTest.java        | 12 ++++++++++-
 .../reactive/GeoReactiveCommandTest.java      | 20 ++++++++++++-------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
index 01da41a338..0fa9d3c01f 100644
--- a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
@@ -103,6 +103,17 @@ public void geodist() throws Exception {
         assertThat(result).isGreaterThan(2.5).isLessThan(2.9);
     }
 
+    // See https://github.com/antirez/redis/issues/3512 and https://github.com/mp911de/lettuce/issues/362
+    @Test(expected = RedisException.class)
+    public void geodistMissingElements() throws Exception {
+
+        prepareGeo();
+
+        assertThat(redis.geodist("Unknown", "Unknown", "Bahn", GeoArgs.Unit.km)).isNull();
+        assertThat(redis.geodist(key, "Unknown", "Bahn", GeoArgs.Unit.km)).isNull();
+        assertThat(redis.geodist(key, "Weinheim", "Unknown", GeoArgs.Unit.km)).isNull();
+    }
+
     @Test
     public void geodistWithTransaction() throws Exception {
 
@@ -114,7 +125,6 @@ public void geodistWithTransaction() throws Exception {
 
         // 10 mins with the bike
         assertThat(result).isGreaterThan(2.5).isLessThan(2.9);
-
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
index ee5b74020f..c6f351ea4a 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
@@ -1,18 +1,19 @@
 package com.lambdaworks.redis.commands.reactive;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.offset;
+
+import java.util.List;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
 import com.lambdaworks.redis.GeoCoordinates;
 import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.GeoCommandTest;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
-import org.junit.Ignore;
-import org.testng.annotations.Test;
-
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.AssertionsForClassTypes.offset;
 
 public class GeoReactiveCommandTest extends GeoCommandTest {
 
@@ -42,4 +43,9 @@ public void geopos() throws Exception {
     @Override
     public void geoposWithTransaction() throws Exception {
     }
+
+    @Test(expected = NumberFormatException.class)
+    public void geodistMissingElements() throws Exception {
+        super.geodistMissingElements();
+    }
 }

From 732d3ec920c3c3338e9d346cbba4942235ea3dc2 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 22 Sep 2016 21:01:13 +0200
Subject: [PATCH 029/808] Provide a more conceise API for Sorted Set query
 operations using Range/Limit #363

Lettuce now provides a more conceise API for Sorted Set handling. It adds Range/Limit types to encapsulate range boundaries and limitation arguments. Range now also encodes the boundary value using RedisCodec to guarantee same encoding and values to query using Z...LEX commands.

Previous usage:
redis.zrangebyscore(key, 2.0, 3.0);
redis.zrangebyscore(key, "(1.0", "4.0");
redis.zrangebyscore(key, "-inf", "+inf");
redis.zrangebyscore(key, 0.0, 4.0, 1, 3);

Range/Limit usage:
redis.zrangebyscore(key, Range.create(2.0, 3.0))).isEqualTo(list("b", "c")
redis.zrangebyscore(key, Range.from(Boundary.excluding(1.0), Boundary.including(4.0)))
redis.zrangebyscore(key, Range.unbounded())
redis.zrangebyscore(key, Range.create(0.0, 4.0), Limit.create(1, 3))
---
 .../redis/AbstractRedisAsyncCommands.java     | 112 +++++++
 .../redis/AbstractRedisReactiveCommands.java  | 114 ++++++-
 .../java/com/lambdaworks/redis/Limit.java     |  83 +++++
 .../java/com/lambdaworks/redis/Range.java     | 210 ++++++++++++
 .../redis/RedisCommandBuilder.java            | 231 ++++++++++++-
 .../async/RedisSortedSetAsyncCommands.java    | 317 ++++++++++++++++++
 .../RedisSortedSetReactiveCommands.java       | 317 ++++++++++++++++++
 .../api/sync/RedisSortedSetCommands.java      | 317 ++++++++++++++++++
 .../NodeSelectionSortedSetAsyncCommands.java  | 317 ++++++++++++++++++
 .../sync/NodeSelectionSortedSetCommands.java  | 317 ++++++++++++++++++
 .../redis/api/RedisSortedSetCommands.java     | 317 ++++++++++++++++++
 .../apigenerator/CompilationUnitFactory.java  |  18 +-
 .../lambdaworks/apigenerator/Constants.java   |   3 +-
 .../java/com/lambdaworks/redis/LimitTest.java |  31 ++
 .../java/com/lambdaworks/redis/RangeTest.java |  92 +++++
 .../redis/commands/CustomCommandTest.java     |   5 +
 .../redis/commands/SortedSetCommandTest.java  | 129 +++++--
 17 files changed, 2885 insertions(+), 45 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/Limit.java
 create mode 100644 src/main/java/com/lambdaworks/redis/Range.java
 create mode 100644 src/test/java/com/lambdaworks/redis/LimitTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/RangeTest.java

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
index 60c2e9596e..a8f102d1e7 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
@@ -1074,6 +1074,11 @@ public RedisFuture<Long> zcount(K key, String min, String max) {
         return dispatch(commandBuilder.zcount(key, min, max));
     }
 
+    @Override
+    public RedisFuture<Long> zcount(K key, Range<? extends Number> range) {
+        return dispatch(commandBuilder.zcount(key, range));
+    }
+
     @Override
     public RedisFuture<Double> zincrby(K key, double amount, K member) {
         return dispatch(commandBuilder.zincrby(key, amount, member));
@@ -1109,6 +1114,11 @@ public RedisFuture<List<V>> zrangebyscore(K key, String min, String max) {
         return dispatch(commandBuilder.zrangebyscore(key, min, max));
     }
 
+    @Override
+    public RedisFuture<List<V>> zrangebyscore(K key, Range<? extends Number> range) {
+        return dispatch(commandBuilder.zrangebyscore(key, range, Limit.unlimited()));
+    }
+
     @Override
     public RedisFuture<List<V>> zrangebyscore(K key, double min, double max, long offset, long count) {
         return dispatch(commandBuilder.zrangebyscore(key, min, max, offset, count));
@@ -1119,6 +1129,11 @@ public RedisFuture<List<V>> zrangebyscore(K key, String min, String max, long of
         return dispatch(commandBuilder.zrangebyscore(key, min, max, offset, count));
     }
 
+    @Override
+    public RedisFuture<List<V>> zrangebyscore(K key, Range<? extends Number> range, Limit limit) {
+        return dispatch(commandBuilder.zrangebyscore(key, range, limit));
+    }
+
     @Override
     public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max) {
         return dispatch(commandBuilder.zrangebyscoreWithScores(key, min, max));
@@ -1129,6 +1144,11 @@ public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String m
         return dispatch(commandBuilder.zrangebyscoreWithScores(key, min, max));
     }
 
+    @Override
+    public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range) {
+        return dispatch(commandBuilder.zrangebyscoreWithScores(key, range, Limit.unlimited()));
+    }
+
     @Override
     public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count) {
         return dispatch(commandBuilder.zrangebyscoreWithScores(key, min, max, offset, count));
@@ -1139,6 +1159,11 @@ public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String m
         return dispatch(commandBuilder.zrangebyscoreWithScores(key, min, max, offset, count));
     }
 
+    @Override
+    public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
+        return dispatch(commandBuilder.zrangebyscoreWithScores(key, range, limit));
+    }
+
     @Override
     public RedisFuture<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
         return dispatch(commandBuilder.zrange(channel, key, start, stop));
@@ -1159,6 +1184,11 @@ public RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key,
         return dispatch(commandBuilder.zrangebyscore(channel, key, min, max));
     }
 
+    @Override
+    public RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range) {
+        return dispatch(commandBuilder.zrangebyscore(channel, key, range, Limit.unlimited()));
+    }
+
     @Override
     public RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset,
             long count) {
@@ -1171,6 +1201,11 @@ public RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key,
         return dispatch(commandBuilder.zrangebyscore(channel, key, min, max, offset, count));
     }
 
+    @Override
+    public RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
+        return dispatch(commandBuilder.zrangebyscore(channel, key, range, limit));
+    }
+
     @Override
     public RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max) {
         return dispatch(commandBuilder.zrangebyscoreWithScores(channel, key, min, max));
@@ -1181,6 +1216,11 @@ public RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V>
         return dispatch(commandBuilder.zrangebyscoreWithScores(channel, key, min, max));
     }
 
+    @Override
+    public RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range) {
+        return dispatch(commandBuilder.zrangebyscoreWithScores(channel, key, range, Limit.unlimited()));
+    }
+
     @Override
     public RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max,
             long offset, long count) {
@@ -1193,6 +1233,12 @@ public RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V>
         return dispatch(commandBuilder.zrangebyscoreWithScores(channel, key, min, max, offset, count));
     }
 
+    @Override
+    public RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
+           Limit limit) {
+        return dispatch(commandBuilder.zrangebyscoreWithScores(channel, key, range, limit));
+    }
+
     @Override
     public RedisFuture<Long> zrank(K key, V member) {
         return dispatch(commandBuilder.zrank(key, member));
@@ -1218,6 +1264,11 @@ public RedisFuture<Long> zremrangebyscore(K key, String min, String max) {
         return dispatch(commandBuilder.zremrangebyscore(key, min, max));
     }
 
+    @Override
+    public RedisFuture<Long> zremrangebyscore(K key, Range<? extends Number> range) {
+        return dispatch(commandBuilder.zremrangebyscore(key, range));
+    }
+
     @Override
     public RedisFuture<List<V>> zrevrange(K key, long start, long stop) {
         return dispatch(commandBuilder.zrevrange(key, start, stop));
@@ -1238,6 +1289,11 @@ public RedisFuture<List<V>> zrevrangebyscore(K key, String max, String min) {
         return dispatch(commandBuilder.zrevrangebyscore(key, max, min));
     }
 
+    @Override
+    public RedisFuture<List<V>> zrevrangebyscore(K key, Range<? extends Number> range) {
+        return dispatch(commandBuilder.zrevrangebyscore(key, range, Limit.unlimited()));
+    }
+
     @Override
     public RedisFuture<List<V>> zrevrangebyscore(K key, double max, double min, long offset, long count) {
         return dispatch(commandBuilder.zrevrangebyscore(key, max, min, offset, count));
@@ -1248,6 +1304,11 @@ public RedisFuture<List<V>> zrevrangebyscore(K key, String max, String min, long
         return dispatch(commandBuilder.zrevrangebyscore(key, max, min, offset, count));
     }
 
+    @Override
+    public RedisFuture<List<V>> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit) {
+        return dispatch(commandBuilder.zrevrangebyscore(key, range, limit));
+    }
+
     @Override
     public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min) {
         return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, max, min));
@@ -1258,6 +1319,11 @@ public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Strin
         return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, max, min));
     }
 
+    @Override
+    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range) {
+        return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, range, Limit.unlimited()));
+    }
+
     @Override
     public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count) {
         return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
@@ -1268,6 +1334,11 @@ public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Strin
         return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
     }
 
+    @Override
+    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
+        return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, range, limit));
+    }
+
     @Override
     public RedisFuture<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
         return dispatch(commandBuilder.zrevrange(channel, key, start, stop));
@@ -1288,6 +1359,11 @@ public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K ke
         return dispatch(commandBuilder.zrevrangebyscore(channel, key, max, min));
     }
 
+    @Override
+    public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range) {
+        return dispatch(commandBuilder.zrevrangebyscore(channel, key, range, Limit.unlimited()));
+    }
+
     @Override
     public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset,
             long count) {
@@ -1300,6 +1376,11 @@ public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K ke
         return dispatch(commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
     }
 
+    @Override
+    public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
+        return dispatch(commandBuilder.zrevrangebyscore(channel, key, range, limit));
+    }
+
     @Override
     public RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min) {
         return dispatch(commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min));
@@ -1310,6 +1391,11 @@ public RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<
         return dispatch(commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min));
     }
 
+    @Override
+    public RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range) {
+        return dispatch(commandBuilder.zrevrangebyscoreWithScores(channel, key, range, Limit.unlimited()));
+    }
+
     @Override
     public RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min,
             long offset, long count) {
@@ -1322,6 +1408,12 @@ public RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<
         return dispatch(commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min, offset, count));
     }
 
+    @Override
+    public RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
+            Limit limit) {
+        return dispatch(commandBuilder.zrevrangebyscoreWithScores(channel, key, range, limit));
+    }
+
     @Override
     public RedisFuture<Long> zrevrank(K key, V member) {
         return dispatch(commandBuilder.zrevrank(key, member));
@@ -1664,21 +1756,41 @@ public RedisFuture<Long> zlexcount(K key, String min, String max) {
         return dispatch(commandBuilder.zlexcount(key, min, max));
     }
 
+    @Override
+    public RedisFuture<Long> zlexcount(K key, Range<? extends V> range) {
+        return dispatch(commandBuilder.zlexcount(key, range));
+    }
+
     @Override
     public RedisFuture<Long> zremrangebylex(K key, String min, String max) {
         return dispatch(commandBuilder.zremrangebylex(key, min, max));
     }
 
+    @Override
+    public RedisFuture<Long> zremrangebylex(K key, Range<? extends V> range) {
+        return dispatch(commandBuilder.zremrangebylex(key, range));
+    }
+
     @Override
     public RedisFuture<List<V>> zrangebylex(K key, String min, String max) {
         return dispatch(commandBuilder.zrangebylex(key, min, max));
     }
 
+    @Override
+    public RedisFuture<List<V>> zrangebylex(K key, Range<? extends V> range) {
+        return dispatch(commandBuilder.zrangebylex(key, range, Limit.unlimited()));
+    }
+
     @Override
     public RedisFuture<List<V>> zrangebylex(K key, String min, String max, long offset, long count) {
         return dispatch(commandBuilder.zrangebylex(key, min, max, offset, count));
     }
 
+    @Override
+    public RedisFuture<List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit) {
+        return dispatch(commandBuilder.zrangebylex(key, range, limit));
+    }
+
     @Override
     public RedisFuture<Long> geoadd(K key, double longitude, double latitude, V member) {
         return dispatch(commandBuilder.geoadd(key, longitude, latitude, member));
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
index 9451d3d22f..a34dc499ca 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
@@ -1080,6 +1080,11 @@ public Mono<Long> zinterstore(K destination, K... keys) {
         return createMono(() -> commandBuilder.zinterstore(destination, keys));
     }
 
+    @Override
+    public Mono<Long> zcount(K key, Range<? extends Number> range) {
+        return createMono(() -> commandBuilder.zcount(key, range));
+    }
+
     @Override
     public Mono<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys) {
         return createMono(() -> commandBuilder.zinterstore(destination, storeArgs, keys));
@@ -1115,6 +1120,11 @@ public Flux<V> zrangebyscore(K key, String min, String max, long offset, long co
         return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, min, max, offset, count));
     }
 
+    @Override
+    public Flux<V> zrangebyscore(K key, Range<? extends Number> range) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, range, Limit.unlimited()));
+    }
+
     @Override
     public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max) {
         return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, min, max));
@@ -1125,6 +1135,11 @@ public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String ma
         return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, min, max));
     }
 
+    @Override
+    public Flux<V> zrangebyscore(K key, Range<? extends Number> range, Limit limit) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, range, limit));
+    }
+
     @Override
     public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count) {
         return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, min, max, offset, count));
@@ -1135,6 +1150,11 @@ public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String ma
         return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, min, max, offset, count));
     }
 
+    @Override
+    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, range, Limit.unlimited()));
+    }
+
     @Override
     public Mono<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
         return createMono(() -> commandBuilder.zrange(channel, key, start, stop));
@@ -1145,6 +1165,11 @@ public Mono<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key
         return createMono(() -> commandBuilder.zrangeWithScores(channel, key, start, stop));
     }
 
+    @Override
+    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, range, limit));
+    }
+
     @Override
     public Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max) {
         return createMono(() -> commandBuilder.zrangebyscore(channel, key, min, max));
@@ -1161,12 +1186,22 @@ public Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double
         return createMono(() -> commandBuilder.zrangebyscore(channel, key, min, max, offset, count));
     }
 
+    @Override
+    public Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range) {
+        return createMono(() -> commandBuilder.zrangebyscore(channel, key, range, Limit.unlimited()));
+    }
+
     @Override
     public Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset,
             long count) {
         return createMono(() -> commandBuilder.zrangebyscore(channel, key, min, max, offset, count));
     }
 
+    @Override
+    public Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
+        return createMono(() -> commandBuilder.zrangebyscore(channel, key, range, limit));
+    }
+
     @Override
     public Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max) {
         return createMono(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max));
@@ -1177,6 +1212,11 @@ public Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel
         return createMono(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max));
     }
 
+    @Override
+    public Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range) {
+        return createMono(() -> commandBuilder.zrangebyscoreWithScores(channel, key, range, Limit.unlimited()));
+    }
+
     @Override
     public Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max,
             long offset, long count) {
@@ -1189,6 +1229,12 @@ public Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel
         return createMono(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max, offset, count));
     }
 
+    @Override
+    public Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
+            Limit limit) {
+        return createMono(() -> commandBuilder.zrangebyscoreWithScores(channel, key, range, limit));
+    }
+
     @Override
     public Mono<Long> zrank(K key, V member) {
         return createMono(() -> commandBuilder.zrank(key, member));
@@ -1214,6 +1260,11 @@ public Mono<Long> zremrangebyscore(K key, String min, String max) {
         return createMono(() -> commandBuilder.zremrangebyscore(key, min, max));
     }
 
+    @Override
+    public Mono<Long> zremrangebyscore(K key, Range<? extends Number> range) {
+        return createMono(() -> commandBuilder.zremrangebyscore(key, range));
+    }
+
     @Override
     public Flux<V> zrevrange(K key, long start, long stop) {
         return createDissolvingFlux(() -> commandBuilder.zrevrange(key, start, stop));
@@ -1234,6 +1285,11 @@ public Flux<V> zrevrangebyscore(K key, String max, String min) {
         return createDissolvingFlux(() -> commandBuilder.zrevrangebyscore(key, max, min));
     }
 
+    @Override
+    public Flux<V> zrevrangebyscore(K key, Range<? extends Number> range) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscore(key, range, Limit.unlimited()));
+    }
+
     @Override
     public Flux<V> zrevrangebyscore(K key, double max, double min, long offset, long count) {
         return createDissolvingFlux(() -> commandBuilder.zrevrangebyscore(key, max, min, offset, count));
@@ -1244,6 +1300,11 @@ public Flux<V> zrevrangebyscore(K key, String max, String min, long offset, long
         return createDissolvingFlux(() -> commandBuilder.zrevrangebyscore(key, max, min, offset, count));
     }
 
+    @Override
+    public Flux<V> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscore(key, range, limit));
+    }
+
     @Override
     public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min) {
         return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min));
@@ -1254,6 +1315,11 @@ public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String
         return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min));
     }
 
+    @Override
+    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, range, Limit.unlimited()));
+    }
+
     @Override
     public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count) {
         return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
@@ -1264,6 +1330,11 @@ public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String
         return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
     }
 
+    @Override
+    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, range, limit));
+    }
+
     @Override
     public Mono<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
         return createMono(() -> commandBuilder.zrevrange(channel, key, start, stop));
@@ -1284,6 +1355,11 @@ public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Stri
         return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min));
     }
 
+    @Override
+    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range) {
+        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, range, Limit.unlimited()));
+    }
+
     @Override
     public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset,
             long count) {
@@ -1296,6 +1372,11 @@ public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Stri
         return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
     }
 
+    @Override
+    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
+        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, range, limit));
+    }
+
     @Override
     public Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min) {
         return createMono(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min));
@@ -1306,6 +1387,11 @@ public Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> chan
         return createMono(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min));
     }
 
+    @Override
+    public Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range) {
+        return createMono(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, range, Limit.unlimited()));
+    }
+
     @Override
     public Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min,
             long offset, long count) {
@@ -1318,6 +1404,12 @@ public Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> chan
         return createMono(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, max, min, offset, count));
     }
 
+    @Override
+    public Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
+            Limit limit) {
+        return createMono(() -> commandBuilder.zrevrangebyscoreWithScores(channel, key, range, limit));
+    }
+
     @Override
     public Mono<Long> zrevrank(K key, V member) {
         return createMono(() -> commandBuilder.zrevrank(key, member));
@@ -1672,21 +1764,41 @@ public Mono<Long> zlexcount(K key, String min, String max) {
         return createMono(() -> commandBuilder.zlexcount(key, min, max));
     }
 
+    @Override
+    public Mono<Long> zlexcount(K key, Range<? extends V> range) {
+        return createMono(() -> commandBuilder.zlexcount(key, range));
+    }
+
     @Override
     public Mono<Long> zremrangebylex(K key, String min, String max) {
         return createMono(() -> commandBuilder.zremrangebylex(key, min, max));
     }
 
+    @Override
+    public Mono<Long> zremrangebylex(K key, Range<? extends V> range) {
+        return createMono(() -> commandBuilder.zremrangebylex(key, range));
+    }
+
     @Override
     public Flux<V> zrangebylex(K key, String min, String max) {
         return createDissolvingFlux(() -> commandBuilder.zrangebylex(key, min, max));
     }
 
+    @Override
+    public Flux<V> zrangebylex(K key, Range<? extends V> range) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebylex(key, range, Limit.unlimited()));
+    }
+
     @Override
     public Flux<V> zrangebylex(K key, String min, String max, long offset, long count) {
         return createDissolvingFlux(() -> commandBuilder.zrangebylex(key, min, max, offset, count));
     }
 
+    @Override
+    public Flux<V> zrangebylex(K key, Range<? extends V> range, Limit limit) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebylex(key, range, limit));
+    }
+
     @Override
     public Mono<Long> geoadd(K key, double longitude, double latitude, V member) {
         return createMono(() -> commandBuilder.geoadd(key, longitude, latitude, member));
@@ -1778,7 +1890,7 @@ protected <T> Mono<T> createMono(CommandType type, CommandOutput<K, V, T> output
     public <T> Mono<T> createMono(Supplier<RedisCommand<K, V, T>> commandSupplier) {
         return Mono.from(new RedisPublisher<>(commandSupplier, connection, false));
     }
-    
+
     @SuppressWarnings("unchecked")
     public <T, R> Flux<R> createDissolvingFlux(Supplier<RedisCommand<K, V, T>> commandSupplier) {
         return (Flux<R>) Flux.from(new RedisPublisher<>(commandSupplier, connection, true));
diff --git a/src/main/java/com/lambdaworks/redis/Limit.java b/src/main/java/com/lambdaworks/redis/Limit.java
new file mode 100644
index 0000000000..87042362a0
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/Limit.java
@@ -0,0 +1,83 @@
+package com.lambdaworks.redis;
+
+/**
+ * Value object for a slice of data (offset/count).
+ *
+ * @author Mark Paluch
+ * @since 4.2
+ */
+public class Limit {
+
+    private static final Limit UNLIMITED = new Limit(null, null);
+
+    private final Long offset;
+    private final Long count;
+
+    protected Limit(Long offset, Long count) {
+        this.offset = offset;
+        this.count = count;
+    }
+
+    /**
+     *
+     * @return an unlimited limit.
+     */
+    public static Limit unlimited() {
+        return UNLIMITED;
+    }
+
+    /**
+     * Creates a {@link Limit} given {@code offset} and {@code count}.
+     *
+     * @param offset
+     * @param count
+     * @return the {@link Limit}
+     */
+    public static Limit create(long offset, long count) {
+        return new Limit(offset, count);
+    }
+
+    /**
+     * @return the offset or {@literal -1} if unlimited.
+     */
+    public long getOffset() {
+
+        if (offset != null) {
+            return offset;
+        }
+
+        return -1;
+    }
+
+    /**
+     * @return the count or {@literal -1} if unlimited.
+     */
+    public long getCount() {
+
+        if (count != null) {
+            return count;
+        }
+
+        return -1;
+    }
+
+    /**
+     *
+     * @return {@literal true} if the {@link Limit} contains a limitation.
+     */
+    public boolean isLimited() {
+        return offset != null && count != null;
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        if (isLimited()) {
+            return sb.append(" [offset=").append(getOffset()).append(", count=").append(getCount()).append("]").toString();
+        }
+
+        return sb.append(" [unlimited]").toString();
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/Range.java b/src/main/java/com/lambdaworks/redis/Range.java
new file mode 100644
index 0000000000..98a416f0a5
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/Range.java
@@ -0,0 +1,210 @@
+package com.lambdaworks.redis;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * {@link Range} defines {@literal lower} and {@literal upper} boundaries to retrieve items from a sorted set.
+ * 
+ * @author Mark Paluch
+ * @since 4.3
+ */
+public class Range<T> {
+
+    private Boundary<T> lower;
+    private Boundary<T> upper;
+
+    private Range(Boundary<T> lower, Boundary<T> upper) {
+
+        LettuceAssert.notNull(lower, "Lower boundary must not be null");
+        LettuceAssert.notNull(upper, "Upper boundary must not be null");
+
+        this.lower = lower;
+        this.upper = upper;
+    }
+
+    /**
+     * Create a new range from {@code lower} and {@code upper} boundary values. Both values are included (greater than or equals
+     * and less than or equals).
+     * 
+     * @return new {@link Range}
+     */
+    public static <T> Range<T> create(T lower, T upper) {
+        return new Range<T>(Boundary.including(lower), Boundary.including(upper));
+    }
+
+    /**
+     * Create a new range from {@code lower} and {@code upper} boundaries.
+     * 
+     * @param lower lower boundary, must not be {@literal null}.
+     * @param upper upper boundary, must not be {@literal null}.
+     * @return new {@link Range}
+     */
+    public static <T> Range<T> from(Boundary<T> lower, Boundary<T> upper) {
+        return new Range<T>(lower, upper);
+    }
+
+    /**
+     * @return new {@link Range} with {@code lower} and {@code upper} set to {@link Boundary#unbounded()}.
+     */
+    public static <T> Range<T> unbounded() {
+        return new Range<T>(Boundary.unbounded(), Boundary.unbounded());
+    }
+
+    /**
+     * Greater than or equals {@code lower}.
+     * 
+     * @param lower the lower boundary value.
+     * @return {@code this} {@link Range} with {@code lower} applied.
+     */
+    public Range gte(T lower) {
+
+        this.lower = Boundary.including(lower);
+        return this;
+    }
+
+    /**
+     * Greater than {@code lower}.
+     *
+     * @param lower the lower boundary value.
+     * @return {@code this} {@link Range} with {@code lower} applied.
+     */
+    public Range gt(T lower) {
+
+        this.lower = Boundary.excluding(lower);
+        return this;
+    }
+
+    /**
+     * Less than or equals {@code lower}.
+     * 
+     * @param upper the upper boundary value.
+     * @return {@code this} {@link Range} with {@code upper} applied.
+     */
+    public Range<T> lte(T upper) {
+
+        this.upper = Boundary.including(upper);
+        return this;
+    }
+
+    /**
+     * Less than {@code lower}.
+     * 
+     * @param upper the upper boundary value.
+     * @return {@code this} {@link Range} with {@code upper} applied.
+     */
+    public Range<T> lt(T upper) {
+
+        this.upper = Boundary.excluding(upper);
+        return this;
+    }
+
+    /**
+     * @return the lower boundary.
+     */
+    public Boundary<T> getLower() {
+        return lower;
+    }
+
+    /**
+     * @return the upper boundary.
+     */
+    public Boundary<T> getUpper() {
+        return upper;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName()).append(" [");
+        sb.append(lower).append(" to ").append(upper).append("]");
+        return sb.toString();
+    }
+
+    /**
+     * @author Mark Paluch
+     */
+    public static class Boundary<T> {
+
+        private final static Boundary<?> UNBOUNDED = new Boundary<>(null, true);
+
+        private final T value;
+        private final boolean including;
+
+        private Boundary(T value, boolean including) {
+            this.value = value;
+            this.including = including;
+        }
+
+        /**
+         * Creates an unbounded (infinite) boundary that marks the beginning/end of the range.
+         * 
+         * @return the unbounded boundary.
+         */
+        @SuppressWarnings("unchecked")
+        public static <T> Boundary<T> unbounded() {
+            return (Boundary<T>) UNBOUNDED;
+        }
+
+        /**
+         * Create a {@link Boundary} based on the {@code value} that includes the value when comparing ranges. Greater or
+         * equals, less or equals. but not Greater or equal, less or equal to {@code value}.
+         * 
+         * @param value must not be {@literal null}.
+         * @param <T> value type
+         * @return the {@link Boundary}.
+         */
+        public static <T> Boundary<T> including(T value) {
+
+            LettuceAssert.notNull(value, "Value must not be null");
+
+            return new Boundary<>(value, true);
+        }
+
+        /**
+         * Create a {@link Boundary} based on the {@code value} that excludes the value when comparing ranges. Greater or less
+         * to {@code value} but not greater or equal, less or equal.
+         *
+         * @param value must not be {@literal null}.
+         * @param <T> value type
+         * @return the {@link Boundary}.
+         */
+        public static <T> Boundary<T> excluding(T value) {
+
+            LettuceAssert.notNull(value, "Value must not be null");
+
+            return new Boundary<>(value, false);
+        }
+
+        /**
+         * @return the value
+         */
+        public T getValue() {
+            return value;
+        }
+
+        /**
+         * @return {@literal true} if the boundary includes the value.
+         */
+        public boolean isIncluding() {
+            return including;
+        }
+
+        @Override
+        public String toString() {
+
+            if (value == null) {
+                return "[unbounded]";
+            }
+
+            StringBuilder sb = new StringBuilder();
+            if (including) {
+                sb.append('[');
+            } else {
+                sb.append('(');
+            }
+
+            sb.append(value);
+            return sb.toString();
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
index b9daa80e32..48b385ddeb 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
@@ -5,6 +5,11 @@
 import static com.lambdaworks.redis.protocol.CommandType.*;
 
 import java.util.*;
+import java.nio.ByteBuffer;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.internal.LettuceAssert;
@@ -27,6 +32,9 @@ class RedisCommandBuilder<K, V> extends BaseRedisCommandBuilder<K, V> {
     static final String MUST_NOT_BE_EMPTY = "must not be empty";
     static final String MUST_NOT_BE_NULL = "must not be null";
 
+    private static final byte[] MINUS_BYTES = {'-'};
+    private static final byte[] PLUS_BYTES = {'+'};
+
     public RedisCommandBuilder(RedisCodec<K, V> codec) {
         super(codec);
     }
@@ -1508,6 +1516,14 @@ public Command<K, V, Long> zcount(K key, String min, String max) {
         return createCommand(ZCOUNT, new IntegerOutput<K, V>(codec), args);
     }
 
+    public Command<K, V, Long> zcount(K key, Range<? extends Number> range) {
+        notNullKey(key);
+        notNullRange(range);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(min(range)).add(max(range));
+        return createCommand(ZCOUNT, new IntegerOutput<K, V>(codec), args);
+    }
+
     public Command<K, V, Double> zincrby(K key, double amount, K member) {
         notNullKey(key);
 
@@ -1571,6 +1587,19 @@ public Command<K, V, List<V>> zrangebyscore(K key, String min, String max, long
         return createCommand(ZRANGEBYSCORE, new ValueListOutput<K, V>(codec), args);
     }
 
+    public Command<K, V, List<V>> zrangebyscore(K key, Range<? extends Number> range, Limit limit) {
+        notNullKey(key);
+        notNullRange(range);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        args.addKey(key).add(min(range)).add(max(range));
+
+        if(limit.isLimited()) {
+            args.add(LIMIT).add(limit.getOffset()).add(limit.getCount());
+        }
+        return createCommand(ZRANGEBYSCORE, new ValueListOutput<K, V>(codec), args);
+    }
+
     public Command<K, V, List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max) {
         return zrangebyscoreWithScores(key, string(min), string(max));
     }
@@ -1593,7 +1622,17 @@ public Command<K, V, List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String
         notNullMinMax(min, max);
 
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(min).add(max).add(WITHSCORES).add(LIMIT).add(offset).add(count);
+        addLimit(args.addKey(key).add(min).add(max).add(WITHSCORES), Limit.create(offset, count));
+        return createCommand(ZRANGEBYSCORE, new ScoredValueListOutput<K, V>(codec), args);
+    }
+
+    public Command<K, V, List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
+        notNullKey(key);
+        notNullRange(range);
+        notNullLimit(limit);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        addLimit(args.addKey(key).add(min(range)).add(max(range)).add(WITHSCORES), limit);
         return createCommand(ZRANGEBYSCORE, new ScoredValueListOutput<K, V>(codec), args);
     }
 
@@ -1636,7 +1675,18 @@ public Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key
         LettuceAssert.notNull(channel, "ScoredValueStreamingChannel " + MUST_NOT_BE_NULL);
 
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(min).add(max).add(LIMIT).add(offset).add(count);
+        addLimit(args.addKey(key).add(min).add(max), Limit.create(offset, count));
+        return createCommand(ZRANGEBYSCORE, new ValueStreamingOutput<K, V>(codec, channel), args);
+    }
+
+    public Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
+        notNullKey(key);
+        notNullRange(range);
+        notNullLimit(limit);
+        LettuceAssert.notNull(channel, "ScoredValueStreamingChannel " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        addLimit(args.addKey(key).add(min(range)).add(max(range)), limit);
         return createCommand(ZRANGEBYSCORE, new ValueStreamingOutput<K, V>(codec, channel), args);
     }
 
@@ -1666,7 +1716,18 @@ public Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V
         notNull(channel);
 
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(min).add(max).add(WITHSCORES).add(LIMIT).add(offset).add(count);
+        addLimit(args.addKey(key).add(min).add(max).add(WITHSCORES), Limit.create(offset, count));
+        return createCommand(ZRANGEBYSCORE, new ScoredValueStreamingOutput<K, V>(codec, channel), args);
+    }
+
+    public Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
+        notNullKey(key);
+        notNullRange(range);
+        notNullLimit(limit);
+        notNull(channel);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        addLimit(args.addKey(key).add(min(range)).add(max(range)).add(WITHSCORES), limit);
         return createCommand(ZRANGEBYSCORE, new ScoredValueStreamingOutput<K, V>(codec, channel), args);
     }
 
@@ -1703,6 +1764,14 @@ public Command<K, V, Long> zremrangebyscore(K key, String min, String max) {
         return createCommand(ZREMRANGEBYSCORE, new IntegerOutput<K, V>(codec), args);
     }
 
+    public Command<K, V, Long> zremrangebyscore(K key, Range<? extends Number> range) {
+        notNullKey(key);
+        notNullRange(range);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(min(range)).add(max(range));
+        return createCommand(ZREMRANGEBYSCORE, new IntegerOutput<K, V>(codec), args);
+    }
+
     public Command<K, V, List<V>> zrevrange(K key, long start, long stop) {
         notNullKey(key);
 
@@ -1739,7 +1808,17 @@ public Command<K, V, List<V>> zrevrangebyscore(K key, String max, String min, lo
         notNullMinMax(min, max);
 
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(max).add(min).add(LIMIT).add(offset).add(count);
+        addLimit(args.addKey(key).add(max).add(min), Limit.create(offset, count));
+        return createCommand(ZREVRANGEBYSCORE, new ValueListOutput<K, V>(codec), args);
+    }
+
+    public Command<K, V, List<V>> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit) {
+        notNullKey(key);
+        notNullRange(range);
+        notNullLimit(limit);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        addLimit(args.addKey(key).add(max(range)).add(min(range)), limit);
         return createCommand(ZREVRANGEBYSCORE, new ValueListOutput<K, V>(codec), args);
     }
 
@@ -1767,7 +1846,17 @@ public Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Str
         notNullMinMax(min, max);
 
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(max).add(min).add(WITHSCORES).add(LIMIT).add(offset).add(count);
+        addLimit(args.addKey(key).add(max).add(min).add(WITHSCORES), Limit.create(offset, count));
+        return createCommand(ZREVRANGEBYSCORE, new ScoredValueListOutput<K, V>(codec), args);
+    }
+
+    public Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
+        notNullKey(key);
+        notNullRange(range);
+        notNullLimit(limit);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        addLimit(args.addKey(key).add(max(range)).add(min(range)).add(WITHSCORES), limit);
         return createCommand(ZREVRANGEBYSCORE, new ScoredValueListOutput<K, V>(codec), args);
     }
 
@@ -1813,7 +1902,18 @@ public Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K
         notNull(channel);
 
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(max).add(min).add(LIMIT).add(offset).add(count);
+        addLimit(args.addKey(key).add(max).add(min), Limit.create(offset, count));
+        return createCommand(ZREVRANGEBYSCORE, new ValueStreamingOutput<K, V>(codec, channel), args);
+    }
+
+    public Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
+        notNullKey(key);
+        notNullRange(range);
+        notNullLimit(limit);
+        notNull(channel);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        addLimit(args.addKey(key).add(max(range)).add(min(range)), limit);
         return createCommand(ZREVRANGEBYSCORE, new ValueStreamingOutput<K, V>(codec, channel), args);
     }
 
@@ -1849,7 +1949,19 @@ public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChanne
         notNull(channel);
 
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(max).add(min).add(WITHSCORES).add(LIMIT).add(offset).add(count);
+        addLimit(args.addKey(key).add(max).add(min).add(WITHSCORES), Limit.create(offset, count));
+        return createCommand(ZREVRANGEBYSCORE, new ScoredValueStreamingOutput<K, V>(codec, channel), args);
+    }
+
+    public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
+            Limit limit) {
+        notNullKey(key);
+        notNullRange(range);
+        notNullLimit(limit);
+        notNull(channel);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        addLimit(args.addKey(key).add(max(range)).add(min(range)).add(WITHSCORES), limit);
         return createCommand(ZREVRANGEBYSCORE, new ScoredValueStreamingOutput<K, V>(codec, channel), args);
     }
 
@@ -1890,6 +2002,15 @@ public RedisCommand<K, V, Long> zlexcount(K key, String min, String max) {
         return createCommand(ZLEXCOUNT, new IntegerOutput<K, V>(codec), args);
     }
 
+    public RedisCommand<K, V, Long> zlexcount(K key, Range<? extends V> range) {
+        notNullKey(key);
+        notNullRange(range);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        args.addKey(key).add(minValue(range)).add(maxValue(range));
+        return createCommand(ZLEXCOUNT, new IntegerOutput<K, V>(codec), args);
+    }
+
     public RedisCommand<K, V, Long> zremrangebylex(K key, String min, String max) {
         notNullKey(key);
         notNullMinMax(min, max);
@@ -1899,6 +2020,15 @@ public RedisCommand<K, V, Long> zremrangebylex(K key, String min, String max) {
         return createCommand(ZREMRANGEBYLEX, new IntegerOutput<K, V>(codec), args);
     }
 
+    public RedisCommand<K, V, Long> zremrangebylex(K key, Range<? extends V> range) {
+        notNullKey(key);
+        notNullRange(range);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        args.addKey(key).add(minValue(range)).add(maxValue(range));
+        return createCommand(ZREMRANGEBYLEX, new IntegerOutput<K, V>(codec), args);
+    }
+
     public RedisCommand<K, V, List<V>> zrangebylex(K key, String min, String max) {
         notNullKey(key);
         notNullMinMax(min, max);
@@ -1913,7 +2043,17 @@ public RedisCommand<K, V, List<V>> zrangebylex(K key, String min, String max, lo
         notNullMinMax(min, max);
 
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(min).add(max).add(LIMIT).add(offset).add(count);
+        addLimit(args.addKey(key).add(min).add(max), Limit.create(offset, count));
+        return createCommand(ZRANGEBYLEX, new ValueListOutput<K, V>(codec), args);
+    }
+
+    public RedisCommand<K, V, List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit) {
+        notNullKey(key);
+        notNullRange(range);
+        notNullLimit(limit);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        addLimit(args.addKey(key).add(minValue(range)).add(maxValue(range)), limit);
         return createCommand(ZRANGEBYLEX, new ValueListOutput<K, V>(codec), args);
     }
 
@@ -2580,6 +2720,14 @@ private void notNullKey(K key) {
         LettuceAssert.notNull(key, "Key " + MUST_NOT_BE_NULL);
     }
 
+    private void notNullRange(Range<?> range) {
+        LettuceAssert.notNull(range, "Range " + MUST_NOT_BE_NULL);
+    }
+
+    private void notNullLimit(Limit limit) {
+        LettuceAssert.notNull(limit, "Limit " + MUST_NOT_BE_NULL);
+    }
+
     public void notNullMinMax(String min, String max) {
         LettuceAssert.notNull(min, "Min " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(max, "Max " + MUST_NOT_BE_NULL);
@@ -2604,4 +2752,71 @@ private void notEmptySlots(int[] slots) {
         LettuceAssert.notNull(slots, "Slots " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(slots, "Slots " + MUST_NOT_BE_EMPTY);
     }
+
+    private void addLimit(CommandArgs<K, V> args, Limit limit) {
+
+        if(limit.isLimited()){
+            args.add(LIMIT).add(limit.getOffset()).add(limit.getCount());
+        }
+    }
+
+    private String min(Range<? extends Number> range) {
+
+        Range.Boundary<? extends Number> lower = range.getLower();
+
+        if(lower.getValue() == null || lower.getValue() instanceof Double && lower.getValue().doubleValue() == Double.NEGATIVE_INFINITY){
+            return "-inf";
+        }
+
+        if(!lower.isIncluding()){
+            return "(" + lower.getValue();
+        }
+
+        return lower.getValue().toString();
+    }
+
+    private String max(Range<? extends Number> range) {
+
+        Range.Boundary<? extends Number> upper = range.getUpper();
+
+        if(upper.getValue() == null || upper.getValue() instanceof Double && upper.getValue().doubleValue() == Double.POSITIVE_INFINITY){
+            return "+inf";
+        }
+
+        if(!upper.isIncluding()){
+            return "(" + upper.getValue();
+        }
+
+        return upper.getValue().toString();
+    }
+
+    private byte[] minValue(Range<? extends V> range) {
+
+        Range.Boundary<? extends V> lower = range.getLower();
+
+        if(lower.getValue() == null){
+            return MINUS_BYTES;
+        }
+
+        ByteBuffer encoded = codec.encodeValue(lower.getValue());
+        ByteBuffer allocated = ByteBuffer.allocate(encoded.remaining() + 1);
+        allocated.put(lower.isIncluding() ? (byte) '[' : (byte) '(').put(encoded);
+
+        return allocated.array();
+    }
+
+    private byte[] maxValue(Range<? extends V> range) {
+
+        Range.Boundary<? extends V> upper = range.getUpper();
+
+        if(upper.getValue() == null){
+            return PLUS_BYTES;
+        }
+
+        ByteBuffer encoded = codec.encodeValue(upper.getValue());
+        ByteBuffer allocated = ByteBuffer.allocate(encoded.remaining() + 1);
+        allocated.put(upper.isIncluding() ? (byte) '[' : (byte) '(').put(encoded);
+
+        return allocated.array();
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
index 27c3285e38..b02bb9314a 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
@@ -1,6 +1,8 @@
 package com.lambdaworks.redis.api.async;
 
 import java.util.List;
+import com.lambdaworks.redis.Limit;
+import com.lambdaworks.redis.Range;
 import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.ScanCursor;
 import com.lambdaworks.redis.ScoredValue;
@@ -131,7 +133,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zcount(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<Long> zcount(K key, double min, double max);
 
     /**
@@ -141,9 +145,21 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zcount(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<Long> zcount(K key, String min, String max);
 
+    /**
+     * Count the members in a sorted set with scores within the given {@link Range}.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<Long> zcount(K key, Range<? extends Number> range);
+
     /**
      * Increment the score of a member in a sorted set.
      * 
@@ -201,7 +217,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<List<V>> zrangebyscore(K key, double min, double max);
 
     /**
@@ -211,9 +229,21 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<List<V>> zrangebyscore(K key, String min, String max);
 
+    /**
+     * Return a range of members in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<List<V>> zrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by score.
      * 
@@ -223,7 +253,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     RedisFuture<List<V>> zrangebyscore(K key, double min, double max, long offset, long count);
 
     /**
@@ -235,9 +267,22 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     RedisFuture<List<V>> zrangebyscore(K key, String min, String max, long offset, long count);
 
+    /**
+     * Return a range of members in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<List<V>> zrangebyscore(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members with score in a sorted set, by score.
      * 
@@ -245,7 +290,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max);
 
     /**
@@ -255,9 +302,21 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max);
 
+    /**
+     * Return a range of members with score in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members with score in a sorted set, by score.
      * 
@@ -267,6 +326,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
     RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
@@ -279,9 +339,22 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
 
+    /**
+     * Return a range of members with score in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by index.
      * 
@@ -312,7 +385,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
@@ -323,9 +398,22 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
 
+    /**
+     * Stream over a range of members in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over range of members in a sorted set, by score.
      * 
@@ -336,7 +424,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
@@ -349,9 +439,23 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
+    /**
+     * Stream over a range of members in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score.
      * 
@@ -360,7 +464,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
@@ -371,9 +477,22 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score.
      * 
@@ -384,7 +503,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
@@ -397,9 +518,23 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Determine the index of a member in a sorted set.
      * 
@@ -438,7 +573,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<Long> zremrangebyscore(K key, double min, double max);
 
     /**
@@ -448,9 +585,21 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<Long> zremrangebyscore(K key, String min, String max);
 
+    /**
+     * Remove all members in a sorted set within the given scores.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    RedisFuture<Long> zremrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by index, with scores ordered from high to low.
      * 
@@ -478,7 +627,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<List<V>> zrevrangebyscore(K key, double max, double min);
 
     /**
@@ -488,9 +639,21 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<List<V>> zrevrangebyscore(K key, String max, String min);
 
+    /**
+     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<List<V>> zrevrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -500,7 +663,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the withscores
      * @param count the null
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     RedisFuture<List<V>> zrevrangebyscore(K key, double max, double min, long offset, long count);
 
     /**
@@ -512,9 +677,22 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     RedisFuture<List<V>> zrevrangebyscore(K key, String max, String min, long offset, long count);
 
+    /**
+     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<List<V>> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -522,7 +700,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min);
 
     /**
@@ -532,9 +712,21 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min);
 
+    /**
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -544,7 +736,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
 
     /**
@@ -556,9 +750,22 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
 
+    /**
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
      * 
@@ -589,7 +796,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
@@ -600,9 +809,22 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
 
+    /**
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -613,7 +835,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
@@ -626,9 +850,23 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
+    /**
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -637,7 +875,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
@@ -648,9 +888,21 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified range.
+     */
+    RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -661,7 +913,9 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
@@ -674,9 +928,23 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Determine the index of a member in a sorted set, with scores ordered from high to low.
      * 
@@ -799,9 +1067,21 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<Long> zlexcount(K key, String min, String max);
 
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<Long> zlexcount(K key, Range<? extends V> range);
+
     /**
      * Remove all members in a sorted set between the given lexicographical range.
      * 
@@ -809,9 +1089,21 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<Long> zremrangebylex(K key, String min, String max);
 
+    /**
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    RedisFuture<Long> zremrangebylex(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range.
      * 
@@ -819,9 +1111,21 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<List<V>> zrangebylex(K key, String min, String max);
 
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<List<V>> zrangebylex(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range.
      * 
@@ -831,6 +1135,19 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     RedisFuture<List<V>> zrangebylex(K key, String min, String max, long offset, long count);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
index ca9c6ca24c..3acd9a8a97 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
@@ -1,6 +1,8 @@
 package com.lambdaworks.redis.api.reactive;
 
 import java.util.List;
+import com.lambdaworks.redis.Limit;
+import com.lambdaworks.redis.Range;
 import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.ScanCursor;
 import com.lambdaworks.redis.ScoredValue;
@@ -132,7 +134,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zcount(java.lang.Object, Range)}
      */
+    @Deprecated
     Mono<Long> zcount(K key, double min, double max);
 
     /**
@@ -142,9 +146,21 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zcount(java.lang.Object, Range)}
      */
+    @Deprecated
     Mono<Long> zcount(K key, String min, String max);
 
+    /**
+     * Count the members in a sorted set with scores within the given {@link Range}.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    Mono<Long> zcount(K key, Range<? extends Number> range);
+
     /**
      * Increment the score of a member in a sorted set.
      * 
@@ -202,7 +218,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return V array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Flux<V> zrangebyscore(K key, double min, double max);
 
     /**
@@ -212,9 +230,21 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return V array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Flux<V> zrangebyscore(K key, String min, String max);
 
+    /**
+     * Return a range of members in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @return V array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Flux<V> zrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by score.
      * 
@@ -224,7 +254,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return V array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Flux<V> zrangebyscore(K key, double min, double max, long offset, long count);
 
     /**
@@ -236,9 +268,22 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return V array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Flux<V> zrangebyscore(K key, String min, String max, long offset, long count);
 
+    /**
+     * Return a range of members in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return V array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Flux<V> zrangebyscore(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members with score in a sorted set, by score.
      * 
@@ -246,7 +291,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max);
 
     /**
@@ -256,9 +303,21 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max);
 
+    /**
+     * Return a range of members with score in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members with score in a sorted set, by score.
      * 
@@ -268,6 +327,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
     Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
@@ -280,9 +340,22 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
 
+    /**
+     * Return a range of members with score in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by index.
      * 
@@ -313,7 +386,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
@@ -324,9 +399,22 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
 
+    /**
+     * Stream over a range of members in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over range of members in a sorted set, by score.
      * 
@@ -337,7 +425,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
@@ -350,9 +440,23 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
+    /**
+     * Stream over a range of members in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score.
      * 
@@ -361,7 +465,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
@@ -372,9 +478,22 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score.
      * 
@@ -385,7 +504,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
@@ -398,9 +519,23 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Determine the index of a member in a sorted set.
      * 
@@ -439,7 +574,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Mono<Long> zremrangebyscore(K key, double min, double max);
 
     /**
@@ -449,9 +586,21 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Mono<Long> zremrangebyscore(K key, String min, String max);
 
+    /**
+     * Remove all members in a sorted set within the given scores.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    Mono<Long> zremrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by index, with scores ordered from high to low.
      * 
@@ -479,7 +628,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return V array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Flux<V> zrevrangebyscore(K key, double max, double min);
 
     /**
@@ -489,9 +640,21 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return V array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Flux<V> zrevrangebyscore(K key, String max, String min);
 
+    /**
+     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return V array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Flux<V> zrevrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -501,7 +664,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the withscores
      * @param count the null
      * @return V array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Flux<V> zrevrangebyscore(K key, double max, double min, long offset, long count);
 
     /**
@@ -513,9 +678,22 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return V array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Flux<V> zrevrangebyscore(K key, String max, String min, long offset, long count);
 
+    /**
+     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return V array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Flux<V> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -523,7 +701,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return V array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min);
 
     /**
@@ -533,9 +713,21 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min);
 
+    /**
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -545,7 +737,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
 
     /**
@@ -557,9 +751,22 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return V array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
 
+    /**
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit limit
+     * @return V array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
      * 
@@ -590,7 +797,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
@@ -601,9 +810,22 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
 
+    /**
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -614,7 +836,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
@@ -627,9 +851,23 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
+    /**
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -638,7 +876,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
@@ -649,9 +889,21 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified range.
+     */
+    Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -662,7 +914,9 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
@@ -675,9 +929,23 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    Mono<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Determine the index of a member in a sorted set, with scores ordered from high to low.
      * 
@@ -800,9 +1068,21 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
      */
+    @Deprecated
     Mono<Long> zlexcount(K key, String min, String max);
 
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    Mono<Long> zlexcount(K key, Range<? extends V> range);
+
     /**
      * Remove all members in a sorted set between the given lexicographical range.
      * 
@@ -810,9 +1090,21 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     Mono<Long> zremrangebylex(K key, String min, String max);
 
+    /**
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    Mono<Long> zremrangebylex(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range.
      * 
@@ -820,9 +1112,21 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return V array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     Flux<V> zrangebylex(K key, String min, String max);
 
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return V array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Flux<V> zrangebylex(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range.
      * 
@@ -832,6 +1136,19 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return V array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     Flux<V> zrangebylex(K key, String min, String max, long offset, long count);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return V array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Flux<V> zrangebylex(K key, Range<? extends V> range, Limit limit);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
index 00062b93b0..d484e1ef94 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
@@ -1,6 +1,8 @@
 package com.lambdaworks.redis.api.sync;
 
 import java.util.List;
+import com.lambdaworks.redis.Limit;
+import com.lambdaworks.redis.Range;
 import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.ScanCursor;
 import com.lambdaworks.redis.ScoredValue;
@@ -130,7 +132,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zcount(java.lang.Object, Range)}
      */
+    @Deprecated
     Long zcount(K key, double min, double max);
 
     /**
@@ -140,9 +144,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zcount(java.lang.Object, Range)}
      */
+    @Deprecated
     Long zcount(K key, String min, String max);
 
+    /**
+     * Count the members in a sorted set with scores within the given {@link Range}.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    Long zcount(K key, Range<? extends Number> range);
+
     /**
      * Increment the score of a member in a sorted set.
      * 
@@ -200,7 +216,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     List<V> zrangebyscore(K key, double min, double max);
 
     /**
@@ -210,9 +228,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     List<V> zrangebyscore(K key, String min, String max);
 
+    /**
+     * Return a range of members in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<V> zrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by score.
      * 
@@ -222,7 +252,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     List<V> zrangebyscore(K key, double min, double max, long offset, long count);
 
     /**
@@ -234,9 +266,22 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     List<V> zrangebyscore(K key, String min, String max, long offset, long count);
 
+    /**
+     * Return a range of members in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<V> zrangebyscore(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members with score in a sorted set, by score.
      * 
@@ -244,7 +289,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     List<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max);
 
     /**
@@ -254,9 +301,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     List<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max);
 
+    /**
+     * Return a range of members with score in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members with score in a sorted set, by score.
      * 
@@ -266,6 +325,7 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
     List<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
@@ -278,9 +338,22 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     List<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
 
+    /**
+     * Return a range of members with score in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by index.
      * 
@@ -311,7 +384,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Long zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
@@ -322,9 +397,22 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Long zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
 
+    /**
+     * Stream over a range of members in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over range of members in a sorted set, by score.
      * 
@@ -335,7 +423,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Long zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
@@ -348,9 +438,23 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Long zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
+    /**
+     * Stream over a range of members in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score.
      * 
@@ -359,7 +463,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
@@ -370,9 +476,22 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score.
      * 
@@ -383,7 +502,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
@@ -396,9 +517,23 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Determine the index of a member in a sorted set.
      * 
@@ -437,7 +572,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Long zremrangebyscore(K key, double min, double max);
 
     /**
@@ -447,9 +584,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Long zremrangebyscore(K key, String min, String max);
 
+    /**
+     * Remove all members in a sorted set within the given scores.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    Long zremrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by index, with scores ordered from high to low.
      * 
@@ -477,7 +626,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     List<V> zrevrangebyscore(K key, double max, double min);
 
     /**
@@ -487,9 +638,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     List<V> zrevrangebyscore(K key, String max, String min);
 
+    /**
+     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<V> zrevrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -499,7 +662,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the withscores
      * @param count the null
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     List<V> zrevrangebyscore(K key, double max, double min, long offset, long count);
 
     /**
@@ -511,9 +676,22 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     List<V> zrevrangebyscore(K key, String max, String min, long offset, long count);
 
+    /**
+     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<V> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -521,7 +699,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min);
 
     /**
@@ -531,9 +711,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min);
 
+    /**
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -543,7 +735,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
 
     /**
@@ -555,9 +749,22 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
 
+    /**
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
      * 
@@ -588,7 +795,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
@@ -599,9 +808,22 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
 
+    /**
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -612,7 +834,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
@@ -625,9 +849,23 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
+    /**
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -636,7 +874,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
@@ -647,9 +887,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified range.
+     */
+    Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -660,7 +912,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
@@ -673,9 +927,23 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Determine the index of a member in a sorted set, with scores ordered from high to low.
      * 
@@ -798,9 +1066,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
      */
+    @Deprecated
     Long zlexcount(K key, String min, String max);
 
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    Long zlexcount(K key, Range<? extends V> range);
+
     /**
      * Remove all members in a sorted set between the given lexicographical range.
      * 
@@ -808,9 +1088,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     Long zremrangebylex(K key, String min, String max);
 
+    /**
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    Long zremrangebylex(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range.
      * 
@@ -818,9 +1110,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     List<V> zrangebylex(K key, String min, String max);
 
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<V> zrangebylex(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range.
      * 
@@ -830,6 +1134,19 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     List<V> zrangebylex(K key, String min, String max, long offset, long count);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<V> zrangebylex(K key, Range<? extends V> range, Limit limit);
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
index 489f704428..100e83dc7b 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
@@ -1,6 +1,8 @@
 package com.lambdaworks.redis.cluster.api.async;
 
 import java.util.List;
+import com.lambdaworks.redis.Limit;
+import com.lambdaworks.redis.Range;
 import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.ScanCursor;
 import com.lambdaworks.redis.ScoredValue;
@@ -131,7 +133,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zcount(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<Long> zcount(K key, double min, double max);
 
     /**
@@ -141,9 +145,21 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zcount(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<Long> zcount(K key, String min, String max);
 
+    /**
+     * Count the members in a sorted set with scores within the given {@link Range}.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<Long> zcount(K key, Range<? extends Number> range);
+
     /**
      * Increment the score of a member in a sorted set.
      * 
@@ -201,7 +217,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<List<V>> zrangebyscore(K key, double min, double max);
 
     /**
@@ -211,9 +229,21 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<List<V>> zrangebyscore(K key, String min, String max);
 
+    /**
+     * Return a range of members in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<List<V>> zrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by score.
      * 
@@ -223,7 +253,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     AsyncExecutions<List<V>> zrangebyscore(K key, double min, double max, long offset, long count);
 
     /**
@@ -235,9 +267,22 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     AsyncExecutions<List<V>> zrangebyscore(K key, String min, String max, long offset, long count);
 
+    /**
+     * Return a range of members in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<List<V>> zrangebyscore(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members with score in a sorted set, by score.
      * 
@@ -245,7 +290,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max);
 
     /**
@@ -255,9 +302,21 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max);
 
+    /**
+     * Return a range of members with score in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members with score in a sorted set, by score.
      * 
@@ -267,6 +326,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
     AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
@@ -279,9 +339,22 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
 
+    /**
+     * Return a range of members with score in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by index.
      * 
@@ -312,7 +385,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
@@ -323,9 +398,22 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
 
+    /**
+     * Stream over a range of members in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over range of members in a sorted set, by score.
      * 
@@ -336,7 +424,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
@@ -349,9 +439,23 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
+    /**
+     * Stream over a range of members in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score.
      * 
@@ -360,7 +464,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
@@ -371,9 +477,22 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score.
      * 
@@ -384,7 +503,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     AsyncExecutions<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
@@ -397,9 +518,23 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     AsyncExecutions<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Determine the index of a member in a sorted set.
      * 
@@ -438,7 +573,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<Long> zremrangebyscore(K key, double min, double max);
 
     /**
@@ -448,9 +585,21 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<Long> zremrangebyscore(K key, String min, String max);
 
+    /**
+     * Remove all members in a sorted set within the given scores.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    AsyncExecutions<Long> zremrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by index, with scores ordered from high to low.
      * 
@@ -478,7 +627,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<List<V>> zrevrangebyscore(K key, double max, double min);
 
     /**
@@ -488,9 +639,21 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<List<V>> zrevrangebyscore(K key, String max, String min);
 
+    /**
+     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<List<V>> zrevrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -500,7 +663,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the withscores
      * @param count the null
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     AsyncExecutions<List<V>> zrevrangebyscore(K key, double max, double min, long offset, long count);
 
     /**
@@ -512,9 +677,22 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     AsyncExecutions<List<V>> zrevrangebyscore(K key, String max, String min, long offset, long count);
 
+    /**
+     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<List<V>> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -522,7 +700,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min);
 
     /**
@@ -532,9 +712,21 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min);
 
+    /**
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -544,7 +736,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
 
     /**
@@ -556,9 +750,22 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
 
+    /**
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
      * 
@@ -589,7 +796,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
@@ -600,9 +809,22 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
 
+    /**
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -613,7 +835,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
@@ -626,9 +850,23 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
+    /**
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -637,7 +875,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
@@ -648,9 +888,21 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified range.
+     */
+    AsyncExecutions<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -661,7 +913,9 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     AsyncExecutions<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
@@ -674,9 +928,23 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     AsyncExecutions<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    AsyncExecutions<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Determine the index of a member in a sorted set, with scores ordered from high to low.
      * 
@@ -799,9 +1067,21 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<Long> zlexcount(K key, String min, String max);
 
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<Long> zlexcount(K key, Range<? extends V> range);
+
     /**
      * Remove all members in a sorted set between the given lexicographical range.
      * 
@@ -809,9 +1089,21 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<Long> zremrangebylex(K key, String min, String max);
 
+    /**
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    AsyncExecutions<Long> zremrangebylex(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range.
      * 
@@ -819,9 +1111,21 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<List<V>> zrangebylex(K key, String min, String max);
 
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<List<V>> zrangebylex(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range.
      * 
@@ -831,6 +1135,19 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     AsyncExecutions<List<V>> zrangebylex(K key, String min, String max, long offset, long count);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit);
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
index 288961a928..0aeeaee2a6 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
@@ -1,6 +1,8 @@
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.List;
+import com.lambdaworks.redis.Limit;
+import com.lambdaworks.redis.Range;
 import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.ScanCursor;
 import com.lambdaworks.redis.ScoredValue;
@@ -130,7 +132,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zcount(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<Long> zcount(K key, double min, double max);
 
     /**
@@ -140,9 +144,21 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zcount(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<Long> zcount(K key, String min, String max);
 
+    /**
+     * Count the members in a sorted set with scores within the given {@link Range}.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<Long> zcount(K key, Range<? extends Number> range);
+
     /**
      * Increment the score of a member in a sorted set.
      * 
@@ -200,7 +216,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<List<V>> zrangebyscore(K key, double min, double max);
 
     /**
@@ -210,9 +228,21 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<List<V>> zrangebyscore(K key, String min, String max);
 
+    /**
+     * Return a range of members in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<List<V>> zrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by score.
      * 
@@ -222,7 +252,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Executions<List<V>> zrangebyscore(K key, double min, double max, long offset, long count);
 
     /**
@@ -234,9 +266,22 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Executions<List<V>> zrangebyscore(K key, String min, String max, long offset, long count);
 
+    /**
+     * Return a range of members in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<List<V>> zrangebyscore(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members with score in a sorted set, by score.
      * 
@@ -244,7 +289,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max);
 
     /**
@@ -254,9 +301,21 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max);
 
+    /**
+     * Return a range of members with score in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members with score in a sorted set, by score.
      * 
@@ -266,6 +325,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
     Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
@@ -278,9 +338,22 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
 
+    /**
+     * Return a range of members with score in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by index.
      * 
@@ -311,7 +384,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
@@ -322,9 +397,22 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
 
+    /**
+     * Stream over a range of members in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over range of members in a sorted set, by score.
      * 
@@ -335,7 +423,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
@@ -348,9 +438,23 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
+    /**
+     * Stream over a range of members in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score.
      * 
@@ -359,7 +463,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
@@ -370,9 +476,22 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score.
      * 
@@ -383,7 +502,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Executions<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
@@ -396,9 +517,23 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Executions<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Determine the index of a member in a sorted set.
      * 
@@ -437,7 +572,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<Long> zremrangebyscore(K key, double min, double max);
 
     /**
@@ -447,9 +584,21 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<Long> zremrangebyscore(K key, String min, String max);
 
+    /**
+     * Remove all members in a sorted set within the given scores.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    Executions<Long> zremrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by index, with scores ordered from high to low.
      * 
@@ -477,7 +626,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<List<V>> zrevrangebyscore(K key, double max, double min);
 
     /**
@@ -487,9 +638,21 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<List<V>> zrevrangebyscore(K key, String max, String min);
 
+    /**
+     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<List<V>> zrevrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -499,7 +662,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the withscores
      * @param count the null
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Executions<List<V>> zrevrangebyscore(K key, double max, double min, long offset, long count);
 
     /**
@@ -511,9 +676,22 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Executions<List<V>> zrevrangebyscore(K key, String max, String min, long offset, long count);
 
+    /**
+     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<List<V>> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -521,7 +699,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min);
 
     /**
@@ -531,9 +711,21 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min);
 
+    /**
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -543,7 +735,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
 
     /**
@@ -555,9 +749,22 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
 
+    /**
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
      * 
@@ -588,7 +795,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
@@ -599,9 +808,22 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
 
+    /**
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -612,7 +834,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
@@ -625,9 +849,23 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
+    /**
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -636,7 +874,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
@@ -647,9 +887,21 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified range.
+     */
+    Executions<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -660,7 +912,9 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Executions<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
@@ -673,9 +927,23 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Executions<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    Executions<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Determine the index of a member in a sorted set, with scores ordered from high to low.
      * 
@@ -798,9 +1066,21 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<Long> zlexcount(K key, String min, String max);
 
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<Long> zlexcount(K key, Range<? extends V> range);
+
     /**
      * Remove all members in a sorted set between the given lexicographical range.
      * 
@@ -808,9 +1088,21 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<Long> zremrangebylex(K key, String min, String max);
 
+    /**
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    Executions<Long> zremrangebylex(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range.
      * 
@@ -818,9 +1110,21 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<List<V>> zrangebylex(K key, String min, String max);
 
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<List<V>> zrangebylex(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range.
      * 
@@ -830,6 +1134,19 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     Executions<List<V>> zrangebylex(K key, String min, String max, long offset, long count);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit);
 }
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
index 251a69dc4c..653e5762dc 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import com.lambdaworks.redis.Limit;
+import com.lambdaworks.redis.Range;
 import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.ScanCursor;
 import com.lambdaworks.redis.ScoredValue;
@@ -130,7 +132,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zcount(java.lang.Object, Range)}
      */
+    @Deprecated
     Long zcount(K key, double min, double max);
 
     /**
@@ -140,9 +144,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zcount(java.lang.Object, Range)}
      */
+    @Deprecated
     Long zcount(K key, String min, String max);
 
+    /**
+     * Count the members in a sorted set with scores within the given {@link Range}.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    Long zcount(K key, Range<? extends Number> range);
+
     /**
      * Increment the score of a member in a sorted set.
      * 
@@ -200,7 +216,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     List<V> zrangebyscore(K key, double min, double max);
 
     /**
@@ -210,9 +228,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     List<V> zrangebyscore(K key, String min, String max);
 
+    /**
+     * Return a range of members in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<V> zrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by score.
      * 
@@ -222,7 +252,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     List<V> zrangebyscore(K key, double min, double max, long offset, long count);
 
     /**
@@ -234,9 +266,22 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     List<V> zrangebyscore(K key, String min, String max, long offset, long count);
 
+    /**
+     * Return a range of members in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<V> zrangebyscore(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members with score in a sorted set, by score.
      * 
@@ -244,7 +289,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     List<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max);
 
     /**
@@ -254,9 +301,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     List<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max);
 
+    /**
+     * Return a range of members with score in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members with score in a sorted set, by score.
      * 
@@ -266,6 +325,7 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
     List<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
@@ -278,9 +338,22 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     List<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
 
+    /**
+     * Return a range of members with score in a sorted set, by score.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by index.
      * 
@@ -311,7 +384,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Long zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
@@ -322,9 +397,22 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Long zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
 
+    /**
+     * Stream over a range of members in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over range of members in a sorted set, by score.
      * 
@@ -335,7 +423,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Long zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
@@ -348,9 +438,23 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Long zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
+    /**
+     * Stream over a range of members in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score.
      * 
@@ -359,7 +463,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
@@ -370,9 +476,22 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score.
      * 
@@ -383,7 +502,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
@@ -396,9 +517,23 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified score range.
+     * @since 4.3
+     */
+    Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Determine the index of a member in a sorted set.
      * 
@@ -437,7 +572,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Long zremrangebyscore(K key, double min, double max);
 
     /**
@@ -447,9 +584,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Long zremrangebyscore(K key, String min, String max);
 
+    /**
+     * Remove all members in a sorted set within the given scores.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    Long zremrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by index, with scores ordered from high to low.
      * 
@@ -477,7 +626,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     List<V> zrevrangebyscore(K key, double max, double min);
 
     /**
@@ -487,9 +638,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     List<V> zrevrangebyscore(K key, String max, String min);
 
+    /**
+     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<V> zrevrangebyscore(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -499,7 +662,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the withscores
      * @param count the null
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     List<V> zrevrangebyscore(K key, double max, double min, long offset, long count);
 
     /**
@@ -511,9 +676,22 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     List<V> zrevrangebyscore(K key, String max, String min, long offset, long count);
 
+    /**
+     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<V> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -521,7 +699,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min);
 
     /**
@@ -531,9 +711,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
+    @Deprecated
     List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min);
 
+    /**
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
+
     /**
      * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -543,7 +735,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
 
     /**
@@ -555,9 +749,22 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
 
+    /**
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
      * 
@@ -588,7 +795,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param max max score
      * @param min min score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
@@ -599,9 +808,22 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
+    @Deprecated
     Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
 
+    /**
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -612,7 +834,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
@@ -625,9 +849,23 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
+    /**
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -636,7 +874,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
@@ -647,9 +887,21 @@ public interface RedisSortedSetCommands<K, V> {
      * @param min min score
      * @param max max score
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range)}
      */
+    @Deprecated
     Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @return Long count of elements in the specified range.
+     */
+    Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -660,7 +912,9 @@ public interface RedisSortedSetCommands<K, V> {
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min, long offset,
                                     long count);
 
@@ -674,10 +928,24 @@ Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, d
      * @param offset the offset
      * @param count the count
      * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit)}
      */
+    @Deprecated
     Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min, long offset,
                                     long count);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return Long count of elements in the specified range.
+     * @since 4.3
+     */
+    Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+
     /**
      * Determine the index of a member in a sorted set, with scores ordered from high to low.
      * 
@@ -800,9 +1068,21 @@ Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, S
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
      */
+    @Deprecated
     Long zlexcount(K key, String min, String max);
 
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    Long zlexcount(K key, Range<? extends V> range);
+
     /**
      * Remove all members in a sorted set between the given lexicographical range.
      * 
@@ -810,9 +1090,21 @@ Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, S
      * @param min min score
      * @param max max score
      * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     Long zremrangebylex(K key, String min, String max);
 
+    /**
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    Long zremrangebylex(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range.
      * 
@@ -820,9 +1112,21 @@ Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, S
      * @param min min score
      * @param max max score
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     List<V> zrangebylex(K key, String min, String max);
 
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<V> zrangebylex(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range.
      * 
@@ -832,6 +1136,19 @@ Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, S
      * @param offset the offset
      * @param count the count
      * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
+    @Deprecated
     List<V> zrangebylex(K key, String min, String max, long offset, long count);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<V> zrangebylex(K key, Range<? extends V> range, Limit limit);
 }
diff --git a/src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java b/src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java
index efc4e934f0..fdb6225951 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java
@@ -49,11 +49,9 @@ public class CompilationUnitFactory {
     ClassOrInterfaceDeclaration resultType;
 
     public CompilationUnitFactory(File templateFile, File sources, String targetPackage, String targetName,
-                                  Function<String, String> typeDocFunction,
-                                  Function<MethodDeclaration, Type> methodReturnTypeFunction,
-                                  Predicate<MethodDeclaration> methodFilter, Supplier<List<String>> importSupplier,
-                                  Consumer<ClassOrInterfaceDeclaration> typeMutator,
-                                  Function<Comment, Comment> methodCommentMutator) {
+            Function<String, String> typeDocFunction, Function<MethodDeclaration, Type> methodReturnTypeFunction,
+            Predicate<MethodDeclaration> methodFilter, Supplier<List<String>> importSupplier,
+            Consumer<ClassOrInterfaceDeclaration> typeMutator, Function<Comment, Comment> methodCommentMutator) {
 
         this.templateFile = templateFile;
         this.sources = sources;
@@ -132,9 +130,9 @@ public void visit(MethodDeclaration n, Object arg) {
 
             MethodDeclaration method = new MethodDeclaration(n.getModifiers(), methodReturnTypeFunction.apply(n), n.getName());
 
-            if(methodCommentMutator != null){
+            if (methodCommentMutator != null) {
                 method.setComment(methodCommentMutator.apply(n.getComment()));
-            }else {
+            } else {
                 method.setComment(n.getComment());
             }
 
@@ -150,9 +148,11 @@ public void visit(MethodDeclaration n, Object arg) {
                 method.getTypeParameters().addAll(n.getTypeParameters());
             }
 
-            ASTHelper.addMember(resultType, method);
+            if (n.getAnnotations() != null) {
+                method.setAnnotations(n.getAnnotations());
+            }
 
+            ASTHelper.addMember(resultType, method);
         }
     }
-
 }
diff --git a/src/test/java/com/lambdaworks/apigenerator/Constants.java b/src/test/java/com/lambdaworks/apigenerator/Constants.java
index 3f60c1dceb..8d61b69e43 100644
--- a/src/test/java/com/lambdaworks/apigenerator/Constants.java
+++ b/src/test/java/com/lambdaworks/apigenerator/Constants.java
@@ -7,8 +7,7 @@
  */
 class Constants {
 
-    public final static String[] TEMPLATE_NAMES = { "RedisHashCommands", "RedisHLLCommands", "RedisKeyCommands",
-            "RedisListCommands", "RedisScriptingCommands", "RedisServerCommands", "RedisSetCommands", "RedisSortedSetCommands",
+    public final static String[] TEMPLATE_NAMES = { "RedisSortedSetCommands",
             "RedisStringCommands", "RedisTransactionalCommands", "RedisSentinelCommands", "BaseRedisCommands",
             "RedisGeoCommands" };
 
diff --git a/src/test/java/com/lambdaworks/redis/LimitTest.java b/src/test/java/com/lambdaworks/redis/LimitTest.java
new file mode 100644
index 0000000000..a5e1595219
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/LimitTest.java
@@ -0,0 +1,31 @@
+package com.lambdaworks.redis;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+
+/**
+ * @author Mark Paluch
+ */
+public class LimitTest {
+
+    @Test
+    public void create() {
+
+        Limit limit = Limit.create(1, 2);
+
+        assertThat(limit.getOffset()).isEqualTo(1);
+        assertThat(limit.getCount()).isEqualTo(2);
+        assertThat(limit.isLimited()).isTrue();
+    }
+
+    @Test
+    public void unlimited() {
+
+        Limit limit = Limit.unlimited();
+
+        assertThat(limit.getOffset()).isEqualTo(-1);
+        assertThat(limit.getCount()).isEqualTo(-1);
+        assertThat(limit.isLimited()).isFalse();
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/RangeTest.java b/src/test/java/com/lambdaworks/redis/RangeTest.java
new file mode 100644
index 0000000000..d250338145
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/RangeTest.java
@@ -0,0 +1,92 @@
+package com.lambdaworks.redis;
+
+import static com.lambdaworks.redis.Range.Boundary.excluding;
+import static com.lambdaworks.redis.Range.Boundary.including;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+
+/**
+ * @author Mark Paluch
+ */
+public class RangeTest {
+
+    @Test
+    public void unbounded() {
+
+        Range<Object> unbounded = Range.unbounded();
+
+        assertThat(unbounded.getLower().isIncluding()).isTrue();
+        assertThat(unbounded.getLower().getValue()).isNull();
+        assertThat(unbounded.getUpper().isIncluding()).isTrue();
+        assertThat(unbounded.getUpper().getValue()).isNull();
+    }
+
+    @Test
+    public void createIncluded() {
+
+        Range<Object> range = Range.create("ze", "ro");
+
+        assertThat(range.getLower().isIncluding()).isTrue();
+        assertThat(range.getLower().getValue()).isEqualTo("ze");
+        assertThat(range.getUpper().isIncluding()).isTrue();
+        assertThat(range.getUpper().getValue()).isEqualTo("ro");
+    }
+
+    @Test
+    public void fromBoundaries() {
+
+        Range<Object> range = Range.from(including("ze"), excluding("ro"));
+
+        assertThat(range.getLower().isIncluding()).isTrue();
+        assertThat(range.getLower().getValue()).isEqualTo("ze");
+        assertThat(range.getUpper().isIncluding()).isFalse();
+        assertThat(range.getUpper().getValue()).isEqualTo("ro");
+    }
+
+    @Test
+    public void greater() {
+
+        Range<Object> gt = Range.unbounded().gt("zero");
+
+        assertThat(gt.getLower().isIncluding()).isFalse();
+        assertThat(gt.getLower().getValue()).isEqualTo("zero");
+        assertThat(gt.getUpper().isIncluding()).isTrue();
+        assertThat(gt.getUpper().getValue()).isNull();
+    }
+
+    @Test
+    public void greaterOrEquals() {
+
+        Range<Object> gte = Range.unbounded().gte("zero");
+
+        assertThat(gte.getLower().isIncluding()).isTrue();
+        assertThat(gte.getLower().getValue()).isEqualTo("zero");
+        assertThat(gte.getUpper().isIncluding()).isTrue();
+        assertThat(gte.getUpper().getValue()).isNull();
+    }
+
+    @Test
+    public void less() {
+
+        Range<Object> lt = Range.unbounded().lt("zero");
+
+        assertThat(lt.getLower().isIncluding()).isTrue();
+        assertThat(lt.getLower().getValue()).isNull();
+        assertThat(lt.getUpper().isIncluding()).isFalse();
+        assertThat(lt.getUpper().getValue()).isEqualTo("zero");
+        assertThat(lt.toString()).isEqualTo("Range [[unbounded] to (zero]");
+    }
+
+    @Test
+    public void lessOrEquals() {
+
+        Range<Object> lte = Range.unbounded().lte("zero");
+
+        assertThat(lte.getLower().isIncluding()).isTrue();
+        assertThat(lte.getLower().getValue()).isNull();
+        assertThat(lte.getUpper().isIncluding()).isTrue();
+        assertThat(lte.getUpper().getValue()).isEqualTo("zero");
+        assertThat(lte.toString()).isEqualTo("Range [[unbounded] to [zero]");
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
index e92e3c5a3c..da084f63a9 100644
--- a/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
@@ -1,8 +1,12 @@
 package com.lambdaworks.redis.commands;
 
+import static com.lambdaworks.redis.protocol.CommandType.ZRANGEBYLEX;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
 
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
 import org.junit.Test;
 
 import com.lambdaworks.redis.AbstractRedisClientTest;
@@ -11,6 +15,7 @@
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.codec.Utf8StringCodec;
 import com.lambdaworks.redis.output.StatusOutput;
+import com.lambdaworks.redis.output.ValueListOutput;
 import com.lambdaworks.redis.protocol.*;
 
 /**
diff --git a/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
index a8b872e667..da4d4f6068 100644
--- a/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
@@ -12,9 +12,9 @@
 import static org.assertj.core.data.Offset.offset;
 
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
+import com.lambdaworks.redis.Range.Boundary;
 import org.junit.Test;
 
 import com.lambdaworks.redis.*;
@@ -112,6 +112,13 @@ public void zcount() throws Exception {
 
         assertThat(redis.zcount(key, "(1.0", "3.0")).isEqualTo(2);
         assertThat(redis.zcount(key, "-inf", "+inf")).isEqualTo(3);
+
+        assertThat(redis.zcount(key, Range.create(1.0, 3.0))).isEqualTo(3);
+        assertThat(redis.zcount(key, Range.create(1.0, 2.0))).isEqualTo(2);
+        assertThat(redis.zcount(key, Range.create(NEGATIVE_INFINITY, POSITIVE_INFINITY))).isEqualTo(3);
+
+        assertThat(redis.zcount(key, Range.from(Boundary.excluding(1.0), Boundary.including(3.0)))).isEqualTo(2);
+        assertThat(redis.zcount(key, Range.unbounded())).isEqualTo(3);
     }
 
     @Test
@@ -142,7 +149,7 @@ public void zrange() throws Exception {
     public void zrangeStreaming() throws Exception {
         setup();
 
-        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
         Long count = redis.zrange(streamingAdapter, key, 0, -1);
         assertThat(count.longValue()).isEqualTo(3);
 
@@ -164,7 +171,7 @@ public void zrangeWithScores() throws Exception {
     @SuppressWarnings({ "unchecked" })
     public void zrangeWithScoresStreaming() throws Exception {
         setup();
-        ScoredValueStreamingAdapter<String> streamingAdapter = new ScoredValueStreamingAdapter<String>();
+        ScoredValueStreamingAdapter<String> streamingAdapter = new ScoredValueStreamingAdapter<>();
         Long count = redis.zrangeWithScores(streamingAdapter, key, 0, -1);
         assertThat(count.longValue()).isEqualTo(3);
         assertThat(streamingAdapter.getList()).isEqualTo(svlist(sv(1.0, "a"), sv(2.0, "b"), sv(3.0, "c")));
@@ -172,19 +179,27 @@ public void zrangeWithScoresStreaming() throws Exception {
 
     @Test
     public void zrangebyscore() throws Exception {
+
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
+
         assertThat(redis.zrangebyscore(key, 2.0, 3.0)).isEqualTo(list("b", "c"));
         assertThat(redis.zrangebyscore(key, "(1.0", "(4.0")).isEqualTo(list("b", "c"));
         assertThat(redis.zrangebyscore(key, NEGATIVE_INFINITY, POSITIVE_INFINITY)).isEqualTo(list("a", "b", "c", "d"));
         assertThat(redis.zrangebyscore(key, "-inf", "+inf")).isEqualTo(list("a", "b", "c", "d"));
         assertThat(redis.zrangebyscore(key, 0.0, 4.0, 1, 3)).isEqualTo(list("b", "c", "d"));
         assertThat(redis.zrangebyscore(key, "-inf", "+inf", 2, 2)).isEqualTo(list("c", "d"));
+
+        assertThat(redis.zrangebyscore(key, Range.create(2.0, 3.0))).isEqualTo(list("b", "c"));
+        assertThat(redis.zrangebyscore(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(list("b", "c"));
+        assertThat(redis.zrangebyscore(key, Range.unbounded())).isEqualTo(list("a", "b", "c", "d"));
+        assertThat(redis.zrangebyscore(key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(list("b", "c", "d"));
+        assertThat(redis.zrangebyscore(key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(list("c", "d"));
     }
 
     @Test
     public void zrangebyscoreStreaming() throws Exception {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
-        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
 
         assertThat(redis.zrangebyscore(streamingAdapter, key, 2.0, 3.0)).isEqualTo(2);
         assertThat(redis.zrangebyscore(streamingAdapter, key, "(1.0", "(4.0")).isEqualTo(2);
@@ -194,12 +209,19 @@ public void zrangebyscoreStreaming() throws Exception {
         assertThat(redis.zrangebyscore(streamingAdapter, key, 0.0, 4.0, 1, 3)).isEqualTo(3);
         assertThat(redis.zrangebyscore(streamingAdapter, key, "-inf", "+inf", 2, 2)).isEqualTo(2);
 
+        assertThat(redis.zrangebyscore(streamingAdapter, key, Range.create(2.0, 3.0))).isEqualTo(2);
+        assertThat(redis.zrangebyscore(streamingAdapter, key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(2);
+        assertThat(redis.zrangebyscore(streamingAdapter, key, Range.unbounded())).isEqualTo(4);
+        assertThat(redis.zrangebyscore(streamingAdapter, key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(3);
+        assertThat(redis.zrangebyscore(streamingAdapter, key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(2);
     }
 
     @Test
     @SuppressWarnings({ "unchecked" })
     public void zrangebyscoreWithScores() throws Exception {
+
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
+
         assertThat(redis.zrangebyscoreWithScores(key, 2.0, 3.0)).isEqualTo(svlist(sv(2.0, "b"), sv(3.0, "c")));
         assertThat(redis.zrangebyscoreWithScores(key, "(1.0", "(4.0")).isEqualTo(svlist(sv(2.0, "b"), sv(3.0, "c")));
         assertThat(redis.zrangebyscoreWithScores(key, NEGATIVE_INFINITY, POSITIVE_INFINITY)).isEqualTo(
@@ -209,12 +231,20 @@ public void zrangebyscoreWithScores() throws Exception {
         assertThat(redis.zrangebyscoreWithScores(key, 0.0, 4.0, 1, 3)).isEqualTo(
                 svlist(sv(2.0, "b"), sv(3.0, "c"), sv(4.0, "d")));
         assertThat(redis.zrangebyscoreWithScores(key, "-inf", "+inf", 2, 2)).isEqualTo(svlist(sv(3.0, "c"), sv(4.0, "d")));
+
+        assertThat(redis.zrangebyscoreWithScores(key, Range.create(2.0, 3.0))).isEqualTo(svlist(sv(2.0, "b"), sv(3.0, "c")));
+        assertThat(redis.zrangebyscoreWithScores(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(svlist(sv(2.0, "b"), sv(3.0, "c")));
+        assertThat(redis.zrangebyscoreWithScores(key, Range.unbounded())).isEqualTo(
+                svlist(sv(1.0, "a"), sv(2.0, "b"), sv(3.0, "c"), sv(4.0, "d")));
+        assertThat(redis.zrangebyscoreWithScores(key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(
+                svlist(sv(2.0, "b"), sv(3.0, "c"), sv(4.0, "d")));
+        assertThat(redis.zrangebyscoreWithScores(key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(svlist(sv(3.0, "c"), sv(4.0, "d")));
     }
 
     @Test
     public void zrangebyscoreWithScoresStreaming() throws Exception {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
-        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
 
         assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key, 2.0, 3.0).longValue()).isEqualTo(2);
         assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key, "(1.0", "(4.0").longValue()).isEqualTo(2);
@@ -225,6 +255,12 @@ public void zrangebyscoreWithScoresStreaming() throws Exception {
         assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key, 0.0, 4.0, 1, 3).longValue()).isEqualTo(3);
         assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key, "-inf", "+inf", 2, 2).longValue()).isEqualTo(2);
 
+        assertThat(redis.zrangebyscoreWithScores(streamingAdapter,key, Range.create(2.0, 3.0))).isEqualTo(2);
+        assertThat(redis.zrangebyscoreWithScores(streamingAdapter,key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(2);
+        assertThat(redis.zrangebyscoreWithScores(streamingAdapter,key, Range.unbounded())).isEqualTo(4);
+        assertThat(redis.zrangebyscoreWithScores(streamingAdapter,key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(3);
+        assertThat(redis.zrangebyscoreWithScores(streamingAdapter,key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(2);
+
     }
 
     @Test
@@ -247,13 +283,22 @@ public void zrem() throws Exception {
 
     @Test
     public void zremrangebyscore() throws Exception {
+
         setup();
         assertThat(redis.zremrangebyscore(key, 1.0, 2.0)).isEqualTo(2);
         assertThat(redis.zrange(key, 0, -1)).isEqualTo(list("c"));
 
+        setup();
+        assertThat(redis.zremrangebyscore(key, Range.create(1.0, 2.0))).isEqualTo(2);
+        assertThat(redis.zrange(key, 0, -1)).isEqualTo(list("c"));
+
         setup();
         assertThat(redis.zremrangebyscore(key, "(1.0", "(3.0")).isEqualTo(1);
         assertThat(redis.zrange(key, 0, -1)).isEqualTo(list("a", "c"));
+
+        setup();
+        assertThat(redis.zremrangebyscore(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(3.0)))).isEqualTo(1);
+        assertThat(redis.zrange(key, 0, -1)).isEqualTo(list("a", "c"));
     }
 
     @Test
@@ -283,7 +328,7 @@ public void zrevrangeWithScores() throws Exception {
     @Test
     public void zrevrangeStreaming() throws Exception {
         setup();
-        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
         Long count = redis.zrevrange(streamingAdapter, key, 0, -1);
         assertThat(count).isEqualTo(3);
         assertThat(streamingAdapter.getList()).isEqualTo(list("c", "b", "a"));
@@ -293,7 +338,7 @@ public void zrevrangeStreaming() throws Exception {
     @SuppressWarnings({ "unchecked" })
     public void zrevrangeWithScoresStreaming() throws Exception {
         setup();
-        ScoredValueStreamingAdapter<String> streamingAdapter = new ScoredValueStreamingAdapter<String>();
+        ScoredValueStreamingAdapter<String> streamingAdapter = new ScoredValueStreamingAdapter<>();
         Long count = redis.zrevrangeWithScores(streamingAdapter, key, 0, -1);
         assertThat(count).isEqualTo(3);
         assertThat(streamingAdapter.getList()).isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
@@ -301,19 +346,28 @@ public void zrevrangeWithScoresStreaming() throws Exception {
 
     @Test
     public void zrevrangebyscore() throws Exception {
+
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
+
         assertThat(redis.zrevrangebyscore(key, 3.0, 2.0)).isEqualTo(list("c", "b"));
         assertThat(redis.zrevrangebyscore(key, "(4.0", "(1.0")).isEqualTo(list("c", "b"));
         assertThat(redis.zrevrangebyscore(key, POSITIVE_INFINITY, NEGATIVE_INFINITY)).isEqualTo(list("d", "c", "b", "a"));
         assertThat(redis.zrevrangebyscore(key, "+inf", "-inf")).isEqualTo(list("d", "c", "b", "a"));
         assertThat(redis.zrevrangebyscore(key, 4.0, 0.0, 1, 3)).isEqualTo(list("c", "b", "a"));
         assertThat(redis.zrevrangebyscore(key, "+inf", "-inf", 2, 2)).isEqualTo(list("b", "a"));
+
+        assertThat(redis.zrevrangebyscore(key, Range.create(2.0, 3.0))).isEqualTo(list("c", "b"));
+        assertThat(redis.zrevrangebyscore(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(list("c", "b"));
+        assertThat(redis.zrevrangebyscore(key, Range.unbounded())).isEqualTo(list("d", "c", "b", "a"));
+        assertThat(redis.zrevrangebyscore(key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(list("c", "b", "a"));
+        assertThat(redis.zrevrangebyscore(key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(list("b", "a"));
     }
 
     @Test
     @SuppressWarnings({ "unchecked" })
     public void zrevrangebyscoreWithScores() throws Exception {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
+
         assertThat(redis.zrevrangebyscoreWithScores(key, 3.0, 2.0)).isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b")));
         assertThat(redis.zrevrangebyscoreWithScores(key, "(4.0", "(1.0")).isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b")));
         assertThat(redis.zrevrangebyscoreWithScores(key, POSITIVE_INFINITY, NEGATIVE_INFINITY)).isEqualTo(
@@ -323,12 +377,20 @@ public void zrevrangebyscoreWithScores() throws Exception {
         assertThat(redis.zrevrangebyscoreWithScores(key, 4.0, 0.0, 1, 3)).isEqualTo(
                 svlist(sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
         assertThat(redis.zrevrangebyscoreWithScores(key, "+inf", "-inf", 2, 2)).isEqualTo(svlist(sv(2.0, "b"), sv(1.0, "a")));
+
+        assertThat(redis.zrevrangebyscoreWithScores(key, Range.create(2.0, 3.0))).isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b")));
+        assertThat(redis.zrevrangebyscoreWithScores(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b")));
+        assertThat(redis.zrevrangebyscoreWithScores(key, Range.unbounded())).isEqualTo(
+                svlist(sv(4.0, "d"), sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
+        assertThat(redis.zrevrangebyscoreWithScores(key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(
+                svlist(sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
+        assertThat(redis.zrevrangebyscoreWithScores(key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(svlist(sv(2.0, "b"), sv(1.0, "a")));
     }
 
     @Test
     public void zrevrangebyscoreStreaming() throws Exception {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
-        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
 
         assertThat(redis.zrevrangebyscore(streamingAdapter, key, 3.0, 2.0).longValue()).isEqualTo(2);
         assertThat(redis.zrevrangebyscore(streamingAdapter, key, "(4.0", "(1.0").longValue()).isEqualTo(2);
@@ -337,6 +399,12 @@ public void zrevrangebyscoreStreaming() throws Exception {
         assertThat(redis.zrevrangebyscore(streamingAdapter, key, "+inf", "-inf").longValue()).isEqualTo(4);
         assertThat(redis.zrevrangebyscore(streamingAdapter, key, 4.0, 0.0, 1, 3).longValue()).isEqualTo(3);
         assertThat(redis.zrevrangebyscore(streamingAdapter, key, "+inf", "-inf", 2, 2).longValue()).isEqualTo(2);
+
+        assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.create(2.0, 3.0)).longValue()).isEqualTo(2);
+        assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0))).longValue()).isEqualTo(2);
+        assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.unbounded()).longValue()).isEqualTo(4);
+        assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.create(0.0, 4.0), Limit.create(1, 3)).longValue()).isEqualTo(3);
+        assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.unbounded(), Limit.create(2, 2)).longValue()).isEqualTo(2);
     }
 
     @Test
@@ -344,7 +412,7 @@ public void zrevrangebyscoreStreaming() throws Exception {
     public void zrevrangebyscoreWithScoresStreaming() throws Exception {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
 
-        ScoredValueStreamingAdapter<String> streamingAdapter = new ScoredValueStreamingAdapter<String>();
+        ScoredValueStreamingAdapter<String> streamingAdapter = new ScoredValueStreamingAdapter<>();
 
         assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, 3.0, 2.0)).isEqualTo(2);
         assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, "(4.0", "(1.0")).isEqualTo(2);
@@ -352,6 +420,12 @@ public void zrevrangebyscoreWithScoresStreaming() throws Exception {
         assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, "+inf", "-inf")).isEqualTo(4);
         assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, 4.0, 0.0, 1, 3)).isEqualTo(3);
         assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, "+inf", "-inf", 2, 2)).isEqualTo(2);
+
+        assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, Range.create(2.0, 3.0)).longValue()).isEqualTo(2);
+        assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0))).longValue()).isEqualTo(2);
+        assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, Range.unbounded()).longValue()).isEqualTo(4);
+        assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, Range.create(0.0, 4.0), Limit.create(1, 3)).longValue()).isEqualTo(3);
+        assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, Range.unbounded(), Limit.create(2, 2)).longValue()).isEqualTo(2);
     }
 
     @Test
@@ -454,7 +528,7 @@ public void zsscanWithCursorAndArgs() throws Exception {
     @Test
     public void zscanStreaming() throws Exception {
         redis.zadd(key, 1, value);
-        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
         StreamScanCursor cursor = redis.zscan(adapter, key);
 
@@ -467,7 +541,7 @@ public void zscanStreaming() throws Exception {
     @Test
     public void zscanStreamingWithCursor() throws Exception {
         redis.zadd(key, 1, value);
-        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
         StreamScanCursor cursor = redis.zscan(adapter, key, ScanCursor.INITIAL);
 
@@ -479,7 +553,7 @@ public void zscanStreamingWithCursor() throws Exception {
     @Test
     public void zscanStreamingWithCursorAndArgs() throws Exception {
         redis.zadd(key, 1, value);
-        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
         StreamScanCursor cursor = redis.zscan(adapter, key, ScanCursor.INITIAL, ScanArgs.Builder.matches("*").limit(100));
 
@@ -491,7 +565,7 @@ public void zscanStreamingWithCursorAndArgs() throws Exception {
     @Test
     public void zscanStreamingWithArgs() throws Exception {
         redis.zadd(key, 1, value);
-        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
         StreamScanCursor cursor = redis.zscan(adapter, key, ScanArgs.Builder.limit(100).match("*"));
 
@@ -533,33 +607,39 @@ public void zscanMatch() throws Exception {
 
     @Test
     public void zlexcount() throws Exception {
+
         setup100KeyValues(new HashSet<>());
-        Long result = redis.zlexcount(key, "-", "+");
 
-        assertThat(result.longValue()).isEqualTo(100);
+        assertThat(redis.zlexcount(key, "-", "+")).isEqualTo(100);
+        assertThat(redis.zlexcount(key, "[value", "[zzz")).isEqualTo(100);
 
-        Long resultFromTo = redis.zlexcount(key, "[value", "[zzz");
-        assertThat(resultFromTo.longValue()).isEqualTo(100);
+        assertThat(redis.zlexcount(key, Range.unbounded())).isEqualTo(100);
+        assertThat(redis.zlexcount(key, Range.create("value", "zzz"))).isEqualTo(100);
+        assertThat(redis.zlexcount(key, Range.from(Boundary.including("value99"), Boundary.unbounded()))).isEqualTo(1);
+        assertThat(redis.zlexcount(key, Range.from(Boundary.excluding("value99"), Boundary.unbounded()))).isEqualTo(0);
     }
 
     @Test
     public void zrangebylex() throws Exception {
         setup100KeyValues(new HashSet<>());
-        List<String> result = redis.zrangebylex(key, "-", "+");
 
-        assertThat(result).hasSize(100);
+        assertThat(redis.zrangebylex(key, "-", "+")).hasSize(100);
+        assertThat(redis.zrangebylex(key, "-", "+", 10, 10)).hasSize(10);
 
-        List<String> result2 = redis.zrangebylex(key, "-", "+", 10, 10);
-
-        assertThat(result2).hasSize(10);
+        assertThat(redis.zrangebylex(key, Range.unbounded())).hasSize(100);
+        assertThat(redis.zrangebylex(key, Range.create("value", "zzz"))).hasSize(100);
+        assertThat(redis.zrangebylex(key, Range.from(Boundary.including("value99"), Boundary.unbounded()))).hasSize(1);
+        assertThat(redis.zrangebylex(key, Range.from(Boundary.excluding("value99"), Boundary.unbounded()))).hasSize(0);
     }
 
     @Test
     public void zremrangebylex() throws Exception {
+
         setup100KeyValues(new HashSet<>());
-        Long result = redis.zremrangebylex(key, "(aaa", "[zzz");
+        assertThat(redis.zremrangebylex(key, "(aaa", "[zzz")).isEqualTo(100);
 
-        assertThat(result.longValue()).isEqualTo(100);
+        setup100KeyValues(new HashSet<>());
+        assertThat(redis.zremrangebylex(key, Range.create("value", "zzz"))).isEqualTo(100);
 
     }
 
@@ -569,6 +649,5 @@ protected void setup100KeyValues(Set<String> expect) {
             redis.zadd(key, i, value + i);
             expect.add(value + i);
         }
-
     }
 }

From 8420915a87edfa7674cc39a1497a3a7d1d3f524f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 22 Sep 2016 21:34:59 +0200
Subject: [PATCH 030/808] Use Limit in SortArgs #364

---
 .../java/com/lambdaworks/redis/SortArgs.java  | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/SortArgs.java b/src/main/java/com/lambdaworks/redis/SortArgs.java
index 87b6a08942..1545c51268 100644
--- a/src/main/java/com/lambdaworks/redis/SortArgs.java
+++ b/src/main/java/com/lambdaworks/redis/SortArgs.java
@@ -8,6 +8,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.protocol.CommandArgs;
 import com.lambdaworks.redis.protocol.CommandKeyword;
 
@@ -20,7 +21,7 @@
 public class SortArgs {
 
     private String by;
-    private Long offset, count;
+    private Limit limit = Limit.unlimited();
     private List<String> get;
     private CommandKeyword order;
     private boolean alpha;
@@ -67,8 +68,14 @@ public SortArgs by(String pattern) {
     }
 
     public SortArgs limit(long offset, long count) {
-        this.offset = offset;
-        this.count = count;
+        return limit(Limit.create(offset, count));
+    }
+
+    public SortArgs limit(Limit limit) {
+
+        LettuceAssert.notNull(limit, "Limit must not be null");
+
+        this.limit = limit;
         return this;
     }
 
@@ -109,10 +116,10 @@ <K, V> void build(CommandArgs<K, V> args, K store) {
             }
         }
 
-        if (offset != null) {
+        if (limit != null && limit.isLimited()) {
             args.add(LIMIT);
-            args.add(offset);
-            args.add(count);
+            args.add(limit.getOffset());
+            args.add(limit.getCount());
         }
 
         if (order != null) {

From 7676035300bffe25c84938952e85be1e6dbce47a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 22 Sep 2016 22:30:13 +0200
Subject: [PATCH 031/808] Fix RedisClusterSetupTest.

Prevent usage of orphaned node when splitting the cluster.
---
 .../redis/cluster/RedisClusterSetupTest.java           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
index f9866abfe1..92fd365343 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
@@ -13,18 +13,18 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.api.sync.RedisCommands;
 import org.junit.*;
 
 import com.google.code.tempusfugit.temporal.Condition;
 import com.google.code.tempusfugit.temporal.WaitFor;
 import com.lambdaworks.ConnectionTestUtil;
 import com.lambdaworks.Futures;
+import com.lambdaworks.TestClientResources;
 import com.lambdaworks.Wait;
 import com.lambdaworks.category.SlowTests;
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
+import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
 import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
@@ -47,7 +47,7 @@ public class RedisClusterSetupTest extends AbstractTest {
     private static final String host = TestSettings.hostAddr();
 
     private static final ClusterTopologyRefreshOptions PERIODIC_REFRESH_ENABLED = ClusterTopologyRefreshOptions.builder()
-            .enablePeriodicRefresh(1, TimeUnit.SECONDS).build();
+            .enablePeriodicRefresh(1, TimeUnit.SECONDS).dynamicRefreshSources(false).build();
 
     private static RedisClusterClient clusterClient;
     private static RedisClient client = DefaultRedisClient.get();
@@ -60,8 +60,8 @@ public class RedisClusterSetupTest extends AbstractTest {
 
     @BeforeClass
     public static void setupClient() {
-        clusterClient = RedisClusterClient.create(
-                TestClientResources.get(), RedisURI.Builder.redis(host, AbstractClusterTest.port5).build());
+        clusterClient = RedisClusterClient.create(TestClientResources.get(),
+                RedisURI.Builder.redis(host, AbstractClusterTest.port5).build());
     }
 
     @AfterClass

From 61fa45be1266c562f2d8ad8f7c5f5e9c837b0922 Mon Sep 17 00:00:00 2001
From: Aaron Miller <aaron.miller@dealer.com>
Date: Thu, 22 Sep 2016 10:50:44 -0400
Subject: [PATCH 032/808] Add EVAL and EVALSHA to ReadOnlyCommands #366

---
 .../java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java    | 2 +-
 .../com/lambdaworks/redis/masterslave/ReadOnlyCommands.java     | 2 +-
 .../com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java b/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
index 95088c4c89..b11515a47a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
@@ -27,7 +27,7 @@ class ReadOnlyCommands {
     }
 
     enum CommandName {
-        ASKING, BITCOUNT, BITPOS, CLIENT, COMMAND, DUMP, ECHO, EXISTS, //
+        ASKING, BITCOUNT, BITPOS, CLIENT, COMMAND, DUMP, ECHO, EVAL, EVALSHA, EXISTS, //
         GEODIST, GEOPOS, GEORADIUS, GEORADIUSBYMEMBER, GEOHASH, GET, GETBIT, //
         GETRANGE, HEXISTS, HGET, HGETALL, HKEYS, HLEN, HMGET, HSCAN, HSTRLEN, //
         HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, MULTI, PFCOUNT, PTTL, //
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java b/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
index ee67adb9ad..791660ea90 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
@@ -27,7 +27,7 @@ class ReadOnlyCommands {
     }
 
     enum CommandName {
-        ASKING, BITCOUNT, BITPOS, CLIENT, COMMAND, DUMP, ECHO, EXISTS,
+        ASKING, BITCOUNT, BITPOS, CLIENT, COMMAND, DUMP, ECHO, EVAL, EVALSHA, EXISTS,
         /**/GEODIST, GEOPOS, GEORADIUS, GEORADIUSBYMEMBER, GEOHASH, GET, GETBIT,
         /**/GETRANGE, HEXISTS, HGET, HGETALL, HKEYS, HLEN, HMGET, HSCAN, HSTRLEN,
         /**/HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, MULTI, PFCOUNT, PTTL,
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java b/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
index 447074e19d..bd9f16c5db 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
@@ -13,7 +13,7 @@ public class ReadOnlyCommandsTest {
 
     @Test
     public void testCount() throws Exception {
-        assertThat(ReadOnlyCommands.READ_ONLY_COMMANDS).hasSize(69);
+        assertThat(ReadOnlyCommands.READ_ONLY_COMMANDS).hasSize(71);
     }
 
     @Test

From 63947c9d7559cd7de3ffb04b535b8e2f31362544 Mon Sep 17 00:00:00 2001
From: Jongyeol Choi <jongyeol.choi@linecorp.com>
Date: Fri, 23 Sep 2016 12:46:23 +0900
Subject: [PATCH 033/808] Add jitter backoff strategies for spreading
 reconnection timing #365

When users use exponential backoff streategy and connection pool with more than thousands of application servers, sometimes connection bursting hits Redis servers.
This issue is because of same timings when Redis is slow/drops connections or due to network partitions.
This change will addresses the problem using well known jitter backoff strategies.

Equal Jitter

    sleep = random_between(0, min(cap, base * 2 ** attempt))

Full Jitter

    temp = min(cap, base * 2 ** attempt)
    sleep = temp / 2 + random_between(0, temp / 2)

Decorrelated Jitter

    sleep = min(cap, random_between(base, sleep * 3))

Rerenrence: https://www.awsarchitectureblog.com/2015/03/backoff.html
---
 .../redis/protocol/ConnectionWatchdog.java    |   9 ++
 .../resource/DecorrelatedJitterDelay.java     |  44 ++++++
 .../resource/DefaultClientResources.java      |  26 +++-
 .../com/lambdaworks/redis/resource/Delay.java | 126 +++++++++++++++++-
 .../redis/resource/EqualJitterDelay.java      |  29 ++++
 .../redis/resource/ExponentialDelay.java      |  33 ++---
 .../redis/resource/FullJitterDelay.java       |  31 +++++
 .../resource/DecorrelatedJitterDelayTest.java |  59 ++++++++
 .../redis/resource/EqualJitterDelayTest.java  |  63 +++++++++
 .../redis/resource/FullJitterDelayTest.java   |  63 +++++++++
 10 files changed, 452 insertions(+), 31 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java
 create mode 100644 src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java
 create mode 100644 src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java
 create mode 100644 src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java

diff --git a/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java b/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
index 59d96e0497..b9112254c0 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
@@ -10,6 +10,7 @@
 import com.lambdaworks.redis.ConnectionEvents;
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.resource.Delay;
+import com.lambdaworks.redis.resource.Delay.StatefulDelay;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.*;
@@ -77,6 +78,7 @@ public ConnectionWatchdog(Delay reconnectDelay, ClientOptions clientOptions, Boo
         LettuceAssert.notNull(connectionFacade, "ConnectionFacade must not be null");
 
         this.reconnectDelay = reconnectDelay;
+        resetReconnectDelay();
         this.bootstrap = bootstrap;
         this.timer = timer;
         this.reconnectWorkers = reconnectWorkers;
@@ -103,6 +105,12 @@ public SocketAddress get() {
                 connectionFacade);
     }
 
+    private void resetReconnectDelay() {
+        if (reconnectDelay instanceof StatefulDelay) {
+            ((StatefulDelay) reconnectDelay).reset();
+        }
+    }
+
     @Override
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
 
@@ -129,6 +137,7 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
         channel = ctx.channel();
         reconnectScheduleTimeout = null;
         remoteAddress = channel.remoteAddress();
+        resetReconnectDelay();
         logPrefix = null;
         logger.debug("{} channelActive()", logPrefix());
 
diff --git a/src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java b/src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java
new file mode 100644
index 0000000000..eba55a82b9
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java
@@ -0,0 +1,44 @@
+package com.lambdaworks.redis.resource;
+
+import java.util.concurrent.TimeUnit;
+
+import com.lambdaworks.redis.resource.Delay.StatefulDelay;
+
+/**
+ * Delay that increases using decorrelated jitter strategy.
+ *
+ * <p>
+ * Considering retry attempts start at 1, attempt 0 would be the initial call and will always yield 0 (or the lower).
+ * Then, each retry step will by default yield <code>min(cap, randomBetween(base, prevDelay * 3))</code>.
+ *
+ * This strategy is based on <a href="https://www.awsarchitectureblog.com/2015/03/backoff.html">Exponential Backoff And Jitter</a>.
+ * </p>
+ */
+class DecorrelatedJitterDelay extends Delay implements StatefulDelay {
+
+    private final long lower;
+    private final long upper;
+    private final long base;
+    private long prevDelay;
+
+    DecorrelatedJitterDelay(long lower, long upper, long base, TimeUnit unit) {
+        super(unit);
+        this.lower = lower;
+        this.upper = upper;
+        this.base = base;
+        reset();
+    }
+
+    @Override
+    public long createDelay(long attempt) {
+        long value = randomBetween(base, Math.max(base, prevDelay * 3));
+        long delay = applyBounds(value, lower, upper);
+        prevDelay = delay;
+        return delay;
+    }
+
+    @Override
+    public void reset() {
+        prevDelay = 0L;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
index cd193c49f4..56184472a3 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
@@ -3,6 +3,7 @@
 import static com.lambdaworks.redis.resource.Futures.toBooleanPromise;
 
 import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 
 import com.lambdaworks.redis.event.DefaultEventBus;
 import com.lambdaworks.redis.event.DefaultEventPublisherOptions;
@@ -16,6 +17,7 @@
 import com.lambdaworks.redis.metrics.CommandLatencyCollectorOptions;
 import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollector;
 import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollectorOptions;
+import com.lambdaworks.redis.resource.Delay.StatefulDelay;
 
 import io.netty.util.concurrent.*;
 import io.netty.util.internal.SystemPropertyUtil;
@@ -55,7 +57,7 @@ public class DefaultClientResources implements ClientResources {
     public static final int DEFAULT_IO_THREADS;
     public static final int DEFAULT_COMPUTATION_THREADS;
 
-    public static final Delay DEFAULT_RECONNECT_DELAY = Delay.exponential();
+    public static final Supplier<Delay> DEFAULT_RECONNECT_DELAY = () -> Delay.exponential();
 
     static {
         int threads = Math.max(1, SystemPropertyUtil.getInt("io.netty.eventLoopThreads",
@@ -78,7 +80,7 @@ public class DefaultClientResources implements ClientResources {
     private final EventPublisherOptions commandLatencyPublisherOptions;
     private final MetricEventPublisher metricEventPublisher;
     private final DnsResolver dnsResolver;
-    private final Delay reconnectDelay;
+    private final Supplier<Delay> reconnectDelay;
 
     private volatile boolean shutdownCalled = false;
 
@@ -194,7 +196,7 @@ public static class Builder {
         private CommandLatencyCollector commandLatencyCollector;
         private EventPublisherOptions commandLatencyPublisherOptions = DefaultEventPublisherOptions.create();
         private DnsResolver dnsResolver = DnsResolvers.JVM_DEFAULT;
-        private Delay reconnectDelay = DEFAULT_RECONNECT_DELAY;
+        private Supplier<Delay> reconnectDelay = DEFAULT_RECONNECT_DELAY;
 
         private Builder() {
         }
@@ -313,13 +315,27 @@ public Builder dnsResolver(DnsResolver dnsResolver) {
         }
 
         /**
-         * Sets the reconnect {@link Delay} to delay reconnect attempts. Defaults to binary exponential delay capped at
+         * Sets the stateless reconnect {@link Delay} to delay reconnect attempts. Defaults to binary exponential delay capped at
          * {@literal 30 SECONDS}.
          *
          * @param reconnectDelay the reconnect delay, must not be {@literal null}.
          * @return this
          */
         public Builder reconnectDelay(Delay reconnectDelay) {
+            if (reconnectDelay instanceof StatefulDelay) {
+                throw new IllegalArgumentException("Delay must be a stateless instance.");
+            }
+            return reconnectDelay(() -> reconnectDelay);
+        }
+
+        /**
+         * Sets the stateful reconnect {@link Supplier<Delay>} to delay reconnect attempts. Defaults to binary exponential delay capped at
+         * {@literal 30 SECONDS}.
+         *
+         * @param reconnectDelay the reconnect delay, must not be {@literal null}.
+         * @return this
+         */
+        public Builder reconnectDelay(Supplier<Delay> reconnectDelay) {
 
             LettuceAssert.notNull(reconnectDelay, "Delay must not be null");
 
@@ -455,6 +471,6 @@ public DnsResolver dnsResolver() {
 
     @Override
     public Delay reconnectDelay() {
-        return reconnectDelay;
+        return reconnectDelay.get();
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/resource/Delay.java b/src/main/java/com/lambdaworks/redis/resource/Delay.java
index 61627931de..bf93d707f0 100644
--- a/src/main/java/com/lambdaworks/redis/resource/Delay.java
+++ b/src/main/java/com/lambdaworks/redis/resource/Delay.java
@@ -1,6 +1,8 @@
 package com.lambdaworks.redis.resource;
 
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 
 import com.lambdaworks.redis.internal.LettuceAssert;
 
@@ -13,6 +15,24 @@
  */
 public abstract class Delay {
 
+    private static long DEFAULT_LOWER_BOUND = 0;
+    private static long DEFAULT_UPPER_BOUND = TimeUnit.SECONDS.toMillis(30);
+    private static int DEFAULT_POWER_OF = 2;
+    private static TimeUnit DEFAULT_TIMEUNIT = TimeUnit.MILLISECONDS;
+
+    /**
+     * Additional interface for stateful {@link Delay}.
+     */
+    public interface StatefulDelay {
+
+        /**
+         * Reset this delay.
+         *
+         * This method is to be implemented by the implementations.
+         */
+        void reset();
+    }
+
     /**
      * The time unit of the delay.
      */
@@ -23,7 +43,7 @@ public abstract class Delay {
      *
      * @param timeUnit the time unit.
      */
-    Delay(TimeUnit timeUnit) {
+    protected Delay(TimeUnit timeUnit) {
 
         LettuceAssert.notNull(timeUnit, "TimeUnit must not be null");
 
@@ -55,7 +75,7 @@ public TimeUnit getTimeUnit() {
      *
      * @param delay the delay, must be greater or equal to 0
      * @param timeUnit the unit of the delay.
-     * @return a created {@link ExponentialDelay}.
+     * @return a created {@link ConstantDelay}.
      */
     public static Delay constant(int delay, TimeUnit timeUnit) {
 
@@ -71,7 +91,7 @@ public static Delay constant(int delay, TimeUnit timeUnit) {
      * @return a created {@link ExponentialDelay}.
      */
     public static Delay exponential() {
-        return exponential(0, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS, 2);
+        return exponential(DEFAULT_LOWER_BOUND, DEFAULT_UPPER_BOUND, DEFAULT_TIMEUNIT, DEFAULT_POWER_OF);
     }
 
     /**
@@ -93,4 +113,104 @@ public static Delay exponential(long lower, long upper, TimeUnit unit, int power
 
         return new ExponentialDelay(lower, upper, unit, powersOf);
     }
+
+    /**
+     * Creates a new {@link EqualJitterDelay} with default boundaries.
+     *
+     * @return a created {@link EqualJitterDelay}.
+     */
+    public static Delay equalJitter() {
+        return equalJitter(DEFAULT_LOWER_BOUND, DEFAULT_UPPER_BOUND, 1L, DEFAULT_TIMEUNIT);
+    }
+
+    /**
+     * Creates a new {@link EqualJitterDelay}.
+     *
+     * @param lower the lower boundary, must be non-negative
+     * @param upper the upper boundary, must be greater than the lower boundary
+     * @param base the base, must be greater or equal to 1
+     * @param unit the unit of the delay.
+     * @return a created {@link EqualJitterDelay}.
+     */
+    public static Delay equalJitter(long lower, long upper, long base, TimeUnit unit) {
+
+        LettuceAssert.isTrue(lower >= 0, "Lower boundary must be greater or equal to 0");
+        LettuceAssert.isTrue(upper > lower, "Upper boundary must be greater than the lower boundary");
+        LettuceAssert.isTrue(base >= 1, "Base must be greater or equal to 1");
+
+        return new EqualJitterDelay(lower, upper, base, unit);
+    }
+
+    /**
+     * Creates a new {@link FullJitterDelay} with default boundaries.
+     *
+     * @return a created {@link FullJitterDelay}.
+     */
+    public static Delay fullJitter() {
+        return fullJitter(DEFAULT_LOWER_BOUND, DEFAULT_UPPER_BOUND, 1L, DEFAULT_TIMEUNIT);
+    }
+
+    /**
+     * Creates a new {@link FullJitterDelay}.
+     *
+     * @param lower the lower boundary, must be non-negative
+     * @param upper the upper boundary, must be greater than the lower boundary
+     * @param base the base, must be greater or equal to 1
+     * @param unit the unit of the delay.
+     * @return a created {@link FullJitterDelay}.
+     */
+    public static Delay fullJitter(long lower, long upper, long base, TimeUnit unit) {
+
+        LettuceAssert.isTrue(lower >= 0, "Lower boundary must be greater or equal to 0");
+        LettuceAssert.isTrue(upper > lower, "Upper boundary must be greater than the lower boundary");
+        LettuceAssert.isTrue(base >= 1, "Base must be greater or equal to 1");
+
+        return new FullJitterDelay(lower, upper, base, unit);
+    }
+
+    /**
+     * Creates a new {@link DecorrelatedJitterDelay} supplier with default boundaries.
+     *
+     * @return a created {@link Supplier<DecorrelatedJitterDelay>}.
+     */
+    public static Supplier<Delay> decorrelatedJitter() {
+        return decorrelatedJitter(DEFAULT_LOWER_BOUND, DEFAULT_UPPER_BOUND, 0L, DEFAULT_TIMEUNIT);
+    }
+
+    /**
+     * Creates a new {@link DecorrelatedJitterDelay} supplier.
+     *
+     * @param lower the lower boundary, must be non-negative
+     * @param upper the upper boundary, must be greater than the lower boundary
+     * @param base the base, must be greater or equal to 0
+     * @param unit the unit of the delay.
+     * @return a created {@link Supplier<DecorrelatedJitterDelay>}.
+     */
+    public static Supplier<Delay> decorrelatedJitter(long lower, long upper, long base, TimeUnit unit) {
+
+        LettuceAssert.isTrue(lower >= 0, "Lower boundary must be greater or equal to 0");
+        LettuceAssert.isTrue(upper > lower, "Upper boundary must be greater than the lower boundary");
+        LettuceAssert.isTrue(base >= 0, "Base must be greater or equal to 0");
+
+        // It'll create new Delay everytime because it has state.
+        return () -> new DecorrelatedJitterDelay(lower, upper, base, unit);
+    }
+
+    protected static long randomBetween(long min, long max) {
+        if (min == max) {
+            return min;
+        }
+        return ThreadLocalRandom.current().nextLong(min, max);
+    }
+
+    protected static long applyBounds(long calculatedValue, long lower, long upper) {
+
+        if (calculatedValue < lower) {
+            return lower;
+        }
+        if (calculatedValue > upper) {
+            return upper;
+        }
+        return calculatedValue;
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java b/src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java
new file mode 100644
index 0000000000..c9067d3bf9
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java
@@ -0,0 +1,29 @@
+package com.lambdaworks.redis.resource;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Delay that increases using equal jitter strategy.
+ *
+ * <p>
+ * Considering retry attempts start at 1, attempt 0 would be the initial call and will always yield 0 (or the lower).
+ * Then, each retry step will by default yield <code>randomBetween(0, base * 2 ^ (attempt - 1))</code>.
+ *
+ * This strategy is based on <a href="https://www.awsarchitectureblog.com/2015/03/backoff.html">Exponential Backoff And Jitter</a>.
+ * </p>
+ */
+class EqualJitterDelay extends ExponentialDelay {
+
+    private final long base;
+
+    EqualJitterDelay(long lower, long upper, long base, TimeUnit unit) {
+        super(lower, upper, unit, 2);
+        this.base = base;
+    }
+
+    @Override
+    public long createDelay(long attempt) {
+        long value = randomBetween(0, base * calculatePowerOfTwo(attempt));
+        return applyBounds(value, lower, upper);
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java b/src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java
index 5485a06929..e47d8691c1 100644
--- a/src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java
+++ b/src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java
@@ -19,8 +19,8 @@
  */
 class ExponentialDelay extends Delay {
 
-    private final long lower;
-    private final long upper;
+    protected final long lower;
+    protected final long upper;
     private final int powersOf;
 
     ExponentialDelay(long lower, long upper, TimeUnit unit, int powersOf) {
@@ -43,37 +43,24 @@ public long createDelay(long attempt) {
             delay = calculateAlternatePower(attempt);
         }
 
-        return applyBounds(delay);
+        return applyBounds(delay, lower, upper);
     }
 
     private long calculateAlternatePower(long attempt) {
 
         // round will cap at Long.MAX_VALUE and pow should prevent overflows
-        double step = Math.pow(this.powersOf, attempt - 1); // attempt > 0
+        double step = Math.pow(powersOf, attempt - 1); // attempt > 0
         return Math.round(step);
     }
 
     // fastpath with bitwise operator
-    private long calculatePowerOfTwo(long attempt) {
-
-        long step;
-        if (attempt >= 64) { // safeguard against overflow in the bitshift operation
-            step = Long.MAX_VALUE;
+    protected static long calculatePowerOfTwo(long attempt) {
+        if (attempt <= 0) { // safeguard against underflow
+            return 0L;
+        } else if (attempt >= 64) { // safeguard against overflow in the bitshift operation
+            return Long.MAX_VALUE;
         } else {
-            step = (1L << (attempt - 1));
-        }
-        // round will cap at Long.MAX_VALUE
-        return Math.round(step);
-    }
-
-    private long applyBounds(long calculatedValue) {
-
-        if (calculatedValue < lower) {
-            return lower;
-        }
-        if (calculatedValue > upper) {
-            return upper;
+            return 1L << (attempt - 1);
         }
-        return calculatedValue;
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java b/src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java
new file mode 100644
index 0000000000..2dab7128c7
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java
@@ -0,0 +1,31 @@
+package com.lambdaworks.redis.resource;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Delay that increases using full jitter strategy.
+ *
+ * <p>
+ * Considering retry attempts start at 1, attempt 0 would be the initial call and will always yield 0 (or the lower).
+ * Then, each retry step will by default yield <code>temp / 2 + random_between(0, temp / 2)</code> and temp
+ * is <code>temp = min(upper, base * 2 ** attempt)</code>.
+ *
+ * This strategy is based on <a href="https://www.awsarchitectureblog.com/2015/03/backoff.html">Exponential Backoff And Jitter</a>.
+ * </p>
+ */
+class FullJitterDelay extends ExponentialDelay {
+
+    private final long base;
+
+    FullJitterDelay(long lower, long upper, long base, TimeUnit unit) {
+        super(lower, upper, unit, 2);
+        this.base = base;
+    }
+
+    @Override
+    public long createDelay(long attempt) {
+        long temp = Math.min(upper, base * calculatePowerOfTwo(attempt));
+        long delay = temp / 2 + randomBetween(0, temp / 2);
+        return applyBounds(delay, lower, upper);
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java b/src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java
new file mode 100644
index 0000000000..2075022e3e
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java
@@ -0,0 +1,59 @@
+package com.lambdaworks.redis.resource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+public class DecorrelatedJitterDelayTest {
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldNotCreateIfLowerBoundIsNegative() throws Exception {
+        Delay.decorrelatedJitter(-1, 100, 0, TimeUnit.MILLISECONDS);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldNotCreateIfLowerBoundIsSameAsUpperBound() throws Exception {
+        Delay.decorrelatedJitter(100, 100, 1, TimeUnit.MILLISECONDS);
+    }
+
+    @Test
+    public void negativeAttemptShouldReturnZero() throws Exception {
+
+        Delay delay = Delay.decorrelatedJitter().get();
+
+        assertThat(delay.createDelay(-1)).isEqualTo(0);
+    }
+
+    @Test
+    public void zeroShouldReturnZero() throws Exception {
+
+        Delay delay = Delay.decorrelatedJitter().get();
+
+        assertThat(delay.createDelay(0)).isEqualTo(0);
+    }
+
+    @Test
+    public void testDefaultDelays() throws Exception {
+
+        Delay delay = Delay.decorrelatedJitter().get();
+
+        assertThat(delay.getTimeUnit()).isEqualTo(TimeUnit.MILLISECONDS);
+
+        for (int i = 0; i < 1000; i++) {
+            assertThat(delay.createDelay(1)).isBetween(0L, 1L);
+            assertThat(delay.createDelay(2)).isBetween(0L, 3L);
+            assertThat(delay.createDelay(3)).isBetween(0L, 9L);
+            assertThat(delay.createDelay(4)).isBetween(0L, 27L);
+            assertThat(delay.createDelay(5)).isBetween(0L, 81L);
+            assertThat(delay.createDelay(6)).isBetween(0L, 243L);
+            assertThat(delay.createDelay(7)).isBetween(0L, 729L);
+            assertThat(delay.createDelay(8)).isBetween(0L, 2187L);
+            assertThat(delay.createDelay(9)).isBetween(0L, 6561L);
+            assertThat(delay.createDelay(10)).isBetween(0L, 19683L);
+            assertThat(delay.createDelay(11)).isBetween(0L, 30000L);
+            assertThat(delay.createDelay(Integer.MAX_VALUE)).isBetween(0L, 30000L);
+        }
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java b/src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java
new file mode 100644
index 0000000000..f3660d3043
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java
@@ -0,0 +1,63 @@
+package com.lambdaworks.redis.resource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+public class EqualJitterDelayTest {
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldNotCreateIfLowerBoundIsNegative() throws Exception {
+        Delay.equalJitter(-1, 100, 1, TimeUnit.MILLISECONDS);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldNotCreateIfLowerBoundIsSameAsUpperBound() throws Exception {
+        Delay.equalJitter(100, 100, 1, TimeUnit.MILLISECONDS);
+    }
+
+    @Test
+    public void negativeAttemptShouldReturnZero() throws Exception {
+
+        Delay delay = Delay.equalJitter();
+
+        assertThat(delay.createDelay(-1)).isEqualTo(0);
+    }
+
+    @Test
+    public void zeroShouldReturnZero() throws Exception {
+
+        Delay delay = Delay.equalJitter();
+
+        assertThat(delay.createDelay(0)).isEqualTo(0);
+    }
+
+    @Test
+    public void testDefaultDelays() throws Exception {
+
+        Delay delay = Delay.equalJitter();
+
+        assertThat(delay.getTimeUnit()).isEqualTo(TimeUnit.MILLISECONDS);
+
+        assertThat(delay.createDelay(1)).isBetween(0L, 1L);
+        assertThat(delay.createDelay(2)).isBetween(0L, 2L);
+        assertThat(delay.createDelay(3)).isBetween(0L, 4L);
+        assertThat(delay.createDelay(4)).isBetween(0L, 8L);
+        assertThat(delay.createDelay(5)).isBetween(0L, 16L);
+        assertThat(delay.createDelay(6)).isBetween(0L, 32L);
+        assertThat(delay.createDelay(7)).isBetween(0L, 64L);
+        assertThat(delay.createDelay(8)).isBetween(0L, 128L);
+        assertThat(delay.createDelay(9)).isBetween(0L, 256L);
+        assertThat(delay.createDelay(10)).isBetween(0L, 512L);
+        assertThat(delay.createDelay(11)).isBetween(0L, 1024L);
+        assertThat(delay.createDelay(12)).isBetween(0L, 2048L);
+        assertThat(delay.createDelay(13)).isBetween(0L, 4096L);
+        assertThat(delay.createDelay(14)).isBetween(0L, 8192L);
+        assertThat(delay.createDelay(15)).isBetween(0L, 16384L);
+        assertThat(delay.createDelay(16)).isBetween(0L, 30000L);
+        assertThat(delay.createDelay(17)).isBetween(0L, 30000L);
+        assertThat(delay.createDelay(Integer.MAX_VALUE)).isBetween(0L, 30000L);
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java b/src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java
new file mode 100644
index 0000000000..8d1542db46
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java
@@ -0,0 +1,63 @@
+package com.lambdaworks.redis.resource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+public class FullJitterDelayTest {
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldNotCreateIfLowerBoundIsNegative() throws Exception {
+        Delay.fullJitter(-1, 100, 1, TimeUnit.MILLISECONDS);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldNotCreateIfLowerBoundIsSameAsUpperBound() throws Exception {
+        Delay.fullJitter(100, 100, 1, TimeUnit.MILLISECONDS);
+    }
+
+    @Test
+    public void negativeAttemptShouldReturnZero() throws Exception {
+
+        Delay delay = Delay.fullJitter();
+
+        assertThat(delay.createDelay(-1)).isEqualTo(0);
+    }
+
+    @Test
+    public void zeroShouldReturnZero() throws Exception {
+
+        Delay delay = Delay.fullJitter();
+
+        assertThat(delay.createDelay(0)).isEqualTo(0);
+    }
+
+    @Test
+    public void testDefaultDelays() throws Exception {
+
+        Delay delay = Delay.fullJitter();
+
+        assertThat(delay.getTimeUnit()).isEqualTo(TimeUnit.MILLISECONDS);
+
+        assertThat(delay.createDelay(1)).isBetween(0L, 1L);
+        assertThat(delay.createDelay(2)).isBetween(1L, 2L);
+        assertThat(delay.createDelay(3)).isBetween(2L, 4L);
+        assertThat(delay.createDelay(4)).isBetween(4L, 8L);
+        assertThat(delay.createDelay(5)).isBetween(8L, 16L);
+        assertThat(delay.createDelay(6)).isBetween(16L, 32L);
+        assertThat(delay.createDelay(7)).isBetween(32L, 64L);
+        assertThat(delay.createDelay(8)).isBetween(64L, 128L);
+        assertThat(delay.createDelay(9)).isBetween(128L, 256L);
+        assertThat(delay.createDelay(10)).isBetween(256L, 512L);
+        assertThat(delay.createDelay(11)).isBetween(512L, 1024L);
+        assertThat(delay.createDelay(12)).isBetween(1024L, 2048L);
+        assertThat(delay.createDelay(13)).isBetween(2048L, 4096L);
+        assertThat(delay.createDelay(14)).isBetween(4096L, 8192L);
+        assertThat(delay.createDelay(15)).isBetween(8192L, 16384L);
+        assertThat(delay.createDelay(16)).isBetween(15000L, 30000L);
+        assertThat(delay.createDelay(17)).isBetween(15000L, 30000L);
+        assertThat(delay.createDelay(Integer.MAX_VALUE)).isBetween(15000L, 30000L);
+    }
+}

From bfee76eefa77e0fe9051e53302f13834ba0e7677 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 27 Sep 2016 21:24:00 +0200
Subject: [PATCH 034/808] Polishing #365

---
 .../redis/protocol/ConnectionWatchdog.java    | 15 +++----
 .../redis/resource/ClientResources.java       |  3 +-
 .../resource/DecorrelatedJitterDelay.java     | 19 ++++++---
 .../resource/DefaultClientResources.java      |  9 +++--
 .../com/lambdaworks/redis/resource/Delay.java | 39 ++++++++++++++-----
 .../redis/resource/EqualJitterDelay.java      | 12 ++++--
 .../redis/resource/ExponentialDelay.java      | 30 ++++++++++----
 .../redis/resource/FullJitterDelay.java       | 16 +++++---
 .../resource/DecorrelatedJitterDelayTest.java |  3 ++
 .../resource/DefaultClientResourcesTest.java  | 34 +++++++++++++++-
 .../redis/resource/EqualJitterDelayTest.java  |  3 ++
 .../redis/resource/FullJitterDelayTest.java   |  3 ++
 12 files changed, 140 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java b/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
index b9112254c0..254367a555 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
@@ -78,7 +78,6 @@ public ConnectionWatchdog(Delay reconnectDelay, ClientOptions clientOptions, Boo
         LettuceAssert.notNull(connectionFacade, "ConnectionFacade must not be null");
 
         this.reconnectDelay = reconnectDelay;
-        resetReconnectDelay();
         this.bootstrap = bootstrap;
         this.timer = timer;
         this.reconnectWorkers = reconnectWorkers;
@@ -103,12 +102,8 @@ public SocketAddress get() {
 
         this.reconnectionHandler = new ReconnectionHandler(clientOptions, bootstrap, wrappedSocketAddressSupplier,
                 connectionFacade);
-    }
 
-    private void resetReconnectDelay() {
-        if (reconnectDelay instanceof StatefulDelay) {
-            ((StatefulDelay) reconnectDelay).reset();
-        }
+        resetReconnectDelay();
     }
 
     @Override
@@ -118,6 +113,7 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
 
         if (evt instanceof ConnectionEvents.Activated) {
             attempts = 0;
+            resetReconnectDelay();
         }
 
         super.userEventTriggered(ctx, evt);
@@ -137,7 +133,6 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
         channel = ctx.channel();
         reconnectScheduleTimeout = null;
         remoteAddress = channel.remoteAddress();
-        resetReconnectDelay();
         logPrefix = null;
         logger.debug("{} channelActive()", logPrefix());
 
@@ -318,6 +313,12 @@ ReconnectionHandler getReconnectionHandler() {
         return reconnectionHandler;
     }
 
+    private void resetReconnectDelay() {
+        if (reconnectDelay instanceof StatefulDelay) {
+            ((StatefulDelay) reconnectDelay).reset();
+        }
+    }
+
     private String logPrefix() {
 
         if (logPrefix != null) {
diff --git a/src/main/java/com/lambdaworks/redis/resource/ClientResources.java b/src/main/java/com/lambdaworks/redis/resource/ClientResources.java
index d8516f0ea8..1ee05ac66f 100644
--- a/src/main/java/com/lambdaworks/redis/resource/ClientResources.java
+++ b/src/main/java/com/lambdaworks/redis/resource/ClientResources.java
@@ -115,10 +115,9 @@ public interface ClientResources {
     DnsResolver dnsResolver();
 
     /**
-     * Returns the {@link Delay} for reconnect attempts. Each connection uses its own attempt counter.
+     * Returns the {@link Delay} for reconnect attempts. May return a different instance on each call.
      *
      * @return the reconnect {@link Delay}.
      */
     Delay reconnectDelay();
-
 }
diff --git a/src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java b/src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java
index eba55a82b9..370ae51bd9 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java
@@ -5,21 +5,30 @@
 import com.lambdaworks.redis.resource.Delay.StatefulDelay;
 
 /**
- * Delay that increases using decorrelated jitter strategy.
+ * Stateful delay that increases using decorrelated jitter strategy.
  *
  * <p>
- * Considering retry attempts start at 1, attempt 0 would be the initial call and will always yield 0 (or the lower).
- * Then, each retry step will by default yield <code>min(cap, randomBetween(base, prevDelay * 3))</code>.
+ * Considering retry attempts start at 1, attempt 0 would be the initial call and will always yield 0 (or the lower). Then, each
+ * retry step will by default yield {@code min(cap, randomBetween(base, prevDelay * 3))}.
  *
- * This strategy is based on <a href="https://www.awsarchitectureblog.com/2015/03/backoff.html">Exponential Backoff And Jitter</a>.
+ * This strategy is based on <a href="https://www.awsarchitectureblog.com/2015/03/backoff.html">Exponential Backoff and
+ * Jitter</a>.
  * </p>
+ * 
+ * @author Jongyeol Choi
+ * @since 4.2
+ * @see StatefulDelay
  */
 class DecorrelatedJitterDelay extends Delay implements StatefulDelay {
 
     private final long lower;
     private final long upper;
     private final long base;
-    private long prevDelay;
+
+    /*
+     * Delays may be used by different threads, this one is volatile to prevent visibility issues
+     */
+    private volatile long prevDelay;
 
     DecorrelatedJitterDelay(long lower, long upper, long base, TimeUnit unit) {
         super(unit);
diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
index 56184472a3..544f4aa41a 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
@@ -316,15 +316,16 @@ public Builder dnsResolver(DnsResolver dnsResolver) {
 
         /**
          * Sets the stateless reconnect {@link Delay} to delay reconnect attempts. Defaults to binary exponential delay capped at
-         * {@literal 30 SECONDS}.
+         * {@literal 30 SECONDS}. {@code reconnectDelay} must be a stateless {@link Delay}.
          *
          * @param reconnectDelay the reconnect delay, must not be {@literal null}.
          * @return this
          */
         public Builder reconnectDelay(Delay reconnectDelay) {
-            if (reconnectDelay instanceof StatefulDelay) {
-                throw new IllegalArgumentException("Delay must be a stateless instance.");
-            }
+
+            LettuceAssert.notNull(reconnectDelay, "Delay must not be null");
+            LettuceAssert.isTrue(!(reconnectDelay instanceof StatefulDelay), "Delay must be a stateless instance.");
+
             return reconnectDelay(() -> reconnectDelay);
         }
 
diff --git a/src/main/java/com/lambdaworks/redis/resource/Delay.java b/src/main/java/com/lambdaworks/redis/resource/Delay.java
index bf93d707f0..4d7ee3e5f9 100644
--- a/src/main/java/com/lambdaworks/redis/resource/Delay.java
+++ b/src/main/java/com/lambdaworks/redis/resource/Delay.java
@@ -8,10 +8,16 @@
 
 /**
  * Base class for delays and factory class to create particular instances. {@link Delay} can be subclassed to create custom
- * delay implementations based on attempts. Attempts start with {@value 1}.
+ * delay implementations based on attempts. Attempts start with {@code 1}.
+ * <p>
+ * Delays are usually stateless instances that can be shared amongst multiple users (such as connections). Stateful
+ * {@link Delay} implementations must implement {@link StatefulDelay} to reset their internal state after the delay is not
+ * required anymore.
  * 
  * @author Mark Paluch
+ * @author Jongyeol Choi
  * @since 4.2
+ * @see StatefulDelay
  */
 public abstract class Delay {
 
@@ -21,14 +27,17 @@ public abstract class Delay {
     private static TimeUnit DEFAULT_TIMEUNIT = TimeUnit.MILLISECONDS;
 
     /**
-     * Additional interface for stateful {@link Delay}.
+     * Interface to be implemented by stateful {@link Delay}s. Stateful delays can get reset once a condition (such as
+     * successful reconnect) is met. Stateful delays should not be shared by multiple connections but each connection should use
+     * its own instance.
+     * 
+     * @see Supplier
+     * @see com.lambdaworks.redis.resource.DefaultClientResources.Builder#reconnectDelay(Supplier)
      */
     public interface StatefulDelay {
 
         /**
-         * Reset this delay.
-         *
-         * This method is to be implemented by the implementations.
+         * Reset this delay state. Resetting prepares a stateful delay for its next usage.
          */
         void reset();
     }
@@ -169,22 +178,22 @@ public static Delay fullJitter(long lower, long upper, long base, TimeUnit unit)
     }
 
     /**
-     * Creates a new {@link DecorrelatedJitterDelay} supplier with default boundaries.
+     * Creates a {@link Supplier} that constructs new {@link DecorrelatedJitterDelay} instances with default boundaries.
      *
-     * @return a created {@link Supplier<DecorrelatedJitterDelay>}.
+     * @return a {@link Supplier} of {@link DecorrelatedJitterDelay}.
      */
     public static Supplier<Delay> decorrelatedJitter() {
         return decorrelatedJitter(DEFAULT_LOWER_BOUND, DEFAULT_UPPER_BOUND, 0L, DEFAULT_TIMEUNIT);
     }
 
     /**
-     * Creates a new {@link DecorrelatedJitterDelay} supplier.
+     * Creates a {@link Supplier} that constructs new {@link DecorrelatedJitterDelay} instances.
      *
      * @param lower the lower boundary, must be non-negative
      * @param upper the upper boundary, must be greater than the lower boundary
      * @param base the base, must be greater or equal to 0
      * @param unit the unit of the delay.
-     * @return a created {@link Supplier<DecorrelatedJitterDelay>}.
+     * @return a new {@link Supplier} of {@link DecorrelatedJitterDelay}.
      */
     public static Supplier<Delay> decorrelatedJitter(long lower, long upper, long base, TimeUnit unit) {
 
@@ -192,10 +201,18 @@ public static Supplier<Delay> decorrelatedJitter(long lower, long upper, long ba
         LettuceAssert.isTrue(upper > lower, "Upper boundary must be greater than the lower boundary");
         LettuceAssert.isTrue(base >= 0, "Base must be greater or equal to 0");
 
-        // It'll create new Delay everytime because it has state.
+        // Create new Delay because it has state.
         return () -> new DecorrelatedJitterDelay(lower, upper, base, unit);
     }
 
+    /**
+     * Generates a random long value within {@code min} and {@code max} boundaries.
+     * 
+     * @param min
+     * @param max
+     * @return a random value
+     * @see ThreadLocalRandom#nextLong(long, long)
+     */
     protected static long randomBetween(long min, long max) {
         if (min == max) {
             return min;
@@ -208,9 +225,11 @@ protected static long applyBounds(long calculatedValue, long lower, long upper)
         if (calculatedValue < lower) {
             return lower;
         }
+
         if (calculatedValue > upper) {
             return upper;
         }
+
         return calculatedValue;
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java b/src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java
index c9067d3bf9..500200dc5a 100644
--- a/src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java
+++ b/src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java
@@ -6,11 +6,15 @@
  * Delay that increases using equal jitter strategy.
  *
  * <p>
- * Considering retry attempts start at 1, attempt 0 would be the initial call and will always yield 0 (or the lower).
- * Then, each retry step will by default yield <code>randomBetween(0, base * 2 ^ (attempt - 1))</code>.
+ * Considering retry attempts start at 1, attempt 0 would be the initial call and will always yield 0 (or the lower). Then, each
+ * retry step will by default yield {@code randomBetween(0, base * 2 ^ (attempt - 1))}.
  *
- * This strategy is based on <a href="https://www.awsarchitectureblog.com/2015/03/backoff.html">Exponential Backoff And Jitter</a>.
+ * This strategy is based on <a href="https://www.awsarchitectureblog.com/2015/03/backoff.html">Exponential Backoff and
+ * Jitter</a>.
  * </p>
+ *
+ * @author Jongyeol Choi
+ * @since 4.2
  */
 class EqualJitterDelay extends ExponentialDelay {
 
@@ -24,6 +28,6 @@ class EqualJitterDelay extends ExponentialDelay {
     @Override
     public long createDelay(long attempt) {
         long value = randomBetween(0, base * calculatePowerOfTwo(attempt));
-        return applyBounds(value, lower, upper);
+        return applyBounds(value);
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java b/src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java
index e47d8691c1..87449415bd 100644
--- a/src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java
+++ b/src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java
@@ -7,20 +7,23 @@
  *
  * <p>
  * Considering retry attempts start at 1, attempt 0 would be the initial call and will always yield 0 (or the lower bound). Then
- * each retry step will by default yield <code>1 * 2 ^ (attemptNumber-1)</code>. Actually each step can be based on a different
- * number than 1 unit of time using the <code>growBy</code> parameter: <code>growBy * 2 ^ (attemptNumber-1)</code>.
+ * each retry step will by default yield {@code 2 ^ (attemptNumber-1)}. By default this gives us 0 (initial attempt), 1, 2, 4,
+ * 8, 16, 32, ...
  * <p>
- * By default with growBy = 1 this gives us 0 (initial attempt), 1, 2, 4, 8, 16, 32...
- *
- * Each of the resulting values that is below the <code>lowerBound</code> will be replaced by the lower bound, and each value
- * over the <code>upperBound</code> will be replaced by the upper bound.
+ * {@link ExponentialDelay} can also apply different {@code powersBy}, such as power of 10 that would apply
+ * {@code 10 ^ (attemptNumber-1)} which would give 0, 10, 100, 1000, ...
+ * <p>
+ * Each of the resulting values that is below the {@code lowerBound} will be replaced by the lower bound, and each value over
+ * the {@code upperBound} will be replaced by the upper bound.
  *
  * @author Mark Paluch
+ * @author Jongyeol Choi
+ * @since 4.1
  */
 class ExponentialDelay extends Delay {
 
-    protected final long lower;
-    protected final long upper;
+    private final long lower;
+    private final long upper;
     private final int powersOf;
 
     ExponentialDelay(long lower, long upper, TimeUnit unit, int powersOf) {
@@ -43,6 +46,16 @@ public long createDelay(long attempt) {
             delay = calculateAlternatePower(attempt);
         }
 
+        return applyBounds(delay);
+    }
+
+    /**
+     * Apply bounds to the given {@code delay}.
+     * 
+     * @param delay the delay
+     * @return the delay normalized to its lower and upper bounds.
+     */
+    protected long applyBounds(long delay) {
         return applyBounds(delay, lower, upper);
     }
 
@@ -55,6 +68,7 @@ private long calculateAlternatePower(long attempt) {
 
     // fastpath with bitwise operator
     protected static long calculatePowerOfTwo(long attempt) {
+
         if (attempt <= 0) { // safeguard against underflow
             return 0L;
         } else if (attempt >= 64) { // safeguard against overflow in the bitshift operation
diff --git a/src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java b/src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java
index 2dab7128c7..c1843360cc 100644
--- a/src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java
+++ b/src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java
@@ -6,19 +6,25 @@
  * Delay that increases using full jitter strategy.
  *
  * <p>
- * Considering retry attempts start at 1, attempt 0 would be the initial call and will always yield 0 (or the lower).
- * Then, each retry step will by default yield <code>temp / 2 + random_between(0, temp / 2)</code> and temp
- * is <code>temp = min(upper, base * 2 ** attempt)</code>.
+ * Considering retry attempts start at 1, attempt 0 would be the initial call and will always yield 0 (or the lower). Then, each
+ * retry step will by default yield {@code temp / 2 + random_between(0, temp / 2)} and temp is
+ * {@code temp = min(upper, base * 2 ** attempt)}.
  *
- * This strategy is based on <a href="https://www.awsarchitectureblog.com/2015/03/backoff.html">Exponential Backoff And Jitter</a>.
+ * This strategy is based on <a href="https://www.awsarchitectureblog.com/2015/03/backoff.html">Exponential Backoff and
+ * Jitter</a>.
  * </p>
+ *
+ * @author Jongyeol Choi
+ * @since 4.2
  */
 class FullJitterDelay extends ExponentialDelay {
 
     private final long base;
+    private final long upper;
 
     FullJitterDelay(long lower, long upper, long base, TimeUnit unit) {
         super(lower, upper, unit, 2);
+        this.upper = upper;
         this.base = base;
     }
 
@@ -26,6 +32,6 @@ class FullJitterDelay extends ExponentialDelay {
     public long createDelay(long attempt) {
         long temp = Math.min(upper, base * calculatePowerOfTwo(attempt));
         long delay = temp / 2 + randomBetween(0, temp / 2);
-        return applyBounds(delay, lower, upper);
+        return applyBounds(delay);
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java b/src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java
index 2075022e3e..3a09ff59c3 100644
--- a/src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java
@@ -6,6 +6,9 @@
 
 import org.junit.Test;
 
+/**
+ * @author Jongyeol Choi
+ */
 public class DecorrelatedJitterDelayTest {
 
     @Test(expected = IllegalArgumentException.class)
diff --git a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java b/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
index 05ed927233..4148f8c57f 100644
--- a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
@@ -8,13 +8,14 @@
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.Test;
 
+import com.lambdaworks.redis.FastShutdown;
 import com.lambdaworks.redis.event.Event;
 import com.lambdaworks.redis.event.EventBus;
 import com.lambdaworks.redis.metrics.CommandLatencyCollector;
 import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollectorOptions;
+import com.lambdaworks.redis.reactive.TestSubscriber;
 
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.concurrent.EventExecutorGroup;
@@ -138,4 +139,35 @@ public void testEventBus() throws Exception {
         assertThat(sut.shutdown(0, 0, TimeUnit.MILLISECONDS).get()).isTrue();
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void delayInstanceShouldRejectStatefulDelay() throws Exception {
+
+        DefaultClientResources.builder().reconnectDelay(Delay.decorrelatedJitter().get());
+    }
+
+    @Test
+    public void reconnectDelayCreatesNewForStatefulDelays() throws Exception {
+
+        DefaultClientResources resources = DefaultClientResources.builder().reconnectDelay(Delay.decorrelatedJitter()).build();
+
+        Delay delay1 = resources.reconnectDelay();
+        Delay delay2 = resources.reconnectDelay();
+
+        assertThat(delay1).isNotSameAs(delay2);
+
+        FastShutdown.shutdown(resources);
+    }
+
+    @Test
+    public void reconnectDelayReturnsSameInstanceForStatelessDelays() throws Exception {
+
+        DefaultClientResources resources = DefaultClientResources.builder().reconnectDelay(Delay.exponential()).build();
+
+        Delay delay1 = resources.reconnectDelay();
+        Delay delay2 = resources.reconnectDelay();
+
+        assertThat(delay1).isSameAs(delay2);
+
+        FastShutdown.shutdown(resources);
+    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java b/src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java
index f3660d3043..8a77969593 100644
--- a/src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java
@@ -6,6 +6,9 @@
 
 import org.junit.Test;
 
+/**
+ * @author Jongyeol Choi
+ */
 public class EqualJitterDelayTest {
 
     @Test(expected = IllegalArgumentException.class)
diff --git a/src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java b/src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java
index 8d1542db46..5a01edd06b 100644
--- a/src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java
@@ -6,6 +6,9 @@
 
 import org.junit.Test;
 
+/**
+ * @author Jongyeol Choi
+ */
 public class FullJitterDelayTest {
 
     @Test(expected = IllegalArgumentException.class)

From dc78fde9bfabceb0fdc11d683627b3bdb0c4af91 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 27 Sep 2016 22:07:13 +0200
Subject: [PATCH 035/808] Add support for ZADD INCR with ZAddArgs #367

---
 .../redis/AbstractRedisAsyncCommands.java     |  7 +++-
 .../redis/AbstractRedisReactiveCommands.java  |  8 +++--
 .../redis/RedisCommandBuilder.java            |  7 +++-
 .../java/com/lambdaworks/redis/ZAddArgs.java  |  7 ++--
 .../async/RedisSortedSetAsyncCommands.java    | 21 ++++++++---
 .../RedisSortedSetReactiveCommands.java       | 21 ++++++++---
 .../api/sync/RedisSortedSetCommands.java      | 21 ++++++++---
 .../NodeSelectionSortedSetAsyncCommands.java  | 21 ++++++++---
 .../sync/NodeSelectionSortedSetCommands.java  | 21 ++++++++---
 .../redis/api/RedisSortedSetCommands.java     | 35 +++++++++++++------
 .../redis/commands/SortedSetCommandTest.java  | 17 +++++++--
 11 files changed, 141 insertions(+), 45 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
index a8f102d1e7..c9278d6097 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
@@ -1056,7 +1056,12 @@ public RedisFuture<Long> zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scored
 
     @Override
     public RedisFuture<Double> zaddincr(K key, double score, V member) {
-        return dispatch(commandBuilder.zaddincr(key, score, member));
+        return dispatch(commandBuilder.zaddincr(key, null, score, member));
+    }
+
+    @Override
+    public RedisFuture<Double> zaddincr(K key, ZAddArgs zAddArgs, double score, V member) {
+        return dispatch(commandBuilder.zaddincr(key, zAddArgs, score, member));
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
index a34dc499ca..d3408daf64 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
@@ -1052,7 +1052,12 @@ public Mono<Long> zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues)
 
     @Override
     public Mono<Double> zaddincr(K key, double score, V member) {
-        return createMono(() -> commandBuilder.zaddincr(key, score, member));
+        return createMono(() -> commandBuilder.zaddincr(key, null, score, member));
+    }
+
+    @Override
+    public Mono<Double> zaddincr(K key, ZAddArgs zAddArgs, double score, V member) {
+        return createMono(() -> commandBuilder.zaddincr(key, zAddArgs, score, member));
     }
 
     @Override
@@ -1060,7 +1065,6 @@ public Mono<Long> zcard(K key) {
         return createMono(() -> commandBuilder.zcard(key));
     }
 
-    @Override
     public Mono<Long> zcount(K key, double min, double max) {
         return createMono(() -> commandBuilder.zcount(key, min, max));
     }
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
index 48b385ddeb..1c82156a52 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
@@ -1441,10 +1441,15 @@ public Command<K, V, Long> zadd(K key, ZAddArgs zAddArgs, double score, V member
         return createCommand(ZADD, new IntegerOutput<K, V>(codec), args);
     }
 
-    public Command<K, V, Double> zaddincr(K key, double score, V member) {
+    public Command<K, V, Double> zaddincr(K key, ZAddArgs zAddArgs, double score, V member) {
         notNullKey(key);
 
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key);
+
+        if (zAddArgs != null) {
+            zAddArgs.build(args);
+        }
+
         args.add(INCR);
         args.add(score).addValue(member);
 
diff --git a/src/main/java/com/lambdaworks/redis/ZAddArgs.java b/src/main/java/com/lambdaworks/redis/ZAddArgs.java
index 1a5fd103b8..8864e1026f 100644
--- a/src/main/java/com/lambdaworks/redis/ZAddArgs.java
+++ b/src/main/java/com/lambdaworks/redis/ZAddArgs.java
@@ -15,6 +15,7 @@ public class ZAddArgs {
     private boolean ch = false;
 
     public static class Builder {
+
         /**
          * Utility constructor.
          */
@@ -35,17 +36,17 @@ public static ZAddArgs ch() {
         }
     }
 
-    private ZAddArgs nx() {
+    public ZAddArgs nx() {
         this.nx = true;
         return this;
     }
 
-    private ZAddArgs ch() {
+    public ZAddArgs ch() {
         this.ch = true;
         return this;
     }
 
-    private ZAddArgs xx() {
+    public ZAddArgs xx() {
         this.xx = true;
         return this;
     }
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
index b02bb9314a..4aebb7a0d5 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
@@ -105,18 +105,29 @@ public interface RedisSortedSetAsyncCommands<K, V> {
     RedisFuture<Long> zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues);
 
     /**
-     * ZADD acts like ZINCRBY
+     * Add one or more members to a sorted set, or update its score if it already exists applying the {@code INCR} option. ZADD
+     * acts like ZINCRBY.
      *
      * @param key the key
      * @param score the score
      * @param member the member
-     *
-     * @return Long integer-reply specifically:
-     *
-     *         The total number of elements changed
+     * @return Long integer-reply specifically: The total number of elements changed
      */
     RedisFuture<Double> zaddincr(K key, double score, V member);
 
+    /**
+     * Add one or more members to a sorted set, or update its score if it already exists applying the {@code INCR} option. ZADD
+     * acts like ZINCRBY.
+     *
+     * @param key the key
+     * @param zAddArgs arguments for zadd
+     * @param score the score
+     * @param member the member
+     * @return Long integer-reply specifically: The total number of elements changed
+     * @since 4.3
+     */
+    RedisFuture<Double> zaddincr(K key, ZAddArgs zAddArgs, double score, V member);
+
     /**
      * Get the number of members in a sorted set.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
index 3acd9a8a97..4e5a31658d 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
@@ -106,18 +106,29 @@ public interface RedisSortedSetReactiveCommands<K, V> {
     Mono<Long> zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues);
 
     /**
-     * ZADD acts like ZINCRBY
+     * Add one or more members to a sorted set, or update its score if it already exists applying the {@code INCR} option. ZADD
+     * acts like ZINCRBY.
      *
      * @param key the key
      * @param score the score
      * @param member the member
-     *
-     * @return Long integer-reply specifically:
-     *
-     *         The total number of elements changed
+     * @return Long integer-reply specifically: The total number of elements changed
      */
     Mono<Double> zaddincr(K key, double score, V member);
 
+    /**
+     * Add one or more members to a sorted set, or update its score if it already exists applying the {@code INCR} option. ZADD
+     * acts like ZINCRBY.
+     *
+     * @param key the key
+     * @param zAddArgs arguments for zadd
+     * @param score the score
+     * @param member the member
+     * @return Long integer-reply specifically: The total number of elements changed
+     * @since 4.3
+     */
+    Mono<Double> zaddincr(K key, ZAddArgs zAddArgs, double score, V member);
+
     /**
      * Get the number of members in a sorted set.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
index d484e1ef94..96d966a1a4 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
@@ -104,18 +104,29 @@ public interface RedisSortedSetCommands<K, V> {
     Long zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues);
 
     /**
-     * ZADD acts like ZINCRBY
+     * Add one or more members to a sorted set, or update its score if it already exists applying the {@code INCR} option. ZADD
+     * acts like ZINCRBY.
      *
      * @param key the key
      * @param score the score
      * @param member the member
-     *
-     * @return Long integer-reply specifically:
-     *
-     *         The total number of elements changed
+     * @return Long integer-reply specifically: The total number of elements changed
      */
     Double zaddincr(K key, double score, V member);
 
+    /**
+     * Add one or more members to a sorted set, or update its score if it already exists applying the {@code INCR} option. ZADD
+     * acts like ZINCRBY.
+     *
+     * @param key the key
+     * @param zAddArgs arguments for zadd
+     * @param score the score
+     * @param member the member
+     * @return Long integer-reply specifically: The total number of elements changed
+     * @since 4.3
+     */
+    Double zaddincr(K key, ZAddArgs zAddArgs, double score, V member);
+
     /**
      * Get the number of members in a sorted set.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
index 100e83dc7b..8da750bf81 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
@@ -105,18 +105,29 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
     AsyncExecutions<Long> zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues);
 
     /**
-     * ZADD acts like ZINCRBY
+     * Add one or more members to a sorted set, or update its score if it already exists applying the {@code INCR} option. ZADD
+     * acts like ZINCRBY.
      *
      * @param key the key
      * @param score the score
      * @param member the member
-     *
-     * @return Long integer-reply specifically:
-     *
-     *         The total number of elements changed
+     * @return Long integer-reply specifically: The total number of elements changed
      */
     AsyncExecutions<Double> zaddincr(K key, double score, V member);
 
+    /**
+     * Add one or more members to a sorted set, or update its score if it already exists applying the {@code INCR} option. ZADD
+     * acts like ZINCRBY.
+     *
+     * @param key the key
+     * @param zAddArgs arguments for zadd
+     * @param score the score
+     * @param member the member
+     * @return Long integer-reply specifically: The total number of elements changed
+     * @since 4.3
+     */
+    AsyncExecutions<Double> zaddincr(K key, ZAddArgs zAddArgs, double score, V member);
+
     /**
      * Get the number of members in a sorted set.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
index 0aeeaee2a6..2768ed7098 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
@@ -104,18 +104,29 @@ public interface NodeSelectionSortedSetCommands<K, V> {
     Executions<Long> zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues);
 
     /**
-     * ZADD acts like ZINCRBY
+     * Add one or more members to a sorted set, or update its score if it already exists applying the {@code INCR} option. ZADD
+     * acts like ZINCRBY.
      *
      * @param key the key
      * @param score the score
      * @param member the member
-     *
-     * @return Long integer-reply specifically:
-     *
-     *         The total number of elements changed
+     * @return Long integer-reply specifically: The total number of elements changed
      */
     Executions<Double> zaddincr(K key, double score, V member);
 
+    /**
+     * Add one or more members to a sorted set, or update its score if it already exists applying the {@code INCR} option. ZADD
+     * acts like ZINCRBY.
+     *
+     * @param key the key
+     * @param zAddArgs arguments for zadd
+     * @param score the score
+     * @param member the member
+     * @return Long integer-reply specifically: The total number of elements changed
+     * @since 4.3
+     */
+    Executions<Double> zaddincr(K key, ZAddArgs zAddArgs, double score, V member);
+
     /**
      * Get the number of members in a sorted set.
      * 
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
index 653e5762dc..20b571778c 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
@@ -49,7 +49,7 @@ public interface RedisSortedSetCommands<K, V> {
      *         updated.
      */
     Long zadd(K key, Object... scoresAndValues);
-    
+
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
      * 
@@ -89,7 +89,7 @@ public interface RedisSortedSetCommands<K, V> {
      *         updated.
      */
     Long zadd(K key, ZAddArgs zAddArgs, Object... scoresAndValues);
-    
+
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
      * 
@@ -104,18 +104,29 @@ public interface RedisSortedSetCommands<K, V> {
     Long zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues);
 
     /**
-     * ZADD acts like ZINCRBY
+     * Add one or more members to a sorted set, or update its score if it already exists applying the {@code INCR} option. ZADD
+     * acts like ZINCRBY.
      *
      * @param key the key
      * @param score the score
      * @param member the member
-     *
-     * @return Long integer-reply specifically:
-     *
-     *         The total number of elements changed
+     * @return Long integer-reply specifically: The total number of elements changed
      */
     Double zaddincr(K key, double score, V member);
 
+    /**
+     * Add one or more members to a sorted set, or update its score if it already exists applying the {@code INCR} option. ZADD
+     * acts like ZINCRBY.
+     *
+     * @param key the key
+     * @param zAddArgs arguments for zadd
+     * @param score the score
+     * @param member the member
+     * @return Long integer-reply specifically: The total number of elements changed
+     * @since 4.3
+     */
+    Double zaddincr(K key, ZAddArgs zAddArgs, double score, V member);
+
     /**
      * Get the number of members in a sorted set.
      * 
@@ -505,7 +516,8 @@ public interface RedisSortedSetCommands<K, V> {
      * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
     @Deprecated
-    Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
+    Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max, long offset,
+            long count);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
@@ -520,7 +532,8 @@ public interface RedisSortedSetCommands<K, V> {
      * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
     @Deprecated
-    Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
+    Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max, long offset,
+            long count);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
@@ -916,7 +929,7 @@ public interface RedisSortedSetCommands<K, V> {
      */
     @Deprecated
     Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min, long offset,
-                                    long count);
+            long count);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
@@ -932,7 +945,7 @@ Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, d
      */
     @Deprecated
     Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min, long offset,
-                                    long count);
+            long count);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
diff --git a/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
index da4d4f6068..bddf66e576 100644
--- a/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
@@ -10,6 +10,7 @@
 import static java.lang.Double.POSITIVE_INFINITY;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.data.Offset.offset;
+import static sun.security.krb5.Confounder.longValue;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -76,8 +77,7 @@ public void zaddxx() throws Exception {
     @Test
     public void zaddch() throws Exception {
         assertThat(redis.zadd(key, 1.0, "a")).isEqualTo(1);
-        assertThat(redis.zadd(key, ZAddArgs.Builder.ch(), 2.0, "a")).isEqualTo(1);
-
+        assertThat(redis.zadd(key, ZAddArgs.Builder.ch().xx(), 2.0, "a")).isEqualTo(1);
         assertThat(redis.zadd(key, ZAddArgs.Builder.ch(), 2.0, "b")).isEqualTo(1);
 
         assertThat(redis.zrangeWithScores(key, 0, -1)).isEqualTo(svlist(sv(2.0, "a"), sv(2.0, "b")));
@@ -93,6 +93,19 @@ public void zaddincr() throws Exception {
         assertThat(redis.zrangeWithScores(key, 0, -1)).isEqualTo(svlist(sv(2.0, "b"), sv(3.0, "a")));
     }
 
+    @Test
+    public void zaddincrnx() throws Exception {
+        assertThat(redis.zaddincr(key, ZAddArgs.Builder.nx(), 2.0, "a").longValue()).isEqualTo(2);
+        assertThat(redis.zaddincr(key, ZAddArgs.Builder.nx(), 2.0, "a")).isNull();
+    }
+
+    @Test
+    public void zaddincrxx() throws Exception {
+        assertThat(redis.zaddincr(key, ZAddArgs.Builder.xx(), 2.0, "a")).isNull();
+        assertThat(redis.zaddincr(key, ZAddArgs.Builder.nx(), 2.0, "a").longValue()).isEqualTo(2);
+        assertThat(redis.zaddincr(key, ZAddArgs.Builder.xx(), 2.0, "a").longValue()).isEqualTo(4);
+    }
+
     @Test
     public void zcard() throws Exception {
         assertThat(redis.zcard(key)).isEqualTo(0);

From 14606101d171a8252efd36e447f1e9566f7c1798 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 29 Sep 2016 14:40:20 +0200
Subject: [PATCH 036/808] Accept double in ZStoreArgs.weights #368

---
 .../com/lambdaworks/redis/ZStoreArgs.java     | 35 +++++++++++++++----
 .../redis/commands/SortedSetCommandTest.java  |  7 ++--
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/ZStoreArgs.java b/src/main/java/com/lambdaworks/redis/ZStoreArgs.java
index a0d74629c8..5a7d85c9e8 100644
--- a/src/main/java/com/lambdaworks/redis/ZStoreArgs.java
+++ b/src/main/java/com/lambdaworks/redis/ZStoreArgs.java
@@ -10,8 +10,8 @@
 import com.lambdaworks.redis.protocol.CommandArgs;
 
 /**
- * Argument list builder for the redis <a href="http://redis.io/commands/zunionstore">ZUNIONSTORE</a> and <a
- * href="http://redis.io/commands/zinterstore">ZINTERSTORE</a> commands. Static import the methods from {@link Builder} and
+ * Argument list builder for the redis <a href="http://redis.io/commands/zunionstore">ZUNIONSTORE</a> and
+ * <a href="http://redis.io/commands/zinterstore">ZINTERSTORE</a> commands. Static import the methods from {@link Builder} and
  * chain the method calls: {@code weights(1, 2).max()}.
  * 
  * @author Will Glozer
@@ -22,7 +22,7 @@ private static enum Aggregate {
         SUM, MIN, MAX
     }
 
-    private List<Long> weights;
+    private List<Double> weights;
     private Aggregate aggregate;
 
     /**
@@ -37,7 +37,12 @@ private Builder() {
 
         }
 
-        public static ZStoreArgs weights(long... weights) {
+        @Deprecated
+        public static ZStoreArgs weights(long[] weights) {
+            return new ZStoreArgs().weights(toDoubleArray(weights));
+        }
+
+        public static ZStoreArgs weights(double... weights) {
             return new ZStoreArgs().weights(weights);
         }
 
@@ -54,9 +59,15 @@ public static ZStoreArgs max() {
         }
     }
 
-    public ZStoreArgs weights(long... weights) {
+    @Deprecated
+    public static ZStoreArgs weights(long[] weights) {
+        return new ZStoreArgs().weights(toDoubleArray(weights));
+    }
+
+    public ZStoreArgs weights(double... weights) {
         this.weights = new ArrayList<>(weights.length);
-        for (long weight : weights) {
+
+        for (double weight : weights) {
             this.weights.add(weight);
         }
         return this;
@@ -77,10 +88,20 @@ public ZStoreArgs max() {
         return this;
     }
 
+    private static double[] toDoubleArray(long[] weights) {
+        double result[] = new double[weights.length];
+        for (int i = 0; i < weights.length; i++) {
+            result[i] = weights[i];
+        }
+        return result;
+    }
+
     <K, V> void build(CommandArgs<K, V> args) {
+
         if (weights != null) {
+
             args.add(WEIGHTS);
-            for (long weight : weights) {
+            for (double weight : weights) {
                 args.add(weight);
             }
         }
diff --git a/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
index bddf66e576..b17e040050 100644
--- a/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
@@ -10,15 +10,14 @@
 import static java.lang.Double.POSITIVE_INFINITY;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.data.Offset.offset;
-import static sun.security.krb5.Confounder.longValue;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import com.lambdaworks.redis.Range.Boundary;
 import org.junit.Test;
 
 import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.Range.Boundary;
 
 public class SortedSetCommandTest extends AbstractRedisClientTest {
 
@@ -465,7 +464,7 @@ public void zunionstore() throws Exception {
         assertThat(redis.zrange(key, 0, -1)).isEqualTo(list("a", "c", "b"));
         assertThat(redis.zrangeWithScores(key, 0, -1)).isEqualTo(svlist(sv(3.0, "a"), sv(4.0, "c"), sv(5.0, "b")));
 
-        assertThat(redis.zunionstore(key, weights(2, 3), "zset1", "zset2")).isEqualTo(3);
+        assertThat(redis.zunionstore(key, weights(new long[] { 2, 3 }), "zset1", "zset2")).isEqualTo(3);
         assertThat(redis.zrangeWithScores(key, 0, -1)).isEqualTo(svlist(sv(8.0, "a"), sv(12.0, "c"), sv(13.0, "b")));
 
         assertThat(redis.zunionstore(key, weights(2, 3).sum(), "zset1", "zset2")).isEqualTo(3);
@@ -493,7 +492,7 @@ public void zStoreArgs() throws Exception {
         assertThat(redis.zinterstore(key, max(), "zset1", "zset2")).isEqualTo(2);
         assertThat(redis.zrangeWithScores(key, 0, -1)).isEqualTo(svlist(sv(2.0, "a"), sv(3.0, "b")));
 
-        assertThat(redis.zinterstore(key, weights(2, 3), "zset1", "zset2")).isEqualTo(2);
+        assertThat(redis.zinterstore(key, weights(new long[] { 2, 3 }), "zset1", "zset2")).isEqualTo(2);
         assertThat(redis.zrangeWithScores(key, 0, -1)).isEqualTo(svlist(sv(8.0, "a"), sv(13.0, "b")));
 
         assertThat(redis.zinterstore(key, weights(2, 3).sum(), "zset1", "zset2")).isEqualTo(2);

From 544c0452054a21415dda2309c9b88fff109bfaa9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 29 Sep 2016 14:58:47 +0200
Subject: [PATCH 037/808] Add support for ZREVRANGEBYLEX command #369

---
 .../redis/AbstractRedisAsyncCommands.java     | 10 ++++
 .../redis/AbstractRedisReactiveCommands.java  | 10 ++++
 .../redis/RedisCommandBuilder.java            | 48 ++++++++++++-------
 .../async/RedisSortedSetAsyncCommands.java    | 29 +++++++++--
 .../RedisSortedSetReactiveCommands.java       | 29 +++++++++--
 .../api/sync/RedisSortedSetCommands.java      | 29 +++++++++--
 .../redis/cluster/ReadOnlyCommands.java       |  4 +-
 .../NodeSelectionSortedSetAsyncCommands.java  | 29 +++++++++--
 .../sync/NodeSelectionSortedSetCommands.java  | 29 +++++++++--
 .../redis/masterslave/ReadOnlyCommands.java   |  4 +-
 .../redis/protocol/CommandType.java           |  2 +-
 .../redis/api/RedisSortedSetCommands.java     | 29 +++++++++--
 .../redis/cluster/ReadOnlyCommandsTest.java   |  2 +-
 .../redis/commands/SortedSetCommandTest.java  | 15 +++++-
 14 files changed, 219 insertions(+), 50 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
index c9278d6097..7fed0dabf7 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
@@ -1284,6 +1284,16 @@ public RedisFuture<List<ScoredValue<V>>> zrevrangeWithScores(K key, long start,
         return dispatch(commandBuilder.zrevrangeWithScores(key, start, stop));
     }
 
+    @Override
+    public RedisFuture<List<V>> zrevrangebylex(K key, Range<? extends V> range) {
+        return dispatch(commandBuilder.zrevrangebylex(key, range, Limit.unlimited()));
+    }
+
+    @Override
+    public RedisFuture<List<V>> zrevrangebylex(K key, Range<? extends V> range, Limit limit) {
+        return dispatch(commandBuilder.zrevrangebylex(key, range, limit));
+    }
+
     @Override
     public RedisFuture<List<V>> zrevrangebyscore(K key, double max, double min) {
         return dispatch(commandBuilder.zrevrangebyscore(key, max, min));
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
index d3408daf64..704bf74645 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
@@ -1279,6 +1279,16 @@ public Flux<ScoredValue<V>> zrevrangeWithScores(K key, long start, long stop) {
         return createDissolvingFlux(() -> commandBuilder.zrevrangeWithScores(key, start, stop));
     }
 
+    @Override
+    public Flux<V> zrevrangebylex(K key, Range<? extends V> range) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebylex(key, range, Limit.unlimited()));
+    }
+
+    @Override
+    public Flux<V> zrevrangebylex(K key, Range<? extends V> range, Limit limit) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebylex(key, range, limit));
+    }
+
     @Override
     public Flux<V> zrevrangebyscore(K key, double max, double min) {
         return createDissolvingFlux(() -> commandBuilder.zrevrangebyscore(key, max, min));
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
index 1c82156a52..af599bd073 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
@@ -25,15 +25,15 @@
  * @param <V>
  * @author Mark Paluch
  */
-@SuppressWarnings({"unchecked", "Convert2Diamond", "WeakerAccess", "varargs"})
+@SuppressWarnings({ "unchecked", "Convert2Diamond", "WeakerAccess", "varargs" })
 class RedisCommandBuilder<K, V> extends BaseRedisCommandBuilder<K, V> {
 
     static final String MUST_NOT_CONTAIN_NULL_ELEMENTS = "must not contain null elements";
     static final String MUST_NOT_BE_EMPTY = "must not be empty";
     static final String MUST_NOT_BE_NULL = "must not be null";
 
-    private static final byte[] MINUS_BYTES = {'-'};
-    private static final byte[] PLUS_BYTES = {'+'};
+    private static final byte[] MINUS_BYTES = { '-' };
+    private static final byte[] PLUS_BYTES = { '+' };
 
     public RedisCommandBuilder(RedisCodec<K, V> codec) {
         super(codec);
@@ -1059,7 +1059,6 @@ public Command<K, V, Long> rpushx(K key, V... values) {
         return createCommand(RPUSHX, new IntegerOutput<K, V>(codec), args);
     }
 
-
     public Command<K, V, Long> sadd(K key, V... members) {
         notNullKey(key);
         LettuceAssert.notNull(members, "Members " + MUST_NOT_BE_NULL);
@@ -1599,7 +1598,7 @@ public Command<K, V, List<V>> zrangebyscore(K key, Range<? extends Number> range
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
         args.addKey(key).add(min(range)).add(max(range));
 
-        if(limit.isLimited()) {
+        if (limit.isLimited()) {
             args.add(LIMIT).add(limit.getOffset()).add(limit.getCount());
         }
         return createCommand(ZRANGEBYSCORE, new ValueListOutput<K, V>(codec), args);
@@ -1684,7 +1683,8 @@ public Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key
         return createCommand(ZRANGEBYSCORE, new ValueStreamingOutput<K, V>(codec, channel), args);
     }
 
-    public Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
+    public Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
+            Limit limit) {
         notNullKey(key);
         notNullRange(range);
         notNullLimit(limit);
@@ -1725,7 +1725,8 @@ public Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V
         return createCommand(ZRANGEBYSCORE, new ScoredValueStreamingOutput<K, V>(codec, channel), args);
     }
 
-    public Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
+    public Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key,
+            Range<? extends Number> range, Limit limit) {
         notNullKey(key);
         notNullRange(range);
         notNullLimit(limit);
@@ -1784,6 +1785,16 @@ public Command<K, V, List<V>> zrevrange(K key, long start, long stop) {
         return createCommand(ZREVRANGE, new ValueListOutput<K, V>(codec), args);
     }
 
+    public Command<K, V, List<V>> zrevrangebylex(K key, Range<? extends V> range, Limit limit) {
+        notNullKey(key);
+        notNullRange(range);
+        notNullLimit(limit);
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        addLimit(args.addKey(key).add(maxValue(range)).add(minValue(range)), limit);
+        return createCommand(ZREVRANGEBYLEX, new ValueListOutput<K, V>(codec), args);
+    }
+
     public Command<K, V, List<ScoredValue<V>>> zrevrangeWithScores(K key, long start, long stop) {
         notNullKey(key);
 
@@ -1911,7 +1922,8 @@ public Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K
         return createCommand(ZREVRANGEBYSCORE, new ValueStreamingOutput<K, V>(codec, channel), args);
     }
 
-    public Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
+    public Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
+            Limit limit) {
         notNullKey(key);
         notNullRange(range);
         notNullLimit(limit);
@@ -1958,8 +1970,8 @@ public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChanne
         return createCommand(ZREVRANGEBYSCORE, new ScoredValueStreamingOutput<K, V>(codec, channel), args);
     }
 
-    public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
-            Limit limit) {
+    public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key,
+            Range<? extends Number> range, Limit limit) {
         notNullKey(key);
         notNullRange(range);
         notNullLimit(limit);
@@ -2760,7 +2772,7 @@ private void notEmptySlots(int[] slots) {
 
     private void addLimit(CommandArgs<K, V> args, Limit limit) {
 
-        if(limit.isLimited()){
+        if (limit.isLimited()) {
             args.add(LIMIT).add(limit.getOffset()).add(limit.getCount());
         }
     }
@@ -2769,11 +2781,12 @@ private String min(Range<? extends Number> range) {
 
         Range.Boundary<? extends Number> lower = range.getLower();
 
-        if(lower.getValue() == null || lower.getValue() instanceof Double && lower.getValue().doubleValue() == Double.NEGATIVE_INFINITY){
+        if (lower.getValue() == null
+                || lower.getValue() instanceof Double && lower.getValue().doubleValue() == Double.NEGATIVE_INFINITY) {
             return "-inf";
         }
 
-        if(!lower.isIncluding()){
+        if (!lower.isIncluding()) {
             return "(" + lower.getValue();
         }
 
@@ -2784,11 +2797,12 @@ private String max(Range<? extends Number> range) {
 
         Range.Boundary<? extends Number> upper = range.getUpper();
 
-        if(upper.getValue() == null || upper.getValue() instanceof Double && upper.getValue().doubleValue() == Double.POSITIVE_INFINITY){
+        if (upper.getValue() == null
+                || upper.getValue() instanceof Double && upper.getValue().doubleValue() == Double.POSITIVE_INFINITY) {
             return "+inf";
         }
 
-        if(!upper.isIncluding()){
+        if (!upper.isIncluding()) {
             return "(" + upper.getValue();
         }
 
@@ -2799,7 +2813,7 @@ private byte[] minValue(Range<? extends V> range) {
 
         Range.Boundary<? extends V> lower = range.getLower();
 
-        if(lower.getValue() == null){
+        if (lower.getValue() == null) {
             return MINUS_BYTES;
         }
 
@@ -2814,7 +2828,7 @@ private byte[] maxValue(Range<? extends V> range) {
 
         Range.Boundary<? extends V> upper = range.getUpper();
 
-        if(upper.getValue() == null){
+        if (upper.getValue() == null) {
             return PLUS_BYTES;
         }
 
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
index 4aebb7a0d5..046b57fb54 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
@@ -631,6 +631,27 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      */
     RedisFuture<List<ScoredValue<V>>> zrevrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<List<V>> zrevrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<List<V>> zrevrangebylex(K key, Range<? extends V> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -1121,7 +1142,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
     @Deprecated
@@ -1132,7 +1153,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      *
      * @param key the key
      * @param range the range
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @since 4.3
      */
     RedisFuture<List<V>> zrangebylex(K key, Range<? extends V> range);
@@ -1145,7 +1166,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
     @Deprecated
@@ -1157,7 +1178,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @since 4.3
      */
     RedisFuture<List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit);
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
index 4e5a31658d..7e9e988890 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
@@ -632,6 +632,27 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      */
     Flux<ScoredValue<V>> zrevrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return V array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Flux<V> zrevrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return V array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Flux<V> zrevrangebylex(K key, Range<? extends V> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -1122,7 +1143,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return V array-reply list of elements in the specified score range.
+     * @return V array-reply list of elements in the specified range.
      * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
     @Deprecated
@@ -1133,7 +1154,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      *
      * @param key the key
      * @param range the range
-     * @return V array-reply list of elements in the specified score range.
+     * @return V array-reply list of elements in the specified range.
      * @since 4.3
      */
     Flux<V> zrangebylex(K key, Range<? extends V> range);
@@ -1146,7 +1167,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return V array-reply list of elements in the specified score range.
+     * @return V array-reply list of elements in the specified range.
      * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
     @Deprecated
@@ -1158,7 +1179,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return V array-reply list of elements in the specified score range.
+     * @return V array-reply list of elements in the specified range.
      * @since 4.3
      */
     Flux<V> zrangebylex(K key, Range<? extends V> range, Limit limit);
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
index 96d966a1a4..b40b2d8dcc 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
@@ -630,6 +630,27 @@ public interface RedisSortedSetCommands<K, V> {
      */
     List<ScoredValue<V>> zrevrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<V> zrevrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<V> zrevrangebylex(K key, Range<? extends V> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -1120,7 +1141,7 @@ public interface RedisSortedSetCommands<K, V> {
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
     @Deprecated
@@ -1131,7 +1152,7 @@ public interface RedisSortedSetCommands<K, V> {
      *
      * @param key the key
      * @param range the range
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @since 4.3
      */
     List<V> zrangebylex(K key, Range<? extends V> range);
@@ -1144,7 +1165,7 @@ public interface RedisSortedSetCommands<K, V> {
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
     @Deprecated
@@ -1156,7 +1177,7 @@ public interface RedisSortedSetCommands<K, V> {
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @since 4.3
      */
     List<V> zrangebylex(K key, Range<? extends V> range, Limit limit);
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java b/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
index b11515a47a..92d5a2ad8e 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
@@ -34,11 +34,9 @@ enum CommandName {
         RANDOMKEY, READWRITE, SCAN, SCARD, SCRIPT, //
         SDIFF, SINTER, SISMEMBER, SMEMBERS, SRANDMEMBER, SSCAN, STRLEN, //
         SUNION, TIME, TTL, TYPE, WAIT, ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE, //
-        ZRANGEBYLEX, ZRANGEBYSCORE, ZRANK, ZREVRANGE, /* ZREVRANGEBYLEX , */ZREVRANGEBYSCORE, ZREVRANK, ZSCAN, ZSCORE, //
+        ZRANGEBYLEX, ZRANGEBYSCORE, ZRANK, ZREVRANGE, ZREVRANGEBYLEX, ZREVRANGEBYSCORE, ZREVRANK, ZSCAN, ZSCORE, //
 
         // Pub/Sub commands are no key-space commands so they are safe to execute on slave nodes
         PUBLISH, PUBSUB, PSUBSCRIBE, PUNSUBSCRIBE, SUBSCRIBE, UNSUBSCRIBE
-
     }
-
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
index 8da750bf81..2d5b1ff749 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
@@ -631,6 +631,27 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      */
     AsyncExecutions<List<ScoredValue<V>>> zrevrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<List<V>> zrevrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<List<V>> zrevrangebylex(K key, Range<? extends V> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -1121,7 +1142,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
     @Deprecated
@@ -1132,7 +1153,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      *
      * @param key the key
      * @param range the range
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @since 4.3
      */
     AsyncExecutions<List<V>> zrangebylex(K key, Range<? extends V> range);
@@ -1145,7 +1166,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
     @Deprecated
@@ -1157,7 +1178,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @since 4.3
      */
     AsyncExecutions<List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit);
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
index 2768ed7098..0fb61752cd 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
@@ -630,6 +630,27 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      */
     Executions<List<ScoredValue<V>>> zrevrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<List<V>> zrevrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<List<V>> zrevrangebylex(K key, Range<? extends V> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -1120,7 +1141,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
     @Deprecated
@@ -1131,7 +1152,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      *
      * @param key the key
      * @param range the range
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @since 4.3
      */
     Executions<List<V>> zrangebylex(K key, Range<? extends V> range);
@@ -1144,7 +1165,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
     @Deprecated
@@ -1156,7 +1177,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @since 4.3
      */
     Executions<List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit);
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java b/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
index 791660ea90..a1ffbe5fc4 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
@@ -34,8 +34,6 @@ enum CommandName {
         /**/RANDOMKEY, READWRITE, SCAN, SCARD, SCRIPT,
         /**/SDIFF, SINTER, SISMEMBER, SMEMBERS, SRANDMEMBER, SSCAN, STRLEN,
         /**/SUNION, TIME, TTL, TYPE, WAIT, ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE,
-        /**/ZRANGEBYLEX, ZRANGEBYSCORE, ZRANK, ZREVRANGE, /* ZREVRANGEBYLEX , */ZREVRANGEBYSCORE, ZREVRANK, ZSCAN, ZSCORE,
-
+        /**/ZRANGEBYLEX, ZRANGEBYSCORE, ZRANK, ZREVRANGE, ZREVRANGEBYLEX, ZREVRANGEBYSCORE, ZREVRANK, ZSCAN, ZSCORE,
     }
-
 }
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandType.java b/src/main/java/com/lambdaworks/redis/protocol/CommandType.java
index 90ffebafc0..77e76f8c94 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandType.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandType.java
@@ -54,7 +54,7 @@ public enum CommandType implements ProtocolKeyword {
 
     // Sorted Set
 
-    ZADD, ZCARD, ZCOUNT, ZINCRBY, ZINTERSTORE, ZRANGE, ZRANGEBYSCORE, ZRANK, ZREM, ZREMRANGEBYRANK, ZREMRANGEBYSCORE, ZREVRANGE, ZREVRANGEBYSCORE, ZREVRANK, ZSCORE, ZUNIONSTORE, ZSCAN, ZLEXCOUNT, ZREMRANGEBYLEX, ZRANGEBYLEX,
+    ZADD, ZCARD, ZCOUNT, ZINCRBY, ZINTERSTORE, ZRANGE, ZRANGEBYSCORE, ZRANK, ZREM, ZREMRANGEBYRANK, ZREMRANGEBYSCORE, ZREVRANGE, ZREVRANGEBYLEX, ZREVRANGEBYSCORE, ZREVRANK, ZSCORE, ZUNIONSTORE, ZSCAN, ZLEXCOUNT, ZREMRANGEBYLEX, ZRANGEBYLEX,
 
     // Scripting
 
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
index 20b571778c..fe674fdcfc 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
@@ -632,6 +632,27 @@ Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Stri
      */
     List<ScoredValue<V>> zrevrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<V> zrevrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @since 4.3
+     */
+    List<V> zrevrangebylex(K key, Range<? extends V> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
      * 
@@ -1124,7 +1145,7 @@ Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, S
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
     @Deprecated
@@ -1135,7 +1156,7 @@ Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, S
      *
      * @param key the key
      * @param range the range
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @since 4.3
      */
     List<V> zrangebylex(K key, Range<? extends V> range);
@@ -1148,7 +1169,7 @@ Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, S
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
      */
     @Deprecated
@@ -1160,7 +1181,7 @@ Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, S
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
      * @since 4.3
      */
     List<V> zrangebylex(K key, Range<? extends V> range, Limit limit);
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java b/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
index bd9f16c5db..2922439042 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
@@ -13,7 +13,7 @@ public class ReadOnlyCommandsTest {
 
     @Test
     public void testCount() throws Exception {
-        assertThat(ReadOnlyCommands.READ_ONLY_COMMANDS).hasSize(71);
+        assertThat(ReadOnlyCommands.READ_ONLY_COMMANDS).hasSize(72);
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
index b17e040050..08f08b53c7 100644
--- a/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
@@ -30,7 +30,7 @@ public void zadd() throws Exception {
         assertThat(redis.zadd(key, 2.0, "b", 3.0, "c")).isEqualTo(2);
         assertThat(redis.zrange(key, 0, -1)).isEqualTo(list("a", "b", "c"));
     }
-    
+
     @Test
     public void zaddScoredValue() throws Exception {
         assertThat(redis.zadd(key, ScoredValue.fromNullable(1.0, "a"))).isEqualTo(1);
@@ -356,6 +356,18 @@ public void zrevrangeWithScoresStreaming() throws Exception {
         assertThat(streamingAdapter.getList()).isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
     }
 
+    @Test
+    public void zrevrangebylex() throws Exception {
+
+        setup100KeyValues(new HashSet<>());
+
+        assertThat(redis.zrevrangebylex(key, Range.unbounded())).hasSize(100);
+        assertThat(redis.zrevrangebylex(key, Range.create("value", "zzz"))).hasSize(100);
+        assertThat(redis.zrevrangebylex(key, Range.from(Boundary.including("value98"), Boundary.including("value99")))).containsSequence("value99", "value98");
+        assertThat(redis.zrevrangebylex(key, Range.from(Boundary.including("value99"), Boundary.unbounded()))).hasSize(1);
+        assertThat(redis.zrevrangebylex(key, Range.from(Boundary.excluding("value99"), Boundary.unbounded()))).hasSize(0);
+    }
+
     @Test
     public void zrevrangebyscore() throws Exception {
 
@@ -640,6 +652,7 @@ public void zrangebylex() throws Exception {
 
         assertThat(redis.zrangebylex(key, Range.unbounded())).hasSize(100);
         assertThat(redis.zrangebylex(key, Range.create("value", "zzz"))).hasSize(100);
+        assertThat(redis.zrangebylex(key, Range.from(Boundary.including("value98"), Boundary.including("value99")))).containsSequence("value98", "value99");
         assertThat(redis.zrangebylex(key, Range.from(Boundary.including("value99"), Boundary.unbounded()))).hasSize(1);
         assertThat(redis.zrangebylex(key, Range.from(Boundary.excluding("value99"), Boundary.unbounded()))).hasSize(0);
     }

From 372ad6814f304c91ab1ba380d8d1da34c9b918cf Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 29 Sep 2016 15:30:41 +0200
Subject: [PATCH 038/808] Polishing

Order sorted set methods alphabetically. Fix typos. Rename API generator entrypoint to GenerateCommandInterfaces.
---
 .../async/RedisSortedSetAsyncCommands.java    | 600 +++++++++---------
 .../RedisSortedSetReactiveCommands.java       | 600 +++++++++---------
 .../api/sync/RedisSortedSetCommands.java      | 600 +++++++++---------
 .../NodeSelectionSortedSetAsyncCommands.java  | 600 +++++++++---------
 .../sync/NodeSelectionSortedSetCommands.java  | 600 +++++++++---------
 .../redis/masterslave/ReadOnlyCommands.java   |  16 +-
 .../redis/api/RedisSortedSetCommands.java     | 600 +++++++++---------
 .../lambdaworks/apigenerator/Constants.java   |   3 +-
 .../apigenerator/CreateAsyncApi.java          |   2 +-
 .../CreateAsyncNodeSelectionClusterApi.java   |   2 +-
 .../apigenerator/CreateSyncApi.java           |   2 +-
 .../CreateSyncNodeSelectionClusterApi.java    |   2 +-
 ...is.java => GenerateCommandInterfaces.java} |   4 +-
 13 files changed, 1817 insertions(+), 1814 deletions(-)
 rename src/test/java/com/lambdaworks/apigenerator/{CreateSyncAsyncRxApis.java => GenerateCommandInterfaces.java} (72%)

diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
index 046b57fb54..5d86c3ec7a 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
@@ -201,9 +201,31 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      */
     RedisFuture<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys);
 
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
+     */
+    @Deprecated
+    RedisFuture<Long> zlexcount(K key, String min, String max);
+
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    RedisFuture<Long> zlexcount(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by index.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -211,9 +233,20 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      */
     RedisFuture<List<V>> zrange(K key, long start, long stop);
 
+    /**
+     * Return a range of members in a sorted set, by index.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    RedisFuture<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members with scores in a sorted set, by index.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -221,9 +254,67 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      */
     RedisFuture<List<ScoredValue<V>>> zrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by index.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    RedisFuture<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    RedisFuture<List<V>> zrangebylex(K key, String min, String max);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @since 4.3
+     */
+    RedisFuture<List<V>> zrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @param offset the offset
+     * @param count the count
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    RedisFuture<List<V>> zrangebylex(K key, String min, String max, long offset, long count);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @since 4.3
+     */
+    RedisFuture<List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -235,7 +326,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -257,7 +348,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -271,7 +362,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -295,181 +386,159 @@ public interface RedisSortedSetAsyncCommands<K, V> {
     RedisFuture<List<V>> zrangebyscore(K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
     @Deprecated
-    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max);
+    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
     @Deprecated
-    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max);
+    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified score range.
      * @since 4.3
      */
-    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
+    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
-    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
+    @Deprecated
+    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
     @Deprecated
-    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
+    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified score range.
      * @since 4.3
      */
-    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
-
-    /**
-     * Return a range of members in a sorted set, by index.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    RedisFuture<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by index.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    RedisFuture<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
+    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
+    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
+     * Return a range of members with score in a sorted set, by score.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return Long count of elements in the specified score range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
 
     /**
-     * Stream over range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
-    @Deprecated
-    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
+    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
+    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
+     * Return a range of members with score in a sorted set, by score.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return Long count of elements in the specified score range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+    RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -482,7 +551,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -506,7 +575,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -521,7 +590,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -548,7 +617,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Determine the index of a member in a sorted set.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
@@ -558,28 +627,50 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Remove one or more members from a sorted set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of members removed from the sorted set, not including non existing members.
      */
     RedisFuture<Long> zrem(K key, V... members);
 
     /**
-     * Remove all members in a sorted set within the given indexes.
-     * 
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
      * @param key the key
-     * @param start the start type: long
-     * @param stop the stop type: long
-     * @return Long integer-reply the number of elements removed.
+     * @param min min score
+     * @param max max score
+     * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    RedisFuture<Long> zremrangebylex(K key, String min, String max);
+
+    /**
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    RedisFuture<Long> zremrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Remove all members in a sorted set within the given indexes.
+     *
+     * @param key the key
+     * @param start the start type: long
+     * @param stop the stop type: long
+     * @return Long integer-reply the number of elements removed.
      */
     RedisFuture<Long> zremrangebyrank(K key, long start, long stop);
 
     /**
      * Remove all members in a sorted set within the given scores.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -591,7 +682,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Remove all members in a sorted set within the given scores.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -613,7 +704,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by index, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -621,9 +712,20 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      */
     RedisFuture<List<V>> zrevrange(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    RedisFuture<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members with scores in a sorted set, by index, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -631,6 +733,17 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      */
     RedisFuture<List<ScoredValue<V>>> zrevrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by index, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    RedisFuture<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
      *
@@ -654,7 +767,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -666,7 +779,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -688,7 +801,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param max max score
      * @param min min score
@@ -702,7 +815,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param max max score
      * @param min min score
@@ -726,182 +839,160 @@ public interface RedisSortedSetAsyncCommands<K, V> {
     RedisFuture<List<V>> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param max max score
      * @param min min score
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
     @Deprecated
-    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min);
+    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
+     * @param max max score
+     * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
     @Deprecated
-    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min);
+    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @since 4.3
      */
-    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
+    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
+     * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
+    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
+     * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
+    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @param limit limit
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     * @since 4.3
-     */
-    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
-
-    /**
-     * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    RedisFuture<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
+     * @param limit the limit
      * @return Long count of elements in the specified range.
+     * @since 4.3
      */
-    RedisFuture<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
      * @param max max score
      * @param min min score
-     * @return Long count of elements in the specified range.
-     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
+    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified range.
-     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
+     * @param min min score
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
+    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return Long count of elements in the specified range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
+     * @param min min score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
+    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
+     * @param min min score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
+    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @param limit the limit
-     * @return Long count of elements in the specified range.
+     * @param limit limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+    RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -914,7 +1005,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -937,7 +1028,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -952,7 +1043,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -979,7 +1070,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Determine the index of a member in a sorted set, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
@@ -987,35 +1078,6 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      */
     RedisFuture<Long> zrevrank(K key, V member);
 
-    /**
-     * Get the score associated with the given member in a sorted set.
-     * 
-     * @param key the key
-     * @param member the member type: value
-     * @return Double bulk-string-reply the score of {@code member} (a double precision floating point number), represented as
-     *         string.
-     */
-    RedisFuture<Double> zscore(K key, V member);
-
-    /**
-     * Add multiple sorted sets and store the resulting sorted set in a new key.
-     *
-     * @param destination destination key
-     * @param keys source keys
-     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    RedisFuture<Long> zunionstore(K destination, K... keys);
-
-    /**
-     * Add multiple sorted sets and store the resulting sorted set in a new key.
-     * 
-     * @param destination the destination
-     * @param storeArgs the storeArgs
-     * @param keys the keys
-     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    RedisFuture<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
-
     /**
      * Incrementally iterate sorted sets elements and associated scores.
      *
@@ -1073,7 +1135,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -1093,93 +1155,31 @@ public interface RedisSortedSetAsyncCommands<K, V> {
     RedisFuture<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
 
     /**
-     * Count the number of members in a sorted set between a given lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements in the specified score range.
-     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
-     */
-    @Deprecated
-    RedisFuture<Long> zlexcount(K key, String min, String max);
-
-    /**
-     * Count the number of members in a sorted set between a given lexicographical range.
-     *
-     * @param key the key
-     * @param range the range
-     * @return Long integer-reply the number of elements in the specified score range.
-     * @since 4.3
-     */
-    RedisFuture<Long> zlexcount(K key, Range<? extends V> range);
-
-    /**
-     * Remove all members in a sorted set between the given lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements removed.
-     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
-     */
-    @Deprecated
-    RedisFuture<Long> zremrangebylex(K key, String min, String max);
-
-    /**
-     * Remove all members in a sorted set between the given lexicographical range.
+     * Get the score associated with the given member in a sorted set.
      *
      * @param key the key
-     * @param range the range
-     * @return Long integer-reply the number of elements removed.
-     * @since 4.3
-     */
-    RedisFuture<Long> zremrangebylex(K key, Range<? extends V> range);
-
-    /**
-     * Return a range of members in a sorted set, by lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     * @param member the member type: value
+     * @return Double bulk-string-reply the score of {@code member} (a double precision floating point number), represented as
+     *         string.
      */
-    @Deprecated
-    RedisFuture<List<V>> zrangebylex(K key, String min, String max);
+    RedisFuture<Double> zscore(K key, V member);
 
     /**
-     * Return a range of members in a sorted set, by lexicographical range.
+     * Add multiple sorted sets and store the resulting sorted set in a new key.
      *
-     * @param key the key
-     * @param range the range
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @since 4.3
-     */
-    RedisFuture<List<V>> zrangebylex(K key, Range<? extends V> range);
-
-    /**
-     * Return a range of members in a sorted set, by lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     * @param destination destination key
+     * @param keys source keys
+     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    @Deprecated
-    RedisFuture<List<V>> zrangebylex(K key, String min, String max, long offset, long count);
+    RedisFuture<Long> zunionstore(K destination, K... keys);
 
     /**
-     * Return a range of members in a sorted set, by lexicographical range.
+     * Add multiple sorted sets and store the resulting sorted set in a new key.
      *
-     * @param key the key
-     * @param range the range
-     * @param limit the limit
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @since 4.3
+     * @param destination the destination
+     * @param storeArgs the storeArgs
+     * @param keys the keys
+     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    RedisFuture<List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit);
+    RedisFuture<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
index 7e9e988890..5867b1a04d 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
@@ -202,9 +202,31 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      */
     Mono<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys);
 
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
+     */
+    @Deprecated
+    Mono<Long> zlexcount(K key, String min, String max);
+
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    Mono<Long> zlexcount(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by index.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -212,9 +234,20 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      */
     Flux<V> zrange(K key, long start, long stop);
 
+    /**
+     * Return a range of members in a sorted set, by index.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    Mono<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members with scores in a sorted set, by index.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -222,9 +255,67 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      */
     Flux<ScoredValue<V>> zrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by index.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    Mono<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @return V array-reply list of elements in the specified range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    Flux<V> zrangebylex(K key, String min, String max);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return V array-reply list of elements in the specified range.
+     * @since 4.3
+     */
+    Flux<V> zrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @param offset the offset
+     * @param count the count
+     * @return V array-reply list of elements in the specified range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    Flux<V> zrangebylex(K key, String min, String max, long offset, long count);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return V array-reply list of elements in the specified range.
+     * @since 4.3
+     */
+    Flux<V> zrangebylex(K key, Range<? extends V> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -236,7 +327,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -258,7 +349,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -272,7 +363,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -296,181 +387,159 @@ public interface RedisSortedSetReactiveCommands<K, V> {
     Flux<V> zrangebyscore(K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
     @Deprecated
-    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max);
+    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
     @Deprecated
-    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max);
+    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified score range.
      * @since 4.3
      */
-    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
+    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
-    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
+    @Deprecated
+    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
     @Deprecated
-    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
+    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified score range.
      * @since 4.3
      */
-    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
-
-    /**
-     * Return a range of members in a sorted set, by index.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    Mono<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by index.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    Mono<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
+     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
+    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
+     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
+    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
+     * Return a range of members with score in a sorted set, by score.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return Long count of elements in the specified score range.
+     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
 
     /**
-     * Stream over range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
+     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
-    @Deprecated
-    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
+    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
+     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
+    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
+     * Return a range of members with score in a sorted set, by score.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return Long count of elements in the specified score range.
+     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+    Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -483,7 +552,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -507,7 +576,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -522,7 +591,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -549,7 +618,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Determine the index of a member in a sorted set.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
@@ -559,28 +628,50 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Remove one or more members from a sorted set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of members removed from the sorted set, not including non existing members.
      */
     Mono<Long> zrem(K key, V... members);
 
     /**
-     * Remove all members in a sorted set within the given indexes.
-     * 
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
      * @param key the key
-     * @param start the start type: long
-     * @param stop the stop type: long
-     * @return Long integer-reply the number of elements removed.
+     * @param min min score
+     * @param max max score
+     * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    Mono<Long> zremrangebylex(K key, String min, String max);
+
+    /**
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    Mono<Long> zremrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Remove all members in a sorted set within the given indexes.
+     *
+     * @param key the key
+     * @param start the start type: long
+     * @param stop the stop type: long
+     * @return Long integer-reply the number of elements removed.
      */
     Mono<Long> zremrangebyrank(K key, long start, long stop);
 
     /**
      * Remove all members in a sorted set within the given scores.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -592,7 +683,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Remove all members in a sorted set within the given scores.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -614,7 +705,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by index, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -622,9 +713,20 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      */
     Flux<V> zrevrange(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    Mono<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members with scores in a sorted set, by index, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -632,6 +734,17 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      */
     Flux<ScoredValue<V>> zrevrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by index, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    Mono<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
      *
@@ -655,7 +768,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -667,7 +780,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -689,7 +802,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param max max score
      * @param min min score
@@ -703,7 +816,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param max max score
      * @param min min score
@@ -727,182 +840,160 @@ public interface RedisSortedSetReactiveCommands<K, V> {
     Flux<V> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param max max score
      * @param min min score
-     * @return V array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
     @Deprecated
-    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min);
+    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
-     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
+     * @param max max score
+     * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
     @Deprecated
-    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min);
+    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @since 4.3
      */
-    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
+    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
+     * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
+    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
+     * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return V array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
+    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @param limit limit
-     * @return V array-reply list of elements in the specified score range.
-     * @since 4.3
-     */
-    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
-
-    /**
-     * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    Mono<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
+     * @param limit the limit
      * @return Long count of elements in the specified range.
+     * @since 4.3
      */
-    Mono<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
      * @param max max score
      * @param min min score
-     * @return Long count of elements in the specified range.
-     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
+     * @return V array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
+    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified range.
-     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
+     * @param min min score
+     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
+    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return Long count of elements in the specified range.
+     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
+     * @param min min score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified range.
+     * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
+    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
+     * @param min min score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified range.
+     * @return V array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
+    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @param limit the limit
-     * @return Long count of elements in the specified range.
+     * @param limit limit
+     * @return V array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+    Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -915,7 +1006,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -938,7 +1029,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -953,7 +1044,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -980,7 +1071,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Determine the index of a member in a sorted set, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
@@ -988,35 +1079,6 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      */
     Mono<Long> zrevrank(K key, V member);
 
-    /**
-     * Get the score associated with the given member in a sorted set.
-     * 
-     * @param key the key
-     * @param member the member type: value
-     * @return Double bulk-string-reply the score of {@code member} (a double precision floating point number), represented as
-     *         string.
-     */
-    Mono<Double> zscore(K key, V member);
-
-    /**
-     * Add multiple sorted sets and store the resulting sorted set in a new key.
-     *
-     * @param destination destination key
-     * @param keys source keys
-     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    Mono<Long> zunionstore(K destination, K... keys);
-
-    /**
-     * Add multiple sorted sets and store the resulting sorted set in a new key.
-     * 
-     * @param destination the destination
-     * @param storeArgs the storeArgs
-     * @param keys the keys
-     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    Mono<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
-
     /**
      * Incrementally iterate sorted sets elements and associated scores.
      *
@@ -1074,7 +1136,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -1094,93 +1156,31 @@ public interface RedisSortedSetReactiveCommands<K, V> {
     Mono<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
 
     /**
-     * Count the number of members in a sorted set between a given lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements in the specified score range.
-     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
-     */
-    @Deprecated
-    Mono<Long> zlexcount(K key, String min, String max);
-
-    /**
-     * Count the number of members in a sorted set between a given lexicographical range.
-     *
-     * @param key the key
-     * @param range the range
-     * @return Long integer-reply the number of elements in the specified score range.
-     * @since 4.3
-     */
-    Mono<Long> zlexcount(K key, Range<? extends V> range);
-
-    /**
-     * Remove all members in a sorted set between the given lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements removed.
-     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
-     */
-    @Deprecated
-    Mono<Long> zremrangebylex(K key, String min, String max);
-
-    /**
-     * Remove all members in a sorted set between the given lexicographical range.
+     * Get the score associated with the given member in a sorted set.
      *
      * @param key the key
-     * @param range the range
-     * @return Long integer-reply the number of elements removed.
-     * @since 4.3
-     */
-    Mono<Long> zremrangebylex(K key, Range<? extends V> range);
-
-    /**
-     * Return a range of members in a sorted set, by lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return V array-reply list of elements in the specified range.
-     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     * @param member the member type: value
+     * @return Double bulk-string-reply the score of {@code member} (a double precision floating point number), represented as
+     *         string.
      */
-    @Deprecated
-    Flux<V> zrangebylex(K key, String min, String max);
+    Mono<Double> zscore(K key, V member);
 
     /**
-     * Return a range of members in a sorted set, by lexicographical range.
+     * Add multiple sorted sets and store the resulting sorted set in a new key.
      *
-     * @param key the key
-     * @param range the range
-     * @return V array-reply list of elements in the specified range.
-     * @since 4.3
-     */
-    Flux<V> zrangebylex(K key, Range<? extends V> range);
-
-    /**
-     * Return a range of members in a sorted set, by lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return V array-reply list of elements in the specified range.
-     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     * @param destination destination key
+     * @param keys source keys
+     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    @Deprecated
-    Flux<V> zrangebylex(K key, String min, String max, long offset, long count);
+    Mono<Long> zunionstore(K destination, K... keys);
 
     /**
-     * Return a range of members in a sorted set, by lexicographical range.
+     * Add multiple sorted sets and store the resulting sorted set in a new key.
      *
-     * @param key the key
-     * @param range the range
-     * @param limit the limit
-     * @return V array-reply list of elements in the specified range.
-     * @since 4.3
+     * @param destination the destination
+     * @param storeArgs the storeArgs
+     * @param keys the keys
+     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    Flux<V> zrangebylex(K key, Range<? extends V> range, Limit limit);
+    Mono<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
index b40b2d8dcc..182926e7a8 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
@@ -200,9 +200,31 @@ public interface RedisSortedSetCommands<K, V> {
      */
     Long zinterstore(K destination, ZStoreArgs storeArgs, K... keys);
 
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
+     */
+    @Deprecated
+    Long zlexcount(K key, String min, String max);
+
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    Long zlexcount(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by index.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -210,9 +232,20 @@ public interface RedisSortedSetCommands<K, V> {
      */
     List<V> zrange(K key, long start, long stop);
 
+    /**
+     * Return a range of members in a sorted set, by index.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    Long zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members with scores in a sorted set, by index.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -220,9 +253,67 @@ public interface RedisSortedSetCommands<K, V> {
      */
     List<ScoredValue<V>> zrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by index.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    Long zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    List<V> zrangebylex(K key, String min, String max);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @since 4.3
+     */
+    List<V> zrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @param offset the offset
+     * @param count the count
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    List<V> zrangebylex(K key, String min, String max, long offset, long count);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @since 4.3
+     */
+    List<V> zrangebylex(K key, Range<? extends V> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -234,7 +325,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -256,7 +347,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -270,7 +361,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -294,181 +385,159 @@ public interface RedisSortedSetCommands<K, V> {
     List<V> zrangebyscore(K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
     @Deprecated
-    List<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max);
+    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
     @Deprecated
-    List<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max);
+    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified score range.
      * @since 4.3
      */
-    List<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
+    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
-    List<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
+    @Deprecated
+    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
     @Deprecated
-    List<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
+    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified score range.
      * @since 4.3
      */
-    List<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
-
-    /**
-     * Return a range of members in a sorted set, by index.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    Long zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by index.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    Long zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
+    List<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
+    List<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
+     * Return a range of members with score in a sorted set, by score.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return Long count of elements in the specified score range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+    List<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
 
     /**
-     * Stream over range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
-    @Deprecated
-    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
+    List<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
+    List<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
+     * Return a range of members with score in a sorted set, by score.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return Long count of elements in the specified score range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+    List<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -481,7 +550,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -505,7 +574,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -520,7 +589,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -547,7 +616,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Determine the index of a member in a sorted set.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
@@ -557,28 +626,50 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Remove one or more members from a sorted set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of members removed from the sorted set, not including non existing members.
      */
     Long zrem(K key, V... members);
 
     /**
-     * Remove all members in a sorted set within the given indexes.
-     * 
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
      * @param key the key
-     * @param start the start type: long
-     * @param stop the stop type: long
-     * @return Long integer-reply the number of elements removed.
+     * @param min min score
+     * @param max max score
+     * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    Long zremrangebylex(K key, String min, String max);
+
+    /**
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    Long zremrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Remove all members in a sorted set within the given indexes.
+     *
+     * @param key the key
+     * @param start the start type: long
+     * @param stop the stop type: long
+     * @return Long integer-reply the number of elements removed.
      */
     Long zremrangebyrank(K key, long start, long stop);
 
     /**
      * Remove all members in a sorted set within the given scores.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -590,7 +681,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Remove all members in a sorted set within the given scores.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -612,7 +703,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by index, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -620,9 +711,20 @@ public interface RedisSortedSetCommands<K, V> {
      */
     List<V> zrevrange(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    Long zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members with scores in a sorted set, by index, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -630,6 +732,17 @@ public interface RedisSortedSetCommands<K, V> {
      */
     List<ScoredValue<V>> zrevrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by index, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    Long zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
      *
@@ -653,7 +766,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -665,7 +778,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -687,7 +800,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param max max score
      * @param min min score
@@ -701,7 +814,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param max max score
      * @param min min score
@@ -725,182 +838,160 @@ public interface RedisSortedSetCommands<K, V> {
     List<V> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param max max score
      * @param min min score
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
     @Deprecated
-    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min);
+    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
+     * @param max max score
+     * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
     @Deprecated
-    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min);
+    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @since 4.3
      */
-    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
+    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
+     * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
+    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
+     * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
+    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @param limit limit
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     * @since 4.3
-     */
-    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
-
-    /**
-     * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    Long zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
+     * @param limit the limit
      * @return Long count of elements in the specified range.
+     * @since 4.3
      */
-    Long zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
      * @param max max score
      * @param min min score
-     * @return Long count of elements in the specified range.
-     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
+    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified range.
-     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
+     * @param min min score
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
+    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return Long count of elements in the specified range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
+     * @param min min score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
+    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
+     * @param min min score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
+    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @param limit the limit
-     * @return Long count of elements in the specified range.
+     * @param limit limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -913,7 +1004,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -936,7 +1027,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -951,7 +1042,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -978,7 +1069,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Determine the index of a member in a sorted set, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
@@ -986,35 +1077,6 @@ public interface RedisSortedSetCommands<K, V> {
      */
     Long zrevrank(K key, V member);
 
-    /**
-     * Get the score associated with the given member in a sorted set.
-     * 
-     * @param key the key
-     * @param member the member type: value
-     * @return Double bulk-string-reply the score of {@code member} (a double precision floating point number), represented as
-     *         string.
-     */
-    Double zscore(K key, V member);
-
-    /**
-     * Add multiple sorted sets and store the resulting sorted set in a new key.
-     *
-     * @param destination destination key
-     * @param keys source keys
-     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    Long zunionstore(K destination, K... keys);
-
-    /**
-     * Add multiple sorted sets and store the resulting sorted set in a new key.
-     * 
-     * @param destination the destination
-     * @param storeArgs the storeArgs
-     * @param keys the keys
-     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    Long zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
-
     /**
      * Incrementally iterate sorted sets elements and associated scores.
      *
@@ -1072,7 +1134,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -1092,93 +1154,31 @@ public interface RedisSortedSetCommands<K, V> {
     StreamScanCursor zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
 
     /**
-     * Count the number of members in a sorted set between a given lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements in the specified score range.
-     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
-     */
-    @Deprecated
-    Long zlexcount(K key, String min, String max);
-
-    /**
-     * Count the number of members in a sorted set between a given lexicographical range.
-     *
-     * @param key the key
-     * @param range the range
-     * @return Long integer-reply the number of elements in the specified score range.
-     * @since 4.3
-     */
-    Long zlexcount(K key, Range<? extends V> range);
-
-    /**
-     * Remove all members in a sorted set between the given lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements removed.
-     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
-     */
-    @Deprecated
-    Long zremrangebylex(K key, String min, String max);
-
-    /**
-     * Remove all members in a sorted set between the given lexicographical range.
+     * Get the score associated with the given member in a sorted set.
      *
      * @param key the key
-     * @param range the range
-     * @return Long integer-reply the number of elements removed.
-     * @since 4.3
-     */
-    Long zremrangebylex(K key, Range<? extends V> range);
-
-    /**
-     * Return a range of members in a sorted set, by lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     * @param member the member type: value
+     * @return Double bulk-string-reply the score of {@code member} (a double precision floating point number), represented as
+     *         string.
      */
-    @Deprecated
-    List<V> zrangebylex(K key, String min, String max);
+    Double zscore(K key, V member);
 
     /**
-     * Return a range of members in a sorted set, by lexicographical range.
+     * Add multiple sorted sets and store the resulting sorted set in a new key.
      *
-     * @param key the key
-     * @param range the range
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @since 4.3
-     */
-    List<V> zrangebylex(K key, Range<? extends V> range);
-
-    /**
-     * Return a range of members in a sorted set, by lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     * @param destination destination key
+     * @param keys source keys
+     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    @Deprecated
-    List<V> zrangebylex(K key, String min, String max, long offset, long count);
+    Long zunionstore(K destination, K... keys);
 
     /**
-     * Return a range of members in a sorted set, by lexicographical range.
+     * Add multiple sorted sets and store the resulting sorted set in a new key.
      *
-     * @param key the key
-     * @param range the range
-     * @param limit the limit
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @since 4.3
+     * @param destination the destination
+     * @param storeArgs the storeArgs
+     * @param keys the keys
+     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    List<V> zrangebylex(K key, Range<? extends V> range, Limit limit);
+    Long zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
index 2d5b1ff749..f3579e7a21 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
@@ -201,9 +201,31 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      */
     AsyncExecutions<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys);
 
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
+     */
+    @Deprecated
+    AsyncExecutions<Long> zlexcount(K key, String min, String max);
+
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    AsyncExecutions<Long> zlexcount(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by index.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -211,9 +233,20 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      */
     AsyncExecutions<List<V>> zrange(K key, long start, long stop);
 
+    /**
+     * Return a range of members in a sorted set, by index.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    AsyncExecutions<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members with scores in a sorted set, by index.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -221,9 +254,67 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      */
     AsyncExecutions<List<ScoredValue<V>>> zrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by index.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    AsyncExecutions<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    AsyncExecutions<List<V>> zrangebylex(K key, String min, String max);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @since 4.3
+     */
+    AsyncExecutions<List<V>> zrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @param offset the offset
+     * @param count the count
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    AsyncExecutions<List<V>> zrangebylex(K key, String min, String max, long offset, long count);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @since 4.3
+     */
+    AsyncExecutions<List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -235,7 +326,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -257,7 +348,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -271,7 +362,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -295,181 +386,159 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
     AsyncExecutions<List<V>> zrangebyscore(K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
     @Deprecated
-    AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max);
+    AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
     @Deprecated
-    AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max);
+    AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified score range.
      * @since 4.3
      */
-    AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
+    AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
-    AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
+    @Deprecated
+    AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
     @Deprecated
-    AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
+    AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified score range.
      * @since 4.3
      */
-    AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
-
-    /**
-     * Return a range of members in a sorted set, by index.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    AsyncExecutions<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by index.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    AsyncExecutions<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+    AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
+    AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
+    AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
+     * Return a range of members with score in a sorted set, by score.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return Long count of elements in the specified score range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+    AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
 
     /**
-     * Stream over range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
-    @Deprecated
-    AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
+    AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
+    AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
+     * Return a range of members with score in a sorted set, by score.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return Long count of elements in the specified score range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    AsyncExecutions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+    AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -482,7 +551,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -506,7 +575,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -521,7 +590,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -548,7 +617,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Determine the index of a member in a sorted set.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
@@ -558,28 +627,50 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Remove one or more members from a sorted set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of members removed from the sorted set, not including non existing members.
      */
     AsyncExecutions<Long> zrem(K key, V... members);
 
     /**
-     * Remove all members in a sorted set within the given indexes.
-     * 
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
      * @param key the key
-     * @param start the start type: long
-     * @param stop the stop type: long
-     * @return Long integer-reply the number of elements removed.
+     * @param min min score
+     * @param max max score
+     * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    AsyncExecutions<Long> zremrangebylex(K key, String min, String max);
+
+    /**
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    AsyncExecutions<Long> zremrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Remove all members in a sorted set within the given indexes.
+     *
+     * @param key the key
+     * @param start the start type: long
+     * @param stop the stop type: long
+     * @return Long integer-reply the number of elements removed.
      */
     AsyncExecutions<Long> zremrangebyrank(K key, long start, long stop);
 
     /**
      * Remove all members in a sorted set within the given scores.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -591,7 +682,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Remove all members in a sorted set within the given scores.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -613,7 +704,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by index, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -621,9 +712,20 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      */
     AsyncExecutions<List<V>> zrevrange(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    AsyncExecutions<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members with scores in a sorted set, by index, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -631,6 +733,17 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      */
     AsyncExecutions<List<ScoredValue<V>>> zrevrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by index, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    AsyncExecutions<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
      *
@@ -654,7 +767,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -666,7 +779,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -688,7 +801,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param max max score
      * @param min min score
@@ -702,7 +815,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param max max score
      * @param min min score
@@ -726,182 +839,160 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
     AsyncExecutions<List<V>> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param max max score
      * @param min min score
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
     @Deprecated
-    AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min);
+    AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
+     * @param max max score
+     * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
     @Deprecated
-    AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min);
+    AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @since 4.3
      */
-    AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
+    AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
+     * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
+    AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
+     * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
+    AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @param limit limit
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     * @since 4.3
-     */
-    AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
-
-    /**
-     * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    AsyncExecutions<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
+     * @param limit the limit
      * @return Long count of elements in the specified range.
+     * @since 4.3
      */
-    AsyncExecutions<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+    AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
      * @param max max score
      * @param min min score
-     * @return Long count of elements in the specified range.
-     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
+    AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified range.
-     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
+     * @param min min score
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
+    AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return Long count of elements in the specified range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+    AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
+     * @param min min score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
+    AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
+     * @param min min score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
+    AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @param limit the limit
-     * @return Long count of elements in the specified range.
+     * @param limit limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    AsyncExecutions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+    AsyncExecutions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -914,7 +1005,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -937,7 +1028,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -952,7 +1043,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -979,7 +1070,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Determine the index of a member in a sorted set, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
@@ -987,35 +1078,6 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      */
     AsyncExecutions<Long> zrevrank(K key, V member);
 
-    /**
-     * Get the score associated with the given member in a sorted set.
-     * 
-     * @param key the key
-     * @param member the member type: value
-     * @return Double bulk-string-reply the score of {@code member} (a double precision floating point number), represented as
-     *         string.
-     */
-    AsyncExecutions<Double> zscore(K key, V member);
-
-    /**
-     * Add multiple sorted sets and store the resulting sorted set in a new key.
-     *
-     * @param destination destination key
-     * @param keys source keys
-     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    AsyncExecutions<Long> zunionstore(K destination, K... keys);
-
-    /**
-     * Add multiple sorted sets and store the resulting sorted set in a new key.
-     * 
-     * @param destination the destination
-     * @param storeArgs the storeArgs
-     * @param keys the keys
-     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    AsyncExecutions<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
-
     /**
      * Incrementally iterate sorted sets elements and associated scores.
      *
@@ -1073,7 +1135,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -1093,93 +1155,31 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
     AsyncExecutions<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
 
     /**
-     * Count the number of members in a sorted set between a given lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements in the specified score range.
-     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
-     */
-    @Deprecated
-    AsyncExecutions<Long> zlexcount(K key, String min, String max);
-
-    /**
-     * Count the number of members in a sorted set between a given lexicographical range.
-     *
-     * @param key the key
-     * @param range the range
-     * @return Long integer-reply the number of elements in the specified score range.
-     * @since 4.3
-     */
-    AsyncExecutions<Long> zlexcount(K key, Range<? extends V> range);
-
-    /**
-     * Remove all members in a sorted set between the given lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements removed.
-     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
-     */
-    @Deprecated
-    AsyncExecutions<Long> zremrangebylex(K key, String min, String max);
-
-    /**
-     * Remove all members in a sorted set between the given lexicographical range.
+     * Get the score associated with the given member in a sorted set.
      *
      * @param key the key
-     * @param range the range
-     * @return Long integer-reply the number of elements removed.
-     * @since 4.3
-     */
-    AsyncExecutions<Long> zremrangebylex(K key, Range<? extends V> range);
-
-    /**
-     * Return a range of members in a sorted set, by lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     * @param member the member type: value
+     * @return Double bulk-string-reply the score of {@code member} (a double precision floating point number), represented as
+     *         string.
      */
-    @Deprecated
-    AsyncExecutions<List<V>> zrangebylex(K key, String min, String max);
+    AsyncExecutions<Double> zscore(K key, V member);
 
     /**
-     * Return a range of members in a sorted set, by lexicographical range.
+     * Add multiple sorted sets and store the resulting sorted set in a new key.
      *
-     * @param key the key
-     * @param range the range
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @since 4.3
-     */
-    AsyncExecutions<List<V>> zrangebylex(K key, Range<? extends V> range);
-
-    /**
-     * Return a range of members in a sorted set, by lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     * @param destination destination key
+     * @param keys source keys
+     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    @Deprecated
-    AsyncExecutions<List<V>> zrangebylex(K key, String min, String max, long offset, long count);
+    AsyncExecutions<Long> zunionstore(K destination, K... keys);
 
     /**
-     * Return a range of members in a sorted set, by lexicographical range.
+     * Add multiple sorted sets and store the resulting sorted set in a new key.
      *
-     * @param key the key
-     * @param range the range
-     * @param limit the limit
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @since 4.3
+     * @param destination the destination
+     * @param storeArgs the storeArgs
+     * @param keys the keys
+     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    AsyncExecutions<List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit);
+    AsyncExecutions<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
index 0fb61752cd..30c15399f2 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
@@ -200,9 +200,31 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      */
     Executions<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys);
 
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
+     */
+    @Deprecated
+    Executions<Long> zlexcount(K key, String min, String max);
+
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    Executions<Long> zlexcount(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by index.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -210,9 +232,20 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      */
     Executions<List<V>> zrange(K key, long start, long stop);
 
+    /**
+     * Return a range of members in a sorted set, by index.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    Executions<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members with scores in a sorted set, by index.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -220,9 +253,67 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      */
     Executions<List<ScoredValue<V>>> zrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by index.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    Executions<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    Executions<List<V>> zrangebylex(K key, String min, String max);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @since 4.3
+     */
+    Executions<List<V>> zrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @param offset the offset
+     * @param count the count
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    Executions<List<V>> zrangebylex(K key, String min, String max, long offset, long count);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @since 4.3
+     */
+    Executions<List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -234,7 +325,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -256,7 +347,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -270,7 +361,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -294,181 +385,159 @@ public interface NodeSelectionSortedSetCommands<K, V> {
     Executions<List<V>> zrangebyscore(K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
     @Deprecated
-    Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max);
+    Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
     @Deprecated
-    Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max);
+    Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified score range.
      * @since 4.3
      */
-    Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
+    Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
-    Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
+    @Deprecated
+    Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
     @Deprecated
-    Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
+    Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified score range.
      * @since 4.3
      */
-    Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
-
-    /**
-     * Return a range of members in a sorted set, by index.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    Executions<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by index.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    Executions<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+    Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
+    Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
+    Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
+     * Return a range of members with score in a sorted set, by score.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return Long count of elements in the specified score range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+    Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
 
     /**
-     * Stream over range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
-    @Deprecated
-    Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
+    Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
+    Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
+     * Return a range of members with score in a sorted set, by score.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return Long count of elements in the specified score range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    Executions<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+    Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -481,7 +550,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -505,7 +574,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -520,7 +589,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -547,7 +616,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Determine the index of a member in a sorted set.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
@@ -557,28 +626,50 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Remove one or more members from a sorted set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of members removed from the sorted set, not including non existing members.
      */
     Executions<Long> zrem(K key, V... members);
 
     /**
-     * Remove all members in a sorted set within the given indexes.
-     * 
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
      * @param key the key
-     * @param start the start type: long
-     * @param stop the stop type: long
-     * @return Long integer-reply the number of elements removed.
+     * @param min min score
+     * @param max max score
+     * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    Executions<Long> zremrangebylex(K key, String min, String max);
+
+    /**
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    Executions<Long> zremrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Remove all members in a sorted set within the given indexes.
+     *
+     * @param key the key
+     * @param start the start type: long
+     * @param stop the stop type: long
+     * @return Long integer-reply the number of elements removed.
      */
     Executions<Long> zremrangebyrank(K key, long start, long stop);
 
     /**
      * Remove all members in a sorted set within the given scores.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -590,7 +681,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Remove all members in a sorted set within the given scores.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -612,7 +703,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by index, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -620,9 +711,20 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      */
     Executions<List<V>> zrevrange(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    Executions<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members with scores in a sorted set, by index, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -630,6 +732,17 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      */
     Executions<List<ScoredValue<V>>> zrevrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by index, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    Executions<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
      *
@@ -653,7 +766,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -665,7 +778,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -687,7 +800,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param max max score
      * @param min min score
@@ -701,7 +814,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param max max score
      * @param min min score
@@ -725,182 +838,160 @@ public interface NodeSelectionSortedSetCommands<K, V> {
     Executions<List<V>> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param max max score
      * @param min min score
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
     @Deprecated
-    Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min);
+    Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
+     * @param max max score
+     * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
     @Deprecated
-    Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min);
+    Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @since 4.3
      */
-    Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
+    Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
+     * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
+    Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
+     * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
+    Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @param limit limit
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     * @since 4.3
-     */
-    Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
-
-    /**
-     * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    Executions<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
+     * @param limit the limit
      * @return Long count of elements in the specified range.
+     * @since 4.3
      */
-    Executions<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+    Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
      * @param max max score
      * @param min min score
-     * @return Long count of elements in the specified range.
-     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
+    Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified range.
-     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
+     * @param min min score
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
+    Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return Long count of elements in the specified range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+    Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
+     * @param min min score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
+    Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
+     * @param min min score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
+    Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @param limit the limit
-     * @return Long count of elements in the specified range.
+     * @param limit limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    Executions<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+    Executions<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -913,7 +1004,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -936,7 +1027,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -951,7 +1042,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -978,7 +1069,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Determine the index of a member in a sorted set, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
@@ -986,35 +1077,6 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      */
     Executions<Long> zrevrank(K key, V member);
 
-    /**
-     * Get the score associated with the given member in a sorted set.
-     * 
-     * @param key the key
-     * @param member the member type: value
-     * @return Double bulk-string-reply the score of {@code member} (a double precision floating point number), represented as
-     *         string.
-     */
-    Executions<Double> zscore(K key, V member);
-
-    /**
-     * Add multiple sorted sets and store the resulting sorted set in a new key.
-     *
-     * @param destination destination key
-     * @param keys source keys
-     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    Executions<Long> zunionstore(K destination, K... keys);
-
-    /**
-     * Add multiple sorted sets and store the resulting sorted set in a new key.
-     * 
-     * @param destination the destination
-     * @param storeArgs the storeArgs
-     * @param keys the keys
-     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    Executions<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
-
     /**
      * Incrementally iterate sorted sets elements and associated scores.
      *
@@ -1072,7 +1134,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -1092,93 +1154,31 @@ public interface NodeSelectionSortedSetCommands<K, V> {
     Executions<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
 
     /**
-     * Count the number of members in a sorted set between a given lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements in the specified score range.
-     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
-     */
-    @Deprecated
-    Executions<Long> zlexcount(K key, String min, String max);
-
-    /**
-     * Count the number of members in a sorted set between a given lexicographical range.
-     *
-     * @param key the key
-     * @param range the range
-     * @return Long integer-reply the number of elements in the specified score range.
-     * @since 4.3
-     */
-    Executions<Long> zlexcount(K key, Range<? extends V> range);
-
-    /**
-     * Remove all members in a sorted set between the given lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements removed.
-     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
-     */
-    @Deprecated
-    Executions<Long> zremrangebylex(K key, String min, String max);
-
-    /**
-     * Remove all members in a sorted set between the given lexicographical range.
+     * Get the score associated with the given member in a sorted set.
      *
      * @param key the key
-     * @param range the range
-     * @return Long integer-reply the number of elements removed.
-     * @since 4.3
-     */
-    Executions<Long> zremrangebylex(K key, Range<? extends V> range);
-
-    /**
-     * Return a range of members in a sorted set, by lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     * @param member the member type: value
+     * @return Double bulk-string-reply the score of {@code member} (a double precision floating point number), represented as
+     *         string.
      */
-    @Deprecated
-    Executions<List<V>> zrangebylex(K key, String min, String max);
+    Executions<Double> zscore(K key, V member);
 
     /**
-     * Return a range of members in a sorted set, by lexicographical range.
+     * Add multiple sorted sets and store the resulting sorted set in a new key.
      *
-     * @param key the key
-     * @param range the range
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @since 4.3
-     */
-    Executions<List<V>> zrangebylex(K key, Range<? extends V> range);
-
-    /**
-     * Return a range of members in a sorted set, by lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     * @param destination destination key
+     * @param keys source keys
+     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    @Deprecated
-    Executions<List<V>> zrangebylex(K key, String min, String max, long offset, long count);
+    Executions<Long> zunionstore(K destination, K... keys);
 
     /**
-     * Return a range of members in a sorted set, by lexicographical range.
+     * Add multiple sorted sets and store the resulting sorted set in a new key.
      *
-     * @param key the key
-     * @param range the range
-     * @param limit the limit
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @since 4.3
+     * @param destination the destination
+     * @param storeArgs the storeArgs
+     * @param keys the keys
+     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    Executions<List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit);
+    Executions<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
 }
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java b/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
index a1ffbe5fc4..c48043db4c 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
@@ -27,13 +27,13 @@ class ReadOnlyCommands {
     }
 
     enum CommandName {
-        ASKING, BITCOUNT, BITPOS, CLIENT, COMMAND, DUMP, ECHO, EVAL, EVALSHA, EXISTS,
-        /**/GEODIST, GEOPOS, GEORADIUS, GEORADIUSBYMEMBER, GEOHASH, GET, GETBIT,
-        /**/GETRANGE, HEXISTS, HGET, HGETALL, HKEYS, HLEN, HMGET, HSCAN, HSTRLEN,
-        /**/HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, MULTI, PFCOUNT, PTTL,
-        /**/RANDOMKEY, READWRITE, SCAN, SCARD, SCRIPT,
-        /**/SDIFF, SINTER, SISMEMBER, SMEMBERS, SRANDMEMBER, SSCAN, STRLEN,
-        /**/SUNION, TIME, TTL, TYPE, WAIT, ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE,
-        /**/ZRANGEBYLEX, ZRANGEBYSCORE, ZRANK, ZREVRANGE, ZREVRANGEBYLEX, ZREVRANGEBYSCORE, ZREVRANK, ZSCAN, ZSCORE,
+        ASKING, BITCOUNT, BITPOS, CLIENT, COMMAND, DUMP, ECHO, EVAL, EVALSHA, EXISTS, //
+        GEODIST, GEOPOS, GEORADIUS, GEORADIUSBYMEMBER, GEOHASH, GET, GETBIT, //
+        GETRANGE, HEXISTS, HGET, HGETALL, HKEYS, HLEN, HMGET, HSCAN, HSTRLEN, //
+        HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, MULTI, PFCOUNT, PTTL, //
+        RANDOMKEY, READWRITE, SCAN, SCARD, SCRIPT, //
+        SDIFF, SINTER, SISMEMBER, SMEMBERS, SRANDMEMBER, SSCAN, STRLEN, //
+        SUNION, TIME, TTL, TYPE, WAIT, ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE, //
+        ZRANGEBYLEX, ZRANGEBYSCORE, ZRANK, ZREVRANGE, ZREVRANGEBYLEX, ZREVRANGEBYSCORE, ZREVRANK, ZSCAN, ZSCORE,
     }
 }
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
index fe674fdcfc..6e26962c72 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
@@ -200,9 +200,31 @@ public interface RedisSortedSetCommands<K, V> {
      */
     Long zinterstore(K destination, ZStoreArgs storeArgs, K... keys);
 
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
+     */
+    @Deprecated
+    Long zlexcount(K key, String min, String max);
+
+    /**
+     * Count the number of members in a sorted set between a given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements in the specified score range.
+     * @since 4.3
+     */
+    Long zlexcount(K key, Range<? extends V> range);
+
     /**
      * Return a range of members in a sorted set, by index.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -210,9 +232,20 @@ public interface RedisSortedSetCommands<K, V> {
      */
     List<V> zrange(K key, long start, long stop);
 
+    /**
+     * Return a range of members in a sorted set, by index.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    Long zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members with scores in a sorted set, by index.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -220,9 +253,67 @@ public interface RedisSortedSetCommands<K, V> {
      */
     List<ScoredValue<V>> zrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by index.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    Long zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    List<V> zrangebylex(K key, String min, String max);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @since 4.3
+     */
+    List<V> zrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param min min score
+     * @param max max score
+     * @param offset the offset
+     * @param count the count
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    List<V> zrangebylex(K key, String min, String max, long offset, long count);
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @param limit the limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified range.
+     * @since 4.3
+     */
+    List<V> zrangebylex(K key, Range<? extends V> range, Limit limit);
+
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -234,7 +325,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -256,7 +347,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -270,7 +361,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Return a range of members in a sorted set, by score.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -294,181 +385,159 @@ public interface RedisSortedSetCommands<K, V> {
     List<V> zrangebyscore(K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
     @Deprecated
-    List<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max);
+    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
      */
     @Deprecated
-    List<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max);
+    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified score range.
      * @since 4.3
      */
-    List<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
+    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
-    List<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
+    @Deprecated
+    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      * 
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
+     * @return Long count of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
     @Deprecated
-    List<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
+    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
     /**
-     * Return a range of members with score in a sorted set, by score.
+     * Stream over a range of members in a sorted set, by score.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified score range.
      * @since 4.3
      */
-    List<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
-
-    /**
-     * Return a range of members in a sorted set, by index.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    Long zrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by index.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    Long zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max);
+    List<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max);
+    List<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
+     * Return a range of members with score in a sorted set, by score.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return Long count of elements in the specified score range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+    List<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range);
 
     /**
-     * Stream over range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
-    @Deprecated
-    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
+    List<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with score in a sorted set, by score.
+     *
      * @param key the key
      * @param min min score
      * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified score range.
-     * @deprecated Use {@link #zrangebyscore(ValueStreamingChannel, java.lang.Object, Range, Limit limit)}
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
+    List<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score.
+     * Return a range of members with score in a sorted set, by score.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
      * @param limit the limit
-     * @return Long count of elements in the specified score range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    Long zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+    List<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -481,7 +550,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -505,7 +574,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -521,7 +590,7 @@ Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, doub
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -549,7 +618,7 @@ Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Stri
 
     /**
      * Determine the index of a member in a sorted set.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
@@ -559,28 +628,50 @@ Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Stri
 
     /**
      * Remove one or more members from a sorted set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of members removed from the sorted set, not including non existing members.
      */
     Long zrem(K key, V... members);
 
     /**
-     * Remove all members in a sorted set within the given indexes.
-     * 
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
      * @param key the key
-     * @param start the start type: long
-     * @param stop the stop type: long
-     * @return Long integer-reply the number of elements removed.
+     * @param min min score
+     * @param max max score
+     * @return Long integer-reply the number of elements removed.
+     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
+     */
+    @Deprecated
+    Long zremrangebylex(K key, String min, String max);
+
+    /**
+     * Remove all members in a sorted set between the given lexicographical range.
+     *
+     * @param key the key
+     * @param range the range
+     * @return Long integer-reply the number of elements removed.
+     * @since 4.3
+     */
+    Long zremrangebylex(K key, Range<? extends V> range);
+
+    /**
+     * Remove all members in a sorted set within the given indexes.
+     *
+     * @param key the key
+     * @param start the start type: long
+     * @param stop the stop type: long
+     * @return Long integer-reply the number of elements removed.
      */
     Long zremrangebyrank(K key, long start, long stop);
 
     /**
      * Remove all members in a sorted set within the given scores.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -592,7 +683,7 @@ Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Stri
 
     /**
      * Remove all members in a sorted set within the given scores.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -614,7 +705,7 @@ Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Stri
 
     /**
      * Return a range of members in a sorted set, by index, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -622,9 +713,20 @@ Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Stri
      */
     List<V> zrevrange(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    Long zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members with scores in a sorted set, by index, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param stop the stop
@@ -632,6 +734,17 @@ Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Stri
      */
     List<ScoredValue<V>> zrevrangeWithScores(K key, long start, long stop);
 
+    /**
+     * Stream over a range of members with scores in a sorted set, by index, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every scored value
+     * @param key the key
+     * @param start the start
+     * @param stop the stop
+     * @return Long count of elements in the specified range.
+     */
+    Long zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+
     /**
      * Return a range of members in a sorted set, by lexicographical range ordered from high to low.
      *
@@ -655,7 +768,7 @@ Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Stri
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -667,7 +780,7 @@ Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Stri
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -689,7 +802,7 @@ Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Stri
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param max max score
      * @param min min score
@@ -703,7 +816,7 @@ Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Stri
 
     /**
      * Return a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param max max score
      * @param min min score
@@ -727,182 +840,160 @@ Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Stri
     List<V> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param max max score
      * @param min min score
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
+     * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
     @Deprecated
-    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min);
+    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
-     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
+     * @param max max score
+     * @return Long count of elements in the specified range.
+     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
      */
     @Deprecated
-    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min);
+    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @since 4.3
      */
-    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
+    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
+     * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
+    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
-     * @param max max score
      * @param min min score
+     * @param max max score
      * @param offset the offset
      * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @return Long count of elements in the specified range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
+    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
 
     /**
-     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
      *
+     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @param limit limit
-     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
-     * @since 4.3
-     */
-    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
-
-    /**
-     * Stream over a range of members in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
-     * @return Long count of elements in the specified range.
-     */
-    Long zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop);
-
-    /**
-     * Stream over a range of members with scores in a sorted set, by index, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every scored value
-     * @param key the key
-     * @param start the start
-     * @param stop the stop
+     * @param limit the limit
      * @return Long count of elements in the specified range.
+     * @since 4.3
      */
-    Long zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop);
+    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
      * @param max max score
      * @param min min score
-     * @return Long count of elements in the specified range.
-     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min);
+    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
-     * @return Long count of elements in the specified range.
-     * @deprecated Use {@link #zrevrangebyscore(java.lang.Object, Range)}
+     * @param min min score
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
+     * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range)}
      */
     @Deprecated
-    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min);
+    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @return Long count of elements in the specified range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range);
+    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
+     * @param min min score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified range.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count);
+    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
-     * 
-     * @param channel streaming channel that receives a call for every value
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
+     *
      * @param key the key
-     * @param min min score
      * @param max max score
+     * @param min min score
      * @param offset the offset
      * @param count the count
-     * @return Long count of elements in the specified range.
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrevrangebyscoreWithScores(java.lang.Object, Range, Limit)}
      */
     @Deprecated
-    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count);
+    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count);
 
     /**
-     * Stream over a range of members in a sorted set, by score, with scores ordered from high to low.
+     * Return a range of members with scores in a sorted set, by score, with scores ordered from high to low.
      *
-     * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param range the range
-     * @param limit the limit
-     * @return Long count of elements in the specified range.
+     * @param limit limit
+     * @return List&lt;V&gt; array-reply list of elements in the specified score range.
      * @since 4.3
      */
-    Long zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit);
+    List<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -915,7 +1006,7 @@ Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Stri
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -938,7 +1029,7 @@ Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Stri
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -954,7 +1045,7 @@ Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, d
 
     /**
      * Stream over a range of members with scores in a sorted set, by score, with scores ordered from high to low.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param min min score
@@ -982,7 +1073,7 @@ Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, S
 
     /**
      * Determine the index of a member in a sorted set, with scores ordered from high to low.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Long integer-reply the rank of {@code member}. If {@code member} does not exist in the sorted set or {@code key}
@@ -990,35 +1081,6 @@ Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, S
      */
     Long zrevrank(K key, V member);
 
-    /**
-     * Get the score associated with the given member in a sorted set.
-     * 
-     * @param key the key
-     * @param member the member type: value
-     * @return Double bulk-string-reply the score of {@code member} (a double precision floating point number), represented as
-     *         string.
-     */
-    Double zscore(K key, V member);
-
-    /**
-     * Add multiple sorted sets and store the resulting sorted set in a new key.
-     *
-     * @param destination destination key
-     * @param keys source keys
-     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    Long zunionstore(K destination, K... keys);
-
-    /**
-     * Add multiple sorted sets and store the resulting sorted set in a new key.
-     * 
-     * @param destination the destination
-     * @param storeArgs the storeArgs
-     * @param keys the keys
-     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
-     */
-    Long zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
-
     /**
      * Incrementally iterate sorted sets elements and associated scores.
      *
@@ -1076,7 +1138,7 @@ Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, S
 
     /**
      * Incrementally iterate sorted sets elements and associated scores.
-     * 
+     *
      * @param channel streaming channel that receives a call for every scored value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -1096,93 +1158,31 @@ Long zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, S
     StreamScanCursor zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor);
 
     /**
-     * Count the number of members in a sorted set between a given lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements in the specified score range.
-     * @deprecated Use {@link #zlexcount(java.lang.Object, Range)}
-     */
-    @Deprecated
-    Long zlexcount(K key, String min, String max);
-
-    /**
-     * Count the number of members in a sorted set between a given lexicographical range.
-     *
-     * @param key the key
-     * @param range the range
-     * @return Long integer-reply the number of elements in the specified score range.
-     * @since 4.3
-     */
-    Long zlexcount(K key, Range<? extends V> range);
-
-    /**
-     * Remove all members in a sorted set between the given lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return Long integer-reply the number of elements removed.
-     * @deprecated Use {@link #zremrangebylex(java.lang.Object, Range)}
-     */
-    @Deprecated
-    Long zremrangebylex(K key, String min, String max);
-
-    /**
-     * Remove all members in a sorted set between the given lexicographical range.
+     * Get the score associated with the given member in a sorted set.
      *
      * @param key the key
-     * @param range the range
-     * @return Long integer-reply the number of elements removed.
-     * @since 4.3
-     */
-    Long zremrangebylex(K key, Range<? extends V> range);
-
-    /**
-     * Return a range of members in a sorted set, by lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     * @param member the member type: value
+     * @return Double bulk-string-reply the score of {@code member} (a double precision floating point number), represented as
+     *         string.
      */
-    @Deprecated
-    List<V> zrangebylex(K key, String min, String max);
+    Double zscore(K key, V member);
 
     /**
-     * Return a range of members in a sorted set, by lexicographical range.
+     * Add multiple sorted sets and store the resulting sorted set in a new key.
      *
-     * @param key the key
-     * @param range the range
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @since 4.3
-     */
-    List<V> zrangebylex(K key, Range<? extends V> range);
-
-    /**
-     * Return a range of members in a sorted set, by lexicographical range.
-     * 
-     * @param key the key
-     * @param min min score
-     * @param max max score
-     * @param offset the offset
-     * @param count the count
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @deprecated Use {@link #zrangebylex(java.lang.Object, Range)}
+     * @param destination destination key
+     * @param keys source keys
+     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    @Deprecated
-    List<V> zrangebylex(K key, String min, String max, long offset, long count);
+    Long zunionstore(K destination, K... keys);
 
     /**
-     * Return a range of members in a sorted set, by lexicographical range.
+     * Add multiple sorted sets and store the resulting sorted set in a new key.
      *
-     * @param key the key
-     * @param range the range
-     * @param limit the limit
-     * @return List&lt;V&gt; array-reply list of elements in the specified range.
-     * @since 4.3
+     * @param destination the destination
+     * @param storeArgs the storeArgs
+     * @param keys the keys
+     * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
      */
-    List<V> zrangebylex(K key, Range<? extends V> range, Limit limit);
+    Long zunionstore(K destination, ZStoreArgs storeArgs, K... keys);
 }
diff --git a/src/test/java/com/lambdaworks/apigenerator/Constants.java b/src/test/java/com/lambdaworks/apigenerator/Constants.java
index 8d61b69e43..3f60c1dceb 100644
--- a/src/test/java/com/lambdaworks/apigenerator/Constants.java
+++ b/src/test/java/com/lambdaworks/apigenerator/Constants.java
@@ -7,7 +7,8 @@
  */
 class Constants {
 
-    public final static String[] TEMPLATE_NAMES = { "RedisSortedSetCommands",
+    public final static String[] TEMPLATE_NAMES = { "RedisHashCommands", "RedisHLLCommands", "RedisKeyCommands",
+            "RedisListCommands", "RedisScriptingCommands", "RedisServerCommands", "RedisSetCommands", "RedisSortedSetCommands",
             "RedisStringCommands", "RedisTransactionalCommands", "RedisSentinelCommands", "BaseRedisCommands",
             "RedisGeoCommands" };
 
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java
index 914aac2530..d102af1d56 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java
@@ -97,7 +97,7 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
     }
 
     /**
-     * Supply addititional imports.
+     * Supply additional imports.
      *
      * @return
      */
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
index 7ae6d2cfca..af4796334e 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
@@ -107,7 +107,7 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
     }
 
     /**
-     * Supply addititional imports.
+     * Supply additional imports.
      *
      * @return
      */
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java
index 9ac6075046..59edd075c9 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java
@@ -98,7 +98,7 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
     }
 
     /**
-     * Supply addititional imports.
+     * Supply additional imports.
      * 
      * @return
      */
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java
index 27e813df11..40e913ed75 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java
@@ -111,7 +111,7 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
     }
 
     /**
-     * Supply addititional imports.
+     * Supply additional imports.
      *
      * @return
      */
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateSyncAsyncRxApis.java b/src/test/java/com/lambdaworks/apigenerator/GenerateCommandInterfaces.java
similarity index 72%
rename from src/test/java/com/lambdaworks/apigenerator/CreateSyncAsyncRxApis.java
rename to src/test/java/com/lambdaworks/apigenerator/GenerateCommandInterfaces.java
index 35ecb176fb..8e40107cfd 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateSyncAsyncRxApis.java
+++ b/src/test/java/com/lambdaworks/apigenerator/GenerateCommandInterfaces.java
@@ -4,11 +4,13 @@
 import org.junit.runners.Suite;
 
 /**
+ * Entrypoint to generate all Redis command interfaces from {@code src/main/templates}.
+ * 
  * @author Mark Paluch
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses({ CreateAsyncApi.class, CreateSyncApi.class, CreateReactiveApi.class,
         CreateAsyncNodeSelectionClusterApi.class, CreateSyncNodeSelectionClusterApi.class })
-public class CreateSyncAsyncRxApis {
+public class GenerateCommandInterfaces {
 
 }

From 4b3f980879087c3b401e3a77b3cb22e2f464bdeb Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 15 Oct 2016 15:09:04 +0200
Subject: [PATCH 039/808] Adopt changed error message in SELECT command

---
 src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java b/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
index a2fa7eab76..5efbefc87e 100644
--- a/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
@@ -122,7 +122,7 @@ public void selectInvalid() throws Exception {
             async.select(1024);
             fail("Selected invalid db index");
         } catch (RedisException e) {
-            assertThat(e.getMessage()).isEqualTo("ERR invalid DB index");
+            assertThat(e.getMessage()).startsWith("ERR");
             StatefulRedisConnection<String, String> statefulRedisCommands = async.getStatefulConnection();
             assertThat(ReflectionTestUtils.getField(statefulRedisCommands, "db")).isEqualTo(0);
         } finally {

From be21fb51c682f52bacb93e0a05c8e482ec87c107 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 18 Oct 2016 10:40:41 +0200
Subject: [PATCH 040/808] Fix RedisAdvancedClusterAsyncCommandsImpl.msetnx
 return value #376

MSETNX on RedisAdvancedClusterAsyncCommandsImpl returns now only true if all distributed MSETNX operations returned true. MSETNX has still a caveat when run on multiple cluster nodes:
MSETNX executed on a single node with a mixed set of existing and non-existing keys will not set the non-existing keys if a key of the operation already exists. That's different with the MSETNX cluster operation. It can't guarantee atomicity so some keys might get set on one node while another node does not set any keys at all.
---
 ...RedisAdvancedClusterAsyncCommandsImpl.java |  7 ++---
 ...isAdvancedClusterReactiveCommandsImpl.java |  2 +-
 .../cluster/AdvancedClusterClientTest.java    | 26 ++++++++++---------
 .../cluster/AdvancedClusterReactiveTest.java  | 26 ++++++++++++++-----
 .../commands/StringClusterCommandTest.java    |  3 ++-
 .../StringClusterReactiveCommandTest.java     |  3 ++-
 6 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index 39882bf075..8df797e054 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -225,14 +225,15 @@ public RedisFuture<Boolean> msetnx(Map<K, V> map) {
         }
 
         return new PipelinedRedisFuture<>(executions, objectPipelinedRedisFuture -> {
+            
             for (RedisFuture<Boolean> listRedisFuture : executions.values()) {
                 Boolean b = MultiNodeExecution.execute(() -> listRedisFuture.get());
-                if (b != null && b) {
-                    return true;
+                if (b == null ||  !b) {
+                    return false;
                 }
             }
 
-            return false;
+            return !executions.isEmpty();
         });
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index 985812a43a..be4b0f2068 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -197,7 +197,7 @@ public Mono<Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K> keys)
     public Mono<Boolean> msetnx(Map<K, V> map) {
 
         return pipeliningWithMap(map, kvMap -> RedisAdvancedClusterReactiveCommandsImpl.super.msetnx(kvMap).flux(),
-                booleanFlux -> booleanFlux).reduce((accu, next) -> accu || next);
+                booleanFlux -> booleanFlux).reduce((accu, next) -> accu && next);
     }
 
     @Override
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
index 341be73b36..fac9504b05 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
@@ -149,23 +149,16 @@ public void msetCrossSlot() throws Exception {
         }
     }
 
-    protected Map<String, String> prepareMset() {
-        Map<String, String> mset = new HashMap<>();
-        for (char c = 'a'; c < 'z'; c++) {
-            String key = new String(new char[] { c, c, c });
-            mset.put(key, "value-" + key);
-        }
-        return mset;
-    }
-
     @Test
     public void msetnxCrossSlot() throws Exception {
 
         Map<String, String> mset = prepareMset();
 
-        RedisFuture<Boolean> result = commands.msetnx(mset);
-
-        assertThat(result.get()).isTrue();
+        String key = mset.keySet().iterator().next();
+        Map<String, String> submap = Collections.singletonMap(key, mset.get(key));
+        
+        assertThat(commands.msetnx(submap).get()).isTrue();
+        assertThat(commands.msetnx(mset).get()).isFalse();
 
         for (String mykey : mset.keySet()) {
             String s1 = commands.get(mykey).get();
@@ -585,5 +578,14 @@ private void writeKeysToTwoNodes() {
         syncCommands.set(KEY_ON_NODE_1, value);
         syncCommands.set(KEY_ON_NODE_2, value);
     }
+    
+    protected Map<String, String> prepareMset() {
+        Map<String, String> mset = new HashMap<>();
+        for (char c = 'a'; c < 'z'; c++) {
+            String key = new String(new char[] { c, c, c });
+            mset.put(key, "value-" + key);
+        }
+        return mset;
+    }
 
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
index 34b248f439..57115d04d2 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
@@ -3,10 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
@@ -77,11 +74,17 @@ public void msetCrossSlot() throws Exception {
     @Test
     public void msetnxCrossSlot() throws Exception {
 
-        assertThat(block(commands.msetnx(RandomKeys.MAP))).isTrue();
+        Map<String, String> mset = prepareMset();
 
-        for (String mykey : RandomKeys.KEYS) {
+        String key = mset.keySet().iterator().next();
+        Map<String, String> submap = Collections.singletonMap(key, mset.get(key));
+
+        assertThat(block(commands.msetnx(submap))).isTrue();
+        assertThat(block(commands.msetnx(mset))).isFalse();
+
+        for (String mykey : mset.keySet()) {
             String s1 = syncCommands.get(mykey);
-            assertThat(s1).isEqualTo(RandomKeys.MAP.get(mykey));
+            assertThat(s1).isEqualTo(mset.get(mykey));
         }
     }
 
@@ -365,4 +368,13 @@ private void writeKeysToTwoNodes() {
         syncCommands.set(KEY_ON_NODE_1, value);
         syncCommands.set(KEY_ON_NODE_2, value);
     }
+    
+    protected Map<String, String> prepareMset() {
+        Map<String, String> mset = new HashMap<>();
+        for (char c = 'a'; c < 'z'; c++) {
+            String key = new String(new char[] { c, c, c });
+            mset.put(key, "value-" + key);
+        }
+        return mset;
+    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
index 3739ed8a87..1c89ef9cc7 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
@@ -56,8 +56,9 @@ public void msetnx() throws Exception {
         Map<String, String> map = new LinkedHashMap<>();
         map.put("one", "1");
         map.put("two", "2");
-        assertThat(redis.msetnx(map)).isTrue();
+        assertThat(redis.msetnx(map)).isFalse();
         redis.del("one");
+        redis.del("two"); // probably set on a different node
         assertThat(redis.msetnx(map)).isTrue();
         assertThat(redis.get("two")).isEqualTo("2");
     }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java
index e44abe0626..9624658558 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java
@@ -59,8 +59,9 @@ public void msetnx() throws Exception {
         Map<String, String> map = new LinkedHashMap<>();
         map.put("one", "1");
         map.put("two", "2");
-        assertThat(redis.msetnx(map)).isTrue();
+        assertThat(redis.msetnx(map)).isFalse();
         redis.del("one");
+        redis.del("two"); // probably set on a different node
         assertThat(redis.msetnx(map)).isTrue();
         assertThat(redis.get("two")).isEqualTo("2");
     }

From d8bac18ce8e1ef50ff85e15665936bcb4f75f982 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 21 Oct 2016 11:58:20 +0200
Subject: [PATCH 041/808] Propagate array sizes in MultiOutput #380

MultiOutput now propagates the array size of the nested responses. The very first count indicates the overall response size and is filtered from child outputs. This also fixes a subsequent NPE caused by the missing array beggining indication.
---
 .../lambdaworks/redis/output/MultiOutput.java |  12 +-
 .../transactional/BitTxCommandTest.java       |  16 +++
 .../transactional/GeoTxCommandTest.java       |  57 ++++++++++
 .../transactional/HLLTxCommandTest.java       |  15 +++
 .../transactional/HashTxCommandTest.java      |  15 +++
 .../transactional/KeyTxCommandTest.java       |  22 ++++
 .../transactional/ListTxCommandTest.java      |  15 +++
 .../transactional/SetTxCommandTest.java       |  16 +++
 .../transactional/SortTxCommandTest.java      |  15 +++
 .../transactional/SortedSetTxCommandTest.java |  15 +++
 .../transactional/StringTxCommandTest.java    |  15 +++
 .../TxSyncInvocationHandler.java              | 104 ++++++++++++++++++
 12 files changed, 309 insertions(+), 8 deletions(-)
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/transactional/BitTxCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/transactional/GeoTxCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/transactional/HLLTxCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/transactional/HashTxCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/transactional/KeyTxCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/transactional/ListTxCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/transactional/SetTxCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/transactional/SortTxCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/transactional/SortedSetTxCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/transactional/StringTxCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/transactional/TxSyncInvocationHandler.java

diff --git a/src/main/java/com/lambdaworks/redis/output/MultiOutput.java b/src/main/java/com/lambdaworks/redis/output/MultiOutput.java
index 77aec87804..728005da56 100644
--- a/src/main/java/com/lambdaworks/redis/output/MultiOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/MultiOutput.java
@@ -62,16 +62,12 @@ public void set(ByteBuffer bytes) {
     public void multi(int count) {
 
         if (rolledBack == null) {
-            if (count == -1) {
-                rolledBack = true;
-            } else {
-                rolledBack = false;
+            rolledBack = count == -1;
+        } else {
+            if (!queue.isEmpty()) {
+                queue.peek().getOutput().multi(count);
             }
         }
-
-        if (count == -1 && !queue.isEmpty()) {
-            queue.peek().getOutput().multi(count);
-        }
     }
 
     @Override
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/BitTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/BitTxCommandTest.java
new file mode 100644
index 0000000000..23a9df92f5
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/BitTxCommandTest.java
@@ -0,0 +1,16 @@
+package com.lambdaworks.redis.commands.transactional;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.BitCommandTest;
+
+/**
+ * @author Mark Paluch
+ */
+public class BitTxCommandTest extends BitCommandTest {
+
+    @Override
+    protected RedisCommands<String, String> connect() {
+        bitstring = TxSyncInvocationHandler.sync(client.connect(new BitStringCodec()));
+        return TxSyncInvocationHandler.sync(client.connect());
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/GeoTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/GeoTxCommandTest.java
new file mode 100644
index 0000000000..26462c321d
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/GeoTxCommandTest.java
@@ -0,0 +1,57 @@
+package com.lambdaworks.redis.commands.transactional;
+
+import org.junit.Ignore;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.GeoCommandTest;
+
+/**
+ * @author Mark Paluch
+ */
+public class GeoTxCommandTest extends GeoCommandTest {
+
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return TxSyncInvocationHandler.sync(client.connect());
+    }
+
+    @Ignore
+    @Override
+    public void georadiusbymemberWithArgsAndTransaction() throws Exception {
+    }
+
+    @Ignore
+    @Override
+    public void geoaddWithTransaction() throws Exception {
+    }
+
+    @Ignore
+    @Override
+    public void geoaddMultiWithTransaction() throws Exception {
+    }
+
+    @Ignore
+    @Override
+    public void geoposWithTransaction() throws Exception {
+    }
+
+    @Ignore
+    @Override
+    public void georadiusWithArgsAndTransaction() throws Exception {
+    }
+
+    @Ignore
+    @Override
+    public void georadiusWithTransaction() throws Exception {
+    }
+
+    @Ignore
+    @Override
+    public void geodistWithTransaction() throws Exception {
+    }
+
+    @Ignore
+    @Override
+    public void geohashWithTransaction() throws Exception {
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/HLLTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/HLLTxCommandTest.java
new file mode 100644
index 0000000000..2ea20437c9
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/HLLTxCommandTest.java
@@ -0,0 +1,15 @@
+package com.lambdaworks.redis.commands.transactional;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.HLLCommandTest;
+
+/**
+ * @author Mark Paluch
+ */
+public class HLLTxCommandTest extends HLLCommandTest {
+
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return TxSyncInvocationHandler.sync(client.connect());
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/HashTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/HashTxCommandTest.java
new file mode 100644
index 0000000000..b7759cd74b
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/HashTxCommandTest.java
@@ -0,0 +1,15 @@
+package com.lambdaworks.redis.commands.transactional;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.HashCommandTest;
+
+/**
+ * @author Mark Paluch
+ */
+public class HashTxCommandTest extends HashCommandTest {
+
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return TxSyncInvocationHandler.sync(client.connect());
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/KeyTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/KeyTxCommandTest.java
new file mode 100644
index 0000000000..0ce7887367
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/KeyTxCommandTest.java
@@ -0,0 +1,22 @@
+package com.lambdaworks.redis.commands.transactional;
+
+import org.junit.Ignore;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.KeyCommandTest;
+
+/**
+ * @author Mark Paluch
+ */
+public class KeyTxCommandTest extends KeyCommandTest {
+
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return TxSyncInvocationHandler.sync(client.connect());
+    }
+
+    @Ignore
+    @Override
+    public void move() throws Exception {
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/ListTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/ListTxCommandTest.java
new file mode 100644
index 0000000000..1019e34e9f
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/ListTxCommandTest.java
@@ -0,0 +1,15 @@
+package com.lambdaworks.redis.commands.transactional;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.ListCommandTest;
+
+/**
+ * @author Mark Paluch
+ */
+public class ListTxCommandTest extends ListCommandTest {
+
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return TxSyncInvocationHandler.sync(client.connect());
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/SetTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/SetTxCommandTest.java
new file mode 100644
index 0000000000..96c01706dc
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/SetTxCommandTest.java
@@ -0,0 +1,16 @@
+package com.lambdaworks.redis.commands.transactional;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.SetCommandTest;
+
+/**
+ * @author Mark Paluch
+ */
+public class SetTxCommandTest extends SetCommandTest {
+
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return TxSyncInvocationHandler.sync(client.connect());
+    }
+
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/SortTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/SortTxCommandTest.java
new file mode 100644
index 0000000000..eaf5bafa07
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/SortTxCommandTest.java
@@ -0,0 +1,15 @@
+package com.lambdaworks.redis.commands.transactional;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.SortCommandTest;
+
+/**
+ * @author Mark Paluch
+ */
+public class SortTxCommandTest extends SortCommandTest {
+
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return TxSyncInvocationHandler.sync(client.connect());
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/SortedSetTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/SortedSetTxCommandTest.java
new file mode 100644
index 0000000000..5d6f39970d
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/SortedSetTxCommandTest.java
@@ -0,0 +1,15 @@
+package com.lambdaworks.redis.commands.transactional;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.SortedSetCommandTest;
+
+/**
+ * @author Mark Paluch
+ */
+public class SortedSetTxCommandTest extends SortedSetCommandTest {
+
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return TxSyncInvocationHandler.sync(client.connect());
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/StringTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/StringTxCommandTest.java
new file mode 100644
index 0000000000..41d4ff15bb
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/StringTxCommandTest.java
@@ -0,0 +1,15 @@
+package com.lambdaworks.redis.commands.transactional;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.StringCommandTest;
+
+/**
+ * @author Mark Paluch
+ */
+public class StringTxCommandTest extends StringCommandTest {
+
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return TxSyncInvocationHandler.sync(client.connect());
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/TxSyncInvocationHandler.java b/src/test/java/com/lambdaworks/redis/commands/transactional/TxSyncInvocationHandler.java
new file mode 100644
index 0000000000..90f3a3ee24
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/TxSyncInvocationHandler.java
@@ -0,0 +1,104 @@
+package com.lambdaworks.redis.commands.transactional;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.List;
+
+import com.lambdaworks.redis.TransactionResult;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.internal.AbstractInvocationHandler;
+
+/**
+ * Invocation handler for testing purposes that wraps each call into a transaction.
+ * 
+ * @param <K>
+ * @param <V>
+ */
+public class TxSyncInvocationHandler<K, V> extends AbstractInvocationHandler {
+
+    private final Object api;
+    private final Method multi;
+    private final Method discard;
+    private final Method exec;
+    private final Method ping;
+
+    public TxSyncInvocationHandler(Object api) throws Exception {
+
+        this.api = api;
+        this.multi = api.getClass().getMethod("multi");
+        this.exec = api.getClass().getMethod("exec");
+        this.discard = api.getClass().getMethod("discard");
+        this.ping = api.getClass().getMethod("ping");
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
+
+        try {
+
+            if (method.getName().equals("exec") || method.getName().equals("multi")) {
+                throw new IllegalStateException("Cannot execute transaction commands over this transactional wrapper");
+            }
+
+            Method targetMethod = api.getClass().getMethod(method.getName(), method.getParameterTypes());
+
+            if (!method.getName().equals("close") && !method.getName().equals("getStatefulConnection")) {
+
+                multi.invoke(api);
+                ping.invoke(api);
+
+                targetMethod.invoke(api, args);
+
+                Object result = exec.invoke(api);
+
+                if (result == null || !(result instanceof TransactionResult)) {
+                    return result;
+                }
+
+                TransactionResult txResult = (TransactionResult) result;
+
+                if (txResult.size() > 1) {
+
+                    result = txResult.get(1);
+                    if (result instanceof Exception) {
+                        throw (Exception) result;
+                    }
+
+                    return result;
+                }
+
+                return null;
+            }
+
+            return targetMethod.invoke(api, args);
+
+        } catch (InvocationTargetException e) {
+            try {
+                discard.invoke(api);
+            } catch (Exception e1) {
+            }
+            throw e.getTargetException();
+        }
+    }
+
+    /**
+     * Create a transactional wrapper proxy for {@link RedisCommands}.
+     * 
+     * @param connection the connection
+     * @return the wrapper proxy.
+     */
+    @SuppressWarnings("unchecked")
+    public static <K, V> RedisCommands<K, V> sync(StatefulRedisConnection<K, V> connection) {
+
+        try {
+            TxSyncInvocationHandler<K, V> handler = new TxSyncInvocationHandler<>(connection.sync());
+            return (RedisCommands<K, V>) Proxy.newProxyInstance(handler.getClass().getClassLoader(),
+                    new Class<?>[] { RedisCommands.class }, handler);
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+    }
+}
\ No newline at end of file

From b8eacfd5b190064c64eb68141cbb052de940195f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 21 Oct 2016 12:13:20 +0200
Subject: [PATCH 042/808] Polishing

Improve JavaDoc and formatting.
---
 src/main/java/com/lambdaworks/redis/Range.java   | 16 +++++++++++-----
 .../redis/resource/DefaultClientResources.java   |  4 ++--
 .../reactive/BitReactiveCommandTest.java         |  2 +-
 .../reactive/CustomReactiveCommandTest.java      |  3 +--
 .../reactive/GeoReactiveCommandTest.java         |  3 +++
 .../reactive/HLLReactiveCommandTest.java         |  3 +++
 .../reactive/HashReactiveCommandTest.java        |  4 +++-
 .../reactive/KeyReactiveCommandTest.java         |  4 ++++
 .../reactive/ListReactiveCommandTest.java        |  4 ++++
 .../reactive/NumericReactiveCommandTest.java     |  4 ++++
 .../reactive/ScriptingReactiveCommandTest.java   |  4 +++-
 .../reactive/ServerReactiveCommandTest.java      |  5 ++++-
 .../reactive/SetReactiveCommandTest.java         |  4 +++-
 .../reactive/SortReactiveCommandTest.java        |  4 ++++
 .../reactive/SortedSetReactiveCommandTest.java   |  4 ++++
 .../reactive/StringReactiveCommandTest.java      |  9 +++++++--
 .../reactive/TransactionReactiveCommandTest.java |  5 ++++-
 17 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/Range.java b/src/main/java/com/lambdaworks/redis/Range.java
index 98a416f0a5..05173a0a42 100644
--- a/src/main/java/com/lambdaworks/redis/Range.java
+++ b/src/main/java/com/lambdaworks/redis/Range.java
@@ -25,7 +25,10 @@ private Range(Boundary<T> lower, Boundary<T> upper) {
     /**
      * Create a new range from {@code lower} and {@code upper} boundary values. Both values are included (greater than or equals
      * and less than or equals).
-     * 
+     *
+     * @param lower lower boundary, must not be {@literal null}.
+     * @param upper upper boundary, must not be {@literal null}.
+     * @param <T> value type
      * @return new {@link Range}
      */
     public static <T> Range<T> create(T lower, T upper) {
@@ -37,6 +40,7 @@ public static <T> Range<T> create(T lower, T upper) {
      * 
      * @param lower lower boundary, must not be {@literal null}.
      * @param upper upper boundary, must not be {@literal null}.
+     * @param <T> value type.
      * @return new {@link Range}
      */
     public static <T> Range<T> from(Boundary<T> lower, Boundary<T> upper) {
@@ -44,6 +48,7 @@ public static <T> Range<T> from(Boundary<T> lower, Boundary<T> upper) {
     }
 
     /**
+     * @param <T> value type.
      * @return new {@link Range} with {@code lower} and {@code upper} set to {@link Boundary#unbounded()}.
      */
     public static <T> Range<T> unbounded() {
@@ -56,7 +61,7 @@ public static <T> Range<T> unbounded() {
      * @param lower the lower boundary value.
      * @return {@code this} {@link Range} with {@code lower} applied.
      */
-    public Range gte(T lower) {
+    public Range<T> gte(T lower) {
 
         this.lower = Boundary.including(lower);
         return this;
@@ -68,7 +73,7 @@ public Range gte(T lower) {
      * @param lower the lower boundary value.
      * @return {@code this} {@link Range} with {@code lower} applied.
      */
-    public Range gt(T lower) {
+    public Range<T> gt(T lower) {
 
         this.lower = Boundary.excluding(lower);
         return this;
@@ -139,6 +144,7 @@ private Boundary(T value, boolean including) {
          * Creates an unbounded (infinite) boundary that marks the beginning/end of the range.
          * 
          * @return the unbounded boundary.
+         * @param <T> inferred type.
          */
         @SuppressWarnings("unchecked")
         public static <T> Boundary<T> unbounded() {
@@ -150,7 +156,7 @@ public static <T> Boundary<T> unbounded() {
          * equals, less or equals. but not Greater or equal, less or equal to {@code value}.
          * 
          * @param value must not be {@literal null}.
-         * @param <T> value type
+         * @param <T> value type.
          * @return the {@link Boundary}.
          */
         public static <T> Boundary<T> including(T value) {
@@ -165,7 +171,7 @@ public static <T> Boundary<T> including(T value) {
          * to {@code value} but not greater or equal, less or equal.
          *
          * @param value must not be {@literal null}.
-         * @param <T> value type
+         * @param <T> value type.
          * @return the {@link Boundary}.
          */
         public static <T> Boundary<T> excluding(T value) {
diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
index 544f4aa41a..4a63e18955 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
@@ -330,8 +330,8 @@ public Builder reconnectDelay(Delay reconnectDelay) {
         }
 
         /**
-         * Sets the stateful reconnect {@link Supplier<Delay>} to delay reconnect attempts. Defaults to binary exponential delay capped at
-         * {@literal 30 SECONDS}.
+         * Sets the stateful reconnect {@link Supplier} to delay reconnect attempts. Defaults to binary exponential delay capped
+         * at {@literal 30 SECONDS}.
          *
          * @param reconnectDelay the reconnect delay, must not be {@literal null}.
          * @return this
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
index 8a17a22feb..9bf704072d 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
@@ -8,10 +8,10 @@
  * @author Mark Paluch
  */
 public class BitReactiveCommandTest extends BitCommandTest {
+
     @Override
     protected RedisCommands<String, String> connect() {
         bitstring = ReactiveSyncInvocationHandler.sync(client.connect(new BitStringCodec()));
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
-
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
index 6ec73e14b2..43ca857766 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
@@ -1,6 +1,5 @@
 package com.lambdaworks.redis.commands.reactive;
 
-import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.Test;
 
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
@@ -10,6 +9,7 @@
 import com.lambdaworks.redis.output.ValueOutput;
 import com.lambdaworks.redis.protocol.CommandArgs;
 import com.lambdaworks.redis.protocol.CommandType;
+import com.lambdaworks.redis.reactive.TestSubscriber;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
 import reactor.core.publisher.Flux;
@@ -49,5 +49,4 @@ public void dispatchList() throws Exception {
         TestSubscriber<String> testSubscriber = TestSubscriber.subscribe(flux);
         testSubscriber.awaitAndAssertNextValues("a", "b", "c").assertComplete().assertNoError();
     }
-
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
index c6f351ea4a..16ac5a0f90 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
@@ -15,6 +15,9 @@
 import com.lambdaworks.redis.commands.GeoCommandTest;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
+/**
+ * @author Mark Paluch
+ */
 public class GeoReactiveCommandTest extends GeoCommandTest {
 
     @Override
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java
index cb54b23aee..47ce5648c4 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java
@@ -4,6 +4,9 @@
 import com.lambdaworks.redis.commands.HLLCommandTest;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
+/**
+ * @author Mark Paluch
+ */
 public class HLLReactiveCommandTest extends HLLCommandTest {
 
     @Override
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java
index 492f7cf1b8..6273435d9f 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java
@@ -4,11 +4,13 @@
 import com.lambdaworks.redis.commands.HashCommandTest;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
+/**
+ * @author Mark Paluch
+ */
 public class HashReactiveCommandTest extends HashCommandTest {
 
     @Override
     protected RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
-
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java
index 5258ccc205..4e6e825b4c 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java
@@ -4,7 +4,11 @@
 import com.lambdaworks.redis.commands.KeyCommandTest;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
+/**
+ * @author Mark Paluch
+ */
 public class KeyReactiveCommandTest extends KeyCommandTest {
+
     @Override
     protected RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java
index 08aace213c..89a3b8fc28 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java
@@ -4,7 +4,11 @@
 import com.lambdaworks.redis.commands.ListCommandTest;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
+/**
+ * @author Mark Paluch
+ */
 public class ListReactiveCommandTest extends ListCommandTest {
+
     @Override
     protected RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java
index 93b4f43c7f..3da291297d 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java
@@ -4,7 +4,11 @@
 import com.lambdaworks.redis.commands.NumericCommandTest;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
+/**
+ * @author Mark Paluch
+ */
 public class NumericReactiveCommandTest extends NumericCommandTest {
+
     @Override
     protected RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java
index 92546430af..fe4f8a6d95 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java
@@ -4,9 +4,11 @@
 import com.lambdaworks.redis.commands.ScriptingCommandTest;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
+/**
+ * @author Mark Paluch
+ */
 public class ScriptingReactiveCommandTest extends ScriptingCommandTest {
 
-
     @Override
     protected RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java
index 150d40a2b6..b8432a2dec 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java
@@ -2,14 +2,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.ServerCommandTest;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
+/**
+ * @author Mark Paluch
+ */
 public class ServerReactiveCommandTest extends ServerCommandTest {
 
     private RedisReactiveCommands<String, String> reactive;
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java
index 5b588e81f7..9c163bdbf4 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java
@@ -4,11 +4,13 @@
 import com.lambdaworks.redis.commands.SetCommandTest;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
+/**
+ * @author Mark Paluch
+ */
 public class SetReactiveCommandTest extends SetCommandTest {
 
     @Override
     protected RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
-
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java
index 87127a1f49..41ccaaa8e8 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java
@@ -4,7 +4,11 @@
 import com.lambdaworks.redis.commands.SortCommandTest;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
+/**
+ * @author Mark Paluch
+ */
 public class SortReactiveCommandTest extends SortCommandTest {
+
     @Override
     protected RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java
index 68b190e01a..7f2d9468c6 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java
@@ -4,7 +4,11 @@
 import com.lambdaworks.redis.commands.SortedSetCommandTest;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
+/**
+ * @author Mark Paluch
+ */
 public class SortedSetReactiveCommandTest extends SortedSetCommandTest {
+
     @Override
     protected RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
index e3c69eed09..a0ebaa15f8 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
@@ -2,16 +2,21 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 import org.junit.Test;
 
+import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.StringCommandTest;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+
 import reactor.core.publisher.Flux;
 
+/**
+ * @author Mark Paluch
+ */
 public class StringReactiveCommandTest extends StringCommandTest {
+
     @Override
     protected RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
index 7760a6e294..605b3c6b41 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
@@ -4,7 +4,6 @@
 
 import java.util.List;
 
-import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -17,11 +16,15 @@
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.TransactionCommandTest;
+import com.lambdaworks.redis.reactive.TestSubscriber;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+/**
+ * @author Mark Paluch
+ */
 public class TransactionReactiveCommandTest extends TransactionCommandTest {
 
     private RedisReactiveCommands<String, String> commands;

From 0a0d23c75d702bc024914105b05bcafa423201a0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 22 Oct 2016 09:10:39 +0200
Subject: [PATCH 043/808] Support integer width multiplied offsets in BITFIELD
 #379

BitFieldArgs exposes now BitFieldArgs.offset and BitFieldArgs.typeWidthBasedOffset factory methods to create Offset instances that can be used together with BITFIELD subcommands.
---
 .../com/lambdaworks/redis/BitFieldArgs.java   | 233 ++++++++++++++++--
 .../redis/commands/BitCommandTest.java        |  46 +++-
 2 files changed, 254 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/BitFieldArgs.java b/src/main/java/com/lambdaworks/redis/BitFieldArgs.java
index 7e562e7acc..a24a9b2315 100644
--- a/src/main/java/com/lambdaworks/redis/BitFieldArgs.java
+++ b/src/main/java/com/lambdaworks/redis/BitFieldArgs.java
@@ -42,7 +42,7 @@ private Builder() {
         }
 
         /**
-         * Adds a new {@link Get} subcommand.
+         * Create a new {@link Get} subcommand.
          *
          * @param bitFieldType the bit field type, must not be {@literal null}.
          * @param offset bitfield offset
@@ -53,7 +53,19 @@ public static BitFieldArgs get(BitFieldType bitFieldType, int offset) {
         }
 
         /**
-         * Adds a new {@link Set} subcommand.
+         * Create a new {@link Get} subcommand.
+         *
+         * @param bitFieldType the bit field type, must not be {@literal null}.
+         * @param offset bitfield offset, must not be {@literal null}.
+         * @return a new {@link Get} subcommand for the given {@code bitFieldType} and {@code offset}.
+         * @since 4.3
+         */
+        public static BitFieldArgs get(BitFieldType bitFieldType, Offset offset) {
+            return new BitFieldArgs().get(bitFieldType, offset);
+        }
+
+        /**
+         * Create a new {@link Set} subcommand.
          *
          * @param bitFieldType the bit field type, must not be {@literal null}.
          * @param offset bitfield offset
@@ -65,7 +77,20 @@ public static BitFieldArgs set(BitFieldType bitFieldType, int offset, long value
         }
 
         /**
-         * Adds a new {@link IncrBy} subcommand.
+         * Create a new {@link Set} subcommand.
+         *
+         * @param bitFieldType the bit field type, must not be {@literal null}.
+         * @param offset bitfield offset, must not be {@literal null}.
+         * @param value the value
+         * @return a new {@link Set} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+         * @since 4.3
+         */
+        public static BitFieldArgs set(BitFieldType bitFieldType, Offset offset, long value) {
+            return new BitFieldArgs().set(bitFieldType, offset, value);
+        }
+
+        /**
+         * Create a new {@link IncrBy} subcommand.
          *
          * @param bitFieldType the bit field type, must not be {@literal null}.
          * @param offset bitfield offset
@@ -76,6 +101,19 @@ public static BitFieldArgs incrBy(BitFieldType bitFieldType, int offset, long va
             return new BitFieldArgs().incrBy(bitFieldType, offset, value);
         }
 
+        /**
+         * Create a new {@link IncrBy} subcommand.
+         *
+         * @param bitFieldType the bit field type, must not be {@literal null}.
+         * @param offset bitfield offset, must not be {@literal null}.
+         * @param value the value
+         * @return a new {@link IncrBy} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+         * @since 4.3
+         */
+        public static BitFieldArgs incrBy(BitFieldType bitFieldType, Offset offset, long value) {
+            return new BitFieldArgs().incrBy(bitFieldType, offset, value);
+        }
+
         /**
          * Adds a new {@link Overflow} subcommand.
          *
@@ -92,8 +130,8 @@ public static BitFieldArgs overflow(OverflowType overflowType) {
      *
      * Redis allows up to {@code 64} bits for unsigned integers.
      *
-     * @param bits
-     * @return
+     * @param bits number of bits to define the integer type width.
+     * @return the {@link BitFieldType}.
      */
     public static BitFieldType signed(int bits) {
         return new BitFieldType(true, bits);
@@ -103,19 +141,43 @@ public static BitFieldType signed(int bits) {
      * Creates a new unsigned {@link BitFieldType} for the given number of {@code bits}. Redis allows up to {@code 63} bits for
      * unsigned integers.
      *
-     * @param bits
-     * @return
+     * @param bits number of bits to define the integer type width.
+     * @return the {@link BitFieldType}.
      */
     public static BitFieldType unsigned(int bits) {
         return new BitFieldType(false, bits);
     }
 
+    /**
+     * Creates a new {@link Offset} for the given {@code offset}.
+     *
+     * @param offset zero-based offset.
+     * @return the {@link Offset}.
+     * @since 4.3
+     */
+    public static Offset offset(int offset) {
+        return new Offset(false, offset);
+    }
+
+    /**
+     * Creates a new {@link Offset} for the given {@code offset} that is multiplied by the integer type width used in the sub
+     * command.
+     *
+     * @param offset offset to be multiplied by the integer type width.
+     * @return the {@link Offset}.
+     * @since 4.3
+     */
+    public static Offset typeWidthBasedOffset(int offset) {
+        return new Offset(true, offset);
+    }
+
     /**
      * Adds a new {@link SubCommand} to the {@code BITFIELD} execution.
      *
-     * @param subCommand
+     * @param subCommand must not be {@literal null}.
      */
     private BitFieldArgs addSubCommand(SubCommand subCommand) {
+
         LettuceAssert.notNull(subCommand, "SubCommand must not be null");
         commands.add(subCommand);
         return this;
@@ -149,7 +211,22 @@ public BitFieldArgs get(BitFieldType bitFieldType) {
      * @return a new {@link Get} subcommand for the given {@code bitFieldType} and {@code offset}.
      */
     public BitFieldArgs get(BitFieldType bitFieldType, int offset) {
-        return addSubCommand(new Get(bitFieldType, offset));
+        return addSubCommand(new Get(bitFieldType, false, offset));
+    }
+
+    /**
+     * Adds a new {@link Get} subcommand.
+     *
+     * @param bitFieldType the bit field type, must not be {@literal null}.
+     * @param offset bitfield offset
+     * @return a new {@link Get} subcommand for the given {@code bitFieldType} and {@code offset}.
+     * @since 4.3
+     */
+    public BitFieldArgs get(BitFieldType bitFieldType, Offset offset) {
+
+        LettuceAssert.notNull(offset, "BitFieldOffset must not be null");
+
+        return addSubCommand(new Get(bitFieldType, offset.isMultiplyByTypeWidth(), offset.getOffset()));
     }
 
     /**
@@ -206,7 +283,23 @@ public BitFieldArgs set(int offset, long value) {
      * @return a new {@link Set} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      */
     public BitFieldArgs set(BitFieldType bitFieldType, int offset, long value) {
-        return addSubCommand(new Set(bitFieldType, offset, value));
+        return addSubCommand(new Set(bitFieldType, false, offset, value));
+    }
+
+    /**
+     * Adds a new {@link Set} subcommand.
+     *
+     * @param bitFieldType the bit field type, must not be {@literal null}.
+     * @param offset bitfield offset, must not be {@literal null}.
+     * @param value the value
+     * @return a new {@link Set} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @since 4.3
+     */
+    public BitFieldArgs set(BitFieldType bitFieldType, Offset offset, long value) {
+
+        LettuceAssert.notNull(offset, "BitFieldOffset must not be null");
+
+        return addSubCommand(new Set(bitFieldType, offset.isMultiplyByTypeWidth(), offset.getOffset(), value));
     }
 
     /**
@@ -252,7 +345,23 @@ public BitFieldArgs incrBy(int offset, long value) {
      * @return a new {@link IncrBy} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      */
     public BitFieldArgs incrBy(BitFieldType bitFieldType, int offset, long value) {
-        return addSubCommand(new IncrBy(bitFieldType, offset, value));
+        return addSubCommand(new IncrBy(bitFieldType, false, offset, value));
+    }
+
+    /**
+     * Adds a new {@link IncrBy} subcommand.
+     *
+     * @param bitFieldType the bit field type, must not be {@literal null}.
+     * @param offset bitfield offset, must not be {@literal null}.
+     * @param value the value
+     * @return a new {@link IncrBy} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @since 4.3
+     */
+    public BitFieldArgs incrBy(BitFieldType bitFieldType, Offset offset, long value) {
+
+        LettuceAssert.notNull(offset, "BitFieldOffset must not be null");
+
+        return addSubCommand(new IncrBy(bitFieldType, offset.isMultiplyByTypeWidth(), offset.getOffset(), value));
     }
 
     /**
@@ -294,22 +403,33 @@ private BitFieldType previousFieldType() {
     private static class Set extends SubCommand {
 
         private final BitFieldType bitFieldType;
+        private final boolean bitOffset;
         private final long offset;
         private final long value;
 
-        private Set(BitFieldType bitFieldType, int offset, long value) {
+        private Set(BitFieldType bitFieldType, boolean bitOffset, int offset, long value) {
 
             LettuceAssert.notNull(bitFieldType, "BitFieldType must not be null");
             LettuceAssert.isTrue(offset > -1, "Offset must be greater or equal to 0");
 
-            this.offset = offset;
             this.bitFieldType = bitFieldType;
+            this.bitOffset = bitOffset;
+            this.offset = offset;
             this.value = value;
         }
 
         @Override
         <K, V> void build(CommandArgs<K, V> args) {
-            args.add(CommandType.SET).add(bitFieldType.asString()).add(offset).add(value);
+
+            args.add(CommandType.SET).add(bitFieldType.asString());
+
+            if (bitOffset) {
+                args.add(String.format("#%d", offset));
+            } else {
+                args.add(offset);
+            }
+
+            args.add(value);
         }
     }
 
@@ -319,20 +439,29 @@ <K, V> void build(CommandArgs<K, V> args) {
     private static class Get extends SubCommand {
 
         private final BitFieldType bitFieldType;
-        private final long offset;
+        private final boolean bitOffset;
+        private final int offset;
 
-        private Get(BitFieldType bitFieldType, int offset) {
+        private Get(BitFieldType bitFieldType, boolean bitOffset, int offset) {
 
             LettuceAssert.notNull(bitFieldType, "BitFieldType must not be null");
             LettuceAssert.isTrue(offset > -1, "Offset must be greater or equal to 0");
 
-            this.offset = offset;
             this.bitFieldType = bitFieldType;
+            this.bitOffset = bitOffset;
+            this.offset = offset;
         }
 
         @Override
         <K, V> void build(CommandArgs<K, V> args) {
-            args.add(CommandType.GET).add(bitFieldType.asString()).add(offset);
+
+            args.add(CommandType.GET).add(bitFieldType.asString());
+
+            if (bitOffset) {
+                args.add(String.format("#%d", offset));
+            } else {
+                args.add(offset);
+            }
         }
     }
 
@@ -342,22 +471,34 @@ <K, V> void build(CommandArgs<K, V> args) {
     private static class IncrBy extends SubCommand {
 
         private final BitFieldType bitFieldType;
+        private final boolean bitOffset;
         private final long offset;
         private final long value;
 
-        private IncrBy(BitFieldType bitFieldType, int offset, long value) {
+        private IncrBy(BitFieldType bitFieldType, boolean offsetWidthMultiplier, int offset, long value) {
 
             LettuceAssert.notNull(bitFieldType, "BitFieldType must not be null");
             LettuceAssert.isTrue(offset > -1, "Offset must be greater or equal to 0");
 
-            this.offset = offset;
             this.bitFieldType = bitFieldType;
+            this.bitOffset = offsetWidthMultiplier;
+            this.offset = offset;
             this.value = value;
         }
 
         @Override
         <K, V> void build(CommandArgs<K, V> args) {
-            args.add(CommandType.INCRBY).add(bitFieldType.asString()).add(offset).add(value);
+
+            args.add(CommandType.INCRBY).add(bitFieldType.asString());
+
+            if (bitOffset) {
+                args.add(String.format("#%d", offset));
+            } else {
+                args.add(offset);
+            }
+
+            args.add(value);
+
         }
     }
 
@@ -403,7 +544,7 @@ public enum OverflowType implements ProtocolKeyword {
 
         public final byte[] bytes;
 
-        private OverflowType() {
+        OverflowType() {
             bytes = name().getBytes(LettuceCharsets.ASCII);
         }
 
@@ -451,8 +592,52 @@ public int getBits() {
             return bits;
         }
 
-		private String asString() {
-            return (signed ? "i" : "u") + bits;
+        private String asString() {
+            return String.format("%s%d", (signed ? "i" : "u"), bits);
+        }
+
+        @Override
+        public String toString() {
+            return asString();
+        }
+    }
+
+    /**
+     * Represents a bit field offset. See also <a href="http://redis.io/commands/bitfield#bits-and-positional-offsets">Bits and
+     * positional offsets</a>
+     * 
+     * @since 4.3
+     */
+    public static class Offset {
+
+        private final boolean multiplyByTypeWidth;
+        private final int offset;
+
+        private Offset(boolean multiplyByTypeWidth, int offset) {
+
+            this.multiplyByTypeWidth = multiplyByTypeWidth;
+            this.offset = offset;
+        }
+
+        /**
+         * @return {@literal true} if the offset should be multiplied by integer width that is represented with a leading hash
+         *         ({@code #}) when constructing the command
+         */
+        public boolean isMultiplyByTypeWidth() {
+            return multiplyByTypeWidth;
+        }
+
+        /**
+         *
+         * @return the offset.
+         */
+        public int getOffset() {
+            return offset;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("%s%d", (multiplyByTypeWidth ? "#" : ""), offset);
         }
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java
index 6369343a6e..bb4272792e 100644
--- a/src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java
@@ -2,7 +2,9 @@
 
 package com.lambdaworks.redis.commands;
 
+import static com.lambdaworks.redis.BitFieldArgs.offset;
 import static com.lambdaworks.redis.BitFieldArgs.signed;
+import static com.lambdaworks.redis.BitFieldArgs.typeWidthBasedOffset;
 import static com.lambdaworks.redis.BitFieldArgs.unsigned;
 import static com.lambdaworks.redis.BitFieldArgs.OverflowType.WRAP;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -10,7 +12,6 @@
 import java.nio.ByteBuffer;
 import java.util.List;
 
-import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
 import com.lambdaworks.redis.AbstractRedisClientTest;
@@ -73,6 +74,16 @@ public void bitfieldBuilderEmptyPreviousType() throws Exception {
         new BitFieldArgs().overflow(WRAP).get();
     }
 
+    @Test
+    public void bitfieldArgsTest() throws Exception {
+
+        assertThat(signed(5).toString()).isEqualTo("i5");
+        assertThat(unsigned(5).toString()).isEqualTo("u5");
+
+        assertThat(offset(5).toString()).isEqualTo("5");
+        assertThat(typeWidthBasedOffset(5).toString()).isEqualTo("#5");
+    }
+
     @Test
     public void bitfield() throws Exception {
 
@@ -84,6 +95,17 @@ public void bitfield() throws Exception {
         assertThat(bitstring.get(key)).isEqualTo("0000000000010011");
     }
 
+    @Test
+    public void bitfieldGetWithOffset() throws Exception {
+
+        BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 1).get(signed(2), typeWidthBasedOffset(1));
+
+        List<Long> values = redis.bitfield(key, bitFieldArgs);
+
+        assertThat(values).containsExactly(0L, 0L);
+        assertThat(bitstring.get(key)).isEqualTo("10000000");
+    }
+
     @Test
     public void bitfieldSet() throws Exception {
 
@@ -95,6 +117,17 @@ public void bitfieldSet() throws Exception {
         assertThat(bitstring.get(key)).isEqualTo("10100000");
     }
 
+    @Test
+    public void bitfieldWithOffsetSet() throws Exception {
+
+        redis.bitfield(key, BitFieldArgs.Builder.set(signed(8), typeWidthBasedOffset(2), 5));
+        assertThat(bitstring.get(key)).isEqualTo("000000000000000010100000");
+
+        redis.del(key);
+        redis.bitfield(key, BitFieldArgs.Builder.set(signed(8), offset(2), 5));
+        assertThat(bitstring.get(key)).isEqualTo("1000000000000010");
+    }
+
     @Test
     public void bitfieldIncrBy() throws Exception {
 
@@ -106,6 +139,17 @@ public void bitfieldIncrBy() throws Exception {
         assertThat(bitstring.get(key)).isEqualTo("01100000");
     }
 
+    @Test
+    public void bitfieldWithOffsetIncrBy() throws Exception {
+
+        redis.bitfield(key, BitFieldArgs.Builder.incrBy(signed(8), typeWidthBasedOffset(2), 1));
+        assertThat(bitstring.get(key)).isEqualTo("000000000000000010000000");
+
+        redis.del(key);
+        redis.bitfield(key, BitFieldArgs.Builder.incrBy(signed(8), offset(2), 1));
+        assertThat(bitstring.get(key)).isEqualTo("0000000000000010");
+    }
+
     @Test
     public void bitfieldOverflow() throws Exception {
 

From f58389c4f0e8c6d80866492fee51d08e63f180e6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 24 Oct 2016 13:49:22 +0200
Subject: [PATCH 044/808] Allow empty values in BITFIELD using the reactive API
 #378
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

RedisStringReactiveCommands.bitfield(…) now returns a Flux of Value of Long instead a Flux of Long to allow empty (nil) values caused by OVERFLOW FAIL.
---
 .../redis/AbstractRedisReactiveCommands.java  |  4 +-
 .../reactive/RedisStringReactiveCommands.java |  5 +-
 .../apigenerator/CreateReactiveApi.java       | 11 ++-
 .../reactive/BitReactiveCommandTest.java      | 87 ++++++++++++++++++-
 4 files changed, 99 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
index 704bf74645..13a510139a 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
@@ -81,8 +81,8 @@ public Mono<Long> bitcount(K key, long start, long end) {
     }
 
     @Override
-    public Flux<Long> bitfield(K key, BitFieldArgs args) {
-        return createDissolvingFlux(() -> commandBuilder.bitfield(key, args));
+    public Flux<Value<Long>> bitfield(K key, BitFieldArgs args) {
+        return createDissolvingFlux(() -> commandBuilder.bitfieldValue(key, args));
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java
index b6934b126f..fda40cf542 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java
@@ -1,9 +1,7 @@
 package com.lambdaworks.redis.api.reactive;
 
-import java.util.List;
 import java.util.Map;
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
 import com.lambdaworks.redis.BitFieldArgs;
 import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.SetArgs;
@@ -59,7 +57,7 @@ public interface RedisStringReactiveCommands<K, V> {
      * 
      * @return Long bulk-reply the results from the bitfield commands.
      */
-    Flux<Long> bitfield(K key, BitFieldArgs bitFieldArgs);
+    Flux<Value<Long>> bitfield(K key, BitFieldArgs bitFieldArgs);
 
     /**
      * Find first bit set or clear in a string.
@@ -111,7 +109,6 @@ public interface RedisStringReactiveCommands<K, V> {
     Mono<Long> bitpos(K key, boolean state, long start, long end);
 
     /**
-     * Perform bitwise AND between strings.
      * 
      * @param destination result key of the operation
      * @param keys operation input key names
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
index d1508dde47..e1fffc81af 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
@@ -30,7 +30,16 @@ public class CreateReactiveApi {
             "BaseRedisCommands.reset", "getStatefulConnection", "setAutoFlushCommands", "flushCommands");
 
     private static Set<String> FORCE_FLUX_RESULT = LettuceSets.unmodifiableSet("eval", "evalsha", "dispatch");
-    private static Map<String, String> RESULT_SPEC = Collections.singletonMap("geopos", "Flux<Value<GeoCoordinates>>");
+    private static final Map<String, String> RESULT_SPEC;
+
+    static {
+
+        Map<String, String> resultSpec = new HashMap<>();
+        resultSpec.put("geopos", "Flux<Value<GeoCoordinates>>");
+        resultSpec.put("bitfield", "Flux<Value<Long>>");
+
+        RESULT_SPEC = resultSpec;
+    }
 
     private CompilationUnitFactory factory;
 
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
index 9bf704072d..c5408baf79 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
@@ -1,5 +1,19 @@
 package com.lambdaworks.redis.commands.reactive;
 
+import static com.lambdaworks.redis.BitFieldArgs.offset;
+import static com.lambdaworks.redis.BitFieldArgs.signed;
+import static com.lambdaworks.redis.BitFieldArgs.typeWidthBasedOffset;
+import static com.lambdaworks.redis.BitFieldArgs.OverflowType.FAIL;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import com.lambdaworks.redis.BitFieldArgs;
+import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.api.reactive.RedisStringReactiveCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.BitCommandTest;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
@@ -9,9 +23,80 @@
  */
 public class BitReactiveCommandTest extends BitCommandTest {
 
+    private RedisStringReactiveCommands<String, String> reactive;
+
     @Override
     protected RedisCommands<String, String> connect() {
         bitstring = ReactiveSyncInvocationHandler.sync(client.connect(new BitStringCodec()));
-        return ReactiveSyncInvocationHandler.sync(client.connect());
+
+        StatefulRedisConnection<String, String> connection = client.connect();
+        reactive = connection.reactive();
+        return ReactiveSyncInvocationHandler.sync(connection);
+    }
+
+    @Test
+    public void bitfield() throws Exception {
+
+        BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 1).set(5, 1).incrBy(2, 3).get().get(2);
+
+        List<Value<Long>> values = reactive.bitfield(key, bitFieldArgs).collectList().block();
+
+        assertThat(values).containsExactly(Value.just(0L), Value.just(32L), Value.just(3L), Value.just(0L), Value.just(3L));
+        assertThat(bitstring.get(key)).isEqualTo("0000000000010011");
+    }
+
+    @Test
+    public void bitfieldGetWithOffset() throws Exception {
+
+        BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 1).get(signed(2), typeWidthBasedOffset(1));
+
+        List<Value<Long>> values = reactive.bitfield(key, bitFieldArgs).collectList().block();
+
+        assertThat(values).containsExactly(Value.just(0L), Value.just(0L));
+        assertThat(bitstring.get(key)).isEqualTo("10000000");
+    }
+
+    @Test
+    public void bitfieldSet() throws Exception {
+
+        BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 5).set(5);
+
+        List<Value<Long>> values = reactive.bitfield(key, bitFieldArgs).collectList().block();
+
+        assertThat(values).containsExactly(Value.just(0L), Value.just(5L));
+        assertThat(bitstring.get(key)).isEqualTo("10100000");
+    }
+
+    @Test
+    public void bitfieldWithOffsetSet() throws Exception {
+
+        reactive.bitfield(key, BitFieldArgs.Builder.set(signed(8), typeWidthBasedOffset(2), 5)).last().block();
+        assertThat(bitstring.get(key)).isEqualTo("000000000000000010100000");
+
+        redis.del(key);
+        reactive.bitfield(key, BitFieldArgs.Builder.set(signed(8), offset(2), 5)).last().block();
+        assertThat(bitstring.get(key)).isEqualTo("1000000000000010");
+    }
+
+    @Test
+    public void bitfieldIncrBy() throws Exception {
+
+        BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 5).incrBy(1);
+
+        List<Value<Long>> values = reactive.bitfield(key, bitFieldArgs).collectList().block();
+
+        assertThat(values).containsExactly(Value.just(0L), Value.just(6L));
+        assertThat(bitstring.get(key)).isEqualTo("01100000");
+    }
+
+    @Test
+    public void bitfieldOverflow() throws Exception {
+
+        BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.overflow(FAIL).set(signed(8), 9, 5).incrBy(signed(8),
+                Integer.MAX_VALUE);
+
+        List<Value<Long>> values = reactive.bitfield(key, bitFieldArgs).collectList().block();
+
+        assertThat(values).containsExactly(Value.just(0L), Value.empty());
     }
 }

From f93d38646ef540fa26ef223c35495143695c33e3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 24 Oct 2016 17:10:02 +0200
Subject: [PATCH 045/808] Allow hostnames in MasterSlaveTopologyProvider when
 parsing in master_host #377

Add dash to allow hostnames in when parsing master_host details received from Redis. Previously, parsing of hostnames with a dash failed due to a restrictive regex.
---
 .../MasterSlaveTopologyProvider.java            |  2 +-
 .../MasterSlaveTopologyProviderTest.java        | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java
index 624e177216..2ed40412cd 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java
@@ -26,7 +26,7 @@ public class MasterSlaveTopologyProvider implements TopologyProvider {
 
     public static final Pattern ROLE_PATTERN = Pattern.compile("^role\\:([a-z]+)$", Pattern.MULTILINE);
     public static final Pattern SLAVE_PATTERN = Pattern.compile("^slave(\\d+)\\:([a-zA-Z\\,\\=\\d\\.\\:]+)$", Pattern.MULTILINE);
-    public static final Pattern MASTER_HOST_PATTERN = Pattern.compile("^master_host\\:([a-zA-Z\\,\\=\\d\\.\\:]+)$",
+    public static final Pattern MASTER_HOST_PATTERN = Pattern.compile("^master_host\\:([a-zA-Z\\,\\=\\d\\.\\:\\-]+)$",
             Pattern.MULTILINE);
     public static final Pattern MASTER_PORT_PATTERN = Pattern.compile("^master_port\\:(\\d+)$", Pattern.MULTILINE);
     public static final Pattern IP_PATTERN = Pattern.compile("ip\\=([a-zA-Z\\d\\.\\:]+)");
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProviderTest.java b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProviderTest.java
index 53fdc8e3b3..0b0879299e 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProviderTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProviderTest.java
@@ -56,6 +56,23 @@ public void shouldParseMasterAndSlave() throws Exception {
         assertThat(master.getUri().getHost()).isEqualTo("127.0.0.1");
     }
 
+    @Test
+    public void shouldParseMasterHostname() throws Exception {
+
+        String info = "# Replication\r\n" + "role:slave\r\n" + "connected_slaves:1\r\n" + "master_host:my.Host-name.COM\r\n"
+                + "master_port:1234\r\n" + "master_repl_offset:56276\r\n" + "repl_backlog_active:1\r\n";
+
+        List<RedisNodeDescription> result = sut.getNodesFromInfo(info);
+        assertThat(result).hasSize(2);
+
+        RedisNodeDescription slave = result.get(0);
+        assertThat(slave.getRole()).isEqualTo(RedisInstance.Role.SLAVE);
+
+        RedisNodeDescription master = result.get(1);
+        assertThat(master.getRole()).isEqualTo(RedisInstance.Role.MASTER);
+        assertThat(master.getUri().getHost()).isEqualTo("my.Host-name.COM");
+    }
+
     @Test
     public void shouldParseIPv6MasterAddress() throws Exception {
 

From efaf6e3348b4c2a466298c00d848205f2d4ad5a4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 24 Oct 2016 17:27:16 +0200
Subject: [PATCH 046/808] Use lenient check for BITFIELD INCRBY/OVERFLOW test

Redis does not isolate previously issued BITFIELD/OVERFLOW commands properly so responses happen to be non-deterministic in serveral cases.
---
 .../redis/commands/reactive/BitReactiveCommandTest.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
index c5408baf79..76d3032ee1 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
@@ -97,6 +97,6 @@ public void bitfieldOverflow() throws Exception {
 
         List<Value<Long>> values = reactive.bitfield(key, bitFieldArgs).collectList().block();
 
-        assertThat(values).containsExactly(Value.just(0L), Value.empty());
+        assertThat(values).contains(Value.empty());
     }
 }

From 7373760d5feed1b3c09cdbd1717485a359d439cd Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 25 Oct 2016 21:44:46 +0200
Subject: [PATCH 047/808] Add support for SWAPDB #375

---
 .../redis/AbstractRedisAsyncCommands.java      |  4 ++++
 .../redis/AbstractRedisReactiveCommands.java   |  4 ++++
 .../lambdaworks/redis/RedisCommandBuilder.java |  5 +++++
 .../redis/api/async/RedisAsyncCommands.java    | 11 +++++++++++
 .../api/reactive/RedisReactiveCommands.java    | 10 ++++++++++
 .../redis/api/sync/RedisCommands.java          | 10 ++++++++++
 .../redis/protocol/CommandType.java            |  2 +-
 .../redis/commands/ServerCommandTest.java      | 18 ++++++++++++++++++
 8 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
index 7fed0dabf7..81bdb80876 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
@@ -815,6 +815,10 @@ protected AsyncCommand<K, V, String> selectAsync(int db) {
         return dispatch(commandBuilder.select(db));
     }
 
+    public RedisFuture<String> swapdb(int db1, int db2) {
+        return dispatch(commandBuilder.swapdb(db1, db2));
+    }
+
     @Override
     public RedisFuture<String> set(K key, V value) {
         return dispatch(commandBuilder.set(key, value));
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
index 13a510139a..99dd0fff10 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
@@ -811,6 +811,10 @@ public Mono<String> select(int db) {
         return createMono(() -> commandBuilder.select(db));
     }
 
+    public Mono<String> swapdb(int db1, int db2) {
+        return createMono(() -> commandBuilder.swapdb(db1, db2));
+    }
+
     @Override
     public Mono<String> set(K key, V value) {
         return createMono(() -> commandBuilder.set(key, value));
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
index af599bd073..e6b43901ab 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
@@ -1134,6 +1134,11 @@ public Command<K, V, String> select(int db) {
         return createCommand(SELECT, new StatusOutput<K, V>(codec), args);
     }
 
+    public Command<K, V, String> swapdb(int db1, int db2) {
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(db1).add(db2);
+        return createCommand(SWAPDB, new StatusOutput<K, V>(codec), args);
+    }
+
     public Command<K, V, String> set(K key, V value) {
         notNullKey(key);
 
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java
index 31adaa7a6f..890f2ebc7a 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java
@@ -2,6 +2,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+import com.lambdaworks.redis.RedisFuture;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
 
@@ -43,6 +44,16 @@ public interface RedisAsyncCommands<K, V> extends RedisHashAsyncCommands<K, V>,
      */
     String select(int db);
 
+    /**
+     * Swap two Redis databases, so that immediately all the clients connected to a given DB will see the data of the other DB,
+     * and the other way around
+     *
+     * @param db1 the first database number
+     * @param db2 the second database number
+     * @return String simple-string-reply
+     */
+    RedisFuture<String> swapdb(int db1, int db2);
+
     /**
      * @return the underlying connection.
      */
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java
index cc8a08962c..dbe5053db4 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java
@@ -45,6 +45,16 @@ public interface RedisReactiveCommands<K, V> extends RedisHashReactiveCommands<K
      */
     Mono<String> select(int db);
 
+    /**
+     * Swap two Redis databases, so that immediately all the clients connected to a given DB will see the data of the other DB,
+     * and the other way around
+     *
+     * @param db1 the first database number
+     * @param db2 the second database number
+     * @return String simple-string-reply
+     */
+    Mono<String> swapdb(int db1, int db2);
+
     /**
      * @return the underlying connection.
      */
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java
index 3a84e48bf8..896bbcc23b 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java
@@ -43,6 +43,16 @@ public interface RedisCommands<K, V> extends RedisHashCommands<K, V>, RedisKeyCo
      */
     String select(int db);
 
+    /**
+     * Swap two Redis databases, so that immediately all the clients connected to a given DB will see the data of the other DB,
+     * and the other way around
+     *
+     * @param db1 the first database number
+     * @param db2 the second database number
+     * @return String simple-string-reply
+     */
+    String swapdb(int db1, int db2);
+
     /**
      * @return the underlying connection.
      */
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandType.java b/src/main/java/com/lambdaworks/redis/protocol/CommandType.java
index 77e76f8c94..e21d1366c7 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandType.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandType.java
@@ -10,7 +10,7 @@
 public enum CommandType implements ProtocolKeyword {
     // Connection
 
-    AUTH, ECHO, PING, QUIT, READONLY, READWRITE, SELECT,
+    AUTH, ECHO, PING, QUIT, READONLY, READWRITE, SELECT, SWAPDB,
 
     // Server
 
diff --git a/src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java
index 07a95815d9..a6e78641a6 100644
--- a/src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java
@@ -328,4 +328,22 @@ public void slowlog() throws Exception {
 
         redis.configSet("slowlog-log-slower-than", "10000");
     }
+
+    @Test
+    public void swapdb() {
+
+        redis.select(1);
+        redis.set(key, "value1");
+
+        redis.select(2);
+        redis.set(key, "value2");
+        assertThat(redis.get(key)).isEqualTo("value2");
+
+        redis.swapdb(1, 2);
+        redis.select(1);
+        assertThat(redis.get(key)).isEqualTo("value2");
+
+        redis.select(2);
+        assertThat(redis.get(key)).isEqualTo("value1");
+    }
 }

From c8feada636c3ad3a5d27b492e0d0e752cf05e6ff Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 30 Sep 2016 14:42:51 +0200
Subject: [PATCH 048/808] Reattempt initially failed Sentinel connections in
 Master/Slave API #306

Lettuce now retries to connect to Redis Sentinel nodes that were unavailable initially. The Master/Slave connection tracks established and missing connections. It retries only missing connections and does not obtain Sentinel endpoint details from pub/sub messages. Connection retries are signalled by Sentinel events.
---
 .../masterslave/SentinelTopologyRefresh.java  | 262 +++++++++++++-----
 .../SentinelTopologyRefreshTest.java          | 143 ++++++++--
 2 files changed, 320 insertions(+), 85 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java b/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
index fa4e605e3a..9772c5d44c 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
@@ -1,16 +1,21 @@
 package com.lambdaworks.redis.masterslave;
 
 import java.io.Closeable;
-import java.io.IOException;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiPredicate;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import com.lambdaworks.redis.RedisClient;
 import com.lambdaworks.redis.RedisConnectionException;
 import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.internal.LettuceLists;
+import com.lambdaworks.redis.protocol.LettuceCharsets;
 import com.lambdaworks.redis.pubsub.RedisPubSubAdapter;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
 
@@ -19,7 +24,8 @@
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
- * Sentinel Pub/Sub listener-enabled topology refresh.
+ * Sentinel Pub/Sub listener-enabled topology refresh. This refresh triggers topology updates if Redis topology changes
+ * (monitored master/slaves) or the Sentinel availability changes.
  *
  * @author Mark Paluch
  * @since 4.2
@@ -27,43 +33,82 @@
 class SentinelTopologyRefresh implements Closeable {
 
     private static final InternalLogger LOG = InternalLoggerFactory.getInstance(SentinelTopologyRefresh.class);
+    private static final StringCodec CODEC = new StringCodec(LettuceCharsets.ASCII);
+    private static final Set<String> PROCESSING_CHANNELS = new HashSet<>(
+            Arrays.asList("failover-end", "failover-end-for-timeout"));
 
-    private final List<StatefulRedisPubSubConnection<String, String>> pubSubConnections = new ArrayList<>();
+    private final Map<RedisURI, StatefulRedisPubSubConnection<String, String>> pubSubConnections = new ConcurrentHashMap<>();
     private final RedisClient redisClient;
-    private final String masterId;
     private final List<RedisURI> sentinels;
-    private final AtomicReference<Timeout> timeoutRef = new AtomicReference<Timeout>();
-    private final Set<String> PROCESSING_CHANNELS = new HashSet<>(Arrays.asList("failover-end", "failover-end-for-timeout"));
+    private final List<Runnable> refreshRunnables = new CopyOnWriteArrayList<>();
+    private final RedisPubSubAdapter<String, String> adapter = new RedisPubSubAdapter<String, String>() {
 
-    private int timeout = 5;
-    private TimeUnit timeUnit = TimeUnit.SECONDS;
+        @Override
+        public void message(String pattern, String channel, String message) {
+            SentinelTopologyRefresh.this.processMessage(pattern, channel, message);
+        }
+    };
+
+    private final PubSubMessageActionScheduler topologyRefresh;
+    private final PubSubMessageActionScheduler sentinelReconnect;
 
-    private RedisPubSubAdapter<String, String> adapter;
+    private volatile boolean closed = false;
 
     SentinelTopologyRefresh(RedisClient redisClient, String masterId, List<RedisURI> sentinels) {
 
         this.redisClient = redisClient;
-        this.masterId = masterId;
-        this.sentinels = sentinels;
+        this.sentinels = LettuceLists.newList(sentinels);
+        this.topologyRefresh = new PubSubMessageActionScheduler(redisClient.getResources().eventExecutorGroup(),
+                new TopologyRefreshMessagePredicate(masterId));
+        this.sentinelReconnect = new PubSubMessageActionScheduler(redisClient.getResources().eventExecutorGroup(),
+                new SentinelReconnectMessagePredicate());
+
     }
 
     @Override
-    public void close() throws IOException {
+    public void close() {
 
-        pubSubConnections.forEach(c -> c.removeListener(adapter));
-        pubSubConnections.forEach(StatefulConnection::close);
+        closed = true;
+
+        HashMap<RedisURI, StatefulRedisPubSubConnection<String, String>> connections = new HashMap<>(pubSubConnections);
+        connections.forEach((k, c) -> {
+            c.removeListener(adapter);
+            c.close();
+            pubSubConnections.remove(k);
+        });
     }
 
     void bind(Runnable runnable) {
 
-        Utf8StringCodec codec = new Utf8StringCodec();
+        refreshRunnables.add(runnable);
+
+        initializeSentinels();
+    }
+
+    private void initializeSentinels() {
+
+        if (closed) {
+            return;
+        }
+
         AtomicReference<RedisConnectionException> ref = new AtomicReference<>();
 
         sentinels.forEach(redisURI -> {
 
+            if (closed) {
+                return;
+            }
+
+            StatefulRedisPubSubConnection<String, String> pubSubConnection = null;
             try {
-                StatefulRedisPubSubConnection<String, String> pubSubConnection = redisClient.connectPubSub(codec, redisURI);
-                pubSubConnections.add(pubSubConnection);
+                if (!pubSubConnections.containsKey(redisURI)) {
+
+                    pubSubConnection = redisClient.connectPubSub(CODEC, redisURI);
+                    pubSubConnections.put(redisURI, pubSubConnection);
+
+                    pubSubConnection.addListener(adapter);
+                    pubSubConnection.async().psubscribe("*");
+                }
             } catch (RedisConnectionException e) {
                 if (ref.get() == null) {
                     ref.set(e);
@@ -77,84 +122,169 @@ void bind(Runnable runnable) {
             throw ref.get();
         }
 
-        adapter = new RedisPubSubAdapter<String, String>() {
-
-            @Override
-            public void message(String pattern, String channel, String message) {
+        if (closed) {
+            close();
+        }
+    }
 
-                if (processingAllowed(channel, message)) {
+    private void processMessage(String pattern, String channel, String message) {
 
-                    LOG.debug("Received topology changed signal from Redis Sentinel, scheduling topology update");
+        topologyRefresh.processMessage(channel, message, () -> {
+            LOG.debug("Received topology changed signal from Redis Sentinel, scheduling topology update");
+            return () -> refreshRunnables.forEach(Runnable::run);
+        });
 
-                    Timeout timeout = timeoutRef.get();
-                    if (timeout == null) {
-                        getEventExecutor().submit(runnable);
-                    } else {
-                        getEventExecutor().schedule(runnable, timeout.remaining(), TimeUnit.MILLISECONDS);
-                    }
-                }
-            }
-        };
+        sentinelReconnect.processMessage(channel, message, () -> {
 
-        pubSubConnections.forEach(c -> {
+            LOG.debug("Received sentinel state changed signal from Redis Sentinel, scheduling sentinel reconnect attempts");
 
-            c.addListener(adapter);
-            c.async().psubscribe("*");
+            return this::initializeSentinels;
         });
-
     }
 
-    private boolean processingAllowed(String channel, String message) {
+    private static class PubSubMessageActionScheduler {
 
-        if (getEventExecutor().isShuttingDown()) {
-            return false;
+        private final TimedSemaphore timedSemaphore = new TimedSemaphore();
+        private final EventExecutorGroup eventExecutors;
+        private final MessagePredicate filter;
+
+        PubSubMessageActionScheduler(EventExecutorGroup eventExecutors, MessagePredicate filter) {
+            this.eventExecutors = eventExecutors;
+            this.filter = filter;
         }
 
-        if (!messageMatches(channel, message)) {
-            return false;
+        void processMessage(String channel, String message, Supplier<Runnable> runnableSupplier) {
+
+            if (!processingAllowed(channel, message)) {
+                return;
+            }
+
+            timedSemaphore.onEvent(timeout -> {
+
+                Runnable runnable = runnableSupplier.get();
+
+                if (timeout == null) {
+                    eventExecutors.submit(runnable);
+                } else {
+                    eventExecutors.schedule(runnable, timeout.remaining(), TimeUnit.MILLISECONDS);
+                }
+
+            });
         }
 
-        Timeout existingTimeout = timeoutRef.get();
+        private boolean processingAllowed(String channel, String message) {
+
+            if (eventExecutors.isShuttingDown()) {
+                return false;
+            }
 
-        if (existingTimeout != null) {
-            if (!existingTimeout.isExpired()) {
+            if (!filter.test(channel, message)) {
                 return false;
             }
+
+            return true;
         }
+    }
+
+    /**
+     * Lock-free semaphore that limits calls by using a {@link Timeout}. This class is thread-safe and
+     * {@link #onEvent(Consumer)} may be called by multiple threads concurrently. It's guaranteed the first caller for an
+     * expired {@link Timeout} will be called.
+     */
+    private static class TimedSemaphore {
+
+        private final AtomicReference<Timeout> timeoutRef = new AtomicReference<>();
 
-        Timeout timeout = new Timeout(this.timeout, this.timeUnit);
-        return timeoutRef.compareAndSet(existingTimeout, timeout);
+        private final int timeout = 5;
+        private final TimeUnit timeUnit = TimeUnit.SECONDS;
+
+        /**
+         * Rate-limited method that notifies the given {@link Consumer} once the current {@link Timeout} is expired.
+         * 
+         * @param timeoutConsumer callback.
+         */
+        protected void onEvent(Consumer<Timeout> timeoutConsumer) {
+
+            Timeout existingTimeout = timeoutRef.get();
+
+            if (existingTimeout != null) {
+                if (!existingTimeout.isExpired()) {
+                    return;
+                }
+            }
+
+            Timeout timeout = new Timeout(this.timeout, this.timeUnit);
+            boolean state = timeoutRef.compareAndSet(existingTimeout, timeout);
+
+            if (state) {
+                timeoutConsumer.accept(timeout);
+            }
+        }
     }
 
-    protected EventExecutorGroup getEventExecutor() {
-        return redisClient.getResources().eventExecutorGroup();
+    static interface MessagePredicate extends BiPredicate<String, String> {
+
+        @Override
+        boolean test(String message, String channel);
     }
 
-    private boolean messageMatches(String channel, String message) {
+    /**
+     * {@link MessagePredicate} to check whether the channel and message contain topology changes related to the monitored
+     * master.
+     */
+    private static class TopologyRefreshMessagePredicate implements MessagePredicate {
 
-        // trailing spaces after the master name are not bugs
-        if (channel.equals("+elected-leader")) {
-            if (message.startsWith(String.format("master %s ", masterId))) {
-                return true;
-            }
+        private final String masterId;
+
+        TopologyRefreshMessagePredicate(String masterId) {
+            this.masterId = masterId;
         }
 
-        if (channel.equals("+switch-master")) {
-            if (message.startsWith(String.format("%s ", masterId))) {
-                return true;
+        @Override
+        public boolean test(String channel, String message) {
+
+            // trailing spaces after the master name are not bugs
+            if (channel.equals("+elected-leader")) {
+                if (message.startsWith(String.format("master %s ", masterId))) {
+                    return true;
+                }
+            }
+
+            if (channel.equals("+switch-master")) {
+                if (message.startsWith(String.format("%s ", masterId))) {
+                    return true;
+                }
             }
+
+            if (channel.equals("fix-slave-config")) {
+                if (message.contains(String.format("@ %s ", masterId))) {
+                    return true;
+                }
+            }
+
+            return PROCESSING_CHANNELS.contains(channel);
         }
+    }
+
+    /**
+     * {@link MessagePredicate} to check whether the channel and message contain Sentinel availability changes or a Sentinel was
+     * added.
+     */
+    private static class SentinelReconnectMessagePredicate implements MessagePredicate {
 
-        if (channel.equals("fix-slave-config")) {
-            if (message.contains(String.format("@ %s ", masterId))) {
+        @Override
+        public boolean test(String message, String channel) {
+            if (channel.equals("+sentinel")) {
                 return true;
             }
-        }
 
-        if (PROCESSING_CHANNELS.contains(channel)) {
-            return true;
-        }
+            if (channel.equals("-odown") || channel.equals("-sdown")) {
+                if (message.startsWith("sentinel ")) {
+                    return true;
+                }
+            }
 
-        return false;
+            return false;
+        }
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java b/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java
index 7ac7ec3a53..47109c6ae5 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java
@@ -1,25 +1,28 @@
 package com.lambdaworks.redis.masterslave;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyLong;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.*;
 
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.lambdaworks.redis.RedisClient;
+import com.lambdaworks.redis.RedisConnectionException;
 import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
+import com.lambdaworks.redis.codec.StringCodec;
 import com.lambdaworks.redis.pubsub.RedisPubSubAdapter;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
 import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
@@ -30,9 +33,13 @@
 /**
  * @author Mark Paluch
  */
+@SuppressWarnings("unchecked")
 @RunWith(MockitoJUnitRunner.class)
 public class SentinelTopologyRefreshTest {
 
+    private static final RedisURI host1 = RedisURI.create("localhost", 1234);
+    private static final RedisURI host2 = RedisURI.create("localhost", 3456);
+
     @Mock
     private RedisClient redisClient;
 
@@ -51,17 +58,20 @@ public class SentinelTopologyRefreshTest {
     @Mock
     private Runnable refreshRunnable;
 
+    @Captor
+    private ArgumentCaptor<Runnable> captor;
+
     private SentinelTopologyRefresh sut;
 
     @Before
     public void before() throws Exception {
 
-        sut = new SentinelTopologyRefresh(redisClient, "mymaster", Arrays.asList(RedisURI.create("localhost", 1234)));
-
-        when(redisClient.connectPubSub(any(Utf8StringCodec.class), any())).thenReturn(connection);
+        when(redisClient.connectPubSub(any(StringCodec.class), eq(host1))).thenReturn(connection);
         when(clientResources.eventExecutorGroup()).thenReturn(eventExecutors);
         when(redisClient.getResources()).thenReturn(clientResources);
         when(connection.async()).thenReturn(pubSubAsyncCommands);
+
+        sut = new SentinelTopologyRefresh(redisClient, "mymaster", Collections.singletonList(host1));
     }
 
     @Test
@@ -73,6 +83,78 @@ public void bind() throws Exception {
         verify(pubSubAsyncCommands).psubscribe("*");
     }
 
+    @Test
+    public void bindWithSecondSentinelFails() throws Exception {
+
+        sut = new SentinelTopologyRefresh(redisClient, "mymaster", Arrays.asList(host1, host2));
+
+        when(redisClient.connectPubSub(any(StringCodec.class), eq(host2))).thenThrow(new RedisConnectionException("err"));
+
+        sut.bind(refreshRunnable);
+
+        Map<RedisURI, StatefulRedisPubSubConnection<String, String>> connections = (Map) ReflectionTestUtils.getField(sut,
+                "pubSubConnections");
+
+        assertThat(connections).containsKey(host1).hasSize(1);
+    }
+
+    @Test
+    public void bindWithSentinelRecovery() throws Exception {
+
+        StatefulRedisPubSubConnection<String, String> connection2 = mock(StatefulRedisPubSubConnection.class);
+        RedisPubSubAsyncCommands<String, String> async2 = mock(RedisPubSubAsyncCommands.class);
+        when(connection2.async()).thenReturn(async2);
+
+        sut = new SentinelTopologyRefresh(redisClient, "mymaster", Arrays.asList(host1, host2));
+
+        when(redisClient.connectPubSub(any(StringCodec.class), eq(host2))).thenThrow(new RedisConnectionException("err"))
+                .thenReturn(connection2);
+
+        sut.bind(refreshRunnable);
+
+        verify(redisClient).connectPubSub(any(), eq(host1));
+        verify(redisClient).connectPubSub(any(), eq(host2));
+
+        Map<RedisURI, StatefulRedisPubSubConnection<String, String>> connections = (Map) ReflectionTestUtils.getField(sut,
+                "pubSubConnections");
+
+        RedisPubSubAdapter<String, String> adapter = getAdapter();
+
+        adapter.message("*", "+sentinel",
+                "sentinel c14cc895bb0479c91312cee0e0440b7d99ad367b 127.0.0.1 26380 @ mymaster 127.0.0.1 6483");
+
+        verify(redisClient, times(2)).connectPubSub(any(), eq(host2));
+        assertThat(connections).containsKey(host1).containsKey(host2).hasSize(2);
+        verify(refreshRunnable, never()).run();
+    }
+
+    @Test
+    public void bindDuringClose() throws Exception {
+
+        sut = new SentinelTopologyRefresh(redisClient, "mymaster", Arrays.asList(host1, host2));
+
+        StatefulRedisPubSubConnection<String, String> connection2 = mock(StatefulRedisPubSubConnection.class);
+        RedisPubSubAsyncCommands<String, String> async2 = mock(RedisPubSubAsyncCommands.class);
+        when(connection2.async()).thenReturn(async2);
+
+        when(redisClient.connectPubSub(any(StringCodec.class), eq(host2))).thenAnswer(invocation -> {
+
+            sut.close();
+            return connection2;
+        });
+
+        sut.bind(refreshRunnable);
+
+        verify(redisClient).connectPubSub(any(), eq(host2));
+        verify(connection).close();
+        verify(connection2).close();
+
+        Map<RedisURI, StatefulRedisPubSubConnection<String, String>> connections = (Map) ReflectionTestUtils.getField(sut,
+                "pubSubConnections");
+
+        assertThat(connections).isEmpty();
+    }
+
     @Test
     public void close() throws Exception {
 
@@ -83,6 +165,16 @@ public void close() throws Exception {
         verify(connection).close();
     }
 
+    @Test
+    public void bindAfterClose() throws Exception {
+
+        sut.close();
+        sut.bind(refreshRunnable);
+
+        verify(redisClient, times(2)).getResources();
+        verifyNoMoreInteractions(redisClient);
+    }
+
     @Test
     public void shouldNotProcessOtherEvents() throws Exception {
 
@@ -90,8 +182,9 @@ public void shouldNotProcessOtherEvents() throws Exception {
 
         adapter.message("*", "*", "irreleval");
 
-        verify(eventExecutors).isShuttingDown();
-        verifyNoMoreInteractions(eventExecutors);
+        verify(redisClient, times(2)).getResources();
+        verify(redisClient).connectPubSub(any(), any());
+        verifyNoMoreInteractions(redisClient);
     }
 
     @Test
@@ -101,7 +194,9 @@ public void shouldProcessElectedLeader() throws Exception {
 
         adapter.message("*", "+elected-leader", "master mymaster 127.0.0.1");
 
-        verify(eventExecutors).schedule(any(Runnable.class), anyLong(), any());
+        verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
+        captor.getValue().run();
+        verify(refreshRunnable, times(1)).run();
     }
 
     @Test
@@ -111,7 +206,9 @@ public void shouldProcessSwitchMaster() throws Exception {
 
         adapter.message("*", "+switch-master", "mymaster 127.0.0.1");
 
-        verify(eventExecutors).schedule(any(Runnable.class), anyLong(), any());
+        verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
+        captor.getValue().run();
+        verify(refreshRunnable, times(1)).run();
     }
 
     @Test
@@ -121,7 +218,9 @@ public void shouldProcessFixSlaveConfig() throws Exception {
 
         adapter.message("*", "fix-slave-config", "@ mymaster 127.0.0.1");
 
-        verify(eventExecutors).schedule(any(Runnable.class), anyLong(), any());
+        verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
+        captor.getValue().run();
+        verify(refreshRunnable, times(1)).run();
     }
 
     @Test
@@ -131,7 +230,9 @@ public void shouldProcessFailoverEnd() throws Exception {
 
         adapter.message("*", "failover-end", "");
 
-        verify(eventExecutors).schedule(any(Runnable.class), anyLong(), any());
+        verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
+        captor.getValue().run();
+        verify(refreshRunnable, times(1)).run();
     }
 
     @Test
@@ -141,7 +242,9 @@ public void shouldProcessFailoverTimeout() throws Exception {
 
         adapter.message("*", "failover-end-for-timeout", "");
 
-        verify(eventExecutors).schedule(any(Runnable.class), anyLong(), any());
+        verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
+        captor.getValue().run();
+        verify(refreshRunnable, times(1)).run();
     }
 
     @Test
@@ -152,7 +255,9 @@ public void shouldExecuteOnceWithinATimeout() throws Exception {
         adapter.message("*", "failover-end-for-timeout", "");
         adapter.message("*", "failover-end-for-timeout", "");
 
-        verify(eventExecutors, times(1)).schedule(any(Runnable.class), anyLong(), any());
+        verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
+        captor.getValue().run();
+        verify(refreshRunnable, times(1)).run();
     }
 
     @Test
@@ -163,13 +268,13 @@ public void shouldNotProcessIfExecutorIsShuttingDown() throws Exception {
 
         adapter.message("*", "failover-end-for-timeout", "");
 
+        verify(redisClient).connectPubSub(any(), any());
         verify(eventExecutors, never()).schedule(any(Runnable.class), anyLong(), any());
     }
 
     private RedisPubSubAdapter<String, String> getAdapter() {
 
         sut.bind(refreshRunnable);
-        return (RedisPubSubAdapter<String, String>) ReflectionTestUtils.getField(sut,
-                "adapter");
+        return (RedisPubSubAdapter<String, String>) ReflectionTestUtils.getField(sut, "adapter");
     }
 }
\ No newline at end of file

From dd24abc171a971c7e220f3a7451165b8307e7c47 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 26 Oct 2016 16:48:00 +0200
Subject: [PATCH 049/808] Consider role changes as trigger for update using
 MasterSlave connections #370

Lettuce now considers +convert-to-slave and +role-change messages as topology refresh triggers.
---
 .../masterslave/SentinelTopologyRefresh.java  |  6 +++++
 .../SentinelTopologyRefreshTest.java          | 26 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java b/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
index 9772c5d44c..6070aba35c 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
@@ -262,6 +262,12 @@ public boolean test(String channel, String message) {
                 }
             }
 
+            if (channel.equals("+convert-to-slave") || channel.equals("+role-change")) {
+                if (message.contains(String.format("@ %s ", masterId))) {
+                    return true;
+                }
+            }
+
             return PROCESSING_CHANNELS.contains(channel);
         }
     }
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java b/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java
index 47109c6ae5..ac589fa70c 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java
@@ -223,6 +223,30 @@ public void shouldProcessFixSlaveConfig() throws Exception {
         verify(refreshRunnable, times(1)).run();
     }
 
+    @Test
+    public void shouldProcessConvertToSlave() throws Exception {
+
+        RedisPubSubAdapter<String, String> adapter = getAdapter();
+
+        adapter.message("*", "+convert-to-slave", "@ mymaster 127.0.0.1");
+
+        verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
+        captor.getValue().run();
+        verify(refreshRunnable, times(1)).run();
+    }
+
+    @Test
+    public void shouldProcessRoleChange() throws Exception {
+
+        RedisPubSubAdapter<String, String> adapter = getAdapter();
+
+        adapter.message("*", "+role-change", "@ mymaster 127.0.0.1");
+
+        verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
+        captor.getValue().run();
+        verify(refreshRunnable, times(1)).run();
+    }
+
     @Test
     public void shouldProcessFailoverEnd() throws Exception {
 
@@ -277,4 +301,4 @@ private RedisPubSubAdapter<String, String> getAdapter() {
         sut.bind(refreshRunnable);
         return (RedisPubSubAdapter<String, String>) ReflectionTestUtils.getField(sut, "adapter");
     }
-}
\ No newline at end of file
+}

From 882cece69b1adc0a51e6fc30f11811bf4d91882d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 26 Oct 2016 16:52:12 +0200
Subject: [PATCH 050/808] Increase cluster-node-timeout to 150ms.

---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 3ddbc22034..a554424939 100644
--- a/Makefile
+++ b/Makefile
@@ -148,7 +148,7 @@ work/cluster-node-7385.conf:
 	@echo appendonly no >> $@
 	@echo unixsocket $(ROOT_DIR)/work/socket-7385 >> $@
 	@echo cluster-enabled yes >> $@
-	@echo cluster-node-timeout 50 >> $@
+	@echo cluster-node-timeout 150 >> $@
 	@echo cluster-config-file $(shell pwd)/work/cluster-node-config-7385.conf >> $@
 	@echo requirepass foobared >> $@
 
@@ -163,7 +163,7 @@ work/cluster-node-7479.conf:
 	@echo save \"\" >> $@
 	@echo appendonly no >> $@
 	@echo cluster-enabled yes >> $@
-	@echo cluster-node-timeout 50 >> $@
+	@echo cluster-node-timeout 150 >> $@
 	@echo cluster-config-file $(shell pwd)/work/cluster-node-config-7479.conf >> $@
 	@echo cluster-announce-port 7443 >> $@
 	@echo requirepass foobared >> $@
@@ -179,7 +179,7 @@ work/cluster-node-7480.conf:
 	@echo save \"\" >> $@
 	@echo appendonly no >> $@
 	@echo cluster-enabled yes >> $@
-	@echo cluster-node-timeout 50 >> $@
+	@echo cluster-node-timeout 150 >> $@
 	@echo cluster-config-file $(shell pwd)/work/cluster-node-config-7480.conf >> $@
 	@echo cluster-announce-port 7444 >> $@
 	@echo requirepass foobared >> $@
@@ -195,7 +195,7 @@ work/cluster-node-7481.conf:
 	@echo save \"\" >> $@
 	@echo appendonly no >> $@
 	@echo cluster-enabled yes >> $@
-	@echo cluster-node-timeout 50 >> $@
+	@echo cluster-node-timeout 150 >> $@
 	@echo cluster-config-file $(shell pwd)/work/cluster-node-config-7481.conf >> $@
 	@echo cluster-announce-port 7445 >> $@
 	@echo requirepass foobared >> $@
@@ -213,7 +213,7 @@ work/cluster-node-%.conf:
 	@echo client-output-buffer-limit pubsub 256k 128k 5 >> $@
 	@echo unixsocket $(ROOT_DIR)/work/socket-$* >> $@
 	@echo cluster-enabled yes >> $@
-	@echo cluster-node-timeout 50 >> $@
+	@echo cluster-node-timeout 150 >> $@
 	@echo cluster-config-file $(shell pwd)/work/cluster-node-config-$*.conf >> $@
 
 work/cluster-node-%.pid: work/cluster-node-%.conf work/redis-git/src/redis-server

From b248997e06eff5113cf792bfc984238261526709 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 26 Oct 2016 17:06:57 +0200
Subject: [PATCH 051/808] Provide Timer as part of ClientResources #354

A `io.netty.util.Timer` can now be provided using `ClientResources` to reduce the amount of threads created when creating Redis Client/Cluster Client instances.
---
 .../redis/AbstractRedisClient.java            | 12 ++--
 .../redis/resource/ClientResources.java       | 10 ++++
 .../resource/DefaultClientResources.java      | 55 ++++++++++++++++---
 3 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
index cd651e8151..99596458c0 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
@@ -21,7 +21,6 @@
 import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.channel.*;
 import io.netty.channel.group.ChannelGroup;
-import io.netty.channel.group.ChannelGroupFuture;
 import io.netty.channel.group.DefaultChannelGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioSocketChannel;
@@ -86,7 +85,7 @@ protected AbstractRedisClient(ClientResources clientResources) {
         unit = TimeUnit.SECONDS;
         genericWorkerPool = this.clientResources.eventExecutorGroup();
         channels = new DefaultChannelGroup(genericWorkerPool.next());
-        timer = new HashedWheelTimer();
+        timer = (HashedWheelTimer) this.clientResources.timer();
     }
 
     /**
@@ -245,8 +244,6 @@ public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
 
         if (shutdown.compareAndSet(false, true)) {
 
-            timer.stop();
-
             while (!closeableResources.isEmpty()) {
                 Closeable closeableResource = closeableResources.iterator().next();
                 try {
@@ -268,8 +265,11 @@ public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
                 }
             }
 
-            ChannelGroupFuture closeFuture = channels.close();
-            closeFutures.add(closeFuture);
+            try {
+                closeFutures.add(channels.close());
+            } catch (Exception e) {
+                logger.debug("Cannot close channels", e);
+            }
 
             if (!sharedResources) {
                 clientResources.shutdown(quietPeriod, timeout, timeUnit);
diff --git a/src/main/java/com/lambdaworks/redis/resource/ClientResources.java b/src/main/java/com/lambdaworks/redis/resource/ClientResources.java
index 1ee05ac66f..10e258caf7 100644
--- a/src/main/java/com/lambdaworks/redis/resource/ClientResources.java
+++ b/src/main/java/com/lambdaworks/redis/resource/ClientResources.java
@@ -6,6 +6,7 @@
 import com.lambdaworks.redis.event.EventPublisherOptions;
 import com.lambdaworks.redis.metrics.CommandLatencyCollector;
 
+import io.netty.util.Timer;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.Future;
 
@@ -86,6 +87,15 @@ public interface ClientResources {
      */
     int computationThreadPoolSize();
 
+    /**
+     * Returns the {@link Timer} to schedule events. A timer object may run single- or multi-threaded but must be used for
+     * scheduling of short-running jobs only. Long-running jobs should be scheduled and executed using
+     * {@link #eventExecutorGroup()}.
+     * 
+     * @return the timer.
+     */
+    Timer timer();
+
     /**
      * Returns the event bus used to publish events.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
index 4a63e18955..1ef7721093 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
@@ -19,6 +19,8 @@
 import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollectorOptions;
 import com.lambdaworks.redis.resource.Delay.StatefulDelay;
 
+import io.netty.util.HashedWheelTimer;
+import io.netty.util.Timer;
 import io.netty.util.concurrent.*;
 import io.netty.util.internal.SystemPropertyUtil;
 import io.netty.util.internal.logging.InternalLogger;
@@ -42,6 +44,7 @@
  * <li>a {@code commandLatencyCollector} which is a provided instance of
  * {@link com.lambdaworks.redis.metrics.CommandLatencyCollector}.</li>
  * <li>a {@code dnsResolver} which is a provided instance of {@link DnsResolver}.</li>
+ * <li>a {@code timer} that is a provided instance of {@link io.netty.util.HashedWheelTimer}.</li>
  * </ul>
  *
  * @author Mark Paluch
@@ -74,6 +77,8 @@ public class DefaultClientResources implements ClientResources {
     private final EventLoopGroupProvider eventLoopGroupProvider;
     private final boolean sharedEventExecutor;
     private final EventExecutorGroup eventExecutorGroup;
+    private final Timer timer;
+    private final boolean sharedTimer;
     private final EventBus eventBus;
     private final CommandLatencyCollector commandLatencyCollector;
     private final boolean sharedCommandLatencyCollector;
@@ -120,6 +125,14 @@ protected DefaultClientResources(Builder builder) {
             eventExecutorGroup = builder.eventExecutorGroup;
         }
 
+        if (builder.timer == null) {
+            timer = new HashedWheelTimer(new DefaultThreadFactory("lettuce-timer"));
+            sharedTimer = false;
+        } else {
+            timer = builder.timer;
+            sharedTimer = true;
+        }
+
         if (builder.eventBus == null) {
             eventBus = new DefaultEventBus(Schedulers.fromExecutor(eventExecutorGroup));
         } else {
@@ -191,6 +204,7 @@ public static class Builder {
         private int computationThreadPoolSize = DEFAULT_COMPUTATION_THREADS;
         private EventExecutorGroup eventExecutorGroup;
         private EventLoopGroupProvider eventLoopGroupProvider;
+        private Timer timer;
         private EventBus eventBus;
         private CommandLatencyCollectorOptions commandLatencyCollectorOptions = DefaultCommandLatencyCollectorOptions.create();
         private CommandLatencyCollector commandLatencyCollector;
@@ -215,9 +229,9 @@ public Builder ioThreadPoolSize(int ioThreadPoolSize) {
 
         /**
          * Sets a shared {@link EventLoopGroupProvider event executor provider} that can be used across different instances of
-         * the RedisClient. The provided {@link EventLoopGroupProvider} instance will not be shut down when shutting down the
-         * client resources. You have to take care of that. This is an advanced configuration that should only be used if you
-         * know what you are doing.
+         * {@link com.lambdaworks.redis.RedisClient} and {@link com.lambdaworks.redis.cluster.RedisClusterClient}. The provided
+         * {@link EventLoopGroupProvider} instance will not be shut down when shutting down the client resources. You have to
+         * take care of that. This is an advanced configuration that should only be used if you know what you are doing.
          *
          * @param eventLoopGroupProvider the shared eventLoopGroupProvider
          * @return this
@@ -240,10 +254,10 @@ public Builder computationThreadPoolSize(int computationThreadPoolSize) {
         }
 
         /**
-         * Sets a shared {@link EventExecutorGroup event executor group} that can be used across different instances of the
-         * RedisClient. The provided {@link EventExecutorGroup} instance will not be shut down when shutting down the client
-         * resources. You have to take care of that. This is an advanced configuration that should only be used if you know what
-         * you are doing.
+         * Sets a shared {@link EventExecutorGroup event executor group} that can be used across different instances of
+         * {@link com.lambdaworks.redis.RedisClient} and {@link com.lambdaworks.redis.cluster.RedisClusterClient}. The provided
+         * {@link EventExecutorGroup} instance will not be shut down when shutting down the client resources. You have to take
+         * care of that. This is an advanced configuration that should only be used if you know what you are doing.
          *
          * @param eventExecutorGroup the shared eventExecutorGroup
          * @return this
@@ -253,6 +267,20 @@ public Builder eventExecutorGroup(EventExecutorGroup eventExecutorGroup) {
             return this;
         }
 
+        /**
+         * Sets a shared {@link Timer} that can be used across different instances of {@link com.lambdaworks.redis.RedisClient}
+         * and {@link com.lambdaworks.redis.cluster.RedisClusterClient} The provided {@link Timer} instance will not be shut
+         * down when shutting down the client resources. You have to take care of that. This is an advanced configuration that
+         * should only be used if you know what you are doing.
+         *
+         * @param timer the shared {@link Timer}.
+         * @return this
+         */
+        public Builder timer(Timer timer) {
+            this.timer = timer;
+            return this;
+        }
+
         /**
          * Sets the {@link EventBus} that can that can be used across different instances of the RedisClient.
          *
@@ -315,8 +343,8 @@ public Builder dnsResolver(DnsResolver dnsResolver) {
         }
 
         /**
-         * Sets the stateless reconnect {@link Delay} to delay reconnect attempts. Defaults to binary exponential delay capped at
-         * {@literal 30 SECONDS}. {@code reconnectDelay} must be a stateless {@link Delay}.
+         * Sets the stateless reconnect {@link Delay} to delay reconnect attempts. Defaults to binary exponential delay capped
+         * at {@literal 30 SECONDS}. {@code reconnectDelay} must be a stateless {@link Delay}.
          *
          * @param reconnectDelay the reconnect delay, must not be {@literal null}.
          * @return this
@@ -406,6 +434,10 @@ public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUni
             metricEventPublisher.shutdown();
         }
 
+        if (!sharedTimer) {
+            timer.stop();
+        }
+
         if (!sharedEventLoopGroupProvider) {
             Future<Boolean> shutdown = eventLoopGroupProvider.shutdown(quietPeriod, timeout, timeUnit);
             if (shutdown instanceof Promise) {
@@ -455,6 +487,11 @@ public EventBus eventBus() {
         return eventBus;
     }
 
+    @Override
+    public Timer timer() {
+        return timer;
+    }
+
     @Override
     public CommandLatencyCollector commandLatencyCollector() {
         return commandLatencyCollector;

From 4ab6ceaa7686849b4290a0b76e0b4ad9129f9b15 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 26 Oct 2016 17:16:35 +0200
Subject: [PATCH 052/808] Polishing

Improve JavaDoc. Add not-null assertions to ClientResourcesBuilder.
---
 .../resource/DefaultClientResources.java      | 59 +++++++++++++++----
 .../resource/DefaultClientResourcesTest.java  |  7 ++-
 2 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
index 1ef7721093..91a5b06d26 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
@@ -54,13 +54,23 @@ public class DefaultClientResources implements ClientResources {
 
     protected static final InternalLogger logger = InternalLoggerFactory.getInstance(DefaultClientResources.class);
 
+    /**
+     * Minimum number of I/O threads.
+     */
     public static final int MIN_IO_THREADS = 3;
+
+    /**
+     * Minimum number of computation threads.
+     */
     public static final int MIN_COMPUTATION_THREADS = 3;
 
     public static final int DEFAULT_IO_THREADS;
     public static final int DEFAULT_COMPUTATION_THREADS;
 
-    public static final Supplier<Delay> DEFAULT_RECONNECT_DELAY = () -> Delay.exponential();
+    /**
+     * Default delay {@link Supplier} for {@link Delay#exponential()} delay.
+     */
+    public static final Supplier<Delay> DEFAULT_RECONNECT_DELAY = Delay::exponential;
 
     static {
         int threads = Math.max(1, SystemPropertyUtil.getInt("io.netty.eventLoopThreads",
@@ -219,10 +229,13 @@ private Builder() {
          * Sets the thread pool size (number of threads to use) for I/O operations (default value is the number of CPUs). The
          * thread pool size is only effective if no {@code eventLoopGroupProvider} is provided.
          *
-         * @param ioThreadPoolSize the thread pool size
+         * @param ioThreadPoolSize the thread pool size, must be greater {@code 0}.
          * @return this
          */
         public Builder ioThreadPoolSize(int ioThreadPoolSize) {
+
+            LettuceAssert.isTrue(ioThreadPoolSize > 0, "I/O thread pool size must be greater zero");
+
             this.ioThreadPoolSize = ioThreadPoolSize;
             return this;
         }
@@ -233,10 +246,13 @@ public Builder ioThreadPoolSize(int ioThreadPoolSize) {
          * {@link EventLoopGroupProvider} instance will not be shut down when shutting down the client resources. You have to
          * take care of that. This is an advanced configuration that should only be used if you know what you are doing.
          *
-         * @param eventLoopGroupProvider the shared eventLoopGroupProvider
+         * @param eventLoopGroupProvider the shared eventLoopGroupProvider, must not be {@literal null}.
          * @return this
          */
         public Builder eventLoopGroupProvider(EventLoopGroupProvider eventLoopGroupProvider) {
+
+            LettuceAssert.notNull(eventLoopGroupProvider, "EventLoopGroupProvider must not be null");
+
             this.eventLoopGroupProvider = eventLoopGroupProvider;
             return this;
         }
@@ -245,10 +261,13 @@ public Builder eventLoopGroupProvider(EventLoopGroupProvider eventLoopGroupProvi
          * Sets the thread pool size (number of threads to use) for computation operations (default value is the number of
          * CPUs). The thread pool size is only effective if no {@code eventExecutorGroup} is provided.
          *
-         * @param computationThreadPoolSize the thread pool size
+         * @param computationThreadPoolSize the thread pool size, must be greater {@code 0}.
          * @return this
          */
         public Builder computationThreadPoolSize(int computationThreadPoolSize) {
+
+            LettuceAssert.isTrue(computationThreadPoolSize > 0, "Computation thread pool size must be greater zero");
+
             this.computationThreadPoolSize = computationThreadPoolSize;
             return this;
         }
@@ -259,10 +278,13 @@ public Builder computationThreadPoolSize(int computationThreadPoolSize) {
          * {@link EventExecutorGroup} instance will not be shut down when shutting down the client resources. You have to take
          * care of that. This is an advanced configuration that should only be used if you know what you are doing.
          *
-         * @param eventExecutorGroup the shared eventExecutorGroup
+         * @param eventExecutorGroup the shared eventExecutorGroup, must not be {@literal null}.
          * @return this
          */
         public Builder eventExecutorGroup(EventExecutorGroup eventExecutorGroup) {
+
+            LettuceAssert.notNull(eventExecutorGroup, "EventExecutorGroup must not be null");
+
             this.eventExecutorGroup = eventExecutorGroup;
             return this;
         }
@@ -273,10 +295,13 @@ public Builder eventExecutorGroup(EventExecutorGroup eventExecutorGroup) {
          * down when shutting down the client resources. You have to take care of that. This is an advanced configuration that
          * should only be used if you know what you are doing.
          *
-         * @param timer the shared {@link Timer}.
+         * @param timer the shared {@link Timer}, must not be {@literal null}.
          * @return this
          */
         public Builder timer(Timer timer) {
+
+            LettuceAssert.notNull(timer, "Timer must not be null");
+
             this.timer = timer;
             return this;
         }
@@ -284,10 +309,13 @@ public Builder timer(Timer timer) {
         /**
          * Sets the {@link EventBus} that can that can be used across different instances of the RedisClient.
          *
-         * @param eventBus the event bus
+         * @param eventBus the event bus, must not be {@literal null}.
          * @return this
          */
         public Builder eventBus(EventBus eventBus) {
+
+            LettuceAssert.notNull(eventBus, "EventBus must not be null");
+
             this.eventBus = eventBus;
             return this;
         }
@@ -296,10 +324,13 @@ public Builder eventBus(EventBus eventBus) {
          * Sets the {@link EventPublisherOptions} to publish command latency metrics using the {@link EventBus}.
          *
          * @param commandLatencyPublisherOptions the {@link EventPublisherOptions} to publish command latency metrics using the
-         *        {@link EventBus}.
+         *        {@link EventBus}, must not be {@literal null}.
          * @return this
          */
         public Builder commandLatencyPublisherOptions(EventPublisherOptions commandLatencyPublisherOptions) {
+
+            LettuceAssert.notNull(commandLatencyPublisherOptions, "EventPublisherOptions must not be null");
+
             this.commandLatencyPublisherOptions = commandLatencyPublisherOptions;
             return this;
         }
@@ -308,10 +339,13 @@ public Builder commandLatencyPublisherOptions(EventPublisherOptions commandLaten
          * Sets the {@link CommandLatencyCollectorOptions} that can that can be used across different instances of the
          * RedisClient. The options are only effective if no {@code commandLatencyCollector} is provided.
          *
-         * @param commandLatencyCollectorOptions the command latency collector options
+         * @param commandLatencyCollectorOptions the command latency collector options, must not be {@link null}.
          * @return this
          */
         public Builder commandLatencyCollectorOptions(CommandLatencyCollectorOptions commandLatencyCollectorOptions) {
+
+            LettuceAssert.notNull(commandLatencyCollectorOptions, "CommandLatencyCollectorOptions must not be null");
+
             this.commandLatencyCollectorOptions = commandLatencyCollectorOptions;
             return this;
         }
@@ -319,10 +353,13 @@ public Builder commandLatencyCollectorOptions(CommandLatencyCollectorOptions com
         /**
          * Sets the {@link CommandLatencyCollector} that can that can be used across different instances of the RedisClient.
          *
-         * @param commandLatencyCollector the command latency collector
+         * @param commandLatencyCollector the command latency collector, must not be {@literal null}.
          * @return this
          */
         public Builder commandLatencyCollector(CommandLatencyCollector commandLatencyCollector) {
+
+            LettuceAssert.notNull(commandLatencyCollector, "CommandLatencyCollector must not be null");
+
             this.commandLatencyCollector = commandLatencyCollector;
             return this;
         }
@@ -336,7 +373,7 @@ public Builder commandLatencyCollector(CommandLatencyCollector commandLatencyCol
          */
         public Builder dnsResolver(DnsResolver dnsResolver) {
 
-            LettuceAssert.notNull(dnsResolver, "DNSResolver must not be null");
+            LettuceAssert.notNull(dnsResolver, "DnsResolver must not be null");
 
             this.dnsResolver = dnsResolver;
             return this;
diff --git a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java b/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
index 4148f8c57f..258a15f380 100644
--- a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
@@ -8,6 +8,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+import io.netty.util.Timer;
 import org.junit.Test;
 
 import com.lambdaworks.redis.FastShutdown;
@@ -84,21 +85,25 @@ public void testProvidedResources() throws Exception {
 
         EventExecutorGroup executorMock = mock(EventExecutorGroup.class);
         EventLoopGroupProvider groupProviderMock = mock(EventLoopGroupProvider.class);
+        Timer timerMock = mock(Timer.class);
         EventBus eventBusMock = mock(EventBus.class);
         CommandLatencyCollector latencyCollectorMock = mock(CommandLatencyCollector.class);
 
         DefaultClientResources sut = DefaultClientResources.builder().eventExecutorGroup(executorMock)
-                .eventLoopGroupProvider(groupProviderMock).eventBus(eventBusMock).commandLatencyCollector(latencyCollectorMock)
+                .eventLoopGroupProvider(groupProviderMock).timer(timerMock).eventBus(eventBusMock)
+                .commandLatencyCollector(latencyCollectorMock)
                 .build();
 
         assertThat(sut.eventExecutorGroup()).isSameAs(executorMock);
         assertThat(sut.eventLoopGroupProvider()).isSameAs(groupProviderMock);
+        assertThat(sut.timer()).isSameAs(timerMock);
         assertThat(sut.eventBus()).isSameAs(eventBusMock);
 
         assertThat(sut.shutdown().get()).isTrue();
 
         verifyZeroInteractions(executorMock);
         verifyZeroInteractions(groupProviderMock);
+        verifyZeroInteractions(timerMock);
         verify(latencyCollectorMock).isEnabled();
         verifyNoMoreInteractions(latencyCollectorMock);
     }

From cc64a19cc54eb8b94ac747f4a8662cab449dad19 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 26 Oct 2016 17:23:53 +0200
Subject: [PATCH 053/808] Use predefined keys and values in KeysAndValues for
 tests

---
 .../{RandomKeys.java => KeysAndValues.java}   | 27 ++++------
 .../redis/ReactiveStreamingOutputTest.java    | 14 ++---
 .../cluster/AdvancedClusterClientTest.java    | 19 +++----
 .../cluster/AdvancedClusterReactiveTest.java  | 51 ++++++++++---------
 4 files changed, 53 insertions(+), 58 deletions(-)
 rename src/test/java/com/lambdaworks/{RandomKeys.java => KeysAndValues.java} (52%)

diff --git a/src/test/java/com/lambdaworks/RandomKeys.java b/src/test/java/com/lambdaworks/KeysAndValues.java
similarity index 52%
rename from src/test/java/com/lambdaworks/RandomKeys.java
rename to src/test/java/com/lambdaworks/KeysAndValues.java
index 95ee0cf500..9c0019cba4 100644
--- a/src/test/java/com/lambdaworks/RandomKeys.java
+++ b/src/test/java/com/lambdaworks/KeysAndValues.java
@@ -2,22 +2,20 @@
 
 import java.util.*;
 
-import org.apache.commons.lang3.RandomStringUtils;
-
 /**
- * Random keys for testing slot-hashes.
+ * Keys for testing slot-hashes.
  * 
  * @author Mark Paluch
  */
-public class RandomKeys {
+public class KeysAndValues {
 
     /**
-     * Ordered list of random keys. The order corresponds with the list of {@code VALUES}.
+     * Ordered list of keys. The order corresponds with the list of {@code VALUES}.
      */
     public static final List<String> KEYS;
 
     /**
-     * Ordered list of random values. The order corresponds with the list of {@code KEYS}.
+     * Ordered list of values. The order corresponds with the list of {@code KEYS}.
      */
     public static final List<String> VALUES;
 
@@ -36,24 +34,19 @@ public class RandomKeys {
         List<String> keys = new ArrayList<>();
         List<String> values = new ArrayList<>();
         Map<String, String> map = new HashMap<>();
-        Set<String> uniqueKeys = new HashSet<>();
-
-        while (map.size() < COUNT) {
 
-            String key = RandomStringUtils.random(10, true, true);
-            String value = RandomStringUtils.random(10, true, true);
+        for (int i = 0; i < COUNT; i++) {
 
-            if (uniqueKeys.add(key)) {
+            String key = "key-" + i;
+            String value = "value-" + i;
 
-                keys.add(key);
-                values.add(value);
-                map.put(key, value);
-            }
+            keys.add(key);
+            values.add(value);
+            map.put(key, value);
         }
 
         KEYS = Collections.unmodifiableList(keys);
         VALUES = Collections.unmodifiableList(values);
         MAP = Collections.unmodifiableMap(map);
     }
-
 }
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java b/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
index 4d39b19e38..1e19c554f3 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
@@ -11,7 +11,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import com.lambdaworks.RandomKeys;
+import com.lambdaworks.KeysAndValues;
 import com.lambdaworks.redis.GeoArgs.Unit;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
@@ -42,12 +42,12 @@ public void closeReactiveConnection() throws Exception {
     @Test
     public void keyListCommandShouldReturnAllElements() throws Exception {
 
-        redis.mset(RandomKeys.MAP);
+        redis.mset(KeysAndValues.MAP);
 
         reactive.keys("*").subscribe(subscriber);
         subscriber.await();
 
-        assertThat(getValues()).containsAll(RandomKeys.KEYS);
+        assertThat(getValues()).containsAll(KeysAndValues.KEYS);
     }
 
     public  List<String> getValues() {
@@ -61,17 +61,17 @@ public  <T> List<T> getValues(TestSubscriber<T> subscriber) {
     @Test
     public void valueListCommandShouldReturnAllElements() throws Exception {
 
-        redis.mset(RandomKeys.MAP);
+        redis.mset(KeysAndValues.MAP);
 
         TestSubscriber<KeyValue<String, String>> subscriber = TestSubscriber.create();
 
-        reactive.mget(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT])).subscribe(subscriber);
+        reactive.mget(KeysAndValues.KEYS.toArray(new String[KeysAndValues.COUNT])).subscribe(subscriber);
         subscriber.await();
 
         assertThat(getValues(subscriber).stream().map(KeyValue::getValue).collect(Collectors.toList()))
-                .containsAll(RandomKeys.VALUES);
+                .containsAll(KeysAndValues.VALUES);
         assertThat(getValues(subscriber).stream().map(KeyValue::getKey).collect(Collectors.toList()))
-                .containsAll(RandomKeys.KEYS);
+                .containsAll(KeysAndValues.KEYS);
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
index fac9504b05..0e93178897 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
@@ -11,7 +11,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.lambdaworks.RandomKeys;
+import com.lambdaworks.KeysAndValues;
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
@@ -470,7 +470,7 @@ public void pipelining() throws Exception {
     public void clusterScan() throws Exception {
 
         RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
-        sync.mset(RandomKeys.MAP);
+        sync.mset(KeysAndValues.MAP);
 
         Set<String> allKeys = new HashSet<>();
 
@@ -485,7 +485,7 @@ public void clusterScan() throws Exception {
             allKeys.addAll(scanCursor.getKeys());
         } while (!scanCursor.isFinished());
 
-        assertThat(allKeys).containsAll(RandomKeys.KEYS);
+        assertThat(allKeys).containsAll(KeysAndValues.KEYS);
 
     }
 
@@ -493,7 +493,7 @@ public void clusterScan() throws Exception {
     public void clusterScanWithArgs() throws Exception {
 
         RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
-        sync.mset(RandomKeys.MAP);
+        sync.mset(KeysAndValues.MAP);
 
         Set<String> allKeys = new HashSet<>();
 
@@ -508,7 +508,8 @@ public void clusterScanWithArgs() throws Exception {
             allKeys.addAll(scanCursor.getKeys());
         } while (!scanCursor.isFinished());
 
-        assertThat(allKeys).containsAll(RandomKeys.KEYS.stream().filter(k -> k.startsWith("a")).collect(Collectors.toList()));
+        assertThat(allKeys)
+                .containsAll(KeysAndValues.KEYS.stream().filter(k -> k.startsWith("a")).collect(Collectors.toList()));
 
     }
 
@@ -516,7 +517,7 @@ public void clusterScanWithArgs() throws Exception {
     public void clusterScanStreaming() throws Exception {
 
         RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
-        sync.mset(RandomKeys.MAP);
+        sync.mset(KeysAndValues.MAP);
 
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
@@ -530,7 +531,7 @@ public void clusterScanStreaming() throws Exception {
             }
         } while (!scanCursor.isFinished());
 
-        assertThat(adapter.getList()).containsAll(RandomKeys.KEYS);
+        assertThat(adapter.getList()).containsAll(KeysAndValues.KEYS);
 
     }
 
@@ -538,7 +539,7 @@ public void clusterScanStreaming() throws Exception {
     public void clusterScanStreamingWithArgs() throws Exception {
 
         RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
-        sync.mset(RandomKeys.MAP);
+        sync.mset(KeysAndValues.MAP);
 
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
@@ -552,7 +553,7 @@ public void clusterScanStreamingWithArgs() throws Exception {
         } while (!scanCursor.isFinished());
 
         assertThat(adapter.getList())
-                .containsAll(RandomKeys.KEYS.stream().filter(k -> k.startsWith("a")).collect(Collectors.toList()));
+                .containsAll(KeysAndValues.KEYS.stream().filter(k -> k.startsWith("a")).collect(Collectors.toList()));
 
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
index 57115d04d2..81d4db86e1 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
@@ -12,7 +12,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.lambdaworks.RandomKeys;
+import com.lambdaworks.KeysAndValues;
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
@@ -62,12 +62,12 @@ public void invalidHost() throws Exception {
     @Test
     public void msetCrossSlot() throws Exception {
 
-        Mono<String> mset = commands.mset(RandomKeys.MAP);
+        Mono<String> mset = commands.mset(KeysAndValues.MAP);
         assertThat(block(mset)).isEqualTo("OK");
 
-        for (String mykey : RandomKeys.KEYS) {
+        for (String mykey : KeysAndValues.KEYS) {
             String s1 = syncCommands.get(mykey);
-            assertThat(s1).isEqualTo(RandomKeys.MAP.get(mykey));
+            assertThat(s1).isEqualTo(KeysAndValues.MAP.get(mykey));
         }
     }
 
@@ -93,14 +93,14 @@ public void mgetCrossSlot() throws Exception {
 
         msetCrossSlot();
 
-        Map<Integer, List<String>> partitioned = SlotHash.partition(new Utf8StringCodec(), RandomKeys.KEYS);
+        Map<Integer, List<String>> partitioned = SlotHash.partition(new Utf8StringCodec(), KeysAndValues.KEYS);
         assertThat(partitioned.size()).isGreaterThan(100);
 
-        Flux<KeyValue<String, String>> flux = commands.mget(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
+        Flux<KeyValue<String, String>> flux = commands.mget(KeysAndValues.KEYS.toArray(new String[KeysAndValues.COUNT]));
         List<KeyValue<String, String>> result = flux.collectList().block();
 
-        assertThat(result).hasSize(RandomKeys.COUNT);
-        assertThat(result.stream().map(Value::getValue).collect(Collectors.toList())).isEqualTo(RandomKeys.VALUES);
+        assertThat(result).hasSize(KeysAndValues.COUNT);
+        assertThat(result.stream().map(Value::getValue).collect(Collectors.toList())).isEqualTo(KeysAndValues.VALUES);
     }
 
     @Test
@@ -110,11 +110,11 @@ public void mgetCrossSlotStreaming() throws Exception {
 
         KeyValueStreamingAdapter<String, String> result = new KeyValueStreamingAdapter<>();
 
-        Mono<Long> mono = commands.mget(result, RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
+        Mono<Long> mono = commands.mget(result, KeysAndValues.KEYS.toArray(new String[KeysAndValues.COUNT]));
         Long count = block(mono);
 
-        assertThat(result.getMap()).hasSize(RandomKeys.COUNT);
-        assertThat(count).isEqualTo(RandomKeys.COUNT);
+        assertThat(result.getMap()).hasSize(KeysAndValues.COUNT);
+        assertThat(count).isEqualTo(KeysAndValues.COUNT);
     }
 
     @Test
@@ -122,12 +122,12 @@ public void delCrossSlot() throws Exception {
 
         msetCrossSlot();
 
-        Mono<Long> mono = commands.del(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
+        Mono<Long> mono = commands.del(KeysAndValues.KEYS.toArray(new String[KeysAndValues.COUNT]));
         Long result = block(mono);
 
-        assertThat(result).isEqualTo(RandomKeys.COUNT);
+        assertThat(result).isEqualTo(KeysAndValues.COUNT);
 
-        for (String mykey : RandomKeys.KEYS) {
+        for (String mykey : KeysAndValues.KEYS) {
             String s1 = syncCommands.get(mykey);
             assertThat(s1).isNull();
         }
@@ -138,12 +138,12 @@ public void unlinkCrossSlot() throws Exception {
 
         msetCrossSlot();
 
-        Mono<Long> mono = commands.unlink(RandomKeys.KEYS.toArray(new String[RandomKeys.COUNT]));
+        Mono<Long> mono = commands.unlink(KeysAndValues.KEYS.toArray(new String[KeysAndValues.COUNT]));
         Long result = block(mono);
 
-        assertThat(result).isEqualTo(RandomKeys.COUNT);
+        assertThat(result).isEqualTo(KeysAndValues.COUNT);
 
-        for (String mykey : RandomKeys.KEYS) {
+        for (String mykey : KeysAndValues.KEYS) {
             String s1 = syncCommands.get(mykey);
             assertThat(s1).isNull();
         }
@@ -272,7 +272,7 @@ public void readFromSlaves() throws Exception {
     public void clusterScan() throws Exception {
 
         RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
-        sync.mset(RandomKeys.MAP);
+        sync.mset(KeysAndValues.MAP);
 
         Set<String> allKeys = new HashSet<>();
 
@@ -287,7 +287,7 @@ public void clusterScan() throws Exception {
             allKeys.addAll(scanCursor.getKeys());
         } while (!scanCursor.isFinished());
 
-        assertThat(allKeys).containsAll(RandomKeys.KEYS);
+        assertThat(allKeys).containsAll(KeysAndValues.KEYS);
 
     }
 
@@ -295,7 +295,7 @@ public void clusterScan() throws Exception {
     public void clusterScanWithArgs() throws Exception {
 
         RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
-        sync.mset(RandomKeys.MAP);
+        sync.mset(KeysAndValues.MAP);
 
         Set<String> allKeys = new HashSet<>();
 
@@ -310,7 +310,8 @@ public void clusterScanWithArgs() throws Exception {
             allKeys.addAll(scanCursor.getKeys());
         } while (!scanCursor.isFinished());
 
-        assertThat(allKeys).containsAll(RandomKeys.KEYS.stream().filter(k -> k.startsWith("a")).collect(Collectors.toList()));
+        assertThat(allKeys)
+                .containsAll(KeysAndValues.KEYS.stream().filter(k -> k.startsWith("a")).collect(Collectors.toList()));
 
     }
 
@@ -318,7 +319,7 @@ public void clusterScanWithArgs() throws Exception {
     public void clusterScanStreaming() throws Exception {
 
         RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
-        sync.mset(RandomKeys.MAP);
+        sync.mset(KeysAndValues.MAP);
 
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
@@ -332,7 +333,7 @@ public void clusterScanStreaming() throws Exception {
             }
         } while (!scanCursor.isFinished());
 
-        assertThat(adapter.getList()).containsAll(RandomKeys.KEYS);
+        assertThat(adapter.getList()).containsAll(KeysAndValues.KEYS);
 
     }
 
@@ -340,7 +341,7 @@ public void clusterScanStreaming() throws Exception {
     public void clusterScanStreamingWithArgs() throws Exception {
 
         RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
-        sync.mset(RandomKeys.MAP);
+        sync.mset(KeysAndValues.MAP);
 
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
@@ -355,7 +356,7 @@ public void clusterScanStreamingWithArgs() throws Exception {
         } while (!scanCursor.isFinished());
 
         assertThat(adapter.getList()).containsAll(
-                RandomKeys.KEYS.stream().filter(k -> k.startsWith("a")).collect(Collectors.toList()));
+                KeysAndValues.KEYS.stream().filter(k -> k.startsWith("a")).collect(Collectors.toList()));
 
     }
 

From 5d4c541517c2967a3e9313605f0b84a2eb4bacff Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 26 Oct 2016 17:34:00 +0200
Subject: [PATCH 054/808] Expose Value.map methods #386

---
 src/main/java/com/lambdaworks/redis/KeyValue.java    | 2 +-
 src/main/java/com/lambdaworks/redis/ScoredValue.java | 4 ++--
 src/main/java/com/lambdaworks/redis/Value.java       | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/KeyValue.java b/src/main/java/com/lambdaworks/redis/KeyValue.java
index 2120f3d01b..9e79063076 100644
--- a/src/main/java/com/lambdaworks/redis/KeyValue.java
+++ b/src/main/java/com/lambdaworks/redis/KeyValue.java
@@ -149,7 +149,7 @@ public K getKey() {
      * @return the new {@link KeyValue}
      */
     @SuppressWarnings("unchecked")
-    <R> KeyValue<K, R> map(Function<? super V, ? extends R> mapper) {
+    public <R> KeyValue<K, R> map(Function<? super V, ? extends R> mapper) {
 
         LettuceAssert.notNull(mapper, "Mapper function must not be null");
 
diff --git a/src/main/java/com/lambdaworks/redis/ScoredValue.java b/src/main/java/com/lambdaworks/redis/ScoredValue.java
index f3530ea243..c288da7ba3 100644
--- a/src/main/java/com/lambdaworks/redis/ScoredValue.java
+++ b/src/main/java/com/lambdaworks/redis/ScoredValue.java
@@ -139,7 +139,7 @@ public String toString() {
      * @return the new {@link ScoredValue}
      */
     @SuppressWarnings("unchecked")
-    <R> ScoredValue<R> map(Function<? super V, ? extends R> mapper) {
+    public <R> ScoredValue<R> map(Function<? super V, ? extends R> mapper) {
 
         LettuceAssert.notNull(mapper, "Mapper function must not be null");
 
@@ -158,7 +158,7 @@ <R> ScoredValue<R> map(Function<? super V, ? extends R> mapper) {
      * @return the new {@link ScoredValue}
      */
     @SuppressWarnings("unchecked")
-    ScoredValue<V> mapScore(Function<? super Number, ? extends Number> mapper) {
+    public ScoredValue<V> mapScore(Function<? super Number, ? extends Number> mapper) {
 
         LettuceAssert.notNull(mapper, "Mapper function must not be null");
 
diff --git a/src/main/java/com/lambdaworks/redis/Value.java b/src/main/java/com/lambdaworks/redis/Value.java
index 7c28f6e1a9..50ab1f00cb 100644
--- a/src/main/java/com/lambdaworks/redis/Value.java
+++ b/src/main/java/com/lambdaworks/redis/Value.java
@@ -212,7 +212,8 @@ public <X extends Throwable> V getValueOrElseThrow(Supplier<? extends X> excepti
      * @return the new {@link Value}
      */
     @SuppressWarnings("unchecked")
-    <R> Value<R> map(Function<? super V, ? extends R> mapper) {
+    public <R> Value<R> map(Function<? super V, ? extends R> mapper) {
+
         LettuceAssert.notNull(mapper, "Mapper function must not be null");
 
         if (hasValue()) {

From a5d7af9b96c1b8f7d238772c912a9e92ea21a31e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 26 Oct 2016 17:40:59 +0200
Subject: [PATCH 055/808] Provide Value.ifEmpty() and Value.ifHasValue()
 callbacks #386

Provide monad callbacks if Value has a value/is empty to facilitate functional programming.
---
 .../java/com/lambdaworks/redis/Value.java     | 29 +++++++++++++
 .../java/com/lambdaworks/redis/ValueTest.java | 43 ++++++++++++++++++-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lambdaworks/redis/Value.java b/src/main/java/com/lambdaworks/redis/Value.java
index 50ab1f00cb..61c871bdd5 100644
--- a/src/main/java/com/lambdaworks/redis/Value.java
+++ b/src/main/java/com/lambdaworks/redis/Value.java
@@ -3,6 +3,7 @@
 import java.io.Serializable;
 import java.util.NoSuchElementException;
 import java.util.Optional;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
@@ -223,6 +224,34 @@ public <R> Value<R> map(Function<? super V, ? extends R> mapper) {
         return (Value<R>) this;
     }
 
+    /**
+     * If a value is present, invoke the specified {@link java.util.function.Consumer} with the value, otherwise do nothing.
+     *
+     * @param consumer block to be executed if a value is present, must not be {@literal null}.
+     */
+    public void ifHasValue(Consumer<? super V> consumer) {
+
+        LettuceAssert.notNull(consumer, "Consumer must not be null");
+
+        if (hasValue()) {
+            consumer.accept(getValue());
+        }
+    }
+
+    /**
+     * If no value is present, invoke the specified {@link Runnable}, otherwise do nothing.
+     *
+     * @param runnable block to be executed if no value value is present, must not be {@literal null}.
+     */
+    public void ifEmpty(Runnable runnable) {
+
+        LettuceAssert.notNull(runnable, "Runnable must not be null");
+
+        if (!hasValue()) {
+            runnable.run();
+        }
+    }
+
     /**
      * Returns an {@link Optional} wrapper for the value.
      * 
diff --git a/src/test/java/com/lambdaworks/redis/ValueTest.java b/src/test/java/com/lambdaworks/redis/ValueTest.java
index 40563b35ba..5bfa8361d4 100644
--- a/src/test/java/com/lambdaworks/redis/ValueTest.java
+++ b/src/test/java/com/lambdaworks/redis/ValueTest.java
@@ -4,6 +4,7 @@
 
 import java.util.NoSuchElementException;
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.Test;
 
@@ -148,6 +149,46 @@ public void mapShouldMapValue() {
         assertThat(value.map(s -> s + "-world").getValue()).isEqualTo("hello-world");
     }
 
+    @Test
+    public void ifHasValueShouldExecuteCallback() {
+
+        Value<String> value = Value.just("hello");
+        AtomicBoolean atomicBoolean = new AtomicBoolean();
+        value.ifHasValue(s -> atomicBoolean.set(true));
+
+        assertThat(atomicBoolean.get()).isTrue();
+    }
+
+    @Test
+    public void emptyValueShouldNotExecuteIfHasValueCallback() {
+
+        Value<String> value = Value.empty();
+        AtomicBoolean atomicBoolean = new AtomicBoolean();
+        value.ifHasValue(s -> atomicBoolean.set(true));
+
+        assertThat(atomicBoolean.get()).isFalse();
+    }
+
+    @Test
+    public void ifEmptyShouldExecuteCallback() {
+
+        Value<String> value = Value.empty();
+        AtomicBoolean atomicBoolean = new AtomicBoolean();
+        value.ifEmpty(() -> atomicBoolean.set(true));
+
+        assertThat(atomicBoolean.get()).isTrue();
+    }
+
+    @Test
+    public void valueShouldNotExecuteIfEmptyCallback() {
+
+        Value<String> value = Value.just("hello");
+        AtomicBoolean atomicBoolean = new AtomicBoolean();
+        value.ifEmpty(() -> atomicBoolean.set(true));
+
+        assertThat(atomicBoolean.get()).isFalse();
+    }
+
     @Test
     public void emptyValueMapShouldNotMapEmptyValue() {
 
@@ -200,4 +241,4 @@ public void streamShouldCreateAStream() {
 
         assertThat(empty.stream().count()).isEqualTo(1);
     }
-}
\ No newline at end of file
+}

From 73c7d77de6342758fb31e954c2b296b1ba2abd7c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 17 Oct 2016 14:46:05 +0200
Subject: [PATCH 056/808] Provide a dynamic Redis Command API #371

Redis exposes a huge amount of API methods that all available in different command interfaces. Those interfaces carry a lot of different methods with overloads so using the API always requires searching for the right method.

Users can declare their own command interfaces and argument sequences where the command name is derived from the method name or provided with `@Command`. Introduction of new commands does not require users to wait for a new lettuce release but they can invoke commands through own declaration. That interface could be also supporting different key and value types, depending on the use-case.

Commands are executed applying synchronization, asynchronous and in a reactive fashion, depending on the method declaration.

Example:

public interface MyRedisCommands {

    String get(String key); // Synchronous Execution of GET

    @Command("GET")
    byte[] getAsBytes(String key); // Synchronous Execution of GET returning data as byte array

    @Command("SET") // synchronous execution applying a Timeout
    String setSync(String key, String value, Timeout timeout);

    Future<String> set(String key, String value); // asynchronous SET execution

    @Command("SET")
    Mono<String> setReactive(String key, String value); // reactive SET execution using SetArgs

    @CommandNaming(split = DOT) // support for Redis Module command notation -> NR.RUN
    double nrRun(String key, int... indexes);
}

RedisCommandFactory factory = new RedisCommandFactory(connection);

MyRedisCommands commands = factory.getCommands(MyRedisCommands.class);

String value = commands.get("key");
---
 .../com/lambdaworks/redis/BitFieldArgs.java   |    4 +-
 .../lambdaworks/redis/CompositeArgument.java  |   33 +
 .../java/com/lambdaworks/redis/GeoArgs.java   |    2 +-
 .../lambdaworks/redis/GeoRadiusStoreArgs.java |    2 +-
 .../java/com/lambdaworks/redis/KillArgs.java  |    4 +-
 .../com/lambdaworks/redis/LettuceStrings.java |   55 +
 .../com/lambdaworks/redis/MigrateArgs.java    |    2 +-
 .../java/com/lambdaworks/redis/ScanArgs.java  |    8 +-
 .../java/com/lambdaworks/redis/SetArgs.java   |    2 +-
 .../java/com/lambdaworks/redis/SortArgs.java  |   11 +-
 .../java/com/lambdaworks/redis/ZAddArgs.java  |    2 +-
 .../com/lambdaworks/redis/ZStoreArgs.java     |    4 +-
 .../CodecAwareMethodParametersAccessor.java   |   93 ++
 .../dynamic/CommandCreationException.java     |   20 +
 .../redis/dynamic/CommandFactory.java         |   23 +
 .../redis/dynamic/CommandMethod.java          |  173 +++
 .../dynamic/CommandMethodSyntaxException.java |   11 +
 .../redis/dynamic/CommandMethodVerifier.java  |  191 +++
 .../dynamic/CommandSegmentCommandFactory.java |   81 +
 .../DefaultMethodParametersAccessor.java      |  114 ++
 .../dynamic/DefaultRedisCommandsMetadata.java |  130 ++
 .../redis/dynamic/ParameterBinder.java        |  120 ++
 .../ReactiveCommandSegmentCommandFactory.java |   53 +
 .../redis/dynamic/ReactiveWrappers.java       |   69 +
 .../redis/dynamic/RedisCommandFactory.java    |  408 +++++
 .../redis/dynamic/RedisCommandsMetadata.java  |   22 +
 .../redis/dynamic/annotation/Command.java     |   44 +
 .../dynamic/annotation/CommandNaming.java     |   69 +
 .../redis/dynamic/annotation/Key.java         |   16 +
 .../redis/dynamic/annotation/Param.java       |   23 +
 .../redis/dynamic/annotation/Value.java       |   16 +
 .../dynamic/annotation/package-info.java      |    4 +
 .../codec/AnnotationRedisCodecResolver.java   |  197 +++
 .../dynamic/codec/RedisCodecResolver.java     |   21 +
 .../redis/dynamic/domain/FlushMode.java       |    8 +
 .../redis/dynamic/domain/Timeout.java         |   55 +
 .../redis/dynamic/domain/package-info.java    |    4 +
 .../intercept/DefaultMethodInvocation.java    |   30 +
 .../intercept/InvocationProxyFactory.java     |  113 ++
 .../dynamic/intercept/MethodInterceptor.java  |   24 +
 .../dynamic/intercept/MethodInvocation.java   |   36 +
 .../redis/dynamic/intercept/package-info.java |    4 +
 .../CodecAwareOutputFactoryResolver.java      |   90 ++
 .../dynamic/output/CommandOutputFactory.java  |   24 +
 .../output/CommandOutputFactoryResolver.java  |   33 +
 .../output/CommandOutputResolverSupport.java  |   73 +
 .../redis/dynamic/output/OutputRegistry.java  |  197 +++
 ...tRegistryCommandOutputFactoryResolver.java |   89 ++
 .../redis/dynamic/output/OutputSelector.java  |   99 ++
 .../redis/dynamic/output/OutputType.java      |   90 ++
 .../redis/dynamic/output/VoidOutput.java      |   34 +
 .../redis/dynamic/output/package-info.java    |    4 +
 .../redis/dynamic/package-info.java           |    4 +
 .../ExecutionSpecificParameters.java          |   86 ++
 .../parameter/MethodParametersAccessor.java   |   60 +
 .../redis/dynamic/parameter/Parameter.java    |  122 ++
 .../redis/dynamic/parameter/Parameters.java   |   92 ++
 .../redis/dynamic/parameter/package-info.java |    4 +
 .../AnnotationCommandSegmentFactory.java      |  214 +++
 .../redis/dynamic/segment/CommandSegment.java |  146 ++
 .../segment/CommandSegmentFactory.java        |   20 +
 .../dynamic/segment/CommandSegments.java      |   80 +
 .../redis/dynamic/segment/package-info.java   |    4 +
 .../AnnotationParameterNameDiscoverer.java    |   62 +
 .../dynamic/support/ClassTypeInformation.java |  165 ++
 .../CompositeParameterNameDiscoverer.java     |   50 +
 .../support/GenericArrayTypeInformation.java  |   48 +
 .../dynamic/support/GenericTypeResolver.java  |   70 +
 .../dynamic/support/MethodParameter.java      |  511 +++++++
 .../support/ParameterNameDiscoverer.java      |   31 +
 .../support/ParametrizedTypeInformation.java  |  182 +++
 .../ParentTypeAwareTypeInformation.java       |   79 +
 .../dynamic/support/ReflectionUtils.java      |  351 +++++
 .../redis/dynamic/support/ResolvableType.java | 1350 +++++++++++++++++
 ...dardReflectionParameterNameDiscoverer.java |   43 +
 .../redis/dynamic/support/TypeDiscoverer.java |  365 +++++
 .../dynamic/support/TypeInformation.java      |  115 ++
 .../support/TypeVariableTypeInformation.java  |   95 ++
 .../redis/dynamic/support/TypeWrapper.java    |  349 +++++
 .../redis/dynamic/support/package-info.java   |    4 +
 .../redis/internal/LettuceClassUtils.java     |   77 +
 .../redis/protocol/CommandArgs.java           |   34 +-
 .../resource/DefaultClientResources.java      |    4 +-
 .../redis/dynamic/CommandMethodTest.java      |   56 +
 .../dynamic/CommandMethodVerifierTest.java    |  114 ++
 .../CommandSegmentCommandFactoryTest.java     |  163 ++
 ...ctiveCommandSegmentCommandFactoryTest.java |   73 +
 .../redis/dynamic/RedisCommandsTest.java      |  106 ++
 .../AnnotationRedisCodecResolverTest.java     |  100 ++
 .../intercept/InvocationProxyFactoryTest.java |   47 +
 .../output/CodecAwareOutputResolverTest.java  |  136 ++
 ...istryCommandOutputFactoryResolverTest.java |  129 ++
 .../dynamic/output/OutputRegistryTest.java    |   64 +
 .../AnnotationCommandSegmentFactoryTest.java  |  110 ++
 94 files changed, 8929 insertions(+), 20 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/CompositeArgument.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/ReactiveWrappers.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/annotation/CommandNaming.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/annotation/Key.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/annotation/Param.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/annotation/Value.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/annotation/package-info.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/codec/RedisCodecResolver.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/domain/FlushMode.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/domain/Timeout.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/domain/package-info.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/intercept/DefaultMethodInvocation.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptor.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInvocation.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/intercept/package-info.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactoryResolver.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/output/VoidOutput.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/output/package-info.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/package-info.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/parameter/MethodParametersAccessor.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameter.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/parameter/package-info.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactory.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegments.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/segment/package-info.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/AnnotationParameterNameDiscoverer.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/CompositeParameterNameDiscoverer.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/GenericTypeResolver.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/MethodParameter.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/ParameterNameDiscoverer.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/ParentTypeAwareTypeInformation.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/ReflectionUtils.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/StandardReflectionParameterNameDiscoverer.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/TypeWrapper.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/package-info.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/CommandMethodTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java

diff --git a/src/main/java/com/lambdaworks/redis/BitFieldArgs.java b/src/main/java/com/lambdaworks/redis/BitFieldArgs.java
index a24a9b2315..82ec346ccd 100644
--- a/src/main/java/com/lambdaworks/redis/BitFieldArgs.java
+++ b/src/main/java/com/lambdaworks/redis/BitFieldArgs.java
@@ -16,7 +16,7 @@
  * @author Mark Paluch
  * @since 4.2
  */
-public class BitFieldArgs {
+public class BitFieldArgs implements CompositeArgument {
 
     private List<SubCommand> commands;
 
@@ -528,7 +528,7 @@ private abstract static class SubCommand {
         abstract <K, V> void build(CommandArgs<K, V> args);
     }
 
-    <K, V> void build(CommandArgs<K, V> args) {
+    public <K, V> void build(CommandArgs<K, V> args) {
 
         for (SubCommand command : commands) {
             command.build(args);
diff --git a/src/main/java/com/lambdaworks/redis/CompositeArgument.java b/src/main/java/com/lambdaworks/redis/CompositeArgument.java
new file mode 100644
index 0000000000..8864b65164
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/CompositeArgument.java
@@ -0,0 +1,33 @@
+package com.lambdaworks.redis;
+
+import com.lambdaworks.redis.protocol.CommandArgs;
+
+/**
+ * Interface for composite command argument objects. Implementing classes of {@link CompositeArgument} consolidate multiple
+ * arguments for a particular Redis command in to one type and reduce the amount of individual arguments passed in a method
+ * signature.
+ * <p>
+ * Command builder call {@link #build(CommandArgs)} during command construction to contribute command arguments for command
+ * invocation. A composite argument is usually stateless as it can be reused multiple times by different commands.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ * @see CommandArgs
+ * @see SetArgs
+ * @see ZStoreArgs
+ * @see GeoArgs
+ */
+public interface CompositeArgument {
+
+    /**
+     * Build command arguments and contribute arguments to {@link CommandArgs}.
+     * <p>
+     * Implementing classes are required to implement this method. Depending on the command nature and configured arguments,
+     * this method may contribute arguments but is not required to add arguments if none are specified.
+     *
+     * @param args the command arguments, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     */
+    <K, V> void build(CommandArgs<K, V> args);
+}
diff --git a/src/main/java/com/lambdaworks/redis/GeoArgs.java b/src/main/java/com/lambdaworks/redis/GeoArgs.java
index e443e92c5f..2780ea6a64 100644
--- a/src/main/java/com/lambdaworks/redis/GeoArgs.java
+++ b/src/main/java/com/lambdaworks/redis/GeoArgs.java
@@ -9,7 +9,7 @@
  * 
  * @author Mark Paluch
  */
-public class GeoArgs {
+public class GeoArgs implements CompositeArgument {
 
     private boolean withdistance;
     private boolean withcoordinates;
diff --git a/src/main/java/com/lambdaworks/redis/GeoRadiusStoreArgs.java b/src/main/java/com/lambdaworks/redis/GeoRadiusStoreArgs.java
index 66981f78db..65ba799269 100644
--- a/src/main/java/com/lambdaworks/redis/GeoRadiusStoreArgs.java
+++ b/src/main/java/com/lambdaworks/redis/GeoRadiusStoreArgs.java
@@ -10,7 +10,7 @@
  *
  * @author Mark Paluch
  */
-public class GeoRadiusStoreArgs<K> {
+public class GeoRadiusStoreArgs<K> implements CompositeArgument {
 
     private K storeKey;
     private K storeDistKey;
diff --git a/src/main/java/com/lambdaworks/redis/KillArgs.java b/src/main/java/com/lambdaworks/redis/KillArgs.java
index ad90193999..1ecd269e74 100644
--- a/src/main/java/com/lambdaworks/redis/KillArgs.java
+++ b/src/main/java/com/lambdaworks/redis/KillArgs.java
@@ -13,7 +13,7 @@
  * @author Mark Paluch
  * @since 3.0
  */
-public class KillArgs {
+public class KillArgs implements CompositeArgument {
 
     private static enum Type {
         NORMAL, SLAVE, PUBSUB
@@ -86,7 +86,7 @@ public KillArgs type(Type type) {
         return this;
     }
 
-    <K, V> void build(CommandArgs<K, V> args) {
+    public <K, V> void build(CommandArgs<K, V> args) {
 
         if (skipme != null) {
             args.add(SKIPME).add(skipme.booleanValue() ? "yes" : "no");
diff --git a/src/main/java/com/lambdaworks/redis/LettuceStrings.java b/src/main/java/com/lambdaworks/redis/LettuceStrings.java
index c591fffea9..283cf9811e 100644
--- a/src/main/java/com/lambdaworks/redis/LettuceStrings.java
+++ b/src/main/java/com/lambdaworks/redis/LettuceStrings.java
@@ -3,6 +3,8 @@
 import java.nio.ByteBuffer;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Collection;
+import java.util.Iterator;
 
 import com.lambdaworks.codec.Base16;
 
@@ -80,4 +82,57 @@ public static String digest(ByteBuffer script) {
             throw new RedisException("JVM does not support SHA1");
         }
     }
+
+    /**
+     * Convert a {@code String} array into a delimited {@code String} (e.g. CSV).
+     * <p>
+     * Useful for {@code toString()} implementations.
+     * 
+     * @param arr the array to display
+     * @param delim the delimiter to use (typically a ",")
+     * @return the delimited {@code String}
+     */
+    public static String arrayToDelimitedString(Object[] arr, String delim) {
+        if ((arr == null || arr.length == 0)) {
+            return "";
+        }
+        if (arr.length == 1) {
+            return "" + arr[0];
+        }
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < arr.length; i++) {
+            if (i > 0) {
+                sb.append(delim);
+            }
+            sb.append(arr[i]);
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Convert a {@link Collection} to a delimited {@code String} (e.g. CSV).
+     * <p>
+     * Useful for {@code toString()} implementations.
+     * 
+     * @param coll the {@code Collection} to convert
+     * @param delim the delimiter to use (typically a ",")
+     * @param prefix the {@code String} to start each element with
+     * @param suffix the {@code String} to end each element with
+     * @return the delimited {@code String}
+     */
+    public static String collectionToDelimitedString(Collection<?> coll, String delim, String prefix, String suffix) {
+
+        if (coll == null || coll.isEmpty()) {
+            return "";
+        }
+        StringBuilder sb = new StringBuilder();
+        Iterator<?> it = coll.iterator();
+        while (it.hasNext()) {
+            sb.append(prefix).append(it.next()).append(suffix);
+            if (it.hasNext()) {
+                sb.append(delim);
+            }
+        }
+        return sb.toString();
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/MigrateArgs.java b/src/main/java/com/lambdaworks/redis/MigrateArgs.java
index 539780c64c..f9d9b914c9 100644
--- a/src/main/java/com/lambdaworks/redis/MigrateArgs.java
+++ b/src/main/java/com/lambdaworks/redis/MigrateArgs.java
@@ -15,7 +15,7 @@
  *
  * @author Mark Paluch
  */
-public class MigrateArgs<K> {
+public class MigrateArgs<K> implements CompositeArgument {
 
     private boolean copy = false;
     private boolean replace = false;
diff --git a/src/main/java/com/lambdaworks/redis/ScanArgs.java b/src/main/java/com/lambdaworks/redis/ScanArgs.java
index 8a8a413591..375684bca4 100644
--- a/src/main/java/com/lambdaworks/redis/ScanArgs.java
+++ b/src/main/java/com/lambdaworks/redis/ScanArgs.java
@@ -1,6 +1,7 @@
 package com.lambdaworks.redis;
 
-import static com.lambdaworks.redis.protocol.CommandKeyword.*;
+import static com.lambdaworks.redis.protocol.CommandKeyword.COUNT;
+import static com.lambdaworks.redis.protocol.CommandKeyword.MATCH;
 
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.protocol.CommandArgs;
@@ -12,7 +13,7 @@
  * @author Mark Paluch
  * @since 3.0
  */
-public class ScanArgs {
+public class ScanArgs implements CompositeArgument {
 
     private Long count;
     private String match;
@@ -73,7 +74,7 @@ public ScanArgs limit(long count) {
         return this;
     }
 
-    <K, V> void build(CommandArgs<K, V> args) {
+    public <K, V> void build(CommandArgs<K, V> args) {
 
         if (match != null) {
             args.add(MATCH).add(match);
@@ -84,5 +85,4 @@ <K, V> void build(CommandArgs<K, V> args) {
         }
 
     }
-
 }
diff --git a/src/main/java/com/lambdaworks/redis/SetArgs.java b/src/main/java/com/lambdaworks/redis/SetArgs.java
index 53b03b566b..2c3f37c92e 100644
--- a/src/main/java/com/lambdaworks/redis/SetArgs.java
+++ b/src/main/java/com/lambdaworks/redis/SetArgs.java
@@ -11,7 +11,7 @@
  * 
  * @author Vincent Rischmann
  */
-public class SetArgs {
+public class SetArgs implements CompositeArgument {
 
     private Long ex;
     private Long px;
diff --git a/src/main/java/com/lambdaworks/redis/SortArgs.java b/src/main/java/com/lambdaworks/redis/SortArgs.java
index 1545c51268..87c4b53aef 100644
--- a/src/main/java/com/lambdaworks/redis/SortArgs.java
+++ b/src/main/java/com/lambdaworks/redis/SortArgs.java
@@ -18,7 +18,7 @@
  * 
  * @author Will Glozer
  */
-public class SortArgs {
+public class SortArgs implements CompositeArgument {
 
     private String by;
     private Limit limit = Limit.unlimited();
@@ -102,7 +102,8 @@ public SortArgs alpha() {
         return this;
     }
 
-    <K, V> void build(CommandArgs<K, V> args, K store) {
+    @Override
+    public <K, V> void build(CommandArgs<K, V> args) {
 
         if (by != null) {
             args.add(BY);
@@ -130,6 +131,12 @@ <K, V> void build(CommandArgs<K, V> args, K store) {
             args.add(ALPHA);
         }
 
+    }
+
+    <K, V> void build(CommandArgs<K, V> args, K store) {
+
+        build(args);
+
         if (store != null) {
             args.add(STORE);
             args.addKey(store);
diff --git a/src/main/java/com/lambdaworks/redis/ZAddArgs.java b/src/main/java/com/lambdaworks/redis/ZAddArgs.java
index 8864e1026f..f9ca95b348 100644
--- a/src/main/java/com/lambdaworks/redis/ZAddArgs.java
+++ b/src/main/java/com/lambdaworks/redis/ZAddArgs.java
@@ -8,7 +8,7 @@
  * 
  * @author Mark Paluch
  */
-public class ZAddArgs {
+public class ZAddArgs implements CompositeArgument {
 
     private boolean nx = false;
     private boolean xx = false;
diff --git a/src/main/java/com/lambdaworks/redis/ZStoreArgs.java b/src/main/java/com/lambdaworks/redis/ZStoreArgs.java
index 5a7d85c9e8..6be16621da 100644
--- a/src/main/java/com/lambdaworks/redis/ZStoreArgs.java
+++ b/src/main/java/com/lambdaworks/redis/ZStoreArgs.java
@@ -16,7 +16,7 @@
  * 
  * @author Will Glozer
  */
-public class ZStoreArgs {
+public class ZStoreArgs implements CompositeArgument {
 
     private static enum Aggregate {
         SUM, MIN, MAX
@@ -96,7 +96,7 @@ private static double[] toDoubleArray(long[] weights) {
         return result;
     }
 
-    <K, V> void build(CommandArgs<K, V> args) {
+    public <K, V> void build(CommandArgs<K, V> args) {
 
         if (weights != null) {
 
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java b/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java
new file mode 100644
index 0000000000..0dfc7183aa
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java
@@ -0,0 +1,93 @@
+package com.lambdaworks.redis.dynamic;
+
+import java.util.Iterator;
+
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
+import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
+import com.lambdaworks.redis.dynamic.support.TypeInformation;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * @author Mark Paluch
+ */
+public class CodecAwareMethodParametersAccessor implements MethodParametersAccessor {
+
+    private final MethodParametersAccessor delegate;
+    private final TypeInformation<?> keyType;
+    private final TypeInformation<?> valueType;
+
+    public CodecAwareMethodParametersAccessor(MethodParametersAccessor delegate, RedisCodec<?, ?> redisCodec) {
+
+        LettuceAssert.notNull(delegate, "MethodParametersAccessor must not be null");
+        LettuceAssert.notNull(redisCodec, "RedisCodec must not be null");
+
+        this.delegate = delegate;
+
+        ClassTypeInformation<? extends RedisCodec> typeInformation = ClassTypeInformation.from(redisCodec.getClass());
+
+        this.keyType = typeInformation.getTypeArgument(RedisCodec.class, 0);
+        this.valueType = typeInformation.getTypeArgument(RedisCodec.class, 1);
+
+    }
+
+    @Override
+    public int getParameterCount() {
+        return delegate.getParameterCount();
+    }
+
+    @Override
+    public Object getBindableValue(int index) {
+        return delegate.getBindableValue(index);
+    }
+
+    @Override
+    public boolean isKey(int index) {
+
+        if (delegate.isValue(index)) {
+            return false;
+        }
+
+        if (delegate.isKey(index)) {
+            return true;
+        }
+
+        Object bindableValue = getBindableValue(index);
+
+        if (bindableValue != null && keyType.getType().isAssignableFrom(bindableValue.getClass())) {
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean isValue(int index) {
+
+        if (delegate.isKey(index)) {
+            return false;
+        }
+
+        if (delegate.isValue(index)) {
+            return true;
+        }
+
+        Object bindableValue = getBindableValue(index);
+
+        if (bindableValue != null && valueType.getType().isAssignableFrom(bindableValue.getClass())) {
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public Iterator<Object> iterator() {
+        return delegate.iterator();
+    }
+
+    @Override
+    public int resolveParameterIndex(String name) {
+        return delegate.resolveParameterIndex(name);
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java
new file mode 100644
index 0000000000..fb4dcdb736
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java
@@ -0,0 +1,20 @@
+package com.lambdaworks.redis.dynamic;
+
+import com.lambdaworks.redis.RedisException;
+
+/**
+ * @author Mark Paluch
+ */
+public class CommandCreationException extends RedisException {
+
+    private final CommandMethod commandMethod;
+
+    public CommandCreationException(CommandMethod commandMethod, String msg) {
+        super(String.format("%s Offending method: %s", msg, commandMethod));
+        this.commandMethod = commandMethod;
+    }
+
+    public CommandMethod getCommandMethod() {
+        return commandMethod;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java
new file mode 100644
index 0000000000..fc9a03adc1
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java
@@ -0,0 +1,23 @@
+package com.lambdaworks.redis.dynamic;
+
+import com.lambdaworks.redis.protocol.RedisCommand;
+
+/**
+ * Strategy interface to create {@link RedisCommand}s.
+ *
+ * <p>
+ * Implementing classes are required to construct {@link RedisCommand}s given an array of parameters for command execution.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ */
+interface CommandFactory {
+
+    /**
+     * Create a new {@link RedisCommand} given {@code parameters}.
+     * 
+     * @param parameters must not be {@literal null}.
+     * @return the {@link RedisCommand}.
+     */
+    RedisCommand<?, ?, ?> createCommand(Object[] parameters);
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
new file mode 100644
index 0000000000..c4bb1a854e
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
@@ -0,0 +1,173 @@
+package com.lambdaworks.redis.dynamic;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Future;
+
+import org.reactivestreams.Publisher;
+
+import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
+import com.lambdaworks.redis.dynamic.parameter.Parameter;
+import com.lambdaworks.redis.dynamic.parameter.Parameters;
+import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
+import com.lambdaworks.redis.dynamic.support.TypeInformation;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Abstraction of a method that is designated to execute a Redis command method. Enriches the standard {@link Method} interface
+ * with specific information that is necessary to construct {@link com.lambdaworks.redis.protocol.RedisCommand} for the method.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public class CommandMethod {
+
+    private final Method method;
+    private final TypeInformation<?> returnType;
+    private final List<Class<?>> arguments = new ArrayList<>();
+    private final Parameters<? extends Parameter> parameters;
+    private final TypeInformation<?> actualReturnType;
+
+    /**
+     * Create a new {@link CommandMethod} given a {@link Method}.
+     * 
+     * @param method must not be null.
+     */
+    public CommandMethod(Method method) {
+        this(method, new ExecutionSpecificParameters(method));
+    }
+
+    /**
+     * Create a new {@link CommandMethod} given a {@link Method} and {@link Parameters}.
+     * 
+     * @param method must not be null.
+     * @param parameters must not be null.
+     */
+    public CommandMethod(Method method, Parameters<?> parameters) {
+
+        LettuceAssert.notNull(method, "Method must not be null");
+        LettuceAssert.notNull(parameters, "Parameters must not be null");
+
+        this.method = method;
+        this.returnType = ClassTypeInformation.fromReturnTypeOf(method);
+        this.parameters = parameters;
+        Collections.addAll(arguments, method.getParameterTypes());
+
+        TypeInformation<?> actualReturnType = this.returnType;
+
+        while (Future.class.isAssignableFrom(actualReturnType.getType())
+                || Publisher.class.isAssignableFrom(actualReturnType.getType())) {
+            actualReturnType = actualReturnType.getComponentType();
+        }
+
+        this.actualReturnType = actualReturnType;
+    }
+
+    /**
+     *
+     * @return the method {@link Parameters}.
+     */
+    public Parameters<? extends Parameter> getParameters() {
+        return parameters;
+    }
+
+    /**
+     *
+     * @return the {@link Method}.
+     */
+    public Method getMethod() {
+        return method;
+    }
+
+    /**
+     *
+     * @return declared {@link Method} return {@link TypeInformation}.
+     */
+    public TypeInformation<?> getReturnType() {
+        return returnType;
+    }
+
+    /**
+     *
+     * @return the actual {@link Method} return {@link TypeInformation} after unwrapping.
+     */
+    public TypeInformation<?> getActualReturnType() {
+        return actualReturnType;
+    }
+
+    /**
+     * Lookup a method annotation.
+     * 
+     * @param annotationClass the annotation class.
+     * @return the annotation object or {@literal null} if not found.
+     */
+    public <A extends Annotation> A getAnnotation(Class<A> annotationClass) {
+        return method.getAnnotation(annotationClass);
+    }
+
+    /**
+     *
+     * @param annotationClass the annotation class.
+     * @return {@literal true} if the method is annotated with {@code annotationClass}.
+     */
+    public boolean hasAnnotation(Class<? extends Annotation> annotationClass) {
+        return method.getAnnotation(annotationClass) != null;
+    }
+
+    /**
+     *
+     * @return the method name.
+     */
+    public String getName() {
+        return method.getName();
+    }
+
+    /**
+     *
+     * @return {@literal true} if the method uses asynchronous execution declaring {@link Future} as result type.
+     */
+    public boolean isFutureExecution() {
+        return Future.class.isAssignableFrom(getReturnType().getType());
+    }
+
+    /**
+     *
+     * @return {@literal true} if the method uses reactive execution declaring {@link Publisher} as result type.
+     */
+    public boolean isReactiveExecution() {
+        return ReactiveWrappers.supports(getReturnType().getType());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof CommandMethod))
+            return false;
+
+        CommandMethod that = (CommandMethod) o;
+
+        if (method != null ? !method.equals(that.method) : that.method != null)
+            return false;
+        if (returnType != null ? !returnType.equals(that.returnType) : that.returnType != null)
+            return false;
+        return arguments != null ? arguments.equals(that.arguments) : that.arguments == null;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = method != null ? method.hashCode() : 0;
+        result = 31 * result + (returnType != null ? returnType.hashCode() : 0);
+        result = 31 * result + (arguments != null ? arguments.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return method.toGenericString();
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java
new file mode 100644
index 0000000000..43b13024b6
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java
@@ -0,0 +1,11 @@
+package com.lambdaworks.redis.dynamic;
+
+/**
+ * @author Mark Paluch
+ */
+public class CommandMethodSyntaxException extends CommandCreationException {
+
+    public CommandMethodSyntaxException(CommandMethod commandMethod, String msg) {
+        super(commandMethod, msg);
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
new file mode 100644
index 0000000000..9ee5ee7784
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
@@ -0,0 +1,191 @@
+package com.lambdaworks.redis.dynamic;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.lambdaworks.redis.LettuceStrings;
+import com.lambdaworks.redis.dynamic.parameter.Parameter;
+import com.lambdaworks.redis.dynamic.segment.CommandSegments;
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.internal.LettuceLists;
+import com.lambdaworks.redis.models.command.CommandDetail;
+
+/**
+ * Verifies {@link CommandMethod} declarations by checking available Redis commands.
+ * 
+ * @author Mark Paluch
+ */
+class CommandMethodVerifier {
+
+    /**
+     * Default maximum property distance: 2
+     */
+    public static final int DEFAULT_MAX_DISTANCE = 2;
+
+    private List<CommandDetail> commandDetails;
+
+    /**
+     * Create a new {@link CommandMethodVerifier} given a {@link List} of {@link CommandDetail}
+     *
+     * @param commandDetails must not be {@literal null}.
+     */
+    public CommandMethodVerifier(List<CommandDetail> commandDetails) {
+
+        LettuceAssert.notNull(commandDetails, "Command details must not be null");
+
+        this.commandDetails = LettuceLists.newList(commandDetails);
+    }
+
+    /**
+     *
+     * Verify a {@link CommandMethod} with its {@link CommandSegments}. This method verifies that the command exists and that
+     * the required number of arguments is declared.
+     * 
+     * @param commandSegments
+     * @param commandMethod
+     */
+    public void validate(CommandSegments commandSegments, CommandMethod commandMethod) throws CommandMethodSyntaxException {
+
+        LettuceAssert.notEmpty(commandSegments.getCommandType().name(), "Command name must not be empty");
+
+        CommandDetail commandDetail = findCommandDetail(commandSegments.getCommandType().name())
+                .orElseThrow(() -> syntaxException(commandSegments.getCommandType().name(), commandMethod));
+
+        validateParameters(commandDetail, commandSegments, commandMethod);
+    }
+
+    private void validateParameters(CommandDetail commandDetail, CommandSegments commandSegments, CommandMethod commandMethod) {
+
+        List<? extends Parameter> bindableParameters = commandMethod.getParameters().getBindableParameters();
+
+        int availableParameterCount = bindableParameters.size() + commandSegments.size();
+
+        // exact parameter count
+        if (commandDetail.getArity() - 1 == availableParameterCount) {
+            return;
+        }
+
+        // more or same parameter cound for dynamic arg count commands
+        if (0 > commandDetail.getArity() && availableParameterCount >= -(commandDetail.getArity() + 1)) {
+            return;
+        }
+
+        for (Parameter bindableParameter : bindableParameters) {
+
+            // Can't verify collection-like arguments as they may contain multiple elements.
+            if (bindableParameter.getTypeInformation().isCollectionLike()) {
+                return;
+            }
+        }
+
+        String message;
+        if (commandDetail.getArity() == 1) {
+            message = String.format("Command %s accepts no parameters.", commandDetail.getName().toUpperCase());
+        } else if (commandDetail.getArity() < -1) {
+            message = String.format("Command %s requires at least %d parameters but method declares %d parameter(s).",
+                    commandDetail.getName().toUpperCase(), Math.abs(commandDetail.getArity()) - 1, availableParameterCount);
+        } else {
+            message = String.format("Command %s accepts %d parameters but method declares %d parameter(s).",
+                    commandDetail.getName().toUpperCase(), commandDetail.getArity() - 1, availableParameterCount);
+        }
+
+        throw new CommandMethodSyntaxException(commandMethod, message);
+    }
+
+    private CommandMethodSyntaxException syntaxException(String commandName, CommandMethod commandMethod) {
+
+        CommandMatches commandMatches = CommandMatches.forCommand(commandName, commandDetails);
+
+        if (commandMatches.hasMatches()) {
+            return new CommandMethodSyntaxException(commandMethod,
+                    String.format("Command %s does not exist. Did you mean: %s?", commandName, commandMatches));
+        }
+
+        return new CommandMethodSyntaxException(commandMethod, String.format("Command %s does not exist", commandName));
+
+    }
+
+    private Optional<CommandDetail> findCommandDetail(String commandName) {
+        return commandDetails.stream().filter(commandDetail -> commandDetail.getName().equalsIgnoreCase(commandName))
+                .findFirst();
+    }
+
+    static class CommandMatches {
+
+        private final List<String> matches = new ArrayList<>();
+
+        private CommandMatches(List<String> matches) {
+            this.matches.addAll(matches);
+        }
+
+        public static CommandMatches forCommand(String command, List<CommandDetail> commandDetails) {
+            return new CommandMatches(calculateMatches(command, commandDetails));
+        }
+
+        private static List<String> calculateMatches(String command, List<CommandDetail> commandDetails) {
+
+            return commandDetails.stream() //
+                    .filter(commandDetail -> calculateStringDistance(commandDetail.getName().toLowerCase(),
+                            command.toLowerCase()) <= DEFAULT_MAX_DISTANCE)
+                    .map(CommandDetail::getName) //
+                    .map(String::toUpperCase) //
+                    .sorted((o1, o2) -> calculateStringDistance(o1, o2)).collect(Collectors.toList());
+        }
+
+        public boolean hasMatches() {
+            return !matches.isEmpty();
+        }
+
+        @Override
+        public String toString() {
+            return LettuceStrings.collectionToDelimitedString(matches, ", ", "", "");
+        }
+
+        /**
+         * Calculate the distance between the given two Strings according to the Levenshtein algorithm.
+         *
+         * @param s1 the first String
+         * @param s2 the second String
+         * @return the distance value
+         */
+        private static int calculateStringDistance(String s1, String s2) {
+
+            if (s1.length() == 0) {
+                return s2.length();
+            }
+
+            if (s2.length() == 0) {
+                return s1.length();
+            }
+
+            int d[][] = new int[s1.length() + 1][s2.length() + 1];
+
+            for (int i = 0; i <= s1.length(); i++) {
+                d[i][0] = i;
+            }
+
+            for (int j = 0; j <= s2.length(); j++) {
+                d[0][j] = j;
+            }
+
+            for (int i = 1; i <= s1.length(); i++) {
+                char s_i = s1.charAt(i - 1);
+                for (int j = 1; j <= s2.length(); j++) {
+                    int cost;
+                    char t_j = s2.charAt(j - 1);
+                    if (s_i == t_j) {
+                        cost = 0;
+                    } else {
+                        cost = 1;
+                    }
+                    d[i][j] = Math.min(Math.min(d[i - 1][j] + 1, d[i][j - 1] + 1), d[i - 1][j - 1] + cost);
+                }
+            }
+
+            return d[s1.length()][s2.length()];
+        }
+    }
+
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
new file mode 100644
index 0000000000..1ef12a7eab
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
@@ -0,0 +1,81 @@
+package com.lambdaworks.redis.dynamic;
+
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.dynamic.output.CommandOutputFactory;
+import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
+import com.lambdaworks.redis.dynamic.output.OutputSelector;
+import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
+import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
+import com.lambdaworks.redis.dynamic.segment.CommandSegments;
+import com.lambdaworks.redis.output.CommandOutput;
+import com.lambdaworks.redis.protocol.CommandArgs;
+import com.lambdaworks.redis.protocol.RedisCommand;
+
+/**
+ * {@link CommandFactory} based on {@link CommandSegments}.
+ *
+ * @author Mark Paluch
+ */
+class CommandSegmentCommandFactory<K, V> implements CommandFactory {
+
+    private final CommandMethod commandMethod;
+    private final CommandSegments segments;
+    private final CommandOutputFactoryResolver outputResolver;
+    private final RedisCodec<K, V> redisCodec;
+    private final ParameterBinder parameterBinder = new ParameterBinder();
+    private final CommandOutputFactory outputFactory;
+
+    public CommandSegmentCommandFactory(CommandSegments commandSegments, CommandMethod commandMethod,
+            RedisCodec<K, V> redisCodec, CommandOutputFactoryResolver outputResolver) {
+
+        this.segments = commandSegments;
+        this.commandMethod = commandMethod;
+        this.redisCodec = redisCodec;
+        this.outputResolver = outputResolver;
+
+        OutputSelector outputSelector = new OutputSelector(commandMethod.getActualReturnType());
+        CommandOutputFactory factory = resolveCommandOutputFactory(outputSelector);
+
+        if (factory == null) {
+            throw new IllegalArgumentException(String.format("Cannot resolve CommandOutput for result type %s on method %s",
+                    commandMethod.getActualReturnType(), commandMethod.getMethod()));
+        }
+
+        if (commandMethod.getParameters() instanceof ExecutionSpecificParameters) {
+
+            ExecutionSpecificParameters executionAwareParameters = (ExecutionSpecificParameters) commandMethod.getParameters();
+
+            if (commandMethod.isFutureExecution() && executionAwareParameters.hasTimeoutIndex()) {
+                throw new CommandCreationException(commandMethod,
+                        "Asynchronous command methods do not support Timeout parameters");
+            }
+        }
+
+        this.outputFactory = factory;
+    }
+
+    protected CommandOutputFactoryResolver getOutputResolver() {
+        return outputResolver;
+    }
+
+    protected CommandOutputFactory resolveCommandOutputFactory(OutputSelector outputSelector) {
+        return outputResolver.resolveCommandOutput(outputSelector);
+    }
+
+    @Override
+    public RedisCommand<?, ?, ?> createCommand(Object[] parameters) {
+
+        MethodParametersAccessor parametersAccessor = new CodecAwareMethodParametersAccessor(
+                new DefaultMethodParametersAccessor(commandMethod.getParameters(), parameters), redisCodec);
+
+        CommandArgs<K, V> args = new CommandArgs<>(redisCodec);
+
+        CommandOutput<K, V, ?> output = outputFactory.create(redisCodec);
+        com.lambdaworks.redis.protocol.Command<?, ?, ?> command = new com.lambdaworks.redis.protocol.Command<>(
+                this.segments.getCommandType(), output, args);
+
+        parameterBinder.bind(args, segments, parametersAccessor);
+
+        return command;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java b/src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java
new file mode 100644
index 0000000000..d6c07070e7
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java
@@ -0,0 +1,114 @@
+package com.lambdaworks.redis.dynamic;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import com.lambdaworks.redis.dynamic.annotation.Key;
+import com.lambdaworks.redis.dynamic.annotation.Value;
+import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
+import com.lambdaworks.redis.dynamic.parameter.Parameter;
+import com.lambdaworks.redis.dynamic.parameter.Parameters;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Default {@link MethodParametersAccessor} implementation.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class DefaultMethodParametersAccessor implements MethodParametersAccessor {
+
+    private final Parameters parameters;
+    private final List<Object> values;
+
+    public DefaultMethodParametersAccessor(Parameters parameters, Object[] values) {
+
+        this.parameters = parameters;
+        this.values = Arrays.asList(values);
+
+    }
+
+    public int getParameterCount() {
+        return parameters.getBindableParameters().size();
+    }
+
+    @Override
+    public Object getBindableValue(int index) {
+        return values.get(parameters.getBindableParameter(index).getParameterIndex());
+    }
+
+    @Override
+    public boolean isKey(int index) {
+        return parameters.getBindableParameter(index).findAnnotation(Key.class) != null;
+    }
+
+    @Override
+    public boolean isValue(int index) {
+        return parameters.getBindableParameter(index).findAnnotation(Value.class) != null;
+    }
+
+    @Override
+    public Iterator<Object> iterator() {
+        return new BindableParameterIterator(this);
+    }
+
+    @Override
+    public int resolveParameterIndex(String name) {
+
+        List<Parameter> bindableParameters = parameters.getBindableParameters();
+        for (int i = 0; i < bindableParameters.size(); i++) {
+
+            if (name.equals(bindableParameters.get(i).getName())) {
+                return i;
+            }
+        }
+
+        throw new IllegalArgumentException(String.format("Cannot resolve named parameter %s", name));
+    }
+
+    public Parameters getParameters() {
+        return parameters;
+    }
+
+    /**
+     * Iterator class to allow traversing all bindable parameters inside the accessor.
+     */
+    private static class BindableParameterIterator implements Iterator<Object> {
+
+        private final int bindableParameterCount;
+        private final DefaultMethodParametersAccessor accessor;
+
+        private int currentIndex = 0;
+
+        /**
+         * Creates a new {@link BindableParameterIterator}.
+         *
+         * @param accessor must not be {@literal null}.
+         */
+        public BindableParameterIterator(DefaultMethodParametersAccessor accessor) {
+
+            LettuceAssert.notNull(accessor, "ParametersParameterAccessor must not be null!");
+
+            this.accessor = accessor;
+            this.bindableParameterCount = accessor.getParameters().getBindableParameters().size();
+        }
+
+        /**
+         * Return the next bindable parameter.
+         *
+         * @return
+         */
+        public Object next() {
+            return accessor.getBindableValue(currentIndex++);
+        }
+
+        public boolean hasNext() {
+            return bindableParameterCount > currentIndex;
+        }
+
+        public void remove() {
+            throw new UnsupportedOperationException();
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java b/src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java
new file mode 100644
index 0000000000..749a245727
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java
@@ -0,0 +1,130 @@
+package com.lambdaworks.redis.dynamic;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Default implementation of {@link RedisCommandsMetadata}.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class DefaultRedisCommandsMetadata implements RedisCommandsMetadata {
+
+    /** The package separator character: '.' */
+    private static final char PACKAGE_SEPARATOR = '.';
+
+    private final Class<?> apiInterface;
+
+    /**
+     * Create {@link DefaultRedisCommandsMetadata} given a {@link Class command interface}.
+     * 
+     * @param apiInterface must not be {@literal null}.
+     */
+    DefaultRedisCommandsMetadata(Class<?> apiInterface) {
+        this.apiInterface = apiInterface;
+    }
+
+    @Override
+    public Class<?> getCommandsInterface() {
+        return apiInterface;
+    }
+
+    @Override
+    public Collection<Method> getMethods() {
+
+        Set<Method> result = new HashSet<Method>();
+
+        for (Method method : getCommandsInterface().getMethods()) {
+            method = getMostSpecificMethod(method, getCommandsInterface());
+            if (isQueryMethodCandidate(method)) {
+                result.add(method);
+            }
+        }
+
+        return Collections.unmodifiableSet(result);
+    }
+
+    /**
+     * Checks whether the given method is a query method candidate.
+     *
+     * @param method
+     * @return
+     */
+    private boolean isQueryMethodCandidate(Method method) {
+        return !method.isBridge() && !method.isDefault();
+    }
+
+    /**
+     * Given a method, which may come from an interface, and a target class used in the current reflective invocation, find the
+     * corresponding target method if there is one. E.g. the method may be {@code IFoo.bar()} and the target class may be
+     * {@code DefaultFoo}. In this case, the method may be {@code DefaultFoo.bar()}. This enables attributes on that method to
+     * be found.
+     *
+     * @param method the method to be invoked, which may come from an interface
+     * @param targetClass the target class for the current invocation. May be {@code null} or may not even implement the method.
+     * @return the specific target method, or the original method if the {@code targetClass} doesn't implement it or is
+     *         {@code null}
+     */
+    public static Method getMostSpecificMethod(Method method, Class<?> targetClass) {
+        if (method != null && isOverridable(method, targetClass) && targetClass != null
+                && targetClass != method.getDeclaringClass()) {
+            try {
+                try {
+                    return targetClass.getMethod(method.getName(), method.getParameterTypes());
+                } catch (NoSuchMethodException ex) {
+                    return method;
+                }
+            } catch (SecurityException ex) {
+            }
+        }
+        return method;
+    }
+
+    /**
+     * Determine whether the given method is overridable in the given target class.
+     *
+     * @param method the method to check
+     * @param targetClass the target class to check against
+     */
+    private static boolean isOverridable(Method method, Class<?> targetClass) {
+        if (Modifier.isPrivate(method.getModifiers())) {
+            return false;
+        }
+        if (Modifier.isPublic(method.getModifiers()) || Modifier.isProtected(method.getModifiers())) {
+            return true;
+        }
+        return getPackageName(method.getDeclaringClass()).equals(getPackageName(targetClass));
+    }
+
+    /**
+     * Determine the name of the package of the given class, e.g. "java.lang" for the {@code java.lang.String} class.
+     *
+     * @param clazz the class
+     * @return the package name, or the empty String if the class is defined in the default package
+     */
+    private static String getPackageName(Class<?> clazz) {
+        LettuceAssert.notNull(clazz, "Class must not be null");
+        return getPackageName(clazz.getName());
+    }
+
+    /**
+     * Determine the name of the package of the given fully-qualified class name, e.g. "java.lang" for the
+     * {@code java.lang.String} class name.
+     *
+     * @param fqClassName the fully-qualified class name
+     * @return the package name, or the empty String if the class is defined in the default package
+     */
+    private static String getPackageName(String fqClassName) {
+        LettuceAssert.notNull(fqClassName, "Class name must not be null");
+        int lastDotIndex = fqClassName.lastIndexOf(PACKAGE_SEPARATOR);
+        return (lastDotIndex != -1 ? fqClassName.substring(0, lastDotIndex) : "");
+    }
+
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java b/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
new file mode 100644
index 0000000000..ef9cc7980b
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
@@ -0,0 +1,120 @@
+package com.lambdaworks.redis.dynamic;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.lambdaworks.redis.CompositeArgument;
+import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
+import com.lambdaworks.redis.dynamic.segment.CommandSegment;
+import com.lambdaworks.redis.dynamic.segment.CommandSegment.ArgumentContribution;
+import com.lambdaworks.redis.dynamic.segment.CommandSegments;
+import com.lambdaworks.redis.protocol.CommandArgs;
+import com.lambdaworks.redis.protocol.ProtocolKeyword;
+
+/**
+ * Parameter binder for {@link CommandSegments}-based Redis Commands.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class ParameterBinder {
+
+    /**
+     * Bind {@link CommandSegments} and method parameters to {@link CommandArgs}.
+     * 
+     * @param args
+     * @param commandSegments
+     * @param accessor
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    <K, V> CommandArgs<K, V> bind(CommandArgs<K, V> args, CommandSegments commandSegments, MethodParametersAccessor accessor) {
+
+        int parameterCount = accessor.getParameterCount();
+
+        Set<Integer> eatenParameters = new HashSet<>();
+
+        for (CommandSegment commandSegment : commandSegments) {
+
+            ArgumentContribution argumentContribution = commandSegment.contribute(accessor);
+            bind(args, argumentContribution.getValue(), argumentContribution.getParameterIndex(), accessor);
+
+            eatenParameters.add(argumentContribution.getParameterIndex());
+        }
+
+        for (int i = 0; i < parameterCount; i++) {
+
+            if (eatenParameters.contains(i)) {
+                continue;
+            }
+
+            Object bindableValue = accessor.getBindableValue(i);
+            bind(args, bindableValue, i, accessor);
+
+            eatenParameters.add(i);
+        }
+
+        return args;
+    }
+
+    @SuppressWarnings("unchecked")
+    private <K, V> void bind(CommandArgs<K, V> args, Object argument, int index, MethodParametersAccessor accessor) {
+
+        if (argument == null) {
+            args.add(new byte[0]);
+            return;
+        }
+
+        if (index != -1) {
+            if (accessor.isKey(index)) {
+
+                if (argument instanceof Iterable) {
+                    args.addKeys((Iterable<K>) argument);
+                } else {
+                    args.addKey((K) argument);
+                }
+                return;
+            }
+
+            if (accessor.isValue(index)) {
+
+                if (argument instanceof Iterable) {
+                    args.addValues((Iterable<V>) argument);
+                } else {
+                    args.addValue((V) argument);
+                }
+                return;
+            }
+        }
+
+        if (argument instanceof String) {
+            args.add((String) argument);
+        }
+
+        if (argument instanceof byte[]) {
+            args.add((byte[]) argument);
+        }
+
+        if (argument instanceof Double) {
+            args.add(((Double) argument));
+        } else if (argument instanceof Number) {
+            args.add(((Number) argument).longValue());
+        }
+
+        if (argument instanceof ProtocolKeyword) {
+            args.add((ProtocolKeyword) argument);
+            return;
+        }
+
+        if (argument instanceof Map) {
+            args.add((Map<K, V>) argument);
+            return;
+        }
+
+        if (argument instanceof CompositeArgument) {
+            ((CompositeArgument) argument).build(args);
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java
new file mode 100644
index 0000000000..7935a4783b
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java
@@ -0,0 +1,53 @@
+package com.lambdaworks.redis.dynamic;
+
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.dynamic.output.CommandOutputFactory;
+import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
+import com.lambdaworks.redis.dynamic.output.OutputSelector;
+import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
+import com.lambdaworks.redis.dynamic.segment.CommandSegments;
+
+/**
+ * {@link CommandSegmentCommandFactory} for Reactive Command execution.
+ * 
+ * @author Mark Paluch
+ */
+class ReactiveCommandSegmentCommandFactory<K, V> extends CommandSegmentCommandFactory<K, V> {
+
+    private boolean streamingExecution;
+
+    public ReactiveCommandSegmentCommandFactory(CommandSegments commandSegments, CommandMethod commandMethod,
+            RedisCodec<K, V> redisCodec, CommandOutputFactoryResolver outputResolver) {
+
+        super(commandSegments, commandMethod, redisCodec, outputResolver);
+
+        if (commandMethod.getParameters() instanceof ExecutionSpecificParameters) {
+
+            ExecutionSpecificParameters executionAwareParameters = (ExecutionSpecificParameters) commandMethod.getParameters();
+
+            if (executionAwareParameters.hasTimeoutIndex()) {
+                throw new CommandCreationException(commandMethod, "Reactive command methods do not support Timeout parameters");
+            }
+        }
+    }
+
+    @Override
+    protected CommandOutputFactory resolveCommandOutputFactory(OutputSelector outputSelector) {
+
+        CommandOutputFactory factory = getOutputResolver().resolveStreamingCommandOutput(outputSelector);
+
+        if (factory != null) {
+            streamingExecution = true;
+            return factory;
+        }
+
+        return super.resolveCommandOutputFactory(outputSelector);
+    }
+
+    /**
+     * @return {@literal true} if the resolved {@link com.lambdaworks.redis.output.CommandOutput} should use streaming.
+     */
+    public boolean isStreamingExecution() {
+        return streamingExecution;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveWrappers.java b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveWrappers.java
new file mode 100644
index 0000000000..c8fb206aa7
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveWrappers.java
@@ -0,0 +1,69 @@
+package com.lambdaworks.redis.dynamic;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.internal.LettuceClassUtils;
+
+/**
+ * Converters to potentially convert the execution of a command method into a variety of wrapper types potentially being
+ * available on the classpath. Currently supported:
+ * <ul>
+ * <li>{@link reactor.core.publisher.Mono}</li>
+ * <li>{@link reactor.core.publisher.Flux}</li>
+ * <li>{@link org.reactivestreams.Publisher}</li>
+ * </ul>
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+abstract class ReactiveWrappers {
+
+    private static final Class<?> MONO = LettuceClassUtils.findClass("reactor.core.publisher.Mono");
+    private static final Class<?> FLUX = LettuceClassUtils.findClass("reactor.core.publisher.Flux");
+    private static final Class<?> PUBLISHER = LettuceClassUtils.findClass("org.reactivestreams.Publisher");
+
+    private static final Set<Class<?>> REACTIVE_WRAPPERS = new HashSet<>();
+    private static final Set<Class<?>> SINGLE_WRAPPERS = new HashSet<>();
+    private static final Set<Class<?>> MULTI_WRAPPERS = new HashSet<>();
+
+    static {
+
+        if (MONO != null) {
+            REACTIVE_WRAPPERS.add(MONO);
+            SINGLE_WRAPPERS.add(MONO);
+        }
+
+        if (FLUX != null) {
+            REACTIVE_WRAPPERS.add(FLUX);
+            MULTI_WRAPPERS.add(FLUX);
+        }
+
+        if (PUBLISHER != null) {
+            REACTIVE_WRAPPERS.add(PUBLISHER);
+            MULTI_WRAPPERS.add(PUBLISHER);
+        }
+    }
+
+    public static boolean supports(Class<?> wrapperType) {
+
+        LettuceAssert.notNull(wrapperType, "Wrapper type must not be null");
+
+        return REACTIVE_WRAPPERS.contains(wrapperType);
+    }
+
+    public static boolean isSingle(Class<?> wrapperType) {
+
+        LettuceAssert.notNull(wrapperType, "Wrapper type must not be null");
+
+        return SINGLE_WRAPPERS.contains(wrapperType) && !isMulti(wrapperType);
+    }
+
+    public static boolean isMulti(Class<?> wrapperType) {
+
+        LettuceAssert.notNull(wrapperType, "Wrapper type must not be null");
+
+        return MULTI_WRAPPERS.contains(wrapperType);
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
new file mode 100644
index 0000000000..74a1a3a8b8
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
@@ -0,0 +1,408 @@
+package com.lambdaworks.redis.dynamic;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+import com.lambdaworks.redis.AbstractRedisReactiveCommands;
+import com.lambdaworks.redis.LettuceFutures;
+import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.api.StatefulConnection;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.api.async.BaseRedisAsyncCommands;
+import com.lambdaworks.redis.api.reactive.BaseRedisReactiveCommands;
+import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
+import com.lambdaworks.redis.codec.ByteArrayCodec;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.dynamic.codec.AnnotationRedisCodecResolver;
+import com.lambdaworks.redis.dynamic.domain.Timeout;
+import com.lambdaworks.redis.dynamic.intercept.InvocationProxyFactory;
+import com.lambdaworks.redis.dynamic.intercept.MethodInterceptor;
+import com.lambdaworks.redis.dynamic.intercept.MethodInvocation;
+import com.lambdaworks.redis.dynamic.output.CodecAwareOutputFactoryResolver;
+import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
+import com.lambdaworks.redis.dynamic.output.OutputRegistry;
+import com.lambdaworks.redis.dynamic.output.OutputRegistryCommandOutputFactoryResolver;
+import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
+import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory;
+import com.lambdaworks.redis.dynamic.segment.CommandSegments;
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.internal.LettuceLists;
+import com.lambdaworks.redis.models.command.CommandDetail;
+import com.lambdaworks.redis.models.command.CommandDetailParser;
+import com.lambdaworks.redis.output.CommandOutput;
+import com.lambdaworks.redis.protocol.CommandArgs;
+import com.lambdaworks.redis.protocol.LettuceCharsets;
+import com.lambdaworks.redis.protocol.RedisCommand;
+
+/**
+ * Factory to create Redis Command interface instances.
+ * <p>
+ * This class is the entry point to implement command interfaces and obtain a reference to the implementation. Redis Command
+ * interfaces provide a dynamic API that are declared in userland code. {@link RedisCommandFactory} and its supportive classes
+ * analyze method declarations and derive from those factories to create and execute {@link RedisCommand}s.
+ *
+ * <h3>Example</h3> <code><pre>
+public interface MyRedisCommands {
+
+    String get(String key); // Synchronous Execution of GET
+
+    &#64;Command("GET")
+    byte[] getAsBytes(String key); // Synchronous Execution of GET returning data as byte array
+
+    &#64;Command("SET") // synchronous execution applying a Timeout
+    String setSync(String key, String value, Timeout timeout);
+
+    Future<String> set(String key, String value); // asynchronous SET execution
+
+    &#64;Command("SET")
+    Mono<String> setReactive(String key, String value, SetArgs setArgs); // reactive SET execution using SetArgs
+
+    &#64;CommandNaming(split = DOT) // support for Redis Module command notation -> NR.RUN
+    double nrRun(String key, int... indexes);
+}
+
+ RedisCommandFactory factory = new RedisCommandFactory(connection);
+
+ MyRedisCommands commands = factory.getCommands(MyRedisCommands.class);
+
+ String value = commands.get("key");
+
+ * </pre></code>
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ * @see com.lambdaworks.redis.dynamic.annotation.Command
+ * @see CommandMethod
+ */
+public class RedisCommandFactory {
+
+    private final StatefulConnection<?, ?> connection;
+    private final CommandMethodVerifier commandMethodVerifier;
+    private final List<RedisCodec<?, ?>> redisCodecs = new ArrayList<>();
+
+    private CommandOutputFactoryResolver commandOutputFactoryResolver = new OutputRegistryCommandOutputFactoryResolver(
+            new OutputRegistry());
+
+    private boolean verifyCommandMethods = true;
+
+    /**
+     * Create a new {@link CommandFactory} given {@link StatefulConnection}.
+     * 
+     * @param connection must not be {@literal null}.
+     */
+    public RedisCommandFactory(StatefulConnection<?, ?> connection) {
+        this(connection, LettuceLists.newList(new ByteArrayCodec(), new StringCodec(LettuceCharsets.UTF8)));
+    }
+
+    /**
+     * Create a new {@link CommandFactory} given {@link StatefulConnection} and a {@link List} of {@link RedisCodec}s to use
+     *
+     * @param connection must not be {@literal null}.
+     * @param redisCodecs must not be {@literal null}.
+     */
+    public RedisCommandFactory(StatefulConnection<?, ?> connection, Iterable<RedisCodec<?, ?>> redisCodecs) {
+
+        LettuceAssert.notNull(connection, "Redis Connection must not be null");
+        LettuceAssert.notNull(redisCodecs, "Iterable of RedisCodec must not be null");
+
+        this.connection = connection;
+        this.redisCodecs.addAll(LettuceLists.newList(redisCodecs));
+
+        commandMethodVerifier = new CommandMethodVerifier(getCommands(connection));
+    }
+
+    @SuppressWarnings("unchecked")
+    private List<CommandDetail> getCommands(StatefulConnection<?, ?> connection) {
+
+        List<Object> commands = Collections.emptyList();
+        if (connection instanceof StatefulRedisConnection) {
+            commands = ((StatefulRedisConnection) connection).sync().command();
+        }
+
+        if (connection instanceof StatefulRedisClusterConnection) {
+            commands = ((StatefulRedisClusterConnection) connection).sync().command();
+        }
+
+        if (commands.isEmpty()) {
+            verifyCommandMethods = false;
+        }
+
+        return CommandDetailParser.parse(commands);
+    }
+
+    /**
+     * Set a {@link CommandOutputFactoryResolver}.
+     * 
+     * @param commandOutputFactoryResolver must not be {@literal null}.
+     */
+    public void setCommandOutputFactoryResolver(CommandOutputFactoryResolver commandOutputFactoryResolver) {
+
+        LettuceAssert.notNull(commandOutputFactoryResolver, "CommandOutputFactoryResolver must not be null");
+
+        this.commandOutputFactoryResolver = commandOutputFactoryResolver;
+    }
+
+    /**
+     * Enables/disables command verification which checks the command name against Redis {@code COMMAND} and the argument count.
+     * 
+     * @param verifyCommandMethods {@literal true} to enable command verification (default) or {@literal false} to disable
+     *        command verification.
+     */
+    public void setVerifyCommandMethods(boolean verifyCommandMethods) {
+        this.verifyCommandMethods = verifyCommandMethods;
+    }
+
+    /**
+     * Returns a Redis Command instance for the given interface.
+     * 
+     * @param commandInterface must not be {@literal null}.
+     * @return the implemented Redis Commands interface.
+     */
+    public <T> T getCommands(Class<T> commandInterface) {
+
+        LettuceAssert.notNull(commandInterface, "Redis Command Interface must not be null");
+
+        RedisCommandsMetadata redisCommandsMetadata = new DefaultRedisCommandsMetadata(commandInterface);
+
+        InvocationProxyFactory factory = new InvocationProxyFactory();
+        factory.addInterface(commandInterface);
+
+        if (connection instanceof StatefulRedisConnection<?, ?>) {
+
+            StatefulRedisConnection<?, ?> redisConnection = (StatefulRedisConnection<?, ?>) connection;
+
+            factory.addInterceptor(
+                    new ReactiveCommandFactoryExecutorMethodInterceptor(redisCommandsMetadata, redisConnection.reactive()));
+
+            factory.addInterceptor(new CommandFactoryExecutorMethodInterceptor(redisCommandsMetadata, redisConnection.async()));
+        }
+
+        return factory.createProxy(commandInterface.getClassLoader());
+    }
+
+    /**
+     * {@link CommandFactory}-based {@link MethodInterceptor} to create and invoke Redis Commands using asynchronous and
+     * synchronous execution models.
+     *
+     * @author Mark Paluch
+     */
+    class CommandFactoryExecutorMethodInterceptor implements MethodInterceptor {
+
+        private final Map<Method, CommandFactory> commandFactories = new ConcurrentHashMap<>();
+        private final BaseRedisAsyncCommands<?, ?> redisAsyncCommands;
+
+        public CommandFactoryExecutorMethodInterceptor(RedisCommandsMetadata redisCommandsMetadata,
+                BaseRedisAsyncCommands<?, ?> redisAsyncCommands) {
+
+            RedisCommandFactoryResolver lookupStrategy = new DefaultRedisCommandFactoryResolver(redisCodecs);
+
+            for (Method method : redisCommandsMetadata.getMethods()) {
+
+                if (ReactiveWrappers.supports(method.getReturnType())) {
+                    continue;
+                }
+
+                CommandFactory commandFactory = lookupStrategy.resolveRedisCommandFactory(method, redisCommandsMetadata);
+                commandFactories.put(method, commandFactory);
+            }
+
+            this.redisAsyncCommands = redisAsyncCommands;
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public Object invoke(MethodInvocation invocation) throws Throwable {
+
+            Method method = invocation.getMethod();
+            Object[] arguments = invocation.getArguments();
+
+            if (hasFactoryFor(method)) {
+
+                CommandMethod commandMethod = new CommandMethod(method);
+                CommandFactory commandFactory = commandFactories.get(method);
+                RedisCommand<?, ?, ?> command = commandFactory.createCommand(arguments);
+
+                if (commandMethod.isFutureExecution()) {
+                    return redisAsyncCommands.dispatch(command.getType(), (CommandOutput) command.getOutput(),
+                            (CommandArgs) command.getArgs());
+                }
+
+                RedisFuture dispatch = redisAsyncCommands.dispatch(command.getType(), (CommandOutput) command.getOutput(),
+                        (CommandArgs) command.getArgs());
+
+                long timeout = connection.getTimeout();
+                TimeUnit unit = connection.getTimeoutUnit();
+
+                if (commandMethod.getParameters() instanceof ExecutionSpecificParameters) {
+                    ExecutionSpecificParameters executionSpecificParameters = (ExecutionSpecificParameters) commandMethod
+                            .getParameters();
+
+                    if (executionSpecificParameters.hasTimeoutIndex()) {
+                        Timeout timeoutArg = (Timeout) arguments[executionSpecificParameters.getTimeoutIndex()];
+                        if (timeoutArg != null) {
+                            timeout = timeoutArg.getTimeout();
+                            unit = timeoutArg.getTimeUnit();
+                        }
+                    }
+                }
+
+                LettuceFutures.awaitAll(timeout, unit, dispatch);
+
+                return dispatch.get();
+            }
+
+            return invocation.proceed();
+        }
+
+        private boolean hasFactoryFor(Method method) {
+            return commandFactories.containsKey(method);
+        }
+    }
+
+    /**
+     * {@link CommandFactory}-based {@link MethodInterceptor} to create and invoke Redis Commands using reactive execution.
+     *
+     * @author Mark Paluch
+     */
+    class ReactiveCommandFactoryExecutorMethodInterceptor implements MethodInterceptor {
+
+        private final Map<Method, ReactiveCommandSegmentCommandFactory> commandFactories = new ConcurrentHashMap<>();
+        private final AbstractRedisReactiveCommands<?, ?> redisReactiveCommands;
+
+        public ReactiveCommandFactoryExecutorMethodInterceptor(RedisCommandsMetadata redisCommandsMetadata,
+                BaseRedisReactiveCommands<?, ?> redisReactiveCommands) {
+
+            ReactiveRedisCommandFactoryResolver lookupStrategy = new ReactiveRedisCommandFactoryResolver(redisCodecs);
+
+            for (Method method : redisCommandsMetadata.getMethods()) {
+
+                if (ReactiveWrappers.supports(method.getReturnType())) {
+
+                    ReactiveCommandSegmentCommandFactory commandFactory = lookupStrategy.resolveRedisCommandFactory(method,
+                            redisCommandsMetadata);
+                    commandFactories.put(method, commandFactory);
+                }
+            }
+
+            this.redisReactiveCommands = (AbstractRedisReactiveCommands) redisReactiveCommands;
+        }
+
+        @Override
+        public Object invoke(MethodInvocation invocation) throws Throwable {
+
+            Method method = invocation.getMethod();
+            Object[] arguments = invocation.getArguments();
+
+            if (hasFactoryFor(method)) {
+
+                ReactiveCommandSegmentCommandFactory commandFactory = commandFactories.get(method);
+
+                if (ReactiveWrappers.isSingle(method.getReturnType())) {
+                    return redisReactiveCommands.createMono(() -> commandFactory.createCommand(arguments));
+                }
+
+                if (commandFactory.isStreamingExecution()) {
+
+                    return redisReactiveCommands.createDissolvingFlux(() -> commandFactory.createCommand(arguments));
+                }
+
+                return redisReactiveCommands.createFlux(() -> commandFactory.createCommand(arguments));
+            }
+
+            return invocation.proceed();
+        }
+
+        private boolean hasFactoryFor(Method method) {
+            return commandFactories.containsKey(method);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    class DefaultRedisCommandFactoryResolver implements RedisCommandFactoryResolver {
+
+        final AnnotationCommandSegmentFactory commandSegmentFactory = new AnnotationCommandSegmentFactory();
+        final AnnotationRedisCodecResolver codecResolver;
+
+        DefaultRedisCommandFactoryResolver(List<RedisCodec<?, ?>> redisCodecs) {
+            codecResolver = new AnnotationRedisCodecResolver(redisCodecs);
+        }
+
+        @Override
+        public CommandFactory resolveRedisCommandFactory(Method method, RedisCommandsMetadata redisCommandsMetadata) {
+
+            CommandMethod commandMethod = new CommandMethod(method);
+
+            RedisCodec<?, ?> codec = codecResolver.resolve(commandMethod);
+
+            if (codec == null) {
+                throw new CommandCreationException(commandMethod, "Cannot resolve codec.");
+            }
+
+            CodecAwareOutputFactoryResolver outputFactoryResolver = new CodecAwareOutputFactoryResolver(
+                    commandOutputFactoryResolver, codec);
+            CommandSegments commandSegments = commandSegmentFactory.createCommandSegments(commandMethod);
+
+            if (verifyCommandMethods) {
+                commandMethodVerifier.validate(commandSegments, commandMethod);
+            }
+
+            if (commandMethod.isReactiveExecution()) {
+
+                return new ReactiveCommandSegmentCommandFactory(commandSegments, commandMethod, (RedisCodec) codec,
+                        outputFactoryResolver);
+            }
+
+            return new CommandSegmentCommandFactory<>(commandSegments, commandMethod, (RedisCodec) codec,
+                    outputFactoryResolver);
+        }
+    }
+
+    class ReactiveRedisCommandFactoryResolver implements RedisCommandFactoryResolver {
+
+        final AnnotationCommandSegmentFactory commandSegmentFactory = new AnnotationCommandSegmentFactory();
+        final AnnotationRedisCodecResolver codecResolver;
+
+        ReactiveRedisCommandFactoryResolver(List<RedisCodec<?, ?>> redisCodecs) {
+            codecResolver = new AnnotationRedisCodecResolver(redisCodecs);
+        }
+
+        @Override
+        public ReactiveCommandSegmentCommandFactory resolveRedisCommandFactory(Method method,
+                RedisCommandsMetadata redisCommandsMetadata) {
+
+            CommandMethod commandMethod = new CommandMethod(method);
+
+            RedisCodec<?, ?> codec = codecResolver.resolve(commandMethod);
+
+            if (codec == null) {
+                throw new CommandCreationException(commandMethod, "Cannot resolve codec.");
+            }
+
+            CommandSegments commandSegments = commandSegmentFactory.createCommandSegments(commandMethod);
+
+            if (verifyCommandMethods) {
+                commandMethodVerifier.validate(commandSegments, commandMethod);
+            }
+
+            CodecAwareOutputFactoryResolver outputFactoryResolver = new CodecAwareOutputFactoryResolver(
+                    commandOutputFactoryResolver, codec);
+
+            return new ReactiveCommandSegmentCommandFactory(commandSegments, commandMethod, (RedisCodec) codec,
+                    outputFactoryResolver);
+        }
+    }
+
+    /**
+     * Strategy interface to resolve a {@link CommandFactory}.
+     */
+    interface RedisCommandFactoryResolver {
+
+        CommandFactory resolveRedisCommandFactory(Method method, RedisCommandsMetadata redisCommandsMetadata);
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java
new file mode 100644
index 0000000000..abc6ebcb88
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java
@@ -0,0 +1,22 @@
+package com.lambdaworks.redis.dynamic;
+
+import java.lang.reflect.Method;
+import java.util.Collection;
+
+/**
+ * Interface exposing Redis command interface metadata.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public interface RedisCommandsMetadata {
+
+    Collection<Method> getMethods();
+
+    /**
+     * Returns the Redis Commands interface.
+     *
+     * @return
+     */
+    Class<?> getCommandsInterface();
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java
new file mode 100644
index 0000000000..13a4aba102
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java
@@ -0,0 +1,44 @@
+package com.lambdaworks.redis.dynamic.annotation;
+
+import com.lambdaworks.redis.dynamic.domain.Timeout;
+
+import java.lang.annotation.*;
+
+/**
+ * Redis command method annotation specifying a command string. A command string can contain the command name, a sequence of
+ * command string bytes and parameter references.
+ * <p>
+ * Parameters: Parameters can be referenced by their name {@code :myArg} or index {@code ?0}. Additional, not referenced
+ * parameters are appended to the command in the order of their appearance. Declared parameters are matched against
+ * {@link com.lambdaworks.redis.codec.RedisCodec} for codec resolution. Additional parameter types such as {@link Timeout}
+ * control execution behavior and are not added to command arguments.
+ * <p>
+ * Usage <code><pre>
+    &#64;Command("SET ?0 ?1")
+    public String setKey(String key, String value)
+
+    &#64;Command("SET :key :value")
+    public String setKeyNamed(@Param("key") String key, @Param("value") String value)
+    </pre></code>
+ * <p>
+ * Implementation notes: A {@link Command#value()} is split into command segments of which each segment is represented as ASCII
+ * string or parameter reference.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ * @see CommandNaming
+ * @see Param
+ * @see Key
+ * @see Value
+ * @see com.lambdaworks.redis.dynamic.codec.RedisCodecResolver
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@Documented
+public @interface Command {
+
+    /**
+     * Command string.
+     */
+    String value();
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/CommandNaming.java b/src/main/java/com/lambdaworks/redis/dynamic/annotation/CommandNaming.java
new file mode 100644
index 0000000000..deaba6de23
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/annotation/CommandNaming.java
@@ -0,0 +1,69 @@
+package com.lambdaworks.redis.dynamic.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * Command naming strategy for Redis command methods. Redis command methods name can be provided either by annotating method
+ * with {@link Command} or derived from its name. Annotate a command interface or method with {@link CommandNaming} to set a
+ * command naming {@link Strategy}.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ * @see Command
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Documented
+public @interface CommandNaming {
+
+    /**
+     * Apply a naming {@link Strategy} to transform the method name into a Redis command name.
+     */
+    Strategy strategy() default Strategy.DEFAULT;
+
+    /**
+     * Adjust letter case, defaults to {@link LetterCase#UPPERCASE}.
+     */
+    LetterCase letterCase() default LetterCase.DEFAULT;
+
+    public enum Strategy {
+
+        /**
+         * Replace camel humps with spaces and split the method name into multiple command segments. A method named
+         * {@code clientSetname} would issue a command {@code CLIENT SETNAME}.
+         */
+        SPLIT,
+
+        /**
+         * Replace camel humps with spaces. A method named {@code nrRun} would issue a command named {@code NR.RUN}.
+         */
+        DOT,
+
+        /**
+         * Passthru the command as-is. A method named {@code clientSetname} would issue a command named {@code CLIENTSETNAME}.
+         */
+        METHOD_NAME,
+
+        /**
+         * Not defined here which defaults to {@link #SPLIT} if nothing else found.
+         */
+        DEFAULT;
+    }
+
+    public enum LetterCase {
+        /**
+         * Keep command name as specified.
+         */
+        AS_IS,
+
+        /**
+         * Convert command to uppercase.
+         */
+        UPPERCASE,
+
+        /**
+         * Not defined here which defaults to {@link #UPPERCASE} if nothing else found.
+         */
+        DEFAULT;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Key.java b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Key.java
new file mode 100644
index 0000000000..3f2d1bbc47
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Key.java
@@ -0,0 +1,16 @@
+package com.lambdaworks.redis.dynamic.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * Marker annotation to declare a method parameter as key.
+ * 
+ * @author Mark Paluch
+ * @see Value
+ * @since 5.0
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+@Documented
+public @interface Key {
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Param.java b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Param.java
new file mode 100644
index 0000000000..1f939dbdef
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Param.java
@@ -0,0 +1,23 @@
+package com.lambdaworks.redis.dynamic.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * Annotation to bind method parameters using their name.
+ *
+ * @author Mark Paluch
+ * @see Key
+ * @since 5.0
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+@Documented
+public @interface Param {
+
+    /**
+     * Name of the parameter.
+     * 
+     * @return
+     */
+    String value();
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Value.java b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Value.java
new file mode 100644
index 0000000000..9eef7135e6
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Value.java
@@ -0,0 +1,16 @@
+package com.lambdaworks.redis.dynamic.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * Marker annotation to declare a method parameter as value.
+ *
+ * @author Mark Paluch
+ * @see Key
+ * @since 5.0
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+@Documented
+public @interface Value {
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/annotation/package-info.java
new file mode 100644
index 0000000000..492b5ff59c
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/annotation/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Central domain abstractions to be used in combination with Redis Command interfaces.
+ */
+package com.lambdaworks.redis.dynamic.annotation;
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java
new file mode 100644
index 0000000000..a8a52f78bc
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java
@@ -0,0 +1,197 @@
+package com.lambdaworks.redis.dynamic.codec;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.lambdaworks.redis.dynamic.annotation.Key;
+import com.lambdaworks.redis.dynamic.annotation.Value;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.dynamic.CommandMethod;
+import com.lambdaworks.redis.dynamic.parameter.Parameter;
+import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
+import com.lambdaworks.redis.dynamic.support.TypeInformation;
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.internal.LettuceLists;
+
+/**
+ * Annotation-based {@link RedisCodecResolver}. Considers {@code @Key} and {@code @Value} annotations of method parameters to
+ * determine a {@link RedisCodec} that is able to handle all involved types.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ * @see Key
+ * @see Value
+ */
+public class AnnotationRedisCodecResolver implements RedisCodecResolver {
+
+    private final List<RedisCodec<?, ?>> codecs;
+
+    /**
+     * Creates a new {@link AnnotationRedisCodecResolver} given a {@link List} of {@link RedisCodec}s.
+     *
+     * @param codecs must not be {@literal null}.
+     */
+    public AnnotationRedisCodecResolver(List<RedisCodec<?, ?>> codecs) {
+
+        LettuceAssert.notNull(codecs, "List of RedisCodecs must not be null");
+
+        this.codecs = LettuceLists.unmodifiableList(codecs);
+    }
+
+    @Override
+    public RedisCodec<?, ?> resolve(CommandMethod commandMethod) {
+
+        LettuceAssert.notNull(commandMethod, "CommandMethod must not be null");
+
+        Set<Class<?>> keyTypes = findTypes(commandMethod, Key.class);
+        Set<Class<?>> valueTypes = findTypes(commandMethod, Value.class);
+
+        if (keyTypes.isEmpty() && valueTypes.isEmpty()) {
+
+            Voted<RedisCodec<?, ?>> voted = voteForTypeMajority(commandMethod);
+            if (voted != null) {
+                return voted.subject;
+            }
+
+            return codecs.get(0);
+        }
+
+        if ((keyTypes.size() == 1 && (valueTypes.isEmpty() || valueTypes.size() == 1))
+                || (valueTypes.size() == 1 && (keyTypes.isEmpty() || keyTypes.size() == 1))) {
+
+            RedisCodec<?, ?> codec = resolveCodec(keyTypes, valueTypes);
+            if (codec != null) {
+                return codec;
+            }
+        }
+
+        throw new IllegalStateException(String.format("Cannot resolve Codec for method %s", commandMethod.getMethod()));
+    }
+
+    private Voted<RedisCodec<?, ?>> voteForTypeMajority(CommandMethod commandMethod) {
+
+        List<Voted<RedisCodec<?, ?>>> votes = codecs.stream().map(redisCodec -> new Voted<RedisCodec<?, ?>>(redisCodec, 0))
+                .collect(Collectors.toList());
+
+        commandMethod.getParameters().getBindableParameters().forEach(parameter -> {
+
+            for (Voted<RedisCodec<?, ?>> vote : votes) {
+                ClassTypeInformation<? extends RedisCodec> typeInformation = ClassTypeInformation.from(vote.subject.getClass());
+
+                TypeInformation<?> superTypeInformation = typeInformation.getSuperTypeInformation(RedisCodec.class);
+
+                List<TypeInformation<?>> typeArguments = superTypeInformation.getTypeArguments();
+
+                if (typeArguments.size() != 2) {
+                    continue;
+                }
+
+                TypeInformation<?> keyType = typeArguments.get(0);
+                TypeInformation<?> valueType = typeArguments.get(1);
+
+                if (keyType.isAssignableFrom(parameter.getTypeInformation())) {
+                    vote.votes++;
+                }
+
+                if (valueType.isAssignableFrom(parameter.getTypeInformation())) {
+                    vote.votes++;
+                }
+            }
+        });
+
+        Collections.sort(votes);
+        if (votes.isEmpty()) {
+            return null;
+        }
+
+        Voted<RedisCodec<?, ?>> voted = votes.get(votes.size() - 1);
+
+        if (voted.votes == 0) {
+            return null;
+        }
+
+        return voted;
+    }
+
+    private RedisCodec<?, ?> resolveCodec(Set<Class<?>> keyTypes, Set<Class<?>> valueTypes) {
+
+        Class<?> keyType = keyTypes.isEmpty() ? null : keyTypes.iterator().next();
+        Class<?> valueType = valueTypes.isEmpty() ? null : valueTypes.iterator().next();
+
+        for (RedisCodec<?, ?> codec : codecs) {
+
+            ClassTypeInformation<?> typeInformation = ClassTypeInformation.from(codec.getClass());
+            TypeInformation<?> keyTypeArgument = typeInformation.getTypeArgument(RedisCodec.class, 0);
+            TypeInformation<?> valueTypeArgument = typeInformation.getTypeArgument(RedisCodec.class, 1);
+
+            if (keyTypeArgument == null || valueTypeArgument == null) {
+                continue;
+            }
+
+            boolean keyMatch = false;
+            boolean valueMatch = false;
+
+            if (keyType != null) {
+                keyMatch = keyTypeArgument.isAssignableFrom(ClassTypeInformation.from(keyType));
+            }
+
+            if (valueType != null) {
+                valueMatch = valueTypeArgument.isAssignableFrom(ClassTypeInformation.from(valueType));
+            }
+
+            if (keyType != null && valueType != null && keyMatch && valueMatch) {
+                return codec;
+            }
+
+            if (keyType != null && valueType == null && keyMatch) {
+                return codec;
+            }
+
+            if (keyType == null && valueType != null && valueMatch) {
+                return codec;
+            }
+        }
+
+        return null;
+    }
+
+    private Set<Class<?>> findTypes(CommandMethod commandMethod, Class<?> annotation) {
+
+        Set<Class<?>> types = new HashSet<>();
+
+        for (Parameter parameter : commandMethod.getParameters().getBindableParameters()) {
+
+            types.addAll(parameter.getAnnotations().stream()
+                    .filter(parameterAnnotation -> annotation.isAssignableFrom(parameterAnnotation.getClass()))
+                    .map(parameterAnnotation -> {
+                        if (parameter.getTypeInformation().isCollectionLike()
+                                && !parameter.getTypeInformation().getType().isArray()) {
+                            return parameter.getTypeInformation().getComponentType().getType();
+                        }
+                        return parameter.getTypeInformation().getType();
+
+                    }).collect(Collectors.toList()));
+        }
+
+        return types;
+    }
+
+    private static class Voted<T> implements Comparable<Voted<?>> {
+
+        private T subject;
+        private int votes;
+
+        public Voted(T subject, int votes) {
+            this.subject = subject;
+            this.votes = votes;
+        }
+
+        @Override
+        public int compareTo(Voted<?> o) {
+            return votes - o.votes;
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/codec/RedisCodecResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/codec/RedisCodecResolver.java
new file mode 100644
index 0000000000..7b463c71e7
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/codec/RedisCodecResolver.java
@@ -0,0 +1,21 @@
+package com.lambdaworks.redis.dynamic.codec;
+
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.dynamic.CommandMethod;
+
+/**
+ * Strategy interface to resolve a {@link RedisCodec} for a {@link CommandMethod}.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public interface RedisCodecResolver {
+
+    /**
+     * Resolve a {@link RedisCodec} for the given {@link CommandMethod}.
+     * 
+     * @param commandMethod must not be {@literal null}.
+     * @return the resolved {@link RedisCodec} or {@literal null} if not resolvable.
+     */
+    RedisCodec<?, ?> resolve(CommandMethod commandMethod);
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/domain/FlushMode.java b/src/main/java/com/lambdaworks/redis/dynamic/domain/FlushMode.java
new file mode 100644
index 0000000000..d55881ee75
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/domain/FlushMode.java
@@ -0,0 +1,8 @@
+package com.lambdaworks.redis.dynamic.domain;
+
+/**
+ * @author Mark Paluch
+ */
+public enum FlushMode {
+    DEFAULT, ENQUEUE, FLUSH;
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/domain/Timeout.java b/src/main/java/com/lambdaworks/redis/dynamic/domain/Timeout.java
new file mode 100644
index 0000000000..0c8e6b0b7e
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/domain/Timeout.java
@@ -0,0 +1,55 @@
+package com.lambdaworks.redis.dynamic.domain;
+
+import java.util.concurrent.TimeUnit;
+
+import com.lambdaworks.redis.dynamic.annotation.Command;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Timeout value object to represent a timeout value with its {@link TimeUnit}.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ * @see Command
+ */
+public class Timeout {
+
+    private final long timeout;
+    private final TimeUnit timeUnit;
+
+    private Timeout(long timeout, TimeUnit timeUnit) {
+
+        LettuceAssert.isTrue(timeout >= 0, "Timeout must be greater or equal to zero");
+        LettuceAssert.notNull(timeUnit, "TimeUnit must not be null");
+
+        this.timeout = timeout;
+        this.timeUnit = timeUnit;
+    }
+
+    /**
+     * Create a {@link Timeout}.
+     * 
+     * @param timeout the timeout value, must be non-negative.
+     * @param timeUnit the associated {@link TimeUnit}, must not be {@literal null}.
+     * @return the {@link Timeout}.
+     */
+    public static Timeout create(long timeout, TimeUnit timeUnit) {
+        return new Timeout(timeout, timeUnit);
+    }
+
+    /**
+     *
+     * @return the timeout value.
+     */
+    public long getTimeout() {
+        return timeout;
+    }
+
+    /**
+     *
+     * @return the {@link TimeUnit}.
+     */
+    public TimeUnit getTimeUnit() {
+        return timeUnit;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/domain/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/domain/package-info.java
new file mode 100644
index 0000000000..86723bb0a4
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/domain/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Core annotations to be used with Redis Command interfaces.
+ */
+package com.lambdaworks.redis.dynamic.domain;
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/DefaultMethodInvocation.java b/src/main/java/com/lambdaworks/redis/dynamic/intercept/DefaultMethodInvocation.java
new file mode 100644
index 0000000000..7e474e337b
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/intercept/DefaultMethodInvocation.java
@@ -0,0 +1,30 @@
+package com.lambdaworks.redis.dynamic.intercept;
+
+import java.lang.reflect.Method;
+
+/**
+ * Default implementation of {@link MethodInvocation}
+ * 
+ * @author Mark Paluch
+ */
+abstract class DefaultMethodInvocation implements MethodInvocation {
+
+    private final Method method;
+    private final Object[] arguments;
+
+    DefaultMethodInvocation(Method method, Object[] arguments) {
+
+        this.method = method;
+        this.arguments = arguments;
+    }
+
+    @Override
+    public Method getMethod() {
+        return method;
+    }
+
+    @Override
+    public Object[] getArguments() {
+        return arguments;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java
new file mode 100644
index 0000000000..38a81d48bc
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java
@@ -0,0 +1,113 @@
+package com.lambdaworks.redis.dynamic.intercept;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import com.lambdaworks.redis.internal.AbstractInvocationHandler;
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.internal.LettuceLists;
+
+/**
+ * Factory to create invocation proxies.
+ * <p>
+ * Method calls to invocation proxies can be intercepted and modified by a chain of {@link MethodInterceptor}s. Each
+ * {@link MethodInterceptor} can continue the call chain, terminate prematurely or modify all aspects of a {@link Method}
+ * invocation.
+ * <p>
+ * {@link InvocationProxyFactory} produces invocation proxies which can implement multiple interface type. Any non-interface
+ * types are rejected.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ * @see MethodInterceptor
+ * @see MethodInvocation
+ */
+public class InvocationProxyFactory {
+
+    private final List<MethodInterceptor> interceptors = new ArrayList<>();
+    private final List<Class<?>> interfaces = new ArrayList<>();
+
+    /**
+     * Create a proxy instance give a {@link ClassLoader}.
+     * 
+     * @param classLoader must not be {@literal null}.
+     * @param <T> inferred result type.
+     * @return the invocation proxy instance.
+     */
+    @SuppressWarnings("unchecked")
+    public <T> T createProxy(ClassLoader classLoader) {
+
+        LettuceAssert.notNull(classLoader, "ClassLoader must not be null");
+
+        Class<?>[] interfaces = this.interfaces.toArray(new Class[this.interfaces.size()]);
+
+        return (T) Proxy.newProxyInstance(classLoader, interfaces, new InterceptorChainInvocationHandler(interceptors));
+    }
+
+    /**
+     * Add a interface type that should be implemented by the resulting invocation proxy.
+     * 
+     * @param ifc must not be {@literal null} and must be an interface type.
+     */
+    public void addInterface(Class<?> ifc) {
+
+        LettuceAssert.notNull(ifc, "Interface type must not be null");
+        LettuceAssert.isTrue(ifc.isInterface(), "Type must be an interface");
+
+        this.interfaces.add(ifc);
+    }
+
+    /**
+     * Add a {@link MethodInterceptor} to the interceptor chain.
+     * 
+     * @param interceptor notNull
+     */
+    public void addInterceptor(MethodInterceptor interceptor) {
+
+        LettuceAssert.notNull(interceptor, "MethodInterceptor must not be null");
+
+        this.interceptors.add(interceptor);
+    }
+
+    /**
+     * {@link MethodInterceptor}-based {@link InterceptorChainInvocationHandler}.
+     */
+    private static class InterceptorChainInvocationHandler extends AbstractInvocationHandler {
+
+        private final List<MethodInterceptor> interceptors;
+
+        InterceptorChainInvocationHandler(List<MethodInterceptor> interceptors) {
+            this.interceptors = LettuceLists.newList(interceptors);
+        }
+
+        @Override
+        protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
+
+            Iterator<MethodInterceptor> iterator = interceptors.iterator();
+
+            if (iterator.hasNext()) {
+                return iterator.next().invoke(getInvocation(method, args, iterator));
+            }
+
+            return null;
+        }
+
+        private DefaultMethodInvocation getInvocation(final Method method, final Object[] args,
+                final Iterator<MethodInterceptor> iterator) {
+            return new DefaultMethodInvocation(method, args) {
+
+                @Override
+                public Object proceed() throws Throwable {
+
+                    if (iterator.hasNext()) {
+                        return iterator.next().invoke(getInvocation(method, args, iterator));
+                    }
+                    return null;
+                }
+            };
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptor.java b/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptor.java
new file mode 100644
index 0000000000..79d2aa0e28
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptor.java
@@ -0,0 +1,24 @@
+package com.lambdaworks.redis.dynamic.intercept;
+
+/**
+ * Intercepts calls on an interface on its way to the target. These are nested "on top" of the target.
+ *
+ * <p>
+ * Implementing classes are required to implement the {@link #invoke(MethodInvocation)} method to modify the original behavior.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public interface MethodInterceptor {
+
+    /**
+     * Implement this method to perform extra treatments before and after the invocation. Polite implementations would certainly
+     * like to invoke {@link MethodInvocation#proceed()}.
+     * 
+     * @param invocation the method invocation
+     * @return the result of the call to {@link MethodInvocation#proceed()}, might be intercepted by the interceptor.
+     * @throws Throwable if the interceptors or the target-object throws an exception.
+     */
+    Object invoke(MethodInvocation invocation) throws Throwable;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInvocation.java b/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInvocation.java
new file mode 100644
index 0000000000..62c31e921b
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInvocation.java
@@ -0,0 +1,36 @@
+package com.lambdaworks.redis.dynamic.intercept;
+
+import java.lang.reflect.Method;
+
+/**
+ * Description of an invocation to a method, given to an interceptor upon method-call.
+ *
+ * <p>
+ * A method invocation is a joinpoint and can be intercepted by a method interceptor.
+ *
+ * @see MethodInterceptor
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public interface MethodInvocation {
+
+    /**
+     * Proceed to the next interceptor in the chain.
+     * <p>
+     * The implementation and the semantics of this method depends on the actual joinpoint type (see the children interfaces).
+     * 
+     * @return see the children interfaces' proceed definition
+     * @throws Throwable if the invocation throws an exception
+     */
+    Object proceed() throws Throwable;
+
+    /**
+     * @return the originally called {@link Method}.
+     */
+    Method getMethod();
+
+    /**
+     * @return method call arguments.
+     */
+    Object[] getArguments();
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/intercept/package-info.java
new file mode 100644
index 0000000000..e3c1fb4dc6
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/intercept/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Invocation proxy support.
+ */
+package com.lambdaworks.redis.dynamic.intercept;
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java
new file mode 100644
index 0000000000..a4cb773f54
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java
@@ -0,0 +1,90 @@
+package com.lambdaworks.redis.dynamic.output;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
+import com.lambdaworks.redis.dynamic.support.TypeInformation;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * {@link RedisCodec}-aware implementation of {@link CommandOutputFactoryResolver}. This implementation inspects
+ * {@link RedisCodec} regarding its type and enhances {@link OutputSelector} for {@link CommandOutputFactory} resolution.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public class CodecAwareOutputFactoryResolver implements CommandOutputFactoryResolver {
+
+    private final CommandOutputFactoryResolver delegate;
+    private final TypeInformation<?> keyType;
+    private final TypeInformation<?> valueType;
+    private final Map<String, TypeInformation<?>> typeVariables = new HashMap<>();
+
+    /**
+     * Create a new {@link CodecAwareOutputFactoryResolver} given {@link CommandOutputFactoryResolver} and {@link RedisCodec}.
+     * 
+     * @param delegate must not be {@literal null}.
+     * @param redisCodec must not be {@literal null}.
+     */
+    public CodecAwareOutputFactoryResolver(CommandOutputFactoryResolver delegate, RedisCodec<?, ?> redisCodec) {
+
+        LettuceAssert.notNull(delegate, "CommandOutputFactoryResolver delegate must not be null");
+        LettuceAssert.notNull(redisCodec, "RedisCodec must not be null");
+
+        this.delegate = delegate;
+
+        ClassTypeInformation<? extends RedisCodec> typeInformation = ClassTypeInformation.from(redisCodec.getClass());
+        TypeInformation<?> superTypeInformation = typeInformation.getSuperTypeInformation(RedisCodec.class);
+        List<TypeInformation<?>> typeArguments = superTypeInformation.getTypeArguments();
+
+        this.keyType = typeArguments.get(0);
+        this.valueType = typeArguments.get(1);
+
+        this.typeVariables.put("K", keyType);
+        this.typeVariables.put("V", valueType);
+    }
+
+    @Override
+    public CommandOutputFactory resolveCommandOutput(OutputSelector outputSelector) {
+
+        Map<String, TypeInformation<?>> typeVariables = new HashMap<>(outputSelector.getTypeVariables());
+        typeVariables.putAll(this.typeVariables);
+
+        return delegate.resolveCommandOutput(
+                new OutputSelector(outputSelector.getTypeInformation(), isKeyType(outputSelector.getTypeInformation()),
+                        isValueType(outputSelector.getTypeInformation()), typeVariables));
+    }
+
+    @Override
+    public CommandOutputFactory resolveStreamingCommandOutput(OutputSelector outputSelector) {
+
+        Map<String, TypeInformation<?>> typeVariables = new HashMap<>(outputSelector.getTypeVariables());
+        typeVariables.putAll(this.typeVariables);
+
+        return delegate.resolveStreamingCommandOutput(
+                new OutputSelector(outputSelector.getTypeInformation(), isKeyType(outputSelector.getTypeInformation()),
+                        isValueType(outputSelector.getTypeInformation()), typeVariables));
+    }
+
+    protected boolean isKeyType(TypeInformation<?> typeInformation) {
+        return walkComponentTypeAssignability(typeInformation, keyType);
+    }
+
+    protected boolean isValueType(TypeInformation<?> typeInformation) {
+        return walkComponentTypeAssignability(typeInformation, valueType);
+    }
+
+    private boolean walkComponentTypeAssignability(TypeInformation<?> typeInformation, TypeInformation<?> sourceType) {
+
+        do {
+            if (typeInformation.isAssignableFrom(sourceType)) {
+                return true;
+            }
+            typeInformation = typeInformation.getComponentType();
+        } while (typeInformation != null);
+        return false;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java
new file mode 100644
index 0000000000..8c5e015e58
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java
@@ -0,0 +1,24 @@
+package com.lambdaworks.redis.dynamic.output;
+
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.output.CommandOutput;
+
+/**
+ * Strategy interface to create {@link CommandOutput} given {@link RedisCodec}.
+ *
+ * <p>
+ * Implementing classes usually produce the same {@link CommandOutput} type.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public interface CommandOutputFactory {
+
+    /**
+     * Create and initialize a new {@link CommandOutput} given {@link RedisCodec}.
+     * 
+     * @param codec must not be {@literal null}.
+     * @return the new {@link CommandOutput}.
+     */
+    <K, V> CommandOutput<K, V, ?> create(RedisCodec<K, V> codec);
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactoryResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactoryResolver.java
new file mode 100644
index 0000000000..b850071cf9
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactoryResolver.java
@@ -0,0 +1,33 @@
+package com.lambdaworks.redis.dynamic.output;
+
+/**
+ * Strategy interface to resolve a {@link CommandOutputFactory} based on a {@link OutputSelector}. Resolution of
+ * {@link CommandOutputFactory} is based on {@link com.lambdaworks.redis.dynamic.CommandMethod} result types and can be
+ * influenced whether the result type is a key or value result type. Additional type variables (based on the used
+ * {@link com.lambdaworks.redis.codec.RedisCodec} are hints to improve output resolution.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ * @see OutputSelector
+ */
+public interface CommandOutputFactoryResolver {
+
+    /**
+     * Resolve a regular {@link CommandOutputFactory} that produces the {@link com.lambdaworks.redis.output.CommandOutput}
+     * result component type.
+     * 
+     * @param outputSelector must not be {@literal null}.
+     * @return the {@link CommandOutputFactory} if resolved, {@literal null} otherwise.
+     */
+    CommandOutputFactory resolveCommandOutput(OutputSelector outputSelector);
+
+    /**
+     * Resolve a streaming {@link CommandOutputFactory} that produces the {@link com.lambdaworks.redis.output.StreamingOutput}
+     * result component type.
+     *
+     * @param outputSelector must not be {@literal null}.
+     * @return the {@link CommandOutputFactory} that implements {@link com.lambdaworks.redis.output.StreamingOutput} if
+     *         resolved, {@literal null} otherwise.
+     */
+    CommandOutputFactory resolveStreamingCommandOutput(OutputSelector outputSelector);
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java b/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java
new file mode 100644
index 0000000000..e6728b00bb
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java
@@ -0,0 +1,73 @@
+package com.lambdaworks.redis.dynamic.output;
+
+import com.lambdaworks.redis.dynamic.support.TypeInformation;
+import com.lambdaworks.redis.dynamic.support.TypeVariableTypeInformation;
+import com.lambdaworks.redis.internal.LettuceClassUtils;
+
+/**
+ * Base class for {@link CommandOutputFactory} resolution such as {@link OutputRegistryCommandOutputFactoryResolver}.
+ * <p>
+ * This class provides methods to check provider/selector type assignability. Subclasses are responsible for calling methods in
+ * this class in the correct order.
+ * 
+ * @author Mark Paluch
+ */
+public abstract class CommandOutputResolverSupport {
+
+    /**
+     * Overridable hook to check whether {@code selector} can be assigned from the provider type {@code provider}.
+     * <p>
+     * This method descends the component type hierarchy and considers primitive/wrapper type conversion.
+     * 
+     * @param selector must not be {@literal null}.
+     * @param provider must not be {@literal null}.
+     * @return {@literal true} if selector can be assigned from its provider type.
+     */
+    protected boolean isAssignableFrom(OutputSelector selector, OutputType provider) {
+
+        TypeInformation<?> outputTypeInformation = provider.getTypeInformation();
+        TypeInformation<?> selectorTypeInformation = selector.getTypeInformation();
+
+        do {
+
+            if (outputTypeInformation instanceof TypeVariableTypeInformation) {
+                if (selector.containsTypeVariable(outputTypeInformation.toString())) {
+                    outputTypeInformation = selector.getTypeVariable(outputTypeInformation.toString());
+                }
+            }
+
+            if (outputTypeInformation.getType() == Object.class && selectorTypeInformation.getComponentType() != null) {
+
+                if (provider.getPrimaryType() == OutputRegistry.KeySurrogate.class) {
+                    return selector.isKey();
+                }
+
+                if (provider.getPrimaryType() == OutputRegistry.ValueSurrogate.class) {
+                    return selector.isValue();
+                }
+            }
+
+            if (!isAssignableFrom(selectorTypeInformation, outputTypeInformation)) {
+                return false;
+            }
+
+            outputTypeInformation = outputTypeInformation.getComponentType();
+            selectorTypeInformation = selectorTypeInformation.getComponentType();
+
+        } while (outputTypeInformation != null && outputTypeInformation.getComponentType() != outputTypeInformation
+                && selectorTypeInformation != null && selectorTypeInformation.getComponentType() != selectorTypeInformation);
+        return true;
+    }
+
+    /**
+     * Overridable hook to check whether {@code selector} can be assigned from the provider type {@code provider}.
+     * 
+     * @param selector must not be {@literal null}.
+     * @param provider must not be {@literal null}.
+     * @return {@literal true} if selector can be assigned from its provider type.
+     */
+    protected boolean isAssignableFrom(TypeInformation<?> selector, TypeInformation<?> provider) {
+
+        return selector.isAssignableFrom(provider) || LettuceClassUtils.isAssignable(selector.getType(), provider.getType());
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java
new file mode 100644
index 0000000000..faefd91fa6
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java
@@ -0,0 +1,197 @@
+package com.lambdaworks.redis.dynamic.output;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
+import com.lambdaworks.redis.dynamic.support.TypeInformation;
+import com.lambdaworks.redis.dynamic.support.TypeVariableTypeInformation;
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.output.*;
+
+/**
+ * Registry for {@link CommandOutput} types and their {@link CommandOutputFactory factories}.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ * @see CommandOutput
+ */
+public class OutputRegistry {
+
+    private final static Map<OutputType, CommandOutputFactory> BUILTIN = new LinkedHashMap<>();
+    private final Map<OutputType, CommandOutputFactory> registry = new LinkedHashMap<>();
+
+    static {
+
+        Map<OutputType, CommandOutputFactory> registry = new LinkedHashMap<>();
+
+        register(registry, ListOfMapsOutput.class, ListOfMapsOutput::new);
+        register(registry, ArrayOutput.class, ArrayOutput::new);
+        register(registry, DoubleOutput.class, DoubleOutput::new);
+        register(registry, ByteArrayOutput.class, ByteArrayOutput::new);
+        register(registry, IntegerOutput.class, IntegerOutput::new);
+
+        register(registry, KeyOutput.class, KeyOutput::new);
+        register(registry, ValueOutput.class, ValueOutput::new);
+        register(registry, KeyListOutput.class, KeyListOutput::new);
+        register(registry, ValueListOutput.class, ValueListOutput::new);
+        register(registry, MapOutput.class, MapOutput::new);
+
+        register(registry, ValueSetOutput.class, ValueSetOutput::new);
+
+        register(registry, BooleanOutput.class, BooleanOutput::new);
+        register(registry, BooleanListOutput.class, BooleanListOutput::new);
+        register(registry, GeoCoordinatesListOutput.class, GeoCoordinatesListOutput::new);
+        register(registry, GeoCoordinatesValueListOutput.class, GeoCoordinatesValueListOutput::new);
+        register(registry, ScoredValueListOutput.class, ScoredValueListOutput::new);
+        register(registry, StringValueListOutput.class, StringValueListOutput::new);
+        register(registry, ValueValueListOutput.class, ValueValueListOutput::new);
+
+        register(registry, StringListOutput.class, StringListOutput::new);
+        register(registry, VoidOutput.class, VoidOutput::new);
+
+        BUILTIN.putAll(registry);
+    }
+
+    /**
+     * Create a new {@link OutputRegistry} registering builtin {@link CommandOutput} types.
+     */
+    public OutputRegistry() {
+        this(true);
+    }
+
+    /**
+     * Create a new {@link OutputRegistry}.
+     * 
+     * @param registerBuiltin {@literal true} to register builtin {@link CommandOutput} types.
+     */
+    public OutputRegistry(boolean registerBuiltin) {
+
+        if (registerBuiltin) {
+            registry.putAll(BUILTIN);
+        }
+    }
+
+    /**
+     * Register a {@link CommandOutput} type with its {@link CommandOutputFactory}.
+     * 
+     * @param commandOutputClass must not be {@literal null}.
+     * @param commandOutputFactory must not be {@literal null}.
+     */
+    public <T extends CommandOutput<?, ?, ?>> void register(Class<T> commandOutputClass,
+            CommandOutputFactory commandOutputFactory) {
+
+        LettuceAssert.notNull(commandOutputClass, "CommandOutput class must not be null");
+        LettuceAssert.notNull(commandOutputFactory, "CommandOutputFactory must not be null");
+
+        register(registry, commandOutputClass, commandOutputFactory);
+    }
+
+    /**
+     * Return the registry map.
+     * 
+     * @return map of {@link OutputType} to {@link CommandOutputFactory}.
+     */
+    Map<OutputType, CommandOutputFactory> getRegistry() {
+        return registry;
+    }
+
+    private static <T extends CommandOutput> void register(Map<OutputType, CommandOutputFactory> registry,
+            Class<T> commandOutputClass, CommandOutputFactory commandOutputFactory) {
+
+        List<OutputType> outputTypes = getOutputTypes(commandOutputClass);
+
+        for (OutputType outputType : outputTypes) {
+            registry.put(outputType, commandOutputFactory);
+        }
+    }
+
+    private static List<OutputType> getOutputTypes(Class<? extends CommandOutput> commandOutputClass) {
+
+        OutputType streamingType = getStreamingType(commandOutputClass);
+        OutputType componentOutputType = getOutputComponentType(commandOutputClass);
+
+        List<OutputType> types = new ArrayList<>(2);
+        if (streamingType != null) {
+            types.add(streamingType);
+        }
+
+        if (componentOutputType != null) {
+            types.add(componentOutputType);
+        }
+
+        return types;
+    }
+
+    /**
+     * Retrieve {@link OutputType} for a {@link StreamingOutput} type.
+     * 
+     * @param commandOutputClass
+     * @return
+     */
+    static OutputType getStreamingType(Class<? extends CommandOutput> commandOutputClass) {
+
+        ClassTypeInformation<? extends CommandOutput> classTypeInformation = ClassTypeInformation.from(commandOutputClass);
+
+        TypeInformation<?> superTypeInformation = classTypeInformation.getSuperTypeInformation(StreamingOutput.class);
+
+        if (superTypeInformation == null) {
+            return null;
+        }
+
+        List<TypeInformation<?>> typeArguments = superTypeInformation.getTypeArguments();
+        Class<?> primaryType = getPrimaryType(typeArguments.get(0));
+
+        return new OutputType(primaryType, commandOutputClass, typeArguments.get(0), true);
+    }
+
+    /**
+     * Retrieve {@link OutputType} for a {@link CommandOutput} type.
+     *
+     * @param commandOutputClass
+     * @return
+     */
+    static OutputType getOutputComponentType(Class<? extends CommandOutput> commandOutputClass) {
+
+        ClassTypeInformation<? extends CommandOutput> classTypeInformation = ClassTypeInformation.from(commandOutputClass);
+
+        TypeInformation<?> superTypeInformation = classTypeInformation.getSuperTypeInformation(CommandOutput.class);
+
+        if (superTypeInformation == null) {
+            return null;
+        }
+
+        List<TypeInformation<?>> typeArguments = superTypeInformation.getTypeArguments();
+        Class<?> primaryType = getPrimaryType(typeArguments.get(2));
+
+        return new OutputType(primaryType, commandOutputClass, typeArguments.get(2), false);
+    }
+
+    private static Class<?> getPrimaryType(TypeInformation<?> typeInformation) {
+
+        Class<?> primaryType = typeInformation.getType();
+        while (typeInformation.isCollectionLike() && typeInformation != typeInformation.getComponentType()) {
+            typeInformation = typeInformation.getComponentType();
+        }
+
+        if (typeInformation instanceof TypeVariableTypeInformation) {
+
+            // TODO: Requires maybe a more sophisticated resolution.
+            if (typeInformation.toString().equals("K")) {
+                primaryType = KeySurrogate.class;
+            }
+
+            if (typeInformation.toString().equals("V")) {
+                primaryType = ValueSurrogate.class;
+            }
+        }
+        return primaryType;
+    }
+
+    static class KeySurrogate {
+    }
+
+    static class ValueSurrogate {
+    }
+
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
new file mode 100644
index 0000000000..a2ebdf79be
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
@@ -0,0 +1,89 @@
+package com.lambdaworks.redis.dynamic.output;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.output.CommandOutput;
+
+/**
+ * {@link CommandOutputFactoryResolver} using {@link OutputRegistry} to resolve a {@link CommandOutputFactory}.
+ * <p>
+ * Types registered in {@link OutputRegistry} are inspected for the types they produce and matched with the declared repository
+ * method. If resolution yields multiple {@link CommandOutput}s, the first matched output is used.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ * @see OutputRegistry
+ */
+public class OutputRegistryCommandOutputFactoryResolver extends CommandOutputResolverSupport
+        implements CommandOutputFactoryResolver {
+
+    private static final ClassTypeInformation<CommandOutput> COMMAND_OUTPUT = ClassTypeInformation.from(CommandOutput.class);
+
+    private final OutputRegistry outputRegistry;
+
+    /**
+     * Create a new {@link OutputRegistryCommandOutputFactoryResolver} given {@link OutputRegistry}.
+     * 
+     * @param outputRegistry must not be {@literal null}.
+     */
+    public OutputRegistryCommandOutputFactoryResolver(OutputRegistry outputRegistry) {
+
+        LettuceAssert.notNull(outputRegistry, "OutputRegistry must not be null");
+
+        this.outputRegistry = outputRegistry;
+    }
+
+    @Override
+    public CommandOutputFactory resolveCommandOutput(OutputSelector outputSelector) {
+
+        Map<OutputType, CommandOutputFactory> registry = outputRegistry.getRegistry();
+
+        Set<OutputType> outputTypes = registry.keySet().stream().filter((outputType) -> !outputType.isStreaming())
+                .collect(Collectors.toSet());
+
+        List<OutputType> candidates = getCandidates(outputTypes, outputSelector);
+
+        if (candidates.isEmpty()) {
+            return null;
+        }
+
+        return registry.get(candidates.get(0));
+    }
+
+    @Override
+    public CommandOutputFactory resolveStreamingCommandOutput(OutputSelector outputSelector) {
+
+        Map<OutputType, CommandOutputFactory> registry = outputRegistry.getRegistry();
+
+        Set<OutputType> outputTypes = registry.keySet().stream().filter(OutputType::isStreaming).collect(Collectors.toSet());
+
+        List<OutputType> candidates = getCandidates(outputTypes, outputSelector);
+
+        if (candidates.isEmpty()) {
+            return null;
+        }
+
+        return registry.get(candidates.get(0));
+    }
+
+    private List<OutputType> getCandidates(Collection<OutputType> outputTypes, OutputSelector outputSelector) {
+
+        return outputTypes.stream().filter(outputType -> {
+
+            if (COMMAND_OUTPUT.getType().isAssignableFrom(outputSelector.getTypeInformation().getType())) {
+
+                if (outputSelector.getTypeInformation().getType().isAssignableFrom(outputType.getCommandOutputClass())) {
+                    return true;
+                }
+            }
+
+            return isAssignableFrom(outputSelector, outputType);
+        }).collect(Collectors.toList());
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java
new file mode 100644
index 0000000000..f8847004b1
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java
@@ -0,0 +1,99 @@
+package com.lambdaworks.redis.dynamic.output;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.lambdaworks.redis.dynamic.support.TypeInformation;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Selector {@link CommandOutputFactory} resolution.
+ * <p>
+ * A {@link OutputSelector} is based on the result {@link TypeInformation} and can supply additionaly whether the type is a key
+ * or value type. An optional {@link Map} with type variables (usually {@link com.lambdaworks.redis.codec.RedisCodec} type
+ * variables) can be supplied to resolve type variables inside of {@link com.lambdaworks.redis.output.CommandOutput}.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public class OutputSelector {
+
+    private final TypeInformation<?> typeInformation;
+    private final boolean key;
+    private final boolean value;
+    private final Map<String, TypeInformation<?>> typeVariables;
+
+    /**
+     * Create a new {@link OutputSelector} given {@link TypeInformation}.
+     *
+     * @param typeInformation must not be {@literal null}.
+     */
+    public OutputSelector(TypeInformation<?> typeInformation) {
+        this(typeInformation, false, false, Collections.emptyMap());
+    }
+
+    /**
+     * Create a new {@link OutputSelector} given {@link TypeInformation}, key/value flags and {@link Map} of type variables.
+     *
+     * @param typeInformation must not be {@literal null}.
+     * @param key
+     * @param value
+     * @param typeVariables must not be {@literal null}.
+     */
+    public OutputSelector(TypeInformation<?> typeInformation, boolean key, boolean value,
+            Map<String, TypeInformation<?>> typeVariables) {
+
+        LettuceAssert.notNull(typeInformation, "Result TypeInformation must not be null");
+        LettuceAssert.notNull(typeVariables, "Map of type variables must not be null");
+
+        this.typeInformation = typeInformation;
+        this.key = key;
+        this.value = value;
+        this.typeVariables = Collections.unmodifiableMap(new HashMap<>(typeVariables));
+    }
+
+    /**
+     * @param typeVariableName
+     * @return {@literal true} if the {@code typeVariableName} is provided.
+     */
+    public boolean containsTypeVariable(String typeVariableName) {
+        return typeVariables.containsKey(typeVariableName);
+    }
+
+    /**
+     * @param typeInformation
+     * @return the {@link TypeInformation} for a type variable.
+     */
+    public TypeInformation<?> getTypeVariable(String typeInformation) {
+        return typeVariables.get(typeInformation);
+    }
+
+    /**
+     * @return the resulting {@link TypeInformation}.
+     */
+    public TypeInformation<?> getTypeInformation() {
+        return typeInformation;
+    }
+
+    /**
+     * @return {@link Map} of type variables.
+     */
+    public Map<String, TypeInformation<?>> getTypeVariables() {
+        return Collections.unmodifiableMap(typeVariables);
+    }
+
+    /**
+     * @return {@literal true} if the {@link #getTypeInformation()} is a key-type.
+     */
+    public boolean isKey() {
+        return key;
+    }
+
+    /**
+     * @return {@literal true} if the {@link #getTypeInformation()} is a value-type.
+     */
+    public boolean isValue() {
+        return value;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java
new file mode 100644
index 0000000000..c4fc40c650
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java
@@ -0,0 +1,90 @@
+package com.lambdaworks.redis.dynamic.output;
+
+import com.lambdaworks.redis.dynamic.support.TypeInformation;
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.output.CommandOutput;
+
+/**
+ * Type descriptor for a {@link com.lambdaworks.redis.output.CommandOutput}.
+ * <p>
+ * This value object describes the primary output type and the produced {@link TypeInformation} by the {@link CommandOutput}
+ * type.
+ * <p>
+ * {@link OutputType} makes a distinction whether a {@link CommandOutput} is a
+ * {@link com.lambdaworks.redis.output.StreamingOutput} by providing {@code streaming}. Streaming outputs produce usually a
+ * component type hence they require an own {@link OutputType} descriptor.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public class OutputType {
+
+    private final Class<?> primaryType;
+    private final Class<? extends CommandOutput> commandOutputClass;
+    private final TypeInformation<?> typeInformation;
+    private final boolean streaming;
+
+    /**
+     * Create a new {@link OutputType} given {@code primaryType}, the {@code commandOutputClass}, {@link TypeInformation} and
+     * whether the {@link OutputType} is for a {@link com.lambdaworks.redis.output.StreamingOutput}.
+     * 
+     * @param primaryType must not be {@literal null}.
+     * @param commandOutputClass must not be {@literal null}.
+     * @param typeInformation must not be {@literal null}.
+     * @param streaming {@literal true} if the type descriptor concerns the {@link com.lambdaworks.redis.output.StreamingOutput}
+     *        result type.
+     */
+    public OutputType(Class<?> primaryType, Class<? extends CommandOutput> commandOutputClass,
+            TypeInformation<?> typeInformation, boolean streaming) {
+
+        LettuceAssert.notNull(primaryType, "Primary type must not be null");
+        LettuceAssert.notNull(commandOutputClass, "CommandOutput class must not be null");
+        LettuceAssert.notNull(typeInformation, "TypeInformation must not be null");
+
+        this.primaryType = primaryType;
+        this.commandOutputClass = commandOutputClass;
+        this.typeInformation = typeInformation;
+        this.streaming = streaming;
+    }
+
+    /**
+     * @return
+     */
+    public Class<?> getPrimaryType() {
+        return primaryType;
+    }
+
+    /**
+     * @return
+     */
+    public TypeInformation<?> getTypeInformation() {
+        return typeInformation;
+    }
+
+    /**
+     * @return
+     */
+    public boolean isStreaming() {
+        return streaming;
+    }
+
+    /**
+     * @return
+     */
+    public Class<?> getCommandOutputClass() {
+        return commandOutputClass;
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [primaryType=").append(primaryType);
+        sb.append(", commandOutputClass=").append(commandOutputClass);
+        sb.append(", typeInformation=").append(typeInformation);
+        sb.append(", streaming=").append(streaming);
+        sb.append(']');
+        return sb.toString();
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/VoidOutput.java b/src/main/java/com/lambdaworks/redis/dynamic/output/VoidOutput.java
new file mode 100644
index 0000000000..e40365cf0f
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/VoidOutput.java
@@ -0,0 +1,34 @@
+package com.lambdaworks.redis.dynamic.output;
+
+import java.nio.ByteBuffer;
+
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.output.CommandOutput;
+
+/**
+ * {@link Void} command output to consume data silently without actually processing it.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class VoidOutput<K, V> extends CommandOutput<K, V, Void> {
+
+    /**
+     * Initialize a new instance that encodes and decodes keys and values using the supplied codec.
+     *
+     * @param codec Codec used to encode/decode keys and values, must not be {@literal null}.
+     */
+    public VoidOutput(RedisCodec<K, V> codec) {
+        super(codec, null);
+    }
+
+    @Override
+    public void set(ByteBuffer bytes) {
+        // no-op
+    }
+
+    @Override
+    public void set(long integer) {
+        // no-op
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/output/package-info.java
new file mode 100644
index 0000000000..a8cd29d577
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * {@link com.lambdaworks.redis.output.CommandOutput} resolution support.
+ */
+package com.lambdaworks.redis.dynamic.output;
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/package-info.java
new file mode 100644
index 0000000000..7ffe3d5810
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Core package for Redis Command Interface support through {@link com.lambdaworks.redis.dynamic.RedisCommandFactory}.
+ */
+package com.lambdaworks.redis.dynamic;
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java
new file mode 100644
index 0000000000..c5ff8b6ab1
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java
@@ -0,0 +1,86 @@
+package com.lambdaworks.redis.dynamic.parameter;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+
+import com.lambdaworks.redis.dynamic.domain.FlushMode;
+import com.lambdaworks.redis.dynamic.domain.Timeout;
+
+/**
+ * {@link Parameters}-implementation specific to execution. This implementation considers {@link Timeout} for a command method
+ * applying the appropriate synchronization.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ * @see Timeout
+ */
+public class ExecutionSpecificParameters extends Parameters<ExecutionSpecificParameters.ExecutionAwareParameter> {
+
+    private static final List<Class<?>> TYPES = Arrays.asList(FlushMode.class, Timeout.class);
+
+    private final int flushModeIndex;
+    private final int timeoutIndex;
+
+    /**
+     * Create new {@link ExecutionSpecificParameters} given a {@link Method}.
+     * 
+     * @param method must not be {@literal null}.
+     */
+    public ExecutionSpecificParameters(Method method) {
+
+        super(method);
+
+        int flushModeIndex = -1;
+        int timeoutIndex = -1;
+
+        List<ExecutionAwareParameter> parameters = getParameters();
+
+        for (int i = 0; i < method.getParameterCount(); i++) {
+
+            Parameter methodParameter = parameters.get(i);
+
+            if (methodParameter.isSpecialParameter()) {
+                if (methodParameter.isAssignableTo(Timeout.class)) {
+                    timeoutIndex = i;
+                }
+
+                if (methodParameter.isAssignableTo(FlushMode.class)) {
+                    flushModeIndex = i;
+                }
+            }
+        }
+
+        this.flushModeIndex = flushModeIndex;
+        this.timeoutIndex = timeoutIndex;
+    }
+
+    public int getFlushModeIndex() {
+        return flushModeIndex;
+    }
+
+    public int getTimeoutIndex() {
+        return timeoutIndex;
+    }
+
+    @Override
+    protected ExecutionAwareParameter createParameter(Method method, int parameterIndex) {
+        return new ExecutionAwareParameter(method, parameterIndex);
+    }
+
+    public boolean hasTimeoutIndex() {
+        return getTimeoutIndex() != -1;
+    }
+
+    public static class ExecutionAwareParameter extends Parameter {
+
+        public ExecutionAwareParameter(Method method, int parameterIndex) {
+            super(method, parameterIndex);
+        }
+
+        @Override
+        public boolean isSpecialParameter() {
+            return super.isSpecialParameter() || TYPES.contains(getParameterType());
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/MethodParametersAccessor.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/MethodParametersAccessor.java
new file mode 100644
index 0000000000..303763b187
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/parameter/MethodParametersAccessor.java
@@ -0,0 +1,60 @@
+package com.lambdaworks.redis.dynamic.parameter;
+
+import com.lambdaworks.redis.dynamic.domain.FlushMode;
+import com.lambdaworks.redis.dynamic.domain.Timeout;
+
+import java.util.Iterator;
+
+/**
+ * Accessor interface to method parameters during the actual invocation.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public interface MethodParametersAccessor {
+
+    /**
+     * @return number of parameters.
+     */
+    int getParameterCount();
+
+    /**
+     * Returns the bindable value with the given index. Bindable means, that {@link FlushMode} and {@link Timeout} values are
+     * skipped without noticed in the index. For a method signature taking {@link String}, {@link Timeout} , {@link String},
+     * {@code #getBindableParameter(1)} would return the second {@link String} value.
+     *
+     * @param index
+     * @return the bindable value.
+     */
+    Object getBindableValue(int index);
+
+    /**
+     *
+     * @param index
+     * @return {@literal true} if the parameter at {@code index} is a key.
+     */
+    boolean isKey(int index);
+
+    /**
+     *
+     * @param index
+     * @return {@literal true} if the parameter at {@code index} is a value.
+     */
+    boolean isValue(int index);
+
+    /**
+     * Returns an iterator over all <em>bindable</em> parameters. This means parameters implementing {@link Timeout} or
+     * {@link FlushMode} will not be included in this {@link Iterator}.
+     *
+     * @return
+     */
+    Iterator<Object> iterator();
+
+    /**
+     * Resolve a parameter name to its index.
+     * 
+     * @param name the name.
+     * @return
+     */
+    int resolveParameterIndex(String name);
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameter.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameter.java
new file mode 100644
index 0000000000..194b2b5079
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameter.java
@@ -0,0 +1,122 @@
+package com.lambdaworks.redis.dynamic.parameter;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.lambdaworks.redis.dynamic.support.*;
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.internal.LettuceClassUtils;
+
+/**
+ * Abstracts a method parameter and exposes access to type and parameter information.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public class Parameter {
+
+    private final ParameterNameDiscoverer discoverer = new CompositeParameterNameDiscoverer(
+            new StandardReflectionParameterNameDiscoverer(), new AnnotationParameterNameDiscoverer());
+
+    private final Method method;
+    private final String name;
+    private final int parameterIndex;
+    private final TypeInformation<?> typeInformation;
+    private final MethodParameter methodParameter;
+
+    public Parameter(Method method, int parameterIndex) {
+
+        this.method = method;
+        this.parameterIndex = parameterIndex;
+        this.methodParameter = new MethodParameter(method, parameterIndex);
+        this.methodParameter.initParameterNameDiscovery(discoverer);
+        this.name = methodParameter.getParameterName();
+        this.typeInformation = ClassTypeInformation.fromMethodParameter(method, parameterIndex);
+    }
+
+    /**
+     * Return the parameter annotation of the given type, if available.
+     * 
+     * @param annotationType the annotation type to look for
+     * @return the annotation object, or {@code null} if not found
+     */
+    public <A extends Annotation> A findAnnotation(Class<A> annotationType) {
+        return methodParameter.getParameterAnnotation(annotationType);
+    }
+
+    /**
+     * Return all parameter annotations.
+     * 
+     * @return the {@link List} of annotation objects.
+     */
+    public List<? extends Annotation> getAnnotations() {
+
+        Annotation[] annotations = method.getParameterAnnotations()[parameterIndex];
+        List<Annotation> result = new ArrayList<>(annotations.length);
+        Collections.addAll(result, annotations);
+
+        return result;
+    }
+
+    /**
+     *
+     * @return the parameter index.
+     */
+    public int getParameterIndex() {
+        return parameterIndex;
+    }
+
+    /**
+     *
+     * @return the parameter type.
+     */
+    public Class<?> getParameterType() {
+        return method.getParameterTypes()[parameterIndex];
+    }
+
+    /**
+     *
+     * @return the parameter {@link TypeInformation}.
+     */
+    public TypeInformation<?> getTypeInformation() {
+        return typeInformation;
+    }
+
+    /**
+     * Check whether the parameter is assignable to {@code target}.
+     * 
+     * @param target must not be {@literal null}.
+     * @return
+     */
+    public boolean isAssignableTo(Class<?> target) {
+
+        LettuceAssert.notNull(target, "Target type must not be null");
+
+        return LettuceClassUtils.isAssignable(target, getParameterType());
+    }
+
+    /**
+     *
+     * @return {@literal true} if the parameter is a special parameter.
+     */
+    public boolean isSpecialParameter() {
+        return false;
+    }
+
+    /**
+     * @return {@literal true} if the {@link Parameter} can be bound to a command.
+     */
+    boolean isBindable() {
+        return !isSpecialParameter();
+    }
+
+    /**
+     * @return the parameter name or {@literal null} if not available.
+     */
+    public String getName() {
+        return name;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java
new file mode 100644
index 0000000000..1ff3a8a515
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java
@@ -0,0 +1,92 @@
+package com.lambdaworks.redis.dynamic.parameter;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Base class to abstract method {@link Parameter}s.
+ * 
+ * @author Mark Paluch
+ */
+public abstract class Parameters<P extends Parameter> implements Iterable<P> {
+
+    private final List<P> parameters;
+    private final List<P> bindableParameters;
+
+    /**
+     * Create new {@link Parameters} given a {@link Method}.
+     *
+     * @param method must not be {@literal null}.
+     */
+    public Parameters(Method method) {
+
+        this.parameters = new ArrayList<>(method.getParameterCount());
+
+        for (int i = 0; i < method.getParameterCount(); i++) {
+            parameters.add(createParameter(method, i));
+        }
+
+        this.bindableParameters = createBindableParameters();
+    }
+
+    /**
+     * Create a new {@link Parameters} for given a {@link Method} at {@code parameterIndex}.
+     * 
+     * @param method must not be {@literal null}.
+     * @param parameterIndex the parameter index.
+     * @return the {@link Parameter}.
+     */
+    protected abstract P createParameter(Method method, int parameterIndex);
+
+    /**
+     * Returns {@link Parameter} instances with effectively all special parameters removed.
+     *
+     * @return
+     */
+    private List<P> createBindableParameters() {
+
+        List<P> bindables = new ArrayList<>(parameters.size());
+
+        for (P parameter : parameters) {
+            if (parameter.isBindable()) {
+                bindables.add(parameter);
+            }
+        }
+
+        return bindables;
+    }
+
+    /**
+     * @return
+     */
+    public List<P> getParameters() {
+        return parameters;
+    }
+
+    /**
+     * Get the bindable parameter according it's logical position in the command. Declarative position may differ because of
+     * special parameters interleaved.
+     * 
+     * @param index
+     * @return the {@link Parameter}.
+     */
+    public Parameter getBindableParameter(int index) {
+        return getBindableParameters().get(index);
+    }
+
+    /**
+     * Returns {@link Parameter} instances with effectively all special parameters removed.
+     *
+     * @return
+     */
+    public List<P> getBindableParameters() {
+        return bindableParameters;
+    }
+
+    @Override
+    public Iterator<P> iterator() {
+        return getBindableParameters().iterator();
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/package-info.java
new file mode 100644
index 0000000000..55df8656d4
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/parameter/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Parameter access and descriptors.
+ */
+package com.lambdaworks.redis.dynamic.parameter;
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactory.java
new file mode 100644
index 0000000000..fa1dffff20
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactory.java
@@ -0,0 +1,214 @@
+package com.lambdaworks.redis.dynamic.segment;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import com.lambdaworks.redis.LettuceStrings;
+import com.lambdaworks.redis.dynamic.annotation.Command;
+import com.lambdaworks.redis.dynamic.annotation.CommandNaming;
+import com.lambdaworks.redis.dynamic.annotation.CommandNaming.LetterCase;
+import com.lambdaworks.redis.dynamic.annotation.CommandNaming.Strategy;
+import com.lambdaworks.redis.dynamic.CommandMethod;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * {@link CommandSegmentFactory} implementation that creates {@link CommandSegments} considering {@link Command} and
+ * {@link CommandNaming} annotations.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public class AnnotationCommandSegmentFactory implements CommandSegmentFactory {
+
+    private static final Pattern SPACE = Pattern.compile("\\s");
+    private static final String INDEX_BASED_PARAM_START = "?";
+    private static final String NAME_BASED_PARAM_START = ":";
+
+    @Override
+    public CommandSegments createCommandSegments(CommandMethod commandMethod) {
+
+        if (CommandSegmentParser.INSTANCE.hasCommandString(commandMethod)) {
+            return CommandSegmentParser.INSTANCE.createCommandSegments(commandMethod);
+        }
+
+        LetterCase letterCase = getLetterCase(commandMethod);
+        Strategy strategy = getNamingStrategy(commandMethod);
+
+        List<String> parts = parseMethodName(commandMethod.getName(), strategy);
+        return createCommandSegments(parts, letterCase);
+    }
+
+    private CommandSegments createCommandSegments(List<String> parts, LetterCase letterCase) {
+
+        List<CommandSegment> segments = new ArrayList<>(parts.size());
+
+        for (String part : parts) {
+
+            if (letterCase == LetterCase.AS_IS) {
+                segments.add(CommandSegment.constant(part));
+            } else {
+                segments.add(CommandSegment.constant(part.toUpperCase()));
+            }
+        }
+
+        return new CommandSegments(segments);
+    }
+
+    private List<String> parseMethodName(String name, Strategy strategy) {
+
+        if (strategy == Strategy.METHOD_NAME) {
+            return Collections.singletonList(name);
+        }
+
+        List<String> parts = new ArrayList<>();
+
+        char[] chars = name.toCharArray();
+
+        boolean previousUpperCase = false;
+        StringBuffer buffer = new StringBuffer(chars.length);
+        for (char theChar : chars) {
+
+            if (!Character.isUpperCase(theChar)) {
+                buffer.append(theChar);
+                previousUpperCase = false;
+                continue;
+
+            }
+
+            // Camel hump
+            if (!previousUpperCase) {
+
+                if (!LettuceStrings.isEmpty(buffer)) {
+
+                    if (strategy == Strategy.DOT) {
+                        buffer.append('.');
+                    }
+
+                    if (strategy == Strategy.SPLIT) {
+
+                        parts.add(buffer.toString());
+                        buffer = new StringBuffer(chars.length);
+                    }
+                }
+            }
+
+            previousUpperCase = true;
+            buffer.append(theChar);
+        }
+
+        if (LettuceStrings.isNotEmpty(buffer)) {
+            parts.add(buffer.toString());
+        }
+
+        return parts;
+    }
+
+    private LetterCase getLetterCase(CommandMethod commandMethod) {
+
+        if (commandMethod.hasAnnotation(CommandNaming.class)) {
+            LetterCase letterCase = commandMethod.getMethod().getAnnotation(CommandNaming.class).letterCase();
+            if (letterCase != LetterCase.DEFAULT) {
+                return letterCase;
+            }
+        }
+
+        Class<?> declaringClass = commandMethod.getMethod().getDeclaringClass();
+        CommandNaming annotation = declaringClass.getAnnotation(CommandNaming.class);
+        if (annotation != null && annotation.letterCase() != LetterCase.DEFAULT) {
+            return annotation.letterCase();
+        }
+
+        return LetterCase.UPPERCASE;
+    }
+
+    private Strategy getNamingStrategy(CommandMethod commandMethod) {
+
+        if (commandMethod.hasAnnotation(CommandNaming.class)) {
+            Strategy strategy = commandMethod.getMethod().getAnnotation(CommandNaming.class).strategy();
+            if (strategy != Strategy.DEFAULT) {
+                return strategy;
+            }
+        }
+
+        Class<?> declaringClass = commandMethod.getMethod().getDeclaringClass();
+        CommandNaming annotation = declaringClass.getAnnotation(CommandNaming.class);
+        if (annotation != null && annotation.strategy() != Strategy.DEFAULT) {
+            return annotation.strategy();
+        }
+
+        return Strategy.SPLIT;
+    }
+
+    private enum CommandSegmentParser implements CommandSegmentFactory {
+
+        INSTANCE;
+
+        @Override
+        public CommandSegments createCommandSegments(CommandMethod commandMethod) {
+            return parse(getCommandString(commandMethod));
+        }
+
+        private CommandSegments parse(String command) {
+
+            String[] split = SPACE.split(command);
+
+            LettuceAssert.notEmpty(split, "Command must not be empty");
+
+            return getCommandSegments(split);
+        }
+
+        private CommandSegments getCommandSegments(String[] split) {
+
+            List<CommandSegment> segments = new ArrayList<>();
+
+            for (String segment : split) {
+
+                if (segment.startsWith(INDEX_BASED_PARAM_START)) {
+                    segments.add(parseIndexBasedArgument(segment));
+                    continue;
+                }
+
+                if (segment.startsWith(NAME_BASED_PARAM_START)) {
+                    segments.add(parseNameBasedArgument(segment));
+                    continue;
+                }
+
+                segments.add(CommandSegment.constant(segment));
+            }
+
+            return new CommandSegments(segments);
+        }
+
+        private CommandSegment parseIndexBasedArgument(String segment) {
+
+            String index = segment.substring(INDEX_BASED_PARAM_START.length());
+            return getIndexBasedArgument(index);
+        }
+
+        private CommandSegment parseNameBasedArgument(String segment) {
+            return CommandSegment.namedParameter(segment.substring(NAME_BASED_PARAM_START.length()));
+        }
+
+        private CommandSegment getIndexBasedArgument(String index) {
+            return CommandSegment.indexedParameter(Integer.parseInt(index));
+        }
+
+        private String getCommandString(CommandMethod commandMethod) {
+
+            Command annotation = commandMethod.getAnnotation(Command.class);
+            return annotation.value();
+        }
+
+        private boolean hasCommandString(CommandMethod commandMethod) {
+
+            if (commandMethod.hasAnnotation(Command.class)) {
+                Command annotation = commandMethod.getAnnotation(Command.class);
+                return LettuceStrings.isNotEmpty(annotation.value());
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java b/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java
new file mode 100644
index 0000000000..c2ad12ae70
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java
@@ -0,0 +1,146 @@
+package com.lambdaworks.redis.dynamic.segment;
+
+import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Value object representing a segment within a Redis Command.
+ * <p>
+ * A command segment is an ASCII string denoting a command, a named or an index-parameter reference.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public abstract class CommandSegment {
+
+    /**
+     * Create a constant {@link CommandSegment}.
+     * 
+     * @param content must not be empty or {@literal null}.
+     * @return the {@link CommandSegment}.
+     */
+    public static CommandSegment constant(String content) {
+        return new Constant(content);
+    }
+
+    /**
+     * Create a named parameter reference {@link CommandSegment}.
+     * 
+     * @param name must not be empty or {@literal null}.
+     * @return
+     */
+    public static CommandSegment namedParameter(String name) {
+        return new NamedParameter(name);
+    }
+
+    public static CommandSegment indexedParameter(int index) {
+        return new IndexedParameter(index);
+    }
+
+    /**
+     *
+     * @return the command segment in its {@link String representation}
+     */
+    public abstract String asString();
+
+    /**
+     *
+     * @param parametersAccessor
+     * @return
+     */
+    public abstract ArgumentContribution contribute(MethodParametersAccessor parametersAccessor);
+
+    @Override
+    public String toString() {
+        final StringBuffer sb = new StringBuffer();
+        sb.append(getClass().getSimpleName());
+        sb.append(" ").append(asString());
+        return sb.toString();
+    }
+
+    private static class Constant extends CommandSegment {
+
+        private final String content;
+
+        public Constant(String content) {
+
+            LettuceAssert.notEmpty(content, "Constant must not be empty");
+
+            this.content = content;
+        }
+
+        @Override
+        public String asString() {
+            return content;
+        }
+
+        @Override
+        public ArgumentContribution contribute(MethodParametersAccessor parametersAccessor) {
+            return new ArgumentContribution(-1, asString());
+        }
+    }
+
+    private static class NamedParameter extends CommandSegment {
+
+        private final String name;
+
+        public NamedParameter(String name) {
+
+            LettuceAssert.notEmpty(name, "Parameter name must not be empty");
+
+            this.name = name;
+        }
+
+        @Override
+        public String asString() {
+            return name;
+        }
+
+        @Override
+        public ArgumentContribution contribute(MethodParametersAccessor parametersAccessor) {
+
+            int index = parametersAccessor.resolveParameterIndex(name);
+            return new ArgumentContribution(index, parametersAccessor.getBindableValue(index));
+        }
+    }
+
+    private static class IndexedParameter extends CommandSegment {
+
+        private final int index;
+
+        public IndexedParameter(int index) {
+
+            LettuceAssert.isTrue(index >= 0, "Parameter index must be non-negative starting at 0");
+            this.index = index;
+        }
+
+        @Override
+        public String asString() {
+            return Integer.toString(index);
+        }
+
+        @Override
+        public ArgumentContribution contribute(MethodParametersAccessor parametersAccessor) {
+            return new ArgumentContribution(index, parametersAccessor.getBindableValue(index));
+        }
+    }
+
+    public static class ArgumentContribution {
+
+        private final int parameterIndex;
+        private final Object value;
+
+        ArgumentContribution(int parameterIndex, Object value) {
+            this.parameterIndex = parameterIndex;
+            this.value = value;
+        }
+
+        public int getParameterIndex() {
+            return parameterIndex;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java
new file mode 100644
index 0000000000..732f3809eb
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java
@@ -0,0 +1,20 @@
+package com.lambdaworks.redis.dynamic.segment;
+
+import com.lambdaworks.redis.dynamic.CommandMethod;
+
+/**
+ * Strategy interface to create {@link CommandSegments} for a {@link CommandMethod}.l
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public interface CommandSegmentFactory {
+
+    /**
+     * Create {@link CommandSegments} for a {@link CommandMethod}.
+     * 
+     * @param commandMethod must not be {@literal null}.
+     * @return the {@link CommandSegments}.
+     */
+    CommandSegments createCommandSegments(CommandMethod commandMethod);
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegments.java b/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegments.java
new file mode 100644
index 0000000000..f5bb6798e0
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegments.java
@@ -0,0 +1,80 @@
+package com.lambdaworks.redis.dynamic.segment;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.protocol.ProtocolKeyword;
+
+/**
+ * Value object abstracting multiple {@link CommandSegment}s.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public class CommandSegments implements Iterable<CommandSegment> {
+
+    private final StringCommandType commandType;
+    private final List<CommandSegment> segments;
+
+    /**
+     * Create {@link CommandSegments} given a {@link List} of {@link CommandSegment}s.
+     * 
+     * @param segments must not be {@literal null.}
+     */
+    public CommandSegments(List<CommandSegment> segments) {
+
+        LettuceAssert.isTrue(!segments.isEmpty(), "Command segments must not be empty");
+
+        this.segments = segments.size() > 1 ? Collections.unmodifiableList(segments.subList(1, segments.size()))
+                : Collections.emptyList();
+        this.commandType = new StringCommandType(segments.get(0).asString());
+    }
+
+    @Override
+    public Iterator<CommandSegment> iterator() {
+        return segments.iterator();
+    }
+
+    public ProtocolKeyword getCommandType() {
+        return commandType;
+    }
+
+    public int size() {
+        return segments.size();
+    }
+
+    private static class StringCommandType implements ProtocolKeyword {
+
+        private final byte[] commandTypeBytes;
+        private final String commandType;
+
+        public StringCommandType(String commandType) {
+            this.commandType = commandType;
+            this.commandTypeBytes = commandType.getBytes();
+        }
+
+        @Override
+        public byte[] getBytes() {
+            return commandTypeBytes;
+        }
+
+        @Override
+        public String name() {
+            return commandType;
+        }
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getCommandType().name());
+
+        for (CommandSegment segment : segments) {
+            sb.append(' ').append(segment);
+        }
+
+        return sb.toString();
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/segment/package-info.java
new file mode 100644
index 0000000000..10ae382b47
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/segment/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Support for {@link com.lambdaworks.redis.dynamic.segment.CommandSegments} and segment parsing.
+ */
+package com.lambdaworks.redis.dynamic.segment;
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/AnnotationParameterNameDiscoverer.java b/src/main/java/com/lambdaworks/redis/dynamic/support/AnnotationParameterNameDiscoverer.java
new file mode 100644
index 0000000000..83f02ba428
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/AnnotationParameterNameDiscoverer.java
@@ -0,0 +1,62 @@
+package com.lambdaworks.redis.dynamic.support;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.lambdaworks.redis.dynamic.annotation.Param;
+
+/**
+ * {@link ParameterNameDiscoverer} based on {@link Param} annotations to resolve parameter names.
+ * 
+ * @author Mark Paluch
+ */
+public class AnnotationParameterNameDiscoverer implements ParameterNameDiscoverer {
+
+    @Override
+    public String[] getParameterNames(Method method) {
+
+        if (method.getParameterCount() == 0) {
+            return new String[0];
+        }
+
+        return doGetParameterNames(method.getParameterAnnotations());
+    }
+
+    @Override
+    public String[] getParameterNames(Constructor<?> ctor) {
+
+        if (ctor.getParameterCount() == 0) {
+            return new String[0];
+        }
+
+        return doGetParameterNames(ctor.getParameterAnnotations());
+    }
+
+    protected String[] doGetParameterNames(Annotation[][] parameterAnnotations) {
+
+        List<String> names = new ArrayList<>();
+
+        for (int i = 0; i < parameterAnnotations.length; i++) {
+
+            boolean foundParam = false;
+            for (int j = 0; j < parameterAnnotations[i].length; j++) {
+
+                if (parameterAnnotations[i][j].annotationType().equals(Param.class)) {
+                    foundParam = true;
+                    Param param = (Param) parameterAnnotations[i][j];
+                    names.add(param.value());
+                    break;
+                }
+            }
+
+            if (!foundParam) {
+                return null;
+            }
+        }
+
+        return names.toArray(new String[names.size()]);
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java
new file mode 100644
index 0000000000..55a060fcbe
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java
@@ -0,0 +1,165 @@
+package com.lambdaworks.redis.dynamic.support;
+
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.*;
+import java.util.Map.Entry;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.internal.LettuceClassUtils;
+
+/**
+ * {@link TypeInformation} for a plain {@link Class}.
+ */
+@SuppressWarnings({ "unchecked", "rawtypes" })
+public class ClassTypeInformation<S> extends TypeDiscoverer<S> {
+
+    public static final ClassTypeInformation<Collection> COLLECTION = new ClassTypeInformation(Collection.class);
+    public static final ClassTypeInformation<List> LIST = new ClassTypeInformation(List.class);
+    public static final ClassTypeInformation<Set> SET = new ClassTypeInformation(Set.class);
+    public static final ClassTypeInformation<Map> MAP = new ClassTypeInformation(Map.class);
+    public static final ClassTypeInformation<Object> OBJECT = new ClassTypeInformation(Object.class);
+
+    private static final Map<Class<?>, Reference<ClassTypeInformation<?>>> CACHE = Collections
+            .synchronizedMap(new WeakHashMap<Class<?>, Reference<ClassTypeInformation<?>>>());
+
+    static {
+        for (ClassTypeInformation<?> info : Arrays.asList(COLLECTION, LIST, SET, MAP, OBJECT)) {
+            CACHE.put(info.getType(), new WeakReference<ClassTypeInformation<?>>(info));
+        }
+    }
+
+    private final Class<S> type;
+
+    /**
+     * Simple factory method to easily create new instances of {@link ClassTypeInformation}.
+     * 
+     * @param <S>
+     * @param type must not be {@literal null}.
+     * @return
+     */
+    public static <S> ClassTypeInformation<S> from(Class<S> type) {
+
+        LettuceAssert.notNull(type, "Type must not be null!");
+
+        Reference<ClassTypeInformation<?>> cachedReference = CACHE.get(type);
+        TypeInformation<?> cachedTypeInfo = cachedReference == null ? null : cachedReference.get();
+
+        if (cachedTypeInfo != null) {
+            return (ClassTypeInformation<S>) cachedTypeInfo;
+        }
+
+        ClassTypeInformation<S> result = new ClassTypeInformation<S>(type);
+        CACHE.put(type, new WeakReference<ClassTypeInformation<?>>(result));
+        return result;
+    }
+
+    /**
+     * Creates a {@link TypeInformation} from the given method's return type.
+     * 
+     * @param method must not be {@literal null}.
+     * @return
+     */
+    public static <S> TypeInformation<S> fromReturnTypeOf(Method method) {
+
+        LettuceAssert.notNull(method, "Method must not be null!");
+        return new ClassTypeInformation(method.getDeclaringClass()).createInfo(method.getGenericReturnType());
+    }
+
+    /**
+     * Creates a {@link TypeInformation} from the given method's parameter type.
+     *
+     * @param method must not be {@literal null}.
+     * @return
+     */
+    public static <S> TypeInformation<S> fromMethodParameter(Method method, int index) {
+
+        LettuceAssert.notNull(method, "Method must not be null!");
+        return new ClassTypeInformation(method.getDeclaringClass()).createInfo(method.getGenericParameterTypes()[index]);
+    }
+
+    /**
+     * Creates {@link ClassTypeInformation} for the given type.
+     * 
+     * @param type
+     */
+    ClassTypeInformation(Class<S> type) {
+        super(getUserClass(type), getTypeVariableMap(type));
+        this.type = type;
+    }
+
+    /**
+     * Return the user-defined class for the given class: usually simply the given class, but the original class in case of a
+     * CGLIB-generated subclass.
+     * 
+     * @param clazz the class to check
+     * @return the user-defined class
+     */
+    private static Class<?> getUserClass(Class<?> clazz) {
+        if (clazz != null && clazz.getName().contains(LettuceClassUtils.CGLIB_CLASS_SEPARATOR)) {
+            Class<?> superclass = clazz.getSuperclass();
+            if (superclass != null && Object.class != superclass) {
+                return superclass;
+            }
+        }
+        return clazz;
+    }
+
+    /**
+     * Little helper to allow us to create a generified map, actually just to satisfy the compiler.
+     * 
+     * @param type must not be {@literal null}.
+     * @return
+     */
+    private static Map<TypeVariable<?>, Type> getTypeVariableMap(Class<?> type) {
+        return getTypeVariableMap(type, new HashSet<Type>());
+    }
+
+    @SuppressWarnings("deprecation")
+    private static Map<TypeVariable<?>, Type> getTypeVariableMap(Class<?> type, Collection<Type> visited) {
+
+        if (visited.contains(type)) {
+            return Collections.emptyMap();
+        } else {
+            visited.add(type);
+        }
+
+        Map<TypeVariable, Type> source = GenericTypeResolver.getTypeVariableMap(type);
+        Map<TypeVariable<?>, Type> map = new HashMap<>(source.size());
+
+        for (Entry<TypeVariable, Type> entry : source.entrySet()) {
+
+            Type value = entry.getValue();
+            map.put(entry.getKey(), entry.getValue());
+
+            if (value instanceof Class) {
+                map.putAll(getTypeVariableMap((Class<?>) value, visited));
+            }
+        }
+
+        return map;
+    }
+
+    @Override
+    public Class<S> getType() {
+        return type;
+    }
+
+    @Override
+    public ClassTypeInformation<?> getRawTypeInformation() {
+        return this;
+    }
+
+    @Override
+    public boolean isAssignableFrom(TypeInformation<?> target) {
+        return getType().isAssignableFrom(target.getType());
+    }
+
+    @Override
+    public String toString() {
+        return type.getName();
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/CompositeParameterNameDiscoverer.java b/src/main/java/com/lambdaworks/redis/dynamic/support/CompositeParameterNameDiscoverer.java
new file mode 100644
index 0000000000..4cf525d656
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/CompositeParameterNameDiscoverer.java
@@ -0,0 +1,50 @@
+package com.lambdaworks.redis.dynamic.support;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collection;
+
+/**
+ * Composite {@link ParameterNameDiscoverer} to resolve parameter names using multiple {@link ParameterNameDiscoverer}s.
+ * 
+ * @author Mark Paluch
+ */
+public class CompositeParameterNameDiscoverer implements ParameterNameDiscoverer {
+
+    private Collection<ParameterNameDiscoverer> parameterNameDiscoverers;
+
+    public CompositeParameterNameDiscoverer(ParameterNameDiscoverer... parameterNameDiscoverers) {
+        this(Arrays.asList(parameterNameDiscoverers));
+    }
+
+    public CompositeParameterNameDiscoverer(Collection<ParameterNameDiscoverer> parameterNameDiscoverers) {
+        this.parameterNameDiscoverers = parameterNameDiscoverers;
+    }
+
+    @Override
+    public String[] getParameterNames(Method method) {
+
+        for (ParameterNameDiscoverer parameterNameDiscoverer : parameterNameDiscoverers) {
+            String[] parameterNames = parameterNameDiscoverer.getParameterNames(method);
+            if (parameterNames != null) {
+                return parameterNames;
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    public String[] getParameterNames(Constructor<?> ctor) {
+
+        for (ParameterNameDiscoverer parameterNameDiscoverer : parameterNameDiscoverers) {
+            String[] parameterNames = parameterNameDiscoverer.getParameterNames(ctor);
+            if (parameterNames != null) {
+                return parameterNames;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java
new file mode 100644
index 0000000000..09f6550496
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java
@@ -0,0 +1,48 @@
+package com.lambdaworks.redis.dynamic.support;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.Map;
+
+/**
+ * Special {@link TypeDiscoverer} handling {@link GenericArrayType}s.
+ */
+class GenericArrayTypeInformation<S> extends ParentTypeAwareTypeInformation<S> {
+
+    private final GenericArrayType type;
+
+    /**
+     * Creates a new {@link GenericArrayTypeInformation} for the given {@link GenericArrayTypeInformation} and
+     * {@link TypeDiscoverer}.
+     * 
+     * @param type must not be {@literal null}.
+     * @param parent must not be {@literal null}.
+     * @param typeVariableMap must not be {@literal null}.
+     */
+    protected GenericArrayTypeInformation(GenericArrayType type, TypeDiscoverer<?> parent,
+            Map<TypeVariable<?>, Type> typeVariableMap) {
+
+        super(type, parent, typeVariableMap);
+        this.type = type;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Class<S> getType() {
+        return (Class<S>) Array.newInstance(resolveType(type.getGenericComponentType()), 0).getClass();
+    }
+
+    @Override
+    protected TypeInformation<?> doGetComponentType() {
+
+        Type componentType = type.getGenericComponentType();
+        return createInfo(componentType);
+    }
+
+    @Override
+    public String toString() {
+        return type.toString();
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/GenericTypeResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/support/GenericTypeResolver.java
new file mode 100644
index 0000000000..72f755316d
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/GenericTypeResolver.java
@@ -0,0 +1,70 @@
+package com.lambdaworks.redis.dynamic.support;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Helper class for resolving generic types against type variables.
+ *
+ * <p>
+ * Mainly intended for usage within the framework, resolving method parameter types even when they are declared generically.
+ */
+public abstract class GenericTypeResolver {
+
+    /**
+     * Build a mapping of {@link TypeVariable#getName TypeVariable names} to {@link Class concrete classes} for the specified
+     * {@link Class}. Searches all super types, enclosing types and interfaces.
+     */
+    @SuppressWarnings("rawtypes")
+    public static Map<TypeVariable, Type> getTypeVariableMap(Class<?> clazz) {
+        Map<TypeVariable, Type> typeVariableMap = new HashMap<TypeVariable, Type>();
+        buildTypeVariableMap(ResolvableType.forClass(clazz), typeVariableMap);
+
+        return typeVariableMap;
+    }
+
+    /**
+     * Resolve the type arguments of the given generic interface against the given target class which is assumed to implement
+     * the generic interface and possibly declare concrete types for its type variables.
+     * 
+     * @param clazz the target class to check against
+     * @param genericIfc the generic interface or superclass to resolve the type argument from
+     * @return the resolved type of each argument, with the array size matching the number of actual type arguments, or
+     *         {@code null} if not resolvable
+     */
+    public static Class<?>[] resolveTypeArguments(Class<?> clazz, Class<?> genericIfc) {
+        ResolvableType type = ResolvableType.forClass(clazz).as(genericIfc);
+        if (!type.hasGenerics() || type.isEntirelyUnresolvable()) {
+            return null;
+        }
+        return type.resolveGenerics(Object.class);
+    }
+
+    @SuppressWarnings("rawtypes")
+    private static void buildTypeVariableMap(ResolvableType type, Map<TypeVariable, Type> typeVariableMap) {
+        if (type != ResolvableType.NONE) {
+            if (type.getType() instanceof ParameterizedType) {
+                TypeVariable<?>[] variables = type.resolve().getTypeParameters();
+                for (int i = 0; i < variables.length; i++) {
+                    ResolvableType generic = type.getGeneric(i);
+                    while (generic.getType() instanceof TypeVariable<?>) {
+                        generic = generic.resolveType();
+                    }
+                    if (generic != ResolvableType.NONE) {
+                        typeVariableMap.put(variables[i], generic.getType());
+                    }
+                }
+            }
+            buildTypeVariableMap(type.getSuperType(), typeVariableMap);
+            for (ResolvableType interfaceType : type.getInterfaces()) {
+                buildTypeVariableMap(interfaceType, typeVariableMap);
+            }
+            if (type.resolve().isMemberClass()) {
+                buildTypeVariableMap(ResolvableType.forClass(type.resolve().getEnclosingClass()), typeVariableMap);
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/MethodParameter.java b/src/main/java/com/lambdaworks/redis/dynamic/support/MethodParameter.java
new file mode 100644
index 0000000000..a930641538
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/MethodParameter.java
@@ -0,0 +1,511 @@
+package com.lambdaworks.redis.dynamic.support;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Helper class that encapsulates the specification of a method parameter, i.e. a {@link Method} or {@link Constructor} plus a
+ * parameter index and a nested type index for a declared generic type. Useful as a specification object to pass along.
+ */
+public class MethodParameter {
+
+    private final Method method;
+
+    private final Constructor<?> constructor;
+
+    private final int parameterIndex;
+
+    private int nestingLevel = 1;
+
+    /** Map from Integer level to Integer type index */
+    Map<Integer, Integer> typeIndexesPerLevel;
+
+    private volatile Class<?> containingClass;
+
+    private volatile Class<?> parameterType;
+
+    private volatile Type genericParameterType;
+
+    private volatile Annotation[] parameterAnnotations;
+
+    private volatile ParameterNameDiscoverer parameterNameDiscoverer;
+
+    private volatile String parameterName;
+
+    /**
+     * Create a new {@code MethodParameter} for the given method, with nesting level 1.
+     * 
+     * @param method the Method to specify a parameter for
+     * @param parameterIndex the index of the parameter: -1 for the method return type; 0 for the first method parameter; 1 for
+     *        the second method parameter, etc.
+     */
+    public MethodParameter(Method method, int parameterIndex) {
+        this(method, parameterIndex, 1);
+    }
+
+    /**
+     * Create a new {@code MethodParameter} for the given method.
+     * 
+     * @param method the Method to specify a parameter for
+     * @param parameterIndex the index of the parameter: -1 for the method return type; 0 for the first method parameter; 1 for
+     *        the second method parameter, etc.
+     * @param nestingLevel the nesting level of the target type (typically 1; e.g. in case of a List of Lists, 1 would indicate
+     *        the nested List, whereas 2 would indicate the element of the nested List)
+     */
+    public MethodParameter(Method method, int parameterIndex, int nestingLevel) {
+
+        LettuceAssert.notNull(method, "Method must not be null");
+
+        this.method = method;
+        this.parameterIndex = parameterIndex;
+        this.nestingLevel = nestingLevel;
+        this.constructor = null;
+    }
+
+    /**
+     * Create a new MethodParameter for the given constructor, with nesting level 1.
+     * 
+     * @param constructor the Constructor to specify a parameter for
+     * @param parameterIndex the index of the parameter
+     */
+    public MethodParameter(Constructor<?> constructor, int parameterIndex) {
+        this(constructor, parameterIndex, 1);
+    }
+
+    /**
+     * Create a new MethodParameter for the given constructor.
+     * 
+     * @param constructor the Constructor to specify a parameter for
+     * @param parameterIndex the index of the parameter
+     * @param nestingLevel the nesting level of the target type (typically 1; e.g. in case of a List of Lists, 1 would indicate
+     *        the nested List, whereas 2 would indicate the element of the nested List)
+     */
+    public MethodParameter(Constructor<?> constructor, int parameterIndex, int nestingLevel) {
+        LettuceAssert.notNull(constructor, "Constructor must not be null");
+        this.constructor = constructor;
+        this.parameterIndex = parameterIndex;
+        this.nestingLevel = nestingLevel;
+        this.method = null;
+    }
+
+    /**
+     * Copy constructor, resulting in an independent MethodParameter object based on the same metadata and cache state that the
+     * original object was in.
+     * 
+     * @param original the original MethodParameter object to copy from
+     */
+    public MethodParameter(MethodParameter original) {
+        LettuceAssert.notNull(original, "Original must not be null");
+        this.method = original.method;
+        this.constructor = original.constructor;
+        this.parameterIndex = original.parameterIndex;
+        this.nestingLevel = original.nestingLevel;
+        this.typeIndexesPerLevel = original.typeIndexesPerLevel;
+        this.containingClass = original.containingClass;
+        this.parameterType = original.parameterType;
+        this.genericParameterType = original.genericParameterType;
+        this.parameterAnnotations = original.parameterAnnotations;
+        this.parameterNameDiscoverer = original.parameterNameDiscoverer;
+        this.parameterName = original.parameterName;
+    }
+
+    /**
+     * Return the wrapped Method, if any.
+     * <p>
+     * Note: Either Method or Constructor is available.
+     * 
+     * @return the Method, or {@code null} if none
+     */
+    public Method getMethod() {
+        return this.method;
+    }
+
+    /**
+     * Return the wrapped Constructor, if any.
+     * <p>
+     * Note: Either Method or Constructor is available.
+     * 
+     * @return the Constructor, or {@code null} if none
+     */
+    public Constructor<?> getConstructor() {
+        return this.constructor;
+    }
+
+    /**
+     * Returns the wrapped member.
+     * 
+     * @return the Method or Constructor as Member
+     */
+    public Member getMember() {
+        // NOTE: no ternary expression to retain JDK <8 compatibility even when using
+        // the JDK 8 compiler (potentially selecting java.lang.reflect.Executable
+        // as common type, with that new base class not available on older JDKs)
+        if (this.method != null) {
+            return this.method;
+        } else {
+            return this.constructor;
+        }
+    }
+
+    /**
+     * Returns the wrapped annotated element.
+     * 
+     * @return the Method or Constructor as AnnotatedElement
+     */
+    public AnnotatedElement getAnnotatedElement() {
+        // NOTE: no ternary expression to retain JDK <8 compatibility even when using
+        // the JDK 8 compiler (potentially selecting java.lang.reflect.Executable
+        // as common type, with that new base class not available on older JDKs)
+        if (this.method != null) {
+            return this.method;
+        } else {
+            return this.constructor;
+        }
+    }
+
+    /**
+     * Return the class that declares the underlying Method or Constructor.
+     */
+    public Class<?> getDeclaringClass() {
+        return getMember().getDeclaringClass();
+    }
+
+    /**
+     * Return the index of the method/constructor parameter.
+     * 
+     * @return the parameter index (-1 in case of the return type)
+     */
+    public int getParameterIndex() {
+        return this.parameterIndex;
+    }
+
+    /**
+     * Increase this parameter's nesting level.
+     * 
+     * @see #getNestingLevel()
+     */
+    public void increaseNestingLevel() {
+        this.nestingLevel++;
+    }
+
+    /**
+     * Decrease this parameter's nesting level.
+     * 
+     * @see #getNestingLevel()
+     */
+    public void decreaseNestingLevel() {
+        getTypeIndexesPerLevel().remove(this.nestingLevel);
+        this.nestingLevel--;
+    }
+
+    /**
+     * Return the nesting level of the target type (typically 1; e.g. in case of a List of Lists, 1 would indicate the nested
+     * List, whereas 2 would indicate the element of the nested List).
+     */
+    public int getNestingLevel() {
+        return this.nestingLevel;
+    }
+
+    /**
+     * Set the type index for the current nesting level.
+     * 
+     * @param typeIndex the corresponding type index (or {@code null} for the default type index)
+     * @see #getNestingLevel()
+     */
+    public void setTypeIndexForCurrentLevel(int typeIndex) {
+        getTypeIndexesPerLevel().put(this.nestingLevel, typeIndex);
+    }
+
+    /**
+     * Return the type index for the current nesting level.
+     * 
+     * @return the corresponding type index, or {@code null} if none specified (indicating the default type index)
+     * @see #getNestingLevel()
+     */
+    public Integer getTypeIndexForCurrentLevel() {
+        return getTypeIndexForLevel(this.nestingLevel);
+    }
+
+    /**
+     * Return the type index for the specified nesting level.
+     * 
+     * @param nestingLevel the nesting level to check
+     * @return the corresponding type index, or {@code null} if none specified (indicating the default type index)
+     */
+    public Integer getTypeIndexForLevel(int nestingLevel) {
+        return getTypeIndexesPerLevel().get(nestingLevel);
+    }
+
+    /**
+     * Obtain the (lazily constructed) type-indexes-per-level Map.
+     */
+    private Map<Integer, Integer> getTypeIndexesPerLevel() {
+        if (this.typeIndexesPerLevel == null) {
+            this.typeIndexesPerLevel = new HashMap<Integer, Integer>(4);
+        }
+        return this.typeIndexesPerLevel;
+    }
+
+    /**
+     * Set a containing class to resolve the parameter type against.
+     */
+    void setContainingClass(Class<?> containingClass) {
+        this.containingClass = containingClass;
+    }
+
+    public Class<?> getContainingClass() {
+        return (this.containingClass != null ? this.containingClass : getDeclaringClass());
+    }
+
+    /**
+     * Set a resolved (generic) parameter type.
+     */
+    void setParameterType(Class<?> parameterType) {
+        this.parameterType = parameterType;
+    }
+
+    /**
+     * Return the type of the method/constructor parameter.
+     * 
+     * @return the parameter type (never {@code null})
+     */
+    public Class<?> getParameterType() {
+        if (this.parameterType == null) {
+            if (this.parameterIndex < 0) {
+                this.parameterType = (this.method != null ? this.method.getReturnType() : null);
+            } else {
+                this.parameterType = (this.method != null ? this.method.getParameterTypes()[this.parameterIndex]
+                        : this.constructor.getParameterTypes()[this.parameterIndex]);
+            }
+        }
+        return this.parameterType;
+    }
+
+    /**
+     * Return the generic type of the method/constructor parameter.
+     * 
+     * @return the parameter type (never {@code null})
+     */
+    public Type getGenericParameterType() {
+        if (this.genericParameterType == null) {
+            if (this.parameterIndex < 0) {
+                this.genericParameterType = (this.method != null ? this.method.getGenericReturnType() : null);
+            } else {
+                this.genericParameterType = (this.method != null ? this.method.getGenericParameterTypes()[this.parameterIndex]
+                        : this.constructor.getGenericParameterTypes()[this.parameterIndex]);
+            }
+        }
+        return this.genericParameterType;
+    }
+
+    /**
+     * Return the nested type of the method/constructor parameter.
+     * 
+     * @return the parameter type (never {@code null})
+     * @see #getNestingLevel()
+     */
+    public Class<?> getNestedParameterType() {
+        if (this.nestingLevel > 1) {
+            Type type = getGenericParameterType();
+            for (int i = 2; i <= this.nestingLevel; i++) {
+                if (type instanceof ParameterizedType) {
+                    Type[] args = ((ParameterizedType) type).getActualTypeArguments();
+                    Integer index = getTypeIndexForLevel(i);
+                    type = args[index != null ? index : args.length - 1];
+                }
+            }
+            if (type instanceof Class) {
+                return (Class<?>) type;
+            } else if (type instanceof ParameterizedType) {
+                Type arg = ((ParameterizedType) type).getRawType();
+                if (arg instanceof Class) {
+                    return (Class<?>) arg;
+                }
+            }
+            return Object.class;
+        } else {
+            return getParameterType();
+        }
+    }
+
+    /**
+     * Return the nested generic type of the method/constructor parameter.
+     * 
+     * @return the parameter type (never {@code null})
+     * @see #getNestingLevel()
+     */
+    public Type getNestedGenericParameterType() {
+        if (this.nestingLevel > 1) {
+            Type type = getGenericParameterType();
+            for (int i = 2; i <= this.nestingLevel; i++) {
+                if (type instanceof ParameterizedType) {
+                    Type[] args = ((ParameterizedType) type).getActualTypeArguments();
+                    Integer index = getTypeIndexForLevel(i);
+                    type = args[index != null ? index : args.length - 1];
+                }
+            }
+            return type;
+        } else {
+            return getGenericParameterType();
+        }
+    }
+
+    /**
+     * Return the annotations associated with the target method/constructor itself.
+     */
+    public Annotation[] getMethodAnnotations() {
+        return adaptAnnotationArray(getAnnotatedElement().getAnnotations());
+    }
+
+    /**
+     * Return the method/constructor annotation of the given type, if available.
+     * 
+     * @param annotationType the annotation type to look for
+     * @return the annotation object, or {@code null} if not found
+     */
+    public <A extends Annotation> A getMethodAnnotation(Class<A> annotationType) {
+        return adaptAnnotation(getAnnotatedElement().getAnnotation(annotationType));
+    }
+
+    /**
+     * Return the annotations associated with the specific method/constructor parameter.
+     */
+    public Annotation[] getParameterAnnotations() {
+        if (this.parameterAnnotations == null) {
+            Annotation[][] annotationArray = (this.method != null ? this.method.getParameterAnnotations()
+                    : this.constructor.getParameterAnnotations());
+            if (this.parameterIndex >= 0 && this.parameterIndex < annotationArray.length) {
+                this.parameterAnnotations = adaptAnnotationArray(annotationArray[this.parameterIndex]);
+            } else {
+                this.parameterAnnotations = new Annotation[0];
+            }
+        }
+        return this.parameterAnnotations;
+    }
+
+    /**
+     * Return the parameter annotation of the given type, if available.
+     * 
+     * @param annotationType the annotation type to look for
+     * @return the annotation object, or {@code null} if not found
+     */
+    @SuppressWarnings("unchecked")
+    public <T extends Annotation> T getParameterAnnotation(Class<T> annotationType) {
+        Annotation[] anns = getParameterAnnotations();
+        for (Annotation ann : anns) {
+            if (annotationType.isInstance(ann)) {
+                return (T) ann;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Return true if the parameter has at least one annotation, false if it has none.
+     */
+    public boolean hasParameterAnnotations() {
+        return (getParameterAnnotations().length != 0);
+    }
+
+    /**
+     * Return true if the parameter has the given annotation type, and false if it doesn't.
+     */
+    public <T extends Annotation> boolean hasParameterAnnotation(Class<T> annotationType) {
+        return (getParameterAnnotation(annotationType) != null);
+    }
+
+    /**
+     * Initialize parameter name discovery for this method parameter.
+     * <p>
+     * This method does not actually try to retrieve the parameter name at this point; it just allows discovery to happen when
+     * the application calls {@link #getParameterName()} (if ever).
+     */
+    public void initParameterNameDiscovery(ParameterNameDiscoverer parameterNameDiscoverer) {
+        this.parameterNameDiscoverer = parameterNameDiscoverer;
+    }
+
+    /**
+     * Return the name of the method/constructor parameter.
+     * 
+     * @return the parameter name (may be {@code null} if no parameter name metadata is contained in the class file or no
+     *         {@link #initParameterNameDiscovery ParameterNameDiscoverer} has been set to begin with)
+     */
+    public String getParameterName() {
+        ParameterNameDiscoverer discoverer = this.parameterNameDiscoverer;
+        if (discoverer != null) {
+            String[] parameterNames = (this.method != null ? discoverer.getParameterNames(this.method)
+                    : discoverer.getParameterNames(this.constructor));
+            if (parameterNames != null) {
+                this.parameterName = parameterNames[this.parameterIndex];
+            }
+            this.parameterNameDiscoverer = null;
+        }
+        return this.parameterName;
+    }
+
+    /**
+     * A template method to post-process a given annotation instance before returning it to the caller.
+     * <p>
+     * The default implementation simply returns the given annotation as-is.
+     * 
+     * @param annotation the annotation about to be returned
+     * @return the post-processed annotation (or simply the original one)
+     */
+    protected <A extends Annotation> A adaptAnnotation(A annotation) {
+        return annotation;
+    }
+
+    /**
+     * A template method to post-process a given annotation array before returning it to the caller.
+     * <p>
+     * The default implementation simply returns the given annotation array as-is.
+     * 
+     * @param annotations the annotation array about to be returned
+     * @return the post-processed annotation array (or simply the original one)
+     */
+    protected Annotation[] adaptAnnotationArray(Annotation[] annotations) {
+        return annotations;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (!(other instanceof MethodParameter)) {
+            return false;
+        }
+        MethodParameter otherParam = (MethodParameter) other;
+        return (this.parameterIndex == otherParam.parameterIndex && getMember().equals(otherParam.getMember()));
+    }
+
+    @Override
+    public int hashCode() {
+        return (getMember().hashCode() * 31 + this.parameterIndex);
+    }
+
+    /**
+     * Create a new MethodParameter for the given method or constructor.
+     * <p>
+     * This is a convenience constructor for scenarios where a Method or Constructor reference is treated in a generic fashion.
+     * 
+     * @param methodOrConstructor the Method or Constructor to specify a parameter for
+     * @param parameterIndex the index of the parameter
+     * @return the corresponding MethodParameter instance
+     */
+    public static MethodParameter forMethodOrConstructor(Object methodOrConstructor, int parameterIndex) {
+        if (methodOrConstructor instanceof Method) {
+            return new MethodParameter((Method) methodOrConstructor, parameterIndex);
+        } else if (methodOrConstructor instanceof Constructor) {
+            return new MethodParameter((Constructor<?>) methodOrConstructor, parameterIndex);
+        } else {
+            throw new IllegalArgumentException(
+                    "Given object [" + methodOrConstructor + "] is neither a Method nor a Constructor");
+        }
+    }
+
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ParameterNameDiscoverer.java b/src/main/java/com/lambdaworks/redis/dynamic/support/ParameterNameDiscoverer.java
new file mode 100644
index 0000000000..e08bd72840
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/ParameterNameDiscoverer.java
@@ -0,0 +1,31 @@
+package com.lambdaworks.redis.dynamic.support;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+/**
+ * Interface to discover parameter names for methods and constructors.
+ *
+ * <p>
+ * Parameter name discovery is not always possible, but various strategies are available to try, such as looking for debug
+ * information that may have been emitted at compile time, and looking for argname annotation values.
+ */
+public interface ParameterNameDiscoverer {
+
+    /**
+     * Return parameter names for this method, or {@code null} if they cannot be determined.
+     * 
+     * @param method method to find parameter names for
+     * @return an array of parameter names if the names can be resolved, or {@code null} if they cannot
+     */
+    String[] getParameterNames(Method method);
+
+    /**
+     * Return parameter names for this constructor, or {@code null} if they cannot be determined.
+     * 
+     * @param ctor constructor to find parameter names for
+     * @return an array of parameter names if the names can be resolved, or {@code null} if they cannot
+     */
+    String[] getParameterNames(Constructor<?> ctor);
+
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java
new file mode 100644
index 0000000000..aa410bd455
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java
@@ -0,0 +1,182 @@
+package com.lambdaworks.redis.dynamic.support;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.*;
+
+import com.lambdaworks.redis.LettuceStrings;
+
+/**
+ * Base class for all types that include parametrization of some kind. Crucial as we have to take note of the parent class we
+ * will have to resolve generic parameters against.
+ */
+class ParametrizedTypeInformation<T> extends ParentTypeAwareTypeInformation<T> {
+
+    private final ParameterizedType type;
+    private Boolean resolved;
+
+    /**
+     * Creates a new {@link ParametrizedTypeInformation} for the given {@link Type} and parent {@link TypeDiscoverer}.
+     * 
+     * @param type must not be {@literal null}
+     * @param parent must not be {@literal null}
+     */
+    public ParametrizedTypeInformation(ParameterizedType type, TypeDiscoverer<?> parent,
+            Map<TypeVariable<?>, Type> typeVariableMap) {
+
+        super(type, parent, typeVariableMap);
+        this.type = type;
+    }
+
+    @Override
+    protected TypeInformation<?> doGetMapValueType() {
+
+        if (Map.class.isAssignableFrom(getType())) {
+
+            Type[] arguments = type.getActualTypeArguments();
+
+            if (arguments.length > 1) {
+                return createInfo(arguments[1]);
+            }
+        }
+
+        Class<?> rawType = getType();
+
+        Set<Type> supertypes = new HashSet<Type>();
+        supertypes.add(rawType.getGenericSuperclass());
+        supertypes.addAll(Arrays.asList(rawType.getGenericInterfaces()));
+
+        for (Type supertype : supertypes) {
+
+            Class<?> rawSuperType = resolveType(supertype);
+
+            if (Map.class.isAssignableFrom(rawSuperType)) {
+
+                ParameterizedType parameterizedSupertype = (ParameterizedType) supertype;
+                Type[] arguments = parameterizedSupertype.getActualTypeArguments();
+                return createInfo(arguments[1]);
+            }
+        }
+
+        return super.getMapValueType();
+    }
+
+    @Override
+    public List<TypeInformation<?>> getTypeArguments() {
+
+        List<TypeInformation<?>> result = new ArrayList<TypeInformation<?>>();
+
+        for (Type argument : type.getActualTypeArguments()) {
+            result.add(createInfo(argument));
+        }
+
+        return result;
+    }
+
+    @Override
+    public boolean isAssignableFrom(TypeInformation<?> target) {
+
+        if (this.equals(target)) {
+            return true;
+        }
+
+        Class<T> rawType = getType();
+        Class<?> rawTargetType = target.getType();
+
+        if (!rawType.isAssignableFrom(rawTargetType)) {
+            return false;
+        }
+
+        TypeInformation<?> otherTypeInformation = rawType.equals(rawTargetType) ? target
+                : target.getSuperTypeInformation(rawType);
+
+        List<TypeInformation<?>> myParameters = getTypeArguments();
+        List<TypeInformation<?>> typeParameters = otherTypeInformation.getTypeArguments();
+
+        if (myParameters.size() != typeParameters.size()) {
+            return false;
+        }
+
+        for (int i = 0; i < myParameters.size(); i++) {
+            if (!myParameters.get(i).isAssignableFrom(typeParameters.get(i))) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    protected TypeInformation<?> doGetComponentType() {
+        return createInfo(type.getActualTypeArguments()[0]);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+
+        if (obj == this) {
+            return true;
+        }
+
+        if (!(obj instanceof ParametrizedTypeInformation)) {
+            return false;
+        }
+
+        ParametrizedTypeInformation<?> that = (ParametrizedTypeInformation<?>) obj;
+
+        if (this.isResolvedCompletely() && that.isResolvedCompletely()) {
+            return this.type.equals(that.type);
+        }
+
+        return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return isResolvedCompletely() ? this.type.hashCode() : super.hashCode();
+    }
+
+    @Override
+    public String toString() {
+
+        return String.format("%s<%s>", getType().getName(),
+                LettuceStrings.collectionToDelimitedString(getTypeArguments(), ",", "", ""));
+    }
+
+    private boolean isResolvedCompletely() {
+
+        if (resolved != null) {
+            return resolved;
+        }
+
+        Type[] typeArguments = type.getActualTypeArguments();
+
+        if (typeArguments.length == 0) {
+            return cacheAndReturn(false);
+        }
+
+        for (Type typeArgument : typeArguments) {
+
+            TypeInformation<?> info = createInfo(typeArgument);
+
+            if (info instanceof ParametrizedTypeInformation) {
+                if (!((ParametrizedTypeInformation<?>) info).isResolvedCompletely()) {
+                    return cacheAndReturn(false);
+                }
+            }
+
+            if (!(info instanceof ClassTypeInformation)) {
+                return cacheAndReturn(false);
+            }
+        }
+
+        return cacheAndReturn(true);
+    }
+
+    private boolean cacheAndReturn(boolean resolved) {
+
+        this.resolved = resolved;
+        return resolved;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ParentTypeAwareTypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/ParentTypeAwareTypeInformation.java
new file mode 100644
index 0000000000..cc275b940c
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/ParentTypeAwareTypeInformation.java
@@ -0,0 +1,79 @@
+package com.lambdaworks.redis.dynamic.support;
+
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Base class for {@link TypeInformation} implementations that need parent type awareness.
+ */
+abstract class ParentTypeAwareTypeInformation<S> extends TypeDiscoverer<S> {
+
+    private final TypeDiscoverer<?> parent;
+    private int hashCode;
+
+    /**
+     * Creates a new {@link ParentTypeAwareTypeInformation}.
+     * 
+     * @param type must not be {@literal null}.
+     * @param parent must not be {@literal null}.
+     * @param map must not be {@literal null}.
+     */
+    protected ParentTypeAwareTypeInformation(Type type, TypeDiscoverer<?> parent, Map<TypeVariable<?>, Type> map) {
+
+        super(type, mergeMaps(parent, map));
+        this.parent = parent;
+    }
+
+    /**
+     * Merges the type variable maps of the given parent with the new map.
+     * 
+     * @param parent must not be {@literal null}.
+     * @param map must not be {@literal null}.
+     * @return
+     */
+    private static Map<TypeVariable<?>, Type> mergeMaps(TypeDiscoverer<?> parent, Map<TypeVariable<?>, Type> map) {
+
+        Map<TypeVariable<?>, Type> typeVariableMap = new HashMap<TypeVariable<?>, Type>();
+        typeVariableMap.putAll(map);
+        typeVariableMap.putAll(parent.getTypeVariableMap());
+
+        return typeVariableMap;
+    }
+
+    @Override
+    protected TypeInformation<?> createInfo(Type fieldType) {
+
+        if (parent.getType().equals(fieldType)) {
+            return parent;
+        }
+
+        return super.createInfo(fieldType);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+
+        if (!super.equals(obj)) {
+            return false;
+        }
+
+        if (!this.getClass().equals(obj.getClass())) {
+            return false;
+        }
+
+        ParentTypeAwareTypeInformation<?> that = (ParentTypeAwareTypeInformation<?>) obj;
+        return this.parent == null ? that.parent == null : this.parent.equals(that.parent);
+    }
+
+    @Override
+    public int hashCode() {
+
+        if (this.hashCode == 0) {
+            this.hashCode = super.hashCode() + 31 * parent.hashCode();
+        }
+
+        return this.hashCode;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ReflectionUtils.java b/src/main/java/com/lambdaworks/redis/dynamic/support/ReflectionUtils.java
new file mode 100644
index 0000000000..5498d76493
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/ReflectionUtils.java
@@ -0,0 +1,351 @@
+package com.lambdaworks.redis.dynamic.support;
+
+import java.lang.reflect.*;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Simple utility class for working with the reflection API and handling reflection exceptions.
+ *
+ * <p>
+ * Only intended for internal use.
+ */
+public abstract class ReflectionUtils {
+
+    /**
+     * Get the field represented by the supplied {@link Field field object} on the specified {@link Object target object}. In
+     * accordance with {@link Field#get(Object)} semantics, the returned value is automatically wrapped if the underlying field
+     * has a primitive type.
+     * <p>
+     * Thrown exceptions are handled via a call to {@link #handleReflectionException(Exception)}.
+     * 
+     * @param field the field to get
+     * @param target the target object from which to get the field
+     * @return the field's current value
+     */
+    public static Object getField(Field field, Object target) {
+        try {
+            return field.get(target);
+        } catch (IllegalAccessException ex) {
+            handleReflectionException(ex);
+            throw new IllegalStateException(
+                    "Unexpected reflection exception - " + ex.getClass().getName() + ": " + ex.getMessage());
+        }
+    }
+
+    /**
+     * Attempt to find a {@link Method} on the supplied class with the supplied name and no parameters. Searches all
+     * superclasses up to {@code Object}.
+     * <p>
+     * Returns {@code null} if no {@link Method} can be found.
+     * 
+     * @param clazz the class to introspect
+     * @param name the name of the method
+     * @return the Method object, or {@code null} if none found
+     */
+    public static Method findMethod(Class<?> clazz, String name) {
+        return findMethod(clazz, name, new Class<?>[0]);
+    }
+
+    /**
+     * Attempt to find a {@link Method} on the supplied class with the supplied name and parameter types. Searches all
+     * superclasses up to {@code Object}.
+     * <p>
+     * Returns {@code null} if no {@link Method} can be found.
+     * 
+     * @param clazz the class to introspect
+     * @param name the name of the method
+     * @param paramTypes the parameter types of the method (may be {@code null} to indicate any signature)
+     * @return the Method object, or {@code null} if none found
+     */
+    public static Method findMethod(Class<?> clazz, String name, Class<?>... paramTypes) {
+        LettuceAssert.notNull(clazz, "Class must not be null");
+        LettuceAssert.notNull(name, "Method name must not be null");
+        Class<?> searchType = clazz;
+        while (searchType != null) {
+            Method[] methods = (searchType.isInterface() ? searchType.getMethods() : getDeclaredMethods(searchType));
+            for (Method method : methods) {
+                if (name.equals(method.getName())
+                        && (paramTypes == null || Arrays.equals(paramTypes, method.getParameterTypes()))) {
+                    return method;
+                }
+            }
+            searchType = searchType.getSuperclass();
+        }
+        return null;
+    }
+
+    /**
+     * Invoke the specified {@link Method} against the supplied target object with no arguments. The target object can be
+     * {@code null} when invoking a static {@link Method}.
+     * <p>
+     * Thrown exceptions are handled via a call to {@link #handleReflectionException}.
+     * 
+     * @param method the method to invoke
+     * @param target the target object to invoke the method on
+     * @return the invocation result, if any
+     * @see #invokeMethod(java.lang.reflect.Method, Object, Object[])
+     */
+    public static Object invokeMethod(Method method, Object target) {
+        return invokeMethod(method, target, new Object[0]);
+    }
+
+    /**
+     * Invoke the specified {@link Method} against the supplied target object with the supplied arguments. The target object can
+     * be {@code null} when invoking a static {@link Method}.
+     * <p>
+     * Thrown exceptions are handled via a call to {@link #handleReflectionException}.
+     * 
+     * @param method the method to invoke
+     * @param target the target object to invoke the method on
+     * @param args the invocation arguments (may be {@code null})
+     * @return the invocation result, if any
+     */
+    public static Object invokeMethod(Method method, Object target, Object... args) {
+        try {
+            return method.invoke(target, args);
+        } catch (Exception ex) {
+            handleReflectionException(ex);
+        }
+        throw new IllegalStateException("Should never get here");
+    }
+
+    /**
+     * Handle the given reflection exception. Should only be called if no checked exception is expected to be thrown by the
+     * target method.
+     * <p>
+     * Throws the underlying RuntimeException or Error in case of an InvocationTargetException with such a root cause. Throws an
+     * IllegalStateException with an appropriate message or UndeclaredThrowableException otherwise.
+     * 
+     * @param ex the reflection exception to handle
+     */
+    public static void handleReflectionException(Exception ex) {
+        if (ex instanceof NoSuchMethodException) {
+            throw new IllegalStateException("Method not found: " + ex.getMessage());
+        }
+        if (ex instanceof IllegalAccessException) {
+            throw new IllegalStateException("Could not access method: " + ex.getMessage());
+        }
+        if (ex instanceof InvocationTargetException) {
+            handleInvocationTargetException((InvocationTargetException) ex);
+        }
+        if (ex instanceof RuntimeException) {
+            throw (RuntimeException) ex;
+        }
+        throw new UndeclaredThrowableException(ex);
+    }
+
+    /**
+     * Handle the given invocation target exception. Should only be called if no checked exception is expected to be thrown by
+     * the target method.
+     * <p>
+     * Throws the underlying RuntimeException or Error in case of such a root cause. Throws an UndeclaredThrowableException
+     * otherwise.
+     * 
+     * @param ex the invocation target exception to handle
+     */
+    public static void handleInvocationTargetException(InvocationTargetException ex) {
+        rethrowRuntimeException(ex.getTargetException());
+    }
+
+    /**
+     * Rethrow the given {@link Throwable exception}, which is presumably the <em>target exception</em> of an
+     * {@link InvocationTargetException}. Should only be called if no checked exception is expected to be thrown by the target
+     * method.
+     * <p>
+     * Rethrows the underlying exception cast to a {@link RuntimeException} or {@link Error} if appropriate; otherwise, throws
+     * an {@link UndeclaredThrowableException}.
+     * 
+     * @param ex the exception to rethrow
+     * @throws RuntimeException the rethrown exception
+     */
+    public static void rethrowRuntimeException(Throwable ex) {
+        if (ex instanceof RuntimeException) {
+            throw (RuntimeException) ex;
+        }
+        if (ex instanceof Error) {
+            throw (Error) ex;
+        }
+        throw new UndeclaredThrowableException(ex);
+    }
+
+    /**
+     * Perform the given callback operation on all matching methods of the given class and superclasses.
+     * <p>
+     * The same named method occurring on subclass and superclass will appear twice, unless excluded by a {@link MethodFilter}.
+     * 
+     * @param clazz the class to introspect
+     * @param mc the callback to invoke for each method
+     * @see #doWithMethods(Class, MethodCallback, MethodFilter)
+     */
+    public static void doWithMethods(Class<?> clazz, MethodCallback mc) {
+        doWithMethods(clazz, mc, null);
+    }
+
+    /**
+     * Perform the given callback operation on all matching methods of the given class and superclasses (or given interface and
+     * super-interfaces).
+     * <p>
+     * The same named method occurring on subclass and superclass will appear twice, unless excluded by the specified
+     * {@link MethodFilter}.
+     * 
+     * @param clazz the class to introspect
+     * @param mc the callback to invoke for each method
+     * @param mf the filter that determines the methods to apply the callback to
+     */
+    public static void doWithMethods(Class<?> clazz, MethodCallback mc, MethodFilter mf) {
+        // Keep backing up the inheritance hierarchy.
+        Method[] methods = getDeclaredMethods(clazz);
+        for (Method method : methods) {
+            if (mf != null && !mf.matches(method)) {
+                continue;
+            }
+            try {
+                mc.doWith(method);
+            } catch (IllegalAccessException ex) {
+                throw new IllegalStateException("Not allowed to access method '" + method.getName() + "': " + ex);
+            }
+        }
+        if (clazz.getSuperclass() != null) {
+            doWithMethods(clazz.getSuperclass(), mc, mf);
+        } else if (clazz.isInterface()) {
+            for (Class<?> superIfc : clazz.getInterfaces()) {
+                doWithMethods(superIfc, mc, mf);
+            }
+        }
+    }
+
+    /**
+     * This variant retrieves {@link Class#getDeclaredMethods()} from a local cache in order to avoid the JVM's SecurityManager
+     * check and defensive array copying. In addition, it also includes Java 8 default methods from locally implemented
+     * interfaces, since those are effectively to be treated just like declared methods.
+     * 
+     * @param clazz the class to introspect
+     * @return the cached array of methods
+     * @see Class#getDeclaredMethods()
+     */
+    private static Method[] getDeclaredMethods(Class<?> clazz) {
+
+        Method[] result;
+        Method[] declaredMethods = clazz.getDeclaredMethods();
+        List<Method> defaultMethods = findConcreteMethodsOnInterfaces(clazz);
+        if (defaultMethods != null) {
+            result = new Method[declaredMethods.length + defaultMethods.size()];
+            System.arraycopy(declaredMethods, 0, result, 0, declaredMethods.length);
+            int index = declaredMethods.length;
+            for (Method defaultMethod : defaultMethods) {
+                result[index] = defaultMethod;
+                index++;
+            }
+        } else {
+            result = declaredMethods;
+        }
+        return result;
+    }
+
+    private static List<Method> findConcreteMethodsOnInterfaces(Class<?> clazz) {
+        List<Method> result = null;
+        for (Class<?> ifc : clazz.getInterfaces()) {
+            for (Method ifcMethod : ifc.getMethods()) {
+                if (!Modifier.isAbstract(ifcMethod.getModifiers())) {
+                    if (result == null) {
+                        result = new LinkedList<Method>();
+                    }
+                    result.add(ifcMethod);
+                }
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Invoke the given callback on all fields in the target class, going up the class hierarchy to get all declared fields.
+     * 
+     * @param clazz the target class to analyze
+     * @param fc the callback to invoke for each field
+     */
+    public static void doWithFields(Class<?> clazz, FieldCallback fc) {
+        doWithFields(clazz, fc, null);
+    }
+
+    /**
+     * Invoke the given callback on all fields in the target class, going up the class hierarchy to get all declared fields.
+     * 
+     * @param clazz the target class to analyze
+     * @param fc the callback to invoke for each field
+     * @param ff the filter that determines the fields to apply the callback to
+     */
+    public static void doWithFields(Class<?> clazz, FieldCallback fc, FieldFilter ff) {
+        // Keep backing up the inheritance hierarchy.
+        Class<?> targetClass = clazz;
+        do {
+            Field[] fields = targetClass.getDeclaredFields();
+            for (Field field : fields) {
+                if (ff != null && !ff.matches(field)) {
+                    continue;
+                }
+                try {
+                    fc.doWith(field);
+                } catch (IllegalAccessException ex) {
+                    throw new IllegalStateException("Not allowed to access field '" + field.getName() + "': " + ex);
+                }
+            }
+            targetClass = targetClass.getSuperclass();
+        } while (targetClass != null && targetClass != Object.class);
+    }
+
+    /**
+     * Action to take on each method.
+     */
+    public interface MethodCallback {
+
+        /**
+         * Perform an operation using the given method.
+         * 
+         * @param method the method to operate on
+         */
+        void doWith(Method method) throws IllegalArgumentException, IllegalAccessException;
+    }
+
+    /**
+     * Callback optionally used to filter methods to be operated on by a method callback.
+     */
+    public interface MethodFilter {
+
+        /**
+         * Determine whether the given method matches.
+         * 
+         * @param method the method to check
+         */
+        boolean matches(Method method);
+    }
+
+    /**
+     * Callback interface invoked on each field in the hierarchy.
+     */
+    public interface FieldCallback {
+
+        /**
+         * Perform an operation using the given field.
+         * 
+         * @param field the field to operate on
+         */
+        void doWith(Field field) throws IllegalArgumentException, IllegalAccessException;
+    }
+
+    /**
+     * Callback optionally used to filter fields to be operated on by a field callback.
+     */
+    public interface FieldFilter {
+
+        /**
+         * Determine whether the given field matches.
+         * 
+         * @param field the field to check
+         */
+        boolean matches(Field field);
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java b/src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java
new file mode 100644
index 0000000000..f07d27ae1a
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java
@@ -0,0 +1,1350 @@
+package com.lambdaworks.redis.dynamic.support;
+
+import java.io.Serializable;
+import java.lang.reflect.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+import com.lambdaworks.redis.LettuceStrings;
+import com.lambdaworks.redis.dynamic.support.TypeWrapper.MethodParameterTypeProvider;
+import com.lambdaworks.redis.dynamic.support.TypeWrapper.TypeProvider;
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.internal.LettuceClassUtils;
+
+/**
+ * Encapsulates a Java {@link java.lang.reflect.Type}, providing access to {@link #getSuperType() supertypes},
+ * {@link #getInterfaces() interfaces}, and {@link #getGeneric(int...) generic parameters} along with the ability to ultimately
+ * {@link #resolve() resolve} to a {@link java.lang.Class}.
+ */
+@SuppressWarnings("serial")
+class ResolvableType implements Serializable {
+
+    /**
+     * {@code ResolvableType} returned when no value is available. {@code NONE} is used in preference to {@code null} so that
+     * multiple method calls can be safely chained.
+     */
+    public static final ResolvableType NONE = new ResolvableType(null, null, null);
+
+    private static final ResolvableType[] EMPTY_TYPES_ARRAY = new ResolvableType[0];
+
+    /**
+     * The underlying Java type being managed (only ever {@code null} for {@link #NONE}).
+     */
+    private final Type type;
+
+    /**
+     * Optional provider for the type.
+     */
+    private final TypeProvider typeProvider;
+
+    /**
+     * The {@code VariableResolver} to use or {@code null} if no resolver is available.
+     */
+    private final VariableResolver variableResolver;
+
+    /**
+     * The component type for an array or {@code null} if the type should be deduced.
+     */
+    private final ResolvableType componentType;
+
+    /**
+     * Copy of the resolved value.
+     */
+    private final Class<?> resolved;
+
+    private ResolvableType superType;
+
+    private ResolvableType[] interfaces;
+
+    private ResolvableType[] generics;
+
+    /**
+     * Private constructor used to create a new {@link ResolvableType} for cache key purposes, with no upfront resolution.
+     */
+    private ResolvableType(Type type, TypeProvider typeProvider, VariableResolver variableResolver) {
+        this.type = type;
+        this.typeProvider = typeProvider;
+        this.variableResolver = variableResolver;
+        this.componentType = null;
+        this.resolved = resolveClass();
+    }
+
+    /**
+     * Private constructor used to create a new {@link ResolvableType} for uncached purposes, with upfront resolution but lazily
+     * calculated hash.
+     */
+    private ResolvableType(Type type, TypeProvider typeProvider, VariableResolver variableResolver,
+            ResolvableType componentType) {
+
+        this.type = type;
+        this.typeProvider = typeProvider;
+        this.variableResolver = variableResolver;
+        this.componentType = componentType;
+        this.resolved = resolveClass();
+    }
+
+    /**
+     * Private constructor used to create a new {@link ResolvableType} on a {@link Class} basis. Avoids all {@code instanceof}
+     * checks in order to create a straight {@link Class} wrapper.
+     */
+    private ResolvableType(Class<?> sourceClass) {
+        this.resolved = (sourceClass != null ? sourceClass : Object.class);
+        this.type = this.resolved;
+        this.typeProvider = null;
+        this.variableResolver = null;
+        this.componentType = null;
+    }
+
+    /**
+     * Return the underling Java {@link Type} being managed. With the exception of the {@link #NONE} constant, this method will
+     * never return {@code null}.
+     */
+    public Type getType() {
+        return TypeWrapper.unwrap(this.type);
+    }
+
+    /**
+     * Return the underlying Java {@link Class} being managed, if available; otherwise {@code null}.
+     */
+    public Class<?> getRawClass() {
+        if (this.type == this.resolved) {
+            return this.resolved;
+        }
+        Type rawType = this.type;
+        if (rawType instanceof ParameterizedType) {
+            rawType = ((ParameterizedType) rawType).getRawType();
+        }
+        return (rawType instanceof Class ? (Class<?>) rawType : null);
+    }
+
+    /**
+     * Return the underlying source of the resolvable type. Will return a {@link Field}, {@link MethodParameter} or {@link Type}
+     * depending on how the {@link ResolvableType} was constructed. With the exception of the {@link #NONE} constant, this
+     * method will never return {@code null}. This method is primarily to provide access to additional type information or
+     * meta-data that alternative JVM languages may provide.
+     */
+    public Object getSource() {
+        Object source = (this.typeProvider != null ? this.typeProvider.getSource() : null);
+        return (source != null ? source : this.type);
+    }
+
+    /**
+     * Determine whether the given object is an instance of this {@code ResolvableType}.
+     * 
+     * @param obj the object to check
+     * @see #isAssignableFrom(Class)
+     */
+    public boolean isInstance(Object obj) {
+        return (obj != null && isAssignableFrom(obj.getClass()));
+    }
+
+    /**
+     * Determine whether this {@code ResolvableType} is assignable from the specified other type.
+     * 
+     * @param other the type to be checked against (as a {@code Class})
+     * @see #isAssignableFrom(ResolvableType)
+     */
+    public boolean isAssignableFrom(Class<?> other) {
+        return isAssignableFrom(forClass(other), null);
+    }
+
+    /**
+     * Determine whether this {@code ResolvableType} is assignable from the specified other type.
+     * <p>
+     * Attempts to follow the same rules as the Java compiler, considering whether both the {@link #resolve() resolved}
+     * {@code Class} is {@link Class#isAssignableFrom(Class) assignable from} the given type as well as whether all
+     * {@link #getGenerics() generics} are assignable.
+     * 
+     * @param other the type to be checked against (as a {@code ResolvableType})
+     * @return {@code true} if the specified other type can be assigned to this {@code ResolvableType}; {@code false} otherwise
+     */
+    public boolean isAssignableFrom(ResolvableType other) {
+        return isAssignableFrom(other, null);
+    }
+
+    private boolean isAssignableFrom(ResolvableType other, Map<Type, Type> matchedBefore) {
+        LettuceAssert.notNull(other, "ResolvableType must not be null");
+
+        // If we cannot resolve types, we are not assignable
+        if (this == NONE || other == NONE) {
+            return false;
+        }
+
+        // Deal with array by delegating to the component type
+        if (isArray()) {
+            return (other.isArray() && getComponentType().isAssignableFrom(other.getComponentType()));
+        }
+
+        if (matchedBefore != null && matchedBefore.get(this.type) == other.type) {
+            return true;
+        }
+
+        // Deal with wildcard bounds
+        WildcardBounds ourBounds = WildcardBounds.get(this);
+        WildcardBounds typeBounds = WildcardBounds.get(other);
+
+        // In the from X is assignable to <? extends Number>
+        if (typeBounds != null) {
+            return (ourBounds != null && ourBounds.isSameKind(typeBounds)
+                    && ourBounds.isAssignableFrom(typeBounds.getBounds()));
+        }
+
+        // In the form <? extends Number> is assignable to X...
+        if (ourBounds != null) {
+            return ourBounds.isAssignableFrom(other);
+        }
+
+        // Main assignability check about to follow
+        boolean exactMatch = (matchedBefore != null); // We're checking nested generic variables now...
+        boolean checkGenerics = true;
+        Class<?> ourResolved = null;
+        if (this.type instanceof TypeVariable) {
+            TypeVariable<?> variable = (TypeVariable<?>) this.type;
+            // Try default variable resolution
+            if (this.variableResolver != null) {
+                ResolvableType resolved = this.variableResolver.resolveVariable(variable);
+                if (resolved != null) {
+                    ourResolved = resolved.resolve();
+                }
+            }
+            if (ourResolved == null) {
+                // Try variable resolution against target type
+                if (other.variableResolver != null) {
+                    ResolvableType resolved = other.variableResolver.resolveVariable(variable);
+                    if (resolved != null) {
+                        ourResolved = resolved.resolve();
+                        checkGenerics = false;
+                    }
+                }
+            }
+            if (ourResolved == null) {
+                // Unresolved type variable, potentially nested -> never insist on exact match
+                exactMatch = false;
+            }
+        }
+        if (ourResolved == null) {
+            ourResolved = resolve(Object.class);
+        }
+        Class<?> otherResolved = other.resolve(Object.class);
+
+        // We need an exact type match for generics
+        // List<CharSequence> is not assignable from List<String>
+        if (exactMatch ? !ourResolved.equals(otherResolved) : !LettuceClassUtils.isAssignable(ourResolved, otherResolved)) {
+            return false;
+        }
+
+        if (checkGenerics) {
+            // Recursively check each generic
+            ResolvableType[] ourGenerics = getGenerics();
+            ResolvableType[] typeGenerics = other.as(ourResolved).getGenerics();
+            if (ourGenerics.length != typeGenerics.length) {
+                return false;
+            }
+            if (matchedBefore == null) {
+                matchedBefore = new IdentityHashMap<Type, Type>(1);
+            }
+            matchedBefore.put(this.type, other.type);
+            for (int i = 0; i < ourGenerics.length; i++) {
+                if (!ourGenerics[i].isAssignableFrom(typeGenerics[i], matchedBefore)) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Return {@code true} if this type resolves to a Class that represents an array.
+     * 
+     * @see #getComponentType()
+     */
+    public boolean isArray() {
+        if (this == NONE) {
+            return false;
+        }
+        return (((this.type instanceof Class && ((Class<?>) this.type).isArray())) || this.type instanceof GenericArrayType
+                || resolveType().isArray());
+    }
+
+    /**
+     * Return the ResolvableType representing the component type of the array or {@link #NONE} if this type does not represent
+     * an array.
+     * 
+     * @see #isArray()
+     */
+    public ResolvableType getComponentType() {
+        if (this == NONE) {
+            return NONE;
+        }
+        if (this.componentType != null) {
+            return this.componentType;
+        }
+        if (this.type instanceof Class) {
+            Class<?> componentType = ((Class<?>) this.type).getComponentType();
+            return forType(componentType, this.variableResolver);
+        }
+        if (this.type instanceof GenericArrayType) {
+            return forType(((GenericArrayType) this.type).getGenericComponentType(), this.variableResolver);
+        }
+        return resolveType().getComponentType();
+    }
+
+    /**
+     * Convenience method to return this type as a resolvable {@link Collection} type. Returns {@link #NONE} if this type does
+     * not implement or extend {@link Collection}.
+     * 
+     * @see #as(Class)
+     * @see #asMap()
+     */
+    public ResolvableType asCollection() {
+        return as(Collection.class);
+    }
+
+    /**
+     * Convenience method to return this type as a resolvable {@link Map} type. Returns {@link #NONE} if this type does not
+     * implement or extend {@link Map}.
+     * 
+     * @see #as(Class)
+     * @see #asCollection()
+     */
+    public ResolvableType asMap() {
+        return as(Map.class);
+    }
+
+    /**
+     * Return this type as a {@link ResolvableType} of the specified class. Searches {@link #getSuperType() supertype} and
+     * {@link #getInterfaces() interface} hierarchies to find a match, returning {@link #NONE} if this type does not implement
+     * or extend the specified class.
+     * 
+     * @param type the required class type
+     * @return a {@link ResolvableType} representing this object as the specified type, or {@link #NONE} if not resolvable as
+     *         that type
+     * @see #asCollection()
+     * @see #asMap()
+     * @see #getSuperType()
+     * @see #getInterfaces()
+     */
+    public ResolvableType as(Class<?> type) {
+        if (this == NONE) {
+            return NONE;
+        }
+        if (nullSafeEquals(resolve(), type)) {
+            return this;
+        }
+        for (ResolvableType interfaceType : getInterfaces()) {
+            ResolvableType interfaceAsType = interfaceType.as(type);
+            if (interfaceAsType != NONE) {
+                return interfaceAsType;
+            }
+        }
+        return getSuperType().as(type);
+    }
+
+    /**
+     * Return a {@link ResolvableType} representing the direct supertype of this type. If no supertype is available this method
+     * returns {@link #NONE}.
+     * 
+     * @see #getInterfaces()
+     */
+    public ResolvableType getSuperType() {
+        Class<?> resolved = resolve();
+        if (resolved == null || resolved.getGenericSuperclass() == null) {
+            return NONE;
+        }
+        if (this.superType == null) {
+            this.superType = forType(TypeWrapper.forGenericSuperclass(resolved), asVariableResolver());
+        }
+        return this.superType;
+    }
+
+    /**
+     * Return a {@link ResolvableType} array representing the direct interfaces implemented by this type. If this type does not
+     * implement any interfaces an empty array is returned.
+     * 
+     * @see #getSuperType()
+     */
+    public ResolvableType[] getInterfaces() {
+        Class<?> resolved = resolve();
+        Object[] array = resolved.getGenericInterfaces();
+        if (resolved == null || (array == null || array.length == 0)) {
+            return EMPTY_TYPES_ARRAY;
+        }
+        if (this.interfaces == null) {
+            this.interfaces = forTypes(TypeWrapper.forGenericInterfaces(resolved), asVariableResolver());
+        }
+        return this.interfaces;
+    }
+
+    /**
+     * Return {@code true} if this type contains generic parameters.
+     * 
+     * @see #getGeneric(int...)
+     * @see #getGenerics()
+     */
+    public boolean hasGenerics() {
+        return (getGenerics().length > 0);
+    }
+
+    /**
+     * Return {@code true} if this type contains unresolvable generics only, that is, no substitute for any of its declared type
+     * variables.
+     */
+    boolean isEntirelyUnresolvable() {
+        if (this == NONE) {
+            return false;
+        }
+        ResolvableType[] generics = getGenerics();
+        for (ResolvableType generic : generics) {
+            if (!generic.isUnresolvableTypeVariable() && !generic.isWildcardWithoutBounds()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Determine whether the underlying type has any unresolvable generics: either through an unresolvable type variable on the
+     * type itself or through implementing a generic interface in a raw fashion, i.e. without substituting that interface's type
+     * variables. The result will be {@code true} only in those two scenarios.
+     */
+    public boolean hasUnresolvableGenerics() {
+        if (this == NONE) {
+            return false;
+        }
+        ResolvableType[] generics = getGenerics();
+        for (ResolvableType generic : generics) {
+            if (generic.isUnresolvableTypeVariable() || generic.isWildcardWithoutBounds()) {
+                return true;
+            }
+        }
+        Class<?> resolved = resolve();
+        if (resolved != null) {
+            for (Type genericInterface : resolved.getGenericInterfaces()) {
+                if (genericInterface instanceof Class) {
+                    if (forClass((Class<?>) genericInterface).hasGenerics()) {
+                        return true;
+                    }
+                }
+            }
+            return getSuperType().hasUnresolvableGenerics();
+        }
+        return false;
+    }
+
+    /**
+     * Determine whether the underlying type is a type variable that cannot be resolved through the associated variable
+     * resolver.
+     */
+    private boolean isUnresolvableTypeVariable() {
+        if (this.type instanceof TypeVariable) {
+            if (this.variableResolver == null) {
+                return true;
+            }
+            TypeVariable<?> variable = (TypeVariable<?>) this.type;
+            ResolvableType resolved = this.variableResolver.resolveVariable(variable);
+            if (resolved == null || resolved.isUnresolvableTypeVariable()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Determine whether the underlying type represents a wildcard without specific bounds (i.e., equal to
+     * {@code ? extends Object}).
+     */
+    private boolean isWildcardWithoutBounds() {
+        if (this.type instanceof WildcardType) {
+            WildcardType wt = (WildcardType) this.type;
+            if (wt.getLowerBounds().length == 0) {
+                Type[] upperBounds = wt.getUpperBounds();
+                if (upperBounds.length == 0 || (upperBounds.length == 1 && Object.class == upperBounds[0])) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified nesting level. See {@link #getNested(int, Map)} for details.
+     * 
+     * @param nestingLevel the nesting level
+     * @return the {@link ResolvableType} type, or {@code #NONE}
+     */
+    public ResolvableType getNested(int nestingLevel) {
+        return getNested(nestingLevel, null);
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified nesting level. The nesting level refers to the specific generic
+     * parameter that should be returned. A nesting level of 1 indicates this type; 2 indicates the first nested generic; 3 the
+     * second; and so on. For example, given {@code List<Set<Integer>>} level 1 refers to the {@code List}, level 2 the
+     * {@code Set}, and level 3 the {@code Integer}.
+     * <p>
+     * The {@code typeIndexesPerLevel} map can be used to reference a specific generic for the given level. For example, an
+     * index of 0 would refer to a {@code Map} key; whereas, 1 would refer to the value. If the map does not contain a value for
+     * a specific level the last generic will be used (e.g. a {@code Map} value).
+     * <p>
+     * Nesting levels may also apply to array types; for example given {@code String[]}, a nesting level of 2 refers to
+     * {@code String}.
+     * <p>
+     * If a type does not {@link #hasGenerics() contain} generics the {@link #getSuperType() supertype} hierarchy will be
+     * considered.
+     * 
+     * @param nestingLevel the required nesting level, indexed from 1 for the current type, 2 for the first nested generic, 3
+     *        for the second and so on
+     * @param typeIndexesPerLevel a map containing the generic index for a given nesting level (may be {@code null})
+     * @return a {@link ResolvableType} for the nested level or {@link #NONE}
+     */
+    public ResolvableType getNested(int nestingLevel, Map<Integer, Integer> typeIndexesPerLevel) {
+        ResolvableType result = this;
+        for (int i = 2; i <= nestingLevel; i++) {
+            if (result.isArray()) {
+                result = result.getComponentType();
+            } else {
+                // Handle derived types
+                while (result != ResolvableType.NONE && !result.hasGenerics()) {
+                    result = result.getSuperType();
+                }
+                Integer index = (typeIndexesPerLevel != null ? typeIndexesPerLevel.get(i) : null);
+                index = (index == null ? result.getGenerics().length - 1 : index);
+                result = result.getGeneric(index);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Return a {@link ResolvableType} representing the generic parameter for the given indexes. Indexes are zero based; for
+     * example given the type {@code Map<Integer, List<String>>}, {@code getGeneric(0)} will access the {@code Integer}. Nested
+     * generics can be accessed by specifying multiple indexes; for example {@code getGeneric(1, 0)} will access the
+     * {@code String} from the nested {@code List}. For convenience, if no indexes are specified the first generic is returned.
+     * <p>
+     * If no generic is available at the specified indexes {@link #NONE} is returned.
+     * 
+     * @param indexes the indexes that refer to the generic parameter (may be omitted to return the first generic)
+     * @return a {@link ResolvableType} for the specified generic or {@link #NONE}
+     * @see #hasGenerics()
+     * @see #getGenerics()
+     * @see #resolveGeneric(int...)
+     * @see #resolveGenerics()
+     */
+    public ResolvableType getGeneric(int... indexes) {
+        try {
+            if (indexes == null || indexes.length == 0) {
+                return getGenerics()[0];
+            }
+            ResolvableType generic = this;
+            for (int index : indexes) {
+                generic = generic.getGenerics()[index];
+            }
+            return generic;
+        } catch (IndexOutOfBoundsException ex) {
+            return NONE;
+        }
+    }
+
+    /**
+     * Return an array of {@link ResolvableType}s representing the generic parameters of this type. If no generics are available
+     * an empty array is returned. If you need to access a specific generic consider using the {@link #getGeneric(int...)}
+     * method as it allows access to nested generics and protects against {@code IndexOutOfBoundsExceptions}.
+     * 
+     * @return an array of {@link ResolvableType}s representing the generic parameters (never {@code null})
+     * @see #hasGenerics()
+     * @see #getGeneric(int...)
+     * @see #resolveGeneric(int...)
+     * @see #resolveGenerics()
+     */
+    public ResolvableType[] getGenerics() {
+        if (this == NONE) {
+            return EMPTY_TYPES_ARRAY;
+        }
+        if (this.generics == null) {
+            if (this.type instanceof Class) {
+                Class<?> typeClass = (Class<?>) this.type;
+                this.generics = forTypes(TypeWrapper.forTypeParameters(typeClass), this.variableResolver);
+            } else if (this.type instanceof ParameterizedType) {
+                Type[] actualTypeArguments = ((ParameterizedType) this.type).getActualTypeArguments();
+                ResolvableType[] generics = new ResolvableType[actualTypeArguments.length];
+                for (int i = 0; i < actualTypeArguments.length; i++) {
+                    generics[i] = forType(actualTypeArguments[i], this.variableResolver);
+                }
+                this.generics = generics;
+            } else {
+                this.generics = resolveType().getGenerics();
+            }
+        }
+        return this.generics;
+    }
+
+    /**
+     * Convenience method that will {@link #getGenerics() get} and {@link #resolve() resolve} generic parameters.
+     * 
+     * @return an array of resolved generic parameters (the resulting array will never be {@code null}, but it may contain
+     *         {@code null} elements})
+     * @see #getGenerics()
+     * @see #resolve()
+     */
+    public Class<?>[] resolveGenerics() {
+        return resolveGenerics(null);
+    }
+
+    /**
+     * Convenience method that will {@link #getGenerics() get} and {@link #resolve() resolve} generic parameters, using the
+     * specified {@code fallback} if any type cannot be resolved.
+     * 
+     * @param fallback the fallback class to use if resolution fails (may be {@code null})
+     * @return an array of resolved generic parameters (the resulting array will never be {@code null}, but it may contain
+     *         {@code null} elements})
+     * @see #getGenerics()
+     * @see #resolve()
+     */
+    public Class<?>[] resolveGenerics(Class<?> fallback) {
+        ResolvableType[] generics = getGenerics();
+        Class<?>[] resolvedGenerics = new Class<?>[generics.length];
+        for (int i = 0; i < generics.length; i++) {
+            resolvedGenerics[i] = generics[i].resolve(fallback);
+        }
+        return resolvedGenerics;
+    }
+
+    /**
+     * Convenience method that will {@link #getGeneric(int...) get} and {@link #resolve() resolve} a specific generic
+     * parameters.
+     * 
+     * @param indexes the indexes that refer to the generic parameter (may be omitted to return the first generic)
+     * @return a resolved {@link Class} or {@code null}
+     * @see #getGeneric(int...)
+     * @see #resolve()
+     */
+    public Class<?> resolveGeneric(int... indexes) {
+        return getGeneric(indexes).resolve();
+    }
+
+    /**
+     * Resolve this type to a {@link java.lang.Class}, returning {@code null} if the type cannot be resolved. This method will
+     * consider bounds of {@link TypeVariable}s and {@link WildcardType}s if direct resolution fails; however, bounds of
+     * {@code Object.class} will be ignored.
+     * 
+     * @return the resolved {@link Class}, or {@code null} if not resolvable
+     * @see #resolve(Class)
+     * @see #resolveGeneric(int...)
+     * @see #resolveGenerics()
+     */
+    public Class<?> resolve() {
+        return resolve(null);
+    }
+
+    /**
+     * Resolve this type to a {@link java.lang.Class}, returning the specified {@code fallback} if the type cannot be resolved.
+     * This method will consider bounds of {@link TypeVariable}s and {@link WildcardType}s if direct resolution fails; however,
+     * bounds of {@code Object.class} will be ignored.
+     * 
+     * @param fallback the fallback class to use if resolution fails (may be {@code null})
+     * @return the resolved {@link Class} or the {@code fallback}
+     * @see #resolve()
+     * @see #resolveGeneric(int...)
+     * @see #resolveGenerics()
+     */
+    public Class<?> resolve(Class<?> fallback) {
+        return (this.resolved != null ? this.resolved : fallback);
+    }
+
+    private Class<?> resolveClass() {
+        if (this.type instanceof Class || this.type == null) {
+            return (Class<?>) this.type;
+        }
+        if (this.type instanceof GenericArrayType) {
+            Class<?> resolvedComponent = getComponentType().resolve();
+            return (resolvedComponent != null ? Array.newInstance(resolvedComponent, 0).getClass() : null);
+        }
+        return resolveType().resolve();
+    }
+
+    /**
+     * Resolve this type by a single level, returning the resolved value or {@link #NONE}.
+     * <p>
+     * Note: The returned {@link ResolvableType} should only be used as an intermediary as it cannot be serialized.
+     */
+    ResolvableType resolveType() {
+        if (this.type instanceof ParameterizedType) {
+            return forType(((ParameterizedType) this.type).getRawType(), this.variableResolver);
+        }
+        if (this.type instanceof WildcardType) {
+            Type resolved = resolveBounds(((WildcardType) this.type).getUpperBounds());
+            if (resolved == null) {
+                resolved = resolveBounds(((WildcardType) this.type).getLowerBounds());
+            }
+            return forType(resolved, this.variableResolver);
+        }
+        if (this.type instanceof TypeVariable) {
+            TypeVariable<?> variable = (TypeVariable<?>) this.type;
+            // Try default variable resolution
+            if (this.variableResolver != null) {
+                ResolvableType resolved = this.variableResolver.resolveVariable(variable);
+                if (resolved != null) {
+                    return resolved;
+                }
+            }
+            // Fallback to bounds
+            return forType(resolveBounds(variable.getBounds()), this.variableResolver);
+        }
+        return NONE;
+    }
+
+    private Type resolveBounds(Type[] bounds) {
+        if ((bounds == null || bounds.length == 0) || Object.class == bounds[0]) {
+            return null;
+        }
+        return bounds[0];
+    }
+
+    private ResolvableType resolveVariable(TypeVariable<?> variable) {
+        if (this.type instanceof TypeVariable) {
+            return resolveType().resolveVariable(variable);
+        }
+        if (this.type instanceof ParameterizedType) {
+            ParameterizedType parameterizedType = (ParameterizedType) this.type;
+            TypeVariable<?>[] variables = resolve().getTypeParameters();
+            for (int i = 0; i < variables.length; i++) {
+                if (nullSafeEquals(variables[i].getName(), variable.getName())) {
+                    Type actualType = parameterizedType.getActualTypeArguments()[i];
+                    return forType(actualType, this.variableResolver);
+                }
+            }
+            if (parameterizedType.getOwnerType() != null) {
+                return forType(parameterizedType.getOwnerType(), this.variableResolver).resolveVariable(variable);
+            }
+        }
+        if (this.variableResolver != null) {
+            return this.variableResolver.resolveVariable(variable);
+        }
+        return null;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (!(other instanceof ResolvableType)) {
+            return false;
+        }
+
+        ResolvableType otherType = (ResolvableType) other;
+        if (!nullSafeEquals(this.type, otherType.type)) {
+            return false;
+        }
+        if (this.typeProvider != otherType.typeProvider && (this.typeProvider == null || otherType.typeProvider == null
+                || !nullSafeEquals(this.typeProvider.getSource(), otherType.typeProvider.getSource()))) {
+            return false;
+        }
+        if (this.variableResolver != otherType.variableResolver
+                && (this.variableResolver == null || otherType.variableResolver == null
+                        || !nullSafeEquals(this.variableResolver.getSource(), otherType.variableResolver.getSource()))) {
+            return false;
+        }
+        if (!nullSafeEquals(this.componentType, otherType.componentType)) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Adapts this {@link ResolvableType} to a {@link VariableResolver}.
+     */
+    VariableResolver asVariableResolver() {
+        if (this == NONE) {
+            return null;
+        }
+        return new DefaultVariableResolver();
+    }
+
+    /**
+     * Custom serialization support for {@link #NONE}.
+     */
+    private Object readResolve() {
+        return (this.type == null ? NONE : this);
+    }
+
+    /**
+     * Return a String representation of this type in its fully resolved form (including any generic parameters).
+     */
+    @Override
+    public String toString() {
+        if (isArray()) {
+            return getComponentType() + "[]";
+        }
+        if (this.resolved == null) {
+            return "?";
+        }
+        if (this.type instanceof TypeVariable) {
+            TypeVariable<?> variable = (TypeVariable<?>) this.type;
+            if (this.variableResolver == null || this.variableResolver.resolveVariable(variable) == null) {
+                // Don't bother with variable boundaries for toString()...
+                // Can cause infinite recursions in case of self-references
+                return "?";
+            }
+        }
+        StringBuilder result = new StringBuilder(this.resolved.getName());
+        if (hasGenerics()) {
+            result.append('<');
+            result.append(LettuceStrings.arrayToDelimitedString(getGenerics(), ", "));
+            result.append('>');
+        }
+        return result.toString();
+    }
+
+    // Factory methods
+
+    /**
+     * Return a {@link ResolvableType} for the specified {@link Class}, using the full generic type information for
+     * assignability checks. For example: {@code ResolvableType.forClass(MyArrayList.class)}.
+     * 
+     * @param sourceClass the source class ({@code null} is semantically equivalent to {@code Object.class} for typical use
+     *        cases here}
+     * @return a {@link ResolvableType} for the specified class
+     * @see #forClass(Class, Class)
+     * @see #forClassWithGenerics(Class, Class...)
+     */
+    public static ResolvableType forClass(Class<?> sourceClass) {
+        return new ResolvableType(sourceClass);
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified {@link Class}, doing assignability checks against the raw class only
+     * (analogous to {@link Class#isAssignableFrom}, which this serves as a wrapper for. For example:
+     * {@code ResolvableType.forClass(MyArrayList.class)}.
+     * 
+     * @param sourceClass the source class ({@code null} is semantically equivalent to {@code Object.class} for typical use
+     *        cases here}
+     * @return a {@link ResolvableType} for the specified class
+     * @see #forClass(Class)
+     * @see #getRawClass()
+     */
+    public static ResolvableType forRawClass(Class<?> sourceClass) {
+        return new ResolvableType(sourceClass) {
+            @Override
+            public boolean isAssignableFrom(Class<?> other) {
+                return LettuceClassUtils.isAssignable(getRawClass(), other);
+            }
+        };
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified {@link Class} with a given implementation. For example:
+     * {@code ResolvableType.forClass(List.class, MyArrayList.class)}.
+     * 
+     * @param sourceClass the source class (must not be {@code null}
+     * @param implementationClass the implementation class
+     * @return a {@link ResolvableType} for the specified class backed by the given implementation class
+     * @see #forClass(Class)
+     * @see #forClassWithGenerics(Class, Class...)
+     */
+    public static ResolvableType forClass(Class<?> sourceClass, Class<?> implementationClass) {
+        LettuceAssert.notNull(sourceClass, "Source class must not be null");
+        ResolvableType asType = forType(implementationClass).as(sourceClass);
+        return (asType == NONE ? forType(sourceClass) : asType);
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified {@link Class} with pre-declared generics.
+     * 
+     * @param sourceClass the source class
+     * @param generics the generics of the class
+     * @return a {@link ResolvableType} for the specific class and generics
+     * @see #forClassWithGenerics(Class, ResolvableType...)
+     */
+    public static ResolvableType forClassWithGenerics(Class<?> sourceClass, Class<?>... generics) {
+        LettuceAssert.notNull(sourceClass, "Source class must not be null");
+        LettuceAssert.notNull(generics, "Generics must not be null");
+        ResolvableType[] resolvableGenerics = new ResolvableType[generics.length];
+        for (int i = 0; i < generics.length; i++) {
+            resolvableGenerics[i] = forClass(generics[i]);
+        }
+        return forClassWithGenerics(sourceClass, resolvableGenerics);
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified {@link Class} with pre-declared generics.
+     * 
+     * @param sourceClass the source class
+     * @param generics the generics of the class
+     * @return a {@link ResolvableType} for the specific class and generics
+     * @see #forClassWithGenerics(Class, Class...)
+     */
+    public static ResolvableType forClassWithGenerics(Class<?> sourceClass, ResolvableType... generics) {
+        LettuceAssert.notNull(sourceClass, "Source class must not be null");
+        LettuceAssert.notNull(generics, "Generics must not be null");
+        TypeVariable<?>[] variables = sourceClass.getTypeParameters();
+        LettuceAssert.isTrue(variables.length == generics.length, "Mismatched number of generics specified");
+
+        Type[] arguments = new Type[generics.length];
+        for (int i = 0; i < generics.length; i++) {
+            ResolvableType generic = generics[i];
+            Type argument = (generic != null ? generic.getType() : null);
+            arguments[i] = (argument != null ? argument : variables[i]);
+        }
+
+        ParameterizedType syntheticType = new SyntheticParameterizedType(sourceClass, arguments);
+        return forType(syntheticType, new TypeVariablesVariableResolver(variables, generics));
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified {@link Method} return type.
+     * 
+     * @param method the source for the method return type
+     * @return a {@link ResolvableType} for the specified method return
+     * @see #forMethodReturnType(Method, Class)
+     */
+    public static ResolvableType forMethodReturnType(Method method) {
+        LettuceAssert.notNull(method, "Method must not be null");
+        return forMethodParameter(new MethodParameter(method, -1));
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified {@link Method} return type. Use this variant when the class that
+     * declares the method includes generic parameter variables that are satisfied by the implementation class.
+     * 
+     * @param method the source for the method return type
+     * @param implementationClass the implementation class
+     * @return a {@link ResolvableType} for the specified method return
+     * @see #forMethodReturnType(Method)
+     */
+    public static ResolvableType forMethodReturnType(Method method, Class<?> implementationClass) {
+        LettuceAssert.notNull(method, "Method must not be null");
+        MethodParameter methodParameter = new MethodParameter(method, -1);
+        methodParameter.setContainingClass(implementationClass);
+        return forMethodParameter(methodParameter);
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified {@link Method} parameter.
+     * 
+     * @param method the source method (must not be {@code null})
+     * @param parameterIndex the parameter index
+     * @return a {@link ResolvableType} for the specified method parameter
+     * @see #forMethodParameter(Method, int, Class)
+     * @see #forMethodParameter(MethodParameter)
+     */
+    public static ResolvableType forMethodParameter(Method method, int parameterIndex) {
+        LettuceAssert.notNull(method, "Method must not be null");
+        return forMethodParameter(new MethodParameter(method, parameterIndex));
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified {@link Method} parameter with a given implementation. Use this variant
+     * when the class that declares the method includes generic parameter variables that are satisfied by the implementation
+     * class.
+     * 
+     * @param method the source method (must not be {@code null})
+     * @param parameterIndex the parameter index
+     * @param implementationClass the implementation class
+     * @return a {@link ResolvableType} for the specified method parameter
+     * @see #forMethodParameter(Method, int, Class)
+     * @see #forMethodParameter(MethodParameter)
+     */
+    public static ResolvableType forMethodParameter(Method method, int parameterIndex, Class<?> implementationClass) {
+        LettuceAssert.notNull(method, "Method must not be null");
+        MethodParameter methodParameter = new MethodParameter(method, parameterIndex);
+        methodParameter.setContainingClass(implementationClass);
+        return forMethodParameter(methodParameter);
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified {@link MethodParameter}.
+     * 
+     * @param methodParameter the source method parameter (must not be {@code null})
+     * @return a {@link ResolvableType} for the specified method parameter
+     * @see #forMethodParameter(Method, int)
+     */
+    public static ResolvableType forMethodParameter(MethodParameter methodParameter) {
+        return forMethodParameter(methodParameter, (Type) null);
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified {@link MethodParameter} with a given implementation type. Use this
+     * variant when the class that declares the method includes generic parameter variables that are satisfied by the
+     * implementation type.
+     * 
+     * @param methodParameter the source method parameter (must not be {@code null})
+     * @param implementationType the implementation type
+     * @return a {@link ResolvableType} for the specified method parameter
+     * @see #forMethodParameter(MethodParameter)
+     */
+    public static ResolvableType forMethodParameter(MethodParameter methodParameter, ResolvableType implementationType) {
+        LettuceAssert.notNull(methodParameter, "MethodParameter must not be null");
+        implementationType = (implementationType != null ? implementationType : forType(methodParameter.getContainingClass()));
+        ResolvableType owner = implementationType.as(methodParameter.getDeclaringClass());
+        return forType(null, new MethodParameterTypeProvider(methodParameter), owner.asVariableResolver())
+                .getNested(methodParameter.getNestingLevel(), methodParameter.typeIndexesPerLevel);
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified {@link MethodParameter}, overriding the target type to resolve with a
+     * specific given type.
+     * 
+     * @param methodParameter the source method parameter (must not be {@code null})
+     * @param targetType the type to resolve (a part of the method parameter's type)
+     * @return a {@link ResolvableType} for the specified method parameter
+     * @see #forMethodParameter(Method, int)
+     */
+    public static ResolvableType forMethodParameter(MethodParameter methodParameter, Type targetType) {
+        LettuceAssert.notNull(methodParameter, "MethodParameter must not be null");
+        ResolvableType owner = forType(methodParameter.getContainingClass()).as(methodParameter.getDeclaringClass());
+        return forType(targetType, new MethodParameterTypeProvider(methodParameter), owner.asVariableResolver())
+                .getNested(methodParameter.getNestingLevel(), methodParameter.typeIndexesPerLevel);
+    }
+
+    /**
+     * Resolve the top-level parameter type of the given {@code MethodParameter}.
+     * 
+     * @param methodParameter the method parameter to resolve
+     * @see MethodParameter#setParameterType
+     */
+    static void resolveMethodParameter(MethodParameter methodParameter) {
+        LettuceAssert.notNull(methodParameter, "MethodParameter must not be null");
+        ResolvableType owner = forType(methodParameter.getContainingClass()).as(methodParameter.getDeclaringClass());
+        methodParameter.setParameterType(
+                forType(null, new MethodParameterTypeProvider(methodParameter), owner.asVariableResolver()).resolve());
+    }
+
+    /**
+     * Return a {@link ResolvableType} as a array of the specified {@code componentType}.
+     * 
+     * @param componentType the component type
+     * @return a {@link ResolvableType} as an array of the specified component type
+     */
+    public static ResolvableType forArrayComponent(ResolvableType componentType) {
+        LettuceAssert.notNull(componentType, "Component type must not be null");
+        Class<?> arrayClass = Array.newInstance(componentType.resolve(), 0).getClass();
+        return new ResolvableType(arrayClass, null, null, componentType);
+    }
+
+    private static ResolvableType[] forTypes(Type[] types, VariableResolver owner) {
+        ResolvableType[] result = new ResolvableType[types.length];
+        for (int i = 0; i < types.length; i++) {
+            result[i] = forType(types[i], owner);
+        }
+        return result;
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified {@link Type}. Note: The resulting {@link ResolvableType} may not be
+     * {@link Serializable}.
+     * 
+     * @param type the source type or {@code null}
+     * @return a {@link ResolvableType} for the specified {@link Type}
+     * @see #forType(Type, ResolvableType)
+     */
+    public static ResolvableType forType(Type type) {
+        return forType(type, null, null);
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified {@link Type} backed by the given owner type. Note: The resulting
+     * {@link ResolvableType} may not be {@link Serializable}.
+     * 
+     * @param type the source type or {@code null}
+     * @param owner the owner type used to resolve variables
+     * @return a {@link ResolvableType} for the specified {@link Type} and owner
+     * @see #forType(Type)
+     */
+    public static ResolvableType forType(Type type, ResolvableType owner) {
+        VariableResolver variableResolver = null;
+        if (owner != null) {
+            variableResolver = owner.asVariableResolver();
+        }
+        return forType(type, variableResolver);
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified {@link Type} backed by a given {@link VariableResolver}.
+     * 
+     * @param type the source type or {@code null}
+     * @param variableResolver the variable resolver or {@code null}
+     * @return a {@link ResolvableType} for the specified {@link Type} and {@link VariableResolver}
+     */
+    static ResolvableType forType(Type type, VariableResolver variableResolver) {
+        return forType(type, null, variableResolver);
+    }
+
+    /**
+     * Return a {@link ResolvableType} for the specified {@link Type} backed by a given {@link VariableResolver}.
+     * 
+     * @param type the source type or {@code null}
+     * @param typeProvider the type provider or {@code null}
+     * @param variableResolver the variable resolver or {@code null}
+     * @return a {@link ResolvableType} for the specified {@link Type} and {@link VariableResolver}
+     */
+    static ResolvableType forType(Type type, TypeProvider typeProvider, VariableResolver variableResolver) {
+        if (type == null && typeProvider != null) {
+            type = TypeWrapper.forTypeProvider(typeProvider);
+        }
+        if (type == null) {
+            return NONE;
+        }
+
+        // For simple Class references, build the wrapper right away -
+        // no expensive resolution necessary, so not worth caching...
+        if (type instanceof Class) {
+            return new ResolvableType(type, typeProvider, variableResolver, null);
+        }
+
+        return new ResolvableType(type, typeProvider, variableResolver);
+    }
+
+    /**
+     * Strategy interface used to resolve {@link TypeVariable}s.
+     */
+    interface VariableResolver extends Serializable {
+
+        /**
+         * Return the source of the resolver (used for hashCode and equals).
+         */
+        Object getSource();
+
+        /**
+         * Resolve the specified variable.
+         * 
+         * @param variable the variable to resolve
+         * @return the resolved variable, or {@code null} if not found
+         */
+        ResolvableType resolveVariable(TypeVariable<?> variable);
+    }
+
+    @SuppressWarnings("serial")
+    private class DefaultVariableResolver implements VariableResolver {
+
+        @Override
+        public ResolvableType resolveVariable(TypeVariable<?> variable) {
+            return ResolvableType.this.resolveVariable(variable);
+        }
+
+        @Override
+        public Object getSource() {
+            return ResolvableType.this;
+        }
+    }
+
+    @SuppressWarnings("serial")
+    private static class TypeVariablesVariableResolver implements VariableResolver {
+
+        private final TypeVariable<?>[] variables;
+
+        private final ResolvableType[] generics;
+
+        public TypeVariablesVariableResolver(TypeVariable<?>[] variables, ResolvableType[] generics) {
+            this.variables = variables;
+            this.generics = generics;
+        }
+
+        @Override
+        public ResolvableType resolveVariable(TypeVariable<?> variable) {
+            for (int i = 0; i < this.variables.length; i++) {
+                if (TypeWrapper.unwrap(this.variables[i]).equals(TypeWrapper.unwrap(variable))) {
+                    return this.generics[i];
+                }
+            }
+            return null;
+        }
+
+        @Override
+        public Object getSource() {
+            return this.generics;
+        }
+    }
+
+    private static final class SyntheticParameterizedType implements ParameterizedType, Serializable {
+
+        private final Type rawType;
+
+        private final Type[] typeArguments;
+
+        public SyntheticParameterizedType(Type rawType, Type[] typeArguments) {
+            this.rawType = rawType;
+            this.typeArguments = typeArguments;
+        }
+
+        @Override
+        public Type getOwnerType() {
+            return null;
+        }
+
+        @Override
+        public Type getRawType() {
+            return this.rawType;
+        }
+
+        @Override
+        public Type[] getActualTypeArguments() {
+            return this.typeArguments;
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            if (this == other) {
+                return true;
+            }
+            if (!(other instanceof ParameterizedType)) {
+                return false;
+            }
+            ParameterizedType otherType = (ParameterizedType) other;
+            return (otherType.getOwnerType() == null && this.rawType.equals(otherType.getRawType())
+                    && Arrays.equals(this.typeArguments, otherType.getActualTypeArguments()));
+        }
+
+        @Override
+        public int hashCode() {
+            return (this.rawType.hashCode() * 31 + Arrays.hashCode(this.typeArguments));
+        }
+    }
+
+    /**
+     * Internal helper to handle bounds from {@link WildcardType}s.
+     */
+    private static class WildcardBounds {
+
+        private final Kind kind;
+
+        private final ResolvableType[] bounds;
+
+        /**
+         * Internal constructor to create a new {@link WildcardBounds} instance.
+         * 
+         * @param kind the kind of bounds
+         * @param bounds the bounds
+         * @see #get(ResolvableType)
+         */
+        public WildcardBounds(Kind kind, ResolvableType[] bounds) {
+            this.kind = kind;
+            this.bounds = bounds;
+        }
+
+        /**
+         * Return {@code true} if this bounds is the same kind as the specified bounds.
+         */
+        public boolean isSameKind(WildcardBounds bounds) {
+            return this.kind == bounds.kind;
+        }
+
+        /**
+         * Return {@code true} if this bounds is assignable to all the specified types.
+         * 
+         * @param types the types to test against
+         * @return {@code true} if this bounds is assignable to all types
+         */
+        public boolean isAssignableFrom(ResolvableType... types) {
+            for (ResolvableType bound : this.bounds) {
+                for (ResolvableType type : types) {
+                    if (!isAssignable(bound, type)) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        private boolean isAssignable(ResolvableType source, ResolvableType from) {
+            return (this.kind == Kind.UPPER ? source.isAssignableFrom(from) : from.isAssignableFrom(source));
+        }
+
+        /**
+         * Return the underlying bounds.
+         */
+        public ResolvableType[] getBounds() {
+            return this.bounds;
+        }
+
+        /**
+         * Get a {@link WildcardBounds} instance for the specified type, returning {@code null} if the specified type cannot be
+         * resolved to a {@link WildcardType}.
+         * 
+         * @param type the source type
+         * @return a {@link WildcardBounds} instance or {@code null}
+         */
+        public static WildcardBounds get(ResolvableType type) {
+            ResolvableType resolveToWildcard = type;
+            while (!(resolveToWildcard.getType() instanceof WildcardType)) {
+                if (resolveToWildcard == NONE) {
+                    return null;
+                }
+                resolveToWildcard = resolveToWildcard.resolveType();
+            }
+            WildcardType wildcardType = (WildcardType) resolveToWildcard.type;
+            Kind boundsType = (wildcardType.getLowerBounds().length > 0 ? Kind.LOWER : Kind.UPPER);
+            Type[] bounds = boundsType == Kind.UPPER ? wildcardType.getUpperBounds() : wildcardType.getLowerBounds();
+            ResolvableType[] resolvableBounds = new ResolvableType[bounds.length];
+            for (int i = 0; i < bounds.length; i++) {
+                resolvableBounds[i] = ResolvableType.forType(bounds[i], type.variableResolver);
+            }
+            return new WildcardBounds(boundsType, resolvableBounds);
+        }
+
+        /**
+         * The various kinds of bounds.
+         */
+        enum Kind {
+            UPPER, LOWER
+        }
+    }
+
+    /**
+     * Determine if the given objects are equal, returning {@code true} if both are {@code null} or {@code false} if only one is
+     * {@code null}.
+     * <p>
+     * Compares arrays with {@code Arrays.equals}, performing an equality check based on the array elements rather than the
+     * array reference.
+     * 
+     * @param o1 first Object to compare
+     * @param o2 second Object to compare
+     * @return whether the given objects are equal
+     * @see java.util.Arrays#equals
+     */
+    private static boolean nullSafeEquals(Object o1, Object o2) {
+        if (o1 == o2) {
+            return true;
+        }
+        if (o1 == null || o2 == null) {
+            return false;
+        }
+        if (o1.equals(o2)) {
+            return true;
+        }
+        if (o1.getClass().isArray() && o2.getClass().isArray()) {
+            if (o1 instanceof Object[] && o2 instanceof Object[]) {
+                return Arrays.equals((Object[]) o1, (Object[]) o2);
+            }
+            if (o1 instanceof boolean[] && o2 instanceof boolean[]) {
+                return Arrays.equals((boolean[]) o1, (boolean[]) o2);
+            }
+            if (o1 instanceof byte[] && o2 instanceof byte[]) {
+                return Arrays.equals((byte[]) o1, (byte[]) o2);
+            }
+            if (o1 instanceof char[] && o2 instanceof char[]) {
+                return Arrays.equals((char[]) o1, (char[]) o2);
+            }
+            if (o1 instanceof double[] && o2 instanceof double[]) {
+                return Arrays.equals((double[]) o1, (double[]) o2);
+            }
+            if (o1 instanceof float[] && o2 instanceof float[]) {
+                return Arrays.equals((float[]) o1, (float[]) o2);
+            }
+            if (o1 instanceof int[] && o2 instanceof int[]) {
+                return Arrays.equals((int[]) o1, (int[]) o2);
+            }
+            if (o1 instanceof long[] && o2 instanceof long[]) {
+                return Arrays.equals((long[]) o1, (long[]) o2);
+            }
+            if (o1 instanceof short[] && o2 instanceof short[]) {
+                return Arrays.equals((short[]) o1, (short[]) o2);
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/StandardReflectionParameterNameDiscoverer.java b/src/main/java/com/lambdaworks/redis/dynamic/support/StandardReflectionParameterNameDiscoverer.java
new file mode 100644
index 0000000000..112f578497
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/StandardReflectionParameterNameDiscoverer.java
@@ -0,0 +1,43 @@
+package com.lambdaworks.redis.dynamic.support;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+
+/**
+ * {@link ParameterNameDiscoverer} implementation which uses JDK 8's reflection facilities for introspecting parameter names
+ * (based on the "-parameters" compiler flag).
+ *
+ * @see java.lang.reflect.Parameter#getName()
+ */
+public class StandardReflectionParameterNameDiscoverer implements ParameterNameDiscoverer {
+
+    @Override
+    public String[] getParameterNames(Method method) {
+        Parameter[] parameters = method.getParameters();
+        String[] parameterNames = new String[parameters.length];
+        for (int i = 0; i < parameters.length; i++) {
+            Parameter param = parameters[i];
+            if (!param.isNamePresent()) {
+                return null;
+            }
+            parameterNames[i] = param.getName();
+        }
+        return parameterNames;
+    }
+
+    @Override
+    public String[] getParameterNames(Constructor<?> ctor) {
+        Parameter[] parameters = ctor.getParameters();
+        String[] parameterNames = new String[parameters.length];
+        for (int i = 0; i < parameters.length; i++) {
+            Parameter param = parameters[i];
+            if (!param.isNamePresent()) {
+                return null;
+            }
+            parameterNames[i] = param.getName();
+        }
+        return parameterNames;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java
new file mode 100644
index 0000000000..fcd76111ee
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java
@@ -0,0 +1,365 @@
+package com.lambdaworks.redis.dynamic.support;
+
+import java.lang.reflect.*;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Basic {@link TypeDiscoverer} that contains basic functionality to discover property types.
+ */
+class TypeDiscoverer<S> implements TypeInformation<S> {
+
+    private final Type type;
+    private final Map<TypeVariable<?>, Type> typeVariableMap;
+    private final Map<String, TypeInformation<?>> fieldTypes = new ConcurrentHashMap<String, TypeInformation<?>>();
+    private final int hashCode;
+
+    private boolean componentTypeResolved = false;
+    private TypeInformation<?> componentType;
+
+    private boolean valueTypeResolved = false;
+    private TypeInformation<?> valueType;
+
+    private Class<S> resolvedType;
+
+    /**
+     * Creates a ne {@link TypeDiscoverer} for the given type, type variable map and parent.
+     * 
+     * @param type must not be {@literal null}.
+     * @param typeVariableMap must not be {@literal null}.
+     */
+    protected TypeDiscoverer(Type type, Map<TypeVariable<?>, Type> typeVariableMap) {
+
+        LettuceAssert.notNull(type, "Type must not be null");
+
+        this.type = type;
+        this.typeVariableMap = typeVariableMap;
+        this.hashCode = 17 + (31 * type.hashCode()) + (31 * typeVariableMap.hashCode());
+    }
+
+    /**
+     * Returns the type variable map.
+     * 
+     * @return
+     */
+    protected Map<TypeVariable<?>, Type> getTypeVariableMap() {
+        return typeVariableMap;
+    }
+
+    /**
+     * Creates {@link TypeInformation} for the given {@link Type}.
+     * 
+     * @param fieldType
+     * @return
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked", "deprecation" })
+    protected TypeInformation<?> createInfo(Type fieldType) {
+
+        if (fieldType.equals(this.type)) {
+            return this;
+        }
+
+        if (fieldType instanceof Class) {
+            return new ClassTypeInformation((Class<?>) fieldType);
+        }
+
+        Class<S> resolveType = resolveType(fieldType);
+        Map<TypeVariable, Type> variableMap = new HashMap<TypeVariable, Type>();
+        variableMap.putAll(GenericTypeResolver.getTypeVariableMap(resolveType));
+
+        if (fieldType instanceof ParameterizedType) {
+
+            ParameterizedType parameterizedType = (ParameterizedType) fieldType;
+
+            TypeVariable<Class<S>>[] typeParameters = resolveType.getTypeParameters();
+            Type[] arguments = parameterizedType.getActualTypeArguments();
+
+            for (int i = 0; i < typeParameters.length; i++) {
+                variableMap.put(typeParameters[i], arguments[i]);
+            }
+
+            return new ParametrizedTypeInformation(parameterizedType, this, variableMap);
+        }
+
+        if (fieldType instanceof TypeVariable) {
+            TypeVariable<?> variable = (TypeVariable<?>) fieldType;
+            return new TypeVariableTypeInformation(variable, type, this, variableMap);
+        }
+
+        if (fieldType instanceof GenericArrayType) {
+            return new GenericArrayTypeInformation((GenericArrayType) fieldType, this, variableMap);
+        }
+
+        if (fieldType instanceof WildcardType) {
+
+            WildcardType wildcardType = (WildcardType) fieldType;
+            Type[] bounds = wildcardType.getLowerBounds();
+
+            if (bounds.length > 0) {
+                return createInfo(bounds[0]);
+            }
+
+            bounds = wildcardType.getUpperBounds();
+
+            if (bounds.length > 0) {
+                return createInfo(bounds[0]);
+            }
+        }
+
+        throw new IllegalArgumentException();
+    }
+
+    /**
+     * Resolves the given type into a plain {@link Class}.
+     * 
+     * @param type
+     * @return
+     */
+    @SuppressWarnings({ "unchecked", "rawtypes", "deprecation" })
+    protected Class<S> resolveType(Type type) {
+
+        Map<TypeVariable, Type> map = new HashMap<TypeVariable, Type>();
+        map.putAll(getTypeVariableMap());
+
+        return (Class<S>) ResolvableType.forType(type, new TypeVariableMapVariableResolver(map)).resolve(Object.class);
+    }
+
+    public List<TypeInformation<?>> getParameterTypes(Constructor<?> constructor) {
+
+        LettuceAssert.notNull(constructor, "Constructor must not be null!");
+
+        Type[] types = constructor.getGenericParameterTypes();
+        List<TypeInformation<?>> result = new ArrayList<TypeInformation<?>>(types.length);
+
+        for (Type parameterType : types) {
+            result.add(createInfo(parameterType));
+        }
+
+        return result;
+    }
+
+    public Class<S> getType() {
+
+        if (resolvedType == null) {
+            this.resolvedType = resolveType(type);
+        }
+
+        return this.resolvedType;
+    }
+
+    @Override
+    public ClassTypeInformation<?> getRawTypeInformation() {
+        return ClassTypeInformation.from(getType()).getRawTypeInformation();
+    }
+
+    public TypeInformation<?> getActualType() {
+
+        if (isMap()) {
+            return getMapValueType();
+        }
+
+        if (isCollectionLike()) {
+            return getComponentType();
+        }
+
+        return this;
+    }
+
+    public boolean isMap() {
+        return Map.class.isAssignableFrom(getType());
+    }
+
+    public TypeInformation<?> getMapValueType() {
+
+        if (!valueTypeResolved) {
+            this.valueType = doGetMapValueType();
+            this.valueTypeResolved = true;
+        }
+
+        return this.valueType;
+    }
+
+    protected TypeInformation<?> doGetMapValueType() {
+
+        if (isMap()) {
+            return getTypeArgument(Map.class, 1);
+        }
+
+        List<TypeInformation<?>> arguments = getTypeArguments();
+
+        if (arguments.size() > 1) {
+            return arguments.get(1);
+        }
+
+        return null;
+    }
+
+    public boolean isCollectionLike() {
+
+        Class<?> rawType = getType();
+
+        if (rawType.isArray() || Iterable.class.equals(rawType)) {
+            return true;
+        }
+
+        return Collection.class.isAssignableFrom(rawType);
+    }
+
+    public final TypeInformation<?> getComponentType() {
+
+        if (!componentTypeResolved) {
+            this.componentType = doGetComponentType();
+            this.componentTypeResolved = true;
+        }
+
+        return this.componentType;
+    }
+
+    protected TypeInformation<?> doGetComponentType() {
+
+        Class<S> rawType = getType();
+
+        if (rawType.isArray()) {
+            return createInfo(rawType.getComponentType());
+        }
+
+        if (isMap()) {
+            return getTypeArgument(Map.class, 0);
+        }
+
+        if (Iterable.class.isAssignableFrom(rawType)) {
+            return getTypeArgument(Iterable.class, 0);
+        }
+
+        List<TypeInformation<?>> arguments = getTypeArguments();
+
+        if (arguments.size() > 0) {
+            return arguments.get(0);
+        }
+
+        return null;
+    }
+
+    public TypeInformation<?> getReturnType(Method method) {
+
+        return createInfo(method.getGenericReturnType());
+    }
+
+    public List<TypeInformation<?>> getParameterTypes(Method method) {
+
+        LettuceAssert.notNull(method, "Method most not be null!");
+
+        Type[] types = method.getGenericParameterTypes();
+        List<TypeInformation<?>> result = new ArrayList<TypeInformation<?>>(types.length);
+
+        for (Type parameterType : types) {
+            result.add(createInfo(parameterType));
+        }
+
+        return result;
+    }
+
+    public TypeInformation<?> getSuperTypeInformation(Class<?> superType) {
+
+        Class<?> rawType = getType();
+
+        if (!superType.isAssignableFrom(rawType)) {
+            return null;
+        }
+
+        if (getType().equals(superType)) {
+            return this;
+        }
+
+        List<Type> candidates = new ArrayList<Type>();
+
+        Type genericSuperclass = rawType.getGenericSuperclass();
+        if (genericSuperclass != null) {
+            candidates.add(genericSuperclass);
+        }
+        candidates.addAll(Arrays.asList(rawType.getGenericInterfaces()));
+
+        for (Type candidate : candidates) {
+
+            TypeInformation<?> candidateInfo = createInfo(candidate);
+
+            if (superType.equals(candidateInfo.getType())) {
+                return candidateInfo;
+            } else {
+                TypeInformation<?> nestedSuperType = candidateInfo.getSuperTypeInformation(superType);
+                if (nestedSuperType != null) {
+                    return nestedSuperType;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public List<TypeInformation<?>> getTypeArguments() {
+        return Collections.emptyList();
+    }
+
+    public boolean isAssignableFrom(TypeInformation<?> target) {
+        return target.getSuperTypeInformation(getType()).equals(this);
+    }
+
+    public TypeInformation<?> getTypeArgument(Class<?> bound, int index) {
+
+        Class<?>[] arguments = GenericTypeResolver.resolveTypeArguments(getType(), bound);
+
+        if (arguments == null) {
+            return getSuperTypeInformation(bound) instanceof ParametrizedTypeInformation ? ClassTypeInformation.OBJECT : null;
+        }
+
+        return createInfo(arguments[index]);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+
+        if (obj == this) {
+            return true;
+        }
+
+        if (obj == null) {
+            return false;
+        }
+
+        if (!this.getClass().equals(obj.getClass())) {
+            return false;
+        }
+
+        TypeDiscoverer<?> that = (TypeDiscoverer<?>) obj;
+
+        return this.type.equals(that.type) && this.typeVariableMap.equals(that.typeVariableMap);
+    }
+
+    @Override
+    public int hashCode() {
+        return hashCode;
+    }
+
+    @SuppressWarnings({ "serial", "rawtypes" })
+    private static class TypeVariableMapVariableResolver implements ResolvableType.VariableResolver {
+
+        private final Map<TypeVariable, Type> typeVariableMap;
+
+        public TypeVariableMapVariableResolver(Map<TypeVariable, Type> typeVariableMap) {
+            this.typeVariableMap = typeVariableMap;
+        }
+
+        @Override
+        public ResolvableType resolveVariable(TypeVariable<?> variable) {
+            Type type = this.typeVariableMap.get(variable);
+            return (type != null ? ResolvableType.forType(type) : null);
+        }
+
+        @Override
+        public Object getSource() {
+            return this.typeVariableMap;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java
new file mode 100644
index 0000000000..1ac8c6b53d
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java
@@ -0,0 +1,115 @@
+package com.lambdaworks.redis.dynamic.support;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.List;
+
+/**
+ * Interface to access types and resolving generics on the way.
+ */
+public interface TypeInformation<S> {
+
+    /**
+     * Returns the {@link TypeInformation}s for the parameters of the given {@link Constructor}.
+     * 
+     * @param constructor must not be {@literal null}.
+     * @return
+     */
+    List<TypeInformation<?>> getParameterTypes(Constructor<?> constructor);
+
+    /**
+     * Returns whether the type can be considered a collection, which means it's a container of elements, e.g. a
+     * {@link java.util.Collection} and {@link java.lang.reflect.Array} or anything implementing {@link Iterable}. If this
+     * returns {@literal true} you can expect {@link #getComponentType()} to return a non-{@literal null} value.
+     * 
+     * @return
+     */
+    boolean isCollectionLike();
+
+    /**
+     * Returns the component type for {@link java.util.Collection}s or the key type for {@link java.util.Map}s.
+     * 
+     * @return
+     */
+    TypeInformation<?> getComponentType();
+
+    /**
+     * Returns whether the property is a {@link java.util.Map}. If this returns {@literal true} you can expect
+     * {@link #getComponentType()} as well as {@link #getMapValueType()} to return something not {@literal null}.
+     * 
+     * @return
+     */
+    boolean isMap();
+
+    /**
+     * Will return the type of the value in case the underlying type is a {@link java.util.Map}.
+     * 
+     * @return
+     */
+    TypeInformation<?> getMapValueType();
+
+    /**
+     * Returns the type of the property. Will resolve generics and the generic context of
+     * 
+     * @return
+     */
+    Class<S> getType();
+
+    /**
+     * Returns a {@link ClassTypeInformation} to represent the {@link TypeInformation} of the raw type of the current instance.
+     * 
+     * @return
+     */
+    ClassTypeInformation<?> getRawTypeInformation();
+
+    /**
+     * Transparently returns the {@link java.util.Map} value type if the type is a {@link java.util.Map}, returns the component
+     * type if the type {@link #isCollectionLike()} or the simple type if none of this applies.
+     * 
+     * @return
+     */
+    TypeInformation<?> getActualType();
+
+    /**
+     * Returns a {@link TypeInformation} for the return type of the given {@link Method}. Will potentially resolve generics
+     * information against the current types type parameter bindings.
+     * 
+     * @param method must not be {@literal null}.
+     * @return
+     */
+    TypeInformation<?> getReturnType(Method method);
+
+    /**
+     * Returns the {@link TypeInformation}s for the parameters of the given {@link Method}.
+     * 
+     * @param method must not be {@literal null}.
+     * @return
+     */
+    List<TypeInformation<?>> getParameterTypes(Method method);
+
+    /**
+     * Returns the {@link TypeInformation} for the given raw super type.
+     * 
+     * @param superType must not be {@literal null}.
+     * @return the {@link TypeInformation} for the given raw super type or {@literal null} in case the current
+     *         {@link TypeInformation} does not implement the given type.
+     */
+    TypeInformation<?> getSuperTypeInformation(Class<?> superType);
+
+    /**
+     * Returns if the current {@link TypeInformation} can be safely assigned to the given one. Mimics semantics of
+     * {@link Class#isAssignableFrom(Class)} but takes generics into account. Thus it will allow to detect that a
+     * {@code List<Long>} is assignable to {@code List<? extends Number>}.
+     * 
+     * @param target
+     * @return
+     */
+    boolean isAssignableFrom(TypeInformation<?> target);
+
+    /**
+     * Returns the {@link TypeInformation} for the type arguments of the current {@link TypeInformation}.
+     * 
+     * @return
+     */
+    List<TypeInformation<?>> getTypeArguments();
+}
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java
new file mode 100644
index 0000000000..7d9c1c9623
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java
@@ -0,0 +1,95 @@
+package com.lambdaworks.redis.dynamic.support;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.Map;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Special {@link TypeDiscoverer} to determine the actual type for a {@link TypeVariable}. Will consider the context the
+ * {@link TypeVariable} is being used in.
+ */
+public class TypeVariableTypeInformation<T> extends ParentTypeAwareTypeInformation<T> {
+
+    private final TypeVariable<?> variable;
+    private final Type owningType;
+
+    /**
+     * Creates a bew {@link TypeVariableTypeInformation} for the given {@link TypeVariable} owning {@link Type} and parent
+     * {@link TypeDiscoverer}.
+     * 
+     * @param variable must not be {@literal null}
+     * @param owningType must not be {@literal null}
+     * @param parent
+     */
+    public TypeVariableTypeInformation(TypeVariable<?> variable, Type owningType, TypeDiscoverer<?> parent,
+            Map<TypeVariable<?>, Type> typeVariableMap) {
+
+        super(variable, parent, typeVariableMap);
+
+        LettuceAssert.notNull(variable, "TypeVariable must not be null");
+
+        this.variable = variable;
+        this.owningType = owningType;
+    }
+
+    @Override
+    public Class<T> getType() {
+
+        int index = getIndex(variable);
+
+        if (owningType instanceof ParameterizedType && index != -1) {
+            Type fieldType = ((ParameterizedType) owningType).getActualTypeArguments()[index];
+            return resolveType(fieldType);
+        }
+
+        return resolveType(variable);
+    }
+
+    /**
+     * Returns the index of the type parameter binding the given {@link TypeVariable}.
+     * 
+     * @param variable
+     * @return
+     */
+    private int getIndex(TypeVariable<?> variable) {
+
+        Class<?> rawType = resolveType(owningType);
+        TypeVariable<?>[] typeParameters = rawType.getTypeParameters();
+
+        for (int i = 0; i < typeParameters.length; i++) {
+            if (variable.equals(typeParameters[i])) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+
+        if (obj == this) {
+            return true;
+        }
+
+        if (!(obj instanceof TypeVariableTypeInformation)) {
+            return false;
+        }
+
+        TypeVariableTypeInformation<?> that = (TypeVariableTypeInformation<?>) obj;
+
+        return getType().equals(that.getType());
+    }
+
+    @Override
+    public String toString() {
+        return variable.getName();
+    }
+
+    public String getVariableName() {
+        return variable.getName();
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeWrapper.java b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeWrapper.java
new file mode 100644
index 0000000000..7da1badd2b
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeWrapper.java
@@ -0,0 +1,349 @@
+package com.lambdaworks.redis.dynamic.support;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.lang.reflect.*;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Internal utility class that can be used to obtain wrapped {@link Serializable} variants of {@link java.lang.reflect.Type}s.
+ *
+ * <p>
+ * {@link #forField(Field) Fields} or {@link #forMethodParameter(MethodParameter) MethodParameters} can be used as the root
+ * source for a serializable type. Alternatively the {@link #forGenericSuperclass(Class) superclass},
+ * {@link #forGenericInterfaces(Class) interfaces} or {@link #forTypeParameters(Class) type parameters} or a regular
+ * {@link Class} can also be used as source.
+ *
+ * <p>
+ * The returned type will either be a {@link Class} or a serializable proxy of {@link GenericArrayType},
+ * {@link ParameterizedType}, {@link TypeVariable} or {@link WildcardType}. With the exception of {@link Class} (which is final)
+ * calls to methods that return further {@link Type}s (for example {@link GenericArrayType#getGenericComponentType()}) will be
+ * automatically wrapped.
+ *
+ */
+abstract class TypeWrapper {
+
+    private static final Class<?>[] SUPPORTED_SERIALIZABLE_TYPES = { GenericArrayType.class, ParameterizedType.class,
+            TypeVariable.class, WildcardType.class };
+
+    /**
+     * Return a {@link Serializable} variant of {@link Field#getGenericType()}.
+     */
+    public static Type forField(Field field) {
+        LettuceAssert.notNull(field, "Field must not be null");
+        return forTypeProvider(new FieldTypeProvider(field));
+    }
+
+    /**
+     * Return a {@link Serializable} variant of {@link MethodParameter#getGenericParameterType()}.
+     */
+    public static Type forMethodParameter(MethodParameter methodParameter) {
+        return forTypeProvider(new MethodParameterTypeProvider(methodParameter));
+    }
+
+    /**
+     * Return a {@link Serializable} variant of {@link Class#getGenericSuperclass()}.
+     */
+    @SuppressWarnings("serial")
+    public static Type forGenericSuperclass(final Class<?> type) {
+        return forTypeProvider(new DefaultTypeProvider() {
+            @Override
+            public Type getType() {
+                return type.getGenericSuperclass();
+            }
+        });
+    }
+
+    /**
+     * Return a {@link Serializable} variant of {@link Class#getGenericInterfaces()}.
+     */
+    @SuppressWarnings("serial")
+    public static Type[] forGenericInterfaces(final Class<?> type) {
+        Type[] result = new Type[type.getGenericInterfaces().length];
+        for (int i = 0; i < result.length; i++) {
+            final int index = i;
+            result[i] = forTypeProvider(new DefaultTypeProvider() {
+                @Override
+                public Type getType() {
+                    return type.getGenericInterfaces()[index];
+                }
+            });
+        }
+        return result;
+    }
+
+    /**
+     * Return a {@link Serializable} variant of {@link Class#getTypeParameters()}.
+     */
+    @SuppressWarnings("serial")
+    public static Type[] forTypeParameters(final Class<?> type) {
+        Type[] result = new Type[type.getTypeParameters().length];
+        for (int i = 0; i < result.length; i++) {
+            final int index = i;
+            result[i] = forTypeProvider(new DefaultTypeProvider() {
+                @Override
+                public Type getType() {
+                    return type.getTypeParameters()[index];
+                }
+            });
+        }
+        return result;
+    }
+
+    /**
+     * Unwrap the given type, effectively returning the original non-serializable type.
+     * 
+     * @param type the type to unwrap
+     * @return the original non-serializable type
+     */
+    @SuppressWarnings("unchecked")
+    public static <T extends Type> T unwrap(T type) {
+        Type unwrapped = type;
+        while (unwrapped instanceof SerializableTypeProxy) {
+            unwrapped = ((SerializableTypeProxy) type).getTypeProvider().getType();
+        }
+        return (T) unwrapped;
+    }
+
+    /**
+     * Return a {@link Serializable} {@link Type} backed by a {@link TypeProvider} .
+     */
+    static Type forTypeProvider(final TypeProvider provider) {
+        LettuceAssert.notNull(provider, "Provider must not be null");
+        if (provider.getType() instanceof Serializable || provider.getType() == null) {
+            return provider.getType();
+        }
+
+        for (Class<?> type : SUPPORTED_SERIALIZABLE_TYPES) {
+            if (type.isAssignableFrom(provider.getType().getClass())) {
+                ClassLoader classLoader = provider.getClass().getClassLoader();
+                Class<?>[] interfaces = new Class<?>[] { type, SerializableTypeProxy.class, Serializable.class };
+                InvocationHandler handler = new TypeProxyInvocationHandler(provider);
+                return (Type) Proxy.newProxyInstance(classLoader, interfaces, handler);
+            }
+        }
+        throw new IllegalArgumentException("Unsupported Type class: " + provider.getType().getClass().getName());
+    }
+
+    /**
+     * Additional interface implemented by the type proxy.
+     */
+    interface SerializableTypeProxy {
+
+        /**
+         * Return the underlying type provider.
+         */
+        TypeProvider getTypeProvider();
+    }
+
+    /**
+     * A {@link Serializable} interface providing access to a {@link Type}.
+     */
+    interface TypeProvider extends Serializable {
+
+        /**
+         * Return the (possibly non {@link Serializable}) {@link Type}.
+         */
+        Type getType();
+
+        /**
+         * Return the source of the type or {@code null}.
+         */
+        Object getSource();
+    }
+
+    /**
+     * Default implementation of {@link TypeProvider} with a {@code null} source.
+     */
+    @SuppressWarnings("serial")
+    private static abstract class DefaultTypeProvider implements TypeProvider {
+
+        @Override
+        public Object getSource() {
+            return null;
+        }
+    }
+
+    /**
+     * {@link Serializable} {@link InvocationHandler} used by the proxied {@link Type}. Provides serialization support and
+     * enhances any methods that return {@code Type} or {@code Type[]}.
+     */
+    @SuppressWarnings("serial")
+    private static class TypeProxyInvocationHandler implements InvocationHandler, Serializable {
+
+        private final TypeProvider provider;
+
+        public TypeProxyInvocationHandler(TypeProvider provider) {
+            this.provider = provider;
+        }
+
+        @Override
+        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+            if (method.getName().equals("equals")) {
+                Object other = args[0];
+                // Unwrap proxies for speed
+                if (other instanceof Type) {
+                    other = unwrap((Type) other);
+                }
+                return this.provider.getType().equals(other);
+            } else if (method.getName().equals("hashCode")) {
+                return this.provider.getType().hashCode();
+            } else if (method.getName().equals("getTypeProvider")) {
+                return this.provider;
+            }
+
+            if (Type.class == method.getReturnType() && args == null) {
+                return forTypeProvider(new MethodInvokeTypeProvider(this.provider, method, -1));
+            } else if (Type[].class == method.getReturnType() && args == null) {
+                Type[] result = new Type[((Type[]) method.invoke(this.provider.getType(), args)).length];
+                for (int i = 0; i < result.length; i++) {
+                    result[i] = forTypeProvider(new MethodInvokeTypeProvider(this.provider, method, i));
+                }
+                return result;
+            }
+
+            try {
+                return method.invoke(this.provider.getType(), args);
+            } catch (InvocationTargetException ex) {
+                throw ex.getTargetException();
+            }
+        }
+    }
+
+    /**
+     * {@link TypeProvider} for {@link Type}s obtained from a {@link Field}.
+     */
+    @SuppressWarnings("serial")
+    static class FieldTypeProvider implements TypeProvider {
+
+        private final String fieldName;
+
+        private final Class<?> declaringClass;
+
+        private transient Field field;
+
+        public FieldTypeProvider(Field field) {
+            this.fieldName = field.getName();
+            this.declaringClass = field.getDeclaringClass();
+            this.field = field;
+        }
+
+        @Override
+        public Type getType() {
+            return this.field.getGenericType();
+        }
+
+        @Override
+        public Object getSource() {
+            return this.field;
+        }
+
+        private void readObject(ObjectInputStream inputStream) throws IOException, ClassNotFoundException {
+            inputStream.defaultReadObject();
+            try {
+                this.field = this.declaringClass.getDeclaredField(this.fieldName);
+            } catch (Throwable ex) {
+                throw new IllegalStateException("Could not find original class structure", ex);
+            }
+        }
+    }
+
+    /**
+     * {@link TypeProvider} for {@link Type}s obtained from a {@link MethodParameter}.
+     */
+    @SuppressWarnings("serial")
+    static class MethodParameterTypeProvider implements TypeProvider {
+
+        private final String methodName;
+
+        private final Class<?>[] parameterTypes;
+
+        private final Class<?> declaringClass;
+
+        private final int parameterIndex;
+
+        private transient MethodParameter methodParameter;
+
+        public MethodParameterTypeProvider(MethodParameter methodParameter) {
+            if (methodParameter.getMethod() != null) {
+                this.methodName = methodParameter.getMethod().getName();
+                this.parameterTypes = methodParameter.getMethod().getParameterTypes();
+            } else {
+                this.methodName = null;
+                this.parameterTypes = methodParameter.getConstructor().getParameterTypes();
+            }
+            this.declaringClass = methodParameter.getDeclaringClass();
+            this.parameterIndex = methodParameter.getParameterIndex();
+            this.methodParameter = methodParameter;
+        }
+
+        @Override
+        public Type getType() {
+            return this.methodParameter.getGenericParameterType();
+        }
+
+        @Override
+        public Object getSource() {
+            return this.methodParameter;
+        }
+
+        private void readObject(ObjectInputStream inputStream) throws IOException, ClassNotFoundException {
+            inputStream.defaultReadObject();
+            try {
+                if (this.methodName != null) {
+                    this.methodParameter = new MethodParameter(
+                            this.declaringClass.getDeclaredMethod(this.methodName, this.parameterTypes), this.parameterIndex);
+                } else {
+                    this.methodParameter = new MethodParameter(this.declaringClass.getDeclaredConstructor(this.parameterTypes),
+                            this.parameterIndex);
+                }
+            } catch (Throwable ex) {
+                throw new IllegalStateException("Could not find original class structure", ex);
+            }
+        }
+    }
+
+    /**
+     * {@link TypeProvider} for {@link Type}s obtained by invoking a no-arg method.
+     */
+    @SuppressWarnings("serial")
+    static class MethodInvokeTypeProvider implements TypeProvider {
+
+        private final TypeProvider provider;
+
+        private final String methodName;
+
+        private final int index;
+
+        private transient Method method;
+
+        private transient volatile Object result;
+
+        public MethodInvokeTypeProvider(TypeProvider provider, Method method, int index) {
+            this.provider = provider;
+            this.methodName = method.getName();
+            this.index = index;
+            this.method = method;
+        }
+
+        @Override
+        public Type getType() {
+            Object result = this.result;
+            if (result == null) {
+                // Lazy invocation of the target method on the provided type
+                result = ReflectionUtils.invokeMethod(this.method, this.provider.getType());
+                // Cache the result for further calls to getType()
+                this.result = result;
+            }
+            return (result instanceof Type[] ? ((Type[]) result)[this.index] : (Type) result);
+        }
+
+        @Override
+        public Object getSource() {
+            return null;
+        }
+    }
+
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/support/package-info.java
new file mode 100644
index 0000000000..8ae763c2a2
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Support classes imported from the Spring Framework.
+ */
+package com.lambdaworks.redis.dynamic.support;
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java b/src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java
index 947254b752..740775c1f5 100644
--- a/src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java
+++ b/src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java
@@ -1,5 +1,10 @@
 package com.lambdaworks.redis.internal;
 
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+import org.springframework.util.TypeUtils;
+
 import com.lambdaworks.redis.JavaRuntime;
 
 /**
@@ -10,6 +15,32 @@
  */
 public class LettuceClassUtils {
 
+    /** The CGLIB class separator character "$$" */
+    public static final String CGLIB_CLASS_SEPARATOR = "$$";
+
+    /**
+     * Map with primitive wrapper type as key and corresponding primitive type as value, for example: Integer.class ->
+     * int.class.
+     */
+    private static final Map<Class<?>, Class<?>> primitiveWrapperTypeMap = new IdentityHashMap<Class<?>, Class<?>>(9);
+
+    /**
+     * Map with primitive type as key and corresponding wrapper type as value, for example: int.class -> Integer.class.
+     */
+    private static final Map<Class<?>, Class<?>> primitiveTypeToWrapperMap = new IdentityHashMap<Class<?>, Class<?>>(9);
+
+    static {
+        primitiveWrapperTypeMap.put(Boolean.class, boolean.class);
+        primitiveWrapperTypeMap.put(Byte.class, byte.class);
+        primitiveWrapperTypeMap.put(Character.class, char.class);
+        primitiveWrapperTypeMap.put(Double.class, double.class);
+        primitiveWrapperTypeMap.put(Float.class, float.class);
+        primitiveWrapperTypeMap.put(Integer.class, int.class);
+        primitiveWrapperTypeMap.put(Long.class, long.class);
+        primitiveWrapperTypeMap.put(Short.class, short.class);
+        primitiveWrapperTypeMap.put(Void.class, void.class);
+    }
+
     /**
      * Determine whether the {@link Class} identified by the supplied name is present and can be loaded. Will return
      * {@code false} if either the class or one of its dependencies is not present or cannot be loaded.
@@ -32,6 +63,20 @@ public static boolean isPresent(String className) {
      * 
      * @param className
      * @return
+     */
+    public static Class<?> findClass(String className) {
+        try {
+            return forName(className, getDefaultClassLoader());
+        } catch (ClassNotFoundException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Loads a class using the {@link #getDefaultClassLoader()}.
+     *
+     * @param className
+     * @return
      * @throws ClassNotFoundException
      */
     public static Class<?> forName(String className) throws ClassNotFoundException {
@@ -75,4 +120,36 @@ private static ClassLoader getDefaultClassLoader() {
         }
         return cl;
     }
+
+    /**
+     * Check if the right-hand side type may be assigned to the left-hand side type, assuming setting by reflection. Considers
+     * primitive wrapper classes as assignable to the corresponding primitive types.
+     * 
+     * @param lhsType the target type
+     * @param rhsType the value type that should be assigned to the target type
+     * @return if the target type is assignable from the value type
+     * @see TypeUtils#isAssignable
+     */
+    public static boolean isAssignable(Class<?> lhsType, Class<?> rhsType) {
+
+        LettuceAssert.notNull(lhsType, "Left-hand side type must not be null");
+        LettuceAssert.notNull(rhsType, "Right-hand side type must not be null");
+
+        if (lhsType.isAssignableFrom(rhsType)) {
+            return true;
+        }
+
+        if (lhsType.isPrimitive()) {
+            Class<?> resolvedPrimitive = primitiveWrapperTypeMap.get(rhsType);
+            if (lhsType == resolvedPrimitive) {
+                return true;
+            }
+        } else {
+            Class<?> resolvedWrapper = primitiveTypeToWrapperMap.get(rhsType);
+            if (resolvedWrapper != null && lhsType.isAssignableFrom(resolvedWrapper)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java b/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
index 14ebb07d77..5a40e69e28 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
@@ -4,12 +4,14 @@
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.List;
 import java.util.Map;
 
 import com.lambdaworks.redis.codec.ByteArrayCodec;
-import com.lambdaworks.redis.codec.ToByteBufEncoder;
 import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.codec.ToByteBufEncoder;
 import com.lambdaworks.redis.internal.LettuceAssert;
 
 import io.netty.buffer.ByteBuf;
@@ -372,6 +374,11 @@ static void writeBytes(ByteBuf buffer, byte[] value) {
             buffer.writeBytes(value);
             buffer.writeBytes(CRLF);
         }
+
+        @Override
+        public String toString() {
+            return Base64.getEncoder().encodeToString(val);
+        }
     }
 
     static class ByteBufferArgument {
@@ -421,6 +428,11 @@ void encode(ByteBuf target) {
             StringArgument.writeString(target, Long.toString(val));
         }
 
+        @Override
+        public String toString() {
+            return "" + val;
+        }
+
         static void writeInteger(ByteBuf target, long value) {
 
             if (value < 10) {
@@ -465,6 +477,11 @@ static DoubleArgument of(double val) {
         void encode(ByteBuf target) {
             StringArgument.writeString(target, Double.toString(val));
         }
+
+        @Override
+        public String toString() {
+            return "" + val;
+        }
     }
 
     static class StringArgument extends SingularArgument {
@@ -496,6 +513,11 @@ static void writeString(ByteBuf target, String value) {
             }
             target.writeBytes(CRLF);
         }
+
+        @Override
+        public String toString() {
+            return val;
+        }
     }
 
     static class KeyArgument<K, V> extends SingularArgument {
@@ -534,6 +556,11 @@ void encode(ByteBuf target) {
 
             ByteBufferArgument.writeByteBuffer(target, codec.encodeKey(key));
         }
+
+        @Override
+        public String toString() {
+            return String.format("key<%s>", new StringCodec().decodeKey(codec.encodeKey(key)));
+        }
     }
 
     static class ValueArgument<K, V> extends SingularArgument {
@@ -572,6 +599,11 @@ void encode(ByteBuf target) {
 
             ByteBufferArgument.writeByteBuffer(target, codec.encodeValue(val));
         }
+
+        @Override
+        public String toString() {
+            return String.format("value<%s>", new StringCodec().decodeValue(codec.encodeValue(val)));
+        }
     }
 
     /**
diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
index 91a5b06d26..25b464e969 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
@@ -395,8 +395,8 @@ public Builder reconnectDelay(Delay reconnectDelay) {
         }
 
         /**
-         * Sets the stateful reconnect {@link Supplier} to delay reconnect attempts. Defaults to binary exponential delay capped
-         * at {@literal 30 SECONDS}.
+         * Sets the stateful reconnect {@link Supplier} to delay reconnect attempts. Defaults to binary exponential delay capped at
+         * {@literal 30 SECONDS}.
          *
          * @param reconnectDelay the reconnect delay, must not be {@literal null}.
          * @return this
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodTest.java b/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodTest.java
new file mode 100644
index 0000000000..76bea6045d
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodTest.java
@@ -0,0 +1,56 @@
+package com.lambdaworks.redis.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.lang.reflect.Method;
+import java.util.concurrent.Future;
+
+import org.junit.Test;
+
+import reactor.core.publisher.Flux;
+
+/**
+ * @author Mark Paluch
+ */
+public class CommandMethodTest {
+
+    @Test
+    public void shouldResolveConcreteType() throws Exception {
+
+        CommandMethod commandMethod = new CommandMethod(getMethod("getString"));
+
+        assertThat(commandMethod.getActualReturnType().getType()).isEqualTo(String.class);
+        assertThat(commandMethod.getReturnType().getType()).isEqualTo(String.class);
+    }
+
+    @Test
+    public void shouldResolveFutureComponentType() throws Exception {
+
+        CommandMethod commandMethod = new CommandMethod(getMethod("getFuture"));
+
+        assertThat(commandMethod.getActualReturnType().getType()).isEqualTo(String.class);
+        assertThat(commandMethod.getReturnType().getType()).isEqualTo(Future.class);
+    }
+
+    @Test
+    public void shouldResolveFluxComponentType() throws Exception {
+
+        CommandMethod commandMethod = new CommandMethod(getMethod("getFlux"));
+
+        assertThat(commandMethod.getActualReturnType().getType()).isEqualTo(String.class);
+        assertThat(commandMethod.getReturnType().getType()).isEqualTo(Flux.class);
+    }
+
+    private Method getMethod(String name) throws NoSuchMethodException {
+        return MyInterface.class.getDeclaredMethod(name);
+    }
+
+    static interface MyInterface {
+
+        String getString();
+
+        Future<String> getFuture();
+
+        Flux<String> getFlux();
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java b/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java
new file mode 100644
index 0000000000..6a18e9c9d4
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java
@@ -0,0 +1,114 @@
+package com.lambdaworks.redis.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Fail.fail;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.lambdaworks.redis.dynamic.segment.CommandSegment;
+import com.lambdaworks.redis.dynamic.segment.CommandSegments;
+import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
+import com.lambdaworks.redis.internal.LettuceLists;
+import com.lambdaworks.redis.models.command.CommandDetail;
+
+/**
+ * @author Mark Paluch
+ */
+public class CommandMethodVerifierTest {
+
+    private CommandMethodVerifier sut;
+
+    @Before
+    public void before() {
+
+        CommandDetail mget = new CommandDetail("mget", -2, null, 0, 0, 0);
+        CommandDetail randomkey = new CommandDetail("randomkey", 1, null, 0, 0, 0);
+        CommandDetail rpop = new CommandDetail("rpop", 2, null, 0, 0, 0);
+
+        sut = new CommandMethodVerifier(LettuceLists.newList(mget, randomkey, rpop));
+    }
+
+    @Test
+    public void misspelledName() {
+
+        try {
+            validateMethod("megt");
+            fail("Missing CommandMethodSyntaxException");
+        } catch (CommandMethodSyntaxException e) {
+            assertThat(e).hasMessageContaining("Command megt does not exist. Did you mean: MGET?");
+        }
+    }
+
+    @Test
+    public void tooFewAtLeastParameters() {
+
+        try {
+            validateMethod("mget");
+            fail("Missing CommandMethodSyntaxException");
+        } catch (CommandMethodSyntaxException e) {
+            assertThat(e)
+                    .hasMessageContaining("Command MGET requires at least 1 parameters but method declares 0 parameter(s)");
+        }
+    }
+
+    @Test
+    public void shouldPassWithCorrectParameterCount() {
+
+        validateMethod("mget", String.class);
+        validateMethod("randomkey");
+        validateMethod("rpop", String.class);
+    }
+
+    @Test
+    public void tooManyParameters() {
+
+        try {
+            validateMethod("rpop", String.class, String.class);
+            fail("Missing CommandMethodSyntaxException");
+        } catch (CommandMethodSyntaxException e) {
+            assertThat(e).hasMessageContaining("Command RPOP accepts 1 parameters but method declares 2 parameter(s)");
+        }
+    }
+
+    @Test
+    public void methodDoesNotAcceptParameters() {
+
+        try {
+            validateMethod("randomkey", String.class);
+            fail("Missing CommandMethodSyntaxException");
+        } catch (CommandMethodSyntaxException e) {
+            assertThat(e).hasMessageContaining("Command RANDOMKEY accepts no parameters");
+        }
+    }
+
+    private void validateMethod(String methodName, Class<?>... parameterTypes) {
+
+        Method method = ReflectionUtils.findMethod(MyInterface.class, methodName, parameterTypes);
+        CommandMethod commandMethod = new CommandMethod(method);
+
+        sut.validate(new CommandSegments(Arrays.asList(CommandSegment.constant(methodName))), commandMethod);
+    }
+
+    static interface MyInterface {
+
+        void megt();
+
+        void mget();
+
+        void mget(String key);
+
+        void mget(String key1, String key2);
+
+        void randomkey();
+
+        void randomkey(String key);
+
+        void rpop(String key);
+
+        void rpop(String key1, String key2);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
new file mode 100644
index 0000000000..5e07d53479
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
@@ -0,0 +1,163 @@
+package com.lambdaworks.redis.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+import java.util.concurrent.Future;
+
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.lambdaworks.redis.SetArgs;
+import com.lambdaworks.redis.codec.ByteArrayCodec;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.dynamic.annotation.Command;
+import com.lambdaworks.redis.dynamic.annotation.Param;
+import com.lambdaworks.redis.dynamic.annotation.Value;
+import com.lambdaworks.redis.dynamic.domain.Timeout;
+import com.lambdaworks.redis.dynamic.output.CodecAwareOutputFactoryResolver;
+import com.lambdaworks.redis.dynamic.output.OutputRegistry;
+import com.lambdaworks.redis.dynamic.output.OutputRegistryCommandOutputFactoryResolver;
+import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory;
+import com.lambdaworks.redis.dynamic.segment.CommandSegmentFactory;
+import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
+import com.lambdaworks.redis.protocol.CommandArgs;
+import com.lambdaworks.redis.protocol.RedisCommand;
+
+/**
+ * @author Mark Paluch
+ */
+public class CommandSegmentCommandFactoryTest {
+
+    @Test
+    public void setKeyValue() {
+
+        RedisCommand<?, ?, ?> command = createCommand(createCommandMethod(Commands.class, "set", String.class, String.class),
+                new StringCodec(), "key", "value");
+
+        assertThat(toString(command)).isEqualTo("SET key<key> key<value>");
+    }
+
+    @Test
+    public void setKeyValueWithByteArrayCodec() {
+
+        RedisCommand<?, ?, ?> command = createCommand(createCommandMethod(Commands.class, "set", String.class, String.class),
+                new ByteArrayCodec(), "key", "value");
+
+        assertThat(toString(command)).isEqualTo("SET key value");
+    }
+
+    @Test
+    public void setKeyValueWithHintedValue() {
+
+        RedisCommand<?, ?, ?> command = createCommand(createCommandMethod(Commands.class, "set2", String.class, String.class),
+                new StringCodec(), "key", "value");
+
+        assertThat(toString(command)).isEqualTo("SET key<key> value<value>");
+    }
+
+    @Test
+    public void setWithArgs() {
+
+        RedisCommand<?, ?, ?> command = createCommand(
+                createCommandMethod(Commands.class, "set", String.class, String.class, SetArgs.class), new StringCodec(), "key",
+                "value", SetArgs.Builder.ex(123).nx());
+
+        assertThat(toString(command)).isEqualTo("SET key<key> key<value> EX 123 NX");
+    }
+
+    @Test
+    public void clientSetname() {
+
+        RedisCommand<?, ?, ?> command = createCommand(createCommandMethod(Commands.class, "clientSetname", String.class),
+                new ByteArrayCodec(), "name");
+
+        assertThat(toString(command)).isEqualTo("CLIENT SETNAME name");
+    }
+
+    @Test
+    public void annotatedClientSetname() {
+
+        RedisCommand<?, ?, ?> command = createCommand(createCommandMethod(Commands.class, "woohoo", String.class),
+                new StringCodec(), "name");
+
+        assertThat(toString(command)).isEqualTo("CLIENT SETNAME key<name>");
+    }
+
+    @Test
+    public void asyncWithTimeout() {
+
+        try {
+            createCommand(createCommandMethod(MethodsWithTimeout.class, "async", String.class, Timeout.class),
+                    new StringCodec());
+            fail("Missing CommandCreationException");
+        } catch (CommandCreationException e) {
+            assertThat(e).hasMessageContaining("Asynchronous command methods do not support Timeout parameters");
+        }
+    }
+
+    @Test
+    public void syncWithTimeout() {
+
+        createCommand(createCommandMethod(MethodsWithTimeout.class, "sync", String.class, Timeout.class), new StringCodec(),
+                "hello", null);
+    }
+
+    private CommandMethod createCommandMethod(Class<?> commandInterface, String methodName, Class... args) {
+        return new CommandMethod(ReflectionUtils.findMethod(commandInterface, methodName, args));
+    }
+
+    private RedisCommand<?, ?, ?> createCommand(CommandMethod commandMethod, RedisCodec<?, ?> codec, Object... args) {
+
+        CommandSegmentFactory segmentFactory = new AnnotationCommandSegmentFactory();
+        CodecAwareOutputFactoryResolver outputFactoryResolver = new CodecAwareOutputFactoryResolver(
+                new OutputRegistryCommandOutputFactoryResolver(new OutputRegistry()), codec);
+        CommandSegmentCommandFactory factory = new CommandSegmentCommandFactory(
+                segmentFactory.createCommandSegments(commandMethod), commandMethod, (RedisCodec) codec, outputFactoryResolver);
+
+        return factory.createCommand(args);
+    }
+
+    @SuppressWarnings("unchecked")
+    private String toString(RedisCommand<?, ?, ?> command) {
+
+        StringBuilder builder = new StringBuilder();
+
+        builder.append(command.getType().name());
+
+        CommandArgs<?, ?> args = command.getArgs();
+        if (args != null) {
+            List<Object> argList = (List) ReflectionTestUtils.getField(args, "singularArguments");
+
+            for (Object o : argList) {
+                builder.append(' ').append(o);
+            }
+        }
+
+        return builder.toString();
+    }
+
+    interface Commands {
+
+        boolean set(String key, String value);
+
+        @Command("SET")
+        boolean set2(String key, @Value String value);
+
+        boolean set(String key, String value, SetArgs setArgs);
+
+        boolean clientSetname(String connectionName);
+
+        @Command("CLIENT SETNAME :connectionName")
+        boolean woohoo(@Param("connectionName") String connectionName);
+    }
+
+    static interface MethodsWithTimeout {
+
+        Future<String> async(String key, Timeout timeout);
+
+        String sync(String key, Timeout timeout);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
new file mode 100644
index 0000000000..9a92d801cc
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
@@ -0,0 +1,73 @@
+package com.lambdaworks.redis.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
+
+import java.lang.reflect.Method;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.reactivestreams.Publisher;
+
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.dynamic.domain.Timeout;
+import com.lambdaworks.redis.dynamic.output.CommandOutputFactory;
+import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
+import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory;
+import com.lambdaworks.redis.dynamic.segment.CommandSegments;
+import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
+import com.lambdaworks.redis.protocol.RedisCommand;
+
+/**
+ * @author Mark Paluch
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class ReactiveCommandSegmentCommandFactoryTest {
+
+    @Mock
+    private CommandOutputFactoryResolver outputFactoryResolver;
+
+    @Mock
+    private CommandOutputFactory commandOutputFactory;
+
+    @Before
+    public void before() {
+        when(outputFactoryResolver.resolveCommandOutput(any())).thenReturn(commandOutputFactory);
+    }
+
+    @Test
+    public void commandCreationWithTimeoutShouldFail() {
+
+        try {
+            createCommand("get", ReactiveWithTimeout.class, String.class, Timeout.class);
+            fail("Missing CommandCreationException");
+        } catch (CommandCreationException e) {
+            assertThat(e).hasMessageContaining("Reactive command methods do not support Timeout parameters");
+        }
+    }
+
+    protected RedisCommand<?, ?, ?> createCommand(String methodName, Class<?> interfaceClass, Class<?>... parameterTypes) {
+
+        Method method = ReflectionUtils.findMethod(interfaceClass, methodName, parameterTypes);
+
+        CommandMethod commandMethod = new CommandMethod(method);
+
+        AnnotationCommandSegmentFactory segmentFactory = new AnnotationCommandSegmentFactory();
+        CommandSegments commandSegments = segmentFactory.createCommandSegments(commandMethod);
+
+        ReactiveCommandSegmentCommandFactory<String, String> factory = new ReactiveCommandSegmentCommandFactory<>(
+                commandSegments, commandMethod, new StringCodec(), outputFactoryResolver);
+
+        return factory.createCommand(null);
+    }
+
+    static interface ReactiveWithTimeout {
+
+        Publisher<String> get(String key, Timeout timeout);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
new file mode 100644
index 0000000000..8edc71e071
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
@@ -0,0 +1,106 @@
+package com.lambdaworks.redis.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+import com.lambdaworks.redis.AbstractRedisClientTest;
+import com.lambdaworks.redis.dynamic.annotation.Command;
+import com.lambdaworks.redis.dynamic.domain.Timeout;
+
+import reactor.core.publisher.Mono;
+
+/**
+ * @author Mark Paluch
+ */
+public class RedisCommandsTest extends AbstractRedisClientTest {
+
+    @Test
+    public void sync() throws Exception {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        TestInterface api = factory.getCommands(TestInterface.class);
+
+        api.setSync("key", "value", Timeout.create(10, TimeUnit.SECONDS));
+        assertThat(api.get("key")).isEqualTo("value");
+        assertThat(api.getAsBytes("key")).isEqualTo("value".getBytes());
+    }
+
+    @Test
+    public void async() throws Exception {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        TestInterface api = factory.getCommands(TestInterface.class);
+
+        Future<String> key = api.set("key", "value");
+        assertThat(key).isInstanceOf(CompletableFuture.class);
+        key.get();
+    }
+
+    @Test
+    public void reactive() throws Exception {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        TestInterface api = factory.getCommands(TestInterface.class);
+
+        Mono<String> key = api.setReactive("key", "value");
+        assertThat(key.block()).isEqualTo("OK");
+    }
+
+    @Test
+    public void verifierShouldCatchBuggyDeclarations() throws Exception {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        try {
+            factory.getCommands(TooFewParameters.class);
+            fail("Missing CommandCreationException");
+        } catch (CommandCreationException e) {
+            assertThat(e).hasMessageContaining("Command GET accepts 1 parameters but method declares 0 parameter");
+        }
+
+        try {
+            factory.getCommands(WithTypo.class);
+            fail("Missing CommandCreationException");
+        } catch (CommandCreationException e) {
+            assertThat(e).hasMessageContaining("Command GAT does not exist.");
+        }
+
+    }
+
+    static interface TestInterface {
+
+        String get(String key);
+
+        @Command("GET")
+        byte[] getAsBytes(String key);
+
+        @Command("SET")
+        String setSync(String key, String value, Timeout timeout);
+
+        Future<String> set(String key, String value);
+
+        @Command("SET")
+        Mono<String> setReactive(String key, String value);
+    }
+
+    static interface TooFewParameters {
+
+        String get();
+
+    }
+
+    static interface WithTypo {
+
+        String gat(String key);
+
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java b/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java
new file mode 100644
index 0000000000..6c8d4a00f7
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java
@@ -0,0 +1,100 @@
+package com.lambdaworks.redis.dynamic.codec;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+
+import com.lambdaworks.redis.dynamic.CommandMethod;
+import org.junit.Test;
+
+import com.lambdaworks.redis.dynamic.annotation.Key;
+import com.lambdaworks.redis.dynamic.annotation.Value;
+import com.lambdaworks.redis.codec.ByteArrayCodec;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
+
+/**
+ * @author Mark Paluch
+ */
+public class AnnotationRedisCodecResolverTest {
+
+    private List<RedisCodec<?, ?>> codecs = Arrays.asList(new StringCodec(), new ByteArrayCodec());
+
+    @Test
+    public void shouldResolveFullyHinted() {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, "stringOnly", String.class, String.class);
+        RedisCodec<?, ?> codec = resolve(method);
+
+        assertThat(codec).isInstanceOf(StringCodec.class);
+    }
+
+    @Test
+    public void shouldResolveHintedKey() {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, "annotatedKey", String.class, String.class);
+        RedisCodec<?, ?> codec = resolve(method);
+
+        assertThat(codec).isInstanceOf(StringCodec.class);
+    }
+
+    @Test
+    public void shouldResolveHintedValue() {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, "annotatedValue", String.class, String.class);
+        RedisCodec<?, ?> codec = resolve(method);
+
+        assertThat(codec).isInstanceOf(StringCodec.class);
+    }
+
+    @Test
+    public void shouldResolveWithoutHints() {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, "nothingAnnotated", String.class, String.class);
+        RedisCodec<?, ?> codec = resolve(method);
+
+        assertThat(codec).isInstanceOf(StringCodec.class);
+    }
+
+    @Test
+    public void shouldResolveHintedByteArrayValue() {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, "annotatedByteArrayValue", String.class, byte[].class);
+        RedisCodec<?, ?> codec = resolve(method);
+
+        assertThat(codec).isInstanceOf(ByteArrayCodec.class);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void resolutionShouldFail() {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, "mixedTypes", String.class, byte[].class);
+        resolve(method);
+    }
+
+    protected RedisCodec<?, ?> resolve(Method method) {
+        CommandMethod commandMethod = new CommandMethod(method);
+        AnnotationRedisCodecResolver resolver = new AnnotationRedisCodecResolver(codecs);
+
+        return resolver.resolve(commandMethod);
+    }
+
+    private static interface CommandMethods {
+
+        String stringOnly(@Key String key, @Value String value);
+
+        String annotatedKey(@Key String key, String value);
+
+        String annotatedValue(String key, @Value String value);
+
+        String annotatedByteArrayValue(String key, @Value byte[] value);
+
+        String nothingAnnotated(String key, String value);
+
+        String mixedTypes(@Key String key, @Value byte[] value);
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java
new file mode 100644
index 0000000000..66e7024a3e
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java
@@ -0,0 +1,47 @@
+package com.lambdaworks.redis.dynamic.intercept;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+
+/**
+ * @author Mark Paluch
+ */
+public class InvocationProxyFactoryTest {
+
+    @Test
+    public void shouldDelegateCallsToInterceptor() {
+
+        InvocationProxyFactory factory = new InvocationProxyFactory();
+        factory.addInterface(MyInterface.class);
+        factory.addInterceptor(new ReturnTrueMethodInterceptor());
+
+        MyInterface myInterface = factory.createProxy(getClass().getClassLoader());
+
+        assertThat(myInterface.someMethod()).isTrue();
+    }
+
+    @Test
+    public void shouldNotFailWithoutFurtherInterceptors() {
+
+        InvocationProxyFactory factory = new InvocationProxyFactory();
+        factory.addInterface(MyInterface.class);
+
+        MyInterface myInterface = factory.createProxy(getClass().getClassLoader());
+
+        assertThat(myInterface.someMethod()).isNull();
+    }
+
+    private interface MyInterface {
+
+        Boolean someMethod();
+    }
+
+    private static class ReturnTrueMethodInterceptor implements MethodInterceptor {
+
+        @Override
+        public Object invoke(MethodInvocation invocation) {
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java b/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java
new file mode 100644
index 0000000000..b748fc4cb9
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java
@@ -0,0 +1,136 @@
+package com.lambdaworks.redis.dynamic.output;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.lang.reflect.Method;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Test;
+
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.dynamic.CommandMethod;
+import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
+import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
+import com.lambdaworks.redis.output.*;
+
+/**
+ * @author Mark Paluch
+ */
+public class CodecAwareOutputResolverTest {
+
+    private CodecAwareOutputFactoryResolver resolver = new CodecAwareOutputFactoryResolver(
+            new OutputRegistryCommandOutputFactoryResolver(new OutputRegistry()), new ByteBufferAndStringCodec());
+
+    @Test
+    public void shouldResolveValueOutput() {
+
+        CommandOutput<?, ?, ?> commandOutput = getCommandOutput("string");
+
+        assertThat(commandOutput).isInstanceOf(ValueOutput.class);
+    }
+
+    @Test
+    public void shouldDetermineKeyType() {
+
+        assertThat(resolver.isKeyType(ClassTypeInformation.from(String.class))).isFalse();
+        assertThat(resolver.isKeyType(ClassTypeInformation.from(ByteBuffer.class))).isTrue();
+    }
+
+    @Test
+    public void shouldDetermineValueType() {
+
+        assertThat(resolver.isValueType(ClassTypeInformation.from(String.class))).isTrue();
+        assertThat(resolver.isValueType(ClassTypeInformation.from(ByteBuffer.class))).isFalse();
+    }
+
+    @Test
+    public void shouldResolveValueListOutput() {
+
+        assertThat(getCommandOutput("stringList")).isOfAnyClassIn(ValueListOutput.class, StringListOutput.class);
+        assertThat(getCommandOutput("charSequenceList")).isOfAnyClassIn(ValueListOutput.class, StringListOutput.class);
+    }
+
+    @Test
+    public void shouldResolveKeyOutput() {
+
+        CommandOutput<?, ?, ?> commandOutput = getCommandOutput("byteBuffer");
+
+        assertThat(commandOutput).isInstanceOf(KeyOutput.class);
+    }
+
+    @Test
+    public void shouldResolveKeyListOutput() {
+
+        CommandOutput<?, ?, ?> commandOutput = getCommandOutput("byteBufferList");
+
+        assertThat(commandOutput).isInstanceOf(KeyListOutput.class);
+    }
+
+    @Test
+    public void shouldResolveListOfMapsOutput() {
+
+        CommandOutput<?, ?, ?> commandOutput = getCommandOutput("listOfMapsOutput");
+
+        assertThat(commandOutput).isInstanceOf(ListOfMapsOutput.class);
+    }
+
+    @Test
+    public void shouldResolveMapsOutput() {
+
+        CommandOutput<?, ?, ?> commandOutput = getCommandOutput("mapOutput");
+
+        assertThat(commandOutput).isInstanceOf(MapOutput.class);
+    }
+
+    protected CommandOutput<?, ?, ?> getCommandOutput(String methodName) {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, methodName);
+        CommandMethod commandMethod = new CommandMethod(method);
+
+        CommandOutputFactory factory = resolver.resolveCommandOutput(new OutputSelector(commandMethod.getActualReturnType()));
+
+        return factory.create(new ByteBufferAndStringCodec());
+    }
+
+    private static interface CommandMethods {
+
+        List<String> stringList();
+
+        List<CharSequence> charSequenceList();
+
+        List<ByteBuffer> byteBufferList();
+
+        List<Map<ByteBuffer, String>> listOfMapsOutput();
+
+        Map<ByteBuffer, String> mapOutput();
+
+        String string();
+
+        ByteBuffer byteBuffer();
+    }
+
+    private static class ByteBufferAndStringCodec implements RedisCodec<ByteBuffer, String> {
+
+        @Override
+        public ByteBuffer decodeKey(ByteBuffer bytes) {
+            return null;
+        }
+
+        @Override
+        public String decodeValue(ByteBuffer bytes) {
+            return null;
+        }
+
+        @Override
+        public ByteBuffer encodeKey(ByteBuffer key) {
+            return null;
+        }
+
+        @Override
+        public ByteBuffer encodeValue(String value) {
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java b/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
new file mode 100644
index 0000000000..3a0a6914d6
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
@@ -0,0 +1,129 @@
+package com.lambdaworks.redis.dynamic.output;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.lambdaworks.redis.GeoCoordinates;
+import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.dynamic.CommandMethod;
+import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
+import com.lambdaworks.redis.output.*;
+
+/**
+ * @author Mark Paluch
+ */
+public class OutputRegistryCommandOutputFactoryResolverTest {
+
+    private OutputRegistryCommandOutputFactoryResolver resolver = new OutputRegistryCommandOutputFactoryResolver(
+            new OutputRegistry());
+
+    @Test
+    public void shouldResolveStringListOutput() {
+
+        assertThat(getCommandOutput("stringList")).isInstanceOf(StringListOutput.class);
+        assertThat(getCommandOutput("stringIterable")).isInstanceOf(StringListOutput.class);
+    }
+
+    @Test
+    public void shouldResolveVoidOutput() {
+
+        assertThat(getCommandOutput("voidMethod")).isInstanceOf(VoidOutput.class);
+        assertThat(getCommandOutput("voidWrapper")).isInstanceOf(VoidOutput.class);
+    }
+
+    @Test
+    public void shouldResolveStringValueListOutput() {
+
+        CommandOutput<?, ?, ?> commandOutput = getCommandOutput("stringValueList");
+
+        assertThat(commandOutput).isInstanceOf(StringValueListOutput.class);
+    }
+
+    @Test
+    public void shouldResolveGeoCoordinatesValueOutput() {
+
+        CommandOutput<?, ?, ?> commandOutput = getCommandOutput("geoCoordinatesValueList");
+
+        assertThat(commandOutput).isInstanceOf(GeoCoordinatesValueListOutput.class);
+    }
+
+    @Test
+    public void shouldResolveByteArrayOutput() {
+
+        CommandOutput<?, ?, ?> commandOutput = getCommandOutput("bytes");
+
+        assertThat(commandOutput).isInstanceOf(ByteArrayOutput.class);
+    }
+
+    @Test
+    public void shouldResolveBooleanOutput() {
+
+        CommandOutput<?, ?, ?> commandOutput = getCommandOutput("bool");
+
+        assertThat(commandOutput).isInstanceOf(BooleanOutput.class);
+    }
+
+    @Test
+    public void shouldResolveBooleanWrappedOutput() {
+
+        CommandOutput<?, ?, ?> commandOutput = getCommandOutput("boolWrapper");
+
+        assertThat(commandOutput).isInstanceOf(BooleanOutput.class);
+    }
+
+    @Test
+    public void shouldResolveBooleanListOutput() {
+
+        CommandOutput<?, ?, ?> commandOutput = getCommandOutput("boolList");
+
+        assertThat(commandOutput).isInstanceOf(BooleanListOutput.class);
+    }
+
+    @Test
+    public void shouldResolveListOfMapsOutput() {
+
+        CommandOutput<?, ?, ?> commandOutput = getCommandOutput("listOfMapsOutput");
+
+        assertThat(commandOutput).isInstanceOf(ListOfMapsOutput.class);
+    }
+
+    protected CommandOutput<?, ?, ?> getCommandOutput(String methodName) {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, methodName);
+        CommandMethod commandMethod = new CommandMethod(method);
+
+        CommandOutputFactory factory = resolver.resolveCommandOutput(new OutputSelector(commandMethod.getActualReturnType()));
+
+        return factory.create(new StringCodec());
+    }
+
+    private static interface CommandMethods {
+
+        List<String> stringList();
+
+        Iterable<String> stringIterable();
+
+        List<Value<String>> stringValueList();
+
+        List<Value<GeoCoordinates>> geoCoordinatesValueList();
+
+        byte[] bytes();
+
+        boolean bool();
+
+        Boolean boolWrapper();
+
+        void voidMethod();
+
+        Void voidWrapper();
+
+        List<Boolean> boolList();
+
+        ListOfMapsOutput<?, ?> listOfMapsOutput();
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java
new file mode 100644
index 0000000000..eb7941f678
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java
@@ -0,0 +1,64 @@
+package com.lambdaworks.redis.dynamic.output;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
+import org.junit.Test;
+
+import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.dynamic.output.OutputRegistry.KeySurrogate;
+import com.lambdaworks.redis.output.GeoCoordinatesValueListOutput;
+import com.lambdaworks.redis.output.KeyListOutput;
+import com.lambdaworks.redis.output.StringListOutput;
+
+/**
+ * @author Mark Paluch
+ */
+public class OutputRegistryTest {
+
+    @Test
+    public void getStreamingType() throws Exception {
+
+        OutputType streamingType = OutputRegistry.getStreamingType(GeoCoordinatesValueListOutput.class);
+
+        assertThat(streamingType.getPrimaryType()).isEqualTo(Value.class);
+    }
+
+    @Test
+    public void getOutputComponentType() throws Exception {
+
+        OutputType outputComponentType = OutputRegistry.getOutputComponentType(GeoCoordinatesValueListOutput.class);
+
+        assertThat(outputComponentType.getPrimaryType()).isEqualTo(List.class);
+    }
+
+    @Test
+    public void getKeyStreamingType() throws Exception {
+
+        OutputRegistry.getStreamingType(KeyListOutput.class);
+        OutputType streamingType = OutputRegistry.getStreamingType(KeyListOutput.class);
+
+        assertThat(streamingType.getPrimaryType()).isEqualTo(KeySurrogate.class);
+    }
+
+    @Test
+    public void getKeyOutputType() throws Exception {
+
+        OutputType outputComponentType = OutputRegistry.getOutputComponentType(KeyListOutput.class);
+
+        assertThat(outputComponentType.getPrimaryType()).isEqualTo(KeySurrogate.class);
+        assertThat(outputComponentType.getTypeInformation().getComponentType().getType()).isEqualTo(Object.class);
+    }
+
+    @Test
+    public void getStringListOutputType() throws Exception {
+
+        OutputType outputComponentType = OutputRegistry.getOutputComponentType(StringListOutput.class);
+
+        assertThat(outputComponentType.getPrimaryType()).isEqualTo(List.class);
+        assertThat(outputComponentType.getTypeInformation().getComponentType())
+                .isEqualTo(ClassTypeInformation.from(String.class));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
new file mode 100644
index 0000000000..c8d1b6f5b7
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
@@ -0,0 +1,110 @@
+package com.lambdaworks.redis.dynamic.segment;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.lambdaworks.redis.dynamic.CommandMethod;
+import org.junit.Test;
+
+import com.lambdaworks.redis.dynamic.annotation.Command;
+import com.lambdaworks.redis.dynamic.annotation.CommandNaming;
+import com.lambdaworks.redis.dynamic.annotation.CommandNaming.LetterCase;
+import com.lambdaworks.redis.dynamic.annotation.CommandNaming.Strategy;
+import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
+
+/**
+ * @author Mark Paluch
+ */
+public class AnnotationCommandSegmentFactoryTest {
+
+    AnnotationCommandSegmentFactory factory = new AnnotationCommandSegmentFactory();
+
+    @Test
+    public void notAnnotatedDotAsIs() {
+
+        CommandMethod commandMethod = new CommandMethod(ReflectionUtils.findMethod(CommandMethods.class, "notAnnotated"));
+
+        CommandSegments commandSegments = factory.createCommandSegments(commandMethod);
+
+        assertThat(commandSegments).isEmpty();
+        assertThat(commandSegments.getCommandType().name()).isEqualTo("not.Annotated");
+    }
+
+    @Test
+    public void uppercaseDot() {
+
+        CommandMethod commandMethod = new CommandMethod(ReflectionUtils.findMethod(CommandMethods.class, "upperCase"));
+
+        CommandSegments commandSegments = factory.createCommandSegments(commandMethod);
+
+        assertThat(commandSegments).isEmpty();
+        assertThat(commandSegments.getCommandType().name()).isEqualTo("UPPER.CASE");
+    }
+
+    @Test
+    public void methodNameAsIs() {
+
+        CommandMethod commandMethod = new CommandMethod(ReflectionUtils.findMethod(CommandMethods.class, "methodName"));
+
+        CommandSegments commandSegments = factory.createCommandSegments(commandMethod);
+
+        assertThat(commandSegments).isEmpty();
+        assertThat(commandSegments.getCommandType().name()).isEqualTo("methodName");
+    }
+
+    @Test
+    public void splitAsIs() {
+
+        CommandMethod commandMethod = new CommandMethod(ReflectionUtils.findMethod(CommandMethods.class, "clientSetname"));
+
+        CommandSegments commandSegments = factory.createCommandSegments(commandMethod);
+
+        assertThat(commandSegments).hasSize(1).extracting(CommandSegment::asString).contains("Setname");
+        assertThat(commandSegments.getCommandType().name()).isEqualTo("client");
+    }
+
+    @Test
+    public void commandAnnotation() {
+
+        CommandMethod commandMethod = new CommandMethod(ReflectionUtils.findMethod(CommandMethods.class, "atCommand"));
+
+        CommandSegments commandSegments = factory.createCommandSegments(commandMethod);
+
+        assertThat(commandSegments).hasSize(1).extracting(CommandSegment::asString).contains("WORLD");
+        assertThat(commandSegments.getCommandType().name()).isEqualTo("HELLO");
+    }
+
+    @Test
+    public void splitDefault() {
+
+        CommandMethod commandMethod = new CommandMethod(ReflectionUtils.findMethod(Defaulted.class, "clientSetname"));
+
+        CommandSegments commandSegments = factory.createCommandSegments(commandMethod);
+
+        assertThat(commandSegments).hasSize(1).extracting(CommandSegment::asString).contains("SETNAME");
+        assertThat(commandSegments.getCommandType().name()).isEqualTo("CLIENT");
+    }
+
+    @CommandNaming(strategy = Strategy.DOT, letterCase = LetterCase.AS_IS)
+    private static interface CommandMethods {
+
+        void notAnnotated();
+
+        @CommandNaming(letterCase = LetterCase.UPPERCASE)
+        void upperCase();
+
+        @CommandNaming(strategy = Strategy.METHOD_NAME)
+        void methodName();
+
+        @CommandNaming(strategy = Strategy.SPLIT)
+        void clientSetname();
+
+        @Command("HELLO WORLD")
+        void atCommand();
+    }
+
+    private static interface Defaulted {
+
+        void clientSetname();
+    }
+
+}
\ No newline at end of file

From 95936712d47d8463eb374c6b5353b72d227ac07a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 24 Oct 2016 17:03:38 +0200
Subject: [PATCH 057/808] Support lettuce parameter types #381

Add support for built-in parameter types:

* ScoredValue, Value and KeyValue
* Limit, Range (numeric)
* GeoCoordinates
---
 .../com/lambdaworks/redis/GeoCoordinates.java |  12 ++
 .../java/com/lambdaworks/redis/Range.java     |   6 +
 .../CodecAwareMethodParametersAccessor.java   |   5 +
 .../redis/dynamic/CommandMethodVerifier.java  |  31 ++-
 .../DefaultMethodParametersAccessor.java      |  21 +-
 .../redis/dynamic/ParameterBinder.java        | 119 +++++++++++-
 .../redis/dynamic/domain/FlushMode.java       |   8 -
 .../ExecutionSpecificParameters.java          |  14 +-
 .../parameter/MethodParametersAccessor.java   |  29 ++-
 .../redis/dynamic/parameter/Parameters.java   |   5 +
 .../redis/protocol/CommandArgs.java           |  14 +-
 .../dynamic/CommandMethodVerifierTest.java    |  16 +-
 .../CommandSegmentCommandFactoryTest.java     |  12 +-
 .../redis/dynamic/ParameterBinderTest.java    | 181 ++++++++++++++++++
 14 files changed, 421 insertions(+), 52 deletions(-)
 delete mode 100644 src/main/java/com/lambdaworks/redis/dynamic/domain/FlushMode.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java

diff --git a/src/main/java/com/lambdaworks/redis/GeoCoordinates.java b/src/main/java/com/lambdaworks/redis/GeoCoordinates.java
index 4be9bc549a..6c600a9f25 100644
--- a/src/main/java/com/lambdaworks/redis/GeoCoordinates.java
+++ b/src/main/java/com/lambdaworks/redis/GeoCoordinates.java
@@ -14,6 +14,7 @@ public class GeoCoordinates {
 
     /**
      * Creates new {@link GeoCoordinates}.
+     * 
      * @param x the longitude, must not be {@literal null}.
      * @param y the latitude, must not be {@literal null}.
      */
@@ -26,6 +27,17 @@ public GeoCoordinates(Number x, Number y) {
         this.y = y;
     }
 
+    /**
+     * Creates new {@link GeoCoordinates}.
+     * 
+     * @param x the longitude, must not be {@literal null}.
+     * @param y the latitude, must not be {@literal null}.
+     * @return {@literal {@link GeoCoordinates}.
+     */
+    public static GeoCoordinates create(Number x, Number y) {
+        return new GeoCoordinates(x, y);
+    }
+
     /**
      *
      * @return the longitude.
diff --git a/src/main/java/com/lambdaworks/redis/Range.java b/src/main/java/com/lambdaworks/redis/Range.java
index 05173a0a42..765c8a3cbd 100644
--- a/src/main/java/com/lambdaworks/redis/Range.java
+++ b/src/main/java/com/lambdaworks/redis/Range.java
@@ -32,6 +32,12 @@ private Range(Boundary<T> lower, Boundary<T> upper) {
      * @return new {@link Range}
      */
     public static <T> Range<T> create(T lower, T upper) {
+
+        LettuceAssert.isTrue(!(lower instanceof Boundary),
+                "Lower must not be a Boundary. Use #from(Boundary, Boundary) instead");
+        LettuceAssert.isTrue(!(upper instanceof Boundary),
+                "Upper must not be a Boundary. Use #from(Boundary, Boundary) instead");
+
         return new Range<T>(Boundary.including(lower), Boundary.including(upper));
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java b/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java
index 0dfc7183aa..653fe7630c 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java
@@ -90,4 +90,9 @@ public Iterator<Object> iterator() {
     public int resolveParameterIndex(String name) {
         return delegate.resolveParameterIndex(name);
     }
+
+    @Override
+    public boolean isBindableNullValue(int index) {
+        return delegate.isBindableNullValue(index);
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
index 9ee5ee7784..fcf2c8c12e 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
@@ -5,7 +5,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.LettuceStrings;
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.dynamic.parameter.Parameter;
 import com.lambdaworks.redis.dynamic.segment.CommandSegments;
 import com.lambdaworks.redis.internal.LettuceAssert;
@@ -60,7 +60,7 @@ private void validateParameters(CommandDetail commandDetail, CommandSegments com
 
         List<? extends Parameter> bindableParameters = commandMethod.getParameters().getBindableParameters();
 
-        int availableParameterCount = bindableParameters.size() + commandSegments.size();
+        int availableParameterCount = calculateAvailableParameterCount(commandSegments, bindableParameters);
 
         // exact parameter count
         if (commandDetail.getArity() - 1 == availableParameterCount) {
@@ -94,6 +94,31 @@ private void validateParameters(CommandDetail commandDetail, CommandSegments com
         throw new CommandMethodSyntaxException(commandMethod, message);
     }
 
+    private int calculateAvailableParameterCount(CommandSegments commandSegments,
+            List<? extends Parameter> bindableParameters) {
+
+        int count = commandSegments.size();
+
+        for (Parameter bindableParameter : bindableParameters) {
+
+            if (bindableParameter.isAssignableTo(KeyValue.class) || bindableParameter.isAssignableTo(ScoredValue.class)) {
+                count++;
+            }
+
+            if (bindableParameter.isAssignableTo(GeoCoordinates.class) || bindableParameter.isAssignableTo(Range.class)) {
+                count++;
+            }
+
+            if (bindableParameter.isAssignableTo(Limit.class)) {
+                count += 2;
+            }
+
+            count++;
+        }
+
+        return count;
+    }
+
     private CommandMethodSyntaxException syntaxException(String commandName, CommandMethod commandMethod) {
 
         CommandMatches commandMatches = CommandMatches.forCommand(commandName, commandDetails);
@@ -131,7 +156,7 @@ private static List<String> calculateMatches(String command, List<CommandDetail>
                             command.toLowerCase()) <= DEFAULT_MAX_DISTANCE)
                     .map(CommandDetail::getName) //
                     .map(String::toUpperCase) //
-                    .sorted((o1, o2) -> calculateStringDistance(o1, o2)).collect(Collectors.toList());
+                    .sorted(CommandMatches::calculateStringDistance).collect(Collectors.toList());
         }
 
         public boolean hasMatches() {
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java b/src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java
index d6c07070e7..4f1370a502 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java
@@ -4,6 +4,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.dynamic.annotation.Key;
 import com.lambdaworks.redis.dynamic.annotation.Value;
 import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
@@ -22,11 +23,13 @@ class DefaultMethodParametersAccessor implements MethodParametersAccessor {
     private final Parameters parameters;
     private final List<Object> values;
 
-    public DefaultMethodParametersAccessor(Parameters parameters, Object[] values) {
+    public DefaultMethodParametersAccessor(Parameters parameters, Object... values) {
+
+        LettuceAssert.notNull(parameters, "Parameters must not be null");
+        LettuceAssert.notNull(values, "Values must not be null");
 
         this.parameters = parameters;
         this.values = Arrays.asList(values);
-
     }
 
     public int getParameterCount() {
@@ -71,6 +74,20 @@ public Parameters getParameters() {
         return parameters;
     }
 
+    @Override
+    public boolean isBindableNullValue(int index) {
+
+        Parameter bindableParameter = parameters.getBindableParameter(index);
+
+        if (bindableParameter.isAssignableTo(Limit.class) || bindableParameter.isAssignableTo(com.lambdaworks.redis.Value.class)
+                || bindableParameter.isAssignableTo(KeyValue.class) || bindableParameter.isAssignableTo(ScoredValue.class)
+                || bindableParameter.isAssignableTo(GeoCoordinates.class) || bindableParameter.isAssignableTo(Range.class)) {
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * Iterator class to allow traversing all bindable parameters inside the accessor.
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java b/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
index ef9cc7980b..39ba93b877 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
@@ -1,10 +1,12 @@
 package com.lambdaworks.redis.dynamic;
 
+import static com.lambdaworks.redis.protocol.CommandKeyword.LIMIT;
+
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.lambdaworks.redis.CompositeArgument;
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
 import com.lambdaworks.redis.dynamic.segment.CommandSegment;
 import com.lambdaworks.redis.dynamic.segment.CommandSegment.ArgumentContribution;
@@ -20,6 +22,9 @@
  */
 class ParameterBinder {
 
+    private static final byte[] MINUS_BYTES = { '-' };
+    private static final byte[] PLUS_BYTES = { '+' };
+
     /**
      * Bind {@link CommandSegments} and method parameters to {@link CommandArgs}.
      * 
@@ -63,11 +68,16 @@ <K, V> CommandArgs<K, V> bind(CommandArgs<K, V> args, CommandSegments commandSeg
     private <K, V> void bind(CommandArgs<K, V> args, Object argument, int index, MethodParametersAccessor accessor) {
 
         if (argument == null) {
-            args.add(new byte[0]);
+
+            if (accessor.isBindableNullValue(index)) {
+                args.add(new byte[0]);
+            }
+
             return;
         }
 
         if (index != -1) {
+
             if (accessor.isKey(index)) {
 
                 if (argument instanceof Iterable) {
@@ -80,6 +90,10 @@ private <K, V> void bind(CommandArgs<K, V> args, Object argument, int index, Met
 
             if (accessor.isValue(index)) {
 
+                if (argument instanceof Range) {
+                    throw new UnsupportedOperationException("Value Range is not supported.");
+                }
+
                 if (argument instanceof Iterable) {
                     args.addValues((Iterable<V>) argument);
                 } else {
@@ -113,8 +127,109 @@ private <K, V> void bind(CommandArgs<K, V> args, Object argument, int index, Met
             return;
         }
 
+        if (argument instanceof ScoredValue) {
+
+            ScoredValue<V> scoredValue = (ScoredValue<V>) argument;
+            V value = scoredValue.getValueOrElseThrow(
+                    () -> new IllegalArgumentException("Cannot bind empty ScoredValue to a Redis command."));
+
+            args.add(scoredValue.getScore());
+            args.addValue(value);
+            return;
+        }
+
+        if (argument instanceof KeyValue) {
+
+            KeyValue<K, V> keyValue = (KeyValue<K, V>) argument;
+            V value = keyValue
+                    .getValueOrElseThrow(() -> new IllegalArgumentException("Cannot bind empty KeyValue to a Redis command."));
+
+            args.addKey(keyValue.getKey());
+            args.addValue(value);
+            return;
+        }
+
+        if (argument instanceof Value) {
+
+            Value<V> valueWrapper = (Value<V>) argument;
+            V value = valueWrapper
+                    .getValueOrElseThrow(() -> new IllegalArgumentException("Cannot bind empty Value to a Redis command."));
+
+            args.addValue(value);
+            return;
+        }
+
+        if (argument instanceof Limit) {
+
+            Limit limit = (Limit) argument;
+            args.add(LIMIT);
+            args.add(limit.getOffset());
+            args.add(limit.getCount());
+            return;
+        }
+
+        if (argument instanceof Range) {
+
+            Range<?> range = (Range<?>) argument;
+
+            if (range.getLower().getValue() != null && !(range.getLower().getValue() instanceof Number)) {
+                throw new IllegalArgumentException(
+                        "Cannot bind non-numeric lower range value for a numeric Range. Annotate with @Value if the Range contains a value range.");
+            }
+
+            if (range.getUpper().getValue() != null && !(range.getUpper().getValue() instanceof Number)) {
+                throw new IllegalArgumentException(
+                        "Cannot bind non-numeric upper range value for a numeric Range. Annotate with @Value if the Range contains a value range.");
+            }
+
+            args.add(min((Range) range));
+            args.add(max((Range) range));
+
+            return;
+        }
+
+        if (argument instanceof GeoCoordinates) {
+
+            GeoCoordinates coordinates = (GeoCoordinates) argument;
+            args.add(coordinates.getX().doubleValue());
+            args.add(coordinates.getY().doubleValue());
+            return;
+        }
+
         if (argument instanceof CompositeArgument) {
             ((CompositeArgument) argument).build(args);
         }
     }
+
+    private String min(Range<? extends Number> range) {
+
+        Range.Boundary<? extends Number> lower = range.getLower();
+
+        if (lower.getValue() == null
+                || lower.getValue() instanceof Double && lower.getValue().doubleValue() == Double.NEGATIVE_INFINITY) {
+            return "-inf";
+        }
+
+        if (!lower.isIncluding()) {
+            return "(" + lower.getValue();
+        }
+
+        return lower.getValue().toString();
+    }
+
+    private String max(Range<? extends Number> range) {
+
+        Range.Boundary<? extends Number> upper = range.getUpper();
+
+        if (upper.getValue() == null
+                || upper.getValue() instanceof Double && upper.getValue().doubleValue() == Double.POSITIVE_INFINITY) {
+            return "+inf";
+        }
+
+        if (!upper.isIncluding()) {
+            return "(" + upper.getValue();
+        }
+
+        return upper.getValue().toString();
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/domain/FlushMode.java b/src/main/java/com/lambdaworks/redis/dynamic/domain/FlushMode.java
deleted file mode 100644
index d55881ee75..0000000000
--- a/src/main/java/com/lambdaworks/redis/dynamic/domain/FlushMode.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.lambdaworks.redis.dynamic.domain;
-
-/**
- * @author Mark Paluch
- */
-public enum FlushMode {
-    DEFAULT, ENQUEUE, FLUSH;
-}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java
index c5ff8b6ab1..0d005d5c93 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java
@@ -4,7 +4,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import com.lambdaworks.redis.dynamic.domain.FlushMode;
 import com.lambdaworks.redis.dynamic.domain.Timeout;
 
 /**
@@ -17,9 +16,8 @@
  */
 public class ExecutionSpecificParameters extends Parameters<ExecutionSpecificParameters.ExecutionAwareParameter> {
 
-    private static final List<Class<?>> TYPES = Arrays.asList(FlushMode.class, Timeout.class);
+    private static final List<Class<?>> TYPES = Arrays.asList(Timeout.class);
 
-    private final int flushModeIndex;
     private final int timeoutIndex;
 
     /**
@@ -31,7 +29,6 @@ public ExecutionSpecificParameters(Method method) {
 
         super(method);
 
-        int flushModeIndex = -1;
         int timeoutIndex = -1;
 
         List<ExecutionAwareParameter> parameters = getParameters();
@@ -44,21 +41,12 @@ public ExecutionSpecificParameters(Method method) {
                 if (methodParameter.isAssignableTo(Timeout.class)) {
                     timeoutIndex = i;
                 }
-
-                if (methodParameter.isAssignableTo(FlushMode.class)) {
-                    flushModeIndex = i;
-                }
             }
         }
 
-        this.flushModeIndex = flushModeIndex;
         this.timeoutIndex = timeoutIndex;
     }
 
-    public int getFlushModeIndex() {
-        return flushModeIndex;
-    }
-
     public int getTimeoutIndex() {
         return timeoutIndex;
     }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/MethodParametersAccessor.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/MethodParametersAccessor.java
index 303763b187..b6ee14a87b 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/MethodParametersAccessor.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/parameter/MethodParametersAccessor.java
@@ -1,10 +1,9 @@
 package com.lambdaworks.redis.dynamic.parameter;
 
-import com.lambdaworks.redis.dynamic.domain.FlushMode;
-import com.lambdaworks.redis.dynamic.domain.Timeout;
-
 import java.util.Iterator;
 
+import com.lambdaworks.redis.dynamic.domain.Timeout;
+
 /**
  * Accessor interface to method parameters during the actual invocation.
  * 
@@ -19,32 +18,32 @@ public interface MethodParametersAccessor {
     int getParameterCount();
 
     /**
-     * Returns the bindable value with the given index. Bindable means, that {@link FlushMode} and {@link Timeout} values are
-     * skipped without noticed in the index. For a method signature taking {@link String}, {@link Timeout} , {@link String},
+     * Returns the bindable value with the given index. Bindable means, that {@link Timeout} values are skipped without noticed
+     * in the index. For a method signature taking {@link String}, {@link Timeout} , {@link String},
      * {@code #getBindableParameter(1)} would return the second {@link String} value.
      *
-     * @param index
+     * @param index parameter index.
      * @return the bindable value.
      */
     Object getBindableValue(int index);
 
     /**
      *
-     * @param index
+     * @param index parameter index.
      * @return {@literal true} if the parameter at {@code index} is a key.
      */
     boolean isKey(int index);
 
     /**
      *
-     * @param index
+     * @param index parameter index.
      * @return {@literal true} if the parameter at {@code index} is a value.
      */
     boolean isValue(int index);
 
     /**
-     * Returns an iterator over all <em>bindable</em> parameters. This means parameters implementing {@link Timeout} or
-     * {@link FlushMode} will not be included in this {@link Iterator}.
+     * Returns an iterator over all <em>bindable</em> parameters. This means parameters assignable to {@link Timeout} will not
+     * be included in this {@link Iterator}.
      *
      * @return
      */
@@ -57,4 +56,14 @@ public interface MethodParametersAccessor {
      * @return
      */
     int resolveParameterIndex(String name);
+
+    /**
+     * Return {@literal true} if the parameter at {@code index} is a bindable {@literal null} value that requires a
+     * {@literal null} value instead of being skipped.
+     * 
+     * @param index parameter index.
+     * @return {@literal true} if the parameter at {@code index} is a bindable {@literal null} value that requires a
+     *         {@literal null} value instead of being skipped.
+     */
+    boolean isBindableNullValue(int index);
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java
index 1ff3a8a515..81d4019462 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java
@@ -1,5 +1,7 @@
 package com.lambdaworks.redis.dynamic.parameter;
 
+import com.lambdaworks.redis.internal.LettuceAssert;
+
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -22,6 +24,8 @@ public abstract class Parameters<P extends Parameter> implements Iterable<P> {
      */
     public Parameters(Method method) {
 
+        LettuceAssert.notNull(method, "Method must not be null");
+
         this.parameters = new ArrayList<>(method.getParameterCount());
 
         for (int i = 0; i < method.getParameterCount(); i++) {
@@ -89,4 +93,5 @@ public List<P> getBindableParameters() {
     public Iterator<P> iterator() {
         return getBindableParameters().iterator();
     }
+
 }
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java b/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
index 5a40e69e28..edbc8e8b26 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.lambdaworks.redis.LettuceStrings;
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.codec.StringCodec;
@@ -240,7 +241,7 @@ public CommandArgs<K, V> add(byte[] value) {
     public CommandArgs<K, V> add(CommandKeyword keyword) {
 
         LettuceAssert.notNull(keyword, "CommandKeyword must not be null");
-        return add(keyword.bytes);
+        return add((ProtocolKeyword) keyword);
     }
 
     /**
@@ -286,6 +287,17 @@ public String toString() {
         return sb.toString();
     }
 
+    /**
+     * Returns a command string representation of {@link CommandArgs} with annotated key and value parameters.
+     *
+     * {@code args.addKey("mykey").add(2.0)} will return {@code key<mykey> 2.0}.
+     * 
+     * @return the command string representation.
+     */
+    public String toCommandString() {
+        return LettuceStrings.collectionToDelimitedString(singularArguments, " ", "", "");
+    }
+
     /**
      * Returns the first integer argument.
      * 
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java b/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java
index 6a18e9c9d4..ff30f8f367 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java
@@ -6,6 +6,8 @@
 import java.lang.reflect.Method;
 import java.util.Arrays;
 
+import com.lambdaworks.redis.GeoCoordinates;
+import com.lambdaworks.redis.KeyValue;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -28,8 +30,10 @@ public void before() {
         CommandDetail mget = new CommandDetail("mget", -2, null, 0, 0, 0);
         CommandDetail randomkey = new CommandDetail("randomkey", 1, null, 0, 0, 0);
         CommandDetail rpop = new CommandDetail("rpop", 2, null, 0, 0, 0);
+        CommandDetail set = new CommandDetail("set", 3, null, 0, 0, 0);
+        CommandDetail geoadd = new CommandDetail("geoadd", -4, null, 0, 0, 0);
 
-        sut = new CommandMethodVerifier(LettuceLists.newList(mget, randomkey, rpop));
+        sut = new CommandMethodVerifier(LettuceLists.newList(mget, randomkey, rpop, set, geoadd));
     }
 
     @Test
@@ -39,7 +43,7 @@ public void misspelledName() {
             validateMethod("megt");
             fail("Missing CommandMethodSyntaxException");
         } catch (CommandMethodSyntaxException e) {
-            assertThat(e).hasMessageContaining("Command megt does not exist. Did you mean: MGET?");
+            assertThat(e).hasMessageContaining("Command megt does not exist. Did you mean: MGET, SET?");
         }
     }
 
@@ -61,6 +65,8 @@ public void shouldPassWithCorrectParameterCount() {
         validateMethod("mget", String.class);
         validateMethod("randomkey");
         validateMethod("rpop", String.class);
+        validateMethod("set", KeyValue.class);
+        validateMethod("geoadd", String.class, String.class, GeoCoordinates.class);
     }
 
     @Test
@@ -103,6 +109,10 @@ static interface MyInterface {
 
         void mget(String key1, String key2);
 
+        void set(KeyValue<String, String> keyValue);
+
+        void geoadd(String key, String member, GeoCoordinates geoCoordinates);
+
         void randomkey();
 
         void randomkey(String key);
@@ -111,4 +121,4 @@ static interface MyInterface {
 
         void rpop(String key1, String key2);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
index 5e07d53479..8db13a0301 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
@@ -126,15 +126,7 @@ private String toString(RedisCommand<?, ?, ?> command) {
         StringBuilder builder = new StringBuilder();
 
         builder.append(command.getType().name());
-
-        CommandArgs<?, ?> args = command.getArgs();
-        if (args != null) {
-            List<Object> argList = (List) ReflectionTestUtils.getField(args, "singularArguments");
-
-            for (Object o : argList) {
-                builder.append(' ').append(o);
-            }
-        }
+        builder.append(' ').append(command.getArgs().toCommandString());
 
         return builder.toString();
     }
@@ -160,4 +152,4 @@ static interface MethodsWithTimeout {
 
         String sync(String key, Timeout timeout);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
new file mode 100644
index 0000000000..35136798ef
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
@@ -0,0 +1,181 @@
+package com.lambdaworks.redis.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Collections;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.util.Base64Utils;
+import org.springframework.util.ReflectionUtils;
+
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.dynamic.segment.CommandSegment;
+import com.lambdaworks.redis.dynamic.segment.CommandSegments;
+import com.lambdaworks.redis.protocol.CommandArgs;
+import com.lambdaworks.redis.protocol.CommandType;
+
+/**
+ * @author Mark Paluch
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class ParameterBinderTest {
+
+    private ParameterBinder binder = new ParameterBinder();
+    private CommandSegments segments = new CommandSegments(Collections.singletonList(CommandSegment.constant("set")));
+
+    @Test
+    public void bindsNullValueAsEmptyByteArray() {
+
+        CommandArgs<String, String> args = bind(null);
+
+        assertThat(args.toCommandString()).isEqualTo("");
+    }
+
+    @Test
+    public void bindsStringCorrectly() {
+
+        CommandArgs<String, String> args = bind("string");
+
+        assertThat(args.toCommandString()).isEqualTo("string");
+    }
+
+    @Test
+    public void bindsValueCorrectly() {
+
+        CommandArgs<String, String> args = bind(Value.just("string"));
+
+        assertThat(args.toCommandString()).isEqualTo("value<string>");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void rejectsEmptyValue() {
+        bind(Value.empty());
+    }
+
+    @Test
+    public void bindsKeyValueCorrectly() {
+
+        CommandArgs<String, String> args = bind(KeyValue.just("mykey", "string"));
+
+        assertThat(args.toCommandString()).isEqualTo("key<mykey> value<string>");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void rejectsEmptyKeyValue() {
+        bind(KeyValue.empty());
+    }
+
+    @Test
+    public void bindsScoredValueCorrectly() {
+
+        CommandArgs<String, String> args = bind(ScoredValue.just(20, "string"));
+
+        assertThat(args.toCommandString()).isEqualTo("20.0 value<string>");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void rejectsEmptyScoredValue() {
+        bind(ScoredValue.empty());
+    }
+
+    @Test
+    public void bindsLimitCorrectly() {
+
+        CommandArgs<String, String> args = bind(Limit.create(10, 100));
+
+        assertThat(args.toCommandString()).isEqualTo("TElNSVQ= 10 100");
+    }
+
+    @Test
+    public void bindsRangeCorrectly() {
+
+        CommandArgs<String, String> args = bind(Range.from(Range.Boundary.including(10), Range.Boundary.excluding(15)));
+
+        assertThat(args.toCommandString()).isEqualTo("10 (15");
+    }
+
+    @Test
+    public void bindsUnboundedRangeCorrectly() {
+
+        CommandArgs<String, String> args = bind(Range.unbounded());
+
+        assertThat(args.toCommandString()).isEqualTo("-inf +inf");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void rejectsStringLowerValue() {
+        bind(Range.from(Range.Boundary.including("hello"), Range.Boundary.excluding(15)));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void rejectsStringUpperValue() {
+        bind(Range.from(Range.Boundary.including(11), Range.Boundary.excluding("hello")));
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void bindsValueRangeCorrectly() {
+
+        CommandMethod commandMethod = new CommandMethod(
+                ReflectionUtils.findMethod(MyCommands.class, "someMethod", Range.class));
+
+        CommandArgs<String, String> args = bind(commandMethod,
+                Range.from(Range.Boundary.including("lower"), Range.Boundary.excluding("upper")));
+
+        assertThat(args.toCommandString()).isEqualTo(String.format("%s %s", Base64Utils.encodeToString("[lower".getBytes()),
+                Base64Utils.encodeToString("(upper".getBytes())));
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void bindsUnboundedValueRangeCorrectly() {
+
+        CommandMethod commandMethod = new CommandMethod(
+                ReflectionUtils.findMethod(MyCommands.class, "someMethod", Range.class));
+
+        CommandArgs<String, String> args = bind(commandMethod, Range.unbounded());
+
+        assertThat(args.toCommandString()).isEqualTo(
+                String.format("%s %s", Base64Utils.encodeToString("-".getBytes()), Base64Utils.encodeToString("+".getBytes())));
+    }
+
+    @Test
+    public void bindsGeoCoordinatesCorrectly() {
+
+        CommandArgs<String, String> args = bind(new GeoCoordinates(100, 200));
+
+        assertThat(args.toCommandString()).isEqualTo("100.0 200.0");
+    }
+
+    @Test
+    public void bindsProtocolKeywordCorrectly() {
+
+        CommandArgs<String, String> args = bind(CommandType.LINDEX);
+
+        assertThat(args.toCommandString()).isEqualTo(Base64Utils.encodeToString("LINDEX".getBytes()));
+    }
+
+    private CommandArgs<String, String> bind(Object object) {
+        CommandMethod commandMethod = new CommandMethod(
+                ReflectionUtils.findMethod(MyCommands.class, "someMethod", Object.class));
+        return bind(commandMethod, object);
+    }
+
+    private CommandArgs<String, String> bind(CommandMethod commandMethod, Object object) {
+        DefaultMethodParametersAccessor parametersAccessor = new DefaultMethodParametersAccessor(commandMethod.getParameters(),
+                object);
+
+        CommandArgs<String, String> args = new CommandArgs<>(new StringCodec());
+        binder.bind(args, segments, parametersAccessor);
+
+        return args;
+    }
+
+    private interface MyCommands {
+
+        void someMethod(Object object);
+
+        void someMethod(@com.lambdaworks.redis.dynamic.annotation.Value Range<String> value);
+    }
+}

From 7599817d02b5151b94474e5f8d5f38bb1d44f957 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 26 Oct 2016 17:54:05 +0200
Subject: [PATCH 058/808] Update license/author headers #387

---
 .../java/com/lambdaworks/codec/Base16.java    | 17 +++++++++++++--
 .../java/com/lambdaworks/codec/CRC16.java     | 15 +++++++++++++
 .../com/lambdaworks/codec/package-info.java   |  2 +-
 .../redis/AbstractRedisAsyncCommands.java     | 17 +++++++++++++--
 .../redis/AbstractRedisClient.java            | 15 +++++++++++++
 .../redis/AbstractRedisReactiveCommands.java  | 15 +++++++++++++
 .../lambdaworks/redis/BackpressureUtils.java  | 17 ++++++++++++++-
 .../com/lambdaworks/redis/BitFieldArgs.java   | 15 +++++++++++++
 .../redis/ChannelGroupListener.java           | 17 +++++++++++++--
 .../com/lambdaworks/redis/ClientOptions.java  | 15 +++++++++++++
 .../com/lambdaworks/redis/CloseEvents.java    | 15 +++++++++++++
 .../lambdaworks/redis/CompositeArgument.java  | 15 +++++++++++++
 .../lambdaworks/redis/ConnectionBuilder.java  | 15 +++++++++++++
 .../redis/ConnectionEventTrigger.java         | 15 +++++++++++++
 .../lambdaworks/redis/ConnectionEvents.java   | 15 +++++++++++++
 .../com/lambdaworks/redis/ConnectionId.java   | 15 +++++++++++++
 .../lambdaworks/redis/ConnectionPoint.java    | 15 +++++++++++++
 .../com/lambdaworks/redis/EpollProvider.java  | 15 +++++++++++++
 .../redis/FutureSyncInvocationHandler.java    | 15 +++++++++++++
 .../java/com/lambdaworks/redis/GeoArgs.java   | 15 +++++++++++++
 .../com/lambdaworks/redis/GeoCoordinates.java | 15 +++++++++++++
 .../lambdaworks/redis/GeoRadiusStoreArgs.java | 15 +++++++++++++
 .../java/com/lambdaworks/redis/GeoWithin.java | 15 +++++++++++++
 .../com/lambdaworks/redis/JavaRuntime.java    | 15 +++++++++++++
 .../com/lambdaworks/redis/KeyScanCursor.java  | 15 +++++++++++++
 .../java/com/lambdaworks/redis/KeyValue.java  | 15 +++++++++++++
 .../java/com/lambdaworks/redis/KillArgs.java  | 15 +++++++++++++
 .../com/lambdaworks/redis/LettuceFutures.java | 15 +++++++++++++
 .../com/lambdaworks/redis/LettuceStrings.java | 15 +++++++++++++
 .../java/com/lambdaworks/redis/Limit.java     | 15 +++++++++++++
 .../com/lambdaworks/redis/MapScanCursor.java  | 15 +++++++++++++
 .../com/lambdaworks/redis/MigrateArgs.java    | 15 +++++++++++++
 .../redis/PlainChannelInitializer.java        | 15 +++++++++++++
 .../java/com/lambdaworks/redis/Range.java     | 15 +++++++++++++
 .../java/com/lambdaworks/redis/ReadFrom.java  | 15 +++++++++++++
 .../com/lambdaworks/redis/ReadFromImpl.java   | 15 +++++++++++++
 .../redis/RedisAsyncCommandsImpl.java         | 17 +++++++++++++--
 .../redis/RedisChannelHandler.java            | 15 +++++++++++++
 .../redis/RedisChannelInitializer.java        | 15 +++++++++++++
 .../redis/RedisChannelInitializerImpl.java    | 15 +++++++++++++
 .../lambdaworks/redis/RedisChannelWriter.java | 15 +++++++++++++
 .../com/lambdaworks/redis/RedisClient.java    | 17 +++++++++++++--
 .../redis/RedisCommandBuilder.java            | 15 +++++++++++++
 .../redis/RedisCommandExecutionException.java | 15 +++++++++++++
 .../RedisCommandInterruptedException.java     | 17 +++++++++++++--
 .../redis/RedisCommandTimeoutException.java   | 15 +++++++++++++
 .../redis/RedisConnectionException.java       | 15 +++++++++++++
 .../redis/RedisConnectionStateListener.java   | 18 ++++++++++++++--
 .../com/lambdaworks/redis/RedisException.java | 17 +++++++++++++--
 .../com/lambdaworks/redis/RedisFuture.java    | 15 +++++++++++++
 .../com/lambdaworks/redis/RedisPublisher.java | 15 +++++++++++++
 .../redis/RedisReactiveCommandsImpl.java      | 15 +++++++++++++
 .../java/com/lambdaworks/redis/RedisURI.java  | 15 +++++++++++++
 .../java/com/lambdaworks/redis/ScanArgs.java  | 15 +++++++++++++
 .../com/lambdaworks/redis/ScanCursor.java     | 15 +++++++++++++
 .../com/lambdaworks/redis/ScoredValue.java    | 15 +++++++++++++
 .../redis/ScoredValueScanCursor.java          | 15 +++++++++++++
 .../lambdaworks/redis/ScriptOutputType.java   | 17 +++++++++++++--
 .../java/com/lambdaworks/redis/SetArgs.java   | 19 ++++++++++++++---
 .../com/lambdaworks/redis/SocketOptions.java  | 15 +++++++++++++
 .../java/com/lambdaworks/redis/SortArgs.java  | 17 +++++++++++++--
 .../redis/SslConnectionBuilder.java           | 15 +++++++++++++
 .../com/lambdaworks/redis/SslOptions.java     | 15 +++++++++++++
 .../redis/StatefulRedisConnectionImpl.java    | 15 +++++++++++++
 .../lambdaworks/redis/StreamScanCursor.java   | 15 +++++++++++++
 .../lambdaworks/redis/TransactionResult.java  | 15 +++++++++++++
 .../java/com/lambdaworks/redis/Value.java     | 15 +++++++++++++
 .../lambdaworks/redis/ValueScanCursor.java    | 15 +++++++++++++
 .../java/com/lambdaworks/redis/ZAddArgs.java  | 15 +++++++++++++
 .../com/lambdaworks/redis/ZStoreArgs.java     | 17 +++++++++++++--
 .../redis/api/StatefulConnection.java         | 15 +++++++++++++
 .../redis/api/StatefulRedisConnection.java    | 15 +++++++++++++
 .../api/async/BaseRedisAsyncCommands.java     | 15 +++++++++++++
 .../redis/api/async/RedisAsyncCommands.java   | 15 +++++++++++++
 .../api/async/RedisGeoAsyncCommands.java      | 15 +++++++++++++
 .../api/async/RedisHLLAsyncCommands.java      | 15 +++++++++++++
 .../api/async/RedisHashAsyncCommands.java     | 15 +++++++++++++
 .../api/async/RedisKeyAsyncCommands.java      | 15 +++++++++++++
 .../api/async/RedisListAsyncCommands.java     | 15 +++++++++++++
 .../async/RedisScriptingAsyncCommands.java    | 15 +++++++++++++
 .../api/async/RedisServerAsyncCommands.java   | 15 +++++++++++++
 .../api/async/RedisSetAsyncCommands.java      | 15 +++++++++++++
 .../async/RedisSortedSetAsyncCommands.java    | 15 +++++++++++++
 .../api/async/RedisStringAsyncCommands.java   | 15 +++++++++++++
 .../RedisTransactionalAsyncCommands.java      | 15 +++++++++++++
 .../redis/api/async/package-info.java         |  2 +-
 .../lambdaworks/redis/api/package-info.java   |  2 +-
 .../reactive/BaseRedisReactiveCommands.java   | 15 +++++++++++++
 .../reactive/RedisGeoReactiveCommands.java    | 15 +++++++++++++
 .../reactive/RedisHLLReactiveCommands.java    | 15 +++++++++++++
 .../reactive/RedisHashReactiveCommands.java   | 15 +++++++++++++
 .../reactive/RedisKeyReactiveCommands.java    | 15 +++++++++++++
 .../reactive/RedisListReactiveCommands.java   | 15 +++++++++++++
 .../api/reactive/RedisReactiveCommands.java   | 15 +++++++++++++
 .../RedisScriptingReactiveCommands.java       | 15 +++++++++++++
 .../reactive/RedisServerReactiveCommands.java | 15 +++++++++++++
 .../reactive/RedisSetReactiveCommands.java    | 15 +++++++++++++
 .../RedisSortedSetReactiveCommands.java       | 15 +++++++++++++
 .../reactive/RedisStringReactiveCommands.java | 15 +++++++++++++
 .../RedisTransactionalReactiveCommands.java   | 15 +++++++++++++
 .../redis/api/reactive/package-info.java      |  2 +-
 .../redis/api/sync/BaseRedisCommands.java     | 15 +++++++++++++
 .../redis/api/sync/RedisCommands.java         | 15 +++++++++++++
 .../redis/api/sync/RedisGeoCommands.java      | 15 +++++++++++++
 .../redis/api/sync/RedisHLLCommands.java      | 15 +++++++++++++
 .../redis/api/sync/RedisHashCommands.java     | 15 +++++++++++++
 .../redis/api/sync/RedisKeyCommands.java      | 15 +++++++++++++
 .../redis/api/sync/RedisListCommands.java     | 15 +++++++++++++
 .../api/sync/RedisScriptingCommands.java      | 15 +++++++++++++
 .../redis/api/sync/RedisServerCommands.java   | 15 +++++++++++++
 .../redis/api/sync/RedisSetCommands.java      | 15 +++++++++++++
 .../api/sync/RedisSortedSetCommands.java      | 15 +++++++++++++
 .../redis/api/sync/RedisStringCommands.java   | 15 +++++++++++++
 .../api/sync/RedisTransactionalCommands.java  | 15 +++++++++++++
 .../redis/api/sync/package-info.java          |  2 +-
 .../redis/cluster/AbstractNodeSelection.java  | 15 +++++++++++++
 .../redis/cluster/AsyncExecutionsImpl.java    | 15 +++++++++++++
 .../redis/cluster/ClusterClientOptions.java   | 15 +++++++++++++
 .../redis/cluster/ClusterCommand.java         | 15 +++++++++++++
 .../cluster/ClusterConnectionProvider.java    | 15 +++++++++++++
 .../ClusterDistributionChannelWriter.java     | 15 +++++++++++++
 .../redis/cluster/ClusterEventListener.java   | 15 +++++++++++++
 .../redis/cluster/ClusterNodeEndpoint.java    | 15 +++++++++++++
 .../redis/cluster/ClusterScanSupport.java     | 15 +++++++++++++
 .../ClusterTopologyRefreshOptions.java        | 15 +++++++++++++
 .../ClusterTopologyRefreshScheduler.java      | 15 +++++++++++++
 .../cluster/DynamicAsyncNodeSelection.java    | 15 +++++++++++++
 .../redis/cluster/DynamicNodeSelection.java   | 15 +++++++++++++
 .../cluster/DynamicSyncNodeSelection.java     | 15 +++++++++++++
 .../redis/cluster/MultiNodeExecution.java     | 15 +++++++++++++
 .../NodeSelectionInvocationHandler.java       | 15 +++++++++++++
 .../redis/cluster/PartitionAccessor.java      | 15 +++++++++++++
 .../redis/cluster/PartitionsConsensus.java    | 15 +++++++++++++
 .../cluster/PartitionsConsensusImpl.java      | 15 +++++++++++++
 .../redis/cluster/PipelinedRedisFuture.java   | 15 +++++++++++++
 .../PooledClusterConnectionProvider.java      | 15 +++++++++++++
 .../redis/cluster/ReadOnlyCommands.java       | 15 +++++++++++++
 .../redis/cluster/ReconnectEventListener.java | 15 +++++++++++++
 ...RedisAdvancedClusterAsyncCommandsImpl.java | 15 +++++++++++++
 ...isAdvancedClusterReactiveCommandsImpl.java | 15 +++++++++++++
 .../redis/cluster/RedisClusterClient.java     | 15 +++++++++++++
 .../lambdaworks/redis/cluster/RoundRobin.java | 17 ++++++++++++++-
 .../RoundRobinSocketAddressSupplier.java      | 15 +++++++++++++
 .../lambdaworks/redis/cluster/SlotHash.java   | 17 ++++++++++++++-
 .../StatefulRedisClusterConnectionImpl.java   | 15 +++++++++++++
 .../cluster/StaticAsyncNodeSelection.java     | 15 +++++++++++++
 .../redis/cluster/StaticNodeSelection.java    | 15 +++++++++++++
 .../cluster/StaticSyncNodeSelection.java      | 15 +++++++++++++
 .../redis/cluster/SyncExecutionsImpl.java     | 15 +++++++++++++
 .../cluster/api/NodeSelectionSupport.java     | 15 +++++++++++++
 .../api/StatefulRedisClusterConnection.java   | 15 +++++++++++++
 .../cluster/api/async/AsyncExecutions.java    | 15 +++++++++++++
 .../cluster/api/async/AsyncNodeSelection.java | 15 +++++++++++++
 .../async/BaseNodeSelectionAsyncCommands.java | 15 +++++++++++++
 .../api/async/NodeSelectionAsyncCommands.java | 15 +++++++++++++
 .../async/NodeSelectionGeoAsyncCommands.java  | 15 +++++++++++++
 .../async/NodeSelectionHLLAsyncCommands.java  | 15 +++++++++++++
 .../async/NodeSelectionHashAsyncCommands.java | 15 +++++++++++++
 .../async/NodeSelectionKeyAsyncCommands.java  | 15 +++++++++++++
 .../async/NodeSelectionListAsyncCommands.java | 15 +++++++++++++
 .../NodeSelectionScriptingAsyncCommands.java  | 15 +++++++++++++
 .../NodeSelectionServerAsyncCommands.java     | 15 +++++++++++++
 .../async/NodeSelectionSetAsyncCommands.java  | 15 +++++++++++++
 .../NodeSelectionSortedSetAsyncCommands.java  | 15 +++++++++++++
 .../NodeSelectionStringAsyncCommands.java     | 15 +++++++++++++
 .../RedisAdvancedClusterAsyncCommands.java    | 15 +++++++++++++
 .../api/async/RedisClusterAsyncCommands.java  | 15 +++++++++++++
 .../redis/cluster/api/async/package-info.java |  2 +-
 .../redis/cluster/api/package-info.java       |  2 +-
 .../RedisAdvancedClusterReactiveCommands.java | 17 ++++++++++++++-
 .../RedisClusterReactiveCommands.java         | 17 ++++++++++++++-
 .../cluster/api/reactive/package-info.java    |  2 +-
 .../api/sync/BaseNodeSelectionCommands.java   | 15 +++++++++++++
 .../redis/cluster/api/sync/Executions.java    | 15 +++++++++++++
 .../redis/cluster/api/sync/NodeSelection.java | 15 +++++++++++++
 .../api/sync/NodeSelectionCommands.java       | 15 +++++++++++++
 .../api/sync/NodeSelectionGeoCommands.java    | 15 +++++++++++++
 .../api/sync/NodeSelectionHLLCommands.java    | 15 +++++++++++++
 .../api/sync/NodeSelectionHashCommands.java   | 15 +++++++++++++
 .../api/sync/NodeSelectionKeyCommands.java    | 15 +++++++++++++
 .../api/sync/NodeSelectionListCommands.java   | 15 +++++++++++++
 .../sync/NodeSelectionScriptingCommands.java  | 15 +++++++++++++
 .../api/sync/NodeSelectionServerCommands.java | 15 +++++++++++++
 .../api/sync/NodeSelectionSetCommands.java    | 15 +++++++++++++
 .../sync/NodeSelectionSortedSetCommands.java  | 15 +++++++++++++
 .../api/sync/NodeSelectionStringCommands.java | 15 +++++++++++++
 .../sync/RedisAdvancedClusterCommands.java    | 15 +++++++++++++
 .../api/sync/RedisClusterCommands.java        | 15 +++++++++++++
 .../redis/cluster/api/sync/package-info.java  |  2 +-
 .../event/ClusterTopologyChangedEvent.java    | 15 +++++++++++++
 .../partitions/ClusterPartitionParser.java    | 15 +++++++++++++
 .../cluster/models/partitions/Partitions.java | 15 +++++++++++++
 .../models/partitions/RedisClusterNode.java   | 15 +++++++++++++
 .../models/partitions/package-info.java       |  2 +-
 .../models/slots/ClusterSlotRange.java        | 15 +++++++++++++
 .../models/slots/ClusterSlotsParser.java      | 15 +++++++++++++
 .../cluster/models/slots/package-info.java    |  2 +-
 .../redis/cluster/package-info.java           |  2 +-
 .../topology/ClusterTopologyRefresh.java      | 15 +++++++++++++
 .../redis/cluster/topology/Connections.java   | 15 +++++++++++++
 .../topology/NodeConnectionFactory.java       | 15 +++++++++++++
 .../cluster/topology/NodeTopologyView.java    | 15 +++++++++++++
 .../cluster/topology/NodeTopologyViews.java   | 15 +++++++++++++
 .../topology/RedisClusterNodeSnapshot.java    | 15 +++++++++++++
 .../redis/cluster/topology/Requests.java      | 15 +++++++++++++
 .../cluster/topology/TimedAsyncCommand.java   | 15 +++++++++++++
 .../cluster/topology/TopologyComparators.java | 15 +++++++++++++
 .../redis/codec/ByteArrayCodec.java           | 15 +++++++++++++
 .../redis/codec/ByteBufferInputStream.java    | 15 +++++++++++++
 .../redis/codec/CompressionCodec.java         | 15 +++++++++++++
 .../lambdaworks/redis/codec/RedisCodec.java   | 17 +++++++++++++--
 .../lambdaworks/redis/codec/StringCodec.java  | 15 +++++++++++++
 .../redis/codec/ToByteBufEncoder.java         | 15 +++++++++++++
 .../redis/codec/Utf8StringCodec.java          | 17 +++++++++++++--
 .../lambdaworks/redis/codec/package-info.java |  2 +-
 .../CodecAwareMethodParametersAccessor.java   | 15 +++++++++++++
 .../dynamic/CommandCreationException.java     | 15 +++++++++++++
 .../redis/dynamic/CommandFactory.java         | 15 +++++++++++++
 .../redis/dynamic/CommandMethod.java          | 15 +++++++++++++
 .../dynamic/CommandMethodSyntaxException.java | 15 +++++++++++++
 .../redis/dynamic/CommandMethodVerifier.java  | 15 +++++++++++++
 .../dynamic/CommandSegmentCommandFactory.java | 15 +++++++++++++
 .../DefaultMethodParametersAccessor.java      | 15 +++++++++++++
 .../dynamic/DefaultRedisCommandsMetadata.java | 15 +++++++++++++
 .../redis/dynamic/ParameterBinder.java        | 15 +++++++++++++
 .../ReactiveCommandSegmentCommandFactory.java | 15 +++++++++++++
 .../redis/dynamic/ReactiveWrappers.java       | 15 +++++++++++++
 .../redis/dynamic/RedisCommandFactory.java    | 15 +++++++++++++
 .../redis/dynamic/RedisCommandsMetadata.java  | 15 +++++++++++++
 .../redis/dynamic/annotation/Command.java     | 15 +++++++++++++
 .../dynamic/annotation/CommandNaming.java     | 15 +++++++++++++
 .../redis/dynamic/annotation/Key.java         | 15 +++++++++++++
 .../redis/dynamic/annotation/Param.java       | 15 +++++++++++++
 .../redis/dynamic/annotation/Value.java       | 15 +++++++++++++
 .../dynamic/annotation/package-info.java      |  2 +-
 .../codec/AnnotationRedisCodecResolver.java   | 15 +++++++++++++
 .../dynamic/codec/RedisCodecResolver.java     | 15 +++++++++++++
 .../redis/dynamic/domain/Timeout.java         | 15 +++++++++++++
 .../redis/dynamic/domain/package-info.java    |  2 +-
 .../intercept/DefaultMethodInvocation.java    | 15 +++++++++++++
 .../intercept/InvocationProxyFactory.java     | 15 +++++++++++++
 .../dynamic/intercept/MethodInterceptor.java  | 17 ++++++++++++++-
 .../dynamic/intercept/MethodInvocation.java   | 15 +++++++++++++
 .../redis/dynamic/intercept/package-info.java |  2 +-
 .../CodecAwareOutputFactoryResolver.java      | 15 +++++++++++++
 .../dynamic/output/CommandOutputFactory.java  | 15 +++++++++++++
 .../output/CommandOutputFactoryResolver.java  | 15 +++++++++++++
 .../output/CommandOutputResolverSupport.java  | 15 +++++++++++++
 .../redis/dynamic/output/OutputRegistry.java  | 15 +++++++++++++
 ...tRegistryCommandOutputFactoryResolver.java | 15 +++++++++++++
 .../redis/dynamic/output/OutputSelector.java  | 15 +++++++++++++
 .../redis/dynamic/output/OutputType.java      | 15 +++++++++++++
 .../redis/dynamic/output/VoidOutput.java      | 15 +++++++++++++
 .../redis/dynamic/output/package-info.java    |  2 +-
 .../redis/dynamic/package-info.java           |  2 +-
 .../ExecutionSpecificParameters.java          | 15 +++++++++++++
 .../parameter/MethodParametersAccessor.java   | 15 +++++++++++++
 .../redis/dynamic/parameter/Parameter.java    | 15 +++++++++++++
 .../redis/dynamic/parameter/Parameters.java   | 15 +++++++++++++
 .../redis/dynamic/parameter/package-info.java |  2 +-
 .../AnnotationCommandSegmentFactory.java      | 15 +++++++++++++
 .../redis/dynamic/segment/CommandSegment.java | 15 +++++++++++++
 .../segment/CommandSegmentFactory.java        | 15 +++++++++++++
 .../dynamic/segment/CommandSegments.java      | 15 +++++++++++++
 .../redis/dynamic/segment/package-info.java   |  2 +-
 .../AnnotationParameterNameDiscoverer.java    | 15 +++++++++++++
 .../dynamic/support/ClassTypeInformation.java | 15 +++++++++++++
 .../CompositeParameterNameDiscoverer.java     | 15 +++++++++++++
 .../support/GenericArrayTypeInformation.java  | 15 +++++++++++++
 .../dynamic/support/GenericTypeResolver.java  | 15 +++++++++++++
 .../dynamic/support/MethodParameter.java      | 15 +++++++++++++
 .../support/ParameterNameDiscoverer.java      | 15 +++++++++++++
 .../support/ParametrizedTypeInformation.java  | 15 +++++++++++++
 .../ParentTypeAwareTypeInformation.java       | 17 ++++++++++++++-
 .../dynamic/support/ReflectionUtils.java      | 15 +++++++++++++
 .../redis/dynamic/support/ResolvableType.java | 15 +++++++++++++
 ...dardReflectionParameterNameDiscoverer.java | 17 ++++++++++++++-
 .../redis/dynamic/support/TypeDiscoverer.java | 17 ++++++++++++++-
 .../dynamic/support/TypeInformation.java      | 17 ++++++++++++++-
 .../support/TypeVariableTypeInformation.java  | 15 +++++++++++++
 .../redis/dynamic/support/TypeWrapper.java    | 15 +++++++++++++
 .../redis/dynamic/support/package-info.java   |  2 +-
 .../redis/event/DefaultEventBus.java          | 15 +++++++++++++
 .../event/DefaultEventPublisherOptions.java   | 15 +++++++++++++
 .../com/lambdaworks/redis/event/Event.java    | 15 +++++++++++++
 .../com/lambdaworks/redis/event/EventBus.java | 15 +++++++++++++
 .../redis/event/EventPublisherOptions.java    | 15 +++++++++++++
 .../event/connection/ConnectedEvent.java      | 15 +++++++++++++
 .../connection/ConnectionActivatedEvent.java  | 15 +++++++++++++
 .../ConnectionDeactivatedEvent.java           | 15 +++++++++++++
 .../event/connection/ConnectionEvent.java     | 15 +++++++++++++
 .../connection/ConnectionEventSupport.java    | 15 +++++++++++++
 .../event/connection/DisconnectedEvent.java   | 15 +++++++++++++
 .../event/metrics/CommandLatencyEvent.java    | 15 +++++++++++++
 .../DefaultCommandLatencyEventPublisher.java  | 15 +++++++++++++
 .../event/metrics/MetricEventPublisher.java   | 15 +++++++++++++
 .../internal/AbstractInvocationHandler.java   | 15 +++++++++++++
 .../redis/internal/HostAndPort.java           | 15 +++++++++++++
 .../redis/internal/LettuceAssert.java         | 15 +++++++++++++
 .../redis/internal/LettuceClassUtils.java     | 15 +++++++++++++
 .../redis/internal/LettuceFactories.java      | 15 +++++++++++++
 .../redis/internal/LettuceLists.java          | 15 +++++++++++++
 .../redis/internal/LettuceSets.java           | 15 +++++++++++++
 .../redis/masterslave/MasterSlave.java        | 15 +++++++++++++
 .../masterslave/MasterSlaveChannelWriter.java | 15 +++++++++++++
 .../MasterSlaveConnectionProvider.java        | 15 +++++++++++++
 .../MasterSlaveTopologyProvider.java          | 15 +++++++++++++
 .../MasterSlaveTopologyRefresh.java           | 15 +++++++++++++
 .../redis/masterslave/MasterSlaveUtils.java   | 15 +++++++++++++
 .../redis/masterslave/ReadOnlyCommands.java   | 15 +++++++++++++
 .../masterslave/RedisMasterSlaveNode.java     | 15 +++++++++++++
 .../masterslave/SentinelTopologyProvider.java | 15 +++++++++++++
 .../masterslave/SentinelTopologyRefresh.java  | 15 +++++++++++++
 .../StatefulRedisMasterSlaveConnection.java   | 15 +++++++++++++
 ...tatefulRedisMasterSlaveConnectionImpl.java | 15 +++++++++++++
 .../StaticMasterSlaveTopologyProvider.java    | 15 +++++++++++++
 .../redis/masterslave/Timeout.java            | 15 +++++++++++++
 .../redis/masterslave/TopologyProvider.java   | 15 +++++++++++++
 .../metrics/CommandLatencyCollector.java      | 15 +++++++++++++
 .../CommandLatencyCollectorOptions.java       | 15 +++++++++++++
 .../redis/metrics/CommandLatencyId.java       | 15 +++++++++++++
 .../redis/metrics/CommandMetrics.java         | 15 +++++++++++++
 .../DefaultCommandLatencyCollector.java       | 15 +++++++++++++
 ...DefaultCommandLatencyCollectorOptions.java | 15 +++++++++++++
 .../redis/metrics/MetricCollector.java        | 15 +++++++++++++
 .../redis/models/command/CommandDetail.java   | 15 +++++++++++++
 .../models/command/CommandDetailParser.java   | 15 +++++++++++++
 .../redis/models/command/package-info.java    |  2 +-
 .../redis/models/role/RedisInstance.java      | 15 +++++++++++++
 .../models/role/RedisMasterInstance.java      | 15 +++++++++++++
 .../models/role/RedisNodeDescription.java     | 15 +++++++++++++
 .../models/role/RedisSentinelInstance.java    | 15 +++++++++++++
 .../redis/models/role/RedisSlaveInstance.java | 15 +++++++++++++
 .../redis/models/role/ReplicationPartner.java | 15 +++++++++++++
 .../redis/models/role/RoleParser.java         | 15 +++++++++++++
 .../redis/models/role/package-info.java       |  2 +-
 .../lambdaworks/redis/output/ArrayOutput.java | 15 +++++++++++++
 .../redis/output/BooleanListOutput.java       | 19 ++++++++++++++---
 .../redis/output/BooleanOutput.java           | 17 +++++++++++++--
 .../redis/output/ByteArrayOutput.java         | 17 +++++++++++++--
 .../redis/output/CommandOutput.java           | 19 ++++++++++++++---
 .../lambdaworks/redis/output/DateOutput.java  | 17 +++++++++++++--
 .../output/DefaultTransactionResult.java      | 15 +++++++++++++
 .../redis/output/DoubleOutput.java            | 17 +++++++++++++--
 .../output/GeoCoordinatesListOutput.java      | 15 +++++++++++++
 .../output/GeoCoordinatesValueListOutput.java | 15 +++++++++++++
 .../redis/output/GeoWithinListOutput.java     | 15 +++++++++++++
 .../redis/output/IntegerOutput.java           | 17 +++++++++++++--
 .../redis/output/KeyListOutput.java           | 17 +++++++++++++--
 .../lambdaworks/redis/output/KeyOutput.java   | 17 +++++++++++++--
 .../redis/output/KeyScanOutput.java           | 15 +++++++++++++
 .../redis/output/KeyScanStreamingOutput.java  | 15 +++++++++++++
 .../redis/output/KeyStreamingChannel.java     | 15 +++++++++++++
 .../redis/output/KeyStreamingOutput.java      | 15 +++++++++++++
 .../redis/output/KeyValueListOutput.java      | 15 +++++++++++++
 .../redis/output/KeyValueOutput.java          | 17 +++++++++++++--
 .../output/KeyValueScanStreamingOutput.java   | 15 +++++++++++++
 .../output/KeyValueStreamingChannel.java      | 15 +++++++++++++
 .../redis/output/KeyValueStreamingOutput.java | 17 +++++++++++++--
 .../redis/output/ListOfMapsOutput.java        | 17 +++++++++++++--
 .../redis/output/ListSubscriber.java          | 15 +++++++++++++
 .../lambdaworks/redis/output/MapOutput.java   | 17 +++++++++++++--
 .../redis/output/MapScanOutput.java           | 15 +++++++++++++
 .../lambdaworks/redis/output/MultiOutput.java | 17 +++++++++++++--
 .../redis/output/NestedMultiOutput.java       | 17 +++++++++++++--
 .../lambdaworks/redis/output/ScanOutput.java  | 15 +++++++++++++
 .../redis/output/ScoredValueListOutput.java   | 18 +++++++++++++---
 .../redis/output/ScoredValueScanOutput.java   | 15 +++++++++++++
 .../ScoredValueScanStreamingOutput.java       | 15 +++++++++++++
 .../output/ScoredValueStreamingChannel.java   | 15 +++++++++++++
 .../output/ScoredValueStreamingOutput.java    | 15 +++++++++++++
 .../redis/output/StatusOutput.java            | 17 +++++++++++++--
 .../redis/output/StreamingChannel.java        | 15 +++++++++++++
 .../redis/output/StreamingOutput.java         | 15 +++++++++++++
 .../redis/output/StringListOutput.java        | 17 +++++++++++++--
 .../redis/output/StringValueListOutput.java   | 17 +++++++++++++--
 .../redis/output/ValueListOutput.java         | 17 +++++++++++++--
 .../lambdaworks/redis/output/ValueOutput.java | 17 +++++++++++++--
 .../redis/output/ValueScanOutput.java         | 15 +++++++++++++
 .../output/ValueScanStreamingOutput.java      | 15 +++++++++++++
 .../redis/output/ValueSetOutput.java          | 17 +++++++++++++--
 .../redis/output/ValueStreamingChannel.java   | 15 +++++++++++++
 .../redis/output/ValueStreamingOutput.java    | 15 +++++++++++++
 .../redis/output/ValueValueListOutput.java    | 15 +++++++++++++
 .../redis/output/package-info.java            |  2 +-
 .../com/lambdaworks/redis/package-info.java   |  2 +-
 .../redis/protocol/AsyncCommand.java          | 15 +++++++++++++
 .../protocol/BaseRedisCommandBuilder.java     | 15 +++++++++++++
 .../redis/protocol/ChannelLogDescriptor.java  | 15 +++++++++++++
 .../lambdaworks/redis/protocol/Command.java   | 19 ++++++++++++++---
 .../redis/protocol/CommandArgs.java           | 17 +++++++++++++--
 .../redis/protocol/CommandEncoder.java        | 17 +++++++++++++--
 .../redis/protocol/CommandHandler.java        | 15 +++++++++++++
 .../redis/protocol/CommandKeyword.java        | 17 +++++++++++++--
 .../redis/protocol/CommandType.java           | 18 ++++++++++++++--
 .../redis/protocol/CommandWrapper.java        | 15 +++++++++++++
 .../redis/protocol/CompleteableCommand.java   | 15 +++++++++++++
 .../redis/protocol/ConnectionFacade.java      | 15 +++++++++++++
 .../redis/protocol/ConnectionWatchdog.java    | 17 +++++++++++++--
 .../redis/protocol/DecoratedCommand.java      | 15 +++++++++++++
 .../redis/protocol/DefaultEndpoint.java       | 15 +++++++++++++
 .../lambdaworks/redis/protocol/Endpoint.java  | 15 +++++++++++++
 .../redis/protocol/HasQueuedCommands.java     | 15 +++++++++++++
 .../redis/protocol/LettuceCharsets.java       | 17 +++++++++++++--
 .../redis/protocol/ProtocolKeyword.java       | 15 +++++++++++++
 .../redis/protocol/QueuedCommands.java        | 15 +++++++++++++
 .../redis/protocol/ReconnectionHandler.java   | 15 +++++++++++++
 .../redis/protocol/ReconnectionListener.java  | 15 +++++++++++++
 .../redis/protocol/RedisCommand.java          | 15 +++++++++++++
 .../redis/protocol/RedisStateMachine.java     | 17 +++++++++++++--
 .../redis/protocol/SharedLock.java            | 15 +++++++++++++
 .../redis/protocol/TransactionalCommand.java  | 15 +++++++++++++
 .../redis/protocol/WithLatency.java           | 15 +++++++++++++
 .../redis/protocol/package-info.java          |  2 +-
 .../redis/pubsub/PubSubCommandArgs.java       | 15 +++++++++++++
 .../redis/pubsub/PubSubCommandBuilder.java    | 15 +++++++++++++
 .../redis/pubsub/PubSubCommandHandler.java    | 17 +++++++++++++--
 .../redis/pubsub/PubSubEndpoint.java          | 15 +++++++++++++
 .../redis/pubsub/PubSubOutput.java            | 17 +++++++++++++--
 .../redis/pubsub/RedisPubSubAdapter.java      | 17 +++++++++++++--
 .../pubsub/RedisPubSubAsyncCommandsImpl.java  | 17 +++++++++++++--
 .../redis/pubsub/RedisPubSubListener.java     | 18 +++++++++++++---
 .../RedisPubSubReactiveCommandsImpl.java      | 15 +++++++++++++
 .../pubsub/StatefulRedisPubSubConnection.java | 15 +++++++++++++
 .../StatefulRedisPubSubConnectionImpl.java    | 15 +++++++++++++
 .../api/async/RedisPubSubAsyncCommands.java   | 15 +++++++++++++
 .../redis/pubsub/api/async/package-info.java  |  2 +-
 .../pubsub/api/reactive/ChannelMessage.java   | 15 +++++++++++++
 .../pubsub/api/reactive/PatternMessage.java   | 15 +++++++++++++
 .../reactive/RedisPubSubReactiveCommands.java | 15 +++++++++++++
 .../pubsub/api/reactive/package-info.java     |  2 +-
 .../pubsub/api/sync/RedisPubSubCommands.java  | 15 +++++++++++++
 .../redis/pubsub/api/sync/package-info.java   |  2 +-
 .../redis/pubsub/package-info.java            |  2 +-
 .../redis/resource/ClientResources.java       | 15 +++++++++++++
 .../redis/resource/ConstantDelay.java         | 15 +++++++++++++
 .../resource/DecorrelatedJitterDelay.java     | 15 +++++++++++++
 .../resource/DefaultClientResources.java      | 15 +++++++++++++
 .../DefaultEventLoopGroupProvider.java        | 15 +++++++++++++
 .../com/lambdaworks/redis/resource/Delay.java | 15 +++++++++++++
 .../redis/resource/DirContextDnsResolver.java | 15 +++++++++++++
 .../redis/resource/DnsResolver.java           | 15 +++++++++++++
 .../redis/resource/DnsResolvers.java          | 15 +++++++++++++
 .../redis/resource/EqualJitterDelay.java      | 15 +++++++++++++
 .../resource/EventLoopGroupProvider.java      | 15 +++++++++++++
 .../redis/resource/ExponentialDelay.java      | 15 +++++++++++++
 .../redis/resource/FullJitterDelay.java       | 15 +++++++++++++
 .../lambdaworks/redis/resource/Futures.java   | 15 +++++++++++++
 .../redis/resource/SocketAddressResolver.java | 15 +++++++++++++
 .../redis/resource/package-info.java          |  2 +-
 .../RedisSentinelAsyncCommandsImpl.java       | 15 +++++++++++++
 .../RedisSentinelReactiveCommandsImpl.java    | 15 +++++++++++++
 .../sentinel/SentinelCommandBuilder.java      | 15 +++++++++++++
 .../StatefulRedisSentinelConnectionImpl.java  | 15 +++++++++++++
 .../api/StatefulRedisSentinelConnection.java  | 15 +++++++++++++
 .../api/async/RedisSentinelAsyncCommands.java | 15 +++++++++++++
 .../sentinel/api/async/package-info.java      |  2 +-
 .../redis/sentinel/api/package-info.java      |  2 +-
 .../RedisSentinelReactiveCommands.java        | 15 +++++++++++++
 .../sentinel/api/reactive/package-info.java   |  2 +-
 .../api/sync/RedisSentinelCommands.java       | 15 +++++++++++++
 .../redis/sentinel/api/sync/package-info.java |  2 +-
 .../redis/sentinel/package-info.java          |  2 +-
 .../redis/support/AbstractCdiBean.java        | 15 +++++++++++++
 .../support/ClientResourcesFactoryBean.java   | 15 +++++++++++++
 .../redis/support/ConnectionPoolSupport.java  | 15 +++++++++++++
 .../redis/support/LettuceCdiExtension.java    | 15 +++++++++++++
 .../support/LettuceFactoryBeanSupport.java    | 15 +++++++++++++
 .../redis/support/RedisClientCdiBean.java     | 15 +++++++++++++
 .../redis/support/RedisClientFactoryBean.java | 15 +++++++++++++
 .../support/RedisClusterClientCdiBean.java    | 15 +++++++++++++
 .../RedisClusterClientFactoryBean.java        | 15 +++++++++++++
 .../redis/api/BaseRedisCommands.java          | 15 +++++++++++++
 .../redis/api/RedisGeoCommands.java           | 15 +++++++++++++
 .../redis/api/RedisHLLCommands.java           | 15 +++++++++++++
 .../redis/api/RedisHashCommands.java          | 15 +++++++++++++
 .../redis/api/RedisKeyCommands.java           | 15 +++++++++++++
 .../redis/api/RedisListCommands.java          | 15 +++++++++++++
 .../redis/api/RedisScriptingCommands.java     | 15 +++++++++++++
 .../redis/api/RedisSentinelCommands.java      | 15 +++++++++++++
 .../redis/api/RedisServerCommands.java        | 15 +++++++++++++
 .../redis/api/RedisSetCommands.java           | 15 +++++++++++++
 .../redis/api/RedisSortedSetCommands.java     | 15 +++++++++++++
 .../redis/api/RedisStringCommands.java        | 15 +++++++++++++
 .../redis/api/RedisTransactionalCommands.java | 15 +++++++++++++
 .../redis/extensibility/LettuceGeoDemo.java   | 15 +++++++++++++
 .../extensibility/MyExtendedRedisClient.java  | 15 +++++++++++++
 .../MyExtendedRedisClientTest.java            | 15 +++++++++++++
 .../extensibility/MyPubSubConnection.java     | 15 +++++++++++++
 src/test/java/com/lambdaworks/CanConnect.java | 15 +++++++++++++
 .../com/lambdaworks/ConnectionTestUtil.java   | 15 +++++++++++++
 src/test/java/com/lambdaworks/Delay.java      | 15 +++++++++++++
 src/test/java/com/lambdaworks/Futures.java    | 15 +++++++++++++
 .../java/com/lambdaworks/KeysAndValues.java   | 15 +++++++++++++
 .../java/com/lambdaworks/LoggingTestRule.java | 15 +++++++++++++
 src/test/java/com/lambdaworks/Sockets.java    | 15 +++++++++++++
 src/test/java/com/lambdaworks/SslTest.java    | 15 +++++++++++++
 .../com/lambdaworks/TestClientResources.java  | 15 +++++++++++++
 src/test/java/com/lambdaworks/Wait.java       | 15 +++++++++++++
 .../apigenerator/CompilationUnitFactory.java  | 15 +++++++++++++
 .../lambdaworks/apigenerator/Constants.java   | 15 +++++++++++++
 .../apigenerator/CreateAsyncApi.java          | 15 +++++++++++++
 .../CreateAsyncNodeSelectionClusterApi.java   | 15 +++++++++++++
 .../apigenerator/CreateReactiveApi.java       | 15 +++++++++++++
 .../apigenerator/CreateSyncApi.java           | 15 +++++++++++++
 .../CreateSyncNodeSelectionClusterApi.java    | 15 +++++++++++++
 .../GenerateCommandInterfaces.java            | 15 +++++++++++++
 .../com/lambdaworks/category/SlowTests.java   | 15 +++++++++++++
 .../java/com/lambdaworks/codec/CRC16Test.java | 15 +++++++++++++
 .../examples/ConnectToElastiCacheMaster.java  | 15 +++++++++++++
 ...tToMasterSlaveUsingElastiCacheCluster.java | 15 +++++++++++++
 ...onnectToMasterSlaveUsingRedisSentinel.java | 15 +++++++++++++
 .../lambdaworks/examples/ConnectToRedis.java  | 15 +++++++++++++
 .../examples/ConnectToRedisCluster.java       | 15 +++++++++++++
 .../examples/ConnectToRedisClusterSSL.java    | 15 +++++++++++++
 ...tToRedisClusterWithTopologyRefreshing.java | 15 +++++++++++++
 .../examples/ConnectToRedisSSL.java           | 15 +++++++++++++
 .../ConnectToRedisUsingRedisSentinel.java     | 15 +++++++++++++
 .../lambdaworks/examples/MySpringBean.java    | 15 +++++++++++++
 .../examples/ReadWriteExample.java            | 15 +++++++++++++
 .../lambdaworks/examples/SpringExample.java   | 15 +++++++++++++
 .../redis/AbstractRedisClientTest.java        | 21 +++++++++++++++++--
 .../com/lambdaworks/redis/AbstractTest.java   | 15 +++++++++++++
 .../com/lambdaworks/redis/AllTheAPIsTest.java | 15 +++++++++++++
 .../redis/AsyncConnectionTest.java            | 21 +++++++++++++++++--
 .../lambdaworks/redis/ClientMetricsTest.java  | 15 +++++++++++++
 .../lambdaworks/redis/ClientOptionsTest.java  | 15 +++++++++++++
 .../com/lambdaworks/redis/ClientTest.java     | 21 +++++++++++++++++--
 .../redis/ConnectionCommandTest.java          | 21 +++++++++++++++++--
 .../lambdaworks/redis/CustomCodecTest.java    | 21 +++++++++++++++++--
 .../lambdaworks/redis/DefaultRedisClient.java | 15 +++++++++++++
 .../com/lambdaworks/redis/FastShutdown.java   | 15 +++++++++++++
 .../com/lambdaworks/redis/GeoModelTest.java   | 15 +++++++++++++
 .../lambdaworks/redis/JavaRuntimeTest.java    | 15 +++++++++++++
 .../redis/KeyValueStreamingAdapter.java       | 15 +++++++++++++
 .../com/lambdaworks/redis/KeyValueTest.java   | 15 +++++++++++++
 .../lambdaworks/redis/LettuceFuturesTest.java | 15 +++++++++++++
 .../java/com/lambdaworks/redis/LimitTest.java | 15 +++++++++++++
 .../redis/ListStreamingAdapter.java           | 15 +++++++++++++
 .../com/lambdaworks/redis/PipeliningTest.java | 15 +++++++++++++
 .../redis/PrivateAccessorTest.java            | 15 +++++++++++++
 .../java/com/lambdaworks/redis/RangeTest.java | 15 +++++++++++++
 .../redis/ReactiveConnectionTest.java         | 15 +++++++++++++
 .../redis/ReactiveStreamingOutputTest.java    | 15 +++++++++++++
 .../redis/RedisClientConnectionTest.java      | 15 +++++++++++++
 .../redis/RedisClientFactoryBeanTest.java     | 15 +++++++++++++
 .../redis/RedisClientFactoryTest.java         | 15 +++++++++++++
 .../lambdaworks/redis/RedisClientTest.java    | 15 +++++++++++++
 .../redis/RedisURIBuilderTest.java            | 15 +++++++++++++
 .../com/lambdaworks/redis/RedisURITest.java   | 15 +++++++++++++
 .../com/lambdaworks/redis/ScanCursorTest.java | 15 +++++++++++++
 .../redis/ScoredValueStreamingAdapter.java    | 15 +++++++++++++
 .../lambdaworks/redis/ScoredValueTest.java    | 15 +++++++++++++
 .../lambdaworks/redis/SocketOptionsTest.java  | 17 ++++++++++++++-
 .../redis/SyncAsyncApiConvergenceTest.java    | 15 +++++++++++++
 .../redis/TestEventLoopGroupProvider.java     | 15 +++++++++++++
 .../lambdaworks/redis/TestRedisPublisher.java | 15 +++++++++++++
 .../com/lambdaworks/redis/TestSettings.java   | 15 +++++++++++++
 .../redis/UnixDomainSocketTest.java           | 15 +++++++++++++
 .../redis/Utf8StringCodecTest.java            | 21 +++++++++++++++++--
 .../java/com/lambdaworks/redis/ValueTest.java | 15 +++++++++++++
 .../redis/cluster/AbstractClusterTest.java    | 15 +++++++++++++
 .../cluster/AdvancedClusterClientTest.java    | 15 +++++++++++++
 .../cluster/AdvancedClusterReactiveTest.java  | 15 +++++++++++++
 .../redis/cluster/ByteCodecClusterTest.java   | 15 +++++++++++++
 .../cluster/ClusterClientOptionsTest.java     | 15 +++++++++++++
 .../cluster/ClusterCommandInternalsTest.java  | 15 +++++++++++++
 .../redis/cluster/ClusterCommandTest.java     | 15 +++++++++++++
 .../ClusterDistributionChannelWriterTest.java | 17 ++++++++++++++-
 .../cluster/ClusterNodeEndpointTest.java      | 15 +++++++++++++
 .../cluster/ClusterPartiallyDownTest.java     | 15 +++++++++++++
 .../cluster/ClusterPartitionParserTest.java   | 15 +++++++++++++
 .../cluster/ClusterReactiveCommandTest.java   | 15 +++++++++++++
 .../redis/cluster/ClusterRule.java            | 15 +++++++++++++
 .../redis/cluster/ClusterSetup.java           | 15 +++++++++++++
 .../redis/cluster/ClusterTestUtil.java        | 15 +++++++++++++
 .../ClusterTopologyRefreshOptionsTest.java    | 17 ++++++++++++++-
 .../ClusterTopologyRefreshSchedulerTest.java  | 15 +++++++++++++
 ...ealthyMajorityPartitionsConsensusTest.java | 15 +++++++++++++
 .../KnownMajorityPartitionsConsensusTest.java | 15 +++++++++++++
 .../redis/cluster/NodeSelectionAsyncTest.java | 15 +++++++++++++
 .../redis/cluster/NodeSelectionSyncTest.java  | 15 +++++++++++++
 .../PartitionsConsensusTestSupport.java       | 15 +++++++++++++
 .../cluster/PipelinedRedisFutureTest.java     | 15 +++++++++++++
 .../PooledClusterConnectionProviderTest.java  | 17 ++++++++++++++-
 .../redis/cluster/ReadFromTest.java           | 15 +++++++++++++
 .../redis/cluster/ReadOnlyCommandsTest.java   | 15 +++++++++++++
 .../RedisClusterClientFactoryTest.java        | 15 +++++++++++++
 .../redis/cluster/RedisClusterClientTest.java | 15 +++++++++++++
 .../RedisClusterPasswordSecuredSslTest.java   | 15 +++++++++++++
 .../cluster/RedisClusterReadFromTest.java     | 15 +++++++++++++
 .../redis/cluster/RedisClusterSetupTest.java  | 15 +++++++++++++
 .../RedisClusterStressScenariosTest.java      | 15 +++++++++++++
 .../RedisReactiveClusterClientTest.java       | 15 +++++++++++++
 .../RoundRobinSocketAddressSupplierTest.java  | 15 +++++++++++++
 .../redis/cluster/SlotHashTest.java           | 15 +++++++++++++
 .../commands/CustomClusterCommandTest.java    | 15 +++++++++++++
 .../commands/GeoClusterCommandTest.java       | 15 +++++++++++++
 .../commands/HashClusterCommandTest.java      | 15 +++++++++++++
 .../commands/KeyClusterCommandTest.java       | 15 +++++++++++++
 .../commands/ListClusterCommandTest.java      | 15 +++++++++++++
 .../commands/StringClusterCommandTest.java    | 15 +++++++++++++
 .../HashClusterReactiveCommandTest.java       | 15 +++++++++++++
 .../KeyClusterReativeCommandTest.java         | 15 +++++++++++++
 .../ListClusterReactiveCommandTest.java       | 15 +++++++++++++
 .../StringClusterReactiveCommandTest.java     | 15 +++++++++++++
 .../models/partitions/PartitionsTest.java     | 17 ++++++++++++++-
 .../partitions/RedisClusterNodeTest.java      | 15 +++++++++++++
 .../models/slots/ClusterSlotsParserTest.java  | 15 +++++++++++++
 .../cluster/pubsub/PubSubClusterTest.java     | 15 +++++++++++++
 .../topology/ClusterTopologyRefreshTest.java  | 15 +++++++++++++
 .../topology/NodeTopologyViewsTest.java       | 17 ++++++++++++++-
 .../redis/cluster/topology/RequestsTest.java  | 17 ++++++++++++++-
 .../topology/TopologyComparatorsTest.java     | 15 +++++++++++++
 .../cluster/topology/TopologyRefreshTest.java | 15 +++++++++++++
 .../redis/codec/CompressionCodecTest.java     | 15 +++++++++++++
 .../redis/codec/StringCodecTest.java          | 17 ++++++++++++++-
 .../redis/commands/BitCommandTest.java        | 21 +++++++++++++++++--
 .../redis/commands/CustomCommandTest.java     | 15 +++++++++++++
 .../redis/commands/GeoCommandTest.java        | 15 +++++++++++++
 .../redis/commands/HLLCommandTest.java        | 15 +++++++++++++
 .../redis/commands/HashCommandTest.java       | 21 +++++++++++++++++--
 .../redis/commands/KeyCommandTest.java        | 21 +++++++++++++++++--
 .../redis/commands/ListCommandTest.java       | 21 +++++++++++++++++--
 .../redis/commands/NumericCommandTest.java    | 21 +++++++++++++++++--
 .../RunOnlyOnceServerCommandTest.java         | 21 +++++++++++++++++--
 .../redis/commands/ScriptingCommandTest.java  | 21 +++++++++++++++++--
 .../redis/commands/ServerCommandTest.java     | 21 +++++++++++++++++--
 .../redis/commands/SetCommandTest.java        | 21 +++++++++++++++++--
 .../redis/commands/SortCommandTest.java       | 21 +++++++++++++++++--
 .../redis/commands/SortedSetCommandTest.java  | 21 +++++++++++++++++--
 .../redis/commands/StringCommandTest.java     | 21 +++++++++++++++++--
 .../commands/TransactionCommandTest.java      | 21 +++++++++++++++++--
 .../reactive/BitReactiveCommandTest.java      | 15 +++++++++++++
 .../reactive/CustomReactiveCommandTest.java   | 15 +++++++++++++
 .../reactive/GeoReactiveCommandTest.java      | 15 +++++++++++++
 .../reactive/HLLReactiveCommandTest.java      | 15 +++++++++++++
 .../reactive/HashReactiveCommandTest.java     | 15 +++++++++++++
 .../reactive/KeyReactiveCommandTest.java      | 15 +++++++++++++
 .../reactive/ListReactiveCommandTest.java     | 15 +++++++++++++
 .../reactive/NumericReactiveCommandTest.java  | 15 +++++++++++++
 .../ScriptingReactiveCommandTest.java         | 15 +++++++++++++
 .../reactive/ServerReactiveCommandTest.java   | 15 +++++++++++++
 .../reactive/SetReactiveCommandTest.java      | 15 +++++++++++++
 .../reactive/SortReactiveCommandTest.java     | 15 +++++++++++++
 .../SortedSetReactiveCommandTest.java         | 15 +++++++++++++
 .../reactive/StringReactiveCommandTest.java   | 15 +++++++++++++
 .../TransactionReactiveCommandTest.java       | 15 +++++++++++++
 .../transactional/BitTxCommandTest.java       | 15 +++++++++++++
 .../transactional/GeoTxCommandTest.java       | 15 +++++++++++++
 .../transactional/HLLTxCommandTest.java       | 15 +++++++++++++
 .../transactional/HashTxCommandTest.java      | 15 +++++++++++++
 .../transactional/KeyTxCommandTest.java       | 15 +++++++++++++
 .../transactional/ListTxCommandTest.java      | 15 +++++++++++++
 .../transactional/SetTxCommandTest.java       | 15 +++++++++++++
 .../transactional/SortTxCommandTest.java      | 15 +++++++++++++
 .../transactional/SortedSetTxCommandTest.java | 15 +++++++++++++
 .../transactional/StringTxCommandTest.java    | 15 +++++++++++++
 .../TxSyncInvocationHandler.java              | 17 ++++++++++++++-
 .../redis/dynamic/CommandMethodTest.java      | 17 ++++++++++++++-
 .../dynamic/CommandMethodVerifierTest.java    | 15 +++++++++++++
 .../CommandSegmentCommandFactoryTest.java     | 15 +++++++++++++
 .../redis/dynamic/ParameterBinderTest.java    | 15 +++++++++++++
 ...ctiveCommandSegmentCommandFactoryTest.java | 17 ++++++++++++++-
 .../redis/dynamic/RedisCommandsTest.java      | 15 +++++++++++++
 .../AnnotationRedisCodecResolverTest.java     | 17 ++++++++++++++-
 .../intercept/InvocationProxyFactoryTest.java | 17 ++++++++++++++-
 .../output/CodecAwareOutputResolverTest.java  | 17 ++++++++++++++-
 ...istryCommandOutputFactoryResolverTest.java | 17 ++++++++++++++-
 .../dynamic/output/OutputRegistryTest.java    | 17 ++++++++++++++-
 .../AnnotationCommandSegmentFactoryTest.java  | 17 ++++++++++++++-
 .../event/ConnectionEventsTriggeredTest.java  | 15 +++++++++++++
 .../redis/event/DefaultEventBusTest.java      | 15 +++++++++++++
 .../DefaultEventPublisherOptionsTest.java     | 15 +++++++++++++
 .../AbstractInvocationHandlerTest.java        | 17 ++++++++++++++-
 .../redis/internal/HostAndPortTest.java       | 17 ++++++++++++++-
 .../masterslave/MasterSlaveSentinelTest.java  | 15 +++++++++++++
 .../redis/masterslave/MasterSlaveTest.java    | 15 +++++++++++++
 .../MasterSlaveTopologyProviderTest.java      | 15 +++++++++++++
 .../masterslave/MasterSlaveUtilsTest.java     | 17 ++++++++++++++-
 .../SentinelTopologyRefreshTest.java          | 15 +++++++++++++
 .../masterslave/StaticMasterSlaveTest.java    | 15 +++++++++++++
 .../redis/metrics/CommandLatencyIdTest.java   | 15 +++++++++++++
 .../DefaultCommandLatencyCollectorTest.java   | 15 +++++++++++++
 ...ultCommandLatencyCollectorOptionsTest.java | 15 +++++++++++++
 .../command/CommandDetailParserTest.java      | 15 +++++++++++++
 .../redis/models/role/RoleParserTest.java     | 15 +++++++++++++
 .../redis/output/BooleanListOutputTest.java   | 17 ++++++++++++++-
 .../output/GeoCoordinatesListOutputTest.java  | 17 ++++++++++++++-
 .../GeoCoordinatesValueListOutputTest.java    | 17 ++++++++++++++-
 .../redis/output/GeoWithinListOutputTest.java | 17 ++++++++++++++-
 .../redis/output/ListOutputTest.java          | 17 ++++++++++++++-
 .../redis/output/NestedMultiOutputTest.java   | 17 ++++++++++++++-
 .../output/ScoredValueListOutputTest.java     | 17 ++++++++++++++-
 .../protocol/AsyncCommandInternalsTest.java   | 15 +++++++++++++
 .../redis/protocol/CommandArgsTest.java       | 17 ++++++++++++++-
 .../redis/protocol/CommandHandlerTest.java    | 15 +++++++++++++
 .../redis/protocol/CommandInternalsTest.java  | 21 +++++++++++++++++--
 .../redis/protocol/ConnectionFailureTest.java | 15 +++++++++++++
 .../redis/protocol/DefaultEndpointTest.java   | 15 +++++++++++++
 .../redis/protocol/StateMachineTest.java      | 21 +++++++++++++++++--
 .../redis/pubsub/PubSubCommandTest.java       | 21 +++++++++++++++++--
 .../redis/pubsub/PubSubReactiveTest.java      | 15 +++++++++++++
 .../reactive/RedisPublisherVerification.java  | 17 ++++++++++++++-
 .../redis/reactive/TestSubscriber.java        | 17 ++++++++++++++-
 .../redis/reliability/AtLeastOnceTest.java    | 15 +++++++++++++
 .../redis/reliability/AtMostOnceTest.java     | 15 +++++++++++++
 .../redis/resource/ConstantDelayTest.java     | 17 ++++++++++++++-
 .../resource/DecorrelatedJitterDelayTest.java | 15 +++++++++++++
 .../resource/DefaultClientResourcesTest.java  | 15 +++++++++++++
 .../DefaultEventLoopGroupProviderTest.java    | 15 +++++++++++++
 .../resource/DirContextDnsResolverTest.java   | 15 +++++++++++++
 .../redis/resource/EqualJitterDelayTest.java  | 15 +++++++++++++
 .../redis/resource/ExponentialDelayTest.java  | 17 ++++++++++++++-
 .../redis/resource/FullJitterDelayTest.java   | 15 +++++++++++++
 .../redis/resource/FuturesTest.java           | 15 +++++++++++++
 .../redis/sentinel/AbstractSentinelTest.java  | 15 +++++++++++++
 .../redis/sentinel/SentinelCommandTest.java   | 15 +++++++++++++
 .../sentinel/SentinelConnectionTest.java      | 15 +++++++++++++
 .../redis/sentinel/SentinelRule.java          | 15 +++++++++++++
 .../reactive/SentinelReactiveCommandTest.java | 15 +++++++++++++
 .../redis/server/RandomResponseServer.java    | 15 +++++++++++++
 .../redis/server/RandomServerHandler.java     | 17 ++++++++++++++-
 .../lambdaworks/redis/support/CdiTest.java    | 15 +++++++++++++
 .../support/ConnectionPoolSupportTest.java    | 17 ++++++++++++++-
 .../redis/support/InjectedClient.java         | 15 +++++++++++++
 .../lambdaworks/redis/support/PersonDB.java   | 15 +++++++++++++
 .../RedisClusterClientFactoryBeanTest.java    | 15 +++++++++++++
 .../lambdaworks/redis/support/SpringTest.java | 15 +++++++++++++
 ...ConnectionDecoratingInvocationHandler.java | 15 +++++++++++++
 .../util/ReactiveSyncInvocationHandler.java   | 17 ++++++++++++++-
 .../util/RoutingInvocationHandler.java        | 15 +++++++++++++
 .../cluster/EmptyRedisChannelWriter.java      | 15 +++++++++++++
 .../cluster/EmptyRedisClusterClient.java      | 15 +++++++++++++
 .../cluster/EmptyStatefulRedisConnection.java | 15 +++++++++++++
 .../com/lambdaworks/redis/codec/JmhMain.java  | 15 +++++++++++++
 .../redis/codec/StringCodecBenchmark.java     | 15 +++++++++++++
 .../redis/codec/Utf8StringCodecBenchmark.java | 15 +++++++++++++
 .../redis/protocol/CommandBenchmark.java      | 15 +++++++++++++
 .../protocol/CommandHandlerBenchmark.java     | 15 +++++++++++++
 .../redis/protocol/EmptyByteBuf.java          | 15 +++++++++++++
 .../redis/protocol/EmptyClientResources.java  | 15 +++++++++++++
 .../redis/protocol/EmptyContext.java          | 15 +++++++++++++
 .../redis/protocol/EmptyFuture.java           | 15 +++++++++++++
 .../redis/protocol/EmptyPromise.java          | 15 +++++++++++++
 .../lambdaworks/redis/protocol/JmhMain.java   | 15 +++++++++++++
 .../protocol/RedisEndpointBenchmark.java      | 15 +++++++++++++
 .../protocol/RedisStateMachineBenchmark.java  | 15 +++++++++++++
 748 files changed, 10855 insertions(+), 229 deletions(-)

diff --git a/src/main/java/com/lambdaworks/codec/Base16.java b/src/main/java/com/lambdaworks/codec/Base16.java
index f7d606fbf2..39dce556d3 100644
--- a/src/main/java/com/lambdaworks/codec/Base16.java
+++ b/src/main/java/com/lambdaworks/codec/Base16.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.codec;
 
 /**
diff --git a/src/main/java/com/lambdaworks/codec/CRC16.java b/src/main/java/com/lambdaworks/codec/CRC16.java
index ff5fb4e880..219105a5f5 100644
--- a/src/main/java/com/lambdaworks/codec/CRC16.java
+++ b/src/main/java/com/lambdaworks/codec/CRC16.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.codec;
 
 /**
diff --git a/src/main/java/com/lambdaworks/codec/package-info.java b/src/main/java/com/lambdaworks/codec/package-info.java
index d1646d9b5f..c48584f769 100644
--- a/src/main/java/com/lambdaworks/codec/package-info.java
+++ b/src/main/java/com/lambdaworks/codec/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Base16 and CRC16 codecs.
  */
-package com.lambdaworks.codec;
\ No newline at end of file
+package com.lambdaworks.codec;
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
index 81bdb80876..e7aa3d9a4c 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.redis.protocol.CommandType.EXEC;
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
index 99596458c0..3d7ac014c7 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.io.Closeable;
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
index 99dd0fff10..7bff4ee261 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.redis.protocol.CommandType.EXEC;
diff --git a/src/main/java/com/lambdaworks/redis/BackpressureUtils.java b/src/main/java/com/lambdaworks/redis/BackpressureUtils.java
index df1a872817..227879d205 100644
--- a/src/main/java/com/lambdaworks/redis/BackpressureUtils.java
+++ b/src/main/java/com/lambdaworks/redis/BackpressureUtils.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.concurrent.atomic.AtomicLong;
@@ -39,4 +54,4 @@ public static long getAndSub(AtomicLong sequence, long toSub) {
 
         return r;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/lambdaworks/redis/BitFieldArgs.java b/src/main/java/com/lambdaworks/redis/BitFieldArgs.java
index 82ec346ccd..3c1b22d2b2 100644
--- a/src/main/java/com/lambdaworks/redis/BitFieldArgs.java
+++ b/src/main/java/com/lambdaworks/redis/BitFieldArgs.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/lambdaworks/redis/ChannelGroupListener.java b/src/main/java/com/lambdaworks/redis/ChannelGroupListener.java
index 167301a463..c2e67e9837 100644
--- a/src/main/java/com/lambdaworks/redis/ChannelGroupListener.java
+++ b/src/main/java/com/lambdaworks/redis/ChannelGroupListener.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import io.netty.channel.ChannelHandler;
diff --git a/src/main/java/com/lambdaworks/redis/ClientOptions.java b/src/main/java/com/lambdaworks/redis/ClientOptions.java
index bd9f162f39..9a685c065c 100644
--- a/src/main/java/com/lambdaworks/redis/ClientOptions.java
+++ b/src/main/java/com/lambdaworks/redis/ClientOptions.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/lambdaworks/redis/CloseEvents.java b/src/main/java/com/lambdaworks/redis/CloseEvents.java
index 0be034dfcd..2cd4b28498 100644
--- a/src/main/java/com/lambdaworks/redis/CloseEvents.java
+++ b/src/main/java/com/lambdaworks/redis/CloseEvents.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.Set;
diff --git a/src/main/java/com/lambdaworks/redis/CompositeArgument.java b/src/main/java/com/lambdaworks/redis/CompositeArgument.java
index 8864b65164..d7f2811e59 100644
--- a/src/main/java/com/lambdaworks/redis/CompositeArgument.java
+++ b/src/main/java/com/lambdaworks/redis/CompositeArgument.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import com.lambdaworks.redis.protocol.CommandArgs;
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java b/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java
index 2f6995d25a..767f6fd45f 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java b/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java
index 1810554d85..2178838e16 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java
+++ b/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionEvents.java b/src/main/java/com/lambdaworks/redis/ConnectionEvents.java
index e0309b8b26..64bd6839bb 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionEvents.java
+++ b/src/main/java/com/lambdaworks/redis/ConnectionEvents.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.Set;
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionId.java b/src/main/java/com/lambdaworks/redis/ConnectionId.java
index c69da6b514..bb14cd6383 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionId.java
+++ b/src/main/java/com/lambdaworks/redis/ConnectionId.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionPoint.java b/src/main/java/com/lambdaworks/redis/ConnectionPoint.java
index 3d033d181f..832fb4e8fe 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionPoint.java
+++ b/src/main/java/com/lambdaworks/redis/ConnectionPoint.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/EpollProvider.java b/src/main/java/com/lambdaworks/redis/EpollProvider.java
index b8323666e8..53a4609e3a 100644
--- a/src/main/java/com/lambdaworks/redis/EpollProvider.java
+++ b/src/main/java/com/lambdaworks/redis/EpollProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.lang.reflect.Constructor;
diff --git a/src/main/java/com/lambdaworks/redis/FutureSyncInvocationHandler.java b/src/main/java/com/lambdaworks/redis/FutureSyncInvocationHandler.java
index db0091d129..10d8600aea 100644
--- a/src/main/java/com/lambdaworks/redis/FutureSyncInvocationHandler.java
+++ b/src/main/java/com/lambdaworks/redis/FutureSyncInvocationHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/com/lambdaworks/redis/GeoArgs.java b/src/main/java/com/lambdaworks/redis/GeoArgs.java
index 2780ea6a64..1363207ac3 100644
--- a/src/main/java/com/lambdaworks/redis/GeoArgs.java
+++ b/src/main/java/com/lambdaworks/redis/GeoArgs.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import com.lambdaworks.redis.internal.LettuceAssert;
diff --git a/src/main/java/com/lambdaworks/redis/GeoCoordinates.java b/src/main/java/com/lambdaworks/redis/GeoCoordinates.java
index 6c600a9f25..8fcb4a5061 100644
--- a/src/main/java/com/lambdaworks/redis/GeoCoordinates.java
+++ b/src/main/java/com/lambdaworks/redis/GeoCoordinates.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import com.lambdaworks.redis.internal.LettuceAssert;
diff --git a/src/main/java/com/lambdaworks/redis/GeoRadiusStoreArgs.java b/src/main/java/com/lambdaworks/redis/GeoRadiusStoreArgs.java
index 65ba799269..9f959a4099 100644
--- a/src/main/java/com/lambdaworks/redis/GeoRadiusStoreArgs.java
+++ b/src/main/java/com/lambdaworks/redis/GeoRadiusStoreArgs.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import com.lambdaworks.redis.GeoArgs.Sort;
diff --git a/src/main/java/com/lambdaworks/redis/GeoWithin.java b/src/main/java/com/lambdaworks/redis/GeoWithin.java
index a17b9359b5..5029c91c94 100644
--- a/src/main/java/com/lambdaworks/redis/GeoWithin.java
+++ b/src/main/java/com/lambdaworks/redis/GeoWithin.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/JavaRuntime.java b/src/main/java/com/lambdaworks/redis/JavaRuntime.java
index ed8ee58eb7..a8e19d2aa1 100644
--- a/src/main/java/com/lambdaworks/redis/JavaRuntime.java
+++ b/src/main/java/com/lambdaworks/redis/JavaRuntime.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.redis.internal.LettuceClassUtils.isPresent;
diff --git a/src/main/java/com/lambdaworks/redis/KeyScanCursor.java b/src/main/java/com/lambdaworks/redis/KeyScanCursor.java
index 0618273719..b668145aaf 100644
--- a/src/main/java/com/lambdaworks/redis/KeyScanCursor.java
+++ b/src/main/java/com/lambdaworks/redis/KeyScanCursor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/lambdaworks/redis/KeyValue.java b/src/main/java/com/lambdaworks/redis/KeyValue.java
index 9e79063076..f3cc4e4470 100644
--- a/src/main/java/com/lambdaworks/redis/KeyValue.java
+++ b/src/main/java/com/lambdaworks/redis/KeyValue.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.Optional;
diff --git a/src/main/java/com/lambdaworks/redis/KillArgs.java b/src/main/java/com/lambdaworks/redis/KillArgs.java
index 1ecd269e74..8de347a246 100644
--- a/src/main/java/com/lambdaworks/redis/KillArgs.java
+++ b/src/main/java/com/lambdaworks/redis/KillArgs.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.redis.protocol.CommandKeyword.*;
diff --git a/src/main/java/com/lambdaworks/redis/LettuceFutures.java b/src/main/java/com/lambdaworks/redis/LettuceFutures.java
index a85a5cd3bd..93280ad30c 100644
--- a/src/main/java/com/lambdaworks/redis/LettuceFutures.java
+++ b/src/main/java/com/lambdaworks/redis/LettuceFutures.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.concurrent.ExecutionException;
diff --git a/src/main/java/com/lambdaworks/redis/LettuceStrings.java b/src/main/java/com/lambdaworks/redis/LettuceStrings.java
index 283cf9811e..6a9c668157 100644
--- a/src/main/java/com/lambdaworks/redis/LettuceStrings.java
+++ b/src/main/java/com/lambdaworks/redis/LettuceStrings.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/Limit.java b/src/main/java/com/lambdaworks/redis/Limit.java
index 87042362a0..d6c6193a47 100644
--- a/src/main/java/com/lambdaworks/redis/Limit.java
+++ b/src/main/java/com/lambdaworks/redis/Limit.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/MapScanCursor.java b/src/main/java/com/lambdaworks/redis/MapScanCursor.java
index 020dc818cf..a2b96b02fe 100644
--- a/src/main/java/com/lambdaworks/redis/MapScanCursor.java
+++ b/src/main/java/com/lambdaworks/redis/MapScanCursor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.LinkedHashMap;
diff --git a/src/main/java/com/lambdaworks/redis/MigrateArgs.java b/src/main/java/com/lambdaworks/redis/MigrateArgs.java
index f9d9b914c9..c8b5f6b660 100644
--- a/src/main/java/com/lambdaworks/redis/MigrateArgs.java
+++ b/src/main/java/com/lambdaworks/redis/MigrateArgs.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java b/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
index 83131cbf2a..5e9ee9d79e 100644
--- a/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
+++ b/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.redis.ConnectionEventTrigger.local;
diff --git a/src/main/java/com/lambdaworks/redis/Range.java b/src/main/java/com/lambdaworks/redis/Range.java
index 765c8a3cbd..1e8c1bdeb5 100644
--- a/src/main/java/com/lambdaworks/redis/Range.java
+++ b/src/main/java/com/lambdaworks/redis/Range.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import com.lambdaworks.redis.internal.LettuceAssert;
diff --git a/src/main/java/com/lambdaworks/redis/ReadFrom.java b/src/main/java/com/lambdaworks/redis/ReadFrom.java
index c727c18a78..2781ca412d 100644
--- a/src/main/java/com/lambdaworks/redis/ReadFrom.java
+++ b/src/main/java/com/lambdaworks/redis/ReadFrom.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/ReadFromImpl.java b/src/main/java/com/lambdaworks/redis/ReadFromImpl.java
index ec45fae1b1..2aac8034ca 100644
--- a/src/main/java/com/lambdaworks/redis/ReadFromImpl.java
+++ b/src/main/java/com/lambdaworks/redis/ReadFromImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java
index 41c17da718..71284ba949 100644
--- a/src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java b/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java
index f7b2e4c284..36aeb33951 100644
--- a/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java
+++ b/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.io.Closeable;
diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelInitializer.java b/src/main/java/com/lambdaworks/redis/RedisChannelInitializer.java
index e4674d41ef..4614df5550 100644
--- a/src/main/java/com/lambdaworks/redis/RedisChannelInitializer.java
+++ b/src/main/java/com/lambdaworks/redis/RedisChannelInitializer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.concurrent.Future;
diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelInitializerImpl.java b/src/main/java/com/lambdaworks/redis/RedisChannelInitializerImpl.java
index 66a7a51601..54143abbf1 100644
--- a/src/main/java/com/lambdaworks/redis/RedisChannelInitializerImpl.java
+++ b/src/main/java/com/lambdaworks/redis/RedisChannelInitializerImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import io.netty.channel.ChannelDuplexHandler;
diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelWriter.java b/src/main/java/com/lambdaworks/redis/RedisChannelWriter.java
index e9ff98b6c8..231eed05a7 100644
--- a/src/main/java/com/lambdaworks/redis/RedisChannelWriter.java
+++ b/src/main/java/com/lambdaworks/redis/RedisChannelWriter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.io.Closeable;
diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/com/lambdaworks/redis/RedisClient.java
index c90d311f2c..591fd723d5 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClient.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.redis.LettuceStrings.isEmpty;
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
index e6b43901ab..71878ab8df 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.redis.LettuceStrings.string;
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandExecutionException.java b/src/main/java/com/lambdaworks/redis/RedisCommandExecutionException.java
index 7b40d72542..854f5defd0 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandExecutionException.java
+++ b/src/main/java/com/lambdaworks/redis/RedisCommandExecutionException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandInterruptedException.java b/src/main/java/com/lambdaworks/redis/RedisCommandInterruptedException.java
index 2cfb344276..3c6d9cfe35 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandInterruptedException.java
+++ b/src/main/java/com/lambdaworks/redis/RedisCommandInterruptedException.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandTimeoutException.java b/src/main/java/com/lambdaworks/redis/RedisCommandTimeoutException.java
index 904140d0e4..57c8d4ea1e 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandTimeoutException.java
+++ b/src/main/java/com/lambdaworks/redis/RedisCommandTimeoutException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/RedisConnectionException.java b/src/main/java/com/lambdaworks/redis/RedisConnectionException.java
index 36181cd8b4..ba94c81453 100644
--- a/src/main/java/com/lambdaworks/redis/RedisConnectionException.java
+++ b/src/main/java/com/lambdaworks/redis/RedisConnectionException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java b/src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java
index 66662c9add..9c1f199ee3 100644
--- a/src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java
+++ b/src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java
@@ -1,4 +1,18 @@
-// Copyright (C) 2013 - ze.  All rights reserved.
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 /**
@@ -31,4 +45,4 @@ public interface RedisConnectionStateListener {
      * @param cause Caught exception.
      */
     void onRedisExceptionCaught(RedisChannelHandler<?, ?> connection, Throwable cause);
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/lambdaworks/redis/RedisException.java b/src/main/java/com/lambdaworks/redis/RedisException.java
index 5400e50426..8eeedf3337 100644
--- a/src/main/java/com/lambdaworks/redis/RedisException.java
+++ b/src/main/java/com/lambdaworks/redis/RedisException.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/RedisFuture.java b/src/main/java/com/lambdaworks/redis/RedisFuture.java
index cae755b022..0b7129582f 100644
--- a/src/main/java/com/lambdaworks/redis/RedisFuture.java
+++ b/src/main/java/com/lambdaworks/redis/RedisFuture.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.concurrent.CompletionStage;
diff --git a/src/main/java/com/lambdaworks/redis/RedisPublisher.java b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
index 9f25888566..c78cd2fa11 100644
--- a/src/main/java/com/lambdaworks/redis/RedisPublisher.java
+++ b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.io.IOException;
diff --git a/src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java
index 08f9e1e394..4e7d7888a5 100644
--- a/src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
diff --git a/src/main/java/com/lambdaworks/redis/RedisURI.java b/src/main/java/com/lambdaworks/redis/RedisURI.java
index 68993ce9f3..7461c0ffa3 100644
--- a/src/main/java/com/lambdaworks/redis/RedisURI.java
+++ b/src/main/java/com/lambdaworks/redis/RedisURI.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.redis.LettuceStrings.isEmpty;
diff --git a/src/main/java/com/lambdaworks/redis/ScanArgs.java b/src/main/java/com/lambdaworks/redis/ScanArgs.java
index 375684bca4..625886517d 100644
--- a/src/main/java/com/lambdaworks/redis/ScanArgs.java
+++ b/src/main/java/com/lambdaworks/redis/ScanArgs.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.redis.protocol.CommandKeyword.COUNT;
diff --git a/src/main/java/com/lambdaworks/redis/ScanCursor.java b/src/main/java/com/lambdaworks/redis/ScanCursor.java
index 297f8d2ad7..7ce6f744d5 100644
--- a/src/main/java/com/lambdaworks/redis/ScanCursor.java
+++ b/src/main/java/com/lambdaworks/redis/ScanCursor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import com.lambdaworks.redis.internal.LettuceAssert;
diff --git a/src/main/java/com/lambdaworks/redis/ScoredValue.java b/src/main/java/com/lambdaworks/redis/ScoredValue.java
index c288da7ba3..b18dfd0248 100644
--- a/src/main/java/com/lambdaworks/redis/ScoredValue.java
+++ b/src/main/java/com/lambdaworks/redis/ScoredValue.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.Optional;
diff --git a/src/main/java/com/lambdaworks/redis/ScoredValueScanCursor.java b/src/main/java/com/lambdaworks/redis/ScoredValueScanCursor.java
index 6cddadfe19..d34e139f6d 100644
--- a/src/main/java/com/lambdaworks/redis/ScoredValueScanCursor.java
+++ b/src/main/java/com/lambdaworks/redis/ScoredValueScanCursor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/lambdaworks/redis/ScriptOutputType.java b/src/main/java/com/lambdaworks/redis/ScriptOutputType.java
index 61984e799b..0de83d291d 100644
--- a/src/main/java/com/lambdaworks/redis/ScriptOutputType.java
+++ b/src/main/java/com/lambdaworks/redis/ScriptOutputType.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/SetArgs.java b/src/main/java/com/lambdaworks/redis/SetArgs.java
index 2c3f37c92e..46792705d7 100644
--- a/src/main/java/com/lambdaworks/redis/SetArgs.java
+++ b/src/main/java/com/lambdaworks/redis/SetArgs.java
@@ -1,6 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-// Copyright (C) 2013 - Vincent Rischmann.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import com.lambdaworks.redis.protocol.CommandArgs;
@@ -9,6 +21,7 @@
  * Argument list builder for the new redis <a href="http://redis.io/commands/set">SET</a> command starting from Redis 2.6.12.
  * Static import the methods from {@link Builder} and chain the method calls: {@code ex(10).nx()}.
  * 
+ * @author Will Glozer
  * @author Vincent Rischmann
  */
 public class SetArgs implements CompositeArgument {
diff --git a/src/main/java/com/lambdaworks/redis/SocketOptions.java b/src/main/java/com/lambdaworks/redis/SocketOptions.java
index bf1b1ba266..dc60be33b0 100644
--- a/src/main/java/com/lambdaworks/redis/SocketOptions.java
+++ b/src/main/java/com/lambdaworks/redis/SocketOptions.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/SortArgs.java b/src/main/java/com/lambdaworks/redis/SortArgs.java
index 87c4b53aef..fc009c5814 100644
--- a/src/main/java/com/lambdaworks/redis/SortArgs.java
+++ b/src/main/java/com/lambdaworks/redis/SortArgs.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.redis.protocol.CommandKeyword.*;
diff --git a/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java b/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
index 3cbf7bbb10..96e2184c1a 100644
--- a/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.redis.ConnectionEventTrigger.local;
diff --git a/src/main/java/com/lambdaworks/redis/SslOptions.java b/src/main/java/com/lambdaworks/redis/SslOptions.java
index d665f23a03..e09ae13e33 100644
--- a/src/main/java/com/lambdaworks/redis/SslOptions.java
+++ b/src/main/java/com/lambdaworks/redis/SslOptions.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.io.File;
diff --git a/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java b/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
index 1db6921758..8ce815ca42 100644
--- a/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.redis.protocol.CommandType.AUTH;
diff --git a/src/main/java/com/lambdaworks/redis/StreamScanCursor.java b/src/main/java/com/lambdaworks/redis/StreamScanCursor.java
index e3554dbe65..06e9258391 100644
--- a/src/main/java/com/lambdaworks/redis/StreamScanCursor.java
+++ b/src/main/java/com/lambdaworks/redis/StreamScanCursor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/TransactionResult.java b/src/main/java/com/lambdaworks/redis/TransactionResult.java
index e4103d4d0e..ebc27b6d84 100644
--- a/src/main/java/com/lambdaworks/redis/TransactionResult.java
+++ b/src/main/java/com/lambdaworks/redis/TransactionResult.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/Value.java b/src/main/java/com/lambdaworks/redis/Value.java
index 61c871bdd5..0c249e2680 100644
--- a/src/main/java/com/lambdaworks/redis/Value.java
+++ b/src/main/java/com/lambdaworks/redis/Value.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/lambdaworks/redis/ValueScanCursor.java b/src/main/java/com/lambdaworks/redis/ValueScanCursor.java
index 090f4db29c..4ce4fc16ba 100644
--- a/src/main/java/com/lambdaworks/redis/ValueScanCursor.java
+++ b/src/main/java/com/lambdaworks/redis/ValueScanCursor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/lambdaworks/redis/ZAddArgs.java b/src/main/java/com/lambdaworks/redis/ZAddArgs.java
index f9ca95b348..2137fcd3f1 100644
--- a/src/main/java/com/lambdaworks/redis/ZAddArgs.java
+++ b/src/main/java/com/lambdaworks/redis/ZAddArgs.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import com.lambdaworks.redis.protocol.CommandArgs;
diff --git a/src/main/java/com/lambdaworks/redis/ZStoreArgs.java b/src/main/java/com/lambdaworks/redis/ZStoreArgs.java
index 6be16621da..b0819c5d11 100644
--- a/src/main/java/com/lambdaworks/redis/ZStoreArgs.java
+++ b/src/main/java/com/lambdaworks/redis/ZStoreArgs.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.redis.protocol.CommandKeyword.*;
diff --git a/src/main/java/com/lambdaworks/redis/api/StatefulConnection.java b/src/main/java/com/lambdaworks/redis/api/StatefulConnection.java
index 02c3c01c2a..924a585e6a 100644
--- a/src/main/java/com/lambdaworks/redis/api/StatefulConnection.java
+++ b/src/main/java/com/lambdaworks/redis/api/StatefulConnection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/api/StatefulRedisConnection.java b/src/main/java/com/lambdaworks/redis/api/StatefulRedisConnection.java
index 94cbdeb24a..d0761e46c8 100644
--- a/src/main/java/com/lambdaworks/redis/api/StatefulRedisConnection.java
+++ b/src/main/java/com/lambdaworks/redis/api/StatefulRedisConnection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api;
 
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
diff --git a/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java
index eecb1630d4..6386425395 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java
index 890f2ebc7a..1f22ccf184 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.async;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
index e4a923d8d1..b2a04755de 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.async;
 
 import com.lambdaworks.redis.*;
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisHLLAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisHLLAsyncCommands.java
index 4fcda15ab6..ce8b5c8d24 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisHLLAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisHLLAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.async;
 
 import com.lambdaworks.redis.RedisFuture;
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java
index 03fb42c057..a06772c2a7 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java
index dcd7436618..ed80797eed 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.async;
 
 import java.util.Date;
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java
index 7a719ffbff..944dcd69b7 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisScriptingAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisScriptingAsyncCommands.java
index 5eed7171c1..b890923184 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisScriptingAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisScriptingAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
index 18453935e3..dfd6d79389 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.async;
 
 import java.util.Date;
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisSetAsyncCommands.java
index 5f3125ad92..54c2be87b2 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisSetAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
index 5d86c3ec7a..babe589e87 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
index 25cc1523db..90ac8f8c6e 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java
index 815b350750..71076f08d0 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/async/package-info.java b/src/main/java/com/lambdaworks/redis/api/async/package-info.java
index 4ac51e1ea8..b6fa5dbcde 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Standalone Redis API for asynchronous executed commands.
  */
-package com.lambdaworks.redis.api.async;
\ No newline at end of file
+package com.lambdaworks.redis.api.async;
diff --git a/src/main/java/com/lambdaworks/redis/api/package-info.java b/src/main/java/com/lambdaworks/redis/api/package-info.java
index a2d9537746..3449aa0a0f 100644
--- a/src/main/java/com/lambdaworks/redis/api/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/api/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Standalone Redis connection API.
  */
-package com.lambdaworks.redis.api;
\ No newline at end of file
+package com.lambdaworks.redis.api;
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java
index e2ff194e50..76d0fe8161 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.reactive;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java
index f57520c7b4..5eccc74ac6 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.reactive;
 
 import com.lambdaworks.redis.*;
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java
index 9e8696b8bf..953c1080b1 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.reactive;
 
 import reactor.core.publisher.Flux;
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java
index fe3c4ce58e..2804603b6e 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.reactive;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java
index bf31d9fd27..d5c232a2da 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.reactive;
 
 import java.util.Date;
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java
index c9f8cbbc37..704999d4c3 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.reactive;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java
index dbe5053db4..7e93617b93 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.reactive;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisScriptingReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisScriptingReactiveCommands.java
index 56e3a2ed3a..d8ee26f1a9 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisScriptingReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisScriptingReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.reactive;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
index ff02fa90f4..896c8173d4 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.reactive;
 
 import java.util.Date;
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java
index 23fbbf65a3..c6bac5e5ef 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.reactive;
 
 import java.util.Set;
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
index 5867b1a04d..4924a4758e 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.reactive;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java
index fda40cf542..09366de970 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.reactive;
 
 import java.util.Map;
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java
index 561816b98f..1bbc8a2107 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.reactive;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/package-info.java b/src/main/java/com/lambdaworks/redis/api/reactive/package-info.java
index 09f535d46b..bd72cba31d 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Standalone Redis API for commands executed in a reactive manner.
  */
-package com.lambdaworks.redis.api.reactive;
\ No newline at end of file
+package com.lambdaworks.redis.api.reactive;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java
index f1484d0192..fe72ac174b 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java
index 896bbcc23b..c8ce6c73fe 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.sync;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
index 88eea5e100..41ef7080e8 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.sync;
 
 import com.lambdaworks.redis.*;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisHLLCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisHLLCommands.java
index 1c2f72a1f6..aa7386298d 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisHLLCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisHLLCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.sync;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java
index 1460f29266..f3f535c878 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java
index f1b618feb0..07c301ecbc 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.sync;
 
 import java.util.Date;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java
index 6baa624022..734dfede07 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisScriptingCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisScriptingCommands.java
index 8f23f65c7a..69b676b36f 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisScriptingCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisScriptingCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
index 13cccac13e..27a1dfb6d4 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.sync;
 
 import java.util.Date;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisSetCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisSetCommands.java
index 6a67e804e2..acdb6856fc 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisSetCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisSetCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
index 182926e7a8..550745ae00 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
index 6b689e6f2f..26c194e20b 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java
index 197c205807..4a8a67a352 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/package-info.java b/src/main/java/com/lambdaworks/redis/api/sync/package-info.java
index 25444955f5..6e79bb0948 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Standalone Redis API for synchronous executed commands.
  */
-package com.lambdaworks.redis.api.sync;
\ No newline at end of file
+package com.lambdaworks.redis.api.sync;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java
index f0f3271315..cbe789b428 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/AsyncExecutionsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/AsyncExecutionsImpl.java
index 69ecbef51c..f655b024bf 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/AsyncExecutionsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/AsyncExecutionsImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.Collection;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java
index 9e573f5cdf..084b7fc5a7 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java
index 9b8935b299..1db9b7f4b2 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import com.lambdaworks.redis.RedisChannelWriter;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterConnectionProvider.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterConnectionProvider.java
index a27f803ad8..261564c5b1 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterConnectionProvider.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterConnectionProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.io.Closeable;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
index 6e85bba035..9513d69529 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static com.lambdaworks.redis.cluster.SlotHash.getSlot;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterEventListener.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterEventListener.java
index 852779784f..7dcc1b7976 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterEventListener.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterEventListener.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeEndpoint.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeEndpoint.java
index 3604b146e2..9103c6a71a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeEndpoint.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeEndpoint.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java
index afa9cb53fb..65eb194cea 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptions.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptions.java
index 25838259a8..f837009a54 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptions.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptions.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.*;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshScheduler.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshScheduler.java
index 07c963ded7..39d6250b6e 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshScheduler.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshScheduler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/DynamicAsyncNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/DynamicAsyncNodeSelection.java
index 305d7f29dd..9952c45420 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/DynamicAsyncNodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/DynamicAsyncNodeSelection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.HashMap;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/DynamicNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/DynamicNodeSelection.java
index be6fa3fcc5..a290dade50 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/DynamicNodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/DynamicNodeSelection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/DynamicSyncNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/DynamicSyncNodeSelection.java
index d8a1275478..f8d7a5f783 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/DynamicSyncNodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/DynamicSyncNodeSelection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.HashMap;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/MultiNodeExecution.java b/src/main/java/com/lambdaworks/redis/cluster/MultiNodeExecution.java
index 1418b9f554..7f4ee88078 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/MultiNodeExecution.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/MultiNodeExecution.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.lang.reflect.Proxy;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java b/src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java
index dcec2426d4..ca70b110c4 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PartitionAccessor.java b/src/main/java/com/lambdaworks/redis/cluster/PartitionAccessor.java
index 26b7dd0752..d83ba4baac 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PartitionAccessor.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/PartitionAccessor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensus.java b/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensus.java
index 47b53d19f3..64276a2e5c 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensus.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensus.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.Map;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensusImpl.java b/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensusImpl.java
index 8fda339be0..697fc358a8 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensusImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensusImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PipelinedRedisFuture.java b/src/main/java/com/lambdaworks/redis/cluster/PipelinedRedisFuture.java
index ae83fbd2da..798fbcf014 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PipelinedRedisFuture.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/PipelinedRedisFuture.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.Map;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java b/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
index 7c4ff9b0e9..22b6887406 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.net.InetSocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java b/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
index 92d5a2ad8e..8f708e2a6a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.HashSet;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ReconnectEventListener.java b/src/main/java/com/lambdaworks/redis/cluster/ReconnectEventListener.java
index b8891ac9f4..4a19ebde59 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ReconnectEventListener.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ReconnectEventListener.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import com.lambdaworks.redis.ConnectionEvents.Reconnect;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index 8df797e054..cb0867bd86 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static com.lambdaworks.redis.cluster.ClusterScanSupport.asyncClusterKeyScanCursorMapper;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index be4b0f2068..8d390ab2d0 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static com.lambdaworks.redis.cluster.ClusterScanSupport.reactiveClusterKeyScanCursorMapper;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index 44c97df19c..90093296e0 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.io.Closeable;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RoundRobin.java b/src/main/java/com/lambdaworks/redis/cluster/RoundRobin.java
index a2c311ffd5..7ca004e76d 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RoundRobin.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RoundRobin.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.Collection;
@@ -45,4 +60,4 @@ public V next() {
 
         return offset = collection.iterator().next();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java b/src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java
index 167d986f73..da553a8425 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/SlotHash.java b/src/main/java/com/lambdaworks/redis/cluster/SlotHash.java
index 680f9d3e16..a9df1901bf 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/SlotHash.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/SlotHash.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.nio.ByteBuffer;
@@ -135,4 +150,4 @@ static <K> Map<K, Integer> getSlots(Map<Integer, ? extends Iterable<K>> partitio
 
         return result;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
index 09344249f5..ce123aaf02 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static com.lambdaworks.redis.protocol.CommandType.AUTH;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StaticAsyncNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/StaticAsyncNodeSelection.java
index 33d524d836..4c398ad759 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/StaticAsyncNodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/StaticAsyncNodeSelection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.HashMap;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StaticNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/StaticNodeSelection.java
index d0df121af3..0136524b16 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/StaticNodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/StaticNodeSelection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StaticSyncNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/StaticSyncNodeSelection.java
index 8633afe788..0eed23e42a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/StaticSyncNodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/StaticSyncNodeSelection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.HashMap;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/SyncExecutionsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/SyncExecutionsImpl.java
index 1efbad9556..6359874730 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/SyncExecutionsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/SyncExecutionsImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.Collection;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/NodeSelectionSupport.java b/src/main/java/com/lambdaworks/redis/cluster/api/NodeSelectionSupport.java
index fe118badea..0429463909 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/NodeSelectionSupport.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/NodeSelectionSupport.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api;
 
 import java.util.Map;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java b/src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java
index b1dea48a96..30baedea74 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api;
 
 import com.lambdaworks.redis.ReadFrom;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncExecutions.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncExecutions.java
index a83f988074..16ac15791e 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncExecutions.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncExecutions.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.async;
 
 import java.util.*;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncNodeSelection.java
index 5a14b7df7e..23a2131197 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncNodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncNodeSelection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.async;
 
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
index fd757d0d91..e5643cf65a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionAsyncCommands.java
index 8d8dd297d3..c6b1b62d1c 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.async;
 
 import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
index 93e0c6e99e..0844bf1732 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.async;
 
 import com.lambdaworks.redis.*;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHLLAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHLLAsyncCommands.java
index c6de42ff6b..391a7db9ea 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHLLAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHLLAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.async;
 
 import com.lambdaworks.redis.RedisFuture;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java
index 43d9b3935f..2d9e8894f5 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java
index a6d7633c2d..7349be15d3 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.async;
 
 import java.util.Date;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java
index 083f1b89ff..d7fa53dea9 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionScriptingAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
index 8e84c5f285..b0e8006fb0 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java
index 7dcf7fd256..fdecccfa25 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.async;
 
 import java.util.Date;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java
index e12c0d5207..f00b8b5fd9 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
index f3579e7a21..9b62840312 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
index ef554b017f..382ff7a4e1 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
index 0bdacab505..fc913e0941 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java
index 6f3c8dd841..9e63cd812a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.async;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/package-info.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/package-info.java
index 2cdba3715e..ed12267be8 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Cluster API for asynchronous executed commands.
  */
-package com.lambdaworks.redis.cluster.api.async;
\ No newline at end of file
+package com.lambdaworks.redis.cluster.api.async;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/package-info.java b/src/main/java/com/lambdaworks/redis/cluster/api/package-info.java
index e2cee2c2c0..cf228a573c 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Cluster connection API.
  */
-package com.lambdaworks.redis.cluster.api;
\ No newline at end of file
+package com.lambdaworks.redis.cluster.api;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
index 1987f1d6a0..9da78d7d24 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.reactive;
 
 import java.util.Map;
@@ -282,4 +297,4 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      */
     Mono<Long> touch(K... keys);
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisClusterReactiveCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisClusterReactiveCommands.java
index 97f4289a34..0808aacaf8 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisClusterReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisClusterReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.reactive;
 
 import java.util.Map;
@@ -312,4 +327,4 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
      */
     Mono<Boolean> msetnx(Map<K, V> map);
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java
index 4cf3456595..30e8b76556 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Cluster API for commands executed in a reactive manner.
  */
-package com.lambdaworks.redis.cluster.api.reactive;
\ No newline at end of file
+package com.lambdaworks.redis.cluster.api.reactive;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
index d5bc731987..2100440d45 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java
index 2b3d889e22..f893cff23d 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.*;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelection.java
index 4aa55752c8..d89d79ac5d 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.sync;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionCommands.java
index fa5929a784..e85baa1f00 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.sync;
 
 import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
index dac1d65873..3dadf4b9ef 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.sync;
 
 import com.lambdaworks.redis.*;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHLLCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHLLCommands.java
index 39236a01a1..29f124010a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHLLCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHLLCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.sync;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java
index 07942954d7..ef2119b84e 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java
index 24b28c25f8..2494895f3c 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.Date;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java
index 9d4830c0ba..de8a6c67cf 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionScriptingCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionScriptingCommands.java
index e89b0132c6..efa3535149 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionScriptingCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionScriptingCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java
index c0554cdbf9..90205f9ec6 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.Date;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSetCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSetCommands.java
index ff8ade03ca..da18f015e3 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSetCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSetCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
index 30c15399f2..ef869892f1 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
index 98fecb27e7..d37b6344dc 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java
index 72492ab8ac..f301435685 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java
index 4d9dcf08d3..4621f7d0d1 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/package-info.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/package-info.java
index 2621d24a0b..8c779ca1f9 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Cluster API for synchronous executed commands.
  */
-package com.lambdaworks.redis.cluster.api.sync;
\ No newline at end of file
+package com.lambdaworks.redis.cluster.api.sync;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/event/ClusterTopologyChangedEvent.java b/src/main/java/com/lambdaworks/redis/cluster/event/ClusterTopologyChangedEvent.java
index 87c31aca4b..24adfab348 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/event/ClusterTopologyChangedEvent.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/event/ClusterTopologyChangedEvent.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.event;
 
 import java.util.Collections;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/ClusterPartitionParser.java b/src/main/java/com/lambdaworks/redis/cluster/models/partitions/ClusterPartitionParser.java
index 68ad37decf..a3ef6ea978 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/ClusterPartitionParser.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/models/partitions/ClusterPartitionParser.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.models.partitions;
 
 import java.util.*;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java b/src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java
index 26fd5b2c01..bfe97eaf48 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.models.partitions;
 
 import java.util.*;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNode.java b/src/main/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNode.java
index c3991977fe..e86037a1fe 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNode.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.models.partitions;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/package-info.java b/src/main/java/com/lambdaworks/redis/cluster/models/partitions/package-info.java
index 12cc10b0b2..761bc33538 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/models/partitions/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Model and parser for the {@code CLUSTER NODES} and {@code CLUSTER SLAVES} output.
  */
-package com.lambdaworks.redis.cluster.models.partitions;
\ No newline at end of file
+package com.lambdaworks.redis.cluster.models.partitions;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java b/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java
index fa6e9502de..e09320e577 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.models.slots;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParser.java b/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParser.java
index 38b1743ff0..90ed428d3d 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParser.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParser.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.models.slots;
 
 import java.util.*;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/slots/package-info.java b/src/main/java/com/lambdaworks/redis/cluster/models/slots/package-info.java
index 973d70a9ff..288791e2d9 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/slots/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/models/slots/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Model and parser for the {@code CLUSTER SLOTS} output.
  */
-package com.lambdaworks.redis.cluster.models.slots;
\ No newline at end of file
+package com.lambdaworks.redis.cluster.models.slots;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/package-info.java b/src/main/java/com/lambdaworks/redis/cluster/package-info.java
index 6f2c3f8807..18a2d1dc02 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Client for Redis Cluster, see {@link com.lambdaworks.redis.cluster.RedisClusterClient}.
  */
-package com.lambdaworks.redis.cluster;
\ No newline at end of file
+package com.lambdaworks.redis.cluster;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
index 178bdeebcc..2606a06f93 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.topology;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java b/src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java
index 711f171975..dadfb03c68 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.topology;
 
 import java.util.Map;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java b/src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java
index 45d6250a87..f2edcac8b0 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.topology;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyView.java b/src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyView.java
index e346b19d78..6fb1b51ceb 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyView.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyView.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.topology;
 
 import java.util.concurrent.ExecutionException;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViews.java b/src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViews.java
index 3b984f4be9..9a04065935 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViews.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViews.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.topology;
 
 import com.lambdaworks.redis.RedisURI;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/RedisClusterNodeSnapshot.java b/src/main/java/com/lambdaworks/redis/cluster/topology/RedisClusterNodeSnapshot.java
index 5a66793ef6..694f1e5f09 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/RedisClusterNodeSnapshot.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/RedisClusterNodeSnapshot.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.topology;
 
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java b/src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java
index 0e7d9179c7..e49f068a13 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.topology;
 
 import java.util.Map;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/TimedAsyncCommand.java b/src/main/java/com/lambdaworks/redis/cluster/topology/TimedAsyncCommand.java
index d7e5a6e5bd..31900e54c9 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/TimedAsyncCommand.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/TimedAsyncCommand.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.topology;
 
 import com.lambdaworks.redis.protocol.AsyncCommand;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/TopologyComparators.java b/src/main/java/com/lambdaworks/redis/cluster/topology/TopologyComparators.java
index 16e4c94ab0..5eca01d168 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/TopologyComparators.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/TopologyComparators.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.topology;
 
 import java.util.Collections;
diff --git a/src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java b/src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java
index 23e9d8ee47..ac9622a005 100644
--- a/src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java
+++ b/src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.codec;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/codec/ByteBufferInputStream.java b/src/main/java/com/lambdaworks/redis/codec/ByteBufferInputStream.java
index 805d42dea7..9575f0af21 100644
--- a/src/main/java/com/lambdaworks/redis/codec/ByteBufferInputStream.java
+++ b/src/main/java/com/lambdaworks/redis/codec/ByteBufferInputStream.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.codec;
 
 import java.io.IOException;
diff --git a/src/main/java/com/lambdaworks/redis/codec/CompressionCodec.java b/src/main/java/com/lambdaworks/redis/codec/CompressionCodec.java
index 6b166685e6..c710f0efc1 100644
--- a/src/main/java/com/lambdaworks/redis/codec/CompressionCodec.java
+++ b/src/main/java/com/lambdaworks/redis/codec/CompressionCodec.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.codec;
 
 import java.io.ByteArrayOutputStream;
diff --git a/src/main/java/com/lambdaworks/redis/codec/RedisCodec.java b/src/main/java/com/lambdaworks/redis/codec/RedisCodec.java
index afcc3771ac..1bbde04db4 100644
--- a/src/main/java/com/lambdaworks/redis/codec/RedisCodec.java
+++ b/src/main/java/com/lambdaworks/redis/codec/RedisCodec.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.codec;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/codec/StringCodec.java b/src/main/java/com/lambdaworks/redis/codec/StringCodec.java
index 08a773fd2b..168ffd2ca2 100644
--- a/src/main/java/com/lambdaworks/redis/codec/StringCodec.java
+++ b/src/main/java/com/lambdaworks/redis/codec/StringCodec.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.codec;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/codec/ToByteBufEncoder.java b/src/main/java/com/lambdaworks/redis/codec/ToByteBufEncoder.java
index 719001e94d..a25c322813 100644
--- a/src/main/java/com/lambdaworks/redis/codec/ToByteBufEncoder.java
+++ b/src/main/java/com/lambdaworks/redis/codec/ToByteBufEncoder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.codec;
 
 import io.netty.buffer.ByteBuf;
diff --git a/src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java b/src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java
index 5d258cfd71..3b84c36dec 100644
--- a/src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java
+++ b/src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.codec;
 
 import static java.nio.charset.CoderResult.OVERFLOW;
diff --git a/src/main/java/com/lambdaworks/redis/codec/package-info.java b/src/main/java/com/lambdaworks/redis/codec/package-info.java
index b6f3fa5e50..82dcb30d79 100644
--- a/src/main/java/com/lambdaworks/redis/codec/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/codec/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Codecs for key/value type conversion.
  */
-package com.lambdaworks.redis.codec;
\ No newline at end of file
+package com.lambdaworks.redis.codec;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java b/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java
index 653fe7630c..c843058071 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import java.util.Iterator;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java
index fb4dcdb736..1a3bdddd77 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import com.lambdaworks.redis.RedisException;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java
index fc9a03adc1..d2043d8ce9 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import com.lambdaworks.redis.protocol.RedisCommand;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
index c4bb1a854e..b7a357648d 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import java.lang.annotation.Annotation;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java
index 43b13024b6..0a5db54566 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
index fcf2c8c12e..436e6c76c0 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
index 1ef12a7eab..cbd4cada03 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import com.lambdaworks.redis.codec.RedisCodec;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java b/src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java
index 4f1370a502..b96b7a6585 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import java.util.Arrays;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java b/src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java
index 749a245727..4cb1297498 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import java.lang.reflect.Method;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java b/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
index 39ba93b877..11707fa617 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import static com.lambdaworks.redis.protocol.CommandKeyword.LIMIT;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java
index 7935a4783b..3799bd2ca4 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import com.lambdaworks.redis.codec.RedisCodec;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveWrappers.java b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveWrappers.java
index c8fb206aa7..32abe54f4d 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveWrappers.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveWrappers.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import java.util.HashSet;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
index 74a1a3a8b8..eb83ac3dab 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import java.lang.reflect.Method;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java
index abc6ebcb88..a0e02acc19 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import java.lang.reflect.Method;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java
index 13a4aba102..1fcb8ee625 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.annotation;
 
 import com.lambdaworks.redis.dynamic.domain.Timeout;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/CommandNaming.java b/src/main/java/com/lambdaworks/redis/dynamic/annotation/CommandNaming.java
index deaba6de23..cc4d4957d0 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/CommandNaming.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/annotation/CommandNaming.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.annotation;
 
 import java.lang.annotation.*;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Key.java b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Key.java
index 3f2d1bbc47..fdc61163e9 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Key.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Key.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.annotation;
 
 import java.lang.annotation.*;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Param.java b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Param.java
index 1f939dbdef..f52117a6da 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Param.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Param.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.annotation;
 
 import java.lang.annotation.*;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Value.java b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Value.java
index 9eef7135e6..729f125193 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Value.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Value.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.annotation;
 
 import java.lang.annotation.*;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/annotation/package-info.java
index 492b5ff59c..00242bde76 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/annotation/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Central domain abstractions to be used in combination with Redis Command interfaces.
  */
-package com.lambdaworks.redis.dynamic.annotation;
\ No newline at end of file
+package com.lambdaworks.redis.dynamic.annotation;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java
index a8a52f78bc..cc39dc3c7c 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.codec;
 
 import java.util.Collections;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/codec/RedisCodecResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/codec/RedisCodecResolver.java
index 7b463c71e7..593046455a 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/codec/RedisCodecResolver.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/codec/RedisCodecResolver.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.codec;
 
 import com.lambdaworks.redis.codec.RedisCodec;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/domain/Timeout.java b/src/main/java/com/lambdaworks/redis/dynamic/domain/Timeout.java
index 0c8e6b0b7e..513ae812ca 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/domain/Timeout.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/domain/Timeout.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.domain;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/domain/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/domain/package-info.java
index 86723bb0a4..66a8ab00ad 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/domain/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/domain/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Core annotations to be used with Redis Command interfaces.
  */
-package com.lambdaworks.redis.dynamic.domain;
\ No newline at end of file
+package com.lambdaworks.redis.dynamic.domain;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/DefaultMethodInvocation.java b/src/main/java/com/lambdaworks/redis/dynamic/intercept/DefaultMethodInvocation.java
index 7e474e337b..a7698a3101 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/DefaultMethodInvocation.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/intercept/DefaultMethodInvocation.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.intercept;
 
 import java.lang.reflect.Method;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java
index 38a81d48bc..62427bd4ac 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.intercept;
 
 import java.lang.reflect.Method;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptor.java b/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptor.java
index 79d2aa0e28..b7af3a53ad 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptor.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.intercept;
 
 /**
@@ -21,4 +36,4 @@ public interface MethodInterceptor {
      */
     Object invoke(MethodInvocation invocation) throws Throwable;
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInvocation.java b/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInvocation.java
index 62c31e921b..c16b5a9baf 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInvocation.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInvocation.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.intercept;
 
 import java.lang.reflect.Method;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/intercept/package-info.java
index e3c1fb4dc6..dfeb3d6fa9 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/intercept/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Invocation proxy support.
  */
-package com.lambdaworks.redis.dynamic.intercept;
\ No newline at end of file
+package com.lambdaworks.redis.dynamic.intercept;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java
index a4cb773f54..96d322686a 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.output;
 
 import java.util.HashMap;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java
index 8c5e015e58..ca6c55ed22 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.output;
 
 import com.lambdaworks.redis.codec.RedisCodec;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactoryResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactoryResolver.java
index b850071cf9..95988051a9 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactoryResolver.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactoryResolver.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.output;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java b/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java
index e6728b00bb..ac42786ddb 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.output;
 
 import com.lambdaworks.redis.dynamic.support.TypeInformation;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java
index faefd91fa6..9db55512bf 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.output;
 
 import java.util.*;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
index a2ebdf79be..eac5f588a0 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.output;
 
 import java.util.Collection;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java
index f8847004b1..528a399fdb 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.output;
 
 import java.util.Collections;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java
index c4fc40c650..1a90bb556f 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.output;
 
 import com.lambdaworks.redis.dynamic.support.TypeInformation;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/VoidOutput.java b/src/main/java/com/lambdaworks/redis/dynamic/output/VoidOutput.java
index e40365cf0f..6a5049154c 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/VoidOutput.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/VoidOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/output/package-info.java
index a8cd29d577..e558ad6cbf 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/package-info.java
@@ -1,4 +1,4 @@
 /**
  * {@link com.lambdaworks.redis.output.CommandOutput} resolution support.
  */
-package com.lambdaworks.redis.dynamic.output;
\ No newline at end of file
+package com.lambdaworks.redis.dynamic.output;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/package-info.java
index 7ffe3d5810..d3d087a524 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Core package for Redis Command Interface support through {@link com.lambdaworks.redis.dynamic.RedisCommandFactory}.
  */
-package com.lambdaworks.redis.dynamic;
\ No newline at end of file
+package com.lambdaworks.redis.dynamic;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java
index 0d005d5c93..9ef1364bfa 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.parameter;
 
 import java.lang.reflect.Method;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/MethodParametersAccessor.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/MethodParametersAccessor.java
index b6ee14a87b..32ca58b0e4 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/MethodParametersAccessor.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/parameter/MethodParametersAccessor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.parameter;
 
 import java.util.Iterator;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameter.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameter.java
index 194b2b5079..8a19eda8af 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameter.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.parameter;
 
 import java.lang.annotation.Annotation;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java
index 81d4019462..58e321fadb 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.parameter;
 
 import com.lambdaworks.redis.internal.LettuceAssert;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/package-info.java
index 55df8656d4..4ddb28ac0f 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/parameter/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Parameter access and descriptors.
  */
-package com.lambdaworks.redis.dynamic.parameter;
\ No newline at end of file
+package com.lambdaworks.redis.dynamic.parameter;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactory.java
index fa1dffff20..061252a7cb 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactory.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.segment;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java b/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java
index c2ad12ae70..9559682c62 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.segment;
 
 import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java
index 732f3809eb..2a9dd84b66 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.segment;
 
 import com.lambdaworks.redis.dynamic.CommandMethod;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegments.java b/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegments.java
index f5bb6798e0..2ade7d378d 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegments.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegments.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.segment;
 
 import java.util.Collections;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/segment/package-info.java
index 10ae382b47..2826cdedf7 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/segment/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/segment/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Support for {@link com.lambdaworks.redis.dynamic.segment.CommandSegments} and segment parsing.
  */
-package com.lambdaworks.redis.dynamic.segment;
\ No newline at end of file
+package com.lambdaworks.redis.dynamic.segment;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/AnnotationParameterNameDiscoverer.java b/src/main/java/com/lambdaworks/redis/dynamic/support/AnnotationParameterNameDiscoverer.java
index 83f02ba428..73a33b5a64 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/AnnotationParameterNameDiscoverer.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/AnnotationParameterNameDiscoverer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.support;
 
 import java.lang.annotation.Annotation;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java
index 55a060fcbe..b61bd415db 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.support;
 
 import java.lang.ref.Reference;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/CompositeParameterNameDiscoverer.java b/src/main/java/com/lambdaworks/redis/dynamic/support/CompositeParameterNameDiscoverer.java
index 4cf525d656..4d803c6ec4 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/CompositeParameterNameDiscoverer.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/CompositeParameterNameDiscoverer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.support;
 
 import java.lang.reflect.Constructor;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java
index 09f6550496..cc67c7743f 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.support;
 
 import java.lang.reflect.Array;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/GenericTypeResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/support/GenericTypeResolver.java
index 72f755316d..b74e13026a 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/GenericTypeResolver.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/GenericTypeResolver.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.support;
 
 import java.lang.reflect.ParameterizedType;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/MethodParameter.java b/src/main/java/com/lambdaworks/redis/dynamic/support/MethodParameter.java
index a930641538..e93c65c263 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/MethodParameter.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/MethodParameter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.support;
 
 import java.lang.annotation.Annotation;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ParameterNameDiscoverer.java b/src/main/java/com/lambdaworks/redis/dynamic/support/ParameterNameDiscoverer.java
index e08bd72840..5794365a3a 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/ParameterNameDiscoverer.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/ParameterNameDiscoverer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.support;
 
 import java.lang.reflect.Constructor;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java
index aa410bd455..014cb1dc4a 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.support;
 
 import java.lang.reflect.ParameterizedType;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ParentTypeAwareTypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/ParentTypeAwareTypeInformation.java
index cc275b940c..935b5064a2 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/ParentTypeAwareTypeInformation.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/ParentTypeAwareTypeInformation.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.support;
 
 import java.lang.reflect.Type;
@@ -76,4 +91,4 @@ public int hashCode() {
 
         return this.hashCode;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ReflectionUtils.java b/src/main/java/com/lambdaworks/redis/dynamic/support/ReflectionUtils.java
index 5498d76493..4bcd5a6561 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/ReflectionUtils.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/ReflectionUtils.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.support;
 
 import java.lang.reflect.*;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java b/src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java
index f07d27ae1a..cdf77b954e 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.support;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/StandardReflectionParameterNameDiscoverer.java b/src/main/java/com/lambdaworks/redis/dynamic/support/StandardReflectionParameterNameDiscoverer.java
index 112f578497..a7c826fa48 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/StandardReflectionParameterNameDiscoverer.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/StandardReflectionParameterNameDiscoverer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.support;
 
 import java.lang.reflect.Constructor;
@@ -40,4 +55,4 @@ public String[] getParameterNames(Constructor<?> ctor) {
         return parameterNames;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java
index fcd76111ee..d3b16a66e2 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.support;
 
 import java.lang.reflect.*;
@@ -362,4 +377,4 @@ public Object getSource() {
             return this.typeVariableMap;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java
index 1ac8c6b53d..bd615bd4a5 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.support;
 
 import java.lang.reflect.Constructor;
@@ -112,4 +127,4 @@ public interface TypeInformation<S> {
      * @return
      */
     List<TypeInformation<?>> getTypeArguments();
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java
index 7d9c1c9623..8d94a71bdd 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.support;
 
 import java.lang.reflect.ParameterizedType;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeWrapper.java b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeWrapper.java
index 7da1badd2b..9e784ab900 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeWrapper.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeWrapper.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.support;
 
 import java.io.IOException;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/support/package-info.java
index 8ae763c2a2..283d71df4b 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Support classes imported from the Spring Framework.
  */
-package com.lambdaworks.redis.dynamic.support;
\ No newline at end of file
+package com.lambdaworks.redis.dynamic.support;
diff --git a/src/main/java/com/lambdaworks/redis/event/DefaultEventBus.java b/src/main/java/com/lambdaworks/redis/event/DefaultEventBus.java
index 08dea5b637..a80911706a 100644
--- a/src/main/java/com/lambdaworks/redis/event/DefaultEventBus.java
+++ b/src/main/java/com/lambdaworks/redis/event/DefaultEventBus.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event;
 
 import reactor.core.publisher.Flux;
diff --git a/src/main/java/com/lambdaworks/redis/event/DefaultEventPublisherOptions.java b/src/main/java/com/lambdaworks/redis/event/DefaultEventPublisherOptions.java
index c05ca16c91..2283d574a6 100644
--- a/src/main/java/com/lambdaworks/redis/event/DefaultEventPublisherOptions.java
+++ b/src/main/java/com/lambdaworks/redis/event/DefaultEventPublisherOptions.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/event/Event.java b/src/main/java/com/lambdaworks/redis/event/Event.java
index 36ea26332c..c6101cadcc 100644
--- a/src/main/java/com/lambdaworks/redis/event/Event.java
+++ b/src/main/java/com/lambdaworks/redis/event/Event.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/event/EventBus.java b/src/main/java/com/lambdaworks/redis/event/EventBus.java
index 7f65d7d0e4..758c8ca44f 100644
--- a/src/main/java/com/lambdaworks/redis/event/EventBus.java
+++ b/src/main/java/com/lambdaworks/redis/event/EventBus.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event;
 
 import reactor.core.publisher.Flux;
diff --git a/src/main/java/com/lambdaworks/redis/event/EventPublisherOptions.java b/src/main/java/com/lambdaworks/redis/event/EventPublisherOptions.java
index 91264e4607..5fbeed4fd7 100644
--- a/src/main/java/com/lambdaworks/redis/event/EventPublisherOptions.java
+++ b/src/main/java/com/lambdaworks/redis/event/EventPublisherOptions.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/event/connection/ConnectedEvent.java b/src/main/java/com/lambdaworks/redis/event/connection/ConnectedEvent.java
index dddc33fcd5..4f5644113e 100644
--- a/src/main/java/com/lambdaworks/redis/event/connection/ConnectedEvent.java
+++ b/src/main/java/com/lambdaworks/redis/event/connection/ConnectedEvent.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event.connection;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionActivatedEvent.java b/src/main/java/com/lambdaworks/redis/event/connection/ConnectionActivatedEvent.java
index 1681e35002..0c67cf0a4f 100644
--- a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionActivatedEvent.java
+++ b/src/main/java/com/lambdaworks/redis/event/connection/ConnectionActivatedEvent.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event.connection;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionDeactivatedEvent.java b/src/main/java/com/lambdaworks/redis/event/connection/ConnectionDeactivatedEvent.java
index 497f8fe833..17ef1a9bc6 100644
--- a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionDeactivatedEvent.java
+++ b/src/main/java/com/lambdaworks/redis/event/connection/ConnectionDeactivatedEvent.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event.connection;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEvent.java b/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEvent.java
index b1205cce95..f8a26c0d53 100644
--- a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEvent.java
+++ b/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEvent.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event.connection;
 
 import com.lambdaworks.redis.ConnectionId;
diff --git a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEventSupport.java b/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEventSupport.java
index f07be809e8..1834d8572e 100644
--- a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEventSupport.java
+++ b/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEventSupport.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event.connection;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/event/connection/DisconnectedEvent.java b/src/main/java/com/lambdaworks/redis/event/connection/DisconnectedEvent.java
index cf4b93cebe..d425ae58de 100644
--- a/src/main/java/com/lambdaworks/redis/event/connection/DisconnectedEvent.java
+++ b/src/main/java/com/lambdaworks/redis/event/connection/DisconnectedEvent.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event.connection;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/event/metrics/CommandLatencyEvent.java b/src/main/java/com/lambdaworks/redis/event/metrics/CommandLatencyEvent.java
index 46494f46b2..68acb8f97b 100644
--- a/src/main/java/com/lambdaworks/redis/event/metrics/CommandLatencyEvent.java
+++ b/src/main/java/com/lambdaworks/redis/event/metrics/CommandLatencyEvent.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event.metrics;
 
 import java.util.Map;
diff --git a/src/main/java/com/lambdaworks/redis/event/metrics/DefaultCommandLatencyEventPublisher.java b/src/main/java/com/lambdaworks/redis/event/metrics/DefaultCommandLatencyEventPublisher.java
index a961508d95..3771565a82 100644
--- a/src/main/java/com/lambdaworks/redis/event/metrics/DefaultCommandLatencyEventPublisher.java
+++ b/src/main/java/com/lambdaworks/redis/event/metrics/DefaultCommandLatencyEventPublisher.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event.metrics;
 
 import com.lambdaworks.redis.event.EventBus;
diff --git a/src/main/java/com/lambdaworks/redis/event/metrics/MetricEventPublisher.java b/src/main/java/com/lambdaworks/redis/event/metrics/MetricEventPublisher.java
index c9f3260e13..2ed948a5f4 100644
--- a/src/main/java/com/lambdaworks/redis/event/metrics/MetricEventPublisher.java
+++ b/src/main/java/com/lambdaworks/redis/event/metrics/MetricEventPublisher.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event.metrics;
 
 import com.lambdaworks.redis.event.Event;
diff --git a/src/main/java/com/lambdaworks/redis/internal/AbstractInvocationHandler.java b/src/main/java/com/lambdaworks/redis/internal/AbstractInvocationHandler.java
index 5c65ee40cf..fb3846e4db 100644
--- a/src/main/java/com/lambdaworks/redis/internal/AbstractInvocationHandler.java
+++ b/src/main/java/com/lambdaworks/redis/internal/AbstractInvocationHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.internal;
 
 import java.lang.reflect.InvocationHandler;
diff --git a/src/main/java/com/lambdaworks/redis/internal/HostAndPort.java b/src/main/java/com/lambdaworks/redis/internal/HostAndPort.java
index b5517bc943..d6e2fb0c76 100644
--- a/src/main/java/com/lambdaworks/redis/internal/HostAndPort.java
+++ b/src/main/java/com/lambdaworks/redis/internal/HostAndPort.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.internal;
 
 import com.lambdaworks.redis.LettuceStrings;
diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceAssert.java b/src/main/java/com/lambdaworks/redis/internal/LettuceAssert.java
index ae5c415b71..611a6bf4d1 100644
--- a/src/main/java/com/lambdaworks/redis/internal/LettuceAssert.java
+++ b/src/main/java/com/lambdaworks/redis/internal/LettuceAssert.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.internal;
 
 import com.lambdaworks.redis.LettuceStrings;
diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java b/src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java
index 740775c1f5..80708cca51 100644
--- a/src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java
+++ b/src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.internal;
 
 import java.util.IdentityHashMap;
diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceFactories.java b/src/main/java/com/lambdaworks/redis/internal/LettuceFactories.java
index dde084d96d..d8f93dd18a 100644
--- a/src/main/java/com/lambdaworks/redis/internal/LettuceFactories.java
+++ b/src/main/java/com/lambdaworks/redis/internal/LettuceFactories.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.internal;
 
 import java.util.ArrayDeque;
diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceLists.java b/src/main/java/com/lambdaworks/redis/internal/LettuceLists.java
index 36a59e37c1..f66374e8f7 100644
--- a/src/main/java/com/lambdaworks/redis/internal/LettuceLists.java
+++ b/src/main/java/com/lambdaworks/redis/internal/LettuceLists.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.internal;
 
 import java.util.*;
diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceSets.java b/src/main/java/com/lambdaworks/redis/internal/LettuceSets.java
index 1392d6d7b1..2499ab4ecc 100644
--- a/src/main/java/com/lambdaworks/redis/internal/LettuceSets.java
+++ b/src/main/java/com/lambdaworks/redis/internal/LettuceSets.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.internal;
 
 import java.util.Collection;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java
index 68c3e81a4d..1357f7102a 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import java.util.*;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java
index a066bd5c4c..a7adcd5f5f 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import com.lambdaworks.redis.ReadFrom;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
index 478ba20023..887537faf7 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import static com.lambdaworks.redis.masterslave.MasterSlaveUtils.findNodeByHostAndPort;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java
index 2ed40412cd..cdbc5c9508 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java
index bdd72922ed..860e429771 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import static com.lambdaworks.redis.masterslave.MasterSlaveUtils.findNodeByUri;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveUtils.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveUtils.java
index 284340cec5..39004c084c 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveUtils.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveUtils.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import java.util.Collection;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java b/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
index c48043db4c..6df5ed08bf 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import java.util.HashSet;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/RedisMasterSlaveNode.java b/src/main/java/com/lambdaworks/redis/masterslave/RedisMasterSlaveNode.java
index c92ab7282e..0bfd9b9fa2 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/RedisMasterSlaveNode.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/RedisMasterSlaveNode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import com.lambdaworks.redis.RedisURI;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyProvider.java b/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyProvider.java
index 79ec00c98e..f040ba88ae 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyProvider.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import static com.lambdaworks.redis.masterslave.MasterSlaveUtils.CODEC;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java b/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
index 6070aba35c..2dd728f4c3 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import java.io.Closeable;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnection.java b/src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnection.java
index 4532e1c143..8b6d2d50f3 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnection.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import com.lambdaworks.redis.ReadFrom;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnectionImpl.java b/src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
index 9eb9823641..04cca47e98 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTopologyProvider.java b/src/main/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTopologyProvider.java
index 010d959f34..93e6085311 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTopologyProvider.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTopologyProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import java.util.*;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/Timeout.java b/src/main/java/com/lambdaworks/redis/masterslave/Timeout.java
index b8c37cbfb7..6cad33ddea 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/Timeout.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/Timeout.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/TopologyProvider.java b/src/main/java/com/lambdaworks/redis/masterslave/TopologyProvider.java
index dd354647e2..7711e382d9 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/TopologyProvider.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/TopologyProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollector.java b/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollector.java
index f3de206bc4..c4761a89b3 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollector.java
+++ b/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollector.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.metrics;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollectorOptions.java b/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollectorOptions.java
index 8c3c4cd1ab..5f88d11b6d 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollectorOptions.java
+++ b/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollectorOptions.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.metrics;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyId.java b/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyId.java
index a468385d3a..a2016c87aa 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyId.java
+++ b/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyId.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.metrics;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/lambdaworks/redis/metrics/CommandMetrics.java b/src/main/java/com/lambdaworks/redis/metrics/CommandMetrics.java
index 49c0f67667..f8747c906c 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/CommandMetrics.java
+++ b/src/main/java/com/lambdaworks/redis/metrics/CommandMetrics.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.metrics;
 
 import java.util.Map;
diff --git a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java b/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java
index 986104373d..46d07a7e90 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java
+++ b/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.metrics;
 
 import com.lambdaworks.redis.metrics.CommandMetrics.CommandLatency;
diff --git a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorOptions.java b/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorOptions.java
index 6723979266..8a56a323d1 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorOptions.java
+++ b/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorOptions.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.metrics;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/metrics/MetricCollector.java b/src/main/java/com/lambdaworks/redis/metrics/MetricCollector.java
index 5dc2147b74..4fde596c65 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/MetricCollector.java
+++ b/src/main/java/com/lambdaworks/redis/metrics/MetricCollector.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.metrics;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/models/command/CommandDetail.java b/src/main/java/com/lambdaworks/redis/models/command/CommandDetail.java
index ee09ba3be7..215764ca77 100644
--- a/src/main/java/com/lambdaworks/redis/models/command/CommandDetail.java
+++ b/src/main/java/com/lambdaworks/redis/models/command/CommandDetail.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.models.command;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/lambdaworks/redis/models/command/CommandDetailParser.java b/src/main/java/com/lambdaworks/redis/models/command/CommandDetailParser.java
index acc4b30515..7689b996b1 100644
--- a/src/main/java/com/lambdaworks/redis/models/command/CommandDetailParser.java
+++ b/src/main/java/com/lambdaworks/redis/models/command/CommandDetailParser.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.models.command;
 
 import java.util.*;
diff --git a/src/main/java/com/lambdaworks/redis/models/command/package-info.java b/src/main/java/com/lambdaworks/redis/models/command/package-info.java
index 005f9672b7..d4dacfe222 100644
--- a/src/main/java/com/lambdaworks/redis/models/command/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/models/command/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Model and parser to for the {@code COMMAND} and {@code COMMAND INFO} output.
  */
-package com.lambdaworks.redis.models.command;
\ No newline at end of file
+package com.lambdaworks.redis.models.command;
diff --git a/src/main/java/com/lambdaworks/redis/models/role/RedisInstance.java b/src/main/java/com/lambdaworks/redis/models/role/RedisInstance.java
index 9f0350037f..0fa1dad871 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/RedisInstance.java
+++ b/src/main/java/com/lambdaworks/redis/models/role/RedisInstance.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.models.role;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/models/role/RedisMasterInstance.java b/src/main/java/com/lambdaworks/redis/models/role/RedisMasterInstance.java
index 7cf17e9a68..f9d51f709b 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/RedisMasterInstance.java
+++ b/src/main/java/com/lambdaworks/redis/models/role/RedisMasterInstance.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.models.role;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/lambdaworks/redis/models/role/RedisNodeDescription.java b/src/main/java/com/lambdaworks/redis/models/role/RedisNodeDescription.java
index 2115a47646..c224aaf64e 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/RedisNodeDescription.java
+++ b/src/main/java/com/lambdaworks/redis/models/role/RedisNodeDescription.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.models.role;
 
 import com.lambdaworks.redis.RedisURI;
diff --git a/src/main/java/com/lambdaworks/redis/models/role/RedisSentinelInstance.java b/src/main/java/com/lambdaworks/redis/models/role/RedisSentinelInstance.java
index 9ecb882924..c596d89c53 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/RedisSentinelInstance.java
+++ b/src/main/java/com/lambdaworks/redis/models/role/RedisSentinelInstance.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.models.role;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/lambdaworks/redis/models/role/RedisSlaveInstance.java b/src/main/java/com/lambdaworks/redis/models/role/RedisSlaveInstance.java
index 8b25f9a9f2..854cb579ff 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/RedisSlaveInstance.java
+++ b/src/main/java/com/lambdaworks/redis/models/role/RedisSlaveInstance.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.models.role;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/lambdaworks/redis/models/role/ReplicationPartner.java b/src/main/java/com/lambdaworks/redis/models/role/ReplicationPartner.java
index aa7f7cad76..524b3cdf41 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/ReplicationPartner.java
+++ b/src/main/java/com/lambdaworks/redis/models/role/ReplicationPartner.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.models.role;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/lambdaworks/redis/models/role/RoleParser.java b/src/main/java/com/lambdaworks/redis/models/role/RoleParser.java
index 0f14b00a8a..34e8ac7d81 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/RoleParser.java
+++ b/src/main/java/com/lambdaworks/redis/models/role/RoleParser.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.models.role;
 
 import java.util.*;
diff --git a/src/main/java/com/lambdaworks/redis/models/role/package-info.java b/src/main/java/com/lambdaworks/redis/models/role/package-info.java
index b833561008..884e807c15 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/models/role/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Model and parser for the {@code ROLE} output.
  */
-package com.lambdaworks.redis.models.role;
\ No newline at end of file
+package com.lambdaworks.redis.models.role;
diff --git a/src/main/java/com/lambdaworks/redis/output/ArrayOutput.java b/src/main/java/com/lambdaworks/redis/output/ArrayOutput.java
index 19957b2cc5..9f0b91d053 100644
--- a/src/main/java/com/lambdaworks/redis/output/ArrayOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ArrayOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/BooleanListOutput.java b/src/main/java/com/lambdaworks/redis/output/BooleanListOutput.java
index 8c33bd01df..b95fa2e3fa 100644
--- a/src/main/java/com/lambdaworks/redis/output/BooleanListOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/BooleanListOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.util.ArrayList;
@@ -11,9 +24,9 @@
 /**
  * {@link java.util.List} of boolean output.
  *
- * @author Will Glozer
  * @param <K> Key type.
  * @param <V> Value type.
+ * @author Will Glozer
  */
 public class BooleanListOutput<K, V> extends CommandOutput<K, V, List<Boolean>> implements StreamingOutput<Boolean> {
 
diff --git a/src/main/java/com/lambdaworks/redis/output/BooleanOutput.java b/src/main/java/com/lambdaworks/redis/output/BooleanOutput.java
index 42dd2ed102..4a06f52b4e 100644
--- a/src/main/java/com/lambdaworks/redis/output/BooleanOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/BooleanOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/ByteArrayOutput.java b/src/main/java/com/lambdaworks/redis/output/ByteArrayOutput.java
index 02d9727537..3351d44968 100644
--- a/src/main/java/com/lambdaworks/redis/output/ByteArrayOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ByteArrayOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2012 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/CommandOutput.java b/src/main/java/com/lambdaworks/redis/output/CommandOutput.java
index 46902888b0..a78970aff2 100644
--- a/src/main/java/com/lambdaworks/redis/output/CommandOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/CommandOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
@@ -13,10 +26,10 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @param <T> Output type.
- * 
  * @author Will Glozer
  */
 public abstract class CommandOutput<K, V, T> {
+
     protected final RedisCodec<K, V> codec;
     protected T output;
     protected String error;
diff --git a/src/main/java/com/lambdaworks/redis/output/DateOutput.java b/src/main/java/com/lambdaworks/redis/output/DateOutput.java
index 11c522f9b4..ae9403da62 100644
--- a/src/main/java/com/lambdaworks/redis/output/DateOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/DateOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.util.Date;
diff --git a/src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java b/src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java
index 10408b5965..78c14fd7a8 100644
--- a/src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java
+++ b/src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.util.Iterator;
diff --git a/src/main/java/com/lambdaworks/redis/output/DoubleOutput.java b/src/main/java/com/lambdaworks/redis/output/DoubleOutput.java
index e108d21ebf..b30b3ab642 100644
--- a/src/main/java/com/lambdaworks/redis/output/DoubleOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/DoubleOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java b/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java
index c080f63555..dcb175549b 100644
--- a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import static java.lang.Double.parseDouble;
diff --git a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutput.java b/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutput.java
index 66beae9741..bd36d82441 100644
--- a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import static java.lang.Double.parseDouble;
diff --git a/src/main/java/com/lambdaworks/redis/output/GeoWithinListOutput.java b/src/main/java/com/lambdaworks/redis/output/GeoWithinListOutput.java
index ea9100ac51..f6c1f24caa 100644
--- a/src/main/java/com/lambdaworks/redis/output/GeoWithinListOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/GeoWithinListOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import static java.lang.Double.parseDouble;
diff --git a/src/main/java/com/lambdaworks/redis/output/IntegerOutput.java b/src/main/java/com/lambdaworks/redis/output/IntegerOutput.java
index 6ccd94b9e7..612cb35104 100644
--- a/src/main/java/com/lambdaworks/redis/output/IntegerOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/IntegerOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyListOutput.java b/src/main/java/com/lambdaworks/redis/output/KeyListOutput.java
index e74757bd02..bc3d03347e 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyListOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/KeyListOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyOutput.java b/src/main/java/com/lambdaworks/redis/output/KeyOutput.java
index e0906c3f50..866a99ecce 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/KeyOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2013 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyScanOutput.java b/src/main/java/com/lambdaworks/redis/output/KeyScanOutput.java
index b8f7ca9672..022e51c86f 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyScanOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/KeyScanOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyScanStreamingOutput.java b/src/main/java/com/lambdaworks/redis/output/KeyScanStreamingOutput.java
index 61f5a2f167..3d3316ddc1 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyScanStreamingOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/KeyScanStreamingOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyStreamingChannel.java b/src/main/java/com/lambdaworks/redis/output/KeyStreamingChannel.java
index bf97f8ff6b..418b866185 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyStreamingChannel.java
+++ b/src/main/java/com/lambdaworks/redis/output/KeyStreamingChannel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyStreamingOutput.java b/src/main/java/com/lambdaworks/redis/output/KeyStreamingOutput.java
index b24a34d462..9837f4a0e8 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyStreamingOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/KeyStreamingOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueListOutput.java b/src/main/java/com/lambdaworks/redis/output/KeyValueListOutput.java
index 2da58e2714..04edc56cd0 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyValueListOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/KeyValueListOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueOutput.java b/src/main/java/com/lambdaworks/redis/output/KeyValueOutput.java
index b3519b9c48..0222f2b1da 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyValueOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/KeyValueOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import com.lambdaworks.redis.KeyValue;
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueScanStreamingOutput.java b/src/main/java/com/lambdaworks/redis/output/KeyValueScanStreamingOutput.java
index 3f73e3721e..019cd9473d 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyValueScanStreamingOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/KeyValueScanStreamingOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingChannel.java b/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingChannel.java
index 73ab97729b..94370bd48e 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingChannel.java
+++ b/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingChannel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingOutput.java b/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingOutput.java
index 567b84e8de..366ce5cdb3 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/ListOfMapsOutput.java b/src/main/java/com/lambdaworks/redis/output/ListOfMapsOutput.java
index 214164a420..ce021060cf 100644
--- a/src/main/java/com/lambdaworks/redis/output/ListOfMapsOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ListOfMapsOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/ListSubscriber.java b/src/main/java/com/lambdaworks/redis/output/ListSubscriber.java
index 6dbd8fea1f..b2a54d40d4 100644
--- a/src/main/java/com/lambdaworks/redis/output/ListSubscriber.java
+++ b/src/main/java/com/lambdaworks/redis/output/ListSubscriber.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/output/MapOutput.java b/src/main/java/com/lambdaworks/redis/output/MapOutput.java
index 781871ed23..5344c5bc52 100644
--- a/src/main/java/com/lambdaworks/redis/output/MapOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/MapOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/MapScanOutput.java b/src/main/java/com/lambdaworks/redis/output/MapScanOutput.java
index 45a440f8ab..1844e2d827 100644
--- a/src/main/java/com/lambdaworks/redis/output/MapScanOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/MapScanOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/MultiOutput.java b/src/main/java/com/lambdaworks/redis/output/MultiOutput.java
index 728005da56..3cdfd0100e 100644
--- a/src/main/java/com/lambdaworks/redis/output/MultiOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/MultiOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/NestedMultiOutput.java b/src/main/java/com/lambdaworks/redis/output/NestedMultiOutput.java
index 7f8b725c10..d72a2bc399 100644
--- a/src/main/java/com/lambdaworks/redis/output/NestedMultiOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/NestedMultiOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/ScanOutput.java b/src/main/java/com/lambdaworks/redis/output/ScanOutput.java
index 975c6f4bf6..5b38f8da5d 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScanOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ScanOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueListOutput.java b/src/main/java/com/lambdaworks/redis/output/ScoredValueListOutput.java
index 26ee186a43..2d30b990e4 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScoredValueListOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ScoredValueListOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
@@ -15,7 +28,6 @@
  *
  * @param <K> Key type.
  * @param <V> Value type.
- *
  * @author Will Glozer
  */
 public class ScoredValueListOutput<K, V> extends CommandOutput<K, V, List<ScoredValue<V>>>
diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueScanOutput.java b/src/main/java/com/lambdaworks/redis/output/ScoredValueScanOutput.java
index bb59960891..87ea706fed 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScoredValueScanOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ScoredValueScanOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueScanStreamingOutput.java b/src/main/java/com/lambdaworks/redis/output/ScoredValueScanStreamingOutput.java
index 571284884a..11e5174b10 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScoredValueScanStreamingOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ScoredValueScanStreamingOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingChannel.java b/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingChannel.java
index ba7db3c2ba..33eaa2b3c1 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingChannel.java
+++ b/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingChannel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import com.lambdaworks.redis.ScoredValue;
diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingOutput.java b/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingOutput.java
index 90ac7cca3f..782b0987de 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/StatusOutput.java b/src/main/java/com/lambdaworks/redis/output/StatusOutput.java
index 39046a018c..32d52e27a1 100644
--- a/src/main/java/com/lambdaworks/redis/output/StatusOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/StatusOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/StreamingChannel.java b/src/main/java/com/lambdaworks/redis/output/StreamingChannel.java
index 91aca606b9..2fc0bbe3c9 100644
--- a/src/main/java/com/lambdaworks/redis/output/StreamingChannel.java
+++ b/src/main/java/com/lambdaworks/redis/output/StreamingChannel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/output/StreamingOutput.java b/src/main/java/com/lambdaworks/redis/output/StreamingOutput.java
index 4b84752f2b..0849803bfb 100644
--- a/src/main/java/com/lambdaworks/redis/output/StreamingOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/StreamingOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/output/StringListOutput.java b/src/main/java/com/lambdaworks/redis/output/StringListOutput.java
index c1fef0a6f1..206d45a930 100644
--- a/src/main/java/com/lambdaworks/redis/output/StringListOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/StringListOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/StringValueListOutput.java b/src/main/java/com/lambdaworks/redis/output/StringValueListOutput.java
index 14b18755f0..7a669dabfa 100644
--- a/src/main/java/com/lambdaworks/redis/output/StringValueListOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/StringValueListOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueListOutput.java b/src/main/java/com/lambdaworks/redis/output/ValueListOutput.java
index a22e0b129d..5a3a302a83 100644
--- a/src/main/java/com/lambdaworks/redis/output/ValueListOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ValueListOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueOutput.java b/src/main/java/com/lambdaworks/redis/output/ValueOutput.java
index b250ce6e95..d8ee0bdc44 100644
--- a/src/main/java/com/lambdaworks/redis/output/ValueOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ValueOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueScanOutput.java b/src/main/java/com/lambdaworks/redis/output/ValueScanOutput.java
index 1a7e976682..eabfeb2ae8 100644
--- a/src/main/java/com/lambdaworks/redis/output/ValueScanOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ValueScanOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueScanStreamingOutput.java b/src/main/java/com/lambdaworks/redis/output/ValueScanStreamingOutput.java
index e3415fa530..4abc1feda2 100644
--- a/src/main/java/com/lambdaworks/redis/output/ValueScanStreamingOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ValueScanStreamingOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueSetOutput.java b/src/main/java/com/lambdaworks/redis/output/ValueSetOutput.java
index 92afce5cc1..2870303e50 100644
--- a/src/main/java/com/lambdaworks/redis/output/ValueSetOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ValueSetOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueStreamingChannel.java b/src/main/java/com/lambdaworks/redis/output/ValueStreamingChannel.java
index 0ce8633de7..e90e5db115 100644
--- a/src/main/java/com/lambdaworks/redis/output/ValueStreamingChannel.java
+++ b/src/main/java/com/lambdaworks/redis/output/ValueStreamingChannel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueStreamingOutput.java b/src/main/java/com/lambdaworks/redis/output/ValueStreamingOutput.java
index bcb7a9c179..0fae37d092 100644
--- a/src/main/java/com/lambdaworks/redis/output/ValueStreamingOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ValueStreamingOutput.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueValueListOutput.java b/src/main/java/com/lambdaworks/redis/output/ValueValueListOutput.java
index 1f0b4d6d9a..030edba528 100644
--- a/src/main/java/com/lambdaworks/redis/output/ValueValueListOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/ValueValueListOutput.java
@@ -1,4 +1,19 @@
 
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/output/package-info.java b/src/main/java/com/lambdaworks/redis/output/package-info.java
index b966f88ce3..988528e46d 100644
--- a/src/main/java/com/lambdaworks/redis/output/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/output/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Implementation of different output protocols including the Streaming API.
  */
-package com.lambdaworks.redis.output;
\ No newline at end of file
+package com.lambdaworks.redis.output;
diff --git a/src/main/java/com/lambdaworks/redis/package-info.java b/src/main/java/com/lambdaworks/redis/package-info.java
index 82adf0e005..a55a3a7f0f 100644
--- a/src/main/java/com/lambdaworks/redis/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/package-info.java
@@ -1,4 +1,4 @@
 /**
  * The redis client package containing {@link com.lambdaworks.redis.RedisClient} for regular and sentinel operations.
  */
-package com.lambdaworks.redis;
\ No newline at end of file
+package com.lambdaworks.redis;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/AsyncCommand.java b/src/main/java/com/lambdaworks/redis/protocol/AsyncCommand.java
index 50773f9923..8018ada89f 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/AsyncCommand.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/AsyncCommand.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.util.concurrent.CompletableFuture;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java b/src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java
index 7aab8637f7..bc574c6d52 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import com.lambdaworks.redis.RedisException;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/ChannelLogDescriptor.java b/src/main/java/com/lambdaworks/redis/protocol/ChannelLogDescriptor.java
index adfeac8ea7..28b2936a72 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ChannelLogDescriptor.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/ChannelLogDescriptor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import io.netty.channel.Channel;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/Command.java b/src/main/java/com/lambdaworks/redis/protocol/Command.java
index 26fdfd5e2b..aea8e5de0d 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/Command.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/Command.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import com.lambdaworks.redis.internal.LettuceAssert;
@@ -191,4 +204,4 @@ public long getFirstResponse() {
     public long getCompleted() {
         return completedNs;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java b/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
index edbc8e8b26..21878cf8cf 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java b/src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java
index 1562f3ea7c..a9eb2430b9 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.nio.charset.Charset;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java b/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
index 13db3aeec8..8a8533a040 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.io.IOException;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandKeyword.java b/src/main/java/com/lambdaworks/redis/protocol/CommandKeyword.java
index de906e0b13..990b48daa7 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandKeyword.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandKeyword.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandType.java b/src/main/java/com/lambdaworks/redis/protocol/CommandType.java
index e21d1366c7..5e087a0cde 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandType.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandType.java
@@ -1,11 +1,25 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 /**
  * Redis commands.
  *
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public enum CommandType implements ProtocolKeyword {
     // Connection
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandWrapper.java b/src/main/java/com/lambdaworks/redis/protocol/CommandWrapper.java
index c05f0ea1b4..56d1ad0806 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandWrapper.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandWrapper.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CompleteableCommand.java b/src/main/java/com/lambdaworks/redis/protocol/CompleteableCommand.java
index 3d2479c549..f3747dd315 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CompleteableCommand.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CompleteableCommand.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.util.function.Consumer;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/ConnectionFacade.java b/src/main/java/com/lambdaworks/redis/protocol/ConnectionFacade.java
index 5040f9622b..9ab1ae349e 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ConnectionFacade.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/ConnectionFacade.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java b/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
index 254367a555..8699004b30 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/DecoratedCommand.java b/src/main/java/com/lambdaworks/redis/protocol/DecoratedCommand.java
index ca2968156b..56f46acf0c 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/DecoratedCommand.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/DecoratedCommand.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java b/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
index 8f0b46b394..d03091b20f 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import static com.lambdaworks.redis.protocol.CommandHandler.SUPPRESS_IO_EXCEPTION_MESSAGES;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/Endpoint.java b/src/main/java/com/lambdaworks/redis/protocol/Endpoint.java
index 294257fe67..0ac5736e15 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/Endpoint.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/Endpoint.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.util.Optional;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java b/src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java
index 05eb9bcadf..37beac56ab 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.util.Queue;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/LettuceCharsets.java b/src/main/java/com/lambdaworks/redis/protocol/LettuceCharsets.java
index f3b785952a..e6724aeb4b 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/LettuceCharsets.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/LettuceCharsets.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/ProtocolKeyword.java b/src/main/java/com/lambdaworks/redis/protocol/ProtocolKeyword.java
index 39ee43f1f6..13398a58c4 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ProtocolKeyword.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/ProtocolKeyword.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/protocol/QueuedCommands.java b/src/main/java/com/lambdaworks/redis/protocol/QueuedCommands.java
index 6353f740e8..67094a0c89 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/QueuedCommands.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/QueuedCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java b/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java
index aac7e43823..3b8a9a4dc9 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionListener.java b/src/main/java/com/lambdaworks/redis/protocol/ReconnectionListener.java
index 533cd13609..902bc6f279 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionListener.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/ReconnectionListener.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import com.lambdaworks.redis.ConnectionEvents;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/RedisCommand.java b/src/main/java/com/lambdaworks/redis/protocol/RedisCommand.java
index 507b678918..a5dac8dfc0 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/RedisCommand.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/RedisCommand.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import com.lambdaworks.redis.output.CommandOutput;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java b/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
index a8d96f5869..f0a096b481 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import static com.lambdaworks.redis.protocol.LettuceCharsets.buffer;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/SharedLock.java b/src/main/java/com/lambdaworks/redis/protocol/SharedLock.java
index 55956ba3ab..10446df6cd 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/SharedLock.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/SharedLock.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.util.concurrent.atomic.AtomicLong;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/TransactionalCommand.java b/src/main/java/com/lambdaworks/redis/protocol/TransactionalCommand.java
index 8630e8af2c..2a281f7ffb 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/TransactionalCommand.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/TransactionalCommand.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.util.concurrent.CountDownLatch;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/WithLatency.java b/src/main/java/com/lambdaworks/redis/protocol/WithLatency.java
index 7f8ed7c7df..cad57a5ce7 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/WithLatency.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/WithLatency.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/protocol/package-info.java b/src/main/java/com/lambdaworks/redis/protocol/package-info.java
index 07967b0b47..a84a938889 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis protocol layer abstraction.
  */
-package com.lambdaworks.redis.protocol;
\ No newline at end of file
+package com.lambdaworks.redis.protocol;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandArgs.java b/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandArgs.java
index d20788e73d..d6ddd852d7 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandArgs.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandArgs.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandBuilder.java b/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandBuilder.java
index 3bba1b8f0c..72793d2625 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub;
 
 import static com.lambdaworks.redis.protocol.CommandKeyword.CHANNELS;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java b/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java
index 0b03c2e9fa..752c7788fe 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub;
 
 import com.lambdaworks.redis.codec.RedisCodec;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java b/src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java
index a35ed3c8b8..ffc3682013 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubOutput.java b/src/main/java/com/lambdaworks/redis/pubsub/PubSubOutput.java
index aace0280c2..2060d771dd 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubOutput.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/PubSubOutput.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub;
 
 import java.nio.ByteBuffer;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAdapter.java b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAdapter.java
index de04d28b52..bd7e0133dc 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAdapter.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAdapter.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
index 1a11b1e1ed..81f0897173 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub;
 
 import java.util.List;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubListener.java b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubListener.java
index 8a94f3afd4..32c29d4e39 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubListener.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubListener.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub;
 
 /**
@@ -7,7 +20,6 @@
  * 
  * @param <K> Key type.
  * @param <V> Value type.
- * 
  * @author Will Glozer
  */
 public interface RedisPubSubListener<K, V> {
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
index 6677f6cbdc..53d76d2d23 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub;
 
 import java.util.Map;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java
index f71b755729..3a0729cd80 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub;
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
index 938b34a0d5..b7a0c06a06 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub;
 
 import java.lang.reflect.Array;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java b/src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java
index 68a7f2d2a4..0d5b35a31d 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub.api.async;
 
 import com.lambdaworks.redis.RedisFuture;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/async/package-info.java b/src/main/java/com/lambdaworks/redis/pubsub/api/async/package-info.java
index b29a6841e0..f82360b4bb 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/async/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/async/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Pub/Sub Redis API for asynchronous executed commands.
  */
-package com.lambdaworks.redis.pubsub.api.async;
\ No newline at end of file
+package com.lambdaworks.redis.pubsub.api.async;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/ChannelMessage.java b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/ChannelMessage.java
index ee2e2f3e37..32a7ca75b5 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/ChannelMessage.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/ChannelMessage.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub.api.reactive;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/PatternMessage.java b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/PatternMessage.java
index d210c5b7d7..135166ca7c 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/PatternMessage.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/PatternMessage.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub.api.reactive;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java
index d4dc4d613d..4fb69e964c 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub.api.reactive;
 
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java
index 4a134068c8..17e7b200e6 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Pub/Sub Redis API for commands executed in a reactive manner.
  */
-package com.lambdaworks.redis.pubsub.api.reactive;
\ No newline at end of file
+package com.lambdaworks.redis.pubsub.api.reactive;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java b/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java
index f124325d46..77b6b0aed1 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub.api.sync;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/package-info.java b/src/main/java/com/lambdaworks/redis/pubsub/api/sync/package-info.java
index ece5c9d7e5..3def5e254a 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/sync/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Pub/Sub Redis API for synchronous executed commands.
  */
-package com.lambdaworks.redis.pubsub.api.sync;
\ No newline at end of file
+package com.lambdaworks.redis.pubsub.api.sync;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/package-info.java b/src/main/java/com/lambdaworks/redis/pubsub/package-info.java
index d68879e934..b698510a89 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Pub/Sub connection classes.
  */
-package com.lambdaworks.redis.pubsub;
\ No newline at end of file
+package com.lambdaworks.redis.pubsub;
diff --git a/src/main/java/com/lambdaworks/redis/resource/ClientResources.java b/src/main/java/com/lambdaworks/redis/resource/ClientResources.java
index 10e258caf7..1070fa7901 100644
--- a/src/main/java/com/lambdaworks/redis/resource/ClientResources.java
+++ b/src/main/java/com/lambdaworks/redis/resource/ClientResources.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/resource/ConstantDelay.java b/src/main/java/com/lambdaworks/redis/resource/ConstantDelay.java
index 51cb3d3ab2..4776e2050a 100644
--- a/src/main/java/com/lambdaworks/redis/resource/ConstantDelay.java
+++ b/src/main/java/com/lambdaworks/redis/resource/ConstantDelay.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java b/src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java
index 370ae51bd9..5e0b072fb0 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
index 25b464e969..da71c46ecb 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import static com.lambdaworks.redis.resource.Futures.toBooleanPromise;
diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProvider.java b/src/main/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProvider.java
index c51dc914ed..1059262c3a 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProvider.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import static com.lambdaworks.redis.resource.Futures.toBooleanPromise;
diff --git a/src/main/java/com/lambdaworks/redis/resource/Delay.java b/src/main/java/com/lambdaworks/redis/resource/Delay.java
index 4d7ee3e5f9..d1c8ca4773 100644
--- a/src/main/java/com/lambdaworks/redis/resource/Delay.java
+++ b/src/main/java/com/lambdaworks/redis/resource/Delay.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java b/src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java
index 08eaa61798..64cf2d2bea 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import java.io.Closeable;
diff --git a/src/main/java/com/lambdaworks/redis/resource/DnsResolver.java b/src/main/java/com/lambdaworks/redis/resource/DnsResolver.java
index 59c71b4b9e..5412201d31 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DnsResolver.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DnsResolver.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import java.net.InetAddress;
diff --git a/src/main/java/com/lambdaworks/redis/resource/DnsResolvers.java b/src/main/java/com/lambdaworks/redis/resource/DnsResolvers.java
index d342c6fc58..8d971ef01f 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DnsResolvers.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DnsResolvers.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import java.net.InetAddress;
diff --git a/src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java b/src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java
index 500200dc5a..954dbe581e 100644
--- a/src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java
+++ b/src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/resource/EventLoopGroupProvider.java b/src/main/java/com/lambdaworks/redis/resource/EventLoopGroupProvider.java
index f9368462e1..5f7cf33fba 100644
--- a/src/main/java/com/lambdaworks/redis/resource/EventLoopGroupProvider.java
+++ b/src/main/java/com/lambdaworks/redis/resource/EventLoopGroupProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java b/src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java
index 87449415bd..445588ed79 100644
--- a/src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java
+++ b/src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java b/src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java
index c1843360cc..428fdcc662 100644
--- a/src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java
+++ b/src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/resource/Futures.java b/src/main/java/com/lambdaworks/redis/resource/Futures.java
index e3a5de9893..c9df5ab771 100644
--- a/src/main/java/com/lambdaworks/redis/resource/Futures.java
+++ b/src/main/java/com/lambdaworks/redis/resource/Futures.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import java.util.LinkedHashSet;
diff --git a/src/main/java/com/lambdaworks/redis/resource/SocketAddressResolver.java b/src/main/java/com/lambdaworks/redis/resource/SocketAddressResolver.java
index 041fb724fa..35ed36580a 100644
--- a/src/main/java/com/lambdaworks/redis/resource/SocketAddressResolver.java
+++ b/src/main/java/com/lambdaworks/redis/resource/SocketAddressResolver.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import java.net.InetAddress;
diff --git a/src/main/java/com/lambdaworks/redis/resource/package-info.java b/src/main/java/com/lambdaworks/redis/resource/package-info.java
index fed7ad5ff9..6fdd5e515f 100644
--- a/src/main/java/com/lambdaworks/redis/resource/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/resource/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Client resource infrastructure providers.
  */
-package com.lambdaworks.redis.resource;
\ No newline at end of file
+package com.lambdaworks.redis.resource;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
index 5c3aeeb1e9..7eb0e135c2 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.sentinel;
 
 import java.net.InetSocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
index 2a168de5f4..e0e5d426c5 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.sentinel;
 
 import java.net.InetSocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/SentinelCommandBuilder.java b/src/main/java/com/lambdaworks/redis/sentinel/SentinelCommandBuilder.java
index 57001f983c..b26203c3d8 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/SentinelCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/SentinelCommandBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.sentinel;
 
 import static com.lambdaworks.redis.protocol.CommandKeyword.FAILOVER;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java b/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
index 8be3d00d42..a0e2254c02 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.sentinel;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/StatefulRedisSentinelConnection.java b/src/main/java/com/lambdaworks/redis/sentinel/api/StatefulRedisSentinelConnection.java
index 034ba3396e..e559f47483 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/StatefulRedisSentinelConnection.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/StatefulRedisSentinelConnection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.sentinel.api;
 
 import com.lambdaworks.redis.api.StatefulConnection;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java b/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java
index 677012500d..73fe33bc13 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.sentinel.api.async;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/async/package-info.java b/src/main/java/com/lambdaworks/redis/sentinel/api/async/package-info.java
index 96dfcd1ffa..b58008bef1 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/async/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/async/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Sentinel API for asynchronous executed commands.
  */
-package com.lambdaworks.redis.sentinel.api.async;
\ No newline at end of file
+package com.lambdaworks.redis.sentinel.api.async;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/package-info.java b/src/main/java/com/lambdaworks/redis/sentinel/api/package-info.java
index e00fe614b6..088f267527 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Sentinel connection API.
  */
-package com.lambdaworks.redis.sentinel.api;
\ No newline at end of file
+package com.lambdaworks.redis.sentinel.api;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java b/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java
index ab430d1d4d..c623cf36b3 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.sentinel.api.reactive;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/package-info.java b/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/package-info.java
index fe9fedf806..09c4f53bb4 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Sentinel API for commands executed in a reactive manner.
  */
-package com.lambdaworks.redis.sentinel.api.reactive;
\ No newline at end of file
+package com.lambdaworks.redis.sentinel.api.reactive;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java b/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java
index 918bf1f92b..249d320ad3 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.sentinel.api.sync;
 
 import java.net.SocketAddress;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/package-info.java b/src/main/java/com/lambdaworks/redis/sentinel/api/sync/package-info.java
index 9f53e21bc0..cba7adbd66 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/sync/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Sentinel API for synchronous executed commands.
  */
-package com.lambdaworks.redis.sentinel.api.sync;
\ No newline at end of file
+package com.lambdaworks.redis.sentinel.api.sync;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/package-info.java b/src/main/java/com/lambdaworks/redis/sentinel/package-info.java
index 5341dd5776..223b2531d3 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/package-info.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Sentinel connection classes.
  */
-package com.lambdaworks.redis.sentinel;
\ No newline at end of file
+package com.lambdaworks.redis.sentinel;
diff --git a/src/main/java/com/lambdaworks/redis/support/AbstractCdiBean.java b/src/main/java/com/lambdaworks/redis/support/AbstractCdiBean.java
index f9c50af1f2..8655992a3c 100644
--- a/src/main/java/com/lambdaworks/redis/support/AbstractCdiBean.java
+++ b/src/main/java/com/lambdaworks/redis/support/AbstractCdiBean.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.support;
 
 import java.lang.annotation.Annotation;
diff --git a/src/main/java/com/lambdaworks/redis/support/ClientResourcesFactoryBean.java b/src/main/java/com/lambdaworks/redis/support/ClientResourcesFactoryBean.java
index dfa01b6d71..9a7a9aade9 100644
--- a/src/main/java/com/lambdaworks/redis/support/ClientResourcesFactoryBean.java
+++ b/src/main/java/com/lambdaworks/redis/support/ClientResourcesFactoryBean.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.support;
 
 import org.springframework.beans.factory.FactoryBean;
diff --git a/src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java b/src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java
index 5cb18ea4cb..f7c68b4dba 100644
--- a/src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java
+++ b/src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.support;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/com/lambdaworks/redis/support/LettuceCdiExtension.java b/src/main/java/com/lambdaworks/redis/support/LettuceCdiExtension.java
index 7ab123ca8c..8f5fad902d 100644
--- a/src/main/java/com/lambdaworks/redis/support/LettuceCdiExtension.java
+++ b/src/main/java/com/lambdaworks/redis/support/LettuceCdiExtension.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.support;
 
 import java.lang.annotation.Annotation;
diff --git a/src/main/java/com/lambdaworks/redis/support/LettuceFactoryBeanSupport.java b/src/main/java/com/lambdaworks/redis/support/LettuceFactoryBeanSupport.java
index 492bfb4284..56958af9c9 100644
--- a/src/main/java/com/lambdaworks/redis/support/LettuceFactoryBeanSupport.java
+++ b/src/main/java/com/lambdaworks/redis/support/LettuceFactoryBeanSupport.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.support;
 
 import java.net.URI;
diff --git a/src/main/java/com/lambdaworks/redis/support/RedisClientCdiBean.java b/src/main/java/com/lambdaworks/redis/support/RedisClientCdiBean.java
index 147240167a..dd17c9f6dc 100644
--- a/src/main/java/com/lambdaworks/redis/support/RedisClientCdiBean.java
+++ b/src/main/java/com/lambdaworks/redis/support/RedisClientCdiBean.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.support;
 
 import java.lang.annotation.Annotation;
diff --git a/src/main/java/com/lambdaworks/redis/support/RedisClientFactoryBean.java b/src/main/java/com/lambdaworks/redis/support/RedisClientFactoryBean.java
index e04ca4456d..ba97203f6a 100644
--- a/src/main/java/com/lambdaworks/redis/support/RedisClientFactoryBean.java
+++ b/src/main/java/com/lambdaworks/redis/support/RedisClientFactoryBean.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.support;
 
 import static com.lambdaworks.redis.LettuceStrings.isNotEmpty;
diff --git a/src/main/java/com/lambdaworks/redis/support/RedisClusterClientCdiBean.java b/src/main/java/com/lambdaworks/redis/support/RedisClusterClientCdiBean.java
index ee5227551b..56d5c5b493 100644
--- a/src/main/java/com/lambdaworks/redis/support/RedisClusterClientCdiBean.java
+++ b/src/main/java/com/lambdaworks/redis/support/RedisClusterClientCdiBean.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.support;
 
 import java.lang.annotation.Annotation;
diff --git a/src/main/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBean.java b/src/main/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBean.java
index 5af28496b6..07b0fb9b9e 100644
--- a/src/main/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBean.java
+++ b/src/main/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBean.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.support;
 
 import static com.lambdaworks.redis.LettuceStrings.isNotEmpty;
diff --git a/src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java b/src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java
index 38731b21dd..22671507a7 100644
--- a/src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.List;
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java
index 205093706f..2071b92634 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import com.lambdaworks.redis.GeoArgs;
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisHLLCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisHLLCommands.java
index a83f8bff4b..f3fdc6bd48 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisHLLCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisHLLCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api;
 
 /**
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java
index 340de0b50b..b392fce6b8 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api;
 
 import java.util.List;
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java
index bcf563fc1c..9e809c9fc1 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api;
 
 import java.util.Date;
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisListCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisListCommands.java
index d1dbee8ac2..f2d97520b9 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisListCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisListCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api;
 
 import java.util.List;
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisScriptingCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisScriptingCommands.java
index 2ce605c5af..f5c562eafe 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisScriptingCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisScriptingCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api;
 
 import java.util.List;
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java
index ac71032723..255c2f0060 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.net.SocketAddress;
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisServerCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisServerCommands.java
index 790e7a0087..d0e92d1d21 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisServerCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisServerCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api;
 
 import java.util.Date;
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSetCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisSetCommands.java
index 17025aa0f2..0db16cdb97 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisSetCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisSetCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api;
 
 import java.util.List;
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
index 6e26962c72..2d0ef979f5 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api;
 
 import java.util.List;
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java
index c087d0aca6..1e84a6d89f 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api;
 
 import java.util.List;
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisTransactionalCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisTransactionalCommands.java
index e6ef5e1c36..54f499100a 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisTransactionalCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisTransactionalCommands.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.api;
 
 import java.util.List;
diff --git a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
index cc15040672..ec0308e6b6 100644
--- a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
+++ b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package biz.paluch.redis.extensibility;
 
 import java.util.List;
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
index 76f2487192..32735c92fc 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package biz.paluch.redis.extensibility;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
index a28f804d20..71b2e1b528 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package biz.paluch.redis.extensibility;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
index dd3e9933d7..674d21dc0e 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package biz.paluch.redis.extensibility;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/java/com/lambdaworks/CanConnect.java b/src/test/java/com/lambdaworks/CanConnect.java
index 764cd2c267..8788791377 100644
--- a/src/test/java/com/lambdaworks/CanConnect.java
+++ b/src/test/java/com/lambdaworks/CanConnect.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks;
 
 import java.io.IOException;
diff --git a/src/test/java/com/lambdaworks/ConnectionTestUtil.java b/src/test/java/com/lambdaworks/ConnectionTestUtil.java
index 47fb6216f0..a2c4c36c12 100644
--- a/src/test/java/com/lambdaworks/ConnectionTestUtil.java
+++ b/src/test/java/com/lambdaworks/ConnectionTestUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks;
 
 import java.util.Queue;
diff --git a/src/test/java/com/lambdaworks/Delay.java b/src/test/java/com/lambdaworks/Delay.java
index b1d36361d6..4935f3646e 100644
--- a/src/test/java/com/lambdaworks/Delay.java
+++ b/src/test/java/com/lambdaworks/Delay.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks;
 
 import com.google.code.tempusfugit.temporal.Duration;
diff --git a/src/test/java/com/lambdaworks/Futures.java b/src/test/java/com/lambdaworks/Futures.java
index 4bb354538b..42d603fcc8 100644
--- a/src/test/java/com/lambdaworks/Futures.java
+++ b/src/test/java/com/lambdaworks/Futures.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks;
 
 import java.util.Collection;
diff --git a/src/test/java/com/lambdaworks/KeysAndValues.java b/src/test/java/com/lambdaworks/KeysAndValues.java
index 9c0019cba4..381969f309 100644
--- a/src/test/java/com/lambdaworks/KeysAndValues.java
+++ b/src/test/java/com/lambdaworks/KeysAndValues.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks;
 
 import java.util.*;
diff --git a/src/test/java/com/lambdaworks/LoggingTestRule.java b/src/test/java/com/lambdaworks/LoggingTestRule.java
index f18befd8c8..a1c054c78a 100644
--- a/src/test/java/com/lambdaworks/LoggingTestRule.java
+++ b/src/test/java/com/lambdaworks/LoggingTestRule.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks;
 
 import java.io.ByteArrayOutputStream;
diff --git a/src/test/java/com/lambdaworks/Sockets.java b/src/test/java/com/lambdaworks/Sockets.java
index c6fef47ce5..63f0f73987 100644
--- a/src/test/java/com/lambdaworks/Sockets.java
+++ b/src/test/java/com/lambdaworks/Sockets.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks;
 
 import java.io.IOException;
diff --git a/src/test/java/com/lambdaworks/SslTest.java b/src/test/java/com/lambdaworks/SslTest.java
index de0baa3158..be52145474 100644
--- a/src/test/java/com/lambdaworks/SslTest.java
+++ b/src/test/java/com/lambdaworks/SslTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks;
 
 import static com.lambdaworks.redis.TestSettings.host;
diff --git a/src/test/java/com/lambdaworks/TestClientResources.java b/src/test/java/com/lambdaworks/TestClientResources.java
index 8820292dfc..2acd2530db 100644
--- a/src/test/java/com/lambdaworks/TestClientResources.java
+++ b/src/test/java/com/lambdaworks/TestClientResources.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/java/com/lambdaworks/Wait.java b/src/test/java/com/lambdaworks/Wait.java
index 12f941f157..2512ceb65f 100644
--- a/src/test/java/com/lambdaworks/Wait.java
+++ b/src/test/java/com/lambdaworks/Wait.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks;
 
 import java.util.concurrent.ExecutionException;
diff --git a/src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java b/src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java
index fdb6225951..fe132bfbc0 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.apigenerator;
 
 import java.io.File;
diff --git a/src/test/java/com/lambdaworks/apigenerator/Constants.java b/src/test/java/com/lambdaworks/apigenerator/Constants.java
index 3f60c1dceb..26535efaf5 100644
--- a/src/test/java/com/lambdaworks/apigenerator/Constants.java
+++ b/src/test/java/com/lambdaworks/apigenerator/Constants.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.apigenerator;
 
 import java.io.File;
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java
index d102af1d56..c9f1ce7abd 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.apigenerator;
 
 import java.io.File;
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
index af4796334e..507e4ddd98 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.apigenerator;
 
 import java.io.File;
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
index e1fffc81af..dae8a7b7ef 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.apigenerator;
 
 import java.io.File;
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java
index 59edd075c9..843dff8191 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.apigenerator;
 
 import java.io.File;
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java
index 40e913ed75..7487e21f2f 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.apigenerator;
 
 import java.io.File;
diff --git a/src/test/java/com/lambdaworks/apigenerator/GenerateCommandInterfaces.java b/src/test/java/com/lambdaworks/apigenerator/GenerateCommandInterfaces.java
index 8e40107cfd..e3e25f79b2 100644
--- a/src/test/java/com/lambdaworks/apigenerator/GenerateCommandInterfaces.java
+++ b/src/test/java/com/lambdaworks/apigenerator/GenerateCommandInterfaces.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.apigenerator;
 
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/lambdaworks/category/SlowTests.java b/src/test/java/com/lambdaworks/category/SlowTests.java
index 026b2b6ceb..77d4836f2c 100644
--- a/src/test/java/com/lambdaworks/category/SlowTests.java
+++ b/src/test/java/com/lambdaworks/category/SlowTests.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.category;
 
 /**
diff --git a/src/test/java/com/lambdaworks/codec/CRC16Test.java b/src/test/java/com/lambdaworks/codec/CRC16Test.java
index 96676b0d3a..94399b7df0 100644
--- a/src/test/java/com/lambdaworks/codec/CRC16Test.java
+++ b/src/test/java/com/lambdaworks/codec/CRC16Test.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.codec;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToElastiCacheMaster.java b/src/test/java/com/lambdaworks/examples/ConnectToElastiCacheMaster.java
index 98fc3a35fd..fd78c38de3 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToElastiCacheMaster.java
+++ b/src/test/java/com/lambdaworks/examples/ConnectToElastiCacheMaster.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.examples;
 
 import com.lambdaworks.redis.RedisClient;
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java b/src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
index 533c3b6255..145db6ab12 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
+++ b/src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.examples;
 
 import java.util.Arrays;
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingRedisSentinel.java b/src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingRedisSentinel.java
index 279e79e44f..caeca3c0aa 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingRedisSentinel.java
+++ b/src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingRedisSentinel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.examples;
 
 import com.lambdaworks.redis.ReadFrom;
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedis.java b/src/test/java/com/lambdaworks/examples/ConnectToRedis.java
index b8b3d66237..2592209929 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToRedis.java
+++ b/src/test/java/com/lambdaworks/examples/ConnectToRedis.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.examples;
 
 import com.lambdaworks.redis.RedisClient;
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedisCluster.java b/src/test/java/com/lambdaworks/examples/ConnectToRedisCluster.java
index 2eb5701ad7..d9a9e568e4 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToRedisCluster.java
+++ b/src/test/java/com/lambdaworks/examples/ConnectToRedisCluster.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.examples;
 
 import com.lambdaworks.redis.cluster.RedisClusterClient;
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedisClusterSSL.java b/src/test/java/com/lambdaworks/examples/ConnectToRedisClusterSSL.java
index 858329e045..1ea69e6087 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToRedisClusterSSL.java
+++ b/src/test/java/com/lambdaworks/examples/ConnectToRedisClusterSSL.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.examples;
 
 import com.lambdaworks.redis.RedisURI;
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedisClusterWithTopologyRefreshing.java b/src/test/java/com/lambdaworks/examples/ConnectToRedisClusterWithTopologyRefreshing.java
index 10faa5da8b..cb0d5179e1 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToRedisClusterWithTopologyRefreshing.java
+++ b/src/test/java/com/lambdaworks/examples/ConnectToRedisClusterWithTopologyRefreshing.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.examples;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedisSSL.java b/src/test/java/com/lambdaworks/examples/ConnectToRedisSSL.java
index 9182c6a4ad..2fa7390a53 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToRedisSSL.java
+++ b/src/test/java/com/lambdaworks/examples/ConnectToRedisSSL.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.examples;
 
 import com.lambdaworks.redis.RedisClient;
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedisUsingRedisSentinel.java b/src/test/java/com/lambdaworks/examples/ConnectToRedisUsingRedisSentinel.java
index f6c2227211..9e6f6455c4 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToRedisUsingRedisSentinel.java
+++ b/src/test/java/com/lambdaworks/examples/ConnectToRedisUsingRedisSentinel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.examples;
 
 import com.lambdaworks.redis.RedisClient;
diff --git a/src/test/java/com/lambdaworks/examples/MySpringBean.java b/src/test/java/com/lambdaworks/examples/MySpringBean.java
index b4ef6ca145..abced3b3d3 100644
--- a/src/test/java/com/lambdaworks/examples/MySpringBean.java
+++ b/src/test/java/com/lambdaworks/examples/MySpringBean.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.examples;
 
 import com.lambdaworks.redis.*;
diff --git a/src/test/java/com/lambdaworks/examples/ReadWriteExample.java b/src/test/java/com/lambdaworks/examples/ReadWriteExample.java
index 2761532f83..49449ee206 100644
--- a/src/test/java/com/lambdaworks/examples/ReadWriteExample.java
+++ b/src/test/java/com/lambdaworks/examples/ReadWriteExample.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.examples;
 
 import com.lambdaworks.redis.RedisClient;
diff --git a/src/test/java/com/lambdaworks/examples/SpringExample.java b/src/test/java/com/lambdaworks/examples/SpringExample.java
index 9ac1c334c8..4e32dacb3c 100644
--- a/src/test/java/com/lambdaworks/examples/SpringExample.java
+++ b/src/test/java/com/lambdaworks/examples/SpringExample.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.examples;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java b/src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java
index b93781465d..23a4b3d9c7 100644
--- a/src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import com.lambdaworks.TestClientResources;
@@ -10,6 +23,10 @@
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public abstract class AbstractRedisClientTest extends AbstractTest {
 
     protected static RedisClient client;
diff --git a/src/test/java/com/lambdaworks/redis/AbstractTest.java b/src/test/java/com/lambdaworks/redis/AbstractTest.java
index a1d693e015..df3e32a3c7 100644
--- a/src/test/java/com/lambdaworks/redis/AbstractTest.java
+++ b/src/test/java/com/lambdaworks/redis/AbstractTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.Arrays;
diff --git a/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java b/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java
index f71741a34b..f35c04559c 100644
--- a/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java
+++ b/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import com.lambdaworks.TestClientResources;
diff --git a/src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java b/src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java
index 052535163c..3805e1a61a 100644
--- a/src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -17,6 +30,10 @@
 
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class AsyncConnectionTest extends AbstractRedisClientTest {
     private RedisAsyncCommands<String, String> async;
 
diff --git a/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java b/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
index ddc5c212be..4f3eadfc69 100644
--- a/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.redis.AbstractRedisClientTest.client;
diff --git a/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java b/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
index a53dd74b4f..1f3838f4f0 100644
--- a/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.ConnectionTestUtil.getChannel;
diff --git a/src/test/java/com/lambdaworks/redis/ClientTest.java b/src/test/java/com/lambdaworks/redis/ClientTest.java
index 47c773cc7f..b0fe55932c 100644
--- a/src/test/java/com/lambdaworks/redis/ClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
@@ -20,6 +33,10 @@
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ClientTest extends AbstractRedisClientTest {
     @Rule
diff --git a/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java b/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
index 5efbefc87e..342a450f9b 100644
--- a/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -16,6 +29,10 @@
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ConnectionCommandTest extends AbstractRedisClientTest {
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/CustomCodecTest.java b/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
index f0e71b9308..c83e386585 100644
--- a/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
+++ b/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -23,6 +36,10 @@
 import com.lambdaworks.redis.codec.CompressionCodec;
 import com.lambdaworks.redis.codec.RedisCodec;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class CustomCodecTest extends AbstractRedisClientTest {
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/DefaultRedisClient.java b/src/test/java/com/lambdaworks/redis/DefaultRedisClient.java
index 0a0014246d..c539c20314 100644
--- a/src/test/java/com/lambdaworks/redis/DefaultRedisClient.java
+++ b/src/test/java/com/lambdaworks/redis/DefaultRedisClient.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/java/com/lambdaworks/redis/FastShutdown.java b/src/test/java/com/lambdaworks/redis/FastShutdown.java
index ab93ea4af3..8f8a67b57d 100644
--- a/src/test/java/com/lambdaworks/redis/FastShutdown.java
+++ b/src/test/java/com/lambdaworks/redis/FastShutdown.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/java/com/lambdaworks/redis/GeoModelTest.java b/src/test/java/com/lambdaworks/redis/GeoModelTest.java
index a6168e7ad9..be531c99bd 100644
--- a/src/test/java/com/lambdaworks/redis/GeoModelTest.java
+++ b/src/test/java/com/lambdaworks/redis/GeoModelTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.*;
diff --git a/src/test/java/com/lambdaworks/redis/JavaRuntimeTest.java b/src/test/java/com/lambdaworks/redis/JavaRuntimeTest.java
index 5f49d528ab..76d6b69888 100644
--- a/src/test/java/com/lambdaworks/redis/JavaRuntimeTest.java
+++ b/src/test/java/com/lambdaworks/redis/JavaRuntimeTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/KeyValueStreamingAdapter.java b/src/test/java/com/lambdaworks/redis/KeyValueStreamingAdapter.java
index 36ee2a4bc1..463cbb59ea 100644
--- a/src/test/java/com/lambdaworks/redis/KeyValueStreamingAdapter.java
+++ b/src/test/java/com/lambdaworks/redis/KeyValueStreamingAdapter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.LinkedHashMap;
diff --git a/src/test/java/com/lambdaworks/redis/KeyValueTest.java b/src/test/java/com/lambdaworks/redis/KeyValueTest.java
index 59a81ba8c2..99e53789ee 100644
--- a/src/test/java/com/lambdaworks/redis/KeyValueTest.java
+++ b/src/test/java/com/lambdaworks/redis/KeyValueTest.java
@@ -1,4 +1,19 @@
 
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/LettuceFuturesTest.java b/src/test/java/com/lambdaworks/redis/LettuceFuturesTest.java
index 7e833be163..aa605c13d9 100644
--- a/src/test/java/com/lambdaworks/redis/LettuceFuturesTest.java
+++ b/src/test/java/com/lambdaworks/redis/LettuceFuturesTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import org.junit.Before;
diff --git a/src/test/java/com/lambdaworks/redis/LimitTest.java b/src/test/java/com/lambdaworks/redis/LimitTest.java
index a5e1595219..e6f3e75f80 100644
--- a/src/test/java/com/lambdaworks/redis/LimitTest.java
+++ b/src/test/java/com/lambdaworks/redis/LimitTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/ListStreamingAdapter.java b/src/test/java/com/lambdaworks/redis/ListStreamingAdapter.java
index c4be19abc9..9129f0c6fc 100644
--- a/src/test/java/com/lambdaworks/redis/ListStreamingAdapter.java
+++ b/src/test/java/com/lambdaworks/redis/ListStreamingAdapter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.ArrayList;
diff --git a/src/test/java/com/lambdaworks/redis/PipeliningTest.java b/src/test/java/com/lambdaworks/redis/PipeliningTest.java
index eaa42e89c2..36fb41036f 100644
--- a/src/test/java/com/lambdaworks/redis/PipeliningTest.java
+++ b/src/test/java/com/lambdaworks/redis/PipeliningTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/PrivateAccessorTest.java b/src/test/java/com/lambdaworks/redis/PrivateAccessorTest.java
index 4bf98f434d..95908f1b16 100644
--- a/src/test/java/com/lambdaworks/redis/PrivateAccessorTest.java
+++ b/src/test/java/com/lambdaworks/redis/PrivateAccessorTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/RangeTest.java b/src/test/java/com/lambdaworks/redis/RangeTest.java
index d250338145..44d5726b1d 100644
--- a/src/test/java/com/lambdaworks/redis/RangeTest.java
+++ b/src/test/java/com/lambdaworks/redis/RangeTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.redis.Range.Boundary.excluding;
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
index 8ca90b8d21..c95498c5e3 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.google.code.tempusfugit.temporal.Duration.millis;
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java b/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
index 1e19c554f3..55d8bb9e11 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 
diff --git a/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java b/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java
index 81b713dd5b..e5bf5c9426 100644
--- a/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static com.lambdaworks.redis.RedisURI.Builder.redis;
diff --git a/src/test/java/com/lambdaworks/redis/RedisClientFactoryBeanTest.java b/src/test/java/com/lambdaworks/redis/RedisClientFactoryBeanTest.java
index c8728f8b82..876b9daf08 100644
--- a/src/test/java/com/lambdaworks/redis/RedisClientFactoryBeanTest.java
+++ b/src/test/java/com/lambdaworks/redis/RedisClientFactoryBeanTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/RedisClientFactoryTest.java b/src/test/java/com/lambdaworks/redis/RedisClientFactoryTest.java
index 6a1e0a9a10..372bd09c7c 100644
--- a/src/test/java/com/lambdaworks/redis/RedisClientFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/RedisClientFactoryTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import com.lambdaworks.TestClientResources;
diff --git a/src/test/java/com/lambdaworks/redis/RedisClientTest.java b/src/test/java/com/lambdaworks/redis/RedisClientTest.java
index 16b8ca7e23..a488f3677a 100644
--- a/src/test/java/com/lambdaworks/redis/RedisClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/RedisClientTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java b/src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java
index d6b3e1c1f6..6dd30fbd5b 100644
--- a/src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java
+++ b/src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/RedisURITest.java b/src/test/java/com/lambdaworks/redis/RedisURITest.java
index 7845c8d11a..7174f20879 100644
--- a/src/test/java/com/lambdaworks/redis/RedisURITest.java
+++ b/src/test/java/com/lambdaworks/redis/RedisURITest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/ScanCursorTest.java b/src/test/java/com/lambdaworks/redis/ScanCursorTest.java
index 3b7a5f7906..e47fbd5ceb 100644
--- a/src/test/java/com/lambdaworks/redis/ScanCursorTest.java
+++ b/src/test/java/com/lambdaworks/redis/ScanCursorTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/ScoredValueStreamingAdapter.java b/src/test/java/com/lambdaworks/redis/ScoredValueStreamingAdapter.java
index 51a211c22c..1b03ac06ee 100644
--- a/src/test/java/com/lambdaworks/redis/ScoredValueStreamingAdapter.java
+++ b/src/test/java/com/lambdaworks/redis/ScoredValueStreamingAdapter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.ArrayList;
diff --git a/src/test/java/com/lambdaworks/redis/ScoredValueTest.java b/src/test/java/com/lambdaworks/redis/ScoredValueTest.java
index f711d9a354..438e831809 100644
--- a/src/test/java/com/lambdaworks/redis/ScoredValueTest.java
+++ b/src/test/java/com/lambdaworks/redis/ScoredValueTest.java
@@ -1,4 +1,19 @@
 
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/SocketOptionsTest.java b/src/test/java/com/lambdaworks/redis/SocketOptionsTest.java
index eedbbf3222..85051e8740 100644
--- a/src/test/java/com/lambdaworks/redis/SocketOptionsTest.java
+++ b/src/test/java/com/lambdaworks/redis/SocketOptionsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -67,4 +82,4 @@ public void testConnectTimeout() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/SyncAsyncApiConvergenceTest.java b/src/test/java/com/lambdaworks/redis/SyncAsyncApiConvergenceTest.java
index 33febca596..905d46c805 100644
--- a/src/test/java/com/lambdaworks/redis/SyncAsyncApiConvergenceTest.java
+++ b/src/test/java/com/lambdaworks/redis/SyncAsyncApiConvergenceTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/TestEventLoopGroupProvider.java b/src/test/java/com/lambdaworks/redis/TestEventLoopGroupProvider.java
index dd47f7bbe5..0c5b218ec4 100644
--- a/src/test/java/com/lambdaworks/redis/TestEventLoopGroupProvider.java
+++ b/src/test/java/com/lambdaworks/redis/TestEventLoopGroupProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/java/com/lambdaworks/redis/TestRedisPublisher.java b/src/test/java/com/lambdaworks/redis/TestRedisPublisher.java
index 3f6777ed2d..ff14a1321a 100644
--- a/src/test/java/com/lambdaworks/redis/TestRedisPublisher.java
+++ b/src/test/java/com/lambdaworks/redis/TestRedisPublisher.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.util.function.Supplier;
diff --git a/src/test/java/com/lambdaworks/redis/TestSettings.java b/src/test/java/com/lambdaworks/redis/TestSettings.java
index b15ef373d3..a8942940af 100644
--- a/src/test/java/com/lambdaworks/redis/TestSettings.java
+++ b/src/test/java/com/lambdaworks/redis/TestSettings.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import java.net.Inet4Address;
diff --git a/src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java b/src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java
index 91bf46432e..b3444fd554 100644
--- a/src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java
+++ b/src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/Utf8StringCodecTest.java b/src/test/java/com/lambdaworks/redis/Utf8StringCodecTest.java
index bd04ef84cd..908240ae33 100644
--- a/src/test/java/com/lambdaworks/redis/Utf8StringCodecTest.java
+++ b/src/test/java/com/lambdaworks/redis/Utf8StringCodecTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -8,6 +21,10 @@
 
 import org.junit.Test;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class Utf8StringCodecTest extends AbstractRedisClientTest {
     @Test
     public void decodeHugeBuffer() throws Exception {
diff --git a/src/test/java/com/lambdaworks/redis/ValueTest.java b/src/test/java/com/lambdaworks/redis/ValueTest.java
index 5bfa8361d4..19fd545e11 100644
--- a/src/test/java/com/lambdaworks/redis/ValueTest.java
+++ b/src/test/java/com/lambdaworks/redis/ValueTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java b/src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java
index ca2f927d9f..dfb94151f7 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import com.lambdaworks.TestClientResources;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
index 0e93178897..6631c6f848 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
index 81d4db86e1..a7292f35f6 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ByteCodecClusterTest.java b/src/test/java/com/lambdaworks/redis/cluster/ByteCodecClusterTest.java
index c7ba6665fa..0180a1875a 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ByteCodecClusterTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ByteCodecClusterTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterClientOptionsTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterClientOptionsTest.java
index 79e0e893e8..c196599c42 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterClientOptionsTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterClientOptionsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java
index 2a60483451..8a9c2c06c8 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java
index 61c29e1a75..67dc03b200 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterTest.java
index 0aa168270f..a2d77cdfa4 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -46,4 +61,4 @@ public void shouldParseIPv6MovedTargetCorrectly() throws Exception {
         assertThat(moveTarget.getHostText()).isEqualTo("1:2:3:4::6");
         assertThat(moveTarget.getPort()).isEqualTo(6381);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java
index 564595e50a..d7ecaceeef 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java
index a4cb0b0f2b..bfea690cea 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterPartitionParserTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterPartitionParserTest.java
index d89abff6b6..924e159c98 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterPartitionParserTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterPartitionParserTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
index c0f5d2a81a..84a9e39155 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static com.lambdaworks.redis.cluster.ClusterTestUtil.getNodeId;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterRule.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterRule.java
index d3c8d3cb9a..b420e702ed 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterRule.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterRule.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.net.InetSocketAddress;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java
index ad27046be2..9afc44cf56 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.concurrent.ExecutionException;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java
index fd3405d370..32874e98f2 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.lang.reflect.InvocationHandler;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptionsTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptionsTest.java
index a69c254bb6..6e967cbb85 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptionsTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptionsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -92,4 +107,4 @@ public void testEnabled() throws Exception {
         assertThat(options.getAdaptiveRefreshTriggers()).contains(RefreshTrigger.ASK_REDIRECT, RefreshTrigger.MOVED_REDIRECT,
                 RefreshTrigger.PERSISTENT_RECONNECTS);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshSchedulerTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshSchedulerTest.java
index b51813a7c7..59ecfe7168 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshSchedulerTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshSchedulerTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.mockito.Matchers.any;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/HealthyMajorityPartitionsConsensusTest.java b/src/test/java/com/lambdaworks/redis/cluster/HealthyMajorityPartitionsConsensusTest.java
index b8cbd9df5d..a4eed8edad 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/HealthyMajorityPartitionsConsensusTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/HealthyMajorityPartitionsConsensusTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createMap;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/KnownMajorityPartitionsConsensusTest.java b/src/test/java/com/lambdaworks/redis/cluster/KnownMajorityPartitionsConsensusTest.java
index 08192f04ca..1449cc017b 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/KnownMajorityPartitionsConsensusTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/KnownMajorityPartitionsConsensusTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createMap;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java b/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java
index f04f440e1f..abdf8b76f2 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static com.lambdaworks.redis.ScriptOutputType.STATUS;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionSyncTest.java b/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionSyncTest.java
index ff491e4211..30c9a59205 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionSyncTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionSyncTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static com.lambdaworks.redis.ScriptOutputType.STATUS;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/PartitionsConsensusTestSupport.java b/src/test/java/com/lambdaworks/redis/cluster/PartitionsConsensusTestSupport.java
index 94bb244045..3e65683f76 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/PartitionsConsensusTestSupport.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/PartitionsConsensusTestSupport.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.*;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/PipelinedRedisFutureTest.java b/src/test/java/com/lambdaworks/redis/cluster/PipelinedRedisFutureTest.java
index d6a770d2f8..dd41522887 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/PipelinedRedisFutureTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/PipelinedRedisFutureTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java b/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
index 08458f3a59..a042fa033a 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -138,4 +153,4 @@ public void shouldRetryConnectionAttemptAfterConnectionAttemptWasBroken() throws
 
         verify(clientMock, times(2)).connectToNode(eq(CODEC), eq("localhost:2"), any(), any());
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ReadFromTest.java b/src/test/java/com/lambdaworks/redis/cluster/ReadFromTest.java
index 8837029a88..d6542e1fb7 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ReadFromTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ReadFromTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java b/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
index 2922439042..528efd5564 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientFactoryTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientFactoryTest.java
index 271f0120a0..900841164d 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientFactoryTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.util.Arrays;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
index 755da79b8e..b79872966c 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static com.lambdaworks.redis.RedisClientConnectionTest.CODEC;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterPasswordSecuredSslTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterPasswordSecuredSslTest.java
index 3fff656970..a7558b2bab 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterPasswordSecuredSslTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterPasswordSecuredSslTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static com.lambdaworks.redis.TestSettings.*;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
index d873a27916..f30c28c8a6 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
index 92fd365343..e18fef4175 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
index 59c0ff9578..8dc5931f8e 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java
index f194e990d9..cddc34bd01 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static com.lambdaworks.redis.cluster.ClusterTestUtil.getOwnPartition;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java b/src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java
index fa8c9ce5a1..410b7a0e51 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/SlotHashTest.java b/src/test/java/com/lambdaworks/redis/cluster/SlotHashTest.java
index 39c5010e2e..a27f40347b 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/SlotHashTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/SlotHashTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.*;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
index aa1283f099..4384a7dfdc 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java
index 5d4f01c8a5..c9b055a9e7 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.commands;
 
 import static com.lambdaworks.redis.cluster.ClusterTestUtil.flushDatabaseOfAllNodes;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java
index 31c4a576fd..31b560c282 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.commands;
 
 import com.lambdaworks.TestClientResources;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/KeyClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/KeyClusterCommandTest.java
index 2b4bfb3bed..564cdf8874 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/KeyClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/KeyClusterCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java
index 8be0f120a0..ecf7cd0b57 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.commands;
 
 import com.lambdaworks.TestClientResources;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
index 1c89ef9cc7..43e7068059 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/HashClusterReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/HashClusterReactiveCommandTest.java
index d6f2d98be3..7f2a7c10db 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/HashClusterReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/HashClusterReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.commands.reactive;
 
 import org.junit.AfterClass;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/KeyClusterReativeCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/KeyClusterReativeCommandTest.java
index aa3f4c15b1..4849012feb 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/KeyClusterReativeCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/KeyClusterReativeCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.commands.reactive;
 
 import com.lambdaworks.TestClientResources;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterReactiveCommandTest.java
index 2eae3213a8..13748e51d9 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.commands.reactive;
 
 import org.junit.AfterClass;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java
index 9624658558..52d72da7f1 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.commands.reactive;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/models/partitions/PartitionsTest.java b/src/test/java/com/lambdaworks/redis/cluster/models/partitions/PartitionsTest.java
index 17b3317a18..a2aef43e2a 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/models/partitions/PartitionsTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/models/partitions/PartitionsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.models.partitions;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
@@ -317,4 +332,4 @@ public void testToString() throws Exception {
 
         assertThat(partitions.toString()).startsWith("Partitions [");
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNodeTest.java b/src/test/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNodeTest.java
index 759a965dee..ec02b1c15f 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNodeTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNodeTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.models.partitions;
 
 import static org.assertj.core.api.Assertions.*;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParserTest.java b/src/test/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParserTest.java
index 2766f5e80f..6e7281b931 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParserTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParserTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.models.slots;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubClusterTest.java b/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubClusterTest.java
index 98530cbdcd..96b4ffc0e3 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubClusterTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubClusterTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.pubsub;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java b/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
index a0216c668e..6a1123c3fc 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.topology;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViewsTest.java b/src/test/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViewsTest.java
index 3f926654da..c2e1e34416 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViewsTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViewsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.topology;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -48,4 +63,4 @@ public void shouldFailWithoutOwnPartition() throws Exception {
 
         new NodeTopologyView(localhost, viewByLocalhost, "", 0);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/RequestsTest.java b/src/test/java/com/lambdaworks/redis/cluster/topology/RequestsTest.java
index 52835654db..89e62d564b 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/RequestsTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/topology/RequestsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.topology;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -97,4 +112,4 @@ private TimedAsyncCommand getCommand(String response) {
         timedAsyncCommand.complete();
         return timedAsyncCommand;
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyComparatorsTest.java b/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyComparatorsTest.java
index 2859785e7c..4512f5c5cf 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyComparatorsTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyComparatorsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.topology;
 
 import static com.lambdaworks.redis.cluster.topology.TopologyComparators.isChanged;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyRefreshTest.java b/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyRefreshTest.java
index 35f5024717..6c7ce2f9f1 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyRefreshTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyRefreshTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster.topology;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/codec/CompressionCodecTest.java b/src/test/java/com/lambdaworks/redis/codec/CompressionCodecTest.java
index c058e0c04e..e1198aef64 100644
--- a/src/test/java/com/lambdaworks/redis/codec/CompressionCodecTest.java
+++ b/src/test/java/com/lambdaworks/redis/codec/CompressionCodecTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.codec;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/codec/StringCodecTest.java b/src/test/java/com/lambdaworks/redis/codec/StringCodecTest.java
index ec067ee3fa..81c38dddc5 100644
--- a/src/test/java/com/lambdaworks/redis/codec/StringCodecTest.java
+++ b/src/test/java/com/lambdaworks/redis/codec/StringCodecTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.codec;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -102,4 +117,4 @@ public void estimateSize() throws Exception {
         assertThat(new StringCodec(LettuceCharsets.ASCII).estimateSize(teststring)).isEqualTo(teststring.length());
         assertThat(new StringCodec(StandardCharsets.ISO_8859_1).estimateSize(teststring)).isEqualTo(teststring.length());
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java
index bb4272792e..96c432a495 100644
--- a/src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2012 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands;
 
 import static com.lambdaworks.redis.BitFieldArgs.offset;
@@ -19,6 +32,10 @@
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.codec.Utf8StringCodec;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class BitCommandTest extends AbstractRedisClientTest {
 
     protected RedisCommands<String, String> bitstring;
diff --git a/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
index da084f63a9..163bf1f91d 100644
--- a/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands;
 
 import static com.lambdaworks.redis.protocol.CommandType.ZRANGEBYLEX;
diff --git a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
index 0fa9d3c01f..c7ce5e06b4 100644
--- a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java
index 949f490402..28075f4a06 100644
--- a/src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/commands/HashCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/HashCommandTest.java
index 0a60e32a06..afc3dc969e 100644
--- a/src/test/java/com/lambdaworks/redis/commands/HashCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/HashCommandTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -15,6 +28,10 @@
 
 import com.lambdaworks.redis.*;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class HashCommandTest extends AbstractRedisClientTest {
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/KeyCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/KeyCommandTest.java
index 5920de93a9..bafb01aa18 100644
--- a/src/test/java/com/lambdaworks/redis/commands/KeyCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/KeyCommandTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -13,6 +26,10 @@
 
 import com.lambdaworks.redis.*;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class KeyCommandTest extends AbstractRedisClientTest {
 
     @Rule
diff --git a/src/test/java/com/lambdaworks/redis/commands/ListCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/ListCommandTest.java
index 8f9e07c1c3..ae18b23c2c 100644
--- a/src/test/java/com/lambdaworks/redis/commands/ListCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/ListCommandTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -12,6 +25,10 @@
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class ListCommandTest extends AbstractRedisClientTest {
     @Test
     public void blpop() throws Exception {
diff --git a/src/test/java/com/lambdaworks/redis/commands/NumericCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/NumericCommandTest.java
index 1c3ef506e1..93306c6079 100644
--- a/src/test/java/com/lambdaworks/redis/commands/NumericCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/NumericCommandTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands;
 
 import static org.assertj.core.api.Assertions.*;
@@ -10,6 +23,10 @@
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class NumericCommandTest extends AbstractRedisClientTest {
     @Test
     public void decr() throws Exception {
diff --git a/src/test/java/com/lambdaworks/redis/commands/RunOnlyOnceServerCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/RunOnlyOnceServerCommandTest.java
index 650e182609..fedf43693c 100644
--- a/src/test/java/com/lambdaworks/redis/commands/RunOnlyOnceServerCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/RunOnlyOnceServerCommandTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands;
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
@@ -23,6 +36,10 @@
 import com.lambdaworks.redis.TestSettings;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class RunOnlyOnceServerCommandTest extends AbstractRedisClientTest {
 
diff --git a/src/test/java/com/lambdaworks/redis/commands/ScriptingCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/ScriptingCommandTest.java
index ffbd5cc800..d41050c1f5 100644
--- a/src/test/java/com/lambdaworks/redis/commands/ScriptingCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/ScriptingCommandTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands;
 
 import static com.lambdaworks.redis.ScriptOutputType.*;
@@ -19,6 +32,10 @@
 import com.lambdaworks.redis.RedisException;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ScriptingCommandTest extends AbstractRedisClientTest {
     @Rule
diff --git a/src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java
index a6e78641a6..c6cc1cd9f5 100644
--- a/src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -26,6 +39,10 @@
 import com.lambdaworks.redis.models.role.RoleParser;
 import com.lambdaworks.redis.protocol.CommandType;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ServerCommandTest extends AbstractRedisClientTest {
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/SetCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/SetCommandTest.java
index f390738fe7..032b292c0e 100644
--- a/src/test/java/com/lambdaworks/redis/commands/SetCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/SetCommandTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -13,6 +26,10 @@
 
 import com.lambdaworks.redis.*;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class SetCommandTest extends AbstractRedisClientTest {
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/SortCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/SortCommandTest.java
index 7e0665a993..bc267bb2ea 100644
--- a/src/test/java/com/lambdaworks/redis/commands/SortCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/SortCommandTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands;
 
 import static com.lambdaworks.redis.SortArgs.Builder.alpha;
@@ -15,6 +28,10 @@
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class SortCommandTest extends AbstractRedisClientTest {
     @Test
     public void sort() throws Exception {
diff --git a/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
index 08f08b53c7..74d88c4b3d 100644
--- a/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands;
 
 import static com.lambdaworks.redis.ZStoreArgs.Builder.max;
@@ -19,6 +32,10 @@
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.Range.Boundary;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class SortedSetCommandTest extends AbstractRedisClientTest {
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/StringCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/StringCommandTest.java
index 0b4455505e..c49b726eb0 100644
--- a/src/test/java/com/lambdaworks/redis/commands/StringCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/StringCommandTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands;
 
 import static com.lambdaworks.redis.SetArgs.Builder.ex;
@@ -18,6 +31,10 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class StringCommandTest extends AbstractRedisClientTest {
     @Rule
     public ExpectedException exception = ExpectedException.none();
diff --git a/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java
index 9b89a9a946..e777f41d26 100644
--- a/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -17,6 +30,10 @@
 import com.lambdaworks.redis.RedisException;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class TransactionCommandTest extends AbstractRedisClientTest {
     @Rule
     public ExpectedException exception = ExpectedException.none();
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
index 76d3032ee1..797764f5db 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.reactive;
 
 import static com.lambdaworks.redis.BitFieldArgs.offset;
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
index 43ca857766..3601b140f4 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.reactive;
 
 import org.junit.Test;
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
index 16ac5a0f90..1291adece4 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.reactive;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java
index 47ce5648c4..bf2a83b507 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.reactive;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java
index 6273435d9f..58ce441207 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.reactive;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java
index 4e6e825b4c..7e6afc1e83 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.reactive;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java
index 89a3b8fc28..f8cce9ed1d 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.reactive;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java
index 3da291297d..8a830a0028 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.reactive;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java
index fe4f8a6d95..112012bb2b 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.reactive;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java
index b8432a2dec..891bb89e60 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.reactive;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java
index 9c163bdbf4..4e18646bb1 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.reactive;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java
index 41ccaaa8e8..28d02b8177 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.reactive;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java
index 7f2d9468c6..5b82a25fca 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.reactive;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
index a0ebaa15f8..65ab8deab4 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.reactive;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
index 605b3c6b41..9335b0198b 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.reactive;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/BitTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/BitTxCommandTest.java
index 23a9df92f5..1c72912cc3 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/BitTxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/BitTxCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.transactional;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/GeoTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/GeoTxCommandTest.java
index 26462c321d..f513054081 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/GeoTxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/GeoTxCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.transactional;
 
 import org.junit.Ignore;
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/HLLTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/HLLTxCommandTest.java
index 2ea20437c9..31c9feb2e4 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/HLLTxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/HLLTxCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.transactional;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/HashTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/HashTxCommandTest.java
index b7759cd74b..1c641e71b0 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/HashTxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/HashTxCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.transactional;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/KeyTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/KeyTxCommandTest.java
index 0ce7887367..d93386a252 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/KeyTxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/KeyTxCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.transactional;
 
 import org.junit.Ignore;
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/ListTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/ListTxCommandTest.java
index 1019e34e9f..b803506e83 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/ListTxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/ListTxCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.transactional;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/SetTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/SetTxCommandTest.java
index 96c01706dc..50f9849276 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/SetTxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/SetTxCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.transactional;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/SortTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/SortTxCommandTest.java
index eaf5bafa07..837ecb0dd1 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/SortTxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/SortTxCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.transactional;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/SortedSetTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/SortedSetTxCommandTest.java
index 5d6f39970d..61ccebb74a 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/SortedSetTxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/SortedSetTxCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.transactional;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/StringTxCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/transactional/StringTxCommandTest.java
index 41d4ff15bb..da6f4a6746 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/StringTxCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/StringTxCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.transactional;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/TxSyncInvocationHandler.java b/src/test/java/com/lambdaworks/redis/commands/transactional/TxSyncInvocationHandler.java
index 90f3a3ee24..b1fe12c5dd 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/TxSyncInvocationHandler.java
+++ b/src/test/java/com/lambdaworks/redis/commands/transactional/TxSyncInvocationHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.commands.transactional;
 
 import java.lang.reflect.InvocationTargetException;
@@ -101,4 +116,4 @@ public static <K, V> RedisCommands<K, V> sync(StatefulRedisConnection<K, V> conn
             throw new IllegalStateException(e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodTest.java b/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodTest.java
index 76bea6045d..eda6b87a85 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -53,4 +68,4 @@ static interface MyInterface {
 
         Flux<String> getFlux();
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java b/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java
index ff30f8f367..789d2fe3bb 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
index 8db13a0301..b773a497b8 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
index 35136798ef..5ba7a037e4 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
index 9a92d801cc..80b02d39d6 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -70,4 +85,4 @@ static interface ReactiveWithTimeout {
 
         Publisher<String> get(String key, Timeout timeout);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
index 8edc71e071..51dba6236e 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java b/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java
index 6c8d4a00f7..8747fdfadb 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.codec;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -97,4 +112,4 @@ private static interface CommandMethods {
         String mixedTypes(@Key String key, @Value byte[] value);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java
index 66e7024a3e..0a47a71632 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.intercept;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -44,4 +59,4 @@ public Object invoke(MethodInvocation invocation) {
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java b/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java
index b748fc4cb9..a5a19dc7df 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.output;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -133,4 +148,4 @@ public ByteBuffer encodeValue(String value) {
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java b/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
index 3a0a6914d6..133a48a10c 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.output;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -126,4 +141,4 @@ private static interface CommandMethods {
 
         ListOfMapsOutput<?, ?> listOfMapsOutput();
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java
index eb7941f678..cfd9bcae8f 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.output;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -61,4 +76,4 @@ public void getStringListOutputType() throws Exception {
         assertThat(outputComponentType.getTypeInformation().getComponentType())
                 .isEqualTo(ClassTypeInformation.from(String.class));
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
index c8d1b6f5b7..f7085678d1 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.dynamic.segment;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -107,4 +122,4 @@ private static interface Defaulted {
         void clientSetname();
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java b/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
index 76fc7650a1..5d8547c9e6 100644
--- a/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
+++ b/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java b/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
index 0135d080e5..c624a0223d 100644
--- a/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
+++ b/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/event/DefaultEventPublisherOptionsTest.java b/src/test/java/com/lambdaworks/redis/event/DefaultEventPublisherOptionsTest.java
index ccb0ce6621..ecc9e22ad6 100644
--- a/src/test/java/com/lambdaworks/redis/event/DefaultEventPublisherOptionsTest.java
+++ b/src/test/java/com/lambdaworks/redis/event/DefaultEventPublisherOptionsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.event;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/internal/AbstractInvocationHandlerTest.java b/src/test/java/com/lambdaworks/redis/internal/AbstractInvocationHandlerTest.java
index 410875e257..10c62102a7 100644
--- a/src/test/java/com/lambdaworks/redis/internal/AbstractInvocationHandlerTest.java
+++ b/src/test/java/com/lambdaworks/redis/internal/AbstractInvocationHandlerTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.internal;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
@@ -63,4 +78,4 @@ static interface ReturnOne {
         int returnOne();
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/internal/HostAndPortTest.java b/src/test/java/com/lambdaworks/redis/internal/HostAndPortTest.java
index c78cab34b6..61ffeff438 100644
--- a/src/test/java/com/lambdaworks/redis/internal/HostAndPortTest.java
+++ b/src/test/java/com/lambdaworks/redis/internal/HostAndPortTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.internal;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -168,4 +183,4 @@ private static void checkFromCompatCase(String hpString, String expectHost, int
         assertThat(hostAndPort.getPort()).isEqualTo(expectPort);
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java
index 55aac7e02c..05779d808d 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import static com.lambdaworks.redis.TestSettings.port;
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java
index f5229e7f16..3bd186ba91 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProviderTest.java b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProviderTest.java
index 0b0879299e..59c93c9783 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProviderTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProviderTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveUtilsTest.java b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveUtilsTest.java
index 70149343eb..d7b11a00bf 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveUtilsTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveUtilsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
@@ -83,4 +98,4 @@ public void isChangedShouldReturnTrueBecauseRolesSwitched() throws Exception {
         assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, slave), Arrays.asList(newmaster, newslave))).isTrue();
         assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, slave), Arrays.asList(newslave, newmaster))).isTrue();
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java b/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java
index ac589fa70c..f26e8a7b35 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java b/src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java
index 31942a6faf..13d78ce0cf 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.masterslave;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/metrics/CommandLatencyIdTest.java b/src/test/java/com/lambdaworks/redis/metrics/CommandLatencyIdTest.java
index e25ef6b65d..5d1cae1fb5 100644
--- a/src/test/java/com/lambdaworks/redis/metrics/CommandLatencyIdTest.java
+++ b/src/test/java/com/lambdaworks/redis/metrics/CommandLatencyIdTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.metrics;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java b/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java
index 5b51a802d1..d9ac17bf57 100644
--- a/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java
+++ b/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.metrics;
 
 import static java.util.concurrent.TimeUnit.MICROSECONDS;
diff --git a/src/test/java/com/lambdaworks/redis/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java b/src/test/java/com/lambdaworks/redis/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java
index 65fe4760c1..4b9cc2b05c 100644
--- a/src/test/java/com/lambdaworks/redis/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java
+++ b/src/test/java/com/lambdaworks/redis/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.metrics;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/models/command/CommandDetailParserTest.java b/src/test/java/com/lambdaworks/redis/models/command/CommandDetailParserTest.java
index f4a7daf50a..cb52aad822 100644
--- a/src/test/java/com/lambdaworks/redis/models/command/CommandDetailParserTest.java
+++ b/src/test/java/com/lambdaworks/redis/models/command/CommandDetailParserTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.models.command;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/models/role/RoleParserTest.java b/src/test/java/com/lambdaworks/redis/models/role/RoleParserTest.java
index 2a70cc9ad2..b4cdc3ce32 100644
--- a/src/test/java/com/lambdaworks/redis/models/role/RoleParserTest.java
+++ b/src/test/java/com/lambdaworks/redis/models/role/RoleParserTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.models.role;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/output/BooleanListOutputTest.java b/src/test/java/com/lambdaworks/redis/output/BooleanListOutputTest.java
index 9be0a51607..09f7d85106 100644
--- a/src/test/java/com/lambdaworks/redis/output/BooleanListOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/output/BooleanListOutputTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import static org.assertj.core.api.Assertions.*;
@@ -34,4 +49,4 @@ public void commandOutputCorrectlyDecoded() throws Exception {
     public void setByteNotImplemented() throws Exception {
         sut.set(ByteBuffer.wrap("4.567".getBytes()));
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java b/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java
index 9612ea3462..a93d3d7b12 100644
--- a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -30,4 +45,4 @@ public void commandOutputCorrectlyDecoded() throws Exception {
 
         assertThat(sut.get()).contains(new GeoCoordinates(1.234, 4.567));
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutputTest.java b/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutputTest.java
index c6c0bfaa2f..d46f158ac2 100644
--- a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutputTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -36,4 +51,4 @@ public void commandOutputCorrectlyDecoded() throws Exception {
 
 		assertThat(sut.get()).contains(Value.just(new GeoCoordinates(1.234, 4.567)));
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/output/GeoWithinListOutputTest.java b/src/test/java/com/lambdaworks/redis/output/GeoWithinListOutputTest.java
index 59703a7cf6..e5e45617ca 100644
--- a/src/test/java/com/lambdaworks/redis/output/GeoWithinListOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/output/GeoWithinListOutputTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import static org.assertj.core.api.Assertions.*;
@@ -81,4 +96,4 @@ public void commandOutputKeyAndCoordinatesDecoded() throws Exception {
 
         assertThat(sut.get()).contains(new GeoWithin<>("key", null, null, new GeoCoordinates(1.234, 4.567)));
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/output/ListOutputTest.java b/src/test/java/com/lambdaworks/redis/output/ListOutputTest.java
index 53893bfd08..755732f602 100644
--- a/src/test/java/com/lambdaworks/redis/output/ListOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/output/ListOutputTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import static org.assertj.core.api.Assertions.*;
@@ -73,4 +88,4 @@ public void setValueShouldConvert() throws Exception {
         assertThat(commandOutput.get()).contains(value);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/output/NestedMultiOutputTest.java b/src/test/java/com/lambdaworks/redis/output/NestedMultiOutputTest.java
index df9b626173..9c2f915d67 100644
--- a/src/test/java/com/lambdaworks/redis/output/NestedMultiOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/output/NestedMultiOutputTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import static com.lambdaworks.redis.protocol.LettuceCharsets.buffer;
@@ -23,4 +38,4 @@ public void nestedMultiError() throws Exception {
         assertThat(output.getError()).isNotNull();
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/output/ScoredValueListOutputTest.java b/src/test/java/com/lambdaworks/redis/output/ScoredValueListOutputTest.java
index dc0436d725..71dfe783ce 100644
--- a/src/test/java/com/lambdaworks/redis/output/ScoredValueListOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/output/ScoredValueListOutputTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.output;
 
 import static org.assertj.core.api.Assertions.*;
@@ -35,4 +50,4 @@ public void commandOutputCorrectlyDecoded() throws Exception {
 
         assertThat(sut.get()).contains(ScoredValue.fromNullable(4.567, "key"));
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/protocol/AsyncCommandInternalsTest.java b/src/test/java/com/lambdaworks/redis/protocol/AsyncCommandInternalsTest.java
index 0e26b7d365..ec9ef31d75 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/AsyncCommandInternalsTest.java
+++ b/src/test/java/com/lambdaworks/redis/protocol/AsyncCommandInternalsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import static com.lambdaworks.redis.protocol.LettuceCharsets.buffer;
diff --git a/src/test/java/com/lambdaworks/redis/protocol/CommandArgsTest.java b/src/test/java/com/lambdaworks/redis/protocol/CommandArgsTest.java
index 3b7cfa1e4f..416cef16f6 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/CommandArgsTest.java
+++ b/src/test/java/com/lambdaworks/redis/protocol/CommandArgsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -185,4 +200,4 @@ public void addKeyUsingByteCodec() throws Exception {
 
         assertThat(buffer.toString(LettuceCharsets.ASCII)).isEqualTo(expected.toString(LettuceCharsets.ASCII));
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java b/src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java
index ab73b1e9dd..80d0da96df 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java
+++ b/src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/protocol/CommandInternalsTest.java b/src/test/java/com/lambdaworks/redis/protocol/CommandInternalsTest.java
index c06b7a49c9..fdb612e4b1 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/CommandInternalsTest.java
+++ b/src/test/java/com/lambdaworks/redis/protocol/CommandInternalsTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import static com.lambdaworks.redis.protocol.LettuceCharsets.buffer;
@@ -15,6 +28,10 @@
 import com.lambdaworks.redis.output.NestedMultiOutput;
 import com.lambdaworks.redis.output.StatusOutput;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class CommandInternalsTest {
     protected RedisCodec<String, String> codec = new Utf8StringCodec();
     protected Command<String, String, String> sut;
diff --git a/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java b/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java
index f41c63fc2b..1129c2ee9d 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java
+++ b/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/protocol/DefaultEndpointTest.java b/src/test/java/com/lambdaworks/redis/protocol/DefaultEndpointTest.java
index 44ab5f8702..f83f585ab1 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/DefaultEndpointTest.java
+++ b/src/test/java/com/lambdaworks/redis/protocol/DefaultEndpointTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/protocol/StateMachineTest.java b/src/test/java/com/lambdaworks/redis/protocol/StateMachineTest.java
index c71fa41d48..c6033962e7 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/StateMachineTest.java
+++ b/src/test/java/com/lambdaworks/redis/protocol/StateMachineTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import static com.lambdaworks.redis.protocol.RedisStateMachine.State;
@@ -27,6 +40,10 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class StateMachineTest {
     protected RedisCodec<String, String> codec = new Utf8StringCodec();
     protected Charset charset = Charset.forName("UTF-8");
diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java b/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
index ae6e4fde2e..9cf8ffd16a 100644
--- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
@@ -1,5 +1,18 @@
-// Copyright (C) 2011 - Will Glozer.  All rights reserved.
-
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -24,6 +37,10 @@
 import com.lambdaworks.redis.internal.LettuceFactories;
 import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
 
+/**
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
 public class PubSubCommandTest extends AbstractRedisClientTest implements RedisPubSubListener<String, String> {
     private RedisPubSubAsyncCommands<String, String> pubsub;
 
diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java b/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
index 5834dda498..124249fd1a 100644
--- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
+++ b/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.pubsub;
 
 import static com.google.code.tempusfugit.temporal.Duration.millis;
diff --git a/src/test/java/com/lambdaworks/redis/reactive/RedisPublisherVerification.java b/src/test/java/com/lambdaworks/redis/reactive/RedisPublisherVerification.java
index 7700a7625d..1d6ebaa84a 100644
--- a/src/test/java/com/lambdaworks/redis/reactive/RedisPublisherVerification.java
+++ b/src/test/java/com/lambdaworks/redis/reactive/RedisPublisherVerification.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.reactive;
 
 import static com.lambdaworks.redis.protocol.CommandType.LRANGE;
@@ -83,4 +98,4 @@ public Publisher<String> createFailedPublisher() {
         return null;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/reactive/TestSubscriber.java b/src/test/java/com/lambdaworks/redis/reactive/TestSubscriber.java
index f866135eca..814174dde9 100644
--- a/src/test/java/com/lambdaworks/redis/reactive/TestSubscriber.java
+++ b/src/test/java/com/lambdaworks/redis/reactive/TestSubscriber.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.reactive;
 
 import java.time.Duration;
@@ -1125,4 +1140,4 @@ protected final String valueAndClass(Object o) {
 		return o + " (" + o.getClass().getSimpleName() + ")";
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java b/src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java
index dcb95c560e..fa6e156a34 100644
--- a/src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java
+++ b/src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.reliability;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java b/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java
index 6561e72ec5..fadf76ad05 100644
--- a/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java
+++ b/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.reliability;
 
 import static com.google.code.tempusfugit.temporal.Duration.millis;
diff --git a/src/test/java/com/lambdaworks/redis/resource/ConstantDelayTest.java b/src/test/java/com/lambdaworks/redis/resource/ConstantDelayTest.java
index 200492beeb..ce8e96dfd1 100644
--- a/src/test/java/com/lambdaworks/redis/resource/ConstantDelayTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/ConstantDelayTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -33,4 +48,4 @@ public void shouldCreateConstantDelay() throws Exception {
         assertThat(delay.createDelay(0)).isEqualTo(100);
         assertThat(delay.createDelay(5)).isEqualTo(100);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java b/src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java
index 3a09ff59c3..9750c98f15 100644
--- a/src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java b/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
index 258a15f380..58ebcbafcb 100644
--- a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProviderTest.java b/src/test/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProviderTest.java
index 0677d335c4..4010a44c9e 100644
--- a/src/test/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProviderTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProviderTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/java/com/lambdaworks/redis/resource/DirContextDnsResolverTest.java b/src/test/java/com/lambdaworks/redis/resource/DirContextDnsResolverTest.java
index 1a22c49c69..4fa79e5715 100644
--- a/src/test/java/com/lambdaworks/redis/resource/DirContextDnsResolverTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/DirContextDnsResolverTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java b/src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java
index 8a77969593..42cd096f7d 100644
--- a/src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/resource/ExponentialDelayTest.java b/src/test/java/com/lambdaworks/redis/resource/ExponentialDelayTest.java
index 6d8d16164c..8ff5da7aba 100644
--- a/src/test/java/com/lambdaworks/redis/resource/ExponentialDelayTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/ExponentialDelayTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -81,4 +96,4 @@ public void testPow10Delays() throws Exception {
         assertThat(delay.createDelay(5)).isEqualTo(10000);
         assertThat(delay.createDelay(Integer.MAX_VALUE)).isEqualTo(10000);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java b/src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java
index 5a01edd06b..c5c1106378 100644
--- a/src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/resource/FuturesTest.java b/src/test/java/com/lambdaworks/redis/resource/FuturesTest.java
index bd82907df9..4a9310fd52 100644
--- a/src/test/java/com/lambdaworks/redis/resource/FuturesTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/FuturesTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.resource;
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java b/src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java
index b55e077c37..7018859b0c 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.sentinel;
 
 import org.junit.After;
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
index 76f19d3869..47c944a357 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.sentinel;
 
 import static com.lambdaworks.redis.TestSettings.hostAddr;
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
index fb5cae9f88..e59e031d3b 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.sentinel;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
index a9c9c4486a..6dee9a1697 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.sentinel;
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelReactiveCommandTest.java
index a7c2ec784a..4f8e1319ea 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelReactiveCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.sentinel.reactive;
 
 import static com.lambdaworks.redis.TestSettings.hostAddr;
diff --git a/src/test/java/com/lambdaworks/redis/server/RandomResponseServer.java b/src/test/java/com/lambdaworks/redis/server/RandomResponseServer.java
index 027861ffbe..ee181acc18 100644
--- a/src/test/java/com/lambdaworks/redis/server/RandomResponseServer.java
+++ b/src/test/java/com/lambdaworks/redis/server/RandomResponseServer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.server;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/java/com/lambdaworks/redis/server/RandomServerHandler.java b/src/test/java/com/lambdaworks/redis/server/RandomServerHandler.java
index d1bf180094..4743e7dd2c 100644
--- a/src/test/java/com/lambdaworks/redis/server/RandomServerHandler.java
+++ b/src/test/java/com/lambdaworks/redis/server/RandomServerHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.server;
 
 import java.security.SecureRandom;
@@ -43,4 +58,4 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
         cause.printStackTrace();
         ctx.close();
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/support/CdiTest.java b/src/test/java/com/lambdaworks/redis/support/CdiTest.java
index 863bf7f31e..dc28b3d18c 100644
--- a/src/test/java/com/lambdaworks/redis/support/CdiTest.java
+++ b/src/test/java/com/lambdaworks/redis/support/CdiTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.support;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java b/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java
index a9bf9246f8..09fe78f5cc 100644
--- a/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java
+++ b/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.support;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -205,4 +220,4 @@ public void wrappedObjectClosedAfterReturn() throws Exception {
 
         pool.close();
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/support/InjectedClient.java b/src/test/java/com/lambdaworks/redis/support/InjectedClient.java
index 0a81ac8d1e..25c86e3572 100644
--- a/src/test/java/com/lambdaworks/redis/support/InjectedClient.java
+++ b/src/test/java/com/lambdaworks/redis/support/InjectedClient.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.support;
 
 import javax.annotation.PostConstruct;
diff --git a/src/test/java/com/lambdaworks/redis/support/PersonDB.java b/src/test/java/com/lambdaworks/redis/support/PersonDB.java
index 004935fb48..5963a96928 100644
--- a/src/test/java/com/lambdaworks/redis/support/PersonDB.java
+++ b/src/test/java/com/lambdaworks/redis/support/PersonDB.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.support;
 
 import java.lang.annotation.Retention;
diff --git a/src/test/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBeanTest.java b/src/test/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBeanTest.java
index 2d0be0017a..fdcde9f968 100644
--- a/src/test/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBeanTest.java
+++ b/src/test/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBeanTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.support;
 
 import static org.assertj.core.api.Assertions.*;
diff --git a/src/test/java/com/lambdaworks/redis/support/SpringTest.java b/src/test/java/com/lambdaworks/redis/support/SpringTest.java
index d63d5a95f1..b5629463c9 100644
--- a/src/test/java/com/lambdaworks/redis/support/SpringTest.java
+++ b/src/test/java/com/lambdaworks/redis/support/SpringTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.support;
 
 import static org.assertj.core.api.Assertions.*;
diff --git a/src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java b/src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java
index 378bdc3b30..745a07d325 100644
--- a/src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java
+++ b/src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.util;
 
 import java.lang.reflect.Method;
diff --git a/src/test/java/com/lambdaworks/util/ReactiveSyncInvocationHandler.java b/src/test/java/com/lambdaworks/util/ReactiveSyncInvocationHandler.java
index 3eec42fb0e..36c854bd2c 100644
--- a/src/test/java/com/lambdaworks/util/ReactiveSyncInvocationHandler.java
+++ b/src/test/java/com/lambdaworks/util/ReactiveSyncInvocationHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.util;
 
 import java.lang.reflect.InvocationTargetException;
@@ -114,4 +129,4 @@ public static <K, V> RedisSentinelCommands<K, V> sync(StatefulRedisSentinelConne
         return (RedisSentinelCommands<K, V>) Proxy.newProxyInstance(handler.getClass().getClassLoader(),
                 new Class<?>[] { RedisSentinelCommands.class }, handler);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/util/RoutingInvocationHandler.java b/src/test/java/com/lambdaworks/util/RoutingInvocationHandler.java
index df73250a24..00088fea55 100644
--- a/src/test/java/com/lambdaworks/util/RoutingInvocationHandler.java
+++ b/src/test/java/com/lambdaworks/util/RoutingInvocationHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.util;
 
 import java.lang.reflect.InvocationHandler;
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisChannelWriter.java b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisChannelWriter.java
index 7cecaab844..b3c4a7099c 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisChannelWriter.java
+++ b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisChannelWriter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import com.lambdaworks.redis.RedisChannelWriter;
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java
index e6cc25a240..00908a42a6 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java
+++ b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import java.net.SocketAddress;
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyStatefulRedisConnection.java b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyStatefulRedisConnection.java
index fd5d860d80..9d62892ba7 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyStatefulRedisConnection.java
+++ b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyStatefulRedisConnection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.cluster;
 
 import com.lambdaworks.redis.ClientOptions;
diff --git a/src/test/jmh/com/lambdaworks/redis/codec/JmhMain.java b/src/test/jmh/com/lambdaworks/redis/codec/JmhMain.java
index 8819aa6c97..15e902a6bf 100644
--- a/src/test/jmh/com/lambdaworks/redis/codec/JmhMain.java
+++ b/src/test/jmh/com/lambdaworks/redis/codec/JmhMain.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.codec;
 
 import java.io.IOException;
diff --git a/src/test/jmh/com/lambdaworks/redis/codec/StringCodecBenchmark.java b/src/test/jmh/com/lambdaworks/redis/codec/StringCodecBenchmark.java
index 24c617ea98..c435f3111a 100644
--- a/src/test/jmh/com/lambdaworks/redis/codec/StringCodecBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/codec/StringCodecBenchmark.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.codec;
 
 import java.nio.ByteBuffer;
diff --git a/src/test/jmh/com/lambdaworks/redis/codec/Utf8StringCodecBenchmark.java b/src/test/jmh/com/lambdaworks/redis/codec/Utf8StringCodecBenchmark.java
index abc8de1802..3d19ce10a8 100644
--- a/src/test/jmh/com/lambdaworks/redis/codec/Utf8StringCodecBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/codec/Utf8StringCodecBenchmark.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.codec;
 
 import java.nio.ByteBuffer;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java b/src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java
index 82d5b6afd6..cb5c728c4a 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import com.lambdaworks.redis.codec.StringCodec;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/CommandHandlerBenchmark.java b/src/test/jmh/com/lambdaworks/redis/protocol/CommandHandlerBenchmark.java
index 1ebad7ea84..e2e7451439 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/CommandHandlerBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/CommandHandlerBenchmark.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import org.openjdk.jmh.annotations.Benchmark;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyByteBuf.java b/src/test/jmh/com/lambdaworks/redis/protocol/EmptyByteBuf.java
index b7d0eff3ea..7ede2e4cc5 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyByteBuf.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/EmptyByteBuf.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import io.netty.buffer.AbstractByteBuf;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java b/src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java
index 7dd3a7d959..effeec0d2e 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.net.SocketAddress;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyContext.java b/src/test/jmh/com/lambdaworks/redis/protocol/EmptyContext.java
index 51131a8fe2..89cf7a089c 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyContext.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/EmptyContext.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import io.netty.buffer.ByteBuf;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyFuture.java b/src/test/jmh/com/lambdaworks/redis/protocol/EmptyFuture.java
index c827eeeae6..39943f0eec 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyFuture.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/EmptyFuture.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import io.netty.channel.Channel;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyPromise.java b/src/test/jmh/com/lambdaworks/redis/protocol/EmptyPromise.java
index baba2c0daa..372eed8a42 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyPromise.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/EmptyPromise.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.util.concurrent.ExecutionException;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java b/src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java
index 97e41efffa..c9bb2b3e9a 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.io.IOException;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java b/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java
index 3f6bb8286b..c47ccd51b2 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import com.lambdaworks.redis.cluster.EmptyStatefulRedisConnection;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java b/src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java
index 10e39ad6dc..1a81c186a1 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.lambdaworks.redis.protocol;
 
 import java.nio.ByteBuffer;

From c7e2d46e13f0c594bef1013e0e1b407de976ac58 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 27 Oct 2016 20:52:31 +0200
Subject: [PATCH 059/808] Upgrade to netty 4.0.42.Final/4.1.6.Final #390

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index fadd047171..26e868e16a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
         <github.site.upload.skip>true</github.site.upload.skip>
         <lettuce-release-version>4.2.2.Final</lettuce-release-version>
         <lettuce3-release-version>3.5.0.Final</lettuce3-release-version>
-        <netty-version>4.1.5.Final</netty-version>
+        <netty-version>4.1.6.Final</netty-version>
     </properties>
 
     <scm>
@@ -285,7 +285,7 @@
         <profile>
             <id>netty-40</id>
             <properties>
-               <netty-version>4.0.41.Final</netty-version>
+               <netty-version>4.0.42.Final</netty-version>
             </properties>
         </profile>
         <profile>

From 030182c834e93784c5a1a84556e0abbf42f70f62 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 28 Oct 2016 10:48:34 +0200
Subject: [PATCH 060/808] Add release notes

---
 RELEASE-NOTES.md | 580 +++++++++++++++++++++++++++++------------------
 1 file changed, 363 insertions(+), 217 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 8eb845b561..b2a51a4e72 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,206 +1,335 @@
-lettuce 4.2.0 RELEASE NOTES
-===========================
+lettuce 5.0.0 Beta 1 RELEASE NOTES
+==================================
 
-That's the zero behind 4.2? Well, that's to not break OSGi support.  Now let's
-talk about the more interesting things. Lettuce 4.2.0 is a major release and
-completes development of several notable enhancements.
+This is a major release coming with several breaking changes and new interesting
+features. It's similar to the simultaneously released version 4.3.0 but 
+comes with major changes.
 
-This release comes with SSL support, Publish/Subscribe and adaptive topology
-refreshing for Redis Cluster. It features a major refactoring of the command
-handling and several improvements for Cloud-based Redis services and
-improvements to the Master/Slave API.
+Lettuce 5.0 removes deprecated interfaces RedisConnection and RedisAsyncConnection
+and their segregated interfaces in favor of StatefulRedisConnection and RedisCommands et al.
 
-The usage of Guava was reduced for the most parts. Only the `LoadingCache`,
-`InetAddresses` and `HostAndPort` components are still in use.  A future lettuce
-5.0 version will eliminate the use of Guava completely.
+This release removes dependencies to Guava. Lettuce requires only Netty and Project Reactor
+which brings us to the next change. The reactive API is based on Reactive Streams by using 
+Project Reactor types `Mono` and `Flux` instead of RxJava 1 and `Observable`.
+Existing users can convert `Mono` and `Flux` by using `rxjava-reactive-streams`.
 
-**Important note for users of connection-pooling and latency tracking**
+Finally, this release introduces the dynamic Redis Commands API. This programming
+model enables you to declare command methods and invoke commands to your needs and
+support Redis Modules without waiting for lettuce to support new commands.
 
-Dependencies were streamlined with this release. Apache's `commons-pool2` and
-`latencyutils` are now _optional_ dependencies. If you use connection-pooling or
-latency tracking, please include these dependencies explicitly otherwise these
-features will be disabled.
+This beta/candidate release is to give you a chance to try out new features, 
+get feedback and improve for the final release.
 
-Lettuce 4.2.0 was verified with several Cloud-based Redis services. It works
-with different AWS ElastiCache usage patterns and is known to work with the
-Azure Redis Cluster service supporting SSL and authentication (see below).
+You will find the full change log at the end of this document.
 
-lettuce 4.2.0 is fully binary compatible with the last release and can be used
-as a drop-in replacement for 4.1.x.  This update is strongly recommended for
-lettuce 4.x users as it fixes some critical connection synchronization bugs.
+Thanks to all contributors that made lettuce 5.0.0 possible.
 
-Thanks to all contributors that made lettuce 4.2.0 possible.
+lettuce 5.0.0 requires Java 8 and cannot be used with Java 6 or 7.
 
-lettuce 4.2.0 requires Java 8 and cannot be used with Java 6 or 7.
 
+Good bye, Guava
+---------------
 
-Redis Cluster Publish/Subscribe
--------------------------------
-Redis Cluster
-provides Publish/Subscribe features to broadcast messages across the cluster.
-Using the standalone client allows using Publish/Subscribe with Redis Cluster
-but comes with the limitation of high-availability/failover.
-
-If a node goes down, the connection is lost until the node is available again.
-lettuce addresses this issue with Redis Cluster Publish/Subscribe and provides a
-failover mechanism.
-
-Publish/Subscribe messages and subscriptions are operated on the default cluster
-connection. The default connection is established with the node with the least
-client connections to achieve a homogeneous connection distribution. It also
-uses the cluster topology to failover if the currently connected node is down.
-
-Publishing a message using the regular cluster connection is still possible
-(since 4.0). The regular cluster connection calculates a slot-hash from the
-channel (which is the key in this case). Publishing always connects to the
-master node which is responsible for the slot although `PUBLISH` is not affected
-by the keyspace/slot-hash rule.
-
-Read more: https://github.com/mp911de/lettuce/wiki/Pub-Sub-%284.0%29
-
-
-Redis Cluster and SSL
----------------------
-Redis introduces an option to announce a specific IP address/port using
-`cluster-announce-ip` and `cluster-announce-port`. This is useful for
-Docker and NAT'ed setups. Furthermore, you can "hide" your Redis Cluster nodes
-behind any other proxy like `stunnel`. A Redis Cluster node will announce the
-specified port/IP which can map to `stunnel`, and you get an SSL-protected
-Redis Cluster. Please note that `cluster-announce-ip` is not part of Redis 3.2
-but will be released in future versions.
-
-Redis Cluster SSL works pretty much the same as Redis Standalone with SSL. You
-can configure SSL and other SSL/TLS options using `RedisURI`.
+Lettuce 5.0 no longer uses Google's Guava library. Guava was a good friend
+back in the Java 6-compatible days where `Future` synchronization and callbacks
+were no fun to use. That changed with Java 8 and `CompletableFuture`.
+
+Other uses like `HostAndPort` or `LoadingCache` could be either inlined or
+replaced by Java 8's Collection framework.
+
+
+Removal of deprecated interfaces and methods
+--------------------------------------------
+
+This release removes deprecated interfaces `RedisConnection` and `RedisAsyncConnection`
+and their segregated interfaces in favor of `StatefulRedisConnection` and `RedisCommands`.
+ 
+You will notice slight differences when using that API. Transactional commands and 
+database selection are no longer available through the Redis Cluster API as the 
+old API was derived from the standalone API. `RedisCommands` and `RedisAsyncCommands`
+are no longer `Closeable`. Please use `commands.getStatefulConnection().close()` to 
+close a connection. This change removes ambiguity over closing the commands interface
+over closing the connection.
+
+
+Migration to Reactive Streams (Project Reactor)
+-----------------------------------------------
+
+Lettuce 4.0 introduced a reactive API based on RxJava 1 and `Observable`.
+This was the beginning of reactive Redis support. Lettuce used `Observable`
+all over the place as other reactive types like `Single` and `Completable` were
+still beta or in development.
+
+Since that time, a lot changed in the reactive space. RxJava 2 is still in the
+works towards a final release supporting Reactive Streams, while other composition
+libraries are already available and polish on sharp edges. This means, 
+it was just a matter of time that lettuce adopts Reactive Streams.
+
+This also means, no `null` values and usage of dedicated value types to express
+value multiplicity (`0|1` and `0|1|N`) on the API.
+
+With lettuce 5.0, the reactive API uses Project Reactor, `Mono` and `Flux`.
+
+**4.3 and earlier**
 
 ```java
-RedisURI redisURI = RedisURI.Builder.redis(host(), 7443)
-                                .withSsl(true)
-                                .withVerifyPeer(false)
-                                .build();
+Observable<Long> del(K... keys);
+
+Observable<K> keys(K pattern);
+
+Observable<V> mget(K... keys);
 
-RedisClusterClient redisClusterClient = RedisClusterClient.create(redisURI);
-StatefulRedisClusterConnection<String, String> connection = redisClusterClient.connect();
 ```
 
-You should disable the `verifyPeer` option if the SSL endpoints cannot provide a
-valid certificate. When creating a `RedisClusterClient` using
-`RedisClusterClientFactoryBean` the `verifyPeer` option is disabled by default.
+**5.0**
 
-Lettuce was successfully tested with Azure Redis with SSL and authentication.
+```java
+Mono<Long> del(K... keys);
 
-Read more: https://github.com/mp911de/lettuce/wiki/Redis-Cluster-%284.0%29
+Flux<K> keys(K pattern);
 
+Flux<KeyValue<K, V>> mget(K... keys);
+```
 
-Redis Cluster Topology Discovery and Refreshing
-----------------------------------------------
-The lettuce Redis Cluster Client
-allows regular topology updates. lettuce 4.2.0 improves the existing topology
-updates with adaptive refreshing and dynamic/static topology discovery.
+Switching from RxJava 1 to Project Reactor use requires switching the library. Most
+operators use similar or even same names. If you're required to stick to RxJava 1,
+the use `rxjava-reactive-streams` to adopt reactive types (RxJava 1 <-> Reactive Streams).
 
-Adaptive refresh initiates topology view updates based on events happened during
-Redis Cluster operations. Adaptive triggers lead to an immediate topology
-refresh. Adaptive updates are rate-limited using a timeout since events can
-happen on a large scale. Adaptive refresh triggers are disabled by default and
-can be enabled selectively:
+Migrating to Reactive Streams requires value wrapping to indicate absence of values.
+You will find differences in comparison to the previous API and to the sync/async API
+in cases where commands can return `null` values. Lettuce 5.0 comes with
+new `Value` types that are monads encapsulating a value (or their absence).
 
-* `MOVED_REDIRECT`
-* `ASK_REDIRECT`
-* `PERSISTENT_RECONNECTS`
+See also: https://github.com/mp911de/lettuce/wiki/Reactive-API-%285.0%29
 
-Dynamic/static topology discovery sources are the second change to topology
-refresh. lettuce uses by default dynamic discovery. Dynamic discovery retrieves
-the initial topology from the seed nodes and determines additional nodes to
-request their topology view. That is to reduce split-brain views by choosing the
-view which is shared by the majority of cluster nodes.
 
-Dynamic topology discovery also provides latency data and client count for each
-node in the cluster. These details are useful for calculating the nearest node
-or the least used node.
+Value, KeyValue, and other value types
+--------------------------------------
 
-Dynamic topology discovery can get expensive when running large Redis Clusters
-as all nodes from the topology are queried for their view. Static topology
-refresh sources limit the nodes to the initial seed node set. Limiting nodes is
-friendly to large clusters but it will provide latency and client count only for
-the seed nodes.
+This release enhances existing value types and introduces new types
+to reduce `null` usage and facilitate functional programming. 
 
-Read more: https://github.com/mp911de/lettuce/wiki/Client-options#adaptive-cluster-topology-refresh
+Value types are based on `Value` and `KeyValue`/`ScoredValue` extend from there.
+Value is a wrapper type encapsulating a value or its absence. A `Value` can
+be created in different ways:
 
+```java
+Value<String> value = Value.from(Optional.of("hello"));
 
-Redis Modules
--------------
+Value<String> value = Value.fromNullable(null);
 
-Redis module support is a very young feature. lettuce provides a custom command
-API to dispatch own commands. `StatefulConnection` already allows sending of
-commands but requires wrapping of commands into the appropriate synchronization
-wrapper (Future, Reactive, Fire+Forget).
+Value<String> value = Value.just("hello");
 
-lettuce provides with 4.2.0 `dispatch(…)` methods on each API type to provide a
-simpler interface.
+KeyValue<Long, String> value = KeyValue.from(1L, Optional.of("hello"));
+ 
+KeyValue<String, String> value = KeyValue.just("key", "hello");
+```
+
+It transforms to `Optional` and `Stream` to integrate with other 
+functional uses and allows value mapping.
 
 ```java
-RedisCodec<String, String> codec = new Utf8StringCodec();
+Value.just("hello").stream().filter(…).count();
 
-String response = redis.dispatch(CommandType.SET,
-        new StatusOutput<>(codec),
-        new CommandArgs<>(codec)
-                .addKey(key)
-                .addValue(value));
-```
+KeyValue.just("hello").optional().isPresent();
 
-Calls to `dispatch(…)` on the synchronous API are blocking calls, calls on the
-asynchronous API return a `RedisFuture<T>` and calls on the Reactive API return
-an `Observable<T>` which flat-maps collection responses.
+Value.from(Optional.of("hello")).map(s -> s + "-world").getValue();
 
-Using `dispatch(…)` allows to invoke arbitrary commands and works together
-within transactions and Redis Cluster. Exposing this API also allows choosing a
-different `RedisCodec` for particular operations.
+ScoredValue.just(42, "hello").mapScore(number -> number.doubleValue() * 3.14d).getScore();
+```
 
-Read more: https://github.com/mp911de/lettuce/wiki/Custom-commands%2C-outputs-and-command-mechanics
+You will also find that all public fields of value types are encapsulated with
+getters and these fields are no longer accessible.
 
 
-CommandHandler refactoring
+Dynamic Redis Commands API
 --------------------------
-Command sending, buffering, encoding and receiving was refactored on a large scale.
-Command encoding is performed in a separate handler and outside of `CommandHandler`.
-It does not longer allocate an additional buffer to encode its arguments, but
-arguments are directly written to the command buffer that is used to encode
-single command/batch of commands. Fewer memory allocations help improving
-performance and do not duplicate data.
 
-Synchronization and locking were reworked as well. The critical path used for
-writing commands is no longer locked exclusively but uses a shared locking with
-almost lock-free synchronization.
+The Redis Command Interface abstraction provides a dynamic way for typesafe Redis 
+command invocation. It allows you to declare an interface with command methods to 
+significantly reduce boilerplate code required to invoke a Redis command.
+
+Redis is a data store supporting over 190 documented commands and over 450 command permutations. 
+Command growth and keeping track with upcoming modules are challenging for client 
+developers and Redis user as there is no full command coverage for each module in a single Redis client.
+
+Invoking a custom command with lettuce several lines of code to define command structures
+pass in arguments and specify the return type.
+
+```java
+RedisCodec<String, String> codec = new StringCodec();
+RedisCommands<String, String> commands = ...
+
+String response = redis.dispatch(CommandType.SET, new StatusOutput<>(codec),
+                new CommandArgs<>(codec)
+                       .addKey(key)
+                       .addValue(value));
+```
+
+The central interface in lettuce Command Interface abstraction is `Commands`. 
+This interface acts primarily as a marker interface to help you to discover 
+interfaces that extend this one. You can declare your own command interfaces 
+and argument sequences where the command name is derived from the method name or 
+provided with `@Command`. Introduction of new commands does not require you 
+to wait for a new lettuce release but they can invoke commands through own declaration. 
+That interface could be also supporting different key and value types, depending on the use-case.
+
+Commands are executed applying synchronization, asynchronous and in a reactive fashion, 
+depending on the method declaration.
+
+```java
+public interface MyRedisCommands extends Commands {
+
+    String get(String key); // Synchronous Execution of GET
+
+    @Command("GET")
+    byte[] getAsBytes(String key); // Synchronous Execution of GET returning data as byte array
+
+    @Command("SET") // synchronous execution applying a Timeout
+    String setSync(String key, String value, Timeout timeout);
+
+    Future<String> set(String key, String value); // asynchronous SET execution
+
+    @Command("SET")
+    Mono<String> setReactive(String key, String value); // reactive SET execution using SetArgs
+
+    @CommandNaming(split = DOT) // support for Redis Module command notation -> NR.RUN
+    double nrRun(String key, int... indexes);
+}
+
+RedisCommandFactory factory = new RedisCommandFactory(connection);
+
+MyRedisCommands commands = factory.getCommands(MyRedisCommands.class);
+
+String value = commands.get("key");
+```
+
+You get a whole lot new possibilities with Redis Command Interfaces. This release
+provides initial support. Future versions are likely to support RxJava 1/2 reactive
+types so RxJava 1 users have a migration path that allows using native types without
+further conversion.
+
+See also: https://github.com/mp911de/lettuce/wiki/Redis-Command-Interfaces
+
+
+Backoff/Delay strategies
+------------------------
 
+_Thanks to @jongyeol_
 
-Improvements to Master/Slave connections
+When running cloud-based services with a multitude of services that use Redis,
+then network partitions impact Redis server connection heavily once 
+the partition ends. A network partition impacts all disconnected applications 
+at the same time and all nodes start reconnecting more or less at the same time.
+
+As soon as the partition ends, the majority of applications reconnect at the same time.
+Jitter backoff strategies leverage the impact as the time of reconnecting is randomized.
+
+Lettuce comes with various backoff implementations:
+
+* Equal Jitter
+* Full Jitter
+* Decorrelated Jitter
+
+These are configured in `ClientResources`:
+
+```java
+DefaultClientResources.builder()
+        .reconnectDelay(Delay.decorrelatedJitter())
+        .build();
+
+DefaultClientResources.builder()
+        .reconnectDelay(Delay.equalJitter())
+        .build();
+```
+
+See also: https://www.awsarchitectureblog.com/2015/03/backoff.html and
+https://github.com/mp911de/lettuce/wiki/Configuring-Client-resources
+
+
+New API for Z...RANGE commands
+-------------------------------
+
+Sorted Sets range commands come with a streamlined API regarding method overloads.
+Commands like `ZRANGEBYSCORE`, `ZRANGEBYLEX`, `ZREMRANGEBYLEX` and several others
+now declare methods accepting `Range` and `Limit` objects instead of an growing
+parameter list. The new `Range` allows score and value types applying the proper
+binary encoding.
+
+**4.2 and earlier**
+
+```java
+commands.zcount(key, 1.0, 3.0)
+
+commands.zrangebyscore(key, "-inf", "+inf")
+
+commands.zrangebyscoreWithScores(key, "[1.0", "(4.0")
+
+commands.zrangebyscoreWithScores(key, "-inf", "+inf", 2, 2)
+```
+
+**Since 4.3**
+
+```java
+commands.zcount(key, Range.create(1.0, 3.0));
+
+commands.zrangebyscore(key, Range.unbounded());
+
+commands.zrangebyscoreWithScores(key, Range.from(Boundary.including(1.0), Boundary.excluding(4.0));
+
+commands.zrangebyscoreWithScores(key, Range.unbounded(), Limit.create(2, 2));
+```
+
+
+Connection pooling deprecation
+------------------------------
+
+It took quite a while but 4.3 finally deprecates Lettuce's existing connection pooling
+support. That are in particular `RedisClient.pool(…)` and `RedisClient.asyncPool(…)`. 
+These methods are removed with lettuce 5.0.
+
+Connection pooling had very limited support and would require additional overloads
+that clutter the API to expose pooling for all supported connections.
+This release brings a replacement, that is customizable
+and does not pollute the API. `ConnectionPoolSupport` provides methods to
+create a connection pool accepting a factory method and pool configuration.
+
+Returned connection objects are proxies that return the connection to its pool
+when calling `close()`. `StatefulConnection` implement `Closeable` to
+allow usage of try-with-resources.
+
+```java
+GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
+        .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig());
+
+
+try(StatefulRedisConnection<String, String> connection = pool.borrowObject()) {
+    // Work
+}
+
+
+pool.close();
+```
+
+
+Redis Cluster topology refresh consensus
 ----------------------------------------
-lettuce introduced with 4.1 a Master/Slave API which is now more dynamic. It's
-no longer required to connect to a Master node when using Master/Slave without
-Sentinel as the Master/Slave API will discover the master by itself. Providing
-one seed node enables dynamic lookup. The API is internally prepared for dynamic
-updates which are used with Redis Sentinel.
-
-A Sentinel-managed Master/Slave setup discovers configuration changes based on
-Sentinel events and updates its topology accordingly.
-
-Another change is the broader support of AWS ElastiCache Master/Slave setups.
-AWS ElastiCache allows various patterns for usage. One of them is the automatic
-failover. AWS ElastiCache exposes a connection point hostname and updates the
-DNS record to point to the current master node. Since the JVM has a built-in
-cache it's not trivial to adjust the DNS lookup and caching to the special needs
-which are valid only for AWS ElastiCache connections. lettuce exposes a DNS
-Lookup API that defaults to the JVM lookup. Lettuce ships also with
-`DirContextDnsResolver` that allows own DNS lookups using either the
-system-configured DNS or external DNS servers. This implementation comes without
-caching and is suitable for AWS ElastiCache.
-
-Another pattern is using AWS ElastiCache slaves. Before 4.2.0, a static setup
-was required. Clients had to point to the appropriate node. The Master/Slave API
-allows specifying a set of nodes which form a static Master/Slave setup. Lettuce
-discovers the roles from the provided nodes and routes read/write commands
-according to `ReadFrom` settings.
-
-Read more: https://github.com/mp911de/lettuce/wiki/Master-Slave
+
+Cluster topology refreshing can lead in some cases (dynamic topology sources)
+to orphaning. This can happen if a cluster node is removed from the cluster and
+lettuce decides to accept the topology view of that removed node. Lettuce 
+gets stuck with that node and is not able to use the remaining cluster.
+
+This release introduces `PartitionsConsensus` strategies to determine the most
+appropriate topology view if multiple views are acquired. The strategy can be
+customized by overriding 
+`RedisClusterClient.determinePartitions(Partitions, Map<RedisURI, Partitions>)`.
+
+Lettuce defaults choosing the topology view with the majority of previously known
+cluster nodes. This helps lettuce to stick with the cluster that consists of the
+most nodes.
+ 
+See also: https://github.com/mp911de/lettuce/issues/355
 
 
 If you need any support, meet lettuce at:
@@ -212,71 +341,88 @@ If you need any support, meet lettuce at:
 
 Commands
 --------
-* Add support for CLUSTER BUMPEPOCH command #179
-* Support extended MIGRATE syntax #197
-* Add support for GEORADIUS STORE and STOREDIST options #199
-* Support SCAN in RedisCluster #201
-* Add support for BITFIELD command #206
-* Add zadd method accepting ScoredValue #210
-* Add support for SPOP key count #235
-* Add support for GEOHASH command #239
-* Add simple interface for custom command invocation for sync/async/reactive APIs #245
+* Add support for TOUCH command #270
+* Add support for variadic LPUSHX and RPUSHX #267
+* Provide a more conceise API for Sorted Set query operations using Range/Limit #363
+* Add support for ZREVRANGEBYLEX command #369 (Thanks to @christophstrobl)
+* Add support for SWAPDB #375
 
 Enhancements
 ------------
-* Cluster pub/sub and resilient subscriptions #138 (Thanks to @jpennell)
-* Reactive API: Emit items during command processing #178
-* Allow configuration of max redirect count for cluster connections #191
-* Improve SCAN API #208
-* Support Redis Cluster with SSL #209
-* Improve CommandHandler locking #211
-* Improve command encoding of singular commands and command batches #212 (Thanks to @cwolfinger)
-* Add log statement for resolved address #218 (Thanks to @mzapletal)
-* Apply configured password/database number in MasterSlave connection #220
-* Improve command draining in flushCommands #228 (Thanks to @CodingFabian)
-* Support dynamic master/slave connections #233
-* Expose DNS Resolver #236
-* Make latencyutils and commons-pool2 dependencies optional #237
-* Support adaptive cluster topology refreshing and static refresh sources #240 (Thanks to @RahulBabbar)
-* Add static builder() methods to builders enhancement #248
-* Add factory for reconnection delay enhancement #250
-* Add integer cache for CommandArgs enhancement #251
+* Remove deprecated interfaces and methods #156
+* Remove Google Guava usage #217
+* Add SocketOptions to ClientOptions #269
+* Add support for OpenSSL as SSL provider #249
+* Replacement support for connection pooling #264
+* Add ToByteBufEncoder and improved StringCodec #275
+* Allow configuration of a trust store password #292
+* Replace Guava Cache by ConcurrentHashMap #300
+* Eager initialization of API wrappers in stateful connections #302 (Thanks to @jongyeol)
+* Change MethodTranslator's loadfactor to 1.0 for sync APIs performance #305 (Thanks to @jongyeol)
+* Reattempt initially failed Sentinel connections in Master/Slave API #306
+* Decouple CommandHandler #317
+* Use TransactionResult for transaction results #320
+* Replace synchronized setters with volatile fields #326 (Thanks to @guperrot)
+* Add workaround for IPv6 parsing #332
+* Provide multi-key-routing for exists and unlink commands using Redis Cluster #334
+* Migrate lettuce reactive API to Reactive Streams #349
+* Provide Value types #350
+* Add ConnectionWatchdog as last handler #335
+* Provide Timer as part of ClientResources #354 (Thanks to @plokhotnyuk)
+* Add support for topology consensus #355
+* Use Limit in SortArgs #364
+* Add jitter backoff strategies for spreading reconnection timing #365 (Thanks to @jongyeol)
+* Add EVAL and EVALSHA to ReadOnlyCommands #366 (Thanks to @amilnarski)
+* Add support for ZADD INCR with ZAddArgs #367 (Thanks to @christophstrobl)
+* Accept double in ZStoreArgs.weights #368 (Thanks to @christophstrobl)
+* Consider role changes as trigger for update using MasterSlave connections #370
+* Provide a dynamic Redis Command API #371
+* Support lettuce parameter types #381
+* Expose Value.map methods #386 
 
 Fixes
 -----
-* pfmerge invokes PFADD instead of PFMERGE #158 (Thanks to @christophstrobl)
-* Fix NPE in when command output is null #187 (Thanks to @rovarghe)
-* Set interrupted bit after catching InterruptedException #192
-* Lettuce fails sometimes at shutdown: DefaultClientResources.shutdown #194
-* Extensive calls to PooledClusterConnectionProvider.closeStaleConnections #195
-* Shared resources are closed altough still users are present #196
-* Lettuce 4.1 does not repackage new dependencies #198 (Thanks to @    CodingFabian)
-* Fix NPE in CommandHandler.write (Thanks to @cinnom) #213
-* Gracefully shutdown DefaultCommandLatencyCollector.PAUSE_DETECTOR #223 (Thanks to @sf-git and @johnou)
-* RedisClient.connect(RedisURI) fails for unix socket based URIs #229 (Thanks to @nivekastoreth)
-* HdrHistogram and LatencyUtils are not included in binary distribution #231
-* Cache update in Partitions is not thread-safe #234
-* GEORADIUSBYMEMBER, GEORADIUS and GEOPOS run into NPE when using Redis Transactions #241
-* LettuceFutures.awaitAll throws RedisCommandInterruptedException when awaiting failed commands #242
-* Fix command sequence on connection activation #253 (Thanks to @long-xuan-nguyen)
-* Cluster topology refresh: Failed connections are not closed bug #255
-* Cluster topology refresh tries to connect twice for failed connection attempts #256
-* Connection lifecycle state DISCONNECTED is considered a connected sate #257
-* Writing commands while a disconnect is in progress leads to a race-condition #258
-* Canceled commands lead to connection desynchronization #262 (Thanks to @long-xuan-nguyen)
+* Fix JavaDoc for blocking list commands #272
+* Guard key parameters against null values #287
+* CommandArgs.ExperimentalByteArrayCodec fails to encode bulk string #288
+* Guard value parameters against null values #291 (Thanks to @christophstrobl)
+* Allow MasterSlave connection using Sentinel if some Sentinels are not available #304 (Thanks to @RahulBabbar)
+* Allow coordinated cross-slot execution using Iterable #303 (Thanks to @agodet)
+* Use at least 3 Threads when configuring default thread count #309
+* Replace own partition host and port only if the reported connection point is empty #312
+* Lettuce RedisClusterClient calls AUTH twice #313
+* CommandHandler notifications called out of order #315
+* Disable SYNC command #319
+* Record sent-time on command queueing #314 (Thanks to @HaloFour)
+* ASK bit not set on ASK redirection #321 (Thanks to @kaibaemon)
+* Check for isUnsubscribed() before calling subscriber methods #323 (Thanks to @vleushin)
+* Avoid timeouts for cancelling command #325 (Thanks to @jongyeol)
+* Guard command completion against exceptions #331
+* Store error at output-level when using NestedMultiOutput #328 (Thanks to @jongyeol)
+* Fix master and slave address parsing for IPv6 addresses #329 (Thanks to @maksimlikharev)
+* Fix srandmember return type from Set to List #330 (Thanks to @jongyeol)
+* Add synchronization to Partitions/Use read-view for consistent Partition usage during Partitions updates #333 (Thanks to @OutOfBrain)
+* Run cluster command redirects on event executor threads #340 (Thanks to @oklahomer)
+* Close connections in PooledClusterConnectionProvider on connection failures #343
+* Consider number of redirections instead of executions for cluster commands #344 (Thanks to @Spikhalskiy)
+* Ensure unique reconnect scheduling #346
+* Guard ConnectionWatchdog against NPE from missing CommandHandler #358
+* Fix RedisAdvancedClusterAsyncCommandsImpl.msetnx return value #376 (Thanks to @mjaow)
+* Allow hostnames in MasterSlaveTopologyProvider when parsing in master_host #377 (Thanks to @szabowexler)
+* Allow empty values in BITFIELD using the reactive API #378
+* Support integer width multiplied offsets in BITFIELD #379 (Thanks to @christophstrobl)
+* Propagate array sizes in MultiOutput #380 (Thanks to @christophstrobl)
 
 Other
 ------
-* Switch remaining tests to AssertJ #13
-* Promote 4.x branch to main branch #155
-* Add Wiki documentation for disconnectedBehavior option in ClientOptions #188
-* Switch travis-ci to container build #203
-* Refactor Makefile #207
-* Code cleanups #215
-* Reduce Google Guava usage #217
-* Improve contribution assets #219
-* Ensure OSGi compatibility #232
-* Upgrade netty to 4.0.36.Final #238
+* Improve test synchronization #216
+* Upgrade to stunnel 5.33 #290
+* Upgrade logging to log4j2 for tests #316
+* Upgrade to AssertJ 3.5.2 #352
+* Add test to verify behavior of GEODIST if a geoset is unknown #362
+* Update license/author headers #387
+* Upgrade to netty 4.0.42.Final/4.1.6.Final 390
+
 
 lettuce requires a minimum of Java 8 to build and run. It is tested continuously
 against the latest Redis source-build.
@@ -287,4 +433,4 @@ If you need any support, meet lettuce at
 or lettuce-redis-client-users@googlegroups.com
 * Join the chat at https://gitter.im/mp911de/lettuce
 * Github Issues: https://github.com/mp911de/lettuce/issues
-* Wiki: https://github.com/mp911de/lettuce/wiki
\ No newline at end of file
+* Wiki: https://github.com/mp911de/lettuce/wiki

From 80668f970482e8ee7d9936a94a815063645b8a90 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 28 Oct 2016 10:49:48 +0200
Subject: [PATCH 061/808] Add Commands interface #371

---
 .../lambdaworks/redis/dynamic/Commands.java   | 26 +++++++++++++++++++
 .../redis/dynamic/RedisCommandFactory.java    |  2 +-
 .../lambdaworks/redis/ScoredValueTest.java    |  2 +-
 .../redis/dynamic/RedisCommandsTest.java      |  6 ++---
 4 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/Commands.java

diff --git a/src/main/java/com/lambdaworks/redis/dynamic/Commands.java b/src/main/java/com/lambdaworks/redis/dynamic/Commands.java
new file mode 100644
index 0000000000..69548b7262
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/Commands.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+/**
+ * Marker interface for dynamic Redis commands. Typically used by Redis Command Interfaces as extension point to discover
+ * interface declarations.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public interface Commands {
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
index eb83ac3dab..f068012101 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
@@ -179,7 +179,7 @@ public void setVerifyCommandMethods(boolean verifyCommandMethods) {
      * @param commandInterface must not be {@literal null}.
      * @return the implemented Redis Commands interface.
      */
-    public <T> T getCommands(Class<T> commandInterface) {
+    public <T extends Commands> T getCommands(Class<T> commandInterface) {
 
         LettuceAssert.notNull(commandInterface, "Redis Command Interface must not be null");
 
diff --git a/src/test/java/com/lambdaworks/redis/ScoredValueTest.java b/src/test/java/com/lambdaworks/redis/ScoredValueTest.java
index 438e831809..aec53eed3a 100644
--- a/src/test/java/com/lambdaworks/redis/ScoredValueTest.java
+++ b/src/test/java/com/lambdaworks/redis/ScoredValueTest.java
@@ -41,7 +41,7 @@ public void shouldCreateEmptyScoredValueFromOptional() {
     public void shouldCreateEmptyValue() {
 
         ScoredValue<String> value = ScoredValue.empty();
-
+        
         assertThat(value.hasValue()).isFalse();
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
index 51dba6236e..225e6ca1ed 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
@@ -91,7 +91,7 @@ public void verifierShouldCatchBuggyDeclarations() throws Exception {
 
     }
 
-    static interface TestInterface {
+    static interface TestInterface extends Commands {
 
         String get(String key);
 
@@ -107,13 +107,13 @@ static interface TestInterface {
         Mono<String> setReactive(String key, String value);
     }
 
-    static interface TooFewParameters {
+    static interface TooFewParameters extends Commands {
 
         String get();
 
     }
 
-    static interface WithTypo {
+    static interface WithTypo extends Commands {
 
         String gat(String key);
 

From 5f873e8d56e343a963baca5e7d7bc68078360d91 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 28 Oct 2016 14:58:08 +0200
Subject: [PATCH 062/808] Upgrade to Project Reactor 3.0.3 #395

---
 RELEASE-NOTES.md | 1 +
 pom.xml          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index b2a51a4e72..d00a103eaa 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -422,6 +422,7 @@ Other
 * Add test to verify behavior of GEODIST if a geoset is unknown #362
 * Update license/author headers #387
 * Upgrade to netty 4.0.42.Final/4.1.6.Final 390
+* Upgrade to Project Reactor 3.0.3 #395
 
 
 lettuce requires a minimum of Java 8 to build and run. It is tested continuously
diff --git a/pom.xml b/pom.xml
index 26e868e16a..fe05748647 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>3.0.1.BUILD-SNAPSHOT</version>
+            <version>3.0.3.RELEASE</version>
         </dependency>
 
         <!-- Netty -->

From 844cd6dde156d3ed4996d37cbd311293fc68e031 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 28 Oct 2016 15:03:08 +0200
Subject: [PATCH 063/808] Disable shaded jar #396

---
 RELEASE-NOTES.md     |  1 +
 pom.xml              | 51 +-------------------------------------------
 src/assembly/bin.xml |  5 ++---
 3 files changed, 4 insertions(+), 53 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index d00a103eaa..24efea1a71 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -423,6 +423,7 @@ Other
 * Update license/author headers #387
 * Upgrade to netty 4.0.42.Final/4.1.6.Final 390
 * Upgrade to Project Reactor 3.0.3 #395
+* Disable shaded jar #396
 
 
 lettuce requires a minimum of Java 8 to build and run. It is tested continuously
diff --git a/pom.xml b/pom.xml
index fe05748647..e5f328684a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -436,7 +436,7 @@
                                     <classpathScope>test</classpathScope>
                                     <arguments>
                                         <argument>-classpath</argument>
-                                        <classpath/>
+                                        <classpath />
                                         <argument>org.openjdk.jmh.Main</argument>
                                         <argument>.*</argument>
                                     </arguments>
@@ -622,55 +622,6 @@
                     <excludes>apidocs/**</excludes>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <relocations>
-                                <relocation>
-                                    <pattern>rx</pattern>
-                                    <shadedPattern>com.lambdaworks.rx</shadedPattern>
-                                </relocation>
-
-                                <relocation>
-                                    <pattern>com.google</pattern>
-                                    <shadedPattern>com.lambdaworks.com.google</shadedPattern>
-                                </relocation>
-
-                                <relocation>
-                                    <pattern>org.HdrHistogram</pattern>
-                                    <shadedPattern>com.lambdaworks.org.HdrHistogram</shadedPattern>
-                                </relocation>
-
-                                <relocation>
-                                    <pattern>org.LatencyUtils</pattern>
-                                    <shadedPattern>com.lambdaworks.org.LatencyUtils</shadedPattern>
-                                </relocation>
-
-                                <relocation>
-                                    <pattern>org.apache.commons.pool2</pattern>
-                                    <shadedPattern>com.lambdaworks.org.apache.commons.pool2</shadedPattern>
-                                </relocation>
-
-                                <relocation>
-                                    <pattern>io</pattern>
-                                    <shadedPattern>com.lambdaworks.io</shadedPattern>
-                                </relocation>
-                            </relocations>
-                            <minimizeJar>false</minimizeJar>
-                            <shadedArtifactAttached>true</shadedArtifactAttached>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index a65ed2ad90..0dfa47f183 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -13,7 +13,6 @@
         <dependencySet>
             <includes>
                 <include>biz.paluch.redis:lettuce:jar:${project.version}</include>
-                <include>biz.paluch.redis:lettuce:jar:shaded:${project.version}</include>
             </includes>
             <outputDirectory></outputDirectory>
             <unpack>false</unpack>
@@ -30,9 +29,9 @@
         </dependencySet>
         <dependencySet>
             <includes>
-                <include>io.reactivex:*</include>
                 <include>io.netty:*</include>
-                <include>com.google.guava:*</include>
+                <include>io.projectreactor:*</include>
+                <include>org.reactivestreams:reactive-streams:*</include>
                 <include>org.apache.commons:*</include>
                 <include>org.latencyutils:*</include>
                 <include>org.hdrhistogram:*</include>

From 7161a36c2f571d0971775a419754398c87fae9c4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 28 Oct 2016 15:08:51 +0200
Subject: [PATCH 064/808] [maven-release-plugin] prepare release 5.0.0.Beta1

---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e5f328684a..32961d61c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>biz.paluch.redis</groupId>
     <artifactId>lettuce</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.0.0.Beta1</version>
     <packaging>jar</packaging>
 
     <name>lettuce</name>
@@ -64,7 +64,8 @@
         <connection>scm:git:https://github.com/mp911de/lettuce.git</connection>
         <developerConnection>scm:git:https://github.com/mp911de/lettuce.git</developerConnection>
         <url>http://github.com/mp911de/lettuce</url>
-    </scm>
+      <tag>5.0.0.Beta1</tag>
+  </scm>
 
     <prerequisites>
         <maven>3.0</maven>

From b764373ca79dc946477a5bd627bcfc4ab05c6403 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 28 Oct 2016 15:12:44 +0200
Subject: [PATCH 065/808] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 32961d61c9..914e9cf1fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>biz.paluch.redis</groupId>
     <artifactId>lettuce</artifactId>
-    <version>5.0.0.Beta1</version>
+    <version>5.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>lettuce</name>
@@ -64,7 +64,7 @@
         <connection>scm:git:https://github.com/mp911de/lettuce.git</connection>
         <developerConnection>scm:git:https://github.com/mp911de/lettuce.git</developerConnection>
         <url>http://github.com/mp911de/lettuce</url>
-      <tag>5.0.0.Beta1</tag>
+      <tag>HEAD</tag>
   </scm>
 
     <prerequisites>

From be257314d7c9b491f254b03f0525595137ed97eb Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 6 Nov 2016 11:56:53 +0100
Subject: [PATCH 066/808] Extend RedisClusterClient and RedisClusterFactoryBean
 to take multiple hosts #401

RedisClusterClient and RedisClusterFactoryBean can now be initialized by taking multiple hosts within one URI.

RedisClusterClient.create("redis+tls://password@host1:6379,host2:6380")
---
 .../java/com/lambdaworks/redis/RedisURI.java  |  35 ++++--
 .../redis/cluster/RedisClusterClient.java     |  30 ++---
 .../redis/cluster/RedisClusterURIUtil.java    |  81 +++++++++++++
 .../RedisClusterClientFactoryBean.java        |  61 +++++++---
 .../com/lambdaworks/redis/RedisURITest.java   |  39 +++---
 .../cluster/RedisClusterURIUtilTest.java      | 112 ++++++++++++++++++
 .../RedisClusterClientFactoryBeanTest.java    |  69 +++++++++--
 7 files changed, 353 insertions(+), 74 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/RedisClusterURIUtil.java
 create mode 100644 src/test/java/com/lambdaworks/redis/cluster/RedisClusterURIUtilTest.java

diff --git a/src/main/java/com/lambdaworks/redis/RedisURI.java b/src/main/java/com/lambdaworks/redis/RedisURI.java
index 7461c0ffa3..74852f8c02 100644
--- a/src/main/java/com/lambdaworks/redis/RedisURI.java
+++ b/src/main/java/com/lambdaworks/redis/RedisURI.java
@@ -535,16 +535,20 @@ private static RedisURI buildRedisUriFromUri(URI uri) {
     private String getAuthority(final String scheme) {
 
         String authority = null;
+
         if (host != null) {
-            authority = urlEncode(host) + getPortPart(port, scheme);
+            if (host.contains(",")) {
+                authority = host;
+            } else {
+                authority = urlEncode(host) + getPortPart(port, scheme);
+            }
         }
 
         if (sentinels.size() != 0) {
-            String joinedSentinels = sentinels.stream()
+
+            authority = sentinels.stream()
                     .map(redisURI -> urlEncode(redisURI.getHost()) + getPortPart(redisURI.getPort(), scheme))
                     .collect(Collectors.joining(","));
-
-            authority = joinedSentinels;
         }
 
         if (socket != null) {
@@ -772,7 +776,8 @@ private static void parseSentinelMasterId(Builder builder, String queryParam) {
     }
 
     private static Builder configureStandalone(URI uri) {
-        Builder builder;
+
+        Builder builder = null;
         Set<String> allowedSchemes = LettuceSets.unmodifiableSet(URI_SCHEME_REDIS, URI_SCHEME_REDIS_SECURE,
                 URI_SCHEME_REDIS_SOCKET, URI_SCHEME_REDIS_SOCKET_ALT, URI_SCHEME_REDIS_SECURE_ALT, URI_SCHEME_REDIS_TLS_ALT);
 
@@ -783,10 +788,24 @@ private static Builder configureStandalone(URI uri) {
         if (URI_SCHEME_REDIS_SOCKET.equals(uri.getScheme()) || URI_SCHEME_REDIS_SOCKET_ALT.equals(uri.getScheme())) {
             builder = Builder.socket(uri.getPath());
         } else {
-            if (uri.getPort() > 0) {
-                builder = Builder.redis(uri.getHost(), uri.getPort());
+
+            if (isNotEmpty(uri.getHost())) {
+
+                if (uri.getPort() > 0) {
+                    builder = Builder.redis(uri.getHost(), uri.getPort());
+                } else {
+                    builder = Builder.redis(uri.getHost());
+                }
             } else {
-                builder = Builder.redis(uri.getHost());
+
+                if (isNotEmpty(uri.getAuthority())) {
+                    String authority = uri.getAuthority();
+                    if (authority.indexOf('@') > -1) {
+                        authority = authority.substring(authority.indexOf('@') + 1);
+                    }
+
+                    builder = Builder.redis(authority);
+                }
             }
         }
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index 90093296e0..fa2861ac0f 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -17,6 +17,7 @@
 
 import java.io.Closeable;
 import java.net.SocketAddress;
+import java.net.URI;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -219,7 +220,7 @@ public static RedisClusterClient create(RedisURI redisURI) {
      * Create a new client that connects to the supplied {@link RedisURI uri} with default {@link ClientResources}. You can
      * connect to different Redis servers but you must supply a {@link RedisURI} on connecting.
      *
-     * @param redisURIs one or more Redis URI, must not be {@literal null} and not empty
+     * @param redisURIs one or more Redis URI, must not be {@literal null} and not empty.
      * @return a new instance of {@link RedisClusterClient}
      */
     public static RedisClusterClient create(Iterable<RedisURI> redisURIs) {
@@ -232,12 +233,12 @@ public static RedisClusterClient create(Iterable<RedisURI> redisURIs) {
      * Create a new client that connects to the supplied uri with default {@link ClientResources}. You can connect to different
      * Redis servers but you must supply a {@link RedisURI} on connecting.
      *
-     * @param uri the Redis URI, must not be {@literal null}
+     * @param uri the Redis URI, must not be empty or {@literal null}.
      * @return a new instance of {@link RedisClusterClient}
      */
     public static RedisClusterClient create(String uri) {
-        LettuceAssert.notNull(uri, "URI must not be null");
-        return create(RedisURI.create(uri));
+        LettuceAssert.notEmpty(uri, "URI must not be empty");
+        return create(RedisClusterURIUtil.toRedisURIs(URI.create(uri)));
     }
 
     /**
@@ -261,13 +262,13 @@ public static RedisClusterClient create(ClientResources clientResources, RedisUR
      * supply a {@link RedisURI} on connecting.
      *
      * @param clientResources the client resources, must not be {@literal null}
-     * @param uri the Redis URI, must not be {@literal null}
+     * @param uri the Redis URI, must not be empty or {@literal null}.
      * @return a new instance of {@link RedisClusterClient}
      */
     public static RedisClusterClient create(ClientResources clientResources, String uri) {
         assertNotNull(clientResources);
-        LettuceAssert.notNull(uri, "URI must not be null");
-        return create(clientResources, RedisURI.create(uri));
+        LettuceAssert.notEmpty(uri, "URI must not be empty");
+        return create(clientResources, RedisClusterURIUtil.toRedisURIs(URI.create(uri)));
     }
 
     /**
@@ -678,7 +679,7 @@ protected Partitions loadPartitions() {
         for (RedisClusterNode partition : loadedPartitions) {
             if (viewedBy != null) {
                 RedisURI uri = partition.getUri();
-                applyUriConnectionSettings(viewedBy, uri);
+                RedisClusterURIUtil.applyUriConnectionSettings(viewedBy, uri);
             }
         }
 
@@ -841,19 +842,6 @@ boolean expireStaleConnections() {
         return getClusterClientOptions() == null || getClusterClientOptions().isCloseStaleConnections();
     }
 
-    static void applyUriConnectionSettings(RedisURI from, RedisURI to) {
-
-        if (from.getPassword() != null && from.getPassword().length != 0) {
-            to.setPassword(new String(from.getPassword()));
-        }
-
-        to.setTimeout(from.getTimeout());
-        to.setUnit(from.getUnit());
-        to.setSsl(from.isSsl());
-        to.setStartTls(from.isStartTls());
-        to.setVerifyPeer(from.isVerifyPeer());
-    }
-
     private static <K, V> void assertNotNull(RedisCodec<K, V> codec) {
         LettuceAssert.notNull(codec, "RedisCodec must not be null");
     }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterURIUtil.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterURIUtil.java
new file mode 100644
index 0000000000..fcdd7ca2c9
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterURIUtil.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.internal.HostAndPort;
+
+/**
+ * {@link RedisClusterURIUtil} is a collection of {@link RedisURI}-based utility methods for {@link RedisClusterClient} use.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public class RedisClusterURIUtil {
+
+    /**
+     * Parse a Redis Cluster URI with potentially multiple hosts into a {@link List} of {@link RedisURI}.
+     *
+     * An URI follows the syntax: {@code redis://[password@]host[:port][,host2[:port2]]}
+     * 
+     * @param uri must not be empty or {@literal null}.
+     * @return {@link List} of {@link RedisURI}.
+     */
+    public static List<RedisURI> toRedisURIs(URI uri) {
+
+        RedisURI redisURI = RedisURI.create(uri);
+
+        String[] parts = redisURI.getHost().split("\\,");
+
+        List<RedisURI> redisURIs = new ArrayList<>(parts.length);
+
+        for (String part : parts) {
+            HostAndPort hostAndPort = HostAndPort.parse(part);
+
+            RedisURI nodeUri = RedisURI.create(hostAndPort.getHostText(),
+                    hostAndPort.hasPort() ? hostAndPort.getPort() : redisURI.getPort());
+
+            applyUriConnectionSettings(redisURI, nodeUri);
+
+            redisURIs.add(nodeUri);
+        }
+
+        return redisURIs;
+    }
+
+    /**
+     * Apply {@link RedisURI} settings such as SSL/Timeout/password.
+     * 
+     * @param from from {@link RedisURI}.
+     * @param to from {@link RedisURI}.
+     */
+    static void applyUriConnectionSettings(RedisURI from, RedisURI to) {
+
+        if (from.getPassword() != null && from.getPassword().length != 0) {
+            to.setPassword(new String(from.getPassword()));
+        }
+
+        to.setTimeout(from.getTimeout());
+        to.setUnit(from.getUnit());
+        to.setSsl(from.isSsl());
+        to.setStartTls(from.isStartTls());
+        to.setVerifyPeer(from.isVerifyPeer());
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBean.java b/src/main/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBean.java
index 07b0fb9b9e..66a68bd158 100644
--- a/src/main/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBean.java
+++ b/src/main/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBean.java
@@ -18,19 +18,23 @@
 import static com.lambdaworks.redis.LettuceStrings.isNotEmpty;
 
 import java.net.URI;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.cluster.RedisClusterClient;
+import com.lambdaworks.redis.cluster.RedisClusterURIUtil;
 import com.lambdaworks.redis.internal.LettuceAssert;
 
 /**
  * Factory Bean for {@link RedisClusterClient} instances. Needs either a {@link URI} or a {@link RedisURI} as input and allows
  * to reuse {@link com.lambdaworks.redis.resource.ClientResources}. URI Format: {@code
- *     redis://[password@]host[:port]
+ *     redis://[password@]host[:port][,host2[:port2]]
  * }
  * 
  * {@code
- *     rediss://[password@]host[:port]
+ *     rediss://[password@]host[:port][,host2[:port2]]
  * }
  *
  * @see RedisURI
@@ -41,32 +45,52 @@
 public class RedisClusterClientFactoryBean extends LettuceFactoryBeanSupport<RedisClusterClient> {
 
     private boolean verifyPeer = false;
+    private Collection<RedisURI> redisURIs;
 
     @Override
     public void afterPropertiesSet() throws Exception {
 
-        if (getRedisURI() == null) {
-            URI uri = getUri();
+        if (redisURIs == null) {
 
-            LettuceAssert.isTrue(!uri.getScheme().equals(RedisURI.URI_SCHEME_REDIS_SENTINEL),
-                    "Sentinel mode not supported when using RedisClusterClient");
+            if (getUri() != null) {
+                URI uri = getUri();
 
-            RedisURI redisURI = RedisURI.create(uri);
-            if (isNotEmpty(getPassword())) {
-                redisURI.setPassword(getPassword());
-            }
+                LettuceAssert.isTrue(!uri.getScheme().equals(RedisURI.URI_SCHEME_REDIS_SENTINEL),
+                        "Sentinel mode not supported when using RedisClusterClient");
 
-            if (RedisURI.URI_SCHEME_REDIS_SECURE.equals(uri.getScheme())
-                    || RedisURI.URI_SCHEME_REDIS_SECURE_ALT.equals(uri.getScheme())
-                    || RedisURI.URI_SCHEME_REDIS_TLS_ALT.equals(uri.getScheme())) {
-                redisURI.setVerifyPeer(verifyPeer);
-            }
+                List<RedisURI> redisURIs = RedisClusterURIUtil.toRedisURIs(uri);
+
+                for (RedisURI redisURI : redisURIs) {
+                    applyProperties(uri.getScheme(), redisURI);
+                }
+
+                this.redisURIs = redisURIs;
+            } else {
 
-            setRedisURI(redisURI);
+                URI uri = getRedisURI().toURI();
+                RedisURI redisURI = RedisURI.create(uri);
+                applyProperties(uri.getScheme(), redisURI);
+                this.redisURIs = Collections.singleton(redisURI);
+            }
         }
 
         super.afterPropertiesSet();
+    }
+
+    private void applyProperties(String scheme, RedisURI redisURI) {
 
+        if (isNotEmpty(getPassword())) {
+            redisURI.setPassword(getPassword());
+        }
+
+        if (RedisURI.URI_SCHEME_REDIS_SECURE.equals(scheme) || RedisURI.URI_SCHEME_REDIS_SECURE_ALT.equals(scheme)
+                || RedisURI.URI_SCHEME_REDIS_TLS_ALT.equals(scheme)) {
+            redisURI.setVerifyPeer(verifyPeer);
+        }
+    }
+
+    protected Collection<RedisURI> getRedisURIs() {
+        return redisURIs;
     }
 
     @Override
@@ -83,9 +107,10 @@ public Class<?> getObjectType() {
     protected RedisClusterClient createInstance() throws Exception {
 
         if (getClientResources() != null) {
-            return RedisClusterClient.create(getClientResources(), getRedisURI());
+            return RedisClusterClient.create(getClientResources(), redisURIs);
         }
-        return RedisClusterClient.create(getRedisURI());
+
+        return RedisClusterClient.create(redisURIs);
     }
 
     public boolean isVerifyPeer() {
diff --git a/src/test/java/com/lambdaworks/redis/RedisURITest.java b/src/test/java/com/lambdaworks/redis/RedisURITest.java
index 7174f20879..6335f6e23b 100644
--- a/src/test/java/com/lambdaworks/redis/RedisURITest.java
+++ b/src/test/java/com/lambdaworks/redis/RedisURITest.java
@@ -31,7 +31,7 @@
 public class RedisURITest {
 
     @Test
-    public void equalsTest() throws Exception {
+    public void equalsTest() {
 
         RedisURI redisURI1 = RedisURI.create("redis://auth@localhost:1234/5");
         RedisURI redisURI2 = RedisURI.create("redis://auth@localhost:1234/5");
@@ -46,7 +46,7 @@ public void equalsTest() throws Exception {
     }
 
     @Test
-    public void setUsage() throws Exception {
+    public void setUsage() {
 
         RedisURI redisURI1 = RedisURI.create("redis://auth@localhost:1234/5");
         RedisURI redisURI2 = RedisURI.create("redis://auth@localhost:1234/5");
@@ -58,7 +58,7 @@ public void setUsage() throws Exception {
     }
 
     @Test
-    public void mapUsage() throws Exception {
+    public void mapUsage() {
 
         RedisURI redisURI1 = RedisURI.create("redis://auth@localhost:1234/5");
         RedisURI redisURI2 = RedisURI.create("redis://auth@localhost:1234/5");
@@ -70,25 +70,31 @@ public void mapUsage() throws Exception {
     }
 
     @Test
-    public void simpleUriTest() throws Exception {
+    public void simpleUriTest() {
         RedisURI redisURI = RedisURI.create("redis://localhost:6379");
         assertThat(redisURI.toURI().toString()).isEqualTo("redis://localhost");
     }
 
     @Test
-    public void sslUriTest() throws Exception {
+    public void sslUriTest() {
         RedisURI redisURI = RedisURI.create("redis+ssl://localhost:6379");
         assertThat(redisURI.toURI().toString()).isEqualTo("rediss://localhost:6379");
     }
 
     @Test
-    public void tlsUriTest() throws Exception {
+    public void tlsUriTest() {
         RedisURI redisURI = RedisURI.create("redis+tls://localhost:6379");
         assertThat(redisURI.toURI().toString()).isEqualTo("redis+tls://localhost:6379");
     }
 
     @Test
-    public void sentinelEqualsTest() throws Exception {
+    public void multipleClusterNodesTest() {
+        RedisURI redisURI = RedisURI.create("redis+ssl://password@host1:6379,host2:6380");
+        assertThat(redisURI.toURI().toString()).isEqualTo("rediss://password@host1:6379,host2:6380");
+    }
+
+    @Test
+    public void sentinelEqualsTest() {
 
         RedisURI redisURI1 = RedisURI.create("redis-sentinel://auth@h1:222,h2,h3:1234/5?sentinelMasterId=masterId");
         RedisURI redisURI2 = RedisURI.create("redis-sentinel://auth@h1:222,h2,h3:1234/5#masterId");
@@ -103,7 +109,7 @@ public void sentinelEqualsTest() throws Exception {
     }
 
     @Test
-    public void sentinelUriTest() throws Exception {
+    public void sentinelUriTest() {
 
         RedisURI redisURI = RedisURI.create("redis-sentinel://auth@h1:222,h2,h3:1234/5?sentinelMasterId=masterId");
         assertThat(redisURI.getSentinelMasterId()).isEqualTo("masterId");
@@ -117,7 +123,7 @@ public void sentinelUriTest() throws Exception {
     }
 
     @Test
-    public void socketEqualsTest() throws Exception {
+    public void socketEqualsTest() {
 
         RedisURI redisURI1 = RedisURI.create("redis-socket:///var/tmp/socket");
         RedisURI redisURI2 = RedisURI.create("redis-socket:///var/tmp/socket");
@@ -132,7 +138,7 @@ public void socketEqualsTest() throws Exception {
     }
 
     @Test
-    public void socketUriTest() throws Exception {
+    public void socketUriTest() {
 
         RedisURI redisURI = RedisURI.create("redis-socket:///var/tmp/other-socket?db=2");
 
@@ -142,7 +148,7 @@ public void socketUriTest() throws Exception {
     }
 
     @Test
-    public void socketAltUriTest() throws Exception {
+    public void socketAltUriTest() {
 
         RedisURI redisURI = RedisURI.create("redis+socket:///var/tmp/other-socket?db=2");
 
@@ -152,7 +158,7 @@ public void socketAltUriTest() throws Exception {
     }
 
     @Test
-    public void timeoutParsingTest() throws Exception {
+    public void timeoutParsingTest() {
         checkUriTimeout("redis://auth@localhost:1234/5?timeout=5000", 5000, TimeUnit.MILLISECONDS);
         checkUriTimeout("redis://auth@localhost:1234/5?timeout=5000ms", 5000, TimeUnit.MILLISECONDS);
         checkUriTimeout("redis://auth@localhost:1234/5?timeout=5s", 5, TimeUnit.SECONDS);
@@ -172,7 +178,7 @@ public void timeoutParsingTest() throws Exception {
     }
 
     @Test
-    public void queryStringDecodingTest() throws Exception {
+    public void queryStringDecodingTest() {
         String timeout = "%74%69%6D%65%6F%75%74";
         String eq = "%3d";
         String s = "%73";
@@ -180,7 +186,7 @@ public void queryStringDecodingTest() throws Exception {
     }
 
     @Test
-    public void timeoutParsingWithJunkParamTest() throws Exception {
+    public void timeoutParsingWithJunkParamTest() {
         RedisURI redisURI1 = RedisURI.create("redis-sentinel://auth@localhost:1234/5?timeout=5s;junkparam=#master-instance");
         assertThat(redisURI1.getTimeout()).isEqualTo(5);
         assertThat(redisURI1.getUnit()).isEqualTo(TimeUnit.SECONDS);
@@ -195,7 +201,7 @@ private RedisURI checkUriTimeout(String uri, long expectedTimeout, TimeUnit expe
     }
 
     @Test
-    public void databaseParsingTest() throws Exception {
+    public void databaseParsingTest() {
         RedisURI redisURI = RedisURI.create("redis://auth@localhost:1234/?database=5");
         assertThat(redisURI.getDatabase()).isEqualTo(5);
 
@@ -203,7 +209,7 @@ public void databaseParsingTest() throws Exception {
     }
 
     @Test
-    public void parsingWithInvalidValuesTest() throws Exception {
+    public void parsingWithInvalidValuesTest() {
         RedisURI redisURI = RedisURI
                 .create("redis://@host:1234/?database=AAA&database=&timeout=&timeout=XYZ&sentinelMasterId=");
         assertThat(redisURI.getDatabase()).isEqualTo(0);
@@ -211,5 +217,4 @@ public void parsingWithInvalidValuesTest() throws Exception {
 
         assertThat(redisURI.toURI().toString()).isEqualTo("redis://host:1234");
     }
-
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterURIUtilTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterURIUtilTest.java
new file mode 100644
index 0000000000..334c67e4b1
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterURIUtilTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.net.URI;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.lambdaworks.redis.RedisURI;
+
+/**
+ * @author Mark Paluch
+ */
+public class RedisClusterURIUtilTest {
+
+    @Test
+    public void testSimpleUri() {
+
+        List<RedisURI> redisURIs = RedisClusterURIUtil.toRedisURIs(URI.create("redis://host:7479"));
+
+        assertThat(redisURIs).hasSize(1);
+
+        RedisURI host1 = redisURIs.get(0);
+        assertThat(host1.getHost()).isEqualTo("host");
+        assertThat(host1.getPort()).isEqualTo(7479);
+    }
+
+    @Test
+    public void testMultipleHosts() {
+
+        List<RedisURI> redisURIs = RedisClusterURIUtil.toRedisURIs(URI.create("redis://host1,host2"));
+
+        assertThat(redisURIs).hasSize(2);
+
+        RedisURI host1 = redisURIs.get(0);
+        assertThat(host1.getHost()).isEqualTo("host1");
+        assertThat(host1.getPort()).isEqualTo(6379);
+
+        RedisURI host2 = redisURIs.get(1);
+        assertThat(host2.getHost()).isEqualTo("host2");
+        assertThat(host2.getPort()).isEqualTo(6379);
+    }
+
+    @Test
+    public void testMultipleHostsWithPorts() {
+
+        List<RedisURI> redisURIs = RedisClusterURIUtil.toRedisURIs(URI.create("redis://host1:6379,host2:6380"));
+
+        assertThat(redisURIs).hasSize(2);
+
+        RedisURI host1 = redisURIs.get(0);
+        assertThat(host1.getHost()).isEqualTo("host1");
+        assertThat(host1.getPort()).isEqualTo(6379);
+
+        RedisURI host2 = redisURIs.get(1);
+        assertThat(host2.getHost()).isEqualTo("host2");
+        assertThat(host2.getPort()).isEqualTo(6380);
+    }
+
+    @Test
+    public void testSslWithPasswordSingleHost() {
+
+        List<RedisURI> redisURIs = RedisClusterURIUtil.toRedisURIs(URI.create("redis+tls://password@host1"));
+
+        assertThat(redisURIs).hasSize(1);
+
+        RedisURI host1 = redisURIs.get(0);
+        assertThat(host1.isSsl()).isTrue();
+        assertThat(host1.isStartTls()).isTrue();
+        assertThat(new String(host1.getPassword())).isEqualTo("password");
+        assertThat(host1.getHost()).isEqualTo("host1");
+        assertThat(host1.getPort()).isEqualTo(6379);
+    }
+
+    @Test
+    public void testSslWithPasswordMultipleHosts() {
+
+        List<RedisURI> redisURIs = RedisClusterURIUtil.toRedisURIs(URI.create("redis+tls://password@host1:6379,host2:6380"));
+
+        assertThat(redisURIs).hasSize(2);
+
+        RedisURI host1 = redisURIs.get(0);
+        assertThat(host1.isSsl()).isTrue();
+        assertThat(host1.isStartTls()).isTrue();
+        assertThat(new String(host1.getPassword())).isEqualTo("password");
+        assertThat(host1.getHost()).isEqualTo("host1");
+        assertThat(host1.getPort()).isEqualTo(6379);
+
+        RedisURI host2 = redisURIs.get(1);
+        assertThat(host2.isSsl()).isTrue();
+        assertThat(host2.isStartTls()).isTrue();
+        assertThat(new String(host2.getPassword())).isEqualTo("password");
+        assertThat(host2.getHost()).isEqualTo("host2");
+        assertThat(host2.getPort()).isEqualTo(6380);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBeanTest.java b/src/test/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBeanTest.java
index fdcde9f968..9399a92b45 100644
--- a/src/test/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBeanTest.java
+++ b/src/test/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBeanTest.java
@@ -15,9 +15,11 @@
  */
 package com.lambdaworks.redis.support;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.net.URI;
+import java.util.Collection;
+import java.util.Iterator;
 
 import org.junit.Test;
 
@@ -49,8 +51,8 @@ public void validUri() throws Exception {
 
         sut.setUri(URI.create(RedisURI.URI_SCHEME_REDIS + "://password@host"));
         sut.afterPropertiesSet();
-        assertThat(sut.getRedisURI().getHost()).isEqualTo("host");
-        assertThat(sut.getRedisURI().getPassword()).isEqualTo("password".toCharArray());
+        assertThat(getRedisURI().getHost()).isEqualTo("host");
+        assertThat(getRedisURI().getPassword()).isEqualTo("password".toCharArray());
     }
 
     @Test
@@ -60,18 +62,65 @@ public void validUriPasswordOverride() throws Exception {
         sut.setPassword("thepassword");
 
         sut.afterPropertiesSet();
-        assertThat(sut.getRedisURI().getHost()).isEqualTo("host");
-        assertThat(sut.getRedisURI().getPassword()).isEqualTo("thepassword".toCharArray());
+        assertThat(getRedisURI().getHost()).isEqualTo("host");
+        assertThat(getRedisURI().getPassword()).isEqualTo("thepassword".toCharArray());
     }
-    
+
+    @Test
+    public void multiNodeUri() throws Exception {
+
+        sut.setUri(URI.create(RedisURI.URI_SCHEME_REDIS + "://password@host1,host2"));
+        sut.afterPropertiesSet();
+
+        Collection<RedisURI> redisUris = sut.getRedisURIs();
+        assertThat(redisUris).hasSize(2);
+
+        Iterator<RedisURI> iterator = redisUris.iterator();
+        RedisURI host1 = iterator.next();
+        RedisURI host2 = iterator.next();
+
+        assertThat(host1.getHost()).isEqualTo("host1");
+        assertThat(host1.getPassword()).isEqualTo("password".toCharArray());
+
+        assertThat(host2.getHost()).isEqualTo("host2");
+        assertThat(host2.getPassword()).isEqualTo("password".toCharArray());
+    }
+
+    @Test
+    public void multiNodeUriPasswordOverride() throws Exception {
+
+        sut.setUri(URI.create(RedisURI.URI_SCHEME_REDIS + "://password@host1,host2"));
+        sut.setPassword("thepassword");
+
+        sut.afterPropertiesSet();
+
+        Collection<RedisURI> redisUris = sut.getRedisURIs();
+        assertThat(redisUris).hasSize(2);
+
+        Iterator<RedisURI> iterator = redisUris.iterator();
+        RedisURI host1 = iterator.next();
+        RedisURI host2 = iterator.next();
+
+        assertThat(host1.getHost()).isEqualTo("host1");
+        assertThat(host1.getPassword()).isEqualTo("thepassword".toCharArray());
+
+        assertThat(host2.getHost()).isEqualTo("host2");
+        assertThat(host2.getPassword()).isEqualTo("thepassword".toCharArray());
+    }
+
     @Test
     public void supportsSsl() throws Exception {
 
         sut.setUri(URI.create(RedisURI.URI_SCHEME_REDIS_SECURE + "://password@host"));
         sut.afterPropertiesSet();
-        assertThat(sut.getRedisURI().getHost()).isEqualTo("host");
-        assertThat(sut.getRedisURI().getPassword()).isEqualTo("password".toCharArray());
-        assertThat(sut.getRedisURI().isVerifyPeer()).isFalse();
-        assertThat(sut.getRedisURI().isSsl()).isTrue();
+
+        assertThat(getRedisURI().getHost()).isEqualTo("host");
+        assertThat(getRedisURI().getPassword()).isEqualTo("password".toCharArray());
+        assertThat(getRedisURI().isVerifyPeer()).isFalse();
+        assertThat(getRedisURI().isSsl()).isTrue();
+    }
+
+    private RedisURI getRedisURI() {
+        return sut.getRedisURIs().iterator().next();
     }
 }

From 0fd589089889bfed78485d0814c90807375920de Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 6 Nov 2016 12:11:07 +0100
Subject: [PATCH 067/808] Use StringCodec from Utf8StringCodec #393

StringCodec now benefits from streamlined UTF-8 encoding/decoding.
---
 .../redis/codec/Utf8StringCodec.java          | 64 ++-----------------
 .../redis/codec/CompressionCodecTest.java     | 13 ++--
 2 files changed, 9 insertions(+), 68 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java b/src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java
index 3b84c36dec..5996608824 100644
--- a/src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java
+++ b/src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java
@@ -15,76 +15,22 @@
  */
 package com.lambdaworks.redis.codec;
 
-import static java.nio.charset.CoderResult.OVERFLOW;
-
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-
 import com.lambdaworks.redis.protocol.LettuceCharsets;
 
 /**
  * A {@link RedisCodec} that handles UTF-8 encoded keys and values.
  * 
  * @author Will Glozer
+ * @author Mark Paluch
+ * @see StringCodec
+ * @see LettuceCharsets#UTF8
  */
-public class Utf8StringCodec implements RedisCodec<String, String> {
-
-    private static final byte[] EMPTY = new byte[0];
-
-    private Charset charset;
-    private CharsetDecoder decoder;
-    private CharBuffer chars;
-
+public class Utf8StringCodec extends StringCodec implements RedisCodec<String, String> {
 
     /**
      * Initialize a new instance that encodes and decodes strings using the UTF-8 charset;
      */
     public Utf8StringCodec() {
-        charset = LettuceCharsets.UTF8;
-        decoder = charset.newDecoder();
-        chars = CharBuffer.allocate(1024);
-    }
-
-    @Override
-    public String decodeKey(ByteBuffer bytes) {
-        return decode(bytes);
-    }
-
-    @Override
-    public String decodeValue(ByteBuffer bytes) {
-        return decode(bytes);
-    }
-
-    @Override
-    public ByteBuffer encodeKey(String key) {
-        return encode(key);
-    }
-
-    @Override
-    public ByteBuffer encodeValue(String value) {
-        return encode(value);
-    }
-
-    private synchronized String decode(ByteBuffer bytes) {
-        chars.clear();
-        bytes.mark();
-
-        decoder.reset();
-        while (decoder.decode(bytes, chars, true) == OVERFLOW || decoder.flush(chars) == OVERFLOW) {
-            chars = CharBuffer.allocate(chars.capacity() * 2);
-            bytes.reset();
-        }
-
-        return chars.flip().toString();
-    }
-
-    private ByteBuffer encode(String string) {
-        if (string == null) {
-            return ByteBuffer.wrap(EMPTY);
-        }
-
-        return charset.encode(string);
+        super(LettuceCharsets.UTF8);
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/codec/CompressionCodecTest.java b/src/test/java/com/lambdaworks/redis/codec/CompressionCodecTest.java
index e1198aef64..82201b36b2 100644
--- a/src/test/java/com/lambdaworks/redis/codec/CompressionCodecTest.java
+++ b/src/test/java/com/lambdaworks/redis/codec/CompressionCodecTest.java
@@ -28,8 +28,8 @@
 public class CompressionCodecTest {
 
     private String key = "key";
-    private byte[] keyGzipBytes = new byte[] { 31, -117, 8, 0, 0, 0, 0, 0, 0, 0, -53, 78, -83, 4, 0, -87, -85, -112, -118, 3,
-            0, 0, 0 };
+    private byte[] keyGzipBytes = new byte[] { 31, -117, 8, 0, 0, 0, 0, 0, 0, 0, -53, 78, -83, 4, 0, -87, -85, -112, -118, 3, 0,
+            0, 0 };
     private byte[] keyDeflateBytes = new byte[] { 120, -100, -53, 78, -83, 4, 0, 2, -121, 1, 74 };
     private String value = "value";
 
@@ -80,13 +80,8 @@ private String toString(ByteBuffer buffer) throws IOException {
     }
 
     private byte[] toBytes(ByteBuffer buffer) {
-        byte[] bytes;
-        if (buffer.hasArray()) {
-            bytes = buffer.array();
-        } else {
-            bytes = new byte[buffer.remaining()];
-            buffer.get(bytes);
-        }
+        byte[] bytes = new byte[buffer.remaining()];
+        buffer.get(bytes);
         return bytes;
     }
 }

From 1cb86d068879f55ae33a6a62bfb4be4ef9a1c983 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 10 Nov 2016 09:45:44 +0100
Subject: [PATCH 068/808] Add reactive wrapper converters for RxJava1 and 2
 #383

---
 pom.xml                                       |  23 +
 .../redis/dynamic/CommandMethod.java          |   4 +-
 .../redis/dynamic/ConversionService.java      | 138 +++++
 .../redis/dynamic/ReactiveTypeAdapters.java   | 576 ++++++++++++++++++
 .../redis/dynamic/ReactiveTypes.java          | 252 ++++++++
 .../redis/dynamic/ReactiveWrappers.java       |  84 ---
 .../redis/dynamic/RedisCommandFactory.java    |  29 +-
 .../redis/dynamic/ConversionServiceTest.java  |  87 +++
 .../dynamic/ReactiveTypeAdaptersTest.java     | 160 +++++
 .../dynamic/ReactiveTypeAdaptionTest.java     |  97 +++
 .../redis/dynamic/RedisCommandsTest.java      |  12 +-
 11 files changed, 1361 insertions(+), 101 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/ConversionService.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypes.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/dynamic/ReactiveWrappers.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java

diff --git a/pom.xml b/pom.xml
index 914e9cf1fe..37f350fe91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,29 @@
 
         <!-- End of Core Dependencies -->
 
+        <!-- Reactive Dependencies -->
+
+        <dependency>
+            <groupId>io.reactivex</groupId>
+            <artifactId>rxjava</artifactId>
+            <version>1.2.1</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>io.reactivex</groupId>
+            <artifactId>rxjava-reactive-streams</artifactId>
+            <version>1.2.0</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>io.reactivex.rxjava2</groupId>
+            <artifactId>rxjava</artifactId>
+            <version>2.0.0</version>
+            <optional>true</optional>
+        </dependency>
+
         <!-- Spring -->
 
         <dependency>
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
index b7a357648d..f2585aa281 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
@@ -74,7 +74,7 @@ public CommandMethod(Method method, Parameters<?> parameters) {
         TypeInformation<?> actualReturnType = this.returnType;
 
         while (Future.class.isAssignableFrom(actualReturnType.getType())
-                || Publisher.class.isAssignableFrom(actualReturnType.getType())) {
+                || ReactiveTypes.supports(actualReturnType.getType())) {
             actualReturnType = actualReturnType.getComponentType();
         }
 
@@ -153,7 +153,7 @@ public boolean isFutureExecution() {
      * @return {@literal true} if the method uses reactive execution declaring {@link Publisher} as result type.
      */
     public boolean isReactiveExecution() {
-        return ReactiveWrappers.supports(getReturnType().getType());
+        return ReactiveTypes.supports(getReturnType().getType());
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ConversionService.java b/src/main/java/com/lambdaworks/redis/dynamic/ConversionService.java
new file mode 100644
index 0000000000..efff7cdb02
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ConversionService.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+
+import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
+import com.lambdaworks.redis.dynamic.support.TypeInformation;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * @author Mark Paluch
+ */
+class ConversionService {
+
+    private Map<ConvertiblePair, Function<?, ?>> converterMap = new HashMap<>(10);
+
+    /**
+     * Register a converter {@link Function}.
+     * 
+     * @param converter the converter.
+     */
+    public void addConverter(Function<?, ?> converter) {
+
+        LettuceAssert.notNull(converter, "Converter must not be null");
+
+        ClassTypeInformation<? extends Function> classTypeInformation = ClassTypeInformation.from(converter.getClass());
+
+        TypeInformation<?> typeInformation = classTypeInformation.getSuperTypeInformation(Function.class);
+
+        List<TypeInformation<?>> typeArguments = typeInformation.getTypeArguments();
+
+        ConvertiblePair pair = new ConvertiblePair(typeArguments.get(0).getType(), typeArguments.get(1).getType());
+        converterMap.put(pair, converter);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <S, T> T convert(S source, Class<T> targetType) {
+
+        LettuceAssert.notNull(source, "Source must not be null");
+
+        return (T) getConverter(source.getClass(), targetType).apply(source);
+    }
+
+    public <S, T> boolean canConvert(Class<S> sourceType, Class<T> targetType) {
+        return findConverter(sourceType, targetType).isPresent();
+    }
+
+    @SuppressWarnings("unchecked")
+    Function<Object, Object> getConverter(Class<?> source, Class<?> target) {
+        return findConverter(source, target).orElseThrow(() -> new IllegalArgumentException(
+                String.format("No converter found for %s to %s conversion", source.getName(), target.getName())));
+    }
+
+    private Optional<Function<Object, Object>> findConverter(Class<?> source, Class<?> target) {
+        LettuceAssert.notNull(source, "Source type must not be null");
+        LettuceAssert.notNull(target, "Target type must not be null");
+
+        for (ConvertiblePair pair : converterMap.keySet()) {
+
+            if (pair.getSourceType().isAssignableFrom(source) && target.isAssignableFrom(pair.getTargetType())) {
+                return Optional.of((Function) converterMap.get(pair));
+            }
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * Holder for a source-to-target class pair.
+     */
+    final class ConvertiblePair {
+
+        private final Class<?> sourceType;
+
+        private final Class<?> targetType;
+
+        /**
+         * Create a new source-to-target pair.
+         * 
+         * @param sourceType the source type
+         * @param targetType the target type
+         */
+        public ConvertiblePair(Class<?> sourceType, Class<?> targetType) {
+
+            LettuceAssert.notNull(sourceType, "Source type must not be null");
+            LettuceAssert.notNull(targetType, "Target type must not be null");
+            this.sourceType = sourceType;
+            this.targetType = targetType;
+        }
+
+        public Class<?> getSourceType() {
+            return this.sourceType;
+        }
+
+        public Class<?> getTargetType() {
+            return this.targetType;
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            if (this == other) {
+                return true;
+            }
+            if (other == null || other.getClass() != ConvertiblePair.class) {
+                return false;
+            }
+            ConvertiblePair otherPair = (ConvertiblePair) other;
+            return (this.sourceType == otherPair.sourceType && this.targetType == otherPair.targetType);
+        }
+
+        @Override
+        public int hashCode() {
+            return (this.sourceType.hashCode() * 31 + this.targetType.hashCode());
+        }
+
+        @Override
+        public String toString() {
+            return (this.sourceType.getName() + " -> " + this.targetType.getName());
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java
new file mode 100644
index 0000000000..759ae80f7b
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java
@@ -0,0 +1,576 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.util.function.Function;
+
+import org.reactivestreams.Publisher;
+
+import com.lambdaworks.redis.dynamic.ReactiveTypes.ReactiveLibrary;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+import io.reactivex.BackpressureStrategy;
+import io.reactivex.Flowable;
+import io.reactivex.Maybe;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import rx.Completable;
+import rx.Observable;
+import rx.RxReactiveStreams;
+import rx.Single;
+import rx.internal.reactivestreams.PublisherAdapter;
+
+/**
+ * @author Mark Paluch
+ */
+class ReactiveTypeAdapters {
+
+    /**
+     * Register adapters in the conversion service.
+     * 
+     * @param conversionService
+     */
+    static void registerIn(ConversionService conversionService) {
+
+        LettuceAssert.notNull(conversionService, "ConversionService must not be null!");
+
+        if (ReactiveTypes.isAvailable(ReactiveLibrary.PROJECT_REACTOR)) {
+
+            if (ReactiveTypes.isAvailable(ReactiveLibrary.RXJAVA1)) {
+
+                conversionService.addConverter(PublisherToRxJava1CompletableAdapter.INSTANCE);
+                conversionService.addConverter(RxJava1CompletableToPublisherAdapter.INSTANCE);
+                conversionService.addConverter(RxJava1CompletableToMonoAdapter.INSTANCE);
+
+                conversionService.addConverter(PublisherToRxJava1SingleAdapter.INSTANCE);
+                conversionService.addConverter(RxJava1SingleToPublisherAdapter.INSTANCE);
+                conversionService.addConverter(RxJava1SingleToMonoAdapter.INSTANCE);
+                conversionService.addConverter(RxJava1SingleToFluxAdapter.INSTANCE);
+
+                conversionService.addConverter(PublisherToRxJava1ObservableAdapter.INSTANCE);
+                conversionService.addConverter(RxJava1ObservableToPublisherAdapter.INSTANCE);
+                conversionService.addConverter(RxJava1ObservableToMonoAdapter.INSTANCE);
+                conversionService.addConverter(RxJava1ObservableToFluxAdapter.INSTANCE);
+            }
+
+            if (ReactiveTypes.isAvailable(ReactiveLibrary.RXJAVA2)) {
+
+                conversionService.addConverter(PublisherToRxJava2CompletableAdapter.INSTANCE);
+                conversionService.addConverter(RxJava2CompletableToPublisherAdapter.INSTANCE);
+                conversionService.addConverter(RxJava2CompletableToMonoAdapter.INSTANCE);
+
+                conversionService.addConverter(PublisherToRxJava2SingleAdapter.INSTANCE);
+                conversionService.addConverter(RxJava2SingleToPublisherAdapter.INSTANCE);
+                conversionService.addConverter(RxJava2SingleToMonoAdapter.INSTANCE);
+                conversionService.addConverter(RxJava2SingleToFluxAdapter.INSTANCE);
+
+                conversionService.addConverter(PublisherToRxJava2ObservableAdapter.INSTANCE);
+                conversionService.addConverter(RxJava2ObservableToPublisherAdapter.INSTANCE);
+                conversionService.addConverter(RxJava2ObservableToMonoAdapter.INSTANCE);
+                conversionService.addConverter(RxJava2ObservableToFluxAdapter.INSTANCE);
+
+                conversionService.addConverter(PublisherToRxJava2FlowableAdapter.INSTANCE);
+                conversionService.addConverter(RxJava2FlowableToPublisherAdapter.INSTANCE);
+
+                conversionService.addConverter(PublisherToRxJava2MaybeAdapter.INSTANCE);
+                conversionService.addConverter(RxJava2MaybeToPublisherAdapter.INSTANCE);
+                conversionService.addConverter(RxJava2MaybeToMonoAdapter.INSTANCE);
+                conversionService.addConverter(RxJava2MaybeToFluxAdapter.INSTANCE);
+            }
+
+            conversionService.addConverter(PublisherToMonoAdapter.INSTANCE);
+            conversionService.addConverter(PublisherToFluxAdapter.INSTANCE);
+
+            if (ReactiveTypes.isAvailable(ReactiveLibrary.RXJAVA1)) {
+                conversionService.addConverter(RxJava1SingleToObservableAdapter.INSTANCE);
+                conversionService.addConverter(RxJava1ObservableToSingleAdapter.INSTANCE);
+            }
+
+            if (ReactiveTypes.isAvailable(ReactiveLibrary.RXJAVA2)) {
+                conversionService.addConverter(RxJava2SingleToObservableAdapter.INSTANCE);
+                conversionService.addConverter(RxJava2ObservableToSingleAdapter.INSTANCE);
+                conversionService.addConverter(RxJava2ObservableToMaybeAdapter.INSTANCE);
+            }
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // ReactiveStreams adapters
+    // -------------------------------------------------------------------------
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Publisher} to {@link Flux}.
+     */
+    public enum PublisherToFluxAdapter implements Function<Publisher<?>, Flux<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Flux<?> apply(Publisher<?> source) {
+            return Flux.from(source);
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Publisher} to {@link Mono}.
+     */
+    public enum PublisherToMonoAdapter implements Function<Publisher<?>, Mono<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Mono<?> apply(Publisher<?> source) {
+            return Mono.from(source);
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // RxJava 1 adapters
+    // -------------------------------------------------------------------------
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Publisher} to {@link Single}.
+     */
+    public enum PublisherToRxJava1SingleAdapter implements Function<Publisher<?>, Single<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Single<?> apply(Publisher<?> source) {
+            return RxReactiveStreams.toSingle(source);
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Publisher} to {@link Completable}.
+     */
+    public enum PublisherToRxJava1CompletableAdapter implements Function<Publisher<?>, Completable> {
+
+        INSTANCE;
+
+        @Override
+        public Completable apply(Publisher<?> source) {
+            return RxReactiveStreams.toCompletable(source);
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Publisher} to {@link Observable}.
+     */
+    public enum PublisherToRxJava1ObservableAdapter implements Function<Publisher<?>, Observable<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Observable<?> apply(Publisher<?> source) {
+            return RxReactiveStreams.toObservable(source);
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Single} to {@link Publisher}.
+     */
+    public enum RxJava1SingleToPublisherAdapter implements Function<Single<?>, Publisher<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Publisher<?> apply(Single<?> source) {
+            return Flux.defer(() -> RxReactiveStreams.toPublisher(source));
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Single} to {@link Mono}.
+     */
+    public enum RxJava1SingleToMonoAdapter implements Function<Single<?>, Mono<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Mono<?> apply(Single<?> source) {
+            return Mono.defer(() -> Mono.from(RxReactiveStreams.toPublisher(source)));
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Single} to {@link Publisher}.
+     */
+    public enum RxJava1SingleToFluxAdapter implements Function<Single<?>, Flux<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Flux<?> apply(Single<?> source) {
+            return Flux.defer(() -> RxReactiveStreams.toPublisher(source));
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Completable} to {@link Publisher}.
+     */
+    public enum RxJava1CompletableToPublisherAdapter implements Function<Completable, Publisher<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Publisher<?> apply(Completable source) {
+            return Flux.defer(() -> RxReactiveStreams.toPublisher(source));
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Completable} to {@link Mono}.
+     */
+    public enum RxJava1CompletableToMonoAdapter implements Function<Completable, Mono<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Mono<?> apply(Completable source) {
+            return Mono.from(RxJava1CompletableToPublisherAdapter.INSTANCE.apply(source));
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt an {@link Observable} to {@link Publisher}.
+     */
+    public enum RxJava1ObservableToPublisherAdapter implements Function<Observable<?>, Publisher<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Publisher<?> apply(Observable<?> source) {
+            return Flux.defer(() -> new PublisherAdapter<>(source));
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Observable} to {@link Mono}.
+     */
+    public enum RxJava1ObservableToMonoAdapter implements Function<Observable<?>, Mono<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Mono<?> apply(Observable<?> source) {
+            return Mono.defer(() -> Mono.from(RxReactiveStreams.toPublisher(source)));
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Observable} to {@link Flux}.
+     */
+    public enum RxJava1ObservableToFluxAdapter implements Function<Observable<?>, Flux<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Flux<?> apply(Observable<?> source) {
+            return Flux.defer(() -> Flux.from(RxReactiveStreams.toPublisher(source)));
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Observable} to {@link Single}.
+     */
+    public enum RxJava1ObservableToSingleAdapter implements Function<Observable<?>, Single<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Single<?> apply(Observable<?> source) {
+            return source.toSingle();
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Single} to {@link Single}.
+     */
+    public enum RxJava1SingleToObservableAdapter implements Function<Single<?>, Observable<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Observable<?> apply(Single<?> source) {
+            return source.toObservable();
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // RxJava 2 adapters
+    // -------------------------------------------------------------------------
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Publisher} to {@link io.reactivex.Single}.
+     */
+    public enum PublisherToRxJava2SingleAdapter implements Function<Publisher<?>, io.reactivex.Single<?>> {
+
+        INSTANCE;
+
+        @Override
+        public io.reactivex.Single<?> apply(Publisher<?> source) {
+            return io.reactivex.Single.fromPublisher(source);
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Publisher} to {@link io.reactivex.Completable}.
+     */
+    public enum PublisherToRxJava2CompletableAdapter implements Function<Publisher<?>, io.reactivex.Completable> {
+
+        INSTANCE;
+
+        @Override
+        public io.reactivex.Completable apply(Publisher<?> source) {
+            return io.reactivex.Completable.fromPublisher(source);
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Publisher} to {@link io.reactivex.Observable}.
+     */
+    public enum PublisherToRxJava2ObservableAdapter implements Function<Publisher<?>, io.reactivex.Observable<?>> {
+
+        INSTANCE;
+
+        @Override
+        public io.reactivex.Observable<?> apply(Publisher<?> source) {
+            return io.reactivex.Observable.fromPublisher(source);
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.Single} to {@link Publisher}.
+     */
+    public enum RxJava2SingleToPublisherAdapter implements Function<io.reactivex.Single<?>, Publisher<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Publisher<?> apply(io.reactivex.Single<?> source) {
+            return source.toFlowable();
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.Single} to {@link Mono}.
+     */
+    public enum RxJava2SingleToMonoAdapter implements Function<io.reactivex.Single<?>, Mono<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Mono<?> apply(io.reactivex.Single<?> source) {
+            return Mono.from(source.toFlowable());
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.Single} to {@link Publisher}.
+     */
+    public enum RxJava2SingleToFluxAdapter implements Function<io.reactivex.Single<?>, Flux<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Flux<?> apply(io.reactivex.Single<?> source) {
+            return Flux.from(source.toFlowable());
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.Completable} to {@link Publisher}.
+     */
+    public enum RxJava2CompletableToPublisherAdapter implements Function<io.reactivex.Completable, Publisher<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Publisher<?> apply(io.reactivex.Completable source) {
+            return source.toFlowable();
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.Completable} to {@link Mono}.
+     */
+    public enum RxJava2CompletableToMonoAdapter implements Function<io.reactivex.Completable, Mono<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Mono<?> apply(io.reactivex.Completable source) {
+            return Mono.from(RxJava2CompletableToPublisherAdapter.INSTANCE.apply(source));
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt an {@link io.reactivex.Observable} to {@link Publisher}.
+     */
+    public enum RxJava2ObservableToPublisherAdapter implements Function<io.reactivex.Observable<?>, Publisher<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Publisher<?> apply(io.reactivex.Observable<?> source) {
+            return source.toFlowable(BackpressureStrategy.BUFFER);
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.Observable} to {@link Mono}.
+     */
+    public enum RxJava2ObservableToMonoAdapter implements Function<io.reactivex.Observable<?>, Mono<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Mono<?> apply(io.reactivex.Observable<?> source) {
+            return Mono.from(source.toFlowable(BackpressureStrategy.BUFFER));
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.Observable} to {@link Flux}.
+     */
+    public enum RxJava2ObservableToFluxAdapter implements Function<io.reactivex.Observable<?>, Flux<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Flux<?> apply(io.reactivex.Observable<?> source) {
+            return Flux.from(source.toFlowable(BackpressureStrategy.BUFFER));
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Publisher} to {@link io.reactivex.Flowable}.
+     */
+    public enum PublisherToRxJava2FlowableAdapter implements Function<Publisher<?>, io.reactivex.Flowable<?>> {
+
+        INSTANCE;
+
+        @Override
+        public io.reactivex.Flowable<?> apply(Publisher<?> source) {
+            return Flowable.fromPublisher(source);
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.Flowable} to {@link Publisher}.
+     */
+    public enum RxJava2FlowableToPublisherAdapter implements Function<io.reactivex.Flowable<?>, Publisher<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Publisher<?> apply(io.reactivex.Flowable<?> source) {
+            return source;
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Publisher} to {@link io.reactivex.Flowable}.
+     */
+    public enum PublisherToRxJava2MaybeAdapter implements Function<Publisher<?>, io.reactivex.Maybe<?>> {
+
+        INSTANCE;
+
+        @Override
+        public io.reactivex.Maybe<?> apply(Publisher<?> source) {
+            return Flowable.fromPublisher(source).singleElement();
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.Maybe} to {@link Publisher}.
+     */
+    public enum RxJava2MaybeToPublisherAdapter implements Function<io.reactivex.Maybe<?>, Publisher<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Publisher<?> apply(io.reactivex.Maybe<?> source) {
+            return source.toFlowable();
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.Maybe} to {@link Mono}.
+     */
+    public enum RxJava2MaybeToMonoAdapter implements Function<io.reactivex.Maybe<?>, Mono<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Mono<?> apply(io.reactivex.Maybe<?> source) {
+            return Mono.from(source.toFlowable());
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.Maybe} to {@link Flux}.
+     */
+    public enum RxJava2MaybeToFluxAdapter implements Function<io.reactivex.Maybe<?>, Flux<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Flux<?> apply(io.reactivex.Maybe<?> source) {
+            return Flux.from(source.toFlowable());
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Observable} to {@link Single}.
+     */
+    public enum RxJava2ObservableToSingleAdapter implements Function<io.reactivex.Observable<?>, io.reactivex.Single<?>> {
+
+        INSTANCE;
+
+        @Override
+        public io.reactivex.Single<?> apply(io.reactivex.Observable<?> source) {
+            return source.singleOrError();
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Observable} to {@link Maybe}.
+     */
+    public enum RxJava2ObservableToMaybeAdapter implements Function<io.reactivex.Observable<?>, io.reactivex.Maybe<?>> {
+
+        INSTANCE;
+
+        @Override
+        public io.reactivex.Maybe<?> apply(io.reactivex.Observable<?> source) {
+            return source.singleElement();
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Single} to {@link Single}.
+     */
+    public enum RxJava2SingleToObservableAdapter implements Function<io.reactivex.Single<?>, io.reactivex.Observable<?>> {
+
+        INSTANCE;
+
+        @Override
+        public io.reactivex.Observable<?> apply(io.reactivex.Single<?> source) {
+            return source.toObservable();
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypes.java b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypes.java
new file mode 100644
index 0000000000..7066cebf95
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypes.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+
+import org.reactivestreams.Publisher;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.internal.LettuceClassUtils;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import rx.Completable;
+import rx.Observable;
+import rx.Single;
+
+/**
+ * Utility class to expose details about reactive wrapper types. This class exposes whether a reactive wrapper is supported in
+ * general and whether a particular type is suitable for no-value/single-value/multi-value usage.
+ * <p>
+ * Supported types are discovered by their availability on the class path. This class is typically used to determine
+ * multiplicity and whether a reactive wrapper type is acceptable for a specific operation.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ * @see org.reactivestreams.Publisher
+ * @see rx.Single
+ * @see rx.Observable
+ * @see rx.Completable
+ * @see io.reactivex.Single
+ * @see io.reactivex.Maybe
+ * @see io.reactivex.Observable
+ * @see io.reactivex.Completable
+ * @see io.reactivex.Flowable
+ * @see Mono
+ * @see Flux
+ */
+class ReactiveTypes {
+
+    private static final boolean PROJECT_REACTOR_PRESENT = LettuceClassUtils.isPresent("reactor.core.publisher.Mono");
+    private static final boolean RXJAVA1_PRESENT = LettuceClassUtils.isPresent("rx.Completable");
+    private static final boolean RXJAVA2_PRESENT = LettuceClassUtils.isPresent("io.reactivex.Flowable");
+
+    private static final Map<Class<?>, Descriptor> REACTIVE_WRAPPERS;
+
+    static {
+
+        Map<Class<?>, Descriptor> reactiveWrappers = new LinkedHashMap<>(3);
+
+        if (RXJAVA1_PRESENT) {
+
+            reactiveWrappers.put(Single.class, new Descriptor(false, true, false));
+            reactiveWrappers.put(Completable.class, new Descriptor(false, true, true));
+            reactiveWrappers.put(Observable.class, new Descriptor(true, true, false));
+        }
+
+        if (RXJAVA2_PRESENT) {
+
+            reactiveWrappers.put(io.reactivex.Single.class, new Descriptor(false, true, false));
+            reactiveWrappers.put(io.reactivex.Maybe.class, new Descriptor(false, true, false));
+            reactiveWrappers.put(io.reactivex.Completable.class, new Descriptor(false, true, true));
+            reactiveWrappers.put(io.reactivex.Flowable.class, new Descriptor(true, true, false));
+            reactiveWrappers.put(io.reactivex.Observable.class, new Descriptor(true, true, false));
+        }
+
+        if (PROJECT_REACTOR_PRESENT) {
+
+            reactiveWrappers.put(Mono.class, new Descriptor(false, true, false));
+            reactiveWrappers.put(Flux.class, new Descriptor(true, true, true));
+            reactiveWrappers.put(Publisher.class, new Descriptor(true, true, true));
+        }
+
+        REACTIVE_WRAPPERS = Collections.unmodifiableMap(reactiveWrappers);
+    }
+
+    /**
+     * Returns {@literal true} if reactive support is available. More specifically, whether RxJava1/2 or Project Reactor
+     * libraries are on the class path.
+     *
+     * @return {@literal true} if reactive support is available.
+     */
+    public static boolean isAvailable() {
+        return isAvailable(ReactiveLibrary.PROJECT_REACTOR) || isAvailable(ReactiveLibrary.RXJAVA1)
+                || isAvailable(ReactiveLibrary.RXJAVA2);
+    }
+
+    /**
+     * Returns {@literal true} if the {@link ReactiveLibrary} is available.
+     *
+     * @param reactiveLibrary must not be {@literal null}.
+     * @return {@literal true} if the {@link ReactiveLibrary} is available.
+     */
+    public static boolean isAvailable(ReactiveLibrary reactiveLibrary) {
+
+        LettuceAssert.notNull(reactiveLibrary, "ReactiveLibrary must not be null!");
+
+        switch (reactiveLibrary) {
+            case PROJECT_REACTOR:
+                return PROJECT_REACTOR_PRESENT;
+            case RXJAVA1:
+                return RXJAVA1_PRESENT;
+            case RXJAVA2:
+                return RXJAVA2_PRESENT;
+        }
+
+        throw new IllegalArgumentException(String.format("ReactiveLibrary %s not supported", reactiveLibrary));
+    }
+
+    /**
+     * Returns {@literal true} if the {@code type} is a supported reactive wrapper type.
+     *
+     * @param type must not be {@literal null}.
+     * @return {@literal true} if the {@code type} is a supported reactive wrapper type.
+     */
+    public static boolean supports(Class<?> type) {
+        return isNoValueType(type) || isSingleValueType(type) || isMultiValueType(type);
+    }
+
+    /**
+     * Returns {@literal true} if {@code type} is a reactive wrapper type that contains no value.
+     *
+     * @param type must not be {@literal null}.
+     * @return {@literal true} if {@code type} is a reactive wrapper type that contains no value.
+     */
+    public static boolean isNoValueType(Class<?> type) {
+
+        LettuceAssert.notNull(type, "Class must not be null!");
+
+        return findDescriptor(type).map(Descriptor::isNoValue).orElse(false);
+    }
+
+    /**
+     * Returns {@literal true} if {@code type} is a reactive wrapper type for a single value.
+     *
+     * @param type must not be {@literal null}.
+     * @return {@literal true} if {@code type} is a reactive wrapper type for a single value.
+     */
+    public static boolean isSingleValueType(Class<?> type) {
+
+        LettuceAssert.notNull(type, "Class must not be null!");
+
+        return findDescriptor(type).map((descriptor) -> !descriptor.isMultiValue() && !descriptor.isNoValue()).orElse(false);
+    }
+
+    /**
+     * Returns {@literal true} if {@code type} is a reactive wrapper type supporting multiple values ({@code 0..N} elements).
+     *
+     * @param type must not be {@literal null}.
+     * @return {@literal true} if {@code type} is a reactive wrapper type supporting multiple values ({@code 0..N} elements).
+     */
+    public static boolean isMultiValueType(Class<?> type) {
+
+        LettuceAssert.notNull(type, "Class must not be null!");
+
+        // Prevent single-types with a multi-hierarchy supertype to be reported as multi type
+        // See Mono implements Publisher
+        if (isSingleValueType(type)) {
+            return false;
+        }
+
+        return findDescriptor(type).map(Descriptor::isMultiValue).orElse(false);
+    }
+
+    /**
+     * Returns a collection of No-Value wrapper types.
+     *
+     * @return a collection of No-Value wrapper types.
+     */
+    public static Collection<Class<?>> getNoValueTypes() {
+        return REACTIVE_WRAPPERS.entrySet().stream().filter(entry -> entry.getValue().isNoValue()).map(Entry::getKey)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * Returns a collection of Single-Value wrapper types.
+     *
+     * @return a collection of Single-Value wrapper types.
+     */
+    public static Collection<Class<?>> getSingleValueTypes() {
+        return REACTIVE_WRAPPERS.entrySet().stream().filter(entry -> !entry.getValue().isMultiValue()).map(Entry::getKey)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * Returns a collection of Multi-Value wrapper types.
+     *
+     * @return a collection of Multi-Value wrapper types.
+     */
+    public static Collection<Class<?>> getMultiValueTypes() {
+        return REACTIVE_WRAPPERS.entrySet().stream().filter(entry -> entry.getValue().isMultiValue()).map(Entry::getKey)
+                .collect(Collectors.toList());
+    }
+
+    private static Optional<Descriptor> findDescriptor(Class<?> rhsType) {
+
+        for (Class<?> type : REACTIVE_WRAPPERS.keySet()) {
+            if (LettuceClassUtils.isAssignable(type, rhsType)) {
+                return Optional.ofNullable(REACTIVE_WRAPPERS.get(type));
+            }
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * Enumeration of supported reactive libraries.
+     *
+     * @author Mark Paluch
+     */
+    enum ReactiveLibrary {
+        PROJECT_REACTOR, RXJAVA1, RXJAVA2;
+    }
+
+    public static class Descriptor {
+        private final boolean isMultiValue;
+        private final boolean supportsEmpty;
+        private final boolean isNoValue;
+
+        public Descriptor(boolean isMultiValue, boolean canBeEmpty, boolean isNoValue) {
+            this.isMultiValue = isMultiValue;
+            this.supportsEmpty = canBeEmpty;
+            this.isNoValue = isNoValue;
+        }
+
+        public boolean isMultiValue() {
+            return this.isMultiValue;
+        }
+
+        public boolean supportsEmpty() {
+            return this.supportsEmpty;
+        }
+
+        public boolean isNoValue() {
+            return this.isNoValue;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveWrappers.java b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveWrappers.java
deleted file mode 100644
index 32abe54f4d..0000000000
--- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveWrappers.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2011-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.lambdaworks.redis.dynamic;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceClassUtils;
-
-/**
- * Converters to potentially convert the execution of a command method into a variety of wrapper types potentially being
- * available on the classpath. Currently supported:
- * <ul>
- * <li>{@link reactor.core.publisher.Mono}</li>
- * <li>{@link reactor.core.publisher.Flux}</li>
- * <li>{@link org.reactivestreams.Publisher}</li>
- * </ul>
- * 
- * @author Mark Paluch
- * @since 5.0
- */
-abstract class ReactiveWrappers {
-
-    private static final Class<?> MONO = LettuceClassUtils.findClass("reactor.core.publisher.Mono");
-    private static final Class<?> FLUX = LettuceClassUtils.findClass("reactor.core.publisher.Flux");
-    private static final Class<?> PUBLISHER = LettuceClassUtils.findClass("org.reactivestreams.Publisher");
-
-    private static final Set<Class<?>> REACTIVE_WRAPPERS = new HashSet<>();
-    private static final Set<Class<?>> SINGLE_WRAPPERS = new HashSet<>();
-    private static final Set<Class<?>> MULTI_WRAPPERS = new HashSet<>();
-
-    static {
-
-        if (MONO != null) {
-            REACTIVE_WRAPPERS.add(MONO);
-            SINGLE_WRAPPERS.add(MONO);
-        }
-
-        if (FLUX != null) {
-            REACTIVE_WRAPPERS.add(FLUX);
-            MULTI_WRAPPERS.add(FLUX);
-        }
-
-        if (PUBLISHER != null) {
-            REACTIVE_WRAPPERS.add(PUBLISHER);
-            MULTI_WRAPPERS.add(PUBLISHER);
-        }
-    }
-
-    public static boolean supports(Class<?> wrapperType) {
-
-        LettuceAssert.notNull(wrapperType, "Wrapper type must not be null");
-
-        return REACTIVE_WRAPPERS.contains(wrapperType);
-    }
-
-    public static boolean isSingle(Class<?> wrapperType) {
-
-        LettuceAssert.notNull(wrapperType, "Wrapper type must not be null");
-
-        return SINGLE_WRAPPERS.contains(wrapperType) && !isMulti(wrapperType);
-    }
-
-    public static boolean isMulti(Class<?> wrapperType) {
-
-        LettuceAssert.notNull(wrapperType, "Wrapper type must not be null");
-
-        return MULTI_WRAPPERS.contains(wrapperType);
-    }
-}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
index f068012101..4c61cac856 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
@@ -219,7 +219,7 @@ public CommandFactoryExecutorMethodInterceptor(RedisCommandsMetadata redisComman
 
             for (Method method : redisCommandsMetadata.getMethods()) {
 
-                if (ReactiveWrappers.supports(method.getReturnType())) {
+                if (ReactiveTypes.supports(method.getReturnType())) {
                     continue;
                 }
 
@@ -289,15 +289,17 @@ class ReactiveCommandFactoryExecutorMethodInterceptor implements MethodIntercept
 
         private final Map<Method, ReactiveCommandSegmentCommandFactory> commandFactories = new ConcurrentHashMap<>();
         private final AbstractRedisReactiveCommands<?, ?> redisReactiveCommands;
+        private final ConversionService conversionService = new ConversionService();
 
         public ReactiveCommandFactoryExecutorMethodInterceptor(RedisCommandsMetadata redisCommandsMetadata,
                 BaseRedisReactiveCommands<?, ?> redisReactiveCommands) {
 
+            ReactiveTypeAdapters.registerIn(this.conversionService);
             ReactiveRedisCommandFactoryResolver lookupStrategy = new ReactiveRedisCommandFactoryResolver(redisCodecs);
 
             for (Method method : redisCommandsMetadata.getMethods()) {
 
-                if (ReactiveWrappers.supports(method.getReturnType())) {
+                if (ReactiveTypes.supports(method.getReturnType())) {
 
                     ReactiveCommandSegmentCommandFactory commandFactory = lookupStrategy.resolveRedisCommandFactory(method,
                             redisCommandsMetadata);
@@ -318,21 +320,30 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
 
                 ReactiveCommandSegmentCommandFactory commandFactory = commandFactories.get(method);
 
-                if (ReactiveWrappers.isSingle(method.getReturnType())) {
-                    return redisReactiveCommands.createMono(() -> commandFactory.createCommand(arguments));
-                }
-
-                if (commandFactory.isStreamingExecution()) {
+                Object result = dispatch(method, arguments, commandFactory);
 
-                    return redisReactiveCommands.createDissolvingFlux(() -> commandFactory.createCommand(arguments));
+                if (method.getReturnType().isAssignableFrom(result.getClass())) {
+                    return result;
                 }
 
-                return redisReactiveCommands.createFlux(() -> commandFactory.createCommand(arguments));
+                return conversionService.convert(result, method.getReturnType());
             }
 
             return invocation.proceed();
         }
 
+        protected Object dispatch(Method method, Object[] arguments, ReactiveCommandSegmentCommandFactory commandFactory) {
+            if (ReactiveTypes.isSingleValueType(method.getReturnType())) {
+                return redisReactiveCommands.createMono(() -> commandFactory.createCommand(arguments));
+            }
+
+            if (commandFactory.isStreamingExecution()) {
+                return redisReactiveCommands.createDissolvingFlux(() -> commandFactory.createCommand(arguments));
+            }
+
+            return redisReactiveCommands.createFlux(() -> commandFactory.createCommand(arguments));
+        }
+
         private boolean hasFactoryFor(Method method) {
             return commandFactories.containsKey(method);
         }
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java
new file mode 100644
index 0000000000..2e520306fd
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+
+import java.util.function.Function;
+
+import org.junit.Test;
+
+import io.reactivex.Observable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * @author Mark Paluch
+ */
+public class ConversionServiceTest {
+
+    ConversionService sut = new ConversionService();
+
+    @Test
+    public void getConverter() {
+
+        sut.addConverter(new FluxToObservableConverter());
+        sut.addConverter(new MonoToObservableConverter());
+
+        assertThat(sut.getConverter(Flux.just("").getClass(), Observable.class)).isNotNull()
+                .isInstanceOf(FluxToObservableConverter.class);
+
+        try {
+            sut.getConverter(Flux.just("").getClass(), String.class);
+            fail("Missing IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+            assertThat(e).hasMessageContaining("No converter found for reactor.core.publisher.FluxJust to java.lang.String");
+        }
+    }
+
+    @Test
+    public void canConvert() {
+
+        sut.addConverter(new FluxToObservableConverter());
+        sut.addConverter(new MonoToObservableConverter());
+
+        assertThat(sut.canConvert(Flux.class, Observable.class)).isTrue();
+        assertThat(sut.canConvert(Observable.class, Flux.class)).isFalse();
+    }
+
+    @Test
+    public void convert() {
+
+        sut.addConverter(new FluxToObservableConverter());
+        sut.addConverter(new MonoToObservableConverter());
+
+        Observable<String> observable = sut.convert(Mono.just("hello"), Observable.class);
+        assertThat(observable.blockingFirst()).isEqualTo("world");
+    }
+
+    private class FluxToObservableConverter implements Function<Flux<?>, Observable<?>> {
+        @Override
+        public Observable<?> apply(Flux<?> source) {
+            return null;
+        }
+    }
+
+    private class MonoToObservableConverter implements Function<Mono<?>, Observable<?>> {
+        @Override
+        public Observable<?> apply(Mono<?> source) {
+            return Observable.just("world");
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java
new file mode 100644
index 0000000000..f5761c903f
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.reactivex.Flowable;
+import org.junit.Before;
+import org.junit.Test;
+import org.reactivestreams.Publisher;
+
+import io.reactivex.Maybe;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import rx.Single;
+
+/**
+ * @author Mark Paluch
+ */
+public class ReactiveTypeAdaptersTest {
+
+    ConversionService conversionService = new ConversionService();
+
+    @Before
+    public void before() throws Exception {
+        ReactiveTypeAdapters.registerIn(conversionService);
+    }
+
+    @Test
+    public void toWrapperShouldCastMonoToMono() {
+
+        Mono<String> foo = Mono.just("foo");
+        assertThat(conversionService.convert(foo, Mono.class)).isSameAs(foo);
+    }
+
+    @Test
+    public void toWrapperShouldConvertMonoToRxJava1Single() {
+
+        Mono<String> foo = Mono.just("foo");
+        assertThat(conversionService.convert(foo, Single.class)).isInstanceOf(Single.class);
+    }
+
+    @Test
+    public void toWrapperShouldConvertMonoToRxJava2Single() {
+
+        Mono<String> foo = Mono.just("foo");
+        assertThat(conversionService.convert(foo, io.reactivex.Single.class)).isInstanceOf(io.reactivex.Single.class);
+    }
+
+    @Test
+    public void toWrapperShouldConvertRxJava2SingleToMono() {
+
+        io.reactivex.Single<String> foo = io.reactivex.Single.just("foo");
+        assertThat(conversionService.convert(foo, Mono.class)).isInstanceOf(Mono.class);
+    }
+
+    @Test
+    public void toWrapperShouldConvertRxJava2SingleToPublisher() {
+
+        io.reactivex.Single<String> foo = io.reactivex.Single.just("foo");
+        assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Publisher.class);
+    }
+
+    @Test
+    public void toWrapperShouldConvertRxJava2MaybeToMono() {
+
+        io.reactivex.Maybe<String> foo = io.reactivex.Maybe.just("foo");
+        assertThat(conversionService.convert(foo, Mono.class)).isInstanceOf(Mono.class);
+    }
+
+    @Test
+    public void toWrapperShouldConvertRxJava2MaybeToFlux() {
+
+        io.reactivex.Maybe<String> foo = io.reactivex.Maybe.just("foo");
+        assertThat(conversionService.convert(foo, Flux.class)).isInstanceOf(Flux.class);
+    }
+
+    @Test
+    public void toWrapperShouldConvertRxJava2MaybeToPublisher() {
+
+        io.reactivex.Maybe<String> foo = io.reactivex.Maybe.just("foo");
+        assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Publisher.class);
+    }
+
+    @Test
+    public void toWrapperShouldConvertRxJava2FlowableToMono() {
+
+        io.reactivex.Flowable<String> foo = io.reactivex.Flowable.just("foo");
+        assertThat(conversionService.convert(foo, Mono.class)).isInstanceOf(Mono.class);
+    }
+
+    @Test
+    public void toWrapperShouldConvertRxJava2FlowableToFlux() {
+
+        io.reactivex.Flowable<String> foo = io.reactivex.Flowable.just("foo");
+        assertThat(conversionService.convert(foo, Flux.class)).isInstanceOf(Flux.class);
+    }
+
+    @Test
+    public void toWrapperShouldCastRxJava2FlowableToPublisher() {
+
+        io.reactivex.Flowable<String> foo = io.reactivex.Flowable.just("foo");
+        assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Flux.class);
+    }
+
+    @Test
+    public void toWrapperShouldConvertRxJava2ObservableToMono() {
+
+        io.reactivex.Observable<String> foo = io.reactivex.Observable.just("foo");
+        assertThat(conversionService.convert(foo, Mono.class)).isInstanceOf(Mono.class);
+    }
+
+    @Test
+    public void toWrapperShouldConvertRxJava2ObservableToFlux() {
+
+        io.reactivex.Observable<String> foo = io.reactivex.Observable.just("foo");
+        assertThat(conversionService.convert(foo, Flux.class)).isInstanceOf(Flux.class);
+    }
+
+    @Test
+    public void toWrapperShouldConvertRxJava2ObservableToSingle() {
+
+        io.reactivex.Observable<String> foo = io.reactivex.Observable.just("foo");
+        assertThat(conversionService.convert(foo, io.reactivex.Single.class)).isInstanceOf(io.reactivex.Single.class);
+    }
+
+    @Test
+    public void toWrapperShouldConvertRxJava2ObservableToMaybe() {
+
+        io.reactivex.Observable<String> foo = io.reactivex.Observable.empty();
+        assertThat(conversionService.convert(foo, Maybe.class)).isInstanceOf(Maybe.class);
+    }
+
+    @Test
+    public void toWrapperShouldConvertRxJava2ObservableToPublisher() {
+
+        io.reactivex.Observable<String> foo = io.reactivex.Observable.just("foo");
+        assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Publisher.class);
+    }
+
+    @Test
+    public void toWrapperShouldConvertMonoToFlux() {
+
+        Mono<String> foo = Mono.just("foo");
+        assertThat(conversionService.convert(foo, Flux.class)).isInstanceOf(Flux.class);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java
new file mode 100644
index 0000000000..cc1f36c24c
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.lambdaworks.redis.AbstractRedisClientTest;
+import com.lambdaworks.redis.dynamic.annotation.Command;
+
+import rx.Observable;
+import rx.Single;
+
+/**
+ * @author Mark Paluch
+ */
+public class ReactiveTypeAdaptionTest extends AbstractRedisClientTest {
+
+    private TestInterface api;
+
+    @Before
+    public void before() throws Exception {
+
+        redis.set(key, value);
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+        this.api = factory.getCommands(TestInterface.class);
+    }
+
+    @Test
+    public void rxJava1Single() throws Exception {
+
+        Single<String> single = api.getRxJava1Single(key);
+        assertThat(single.toBlocking().value()).isEqualTo(value);
+    }
+
+    @Test
+    public void rxJava1Observable() throws Exception {
+
+        Observable<String> observable = api.getRxJava1Observable(key);
+        assertThat(observable.toBlocking().last()).isEqualTo(value);
+    }
+
+    @Test
+    public void rxJava2Single() throws Exception {
+
+        io.reactivex.Single<String> single = api.getRxJava2Single(key);
+        assertThat(single.blockingGet()).isEqualTo(value);
+    }
+
+    @Test
+    public void rxJava2Maybe() throws Exception {
+
+        io.reactivex.Maybe<String> maybe = api.getRxJava2Maybe(key);
+        assertThat(maybe.blockingGet()).isEqualTo(value);
+    }
+
+    @Test
+    public void rxJava2Observable() throws Exception {
+
+        io.reactivex.Observable<String> observable = api.getRxJava2Observable(key);
+        assertThat(observable.blockingFirst()).isEqualTo(value);
+    }
+
+    static interface TestInterface extends Commands {
+
+        @Command("GET")
+        Single<String> getRxJava1Single(String key);
+
+        @Command("GET")
+        Observable<String> getRxJava1Observable(String key);
+
+        @Command("GET")
+        io.reactivex.Single<String> getRxJava2Single(String key);
+
+        @Command("GET")
+        io.reactivex.Maybe<String> getRxJava2Maybe(String key);
+
+        @Command("GET")
+        io.reactivex.Observable<String> getRxJava2Observable(String key);
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
index 225e6ca1ed..426b22eb1c 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
@@ -42,7 +42,7 @@ public void sync() throws Exception {
 
         TestInterface api = factory.getCommands(TestInterface.class);
 
-        api.setSync("key", "value", Timeout.create(10, TimeUnit.SECONDS));
+        api.setSync(key, value, Timeout.create(10, TimeUnit.SECONDS));
         assertThat(api.get("key")).isEqualTo("value");
         assertThat(api.getAsBytes("key")).isEqualTo("value".getBytes());
     }
@@ -54,9 +54,9 @@ public void async() throws Exception {
 
         TestInterface api = factory.getCommands(TestInterface.class);
 
-        Future<String> key = api.set("key", "value");
-        assertThat(key).isInstanceOf(CompletableFuture.class);
-        key.get();
+        Future<String> set = api.set(key, value);
+        assertThat(set).isInstanceOf(CompletableFuture.class);
+        set.get();
     }
 
     @Test
@@ -66,8 +66,8 @@ public void reactive() throws Exception {
 
         TestInterface api = factory.getCommands(TestInterface.class);
 
-        Mono<String> key = api.setReactive("key", "value");
-        assertThat(key.block()).isEqualTo("OK");
+        Mono<String> set = api.setReactive(key, value);
+        assertThat(set.block()).isEqualTo("OK");
     }
 
     @Test

From 7ff76fa20295f30ff0e7a450870aa583ee886aa9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 12 Nov 2016 16:02:16 +0100
Subject: [PATCH 069/808] Provide synchronous ScanIterator API #397

Lettuce now provides ScanIterator to iterate over keys, hashes, sets and sorted sets using Iterator and Stream. ScanIterator is synchronous and implements Iterator.

ScanIterator<String> scan = ScanIterator.scan(connection.sync());
List<String> keys = scan.stream().collect(Collectors.toList());
---
 .../com/lambdaworks/redis/ScanIterator.java   | 306 ++++++++++++++++++
 .../lambdaworks/redis/ScanIteratorTest.java   | 235 ++++++++++++++
 .../redis/cluster/ScanIteratorTest.java       | 253 +++++++++++++++
 3 files changed, 794 insertions(+)
 create mode 100644 src/main/java/com/lambdaworks/redis/ScanIterator.java
 create mode 100644 src/test/java/com/lambdaworks/redis/ScanIteratorTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/cluster/ScanIteratorTest.java

diff --git a/src/main/java/com/lambdaworks/redis/ScanIterator.java b/src/main/java/com/lambdaworks/redis/ScanIterator.java
new file mode 100644
index 0000000000..4b59f2f327
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/ScanIterator.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.Spliterators;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import com.lambdaworks.redis.api.sync.RedisHashCommands;
+import com.lambdaworks.redis.api.sync.RedisKeyCommands;
+import com.lambdaworks.redis.api.sync.RedisSetCommands;
+import com.lambdaworks.redis.api.sync.RedisSortedSetCommands;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Scan command support exposed through {@link Iterator}.
+ * <p>
+ * {@link ScanIterator} uses synchronous command interfaces to scan over keys ({@code SCAN}), sets ({@code SSCAN}), sorted sets
+ * ({@code ZSCAN}), and hashes ({@code HSCAN}). A {@link ScanIterator} is stateful and not thread-safe. Instances can be used
+ * only once to iterate over results.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+abstract public class ScanIterator<T> implements Iterator<T> {
+
+    /**
+     * Sequentially iterate over keys in the keyspace. This method uses {@code SCAN} to perform an iterative scan.
+     * 
+     * @param commands the commands interface, must not be {@literal null}.
+     * @return a new {@link ScanIterator}.
+     */
+    public static <K, V> ScanIterator<K> scan(RedisKeyCommands<K, V> commands) {
+        return scan(commands, Optional.empty());
+    }
+
+    /**
+     * Sequentially iterate over keys in the keyspace. This method uses {@code SCAN} to perform an iterative scan.
+     *
+     * @param commands the commands interface, must not be {@literal null}.
+     * @param scanArgs the scan arguments, must not be {@literal null}.
+     * @return a new {@link ScanIterator}.
+     */
+    public static <K, V> ScanIterator<K> scan(RedisKeyCommands<K, V> commands, ScanArgs scanArgs) {
+
+        LettuceAssert.notNull(scanArgs, "ScanArgs must not be null");
+
+        return scan(commands, Optional.of(scanArgs));
+    }
+
+    private static <K, V> ScanIterator<K> scan(RedisKeyCommands<K, V> commands, Optional<ScanArgs> scanArgs) {
+
+        LettuceAssert.notNull(commands, "RedisKeyCommands must not be null");
+
+        return new SyncScanIterator<K>() {
+
+            @Override
+            protected ScanCursor nextScanCursor(ScanCursor scanCursor) {
+
+                KeyScanCursor<K> cursor = getNextScanCursor(scanCursor);
+                chunk = cursor.getKeys().iterator();
+                return cursor;
+            }
+
+            private KeyScanCursor<K> getNextScanCursor(ScanCursor scanCursor) {
+
+                if (scanCursor == null) {
+                    return scanArgs.map(commands::scan).orElseGet(commands::scan);
+                }
+
+                return scanArgs.map((scanArgs) -> commands.scan(scanCursor, scanArgs))
+                        .orElseGet(() -> commands.scan(scanCursor));
+            }
+        };
+    }
+
+    /**
+     * Sequentially iterate over entries in a hash identified by {@code key}. This method uses {@code HSCAN} to perform an
+     * iterative scan.
+     *
+     * @param commands the commands interface, must not be {@literal null}.
+     * @return a new {@link ScanIterator}.
+     */
+    public static <K, V> ScanIterator<KeyValue<K, V>> hscan(RedisHashCommands<K, V> commands, K key) {
+        return hscan(commands, key, Optional.empty());
+    }
+
+    /**
+     * Sequentially iterate over entries in a hash identified by {@code key}. This method uses {@code HSCAN} to perform an
+     * iterative scan.
+     *
+     * @param commands the commands interface, must not be {@literal null}.
+     * @param scanArgs the scan arguments, must not be {@literal null}.
+     * @return a new {@link ScanIterator}.
+     */
+    public static <K, V> ScanIterator<KeyValue<K, V>> hscan(RedisHashCommands<K, V> commands, K key, ScanArgs scanArgs) {
+
+        LettuceAssert.notNull(scanArgs, "ScanArgs must not be null");
+
+        return hscan(commands, key, Optional.of(scanArgs));
+    }
+
+    private static <K, V> ScanIterator<KeyValue<K, V>> hscan(RedisHashCommands<K, V> commands, K key,
+            Optional<ScanArgs> scanArgs) {
+
+        LettuceAssert.notNull(commands, "RedisKeyCommands must not be null");
+        LettuceAssert.notNull(key, "Key must not be null");
+
+        return new SyncScanIterator<KeyValue<K, V>>() {
+
+            @Override
+            protected ScanCursor nextScanCursor(ScanCursor scanCursor) {
+
+                MapScanCursor<K, V> cursor = getNextScanCursor(scanCursor);
+                chunk = cursor.getMap().keySet().stream().map(k -> KeyValue.fromNullable(k, cursor.getMap().get(k))).iterator();
+                return cursor;
+            }
+
+            private MapScanCursor<K, V> getNextScanCursor(ScanCursor scanCursor) {
+
+                if (scanCursor == null) {
+                    return scanArgs.map(scanArgs -> commands.hscan(key, scanArgs)).orElseGet(() -> commands.hscan(key));
+                }
+
+                return scanArgs.map((scanArgs) -> commands.hscan(key, scanCursor, scanArgs))
+                        .orElseGet(() -> commands.hscan(key, scanCursor));
+            }
+        };
+    }
+
+    /**
+     * Sequentially iterate over elements in a set identified by {@code key}. This method uses {@code SSCAN} to perform an
+     * iterative scan.
+     *
+     * @param commands the commands interface, must not be {@literal null}.
+     * @return a new {@link ScanIterator}.
+     */
+    public static <K, V> ScanIterator<V> sscan(RedisSetCommands<K, V> commands, K key) {
+        return sscan(commands, key, Optional.empty());
+    }
+
+    /**
+     * Sequentially iterate over elements in a set identified by {@code key}. This method uses {@code SSCAN} to perform an
+     * iterative scan.
+     *
+     * @param commands the commands interface, must not be {@literal null}.
+     * @param scanArgs the scan arguments, must not be {@literal null}.
+     * @return a new {@link ScanIterator}.
+     */
+    public static <K, V> ScanIterator<V> sscan(RedisSetCommands<K, V> commands, K key, ScanArgs scanArgs) {
+
+        LettuceAssert.notNull(scanArgs, "ScanArgs must not be null");
+
+        return sscan(commands, key, Optional.of(scanArgs));
+    }
+
+    private static <K, V> ScanIterator<V> sscan(RedisSetCommands<K, V> commands, K key, Optional<ScanArgs> scanArgs) {
+
+        LettuceAssert.notNull(commands, "RedisKeyCommands must not be null");
+        LettuceAssert.notNull(key, "Key must not be null");
+
+        return new SyncScanIterator<V>() {
+
+            @Override
+            protected ScanCursor nextScanCursor(ScanCursor scanCursor) {
+
+                ValueScanCursor<V> cursor = getNextScanCursor(scanCursor);
+                chunk = cursor.getValues().iterator();
+                return cursor;
+            }
+
+            private ValueScanCursor<V> getNextScanCursor(ScanCursor scanCursor) {
+
+                if (scanCursor == null) {
+                    return scanArgs.map(scanArgs -> commands.sscan(key, scanArgs)).orElseGet(() -> commands.sscan(key));
+                }
+
+                return scanArgs.map((scanArgs) -> commands.sscan(key, scanCursor, scanArgs))
+                        .orElseGet(() -> commands.sscan(key, scanCursor));
+            }
+        };
+    }
+
+    /**
+     * Sequentially iterate over scored values in a sorted set identified by {@code key}. This method uses {@code ZSCAN} to
+     * perform an iterative scan.
+     *
+     * @param commands the commands interface, must not be {@literal null}.
+     * @return a new {@link ScanIterator}.
+     */
+    public static <K, V> ScanIterator<ScoredValue<V>> zscan(RedisSortedSetCommands<K, V> commands, K key) {
+        return zscan(commands, key, Optional.empty());
+    }
+
+    /**
+     * Sequentially iterate over scored values in a sorted set identified by {@code key}. This method uses {@code ZSCAN} to
+     * perform an iterative scan.
+     *
+     * @param commands the commands interface, must not be {@literal null}.
+     * @param scanArgs the scan arguments, must not be {@literal null}.
+     * @return a new {@link ScanIterator}.
+     */
+    public static <K, V> ScanIterator<ScoredValue<V>> zscan(RedisSortedSetCommands<K, V> commands, K key, ScanArgs scanArgs) {
+
+        LettuceAssert.notNull(scanArgs, "ScanArgs must not be null");
+
+        return zscan(commands, key, Optional.of(scanArgs));
+    }
+
+    private static <K, V> ScanIterator<ScoredValue<V>> zscan(RedisSortedSetCommands<K, V> commands, K key,
+            Optional<ScanArgs> scanArgs) {
+
+        LettuceAssert.notNull(commands, "RedisKeyCommands must not be null");
+        LettuceAssert.notNull(key, "Key must not be null");
+
+        return new SyncScanIterator<ScoredValue<V>>() {
+
+            @Override
+            protected ScanCursor nextScanCursor(ScanCursor scanCursor) {
+
+                ScoredValueScanCursor<V> cursor = getNextScanCursor(scanCursor);
+                chunk = cursor.getValues().iterator();
+                return cursor;
+            }
+
+            private ScoredValueScanCursor<V> getNextScanCursor(ScanCursor scanCursor) {
+
+                if (scanCursor == null) {
+                    return scanArgs.map(scanArgs -> commands.zscan(key, scanArgs)).orElseGet(() -> commands.zscan(key));
+                }
+
+                return scanArgs.map((scanArgs) -> commands.zscan(key, scanCursor, scanArgs))
+                        .orElseGet(() -> commands.zscan(key, scanCursor));
+            }
+        };
+    }
+
+    /**
+     * Returns a sequential {@code Stream} with this {@link ScanIterator} as its source.
+     * 
+     * @return a {@link Stream} for this {@link ScanIterator}.
+     */
+    public Stream<T> stream() {
+        return StreamSupport.stream(Spliterators.spliterator(this, 0, 0), false);
+    }
+
+    /**
+     * Synchronous {@link ScanIterator} implementation.
+     * 
+     * @param <T>
+     */
+    private static abstract class SyncScanIterator<T> extends ScanIterator<T> {
+
+        private ScanCursor scanCursor;
+        protected Iterator<T> chunk = null;
+
+        @Override
+        public boolean hasNext() {
+
+            while (scanCursor == null || !scanCursor.isFinished()) {
+
+                if (scanCursor == null || !hasChunkElements()) {
+                    scanCursor = nextScanCursor(scanCursor);
+                }
+
+                if (hasChunkElements()) {
+                    return true;
+                }
+            }
+
+            return hasChunkElements();
+        }
+
+        private boolean hasChunkElements() {
+            return chunk.hasNext();
+        }
+
+        @Override
+        public T next() {
+
+            if (!hasNext()) {
+                throw new NoSuchElementException();
+            }
+
+            return chunk.next();
+        }
+
+        protected abstract ScanCursor nextScanCursor(ScanCursor scanCursor);
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/ScanIteratorTest.java b/src/test/java/com/lambdaworks/redis/ScanIteratorTest.java
new file mode 100644
index 0000000000..911bc8462b
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/ScanIteratorTest.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis;
+
+import static org.assertj.core.api.AssertionsForClassTypes.fail;
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.stream.Collectors;
+
+import org.junit.Test;
+
+import com.lambdaworks.KeysAndValues;
+
+/**
+ * @author Mark Paluch
+ */
+public class ScanIteratorTest extends AbstractRedisClientTest {
+
+    @Test
+    public void scanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
+
+        redis.mset(KeysAndValues.MAP);
+
+        ScanIterator<String> scan = ScanIterator.scan(redis, ScanArgs.Builder.limit(50).match("key-foo"));
+
+        assertThat(scan.hasNext()).isFalse();
+        try {
+            scan.next();
+            fail("Missing NoSuchElementException");
+        } catch (NoSuchElementException e) {
+            assertThat(e).isInstanceOf(NoSuchElementException.class);
+        }
+    }
+
+    @Test
+    public void keysSinglePass() throws Exception {
+
+        redis.mset(KeysAndValues.MAP);
+
+        ScanIterator<String> scan = ScanIterator.scan(redis, ScanArgs.Builder.limit(50).match("key-11*"));
+
+        assertThat(scan.hasNext()).isTrue();
+        assertThat(scan.hasNext()).isTrue();
+
+        for (int i = 0; i < 11; i++) {
+            assertThat(scan.hasNext()).isTrue();
+            assertThat(scan.next()).isNotNull();
+        }
+
+        assertThat(scan.hasNext()).isFalse();
+    }
+
+    @Test
+    public void keysMultiPass() throws Exception {
+
+        redis.mset(KeysAndValues.MAP);
+
+        ScanIterator<String> scan = ScanIterator.scan(redis);
+
+        List<String> keys = scan.stream().collect(Collectors.toList());
+
+        assertThat(keys).containsAll(KeysAndValues.KEYS);
+    }
+
+    @Test
+    public void hscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
+
+        redis.mset(KeysAndValues.MAP);
+
+        ScanIterator<KeyValue<String, String>> scan = ScanIterator.hscan(redis, "none",
+                ScanArgs.Builder.limit(50).match("key-foo"));
+
+        assertThat(scan.hasNext()).isFalse();
+        try {
+            scan.next();
+            fail("Missing NoSuchElementException");
+        } catch (NoSuchElementException e) {
+            assertThat(e).isInstanceOf(NoSuchElementException.class);
+        }
+    }
+
+    @Test
+    public void hashSinglePass() throws Exception {
+
+        redis.hmset(key, KeysAndValues.MAP);
+
+        ScanIterator<KeyValue<String, String>> scan = ScanIterator.hscan(redis, key,
+                ScanArgs.Builder.limit(50).match("key-11*"));
+
+        assertThat(scan.hasNext()).isTrue();
+        assertThat(scan.hasNext()).isTrue();
+
+        for (int i = 0; i < 11; i++) {
+            assertThat(scan.hasNext()).isTrue();
+            assertThat(scan.next()).isNotNull();
+        }
+
+        assertThat(scan.hasNext()).isFalse();
+    }
+
+    @Test
+    public void hashMultiPass() throws Exception {
+
+        redis.hmset(key, KeysAndValues.MAP);
+
+        ScanIterator<KeyValue<String, String>> scan = ScanIterator.hscan(redis, key);
+
+        List<KeyValue<String, String>> keys = scan.stream().collect(Collectors.toList());
+
+        assertThat(keys).containsAll(
+                KeysAndValues.KEYS.stream().map(s -> KeyValue.fromNullable(s, KeysAndValues.MAP.get(s))).collect(Collectors.toList()));
+    }
+
+    @Test
+    public void sscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
+
+        redis.sadd(key, KeysAndValues.VALUES.toArray(new String[0]));
+
+        ScanIterator<String> scan = ScanIterator.sscan(redis, "none",
+                ScanArgs.Builder.limit(50).match("key-foo"));
+
+        assertThat(scan.hasNext()).isFalse();
+        try {
+            scan.next();
+            fail("Missing NoSuchElementException");
+        } catch (NoSuchElementException e) {
+            assertThat(e).isInstanceOf(NoSuchElementException.class);
+        }
+    }
+
+    @Test
+    public void setSinglePass() throws Exception {
+
+        redis.sadd(key, KeysAndValues.KEYS.toArray(new String[0]));
+
+        ScanIterator<String> scan = ScanIterator.sscan(redis, key,
+                ScanArgs.Builder.limit(50).match("key-11*"));
+
+        assertThat(scan.hasNext()).isTrue();
+        assertThat(scan.hasNext()).isTrue();
+
+        for (int i = 0; i < 11; i++) {
+            assertThat(scan.hasNext()).isTrue();
+            assertThat(scan.next()).isNotNull();
+        }
+
+        assertThat(scan.hasNext()).isFalse();
+    }
+
+    @Test
+    public void setMultiPass() throws Exception {
+
+        redis.sadd(key, KeysAndValues.KEYS.toArray(new String[0]));
+
+        ScanIterator<String> scan = ScanIterator.sscan(redis, key);
+
+        List<String> values = scan.stream().collect(Collectors.toList());
+
+        assertThat(values).containsAll(values);
+    }
+
+    @Test
+    public void zscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
+
+        for (int i = 0; i < KeysAndValues.COUNT; i++) {
+            redis.zadd(key, ScoredValue.just(i, KeysAndValues.KEYS.get(i)));
+        }
+
+
+        ScanIterator<ScoredValue<String>> scan = ScanIterator.zscan(redis, "none",
+                ScanArgs.Builder.limit(50).match("key-foo"));
+
+        assertThat(scan.hasNext()).isFalse();
+        try {
+            scan.next();
+            fail("Missing NoSuchElementException");
+        } catch (NoSuchElementException e) {
+            assertThat(e).isInstanceOf(NoSuchElementException.class);
+        }
+    }
+
+    @Test
+    public void zsetSinglePass() throws Exception {
+
+        for (int i = 0; i < KeysAndValues.COUNT; i++) {
+            redis.zadd(key, ScoredValue.just(i, KeysAndValues.KEYS.get(i)));
+        }
+
+        ScanIterator<ScoredValue<String>> scan = ScanIterator.zscan(redis, key,
+                ScanArgs.Builder.limit(50).match("key-11*"));
+
+        assertThat(scan.hasNext()).isTrue();
+        assertThat(scan.hasNext()).isTrue();
+
+        for (int i = 0; i < 11; i++) {
+            assertThat(scan.hasNext()).isTrue();
+            assertThat(scan.next()).isNotNull();
+        }
+
+        assertThat(scan.hasNext()).isFalse();
+    }
+
+    @Test
+    public void zsetMultiPass() throws Exception {
+
+        List<ScoredValue<String>> expected = new ArrayList<>();
+        for (int i = 0; i < KeysAndValues.COUNT; i++) {
+            ScoredValue<String> scoredValue = ScoredValue.just(i, KeysAndValues.KEYS.get(i));
+            expected.add(scoredValue);
+            redis.zadd(key, scoredValue);
+        }
+
+        ScanIterator<ScoredValue<String>> scan = ScanIterator.zscan(redis, key);
+
+        List<ScoredValue<String>> values = scan.stream().collect(Collectors.toList());
+
+        assertThat(values).containsAll(values);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ScanIteratorTest.java b/src/test/java/com/lambdaworks/redis/cluster/ScanIteratorTest.java
new file mode 100644
index 0000000000..964a3963ff
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/cluster/ScanIteratorTest.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster;
+
+import static org.assertj.core.api.AssertionsForClassTypes.fail;
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.stream.Collectors;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.lambdaworks.KeysAndValues;
+import com.lambdaworks.redis.KeyValue;
+import com.lambdaworks.redis.ScanArgs;
+import com.lambdaworks.redis.ScanIterator;
+import com.lambdaworks.redis.ScoredValue;
+import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
+import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
+
+/**
+ * @author Mark Paluch
+ */
+public class ScanIteratorTest extends AbstractClusterTest {
+
+    private StatefulRedisClusterConnection<String, String> connection;
+    private RedisAdvancedClusterCommands<String, String> redis;
+
+    @Before
+    public void before() throws Exception {
+
+        this.connection = clusterClient.connect();
+        this.redis = this.connection.sync();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        this.connection.close();
+    }
+
+    @Test
+    public void scanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
+
+        redis.mset(KeysAndValues.MAP);
+
+        ScanIterator<String> scan = ScanIterator.scan(redis, ScanArgs.Builder.limit(50).match("key-foo"));
+
+        assertThat(scan.hasNext()).isFalse();
+        try {
+            scan.next();
+            fail("Missing NoSuchElementException");
+        } catch (NoSuchElementException e) {
+            assertThat(e).isInstanceOf(NoSuchElementException.class);
+        }
+    }
+
+    @Test
+    public void keysSinglePass() throws Exception {
+
+        redis.mset(KeysAndValues.MAP);
+
+        ScanIterator<String> scan = ScanIterator.scan(redis, ScanArgs.Builder.limit(50).match("key-11*"));
+
+        assertThat(scan.hasNext()).isTrue();
+        assertThat(scan.hasNext()).isTrue();
+
+        for (int i = 0; i < 11; i++) {
+            assertThat(scan.hasNext()).isTrue();
+            assertThat(scan.next()).isNotNull();
+        }
+
+        assertThat(scan.hasNext()).isFalse();
+    }
+
+    @Test
+    public void keysMultiPass() throws Exception {
+
+        redis.mset(KeysAndValues.MAP);
+
+        ScanIterator<String> scan = ScanIterator.scan(redis);
+
+        List<String> keys = scan.stream().collect(Collectors.toList());
+
+        assertThat(keys).containsAll(KeysAndValues.KEYS);
+    }
+
+    @Test
+    public void hscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
+
+        redis.mset(KeysAndValues.MAP);
+
+        ScanIterator<KeyValue<String, String>> scan = ScanIterator.hscan(redis, "none",
+                ScanArgs.Builder.limit(50).match("key-foo"));
+
+        assertThat(scan.hasNext()).isFalse();
+        try {
+            scan.next();
+            fail("Missing NoSuchElementException");
+        } catch (NoSuchElementException e) {
+            assertThat(e).isInstanceOf(NoSuchElementException.class);
+        }
+    }
+
+    @Test
+    public void hashSinglePass() throws Exception {
+
+        redis.hmset(key, KeysAndValues.MAP);
+
+        ScanIterator<KeyValue<String, String>> scan = ScanIterator.hscan(redis, key,
+                ScanArgs.Builder.limit(50).match("key-11*"));
+
+        assertThat(scan.hasNext()).isTrue();
+        assertThat(scan.hasNext()).isTrue();
+
+        for (int i = 0; i < 11; i++) {
+            assertThat(scan.hasNext()).isTrue();
+            assertThat(scan.next()).isNotNull();
+        }
+
+        assertThat(scan.hasNext()).isFalse();
+    }
+
+    @Test
+    public void hashMultiPass() throws Exception {
+
+        redis.hmset(key, KeysAndValues.MAP);
+
+        ScanIterator<KeyValue<String, String>> scan = ScanIterator.hscan(redis, key);
+
+        List<KeyValue<String, String>> keys = scan.stream().collect(Collectors.toList());
+
+        assertThat(keys).containsAll(KeysAndValues.KEYS.stream().map(s -> KeyValue.fromNullable(s, KeysAndValues.MAP.get(s)))
+                .collect(Collectors.toList()));
+    }
+
+    @Test
+    public void sscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
+
+        redis.sadd(key, KeysAndValues.VALUES.toArray(new String[0]));
+
+        ScanIterator<String> scan = ScanIterator.sscan(redis, "none", ScanArgs.Builder.limit(50).match("key-foo"));
+
+        assertThat(scan.hasNext()).isFalse();
+        try {
+            scan.next();
+            fail("Missing NoSuchElementException");
+        } catch (NoSuchElementException e) {
+            assertThat(e).isInstanceOf(NoSuchElementException.class);
+        }
+    }
+
+    @Test
+    public void setSinglePass() throws Exception {
+
+        redis.sadd(key, KeysAndValues.KEYS.toArray(new String[0]));
+
+        ScanIterator<String> scan = ScanIterator.sscan(redis, key, ScanArgs.Builder.limit(50).match("key-11*"));
+
+        assertThat(scan.hasNext()).isTrue();
+        assertThat(scan.hasNext()).isTrue();
+
+        for (int i = 0; i < 11; i++) {
+            assertThat(scan.hasNext()).isTrue();
+            assertThat(scan.next()).isNotNull();
+        }
+
+        assertThat(scan.hasNext()).isFalse();
+    }
+
+    @Test
+    public void setMultiPass() throws Exception {
+
+        redis.sadd(key, KeysAndValues.KEYS.toArray(new String[0]));
+
+        ScanIterator<String> scan = ScanIterator.sscan(redis, key);
+
+        List<String> values = scan.stream().collect(Collectors.toList());
+
+        assertThat(values).containsAll(values);
+    }
+
+    @Test
+    public void zscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
+
+        for (int i = 0; i < KeysAndValues.COUNT; i++) {
+            redis.zadd(key, ScoredValue.just(i, KeysAndValues.KEYS.get(i)));
+        }
+
+        ScanIterator<ScoredValue<String>> scan = ScanIterator.zscan(redis, "none", ScanArgs.Builder.limit(50).match("key-foo"));
+
+        assertThat(scan.hasNext()).isFalse();
+        try {
+            scan.next();
+            fail("Missing NoSuchElementException");
+        } catch (NoSuchElementException e) {
+            assertThat(e).isInstanceOf(NoSuchElementException.class);
+        }
+    }
+
+    @Test
+    public void zsetSinglePass() throws Exception {
+
+        for (int i = 0; i < KeysAndValues.COUNT; i++) {
+            redis.zadd(key, ScoredValue.just(i, KeysAndValues.KEYS.get(i)));
+        }
+
+        ScanIterator<ScoredValue<String>> scan = ScanIterator.zscan(redis, key, ScanArgs.Builder.limit(50).match("key-11*"));
+
+        assertThat(scan.hasNext()).isTrue();
+        assertThat(scan.hasNext()).isTrue();
+
+        for (int i = 0; i < 11; i++) {
+            assertThat(scan.hasNext()).isTrue();
+            assertThat(scan.next()).isNotNull();
+        }
+
+        assertThat(scan.hasNext()).isFalse();
+    }
+
+    @Test
+    public void zsetMultiPass() throws Exception {
+
+        List<ScoredValue<String>> expected = new ArrayList<>();
+        for (int i = 0; i < KeysAndValues.COUNT; i++) {
+            ScoredValue<String> scoredValue = ScoredValue.just(i, KeysAndValues.KEYS.get(i));
+            expected.add(scoredValue);
+            redis.zadd(key, scoredValue);
+        }
+
+        ScanIterator<ScoredValue<String>> scan = ScanIterator.zscan(redis, key);
+
+        List<ScoredValue<String>> values = scan.stream().collect(Collectors.toList());
+
+        assertThat(values).containsAll(values);
+    }
+}
\ No newline at end of file

From ee70da3d1f970b4591752e302375a819feea89cf Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 13 Nov 2016 19:48:48 +0100
Subject: [PATCH 070/808] Fix compiler ambiguities on JDK 8u31

---
 .../com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java | 6 +++---
 .../lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java
index 759ae80f7b..48e0b7f539 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java
@@ -202,7 +202,7 @@ public enum RxJava1SingleToMonoAdapter implements Function<Single<?>, Mono<?>> {
 
         @Override
         public Mono<?> apply(Single<?> source) {
-            return Mono.defer(() -> Mono.from(RxReactiveStreams.toPublisher(source)));
+            return Mono.defer(() -> Mono.from((Publisher<?>) RxReactiveStreams.toPublisher(source)));
         }
     }
 
@@ -267,7 +267,7 @@ public enum RxJava1ObservableToMonoAdapter implements Function<Observable<?>, Mo
 
         @Override
         public Mono<?> apply(Observable<?> source) {
-            return Mono.defer(() -> Mono.from(RxReactiveStreams.toPublisher(source)));
+            return Mono.defer(() -> Mono.from((Publisher<?>) RxReactiveStreams.toPublisher(source)));
         }
     }
 
@@ -280,7 +280,7 @@ public enum RxJava1ObservableToFluxAdapter implements Function<Observable<?>, Fl
 
         @Override
         public Flux<?> apply(Observable<?> source) {
-            return Flux.defer(() -> Flux.from(RxReactiveStreams.toPublisher(source)));
+            return Flux.defer(() -> Flux.from((Publisher<?>) RxReactiveStreams.toPublisher(source)));
         }
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java
index f5761c903f..5e8cf8c0bc 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java
@@ -113,7 +113,7 @@ public void toWrapperShouldConvertRxJava2FlowableToFlux() {
     public void toWrapperShouldCastRxJava2FlowableToPublisher() {
 
         io.reactivex.Flowable<String> foo = io.reactivex.Flowable.just("foo");
-        assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Flux.class);
+        assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Flowable.class);
     }
 
     @Test

From 724e8f8f885f6ad3f9d406ad901847b509f56b0c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 13 Nov 2016 19:56:17 +0100
Subject: [PATCH 071/808] Test fix

---
 .../com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java
index 5e8cf8c0bc..3c99cd8a44 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java
@@ -113,7 +113,7 @@ public void toWrapperShouldConvertRxJava2FlowableToFlux() {
     public void toWrapperShouldCastRxJava2FlowableToPublisher() {
 
         io.reactivex.Flowable<String> foo = io.reactivex.Flowable.just("foo");
-        assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Flowable.class);
+        assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Publisher.class);
     }
 
     @Test

From d3800903c60d82fe5a26b66155bac8d50125b0aa Mon Sep 17 00:00:00 2001
From: Takashi Takebayashi <changesworlds@gmail.com>
Date: Thu, 24 Nov 2016 13:49:18 +0900
Subject: [PATCH 072/808] Update code samples in readme to Lettuce 4.0 #410

Fixes #409
---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0a10f778bf..d4ceedb753 100644
--- a/README.md
+++ b/README.md
@@ -111,9 +111,10 @@ Basic Usage
 -----------
 
 ```java
-RedisClient client = RedisClient.create("redis://localhost")
-RedisStringsConnection<String, String> connection = client.connect()
-String value = connection.get("key")
+RedisClient client = RedisClient.create("redis://localhost");
+StatefulRedisConnection<String, String> connection = client.connect();
+RedisStringCommands sync = connection.sync();
+String value = sync.get("key");
 ```
 
 Each Redis command is implemented by one or more methods with names identical

From 90b886487b03d4ba3254648b6cd484d1ca076762 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 23 Nov 2016 13:01:53 +0100
Subject: [PATCH 073/808] Simplify NodeSelection implementation #408

Improve reuse of AbstractNodeSelection by providing template methods. Remove (Static|Dynamic)(Sync|Async)NodeSelection and replace methods with extractor functions. Extract ClusterFutureSyncInvocationHandler for reuse.
---
 .../redis/cluster/AbstractNodeSelection.java  |  70 ++++--
 .../ClusterDistributionChannelWriter.java     |   8 +
 .../ClusterFutureSyncInvocationHandler.java   | 205 ++++++++++++++++++
 .../cluster/DynamicAsyncNodeSelection.java    |  68 ------
 .../redis/cluster/DynamicNodeSelection.java   |  32 ++-
 .../cluster/DynamicSyncNodeSelection.java     |  68 ------
 .../NodeSelectionInvocationHandler.java       |  69 ++++--
 .../redis/cluster/ReactiveExecutionsImpl.java |  51 +++++
 ...RedisAdvancedClusterAsyncCommandsImpl.java |  28 ++-
 .../StatefulRedisClusterConnectionImpl.java   | 164 +-------------
 .../cluster/StaticAsyncNodeSelection.java     |  68 ------
 .../redis/cluster/StaticNodeSelection.java    |  33 ++-
 .../cluster/StaticSyncNodeSelection.java      |  68 ------
 .../redis/cluster/SyncExecutionsImpl.java     |   1 +
 .../cluster/api/NodeSelectionSupport.java     |   4 -
 .../api/StatefulRedisClusterConnection.java   |   2 +-
 .../api/reactive/ReactiveExecutions.java      |  44 ++++
 17 files changed, 477 insertions(+), 506 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/ClusterFutureSyncInvocationHandler.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/cluster/DynamicAsyncNodeSelection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/cluster/DynamicSyncNodeSelection.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/ReactiveExecutionsImpl.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/cluster/StaticAsyncNodeSelection.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/cluster/StaticSyncNodeSelection.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/api/reactive/ReactiveExecutions.java

diff --git a/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java
index cbe789b428..be1e8f2cdd 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java
@@ -15,14 +15,13 @@
  */
 package com.lambdaworks.redis.cluster;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 
 /**
@@ -33,44 +32,69 @@
  * @param <CMD> Command command interface type to invoke multi-node operations.
  * @param <K> Key type.
  * @param <V> Value type.
+ * @since 4.1
  * @author Mark Paluch
  */
 abstract class AbstractNodeSelection<API, CMD, K, V> implements NodeSelectionSupport<API, CMD> {
 
-    protected ClusterDistributionChannelWriter writer;
-    protected StatefulRedisClusterConnection<K, V> globalConnection;
+    @Override
+    public Map<RedisClusterNode, API> asMap() {
 
-    private ClusterConnectionProvider.Intent intent;
+        List<RedisClusterNode> list = nodes().stream().collect(Collectors.toList());
+        Map<RedisClusterNode, API> map = new HashMap<>();
 
-    public AbstractNodeSelection(StatefulRedisClusterConnection<K, V> globalConnection, ClusterConnectionProvider.Intent intent) {
-        this.globalConnection = globalConnection;
-        this.intent = intent;
-        writer = ((StatefulRedisClusterConnectionImpl) globalConnection).getClusterDistributionChannelWriter();
-    }
+        list.forEach((key) -> map.put(key, getApi(key)));
 
-    protected StatefulRedisConnection<K, V> getConnection(RedisClusterNode redisClusterNode) {
-        RedisURI uri = redisClusterNode.getUri();
-        return writer.getClusterConnectionProvider().getConnection(intent, uri.getHost(), uri.getPort());
+        return map;
     }
 
-    /**
-     * @return List of involved nodes
-     */
-    protected abstract List<RedisClusterNode> nodes();
-
     @Override
     public int size() {
         return nodes().size();
     }
 
-    public Map<RedisClusterNode, StatefulRedisConnection<K, V>> statefulMap() {
-        return nodes().stream().collect(
-                Collectors.toMap(redisClusterNode -> redisClusterNode, redisClusterNode1 -> getConnection(redisClusterNode1)));
-    }
-
     @Override
     public RedisClusterNode node(int index) {
         return nodes().get(index);
     }
 
+    // This method is never called, the value is supplied by AOP magic.
+    @Override
+    public CMD commands() {
+        return null;
+    }
+
+    @Override
+    public API commands(int index) {
+        return getApi(node(index));
+    }
+
+    /**
+     *
+     * @return {@link Map} between a {@link RedisClusterNode} to its actual {@link StatefulRedisConnection}.
+     */
+    protected  Map<RedisClusterNode, ? extends StatefulRedisConnection<K, V>> statefulMap() {
+        return nodes().stream().collect(Collectors.toMap(redisClusterNode -> redisClusterNode, this::getConnection));
+    }
+
+    /**
+     * Template method to be implemented by implementing classes to obtain a {@link StatefulRedisConnection}.
+     *
+     * @param redisClusterNode must not be {@literal null}.
+     * @return
+     */
+    protected abstract StatefulRedisConnection<K, V> getConnection(RedisClusterNode redisClusterNode);
+
+    /**
+     * Template method to be implemented by implementing classes to obtain a the API object given a {@link RedisClusterNode}.
+     *
+     * @param redisClusterNode must not be {@literal null}.
+     * @return
+     */
+    protected  abstract API getApi(RedisClusterNode redisClusterNode);
+
+    /**
+     * @return List of involved nodes
+     */
+    protected abstract List<RedisClusterNode> nodes();
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
index 9513d69529..b6fd201ae5 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
@@ -41,6 +41,7 @@ class ClusterDistributionChannelWriter implements RedisChannelWriter {
 
     private ClusterConnectionProvider clusterConnectionProvider;
     private boolean closed = false;
+    private volatile Partitions partitions;
 
     ClusterDistributionChannelWriter(ClientOptions clientOptions, RedisChannelWriter defaultWriter,
             ClusterEventListener clusterEventListener, EventExecutorGroup eventExecutors) {
@@ -226,11 +227,18 @@ public void setClusterConnectionProvider(ClusterConnectionProvider clusterConnec
     }
 
     public void setPartitions(Partitions partitions) {
+
+        this.partitions = partitions;
+
         if (clusterConnectionProvider != null) {
             clusterConnectionProvider.setPartitions(partitions);
         }
     }
 
+    public Partitions getPartitions(){
+        return partitions;
+    }
+
     /**
      * Set from which nodes data is read. The setting is used as default for read operations on this connection. See the
      * documentation for {@link ReadFrom} for more information.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterFutureSyncInvocationHandler.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterFutureSyncInvocationHandler.java
new file mode 100644
index 0000000000..0a249e7695
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterFutureSyncInvocationHandler.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+
+import com.lambdaworks.redis.LettuceFutures;
+import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.api.StatefulConnection;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
+import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
+import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.redis.internal.AbstractInvocationHandler;
+
+/**
+ * Invocation-handler to synchronize API calls which use Futures as backend. This class leverages the need to implement a full
+ * sync class which just delegates every request.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 3.0
+ */
+@SuppressWarnings("unchecked")
+class ClusterFutureSyncInvocationHandler<K, V> extends AbstractInvocationHandler {
+
+    private final StatefulConnection<K, V> connection;
+    private final Class<?> asyncCommandsInterface;
+    private final Class<?> nodeSelectionInterface;
+    private final Class<?> nodeSelectionCommandsInterface;
+    private final Object asyncApi;
+
+    private final Map<Method, Method> apiMethodCache = new ConcurrentHashMap<>(RedisClusterCommands.class.getMethods().length,
+            1);
+    private final Map<Method, Method> connectionMethodCache = new ConcurrentHashMap<>(5, 1);
+
+    private static final Constructor<MethodHandles.Lookup> LOOKUP_CONSTRUCTOR;
+
+    static {
+        try {
+            LOOKUP_CONSTRUCTOR = MethodHandles.Lookup.class.getDeclaredConstructor(Class.class, int.class);
+            if (!LOOKUP_CONSTRUCTOR.isAccessible()) {
+                LOOKUP_CONSTRUCTOR.setAccessible(true);
+            }
+        } catch (NoSuchMethodException exp) {
+            // should be impossible, but...
+            throw new IllegalStateException(exp);
+        }
+    }
+
+    ClusterFutureSyncInvocationHandler(StatefulConnection<K, V> connection, Class<?> asyncCommandsInterface,
+            Class<?> nodeSelectionInterface, Class<?> nodeSelectionCommandsInterface, Object asyncApi) {
+        this.connection = connection;
+        this.asyncCommandsInterface = asyncCommandsInterface;
+        this.nodeSelectionInterface = nodeSelectionInterface;
+        this.nodeSelectionCommandsInterface = nodeSelectionCommandsInterface;
+        this.asyncApi = asyncApi;
+    }
+
+    /**
+     *
+     * @see AbstractInvocationHandler#handleInvocation(Object, Method, Object[])
+     */
+    @Override
+    protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
+
+        try {
+
+            if (method.isDefault()) {
+                return getDefaultMethodHandle(method).bindTo(proxy).invokeWithArguments(args);
+            }
+
+            if (method.getName().equals("getConnection") && args.length > 0) {
+                Method targetMethod = connectionMethodCache.computeIfAbsent(method, key -> {
+                    try {
+                        return connection.getClass().getMethod(key.getName(), key.getParameterTypes());
+                    } catch (NoSuchMethodException e) {
+                        throw new IllegalStateException(e);
+                    }
+                });
+
+                Object result = targetMethod.invoke(connection, args);
+                if (result instanceof StatefulRedisClusterConnection) {
+                    StatefulRedisClusterConnection<K, V> connection = (StatefulRedisClusterConnection<K, V>) result;
+                    return connection.sync();
+                }
+
+                if (result instanceof StatefulRedisConnection) {
+                    StatefulRedisConnection<K, V> connection = (StatefulRedisConnection<K, V>) result;
+                    return connection.sync();
+                }
+            }
+
+            if (method.getName().equals("readonly") && args.length == 1) {
+                return nodes((Predicate<RedisClusterNode>) args[0], ClusterConnectionProvider.Intent.READ, false);
+            }
+
+            if (method.getName().equals("nodes") && args.length == 1) {
+                return nodes((Predicate<RedisClusterNode>) args[0], ClusterConnectionProvider.Intent.WRITE, false);
+            }
+
+            if (method.getName().equals("nodes") && args.length == 2) {
+                return nodes((Predicate<RedisClusterNode>) args[0], ClusterConnectionProvider.Intent.WRITE, (Boolean) args[1]);
+            }
+
+            Method targetMethod = apiMethodCache.computeIfAbsent(method, key -> {
+
+                try {
+                    return asyncApi.getClass().getMethod(key.getName(), key.getParameterTypes());
+                } catch (NoSuchMethodException e) {
+                    throw new IllegalStateException(e);
+                }
+            });
+
+            Object result = targetMethod.invoke(asyncApi, args);
+
+            if (result instanceof RedisFuture) {
+                RedisFuture<?> command = (RedisFuture<?>) result;
+                if (!method.getName().equals("exec") && !method.getName().equals("multi")) {
+                    if (connection instanceof StatefulRedisConnection && ((StatefulRedisConnection) connection).isMulti()) {
+                        return null;
+                    }
+                }
+                return LettuceFutures.awaitOrCancel(command, connection.getTimeout(), connection.getTimeoutUnit());
+            }
+
+            return result;
+
+        } catch (InvocationTargetException e) {
+            throw e.getTargetException();
+        }
+    }
+
+    protected Object nodes(Predicate<RedisClusterNode> predicate, ClusterConnectionProvider.Intent intent, boolean dynamic) {
+
+        NodeSelectionSupport<RedisCommands<K, V>, ?> selection = null;
+
+        if (connection instanceof StatefulRedisClusterConnectionImpl) {
+
+            StatefulRedisClusterConnectionImpl impl = (StatefulRedisClusterConnectionImpl) connection;
+
+            if (dynamic) {
+                selection = new DynamicNodeSelection<RedisCommands<K, V>, Object, K, V>(
+                        impl.getClusterDistributionChannelWriter(), predicate, intent, StatefulRedisConnection::sync);
+            } else {
+
+                selection = new StaticNodeSelection<RedisCommands<K, V>, Object, K, V>(
+                        impl.getClusterDistributionChannelWriter(), predicate, intent, StatefulRedisConnection::sync);
+            }
+        }
+
+        if (connection instanceof StatefulRedisClusterPubSubConnectionImpl) {
+
+            StatefulRedisClusterPubSubConnectionImpl impl = (StatefulRedisClusterPubSubConnectionImpl) connection;
+            selection = new StaticNodeSelection<RedisCommands<K, V>, Object, K, V>(impl.getClusterDistributionChannelWriter(),
+                    predicate, intent, StatefulRedisConnection::sync);
+        }
+
+        NodeSelectionInvocationHandler h = new NodeSelectionInvocationHandler((AbstractNodeSelection<?, ?, ?, ?>) selection,
+                asyncCommandsInterface, connection.getTimeout(), connection.getTimeoutUnit());
+        return Proxy.newProxyInstance(NodeSelectionSupport.class.getClassLoader(),
+                new Class<?>[] { nodeSelectionCommandsInterface, nodeSelectionInterface }, h);
+    }
+
+    private static MethodHandles.Lookup privateMethodHandleLookup(Class<?> declaringClass) {
+        try {
+            return LOOKUP_CONSTRUCTOR.newInstance(declaringClass, MethodHandles.Lookup.PRIVATE);
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    private static MethodHandle getDefaultMethodHandle(Method method) {
+        Class<?> declaringClass = method.getDeclaringClass();
+        try {
+            return privateMethodHandleLookup(declaringClass).unreflectSpecial(method, declaringClass);
+        } catch (IllegalAccessException e) {
+            throw new IllegalArgumentException("Did not pass in an interface method: " + method);
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/DynamicAsyncNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/DynamicAsyncNodeSelection.java
deleted file mode 100644
index 9952c45420..0000000000
--- a/src/main/java/com/lambdaworks/redis/cluster/DynamicAsyncNodeSelection.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2011-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.lambdaworks.redis.cluster;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-
-/**
- * @param <CMD> Command command interface type to invoke multi-node operations.
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- */
-class DynamicAsyncNodeSelection<CMD, K, V> extends DynamicNodeSelection<RedisAsyncCommands<K, V>, CMD, K, V> {
-
-    public DynamicAsyncNodeSelection(StatefulRedisClusterConnection<K, V> globalConnection,
-            Predicate<RedisClusterNode> selector, ClusterConnectionProvider.Intent intent) {
-        super(globalConnection, selector, intent);
-    }
-
-    public Iterator<RedisAsyncCommands<K, V>> iterator() {
-        List<RedisClusterNode> list = nodes().stream().collect(Collectors.toList());
-        return list.stream().map(node -> getConnection(node).async()).iterator();
-    }
-
-    @Override
-    public RedisAsyncCommands<K, V> commands(int index) {
-        return statefulMap().get(nodes().get(index)).async();
-    }
-
-    @Override
-    public Map<RedisClusterNode, RedisAsyncCommands<K, V>> asMap() {
-
-        List<RedisClusterNode> list = nodes().stream().collect(Collectors.toList());
-        Map<RedisClusterNode, RedisAsyncCommands<K, V>> map = new HashMap<>();
-
-        list.forEach((key) -> map.put(key, getConnection(key).async()));
-
-        return map;
-    }
-
-    // This method is never called, the value is supplied by AOP magic.
-    @Override
-    public CMD commands() {
-        return null;
-    }
-}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/DynamicNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/DynamicNodeSelection.java
index a290dade50..518d10b68e 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/DynamicNodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/DynamicNodeSelection.java
@@ -16,10 +16,12 @@
 package com.lambdaworks.redis.cluster;
 
 import java.util.List;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 
 /**
@@ -31,18 +33,36 @@
  * @param <V> Value type.
  * @author Mark Paluch
  */
-abstract class DynamicNodeSelection<API, CMD, K, V> extends AbstractNodeSelection<API, CMD, K, V> {
+class DynamicNodeSelection<API, CMD, K, V> extends AbstractNodeSelection<API, CMD, K, V> {
 
+    private final ClusterDistributionChannelWriter writer;
     private final Predicate<RedisClusterNode> selector;
+    private final ClusterConnectionProvider.Intent intent;
+    private final Function<StatefulRedisConnection<K, V>, API> apiExtractor;
+
+    public DynamicNodeSelection(ClusterDistributionChannelWriter writer, Predicate<RedisClusterNode> selector,
+            ClusterConnectionProvider.Intent intent, Function<StatefulRedisConnection<K, V>, API> apiExtractor) {
 
-    public DynamicNodeSelection(StatefulRedisClusterConnection<K, V> globalConnection, Predicate<RedisClusterNode> selector,
-            ClusterConnectionProvider.Intent intent) {
-        super(globalConnection, intent);
         this.selector = selector;
+        this.intent = intent;
+        this.writer = writer;
+        this.apiExtractor = apiExtractor;
+    }
+
+    @Override
+    protected StatefulRedisConnection<K, V> getConnection(RedisClusterNode redisClusterNode) {
+
+        RedisURI uri = redisClusterNode.getUri();
+        return writer.getClusterConnectionProvider().getConnection(intent, uri.getHost(), uri.getPort());
+    }
+
+    @Override
+    protected API getApi(RedisClusterNode redisClusterNode) {
+        return apiExtractor.apply(getConnection(redisClusterNode));
     }
 
     @Override
     protected List<RedisClusterNode> nodes() {
-        return globalConnection.getPartitions().getPartitions().stream().filter(selector).collect(Collectors.toList());
+        return writer.getPartitions().getPartitions().stream().filter(selector).collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/DynamicSyncNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/DynamicSyncNodeSelection.java
deleted file mode 100644
index f8d7a5f783..0000000000
--- a/src/main/java/com/lambdaworks/redis/cluster/DynamicSyncNodeSelection.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2011-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.lambdaworks.redis.cluster;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-
-/**
- * @param <CMD> Command command interface type to invoke multi-node operations.
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- */
-class DynamicSyncNodeSelection<CMD, K, V> extends DynamicNodeSelection<RedisCommands<K, V>, CMD, K, V> {
-
-    public DynamicSyncNodeSelection(StatefulRedisClusterConnection<K, V> globalConnection,
-            Predicate<RedisClusterNode> selector, ClusterConnectionProvider.Intent intent) {
-        super(globalConnection, selector, intent);
-    }
-
-    public Iterator<RedisCommands<K, V>> iterator() {
-        List<RedisClusterNode> list = nodes().stream().collect(Collectors.toList());
-        return list.stream().map(node -> getConnection(node).sync()).iterator();
-    }
-
-    @Override
-    public RedisCommands<K, V> commands(int index) {
-        return statefulMap().get(nodes().get(index)).sync();
-    }
-
-    @Override
-    public Map<RedisClusterNode, RedisCommands<K, V>> asMap() {
-
-        List<RedisClusterNode> list = nodes().stream().collect(Collectors.toList());
-        Map<RedisClusterNode, RedisCommands<K, V>> map = new HashMap<>();
-
-        list.forEach((key) -> map.put(key, getConnection(key).sync()));
-
-        return map;
-    }
-
-    // This method is never called, the value is supplied by AOP magic.
-    @Override
-    public CMD commands() {
-        return null;
-    }
-}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java b/src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java
index ca70b110c4..a9077ae8f3 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java
@@ -26,15 +26,15 @@
 import com.lambdaworks.redis.RedisCommandTimeoutException;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
-import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 import com.lambdaworks.redis.internal.AbstractInvocationHandler;
 import com.lambdaworks.redis.internal.LettuceAssert;
 
 /**
  * Invocation handler to trigger commands on multiple connections and return a holder for the values.
- * 
+ *
  * @author Mark Paluch
+ * @since 4.4
  */
 class NodeSelectionInvocationHandler extends AbstractInvocationHandler {
 
@@ -42,9 +42,10 @@ class NodeSelectionInvocationHandler extends AbstractInvocationHandler {
 
     private final Map<Method, Method> nodeSelectionMethods = new ConcurrentHashMap<>();
     private final Map<Method, Method> connectionMethod = new ConcurrentHashMap<>();
+    private final Class<?> commandsInterface;
 
     private AbstractNodeSelection<?, ?, ?, ?> selection;
-    private boolean sync;
+    private ExecutionModel executionModel;
     private long timeout;
     private TimeUnit unit;
 
@@ -57,55 +58,75 @@ class NodeSelectionInvocationHandler extends AbstractInvocationHandler {
         }
     }
 
-    public NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selection) {
-        this(selection, false, 0, null);
+    NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selection, Class<?> commandsInterface,
+            ExecutionModel executionModel) {
+        this(selection, commandsInterface, 0, null, executionModel);
     }
 
-    public NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selection, boolean sync, long timeout,
+    NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selection, Class<?> commandsInterface, long timeout,
             TimeUnit unit) {
-        if (sync) {
+        this(selection, commandsInterface, timeout, unit, ExecutionModel.SYNC);
+    }
+
+    private NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selection, Class<?> commandsInterface,
+            long timeout, TimeUnit unit, ExecutionModel executionModel) {
+
+        if (executionModel == ExecutionModel.SYNC) {
             LettuceAssert.isTrue(timeout > 0, "Timeout must be greater 0 when using sync mode");
             LettuceAssert.notNull(unit, "Unit must not be null when using sync mode");
         }
 
+        LettuceAssert.notNull(executionModel, "ExecutionModel must not be null");
+
         this.selection = selection;
-        this.sync = sync;
+        this.commandsInterface = commandsInterface;
         this.unit = unit;
         this.timeout = timeout;
+        this.executionModel = executionModel;
     }
 
     @Override
-    @SuppressWarnings("rawtypes")
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
 
         try {
-            Method targetMethod = findMethod(RedisClusterAsyncCommands.class, method, connectionMethod);
+            Method targetMethod = findMethod(commandsInterface, method, connectionMethod);
 
             Map<RedisClusterNode, StatefulRedisConnection<?, ?>> connections = new HashMap<>(selection.size(), 1);
             connections.putAll(selection.statefulMap());
 
             if (targetMethod != null) {
 
-                Map<RedisClusterNode, CompletionStage<?>> executions = new HashMap<>();
+                Map<RedisClusterNode, Object> executions = new HashMap<>();
+
                 for (Map.Entry<RedisClusterNode, StatefulRedisConnection<?, ?>> entry : connections.entrySet()) {
 
-                    CompletionStage<?> result = (CompletionStage<?>) targetMethod.invoke(entry.getValue().async(), args);
+                    StatefulRedisConnection<?, ?> connection = entry.getValue();
+                    Object result = targetMethod.invoke(
+                            executionModel == ExecutionModel.REACTIVE ? connection.reactive() : connection.async(), args);
+
                     executions.put(entry.getKey(), result);
                 }
 
-                if (sync) {
-                    if (!awaitAll(timeout, unit, executions.values())) {
-                        throw createTimeoutException(executions);
+                if (executionModel == ExecutionModel.SYNC) {
+
+                    Map<RedisClusterNode, CompletionStage<?>> asyncExecutions = (Map) executions;
+                    if (!awaitAll(timeout, unit, asyncExecutions.values())) {
+                        throw createTimeoutException(asyncExecutions);
                     }
 
-                    if (atLeastOneFailed(executions)) {
-                        throw createExecutionException(executions);
+                    if (atLeastOneFailed(asyncExecutions)) {
+                        throw createExecutionException(asyncExecutions);
                     }
 
-                    return new SyncExecutionsImpl(executions);
+                    return new SyncExecutionsImpl(asyncExecutions);
+                }
+
+                if (executionModel == ExecutionModel.REACTIVE) {
+                    return new ReactiveExecutionsImpl(executions);
 
                 }
-                return new AsyncExecutionsImpl<>((Map) executions);
+                return new AsyncExecutionsImpl(executions);
             }
 
             if (method.getName().equals("commands") && args.length == 0) {
@@ -152,8 +173,7 @@ public static boolean awaitAll(long timeout, TimeUnit unit, Collection<Completio
 
     private boolean atLeastOneFailed(Map<RedisClusterNode, CompletionStage<?>> executions) {
         return executions.values().stream()
-                .filter(completionStage -> completionStage.toCompletableFuture().isCompletedExceptionally()).findFirst()
-                .isPresent();
+                .anyMatch(completionStage -> completionStage.toCompletableFuture().isCompletedExceptionally());
     }
 
     private RedisCommandTimeoutException createTimeoutException(Map<RedisClusterNode, CompletionStage<?>> executions) {
@@ -197,8 +217,7 @@ private RedisCommandExecutionException createExecutionException(Map<RedisCluster
     }
 
     private String getNodeDescription(List<RedisClusterNode> notFinished) {
-        return String.join(", ",
-                notFinished.stream().map(redisClusterNode -> getDescriptor(redisClusterNode)).collect(Collectors.toList()));
+        return String.join(", ", notFinished.stream().map(this::getDescriptor).collect(Collectors.toList()));
     }
 
     private String getDescriptor(RedisClusterNode redisClusterNode) {
@@ -234,4 +253,8 @@ private Method findMethod(Class<?> type, Method method, Map<Method, Method> cach
         cache.put(method, NULL_MARKER_METHOD);
         return null;
     }
+
+    enum ExecutionModel {
+        SYNC, ASYNC, REACTIVE;
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ReactiveExecutionsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/ReactiveExecutionsImpl.java
new file mode 100644
index 0000000000..9860f69b3b
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/ReactiveExecutionsImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster;
+
+import java.util.Collection;
+import java.util.Map;
+
+import com.lambdaworks.redis.cluster.api.reactive.ReactiveExecutions;
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+
+import org.reactivestreams.Publisher;
+import reactor.core.publisher.Flux;
+import rx.Observable;
+
+/**
+ * Default implementation of {@link ReactiveExecutions}.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+class ReactiveExecutionsImpl<T> implements ReactiveExecutions<T> {
+
+    private Map<RedisClusterNode, ? extends Publisher<T>> executions;
+
+    public ReactiveExecutionsImpl(Map<RedisClusterNode, ? extends Publisher<T>> executions) {
+        this.executions = executions;
+    }
+
+    @Override
+    public Flux<T> flux() {
+        return Flux.merge(executions.values());
+    }
+
+    @Override
+    public Collection<RedisClusterNode> nodes() {
+        return executions.keySet();
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index cb0867bd86..c059510d34 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -17,6 +17,7 @@
 
 import static com.lambdaworks.redis.cluster.ClusterScanSupport.asyncClusterKeyScanCursorMapper;
 import static com.lambdaworks.redis.cluster.ClusterScanSupport.asyncClusterStreamScanCursorMapper;
+import static com.lambdaworks.redis.cluster.NodeSelectionInvocationHandler.ExecutionModel.ASYNC;
 import static com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode.NodeFlag.MASTER;
 
 import java.lang.reflect.Proxy;
@@ -240,10 +241,10 @@ public RedisFuture<Boolean> msetnx(Map<K, V> map) {
         }
 
         return new PipelinedRedisFuture<>(executions, objectPipelinedRedisFuture -> {
-            
+
             for (RedisFuture<Boolean> listRedisFuture : executions.values()) {
                 Boolean b = MultiNodeExecution.execute(() -> listRedisFuture.get());
-                if (b == null ||  !b) {
+                if (b == null || !b) {
                     return false;
                 }
             }
@@ -343,7 +344,7 @@ public RedisFuture<List<K>> keys(K pattern) {
         return new PipelinedRedisFuture<>(executions, objectPipelinedRedisFuture -> {
             List<K> result = new ArrayList<>();
             for (RedisFuture<List<K>> future : executions.values()) {
-                result.addAll(MultiNodeExecution.execute(() -> future.get()));
+                result.addAll(MultiNodeExecution.execute(future::get));
             }
             return result;
         });
@@ -410,8 +411,8 @@ protected <T> Map<String, RedisFuture<T>> executeOnMasters(
      * @param <T> result type
      * @return map of a key (counter) and commands.
      */
-    protected <T> Map<String, RedisFuture<T>> executeOnNodes(
-            Function<RedisClusterAsyncCommands<K, V>, RedisFuture<T>> function, Function<RedisClusterNode, Boolean> filter) {
+    protected <T> Map<String, RedisFuture<T>> executeOnNodes(Function<RedisClusterAsyncCommands<K, V>, RedisFuture<T>> function,
+            Function<RedisClusterNode, Boolean> filter) {
         Map<String, RedisFuture<T>> executions = new HashMap<>();
 
         for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
@@ -474,15 +475,19 @@ protected AsyncNodeSelection<K, V> nodes(Predicate<RedisClusterNode> predicate,
 
         NodeSelectionSupport<RedisAsyncCommands<K, V>, ?> selection;
 
+        StatefulRedisClusterConnectionImpl impl = (StatefulRedisClusterConnectionImpl) connection;
         if (dynamic) {
-            selection = new DynamicAsyncNodeSelection<>(getStatefulConnection(), predicate, intent);
+            selection = new DynamicNodeSelection<RedisAsyncCommands<K, V>, Object, K, V>(
+                    impl.getClusterDistributionChannelWriter(), predicate, intent, StatefulRedisConnection::async);
         } else {
-            selection = new StaticAsyncNodeSelection<>(getStatefulConnection(), predicate, intent);
+            selection = new StaticNodeSelection<RedisAsyncCommands<K, V>, Object, K, V>(
+                    impl.getClusterDistributionChannelWriter(), predicate, intent, StatefulRedisConnection::async);
         }
 
-        NodeSelectionInvocationHandler h = new NodeSelectionInvocationHandler((AbstractNodeSelection<?, ?, ?, ?>) selection);
-        return (AsyncNodeSelection<K, V>) Proxy.newProxyInstance(NodeSelectionSupport.class.getClassLoader(), new Class<?>[] {
-                NodeSelectionAsyncCommands.class, AsyncNodeSelection.class }, h);
+        NodeSelectionInvocationHandler h = new NodeSelectionInvocationHandler((AbstractNodeSelection<?, ?, ?, ?>) selection,
+                RedisClusterAsyncCommands.class, ASYNC);
+        return (AsyncNodeSelection<K, V>) Proxy.newProxyInstance(NodeSelectionSupport.class.getClassLoader(),
+                new Class<?>[] { NodeSelectionAsyncCommands.class, AsyncNodeSelection.class }, h);
     }
 
     @Override
@@ -504,7 +509,7 @@ public RedisFuture<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanAr
 
     @Override
     public RedisFuture<KeyScanCursor<K>> scan(ScanCursor scanCursor) {
-        return clusterScan(scanCursor, (connection, cursor) -> connection.scan(cursor), asyncClusterKeyScanCursorMapper());
+        return clusterScan(scanCursor, RedisKeyAsyncCommands::scan, asyncClusterKeyScanCursorMapper());
     }
 
     @Override
@@ -553,5 +558,4 @@ static <T extends ScanCursor, K, V> RedisFuture<T> clusterScan(StatefulRedisClus
         RedisFuture<T> scanCursor = scanFunction.apply(connection.getConnection(currentNodeId).async(), continuationCursor);
         return mapper.map(nodeIds, currentNodeId, scanCursor);
     }
-
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
index ce123aaf02..4a2ca950af 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
@@ -19,30 +19,23 @@
 import static com.lambdaworks.redis.protocol.CommandType.READONLY;
 import static com.lambdaworks.redis.protocol.CommandType.READWRITE;
 
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.reflect.*;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-import java.util.function.Predicate;
 
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
+import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
 import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
 import com.lambdaworks.redis.cluster.api.sync.NodeSelection;
 import com.lambdaworks.redis.cluster.api.sync.NodeSelectionCommands;
 import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.AbstractInvocationHandler;
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.protocol.CompleteableCommand;
 import com.lambdaworks.redis.protocol.ConnectionWatchdog;
@@ -96,8 +89,9 @@ public RedisAdvancedClusterCommands<K, V> sync() {
         return sync;
     }
 
-    public InvocationHandler syncInvocationHandler() {
-        return new ClusterFutureSyncInvocationHandler<>(this, async());
+    protected InvocationHandler syncInvocationHandler() {
+        return new ClusterFutureSyncInvocationHandler<>(this, RedisClusterAsyncCommands.class, NodeSelection.class,
+                NodeSelectionCommands.class, async());
     }
 
     @Override
@@ -218,150 +212,4 @@ public void setReadFrom(ReadFrom readFrom) {
     public ReadFrom getReadFrom() {
         return getClusterDistributionChannelWriter().getReadFrom();
     }
-
-    /**
-     * Invocation-handler to synchronize API calls which use Futures as backend. This class leverages the need to implement a
-     * full sync class which just delegates every request.
-     *
-     * @param <K> Key type.
-     * @param <V> Value type.
-     * @author Mark Paluch
-     * @since 3.0
-     */
-    @SuppressWarnings("unchecked")
-    private static class ClusterFutureSyncInvocationHandler<K, V> extends AbstractInvocationHandler {
-
-        private final StatefulRedisClusterConnection<K, V> connection;
-        private final Object asyncApi;
-        private final Map<Method, Method> apiMethodCache = new ConcurrentHashMap<>(RedisClusterCommands.class.getMethods().length, 1);
-        private final Map<Method, Method> connectionMethodCache = new ConcurrentHashMap<>(5, 1);
-
-        private static final Constructor<MethodHandles.Lookup> LOOKUP_CONSTRUCTOR;
-
-        static {
-            try {
-                LOOKUP_CONSTRUCTOR = MethodHandles.Lookup.class.getDeclaredConstructor(Class.class, int.class);
-                if (!LOOKUP_CONSTRUCTOR.isAccessible()) {
-                    LOOKUP_CONSTRUCTOR.setAccessible(true);
-                }
-            } catch (NoSuchMethodException exp) {
-                // should be impossible, but...
-                throw new IllegalStateException(exp);
-            }
-        }
-
-        ClusterFutureSyncInvocationHandler(StatefulRedisClusterConnection<K, V> connection, Object asyncApi) {
-            this.connection = connection;
-            this.asyncApi = asyncApi;
-        }
-
-        static MethodHandles.Lookup privateMethodHandleLookup(Class<?> declaringClass) {
-            try {
-                return LOOKUP_CONSTRUCTOR.newInstance(declaringClass, MethodHandles.Lookup.PRIVATE);
-            } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
-                throw new IllegalStateException(e);
-            }
-        }
-
-        static MethodHandle getDefaultMethodHandle(Method method) {
-            Class<?> declaringClass = method.getDeclaringClass();
-            try {
-                return privateMethodHandleLookup(declaringClass).unreflectSpecial(method, declaringClass);
-            } catch (IllegalAccessException e) {
-                throw new IllegalArgumentException("Did not pass in an interface method: " + method);
-            }
-        }
-
-        /**
-         *
-         * @see AbstractInvocationHandler#handleInvocation(Object, Method, Object[])
-         */
-        @Override
-        protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
-
-            try {
-
-                if (method.isDefault()) {
-                    return getDefaultMethodHandle(method).bindTo(proxy).invokeWithArguments(args);
-                }
-
-                if (method.getName().equals("getConnection") && args.length > 0) {
-                    Method targetMethod = connectionMethodCache.computeIfAbsent(method, key -> {
-                        try {
-                            return connection.getClass().getMethod(key.getName(), key.getParameterTypes());
-                        } catch (NoSuchMethodException e) {
-                            throw new IllegalStateException(e);
-                        }
-                    });
-
-                    Object result = targetMethod.invoke(connection, args);
-                    if (result instanceof StatefulRedisClusterConnection) {
-                        StatefulRedisClusterConnection<K, V> connection = (StatefulRedisClusterConnection<K, V>) result;
-                        return connection.sync();
-                    }
-
-                    if (result instanceof StatefulRedisConnection) {
-                        StatefulRedisConnection<K, V> connection = (StatefulRedisConnection<K, V>) result;
-                        return connection.sync();
-                    }
-                }
-
-                if (method.getName().equals("readonly") && args.length == 1) {
-                    return nodes((Predicate<RedisClusterNode>) args[0], ClusterConnectionProvider.Intent.READ, false);
-                }
-
-                if (method.getName().equals("nodes") && args.length == 1) {
-                    return nodes((Predicate<RedisClusterNode>) args[0], ClusterConnectionProvider.Intent.WRITE, false);
-                }
-
-                if (method.getName().equals("nodes") && args.length == 2) {
-                    return nodes((Predicate<RedisClusterNode>) args[0], ClusterConnectionProvider.Intent.WRITE,
-                            (Boolean) args[1]);
-                }
-
-                Method targetMethod = apiMethodCache.computeIfAbsent(method, key -> {
-
-                    try {
-                        return asyncApi.getClass().getMethod(key.getName(), key.getParameterTypes());
-                    } catch (NoSuchMethodException e) {
-                        throw new IllegalStateException(e);
-                    }
-                });
-
-                Object result = targetMethod.invoke(asyncApi, args);
-
-                if (result instanceof RedisFuture) {
-                    RedisFuture<?> command = (RedisFuture<?>) result;
-                    if (!method.getName().equals("exec") && !method.getName().equals("multi")) {
-                        if (connection instanceof StatefulRedisConnection && ((StatefulRedisConnection) connection).isMulti()) {
-                            return null;
-                        }
-                    }
-                    return LettuceFutures.awaitOrCancel(command, connection.getTimeout(), connection.getTimeoutUnit());
-                }
-
-                return result;
-
-            } catch (InvocationTargetException e) {
-                throw e.getTargetException();
-            }
-        }
-
-        protected NodeSelection<K, V> nodes(Predicate<RedisClusterNode> predicate, ClusterConnectionProvider.Intent intent,
-                boolean dynamic) {
-
-            NodeSelectionSupport<RedisCommands<K, V>, ?> selection;
-
-            if (dynamic) {
-                selection = new DynamicSyncNodeSelection<>(connection, predicate, intent);
-            } else {
-                selection = new StaticSyncNodeSelection<>(connection, predicate, intent);
-            }
-
-            NodeSelectionInvocationHandler h = new NodeSelectionInvocationHandler((AbstractNodeSelection<?, ?, ?, ?>) selection,
-                    true, connection.getTimeout(), connection.getTimeoutUnit());
-            return (NodeSelection<K, V>) Proxy.newProxyInstance(NodeSelectionSupport.class.getClassLoader(),
-                    new Class<?>[] { NodeSelectionCommands.class, NodeSelection.class }, h);
-        }
-    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StaticAsyncNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/StaticAsyncNodeSelection.java
deleted file mode 100644
index 4c398ad759..0000000000
--- a/src/main/java/com/lambdaworks/redis/cluster/StaticAsyncNodeSelection.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2011-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.lambdaworks.redis.cluster;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-
-/**
- * @param <CMD> Command command interface type to invoke multi-node operations.
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- */
-class StaticAsyncNodeSelection<CMD, K, V> extends StaticNodeSelection<RedisAsyncCommands<K, V>, CMD, K, V> {
-
-    public StaticAsyncNodeSelection(StatefulRedisClusterConnection<K, V> globalConnection,
-            Predicate<RedisClusterNode> selector, ClusterConnectionProvider.Intent intent) {
-        super(globalConnection, selector, intent);
-    }
-
-    public Iterator<RedisAsyncCommands<K, V>> iterator() {
-        List<RedisClusterNode> list = nodes().stream().collect(Collectors.toList());
-        return list.stream().map(node -> getConnection(node).async()).iterator();
-    }
-
-    @Override
-    public RedisAsyncCommands<K, V> commands(int index) {
-        return statefulMap().get(nodes().get(index)).async();
-    }
-
-    @Override
-    public Map<RedisClusterNode, RedisAsyncCommands<K, V>> asMap() {
-
-        List<RedisClusterNode> list = nodes().stream().collect(Collectors.toList());
-        Map<RedisClusterNode, RedisAsyncCommands<K, V>> map = new HashMap<>();
-
-        list.forEach((key) -> map.put(key, getConnection(key).async()));
-
-        return map;
-    }
-
-    // This method is never called, the value is supplied by AOP magic.
-    @Override
-    public CMD commands() {
-        return null;
-    }
-}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StaticNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/StaticNodeSelection.java
index 0136524b16..a6c228102d 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/StaticNodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/StaticNodeSelection.java
@@ -16,10 +16,12 @@
 package com.lambdaworks.redis.cluster;
 
 import java.util.List;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 
 /**
@@ -31,16 +33,33 @@
  * @param <V> Value type.
  * @author Mark Paluch
  */
-abstract class StaticNodeSelection<API, CMD, K, V> extends AbstractNodeSelection<API, CMD, K, V> {
+class StaticNodeSelection<API, CMD, K, V> extends AbstractNodeSelection<API, CMD, K, V> {
 
+    private final ClusterDistributionChannelWriter writer;
+    private final ClusterConnectionProvider.Intent intent;
     private final List<RedisClusterNode> redisClusterNodes;
+    private final Function<StatefulRedisConnection<K, V>, API> apiExtractor;
 
-    public StaticNodeSelection(StatefulRedisClusterConnection<K, V> globalConnection, Predicate<RedisClusterNode> selector,
-            ClusterConnectionProvider.Intent intent) {
-        super(globalConnection, intent);
+    public StaticNodeSelection(ClusterDistributionChannelWriter writer, Predicate<RedisClusterNode> selector,
+            ClusterConnectionProvider.Intent intent, Function<StatefulRedisConnection<K, V>, API> apiExtractor) {
 
-        this.redisClusterNodes = globalConnection.getPartitions().getPartitions().stream().filter(selector)
-                .collect(Collectors.toList());
+        this.writer = writer;
+        this.intent = intent;
+        this.apiExtractor = apiExtractor;
+
+        this.redisClusterNodes = writer.getPartitions().getPartitions().stream().filter(selector).collect(Collectors.toList());
+    }
+
+    @Override
+    protected StatefulRedisConnection<K, V> getConnection(RedisClusterNode redisClusterNode) {
+
+        RedisURI uri = redisClusterNode.getUri();
+        return writer.getClusterConnectionProvider().getConnection(intent, uri.getHost(), uri.getPort());
+    }
+
+    @Override
+    protected API getApi(RedisClusterNode redisClusterNode) {
+        return apiExtractor.apply(getConnection(redisClusterNode));
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StaticSyncNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/StaticSyncNodeSelection.java
deleted file mode 100644
index 0eed23e42a..0000000000
--- a/src/main/java/com/lambdaworks/redis/cluster/StaticSyncNodeSelection.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2011-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.lambdaworks.redis.cluster;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-
-/**
- * @param <CMD> Command command interface type to invoke multi-node operations.
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- */
-class StaticSyncNodeSelection<CMD, K, V> extends StaticNodeSelection<RedisCommands<K, V>, CMD, K, V> {
-
-    public StaticSyncNodeSelection(StatefulRedisClusterConnection<K, V> globalConnection, Predicate<RedisClusterNode> selector,
-            ClusterConnectionProvider.Intent intent) {
-        super(globalConnection, selector, intent);
-    }
-
-    public Iterator<RedisCommands<K, V>> iterator() {
-        List<RedisClusterNode> list = nodes().stream().collect(Collectors.toList());
-        return list.stream().map(node -> getConnection(node).sync()).iterator();
-    }
-
-    @Override
-    public RedisCommands<K, V> commands(int index) {
-        return statefulMap().get(nodes().get(index)).sync();
-    }
-
-    @Override
-    public Map<RedisClusterNode, RedisCommands<K, V>> asMap() {
-
-        List<RedisClusterNode> list = nodes().stream().collect(Collectors.toList());
-        Map<RedisClusterNode, RedisCommands<K, V>> map = new HashMap<>();
-
-        list.forEach((key) -> map.put(key, getConnection(key).sync()));
-
-        return map;
-    }
-
-    // This method is never called, the value is supplied by AOP magic.
-    @Override
-    public CMD commands() {
-        return null;
-    }
-}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/SyncExecutionsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/SyncExecutionsImpl.java
index 6359874730..ded848df87 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/SyncExecutionsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/SyncExecutionsImpl.java
@@ -26,6 +26,7 @@
 
 /**
  * @author Mark Paluch
+ * TODO: Add timeout handling
  */
 class SyncExecutionsImpl<T> implements Executions<T> {
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/NodeSelectionSupport.java b/src/main/java/com/lambdaworks/redis/cluster/api/NodeSelectionSupport.java
index 0429463909..46682a0ade 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/NodeSelectionSupport.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/NodeSelectionSupport.java
@@ -31,13 +31,11 @@
 public interface NodeSelectionSupport<API, CMD> {
 
     /**
-     * 
      * @return number of nodes.
      */
     int size();
 
     /**
-     *
      * @return commands API to run on this node selection.
      */
     CMD commands();
@@ -59,9 +57,7 @@ public interface NodeSelectionSupport<API, CMD> {
     RedisClusterNode node(int index);
 
     /**
-     * 
      * @return map of {@link RedisClusterNode} and the connection/commands objects
      */
     Map<RedisClusterNode, API> asMap();
-
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java b/src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java
index 30baedea74..f2a7b15060 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java
@@ -26,7 +26,7 @@
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 
 /**
- * A stateful cluster connection providing. Advanced cluster connections provide transparent command routing based on the first
+ * A stateful cluster connection. Advanced cluster connections provide transparent command routing based on the first
  * command key.
  * 
  * @param <K> Key type.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/ReactiveExecutions.java b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/ReactiveExecutions.java
new file mode 100644
index 0000000000..9c8203191b
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/ReactiveExecutions.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.api.reactive;
+
+import java.util.Collection;
+
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+
+import reactor.core.publisher.Flux;
+import rx.Observable;
+
+/**
+ * Execution holder for a reactive command to be executed on multiple nodes.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public interface ReactiveExecutions<T> {
+
+    /**
+     * Return an {@link Observable} that contains a combined stream of the multi-node execution.
+     * 
+     * @return
+     */
+    Flux<T> flux();
+
+    /**
+     * @return collection of nodes on which the command was executed.
+     */
+    Collection<RedisClusterNode> nodes();
+}

From a26c2290b90bbd55bfb6236d8240c17934447949 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 25 Nov 2016 09:44:37 +0100
Subject: [PATCH 074/808] Allow Pub/Sub subscriptions on a node selection
 within Redis Cluster #385

Lettuce now supports Pub/Sub subscriptions on particular nodes with Redis Cluster. Subscriptions to one or a selection of nodes is useful especially when working with keyspace notifications. Keyspace notifications with Redis Cluster are published only to the node where the event originates and these notifications are not broadcasted across the cluster.

 This change introduces StatefulRedisClusterPubSubConnection that exposes node-selection APIs for synchronous, asynchronous and reactive subscription operations.
---
 .../ClusterPubSubConnectionProvider.java      | 147 +++++++++++++
 .../PooledClusterConnectionProvider.java      | 102 ++++++---
 .../redis/cluster/PubSubClusterEndpoint.java  | 200 +++++++++++++++++
 .../redis/cluster/RedisClusterClient.java     |  83 +++++--
 .../RedisClusterPubSubAsyncCommandsImpl.java  | 104 +++++++++
 ...edisClusterPubSubReactiveCommandsImpl.java | 104 +++++++++
 ...tefulRedisClusterPubSubConnectionImpl.java | 182 ++++++++++++++++
 .../api/reactive/ReactiveExecutions.java      |   3 +-
 .../pubsub/RedisClusterPubSubAdapter.java     |  59 +++++
 .../pubsub/RedisClusterPubSubListener.java    |  78 +++++++
 .../StatefulRedisClusterPubSubConnection.java | 159 ++++++++++++++
 .../NodeSelectionPubSubAsyncCommands.java     |  59 +++++
 .../api/async/PubSubAsyncNodeSelection.java   |  36 ++++
 .../RedisClusterPubSubAsyncCommands.java      |  85 ++++++++
 .../NodeSelectionPubSubReactiveCommands.java  |  59 +++++
 .../reactive/PubSubReactiveNodeSelection.java |  31 +++
 .../RedisClusterPubSubReactiveCommands.java   |  85 ++++++++
 .../api/sync/NodeSelectionPubSubCommands.java |  59 +++++
 .../pubsub/api/sync/PubSubNodeSelection.java  |  30 +++
 .../api/sync/RedisClusterPubSubCommands.java  |  85 ++++++++
 .../redis/pubsub/PubSubEndpoint.java          |  14 +-
 .../pubsub/StatefulRedisPubSubConnection.java |  11 +-
 .../StatefulRedisPubSubConnectionImpl.java    |   2 +-
 .../pubsub/api/sync/RedisPubSubCommands.java  |   1 -
 .../cluster/pubsub/PubSubClusterTest.java     | 204 +++++++++---------
 .../cluster/pubsub/PubSubConnectionTest.java  | 142 ++++++++++++
 .../redis/support/PubSubTestListener.java     |  87 ++++++++
 27 files changed, 2048 insertions(+), 163 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/ClusterPubSubConnectionProvider.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/PubSubClusterEndpoint.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubAsyncCommandsImpl.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubReactiveCommandsImpl.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterPubSubConnectionImpl.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubAdapter.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubListener.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/PubSubNodeSelection.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
 create mode 100644 src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubConnectionTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/support/PubSubTestListener.java

diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterPubSubConnectionProvider.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterPubSubConnectionProvider.java
new file mode 100644
index 0000000000..e43beca31a
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterPubSubConnectionProvider.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster;
+
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.redis.cluster.pubsub.RedisClusterPubSubListener;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.pubsub.RedisPubSubAdapter;
+import com.lambdaworks.redis.pubsub.RedisPubSubListener;
+import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
+
+/**
+ * {@link ClusterConnectionProvider} to provide {@link StatefulRedisPubSubConnection}s for Redis Cluster use.
+ * <p>
+ * {@link StatefulRedisPubSubConnection}s provided by this {@link ClusterConnectionProvider} get a {@link RedisPubSubListener}
+ * registered that propagates received events to an upstream {@link RedisClusterPubSubListener} to provide message propagation.
+ * Message propagation performs a {@link RedisClusterNode} lookup to distinguish notifications between cluster nodes.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+class ClusterPubSubConnectionProvider<K, V> extends PooledClusterConnectionProvider<K, V> {
+
+    private final RedisClusterClient redisClusterClient;
+    private final RedisCodec<K, V> redisCodec;
+    private final RedisClusterPubSubListener<K, V> notifications;
+
+    /**
+     * Creates a new {@link ClusterPubSubConnectionProvider}.
+     * 
+     * @param redisClusterClient must not be {@literal null}.
+     * @param clusterWriter must not be {@literal null}.
+     * @param redisCodec must not be {@literal null}.
+     * @param notificationTarget must not be {@literal null}.
+     */
+    public ClusterPubSubConnectionProvider(RedisClusterClient redisClusterClient,
+            ClusterDistributionChannelWriter clusterWriter, RedisCodec<K, V> redisCodec,
+            RedisClusterPubSubListener<K, V> notificationTarget) {
+
+        super(redisClusterClient, clusterWriter, redisCodec);
+
+        this.redisClusterClient = redisClusterClient;
+        this.redisCodec = redisCodec;
+        this.notifications = notificationTarget;
+    }
+
+    @Override
+    protected ClusterNodeConnectionFactory<K, V> getConnectionFactory() {
+        return new PubSubConnectionFactory();
+    }
+
+    private class PubSubConnectionFactory implements ClusterNodeConnectionFactory<K, V> {
+
+        @Override
+        public StatefulRedisPubSubConnection<K, V> apply(ConnectionKey key) {
+
+            StatefulRedisPubSubConnection<K, V> connection = null;
+
+            if (key.nodeId != null) {
+
+                // NodeId connections do not provide command recovery due to cluster reconfiguration
+                connection = redisClusterClient.connectPubSubToNode(redisCodec, key.nodeId, getSocketAddressSupplier(key));
+
+                connection.addListener(new DelegatingRedisClusterPubSubListener(key.nodeId));
+            }
+
+            if (key.host != null) {
+
+                // Host and port connections do provide command recovery due to cluster reconfiguration
+                connection = redisClusterClient.connectPubSubToNode(redisCodec, key.host + ":" + key.port,
+                        getSocketAddressSupplier(key));
+
+                connection.addListener(new DelegatingRedisClusterPubSubListener(key.host, key.port));
+            }
+
+            return connection;
+        }
+    }
+
+    private class DelegatingRedisClusterPubSubListener extends RedisPubSubAdapter<K, V> {
+
+        private final String nodeId;
+        private final String host;
+        private final int port;
+
+        public DelegatingRedisClusterPubSubListener(String nodeId) {
+
+            this.nodeId = nodeId;
+            this.host = null;
+            this.port = 0;
+        }
+
+        public DelegatingRedisClusterPubSubListener(String host, int port) {
+
+            this.nodeId = null;
+            this.host = host;
+            this.port = port;
+        }
+
+        @Override
+        public void message(K channel, V message) {
+            notifications.message(getNode(), channel, message);
+        }
+
+        @Override
+        public void message(K pattern, K channel, V message) {
+            notifications.message(getNode(), pattern, channel, message);
+        }
+
+        @Override
+        public void subscribed(K channel, long count) {
+            notifications.subscribed(getNode(), channel, count);
+        }
+
+        @Override
+        public void psubscribed(K pattern, long count) {
+            notifications.psubscribed(getNode(), pattern, count);
+        }
+
+        @Override
+        public void unsubscribed(K channel, long count) {
+            notifications.unsubscribed(getNode(), channel, count);
+        }
+
+        @Override
+        public void punsubscribed(K pattern, long count) {
+            notifications.punsubscribed(getNode(), pattern, count);
+        }
+
+        private RedisClusterNode getNode() {
+            return nodeId != null ? getPartitions().getPartitionByNodeId(nodeId) : getPartition(host, port);
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java b/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
index 22b6887406..9705677c4c 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
@@ -59,7 +59,9 @@ class PooledClusterConnectionProvider<K, V> implements ClusterConnectionProvider
     private final StatefulRedisConnection<K, V> writers[] = new StatefulRedisConnection[SlotHash.SLOT_COUNT];
     private final StatefulRedisConnection<K, V> readers[][] = new StatefulRedisConnection[SlotHash.SLOT_COUNT][];
     private final RedisClusterClient redisClusterClient;
-    private final ConnectionFactory connectionFactory;
+    private final ClusterNodeConnectionFactory connectionFactory;
+    private final RedisChannelWriter clusterWriter;
+    private final RedisCodec<K, V> redisCodec;
 
     private Partitions partitions;
     private boolean autoFlushCommands = true;
@@ -68,8 +70,10 @@ class PooledClusterConnectionProvider<K, V> implements ClusterConnectionProvider
     public PooledClusterConnectionProvider(RedisClusterClient redisClusterClient, RedisChannelWriter clusterWriter,
             RedisCodec<K, V> redisCodec) {
 
+        this.redisCodec = redisCodec;
         this.redisClusterClient = redisClusterClient;
-        this.connectionFactory = new ConnectionFactory(redisClusterClient, redisCodec, clusterWriter);
+        this.clusterWriter = clusterWriter;
+        this.connectionFactory = new ConnectionPostProcessor(getConnectionFactory());
     }
 
     @Override
@@ -228,7 +232,8 @@ public StatefulRedisConnection<K, V> getConnection(Intent intent, String host, i
         }
     }
 
-    private RedisClusterNode getPartition(String host, int port) {
+    protected RedisClusterNode getPartition(String host, int port) {
+
         for (RedisClusterNode partition : partitions) {
             RedisURI uri = partition.getUri();
             if (port == uri.getPort() && host.equals(uri.getHost())) {
@@ -276,6 +281,10 @@ public void setPartitions(Partitions partitions) {
         }
     }
 
+    protected Partitions getPartitions() {
+        return partitions;
+    }
+
     private void reconfigurePartitions() {
 
         if (!redisClusterClient.expireStaleConnections()) {
@@ -402,12 +411,12 @@ private void resetFastConnectionCache() {
         }
     }
 
-    private RuntimeException invalidConnectionPoint(String message) {
+    private static RuntimeException invalidConnectionPoint(String message) {
         return new IllegalArgumentException(
                 "Connection to " + message + " not allowed. This connection point is not known in the cluster view");
     }
 
-    private Supplier<SocketAddress> getSocketAddressSupplier(final ConnectionKey connectionKey) {
+    Supplier<SocketAddress> getSocketAddressSupplier(final ConnectionKey connectionKey) {
         return () -> {
             if (connectionKey.nodeId != null) {
                 SocketAddress socketAddress = getSocketAddress(connectionKey.nodeId);
@@ -433,11 +442,12 @@ private SocketAddress getSocketAddress(String nodeId) {
     /**
      * Connection to identify a connection either by nodeId or host/port.
      */
-    private static class ConnectionKey {
-        private final ClusterConnectionProvider.Intent intent;
-        private final String nodeId;
-        private final String host;
-        private final int port;
+    static class ConnectionKey {
+
+        final ClusterConnectionProvider.Intent intent;
+        final String nodeId;
+        final String host;
+        final int port;
 
         public ConnectionKey(Intent intent, String nodeId) {
             this.intent = intent;
@@ -481,7 +491,7 @@ public int hashCode() {
         }
     }
 
-    private boolean validateClusterNodeMembership() {
+    boolean validateClusterNodeMembership() {
         return redisClusterClient.getClusterClientOptions() == null
                 || redisClusterClient.getClusterClientOptions().isValidateClusterNodeMembership();
     }
@@ -490,31 +500,28 @@ private StatefulRedisConnection<K, V> getOrCreateConnection(ConnectionKey key) {
         return connections.computeIfAbsent(key, connectionFactory);
     }
 
-    private class ConnectionFactory implements Function<ConnectionKey, StatefulRedisConnection<K, V>> {
+    /**
+     * @return a factory {@link Function}
+     */
+    protected ClusterNodeConnectionFactory<K, V> getConnectionFactory() {
+        return new NodeConnectionFactoryImpl(redisClusterClient, redisCodec, clusterWriter);
+    }
 
-        private final RedisClusterClient redisClusterClient;
-        private final RedisCodec<K, V> redisCodec;
-        private final RedisChannelWriter clusterWriter;
+    private class ConnectionPostProcessor implements ClusterNodeConnectionFactory<K, V> {
 
-        public ConnectionFactory(RedisClusterClient redisClusterClient, RedisCodec<K, V> redisCodec,
-                RedisChannelWriter clusterWriter) {
-            this.redisClusterClient = redisClusterClient;
-            this.redisCodec = redisCodec;
-            this.clusterWriter = clusterWriter;
+        private final Function<ConnectionKey, StatefulRedisConnection<K, V>> delegate;
+
+        public ConnectionPostProcessor(Function<ConnectionKey, StatefulRedisConnection<K, V>> delegate) {
+            this.delegate = delegate;
         }
 
         @Override
         public StatefulRedisConnection<K, V> apply(ConnectionKey key) {
 
-            StatefulRedisConnection<K, V> connection = null;
-
             if (key.nodeId != null) {
-                if (partitions.getPartitionByNodeId(key.nodeId) == null) {
+                if (getPartitions().getPartitionByNodeId(key.nodeId) == null) {
                     throw invalidConnectionPoint("node id " + key.nodeId);
                 }
-
-                // NodeId connections do not provide command recovery due to cluster reconfiguration
-                connection = redisClusterClient.connectToNode(redisCodec, key.nodeId, null, getSocketAddressSupplier(key));
             }
 
             if (key.host != null) {
@@ -524,12 +531,10 @@ public StatefulRedisConnection<K, V> apply(ConnectionKey key) {
                         throw invalidConnectionPoint(key.host + ":" + key.port);
                     }
                 }
-
-                // Host and port connections do provide command recovery due to cluster reconfiguration
-                connection = redisClusterClient.connectToNode(redisCodec, key.host + ":" + key.port, clusterWriter,
-                        getSocketAddressSupplier(key));
             }
 
+            StatefulRedisConnection<K, V> connection = delegate.apply(key);
+
             LettuceAssert.notNull(connection, "Connection is null. Check ConnectionKey because host and nodeId are null");
 
             try {
@@ -548,4 +553,41 @@ public StatefulRedisConnection<K, V> apply(ConnectionKey key) {
             return connection;
         }
     }
+
+    private class NodeConnectionFactoryImpl implements ClusterNodeConnectionFactory<K, V> {
+
+        private final RedisClusterClient redisClusterClient;
+        private final RedisCodec<K, V> redisCodec;
+        private final RedisChannelWriter clusterWriter;
+
+        public NodeConnectionFactoryImpl(RedisClusterClient redisClusterClient, RedisCodec<K, V> redisCodec,
+                RedisChannelWriter clusterWriter) {
+            this.redisClusterClient = redisClusterClient;
+            this.redisCodec = redisCodec;
+            this.clusterWriter = clusterWriter;
+        }
+
+        @Override
+        public StatefulRedisConnection<K, V> apply(ConnectionKey key) {
+
+            StatefulRedisConnection<K, V> connection = null;
+
+            if (key.nodeId != null) {
+                // NodeId connections do not provide command recovery due to cluster reconfiguration
+                connection = redisClusterClient.connectToNode(redisCodec, key.nodeId, null, getSocketAddressSupplier(key));
+            }
+
+            if (key.host != null) {
+                // Host and port connections do provide command recovery due to cluster reconfiguration
+                connection = redisClusterClient.connectToNode(redisCodec, key.host + ":" + key.port, clusterWriter,
+                        getSocketAddressSupplier(key));
+            }
+
+            return connection;
+        }
+    }
+
+    interface ClusterNodeConnectionFactory<K, V> extends Function<ConnectionKey, StatefulRedisConnection<K, V>> {
+
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PubSubClusterEndpoint.java b/src/main/java/com/lambdaworks/redis/cluster/PubSubClusterEndpoint.java
new file mode 100644
index 0000000000..f4286e1326
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/PubSubClusterEndpoint.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import com.lambdaworks.redis.ClientOptions;
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.redis.cluster.pubsub.RedisClusterPubSubAdapter;
+import com.lambdaworks.redis.cluster.pubsub.RedisClusterPubSubListener;
+import com.lambdaworks.redis.pubsub.PubSubEndpoint;
+import com.lambdaworks.redis.pubsub.PubSubOutput;
+
+/**
+ * @author Mark Paluch
+ */
+public class PubSubClusterEndpoint<K, V> extends PubSubEndpoint<K, V> {
+
+    private final List<RedisClusterPubSubListener<K, V>> clusterListeners = new CopyOnWriteArrayList<>();
+    private final NotifyingMessageListener multicast = new NotifyingMessageListener();
+    private final UpstreamMessageListener upstream = new UpstreamMessageListener();
+
+    private volatile boolean nodeMessagePropagation = false;
+    private volatile RedisClusterNode clusterNode;
+
+    /**
+     * Initialize a new instance that handles commands from the supplied queue.
+     *
+     * @param clientOptions client options for this connection, must not be {@literal null}
+     */
+    public PubSubClusterEndpoint(ClientOptions clientOptions) {
+        super(clientOptions);
+    }
+
+    /**
+     * Add a new {@link RedisClusterPubSubListener listener}.
+     *
+     * @param listener the listener, must not be {@literal null}.
+     */
+    public void addListener(RedisClusterPubSubListener<K, V> listener) {
+        clusterListeners.add(listener);
+    }
+
+    public RedisClusterPubSubListener<K, V> getUpstreamListener() {
+        return upstream;
+    }
+
+    /**
+     * Remove an existing {@link RedisClusterPubSubListener listener}.
+     *
+     * @param listener the listener, must not be {@literal null}.
+     */
+    public void removeListener(RedisClusterPubSubListener<K, V> listener) {
+        clusterListeners.remove(listener);
+    }
+
+    public void setNodeMessagePropagation(boolean nodeMessagePropagation) {
+        this.nodeMessagePropagation = nodeMessagePropagation;
+    }
+
+    void setClusterNode(RedisClusterNode clusterNode) {
+        this.clusterNode = clusterNode;
+    }
+
+    protected void notifyListeners(PubSubOutput<K, V, V> output) {
+        // update listeners
+        switch (output.type()) {
+            case message:
+                multicast.message(clusterNode, output.channel(), output.get());
+                break;
+            case pmessage:
+                multicast.message(clusterNode, output.pattern(), output.channel(), output.get());
+                break;
+            case psubscribe:
+                multicast.psubscribed(clusterNode, output.pattern(), output.count());
+                break;
+            case punsubscribe:
+                multicast.punsubscribed(clusterNode, output.pattern(), output.count());
+                break;
+            case subscribe:
+                multicast.subscribed(clusterNode, output.channel(), output.count());
+                break;
+            case unsubscribe:
+                multicast.unsubscribed(clusterNode, output.channel(), output.count());
+                break;
+            default:
+                throw new UnsupportedOperationException("Operation " + output.type() + " not supported");
+        }
+    }
+
+    private class UpstreamMessageListener extends NotifyingMessageListener {
+
+        @Override
+        public void message(RedisClusterNode node, K channel, V message) {
+
+            if (nodeMessagePropagation) {
+                super.message(node, channel, message);
+            }
+        }
+
+        @Override
+        public void message(RedisClusterNode node, K pattern, K channel, V message) {
+
+            if (nodeMessagePropagation) {
+                super.message(node, pattern, channel, message);
+            }
+        }
+
+        @Override
+        public void subscribed(RedisClusterNode node, K channel, long count) {
+
+            if (nodeMessagePropagation) {
+                super.subscribed(node, channel, count);
+            }
+        }
+
+        @Override
+        public void psubscribed(RedisClusterNode node, K pattern, long count) {
+
+            if (nodeMessagePropagation) {
+                super.psubscribed(node, pattern, count);
+            }
+        }
+
+        @Override
+        public void unsubscribed(RedisClusterNode node, K channel, long count) {
+
+            if (nodeMessagePropagation) {
+                super.unsubscribed(node, channel, count);
+            }
+        }
+
+        @Override
+        public void punsubscribed(RedisClusterNode node, K pattern, long count) {
+
+            if (nodeMessagePropagation) {
+                super.punsubscribed(node, pattern, count);
+            }
+        }
+    }
+
+    private class NotifyingMessageListener extends RedisClusterPubSubAdapter<K, V> {
+
+        @Override
+        public void message(RedisClusterNode node, K channel, V message) {
+
+            getListeners().forEach(listener -> listener.message(channel, message));
+            clusterListeners.forEach(listener -> listener.message(node, channel, message));
+        }
+
+        @Override
+        public void message(RedisClusterNode node, K pattern, K channel, V message) {
+
+            getListeners().forEach(listener -> listener.message(pattern, channel, message));
+            clusterListeners.forEach(listener -> listener.message(node, pattern, channel, message));
+        }
+
+        @Override
+        public void subscribed(RedisClusterNode node, K channel, long count) {
+
+            getListeners().forEach(listener -> listener.subscribed(channel, count));
+            clusterListeners.forEach(listener -> listener.subscribed(node, channel, count));
+        }
+
+        @Override
+        public void psubscribed(RedisClusterNode node, K pattern, long count) {
+
+            getListeners().forEach(listener -> listener.psubscribed(pattern, count));
+            clusterListeners.forEach(listener -> listener.psubscribed(node, pattern, count));
+        }
+
+        @Override
+        public void unsubscribed(RedisClusterNode node, K channel, long count) {
+
+            getListeners().forEach(listener -> listener.unsubscribed(channel, count));
+            clusterListeners.forEach(listener -> listener.unsubscribed(node, channel, count));
+        }
+
+        @Override
+        public void punsubscribed(RedisClusterNode node, K pattern, long count) {
+
+            getListeners().forEach(listener -> listener.punsubscribed(pattern, count));
+            clusterListeners.forEach(listener -> listener.punsubscribed(node, pattern, count));
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index fa2861ac0f..0cfedb6788 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -36,6 +36,7 @@
 import com.lambdaworks.redis.cluster.event.ClusterTopologyChangedEvent;
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection;
 import com.lambdaworks.redis.cluster.topology.ClusterTopologyRefresh;
 import com.lambdaworks.redis.cluster.topology.NodeConnectionFactory;
 import com.lambdaworks.redis.cluster.topology.TopologyComparators;
@@ -44,9 +45,8 @@
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.internal.LettuceLists;
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
-import com.lambdaworks.redis.protocol.DefaultEndpoint;
 import com.lambdaworks.redis.protocol.CommandHandler;
+import com.lambdaworks.redis.protocol.DefaultEndpoint;
 import com.lambdaworks.redis.pubsub.PubSubCommandHandler;
 import com.lambdaworks.redis.pubsub.PubSubEndpoint;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
@@ -344,7 +344,7 @@ public <K, V> StatefulRedisClusterConnection<K, V> connect(RedisCodec<K, V> code
      *
      * @return A new stateful Redis Cluster connection
      */
-    public StatefulRedisPubSubConnection<String, String> connectPubSub() {
+    public StatefulRedisClusterPubSubConnection<String, String> connectPubSub() {
         return connectPubSub(newStringStringCodec());
     }
 
@@ -368,11 +368,10 @@ public StatefulRedisPubSubConnection<String, String> connectPubSub() {
      * @return A new stateful Redis Cluster connection
      */
     @SuppressWarnings("unchecked")
-    public <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec) {
+    public <K, V> StatefulRedisClusterPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec) {
         return connectClusterPubSubImpl(codec);
     }
 
-
     protected StatefulRedisConnection<String, String> connectToNode(final SocketAddress socketAddress) {
         return connectToNode(newStringStringCodec(), socketAddress.toString(), null, new Supplier<SocketAddress>() {
             @Override
@@ -419,6 +418,43 @@ <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, Strin
         return connection;
     }
 
+    /**
+     * Create a pub/sub connection to a redis socket address.
+     *
+     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
+     * @param nodeId the nodeId
+     * @param socketAddressSupplier supplier for the socket address
+     * @param <K> Key type
+     * @param <V> Value type
+     * @return A new connection
+     */
+    <K, V> StatefulRedisPubSubConnection<K, V> connectPubSubToNode(RedisCodec<K, V> codec, String nodeId,
+            final Supplier<SocketAddress> socketAddressSupplier) {
+
+        assertNotNull(codec);
+        assertNotEmpty(initialUris);
+
+        LettuceAssert.notNull(socketAddressSupplier, "SocketAddressSupplier must not be null");
+
+        logger.debug("connectPubSubToNode(" + nodeId + ")");
+
+        PubSubEndpoint endpoint = new PubSubEndpoint(clientOptions);
+        StatefulRedisPubSubConnectionImpl<K, V> connection = new StatefulRedisPubSubConnectionImpl<>(endpoint, endpoint, codec,
+                timeout, unit);
+
+        try {
+            connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier,
+                    () -> new PubSubCommandHandler<K, V>(clientResources, codec, endpoint));
+
+            connection.registerCloseables(closeableResources, connection);
+        } catch (RedisException e) {
+            connection.close();
+            throw e;
+        }
+        return connection;
+
+    }
+
     /**
      * Create a clustered pub/sub connection with command distributor.
      *
@@ -441,8 +477,8 @@ <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K,
 
         DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
 
-        ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions,
-                endpoint, clusterTopologyRefreshScheduler, getResources().eventExecutorGroup());
+        ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, endpoint,
+                clusterTopologyRefreshScheduler, getResources().eventExecutorGroup());
         PooledClusterConnectionProvider<K, V> pooledClusterConnectionProvider = new PooledClusterConnectionProvider<K, V>(this,
                 clusterWriter, codec);
 
@@ -490,7 +526,7 @@ <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K,
      * @param <V> Value type
      * @return a new connection
      */
-    <K, V> StatefulRedisPubSubConnectionImpl<K, V> connectClusterPubSubImpl(RedisCodec<K, V> codec) {
+    <K, V> StatefulRedisClusterPubSubConnection<K, V> connectClusterPubSubImpl(RedisCodec<K, V> codec) {
 
         if (partitions == null) {
             initializePartitions();
@@ -502,19 +538,20 @@ <K, V> StatefulRedisPubSubConnectionImpl<K, V> connectClusterPubSubImpl(RedisCod
 
         Supplier<SocketAddress> socketAddressSupplier = getSocketAddressSupplier(TopologyComparators::sortByClientCount);
 
-        PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<K, V>(clientOptions);
+        PubSubClusterEndpoint<K, V> endpoint = new PubSubClusterEndpoint<K, V>(clientOptions);
 
         ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, endpoint,
                 clusterTopologyRefreshScheduler, getResources().eventExecutorGroup());
-        PooledClusterConnectionProvider<K, V> pooledClusterConnectionProvider = new PooledClusterConnectionProvider<K, V>(this,
-                clusterWriter, codec);
 
-        clusterWriter.setClusterConnectionProvider(pooledClusterConnectionProvider);
+        StatefulRedisClusterPubSubConnectionImpl<K, V> connection = new StatefulRedisClusterPubSubConnectionImpl<>(endpoint,
+                clusterWriter, codec, timeout, unit);
 
-        StatefulRedisPubSubConnectionImpl<K, V> connection = new StatefulRedisPubSubConnectionImpl<>(endpoint, clusterWriter,
-                codec, timeout, unit);
+        ClusterPubSubConnectionProvider<K, V> pooledClusterConnectionProvider = new ClusterPubSubConnectionProvider<>(this,
+                clusterWriter, codec, connection.getUpstreamListener());
 
-        clusterWriter.setPartitions(partitions);
+        clusterWriter.setClusterConnectionProvider(pooledClusterConnectionProvider);
+
+        connection.setPartitions(partitions);
 
         boolean connected = false;
         RedisException causingException = null;
@@ -534,7 +571,9 @@ <K, V> StatefulRedisPubSubConnectionImpl<K, V> connectClusterPubSubImpl(RedisCod
 
         if (!connected) {
             connection.close();
-            throw causingException;
+            if (causingException != null) {
+                throw causingException;
+            }
         }
 
         connection.registerCloseables(closeableResources, connection, clusterWriter, pooledClusterConnectionProvider);
@@ -568,8 +607,8 @@ private <K, V> void connectStateful(StatefulRedisConnectionImpl<K, V> connection
      *
      */
     private <K, V> void connectStateful(DefaultEndpoint endpoint, StatefulRedisClusterConnectionImpl<K, V> connection,
-                                        RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier,
-                                        Supplier<CommandHandler> commandHandlerSupplier) {
+            RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier,
+            Supplier<CommandHandler> commandHandlerSupplier) {
 
         connectStateful0(connection, endpoint, connectionSettings, socketAddressSupplier, commandHandlerSupplier);
 
@@ -639,6 +678,10 @@ protected void updatePartitionsInConnections() {
         forEachClusterConnection(input -> {
             input.setPartitions(partitions);
         });
+
+        forEachClusterPubSubConnection(input -> {
+            input.setPartitions(partitions);
+        });
     }
 
     protected void initializePartitions() {
@@ -805,6 +848,10 @@ protected void forEachClusterConnection(Consumer<StatefulRedisClusterConnectionI
         forEachCloseable(input -> input instanceof StatefulRedisClusterConnectionImpl, function);
     }
 
+    protected void forEachClusterPubSubConnection(Consumer<StatefulRedisClusterPubSubConnectionImpl<?, ?>> function) {
+        forEachCloseable(input -> input instanceof StatefulRedisClusterPubSubConnectionImpl, function);
+    }
+
     protected <T extends Closeable> void forEachCloseable(Predicate<? super Closeable> selector, Consumer<T> function) {
         for (Closeable c : closeableResources) {
             if (selector.test(c)) {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubAsyncCommandsImpl.java
new file mode 100644
index 0000000000..9d1deadcb8
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubAsyncCommandsImpl.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster;
+
+import static com.lambdaworks.redis.cluster.NodeSelectionInvocationHandler.ExecutionModel.ASYNC;
+
+import java.lang.reflect.Proxy;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection;
+import com.lambdaworks.redis.cluster.pubsub.api.async.NodeSelectionPubSubAsyncCommands;
+import com.lambdaworks.redis.cluster.pubsub.api.async.PubSubAsyncNodeSelection;
+import com.lambdaworks.redis.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.pubsub.RedisPubSubAsyncCommandsImpl;
+import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
+import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
+
+/**
+ * @author Mark Paluch
+ */
+class RedisClusterPubSubAsyncCommandsImpl<K, V> extends RedisPubSubAsyncCommandsImpl<K, V>
+        implements RedisClusterPubSubAsyncCommands<K, V> {
+
+    /**
+     * Initialize a new connection.
+     *
+     * @param connection the connection .
+     * @param codec Codec used to encode/decode keys and values.
+     */
+    public RedisClusterPubSubAsyncCommandsImpl(StatefulRedisClusterPubSubConnection<K, V> connection, RedisCodec<K, V> codec) {
+        super(connection, codec);
+    }
+
+    @Override
+    public StatefulRedisClusterPubSubConnection<K, V> getStatefulConnection() {
+        return (StatefulRedisClusterPubSubConnection<K, V>) super.getStatefulConnection();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public PubSubAsyncNodeSelection<K, V> nodes(Predicate<RedisClusterNode> predicate) {
+
+        PubSubAsyncNodeSelection<K, V> selection = new StaticPubSubAsyncNodeSelection<>(getStatefulConnection(), predicate);
+
+        NodeSelectionInvocationHandler h = new NodeSelectionInvocationHandler((AbstractNodeSelection<?, ?, ?, ?>) selection,
+                RedisPubSubAsyncCommands.class, ASYNC);
+        return (PubSubAsyncNodeSelection<K, V>) Proxy.newProxyInstance(NodeSelectionSupport.class.getClassLoader(),
+                new Class<?>[] { NodeSelectionPubSubAsyncCommands.class, PubSubAsyncNodeSelection.class }, h);
+    }
+
+    private static class StaticPubSubAsyncNodeSelection<K, V>
+            extends AbstractNodeSelection<RedisPubSubAsyncCommands<K, V>, NodeSelectionPubSubAsyncCommands<K, V>, K, V>
+            implements PubSubAsyncNodeSelection<K, V> {
+
+        private final List<RedisClusterNode> redisClusterNodes;
+        private final ClusterDistributionChannelWriter writer;
+
+        @SuppressWarnings("unchecked")
+        public StaticPubSubAsyncNodeSelection(StatefulRedisClusterPubSubConnection<K, V> globalConnection,
+                Predicate<RedisClusterNode> selector) {
+
+            this.redisClusterNodes = globalConnection.getPartitions().getPartitions().stream().filter(selector)
+                    .collect(Collectors.toList());
+            writer = ((StatefulRedisClusterPubSubConnectionImpl) globalConnection).getClusterDistributionChannelWriter();
+        }
+
+        @Override
+        protected RedisPubSubAsyncCommands<K, V> getApi(RedisClusterNode redisClusterNode) {
+            return getConnection(redisClusterNode).async();
+        }
+
+        protected List<RedisClusterNode> nodes() {
+            return redisClusterNodes;
+        }
+
+        @SuppressWarnings("unchecked")
+        protected StatefulRedisPubSubConnection<K, V> getConnection(RedisClusterNode redisClusterNode) {
+            RedisURI uri = redisClusterNode.getUri();
+            return (StatefulRedisPubSubConnection<K, V>) writer.getClusterConnectionProvider()
+                    .getConnection(ClusterConnectionProvider.Intent.WRITE, uri.getHost(), uri.getPort());
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubReactiveCommandsImpl.java
new file mode 100644
index 0000000000..46bc3f1592
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubReactiveCommandsImpl.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster;
+
+import static com.lambdaworks.redis.cluster.NodeSelectionInvocationHandler.ExecutionModel.REACTIVE;
+
+import java.lang.reflect.Proxy;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection;
+import com.lambdaworks.redis.cluster.pubsub.api.reactive.NodeSelectionPubSubReactiveCommands;
+import com.lambdaworks.redis.cluster.pubsub.api.reactive.PubSubReactiveNodeSelection;
+import com.lambdaworks.redis.cluster.pubsub.api.reactive.RedisClusterPubSubReactiveCommands;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.pubsub.RedisPubSubReactiveCommandsImpl;
+import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
+import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands;
+
+/**
+ * @author Mark Paluch
+ */
+class RedisClusterPubSubReactiveCommandsImpl<K, V> extends RedisPubSubReactiveCommandsImpl<K, V>
+        implements RedisClusterPubSubReactiveCommands<K, V> {
+
+    /**
+     * Initialize a new connection.
+     *
+     * @param connection the connection .
+     * @param codec Codec used to encode/decode keys and values.
+     */
+    public RedisClusterPubSubReactiveCommandsImpl(StatefulRedisClusterPubSubConnection<K, V> connection,
+            RedisCodec<K, V> codec) {
+        super(connection, codec);
+    }
+
+    @Override
+    public StatefulRedisClusterPubSubConnection<K, V> getStatefulConnection() {
+        return (StatefulRedisClusterPubSubConnection<K, V>) super.getStatefulConnection();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public PubSubReactiveNodeSelection<K, V> nodes(Predicate<RedisClusterNode> predicate) {
+
+        PubSubReactiveNodeSelection<K, V> selection = new StaticPubSubReactiveNodeSelection<K, V>(getStatefulConnection(),
+                predicate);
+
+        NodeSelectionInvocationHandler h = new NodeSelectionInvocationHandler((AbstractNodeSelection<?, ?, ?, ?>) selection,
+                RedisPubSubReactiveCommands.class, REACTIVE);
+        return (PubSubReactiveNodeSelection<K, V>) Proxy.newProxyInstance(NodeSelectionSupport.class.getClassLoader(),
+                new Class<?>[] { NodeSelectionPubSubReactiveCommands.class, PubSubReactiveNodeSelection.class }, h);
+    }
+
+    private static class StaticPubSubReactiveNodeSelection<K, V>
+            extends AbstractNodeSelection<RedisPubSubReactiveCommands<K, V>, NodeSelectionPubSubReactiveCommands<K, V>, K, V>
+            implements PubSubReactiveNodeSelection<K, V> {
+
+        private final List<RedisClusterNode> redisClusterNodes;
+        private final ClusterDistributionChannelWriter writer;
+
+        @SuppressWarnings("unchecked")
+        public StaticPubSubReactiveNodeSelection(StatefulRedisClusterPubSubConnection<K, V> globalConnection,
+                Predicate<RedisClusterNode> selector) {
+
+            this.redisClusterNodes = globalConnection.getPartitions().getPartitions().stream().filter(selector)
+                    .collect(Collectors.toList());
+            writer = ((StatefulRedisClusterPubSubConnectionImpl) globalConnection).getClusterDistributionChannelWriter();
+        }
+
+        @Override
+        protected RedisPubSubReactiveCommands<K, V> getApi(RedisClusterNode redisClusterNode) {
+            return getConnection(redisClusterNode).reactive();
+        }
+
+        protected List<RedisClusterNode> nodes() {
+            return redisClusterNodes;
+        }
+
+        @SuppressWarnings("unchecked")
+        protected StatefulRedisPubSubConnection<K, V> getConnection(RedisClusterNode redisClusterNode) {
+            RedisURI uri = redisClusterNode.getUri();
+            return (StatefulRedisPubSubConnection<K, V>) writer.getClusterConnectionProvider()
+                    .getConnection(ClusterConnectionProvider.Intent.WRITE, uri.getHost(), uri.getPort());
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterPubSubConnectionImpl.java b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterPubSubConnectionImpl.java
new file mode 100644
index 0000000000..4f6e3f2656
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterPubSubConnectionImpl.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+import java.util.concurrent.TimeUnit;
+
+import com.lambdaworks.redis.AbstractRedisClient;
+import com.lambdaworks.redis.RedisChannelWriter;
+import com.lambdaworks.redis.RedisException;
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.cluster.models.partitions.Partitions;
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.redis.cluster.pubsub.RedisClusterPubSubListener;
+import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection;
+import com.lambdaworks.redis.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands;
+import com.lambdaworks.redis.cluster.pubsub.api.reactive.RedisClusterPubSubReactiveCommands;
+import com.lambdaworks.redis.cluster.pubsub.api.sync.NodeSelectionPubSubCommands;
+import com.lambdaworks.redis.cluster.pubsub.api.sync.PubSubNodeSelection;
+import com.lambdaworks.redis.cluster.pubsub.api.sync.RedisClusterPubSubCommands;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.pubsub.RedisPubSubAsyncCommandsImpl;
+import com.lambdaworks.redis.pubsub.RedisPubSubReactiveCommandsImpl;
+import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
+import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl;
+import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
+import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
+
+/**
+ * @author Mark Paluch
+ */
+class StatefulRedisClusterPubSubConnectionImpl<K, V> extends StatefulRedisPubSubConnectionImpl<K, V>
+        implements StatefulRedisClusterPubSubConnection<K, V> {
+
+    private final PubSubClusterEndpoint<K, V> endpoint;
+    private volatile Partitions partitions;
+
+    /**
+     * Initialize a new connection.
+     *
+     * @param writer the channel writer
+     * @param codec Codec used to encode/decode keys and values.
+     * @param timeout Maximum time to wait for a response.
+     * @param unit Unit of time for the timeout.
+     */
+    public StatefulRedisClusterPubSubConnectionImpl(PubSubClusterEndpoint<K, V> endpoint, RedisChannelWriter writer,
+            RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
+
+        super(endpoint, writer, codec, timeout, unit);
+        this.endpoint = endpoint;
+    }
+
+    @Override
+    public RedisClusterPubSubAsyncCommands<K, V> async() {
+        return (RedisClusterPubSubAsyncCommands<K, V>) super.async();
+    }
+
+    @Override
+    protected RedisPubSubAsyncCommandsImpl<K, V> newRedisAsyncCommandsImpl() {
+        return new RedisClusterPubSubAsyncCommandsImpl<>(this, codec);
+    }
+
+    @Override
+    public RedisClusterPubSubCommands<K, V> sync() {
+        return (RedisClusterPubSubCommands<K, V>) super.sync();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected RedisPubSubCommands<K, V> newRedisSyncCommandsImpl() {
+
+        return (RedisPubSubCommands) Proxy.newProxyInstance(AbstractRedisClient.class.getClassLoader(),
+                new Class<?>[] { RedisClusterPubSubCommands.class, RedisPubSubCommands.class }, syncInvocationHandler());
+    }
+
+    private InvocationHandler syncInvocationHandler() {
+        return new ClusterFutureSyncInvocationHandler<K, V>(this, RedisPubSubAsyncCommands.class, PubSubNodeSelection.class,
+                NodeSelectionPubSubCommands.class, async());
+    }
+
+    @Override
+    public RedisClusterPubSubReactiveCommands<K, V> reactive() {
+        return (RedisClusterPubSubReactiveCommands<K, V>) super.reactive();
+    }
+
+    @Override
+    protected RedisPubSubReactiveCommandsImpl<K, V> newRedisReactiveCommandsImpl() {
+        return new RedisClusterPubSubReactiveCommandsImpl<K, V>(this, codec);
+    }
+
+    @Override
+    public void activated() {
+        super.activated();
+        async().clusterMyId().thenAccept(nodeId -> endpoint.setClusterNode(partitions.getPartitionByNodeId(nodeId)));
+    }
+
+    @Override
+    public StatefulRedisPubSubConnection<K, V> getConnection(String nodeId) {
+
+        RedisURI redisURI = lookup(nodeId);
+
+        if (redisURI == null) {
+            throw new RedisException("NodeId " + nodeId + " does not belong to the cluster");
+        }
+
+        return (StatefulRedisPubSubConnection<K, V>) getClusterDistributionChannelWriter().getClusterConnectionProvider()
+                .getConnection(ClusterConnectionProvider.Intent.WRITE, nodeId);
+    }
+
+    @Override
+    public StatefulRedisPubSubConnection<K, V> getConnection(String host, int port) {
+
+        return (StatefulRedisPubSubConnection<K, V>) getClusterDistributionChannelWriter().getClusterConnectionProvider()
+                .getConnection(ClusterConnectionProvider.Intent.WRITE, host, port);
+    }
+
+    public void setPartitions(Partitions partitions) {
+        this.partitions = partitions;
+        getClusterDistributionChannelWriter().setPartitions(partitions);
+    }
+
+    public Partitions getPartitions() {
+        return partitions;
+    }
+
+    @Override
+    public void setNodeMessagePropagation(boolean enabled) {
+        this.endpoint.setNodeMessagePropagation(enabled);
+    }
+
+    /**
+     * Add a new {@link RedisClusterPubSubListener listener}.
+     *
+     * @param listener the listener, must not be {@literal null}.
+     */
+    @Override
+    public void addListener(RedisClusterPubSubListener<K, V> listener) {
+        endpoint.addListener(listener);
+    }
+
+    /**
+     * Remove an existing {@link RedisClusterPubSubListener listener}.
+     *
+     * @param listener the listener, must not be {@literal null}.
+     */
+    @Override
+    public void removeListener(RedisClusterPubSubListener<K, V> listener) {
+        endpoint.removeListener(listener);
+    }
+
+    RedisClusterPubSubListener<K, V> getUpstreamListener() {
+        return endpoint.getUpstreamListener();
+    }
+
+    protected ClusterDistributionChannelWriter getClusterDistributionChannelWriter() {
+        return (ClusterDistributionChannelWriter) super.getChannelWriter();
+    }
+
+    private RedisURI lookup(String nodeId) {
+
+        for (RedisClusterNode partition : partitions) {
+            if (partition.getNodeId().equals(nodeId)) {
+                return partition.getUri();
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/ReactiveExecutions.java b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/ReactiveExecutions.java
index 9c8203191b..264b234d4a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/ReactiveExecutions.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/reactive/ReactiveExecutions.java
@@ -20,7 +20,6 @@
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 
 import reactor.core.publisher.Flux;
-import rx.Observable;
 
 /**
  * Execution holder for a reactive command to be executed on multiple nodes.
@@ -31,7 +30,7 @@
 public interface ReactiveExecutions<T> {
 
     /**
-     * Return an {@link Observable} that contains a combined stream of the multi-node execution.
+     * Return a {@link Flux} that contains a combined stream of the multi-node execution.
      * 
      * @return
      */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubAdapter.java b/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubAdapter.java
new file mode 100644
index 0000000000..4b279848de
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubAdapter.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.pubsub;
+
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+
+/**
+ * Convenience adapter with an empty implementation of all {@link RedisClusterPubSubListener} callback methods.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public class RedisClusterPubSubAdapter<K, V> implements RedisClusterPubSubListener<K, V> {
+
+    @Override
+    public void message(RedisClusterNode node, K channel, V message) {
+        // empty adapter method
+    }
+
+    @Override
+    public void message(RedisClusterNode node, K pattern, K channel, V message) {
+        // empty adapter method
+    }
+
+    @Override
+    public void subscribed(RedisClusterNode node, K channel, long count) {
+        // empty adapter method
+    }
+
+    @Override
+    public void psubscribed(RedisClusterNode node, K pattern, long count) {
+        // empty adapter method
+    }
+
+    @Override
+    public void unsubscribed(RedisClusterNode node, K channel, long count) {
+        // empty adapter method
+    }
+
+    @Override
+    public void punsubscribed(RedisClusterNode node, K pattern, long count) {
+        // empty adapter method
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubListener.java b/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubListener.java
new file mode 100644
index 0000000000..b3ab77f8c8
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubListener.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.pubsub;
+
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+
+/**
+ * Interface for Redis Cluster Pub/Sub listeners.
+ * 
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public interface RedisClusterPubSubListener<K, V> {
+
+    /**
+     * Message received from a channel subscription.
+     * 
+     * @param channel Channel.
+     * @param message Message.
+     */
+    void message(RedisClusterNode node, K channel, V message);
+
+    /**
+     * Message received from a pattern subscription.
+     * 
+     * @param pattern Pattern
+     * @param channel Channel
+     * @param message Message
+     */
+    void message(RedisClusterNode node, K pattern, K channel, V message);
+
+    /**
+     * Subscribed to a channel.
+     * 
+     * @param channel Channel
+     * @param count Subscription count.
+     */
+    void subscribed(RedisClusterNode node, K channel, long count);
+
+    /**
+     * Subscribed to a pattern.
+     * 
+     * @param pattern Pattern.
+     * @param count Subscription count.
+     */
+    void psubscribed(RedisClusterNode node, K pattern, long count);
+
+    /**
+     * Unsubscribed from a channel.
+     * 
+     * @param channel Channel
+     * @param count Subscription count.
+     */
+    void unsubscribed(RedisClusterNode node, K channel, long count);
+
+    /**
+     * Unsubscribed from a pattern.
+     * 
+     * @param pattern Channel
+     * @param count Subscription count.
+     */
+    void punsubscribed(RedisClusterNode node, K pattern, long count);
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/StatefulRedisClusterPubSubConnection.java b/src/main/java/com/lambdaworks/redis/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
new file mode 100644
index 0000000000..a0e9358256
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.pubsub;
+
+import java.util.function.Predicate;
+
+import com.lambdaworks.redis.RedisException;
+import com.lambdaworks.redis.cluster.ClusterClientOptions;
+import com.lambdaworks.redis.cluster.api.sync.NodeSelection;
+import com.lambdaworks.redis.cluster.models.partitions.Partitions;
+import com.lambdaworks.redis.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands;
+import com.lambdaworks.redis.cluster.pubsub.api.reactive.RedisClusterPubSubReactiveCommands;
+import com.lambdaworks.redis.cluster.pubsub.api.sync.RedisClusterPubSubCommands;
+import com.lambdaworks.redis.pubsub.RedisPubSubListener;
+import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
+
+/**
+ * A stateful Pub/Sub connection for Redis Cluster use. This connection type is intended for Pub/Sub messaging with Redis
+ * Cluster. The connection provides transparent command routing based on the first command key.
+ * <p>
+ * This connection allows publishing and subscription to Pub/Sub messages within a Redis Cluster. Due to Redis Cluster's nature,
+ * messages are broadcasted across the cluster and a client can connect to any arbitrary node to participate with a
+ * subscription.
+ *
+ * <pre>
+ *     <code>
+ *  StatefulRedisClusterPubSubConnection<String, String> connection = clusterClient.connectPubSub();
+ *  connection.addListener(…);
+ *
+ *  RedisClusterPubSubCommands<String, String> sync = connection.sync();
+ *  sync.subscribe("channel");
+ *  sync.publish("channel", "message");
+ *     </code>
+ * </pre>
+ *
+ * <h3>Keyspace notifications</h3> Redis clients can subscribe to user-space Pub/Sub messages and Redis keyspace notifications.
+ * Other than user-space Pub/Sub messages are Keyspace notifications not broadcasted to the whole cluster. They stay node-local.
+ * Subscription to keyspace notifications requires subscription to the nodes which publish the keyspace notifications.
+ *
+ * <p>
+ * {@link StatefulRedisClusterPubSubConnection} allows node-specific subscriptions and {@link #setNodeMessagePropagation message
+ * propagation}. {@link #setNodeMessagePropagation} can notify a {@link RedisPubSubListener} that requires a single registration
+ * with {@link #addListener(RedisPubSubListener) this connection}. Node-subscriptions are supported on
+ * {@link #getConnection(String, int) connection} and {@link NodeSelection} levels through
+ * {@link RedisClusterPubSubAsyncCommands#nodes(Predicate) asynchronous}, {@link RedisClusterPubSubCommands#nodes(Predicate)
+ * synchronous}, and {@link RedisClusterPubSubReactiveCommands#nodes(Predicate) reactive} APIs.
+ *
+ * <pre>
+ *     <code>
+ *  StatefulRedisClusterPubSubConnection<String, String> connection = clusterClient.connectPubSub();
+ *  connection.addListener(…);
+ *
+ *  RedisClusterPubSubCommands<String, String> sync = connection.sync();
+ *  sync.slaves().commands().psubscribe("__key*__:*");
+ *     </code>
+ * </pre>
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public interface StatefulRedisClusterPubSubConnection<K, V> extends StatefulRedisPubSubConnection<K, V> {
+
+    /**
+     * Returns the {@link RedisClusterPubSubCommands} API for the current connection. Does not create a new connection.
+     *
+     * @return the synchronous API for the underlying connection.
+     */
+    RedisClusterPubSubCommands<K, V> sync();
+
+    /**
+     * Returns the {@link RedisClusterPubSubAsyncCommands} API for the current connection. Does not create a new connection.
+     *
+     * @return the asynchronous API for the underlying connection.
+     */
+    RedisClusterPubSubAsyncCommands<K, V> async();
+
+    /**
+     * Returns the {@link RedisClusterPubSubReactiveCommands} API for the current connection. Does not create a new connection.
+     *
+     * @return the reactive API for the underlying connection.
+     */
+    RedisClusterPubSubReactiveCommands<K, V> reactive();
+
+    /**
+     * Retrieve a connection to the specified cluster node using the nodeId. Host and port are looked up in the node list. This
+     * connection is bound to the node id. Once the cluster topology view is updated, the connection will try to reconnect the
+     * to the node with the specified {@code nodeId}, that behavior can also lead to a closed connection once the node with the
+     * specified {@code nodeId} is no longer part of the cluster.
+     *
+     * Do not close the connections. Otherwise, unpredictable behavior will occur. The nodeId must be part of the cluster and is
+     * validated against the current topology view in {@link com.lambdaworks.redis.cluster.models.partitions.Partitions}.
+     *
+     * @param nodeId the node Id
+     * @return a connection to the requested cluster node
+     * @throws RedisException if the requested node identified by {@code nodeId} is not part of the cluster
+     */
+    StatefulRedisPubSubConnection<K, V> getConnection(String nodeId);
+
+    /**
+     * Retrieve a connection to the specified cluster node using host and port. This connection is bound to a host and port.
+     * Updates to the cluster topology view can close the connection once the host, identified by {@code host} and {@code port},
+     * are no longer part of the cluster.
+     *
+     * Do not close the connections. Otherwise, unpredictable behavior will occur. Host and port connections are verified by
+     * default for cluster membership, see {@link ClusterClientOptions#isValidateClusterNodeMembership()}.
+     *
+     * @param host the host
+     * @param port the port
+     * @return a connection to the requested cluster node
+     * @throws RedisException if the requested node identified by {@code host} and {@code port} is not part of the cluster
+     */
+    StatefulRedisPubSubConnection<K, V> getConnection(String host, int port);
+
+    /**
+     * @return Known partitions for this connection.
+     */
+    Partitions getPartitions();
+
+    /**
+     * Enables/disables node message propagation to {@code this} {@link StatefulRedisClusterPubSubConnection connections}
+     * {@link RedisPubSubListener listeners}.
+     * <p>
+     * If {@code enabled} is {@literal true}, then Pub/Sub messages received on node-specific connections are propagated to this
+     * connection facade. Registered {@link RedisPubSubListener} will receive messages from individual node subscriptions.
+     * <p>
+     * Node event propagation is disabled by default.
+     * 
+     * @param enabled {@literal true} to enable node message propagation; {@literal false} (default) to disable message
+     *        propagation.
+     */
+    void setNodeMessagePropagation(boolean enabled);
+
+    /**
+     * Add a new {@link RedisClusterPubSubListener listener}.
+     *
+     * @param listener the listener, must not be {@literal null}.
+     */
+    void addListener(RedisClusterPubSubListener<K, V> listener);
+
+    /**
+     * Remove an existing {@link RedisClusterPubSubListener listener}.
+     *
+     * @param listener the listener, must not be {@literal null}.
+     */
+    void removeListener(RedisClusterPubSubListener<K, V> listener);
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
new file mode 100644
index 0000000000..10e367ae1b
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.pubsub.api.async;
+
+import com.lambdaworks.redis.cluster.api.async.AsyncExecutions;
+
+/**
+ * Asynchronous executed commands on a node selection for Pub/Sub.
+ * 
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public interface NodeSelectionPubSubAsyncCommands<K, V> {
+
+    /**
+     * Listen for messages published to channels matching the given patterns.
+     *
+     * @param patterns the patterns
+     * @return RedisFuture&lt;Void&gt; Future to synchronize {@code psubscribe} completion
+     */
+    AsyncExecutions<Void> psubscribe(K... patterns);
+
+    /**
+     * Stop listening for messages posted to channels matching the given patterns.
+     *
+     * @param patterns the patterns
+     * @return RedisFuture&lt;Void&gt; Future to synchronize {@code punsubscribe} completion
+     */
+    AsyncExecutions<Void> punsubscribe(K... patterns);
+
+    /**
+     * Listen for messages published to the given channels.
+     *
+     * @param channels the channels
+     * @return RedisFuture&lt;Void&gt; Future to synchronize {@code subscribe} completion
+     */
+    AsyncExecutions<Void> subscribe(K... channels);
+
+    /**
+     * Stop listening for messages posted to the given channels.
+     *
+     * @param channels the channels
+     * @return RedisFuture&lt;Void&gt; Future to synchronize {@code unsubscribe} completion.
+     */
+    AsyncExecutions<Void> unsubscribe(K... channels);
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
new file mode 100644
index 0000000000..cb08366da9
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.pubsub.api.async;
+
+import com.lambdaworks.redis.api.async.RedisAsyncCommands;
+import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
+import com.lambdaworks.redis.cluster.api.async.NodeSelectionAsyncCommands;
+import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
+
+/**
+ * Node selection with access to asynchronous executed commands on the set. This API is subject to incompatible changes in a
+ * future release. The API is exempt from any compatibility guarantees made by lettuce. The current state implies nothing about
+ * the quality or performance of the API in question, only the fact that it is not "API-frozen."
+ *
+ * The NodeSelection command API and its result types are a base for discussions.
+ * 
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public interface PubSubAsyncNodeSelection<K, V> extends
+        NodeSelectionSupport<RedisPubSubAsyncCommands<K, V>, NodeSelectionPubSubAsyncCommands<K, V>> {
+
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
new file mode 100644
index 0000000000..39d6826233
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.pubsub.api.async;
+
+import java.util.function.Predicate;
+
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection;
+import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
+
+/**
+ * Asynchronous and thread-safe Redis Cluster PubSub API. Operations are executed either on the main connection or a
+ * {@link PubSubAsyncNodeSelection}.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public interface RedisClusterPubSubAsyncCommands<K, V> extends RedisPubSubAsyncCommands<K, V> {
+
+    /**
+     * @return the underlying connection.
+     */
+    StatefulRedisClusterPubSubConnection<K, V> getStatefulConnection();
+
+    /**
+     * Select all masters.
+     *
+     * @return API with asynchronous executed commands on a selection of master cluster nodes.
+     */
+    default PubSubAsyncNodeSelection<K, V> masters() {
+        return nodes(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.MASTER));
+    }
+
+    /**
+     * Select all slaves.
+     *
+     * @return API with asynchronous executed commands on a selection of slave cluster nodes.
+     */
+    default PubSubAsyncNodeSelection<K, V> slaves() {
+        return nodes(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+    }
+
+    /**
+     * Select all slaves.
+     *
+     * @param predicate Predicate to filter nodes
+     * @return API with asynchronous executed commands on a selection of slave cluster nodes.
+     */
+    default PubSubAsyncNodeSelection<K, V> slaves(Predicate<RedisClusterNode> predicate) {
+        return nodes(
+                redisClusterNode -> predicate.test(redisClusterNode) && redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+    }
+
+    /**
+     * Select all known cluster nodes.
+     *
+     * @return API with asynchronous executed commands on a selection of all cluster nodes.
+     */
+    default PubSubAsyncNodeSelection<K, V> all() {
+        return nodes(redisClusterNode -> true);
+    }
+
+    /**
+     * Select nodes by a predicate.
+     *
+     * @param predicate Predicate to filter nodes
+     * @return API with asynchronous executed commands on a selection of cluster nodes matching {@code predicate}
+     */
+    PubSubAsyncNodeSelection<K, V> nodes(Predicate<RedisClusterNode> predicate);
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
new file mode 100644
index 0000000000..24dddfe903
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.pubsub.api.reactive;
+
+import com.lambdaworks.redis.cluster.api.reactive.ReactiveExecutions;
+
+/**
+ * Reactive executed commands on a node selection for Pub/Sub.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public interface NodeSelectionPubSubReactiveCommands<K, V> {
+
+    /**
+     * Listen for messages published to channels matching the given patterns.
+     *
+     * @param patterns the patterns
+     * @return RedisFuture&lt;Void&gt; Future to synchronize {@code psubscribe} completion
+     */
+    ReactiveExecutions<Void> psubscribe(K... patterns);
+
+    /**
+     * Stop listening for messages posted to channels matching the given patterns.
+     *
+     * @param patterns the patterns
+     * @return RedisFuture&lt;Void&gt; Future to synchronize {@code punsubscribe} completion
+     */
+    ReactiveExecutions<Void> punsubscribe(K... patterns);
+
+    /**
+     * Listen for messages published to the given channels.
+     *
+     * @param channels the channels
+     * @return RedisFuture&lt;Void&gt; Future to synchronize {@code subscribe} completion
+     */
+    ReactiveExecutions<Void> subscribe(K... channels);
+
+    /**
+     * Stop listening for messages posted to the given channels.
+     *
+     * @param channels the channels
+     * @return RedisFuture&lt;Void&gt; Future to synchronize {@code unsubscribe} completion.
+     */
+    ReactiveExecutions<Void> unsubscribe(K... channels);
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
new file mode 100644
index 0000000000..1125a6abe9
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.pubsub.api.reactive;
+
+import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
+import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands;
+import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
+
+/**
+ * Node selection with access to {@link RedisPubSubCommands}.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public interface PubSubReactiveNodeSelection<K, V>
+        extends NodeSelectionSupport<RedisPubSubReactiveCommands<K, V>, NodeSelectionPubSubReactiveCommands<K, V>> {
+
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
new file mode 100644
index 0000000000..0f15a30a31
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.pubsub.api.reactive;
+
+import java.util.function.Predicate;
+
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection;
+import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands;
+
+/**
+ * Reactive and thread-safe Redis Cluster PubSub API. Operations are executed either on the main connection or a
+ * {@link PubSubReactiveNodeSelection}.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public interface RedisClusterPubSubReactiveCommands<K, V> extends RedisPubSubReactiveCommands<K, V> {
+
+    /**
+     * @return the underlying connection.
+     */
+    StatefulRedisClusterPubSubConnection<K, V> getStatefulConnection();
+
+    /**
+     * Select all masters.
+     *
+     * @return API with asynchronous executed commands on a selection of master cluster nodes.
+     */
+    default PubSubReactiveNodeSelection<K, V> masters() {
+        return nodes(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.MASTER));
+    }
+
+    /**
+     * Select all slaves.
+     *
+     * @return API with asynchronous executed commands on a selection of slave cluster nodes.
+     */
+    default PubSubReactiveNodeSelection<K, V> slaves() {
+        return nodes(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+    }
+
+    /**
+     * Select all slaves.
+     *
+     * @param predicate Predicate to filter nodes
+     * @return API with asynchronous executed commands on a selection of slave cluster nodes.
+     */
+    default PubSubReactiveNodeSelection<K, V> slaves(Predicate<RedisClusterNode> predicate) {
+        return nodes(
+                redisClusterNode -> predicate.test(redisClusterNode) && redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+    }
+
+    /**
+     * Select all known cluster nodes.
+     *
+     * @return API with asynchronous executed commands on a selection of all cluster nodes.
+     */
+    default PubSubReactiveNodeSelection<K, V> all() {
+        return nodes(redisClusterNode -> true);
+    }
+
+    /**
+     * Select nodes by a predicate.
+     *
+     * @param predicate Predicate to filter nodes
+     * @return API with asynchronous executed commands on a selection of cluster nodes matching {@code predicate}
+     */
+    PubSubReactiveNodeSelection<K, V> nodes(Predicate<RedisClusterNode> predicate);
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
new file mode 100644
index 0000000000..87984dfdb1
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.pubsub.api.sync;
+
+import com.lambdaworks.redis.cluster.api.sync.Executions;
+
+/**
+ * Synchronous executed commands on a node selection for Pub/Sub.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public interface NodeSelectionPubSubCommands<K, V> {
+
+    /**
+     * Listen for messages published to channels matching the given patterns.
+     *
+     * @param patterns the patterns
+     * @return Executions to synchronize {@code psubscribe} completion
+     */
+    Executions<Void> psubscribe(K... patterns);
+
+    /**
+     * Stop listening for messages posted to channels matching the given patterns.
+     *
+     * @param patterns the patterns
+     * @return Executions Future to synchronize {@code punsubscribe} completion
+     */
+    Executions<Void> punsubscribe(K... patterns);
+
+    /**
+     * Listen for messages published to the given channels.
+     *
+     * @param channels the channels
+     * @return Executions Future to synchronize {@code subscribe} completion
+     */
+    Executions<Void> subscribe(K... channels);
+
+    /**
+     * Stop listening for messages posted to the given channels.
+     *
+     * @param channels the channels
+     * @return Executions Future to synchronize {@code unsubscribe} completion.
+     */
+    Executions<Void> unsubscribe(K... channels);
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/PubSubNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/PubSubNodeSelection.java
new file mode 100644
index 0000000000..4362952d4b
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/PubSubNodeSelection.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.pubsub.api.sync;
+
+import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
+import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
+
+/**
+ * Node selection with access to {@link RedisPubSubCommands}.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public interface PubSubNodeSelection<K, V>
+        extends NodeSelectionSupport<RedisPubSubCommands<K, V>, NodeSelectionPubSubCommands<K, V>> {
+
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
new file mode 100644
index 0000000000..4bd2df92d3
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.pubsub.api.sync;
+
+import java.util.function.Predicate;
+
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection;
+import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
+
+/**
+ * Synchronous and thread-safe Redis Cluster PubSub API. Operations are executed either on the main connection or a
+ * {@link PubSubNodeSelection}.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public interface RedisClusterPubSubCommands<K, V> extends RedisPubSubCommands<K, V> {
+
+    /**
+     * @return the underlying connection.
+     */
+    StatefulRedisClusterPubSubConnection<K, V> getStatefulConnection();
+
+    /**
+     * Select all masters.
+     *
+     * @return API with asynchronous executed commands on a selection of master cluster nodes.
+     */
+    default PubSubNodeSelection<K, V> masters() {
+        return nodes(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.MASTER));
+    }
+
+    /**
+     * Select all slaves.
+     *
+     * @return API with asynchronous executed commands on a selection of slave cluster nodes.
+     */
+    default PubSubNodeSelection<K, V> slaves() {
+        return nodes(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+    }
+
+    /**
+     * Select all slaves.
+     *
+     * @param predicate Predicate to filter nodes
+     * @return API with asynchronous executed commands on a selection of slave cluster nodes.
+     */
+    default PubSubNodeSelection<K, V> slaves(Predicate<RedisClusterNode> predicate) {
+        return nodes(
+                redisClusterNode -> predicate.test(redisClusterNode) && redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+    }
+
+    /**
+     * Select all known cluster nodes.
+     *
+     * @return API with asynchronous executed commands on a selection of all cluster nodes.
+     */
+    default PubSubNodeSelection<K, V> all() {
+        return nodes(redisClusterNode -> true);
+    }
+
+    /**
+     * Select nodes by a predicate.
+     *
+     * @param predicate Predicate to filter nodes
+     * @return API with asynchronous executed commands on a selection of cluster nodes matching {@code predicate}
+     */
+    PubSubNodeSelection<K, V> nodes(Predicate<RedisClusterNode> predicate);
+}
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java b/src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java
index ffc3682013..fe1817613d 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java
@@ -46,23 +46,27 @@ public PubSubEndpoint(ClientOptions clientOptions) {
     }
 
     /**
-     * Add a new listener.
+     * Add a new {@link RedisPubSubListener listener}.
      *
-     * @param listener Listener.
+     * @param listener the listener, must not be {@literal null}.
      */
     public void addListener(RedisPubSubListener<K, V> listener) {
         listeners.add(listener);
     }
 
     /**
-     * Remove an existing listener.
+     * Remove an existing {@link RedisPubSubListener listener}..
      *
-     * @param listener Listener.
+     * @param listener the listener, must not be {@literal null}.
      */
     public void removeListener(RedisPubSubListener<K, V> listener) {
         listeners.remove(listener);
     }
 
+    protected List<RedisPubSubListener<K, V>> getListeners() {
+        return listeners;
+    }
+
     public Set<K> getChannels() {
         return channels;
     }
@@ -82,7 +86,7 @@ public void notifyMessage(PubSubOutput<K, V, V> output) {
         notifyListeners(output);
     }
 
-    private void notifyListeners(PubSubOutput<K, V, V> output) {
+    protected void notifyListeners(PubSubOutput<K, V, V> output) {
         // update listeners
         for (RedisPubSubListener<K, V> listener : listeners) {
             switch (output.type()) {
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java
index 3a0729cd80..e5d8cbd78e 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java
@@ -59,17 +59,16 @@ public interface StatefulRedisPubSubConnection<K, V> extends StatefulRedisConnec
     RedisPubSubReactiveCommands<K, V> reactive();
 
     /**
-     * Add a new listener.
-     * 
-     * @param listener Listener.
+     * Add a new {@link RedisPubSubListener listener}.
+     *
+     * @param listener the listener, must not be {@literal null}.
      */
     void addListener(RedisPubSubListener<K, V> listener);
 
     /**
-     * Remove an existing listener.
+     * Remove an existing {@link RedisPubSubListener listener}..
      * 
-     * @param listener Listener.
+     * @param listener the listener, must not be {@literal null}.
      */
     void removeListener(RedisPubSubListener<K, V> listener);
-
 }
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
index b7a0c06a06..e0e4b4251b 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
@@ -118,7 +118,7 @@ protected RedisPubSubReactiveCommandsImpl<K, V> newRedisReactiveCommandsImpl() {
 
     /**
      * Re-subscribe to all previously subscribed channels and patterns.
-     * 
+     *
      * @return list of the futures of the {@literal subscribe} and {@literal psubscribe} commands.
      */
     protected List<RedisFuture<Void>> resubscribe() {
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java b/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java
index 77b6b0aed1..3649c08c6e 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java
@@ -20,7 +20,6 @@
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
 
 /**
- * 
  * Synchronous and thread-safe Redis PubSub API.
  * 
  * @param <K> Key type.
diff --git a/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubClusterTest.java b/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubClusterTest.java
index 96b4ffc0e3..b52cf8aedb 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubClusterTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubClusterTest.java
@@ -17,174 +17,178 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
 import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.LinkedBlockingQueue;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.cluster.AbstractClusterTest;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.internal.LettuceFactories;
-import com.lambdaworks.redis.pubsub.RedisPubSubListener;
+import com.lambdaworks.redis.cluster.pubsub.api.async.NodeSelectionPubSubAsyncCommands;
+import com.lambdaworks.redis.cluster.pubsub.api.async.PubSubAsyncNodeSelection;
+import com.lambdaworks.redis.cluster.pubsub.api.reactive.NodeSelectionPubSubReactiveCommands;
+import com.lambdaworks.redis.cluster.pubsub.api.reactive.PubSubReactiveNodeSelection;
+import com.lambdaworks.redis.cluster.pubsub.api.sync.NodeSelectionPubSubCommands;
+import com.lambdaworks.redis.cluster.pubsub.api.sync.PubSubNodeSelection;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
+import com.lambdaworks.redis.support.PubSubTestListener;
 
 /**
  * @author Mark Paluch
  */
-public class PubSubClusterTest extends AbstractClusterTest implements RedisPubSubListener<String, String> {
+public class PubSubClusterTest extends AbstractClusterTest {
 
-    private BlockingQueue<String> channels;
-    private BlockingQueue<String> patterns;
-    private BlockingQueue<String> messages;
-    private BlockingQueue<Long> counts;
+    private PubSubTestListener connectionListener = new PubSubTestListener();
+    private PubSubTestListener nodeListener = new PubSubTestListener();
 
-    private StatefulRedisClusterConnection<String, String> connection;
-    private StatefulRedisPubSubConnection<String, String> pubSubConnection;
+    private StatefulRedisClusterPubSubConnection<String, String> pubSubConnection;
     private StatefulRedisPubSubConnection<String, String> pubSubConnection2;
 
     @Before
     public void openPubSubConnection() throws Exception {
-        connection = clusterClient.connect();
+
         pubSubConnection = clusterClient.connectPubSub();
         pubSubConnection2 = clusterClient.connectPubSub();
-        channels = LettuceFactories.newBlockingQueue();
-        patterns = LettuceFactories.newBlockingQueue();
-        messages = LettuceFactories.newBlockingQueue();
-        counts = LettuceFactories.newBlockingQueue();
+
+        pubSubConnection.addListener(connectionListener);
     }
 
     @After
     public void closePubSubConnection() throws Exception {
-        connection.close();
         pubSubConnection.close();
         pubSubConnection2.close();
     }
 
     @Test
-    public void testRegularClientPubSubChannels() throws Exception {
+    public void testNodeIdSubscription() throws Exception {
+
+        RedisClusterNode partition = pubSubConnection.getPartitions().getPartition(0);
+
+        StatefulRedisPubSubConnection<String, String> node = pubSubConnection.getConnection(partition.getNodeId());
+        node.addListener(nodeListener);
 
-        String nodeId = pubSubConnection.sync().clusterMyId();
-        RedisClusterNode otherNode = getOtherThan(nodeId);
-        pubSubConnection.sync().subscribe(key);
+        node.sync().subscribe("channel");
 
-        List<String> channelsOnSubscribedNode = connection.getConnection(nodeId).sync().pubsubChannels();
-        assertThat(channelsOnSubscribedNode).hasSize(1);
+        pubSubConnection2.sync().publish("channel", "message");
 
-        List<String> channelsOnOtherNode = connection.getConnection(otherNode.getNodeId()).sync().pubsubChannels();
-        assertThat(channelsOnOtherNode).isEmpty();
+        assertThat(nodeListener.getMessages().take()).isEqualTo("message");
+        assertThat(connectionListener.getMessages().poll()).isNull();
     }
 
     @Test
-    public void testRegularClientPublish() throws Exception {
+    public void testNodeMessagePropagationSubscription() throws Exception {
 
-        String nodeId = pubSubConnection.sync().clusterMyId();
-        RedisClusterNode otherNode = getOtherThan(nodeId);
-        pubSubConnection.sync().subscribe(key);
-        pubSubConnection.addListener(this);
+        RedisClusterNode partition = pubSubConnection.getPartitions().getPartition(0);
+        pubSubConnection.setNodeMessagePropagation(true);
 
-        connection.getConnection(nodeId).sync().publish(key, value);
-        assertThat(messages.take()).isEqualTo(value);
+        StatefulRedisPubSubConnection<String, String> node = pubSubConnection.getConnection(partition.getNodeId());
+        node.sync().subscribe("channel");
 
-        connection.getConnection(otherNode.getNodeId()).sync().publish(key, value);
-        assertThat(messages.take()).isEqualTo(value);
-    }
+        pubSubConnection2.sync().publish("channel", "message");
 
+        assertThat(connectionListener.getMessages().take()).isEqualTo("message");
+    }
 
     @Test
-    public void testPubSubClientPublish() throws Exception {
+    public void testNodeHostAndPortMessagePropagationSubscription() throws Exception {
+
+        RedisClusterNode partition = pubSubConnection.getPartitions().getPartition(0);
+        pubSubConnection.setNodeMessagePropagation(true);
 
-        String nodeId = pubSubConnection.sync().clusterMyId();
-        pubSubConnection.sync().subscribe(key);
-        pubSubConnection.addListener(this);
+        RedisURI uri = partition.getUri();
+        StatefulRedisPubSubConnection<String, String> node = pubSubConnection.getConnection(uri.getHost(), uri.getPort());
+        node.sync().subscribe("channel");
 
-        assertThat(pubSubConnection2.sync().clusterMyId()).isEqualTo(nodeId);
+        pubSubConnection2.sync().publish("channel", "message");
 
-        pubSubConnection2.sync().publish(key, value);
-        assertThat(messages.take()).isEqualTo(value);
+        assertThat(connectionListener.getMessages().take()).isEqualTo("message");
     }
 
     @Test
-    public void testConnectToLeastClientsNode() throws Exception {
+    public void testAsyncSubscription() throws Exception {
 
-        clusterClient.reloadPartitions();
-        String nodeId = pubSubConnection.sync().clusterMyId();
+        pubSubConnection.setNodeMessagePropagation(true);
 
-        StatefulRedisPubSubConnection<String, String> connectionAfterPartitionReload = clusterClient.connectPubSub();
-        String newConnectionNodeId = connectionAfterPartitionReload.sync().clusterMyId();
-        connectionAfterPartitionReload.close();
+        PubSubAsyncNodeSelection<String, String> masters = pubSubConnection.async().masters();
+        NodeSelectionPubSubAsyncCommands<String, String> commands = masters.commands();
 
-        assertThat(nodeId).isNotEqualTo(newConnectionNodeId);
+        CompletableFuture.allOf(commands.psubscribe("chann*").futures()).get();
+
+        pubSubConnection2.sync().publish("channel", "message");
+
+        assertThat(masters.size()).isEqualTo(2);
+        assertThat(connectionListener.getMessages().take()).isEqualTo("message");
+        assertThat(connectionListener.getMessages().take()).isEqualTo("message");
+        assertThat(connectionListener.getMessages().poll()).isNull();
     }
 
     @Test
-    public void testRegularClientPubSubPublish() throws Exception {
+    public void testSyncSubscription() throws Exception {
+
+        pubSubConnection.setNodeMessagePropagation(true);
 
-        String nodeId = pubSubConnection.sync().clusterMyId();
-        RedisClusterNode otherNode = getOtherThan(nodeId);
-        pubSubConnection.sync().subscribe(key);
-        pubSubConnection.addListener(this);
+        PubSubNodeSelection<String, String> masters = pubSubConnection.sync().masters();
+        NodeSelectionPubSubCommands<String, String> commands = masters.commands();
 
-        List<String> channelsOnSubscribedNode = connection.getConnection(nodeId).sync().pubsubChannels();
-        assertThat(channelsOnSubscribedNode).hasSize(1);
+        commands.psubscribe("chann*");
 
-        RedisCommands<String, String> otherNodeConnection = connection.getConnection(otherNode.getNodeId()).sync();
-        otherNodeConnection.publish(key, value);
-        assertThat(channels.take()).isEqualTo(key);
+        pubSubConnection2.sync().publish("channel", "message");
 
+        assertThat(masters.size()).isEqualTo(2);
+        assertThat(connectionListener.getMessages().take()).isEqualTo("message");
+        assertThat(connectionListener.getMessages().take()).isEqualTo("message");
+        assertThat(connectionListener.getMessages().poll()).isNull();
     }
 
-    private RedisClusterNode getOtherThan(String nodeId) {
-        for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
-            if (redisClusterNode.getNodeId().equals(nodeId)) {
-                continue;
-            }
-            return redisClusterNode;
-        }
+    @Test
+    public void testReactiveSubscription() throws Exception {
 
-        throw new IllegalStateException("No other nodes than " + nodeId + " available");
-    }
+        pubSubConnection.setNodeMessagePropagation(true);
 
-    // RedisPubSubListener implementation
+        PubSubReactiveNodeSelection<String, String> masters = pubSubConnection.reactive().masters();
+        NodeSelectionPubSubReactiveCommands<String, String> commands = masters.commands();
 
-    @Override
-    public void message(String channel, String message) {
-        channels.add(channel);
-        messages.add(message);
-    }
+        commands.psubscribe("chann*").flux().then().block();
 
-    @Override
-    public void message(String pattern, String channel, String message) {
-        patterns.add(pattern);
-        channels.add(channel);
-        messages.add(message);
-    }
+        pubSubConnection2.sync().publish("channel", "message");
 
-    @Override
-    public void subscribed(String channel, long count) {
-        channels.add(channel);
-        counts.add(count);
+        assertThat(masters.size()).isEqualTo(2);
+        assertThat(connectionListener.getMessages().take()).isEqualTo("message");
+        assertThat(connectionListener.getMessages().take()).isEqualTo("message");
+        assertThat(connectionListener.getMessages().poll()).isNull();
     }
 
-    @Override
-    public void psubscribed(String pattern, long count) {
-        patterns.add(pattern);
-        counts.add(count);
-    }
+    @Test
+    public void testClusterListener() throws Exception {
 
-    @Override
-    public void unsubscribed(String channel, long count) {
-        channels.add(channel);
-        counts.add(count);
-    }
+        BlockingQueue<RedisClusterNode> nodes = new LinkedBlockingQueue<>();
+        pubSubConnection.setNodeMessagePropagation(true);
+        pubSubConnection.addListener(new RedisClusterPubSubAdapter<String, String>() {
 
-    @Override
-    public void punsubscribed(String pattern, long count) {
-        patterns.add(pattern);
-        counts.add(count);
-    }
+            @Override
+            public void message(RedisClusterNode node, String pattern, String channel, String message) {
+                nodes.add(node);
+            }
+        });
+
+        PubSubNodeSelection<String, String> masters = pubSubConnection.sync().masters();
+        NodeSelectionPubSubCommands<String, String> commands = masters.commands();
+
+        commands.psubscribe("chann*");
 
+        pubSubConnection2.sync().publish("channel", "message");
+
+        assertThat(masters.size()).isEqualTo(2);
+        assertThat(connectionListener.getMessages().take()).isEqualTo("message");
+        assertThat(connectionListener.getMessages().take()).isEqualTo("message");
+        assertThat(connectionListener.getMessages().poll()).isNull();
+
+        assertThat(nodes.take()).isNotNull();
+        assertThat(nodes.take()).isNotNull();
+        assertThat(nodes.poll()).isNull();
+    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubConnectionTest.java b/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubConnectionTest.java
new file mode 100644
index 0000000000..d3ef4ebcdf
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubConnectionTest.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.pubsub;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.cluster.AbstractClusterTest;
+import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
+import com.lambdaworks.redis.support.PubSubTestListener;
+
+/**
+ * @author Mark Paluch
+ */
+public class PubSubConnectionTest extends AbstractClusterTest {
+
+    private PubSubTestListener listener = new PubSubTestListener();
+
+    private StatefulRedisClusterConnection<String, String> connection;
+    private StatefulRedisPubSubConnection<String, String> pubSubConnection;
+    private StatefulRedisPubSubConnection<String, String> pubSubConnection2;
+
+    @Before
+    public void openPubSubConnection() throws Exception {
+        connection = clusterClient.connect();
+        pubSubConnection = clusterClient.connectPubSub();
+        pubSubConnection2 = clusterClient.connectPubSub();
+
+    }
+
+    @After
+    public void closePubSubConnection() throws Exception {
+        connection.close();
+        pubSubConnection.close();
+        pubSubConnection2.close();
+    }
+
+    @Test
+    public void testRegularClientPubSubChannels() throws Exception {
+
+        String nodeId = pubSubConnection.sync().clusterMyId();
+        RedisClusterNode otherNode = getOtherThan(nodeId);
+        pubSubConnection.sync().subscribe(key);
+
+        List<String> channelsOnSubscribedNode = connection.getConnection(nodeId).sync().pubsubChannels();
+        assertThat(channelsOnSubscribedNode).hasSize(1);
+
+        List<String> channelsOnOtherNode = connection.getConnection(otherNode.getNodeId()).sync().pubsubChannels();
+        assertThat(channelsOnOtherNode).isEmpty();
+    }
+
+    @Test
+    public void testRegularClientPublish() throws Exception {
+
+        String nodeId = pubSubConnection.sync().clusterMyId();
+        RedisClusterNode otherNode = getOtherThan(nodeId);
+        pubSubConnection.sync().subscribe(key);
+        pubSubConnection.addListener(listener);
+
+        connection.getConnection(nodeId).sync().publish(key, value);
+        assertThat(listener.getMessages().take()).isEqualTo(value);
+
+        connection.getConnection(otherNode.getNodeId()).sync().publish(key, value);
+        assertThat(listener.getMessages().take()).isEqualTo(value);
+    }
+
+    @Test
+    public void testPubSubClientPublish() throws Exception {
+
+        String nodeId = pubSubConnection.sync().clusterMyId();
+        pubSubConnection.sync().subscribe(key);
+        pubSubConnection.addListener(listener);
+
+        assertThat(pubSubConnection2.sync().clusterMyId()).isEqualTo(nodeId);
+
+        pubSubConnection2.sync().publish(key, value);
+        assertThat(listener.getMessages().take()).isEqualTo(value);
+    }
+
+    @Test
+    public void testConnectToLeastClientsNode() throws Exception {
+
+        clusterClient.reloadPartitions();
+        String nodeId = pubSubConnection.sync().clusterMyId();
+
+        StatefulRedisPubSubConnection<String, String> connectionAfterPartitionReload = clusterClient.connectPubSub();
+        String newConnectionNodeId = connectionAfterPartitionReload.sync().clusterMyId();
+        connectionAfterPartitionReload.close();
+
+        assertThat(nodeId).isNotEqualTo(newConnectionNodeId);
+    }
+
+    @Test
+    public void testRegularClientPubSubPublish() throws Exception {
+
+        String nodeId = pubSubConnection.sync().clusterMyId();
+        RedisClusterNode otherNode = getOtherThan(nodeId);
+        pubSubConnection.sync().subscribe(key);
+        pubSubConnection.addListener(listener);
+
+        List<String> channelsOnSubscribedNode = connection.getConnection(nodeId).sync().pubsubChannels();
+        assertThat(channelsOnSubscribedNode).hasSize(1);
+
+        RedisCommands<String, String> otherNodeConnection = connection.getConnection(otherNode.getNodeId()).sync();
+        otherNodeConnection.publish(key, value);
+        assertThat(listener.getChannels().take()).isEqualTo(key);
+
+    }
+
+    private RedisClusterNode getOtherThan(String nodeId) {
+        for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
+            if (redisClusterNode.getNodeId().equals(nodeId)) {
+                continue;
+            }
+            return redisClusterNode;
+        }
+
+        throw new IllegalStateException("No other nodes than " + nodeId + " available");
+    }
+
+}
diff --git a/src/test/java/com/lambdaworks/redis/support/PubSubTestListener.java b/src/test/java/com/lambdaworks/redis/support/PubSubTestListener.java
new file mode 100644
index 0000000000..c4c2ac753c
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/support/PubSubTestListener.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.support;
+
+import java.util.concurrent.BlockingQueue;
+
+import com.lambdaworks.redis.internal.LettuceFactories;
+import com.lambdaworks.redis.pubsub.RedisPubSubListener;
+
+/**
+ * @author Mark Paluch
+ */
+public class PubSubTestListener implements RedisPubSubListener<String, String> {
+
+    private BlockingQueue<String> channels = LettuceFactories.newBlockingQueue();
+    private BlockingQueue<String> patterns = LettuceFactories.newBlockingQueue();
+    private BlockingQueue<String> messages = LettuceFactories.newBlockingQueue();
+    private BlockingQueue<Long> counts = LettuceFactories.newBlockingQueue();
+
+    // RedisPubSubListener implementation
+
+    @Override
+    public void message(String channel, String message) {
+        channels.add(channel);
+        messages.add(message);
+    }
+
+    @Override
+    public void message(String pattern, String channel, String message) {
+        patterns.add(pattern);
+        channels.add(channel);
+        messages.add(message);
+    }
+
+    @Override
+    public void subscribed(String channel, long count) {
+        channels.add(channel);
+        counts.add(count);
+    }
+
+    @Override
+    public void psubscribed(String pattern, long count) {
+        patterns.add(pattern);
+        counts.add(count);
+    }
+
+    @Override
+    public void unsubscribed(String channel, long count) {
+        channels.add(channel);
+        counts.add(count);
+    }
+
+    @Override
+    public void punsubscribed(String pattern, long count) {
+        patterns.add(pattern);
+        counts.add(count);
+    }
+
+    public BlockingQueue<String> getChannels() {
+        return channels;
+    }
+
+    public BlockingQueue<String> getPatterns() {
+        return patterns;
+    }
+
+    public BlockingQueue<String> getMessages() {
+        return messages;
+    }
+
+    public BlockingQueue<Long> getCounts() {
+        return counts;
+    }
+}

From bdf37aea55cf157cf692f7da0014db9f0efdd8af Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 25 Nov 2016 20:40:08 +0100
Subject: [PATCH 075/808] Remove addListener/removeListener methods from
 execution-specific Pub/Sub interfaces #412

Remove addListener/removeListener methods to remove API ambiguity.
---
 .../pubsub/RedisPubSubAsyncCommandsImpl.java  | 20 ------------
 .../RedisPubSubReactiveCommandsImpl.java      | 32 +++++--------------
 .../api/async/RedisPubSubAsyncCommands.java   | 14 --------
 .../reactive/RedisPubSubReactiveCommands.java | 15 ---------
 .../pubsub/api/sync/RedisPubSubCommands.java  | 15 ---------
 .../redis/pubsub/PubSubCommandTest.java       | 10 +++---
 .../redis/pubsub/PubSubReactiveTest.java      |  6 ++--
 7 files changed, 16 insertions(+), 96 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
index 81f0897173..9aac82b3b8 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
@@ -46,26 +46,6 @@ public RedisPubSubAsyncCommandsImpl(StatefulRedisPubSubConnection<K, V> connecti
         this.commandBuilder = new PubSubCommandBuilder<>(codec);
     }
 
-    /**
-     * Add a new listener.
-     * 
-     * @param listener Listener.
-     */
-    @Override
-    public void addListener(RedisPubSubListener<K, V> listener) {
-        getStatefulConnection().addListener(listener);
-    }
-
-    /**
-     * Remove an existing listener.
-     * 
-     * @param listener Listener.
-     */
-    @Override
-    public void removeListener(RedisPubSubListener<K, V> listener) {
-        getStatefulConnection().removeListener(listener);
-    }
-
     @Override
     @SuppressWarnings("unchecked")
     public RedisFuture<Void> psubscribe(K... patterns) {
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
index 53d76d2d23..6a9a2cb362 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
@@ -51,16 +51,6 @@ public RedisPubSubReactiveCommandsImpl(StatefulRedisPubSubConnection<K, V> conne
         this.commandBuilder = new PubSubCommandBuilder<>(codec);
     }
 
-    /**
-     * Add a new listener.
-     * 
-     * @param listener Listener.
-     */
-    @Override
-    public void addListener(RedisPubSubListener<K, V> listener) {
-        getStatefulConnection().addListener(listener);
-    }
-
     @Override
     public Flux<PatternMessage<K, V>> observePatterns() {
         return observePatterns(FluxSink.OverflowStrategy.BUFFER);
@@ -68,6 +58,7 @@ public Flux<PatternMessage<K, V>> observePatterns() {
 
     @Override
     public Flux<PatternMessage<K, V>> observePatterns(FluxSink.OverflowStrategy overflowStrategy) {
+
         return Flux.create(sink -> {
 
             RedisPubSubAdapter<K, V> listener = new RedisPubSubAdapter<K, V>() {
@@ -78,9 +69,11 @@ public void message(K pattern, K channel, V message) {
                 }
             };
 
-            addListener(listener);
+            StatefulRedisPubSubConnection<K, V> statefulConnection = getStatefulConnection();
+            statefulConnection.addListener(listener);
+
             sink.setCancellation(() -> {
-                removeListener(listener);
+                statefulConnection.removeListener(listener);
             });
 
         }, overflowStrategy);
@@ -104,25 +97,16 @@ public void message(K channel, V message) {
                 }
             };
 
-            addListener(listener);
+            StatefulRedisPubSubConnection<K, V> statefulConnection = getStatefulConnection();
+            statefulConnection.addListener(listener);
 
             sink.setCancellation(() -> {
-                removeListener(listener);
+                statefulConnection.removeListener(listener);
             });
 
         }, overflowStrategy);
     }
 
-    /**
-     * Remove an existing listener.
-     * 
-     * @param listener Listener.
-     */
-    @Override
-    public void removeListener(RedisPubSubListener<K, V> listener) {
-        getStatefulConnection().removeListener(listener);
-    }
-
     @Override
     public Mono<Void> psubscribe(K... patterns) {
         return createMono(() -> commandBuilder.psubscribe(patterns)).then();
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java b/src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java
index 0d5b35a31d..6e98e33186 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java
@@ -30,20 +30,6 @@
  */
 public interface RedisPubSubAsyncCommands<K, V> extends RedisAsyncCommands<K, V> {
 
-    /**
-     * Add a new listener.
-     * 
-     * @param listener Listener.
-     */
-    void addListener(RedisPubSubListener<K, V> listener);
-
-    /**
-     * Remove an existing listener.
-     * 
-     * @param listener Listener.
-     */
-    void removeListener(RedisPubSubListener<K, V> listener);
-
     /**
      * Listen for messages published to channels matching the given patterns.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java
index 4fb69e964c..8e2d6d00d7 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java
@@ -16,7 +16,6 @@
 package com.lambdaworks.redis.pubsub.api.reactive;
 
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
-import com.lambdaworks.redis.pubsub.RedisPubSubListener;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
 
 import reactor.core.publisher.Flux;
@@ -33,20 +32,6 @@
  */
 public interface RedisPubSubReactiveCommands<K, V> extends RedisReactiveCommands<K, V> {
 
-    /**
-     * Add a new listener.
-     * 
-     * @param listener Listener.
-     */
-    void addListener(RedisPubSubListener<K, V> listener);
-
-    /**
-     * Remove an existing listener.
-     * 
-     * @param listener Listener.
-     */
-    void removeListener(RedisPubSubListener<K, V> listener);
-
     /**
      * Flux for messages ({@literal pmessage}) received though pattern subscriptions. The connection needs to be subscribed to
      * one or more patterns using {@link #psubscribe(Object[])}.
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java b/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java
index 3649c08c6e..55ddaf7d56 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java
@@ -16,7 +16,6 @@
 package com.lambdaworks.redis.pubsub.api.sync;
 
 import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.pubsub.RedisPubSubListener;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
 
 /**
@@ -29,20 +28,6 @@
  */
 public interface RedisPubSubCommands<K, V> extends RedisCommands<K, V> {
 
-    /**
-     * Add a new listener.
-     * 
-     * @param listener Listener.
-     */
-    void addListener(RedisPubSubListener<K, V> listener);
-
-    /**
-     * Remove an existing listener.
-     * 
-     * @param listener Listener.
-     */
-    void removeListener(RedisPubSubListener<K, V> listener);
-
     /**
      * Listen for messages published to channels matching the given patterns.
      * 
diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java b/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
index 9cf8ffd16a..60d8fd7c8d 100644
--- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
@@ -56,7 +56,7 @@ public class PubSubCommandTest extends AbstractRedisClientTest implements RedisP
     @Before
     public void openPubSubConnection() throws Exception {
         pubsub = client.connectPubSub().async();
-        pubsub.addListener(this);
+        pubsub.getStatefulConnection().addListener(this);
         channels = LettuceFactories.newBlockingQueue();
         patterns = LettuceFactories.newBlockingQueue();
         messages = LettuceFactories.newBlockingQueue();
@@ -74,7 +74,7 @@ public void auth() throws Exception {
             @Override
             protected void run(RedisClient client) throws Exception {
                 RedisPubSubAsyncCommands<String, String> connection = client.connectPubSub().async();
-                connection.addListener(PubSubCommandTest.this);
+                connection.getStatefulConnection().addListener(PubSubCommandTest.this);
                 connection.auth(passwd);
 
                 connection.subscribe(channel);
@@ -89,7 +89,7 @@ public void authWithReconnect() throws Exception {
             @Override
             protected void run(RedisClient client) throws Exception {
                 RedisPubSubAsyncCommands<String, String> connection = client.connectPubSub().async();
-                connection.addListener(PubSubCommandTest.this);
+                connection.getStatefulConnection().addListener(PubSubCommandTest.this);
                 connection.auth(passwd);
                 connection.quit();
                 Wait.untilTrue(() -> {
@@ -351,7 +351,7 @@ public void unsubscribed(String channel, long count) {
             }
         };
 
-        pubsub.addListener(adapter);
+        pubsub.getStatefulConnection().addListener(adapter);
         pubsub.subscribe(channel);
         pubsub.psubscribe(pattern);
 
@@ -373,7 +373,7 @@ public void removeListener() throws Exception {
         assertThat(channels.take()).isEqualTo(channel);
         assertThat(messages.take()).isEqualTo(message);
 
-        pubsub.removeListener(this);
+        pubsub.getStatefulConnection().removeListener(this);
 
         redis.publish(channel, message);
         assertThat(channels.poll(10, TimeUnit.MILLISECONDS)).isNull();
diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java b/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
index 124249fd1a..a57c9414e4 100644
--- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
+++ b/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
@@ -68,7 +68,7 @@ public void openPubSubConnection() throws Exception {
 
         pubsub = client.connectPubSub().reactive();
         pubsub2 = client.connectPubSub().reactive();
-        pubsub.addListener(this);
+        pubsub.getStatefulConnection().addListener(this);
         channels = LettuceFactories.newBlockingQueue();
         patterns = LettuceFactories.newBlockingQueue();
         messages = LettuceFactories.newBlockingQueue();
@@ -379,7 +379,7 @@ public void unsubscribed(String channel, long count) {
             }
         };
 
-        pubsub.addListener(adapter);
+        pubsub.getStatefulConnection().addListener(adapter);
         pubsub.subscribe(channel).subscribe();
         pubsub.psubscribe(pattern).subscribe();
 
@@ -402,7 +402,7 @@ public void removeListener() throws Exception {
         assertThat(channels.take()).isEqualTo(channel);
         assertThat(messages.take()).isEqualTo(message);
 
-        pubsub.removeListener(this);
+        pubsub.getStatefulConnection().removeListener(this);
 
         pubsub2.publish(channel, message).subscribe();
         assertThat(channels.poll(10, TimeUnit.MILLISECONDS)).isNull();

From 7259a0bedc69dad257b810b1f21c35a74973b295 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 25 Nov 2016 20:46:01 +0100
Subject: [PATCH 076/808] Remove deprecated LettuceFutures.await method #388

Removed in favor of LettuceFutures.awaitOrCancel.
---
 .../com/lambdaworks/redis/LettuceFutures.java   | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/LettuceFutures.java b/src/main/java/com/lambdaworks/redis/LettuceFutures.java
index 93280ad30c..2aae3610c3 100644
--- a/src/main/java/com/lambdaworks/redis/LettuceFutures.java
+++ b/src/main/java/com/lambdaworks/redis/LettuceFutures.java
@@ -89,24 +89,7 @@ public static boolean awaitAll(long timeout, TimeUnit unit, Future<?>... futures
      * @return Result of the command.
      */
     public static <T> T awaitOrCancel(RedisFuture<T> cmd, long timeout, TimeUnit unit) {
-        return await(timeout, unit, cmd);
-    }
 
-    /**
-     * Wait until futures are complete or the supplied timeout is reached. Commands are canceled if the timeout is reached but
-     * the command is not finished.
-     *
-     * @param cmd Command to wait for
-     * @param timeout Maximum time to wait for futures to complete
-     * @param unit Unit of time for the timeout
-     * @param <T> Result type
-     * @deprecated The method name does not reflect what the method is doing, therefore it is deprecated. Use
-     *             {@link #awaitOrCancel(RedisFuture, long, TimeUnit)} instead. The semantics did not change and
-     *             {@link #awaitOrCancel(RedisFuture, long, TimeUnit)} simply calls this method.
-     * @return True if all futures complete in time.
-     */
-    @Deprecated
-    public static <T> T await(long timeout, TimeUnit unit, RedisFuture<T> cmd) {
         try {
             if (!cmd.await(timeout, unit)) {
                 cmd.cancel(true);

From 3c52541138aa4ee0ee4d6a091349ac7924759d64 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 25 Nov 2016 22:27:24 +0100
Subject: [PATCH 077/808] Default to epoll transport if available #402

Use epoll for socket transport (TCP) if epoll library is available and running on a linux operating system.
Epoll usage can be disabled with setting -Dbiz.paluch.redis.lettuce.epoll=false
---
 .../redis/AbstractRedisClient.java            |  41 +++---
 .../com/lambdaworks/redis/EpollProvider.java  | 128 +++++++++++++-----
 .../com/lambdaworks/redis/Transports.java     |  89 ++++++++++++
 .../DefaultEventLoopGroupProvider.java        |   4 +-
 4 files changed, 210 insertions(+), 52 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/Transports.java

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
index 3d7ac014c7..f8d6eb0715 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
@@ -27,6 +27,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
 
+import com.lambdaworks.redis.Transports.NativeTransports;
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.protocol.ConnectionWatchdog;
 import com.lambdaworks.redis.resource.ClientResources;
@@ -38,7 +39,6 @@
 import io.netty.channel.group.ChannelGroup;
 import io.netty.channel.group.DefaultChannelGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.util.HashedWheelTimer;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.Future;
@@ -104,8 +104,8 @@ protected AbstractRedisClient(ClientResources clientResources) {
     }
 
     /**
-     * Set the default timeout for connections created by this client. The timeout
-     * applies to connection attempts and non-blocking commands.
+     * Set the default timeout for connections created by this client. The timeout applies to connection attempts and
+     * non-blocking commands.
      * 
      * @param timeout Default connection timeout.
      * @param unit Unit of time for the timeout.
@@ -151,39 +151,44 @@ protected void connectionBuilder(Supplier<SocketAddress> socketAddressSupplier,
 
     protected void channelType(ConnectionBuilder connectionBuilder, ConnectionPoint connectionPoint) {
 
+        LettuceAssert.notNull(connectionPoint, "ConnectionPoint must not be null");
+
         connectionBuilder.bootstrap().group(getEventLoopGroup(connectionPoint));
 
-        if (connectionPoint != null && connectionPoint.getSocket() != null) {
+        if (connectionPoint.getSocket() != null) {
             checkForEpollLibrary();
-            connectionBuilder.bootstrap().channel(EpollProvider.epollDomainSocketChannelClass);
+            connectionBuilder.bootstrap().channel(NativeTransports.domainSocketChannelClass());
         } else {
-            connectionBuilder.bootstrap().channel(NioSocketChannel.class);
+            connectionBuilder.bootstrap().channel(Transports.socketChannelClass());
         }
     }
 
     private synchronized EventLoopGroup getEventLoopGroup(ConnectionPoint connectionPoint) {
 
-        if ((connectionPoint == null || connectionPoint.getSocket() == null)
-                && !eventLoopGroups.containsKey(NioEventLoopGroup.class)) {
-            eventLoopGroups.put(NioEventLoopGroup.class, clientResources.eventLoopGroupProvider().allocate(NioEventLoopGroup.class));
+        if (connectionPoint.getSocket() == null && !eventLoopGroups.containsKey(Transports.eventLoopGroupClass())) {
+            eventLoopGroups.put(Transports.eventLoopGroupClass(),
+                    clientResources.eventLoopGroupProvider().allocate(Transports.eventLoopGroupClass()));
         }
 
-        if (connectionPoint != null && connectionPoint.getSocket() != null) {
+        if (connectionPoint.getSocket() != null) {
+
             checkForEpollLibrary();
 
-            if (!eventLoopGroups.containsKey(EpollProvider.epollEventLoopGroupClass)) {
-                EventLoopGroup epl = clientResources.eventLoopGroupProvider().allocate(EpollProvider.epollEventLoopGroupClass);
-                eventLoopGroups.put(EpollProvider.epollEventLoopGroupClass, epl);
+            Class<? extends EventLoopGroup> eventLoopGroupClass = NativeTransports.eventLoopGroupClass();
+
+            if (!eventLoopGroups.containsKey(NativeTransports.eventLoopGroupClass())) {
+                eventLoopGroups.put(eventLoopGroupClass,
+                        clientResources.eventLoopGroupProvider().allocate(eventLoopGroupClass));
             }
         }
 
-        if (connectionPoint == null || connectionPoint.getSocket() == null) {
-            return eventLoopGroups.get(NioEventLoopGroup.class);
+        if (connectionPoint.getSocket() == null) {
+            return eventLoopGroups.get(Transports.eventLoopGroupClass());
         }
 
-        if (connectionPoint != null && connectionPoint.getSocket() != null) {
+        if (connectionPoint.getSocket() != null) {
             checkForEpollLibrary();
-            return eventLoopGroups.get(EpollProvider.epollEventLoopGroupClass);
+            return eventLoopGroups.get(NativeTransports.eventLoopGroupClass());
         }
 
         throw new IllegalStateException("This should not have happened in a binary decision. Please file a bug.");
@@ -199,7 +204,7 @@ protected <K, V, T extends RedisChannelHandler<K, V>> T initializeChannel(Connec
         RedisChannelHandler<?, ?> connection = connectionBuilder.connection();
         SocketAddress redisAddress = connectionBuilder.socketAddress();
 
-        if(clientResources.eventExecutorGroup().isShuttingDown()){
+        if (clientResources.eventExecutorGroup().isShuttingDown()) {
             throw new IllegalStateException("Cannot connect. Worker pool not running");
         }
 
diff --git a/src/main/java/com/lambdaworks/redis/EpollProvider.java b/src/main/java/com/lambdaworks/redis/EpollProvider.java
index 53a4609e3a..297bae9e76 100644
--- a/src/main/java/com/lambdaworks/redis/EpollProvider.java
+++ b/src/main/java/com/lambdaworks/redis/EpollProvider.java
@@ -17,14 +17,16 @@
 
 import java.lang.reflect.Constructor;
 import java.net.SocketAddress;
-import java.util.concurrent.Callable;
+import java.util.Locale;
 import java.util.concurrent.ThreadFactory;
 
 import com.lambdaworks.redis.internal.LettuceAssert;
-
 import com.lambdaworks.redis.internal.LettuceClassUtils;
+
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
+import io.netty.util.concurrent.EventExecutorGroup;
+import io.netty.util.internal.SystemPropertyUtil;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -36,73 +38,133 @@
  */
 public class EpollProvider {
 
-    protected static final InternalLogger logger = InternalLoggerFactory.getInstance(EpollProvider.class);
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(EpollProvider.class);
 
-    public static final Class<EventLoopGroup> epollEventLoopGroupClass;
-    public static final Class<Channel> epollDomainSocketChannelClass;
-    public static final Class<SocketAddress> domainSocketAddressClass;
+    private static final String EPOLL_ENABLED_KEY = "biz.paluch.lettuce.redis.epoll";
+    private static final boolean EPOLL_ENABLED = Boolean.parseBoolean(SystemPropertyUtil.get(EPOLL_ENABLED_KEY, "true"));
+    private static final boolean EPOLL_COMPATIBLE = SystemPropertyUtil.get("os.name").toLowerCase(Locale.UK).trim()
+            .startsWith("linux");
+    private static final Class<EventLoopGroup> epollEventLoopGroupClass;
+    private static final Class<Channel> epollDomainSocketChannelClass;
+    private static final Class<Channel> epollSocketChannelClass;
+    private static final Class<SocketAddress> domainSocketAddressClass;
 
     static {
 
         epollEventLoopGroupClass = getClass("io.netty.channel.epoll.EpollEventLoopGroup");
         epollDomainSocketChannelClass = getClass("io.netty.channel.epoll.EpollDomainSocketChannel");
+        epollSocketChannelClass = getClass("io.netty.channel.epoll.EpollSocketChannel");
         domainSocketAddressClass = getClass("io.netty.channel.unix.DomainSocketAddress");
-        if (epollDomainSocketChannelClass == null || epollEventLoopGroupClass == null) {
+
+        if (epollDomainSocketChannelClass == null || epollEventLoopGroupClass == null || epollSocketChannelClass == null) {
             logger.debug("Starting without optional Epoll library");
+        } else {
+
+            logger.debug("Starting with Epoll library");
+
+            if (!EPOLL_COMPATIBLE) {
+                logger.debug(String.format("Epoll not compatible with %s", SystemPropertyUtil.get("os.name")));
+            }
         }
     }
 
     /**
-     * Try to load class {@literal className}.
+     * @param type must not be {@literal null}.
+     * @return {@literal true} if {@code type} is a {@link io.netty.channel.epoll.EpollEventLoopGroup}.
+     */
+    public static boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type) {
+
+        LettuceAssert.notNull(type, "EventLoopGroup type must not be null");
+
+        return type.equals(epollEventLoopGroupClass);
+    }
+
+    /**
+     * Create a new {@link io.netty.channel.epoll.EpollEventLoopGroup}.
      * 
-     * @param className
-     * @param <T> Expected return type for casting.
-     * @return instance of {@literal className} or null
+     * @param nThreads
+     * @param threadFactory
+     * @return the {@link EventLoopGroup}.
      */
-    private static <T> Class<T> getClass(String className) {
+    public static EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
+
         try {
-            return (Class) LettuceClassUtils.forName(className);
-        } catch (ClassNotFoundException e) {
-            logger.debug("Cannot load class " + className, e);
+            Constructor<EventLoopGroup> constructor = epollEventLoopGroupClass.getConstructor(Integer.TYPE,
+                    ThreadFactory.class);
+            return constructor.newInstance(nThreads, threadFactory);
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
         }
-        return null;
+    }
+
+    /**
+     * @return {@literal true} if epoll is available.
+     */
+    public static boolean isAvailable() {
+        return domainSocketAddressClass != null && epollDomainSocketChannelClass != null && EPOLL_ENABLED && EPOLL_COMPATIBLE;
+    }
+
+    /**
+     *
+     * @return the {@link io.netty.channel.epoll.EpollDomainSocketChannel} class.
+     */
+    static Class<? extends Channel> domainSocketChannelClass() {
+        return epollDomainSocketChannelClass;
+    }
+
+    /**
+     *
+     * @return the {@link io.netty.channel.epoll.EpollSocketChannel} class.
+     */
+    static Class<? extends Channel> socketChannelClass() {
+        return epollSocketChannelClass;
+    }
+
+    /**
+     *
+     * @return the {@link io.netty.channel.epoll.EpollEventLoopGroup} class.
+     */
+    static Class<? extends EventLoopGroup> eventLoopGroupClass() {
+        return epollEventLoopGroupClass;
     }
 
     /**
      * Check whether the Epoll library is available on the class path.
-     * 
+     *
      * @throws IllegalStateException if the {@literal netty-transport-native-epoll} library is not available
-     * 
+     *
      */
     static void checkForEpollLibrary() {
 
-        LettuceAssert.assertState(domainSocketAddressClass != null && epollDomainSocketChannelClass != null,
+        LettuceAssert.assertState(EPOLL_ENABLED && EPOLL_COMPATIBLE,
+                String.format("epoll use is disabled via System properties (%s)", EPOLL_ENABLED_KEY));
+        LettuceAssert.assertState(isAvailable(),
                 "Cannot connect using sockets without the optional netty-transport-native-epoll library on the class path");
     }
 
     static SocketAddress newSocketAddress(String socketPath) {
-        return get(() -> {
-            Constructor<SocketAddress> constructor = domainSocketAddressClass.getConstructor(String.class);
-            return constructor.newInstance(socketPath);
-        });
-    }
-
-    public static EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
 
         try {
-            Constructor<EventLoopGroup> constructor = epollEventLoopGroupClass
-                    .getConstructor(Integer.TYPE, ThreadFactory.class);
-            return constructor.newInstance(nThreads, threadFactory);
+            Constructor<SocketAddress> constructor = domainSocketAddressClass.getConstructor(String.class);
+            return constructor.newInstance(socketPath);
         } catch (Exception e) {
             throw new IllegalStateException(e);
         }
     }
 
-    private static <V> V get(Callable<V> supplier) {
+    /**
+     * Try to load class {@literal className}.
+     *
+     * @param className
+     * @param <T> Expected return type for casting.
+     * @return instance of {@literal className} or null
+     */
+    private static <T> Class<T> getClass(String className) {
         try {
-            return supplier.call();
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
+            return (Class) LettuceClassUtils.forName(className);
+        } catch (ClassNotFoundException e) {
+            logger.debug("Cannot load class " + className, e);
         }
+        return null;
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/Transports.java b/src/main/java/com/lambdaworks/redis/Transports.java
new file mode 100644
index 0000000000..330cb8d14b
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/Transports.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis;
+
+import io.netty.channel.Channel;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioSocketChannel;
+
+/**
+ * Transport infrastructure utility class. This class provides {@link EventLoopGroup} and {@link Channel} classes for socket and
+ * native socket transports.
+ * 
+ * @author Mark Paluch
+ * @since 4.4
+ */
+class Transports {
+
+    /**
+     * @return the default {@link EventLoopGroup} for socket transport that is compatible with {@link #socketChannelClass()}.
+     */
+    static Class<? extends EventLoopGroup> eventLoopGroupClass() {
+
+        if (NativeTransports.isSocketSupport()) {
+            return NativeTransports.eventLoopGroupClass();
+        }
+
+        return NioEventLoopGroup.class;
+    }
+
+    /**
+     * @return the default {@link Channel} for socket (network/TCP) transport.
+     */
+    static Class<? extends Channel> socketChannelClass() {
+
+        if (NativeTransports.isSocketSupport()) {
+            return NativeTransports.socketChannelClass();
+        }
+
+        return NioSocketChannel.class;
+    }
+
+    /**
+     * Native transport support.
+     */
+    static class NativeTransports {
+
+        /**
+         * @return {@literal true} if a native transport is available.
+         */
+        static boolean isSocketSupport() {
+            return EpollProvider.isAvailable();
+        }
+
+        /**
+         * @return the native transport socket {@link Channel} class.
+         */
+        static Class<? extends Channel> socketChannelClass() {
+            return EpollProvider.socketChannelClass();
+        }
+
+        /**
+         * @return the native transport domain socket {@link Channel} class.
+         */
+        static Class<? extends Channel> domainSocketChannelClass() {
+            return EpollProvider.domainSocketChannelClass();
+        }
+
+        /**
+         * @return the native transport {@link EventLoopGroup} class.
+         */
+        static Class<? extends EventLoopGroup> eventLoopGroupClass() {
+            return EpollProvider.eventLoopGroupClass();
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProvider.java b/src/main/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProvider.java
index 1059262c3a..5cac9a7172 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProvider.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProvider.java
@@ -132,6 +132,7 @@ private <T extends EventLoopGroup> T getOrCreate(Class<T> type) {
      * @throws IllegalArgumentException if the {@code type} is not supported.
      */
     public static <T extends EventExecutorGroup> EventExecutorGroup createEventLoopGroup(Class<T> type, int numberOfThreads) {
+
         if (DefaultEventExecutorGroup.class.equals(type)) {
             return new DefaultEventExecutorGroup(numberOfThreads, new DefaultThreadFactory("lettuce-eventExecutorLoop", true));
         }
@@ -140,9 +141,10 @@ public static <T extends EventExecutorGroup> EventExecutorGroup createEventLoopG
             return new NioEventLoopGroup(numberOfThreads, new DefaultThreadFactory("lettuce-nioEventLoop", true));
         }
 
-        if (EpollProvider.epollEventLoopGroupClass != null && EpollProvider.epollEventLoopGroupClass.equals(type)) {
+        if (EpollProvider.isAvailable() && EpollProvider.isEventLoopGroup(type)) {
             return EpollProvider.newEventLoopGroup(numberOfThreads, new DefaultThreadFactory("lettuce-epollEventLoop", true));
         }
+
         throw new IllegalArgumentException("Type " + type.getName() + " not supported");
     }
 

From b2878e377f3d9ab159408dfdb266b728372ff798 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 25 Nov 2016 22:28:18 +0100
Subject: [PATCH 078/808] Guard OpenSSL tests if OpenSSL is not available

---
 src/test/java/com/lambdaworks/SslTest.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/test/java/com/lambdaworks/SslTest.java b/src/test/java/com/lambdaworks/SslTest.java
index be52145474..3a4e00f3fc 100644
--- a/src/test/java/com/lambdaworks/SslTest.java
+++ b/src/test/java/com/lambdaworks/SslTest.java
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
+import io.netty.handler.ssl.OpenSsl;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
@@ -127,6 +128,8 @@ public void standaloneWithJdkSslFailsWithWrongTruststore() throws Exception {
     @Test
     public void standaloneWithOpenSsl() throws Exception {
 
+        assumeTrue(OpenSsl.isAvailable());
+
         SslOptions sslOptions = SslOptions.builder() //
                 .openSslProvider() //
                 .truststore(new File(LOCALHOST_KEYSTORE)) //
@@ -139,6 +142,8 @@ public void standaloneWithOpenSsl() throws Exception {
     @Test(expected = RedisConnectionException.class)
     public void standaloneWithOpenSslFailsWithWrongTruststore() throws Exception {
 
+        assumeTrue(OpenSsl.isAvailable());
+
         SslOptions sslOptions = SslOptions.builder() //
                 .openSslProvider() //
                 .build();

From 9dd11e7869764dd5198ec887823aadf0ffcaccda Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 29 Nov 2016 18:15:10 +0100
Subject: [PATCH 079/808] Apply proxy wrapper to obtained pooled connections
 #411

Connection pooling no longer pools proxies but wraps objects returned by the object pool. The proxy state is still invalidated which makes references to the proxy unusable once the connection is released back to the pool but the proxy instance it self is not pooled. Retrieval of the same connection will create a fresh proxy instance.
---
 .../redis/support/ConnectionPoolSupport.java  |  82 +++++++----
 .../support/ConnectionPoolSupportTest.java    | 134 +++++++++++++++++-
 2 files changed, 187 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java b/src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java
index f7c68b4dba..1a9b880aff 100644
--- a/src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java
+++ b/src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java
@@ -23,11 +23,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import org.apache.commons.pool2.BasePooledObjectFactory;
 import org.apache.commons.pool2.ObjectPool;
 import org.apache.commons.pool2.PooledObject;
@@ -113,6 +108,7 @@ private ConnectionPoolSupport() {
      * @param <T> connection type.
      * @return the connection pool.
      */
+    @SuppressWarnings("unchecked")
     public static <T extends StatefulConnection<?, ?>> GenericObjectPool<T> createGenericObjectPool(
             Supplier<T> connectionSupplier, GenericObjectPoolConfig config, boolean wrapConnections) {
 
@@ -120,10 +116,24 @@ private ConnectionPoolSupport() {
         LettuceAssert.notNull(config, "GenericObjectPoolConfig must not be null");
 
         AtomicReference<ObjectPool<T>> poolRef = new AtomicReference<>();
-        Supplier<T> providerToUse = wrapConnections ? wrappedConnectionSupplier(connectionSupplier, poolRef)
-                : connectionSupplier;
 
-        GenericObjectPool<T> pool = new GenericObjectPool<>(new RedisPooledObjectFactory<T>(providerToUse), config);
+        GenericObjectPool<T> pool = new GenericObjectPool<T>(new RedisPooledObjectFactory<T>(connectionSupplier), config) {
+
+            @Override
+            public synchronized T borrowObject() throws Exception {
+                return wrapConnections ? wrapConnection(super.borrowObject(), this) : super.borrowObject();
+            }
+
+            @Override
+            public synchronized void returnObject(T obj) {
+
+                if (wrapConnections && obj instanceof HasTargetConnection) {
+                    super.returnObject((T) ((HasTargetConnection) obj).getTargetConnection());
+                    return;
+                }
+                super.returnObject(obj);
+            }
+        };
 
         poolRef.set(pool);
 
@@ -153,41 +163,49 @@ private ConnectionPoolSupport() {
      * @param <T> connection type.
      * @return the connection pool.
      */
+    @SuppressWarnings("unchecked")
     public static <T extends StatefulConnection<?, ?>> SoftReferenceObjectPool<T> createSoftReferenceObjectPool(
             Supplier<T> connectionSupplier, boolean wrapConnections) {
 
         LettuceAssert.notNull(connectionSupplier, "Connection supplier must not be null");
 
         AtomicReference<ObjectPool<T>> poolRef = new AtomicReference<>();
-        Supplier<T> providerToUse = wrapConnections ? wrappedConnectionSupplier(connectionSupplier, poolRef)
-                : connectionSupplier;
 
-        SoftReferenceObjectPool<T> pool = new SoftReferenceObjectPool<>(new RedisPooledObjectFactory<>(providerToUse));
+        SoftReferenceObjectPool<T> pool = new SoftReferenceObjectPool<T>(new RedisPooledObjectFactory<>(connectionSupplier)) {
+            @Override
+            public synchronized T borrowObject() throws Exception {
+                return wrapConnections ? wrapConnection(super.borrowObject(), this) : super.borrowObject();
+            }
+
+            @Override
+            public synchronized void returnObject(T obj) throws Exception {
+
+                if (wrapConnections && obj instanceof HasTargetConnection) {
+                    super.returnObject((T) ((HasTargetConnection) obj).getTargetConnection());
+                    return;
+                }
+                super.returnObject(obj);
+            }
+        };
         poolRef.set(pool);
 
         return pool;
     }
 
     @SuppressWarnings("unchecked")
-    private static <T> Supplier<T> wrappedConnectionSupplier(Supplier<T> connectionSupplier,
-            AtomicReference<ObjectPool<T>> poolRef) {
-
-        return new Supplier<T>() {
+    private static <T> T wrapConnection(T connection, ObjectPool<T> pool) {
 
-            @Override
-            public T get() {
+        ReturnObjectOnCloseInvocationHandler<T> handler = new ReturnObjectOnCloseInvocationHandler<T>(connection, pool);
 
-                T connection = connectionSupplier.get();
-                ReturnObjectOnCloseInvocationHandler<T> handler = new ReturnObjectOnCloseInvocationHandler<>(connection,
-                        poolRef.get());
+        Class<?>[] implementedInterfaces = connection.getClass().getInterfaces();
+        Class[] interfaces = new Class[implementedInterfaces.length + 1];
+        interfaces[0] = HasTargetConnection.class;
+        System.arraycopy(implementedInterfaces, 0, interfaces, 1, implementedInterfaces.length);
 
-                T proxiedConnection = (T) Proxy.newProxyInstance(getClass().getClassLoader(),
-                        connection.getClass().getInterfaces(), handler);
-                handler.setProxiedConnection(proxiedConnection);
+        T proxiedConnection = (T) Proxy.newProxyInstance(connection.getClass().getClassLoader(), interfaces, handler);
+        handler.setProxiedConnection(proxiedConnection);
 
-                return proxiedConnection;
-            }
-        };
+        return proxiedConnection;
     }
 
     /**
@@ -242,7 +260,6 @@ void setProxiedConnection(T proxiedConnection) {
             this.proxiedConnection = proxiedConnection;
         }
 
-        @SuppressWarnings("unchecked")
         @Override
         protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
 
@@ -250,6 +267,10 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
                 return proxiedConnection;
             }
 
+            if (method.getName().equals("getTargetConnection")) {
+                return connection;
+            }
+
             if (connection == null) {
                 throw new RedisException("Connection is deallocated and cannot be used anymore.");
             }
@@ -335,4 +356,11 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
             }
         }
     }
+
+    /**
+     * Interface to retrieve an underlying target connection from a proxy.
+     */
+    interface HasTargetConnection {
+        StatefulConnection<?, ?> getTargetConnection();
+    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java b/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java
index 09fe78f5cc..2112e789d2 100644
--- a/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java
+++ b/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java
@@ -20,6 +20,7 @@
 
 import java.lang.reflect.Proxy;
 
+import org.apache.commons.pool2.ObjectPool;
 import org.apache.commons.pool2.impl.GenericObjectPool;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.apache.commons.pool2.impl.SoftReferenceObjectPool;
@@ -54,9 +55,58 @@ public void genericPoolShouldWorkWithWrappedConnections() throws Exception {
         GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
                 .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig());
 
+        borrowAndReturn(pool);
+        borrowAndClose(pool);
+        borrowAndCloseTryWithResources(pool);
+
+        pool.returnObject(pool.borrowObject().sync().getStatefulConnection());
+        pool.returnObject(pool.borrowObject().async().getStatefulConnection());
+
+        pool.close();
+    }
+
+    @Test
+    public void softReferencePoolShouldWorkWithWrappedConnections() throws Exception {
+
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
+                .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig());
+
+        borrowAndReturn(pool);
+        borrowAndClose(pool);
+        borrowAndCloseTryWithResources(pool);
+
+        pool.returnObject(pool.borrowObject().sync().getStatefulConnection());
+        pool.returnObject(pool.borrowObject().async().getStatefulConnection());
+
+        pool.close();
+    }
+
+    @Test
+    public void genericPoolShouldWorkWithPlainConnections() throws Exception {
+
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
+                .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig(), false);
+
+        borrowAndReturn(pool);
+
         StatefulRedisConnection<String, String> connection = pool.borrowObject();
-        RedisCommands<String, String> sync = connection.sync();
-        sync.ping();
+        assertThat(Proxy.isProxyClass(connection.getClass())).isFalse();
+        pool.returnObject(connection);
+
+        pool.close();
+    }
+
+    @Test
+    public void softReferencePoolShouldWorkWithPlainConnections() throws Exception {
+
+        SoftReferenceObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
+                .createSoftReferenceObjectPool(() -> client.connect(), false);
+
+        borrowAndReturn(pool);
+
+        StatefulRedisConnection<String, String> connection = pool.borrowObject();
+        assertThat(Proxy.isProxyClass(connection.getClass())).isFalse();
+        pool.returnObject(connection);
 
         connection.close();
         pool.close();
@@ -220,4 +270,84 @@ public void wrappedObjectClosedAfterReturn() throws Exception {
 
         pool.close();
     }
+
+    @Test
+    public void tryWithResourcesReturnsConnectionToPool() throws Exception {
+
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
+                .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig());
+
+        StatefulRedisConnection<String, String> usedConnection = null;
+        try (StatefulRedisConnection<String, String> connection = pool.borrowObject()) {
+
+            RedisCommands<String, String> sync = connection.sync();
+            sync.ping();
+
+            usedConnection = connection;
+        }
+
+        try {
+            usedConnection.isMulti();
+            fail("Missing RedisException");
+        } catch (RedisException e) {
+            assertThat(e).hasMessageContaining("deallocated");
+        }
+
+        pool.close();
+    }
+
+    @Test
+    public void tryWithResourcesReturnsSoftRefConnectionToPool() throws Exception {
+
+        SoftReferenceObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
+                .createSoftReferenceObjectPool(() -> client.connect());
+
+        StatefulRedisConnection<String, String> usedConnection = null;
+        try (StatefulRedisConnection<String, String> connection = pool.borrowObject()) {
+
+            RedisCommands<String, String> sync = connection.sync();
+            sync.ping();
+
+            usedConnection = connection;
+        }
+
+        try {
+            usedConnection.isMulti();
+            fail("Missing RedisException");
+        } catch (RedisException e) {
+            assertThat(e).hasMessageContaining("deallocated");
+        }
+
+        pool.close();
+    }
+
+    private void borrowAndReturn(ObjectPool<StatefulRedisConnection<String, String>> pool) throws Exception {
+
+        for (int i = 0; i < 10; i++) {
+            StatefulRedisConnection<String, String> connection = pool.borrowObject();
+            RedisCommands<String, String> sync = connection.sync();
+            sync.ping();
+            pool.returnObject(connection);
+        }
+    }
+
+    private void borrowAndCloseTryWithResources(ObjectPool<StatefulRedisConnection<String, String>> pool) throws Exception {
+
+        for (int i = 0; i < 10; i++) {
+            try (StatefulRedisConnection<String, String> connection = pool.borrowObject()) {
+                RedisCommands<String, String> sync = connection.sync();
+                sync.ping();
+            }
+        }
+    }
+
+    private void borrowAndClose(ObjectPool<StatefulRedisConnection<String, String>> pool) throws Exception {
+
+        for (int i = 0; i < 10; i++) {
+            StatefulRedisConnection<String, String> connection = pool.borrowObject();
+            RedisCommands<String, String> sync = connection.sync();
+            sync.ping();
+            connection.close();
+        }
+    }
 }

From a4dc321c743becb219a0fd096f2569be15fafe44 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 1 Dec 2016 10:07:12 +0100
Subject: [PATCH 080/808] Support CLIENT and INFO commands for Redis Sentinel
 #415

---
 .../RedisSentinelAsyncCommandsImpl.java       |  41 +++++++
 .../RedisSentinelReactiveCommandsImpl.java    |  45 ++++++-
 .../sentinel/SentinelCommandBuilder.java      |  66 ++++++++--
 .../api/async/RedisSentinelAsyncCommands.java |  63 ++++++++++
 .../RedisSentinelReactiveCommands.java        |  63 ++++++++++
 .../api/sync/RedisSentinelCommands.java       |  63 ++++++++++
 .../redis/api/RedisSentinelCommands.java      |  63 ++++++++++
 .../redis/sentinel/AbstractSentinelTest.java  |   3 +
 .../redis/sentinel/SentinelCommandTest.java   |   3 +
 .../sentinel/SentinelConnectionTest.java      |   3 +
 .../redis/sentinel/SentinelRule.java          |   1 -
 .../sentinel/SentinelServerCommandTest.java   | 115 ++++++++++++++++++
 .../SentinelServerReactiveCommandTest.java    |  48 ++++++++
 13 files changed, 562 insertions(+), 15 deletions(-)
 create mode 100644 src/test/java/com/lambdaworks/redis/sentinel/SentinelServerCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelServerReactiveCommandTest.java

diff --git a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
index 7eb0e135c2..ccabe0a9c4 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
@@ -22,6 +22,7 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.atomic.AtomicReference;
 
+import com.lambdaworks.redis.KillArgs;
 import com.lambdaworks.redis.RedisFuture;
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.codec.RedisCodec;
@@ -136,6 +137,46 @@ public RedisFuture<String> ping() {
         return dispatch(commandBuilder.ping());
     }
 
+    @Override
+    public RedisFuture<K> clientGetname() {
+        return dispatch(commandBuilder.clientGetname());
+    }
+
+    @Override
+    public RedisFuture<String> clientSetname(K name) {
+        return dispatch(commandBuilder.clientSetname(name));
+    }
+
+    @Override
+    public RedisFuture<String> clientKill(String addr) {
+        return dispatch(commandBuilder.clientKill(addr));
+    }
+
+    @Override
+    public RedisFuture<Long> clientKill(KillArgs killArgs) {
+        return dispatch(commandBuilder.clientKill(killArgs));
+    }
+
+    @Override
+    public RedisFuture<String> clientPause(long timeout) {
+        return dispatch(commandBuilder.clientPause(timeout));
+    }
+
+    @Override
+    public RedisFuture<String> clientList() {
+        return dispatch(commandBuilder.clientList());
+    }
+
+    @Override
+    public RedisFuture<String> info() {
+        return dispatch(commandBuilder.info());
+    }
+
+    @Override
+    public RedisFuture<String> info(String section) {
+        return dispatch(commandBuilder.info(section));
+    }
+
     public <T> AsyncCommand<K, V, T> dispatch(RedisCommand<K, V, T> cmd) {
         return connection.dispatch(new AsyncCommand<>(cmd));
     }
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
index e0e5d426c5..f6c84fd2ed 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
@@ -19,6 +19,7 @@
 import java.net.SocketAddress;
 import java.util.Map;
 
+import com.lambdaworks.redis.KillArgs;
 import com.lambdaworks.redis.AbstractRedisReactiveCommands;
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.codec.RedisCodec;
@@ -112,12 +113,52 @@ public Mono<String> ping() {
         return createMono(commandBuilder::ping);
     }
 
-    // @Override
+    @Override
+    public Mono<K> clientGetname() {
+        return createMono(commandBuilder::clientGetname);
+    }
+
+    @Override
+    public Mono<String> clientSetname(K name) {
+        return createMono(() -> commandBuilder.clientSetname(name));
+    }
+
+    @Override
+    public Mono<String> clientKill(String addr) {
+        return createMono(() -> commandBuilder.clientKill(addr));
+    }
+
+    @Override
+    public Mono<Long> clientKill(KillArgs killArgs) {
+        return createMono(() -> commandBuilder.clientKill(killArgs));
+    }
+
+    @Override
+    public Mono<String> clientPause(long timeout) {
+        return createMono(() -> commandBuilder.clientPause(timeout));
+    }
+
+    @Override
+    public Mono<String> clientList() {
+        return createMono(commandBuilder::clientList);
+    }
+
+    @Override
+    public Mono<String> info() {
+        return createMono(commandBuilder::info);
+    }
+
+    @Override
+    public Mono<String> info(String section) {
+        return createMono(() -> commandBuilder.info(section));
+    }
+
+    @Override
     public void close() {
         connection.close();
     }
 
-    // @Override
+    @Override
     public boolean isOpen() {
         return connection.isOpen();
     }
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/SentinelCommandBuilder.java b/src/main/java/com/lambdaworks/redis/sentinel/SentinelCommandBuilder.java
index b26203c3d8..7381d7b334 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/SentinelCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/SentinelCommandBuilder.java
@@ -15,23 +15,16 @@
  */
 package com.lambdaworks.redis.sentinel;
 
-import static com.lambdaworks.redis.protocol.CommandKeyword.FAILOVER;
-import static com.lambdaworks.redis.protocol.CommandKeyword.RESET;
-import static com.lambdaworks.redis.protocol.CommandKeyword.SLAVES;
-import static com.lambdaworks.redis.protocol.CommandType.MONITOR;
-import static com.lambdaworks.redis.protocol.CommandType.PING;
-import static com.lambdaworks.redis.protocol.CommandType.SENTINEL;
-import static com.lambdaworks.redis.protocol.CommandType.SET;
+import static com.lambdaworks.redis.protocol.CommandKeyword.*;
+import static com.lambdaworks.redis.protocol.CommandType.*;
 
 import java.util.List;
 import java.util.Map;
 
+import com.lambdaworks.redis.KillArgs;
 import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.output.IntegerOutput;
-import com.lambdaworks.redis.output.ListOfMapsOutput;
-import com.lambdaworks.redis.output.MapOutput;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.output.ValueListOutput;
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.output.*;
 import com.lambdaworks.redis.protocol.BaseRedisCommandBuilder;
 import com.lambdaworks.redis.protocol.Command;
 import com.lambdaworks.redis.protocol.CommandArgs;
@@ -87,6 +80,55 @@ public Command<K, V, String> set(K key, String option, V value) {
         return createCommand(SENTINEL, new StatusOutput<K, V>(codec), args);
     }
 
+    public Command<K, V, K> clientGetname() {
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(GETNAME);
+        return createCommand(CLIENT, new KeyOutput<K, V>(codec), args);
+    }
+
+    public Command<K, V, String> clientSetname(K name) {
+        LettuceAssert.notNull(name, "Name must not be null");
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(SETNAME).addKey(name);
+        return createCommand(CLIENT, new StatusOutput<K, V>(codec), args);
+    }
+
+    public Command<K, V, String> clientKill(String addr) {
+        LettuceAssert.notNull(addr, "Addr must not be null");
+        LettuceAssert.notEmpty(addr, "Addr must not be empty");
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(KILL).add(addr);
+        return createCommand(CLIENT, new StatusOutput<K, V>(codec), args);
+    }
+
+    public Command<K, V, Long> clientKill(KillArgs killArgs) {
+        LettuceAssert.notNull(killArgs, "KillArgs must not be null");
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(KILL);
+        killArgs.build(args);
+        return createCommand(CLIENT, new IntegerOutput<K, V>(codec), args);
+    }
+
+    public Command<K, V, String> clientPause(long timeout) {
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(PAUSE).add(timeout);
+        return createCommand(CLIENT, new StatusOutput<K, V>(codec), args);
+    }
+
+    public Command<K, V, String> clientList() {
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(LIST);
+        return createCommand(CLIENT, new StatusOutput<K, V>(codec), args);
+    }
+
+    public Command<K, V, String> info() {
+        return createCommand(INFO, new StatusOutput<K, V>(codec));
+    }
+
+    public Command<K, V, String> info(String section) {
+        LettuceAssert.notNull(section, "Section must not be null");
+
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(section);
+        return createCommand(INFO, new StatusOutput<K, V>(codec), args);
+    }
+
     public Command<K, V, String> ping() {
         return createCommand(PING, new StatusOutput<K, V>(codec));
     }
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java b/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java
index 73fe33bc13..1e203d3f14 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java
@@ -18,6 +18,7 @@
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
+import com.lambdaworks.redis.KillArgs;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
 import com.lambdaworks.redis.RedisFuture;
 
@@ -109,6 +110,68 @@ public interface RedisSentinelAsyncCommands<K, V> {
      */
     RedisFuture<String> remove(K key);
 
+    /**
+     * Get the current connection name.
+     *
+     * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set.
+     */
+    RedisFuture<K> clientGetname();
+
+    /**
+     * Set the current connection name.
+     *
+     * @param name the client name
+     * @return simple-string-reply {@code OK} if the connection name was successfully set.
+     */
+    RedisFuture<String> clientSetname(K name);
+
+    /**
+     * Kill the connection of a client identified by ip:port.
+     *
+     * @param addr ip:port
+     * @return String simple-string-reply {@code OK} if the connection exists and has been closed
+     */
+    RedisFuture<String> clientKill(String addr);
+
+    /**
+     * Kill connections of clients which are filtered by {@code killArgs}
+     *
+     * @param killArgs args for the kill operation
+     * @return Long integer-reply number of killed connections
+     */
+    RedisFuture<Long> clientKill(KillArgs killArgs);
+
+    /**
+     * Stop processing commands from clients for some time.
+     *
+     * @param timeout the timeout value in milliseconds
+     * @return String simple-string-reply The command returns OK or an error if the timeout is invalid.
+     */
+    RedisFuture<String> clientPause(long timeout);
+
+    /**
+     * Get the list of client connections.
+     *
+     * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF),
+     *         each line is composed of a succession of property=value fields separated by a space character.
+     */
+    RedisFuture<String> clientList();
+
+    /**
+     * Get information and statistics about the server.
+     *
+     * @return String bulk-string-reply as a collection of text lines.
+     */
+    RedisFuture<String> info();
+
+    /**
+     * Get information and statistics about the server.
+     *
+     * @param section the section type: string
+     * @return String bulk-string-reply as a collection of text lines.
+     */
+    RedisFuture<String> info(String section);
+
     /**
      * Ping the server.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java b/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java
index c623cf36b3..daff5b8773 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java
@@ -18,6 +18,7 @@
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
+import com.lambdaworks.redis.KillArgs;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -110,6 +111,68 @@ public interface RedisSentinelReactiveCommands<K, V> {
      */
     Mono<String> remove(K key);
 
+    /**
+     * Get the current connection name.
+     *
+     * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set.
+     */
+    Mono<K> clientGetname();
+
+    /**
+     * Set the current connection name.
+     *
+     * @param name the client name
+     * @return simple-string-reply {@code OK} if the connection name was successfully set.
+     */
+    Mono<String> clientSetname(K name);
+
+    /**
+     * Kill the connection of a client identified by ip:port.
+     *
+     * @param addr ip:port
+     * @return String simple-string-reply {@code OK} if the connection exists and has been closed
+     */
+    Mono<String> clientKill(String addr);
+
+    /**
+     * Kill connections of clients which are filtered by {@code killArgs}
+     *
+     * @param killArgs args for the kill operation
+     * @return Long integer-reply number of killed connections
+     */
+    Mono<Long> clientKill(KillArgs killArgs);
+
+    /**
+     * Stop processing commands from clients for some time.
+     *
+     * @param timeout the timeout value in milliseconds
+     * @return String simple-string-reply The command returns OK or an error if the timeout is invalid.
+     */
+    Mono<String> clientPause(long timeout);
+
+    /**
+     * Get the list of client connections.
+     *
+     * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF),
+     *         each line is composed of a succession of property=value fields separated by a space character.
+     */
+    Mono<String> clientList();
+
+    /**
+     * Get information and statistics about the server.
+     *
+     * @return String bulk-string-reply as a collection of text lines.
+     */
+    Mono<String> info();
+
+    /**
+     * Get information and statistics about the server.
+     *
+     * @param section the section type: string
+     * @return String bulk-string-reply as a collection of text lines.
+     */
+    Mono<String> info(String section);
+
     /**
      * Ping the server.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java b/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java
index 249d320ad3..98f6e4b1cf 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java
@@ -18,6 +18,7 @@
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
+import com.lambdaworks.redis.KillArgs;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
 
 /**
@@ -108,6 +109,68 @@ public interface RedisSentinelCommands<K, V> {
      */
     String remove(K key);
 
+    /**
+     * Get the current connection name.
+     *
+     * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set.
+     */
+    K clientGetname();
+
+    /**
+     * Set the current connection name.
+     *
+     * @param name the client name
+     * @return simple-string-reply {@code OK} if the connection name was successfully set.
+     */
+    String clientSetname(K name);
+
+    /**
+     * Kill the connection of a client identified by ip:port.
+     *
+     * @param addr ip:port
+     * @return String simple-string-reply {@code OK} if the connection exists and has been closed
+     */
+    String clientKill(String addr);
+
+    /**
+     * Kill connections of clients which are filtered by {@code killArgs}
+     *
+     * @param killArgs args for the kill operation
+     * @return Long integer-reply number of killed connections
+     */
+    Long clientKill(KillArgs killArgs);
+
+    /**
+     * Stop processing commands from clients for some time.
+     *
+     * @param timeout the timeout value in milliseconds
+     * @return String simple-string-reply The command returns OK or an error if the timeout is invalid.
+     */
+    String clientPause(long timeout);
+
+    /**
+     * Get the list of client connections.
+     *
+     * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF),
+     *         each line is composed of a succession of property=value fields separated by a space character.
+     */
+    String clientList();
+
+    /**
+     * Get information and statistics about the server.
+     *
+     * @return String bulk-string-reply as a collection of text lines.
+     */
+    String info();
+
+    /**
+     * Get information and statistics about the server.
+     *
+     * @param section the section type: string
+     * @return String bulk-string-reply as a collection of text lines.
+     */
+    String info(String section);
+
     /**
      * Ping the server.
      * 
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java
index 255c2f0060..62d16303a3 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.lambdaworks.redis.KillArgs;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
 
 /**
@@ -108,6 +109,68 @@ public interface RedisSentinelCommands<K, V> {
      */
     String remove(K key);
 
+    /**
+     * Get the current connection name.
+     *
+     * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set.
+     */
+    K clientGetname();
+
+    /**
+     * Set the current connection name.
+     *
+     * @param name the client name
+     * @return simple-string-reply {@code OK} if the connection name was successfully set.
+     */
+    String clientSetname(K name);
+
+    /**
+     * Kill the connection of a client identified by ip:port.
+     *
+     * @param addr ip:port
+     * @return String simple-string-reply {@code OK} if the connection exists and has been closed
+     */
+    String clientKill(String addr);
+
+    /**
+     * Kill connections of clients which are filtered by {@code killArgs}
+     *
+     * @param killArgs args for the kill operation
+     * @return Long integer-reply number of killed connections
+     */
+    Long clientKill(KillArgs killArgs);
+
+    /**
+     * Stop processing commands from clients for some time.
+     *
+     * @param timeout the timeout value in milliseconds
+     * @return String simple-string-reply The command returns OK or an error if the timeout is invalid.
+     */
+    String clientPause(long timeout);
+
+    /**
+     * Get the list of client connections.
+     *
+     * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF),
+     *         each line is composed of a succession of property=value fields separated by a space character.
+     */
+    String clientList();
+
+    /**
+     * Get information and statistics about the server.
+     *
+     * @return String bulk-string-reply as a collection of text lines.
+     */
+    String info();
+
+    /**
+     * Get information and statistics about the server.
+     *
+     * @param section the section type: string
+     * @return String bulk-string-reply as a collection of text lines.
+     */
+    String info(String section);
+
     /**
      * Ping the server.
      * 
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java b/src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java
index 7018859b0c..db7f5f8088 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java
@@ -24,6 +24,9 @@
 import com.lambdaworks.redis.RedisClient;
 import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
 
+/**
+ * @author Mark Paluch
+ */
 public abstract class AbstractSentinelTest extends AbstractTest {
 
     public static final String MASTER_ID = "mymaster";
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
index 47c944a357..786cd6beed 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
@@ -36,6 +36,9 @@
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
 
+/**
+ * @author Mark Paluch
+ */
 public class SentinelCommandTest extends AbstractSentinelTest {
 
     @Rule
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
index e59e031d3b..130fab8b7a 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
@@ -37,6 +37,9 @@
 import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
 import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
 
+/**
+ * @author Mark Paluch
+ */
 public class SentinelConnectionTest extends AbstractSentinelTest {
 
     private StatefulRedisSentinelConnection<String, String> connection;
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
index 6dee9a1697..df5dc93ff3 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
@@ -50,7 +50,6 @@
  * <li>Setup a master/slave combination</li>
  * </ul>
  *
- *
  * @author Mark Paluch
  */
 public class SentinelRule implements TestRule {
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelServerCommandTest.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelServerCommandTest.java
new file mode 100644
index 0000000000..ece10ede8b
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelServerCommandTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.sentinel;
+
+import static com.lambdaworks.redis.TestSettings.hostAddr;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.lambdaworks.redis.KillArgs;
+import com.lambdaworks.redis.RedisClient;
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.TestSettings;
+import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
+
+/**
+ * @author Mark Paluch
+ */
+public class SentinelServerCommandTest extends AbstractSentinelTest {
+
+    @Rule
+    public SentinelRule sentinelRule = new SentinelRule(sentinelClient, false, 26379, 26380);
+
+    @BeforeClass
+    public static void setupClient() {
+        sentinelClient = RedisClient.create(RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
+    }
+
+    @Before
+    public void openConnection() throws Exception {
+        super.openConnection();
+
+        try {
+            sentinel.master(MASTER_ID);
+        } catch (Exception e) {
+            sentinelRule.monitor(MASTER_ID, hostAddr(), TestSettings.port(3), 1, true);
+        }
+    }
+
+    @Test
+    public void clientGetSetname() throws Exception {
+        assertThat(sentinel.clientGetname()).isNull();
+        assertThat(sentinel.clientSetname("test")).isEqualTo("OK");
+        assertThat(sentinel.clientGetname()).isEqualTo("test");
+        assertThat(sentinel.clientSetname("")).isEqualTo("OK");
+        assertThat(sentinel.clientGetname()).isNull();
+    }
+
+    @Test
+    public void clientPause() throws Exception {
+        assertThat(sentinel.clientPause(10)).isEqualTo("OK");
+    }
+
+    @Test
+    public void clientKill() throws Exception {
+        Pattern p = Pattern.compile(".*addr=([^ ]+).*");
+        String clients = sentinel.clientList();
+        Matcher m = p.matcher(clients);
+
+        assertThat(m.lookingAt()).isTrue();
+        assertThat(sentinel.clientKill(m.group(1))).isEqualTo("OK");
+    }
+
+    @Test
+    public void clientKillExtended() throws Exception {
+
+        RedisSentinelCommands<String, String> connection2 = sentinelClient.connectSentinel().sync();
+        connection2.clientSetname("killme");
+
+        Pattern p = Pattern.compile("^.*addr=([^ ]+).*name=killme.*$", Pattern.MULTILINE | Pattern.DOTALL);
+        String clients = sentinel.clientList();
+        Matcher m = p.matcher(clients);
+
+        assertThat(m.matches()).isTrue();
+        String addr = m.group(1);
+        assertThat(sentinel.clientKill(KillArgs.Builder.addr(addr).skipme())).isGreaterThan(0);
+
+        assertThat(sentinel.clientKill(KillArgs.Builder.id(4234))).isEqualTo(0);
+        assertThat(sentinel.clientKill(KillArgs.Builder.typeSlave().id(4234))).isEqualTo(0);
+        assertThat(sentinel.clientKill(KillArgs.Builder.typeNormal().id(4234))).isEqualTo(0);
+        assertThat(sentinel.clientKill(KillArgs.Builder.typePubsub().id(4234))).isEqualTo(0);
+
+        connection2.close();
+    }
+
+    @Test
+    public void clientList() throws Exception {
+        assertThat(sentinel.clientList().contains("addr=")).isTrue();
+    }
+
+    @Test
+    public void info() throws Exception {
+        assertThat(sentinel.info().contains("redis_version")).isTrue();
+        assertThat(sentinel.info("server").contains("redis_version")).isTrue();
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelServerReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelServerReactiveCommandTest.java
new file mode 100644
index 0000000000..6eaea17ac8
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelServerReactiveCommandTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.sentinel.reactive;
+
+import static com.lambdaworks.redis.TestSettings.hostAddr;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.lambdaworks.redis.TestSettings;
+import com.lambdaworks.redis.sentinel.SentinelServerCommandTest;
+import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
+import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands;
+import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+
+/**
+ * @author Mark Paluch
+ */
+public class SentinelServerReactiveCommandTest extends SentinelServerCommandTest {
+
+    @Override
+    public void openConnection() throws Exception {
+
+        RedisSentinelAsyncCommands<String, String> async = sentinelClient.connectSentinel().async();
+        RedisSentinelReactiveCommands<String, String> reactive = async.getStatefulConnection().reactive();
+        sentinel = ReactiveSyncInvocationHandler.sync(async.getStatefulConnection());
+
+        try {
+            sentinel.master(MASTER_ID);
+        } catch (Exception e) {
+            sentinelRule.monitor(MASTER_ID, hostAddr(), TestSettings.port(3), 1, true);
+        }
+
+        assertThat(reactive.isOpen()).isTrue();
+        assertThat(reactive.getStatefulConnection()).isSameAs(async.getStatefulConnection());
+    }
+}

From 71c1131761ae1f58522083c7c68c179fa3903e75 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 1 Dec 2016 10:24:55 +0100
Subject: [PATCH 081/808] Remove close method from Redis Sentinel command
 interfaces #415

---
 .../redis/sentinel/RedisSentinelAsyncCommandsImpl.java    | 1 -
 .../sentinel/api/async/RedisSentinelAsyncCommands.java    | 5 -----
 .../api/reactive/RedisSentinelReactiveCommands.java       | 5 -----
 .../redis/sentinel/api/sync/RedisSentinelCommands.java    | 5 -----
 .../com/lambdaworks/redis/api/RedisSentinelCommands.java  | 5 -----
 src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java   | 2 +-
 .../lambdaworks/redis/sentinel/AbstractSentinelTest.java  | 2 +-
 .../lambdaworks/redis/sentinel/SentinelCommandTest.java   | 2 +-
 .../redis/sentinel/SentinelConnectionTest.java            | 8 ++++----
 .../java/com/lambdaworks/redis/sentinel/SentinelRule.java | 2 +-
 .../redis/sentinel/SentinelServerCommandTest.java         | 2 +-
 .../util/ConnectionDecoratingInvocationHandler.java       | 4 ++++
 12 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
index ccabe0a9c4..423c2cb550 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
@@ -181,7 +181,6 @@ public <T> AsyncCommand<K, V, T> dispatch(RedisCommand<K, V, T> cmd) {
         return connection.dispatch(new AsyncCommand<>(cmd));
     }
 
-    @Override
     public void close() {
         connection.close();
     }
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java b/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java
index 1e203d3f14..6ce644bbd9 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java
@@ -179,11 +179,6 @@ public interface RedisSentinelAsyncCommands<K, V> {
      */
     RedisFuture<String> ping();
 
-    /**
-     * close the underlying connection.
-     */
-    void close();
-
     /**
      *
      * @return true if the connection is open (connected and not closed).
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java b/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java
index daff5b8773..d784f09935 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java
@@ -180,11 +180,6 @@ public interface RedisSentinelReactiveCommands<K, V> {
      */
     Mono<String> ping();
 
-    /**
-     * close the underlying connection.
-     */
-    void close();
-
     /**
      *
      * @return true if the connection is open (connected and not closed).
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java b/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java
index 98f6e4b1cf..52b5e76cea 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java
@@ -178,11 +178,6 @@ public interface RedisSentinelCommands<K, V> {
      */
     String ping();
 
-    /**
-     * close the underlying connection.
-     */
-    void close();
-
     /**
      *
      * @return true if the connection is open (connected and not closed).
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java
index 62d16303a3..44c9d44f11 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java
@@ -178,11 +178,6 @@ public interface RedisSentinelCommands<K, V> {
      */
     String ping();
 
-    /**
-     * close the underlying connection.
-     */
-    void close();
-
     /**
      *
      * @return true if the connection is open (connected and not closed).
diff --git a/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java b/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java
index f35c04559c..313807ae8b 100644
--- a/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java
+++ b/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java
@@ -91,7 +91,7 @@ public void pubsubStateful() throws Exception {
     // Sentinel
     @Test
     public void sentinelSync() throws Exception {
-        redisClient.connectSentinel().sync().close();
+        redisClient.connectSentinel().sync().getStatefulConnection().close();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java b/src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java
index db7f5f8088..855d451328 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java
@@ -47,7 +47,7 @@ public void openConnection() throws Exception {
     @After
     public void closeConnection() throws Exception {
         if (sentinel != null) {
-            sentinel.close();
+            sentinel.getStatefulConnection().close();
         }
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
index 786cd6beed..b2e4b19351 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
@@ -101,7 +101,7 @@ public void sentinelConnectWith() throws Exception {
         RedisSentinelCommands<String, String> sentinelConnection = client.connectSentinel().sync();
         assertThat(sentinelConnection.ping()).isEqualTo("PONG");
 
-        sentinelConnection.close();
+        sentinelConnection.getStatefulConnection().close();
 
         RedisCommands<String, String> connection2 = client.connect().sync();
         assertThat(connection2.ping()).isEqualTo("PONG");
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
index 130fab8b7a..8f6decc055 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
@@ -114,7 +114,7 @@ public void testSyncAsyncConversion() throws Exception {
     public void testSyncClose() throws Exception {
 
         StatefulRedisSentinelConnection<String, String> statefulConnection = sentinel.getStatefulConnection();
-        statefulConnection.sync().close();
+        statefulConnection.sync().getStatefulConnection().close();
 
         Wait.untilTrue(() -> !sentinel.isOpen()).waitOrTimeout();
 
@@ -125,7 +125,7 @@ public void testSyncClose() throws Exception {
     @Test
     public void testAsyncClose() throws Exception {
         StatefulRedisSentinelConnection<String, String> statefulConnection = sentinel.getStatefulConnection();
-        statefulConnection.async().close();
+        statefulConnection.async().getStatefulConnection().close();
 
         Wait.untilTrue(() -> !sentinel.isOpen()).waitOrTimeout();
 
@@ -138,12 +138,12 @@ public void connectToOneNode() throws Exception {
         RedisSentinelCommands<String, String> connection = sentinelClient
                 .connectSentinel(RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build()).sync();
         assertThat(connection.ping()).isEqualTo("PONG");
-        connection.close();
+        connection.getStatefulConnection().close();
     }
     @Test
     public void connectWithByteCodec() throws Exception {
         RedisSentinelCommands<byte[], byte[]> connection = sentinelClient.connectSentinel(new ByteArrayCodec()).sync();
         assertThat(connection.master(MASTER_ID.getBytes())).isNotNull();
-        connection.close();
+        connection.getStatefulConnection().close();
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
index df5dc93ff3..a5f8864fdf 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
@@ -96,7 +96,7 @@ public void evaluate() throws Throwable {
                 base.evaluate();
 
                 for (RedisSentinelCommands<String, String> commands : sentinelConnections.values()) {
-                    commands.close();
+                    commands.getStatefulConnection().close();
                 }
             }
         };
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelServerCommandTest.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelServerCommandTest.java
index ece10ede8b..283041f5d6 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelServerCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelServerCommandTest.java
@@ -99,7 +99,7 @@ public void clientKillExtended() throws Exception {
         assertThat(sentinel.clientKill(KillArgs.Builder.typeNormal().id(4234))).isEqualTo(0);
         assertThat(sentinel.clientKill(KillArgs.Builder.typePubsub().id(4234))).isEqualTo(0);
 
-        connection2.close();
+        connection2.getStatefulConnection().close();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java b/src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java
index 745a07d325..d908754fd8 100644
--- a/src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java
+++ b/src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java
@@ -22,6 +22,7 @@
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.internal.AbstractInvocationHandler;
+import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
 
 /**
  * @author Mark Paluch
@@ -48,6 +49,9 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
             if (result instanceof StatefulRedisClusterConnection
                     && proxyMethod.getReturnType().isAssignableFrom(StatefulRedisClusterConnection.class)) {
                 interfaces = new Class[] { StatefulConnection.class, StatefulRedisClusterConnection.class };
+            } else if (result instanceof StatefulRedisSentinelConnection
+                    && proxyMethod.getReturnType().isAssignableFrom(StatefulRedisSentinelConnection.class)) {
+                interfaces = new Class[] { StatefulConnection.class, StatefulRedisSentinelConnection.class };
             } else {
                 interfaces = new Class[] { StatefulConnection.class, StatefulRedisConnection.class };
             }

From 4753849228d90d44922741ad90e15bb8239991b0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 1 Dec 2016 14:23:03 +0100
Subject: [PATCH 082/808] Allow setting client name with RedisURI #416

RedisURI now allows client name configuration to set the client name upon connection. The client name is applied to all connection types. Client name can be set via URI and API:

redis://host:port?clientName=foo

redisURI.setClientName("foo")

RedisURI.Builder.redis("host").withClientName("foo")
---
 .../com/lambdaworks/redis/RedisClient.java    | 30 +++---
 .../java/com/lambdaworks/redis/RedisURI.java  | 96 +++++++++++++++----
 .../redis/StatefulRedisConnectionImpl.java    | 21 +++-
 .../redis/cluster/RedisClusterClient.java     |  8 ++
 .../StatefulRedisClusterConnectionImpl.java   | 21 +++-
 .../MasterSlaveConnectionProvider.java        |  3 +
 .../masterslave/RedisMasterSlaveNode.java     |  8 +-
 .../StatefulRedisSentinelConnectionImpl.java  | 26 ++++-
 .../com/lambdaworks/redis/ClientTest.java     | 33 +++++++
 .../redis/RedisURIBuilderTest.java            | 11 +++
 .../com/lambdaworks/redis/RedisURITest.java   |  8 ++
 .../redis/cluster/RedisClusterClientTest.java | 40 +++++++-
 .../masterslave/MasterSlaveSentinelTest.java  | 18 +++-
 .../redis/masterslave/MasterSlaveTest.java    | 15 ++-
 .../masterslave/StaticMasterSlaveTest.java    | 14 ++-
 .../sentinel/SentinelConnectionTest.java      | 34 ++++++-
 16 files changed, 336 insertions(+), 50 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/com/lambdaworks/redis/RedisClient.java
index 591fd723d5..d16aa8e2e1 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClient.java
@@ -17,7 +17,6 @@
 
 import static com.lambdaworks.redis.LettuceStrings.isEmpty;
 import static com.lambdaworks.redis.LettuceStrings.isNotEmpty;
-import static com.lambdaworks.redis.internal.LettuceClassUtils.isPresent;
 
 import java.net.ConnectException;
 import java.net.SocketAddress;
@@ -31,8 +30,8 @@
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.codec.StringCodec;
 import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.DefaultEndpoint;
 import com.lambdaworks.redis.protocol.CommandHandler;
+import com.lambdaworks.redis.protocol.DefaultEndpoint;
 import com.lambdaworks.redis.pubsub.PubSubCommandHandler;
 import com.lambdaworks.redis.pubsub.PubSubEndpoint;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
@@ -41,7 +40,6 @@
 import com.lambdaworks.redis.resource.SocketAddressResolver;
 import com.lambdaworks.redis.sentinel.StatefulRedisSentinelConnectionImpl;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
-import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
 
 /**
  * A scalable thread-safe <a href="http://redis.io/">Redis</a> client. Multiple threads may share one connection if they avoid
@@ -200,7 +198,6 @@ public <K, V> StatefulRedisConnection<K, V> connect(RedisCodec<K, V> codec, Redi
         return connectStandalone(codec, redisURI, Timeout.from(redisURI));
     }
 
-
     private <K, V> StatefulRedisConnection<K, V> connectStandalone(RedisCodec<K, V> codec, RedisURI redisURI, Timeout timeout) {
 
         assertNotNull(codec);
@@ -215,7 +212,7 @@ private <K, V> StatefulRedisConnection<K, V> connectStandalone(RedisCodec<K, V>
     }
 
     private <K, V> void connectStateful(StatefulRedisConnectionImpl<K, V> connection, RedisURI redisURI,
-                                        DefaultEndpoint endpoint, Supplier<CommandHandler> commandHandlerSupplier) {
+            DefaultEndpoint endpoint, Supplier<CommandHandler> commandHandlerSupplier) {
 
         ConnectionBuilder connectionBuilder;
         if (redisURI.isSsl()) {
@@ -239,10 +236,13 @@ private <K, V> void connectStateful(StatefulRedisConnectionImpl<K, V> connection
             connection.async().auth(new String(redisURI.getPassword()));
         }
 
+        if (LettuceStrings.isNotEmpty(redisURI.getClientName())) {
+            connection.setClientName(redisURI.getClientName());
+        }
+
         if (redisURI.getDatabase() != 0) {
             connection.async().select(redisURI.getDatabase());
         }
-
     }
 
     /**
@@ -301,8 +301,8 @@ private <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V
 
         PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<K, V>(clientOptions);
 
-        StatefulRedisPubSubConnectionImpl<K, V> connection = newStatefulRedisPubSubConnection(endpoint,
-                endpoint, codec, timeout.timeout, timeout.timeUnit);
+        StatefulRedisPubSubConnectionImpl<K, V> connection = newStatefulRedisPubSubConnection(endpoint, endpoint, codec,
+                timeout.timeout, timeout.timeUnit);
 
         connectStateful(connection, redisURI, endpoint, () -> new PubSubCommandHandler<>(clientResources, codec, endpoint));
 
@@ -368,12 +368,13 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
 
         DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
 
-        StatefulRedisSentinelConnectionImpl<K, V> connection = newStatefulRedisSentinelConnection(endpoint,
-                codec, timeout.timeout, timeout.timeUnit);
+        StatefulRedisSentinelConnectionImpl<K, V> connection = newStatefulRedisSentinelConnection(endpoint, codec,
+                timeout.timeout, timeout.timeUnit);
 
         logger.debug("Trying to get a Sentinel connection for one of: " + redisURI.getSentinels());
 
-        connectionBuilder.endpoint(endpoint).commandHandler(() -> new CommandHandler(clientResources, endpoint)).connection(connection);
+        connectionBuilder.endpoint(endpoint).commandHandler(() -> new CommandHandler(clientResources, endpoint))
+                .connection(connection);
         connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
 
         if (redisURI.getSentinels().isEmpty() && (isNotEmpty(redisURI.getHost()) || !isEmpty(redisURI.getSocket()))) {
@@ -413,6 +414,10 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
             }
         }
 
+        if (LettuceStrings.isNotEmpty(redisURI.getClientName())) {
+            connection.setClientName(redisURI.getClientName());
+        }
+
         return connection;
     }
 
@@ -527,8 +532,7 @@ private SocketAddress getSocketAddress(RedisURI redisURI)
     }
 
     private SocketAddress lookupRedis(RedisURI sentinelUri) throws InterruptedException, TimeoutException, ExecutionException {
-        StatefulRedisSentinelConnection<String, String> connection = connectSentinel(
-                sentinelUri);
+        StatefulRedisSentinelConnection<String, String> connection = connectSentinel(sentinelUri);
         try {
             return connection.async().getMasterAddrByName(sentinelUri.getSentinelMasterId()).get(timeout, unit);
         } finally {
diff --git a/src/main/java/com/lambdaworks/redis/RedisURI.java b/src/main/java/com/lambdaworks/redis/RedisURI.java
index 74852f8c02..fa74b34184 100644
--- a/src/main/java/com/lambdaworks/redis/RedisURI.java
+++ b/src/main/java/com/lambdaworks/redis/RedisURI.java
@@ -34,8 +34,8 @@
 import com.lambdaworks.redis.protocol.LettuceCharsets;
 
 /**
- * Redis URI. Contains connection details for the Redis/Sentinel connections. You can provide the database, password and
- * timeouts within the RedisURI.
+ * Redis URI. Contains connection details for the Redis/Sentinel connections. You can provide the database, client name,
+ * password and timeouts within the RedisURI.
  *
  * You have following possibilities to create a {@link RedisURI}:
  *
@@ -68,19 +68,20 @@
  *
  * <b>Redis Standalone</b> <blockquote> <i>redis</i><b>{@code ://}</b>[<i>password@</i>]<i>host</i> [<b>{@code :} </b>
  * <i>port</i>][<b>{@code /}</b><i>database</i>][<b>{@code ?}</b> [<i>timeout=timeout</i>[<i>d|h|m|s|ms|us|ns</i>]] [
- * <i>&database=database</i>]] </blockquote>
+ * <i>&database=database</i>] [<i>&clientName=clientName</i>]] </blockquote>
  *
  * <b>Redis Standalone (SSL)</b> <blockquote> <i>rediss</i><b>{@code ://}</b>[<i>password@</i>]<i>host</i> [<b>{@code :} </b>
  * <i>port</i>][<b>{@code /}</b><i>database</i>][<b>{@code ?}</b> [<i>timeout=timeout</i>[<i>d|h|m|s|ms|us|ns</i>]] [
- * <i>&database=database</i>]] </blockquote>
+ * <i>&database=database</i>] [<i>&clientName=clientName</i>]] </blockquote>
  *
  * Redis Standalone (Unix Domain Sockets)</b> <blockquote> <i>redis-socket</i><b>{@code ://} </b>[<i>password@</i>]<i>path</i>[
- * <b>{@code ?}</b>[<i>timeout=timeout</i>[<i>d|h|m|s|ms|us|ns</i>]][<i>&database=database</i>]] </blockquote>
+ * <b>{@code ?}</b>[<i>timeout=timeout</i>[<i>d|h|m|s|ms|us|ns</i>]][<i>&database=database</i>] [<i>&clientName=clientName</i>]]
+ * </blockquote>
  *
  * <b>Redis Sentinel</b> <blockquote> <i>redis-sentinel</i><b>{@code ://}</b>[<i>password@</i>]<i>host1</i> [<b>{@code :} </b>
  * <i>port1</i>][, <i>host2</i> [<b>{@code :}</b><i>port2</i>]][, <i>hostN</i> [<b>{@code :}</b><i>portN</i>]][<b>{@code /} </b>
  * <i>database</i>][<b>{@code ?} </b>[<i>timeout=timeout</i>[<i>d|h|m|s|ms|us|ns</i>]] [
- * <i>&sentinelMasterId=sentinelMasterId</i>] [<i>&database=database</i>]] </blockquote>
+ * <i>&sentinelMasterId=sentinelMasterId</i>] [<i>&database=database</i>] [<i>&clientName=clientName</i>]] </blockquote>
  *
  * <p>
  * <b>Schemes</b>
@@ -108,8 +109,7 @@
  * <p>
  * Hint: The database parameter within the query part has higher precedence than the database in the path.
  * </p>
- * 
- * 
+ *
  * RedisURI supports Redis Standalone, Redis Sentinel and Redis Cluster with plain, SSL, TLS and unix domain socket connections.
  * 
  * @author Mark Paluch
@@ -129,6 +129,7 @@ public class RedisURI implements Serializable, ConnectionPoint {
     public static final String PARAMETER_NAME_DATABASE = "database";
     public static final String PARAMETER_NAME_DATABASE_ALT = "db";
     public static final String PARAMETER_NAME_SENTINEL_MASTER_ID = "sentinelMasterId";
+    public static final String PARAMETER_NAME_CLIENT_NAME = "clientName";
 
     public static final Map<String, TimeUnit> TIME_UNIT_MAP;
 
@@ -165,6 +166,7 @@ public class RedisURI implements Serializable, ConnectionPoint {
     private String sentinelMasterId;
     private int port;
     private int database;
+    private String clientName;
     private char[] password;
     private boolean ssl = false;
     private boolean verifyPeer = true;
@@ -387,6 +389,26 @@ public void setDatabase(int database) {
         this.database = database;
     }
 
+    /**
+     * Returns the client name.
+     *
+     * @return
+     * @since 4.4
+     */
+    public String getClientName() {
+        return clientName;
+    }
+
+    /**
+     * Sets the client name to be applied on Redis connections.
+     *
+     * @param clientName the client name.
+     * @since 4.4
+     */
+    public void setClientName(String clientName) {
+        this.clientName = clientName;
+    }
+
     /**
      * Returns {@literal true} if SSL mode is enabled.
      * 
@@ -519,6 +541,10 @@ private static RedisURI buildRedisUriFromUri(URI uri) {
                     parseDatabase(builder, queryParam);
                 }
 
+                if (forStartWith.startsWith(PARAMETER_NAME_CLIENT_NAME.toLowerCase() + "=")) {
+                    parseClientName(builder, queryParam);
+                }
+
                 if (forStartWith.startsWith(PARAMETER_NAME_SENTINEL_MASTER_ID.toLowerCase() + "=")) {
                     parseSentinelMasterId(builder, queryParam);
                 }
@@ -568,6 +594,10 @@ private String getQueryString() {
             queryPairs.add(PARAMETER_NAME_DATABASE + "=" + database);
         }
 
+        if (clientName != null) {
+            queryPairs.add(PARAMETER_NAME_CLIENT_NAME + "=" + urlEncode(clientName));
+        }
+
         if (sentinelMasterId != null) {
             queryPairs.add(PARAMETER_NAME_SENTINEL_MASTER_ID + "=" + urlEncode(sentinelMasterId));
         }
@@ -763,18 +793,31 @@ private static void parseDatabase(Builder builder, String queryParam) {
         }
     }
 
-    private static void parseSentinelMasterId(Builder builder, String queryParam) {
-        int index = queryParam.indexOf('=');
-        if (index < 0) {
-            return;
+    private static void parseClientName(Builder builder, String queryParam) {
+
+        String clientName = getValuePart(queryParam);
+        if (isNotEmpty(clientName)) {
+            builder.withClientName(clientName);
         }
+    }
 
-        String masterIdString = queryParam.substring(index + 1);
+    private static void parseSentinelMasterId(Builder builder, String queryParam) {
+
+        String masterIdString = getValuePart(queryParam);
         if (isNotEmpty(masterIdString)) {
             builder.withSentinelMasterId(masterIdString);
         }
     }
 
+    private static String getValuePart(String queryParam) {
+        int index = queryParam.indexOf('=');
+        if (index < 0) {
+            return null;
+        }
+
+        return queryParam.substring(index + 1);
+    }
+
     private static Builder configureStandalone(URI uri) {
 
         Builder builder = null;
@@ -876,6 +919,7 @@ public static class Builder {
         private String sentinelMasterId;
         private int port;
         private int database;
+        private String clientName;
         private char[] password;
         private boolean ssl = false;
         private boolean verifyPeer = true;
@@ -1086,7 +1130,7 @@ public Builder withVerifyPeer(boolean verifyPeer) {
         }
 
         /**
-         * Adds database selection.
+         * Configures the database number.
          *
          * @param database the database number
          * @return the builder
@@ -1100,7 +1144,21 @@ public Builder withDatabase(int database) {
         }
 
         /**
-         * Adds authentication.
+         * Configures a client name.
+         *
+         * @param clientName the client name
+         * @return the builder
+         */
+        public Builder withClientName(String clientName) {
+
+            LettuceAssert.notNull(clientName, "Client name must not be null");
+
+            this.clientName = clientName;
+            return this;
+        }
+
+        /**
+         * Configures authentication.
          *
          * @param password the password
          * @return the builder
@@ -1114,9 +1172,9 @@ public Builder withPassword(String password) {
         }
 
         /**
-         * Adds timeout.
+         * Configures a timeout.
          *
-         * @param timeout must be greater or equal 0"
+         * @param timeout must be greater or equal 0.
          * @param unit the timeout time unit.
          * @return the builder
          */
@@ -1131,7 +1189,7 @@ public Builder withTimeout(long timeout, TimeUnit unit) {
         }
 
         /**
-         * Adds a sentinel master Id.
+         * Configures a sentinel master Id.
          * 
          * @param sentinelMasterId sentinel master id, must not be empty or {@literal null}
          * @return the builder
@@ -1145,7 +1203,6 @@ public Builder withSentinelMasterId(String sentinelMasterId) {
         }
 
         /**
-         *
          * @return the RedisURI.
          */
         public RedisURI build() {
@@ -1160,6 +1217,7 @@ public RedisURI build() {
             redisURI.setPort(port);
             redisURI.password = password;
             redisURI.setDatabase(database);
+            redisURI.setClientName(clientName);
 
             redisURI.setSentinelMasterId(sentinelMasterId);
 
diff --git a/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java b/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
index 8ce815ca42..e2e2f6b798 100644
--- a/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
@@ -32,11 +32,10 @@
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
 import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.codec.StringCodec;
 import com.lambdaworks.redis.output.MultiOutput;
-import com.lambdaworks.redis.protocol.CompleteableCommand;
-import com.lambdaworks.redis.protocol.ConnectionWatchdog;
-import com.lambdaworks.redis.protocol.RedisCommand;
-import com.lambdaworks.redis.protocol.TransactionalCommand;
+import com.lambdaworks.redis.output.StatusOutput;
+import com.lambdaworks.redis.protocol.*;
 import io.netty.channel.ChannelHandler;
 
 /**
@@ -60,6 +59,7 @@ public class StatefulRedisConnectionImpl<K, V> extends RedisChannelHandler<K, V>
     private char[] password;
     private int db;
     private boolean readOnly;
+    private String clientName;
 
     /**
      * Initialize a new connection.
@@ -138,6 +138,10 @@ public void activated() {
             async.selectAsync(db);
         }
 
+        if (clientName != null) {
+            setClientName(clientName);
+        }
+
         if (readOnly) {
             async.readOnly();
         }
@@ -219,4 +223,13 @@ private <T> RedisCommand<K, V, T> attachOnComplete(RedisCommand<K, V, T> command
         return command;
     }
 
+    public void setClientName(String clientName) {
+
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.SETNAME).addValue(clientName);
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(
+                new Command<>(CommandType.CLIENT, new StatusOutput<>(StringCodec.UTF8), args));
+        this.clientName = clientName;
+
+        dispatch((RedisCommand) async);
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index 0cfedb6788..2b55af3dce 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -599,6 +599,10 @@ private <K, V> void connectStateful(StatefulRedisConnectionImpl<K, V> connection
         if (connectionSettings.getPassword() != null && connectionSettings.getPassword().length != 0) {
             connection.async().auth(new String(connectionSettings.getPassword()));
         }
+
+        if (LettuceStrings.isNotEmpty(connectionSettings.getClientName())) {
+            connection.setClientName(connectionSettings.getClientName());
+        }
     }
 
     /**
@@ -615,6 +619,10 @@ private <K, V> void connectStateful(DefaultEndpoint endpoint, StatefulRedisClust
         if (connectionSettings.getPassword() != null && connectionSettings.getPassword().length != 0) {
             connection.async().auth(new String(connectionSettings.getPassword()));
         }
+
+        if (LettuceStrings.isNotEmpty(connectionSettings.getClientName())) {
+            connection.setClientName(connectionSettings.getClientName());
+        }
     }
 
     /**
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
index 4a2ca950af..18670a99ff 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
@@ -36,10 +36,10 @@
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.codec.StringCodec;
 import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.CompleteableCommand;
-import com.lambdaworks.redis.protocol.ConnectionWatchdog;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import com.lambdaworks.redis.output.StatusOutput;
+import com.lambdaworks.redis.protocol.*;
 
 import io.netty.channel.ChannelHandler;
 
@@ -59,6 +59,7 @@ public class StatefulRedisClusterConnectionImpl<K, V> extends RedisChannelHandle
 
     private char[] password;
     private boolean readOnly;
+    private String clientName;
 
     protected final RedisCodec<K, V> codec;
     protected final RedisAdvancedClusterCommands<K, V> sync;
@@ -147,11 +148,25 @@ public void activated() {
             async.authAsync(new String(password));
         }
 
+        if (clientName != null) {
+            setClientName(clientName);
+        }
+
         if (readOnly) {
             async.readOnly();
         }
     }
 
+    void setClientName(String clientName) {
+
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.SETNAME).addValue(clientName);
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(
+                new Command<>(CommandType.CLIENT, new StatusOutput<>(StringCodec.UTF8), args));
+        this.clientName = clientName;
+
+        dispatch((RedisCommand) async);
+    }
+
     @Override
     public <T, C extends RedisCommand<K, V, T>> C dispatch(C cmd) {
 
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
index 887537faf7..bcfe3c5876 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
@@ -253,6 +253,9 @@ public StatefulRedisConnection<K, V> apply(ConnectionKey key) {
                 builder.withPassword(new String(initialRedisUri.getPassword()));
             }
 
+            if (initialRedisUri.getClientName() != null) {
+                builder.withClientName(initialRedisUri.getClientName());
+            }
             builder.withDatabase(initialRedisUri.getDatabase());
 
             StatefulRedisConnection<K, V> connection = redisClient.connect(redisCodec, builder.build());
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/RedisMasterSlaveNode.java b/src/main/java/com/lambdaworks/redis/masterslave/RedisMasterSlaveNode.java
index 0bfd9b9fa2..7a84a207c9 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/RedisMasterSlaveNode.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/RedisMasterSlaveNode.java
@@ -35,7 +35,13 @@ public RedisMasterSlaveNode(String host, int port, RedisURI seed, Role role) {
             builder.withPassword(new String(seed.getPassword()));
         }
 
-        this.redisURI = builder.withDatabase(seed.getDatabase()).build();
+        if (seed.getClientName() != null) {
+            builder.withClientName(seed.getClientName());
+        }
+
+        builder.withDatabase(seed.getDatabase());
+
+        this.redisURI = builder.build();
         this.role = role;
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java b/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
index a0e2254c02..b678ad6eb3 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
@@ -20,7 +20,9 @@
 import com.lambdaworks.redis.RedisChannelHandler;
 import com.lambdaworks.redis.RedisChannelWriter;
 import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.output.StatusOutput;
+import com.lambdaworks.redis.protocol.*;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
 import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
 import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands;
@@ -38,6 +40,8 @@ public class StatefulRedisSentinelConnectionImpl<K, V> extends RedisChannelHandl
     protected final RedisSentinelAsyncCommands<K, V> async;
     protected final RedisSentinelReactiveCommands<K, V> reactive;
 
+    private String clientName;
+
     public StatefulRedisSentinelConnectionImpl(RedisChannelWriter writer, RedisCodec<K, V> codec, long timeout,
             TimeUnit unit) {
         super(writer, timeout, unit);
@@ -67,4 +71,24 @@ public RedisSentinelAsyncCommands<K, V> async() {
     public RedisSentinelReactiveCommands<K, V> reactive() {
         return reactive;
     }
+
+    @Override
+    public void activated() {
+
+        super.activated();
+
+        if (clientName != null) {
+            setClientName(clientName);
+        }
+    }
+
+    public void setClientName(String clientName) {
+
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.SETNAME).addValue(clientName);
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(
+                new Command<>(CommandType.CLIENT, new StatusOutput<>(StringCodec.UTF8), args));
+        this.clientName = clientName;
+
+        dispatch((RedisCommand) async);
+    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/ClientTest.java b/src/test/java/com/lambdaworks/redis/ClientTest.java
index b0fe55932c..f1873dd64d 100644
--- a/src/test/java/com/lambdaworks/redis/ClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientTest.java
@@ -39,6 +39,7 @@
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ClientTest extends AbstractRedisClientTest {
+
     @Rule
     public ExpectedException exception = ExpectedException.none();
 
@@ -263,4 +264,36 @@ public void reset() throws Exception {
         connection.close();
     }
 
+    @Test
+    public void standaloneConnectionShouldSetClientName() throws Exception {
+
+        RedisURI redisURI = RedisURI.create(host, port);
+        redisURI.setClientName("my-client");
+
+        StatefulRedisConnection<String, String> connection = client.connect(redisURI);
+
+        assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
+
+        connection.sync().quit();
+        assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
+
+        connection.close();
+    }
+
+    @Test
+    public void pubSubConnectionShouldSetClientName() throws Exception {
+
+        RedisURI redisURI = RedisURI.create(host, port);
+        redisURI.setClientName("my-client");
+
+        StatefulRedisConnection<String, String> connection = client.connectPubSub(redisURI);
+
+        assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
+
+        connection.sync().quit();
+        assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
+
+        connection.close();
+    }
+
 }
diff --git a/src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java b/src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java
index 6dd30fbd5b..b4a244f22d 100644
--- a/src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java
+++ b/src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java
@@ -22,6 +22,9 @@
 
 import org.junit.Test;
 
+/**
+ * @author Mark Paluch
+ */
 public class RedisURIBuilderTest {
 
     @Test
@@ -68,6 +71,14 @@ public void redisWithPort() throws Exception {
         assertThat(result.getPort()).isEqualTo(1234);
     }
 
+    @Test
+    public void redisWithClientName() throws Exception {
+        RedisURI result = RedisURI.Builder.redis("localhost").withClientName("hello").build();
+
+        assertThat(result.getHost()).isEqualTo("localhost");
+        assertThat(result.getClientName()).isEqualTo("hello");
+    }
+
     @Test(expected = IllegalArgumentException.class)
     public void redisHostAndPortWithInvalidPort() throws Exception {
         RedisURI.Builder.redis("localhost", -1);
diff --git a/src/test/java/com/lambdaworks/redis/RedisURITest.java b/src/test/java/com/lambdaworks/redis/RedisURITest.java
index 6335f6e23b..84938194b1 100644
--- a/src/test/java/com/lambdaworks/redis/RedisURITest.java
+++ b/src/test/java/com/lambdaworks/redis/RedisURITest.java
@@ -208,6 +208,14 @@ public void databaseParsingTest() {
         assertThat(redisURI.toURI().toString()).isEqualTo("redis://auth@localhost:1234?database=5");
     }
 
+    @Test
+    public void clientNameParsingTest() {
+        RedisURI redisURI = RedisURI.create("redis://auth@localhost:1234/?clientName=hello");
+        assertThat(redisURI.getClientName()).isEqualTo("hello");
+
+        assertThat(redisURI.toURI().toString()).isEqualTo("redis://auth@localhost:1234?clientName=hello");
+    }
+
     @Test
     public void parsingWithInvalidValuesTest() {
         RedisURI redisURI = RedisURI
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
index b79872966c..15d18f5bf5 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
@@ -41,6 +41,7 @@
 import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection;
 import com.lambdaworks.redis.protocol.AsyncCommand;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
 
@@ -66,7 +67,8 @@ public class RedisClusterClientTest extends AbstractClusterTest {
     public static void setupClient() throws Exception {
         setupClusterClient();
         client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port1).build());
-        clusterClient = RedisClusterClient.create(TestClientResources.get(), Collections.singletonList(RedisURI.Builder.redis(host, port1).build()));
+        clusterClient = RedisClusterClient
+                .create(TestClientResources.get(), Collections.singletonList(RedisURI.Builder.redis(host, port1).withClientName("my-client").build()));
     }
 
     @AfterClass
@@ -169,6 +171,42 @@ public void shouldApplyTimeoutOnPubSubConnectionUsingCodec() throws Exception {
         connection.close();
     }
 
+    @Test
+    public void clusterConnectionShouldSetClientName() throws Exception {
+
+        StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
+
+        assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
+        connection.sync().quit();
+        assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
+
+        StatefulRedisConnection<String, String> nodeConnection = connection
+                .getConnection(connection.getPartitions().getPartition(0).getNodeId());
+        assertThat(nodeConnection.sync().clientGetname()).isEqualTo("my-client");
+        nodeConnection.sync().quit();
+        assertThat(nodeConnection.sync().clientGetname()).isEqualTo("my-client");
+
+        connection.close();
+    }
+
+    @Test
+    public void pubSubclusterConnectionShouldSetClientName() throws Exception {
+
+        StatefulRedisClusterPubSubConnection<String, String> connection = clusterClient.connectPubSub();
+
+        assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
+        connection.sync().quit();
+        assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
+
+        StatefulRedisConnection<String, String> nodeConnection = connection
+                .getConnection(connection.getPartitions().getPartition(0).getNodeId());
+        assertThat(nodeConnection.sync().clientGetname()).isEqualTo("my-client");
+        nodeConnection.sync().quit();
+        assertThat(nodeConnection.sync().clientGetname()).isEqualTo("my-client");
+
+        connection.close();
+    }
+
     @Test
     public void reloadPartitions() throws Exception {
         assertThat(clusterClient.getPartitions()).hasSize(4);
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java
index 05779d808d..5ab7ff8ac3 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java
@@ -73,6 +73,21 @@ public void testMasterSlaveSentinelBasic() throws Exception {
         connection.close();
     }
 
+    @Test
+    public void masterSlaveConnectionShouldSetClientName() throws Exception {
+
+        RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).withClientName("my-client").build();
+
+        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(sentinelClient,
+                new Utf8StringCodec(), redisURI);
+
+        assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
+        connection.sync().quit();
+        assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
+
+        connection.close();
+    }
+
     @Test
     public void testMasterSlaveSentinelWithTwoUnavailableSentinels() throws Exception {
 
@@ -91,8 +106,7 @@ public void testMasterSlaveSentinelWithTwoUnavailableSentinels() throws Exceptio
     @Test
     public void testMasterSlaveSentinelWithUnavailableSentinels() throws Exception {
 
-        RedisURI uri = RedisURI
-                .create("redis-sentinel://127.0.0.1:21379,127.0.0.1:21379?sentinelMasterId=mymaster&timeout=5s");
+        RedisURI uri = RedisURI.create("redis-sentinel://127.0.0.1:21379,127.0.0.1:21379?sentinelMasterId=mymaster&timeout=5s");
 
         try {
             MasterSlave.connect(sentinelClient, new Utf8StringCodec(), uri);
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java
index 3bd186ba91..5f05b36354 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java
@@ -41,8 +41,9 @@
  */
 public class MasterSlaveTest extends AbstractRedisClientTest {
 
-    private RedisURI masterURI = RedisURI.Builder.redis(host, TestSettings.port(3)).withPassword(passwd).withDatabase(5)
-            .build();
+    private RedisURI masterURI = RedisURI.Builder.redis(host, TestSettings.port(3)).withPassword(passwd)
+            .withClientName("my-client").withDatabase(5).build();
+
     private StatefulRedisMasterSlaveConnectionImpl<String, String> connection;
     private RedisAsyncCommands<String, String> connectionToNode1;
     private RedisAsyncCommands<String, String> connectionToNode2;
@@ -167,6 +168,16 @@ public List<RedisNodeDescription> select(Nodes nodes) {
         slaveCall(connection);
     }
 
+    @Test
+    public void masterSlaveConnectionShouldSetClientName() throws Exception {
+
+        assertThat(connection.sync().clientGetname()).isEqualTo(masterURI.getClientName());
+        connection.sync().quit();
+        assertThat(connection.sync().clientGetname()).isEqualTo(masterURI.getClientName());
+
+        connection.close();
+    }
+
     @Test
     public void testConnectionCount() throws Exception {
 
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java b/src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java
index 13d78ce0cf..9c6f09fd44 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java
@@ -51,8 +51,8 @@ public class StaticMasterSlaveTest extends AbstractRedisClientTest {
     @Before
     public void before() throws Exception {
 
-        RedisURI node1 = RedisURI.Builder.redis(host, TestSettings.port(3)).withDatabase(2).build();
-        RedisURI node2 = RedisURI.Builder.redis(host, TestSettings.port(4)).withDatabase(2).build();
+        RedisURI node1 = RedisURI.Builder.redis(host, TestSettings.port(3)).withClientName("my-client").withDatabase(2).build();
+        RedisURI node2 = RedisURI.Builder.redis(host, TestSettings.port(4)).withClientName("my-client").withDatabase(2).build();
 
         connectionToNode1 = client.connect(node1).async();
         connectionToNode2 = client.connect(node2).async();
@@ -178,6 +178,16 @@ public void noMasterForWrite() throws Exception {
         connection.sync().set(key, value);
     }
 
+    @Test
+    public void masterSlaveConnectionShouldSetClientName() throws Exception {
+
+        assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
+        connection.sync().quit();
+        assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
+
+        connection.close();
+    }
+
     @Test
     public void testConnectionCount() throws Exception {
 
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
index 8f6decc055..e85a0d35a1 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
@@ -22,16 +22,17 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import com.lambdaworks.TestClientResources;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import com.lambdaworks.TestClientResources;
 import com.lambdaworks.Wait;
 import com.lambdaworks.redis.RedisClient;
 import com.lambdaworks.redis.RedisFuture;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.TestSettings;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
 import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
@@ -47,7 +48,8 @@ public class SentinelConnectionTest extends AbstractSentinelTest {
 
     @BeforeClass
     public static void setupClient() {
-        sentinelClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
+        sentinelClient = RedisClient.create(TestClientResources.get(),
+                RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
     }
 
     @Before
@@ -140,10 +142,38 @@ public void connectToOneNode() throws Exception {
         assertThat(connection.ping()).isEqualTo("PONG");
         connection.getStatefulConnection().close();
     }
+
     @Test
     public void connectWithByteCodec() throws Exception {
         RedisSentinelCommands<byte[], byte[]> connection = sentinelClient.connectSentinel(new ByteArrayCodec()).sync();
         assertThat(connection.master(MASTER_ID.getBytes())).isNotNull();
         connection.getStatefulConnection().close();
     }
+
+    @Test
+    public void sentinelConnectionShouldSetClientName() throws Exception {
+
+        RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).withClientName("my-client").build();
+
+        StatefulRedisSentinelConnection<String, String> connection = sentinelClient.connectSentinel(redisURI);
+
+        assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
+
+        connection.close();
+    }
+
+    @Test
+    public void sentinelManagedConnectionShouldSetClientName() throws Exception {
+
+        RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).withClientName("my-client").build();
+
+        StatefulRedisConnection<String, String> connection = sentinelClient.connect(redisURI);
+
+        assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
+
+        connection.sync().quit();
+        assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
+
+        connection.close();
+    }
 }

From 8b0a19ec06c9b515c3fc9587b1854703ab2d2a43 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 6 Dec 2016 17:17:05 +0100
Subject: [PATCH 083/808] Document RedisClient and RedisClusterClient
 implementation hooks #392

---
 .../com/lambdaworks/redis/RedisClient.java    | 124 +++++++-----
 .../redis/cluster/RedisClusterClient.java     | 190 +++++++++++-------
 2 files changed, 195 insertions(+), 119 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/com/lambdaworks/redis/RedisClient.java
index d16aa8e2e1..d7647a2d2d 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClient.java
@@ -421,8 +421,34 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
         return connection;
     }
 
+    /**
+     * Set the {@link ClientOptions} for the client.
+     *
+     * @param clientOptions the new client options
+     * @throws IllegalArgumentException if {@literal clientOptions} is null
+     */
+    @Override
+    public void setOptions(ClientOptions clientOptions) {
+        super.setOptions(clientOptions);
+    }
+
+    /**
+     * Returns the {@link ClientResources} which are used with that client.
+     *
+     * @return the {@link ClientResources} for this client
+     */
+    public ClientResources getResources() {
+        return clientResources;
+    }
+
+    // -------------------------------------------------------------------------
+    // Implementation hooks and helper methods
+    // -------------------------------------------------------------------------
+
     /**
      * Create a new instance of {@link StatefulRedisPubSubConnectionImpl} or a subclass.
+     * <p>
+     * Subclasses of {@link RedisClient} may override that method.
      *
      * @param endpoint the endpoint
      * @param channelWriter the channel writer
@@ -440,6 +466,8 @@ protected <K, V> StatefulRedisPubSubConnectionImpl<K, V> newStatefulRedisPubSubC
 
     /**
      * Create a new instance of {@link StatefulRedisSentinelConnectionImpl} or a subclass.
+     * <p>
+     * Subclasses of {@link RedisClient} may override that method.
      *
      * @param channelWriter the channel writer
      * @param codec codec
@@ -456,6 +484,8 @@ protected <K, V> StatefulRedisSentinelConnectionImpl<K, V> newStatefulRedisSenti
 
     /**
      * Create a new instance of {@link StatefulRedisConnectionImpl} or a subclass.
+     * <p>
+     * Subclasses of {@link RedisClient} may override that method.
      *
      * @param channelWriter the channel writer
      * @param codec codec
@@ -470,6 +500,51 @@ protected <K, V> StatefulRedisConnectionImpl<K, V> newStatefulRedisConnection(Re
         return new StatefulRedisConnectionImpl<>(channelWriter, codec, timeout, unit);
     }
 
+    /**
+     * Resolve a {@link RedisURI} to a {@link SocketAddress}. Resolution is performed either using Redis Sentinel (if the
+     * {@link RedisURI} is configured with Sentinels) or via DNS resolution.
+     * <p>
+     * Subclasses of {@link RedisClient} may override that method.
+     * 
+     * @param redisURI must not be {@literal null}.
+     * @return the resolved {@link SocketAddress}.
+     * @throws InterruptedException
+     * @throws TimeoutException
+     * @throws ExecutionException
+     * @see ClientResources#dnsResolver()
+     * @see RedisURI#getSentinels()
+     * @see RedisURI#getSentinelMasterId()
+     */
+    protected SocketAddress getSocketAddress(RedisURI redisURI)
+            throws InterruptedException, TimeoutException, ExecutionException {
+        SocketAddress redisAddress;
+
+        if (redisURI.getSentinelMasterId() != null && !redisURI.getSentinels().isEmpty()) {
+            logger.debug("Connecting to Redis using Sentinels {}, MasterId {}", redisURI.getSentinels(),
+                    redisURI.getSentinelMasterId());
+            redisAddress = lookupRedis(redisURI);
+
+            if (redisAddress == null) {
+                throw new RedisConnectionException(
+                        "Cannot provide redisAddress using sentinel for masterId " + redisURI.getSentinelMasterId());
+            }
+
+        } else {
+            redisAddress = SocketAddressResolver.resolve(redisURI, clientResources.dnsResolver());
+        }
+        return redisAddress;
+    }
+
+    /**
+     * Returns a {@link String} {@link RedisCodec codec}.
+     *
+     * @return a {@link String} {@link RedisCodec codec}.
+     * @see StringCodec#UTF8
+     */
+    protected RedisCodec<String, String> newStringStringCodec() {
+        return StringCodec.UTF8;
+    }
+
     private void validateUrisAreOfSameConnectionType(List<RedisURI> redisUris) {
         boolean unixDomainSocket = false;
         boolean inetSocket = false;
@@ -502,41 +577,9 @@ private Supplier<SocketAddress> getSocketAddressSupplier(final RedisURI redisURI
         };
     }
 
-    /**
-     * Returns the {@link ClientResources} which are used with that client.
-     *
-     * @return the {@link ClientResources} for this client
-     */
-    public ClientResources getResources() {
-        return clientResources;
-    }
-
-    private SocketAddress getSocketAddress(RedisURI redisURI)
-            throws InterruptedException, TimeoutException, ExecutionException {
-        SocketAddress redisAddress;
-
-        if (redisURI.getSentinelMasterId() != null && !redisURI.getSentinels().isEmpty()) {
-            logger.debug("Connecting to Redis using Sentinels {}, MasterId {}", redisURI.getSentinels(),
-                    redisURI.getSentinelMasterId());
-            redisAddress = lookupRedis(redisURI);
-
-            if (redisAddress == null) {
-                throw new RedisConnectionException(
-                        "Cannot provide redisAddress using sentinel for masterId " + redisURI.getSentinelMasterId());
-            }
-
-        } else {
-            redisAddress = SocketAddressResolver.resolve(redisURI, clientResources.dnsResolver());
-        }
-        return redisAddress;
-    }
-
     private SocketAddress lookupRedis(RedisURI sentinelUri) throws InterruptedException, TimeoutException, ExecutionException {
-        StatefulRedisSentinelConnection<String, String> connection = connectSentinel(sentinelUri);
-        try {
+        try (StatefulRedisSentinelConnection<String, String> connection = connectSentinel(sentinelUri)) {
             return connection.async().getMasterAddrByName(sentinelUri.getSentinelMasterId()).get(timeout, unit);
-        } finally {
-            connection.close();
         }
     }
 
@@ -562,10 +605,6 @@ private void checkValidRedisURI(RedisURI redisURI) {
         }
     }
 
-    protected RedisCodec<String, String> newStringStringCodec() {
-        return StringCodec.UTF8;
-    }
-
     private static <K, V> void assertNotNull(RedisCodec<K, V> codec) {
         LettuceAssert.notNull(codec, "RedisCodec must not be null");
     }
@@ -584,17 +623,6 @@ private void checkForRedisURI() {
         checkValidRedisURI(this.redisURI);
     }
 
-    /**
-     * Set the {@link ClientOptions} for the client.
-     *
-     * @param clientOptions the new client options
-     * @throws IllegalArgumentException if {@literal clientOptions} is null
-     */
-    @Override
-    public void setOptions(ClientOptions clientOptions) {
-        super.setOptions(clientOptions);
-    }
-
     private Timeout defaultTimeout() {
         return Timeout.of(timeout, unit);
     }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index 2b55af3dce..229e268770 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -773,41 +773,6 @@ private void activateTopologyRefreshIfNeeded() {
         }
     }
 
-    protected RedisURI getFirstUri() {
-        assertNotEmpty(initialUris);
-        Iterator<RedisURI> iterator = initialUris.iterator();
-        return iterator.next();
-    }
-
-    /**
-     * Returns a {@link Supplier} for {@link SocketAddress connection points}.
-     * 
-     * @param sortFunction Sort function to enforce a specific order. The sort function must not change the order or the input
-     *        parameter but create a new collection with the desired order, must not be {@literal null}.
-     * @return {@link Supplier} for {@link SocketAddress connection points}.
-     */
-    protected Supplier<SocketAddress> getSocketAddressSupplier(
-            Function<Partitions, Collection<RedisClusterNode>> sortFunction) {
-
-        LettuceAssert.notNull(sortFunction, "Sort function must not be null");
-
-        final RoundRobinSocketAddressSupplier socketAddressSupplier = new RoundRobinSocketAddressSupplier(partitions,
-                sortFunction, clientResources);
-        return () -> {
-            if (partitions.isEmpty()) {
-                SocketAddress socketAddress = SocketAddressResolver.resolve(getFirstUri(), clientResources.dnsResolver());
-                logger.debug("Resolved SocketAddress {} using {}", socketAddress, getFirstUri());
-                return socketAddress;
-            }
-
-            return socketAddressSupplier.get();
-        };
-    }
-
-    protected RedisCodec<String, String> newStringStringCodec() {
-        return StringCodec.UTF8;
-    }
-
     /**
      * Sets the new cluster topology. The partitions are not applied to existing connections.
      *
@@ -852,14 +817,88 @@ public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
         super.shutdown(quietPeriod, timeout, timeUnit);
     }
 
+    /**
+     * Set the {@link ClusterClientOptions} for the client.
+     *
+     * @param clientOptions client options for the client and connections that are created after setting the options
+     */
+    public void setOptions(ClusterClientOptions clientOptions) {
+        super.setOptions(clientOptions);
+    }
+
+    // -------------------------------------------------------------------------
+    // Implementation hooks and helper methods
+    // -------------------------------------------------------------------------
+
+    /**
+     * Returns the first {@link RedisURI} configured with this {@link RedisClusterClient} instance.
+     * 
+     * @return the first {@link RedisURI}.
+     */
+    protected RedisURI getFirstUri() {
+        assertNotEmpty(initialUris);
+        Iterator<RedisURI> iterator = initialUris.iterator();
+        return iterator.next();
+    }
+
+    /**
+     * Returns a {@link Supplier} for {@link SocketAddress connection points}.
+     * 
+     * @param sortFunction Sort function to enforce a specific order. The sort function must not change the order or the input
+     *        parameter but create a new collection with the desired order, must not be {@literal null}.
+     * @return {@link Supplier} for {@link SocketAddress connection points}.
+     */
+    protected Supplier<SocketAddress> getSocketAddressSupplier(
+            Function<Partitions, Collection<RedisClusterNode>> sortFunction) {
+
+        LettuceAssert.notNull(sortFunction, "Sort function must not be null");
+
+        final RoundRobinSocketAddressSupplier socketAddressSupplier = new RoundRobinSocketAddressSupplier(partitions,
+                sortFunction, clientResources);
+        return () -> {
+            if (partitions.isEmpty()) {
+                SocketAddress socketAddress = SocketAddressResolver.resolve(getFirstUri(), clientResources.dnsResolver());
+                logger.debug("Resolved SocketAddress {} using {}", socketAddress, getFirstUri());
+                return socketAddress;
+            }
+
+            return socketAddressSupplier.get();
+        };
+    }
+
+    /**
+     * Returns an {@link Iterable} of the initial {@link RedisURI URIs}.
+     * 
+     * @return the initial {@link RedisURI URIs}
+     */
+    protected Iterable<RedisURI> getInitialUris() {
+        return initialUris;
+    }
+
+    /**
+     * Apply a {@link Consumer} of {@link StatefulRedisClusterConnectionImpl} to all active connections.
+     * 
+     * @param function the {@link Consumer}.
+     */
     protected void forEachClusterConnection(Consumer<StatefulRedisClusterConnectionImpl<?, ?>> function) {
         forEachCloseable(input -> input instanceof StatefulRedisClusterConnectionImpl, function);
     }
 
+    /**
+     * Apply a {@link Consumer} of {@link StatefulRedisClusterPubSubConnectionImpl} to all active connections.
+     *
+     * @param function the {@link Consumer}.
+     */
     protected void forEachClusterPubSubConnection(Consumer<StatefulRedisClusterPubSubConnectionImpl<?, ?>> function) {
         forEachCloseable(input -> input instanceof StatefulRedisClusterPubSubConnectionImpl, function);
     }
 
+    /**
+     * Apply a {@link Consumer} of {@link Closeable} to all active connections.
+     *
+     * @param function the {@link Consumer}.
+     */
+    @SuppressWarnings("unchecked")
     protected <T extends Closeable> void forEachCloseable(Predicate<? super Closeable> selector, Consumer<T> function) {
         for (Closeable c : closeableResources) {
             if (selector.test(c)) {
@@ -869,21 +908,57 @@ protected <T extends Closeable> void forEachCloseable(Predicate<? super Closeabl
     }
 
     /**
-     * Set the {@link ClusterClientOptions} for the client.
-     *
-     * @param clientOptions client options for the client and connections that are created after setting the options
+     * Returns the seed {@link RedisURI} for the topology refreshing. This method is called before each topology refresh to
+     * provide an {@link Iterable} of {@link RedisURI} that is used to perform the next topology refresh.
+     * <p>
+     * Subclasses of {@link RedisClusterClient} may override that method.
+     * 
+     * @return {@link Iterable} of {@link RedisURI} for the next topology refresh.
      */
-    public void setOptions(ClusterClientOptions clientOptions) {
-        super.setOptions(clientOptions);
+    protected Iterable<RedisURI> getTopologyRefreshSource() {
+
+        boolean initialSeedNodes = !useDynamicRefreshSources();
+
+        Iterable<RedisURI> seed;
+        if (initialSeedNodes || partitions == null || partitions.isEmpty()) {
+            seed = RedisClusterClient.this.initialUris;
+        } else {
+            List<RedisURI> uris = new ArrayList<>();
+            for (RedisClusterNode partition : TopologyComparators.sortByUri(partitions)) {
+                uris.add(partition.getUri());
+            }
+            seed = uris;
+        }
+        return seed;
     }
 
     /**
-     * Returns the initial {@link RedisURI URIs}.
+     * Returns {@link true} if {@link ClusterTopologyRefreshOptions#useDynamicRefreshSources() dynamic refresh sources} are
+     * enabled.
+     * <p>
+     * Subclasses of {@link RedisClusterClient} may override that method.
      * 
-     * @return the initial {@link RedisURI URIs}
+     * @return {@link true} if dynamic refresh sources are used.
+     * @see ClusterTopologyRefreshOptions#useDynamicRefreshSources()
      */
-    protected Iterable<RedisURI> getInitialUris() {
-        return initialUris;
+    protected boolean useDynamicRefreshSources() {
+
+        if (getClusterClientOptions() != null) {
+            ClusterTopologyRefreshOptions topologyRefreshOptions = getClusterClientOptions().getTopologyRefreshOptions();
+
+            return topologyRefreshOptions.useDynamicRefreshSources();
+        }
+        return true;
+    }
+
+    /**
+     * Returns a {@link String} {@link RedisCodec codec}.
+     *
+     * @return a {@link String} {@link RedisCodec codec}.
+     * @see StringCodec#UTF8
+     */
+    protected RedisCodec<String, String> newStringStringCodec() {
+        return StringCodec.UTF8;
     }
 
     ClusterClientOptions getClusterClientOptions() {
@@ -915,33 +990,6 @@ private static void assertNotNull(ClientResources clientResources) {
         LettuceAssert.notNull(clientResources, "ClientResources must not be null");
     }
 
-    protected Iterable<RedisURI> getTopologyRefreshSource() {
-
-        boolean initialSeedNodes = !useDynamicRefreshSources();
-
-        Iterable<RedisURI> seed;
-        if (initialSeedNodes || partitions == null || partitions.isEmpty()) {
-            seed = RedisClusterClient.this.initialUris;
-        } else {
-            List<RedisURI> uris = new ArrayList<>();
-            for (RedisClusterNode partition : TopologyComparators.sortByUri(partitions)) {
-                uris.add(partition.getUri());
-            }
-            seed = uris;
-        }
-        return seed;
-    }
-
-    protected boolean useDynamicRefreshSources() {
-
-        if (getClusterClientOptions() != null) {
-            ClusterTopologyRefreshOptions topologyRefreshOptions = getClusterClientOptions().getTopologyRefreshOptions();
-
-            return topologyRefreshOptions.useDynamicRefreshSources();
-        }
-        return true;
-    }
-
     private class NodeConnectionFactoryImpl implements NodeConnectionFactory {
         @Override
         public <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, SocketAddress socketAddress) {

From fadc8ecef56ce5c9fa90cc7110801dc26fb952b9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 6 Dec 2016 17:34:23 +0100
Subject: [PATCH 084/808] Disable WAIT as Read-Only command #418

---
 .../java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java    | 2 +-
 .../com/lambdaworks/redis/masterslave/ReadOnlyCommands.java     | 2 +-
 .../com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java b/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
index 8f708e2a6a..22972885da 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
@@ -48,7 +48,7 @@ enum CommandName {
         HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, MULTI, PFCOUNT, PTTL, //
         RANDOMKEY, READWRITE, SCAN, SCARD, SCRIPT, //
         SDIFF, SINTER, SISMEMBER, SMEMBERS, SRANDMEMBER, SSCAN, STRLEN, //
-        SUNION, TIME, TTL, TYPE, WAIT, ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE, //
+        SUNION, TIME, TTL, TYPE, ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE, //
         ZRANGEBYLEX, ZRANGEBYSCORE, ZRANK, ZREVRANGE, ZREVRANGEBYLEX, ZREVRANGEBYSCORE, ZREVRANK, ZSCAN, ZSCORE, //
 
         // Pub/Sub commands are no key-space commands so they are safe to execute on slave nodes
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java b/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
index 6df5ed08bf..f5952854db 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
@@ -48,7 +48,7 @@ enum CommandName {
         HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, MULTI, PFCOUNT, PTTL, //
         RANDOMKEY, READWRITE, SCAN, SCARD, SCRIPT, //
         SDIFF, SINTER, SISMEMBER, SMEMBERS, SRANDMEMBER, SSCAN, STRLEN, //
-        SUNION, TIME, TTL, TYPE, WAIT, ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE, //
+        SUNION, TIME, TTL, TYPE, ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE, //
         ZRANGEBYLEX, ZRANGEBYSCORE, ZRANK, ZREVRANGE, ZREVRANGEBYLEX, ZREVRANGEBYSCORE, ZREVRANK, ZSCAN, ZSCORE,
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java b/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
index 528efd5564..d8c346c563 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
@@ -28,7 +28,7 @@ public class ReadOnlyCommandsTest {
 
     @Test
     public void testCount() throws Exception {
-        assertThat(ReadOnlyCommands.READ_ONLY_COMMANDS).hasSize(72);
+        assertThat(ReadOnlyCommands.READ_ONLY_COMMANDS).hasSize(71);
     }
 
     @Test

From fcf1320e292fce34dfbdc8c2c4ccb35df3dd4832 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 7 Dec 2016 08:35:26 +0100
Subject: [PATCH 085/808] Allow databases greater than 15 in RedisURI #420

---
 src/main/java/com/lambdaworks/redis/RedisURI.java           | 5 ++++-
 .../java/com/lambdaworks/redis/RedisURIBuilderTest.java     | 3 ++-
 src/test/java/com/lambdaworks/redis/RedisURITest.java       | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/RedisURI.java b/src/main/java/com/lambdaworks/redis/RedisURI.java
index fa74b34184..9e14520874 100644
--- a/src/main/java/com/lambdaworks/redis/RedisURI.java
+++ b/src/main/java/com/lambdaworks/redis/RedisURI.java
@@ -386,6 +386,9 @@ public int getDatabase() {
      * @param database the Redis database number.
      */
     public void setDatabase(int database) {
+
+        LettuceAssert.isTrue(database >= 0, "Invalid database number: " + database);
+
         this.database = database;
     }
 
@@ -1137,7 +1140,7 @@ public Builder withVerifyPeer(boolean verifyPeer) {
          */
         public Builder withDatabase(int database) {
 
-            LettuceAssert.isTrue(database >= 0 && database <= 15, "Invalid database number: " + database);
+            LettuceAssert.isTrue(database >= 0, "Invalid database number: " + database);
 
             this.database = database;
             return this;
diff --git a/src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java b/src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java
index b4a244f22d..8737991561 100644
--- a/src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java
+++ b/src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java
@@ -91,12 +91,13 @@ public void redisWithInvalidPort() throws Exception {
 
     @Test
     public void redisFromUrl() throws Exception {
-        RedisURI result = RedisURI.create(RedisURI.URI_SCHEME_REDIS + "://password@localhost/1");
+        RedisURI result = RedisURI.create(RedisURI.URI_SCHEME_REDIS + "://password@localhost/21");
 
         assertThat(result.getSentinels()).isEmpty();
         assertThat(result.getHost()).isEqualTo("localhost");
         assertThat(result.getPort()).isEqualTo(RedisURI.DEFAULT_REDIS_PORT);
         assertThat(result.getPassword()).isEqualTo("password".toCharArray());
+        assertThat(result.getDatabase()).isEqualTo(21);
         assertThat(result.isSsl()).isFalse();
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/RedisURITest.java b/src/test/java/com/lambdaworks/redis/RedisURITest.java
index 84938194b1..f0898ea236 100644
--- a/src/test/java/com/lambdaworks/redis/RedisURITest.java
+++ b/src/test/java/com/lambdaworks/redis/RedisURITest.java
@@ -202,10 +202,10 @@ private RedisURI checkUriTimeout(String uri, long expectedTimeout, TimeUnit expe
 
     @Test
     public void databaseParsingTest() {
-        RedisURI redisURI = RedisURI.create("redis://auth@localhost:1234/?database=5");
-        assertThat(redisURI.getDatabase()).isEqualTo(5);
+        RedisURI redisURI = RedisURI.create("redis://auth@localhost:1234/?database=21");
+        assertThat(redisURI.getDatabase()).isEqualTo(21);
 
-        assertThat(redisURI.toURI().toString()).isEqualTo("redis://auth@localhost:1234?database=5");
+        assertThat(redisURI.toURI().toString()).isEqualTo("redis://auth@localhost:1234?database=21");
     }
 
     @Test

From 95a4a41fc0ec67a2a95fc74a13827d8c81203a7d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 10 Dec 2016 15:18:36 +0100
Subject: [PATCH 086/808] Polishing #414

Optimize Imports in API package. Add missing @Deprecated annotations. Copy file header comment in interface generator.
---
 .../api/async/BaseRedisAsyncCommands.java     |   5 +-
 .../api/async/RedisGeoAsyncCommands.java      |   4 +-
 .../api/async/RedisHashAsyncCommands.java     |   9 +-
 .../api/async/RedisKeyAsyncCommands.java      |  10 +-
 .../api/async/RedisListAsyncCommands.java     |   3 +-
 .../async/RedisScriptingAsyncCommands.java    |   3 +-
 .../api/async/RedisServerAsyncCommands.java   |   7 +-
 .../api/async/RedisSetAsyncCommands.java      |   7 +-
 .../async/RedisSortedSetAsyncCommands.java    |  13 +--
 .../api/async/RedisStringAsyncCommands.java   | 101 +++++++++---------
 .../RedisTransactionalAsyncCommands.java      |   3 +-
 .../reactive/BaseRedisReactiveCommands.java   |   5 +-
 .../reactive/RedisGeoReactiveCommands.java    |   2 -
 .../reactive/RedisHLLReactiveCommands.java    |   1 -
 .../reactive/RedisHashReactiveCommands.java   |  10 +-
 .../reactive/RedisKeyReactiveCommands.java    |  11 +-
 .../reactive/RedisListReactiveCommands.java   |   2 +-
 .../RedisScriptingReactiveCommands.java       |   2 +-
 .../reactive/RedisServerReactiveCommands.java |   4 +-
 .../reactive/RedisSetReactiveCommands.java    |   2 +-
 .../RedisSortedSetReactiveCommands.java       |  13 +--
 .../reactive/RedisStringReactiveCommands.java |  99 ++++++++---------
 .../RedisTransactionalReactiveCommands.java   |   3 +-
 .../redis/api/sync/BaseRedisCommands.java     |   3 +-
 .../redis/api/sync/RedisGeoCommands.java      |   4 +-
 .../redis/api/sync/RedisHashCommands.java     |   8 +-
 .../redis/api/sync/RedisKeyCommands.java      |   9 +-
 .../redis/api/sync/RedisListCommands.java     |   1 +
 .../api/sync/RedisScriptingCommands.java      |   1 +
 .../redis/api/sync/RedisServerCommands.java   |   5 +
 .../redis/api/sync/RedisSetCommands.java      |   1 +
 .../api/sync/RedisSortedSetCommands.java      |  12 +--
 .../redis/api/sync/RedisStringCommands.java   |  99 +++++++++--------
 .../api/sync/RedisTransactionalCommands.java  |   1 -
 .../async/BaseNodeSelectionAsyncCommands.java |  19 +---
 .../async/NodeSelectionGeoAsyncCommands.java  |   4 +-
 .../async/NodeSelectionHLLAsyncCommands.java  |   2 -
 .../async/NodeSelectionHashAsyncCommands.java |   9 +-
 .../async/NodeSelectionKeyAsyncCommands.java  |  10 +-
 .../async/NodeSelectionListAsyncCommands.java |   2 +-
 .../NodeSelectionScriptingAsyncCommands.java  |   2 +-
 .../NodeSelectionServerAsyncCommands.java     |   2 +-
 .../async/NodeSelectionSetAsyncCommands.java  |   1 +
 .../NodeSelectionSortedSetAsyncCommands.java  |  13 +--
 .../NodeSelectionStringAsyncCommands.java     | 100 +++++++++--------
 .../api/sync/BaseNodeSelectionCommands.java   |  19 ----
 .../redis/cluster/api/sync/Executions.java    |   1 -
 .../api/sync/NodeSelectionGeoCommands.java    |   4 +-
 .../api/sync/NodeSelectionHashCommands.java   |   8 +-
 .../api/sync/NodeSelectionKeyCommands.java    |   9 +-
 .../api/sync/NodeSelectionListCommands.java   |   1 +
 .../sync/NodeSelectionScriptingCommands.java  |   1 +
 .../api/sync/NodeSelectionServerCommands.java |   1 +
 .../api/sync/NodeSelectionSetCommands.java    |   1 +
 .../sync/NodeSelectionSortedSetCommands.java  |  12 +--
 .../api/sync/NodeSelectionStringCommands.java |  99 +++++++++--------
 .../redis/api/RedisGeoCommands.java           |   6 +-
 .../redis/api/RedisHashCommands.java          |   7 +-
 .../redis/api/RedisKeyCommands.java           |   8 +-
 .../redis/api/RedisSortedSetCommands.java     |  11 +-
 .../redis/api/RedisStringCommands.java        |  96 ++++++++---------
 .../apigenerator/CompilationUnitFactory.java  |   1 +
 .../apigenerator/CreateAsyncApi.java          |  15 ++-
 .../CreateAsyncNodeSelectionClusterApi.java   |  11 +-
 .../CreateSyncNodeSelectionClusterApi.java    |   2 +-
 65 files changed, 407 insertions(+), 533 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java
index 6386425395..aea62fdae5 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java
@@ -17,10 +17,11 @@
 
 import java.util.List;
 import java.util.Map;
+
+import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.output.CommandOutput;
 import com.lambdaworks.redis.protocol.CommandArgs;
 import com.lambdaworks.redis.protocol.ProtocolKeyword;
-import com.lambdaworks.redis.output.CommandOutput;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * 
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
index b2a04755de..962e8c4742 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
@@ -15,11 +15,11 @@
  */
 package com.lambdaworks.redis.api.async;
 
-import com.lambdaworks.redis.*;
-
 import java.util.List;
 import java.util.Set;
 
+import com.lambdaworks.redis.*;
+
 /**
  * Asynchronous executed commands for the Geo-API.
  *
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java
index a06772c2a7..90806cc534 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java
@@ -17,16 +17,11 @@
 
 import java.util.List;
 import java.util.Map;
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.MapScanCursor;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
+
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands for Hashes (Key-Value pairs).
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java
index ed80797eed..2d3ca33f3f 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java
@@ -17,16 +17,10 @@
 
 import java.util.Date;
 import java.util.List;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.KeyScanCursor;
-import com.lambdaworks.redis.MigrateArgs;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.SortArgs;
-import com.lambdaworks.redis.StreamScanCursor;
+
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands for Keys (Key manipulation/querying).
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java
index 944dcd69b7..071461cf84 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java
@@ -16,9 +16,10 @@
 package com.lambdaworks.redis.api.async;
 
 import java.util.List;
+
 import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
 import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.output.ValueStreamingChannel;
 
 /**
  * Asynchronous executed commands for Lists.
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisScriptingAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisScriptingAsyncCommands.java
index b890923184..f6038c852b 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisScriptingAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisScriptingAsyncCommands.java
@@ -16,8 +16,9 @@
 package com.lambdaworks.redis.api.async;
 
 import java.util.List;
-import com.lambdaworks.redis.ScriptOutputType;
+
 import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.ScriptOutputType;
 
 /**
  * Asynchronous executed commands for Scripting.
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
index dfd6d79389..17da5436bd 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
@@ -17,9 +17,10 @@
 
 import java.util.Date;
 import java.util.List;
+
 import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.protocol.CommandType;
 import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.protocol.CommandType;
 
 /**
  * Asynchronous executed commands for Server Control.
@@ -187,11 +188,15 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Make the server crash: Out of memory.
+     *
+     * @return nothing, because the server crashes before returning.
      */
     void debugOom();
 
     /**
      * Make the server crash: Invalid pointer access.
+     *
+     * @return nothing, because the server crashes before returning.
      */
     void debugSegfault();
 
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisSetAsyncCommands.java
index 54c2be87b2..6177ae50f6 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisSetAsyncCommands.java
@@ -17,12 +17,9 @@
 
 import java.util.List;
 import java.util.Set;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
-import com.lambdaworks.redis.ValueScanCursor;
+
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands for Sets.
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
index babe589e87..a76354f598 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
@@ -16,18 +16,10 @@
 package com.lambdaworks.redis.api.async;
 
 import java.util.List;
-import com.lambdaworks.redis.Limit;
-import com.lambdaworks.redis.Range;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.ScoredValue;
-import com.lambdaworks.redis.ScoredValueScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
-import com.lambdaworks.redis.ZAddArgs;
-import com.lambdaworks.redis.ZStoreArgs;
+
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands for Sorted Sets.
@@ -524,6 +516,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
     /**
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
index 90ac8f8c6e..e58204512b 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
@@ -17,17 +17,16 @@
 
 import java.util.List;
 import java.util.Map;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+
 import com.lambdaworks.redis.BitFieldArgs;
 import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.SetArgs;
-import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.SetArgs;
+import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 
 /**
  * Asynchronous executed commands for Strings.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -38,7 +37,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Append a value to a key.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return Long integer-reply the length of the string after the append operation.
@@ -47,52 +46,52 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Count set bits in a string.
-     * 
+     *
      * @param key the key
-     * 
+     *
      * @return Long integer-reply The number of bits set to 1.
      */
     RedisFuture<Long> bitcount(K key);
 
     /**
      * Count set bits in a string.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param end the end
-     * 
+     *
      * @return Long integer-reply The number of bits set to 1.
      */
     RedisFuture<Long> bitcount(K key, long start, long end);
 
     /**
      * Execute {@code BITFIELD} with its subcommands.
-     * 
+     *
      * @param key the key
      * @param bitFieldArgs the args containing subcommands, must not be {@literal null}.
-     * 
+     *
      * @return Long bulk-reply the results from the bitfield commands.
      */
     RedisFuture<List<Long>> bitfield(K key, BitFieldArgs bitFieldArgs);
 
     /**
      * Find first bit set or clear in a string.
-     * 
+     *
      * @param key the key
      * @param state the state
-     * 
+     *
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     * 
+     *
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     * 
+     *
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     * 
+     *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     * 
+     *
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -101,23 +100,23 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Find first bit set or clear in a string.
-     * 
+     *
      * @param key the key
      * @param state the bit type: long
      * @param start the start type: long
      * @param end the end type: long
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     * 
+     *
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     * 
+     *
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     * 
+     *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     * 
+     *
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -126,7 +125,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Perform bitwise AND between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -136,7 +135,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Perform bitwise NOT between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param source operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -146,7 +145,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Perform bitwise OR between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -156,7 +155,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Perform bitwise XOR between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -166,7 +165,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by one.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the decrement
      */
@@ -174,7 +173,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by the given number.
-     * 
+     *
      * @param key the key
      * @param amount the decrement type: long
      * @return Long integer-reply the value of {@code key} after the decrement
@@ -183,7 +182,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Get the value of a key.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of {@code key}, or {@literal null} when {@code key} does not exist.
      */
@@ -191,7 +190,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Returns the bit value at offset in the string value stored at key.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @return Long integer-reply the bit value stored at <em>offset</em>.
@@ -200,7 +199,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Get a substring of the string stored at a key.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param end the end type: long
@@ -210,7 +209,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Set the string value of a key and return its old value.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return V bulk-string-reply the old value stored at {@code key}, or {@literal null} when {@code key} did not exist.
@@ -219,7 +218,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Increment the integer value of a key by one.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the increment
      */
@@ -227,7 +226,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Increment the integer value of a key by the given amount.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: long
      * @return Long integer-reply the value of {@code key} after the increment
@@ -236,7 +235,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Increment the float value of a key by the given amount.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: double
      * @return Double bulk-string-reply the value of {@code key} after the increment.
@@ -245,7 +244,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Get the values of all the given keys.
-     * 
+     *
      * @param keys the key
      * @return List&lt;V&gt; array-reply list of values at the specified keys.
      */
@@ -263,7 +262,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Set multiple keys to multiple values.
-     * 
+     *
      * @param map the null
      * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail.
      */
@@ -271,38 +270,38 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Set multiple keys to multiple values, only if none of the keys exist.
-     * 
+     *
      * @param map the null
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
      */
     RedisFuture<Boolean> msetnx(Map<K, V> map);
 
     /**
      * Set the string value of a key.
-     * 
+     *
      * @param key the key
      * @param value the value
-     * 
+     *
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     RedisFuture<String> set(K key, V value);
 
     /**
      * Set the string value of a key.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @param setArgs the setArgs
-     * 
+     *
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     RedisFuture<String> set(K key, V value, SetArgs setArgs);
 
     /**
      * Sets or clears the bit at offset in the string value stored at key.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @param value the value type: string
@@ -312,7 +311,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Set the value and expiration of a key.
-     * 
+     *
      * @param key the key
      * @param seconds the seconds type: long
      * @param value the value
@@ -322,7 +321,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Set the value and expiration in milliseconds of a key.
-     * 
+     *
      * @param key the key
      * @param milliseconds the milliseconds type: long
      * @param value the value
@@ -332,18 +331,18 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Set the value of a key, only if the key does not exist.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@code 1} if the key was set {@code 0} if the key was not set
      */
     RedisFuture<Boolean> setnx(K key, V value);
 
     /**
      * Overwrite part of a string at key starting at the specified offset.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @param value the value
@@ -353,7 +352,7 @@ public interface RedisStringAsyncCommands<K, V> {
 
     /**
      * Get the length of the value stored in a key.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the length of the string at {@code key}, or {@code 0} when {@code key} does not exist.
      */
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java
index 71076f08d0..e7f55f29c5 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java
@@ -15,9 +15,8 @@
  */
 package com.lambdaworks.redis.api.async;
 
-import java.util.List;
-import com.lambdaworks.redis.TransactionResult;
 import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.TransactionResult;
 
 /**
  * Asynchronous executed commands for Transactions.
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java
index 76d0fe8161..735e33aa7c 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java
@@ -15,11 +15,12 @@
  */
 package com.lambdaworks.redis.api.reactive;
 
-import java.util.List;
 import java.util.Map;
+
+import com.lambdaworks.redis.output.CommandOutput;
 import com.lambdaworks.redis.protocol.CommandArgs;
 import com.lambdaworks.redis.protocol.ProtocolKeyword;
-import com.lambdaworks.redis.output.CommandOutput;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java
index 5eccc74ac6..5de0c6ba20 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java
@@ -17,8 +17,6 @@
 
 import com.lambdaworks.redis.*;
 
-import java.util.List;
-import java.util.Set;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java
index 953c1080b1..0eddbd8a14 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java
@@ -15,7 +15,6 @@
  */
 package com.lambdaworks.redis.api.reactive;
 
-import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java
index 2804603b6e..dd48f79069 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java
@@ -15,17 +15,13 @@
  */
 package com.lambdaworks.redis.api.reactive;
 
-import java.util.List;
 import java.util.Map;
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.MapScanCursor;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
+
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java
index d5c232a2da..882bc699d7 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java
@@ -16,16 +16,11 @@
 package com.lambdaworks.redis.api.reactive;
 
 import java.util.Date;
-import java.util.List;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.KeyScanCursor;
-import com.lambdaworks.redis.MigrateArgs;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.SortArgs;
-import com.lambdaworks.redis.StreamScanCursor;
+
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java
index 704999d4c3..7fb36bc541 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java
@@ -15,9 +15,9 @@
  */
 package com.lambdaworks.redis.api.reactive;
 
-import java.util.List;
 import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisScriptingReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisScriptingReactiveCommands.java
index d8ee26f1a9..c8fe5da3c1 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisScriptingReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisScriptingReactiveCommands.java
@@ -15,8 +15,8 @@
  */
 package com.lambdaworks.redis.api.reactive;
 
-import java.util.List;
 import com.lambdaworks.redis.ScriptOutputType;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
index 896c8173d4..6169fac93e 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
@@ -16,9 +16,10 @@
 package com.lambdaworks.redis.api.reactive;
 
 import java.util.Date;
-import java.util.List;
+
 import com.lambdaworks.redis.KillArgs;
 import com.lambdaworks.redis.protocol.CommandType;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -283,7 +284,6 @@ public interface RedisServerReactiveCommands<K, V> {
      * Synchronously save the dataset to disk and then shut down the server.
      * 
      * @param save {@literal true} force save operation
-     * @return nothing
      */
     Mono<Void> shutdown(boolean save);
 
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java
index c6bac5e5ef..80e9a1f44a 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java
@@ -15,12 +15,12 @@
  */
 package com.lambdaworks.redis.api.reactive;
 
-import java.util.Set;
 import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.ScanCursor;
 import com.lambdaworks.redis.StreamScanCursor;
 import com.lambdaworks.redis.ValueScanCursor;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
index 4924a4758e..b1b4cd7a3f 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
@@ -15,18 +15,10 @@
  */
 package com.lambdaworks.redis.api.reactive;
 
-import java.util.List;
-import com.lambdaworks.redis.Limit;
-import com.lambdaworks.redis.Range;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.ScoredValue;
-import com.lambdaworks.redis.ScoredValueScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
-import com.lambdaworks.redis.ZAddArgs;
-import com.lambdaworks.redis.ZStoreArgs;
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -525,6 +517,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      * @return ScoredValue&lt;V&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
     /**
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java
index 09366de970..24ad9c610a 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java
@@ -16,17 +16,19 @@
 package com.lambdaworks.redis.api.reactive;
 
 import java.util.Map;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
+
 import com.lambdaworks.redis.BitFieldArgs;
 import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.SetArgs;
 import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.output.KeyValueStreamingChannel;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
  * Reactive executed commands for Strings.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -37,7 +39,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Append a value to a key.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return Long integer-reply the length of the string after the append operation.
@@ -46,52 +48,52 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Count set bits in a string.
-     * 
+     *
      * @param key the key
-     * 
+     *
      * @return Long integer-reply The number of bits set to 1.
      */
     Mono<Long> bitcount(K key);
 
     /**
      * Count set bits in a string.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param end the end
-     * 
+     *
      * @return Long integer-reply The number of bits set to 1.
      */
     Mono<Long> bitcount(K key, long start, long end);
 
     /**
      * Execute {@code BITFIELD} with its subcommands.
-     * 
+     *
      * @param key the key
      * @param bitFieldArgs the args containing subcommands, must not be {@literal null}.
-     * 
+     *
      * @return Long bulk-reply the results from the bitfield commands.
      */
     Flux<Value<Long>> bitfield(K key, BitFieldArgs bitFieldArgs);
 
     /**
      * Find first bit set or clear in a string.
-     * 
+     *
      * @param key the key
      * @param state the state
-     * 
+     *
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     * 
+     *
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     * 
+     *
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     * 
+     *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     * 
+     *
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -100,23 +102,23 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Find first bit set or clear in a string.
-     * 
+     *
      * @param key the key
      * @param state the bit type: long
      * @param start the start type: long
      * @param end the end type: long
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     * 
+     *
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     * 
+     *
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     * 
+     *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     * 
+     *
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -124,7 +126,8 @@ public interface RedisStringReactiveCommands<K, V> {
     Mono<Long> bitpos(K key, boolean state, long start, long end);
 
     /**
-     * 
+     * Perform bitwise AND between strings.
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -134,7 +137,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Perform bitwise NOT between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param source operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -144,7 +147,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Perform bitwise OR between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -154,7 +157,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Perform bitwise XOR between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -164,7 +167,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by one.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the decrement
      */
@@ -172,7 +175,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by the given number.
-     * 
+     *
      * @param key the key
      * @param amount the decrement type: long
      * @return Long integer-reply the value of {@code key} after the decrement
@@ -181,7 +184,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Get the value of a key.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of {@code key}, or {@literal null} when {@code key} does not exist.
      */
@@ -189,7 +192,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Returns the bit value at offset in the string value stored at key.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @return Long integer-reply the bit value stored at <em>offset</em>.
@@ -198,7 +201,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Get a substring of the string stored at a key.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param end the end type: long
@@ -208,7 +211,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Set the string value of a key and return its old value.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return V bulk-string-reply the old value stored at {@code key}, or {@literal null} when {@code key} did not exist.
@@ -217,7 +220,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Increment the integer value of a key by one.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the increment
      */
@@ -225,7 +228,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Increment the integer value of a key by the given amount.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: long
      * @return Long integer-reply the value of {@code key} after the increment
@@ -234,7 +237,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Increment the float value of a key by the given amount.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: double
      * @return Double bulk-string-reply the value of {@code key} after the increment.
@@ -243,7 +246,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Get the values of all the given keys.
-     * 
+     *
      * @param keys the key
      * @return V array-reply list of values at the specified keys.
      */
@@ -261,7 +264,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Set multiple keys to multiple values.
-     * 
+     *
      * @param map the null
      * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail.
      */
@@ -269,38 +272,38 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Set multiple keys to multiple values, only if none of the keys exist.
-     * 
+     *
      * @param map the null
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
      */
     Mono<Boolean> msetnx(Map<K, V> map);
 
     /**
      * Set the string value of a key.
-     * 
+     *
      * @param key the key
      * @param value the value
-     * 
+     *
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     Mono<String> set(K key, V value);
 
     /**
      * Set the string value of a key.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @param setArgs the setArgs
-     * 
+     *
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     Mono<String> set(K key, V value, SetArgs setArgs);
 
     /**
      * Sets or clears the bit at offset in the string value stored at key.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @param value the value type: string
@@ -310,7 +313,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Set the value and expiration of a key.
-     * 
+     *
      * @param key the key
      * @param seconds the seconds type: long
      * @param value the value
@@ -320,7 +323,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Set the value and expiration in milliseconds of a key.
-     * 
+     *
      * @param key the key
      * @param milliseconds the milliseconds type: long
      * @param value the value
@@ -330,18 +333,18 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Set the value of a key, only if the key does not exist.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@code 1} if the key was set {@code 0} if the key was not set
      */
     Mono<Boolean> setnx(K key, V value);
 
     /**
      * Overwrite part of a string at key starting at the specified offset.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @param value the value
@@ -351,7 +354,7 @@ public interface RedisStringReactiveCommands<K, V> {
 
     /**
      * Get the length of the value stored in a key.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the length of the string at {@code key}, or {@code 0} when {@code key} does not exist.
      */
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java
index 1bbc8a2107..a25836c2aa 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java
@@ -15,9 +15,8 @@
  */
 package com.lambdaworks.redis.api.reactive;
 
-import java.util.List;
 import com.lambdaworks.redis.TransactionResult;
-import reactor.core.publisher.Flux;
+
 import reactor.core.publisher.Mono;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java
index fe72ac174b..b5d567ab86 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java
@@ -17,9 +17,10 @@
 
 import java.util.List;
 import java.util.Map;
+
+import com.lambdaworks.redis.output.CommandOutput;
 import com.lambdaworks.redis.protocol.CommandArgs;
 import com.lambdaworks.redis.protocol.ProtocolKeyword;
-import com.lambdaworks.redis.output.CommandOutput;
 
 /**
  * 
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
index 41ef7080e8..625ad6aaae 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
@@ -15,11 +15,11 @@
  */
 package com.lambdaworks.redis.api.sync;
 
-import com.lambdaworks.redis.*;
-
 import java.util.List;
 import java.util.Set;
 
+import com.lambdaworks.redis.*;
+
 /**
  * Synchronous executed commands for the Geo-API.
  *
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java
index f3f535c878..a6be8df68b 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java
@@ -17,12 +17,8 @@
 
 import java.util.List;
 import java.util.Map;
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.MapScanCursor;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
+
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java
index 07c301ecbc..285b04d15f 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java
@@ -17,13 +17,8 @@
 
 import java.util.Date;
 import java.util.List;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.KeyScanCursor;
-import com.lambdaworks.redis.MigrateArgs;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.SortArgs;
-import com.lambdaworks.redis.StreamScanCursor;
+
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java
index 734dfede07..93c1b00c0e 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java
@@ -16,6 +16,7 @@
 package com.lambdaworks.redis.api.sync;
 
 import java.util.List;
+
 import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisScriptingCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisScriptingCommands.java
index 69b676b36f..705e6a4f4d 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisScriptingCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisScriptingCommands.java
@@ -16,6 +16,7 @@
 package com.lambdaworks.redis.api.sync;
 
 import java.util.List;
+
 import com.lambdaworks.redis.ScriptOutputType;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
index 27a1dfb6d4..1f7a4a021e 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
@@ -17,6 +17,7 @@
 
 import java.util.Date;
 import java.util.List;
+
 import com.lambdaworks.redis.KillArgs;
 import com.lambdaworks.redis.protocol.CommandType;
 
@@ -186,11 +187,15 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Make the server crash: Out of memory.
+     *
+     * @return nothing, because the server crashes before returning.
      */
     void debugOom();
 
     /**
      * Make the server crash: Invalid pointer access.
+     *
+     * @return nothing, because the server crashes before returning.
      */
     void debugSegfault();
 
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisSetCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisSetCommands.java
index acdb6856fc..69e8220df9 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisSetCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisSetCommands.java
@@ -17,6 +17,7 @@
 
 import java.util.List;
 import java.util.Set;
+
 import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.ScanCursor;
 import com.lambdaworks.redis.StreamScanCursor;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
index 550745ae00..42baa2c1e6 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
@@ -16,15 +16,8 @@
 package com.lambdaworks.redis.api.sync;
 
 import java.util.List;
-import com.lambdaworks.redis.Limit;
-import com.lambdaworks.redis.Range;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.ScoredValue;
-import com.lambdaworks.redis.ScoredValueScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
-import com.lambdaworks.redis.ZAddArgs;
-import com.lambdaworks.redis.ZStoreArgs;
+
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 
@@ -523,6 +516,7 @@ public interface RedisSortedSetCommands<K, V> {
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     List<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
     /**
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
index 26c194e20b..3d504eeb42 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
@@ -17,16 +17,15 @@
 
 import java.util.List;
 import java.util.Map;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+
 import com.lambdaworks.redis.BitFieldArgs;
 import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.SetArgs;
-import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 
 /**
  * Synchronous executed commands for Strings.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -37,7 +36,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Append a value to a key.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return Long integer-reply the length of the string after the append operation.
@@ -46,52 +45,52 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Count set bits in a string.
-     * 
+     *
      * @param key the key
-     * 
+     *
      * @return Long integer-reply The number of bits set to 1.
      */
     Long bitcount(K key);
 
     /**
      * Count set bits in a string.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param end the end
-     * 
+     *
      * @return Long integer-reply The number of bits set to 1.
      */
     Long bitcount(K key, long start, long end);
 
     /**
      * Execute {@code BITFIELD} with its subcommands.
-     * 
+     *
      * @param key the key
      * @param bitFieldArgs the args containing subcommands, must not be {@literal null}.
-     * 
+     *
      * @return Long bulk-reply the results from the bitfield commands.
      */
     List<Long> bitfield(K key, BitFieldArgs bitFieldArgs);
 
     /**
      * Find first bit set or clear in a string.
-     * 
+     *
      * @param key the key
      * @param state the state
-     * 
+     *
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     * 
+     *
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     * 
+     *
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     * 
+     *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     * 
+     *
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -100,23 +99,23 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Find first bit set or clear in a string.
-     * 
+     *
      * @param key the key
      * @param state the bit type: long
      * @param start the start type: long
      * @param end the end type: long
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     * 
+     *
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     * 
+     *
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     * 
+     *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     * 
+     *
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -125,7 +124,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Perform bitwise AND between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -135,7 +134,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Perform bitwise NOT between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param source operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -145,7 +144,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Perform bitwise OR between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -155,7 +154,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Perform bitwise XOR between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -165,7 +164,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by one.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the decrement
      */
@@ -173,7 +172,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by the given number.
-     * 
+     *
      * @param key the key
      * @param amount the decrement type: long
      * @return Long integer-reply the value of {@code key} after the decrement
@@ -182,7 +181,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Get the value of a key.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of {@code key}, or {@literal null} when {@code key} does not exist.
      */
@@ -190,7 +189,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Returns the bit value at offset in the string value stored at key.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @return Long integer-reply the bit value stored at <em>offset</em>.
@@ -199,7 +198,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Get a substring of the string stored at a key.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param end the end type: long
@@ -209,7 +208,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set the string value of a key and return its old value.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return V bulk-string-reply the old value stored at {@code key}, or {@literal null} when {@code key} did not exist.
@@ -218,7 +217,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Increment the integer value of a key by one.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the increment
      */
@@ -226,7 +225,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Increment the integer value of a key by the given amount.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: long
      * @return Long integer-reply the value of {@code key} after the increment
@@ -235,7 +234,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Increment the float value of a key by the given amount.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: double
      * @return Double bulk-string-reply the value of {@code key} after the increment.
@@ -244,7 +243,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Get the values of all the given keys.
-     * 
+     *
      * @param keys the key
      * @return List&lt;V&gt; array-reply list of values at the specified keys.
      */
@@ -262,7 +261,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set multiple keys to multiple values.
-     * 
+     *
      * @param map the null
      * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail.
      */
@@ -270,38 +269,38 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set multiple keys to multiple values, only if none of the keys exist.
-     * 
+     *
      * @param map the null
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
      */
     Boolean msetnx(Map<K, V> map);
 
     /**
      * Set the string value of a key.
-     * 
+     *
      * @param key the key
      * @param value the value
-     * 
+     *
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     String set(K key, V value);
 
     /**
      * Set the string value of a key.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @param setArgs the setArgs
-     * 
+     *
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     String set(K key, V value, SetArgs setArgs);
 
     /**
      * Sets or clears the bit at offset in the string value stored at key.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @param value the value type: string
@@ -311,7 +310,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set the value and expiration of a key.
-     * 
+     *
      * @param key the key
      * @param seconds the seconds type: long
      * @param value the value
@@ -321,7 +320,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set the value and expiration in milliseconds of a key.
-     * 
+     *
      * @param key the key
      * @param milliseconds the milliseconds type: long
      * @param value the value
@@ -331,18 +330,18 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set the value of a key, only if the key does not exist.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@code 1} if the key was set {@code 0} if the key was not set
      */
     Boolean setnx(K key, V value);
 
     /**
      * Overwrite part of a string at key starting at the specified offset.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @param value the value
@@ -352,7 +351,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Get the length of the value stored in a key.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the length of the string at {@code key}, or {@code 0} when {@code key} does not exist.
      */
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java
index 4a8a67a352..3c3ddd77df 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java
@@ -15,7 +15,6 @@
  */
 package com.lambdaworks.redis.api.sync;
 
-import java.util.List;
 import com.lambdaworks.redis.TransactionResult;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
index e5643cf65a..47b80257d0 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
@@ -17,10 +17,10 @@
 
 import java.util.List;
 import java.util.Map;
+
+import com.lambdaworks.redis.output.CommandOutput;
 import com.lambdaworks.redis.protocol.CommandArgs;
 import com.lambdaworks.redis.protocol.ProtocolKeyword;
-import com.lambdaworks.redis.output.CommandOutput;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * 
@@ -132,19 +132,4 @@ public interface BaseNodeSelectionAsyncCommands<K, V> {
      * @return the command response
      */
     <T> AsyncExecutions<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args);
-
-    /**
-     * Disable or enable auto-flush behavior. Default is {@literal true}. If autoFlushCommands is disabled, multiple commands
-     * can be issued without writing them actually to the transport. Commands are buffered until a {@link #flushCommands()} is
-     * issued. After calling {@link #flushCommands()} commands are sent to the transport and executed by Redis.
-     *
-     * @param autoFlush state of autoFlush.
-     */
-    void setAutoFlushCommands(boolean autoFlush);
-
-    /**
-     * Flush pending commands. This commands forces a flush on the channel and can be used to buffer ("pipeline") commands to
-     * achieve batching. No-op if channel is not connected.
-     */
-    void flushCommands();
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
index 0844bf1732..ad290a4125 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
@@ -15,11 +15,11 @@
  */
 package com.lambdaworks.redis.cluster.api.async;
 
-import com.lambdaworks.redis.*;
-
 import java.util.List;
 import java.util.Set;
 
+import com.lambdaworks.redis.*;
+
 /**
  * Asynchronous executed commands on a node selection for the Geo-API.
  *
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHLLAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHLLAsyncCommands.java
index 391a7db9ea..ac0226b4e8 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHLLAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHLLAsyncCommands.java
@@ -15,8 +15,6 @@
  */
 package com.lambdaworks.redis.cluster.api.async;
 
-import com.lambdaworks.redis.RedisFuture;
-
 /**
  * Asynchronous executed commands on a node selection for HyperLogLog (PF* commands).
  * 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java
index 2d9e8894f5..36433c2f61 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java
@@ -17,16 +17,11 @@
 
 import java.util.List;
 import java.util.Map;
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.MapScanCursor;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
+
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands on a node selection for Hashes (Key-Value pairs).
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java
index 7349be15d3..2bf737915e 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java
@@ -17,16 +17,10 @@
 
 import java.util.Date;
 import java.util.List;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.KeyScanCursor;
-import com.lambdaworks.redis.MigrateArgs;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.SortArgs;
-import com.lambdaworks.redis.StreamScanCursor;
+
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands on a node selection for Keys (Key manipulation/querying).
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java
index d7fa53dea9..9aab6b92de 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java
@@ -16,9 +16,9 @@
 package com.lambdaworks.redis.cluster.api.async;
 
 import java.util.List;
+
 import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands on a node selection for Lists.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionScriptingAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
index b0e8006fb0..7e6ec4e76f 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
@@ -16,8 +16,8 @@
 package com.lambdaworks.redis.cluster.api.async;
 
 import java.util.List;
+
 import com.lambdaworks.redis.ScriptOutputType;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands on a node selection for Scripting.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java
index fdecccfa25..aa73c895b0 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java
@@ -17,9 +17,9 @@
 
 import java.util.Date;
 import java.util.List;
+
 import com.lambdaworks.redis.KillArgs;
 import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands on a node selection for Server Control.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java
index f00b8b5fd9..6986a9b072 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java
@@ -17,6 +17,7 @@
 
 import java.util.List;
 import java.util.Set;
+
 import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.ScanCursor;
 import com.lambdaworks.redis.StreamScanCursor;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
index 9b62840312..2824320f06 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
@@ -16,18 +16,10 @@
 package com.lambdaworks.redis.cluster.api.async;
 
 import java.util.List;
-import com.lambdaworks.redis.Limit;
-import com.lambdaworks.redis.Range;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.ScoredValue;
-import com.lambdaworks.redis.ScoredValueScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
-import com.lambdaworks.redis.ZAddArgs;
-import com.lambdaworks.redis.ZStoreArgs;
+
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
-import com.lambdaworks.redis.RedisFuture;
 
 /**
  * Asynchronous executed commands on a node selection for Sorted Sets.
@@ -524,6 +516,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     AsyncExecutions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
     /**
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
index 382ff7a4e1..43aaa246f1 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
@@ -17,17 +17,15 @@
 
 import java.util.List;
 import java.util.Map;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+
 import com.lambdaworks.redis.BitFieldArgs;
 import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.SetArgs;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 
 /**
  * Asynchronous executed commands on a node selection for Strings.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -38,7 +36,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Append a value to a key.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return Long integer-reply the length of the string after the append operation.
@@ -47,52 +45,52 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Count set bits in a string.
-     * 
+     *
      * @param key the key
-     * 
+     *
      * @return Long integer-reply The number of bits set to 1.
      */
     AsyncExecutions<Long> bitcount(K key);
 
     /**
      * Count set bits in a string.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param end the end
-     * 
+     *
      * @return Long integer-reply The number of bits set to 1.
      */
     AsyncExecutions<Long> bitcount(K key, long start, long end);
 
     /**
      * Execute {@code BITFIELD} with its subcommands.
-     * 
+     *
      * @param key the key
      * @param bitFieldArgs the args containing subcommands, must not be {@literal null}.
-     * 
+     *
      * @return Long bulk-reply the results from the bitfield commands.
      */
     AsyncExecutions<List<Long>> bitfield(K key, BitFieldArgs bitFieldArgs);
 
     /**
      * Find first bit set or clear in a string.
-     * 
+     *
      * @param key the key
      * @param state the state
-     * 
+     *
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     * 
+     *
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     * 
+     *
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     * 
+     *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     * 
+     *
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -101,23 +99,23 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Find first bit set or clear in a string.
-     * 
+     *
      * @param key the key
      * @param state the bit type: long
      * @param start the start type: long
      * @param end the end type: long
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     * 
+     *
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     * 
+     *
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     * 
+     *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     * 
+     *
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -126,7 +124,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Perform bitwise AND between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -136,7 +134,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Perform bitwise NOT between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param source operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -146,7 +144,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Perform bitwise OR between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -156,7 +154,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Perform bitwise XOR between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -166,7 +164,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by one.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the decrement
      */
@@ -174,7 +172,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by the given number.
-     * 
+     *
      * @param key the key
      * @param amount the decrement type: long
      * @return Long integer-reply the value of {@code key} after the decrement
@@ -183,7 +181,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Get the value of a key.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of {@code key}, or {@literal null} when {@code key} does not exist.
      */
@@ -191,7 +189,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Returns the bit value at offset in the string value stored at key.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @return Long integer-reply the bit value stored at <em>offset</em>.
@@ -200,7 +198,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Get a substring of the string stored at a key.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param end the end type: long
@@ -210,7 +208,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Set the string value of a key and return its old value.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return V bulk-string-reply the old value stored at {@code key}, or {@literal null} when {@code key} did not exist.
@@ -219,7 +217,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Increment the integer value of a key by one.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the increment
      */
@@ -227,7 +225,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Increment the integer value of a key by the given amount.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: long
      * @return Long integer-reply the value of {@code key} after the increment
@@ -236,7 +234,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Increment the float value of a key by the given amount.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: double
      * @return Double bulk-string-reply the value of {@code key} after the increment.
@@ -245,7 +243,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Get the values of all the given keys.
-     * 
+     *
      * @param keys the key
      * @return List&lt;V&gt; array-reply list of values at the specified keys.
      */
@@ -263,7 +261,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Set multiple keys to multiple values.
-     * 
+     *
      * @param map the null
      * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail.
      */
@@ -271,38 +269,38 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Set multiple keys to multiple values, only if none of the keys exist.
-     * 
+     *
      * @param map the null
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
      */
     AsyncExecutions<Boolean> msetnx(Map<K, V> map);
 
     /**
      * Set the string value of a key.
-     * 
+     *
      * @param key the key
      * @param value the value
-     * 
+     *
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     AsyncExecutions<String> set(K key, V value);
 
     /**
      * Set the string value of a key.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @param setArgs the setArgs
-     * 
+     *
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     AsyncExecutions<String> set(K key, V value, SetArgs setArgs);
 
     /**
      * Sets or clears the bit at offset in the string value stored at key.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @param value the value type: string
@@ -312,7 +310,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Set the value and expiration of a key.
-     * 
+     *
      * @param key the key
      * @param seconds the seconds type: long
      * @param value the value
@@ -322,7 +320,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Set the value and expiration in milliseconds of a key.
-     * 
+     *
      * @param key the key
      * @param milliseconds the milliseconds type: long
      * @param value the value
@@ -332,18 +330,18 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Set the value of a key, only if the key does not exist.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@code 1} if the key was set {@code 0} if the key was not set
      */
     AsyncExecutions<Boolean> setnx(K key, V value);
 
     /**
      * Overwrite part of a string at key starting at the specified offset.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @param value the value
@@ -353,7 +351,7 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
 
     /**
      * Get the length of the value stored in a key.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the length of the string at {@code key}, or {@code 0} when {@code key} does not exist.
      */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
index 2100440d45..834b4b8cfd 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
@@ -17,9 +17,6 @@
 
 import java.util.List;
 import java.util.Map;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
-import com.lambdaworks.redis.output.CommandOutput;
 
 /**
  * 
@@ -110,20 +107,4 @@ public interface BaseNodeSelectionCommands<K, V> {
      * @return number of replicas
      */
     Executions<Long> waitForReplication(int replicas, long timeout);
-
-    /**
-     * Disable or enable auto-flush behavior. Default is {@literal true}. If autoFlushCommands is disabled, multiple commands
-     * can be issued without writing them actually to the transport. Commands are buffered until a {@link #flushCommands()} is
-     * issued. After calling {@link #flushCommands()} commands are sent to the transport and executed by Redis.
-     *
-     * @param autoFlush state of autoFlush.
-     */
-    void setAutoFlushCommands(boolean autoFlush);
-
-    /**
-     * Flush pending commands. This commands forces a flush on the channel and can be used to buffer ("pipeline") commands to
-     * achieve batching. No-op if channel is not connected.
-     *
-     */
-    void flushCommands();
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java
index f893cff23d..7507441831 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java
@@ -16,7 +16,6 @@
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
index 3dadf4b9ef..fce9623874 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
@@ -15,11 +15,11 @@
  */
 package com.lambdaworks.redis.cluster.api.sync;
 
-import com.lambdaworks.redis.*;
-
 import java.util.List;
 import java.util.Set;
 
+import com.lambdaworks.redis.*;
+
 /**
  * Synchronous executed commands on a node selection for the Geo-API.
  *
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java
index ef2119b84e..2c4764680e 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java
@@ -17,12 +17,8 @@
 
 import java.util.List;
 import java.util.Map;
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.MapScanCursor;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
+
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java
index 2494895f3c..d241449851 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java
@@ -17,13 +17,8 @@
 
 import java.util.Date;
 import java.util.List;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.KeyScanCursor;
-import com.lambdaworks.redis.MigrateArgs;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.SortArgs;
-import com.lambdaworks.redis.StreamScanCursor;
+
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java
index de8a6c67cf..e6d5484183 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java
@@ -16,6 +16,7 @@
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.List;
+
 import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionScriptingCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionScriptingCommands.java
index efa3535149..c8498524ba 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionScriptingCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionScriptingCommands.java
@@ -16,6 +16,7 @@
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.List;
+
 import com.lambdaworks.redis.ScriptOutputType;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java
index 90205f9ec6..4779b8beec 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java
@@ -17,6 +17,7 @@
 
 import java.util.Date;
 import java.util.List;
+
 import com.lambdaworks.redis.KillArgs;
 import com.lambdaworks.redis.protocol.CommandType;
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSetCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSetCommands.java
index da18f015e3..11f815be83 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSetCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSetCommands.java
@@ -17,6 +17,7 @@
 
 import java.util.List;
 import java.util.Set;
+
 import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.ScanCursor;
 import com.lambdaworks.redis.StreamScanCursor;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
index ef869892f1..0e51823977 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
@@ -16,15 +16,8 @@
 package com.lambdaworks.redis.cluster.api.sync;
 
 import java.util.List;
-import com.lambdaworks.redis.Limit;
-import com.lambdaworks.redis.Range;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.ScoredValue;
-import com.lambdaworks.redis.ScoredValueScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
-import com.lambdaworks.redis.ZAddArgs;
-import com.lambdaworks.redis.ZStoreArgs;
+
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 
@@ -523,6 +516,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     Executions<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
     /**
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
index d37b6344dc..d10d413b16 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
@@ -17,16 +17,15 @@
 
 import java.util.List;
 import java.util.Map;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+
 import com.lambdaworks.redis.BitFieldArgs;
 import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.SetArgs;
-import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 
 /**
  * Synchronous executed commands on a node selection for Strings.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -37,7 +36,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Append a value to a key.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return Long integer-reply the length of the string after the append operation.
@@ -46,52 +45,52 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Count set bits in a string.
-     * 
+     *
      * @param key the key
-     * 
+     *
      * @return Long integer-reply The number of bits set to 1.
      */
     Executions<Long> bitcount(K key);
 
     /**
      * Count set bits in a string.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param end the end
-     * 
+     *
      * @return Long integer-reply The number of bits set to 1.
      */
     Executions<Long> bitcount(K key, long start, long end);
 
     /**
      * Execute {@code BITFIELD} with its subcommands.
-     * 
+     *
      * @param key the key
      * @param bitFieldArgs the args containing subcommands, must not be {@literal null}.
-     * 
+     *
      * @return Long bulk-reply the results from the bitfield commands.
      */
     Executions<List<Long>> bitfield(K key, BitFieldArgs bitFieldArgs);
 
     /**
      * Find first bit set or clear in a string.
-     * 
+     *
      * @param key the key
      * @param state the state
-     * 
+     *
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     * 
+     *
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     * 
+     *
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     * 
+     *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     * 
+     *
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -100,23 +99,23 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Find first bit set or clear in a string.
-     * 
+     *
      * @param key the key
      * @param state the bit type: long
      * @param start the start type: long
      * @param end the end type: long
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     * 
+     *
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     * 
+     *
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     * 
+     *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     * 
+     *
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -125,7 +124,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Perform bitwise AND between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -135,7 +134,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Perform bitwise NOT between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param source operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -145,7 +144,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Perform bitwise OR between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -155,7 +154,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Perform bitwise XOR between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -165,7 +164,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by one.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the decrement
      */
@@ -173,7 +172,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by the given number.
-     * 
+     *
      * @param key the key
      * @param amount the decrement type: long
      * @return Long integer-reply the value of {@code key} after the decrement
@@ -182,7 +181,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Get the value of a key.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of {@code key}, or {@literal null} when {@code key} does not exist.
      */
@@ -190,7 +189,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Returns the bit value at offset in the string value stored at key.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @return Long integer-reply the bit value stored at <em>offset</em>.
@@ -199,7 +198,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Get a substring of the string stored at a key.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param end the end type: long
@@ -209,7 +208,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Set the string value of a key and return its old value.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return V bulk-string-reply the old value stored at {@code key}, or {@literal null} when {@code key} did not exist.
@@ -218,7 +217,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Increment the integer value of a key by one.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the increment
      */
@@ -226,7 +225,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Increment the integer value of a key by the given amount.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: long
      * @return Long integer-reply the value of {@code key} after the increment
@@ -235,7 +234,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Increment the float value of a key by the given amount.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: double
      * @return Double bulk-string-reply the value of {@code key} after the increment.
@@ -244,7 +243,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Get the values of all the given keys.
-     * 
+     *
      * @param keys the key
      * @return List&lt;V&gt; array-reply list of values at the specified keys.
      */
@@ -262,7 +261,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Set multiple keys to multiple values.
-     * 
+     *
      * @param map the null
      * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail.
      */
@@ -270,38 +269,38 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Set multiple keys to multiple values, only if none of the keys exist.
-     * 
+     *
      * @param map the null
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
      */
     Executions<Boolean> msetnx(Map<K, V> map);
 
     /**
      * Set the string value of a key.
-     * 
+     *
      * @param key the key
      * @param value the value
-     * 
+     *
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     Executions<String> set(K key, V value);
 
     /**
      * Set the string value of a key.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @param setArgs the setArgs
-     * 
+     *
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     Executions<String> set(K key, V value, SetArgs setArgs);
 
     /**
      * Sets or clears the bit at offset in the string value stored at key.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @param value the value type: string
@@ -311,7 +310,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Set the value and expiration of a key.
-     * 
+     *
      * @param key the key
      * @param seconds the seconds type: long
      * @param value the value
@@ -321,7 +320,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Set the value and expiration in milliseconds of a key.
-     * 
+     *
      * @param key the key
      * @param milliseconds the milliseconds type: long
      * @param value the value
@@ -331,18 +330,18 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Set the value of a key, only if the key does not exist.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@code 1} if the key was set {@code 0} if the key was not set
      */
     Executions<Boolean> setnx(K key, V value);
 
     /**
      * Overwrite part of a string at key starting at the specified offset.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @param value the value
@@ -352,7 +351,7 @@ public interface NodeSelectionStringCommands<K, V> {
 
     /**
      * Get the length of the value stored in a key.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the length of the string at {@code key}, or {@code 0} when {@code key} does not exist.
      */
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java
index 2071b92634..04bd3ff2d7 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java
@@ -15,11 +15,7 @@
  */
 package com.lambdaworks.redis;
 
-import com.lambdaworks.redis.GeoArgs;
-import com.lambdaworks.redis.GeoCoordinates;
-import com.lambdaworks.redis.GeoRadiusStoreArgs;
-import com.lambdaworks.redis.GeoWithin;
-import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.*;
 import java.util.List;
 import java.util.Set;
 
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java
index b392fce6b8..408df3049a 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java
@@ -18,12 +18,7 @@
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.MapScanCursor;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java
index 9e809c9fc1..9ca45cc9a7 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java
@@ -18,13 +18,7 @@
 import java.util.Date;
 import java.util.List;
 
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.KeyScanCursor;
-import com.lambdaworks.redis.MigrateArgs;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.SortArgs;
-import com.lambdaworks.redis.StreamScanCursor;
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
index 2d0ef979f5..d6a4eda2e1 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
@@ -17,15 +17,7 @@
 
 import java.util.List;
 
-import com.lambdaworks.redis.Limit;
-import com.lambdaworks.redis.Range;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.ScoredValue;
-import com.lambdaworks.redis.ScoredValueScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
-import com.lambdaworks.redis.ZAddArgs;
-import com.lambdaworks.redis.ZStoreArgs;
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
 import com.lambdaworks.redis.output.ValueStreamingChannel;
 
@@ -523,6 +515,7 @@ public interface RedisSortedSetCommands<K, V> {
      * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of elements in the specified score range.
      * @deprecated Use {@link #zrangebyscoreWithScores(java.lang.Object, Range, Limit limit)}
      */
+    @Deprecated
     List<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count);
 
     /**
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java
index 1e84a6d89f..e01479587a 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java
@@ -27,7 +27,7 @@
 
 /**
  * ${intent} for Strings.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -37,7 +37,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Append a value to a key.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return Long integer-reply the length of the string after the append operation.
@@ -46,52 +46,52 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Count set bits in a string.
-     * 
+     *
      * @param key the key
-     * 
+     *
      * @return Long integer-reply The number of bits set to 1.
      */
     Long bitcount(K key);
 
     /**
      * Count set bits in a string.
-     * 
+     *
      * @param key the key
      * @param start the start
      * @param end the end
-     * 
+     *
      * @return Long integer-reply The number of bits set to 1.
      */
     Long bitcount(K key, long start, long end);
-    
+
     /**
      * Execute {@code BITFIELD} with its subcommands.
-     * 
+     *
      * @param key the key
      * @param bitFieldArgs the args containing subcommands, must not be {@literal null}.
-     * 
+     *
      * @return Long bulk-reply the results from the bitfield commands.
      */
     List<Long> bitfield(K key, BitFieldArgs bitFieldArgs);
 
     /**
      * Find first bit set or clear in a string.
-     * 
+     *
      * @param key the key
      * @param state the state
-     * 
+     *
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     * 
+     *
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     * 
+     *
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     * 
+     *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     * 
+     *
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -100,23 +100,23 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Find first bit set or clear in a string.
-     * 
+     *
      * @param key the key
      * @param state the bit type: long
      * @param start the start type: long
      * @param end the end type: long
      * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
-     * 
+     *
      *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
      *         returned.
-     * 
+     *
      *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
      *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
      *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
-     * 
+     *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     * 
+     *
      *         However this behavior changes if you are looking for clear bits and specify a range with both
      *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
      *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
@@ -125,7 +125,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Perform bitwise AND between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -135,7 +135,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Perform bitwise NOT between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param source operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -145,7 +145,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Perform bitwise OR between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -155,7 +155,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Perform bitwise XOR between strings.
-     * 
+     *
      * @param destination result key of the operation
      * @param keys operation input key names
      * @return Long integer-reply The size of the string stored in the destination key, that is equal to the size of the longest
@@ -165,7 +165,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by one.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the decrement
      */
@@ -173,7 +173,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Decrement the integer value of a key by the given number.
-     * 
+     *
      * @param key the key
      * @param amount the decrement type: long
      * @return Long integer-reply the value of {@code key} after the decrement
@@ -182,7 +182,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Get the value of a key.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of {@code key}, or {@literal null} when {@code key} does not exist.
      */
@@ -190,7 +190,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Returns the bit value at offset in the string value stored at key.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @return Long integer-reply the bit value stored at <em>offset</em>.
@@ -199,7 +199,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Get a substring of the string stored at a key.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param end the end type: long
@@ -209,7 +209,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set the string value of a key and return its old value.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return V bulk-string-reply the old value stored at {@code key}, or {@literal null} when {@code key} did not exist.
@@ -218,7 +218,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Increment the integer value of a key by one.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the value of {@code key} after the increment
      */
@@ -226,7 +226,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Increment the integer value of a key by the given amount.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: long
      * @return Long integer-reply the value of {@code key} after the increment
@@ -235,7 +235,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Increment the float value of a key by the given amount.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: double
      * @return Double bulk-string-reply the value of {@code key} after the increment.
@@ -244,7 +244,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Get the values of all the given keys.
-     * 
+     *
      * @param keys the key
      * @return List&lt;V&gt; array-reply list of values at the specified keys.
      */
@@ -262,7 +262,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set multiple keys to multiple values.
-     * 
+     *
      * @param map the null
      * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail.
      */
@@ -270,38 +270,38 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set multiple keys to multiple values, only if none of the keys exist.
-     * 
+     *
      * @param map the null
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
      */
     Boolean msetnx(Map<K, V> map);
 
     /**
      * Set the string value of a key.
-     * 
+     *
      * @param key the key
      * @param value the value
-     * 
+     *
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     String set(K key, V value);
 
     /**
      * Set the string value of a key.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @param setArgs the setArgs
-     * 
+     *
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     String set(K key, V value, SetArgs setArgs);
 
     /**
      * Sets or clears the bit at offset in the string value stored at key.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @param value the value type: string
@@ -311,7 +311,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set the value and expiration of a key.
-     * 
+     *
      * @param key the key
      * @param seconds the seconds type: long
      * @param value the value
@@ -321,7 +321,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set the value and expiration in milliseconds of a key.
-     * 
+     *
      * @param key the key
      * @param milliseconds the milliseconds type: long
      * @param value the value
@@ -331,18 +331,18 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Set the value of a key, only if the key does not exist.
-     * 
+     *
      * @param key the key
      * @param value the value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@code 1} if the key was set {@code 0} if the key was not set
      */
     Boolean setnx(K key, V value);
 
     /**
      * Overwrite part of a string at key starting at the specified offset.
-     * 
+     *
      * @param key the key
      * @param offset the offset type: long
      * @param value the value
@@ -352,7 +352,7 @@ public interface RedisStringCommands<K, V> {
 
     /**
      * Get the length of the value stored in a key.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the length of the string at {@code key}, or {@code 0} when {@code key} does not exist.
      */
diff --git a/src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java b/src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java
index fe132bfbc0..1954e5d566 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java
@@ -102,6 +102,7 @@ public void createInterface() throws Exception {
         }
 
         resultType.setComment(new JavadocComment(typeDocFunction.apply(templateTypeDeclaration.getComment().getContent())));
+        result.setComment(template.getComment());
 
         result.setImports(new ArrayList<>());
         ASTHelper.addTypeDeclaration(result, resultType);
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java
index c9f1ce7abd..a0cb4c791e 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java
@@ -16,24 +16,23 @@
 package com.lambdaworks.apigenerator;
 
 import java.io.File;
-import java.util.*;
-import java.util.function.Consumer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.internal.LettuceSets;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.github.javaparser.ast.CompilationUnit;
-import com.github.javaparser.ast.ImportDeclaration;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.body.MethodDeclaration;
-import com.github.javaparser.ast.expr.NameExpr;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.ast.type.ReferenceType;
 import com.github.javaparser.ast.type.Type;
+import com.lambdaworks.redis.internal.LettuceSets;
 
 /**
  * Create async API based on the templates.
@@ -43,8 +42,8 @@
 @RunWith(Parameterized.class)
 public class CreateAsyncApi {
 
-    private Set<String> KEEP_METHOD_RESULT_TYPE = LettuceSets.unmodifiableSet("shutdown", "debugOom", "debugSegfault",
-            "digest", "close", "isOpen", "BaseRedisCommands.reset", "getStatefulConnection");
+    private Set<String> KEEP_METHOD_RESULT_TYPE = LettuceSets.unmodifiableSet("shutdown", "debugOom", "debugSegfault", "digest",
+            "close", "isOpen", "BaseRedisCommands.reset", "getStatefulConnection", "setAutoFlushCommands", "flushCommands");
 
     private CompilationUnitFactory factory;
 
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
index 507e4ddd98..571d6f0aa2 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
@@ -16,12 +16,14 @@
 package com.lambdaworks.apigenerator;
 
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.internal.LettuceSets;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -31,6 +33,7 @@
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.ast.type.ReferenceType;
 import com.github.javaparser.ast.type.Type;
+import com.lambdaworks.redis.internal.LettuceSets;
 
 /**
  * Create async API based on the templates.
@@ -40,8 +43,8 @@
 @RunWith(Parameterized.class)
 public class CreateAsyncNodeSelectionClusterApi {
 
-    private Set<String> FILTER_METHODS = LettuceSets.unmodifiableSet("shutdown", "debugOom", "debugSegfault", "digest",
-            "close", "isOpen", "BaseRedisCommands.reset", "readOnly", "readWrite");
+    private Set<String> FILTER_METHODS = LettuceSets.unmodifiableSet("shutdown", "debugOom", "debugSegfault", "digest", "close",
+            "isOpen", "BaseRedisCommands.reset", "readOnly", "readWrite", "setAutoFlushCommands", "flushCommands");
 
     private CompilationUnitFactory factory;
 
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java b/src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java
index 7487e21f2f..990c6025c1 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java
+++ b/src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java
@@ -44,7 +44,7 @@
 public class CreateSyncNodeSelectionClusterApi {
 
     private Set<String> FILTER_METHODS = LettuceSets.unmodifiableSet("shutdown", "debugOom", "debugSegfault", "digest", "close",
-            "isOpen", "BaseRedisCommands.reset", "readOnly", "readWrite", "dispatch");
+            "isOpen", "BaseRedisCommands.reset", "readOnly", "readWrite", "dispatch", "setAutoFlushCommands", "flushCommands");
 
     private CompilationUnitFactory factory;
 

From 6636773bda25a5f30a457015015df427737e45d6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 10 Dec 2016 15:47:44 +0100
Subject: [PATCH 087/808] Remove ExperimentalByteArrayCodec and enhance
 ByteArrayCodec #389

Remove ExperimentalByteArrayCodec in favor of an enhanced ByteArrayCodec. ByteArrayCodec now implements ToByteBufEncoder that writes data directly on ByteBuf. This change reduces GC pressure as ByteBuffer wrapping is no longer required.
---
 .../redis/codec/ByteArrayCodec.java           | 39 ++++++++---
 .../redis/protocol/CommandArgs.java           | 49 +------------
 .../lambdaworks/redis/CustomCodecTest.java    | 68 +++++++++++++++----
 .../redis/protocol/CommandArgsTest.java       | 56 ++-------------
 4 files changed, 92 insertions(+), 120 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java b/src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java
index ac9622a005..ace3afaf87 100644
--- a/src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java
+++ b/src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java
@@ -17,17 +17,42 @@
 
 import java.nio.ByteBuffer;
 
+import io.netty.buffer.ByteBuf;
+
 /**
- * A {@link RedisCodec} that uses plain byte arrays.
+ * A {@link RedisCodec} that uses plain byte arrays without further transformations.
  * 
  * @author Mark Paluch
  * @since 3.3
  */
-public class ByteArrayCodec implements RedisCodec<byte[], byte[]> {
+public class ByteArrayCodec implements RedisCodec<byte[], byte[]>, ToByteBufEncoder<byte[], byte[]> {
 
     public static final ByteArrayCodec INSTANCE = new ByteArrayCodec();
     private static final byte[] EMPTY = new byte[0];
 
+    @Override
+    public void encodeKey(byte[] key, ByteBuf target) {
+
+        if (key != null) {
+            target.writeBytes(key);
+        }
+    }
+
+    @Override
+    public void encodeValue(byte[] value, ByteBuf target) {
+        encodeKey(value, target);
+    }
+
+    @Override
+    public int estimateSize(Object keyOrValue) {
+
+        if (keyOrValue == null) {
+            return 0;
+        }
+
+        return ((byte[]) keyOrValue).length;
+    }
+
     @Override
     public byte[] decodeKey(ByteBuffer bytes) {
         return getBytes(bytes);
@@ -41,7 +66,7 @@ public byte[] decodeValue(ByteBuffer bytes) {
     @Override
     public ByteBuffer encodeKey(byte[] key) {
 
-        if(key == null){
+        if (key == null) {
             return ByteBuffer.wrap(EMPTY);
         }
 
@@ -50,12 +75,7 @@ public ByteBuffer encodeKey(byte[] key) {
 
     @Override
     public ByteBuffer encodeValue(byte[] value) {
-
-        if(value == null){
-            return ByteBuffer.wrap(EMPTY);
-        }
-
-        return ByteBuffer.wrap(value);
+        return encodeKey(value);
     }
 
     private static byte[] getBytes(ByteBuffer buffer) {
@@ -63,5 +83,4 @@ private static byte[] getBytes(ByteBuffer buffer) {
         buffer.get(b);
         return b;
     }
-
 }
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java b/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
index 21878cf8cf..d52c7175b6 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
@@ -304,7 +304,7 @@ public String toString() {
      * Returns a command string representation of {@link CommandArgs} with annotated key and value parameters.
      *
      * {@code args.addKey("mykey").add(2.0)} will return {@code key<mykey> 2.0}.
-     * 
+     *
      * @return the command string representation.
      */
     public String toCommandString() {
@@ -562,15 +562,10 @@ static <K, V> KeyArgument<K, V> of(K key, RedisCodec<K, V> codec) {
         @Override
         void encode(ByteBuf target) {
 
-            if (codec == ExperimentalByteArrayCodec.INSTANCE) {
-                ((ExperimentalByteArrayCodec) codec).encodeKey(target, (byte[]) key);
-                return;
-            }
-
             if (codec instanceof ToByteBufEncoder) {
 
                 ToByteBufEncoder<K, V> toByteBufEncoder = (ToByteBufEncoder<K, V>) codec;
-                ByteBuf temporaryBuffer = target.alloc().buffer(toByteBufEncoder.estimateSize(key));
+                ByteBuf temporaryBuffer = target.alloc().buffer(toByteBufEncoder.estimateSize(key) + 6);
                 toByteBufEncoder.encodeKey(key, temporaryBuffer);
 
                 ByteBufferArgument.writeByteBuf(target, temporaryBuffer);
@@ -605,15 +600,10 @@ static <K, V> ValueArgument<K, V> of(V val, RedisCodec<K, V> codec) {
         @Override
         void encode(ByteBuf target) {
 
-            if (codec == ExperimentalByteArrayCodec.INSTANCE) {
-                ((ExperimentalByteArrayCodec) codec).encodeValue(target, (byte[]) val);
-                return;
-            }
-
             if (codec instanceof ToByteBufEncoder) {
 
                 ToByteBufEncoder<K, V> toByteBufEncoder = (ToByteBufEncoder<K, V>) codec;
-                ByteBuf temporaryBuffer = target.alloc().buffer(toByteBufEncoder.estimateSize(val));
+                ByteBuf temporaryBuffer = target.alloc().buffer(toByteBufEncoder.estimateSize(val) + 6);
                 toByteBufEncoder.encodeValue(val, temporaryBuffer);
 
                 ByteBufferArgument.writeByteBuf(target, temporaryBuffer);
@@ -630,37 +620,4 @@ public String toString() {
             return String.format("value<%s>", new StringCodec().decodeValue(codec.encodeValue(val)));
         }
     }
-
-    /**
-     * This codec writes directly {@code byte[]} to the target buffer without wrapping it in a {@link ByteBuffer} to reduce GC
-     * pressure.
-     */
-    public static final class ExperimentalByteArrayCodec extends ByteArrayCodec {
-
-        public static final ExperimentalByteArrayCodec INSTANCE = new ExperimentalByteArrayCodec();
-
-        private ExperimentalByteArrayCodec() {
-
-        }
-
-        public void encodeKey(ByteBuf target, byte[] key) {
-
-            target.writeByte('$');
-
-            if (key == null) {
-                target.writeBytes("0\r\n\r\n".getBytes());
-                return;
-            }
-
-            IntegerArgument.writeInteger(target, key.length);
-            target.writeBytes(CRLF);
-
-            target.writeBytes(key);
-            target.writeBytes(CRLF);
-        }
-
-        public void encodeValue(ByteBuf target, byte[] value) {
-            encodeKey(target, value);
-        }
-    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/CustomCodecTest.java b/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
index c83e386585..7a1dbc9d89 100644
--- a/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
+++ b/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
@@ -26,6 +26,8 @@
 import java.nio.charset.Charset;
 import java.util.List;
 
+import org.junit.Test;
+
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.protocol.CommandArgs;
@@ -35,6 +37,7 @@
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.codec.CompressionCodec;
 import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.protocol.CommandArgs;
 
 /**
  * @author Will Glozer
@@ -71,8 +74,10 @@ public void testJavaSerializerReactive() throws Exception {
 
     @Test
     public void testDeflateCompressedJavaSerializer() throws Exception {
-        RedisCommands<String, Object> connection = client.connect(
-                CompressionCodec.valueCompressor(new SerializedObjectCodec(), CompressionCodec.CompressionType.DEFLATE)).sync();
+        RedisCommands<String, Object> connection = client
+                .connect(
+                        CompressionCodec.valueCompressor(new SerializedObjectCodec(), CompressionCodec.CompressionType.DEFLATE))
+                .sync();
         List<String> list = list("one", "two");
         connection.set(key, list);
         assertThat(connection.get(key)).isEqualTo(list);
@@ -82,8 +87,9 @@ public void testDeflateCompressedJavaSerializer() throws Exception {
 
     @Test
     public void testGzipompressedJavaSerializer() throws Exception {
-        RedisCommands<String, Object> connection = client.connect(
-                CompressionCodec.valueCompressor(new SerializedObjectCodec(), CompressionCodec.CompressionType.GZIP)).sync();
+        RedisCommands<String, Object> connection = client
+                .connect(CompressionCodec.valueCompressor(new SerializedObjectCodec(), CompressionCodec.CompressionType.GZIP))
+                .sync();
         List<String> list = list("one", "two");
         connection.set(key, list);
         assertThat(connection.get(key)).isEqualTo(list);
@@ -107,20 +113,29 @@ public void testByteCodec() throws Exception {
     }
 
     @Test
-    public void testExperimentalByteCodec() throws Exception {
-        RedisCommands<byte[], byte[]> connection = client.connect(CommandArgs.ExperimentalByteArrayCodec.INSTANCE).sync();
+    public void testByteBufferCodec() throws Exception {
+
+        RedisCommands<ByteBuffer, ByteBuffer> connection = client.connect(new ByteBufferCodec()).sync();
         String value = "üöäü+#";
-        connection.set(key.getBytes(), value.getBytes());
-        assertThat(connection.get(key.getBytes())).isEqualTo(value.getBytes());
-        connection.set(key.getBytes(), null);
-        assertThat(connection.get(key.getBytes())).isEqualTo(new byte[0]);
 
-        List<byte[]> keys = connection.keys(key.getBytes());
-        assertThat(keys).contains(key.getBytes());
+        ByteBuffer wrap = ByteBuffer.wrap(value.getBytes());
+
+        connection.set(wrap, wrap);
+
+        List<ByteBuffer> keys = connection.keys(wrap);
+        assertThat(keys).hasSize(1);
+        ByteBuffer byteBuffer = keys.get(0);
+        byte[] bytes = new byte[byteBuffer.remaining()];
+        byteBuffer.get(bytes);
+
+        assertThat(bytes).isEqualTo(value.getBytes());
+
         connection.getStatefulConnection().close();
     }
 
+
     public class SerializedObjectCodec implements RedisCodec<String, Object> {
+
         private Charset charset = Charset.forName("UTF-8");
 
         @Override
@@ -157,4 +172,33 @@ public ByteBuffer encodeValue(Object value) {
             }
         }
     }
+
+    public class ByteBufferCodec implements RedisCodec<ByteBuffer, ByteBuffer> {
+
+        @Override
+        public ByteBuffer decodeKey(ByteBuffer bytes) {
+
+            ByteBuffer decoupled = ByteBuffer.allocate(bytes.remaining());
+            decoupled.put(bytes);
+            return (ByteBuffer) decoupled.flip();
+        }
+
+        @Override
+        public ByteBuffer decodeValue(ByteBuffer bytes) {
+
+            ByteBuffer decoupled = ByteBuffer.allocate(bytes.remaining());
+            decoupled.put(bytes);
+            return (ByteBuffer) decoupled.flip();
+        }
+
+        @Override
+        public ByteBuffer encodeKey(ByteBuffer key) {
+            return key.asReadOnlyBuffer();
+        }
+
+        @Override
+        public ByteBuffer encodeValue(ByteBuffer value) {
+            return value.asReadOnlyBuffer();
+        }
+    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/protocol/CommandArgsTest.java b/src/test/java/com/lambdaworks/redis/protocol/CommandArgsTest.java
index 416cef16f6..e6107131ea 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/CommandArgsTest.java
+++ b/src/test/java/com/lambdaworks/redis/protocol/CommandArgsTest.java
@@ -20,9 +20,9 @@
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-import com.lambdaworks.redis.codec.ByteArrayCodec;
 import org.junit.Test;
 
+import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.codec.Utf8StringCodec;
 
 import io.netty.buffer.ByteBuf;
@@ -111,56 +111,10 @@ public void addByte() throws Exception {
         assertThat(buffer.toString(LettuceCharsets.ASCII)).isEqualTo(expected.toString(LettuceCharsets.ASCII));
     }
 
-    @Test
-    public void addByteUsingDirectByteCodec() throws Exception {
-
-        CommandArgs<byte[], byte[]> args = new CommandArgs<>(CommandArgs.ExperimentalByteArrayCodec.INSTANCE)
-                .add("one".getBytes());
-
-        ByteBuf buffer = Unpooled.buffer();
-        args.encode(buffer);
-
-        ByteBuf expected = Unpooled.buffer();
-        expected.writeBytes(("$3\r\n" + "one\r\n").getBytes());
-
-        assertThat(buffer.toString(LettuceCharsets.ASCII)).isEqualTo(expected.toString(LettuceCharsets.ASCII));
-    }
-
-    @Test
-    public void addValueUsingDirectByteCodec() throws Exception {
-
-        CommandArgs<byte[], byte[]> args = new CommandArgs<>(CommandArgs.ExperimentalByteArrayCodec.INSTANCE)
-                .addValue("one".getBytes());
-
-        ByteBuf buffer = Unpooled.buffer();
-        args.encode(buffer);
-
-        ByteBuf expected = Unpooled.buffer();
-        expected.writeBytes(("$3\r\n" + "one\r\n").getBytes());
-
-        assertThat(buffer.toString(LettuceCharsets.ASCII)).isEqualTo(expected.toString(LettuceCharsets.ASCII));
-    }
-
-    @Test
-    public void addKeyUsingDirectByteCodec() throws Exception {
-
-        CommandArgs<byte[], byte[]> args = new CommandArgs<>(CommandArgs.ExperimentalByteArrayCodec.INSTANCE)
-                .addValue("one".getBytes());
-
-        ByteBuf buffer = Unpooled.buffer();
-        args.encode(buffer);
-
-        ByteBuf expected = Unpooled.buffer();
-        expected.writeBytes(("$3\r\n" + "one\r\n").getBytes());
-
-        assertThat(buffer.toString(LettuceCharsets.ASCII)).isEqualTo(expected.toString(LettuceCharsets.ASCII));
-    }
-
     @Test
     public void addByteUsingByteCodec() throws Exception {
 
-        CommandArgs<byte[], byte[]> args = new CommandArgs<>(ByteArrayCodec.INSTANCE)
-                .add("one".getBytes());
+        CommandArgs<byte[], byte[]> args = new CommandArgs<>(ByteArrayCodec.INSTANCE).add("one".getBytes());
 
         ByteBuf buffer = Unpooled.buffer();
         args.encode(buffer);
@@ -174,8 +128,7 @@ public void addByteUsingByteCodec() throws Exception {
     @Test
     public void addValueUsingByteCodec() throws Exception {
 
-        CommandArgs<byte[], byte[]> args = new CommandArgs<>(ByteArrayCodec.INSTANCE)
-                .addValue("one".getBytes());
+        CommandArgs<byte[], byte[]> args = new CommandArgs<>(ByteArrayCodec.INSTANCE).addValue("one".getBytes());
 
         ByteBuf buffer = Unpooled.buffer();
         args.encode(buffer);
@@ -189,8 +142,7 @@ public void addValueUsingByteCodec() throws Exception {
     @Test
     public void addKeyUsingByteCodec() throws Exception {
 
-        CommandArgs<byte[], byte[]> args = new CommandArgs<>(ByteArrayCodec.INSTANCE)
-                .addValue("one".getBytes());
+        CommandArgs<byte[], byte[]> args = new CommandArgs<>(ByteArrayCodec.INSTANCE).addValue("one".getBytes());
 
         ByteBuf buffer = Unpooled.buffer();
         args.encode(buffer);

From 6bc9c7d403460c38e10cbe1e446e25ffd9880c32 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 10 Dec 2016 15:48:03 +0100
Subject: [PATCH 088/808] Mark NodeSelection API as stable #389

---
 .../redis/cluster/api/async/AsyncExecutions.java     |  7 +------
 .../redis/cluster/api/async/AsyncNodeSelection.java  | 10 +++-------
 .../redis/cluster/api/sync/Executions.java           |  7 +------
 .../redis/cluster/api/sync/NodeSelection.java        |  6 ------
 .../pubsub/api/async/PubSubAsyncNodeSelection.java   | 12 +++---------
 5 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncExecutions.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncExecutions.java
index 16ac15791e..11cf72ac69 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncExecutions.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncExecutions.java
@@ -24,13 +24,8 @@
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 
 /**
- * Result holder for a command that was executed asynchronously on multiple nodes. This API is subject to incompatible changes
- * in a future release. The API is exempt from any compatibility guarantees made by lettuce. The current state implies nothing
- * about the quality or performance of the API in question, only the fact that it is not "API-frozen."
+ * Result holder for a command that was executed asynchronously on multiple nodes.
  *
- * The NodeSelection command API and its result types are a base for discussions.
- *
- * 
  * @author Mark Paluch
  * @since 4.0
  */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncNodeSelection.java
index 23a2131197..c206c4ffc3 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncNodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncNodeSelection.java
@@ -19,16 +19,12 @@
 import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
 
 /**
- * Node selection with access to asynchronous executed commands on the set. This API is subject to incompatible changes in a
- * future release. The API is exempt from any compatibility guarantees made by lettuce. The current state implies nothing about
- * the quality or performance of the API in question, only the fact that it is not "API-frozen."
- *
- * The NodeSelection command API and its result types are a base for discussions.
+ * Node selection with access to asynchronous executed commands on the set.
  * 
  * @author Mark Paluch
  * @since 4.0
  */
-public interface AsyncNodeSelection<K, V> extends
-        NodeSelectionSupport<RedisAsyncCommands<K, V>, NodeSelectionAsyncCommands<K, V>> {
+public interface AsyncNodeSelection<K, V>
+        extends NodeSelectionSupport<RedisAsyncCommands<K, V>, NodeSelectionAsyncCommands<K, V>> {
 
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java
index 7507441831..302b1206f2 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java
@@ -23,12 +23,7 @@
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 
 /**
- * Result holder for a command that was executed synchronously on multiple nodes. This API is subject to incompatible changes in
- * a future release. The API is exempt from any compatibility guarantees made by lettuce. The current state implies nothing
- * about the quality or performance of the API in question, only the fact that it is not "API-frozen."
- *
- * The NodeSelection command API and its result types are a base for discussions.
- *
+ * Result holder for a command that was executed synchronously on multiple nodes.
  * 
  * @author Mark Paluch
  * @since 4.0
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelection.java
index d89d79ac5d..1f330a9449 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelection.java
@@ -21,12 +21,6 @@
 /**
  * Node selection with access to synchronous executed commands on the set. Commands are triggered concurrently to the selected
  * nodes and synchronized afterwards.
- *
- * This API is subject to incompatible changes in a future release. The API is exempt from any compatibility guarantees made by
- * lettuce. The current state implies nothing about the quality or performance of the API in question, only the fact that it is
- * not "API-frozen."
- *
- * The NodeSelection command API and its result types are a base for discussions.
  * 
  * @author Mark Paluch
  * @since 4.0
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
index cb08366da9..6cad1ae454 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
@@ -15,22 +15,16 @@
  */
 package com.lambdaworks.redis.cluster.pubsub.api.async;
 
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
 import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
-import com.lambdaworks.redis.cluster.api.async.NodeSelectionAsyncCommands;
 import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
 
 /**
- * Node selection with access to asynchronous executed commands on the set. This API is subject to incompatible changes in a
- * future release. The API is exempt from any compatibility guarantees made by lettuce. The current state implies nothing about
- * the quality or performance of the API in question, only the fact that it is not "API-frozen."
- *
- * The NodeSelection command API and its result types are a base for discussions.
+ * Node selection with access to asynchronous executed commands on the set.
  * 
  * @author Mark Paluch
  * @since 4.4
  */
-public interface PubSubAsyncNodeSelection<K, V> extends
-        NodeSelectionSupport<RedisPubSubAsyncCommands<K, V>, NodeSelectionPubSubAsyncCommands<K, V>> {
+public interface PubSubAsyncNodeSelection<K, V>
+        extends NodeSelectionSupport<RedisPubSubAsyncCommands<K, V>, NodeSelectionPubSubAsyncCommands<K, V>> {
 
 }

From 860cdde61ec1e081a25d20c9bf7871d6ada9882a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 11 Dec 2016 15:33:05 +0100
Subject: [PATCH 089/808] Polishing

Fix modifier order.
---
 src/main/java/com/lambdaworks/redis/ScanIterator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/lambdaworks/redis/ScanIterator.java b/src/main/java/com/lambdaworks/redis/ScanIterator.java
index 4b59f2f327..86805619a9 100644
--- a/src/main/java/com/lambdaworks/redis/ScanIterator.java
+++ b/src/main/java/com/lambdaworks/redis/ScanIterator.java
@@ -38,7 +38,7 @@
  * @author Mark Paluch
  * @since 4.4
  */
-abstract public class ScanIterator<T> implements Iterator<T> {
+public abstract class ScanIterator<T> implements Iterator<T> {
 
     /**
      * Sequentially iterate over keys in the keyspace. This method uses {@code SCAN} to perform an iterative scan.

From 16982163221761f7d1ed2e19aff713a40b42bb43 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 11 Dec 2016 16:17:25 +0100
Subject: [PATCH 090/808] Decompose array parameters into single command
 arguments #421

Array parameters (such as varargs) are decomposed into single elements that are bound as single elements. All array types except byte arrays are decomposed.

interface KeyCommands {
  List<String> mget(String... keys);
}

commands.mget("key1", "key2") results in

MGET key1 key2
---
 .../redis/dynamic/ParameterBinder.java        | 46 ++++++++++++++++---
 .../redis/protocol/CommandArgs.java           |  1 -
 .../CommandSegmentCommandFactoryTest.java     | 42 ++++++++++-------
 .../redis/dynamic/ParameterBinderTest.java    | 16 +++++++
 .../redis/dynamic/RedisCommandsTest.java      | 20 ++++++++
 5 files changed, 101 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java b/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
index 11707fa617..77b8ee9093 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
@@ -17,9 +17,8 @@
 
 import static com.lambdaworks.redis.protocol.CommandKeyword.LIMIT;
 
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.lang.reflect.Array;
+import java.util.*;
 
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
@@ -91,6 +90,15 @@ private <K, V> void bind(CommandArgs<K, V> args, Object argument, int index, Met
             return;
         }
 
+        if (argument instanceof byte[]) {
+            args.add((byte[]) argument);
+            return;
+        }
+
+        if (argument.getClass().isArray()) {
+            argument = asIterable(argument);
+        }
+
         if (index != -1) {
 
             if (accessor.isKey(index)) {
@@ -118,12 +126,20 @@ private <K, V> void bind(CommandArgs<K, V> args, Object argument, int index, Met
             }
         }
 
-        if (argument instanceof String) {
-            args.add((String) argument);
+        if (argument instanceof Iterable) {
+            for (Object argumentElement : (Iterable<Object>) argument) {
+                bindArgument(args, argumentElement);
+            }
+        } else {
+            bindArgument(args, argument);
         }
+    }
 
-        if (argument instanceof byte[]) {
-            args.add((byte[]) argument);
+    @SuppressWarnings("unchecked")
+    private <K, V> void bindArgument(CommandArgs<K, V> args, Object argument) {
+
+        if (argument instanceof String) {
+            args.add((String) argument);
         }
 
         if (argument instanceof Double) {
@@ -247,4 +263,20 @@ private String max(Range<? extends Number> range) {
 
         return upper.getValue().toString();
     }
+
+    private Object asIterable(Object argument) {
+
+        if (argument.getClass().getComponentType().isPrimitive()) {
+
+            int length = Array.getLength(argument);
+
+            List<Object> elements = new ArrayList<>(length);
+            for (int i = 0; i < length; i++) {
+                elements.add(Array.get(argument, i));
+            }
+
+            return elements;
+        }
+        return Arrays.asList((Object[]) argument);
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java b/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
index d52c7175b6..05ea3a47a5 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
@@ -63,7 +63,6 @@ public class CommandArgs<K, V> {
     private K firstKey;
 
     /**
-     *
      * @param codec Codec used to encode/decode keys and values, must not be {@literal null}.
      */
     public CommandArgs(RedisCodec<K, V> codec) {
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
index b773a497b8..a7351b36f0 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
@@ -18,12 +18,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 
-import java.util.List;
 import java.util.concurrent.Future;
 
 import org.junit.Test;
-import org.springframework.test.util.ReflectionTestUtils;
 
+import com.lambdaworks.redis.ScanArgs;
 import com.lambdaworks.redis.SetArgs;
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.codec.RedisCodec;
@@ -38,7 +37,6 @@
 import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory;
 import com.lambdaworks.redis.dynamic.segment.CommandSegmentFactory;
 import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
-import com.lambdaworks.redis.protocol.CommandArgs;
 import com.lambdaworks.redis.protocol.RedisCommand;
 
 /**
@@ -49,7 +47,7 @@ public class CommandSegmentCommandFactoryTest {
     @Test
     public void setKeyValue() {
 
-        RedisCommand<?, ?, ?> command = createCommand(createCommandMethod(Commands.class, "set", String.class, String.class),
+        RedisCommand<?, ?, ?> command = createCommand(methodOf(Commands.class, "set", String.class, String.class),
                 new StringCodec(), "key", "value");
 
         assertThat(toString(command)).isEqualTo("SET key<key> key<value>");
@@ -58,7 +56,7 @@ public void setKeyValue() {
     @Test
     public void setKeyValueWithByteArrayCodec() {
 
-        RedisCommand<?, ?, ?> command = createCommand(createCommandMethod(Commands.class, "set", String.class, String.class),
+        RedisCommand<?, ?, ?> command = createCommand(methodOf(Commands.class, "set", String.class, String.class),
                 new ByteArrayCodec(), "key", "value");
 
         assertThat(toString(command)).isEqualTo("SET key value");
@@ -67,7 +65,7 @@ public void setKeyValueWithByteArrayCodec() {
     @Test
     public void setKeyValueWithHintedValue() {
 
-        RedisCommand<?, ?, ?> command = createCommand(createCommandMethod(Commands.class, "set2", String.class, String.class),
+        RedisCommand<?, ?, ?> command = createCommand(methodOf(Commands.class, "set2", String.class, String.class),
                 new StringCodec(), "key", "value");
 
         assertThat(toString(command)).isEqualTo("SET key<key> value<value>");
@@ -77,16 +75,26 @@ public void setKeyValueWithHintedValue() {
     public void setWithArgs() {
 
         RedisCommand<?, ?, ?> command = createCommand(
-                createCommandMethod(Commands.class, "set", String.class, String.class, SetArgs.class), new StringCodec(), "key",
-                "value", SetArgs.Builder.ex(123).nx());
+                methodOf(Commands.class, "set", String.class, String.class, SetArgs.class), new StringCodec(), "key", "value",
+                SetArgs.Builder.ex(123).nx());
 
         assertThat(toString(command)).isEqualTo("SET key<key> key<value> EX 123 NX");
     }
 
+    @Test
+    public void varargsMethodWithParameterIndexAccess() {
+
+        RedisCommand<?, ?, ?> command = createCommand(
+                methodOf(Commands.class, "varargsWithParamIndexes", ScanArgs.class, String[].class), new StringCodec(),
+                ScanArgs.Builder.limit(1), new String[] { "a", "b" });
+
+        assertThat(toString(command)).isEqualTo("MGET a b Q09VTlQ= 1");
+    }
+
     @Test
     public void clientSetname() {
 
-        RedisCommand<?, ?, ?> command = createCommand(createCommandMethod(Commands.class, "clientSetname", String.class),
+        RedisCommand<?, ?, ?> command = createCommand(methodOf(Commands.class, "clientSetname", String.class),
                 new ByteArrayCodec(), "name");
 
         assertThat(toString(command)).isEqualTo("CLIENT SETNAME name");
@@ -95,7 +103,7 @@ public void clientSetname() {
     @Test
     public void annotatedClientSetname() {
 
-        RedisCommand<?, ?, ?> command = createCommand(createCommandMethod(Commands.class, "woohoo", String.class),
+        RedisCommand<?, ?, ?> command = createCommand(methodOf(Commands.class, "methodWithNamedParameters", String.class),
                 new StringCodec(), "name");
 
         assertThat(toString(command)).isEqualTo("CLIENT SETNAME key<name>");
@@ -105,8 +113,7 @@ public void annotatedClientSetname() {
     public void asyncWithTimeout() {
 
         try {
-            createCommand(createCommandMethod(MethodsWithTimeout.class, "async", String.class, Timeout.class),
-                    new StringCodec());
+            createCommand(methodOf(MethodsWithTimeout.class, "async", String.class, Timeout.class), new StringCodec());
             fail("Missing CommandCreationException");
         } catch (CommandCreationException e) {
             assertThat(e).hasMessageContaining("Asynchronous command methods do not support Timeout parameters");
@@ -116,11 +123,11 @@ public void asyncWithTimeout() {
     @Test
     public void syncWithTimeout() {
 
-        createCommand(createCommandMethod(MethodsWithTimeout.class, "sync", String.class, Timeout.class), new StringCodec(),
-                "hello", null);
+        createCommand(methodOf(MethodsWithTimeout.class, "sync", String.class, Timeout.class), new StringCodec(), "hello",
+                null);
     }
 
-    private CommandMethod createCommandMethod(Class<?> commandInterface, String methodName, Class... args) {
+    private CommandMethod methodOf(Class<?> commandInterface, String methodName, Class... args) {
         return new CommandMethod(ReflectionUtils.findMethod(commandInterface, methodName, args));
     }
 
@@ -158,7 +165,10 @@ interface Commands {
         boolean clientSetname(String connectionName);
 
         @Command("CLIENT SETNAME :connectionName")
-        boolean woohoo(@Param("connectionName") String connectionName);
+        boolean methodWithNamedParameters(@Param("connectionName") String connectionName);
+
+        @Command("MGET ?1 ?0")
+        String varargsWithParamIndexes(ScanArgs scanArgs, String... keys);
     }
 
     static interface MethodsWithTimeout {
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
index 5ba7a037e4..cc912b0bc0 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
@@ -57,6 +57,22 @@ public void bindsStringCorrectly() {
         assertThat(args.toCommandString()).isEqualTo("string");
     }
 
+    @Test
+    public void bindsStringArrayCorrectly() {
+
+        CommandArgs<String, String> args = bind(new String[] { "arg1", "arg2" });
+
+        assertThat(args.toCommandString()).isEqualTo("arg1 arg2");
+    }
+
+    @Test
+    public void bindsIntArrayCorrectly() {
+
+        CommandArgs<String, String> args = bind(new int[] { 1, 2, 3 });
+
+        assertThat(args.toCommandString()).isEqualTo("1 2 3");
+    }
+
     @Test
     public void bindsValueCorrectly() {
 
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
index 426b22eb1c..a29049354d 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
@@ -18,6 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -25,6 +26,7 @@
 import org.junit.Test;
 
 import com.lambdaworks.redis.AbstractRedisClientTest;
+import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.dynamic.annotation.Command;
 import com.lambdaworks.redis.dynamic.domain.Timeout;
 
@@ -47,6 +49,21 @@ public void sync() throws Exception {
         assertThat(api.getAsBytes("key")).isEqualTo("value".getBytes());
     }
 
+    @Test
+    public void mgetAsValues() throws Exception {
+
+        redis.set(key, value);
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        TestInterface api = factory.getCommands(TestInterface.class);
+
+        List<Value<String>> values = api.mgetAsValues(key, "key2");
+        assertThat(values).hasSize(2);
+        assertThat(values.get(0)).isEqualTo(Value.just(value));
+        assertThat(values.get(1)).isEqualTo(Value.empty());
+    }
+
     @Test
     public void async() throws Exception {
 
@@ -105,6 +122,9 @@ static interface TestInterface extends Commands {
 
         @Command("SET")
         Mono<String> setReactive(String key, String value);
+
+        @Command("MGET")
+        List<Value<String>> mgetAsValues(String... keys);
     }
 
     static interface TooFewParameters extends Commands {

From e9b5623e8d8e8a03582e2735335c4b8931d88641 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 11 Dec 2016 16:23:23 +0100
Subject: [PATCH 091/808] Polishing #421

Use ProtocolKeywordArgument to render protocol keywords. Improve test names.
---
 .../redis/protocol/CommandArgs.java           | 28 +++++++++++++++++--
 .../CommandSegmentCommandFactoryTest.java     |  2 +-
 .../redis/dynamic/ParameterBinderTest.java    | 14 +++++-----
 .../dynamic/ReactiveTypeAdaptionTest.java     | 21 ++++++++------
 .../redis/dynamic/RedisCommandsTest.java      | 10 +++----
 5 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java b/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
index 05ea3a47a5..bdcbca1e67 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 
 import com.lambdaworks.redis.LettuceStrings;
-import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.codec.StringCodec;
 import com.lambdaworks.redis.codec.ToByteBufEncoder;
@@ -277,7 +276,9 @@ public CommandArgs<K, V> add(CommandType type) {
     public CommandArgs<K, V> add(ProtocolKeyword keyword) {
 
         LettuceAssert.notNull(keyword, "CommandKeyword must not be null");
-        return add(keyword.getBytes());
+
+        singularArguments.add(ProtocolKeywordArgument.of(keyword));
+        return this;
     }
 
     @Override
@@ -371,6 +372,29 @@ static abstract class SingularArgument {
         abstract void encode(ByteBuf buffer);
     }
 
+    static class ProtocolKeywordArgument extends SingularArgument {
+
+        final ProtocolKeyword protocolKeyword;
+
+        private ProtocolKeywordArgument(ProtocolKeyword protocolKeyword) {
+            this.protocolKeyword = protocolKeyword;
+        }
+
+        static ProtocolKeywordArgument of(ProtocolKeyword val) {
+            return new ProtocolKeywordArgument(val);
+        }
+
+        @Override
+        void encode(ByteBuf buffer) {
+            BytesArgument.writeBytes(buffer, protocolKeyword.getBytes());
+        }
+
+        @Override
+        public String toString() {
+            return protocolKeyword.name();
+        }
+    }
+
     static class BytesArgument extends SingularArgument {
 
         final byte[] val;
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
index a7351b36f0..01e31131d0 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
@@ -88,7 +88,7 @@ public void varargsMethodWithParameterIndexAccess() {
                 methodOf(Commands.class, "varargsWithParamIndexes", ScanArgs.class, String[].class), new StringCodec(),
                 ScanArgs.Builder.limit(1), new String[] { "a", "b" });
 
-        assertThat(toString(command)).isEqualTo("MGET a b Q09VTlQ= 1");
+        assertThat(toString(command)).isEqualTo("MGET a b COUNT 1");
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
index cc912b0bc0..2fab33fb11 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
@@ -117,7 +117,7 @@ public void bindsLimitCorrectly() {
 
         CommandArgs<String, String> args = bind(Limit.create(10, 100));
 
-        assertThat(args.toCommandString()).isEqualTo("TElNSVQ= 10 100");
+        assertThat(args.toCommandString()).isEqualTo("LIMIT 10 100");
     }
 
     @Test
@@ -150,7 +150,7 @@ public void rejectsStringUpperValue() {
     public void bindsValueRangeCorrectly() {
 
         CommandMethod commandMethod = new CommandMethod(
-                ReflectionUtils.findMethod(MyCommands.class, "someMethod", Range.class));
+                ReflectionUtils.findMethod(MyCommands.class, "valueRange", Range.class));
 
         CommandArgs<String, String> args = bind(commandMethod,
                 Range.from(Range.Boundary.including("lower"), Range.Boundary.excluding("upper")));
@@ -163,7 +163,7 @@ public void bindsValueRangeCorrectly() {
     public void bindsUnboundedValueRangeCorrectly() {
 
         CommandMethod commandMethod = new CommandMethod(
-                ReflectionUtils.findMethod(MyCommands.class, "someMethod", Range.class));
+                ReflectionUtils.findMethod(MyCommands.class, "valueRange", Range.class));
 
         CommandArgs<String, String> args = bind(commandMethod, Range.unbounded());
 
@@ -184,12 +184,12 @@ public void bindsProtocolKeywordCorrectly() {
 
         CommandArgs<String, String> args = bind(CommandType.LINDEX);
 
-        assertThat(args.toCommandString()).isEqualTo(Base64Utils.encodeToString("LINDEX".getBytes()));
+        assertThat(args.toCommandString()).isEqualTo("LINDEX");
     }
 
     private CommandArgs<String, String> bind(Object object) {
         CommandMethod commandMethod = new CommandMethod(
-                ReflectionUtils.findMethod(MyCommands.class, "someMethod", Object.class));
+                ReflectionUtils.findMethod(MyCommands.class, "justObject", Object.class));
         return bind(commandMethod, object);
     }
 
@@ -205,8 +205,8 @@ private CommandArgs<String, String> bind(CommandMethod commandMethod, Object obj
 
     private interface MyCommands {
 
-        void someMethod(Object object);
+        void justObject(Object object);
 
-        void someMethod(@com.lambdaworks.redis.dynamic.annotation.Value Range<String> value);
+        void valueRange(@com.lambdaworks.redis.dynamic.annotation.Value Range<String> value);
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java
index cc1f36c24c..02e129eaff 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java
@@ -31,7 +31,8 @@
  */
 public class ReactiveTypeAdaptionTest extends AbstractRedisClientTest {
 
-    private TestInterface api;
+    private RxJava1Types rxjava1;
+    private RxJava2Types rxjava2;
 
     @Before
     public void before() throws Exception {
@@ -39,51 +40,55 @@ public void before() throws Exception {
         redis.set(key, value);
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
-        this.api = factory.getCommands(TestInterface.class);
+        this.rxjava1 = factory.getCommands(RxJava1Types.class);
+        this.rxjava2 = factory.getCommands(RxJava2Types.class);
     }
 
     @Test
     public void rxJava1Single() throws Exception {
 
-        Single<String> single = api.getRxJava1Single(key);
+        Single<String> single = rxjava1.getRxJava1Single(key);
         assertThat(single.toBlocking().value()).isEqualTo(value);
     }
 
     @Test
     public void rxJava1Observable() throws Exception {
 
-        Observable<String> observable = api.getRxJava1Observable(key);
+        Observable<String> observable = rxjava1.getRxJava1Observable(key);
         assertThat(observable.toBlocking().last()).isEqualTo(value);
     }
 
     @Test
     public void rxJava2Single() throws Exception {
 
-        io.reactivex.Single<String> single = api.getRxJava2Single(key);
+        io.reactivex.Single<String> single = rxjava2.getRxJava2Single(key);
         assertThat(single.blockingGet()).isEqualTo(value);
     }
 
     @Test
     public void rxJava2Maybe() throws Exception {
 
-        io.reactivex.Maybe<String> maybe = api.getRxJava2Maybe(key);
+        io.reactivex.Maybe<String> maybe = rxjava2.getRxJava2Maybe(key);
         assertThat(maybe.blockingGet()).isEqualTo(value);
     }
 
     @Test
     public void rxJava2Observable() throws Exception {
 
-        io.reactivex.Observable<String> observable = api.getRxJava2Observable(key);
+        io.reactivex.Observable<String> observable = rxjava2.getRxJava2Observable(key);
         assertThat(observable.blockingFirst()).isEqualTo(value);
     }
 
-    static interface TestInterface extends Commands {
+    static interface RxJava1Types extends Commands {
 
         @Command("GET")
         Single<String> getRxJava1Single(String key);
 
         @Command("GET")
         Observable<String> getRxJava1Observable(String key);
+    }
+
+    static interface RxJava2Types extends Commands {
 
         @Command("GET")
         io.reactivex.Single<String> getRxJava2Single(String key);
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
index a29049354d..06357ee7ca 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
@@ -42,7 +42,7 @@ public void sync() throws Exception {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
-        TestInterface api = factory.getCommands(TestInterface.class);
+        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
 
         api.setSync(key, value, Timeout.create(10, TimeUnit.SECONDS));
         assertThat(api.get("key")).isEqualTo("value");
@@ -56,7 +56,7 @@ public void mgetAsValues() throws Exception {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
-        TestInterface api = factory.getCommands(TestInterface.class);
+        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
 
         List<Value<String>> values = api.mgetAsValues(key, "key2");
         assertThat(values).hasSize(2);
@@ -69,7 +69,7 @@ public void async() throws Exception {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
-        TestInterface api = factory.getCommands(TestInterface.class);
+        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
 
         Future<String> set = api.set(key, value);
         assertThat(set).isInstanceOf(CompletableFuture.class);
@@ -81,7 +81,7 @@ public void reactive() throws Exception {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
-        TestInterface api = factory.getCommands(TestInterface.class);
+        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
 
         Mono<String> set = api.setReactive(key, value);
         assertThat(set.block()).isEqualTo("OK");
@@ -108,7 +108,7 @@ public void verifierShouldCatchBuggyDeclarations() throws Exception {
 
     }
 
-    static interface TestInterface extends Commands {
+    static interface MultipleExecutionModels extends Commands {
 
         String get(String key);
 

From 91ae55e41b6160cdb0404110f6ba8a0cae4a4c9e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 11 Dec 2016 16:40:09 +0100
Subject: [PATCH 092/808] Synchronize KeyValueStreamingAdapter

Add synchronization to prevent element loss during concurrent access
---
 .../java/com/lambdaworks/redis/KeyValueStreamingAdapter.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/lambdaworks/redis/KeyValueStreamingAdapter.java b/src/test/java/com/lambdaworks/redis/KeyValueStreamingAdapter.java
index 463cbb59ea..038cb6a7c1 100644
--- a/src/test/java/com/lambdaworks/redis/KeyValueStreamingAdapter.java
+++ b/src/test/java/com/lambdaworks/redis/KeyValueStreamingAdapter.java
@@ -35,7 +35,10 @@ public class KeyValueStreamingAdapter<K, V> implements KeyValueStreamingChannel<
 
     @Override
     public void onKeyValue(K key, V value) {
-        map.put(key, value);
+
+        synchronized (map) {
+            map.put(key, value);
+        }
     }
 
     public Map<K, V> getMap() {

From 8fd306bfc34042a43c6cbed6830de355bbb478a4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 11 Dec 2016 16:49:54 +0100
Subject: [PATCH 093/808] Add missing JavaDoc #421

---
 pom.xml                                         |  2 +-
 .../com/lambdaworks/redis/ScanIterator.java     | 17 +++++++++++++++++
 .../api/async/RedisServerAsyncCommands.java     |  4 ----
 .../reactive/RedisServerReactiveCommands.java   |  1 +
 .../redis/api/sync/RedisServerCommands.java     |  4 ----
 .../redis/cluster/RedisClusterClient.java       |  1 +
 .../pubsub/RedisClusterPubSubListener.java      | 13 +++++++++----
 .../redis/dynamic/RedisCommandFactory.java      |  1 +
 .../dynamic/output/CommandOutputFactory.java    |  2 ++
 9 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 37f350fe91..eae715420e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -518,7 +518,7 @@
                         <link>http://commons.apache.org/proper/commons-pool/api-2.4.2/</link>
                         <link>https://docs.oracle.com/javase/8/docs/api/</link>
                     </links>
-                    <additionalparam>-Xdoclint:all -Xdoclint:-html -Xdoclint:-syntax</additionalparam>
+                    <additionalparam>-Xdoclint:all -Xdoclint:-html -Xdoclint:-syntax -Xdoclint:-missing</additionalparam>
                     <tags>
                         <tag>
                             <name>generated</name>
diff --git a/src/main/java/com/lambdaworks/redis/ScanIterator.java b/src/main/java/com/lambdaworks/redis/ScanIterator.java
index 86805619a9..cf306af142 100644
--- a/src/main/java/com/lambdaworks/redis/ScanIterator.java
+++ b/src/main/java/com/lambdaworks/redis/ScanIterator.java
@@ -35,6 +35,7 @@
  * ({@code ZSCAN}), and hashes ({@code HSCAN}). A {@link ScanIterator} is stateful and not thread-safe. Instances can be used
  * only once to iterate over results.
  *
+ * @param <T> Element type
  * @author Mark Paluch
  * @since 4.4
  */
@@ -44,6 +45,8 @@ public abstract class ScanIterator<T> implements Iterator<T> {
      * Sequentially iterate over keys in the keyspace. This method uses {@code SCAN} to perform an iterative scan.
      * 
      * @param commands the commands interface, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
      * @return a new {@link ScanIterator}.
      */
     public static <K, V> ScanIterator<K> scan(RedisKeyCommands<K, V> commands) {
@@ -55,6 +58,8 @@ public static <K, V> ScanIterator<K> scan(RedisKeyCommands<K, V> commands) {
      *
      * @param commands the commands interface, must not be {@literal null}.
      * @param scanArgs the scan arguments, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
      * @return a new {@link ScanIterator}.
      */
     public static <K, V> ScanIterator<K> scan(RedisKeyCommands<K, V> commands, ScanArgs scanArgs) {
@@ -95,6 +100,8 @@ private KeyScanCursor<K> getNextScanCursor(ScanCursor scanCursor) {
      * iterative scan.
      *
      * @param commands the commands interface, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
      * @return a new {@link ScanIterator}.
      */
     public static <K, V> ScanIterator<KeyValue<K, V>> hscan(RedisHashCommands<K, V> commands, K key) {
@@ -107,6 +114,8 @@ public static <K, V> ScanIterator<KeyValue<K, V>> hscan(RedisHashCommands<K, V>
      *
      * @param commands the commands interface, must not be {@literal null}.
      * @param scanArgs the scan arguments, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
      * @return a new {@link ScanIterator}.
      */
     public static <K, V> ScanIterator<KeyValue<K, V>> hscan(RedisHashCommands<K, V> commands, K key, ScanArgs scanArgs) {
@@ -149,6 +158,8 @@ private MapScanCursor<K, V> getNextScanCursor(ScanCursor scanCursor) {
      * iterative scan.
      *
      * @param commands the commands interface, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
      * @return a new {@link ScanIterator}.
      */
     public static <K, V> ScanIterator<V> sscan(RedisSetCommands<K, V> commands, K key) {
@@ -161,6 +172,8 @@ public static <K, V> ScanIterator<V> sscan(RedisSetCommands<K, V> commands, K ke
      *
      * @param commands the commands interface, must not be {@literal null}.
      * @param scanArgs the scan arguments, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
      * @return a new {@link ScanIterator}.
      */
     public static <K, V> ScanIterator<V> sscan(RedisSetCommands<K, V> commands, K key, ScanArgs scanArgs) {
@@ -202,6 +215,8 @@ private ValueScanCursor<V> getNextScanCursor(ScanCursor scanCursor) {
      * perform an iterative scan.
      *
      * @param commands the commands interface, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
      * @return a new {@link ScanIterator}.
      */
     public static <K, V> ScanIterator<ScoredValue<V>> zscan(RedisSortedSetCommands<K, V> commands, K key) {
@@ -214,6 +229,8 @@ public static <K, V> ScanIterator<ScoredValue<V>> zscan(RedisSortedSetCommands<K
      *
      * @param commands the commands interface, must not be {@literal null}.
      * @param scanArgs the scan arguments, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
      * @return a new {@link ScanIterator}.
      */
     public static <K, V> ScanIterator<ScoredValue<V>> zscan(RedisSortedSetCommands<K, V> commands, K key, ScanArgs scanArgs) {
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
index 17da5436bd..af87fe4b33 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
@@ -188,15 +188,11 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Make the server crash: Out of memory.
-     *
-     * @return nothing, because the server crashes before returning.
      */
     void debugOom();
 
     /**
      * Make the server crash: Invalid pointer access.
-     *
-     * @return nothing, because the server crashes before returning.
      */
     void debugSegfault();
 
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
index 6169fac93e..67c8b0bb09 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
@@ -284,6 +284,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * Synchronously save the dataset to disk and then shut down the server.
      * 
      * @param save {@literal true} force save operation
+     * @return String simple-string-reply The commands returns OK on success.
      */
     Mono<Void> shutdown(boolean save);
 
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
index 1f7a4a021e..6adcfe2137 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
@@ -187,15 +187,11 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Make the server crash: Out of memory.
-     *
-     * @return nothing, because the server crashes before returning.
      */
     void debugOom();
 
     /**
      * Make the server crash: Invalid pointer access.
-     *
-     * @return nothing, because the server crashes before returning.
      */
     void debugSegfault();
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index 229e268770..d6e8f71bbc 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -896,6 +896,7 @@ protected void forEachClusterPubSubConnection(Consumer<StatefulRedisClusterPubSu
     /**
      * Apply a {@link Consumer} of {@link Closeable} to all active connections.
      *
+     * @param <T>
      * @param function the {@link Consumer}.
      */
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubListener.java b/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubListener.java
index b3ab77f8c8..5479c94717 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubListener.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubListener.java
@@ -30,6 +30,7 @@ public interface RedisClusterPubSubListener<K, V> {
     /**
      * Message received from a channel subscription.
      * 
+     * @param node the {@link RedisClusterNode} where the {@literal message} originates.
      * @param channel Channel.
      * @param message Message.
      */
@@ -37,7 +38,8 @@ public interface RedisClusterPubSubListener<K, V> {
 
     /**
      * Message received from a pattern subscription.
-     * 
+     *
+     * @param node the {@link RedisClusterNode} where the {@literal message} originates.
      * @param pattern Pattern
      * @param channel Channel
      * @param message Message
@@ -46,7 +48,8 @@ public interface RedisClusterPubSubListener<K, V> {
 
     /**
      * Subscribed to a channel.
-     * 
+     *
+     * @param node the {@link RedisClusterNode} where the {@literal message} originates.
      * @param channel Channel
      * @param count Subscription count.
      */
@@ -62,7 +65,8 @@ public interface RedisClusterPubSubListener<K, V> {
 
     /**
      * Unsubscribed from a channel.
-     * 
+     *
+     * @param node the {@link RedisClusterNode} where the {@literal message} originates.
      * @param channel Channel
      * @param count Subscription count.
      */
@@ -70,7 +74,8 @@ public interface RedisClusterPubSubListener<K, V> {
 
     /**
      * Unsubscribed from a pattern.
-     * 
+     *
+     * @param node the {@link RedisClusterNode} where the {@literal message} originates.
      * @param pattern Channel
      * @param count Subscription count.
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
index 4c61cac856..aa69f0d7ac 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
@@ -177,6 +177,7 @@ public void setVerifyCommandMethods(boolean verifyCommandMethods) {
      * Returns a Redis Command instance for the given interface.
      * 
      * @param commandInterface must not be {@literal null}.
+     * @param <T> command interface type.
      * @return the implemented Redis Commands interface.
      */
     public <T extends Commands> T getCommands(Class<T> commandInterface) {
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java
index ca6c55ed22..a53d1eb5b1 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java
@@ -33,6 +33,8 @@ public interface CommandOutputFactory {
      * Create and initialize a new {@link CommandOutput} given {@link RedisCodec}.
      * 
      * @param codec must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
      * @return the new {@link CommandOutput}.
      */
     <K, V> CommandOutput<K, V, ?> create(RedisCodec<K, V> codec);

From a0f63ed0ff15fc396133a57d12c6c576796916ab Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 12 Dec 2016 20:18:14 +0100
Subject: [PATCH 094/808] Polishing

Split executionmodel-specific tests.
---
 .../dynamic/CommandMethodVerifierTest.java    |  8 +-
 .../CommandSegmentCommandFactoryTest.java     |  3 +-
 .../redis/dynamic/ConversionServiceTest.java  |  2 +-
 .../redis/dynamic/RedisCommandsAsyncTest.java | 47 ++++++++++
 .../dynamic/RedisCommandsReactiveTest.java    | 47 ++++++++++
 .../redis/dynamic/RedisCommandsSyncTest.java  | 76 ++++++++++++++++
 .../redis/dynamic/RedisCommandsTest.java      | 88 ++-----------------
 .../AnnotationCommandSegmentFactoryTest.java  |  1 -
 8 files changed, 185 insertions(+), 87 deletions(-)
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsAsyncTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsReactiveTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsSyncTest.java

diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java b/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java
index 789d2fe3bb..4e5b7f261c 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java
@@ -19,13 +19,13 @@
 import static org.assertj.core.api.Fail.fail;
 
 import java.lang.reflect.Method;
-import java.util.Arrays;
+import java.util.Collections;
 
-import com.lambdaworks.redis.GeoCoordinates;
-import com.lambdaworks.redis.KeyValue;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.lambdaworks.redis.GeoCoordinates;
+import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.dynamic.segment.CommandSegment;
 import com.lambdaworks.redis.dynamic.segment.CommandSegments;
 import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
@@ -111,7 +111,7 @@ private void validateMethod(String methodName, Class<?>... parameterTypes) {
         Method method = ReflectionUtils.findMethod(MyInterface.class, methodName, parameterTypes);
         CommandMethod commandMethod = new CommandMethod(method);
 
-        sut.validate(new CommandSegments(Arrays.asList(CommandSegment.constant(methodName))), commandMethod);
+        sut.validate(new CommandSegments(Collections.singletonList(CommandSegment.constant(methodName))), commandMethod);
     }
 
     static interface MyInterface {
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
index 01e31131d0..6fca07596d 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
@@ -131,13 +131,14 @@ private CommandMethod methodOf(Class<?> commandInterface, String methodName, Cla
         return new CommandMethod(ReflectionUtils.findMethod(commandInterface, methodName, args));
     }
 
+    @SuppressWarnings("unchecked")
     private RedisCommand<?, ?, ?> createCommand(CommandMethod commandMethod, RedisCodec<?, ?> codec, Object... args) {
 
         CommandSegmentFactory segmentFactory = new AnnotationCommandSegmentFactory();
         CodecAwareOutputFactoryResolver outputFactoryResolver = new CodecAwareOutputFactoryResolver(
                 new OutputRegistryCommandOutputFactoryResolver(new OutputRegistry()), codec);
         CommandSegmentCommandFactory factory = new CommandSegmentCommandFactory(
-                segmentFactory.createCommandSegments(commandMethod), commandMethod, (RedisCodec) codec, outputFactoryResolver);
+                segmentFactory.createCommandSegments(commandMethod), commandMethod, codec, outputFactoryResolver);
 
         return factory.createCommand(args);
     }
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java
index 2e520306fd..8be5e8dc55 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java
@@ -31,7 +31,7 @@
  */
 public class ConversionServiceTest {
 
-    ConversionService sut = new ConversionService();
+    private ConversionService sut = new ConversionService();
 
     @Test
     public void getConverter() {
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsAsyncTest.java b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsAsyncTest.java
new file mode 100644
index 0000000000..b35021bdb5
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsAsyncTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
+
+import org.junit.Test;
+
+import com.lambdaworks.redis.AbstractRedisClientTest;
+
+/**
+ * @author Mark Paluch
+ */
+public class RedisCommandsAsyncTest extends AbstractRedisClientTest {
+
+    @Test
+    public void async() throws Exception {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
+
+        Future<String> set = api.set(key, value);
+        assertThat(set).isInstanceOf(CompletableFuture.class);
+        set.get();
+    }
+
+    static interface MultipleExecutionModels extends Commands {
+        Future<String> set(String key, String value);
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsReactiveTest.java b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsReactiveTest.java
new file mode 100644
index 0000000000..a168d14915
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsReactiveTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+
+import com.lambdaworks.redis.AbstractRedisClientTest;
+import com.lambdaworks.redis.dynamic.annotation.Command;
+
+import reactor.core.publisher.Mono;
+
+/**
+ * @author Mark Paluch
+ */
+public class RedisCommandsReactiveTest extends AbstractRedisClientTest {
+
+    @Test
+    public void reactive() throws Exception {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
+
+        Mono<String> set = api.setReactive(key, value);
+        assertThat(set.block()).isEqualTo("OK");
+    }
+
+    static interface MultipleExecutionModels extends Commands {
+        @Command("SET")
+        Mono<String> setReactive(String key, String value);
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsSyncTest.java b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsSyncTest.java
new file mode 100644
index 0000000000..efc16a4616
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsSyncTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+import com.lambdaworks.redis.AbstractRedisClientTest;
+import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.dynamic.annotation.Command;
+import com.lambdaworks.redis.dynamic.domain.Timeout;
+
+/**
+ * @author Mark Paluch
+ */
+public class RedisCommandsSyncTest extends AbstractRedisClientTest {
+
+    @Test
+    public void sync() throws Exception {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
+
+        api.setSync(key, value, Timeout.create(10, TimeUnit.SECONDS));
+        assertThat(api.get("key")).isEqualTo("value");
+        assertThat(api.getAsBytes("key")).isEqualTo("value".getBytes());
+    }
+
+    @Test
+    public void mgetAsValues() throws Exception {
+
+        redis.set(key, value);
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
+
+        List<Value<String>> values = api.mgetAsValues(key, "key2");
+        assertThat(values).hasSize(2);
+        assertThat(values.get(0)).isEqualTo(Value.just(value));
+        assertThat(values.get(1)).isEqualTo(Value.empty());
+    }
+
+    static interface MultipleExecutionModels extends Commands {
+
+        String get(String key);
+
+        @Command("GET")
+        byte[] getAsBytes(String key);
+
+        @Command("SET")
+        String setSync(String key, String value, Timeout timeout);
+
+        @Command("MGET")
+        List<Value<String>> mgetAsValues(String... keys);
+    }
+
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
index 06357ee7ca..9d30c2831d 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
@@ -18,19 +18,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
 import org.junit.Test;
 
 import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.dynamic.annotation.Command;
-import com.lambdaworks.redis.dynamic.domain.Timeout;
-
-import reactor.core.publisher.Mono;
 
 /**
  * @author Mark Paluch
@@ -38,57 +28,21 @@
 public class RedisCommandsTest extends AbstractRedisClientTest {
 
     @Test
-    public void sync() throws Exception {
-
-        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
-
-        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
-
-        api.setSync(key, value, Timeout.create(10, TimeUnit.SECONDS));
-        assertThat(api.get("key")).isEqualTo("value");
-        assertThat(api.getAsBytes("key")).isEqualTo("value".getBytes());
-    }
-
-    @Test
-    public void mgetAsValues() throws Exception {
-
-        redis.set(key, value);
+    public void verifierShouldCatchMisspelledDeclarations() throws Exception {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
-        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
-
-        List<Value<String>> values = api.mgetAsValues(key, "key2");
-        assertThat(values).hasSize(2);
-        assertThat(values.get(0)).isEqualTo(Value.just(value));
-        assertThat(values.get(1)).isEqualTo(Value.empty());
-    }
-
-    @Test
-    public void async() throws Exception {
-
-        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
-
-        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
-
-        Future<String> set = api.set(key, value);
-        assertThat(set).isInstanceOf(CompletableFuture.class);
-        set.get();
-    }
-
-    @Test
-    public void reactive() throws Exception {
-
-        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
-
-        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
+        try {
+            factory.getCommands(WithTypo.class);
+            fail("Missing CommandCreationException");
+        } catch (CommandCreationException e) {
+            assertThat(e).hasMessageContaining("Command GAT does not exist.");
+        }
 
-        Mono<String> set = api.setReactive(key, value);
-        assertThat(set.block()).isEqualTo("OK");
     }
 
     @Test
-    public void verifierShouldCatchBuggyDeclarations() throws Exception {
+    public void verifierShouldCatchTooFewParametersDeclarations() throws Exception {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
@@ -99,32 +53,6 @@ public void verifierShouldCatchBuggyDeclarations() throws Exception {
             assertThat(e).hasMessageContaining("Command GET accepts 1 parameters but method declares 0 parameter");
         }
 
-        try {
-            factory.getCommands(WithTypo.class);
-            fail("Missing CommandCreationException");
-        } catch (CommandCreationException e) {
-            assertThat(e).hasMessageContaining("Command GAT does not exist.");
-        }
-
-    }
-
-    static interface MultipleExecutionModels extends Commands {
-
-        String get(String key);
-
-        @Command("GET")
-        byte[] getAsBytes(String key);
-
-        @Command("SET")
-        String setSync(String key, String value, Timeout timeout);
-
-        Future<String> set(String key, String value);
-
-        @Command("SET")
-        Mono<String> setReactive(String key, String value);
-
-        @Command("MGET")
-        List<Value<String>> mgetAsValues(String... keys);
     }
 
     static interface TooFewParameters extends Commands {
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
index f7085678d1..fbaeda6e10 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
@@ -121,5 +121,4 @@ private static interface Defaulted {
 
         void clientSetname();
     }
-
 }

From ab8e6122c9f476603c3c122e75499b5b607e6165 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 12 Dec 2016 20:20:06 +0100
Subject: [PATCH 095/808] Add test for RxJava2 Flowable use in dynamic API

---
 .../redis/dynamic/ReactiveTypeAdaptionTest.java        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java
index 02e129eaff..63f0cadc45 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java
@@ -79,6 +79,13 @@ public void rxJava2Observable() throws Exception {
         assertThat(observable.blockingFirst()).isEqualTo(value);
     }
 
+    @Test
+    public void rxJava2Flowable() throws Exception {
+
+        io.reactivex.Flowable<String> flowable = rxjava2.getRxJava2Flowable(key);
+        assertThat(flowable.blockingFirst()).isEqualTo(value);
+    }
+
     static interface RxJava1Types extends Commands {
 
         @Command("GET")
@@ -98,5 +105,8 @@ static interface RxJava2Types extends Commands {
 
         @Command("GET")
         io.reactivex.Observable<String> getRxJava2Observable(String key);
+
+        @Command("GET")
+        io.reactivex.Flowable<String> getRxJava2Flowable(String key);
     }
 }

From ae531cf2bad06c168db58d890fc3dd382fcad65c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 12 Dec 2016 20:58:01 +0100
Subject: [PATCH 096/808] Support value ranges #384

Redis Command Interfaces support now value-typed ranges.

public interface SortedSetCommands extends Commands {

    List<String> zrangebylex(String key, @Value Range<String> range);

}
---
 .../dynamic/CommandSegmentCommandFactory.java |  2 +-
 .../redis/dynamic/ParameterBinder.java        | 98 ++++++++++++++-----
 .../redis/dynamic/ParameterBinderTest.java    |  6 +-
 3 files changed, 75 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
index cbd4cada03..b8df2b3987 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
@@ -89,7 +89,7 @@ protected CommandOutputFactory resolveCommandOutputFactory(OutputSelector output
         com.lambdaworks.redis.protocol.Command<?, ?, ?> command = new com.lambdaworks.redis.protocol.Command<>(
                 this.segments.getCommandType(), output, args);
 
-        parameterBinder.bind(args, segments, parametersAccessor);
+        parameterBinder.bind(args, redisCodec, segments, parametersAccessor);
 
         return command;
     }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java b/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
index 77b8ee9093..84d35a5d69 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
@@ -18,9 +18,11 @@
 import static com.lambdaworks.redis.protocol.CommandKeyword.LIMIT;
 
 import java.lang.reflect.Array;
+import java.nio.ByteBuffer;
 import java.util.*;
 
 import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
 import com.lambdaworks.redis.dynamic.segment.CommandSegment;
 import com.lambdaworks.redis.dynamic.segment.CommandSegment.ArgumentContribution;
@@ -42,14 +44,14 @@ class ParameterBinder {
     /**
      * Bind {@link CommandSegments} and method parameters to {@link CommandArgs}.
      * 
-     * @param args
-     * @param commandSegments
-     * @param accessor
-     * @param <K>
-     * @param <V>
+     * @param args the command arguments.
+     * @param codec the codec.
+     * @param commandSegments the command segments.
+     * @param accessor the parameter accessor.
      * @return
      */
-    <K, V> CommandArgs<K, V> bind(CommandArgs<K, V> args, CommandSegments commandSegments, MethodParametersAccessor accessor) {
+    <K, V> CommandArgs<K, V> bind(CommandArgs<K, V> args, RedisCodec<K, V> codec, CommandSegments commandSegments,
+            MethodParametersAccessor accessor) {
 
         int parameterCount = accessor.getParameterCount();
 
@@ -58,7 +60,7 @@ <K, V> CommandArgs<K, V> bind(CommandArgs<K, V> args, CommandSegments commandSeg
         for (CommandSegment commandSegment : commandSegments) {
 
             ArgumentContribution argumentContribution = commandSegment.contribute(accessor);
-            bind(args, argumentContribution.getValue(), argumentContribution.getParameterIndex(), accessor);
+            bind(args, codec, argumentContribution.getValue(), argumentContribution.getParameterIndex(), accessor);
 
             eatenParameters.add(argumentContribution.getParameterIndex());
         }
@@ -70,7 +72,7 @@ <K, V> CommandArgs<K, V> bind(CommandArgs<K, V> args, CommandSegments commandSeg
             }
 
             Object bindableValue = accessor.getBindableValue(i);
-            bind(args, bindableValue, i, accessor);
+            bind(args, codec, bindableValue, i, accessor);
 
             eatenParameters.add(i);
         }
@@ -78,8 +80,12 @@ <K, V> CommandArgs<K, V> bind(CommandArgs<K, V> args, CommandSegments commandSeg
         return args;
     }
 
+    /*
+     * Bind key/value/byte[] arguments. Other arguments are unwound, if applicable, and bound according to their type.
+     */
     @SuppressWarnings("unchecked")
-    private <K, V> void bind(CommandArgs<K, V> args, Object argument, int index, MethodParametersAccessor accessor) {
+    private <K, V> void bind(CommandArgs<K, V> args, RedisCodec<K, V> codec, Object argument, int index,
+            MethodParametersAccessor accessor) {
 
         if (argument == null) {
 
@@ -114,7 +120,8 @@ private <K, V> void bind(CommandArgs<K, V> args, Object argument, int index, Met
             if (accessor.isValue(index)) {
 
                 if (argument instanceof Range) {
-                    throw new UnsupportedOperationException("Value Range is not supported.");
+                    bindValueRange(args, codec, (Range<? extends V>) argument);
+                    return;
                 }
 
                 if (argument instanceof Iterable) {
@@ -135,6 +142,10 @@ private <K, V> void bind(CommandArgs<K, V> args, Object argument, int index, Met
         }
     }
 
+    /*
+     * Bind generic-handled arguments (String, ProtocolKeyword, Double, Map, Value hierarchy, Limit, Range, GeoCoordinates,
+     * Composite Arguments).
+     */
     @SuppressWarnings("unchecked")
     private <K, V> void bindArgument(CommandArgs<K, V> args, Object argument) {
 
@@ -201,21 +212,8 @@ private <K, V> void bindArgument(CommandArgs<K, V> args, Object argument) {
 
         if (argument instanceof Range) {
 
-            Range<?> range = (Range<?>) argument;
-
-            if (range.getLower().getValue() != null && !(range.getLower().getValue() instanceof Number)) {
-                throw new IllegalArgumentException(
-                        "Cannot bind non-numeric lower range value for a numeric Range. Annotate with @Value if the Range contains a value range.");
-            }
-
-            if (range.getUpper().getValue() != null && !(range.getUpper().getValue() instanceof Number)) {
-                throw new IllegalArgumentException(
-                        "Cannot bind non-numeric upper range value for a numeric Range. Annotate with @Value if the Range contains a value range.");
-            }
-
-            args.add(min((Range) range));
-            args.add(max((Range) range));
-
+            Range<? extends Number> range = (Range<? extends Number>) argument;
+            bindNumericRange(args, range);
             return;
         }
 
@@ -232,7 +230,29 @@ private <K, V> void bindArgument(CommandArgs<K, V> args, Object argument) {
         }
     }
 
-    private String min(Range<? extends Number> range) {
+    private <K, V> void bindValueRange(CommandArgs<K, V> args, RedisCodec<K, V> codec, Range<? extends V> range) {
+
+        args.add(minValue(codec, range));
+        args.add(maxValue(codec, range));
+    }
+
+    private <K, V> void bindNumericRange(CommandArgs<K, V> args, Range<? extends Number> range) {
+
+        if (range.getLower().getValue() != null && !(range.getLower().getValue() instanceof Number)) {
+            throw new IllegalArgumentException(
+                    "Cannot bind non-numeric lower range value for a numeric Range. Annotate with @Value if the Range contains a value range.");
+        }
+
+        if (range.getUpper().getValue() != null && !(range.getUpper().getValue() instanceof Number)) {
+            throw new IllegalArgumentException(
+                    "Cannot bind non-numeric upper range value for a numeric Range. Annotate with @Value if the Range contains a value range.");
+        }
+
+        args.add(minNumeric(range));
+        args.add(maxNumeric(range));
+    }
+
+    private String minNumeric(Range<? extends Number> range) {
 
         Range.Boundary<? extends Number> lower = range.getLower();
 
@@ -248,7 +268,7 @@ private String min(Range<? extends Number> range) {
         return lower.getValue().toString();
     }
 
-    private String max(Range<? extends Number> range) {
+    private String maxNumeric(Range<? extends Number> range) {
 
         Range.Boundary<? extends Number> upper = range.getUpper();
 
@@ -264,6 +284,30 @@ private String max(Range<? extends Number> range) {
         return upper.getValue().toString();
     }
 
+    private <K, V> byte[] minValue(RedisCodec<K, V> codec, Range<? extends V> range) {
+        return valueRange(range.getLower(), MINUS_BYTES, codec);
+    }
+
+    private <K, V> byte[] maxValue(RedisCodec<K, V> codec, Range<? extends V> range) {
+        return valueRange(range.getUpper(), PLUS_BYTES, codec);
+    }
+
+    private <K, V> byte[] valueRange(Range.Boundary<? extends V> boundary, byte[] unbounded, RedisCodec<K, V> codec) {
+
+        if (boundary.getValue() == null) {
+            return unbounded;
+        }
+
+        ByteBuffer encodeValue = codec.encodeValue(boundary.getValue());
+        byte[] argument = new byte[encodeValue.remaining() + 1];
+
+        argument[0] = (byte) (boundary.isIncluding() ? '[' : '(');
+
+        encodeValue.get(argument, 1, argument.length - 1);
+
+        return argument;
+    }
+
     private Object asIterable(Object argument) {
 
         if (argument.getClass().getComponentType().isPrimitive()) {
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
index 2fab33fb11..f19f7f3459 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
@@ -146,7 +146,7 @@ public void rejectsStringUpperValue() {
         bind(Range.from(Range.Boundary.including(11), Range.Boundary.excluding("hello")));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
+    @Test
     public void bindsValueRangeCorrectly() {
 
         CommandMethod commandMethod = new CommandMethod(
@@ -159,7 +159,7 @@ public void bindsValueRangeCorrectly() {
                 Base64Utils.encodeToString("(upper".getBytes())));
     }
 
-    @Test(expected = UnsupportedOperationException.class)
+    @Test
     public void bindsUnboundedValueRangeCorrectly() {
 
         CommandMethod commandMethod = new CommandMethod(
@@ -198,7 +198,7 @@ private CommandArgs<String, String> bind(CommandMethod commandMethod, Object obj
                 object);
 
         CommandArgs<String, String> args = new CommandArgs<>(new StringCodec());
-        binder.bind(args, segments, parametersAccessor);
+        binder.bind(args, StringCodec.UTF8, segments, parametersAccessor);
 
         return args;
     }

From 41dcd208ec2f775f541254047e960b98351bb9fb Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 12 Dec 2016 22:11:18 +0100
Subject: [PATCH 097/808] Consider key/value type of parameter wrappers in
 codec resolution #423

Codec resolution for wrapped parameter types (such as Value, KeyValue, Map, Iterable) considers their Key/Value type.
---
 .../codec/AnnotationRedisCodecResolver.java   | 129 +++++++++++++--
 .../AnnotationRedisCodecResolverTest.java     |  25 ++-
 .../dynamic/codec/ParameterWrappersTest.java  | 147 ++++++++++++++++++
 3 files changed, 283 insertions(+), 18 deletions(-)
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/codec/ParameterWrappersTest.java

diff --git a/src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java
index cc39dc3c7c..431da9ee7c 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java
@@ -15,16 +15,13 @@
  */
 package com.lambdaworks.redis.dynamic.codec;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.dynamic.annotation.Key;
-import com.lambdaworks.redis.dynamic.annotation.Value;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.dynamic.CommandMethod;
+import com.lambdaworks.redis.dynamic.annotation.Key;
+import com.lambdaworks.redis.dynamic.annotation.Value;
 import com.lambdaworks.redis.dynamic.parameter.Parameter;
 import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
 import com.lambdaworks.redis.dynamic.support.TypeInformation;
@@ -94,6 +91,7 @@ public AnnotationRedisCodecResolver(List<RedisCodec<?, ?>> codecs) {
         commandMethod.getParameters().getBindableParameters().forEach(parameter -> {
 
             for (Voted<RedisCodec<?, ?>> vote : votes) {
+
                 ClassTypeInformation<? extends RedisCodec> typeInformation = ClassTypeInformation.from(vote.subject.getClass());
 
                 TypeInformation<?> superTypeInformation = typeInformation.getSuperTypeInformation(RedisCodec.class);
@@ -104,14 +102,18 @@ public AnnotationRedisCodecResolver(List<RedisCodec<?, ?>> codecs) {
                     continue;
                 }
 
+                TypeInformation<?> parameterType = parameter.getTypeInformation();
+                TypeInformation<?> parameterKeyType = ParameterWrappers.getKeyType(parameterType);
+                TypeInformation<?> parameterValueType = ParameterWrappers.getValueType(parameterType);
+
                 TypeInformation<?> keyType = typeArguments.get(0);
                 TypeInformation<?> valueType = typeArguments.get(1);
 
-                if (keyType.isAssignableFrom(parameter.getTypeInformation())) {
+                if (keyType.isAssignableFrom(parameterKeyType)) {
                     vote.votes++;
                 }
 
-                if (valueType.isAssignableFrom(parameter.getTypeInformation())) {
+                if (valueType.isAssignableFrom(parameterValueType)) {
                     vote.votes++;
                 }
             }
@@ -173,20 +175,24 @@ public AnnotationRedisCodecResolver(List<RedisCodec<?, ?>> codecs) {
         return null;
     }
 
-    private Set<Class<?>> findTypes(CommandMethod commandMethod, Class<?> annotation) {
+    Set<Class<?>> findTypes(CommandMethod commandMethod, Class<?> annotation) {
 
-        Set<Class<?>> types = new HashSet<>();
+        Set<Class<?>> types = new LinkedHashSet<>();
 
         for (Parameter parameter : commandMethod.getParameters().getBindableParameters()) {
 
             types.addAll(parameter.getAnnotations().stream()
                     .filter(parameterAnnotation -> annotation.isAssignableFrom(parameterAnnotation.getClass()))
                     .map(parameterAnnotation -> {
-                        if (parameter.getTypeInformation().isCollectionLike()
-                                && !parameter.getTypeInformation().getType().isArray()) {
-                            return parameter.getTypeInformation().getComponentType().getType();
+
+                        TypeInformation<?> typeInformation = parameter.getTypeInformation();
+
+                        if (annotation == Key.class && ParameterWrappers.hasKeyType(typeInformation)) {
+                            TypeInformation<?> parameterKeyType = ParameterWrappers.getKeyType(typeInformation);
+                            return parameterKeyType.getType();
                         }
-                        return parameter.getTypeInformation().getType();
+
+                        return ParameterWrappers.getValueType(typeInformation).getType();
 
                     }).collect(Collectors.toList()));
         }
@@ -199,7 +205,7 @@ private static class Voted<T> implements Comparable<Voted<?>> {
         private T subject;
         private int votes;
 
-        public Voted(T subject, int votes) {
+        Voted(T subject, int votes) {
             this.subject = subject;
             this.votes = votes;
         }
@@ -209,4 +215,97 @@ public int compareTo(Voted<?> o) {
             return votes - o.votes;
         }
     }
+
+    /**
+     * Parameter wrapper support for types that encapsulate one or more parameter values.
+     */
+    protected static class ParameterWrappers {
+
+        private final static Set<Class<?>> WRAPPERS = new HashSet<>();
+        private final static Set<Class<?>> WITH_KEY_TYPE = new HashSet<>();
+        private final static Set<Class<?>> WITH_VALUE_TYPE = new HashSet<>();
+
+        static {
+
+            WRAPPERS.add(com.lambdaworks.redis.Value.class);
+            WRAPPERS.add(com.lambdaworks.redis.KeyValue.class);
+            WRAPPERS.add(com.lambdaworks.redis.ScoredValue.class);
+            WRAPPERS.add(com.lambdaworks.redis.Range.class);
+
+            WRAPPERS.add(List.class);
+            WRAPPERS.add(Collection.class);
+            WRAPPERS.add(Set.class);
+            WRAPPERS.add(Iterable.class);
+            WRAPPERS.add(Map.class);
+
+            WITH_VALUE_TYPE.add(com.lambdaworks.redis.Value.class);
+            WITH_VALUE_TYPE.add(com.lambdaworks.redis.KeyValue.class);
+            WITH_KEY_TYPE.add(com.lambdaworks.redis.KeyValue.class);
+            WITH_VALUE_TYPE.add(com.lambdaworks.redis.ScoredValue.class);
+
+            WITH_KEY_TYPE.add(Map.class);
+            WITH_VALUE_TYPE.add(Map.class);
+        }
+
+        /**
+         * @param typeInformation must not be {@literal null}.
+         * @return {@literal true} if {@code parameterClass} is a parameter wrapper.
+         */
+        public static boolean supports(TypeInformation<?> typeInformation) {
+            return WRAPPERS.contains(typeInformation.getType())
+                    || (typeInformation.getType().isArray() && !(typeInformation.getType().equals(byte[].class)));
+        }
+
+        /**
+         * @param typeInformation must not be {@literal null}.
+         * @return {@literal true} if the type has a key type variable.
+         */
+        public static boolean hasKeyType(TypeInformation<?> typeInformation) {
+            return WITH_KEY_TYPE.contains(typeInformation.getType());
+        }
+
+        /**
+         * @param typeInformation must not be {@literal null}.
+         * @return {@literal true} if the type has a value type variable.
+         */
+        public static boolean hasValueType(TypeInformation<?> typeInformation) {
+            return WITH_VALUE_TYPE.contains(typeInformation.getType());
+        }
+
+        /**
+         * @param typeInformation must not be {@literal null}.
+         * @return the key type.
+         */
+        public static TypeInformation<?> getKeyType(TypeInformation<?> typeInformation) {
+
+            if (!supports(typeInformation) || !hasKeyType(typeInformation)) {
+                return typeInformation;
+            }
+
+            return typeInformation.getComponentType();
+        }
+
+        /**
+         * @param typeInformation must not be {@literal null}.
+         * @return the value type.
+         */
+        public static TypeInformation<?> getValueType(TypeInformation<?> typeInformation) {
+
+            if (!supports(typeInformation) || typeInformation.getComponentType() == null) {
+                return typeInformation;
+            }
+
+            if (!hasValueType(typeInformation)) {
+                return typeInformation.getComponentType();
+            }
+
+            List<TypeInformation<?>> typeArguments = typeInformation.getTypeArguments();
+
+            if (hasKeyType(typeInformation)) {
+                return typeArguments.get(1);
+            }
+
+            return typeArguments.get(0);
+        }
+    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java b/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java
index 8747fdfadb..61d4f4a51c 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java
@@ -20,15 +20,18 @@
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
-import com.lambdaworks.redis.dynamic.CommandMethod;
 import org.junit.Test;
 
-import com.lambdaworks.redis.dynamic.annotation.Key;
-import com.lambdaworks.redis.dynamic.annotation.Value;
+import com.lambdaworks.redis.Range;
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.dynamic.CommandMethod;
+import com.lambdaworks.redis.dynamic.annotation.Key;
+import com.lambdaworks.redis.dynamic.annotation.Value;
 import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
 
 /**
@@ -90,7 +93,19 @@ public void resolutionShouldFail() {
         resolve(method);
     }
 
+    @Test
+    public void shouldDiscoverCodecTypesFromWrappers() {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, "withWrappers", Range.class,
+                com.lambdaworks.redis.Value.class);
+
+        Set<Class<?>> types = new AnnotationRedisCodecResolver(codecs).findTypes(new CommandMethod(method), Value.class);
+
+        assertThat(types).contains(String.class, Number.class);
+    }
+
     protected RedisCodec<?, ?> resolve(Method method) {
+
         CommandMethod commandMethod = new CommandMethod(method);
         AnnotationRedisCodecResolver resolver = new AnnotationRedisCodecResolver(codecs);
 
@@ -110,6 +125,10 @@ private static interface CommandMethods {
         String nothingAnnotated(String key, String value);
 
         String mixedTypes(@Key String key, @Value byte[] value);
+
+        String withWrappers(@Value Range<String> range, @Value com.lambdaworks.redis.Value<Number> value);
+
+        String withMap(Map<Integer, String> map);
     }
 
 }
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/codec/ParameterWrappersTest.java b/src/test/java/com/lambdaworks/redis/dynamic/codec/ParameterWrappersTest.java
new file mode 100644
index 0000000000..4747cd283b
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/codec/ParameterWrappersTest.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic.codec;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Test;
+
+import com.lambdaworks.redis.KeyValue;
+import com.lambdaworks.redis.Range;
+import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.dynamic.codec.AnnotationRedisCodecResolver.ParameterWrappers;
+import com.lambdaworks.redis.dynamic.parameter.Parameter;
+import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
+import com.lambdaworks.redis.dynamic.support.TypeInformation;
+
+/**
+ * @author Mark Paluch
+ */
+public class ParameterWrappersTest {
+
+    @Test
+    public void shouldReturnValueTypeForRange() {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, "range", Range.class);
+
+        TypeInformation typeInformation = new Parameter(method, 0).getTypeInformation();
+
+        assertThat(ParameterWrappers.hasKeyType(typeInformation)).isFalse();
+        assertThat(ParameterWrappers.hasValueType(typeInformation)).isFalse();
+        assertThat(ParameterWrappers.supports(typeInformation)).isTrue();
+        assertThat(ParameterWrappers.getValueType(typeInformation).getType()).isEqualTo(String.class);
+    }
+
+    @Test
+    public void shouldReturnValueTypeForValue() {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, "value", Value.class);
+
+        TypeInformation typeInformation = new Parameter(method, 0).getTypeInformation();
+
+        assertThat(ParameterWrappers.hasKeyType(typeInformation)).isFalse();
+        assertThat(ParameterWrappers.hasValueType(typeInformation)).isTrue();
+        assertThat(ParameterWrappers.getValueType(typeInformation).getType()).isEqualTo(String.class);
+    }
+
+    @Test
+    public void shouldReturnValueTypeForKeyValue() {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, "keyValue", KeyValue.class);
+
+        TypeInformation typeInformation = new Parameter(method, 0).getTypeInformation();
+
+        assertThat(ParameterWrappers.hasKeyType(typeInformation)).isTrue();
+        assertThat(ParameterWrappers.getKeyType(typeInformation).getType()).isEqualTo(Integer.class);
+
+        assertThat(ParameterWrappers.hasValueType(typeInformation)).isTrue();
+        assertThat(ParameterWrappers.getValueType(typeInformation).getType()).isEqualTo(String.class);
+    }
+
+    @Test
+    public void shouldReturnValueTypeForArray() {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, "array", String[].class);
+
+        TypeInformation typeInformation = new Parameter(method, 0).getTypeInformation();
+
+        assertThat(ParameterWrappers.hasKeyType(typeInformation)).isFalse();
+        assertThat(ParameterWrappers.supports(typeInformation)).isTrue();
+        assertThat(ParameterWrappers.getValueType(typeInformation).getType()).isEqualTo(String.class);
+    }
+
+    @Test
+    public void shouldNotSupportByteArray() {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, "byteArray", byte[].class);
+
+        TypeInformation typeInformation = new Parameter(method, 0).getTypeInformation();
+
+        assertThat(ParameterWrappers.supports(typeInformation)).isFalse();
+    }
+
+    @Test
+    public void shouldReturnValueTypeForList() {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, "withList", List.class);
+
+        TypeInformation typeInformation = new Parameter(method, 0).getTypeInformation();
+
+        assertThat(ParameterWrappers.hasKeyType(typeInformation)).isFalse();
+
+        assertThat(ParameterWrappers.supports(typeInformation)).isTrue();
+        assertThat(ParameterWrappers.getValueType(typeInformation).getType()).isEqualTo(String.class);
+    }
+
+    @Test
+    public void shouldReturnValueTypeForMap() {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, "withMap", Map.class);
+
+        TypeInformation typeInformation = new Parameter(method, 0).getTypeInformation();
+
+        assertThat(ParameterWrappers.hasKeyType(typeInformation)).isTrue();
+        assertThat(ParameterWrappers.getKeyType(typeInformation).getType()).isEqualTo(Integer.class);
+
+        assertThat(ParameterWrappers.hasValueType(typeInformation)).isTrue();
+        assertThat(ParameterWrappers.getValueType(typeInformation).getType()).isEqualTo(String.class);
+    }
+
+    private static interface CommandMethods {
+
+        String range(Range<String> range);
+
+        String value(Value<String> range);
+
+        String keyValue(KeyValue<Integer, String> range);
+
+        String array(String[] values);
+
+        String byteArray(byte[] values);
+
+        String withWrappers(Range<String> range, com.lambdaworks.redis.Value<Number> value,
+                com.lambdaworks.redis.KeyValue<Integer, Long> keyValue);
+
+        String withList(List<String> map);
+
+        String withMap(Map<Integer, String> map);
+    }
+
+}
\ No newline at end of file

From 9e2df7c2b95abc7fa7cba8e9c4b49320af49bedb Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 12 Dec 2016 22:11:39 +0100
Subject: [PATCH 098/808] Polishing #423

---
 src/main/java/com/lambdaworks/redis/LettuceFutures.java       | 1 -
 src/main/java/com/lambdaworks/redis/LettuceStrings.java       | 4 ++++
 .../com/lambdaworks/redis/internal/LettuceClassUtils.java     | 3 ---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/LettuceFutures.java b/src/main/java/com/lambdaworks/redis/LettuceFutures.java
index 2aae3610c3..3478631b23 100644
--- a/src/main/java/com/lambdaworks/redis/LettuceFutures.java
+++ b/src/main/java/com/lambdaworks/redis/LettuceFutures.java
@@ -30,7 +30,6 @@
 public class LettuceFutures {
 
     private LettuceFutures() {
-
     }
 
     /**
diff --git a/src/main/java/com/lambdaworks/redis/LettuceStrings.java b/src/main/java/com/lambdaworks/redis/LettuceStrings.java
index 6a9c668157..dcf786d760 100644
--- a/src/main/java/com/lambdaworks/redis/LettuceStrings.java
+++ b/src/main/java/com/lambdaworks/redis/LettuceStrings.java
@@ -108,12 +108,15 @@ public static String digest(ByteBuffer script) {
      * @return the delimited {@code String}
      */
     public static String arrayToDelimitedString(Object[] arr, String delim) {
+
         if ((arr == null || arr.length == 0)) {
             return "";
         }
+
         if (arr.length == 1) {
             return "" + arr[0];
         }
+
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < arr.length; i++) {
             if (i > 0) {
@@ -140,6 +143,7 @@ public static String collectionToDelimitedString(Collection<?> coll, String deli
         if (coll == null || coll.isEmpty()) {
             return "";
         }
+
         StringBuilder sb = new StringBuilder();
         Iterator<?> it = coll.iterator();
         while (it.hasNext()) {
diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java b/src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java
index 80708cca51..f3b2792638 100644
--- a/src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java
+++ b/src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java
@@ -18,8 +18,6 @@
 import java.util.IdentityHashMap;
 import java.util.Map;
 
-import org.springframework.util.TypeUtils;
-
 import com.lambdaworks.redis.JavaRuntime;
 
 /**
@@ -143,7 +141,6 @@ private static ClassLoader getDefaultClassLoader() {
      * @param lhsType the target type
      * @param rhsType the value type that should be assigned to the target type
      * @return if the target type is assignable from the value type
-     * @see TypeUtils#isAssignable
      */
     public static boolean isAssignable(Class<?> lhsType, Class<?> rhsType) {
 

From 15ce1f9651bf04326d675e5139c5e9c9b596fbcd Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 14 Dec 2016 22:15:24 +0100
Subject: [PATCH 099/808] Return ClusterClientOptions.Builder in socketOptions
 and sslOptions methods #425

---
 .../lambdaworks/redis/cluster/ClusterClientOptions.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java
index 084b7fc5a7..6fcf2fbb33 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java
@@ -19,6 +19,7 @@
 
 import com.lambdaworks.redis.ClientOptions;
 import com.lambdaworks.redis.SocketOptions;
+import com.lambdaworks.redis.SslOptions;
 
 /**
  * Client Options to control the behavior of {@link RedisClusterClient}.
@@ -183,11 +184,17 @@ public Builder disconnectedBehavior(DisconnectedBehavior disconnectedBehavior) {
         }
 
         @Override
-        public ClientOptions.Builder socketOptions(SocketOptions socketOptions) {
+        public Builder socketOptions(SocketOptions socketOptions) {
             super.socketOptions(socketOptions);
             return this;
         }
 
+        @Override
+        public Builder sslOptions(SslOptions sslOptions) {
+            super.sslOptions(sslOptions);
+            return this;
+        }
+
         /**
          * Create a new instance of {@link ClusterClientOptions}
          *

From a4655b98b6ec0fb2027167168a09f5c8d46da2be Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 17 Dec 2016 21:30:10 +0100
Subject: [PATCH 100/808] Propagate asynchronous connection initialization #429

Lettuce now connects asynchronously with a late synchronization. This allows post-connect initializations to be part of the asynchronous completion chain. NodeConnectionFactory exposes also connectToNodeAsync.
---
 .../redis/AbstractRedisClient.java            | 411 ++++++++++++++++--
 .../com/lambdaworks/redis/RedisClient.java    |  33 +-
 .../redis/cluster/RedisClusterClient.java     | 143 +++---
 .../topology/NodeConnectionFactory.java       |  18 +-
 4 files changed, 504 insertions(+), 101 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
index f8d6eb0715..3a12b0ecdf 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
@@ -21,11 +21,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Supplier;
+import java.util.function.*;
 
 import com.lambdaworks.redis.Transports.NativeTransports;
 import com.lambdaworks.redis.internal.LettuceAssert;
@@ -117,7 +115,7 @@ public void setDefaultTimeout(long timeout, TimeUnit unit) {
 
     /**
      * Populate connection builder with necessary resources.
-     * 
+     *
      * @param socketAddressSupplier address supplier for initial connect and re-connect
      * @param connectionBuilder connection builder to configure the connection
      * @param redisURI URI of the redis instance
@@ -198,50 +196,103 @@ private void checkForEpollLibrary() {
         EpollProvider.checkForEpollLibrary();
     }
 
+    /**
+     * Retrieve the connection from {@link ConnectionFuture}. Performs a blocking {@link ConnectionFuture#get()} to synchronize
+     * the channel/connection initialization. Any exception is rethrown as {@link RedisConnectionException}.
+     *
+     * @param connectionFuture must not be null.
+     * @param <T> Connection type.
+     * @return the connection.
+     * @throws RedisConnectionException in case of connection failures.
+     * @since 4.4
+     */
+    protected <T> T getConnection(ConnectionFuture<T> connectionFuture) {
+
+        String msg = String.format("Unable to connect to %s", connectionFuture.getRemoteAddress());
+
+        try {
+            return connectionFuture.get();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RedisConnectionException(msg, e);
+        } catch (Exception e) {
+
+            if (e instanceof ExecutionException) {
+                throw new RedisConnectionException(msg, e.getCause());
+            }
+
+            throw new RedisConnectionException(msg, e);
+        }
+    }
+
+    /**
+     * Connect and initialize a channel from {@link ConnectionBuilder}.
+     *
+     * @param connectionBuilder must not be {@literal null}.
+     * @return the {@link ConnectionFuture} to synchronize the connection process.
+     * @since 4.4
+     */
     @SuppressWarnings("unchecked")
-    protected <K, V, T extends RedisChannelHandler<K, V>> T initializeChannel(ConnectionBuilder connectionBuilder) {
+    protected <K, V, T extends RedisChannelHandler<K, V>> ConnectionFuture<T> initializeChannelAsync(
+            ConnectionBuilder connectionBuilder) {
 
-        RedisChannelHandler<?, ?> connection = connectionBuilder.connection();
         SocketAddress redisAddress = connectionBuilder.socketAddress();
 
         if (clientResources.eventExecutorGroup().isShuttingDown()) {
-            throw new IllegalStateException("Cannot connect. Worker pool not running");
+            throw new IllegalStateException("Cannot connect, Event executor group is terminated.");
         }
 
-        try {
+        logger.debug("Connecting to Redis at {}", redisAddress);
 
-            logger.debug("Connecting to Redis at {}", redisAddress);
+        CompletableFuture<Channel> channelReadyFuture = new CompletableFuture<>();
+        Bootstrap redisBootstrap = connectionBuilder.bootstrap();
+        RedisChannelInitializer initializer = connectionBuilder.build();
+        redisBootstrap.handler(initializer);
+        ChannelFuture connectFuture = redisBootstrap.connect(redisAddress);
 
-            Bootstrap redisBootstrap = connectionBuilder.bootstrap();
-            RedisChannelInitializer initializer = connectionBuilder.build();
-            redisBootstrap.handler(initializer);
-            ChannelFuture connectFuture = redisBootstrap.connect(redisAddress);
+        connectFuture.addListener(future -> {
 
-            connectFuture.await();
+            if (!future.isSuccess()) {
 
-            if (!connectFuture.isSuccess()) {
-                if (connectFuture.cause() instanceof Exception) {
-                    throw (Exception) connectFuture.cause();
-                }
-                connectFuture.get();
+                logger.debug("Connecting to Redis at {}: {}", redisAddress, future.cause());
+                connectionBuilder.endpoint().initialState();
+                channelReadyFuture.completeExceptionally(future.cause());
+                return;
             }
 
-            try {
-                initializer.channelInitialized().get(connectionBuilder.getTimeout(), connectionBuilder.getTimeUnit());
-            } catch (TimeoutException e) {
-                throw new RedisConnectionException("Could not initialize channel within " + connectionBuilder.getTimeout() + " "
-                        + connectionBuilder.getTimeUnit(), e);
-            }
-            connection.registerCloseables(closeableResources, connection);
+            CompletableFuture<Boolean> initFuture = (CompletableFuture<Boolean>) initializer.channelInitialized();
+            initFuture.whenComplete((success, throwable) -> {
 
-            return (T) connection;
-        } catch (RedisException e) {
-            connectionBuilder.endpoint().initialState();
-            throw e;
-        } catch (Exception e) {
-            connectionBuilder.endpoint().initialState();
-            throw new RedisConnectionException("Unable to connect to " + redisAddress, e);
-        }
+                if (throwable == null) {
+                    logger.debug("Connecting to Redis at {}: Success", redisAddress);
+                    RedisChannelHandler<?, ?> connection = connectionBuilder.connection();
+                    connection.registerCloseables(closeableResources, connection);
+                    channelReadyFuture.complete(connectFuture.channel());
+                    return;
+                }
+
+                logger.debug("Connecting to Redis at {}, initialization: {}", redisAddress, throwable);
+                connectionBuilder.endpoint().initialState();
+                Throwable failure;
+
+                if (throwable instanceof RedisConnectionException) {
+                    failure = throwable;
+                } else if (throwable instanceof TimeoutException) {
+                    failure = new RedisConnectionException("Could not initialize channel within "
+                            + connectionBuilder.getTimeout() + " " + connectionBuilder.getTimeUnit(), throwable);
+                } else {
+                    failure = throwable;
+                }
+                channelReadyFuture.completeExceptionally(failure);
+
+                CompletableFuture<Boolean> response = new CompletableFuture<>();
+                response.completeExceptionally(failure);
+
+            });
+        });
+
+        return new ConnectionFuture<T>(redisAddress,
+                channelReadyFuture.thenApply(channel -> (T) connectionBuilder.connection()));
     }
 
     /**
@@ -362,4 +413,294 @@ protected void setOptions(ClientOptions clientOptions) {
         LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
         this.clientOptions = clientOptions;
     }
+
+    /**
+     * lettuce-specific connection {@link CompletableFuture future}. Delegates calls to the decorated {@link CompletableFuture}
+     * and provides a {@link SocketAddress}.
+     *
+     * @since 4.4
+     */
+    protected class ConnectionFuture<T> extends CompletableFuture<T> {
+
+        private final SocketAddress remoteAddress;
+        private final CompletableFuture<T> delegate;
+
+        protected ConnectionFuture(SocketAddress remoteAddress, CompletableFuture<T> delegate) {
+
+            this.remoteAddress = remoteAddress;
+            this.delegate = delegate;
+        }
+
+        public SocketAddress getRemoteAddress() {
+            return remoteAddress;
+        }
+
+        private <U> ConnectionFuture<U> adopt(CompletableFuture<U> newFuture) {
+            return new ConnectionFuture<>(remoteAddress, newFuture);
+        }
+
+        @Override
+        public boolean isDone() {
+            return delegate.isDone();
+        }
+
+        @Override
+        public T get() throws InterruptedException, ExecutionException {
+            return delegate.get();
+        }
+
+        @Override
+        public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+            return delegate.get(timeout, unit);
+        }
+
+        @Override
+        public T join() {
+            return delegate.join();
+        }
+
+        @Override
+        public T getNow(T valueIfAbsent) {
+            return delegate.getNow(valueIfAbsent);
+        }
+
+        @Override
+        public boolean complete(T value) {
+            return delegate.complete(value);
+        }
+
+        @Override
+        public boolean completeExceptionally(Throwable ex) {
+            return delegate.completeExceptionally(ex);
+        }
+
+        @Override
+        public <U> ConnectionFuture<U> thenApply(Function<? super T, ? extends U> fn) {
+            return adopt(delegate.thenApply(fn));
+        }
+
+        @Override
+        public <U> ConnectionFuture<U> thenApplyAsync(Function<? super T, ? extends U> fn) {
+            return adopt(delegate.thenApplyAsync(fn));
+        }
+
+        @Override
+        public <U> ConnectionFuture<U> thenApplyAsync(Function<? super T, ? extends U> fn, Executor executor) {
+            return adopt(delegate.thenApplyAsync(fn, executor));
+        }
+
+        @Override
+        public ConnectionFuture<Void> thenAccept(Consumer<? super T> action) {
+            return adopt(delegate.thenAccept(action));
+        }
+
+        @Override
+        public ConnectionFuture<Void> thenAcceptAsync(Consumer<? super T> action) {
+            return adopt(delegate.thenAcceptAsync(action));
+        }
+
+        @Override
+        public ConnectionFuture<Void> thenAcceptAsync(Consumer<? super T> action, Executor executor) {
+            return adopt(delegate.thenAcceptAsync(action, executor));
+        }
+
+        @Override
+        public ConnectionFuture<Void> thenRun(Runnable action) {
+            return adopt(delegate.thenRun(action));
+        }
+
+        @Override
+        public ConnectionFuture<Void> thenRunAsync(Runnable action) {
+            return adopt(delegate.thenRunAsync(action));
+        }
+
+        @Override
+        public ConnectionFuture<Void> thenRunAsync(Runnable action, Executor executor) {
+            return adopt(delegate.thenRunAsync(action, executor));
+        }
+
+        @Override
+        public <U, V> ConnectionFuture<V> thenCombine(CompletionStage<? extends U> other,
+                BiFunction<? super T, ? super U, ? extends V> fn) {
+            return adopt(delegate.thenCombine(other, fn));
+        }
+
+        @Override
+        public <U, V> ConnectionFuture<V> thenCombineAsync(CompletionStage<? extends U> other,
+                BiFunction<? super T, ? super U, ? extends V> fn) {
+            return adopt(delegate.thenCombineAsync(other, fn));
+        }
+
+        @Override
+        public <U, V> ConnectionFuture<V> thenCombineAsync(CompletionStage<? extends U> other,
+                BiFunction<? super T, ? super U, ? extends V> fn, Executor executor) {
+            return adopt(delegate.thenCombineAsync(other, fn, executor));
+        }
+
+        @Override
+        public <U> ConnectionFuture<Void> thenAcceptBoth(CompletionStage<? extends U> other,
+                BiConsumer<? super T, ? super U> action) {
+            return adopt(delegate.thenAcceptBoth(other, action));
+        }
+
+        @Override
+        public <U> ConnectionFuture<Void> thenAcceptBothAsync(CompletionStage<? extends U> other,
+                BiConsumer<? super T, ? super U> action) {
+            return adopt(delegate.thenAcceptBothAsync(other, action));
+        }
+
+        @Override
+        public <U> ConnectionFuture<Void> thenAcceptBothAsync(CompletionStage<? extends U> other,
+                BiConsumer<? super T, ? super U> action, Executor executor) {
+            return adopt(delegate.thenAcceptBothAsync(other, action, executor));
+        }
+
+        @Override
+        public ConnectionFuture<Void> runAfterBoth(CompletionStage<?> other, Runnable action) {
+            return adopt(delegate.runAfterBoth(other, action));
+        }
+
+        @Override
+        public ConnectionFuture<Void> runAfterBothAsync(CompletionStage<?> other, Runnable action) {
+            return adopt(delegate.runAfterBothAsync(other, action));
+        }
+
+        @Override
+        public ConnectionFuture<Void> runAfterBothAsync(CompletionStage<?> other, Runnable action, Executor executor) {
+            return adopt(delegate.runAfterBothAsync(other, action, executor));
+        }
+
+        @Override
+        public <U> ConnectionFuture<U> applyToEither(CompletionStage<? extends T> other, Function<? super T, U> fn) {
+            return adopt(delegate.applyToEither(other, fn));
+        }
+
+        @Override
+        public <U> ConnectionFuture<U> applyToEitherAsync(CompletionStage<? extends T> other, Function<? super T, U> fn) {
+            return adopt(delegate.applyToEitherAsync(other, fn));
+        }
+
+        @Override
+        public <U> ConnectionFuture<U> applyToEitherAsync(CompletionStage<? extends T> other, Function<? super T, U> fn,
+                Executor executor) {
+            return adopt(delegate.applyToEitherAsync(other, fn, executor));
+        }
+
+        @Override
+        public ConnectionFuture<Void> acceptEither(CompletionStage<? extends T> other, Consumer<? super T> action) {
+            return adopt(delegate.acceptEither(other, action));
+        }
+
+        @Override
+        public ConnectionFuture<Void> acceptEitherAsync(CompletionStage<? extends T> other, Consumer<? super T> action) {
+            return adopt(delegate.acceptEitherAsync(other, action));
+        }
+
+        @Override
+        public ConnectionFuture<Void> acceptEitherAsync(CompletionStage<? extends T> other, Consumer<? super T> action,
+                Executor executor) {
+            return adopt(delegate.acceptEitherAsync(other, action, executor));
+        }
+
+        @Override
+        public ConnectionFuture<Void> runAfterEither(CompletionStage<?> other, Runnable action) {
+            return adopt(delegate.runAfterEither(other, action));
+        }
+
+        @Override
+        public ConnectionFuture<Void> runAfterEitherAsync(CompletionStage<?> other, Runnable action) {
+            return adopt(delegate.runAfterEitherAsync(other, action));
+        }
+
+        @Override
+        public ConnectionFuture<Void> runAfterEitherAsync(CompletionStage<?> other, Runnable action, Executor executor) {
+            return adopt(delegate.runAfterEitherAsync(other, action, executor));
+        }
+
+        @Override
+        public <U> ConnectionFuture<U> thenCompose(Function<? super T, ? extends CompletionStage<U>> fn) {
+            return adopt(delegate.thenCompose(fn));
+        }
+
+        @Override
+        public <U> ConnectionFuture<U> thenComposeAsync(Function<? super T, ? extends CompletionStage<U>> fn) {
+            return adopt(delegate.thenComposeAsync(fn));
+        }
+
+        @Override
+        public <U> ConnectionFuture<U> thenComposeAsync(Function<? super T, ? extends CompletionStage<U>> fn,
+                Executor executor) {
+            return adopt(delegate.thenComposeAsync(fn, executor));
+        }
+
+        @Override
+        public ConnectionFuture<T> whenComplete(BiConsumer<? super T, ? super Throwable> action) {
+            return adopt(delegate.whenComplete(action));
+        }
+
+        @Override
+        public ConnectionFuture<T> whenCompleteAsync(BiConsumer<? super T, ? super Throwable> action) {
+            return adopt(delegate.whenCompleteAsync(action));
+        }
+
+        @Override
+        public ConnectionFuture<T> whenCompleteAsync(BiConsumer<? super T, ? super Throwable> action, Executor executor) {
+            return adopt(delegate.whenCompleteAsync(action, executor));
+        }
+
+        @Override
+        public <U> ConnectionFuture<U> handle(BiFunction<? super T, Throwable, ? extends U> fn) {
+            return adopt(delegate.handle(fn));
+        }
+
+        @Override
+        public <U> ConnectionFuture<U> handleAsync(BiFunction<? super T, Throwable, ? extends U> fn) {
+            return adopt(delegate.handleAsync(fn));
+        }
+
+        @Override
+        public <U> ConnectionFuture<U> handleAsync(BiFunction<? super T, Throwable, ? extends U> fn, Executor executor) {
+            return adopt(delegate.handleAsync(fn, executor));
+        }
+
+        @Override
+        public CompletableFuture<T> toCompletableFuture() {
+            return delegate.toCompletableFuture();
+        }
+
+        @Override
+        public ConnectionFuture<T> exceptionally(Function<Throwable, ? extends T> fn) {
+            return adopt(delegate.exceptionally(fn));
+        }
+
+        @Override
+        public boolean cancel(boolean mayInterruptIfRunning) {
+            return delegate.cancel(mayInterruptIfRunning);
+        }
+
+        @Override
+        public boolean isCancelled() {
+            return delegate.isCancelled();
+        }
+
+        @Override
+        public boolean isCompletedExceptionally() {
+            return delegate.isCompletedExceptionally();
+        }
+
+        @Override
+        public void obtrudeValue(T value) {
+            delegate.obtrudeValue(value);
+        }
+
+        @Override
+        public void obtrudeException(Throwable ex) {
+            delegate.obtrudeException(ex);
+        }
+
+        @Override
+        public int getNumberOfDependents() {
+            return delegate.getNumberOfDependents();
+        }
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/com/lambdaworks/redis/RedisClient.java
index d7647a2d2d..7d639f17a2 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClient.java
@@ -205,7 +205,7 @@ private <K, V> StatefulRedisConnection<K, V> connectStandalone(RedisCodec<K, V>
 
         DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
 
-        StatefulRedisConnectionImpl<K, V> connection = newStatefulRedisConnection((RedisChannelWriter) endpoint, codec,
+        StatefulRedisConnectionImpl<K, V> connection = newStatefulRedisConnection(endpoint, codec,
                 timeout.timeout, timeout.timeUnit);
         connectStateful(connection, redisURI, endpoint, () -> new CommandHandler(clientResources, endpoint));
         return connection;
@@ -230,19 +230,38 @@ private <K, V> void connectStateful(StatefulRedisConnectionImpl<K, V> connection
 
         connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
         channelType(connectionBuilder, redisURI);
-        initializeChannel(connectionBuilder);
+
+        ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
 
         if (redisURI.getPassword() != null && redisURI.getPassword().length != 0) {
-            connection.async().auth(new String(redisURI.getPassword()));
+
+            future = future.thenApplyAsync(channelHandler -> {
+
+                connection.async().auth(new String(redisURI.getPassword()));
+
+                return channelHandler;
+            }, clientResources.eventExecutorGroup());
         }
 
         if (LettuceStrings.isNotEmpty(redisURI.getClientName())) {
-            connection.setClientName(redisURI.getClientName());
+            future.thenApply(channelHandler -> {
+                connection.setClientName(redisURI.getClientName());
+                return channelHandler;
+            });
+
         }
 
         if (redisURI.getDatabase() != 0) {
-            connection.async().select(redisURI.getDatabase());
+
+            future = future.thenApplyAsync(channelHandler -> {
+
+                connection.async().select(redisURI.getDatabase());
+
+                return channelHandler;
+            }, clientResources.eventExecutorGroup());
         }
+
+        getConnection(future);
     }
 
     /**
@@ -379,7 +398,7 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
 
         if (redisURI.getSentinels().isEmpty() && (isNotEmpty(redisURI.getHost()) || !isEmpty(redisURI.getSocket()))) {
             channelType(connectionBuilder, redisURI);
-            initializeChannel(connectionBuilder);
+            getConnection(initializeChannelAsync(connectionBuilder));
         } else {
             boolean connected = false;
             boolean first = true;
@@ -397,7 +416,7 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
                     logger.debug("Connecting to Sentinel, address: " + socketAddress);
                 }
                 try {
-                    initializeChannel(connectionBuilder);
+                    getConnection(initializeChannelAsync(connectionBuilder));
                     connected = true;
                     break;
                 } catch (Exception e) {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index d6e8f71bbc..e30d316a45 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -19,6 +19,7 @@
 import java.net.SocketAddress;
 import java.net.URI;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -373,12 +374,7 @@ public <K, V> StatefulRedisClusterPubSubConnection<K, V> connectPubSub(RedisCode
     }
 
     protected StatefulRedisConnection<String, String> connectToNode(final SocketAddress socketAddress) {
-        return connectToNode(newStringStringCodec(), socketAddress.toString(), null, new Supplier<SocketAddress>() {
-            @Override
-            public SocketAddress get() {
-                return socketAddress;
-            }
-        });
+        return connectToNode(newStringStringCodec(), socketAddress.toString(), null, () -> socketAddress);
     }
 
     /**
@@ -394,28 +390,42 @@ public SocketAddress get() {
      */
     <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, String nodeId, RedisChannelWriter clusterWriter,
             final Supplier<SocketAddress> socketAddressSupplier) {
+        return getConnection(connectToNodeAsync(codec, nodeId, clusterWriter, socketAddressSupplier));
+    }
+
+    /**
+     * Create a connection to a redis socket address.
+     *
+     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
+     * @param nodeId the nodeId
+     * @param clusterWriter global cluster writer
+     * @param socketAddressSupplier supplier for the socket address
+     * @param <K> Key type
+     * @param <V> Value type
+     * @return A new connection
+     */
+    private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisCodec<K, V> codec, String nodeId,
+            RedisChannelWriter clusterWriter, final Supplier<SocketAddress> socketAddressSupplier) {
 
         assertNotNull(codec);
         assertNotEmpty(initialUris);
-
         LettuceAssert.notNull(socketAddressSupplier, "SocketAddressSupplier must not be null");
 
-        logger.debug("connectNode(" + nodeId + ")");
+        SocketAddress socketAddress = socketAddressSupplier.get();
+
+        logger.debug(String.format("connectToNodeAsync(%s at %s)", nodeId, socketAddress));
 
         ClusterNodeEndpoint endpoint = new ClusterNodeEndpoint(clientOptions, getResources(), clusterWriter);
         StatefulRedisConnectionImpl<K, V> connection = new StatefulRedisConnectionImpl<K, V>(endpoint, codec, timeout, unit);
 
-        try {
-            connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier,
-                    () -> new CommandHandler(clientResources, endpoint));
+        ConnectionFuture<StatefulRedisConnection<K, V>> connectionFuture = connectStatefulAsync(connection, endpoint,
+                getFirstUri(), socketAddressSupplier, () -> new CommandHandler(clientResources, endpoint));
 
-            connection.registerCloseables(closeableResources, connection);
-        } catch (RedisException e) {
-            connection.close();
-            throw e;
-        }
-
-        return connection;
+        return connectionFuture.whenComplete((conn, throwable) -> {
+            if (throwable != null) {
+                connection.close();
+            }
+        });
     }
 
     /**
@@ -445,8 +455,6 @@ <K, V> StatefulRedisPubSubConnection<K, V> connectPubSubToNode(RedisCodec<K, V>
         try {
             connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier,
                     () -> new PubSubCommandHandler<K, V>(clientResources, codec, endpoint));
-
-            connection.registerCloseables(closeableResources, connection);
         } catch (RedisException e) {
             connection.close();
             throw e;
@@ -496,7 +504,7 @@ <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K,
 
         for (int i = 0; i < connectionAttempts; i++) {
             try {
-                connectStateful(endpoint, connection, getFirstUri(), socketAddressSupplier,
+                connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier,
                         () -> new CommandHandler(clientResources, endpoint));
                 connected = true;
                 break;
@@ -513,7 +521,7 @@ <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K,
             }
         }
 
-        connection.registerCloseables(closeableResources, connection, clusterWriter, pooledClusterConnectionProvider);
+        connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider);
 
         return connection;
     }
@@ -576,11 +584,7 @@ <K, V> StatefulRedisClusterPubSubConnection<K, V> connectClusterPubSubImpl(Redis
             }
         }
 
-        connection.registerCloseables(closeableResources, connection, clusterWriter, pooledClusterConnectionProvider);
-
-        if (getFirstUri().getPassword() != null) {
-            connection.async().auth(new String(getFirstUri().getPassword()));
-        }
+        connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider);
 
         return connection;
     }
@@ -588,48 +592,73 @@ <K, V> StatefulRedisClusterPubSubConnection<K, V> connectClusterPubSubImpl(Redis
     /**
      * Connect to a endpoint provided by {@code socketAddressSupplier} using connection settings (authentication, SSL) from
      * {@code connectionSettings}.
-     *
      */
     private <K, V> void connectStateful(StatefulRedisConnectionImpl<K, V> connection, DefaultEndpoint endpoint,
             RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier,
             Supplier<CommandHandler> commandHandlerSupplier) {
-
-        connectStateful0(connection, endpoint, connectionSettings, socketAddressSupplier, commandHandlerSupplier);
-
-        if (connectionSettings.getPassword() != null && connectionSettings.getPassword().length != 0) {
-            connection.async().auth(new String(connectionSettings.getPassword()));
-        }
-
-        if (LettuceStrings.isNotEmpty(connectionSettings.getClientName())) {
-            connection.setClientName(connectionSettings.getClientName());
-        }
+        getConnection(
+                connectStatefulAsync(connection, endpoint, connectionSettings, socketAddressSupplier, commandHandlerSupplier));
     }
 
     /**
      * Connect to a endpoint provided by {@code socketAddressSupplier} using connection settings (authentication, SSL) from
      * {@code connectionSettings}.
-     *
      */
-    private <K, V> void connectStateful(DefaultEndpoint endpoint, StatefulRedisClusterConnectionImpl<K, V> connection,
+    private <K, V> void connectStateful(StatefulRedisClusterConnectionImpl<K, V> connection, DefaultEndpoint endpoint,
             RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier,
             Supplier<CommandHandler> commandHandlerSupplier) {
+        getConnection(
+                connectStatefulAsync(connection, endpoint, connectionSettings, socketAddressSupplier, commandHandlerSupplier));
+    }
 
-        connectStateful0(connection, endpoint, connectionSettings, socketAddressSupplier, commandHandlerSupplier);
+    /**
+     * Initiates a channel connection considering {@link ClientOptions} initialization options, authentication and client name
+     * options.
+     */
+    private <K, V, T extends RedisChannelHandler<K, V>, S> ConnectionFuture<S> connectStatefulAsync(T connection,
+            DefaultEndpoint endpoint, RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier,
+            Supplier<CommandHandler> commandHandlerSupplier) {
+
+        ConnectionBuilder connectionBuilder = createConnectionBuilder(connection, endpoint, connectionSettings,
+                socketAddressSupplier, commandHandlerSupplier);
+
+        ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
 
         if (connectionSettings.getPassword() != null && connectionSettings.getPassword().length != 0) {
-            connection.async().auth(new String(connectionSettings.getPassword()));
+            future = future.thenApplyAsync(channelHandler -> {
+
+                if (connection instanceof StatefulRedisClusterConnectionImpl) {
+                    ((StatefulRedisClusterConnectionImpl) connection).async()
+                            .auth(new String(connectionSettings.getPassword()));
+                }
+
+                if (connection instanceof StatefulRedisConnectionImpl) {
+                    ((StatefulRedisConnectionImpl) connection).async().auth(new String(connectionSettings.getPassword()));
+                }
+
+                return channelHandler;
+            }, clientResources.eventExecutorGroup());
+
         }
 
         if (LettuceStrings.isNotEmpty(connectionSettings.getClientName())) {
-            connection.setClientName(connectionSettings.getClientName());
+            future = future.thenApply(channelHandler -> {
+
+                if (connection instanceof StatefulRedisClusterConnectionImpl) {
+                    ((StatefulRedisClusterConnectionImpl) connection).setClientName(connectionSettings.getClientName());
+                }
+
+                if (connection instanceof StatefulRedisConnectionImpl) {
+                    ((StatefulRedisConnectionImpl) connection).setClientName(connectionSettings.getClientName());
+                }
+                return channelHandler;
+            });
         }
+
+        return future.thenApply(channelHandler -> (S) connection);
     }
 
-    /**
-     * Connect to a endpoint provided by {@code socketAddressSupplier} using connection settings (SSL) from {@code
-     * connectionSettings}.
-     */
-    private <K, V> void connectStateful0(RedisChannelHandler<K, V> connection, DefaultEndpoint endpoint,
+    private <K, V> ConnectionBuilder createConnectionBuilder(RedisChannelHandler<K, V> connection, DefaultEndpoint endpoint,
             RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier,
             Supplier<CommandHandler> commandHandlerSupplier) {
 
@@ -650,8 +679,7 @@ private <K, V> void connectStateful0(RedisChannelHandler<K, V> connection, Defau
         connectionBuilder.commandHandler(commandHandlerSupplier);
         connectionBuilder(socketAddressSupplier, connectionBuilder, connectionSettings);
         channelType(connectionBuilder, connectionSettings);
-
-        initializeChannel(connectionBuilder);
+        return connectionBuilder;
     }
 
     /**
@@ -992,15 +1020,16 @@ private static void assertNotNull(ClientResources clientResources) {
     }
 
     private class NodeConnectionFactoryImpl implements NodeConnectionFactory {
+
         @Override
         public <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, SocketAddress socketAddress) {
-            return RedisClusterClient.this.connectToNode(codec, socketAddress.toString(), null, new Supplier<SocketAddress>() {
-                @Override
-                public SocketAddress get() {
-                    return socketAddress;
-                }
-            });
+            return RedisClusterClient.this.connectToNode(codec, socketAddress.toString(), null, () -> socketAddress);
         }
-    }
 
+        @Override
+        public <K, V> CompletableFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisCodec<K, V> codec,
+                SocketAddress socketAddress) {
+            return RedisClusterClient.this.connectToNodeAsync(codec, socketAddress.toString(), null, () -> socketAddress);
+        }
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java b/src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java
index f2edcac8b0..8563869eec 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java
@@ -16,6 +16,7 @@
 package com.lambdaworks.redis.cluster.topology;
 
 import java.net.SocketAddress;
+import java.util.concurrent.CompletableFuture;
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.codec.RedisCodec;
@@ -33,9 +34,22 @@ public interface NodeConnectionFactory {
      *
      * @param codec must not be {@literal null}.
      * @param socketAddress must not be {@literal null}.
-     * @param <K>
-     * @param <V>
+     * @param <K> Key type.
+     * @param <V> Value type.
      * @return a new {@link StatefulRedisConnection}
      */
     <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, SocketAddress socketAddress);
+
+    /**
+     * Connects to a {@link SocketAddress} with the given {@link RedisCodec} asynchronously.
+     *
+     * @param codec must not be {@literal null}.
+     * @param socketAddress must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return a new {@link StatefulRedisConnection}
+     * @since 4.4
+     */
+    <K, V> CompletableFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisCodec<K, V> codec,
+            SocketAddress socketAddress);
 }

From a2316f8f8cd2be622afd427c21d868c323677c1e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 18 Dec 2016 23:49:51 +0100
Subject: [PATCH 101/808] Connect asynchronously in cluster topology refresh
 #424

Switch from blocking to asynchronous connection initialization when connecting Redis Cluster nodes for topology refresh. Asynchronous connection allows connecting concurrently.
---
 .../ClusterTopologyRefreshScheduler.java      |  6 +-
 .../cluster/topology/AsyncConnections.java    | 78 +++++++++++++++++++
 .../topology/ClusterTopologyRefresh.java      | 44 ++++++++---
 .../redis/cluster/topology/Connections.java   | 22 +++---
 .../cluster/topology/RefreshFutures.java      | 55 +++++++++++++
 .../redis/cluster/topology/Requests.java      | 25 +-----
 .../topology/ClusterTopologyRefreshTest.java  | 75 ++++++++++--------
 7 files changed, 226 insertions(+), 79 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/topology/AsyncConnections.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/topology/RefreshFutures.java

diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshScheduler.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshScheduler.java
index 39d6250b6e..cadb0d6378 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshScheduler.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshScheduler.java
@@ -195,7 +195,11 @@ public void run() {
                 logger.debug("ClusterTopologyRefreshTask requesting partitions from {}",
                         redisClusterClient.getTopologyRefreshSource());
             }
-            redisClusterClient.reloadPartitions();
+            try {
+                redisClusterClient.reloadPartitions();
+            } catch (Exception e) {
+                logger.warn("Cannot refresh Redis Cluster topology", e);
+            }
         }
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/AsyncConnections.java b/src/main/java/com/lambdaworks/redis/cluster/topology/AsyncConnections.java
new file mode 100644
index 0000000000..eda0aacb0e
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/AsyncConnections.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.topology;
+
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import com.lambdaworks.redis.RedisConnectionException;
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+
+/**
+ * @author Mark Paluch
+ */
+class AsyncConnections {
+
+    private final Map<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> futures = new TreeMap<>(
+            TopologyComparators.RedisURIComparator.INSTANCE);
+
+    public AsyncConnections() {
+    }
+
+    /**
+     * Add a connection for a {@link RedisURI}
+     *
+     * @param redisURI
+     * @param connection
+     */
+    public void addConnection(RedisURI redisURI, CompletableFuture<StatefulRedisConnection<String, String>> connection) {
+        futures.put(redisURI, connection);
+    }
+
+    /**
+     *
+     * @return a set of {@link RedisURI} for which {@link Connections} has a connection.
+     */
+    public Set<RedisURI> connectedNodes() {
+        return futures.keySet();
+    }
+
+    /**
+     * @return the {@link Connections}.
+     * @throws RedisConnectionException if no connection could be established.
+     */
+    public Connections get(long timeout, TimeUnit timeUnit) throws InterruptedException {
+
+        Connections connections = new Connections();
+        List<Future<?>> sync = new ArrayList<>(this.futures.size());
+
+        for (Map.Entry<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> entry : this.futures.entrySet()) {
+
+            CompletableFuture<StatefulRedisConnection<String, String>> future = entry.getValue();
+
+            sync.add(future.thenAccept((connection) -> {
+                connections.addConnection(entry.getKey(), connection);
+            }));
+        }
+
+        RefreshFutures.awaitAll(timeout, timeUnit, sync);
+
+        return connections;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
index 2606a06f93..a0481961c0 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
@@ -17,6 +17,7 @@
 
 import java.net.SocketAddress;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -64,13 +65,15 @@ public ClusterTopologyRefresh(NodeConnectionFactory nodeConnectionFactory, Clien
      */
     public Map<RedisURI, Partitions> loadViews(Iterable<RedisURI> seed, boolean discovery) {
 
-        Connections connections = getConnections(seed);
-        Requests requestedTopology = connections.requestTopology();
-        Requests requestedClients = connections.requestClients();
-
         long commandTimeoutNs = getCommandTimeoutNs(seed);
 
+        Connections connections = null;
         try {
+            connections = getConnections(seed).get(commandTimeoutNs, TimeUnit.NANOSECONDS);
+
+            Requests requestedTopology = connections.requestTopology();
+            Requests requestedClients = connections.requestClients();
+
             NodeTopologyViews nodeSpecificViews = getNodeSpecificViews(requestedTopology, requestedClients, commandTimeoutNs);
 
             if (discovery) {
@@ -78,7 +81,8 @@ public Map<RedisURI, Partitions> loadViews(Iterable<RedisURI> seed, boolean disc
                 Set<RedisURI> discoveredNodes = difference(allKnownUris, toSet(seed));
 
                 if (!discoveredNodes.isEmpty()) {
-                    Connections discoveredConnections = getConnections(discoveredNodes);
+                    Connections discoveredConnections = getConnections(discoveredNodes).get(commandTimeoutNs,
+                            TimeUnit.NANOSECONDS);
                     connections = connections.mergeWith(discoveredConnections);
 
                     requestedTopology = requestedTopology.mergeWith(discoveredConnections.requestTopology());
@@ -97,7 +101,9 @@ public Map<RedisURI, Partitions> loadViews(Iterable<RedisURI> seed, boolean disc
             Thread.currentThread().interrupt();
             throw new RedisCommandInterruptedException(e);
         } finally {
-            connections.close();
+            if (connections != null) {
+                connections.close();
+            }
         }
     }
 
@@ -190,9 +196,9 @@ private static boolean validNode(RedisClusterNode redisClusterNode) {
     /*
      * Open connections where an address can be resolved.
      */
-    private Connections getConnections(Iterable<RedisURI> redisURIs) {
+    private AsyncConnections getConnections(Iterable<RedisURI> redisURIs) throws InterruptedException {
 
-        Connections connections = new Connections();
+        AsyncConnections connections = new AsyncConnections();
 
         for (RedisURI redisURI : redisURIs) {
             if (redisURI.getHost() == null || connections.connectedNodes().contains(redisURI)) {
@@ -201,10 +207,25 @@ private Connections getConnections(Iterable<RedisURI> redisURIs) {
 
             try {
                 SocketAddress socketAddress = SocketAddressResolver.resolve(redisURI, clientResources.dnsResolver());
-                StatefulRedisConnection<String, String> connection = nodeConnectionFactory.connectToNode(CODEC, socketAddress);
-                connection.async().clientSetname("lettuce#ClusterTopologyRefresh");
 
-                connections.addConnection(redisURI, connection);
+                CompletableFuture<StatefulRedisConnection<String, String>> connectionFuture = nodeConnectionFactory
+                        .connectToNodeAsync(CODEC, socketAddress);
+
+                connectionFuture.thenAccept(connection -> connection.async().clientSetname("lettuce#ClusterTopologyRefresh"));
+
+                CompletableFuture<StatefulRedisConnection<String, String>> sync = new CompletableFuture<>();
+
+                connectionFuture.whenComplete((connection, throwable) -> {
+
+                    if (throwable != null) {
+                        sync.completeExceptionally(new RedisConnectionException(
+                                String.format("Unable to connect to %s", socketAddress), throwable));
+                    } else {
+                        sync.complete(connection);
+                    }
+                });
+
+                connections.addConnection(redisURI, sync);
             } catch (RedisConnectionException e) {
 
                 if (logger.isDebugEnabled()) {
@@ -216,6 +237,7 @@ private Connections getConnections(Iterable<RedisURI> redisURIs) {
                 logger.warn(String.format("Cannot connect to %s", redisURI), e);
             }
         }
+
         return connections;
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java b/src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java
index dadfb03c68..60e43e8022 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java
@@ -16,7 +16,6 @@
 package com.lambdaworks.redis.cluster.topology;
 
 import java.util.Map;
-import java.util.Set;
 import java.util.TreeMap;
 
 import com.lambdaworks.redis.RedisURI;
@@ -49,7 +48,18 @@ private Connections(Map<RedisURI, StatefulRedisConnection<String, String>> conne
      * @param connection
      */
     public void addConnection(RedisURI redisURI, StatefulRedisConnection<String, String> connection) {
-        connections.put(redisURI, connection);
+        synchronized (connections) {
+            connections.put(redisURI, connection);
+        }
+    }
+
+    /**
+     * @return {@literal true} if no connections present.
+     */
+    public boolean isEmpty() {
+        synchronized (connections) {
+            return connections.isEmpty();
+        }
     }
 
     /*
@@ -107,14 +117,6 @@ public void close() {
         }
     }
 
-    /**
-     *
-     * @return a set of {@link RedisURI} for which {@link Connections} has a connection.
-     */
-    public Set<RedisURI> connectedNodes() {
-        return connections.keySet();
-    }
-
     public Connections mergeWith(Connections discoveredConnections) {
 
         Map<RedisURI, StatefulRedisConnection<String, String>> result = new TreeMap<>(
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/RefreshFutures.java b/src/main/java/com/lambdaworks/redis/cluster/topology/RefreshFutures.java
new file mode 100644
index 0000000000..3a8463e427
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/RefreshFutures.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.topology;
+
+import java.util.Collection;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author Mark Paluch
+ */
+class RefreshFutures {
+
+    static long awaitAll(long timeout, TimeUnit timeUnit, Collection<? extends Future<?>> futures) throws InterruptedException {
+
+        long waitTime = 0;
+
+        for (Future<?> future : futures) {
+
+            long timeoutLeft = timeUnit.toNanos(timeout) - waitTime;
+
+            if (timeoutLeft <= 0) {
+                break;
+            }
+
+            long startWait = System.nanoTime();
+
+            try {
+                future.get(timeoutLeft, TimeUnit.NANOSECONDS);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw e;
+            } catch (Exception e) {
+                continue;
+            } finally {
+                waitTime += System.nanoTime() - startWait;
+            }
+
+        }
+        return waitTime;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java b/src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java
index e49f068a13..58fb8fcf3e 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java
@@ -20,7 +20,6 @@
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.RedisFuture;
 import com.lambdaworks.redis.RedisURI;
 
 /**
@@ -43,29 +42,7 @@ void addRequest(RedisURI redisURI, TimedAsyncCommand<String, String, String> com
     }
 
     long await(long timeout, TimeUnit timeUnit) throws InterruptedException {
-
-        long waitTime = 0;
-
-        for (Map.Entry<RedisURI, ? extends RedisFuture<?>> entry : rawViews.entrySet()) {
-            long timeoutLeft = timeUnit.toNanos(timeout) - waitTime;
-
-            if (timeoutLeft <= 0) {
-                break;
-            }
-
-            long startWait = System.nanoTime();
-            RedisFuture<?> future = entry.getValue();
-
-            try {
-                if (!future.await(timeoutLeft, TimeUnit.NANOSECONDS)) {
-                    break;
-                }
-            } finally {
-                waitTime += System.nanoTime() - startWait;
-            }
-
-        }
-        return waitTime;
+        return RefreshFutures.awaitAll(timeout, timeUnit, rawViews.values());
     }
 
     Set<RedisURI> nodes() {
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java b/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
index 6a1123c3fc..bc15a9a2ec 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
@@ -15,6 +15,7 @@
  */
 package com.lambdaworks.redis.cluster.topology;
 
+import static java.util.concurrent.CompletableFuture.completedFuture;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
@@ -25,6 +26,7 @@
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Before;
@@ -207,15 +209,15 @@ public void shouldAttemptToConnectOnlyOnce() throws Exception {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380), RedisURI.create("127.0.0.1", 7381));
 
-        when(nodeConnectionFactory.connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
-                .thenReturn((StatefulRedisConnection) connection1);
-        when(nodeConnectionFactory.connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
-                .thenThrow(new RedisException("connection failed"));
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
+                .thenReturn(completedFuture((StatefulRedisConnection) connection1));
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
+                .thenReturn(completedWithException(new RedisException("connection failed")));
 
         sut.loadViews(seed, true);
 
-        verify(nodeConnectionFactory).connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380)));
-        verify(nodeConnectionFactory).connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381)));
+        verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380)));
+        verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381)));
     }
 
     @Test
@@ -223,15 +225,15 @@ public void shouldShouldDiscoverNodes() throws Exception {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
 
-        when(nodeConnectionFactory.connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
-                .thenReturn((StatefulRedisConnection) connection1);
-        when(nodeConnectionFactory.connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
-                .thenReturn((StatefulRedisConnection) connection2);
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
+                .thenReturn(completedFuture((StatefulRedisConnection) connection1));
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
+                .thenReturn(completedFuture((StatefulRedisConnection) connection2));
 
         sut.loadViews(seed, true);
 
-        verify(nodeConnectionFactory).connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380)));
-        verify(nodeConnectionFactory).connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381)));
+        verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380)));
+        verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381)));
     }
 
     @Test
@@ -239,12 +241,12 @@ public void shouldShouldNotDiscoverNodes() throws Exception {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
 
-        when(nodeConnectionFactory.connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
-                .thenReturn((StatefulRedisConnection) connection1);
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
+                .thenReturn(completedFuture((StatefulRedisConnection) connection1));
 
         sut.loadViews(seed, false);
 
-        verify(nodeConnectionFactory).connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380)));
+        verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380)));
         verifyNoMoreInteractions(nodeConnectionFactory);
     }
 
@@ -254,16 +256,16 @@ public void shouldNotFailOnDuplicateSeedNodes() throws Exception {
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380), RedisURI.create("127.0.0.1", 7381),
                 RedisURI.create("127.0.0.1", 7381));
 
-        when(nodeConnectionFactory.connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
-                .thenReturn((StatefulRedisConnection) connection1);
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
+                .thenReturn(completedFuture((StatefulRedisConnection) connection1));
 
-        when(nodeConnectionFactory.connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
-                .thenReturn((StatefulRedisConnection) connection2);
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
+                .thenReturn(completedFuture((StatefulRedisConnection) connection2));
 
         sut.loadViews(seed, true);
 
-        verify(nodeConnectionFactory).connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380)));
-        verify(nodeConnectionFactory).connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381)));
+        verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380)));
+        verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381)));
     }
 
     @Test
@@ -271,8 +273,8 @@ public void undiscoveredAdditionalNodesShouldBeLastUsingClientCount() throws Exc
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
 
-        when(nodeConnectionFactory.connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
-                .thenReturn((StatefulRedisConnection) connection1);
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
+                .thenReturn(completedFuture((StatefulRedisConnection) connection1));
 
         Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, false);
 
@@ -289,10 +291,10 @@ public void discoveredAdditionalNodesShouldBeOrderedUsingClientCount() throws Ex
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
 
-        when(nodeConnectionFactory.connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
-                .thenReturn((StatefulRedisConnection) connection1);
-        when(nodeConnectionFactory.connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
-                .thenReturn((StatefulRedisConnection) connection2);
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
+                .thenReturn(completedFuture((StatefulRedisConnection) connection1));
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
+                .thenReturn(completedFuture((StatefulRedisConnection) connection2));
 
         Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, true);
 
@@ -309,8 +311,8 @@ public void undiscoveredAdditionalNodesShouldBeLastUsingLatency() throws Excepti
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
 
-        when(nodeConnectionFactory.connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
-                .thenReturn((StatefulRedisConnection) connection1);
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
+                .thenReturn(completedFuture((StatefulRedisConnection) connection1));
 
         Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, false);
 
@@ -327,10 +329,10 @@ public void discoveredAdditionalNodesShouldBeOrderedUsingLatency() throws Except
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
 
-        when(nodeConnectionFactory.connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
-                .thenReturn((StatefulRedisConnection) connection1);
-        when(nodeConnectionFactory.connectToNode(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
-                .thenReturn((StatefulRedisConnection) connection2);
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
+                .thenReturn(completedFuture((StatefulRedisConnection) connection1));
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
+                .thenReturn(completedFuture((StatefulRedisConnection) connection2));
 
         Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, true);
 
@@ -374,4 +376,11 @@ protected Requests createClientListRequests(int duration, String response) {
 
         return requests;
     }
+
+    private static <T> CompletableFuture<T> completedWithException(Exception e) {
+
+        CompletableFuture<T> future = new CompletableFuture<T>();
+        future.completeExceptionally(e);
+        return future;
+    }
 }

From bc05815bfbaa7d2ea81b049700ed273e811226dd Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 19 Dec 2016 00:13:45 +0100
Subject: [PATCH 102/808] Propagate cause if cluster topology refresh can't
 connect to any node #427

RedisClusterClient.loadPartitions now propagates the cause if lettuce can't connect to any of the topology refresh sources (initial seed nodes). Cause propagation covers I/O errors and authentication issues. Command execution issues are just logged.
---
 .../redis/cluster/RedisClusterClient.java     | 37 +++++++-------
 .../cluster/topology/AsyncConnections.java    | 39 ++++++++++++++-
 .../topology/ClusterTopologyRefresh.java      | 48 ++++++++++---------
 .../cluster/ClusterPartiallyDownTest.java     | 12 ++---
 .../topology/ClusterTopologyRefreshTest.java  | 26 +++++++++-
 5 files changed, 114 insertions(+), 48 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index e30d316a45..2d142bcb38 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -721,9 +721,7 @@ protected void updatePartitionsInConnections() {
     }
 
     protected void initializePartitions() {
-
-        Partitions loadedPartitions = loadPartitions();
-        this.partitions = loadedPartitions;
+        this.partitions = loadPartitions();
     }
 
     /**
@@ -746,25 +744,32 @@ public Partitions getPartitions() {
     protected Partitions loadPartitions() {
 
         Iterable<RedisURI> topologyRefreshSource = getTopologyRefreshSource();
-        Map<RedisURI, Partitions> partitions = refresh.loadViews(topologyRefreshSource, useDynamicRefreshSources());
 
-        if (partitions.isEmpty()) {
-            throw new RedisException("Cannot retrieve initial cluster partitions from initial URIs " + topologyRefreshSource);
-        }
+        String message = "Cannot retrieve initial cluster partitions from initial URIs " + topologyRefreshSource;
+        try {
+            Map<RedisURI, Partitions> partitions = refresh.loadViews(topologyRefreshSource, useDynamicRefreshSources());
+
+            if (partitions.isEmpty()) {
+                throw new RedisException(message);
+            }
 
-        Partitions loadedPartitions = determinePartitions(this.partitions, partitions);
-        RedisURI viewedBy = refresh.getViewedBy(partitions, loadedPartitions);
+            Partitions loadedPartitions = determinePartitions(this.partitions, partitions);
+            RedisURI viewedBy = refresh.getViewedBy(partitions, loadedPartitions);
 
-        for (RedisClusterNode partition : loadedPartitions) {
-            if (viewedBy != null) {
-                RedisURI uri = partition.getUri();
-                RedisClusterURIUtil.applyUriConnectionSettings(viewedBy, uri);
+            for (RedisClusterNode partition : loadedPartitions) {
+                if (viewedBy != null) {
+                    RedisURI uri = partition.getUri();
+                    RedisClusterURIUtil.applyUriConnectionSettings(viewedBy, uri);
+                }
             }
-        }
 
-        activateTopologyRefreshIfNeeded();
+            activateTopologyRefreshIfNeeded();
 
-        return loadedPartitions;
+            return loadedPartitions;
+
+        } catch (RedisConnectionException e) {
+            throw new RedisException(message, e);
+        }
     }
 
     /**
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/AsyncConnections.java b/src/main/java/com/lambdaworks/redis/cluster/topology/AsyncConnections.java
index eda0aacb0e..da15091ef1 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/AsyncConnections.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/AsyncConnections.java
@@ -17,6 +17,7 @@
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
@@ -46,7 +47,6 @@ public void addConnection(RedisURI redisURI, CompletableFuture<StatefulRedisConn
     }
 
     /**
-     *
      * @return a set of {@link RedisURI} for which {@link Connections} has a connection.
      */
     public Set<RedisURI> connectedNodes() {
@@ -59,6 +59,43 @@ public Set<RedisURI> connectedNodes() {
      */
     public Connections get(long timeout, TimeUnit timeUnit) throws InterruptedException {
 
+        Connections connections = new Connections();
+        List<Throwable> exceptions = new CopyOnWriteArrayList<>();
+        List<Future<?>> sync = new ArrayList<>(this.futures.size());
+
+        for (Map.Entry<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> entry : this.futures.entrySet()) {
+
+            CompletableFuture<StatefulRedisConnection<String, String>> future = entry.getValue();
+
+            sync.add(future.whenComplete((connection, throwable) -> {
+
+                if (throwable != null) {
+                    exceptions.add(throwable);
+                } else {
+                    connections.addConnection(entry.getKey(), connection);
+                }
+            }));
+        }
+
+        RefreshFutures.awaitAll(timeout, timeUnit, sync);
+
+        if (connections.isEmpty() && !sync.isEmpty() && !exceptions.isEmpty()) {
+
+            RedisConnectionException collector = new RedisConnectionException(
+                    "Unable to establish a connection to Redis Cluster");
+            exceptions.forEach(collector::addSuppressed);
+
+            throw collector;
+        }
+
+        return connections;
+    }
+
+    /**
+     * @return the {@link Connections}.
+     */
+    public Connections optionalGet(long timeout, TimeUnit timeUnit) throws InterruptedException {
+
         Connections connections = new Connections();
         List<Future<?>> sync = new ArrayList<>(this.futures.size());
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
index a0481961c0..0629106d68 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
@@ -81,7 +81,7 @@ public Map<RedisURI, Partitions> loadViews(Iterable<RedisURI> seed, boolean disc
                 Set<RedisURI> discoveredNodes = difference(allKnownUris, toSet(seed));
 
                 if (!discoveredNodes.isEmpty()) {
-                    Connections discoveredConnections = getConnections(discoveredNodes).get(commandTimeoutNs,
+                    Connections discoveredConnections = getConnections(discoveredNodes).optionalGet(commandTimeoutNs,
                             TimeUnit.NANOSECONDS);
                     connections = connections.mergeWith(discoveredConnections);
 
@@ -139,19 +139,18 @@ NodeTopologyViews getNodeSpecificViews(Requests requestedTopology, Requests requ
                         .filter(ClusterTopologyRefresh::validNode) //
                         .map(RedisClusterNodeSnapshot::new).collect(Collectors.toList());
 
-                for (RedisClusterNodeSnapshot partition : nodeWithStats) {
+                nodeWithStats.stream() //
+                        .filter(partition -> partition.is(RedisClusterNode.NodeFlag.MYSELF)) //
+                        .forEach(partition -> {
 
-                    if (partition.getFlags().contains(RedisClusterNode.NodeFlag.MYSELF)) {
+                            if (partition.getUri() == null) {
+                                partition.setUri(node);
+                            }
 
-                        if (partition.getUri() == null) {
-                            partition.setUri(node);
-                        }
-
-                        // record latency for later partition ordering
-                        latencies.put(partition.getNodeId(), nodeTopologyView.getLatency());
-                        clientCountByNodeId.put(partition.getNodeId(), nodeTopologyView.getConnectedClients());
-                    }
-                }
+                            // record latency for later partition ordering
+                            latencies.put(partition.getNodeId(), nodeTopologyView.getLatency());
+                            clientCountByNodeId.put(partition.getNodeId(), nodeTopologyView.getConnectedClients());
+                        });
 
                 allNodes.addAll(nodeWithStats);
 
@@ -211,28 +210,31 @@ private AsyncConnections getConnections(Iterable<RedisURI> redisURIs) throws Int
                 CompletableFuture<StatefulRedisConnection<String, String>> connectionFuture = nodeConnectionFactory
                         .connectToNodeAsync(CODEC, socketAddress);
 
-                connectionFuture.thenAccept(connection -> connection.async().clientSetname("lettuce#ClusterTopologyRefresh"));
-
                 CompletableFuture<StatefulRedisConnection<String, String>> sync = new CompletableFuture<>();
 
                 connectionFuture.whenComplete((connection, throwable) -> {
 
                     if (throwable != null) {
-                        sync.completeExceptionally(new RedisConnectionException(
-                                String.format("Unable to connect to %s", socketAddress), throwable));
+
+                        String message = String.format("Unable to connect to %s", socketAddress);
+                        if (throwable instanceof RedisConnectionException) {
+                            if (logger.isDebugEnabled()) {
+                                logger.debug(throwable.getMessage(), throwable);
+                            } else {
+                                logger.warn(throwable.getMessage());
+                            }
+                        } else {
+                            logger.warn(message, throwable);
+                        }
+
+                        sync.completeExceptionally(new RedisConnectionException(message, throwable));
                     } else {
+                        connection.async().clientSetname("lettuce#ClusterTopologyRefresh");
                         sync.complete(connection);
                     }
                 });
 
                 connections.addConnection(redisURI, sync);
-            } catch (RedisConnectionException e) {
-
-                if (logger.isDebugEnabled()) {
-                    logger.debug(e.getMessage(), e);
-                } else {
-                    logger.warn(e.getMessage());
-                }
             } catch (RuntimeException e) {
                 logger.warn(String.format("Cannot connect to %s", redisURI), e);
             }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java
index bfea690cea..1a98512dcf 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java
@@ -89,8 +89,7 @@ public void operateOnPartiallyDownCluster() throws Exception {
             connection.sync().get(key_10439);
             fail("Missing RedisException");
         } catch (RedisConnectionException e) {
-            assertThat(e).hasRootCauseInstanceOf(
-                    ConnectException.class);
+            assertThat(e).hasRootCauseInstanceOf(ConnectException.class);
         }
 
         connection.close();
@@ -106,7 +105,8 @@ public void seedNodesAreOffline() throws Exception {
             redisClusterClient.connect();
             fail("Missing RedisException");
         } catch (RedisException e) {
-            assertThat(e).hasNoCause();
+            assertThat(e).hasCauseInstanceOf(RedisConnectionException.class);
+            assertThat(e.getCause()).hasMessage("Unable to establish a connection to Redis Cluster");
         }
     }
 
@@ -117,10 +117,8 @@ public void partitionNodesAreOffline() throws Exception {
         redisClusterClient = RedisClusterClient.create(clientResources, seed);
 
         Partitions partitions = new Partitions();
-        partitions.addPartition(
-                new RedisClusterNode(URI_1, "a", true, null, 0, 0, 0, new ArrayList<>(), new HashSet<>()));
-        partitions.addPartition(
-                new RedisClusterNode(URI_2, "b", true, null, 0, 0, 0, new ArrayList<>(), new HashSet<>()));
+        partitions.addPartition(new RedisClusterNode(URI_1, "a", true, null, 0, 0, 0, new ArrayList<>(), new HashSet<>()));
+        partitions.addPartition(new RedisClusterNode(URI_2, "b", true, null, 0, 0, 0, new ArrayList<>(), new HashSet<>()));
 
         redisClusterClient.setPartitions(partitions);
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java b/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
index bc15a9a2ec..d2addc8b78 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
@@ -17,6 +17,7 @@
 
 import static java.util.concurrent.CompletableFuture.completedFuture;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
@@ -29,6 +30,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
+import io.netty.util.concurrent.ImmediateEventExecutor;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -90,6 +92,7 @@ public class ClusterTopologyRefreshTest {
     public void before() throws Exception {
 
         when(clientResources.dnsResolver()).thenReturn(DnsResolvers.JVM_DEFAULT);
+        when(clientResources.eventExecutorGroup()).thenReturn(ImmediateEventExecutor.INSTANCE);
         when(connection1.async()).thenReturn(asyncCommands1);
         when(connection2.async()).thenReturn(asyncCommands2);
 
@@ -220,6 +223,28 @@ public void shouldAttemptToConnectOnlyOnce() throws Exception {
         verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381)));
     }
 
+    @Test
+    public void shouldFailIfNoNodeConnects() throws Exception {
+
+        List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380), RedisURI.create("127.0.0.1", 7381));
+
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
+                .thenReturn(completedWithException(new RedisException("connection failed")));
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
+                .thenReturn(completedWithException(new RedisException("connection failed")));
+
+        try {
+            sut.loadViews(seed, true);
+            fail("Missing RedisConnectionException");
+        } catch (Exception e) {
+            assertThat(e).hasNoCause().hasMessage("Unable to establish a connection to Redis Cluster");
+            assertThat(e.getSuppressed()).hasSize(2);
+        }
+
+        verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380)));
+        verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381)));
+    }
+
     @Test
     public void shouldShouldDiscoverNodes() throws Exception {
 
@@ -359,7 +384,6 @@ protected Requests createClusterNodesRequests(int duration, String nodes) {
         command.completedAtNs = duration;
 
         return requests;
-
     }
 
     protected Requests createClientListRequests(int duration, String response) {

From 8cdab70b6baf756e8d077ee5d0e93f8ae18b7bc3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 20 Dec 2016 21:30:10 +0100
Subject: [PATCH 103/808] Perform resilient Master/Slave topology refresh ping
 #424

Lettuce now connects Master/Slave nodes asynchronously and performs fail-safe topology refresh ping synchronization. Master/Slave node connections are established asynchronously, and the connection is synchronized with a timeout. Only connections that were able to initialize within the timeout are considered for the topology ping. Topology ping execution is also synchronized with a timeout. Nodes that responded within the timeout successfully are considered as Master/Slave members.

Previously, connection was synchronous and if one node in the ping failed, the result of other nodes was discarded.
---
 .../com/lambdaworks/redis/RedisClient.java    |  76 ++++--
 .../redis/masterslave/AsyncConnections.java   |  89 +++++++
 .../redis/masterslave/Connections.java        |  93 +++++++
 .../MasterSlaveTopologyRefresh.java           | 235 ++++++------------
 .../redis/masterslave/MasterSlaveUtils.java   |  25 ++
 .../masterslave/NodeConnectionFactory.java    |  43 ++++
 .../ReflectiveNodeConnectionFactory.java      |  67 +++++
 .../redis/masterslave/RefreshFutures.java     |  64 +++++
 .../redis/masterslave/Requests.java           |  53 ++++
 .../masterslave/SentinelTopologyRefresh.java  |   2 +-
 .../redis/masterslave/TimedAsyncCommand.java  |  61 +++++
 .../masterslave/TopologyComparators.java      |  87 +++++++
 .../topology/ClusterTopologyRefreshTest.java  |   7 +-
 13 files changed, 714 insertions(+), 188 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/masterslave/AsyncConnections.java
 create mode 100644 src/main/java/com/lambdaworks/redis/masterslave/Connections.java
 create mode 100644 src/main/java/com/lambdaworks/redis/masterslave/NodeConnectionFactory.java
 create mode 100644 src/main/java/com/lambdaworks/redis/masterslave/ReflectiveNodeConnectionFactory.java
 create mode 100644 src/main/java/com/lambdaworks/redis/masterslave/RefreshFutures.java
 create mode 100644 src/main/java/com/lambdaworks/redis/masterslave/Requests.java
 create mode 100644 src/main/java/com/lambdaworks/redis/masterslave/TimedAsyncCommand.java
 create mode 100644 src/main/java/com/lambdaworks/redis/masterslave/TopologyComparators.java

diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/com/lambdaworks/redis/RedisClient.java
index 7d639f17a2..450bc1abaf 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClient.java
@@ -18,7 +18,6 @@
 import static com.lambdaworks.redis.LettuceStrings.isEmpty;
 import static com.lambdaworks.redis.LettuceStrings.isNotEmpty;
 
-import java.net.ConnectException;
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -200,19 +199,44 @@ public <K, V> StatefulRedisConnection<K, V> connect(RedisCodec<K, V> codec, Redi
 
     private <K, V> StatefulRedisConnection<K, V> connectStandalone(RedisCodec<K, V> codec, RedisURI redisURI, Timeout timeout) {
 
+        ConnectionFuture<StatefulRedisConnection<K, V>> future = connectStandaloneAsync(codec, redisURI, timeout);
+        return getConnection(future);
+    }
+
+    private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandaloneAsync(RedisCodec<K, V> codec,
+            RedisURI redisURI) {
+        return connectStandaloneAsync(codec, redisURI, Timeout.from(redisURI));
+    }
+
+    private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandaloneAsync(RedisCodec<K, V> codec,
+            RedisURI redisURI, Timeout timeout) {
+
         assertNotNull(codec);
         checkValidRedisURI(redisURI);
 
+        logger.debug("Trying to get a Redis connection for: " + redisURI);
+
         DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
 
-        StatefulRedisConnectionImpl<K, V> connection = newStatefulRedisConnection(endpoint, codec,
-                timeout.timeout, timeout.timeUnit);
-        connectStateful(connection, redisURI, endpoint, () -> new CommandHandler(clientResources, endpoint));
-        return connection;
+        StatefulRedisConnectionImpl<K, V> connection = newStatefulRedisConnection(endpoint, codec, timeout.timeout,
+                timeout.timeUnit);
+        ConnectionFuture<StatefulRedisConnection<K, V>> future = connectStatefulAsync(connection, endpoint, redisURI,
+                () -> new CommandHandler(clientResources, endpoint));
+
+        future.whenComplete((channelHandler, throwable) -> {
+
+            if (throwable != null) {
+                connection.close();
+            }
+        });
+
+        return future;
     }
 
-    private <K, V> void connectStateful(StatefulRedisConnectionImpl<K, V> connection, RedisURI redisURI,
-            DefaultEndpoint endpoint, Supplier<CommandHandler> commandHandlerSupplier) {
+    @SuppressWarnings("unchecked")
+    private <K, V, T extends RedisChannelHandler<K, V>, S> ConnectionFuture<S> connectStatefulAsync(
+            StatefulRedisConnectionImpl<K, V> connection, DefaultEndpoint endpoint, RedisURI redisURI,
+            Supplier<CommandHandler> commandHandlerSupplier) {
 
         ConnectionBuilder connectionBuilder;
         if (redisURI.isSsl()) {
@@ -261,7 +285,7 @@ private <K, V> void connectStateful(StatefulRedisConnectionImpl<K, V> connection
             }, clientResources.eventExecutorGroup());
         }
 
-        getConnection(future);
+        return future.thenApply(channelHandler -> (S) connection);
     }
 
     /**
@@ -323,7 +347,15 @@ private <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V
         StatefulRedisPubSubConnectionImpl<K, V> connection = newStatefulRedisPubSubConnection(endpoint, endpoint, codec,
                 timeout.timeout, timeout.timeUnit);
 
-        connectStateful(connection, redisURI, endpoint, () -> new PubSubCommandHandler<>(clientResources, codec, endpoint));
+        ConnectionFuture<StatefulRedisConnectionImpl<K, V>> future = connectStatefulAsync(connection, endpoint, redisURI,
+                () -> new PubSubCommandHandler<>(clientResources, codec, endpoint));
+
+        getConnection(future.whenComplete((conn, throwable) -> {
+
+            if (throwable != null) {
+                conn.close();
+            }
+        }));
 
         return connection;
     }
@@ -390,7 +422,7 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
         StatefulRedisSentinelConnectionImpl<K, V> connection = newStatefulRedisSentinelConnection(endpoint, codec,
                 timeout.timeout, timeout.timeUnit);
 
-        logger.debug("Trying to get a Sentinel connection for one of: " + redisURI.getSentinels());
+        logger.debug("Trying to get a Redis Sentinel connection for one of: " + redisURI.getSentinels());
 
         connectionBuilder.endpoint(endpoint).commandHandler(() -> new CommandHandler(clientResources, endpoint))
                 .connection(connection);
@@ -398,12 +430,19 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
 
         if (redisURI.getSentinels().isEmpty() && (isNotEmpty(redisURI.getHost()) || !isEmpty(redisURI.getSocket()))) {
             channelType(connectionBuilder, redisURI);
-            getConnection(initializeChannelAsync(connectionBuilder));
+            try {
+                getConnection(initializeChannelAsync(connectionBuilder));
+            } catch (RuntimeException e) {
+                connection.close();
+                throw e;
+            }
         } else {
+
             boolean connected = false;
             boolean first = true;
             Exception causingException = null;
             validateUrisAreOfSameConnectionType(redisURI.getSentinels());
+
             for (RedisURI uri : redisURI.getSentinels()) {
                 if (first) {
                     channelType(connectionBuilder, uri);
@@ -413,22 +452,21 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
 
                 if (logger.isDebugEnabled()) {
                     SocketAddress socketAddress = SocketAddressResolver.resolve(redisURI, clientResources.dnsResolver());
-                    logger.debug("Connecting to Sentinel, address: " + socketAddress);
+                    logger.debug("Connecting to Redis Sentinel, address: " + socketAddress);
                 }
                 try {
                     getConnection(initializeChannelAsync(connectionBuilder));
                     connected = true;
                     break;
                 } catch (Exception e) {
-                    logger.warn("Cannot connect sentinel at " + uri + ": " + e.toString());
+                    logger.warn("Cannot connect Redis Sentinel at " + uri + ": " + e.toString());
                     causingException = e;
-                    if (e instanceof ConnectException) {
-                        continue;
-                    }
                 }
             }
+
             if (!connected) {
-                throw new RedisConnectionException("Cannot connect to a sentinel: " + redisURI.getSentinels(),
+                connection.close();
+                throw new RedisConnectionException("Cannot connect to a Redis Sentinel: " + redisURI.getSentinels(),
                         causingException);
             }
         }
@@ -524,7 +562,7 @@ protected <K, V> StatefulRedisConnectionImpl<K, V> newStatefulRedisConnection(Re
      * {@link RedisURI} is configured with Sentinels) or via DNS resolution.
      * <p>
      * Subclasses of {@link RedisClient} may override that method.
-     * 
+     *
      * @param redisURI must not be {@literal null}.
      * @return the resolved {@link SocketAddress}.
      * @throws InterruptedException
@@ -604,7 +642,7 @@ private SocketAddress lookupRedis(RedisURI sentinelUri) throws InterruptedExcept
 
     private void checkValidRedisURI(RedisURI redisURI) {
 
-        LettuceAssert.notNull(redisURI, "A valid RedisURI is needed");
+        LettuceAssert.notNull(redisURI, "A valid RedisURI is required");
 
         if (redisURI.getSentinels().isEmpty()) {
             if (isEmpty(redisURI.getHost()) && isEmpty(redisURI.getSocket())) {
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/AsyncConnections.java b/src/main/java/com/lambdaworks/redis/masterslave/AsyncConnections.java
new file mode 100644
index 0000000000..a136d0d97c
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/masterslave/AsyncConnections.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.masterslave;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import com.lambdaworks.redis.RedisConnectionException;
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+
+/**
+ * @author Mark Paluch
+ */
+class AsyncConnections {
+
+    private final Map<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> futures = new TreeMap<>(
+            MasterSlaveUtils.RedisURIComparator.INSTANCE);
+
+    public AsyncConnections() {
+    }
+
+    /**
+     * Add a connection for a {@link RedisURI}
+     *
+     * @param redisURI
+     * @param connection
+     */
+    public void addConnection(RedisURI redisURI, CompletableFuture<StatefulRedisConnection<String, String>> connection) {
+        futures.put(redisURI, connection);
+    }
+
+    /**
+     * @return the {@link Connections}.
+     * @throws RedisConnectionException if no connection could be established.
+     */
+    public Connections get(long timeout, TimeUnit timeUnit) throws InterruptedException {
+
+        Connections connections = new Connections();
+        List<Throwable> exceptions = new CopyOnWriteArrayList<>();
+        List<Future<?>> sync = new ArrayList<>(this.futures.size());
+
+        for (Map.Entry<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> entry : this.futures.entrySet()) {
+
+            CompletableFuture<StatefulRedisConnection<String, String>> future = entry.getValue();
+
+            sync.add(future.whenComplete((connection, throwable) -> {
+
+                if (throwable != null) {
+                    exceptions.add(throwable);
+                } else {
+                    connections.addConnection(entry.getKey(), connection);
+                }
+            }));
+        }
+
+        RefreshFutures.awaitAll(timeout, timeUnit, sync);
+
+        if (connections.isEmpty() && !sync.isEmpty() && !exceptions.isEmpty()) {
+
+            RedisConnectionException collector = new RedisConnectionException(
+                    "Unable to establish a connection to Redis Cluster");
+            exceptions.forEach(collector::addSuppressed);
+
+            throw collector;
+        }
+
+        return connections;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/Connections.java b/src/main/java/com/lambdaworks/redis/masterslave/Connections.java
new file mode 100644
index 0000000000..1d84f48243
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/masterslave/Connections.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.masterslave;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.output.StatusOutput;
+import com.lambdaworks.redis.protocol.Command;
+import com.lambdaworks.redis.protocol.CommandArgs;
+import com.lambdaworks.redis.protocol.CommandKeyword;
+import com.lambdaworks.redis.protocol.CommandType;
+
+/**
+ * @author Mark Paluch
+ */
+class Connections {
+
+    private final Map<RedisURI, StatefulRedisConnection<String, String>> connections = new TreeMap<>(
+            MasterSlaveUtils.RedisURIComparator.INSTANCE);
+
+    public Connections() {
+    }
+
+    /**
+     * Add a connection for a {@link RedisURI}
+     *
+     * @param redisURI
+     * @param connection
+     */
+    public void addConnection(RedisURI redisURI, StatefulRedisConnection<String, String> connection) {
+        synchronized (connections) {
+            connections.put(redisURI, connection);
+        }
+    }
+
+    /**
+     * @return {@literal true} if no connections present.
+     */
+    public boolean isEmpty() {
+        synchronized (connections) {
+            return connections.isEmpty();
+        }
+    }
+
+    /*
+     * Initiate {@code PING} on all connections and return the {@link Requests}.
+     *
+     * @return the {@link Requests}.
+     */
+    public Requests requestPing() {
+
+        Requests requests = new Requests();
+
+        for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : connections.entrySet()) {
+
+            CommandArgs<String, String> args = new CommandArgs<>(StringCodec.ASCII).add(CommandKeyword.NODES);
+            Command<String, String, String> command = new Command<>(CommandType.PING, new StatusOutput<>(StringCodec.ASCII),
+                    args);
+            TimedAsyncCommand<String, String, String> timedCommand = new TimedAsyncCommand<>(command);
+
+            entry.getValue().dispatch(timedCommand);
+            requests.addRequest(entry.getKey(), timedCommand);
+        }
+
+        return requests;
+    }
+
+    /**
+     * Close all connections.
+     */
+    public void close() {
+        for (StatefulRedisConnection<String, String> connection : connections.values()) {
+            connection.close();
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java
index 860e429771..fe6550e58f 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java
@@ -17,21 +17,22 @@
 
 import static com.lambdaworks.redis.masterslave.MasterSlaveUtils.findNodeByUri;
 
-import java.util.*;
-import java.util.concurrent.ExecutionException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
 import com.lambdaworks.redis.RedisClient;
 import com.lambdaworks.redis.RedisCommandInterruptedException;
-import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.RedisConnectionException;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
+import com.lambdaworks.redis.codec.StringCodec;
 import com.lambdaworks.redis.models.role.RedisNodeDescription;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.*;
 
-import io.netty.buffer.ByteBuf;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -43,12 +44,14 @@
 class MasterSlaveTopologyRefresh {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(MasterSlaveTopologyRefresh.class);
+    private static final StringCodec CODEC = StringCodec.UTF8;
 
-    private final RedisClient client;
+    private final NodeConnectionFactory nodeConnectionFactory;
     private final TopologyProvider topologyProvider;
 
     public MasterSlaveTopologyRefresh(RedisClient client, TopologyProvider topologyProvider) {
-        this.client = client;
+
+        this.nodeConnectionFactory = new ReflectiveNodeConnectionFactory(client);
         this.topologyProvider = topologyProvider;
     }
 
@@ -65,12 +68,23 @@ public List<RedisNodeDescription> getNodes(RedisURI seed) {
 
         addPasswordIfNeeded(nodes, seed);
 
-        Map<RedisURI, StatefulRedisConnection<String, String>> connections = getConnections(nodes);
-        Map<RedisURI, TimedAsyncCommand<String, String, String>> rawViews = requestPing(connections);
-        List<RedisNodeDescription> result = getNodeSpecificViews(rawViews, nodes, seed);
-        close(connections);
+        AsyncConnections asyncConnections = getConnections(nodes);
+        Connections connections = null;
 
-        return result;
+        try {
+
+            connections = asyncConnections.get(seed.getTimeout(), seed.getUnit());
+            Requests requestedPing = connections.requestPing();
+            return getNodeSpecificViews(requestedPing, nodes, seed);
+
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RedisCommandInterruptedException(e);
+        } finally {
+            if (connections != null) {
+                connections.close();
+            }
+        }
     }
 
     private void addPasswordIfNeeded(List<RedisNodeDescription> nodes, RedisURI seed) {
@@ -82,189 +96,80 @@ private void addPasswordIfNeeded(List<RedisNodeDescription> nodes, RedisURI seed
         }
     }
 
-    protected List<RedisNodeDescription> getNodeSpecificViews(
-            Map<RedisURI, TimedAsyncCommand<String, String, String>> rawViews, List<RedisNodeDescription> nodes, RedisURI seed) {
+    private List<RedisNodeDescription> getNodeSpecificViews(Requests requestedPing, List<RedisNodeDescription> nodes,
+            RedisURI seed) throws InterruptedException {
+
         List<RedisNodeDescription> result = new ArrayList<>();
 
         long timeout = seed.getUnit().toNanos(seed.getTimeout());
-        long waitTime = 0;
         Map<RedisNodeDescription, Long> latencies = new HashMap<>();
 
-        for (Map.Entry<RedisURI, TimedAsyncCommand<String, String, String>> entry : rawViews.entrySet()) {
-            long timeoutLeft = timeout - waitTime;
-
-            if (timeoutLeft <= 0) {
-                break;
-            }
+        requestedPing.await(timeout, TimeUnit.NANOSECONDS);
 
-            long startWait = System.nanoTime();
-            RedisFuture<String> future = entry.getValue();
+        for (RedisNodeDescription node : nodes) {
 
-            try {
+            TimedAsyncCommand<String, String, String> future = requestedPing.getRequest(node.getUri());
 
-                if (!future.await(timeoutLeft, TimeUnit.NANOSECONDS)) {
-                    break;
-                }
-                waitTime += System.nanoTime() - startWait;
-
-                future.get();
-
-                RedisNodeDescription redisNodeDescription = findNodeByUri(nodes, entry.getKey());
-                latencies.put(redisNodeDescription, entry.getValue().duration());
-                result.add(redisNodeDescription);
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                throw new RedisCommandInterruptedException(e);
-            } catch (ExecutionException e) {
-                logger.warn("Cannot retrieve partition view from " + entry.getKey(), e);
+            if (!future.isDone()) {
+                continue;
             }
+
+            RedisNodeDescription redisNodeDescription = findNodeByUri(nodes, node.getUri());
+            latencies.put(redisNodeDescription, future.duration());
+            result.add(redisNodeDescription);
         }
 
-        LatencyComparator comparator = new LatencyComparator(latencies);
+        TopologyComparators.LatencyComparator comparator = new TopologyComparators.LatencyComparator(latencies);
 
-        Collections.sort(result, comparator);
+        result.sort(comparator);
 
         return result;
     }
 
     /*
-     * Async request of views.
+     * Establish connections asynchronously.
      */
-    @SuppressWarnings("unchecked")
-    private Map<RedisURI, TimedAsyncCommand<String, String, String>> requestPing(
-            Map<RedisURI, StatefulRedisConnection<String, String>> connections) {
-        Map<RedisURI, TimedAsyncCommand<String, String, String>> rawViews = new TreeMap<>(RedisUriComparator.INSTANCE);
-        for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : connections.entrySet()) {
-
-            TimedAsyncCommand<String, String, String> timed = createPingCommand();
-
-            entry.getValue().dispatch(timed);
-            rawViews.put(entry.getKey(), timed);
-        }
-        return rawViews;
-    }
+    private AsyncConnections getConnections(Iterable<RedisNodeDescription> nodes) {
 
-    protected TimedAsyncCommand<String, String, String> createPingCommand() {
-        CommandArgs<String, String> args = new CommandArgs<>(MasterSlaveUtils.CODEC);
-        Command<String, String, String> command = new Command<>(CommandType.PING, new StatusOutput<>(MasterSlaveUtils.CODEC),
-                args);
-        return new TimedAsyncCommand<>(command);
-    }
-
-    private void close(Map<RedisURI, StatefulRedisConnection<String, String>> connections) {
-        for (StatefulRedisConnection<String, String> connection : connections.values()) {
-            connection.close();
-        }
-    }
-
-    /*
-     * Open connections where an address can be resolved.
-     */
-    private Map<RedisURI, StatefulRedisConnection<String, String>> getConnections(Iterable<RedisNodeDescription> nodes) {
-        Map<RedisURI, StatefulRedisConnection<String, String>> connections = new TreeMap<>(RedisUriComparator.INSTANCE);
+        AsyncConnections connections = new AsyncConnections();
 
         for (RedisNodeDescription node : nodes) {
 
+            RedisURI redisURI = node.getUri();
+            String message = String.format("Unable to connect to %s", redisURI);
             try {
-                StatefulRedisConnection<String, String> connection = client.connect(node.getUri());
-                connections.put(node.getUri(), connection);
-            } catch (RuntimeException e) {
-                logger.warn("Cannot connect to " + node.getUri(), e);
-            }
-        }
-        return connections;
-    }
+                CompletableFuture<StatefulRedisConnection<String, String>> connectionFuture = nodeConnectionFactory
+                        .connectToNodeAsync(CODEC, redisURI);
 
-    /**
-     * Compare {@link RedisURI} based on their host and port representation.
-     */
-    static class RedisUriComparator implements Comparator<RedisURI> {
+                CompletableFuture<StatefulRedisConnection<String, String>> sync = new CompletableFuture<>();
 
-        public static final RedisUriComparator INSTANCE = new RedisUriComparator();
+                connectionFuture.whenComplete((connection, throwable) -> {
 
-        @Override
-        public int compare(RedisURI o1, RedisURI o2) {
-            String h1 = "";
-            String h2 = "";
+                    if (throwable != null) {
 
-            if (o1 != null) {
-                h1 = o1.getHost() + ":" + o1.getPort();
-            }
+                        if (throwable instanceof RedisConnectionException) {
+                            if (logger.isDebugEnabled()) {
+                                logger.debug(throwable.getMessage(), throwable);
+                            } else {
+                                logger.warn(throwable.getMessage());
+                            }
+                        } else {
+                            logger.warn(message, throwable);
+                        }
 
-            if (o2 != null) {
-                h2 = o2.getHost() + ":" + o2.getPort();
-            }
+                        sync.completeExceptionally(new RedisConnectionException(message, throwable));
+                    } else {
+                        connection.async().clientSetname("lettuce#MasterSlaveTopologyRefresh");
+                        sync.complete(connection);
+                    }
+                });
 
-            return h1.compareToIgnoreCase(h2);
-        }
-    }
-
-    /**
-     * Timed command that records the time at which the command was encoded and completed.
-     * 
-     * @param <K> Key type
-     * @param <V> Value type
-     * @param <T> Result type
-     */
-    static class TimedAsyncCommand<K, V, T> extends AsyncCommand<K, V, T> {
-
-        long encodedAtNs = -1;
-        long completedAtNs = -1;
-
-        public TimedAsyncCommand(RedisCommand<K, V, T> command) {
-            super(command);
-        }
-
-        @Override
-        public void encode(ByteBuf buf) {
-            completedAtNs = -1;
-            encodedAtNs = -1;
-
-            super.encode(buf);
-            encodedAtNs = System.nanoTime();
-        }
-
-        @Override
-        public void complete() {
-            completedAtNs = System.nanoTime();
-            super.complete();
-        }
-
-        public long duration() {
-            if (completedAtNs == -1 || encodedAtNs == -1) {
-                return -1;
+                connections.addConnection(redisURI, sync);
+            } catch (RuntimeException e) {
+                logger.warn(String.format(message, redisURI), e);
             }
-            return completedAtNs - encodedAtNs;
         }
-    }
-
-    static class LatencyComparator implements Comparator<RedisNodeDescription> {
-
-        private final Map<RedisNodeDescription, Long> latencies;
-
-        public LatencyComparator(Map<RedisNodeDescription, Long> latencies) {
-            this.latencies = latencies;
-        }
-
-        @Override
-        public int compare(RedisNodeDescription o1, RedisNodeDescription o2) {
 
-            Long latency1 = latencies.get(o1);
-            Long latency2 = latencies.get(o2);
-
-            if (latency1 != null && latency2 != null) {
-                return latency1.compareTo(latency2);
-            }
-
-            if (latency1 != null && latency2 == null) {
-                return -1;
-            }
-
-            if (latency1 == null && latency2 != null) {
-                return 1;
-            }
-
-            return 0;
-        }
+        return connections;
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveUtils.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveUtils.java
index 39004c084c..df345b7c79 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveUtils.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveUtils.java
@@ -16,6 +16,7 @@
 package com.lambdaworks.redis.masterslave;
 
 import java.util.Collection;
+import java.util.Comparator;
 
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.codec.Utf8StringCodec;
@@ -102,4 +103,28 @@ static boolean essentiallyEqualsTo(RedisNodeDescription o1, RedisNodeDescription
         return true;
     }
 
+    /**
+     * Compare {@link RedisURI} based on their host and port representation.
+     */
+    enum RedisURIComparator implements Comparator<RedisURI> {
+
+        INSTANCE;
+
+        @Override
+        public int compare(RedisURI o1, RedisURI o2) {
+            String h1 = "";
+            String h2 = "";
+
+            if (o1 != null) {
+                h1 = o1.getHost() + ":" + o1.getPort();
+            }
+
+            if (o2 != null) {
+                h2 = o2.getHost() + ":" + o2.getPort();
+            }
+
+            return h1.compareToIgnoreCase(h2);
+        }
+    }
+
 }
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/NodeConnectionFactory.java b/src/main/java/com/lambdaworks/redis/masterslave/NodeConnectionFactory.java
new file mode 100644
index 0000000000..dc6b608f41
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/masterslave/NodeConnectionFactory.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.masterslave;
+
+import java.net.SocketAddress;
+import java.util.concurrent.CompletableFuture;
+
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.codec.RedisCodec;
+
+/**
+ * Factory interface to obtain {@link StatefulRedisConnection connections} to Redis nodes.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public interface NodeConnectionFactory {
+
+    /**
+     * Connects to a {@link SocketAddress} with the given {@link RedisCodec} asynchronously.
+     *
+     * @param codec must not be {@literal null}.
+     * @param redisURI must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return a new {@link StatefulRedisConnection}
+     */
+    <K, V> CompletableFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisCodec<K, V> codec, RedisURI redisURI);
+}
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/ReflectiveNodeConnectionFactory.java b/src/main/java/com/lambdaworks/redis/masterslave/ReflectiveNodeConnectionFactory.java
new file mode 100644
index 0000000000..994cf8327c
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/masterslave/ReflectiveNodeConnectionFactory.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.masterslave;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.concurrent.CompletableFuture;
+
+import com.lambdaworks.redis.RedisClient;
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.codec.RedisCodec;
+
+/**
+ * {@link NodeConnectionFactory} implementation that operates via reflection on {@link RedisClient}. Using reflection does not
+ * require utility methods to leak on the API.
+ * 
+ * @author Mark Paluch
+ */
+@SuppressWarnings("unchecked")
+class ReflectiveNodeConnectionFactory implements NodeConnectionFactory {
+
+    private final Method connectToNodeAsync;
+    private final RedisClient client;
+
+    protected ReflectiveNodeConnectionFactory(RedisClient client) {
+
+        this.client = client;
+
+        try {
+            connectToNodeAsync = RedisClient.class.getDeclaredMethod("connectStandaloneAsync", RedisCodec.class,
+                    RedisURI.class);
+            connectToNodeAsync.setAccessible(true);
+        } catch (NoSuchMethodException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    @Override
+    public <K, V> CompletableFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisCodec<K, V> codec,
+            RedisURI redisURI) {
+        try {
+            return (CompletableFuture<StatefulRedisConnection<K, V>>) connectToNodeAsync.invoke(client, codec, redisURI);
+        } catch (IllegalAccessException e) {
+            throw new IllegalStateException(e);
+        } catch (InvocationTargetException e) {
+
+            if (e.getCause() instanceof RuntimeException) {
+                throw (RuntimeException) e.getCause();
+            }
+            throw new IllegalStateException(e.getCause());
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/RefreshFutures.java b/src/main/java/com/lambdaworks/redis/masterslave/RefreshFutures.java
new file mode 100644
index 0000000000..679712a5bf
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/masterslave/RefreshFutures.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.masterslave;
+
+import java.util.Collection;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author Mark Paluch
+ */
+class RefreshFutures {
+
+    /**
+     * Await for either future completion or to reach the timeout. Successful/exceptional future completion is not substantial.
+     * 
+     * @param timeout the timeout value.
+     * @param timeUnit timeout unit.
+     * @param futures {@link Collection} of {@literal Future}s.
+     * @return time awaited in {@link TimeUnit#NANOSECONDS}.
+     * @throws InterruptedException
+     */
+    static long awaitAll(long timeout, TimeUnit timeUnit, Collection<? extends Future<?>> futures) throws InterruptedException {
+
+        long waitTime = 0;
+
+        for (Future<?> future : futures) {
+
+            long timeoutLeft = timeUnit.toNanos(timeout) - waitTime;
+
+            if (timeoutLeft <= 0) {
+                break;
+            }
+
+            long startWait = System.nanoTime();
+
+            try {
+                future.get(timeoutLeft, TimeUnit.NANOSECONDS);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw e;
+            } catch (Exception e) {
+                continue;
+            } finally {
+                waitTime += System.nanoTime() - startWait;
+            }
+
+        }
+        return waitTime;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/Requests.java b/src/main/java/com/lambdaworks/redis/masterslave/Requests.java
new file mode 100644
index 0000000000..e9a20b13b2
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/masterslave/Requests.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.masterslave;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
+
+import com.lambdaworks.redis.RedisURI;
+
+/**
+ * Encapsulates asynchronously executed commands to multiple {@link RedisURI nodes}.
+ * 
+ * @author Mark Paluch
+ */
+class Requests {
+
+    private final Map<RedisURI, TimedAsyncCommand<String, String, String>> rawViews = new TreeMap<>(
+            MasterSlaveUtils.RedisURIComparator.INSTANCE);
+
+    public Requests() {
+    }
+
+    protected void addRequest(RedisURI redisURI, TimedAsyncCommand<String, String, String> command) {
+        rawViews.put(redisURI, command);
+    }
+
+    protected long await(long timeout, TimeUnit timeUnit) throws InterruptedException {
+        return RefreshFutures.awaitAll(timeout, timeUnit, rawViews.values());
+    }
+
+    protected Set<RedisURI> nodes() {
+        return rawViews.keySet();
+    }
+
+    protected TimedAsyncCommand<String, String, String> getRequest(RedisURI redisURI) {
+        return rawViews.get(redisURI);
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java b/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
index 2dd728f4c3..c87813fb78 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
@@ -145,7 +145,7 @@ private void initializeSentinels() {
     private void processMessage(String pattern, String channel, String message) {
 
         topologyRefresh.processMessage(channel, message, () -> {
-            LOG.debug("Received topology changed signal from Redis Sentinel, scheduling topology update");
+            LOG.debug("Received topology changed signal from Redis Sentinel ({}), scheduling topology update", channel);
             return () -> refreshRunnables.forEach(Runnable::run);
         });
 
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/TimedAsyncCommand.java b/src/main/java/com/lambdaworks/redis/masterslave/TimedAsyncCommand.java
new file mode 100644
index 0000000000..f595f9cefe
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/masterslave/TimedAsyncCommand.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.masterslave;
+
+import com.lambdaworks.redis.protocol.AsyncCommand;
+import com.lambdaworks.redis.protocol.RedisCommand;
+
+import io.netty.buffer.ByteBuf;
+
+/**
+ * Timed command that records the time at which the command was encoded and completed.
+ *
+ * @param <K> Key type
+ * @param <V> Value type
+ * @param <T> Result type
+ * @author Mark Paluch
+ */
+class TimedAsyncCommand<K, V, T> extends AsyncCommand<K, V, T> {
+
+    long encodedAtNs = -1;
+    long completedAtNs = -1;
+
+    public TimedAsyncCommand(RedisCommand<K, V, T> command) {
+        super(command);
+    }
+
+    @Override
+    public void encode(ByteBuf buf) {
+        completedAtNs = -1;
+        encodedAtNs = -1;
+
+        super.encode(buf);
+        encodedAtNs = System.nanoTime();
+    }
+
+    @Override
+    public void complete() {
+        completedAtNs = System.nanoTime();
+        super.complete();
+    }
+
+    public long duration() {
+        if (completedAtNs == -1 || encodedAtNs == -1) {
+            return -1;
+        }
+        return completedAtNs - encodedAtNs;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/TopologyComparators.java b/src/main/java/com/lambdaworks/redis/masterslave/TopologyComparators.java
new file mode 100644
index 0000000000..be98fbba0f
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/masterslave/TopologyComparators.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.masterslave;
+
+import java.util.Comparator;
+import java.util.Map;
+
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.models.role.RedisNodeDescription;
+
+/**
+ * Comparators for {@link RedisNodeDescription} and {@link RedisURI}.
+ *
+ * @author Mark Paluch
+ */
+class TopologyComparators {
+
+    /**
+     * Compare {@link RedisNodeDescription} based on their latency. Lowest comes first.
+     */
+    static class LatencyComparator implements Comparator<RedisNodeDescription> {
+
+        private final Map<RedisNodeDescription, Long> latencies;
+
+        public LatencyComparator(Map<RedisNodeDescription, Long> latencies) {
+            this.latencies = latencies;
+        }
+
+        @Override
+        public int compare(RedisNodeDescription o1, RedisNodeDescription o2) {
+
+            Long latency1 = latencies.get(o1);
+            Long latency2 = latencies.get(o2);
+
+            if (latency1 != null && latency2 != null) {
+                return latency1.compareTo(latency2);
+            }
+
+            if (latency1 != null) {
+                return -1;
+            }
+
+            if (latency2 != null) {
+                return 1;
+            }
+
+            return 0;
+        }
+    }
+
+    /**
+     * Compare {@link RedisURI} based on their host and port representation.
+     */
+    enum RedisURIComparator implements Comparator<RedisURI> {
+
+        INSTANCE;
+
+        @Override
+        public int compare(RedisURI o1, RedisURI o2) {
+            String h1 = "";
+            String h2 = "";
+
+            if (o1 != null) {
+                h1 = o1.getHost() + ":" + o1.getPort();
+            }
+
+            if (o2 != null) {
+                h2 = o2.getHost() + ":" + o2.getPort();
+            }
+
+            return h1.compareToIgnoreCase(h2);
+        }
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java b/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
index d2addc8b78..831ebc5675 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
@@ -30,7 +30,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
-import io.netty.util.concurrent.ImmediateEventExecutor;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,6 +48,8 @@
 import com.lambdaworks.redis.resource.ClientResources;
 import com.lambdaworks.redis.resource.DnsResolvers;
 
+import io.netty.util.concurrent.ImmediateEventExecutor;
+
 /**
  * @author Mark Paluch
  */
@@ -376,7 +377,7 @@ protected Requests createClusterNodesRequests(int duration, String nodes) {
         connections.addConnection(redisURI, connection);
 
         Requests requests = connections.requestTopology();
-        TimedAsyncCommand<String, String, String> command = requests.rawViews.get(redisURI);
+        TimedAsyncCommand<String, String, String> command = requests.getRequest(redisURI);
 
         command.getOutput().set(ByteBuffer.wrap(nodes.getBytes()));
         command.complete();
@@ -393,7 +394,7 @@ protected Requests createClientListRequests(int duration, String response) {
         connections.addConnection(redisURI, connection);
 
         Requests requests = connections.requestTopology();
-        TimedAsyncCommand<String, String, String> command = requests.rawViews.get(redisURI);
+        TimedAsyncCommand<String, String, String> command = requests.getRequest(redisURI);
 
         command.getOutput().set(ByteBuffer.wrap(response.getBytes()));
         command.complete();

From c7406ca1d39bee3ba0ddd86d7035089cbe94dc89 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 21 Dec 2016 12:13:28 +0100
Subject: [PATCH 104/808] Polishing

---
 .../topology/ClusterTopologyRefresh.java      |  4 ++--
 .../redis/cluster/topology/Connections.java   | 17 ++++++++--------
 .../cluster/topology/RefreshFutures.java      |  9 +++++++++
 .../redis/cluster/topology/Requests.java      | 20 ++++++++++---------
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
index 0629106d68..4e5ae11dfb 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
@@ -171,7 +171,7 @@ NodeTopologyViews getNodeSpecificViews(Requests requestedTopology, Requests requ
         }
 
         for (NodeTopologyView view : views) {
-            Collections.sort(view.getPartitions().getPartitions(), TopologyComparators.LatencyComparator.INSTANCE);
+            view.getPartitions().getPartitions().sort(TopologyComparators.LatencyComparator.INSTANCE);
             view.getPartitions().updateCache();
         }
 
@@ -236,7 +236,7 @@ private AsyncConnections getConnections(Iterable<RedisURI> redisURIs) throws Int
 
                 connections.addConnection(redisURI, sync);
             } catch (RuntimeException e) {
-                logger.warn(String.format("Cannot connect to %s", redisURI), e);
+                logger.warn(String.format("Unable to connect to %s", redisURI), e);
             }
         }
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java b/src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java
index 60e43e8022..f23c045662 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java
@@ -20,6 +20,7 @@
 
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.codec.StringCodec;
 import com.lambdaworks.redis.output.StatusOutput;
 import com.lambdaworks.redis.protocol.Command;
 import com.lambdaworks.redis.protocol.CommandArgs;
@@ -31,10 +32,10 @@
  */
 class Connections {
 
-    private Map<RedisURI, StatefulRedisConnection<String, String>> connections = new TreeMap<>(
-            TopologyComparators.RedisURIComparator.INSTANCE);
+    private final Map<RedisURI, StatefulRedisConnection<String, String>> connections;
 
     public Connections() {
+        connections = new TreeMap<>(TopologyComparators.RedisURIComparator.INSTANCE);
     }
 
     private Connections(Map<RedisURI, StatefulRedisConnection<String, String>> connections) {
@@ -73,9 +74,9 @@ public Requests requestTopology() {
 
         for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : connections.entrySet()) {
 
-            CommandArgs<String, String> args = new CommandArgs<>(ClusterTopologyRefresh.CODEC).add(CommandKeyword.NODES);
-            Command<String, String, String> command = new Command<>(CommandType.CLUSTER,
-                    new StatusOutput<>(ClusterTopologyRefresh.CODEC), args);
+            CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.NODES);
+            Command<String, String, String> command = new Command<>(CommandType.CLUSTER, new StatusOutput<>(StringCodec.UTF8),
+                    args);
             TimedAsyncCommand<String, String, String> timedCommand = new TimedAsyncCommand<>(command);
 
             entry.getValue().dispatch(timedCommand);
@@ -96,9 +97,9 @@ public Requests requestClients() {
 
         for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : connections.entrySet()) {
 
-            CommandArgs<String, String> args = new CommandArgs<>(ClusterTopologyRefresh.CODEC).add(CommandKeyword.LIST);
-            Command<String, String, String> command = new Command<>(CommandType.CLIENT,
-                    new StatusOutput<>(ClusterTopologyRefresh.CODEC), args);
+            CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.LIST);
+            Command<String, String, String> command = new Command<>(CommandType.CLIENT, new StatusOutput<>(StringCodec.UTF8),
+                    args);
             TimedAsyncCommand<String, String, String> timedCommand = new TimedAsyncCommand<>(command);
 
             entry.getValue().dispatch(timedCommand);
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/RefreshFutures.java b/src/main/java/com/lambdaworks/redis/cluster/topology/RefreshFutures.java
index 3a8463e427..57d03fdb59 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/RefreshFutures.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/RefreshFutures.java
@@ -24,6 +24,15 @@
  */
 class RefreshFutures {
 
+    /**
+     * Await for either future completion or to reach the timeout. Successful/exceptional future completion is not substantial.
+     *
+     * @param timeout the timeout value.
+     * @param timeUnit timeout unit.
+     * @param futures {@link Collection} of {@literal Future}s.
+     * @return time awaited in {@link TimeUnit#NANOSECONDS}.
+     * @throws InterruptedException
+     */
     static long awaitAll(long timeout, TimeUnit timeUnit, Collection<? extends Future<?>> futures) throws InterruptedException {
 
         long waitTime = 0;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java b/src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java
index 58fb8fcf3e..bf3a555fe7 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java
@@ -23,37 +23,39 @@
 import com.lambdaworks.redis.RedisURI;
 
 /**
+ * Encapsulates asynchronously executed commands to multiple {@link RedisURI nodes}.
+ * 
  * @author Mark Paluch
  */
 class Requests {
 
-    Map<RedisURI, TimedAsyncCommand<String, String, String>> rawViews = new TreeMap<>(
-            TopologyComparators.RedisURIComparator.INSTANCE);
+    private final Map<RedisURI, TimedAsyncCommand<String, String, String>> rawViews;
 
-    Requests() {
+    protected Requests() {
+        rawViews = new TreeMap<>(TopologyComparators.RedisURIComparator.INSTANCE);
     }
 
-    Requests(Map<RedisURI, TimedAsyncCommand<String, String, String>> rawViews) {
+    private Requests(Map<RedisURI, TimedAsyncCommand<String, String, String>> rawViews) {
         this.rawViews = rawViews;
     }
 
-    void addRequest(RedisURI redisURI, TimedAsyncCommand<String, String, String> command) {
+    protected void addRequest(RedisURI redisURI, TimedAsyncCommand<String, String, String> command) {
         rawViews.put(redisURI, command);
     }
 
-    long await(long timeout, TimeUnit timeUnit) throws InterruptedException {
+    protected long await(long timeout, TimeUnit timeUnit) throws InterruptedException {
         return RefreshFutures.awaitAll(timeout, timeUnit, rawViews.values());
     }
 
-    Set<RedisURI> nodes() {
+    protected Set<RedisURI> nodes() {
         return rawViews.keySet();
     }
 
-    TimedAsyncCommand<String, String, String> getRequest(RedisURI redisURI) {
+    protected TimedAsyncCommand<String, String, String> getRequest(RedisURI redisURI) {
         return rawViews.get(redisURI);
     }
 
-    Requests mergeWith(Requests requests) {
+    protected Requests mergeWith(Requests requests) {
 
         Map<RedisURI, TimedAsyncCommand<String, String, String>> result = new TreeMap<>(
                 TopologyComparators.RedisURIComparator.INSTANCE);

From 28d8eeed43bc3ce1ee8d867c344bd5ca4566ce3c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 21 Dec 2016 13:27:00 +0100
Subject: [PATCH 105/808] Adopt fixed GEODIST/GEOHASH behavior in tests #362

---
 .../java/com/lambdaworks/redis/commands/GeoCommandTest.java | 6 +++---
 .../redis/commands/reactive/GeoReactiveCommandTest.java     | 5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
index c7ce5e06b4..5e3ceec851 100644
--- a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
@@ -118,8 +118,7 @@ public void geodist() throws Exception {
         assertThat(result).isGreaterThan(2.5).isLessThan(2.9);
     }
 
-    // See https://github.com/antirez/redis/issues/3512 and https://github.com/mp911de/lettuce/issues/362
-    @Test(expected = RedisException.class)
+    @Test
     public void geodistMissingElements() throws Exception {
 
         prepareGeo();
@@ -256,7 +255,8 @@ public void geohashUnknownKey() throws Exception {
 
         List<Value<String>> geohash = redis.geohash("dunno", "member");
 
-        assertThat(geohash).isEmpty();
+        assertThat(geohash).hasSize(1);
+        assertThat(geohash.get(0)).isIn(null, Value.empty());
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
index 1291adece4..e497ce2e0a 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
@@ -61,9 +61,4 @@ public void geopos() throws Exception {
     @Override
     public void geoposWithTransaction() throws Exception {
     }
-
-    @Test(expected = NumberFormatException.class)
-    public void geodistMissingElements() throws Exception {
-        super.geodistMissingElements();
-    }
 }

From edf27eee6c84cfd9a4de3af7843b95fe8572ccc1 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 21 Dec 2016 17:25:14 +0100
Subject: [PATCH 106/808] Extend RedisConnectionStateListener.onRedisConnected
 by adding SocketAddress #419

---
 .../redis/ConnectionEventTrigger.java         |   2 +-
 .../lambdaworks/redis/ConnectionEvents.java   |   9 +-
 .../redis/RedisConnectionStateAdapter.java    |  42 ++++++
 .../redis/RedisConnectionStateListener.java   |  19 ++-
 .../com/lambdaworks/redis/ClientTest.java     |  94 +-----------
 .../redis/RedisClientListenerTest.java        | 134 ++++++++++++++++++
 6 files changed, 201 insertions(+), 99 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/RedisConnectionStateAdapter.java
 create mode 100644 src/test/java/com/lambdaworks/redis/RedisClientListenerTest.java

diff --git a/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java b/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java
index 2178838e16..dc90d6846b 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java
+++ b/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java
@@ -44,7 +44,7 @@ class ConnectionEventTrigger extends ChannelInboundHandlerAdapter {
 
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
-        connectionEvents.fireEventRedisConnected(connection);
+        connectionEvents.fireEventRedisConnected(connection, ctx.channel().remoteAddress());
         super.channelActive(ctx);
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionEvents.java b/src/main/java/com/lambdaworks/redis/ConnectionEvents.java
index 64bd6839bb..efe5636819 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionEvents.java
+++ b/src/main/java/com/lambdaworks/redis/ConnectionEvents.java
@@ -15,6 +15,7 @@
  */
 package com.lambdaworks.redis;
 
+import java.net.SocketAddress;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 
@@ -30,19 +31,19 @@ public class ConnectionEvents {
 
     private final Set<RedisConnectionStateListener> listeners = new ConcurrentSet<>();
 
-    protected void fireEventRedisConnected(RedisChannelHandler<?, ?> connection) {
+    void fireEventRedisConnected(RedisChannelHandler<?, ?> connection, SocketAddress socketAddress) {
         for (RedisConnectionStateListener listener : listeners) {
-            listener.onRedisConnected(connection);
+            listener.onRedisConnected(connection, socketAddress);
         }
     }
 
-    protected void fireEventRedisDisconnected(RedisChannelHandler<?, ?> connection) {
+    void fireEventRedisDisconnected(RedisChannelHandler<?, ?> connection) {
         for (RedisConnectionStateListener listener : listeners) {
             listener.onRedisDisconnected(connection);
         }
     }
 
-    protected void fireEventRedisExceptionCaught(RedisChannelHandler<?, ?> connection, Throwable cause) {
+    void fireEventRedisExceptionCaught(RedisChannelHandler<?, ?> connection, Throwable cause) {
         for (RedisConnectionStateListener listener : listeners) {
             listener.onRedisExceptionCaught(connection, cause);
         }
diff --git a/src/main/java/com/lambdaworks/redis/RedisConnectionStateAdapter.java b/src/main/java/com/lambdaworks/redis/RedisConnectionStateAdapter.java
new file mode 100644
index 0000000000..cda5404118
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/RedisConnectionStateAdapter.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis;
+
+import java.net.SocketAddress;
+
+/**
+ * Convenience adapter with an empty implementation of all {@link RedisConnectionStateListener} callback methods.
+ * 
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public class RedisConnectionStateAdapter implements RedisConnectionStateListener {
+
+    @Override
+    public void onRedisConnected(RedisChannelHandler<?, ?> connection, SocketAddress socketAddress) {
+        // empty adapter method
+    }
+
+    @Override
+    public void onRedisDisconnected(RedisChannelHandler<?, ?> connection) {
+        // empty adapter method
+    }
+
+    @Override
+    public void onRedisExceptionCaught(RedisChannelHandler<?, ?> connection, Throwable cause) {
+        // empty adapter method
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java b/src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java
index 9c1f199ee3..5d461a1513 100644
--- a/src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java
+++ b/src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java
@@ -15,10 +15,13 @@
  */
 package com.lambdaworks.redis;
 
+import java.net.SocketAddress;
+
 /**
  * Simple interface for Redis connection state monitoring.
  * 
  * @author ze
+ * @author Mark Paluch
  */
 public interface RedisConnectionStateListener {
 
@@ -26,8 +29,22 @@ public interface RedisConnectionStateListener {
      * Event handler for successful connection event.
      * 
      * @param connection Source connection.
+     * @deprecated since 4.4, use {@link RedisConnectionStateListener#onRedisConnected(RedisChannelHandler, SocketAddress)}.
+     */
+    @Deprecated
+    default void onRedisConnected(RedisChannelHandler<?, ?> connection) {
+    }
+
+    /**
+     * Event handler for successful connection event. Delegates by default to {@link #onRedisConnected(RedisChannelHandler)}.
+     *
+     * @param connection Source connection.
+     * @param socketAddress remote {@link SocketAddress}.
+     * @since 4.4
      */
-    void onRedisConnected(RedisChannelHandler<?, ?> connection);
+    default void onRedisConnected(RedisChannelHandler<?, ?> connection, SocketAddress socketAddress) {
+        onRedisConnected(connection);
+    }
 
     /**
      * Event handler for disconnection event.
diff --git a/src/test/java/com/lambdaworks/redis/ClientTest.java b/src/test/java/com/lambdaworks/redis/ClientTest.java
index f1873dd64d..a4859c5182 100644
--- a/src/test/java/com/lambdaworks/redis/ClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientTest.java
@@ -15,21 +15,17 @@
  */
 package com.lambdaworks.redis;
 
-import static com.google.code.tempusfugit.temporal.Duration.seconds;
-import static com.google.code.tempusfugit.temporal.WaitFor.waitOrTimeout;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.TestClientResources;
 import org.junit.FixMethodOrder;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runners.MethodSorters;
 
-import com.google.code.tempusfugit.temporal.Condition;
-import com.google.code.tempusfugit.temporal.Timeout;
+import com.lambdaworks.TestClientResources;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
 
@@ -78,71 +74,6 @@ public void statefulConnectionFromReactive() throws Exception {
         async.getStatefulConnection().close();
     }
 
-    @Test
-    public void listenerTest() throws Exception {
-
-        final TestConnectionListener listener = new TestConnectionListener();
-
-        RedisClient client = RedisClient.create(RedisURI.Builder.redis(host, port).build());
-
-        client.addListener(listener);
-
-        assertThat(listener.onConnected).isNull();
-        assertThat(listener.onDisconnected).isNull();
-        assertThat(listener.onException).isNull();
-
-        RedisAsyncCommands<String, String> connection = client.connect().async();
-
-        StatefulRedisConnection<String, String> statefulRedisConnection = connection.getStatefulConnection();
-
-        waitOrTimeout(() -> listener.onConnected != null, Timeout.timeout(seconds(2)));
-
-        assertThat(listener.onConnected).isEqualTo(statefulRedisConnection);
-        assertThat(listener.onDisconnected).isNull();
-
-        connection.set(key, value).get();
-        connection.getStatefulConnection().close();
-
-        waitOrTimeout(new Condition() {
-
-            @Override
-            public boolean isSatisfied() {
-                return listener.onDisconnected != null;
-            }
-        }, Timeout.timeout(seconds(2)));
-
-        assertThat(listener.onConnected).isEqualTo(statefulRedisConnection);
-        assertThat(listener.onDisconnected).isEqualTo(statefulRedisConnection);
-
-        FastShutdown.shutdown(client);
-    }
-
-    @Test
-    public void listenerTestWithRemoval() throws Exception {
-
-        final TestConnectionListener removedListener = new TestConnectionListener();
-        final TestConnectionListener retainedListener = new TestConnectionListener();
-
-        RedisClient client = RedisClient.create(RedisURI.Builder.redis(host, port).build());
-        client.addListener(removedListener);
-        client.addListener(retainedListener);
-        client.removeListener(removedListener);
-
-        // that's the sut call
-        client.connect().async();
-
-        waitOrTimeout(() -> retainedListener.onConnected != null, Timeout.timeout(seconds(2)));
-
-        assertThat(retainedListener.onConnected).isNotNull();
-
-        assertThat(removedListener.onConnected).isNull();
-        assertThat(removedListener.onDisconnected).isNull();
-        assertThat(removedListener.onException).isNull();
-
-        FastShutdown.shutdown(client);
-
-    }
-
     @Test(expected = RedisException.class)
     public void timeout() throws Exception {
         redis.setTimeout(0, TimeUnit.MICROSECONDS);
@@ -189,29 +120,6 @@ public void connectPubSubFailure() throws Exception {
         FastShutdown.shutdown(client);
     }
 
-    private class TestConnectionListener implements RedisConnectionStateListener {
-
-        public RedisChannelHandler<?, ?> onConnected;
-        public RedisChannelHandler<?, ?> onDisconnected;
-        public RedisChannelHandler<?, ?> onException;
-
-        @Override
-        public void onRedisConnected(RedisChannelHandler<?, ?> connection) {
-            onConnected = connection;
-        }
-
-        @Override
-        public void onRedisDisconnected(RedisChannelHandler<?, ?> connection) {
-            onDisconnected = connection;
-        }
-
-        @Override
-        public void onRedisExceptionCaught(RedisChannelHandler<?, ?> connection, Throwable cause) {
-            onException = connection;
-
-        }
-    }
-
     @Test
     public void emptyClient() throws Exception {
 
diff --git a/src/test/java/com/lambdaworks/redis/RedisClientListenerTest.java b/src/test/java/com/lambdaworks/redis/RedisClientListenerTest.java
new file mode 100644
index 0000000000..76f70bb341
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/RedisClientListenerTest.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis;
+
+import static com.google.code.tempusfugit.temporal.Duration.seconds;
+import static com.google.code.tempusfugit.temporal.WaitFor.waitOrTimeout;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.net.SocketAddress;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.google.code.tempusfugit.temporal.Timeout;
+import com.lambdaworks.TestClientResources;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.resource.ClientResources;
+
+/**
+ * Integration tests for {@link RedisConnectionStateListener} via {@link RedisClient}.
+ * 
+ * @author Mark Paluch
+ */
+public class RedisClientListenerTest extends AbstractTest {
+
+    private static ClientResources DEFAULT_RESOURCES;
+
+    @BeforeClass
+    public static void beforeClass() throws Exception {
+        DEFAULT_RESOURCES = TestClientResources.create();
+    }
+
+    @AfterClass
+    public static void afterClass() throws Exception {
+        DEFAULT_RESOURCES.shutdown(100, 100, TimeUnit.MILLISECONDS).get();
+    }
+
+    @Test
+    public void shouldNotifyListener() throws Exception {
+
+        final TestConnectionListener listener = new TestConnectionListener();
+
+        RedisClient client = RedisClient.create(DEFAULT_RESOURCES, RedisURI.Builder.redis(host, port).build());
+
+        client.addListener(listener);
+
+        assertThat(listener.onConnected).isNull();
+        assertThat(listener.onDisconnected).isNull();
+        assertThat(listener.onException).isNull();
+
+        StatefulRedisConnection<String, String> connection = client.connect();
+
+        waitOrTimeout(() -> listener.onConnected != null, Timeout.timeout(seconds(2)));
+        assertThat(listener.onConnectedSocketAddress).isNotNull();
+
+        assertThat(listener.onConnected).isEqualTo(connection);
+        assertThat(listener.onDisconnected).isNull();
+
+        connection.sync().set(key, value);
+        connection.close();
+
+        waitOrTimeout(() -> listener.onDisconnected != null, Timeout.timeout(seconds(2)));
+
+        assertThat(listener.onConnected).isEqualTo(connection);
+        assertThat(listener.onDisconnected).isEqualTo(connection);
+
+        FastShutdown.shutdown(client);
+    }
+
+    @Test
+    public void shouldNotNotifyListenerAfterRemoval() throws Exception {
+
+        final TestConnectionListener removedListener = new TestConnectionListener();
+        final TestConnectionListener retainedListener = new TestConnectionListener();
+
+        RedisClient client = RedisClient.create(DEFAULT_RESOURCES, RedisURI.Builder.redis(host, port).build());
+        client.addListener(removedListener);
+        client.addListener(retainedListener);
+        client.removeListener(removedListener);
+
+        // that's the sut call
+        client.connect().close();
+
+        waitOrTimeout(() -> retainedListener.onConnected != null, Timeout.timeout(seconds(2)));
+
+        assertThat(retainedListener.onConnected).isNotNull();
+
+        assertThat(removedListener.onConnected).isNull();
+        assertThat(removedListener.onConnectedSocketAddress).isNull();
+        assertThat(removedListener.onDisconnected).isNull();
+        assertThat(removedListener.onException).isNull();
+
+        FastShutdown.shutdown(client);
+    }
+
+    private class TestConnectionListener implements RedisConnectionStateListener {
+
+        volatile SocketAddress onConnectedSocketAddress;
+        volatile RedisChannelHandler<?, ?> onConnected;
+        volatile RedisChannelHandler<?, ?> onDisconnected;
+        volatile RedisChannelHandler<?, ?> onException;
+
+        @Override
+        public void onRedisConnected(RedisChannelHandler<?, ?> connection, SocketAddress socketAddress) {
+            onConnected = connection;
+            onConnectedSocketAddress = socketAddress;
+        }
+
+        @Override
+        public void onRedisDisconnected(RedisChannelHandler<?, ?> connection) {
+            onDisconnected = connection;
+        }
+
+        @Override
+        public void onRedisExceptionCaught(RedisChannelHandler<?, ?> connection, Throwable cause) {
+            onException = connection;
+        }
+    }
+}

From f7fabffb004d1fa0a2f135c98ad0eb6e99fe7468 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 23 Dec 2016 10:59:05 +0100
Subject: [PATCH 107/808] Consider Wildcard types in type information and
 assignability #431

---
 .../support/GenericArrayTypeInformation.java  |   2 +-
 .../support/ParametrizedTypeInformation.java  |  22 ++-
 .../redis/dynamic/support/TypeDiscoverer.java |  40 ++---
 .../support/TypeVariableTypeInformation.java  |  24 ++-
 .../support/WildcardTypeInformation.java      |  79 ++++++++++
 .../ParametrizedTypeInformationTest.java      | 141 ++++++++++++++++++
 .../support/WildcardTypeInformationTest.java  | 130 ++++++++++++++++
 7 files changed, 411 insertions(+), 27 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformation.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformationTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformationTest.java

diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java
index cc67c7743f..26bad0ac3c 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java
@@ -46,7 +46,7 @@ protected GenericArrayTypeInformation(GenericArrayType type, TypeDiscoverer<?> p
     @Override
     @SuppressWarnings("unchecked")
     public Class<S> getType() {
-        return (Class<S>) Array.newInstance(resolveType(type.getGenericComponentType()), 0).getClass();
+        return (Class<S>) Array.newInstance(resolveClass(type.getGenericComponentType()), 0).getClass();
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java
index 014cb1dc4a..d5b115887d 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java
@@ -64,7 +64,7 @@ protected TypeInformation<?> doGetMapValueType() {
 
         for (Type supertype : supertypes) {
 
-            Class<?> rawSuperType = resolveType(supertype);
+            Class<?> rawSuperType = resolveClass(supertype);
 
             if (Map.class.isAssignableFrom(rawSuperType)) {
 
@@ -74,13 +74,13 @@ protected TypeInformation<?> doGetMapValueType() {
             }
         }
 
-        return super.getMapValueType();
+        return super.doGetMapValueType();
     }
 
     @Override
     public List<TypeInformation<?>> getTypeArguments() {
 
-        List<TypeInformation<?>> result = new ArrayList<TypeInformation<?>>();
+        List<TypeInformation<?>> result = new ArrayList<>();
 
         for (Type argument : type.getActualTypeArguments()) {
             result.add(createInfo(argument));
@@ -114,9 +114,21 @@ public boolean isAssignableFrom(TypeInformation<?> target) {
         }
 
         for (int i = 0; i < myParameters.size(); i++) {
-            if (!myParameters.get(i).isAssignableFrom(typeParameters.get(i))) {
-                return false;
+
+            if (myParameters.get(i) instanceof WildcardTypeInformation) {
+                if (!myParameters.get(i).isAssignableFrom(typeParameters.get(i))) {
+                    return false;
+                }
+            } else {
+                if (!myParameters.get(i).getType().equals(typeParameters.get(i).getType())) {
+                    return false;
+                }
+
+                if (!myParameters.get(i).isAssignableFrom(typeParameters.get(i))) {
+                    return false;
+                }
             }
+
         }
 
         return true;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java
index d3b16a66e2..e4bbf4f3b6 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java
@@ -17,7 +17,6 @@
 
 import java.lang.reflect.*;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 
 import com.lambdaworks.redis.internal.LettuceAssert;
 
@@ -28,7 +27,6 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
 
     private final Type type;
     private final Map<TypeVariable<?>, Type> typeVariableMap;
-    private final Map<String, TypeInformation<?>> fieldTypes = new ConcurrentHashMap<String, TypeInformation<?>>();
     private final int hashCode;
 
     private boolean componentTypeResolved = false;
@@ -40,7 +38,7 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
     private Class<S> resolvedType;
 
     /**
-     * Creates a ne {@link TypeDiscoverer} for the given type, type variable map and parent.
+     * Creates a new {@link TypeDiscoverer} for the given type and type variable map.
      * 
      * @param type must not be {@literal null}.
      * @param typeVariableMap must not be {@literal null}.
@@ -48,6 +46,7 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
     protected TypeDiscoverer(Type type, Map<TypeVariable<?>, Type> typeVariableMap) {
 
         LettuceAssert.notNull(type, "Type must not be null");
+        LettuceAssert.notNull(typeVariableMap, "TypeVariableMap must not be null");
 
         this.type = type;
         this.typeVariableMap = typeVariableMap;
@@ -80,7 +79,7 @@ protected TypeInformation<?> createInfo(Type fieldType) {
             return new ClassTypeInformation((Class<?>) fieldType);
         }
 
-        Class<S> resolveType = resolveType(fieldType);
+        Class<S> resolveType = resolveClass(fieldType);
         Map<TypeVariable, Type> variableMap = new HashMap<TypeVariable, Type>();
         variableMap.putAll(GenericTypeResolver.getTypeVariableMap(resolveType));
 
@@ -110,17 +109,7 @@ protected TypeInformation<?> createInfo(Type fieldType) {
         if (fieldType instanceof WildcardType) {
 
             WildcardType wildcardType = (WildcardType) fieldType;
-            Type[] bounds = wildcardType.getLowerBounds();
-
-            if (bounds.length > 0) {
-                return createInfo(bounds[0]);
-            }
-
-            bounds = wildcardType.getUpperBounds();
-
-            if (bounds.length > 0) {
-                return createInfo(bounds[0]);
-            }
+            return new WildcardTypeInformation(wildcardType, variableMap);
         }
 
         throw new IllegalArgumentException();
@@ -132,8 +121,8 @@ protected TypeInformation<?> createInfo(Type fieldType) {
      * @param type
      * @return
      */
-    @SuppressWarnings({ "unchecked", "rawtypes", "deprecation" })
-    protected Class<S> resolveType(Type type) {
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    protected Class<S> resolveClass(Type type) {
 
         Map<TypeVariable, Type> map = new HashMap<TypeVariable, Type>();
         map.putAll(getTypeVariableMap());
@@ -141,6 +130,21 @@ protected Class<S> resolveType(Type type) {
         return (Class<S>) ResolvableType.forType(type, new TypeVariableMapVariableResolver(map)).resolve(Object.class);
     }
 
+    /**
+     * Resolves the given type into a {@link Type}.
+     *
+     * @param type
+     * @return
+     */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    protected Type resolveType(Type type) {
+
+        Map<TypeVariable, Type> map = new HashMap<>();
+        map.putAll(getTypeVariableMap());
+
+        return ResolvableType.forType(type, new TypeVariableMapVariableResolver(map)).resolveType().getType();
+    }
+
     public List<TypeInformation<?>> getParameterTypes(Constructor<?> constructor) {
 
         LettuceAssert.notNull(constructor, "Constructor must not be null!");
@@ -158,7 +162,7 @@ public List<TypeInformation<?>> getParameterTypes(Constructor<?> constructor) {
     public Class<S> getType() {
 
         if (resolvedType == null) {
-            this.resolvedType = resolveType(type);
+            this.resolvedType = resolveClass(type);
         }
 
         return this.resolvedType;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java
index 8d94a71bdd..3d0ffae9fa 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java
@@ -18,6 +18,8 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import com.lambdaworks.redis.internal.LettuceAssert;
@@ -57,10 +59,10 @@ public Class<T> getType() {
 
         if (owningType instanceof ParameterizedType && index != -1) {
             Type fieldType = ((ParameterizedType) owningType).getActualTypeArguments()[index];
-            return resolveType(fieldType);
+            return resolveClass(fieldType);
         }
 
-        return resolveType(variable);
+        return resolveClass(variable);
     }
 
     /**
@@ -71,7 +73,7 @@ public Class<T> getType() {
      */
     private int getIndex(TypeVariable<?> variable) {
 
-        Class<?> rawType = resolveType(owningType);
+        Class<?> rawType = resolveClass(owningType);
         TypeVariable<?>[] typeParameters = rawType.getTypeParameters();
 
         for (int i = 0; i < typeParameters.length; i++) {
@@ -83,6 +85,22 @@ private int getIndex(TypeVariable<?> variable) {
         return -1;
     }
 
+    @Override
+    public List<TypeInformation<?>> getTypeArguments() {
+
+        List<TypeInformation<?>> result = new ArrayList<>();
+
+        Type type = resolveType(variable);
+        if (type instanceof ParameterizedType) {
+
+            for (Type typeArgument : ((ParameterizedType) type).getActualTypeArguments()) {
+                result.add(createInfo(typeArgument));
+            }
+        }
+
+        return result;
+    }
+
     @Override
     public boolean equals(Object obj) {
 
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformation.java
new file mode 100644
index 0000000000..47680f3530
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformation.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic.support;
+
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * {@link TypeInformation} for a {@link WildcardType}.
+ */
+class WildcardTypeInformation<S> extends TypeDiscoverer<S> {
+
+    private final WildcardType type;
+
+    /**
+     * Creates a new {@link WildcardTypeInformation} for the given type, type variable map.
+     *
+     * @param type must not be {@literal null}.
+     * @param typeVariableMap must not be {@literal null}.
+     */
+    protected WildcardTypeInformation(WildcardType type, Map<TypeVariable<?>, Type> typeVariableMap) {
+
+        super(type, typeVariableMap);
+        this.type = type;
+    }
+
+    @Override
+    public boolean isAssignableFrom(TypeInformation<?> target) {
+
+        for (TypeInformation<?> lowerBound : getLowerBounds()) {
+            if (!target.isAssignableFrom(lowerBound)) {
+                return false;
+            }
+        }
+
+        for (TypeInformation<?> upperBound : getUpperBounds()) {
+            if (!upperBound.isAssignableFrom(target)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public List<TypeInformation<?>> getUpperBounds() {
+        return getBounds(type.getUpperBounds());
+    }
+
+    public List<TypeInformation<?>> getLowerBounds() {
+        return getBounds(type.getLowerBounds());
+    }
+
+    private List<TypeInformation<?>> getBounds(Type[] bounds) {
+
+        List<TypeInformation<?>> typeInformations = new ArrayList<>(bounds.length);
+
+        Arrays.stream(bounds).map(this::createInfo).forEach(typeInformations::add);
+
+        return typeInformations;
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformationTest.java b/src/test/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformationTest.java
new file mode 100644
index 0000000000..d5c05cbf05
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformationTest.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic.support;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.Test;
+
+/**
+ * @author Mark Paluch
+ */
+public class ParametrizedTypeInformationTest {
+
+    @Test
+    public void isAssignableShouldConsiderExactType() throws Exception {
+
+        TypeInformation<Object> target = ClassTypeInformation
+                .fromReturnTypeOf(ReflectionUtils.findMethod(TestType.class, "exactNumber"));
+
+        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfNumber.class))).isTrue();
+        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfInteger.class))).isFalse();
+        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfString.class))).isFalse();
+    }
+
+    @Test
+    public void isAssignableShouldConsiderCompatibleType() throws Exception {
+
+        TypeInformation<Object> target = ClassTypeInformation
+                .fromReturnTypeOf(ReflectionUtils.findMethod(TestType.class, "collectionOfNumber"));
+
+        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfNumber.class))).isTrue();
+        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfInteger.class))).isFalse();
+        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfString.class))).isFalse();
+    }
+
+    @Test
+    public void isAssignableShouldConsiderWildcardOfNumberType() throws Exception {
+
+        TypeInformation<Object> target = ClassTypeInformation
+                .fromReturnTypeOf(ReflectionUtils.findMethod(TestType.class, "numberOrSubtype"));
+
+        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfNumber.class))).isTrue();
+        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfInteger.class))).isTrue();
+        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfString.class))).isFalse();
+    }
+
+    @Test
+    public void isAssignableShouldConsiderWildcard() throws Exception {
+
+        TypeInformation<Object> target = ClassTypeInformation
+                .fromReturnTypeOf(ReflectionUtils.findMethod(TestType.class, "anything"));
+
+        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfNumber.class))).isTrue();
+        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfInteger.class))).isTrue();
+        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfString.class))).isTrue();
+    }
+
+    @Test
+    public void returnsNullMapValueTypeForNonMapProperties() {
+
+        TypeInformation<?> valueType = ClassTypeInformation.from(Bar.class).getSuperTypeInformation(List.class);
+        TypeInformation<?> mapValueType = valueType.getMapValueType();
+
+        assertThat(valueType).isInstanceOf(ParametrizedTypeInformation.class);
+        assertThat(mapValueType).isNull();
+    }
+
+    @Test
+    public void isAssignableShouldConsiderNestedParameterTypes() throws Exception {
+
+        TypeInformation<Object> target = ClassTypeInformation
+                .fromReturnTypeOf(ReflectionUtils.findMethod(TestType.class, "collectionOfIterableOfNumber"));
+
+        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfIterableOfNumber.class))).isTrue();
+        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfIterableOfInteger.class))).isFalse();
+        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfListOfNumber.class))).isFalse();
+        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfSetOfNumber.class))).isFalse();
+    }
+
+    interface Bar extends List<String> {
+
+    }
+
+    static interface TestType {
+
+        Collection<Number> collectionOfNumber();
+
+        Collection<Iterable<Number>> collectionOfIterableOfNumber();
+
+        List<Number> exactNumber();
+
+        List<?> anything();
+
+        List<? extends Number> numberOrSubtype();
+    }
+
+    static interface ListOfNumber extends List<Number> {
+
+    }
+
+    static interface ListOfIterableOfNumber extends List<Iterable<Number>> {
+
+    }
+
+    static interface ListOfSetOfNumber extends List<Set<Number>> {
+
+    }
+
+    static interface ListOfIterableOfInteger extends List<Iterable<Integer>> {
+
+    }
+
+    static interface ListOfListOfNumber extends List<List<Number>> {
+
+    }
+
+    static interface ListOfString extends List<String> {
+
+    }
+
+    static interface ListOfInteger extends List<Integer> {
+
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformationTest.java b/src/test/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformationTest.java
new file mode 100644
index 0000000000..a3b0825aea
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformationTest.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic.support;
+
+import static com.lambdaworks.redis.dynamic.support.ClassTypeInformation.from;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.List;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * @author Mark Paluch
+ */
+public class WildcardTypeInformationTest {
+
+    @Test
+    public void shouldResolveWildcardType() {
+
+        TypeInformation<Object> information = ClassTypeInformation.fromReturnTypeOf(methodOf("listOfAnything"));
+
+        assertThat(information.getComponentType()).isInstanceOf(WildcardTypeInformation.class);
+    }
+
+    @Test
+    public void isAssignableFromExactType() {
+
+        TypeInformation<Object> information = ClassTypeInformation.fromReturnTypeOf(methodOf("listOfAnything"));
+        TypeInformation<Object> compatible = ClassTypeInformation.fromReturnTypeOf(methodOf("anotherListOfAnything"));
+
+        assertThat(information.isAssignableFrom(compatible)).isTrue();
+    }
+
+    @Test
+    public void isAssignableFromCompatibleFirstLevelType() {
+
+        TypeInformation<Object> target = ClassTypeInformation.fromReturnTypeOf(methodOf("collectionOfAnything"));
+        TypeInformation<Object> source = ClassTypeInformation.fromReturnTypeOf(methodOf("anotherListOfAnything"));
+
+        assertThat(target.isAssignableFrom(source)).isTrue();
+    }
+
+    @Test
+    public void isAssignableFromCompatibleComponentType() {
+
+        TypeInformation<Object> target = ClassTypeInformation.fromReturnTypeOf(methodOf("listOfAnything"));
+        TypeInformation<Object> source = ClassTypeInformation.fromReturnTypeOf(methodOf("exactNumber"));
+
+        assertThat(target.isAssignableFrom(source)).isTrue();
+        assertThat(target.isAssignableFrom(ClassTypeInformation.SET)).isFalse();
+    }
+
+    @Test
+    public void isAssignableFromUpperBoundComponentType() {
+
+        TypeInformation<?> target = componentTypeOf("atMostInteger");
+
+        assertThat(target.isAssignableFrom(from(Integer.class))).isTrue();
+        assertThat(target.isAssignableFrom(from(Number.class))).isTrue();
+        assertThat(target.isAssignableFrom(from(Float.class))).isFalse();
+    }
+
+    @Test
+    public void isAssignableFromLowerBoundComponentType() {
+
+        TypeInformation<?> target = componentTypeOf("atLeastNumber");
+
+        assertThat(target.isAssignableFrom(from(Integer.class))).isTrue();
+        assertThat(target.isAssignableFrom(from(Number.class))).isTrue();
+        assertThat(target.isAssignableFrom(from(Float.class))).isTrue();
+        assertThat(target.isAssignableFrom(from(String.class))).isFalse();
+        assertThat(target.isAssignableFrom(from(Object.class))).isFalse();
+    }
+
+    @Test
+    @Ignore("Method-level variables not supported")
+    public void isAssignableFromParametrizedWildcardType() {
+
+        TypeInformation<?> target = componentTypeOf("numberOrSubtype");
+
+        assertThat(target.isAssignableFrom(from(Integer.class))).isTrue();
+        assertThat(target.isAssignableFrom(from(Number.class))).isTrue();
+        assertThat(target.isAssignableFrom(from(Float.class))).isTrue();
+        assertThat(target.isAssignableFrom(from(String.class))).isFalse();
+        assertThat(target.isAssignableFrom(from(Object.class))).isFalse();
+    }
+
+    protected TypeInformation<?> componentTypeOf(String name) {
+        return ClassTypeInformation.fromReturnTypeOf(methodOf(name)).getComponentType();
+    }
+
+    protected Method methodOf(String name) {
+        return ReflectionUtils.findMethod(GenericReturnTypes.class, name);
+    }
+
+    static interface GenericReturnTypes {
+
+        List<Number> exactNumber();
+
+        List<?> listOfAnything();
+
+        List<?> anotherListOfAnything();
+
+        Collection<?> collectionOfAnything();
+
+        List<? super Integer> atMostInteger();
+
+        List<Float> exactFloat();
+
+        List<? extends Number> atLeastNumber();
+
+        <T extends Number> List<? super T> numberOrSubtype();
+    }
+}
\ No newline at end of file

From 7f80a1d80046a9a8a30f3f1172a548a18e295227 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 23 Dec 2016 20:43:28 +0100
Subject: [PATCH 108/808] Use ResolvableType for type resolution #426

ResolvableType correctly determines assignability considering wildcards and parametrized assignability.  OutputRegistryCommandOutputFactoryResolver now uses a List to retain OutputRegistry ordering.
---
 .../redis/dynamic/CommandMethod.java          | 30 +++---
 .../dynamic/CommandSegmentCommandFactory.java |  2 +-
 .../CodecAwareOutputFactoryResolver.java      | 56 +----------
 .../output/CommandOutputResolverSupport.java  | 50 +---------
 .../redis/dynamic/output/OutputRegistry.java  | 95 ++++++++++++++-----
 ...tRegistryCommandOutputFactoryResolver.java | 11 +--
 .../redis/dynamic/output/OutputSelector.java  | 93 +++++-------------
 .../redis/dynamic/output/OutputType.java      | 24 ++---
 .../dynamic/support/ClassTypeInformation.java |  2 +-
 .../redis/dynamic/support/ResolvableType.java |  8 +-
 .../redis/dynamic/support/TypeDiscoverer.java |  9 +-
 .../dynamic/support/TypeInformation.java      |  7 ++
 .../redis/dynamic/CommandMethodTest.java      |  8 +-
 .../output/CodecAwareOutputResolverTest.java  | 20 +---
 ...istryCommandOutputFactoryResolverTest.java | 59 ++++++++++--
 .../dynamic/output/OutputRegistryTest.java    | 88 ++++++++++++-----
 .../ParametrizedTypeInformationTest.java      |  1 -
 .../support/WildcardTypeInformationTest.java  | 16 ----
 18 files changed, 272 insertions(+), 307 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
index f2585aa281..c0fcbd28cc 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
@@ -27,7 +27,7 @@
 import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
 import com.lambdaworks.redis.dynamic.parameter.Parameter;
 import com.lambdaworks.redis.dynamic.parameter.Parameters;
-import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
+import com.lambdaworks.redis.dynamic.support.ResolvableType;
 import com.lambdaworks.redis.dynamic.support.TypeInformation;
 import com.lambdaworks.redis.internal.LettuceAssert;
 
@@ -41,10 +41,10 @@
 public class CommandMethod {
 
     private final Method method;
-    private final TypeInformation<?> returnType;
+    private final ResolvableType returnType;
     private final List<Class<?>> arguments = new ArrayList<>();
     private final Parameters<? extends Parameter> parameters;
-    private final TypeInformation<?> actualReturnType;
+    private final ResolvableType actualReturnType;
 
     /**
      * Create a new {@link CommandMethod} given a {@link Method}.
@@ -67,15 +67,21 @@ public CommandMethod(Method method, Parameters<?> parameters) {
         LettuceAssert.notNull(parameters, "Parameters must not be null");
 
         this.method = method;
-        this.returnType = ClassTypeInformation.fromReturnTypeOf(method);
+        this.returnType = ResolvableType.forMethodReturnType(method);
         this.parameters = parameters;
         Collections.addAll(arguments, method.getParameterTypes());
 
-        TypeInformation<?> actualReturnType = this.returnType;
+        ResolvableType actualReturnType = this.returnType;
 
-        while (Future.class.isAssignableFrom(actualReturnType.getType())
-                || ReactiveTypes.supports(actualReturnType.getType())) {
-            actualReturnType = actualReturnType.getComponentType();
+        while (Future.class.isAssignableFrom(actualReturnType.getRawClass())
+                || ReactiveTypes.supports(actualReturnType.getRawClass())) {
+            ResolvableType[] generics = actualReturnType.getGenerics();
+
+            if (generics.length != 1) {
+                break;
+            }
+
+            actualReturnType = generics[0];
         }
 
         this.actualReturnType = actualReturnType;
@@ -101,7 +107,7 @@ public Method getMethod() {
      *
      * @return declared {@link Method} return {@link TypeInformation}.
      */
-    public TypeInformation<?> getReturnType() {
+    public ResolvableType getReturnType() {
         return returnType;
     }
 
@@ -109,7 +115,7 @@ public TypeInformation<?> getReturnType() {
      *
      * @return the actual {@link Method} return {@link TypeInformation} after unwrapping.
      */
-    public TypeInformation<?> getActualReturnType() {
+    public ResolvableType getActualReturnType() {
         return actualReturnType;
     }
 
@@ -145,7 +151,7 @@ public String getName() {
      * @return {@literal true} if the method uses asynchronous execution declaring {@link Future} as result type.
      */
     public boolean isFutureExecution() {
-        return Future.class.isAssignableFrom(getReturnType().getType());
+        return Future.class.isAssignableFrom(getReturnType().getRawClass());
     }
 
     /**
@@ -153,7 +159,7 @@ public boolean isFutureExecution() {
      * @return {@literal true} if the method uses reactive execution declaring {@link Publisher} as result type.
      */
     public boolean isReactiveExecution() {
-        return ReactiveTypes.supports(getReturnType().getType());
+        return ReactiveTypes.supports(getReturnType().getRawClass());
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
index b8df2b3987..f96b90c216 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
@@ -48,7 +48,7 @@ public CommandSegmentCommandFactory(CommandSegments commandSegments, CommandMeth
         this.redisCodec = redisCodec;
         this.outputResolver = outputResolver;
 
-        OutputSelector outputSelector = new OutputSelector(commandMethod.getActualReturnType());
+        OutputSelector outputSelector = new OutputSelector(commandMethod.getActualReturnType(), redisCodec);
         CommandOutputFactory factory = resolveCommandOutputFactory(outputSelector);
 
         if (factory == null) {
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java
index 96d322686a..eab6e4e17b 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java
@@ -15,13 +15,7 @@
  */
 package com.lambdaworks.redis.dynamic.output;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
-import com.lambdaworks.redis.dynamic.support.TypeInformation;
 import com.lambdaworks.redis.internal.LettuceAssert;
 
 /**
@@ -34,9 +28,7 @@
 public class CodecAwareOutputFactoryResolver implements CommandOutputFactoryResolver {
 
     private final CommandOutputFactoryResolver delegate;
-    private final TypeInformation<?> keyType;
-    private final TypeInformation<?> valueType;
-    private final Map<String, TypeInformation<?>> typeVariables = new HashMap<>();
+    private final RedisCodec<?, ?> redisCodec;
 
     /**
      * Create a new {@link CodecAwareOutputFactoryResolver} given {@link CommandOutputFactoryResolver} and {@link RedisCodec}.
@@ -50,56 +42,16 @@ public CodecAwareOutputFactoryResolver(CommandOutputFactoryResolver delegate, Re
         LettuceAssert.notNull(redisCodec, "RedisCodec must not be null");
 
         this.delegate = delegate;
-
-        ClassTypeInformation<? extends RedisCodec> typeInformation = ClassTypeInformation.from(redisCodec.getClass());
-        TypeInformation<?> superTypeInformation = typeInformation.getSuperTypeInformation(RedisCodec.class);
-        List<TypeInformation<?>> typeArguments = superTypeInformation.getTypeArguments();
-
-        this.keyType = typeArguments.get(0);
-        this.valueType = typeArguments.get(1);
-
-        this.typeVariables.put("K", keyType);
-        this.typeVariables.put("V", valueType);
+        this.redisCodec = redisCodec;
     }
 
     @Override
     public CommandOutputFactory resolveCommandOutput(OutputSelector outputSelector) {
-
-        Map<String, TypeInformation<?>> typeVariables = new HashMap<>(outputSelector.getTypeVariables());
-        typeVariables.putAll(this.typeVariables);
-
-        return delegate.resolveCommandOutput(
-                new OutputSelector(outputSelector.getTypeInformation(), isKeyType(outputSelector.getTypeInformation()),
-                        isValueType(outputSelector.getTypeInformation()), typeVariables));
+        return delegate.resolveCommandOutput(new OutputSelector(outputSelector.getOutputType(), redisCodec));
     }
 
     @Override
     public CommandOutputFactory resolveStreamingCommandOutput(OutputSelector outputSelector) {
-
-        Map<String, TypeInformation<?>> typeVariables = new HashMap<>(outputSelector.getTypeVariables());
-        typeVariables.putAll(this.typeVariables);
-
-        return delegate.resolveStreamingCommandOutput(
-                new OutputSelector(outputSelector.getTypeInformation(), isKeyType(outputSelector.getTypeInformation()),
-                        isValueType(outputSelector.getTypeInformation()), typeVariables));
-    }
-
-    protected boolean isKeyType(TypeInformation<?> typeInformation) {
-        return walkComponentTypeAssignability(typeInformation, keyType);
-    }
-
-    protected boolean isValueType(TypeInformation<?> typeInformation) {
-        return walkComponentTypeAssignability(typeInformation, valueType);
-    }
-
-    private boolean walkComponentTypeAssignability(TypeInformation<?> typeInformation, TypeInformation<?> sourceType) {
-
-        do {
-            if (typeInformation.isAssignableFrom(sourceType)) {
-                return true;
-            }
-            typeInformation = typeInformation.getComponentType();
-        } while (typeInformation != null);
-        return false;
+        return delegate.resolveStreamingCommandOutput(new OutputSelector(outputSelector.getOutputType(), redisCodec));
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java b/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java
index ac42786ddb..71a9caf860 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java
@@ -15,9 +15,7 @@
  */
 package com.lambdaworks.redis.dynamic.output;
 
-import com.lambdaworks.redis.dynamic.support.TypeInformation;
-import com.lambdaworks.redis.dynamic.support.TypeVariableTypeInformation;
-import com.lambdaworks.redis.internal.LettuceClassUtils;
+import com.lambdaworks.redis.dynamic.support.ResolvableType;
 
 /**
  * Base class for {@link CommandOutputFactory} resolution such as {@link OutputRegistryCommandOutputFactoryResolver}.
@@ -40,49 +38,9 @@ public abstract class CommandOutputResolverSupport {
      */
     protected boolean isAssignableFrom(OutputSelector selector, OutputType provider) {
 
-        TypeInformation<?> outputTypeInformation = provider.getTypeInformation();
-        TypeInformation<?> selectorTypeInformation = selector.getTypeInformation();
+        ResolvableType selectorType = selector.getOutputType();
+        ResolvableType resolvableType = provider.withCodec(selector.getRedisCodec());
 
-        do {
-
-            if (outputTypeInformation instanceof TypeVariableTypeInformation) {
-                if (selector.containsTypeVariable(outputTypeInformation.toString())) {
-                    outputTypeInformation = selector.getTypeVariable(outputTypeInformation.toString());
-                }
-            }
-
-            if (outputTypeInformation.getType() == Object.class && selectorTypeInformation.getComponentType() != null) {
-
-                if (provider.getPrimaryType() == OutputRegistry.KeySurrogate.class) {
-                    return selector.isKey();
-                }
-
-                if (provider.getPrimaryType() == OutputRegistry.ValueSurrogate.class) {
-                    return selector.isValue();
-                }
-            }
-
-            if (!isAssignableFrom(selectorTypeInformation, outputTypeInformation)) {
-                return false;
-            }
-
-            outputTypeInformation = outputTypeInformation.getComponentType();
-            selectorTypeInformation = selectorTypeInformation.getComponentType();
-
-        } while (outputTypeInformation != null && outputTypeInformation.getComponentType() != outputTypeInformation
-                && selectorTypeInformation != null && selectorTypeInformation.getComponentType() != selectorTypeInformation);
-        return true;
-    }
-
-    /**
-     * Overridable hook to check whether {@code selector} can be assigned from the provider type {@code provider}.
-     * 
-     * @param selector must not be {@literal null}.
-     * @param provider must not be {@literal null}.
-     * @return {@literal true} if selector can be assigned from its provider type.
-     */
-    protected boolean isAssignableFrom(TypeInformation<?> selector, TypeInformation<?> provider) {
-
-        return selector.isAssignableFrom(provider) || LettuceClassUtils.isAssignable(selector.getType(), provider.getType());
+        return selectorType.isAssignableFrom(resolvableType);
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java
index 9db55512bf..cf2e2ff4dc 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java
@@ -15,12 +15,16 @@
  */
 package com.lambdaworks.redis.dynamic.output;
 
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
+import java.lang.reflect.TypeVariable;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
+import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
+import com.lambdaworks.redis.dynamic.support.ResolvableType;
 import com.lambdaworks.redis.dynamic.support.TypeInformation;
-import com.lambdaworks.redis.dynamic.support.TypeVariableTypeInformation;
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.output.*;
 
@@ -59,8 +63,8 @@ public class OutputRegistry {
         register(registry, GeoCoordinatesListOutput.class, GeoCoordinatesListOutput::new);
         register(registry, GeoCoordinatesValueListOutput.class, GeoCoordinatesValueListOutput::new);
         register(registry, ScoredValueListOutput.class, ScoredValueListOutput::new);
-        register(registry, StringValueListOutput.class, StringValueListOutput::new);
         register(registry, ValueValueListOutput.class, ValueValueListOutput::new);
+        register(registry, StringValueListOutput.class, StringValueListOutput::new);
 
         register(registry, StringListOutput.class, StringListOutput::new);
         register(registry, VoidOutput.class, VoidOutput::new);
@@ -155,9 +159,33 @@ static OutputType getStreamingType(Class<? extends CommandOutput> commandOutputC
         }
 
         List<TypeInformation<?>> typeArguments = superTypeInformation.getTypeArguments();
-        Class<?> primaryType = getPrimaryType(typeArguments.get(0));
 
-        return new OutputType(primaryType, commandOutputClass, typeArguments.get(0), true);
+        return new OutputType(commandOutputClass, typeArguments.get(0), true) {
+
+            @Override
+            public ResolvableType withCodec(RedisCodec<?, ?> codec) {
+
+                TypeInformation<?> typeInformation = ClassTypeInformation.from(codec.getClass());
+
+                ResolvableType resolvableType = ResolvableType.forType(commandOutputClass,
+                        new CodecVariableTypeResolver(typeInformation));
+
+                while (resolvableType != ResolvableType.NONE) {
+
+                    ResolvableType[] interfaces = resolvableType.getInterfaces();
+                    for (ResolvableType resolvableInterface : interfaces) {
+
+                        if (resolvableInterface.getRawClass().equals(StreamingOutput.class)) {
+                            return resolvableInterface.getGeneric(0);
+                        }
+                    }
+
+                    resolvableType = resolvableType.getSuperType();
+                }
+
+                throw new IllegalStateException();
+            }
+        };
     }
 
     /**
@@ -177,36 +205,53 @@ static OutputType getOutputComponentType(Class<? extends CommandOutput> commandO
         }
 
         List<TypeInformation<?>> typeArguments = superTypeInformation.getTypeArguments();
-        Class<?> primaryType = getPrimaryType(typeArguments.get(2));
 
-        return new OutputType(primaryType, commandOutputClass, typeArguments.get(2), false);
+        return new OutputType(commandOutputClass, typeArguments.get(2), false) {
+            @Override
+            public ResolvableType withCodec(RedisCodec<?, ?> codec) {
+
+                TypeInformation<?> typeInformation = ClassTypeInformation.from(codec.getClass());
+
+                ResolvableType resolvableType = ResolvableType.forType(commandOutputClass,
+                        new CodecVariableTypeResolver(typeInformation));
+
+                while (!resolvableType.getRawClass().equals(CommandOutput.class)) {
+                    resolvableType = resolvableType.getSuperType();
+                }
+
+                return resolvableType.getGeneric(2);
+            }
+        };
     }
 
-    private static Class<?> getPrimaryType(TypeInformation<?> typeInformation) {
+    static class CodecVariableTypeResolver implements ResolvableType.VariableResolver {
+
+        private final TypeInformation<?> codecType;
+        private final List<TypeInformation<?>> typeArguments;
+
+        public CodecVariableTypeResolver(TypeInformation<?> codecType) {
+
+            this.codecType = codecType.getSuperTypeInformation(RedisCodec.class);
+            this.typeArguments = this.codecType.getTypeArguments();
+        }
 
-        Class<?> primaryType = typeInformation.getType();
-        while (typeInformation.isCollectionLike() && typeInformation != typeInformation.getComponentType()) {
-            typeInformation = typeInformation.getComponentType();
+        @Override
+        public Object getSource() {
+            return codecType;
         }
 
-        if (typeInformation instanceof TypeVariableTypeInformation) {
+        @Override
+        public ResolvableType resolveVariable(TypeVariable<?> variable) {
 
-            // TODO: Requires maybe a more sophisticated resolution.
-            if (typeInformation.toString().equals("K")) {
-                primaryType = KeySurrogate.class;
+            if (variable.getName().equals("K")) {
+                return ResolvableType.forClass(typeArguments.get(0).getType());
             }
 
-            if (typeInformation.toString().equals("V")) {
-                primaryType = ValueSurrogate.class;
+            if (variable.getName().equals("V")) {
+                return ResolvableType.forClass(typeArguments.get(1).getType());
             }
+            return null;
         }
-        return primaryType;
-    }
-
-    static class KeySurrogate {
-    }
-
-    static class ValueSurrogate {
     }
 
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
index eac5f588a0..f15df526aa 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
@@ -18,7 +18,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
@@ -59,8 +58,8 @@ public CommandOutputFactory resolveCommandOutput(OutputSelector outputSelector)
 
         Map<OutputType, CommandOutputFactory> registry = outputRegistry.getRegistry();
 
-        Set<OutputType> outputTypes = registry.keySet().stream().filter((outputType) -> !outputType.isStreaming())
-                .collect(Collectors.toSet());
+        List<OutputType> outputTypes = registry.keySet().stream().filter((outputType) -> !outputType.isStreaming())
+                .collect(Collectors.toList());
 
         List<OutputType> candidates = getCandidates(outputTypes, outputSelector);
 
@@ -76,7 +75,7 @@ public CommandOutputFactory resolveStreamingCommandOutput(OutputSelector outputS
 
         Map<OutputType, CommandOutputFactory> registry = outputRegistry.getRegistry();
 
-        Set<OutputType> outputTypes = registry.keySet().stream().filter(OutputType::isStreaming).collect(Collectors.toSet());
+        List<OutputType> outputTypes = registry.keySet().stream().filter(OutputType::isStreaming).collect(Collectors.toList());
 
         List<OutputType> candidates = getCandidates(outputTypes, outputSelector);
 
@@ -91,9 +90,9 @@ private List<OutputType> getCandidates(Collection<OutputType> outputTypes, Outpu
 
         return outputTypes.stream().filter(outputType -> {
 
-            if (COMMAND_OUTPUT.getType().isAssignableFrom(outputSelector.getTypeInformation().getType())) {
+            if (COMMAND_OUTPUT.getType().isAssignableFrom(outputSelector.getOutputType().getRawClass())) {
 
-                if (outputSelector.getTypeInformation().getType().isAssignableFrom(outputType.getCommandOutputClass())) {
+                if (outputSelector.getOutputType().getRawClass().isAssignableFrom(outputType.getCommandOutputClass())) {
                     return true;
                 }
             }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java
index 528a399fdb..04d60b5ac0 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java
@@ -15,100 +15,51 @@
  */
 package com.lambdaworks.redis.dynamic.output;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.lambdaworks.redis.dynamic.support.TypeInformation;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.dynamic.support.ResolvableType;
 import com.lambdaworks.redis.internal.LettuceAssert;
 
 /**
  * Selector {@link CommandOutputFactory} resolution.
  * <p>
- * A {@link OutputSelector} is based on the result {@link TypeInformation} and can supply additionaly whether the type is a key
- * or value type. An optional {@link Map} with type variables (usually {@link com.lambdaworks.redis.codec.RedisCodec} type
- * variables) can be supplied to resolve type variables inside of {@link com.lambdaworks.redis.output.CommandOutput}.
+ * A {@link OutputSelector} is based on the result {@link ResolvableType} and {@link com.lambdaworks.redis.codec.RedisCodec}.
+ * The codec supplies types for generics resolution of {@link com.lambdaworks.redis.output.CommandOutput}.
  *
  * @author Mark Paluch
  * @since 5.0
  */
 public class OutputSelector {
 
-    private final TypeInformation<?> typeInformation;
-    private final boolean key;
-    private final boolean value;
-    private final Map<String, TypeInformation<?>> typeVariables;
-
-    /**
-     * Create a new {@link OutputSelector} given {@link TypeInformation}.
-     *
-     * @param typeInformation must not be {@literal null}.
-     */
-    public OutputSelector(TypeInformation<?> typeInformation) {
-        this(typeInformation, false, false, Collections.emptyMap());
-    }
-
-    /**
-     * Create a new {@link OutputSelector} given {@link TypeInformation}, key/value flags and {@link Map} of type variables.
-     *
-     * @param typeInformation must not be {@literal null}.
-     * @param key
-     * @param value
-     * @param typeVariables must not be {@literal null}.
-     */
-    public OutputSelector(TypeInformation<?> typeInformation, boolean key, boolean value,
-            Map<String, TypeInformation<?>> typeVariables) {
-
-        LettuceAssert.notNull(typeInformation, "Result TypeInformation must not be null");
-        LettuceAssert.notNull(typeVariables, "Map of type variables must not be null");
-
-        this.typeInformation = typeInformation;
-        this.key = key;
-        this.value = value;
-        this.typeVariables = Collections.unmodifiableMap(new HashMap<>(typeVariables));
-    }
-
-    /**
-     * @param typeVariableName
-     * @return {@literal true} if the {@code typeVariableName} is provided.
-     */
-    public boolean containsTypeVariable(String typeVariableName) {
-        return typeVariables.containsKey(typeVariableName);
-    }
+    private final ResolvableType outputType;
+    private final RedisCodec<?, ?> redisCodec;
 
     /**
-     * @param typeInformation
-     * @return the {@link TypeInformation} for a type variable.
+     * Creates a new {@link OutputSelector} given {@link ResolvableType} and {@link RedisCodec}.
+     * 
+     * @param outputType must not be {@literal null}.
+     * @param redisCodec must not be {@literal null}.
      */
-    public TypeInformation<?> getTypeVariable(String typeInformation) {
-        return typeVariables.get(typeInformation);
-    }
+    public OutputSelector(ResolvableType outputType, RedisCodec<?, ?> redisCodec) {
 
-    /**
-     * @return the resulting {@link TypeInformation}.
-     */
-    public TypeInformation<?> getTypeInformation() {
-        return typeInformation;
-    }
+        LettuceAssert.notNull(outputType, "Output type must not be null!");
+        LettuceAssert.notNull(redisCodec, "RedisCodec must not be null!");
 
-    /**
-     * @return {@link Map} of type variables.
-     */
-    public Map<String, TypeInformation<?>> getTypeVariables() {
-        return Collections.unmodifiableMap(typeVariables);
+        this.outputType = outputType;
+        this.redisCodec = redisCodec;
     }
 
     /**
-     * @return {@literal true} if the {@link #getTypeInformation()} is a key-type.
+     * @return the output type.
      */
-    public boolean isKey() {
-        return key;
+    public ResolvableType getOutputType() {
+        return outputType;
     }
 
     /**
-     * @return {@literal true} if the {@link #getTypeInformation()} is a value-type.
+     *
+     * @return the associated codec.
      */
-    public boolean isValue() {
-        return value;
+    public RedisCodec<?, ?> getRedisCodec() {
+        return redisCodec;
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java
index 1a90bb556f..22f9a2cb9e 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java
@@ -15,6 +15,8 @@
  */
 package com.lambdaworks.redis.dynamic.output;
 
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.dynamic.support.ResolvableType;
 import com.lambdaworks.redis.dynamic.support.TypeInformation;
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.output.CommandOutput;
@@ -34,7 +36,6 @@
  */
 public class OutputType {
 
-    private final Class<?> primaryType;
     private final Class<? extends CommandOutput> commandOutputClass;
     private final TypeInformation<?> typeInformation;
     private final boolean streaming;
@@ -43,32 +44,20 @@ public class OutputType {
      * Create a new {@link OutputType} given {@code primaryType}, the {@code commandOutputClass}, {@link TypeInformation} and
      * whether the {@link OutputType} is for a {@link com.lambdaworks.redis.output.StreamingOutput}.
      * 
-     * @param primaryType must not be {@literal null}.
      * @param commandOutputClass must not be {@literal null}.
      * @param typeInformation must not be {@literal null}.
      * @param streaming {@literal true} if the type descriptor concerns the {@link com.lambdaworks.redis.output.StreamingOutput}
-     *        result type.
      */
-    public OutputType(Class<?> primaryType, Class<? extends CommandOutput> commandOutputClass,
-            TypeInformation<?> typeInformation, boolean streaming) {
+    OutputType(Class<? extends CommandOutput> commandOutputClass, TypeInformation<?> typeInformation, boolean streaming) {
 
-        LettuceAssert.notNull(primaryType, "Primary type must not be null");
         LettuceAssert.notNull(commandOutputClass, "CommandOutput class must not be null");
         LettuceAssert.notNull(typeInformation, "TypeInformation must not be null");
 
-        this.primaryType = primaryType;
         this.commandOutputClass = commandOutputClass;
         this.typeInformation = typeInformation;
         this.streaming = streaming;
     }
 
-    /**
-     * @return
-     */
-    public Class<?> getPrimaryType() {
-        return primaryType;
-    }
-
     /**
      * @return
      */
@@ -83,6 +72,10 @@ public boolean isStreaming() {
         return streaming;
     }
 
+    public ResolvableType withCodec(RedisCodec<?, ?> codec) {
+        return ResolvableType.forClass(typeInformation.getType());
+    }
+
     /**
      * @return
      */
@@ -95,8 +88,7 @@ public String toString() {
 
         StringBuilder sb = new StringBuilder();
         sb.append(getClass().getSimpleName());
-        sb.append(" [primaryType=").append(primaryType);
-        sb.append(", commandOutputClass=").append(commandOutputClass);
+        sb.append(" [commandOutputClass=").append(commandOutputClass);
         sb.append(", typeInformation=").append(typeInformation);
         sb.append(", streaming=").append(streaming);
         sb.append(']');
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java
index b61bd415db..729f0c5921 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java
@@ -43,7 +43,7 @@ public class ClassTypeInformation<S> extends TypeDiscoverer<S> {
 
     static {
         for (ClassTypeInformation<?> info : Arrays.asList(COLLECTION, LIST, SET, MAP, OBJECT)) {
-            CACHE.put(info.getType(), new WeakReference<ClassTypeInformation<?>>(info));
+            CACHE.put(info.getType(), new WeakReference<>(info));
         }
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java b/src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java
index cdf77b954e..bbaaae8f08 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java
@@ -34,7 +34,7 @@
  * {@link #resolve() resolve} to a {@link java.lang.Class}.
  */
 @SuppressWarnings("serial")
-class ResolvableType implements Serializable {
+public class ResolvableType implements Serializable {
 
     /**
      * {@code ResolvableType} returned when no value is available. {@code NONE} is used in preference to {@code null} so that
@@ -685,7 +685,7 @@ private Class<?> resolveClass() {
      * <p>
      * Note: The returned {@link ResolvableType} should only be used as an intermediary as it cannot be serialized.
      */
-    ResolvableType resolveType() {
+    public ResolvableType resolveType() {
         if (this.type instanceof ParameterizedType) {
             return forType(((ParameterizedType) this.type).getRawType(), this.variableResolver);
         }
@@ -1084,7 +1084,7 @@ public static ResolvableType forType(Type type, ResolvableType owner) {
      * @param variableResolver the variable resolver or {@code null}
      * @return a {@link ResolvableType} for the specified {@link Type} and {@link VariableResolver}
      */
-    static ResolvableType forType(Type type, VariableResolver variableResolver) {
+    public static ResolvableType forType(Type type, VariableResolver variableResolver) {
         return forType(type, null, variableResolver);
     }
 
@@ -1116,7 +1116,7 @@ static ResolvableType forType(Type type, TypeProvider typeProvider, VariableReso
     /**
      * Strategy interface used to resolve {@link TypeVariable}s.
      */
-    interface VariableResolver extends Serializable {
+    public interface VariableResolver extends Serializable {
 
         /**
          * Return the source of the resolver (used for hashCode and equals).
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java
index e4bbf4f3b6..b0e71adeb0 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java
@@ -58,7 +58,7 @@ protected TypeDiscoverer(Type type, Map<TypeVariable<?>, Type> typeVariableMap)
      * 
      * @return
      */
-    protected Map<TypeVariable<?>, Type> getTypeVariableMap() {
+    public Map<TypeVariable<?>, Type> getTypeVariableMap() {
         return typeVariableMap;
     }
 
@@ -142,7 +142,7 @@ protected Type resolveType(Type type) {
         Map<TypeVariable, Type> map = new HashMap<>();
         map.putAll(getTypeVariableMap());
 
-        return ResolvableType.forType(type, new TypeVariableMapVariableResolver(map)).resolveType().getType();
+        return ResolvableType.forType(type, new TypeVariableMapVariableResolver(map)).getType();
     }
 
     public List<TypeInformation<?>> getParameterTypes(Constructor<?> constructor) {
@@ -168,6 +168,11 @@ public Class<S> getType() {
         return this.resolvedType;
     }
 
+    @Override
+    public Type getGenericType() {
+        return resolveType(type);
+    }
+
     @Override
     public ClassTypeInformation<?> getRawTypeInformation() {
         return ClassTypeInformation.from(getType()).getRawTypeInformation();
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java
index bd615bd4a5..167a92c7b0 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java
@@ -17,13 +17,18 @@
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Interface to access types and resolving generics on the way.
  */
 public interface TypeInformation<S> {
 
+    Type getGenericType();
+
     /**
      * Returns the {@link TypeInformation}s for the parameters of the given {@link Constructor}.
      * 
@@ -127,4 +132,6 @@ public interface TypeInformation<S> {
      * @return
      */
     List<TypeInformation<?>> getTypeArguments();
+
+    Map<TypeVariable<?>, Type> getTypeVariableMap();
 }
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodTest.java b/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodTest.java
index eda6b87a85..cade02bc86 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodTest.java
@@ -43,8 +43,8 @@ public void shouldResolveFutureComponentType() throws Exception {
 
         CommandMethod commandMethod = new CommandMethod(getMethod("getFuture"));
 
-        assertThat(commandMethod.getActualReturnType().getType()).isEqualTo(String.class);
-        assertThat(commandMethod.getReturnType().getType()).isEqualTo(Future.class);
+        assertThat(commandMethod.getActualReturnType().getRawClass()).isEqualTo(String.class);
+        assertThat(commandMethod.getReturnType().getRawClass()).isEqualTo(Future.class);
     }
 
     @Test
@@ -52,8 +52,8 @@ public void shouldResolveFluxComponentType() throws Exception {
 
         CommandMethod commandMethod = new CommandMethod(getMethod("getFlux"));
 
-        assertThat(commandMethod.getActualReturnType().getType()).isEqualTo(String.class);
-        assertThat(commandMethod.getReturnType().getType()).isEqualTo(Flux.class);
+        assertThat(commandMethod.getActualReturnType().getRawClass()).isEqualTo(String.class);
+        assertThat(commandMethod.getReturnType().getRawClass()).isEqualTo(Flux.class);
     }
 
     private Method getMethod(String name) throws NoSuchMethodException {
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java b/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java
index a5a19dc7df..00fe34db28 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java
@@ -26,7 +26,6 @@
 
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.dynamic.CommandMethod;
-import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
 import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
 import com.lambdaworks.redis.output.*;
 
@@ -46,20 +45,6 @@ public void shouldResolveValueOutput() {
         assertThat(commandOutput).isInstanceOf(ValueOutput.class);
     }
 
-    @Test
-    public void shouldDetermineKeyType() {
-
-        assertThat(resolver.isKeyType(ClassTypeInformation.from(String.class))).isFalse();
-        assertThat(resolver.isKeyType(ClassTypeInformation.from(ByteBuffer.class))).isTrue();
-    }
-
-    @Test
-    public void shouldDetermineValueType() {
-
-        assertThat(resolver.isValueType(ClassTypeInformation.from(String.class))).isTrue();
-        assertThat(resolver.isValueType(ClassTypeInformation.from(ByteBuffer.class))).isFalse();
-    }
-
     @Test
     public void shouldResolveValueListOutput() {
 
@@ -104,7 +89,8 @@ public void shouldResolveMapsOutput() {
         Method method = ReflectionUtils.findMethod(CommandMethods.class, methodName);
         CommandMethod commandMethod = new CommandMethod(method);
 
-        CommandOutputFactory factory = resolver.resolveCommandOutput(new OutputSelector(commandMethod.getActualReturnType()));
+        CommandOutputFactory factory = resolver
+                .resolveCommandOutput(new OutputSelector(commandMethod.getReturnType(), new ByteBufferAndStringCodec()));
 
         return factory.create(new ByteBufferAndStringCodec());
     }
@@ -113,7 +99,7 @@ private static interface CommandMethods {
 
         List<String> stringList();
 
-        List<CharSequence> charSequenceList();
+        List<? extends CharSequence> charSequenceList();
 
         List<ByteBuffer> byteBufferList();
 
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java b/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
index 133a48a10c..602cad95bd 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
@@ -18,11 +18,13 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.lang.reflect.Method;
+import java.util.Collection;
 import java.util.List;
 
 import org.junit.Test;
 
 import com.lambdaworks.redis.GeoCoordinates;
+import com.lambdaworks.redis.ScoredValue;
 import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.codec.StringCodec;
 import com.lambdaworks.redis.dynamic.CommandMethod;
@@ -40,8 +42,8 @@ public class OutputRegistryCommandOutputFactoryResolverTest {
     @Test
     public void shouldResolveStringListOutput() {
 
-        assertThat(getCommandOutput("stringList")).isInstanceOf(StringListOutput.class);
-        assertThat(getCommandOutput("stringIterable")).isInstanceOf(StringListOutput.class);
+        assertThat(getCommandOutput("stringList")).isInstanceOf(KeyListOutput.class);
+        assertThat(getCommandOutput("stringIterable")).isInstanceOf(KeyListOutput.class);
     }
 
     @Test
@@ -54,9 +56,17 @@ public void shouldResolveVoidOutput() {
     @Test
     public void shouldResolveStringValueListOutput() {
 
-        CommandOutput<?, ?, ?> commandOutput = getCommandOutput("stringValueList");
+        CommandOutput<?, ?, ?> commandOutput = getCommandOutput("stringValueCollection");
 
-        assertThat(commandOutput).isInstanceOf(StringValueListOutput.class);
+        assertThat(commandOutput).isInstanceOf(ValueValueListOutput.class);
+    }
+
+    @Test
+    public void shouldResolveStringScoredValueListOutput() {
+
+        CommandOutput<?, ?, ?> commandOutput = getCommandOutput("stringScoredValueList");
+
+        assertThat(commandOutput).isInstanceOf(ScoredValueListOutput.class);
     }
 
     @Test
@@ -107,23 +117,54 @@ public void shouldResolveListOfMapsOutput() {
         assertThat(commandOutput).isInstanceOf(ListOfMapsOutput.class);
     }
 
-    protected CommandOutput<?, ?, ?> getCommandOutput(String methodName) {
+    @Test
+    public void stringValueCollectionIsAssignableFromStringValueListOutput() {
 
-        Method method = ReflectionUtils.findMethod(CommandMethods.class, methodName);
-        CommandMethod commandMethod = new CommandMethod(method);
+        OutputSelector selector = getOutputSelector("stringValueCollection");
+
+        boolean assignable = resolver.isAssignableFrom(selector,
+                OutputRegistry.getOutputComponentType(StringValueListOutput.class));
+        assertThat(assignable).isTrue();
+    }
+
+    @Test
+    public void stringWildcardValueCollectionIsAssignableFromOutputs() {
+
+        OutputSelector selector = getOutputSelector("stringValueCollection");
 
-        CommandOutputFactory factory = resolver.resolveCommandOutput(new OutputSelector(commandMethod.getActualReturnType()));
+        assertThat(resolver.isAssignableFrom(selector, OutputRegistry.getOutputComponentType(ScoredValueListOutput.class)))
+                .isFalse();
+
+        assertThat(resolver.isAssignableFrom(selector, OutputRegistry.getOutputComponentType(StringValueListOutput.class)))
+                .isTrue();
+
+    }
+
+    protected CommandOutput<?, ?, ?> getCommandOutput(String methodName) {
+
+        OutputSelector outputSelector = getOutputSelector(methodName);
+        CommandOutputFactory factory = resolver.resolveCommandOutput(outputSelector);
 
         return factory.create(new StringCodec());
     }
 
+    private OutputSelector getOutputSelector(String methodName) {
+
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, methodName);
+        return new OutputSelector(new CommandMethod(method).getActualReturnType(), StringCodec.UTF8);
+    }
+
     private static interface CommandMethods {
 
         List<String> stringList();
 
         Iterable<String> stringIterable();
 
-        List<Value<String>> stringValueList();
+        Collection<Value<String>> stringValueCollection();
+
+        Collection<? extends Value<String>> stringWildcardValueCollection();
+
+        List<ScoredValue<String>> stringScoredValueList();
 
         List<Value<GeoCoordinates>> geoCoordinatesValueList();
 
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java
index cfd9bcae8f..e3d13e5a21 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java
@@ -17,16 +17,18 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.nio.ByteBuffer;
 import java.util.List;
 
-import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
 import org.junit.Test;
 
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.dynamic.output.OutputRegistry.KeySurrogate;
-import com.lambdaworks.redis.output.GeoCoordinatesValueListOutput;
-import com.lambdaworks.redis.output.KeyListOutput;
-import com.lambdaworks.redis.output.StringListOutput;
+import com.lambdaworks.redis.ScoredValue;
+import com.lambdaworks.redis.codec.ByteArrayCodec;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
+import com.lambdaworks.redis.dynamic.support.ResolvableType;
+import com.lambdaworks.redis.output.*;
 
 /**
  * @author Mark Paluch
@@ -34,46 +36,84 @@
 public class OutputRegistryTest {
 
     @Test
-    public void getStreamingType() throws Exception {
+    public void getKeyOutputType() throws Exception {
 
-        OutputType streamingType = OutputRegistry.getStreamingType(GeoCoordinatesValueListOutput.class);
+        OutputType outputComponentType = OutputRegistry.getOutputComponentType(KeyListOutput.class);
 
-        assertThat(streamingType.getPrimaryType()).isEqualTo(Value.class);
+        assertThat(outputComponentType.getTypeInformation().getComponentType().getType()).isEqualTo(Object.class);
     }
 
     @Test
-    public void getOutputComponentType() throws Exception {
+    public void getStringListOutputType() throws Exception {
 
-        OutputType outputComponentType = OutputRegistry.getOutputComponentType(GeoCoordinatesValueListOutput.class);
+        OutputType outputComponentType = OutputRegistry.getOutputComponentType(StringListOutput.class);
 
-        assertThat(outputComponentType.getPrimaryType()).isEqualTo(List.class);
+        assertThat(outputComponentType.getTypeInformation().getComponentType())
+                .isEqualTo(ClassTypeInformation.from(String.class));
     }
 
     @Test
-    public void getKeyStreamingType() throws Exception {
+    public void componentTypeOfKeyOuputWithCodecIsAssignableFromString() throws Exception {
 
-        OutputRegistry.getStreamingType(KeyListOutput.class);
-        OutputType streamingType = OutputRegistry.getStreamingType(KeyListOutput.class);
+        OutputType outputComponentType = OutputRegistry.getOutputComponentType(KeyOutput.class);
 
-        assertThat(streamingType.getPrimaryType()).isEqualTo(KeySurrogate.class);
+        ResolvableType resolvableType = outputComponentType.withCodec(new StringCodec());
+
+        assertThat(resolvableType.isAssignableFrom(String.class)).isTrue();
     }
 
     @Test
-    public void getKeyOutputType() throws Exception {
+    public void componentTypeOfKeyListOuputWithCodecIsAssignableFromListOfString() throws Exception {
 
         OutputType outputComponentType = OutputRegistry.getOutputComponentType(KeyListOutput.class);
 
-        assertThat(outputComponentType.getPrimaryType()).isEqualTo(KeySurrogate.class);
-        assertThat(outputComponentType.getTypeInformation().getComponentType().getType()).isEqualTo(Object.class);
+        ResolvableType resolvableType = outputComponentType.withCodec(new StringCodec());
+
+        assertThat(resolvableType.isAssignableFrom(ResolvableType.forClassWithGenerics(List.class, String.class))).isTrue();
     }
 
     @Test
-    public void getStringListOutputType() throws Exception {
+    public void streamingTypeOfKeyOuputWithCodecIsAssignableFromString() throws Exception {
 
-        OutputType outputComponentType = OutputRegistry.getOutputComponentType(StringListOutput.class);
+        OutputType outputComponentType = OutputRegistry.getStreamingType(KeyListOutput.class);
 
-        assertThat(outputComponentType.getPrimaryType()).isEqualTo(List.class);
-        assertThat(outputComponentType.getTypeInformation().getComponentType())
-                .isEqualTo(ClassTypeInformation.from(String.class));
+        ResolvableType resolvableType = outputComponentType.withCodec(new StringCodec());
+
+        assertThat(resolvableType.isAssignableFrom(ResolvableType.forClass(String.class))).isTrue();
+    }
+
+    @Test
+    public void streamingTypeOfKeyListOuputWithCodecIsAssignableFromListOfString() throws Exception {
+
+        OutputType outputComponentType = OutputRegistry.getStreamingType(ScoredValueListOutput.class);
+
+        ResolvableType resolvableType = outputComponentType.withCodec(new StringCodec());
+
+        assertThat(resolvableType.isAssignableFrom(ResolvableType.forClassWithGenerics(ScoredValue.class, String.class)))
+                .isTrue();
+    }
+
+    @Test
+    public void customizedValueOutput() throws Exception {
+
+        OutputType outputComponentType = OutputRegistry.getOutputComponentType(KeyTypedOutput.class);
+
+        ResolvableType resolvableType = outputComponentType.withCodec(ByteArrayCodec.INSTANCE);
+
+        assertThat(resolvableType.isAssignableFrom(ResolvableType.forClass(byte[].class))).isTrue();
+    }
+
+    private static abstract class IntermediateOutput<K1, V1> extends CommandOutput<K1, V1, V1> {
+
+        public IntermediateOutput(RedisCodec<K1, V1> codec, V1 output) {
+            super(codec, null);
+        }
+    }
+
+    private static class KeyTypedOutput extends IntermediateOutput<ByteBuffer, byte[]> {
+
+        public KeyTypedOutput(RedisCodec<ByteBuffer, byte[]> codec) {
+            super(codec, null);
+        }
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformationTest.java b/src/test/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformationTest.java
index d5c05cbf05..6522b120f6 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformationTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformationTest.java
@@ -88,7 +88,6 @@ public void isAssignableShouldConsiderNestedParameterTypes() throws Exception {
         TypeInformation<Object> target = ClassTypeInformation
                 .fromReturnTypeOf(ReflectionUtils.findMethod(TestType.class, "collectionOfIterableOfNumber"));
 
-        assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfIterableOfNumber.class))).isTrue();
         assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfIterableOfInteger.class))).isFalse();
         assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfListOfNumber.class))).isFalse();
         assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfSetOfNumber.class))).isFalse();
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformationTest.java b/src/test/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformationTest.java
index a3b0825aea..29d4874c56 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformationTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformationTest.java
@@ -22,7 +22,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -88,19 +87,6 @@ public void isAssignableFromLowerBoundComponentType() {
         assertThat(target.isAssignableFrom(from(Object.class))).isFalse();
     }
 
-    @Test
-    @Ignore("Method-level variables not supported")
-    public void isAssignableFromParametrizedWildcardType() {
-
-        TypeInformation<?> target = componentTypeOf("numberOrSubtype");
-
-        assertThat(target.isAssignableFrom(from(Integer.class))).isTrue();
-        assertThat(target.isAssignableFrom(from(Number.class))).isTrue();
-        assertThat(target.isAssignableFrom(from(Float.class))).isTrue();
-        assertThat(target.isAssignableFrom(from(String.class))).isFalse();
-        assertThat(target.isAssignableFrom(from(Object.class))).isFalse();
-    }
-
     protected TypeInformation<?> componentTypeOf(String name) {
         return ClassTypeInformation.fromReturnTypeOf(methodOf(name)).getComponentType();
     }
@@ -124,7 +110,5 @@ static interface GenericReturnTypes {
         List<Float> exactFloat();
 
         List<? extends Number> atLeastNumber();
-
-        <T extends Number> List<? super T> numberOrSubtype();
     }
 }
\ No newline at end of file

From 41fa6be0857ba830daef6a88da2db7b6a8027af0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 8 Jan 2017 21:52:46 +0100
Subject: [PATCH 109/808] Remove own BackpressureUtils class #394

Switch to Reactor Core's Operators class to update wip (demand). Remove superflous allDataRead since it was never used. allDataRead is set by the onAllDataRead event handling inside the state transitions.
---
 .../lambdaworks/redis/BackpressureUtils.java  | 57 -------------------
 .../com/lambdaworks/redis/RedisPublisher.java | 35 +++++++-----
 2 files changed, 22 insertions(+), 70 deletions(-)
 delete mode 100644 src/main/java/com/lambdaworks/redis/BackpressureUtils.java

diff --git a/src/main/java/com/lambdaworks/redis/BackpressureUtils.java b/src/main/java/com/lambdaworks/redis/BackpressureUtils.java
deleted file mode 100644
index 227879d205..0000000000
--- a/src/main/java/com/lambdaworks/redis/BackpressureUtils.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2011-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.lambdaworks.redis;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-enum BackpressureUtils {
-    ;
-
-    /**
-     * Cap a substraction to 0
-     *
-     * @param a left operand
-     * @param b right operand
-     * @return Subscription result or 0 if overflow
-     */
-    public static long subOrZero(long a, long b) {
-        long res = a - b;
-        if (res < 0L) {
-            return 0;
-        }
-        return res;
-    }
-
-    /**
-     * Concurrent substraction bound to 0 and Long.MAX_VALUE. Any concurrent write will "happen" before this operation.
-     *
-     * @param sequence current atomic to update
-     * @param toSub delta to sub
-     * @return value before subscription, 0 or Long.MAX_VALUE
-     */
-    public static long getAndSub(AtomicLong sequence, long toSub) {
-        long r, u;
-        do {
-            r = sequence.get();
-            if (r == 0 || r == Long.MAX_VALUE) {
-                return r;
-            }
-            u = subOrZero(r, toSub);
-        } while (!sequence.compareAndSet(r, u));
-
-        return r;
-    }
-}
diff --git a/src/main/java/com/lambdaworks/redis/RedisPublisher.java b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
index c78cd2fa11..1528f5f0f3 100644
--- a/src/main/java/com/lambdaworks/redis/RedisPublisher.java
+++ b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
@@ -30,6 +30,8 @@
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 
+import reactor.core.publisher.Operators;
+
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.internal.LettuceAssert;
@@ -39,7 +41,6 @@
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
-import reactor.core.publisher.Operators;
 
 /**
  * Reactive command {@link Publisher} using ReactiveStreams.
@@ -83,8 +84,7 @@ public RedisPublisher(RedisCommand<K, V, T> staticCommand, StatefulConnection<K,
      * @param connection the connection, must not be {@literal null}
      * @param dissolve dissolve collections into particular elements
      */
-    public RedisPublisher(Supplier<RedisCommand<K, V, T>> commandSupplier, StatefulConnection<K, V> connection,
-            boolean dissolve) {
+    public RedisPublisher(Supplier<RedisCommand<K, V, T>> commandSupplier, StatefulConnection<K, V> connection, boolean dissolve) {
 
         LettuceAssert.notNull(commandSupplier, "CommandSupplier must not be null");
         LettuceAssert.notNull(connection, "StatefulConnection must not be null");
@@ -164,7 +164,7 @@ void subscribe(Subscriber<? super T> subscriber) {
             }
 
             if (traceEnabled) {
-                LOG.trace("{} subscribe: {}@{}", state(), subscriber.getClass().getName(), Objects.hashCode(subscriber));
+                LOG.trace("{} subscribe: {}@{}", state(), subscriber.getClass().getName(), subscriber.hashCode());
             }
 
             state().subscribe(this, subscriber);
@@ -239,7 +239,6 @@ final void onAllDataRead() {
                 LOG.trace("{} onAllDataRead()", state());
             }
 
-            allDataRead = true;
             this.state.get().onAllDataRead(this);
         }
 
@@ -253,6 +252,7 @@ final void onError(Throwable t) {
             if (LOG.isErrorEnabled()) {
                 LOG.trace("{} onError(): {}", state(), t.toString(), t);
             }
+
             this.state.get().onError(this, t);
         }
 
@@ -260,20 +260,26 @@ final void onError(Throwable t) {
          * Reads and publishes data from the input. Continues until either there is no more demand, or until there is no more
          * data to be read.
          *
-         * @return {@literal true} if there is more demand, {@literal false} otherwise
+         * @return {@literal true} if there is more demand, {@literal false} otherwise.
          */
         private boolean readAndPublish() throws IOException {
 
             while (hasDemand()) {
+
                 T data = read();
 
                 if (data != null) {
-                    BackpressureUtils.getAndSub(this.demand, 1L);
+
                     this.subscriber.onNext(data);
+
+                    if (Operators.addAndGet(this.demand, -1) == 0) {
+                        return false;
+                    }
                 } else {
                     return true;
                 }
             }
+
             return false;
         }
 
@@ -301,14 +307,15 @@ void checkCommandDispatch() {
             }
         }
 
-        @SuppressWarnings({"unchecked", "rawtypes"})
-        private void dispatchCommand() {
+        @SuppressWarnings({ "unchecked", "rawtypes" })
+        void dispatchCommand() {
+
             if (command.getOutput() instanceof StreamingOutput<?>) {
                 StreamingOutput<T> streamingOutput = (StreamingOutput<T>) command.getOutput();
 
                 if (connection instanceof StatefulRedisConnection<?, ?> && ((StatefulRedisConnection) connection).isMulti()) {
-                    streamingOutput
-                            .setSubscriber(new CompositeSubscriber<T>(Arrays.asList(this, streamingOutput.getSubscriber())));
+                    streamingOutput.setSubscriber(new CompositeSubscriber<T>(Arrays.asList(this,
+                            streamingOutput.getSubscriber())));
                 } else {
                     streamingOutput.setSubscriber(this);
                 }
@@ -376,9 +383,11 @@ void subscribe(RedisSubscription<?> subscription, Subscriber<?> subscriber) {
             void request(RedisSubscription<?> subscription, long n) {
 
                 if (Operators.checkRequest(n, subscription.subscriber)) {
+
                     Operators.addAndGet(subscription.demand, n);
 
                     if (subscription.changeState(this, DEMAND)) {
+
                         try {
                             subscription.checkCommandDispatch();
                         } catch (Exception ex) {
@@ -407,14 +416,14 @@ void onDataAvailable(RedisSubscription<?> subscription) {
                             subscription.checkOnDataAvailable();
                         } else {
 
-                            if (subscription.allDataRead && subscription.data.isEmpty()) {
+                            if (subscription.data.isEmpty() && subscription.allDataRead) {
                                 subscription.onAllDataRead();
                             } else {
                                 subscription.changeState(READING, NO_DEMAND);
                             }
                         }
                     } catch (IOException ex) {
-                        subscription.onError(ex);
+                        onError(subscription, ex);
                     }
                 }
             }

From 48e54b63ee9ef12ce3c37344eac811a7529237d0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 8 Jan 2017 21:54:51 +0100
Subject: [PATCH 110/808] Guard data queue against overflow #394

Check for the outcome when offering an element to the data queue. Send an error signal to the subscriber if the element cannot be added to the queue.
---
 src/main/java/com/lambdaworks/redis/RedisPublisher.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lambdaworks/redis/RedisPublisher.java b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
index 1528f5f0f3..eda77ceae8 100644
--- a/src/main/java/com/lambdaworks/redis/RedisPublisher.java
+++ b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
@@ -30,6 +30,7 @@
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 
+import reactor.core.Exceptions;
 import reactor.core.publisher.Operators;
 
 import com.lambdaworks.redis.api.StatefulConnection;
@@ -212,7 +213,13 @@ public void onNext(T t) {
 
             LettuceAssert.notNull(t, "Data must not be null");
 
-            data.add(t);
+            if (!data.offer(t)) {
+
+                Throwable e = Operators.onOperatorError(this, Exceptions.failWithOverflow(), t);
+                onError(e);
+                return;
+            }
+
             onDataAvailable();
         }
 

From 832b5c8b92af245e9f445e56ba6a54d5272195cf Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 8 Jan 2017 22:02:21 +0100
Subject: [PATCH 111/808] Optimize field access #394

Increase field visibility to package level to prevent synthetic accessors. Use AtomicLongFieldUpdater for demand updating that was previously an AtomicLong to reduce memory footprint. Use CommandDispatch state to perform command dispatching. That change prevents conditional code to be executed if data is requested (no demand -> demand) while command execution is allowed to happen only once.
---
 .../com/lambdaworks/redis/RedisPublisher.java | 88 +++++++++++++------
 1 file changed, 61 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/RedisPublisher.java b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
index eda77ceae8..38cb759df7 100644
--- a/src/main/java/com/lambdaworks/redis/RedisPublisher.java
+++ b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
@@ -20,9 +20,7 @@
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
@@ -32,6 +30,7 @@
 
 import reactor.core.Exceptions;
 import reactor.core.publisher.Operators;
+import reactor.util.concurrent.QueueSupplier;
 
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
@@ -125,23 +124,26 @@ public void subscribe(Subscriber<? super T> subscriber) {
      *
      * @param <T> data element type
      */
-    private static class RedisSubscription<T> implements Subscription, StreamingOutput.Subscriber<T> {
+    static class RedisSubscription<T> implements Subscription, StreamingOutput.Subscriber<T> {
 
-        private static final InternalLogger LOG = InternalLoggerFactory.getInstance(RedisPublisher.class);
-        private final boolean traceEnabled = LOG.isTraceEnabled();
+        static final InternalLogger LOG = InternalLoggerFactory.getInstance(RedisPublisher.class);
 
-        private final AtomicLong demand = new AtomicLong();
-        private final Queue<T> data = new ConcurrentLinkedQueue<T>();
-        private final AtomicBoolean dispatched = new AtomicBoolean();
-        private volatile boolean allDataRead = false;
+        static final AtomicLongFieldUpdater<RedisSubscription> DEMAND = AtomicLongFieldUpdater.newUpdater(
+                RedisSubscription.class, "demand");
 
-        private final StatefulConnection<?, ?> connection;
-        private final RedisCommand<?, ?, T> command;
-        private final boolean dissolve;
+        final boolean traceEnabled = LOG.isTraceEnabled();
+
+        final Queue<T> data = QueueSupplier.<T> unbounded().get();
+        final StatefulConnection<?, ?> connection;
+        final RedisCommand<?, ?, T> command;
+        final boolean dissolve;
+        final AtomicReference<State> state = new AtomicReference<>(State.UNSUBSCRIBED);
+        final AtomicReference<CommandDispatch> commandDispatch = new AtomicReference<>(CommandDispatch.UNDISPATCHED);
 
-        private Subscriber<? super T> subscriber;
+        volatile long demand;
+        volatile boolean allDataRead = false;
 
-        private final AtomicReference<State> state = new AtomicReference<>(State.UNSUBSCRIBED);
+        Subscriber<? super T> subscriber;
 
         RedisSubscription(StatefulConnection<?, ?> connection, RedisCommand<?, ?, T> command, boolean dissolve) {
 
@@ -279,7 +281,7 @@ private boolean readAndPublish() throws IOException {
 
                     this.subscriber.onNext(data);
 
-                    if (Operators.addAndGet(this.demand, -1) == 0) {
+                    if (Operators.addAndGet(DEMAND, this, -1) == 0) {
                         return false;
                     }
                 } else {
@@ -292,7 +294,7 @@ private boolean readAndPublish() throws IOException {
 
         /**
          * Reads data from the input, if possible.
-         * 
+         *
          * @return the data that was read or {@literal null}
          */
         protected T read() {
@@ -300,7 +302,7 @@ protected T read() {
         }
 
         private boolean hasDemand() {
-            return this.demand.get() > 0;
+            return this.demand > 0;
         }
 
         private boolean changeState(State oldState, State newState) {
@@ -308,10 +310,7 @@ private boolean changeState(State oldState, State newState) {
         }
 
         void checkCommandDispatch() {
-
-            if (!dispatched.get() && dispatched.compareAndSet(false, true)) {
-                dispatchCommand();
-            }
+            commandDispatch.get().dispatch(this);
         }
 
         @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -340,7 +339,42 @@ void checkOnDataAvailable() {
     }
 
     /**
-     * Represents a state for the {@link Subscription} to be in. The following figure indicate the four different states that
+     * Represents a state for command dispatch of the {@link Subscription}. The following figure indicates the two different
+     * states that exist, and the relationships between them.
+     *
+     * <pre>
+     *   UNDISPATCHED
+     *        |
+     *        v
+     *   DISPATCHED
+     * </pre>
+     *
+     * Refer to the individual states for more information.
+     */
+    private enum CommandDispatch {
+
+        /**
+         * Initial state. Will respond to {@link #dispatch(RedisSubscription)} by changing the state to {@link #DISPATCHED} and
+         * dispatch the command.
+         */
+        UNDISPATCHED {
+
+            @Override
+            void dispatch(RedisSubscription<?> redisSubscription) {
+
+                if (redisSubscription.commandDispatch.compareAndSet(this, DISPATCHED)) {
+                    redisSubscription.dispatchCommand();
+                }
+            }
+        },
+        DISPATCHED;
+
+        void dispatch(RedisSubscription<?> redisSubscription) {
+        }
+    }
+
+    /**
+     * Represents a state for the {@link Subscription} to be in. The following figure indicates the four different states that
      * exist, and the relationships between them.
      *
      * <pre>
@@ -355,7 +389,7 @@ void checkOnDataAvailable() {
      *    |                 v              |
      *    ------------> COMPLETED <---------
      * </pre>
-     * 
+     *
      * Refer to the individual states for more information.
      */
     private enum State {
@@ -391,7 +425,7 @@ void request(RedisSubscription<?> subscription, long n) {
 
                 if (Operators.checkRequest(n, subscription.subscriber)) {
 
-                    Operators.addAndGet(subscription.demand, n);
+                    Operators.getAndAddCap(subscription.DEMAND, subscription, n);
 
                     if (subscription.changeState(this, DEMAND)) {
 
@@ -439,7 +473,7 @@ void onDataAvailable(RedisSubscription<?> subscription) {
             void request(RedisSubscription<?> subscription, long n) {
 
                 if (Operators.checkRequest(n, subscription.subscriber)) {
-                    Operators.addAndGet(subscription.demand, n);
+                    Operators.getAndAddCap(subscription.DEMAND, subscription, n);
                 }
             }
 
@@ -450,7 +484,7 @@ void request(RedisSubscription<?> subscription, long n) {
             void request(RedisSubscription<?> subscription, long n) {
 
                 if (Operators.checkRequest(n, subscription.subscriber)) {
-                    Operators.addAndGet(subscription.demand, n);
+                    Operators.getAndAddCap(subscription.DEMAND, subscription, n);
                 }
             }
         },

From dc531035a6cf51c07194f9d3c2f5c793492a065d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 14 Jan 2017 19:40:14 +0100
Subject: [PATCH 112/808] Upgrade to netty 4.1.7 #436

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index eae715420e..1f17085b2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
         <github.site.upload.skip>true</github.site.upload.skip>
         <lettuce-release-version>4.2.2.Final</lettuce-release-version>
         <lettuce3-release-version>3.5.0.Final</lettuce3-release-version>
-        <netty-version>4.1.6.Final</netty-version>
+        <netty-version>4.1.7.Final</netty-version>
     </properties>
 
     <scm>
@@ -111,7 +111,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative</artifactId>
-            <version>1.1.33.Fork21</version>
+            <version>1.1.33.Fork25</version>
             <classifier>${os.detected.classifier}</classifier>
             <scope>provided</scope>
             <optional>true</optional>
@@ -309,7 +309,7 @@
         <profile>
             <id>netty-40</id>
             <properties>
-               <netty-version>4.0.42.Final</netty-version>
+               <netty-version>4.0.43.Final</netty-version>
             </properties>
         </profile>
         <profile>

From d6107049c48c745b5bf39bc1fd2d76999037bcab Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 19 Jan 2017 07:15:10 +0100
Subject: [PATCH 113/808] Expose a protected default constructor for
 RedisClusterClient #438

RedisClusterClient exposes now a protected default constructor so frameworks like CDI can create proxy instances. Previously, RedisClusterClient provided a private default constructor that prevents proxying as CDI cannot proxy beans (in normalscoped Scopes) without a non-private no-args constructor.
---
 .../java/com/lambdaworks/redis/RedisClient.java | 17 +++++++++--------
 .../redis/cluster/RedisClusterClient.java       |  5 ++++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/com/lambdaworks/redis/RedisClient.java
index 450bc1abaf..1b086ee106 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClient.java
@@ -67,6 +67,7 @@ protected RedisClient(ClientResources clientResources, RedisURI redisURI) {
     /**
      * Creates a uri-less RedisClient. You can connect to different Redis servers but you must supply a {@link RedisURI} on
      * connecting. Methods without having a {@link RedisURI} will fail with a {@link java.lang.IllegalStateException}.
+     * Non-private constructor to make {@link RedisClient} proxyable.
      */
     protected RedisClient() {
         this(null, EMPTY_URI);
@@ -336,8 +337,7 @@ public <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V>
         return connectPubSub(codec, redisURI, Timeout.from(redisURI));
     }
 
-    private <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec, RedisURI redisURI,
-            Timeout timeout) {
+    private <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec, RedisURI redisURI, Timeout timeout) {
 
         assertNotNull(codec);
         checkValidRedisURI(redisURI);
@@ -572,8 +572,8 @@ protected <K, V> StatefulRedisConnectionImpl<K, V> newStatefulRedisConnection(Re
      * @see RedisURI#getSentinels()
      * @see RedisURI#getSentinelMasterId()
      */
-    protected SocketAddress getSocketAddress(RedisURI redisURI)
-            throws InterruptedException, TimeoutException, ExecutionException {
+    protected SocketAddress getSocketAddress(RedisURI redisURI) throws InterruptedException, TimeoutException,
+            ExecutionException {
         SocketAddress redisAddress;
 
         if (redisURI.getSentinelMasterId() != null && !redisURI.getSentinels().isEmpty()) {
@@ -582,8 +582,8 @@ protected SocketAddress getSocketAddress(RedisURI redisURI)
             redisAddress = lookupRedis(redisURI);
 
             if (redisAddress == null) {
-                throw new RedisConnectionException(
-                        "Cannot provide redisAddress using sentinel for masterId " + redisURI.getSentinelMasterId());
+                throw new RedisConnectionException("Cannot provide redisAddress using sentinel for masterId "
+                        + redisURI.getSentinelMasterId());
             }
 
         } else {
@@ -675,8 +675,9 @@ private static void assertNotNull(ClientResources clientResources) {
     }
 
     private void checkForRedisURI() {
-        LettuceAssert.assertState(this.redisURI != EMPTY_URI,
-                "RedisURI is not available. Use RedisClient(Host), RedisClient(Host, Port) or RedisClient(RedisURI) to construct your client.");
+        LettuceAssert
+                .assertState(this.redisURI != EMPTY_URI,
+                        "RedisURI is not available. Use RedisClient(Host), RedisClient(Host, Port) or RedisClient(RedisURI) to construct your client.");
         checkValidRedisURI(this.redisURI);
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index 2d142bcb38..ab6f4d06a5 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -141,7 +141,10 @@ public class RedisClusterClient extends AbstractRedisClient {
 
     private Partitions partitions;
 
-    private RedisClusterClient() {
+    /**
+     * Non-private constructor to make {@link RedisClusterClient} proxyable.
+     */
+    protected RedisClusterClient() {
 
         super(null);
 

From af27880eb5449888763e0f1e9180e6f27502f471 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 20 Jan 2017 22:41:24 +0100
Subject: [PATCH 114/808] Propagate backpressure to the transport channel #394

Backpressure of reactive commands, more specific the missing demand, is propagated to the channel. Reactive commands receive a batch of data and are queried whether they still have a demand for data or whether their demand is satisfied (because of no demand/saturated demand). A command without demand will disable further channel reads until the command is completed/canceled or signals further demand.

A significant amount of unread data will eventually cause the TCP receive buffer to overflow. This change moves the buffer responsibility away from the application into the operating system layer which requires then appropriate receive buffer sizing. On the other side, the application is protected against buffer overflows inside the application and reduces the memory footprint because of a reduced amount of data that is held inside the application.
---
 .../com/lambdaworks/redis/RedisPublisher.java | 149 ++++++++-----
 .../redis/protocol/CommandHandler.java        |  55 +++--
 .../redis/protocol/DefaultEndpoint.java       |   9 +-
 .../redis/protocol/DemandAware.java           |  72 +++++++
 .../lambdaworks/redis/protocol/Endpoint.java  |   2 +-
 .../redis/protocol/HasQueuedCommands.java     |   2 +-
 .../ReactiveBackpressurePropagationTest.java  | 196 ++++++++++++++++++
 .../redis/ReactiveConnectionTest.java         |  22 +-
 8 files changed, 430 insertions(+), 77 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/protocol/DemandAware.java
 create mode 100644 src/test/java/com/lambdaworks/redis/ReactiveBackpressurePropagationTest.java

diff --git a/src/main/java/com/lambdaworks/redis/RedisPublisher.java b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
index 38cb759df7..62a7b0e9cf 100644
--- a/src/main/java/com/lambdaworks/redis/RedisPublisher.java
+++ b/src/main/java/com/lambdaworks/redis/RedisPublisher.java
@@ -37,6 +37,7 @@
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.output.StreamingOutput;
 import com.lambdaworks.redis.protocol.CommandWrapper;
+import com.lambdaworks.redis.protocol.DemandAware;
 import com.lambdaworks.redis.protocol.RedisCommand;
 
 import io.netty.util.internal.logging.InternalLogger;
@@ -131,7 +132,8 @@ static class RedisSubscription<T> implements Subscription, StreamingOutput.Subsc
         static final AtomicLongFieldUpdater<RedisSubscription> DEMAND = AtomicLongFieldUpdater.newUpdater(
                 RedisSubscription.class, "demand");
 
-        final boolean traceEnabled = LOG.isTraceEnabled();
+        private final SubscriptionCommand<?, ?, T> subscriptionCommand;
+        private final boolean traceEnabled = LOG.isTraceEnabled();
 
         final Queue<T> data = QueueSupplier.<T> unbounded().get();
         final StatefulConnection<?, ?> connection;
@@ -145,6 +147,7 @@ static class RedisSubscription<T> implements Subscription, StreamingOutput.Subsc
 
         Subscriber<? super T> subscriber;
 
+        @SuppressWarnings("unchecked")
         RedisSubscription(StatefulConnection<?, ?> connection, RedisCommand<?, ?, T> command, boolean dissolve) {
 
             LettuceAssert.notNull(connection, "Connection must not be null");
@@ -153,6 +156,19 @@ static class RedisSubscription<T> implements Subscription, StreamingOutput.Subsc
             this.connection = connection;
             this.command = command;
             this.dissolve = dissolve;
+
+            if (command.getOutput() instanceof StreamingOutput<?>) {
+                StreamingOutput<T> streamingOutput = (StreamingOutput<T>) command.getOutput();
+
+                if (connection instanceof StatefulRedisConnection<?, ?> && ((StatefulRedisConnection) connection).isMulti()) {
+                    streamingOutput.setSubscriber(new CompositeSubscriber<>(
+                            Arrays.asList(this, streamingOutput.getSubscriber())));
+                } else {
+                    streamingOutput.setSubscriber(this);
+                }
+            }
+
+            this.subscriptionCommand = new SubscriptionCommand<>(command, this, dissolve);
         }
 
         /**
@@ -201,10 +217,6 @@ public final void cancel() {
             state().cancel(this);
         }
 
-        private RedisPublisher.State state() {
-            return this.state.get();
-        }
-
         /**
          * Called by {@link StreamingOutput} to dispatch data (push).
          *
@@ -215,6 +227,10 @@ public void onNext(T t) {
 
             LettuceAssert.notNull(t, "Data must not be null");
 
+            if (state() == State.COMPLETED) {
+                return;
+            }
+
             if (!data.offer(t)) {
 
                 Throwable e = Operators.onOperatorError(this, Exceptions.failWithOverflow(), t);
@@ -235,7 +251,7 @@ final void onDataAvailable() {
                 LOG.trace("{} onDataAvailable()", state());
             }
 
-            this.state.get().onDataAvailable(this);
+            state().onDataAvailable(this);
         }
 
         /**
@@ -248,7 +264,7 @@ final void onAllDataRead() {
                 LOG.trace("{} onAllDataRead()", state());
             }
 
-            this.state.get().onAllDataRead(this);
+            state().onAllDataRead(this);
         }
 
         /**
@@ -262,34 +278,7 @@ final void onError(Throwable t) {
                 LOG.trace("{} onError(): {}", state(), t.toString(), t);
             }
 
-            this.state.get().onError(this, t);
-        }
-
-        /**
-         * Reads and publishes data from the input. Continues until either there is no more demand, or until there is no more
-         * data to be read.
-         *
-         * @return {@literal true} if there is more demand, {@literal false} otherwise.
-         */
-        private boolean readAndPublish() throws IOException {
-
-            while (hasDemand()) {
-
-                T data = read();
-
-                if (data != null) {
-
-                    this.subscriber.onNext(data);
-
-                    if (Operators.addAndGet(DEMAND, this, -1) == 0) {
-                        return false;
-                    }
-                } else {
-                    return true;
-                }
-            }
-
-            return false;
+            state().onError(this, t);
         }
 
         /**
@@ -315,26 +304,51 @@ void checkCommandDispatch() {
 
         @SuppressWarnings({ "unchecked", "rawtypes" })
         void dispatchCommand() {
+            connection.dispatch((RedisCommand) subscriptionCommand);
+        }
 
-            if (command.getOutput() instanceof StreamingOutput<?>) {
-                StreamingOutput<T> streamingOutput = (StreamingOutput<T>) command.getOutput();
+        void checkOnDataAvailable() {
 
-                if (connection instanceof StatefulRedisConnection<?, ?> && ((StatefulRedisConnection) connection).isMulti()) {
-                    streamingOutput.setSubscriber(new CompositeSubscriber<T>(Arrays.asList(this,
-                            streamingOutput.getSubscriber())));
-                } else {
-                    streamingOutput.setSubscriber(this);
+            if (data.isEmpty()) {
+                if (hasDemand()) {
+                    state().readData(this);
                 }
             }
 
-            connection.dispatch(new SubscriptionCommand(command, this, dissolve));
+            if (!data.isEmpty()) {
+                onDataAvailable();
+            }
         }
 
-        void checkOnDataAvailable() {
+        /**
+         * Reads and publishes data from the input. Continues until either there is no more demand, or until there is no more
+         * data to be read.
+         *
+         * @return {@literal true} if there is more demand, {@literal false} otherwise.
+         */
+        private boolean readAndPublish() throws IOException {
 
-            if (!data.isEmpty()) {
-                onDataAvailable();
+            while (hasDemand()) {
+
+                T data = read();
+
+                if (data != null) {
+
+                    this.subscriber.onNext(data);
+
+                    if (Operators.addAndGet(DEMAND, this, -1) == 0) {
+                        return false;
+                    }
+                } else {
+                    return true;
+                }
             }
+
+            return false;
+        }
+
+        RedisPublisher.State state() {
+            return this.state.get();
         }
     }
 
@@ -425,7 +439,7 @@ void request(RedisSubscription<?> subscription, long n) {
 
                 if (Operators.checkRequest(n, subscription.subscriber)) {
 
-                    Operators.getAndAddCap(subscription.DEMAND, subscription, n);
+                    Operators.getAndAddCap(RedisSubscription.DEMAND, subscription, n);
 
                     if (subscription.changeState(this, DEMAND)) {
 
@@ -473,7 +487,7 @@ void onDataAvailable(RedisSubscription<?> subscription) {
             void request(RedisSubscription<?> subscription, long n) {
 
                 if (Operators.checkRequest(n, subscription.subscriber)) {
-                    Operators.getAndAddCap(subscription.DEMAND, subscription, n);
+                    Operators.getAndAddCap(RedisSubscription.DEMAND, subscription, n);
                 }
             }
 
@@ -484,7 +498,7 @@ void request(RedisSubscription<?> subscription, long n) {
             void request(RedisSubscription<?> subscription, long n) {
 
                 if (Operators.checkRequest(n, subscription.subscriber)) {
-                    Operators.getAndAddCap(subscription.DEMAND, subscription, n);
+                    Operators.getAndAddCap(RedisSubscription.DEMAND, subscription, n);
                 }
             }
         },
@@ -526,7 +540,16 @@ void request(RedisSubscription<?> subscription, long n) {
         void cancel(RedisSubscription<?> subscription) {
 
             subscription.command.cancel();
-            subscription.changeState(this, COMPLETED);
+            if (subscription.changeState(this, COMPLETED)) {
+                readData(subscription);
+            }
+        }
+
+        void readData(RedisSubscription<?> subscription) {
+            DemandAware.Source source = subscription.subscriptionCommand.source;
+            if (source != null) {
+                source.requestMore();
+            }
         }
 
         void onDataAvailable(RedisSubscription<?> subscription) {
@@ -538,6 +561,7 @@ void onAllDataRead(RedisSubscription<?> subscription) {
             subscription.allDataRead = true;
 
             if (subscription.data.isEmpty() && subscription.changeState(this, COMPLETED)) {
+                readData(subscription);
                 if (subscription.subscriber != null) {
                     subscription.subscriber.onComplete();
                 }
@@ -547,6 +571,7 @@ void onAllDataRead(RedisSubscription<?> subscription) {
         void onError(RedisSubscription<?> subscription, Throwable t) {
 
             if (subscription.changeState(this, COMPLETED)) {
+                readData(subscription);
                 if (subscription.subscriber != null) {
                     subscription.subscriber.onError(t);
                 }
@@ -561,11 +586,12 @@ void onError(RedisSubscription<?> subscription, Throwable t) {
      * @param <V> value type
      * @param <T> response type
      */
-    private static class SubscriptionCommand<K, V, T> extends CommandWrapper<K, V, T> {
+    private static class SubscriptionCommand<K, V, T> extends CommandWrapper<K, V, T> implements DemandAware.Sink {
 
         private final boolean dissolve;
         private final RedisSubscription<T> subscription;
-        private boolean completed = false;
+        private volatile boolean completed = false;
+        private volatile DemandAware.Source source;
 
         public SubscriptionCommand(RedisCommand<K, V, T> command, RedisSubscription<T> subscription, boolean dissolve) {
 
@@ -575,6 +601,13 @@ public SubscriptionCommand(RedisCommand<K, V, T> command, RedisSubscription<T> s
             this.dissolve = dissolve;
         }
 
+        @Override
+        public boolean hasDemand() {
+
+            // signal demand as completed commands just no-op on incoming data.
+            return completed || subscription.state() == State.COMPLETED || subscription.demand > subscription.data.size();
+        }
+
         @Override
         @SuppressWarnings("unchecked")
         public void complete() {
@@ -598,7 +631,9 @@ public void complete() {
                     if (!(getOutput() instanceof StreamingOutput<?>) && result != null) {
 
                         if (dissolve && result instanceof Collection) {
+
                             Collection<T> collection = (Collection<T>) result;
+
                             for (T t : collection) {
                                 if (t != null) {
                                     subscription.onNext(t);
@@ -617,6 +652,16 @@ public void complete() {
             }
         }
 
+        @Override
+        public void setSource(DemandAware.Source source) {
+            this.source = source;
+        }
+
+        @Override
+        public void removeSource() {
+            this.source = null;
+        }
+
         @Override
         public void cancel() {
 
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java b/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
index 8a8533a040..61dc9acc16 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
@@ -62,11 +62,12 @@ public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCom
     private final RedisStateMachine rsm = new RedisStateMachine();
     private final boolean traceEnabled = logger.isTraceEnabled();
     private final boolean debugEnabled = logger.isDebugEnabled();
+    private final BackpressureSource backpressureSource = new BackpressureSource();
 
     private final ClientResources clientResources;
     private final Endpoint endpoint;
 
-    private Channel channel;
+    Channel channel;
     private ByteBuf buffer;
     private LifecycleState lifecycleState = LifecycleState.NOT_CONNECTED;
     private String logPrefix;
@@ -196,13 +197,10 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
         endpoint.notifyChannelActive(ctx.channel());
 
         super.channelActive(ctx);
+
         if (channel != null) {
-            channel.eventLoop().submit(new Runnable() {
-                @Override
-                public void run() {
-                    channel.pipeline().fireUserEventTriggered(new ConnectionEvents.Activated());
-                }
-            });
+            channel.eventLoop().submit(
+                    (Runnable) () -> channel.pipeline().fireUserEventTriggered(new ConnectionEvents.Activated()));
         }
 
         if (debugEnabled) {
@@ -227,8 +225,8 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
         }
 
         setState(LifecycleState.DISCONNECTED);
-
         setState(LifecycleState.DEACTIVATING);
+
         endpoint.notifyChannelInactive(ctx.channel());
         endpoint.notifyDrainQueuedCommands(this);
 
@@ -316,9 +314,24 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
             WithLatency withLatency = getWithLatency(command);
 
             if (!rsm.decode(buffer, command, command.getOutput())) {
+
+                if (command instanceof DemandAware.Sink) {
+
+                    DemandAware.Sink sink = (DemandAware.Sink) command;
+                    sink.setSource(backpressureSource);
+
+                    if (!sink.hasDemand()) {
+                        ctx.channel().config().setAutoRead(false);
+                    }
+                }
+
                 return;
             }
 
+            if (!ctx.channel().config().isAutoRead()) {
+                ctx.channel().config().setAutoRead(true);
+            }
+
             recordLatency(withLatency, command.getType());
 
             queue.poll();
@@ -336,12 +349,17 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
     }
 
     private WithLatency getWithLatency(RedisCommand<?, ?, ?> command) {
+
         WithLatency withLatency = null;
 
         if (clientResources.commandLatencyCollector().isEnabled()) {
+
             RedisCommand<?, ?, ?> unwrappedCommand = CommandWrapper.unwrap(command);
+
             if (unwrappedCommand instanceof WithLatency) {
+
                 withLatency = (WithLatency) unwrappedCommand;
+
                 if (withLatency.getFirstResponse() == -1) {
                     withLatency.firstResponse(nanoTime());
                 }
@@ -357,14 +375,13 @@ protected boolean decode(ByteBuf buffer, CommandOutput<?, ?, ?> output) {
 
     private void recordLatency(WithLatency withLatency, ProtocolKeyword commandType) {
 
-        if (withLatency != null && clientResources.commandLatencyCollector().isEnabled() && channel != null
-                && remote() != null) {
+        if (withLatency != null && clientResources.commandLatencyCollector().isEnabled() && channel != null && remote() != null) {
 
             long firstResponseLatency = nanoTime() - withLatency.getFirstResponse();
             long completionLatency = nanoTime() - withLatency.getSent();
 
-            clientResources.commandLatencyCollector().recordCommandLatency(local(), remote(), commandType, firstResponseLatency,
-                    completionLatency);
+            clientResources.commandLatencyCollector().recordCommandLatency(local(), remote(), commandType,
+                    firstResponseLatency, completionLatency);
         }
     }
 
@@ -516,4 +533,18 @@ protected String logPrefix() {
     public enum LifecycleState {
         NOT_CONNECTED, REGISTERED, CONNECTED, ACTIVATING, ACTIVE, DISCONNECTED, DEACTIVATING, DEACTIVATED, CLOSED,
     }
+
+    /**
+     * Source for backpressure.
+     */
+    class BackpressureSource implements DemandAware.Source {
+
+        @Override
+        public void requestMore() {
+
+            if (isConnected() && !isClosed() && !channel.config().isAutoRead()) {
+                channel.config().setAutoRead(true);
+            }
+        }
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java b/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
index d03091b20f..1e26d9e8f5 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
@@ -60,7 +60,6 @@ public class DefaultEndpoint implements RedisChannelWriter, Endpoint, HasQueuedC
     private final ClientOptions clientOptions;
 
     private final QueuedCommands queuedCommands = new QueuedCommands();
-    private final boolean traceEnabled = logger.isTraceEnabled();
     private final boolean debugEnabled = logger.isDebugEnabled();
 
     protected volatile Channel channel;
@@ -418,6 +417,14 @@ public void notifyDrainQueuedCommands(HasQueuedCommands queuedCommands) {
         sharedLock.doExclusive(() -> {
 
             List<RedisCommand<?, ?, ?>> commands = drainCommands(queuedCommands.getQueue());
+
+            for (RedisCommand<?, ?, ?> command : commands) {
+
+                if (command instanceof DemandAware.Sink) {
+                    ((DemandAware.Sink) command).removeSource();
+                }
+            }
+
             Collections.reverse(commands);
 
             logger.debug("{} notifyQueuedCommands {} command(s) added to buffer", logPrefix(), commands.size());
diff --git a/src/main/java/com/lambdaworks/redis/protocol/DemandAware.java b/src/main/java/com/lambdaworks/redis/protocol/DemandAware.java
new file mode 100644
index 0000000000..f713444d97
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/protocol/DemandAware.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.protocol;
+
+/**
+ * Interface for demand-aware components.
+ * <p>
+ * A demand-aware component is aware of its demand for data that is read from the {@link Source} and possibly awaits processing.
+ * A {@link Sink} with demand is ready to process data. A {@link Sink} without demand signals that it's ability to keep up with
+ * the incoming data is no longer given and it wishes to receive no more data. Submitting more data could cause overload and
+ * exhaust buffer space.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public interface DemandAware {
+
+    /**
+     * A demand-aware {@link Sink} that accepts data. It can signal its {@link Source} demand/readiness to emit more data.
+     * Instances of implementing classes are required to be thread-safe as they are shared amongst multiple threads.
+     */
+    interface Sink {
+
+        /**
+         * Returns {@literal true} if the {@link Sink} has demand or {@literal false} if the source has no demand.
+         * {@literal false} means either the {@link Sink} has no demand in general because data is not needed or the current
+         * demand is saturated.
+         * 
+         * @return {@literal true} if the {@link Sink} demands data.
+         */
+        boolean hasDemand();
+
+        /**
+         * Sets the {@link Source} for a {@link Sink}. The {@link Sink} is notified by this {@link Source} if the source
+         * indicates new demand or the sink catches up so it's ready to receive more data.
+         * 
+         * @param source the reference to the data {@link Source}, must not be {@literal null}.
+         */
+        void setSource(Source source);
+
+        /**
+         * Removes the {@link Source} reference from this {@link Sink}. Any previously set {@link Source} will no longer be
+         * asked for data.
+         */
+        void removeSource();
+    }
+
+    /**
+     * A {@link Source} provides data to a {@link DemandAware} and can be notified to produce more input for the command.
+     * Instances of implementing classes are required to be thread-safe as they are shared amongst multiple threads.
+     */
+    interface Source {
+
+        /**
+         * Signals demand to the {@link Source}
+         */
+        void requestMore();
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/protocol/Endpoint.java b/src/main/java/com/lambdaworks/redis/protocol/Endpoint.java
index 0ac5736e15..e0d73b15f4 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/Endpoint.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/Endpoint.java
@@ -25,7 +25,7 @@
  *
  * @author Mark Paluch
  */
-interface Endpoint {
+public interface Endpoint {
 
     /**
      * Notify about channel activation.
diff --git a/src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java b/src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java
index 37beac56ab..b68e99b726 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java
@@ -23,7 +23,7 @@
  *
  * @author Mark Paluch
  */
-interface HasQueuedCommands {
+public interface HasQueuedCommands {
 
     /**
      * The queue holding commands.
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveBackpressurePropagationTest.java b/src/test/java/com/lambdaworks/redis/ReactiveBackpressurePropagationTest.java
new file mode 100644
index 0000000000..81f83e7738
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/ReactiveBackpressurePropagationTest.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import reactor.core.Cancellation;
+import reactor.core.publisher.Flux;
+import reactor.core.scheduler.Schedulers;
+
+import com.lambdaworks.redis.api.StatefulConnection;
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.metrics.CommandLatencyCollector;
+import com.lambdaworks.redis.output.ValueListOutput;
+import com.lambdaworks.redis.protocol.*;
+import com.lambdaworks.redis.resource.ClientResources;
+
+import io.netty.buffer.Unpooled;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.channel.local.LocalAddress;
+
+/**
+ * @author Mark Paluch
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class ReactiveBackpressurePropagationTest {
+
+    private CommandHandler commandHandler;
+    private EmbeddedChannel embeddedChannel;
+
+    @Mock
+    private Endpoint endpoint;
+
+    @Mock
+    private ClientResources clientResources;
+
+    @Mock
+    private CommandLatencyCollector latencyCollector;
+
+    @Mock
+    private StatefulConnection statefulConnection;
+
+    @Before
+    public void before() throws Exception {
+
+        commandHandler = new CommandHandler(clientResources, endpoint);
+
+        when(clientResources.commandLatencyCollector()).thenReturn(latencyCollector);
+        when(statefulConnection.dispatch(any())).thenAnswer(invocation -> {
+
+            RedisCommand command = (RedisCommand) invocation.getArguments()[0];
+            embeddedChannel.writeOutbound(command);
+            return command;
+        });
+
+        embeddedChannel = new EmbeddedChannel(commandHandler);
+        embeddedChannel.connect(new LocalAddress("remote"));
+    }
+
+    @Test
+    public void writeCommand() throws Exception {
+
+        Command<String, String, List<String>> lrange = new Command<>(CommandType.LRANGE,
+                new ValueListOutput<>(StringCodec.UTF8));
+        RedisPublisher<String, String, String> publisher = new RedisPublisher<>((Command) lrange, statefulConnection, true);
+
+        CountDownLatch pressureArrived = new CountDownLatch(1);
+        CountDownLatch buildPressure = new CountDownLatch(1);
+        CountDownLatch waitForPressureReduced = new CountDownLatch(2);
+        CountDownLatch waitForWorkCompleted = new CountDownLatch(4);
+
+        Flux.from(publisher).limitRate(2).publishOn(Schedulers.single()).doOnNext(s -> {
+
+            try {
+                pressureArrived.countDown();
+                buildPressure.await();
+            } catch (InterruptedException e) {
+            }
+
+            waitForPressureReduced.countDown();
+            waitForWorkCompleted.countDown();
+
+        }).subscribe();
+
+        assertThat(embeddedChannel.config().isAutoRead()).isTrue();
+
+        // produce some back pressure
+        embeddedChannel.writeInbound(Unpooled.wrappedBuffer(RESP.arrayHeader(4)));
+        embeddedChannel.writeInbound(Unpooled.wrappedBuffer(RESP.bulkString("one")));
+        pressureArrived.await();
+        assertThat(embeddedChannel.config().isAutoRead()).isTrue();
+
+        embeddedChannel.writeInbound(Unpooled.wrappedBuffer(RESP.bulkString("two")));
+        embeddedChannel.writeInbound(Unpooled.wrappedBuffer(RESP.bulkString("three")));
+        assertThat(embeddedChannel.config().isAutoRead()).isFalse();
+
+        // allow processing
+        buildPressure.countDown();
+
+        // wait until processing caught up
+        waitForPressureReduced.await();
+        assertThat(embeddedChannel.config().isAutoRead()).isTrue();
+
+        // emit the last item
+        embeddedChannel.writeInbound(Unpooled.wrappedBuffer(RESP.bulkString("four")));
+
+        // done
+        waitForWorkCompleted.await();
+        assertThat(embeddedChannel.config().isAutoRead()).isTrue();
+    }
+
+    @Test
+    public void writeCommandAndCancelInTheMiddle() throws Exception {
+
+        Command<String, String, List<String>> lrange = new Command<>(CommandType.LRANGE,
+                new ValueListOutput<>(StringCodec.UTF8));
+        RedisPublisher<String, String, String> publisher = new RedisPublisher<>((Command) lrange, statefulConnection, true);
+
+        CountDownLatch pressureArrived = new CountDownLatch(1);
+        CountDownLatch buildPressure = new CountDownLatch(1);
+        CountDownLatch waitForPressureReduced = new CountDownLatch(2);
+
+        Cancellation cancellation = Flux.from(publisher).limitRate(2).publishOn(Schedulers.single()).doOnNext(s -> {
+
+            try {
+                pressureArrived.countDown();
+                buildPressure.await();
+            } catch (InterruptedException e) {
+            }
+
+            waitForPressureReduced.countDown();
+
+        }).subscribe();
+
+        assertThat(embeddedChannel.config().isAutoRead()).isTrue();
+
+        // produce some back pressure
+        embeddedChannel.writeInbound(Unpooled.wrappedBuffer(RESP.arrayHeader(4)));
+        embeddedChannel.writeInbound(Unpooled.wrappedBuffer(RESP.bulkString("one")));
+        pressureArrived.await();
+        assertThat(embeddedChannel.config().isAutoRead()).isTrue();
+
+        embeddedChannel.writeInbound(Unpooled.wrappedBuffer(RESP.bulkString("two")));
+        embeddedChannel.writeInbound(Unpooled.wrappedBuffer(RESP.bulkString("three")));
+        assertThat(embeddedChannel.config().isAutoRead()).isFalse();
+
+        cancellation.dispose();
+
+        assertThat(embeddedChannel.config().isAutoRead()).isTrue();
+
+        // allow processing
+        buildPressure.countDown();
+
+        // emit the last item
+        embeddedChannel.writeInbound(Unpooled.wrappedBuffer(RESP.bulkString("four")));
+
+        // done
+        assertThat(embeddedChannel.config().isAutoRead()).isTrue();
+    }
+
+    static class RESP {
+
+        static byte[] arrayHeader(int count) {
+            return String.format("*%d\r\n", count).getBytes();
+        }
+
+        static byte[] bulkString(String string) {
+            return String.format("$%d\r\n%s\r\n", string.getBytes().length, string).getBytes();
+        }
+    }
+
+}
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
index c95498c5e3..23faab5a1f 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
@@ -34,16 +34,16 @@
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
+
 import com.lambdaworks.Delay;
 import com.lambdaworks.Wait;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
 import com.lambdaworks.redis.reactive.TestSubscriber;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
-
 public class ReactiveConnectionTest extends AbstractRedisClientTest {
 
     private RedisReactiveCommands<String, String> reactive;
@@ -187,8 +187,8 @@ public void reactiveChain() throws Exception {
 
         reactive.mset(map).block();
 
-        List<String> values = reactive.keys("*").flatMap(s -> reactive.get(s)).collectList().subscribeOn(Schedulers.immediate())
-                .block();
+        List<String> values = reactive.keys("*").flatMap(s -> reactive.get(s)).collectList()
+                .subscribeOn(Schedulers.immediate()).block();
 
         assertThat(values).hasSize(2).contains(value, "value1");
     }
@@ -225,12 +225,14 @@ public void subscribeWithDisconnectedClient() throws Exception {
 
             Mono<String> ping = connection.reactive().ping();
 
-            ping.subscribeWith(TestSubscriber.create()).assertErrorWith(throwable -> {
+            ping.subscribeWith(TestSubscriber.create())
+                    .assertErrorWith(
+                            throwable -> {
 
-                assertThat(throwable).isInstanceOf(RedisException.class)
-                        .hasMessageContaining("not connected. Commands are rejected");
+                                assertThat(throwable).isInstanceOf(RedisException.class).hasMessageContaining(
+                                        "not connected. Commands are rejected");
 
-            }).await();
+                            }).await();
         }
     }
 

From 866781a267c57db63bb0e604f1fd2391b1b06427 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 21 Jan 2017 22:34:02 +0100
Subject: [PATCH 115/808] =?UTF-8?q?Fix=20Partitions.addPartition(=E2=80=A6?=
 =?UTF-8?q?)=20and=20Partitions.reload(=E2=80=A6)=20synchronization=20#442?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Partitions.addPartition(…) and Partitions.reload(…) are now correctly synchronized by using the correct mutex, the mutable partitions collection that is used as well by other methods.

Wrong synchronization could lead to concurrent modifications that are terminated with a ConcurrentModificationException so topology updates could fail. This race can be caused if topology updates are executed by two updates that are executed at the same time because of network congestion/slow updating or a a concurrent update by the background updater and an update outside the client.
---
 .../redis/cluster/models/partitions/Partitions.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java b/src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java
index bfe97eaf48..d2a9a7be6e 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java
@@ -146,7 +146,7 @@ public void addPartition(RedisClusterNode partition) {
 
         LettuceAssert.notNull(partition, "Partition must not be null");
 
-        synchronized (this) {
+        synchronized (partitions) {
             slotCache = EMPTY;
             partitions.add(partition);
         }
@@ -179,7 +179,7 @@ public void reload(List<RedisClusterNode> partitions) {
 
         LettuceAssert.noNullElements(partitions, "Partitions must not contain null elements");
 
-        synchronized (partitions) {
+        synchronized (this.partitions) {
             this.partitions.clear();
             this.partitions.addAll(partitions);
             updateCache();

From d51b44299e782de1c8939df8dfe8719e0dad1523 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 21 Jan 2017 22:36:02 +0100
Subject: [PATCH 116/808] Reuse stale connections collection when closing stale
 connections #443

Stale connections expiry now uses the same collection of connections to prevent stale expiry preparation and the actual closing to use different connections.
---
 .../PooledClusterConnectionProvider.java      | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java b/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
index 9705677c4c..a1e2c53023 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
@@ -306,7 +306,7 @@ private void reconfigurePartitions() {
         }
 
         resetFastConnectionCache();
-        closeStaleConnections();
+        closeStaleConnections(staleConnections);
     }
 
     /**
@@ -314,9 +314,14 @@ private void reconfigurePartitions() {
      */
     @Override
     public void closeStaleConnections() {
-        logger.debug("closeStaleConnections() count before expiring: {}", getConnectionCount());
 
         Set<ConnectionKey> stale = getStaleConnectionKeys();
+        closeStaleConnections(stale);
+    }
+
+    protected void closeStaleConnections(Set<ConnectionKey> stale) {
+
+        logger.debug("closeStaleConnections() count before expiring: {}", getConnectionCount());
 
         for (ConnectionKey connectionKey : stale) {
             StatefulRedisConnection<K, V> connection = connections.get(connectionKey);
@@ -360,6 +365,7 @@ private Set<ConnectionKey> getStaleConnectionKeys() {
      */
     @Override
     public void setAutoFlushCommands(boolean autoFlush) {
+
         synchronized (stateLock) {
             this.autoFlushCommands = autoFlush;
         }
@@ -378,6 +384,7 @@ public void flushCommands() {
 
     @Override
     public void setReadFrom(ReadFrom readFrom) {
+
         synchronized (stateLock) {
             this.readFrom = readFrom;
             Arrays.fill(readers, null);
@@ -404,10 +411,10 @@ long getConnectionCount() {
      * Synchronize on {@code stateLock} to initiate a happens-before relation and clear the thread caches of other threads.
      */
     private void resetFastConnectionCache() {
+
         synchronized (stateLock) {
             Arrays.fill(writers, null);
             Arrays.fill(readers, null);
-
         }
     }
 
@@ -417,12 +424,15 @@ private static RuntimeException invalidConnectionPoint(String message) {
     }
 
     Supplier<SocketAddress> getSocketAddressSupplier(final ConnectionKey connectionKey) {
+
         return () -> {
+
             if (connectionKey.nodeId != null) {
                 SocketAddress socketAddress = getSocketAddress(connectionKey.nodeId);
                 logger.debug("Resolved SocketAddress {} using for Cluster node {}", socketAddress, connectionKey.nodeId);
                 return socketAddress;
             }
+
             SocketAddress socketAddress = new InetSocketAddress(connectionKey.host, connectionKey.port);
             logger.debug("Resolved SocketAddress {} using for Cluster node at {}:{}", socketAddress, connectionKey.host,
                     connectionKey.port);
@@ -431,6 +441,7 @@ Supplier<SocketAddress> getSocketAddressSupplier(final ConnectionKey connectionK
     }
 
     private SocketAddress getSocketAddress(String nodeId) {
+
         for (RedisClusterNode partition : partitions) {
             if (partition.getNodeId().equals(nodeId)) {
                 return SocketAddressResolver.resolve(partition.getUri(), redisClusterClient.getResources().dnsResolver());
@@ -465,6 +476,7 @@ public ConnectionKey(Intent intent, String host, int port) {
 
         @Override
         public boolean equals(Object o) {
+
             if (this == o)
                 return true;
             if (!(o instanceof ConnectionKey))
@@ -483,12 +495,26 @@ public boolean equals(Object o) {
 
         @Override
         public int hashCode() {
+
             int result = intent != null ? intent.name().hashCode() : 0;
             result = 31 * result + (nodeId != null ? nodeId.hashCode() : 0);
             result = 31 * result + (host != null ? host.hashCode() : 0);
             result = 31 * result + port;
             return result;
         }
+
+        @Override
+        public String toString() {
+
+            StringBuffer sb = new StringBuffer();
+            sb.append(getClass().getSimpleName());
+            sb.append(" [intent=").append(intent);
+            sb.append(", nodeId='").append(nodeId).append('\'');
+            sb.append(", host='").append(host).append('\'');
+            sb.append(", port=").append(port);
+            sb.append(']');
+            return sb.toString();
+        }
     }
 
     boolean validateClusterNodeMembership() {
@@ -588,6 +614,5 @@ public StatefulRedisConnection<K, V> apply(ConnectionKey key) {
     }
 
     interface ClusterNodeConnectionFactory<K, V> extends Function<ConnectionKey, StatefulRedisConnection<K, V>> {
-
     }
 }

From 7df2d0ff2fec069a223557f2d10c69af58a1d775 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 21 Jan 2017 22:36:24 +0100
Subject: [PATCH 117/808] Polishing

---
 .../com/lambdaworks/redis/dynamic/segment/CommandSegment.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java b/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java
index 9559682c62..bb7dcea60b 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java
@@ -67,7 +67,8 @@ public static CommandSegment indexedParameter(int index) {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer();
+
+        StringBuffer sb = new StringBuffer();
         sb.append(getClass().getSimpleName());
         sb.append(" ").append(asString());
         return sb.toString();

From 9fdd5970952b30ac8ebe83ec1da168c9f00d328b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 23 Jan 2017 20:35:58 +0100
Subject: [PATCH 118/808] Ensure RoundRobinSocketAddressSupplier consistency
 before returning a SocketAddress #440

RoundRobinSocketAddressSupplier now checks whether its partition collection reference contains all nodes before returning a SocketAddress.
In case of an inconsistency, RoundRobinSocketAddressSupplier is refreshed with the current cluster nodes and round-robin is re-initialized starting with the first node.

Previously, Partitions could contain less nodes so stale nodes remained active. In case of a topology update, Partitions contains less nodes (e.g. because a cluster node was removed) but the cluster node was still references by RoundRobinSocketAddressSupplier. This caused a reconnect attempt to a node which was no longer part of the cluster.
---
 .../RoundRobinSocketAddressSupplier.java      |  5 +++-
 .../RoundRobinSocketAddressSupplierTest.java  | 28 +++++++++++++++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java b/src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java
index da553a8425..19a713d4bc 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java
@@ -62,7 +62,8 @@ public RoundRobinSocketAddressSupplier(Collection<RedisClusterNode> partitions,
 
     @Override
     public SocketAddress get() {
-        if (!clusterNodes.containsAll(partitions)) {
+
+        if (!clusterNodes.containsAll(partitions) || !partitions.containsAll(clusterNodes)) {
             resetRoundRobin();
         }
 
@@ -71,12 +72,14 @@ public SocketAddress get() {
     }
 
     protected void resetRoundRobin() {
+
         clusterNodes.clear();
         clusterNodes.addAll(sortFunction.apply(partitions));
         roundRobin.offset = null;
     }
 
     protected SocketAddress getSocketAddress(RedisClusterNode redisClusterNode) {
+
         SocketAddress resolvedAddress = SocketAddressResolver.resolve(redisClusterNode.getUri(), clientResources.dnsResolver());
         logger.debug("Resolved SocketAddress {} using for Cluster node {}", resolvedAddress, redisClusterNode.getNodeId());
         return resolvedAddress;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java b/src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java
index 410b7a0e51..7053d8b0c2 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java
@@ -22,18 +22,18 @@
 import java.util.HashSet;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.resource.ClientResources;
-import com.lambdaworks.redis.resource.DnsResolvers;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import com.lambdaworks.redis.resource.ClientResources;
+import com.lambdaworks.redis.resource.DnsResolvers;
 
 /**
  * @author Mark Paluch
@@ -52,6 +52,7 @@ public class RoundRobinSocketAddressSupplierTest {
 
     @BeforeClass
     public static void beforeClass() throws Exception {
+
         hap1.getResolvedAddress();
         hap2.getResolvedAddress();
         hap3.getResolvedAddress();
@@ -88,7 +89,7 @@ public void noOffset() throws Exception {
     }
 
     @Test
-    public void partitionTableChanges() throws Exception {
+    public void partitionTableChangesNewNode() throws Exception {
 
         RoundRobinSocketAddressSupplier sut = new RoundRobinSocketAddressSupplier(partitions, redisClusterNodes -> redisClusterNodes,
                 clientResourcesMock);
@@ -106,4 +107,19 @@ public void partitionTableChanges() throws Exception {
         assertThat(sut.get()).isEqualTo(hap1.getResolvedAddress());
     }
 
+    @Test
+    public void partitionTableChangesNodeRemoved() throws Exception {
+
+        RoundRobinSocketAddressSupplier sut = new RoundRobinSocketAddressSupplier(partitions,
+                redisClusterNodes -> redisClusterNodes, clientResourcesMock);
+
+        assertThat(sut.get()).isEqualTo(hap1.getResolvedAddress());
+        assertThat(sut.get()).isEqualTo(hap2.getResolvedAddress());
+
+        partitions.remove(partitions.getPartition(2));
+
+        assertThat(sut.get()).isEqualTo(hap1.getResolvedAddress());
+        assertThat(sut.get()).isEqualTo(hap2.getResolvedAddress());
+        assertThat(sut.get()).isEqualTo(hap1.getResolvedAddress());
+    }
 }

From 0826a09425648a22d33bea5700241770eb827eec Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 22 Jan 2017 20:57:14 +0100
Subject: [PATCH 119/808] Fix ClientResources usage in tests #445

---
 .../java/com/lambdaworks/TestClientResources.java | 15 +++++++++++++--
 .../redis/RedisClientListenerTest.java            |  7 +------
 .../redis/cluster/ClusterPartiallyDownTest.java   |  9 ++++++++-
 .../redis/support/ConnectionPoolSupportTest.java  |  2 +-
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/test/java/com/lambdaworks/TestClientResources.java b/src/test/java/com/lambdaworks/TestClientResources.java
index 2acd2530db..58b102d60a 100644
--- a/src/test/java/com/lambdaworks/TestClientResources.java
+++ b/src/test/java/com/lambdaworks/TestClientResources.java
@@ -33,9 +33,16 @@ public class TestClientResources {
     private final static TestClientResources instance = new TestClientResources();
     private ClientResources clientResources = create();
 
+    /**
+     * Creates a new {@link ClientResources} instance and registers a shutdown hook to de-allocate the instance upon JVM
+     * shutdown.
+     * 
+     * @return a new {@link ClientResources} instance.
+     */
     public static ClientResources create() {
-        final DefaultClientResources resources = DefaultClientResources.builder().eventLoopGroupProvider(
-                new TestEventLoopGroupProvider()).build();
+
+        final DefaultClientResources resources = DefaultClientResources.builder()
+                .eventLoopGroupProvider(new TestEventLoopGroupProvider()).build();
 
         Runtime.getRuntime().addShutdownHook(new Thread() {
             @Override
@@ -51,6 +58,10 @@ public void run() {
         return resources;
     }
 
+    /**
+     * @return the default {@link ClientResources} instance used across multiple tests. The returned instance must not be shut
+     *         down.
+     */
     public static ClientResources get() {
         return instance.clientResources;
     }
diff --git a/src/test/java/com/lambdaworks/redis/RedisClientListenerTest.java b/src/test/java/com/lambdaworks/redis/RedisClientListenerTest.java
index 76f70bb341..786e1d76c1 100644
--- a/src/test/java/com/lambdaworks/redis/RedisClientListenerTest.java
+++ b/src/test/java/com/lambdaworks/redis/RedisClientListenerTest.java
@@ -42,12 +42,7 @@ public class RedisClientListenerTest extends AbstractTest {
 
     @BeforeClass
     public static void beforeClass() throws Exception {
-        DEFAULT_RESOURCES = TestClientResources.create();
-    }
-
-    @AfterClass
-    public static void afterClass() throws Exception {
-        DEFAULT_RESOURCES.shutdown(100, 100, TimeUnit.MILLISECONDS).get();
+        DEFAULT_RESOURCES = TestClientResources.get();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java
index 1a98512dcf..24cb6666c3 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java
@@ -25,6 +25,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.lambdaworks.TestClientResources;
@@ -39,7 +40,8 @@
  * @author Mark Paluch
  */
 public class ClusterPartiallyDownTest extends AbstractTest {
-    private static ClientResources clientResources = TestClientResources.create();
+
+    private static ClientResources clientResources;
 
     private static int port1 = 7579;
     private static int port2 = 7580;
@@ -53,6 +55,11 @@ public class ClusterPartiallyDownTest extends AbstractTest {
 
     private RedisClusterClient redisClusterClient;
 
+    @BeforeClass
+    public static void beforeClass() {
+        clientResources = TestClientResources.get();
+    }
+
     @Before
     public void before() throws Exception {
 
diff --git a/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java b/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java
index 2112e789d2..cb39a76ee1 100644
--- a/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java
+++ b/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java
@@ -184,7 +184,7 @@ public void wrappedMasterSlaveConnectionShouldUseWrappers() throws Exception {
     @Test
     public void wrappedClusterConnectionShouldUseWrappers() throws Exception {
 
-        RedisClusterClient redisClusterClient = RedisClusterClient.create(TestClientResources.create(),
+        RedisClusterClient redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.create(TestSettings.host(), 7379));
 
         GenericObjectPool<StatefulRedisClusterConnection<String, String>> pool = ConnectionPoolSupport

From f0966e365fd5efcafbb99a1837f492d5f8add256 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 24 Jan 2017 20:08:47 +0100
Subject: [PATCH 120/808] Polishing

Complete initialization future after triggering activation event. Improve test synchronization. Increase sentinel timeouts.
---
 Makefile                                               |  4 ++--
 .../com/lambdaworks/redis/PlainChannelInitializer.java |  2 +-
 .../redis/protocol/ConnectionFailureTest.java          |  2 +-
 .../lambdaworks/redis/pubsub/PubSubCommandTest.java    | 10 ++++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index a554424939..e176ee9f10 100644
--- a/Makefile
+++ b/Makefile
@@ -120,8 +120,8 @@ work/sentinel-%.conf:
 	@echo logfile $(shell pwd)/work/redis-sentinel-$*.log >> $@
 
 	@echo sentinel monitor mymaster 127.0.0.1 6482 1 >> $@
-	@echo sentinel down-after-milliseconds mymaster 100 >> $@
-	@echo sentinel failover-timeout mymaster 100 >> $@
+	@echo sentinel down-after-milliseconds mymaster 200 >> $@
+	@echo sentinel failover-timeout mymaster 200 >> $@
 	@echo sentinel parallel-syncs mymaster 1 >> $@
 	@echo unixsocket $(ROOT_DIR)/work/socket-$* >> $@
 	@echo unixsocketperm 777 >> $@
diff --git a/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java b/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
index 5e9ee9d79e..57953f7d05 100644
--- a/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
+++ b/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
@@ -126,8 +126,8 @@ static void pingBeforeActivate(final AsyncCommand<?, ?, ?> cmd, final Completabl
             final ChannelHandlerContext ctx) throws Exception {
         cmd.handle((o, throwable) -> {
             if (throwable == null) {
-                initializedFuture.complete(true);
                 ctx.fireChannelActive();
+                initializedFuture.complete(true);
             } else {
                 initializedFuture.completeExceptionally(throwable);
             }
diff --git a/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java b/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java
index 1129c2ee9d..41e6a6a7f7 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java
+++ b/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java
@@ -69,7 +69,7 @@ public void pingBeforeConnectFails() throws Exception {
      *
      * @throws Exception
      */
-    @Test(timeout = 120000)
+    @Test(timeout = 12000)
     public void pingBeforeConnectFailOnReconnect() throws Exception {
 
         ClientOptions clientOptions = ClientOptions.builder().pingBeforeActivateConnection(true)
diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java b/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
index 60d8fd7c8d..e38cc32021 100644
--- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
@@ -26,11 +26,11 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.TestClientResources;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.lambdaworks.TestClientResources;
 import com.lambdaworks.Wait;
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
@@ -85,16 +85,18 @@ protected void run(RedisClient client) throws Exception {
 
     @Test
     public void authWithReconnect() throws Exception {
+
         new WithPasswordRequired() {
             @Override
             protected void run(RedisClient client) throws Exception {
+
                 RedisPubSubAsyncCommands<String, String> connection = client.connectPubSub().async();
                 connection.getStatefulConnection().addListener(PubSubCommandTest.this);
                 connection.auth(passwd);
                 connection.quit();
-                Wait.untilTrue(() -> {
-                    return !connection.isOpen();
-                }).waitOrTimeout();
+
+                Thread.sleep(100);
+                Wait.untilTrue(connection::isOpen).waitOrTimeout();
 
                 connection.subscribe(channel);
                 assertThat(channels.take()).isEqualTo(channel);

From a24bf57247cca5adb0a3921e5f0a0f62579d7265 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 27 Jan 2017 17:07:03 +0100
Subject: [PATCH 121/808] Enable JMH tests on TravisCI #454

---
 .travis.yml                                   |  1 +
 pom.xml                                       | 38 ++++++++++++++-----
 .../cluster/EmptyStatefulRedisConnection.java |  2 +-
 .../redis/protocol/CommandBenchmark.java      | 17 +++------
 .../redis/protocol/EmptyClientResources.java  |  7 ++++
 .../lambdaworks/redis/protocol/JmhMain.java   | 20 +++++-----
 6 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a6f794fe99..383ebf3c57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ env:
   matrix:
     - PROFILE=netty-40
     - PROFILE=netty-41
+    - PROFILE=jmh
 sudo: false
 before_install:
   - if [[ ! -f stunnel.tar.gz ]]; then wget -O stunnel.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.33.tar.gz; fi
diff --git a/pom.xml b/pom.xml
index 1f17085b2d..9325a22722 100644
--- a/pom.xml
+++ b/pom.xml
@@ -420,12 +420,20 @@
             </dependencies>
 
             <build>
-                <resources>
-                    <resource>
-                        <directory>src/test/resources</directory>
-                    </resource>
-                </resources>
                 <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.eluder.coveralls</groupId>
+                        <artifactId>coveralls-maven-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
@@ -433,7 +441,7 @@
                         <executions>
                             <execution>
                                 <id>add-source</id>
-                                <phase>generate-sources</phase>
+                                <phase>generate-test-sources</phase>
                                 <goals>
                                     <goal>add-test-source</goal>
                                 </goals>
@@ -448,10 +456,11 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.5.0</version>
                         <executions>
                             <execution>
                                 <id>run-benchmarks</id>
-                                <phase>process-test-resources</phase>
+                                <phase>test</phase>
                                 <goals>
                                     <goal>exec</goal>
                                 </goals>
@@ -459,10 +468,21 @@
                                     <executable>java</executable>
                                     <classpathScope>test</classpathScope>
                                     <arguments>
+                                        <argument>-Xmx2G</argument>
                                         <argument>-classpath</argument>
                                         <classpath />
                                         <argument>org.openjdk.jmh.Main</argument>
                                         <argument>.*</argument>
+                                        <argument>-tu</argument>
+                                        <argument>ns</argument>
+                                        <argument>-f</argument>
+                                        <argument>1</argument>
+                                        <argument>-wi</argument>
+                                        <argument>10</argument>
+                                        <argument>-i</argument>
+                                        <argument>10</argument>
+                                        <argument>-bm</argument>
+                                        <argument>avgt</argument>
                                     </arguments>
                                 </configuration>
                             </execution>
@@ -479,7 +499,7 @@
             <extension>
                 <groupId>kr.motd.maven</groupId>
                 <artifactId>os-maven-plugin</artifactId>
-                <version>1.4.0.Final</version>
+                <version>1.5.0.Final</version>
             </extension>
         </extensions>
 
@@ -488,7 +508,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.6.0</version>
                 <configuration>
                     <compilerArgument>-Xlint:all,-deprecation,-unchecked</compilerArgument>
                     <testCompilerArgument>-Xlint:none</testCompilerArgument>
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyStatefulRedisConnection.java b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyStatefulRedisConnection.java
index 9d62892ba7..fe64e9b65a 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyStatefulRedisConnection.java
+++ b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyStatefulRedisConnection.java
@@ -18,7 +18,7 @@
 import com.lambdaworks.redis.ClientOptions;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.rx.RedisReactiveCommands;
+import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.protocol.ConnectionFacade;
 import com.lambdaworks.redis.protocol.RedisCommand;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java b/src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java
index cb5c728c4a..594e27bff4 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java
@@ -15,17 +15,18 @@
  */
 package com.lambdaworks.redis.protocol;
 
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.protocol.CommandArgs.ExperimentalByteArrayCodec;
-import org.openjdk.jmh.annotations.*;
+import java.nio.charset.StandardCharsets;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
 
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.codec.StringCodec;
 import com.lambdaworks.redis.codec.Utf8StringCodec;
 import com.lambdaworks.redis.output.ValueOutput;
 
-import java.nio.charset.StandardCharsets;
-
 /**
  * Benchmark for {@link Command}. Test cases:
  * <ul>
@@ -39,7 +40,6 @@
 public class CommandBenchmark {
 
     private final static ByteArrayCodec BYTE_ARRAY_CODEC = new ByteArrayCodec();
-    private final static ExperimentalByteArrayCodec BYTE_ARRAY_CODEC2 = ExperimentalByteArrayCodec.INSTANCE;
     private final static Utf8StringCodec OLD_STRING_CODEC = new Utf8StringCodec();
     private final static StringCodec NEW_STRING_CODEC = new StringCodec(StandardCharsets.UTF_8);
     private final static EmptyByteBuf DUMMY_BYTE_BUF = new EmptyByteBuf();
@@ -62,11 +62,6 @@ public void encodeCommandUsingByteArrayCodec() {
         createCommand(BYTE_KEY, BYTE_ARRAY_CODEC).encode(DUMMY_BYTE_BUF);
     }
 
-    @Benchmark
-    public void encodeCommandUsingByteArrayCodec2() {
-        createCommand(BYTE_KEY, BYTE_ARRAY_CODEC2).encode(DUMMY_BYTE_BUF);
-    }
-
     @Benchmark
     public void encodeCommandUsingOldStringCodec() {
         createCommand(KEY, OLD_STRING_CODEC).encode(DUMMY_BYTE_BUF);
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java b/src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java
index effeec0d2e..9a50f1b90c 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java
@@ -29,6 +29,8 @@
 import com.lambdaworks.redis.resource.Delay;
 import com.lambdaworks.redis.resource.DnsResolver;
 import com.lambdaworks.redis.resource.EventLoopGroupProvider;
+import io.netty.util.Timer;
+import io.netty.util.concurrent.*;
 
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.Future;
@@ -74,6 +76,11 @@ public int computationThreadPoolSize() {
         return 0;
     }
 
+    @Override
+    public Timer timer() {
+        return null;
+    }
+
     @Override
     public EventBus eventBus() {
         return null;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java b/src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java
index c9bb2b3e9a..7f15361ad5 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java
@@ -27,7 +27,7 @@
 
 /**
  * Manual JMH Test Launcher.
- * 
+ *
  * @author Mark Paluch
  */
 public class JmhMain {
@@ -35,9 +35,10 @@ public class JmhMain {
     public static void main(String... args) throws IOException, RunnerException {
 
         // run selectively
-        // runCommandBenchmark();
+        runCommandBenchmark();
         runCommandHandlerBenchmark();
-        // runRedisStateMachineBenchmark();
+        runRedisStateMachineBenchmark();
+        runCommandEncoderBenchmark();
 
         // or all
         //runBenchmarks();
@@ -50,9 +51,8 @@ private static void runBenchmarks() throws RunnerException {
 
     private static void runCommandBenchmark() throws RunnerException {
 
-        new Runner(
-                prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).include(".*CommandBenchmark.*").build())
-                        .run();
+        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).include(".*CommandBenchmark.*")
+                .build()).run();
 
         new Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS).include(".*CommandBenchmark.*").build())
                 .run();
@@ -60,16 +60,16 @@ private static void runCommandBenchmark() throws RunnerException {
 
     private static void runCommandHandlerBenchmark() throws RunnerException {
 
-        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).include(".*CommandHandlerBenchmark.*")
-                .build()).run();
+        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS)
+                .include(".*CommandHandlerBenchmark.*").build()).run();
         // new
         // Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS).include(".*CommandHandlerBenchmark.*").build()).run();
     }
 
     private static void runCommandEncoderBenchmark() throws RunnerException {
 
-        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).include(".*CommandEncoderBenchmark.*")
-                .build()).run();
+        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS)
+                .include(".*CommandEncoderBenchmark.*").build()).run();
         // new
         // Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS).include(".*CommandHandlerBenchmark.*").build()).run();
     }

From 8906735cc5d825c46b54be64b6eda068f2f88e3c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 27 Jan 2017 17:48:14 +0100
Subject: [PATCH 122/808] Use Reactor's StepVerifier in
 ConnectionEventsTriggeredTest #455

---
 pom.xml                                       |  9 ++-
 .../event/ConnectionEventsTriggeredTest.java  | 61 ++++++-------------
 2 files changed, 27 insertions(+), 43 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9325a22722..21a8cda1e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>3.0.3.RELEASE</version>
+            <version>3.0.4.RELEASE</version>
         </dependency>
 
         <!-- Netty -->
@@ -205,6 +205,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.projectreactor.addons</groupId>
+            <artifactId>reactor-test</artifactId>
+            <version>3.0.4.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.googlecode.multithreadedtc</groupId>
             <artifactId>multithreadedtc</artifactId>
diff --git a/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java b/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
index 5d8547c9e6..67ca3cffd4 100644
--- a/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
+++ b/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
@@ -17,61 +17,38 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import com.lambdaworks.redis.reactive.TestSubscriber;
-import org.assertj.core.api.Condition;
 import org.junit.Test;
 
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.event.connection.*;
+import reactor.core.publisher.Flux;
+import reactor.test.StepVerifier;
+
+import com.lambdaworks.TestClientResources;
+import com.lambdaworks.redis.AbstractTest;
+import com.lambdaworks.redis.RedisClient;
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.event.connection.ConnectionEvent;
 
 /**
  * @author Mark Paluch
  */
-public class ConnectionEventsTriggeredTest extends AbstractRedisClientTest {
+public class ConnectionEventsTriggeredTest extends AbstractTest {
 
     @Test
     public void testConnectionEvents() throws Exception {
 
-        TestSubscriber<Object> subscriber = TestSubscriber.create();
-        List<Object> events = new ArrayList<>();
-
-        client.getResources().eventBus().get().filter(event -> event instanceof ConnectionEvent).doOnNext(events::add)
-                .subscribe(subscriber);
-
-        try {
-            subscriber.request(10);
-            client.connect().close();
-            Wait.untilTrue(() -> events.size() > 4).waitOrTimeout();
-        } finally {
-            subscriber.cancel();
-        }
+        RedisClient client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port).build());
 
-        assertThat(events).areAtLeast(1, new ExpectedClassCondition(ConnectedEvent.class));
-        assertThat(events).areAtLeast(1, new ExpectedClassCondition(ConnectionActivatedEvent.class));
-        assertThat(events).areAtLeast(1, new ExpectedClassCondition(DisconnectedEvent.class));
-        assertThat(events).areAtLeast(1, new ExpectedClassCondition(ConnectionDeactivatedEvent.class));
-
-        ConnectionEvent event = (ConnectionEvent) events.get(0);
-        assertThat(event.remoteAddress()).isNotNull();
-        assertThat(event.localAddress()).isNotNull();
-
-        assertThat(event.toString()).contains("->");
-    }
+        Flux<ConnectionEvent> publisher = client.getResources().eventBus().get()
+                .filter(event -> event instanceof ConnectionEvent).cast(ConnectionEvent.class);
 
-    private static class ExpectedClassCondition extends Condition<Object> {
-        private final Class<?> expectedClass;
+        client.connect().close();
 
-        public ExpectedClassCondition(Class<?> expectedClass) {
-            this.expectedClass = expectedClass;
-        }
+        StepVerifier.create(publisher).assertNext(event -> {
+            assertThat(event.remoteAddress()).isNotNull();
+            assertThat(event.localAddress()).isNotNull();
+            assertThat(event.toString()).contains("->");
+        }).expectNextCount(3).thenCancel().verify();
 
-        @Override
-        public boolean matches(Object value) {
-            return value != null && value.getClass().equals(expectedClass);
-        }
+        client.shutdown();
     }
 }

From 40128e0123e4ded229f2aa5980907f213277a851 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 27 Jan 2017 21:04:54 +0100
Subject: [PATCH 123/808] Create benchmarks for RedisClient, RedisClusterClient
 and ClusterDistributionChannelWriter #454

---
 .../EmptyRedisChannelWriter.java              |   7 +-
 .../EmptyStatefulRedisConnection.java         |  19 ++-
 .../redis/RedisClientBenchmark.java           | 130 +++++++++++++++++
 ...terDistributionChannelWriterBenchmark.java |  96 +++++++++++++
 .../cluster/EmptyRedisClusterClient.java      |   8 +-
 .../cluster/RedisClusterClientBenchmark.java  | 133 ++++++++++++++++++
 .../protocol/RedisEndpointBenchmark.java      |   6 +-
 7 files changed, 384 insertions(+), 15 deletions(-)
 rename src/test/jmh/com/lambdaworks/redis/{cluster => }/EmptyRedisChannelWriter.java (88%)
 rename src/test/jmh/com/lambdaworks/redis/{cluster => }/EmptyStatefulRedisConnection.java (81%)
 create mode 100644 src/test/jmh/com/lambdaworks/redis/RedisClientBenchmark.java
 create mode 100644 src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java
 create mode 100644 src/test/jmh/com/lambdaworks/redis/cluster/RedisClusterClientBenchmark.java

diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisChannelWriter.java b/src/test/jmh/com/lambdaworks/redis/EmptyRedisChannelWriter.java
similarity index 88%
rename from src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisChannelWriter.java
rename to src/test/jmh/com/lambdaworks/redis/EmptyRedisChannelWriter.java
index b3c4a7099c..c3541b8e5a 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisChannelWriter.java
+++ b/src/test/jmh/com/lambdaworks/redis/EmptyRedisChannelWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package com.lambdaworks.redis;
 
 import com.lambdaworks.redis.RedisChannelWriter;
 import com.lambdaworks.redis.protocol.ConnectionFacade;
@@ -23,6 +23,9 @@
  * @author Mark Paluch
  */
 public class EmptyRedisChannelWriter implements RedisChannelWriter {
+
+    public final static EmptyRedisChannelWriter INSTANCE = new EmptyRedisChannelWriter();
+
     @Override
     public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         return null;
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyStatefulRedisConnection.java b/src/test/jmh/com/lambdaworks/redis/EmptyStatefulRedisConnection.java
similarity index 81%
rename from src/test/jmh/com/lambdaworks/redis/cluster/EmptyStatefulRedisConnection.java
rename to src/test/jmh/com/lambdaworks/redis/EmptyStatefulRedisConnection.java
index fe64e9b65a..b1264d90ff 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyStatefulRedisConnection.java
+++ b/src/test/jmh/com/lambdaworks/redis/EmptyStatefulRedisConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package com.lambdaworks.redis;
+
+import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.ClientOptions;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
@@ -23,12 +24,18 @@
 import com.lambdaworks.redis.protocol.ConnectionFacade;
 import com.lambdaworks.redis.protocol.RedisCommand;
 
-import java.util.concurrent.TimeUnit;
-
 /**
  * @author Mark Paluch
  */
-public class EmptyStatefulRedisConnection implements StatefulRedisConnection, ConnectionFacade {
+public class EmptyStatefulRedisConnection extends RedisChannelHandler implements StatefulRedisConnection, ConnectionFacade {
+
+    public final static EmptyStatefulRedisConnection INSTANCE = new EmptyStatefulRedisConnection(
+            EmptyRedisChannelWriter.INSTANCE);
+
+    public EmptyStatefulRedisConnection(RedisChannelWriter writer) {
+        super(writer, 0, TimeUnit.MINUTES);
+    }
+
     @Override
     public boolean isMulti() {
         return false;
diff --git a/src/test/jmh/com/lambdaworks/redis/RedisClientBenchmark.java b/src/test/jmh/com/lambdaworks/redis/RedisClientBenchmark.java
new file mode 100644
index 0000000000..edb4785f8b
--- /dev/null
+++ b/src/test/jmh/com/lambdaworks/redis/RedisClientBenchmark.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis;
+
+import com.lambdaworks.redis.codec.ByteArrayCodec;
+import org.openjdk.jmh.annotations.*;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+
+/**
+ * @author Mark Paluch
+ */
+@State(Scope.Benchmark)
+public class RedisClientBenchmark {
+
+    private final static int BATCH_SIZE = 20;
+    private final static byte[] KEY = "benchmark".getBytes();
+
+    private RedisClient redisClient;
+    private StatefulRedisConnection<byte[], byte[]> connection;
+    private RedisFuture commands[];
+    private Mono monos[];
+
+    @Setup
+    public void setup() {
+
+        redisClient = RedisClient.create(RedisURI.create(TestSettings.host(), TestSettings.port()));
+        connection = redisClient.connect(ByteArrayCodec.INSTANCE);
+        commands = new RedisFuture[BATCH_SIZE];
+        monos = new Mono[BATCH_SIZE];
+    }
+
+    @TearDown
+    public void tearDown() {
+
+        connection.close();
+        redisClient.shutdown();
+    }
+
+    @Benchmark
+    public void asyncSet() {
+        connection.async().set(KEY, KEY).toCompletableFuture().join();
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(BATCH_SIZE)
+    public void asyncSetBatch() throws Exception {
+
+        for (int i = 0; i < BATCH_SIZE; i++) {
+            commands[i] = connection.async().set(KEY, KEY);
+        }
+
+        for (int i = 0; i < BATCH_SIZE; i++) {
+            commands[i].get();
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(BATCH_SIZE)
+    public void asyncSetBatchFlush() throws Exception {
+
+        connection.setAutoFlushCommands(false);
+
+        for (int i = 0; i < BATCH_SIZE; i++) {
+            commands[i] = connection.async().set(KEY, KEY);
+        }
+
+        connection.flushCommands();
+        connection.setAutoFlushCommands(true);
+
+        for (int i = 0; i < BATCH_SIZE; i++) {
+            commands[i].get();
+        }
+    }
+
+    @Benchmark
+    public void syncSet() {
+        connection.sync().set(KEY, KEY);
+    }
+
+    @Benchmark
+    public void reactiveSet() {
+        connection.reactive().set(KEY, KEY).block();
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(BATCH_SIZE)
+    public void reactiveSetBatch() throws Exception {
+
+        for (int i = 0; i < BATCH_SIZE; i++) {
+            monos[i] = connection.reactive().set(KEY, KEY);
+        }
+
+        Flux.merge(monos).blockLast();
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(BATCH_SIZE)
+    public void reactiveSetBatchFlush() throws Exception {
+
+        connection.setAutoFlushCommands(false);
+
+        for (int i = 0; i < BATCH_SIZE; i++) {
+            monos[i] = connection.reactive().set(KEY, KEY);
+        }
+
+        Flux.merge(monos).doOnSubscribe(subscription -> {
+
+            connection.flushCommands();
+            connection.setAutoFlushCommands(true);
+
+        }).blockLast();
+    }
+}
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java b/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java
new file mode 100644
index 0000000000..a566fb2db5
--- /dev/null
+++ b/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster;
+
+import java.net.SocketAddress;
+import java.util.HashSet;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.cluster.models.partitions.Partitions;
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.redis.codec.ByteArrayCodec;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.output.ValueOutput;
+import com.lambdaworks.redis.protocol.Command;
+import com.lambdaworks.redis.protocol.CommandArgs;
+import com.lambdaworks.redis.protocol.CommandType;
+
+/**
+ * @author Mark Paluch
+ */
+@State(Scope.Benchmark)
+public class ClusterDistributionChannelWriterBenchmark {
+
+    private final static ClientOptions CLIENT_OPTIONS = ClientOptions.create();
+    private final static RedisChannelWriter EMPTY_WRITER = EmptyRedisChannelWriter.INSTANCE;
+    private final static EmptyStatefulRedisConnection CONNECTION = EmptyStatefulRedisConnection.INSTANCE;
+    private static final ValueOutput<byte[], byte[]> VALUE_OUTPUT = new ValueOutput<>(ByteArrayCodec.INSTANCE);
+
+    private final static Command<byte[], byte[], byte[]> KEYED_COMMAND = new Command<>(CommandType.GET, VALUE_OUTPUT,
+            new CommandArgs<>(ByteArrayCodec.INSTANCE).addKey("benchmark".getBytes()));
+
+    private final static Command<byte[], byte[], byte[]> PLAIN_COMMAND = new Command<>(CommandType.GET, VALUE_OUTPUT,
+            new CommandArgs<>(ByteArrayCodec.INSTANCE));
+
+    private ClusterDistributionChannelWriter writer;
+
+    @Setup
+    public void setup() {
+
+        writer = new ClusterDistributionChannelWriter(CLIENT_OPTIONS, EMPTY_WRITER, ClusterEventListener.NO_OP, null);
+
+        Partitions partitions = new Partitions();
+
+        partitions.add(new RedisClusterNode(RedisURI.create("localhost", 1), "1", true, null, 0, 0, 0, IntStream.range(0, 8191)
+                .boxed().collect(Collectors.toList()), new HashSet<>()));
+
+        partitions.add(new RedisClusterNode(RedisURI.create("localhost", 2), "2", true, null, 0, 0, 0, IntStream
+                .range(8192, SlotHash.SLOT_COUNT).boxed().collect(Collectors.toList()), new HashSet<>()));
+
+        partitions.updateCache();
+
+        writer.setPartitions(partitions);
+        writer.setClusterConnectionProvider(new PooledClusterConnectionProvider<>(new RedisClusterClient() {
+
+            @Override
+            <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, String nodeId,
+                    RedisChannelWriter clusterWriter, Supplier<SocketAddress> socketAddressSupplier) {
+                return CONNECTION;
+            }
+        }, EMPTY_WRITER, ByteArrayCodec.INSTANCE));
+
+        writer.setPartitions(partitions);
+    }
+
+    @Benchmark
+    public void writeKeyedCommand() {
+        writer.write(KEYED_COMMAND);
+    }
+
+    @Benchmark
+    public void writePlainCommand() {
+        writer.write(PLAIN_COMMAND);
+    }
+}
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java
index 00908a42a6..b2be6479ad 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java
+++ b/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java
@@ -19,6 +19,7 @@
 import java.util.Collections;
 import java.util.function.Supplier;
 
+import com.lambdaworks.redis.EmptyStatefulRedisConnection;
 import com.lambdaworks.redis.RedisChannelWriter;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
@@ -28,14 +29,13 @@
  * @author Mark Paluch
  */
 public class EmptyRedisClusterClient extends RedisClusterClient {
-    private final static EmptyStatefulRedisConnection CONNECTION = new EmptyStatefulRedisConnection();
 
     public EmptyRedisClusterClient(RedisURI initialUri) {
         super(null, Collections.singleton(initialUri));
     }
 
-    <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, String nodeId,
-            RedisChannelWriter clusterWriter, final Supplier<SocketAddress> socketAddressSupplier) {
-        return CONNECTION;
+    <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, String nodeId, RedisChannelWriter clusterWriter,
+            final Supplier<SocketAddress> socketAddressSupplier) {
+        return EmptyStatefulRedisConnection.INSTANCE;
     }
 }
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/RedisClusterClientBenchmark.java b/src/test/jmh/com/lambdaworks/redis/cluster/RedisClusterClientBenchmark.java
new file mode 100644
index 0000000000..1471d91d69
--- /dev/null
+++ b/src/test/jmh/com/lambdaworks/redis/cluster/RedisClusterClientBenchmark.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster;
+
+import org.openjdk.jmh.annotations.*;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.TestSettings;
+import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
+import com.lambdaworks.redis.codec.ByteArrayCodec;
+
+/**
+ * @author Mark Paluch
+ */
+@State(Scope.Benchmark)
+public class RedisClusterClientBenchmark {
+
+    private final static int BATCH_SIZE = 20;
+    private final static byte[] KEY = "benchmark".getBytes();
+
+    private RedisClusterClient redisClusterClient;
+    private StatefulRedisClusterConnection<byte[], byte[]> connection;
+    private RedisFuture commands[];
+    private Mono monos[];
+
+    @Setup
+    public void setup() {
+
+        redisClusterClient = RedisClusterClient.create(RedisURI.create(TestSettings.host(), TestSettings.port(900)));
+        connection = redisClusterClient.connect(ByteArrayCodec.INSTANCE);
+        commands = new RedisFuture[BATCH_SIZE];
+        monos = new Mono[BATCH_SIZE];
+    }
+
+    @TearDown
+    public void tearDown() {
+
+        connection.close();
+        redisClusterClient.shutdown();
+    }
+
+    @Benchmark
+    public void asyncSet() {
+        connection.async().set(KEY, KEY).toCompletableFuture().join();
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(BATCH_SIZE)
+    public void asyncSetBatch() throws Exception {
+
+        for (int i = 0; i < BATCH_SIZE; i++) {
+            commands[i] = connection.async().set(KEY, KEY);
+        }
+
+        for (int i = 0; i < BATCH_SIZE; i++) {
+            commands[i].get();
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(BATCH_SIZE)
+    public void asyncSetBatchFlush() throws Exception {
+
+        connection.setAutoFlushCommands(false);
+
+        for (int i = 0; i < BATCH_SIZE; i++) {
+            commands[i] = connection.async().set(KEY, KEY);
+        }
+
+        connection.flushCommands();
+        connection.setAutoFlushCommands(true);
+
+        for (int i = 0; i < BATCH_SIZE; i++) {
+            commands[i].get();
+        }
+    }
+
+    @Benchmark
+    public void syncSet() {
+        connection.sync().set(KEY, KEY);
+    }
+
+    @Benchmark
+    public void reactiveSet() {
+        connection.reactive().set(KEY, KEY).block();
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(BATCH_SIZE)
+    public void reactiveSetBatch() throws Exception {
+
+        for (int i = 0; i < BATCH_SIZE; i++) {
+            monos[i] = connection.reactive().set(KEY, KEY);
+        }
+
+        Flux.merge(monos).blockLast();
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(BATCH_SIZE)
+    public void reactiveSetBatchFlush() throws Exception {
+
+        connection.setAutoFlushCommands(false);
+
+        for (int i = 0; i < BATCH_SIZE; i++) {
+            monos[i] = connection.reactive().set(KEY, KEY);
+        }
+
+        Flux.merge(monos).doOnSubscribe(subscription -> {
+
+            connection.flushCommands();
+            connection.setAutoFlushCommands(true);
+
+        }).blockLast();
+    }
+}
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java b/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java
index c47ccd51b2..84cd087ef1 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java
@@ -15,10 +15,10 @@
  */
 package com.lambdaworks.redis.protocol;
 
-import com.lambdaworks.redis.cluster.EmptyStatefulRedisConnection;
 import org.openjdk.jmh.annotations.*;
 
 import com.lambdaworks.redis.ClientOptions;
+import com.lambdaworks.redis.EmptyStatefulRedisConnection;
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.output.ValueOutput;
 
@@ -31,7 +31,7 @@
  * <ul>
  * <li>user command writes</li>
  * </ul>
- * 
+ *
  * @author Mark Paluch
  */
 @State(Scope.Benchmark)
@@ -51,7 +51,7 @@ public void setup() {
         defaultEndpoint = new DefaultEndpoint(CLIENT_OPTIONS);
         command = new Command(CommandType.GET, new ValueOutput<>(CODEC), new CommandArgs(CODEC).addKey(KEY));
 
-        defaultEndpoint.setConnectionFacade(new EmptyStatefulRedisConnection());
+        defaultEndpoint.setConnectionFacade(EmptyStatefulRedisConnection.INSTANCE);
         defaultEndpoint.notifyChannelActive(new MyLocalChannel());
     }
 

From b7955a88edb55129411caf7d079c8ebf3353bcd4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 27 Jan 2017 21:26:10 +0100
Subject: [PATCH 124/808] Add ReadFrom.SLAVE_PREFERRED #452

Add new ReadFrom setting to prefer slave reads and fall back to master if no slave is available.
---
 .../java/com/lambdaworks/redis/ReadFrom.java  | 19 +++++---
 .../com/lambdaworks/redis/ReadFromImpl.java   | 47 +++++++++++++++++--
 .../redis/cluster/ReadFromTest.java           |  9 +++-
 .../cluster/RedisClusterReadFromTest.java     | 44 ++++++++++++-----
 4 files changed, 94 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/ReadFrom.java b/src/main/java/com/lambdaworks/redis/ReadFrom.java
index 2781ca412d..efbd6844de 100644
--- a/src/main/java/com/lambdaworks/redis/ReadFrom.java
+++ b/src/main/java/com/lambdaworks/redis/ReadFrom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
 /**
  * Defines from which Redis nodes data is read.
- * 
+ *
  * @author Mark Paluch
  * @since 4.0
  */
@@ -37,6 +37,13 @@ public abstract class ReadFrom {
      */
     public static final ReadFrom MASTER_PREFERRED = new ReadFromImpl.ReadFromMasterPreferred();
 
+    /**
+     * Setting to read preferred from slaves and fall back to master if no slave is not available.
+     *
+     * @since 4.4
+     */
+    public static final ReadFrom SLAVE_PREFERRED = new ReadFromImpl.ReadFromSlavePreferred();
+
     /**
      * Setting to read from the slave only.
      */
@@ -49,7 +56,7 @@ public abstract class ReadFrom {
 
     /**
      * Chooses the nodes from the matching Redis nodes that match this read selector.
-     * 
+     *
      * @param nodes set of nodes that are suitable for reading
      * @return List of {@link RedisNodeDescription}s that are selected for reading
      */
@@ -57,7 +64,7 @@ public abstract class ReadFrom {
 
     /**
      * Retrieve the {@link ReadFrom} preset by name.
-     * 
+     *
      * @param name the name of the read from setting
      * @return the {@link ReadFrom} preset
      * @throws IllegalArgumentException if {@code name} is empty, {@literal null} or the {@link ReadFrom} preset is unknown.
@@ -93,9 +100,9 @@ public interface Nodes extends Iterable<RedisNodeDescription> {
 
         /**
          * Returns the list of nodes that are applicable for the read operation. The list is ordered by latency.
-         * 
+         *
          * @return the collection of nodes that are applicable for reading.
-         * 
+         *
          */
         List<RedisNodeDescription> getNodes();
     }
diff --git a/src/main/java/com/lambdaworks/redis/ReadFromImpl.java b/src/main/java/com/lambdaworks/redis/ReadFromImpl.java
index 2aac8034ca..1cf86c5ad8 100644
--- a/src/main/java/com/lambdaworks/redis/ReadFromImpl.java
+++ b/src/main/java/com/lambdaworks/redis/ReadFromImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 
 /**
  * Collection of common read setting implementations.
- * 
+ *
  * @author Mark Paluch
  * @since 4.0
  */
@@ -35,24 +35,29 @@ class ReadFromImpl {
      * Read from master only.
      */
     static final class ReadFromMaster extends ReadFrom {
+
         @Override
         public List<RedisNodeDescription> select(Nodes nodes) {
+
             for (RedisNodeDescription node : nodes) {
                 if (node.getRole() == RedisInstance.Role.MASTER) {
                     return LettuceLists.newList(node);
                 }
             }
+
             return Collections.emptyList();
         }
     }
 
     /**
-     * Read preffered from master. If the master is not available, read from a slave.
+     * Read from master and slaves. Prefer master reads and fall back to slaves if the master is not available.
      */
     static final class ReadFromMasterPreferred extends ReadFrom {
+
         @Override
         public List<RedisNodeDescription> select(Nodes nodes) {
-            List<RedisNodeDescription> result = new ArrayList<>();
+
+            List<RedisNodeDescription> result = new ArrayList<>(nodes.getNodes().size());
 
             for (RedisNodeDescription node : nodes) {
                 if (node.getRole() == RedisInstance.Role.MASTER) {
@@ -65,6 +70,7 @@ public List<RedisNodeDescription> select(Nodes nodes) {
                     result.add(node);
                 }
             }
+
             return result;
         }
     }
@@ -73,14 +79,44 @@ public List<RedisNodeDescription> select(Nodes nodes) {
      * Read from slave only.
      */
     static final class ReadFromSlave extends ReadFrom {
+
         @Override
         public List<RedisNodeDescription> select(Nodes nodes) {
-            List<RedisNodeDescription> result = new ArrayList<>();
+
+            List<RedisNodeDescription> result = new ArrayList<>(nodes.getNodes().size());
+
             for (RedisNodeDescription node : nodes) {
                 if (node.getRole() == RedisInstance.Role.SLAVE) {
                     result.add(node);
                 }
             }
+
+            return result;
+        }
+    }
+
+    /**
+     * Read from master and slaves. Prefer slave reads and fall back to master if the no slave is not available.
+     */
+    static final class ReadFromSlavePreferred extends ReadFrom {
+
+        @Override
+        public List<RedisNodeDescription> select(Nodes nodes) {
+
+            List<RedisNodeDescription> result = new ArrayList<>(nodes.getNodes().size());
+
+            for (RedisNodeDescription node : nodes) {
+                if (node.getRole() == RedisInstance.Role.SLAVE) {
+                    result.add(node);
+                }
+            }
+
+            for (RedisNodeDescription node : nodes) {
+                if (node.getRole() == RedisInstance.Role.MASTER) {
+                    result.add(node);
+                }
+            }
+
             return result;
         }
     }
@@ -89,6 +125,7 @@ public List<RedisNodeDescription> select(Nodes nodes) {
      * Read from nearest node.
      */
     static final class ReadFromNearest extends ReadFrom {
+
         @Override
         public List<RedisNodeDescription> select(Nodes nodes) {
             return nodes.getNodes();
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ReadFromTest.java b/src/test/java/com/lambdaworks/redis/cluster/ReadFromTest.java
index d6542e1fb7..42e92e4da3 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ReadFromTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ReadFromTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@ public class ReadFromTest {
 
     @Before
     public void before() throws Exception {
+
         master.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.MASTER));
         nearest.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.SLAVE));
         slave.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.SLAVE));
@@ -68,6 +69,12 @@ public void slave() throws Exception {
         assertThat(result).hasSize(2).contains(nearest, slave);
     }
 
+    @Test
+    public void slavePreferred() throws Exception {
+        List<RedisNodeDescription> result = ReadFrom.SLAVE_PREFERRED.select(getNodes());
+        assertThat(result).hasSize(3).containsExactly(nearest, slave, master);
+    }
+
     @Test
     public void nearest() throws Exception {
         List<RedisNodeDescription> result = ReadFrom.NEAREST.select(getNodes());
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
index f30c28c8a6..9d1d82ee85 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,17 +19,15 @@
 
 import java.util.Collections;
 
-import com.lambdaworks.TestClientResources;
 import org.junit.*;
-import org.junit.runners.MethodSorters;
 
+import com.lambdaworks.TestClientResources;
 import com.lambdaworks.redis.FastShutdown;
 import com.lambdaworks.redis.ReadFrom;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
 
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SuppressWarnings("unchecked")
 public class RedisClusterReadFromTest extends AbstractClusterTest {
 
@@ -38,50 +36,58 @@ public class RedisClusterReadFromTest extends AbstractClusterTest {
 
     @BeforeClass
     public static void setupClient() throws Exception {
+
         setupClusterClient();
-        clusterClient = RedisClusterClient.create(
-                TestClientResources.get(), Collections.singletonList(RedisURI.Builder.redis(host, port1).build()));
+        clusterClient = RedisClusterClient.create(TestClientResources.get(),
+                Collections.singletonList(RedisURI.Builder.redis(host, port1).build()));
     }
 
     @AfterClass
     public static void shutdownClient() {
+
         shutdownClusterClient();
         FastShutdown.shutdown(clusterClient);
     }
 
     @Before
-    public void before() throws Exception {
+    public void before() {
+
         clusterRule.getClusterClient().reloadPartitions();
         connection = clusterClient.connect();
         sync = connection.sync();
     }
 
     @After
-    public void after() throws Exception {
+    public void after() {
         sync.getStatefulConnection().close();
     }
 
     @Test
-    public void defaultTest() throws Exception {
+    public void defaultTest() {
         assertThat(connection.getReadFrom()).isEqualTo(ReadFrom.MASTER);
     }
 
     @Test
-    public void readWriteMaster() throws Exception {
+    public void readWriteMaster() {
+
         connection.setReadFrom(ReadFrom.MASTER);
+
         sync.set(key, value);
         assertThat(sync.get(key)).isEqualTo(value);
     }
 
     @Test
-    public void readWriteMasterPreferred() throws Exception {
+    public void readWriteMasterPreferred() {
+
         connection.setReadFrom(ReadFrom.MASTER_PREFERRED);
+
         sync.set(key, value);
         assertThat(sync.get(key)).isEqualTo(value);
     }
 
     @Test
-    public void readWriteSlave() throws Exception {
+    public void readWriteSlave() {
+
         connection.setReadFrom(ReadFrom.SLAVE);
 
         sync.set(key, "value1");
@@ -91,7 +97,19 @@ public void readWriteSlave() throws Exception {
     }
 
     @Test
-    public void readWriteNearest() throws Exception {
+    public void readWriteSlavePreferred() {
+
+        connection.setReadFrom(ReadFrom.SLAVE_PREFERRED);
+
+        sync.set(key, "value1");
+
+        connection.getConnection(host, port2).sync().waitForReplication(1, 1000);
+        assertThat(sync.get(key)).isEqualTo("value1");
+    }
+
+    @Test
+    public void readWriteNearest() {
+
         connection.setReadFrom(ReadFrom.NEAREST);
 
         sync.set(key, "value1");

From 0d442880ecbf3ccebbcba11a42ce32ab00f4d1af Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 27 Jan 2017 21:26:21 +0100
Subject: [PATCH 125/808] Polishing

---
 .../redis/event/ConnectionEventsTriggeredTest.java       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java b/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
index 67ca3cffd4..502481d1e7 100644
--- a/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
+++ b/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
@@ -17,6 +17,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+
 import org.junit.Test;
 
 import reactor.core.publisher.Flux;
@@ -41,13 +44,11 @@ public void testConnectionEvents() throws Exception {
         Flux<ConnectionEvent> publisher = client.getResources().eventBus().get()
                 .filter(event -> event instanceof ConnectionEvent).cast(ConnectionEvent.class);
 
-        client.connect().close();
-
-        StepVerifier.create(publisher).assertNext(event -> {
+        StepVerifier.create(publisher).then(() -> client.connect().close()).assertNext(event -> {
             assertThat(event.remoteAddress()).isNotNull();
             assertThat(event.localAddress()).isNotNull();
             assertThat(event.toString()).contains("->");
-        }).expectNextCount(3).thenCancel().verify();
+        }).expectNextCount(3).thenCancel().verify(Duration.of(5, ChronoUnit.SECONDS));
 
         client.shutdown();
     }

From 5280012739dfcc2a1b8a9d5def3697d7400f1cb7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 27 Jan 2017 22:14:40 +0100
Subject: [PATCH 126/808] Fix authenticated PING before connect with Redis
 Sentinel #448

PING before reconnect now no longer executes AUTH when connecting a Redis Sentinel node but only a PING. Redis Sentinel does not provide authentication which causes AUTH to fail.

Extract PING command supplier from initializers into ConnectionBuilder so the connecting method can decide over the PING method. Connecting no longer issues an additional AUTH command if PING before connect is enabled.
---
 .../redis/AbstractRedisClient.java            | 13 ++--
 .../lambdaworks/redis/ConnectionBuilder.java  | 25 +++++--
 .../redis/PlainChannelInitializer.java        | 35 ++++------
 .../com/lambdaworks/redis/RedisClient.java    | 18 ++++-
 .../redis/SslConnectionBuilder.java           | 28 ++++----
 .../redis/cluster/RedisClusterClient.java     | 66 +++++++++++--------
 .../redis/cluster/RedisClusterClientTest.java | 26 +++++++-
 .../sentinel/SentinelConnectionTest.java      | 32 +++++----
 8 files changed, 150 insertions(+), 93 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
index 3a12b0ecdf..b9de874b99 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
@@ -104,7 +104,7 @@ protected AbstractRedisClient(ClientResources clientResources) {
     /**
      * Set the default timeout for connections created by this client. The timeout applies to connection attempts and
      * non-blocking commands.
-     * 
+     *
      * @param timeout Default connection timeout.
      * @param unit Unit of time for the timeout.
      */
@@ -246,6 +246,7 @@ protected <K, V, T extends RedisChannelHandler<K, V>> ConnectionFuture<T> initia
 
         CompletableFuture<Channel> channelReadyFuture = new CompletableFuture<>();
         Bootstrap redisBootstrap = connectionBuilder.bootstrap();
+
         RedisChannelInitializer initializer = connectionBuilder.build();
         redisBootstrap.handler(initializer);
         ChannelFuture connectFuture = redisBootstrap.connect(redisAddress);
@@ -305,7 +306,7 @@ public void shutdown() {
 
     /**
      * Shutdown this client and close all open connections. The client should be discarded after calling shutdown.
-     * 
+     *
      * @param quietPeriod the quiet period as described in the documentation
      * @param timeout the maximum amount of time to wait until the executor is shutdown regardless if a task was submitted
      *        during the quiet period
@@ -375,7 +376,7 @@ protected int getChannelCount() {
      * happens. The listeners are not bound to a specific connection, so every time a connection event happens on any
      * connection, the listener will be notified. The corresponding netty channel handler (async connection) is passed on the
      * event.
-     * 
+     *
      * @param listener must not be {@literal null}
      */
     public void addListener(RedisConnectionStateListener listener) {
@@ -385,7 +386,7 @@ public void addListener(RedisConnectionStateListener listener) {
 
     /**
      * Removes a listener.
-     * 
+     *
      * @param listener must not be {@literal null}
      */
     public void removeListener(RedisConnectionStateListener listener) {
@@ -397,7 +398,7 @@ public void removeListener(RedisConnectionStateListener listener) {
     /**
      * Returns the {@link ClientOptions} which are valid for that client. Connections inherit the current options at the moment
      * the connection is created. Changes to options will not affect existing connections.
-     * 
+     *
      * @return the {@link ClientOptions} for this client
      */
     public ClientOptions getOptions() {
@@ -406,7 +407,7 @@ public ClientOptions getOptions() {
 
     /**
      * Set the {@link ClientOptions} for the client.
-     * 
+     *
      * @param clientOptions client options for the client and connections that are created after setting the options
      */
     protected void setOptions(ClientOptions clientOptions) {
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java b/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java
index 767f6fd45f..333a9337a3 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java
@@ -22,6 +22,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
+import com.lambdaworks.redis.codec.Utf8StringCodec;
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.protocol.*;
 import com.lambdaworks.redis.resource.ClientResources;
@@ -30,15 +31,19 @@
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.group.ChannelGroup;
 import io.netty.util.Timer;
-import io.netty.util.concurrent.EventExecutorGroup;
 
 /**
  * Connection builder for connections. This class is part of the internal API.
- * 
+ *
  * @author Mark Paluch
  */
 public class ConnectionBuilder {
 
+    private static final RedisCommandBuilder<String, String> INITIALIZING_CMD_BUILDER = new RedisCommandBuilder<>(
+            new Utf8StringCodec());
+    private static final Supplier<AsyncCommand<?, ?, ?>> PING_COMMAND_SUPPLIER = () -> new AsyncCommand<>(
+            INITIALIZING_CMD_BUILDER.ping());
+
     private Supplier<SocketAddress> socketAddressSupplier;
     private ConnectionEvents connectionEvents;
     private RedisChannelHandler<?, ?> connection;
@@ -54,6 +59,7 @@ public class ConnectionBuilder {
     private char[] password;
     private ReconnectionListener reconnectionListener = ReconnectionListener.NO_OP;
     private ConnectionWatchdog connectionWatchdog;
+    private Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier = PlainChannelInitializer.NO_PING;
 
     public static ConnectionBuilder connectionBuilder() {
         return new ConnectionBuilder();
@@ -90,6 +96,14 @@ protected List<ChannelHandler> buildHandlers() {
         return handlers;
     }
 
+    public void enablePingBeforeConnect() {
+        pingCommandSupplier = PING_COMMAND_SUPPLIER;
+    }
+
+    public void enableAuthPingBeforeConnect() {
+        pingCommandSupplier = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.auth(new String(password)));
+    }
+
     protected ConnectionWatchdog createConnectionWatchdog() {
 
         if (connectionWatchdog != null) {
@@ -110,8 +124,7 @@ protected ConnectionWatchdog createConnectionWatchdog() {
     }
 
     public RedisChannelInitializer build() {
-        return new PlainChannelInitializer(clientOptions.isPingBeforeActivateConnection(), password(), this::buildHandlers,
-                clientResources.eventBus());
+        return new PlainChannelInitializer(pingCommandSupplier, this::buildHandlers, clientResources.eventBus());
     }
 
     public ConnectionBuilder socketAddressSupplier(Supplier<SocketAddress> socketAddressSupplier) {
@@ -218,4 +231,8 @@ public char[] password() {
     public DefaultEndpoint endpoint() {
         return endpoint;
     }
+
+    Supplier<AsyncCommand<?, ?, ?>> getPingCommandSupplier() {
+        return pingCommandSupplier;
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java b/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
index 57953f7d05..844d4318f6 100644
--- a/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
+++ b/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
@@ -22,7 +22,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.codec.Utf8StringCodec;
 import com.lambdaworks.redis.event.EventBus;
 import com.lambdaworks.redis.event.connection.ConnectedEvent;
 import com.lambdaworks.redis.event.connection.ConnectionActivatedEvent;
@@ -32,28 +31,24 @@
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPipeline;
 
 /**
  * @author Mark Paluch
  */
 class PlainChannelInitializer extends io.netty.channel.ChannelInitializer<Channel> implements RedisChannelInitializer {
 
-    static final RedisCommandBuilder<String, String> INITIALIZING_CMD_BUILDER = new RedisCommandBuilder<>(
-            new Utf8StringCodec());
+    final static Supplier<AsyncCommand<?, ?, ?>> NO_PING = () -> null;
 
-    protected final char[] password;
-
-    private boolean pingBeforeActivate;
-    private CompletableFuture<Boolean> initializedFuture = new CompletableFuture<>();
     private final Supplier<List<ChannelHandler>> handlers;
+    private final Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier;
     private final EventBus eventBus;
 
-    PlainChannelInitializer(boolean pingBeforeActivateConnection, char[] password, Supplier<List<ChannelHandler>> handlers,
+    private volatile CompletableFuture<Boolean> initializedFuture = new CompletableFuture<>();
+
+    PlainChannelInitializer(Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier, Supplier<List<ChannelHandler>> handlers,
             EventBus eventBus) {
 
-        this.pingBeforeActivate = pingBeforeActivateConnection;
-        this.password = password;
+        this.pingCommandSupplier = pingCommandSupplier;
         this.handlers = handlers;
         this.eventBus = eventBus;
     }
@@ -74,6 +69,7 @@ public CompletableFuture<Boolean> channelInitialized() {
 
                 @Override
                 public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+
                     eventBus.publish(new DisconnectedEvent(local(ctx), remote(ctx)));
                     initializedFuture = new CompletableFuture<>();
                     pingCommand = null;
@@ -94,13 +90,11 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
 
                 @Override
                 public void channelActive(final ChannelHandlerContext ctx) throws Exception {
+
                     eventBus.publish(new ConnectedEvent(local(ctx), remote(ctx)));
-                    if (pingBeforeActivate) {
-                        if (password != null && password.length != 0) {
-                            pingCommand = new AsyncCommand<>(INITIALIZING_CMD_BUILDER.auth(new String(password)));
-                        } else {
-                            pingCommand = new AsyncCommand<>(INITIALIZING_CMD_BUILDER.ping());
-                        }
+
+                    if (pingCommandSupplier != NO_PING) {
+                        pingCommand = pingCommandSupplier.get();
                         pingBeforeActivate(pingCommand, initializedFuture, ctx);
                     } else {
                         super.channelActive(ctx);
@@ -137,13 +131,6 @@ static void pingBeforeActivate(final AsyncCommand<?, ?, ?> cmd, final Completabl
         ctx.channel().writeAndFlush(cmd);
     }
 
-    static void removeIfExists(ChannelPipeline pipeline, Class<? extends ChannelHandler> handlerClass) {
-        ChannelHandler channelHandler = pipeline.get(handlerClass);
-        if (channelHandler != null) {
-            pipeline.remove(channelHandler);
-        }
-    }
-
     @Override
     public CompletableFuture<Boolean> channelInitialized() {
         return initializedFuture;
diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/com/lambdaworks/redis/RedisClient.java
index 1b086ee106..8772de5499 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClient.java
@@ -256,9 +256,17 @@ private <K, V, T extends RedisChannelHandler<K, V>, S> ConnectionFuture<S> conne
         connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
         channelType(connectionBuilder, redisURI);
 
+        if (clientOptions.isPingBeforeActivateConnection()) {
+            if (hasPassword(redisURI)) {
+                connectionBuilder.enableAuthPingBeforeConnect();
+            } else {
+                connectionBuilder.enablePingBeforeConnect();
+            }
+        }
+
         ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
 
-        if (redisURI.getPassword() != null && redisURI.getPassword().length != 0) {
+        if (!clientOptions.isPingBeforeActivateConnection() && hasPassword(redisURI)) {
 
             future = future.thenApplyAsync(channelHandler -> {
 
@@ -289,6 +297,10 @@ private <K, V, T extends RedisChannelHandler<K, V>, S> ConnectionFuture<S> conne
         return future.thenApply(channelHandler -> (S) connection);
     }
 
+    private boolean hasPassword(RedisURI redisURI) {
+        return redisURI.getPassword() != null && redisURI.getPassword().length != 0;
+    }
+
     /**
      * Open a new pub/sub connection to a Redis server that treats keys and values as UTF-8 strings.
      *
@@ -428,6 +440,10 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
                 .connection(connection);
         connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
 
+        if (clientOptions.isPingBeforeActivateConnection()) {
+            connectionBuilder.enablePingBeforeConnect();
+        }
+
         if (redisURI.getSentinels().isEmpty() && (isNotEmpty(redisURI.getHost()) || !isEmpty(redisURI.getSocket()))) {
             channelType(connectionBuilder, redisURI);
             try {
diff --git a/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java b/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
index 96e2184c1a..ace25e3fea 100644
--- a/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
@@ -17,7 +17,6 @@
 
 import static com.lambdaworks.redis.ConnectionEventTrigger.local;
 import static com.lambdaworks.redis.ConnectionEventTrigger.remote;
-import static com.lambdaworks.redis.PlainChannelInitializer.INITIALIZING_CMD_BUILDER;
 import static com.lambdaworks.redis.PlainChannelInitializer.pingBeforeActivate;
 
 import java.io.IOException;
@@ -49,7 +48,7 @@
 
 /**
  * Connection builder for SSL connections. This class is part of the internal API.
- * 
+ *
  * @author Mark Paluch
  */
 public class SslConnectionBuilder extends ConnectionBuilder {
@@ -76,8 +75,8 @@ protected List<ChannelHandler> buildHandlers() {
     @Override
     public RedisChannelInitializer build() {
 
-        return new SslChannelInitializer(clientOptions().isPingBeforeActivateConnection(), this::buildHandlers, redisURI,
-                clientResources().eventBus(), clientOptions().getSslOptions());
+        return new SslChannelInitializer(getPingCommandSupplier(), this::buildHandlers, redisURI, clientResources().eventBus(),
+                clientOptions().getSslOptions());
     }
 
     /**
@@ -85,16 +84,18 @@ public RedisChannelInitializer build() {
      */
     static class SslChannelInitializer extends io.netty.channel.ChannelInitializer<Channel> implements RedisChannelInitializer {
 
-        private final boolean pingBeforeActivate;
+        private final Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier;
         private final Supplier<List<ChannelHandler>> handlers;
         private final RedisURI redisURI;
         private final EventBus eventBus;
         private final SslOptions sslOptions;
-        private CompletableFuture<Boolean> initializedFuture = new CompletableFuture<>();
 
-        public SslChannelInitializer(boolean pingBeforeActivate, Supplier<List<ChannelHandler>> handlers, RedisURI redisURI,
-                EventBus eventBus, SslOptions sslOptions) {
-            this.pingBeforeActivate = pingBeforeActivate;
+        private volatile CompletableFuture<Boolean> initializedFuture = new CompletableFuture<>();
+
+        public SslChannelInitializer(Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier,
+                Supplier<List<ChannelHandler>> handlers, RedisURI redisURI, EventBus eventBus, SslOptions sslOptions) {
+
+            this.pingCommandSupplier = pingCommandSupplier;
             this.handlers = handlers;
             this.redisURI = redisURI;
             this.eventBus = eventBus;
@@ -175,13 +176,8 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
 
                             SslHandshakeCompletionEvent event = (SslHandshakeCompletionEvent) evt;
                             if (event.isSuccess()) {
-                                if (pingBeforeActivate) {
-                                    if (redisURI.getPassword() != null && redisURI.getPassword().length != 0) {
-                                        pingCommand = new AsyncCommand<>(
-                                                INITIALIZING_CMD_BUILDER.auth(new String(redisURI.getPassword())));
-                                    } else {
-                                        pingCommand = new AsyncCommand<>(INITIALIZING_CMD_BUILDER.ping());
-                                    }
+                                if (pingCommandSupplier != PlainChannelInitializer.NO_PING) {
+                                    pingCommand = pingCommandSupplier.get();
                                     pingBeforeActivate(pingCommand, initializedFuture, ctx);
                                 } else {
                                     ctx.fireChannelActive();
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index ab6f4d06a5..1891671844 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -66,8 +66,8 @@
  *
  * <p>
  * Connections to the cluster members are opened on the first access to the cluster node and managed by the
- * {@link StatefulRedisClusterConnection}. You should not use transactional commands on cluster connections since {@code
- * MULTI}, {@code EXEC} and {@code DISCARD} have no key and cannot be assigned to a particular node.
+ * {@link StatefulRedisClusterConnection}. You should not use transactional commands on cluster connections since {@code MULTI},
+ * {@code EXEC} and {@code DISCARD} have no key and cannot be assigned to a particular node.
  * </p>
  * <p>
  * The Redis cluster client provides a {@link RedisAdvancedClusterCommands sync}, {@link RedisAdvancedClusterAsyncCommands
@@ -101,8 +101,7 @@
  * initializes new connections with the {@code clientName}.</li>
  * <li>{@link RedisAdvancedClusterAsyncCommands#flushall()} Run {@code FLUSHALL} on all master nodes.</li>
  * <li>{@link RedisAdvancedClusterAsyncCommands#flushdb()} Executes {@code FLUSHDB} on all master nodes.</li>
- * <li>{@link RedisAdvancedClusterAsyncCommands#keys(Object)} Executes {@code
- * KEYS} on all.</li>
+ * <li>{@link RedisAdvancedClusterAsyncCommands#keys(Object)} Executes {@code KEYS} on all.</li>
  * <li>{@link RedisAdvancedClusterAsyncCommands#randomkey()} Returns a random key from a random master node.</li>
  * <li>{@link RedisAdvancedClusterAsyncCommands#scriptFlush()} Executes {@code SCRIPT FLUSH} on all nodes.</li>
  * <li>{@link RedisAdvancedClusterAsyncCommands#scriptKill()} Executes {@code SCRIPT KILL} on all nodes.</li>
@@ -192,18 +191,18 @@ private static void assertSameOptions(Iterable<RedisURI> redisURIs) {
             }
 
             if (ssl.booleanValue() != redisURI.isSsl()) {
-                throw new IllegalArgumentException(
-                        "RedisURI " + redisURI + " SSL is not consistent with the other seed URI SSL settings");
+                throw new IllegalArgumentException("RedisURI " + redisURI
+                        + " SSL is not consistent with the other seed URI SSL settings");
             }
 
             if (startTls.booleanValue() != redisURI.isStartTls()) {
-                throw new IllegalArgumentException(
-                        "RedisURI " + redisURI + " StartTLS is not consistent with the other seed URI StartTLS settings");
+                throw new IllegalArgumentException("RedisURI " + redisURI
+                        + " StartTLS is not consistent with the other seed URI StartTLS settings");
             }
 
             if (verifyPeer.booleanValue() != redisURI.isVerifyPeer()) {
-                throw new IllegalArgumentException(
-                        "RedisURI " + redisURI + " VerifyPeer is not consistent with the other seed URI VerifyPeer settings");
+                throw new IllegalArgumentException("RedisURI " + redisURI
+                        + " VerifyPeer is not consistent with the other seed URI VerifyPeer settings");
             }
         }
     }
@@ -456,8 +455,8 @@ <K, V> StatefulRedisPubSubConnection<K, V> connectPubSubToNode(RedisCodec<K, V>
                 timeout, unit);
 
         try {
-            connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier,
-                    () -> new PubSubCommandHandler<K, V>(clientResources, codec, endpoint));
+            connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier, () -> new PubSubCommandHandler<K, V>(
+                    clientResources, codec, endpoint));
         } catch (RedisException e) {
             connection.close();
             throw e;
@@ -507,8 +506,8 @@ <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K,
 
         for (int i = 0; i < connectionAttempts; i++) {
             try {
-                connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier,
-                        () -> new CommandHandler(clientResources, endpoint));
+                connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier, () -> new CommandHandler(
+                        clientResources, endpoint));
                 connected = true;
                 break;
             } catch (RedisException e) {
@@ -599,8 +598,8 @@ <K, V> StatefulRedisClusterPubSubConnection<K, V> connectClusterPubSubImpl(Redis
     private <K, V> void connectStateful(StatefulRedisConnectionImpl<K, V> connection, DefaultEndpoint endpoint,
             RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier,
             Supplier<CommandHandler> commandHandlerSupplier) {
-        getConnection(
-                connectStatefulAsync(connection, endpoint, connectionSettings, socketAddressSupplier, commandHandlerSupplier));
+        getConnection(connectStatefulAsync(connection, endpoint, connectionSettings, socketAddressSupplier,
+                commandHandlerSupplier));
     }
 
     /**
@@ -610,8 +609,8 @@ private <K, V> void connectStateful(StatefulRedisConnectionImpl<K, V> connection
     private <K, V> void connectStateful(StatefulRedisClusterConnectionImpl<K, V> connection, DefaultEndpoint endpoint,
             RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier,
             Supplier<CommandHandler> commandHandlerSupplier) {
-        getConnection(
-                connectStatefulAsync(connection, endpoint, connectionSettings, socketAddressSupplier, commandHandlerSupplier));
+        getConnection(connectStatefulAsync(connection, endpoint, connectionSettings, socketAddressSupplier,
+                commandHandlerSupplier));
     }
 
     /**
@@ -625,9 +624,17 @@ private <K, V, T extends RedisChannelHandler<K, V>, S> ConnectionFuture<S> conne
         ConnectionBuilder connectionBuilder = createConnectionBuilder(connection, endpoint, connectionSettings,
                 socketAddressSupplier, commandHandlerSupplier);
 
+        if (clientOptions.isPingBeforeActivateConnection()) {
+            if (hasPassword(connectionSettings)) {
+                connectionBuilder.enableAuthPingBeforeConnect();
+            } else {
+                connectionBuilder.enablePingBeforeConnect();
+            }
+        }
+
         ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
 
-        if (connectionSettings.getPassword() != null && connectionSettings.getPassword().length != 0) {
+        if (!clientOptions.isPingBeforeActivateConnection() && hasPassword(connectionSettings)) {
             future = future.thenApplyAsync(channelHandler -> {
 
                 if (connection instanceof StatefulRedisClusterConnectionImpl) {
@@ -661,6 +668,10 @@ private <K, V, T extends RedisChannelHandler<K, V>, S> ConnectionFuture<S> conne
         return future.thenApply(channelHandler -> (S) connection);
     }
 
+    private boolean hasPassword(RedisURI connectionSettings) {
+        return connectionSettings.getPassword() != null && connectionSettings.getPassword().length != 0;
+    }
+
     private <K, V> ConnectionBuilder createConnectionBuilder(RedisChannelHandler<K, V> connection, DefaultEndpoint endpoint,
             RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier,
             Supplier<CommandHandler> commandHandlerSupplier) {
@@ -777,7 +788,7 @@ protected Partitions loadPartitions() {
 
     /**
      * Determines a {@link Partitions topology view} based on the current and the obtain topology views.
-     * 
+     *
      * @param current the current topology view. May be {@literal null} if {@link RedisClusterClient} has no topology view yet.
      * @param topologyViews the obtain topology views
      * @return the {@link Partitions topology view} to use.
@@ -868,7 +879,7 @@ public void setOptions(ClusterClientOptions clientOptions) {
 
     /**
      * Returns the first {@link RedisURI} configured with this {@link RedisClusterClient} instance.
-     * 
+     *
      * @return the first {@link RedisURI}.
      */
     protected RedisURI getFirstUri() {
@@ -879,13 +890,12 @@ protected RedisURI getFirstUri() {
 
     /**
      * Returns a {@link Supplier} for {@link SocketAddress connection points}.
-     * 
+     *
      * @param sortFunction Sort function to enforce a specific order. The sort function must not change the order or the input
      *        parameter but create a new collection with the desired order, must not be {@literal null}.
      * @return {@link Supplier} for {@link SocketAddress connection points}.
      */
-    protected Supplier<SocketAddress> getSocketAddressSupplier(
-            Function<Partitions, Collection<RedisClusterNode>> sortFunction) {
+    protected Supplier<SocketAddress> getSocketAddressSupplier(Function<Partitions, Collection<RedisClusterNode>> sortFunction) {
 
         LettuceAssert.notNull(sortFunction, "Sort function must not be null");
 
@@ -904,7 +914,7 @@ protected Supplier<SocketAddress> getSocketAddressSupplier(
 
     /**
      * Returns an {@link Iterable} of the initial {@link RedisURI URIs}.
-     * 
+     *
      * @return the initial {@link RedisURI URIs}
      */
     protected Iterable<RedisURI> getInitialUris() {
@@ -913,7 +923,7 @@ protected Iterable<RedisURI> getInitialUris() {
 
     /**
      * Apply a {@link Consumer} of {@link StatefulRedisClusterConnectionImpl} to all active connections.
-     * 
+     *
      * @param function the {@link Consumer}.
      */
     protected void forEachClusterConnection(Consumer<StatefulRedisClusterConnectionImpl<?, ?>> function) {
@@ -949,7 +959,7 @@ protected <T extends Closeable> void forEachCloseable(Predicate<? super Closeabl
      * provide an {@link Iterable} of {@link RedisURI} that is used to perform the next topology refresh.
      * <p>
      * Subclasses of {@link RedisClusterClient} may override that method.
-     * 
+     *
      * @return {@link Iterable} of {@link RedisURI} for the next topology refresh.
      */
     protected Iterable<RedisURI> getTopologyRefreshSource() {
@@ -974,7 +984,7 @@ protected Iterable<RedisURI> getTopologyRefreshSource() {
      * enabled.
      * <p>
      * Subclasses of {@link RedisClusterClient} may override that method.
-     * 
+     *
      * @return {@link true} if dynamic refresh sources are used.
      * @see ClusterTopologyRefreshOptions#useDynamicRefreshSources()
      */
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
index 15d18f5bf5..9926601184 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
@@ -25,16 +25,16 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.api.sync.RedisCommands;
 import org.assertj.core.api.AssertionsForClassTypes;
 import org.junit.*;
 import org.junit.runners.MethodSorters;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import com.lambdaworks.TestClientResources;
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
 import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
@@ -391,6 +391,28 @@ public void clusterAuth() throws Exception {
         FastShutdown.shutdown(clusterClient);
     }
 
+    @Test
+    public void clusterAuthPingBeforeConnect() throws Exception {
+
+        RedisClusterClient clusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), port7)
+                .withPassword("foobared").build());
+        clusterClient.setOptions(ClusterClientOptions.builder().pingBeforeActivateConnection(true).build());
+
+        StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
+        RedisAdvancedClusterCommands<String, String> sync = connection.sync();
+
+        List<String> time = sync.time();
+        assertThat(time).hasSize(2);
+
+        connection.async().quit().get();
+
+        time = sync.time();
+        assertThat(time).hasSize(2);
+
+        connection.close();
+        FastShutdown.shutdown(clusterClient);
+    }
+
     @Test(expected = RedisException.class)
     public void clusterNeedsAuthButNotSupplied() throws Exception {
 
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java b/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
index e85a0d35a1..c388f65010 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
@@ -28,10 +28,7 @@
 
 import com.lambdaworks.TestClientResources;
 import com.lambdaworks.Wait;
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
@@ -48,8 +45,8 @@ public class SentinelConnectionTest extends AbstractSentinelTest {
 
     @BeforeClass
     public static void setupClient() {
-        sentinelClient = RedisClient.create(TestClientResources.get(),
-                RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
+        sentinelClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder
+                .sentinel(TestSettings.host(), MASTER_ID).build());
     }
 
     @Before
@@ -67,7 +64,6 @@ public void testAsync() throws Exception {
         assertThat(future.get()).isNotNull();
         assertThat(future.isDone()).isTrue();
         assertThat(future.isCancelled()).isFalse();
-
     }
 
     @Test
@@ -91,7 +87,6 @@ public void testStatefulConnection() throws Exception {
 
         StatefulRedisSentinelConnection<String, String> statefulConnection = sentinel.getStatefulConnection();
         assertThat(statefulConnection).isSameAs(statefulConnection.async().getStatefulConnection());
-
     }
 
     @Test
@@ -100,7 +95,6 @@ public void testSyncConnection() throws Exception {
         StatefulRedisSentinelConnection<String, String> statefulConnection = sentinel.getStatefulConnection();
         RedisSentinelCommands<String, String> sync = statefulConnection.sync();
         assertThat(sync.ping()).isEqualTo("PONG");
-
     }
 
     @Test
@@ -109,7 +103,6 @@ public void testSyncAsyncConversion() throws Exception {
         StatefulRedisSentinelConnection<String, String> statefulConnection = sentinel.getStatefulConnection();
         assertThat(statefulConnection.sync().getStatefulConnection()).isSameAs(statefulConnection);
         assertThat(statefulConnection.sync().getStatefulConnection().sync()).isSameAs(statefulConnection.sync());
-
     }
 
     @Test
@@ -137,8 +130,8 @@ public void testAsyncClose() throws Exception {
 
     @Test
     public void connectToOneNode() throws Exception {
-        RedisSentinelCommands<String, String> connection = sentinelClient
-                .connectSentinel(RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build()).sync();
+        RedisSentinelCommands<String, String> connection = sentinelClient.connectSentinel(
+                RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build()).sync();
         assertThat(connection.ping()).isEqualTo("PONG");
         connection.getStatefulConnection().close();
     }
@@ -150,6 +143,21 @@ public void connectWithByteCodec() throws Exception {
         connection.getStatefulConnection().close();
     }
 
+    @Test
+    public void sentinelConnectionPingBeforeConnectShouldDiscardPassword() throws Exception {
+
+        RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).withPassword("hello-world").build();
+
+        sentinelClient.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+        StatefulRedisSentinelConnection<String, String> connection = sentinelClient.connectSentinel(redisURI);
+
+        assertThat(connection.sync().ping()).isEqualTo("PONG");
+
+        connection.close();
+
+        sentinelClient.setOptions(ClientOptions.create());
+    }
+
     @Test
     public void sentinelConnectionShouldSetClientName() throws Exception {
 

From bf0d18ca9c130e99d3c5e8a673b11886988bd996 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 30 Jan 2017 10:02:02 +0100
Subject: [PATCH 127/808] Use EnumSet to determine Read-Only commands #457

Use EnumSet that stores enum values as bit vector instead of iterating through an array of elements.
---
 .../ClusterDistributionChannelWriter.java     | 35 +++++++++----------
 .../redis/cluster/ReadOnlyCommands.java       | 25 +++++++++----
 .../masterslave/MasterSlaveChannelWriter.java |  9 +++--
 .../redis/masterslave/ReadOnlyCommands.java   | 25 +++++++++----
 .../redis/cluster/ReadOnlyCommandsTest.java   |  7 ++--
 5 files changed, 61 insertions(+), 40 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
index b6fd201ae5..04fa126ad7 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
@@ -100,15 +100,15 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
 
                         if (asking) {
                             // set asking bit
-                            StatefulRedisConnection<K, V> statefulRedisConnection = (StatefulRedisConnection<K, V>) connection;
-                            statefulRedisConnection.async().asking();
-                        }
-
-                        connection.getChannelWriter().write(command);
-                    } catch (Exception e) {
-                        command.completeExceptionally(e);
+                        StatefulRedisConnection<K, V> statefulRedisConnection = (StatefulRedisConnection<K, V>) connection;
+                        statefulRedisConnection.async().asking();
                     }
-                });
+
+                    connection.getChannelWriter().write(command);
+                } catch (Exception e) {
+                    command.completeExceptionally(e);
+                }
+            })  ;
 
                 return command;
             }
@@ -145,10 +145,9 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
     }
 
     private ClusterConnectionProvider.Intent getIntent(ProtocolKeyword type) {
-        for (ProtocolKeyword readOnlyCommand : ReadOnlyCommands.READ_ONLY_COMMANDS) {
-            if (readOnlyCommand == type) {
-                return ClusterConnectionProvider.Intent.READ;
-            }
+
+        if (ReadOnlyCommands.isReadOnlyCommand(type)) {
+            return ClusterConnectionProvider.Intent.READ;
         }
 
         return ClusterConnectionProvider.Intent.WRITE;
@@ -157,8 +156,8 @@ private ClusterConnectionProvider.Intent getIntent(ProtocolKeyword type) {
     static HostAndPort getMoveTarget(String errorMessage) {
 
         LettuceAssert.notEmpty(errorMessage, "ErrorMessage must not be empty");
-        LettuceAssert.isTrue(errorMessage.startsWith(CommandKeyword.MOVED.name()),
-                "ErrorMessage must start with " + CommandKeyword.MOVED);
+        LettuceAssert.isTrue(errorMessage.startsWith(CommandKeyword.MOVED.name()), "ErrorMessage must start with "
+                + CommandKeyword.MOVED);
 
         String[] movedMessageParts = errorMessage.split(" ");
         LettuceAssert.isTrue(movedMessageParts.length >= 3, "ErrorMessage must consist of 3 tokens (" + errorMessage + ")");
@@ -169,8 +168,8 @@ static HostAndPort getMoveTarget(String errorMessage) {
     static HostAndPort getAskTarget(String errorMessage) {
 
         LettuceAssert.notEmpty(errorMessage, "ErrorMessage must not be empty");
-        LettuceAssert.isTrue(errorMessage.startsWith(CommandKeyword.ASK.name()),
-                "ErrorMessage must start with " + CommandKeyword.ASK);
+        LettuceAssert.isTrue(errorMessage.startsWith(CommandKeyword.ASK.name()), "ErrorMessage must start with "
+                + CommandKeyword.ASK);
 
         String[] movedMessageParts = errorMessage.split(" ");
         LettuceAssert.isTrue(movedMessageParts.length >= 3, "ErrorMessage must consist of 3 tokens (" + errorMessage + ")");
@@ -235,7 +234,7 @@ public void setPartitions(Partitions partitions) {
         }
     }
 
-    public Partitions getPartitions(){
+    public Partitions getPartitions() {
         return partitions;
     }
 
@@ -251,7 +250,7 @@ public void setReadFrom(ReadFrom readFrom) {
 
     /**
      * Gets the {@link ReadFrom} setting for this connection. Defaults to {@link ReadFrom#MASTER} if not set.
-     * 
+     *
      * @return the read from setting
      */
     public ReadFrom getReadFrom() {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java b/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
index 22972885da..d0cf5cdf0c 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
@@ -15,7 +15,8 @@
  */
 package com.lambdaworks.redis.cluster;
 
-import java.util.HashSet;
+import java.util.Collections;
+import java.util.EnumSet;
 import java.util.Set;
 
 import com.lambdaworks.redis.protocol.CommandType;
@@ -28,17 +29,27 @@
  */
 class ReadOnlyCommands {
 
-    static final ProtocolKeyword READ_ONLY_COMMANDS[];
+    private static final Set<CommandType> READ_ONLY_COMMANDS = EnumSet.noneOf(CommandType.class);
 
     static {
-
-        Set<ProtocolKeyword> set = new HashSet<ProtocolKeyword>(CommandName.values().length);
-
         for (CommandName commandNames : CommandName.values()) {
-            set.add(CommandType.valueOf(commandNames.name()));
+            READ_ONLY_COMMANDS.add(CommandType.valueOf(commandNames.name()));
         }
+    }
+
+    /**
+     * @param protocolKeyword must not be {@literal null}.
+     * @return {@literal true} if {@link ProtocolKeyword} is a read-only command.
+     */
+    public static boolean isReadOnlyCommand(ProtocolKeyword protocolKeyword) {
+        return READ_ONLY_COMMANDS.contains(protocolKeyword);
+    }
 
-        READ_ONLY_COMMANDS = set.toArray(new ProtocolKeyword[set.size()]);
+    /**
+     * @return an unmodifiable {@link Set} of {@link CommandType read-only} commands.
+     */
+    public static Set<CommandType> getReadOnlyCommands() {
+        return Collections.unmodifiableSet(READ_ONLY_COMMANDS);
     }
 
     enum CommandName {
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java
index a7adcd5f5f..3cec6e99aa 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java
@@ -26,7 +26,7 @@
 
 /**
  * Channel writer/dispatcher that dispatches commands based on the intent to different connections.
- * 
+ *
  * @author Mark Paluch
  */
 class MasterSlaveChannelWriter<K, V> implements RedisChannelWriter {
@@ -55,11 +55,10 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
 
     private MasterSlaveConnectionProvider.Intent getIntent(ProtocolKeyword type) {
 
-        for (ProtocolKeyword readOnlyCommand : ReadOnlyCommands.READ_ONLY_COMMANDS) {
-            if (readOnlyCommand == type) {
-                return MasterSlaveConnectionProvider.Intent.READ;
-            }
+        if (ReadOnlyCommands.isReadOnlyCommand(type)) {
+            return MasterSlaveConnectionProvider.Intent.READ;
         }
+
         return MasterSlaveConnectionProvider.Intent.WRITE;
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java b/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
index f5952854db..f720ec8cc5 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
@@ -15,7 +15,8 @@
  */
 package com.lambdaworks.redis.masterslave;
 
-import java.util.HashSet;
+import java.util.Collections;
+import java.util.EnumSet;
 import java.util.Set;
 
 import com.lambdaworks.redis.protocol.CommandType;
@@ -28,17 +29,27 @@
  */
 class ReadOnlyCommands {
 
-    public static final ProtocolKeyword READ_ONLY_COMMANDS[];
+    private static final Set<CommandType> READ_ONLY_COMMANDS = EnumSet.noneOf(CommandType.class);
 
     static {
-
-        Set<ProtocolKeyword> set = new HashSet<ProtocolKeyword>(CommandName.values().length);
-
         for (CommandName commandNames : CommandName.values()) {
-            set.add(CommandType.valueOf(commandNames.name()));
+            READ_ONLY_COMMANDS.add(CommandType.valueOf(commandNames.name()));
         }
+    }
+
+    /**
+     * @param protocolKeyword must not be {@literal null}.
+     * @return {@literal true} if {@link ProtocolKeyword} is a read-only command.
+     */
+    public static boolean isReadOnlyCommand(ProtocolKeyword protocolKeyword) {
+        return READ_ONLY_COMMANDS.contains(protocolKeyword);
+    }
 
-        READ_ONLY_COMMANDS = set.toArray(new ProtocolKeyword[set.size()]);
+    /**
+     * @return an unmodifiable {@link Set} of {@link CommandType read-only} commands.
+     */
+    public static Set<CommandType> getReadOnlyCommands() {
+        return Collections.unmodifiableSet(READ_ONLY_COMMANDS);
     }
 
     enum CommandName {
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java b/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
index d8c346c563..7aa4b7206b 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
@@ -17,9 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.junit.Test;
+
 import com.lambdaworks.redis.protocol.CommandType;
 import com.lambdaworks.redis.protocol.ProtocolKeyword;
-import org.junit.Test;
 
 /**
  * @author Mark Paluch
@@ -28,12 +29,12 @@ public class ReadOnlyCommandsTest {
 
     @Test
     public void testCount() throws Exception {
-        assertThat(ReadOnlyCommands.READ_ONLY_COMMANDS).hasSize(71);
+        assertThat(ReadOnlyCommands.getReadOnlyCommands()).hasSize(71);
     }
 
     @Test
     public void testResolvableCommandNames() throws Exception {
-        for (ProtocolKeyword readOnlyCommand : ReadOnlyCommands.READ_ONLY_COMMANDS) {
+        for (ProtocolKeyword readOnlyCommand : ReadOnlyCommands.getReadOnlyCommands()) {
             assertThat(readOnlyCommand.name()).isEqualTo(CommandType.valueOf(readOnlyCommand.name()).name());
         }
     }

From 0e637f4b7f2a0ff9260a3d1d66c05604fb1714c3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 30 Jan 2017 17:25:08 +0100
Subject: [PATCH 128/808] Encapsulate fields in Commands implementations and
 command builder #458

Make fields private and immutable for better encapsulation.
---
 .../redis/AbstractRedisAsyncCommands.java     | 39 ++++++++-------
 .../redis/AbstractRedisReactiveCommands.java  | 50 +++++++------------
 .../redis/RedisAsyncCommandsImpl.java         | 14 +++---
 .../redis/RedisReactiveCommandsImpl.java      |  6 +--
 ...RedisAdvancedClusterAsyncCommandsImpl.java | 11 ++--
 ...isAdvancedClusterReactiveCommandsImpl.java | 18 ++++---
 .../protocol/BaseRedisCommandBuilder.java     |  4 +-
 .../pubsub/RedisPubSubAsyncCommandsImpl.java  |  8 +--
 .../RedisPubSubReactiveCommandsImpl.java      | 19 ++++---
 .../RedisSentinelReactiveCommandsImpl.java    | 22 ++++----
 10 files changed, 91 insertions(+), 100 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
index e7aa3d9a4c..e306fb2d9e 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,17 +38,17 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
+ * @author Mark Paluch
  */
-public abstract class AbstractRedisAsyncCommands<K, V>
-        implements RedisHashAsyncCommands<K, V>, RedisKeyAsyncCommands<K, V>, RedisStringAsyncCommands<K, V>, RedisListAsyncCommands<K, V>,
-        RedisSetAsyncCommands<K, V>, RedisSortedSetAsyncCommands<K, V>, RedisScriptingAsyncCommands<K, V>,
-        RedisServerAsyncCommands<K, V>, RedisHLLAsyncCommands<K, V>, BaseRedisAsyncCommands<K, V>,
-        RedisTransactionalAsyncCommands<K, V>, RedisGeoAsyncCommands<K, V>, RedisClusterAsyncCommands<K, V> {
+public abstract class AbstractRedisAsyncCommands<K, V> implements RedisHashAsyncCommands<K, V>, RedisKeyAsyncCommands<K, V>,
+        RedisStringAsyncCommands<K, V>, RedisListAsyncCommands<K, V>, RedisSetAsyncCommands<K, V>,
+        RedisSortedSetAsyncCommands<K, V>, RedisScriptingAsyncCommands<K, V>, RedisServerAsyncCommands<K, V>,
+        RedisHLLAsyncCommands<K, V>, BaseRedisAsyncCommands<K, V>, RedisTransactionalAsyncCommands<K, V>,
+        RedisGeoAsyncCommands<K, V>, RedisClusterAsyncCommands<K, V> {
 
-    protected MultiOutput<K, V> multi;
-    protected RedisCommandBuilder<K, V> commandBuilder;
-    protected RedisCodec<K, V> codec;
-    protected StatefulConnection<K, V> connection;
+    private final RedisCommandBuilder<K, V> commandBuilder;
+    private final RedisCodec<K, V> codec;
+    private final StatefulConnection<K, V> connection;
 
     /**
      * Initialize a new instance.
@@ -59,7 +59,7 @@ public abstract class AbstractRedisAsyncCommands<K, V>
     public AbstractRedisAsyncCommands(StatefulConnection<K, V> connection, RedisCodec<K, V> codec) {
         this.connection = connection;
         this.codec = codec;
-        commandBuilder = new RedisCommandBuilder<K, V>(codec);
+        this.commandBuilder = new RedisCommandBuilder<K, V>(codec);
     }
 
     @Override
@@ -1239,7 +1239,8 @@ public RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V>
     }
 
     @Override
-    public RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range) {
+    public RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key,
+            Range<? extends Number> range) {
         return dispatch(commandBuilder.zrangebyscoreWithScores(channel, key, range, Limit.unlimited()));
     }
 
@@ -1256,8 +1257,8 @@ public RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V>
     }
 
     @Override
-    public RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
-           Limit limit) {
+    public RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key,
+            Range<? extends Number> range, Limit limit) {
         return dispatch(commandBuilder.zrangebyscoreWithScores(channel, key, range, limit));
     }
 
@@ -1409,7 +1410,8 @@ public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K ke
     }
 
     @Override
-    public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
+    public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
+            Limit limit) {
         return dispatch(commandBuilder.zrevrangebyscore(channel, key, range, limit));
     }
 
@@ -1424,7 +1426,8 @@ public RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<
     }
 
     @Override
-    public RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range) {
+    public RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key,
+            Range<? extends Number> range) {
         return dispatch(commandBuilder.zrevrangebyscoreWithScores(channel, key, range, Limit.unlimited()));
     }
 
@@ -1441,8 +1444,8 @@ public RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<
     }
 
     @Override
-    public RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
-            Limit limit) {
+    public RedisFuture<Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key,
+            Range<? extends Number> range, Limit limit) {
         return dispatch(commandBuilder.zrevrangebyscoreWithScores(channel, key, range, limit));
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
index 7bff4ee261..f111005f0f 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
 import com.lambdaworks.redis.GeoArgs.Unit;
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.api.reactive.*;
@@ -30,8 +33,6 @@
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.output.*;
 import com.lambdaworks.redis.protocol.*;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
 
 /**
  * A reactive and thread-safe API for a Redis connection.
@@ -47,10 +48,9 @@ public abstract class AbstractRedisReactiveCommands<K, V> implements RedisHashRe
         RedisServerReactiveCommands<K, V>, RedisHLLReactiveCommands<K, V>, BaseRedisReactiveCommands<K, V>,
         RedisTransactionalReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>, RedisClusterReactiveCommands<K, V> {
 
-    protected MultiOutput<K, V> multi;
-    protected RedisCommandBuilder<K, V> commandBuilder;
-    protected RedisCodec<K, V> codec;
-    protected StatefulConnection<K, V> connection;
+    private final RedisCommandBuilder<K, V> commandBuilder;
+    private final RedisCodec<K, V> codec;
+    private final StatefulConnection<K, V> connection;
 
     /**
      * Initialize a new instance.
@@ -61,7 +61,7 @@ public abstract class AbstractRedisReactiveCommands<K, V> implements RedisHashRe
     public AbstractRedisReactiveCommands(StatefulConnection<K, V> connection, RedisCodec<K, V> codec) {
         this.connection = connection;
         this.codec = codec;
-        commandBuilder = new RedisCommandBuilder<K, V>(codec);
+        this.commandBuilder = new RedisCommandBuilder<K, V>(codec);
     }
 
     @Override
@@ -72,7 +72,6 @@ public Mono<Long> append(K key, V value) {
     @Override
     public Mono<String> auth(String password) {
         return createMono(() -> commandBuilder.auth(password));
-
     }
 
     @Override
@@ -1204,8 +1203,7 @@ public Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String
     }
 
     @Override
-    public Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset,
-            long count) {
+    public Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count) {
         return createMono(() -> commandBuilder.zrangebyscore(channel, key, min, max, offset, count));
     }
 
@@ -1215,8 +1213,7 @@ public Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<?
     }
 
     @Override
-    public Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset,
-            long count) {
+    public Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count) {
         return createMono(() -> commandBuilder.zrangebyscore(channel, key, min, max, offset, count));
     }
 
@@ -1394,14 +1391,12 @@ public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Rang
     }
 
     @Override
-    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset,
-            long count) {
+    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count) {
         return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
     }
 
     @Override
-    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset,
-            long count) {
+    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count) {
         return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
     }
 
@@ -1574,8 +1569,7 @@ public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K ke
     }
 
     @Override
-    public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor,
-            ScanArgs scanArgs) {
+    public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs) {
         return createMono(() -> commandBuilder.hscanStreaming(channel, key, scanCursor, scanArgs));
     }
 
@@ -1615,8 +1609,7 @@ public Mono<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K ke
     }
 
     @Override
-    public Mono<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor,
-            ScanArgs scanArgs) {
+    public Mono<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs) {
         return createMono(() -> commandBuilder.zscanStreaming(channel, key, scanCursor, scanArgs));
     }
 
@@ -1853,17 +1846,14 @@ public Flux<V> georadius(K key, double longitude, double latitude, double distan
     }
 
     @Override
-    public Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, Unit unit,
-            GeoArgs geoArgs) {
-        return createDissolvingFlux(() -> commandBuilder.georadius(key, longitude, latitude, distance, unit.name(),
-                geoArgs));
+    public Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, Unit unit, GeoArgs geoArgs) {
+        return createDissolvingFlux(() -> commandBuilder.georadius(key, longitude, latitude, distance, unit.name(), geoArgs));
     }
 
     @Override
     public Mono<Long> georadius(K key, double longitude, double latitude, double distance, Unit unit,
             GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
-        return createMono(
-                () -> commandBuilder.georadius(key, longitude, latitude, distance, unit.name(), geoRadiusStoreArgs));
+        return createMono(() -> commandBuilder.georadius(key, longitude, latitude, distance, unit.name(), geoRadiusStoreArgs));
     }
 
     @Override
@@ -1877,10 +1867,8 @@ public Flux<GeoWithin<V>> georadiusbymember(K key, V member, double distance, Un
     }
 
     @Override
-    public Mono<Long> georadiusbymember(K key, V member, double distance, Unit unit,
-            GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
-        return createMono(
-                () -> commandBuilder.georadiusbymember(key, member, distance, unit.name(), geoRadiusStoreArgs));
+    public Mono<Long> georadiusbymember(K key, V member, double distance, Unit unit, GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
+        return createMono(() -> commandBuilder.georadiusbymember(key, member, distance, unit.name(), geoRadiusStoreArgs));
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java
index 71284ba949..762c29d9ed 100644
--- a/src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,20 +22,20 @@
 
 /**
  * An asynchronous and thread-safe API for a Redis connection.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  */
-public class RedisAsyncCommandsImpl<K, V> extends AbstractRedisAsyncCommands<K, V>
-        implements RedisAsyncCommands<K, V>, RedisClusterAsyncCommands<K, V> {
+public class RedisAsyncCommandsImpl<K, V> extends AbstractRedisAsyncCommands<K, V> implements RedisAsyncCommands<K, V>,
+        RedisClusterAsyncCommands<K, V> {
 
     /**
      * Initialize a new instance.
-     * 
+     *
      * @param connection the connection to operate on
      * @param codec the codec for command encoding
-     * 
+     *
      */
     public RedisAsyncCommandsImpl(StatefulRedisConnection<K, V> connection, RedisCodec<K, V> codec) {
         super(connection, codec);
@@ -44,6 +44,6 @@ public RedisAsyncCommandsImpl(StatefulRedisConnection<K, V> connection, RedisCod
     @Override
     @SuppressWarnings("unchecked")
     public StatefulRedisConnection<K, V> getStatefulConnection() {
-        return (StatefulRedisConnection<K, V>) connection;
+        return (StatefulRedisConnection<K, V>) super.getConnection();
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java
index 4e7d7888a5..5ff894fdd7 100644
--- a/src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 
 /**
  * A reactive and thread-safe API for a Redis Sentinel connection.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -44,6 +44,6 @@ public RedisReactiveCommandsImpl(StatefulRedisConnection<K, V> connection, Redis
     @Override
     @SuppressWarnings("unchecked")
     public StatefulRedisConnection<K, V> getStatefulConnection() {
-        return (StatefulRedisConnection<K, V>) connection;
+        return (StatefulRedisConnection<K, V>) super.getConnection();
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index c059510d34..a3faac49c6 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,14 +45,13 @@
 import com.lambdaworks.redis.output.IntegerOutput;
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
 import com.lambdaworks.redis.protocol.AsyncCommand;
 import com.lambdaworks.redis.protocol.Command;
 import com.lambdaworks.redis.protocol.CommandType;
 
 /**
  * An advanced asynchronous and thread-safe API for a Redis Cluster connection.
- * 
+ *
  * @author Mark Paluch
  * @since 3.3
  */
@@ -61,6 +60,7 @@ public class RedisAdvancedClusterAsyncCommandsImpl<K, V> extends AbstractRedisAs
          RedisAdvancedClusterAsyncCommands<K, V> {
 
     private final Random random = new Random();
+    private final RedisCodec<K, V> codec;
 
     /**
      * Initialize a new connection.
@@ -70,6 +70,7 @@ public class RedisAdvancedClusterAsyncCommandsImpl<K, V> extends AbstractRedisAs
      */
     public RedisAdvancedClusterAsyncCommandsImpl(StatefulRedisClusterConnectionImpl<K, V> connection, RedisCodec<K, V> codec) {
         super(connection, codec);
+        this.codec = codec;
     }
 
     @Override
@@ -451,7 +452,7 @@ public RedisClusterAsyncCommands<K, V> getConnection(String host, int port) {
 
     @Override
     public StatefulRedisClusterConnection<K, V> getStatefulConnection() {
-        return (StatefulRedisClusterConnection<K, V>) connection;
+        return (StatefulRedisClusterConnection<K, V>) super.getConnection();
     }
 
     @Override
@@ -475,7 +476,7 @@ protected AsyncNodeSelection<K, V> nodes(Predicate<RedisClusterNode> predicate,
 
         NodeSelectionSupport<RedisAsyncCommands<K, V>, ?> selection;
 
-        StatefulRedisClusterConnectionImpl impl = (StatefulRedisClusterConnectionImpl) connection;
+        StatefulRedisClusterConnectionImpl impl = (StatefulRedisClusterConnectionImpl) getConnection();
         if (dynamic) {
             selection = new DynamicNodeSelection<RedisAsyncCommands<K, V>, Object, K, V>(
                     impl.getClusterDistributionChannelWriter(), predicate, intent, StatefulRedisConnection::async);
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index 8d390ab2d0..2583b5afd0 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,9 @@
 
 import org.reactivestreams.Publisher;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.reactive.RedisKeyReactiveCommands;
@@ -39,9 +42,6 @@
 import com.lambdaworks.redis.output.KeyStreamingChannel;
 import com.lambdaworks.redis.output.KeyValueStreamingChannel;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 /**
  * An advanced reactive and thread-safe API to a Redis Cluster connection.
  *
@@ -52,6 +52,7 @@ public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedi
         implements RedisAdvancedClusterReactiveCommands<K, V> {
 
     private final Random random = new Random();
+    private final RedisCodec<K, V> codec;
 
     /**
      * Initialize a new connection.
@@ -62,6 +63,7 @@ public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedi
     public RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnectionImpl<K, V> connection,
             RedisCodec<K, V> codec) {
         super(connection, codec);
+        this.codec = codec;
     }
 
     @Override
@@ -350,7 +352,7 @@ public Mono<Long> touch(Iterable<K> keys) {
 
     /**
      * Run a command on all available masters,
-     * 
+     *
      * @param function function producing the command
      * @param <T> result type
      * @return map of a key (counter) and commands.
@@ -361,7 +363,7 @@ protected <T> Map<String, Flux<T>> executeOnMasters(Function<RedisClusterReactiv
 
     /**
      * Run a command on all available nodes that match {@code filter}.
-     * 
+     *
      * @param function function producing the command
      * @param filter filter function for the node selection
      * @param <T> result type
@@ -397,7 +399,7 @@ private RedisClusterReactiveCommands<K, V> findConnectionBySlot(int slot) {
 
     @Override
     public StatefulRedisClusterConnection<K, V> getStatefulConnection() {
-        return (StatefulRedisClusterConnection<K, V>) connection;
+        return (StatefulRedisClusterConnection<K, V>) super.getConnection();
     }
 
     @Override
@@ -465,7 +467,7 @@ private <T extends ScanCursor> Mono<T> clusterScan(ScanCursor cursor,
 
     /**
      * Perform a SCAN in the cluster.
-     * 
+     *
      */
     static <T extends ScanCursor, K, V> Mono<T> clusterScan(StatefulRedisClusterConnection<K, V> connection, ScanCursor cursor,
             BiFunction<RedisKeyReactiveCommands<K, V>, ScanCursor, Mono<T>> scanFunction,
diff --git a/src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java b/src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java
index bc574c6d52..1cfd0eb65b 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
  */
 public class BaseRedisCommandBuilder<K, V> {
 
-    protected RedisCodec<K, V> codec;
+    protected final RedisCodec<K, V> codec;
 
     public BaseRedisCommandBuilder(RedisCodec<K, V> codec) {
         this.codec = codec;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
index 9aac82b3b8..87f8355c1a 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,11 @@
 
 /**
  * An asynchronous and thread-safe API for a Redis pub/sub connection.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public class RedisPubSubAsyncCommandsImpl<K, V> extends RedisAsyncCommandsImpl<K, V> implements RedisPubSubAsyncCommands<K, V> {
 
@@ -36,13 +37,12 @@ public class RedisPubSubAsyncCommandsImpl<K, V> extends RedisAsyncCommandsImpl<K
 
     /**
      * Initialize a new connection.
-     * 
+     *
      * @param connection the connection .
      * @param codec Codec used to encode/decode keys and values.
      */
     public RedisPubSubAsyncCommandsImpl(StatefulRedisPubSubConnection<K, V> connection, RedisCodec<K, V> codec) {
         super(connection, codec);
-        this.connection = connection;
         this.commandBuilder = new PubSubCommandBuilder<>(codec);
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
index 6a9a2cb362..809a67fd7f 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,27 +17,27 @@
 
 import java.util.Map;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.FluxSink;
+import reactor.core.publisher.Mono;
+
 import com.lambdaworks.redis.RedisReactiveCommandsImpl;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.pubsub.api.reactive.ChannelMessage;
 import com.lambdaworks.redis.pubsub.api.reactive.PatternMessage;
 import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.FluxSink;
-import reactor.core.publisher.Mono;
-
 /**
  * A reactive and thread-safe API for a Redis pub/sub connection.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  */
-public class RedisPubSubReactiveCommandsImpl<K, V> extends RedisReactiveCommandsImpl<K, V>
-        implements RedisPubSubReactiveCommands<K, V> {
+public class RedisPubSubReactiveCommandsImpl<K, V> extends RedisReactiveCommandsImpl<K, V> implements
+        RedisPubSubReactiveCommands<K, V> {
 
-    private PubSubCommandBuilder<K, V> commandBuilder;
+    private final PubSubCommandBuilder<K, V> commandBuilder;
 
     /**
      * Initialize a new connection.
@@ -47,7 +47,6 @@ public class RedisPubSubReactiveCommandsImpl<K, V> extends RedisReactiveCommands
      */
     public RedisPubSubReactiveCommandsImpl(StatefulRedisPubSubConnection<K, V> connection, RedisCodec<K, V> codec) {
         super(connection, codec);
-        this.connection = connection;
         this.commandBuilder = new PubSubCommandBuilder<>(codec);
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
index f6c84fd2ed..a963fa70cf 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,17 +19,17 @@
 import java.net.SocketAddress;
 import java.util.Map;
 
-import com.lambdaworks.redis.KillArgs;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
 import com.lambdaworks.redis.AbstractRedisReactiveCommands;
+import com.lambdaworks.redis.KillArgs;
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
 import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 /**
  * A reactive and thread-safe API for a Redis Sentinel connection.
  *
@@ -38,15 +38,13 @@
  * @author Mark Paluch
  * @since 3.0
  */
-public class RedisSentinelReactiveCommandsImpl<K, V> extends AbstractRedisReactiveCommands<K, V>
-        implements RedisSentinelReactiveCommands<K, V> {
+public class RedisSentinelReactiveCommandsImpl<K, V> extends AbstractRedisReactiveCommands<K, V> implements
+        RedisSentinelReactiveCommands<K, V> {
 
     private final SentinelCommandBuilder<K, V> commandBuilder;
-    private final StatefulConnection<K, V> connection;
 
     public RedisSentinelReactiveCommandsImpl(StatefulConnection<K, V> connection, RedisCodec<K, V> codec) {
         super(connection, codec);
-        this.connection = connection;
         commandBuilder = new SentinelCommandBuilder<K, V>(codec);
     }
 
@@ -155,16 +153,16 @@ public Mono<String> info(String section) {
 
     @Override
     public void close() {
-        connection.close();
+        getStatefulConnection().close();
     }
 
     @Override
     public boolean isOpen() {
-        return connection.isOpen();
+        return getStatefulConnection().isOpen();
     }
 
     @Override
     public StatefulRedisSentinelConnection<K, V> getStatefulConnection() {
-        return (StatefulRedisSentinelConnection<K, V>) connection;
+        return (StatefulRedisSentinelConnection<K, V>) super.getConnection();
     }
 }

From dd3a0ac506e178736e75695e071e7c9e36e2aab9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 30 Jan 2017 17:25:48 +0100
Subject: [PATCH 129/808] Polishing

Apply a timeout to SslTest.pubSubSslAndBreakConnection to prevent infinite wait.
---
 src/test/java/com/lambdaworks/SslTest.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/lambdaworks/SslTest.java b/src/test/java/com/lambdaworks/SslTest.java
index 3a4e00f3fc..a92a36d2f0 100644
--- a/src/test/java/com/lambdaworks/SslTest.java
+++ b/src/test/java/com/lambdaworks/SslTest.java
@@ -22,13 +22,10 @@
 import static org.junit.Assume.assumeTrue;
 
 import java.io.File;
-import java.io.IOException;
 import java.security.cert.CertificateException;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
-import io.netty.handler.ssl.OpenSsl;
-import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -39,6 +36,7 @@
 import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
 
 import io.netty.handler.codec.DecoderException;
+import io.netty.handler.ssl.OpenSsl;
 
 /**
  * @author Mark Paluch
@@ -200,7 +198,7 @@ public void pubSubSsl() throws Exception {
         connection2.getStatefulConnection().close();
     }
 
-    @Test
+    @Test(timeout = 10000)
     public void pubSubSslAndBreakConnection() throws Exception {
 
         RedisURI redisURI = RedisURI.Builder.redis(host(), sslPort()).withSsl(true).withVerifyPeer(false)

From 707d9611245cd2cda1f989640226330cdf5a50b0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 30 Jan 2017 17:35:28 +0100
Subject: [PATCH 130/808] Fix CommandBenchmark

Add mock for ByteBufAllocator.
---
 .../redis/protocol/EmptyByteBuf.java          | 119 ++++++++++++++++--
 1 file changed, 112 insertions(+), 7 deletions(-)

diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyByteBuf.java b/src/test/jmh/com/lambdaworks/redis/protocol/EmptyByteBuf.java
index 7ede2e4cc5..874abed595 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyByteBuf.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/EmptyByteBuf.java
@@ -15,12 +15,6 @@
  */
 package com.lambdaworks.redis.protocol;
 
-import io.netty.buffer.AbstractByteBuf;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.ByteBufProcessor;
-import io.netty.util.ByteProcessor;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -31,11 +25,18 @@
 import java.nio.channels.ScatteringByteChannel;
 import java.nio.charset.Charset;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.CompositeByteBuf;
+import io.netty.util.ByteProcessor;
+
 /**
  * @author Mark Paluch
  */
 class EmptyByteBuf extends ByteBuf {
 
+    private final static EmptyByteBuf INSTANCE = new EmptyByteBuf();
+
     @Override
     public int capacity() {
         return 0;
@@ -53,7 +54,7 @@ public int maxCapacity() {
 
     @Override
     public ByteBufAllocator alloc() {
-        return null;
+        return EmptyByteBufAllocator.INSTANCE;
     }
 
     @Override
@@ -950,4 +951,108 @@ public boolean release() {
     public boolean release(int i) {
         return false;
     }
+
+    private enum EmptyByteBufAllocator implements ByteBufAllocator {
+        INSTANCE;
+
+        @Override
+        public ByteBuf buffer() {
+            return EmptyByteBuf.INSTANCE;
+        }
+
+        @Override
+        public ByteBuf buffer(int i) {
+            return EmptyByteBuf.INSTANCE;
+        }
+
+        @Override
+        public ByteBuf buffer(int i, int i1) {
+            return EmptyByteBuf.INSTANCE;
+        }
+
+        @Override
+        public ByteBuf ioBuffer() {
+            return EmptyByteBuf.INSTANCE;
+        }
+
+        @Override
+        public ByteBuf ioBuffer(int i) {
+            return EmptyByteBuf.INSTANCE;
+        }
+
+        @Override
+        public ByteBuf ioBuffer(int i, int i1) {
+            return EmptyByteBuf.INSTANCE;
+        }
+
+        @Override
+        public ByteBuf heapBuffer() {
+            return EmptyByteBuf.INSTANCE;
+        }
+
+        @Override
+        public ByteBuf heapBuffer(int i) {
+            return EmptyByteBuf.INSTANCE;
+        }
+
+        @Override
+        public ByteBuf heapBuffer(int i, int i1) {
+            return EmptyByteBuf.INSTANCE;
+        }
+
+        @Override
+        public ByteBuf directBuffer() {
+            return EmptyByteBuf.INSTANCE;
+        }
+
+        @Override
+        public ByteBuf directBuffer(int i) {
+            return EmptyByteBuf.INSTANCE;
+        }
+
+        @Override
+        public ByteBuf directBuffer(int i, int i1) {
+            return EmptyByteBuf.INSTANCE;
+        }
+
+        @Override
+        public CompositeByteBuf compositeBuffer() {
+            return null;
+        }
+
+        @Override
+        public CompositeByteBuf compositeBuffer(int i) {
+            return null;
+        }
+
+        @Override
+        public CompositeByteBuf compositeHeapBuffer() {
+            return null;
+        }
+
+        @Override
+        public CompositeByteBuf compositeHeapBuffer(int i) {
+            return null;
+        }
+
+        @Override
+        public CompositeByteBuf compositeDirectBuffer() {
+            return null;
+        }
+
+        @Override
+        public CompositeByteBuf compositeDirectBuffer(int i) {
+            return null;
+        }
+
+        @Override
+        public boolean isDirectBufferPooled() {
+            return false;
+        }
+
+        @Override
+        public int calculateNewCapacity(int i, int i1) {
+            return 0;
+        }
+    }
 }

From e5b6f7784f7d198ab5cad646aeaaa2243cf1599a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 31 Jan 2017 14:45:29 +0100
Subject: [PATCH 131/808] Close connections in
 PooledClusterConnectionProvider.close() #460

Connection are now closed through PooledClusterConnectionProvider.close(). Previously, the connection map was cleared and iterated afterwards (which was empty then) so connection stayed open until RedisClusterClient was closed.
---
 .../PooledClusterConnectionProvider.java      | 10 +--
 .../MasterSlaveConnectionProvider.java        |  8 +-
 .../PooledClusterConnectionProviderTest.java  | 40 ++++++---
 .../MasterSlaveConnectionProviderTest.java    | 81 +++++++++++++++++++
 4 files changed, 118 insertions(+), 21 deletions(-)
 create mode 100644 src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProviderTest.java

diff --git a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java b/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
index a1e2c53023..2419a64039 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -246,13 +246,12 @@ protected RedisClusterNode getPartition(String host, int port) {
     @Override
     public void close() {
 
-        this.connections.clear();
         resetFastConnectionCache();
 
         new HashMap<>(this.connections) //
-                .values() //
-                .stream() //
-                .filter(StatefulConnection::isOpen).forEach(StatefulConnection::close);
+                .values().forEach(StatefulConnection::close);
+
+        this.connections.clear();
     }
 
     @Override
@@ -340,6 +339,7 @@ protected void closeStaleConnections(Set<ConnectionKey> stale) {
      * @return Set of {@link ConnectionKey}s
      */
     private Set<ConnectionKey> getStaleConnectionKeys() {
+
         Map<ConnectionKey, StatefulRedisConnection<K, V>> map = new HashMap<>(connections);
         Set<ConnectionKey> stale = new HashSet<>();
 
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
index bcfe3c5876..fc5a9494dc 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -180,8 +180,10 @@ public void reset() {
      * Close all connections.
      */
     public void close() {
-        allConnections().forEach(StatefulRedisConnection::close);
-        connections.clear();
+
+        Collection<StatefulRedisConnection<K, V>> connections = allConnections();
+        this.connections.clear();
+        connections.forEach(StatefulRedisConnection::close);
     }
 
     public void flushCommands() {
diff --git a/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java b/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
index a042fa033a..72f8e160d8 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,10 +54,10 @@ public class PooledClusterConnectionProviderTest {
     private PooledClusterConnectionProvider<String, String> sut;
 
     @Mock
-    private RedisClusterClient clientMock;
+    RedisClusterClient clientMock;
 
     @Mock
-    private RedisChannelWriter writerMock;
+    RedisChannelWriter writerMock;
 
     @Mock
     StatefulRedisConnection<String, String> nodeConnectionMock;
@@ -65,20 +65,20 @@ public class PooledClusterConnectionProviderTest {
     @Mock
     RedisCommands<String, String> commandsMock;
 
-    private Partitions partitions = new Partitions();
+    Partitions partitions = new Partitions();
 
     @Before
-    public void before() throws Exception {
+    public void before() {
 
         sut = new PooledClusterConnectionProvider<>(clientMock, writerMock, CODEC);
 
         List<Integer> slots1 = IntStream.range(0, 8192).boxed().collect(Collectors.toList());
         List<Integer> slots2 = IntStream.range(8192, SlotHash.SLOT_COUNT).boxed().collect(Collectors.toList());
 
-        partitions.add(new RedisClusterNode(RedisURI.create("localhost", 1), "1", true, null, 0, 0, 0, slots1,
-                Collections.singleton(RedisClusterNode.NodeFlag.MASTER)));
-        partitions.add(new RedisClusterNode(RedisURI.create("localhost", 2), "2", true, "1", 0, 0, 0, slots2,
-                Collections.singleton(RedisClusterNode.NodeFlag.SLAVE)));
+        partitions.add(new RedisClusterNode(RedisURI.create("localhost", 1), "1", true, null, 0, 0, 0, slots1, Collections
+                .singleton(RedisClusterNode.NodeFlag.MASTER)));
+        partitions.add(new RedisClusterNode(RedisURI.create("localhost", 2), "2", true, "1", 0, 0, 0, slots2, Collections
+                .singleton(RedisClusterNode.NodeFlag.SLAVE)));
 
         sut.setPartitions(partitions);
 
@@ -86,7 +86,7 @@ public void before() throws Exception {
     }
 
     @Test
-    public void shouldObtainConnection() throws Exception {
+    public void shouldObtainConnection() {
 
         when(clientMock.connectToNode(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(nodeConnectionMock);
 
@@ -98,7 +98,7 @@ public void shouldObtainConnection() throws Exception {
     }
 
     @Test
-    public void shouldObtainConnectionReadFromSlave() throws Exception {
+    public void shouldObtainConnectionReadFromSlave() {
 
         when(clientMock.connectToNode(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(nodeConnectionMock);
 
@@ -113,7 +113,7 @@ public void shouldObtainConnectionReadFromSlave() throws Exception {
     }
 
     @Test
-    public void shouldCloseConnectionOnConnectFailure() throws Exception {
+    public void shouldCloseConnectionOnConnectFailure() {
 
         when(clientMock.connectToNode(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(nodeConnectionMock);
         doThrow(new RuntimeException()).when(commandsMock).readOnly();
@@ -132,7 +132,7 @@ public void shouldCloseConnectionOnConnectFailure() throws Exception {
     }
 
     @Test
-    public void shouldRetryConnectionAttemptAfterConnectionAttemptWasBroken() throws Exception {
+    public void shouldRetryConnectionAttemptAfterConnectionAttemptWasBroken() {
 
         when(clientMock.connectToNode(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(nodeConnectionMock);
         doThrow(new RuntimeException()).when(commandsMock).readOnly();
@@ -153,4 +153,18 @@ public void shouldRetryConnectionAttemptAfterConnectionAttemptWasBroken() throws
 
         verify(clientMock, times(2)).connectToNode(eq(CODEC), eq("localhost:2"), any(), any());
     }
+
+    @Test
+    public void shouldCloseConnections() {
+
+        when(clientMock.connectToNode(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(nodeConnectionMock);
+
+        StatefulRedisConnection<String, String> connection = sut.getConnection(Intent.READ, 1);
+        assertThat(connection).isNotNull();
+
+        sut.close();
+
+        verify(nodeConnectionMock).close();
+    }
+
 }
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProviderTest.java b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProviderTest.java
new file mode 100644
index 0000000000..3681a9540d
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProviderTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.masterslave;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import com.lambdaworks.redis.RedisClient;
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.codec.Utf8StringCodec;
+import com.lambdaworks.redis.models.role.RedisInstance;
+
+/**
+ * @author Mark Paluch
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class MasterSlaveConnectionProviderTest {
+
+    public static final Utf8StringCodec CODEC = new Utf8StringCodec();
+
+    private MasterSlaveConnectionProvider<String, String> sut;
+
+    @Mock
+    RedisClient clientMock;
+
+    @Mock
+    StatefulRedisConnection<String, String> nodeConnectionMock;
+
+    @Mock
+    RedisCommands<String, String> commandsMock;
+
+    @Before
+    public void before() {
+
+        sut = new MasterSlaveConnectionProvider<>(clientMock, CODEC, RedisURI.create("localhost", 1), Collections.emptyMap());
+        sut.setKnownNodes(Arrays.asList(new RedisMasterSlaveNode("localhost", 1, RedisURI.create("localhost", 1),
+                RedisInstance.Role.MASTER)));
+        when(nodeConnectionMock.sync()).thenReturn(commandsMock);
+    }
+
+    @Test
+    public void shouldCloseConnections() {
+
+        when(clientMock.connect(eq(CODEC), any())).thenReturn(nodeConnectionMock);
+
+        StatefulRedisConnection<String, String> connection = sut.getConnection(MasterSlaveConnectionProvider.Intent.READ);
+        assertThat(connection).isNotNull();
+
+        sut.close();
+
+        verify(nodeConnectionMock).close();
+    }
+
+}
\ No newline at end of file

From d201ba02782146dfca76bf7c988c9db38423a9a5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 31 Jan 2017 16:26:29 +0100
Subject: [PATCH 132/808] Upgrade to TravisCI trusty #461
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Upgrade to jemalloc 4.4 requires librt which is not available on Ubuntu 12.04 🐼
---
 .travis.yml | 1 +
 Makefile    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 383ebf3c57..21d7cdeda9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: trusty
 language: java
 jdk:
   - oraclejdk8
diff --git a/Makefile b/Makefile
index e176ee9f10..2b4ecb6b57 100644
--- a/Makefile
+++ b/Makefile
@@ -366,7 +366,7 @@ endif
 
 work/redis-git/src/redis-cli work/redis-git/src/redis-server:
 	[ ! -e work/redis-git ] && git clone https://github.com/antirez/redis.git --branch unstable --single-branch work/redis-git && cd work/redis-git|| true
-	[ -e work/redis-git ] && cd work/redis-git && git fetch && git merge origin/master || true
+	[ -e work/redis-git ] && cd work/redis-git && git fetch && git merge origin/unstable || true
 	$(MAKE) -C work/redis-git clean
 	$(MAKE) -C work/redis-git -j4
 

From 0faba93b777b4b77218c8b382fb7cf20b40f51f7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 29 Jan 2017 22:04:00 +0100
Subject: [PATCH 133/808] Send collection of commands as batch through
 StatefulConnection and ChannelWriter #456

StatefulConnection and ChannelWriter accept each a collection of commands that is written as a single batch on the channel. Writing multiple commands does not require intermediate flushing and improves overall efficiency.

Commands sent to multi-node backed connections such as Redis Cluster and Master/Slave use write connections for batches of mixed (read and write) commands. Intent escalation retains command order and guarantees the order in which commands are executed. A whole command batch is sent to one node and not split amongst multiple nodes.
---
 .../redis/RedisChannelHandler.java            |  41 ++--
 .../lambdaworks/redis/RedisChannelWriter.java |  24 ++-
 .../redis/StatefulRedisConnectionImpl.java    |  63 ++++---
 .../redis/api/StatefulConnection.java         |  25 ++-
 .../ClusterDistributionChannelWriter.java     | 175 +++++++++++++++++-
 .../StatefulRedisClusterConnectionImpl.java   |  35 +++-
 .../masterslave/MasterSlaveChannelWriter.java |  66 ++++++-
 .../redis/protocol/DefaultEndpoint.java       |  98 +++++++---
 .../RedisSentinelAsyncCommandsImpl.java       |   6 +-
 .../StatefulRedisSentinelConnectionImpl.java  |  13 +-
 .../extensibility/MyPubSubConnection.java     |  17 +-
 .../lambdaworks/redis/ClientOptionsTest.java  |  14 +-
 .../ReactiveBackpressurePropagationTest.java  |   2 +-
 .../ClusterDistributionChannelWriterTest.java |  56 +++++-
 .../cluster/ClusterNodeEndpointTest.java      |  10 +-
 .../commands/CustomClusterCommandTest.java    |  62 ++++++-
 .../topology/ClusterTopologyRefreshTest.java  |  31 ++--
 .../redis/commands/CustomCommandTest.java     |  57 ++++--
 .../redis/masterslave/CustomCommandTest.java  | 170 +++++++++++++++++
 .../MasterSlaveChannelWriterTest.java         |  80 ++++++++
 .../redis/EmptyRedisChannelWriter.java        |   8 +-
 .../redis/EmptyStatefulRedisConnection.java   |  13 +-
 ...terDistributionChannelWriterBenchmark.java |  31 +++-
 23 files changed, 917 insertions(+), 180 deletions(-)
 create mode 100644 src/test/java/com/lambdaworks/redis/masterslave/CustomCommandTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriterTest.java

diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java b/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java
index 36aeb33951..5ee51fd4a5 100644
--- a/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java
+++ b/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 
 /**
  * Abstract base for every redis connection. Provides basic connection functionality and tracks open resources.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -59,7 +59,7 @@ public abstract class RedisChannelHandler<K, V> implements Closeable, Connection
      * @param unit unit of the timeout
      */
     public RedisChannelHandler(RedisChannelWriter writer, long timeout, TimeUnit unit) {
-        
+
         this.channelWriter = writer;
 
         writer.setConnectionFacade(this);
@@ -68,7 +68,7 @@ public RedisChannelHandler(RedisChannelWriter writer, long timeout, TimeUnit uni
 
     /**
      * Set the command timeout for this connection.
-     * 
+     *
      * @param timeout Command timeout.
      * @param unit Unit of time for the timeout.
      */
@@ -83,8 +83,8 @@ public void setTimeout(long timeout, TimeUnit unit) {
      */
     @Override
     public synchronized void close() {
-        
-        if(debugEnabled) {
+
+        if (debugEnabled) {
             logger.debug("close()");
         }
 
@@ -102,18 +102,27 @@ public synchronized void close() {
         }
     }
 
-    protected <T, C extends RedisCommand<K, V, T>> C dispatch(C cmd) {
-        
-        if(debugEnabled) {
+    protected <T> RedisCommand<K, V, T> dispatch(RedisCommand<K, V, T> cmd) {
+
+        if (debugEnabled) {
             logger.debug("dispatching command {}", cmd);
         }
-        
-        return (C) channelWriter.write(cmd);
+
+        return channelWriter.write(cmd);
+    }
+
+    protected Collection<RedisCommand<K, V, ?>> dispatch(Collection<? extends RedisCommand<K, V, ?>> commands) {
+
+        if (debugEnabled) {
+            logger.debug("dispatching commands {}", commands);
+        }
+
+        return channelWriter.write(commands);
     }
 
     /**
      * Register Closeable resources. Internal access only.
-     * 
+     *
      * @param registry registry of closeables
      * @param closeables closeables to register
      */
@@ -129,7 +138,7 @@ public void registerCloseables(final Collection<Closeable> registry, final Close
                 try {
                     closeable.close();
                 } catch (IOException e) {
-                    if(debugEnabled) {
+                    if (debugEnabled) {
                         logger.debug(e.toString(), e);
                     }
                 }
@@ -144,7 +153,7 @@ protected void addListener(CloseEvents.CloseListener listener) {
     }
 
     /**
-     * 
+     *
      * @return true if the connection is closed (final state in the connection lifecyle).
      */
     public boolean isClosed() {
@@ -167,7 +176,7 @@ public void deactivated() {
     }
 
     /**
-     * 
+     *
      * @return the channel writer
      */
     public RedisChannelWriter getChannelWriter() {
@@ -175,7 +184,7 @@ public RedisChannelWriter getChannelWriter() {
     }
 
     /**
-     * 
+     *
      * @return true if the connection is active and not closed.
      */
     public boolean isOpen() {
diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelWriter.java b/src/main/java/com/lambdaworks/redis/RedisChannelWriter.java
index 231eed05a7..4c02879822 100644
--- a/src/main/java/com/lambdaworks/redis/RedisChannelWriter.java
+++ b/src/main/java/com/lambdaworks/redis/RedisChannelWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,14 @@
 package com.lambdaworks.redis;
 
 import java.io.Closeable;
+import java.util.Collection;
 
 import com.lambdaworks.redis.protocol.ConnectionFacade;
 import com.lambdaworks.redis.protocol.RedisCommand;
 
 /**
  * Writer for a channel. Writers push commands on to the communication channel and maintain a state for the commands.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -31,8 +32,8 @@ public interface RedisChannelWriter extends Closeable {
     /**
      * Write a command on the channel. The command may be changed/wrapped during write and the written instance is returned
      * after the call.
-     * 
-     * @param command the redis command
+     *
+     * @param command the Redis command.
      * @param <K> key type
      * @param <V> value type
      * @param <T> result type
@@ -40,6 +41,17 @@ public interface RedisChannelWriter extends Closeable {
      */
     <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command);
 
+    /**
+     * Write multiple commands on the channel. The commands may be changed/wrapped during write and the written instance is
+     * returned after the call.
+     *
+     * @param commands the Redis commands.
+     * @param <K> key type
+     * @param <V> value type
+     * @return the written redis command
+     */
+    <K, V> Collection<RedisCommand<K, V, ?>> write(Collection<? extends RedisCommand<K, V, ?>> commands);
+
     @Override
     void close();
 
@@ -51,7 +63,7 @@ public interface RedisChannelWriter extends Closeable {
 
     /**
      * Set the corresponding connection facade in order to notify it about channel active/inactive state.
-     * 
+     *
      * @param connection the connection facade (external connection object)
      */
     void setConnectionFacade(ConnectionFacade connection);
@@ -60,7 +72,7 @@ public interface RedisChannelWriter extends Closeable {
      * Disable or enable auto-flush behavior. Default is {@literal true}. If autoFlushCommands is disabled, multiple commands
      * can be issued without writing them actually to the transport. Commands are buffered until a {@link #flushCommands()} is
      * issued. After calling {@link #flushCommands()} commands are sent to the transport and executed by Redis.
-     * 
+     *
      * @param autoFlush state of autoFlush.
      */
     void setAutoFlushCommands(boolean autoFlush);
diff --git a/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java b/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
index e2e2f6b798..905cd9b41e 100644
--- a/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,11 @@
  */
 package com.lambdaworks.redis;
 
-import static com.lambdaworks.redis.protocol.CommandType.AUTH;
-import static com.lambdaworks.redis.protocol.CommandType.DISCARD;
-import static com.lambdaworks.redis.protocol.CommandType.EXEC;
-import static com.lambdaworks.redis.protocol.CommandType.MULTI;
-import static com.lambdaworks.redis.protocol.CommandType.READONLY;
-import static com.lambdaworks.redis.protocol.CommandType.READWRITE;
-import static com.lambdaworks.redis.protocol.CommandType.SELECT;
+import static com.lambdaworks.redis.protocol.CommandType.*;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
@@ -36,14 +33,13 @@
 import com.lambdaworks.redis.output.MultiOutput;
 import com.lambdaworks.redis.output.StatusOutput;
 import com.lambdaworks.redis.protocol.*;
-import io.netty.channel.ChannelHandler;
 
 /**
  * A thread-safe connection to a Redis server. Multiple threads may share one {@link StatefulRedisConnectionImpl}
  *
  * A {@link ConnectionWatchdog} monitors each connection and reconnects automatically until {@link #close} is called. All
  * pending commands will be (re)sent after successful reconnection.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -108,7 +104,7 @@ public RedisReactiveCommands<K, V> reactive() {
 
     /**
      * Create a new instance of {@link RedisReactiveCommandsImpl}. Can be overriden to extend.
-     * 
+     *
      * @return a new instance
      */
     protected RedisReactiveCommandsImpl<K, V> newRedisReactiveCommandsImpl() {
@@ -148,7 +144,37 @@ public void activated() {
     }
 
     @Override
-    public <T, C extends RedisCommand<K, V, T>> C dispatch(C cmd) {
+    public <T> RedisCommand<K, V, T> dispatch(RedisCommand<K, V, T> command) {
+
+        RedisCommand<K, V, T> toSend = preProcessCommand(command);
+
+        try {
+            return super.dispatch(toSend);
+        } finally {
+            if (command.getType().name().equals(MULTI.name())) {
+                multi = (multi == null ? new MultiOutput<>(codec) : multi);
+            }
+        }
+    }
+
+    @Override
+    public Collection<RedisCommand<K, V, ?>> dispatch(Collection<? extends RedisCommand<K, V, ?>> commands) {
+
+        List<RedisCommand<K, V, ?>> sentCommands = new ArrayList<>(commands.size());
+
+        commands.forEach(o -> {
+            RedisCommand<K, V, ?> command = preProcessCommand(o);
+
+            sentCommands.add(command);
+            if (command.getType().name().equals(MULTI.name())) {
+                multi = (multi == null ? new MultiOutput<>(codec) : multi);
+            }
+        });
+
+        return super.dispatch(sentCommands);
+    }
+
+    protected <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> cmd) {
 
         RedisCommand<K, V, T> local = cmd;
 
@@ -204,14 +230,7 @@ public <T, C extends RedisCommand<K, V, T>> C dispatch(C cmd) {
             local = new TransactionalCommand<>(local);
             multi.add(local);
         }
-
-        try {
-            return (C) super.dispatch(local);
-        } finally {
-            if (cmd.getType().name().equals(MULTI.name())) {
-                multi = (multi == null ? new MultiOutput<>(codec) : multi);
-            }
-        }
+        return local;
     }
 
     private <T> RedisCommand<K, V, T> attachOnComplete(RedisCommand<K, V, T> command, Consumer<T> consumer) {
@@ -226,8 +245,8 @@ private <T> RedisCommand<K, V, T> attachOnComplete(RedisCommand<K, V, T> command
     public void setClientName(String clientName) {
 
         CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.SETNAME).addValue(clientName);
-        AsyncCommand<String, String, String> async = new AsyncCommand<>(
-                new Command<>(CommandType.CLIENT, new StatusOutput<>(StringCodec.UTF8), args));
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.CLIENT, new StatusOutput<>(
+                StringCodec.UTF8), args));
         this.clientName = clientName;
 
         dispatch((RedisCommand) async);
diff --git a/src/main/java/com/lambdaworks/redis/api/StatefulConnection.java b/src/main/java/com/lambdaworks/redis/api/StatefulConnection.java
index 924a585e6a..771632ad54 100644
--- a/src/main/java/com/lambdaworks/redis/api/StatefulConnection.java
+++ b/src/main/java/com/lambdaworks/redis/api/StatefulConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package com.lambdaworks.redis.api;
 
+import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
 import com.lambdaworks.redis.ClientOptions;
@@ -22,7 +23,7 @@
 
 /**
  * A stateful connection providing command dispatching, timeouts and open/close methods.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -53,12 +54,22 @@ public interface StatefulConnection<K, V> extends AutoCloseable {
      * instance is returned after the call. This command does not wait until the command completes and does not guarantee
      * whether the command is executed successfully.
      *
-     * @param command the Redis command
+     * @param command the Redis command.
      * @param <T> result type
-     * @param <C> command type
-     * @return the written redis command
+     * @return the written Redis command.
+     */
+    <T> RedisCommand<K, V, T> dispatch(RedisCommand<K, V, T> command);
+
+    /**
+     * Dispatch multiple command in a single write on the channel. The commands may be changed/wrapped during write and the
+     * written instance is returned after the call. This command does not wait until the command completes and does not
+     * guarantee whether the command is executed successfully.
+     *
+     * @param commands the Redis commands.
+     * @return the written Redis commands.
+     * @since 5.0
      */
-    <T, C extends RedisCommand<K, V, T>> C dispatch(C command);
+    Collection<RedisCommand<K, V, ?>> dispatch(Collection<? extends RedisCommand<K, V, ?>> commands);
 
     /**
      * Close the connection. The connection will become not usable anymore as soon as this method was called.
@@ -86,7 +97,7 @@ public interface StatefulConnection<K, V> extends AutoCloseable {
      * Disable or enable auto-flush behavior. Default is {@literal true}. If autoFlushCommands is disabled, multiple commands
      * can be issued without writing them actually to the transport. Commands are buffered until a {@link #flushCommands()} is
      * issued. After calling {@link #flushCommands()} commands are sent to the transport and executed by Redis.
-     * 
+     *
      * @param autoFlush state of autoFlush.
      */
     void setAutoFlushCommands(boolean autoFlush);
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
index 04fa126ad7..79b8d92aba 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,13 @@
 
 import static com.lambdaworks.redis.cluster.SlotHash.getSlot;
 
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.stream.IntStream;
+
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent;
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 import com.lambdaworks.redis.internal.HostAndPort;
 import com.lambdaworks.redis.internal.LettuceAssert;
@@ -57,6 +62,7 @@ class ClusterDistributionChannelWriter implements RedisChannelWriter {
         this.eventExecutors = eventExecutors;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
 
@@ -96,7 +102,7 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
 
                     try {
                         RedisChannelHandler<K, V> connection = (RedisChannelHandler<K, V>) clusterConnectionProvider
-                                .getConnection(ClusterConnectionProvider.Intent.WRITE, target.getHostText(), target.getPort());
+                                .getConnection(Intent.WRITE, target.getHostText(), target.getPort());
 
                         if (asking) {
                             // set asking bit
@@ -116,9 +122,10 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
 
         RedisChannelWriter channelWriter = null;
 
-        if (args != null && args.getFirstEncodedKey() != null) {
+        ByteBuffer firstEncodedKey = args != null ? args.getFirstEncodedKey() : null;
+        if (firstEncodedKey != null) {
             int hash = getSlot(args.getFirstEncodedKey());
-            ClusterConnectionProvider.Intent intent = getIntent(command.getType());
+            Intent intent = getIntent(command.getType());
 
             RedisChannelHandler<K, V> connection = (RedisChannelHandler<K, V>) clusterConnectionProvider.getConnection(intent,
                     hash);
@@ -144,13 +151,110 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         return command;
     }
 
-    private ClusterConnectionProvider.Intent getIntent(ProtocolKeyword type) {
+    @SuppressWarnings("unchecked")
+    @Override
+    public <K, V> Collection<RedisCommand<K, V, ?>> write(Collection<? extends RedisCommand<K, V, ?>> commands) {
+
+        LettuceAssert.notNull(commands, "Commands must not be null");
+
+        if (closed) {
+            throw new RedisException("Connection is closed");
+        }
+
+        List<ClusterCommand<K, V, ?>> clusterCommands = new ArrayList<>(commands.size());
+        List<ClusterCommand<K, V, ?>> defaultCommands = new ArrayList<>(commands.size());
+        Map<SlotIntent, List<ClusterCommand<K, V, ?>>> partitions = new HashMap<>();
+
+        // TODO: Retain order or retain Intent preference?
+        // Currently: Retain order
+        Intent intent = getIntent(commands);
+
+        for (RedisCommand<K, V, ?> cmd : commands) {
+
+            if (cmd instanceof ClusterCommand) {
+                clusterCommands.add((ClusterCommand) cmd);
+                continue;
+            }
+
+            CommandArgs<K, V> args = cmd.getArgs();
+            ByteBuffer firstEncodedKey = args != null ? args.getFirstEncodedKey() : null;
+
+            if (firstEncodedKey == null) {
+                defaultCommands.add(new ClusterCommand<>(cmd, this, executionLimit));
+                continue;
+            }
+
+            int hash = getSlot(args.getFirstEncodedKey());
+
+            List<ClusterCommand<K, V, ?>> commandPartition = partitions.computeIfAbsent(SlotIntent.of(intent, hash),
+                    slotIntent -> new ArrayList<>());
+
+            commandPartition.add(new ClusterCommand<>(cmd, this, executionLimit));
+        }
+
+        for (Map.Entry<SlotIntent, List<ClusterCommand<K, V, ?>>> entry : partitions.entrySet()) {
+
+            SlotIntent slotIntent = entry.getKey();
+            RedisChannelHandler<K, V> connection = (RedisChannelHandler<K, V>) clusterConnectionProvider.getConnection(
+                    slotIntent.intent, slotIntent.slotHash);
+
+            RedisChannelWriter channelWriter = connection.getChannelWriter();
+            if (channelWriter instanceof ClusterDistributionChannelWriter) {
+                ClusterDistributionChannelWriter writer = (ClusterDistributionChannelWriter) channelWriter;
+                channelWriter = writer.defaultWriter;
+            }
+
+            if (channelWriter != null && channelWriter != this && channelWriter != defaultWriter) {
+                channelWriter.write(entry.getValue());
+            }
+        }
+
+        clusterCommands.forEach(this::write);
+        defaultCommands.forEach(defaultWriter::write);
+
+        return (Collection) commands;
+    }
+
+    /**
+     * Optimization: Determine command intents and optimize for bulk execution preferring one node.
+     * <p>
+     * If there is only one intent, then we take the intent derived from the commands. If there is more than one intent, then
+     * use {@link Intent#WRITE}.
+     *
+     * @param commands {@link Collection} of {@link RedisCommand commands}.
+     * @return the intent.
+     */
+    static Intent getIntent(Collection<? extends RedisCommand<?, ?, ?>> commands) {
+
+        boolean w = false;
+        boolean r = false;
+        Intent singleIntent = Intent.WRITE;
+
+        for (RedisCommand<?, ?, ?> command : commands) {
+
+            if (command instanceof ClusterCommand) {
+                continue;
+            }
+
+            singleIntent = getIntent(command.getType());
+            if (singleIntent == Intent.READ) {
+                r = true;
+            }
+
+            if (singleIntent == Intent.WRITE) {
+                w = true;
+            }
 
-        if (ReadOnlyCommands.isReadOnlyCommand(type)) {
-            return ClusterConnectionProvider.Intent.READ;
+            if (r && w) {
+                return Intent.WRITE;
+            }
         }
 
-        return ClusterConnectionProvider.Intent.WRITE;
+        return singleIntent;
+    }
+
+    private static Intent getIntent(ProtocolKeyword type) {
+        return ReadOnlyCommands.isReadOnlyCommand(type) ? Intent.READ : Intent.WRITE;
     }
 
     static HostAndPort getMoveTarget(String errorMessage) {
@@ -256,4 +360,59 @@ public void setReadFrom(ReadFrom readFrom) {
     public ReadFrom getReadFrom() {
         return clusterConnectionProvider.getReadFrom();
     }
+
+    static class SlotIntent {
+
+        final int slotHash;
+        final Intent intent;
+        private final static SlotIntent[] READ;
+        private final static SlotIntent[] WRITE;
+
+        static {
+            READ = new SlotIntent[SlotHash.SLOT_COUNT];
+            WRITE = new SlotIntent[SlotHash.SLOT_COUNT];
+
+            IntStream.range(0, SlotHash.SLOT_COUNT).forEach(i -> {
+
+                READ[i] = new SlotIntent(i, Intent.READ);
+                WRITE[i] = new SlotIntent(i, Intent.WRITE);
+            });
+
+        }
+
+        private SlotIntent(int slotHash, Intent intent) {
+            this.slotHash = slotHash;
+            this.intent = intent;
+        }
+
+        public static SlotIntent of(Intent intent, int slot) {
+
+            if (intent == Intent.READ) {
+                return READ[slot];
+            }
+
+            return WRITE[slot];
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o)
+                return true;
+            if (!(o instanceof SlotIntent))
+                return false;
+
+            SlotIntent that = (SlotIntent) o;
+
+            if (slotHash != that.slotHash)
+                return false;
+            return intent == that.intent;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = slotHash;
+            result = 31 * result + intent.hashCode();
+            return result;
+        }
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
index 18670a99ff..2e0d5567f9 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,9 @@
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
@@ -41,14 +44,12 @@
 import com.lambdaworks.redis.output.StatusOutput;
 import com.lambdaworks.redis.protocol.*;
 
-import io.netty.channel.ChannelHandler;
-
 /**
  * A thread-safe connection to a Redis Cluster. Multiple threads may share one {@link StatefulRedisClusterConnectionImpl}
  *
  * A {@link ConnectionWatchdog} monitors each connection and reconnects automatically until {@link #close} is called. All
  * pending commands will be (re)sent after successful reconnection.
- * 
+ *
  * @author Mark Paluch
  * @since 4.0
  */
@@ -168,14 +169,29 @@ void setClientName(String clientName) {
     }
 
     @Override
-    public <T, C extends RedisCommand<K, V, T>> C dispatch(C cmd) {
+    public <T> RedisCommand<K, V, T> dispatch(RedisCommand<K, V, T> command) {
+        return super.dispatch(preProcessCommand(command));
+    }
+
+    @Override
+    public Collection<RedisCommand<K, V, ?>> dispatch(Collection<? extends RedisCommand<K, V, ?>> commands) {
 
-        RedisCommand<K, V, T> local = cmd;
+        List<RedisCommand<K, V, ?>> commandsToSend = new ArrayList<>(commands.size());
+        for (RedisCommand<K, V, ?> command : commands) {
+            commandsToSend.add(preProcessCommand(command));
+        }
+
+        return super.dispatch(commandsToSend);
+    }
+
+    private <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> command) {
+
+        RedisCommand<K, V, T> local = command;
 
         if (local.getType().name().equals(AUTH.name())) {
             local = attachOnComplete(local, status -> {
-                if (status.equals("OK") && cmd.getArgs().getFirstString() != null) {
-                    this.password = cmd.getArgs().getFirstString().toCharArray();
+                if (status.equals("OK") && command.getArgs().getFirstString() != null) {
+                    this.password = command.getArgs().getFirstString().toCharArray();
                 }
             });
         }
@@ -195,8 +211,7 @@ public <T, C extends RedisCommand<K, V, T>> C dispatch(C cmd) {
                 }
             });
         }
-
-        return super.dispatch((C) local);
+        return local;
     }
 
     private <T> RedisCommand<K, V, T> attachOnComplete(RedisCommand<K, V, T> command, Consumer<T> consumer) {
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java
index 3cec6e99aa..6ffed9b59a 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,14 @@
  */
 package com.lambdaworks.redis.masterslave;
 
+import java.util.Collection;
+
 import com.lambdaworks.redis.ReadFrom;
 import com.lambdaworks.redis.RedisChannelWriter;
 import com.lambdaworks.redis.RedisException;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.masterslave.MasterSlaveConnectionProvider.Intent;
 import com.lambdaworks.redis.protocol.ConnectionFacade;
 import com.lambdaworks.redis.protocol.ProtocolKeyword;
 import com.lambdaworks.redis.protocol.RedisCommand;
@@ -47,19 +50,68 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
             throw new RedisException("Connection is closed");
         }
 
-        MasterSlaveConnectionProvider.Intent intent = getIntent(command.getType());
-        StatefulRedisConnection<K, V> connection = (StatefulRedisConnection) masterSlaveConnectionProvider.getConnection(intent);
+        Intent intent = getIntent(command.getType());
+        StatefulRedisConnection<K, V> connection = (StatefulRedisConnection) masterSlaveConnectionProvider
+                .getConnection(intent);
 
         return connection.dispatch(command);
     }
 
-    private MasterSlaveConnectionProvider.Intent getIntent(ProtocolKeyword type) {
+    @Override
+    public <K, V> Collection<RedisCommand<K, V, ?>> write(Collection<? extends RedisCommand<K, V, ?>> commands) {
+
+        LettuceAssert.notNull(commands, "Commands must not be null");
 
-        if (ReadOnlyCommands.isReadOnlyCommand(type)) {
-            return MasterSlaveConnectionProvider.Intent.READ;
+        if (closed) {
+            throw new RedisException("Connection is closed");
         }
 
-        return MasterSlaveConnectionProvider.Intent.WRITE;
+        // TODO: Retain order or retain Intent preference?
+        // Currently: Retain order
+        Intent intent = getIntent(commands);
+
+        StatefulRedisConnection<K, V> connection = (StatefulRedisConnection) masterSlaveConnectionProvider
+                .getConnection(intent);
+
+        return connection.dispatch(commands);
+    }
+
+    /**
+     * Optimization: Determine command intents and optimize for bulk execution preferring one node.
+     * <p>
+     * If there is only one intent, then we take the intent derived from the commands. If there is more than one intent, then
+     * use {@link Intent#WRITE}.
+     *
+     * @param commands {@link Collection} of {@link RedisCommand commands}.
+     * @return the intent.
+     */
+    static Intent getIntent(Collection<? extends RedisCommand<?, ?, ?>> commands) {
+
+        boolean w = false;
+        boolean r = false;
+        Intent singleIntent = Intent.WRITE;
+
+        for (RedisCommand<?, ?, ?> command : commands) {
+
+            singleIntent = getIntent(command.getType());
+            if (singleIntent == Intent.READ) {
+                r = true;
+            }
+
+            if (singleIntent == Intent.WRITE) {
+                w = true;
+            }
+
+            if (r && w) {
+                return Intent.WRITE;
+            }
+        }
+
+        return singleIntent;
+    }
+
+    private static Intent getIntent(ProtocolKeyword type) {
+        return ReadOnlyCommands.isReadOnlyCommand(type) ? Intent.READ : Intent.WRITE;
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java b/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
index 1e26d9e8f5..10ff7db922 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@
 
 /**
  * Default {@link Endpoint} implementation.
- * 
+ *
  * @author Mark Paluch
  */
 public class DefaultEndpoint implements RedisChannelWriter, Endpoint, HasQueuedCommands {
@@ -73,7 +73,7 @@ public class DefaultEndpoint implements RedisChannelWriter, Endpoint, HasQueuedC
 
     /**
      * Create a new {@link DefaultEndpoint}.
-     * 
+     *
      * @param clientOptions client options for this connection, must not be {@literal null}
      */
     public DefaultEndpoint(ClientOptions clientOptions) {
@@ -93,18 +93,7 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         try {
             sharedLock.incrementWriters();
 
-            if (isClosed()) {
-                throw new RedisException("Connection is closed");
-            }
-
-            if (queuedCommands.exceedsLimit(clientOptions.getRequestQueueSize())) {
-                throw new RedisException("Request queue size exceeded: " + clientOptions.getRequestQueueSize()
-                        + ". Commands are not accepted until the queue size drops.");
-            }
-
-            if ((channel == null || !isConnected()) && isRejectCommand()) {
-                throw new RedisException("Currently not connected. Commands are rejected.");
-            }
+            validateWrite();
 
             if (autoFlushCommands) {
 
@@ -127,6 +116,58 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         return command;
     }
 
+    @SuppressWarnings("unchecked")
+    @Override
+    public <K, V> Collection<RedisCommand<K, V, ?>> write(Collection<? extends RedisCommand<K, V, ?>> commands) {
+
+        LettuceAssert.notNull(commands, "Commands must not be null");
+
+        try {
+            sharedLock.incrementWriters();
+
+            validateWrite();
+
+            if (autoFlushCommands) {
+
+                if (isConnected()) {
+                    writeToChannel(commands);
+                } else {
+                    writeToBuffer(commands);
+                }
+
+            } else {
+                writeToBuffer(commands);
+            }
+        } finally {
+            sharedLock.decrementWriters();
+            if (debugEnabled) {
+                logger.debug("{} write() done", logPrefix());
+            }
+        }
+
+        return (Collection<RedisCommand<K, V, ?>>) commands;
+    }
+
+    private void validateWrite() {
+
+        if (isClosed()) {
+            throw new RedisException("Connection is closed");
+        }
+
+        if (queuedCommands.exceedsLimit(clientOptions.getRequestQueueSize())) {
+            throw new RedisException("Request queue size exceeded: " + clientOptions.getRequestQueueSize()
+                    + ". Commands are not accepted until the queue size drops.");
+        }
+
+        if ((channel == null || !isConnected()) && isRejectCommand()) {
+            throw new RedisException("Currently not connected. Commands are rejected.");
+        }
+    }
+
+    private void writeToBuffer(Iterable<? extends RedisCommand<?, ?, ?>> commands) {
+        commands.forEach(this::writeToBuffer);
+    }
+
     private <C extends RedisCommand<?, ?, T>, T> void writeToBuffer(C command) {
 
         if (commandBuffer.contains(command)) {
@@ -136,7 +177,7 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         bufferCommand(command);
     }
 
-    private <C extends RedisCommand<?, ?, T>, T> void writeToChannel(C command) {
+    private void writeToChannel(RedisCommand<?, ?, ?> command) {
 
         if (reliability == Reliability.AT_MOST_ONCE) {
             // cancel on exceptions and remove from queue, because there is no housekeeping
@@ -149,6 +190,19 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         }
     }
 
+    private void writeToChannel(Collection<? extends RedisCommand<?, ?, ?>> commands) {
+
+        if (reliability == Reliability.AT_MOST_ONCE) {
+            // cancel on exceptions and remove from queue, because there is no housekeeping
+            writeAndFlush(commands).addListener(new AtMostOnceWriteListener(commands, queuedCommands));
+        }
+
+        if (reliability == Reliability.AT_LEAST_ONCE) {
+            // commands are ok to stay within the queue, reconnect will retrigger them
+            writeAndFlush(commands).addListener(new RetryListener(commands));
+        }
+    }
+
     protected void bufferCommand(RedisCommand<?, ?, ?> command) {
 
         if (debugEnabled) {
@@ -447,7 +501,7 @@ public boolean isClosed() {
 
     /**
      * Execute a {@link Supplier} callback guarded by an exclusive lock.
-     * 
+     *
      * @param supplier
      * @param <T>
      * @return
@@ -456,7 +510,7 @@ protected <T> T doExclusive(Supplier<T> supplier) {
         return sharedLock.doExclusive(supplier);
     }
 
-    private ChannelFuture writeAndFlush(List<? extends RedisCommand<?, ?, ?>> commands) {
+    private ChannelFuture writeAndFlush(Iterable<? extends RedisCommand<?, ?, ?>> commands) {
 
         if (debugEnabled) {
             logger.debug("{} write() writeAndFlush commands {}", logPrefix(), commands);
@@ -520,7 +574,7 @@ protected String logPrefix() {
 
     private static class AtMostOnceWriteListener implements ChannelFutureListener {
 
-        private final Collection<RedisCommand<?, ?, ?>> sentCommands;
+        private final Collection<? extends RedisCommand<?, ?, ?>> sentCommands;
         private final RedisCommand<?, ?, ?> sentCommand;
         private final QueuedCommands queuedCommands;
 
@@ -530,7 +584,7 @@ private static class AtMostOnceWriteListener implements ChannelFutureListener {
             this.queuedCommands = queuedCommands;
         }
 
-        AtMostOnceWriteListener(Collection<RedisCommand<?, ?, ?>> sentCommands, QueuedCommands queuedCommands) {
+        AtMostOnceWriteListener(Collection<? extends RedisCommand<?, ?, ?>> sentCommands, QueuedCommands queuedCommands) {
             this.sentCommand = null;
             this.sentCommands = sentCommands;
             this.queuedCommands = queuedCommands;
@@ -564,10 +618,10 @@ public void operationComplete(ChannelFuture future) throws Exception {
      */
     private class RetryListener implements GenericFutureListener<Future<Void>> {
 
-        private final Collection<RedisCommand<?, ?, ?>> sentCommands;
+        private final Collection<? extends RedisCommand<?, ?, ?>> sentCommands;
         private final RedisCommand<?, ?, ?> sentCommand;
 
-        RetryListener(Collection<RedisCommand<?, ?, ?>> sentCommands) {
+        RetryListener(Collection<? extends RedisCommand<?, ?, ?>> sentCommands) {
             this.sentCommands = sentCommands;
             this.sentCommand = null;
         }
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
index 423c2cb550..02ee4ca0bf 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
 
 /**
  * An asynchronous and thread-safe API for a Redis Sentinel connection.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -178,7 +178,7 @@ public RedisFuture<String> info(String section) {
     }
 
     public <T> AsyncCommand<K, V, T> dispatch(RedisCommand<K, V, T> cmd) {
-        return connection.dispatch(new AsyncCommand<>(cmd));
+        return (AsyncCommand<K, V, T>) connection.dispatch(new AsyncCommand<>(cmd));
     }
 
     public void close() {
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java b/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
index b678ad6eb3..2d29e2bd87 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
+++ b/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package com.lambdaworks.redis.sentinel;
 
+import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
 import com.lambdaworks.redis.RedisChannelHandler;
@@ -27,7 +28,6 @@
 import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
 import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands;
 import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
-import io.netty.channel.ChannelHandler;
 
 /**
  * @author Mark Paluch
@@ -53,8 +53,13 @@ public StatefulRedisSentinelConnectionImpl(RedisChannelWriter writer, RedisCodec
     }
 
     @Override
-    public <T, C extends RedisCommand<K, V, T>> C dispatch(C cmd) {
-        return super.dispatch(cmd);
+    public <T> RedisCommand<K, V, T> dispatch(RedisCommand<K, V, T> command) {
+        return super.dispatch(command);
+    }
+
+    @Override
+    public Collection<RedisCommand<K, V, ?>> dispatch(Collection<? extends RedisCommand<K, V, ?>> commands) {
+        return super.dispatch(commands);
     }
 
     @Override
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
index 674d21dc0e..a66ff7df98 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,12 +23,11 @@
 import com.lambdaworks.redis.protocol.CommandType;
 import com.lambdaworks.redis.protocol.RedisCommand;
 import com.lambdaworks.redis.pubsub.PubSubEndpoint;
-import com.lambdaworks.redis.pubsub.PubSubOutput;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl;
 
 /**
  * Demo code for extending a RedisPubSubConnectionImpl.
- * 
+ *
  * @author Mark Paluch
  */
 @SuppressWarnings("unchecked")
@@ -45,20 +44,18 @@ public class MyPubSubConnection<K, V> extends StatefulRedisPubSubConnectionImpl<
      * @param timeout Maximum time to wait for a response.
      * @param unit Unit of time for the timeout.
      */
-    public MyPubSubConnection(PubSubEndpoint<K, V> endpoint,
-                              RedisChannelWriter writer, RedisCodec<K, V> codec, long timeout,
-                              TimeUnit unit) {
+    public MyPubSubConnection(PubSubEndpoint<K, V> endpoint, RedisChannelWriter writer, RedisCodec<K, V> codec, long timeout,
+            TimeUnit unit) {
         super(endpoint, writer, codec, timeout, unit);
     }
 
     @Override
-    public <T, C extends RedisCommand<K, V, T>> C dispatch(C cmd) {
+    public <T> RedisCommand<K, V, T> dispatch(RedisCommand<K, V, T> command) {
 
-        if (cmd.getType() == CommandType.SUBSCRIBE) {
+        if (command.getType() == CommandType.SUBSCRIBE) {
             subscriptions.incrementAndGet();
         }
 
-        return super.dispatch(cmd);
+        return super.dispatch(command);
     }
-
 }
diff --git a/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java b/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
index 1f3838f4f0..a323d35acb 100644
--- a/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -205,8 +205,8 @@ public void pingBeforeConnectWithSslAndAuthentication() throws Exception {
             protected void run(RedisClient client) throws Exception {
 
                 client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
-                RedisURI redisURI = RedisURI.Builder.redis(host, 6443).withPassword(passwd).withVerifyPeer(false)
-                        .withSsl(true).build();
+                RedisURI redisURI = RedisURI.Builder.redis(host, 6443).withPassword(passwd).withVerifyPeer(false).withSsl(true)
+                        .build();
 
                 RedisCommands<String, String> connection = client.connect(redisURI).sync();
 
@@ -274,8 +274,8 @@ public void pingBeforeConnectWithQueuedCommandsAndReconnect() throws Exception {
         redisConnection.async().set("key1", "value1");
         redisConnection.async().set("key2", "value2");
 
-        RedisFuture<String> sleep = controlConnection.dispatch(new AsyncCommand<>(
-                new Command<>(CommandType.DEBUG, new StatusOutput<>(codec), new CommandArgs<>(codec).add("SLEEP").add(2))));
+        RedisFuture<String> sleep = (RedisFuture<String>) controlConnection.dispatch(new AsyncCommand<>(new Command<>(
+                CommandType.DEBUG, new StatusOutput<>(codec), new CommandArgs<>(codec).add("SLEEP").add(2))));
 
         sleep.await(100, TimeUnit.MILLISECONDS);
 
@@ -321,8 +321,8 @@ protected void run(RedisClient client) throws Exception {
                 redisConnection.async().set("key1", "value1");
                 redisConnection.async().set("key2", "value2");
 
-                RedisFuture<String> sleep = controlConnection.dispatch(new AsyncCommand<>(new Command<>(CommandType.DEBUG,
-                        new StatusOutput<>(codec), new CommandArgs<>(codec).add("SLEEP").add(2))));
+                RedisFuture<String> sleep = (RedisFuture<String>) controlConnection.dispatch(new AsyncCommand<>(new Command<>(
+                        CommandType.DEBUG, new StatusOutput<>(codec), new CommandArgs<>(codec).add("SLEEP").add(2))));
 
                 sleep.await(100, TimeUnit.MILLISECONDS);
 
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveBackpressurePropagationTest.java b/src/test/java/com/lambdaworks/redis/ReactiveBackpressurePropagationTest.java
index 81f83e7738..8d9f3284b8 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveBackpressurePropagationTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveBackpressurePropagationTest.java
@@ -70,7 +70,7 @@ public void before() throws Exception {
         commandHandler = new CommandHandler(clientResources, endpoint);
 
         when(clientResources.commandLatencyCollector()).thenReturn(latencyCollector);
-        when(statefulConnection.dispatch(any())).thenAnswer(invocation -> {
+        when(statefulConnection.dispatch(any(RedisCommand.class))).thenAnswer(invocation -> {
 
             RedisCommand command = (RedisCommand) invocation.getArguments()[0];
             embeddedChannel.writeOutbound(command);
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterTest.java
index a2d77cdfa4..d3a2bef3a7 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,16 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.Arrays;
+import java.util.Collections;
+
 import org.junit.Test;
 
+import com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent;
 import com.lambdaworks.redis.internal.HostAndPort;
+import com.lambdaworks.redis.protocol.Command;
+import com.lambdaworks.redis.protocol.CommandType;
+import com.lambdaworks.redis.protocol.RedisCommand;
 
 /**
  * @author Mark Paluch
@@ -27,7 +34,7 @@
 public class ClusterDistributionChannelWriterTest {
 
     @Test
-    public void shouldParseAskTargetCorrectly() throws Exception {
+    public void shouldParseAskTargetCorrectly() {
 
         HostAndPort askTarget = ClusterDistributionChannelWriter.getAskTarget("ASK 1234 127.0.0.1:6381");
 
@@ -36,7 +43,7 @@ public void shouldParseAskTargetCorrectly() throws Exception {
     }
 
     @Test
-    public void shouldParseIPv6AskTargetCorrectly() throws Exception {
+    public void shouldParseIPv6AskTargetCorrectly() {
 
         HostAndPort askTarget = ClusterDistributionChannelWriter.getAskTarget("ASK 1234 1:2:3:4::6:6381");
 
@@ -45,7 +52,7 @@ public void shouldParseIPv6AskTargetCorrectly() throws Exception {
     }
 
     @Test
-    public void shouldParseMovedTargetCorrectly() throws Exception {
+    public void shouldParseMovedTargetCorrectly() {
 
         HostAndPort moveTarget = ClusterDistributionChannelWriter.getMoveTarget("MOVED 1234 127.0.0.1:6381");
 
@@ -54,11 +61,50 @@ public void shouldParseMovedTargetCorrectly() throws Exception {
     }
 
     @Test
-    public void shouldParseIPv6MovedTargetCorrectly() throws Exception {
+    public void shouldParseIPv6MovedTargetCorrectly() {
 
         HostAndPort moveTarget = ClusterDistributionChannelWriter.getMoveTarget("MOVED 1234 1:2:3:4::6:6381");
 
         assertThat(moveTarget.getHostText()).isEqualTo("1:2:3:4::6");
         assertThat(moveTarget.getPort()).isEqualTo(6381);
     }
+
+    @Test
+    public void shouldReturnIntentForWriteCommand() {
+
+        RedisCommand<String, String, String> set = new Command<>(CommandType.SET, null);
+        RedisCommand<String, String, String> mset = new Command<>(CommandType.MSET, null);
+
+        assertThat(ClusterDistributionChannelWriter.getIntent(Arrays.asList(set, mset))).isEqualTo(Intent.WRITE);
+
+        assertThat(ClusterDistributionChannelWriter.getIntent(Collections.singletonList(set))).isEqualTo(Intent.WRITE);
+    }
+
+    @Test
+    public void shouldReturnDefaultIntentForNoCommands() {
+
+        assertThat(ClusterDistributionChannelWriter.getIntent(Collections.emptyList())).isEqualTo(Intent.WRITE);
+    }
+
+    @Test
+    public void shouldReturnIntentForReadCommand() {
+
+        RedisCommand<String, String, String> get = new Command<>(CommandType.GET, null);
+        RedisCommand<String, String, String> mget = new Command<>(CommandType.MGET, null);
+
+        assertThat(ClusterDistributionChannelWriter.getIntent(Arrays.asList(get, mget))).isEqualTo(Intent.READ);
+
+        assertThat(ClusterDistributionChannelWriter.getIntent(Collections.singletonList(get))).isEqualTo(Intent.READ);
+    }
+
+    @Test
+    public void shouldReturnIntentForMixedCommands() {
+
+        RedisCommand<String, String, String> set = new Command<>(CommandType.SET, null);
+        RedisCommand<String, String, String> mget = new Command<>(CommandType.MGET, null);
+
+        assertThat(ClusterDistributionChannelWriter.getIntent(Arrays.asList(set, mget))).isEqualTo(Intent.WRITE);
+
+        assertThat(ClusterDistributionChannelWriter.getIntent(Collections.singletonList(set))).isEqualTo(Intent.WRITE);
+    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java
index d7ecaceeef..1fcc0c009b 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,8 +48,8 @@
 @RunWith(MockitoJUnitRunner.class)
 public class ClusterNodeEndpointTest {
 
-    private AsyncCommand<String, String, String> command = new AsyncCommand<>(
-            new Command<>(CommandType.APPEND, new StatusOutput<String, String>(new Utf8StringCodec()), null));
+    private AsyncCommand<String, String, String> command = new AsyncCommand<>(new Command<>(CommandType.APPEND,
+            new StatusOutput<String, String>(new Utf8StringCodec()), null));
 
     private Queue<RedisCommand<String, String, ?>> queue;
 
@@ -106,7 +106,7 @@ public void closeWithQueuedCommandsFails() throws Exception {
 
         when(clientOptions.isAutoReconnect()).thenReturn(true);
         queue.add(command);
-        when(clusterChannelWriter.write(any())).thenThrow(new RedisException("meh"));
+        when(clusterChannelWriter.write(any(RedisCommand.class))).thenThrow(new RedisException("meh"));
 
         sut.close();
 
@@ -155,7 +155,7 @@ public void closeWithBufferedCommandsFails() throws Exception {
         when(clientOptions.getRequestQueueSize()).thenReturn(1000);
         when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS);
         sut.write(command);
-        when(clusterChannelWriter.write(any())).thenThrow(new RedisException(""));
+        when(clusterChannelWriter.write(any(RedisCommand.class))).thenThrow(new RedisException(""));
 
         sut.close();
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
index 4384a7dfdc..62ee954444 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,18 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.lambdaworks.TestClientResources;
+import java.util.Arrays;
+
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.lambdaworks.redis.*;
+import com.lambdaworks.TestClientResources;
+import com.lambdaworks.redis.FastShutdown;
+import com.lambdaworks.redis.RedisCommandExecutionException;
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.TestSettings;
 import com.lambdaworks.redis.cluster.AbstractClusterTest;
 import com.lambdaworks.redis.cluster.ClusterTestUtil;
 import com.lambdaworks.redis.cluster.RedisClusterClient;
@@ -87,10 +92,10 @@ public void dispatchShouldFailForWrongDataType() throws Exception {
     }
 
     @Test
-    public void standaloneAsyncPing() throws Exception {
+    public void clusterAsyncPing() throws Exception {
 
-        RedisCommand<String, String, String> command = new Command<>(CustomCommandTest.MyCommands.PING,
-                new StatusOutput<>(new Utf8StringCodec()), null);
+        RedisCommand<String, String, String> command = new Command<>(CustomCommandTest.MyCommands.PING, new StatusOutput<>(
+                utf8StringCodec), null);
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(command);
         redisClusterConnection.dispatch(async);
@@ -99,10 +104,49 @@ public void standaloneAsyncPing() throws Exception {
     }
 
     @Test
-    public void standaloneFireAndForget() throws Exception {
+    public void clusterAsyncBatchPing() throws Exception {
+
+        RedisCommand<String, String, String> command1 = new Command<>(CustomCommandTest.MyCommands.PING, new StatusOutput<>(
+                utf8StringCodec), null);
+
+        RedisCommand<String, String, String> command2 = new Command<>(CustomCommandTest.MyCommands.PING, new StatusOutput<>(
+                utf8StringCodec), null);
+
+        AsyncCommand<String, String, String> async1 = new AsyncCommand<>(command1);
+        AsyncCommand<String, String, String> async2 = new AsyncCommand<>(command2);
+        redisClusterConnection.dispatch(Arrays.asList(async1, async2));
+
+        assertThat(async1.get()).isEqualTo("PONG");
+        assertThat(async2.get()).isEqualTo("PONG");
+    }
+
+    @Test
+    public void clusterAsyncBatchSet() throws Exception {
+
+        RedisCommand<String, String, String> command1 = new Command<>(CommandType.SET, new StatusOutput<>(utf8StringCodec),
+                new CommandArgs<>(utf8StringCodec).addKey("key1").addValue("value"));
+
+        RedisCommand<String, String, String> command2 = new Command<>(CommandType.GET, new StatusOutput<>(utf8StringCodec),
+                new CommandArgs<>(utf8StringCodec).addKey("key1"));
+
+        RedisCommand<String, String, String> command3 = new Command<>(CommandType.SET, new StatusOutput<>(utf8StringCodec),
+                new CommandArgs<>(utf8StringCodec).addKey("other-key1").addValue("value"));
+
+        AsyncCommand<String, String, String> async1 = new AsyncCommand<>(command1);
+        AsyncCommand<String, String, String> async2 = new AsyncCommand<>(command2);
+        AsyncCommand<String, String, String> async3 = new AsyncCommand<>(command3);
+        redisClusterConnection.dispatch(Arrays.asList(async1, async2, async3));
+
+        assertThat(async1.get()).isEqualTo("OK");
+        assertThat(async2.get()).isEqualTo("value");
+        assertThat(async3.get()).isEqualTo("OK");
+    }
+
+    @Test
+    public void clusterFireAndForget() throws Exception {
 
-        RedisCommand<String, String, String> command = new Command<>(CustomCommandTest.MyCommands.PING,
-                new StatusOutput<>(new Utf8StringCodec()), null);
+        RedisCommand<String, String, String> command = new Command<>(CustomCommandTest.MyCommands.PING, new StatusOutput<>(
+                utf8StringCodec), null);
         redisClusterConnection.dispatch(command);
         assertThat(command.isCancelled()).isFalse();
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java b/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
index 831ebc5675..6d3155413e 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,6 +45,7 @@
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.protocol.CommandType;
+import com.lambdaworks.redis.protocol.RedisCommand;
 import com.lambdaworks.redis.resource.ClientResources;
 import com.lambdaworks.redis.resource.DnsResolvers;
 
@@ -97,7 +98,7 @@ public void before() throws Exception {
         when(connection1.async()).thenReturn(asyncCommands1);
         when(connection2.async()).thenReturn(asyncCommands2);
 
-        when(connection1.dispatch(any())).thenAnswer(invocation -> {
+        when(connection1.dispatch(any(RedisCommand.class))).thenAnswer(invocation -> {
 
             TimedAsyncCommand command = (TimedAsyncCommand) invocation.getArguments()[0];
             if (command.getType() == CommandType.CLUSTER) {
@@ -116,7 +117,7 @@ public void before() throws Exception {
             return command;
         });
 
-        when(connection2.dispatch(any())).thenAnswer(invocation -> {
+        when(connection2.dispatch(any(RedisCommand.class))).thenAnswer(invocation -> {
 
             TimedAsyncCommand command = (TimedAsyncCommand) invocation.getArguments()[0];
             if (command.getType() == CommandType.CLUSTER) {
@@ -171,8 +172,8 @@ public void getNodeSpecificViewTestingNoAddrFilter() throws Exception {
         Requests clusterNodesRequests = createClusterNodesRequests(1, nodes1);
         Requests clientRequests = createClientListRequests(1, "c1\nc2\n");
 
-        NodeTopologyViews nodeSpecificViews = sut.getNodeSpecificViews(clusterNodesRequests, clientRequests,
-                COMMAND_TIMEOUT_NS);
+        NodeTopologyViews nodeSpecificViews = sut
+                .getNodeSpecificViews(clusterNodesRequests, clientRequests, COMMAND_TIMEOUT_NS);
 
         List<Partitions> values = new ArrayList<>(nodeSpecificViews.toMap().values());
 
@@ -197,8 +198,8 @@ public void getNodeSpecificViewsNode2IsFasterThanNode1() throws Exception {
 
         Requests clientRequests = createClientListRequests(5, "c1\nc2\n").mergeWith(createClientListRequests(1, "c1\nc2\n"));
 
-        NodeTopologyViews nodeSpecificViews = sut.getNodeSpecificViews(clusterNodesRequests, clientRequests,
-                COMMAND_TIMEOUT_NS);
+        NodeTopologyViews nodeSpecificViews = sut
+                .getNodeSpecificViews(clusterNodesRequests, clientRequests, COMMAND_TIMEOUT_NS);
         List<Partitions> values = new ArrayList<>(nodeSpecificViews.toMap().values());
 
         assertThat(values).hasSize(2);
@@ -308,8 +309,8 @@ public void undiscoveredAdditionalNodesShouldBeLastUsingClientCount() throws Exc
 
         List<RedisClusterNode> nodes = TopologyComparators.sortByClientCount(partitions);
 
-        assertThat(nodes).hasSize(2).extracting(RedisClusterNode::getUri).containsSequence(seed.get(0),
-                RedisURI.create("127.0.0.1", 7381));
+        assertThat(nodes).hasSize(2).extracting(RedisClusterNode::getUri)
+                .containsSequence(seed.get(0), RedisURI.create("127.0.0.1", 7381));
     }
 
     @Test
@@ -328,8 +329,8 @@ public void discoveredAdditionalNodesShouldBeOrderedUsingClientCount() throws Ex
 
         List<RedisClusterNode> nodes = TopologyComparators.sortByClientCount(partitions);
 
-        assertThat(nodes).hasSize(2).extracting(RedisClusterNode::getUri).containsSequence(RedisURI.create("127.0.0.1", 7381),
-                seed.get(0));
+        assertThat(nodes).hasSize(2).extracting(RedisClusterNode::getUri)
+                .containsSequence(RedisURI.create("127.0.0.1", 7381), seed.get(0));
     }
 
     @Test
@@ -346,8 +347,8 @@ public void undiscoveredAdditionalNodesShouldBeLastUsingLatency() throws Excepti
 
         List<RedisClusterNode> nodes = TopologyComparators.sortByLatency(partitions);
 
-        assertThat(nodes).hasSize(2).extracting(RedisClusterNode::getUri).containsSequence(seed.get(0),
-                RedisURI.create("127.0.0.1", 7381));
+        assertThat(nodes).hasSize(2).extracting(RedisClusterNode::getUri)
+                .containsSequence(seed.get(0), RedisURI.create("127.0.0.1", 7381));
     }
 
     @Test
@@ -366,8 +367,8 @@ public void discoveredAdditionalNodesShouldBeOrderedUsingLatency() throws Except
 
         List<RedisClusterNode> nodes = TopologyComparators.sortByLatency(partitions);
 
-        assertThat(nodes).hasSize(2).extracting(RedisClusterNode::getUri).containsSequence(RedisURI.create("127.0.0.1", 7381),
-                seed.get(0));
+        assertThat(nodes).hasSize(2).extracting(RedisClusterNode::getUri)
+                .containsSequence(RedisURI.create("127.0.0.1", 7381), seed.get(0));
     }
 
     protected Requests createClusterNodesRequests(int duration, String nodes) {
diff --git a/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
index 163bf1f91d..eb7dedee8c 100644
--- a/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,10 @@
  */
 package com.lambdaworks.redis.commands;
 
-import static com.lambdaworks.redis.protocol.CommandType.ZRANGEBYLEX;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
 
-import java.nio.charset.StandardCharsets;
-import java.util.List;
+import java.util.Arrays;
 
 import org.junit.Test;
 
@@ -30,7 +28,6 @@
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.codec.Utf8StringCodec;
 import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.output.ValueListOutput;
 import com.lambdaworks.redis.protocol.*;
 
 /**
@@ -68,8 +65,8 @@ public void dispatchShouldFailForWrongDataType() throws Exception {
     public void dispatchTransactions() throws Exception {
 
         redis.multi();
-        String response = redis.dispatch(CommandType.SET, new StatusOutput<>(utf8StringCodec),
-                new CommandArgs<>(utf8StringCodec).addKey(key).addValue(value));
+        String response = redis.dispatch(CommandType.SET, new StatusOutput<>(utf8StringCodec), new CommandArgs<>(
+                utf8StringCodec).addKey(key).addValue(value));
 
         TransactionResult exec = redis.exec();
 
@@ -80,8 +77,7 @@ public void dispatchTransactions() throws Exception {
     @Test
     public void standaloneAsyncPing() throws Exception {
 
-        RedisCommand<String, String, String> command = new Command<>(MyCommands.PING, new StatusOutput<>(new Utf8StringCodec()),
-                null);
+        RedisCommand<String, String, String> command = new Command<>(MyCommands.PING, new StatusOutput<>(utf8StringCodec), null);
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(command);
         getStandaloneConnection().dispatch(async);
@@ -90,10 +86,49 @@ public void standaloneAsyncPing() throws Exception {
     }
 
     @Test
-    public void standaloneFireAndForget() throws Exception {
+    public void standaloneAsyncBatchPing() throws Exception {
 
-        RedisCommand<String, String, String> command = new Command<>(MyCommands.PING, new StatusOutput<>(new Utf8StringCodec()),
+        RedisCommand<String, String, String> command1 = new Command<>(MyCommands.PING, new StatusOutput<>(utf8StringCodec),
                 null);
+
+        RedisCommand<String, String, String> command2 = new Command<>(MyCommands.PING, new StatusOutput<>(utf8StringCodec),
+                null);
+
+        AsyncCommand<String, String, String> async1 = new AsyncCommand<>(command1);
+        AsyncCommand<String, String, String> async2 = new AsyncCommand<>(command2);
+        getStandaloneConnection().dispatch(Arrays.asList(async1, async2));
+
+        assertThat(async1.get()).isEqualTo("PONG");
+        assertThat(async2.get()).isEqualTo("PONG");
+    }
+
+    @Test
+    public void standaloneAsyncBatchTransaction() throws Exception {
+
+        RedisCommand<String, String, String> multi = new Command<>(CommandType.MULTI, new StatusOutput<>(utf8StringCodec));
+
+        RedisCommand<String, String, String> set = new Command<>(CommandType.SET, new StatusOutput<>(utf8StringCodec),
+                new CommandArgs<>(utf8StringCodec).addKey("key").add("value"));
+
+        RedisCommand<String, String, TransactionResult> exec = new Command<>(CommandType.EXEC, null);
+
+        AsyncCommand<String, String, String> async1 = new AsyncCommand<>(multi);
+        AsyncCommand<String, String, String> async2 = new AsyncCommand<>(set);
+        AsyncCommand<String, String, TransactionResult> async3 = new AsyncCommand<>(exec);
+        getStandaloneConnection().dispatch(Arrays.asList(async1, async2, async3));
+
+        assertThat(async1.get()).isEqualTo("OK");
+        assertThat(async2.get()).isEqualTo("OK");
+
+        TransactionResult transactionResult = async3.get();
+        assertThat(transactionResult.wasRolledBack()).isFalse();
+        assertThat(transactionResult.<String> get(0)).isEqualTo("OK");
+    }
+
+    @Test
+    public void standaloneFireAndForget() throws Exception {
+
+        RedisCommand<String, String, String> command = new Command<>(MyCommands.PING, new StatusOutput<>(utf8StringCodec), null);
         getStandaloneConnection().dispatch(command);
         assertThat(command.isCancelled()).isFalse();
 
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/CustomCommandTest.java b/src/test/java/com/lambdaworks/redis/masterslave/CustomCommandTest.java
new file mode 100644
index 0000000000..d862321105
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/masterslave/CustomCommandTest.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.masterslave;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assume.assumeTrue;
+
+import java.util.Arrays;
+
+import org.junit.*;
+
+import com.lambdaworks.TestClientResources;
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.codec.Utf8StringCodec;
+import com.lambdaworks.redis.output.StatusOutput;
+import com.lambdaworks.redis.protocol.*;
+
+/**
+ * @author Mark Paluch
+ */
+public class CustomCommandTest extends AbstractTest {
+
+    private static final Utf8StringCodec utf8StringCodec = new Utf8StringCodec();
+    private static RedisClient redisClient;
+
+    private RedisCommands<String, String> redis;
+    private StatefulRedisConnection<String, String> connection;
+
+    @BeforeClass
+    public static void beforeClass() {
+        redisClient = RedisClient.create(TestClientResources.get());
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        FastShutdown.shutdown(redisClient);
+    }
+
+    @Before
+    public void before() {
+
+        RedisURI uri = RedisURI.create("redis-sentinel://127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
+        connection = MasterSlave.connect(redisClient, utf8StringCodec, uri);
+
+        redis = connection.sync();
+    }
+
+    @After
+    public void after() {
+        connection.close();
+    }
+
+    @Test
+    public void dispatchSet() throws Exception {
+
+        String response = redis.dispatch(MyCommands.SET, new StatusOutput<>(utf8StringCodec),
+                new CommandArgs<>(utf8StringCodec).addKey(key).addValue(value));
+
+        assertThat(response).isEqualTo("OK");
+    }
+
+    @Test
+    public void dispatchWithoutArgs() throws Exception {
+
+        String response = redis.dispatch(MyCommands.INFO, new StatusOutput<>(utf8StringCodec));
+
+        assertThat(response).contains("connected_clients");
+    }
+
+    @Test(expected = RedisCommandExecutionException.class)
+    public void dispatchShouldFailForWrongDataType() throws Exception {
+
+        redis.hset(key, key, value);
+        redis.dispatch(CommandType.GET, new StatusOutput<>(utf8StringCodec), new CommandArgs<>(utf8StringCodec).addKey(key));
+    }
+
+    @Test
+    public void dispatchTransactions() throws Exception {
+
+        redis.multi();
+        String response = redis.dispatch(CommandType.SET, new StatusOutput<>(utf8StringCodec), new CommandArgs<>(
+                utf8StringCodec).addKey(key).addValue(value));
+
+        TransactionResult exec = redis.exec();
+
+        assertThat(response).isNull();
+        assertThat(exec).hasSize(1).contains("OK");
+    }
+
+    @Test
+    public void masterSlaveAsyncPing() throws Exception {
+
+        RedisCommand<String, String, String> command = new Command<>(MyCommands.PING,
+                new StatusOutput<>(new Utf8StringCodec()), null);
+
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(command);
+        getStandaloneConnection().dispatch(async);
+
+        assertThat(async.get()).isEqualTo("PONG");
+    }
+
+    @Test
+    public void masterSlaveAsyncBatchPing() throws Exception {
+
+        RedisCommand<String, String, String> command1 = new Command<>(CommandType.SET, new StatusOutput<>(utf8StringCodec),
+                new CommandArgs<>(utf8StringCodec).addKey("key1").addValue("value"));
+
+        RedisCommand<String, String, String> command2 = new Command<>(CommandType.GET, new StatusOutput<>(utf8StringCodec),
+                new CommandArgs<>(utf8StringCodec).addKey("key1"));
+
+        RedisCommand<String, String, String> command3 = new Command<>(CommandType.SET, new StatusOutput<>(utf8StringCodec),
+                new CommandArgs<>(utf8StringCodec).addKey("other-key1").addValue("value"));
+
+        AsyncCommand<String, String, String> async1 = new AsyncCommand<>(command1);
+        AsyncCommand<String, String, String> async2 = new AsyncCommand<>(command2);
+        AsyncCommand<String, String, String> async3 = new AsyncCommand<>(command3);
+        getStandaloneConnection().dispatch(Arrays.asList(async1, async2, async3));
+
+        assertThat(async1.get()).isEqualTo("OK");
+        assertThat(async2.get()).isEqualTo("value");
+        assertThat(async3.get()).isEqualTo("OK");
+    }
+
+    @Test
+    public void masterSlaveFireAndForget() throws Exception {
+
+        RedisCommand<String, String, String> command = new Command<>(MyCommands.PING,
+                new StatusOutput<>(new Utf8StringCodec()), null);
+        getStandaloneConnection().dispatch(command);
+        assertThat(command.isCancelled()).isFalse();
+
+    }
+
+    private StatefulRedisConnection<String, String> getStandaloneConnection() {
+
+        assumeTrue(redis.getStatefulConnection() instanceof StatefulRedisConnection);
+        return redis.getStatefulConnection();
+    }
+
+    public enum MyCommands implements ProtocolKeyword {
+        PING, SET, INFO;
+
+        private final byte name[];
+
+        MyCommands() {
+            // cache the bytes for the command name. Reduces memory and cpu pressure when using commands.
+            name = name().getBytes();
+        }
+
+        @Override
+        public byte[] getBytes() {
+            return name;
+        }
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriterTest.java b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriterTest.java
new file mode 100644
index 0000000000..231e41dfc1
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriterTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.masterslave;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.Test;
+
+import com.lambdaworks.redis.protocol.Command;
+import com.lambdaworks.redis.protocol.CommandType;
+import com.lambdaworks.redis.protocol.RedisCommand;
+
+/**
+ * @author Mark Paluch
+ */
+public class MasterSlaveChannelWriterTest {
+
+    @Test
+    public void shouldReturnIntentForWriteCommand() {
+
+        RedisCommand<String, String, String> set = new Command<>(CommandType.SET, null);
+        RedisCommand<String, String, String> mset = new Command<>(CommandType.MSET, null);
+
+        assertThat(MasterSlaveChannelWriter.getIntent(Arrays.asList(set, mset))).isEqualTo(
+                MasterSlaveConnectionProvider.Intent.WRITE);
+
+        assertThat(MasterSlaveChannelWriter.getIntent(Collections.singletonList(set))).isEqualTo(
+                MasterSlaveConnectionProvider.Intent.WRITE);
+    }
+
+    @Test
+    public void shouldReturnDefaultIntentForNoCommands() {
+
+        assertThat(MasterSlaveChannelWriter.getIntent(Collections.emptyList())).isEqualTo(
+                MasterSlaveConnectionProvider.Intent.WRITE);
+    }
+
+    @Test
+    public void shouldReturnIntentForReadCommand() {
+
+        RedisCommand<String, String, String> get = new Command<>(CommandType.GET, null);
+        RedisCommand<String, String, String> mget = new Command<>(CommandType.MGET, null);
+
+        assertThat(MasterSlaveChannelWriter.getIntent(Arrays.asList(get, mget))).isEqualTo(
+                MasterSlaveConnectionProvider.Intent.READ);
+
+        assertThat(MasterSlaveChannelWriter.getIntent(Collections.singletonList(get))).isEqualTo(
+                MasterSlaveConnectionProvider.Intent.READ);
+    }
+
+    @Test
+    public void shouldReturnIntentForMixedCommands() {
+
+        RedisCommand<String, String, String> set = new Command<>(CommandType.SET, null);
+        RedisCommand<String, String, String> mget = new Command<>(CommandType.MGET, null);
+
+        assertThat(MasterSlaveChannelWriter.getIntent(Arrays.asList(set, mget))).isEqualTo(
+                MasterSlaveConnectionProvider.Intent.WRITE);
+
+        assertThat(MasterSlaveChannelWriter.getIntent(Collections.singletonList(set))).isEqualTo(
+                MasterSlaveConnectionProvider.Intent.WRITE);
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/jmh/com/lambdaworks/redis/EmptyRedisChannelWriter.java b/src/test/jmh/com/lambdaworks/redis/EmptyRedisChannelWriter.java
index c3541b8e5a..7379217bee 100644
--- a/src/test/jmh/com/lambdaworks/redis/EmptyRedisChannelWriter.java
+++ b/src/test/jmh/com/lambdaworks/redis/EmptyRedisChannelWriter.java
@@ -15,7 +15,8 @@
  */
 package com.lambdaworks.redis;
 
-import com.lambdaworks.redis.RedisChannelWriter;
+import java.util.Collection;
+
 import com.lambdaworks.redis.protocol.ConnectionFacade;
 import com.lambdaworks.redis.protocol.RedisCommand;
 
@@ -31,6 +32,11 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         return null;
     }
 
+    @Override
+    public <K, V> Collection<RedisCommand<K, V, ?>> write(Collection<? extends RedisCommand<K, V, ?>> redisCommands) {
+        return (Collection) redisCommands;
+    }
+
     @Override
     public void close() {
 
diff --git a/src/test/jmh/com/lambdaworks/redis/EmptyStatefulRedisConnection.java b/src/test/jmh/com/lambdaworks/redis/EmptyStatefulRedisConnection.java
index b1264d90ff..202ed9f047 100644
--- a/src/test/jmh/com/lambdaworks/redis/EmptyStatefulRedisConnection.java
+++ b/src/test/jmh/com/lambdaworks/redis/EmptyStatefulRedisConnection.java
@@ -15,6 +15,7 @@
  */
 package com.lambdaworks.redis;
 
+import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
@@ -58,7 +59,6 @@ public RedisReactiveCommands reactive() {
 
     @Override
     public void setTimeout(long timeout, TimeUnit unit) {
-
     }
 
     @Override
@@ -73,7 +73,6 @@ public long getTimeout() {
 
     @Override
     public void close() {
-
     }
 
     @Override
@@ -88,31 +87,31 @@ public ClientOptions getOptions() {
 
     @Override
     public void activated() {
-
     }
 
     @Override
     public void deactivated() {
-
     }
 
     @Override
     public void reset() {
-
     }
 
     @Override
     public void setAutoFlushCommands(boolean autoFlush) {
-
     }
 
     @Override
     public void flushCommands() {
-
     }
 
     @Override
     public RedisCommand dispatch(RedisCommand command) {
         return null;
     }
+
+    @Override
+    public Collection<? extends RedisCommand> dispatch(Collection commands) {
+        return commands;
+    }
 }
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java b/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java
index a566fb2db5..7e251773b9 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java
@@ -16,7 +16,9 @@
 package com.lambdaworks.redis.cluster;
 
 import java.net.SocketAddress;
+import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -48,12 +50,21 @@ public class ClusterDistributionChannelWriterBenchmark {
     private final static EmptyStatefulRedisConnection CONNECTION = EmptyStatefulRedisConnection.INSTANCE;
     private static final ValueOutput<byte[], byte[]> VALUE_OUTPUT = new ValueOutput<>(ByteArrayCodec.INSTANCE);
 
-    private final static Command<byte[], byte[], byte[]> KEYED_COMMAND = new Command<>(CommandType.GET, VALUE_OUTPUT,
-            new CommandArgs<>(ByteArrayCodec.INSTANCE).addKey("benchmark".getBytes()));
+    private final static Command<byte[], byte[], byte[]> KEYED_COMMAND1 = new Command<>(CommandType.GET, VALUE_OUTPUT,
+            new CommandArgs<>(ByteArrayCodec.INSTANCE).addKey("benchmark1".getBytes()));
+
+    private final static Command<byte[], byte[], byte[]> KEYED_COMMAND2 = new Command<>(CommandType.GET, VALUE_OUTPUT,
+            new CommandArgs<>(ByteArrayCodec.INSTANCE).addKey("benchmark2".getBytes()));
+
+    private final static Command<byte[], byte[], byte[]> KEYED_COMMAND3 = new Command<>(CommandType.GET, VALUE_OUTPUT,
+            new CommandArgs<>(ByteArrayCodec.INSTANCE).addKey("benchmark3".getBytes()));
 
     private final static Command<byte[], byte[], byte[]> PLAIN_COMMAND = new Command<>(CommandType.GET, VALUE_OUTPUT,
             new CommandArgs<>(ByteArrayCodec.INSTANCE));
 
+    private final static List<Command<byte[], byte[], byte[]>> COMMANDS = Arrays.asList(KEYED_COMMAND1, KEYED_COMMAND2,
+            KEYED_COMMAND3);
+
     private ClusterDistributionChannelWriter writer;
 
     @Setup
@@ -84,12 +95,24 @@ <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, Strin
         writer.setPartitions(partitions);
     }
 
-    @Benchmark
+    // @Benchmark
     public void writeKeyedCommand() {
-        writer.write(KEYED_COMMAND);
+        writer.write(KEYED_COMMAND1);
     }
 
     @Benchmark
+    public void write3KeyedCommands() {
+        writer.write(KEYED_COMMAND1);
+        writer.write(KEYED_COMMAND2);
+        writer.write(KEYED_COMMAND3);
+    }
+
+    @Benchmark
+    public void write3KeyedCommandsAsBatch() {
+        writer.write(COMMANDS);
+    }
+
+    // @Benchmark
     public void writePlainCommand() {
         writer.write(PLAIN_COMMAND);
     }

From 9dcf5f7f2a978974977a3974b5351a0e20e412d6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 1 Feb 2017 22:16:51 +0100
Subject: [PATCH 134/808] Fix test synchronization

---
 src/test/java/com/lambdaworks/Wait.java            |  2 +-
 .../java/com/lambdaworks/redis/ClientTest.java     | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/test/java/com/lambdaworks/Wait.java b/src/test/java/com/lambdaworks/Wait.java
index 2512ceb65f..1769839df9 100644
--- a/src/test/java/com/lambdaworks/Wait.java
+++ b/src/test/java/com/lambdaworks/Wait.java
@@ -96,7 +96,7 @@ public static <T> WaitBuilder<T> untilNotEquals(T expectation, Supplier<T> actua
 
             if (o instanceof Number && expectation instanceof Number) {
                 Number actualNumber = (Number) o;
-                Number expectedNumber = (Number) o;
+                Number expectedNumber = (Number) expectation;
 
                 if (actualNumber.doubleValue() == expectedNumber.doubleValue()) {
                     return false;
diff --git a/src/test/java/com/lambdaworks/redis/ClientTest.java b/src/test/java/com/lambdaworks/redis/ClientTest.java
index a4859c5182..0480b83854 100644
--- a/src/test/java/com/lambdaworks/redis/ClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientTest.java
@@ -26,8 +26,12 @@
 import org.junit.runners.MethodSorters;
 
 import com.lambdaworks.TestClientResources;
+import com.lambdaworks.Wait;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
+import com.lambdaworks.redis.protocol.Command;
+import com.lambdaworks.redis.protocol.CommandWrapper;
+import com.lambdaworks.redis.protocol.RedisCommand;
 
 /**
  * @author Will Glozer
@@ -159,13 +163,19 @@ public void reset() throws Exception {
         connection.sync().set(key, value);
         connection.sync().flushall();
 
-        RedisFuture<KeyValue<String, String>> eval = async.blpop(2, key);
-        Thread.sleep(100);
+        RedisFuture<KeyValue<String, String>> eval = async.blpop(5, key);
+
+        Command unwrapped = (Command) CommandWrapper.unwrap((RedisCommand) eval);
+
+        Wait.untilNotEquals(0L, unwrapped::getSent).waitOrTimeout();
+
         assertThat(eval.isDone()).isFalse();
         assertThat(eval.isCancelled()).isFalse();
 
         async.reset();
 
+        Wait.untilTrue(eval::isCancelled).waitOrTimeout();
+
         assertThat(eval.isCancelled()).isTrue();
         assertThat(eval.isDone()).isTrue();
 

From c0a93c3dc2491ac052d28d6d806b4135955e8ce7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 5 Feb 2017 16:49:24 +0100
Subject: [PATCH 135/808] Refactor command creation and execution to
 ExecutableCommand creation #463

Introduce ExecutableCommand and ExecutableCommandLookupStrategy to create executable commands. This removes the need to use different MethodInterceptors to control the execution/synchronization mode. An ExecutableCommand hides how it's constructed and how it is executed. This is particularly useful if command execution is augmented.
---
 .../redis/dynamic/AsyncExecutableCommand.java |  92 +++++++
 .../AsyncExecutableCommandLookupStrategy.java |  96 +++++++
 .../dynamic/CommandCreationException.java     |  15 +-
 .../redis/dynamic/CommandFactory.java         |   5 +-
 .../redis/dynamic/CommandFactoryResolver.java |  31 +++
 .../dynamic/CommandMethodSyntaxException.java |  11 +-
 .../redis/dynamic/CommandMethodVerifier.java  | 208 +--------------
 .../dynamic/CommandSegmentCommandFactory.java |  22 +-
 .../redis/dynamic/ConvertingCommand.java      |  53 ++++
 .../dynamic/DefaultCommandMethodVerifier.java | 231 ++++++++++++++++
 .../redis/dynamic/ExecutableCommand.java      |  42 +++
 .../ExecutableCommandLookupStrategy.java      |  36 +++
 .../ReactiveCommandSegmentCommandFactory.java |   6 +-
 .../dynamic/ReactiveExecutableCommand.java    |  62 +++++
 ...activeExecutableCommandLookupStrategy.java |  99 +++++++
 .../redis/dynamic/ReactiveTypeAdapters.java   |  16 +-
 .../redis/dynamic/RedisCommandFactory.java    | 247 +++---------------
 ... => DefaultCommandMethodVerifierTest.java} |   8 +-
 ...ctiveCommandSegmentCommandFactoryTest.java |   6 +-
 .../dynamic/RedisCommandsClusterSyncTest.java | 115 ++++++++
 20 files changed, 958 insertions(+), 443 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommand.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommandLookupStrategy.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/CommandFactoryResolver.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/ConvertingCommand.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifier.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommand.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategy.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommand.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommandLookupStrategy.java
 rename src/test/java/com/lambdaworks/redis/dynamic/{CommandMethodVerifierTest.java => DefaultCommandMethodVerifierTest.java} (94%)
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsClusterSyncTest.java

diff --git a/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommand.java b/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommand.java
new file mode 100644
index 0000000000..a1e4df4bea
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommand.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import com.lambdaworks.redis.LettuceFutures;
+import com.lambdaworks.redis.api.StatefulConnection;
+import com.lambdaworks.redis.dynamic.domain.Timeout;
+import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
+import com.lambdaworks.redis.protocol.AsyncCommand;
+import com.lambdaworks.redis.protocol.RedisCommand;
+
+/**
+ * An {@link ExecutableCommand} that is executed asynchronously or synchronously.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class AsyncExecutableCommand implements ExecutableCommand {
+
+    private final CommandMethod commandMethod;
+    private final CommandFactory commandFactory;
+    private final StatefulConnection<Object, Object> connection;
+
+    AsyncExecutableCommand(CommandMethod commandMethod, CommandFactory commandFactory,
+            StatefulConnection<Object, Object> connection) {
+
+        this.commandMethod = commandMethod;
+        this.commandFactory = commandFactory;
+        this.connection = connection;
+    }
+
+    @Override
+    public Object execute(Object[] parameters) throws ExecutionException, InterruptedException {
+
+        RedisCommand<Object, Object, Object> command = commandFactory.createCommand(parameters);
+
+        return dispatchCommand(parameters, command);
+    }
+
+    protected Object dispatchCommand(Object[] arguments, RedisCommand<Object, Object, Object> command)
+            throws InterruptedException, java.util.concurrent.ExecutionException {
+
+        AsyncCommand<Object, Object, Object> asyncCommand = new AsyncCommand<>(command);
+
+        if (commandMethod.isFutureExecution()) {
+            return connection.dispatch(asyncCommand);
+        }
+
+        connection.dispatch(asyncCommand);
+
+        long timeout = connection.getTimeout();
+        TimeUnit unit = connection.getTimeoutUnit();
+
+        if (commandMethod.getParameters() instanceof ExecutionSpecificParameters) {
+            ExecutionSpecificParameters executionSpecificParameters = (ExecutionSpecificParameters) commandMethod
+                    .getParameters();
+
+            if (executionSpecificParameters.hasTimeoutIndex()) {
+                Timeout timeoutArg = (Timeout) arguments[executionSpecificParameters.getTimeoutIndex()];
+                if (timeoutArg != null) {
+                    timeout = timeoutArg.getTimeout();
+                    unit = timeoutArg.getTimeUnit();
+                }
+            }
+        }
+
+        LettuceFutures.awaitAll(timeout, unit, asyncCommand);
+
+        return asyncCommand.get();
+    }
+
+    @Override
+    public CommandMethod getCommandMethod() {
+        return commandMethod;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommandLookupStrategy.java b/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommandLookupStrategy.java
new file mode 100644
index 0000000000..f940808b28
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommandLookupStrategy.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import com.lambdaworks.redis.api.StatefulConnection;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.dynamic.codec.AnnotationRedisCodecResolver;
+import com.lambdaworks.redis.dynamic.output.CodecAwareOutputFactoryResolver;
+import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
+import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory;
+import com.lambdaworks.redis.dynamic.segment.CommandSegments;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class AsyncExecutableCommandLookupStrategy implements ExecutableCommandLookupStrategy {
+
+    private final List<RedisCodec<?, ?>> redisCodecs;
+    private final CommandOutputFactoryResolver commandOutputFactoryResolver;
+    private final DefaultCommandFactoryResolver commandFactoryResolver;
+    private final CommandMethodVerifier commandMethodVerifier;
+
+    private final StatefulConnection<Object, Object> connection;
+
+    public AsyncExecutableCommandLookupStrategy(List<RedisCodec<?, ?>> redisCodecs,
+            CommandOutputFactoryResolver commandOutputFactoryResolver, CommandMethodVerifier commandMethodVerifier,
+            StatefulConnection<Object, Object> connection) {
+
+        this.redisCodecs = redisCodecs;
+        this.commandOutputFactoryResolver = commandOutputFactoryResolver;
+        this.commandMethodVerifier = commandMethodVerifier;
+        this.connection = connection;
+
+        this.commandFactoryResolver = new DefaultCommandFactoryResolver();
+    }
+
+    @Override
+    public ExecutableCommand resolveCommandMethod(Method method, RedisCommandsMetadata commandsMetadata) {
+
+        CommandMethod commandMethod = new CommandMethod(method);
+
+        LettuceAssert.isTrue(!commandMethod.isReactiveExecution(),
+                String.format("Command method %s not supported by this command lookup strategy", method));
+
+        CommandFactory commandFactory = commandFactoryResolver.resolveRedisCommandFactory(commandMethod, commandsMetadata);
+
+        return new AsyncExecutableCommand(commandMethod, commandFactory, connection);
+    }
+
+    @SuppressWarnings("unchecked")
+    class DefaultCommandFactoryResolver implements CommandFactoryResolver {
+
+        final AnnotationCommandSegmentFactory commandSegmentFactory = new AnnotationCommandSegmentFactory();
+        final AnnotationRedisCodecResolver codecResolver;
+
+        DefaultCommandFactoryResolver() {
+            codecResolver = new AnnotationRedisCodecResolver(redisCodecs);
+        }
+
+        @Override
+        public CommandFactory resolveRedisCommandFactory(CommandMethod commandMethod, RedisCommandsMetadata commandsMetadata) {
+
+            RedisCodec<?, ?> codec = codecResolver.resolve(commandMethod);
+
+            if (codec == null) {
+                throw new CommandCreationException(commandMethod, "Cannot resolve RedisCodec");
+            }
+
+            CodecAwareOutputFactoryResolver outputFactoryResolver = new CodecAwareOutputFactoryResolver(
+                    commandOutputFactoryResolver, codec);
+            CommandSegments commandSegments = commandSegmentFactory.createCommandSegments(commandMethod);
+
+            commandMethodVerifier.validate(commandSegments, commandMethod);
+
+            return new CommandSegmentCommandFactory(commandSegments, commandMethod, codec, outputFactoryResolver);
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java
index 1a3bdddd77..a0ccf78cae 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,17 +18,30 @@
 import com.lambdaworks.redis.RedisException;
 
 /**
+ * Exception thrown if a command cannot be constructed from a {@link CommandMethod}.
+ * 
  * @author Mark Paluch
+ * @since 5.0
  */
 public class CommandCreationException extends RedisException {
 
     private final CommandMethod commandMethod;
 
+    /**
+     * Create a new {@link CommandCreationException} given {@link CommandMethod} and a message.
+     * 
+     * @param commandMethod must not be {@literal null}.
+     * @param msg must not be {@literal null}.
+     */
     public CommandCreationException(CommandMethod commandMethod, String msg) {
+
         super(String.format("%s Offending method: %s", msg, commandMethod));
         this.commandMethod = commandMethod;
     }
 
+    /**
+     * @return the offending {@link CommandMethod}.
+     */
     public CommandMethod getCommandMethod() {
         return commandMethod;
     }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java
index d2043d8ce9..7d89ac45d8 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 
 /**
  * Strategy interface to create {@link RedisCommand}s.
- *
  * <p>
  * Implementing classes are required to construct {@link RedisCommand}s given an array of parameters for command execution.
  *
@@ -34,5 +33,5 @@ interface CommandFactory {
      * @param parameters must not be {@literal null}.
      * @return the {@link RedisCommand}.
      */
-    RedisCommand<?, ?, ?> createCommand(Object[] parameters);
+    RedisCommand<Object, Object, Object> createCommand(Object[] parameters);
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandFactoryResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandFactoryResolver.java
new file mode 100644
index 0000000000..09a35af1de
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandFactoryResolver.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+/**
+ * Strategy interface to resolve a {@link CommandFactory}.
+ */
+interface CommandFactoryResolver {
+
+    /**
+     * Resolve a {@link CommandFactory} given a{@link CommandMethod} and {@link RedisCommandsMetadata}.
+     * 
+     * @param method must not be {@literal null}.
+     * @param redisCommandsMetadata must not be {@literal null}.
+     * @return the {@link CommandFactory}.
+     */
+    CommandFactory resolveRedisCommandFactory(CommandMethod method, RedisCommandsMetadata redisCommandsMetadata);
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java
index 0a5db54566..6125f75f81 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,19 @@
 package com.lambdaworks.redis.dynamic;
 
 /**
+ * Exception thrown if the command syntax is invalid.
+ * 
  * @author Mark Paluch
+ * @since 5.0
  */
 public class CommandMethodSyntaxException extends CommandCreationException {
 
+    /**
+     * Create a new {@link CommandMethodSyntaxException} given {@link CommandMethod} and a message.
+     * 
+     * @param commandMethod must not be {@literal null}.
+     * @param msg must not be {@literal null}.
+     */
     public CommandMethodSyntaxException(CommandMethod commandMethod, String msg) {
         super(commandMethod, msg);
     }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
index 436e6c76c0..ee0cb73c5d 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,217 +15,25 @@
  */
 package com.lambdaworks.redis.dynamic;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.dynamic.parameter.Parameter;
 import com.lambdaworks.redis.dynamic.segment.CommandSegments;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceLists;
-import com.lambdaworks.redis.models.command.CommandDetail;
 
 /**
- * Verifies {@link CommandMethod} declarations by checking available Redis commands.
- * 
  * @author Mark Paluch
  */
-class CommandMethodVerifier {
+interface CommandMethodVerifier {
 
     /**
-     * Default maximum property distance: 2
+     * Default instance that does not verify commands.
      */
-    public static final int DEFAULT_MAX_DISTANCE = 2;
-
-    private List<CommandDetail> commandDetails;
-
-    /**
-     * Create a new {@link CommandMethodVerifier} given a {@link List} of {@link CommandDetail}
-     *
-     * @param commandDetails must not be {@literal null}.
-     */
-    public CommandMethodVerifier(List<CommandDetail> commandDetails) {
-
-        LettuceAssert.notNull(commandDetails, "Command details must not be null");
-
-        this.commandDetails = LettuceLists.newList(commandDetails);
-    }
+    CommandMethodVerifier NONE = (commandSegments, commandMethod) -> {
+    };
 
     /**
-     *
      * Verify a {@link CommandMethod} with its {@link CommandSegments}. This method verifies that the command exists and that
      * the required number of arguments is declared.
      * 
-     * @param commandSegments
-     * @param commandMethod
+     * @param commandSegments must not be {@literal null}.
+     * @param commandMethod must not be {@literal null}.
      */
-    public void validate(CommandSegments commandSegments, CommandMethod commandMethod) throws CommandMethodSyntaxException {
-
-        LettuceAssert.notEmpty(commandSegments.getCommandType().name(), "Command name must not be empty");
-
-        CommandDetail commandDetail = findCommandDetail(commandSegments.getCommandType().name())
-                .orElseThrow(() -> syntaxException(commandSegments.getCommandType().name(), commandMethod));
-
-        validateParameters(commandDetail, commandSegments, commandMethod);
-    }
-
-    private void validateParameters(CommandDetail commandDetail, CommandSegments commandSegments, CommandMethod commandMethod) {
-
-        List<? extends Parameter> bindableParameters = commandMethod.getParameters().getBindableParameters();
-
-        int availableParameterCount = calculateAvailableParameterCount(commandSegments, bindableParameters);
-
-        // exact parameter count
-        if (commandDetail.getArity() - 1 == availableParameterCount) {
-            return;
-        }
-
-        // more or same parameter cound for dynamic arg count commands
-        if (0 > commandDetail.getArity() && availableParameterCount >= -(commandDetail.getArity() + 1)) {
-            return;
-        }
-
-        for (Parameter bindableParameter : bindableParameters) {
-
-            // Can't verify collection-like arguments as they may contain multiple elements.
-            if (bindableParameter.getTypeInformation().isCollectionLike()) {
-                return;
-            }
-        }
-
-        String message;
-        if (commandDetail.getArity() == 1) {
-            message = String.format("Command %s accepts no parameters.", commandDetail.getName().toUpperCase());
-        } else if (commandDetail.getArity() < -1) {
-            message = String.format("Command %s requires at least %d parameters but method declares %d parameter(s).",
-                    commandDetail.getName().toUpperCase(), Math.abs(commandDetail.getArity()) - 1, availableParameterCount);
-        } else {
-            message = String.format("Command %s accepts %d parameters but method declares %d parameter(s).",
-                    commandDetail.getName().toUpperCase(), commandDetail.getArity() - 1, availableParameterCount);
-        }
-
-        throw new CommandMethodSyntaxException(commandMethod, message);
-    }
-
-    private int calculateAvailableParameterCount(CommandSegments commandSegments,
-            List<? extends Parameter> bindableParameters) {
-
-        int count = commandSegments.size();
-
-        for (Parameter bindableParameter : bindableParameters) {
-
-            if (bindableParameter.isAssignableTo(KeyValue.class) || bindableParameter.isAssignableTo(ScoredValue.class)) {
-                count++;
-            }
-
-            if (bindableParameter.isAssignableTo(GeoCoordinates.class) || bindableParameter.isAssignableTo(Range.class)) {
-                count++;
-            }
-
-            if (bindableParameter.isAssignableTo(Limit.class)) {
-                count += 2;
-            }
-
-            count++;
-        }
-
-        return count;
-    }
-
-    private CommandMethodSyntaxException syntaxException(String commandName, CommandMethod commandMethod) {
-
-        CommandMatches commandMatches = CommandMatches.forCommand(commandName, commandDetails);
-
-        if (commandMatches.hasMatches()) {
-            return new CommandMethodSyntaxException(commandMethod,
-                    String.format("Command %s does not exist. Did you mean: %s?", commandName, commandMatches));
-        }
-
-        return new CommandMethodSyntaxException(commandMethod, String.format("Command %s does not exist", commandName));
-
-    }
-
-    private Optional<CommandDetail> findCommandDetail(String commandName) {
-        return commandDetails.stream().filter(commandDetail -> commandDetail.getName().equalsIgnoreCase(commandName))
-                .findFirst();
-    }
-
-    static class CommandMatches {
-
-        private final List<String> matches = new ArrayList<>();
-
-        private CommandMatches(List<String> matches) {
-            this.matches.addAll(matches);
-        }
-
-        public static CommandMatches forCommand(String command, List<CommandDetail> commandDetails) {
-            return new CommandMatches(calculateMatches(command, commandDetails));
-        }
-
-        private static List<String> calculateMatches(String command, List<CommandDetail> commandDetails) {
-
-            return commandDetails.stream() //
-                    .filter(commandDetail -> calculateStringDistance(commandDetail.getName().toLowerCase(),
-                            command.toLowerCase()) <= DEFAULT_MAX_DISTANCE)
-                    .map(CommandDetail::getName) //
-                    .map(String::toUpperCase) //
-                    .sorted(CommandMatches::calculateStringDistance).collect(Collectors.toList());
-        }
-
-        public boolean hasMatches() {
-            return !matches.isEmpty();
-        }
-
-        @Override
-        public String toString() {
-            return LettuceStrings.collectionToDelimitedString(matches, ", ", "", "");
-        }
-
-        /**
-         * Calculate the distance between the given two Strings according to the Levenshtein algorithm.
-         *
-         * @param s1 the first String
-         * @param s2 the second String
-         * @return the distance value
-         */
-        private static int calculateStringDistance(String s1, String s2) {
-
-            if (s1.length() == 0) {
-                return s2.length();
-            }
-
-            if (s2.length() == 0) {
-                return s1.length();
-            }
-
-            int d[][] = new int[s1.length() + 1][s2.length() + 1];
-
-            for (int i = 0; i <= s1.length(); i++) {
-                d[i][0] = i;
-            }
-
-            for (int j = 0; j <= s2.length(); j++) {
-                d[0][j] = j;
-            }
-
-            for (int i = 1; i <= s1.length(); i++) {
-                char s_i = s1.charAt(i - 1);
-                for (int j = 1; j <= s2.length(); j++) {
-                    int cost;
-                    char t_j = s2.charAt(j - 1);
-                    if (s_i == t_j) {
-                        cost = 0;
-                    } else {
-                        cost = 1;
-                    }
-                    d[i][j] = Math.min(Math.min(d[i - 1][j] + 1, d[i][j - 1] + 1), d[i - 1][j - 1] + cost);
-                }
-            }
-
-            return d[s1.length()][s2.length()];
-        }
-    }
-
+    void validate(CommandSegments commandSegments, CommandMethod commandMethod) throws CommandMethodSyntaxException;
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
index f96b90c216..c792b66889 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
@@ -23,6 +23,7 @@
 import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
 import com.lambdaworks.redis.dynamic.segment.CommandSegments;
 import com.lambdaworks.redis.output.CommandOutput;
+import com.lambdaworks.redis.protocol.Command;
 import com.lambdaworks.redis.protocol.CommandArgs;
 import com.lambdaworks.redis.protocol.RedisCommand;
 
@@ -30,22 +31,23 @@
  * {@link CommandFactory} based on {@link CommandSegments}.
  *
  * @author Mark Paluch
+ * @since 5.0
  */
-class CommandSegmentCommandFactory<K, V> implements CommandFactory {
+class CommandSegmentCommandFactory implements CommandFactory {
 
     private final CommandMethod commandMethod;
     private final CommandSegments segments;
     private final CommandOutputFactoryResolver outputResolver;
-    private final RedisCodec<K, V> redisCodec;
+    private final RedisCodec<Object, Object> redisCodec;
     private final ParameterBinder parameterBinder = new ParameterBinder();
     private final CommandOutputFactory outputFactory;
 
     public CommandSegmentCommandFactory(CommandSegments commandSegments, CommandMethod commandMethod,
-            RedisCodec<K, V> redisCodec, CommandOutputFactoryResolver outputResolver) {
+            RedisCodec<?, ?> redisCodec, CommandOutputFactoryResolver outputResolver) {
 
         this.segments = commandSegments;
         this.commandMethod = commandMethod;
-        this.redisCodec = redisCodec;
+        this.redisCodec = (RedisCodec) redisCodec;
         this.outputResolver = outputResolver;
 
         OutputSelector outputSelector = new OutputSelector(commandMethod.getActualReturnType(), redisCodec);
@@ -78,19 +80,19 @@ protected CommandOutputFactory resolveCommandOutputFactory(OutputSelector output
     }
 
     @Override
-    public RedisCommand<?, ?, ?> createCommand(Object[] parameters) {
+    public RedisCommand<Object, Object, Object> createCommand(Object[] parameters) {
 
         MethodParametersAccessor parametersAccessor = new CodecAwareMethodParametersAccessor(
                 new DefaultMethodParametersAccessor(commandMethod.getParameters(), parameters), redisCodec);
 
-        CommandArgs<K, V> args = new CommandArgs<>(redisCodec);
+        CommandArgs<Object, Object> args = new CommandArgs<>(redisCodec);
 
-        CommandOutput<K, V, ?> output = outputFactory.create(redisCodec);
-        com.lambdaworks.redis.protocol.Command<?, ?, ?> command = new com.lambdaworks.redis.protocol.Command<>(
-                this.segments.getCommandType(), output, args);
+        CommandOutput<Object, Object, ?> output = outputFactory.create(redisCodec);
+        Command<Object, Object, ?> command = new com.lambdaworks.redis.protocol.Command<>(this.segments.getCommandType(),
+                output, args);
 
         parameterBinder.bind(args, redisCodec, segments, parametersAccessor);
 
-        return command;
+        return (Command) command;
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ConvertingCommand.java b/src/main/java/com/lambdaworks/redis/dynamic/ConvertingCommand.java
new file mode 100644
index 0000000000..4f71bc8deb
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ConvertingCommand.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.util.concurrent.ExecutionException;
+
+/**
+ * A {@link ExecutableCommand} that uses {@link ConversionService} to convert the result of a decorated
+ * {@link ExecutableCommand}.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class ConvertingCommand implements ExecutableCommand {
+
+    private final ConversionService conversionService;
+    private final ExecutableCommand delegate;
+
+    public ConvertingCommand(ConversionService conversionService, ExecutableCommand delegate) {
+        this.conversionService = conversionService;
+        this.delegate = delegate;
+    }
+
+    @Override
+    public Object execute(Object[] parameters) throws ExecutionException, InterruptedException {
+
+        Object result = delegate.execute(parameters);
+
+        if (delegate.getCommandMethod().getReturnType().isAssignableFrom(result.getClass())) {
+            return result;
+        }
+
+        return conversionService.convert(result, delegate.getCommandMethod().getReturnType().getRawClass());
+    }
+
+    @Override
+    public CommandMethod getCommandMethod() {
+        return delegate.getCommandMethod();
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifier.java b/src/main/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifier.java
new file mode 100644
index 0000000000..c37a5102ba
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifier.java
@@ -0,0 +1,231 @@
+/*
+ * Copyright 2016-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.dynamic.parameter.Parameter;
+import com.lambdaworks.redis.dynamic.segment.CommandSegments;
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.internal.LettuceLists;
+import com.lambdaworks.redis.models.command.CommandDetail;
+
+/**
+ * Verifies {@link CommandMethod} declarations by checking available Redis commands.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class DefaultCommandMethodVerifier implements CommandMethodVerifier {
+
+    /**
+     * Default maximum property distance: 2
+     */
+    public static final int DEFAULT_MAX_DISTANCE = 2;
+
+    private List<CommandDetail> commandDetails;
+
+    /**
+     * Create a new {@link DefaultCommandMethodVerifier} given a {@link List} of {@link CommandDetail}
+     *
+     * @param commandDetails must not be {@literal null}.
+     */
+    public DefaultCommandMethodVerifier(List<CommandDetail> commandDetails) {
+
+        LettuceAssert.notNull(commandDetails, "Command details must not be null");
+
+        this.commandDetails = LettuceLists.newList(commandDetails);
+    }
+
+    /**
+     * Verify a {@link CommandMethod} with its {@link CommandSegments}. This method verifies that the command exists and that
+     * the required number of arguments is declared.
+     * 
+     * @param commandSegments
+     * @param commandMethod
+     */
+    public void validate(CommandSegments commandSegments, CommandMethod commandMethod) throws CommandMethodSyntaxException {
+
+        LettuceAssert.notEmpty(commandSegments.getCommandType().name(), "Command name must not be empty");
+
+        CommandDetail commandDetail = findCommandDetail(commandSegments.getCommandType().name()).orElseThrow(
+                () -> syntaxException(commandSegments.getCommandType().name(), commandMethod));
+
+        validateParameters(commandDetail, commandSegments, commandMethod);
+    }
+
+    private void validateParameters(CommandDetail commandDetail, CommandSegments commandSegments, CommandMethod commandMethod) {
+
+        List<? extends Parameter> bindableParameters = commandMethod.getParameters().getBindableParameters();
+
+        int availableParameterCount = calculateAvailableParameterCount(commandSegments, bindableParameters);
+
+        // exact parameter count
+        if (commandDetail.getArity() - 1 == availableParameterCount) {
+            return;
+        }
+
+        // more or same parameter cound for dynamic arg count commands
+        if (0 > commandDetail.getArity() && availableParameterCount >= -(commandDetail.getArity() + 1)) {
+            return;
+        }
+
+        for (Parameter bindableParameter : bindableParameters) {
+
+            // Can't verify collection-like arguments as they may contain multiple elements.
+            if (bindableParameter.getTypeInformation().isCollectionLike()) {
+                return;
+            }
+        }
+
+        String message;
+        if (commandDetail.getArity() == 1) {
+            message = String.format("Command %s accepts no parameters.", commandDetail.getName().toUpperCase());
+        } else if (commandDetail.getArity() < -1) {
+            message = String.format("Command %s requires at least %d parameters but method declares %d parameter(s).",
+                    commandDetail.getName().toUpperCase(), Math.abs(commandDetail.getArity()) - 1, availableParameterCount);
+        } else {
+            message = String.format("Command %s accepts %d parameters but method declares %d parameter(s).", commandDetail
+                    .getName().toUpperCase(), commandDetail.getArity() - 1, availableParameterCount);
+        }
+
+        throw new CommandMethodSyntaxException(commandMethod, message);
+    }
+
+    private int calculateAvailableParameterCount(CommandSegments commandSegments, List<? extends Parameter> bindableParameters) {
+
+        int count = commandSegments.size();
+
+        for (Parameter bindableParameter : bindableParameters) {
+
+            if (bindableParameter.isAssignableTo(KeyValue.class) || bindableParameter.isAssignableTo(ScoredValue.class)) {
+                count++;
+            }
+
+            if (bindableParameter.isAssignableTo(GeoCoordinates.class) || bindableParameter.isAssignableTo(Range.class)) {
+                count++;
+            }
+
+            if (bindableParameter.isAssignableTo(Limit.class)) {
+                count += 2;
+            }
+
+            count++;
+        }
+
+        return count;
+    }
+
+    private CommandMethodSyntaxException syntaxException(String commandName, CommandMethod commandMethod) {
+
+        CommandMatches commandMatches = CommandMatches.forCommand(commandName, commandDetails);
+
+        if (commandMatches.hasMatches()) {
+            return new CommandMethodSyntaxException(commandMethod, String.format(
+                    "Command %s does not exist. Did you mean: %s?", commandName, commandMatches));
+        }
+
+        return new CommandMethodSyntaxException(commandMethod, String.format("Command %s does not exist", commandName));
+
+    }
+
+    private Optional<CommandDetail> findCommandDetail(String commandName) {
+        return commandDetails.stream().filter(commandDetail -> commandDetail.getName().equalsIgnoreCase(commandName))
+                .findFirst();
+    }
+
+    static class CommandMatches {
+
+        private final List<String> matches = new ArrayList<>();
+
+        private CommandMatches(List<String> matches) {
+            this.matches.addAll(matches);
+        }
+
+        public static CommandMatches forCommand(String command, List<CommandDetail> commandDetails) {
+            return new CommandMatches(calculateMatches(command, commandDetails));
+        }
+
+        private static List<String> calculateMatches(String command, List<CommandDetail> commandDetails) {
+
+            return commandDetails
+                    .stream()
+                    //
+                    .filter(commandDetail -> calculateStringDistance(commandDetail.getName().toLowerCase(),
+                            command.toLowerCase()) <= DEFAULT_MAX_DISTANCE).map(CommandDetail::getName) //
+                    .map(String::toUpperCase) //
+                    .sorted(CommandMatches::calculateStringDistance).collect(Collectors.toList());
+        }
+
+        public boolean hasMatches() {
+            return !matches.isEmpty();
+        }
+
+        @Override
+        public String toString() {
+            return LettuceStrings.collectionToDelimitedString(matches, ", ", "", "");
+        }
+
+        /**
+         * Calculate the distance between the given two Strings according to the Levenshtein algorithm.
+         *
+         * @param s1 the first String
+         * @param s2 the second String
+         * @return the distance value
+         */
+        private static int calculateStringDistance(String s1, String s2) {
+
+            if (s1.length() == 0) {
+                return s2.length();
+            }
+
+            if (s2.length() == 0) {
+                return s1.length();
+            }
+
+            int d[][] = new int[s1.length() + 1][s2.length() + 1];
+
+            for (int i = 0; i <= s1.length(); i++) {
+                d[i][0] = i;
+            }
+
+            for (int j = 0; j <= s2.length(); j++) {
+                d[0][j] = j;
+            }
+
+            for (int i = 1; i <= s1.length(); i++) {
+                char s_i = s1.charAt(i - 1);
+                for (int j = 1; j <= s2.length(); j++) {
+                    int cost;
+                    char t_j = s2.charAt(j - 1);
+                    if (s_i == t_j) {
+                        cost = 0;
+                    } else {
+                        cost = 1;
+                    }
+                    d[i][j] = Math.min(Math.min(d[i - 1][j] + 1, d[i][j - 1] + 1), d[i - 1][j - 1] + cost);
+                }
+            }
+
+            return d[s1.length()][s2.length()];
+        }
+    }
+
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommand.java b/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommand.java
new file mode 100644
index 0000000000..d209d5d18f
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommand.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.util.concurrent.ExecutionException;
+
+/**
+ * An executable command that can be executed calling {@link #execute(Object[])}.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+interface ExecutableCommand {
+
+    /**
+     * Executes the {@link ExecutableCommand} with the given parameters.
+     * 
+     * @param parameters
+     * @return
+     */
+    Object execute(Object[] parameters) throws ExecutionException, InterruptedException;
+
+    /**
+     * Returns the {@link CommandMethod}.
+     * 
+     * @return
+     */
+    CommandMethod getCommandMethod();
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategy.java b/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategy.java
new file mode 100644
index 0000000000..ad9cbdaea0
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategy.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.lang.reflect.Method;
+
+/**
+ * Strategy interface to resolve {@link ExecutableCommand} from a {@link Method} and {@link RedisCommandsMetadata}.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+interface ExecutableCommandLookupStrategy {
+
+    /**
+     * Resolve a {@link ExecutableCommand} given the {@link Method} and {@link RedisCommandsMetadata}.
+     * 
+     * @param method must not be {@literal null}.
+     * @param commandsMetadata must not be {@literal null}.
+     * @return the {@link ExecutableCommand}.
+     */
+    ExecutableCommand resolveCommandMethod(Method method, RedisCommandsMetadata commandsMetadata);
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java
index 3799bd2ca4..8b2390b637 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,12 +27,12 @@
  * 
  * @author Mark Paluch
  */
-class ReactiveCommandSegmentCommandFactory<K, V> extends CommandSegmentCommandFactory<K, V> {
+class ReactiveCommandSegmentCommandFactory extends CommandSegmentCommandFactory {
 
     private boolean streamingExecution;
 
     public ReactiveCommandSegmentCommandFactory(CommandSegments commandSegments, CommandMethod commandMethod,
-            RedisCodec<K, V> redisCodec, CommandOutputFactoryResolver outputResolver) {
+            RedisCodec<?, ?> redisCodec, CommandOutputFactoryResolver outputResolver) {
 
         super(commandSegments, commandMethod, redisCodec, outputResolver);
 
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommand.java b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommand.java
new file mode 100644
index 0000000000..079316e3f6
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommand.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import com.lambdaworks.redis.AbstractRedisReactiveCommands;
+
+/**
+ * An {@link ExecutableCommand} that is executed using reactive infrastructure.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class ReactiveExecutableCommand implements ExecutableCommand {
+
+    private final CommandMethod commandMethod;
+    private final ReactiveCommandSegmentCommandFactory commandFactory;
+    private final AbstractRedisReactiveCommands<Object, Object> redisReactiveCommands;
+
+    ReactiveExecutableCommand(CommandMethod commandMethod, ReactiveCommandSegmentCommandFactory commandFactory,
+            AbstractRedisReactiveCommands<Object, Object> redisReactiveCommands) {
+
+        this.commandMethod = commandMethod;
+        this.commandFactory = commandFactory;
+        this.redisReactiveCommands = redisReactiveCommands;
+    }
+
+    @Override
+    public Object execute(Object[] parameters) {
+        return dispatch(parameters);
+    }
+
+    protected Object dispatch(Object[] arguments) {
+
+        if (ReactiveTypes.isSingleValueType(commandMethod.getReturnType().getRawClass())) {
+            return redisReactiveCommands.createMono(() -> commandFactory.createCommand(arguments));
+        }
+
+        if (commandFactory.isStreamingExecution()) {
+            return redisReactiveCommands.createDissolvingFlux(() -> commandFactory.createCommand(arguments));
+        }
+
+        return redisReactiveCommands.createFlux(() -> commandFactory.createCommand(arguments));
+    }
+
+    @Override
+    public CommandMethod getCommandMethod() {
+        return commandMethod;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommandLookupStrategy.java b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommandLookupStrategy.java
new file mode 100644
index 0000000000..c8106a236d
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommandLookupStrategy.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import com.lambdaworks.redis.AbstractRedisReactiveCommands;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.dynamic.codec.AnnotationRedisCodecResolver;
+import com.lambdaworks.redis.dynamic.output.CodecAwareOutputFactoryResolver;
+import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
+import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory;
+import com.lambdaworks.redis.dynamic.segment.CommandSegments;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class ReactiveExecutableCommandLookupStrategy implements ExecutableCommandLookupStrategy {
+
+    private final AbstractRedisReactiveCommands<Object, Object> redisReactiveCommands;
+    private final ConversionService conversionService = new ConversionService();
+    private final List<RedisCodec<?, ?>> redisCodecs;
+    private final CommandOutputFactoryResolver outputFactoryResolver;
+    private final ReactiveCommandFactoryResolver commandFactoryResolver;
+    private final CommandMethodVerifier commandMethodVerifier;
+
+    ReactiveExecutableCommandLookupStrategy(List<RedisCodec<?, ?>> redisCodecs,
+            CommandOutputFactoryResolver outputFactoryResolver, CommandMethodVerifier commandMethodVerifier,
+            AbstractRedisReactiveCommands<Object, Object> redisReactiveCommands) {
+
+        this.redisReactiveCommands = redisReactiveCommands;
+        this.redisCodecs = redisCodecs;
+        this.outputFactoryResolver = outputFactoryResolver;
+        this.commandMethodVerifier = commandMethodVerifier;
+
+        ReactiveTypeAdapters.registerIn(this.conversionService);
+        this.commandFactoryResolver = new ReactiveCommandFactoryResolver();
+    }
+
+    @Override
+    public ExecutableCommand resolveCommandMethod(Method method, RedisCommandsMetadata commandsMetadata) {
+
+        CommandMethod commandMethod = new CommandMethod(method);
+
+        LettuceAssert.isTrue(commandMethod.isReactiveExecution(),
+                String.format("Command method %s not supported by this command lookup strategy", method));
+
+        ReactiveCommandSegmentCommandFactory commandFactory = commandFactoryResolver.resolveRedisCommandFactory(commandMethod,
+                commandsMetadata);
+
+        return new ConvertingCommand(conversionService, new ReactiveExecutableCommand(commandMethod, commandFactory,
+                redisReactiveCommands));
+    }
+
+    class ReactiveCommandFactoryResolver implements CommandFactoryResolver {
+
+        final AnnotationCommandSegmentFactory commandSegmentFactory = new AnnotationCommandSegmentFactory();
+        final AnnotationRedisCodecResolver codecResolver;
+
+        ReactiveCommandFactoryResolver() {
+            codecResolver = new AnnotationRedisCodecResolver(redisCodecs);
+        }
+
+        public ReactiveCommandSegmentCommandFactory resolveRedisCommandFactory(CommandMethod commandMethod,
+                RedisCommandsMetadata redisCommandsMetadata) {
+
+            RedisCodec<?, ?> codec = codecResolver.resolve(commandMethod);
+
+            if (codec == null) {
+                throw new CommandCreationException(commandMethod, "Cannot resolve RedisCodec");
+            }
+
+            CommandSegments commandSegments = commandSegmentFactory.createCommandSegments(commandMethod);
+
+            commandMethodVerifier.validate(commandSegments, commandMethod);
+
+            CodecAwareOutputFactoryResolver outputFactoryResolver = new CodecAwareOutputFactoryResolver(
+                    ReactiveExecutableCommandLookupStrategy.this.outputFactoryResolver, codec);
+
+            return new ReactiveCommandSegmentCommandFactory(commandSegments, commandMethod, codec, outputFactoryResolver);
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java
index 48e0b7f539..f5b79ac79e 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,6 @@
 
 import org.reactivestreams.Publisher;
 
-import com.lambdaworks.redis.dynamic.ReactiveTypes.ReactiveLibrary;
-import com.lambdaworks.redis.internal.LettuceAssert;
-
-import io.reactivex.BackpressureStrategy;
-import io.reactivex.Flowable;
-import io.reactivex.Maybe;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import rx.Completable;
@@ -33,8 +27,16 @@
 import rx.Single;
 import rx.internal.reactivestreams.PublisherAdapter;
 
+import com.lambdaworks.redis.dynamic.ReactiveTypes.ReactiveLibrary;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+import io.reactivex.BackpressureStrategy;
+import io.reactivex.Flowable;
+import io.reactivex.Maybe;
+
 /**
  * @author Mark Paluch
+ * @since 5.0
  */
 class ReactiveTypeAdapters {
 
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
index aa69f0d7ac..44f87059a9 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
@@ -16,42 +16,27 @@
 package com.lambdaworks.redis.dynamic;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
+import java.util.*;
+
+import org.springframework.util.Assert;
 
 import com.lambdaworks.redis.AbstractRedisReactiveCommands;
-import com.lambdaworks.redis.LettuceFutures;
-import com.lambdaworks.redis.RedisFuture;
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.BaseRedisAsyncCommands;
-import com.lambdaworks.redis.api.reactive.BaseRedisReactiveCommands;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.dynamic.codec.AnnotationRedisCodecResolver;
-import com.lambdaworks.redis.dynamic.domain.Timeout;
 import com.lambdaworks.redis.dynamic.intercept.InvocationProxyFactory;
 import com.lambdaworks.redis.dynamic.intercept.MethodInterceptor;
 import com.lambdaworks.redis.dynamic.intercept.MethodInvocation;
-import com.lambdaworks.redis.dynamic.output.CodecAwareOutputFactoryResolver;
 import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
 import com.lambdaworks.redis.dynamic.output.OutputRegistry;
 import com.lambdaworks.redis.dynamic.output.OutputRegistryCommandOutputFactoryResolver;
-import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
-import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory;
-import com.lambdaworks.redis.dynamic.segment.CommandSegments;
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.internal.LettuceLists;
 import com.lambdaworks.redis.models.command.CommandDetail;
 import com.lambdaworks.redis.models.command.CommandDetailParser;
-import com.lambdaworks.redis.output.CommandOutput;
-import com.lambdaworks.redis.protocol.CommandArgs;
 import com.lambdaworks.redis.protocol.LettuceCharsets;
 import com.lambdaworks.redis.protocol.RedisCommand;
 
@@ -98,7 +83,7 @@ public interface MyRedisCommands {
 public class RedisCommandFactory {
 
     private final StatefulConnection<?, ?> connection;
-    private final CommandMethodVerifier commandMethodVerifier;
+    private final DefaultCommandMethodVerifier commandMethodVerifier;
     private final List<RedisCodec<?, ?>> redisCodecs = new ArrayList<>();
 
     private CommandOutputFactoryResolver commandOutputFactoryResolver = new OutputRegistryCommandOutputFactoryResolver(
@@ -121,7 +106,7 @@ public RedisCommandFactory(StatefulConnection<?, ?> connection) {
      * @param connection must not be {@literal null}.
      * @param redisCodecs must not be {@literal null}.
      */
-    public RedisCommandFactory(StatefulConnection<?, ?> connection, Iterable<RedisCodec<?, ?>> redisCodecs) {
+    public RedisCommandFactory(StatefulConnection<?, ?> connection, Iterable<? extends RedisCodec<?, ?>> redisCodecs) {
 
         LettuceAssert.notNull(connection, "Redis Connection must not be null");
         LettuceAssert.notNull(redisCodecs, "Iterable of RedisCodec must not be null");
@@ -129,7 +114,7 @@ public RedisCommandFactory(StatefulConnection<?, ?> connection, Iterable<RedisCo
         this.connection = connection;
         this.redisCodecs.addAll(LettuceLists.newList(redisCodecs));
 
-        commandMethodVerifier = new CommandMethodVerifier(getCommands(connection));
+        commandMethodVerifier = new DefaultCommandMethodVerifier(getCommands(connection));
     }
 
     @SuppressWarnings("unchecked")
@@ -174,7 +159,7 @@ public void setVerifyCommandMethods(boolean verifyCommandMethods) {
     }
 
     /**
-     * Returns a Redis Command instance for the given interface.
+     * Returns a Redis Commands interface instance for the given interface.
      * 
      * @param commandInterface must not be {@literal null}.
      * @param <T> command interface type.
@@ -189,16 +174,9 @@ public <T extends Commands> T getCommands(Class<T> commandInterface) {
         InvocationProxyFactory factory = new InvocationProxyFactory();
         factory.addInterface(commandInterface);
 
-        if (connection instanceof StatefulRedisConnection<?, ?>) {
-
-            StatefulRedisConnection<?, ?> redisConnection = (StatefulRedisConnection<?, ?>) connection;
-
-            factory.addInterceptor(
-                    new ReactiveCommandFactoryExecutorMethodInterceptor(redisCommandsMetadata, redisConnection.reactive()));
-
-            factory.addInterceptor(new CommandFactoryExecutorMethodInterceptor(redisCommandsMetadata, redisConnection.async()));
-        }
+        CompositeCommandLookupStrategy lookupStrategy = new CompositeCommandLookupStrategy();
 
+        factory.addInterceptor(new CommandFactoryExecutorMethodInterceptor(redisCommandsMetadata, lookupStrategy));
         return factory.createProxy(commandInterface.getClassLoader());
     }
 
@@ -210,28 +188,18 @@ public <T extends Commands> T getCommands(Class<T> commandInterface) {
      */
     class CommandFactoryExecutorMethodInterceptor implements MethodInterceptor {
 
-        private final Map<Method, CommandFactory> commandFactories = new ConcurrentHashMap<>();
-        private final BaseRedisAsyncCommands<?, ?> redisAsyncCommands;
+        private final Map<Method, ExecutableCommand> commandMethods = new HashMap<>();
 
-        public CommandFactoryExecutorMethodInterceptor(RedisCommandsMetadata redisCommandsMetadata,
-                BaseRedisAsyncCommands<?, ?> redisAsyncCommands) {
-
-            RedisCommandFactoryResolver lookupStrategy = new DefaultRedisCommandFactoryResolver(redisCodecs);
+        CommandFactoryExecutorMethodInterceptor(RedisCommandsMetadata redisCommandsMetadata,
+                ExecutableCommandLookupStrategy strategy) {
 
             for (Method method : redisCommandsMetadata.getMethods()) {
 
-                if (ReactiveTypes.supports(method.getReturnType())) {
-                    continue;
-                }
-
-                CommandFactory commandFactory = lookupStrategy.resolveRedisCommandFactory(method, redisCommandsMetadata);
-                commandFactories.put(method, commandFactory);
+                ExecutableCommand executableCommand = strategy.resolveCommandMethod(method, redisCommandsMetadata);
+                commandMethods.put(method, executableCommand);
             }
-
-            this.redisAsyncCommands = redisAsyncCommands;
         }
 
-        @SuppressWarnings("unchecked")
         @Override
         public Object invoke(MethodInvocation invocation) throws Throwable {
 
@@ -240,196 +208,53 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
 
             if (hasFactoryFor(method)) {
 
-                CommandMethod commandMethod = new CommandMethod(method);
-                CommandFactory commandFactory = commandFactories.get(method);
-                RedisCommand<?, ?, ?> command = commandFactory.createCommand(arguments);
-
-                if (commandMethod.isFutureExecution()) {
-                    return redisAsyncCommands.dispatch(command.getType(), (CommandOutput) command.getOutput(),
-                            (CommandArgs) command.getArgs());
-                }
-
-                RedisFuture dispatch = redisAsyncCommands.dispatch(command.getType(), (CommandOutput) command.getOutput(),
-                        (CommandArgs) command.getArgs());
-
-                long timeout = connection.getTimeout();
-                TimeUnit unit = connection.getTimeoutUnit();
-
-                if (commandMethod.getParameters() instanceof ExecutionSpecificParameters) {
-                    ExecutionSpecificParameters executionSpecificParameters = (ExecutionSpecificParameters) commandMethod
-                            .getParameters();
-
-                    if (executionSpecificParameters.hasTimeoutIndex()) {
-                        Timeout timeoutArg = (Timeout) arguments[executionSpecificParameters.getTimeoutIndex()];
-                        if (timeoutArg != null) {
-                            timeout = timeoutArg.getTimeout();
-                            unit = timeoutArg.getTimeUnit();
-                        }
-                    }
-                }
-
-                LettuceFutures.awaitAll(timeout, unit, dispatch);
-
-                return dispatch.get();
+                ExecutableCommand executableCommand = commandMethods.get(method);
+                return executableCommand.execute(arguments);
             }
 
             return invocation.proceed();
         }
 
         private boolean hasFactoryFor(Method method) {
-            return commandFactories.containsKey(method);
+            return commandMethods.containsKey(method);
         }
     }
 
-    /**
-     * {@link CommandFactory}-based {@link MethodInterceptor} to create and invoke Redis Commands using reactive execution.
-     *
-     * @author Mark Paluch
-     */
-    class ReactiveCommandFactoryExecutorMethodInterceptor implements MethodInterceptor {
-
-        private final Map<Method, ReactiveCommandSegmentCommandFactory> commandFactories = new ConcurrentHashMap<>();
-        private final AbstractRedisReactiveCommands<?, ?> redisReactiveCommands;
-        private final ConversionService conversionService = new ConversionService();
+    class CompositeCommandLookupStrategy implements ExecutableCommandLookupStrategy {
 
-        public ReactiveCommandFactoryExecutorMethodInterceptor(RedisCommandsMetadata redisCommandsMetadata,
-                BaseRedisReactiveCommands<?, ?> redisReactiveCommands) {
+        private final AsyncExecutableCommandLookupStrategy async;
+        private final ReactiveExecutableCommandLookupStrategy reactive;
 
-            ReactiveTypeAdapters.registerIn(this.conversionService);
-            ReactiveRedisCommandFactoryResolver lookupStrategy = new ReactiveRedisCommandFactoryResolver(redisCodecs);
+        CompositeCommandLookupStrategy() {
 
-            for (Method method : redisCommandsMetadata.getMethods()) {
-
-                if (ReactiveTypes.supports(method.getReturnType())) {
+            CommandMethodVerifier verifier = verifyCommandMethods ? commandMethodVerifier : CommandMethodVerifier.NONE;
 
-                    ReactiveCommandSegmentCommandFactory commandFactory = lookupStrategy.resolveRedisCommandFactory(method,
-                            redisCommandsMetadata);
-                    commandFactories.put(method, commandFactory);
-                }
+            AbstractRedisReactiveCommands reactive = null;
+            if (connection instanceof StatefulRedisConnection) {
+                reactive = (AbstractRedisReactiveCommands) ((StatefulRedisConnection) connection).reactive();
             }
 
-            this.redisReactiveCommands = (AbstractRedisReactiveCommands) redisReactiveCommands;
-        }
-
-        @Override
-        public Object invoke(MethodInvocation invocation) throws Throwable {
-
-            Method method = invocation.getMethod();
-            Object[] arguments = invocation.getArguments();
-
-            if (hasFactoryFor(method)) {
-
-                ReactiveCommandSegmentCommandFactory commandFactory = commandFactories.get(method);
-
-                Object result = dispatch(method, arguments, commandFactory);
-
-                if (method.getReturnType().isAssignableFrom(result.getClass())) {
-                    return result;
-                }
-
-                return conversionService.convert(result, method.getReturnType());
+            if (connection instanceof StatefulRedisClusterConnection) {
+                reactive = (AbstractRedisReactiveCommands) ((StatefulRedisClusterConnection) connection).reactive();
             }
 
-            return invocation.proceed();
-        }
+            Assert.state(reactive != null, "Reactive commands is null");
 
-        protected Object dispatch(Method method, Object[] arguments, ReactiveCommandSegmentCommandFactory commandFactory) {
-            if (ReactiveTypes.isSingleValueType(method.getReturnType())) {
-                return redisReactiveCommands.createMono(() -> commandFactory.createCommand(arguments));
-            }
-
-            if (commandFactory.isStreamingExecution()) {
-                return redisReactiveCommands.createDissolvingFlux(() -> commandFactory.createCommand(arguments));
-            }
+            this.async = new AsyncExecutableCommandLookupStrategy(redisCodecs, commandOutputFactoryResolver, verifier,
+                    (StatefulConnection) connection);
 
-            return redisReactiveCommands.createFlux(() -> commandFactory.createCommand(arguments));
-        }
-
-        private boolean hasFactoryFor(Method method) {
-            return commandFactories.containsKey(method);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    class DefaultRedisCommandFactoryResolver implements RedisCommandFactoryResolver {
-
-        final AnnotationCommandSegmentFactory commandSegmentFactory = new AnnotationCommandSegmentFactory();
-        final AnnotationRedisCodecResolver codecResolver;
-
-        DefaultRedisCommandFactoryResolver(List<RedisCodec<?, ?>> redisCodecs) {
-            codecResolver = new AnnotationRedisCodecResolver(redisCodecs);
+            this.reactive = new ReactiveExecutableCommandLookupStrategy(redisCodecs, commandOutputFactoryResolver, verifier,
+                    reactive);
         }
 
         @Override
-        public CommandFactory resolveRedisCommandFactory(Method method, RedisCommandsMetadata redisCommandsMetadata) {
-
-            CommandMethod commandMethod = new CommandMethod(method);
+        public ExecutableCommand resolveCommandMethod(Method method, RedisCommandsMetadata commandsMetadata) {
 
-            RedisCodec<?, ?> codec = codecResolver.resolve(commandMethod);
-
-            if (codec == null) {
-                throw new CommandCreationException(commandMethod, "Cannot resolve codec.");
-            }
-
-            CodecAwareOutputFactoryResolver outputFactoryResolver = new CodecAwareOutputFactoryResolver(
-                    commandOutputFactoryResolver, codec);
-            CommandSegments commandSegments = commandSegmentFactory.createCommandSegments(commandMethod);
-
-            if (verifyCommandMethods) {
-                commandMethodVerifier.validate(commandSegments, commandMethod);
-            }
-
-            if (commandMethod.isReactiveExecution()) {
-
-                return new ReactiveCommandSegmentCommandFactory(commandSegments, commandMethod, (RedisCodec) codec,
-                        outputFactoryResolver);
+            if (ReactiveTypes.supports(method.getReturnType())) {
+                return reactive.resolveCommandMethod(method, commandsMetadata);
             }
 
-            return new CommandSegmentCommandFactory<>(commandSegments, commandMethod, (RedisCodec) codec,
-                    outputFactoryResolver);
+            return async.resolveCommandMethod(method, commandsMetadata);
         }
     }
-
-    class ReactiveRedisCommandFactoryResolver implements RedisCommandFactoryResolver {
-
-        final AnnotationCommandSegmentFactory commandSegmentFactory = new AnnotationCommandSegmentFactory();
-        final AnnotationRedisCodecResolver codecResolver;
-
-        ReactiveRedisCommandFactoryResolver(List<RedisCodec<?, ?>> redisCodecs) {
-            codecResolver = new AnnotationRedisCodecResolver(redisCodecs);
-        }
-
-        @Override
-        public ReactiveCommandSegmentCommandFactory resolveRedisCommandFactory(Method method,
-                RedisCommandsMetadata redisCommandsMetadata) {
-
-            CommandMethod commandMethod = new CommandMethod(method);
-
-            RedisCodec<?, ?> codec = codecResolver.resolve(commandMethod);
-
-            if (codec == null) {
-                throw new CommandCreationException(commandMethod, "Cannot resolve codec.");
-            }
-
-            CommandSegments commandSegments = commandSegmentFactory.createCommandSegments(commandMethod);
-
-            if (verifyCommandMethods) {
-                commandMethodVerifier.validate(commandSegments, commandMethod);
-            }
-
-            CodecAwareOutputFactoryResolver outputFactoryResolver = new CodecAwareOutputFactoryResolver(
-                    commandOutputFactoryResolver, codec);
-
-            return new ReactiveCommandSegmentCommandFactory(commandSegments, commandMethod, (RedisCodec) codec,
-                    outputFactoryResolver);
-        }
-    }
-
-    /**
-     * Strategy interface to resolve a {@link CommandFactory}.
-     */
-    interface RedisCommandFactoryResolver {
-
-        CommandFactory resolveRedisCommandFactory(Method method, RedisCommandsMetadata redisCommandsMetadata);
-    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java b/src/test/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifierTest.java
similarity index 94%
rename from src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java
rename to src/test/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifierTest.java
index 4e5b7f261c..2dc6b46f04 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodVerifierTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,9 +35,9 @@
 /**
  * @author Mark Paluch
  */
-public class CommandMethodVerifierTest {
+public class DefaultCommandMethodVerifierTest {
 
-    private CommandMethodVerifier sut;
+    private DefaultCommandMethodVerifier sut;
 
     @Before
     public void before() {
@@ -48,7 +48,7 @@ public void before() {
         CommandDetail set = new CommandDetail("set", 3, null, 0, 0, 0);
         CommandDetail geoadd = new CommandDetail("geoadd", -4, null, 0, 0, 0);
 
-        sut = new CommandMethodVerifier(LettuceLists.newList(mget, randomkey, rpop, set, geoadd));
+        sut = new DefaultCommandMethodVerifier(LettuceLists.newList(mget, randomkey, rpop, set, geoadd));
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
index 80b02d39d6..4709630a20 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,8 +75,8 @@ public void commandCreationWithTimeoutShouldFail() {
         AnnotationCommandSegmentFactory segmentFactory = new AnnotationCommandSegmentFactory();
         CommandSegments commandSegments = segmentFactory.createCommandSegments(commandMethod);
 
-        ReactiveCommandSegmentCommandFactory<String, String> factory = new ReactiveCommandSegmentCommandFactory<>(
-                commandSegments, commandMethod, new StringCodec(), outputFactoryResolver);
+        ReactiveCommandSegmentCommandFactory factory = new ReactiveCommandSegmentCommandFactory(commandSegments, commandMethod,
+                new StringCodec(), outputFactoryResolver);
 
         return factory.createCommand(null);
     }
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsClusterSyncTest.java b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsClusterSyncTest.java
new file mode 100644
index 0000000000..8b72d28099
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsClusterSyncTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.*;
+
+import com.lambdaworks.TestClientResources;
+import com.lambdaworks.redis.AbstractTest;
+import com.lambdaworks.redis.FastShutdown;
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.cluster.ClusterRule;
+import com.lambdaworks.redis.cluster.RedisClusterClient;
+import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
+import com.lambdaworks.redis.dynamic.annotation.Command;
+import com.lambdaworks.redis.dynamic.domain.Timeout;
+import com.lambdaworks.redis.internal.LettuceLists;
+
+/**
+ * @author Mark Paluch
+ */
+public class RedisCommandsClusterSyncTest extends AbstractTest {
+
+    public static final int port1 = 7379;
+    public static final int port2 = port1 + 1;
+    public static final int port3 = port1 + 2;
+    public static final int port4 = port1 + 3;
+
+    protected static RedisClusterClient clusterClient;
+
+    @Rule
+    public ClusterRule clusterRule = new ClusterRule(clusterClient, port1, port2, port3, port4);
+
+    private StatefulRedisClusterConnection<String, String> connection;
+
+    @BeforeClass
+    public static void setupClusterClient() {
+        clusterClient = RedisClusterClient.create(TestClientResources.get(),
+                LettuceLists.unmodifiableList(RedisURI.Builder.redis(host, port1).build()));
+    }
+
+    @AfterClass
+    public static void shutdownClusterClient() {
+        FastShutdown.shutdown(clusterClient);
+    }
+
+    @Before
+    public void before() {
+        connection = clusterClient.connect();
+    }
+
+    @After
+    public void tearDown() {
+        connection.close();
+    }
+
+    @Test
+    public void sync() {
+
+        RedisCommandFactory factory = new RedisCommandFactory(connection);
+
+        SynchronousCommands api = factory.getCommands(SynchronousCommands.class);
+
+        api.setSync(key, value, Timeout.create(10, TimeUnit.SECONDS));
+        assertThat(api.get("key")).isEqualTo("value");
+        assertThat(api.getAsBytes("key")).isEqualTo("value".getBytes());
+    }
+
+    @Test
+    public void mgetAsValues() {
+
+        connection.sync().set(key, value);
+
+        RedisCommandFactory factory = new RedisCommandFactory(connection);
+
+        SynchronousCommands api = factory.getCommands(SynchronousCommands.class);
+
+        List<Value<String>> values = api.mgetAsValues(key);
+        assertThat(values).hasSize(1);
+        assertThat(values.get(0)).isEqualTo(Value.just(value));
+    }
+
+    static interface SynchronousCommands extends Commands {
+
+        String get(String key);
+
+        @Command("GET")
+        byte[] getAsBytes(String key);
+
+        @Command("SET")
+        String setSync(String key, String value, Timeout timeout);
+
+        @Command("MGET")
+        List<Value<String>> mgetAsValues(String... keys);
+    }
+
+}

From 05ce141543f7526e44703913cd0b7d3e24787cbf Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 2 Feb 2017 15:20:20 +0100
Subject: [PATCH 136/808] Dynamic API: Support command batching #432
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lettuce now supports command batching for dynamic command interfaces. Command batching executes commands in a deferred nature. This also means that at the time of invocation no result is available. Batching can be only used with synchronous methods without a return value, void or asynchronous methods returning a RedisFuture. Reactive command batching is not supported because reactive executed commands maintain an own subscription lifecycle that is decoupled from command method batching.

Command errors that occur during batching cause a BatchException that contains the failed commands.

@BatchSize(50)
interface MyCommands extends Commands {

  void set(String key, String value);

  Future<String> get(String key);

  void set(String key, String value, CommandBatching flush);
}

MyCommands commands = …

commands.set("key", "value");
commands.set("key", "value", CommandBatching.flush());
---
 .../AsyncExecutableCommandLookupStrategy.java |  57 +----
 .../redis/dynamic/BatchExecutableCommand.java | 117 ++++++++++
 .../BatchExecutableCommandLookupStrategy.java |  98 ++++++++
 .../lambdaworks/redis/dynamic/BatchTasks.java |  48 ++++
 .../lambdaworks/redis/dynamic/Batcher.java    |  54 +++++
 .../redis/dynamic/CommandFactoryResolver.java |   4 +-
 .../redis/dynamic/CommandMethod.java          | 143 ++----------
 .../redis/dynamic/CommandMethodVerifier.java  |   3 +
 .../redis/dynamic/DeclaredCommandMethod.java  | 215 ++++++++++++++++++
 .../dynamic/DefaultRedisCommandsMetadata.java |  15 ++
 .../ExecutableCommandLookupStrategy.java      |   4 +-
 ...xecutableCommandLookupStrategySupport.java |  79 +++++++
 ...activeExecutableCommandLookupStrategy.java |  14 +-
 .../redis/dynamic/RedisCommandFactory.java    |  68 +++++-
 .../redis/dynamic/RedisCommandsMetadata.java  |  17 +-
 .../redis/dynamic/SimpleBatcher.java          | 172 ++++++++++++++
 .../redis/dynamic/batch/BatchException.java   |  55 +++++
 .../redis/dynamic/batch/BatchExecutor.java    |  38 ++++
 .../redis/dynamic/batch/BatchSize.java        |  67 ++++++
 .../redis/dynamic/batch/CommandBatching.java  | 103 +++++++++
 .../ExecutionSpecificParameters.java          |  35 ++-
 ...chExecutableCommandLookupStrategyTest.java | 104 +++++++++
 .../CommandSegmentCommandFactoryTest.java     |   2 +-
 ...st.java => DeclaredCommandMethodTest.java} |   8 +-
 .../DefaultCommandMethodVerifierTest.java     |   2 +-
 .../redis/dynamic/ParameterBinderTest.java    |   6 +-
 ...ctiveCommandSegmentCommandFactoryTest.java |   2 +-
 .../dynamic/RedisCommandsBatchingTest.java    | 197 ++++++++++++++++
 .../redis/dynamic/SimpleBatcherTest.java      | 146 ++++++++++++
 .../AnnotationRedisCodecResolverTest.java     |   6 +-
 .../output/CodecAwareOutputResolverTest.java  |   3 +-
 ...istryCommandOutputFactoryResolverTest.java |   4 +-
 .../AnnotationCommandSegmentFactoryTest.java  |  21 +-
 33 files changed, 1688 insertions(+), 219 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommand.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategy.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/BatchTasks.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/Batcher.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethod.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategySupport.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/SimpleBatcher.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/batch/BatchException.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/batch/BatchExecutor.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/batch/BatchSize.java
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/batch/CommandBatching.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategyTest.java
 rename src/test/java/com/lambdaworks/redis/dynamic/{CommandMethodTest.java => DeclaredCommandMethodTest.java} (86%)
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsBatchingTest.java
 create mode 100644 src/test/java/com/lambdaworks/redis/dynamic/SimpleBatcherTest.java

diff --git a/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommandLookupStrategy.java b/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommandLookupStrategy.java
index f940808b28..a1080c5a2a 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommandLookupStrategy.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommandLookupStrategy.java
@@ -15,28 +15,18 @@
  */
 package com.lambdaworks.redis.dynamic;
 
-import java.lang.reflect.Method;
 import java.util.List;
 
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.dynamic.codec.AnnotationRedisCodecResolver;
-import com.lambdaworks.redis.dynamic.output.CodecAwareOutputFactoryResolver;
 import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
-import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory;
-import com.lambdaworks.redis.dynamic.segment.CommandSegments;
 import com.lambdaworks.redis.internal.LettuceAssert;
 
 /**
  * @author Mark Paluch
  * @since 5.0
  */
-class AsyncExecutableCommandLookupStrategy implements ExecutableCommandLookupStrategy {
-
-    private final List<RedisCodec<?, ?>> redisCodecs;
-    private final CommandOutputFactoryResolver commandOutputFactoryResolver;
-    private final DefaultCommandFactoryResolver commandFactoryResolver;
-    private final CommandMethodVerifier commandMethodVerifier;
+class AsyncExecutableCommandLookupStrategy extends ExecutableCommandLookupStrategySupport {
 
     private final StatefulConnection<Object, Object> connection;
 
@@ -44,53 +34,18 @@ public AsyncExecutableCommandLookupStrategy(List<RedisCodec<?, ?>> redisCodecs,
             CommandOutputFactoryResolver commandOutputFactoryResolver, CommandMethodVerifier commandMethodVerifier,
             StatefulConnection<Object, Object> connection) {
 
-        this.redisCodecs = redisCodecs;
-        this.commandOutputFactoryResolver = commandOutputFactoryResolver;
-        this.commandMethodVerifier = commandMethodVerifier;
+        super(redisCodecs, commandOutputFactoryResolver, commandMethodVerifier);
         this.connection = connection;
-
-        this.commandFactoryResolver = new DefaultCommandFactoryResolver();
     }
 
     @Override
-    public ExecutableCommand resolveCommandMethod(Method method, RedisCommandsMetadata commandsMetadata) {
+    public ExecutableCommand resolveCommandMethod(CommandMethod method, RedisCommandsMetadata metadata) {
 
-        CommandMethod commandMethod = new CommandMethod(method);
-
-        LettuceAssert.isTrue(!commandMethod.isReactiveExecution(),
+        LettuceAssert.isTrue(!method.isReactiveExecution(),
                 String.format("Command method %s not supported by this command lookup strategy", method));
 
-        CommandFactory commandFactory = commandFactoryResolver.resolveRedisCommandFactory(commandMethod, commandsMetadata);
-
-        return new AsyncExecutableCommand(commandMethod, commandFactory, connection);
-    }
-
-    @SuppressWarnings("unchecked")
-    class DefaultCommandFactoryResolver implements CommandFactoryResolver {
-
-        final AnnotationCommandSegmentFactory commandSegmentFactory = new AnnotationCommandSegmentFactory();
-        final AnnotationRedisCodecResolver codecResolver;
-
-        DefaultCommandFactoryResolver() {
-            codecResolver = new AnnotationRedisCodecResolver(redisCodecs);
-        }
-
-        @Override
-        public CommandFactory resolveRedisCommandFactory(CommandMethod commandMethod, RedisCommandsMetadata commandsMetadata) {
-
-            RedisCodec<?, ?> codec = codecResolver.resolve(commandMethod);
-
-            if (codec == null) {
-                throw new CommandCreationException(commandMethod, "Cannot resolve RedisCodec");
-            }
-
-            CodecAwareOutputFactoryResolver outputFactoryResolver = new CodecAwareOutputFactoryResolver(
-                    commandOutputFactoryResolver, codec);
-            CommandSegments commandSegments = commandSegmentFactory.createCommandSegments(commandMethod);
-
-            commandMethodVerifier.validate(commandSegments, commandMethod);
+        CommandFactory commandFactory = super.resolveCommandFactory(method, metadata);
 
-            return new CommandSegmentCommandFactory(commandSegments, commandMethod, codec, outputFactoryResolver);
-        }
+        return new AsyncExecutableCommand(method, commandFactory, connection);
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommand.java b/src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommand.java
new file mode 100644
index 0000000000..7b42047a6f
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommand.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import com.lambdaworks.redis.LettuceFutures;
+import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.api.StatefulConnection;
+import com.lambdaworks.redis.dynamic.batch.BatchException;
+import com.lambdaworks.redis.dynamic.batch.CommandBatching;
+import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
+import com.lambdaworks.redis.protocol.AsyncCommand;
+import com.lambdaworks.redis.protocol.RedisCommand;
+
+/**
+ * Executable command that uses a {@link Batcher} for command execution.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class BatchExecutableCommand implements ExecutableCommand {
+
+    private final CommandMethod commandMethod;
+    private final CommandFactory commandFactory;
+    private final Batcher batcher;
+    private final StatefulConnection<Object, Object> connection;
+    private final ExecutionSpecificParameters parameters;
+    private final boolean async;
+
+    BatchExecutableCommand(CommandMethod commandMethod, CommandFactory commandFactory, Batcher batcher,
+            StatefulConnection<Object, Object> connection) {
+
+        this.commandMethod = commandMethod;
+        this.commandFactory = commandFactory;
+        this.batcher = batcher;
+        this.parameters = (ExecutionSpecificParameters) commandMethod.getParameters();
+        this.async = commandMethod.isFutureExecution();
+        this.connection = connection;
+    }
+
+    @Override
+    public Object execute(Object[] parameters) throws ExecutionException, InterruptedException {
+
+        RedisCommand<Object, Object, Object> command = commandFactory.createCommand(parameters);
+
+        CommandBatching batching = null;
+        if (this.parameters.hasCommandBatchingIndex()) {
+            batching = (CommandBatching) parameters[this.parameters.getCommandBatchingIndex()];
+        }
+
+        AsyncCommand<Object, Object, Object> asyncCommand = new AsyncCommand<>(command);
+
+        if (async) {
+            batcher.batch(asyncCommand, batching);
+            return asyncCommand;
+        }
+
+        BatchTasks batchTasks = batcher.batch(asyncCommand, batching);
+
+        return synchronize(batchTasks, connection);
+    }
+
+    protected static Object synchronize(BatchTasks batchTasks, StatefulConnection<Object, Object> connection) {
+
+        if (batchTasks == BatchTasks.EMPTY) {
+            return null;
+        }
+
+        long timeout = connection.getTimeout();
+        TimeUnit unit = connection.getTimeoutUnit();
+
+        BatchException exception = null;
+        List<RedisCommand<?, ?, ?>> failures = null;
+        for (RedisCommand<?, ?, ?> batchTask : batchTasks) {
+
+            try {
+                LettuceFutures.awaitAll(timeout, unit, (RedisFuture) batchTask);
+            } catch (Exception e) {
+                if (exception == null) {
+                    failures = new ArrayList<>();
+                    exception = new BatchException(failures);
+                }
+
+                failures.add(batchTask);
+                exception.addSuppressed(e);
+            }
+        }
+
+        if (exception != null) {
+            throw exception;
+        }
+
+        return null;
+    }
+
+    @Override
+    public CommandMethod getCommandMethod() {
+        return commandMethod;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategy.java b/src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategy.java
new file mode 100644
index 0000000000..b058c3112c
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategy.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+
+import com.lambdaworks.redis.api.StatefulConnection;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.dynamic.batch.BatchExecutor;
+import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
+import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class BatchExecutableCommandLookupStrategy extends ExecutableCommandLookupStrategySupport {
+
+    private final Set<Class<?>> SYNCHRONOUS_RETURN_TYPES = new HashSet<Class<?>>(Arrays.asList(Void.class, Void.TYPE));
+
+    private final Batcher batcher;
+    private final StatefulConnection<Object, Object> connection;
+
+    public BatchExecutableCommandLookupStrategy(List<RedisCodec<?, ?>> redisCodecs,
+            CommandOutputFactoryResolver commandOutputFactoryResolver, CommandMethodVerifier commandMethodVerifier,
+            Batcher batcher, StatefulConnection<Object, Object> connection) {
+
+        super(redisCodecs, commandOutputFactoryResolver, commandMethodVerifier);
+        this.batcher = batcher;
+        this.connection = connection;
+    }
+
+    public static boolean supports(CommandMethod method) {
+        return method.isBatchExecution() || isForceFlush(method);
+    }
+
+    private static boolean isForceFlush(CommandMethod method) {
+        return method.getName().equals("flush") && method.getMethod().getDeclaringClass().equals(BatchExecutor.class);
+    }
+
+    @Override
+    public ExecutableCommand resolveCommandMethod(CommandMethod method, RedisCommandsMetadata metadata) {
+
+        LettuceAssert.isTrue(!method.isReactiveExecution(),
+                String.format("Command method %s not supported by this command lookup strategy", method));
+
+        ExecutionSpecificParameters parameters = (ExecutionSpecificParameters) method.getParameters();
+
+        if (parameters.hasTimeoutIndex()) {
+            throw new IllegalArgumentException(String.format(
+                    "Timeout and batching is not supported, offending command method %s ", method));
+        }
+
+        if (isForceFlush(method)) {
+
+            return new ExecutableCommand() {
+
+                @Override
+                public Object execute(Object[] parameters) throws ExecutionException, InterruptedException {
+                    BatchExecutableCommand.synchronize(batcher.flush(), connection);
+                    return null;
+                }
+
+                @Override
+                public CommandMethod getCommandMethod() {
+                    return method;
+                }
+            };
+        }
+
+        if (method.isFutureExecution() || SYNCHRONOUS_RETURN_TYPES.contains(method.getReturnType().getRawClass())) {
+
+            CommandFactory commandFactory = super.resolveCommandFactory(method, metadata);
+            return new BatchExecutableCommand(method, commandFactory, batcher, connection);
+        }
+
+        throw new IllegalArgumentException(String.format(
+                "Batching command method %s must declare either a Future or void return type", method));
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/BatchTasks.java b/src/main/java/com/lambdaworks/redis/dynamic/BatchTasks.java
new file mode 100644
index 0000000000..b5feb7cb39
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/BatchTasks.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import com.lambdaworks.redis.protocol.RedisCommand;
+
+/**
+ * Result of a batching request. Contains references to the batched {@link RedisCommand}s.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class BatchTasks implements Iterable<RedisCommand<?, ?, ?>> {
+
+    public final static BatchTasks EMPTY = new BatchTasks(Collections.emptyList());
+
+    private final List<RedisCommand<?, ?, ?>> futures;
+
+    BatchTasks(List<RedisCommand<?, ?, ?>> futures) {
+        this.futures = futures;
+    }
+
+    @Override
+    public Iterator<RedisCommand<?, ?, ?>> iterator() {
+        return futures.iterator();
+    }
+
+    public RedisCommand<?, ?, ?>[] toArray() {
+        return futures.toArray(new RedisCommand[futures.size()]);
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/Batcher.java b/src/main/java/com/lambdaworks/redis/dynamic/Batcher.java
new file mode 100644
index 0000000000..29abaae6eb
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/Batcher.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import com.lambdaworks.redis.dynamic.batch.CommandBatching;
+import com.lambdaworks.redis.protocol.RedisCommand;
+
+/**
+ * Command batcher to enqueue commands and flush a batch once a flush is requested or a configured command threshold is reached.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ * @see SimpleBatcher
+ */
+public interface Batcher {
+
+    /**
+     * Batcher that does not support batching.
+     */
+    Batcher NONE = (command, batching) -> {
+        throw new UnsupportedOperationException();
+    };
+
+    /**
+     * Add command to the {@link Batcher}.
+     * 
+     * @param command the command to batch.
+     * @param batching invocation-specific {@link CommandBatching} control. May be {@literal null} to use default batching
+     *        settings.
+     * @return result of the batching. Either an {@link BatchTasks#EMPTY empty} result or a result containing the batched
+     *         commands.
+     */
+    BatchTasks batch(RedisCommand<Object, Object, Object> command, CommandBatching batching);
+
+    /**
+     * Force-flush the batch. Has no effect if the queue is empty.
+     */
+    default BatchTasks flush() {
+        return BatchTasks.EMPTY;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandFactoryResolver.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandFactoryResolver.java
index 09a35af1de..c97e3bbf56 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandFactoryResolver.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandFactoryResolver.java
@@ -17,11 +17,13 @@
 
 /**
  * Strategy interface to resolve a {@link CommandFactory}.
+ * 
+ * @since 5.0
  */
 interface CommandFactoryResolver {
 
     /**
-     * Resolve a {@link CommandFactory} given a{@link CommandMethod} and {@link RedisCommandsMetadata}.
+     * Resolve a {@link CommandFactory} given a{@link DeclaredCommandMethod} and {@link RedisCommandsMetadata}.
      * 
      * @param method must not be {@literal null}.
      * @param redisCommandsMetadata must not be {@literal null}.
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
index c0fcbd28cc..914ef05765 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,19 +17,11 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import java.util.concurrent.Future;
 
-import org.reactivestreams.Publisher;
-
-import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
 import com.lambdaworks.redis.dynamic.parameter.Parameter;
 import com.lambdaworks.redis.dynamic.parameter.Parameters;
 import com.lambdaworks.redis.dynamic.support.ResolvableType;
-import com.lambdaworks.redis.dynamic.support.TypeInformation;
-import com.lambdaworks.redis.internal.LettuceAssert;
 
 /**
  * Abstraction of a method that is designated to execute a Redis command method. Enriches the standard {@link Method} interface
@@ -38,86 +30,27 @@
  * @author Mark Paluch
  * @since 5.0
  */
-public class CommandMethod {
-
-    private final Method method;
-    private final ResolvableType returnType;
-    private final List<Class<?>> arguments = new ArrayList<>();
-    private final Parameters<? extends Parameter> parameters;
-    private final ResolvableType actualReturnType;
-
-    /**
-     * Create a new {@link CommandMethod} given a {@link Method}.
-     * 
-     * @param method must not be null.
-     */
-    public CommandMethod(Method method) {
-        this(method, new ExecutionSpecificParameters(method));
-    }
-
-    /**
-     * Create a new {@link CommandMethod} given a {@link Method} and {@link Parameters}.
-     * 
-     * @param method must not be null.
-     * @param parameters must not be null.
-     */
-    public CommandMethod(Method method, Parameters<?> parameters) {
-
-        LettuceAssert.notNull(method, "Method must not be null");
-        LettuceAssert.notNull(parameters, "Parameters must not be null");
-
-        this.method = method;
-        this.returnType = ResolvableType.forMethodReturnType(method);
-        this.parameters = parameters;
-        Collections.addAll(arguments, method.getParameterTypes());
-
-        ResolvableType actualReturnType = this.returnType;
-
-        while (Future.class.isAssignableFrom(actualReturnType.getRawClass())
-                || ReactiveTypes.supports(actualReturnType.getRawClass())) {
-            ResolvableType[] generics = actualReturnType.getGenerics();
-
-            if (generics.length != 1) {
-                break;
-            }
-
-            actualReturnType = generics[0];
-        }
-
-        this.actualReturnType = actualReturnType;
-    }
+public interface CommandMethod {
 
     /**
-     *
      * @return the method {@link Parameters}.
      */
-    public Parameters<? extends Parameter> getParameters() {
-        return parameters;
-    }
+    Parameters<? extends Parameter> getParameters();
 
     /**
-     *
      * @return the {@link Method}.
      */
-    public Method getMethod() {
-        return method;
-    }
+    Method getMethod();
 
     /**
-     *
-     * @return declared {@link Method} return {@link TypeInformation}.
+     * @return declared {@link Method} return {@link com.lambdaworks.redis.dynamic.support.TypeInformation}.
      */
-    public ResolvableType getReturnType() {
-        return returnType;
-    }
+    ResolvableType getReturnType();
 
     /**
-     *
-     * @return the actual {@link Method} return {@link TypeInformation} after unwrapping.
+     * @return the actual {@link Method} return {@link com.lambdaworks.redis.dynamic.support.TypeInformation} after unwrapping.
      */
-    public ResolvableType getActualReturnType() {
-        return actualReturnType;
-    }
+    ResolvableType getActualReturnType();
 
     /**
      * Lookup a method annotation.
@@ -125,70 +58,32 @@ public ResolvableType getActualReturnType() {
      * @param annotationClass the annotation class.
      * @return the annotation object or {@literal null} if not found.
      */
-    public <A extends Annotation> A getAnnotation(Class<A> annotationClass) {
-        return method.getAnnotation(annotationClass);
-    }
+    <A extends Annotation> A getAnnotation(Class<A> annotationClass);
 
     /**
-     *
      * @param annotationClass the annotation class.
      * @return {@literal true} if the method is annotated with {@code annotationClass}.
      */
-    public boolean hasAnnotation(Class<? extends Annotation> annotationClass) {
-        return method.getAnnotation(annotationClass) != null;
-    }
+    boolean hasAnnotation(Class<? extends Annotation> annotationClass);
 
     /**
-     *
      * @return the method name.
      */
-    public String getName() {
-        return method.getName();
-    }
+    String getName();
 
     /**
-     *
      * @return {@literal true} if the method uses asynchronous execution declaring {@link Future} as result type.
      */
-    public boolean isFutureExecution() {
-        return Future.class.isAssignableFrom(getReturnType().getRawClass());
-    }
+    boolean isFutureExecution();
 
     /**
-     *
-     * @return {@literal true} if the method uses reactive execution declaring {@link Publisher} as result type.
+     * @return {@literal true} if the method uses reactive execution declaring {@link org.reactivestreams.Publisher} as result
+     *         type.
      */
-    public boolean isReactiveExecution() {
-        return ReactiveTypes.supports(getReturnType().getRawClass());
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof CommandMethod))
-            return false;
+    boolean isReactiveExecution();
 
-        CommandMethod that = (CommandMethod) o;
-
-        if (method != null ? !method.equals(that.method) : that.method != null)
-            return false;
-        if (returnType != null ? !returnType.equals(that.returnType) : that.returnType != null)
-            return false;
-        return arguments != null ? arguments.equals(that.arguments) : that.arguments == null;
-
-    }
-
-    @Override
-    public int hashCode() {
-        int result = method != null ? method.hashCode() : 0;
-        result = 31 * result + (returnType != null ? returnType.hashCode() : 0);
-        result = 31 * result + (arguments != null ? arguments.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return method.toGenericString();
-    }
+    /**
+     * @return {@literal true} if the method defines a {@link com.lambdaworks.redis.dynamic.batch.CommandBatching} argument.
+     */
+    boolean isBatchExecution();
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
index ee0cb73c5d..f820454b21 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
@@ -18,7 +18,10 @@
 import com.lambdaworks.redis.dynamic.segment.CommandSegments;
 
 /**
+ * Verifies {@link CommandMethod} declarations by checking available Redis commands.
+ * 
  * @author Mark Paluch
+ * @since 5.0
  */
 interface CommandMethodVerifier {
 
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethod.java b/src/main/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethod.java
new file mode 100644
index 0000000000..ad97e1e88d
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethod.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright 2011-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Future;
+
+import org.reactivestreams.Publisher;
+
+import com.lambdaworks.redis.dynamic.batch.BatchExecutor;
+import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
+import com.lambdaworks.redis.dynamic.parameter.Parameter;
+import com.lambdaworks.redis.dynamic.parameter.Parameters;
+import com.lambdaworks.redis.dynamic.support.ResolvableType;
+import com.lambdaworks.redis.dynamic.support.TypeInformation;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Abstraction of a method that is designated to execute a Redis command method. Enriches the standard {@link Method} interface
+ * with specific information that is necessary to construct {@link com.lambdaworks.redis.protocol.RedisCommand} for the method.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public class DeclaredCommandMethod implements CommandMethod {
+
+    private final Method method;
+    private final ResolvableType returnType;
+    private final List<Class<?>> arguments = new ArrayList<>();
+    private final ExecutionSpecificParameters parameters;
+    private final ResolvableType actualReturnType;
+
+    /**
+     * Create a new {@link DeclaredCommandMethod} given a {@link Method}.
+     * 
+     * @param method must not be null.
+     */
+    private DeclaredCommandMethod(Method method) {
+        this(method, new ExecutionSpecificParameters(method));
+    }
+
+    /**
+     * Create a new {@link DeclaredCommandMethod} given a {@link Method} and {@link Parameters}.
+     * 
+     * @param method must not be null.
+     * @param parameters must not be null.
+     */
+    private DeclaredCommandMethod(Method method, ExecutionSpecificParameters parameters) {
+
+        LettuceAssert.notNull(method, "Method must not be null");
+        LettuceAssert.notNull(parameters, "Parameters must not be null");
+
+        this.method = method;
+        this.returnType = ResolvableType.forMethodReturnType(method);
+        this.parameters = parameters;
+
+        Collections.addAll(arguments, method.getParameterTypes());
+
+        ResolvableType actualReturnType = this.returnType;
+
+        while (Future.class.isAssignableFrom(actualReturnType.getRawClass())
+                || ReactiveTypes.supports(actualReturnType.getRawClass())) {
+            ResolvableType[] generics = actualReturnType.getGenerics();
+
+            if (generics.length != 1) {
+                break;
+            }
+
+            actualReturnType = generics[0];
+        }
+
+        this.actualReturnType = actualReturnType;
+    }
+
+    /**
+     * Create a new {@link DeclaredCommandMethod} given a {@link Method}.
+     * 
+     * @param method must not be null.
+     */
+    public static CommandMethod create(Method method) {
+        return new DeclaredCommandMethod(method);
+    }
+
+    /**
+     * @return the method {@link Parameters}.
+     */
+    @Override
+    public Parameters<? extends Parameter> getParameters() {
+        return parameters;
+    }
+
+    /**
+     * @return the {@link Method}.
+     */
+    @Override
+    public Method getMethod() {
+        return method;
+    }
+
+    /**
+     * @return declared {@link Method} return {@link TypeInformation}.
+     */
+    @Override
+    public ResolvableType getReturnType() {
+        return returnType;
+    }
+
+    /**
+     * @return the actual {@link Method} return {@link TypeInformation} after unwrapping.
+     */
+    @Override
+    public ResolvableType getActualReturnType() {
+        return actualReturnType;
+    }
+
+    /**
+     * Lookup a method annotation.
+     * 
+     * @param annotationClass the annotation class.
+     * @return the annotation object or {@literal null} if not found.
+     */
+    @Override
+    public <A extends Annotation> A getAnnotation(Class<A> annotationClass) {
+        return method.getAnnotation(annotationClass);
+    }
+
+    /**
+     * @param annotationClass the annotation class.
+     * @return {@literal true} if the method is annotated with {@code annotationClass}.
+     */
+    @Override
+    public boolean hasAnnotation(Class<? extends Annotation> annotationClass) {
+        return method.getAnnotation(annotationClass) != null;
+    }
+
+    /**
+     * @return the method name.
+     */
+    @Override
+    public String getName() {
+        return method.getName();
+    }
+
+    /**
+     * @return {@literal true} if the method uses asynchronous execution declaring {@link Future} as result type.
+     */
+    @Override
+    public boolean isFutureExecution() {
+        return Future.class.isAssignableFrom(getReturnType().getRawClass());
+    }
+
+    /**
+     * @return {@literal true} if the method uses reactive execution declaring {@link Publisher} as result type.
+     */
+    @Override
+    public boolean isReactiveExecution() {
+        return ReactiveTypes.supports(getReturnType().getRawClass());
+    }
+
+    /**
+     * @return {@literal true} if the method defines a {@link com.lambdaworks.redis.dynamic.batch.CommandBatching} argument.
+     */
+    @Override
+    public boolean isBatchExecution() {
+        return parameters.hasCommandBatchingIndex()
+                || (method.getName().equals("flush") && method.getDeclaringClass().equals(BatchExecutor.class));
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof DeclaredCommandMethod))
+            return false;
+
+        DeclaredCommandMethod that = (DeclaredCommandMethod) o;
+
+        if (method != null ? !method.equals(that.method) : that.method != null)
+            return false;
+        if (returnType != null ? !returnType.equals(that.returnType) : that.returnType != null)
+            return false;
+        return arguments != null ? arguments.equals(that.arguments) : that.arguments == null;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = method != null ? method.hashCode() : 0;
+        result = 31 * result + (returnType != null ? returnType.hashCode() : 0);
+        result = 31 * result + (arguments != null ? arguments.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return method.toGenericString();
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java b/src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java
index 4cb1297498..9f63f4943d 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java
@@ -15,6 +15,7 @@
  */
 package com.lambdaworks.redis.dynamic;
 
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Collection;
@@ -76,6 +77,16 @@ private boolean isQueryMethodCandidate(Method method) {
         return !method.isBridge() && !method.isDefault();
     }
 
+    @Override
+    public <A extends Annotation> A getAnnotation(Class<A> annotationClass) {
+        return getCommandsInterface().getAnnotation(annotationClass);
+    }
+
+    @Override
+    public boolean hasAnnotation(Class<? extends Annotation> annotationClass) {
+        return getCommandsInterface().getAnnotation(annotationClass) != null;
+    }
+
     /**
      * Given a method, which may come from an interface, and a target class used in the current reflective invocation, find the
      * corresponding target method if there is one. E.g. the method may be {@code IFoo.bar()} and the target class may be
@@ -88,6 +99,7 @@ private boolean isQueryMethodCandidate(Method method) {
      *         {@code null}
      */
     public static Method getMostSpecificMethod(Method method, Class<?> targetClass) {
+
         if (method != null && isOverridable(method, targetClass) && targetClass != null
                 && targetClass != method.getDeclaringClass()) {
             try {
@@ -109,6 +121,7 @@ public static Method getMostSpecificMethod(Method method, Class<?> targetClass)
      * @param targetClass the target class to check against
      */
     private static boolean isOverridable(Method method, Class<?> targetClass) {
+
         if (Modifier.isPrivate(method.getModifiers())) {
             return false;
         }
@@ -125,6 +138,7 @@ private static boolean isOverridable(Method method, Class<?> targetClass) {
      * @return the package name, or the empty String if the class is defined in the default package
      */
     private static String getPackageName(Class<?> clazz) {
+
         LettuceAssert.notNull(clazz, "Class must not be null");
         return getPackageName(clazz.getName());
     }
@@ -137,6 +151,7 @@ private static String getPackageName(Class<?> clazz) {
      * @return the package name, or the empty String if the class is defined in the default package
      */
     private static String getPackageName(String fqClassName) {
+
         LettuceAssert.notNull(fqClassName, "Class name must not be null");
         int lastDotIndex = fqClassName.lastIndexOf(PACKAGE_SEPARATOR);
         return (lastDotIndex != -1 ? fqClassName.substring(0, lastDotIndex) : "");
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategy.java b/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategy.java
index ad9cbdaea0..5c9a12bc41 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategy.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategy.java
@@ -29,8 +29,8 @@ interface ExecutableCommandLookupStrategy {
      * Resolve a {@link ExecutableCommand} given the {@link Method} and {@link RedisCommandsMetadata}.
      * 
      * @param method must not be {@literal null}.
-     * @param commandsMetadata must not be {@literal null}.
+     * @param metadata must not be {@literal null}.
      * @return the {@link ExecutableCommand}.
      */
-    ExecutableCommand resolveCommandMethod(Method method, RedisCommandsMetadata commandsMetadata);
+    ExecutableCommand resolveCommandMethod(CommandMethod method, RedisCommandsMetadata metadata);
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategySupport.java b/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategySupport.java
new file mode 100644
index 0000000000..6c7d961561
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategySupport.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.util.List;
+
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.dynamic.codec.AnnotationRedisCodecResolver;
+import com.lambdaworks.redis.dynamic.output.CodecAwareOutputFactoryResolver;
+import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
+import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory;
+import com.lambdaworks.redis.dynamic.segment.CommandSegments;
+
+/**
+ * @author Mark Paluch
+ * @since 5.0
+ */
+abstract class ExecutableCommandLookupStrategySupport implements ExecutableCommandLookupStrategy {
+
+    private final List<RedisCodec<?, ?>> redisCodecs;
+    private final CommandOutputFactoryResolver commandOutputFactoryResolver;
+    private final CommandFactoryResolver commandFactoryResolver;
+    private final CommandMethodVerifier commandMethodVerifier;
+
+    public ExecutableCommandLookupStrategySupport(List<RedisCodec<?, ?>> redisCodecs,
+            CommandOutputFactoryResolver commandOutputFactoryResolver, CommandMethodVerifier commandMethodVerifier) {
+
+        this.redisCodecs = redisCodecs;
+        this.commandOutputFactoryResolver = commandOutputFactoryResolver;
+        this.commandMethodVerifier = commandMethodVerifier;
+        this.commandFactoryResolver = new DefaultCommandFactoryResolver();
+    }
+
+    protected CommandFactory resolveCommandFactory(CommandMethod commandMethod, RedisCommandsMetadata commandsMetadata) {
+        return commandFactoryResolver.resolveRedisCommandFactory(commandMethod, commandsMetadata);
+    }
+
+    @SuppressWarnings("unchecked")
+    class DefaultCommandFactoryResolver implements CommandFactoryResolver {
+
+        final AnnotationCommandSegmentFactory commandSegmentFactory = new AnnotationCommandSegmentFactory();
+        final AnnotationRedisCodecResolver codecResolver;
+
+        DefaultCommandFactoryResolver() {
+            codecResolver = new AnnotationRedisCodecResolver(redisCodecs);
+        }
+
+        @Override
+        public CommandFactory resolveRedisCommandFactory(CommandMethod commandMethod, RedisCommandsMetadata commandsMetadata) {
+
+            RedisCodec<?, ?> codec = codecResolver.resolve(commandMethod);
+
+            if (codec == null) {
+                throw new CommandCreationException(commandMethod, "Cannot resolve RedisCodec");
+            }
+
+            CodecAwareOutputFactoryResolver outputFactoryResolver = new CodecAwareOutputFactoryResolver(
+                    commandOutputFactoryResolver, codec);
+            CommandSegments commandSegments = commandSegmentFactory.createCommandSegments(commandMethod);
+
+            commandMethodVerifier.validate(commandSegments, commandMethod);
+
+            return new CommandSegmentCommandFactory(commandSegments, commandMethod, codec, outputFactoryResolver);
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommandLookupStrategy.java b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommandLookupStrategy.java
index c8106a236d..f3d43d2ab0 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommandLookupStrategy.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommandLookupStrategy.java
@@ -15,7 +15,6 @@
  */
 package com.lambdaworks.redis.dynamic;
 
-import java.lang.reflect.Method;
 import java.util.List;
 
 import com.lambdaworks.redis.AbstractRedisReactiveCommands;
@@ -54,17 +53,18 @@ class ReactiveExecutableCommandLookupStrategy implements ExecutableCommandLookup
     }
 
     @Override
-    public ExecutableCommand resolveCommandMethod(Method method, RedisCommandsMetadata commandsMetadata) {
+    public ExecutableCommand resolveCommandMethod(CommandMethod method, RedisCommandsMetadata commandsMetadata) {
 
-        CommandMethod commandMethod = new CommandMethod(method);
+        LettuceAssert.isTrue(!method.isBatchExecution(),
+                String.format("Command batching %s not supported with ReactiveExecutableCommandLookupStrategy", method));
 
-        LettuceAssert.isTrue(commandMethod.isReactiveExecution(),
-                String.format("Command method %s not supported by this command lookup strategy", method));
+        LettuceAssert.isTrue(method.isReactiveExecution(),
+                String.format("Command method %s not supported by ReactiveExecutableCommandLookupStrategy", method));
 
-        ReactiveCommandSegmentCommandFactory commandFactory = commandFactoryResolver.resolveRedisCommandFactory(commandMethod,
+        ReactiveCommandSegmentCommandFactory commandFactory = commandFactoryResolver.resolveRedisCommandFactory(method,
                 commandsMetadata);
 
-        return new ConvertingCommand(conversionService, new ReactiveExecutableCommand(commandMethod, commandFactory,
+        return new ConvertingCommand(conversionService, new ReactiveExecutableCommand(method, commandFactory,
                 redisReactiveCommands));
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
index 44f87059a9..9fee67502f 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
@@ -27,6 +27,7 @@
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.dynamic.batch.BatchSize;
 import com.lambdaworks.redis.dynamic.intercept.InvocationProxyFactory;
 import com.lambdaworks.redis.dynamic.intercept.MethodInterceptor;
 import com.lambdaworks.redis.dynamic.intercept.MethodInvocation;
@@ -169,14 +170,15 @@ public <T extends Commands> T getCommands(Class<T> commandInterface) {
 
         LettuceAssert.notNull(commandInterface, "Redis Command Interface must not be null");
 
-        RedisCommandsMetadata redisCommandsMetadata = new DefaultRedisCommandsMetadata(commandInterface);
+        RedisCommandsMetadata metadata = new DefaultRedisCommandsMetadata(commandInterface);
 
         InvocationProxyFactory factory = new InvocationProxyFactory();
         factory.addInterface(commandInterface);
 
-        CompositeCommandLookupStrategy lookupStrategy = new CompositeCommandLookupStrategy();
+        BatchAwareCommandLookupStrategy lookupStrategy = new BatchAwareCommandLookupStrategy(
+                new CompositeCommandLookupStrategy(), metadata);
 
-        factory.addInterceptor(new CommandFactoryExecutorMethodInterceptor(redisCommandsMetadata, lookupStrategy));
+        factory.addInterceptor(new CommandFactoryExecutorMethodInterceptor(metadata, lookupStrategy));
         return factory.createProxy(commandInterface.getClassLoader());
     }
 
@@ -186,7 +188,7 @@ public <T extends Commands> T getCommands(Class<T> commandInterface) {
      *
      * @author Mark Paluch
      */
-    class CommandFactoryExecutorMethodInterceptor implements MethodInterceptor {
+    static class CommandFactoryExecutorMethodInterceptor implements MethodInterceptor {
 
         private final Map<Method, ExecutableCommand> commandMethods = new HashMap<>();
 
@@ -195,7 +197,8 @@ class CommandFactoryExecutorMethodInterceptor implements MethodInterceptor {
 
             for (Method method : redisCommandsMetadata.getMethods()) {
 
-                ExecutableCommand executableCommand = strategy.resolveCommandMethod(method, redisCommandsMetadata);
+                ExecutableCommand executableCommand = strategy.resolveCommandMethod(DeclaredCommandMethod.create(method),
+                        redisCommandsMetadata);
                 commandMethods.put(method, executableCommand);
             }
         }
@@ -248,13 +251,60 @@ class CompositeCommandLookupStrategy implements ExecutableCommandLookupStrategy
         }
 
         @Override
-        public ExecutableCommand resolveCommandMethod(Method method, RedisCommandsMetadata commandsMetadata) {
+        public ExecutableCommand resolveCommandMethod(CommandMethod method, RedisCommandsMetadata metadata) {
 
-            if (ReactiveTypes.supports(method.getReturnType())) {
-                return reactive.resolveCommandMethod(method, commandsMetadata);
+            if (method.isReactiveExecution()) {
+                return reactive.resolveCommandMethod(method, metadata);
             }
 
-            return async.resolveCommandMethod(method, commandsMetadata);
+            return async.resolveCommandMethod(method, metadata);
+        }
+    }
+
+    class BatchAwareCommandLookupStrategy implements ExecutableCommandLookupStrategy {
+
+        private final ExecutableCommandLookupStrategy fallbackStrategy;
+        private final boolean globalBatching;
+        private final CommandMethodVerifier verifier;
+        private final long batchSize;
+
+        private Batcher batcher = Batcher.NONE;
+        private BatchExecutableCommandLookupStrategy batchingStrategy;
+
+        public BatchAwareCommandLookupStrategy(ExecutableCommandLookupStrategy fallbackStrategy, RedisCommandsMetadata metadata) {
+
+            this.fallbackStrategy = fallbackStrategy;
+            this.verifier = verifyCommandMethods ? commandMethodVerifier : CommandMethodVerifier.NONE;
+
+            if (metadata.hasAnnotation(BatchSize.class)) {
+
+                BatchSize batchSize = metadata.getAnnotation(BatchSize.class);
+
+                this.globalBatching = true;
+                this.batchSize = batchSize.value();
+
+            } else {
+
+                this.globalBatching = false;
+                this.batchSize = -1;
+            }
+        }
+
+        @Override
+        public ExecutableCommand resolveCommandMethod(CommandMethod method, RedisCommandsMetadata metadata) {
+
+            if (BatchExecutableCommandLookupStrategy.supports(method) || globalBatching) {
+
+                if (batcher == Batcher.NONE) {
+                    batcher = new SimpleBatcher((StatefulConnection) connection, Math.toIntExact(batchSize));
+                    batchingStrategy = new BatchExecutableCommandLookupStrategy(redisCodecs, commandOutputFactoryResolver,
+                            verifier, batcher, (StatefulConnection) connection);
+                }
+
+                return batchingStrategy.resolveCommandMethod(method, metadata);
+            }
+
+            return fallbackStrategy.resolveCommandMethod(method, metadata);
         }
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java
index a0e02acc19..4a35f662b1 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java
@@ -15,6 +15,7 @@
  */
 package com.lambdaworks.redis.dynamic;
 
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.Collection;
 
@@ -24,7 +25,7 @@
  * @author Mark Paluch
  * @since 5.0
  */
-public interface RedisCommandsMetadata {
+interface RedisCommandsMetadata {
 
     Collection<Method> getMethods();
 
@@ -34,4 +35,18 @@ public interface RedisCommandsMetadata {
      * @return
      */
     Class<?> getCommandsInterface();
+
+    /**
+     * Lookup an interface annotation.
+     * 
+     * @param annotationClass the annotation class.
+     * @return the annotation object or {@literal null} if not found.
+     */
+    <A extends Annotation> A getAnnotation(Class<A> annotationClass);
+
+    /**
+     * @param annotationClass the annotation class.
+     * @return {@literal true} if the interface is annotated with {@code annotationClass}.
+     */
+    boolean hasAnnotation(Class<? extends Annotation> annotationClass);
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/SimpleBatcher.java b/src/main/java/com/lambdaworks/redis/dynamic/SimpleBatcher.java
new file mode 100644
index 0000000000..db2bd98b9e
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/SimpleBatcher.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import com.lambdaworks.redis.api.StatefulConnection;
+import com.lambdaworks.redis.dynamic.batch.CommandBatching;
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.protocol.RedisCommand;
+
+import io.netty.util.internal.shaded.org.jctools.queues.atomic.MpscLinkedAtomicQueue;
+
+/**
+ * Simple threadsafe and lock-free {@link Batcher} that flushes queued command when either:
+ * <ul>
+ * <li>Reaches the configured {@link #batchSize}</li>
+ * <li>Encounters a {@link CommandBatching#flush() force flush}</li>
+ * </ul>
+ * 
+ * @author Mark Paluch
+ */
+class SimpleBatcher implements Batcher {
+
+    private final StatefulConnection<Object, Object> connection;
+    private final int batchSize;
+    private final MpscLinkedAtomicQueue<RedisCommand<Object, Object, Object>> queue = new MpscLinkedAtomicQueue<>();
+    private final AtomicBoolean flushing = new AtomicBoolean();
+
+    public SimpleBatcher(StatefulConnection<Object, Object> connection, int batchSize) {
+
+        LettuceAssert.isTrue(batchSize == -1 || batchSize > 1, "Batch size must be greater zero or -1");
+        this.connection = connection;
+        this.batchSize = batchSize;
+    }
+
+    @Override
+    public BatchTasks batch(RedisCommand<Object, Object, Object> command, CommandBatching batching) {
+
+        queue.add(command);
+
+        if (batching == CommandBatching.queue()) {
+            return BatchTasks.EMPTY;
+        }
+
+        boolean forcedFlush = batching == CommandBatching.flush();
+
+        boolean defaultFlush = false;
+
+        if (!forcedFlush) {
+            if (queue.size() >= batchSize) {
+                defaultFlush = true;
+            }
+        }
+
+        if (defaultFlush || forcedFlush) {
+            return flush(forcedFlush);
+        }
+
+        return BatchTasks.EMPTY;
+    }
+
+    @Override
+    public BatchTasks flush() {
+        return flush(true);
+    }
+
+    protected BatchTasks flush(boolean forcedFlush) {
+
+        boolean defaultFlush = false;
+
+        List<RedisCommand<?, ?, ?>> commands = new ArrayList<>(Math.max(batchSize, 10));
+
+        while (flushing.compareAndSet(false, true)) {
+
+            try {
+
+                int consume = -1;
+
+                if (!forcedFlush) {
+                    long queuedItems = queue.size();
+                    if (queuedItems >= batchSize) {
+                        consume = batchSize;
+                        defaultFlush = true;
+                    }
+                }
+
+                List<? extends RedisCommand<?, ?, ?>> batch = doFlush(forcedFlush, defaultFlush, consume);
+                if (batch != null) {
+                    commands.addAll(batch);
+                }
+
+                if (defaultFlush && !queue.isEmpty() && queue.size() > batchSize) {
+                    continue;
+                }
+
+                return new BatchTasks(commands);
+
+            } finally {
+                flushing.set(false);
+            }
+        }
+
+        return BatchTasks.EMPTY;
+    }
+
+    private List<? extends RedisCommand<?, ?, ?>> doFlush(boolean forcedFlush, boolean defaultFlush, int consume) {
+
+        List<RedisCommand<Object, Object, Object>> commands = null;
+        if (forcedFlush) {
+            commands = prepareForceFlush();
+        } else if (defaultFlush) {
+            commands = prepareDefaultFlush(consume);
+        }
+
+        if (commands != null && !commands.isEmpty()) {
+            if (commands.size() == 1) {
+                connection.dispatch(commands.get(0));
+            } else {
+                connection.dispatch(commands);
+            }
+
+            return commands;
+        }
+        return Collections.emptyList();
+    }
+
+    private List<RedisCommand<Object, Object, Object>> prepareForceFlush() {
+
+        List<RedisCommand<Object, Object, Object>> batch = new ArrayList<>(Math.max(batchSize, 10));
+
+        do {
+            RedisCommand<Object, Object, Object> poll = queue.poll();
+
+            assert poll != null;
+            batch.add(poll);
+        } while (!queue.isEmpty());
+
+        return batch;
+    }
+
+    private List<RedisCommand<Object, Object, Object>> prepareDefaultFlush(int consume) {
+
+        List<RedisCommand<Object, Object, Object>> batch = new ArrayList<>(Math.max(consume, 10));
+
+        while ((batch.size() < consume || consume == -1) && !queue.isEmpty()) {
+
+            RedisCommand<Object, Object, Object> poll = queue.poll();
+
+            assert poll != null;
+            batch.add(poll);
+        }
+
+        return batch;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchException.java b/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchException.java
new file mode 100644
index 0000000000..63fe23566c
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchException.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic.batch;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.lambdaworks.redis.RedisCommandExecutionException;
+import com.lambdaworks.redis.protocol.RedisCommand;
+
+/**
+ * Batch exception to collect multiple errors from batched command execution.
+ * <p>
+ * Commands that fail during the batch cause a {@link BatchException} while non-failed commands remain executed successfully.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ * @see BatchExecutor
+ * @see BatchSize
+ * @see CommandBatching
+ */
+public class BatchException extends RedisCommandExecutionException {
+
+    private final List<RedisCommand<?, ?, ?>> failedCommands;
+
+    /**
+     * Create a new {@link BatchException}.
+     * 
+     * @param failedCommands {@link List} of failed {@link RedisCommand}s.
+     */
+    public BatchException(List<RedisCommand<?, ?, ?>> failedCommands) {
+        super("Error during batch command execution");
+        this.failedCommands = Collections.unmodifiableList(failedCommands);
+    }
+
+    /**
+     * @return the failed commands.
+     */
+    public List<RedisCommand<?, ?, ?>> getFailedCommands() {
+        return failedCommands;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchExecutor.java b/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchExecutor.java
new file mode 100644
index 0000000000..163126b108
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchExecutor.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic.batch;
+
+/**
+ * Batch executor interface to enforce command queue flushing using {@link BatchSize}.
+ * <p>
+ * Commands remain in a batch queue until the batch size is reached or the queue is {@link BatchExecutor#flush() flushed}. If
+ * the batch size is not reached, commands remain not executed.
+ * <p>
+ * Commands that fail during the batch cause a {@link BatchException} while non-failed commands remain executed successfully.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ * @see BatchSize
+ */
+public interface BatchExecutor {
+
+    /**
+     * Flush the command queue resulting in the queued commands being executed.
+     * 
+     * @throws BatchException if at least one command failed.
+     */
+    void flush() throws BatchException;
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchSize.java b/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchSize.java
new file mode 100644
index 0000000000..fad81fda7f
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchSize.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic.batch;
+
+import java.lang.annotation.*;
+
+/**
+ * Redis command method annotation declaring a command interface to use batching with a specified {@code batchSize}.
+ * <p>
+ * Usage:
+ * 
+ * <pre class="code">
+ * &#64;BatchSize(50)
+ * public interface MyCommands extends Commands {
+ *  
+ *   public void set(String key, String value);
+ *  
+ *   public RedisFuture&lt;String&gt; get(String key)
+ * }
+ * </pre>
+ * <p>
+ * Command batching executes commands in a deferred nature. This also means that at the time of invocation no result is
+ * available. Batching can be only used with synchronous methods without a return value ({@code void}) or asynchronous methods
+ * returning a {@link com.lambdaworks.redis.RedisFuture}. Reactive command batching is not supported because reactive executed
+ * commands maintain an own subscription lifecycle that is decoupled from command method batching.
+ * <p>
+ * Command methods participating in batching share a single batch queue. All method invocations are queued until reaching the
+ * batch size. Command batching can be also specified using dynamic batching by providing a {@link CommandBatching} parameter on
+ * each command invocation. {@link CommandBatching} parameters have precedence over {@link BatchSize} and can be used to enqueue
+ * commands or force batch flushing of commands.
+ * <p>
+ * Alternatively, a command interface can implement {@link BatchExecutor} to {@link BatchExecutor#flush()} commands before the
+ * batch size is reached. Commands remain in a batch queue until the batch size is reached or the queue is
+ * {@link BatchExecutor#flush() flushed}. If the batch size is not reached, commands remain not executed.
+ * <p>
+ * Batching command interfaces are thread-safe and can be shared amongst multiple threads.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ * @see CommandBatching
+ * @see BatchExecutor
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Documented
+public @interface BatchSize {
+
+    /**
+     * Declares the batch size for the command method.
+     * 
+     * @return a positive, non-zero number of commands.
+     */
+    int value();
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/batch/CommandBatching.java b/src/main/java/com/lambdaworks/redis/dynamic/batch/CommandBatching.java
new file mode 100644
index 0000000000..25b8f5b083
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/batch/CommandBatching.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic.batch;
+
+/**
+ * Programmatic command batching API.
+ * <p>
+ * {@link CommandBatching} is used to queue commands in a batch queue and flush the command queue on command invocation. Usage:
+ * 
+ * <pre class="code">
+ * public interface MyCommands extends Commands {
+ *  
+ *   public void set(String key, String value, CommandBatching batching);
+ *  
+ *   public RedisFuture&lt;String&gt; get(String key, CommandBatching batching)
+ * }
+ * 
+ * MyCommands commands = …
+ * 
+ * commands.set("key", "value", CommandBatching.queue()); 
+ * commands.get("key", CommandBatching.flush());
+ * </pre>
+ * <p>
+ * Using {@link CommandBatching} in a method signature turns the command method into a batched command method.<br/>
+ * Command batching executes commands in a deferred nature. This also means that at the time of invocation no result is
+ * available. Batching can be only used with synchronous methods without a return value ({@code void}) or asynchronous methods
+ * returning a {@link com.lambdaworks.redis.RedisFuture}. Reactive command batching is not supported because reactive executed
+ * commands maintain an own subscription lifecycle that is decoupled from command method batching.
+ * <p>
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ * @see BatchSize
+ */
+public abstract class CommandBatching {
+
+    /**
+     * Flush the command batch queue after adding a command to the batch queue.
+     * 
+     * @return {@link CommandBatching} to flush the command batch queue after adding a command to the batch queue.
+     */
+    public static CommandBatching flush() {
+        return FlushCommands.instance();
+    }
+
+    /**
+     * Enqueue the command to the batch queue.
+     * 
+     * @return {@link CommandBatching} to enqueue the command to the batch queue.
+     */
+    public static CommandBatching queue() {
+        return QueueCommands.instance();
+    }
+
+    /**
+     * {@link CommandBatching} to flush the command batch queue after adding a command to the batch queue.
+     */
+    static class FlushCommands extends CommandBatching {
+
+        static final FlushCommands INSTANCE = new FlushCommands();
+
+        private FlushCommands() {
+        }
+
+        /**
+         * @return a static instance of {@link FlushCommands}.
+         */
+        public static CommandBatching instance() {
+            return INSTANCE;
+        }
+    }
+
+    /**
+     * {@link CommandBatching} to enqueue the command to the batch queue.
+     */
+    static class QueueCommands extends CommandBatching {
+
+        static final QueueCommands INSTANCE = new QueueCommands();
+
+        private QueueCommands() {
+        }
+
+        /**
+         * @return a static instance of {@link QueueCommands}.
+         */
+        public static QueueCommands instance() {
+            return INSTANCE;
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java
index 9ef1364bfa..fdd2aa44a7 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java
@@ -19,21 +19,24 @@
 import java.util.Arrays;
 import java.util.List;
 
+import com.lambdaworks.redis.dynamic.batch.CommandBatching;
 import com.lambdaworks.redis.dynamic.domain.Timeout;
 
 /**
  * {@link Parameters}-implementation specific to execution. This implementation considers {@link Timeout} for a command method
- * applying the appropriate synchronization.
+ * applying the appropriate synchronization and {@link CommandBatching} to batch commands.
  * 
  * @author Mark Paluch
  * @since 5.0
  * @see Timeout
+ * @see CommandBatching
  */
 public class ExecutionSpecificParameters extends Parameters<ExecutionSpecificParameters.ExecutionAwareParameter> {
 
-    private static final List<Class<?>> TYPES = Arrays.asList(Timeout.class);
+    private static final List<Class<?>> TYPES = Arrays.asList(Timeout.class, CommandBatching.class);
 
     private final int timeoutIndex;
+    private final int commandBatchingIndex;
 
     /**
      * Create new {@link ExecutionSpecificParameters} given a {@link Method}.
@@ -45,6 +48,7 @@ public ExecutionSpecificParameters(Method method) {
         super(method);
 
         int timeoutIndex = -1;
+        int commandBatchingIndex = -1;
 
         List<ExecutionAwareParameter> parameters = getParameters();
 
@@ -56,21 +60,48 @@ public ExecutionSpecificParameters(Method method) {
                 if (methodParameter.isAssignableTo(Timeout.class)) {
                     timeoutIndex = i;
                 }
+
+                if (methodParameter.isAssignableTo(CommandBatching.class)) {
+                    commandBatchingIndex = i;
+                }
             }
         }
 
         this.timeoutIndex = timeoutIndex;
+        this.commandBatchingIndex = commandBatchingIndex;
     }
 
+    /**
+     * @return the timeout argument index if present, or {@literal -1} if the command method declares a {@link Timeout}
+     *         parameter.
+     */
     public int getTimeoutIndex() {
         return timeoutIndex;
     }
 
+    /**
+     * @return the command batching argument index if present, or {@literal -1} if the command method declares a
+     *         {@link CommandBatching} parameter.
+     */
+    public int getCommandBatchingIndex() {
+        return commandBatchingIndex;
+    }
+
     @Override
     protected ExecutionAwareParameter createParameter(Method method, int parameterIndex) {
         return new ExecutionAwareParameter(method, parameterIndex);
     }
 
+    /**
+     * @return {@literal true} if the method defines a {@link CommandBatching} parameter.
+     */
+    public boolean hasCommandBatchingIndex() {
+        return commandBatchingIndex != -1;
+    }
+
+    /**
+     * @return {@literal true} if the method defines a {@link Timeout} parameter.
+     */
     public boolean hasTimeoutIndex() {
         return getTimeoutIndex() != -1;
     }
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategyTest.java b/src/test/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategyTest.java
new file mode 100644
index 0000000000..d89ad82ab1
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategyTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
+import java.util.concurrent.Future;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.dynamic.domain.Timeout;
+import com.lambdaworks.redis.dynamic.output.CommandOutputFactory;
+import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
+
+/**
+ * @author Mark Paluch
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class BatchExecutableCommandLookupStrategyTest {
+
+    @Mock
+    private RedisCommandsMetadata metadata;
+    @Mock
+    private StatefulRedisConnection<Object, Object> connection;
+
+    @Mock
+    private CommandOutputFactoryResolver outputFactoryResolver;
+
+    @Mock
+    private CommandOutputFactory outputFactory;
+
+    private BatchExecutableCommandLookupStrategy sut;
+
+    @Before
+    public void before() {
+        sut = new BatchExecutableCommandLookupStrategy(Collections.singletonList(StringCodec.UTF8), outputFactoryResolver,
+                CommandMethodVerifier.NONE, Batcher.NONE, connection);
+
+        when(outputFactoryResolver.resolveCommandOutput(any())).thenReturn(outputFactory);
+    }
+
+    @Test
+    public void shouldCreateAsyncBatchCommand() throws Exception {
+
+        ExecutableCommand result = sut.resolveCommandMethod(getMethod("async"), metadata);
+
+        assertThat(result).isInstanceOf(BatchExecutableCommand.class);
+    }
+
+    @Test
+    public void shouldCreateSyncBatchCommand() throws Exception {
+
+        ExecutableCommand result = sut.resolveCommandMethod(getMethod("justVoid"), metadata);
+
+        assertThat(result).isInstanceOf(BatchExecutableCommand.class);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldNotAllowTimeoutParameter() throws Exception {
+        sut.resolveCommandMethod(getMethod("withTimeout", String.class, Timeout.class), metadata);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldNotAllowSynchronousReturnTypes() throws Exception {
+        sut.resolveCommandMethod(getMethod("withReturnType"), metadata);
+    }
+
+    private CommandMethod getMethod(String name, Class<?>... parameterTypes) throws NoSuchMethodException {
+        return DeclaredCommandMethod.create(BatchingCommands.class.getDeclaredMethod(name, parameterTypes));
+    }
+
+    static interface BatchingCommands {
+
+        Future<String> async();
+
+        String withTimeout(String key, Timeout timeout);
+
+        String withReturnType();
+
+        void justVoid();
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
index 6fca07596d..aef5c95b68 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
@@ -128,7 +128,7 @@ public void syncWithTimeout() {
     }
 
     private CommandMethod methodOf(Class<?> commandInterface, String methodName, Class... args) {
-        return new CommandMethod(ReflectionUtils.findMethod(commandInterface, methodName, args));
+        return DeclaredCommandMethod.create(ReflectionUtils.findMethod(commandInterface, methodName, args));
     }
 
     @SuppressWarnings("unchecked")
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodTest.java b/src/test/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethodTest.java
similarity index 86%
rename from src/test/java/com/lambdaworks/redis/dynamic/CommandMethodTest.java
rename to src/test/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethodTest.java
index cade02bc86..33f3de88ff 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/CommandMethodTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethodTest.java
@@ -27,12 +27,12 @@
 /**
  * @author Mark Paluch
  */
-public class CommandMethodTest {
+public class DeclaredCommandMethodTest {
 
     @Test
     public void shouldResolveConcreteType() throws Exception {
 
-        CommandMethod commandMethod = new CommandMethod(getMethod("getString"));
+        CommandMethod commandMethod = DeclaredCommandMethod.create(getMethod("getString"));
 
         assertThat(commandMethod.getActualReturnType().getType()).isEqualTo(String.class);
         assertThat(commandMethod.getReturnType().getType()).isEqualTo(String.class);
@@ -41,7 +41,7 @@ public void shouldResolveConcreteType() throws Exception {
     @Test
     public void shouldResolveFutureComponentType() throws Exception {
 
-        CommandMethod commandMethod = new CommandMethod(getMethod("getFuture"));
+        CommandMethod commandMethod = DeclaredCommandMethod.create(getMethod("getFuture"));
 
         assertThat(commandMethod.getActualReturnType().getRawClass()).isEqualTo(String.class);
         assertThat(commandMethod.getReturnType().getRawClass()).isEqualTo(Future.class);
@@ -50,7 +50,7 @@ public void shouldResolveFutureComponentType() throws Exception {
     @Test
     public void shouldResolveFluxComponentType() throws Exception {
 
-        CommandMethod commandMethod = new CommandMethod(getMethod("getFlux"));
+        CommandMethod commandMethod = DeclaredCommandMethod.create(getMethod("getFlux"));
 
         assertThat(commandMethod.getActualReturnType().getRawClass()).isEqualTo(String.class);
         assertThat(commandMethod.getReturnType().getRawClass()).isEqualTo(Flux.class);
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifierTest.java b/src/test/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifierTest.java
index 2dc6b46f04..a103deedd7 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifierTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifierTest.java
@@ -109,7 +109,7 @@ public void methodDoesNotAcceptParameters() {
     private void validateMethod(String methodName, Class<?>... parameterTypes) {
 
         Method method = ReflectionUtils.findMethod(MyInterface.class, methodName, parameterTypes);
-        CommandMethod commandMethod = new CommandMethod(method);
+        CommandMethod commandMethod = DeclaredCommandMethod.create(method);
 
         sut.validate(new CommandSegments(Collections.singletonList(CommandSegment.constant(methodName))), commandMethod);
     }
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
index f19f7f3459..94907b10c9 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
@@ -149,7 +149,7 @@ public void rejectsStringUpperValue() {
     @Test
     public void bindsValueRangeCorrectly() {
 
-        CommandMethod commandMethod = new CommandMethod(
+        CommandMethod commandMethod = DeclaredCommandMethod.create(
                 ReflectionUtils.findMethod(MyCommands.class, "valueRange", Range.class));
 
         CommandArgs<String, String> args = bind(commandMethod,
@@ -162,7 +162,7 @@ public void bindsValueRangeCorrectly() {
     @Test
     public void bindsUnboundedValueRangeCorrectly() {
 
-        CommandMethod commandMethod = new CommandMethod(
+        CommandMethod commandMethod = DeclaredCommandMethod.create(
                 ReflectionUtils.findMethod(MyCommands.class, "valueRange", Range.class));
 
         CommandArgs<String, String> args = bind(commandMethod, Range.unbounded());
@@ -188,7 +188,7 @@ public void bindsProtocolKeywordCorrectly() {
     }
 
     private CommandArgs<String, String> bind(Object object) {
-        CommandMethod commandMethod = new CommandMethod(
+        CommandMethod commandMethod = DeclaredCommandMethod.create(
                 ReflectionUtils.findMethod(MyCommands.class, "justObject", Object.class));
         return bind(commandMethod, object);
     }
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
index 4709630a20..e2616fe812 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
@@ -70,7 +70,7 @@ public void commandCreationWithTimeoutShouldFail() {
 
         Method method = ReflectionUtils.findMethod(interfaceClass, methodName, parameterTypes);
 
-        CommandMethod commandMethod = new CommandMethod(method);
+        CommandMethod commandMethod = DeclaredCommandMethod.create(method);
 
         AnnotationCommandSegmentFactory segmentFactory = new AnnotationCommandSegmentFactory();
         CommandSegments commandSegments = segmentFactory.createCommandSegments(commandMethod);
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsBatchingTest.java b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsBatchingTest.java
new file mode 100644
index 0000000000..2639162fbf
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsBatchingTest.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Fail.fail;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+import com.lambdaworks.redis.AbstractRedisClientTest;
+import com.lambdaworks.redis.LettuceFutures;
+import com.lambdaworks.redis.RedisCommandExecutionException;
+import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.dynamic.annotation.Command;
+import com.lambdaworks.redis.dynamic.batch.BatchException;
+import com.lambdaworks.redis.dynamic.batch.BatchExecutor;
+import com.lambdaworks.redis.dynamic.batch.BatchSize;
+import com.lambdaworks.redis.dynamic.batch.CommandBatching;
+
+/**
+ * @author Mark Paluch
+ */
+public class RedisCommandsBatchingTest extends AbstractRedisClientTest {
+
+    @Test
+    public void selectiveBatching() {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        SelectiveBatching api = factory.getCommands(SelectiveBatching.class);
+
+        api.set("k1", value);
+        assertThat(redis.get("k1")).isEqualTo(value);
+
+        api.set("k2", value, CommandBatching.queue());
+        api.set("k3", value, CommandBatching.queue());
+        assertThat(redis.get("k2")).isNull();
+        assertThat(redis.get("k3")).isNull();
+
+        api.set("k4", value, CommandBatching.flush());
+
+        assertThat(redis.get("k2")).isEqualTo(value);
+        assertThat(redis.get("k3")).isEqualTo(value);
+        assertThat(redis.get("k4")).isEqualTo(value);
+    }
+
+    @Test
+    public void selectiveBatchingShouldHandleErrors() {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        SelectiveBatching api = factory.getCommands(SelectiveBatching.class);
+
+        api.set("k1", value, CommandBatching.queue());
+        api.llen("k1", CommandBatching.queue());
+
+        try {
+            api.flush();
+            fail("Missing BatchException");
+        } catch (BatchException e) {
+            assertThat(redis.get("k1")).isEqualTo(value);
+            assertThat(e.getFailedCommands()).hasSize(1);
+        }
+    }
+
+    @Test
+    public void shouldExecuteBatchingSynchronously() {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        Batching api = factory.getCommands(Batching.class);
+
+        api.set("k1", value);
+        api.set("k2", value);
+        api.set("k3", value);
+        api.set("k4", value);
+
+        assertThat(redis.get("k1")).isNull();
+        api.set("k5", value);
+
+        assertThat(redis.get("k1")).isEqualTo(value);
+    }
+
+    @Test
+    public void shouldHandleSynchronousBatchErrors() {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        Batching api = factory.getCommands(Batching.class);
+
+        api.set("k1", value);
+        api.set("k2", value);
+        api.llen("k2");
+        api.set("k4", value);
+
+        assertThat(redis.get("k1")).isNull();
+
+        try {
+            api.llen("k4");
+            fail("Missing BatchException");
+        } catch (BatchException e) {
+
+            assertThat(redis.get("k1")).isEqualTo(value);
+            assertThat(redis.get("k4")).isEqualTo(value);
+
+            assertThat(e).isInstanceOf(BatchException.class);
+            assertThat(e.getSuppressed()).hasSize(2);
+            assertThat(e.getFailedCommands()).hasSize(2);
+        }
+    }
+
+    @Test
+    public void shouldExecuteBatchingAynchronously() throws Exception {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        Batching api = factory.getCommands(Batching.class);
+
+        api.setAsync("k1", value);
+        api.setAsync("k2", value);
+        api.setAsync("k3", value);
+        api.setAsync("k4", value);
+
+        assertThat(redis.get("k1")).isNull();
+        assertThat(api.setAsync("k5", value).get()).isEqualTo("OK");
+
+        assertThat(redis.get("k1")).isEqualTo(value);
+    }
+
+    @Test
+    public void shouldHandleAsynchronousBatchErrors() throws Exception {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        Batching api = factory.getCommands(Batching.class);
+
+        api.setAsync("k1", value);
+        api.setAsync("k2", value);
+        api.llen("k2");
+        api.setAsync("k4", value);
+
+        assertThat(redis.get("k1")).isNull();
+
+        RedisFuture<Long> llen = api.llenAsync("k4");
+        llen.await(1, TimeUnit.SECONDS);
+
+        assertThat(redis.get("k1")).isEqualTo(value);
+        assertThat(redis.get("k4")).isEqualTo(value);
+
+        try {
+            LettuceFutures.awaitAll(1, TimeUnit.SECONDS, llen);
+            fail("Missing RedisCommandExecutionException");
+        } catch (Exception e) {
+            assertThat(e).isInstanceOf(RedisCommandExecutionException.class);
+        }
+    }
+
+    @BatchSize(5)
+    static interface Batching extends Commands {
+
+        void set(String key, String value);
+
+        void llen(String key);
+
+        @Command("SET")
+        RedisFuture<String> setAsync(String key, String value);
+
+        @Command("LLEN")
+        RedisFuture<Long> llenAsync(String key);
+    }
+
+    static interface SelectiveBatching extends Commands, BatchExecutor {
+
+        void set(String key, String value);
+
+        void set(String key, String value, CommandBatching commandBatching);
+
+        void llen(String key, CommandBatching commandBatching);
+
+    }
+
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/SimpleBatcherTest.java b/src/test/java/com/lambdaworks/redis/dynamic/SimpleBatcherTest.java
new file mode 100644
index 0000000000..9830d30338
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/dynamic/SimpleBatcherTest.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import com.lambdaworks.redis.api.StatefulConnection;
+import com.lambdaworks.redis.dynamic.batch.CommandBatching;
+import com.lambdaworks.redis.protocol.AsyncCommand;
+import com.lambdaworks.redis.protocol.Command;
+import com.lambdaworks.redis.protocol.CommandType;
+import com.lambdaworks.redis.protocol.RedisCommand;
+
+/**
+ * @author Mark Paluch
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class SimpleBatcherTest {
+
+    @Mock
+    private StatefulConnection<Object, Object> connection;
+
+    @Test
+    public void shouldBatchWithDefaultSize() {
+
+        RedisCommand<Object, Object, Object> c1 = createCommand();
+        RedisCommand<Object, Object, Object> c2 = createCommand();
+        RedisCommand<Object, Object, Object> c3 = createCommand();
+        RedisCommand<Object, Object, Object> c4 = createCommand();
+
+        SimpleBatcher batcher = new SimpleBatcher(connection, 2);
+
+        assertThat(batcher.batch(c1, null)).isEqualTo(BatchTasks.EMPTY);
+        verifyZeroInteractions(connection);
+
+        BatchTasks batch = batcher.batch(c2, null);
+        verify(connection).dispatch(Arrays.asList(c1, c2));
+        assertThat(batch).contains(c1, c2);
+
+        batcher.batch(c3, null);
+        verifyZeroInteractions(connection);
+
+        batcher.batch(c4, null);
+        verify(connection).dispatch(Arrays.asList(c3, c4));
+    }
+
+    @Test
+    public void shouldBatchWithoutSize() {
+
+        RedisCommand<Object, Object, Object> c1 = createCommand();
+        RedisCommand<Object, Object, Object> c2 = createCommand();
+
+        SimpleBatcher batcher = new SimpleBatcher(connection, -1);
+
+        batcher.batch(c1, null);
+
+        verify(connection).dispatch(c1);
+
+        batcher.batch(c2, null);
+
+        verify(connection).dispatch(c2);
+    }
+
+    @Test
+    public void shouldBatchWithBatchControlQueue() {
+
+        RedisCommand<Object, Object, Object> c1 = createCommand();
+        RedisCommand<Object, Object, Object> c2 = createCommand();
+        RedisCommand<Object, Object, Object> c3 = createCommand();
+        RedisCommand<Object, Object, Object> c4 = createCommand();
+
+        SimpleBatcher batcher = new SimpleBatcher(connection, 2);
+
+        batcher.batch(c1, CommandBatching.queue());
+        batcher.batch(c2, CommandBatching.queue());
+        verifyZeroInteractions(connection);
+
+        batcher.batch(c3, null);
+
+        verify(connection).dispatch(Arrays.asList(c1, c2));
+    }
+
+    @Test
+    public void shouldBatchWithBatchControlQueueOverqueue() {
+
+        RedisCommand<Object, Object, Object> c1 = createCommand();
+        RedisCommand<Object, Object, Object> c2 = createCommand();
+        RedisCommand<Object, Object, Object> c3 = createCommand();
+        RedisCommand<Object, Object, Object> c4 = createCommand();
+        RedisCommand<Object, Object, Object> c5 = createCommand();
+
+        SimpleBatcher batcher = new SimpleBatcher(connection, 2);
+
+        batcher.batch(c1, CommandBatching.queue());
+        batcher.batch(c2, CommandBatching.queue());
+        batcher.batch(c3, CommandBatching.queue());
+        batcher.batch(c4, CommandBatching.queue());
+        verifyZeroInteractions(connection);
+
+        batcher.batch(c5, null);
+
+        verify(connection).dispatch(Arrays.asList(c1, c2));
+        verify(connection).dispatch(Arrays.asList(c3, c4));
+    }
+
+    @Test
+    public void shouldBatchWithBatchControlFlush() {
+
+        RedisCommand<Object, Object, Object> c1 = createCommand();
+        RedisCommand<Object, Object, Object> c2 = createCommand();
+        RedisCommand<Object, Object, Object> c3 = createCommand();
+
+        SimpleBatcher batcher = new SimpleBatcher(connection, 4);
+
+        batcher.batch(c1, null);
+        batcher.batch(c2, CommandBatching.flush());
+
+        verify(connection).dispatch(Arrays.asList(c1, c2));
+    }
+
+    private static RedisCommand<Object, Object, Object> createCommand() {
+        return new AsyncCommand<>(new Command<>(CommandType.COMMAND, null, null));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java b/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java
index 61d4f4a51c..7f43d0314d 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java
@@ -30,6 +30,7 @@
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.codec.StringCodec;
 import com.lambdaworks.redis.dynamic.CommandMethod;
+import com.lambdaworks.redis.dynamic.DeclaredCommandMethod;
 import com.lambdaworks.redis.dynamic.annotation.Key;
 import com.lambdaworks.redis.dynamic.annotation.Value;
 import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
@@ -99,14 +100,15 @@ public void shouldDiscoverCodecTypesFromWrappers() {
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "withWrappers", Range.class,
                 com.lambdaworks.redis.Value.class);
 
-        Set<Class<?>> types = new AnnotationRedisCodecResolver(codecs).findTypes(new CommandMethod(method), Value.class);
+        Set<Class<?>> types = new AnnotationRedisCodecResolver(codecs).findTypes(DeclaredCommandMethod.create(method),
+                Value.class);
 
         assertThat(types).contains(String.class, Number.class);
     }
 
     protected RedisCodec<?, ?> resolve(Method method) {
 
-        CommandMethod commandMethod = new CommandMethod(method);
+        CommandMethod commandMethod = DeclaredCommandMethod.create(method);
         AnnotationRedisCodecResolver resolver = new AnnotationRedisCodecResolver(codecs);
 
         return resolver.resolve(commandMethod);
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java b/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java
index 00fe34db28..e6eea7cb66 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java
@@ -26,6 +26,7 @@
 
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.dynamic.CommandMethod;
+import com.lambdaworks.redis.dynamic.DeclaredCommandMethod;
 import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
 import com.lambdaworks.redis.output.*;
 
@@ -87,7 +88,7 @@ public void shouldResolveMapsOutput() {
     protected CommandOutput<?, ?, ?> getCommandOutput(String methodName) {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, methodName);
-        CommandMethod commandMethod = new CommandMethod(method);
+        CommandMethod commandMethod = DeclaredCommandMethod.create(method);
 
         CommandOutputFactory factory = resolver
                 .resolveCommandOutput(new OutputSelector(commandMethod.getReturnType(), new ByteBufferAndStringCodec()));
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java b/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
index 602cad95bd..1e51436aa4 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
@@ -27,7 +27,7 @@
 import com.lambdaworks.redis.ScoredValue;
 import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.dynamic.CommandMethod;
+import com.lambdaworks.redis.dynamic.DeclaredCommandMethod;
 import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
 import com.lambdaworks.redis.output.*;
 
@@ -151,7 +151,7 @@ public void stringWildcardValueCollectionIsAssignableFromOutputs() {
     private OutputSelector getOutputSelector(String methodName) {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, methodName);
-        return new OutputSelector(new CommandMethod(method).getActualReturnType(), StringCodec.UTF8);
+        return new OutputSelector(DeclaredCommandMethod.create(method).getActualReturnType(), StringCodec.UTF8);
     }
 
     private static interface CommandMethods {
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
index fbaeda6e10..695084ad97 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
@@ -17,9 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.lambdaworks.redis.dynamic.CommandMethod;
 import org.junit.Test;
 
+import com.lambdaworks.redis.dynamic.CommandMethod;
+import com.lambdaworks.redis.dynamic.DeclaredCommandMethod;
 import com.lambdaworks.redis.dynamic.annotation.Command;
 import com.lambdaworks.redis.dynamic.annotation.CommandNaming;
 import com.lambdaworks.redis.dynamic.annotation.CommandNaming.LetterCase;
@@ -36,7 +37,8 @@ public class AnnotationCommandSegmentFactoryTest {
     @Test
     public void notAnnotatedDotAsIs() {
 
-        CommandMethod commandMethod = new CommandMethod(ReflectionUtils.findMethod(CommandMethods.class, "notAnnotated"));
+        CommandMethod commandMethod = DeclaredCommandMethod.create(ReflectionUtils.findMethod(CommandMethods.class,
+                "notAnnotated"));
 
         CommandSegments commandSegments = factory.createCommandSegments(commandMethod);
 
@@ -47,7 +49,8 @@ public void notAnnotatedDotAsIs() {
     @Test
     public void uppercaseDot() {
 
-        CommandMethod commandMethod = new CommandMethod(ReflectionUtils.findMethod(CommandMethods.class, "upperCase"));
+        CommandMethod commandMethod = DeclaredCommandMethod.create(ReflectionUtils
+                .findMethod(CommandMethods.class, "upperCase"));
 
         CommandSegments commandSegments = factory.createCommandSegments(commandMethod);
 
@@ -58,7 +61,8 @@ public void uppercaseDot() {
     @Test
     public void methodNameAsIs() {
 
-        CommandMethod commandMethod = new CommandMethod(ReflectionUtils.findMethod(CommandMethods.class, "methodName"));
+        CommandMethod commandMethod = DeclaredCommandMethod.create(ReflectionUtils.findMethod(CommandMethods.class,
+                "methodName"));
 
         CommandSegments commandSegments = factory.createCommandSegments(commandMethod);
 
@@ -69,7 +73,8 @@ public void methodNameAsIs() {
     @Test
     public void splitAsIs() {
 
-        CommandMethod commandMethod = new CommandMethod(ReflectionUtils.findMethod(CommandMethods.class, "clientSetname"));
+        CommandMethod commandMethod = DeclaredCommandMethod.create(ReflectionUtils.findMethod(CommandMethods.class,
+                "clientSetname"));
 
         CommandSegments commandSegments = factory.createCommandSegments(commandMethod);
 
@@ -80,7 +85,8 @@ public void splitAsIs() {
     @Test
     public void commandAnnotation() {
 
-        CommandMethod commandMethod = new CommandMethod(ReflectionUtils.findMethod(CommandMethods.class, "atCommand"));
+        CommandMethod commandMethod = DeclaredCommandMethod.create(ReflectionUtils
+                .findMethod(CommandMethods.class, "atCommand"));
 
         CommandSegments commandSegments = factory.createCommandSegments(commandMethod);
 
@@ -91,7 +97,8 @@ public void commandAnnotation() {
     @Test
     public void splitDefault() {
 
-        CommandMethod commandMethod = new CommandMethod(ReflectionUtils.findMethod(Defaulted.class, "clientSetname"));
+        CommandMethod commandMethod = DeclaredCommandMethod
+                .create(ReflectionUtils.findMethod(Defaulted.class, "clientSetname"));
 
         CommandSegments commandSegments = factory.createCommandSegments(commandMethod);
 

From 30c5798ca936c6b961a460de867fb1ed5a3b6ff8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 2 Feb 2017 15:20:34 +0100
Subject: [PATCH 137/808] Polishing

---
 .../redis/dynamic/ParameterBinder.java        | 20 +++++++++----------
 .../redis/dynamic/annotation/Command.java     | 20 ++++++++++---------
 .../redis/dynamic/parameter/Parameters.java   |  9 ++++++---
 .../segment/CommandSegmentFactory.java        |  2 +-
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java b/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
index 84d35a5d69..fdbf1de63f 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
@@ -25,8 +25,8 @@
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
 import com.lambdaworks.redis.dynamic.segment.CommandSegment;
-import com.lambdaworks.redis.dynamic.segment.CommandSegment.ArgumentContribution;
 import com.lambdaworks.redis.dynamic.segment.CommandSegments;
+import com.lambdaworks.redis.dynamic.segment.CommandSegment.ArgumentContribution;
 import com.lambdaworks.redis.protocol.CommandArgs;
 import com.lambdaworks.redis.protocol.ProtocolKeyword;
 
@@ -147,7 +147,7 @@ private <K, V> void bind(CommandArgs<K, V> args, RedisCodec<K, V> codec, Object
      * Composite Arguments).
      */
     @SuppressWarnings("unchecked")
-    private <K, V> void bindArgument(CommandArgs<K, V> args, Object argument) {
+    private static <K, V> void bindArgument(CommandArgs<K, V> args, Object argument) {
 
         if (argument instanceof String) {
             args.add((String) argument);
@@ -230,13 +230,13 @@ private <K, V> void bindArgument(CommandArgs<K, V> args, Object argument) {
         }
     }
 
-    private <K, V> void bindValueRange(CommandArgs<K, V> args, RedisCodec<K, V> codec, Range<? extends V> range) {
+    private static <K, V> void bindValueRange(CommandArgs<K, V> args, RedisCodec<K, V> codec, Range<? extends V> range) {
 
         args.add(minValue(codec, range));
         args.add(maxValue(codec, range));
     }
 
-    private <K, V> void bindNumericRange(CommandArgs<K, V> args, Range<? extends Number> range) {
+    private static <K, V> void bindNumericRange(CommandArgs<K, V> args, Range<? extends Number> range) {
 
         if (range.getLower().getValue() != null && !(range.getLower().getValue() instanceof Number)) {
             throw new IllegalArgumentException(
@@ -252,7 +252,7 @@ private <K, V> void bindNumericRange(CommandArgs<K, V> args, Range<? extends Num
         args.add(maxNumeric(range));
     }
 
-    private String minNumeric(Range<? extends Number> range) {
+    private static String minNumeric(Range<? extends Number> range) {
 
         Range.Boundary<? extends Number> lower = range.getLower();
 
@@ -268,7 +268,7 @@ private String minNumeric(Range<? extends Number> range) {
         return lower.getValue().toString();
     }
 
-    private String maxNumeric(Range<? extends Number> range) {
+    private static String maxNumeric(Range<? extends Number> range) {
 
         Range.Boundary<? extends Number> upper = range.getUpper();
 
@@ -284,15 +284,15 @@ private String maxNumeric(Range<? extends Number> range) {
         return upper.getValue().toString();
     }
 
-    private <K, V> byte[] minValue(RedisCodec<K, V> codec, Range<? extends V> range) {
+    private static <K, V> byte[] minValue(RedisCodec<K, V> codec, Range<? extends V> range) {
         return valueRange(range.getLower(), MINUS_BYTES, codec);
     }
 
-    private <K, V> byte[] maxValue(RedisCodec<K, V> codec, Range<? extends V> range) {
+    private static <K, V> byte[] maxValue(RedisCodec<K, V> codec, Range<? extends V> range) {
         return valueRange(range.getUpper(), PLUS_BYTES, codec);
     }
 
-    private <K, V> byte[] valueRange(Range.Boundary<? extends V> boundary, byte[] unbounded, RedisCodec<K, V> codec) {
+    private static <K, V> byte[] valueRange(Range.Boundary<? extends V> boundary, byte[] unbounded, RedisCodec<K, V> codec) {
 
         if (boundary.getValue() == null) {
             return unbounded;
@@ -308,7 +308,7 @@ private <K, V> byte[] valueRange(Range.Boundary<? extends V> boundary, byte[] un
         return argument;
     }
 
-    private Object asIterable(Object argument) {
+    private static Object asIterable(Object argument) {
 
         if (argument.getClass().getComponentType().isPrimitive()) {
 
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java
index 1fcb8ee625..773fb62e03 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java
@@ -15,10 +15,10 @@
  */
 package com.lambdaworks.redis.dynamic.annotation;
 
-import com.lambdaworks.redis.dynamic.domain.Timeout;
-
 import java.lang.annotation.*;
 
+import com.lambdaworks.redis.dynamic.domain.Timeout;
+
 /**
  * Redis command method annotation specifying a command string. A command string can contain the command name, a sequence of
  * command string bytes and parameter references.
@@ -28,13 +28,15 @@
  * {@link com.lambdaworks.redis.codec.RedisCodec} for codec resolution. Additional parameter types such as {@link Timeout}
  * control execution behavior and are not added to command arguments.
  * <p>
- * Usage <code><pre>
-    &#64;Command("SET ?0 ?1")
-    public String setKey(String key, String value)
-
-    &#64;Command("SET :key :value")
-    public String setKeyNamed(@Param("key") String key, @Param("value") String value)
-    </pre></code>
+ * Usage:
+ * 
+ * <pre class="code">
+ *     &#64;Command("SET ?0 ?1")
+ *     public String setKey(String key, String value)
+ * 
+ *     &#64;Command("SET :key :value")
+ *     public String setKeyNamed(@Param("key") String key, @Param("value") String value)
+ * </pre>
  * <p>
  * Implementation notes: A {@link Command#value()} is split into command segments of which each segment is represented as ASCII
  * string or parameter reference.
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java
index 58e321fadb..b38d1a4347 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java
@@ -15,13 +15,13 @@
  */
 package com.lambdaworks.redis.dynamic.parameter;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import com.lambdaworks.redis.internal.LettuceAssert;
+
 /**
  * Base class to abstract method {@link Parameter}s.
  * 
@@ -44,7 +44,10 @@ public Parameters(Method method) {
         this.parameters = new ArrayList<>(method.getParameterCount());
 
         for (int i = 0; i < method.getParameterCount(); i++) {
-            parameters.add(createParameter(method, i));
+
+            P parameter = createParameter(method, i);
+
+            parameters.add(parameter);
         }
 
         this.bindableParameters = createBindableParameters();
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java
index 2a9dd84b66..88f6206a96 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java
@@ -18,7 +18,7 @@
 import com.lambdaworks.redis.dynamic.CommandMethod;
 
 /**
- * Strategy interface to create {@link CommandSegments} for a {@link CommandMethod}.l
+ * Strategy interface to create {@link CommandSegments} for a {@link CommandMethod}.
  * 
  * @author Mark Paluch
  * @since 5.0

From 939c656ee38127ef9e1df2990bc33a6bcbb5bf4d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 7 Feb 2017 22:44:14 +0100
Subject: [PATCH 138/808] Fix repeatable read from
 ReconnectionHandler.currentFuture

ReconnectionHandler.prepareClose uses a local copy of currentFuture to avoid a concurrent write to the Future to cause a NullPointerException.
---
 .../java/com/lambdaworks/redis/protocol/ReconnectionHandler.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java b/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java
index 3b8a9a4dc9..01ee7e6a16 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java
@@ -149,6 +149,7 @@ void setTimeout(long timeout) {
 
     void prepareClose() {
 
+        ChannelFuture currentFuture = this.currentFuture;
         if (currentFuture != null && !currentFuture.isDone()) {
             currentFuture.cancel(true);
         }

From 57448b08a9a15dae7b4d11124bbdf8e75c300c2e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 9 Feb 2017 20:47:55 +0100
Subject: [PATCH 139/808] Create JMH tests for Redis Command Interfaces

---
 .../dynamic/RedisCommandFactoryBenchmark.java | 103 ++++++++++++++++++
 .../redis/dynamic/RedisCommandsBenchmark.java |  99 +++++++++++++++++
 2 files changed, 202 insertions(+)
 create mode 100644 src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandFactoryBenchmark.java
 create mode 100644 src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandsBenchmark.java

diff --git a/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandFactoryBenchmark.java b/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandFactoryBenchmark.java
new file mode 100644
index 0000000000..9735370b50
--- /dev/null
+++ b/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandFactoryBenchmark.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import org.mockito.Mockito;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.dynamic.batch.BatchSize;
+
+/**
+ * @author Mark Paluch
+ */
+@State(Scope.Benchmark)
+public class RedisCommandFactoryBenchmark {
+
+    private RedisCommandFactory redisCommandFactory;
+    private RegularCommands regularCommands;
+    private RedisAsyncCommandsImpl<String, String> asyncCommands;
+
+    @Setup
+    public void setup() {
+
+        redisCommandFactory = new RedisCommandFactory(new MockStatefulConnection(EmptyRedisChannelWriter.INSTANCE));
+        regularCommands = redisCommandFactory.getCommands(RegularCommands.class);
+
+        asyncCommands = new RedisAsyncCommandsImpl<>(EmptyStatefulRedisConnection.INSTANCE, StringCodec.UTF8);
+    }
+
+    @Benchmark
+    public void createRegularCommands() {
+        redisCommandFactory.getCommands(RegularCommands.class);
+    }
+
+    @Benchmark
+    public void createBatchCommands() {
+        redisCommandFactory.getCommands(BatchCommands.class);
+    }
+
+    @Benchmark
+    public void executeCommandInterfaceCommand() {
+        regularCommands.set("key", "value");
+    }
+
+    @Benchmark
+    public void executeAsyncCommand() {
+        asyncCommands.set("key", "value");
+    }
+
+    interface RegularCommands extends Commands {
+
+        RedisFuture<String> set(String key, String value);
+    }
+
+    @BatchSize(10)
+    interface BatchCommands extends Commands {
+
+        void set(String key, String value);
+    }
+
+    static class MockStatefulConnection extends EmptyStatefulRedisConnection {
+
+        RedisCommands sync;
+        RedisReactiveCommands reactive;
+
+        public MockStatefulConnection(RedisChannelWriter writer) {
+            super(writer);
+
+            sync = Mockito.mock(RedisCommands.class);
+            reactive = (RedisReactiveCommands) Mockito.mock(AbstractRedisReactiveCommands.class, Mockito.withSettings()
+                    .extraInterfaces(RedisReactiveCommands.class));
+        }
+
+        @Override
+        public RedisCommands sync() {
+            return sync;
+        }
+
+        @Override
+        public RedisReactiveCommands reactive() {
+            return reactive;
+        }
+    }
+}
diff --git a/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandsBenchmark.java b/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandsBenchmark.java
new file mode 100644
index 0000000000..7ce23659b2
--- /dev/null
+++ b/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandsBenchmark.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.openjdk.jmh.annotations.*;
+
+import com.lambdaworks.redis.RedisClient;
+import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.TestSettings;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.codec.ByteArrayCodec;
+import com.lambdaworks.redis.dynamic.batch.BatchSize;
+
+/**
+ * @author Mark Paluch
+ */
+@State(Scope.Benchmark)
+public class RedisCommandsBenchmark {
+
+    private final static int BATCH_SIZE = 20;
+
+    private RedisClient redisClient;
+    private StatefulRedisConnection<byte[], byte[]> connection;
+    private CompletableFuture commands[];
+    private RegularCommands regularCommands;
+    private BatchCommands batchCommands;
+
+    @Setup
+    public void setup() {
+
+        redisClient = RedisClient.create(RedisURI.create(TestSettings.host(), TestSettings.port()));
+        connection = redisClient.connect(ByteArrayCodec.INSTANCE);
+
+        RedisCommandFactory redisCommandFactory = new RedisCommandFactory(connection);
+        regularCommands = redisCommandFactory.getCommands(RegularCommands.class);
+        batchCommands = redisCommandFactory.getCommands(BatchCommands.class);
+        commands = new CompletableFuture[BATCH_SIZE];
+    }
+
+    @TearDown
+    public void tearDown() {
+
+        connection.close();
+        redisClient.shutdown();
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(BATCH_SIZE)
+    public void asyncSet() {
+
+        for (int i = 0; i < BATCH_SIZE; i++) {
+            commands[i] = regularCommands.set("key", "value").toCompletableFuture();
+        }
+
+        CompletableFuture.allOf(commands).join();
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(BATCH_SIZE)
+    public void batchSet() {
+
+        for (int i = 0; i < BATCH_SIZE; i++) {
+            batchCommands.set("key", "value");
+        }
+    }
+
+    interface RegularCommands extends Commands {
+
+        RedisFuture<String> set(String key, String value);
+    }
+
+    @BatchSize(BATCH_SIZE)
+    interface BatchCommands extends Commands {
+
+        void set(String key, String value);
+    }
+
+    public static void main(String[] args) {
+        RedisCommandsBenchmark b = new RedisCommandsBenchmark();
+        b.setup();
+        b.asyncSet();
+    }
+}

From 97f1af94779f0856907e21ab90fdef7be7c99052 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 9 Feb 2017 20:53:05 +0100
Subject: [PATCH 140/808] Polishing

---
 .../lambdaworks/redis/RedisClientBenchmark.java   | 15 ++++++++++++++-
 ...ClusterDistributionChannelWriterBenchmark.java |  2 ++
 .../cluster/RedisClusterClientBenchmark.java      | 11 +++++++++++
 .../redis/codec/StringCodecBenchmark.java         |  2 ++
 .../redis/codec/Utf8StringCodecBenchmark.java     |  2 ++
 .../dynamic/RedisCommandFactoryBenchmark.java     |  2 ++
 .../redis/dynamic/RedisCommandsBenchmark.java     |  2 ++
 .../redis/protocol/RedisEndpointBenchmark.java    |  4 +++-
 .../protocol/RedisStateMachineBenchmark.java      |  2 ++
 9 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/test/jmh/com/lambdaworks/redis/RedisClientBenchmark.java b/src/test/jmh/com/lambdaworks/redis/RedisClientBenchmark.java
index edb4785f8b..2d6c63705e 100644
--- a/src/test/jmh/com/lambdaworks/redis/RedisClientBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/RedisClientBenchmark.java
@@ -15,15 +15,28 @@
  */
 package com.lambdaworks.redis;
 
-import com.lambdaworks.redis.codec.ByteArrayCodec;
 import org.openjdk.jmh.annotations.*;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.codec.ByteArrayCodec;
 
 /**
+ * Benchmark for {@link RedisClient}.
+ * <p>
+ * Test cases:
+ * <ul>
+ * <li>synchronous command execution</li>
+ * <li>asynchronous command execution</li>
+ * <li>asynchronous command execution with batching</li>
+ * <li>asynchronous command execution with delayed flushing</li>
+ * <li>reactive command execution</li>
+ * <li>reactive command execution with batching</li>
+ * <li>reactive command execution with delayed flushing</li>
+ * </ul>
+ *
  * @author Mark Paluch
  */
 @State(Scope.Benchmark)
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java b/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java
index 7e251773b9..7bec1a731f 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java
@@ -40,6 +40,8 @@
 import com.lambdaworks.redis.protocol.CommandType;
 
 /**
+ * Benchmark for {@link ClusterDistributionChannelWriter}.
+ *
  * @author Mark Paluch
  */
 @State(Scope.Benchmark)
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/RedisClusterClientBenchmark.java b/src/test/jmh/com/lambdaworks/redis/cluster/RedisClusterClientBenchmark.java
index 1471d91d69..7bf8eaa623 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/RedisClusterClientBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/cluster/RedisClusterClientBenchmark.java
@@ -27,6 +27,17 @@
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 
 /**
+ * Benchmark for {@link RedisClusterClient}.
+ * <ul>
+ * <li>synchronous command execution</li>
+ * <li>asynchronous command execution</li>
+ * <li>asynchronous command execution with batching</li>
+ * <li>asynchronous command execution with delayed flushing</li>
+ * <li>reactive command execution</li>
+ * <li>reactive command execution with batching</li>
+ * <li>reactive command execution with delayed flushing</li>
+ * </ul>
+ * 
  * @author Mark Paluch
  */
 @State(Scope.Benchmark)
diff --git a/src/test/jmh/com/lambdaworks/redis/codec/StringCodecBenchmark.java b/src/test/jmh/com/lambdaworks/redis/codec/StringCodecBenchmark.java
index c435f3111a..cd3541bdcb 100644
--- a/src/test/jmh/com/lambdaworks/redis/codec/StringCodecBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/codec/StringCodecBenchmark.java
@@ -30,6 +30,8 @@
 import io.netty.buffer.Unpooled;
 
 /**
+ * Benchmark for {@link StringCodec}.
+ * 
  * @author Mark Paluch
  */
 public class StringCodecBenchmark {
diff --git a/src/test/jmh/com/lambdaworks/redis/codec/Utf8StringCodecBenchmark.java b/src/test/jmh/com/lambdaworks/redis/codec/Utf8StringCodecBenchmark.java
index 3d19ce10a8..facdefcaaf 100644
--- a/src/test/jmh/com/lambdaworks/redis/codec/Utf8StringCodecBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/codec/Utf8StringCodecBenchmark.java
@@ -26,6 +26,8 @@
 import com.lambdaworks.redis.protocol.LettuceCharsets;
 
 /**
+ * Benchmark for {@link Utf8StringCodec}.
+ *
  * @author Mark Paluch
  */
 public class Utf8StringCodecBenchmark {
diff --git a/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandFactoryBenchmark.java b/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandFactoryBenchmark.java
index 9735370b50..222a0ff20b 100644
--- a/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandFactoryBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandFactoryBenchmark.java
@@ -28,6 +28,8 @@
 import com.lambdaworks.redis.dynamic.batch.BatchSize;
 
 /**
+ * Benchmark for commands executed through {@link RedisCommandFactory}.
+ *
  * @author Mark Paluch
  */
 @State(Scope.Benchmark)
diff --git a/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandsBenchmark.java b/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandsBenchmark.java
index 7ce23659b2..19c84aa61b 100644
--- a/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandsBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandsBenchmark.java
@@ -28,6 +28,8 @@
 import com.lambdaworks.redis.dynamic.batch.BatchSize;
 
 /**
+ * Benchmark for commands executed through {@link StatefulRedisConnection}.
+ *
  * @author Mark Paluch
  */
 @State(Scope.Benchmark)
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java b/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java
index 84cd087ef1..0e0126eefb 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java
@@ -27,7 +27,9 @@
 import io.netty.channel.embedded.EmbeddedChannel;
 
 /**
- * Benchmark for {@link DefaultEndpoint}. Test cases:
+ * Benchmark for {@link DefaultEndpoint}.
+ * <p>
+ * Test cases:
  * <ul>
  * <li>user command writes</li>
  * </ul>
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java b/src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java
index 1a81c186a1..e67019df36 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java
@@ -27,6 +27,8 @@
 import io.netty.buffer.PooledByteBufAllocator;
 
 /**
+ * Bechmark for {@link RedisStateMachine}.
+ *
  * @author Mark Paluch
  */
 @State(Scope.Benchmark)

From f1f8cf00ec7c522417f3894dbf44f4a6f3cffd67 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 9 Feb 2017 21:28:32 +0100
Subject: [PATCH 141/808] Use String-Codec for COMMAND #467

Encode and decode COMMAND command execution with Utf8StringCodec. Command responses are known to use strings so it's not required to use a different codec.
---
 .../redis/RedisCommandBuilder.java            | 67 +++++++++----------
 .../redis/dynamic/RedisCommandsSyncTest.java  |  7 +-
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
index 71878ab8df..2150664708 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
@@ -19,16 +19,12 @@
 import static com.lambdaworks.redis.protocol.CommandKeyword.*;
 import static com.lambdaworks.redis.protocol.CommandType.*;
 
-import java.util.*;
 import java.nio.ByteBuffer;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.codec.Utf8StringCodec;
 import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceLists;
 import com.lambdaworks.redis.output.*;
 import com.lambdaworks.redis.protocol.BaseRedisCommandBuilder;
 import com.lambdaworks.redis.protocol.Command;
@@ -50,6 +46,8 @@ class RedisCommandBuilder<K, V> extends BaseRedisCommandBuilder<K, V> {
     private static final byte[] MINUS_BYTES = { '-' };
     private static final byte[] PLUS_BYTES = { '+' };
 
+    private final RedisCodec<String, String> STRING_CODEC = new Utf8StringCodec();
+
     public RedisCommandBuilder(RedisCodec<K, V> codec) {
         super(codec);
     }
@@ -229,8 +227,8 @@ public Command<K, V, String> clientList() {
     }
 
     public Command<K, V, List<Object>> command() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        return createCommand(COMMAND, new ArrayOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<K, V>((RedisCodec) STRING_CODEC);
+        return createCommand(COMMAND, new ArrayOutput<K, V>((RedisCodec) STRING_CODEC), args);
     }
 
     public Command<K, V, List<Object>> commandInfo(String... commands) {
@@ -238,14 +236,14 @@ public Command<K, V, List<Object>> commandInfo(String... commands) {
         LettuceAssert.notEmpty(commands, "Commands " + MUST_NOT_BE_EMPTY);
         LettuceAssert.noNullElements(commands, "Commands " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<K, V>((RedisCodec) STRING_CODEC);
         args.add(INFO);
 
         for (String command : commands) {
             args.add(command);
         }
 
-        return createCommand(COMMAND, new ArrayOutput<K, V>(codec), args);
+        return createCommand(COMMAND, new ArrayOutput<K, V>((RedisCodec) STRING_CODEC), args);
     }
 
     public Command<K, V, Long> commandCount() {
@@ -1703,8 +1701,7 @@ public Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key
         return createCommand(ZRANGEBYSCORE, new ValueStreamingOutput<K, V>(codec, channel), args);
     }
 
-    public Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
-            Limit limit) {
+    public Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
         notNullKey(key);
         notNullRange(range);
         notNullLimit(limit);
@@ -1871,13 +1868,11 @@ public Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Str
         return createCommand(ZREVRANGEBYSCORE, new ScoredValueListOutput<K, V>(codec), args);
     }
 
-    public Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset,
-            long count) {
+    public Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count) {
         return zrevrangebyscoreWithScores(key, string(max), string(min), offset, count);
     }
 
-    public Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset,
-            long count) {
+    public Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count) {
         notNullKey(key);
         notNullMinMax(min, max);
 
@@ -1954,13 +1949,11 @@ public Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K
         return createCommand(ZREVRANGEBYSCORE, new ValueStreamingOutput<K, V>(codec, channel), args);
     }
 
-    public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max,
-            double min) {
+    public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min) {
         return zrevrangebyscoreWithScores(channel, key, string(max), string(min));
     }
 
-    public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max,
-            String min) {
+    public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min) {
         notNullKey(key);
         notNullMinMax(min, max);
         notNull(channel);
@@ -1970,8 +1963,8 @@ public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChanne
         return createCommand(ZREVRANGEBYSCORE, new ScoredValueStreamingOutput<K, V>(codec, channel), args);
     }
 
-    public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min,
-            long offset, long count) {
+    public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max,
+            double min, long offset, long count) {
         notNullKey(key);
         LettuceAssert.notNull(min, "Min " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(max, "Max " + MUST_NOT_BE_NULL);
@@ -1979,8 +1972,8 @@ public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChanne
         return zrevrangebyscoreWithScores(channel, key, string(max), string(min), offset, count);
     }
 
-    public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min,
-            long offset, long count) {
+    public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max,
+            String min, long offset, long count) {
         notNullKey(key);
         notNullMinMax(min, max);
         notNull(channel);
@@ -2266,8 +2259,7 @@ public Command<K, V, StreamScanCursor> hscanStreaming(KeyValueStreamingChannel<K
         return hscanStreaming(channel, key, ScanCursor.INITIAL, null);
     }
 
-    public Command<K, V, StreamScanCursor> hscanStreaming(KeyValueStreamingChannel<K, V> channel, K key,
-            ScanCursor scanCursor) {
+    public Command<K, V, StreamScanCursor> hscanStreaming(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor) {
         notNullKey(key);
         notNull(channel);
 
@@ -2332,8 +2324,7 @@ public Command<K, V, StreamScanCursor> zscanStreaming(ScoredValueStreamingChanne
         return zscanStreaming(channel, key, ScanCursor.INITIAL, null);
     }
 
-    public Command<K, V, StreamScanCursor> zscanStreaming(ScoredValueStreamingChannel<V> channel, K key,
-            ScanCursor scanCursor) {
+    public Command<K, V, StreamScanCursor> zscanStreaming(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
         notNullKey(key);
         notNull(channel);
 
@@ -2601,8 +2592,10 @@ public Command<K, V, Long> geoadd(K key, Object[] lngLatMember) {
         LettuceAssert.notNull(lngLatMember, "LngLatMember " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(lngLatMember, "LngLatMember " + MUST_NOT_BE_EMPTY);
         LettuceAssert.noNullElements(lngLatMember, "LngLatMember " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
-        LettuceAssert.isTrue(lngLatMember.length % 3 == 0, "LngLatMember.length must be a multiple of 3 and contain a "
-                + "sequence of longitude1, latitude1, member1, longitude2, latitude2, member2, ... longitudeN, latitudeN, memberN");
+        LettuceAssert
+                .isTrue(lngLatMember.length % 3 == 0,
+                        "LngLatMember.length must be a multiple of 3 and contain a "
+                                + "sequence of longitude1, latitude1, member1, longitude2, latitude2, member2, ... longitudeN, latitudeN, memberN");
 
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key);
 
@@ -2683,8 +2676,10 @@ public Command<K, V, List<GeoWithin<V>>> georadiusbymember(K key, V member, doub
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValue(member).add(distance).add(unit);
         geoArgs.build(args);
 
-        return createCommand(GEORADIUSBYMEMBER, new GeoWithinListOutput<K, V>(codec, geoArgs.isWithDistance(),
-                geoArgs.isWithHash(), geoArgs.isWithCoordinates()), args);
+        return createCommand(
+                GEORADIUSBYMEMBER,
+                new GeoWithinListOutput<K, V>(codec, geoArgs.isWithDistance(), geoArgs.isWithHash(), geoArgs
+                        .isWithCoordinates()), args);
     }
 
     public Command<K, V, Long> georadiusbymember(K key, V member, double distance, String unit,
@@ -2801,8 +2796,8 @@ private String min(Range<? extends Number> range) {
 
         Range.Boundary<? extends Number> lower = range.getLower();
 
-        if (lower.getValue() == null
-                || lower.getValue() instanceof Double && lower.getValue().doubleValue() == Double.NEGATIVE_INFINITY) {
+        if (lower.getValue() == null || lower.getValue() instanceof Double
+                && lower.getValue().doubleValue() == Double.NEGATIVE_INFINITY) {
             return "-inf";
         }
 
@@ -2817,8 +2812,8 @@ private String max(Range<? extends Number> range) {
 
         Range.Boundary<? extends Number> upper = range.getUpper();
 
-        if (upper.getValue() == null
-                || upper.getValue() instanceof Double && upper.getValue().doubleValue() == Double.POSITIVE_INFINITY) {
+        if (upper.getValue() == null || upper.getValue() instanceof Double
+                && upper.getValue().doubleValue() == Double.POSITIVE_INFINITY) {
             return "+inf";
         }
 
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsSyncTest.java b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsSyncTest.java
index efc16a4616..c7afbde633 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsSyncTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsSyncTest.java
@@ -24,6 +24,8 @@
 
 import com.lambdaworks.redis.AbstractRedisClientTest;
 import com.lambdaworks.redis.Value;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.dynamic.annotation.Command;
 import com.lambdaworks.redis.dynamic.domain.Timeout;
 
@@ -35,13 +37,16 @@ public class RedisCommandsSyncTest extends AbstractRedisClientTest {
     @Test
     public void sync() throws Exception {
 
-        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+        StatefulRedisConnection<byte[], byte[]> connection = client.connect(ByteArrayCodec.INSTANCE);
+        RedisCommandFactory factory = new RedisCommandFactory(connection);
 
         MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
 
         api.setSync(key, value, Timeout.create(10, TimeUnit.SECONDS));
         assertThat(api.get("key")).isEqualTo("value");
         assertThat(api.getAsBytes("key")).isEqualTo("value".getBytes());
+
+        connection.close();
     }
 
     @Test

From c129121063110c277670431378c3df5103829b58 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 9 Feb 2017 21:36:58 +0100
Subject: [PATCH 142/808] Polishing

Enable commented ClusterDistributionChannelWriterBenchmark benchmarks.
---
 .../cluster/ClusterDistributionChannelWriterBenchmark.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java b/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java
index 7bec1a731f..111d86b801 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java
+++ b/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java
@@ -97,7 +97,7 @@ <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, Strin
         writer.setPartitions(partitions);
     }
 
-    // @Benchmark
+    @Benchmark
     public void writeKeyedCommand() {
         writer.write(KEYED_COMMAND1);
     }
@@ -114,7 +114,7 @@ public void write3KeyedCommandsAsBatch() {
         writer.write(COMMANDS);
     }
 
-    // @Benchmark
+    @Benchmark
     public void writePlainCommand() {
         writer.write(PLAIN_COMMAND);
     }

From 8b4c8dfe7f0872f4a6811856ae776fa063f24687 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 9 Feb 2017 22:25:01 +0100
Subject: [PATCH 143/808] Performance tuning #432

Cache types for RedisCodec. Cache annotations for a parameter. Cache future/reactive execution on DeclaredCommandMethod creation.
---
 .../CodecAwareMethodParametersAccessor.java   | 44 +++++++++++++++----
 .../dynamic/CommandSegmentCommandFactory.java |  7 ++-
 .../redis/dynamic/DeclaredCommandMethod.java  | 10 +++--
 .../redis/dynamic/ParameterBinder.java        | 32 +++++++-------
 .../intercept/InvocationProxyFactory.java     |  5 ++-
 .../redis/dynamic/parameter/Parameter.java    | 43 +++++++++++++-----
 6 files changed, 99 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java b/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java
index c843058071..c78397cbd4 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,13 +24,16 @@
 import com.lambdaworks.redis.internal.LettuceAssert;
 
 /**
+ * Codec-aware {@link MethodParametersAccessor}. Identifies key and value types by checking value compatibility with
+ * {@link RedisCodec} types.
+ * 
  * @author Mark Paluch
+ * @since 5.0
  */
-public class CodecAwareMethodParametersAccessor implements MethodParametersAccessor {
+class CodecAwareMethodParametersAccessor implements MethodParametersAccessor {
 
     private final MethodParametersAccessor delegate;
-    private final TypeInformation<?> keyType;
-    private final TypeInformation<?> valueType;
+    private final TypeContext typeContext;
 
     public CodecAwareMethodParametersAccessor(MethodParametersAccessor delegate, RedisCodec<?, ?> redisCodec) {
 
@@ -38,12 +41,16 @@ public CodecAwareMethodParametersAccessor(MethodParametersAccessor delegate, Red
         LettuceAssert.notNull(redisCodec, "RedisCodec must not be null");
 
         this.delegate = delegate;
+        this.typeContext = new TypeContext(redisCodec);
+    }
 
-        ClassTypeInformation<? extends RedisCodec> typeInformation = ClassTypeInformation.from(redisCodec.getClass());
+    public CodecAwareMethodParametersAccessor(MethodParametersAccessor delegate, TypeContext typeContext) {
 
-        this.keyType = typeInformation.getTypeArgument(RedisCodec.class, 0);
-        this.valueType = typeInformation.getTypeArgument(RedisCodec.class, 1);
+        LettuceAssert.notNull(delegate, "MethodParametersAccessor must not be null");
+        LettuceAssert.notNull(typeContext, "TypeContext must not be null");
 
+        this.delegate = delegate;
+        this.typeContext = typeContext;
     }
 
     @Override
@@ -69,7 +76,7 @@ public boolean isKey(int index) {
 
         Object bindableValue = getBindableValue(index);
 
-        if (bindableValue != null && keyType.getType().isAssignableFrom(bindableValue.getClass())) {
+        if (bindableValue != null && typeContext.keyType.getType().isAssignableFrom(bindableValue.getClass())) {
             return true;
         }
 
@@ -89,7 +96,7 @@ public boolean isValue(int index) {
 
         Object bindableValue = getBindableValue(index);
 
-        if (bindableValue != null && valueType.getType().isAssignableFrom(bindableValue.getClass())) {
+        if (bindableValue != null && typeContext.valueType.getType().isAssignableFrom(bindableValue.getClass())) {
             return true;
         }
 
@@ -110,4 +117,23 @@ public int resolveParameterIndex(String name) {
     public boolean isBindableNullValue(int index) {
         return delegate.isBindableNullValue(index);
     }
+
+    /**
+     * Cacheable type context for a {@link RedisCodec}.
+     */
+    public static class TypeContext {
+
+        final TypeInformation<?> keyType;
+        final TypeInformation<?> valueType;
+
+        public TypeContext(RedisCodec<?, ?> redisCodec) {
+
+            LettuceAssert.notNull(redisCodec, "RedisCodec must not be null");
+
+            ClassTypeInformation<? extends RedisCodec> typeInformation = ClassTypeInformation.from(redisCodec.getClass());
+
+            this.keyType = typeInformation.getTypeArgument(RedisCodec.class, 0);
+            this.valueType = typeInformation.getTypeArgument(RedisCodec.class, 1);
+        }
+    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
index c792b66889..3e05505e5b 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package com.lambdaworks.redis.dynamic;
 
 import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.dynamic.CodecAwareMethodParametersAccessor.TypeContext;
 import com.lambdaworks.redis.dynamic.output.CommandOutputFactory;
 import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
 import com.lambdaworks.redis.dynamic.output.OutputSelector;
@@ -41,6 +42,7 @@ class CommandSegmentCommandFactory implements CommandFactory {
     private final RedisCodec<Object, Object> redisCodec;
     private final ParameterBinder parameterBinder = new ParameterBinder();
     private final CommandOutputFactory outputFactory;
+    private final TypeContext typeContext;
 
     public CommandSegmentCommandFactory(CommandSegments commandSegments, CommandMethod commandMethod,
             RedisCodec<?, ?> redisCodec, CommandOutputFactoryResolver outputResolver) {
@@ -49,6 +51,7 @@ public CommandSegmentCommandFactory(CommandSegments commandSegments, CommandMeth
         this.commandMethod = commandMethod;
         this.redisCodec = (RedisCodec) redisCodec;
         this.outputResolver = outputResolver;
+        this.typeContext = new TypeContext(redisCodec);
 
         OutputSelector outputSelector = new OutputSelector(commandMethod.getActualReturnType(), redisCodec);
         CommandOutputFactory factory = resolveCommandOutputFactory(outputSelector);
@@ -83,7 +86,7 @@ protected CommandOutputFactory resolveCommandOutputFactory(OutputSelector output
     public RedisCommand<Object, Object, Object> createCommand(Object[] parameters) {
 
         MethodParametersAccessor parametersAccessor = new CodecAwareMethodParametersAccessor(
-                new DefaultMethodParametersAccessor(commandMethod.getParameters(), parameters), redisCodec);
+                new DefaultMethodParametersAccessor(commandMethod.getParameters(), parameters), typeContext);
 
         CommandArgs<Object, Object> args = new CommandArgs<>(redisCodec);
 
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethod.java b/src/main/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethod.java
index ad97e1e88d..6d20679bd7 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethod.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,8 @@ public class DeclaredCommandMethod implements CommandMethod {
     private final List<Class<?>> arguments = new ArrayList<>();
     private final ExecutionSpecificParameters parameters;
     private final ResolvableType actualReturnType;
+    private final boolean futureExecution;
+    private final boolean reactiveExecution;
 
     /**
      * Create a new {@link DeclaredCommandMethod} given a {@link Method}.
@@ -70,6 +72,8 @@ private DeclaredCommandMethod(Method method, ExecutionSpecificParameters paramet
         this.method = method;
         this.returnType = ResolvableType.forMethodReturnType(method);
         this.parameters = parameters;
+        this.futureExecution = Future.class.isAssignableFrom(getReturnType().getRawClass());
+        this.reactiveExecution = ReactiveTypes.supports(getReturnType().getRawClass());
 
         Collections.addAll(arguments, method.getParameterTypes());
 
@@ -163,7 +167,7 @@ public String getName() {
      */
     @Override
     public boolean isFutureExecution() {
-        return Future.class.isAssignableFrom(getReturnType().getRawClass());
+        return futureExecution;
     }
 
     /**
@@ -171,7 +175,7 @@ public boolean isFutureExecution() {
      */
     @Override
     public boolean isReactiveExecution() {
-        return ReactiveTypes.supports(getReturnType().getRawClass());
+        return reactiveExecution;
     }
 
     /**
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java b/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
index fdbf1de63f..4ef062f468 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,26 +55,28 @@ <K, V> CommandArgs<K, V> bind(CommandArgs<K, V> args, RedisCodec<K, V> codec, Co
 
         int parameterCount = accessor.getParameterCount();
 
-        Set<Integer> eatenParameters = new HashSet<>();
+        BitSet set = new BitSet(parameterCount);
 
         for (CommandSegment commandSegment : commandSegments) {
 
             ArgumentContribution argumentContribution = commandSegment.contribute(accessor);
             bind(args, codec, argumentContribution.getValue(), argumentContribution.getParameterIndex(), accessor);
 
-            eatenParameters.add(argumentContribution.getParameterIndex());
+            if (argumentContribution.getParameterIndex() != -1) {
+                set.set(argumentContribution.getParameterIndex());
+            }
         }
 
         for (int i = 0; i < parameterCount; i++) {
 
-            if (eatenParameters.contains(i)) {
+            if (set.get(i)) {
                 continue;
             }
 
             Object bindableValue = accessor.getBindableValue(i);
             bind(args, codec, bindableValue, i, accessor);
 
-            eatenParameters.add(i);
+            set.set(i);
         }
 
         return args;
@@ -172,8 +174,8 @@ private static <K, V> void bindArgument(CommandArgs<K, V> args, Object argument)
         if (argument instanceof ScoredValue) {
 
             ScoredValue<V> scoredValue = (ScoredValue<V>) argument;
-            V value = scoredValue.getValueOrElseThrow(
-                    () -> new IllegalArgumentException("Cannot bind empty ScoredValue to a Redis command."));
+            V value = scoredValue.getValueOrElseThrow(() -> new IllegalArgumentException(
+                    "Cannot bind empty ScoredValue to a Redis command."));
 
             args.add(scoredValue.getScore());
             args.addValue(value);
@@ -183,8 +185,8 @@ private static <K, V> void bindArgument(CommandArgs<K, V> args, Object argument)
         if (argument instanceof KeyValue) {
 
             KeyValue<K, V> keyValue = (KeyValue<K, V>) argument;
-            V value = keyValue
-                    .getValueOrElseThrow(() -> new IllegalArgumentException("Cannot bind empty KeyValue to a Redis command."));
+            V value = keyValue.getValueOrElseThrow(() -> new IllegalArgumentException(
+                    "Cannot bind empty KeyValue to a Redis command."));
 
             args.addKey(keyValue.getKey());
             args.addValue(value);
@@ -194,8 +196,8 @@ private static <K, V> void bindArgument(CommandArgs<K, V> args, Object argument)
         if (argument instanceof Value) {
 
             Value<V> valueWrapper = (Value<V>) argument;
-            V value = valueWrapper
-                    .getValueOrElseThrow(() -> new IllegalArgumentException("Cannot bind empty Value to a Redis command."));
+            V value = valueWrapper.getValueOrElseThrow(() -> new IllegalArgumentException(
+                    "Cannot bind empty Value to a Redis command."));
 
             args.addValue(value);
             return;
@@ -256,8 +258,8 @@ private static String minNumeric(Range<? extends Number> range) {
 
         Range.Boundary<? extends Number> lower = range.getLower();
 
-        if (lower.getValue() == null
-                || lower.getValue() instanceof Double && lower.getValue().doubleValue() == Double.NEGATIVE_INFINITY) {
+        if (lower.getValue() == null || lower.getValue() instanceof Double
+                && lower.getValue().doubleValue() == Double.NEGATIVE_INFINITY) {
             return "-inf";
         }
 
@@ -272,8 +274,8 @@ private static String maxNumeric(Range<? extends Number> range) {
 
         Range.Boundary<? extends Number> upper = range.getUpper();
 
-        if (upper.getValue() == null
-                || upper.getValue() instanceof Double && upper.getValue().doubleValue() == Double.POSITIVE_INFINITY) {
+        if (upper.getValue() == null || upper.getValue() instanceof Double
+                && upper.getValue().doubleValue() == Double.POSITIVE_INFINITY) {
             return "+inf";
         }
 
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java
index 62427bd4ac..c8e25ded07 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -90,7 +90,7 @@ public void addInterceptor(MethodInterceptor interceptor) {
     /**
      * {@link MethodInterceptor}-based {@link InterceptorChainInvocationHandler}.
      */
-    private static class InterceptorChainInvocationHandler extends AbstractInvocationHandler {
+    static class InterceptorChainInvocationHandler extends AbstractInvocationHandler {
 
         private final List<MethodInterceptor> interceptors;
 
@@ -112,6 +112,7 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
 
         private DefaultMethodInvocation getInvocation(final Method method, final Object[] args,
                 final Iterator<MethodInterceptor> iterator) {
+
             return new DefaultMethodInvocation(method, args) {
 
                 @Override
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameter.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameter.java
index 8a19eda8af..cbc2355143 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameter.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,14 +17,15 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 import com.lambdaworks.redis.dynamic.support.*;
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.internal.LettuceClassUtils;
 
+import io.netty.util.internal.ConcurrentSet;
+
 /**
  * Abstracts a method parameter and exposes access to type and parameter information.
  * 
@@ -41,6 +42,9 @@ public class Parameter {
     private final int parameterIndex;
     private final TypeInformation<?> typeInformation;
     private final MethodParameter methodParameter;
+    private final Map<Class<? extends Annotation>, Annotation> annotationCache = new ConcurrentHashMap<>();
+    private final Set<Class<? extends Annotation>> absentCache = new ConcurrentSet<>();
+    private final List<Annotation> annotations;
 
     public Parameter(Method method, int parameterIndex) {
 
@@ -50,6 +54,15 @@ public Parameter(Method method, int parameterIndex) {
         this.methodParameter.initParameterNameDiscovery(discoverer);
         this.name = methodParameter.getParameterName();
         this.typeInformation = ClassTypeInformation.fromMethodParameter(method, parameterIndex);
+
+        Annotation[] annotations = method.getParameterAnnotations()[parameterIndex];
+        List<Annotation> allAnnotations = new ArrayList<>(annotations.length);
+
+        for (Annotation annotation : annotations) {
+            this.annotationCache.put(annotation.getClass(), annotation);
+            allAnnotations.add(annotation);
+        }
+        this.annotations = Collections.unmodifiableList(allAnnotations);
     }
 
     /**
@@ -58,8 +71,21 @@ public Parameter(Method method, int parameterIndex) {
      * @param annotationType the annotation type to look for
      * @return the annotation object, or {@code null} if not found
      */
+    @SuppressWarnings("unchecked")
     public <A extends Annotation> A findAnnotation(Class<A> annotationType) {
-        return methodParameter.getParameterAnnotation(annotationType);
+
+        if (absentCache.contains(annotationType)) {
+            return null;
+        }
+
+        A result = (A) annotationCache.computeIfAbsent(annotationType,
+                key -> methodParameter.getParameterAnnotation(annotationType));
+
+        if (result == null) {
+            absentCache.add(annotationType);
+        }
+
+        return result;
     }
 
     /**
@@ -68,12 +94,7 @@ public <A extends Annotation> A findAnnotation(Class<A> annotationType) {
      * @return the {@link List} of annotation objects.
      */
     public List<? extends Annotation> getAnnotations() {
-
-        Annotation[] annotations = method.getParameterAnnotations()[parameterIndex];
-        List<Annotation> result = new ArrayList<>(annotations.length);
-        Collections.addAll(result, annotations);
-
-        return result;
+        return annotations;
     }
 
     /**

From 963f6e82b90aa43f9c54e2fc8610a2abfd0cd0f1 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 10 Feb 2017 17:21:44 +0100
Subject: [PATCH 144/808] Upgrade to Mockito #469

---
 pom.xml                                       |  2 +-
 .../cluster/ClusterCommandInternalsTest.java  |  9 ++--
 .../cluster/ClusterNodeEndpointTest.java      |  2 +-
 .../ClusterTopologyRefreshSchedulerTest.java  |  5 +--
 .../PooledClusterConnectionProviderTest.java  |  2 +-
 .../RoundRobinSocketAddressSupplierTest.java  |  2 +-
 .../topology/ClusterTopologyRefreshTest.java  |  5 +--
 .../redis/event/DefaultEventBusTest.java      | 10 ++---
 .../MasterSlaveConnectionProviderTest.java    |  5 +--
 .../SentinelTopologyRefreshTest.java          |  2 +-
 .../DefaultCommandLatencyCollectorTest.java   |  3 +-
 .../redis/protocol/CommandHandlerTest.java    | 44 ++++---------------
 12 files changed, 27 insertions(+), 64 deletions(-)

diff --git a/pom.xml b/pom.xml
index 21a8cda1e1..ee1e3bcaf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,7 +222,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
+            <version>2.7.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java
index 8a9c2c06c8..2992b5db2d 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java
@@ -16,25 +16,24 @@
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.RedisChannelWriter;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
+import com.lambdaworks.redis.RedisChannelWriter;
 import com.lambdaworks.redis.codec.Utf8StringCodec;
 import com.lambdaworks.redis.output.StatusOutput;
 import com.lambdaworks.redis.protocol.AsyncCommand;
 import com.lambdaworks.redis.protocol.Command;
 import com.lambdaworks.redis.protocol.CommandType;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ClusterCommandInternalsTest {
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java
index 1fcc0c009b..57f27a1b16 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java
@@ -29,7 +29,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.lambdaworks.redis.ClientOptions;
 import com.lambdaworks.redis.RedisChannelWriter;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshSchedulerTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshSchedulerTest.java
index 59ecfe7168..79c2fc45a0 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshSchedulerTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshSchedulerTest.java
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.lambdaworks.redis.resource.ClientResources;
 
@@ -98,7 +98,6 @@ public void shouldNotSubmitIfOptionsNotSet() throws Exception {
     @Test
     public void shouldNotSubmitIfExecutorIsShuttingDown() throws Exception {
 
-        when(clusterClient.getClusterClientOptions()).thenReturn(clusterClientOptions);
         when(eventExecutors.isShuttingDown()).thenReturn(true);
 
         sut.run();
@@ -108,7 +107,6 @@ public void shouldNotSubmitIfExecutorIsShuttingDown() throws Exception {
     @Test
     public void shouldNotSubmitIfExecutorIsShutdown() throws Exception {
 
-        when(clusterClient.getClusterClientOptions()).thenReturn(clusterClientOptions);
         when(eventExecutors.isShutdown()).thenReturn(true);
 
         sut.run();
@@ -118,7 +116,6 @@ public void shouldNotSubmitIfExecutorIsShutdown() throws Exception {
     @Test
     public void shouldNotSubmitIfExecutorIsTerminated() throws Exception {
 
-        when(clusterClient.getClusterClientOptions()).thenReturn(clusterClientOptions);
         when(eventExecutors.isTerminated()).thenReturn(true);
 
         sut.run();
diff --git a/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java b/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
index 72f8e160d8..e870344c50 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
@@ -30,7 +30,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.lambdaworks.redis.ReadFrom;
 import com.lambdaworks.redis.RedisChannelWriter;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java b/src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java
index 7053d8b0c2..1fba569461 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java b/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
index 6d3155413e..7028fbb82c 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
@@ -34,7 +34,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.lambdaworks.redis.RedisException;
 import com.lambdaworks.redis.RedisURI;
@@ -49,8 +49,6 @@
 import com.lambdaworks.redis.resource.ClientResources;
 import com.lambdaworks.redis.resource.DnsResolvers;
 
-import io.netty.util.concurrent.ImmediateEventExecutor;
-
 /**
  * @author Mark Paluch
  */
@@ -94,7 +92,6 @@ public class ClusterTopologyRefreshTest {
     public void before() throws Exception {
 
         when(clientResources.dnsResolver()).thenReturn(DnsResolvers.JVM_DEFAULT);
-        when(clientResources.eventExecutorGroup()).thenReturn(ImmediateEventExecutor.INSTANCE);
         when(connection1.async()).thenReturn(asyncCommands1);
         when(connection2.async()).thenReturn(asyncCommands2);
 
diff --git a/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java b/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
index c624a0223d..7930402897 100644
--- a/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
+++ b/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
@@ -15,17 +15,15 @@
  */
 package com.lambdaworks.redis.event;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.concurrent.TimeUnit;
-
-import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
+
 import reactor.core.scheduler.Schedulers;
 
+import com.lambdaworks.redis.reactive.TestSubscriber;
+
 /**
  * @author Mark Paluch
  */
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProviderTest.java b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProviderTest.java
index 3681a9540d..9b7b11237c 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProviderTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProviderTest.java
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.lambdaworks.redis.RedisClient;
 import com.lambdaworks.redis.RedisURI;
@@ -62,7 +62,6 @@ public void before() {
         sut = new MasterSlaveConnectionProvider<>(clientMock, CODEC, RedisURI.create("localhost", 1), Collections.emptyMap());
         sut.setKnownNodes(Arrays.asList(new RedisMasterSlaveNode("localhost", 1, RedisURI.create("localhost", 1),
                 RedisInstance.Role.MASTER)));
-        when(nodeConnectionMock.sync()).thenReturn(commandsMock);
     }
 
     @Test
@@ -78,4 +77,4 @@ public void shouldCloseConnections() {
         verify(nodeConnectionMock).close();
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java b/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java
index f26e8a7b35..2b49d9ead8 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java
+++ b/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java
@@ -31,7 +31,7 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.lambdaworks.redis.RedisClient;
diff --git a/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java b/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java
index d9ac17bf57..c30d1fc54c 100644
--- a/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java
+++ b/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java
@@ -23,9 +23,10 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.lambdaworks.redis.protocol.CommandType;
+
 import io.netty.channel.local.LocalAddress;
 
 /**
diff --git a/src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java b/src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java
index 80d0da96df..6a32bbc079 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java
+++ b/src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java
@@ -38,7 +38,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.lambdaworks.redis.ConnectionEvents;
@@ -60,8 +60,8 @@ public class CommandHandlerTest {
 
     private CommandHandler sut;
 
-    private final Command<String, String, String> command = new Command<>(CommandType.APPEND,
-            new StatusOutput<String, String>(new Utf8StringCodec()), null);
+    private final Command<String, String, String> command = new Command<>(CommandType.APPEND, new StatusOutput<>(
+            new Utf8StringCodec()), null);
 
     @Mock
     private ChannelHandlerContext context;
@@ -102,6 +102,7 @@ public static void afterClass() {
 
     @Before
     public void before() throws Exception {
+
         when(context.channel()).thenReturn(channel);
         when(context.alloc()).thenReturn(byteBufAllocator);
         when(channel.pipeline()).thenReturn(pipeline);
@@ -112,32 +113,8 @@ public void before() throws Exception {
             return null;
         });
 
-        when(clientResources.commandLatencyCollector())
-                .thenReturn(new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create()));
-
-        when(channel.write(any())).thenAnswer(invocation -> {
-
-            if (invocation.getArguments()[0] instanceof RedisCommand) {
-                q.add((RedisCommand) invocation.getArguments()[0]);
-            }
-
-            if (invocation.getArguments()[0] instanceof Collection) {
-                q.addAll((Collection) invocation.getArguments()[0]);
-            }
-
-            return new DefaultChannelPromise(channel);
-        });
-
-        when(channel.writeAndFlush(any())).thenAnswer(invocation -> {
-            if (invocation.getArguments()[0] instanceof RedisCommand) {
-                q.add((RedisCommand) invocation.getArguments()[0]);
-            }
-
-            if (invocation.getArguments()[0] instanceof Collection) {
-                q.addAll((Collection) invocation.getArguments()[0]);
-            }
-            return new DefaultChannelPromise(channel);
-        });
+        when(clientResources.commandLatencyCollector()).thenReturn(
+                new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create()));
 
         sut = new CommandHandler(clientResources, endpoint);
         q = (Queue) ReflectionTestUtils.getField(sut, "queue");
@@ -156,8 +133,6 @@ public void testChannelActive() throws Exception {
     public void testExceptionChannelActive() throws Exception {
         sut.setState(CommandHandler.LifecycleState.ACTIVE);
 
-        when(channel.isActive()).thenReturn(true);
-
         sut.channelActive(context);
         sut.exceptionCaught(context, new Exception());
     }
@@ -166,8 +141,6 @@ public void testExceptionChannelActive() throws Exception {
     public void testIOExceptionChannelActive() throws Exception {
         sut.setState(CommandHandler.LifecycleState.ACTIVE);
 
-        when(channel.isActive()).thenReturn(true);
-
         sut.channelActive(context);
         sut.exceptionCaught(context, new IOException("Connection timed out"));
     }
@@ -185,7 +158,6 @@ public void testExceptionWithQueue() throws Exception {
         q.clear();
 
         sut.channelActive(context);
-        when(channel.isActive()).thenReturn(true);
 
         q.add(command);
         sut.exceptionCaught(context, new Exception());
@@ -350,8 +322,8 @@ public void shouldWriteActiveCommandsInBatch() throws Exception {
     @Test
     public void shouldWriteActiveCommandsInMixedBatch() throws Exception {
 
-        Command<String, String, String> command2 = new Command<>(CommandType.APPEND,
-                new StatusOutput<String, String>(new Utf8StringCodec()), null);
+        Command<String, String, String> command2 = new Command<>(CommandType.APPEND, new StatusOutput<String, String>(
+                new Utf8StringCodec()), null);
 
         command.cancel();
 

From c5f6c41f726611e5ac9957a8882177ff2d68bb01 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 10 Feb 2017 19:48:17 +0100
Subject: [PATCH 145/808] =?UTF-8?q?Use=20MethodHandle.Lookup.findSpecial(?=
 =?UTF-8?q?=E2=80=A6)=20for=20default=20method=20lookup=20#310?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use a Java 9-compatible MethodHandle lookup for default interface methods via MethodHandle.Lookup.findSpecial(…). Keep the private constructor lookup and call to setAccessible(…) for pre-Java 9 use. Calling setAccessible(true) fails on Java 9.
---
 .../ClusterFutureSyncInvocationHandler.java   | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterFutureSyncInvocationHandler.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterFutureSyncInvocationHandler.java
index 0a249e7695..afa86b6260 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterFutureSyncInvocationHandler.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterFutureSyncInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -63,12 +64,15 @@ class ClusterFutureSyncInvocationHandler<K, V> extends AbstractInvocationHandler
     static {
         try {
             LOOKUP_CONSTRUCTOR = MethodHandles.Lookup.class.getDeclaredConstructor(Class.class, int.class);
+        } catch (NoSuchMethodException e) {
+            throw new IllegalStateException(e);
+        }
+
+        try {
             if (!LOOKUP_CONSTRUCTOR.isAccessible()) {
                 LOOKUP_CONSTRUCTOR.setAccessible(true);
             }
-        } catch (NoSuchMethodException exp) {
-            // should be impossible, but...
-            throw new IllegalStateException(exp);
+        } catch (Throwable jdk9) {
         }
     }
 
@@ -182,24 +186,24 @@ protected Object nodes(Predicate<RedisClusterNode> predicate, ClusterConnectionP
 
         NodeSelectionInvocationHandler h = new NodeSelectionInvocationHandler((AbstractNodeSelection<?, ?, ?, ?>) selection,
                 asyncCommandsInterface, connection.getTimeout(), connection.getTimeoutUnit());
-        return Proxy.newProxyInstance(NodeSelectionSupport.class.getClassLoader(),
-                new Class<?>[] { nodeSelectionCommandsInterface, nodeSelectionInterface }, h);
-    }
-
-    private static MethodHandles.Lookup privateMethodHandleLookup(Class<?> declaringClass) {
-        try {
-            return LOOKUP_CONSTRUCTOR.newInstance(declaringClass, MethodHandles.Lookup.PRIVATE);
-        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
-            throw new IllegalStateException(e);
-        }
+        return Proxy.newProxyInstance(NodeSelectionSupport.class.getClassLoader(), new Class<?>[] {
+                nodeSelectionCommandsInterface, nodeSelectionInterface }, h);
     }
 
     private static MethodHandle getDefaultMethodHandle(Method method) {
+
         Class<?> declaringClass = method.getDeclaringClass();
+
         try {
-            return privateMethodHandleLookup(declaringClass).unreflectSpecial(method, declaringClass);
-        } catch (IllegalAccessException e) {
-            throw new IllegalArgumentException("Did not pass in an interface method: " + method);
+            if (LOOKUP_CONSTRUCTOR.isAccessible()) {
+                MethodHandles.Lookup result = LOOKUP_CONSTRUCTOR.newInstance(declaringClass, MethodHandles.Lookup.PRIVATE);
+                return result.unreflectSpecial(method, declaringClass);
+            }
+
+            return MethodHandles.lookup().findSpecial(method.getDeclaringClass(), method.getName(),
+                    MethodType.methodType(method.getReturnType(), method.getParameterTypes()), method.getDeclaringClass());
+        } catch (ReflectiveOperationException e) {
+            throw new IllegalArgumentException("Did not pass in an interface method: " + method, e);
         }
     }
 }

From 7fd80f5fc9dc67f969be4af73c418804fa7d8f82 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 10 Feb 2017 19:50:08 +0100
Subject: [PATCH 146/808] Upgrade to Java 9-compatible build #310

Fix generics in test. Upgrade to netty 4.1.8. Upgrade jacoco plugin. Add profile to open packages during test.
---
 pom.xml                                       | 56 +++++++++++++------
 .../redis/output/ListOutputTest.java          |  7 +--
 2 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index ee1e3bcaf0..b26d5ca1ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -57,15 +58,15 @@
         <github.site.upload.skip>true</github.site.upload.skip>
         <lettuce-release-version>4.2.2.Final</lettuce-release-version>
         <lettuce3-release-version>3.5.0.Final</lettuce3-release-version>
-        <netty-version>4.1.7.Final</netty-version>
+        <netty-version>4.1.8.Final</netty-version>
     </properties>
 
     <scm>
         <connection>scm:git:https://github.com/mp911de/lettuce.git</connection>
         <developerConnection>scm:git:https://github.com/mp911de/lettuce.git</developerConnection>
         <url>http://github.com/mp911de/lettuce</url>
-      <tag>HEAD</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
 
     <prerequisites>
         <maven>3.0</maven>
@@ -316,13 +317,33 @@
         <profile>
             <id>netty-40</id>
             <properties>
-               <netty-version>4.0.43.Final</netty-version>
+                <netty-version>4.0.43.Final</netty-version>
             </properties>
         </profile>
+
         <profile>
             <id>netty-41</id>
         </profile>
 
+        <profile>
+            <id>java9</id>
+            <activation>
+                <jdk>9</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <argLine>--add-opens=java.base/java.nio=ALL-UNNAMED
+                                --add-opens=java.base/java.lang=ALL-UNNAMED
+                            </argLine>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
         <profile>
             <id>sonatype-oss-release</id>
             <build>
@@ -477,7 +498,7 @@
                                     <arguments>
                                         <argument>-Xmx2G</argument>
                                         <argument>-classpath</argument>
-                                        <classpath />
+                                        <classpath/>
                                         <argument>org.openjdk.jmh.Main</argument>
                                         <argument>.*</argument>
                                         <argument>-tu</argument>
@@ -545,7 +566,8 @@
                         <link>http://commons.apache.org/proper/commons-pool/api-2.4.2/</link>
                         <link>https://docs.oracle.com/javase/8/docs/api/</link>
                     </links>
-                    <additionalparam>-Xdoclint:all -Xdoclint:-html -Xdoclint:-syntax -Xdoclint:-missing</additionalparam>
+                    <additionalparam>-Xdoclint:all -Xdoclint:-html -Xdoclint:-syntax -Xdoclint:-missing
+                    </additionalparam>
                     <tags>
                         <tag>
                             <name>generated</name>
@@ -628,7 +650,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.5.201505241946</version>
+                <version>0.7.9</version>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>
@@ -704,13 +726,13 @@
     </reporting>
 
     <repositories>
-    <repository>
-        <id>spring-snapshots</id>
-        <name>Spring Snapshots</name>
-        <url>https://repo.spring.io/libs-snapshot</url>
-        <snapshots>
-            <enabled>true</enabled>
-        </snapshots>
-    </repository>
-</repositories>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/libs-snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 </project>
diff --git a/src/test/java/com/lambdaworks/redis/output/ListOutputTest.java b/src/test/java/com/lambdaworks/redis/output/ListOutputTest.java
index 755732f602..0c76577c8d 100644
--- a/src/test/java/com/lambdaworks/redis/output/ListOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/output/ListOutputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package com.lambdaworks.redis.output;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -37,7 +37,7 @@
 public class ListOutputTest {
 
     @Parameter(0)
-    public CommandOutput<?, ?, List<?>> commandOutput;
+    public CommandOutput<Object, Object, List<Object>> commandOutput;
 
     @Parameter(1)
     public StreamingOutput<?> streamingOutput;
@@ -87,5 +87,4 @@ public void setValueShouldConvert() throws Exception {
 
         assertThat(commandOutput.get()).contains(value);
     }
-
 }

From 5b9e55aa0d6b7ddca6c8e85992e853be95ea8617 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 17 Feb 2017 19:48:56 +0100
Subject: [PATCH 147/808] Polishing

Extract ConnectionFuture and DefaultConnectionFuture to toplevel types.
---
 .../redis/AbstractRedisClient.java            | 302 +----------------
 .../lambdaworks/redis/ConnectionFuture.java   | 176 ++++++++++
 .../redis/DefaultConnectionFuture.java        | 313 ++++++++++++++++++
 .../com/lambdaworks/redis/RedisClient.java    |   4 +-
 .../com/lambdaworks/redis/RedisFuture.java    |  10 +-
 .../redis/cluster/RedisClusterClient.java     |   5 +-
 .../topology/ClusterTopologyRefresh.java      |  13 +-
 .../topology/NodeConnectionFactory.java       |   6 +-
 src/test/java/com/lambdaworks/Futures.java    |  32 +-
 .../topology/ClusterTopologyRefreshTest.java  |  14 +-
 10 files changed, 555 insertions(+), 320 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/ConnectionFuture.java
 create mode 100644 src/main/java/com/lambdaworks/redis/DefaultConnectionFuture.java

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
index b9de874b99..dab99600b3 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 import java.util.Set;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.*;
+import java.util.function.Supplier;
 
 import com.lambdaworks.redis.Transports.NativeTransports;
 import com.lambdaworks.redis.internal.LettuceAssert;
@@ -175,8 +175,8 @@ private synchronized EventLoopGroup getEventLoopGroup(ConnectionPoint connection
             Class<? extends EventLoopGroup> eventLoopGroupClass = NativeTransports.eventLoopGroupClass();
 
             if (!eventLoopGroups.containsKey(NativeTransports.eventLoopGroupClass())) {
-                eventLoopGroups.put(eventLoopGroupClass,
-                        clientResources.eventLoopGroupProvider().allocate(eventLoopGroupClass));
+                eventLoopGroups
+                        .put(eventLoopGroupClass, clientResources.eventLoopGroupProvider().allocate(eventLoopGroupClass));
             }
         }
 
@@ -292,8 +292,8 @@ protected <K, V, T extends RedisChannelHandler<K, V>> ConnectionFuture<T> initia
             });
         });
 
-        return new ConnectionFuture<T>(redisAddress,
-                channelReadyFuture.thenApply(channel -> (T) connectionBuilder.connection()));
+        return new DefaultConnectionFuture<T>(redisAddress, channelReadyFuture.thenApply(channel -> (T) connectionBuilder
+                .connection()));
     }
 
     /**
@@ -414,294 +414,4 @@ protected void setOptions(ClientOptions clientOptions) {
         LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
         this.clientOptions = clientOptions;
     }
-
-    /**
-     * lettuce-specific connection {@link CompletableFuture future}. Delegates calls to the decorated {@link CompletableFuture}
-     * and provides a {@link SocketAddress}.
-     *
-     * @since 4.4
-     */
-    protected class ConnectionFuture<T> extends CompletableFuture<T> {
-
-        private final SocketAddress remoteAddress;
-        private final CompletableFuture<T> delegate;
-
-        protected ConnectionFuture(SocketAddress remoteAddress, CompletableFuture<T> delegate) {
-
-            this.remoteAddress = remoteAddress;
-            this.delegate = delegate;
-        }
-
-        public SocketAddress getRemoteAddress() {
-            return remoteAddress;
-        }
-
-        private <U> ConnectionFuture<U> adopt(CompletableFuture<U> newFuture) {
-            return new ConnectionFuture<>(remoteAddress, newFuture);
-        }
-
-        @Override
-        public boolean isDone() {
-            return delegate.isDone();
-        }
-
-        @Override
-        public T get() throws InterruptedException, ExecutionException {
-            return delegate.get();
-        }
-
-        @Override
-        public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
-            return delegate.get(timeout, unit);
-        }
-
-        @Override
-        public T join() {
-            return delegate.join();
-        }
-
-        @Override
-        public T getNow(T valueIfAbsent) {
-            return delegate.getNow(valueIfAbsent);
-        }
-
-        @Override
-        public boolean complete(T value) {
-            return delegate.complete(value);
-        }
-
-        @Override
-        public boolean completeExceptionally(Throwable ex) {
-            return delegate.completeExceptionally(ex);
-        }
-
-        @Override
-        public <U> ConnectionFuture<U> thenApply(Function<? super T, ? extends U> fn) {
-            return adopt(delegate.thenApply(fn));
-        }
-
-        @Override
-        public <U> ConnectionFuture<U> thenApplyAsync(Function<? super T, ? extends U> fn) {
-            return adopt(delegate.thenApplyAsync(fn));
-        }
-
-        @Override
-        public <U> ConnectionFuture<U> thenApplyAsync(Function<? super T, ? extends U> fn, Executor executor) {
-            return adopt(delegate.thenApplyAsync(fn, executor));
-        }
-
-        @Override
-        public ConnectionFuture<Void> thenAccept(Consumer<? super T> action) {
-            return adopt(delegate.thenAccept(action));
-        }
-
-        @Override
-        public ConnectionFuture<Void> thenAcceptAsync(Consumer<? super T> action) {
-            return adopt(delegate.thenAcceptAsync(action));
-        }
-
-        @Override
-        public ConnectionFuture<Void> thenAcceptAsync(Consumer<? super T> action, Executor executor) {
-            return adopt(delegate.thenAcceptAsync(action, executor));
-        }
-
-        @Override
-        public ConnectionFuture<Void> thenRun(Runnable action) {
-            return adopt(delegate.thenRun(action));
-        }
-
-        @Override
-        public ConnectionFuture<Void> thenRunAsync(Runnable action) {
-            return adopt(delegate.thenRunAsync(action));
-        }
-
-        @Override
-        public ConnectionFuture<Void> thenRunAsync(Runnable action, Executor executor) {
-            return adopt(delegate.thenRunAsync(action, executor));
-        }
-
-        @Override
-        public <U, V> ConnectionFuture<V> thenCombine(CompletionStage<? extends U> other,
-                BiFunction<? super T, ? super U, ? extends V> fn) {
-            return adopt(delegate.thenCombine(other, fn));
-        }
-
-        @Override
-        public <U, V> ConnectionFuture<V> thenCombineAsync(CompletionStage<? extends U> other,
-                BiFunction<? super T, ? super U, ? extends V> fn) {
-            return adopt(delegate.thenCombineAsync(other, fn));
-        }
-
-        @Override
-        public <U, V> ConnectionFuture<V> thenCombineAsync(CompletionStage<? extends U> other,
-                BiFunction<? super T, ? super U, ? extends V> fn, Executor executor) {
-            return adopt(delegate.thenCombineAsync(other, fn, executor));
-        }
-
-        @Override
-        public <U> ConnectionFuture<Void> thenAcceptBoth(CompletionStage<? extends U> other,
-                BiConsumer<? super T, ? super U> action) {
-            return adopt(delegate.thenAcceptBoth(other, action));
-        }
-
-        @Override
-        public <U> ConnectionFuture<Void> thenAcceptBothAsync(CompletionStage<? extends U> other,
-                BiConsumer<? super T, ? super U> action) {
-            return adopt(delegate.thenAcceptBothAsync(other, action));
-        }
-
-        @Override
-        public <U> ConnectionFuture<Void> thenAcceptBothAsync(CompletionStage<? extends U> other,
-                BiConsumer<? super T, ? super U> action, Executor executor) {
-            return adopt(delegate.thenAcceptBothAsync(other, action, executor));
-        }
-
-        @Override
-        public ConnectionFuture<Void> runAfterBoth(CompletionStage<?> other, Runnable action) {
-            return adopt(delegate.runAfterBoth(other, action));
-        }
-
-        @Override
-        public ConnectionFuture<Void> runAfterBothAsync(CompletionStage<?> other, Runnable action) {
-            return adopt(delegate.runAfterBothAsync(other, action));
-        }
-
-        @Override
-        public ConnectionFuture<Void> runAfterBothAsync(CompletionStage<?> other, Runnable action, Executor executor) {
-            return adopt(delegate.runAfterBothAsync(other, action, executor));
-        }
-
-        @Override
-        public <U> ConnectionFuture<U> applyToEither(CompletionStage<? extends T> other, Function<? super T, U> fn) {
-            return adopt(delegate.applyToEither(other, fn));
-        }
-
-        @Override
-        public <U> ConnectionFuture<U> applyToEitherAsync(CompletionStage<? extends T> other, Function<? super T, U> fn) {
-            return adopt(delegate.applyToEitherAsync(other, fn));
-        }
-
-        @Override
-        public <U> ConnectionFuture<U> applyToEitherAsync(CompletionStage<? extends T> other, Function<? super T, U> fn,
-                Executor executor) {
-            return adopt(delegate.applyToEitherAsync(other, fn, executor));
-        }
-
-        @Override
-        public ConnectionFuture<Void> acceptEither(CompletionStage<? extends T> other, Consumer<? super T> action) {
-            return adopt(delegate.acceptEither(other, action));
-        }
-
-        @Override
-        public ConnectionFuture<Void> acceptEitherAsync(CompletionStage<? extends T> other, Consumer<? super T> action) {
-            return adopt(delegate.acceptEitherAsync(other, action));
-        }
-
-        @Override
-        public ConnectionFuture<Void> acceptEitherAsync(CompletionStage<? extends T> other, Consumer<? super T> action,
-                Executor executor) {
-            return adopt(delegate.acceptEitherAsync(other, action, executor));
-        }
-
-        @Override
-        public ConnectionFuture<Void> runAfterEither(CompletionStage<?> other, Runnable action) {
-            return adopt(delegate.runAfterEither(other, action));
-        }
-
-        @Override
-        public ConnectionFuture<Void> runAfterEitherAsync(CompletionStage<?> other, Runnable action) {
-            return adopt(delegate.runAfterEitherAsync(other, action));
-        }
-
-        @Override
-        public ConnectionFuture<Void> runAfterEitherAsync(CompletionStage<?> other, Runnable action, Executor executor) {
-            return adopt(delegate.runAfterEitherAsync(other, action, executor));
-        }
-
-        @Override
-        public <U> ConnectionFuture<U> thenCompose(Function<? super T, ? extends CompletionStage<U>> fn) {
-            return adopt(delegate.thenCompose(fn));
-        }
-
-        @Override
-        public <U> ConnectionFuture<U> thenComposeAsync(Function<? super T, ? extends CompletionStage<U>> fn) {
-            return adopt(delegate.thenComposeAsync(fn));
-        }
-
-        @Override
-        public <U> ConnectionFuture<U> thenComposeAsync(Function<? super T, ? extends CompletionStage<U>> fn,
-                Executor executor) {
-            return adopt(delegate.thenComposeAsync(fn, executor));
-        }
-
-        @Override
-        public ConnectionFuture<T> whenComplete(BiConsumer<? super T, ? super Throwable> action) {
-            return adopt(delegate.whenComplete(action));
-        }
-
-        @Override
-        public ConnectionFuture<T> whenCompleteAsync(BiConsumer<? super T, ? super Throwable> action) {
-            return adopt(delegate.whenCompleteAsync(action));
-        }
-
-        @Override
-        public ConnectionFuture<T> whenCompleteAsync(BiConsumer<? super T, ? super Throwable> action, Executor executor) {
-            return adopt(delegate.whenCompleteAsync(action, executor));
-        }
-
-        @Override
-        public <U> ConnectionFuture<U> handle(BiFunction<? super T, Throwable, ? extends U> fn) {
-            return adopt(delegate.handle(fn));
-        }
-
-        @Override
-        public <U> ConnectionFuture<U> handleAsync(BiFunction<? super T, Throwable, ? extends U> fn) {
-            return adopt(delegate.handleAsync(fn));
-        }
-
-        @Override
-        public <U> ConnectionFuture<U> handleAsync(BiFunction<? super T, Throwable, ? extends U> fn, Executor executor) {
-            return adopt(delegate.handleAsync(fn, executor));
-        }
-
-        @Override
-        public CompletableFuture<T> toCompletableFuture() {
-            return delegate.toCompletableFuture();
-        }
-
-        @Override
-        public ConnectionFuture<T> exceptionally(Function<Throwable, ? extends T> fn) {
-            return adopt(delegate.exceptionally(fn));
-        }
-
-        @Override
-        public boolean cancel(boolean mayInterruptIfRunning) {
-            return delegate.cancel(mayInterruptIfRunning);
-        }
-
-        @Override
-        public boolean isCancelled() {
-            return delegate.isCancelled();
-        }
-
-        @Override
-        public boolean isCompletedExceptionally() {
-            return delegate.isCompletedExceptionally();
-        }
-
-        @Override
-        public void obtrudeValue(T value) {
-            delegate.obtrudeValue(value);
-        }
-
-        @Override
-        public void obtrudeException(Throwable ex) {
-            delegate.obtrudeException(ex);
-        }
-
-        @Override
-        public int getNumberOfDependents() {
-            return delegate.getNumberOfDependents();
-        }
-    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionFuture.java b/src/main/java/com/lambdaworks/redis/ConnectionFuture.java
new file mode 100644
index 0000000000..f62781c8bd
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/ConnectionFuture.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis;
+
+import java.net.SocketAddress;
+import java.util.concurrent.*;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.lambdaworks.redis.api.StatefulConnection;
+
+/**
+ * A {@code ConnectionFuture} represents the result of an asynchronous connection initialization. The future provides a
+ * {@link StatefulConnection} on successful completion. It also provides the remote {@link SocketAddress}.
+ *
+ * @since 4.4
+ */
+public interface ConnectionFuture<T> extends CompletionStage<T> {
+
+    /**
+     * Waits if necessary for the computation to complete, and then retrieves its result.
+     *
+     * @return the computed result
+     * @throws CancellationException if the computation was cancelled
+     * @throws ExecutionException if the computation threw an exception
+     * @throws InterruptedException if the current thread was interrupted while waiting
+     */
+    T get() throws InterruptedException, ExecutionException;
+
+    /**
+     * Return the remote {@link SocketAddress}.
+     *
+     * @return the remote {@link SocketAddress}.
+     */
+    SocketAddress getRemoteAddress();
+
+    /**
+     * Returns the result value when complete, or throws an (unchecked) exception if completed exceptionally. To better conform
+     * with the use of common functional forms, if a computation involved in the completion of this CompletableFuture threw an
+     * exception, this method throws an (unchecked) {@link CompletionException} with the underlying exception as its cause.
+     *
+     * @return the result value
+     * @throws CancellationException if the computation was cancelled
+     * @throws CompletionException if this future completed exceptionally or a completion computation threw an exception
+     */
+    T join();
+
+    @Override
+    <U> ConnectionFuture<U> thenApply(Function<? super T, ? extends U> fn);
+
+    @Override
+    <U> ConnectionFuture<U> thenApplyAsync(Function<? super T, ? extends U> fn);
+
+    @Override
+    <U> ConnectionFuture<U> thenApplyAsync(Function<? super T, ? extends U> fn, Executor executor);
+
+    @Override
+    ConnectionFuture<Void> thenAccept(Consumer<? super T> action);
+
+    @Override
+    ConnectionFuture<Void> thenAcceptAsync(Consumer<? super T> action);
+
+    @Override
+    ConnectionFuture<Void> thenAcceptAsync(Consumer<? super T> action, Executor executor);
+
+    @Override
+    ConnectionFuture<Void> thenRun(Runnable action);
+
+    @Override
+    ConnectionFuture<Void> thenRunAsync(Runnable action);
+
+    @Override
+    ConnectionFuture<Void> thenRunAsync(Runnable action, Executor executor);
+
+    @Override
+    <U, V> ConnectionFuture<V> thenCombine(CompletionStage<? extends U> other, BiFunction<? super T, ? super U, ? extends V> fn);
+
+    @Override
+    <U, V> ConnectionFuture<V> thenCombineAsync(CompletionStage<? extends U> other,
+            BiFunction<? super T, ? super U, ? extends V> fn);
+
+    @Override
+    <U, V> ConnectionFuture<V> thenCombineAsync(CompletionStage<? extends U> other,
+            BiFunction<? super T, ? super U, ? extends V> fn, Executor executor);
+
+    @Override
+    <U> ConnectionFuture<Void> thenAcceptBoth(CompletionStage<? extends U> other, BiConsumer<? super T, ? super U> action);
+
+    @Override
+    <U> ConnectionFuture<Void> thenAcceptBothAsync(CompletionStage<? extends U> other, BiConsumer<? super T, ? super U> action);
+
+    @Override
+    <U> ConnectionFuture<Void> thenAcceptBothAsync(CompletionStage<? extends U> other, BiConsumer<? super T, ? super U> action,
+            Executor executor);
+
+    @Override
+    ConnectionFuture<Void> runAfterBoth(CompletionStage<?> other, Runnable action);
+
+    @Override
+    ConnectionFuture<Void> runAfterBothAsync(CompletionStage<?> other, Runnable action);
+
+    @Override
+    ConnectionFuture<Void> runAfterBothAsync(CompletionStage<?> other, Runnable action, Executor executor);
+
+    @Override
+    <U> ConnectionFuture<U> applyToEither(CompletionStage<? extends T> other, Function<? super T, U> fn);
+
+    @Override
+    <U> ConnectionFuture<U> applyToEitherAsync(CompletionStage<? extends T> other, Function<? super T, U> fn);
+
+    @Override
+    <U> ConnectionFuture<U> applyToEitherAsync(CompletionStage<? extends T> other, Function<? super T, U> fn, Executor executor);
+
+    @Override
+    ConnectionFuture<Void> acceptEither(CompletionStage<? extends T> other, Consumer<? super T> action);
+
+    @Override
+    ConnectionFuture<Void> acceptEitherAsync(CompletionStage<? extends T> other, Consumer<? super T> action);
+
+    @Override
+    ConnectionFuture<Void> acceptEitherAsync(CompletionStage<? extends T> other, Consumer<? super T> action, Executor executor);
+
+    @Override
+    ConnectionFuture<Void> runAfterEither(CompletionStage<?> other, Runnable action);
+
+    @Override
+    ConnectionFuture<Void> runAfterEitherAsync(CompletionStage<?> other, Runnable action);
+
+    @Override
+    ConnectionFuture<Void> runAfterEitherAsync(CompletionStage<?> other, Runnable action, Executor executor);
+
+    @Override
+    <U> ConnectionFuture<U> thenCompose(Function<? super T, ? extends CompletionStage<U>> fn);
+
+    @Override
+    <U> ConnectionFuture<U> thenComposeAsync(Function<? super T, ? extends CompletionStage<U>> fn);
+
+    @Override
+    <U> ConnectionFuture<U> thenComposeAsync(Function<? super T, ? extends CompletionStage<U>> fn, Executor executor);
+
+    @Override
+    ConnectionFuture<T> exceptionally(Function<Throwable, ? extends T> fn);
+
+    @Override
+    ConnectionFuture<T> whenComplete(BiConsumer<? super T, ? super Throwable> action);
+
+    @Override
+    ConnectionFuture<T> whenCompleteAsync(BiConsumer<? super T, ? super Throwable> action);
+
+    @Override
+    ConnectionFuture<T> whenCompleteAsync(BiConsumer<? super T, ? super Throwable> action, Executor executor);
+
+    @Override
+    <U> ConnectionFuture<U> handle(BiFunction<? super T, Throwable, ? extends U> fn);
+
+    @Override
+    <U> ConnectionFuture<U> handleAsync(BiFunction<? super T, Throwable, ? extends U> fn);
+
+    @Override
+    <U> ConnectionFuture<U> handleAsync(BiFunction<? super T, Throwable, ? extends U> fn, Executor executor);
+}
diff --git a/src/main/java/com/lambdaworks/redis/DefaultConnectionFuture.java b/src/main/java/com/lambdaworks/redis/DefaultConnectionFuture.java
new file mode 100644
index 0000000000..53b1749959
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/DefaultConnectionFuture.java
@@ -0,0 +1,313 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis;
+
+import java.net.SocketAddress;
+import java.util.concurrent.*;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * Default {@link CompletableFuture} implementation. Delegates calls to the decorated {@link CompletableFuture} and provides a
+ * {@link SocketAddress}.
+ *
+ * @since 4.4
+ */
+class DefaultConnectionFuture<T> extends CompletableFuture<T> implements ConnectionFuture<T> {
+
+    private final SocketAddress remoteAddress;
+    private final CompletableFuture<T> delegate;
+
+    public DefaultConnectionFuture(SocketAddress remoteAddress, CompletableFuture<T> delegate) {
+
+        this.remoteAddress = remoteAddress;
+        this.delegate = delegate;
+    }
+
+    public SocketAddress getRemoteAddress() {
+        return remoteAddress;
+    }
+
+    private <U> DefaultConnectionFuture<U> adopt(CompletableFuture<U> newFuture) {
+        return new DefaultConnectionFuture<>(remoteAddress, newFuture);
+    }
+
+    @Override
+    public boolean isDone() {
+        return delegate.isDone();
+    }
+
+    @Override
+    public T get() throws InterruptedException, ExecutionException {
+        return delegate.get();
+    }
+
+    @Override
+    public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+        return delegate.get(timeout, unit);
+    }
+
+    @Override
+    public T join() {
+        return delegate.join();
+    }
+
+    @Override
+    public T getNow(T valueIfAbsent) {
+        return delegate.getNow(valueIfAbsent);
+    }
+
+    @Override
+    public boolean complete(T value) {
+        return delegate.complete(value);
+    }
+
+    @Override
+    public boolean completeExceptionally(Throwable ex) {
+        return delegate.completeExceptionally(ex);
+    }
+
+    @Override
+    public <U> DefaultConnectionFuture<U> thenApply(Function<? super T, ? extends U> fn) {
+        return adopt(delegate.thenApply(fn));
+    }
+
+    @Override
+    public <U> DefaultConnectionFuture<U> thenApplyAsync(Function<? super T, ? extends U> fn) {
+        return adopt(delegate.thenApplyAsync(fn));
+    }
+
+    @Override
+    public <U> DefaultConnectionFuture<U> thenApplyAsync(Function<? super T, ? extends U> fn, Executor executor) {
+        return adopt(delegate.thenApplyAsync(fn, executor));
+    }
+
+    @Override
+    public DefaultConnectionFuture<Void> thenAccept(Consumer<? super T> action) {
+        return adopt(delegate.thenAccept(action));
+    }
+
+    @Override
+    public DefaultConnectionFuture<Void> thenAcceptAsync(Consumer<? super T> action) {
+        return adopt(delegate.thenAcceptAsync(action));
+    }
+
+    @Override
+    public DefaultConnectionFuture<Void> thenAcceptAsync(Consumer<? super T> action, Executor executor) {
+        return adopt(delegate.thenAcceptAsync(action, executor));
+    }
+
+    @Override
+    public DefaultConnectionFuture<Void> thenRun(Runnable action) {
+        return adopt(delegate.thenRun(action));
+    }
+
+    @Override
+    public DefaultConnectionFuture<Void> thenRunAsync(Runnable action) {
+        return adopt(delegate.thenRunAsync(action));
+    }
+
+    @Override
+    public DefaultConnectionFuture<Void> thenRunAsync(Runnable action, Executor executor) {
+        return adopt(delegate.thenRunAsync(action, executor));
+    }
+
+    @Override
+    public <U, V> DefaultConnectionFuture<V> thenCombine(CompletionStage<? extends U> other,
+            BiFunction<? super T, ? super U, ? extends V> fn) {
+        return adopt(delegate.thenCombine(other, fn));
+    }
+
+    @Override
+    public <U, V> DefaultConnectionFuture<V> thenCombineAsync(CompletionStage<? extends U> other,
+            BiFunction<? super T, ? super U, ? extends V> fn) {
+        return adopt(delegate.thenCombineAsync(other, fn));
+    }
+
+    @Override
+    public <U, V> DefaultConnectionFuture<V> thenCombineAsync(CompletionStage<? extends U> other,
+            BiFunction<? super T, ? super U, ? extends V> fn, Executor executor) {
+        return adopt(delegate.thenCombineAsync(other, fn, executor));
+    }
+
+    @Override
+    public <U> DefaultConnectionFuture<Void> thenAcceptBoth(CompletionStage<? extends U> other,
+            BiConsumer<? super T, ? super U> action) {
+        return adopt(delegate.thenAcceptBoth(other, action));
+    }
+
+    @Override
+    public <U> DefaultConnectionFuture<Void> thenAcceptBothAsync(CompletionStage<? extends U> other,
+            BiConsumer<? super T, ? super U> action) {
+        return adopt(delegate.thenAcceptBothAsync(other, action));
+    }
+
+    @Override
+    public <U> DefaultConnectionFuture<Void> thenAcceptBothAsync(CompletionStage<? extends U> other,
+            BiConsumer<? super T, ? super U> action, Executor executor) {
+        return adopt(delegate.thenAcceptBothAsync(other, action, executor));
+    }
+
+    @Override
+    public DefaultConnectionFuture<Void> runAfterBoth(CompletionStage<?> other, Runnable action) {
+        return adopt(delegate.runAfterBoth(other, action));
+    }
+
+    @Override
+    public DefaultConnectionFuture<Void> runAfterBothAsync(CompletionStage<?> other, Runnable action) {
+        return adopt(delegate.runAfterBothAsync(other, action));
+    }
+
+    @Override
+    public DefaultConnectionFuture<Void> runAfterBothAsync(CompletionStage<?> other, Runnable action, Executor executor) {
+        return adopt(delegate.runAfterBothAsync(other, action, executor));
+    }
+
+    @Override
+    public <U> DefaultConnectionFuture<U> applyToEither(CompletionStage<? extends T> other, Function<? super T, U> fn) {
+        return adopt(delegate.applyToEither(other, fn));
+    }
+
+    @Override
+    public <U> DefaultConnectionFuture<U> applyToEitherAsync(CompletionStage<? extends T> other, Function<? super T, U> fn) {
+        return adopt(delegate.applyToEitherAsync(other, fn));
+    }
+
+    @Override
+    public <U> DefaultConnectionFuture<U> applyToEitherAsync(CompletionStage<? extends T> other, Function<? super T, U> fn,
+            Executor executor) {
+        return adopt(delegate.applyToEitherAsync(other, fn, executor));
+    }
+
+    @Override
+    public DefaultConnectionFuture<Void> acceptEither(CompletionStage<? extends T> other, Consumer<? super T> action) {
+        return adopt(delegate.acceptEither(other, action));
+    }
+
+    @Override
+    public DefaultConnectionFuture<Void> acceptEitherAsync(CompletionStage<? extends T> other, Consumer<? super T> action) {
+        return adopt(delegate.acceptEitherAsync(other, action));
+    }
+
+    @Override
+    public DefaultConnectionFuture<Void> acceptEitherAsync(CompletionStage<? extends T> other, Consumer<? super T> action,
+            Executor executor) {
+        return adopt(delegate.acceptEitherAsync(other, action, executor));
+    }
+
+    @Override
+    public DefaultConnectionFuture<Void> runAfterEither(CompletionStage<?> other, Runnable action) {
+        return adopt(delegate.runAfterEither(other, action));
+    }
+
+    @Override
+    public DefaultConnectionFuture<Void> runAfterEitherAsync(CompletionStage<?> other, Runnable action) {
+        return adopt(delegate.runAfterEitherAsync(other, action));
+    }
+
+    @Override
+    public DefaultConnectionFuture<Void> runAfterEitherAsync(CompletionStage<?> other, Runnable action, Executor executor) {
+        return adopt(delegate.runAfterEitherAsync(other, action, executor));
+    }
+
+    @Override
+    public <U> DefaultConnectionFuture<U> thenCompose(Function<? super T, ? extends CompletionStage<U>> fn) {
+        return adopt(delegate.thenCompose(fn));
+    }
+
+    @Override
+    public <U> DefaultConnectionFuture<U> thenComposeAsync(Function<? super T, ? extends CompletionStage<U>> fn) {
+        return adopt(delegate.thenComposeAsync(fn));
+    }
+
+    @Override
+    public <U> DefaultConnectionFuture<U> thenComposeAsync(Function<? super T, ? extends CompletionStage<U>> fn,
+            Executor executor) {
+        return adopt(delegate.thenComposeAsync(fn, executor));
+    }
+
+    @Override
+    public DefaultConnectionFuture<T> whenComplete(BiConsumer<? super T, ? super Throwable> action) {
+        return adopt(delegate.whenComplete(action));
+    }
+
+    @Override
+    public DefaultConnectionFuture<T> whenCompleteAsync(BiConsumer<? super T, ? super Throwable> action) {
+        return adopt(delegate.whenCompleteAsync(action));
+    }
+
+    @Override
+    public DefaultConnectionFuture<T> whenCompleteAsync(BiConsumer<? super T, ? super Throwable> action, Executor executor) {
+        return adopt(delegate.whenCompleteAsync(action, executor));
+    }
+
+    @Override
+    public <U> DefaultConnectionFuture<U> handle(BiFunction<? super T, Throwable, ? extends U> fn) {
+        return adopt(delegate.handle(fn));
+    }
+
+    @Override
+    public <U> DefaultConnectionFuture<U> handleAsync(BiFunction<? super T, Throwable, ? extends U> fn) {
+        return adopt(delegate.handleAsync(fn));
+    }
+
+    @Override
+    public <U> DefaultConnectionFuture<U> handleAsync(BiFunction<? super T, Throwable, ? extends U> fn, Executor executor) {
+        return adopt(delegate.handleAsync(fn, executor));
+    }
+
+    @Override
+    public CompletableFuture<T> toCompletableFuture() {
+        return delegate.toCompletableFuture();
+    }
+
+    @Override
+    public DefaultConnectionFuture<T> exceptionally(Function<Throwable, ? extends T> fn) {
+        return adopt(delegate.exceptionally(fn));
+    }
+
+    @Override
+    public boolean cancel(boolean mayInterruptIfRunning) {
+        return delegate.cancel(mayInterruptIfRunning);
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return delegate.isCancelled();
+    }
+
+    @Override
+    public boolean isCompletedExceptionally() {
+        return delegate.isCompletedExceptionally();
+    }
+
+    @Override
+    public void obtrudeValue(T value) {
+        delegate.obtrudeValue(value);
+    }
+
+    @Override
+    public void obtrudeException(Throwable ex) {
+        delegate.obtrudeException(ex);
+    }
+
+    @Override
+    public int getNumberOfDependents() {
+        return delegate.getNumberOfDependents();
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/com/lambdaworks/redis/RedisClient.java
index 8772de5499..3b9d99ad60 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClient.java
@@ -204,7 +204,9 @@ private <K, V> StatefulRedisConnection<K, V> connectStandalone(RedisCodec<K, V>
         return getConnection(future);
     }
 
-    private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandaloneAsync(RedisCodec<K, V> codec,
+    @SuppressWarnings("unused")
+    // Required by ReflectiveNodeConnectionFactory.
+    <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandaloneAsync(RedisCodec<K, V> codec,
             RedisURI redisURI) {
         return connectStandaloneAsync(codec, redisURI, Timeout.from(redisURI));
     }
diff --git a/src/main/java/com/lambdaworks/redis/RedisFuture.java b/src/main/java/com/lambdaworks/redis/RedisFuture.java
index 0b7129582f..6c2c3e3021 100644
--- a/src/main/java/com/lambdaworks/redis/RedisFuture.java
+++ b/src/main/java/com/lambdaworks/redis/RedisFuture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * Redis Future, extends a Listenable Future (Notification on Complete). The execution of the notification happens either on
- * finish of the future execution or, if the future is completed already, immediately.
- * 
+ * A {@code RedisFuture} represents the result of an asynchronous computation, extending {@link CompletionStage}. The execution
+ * of the notification happens either on finish of the future execution or, if the future is completed already, immediately.
+ *
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 3.0
@@ -30,7 +30,7 @@
 public interface RedisFuture<V> extends CompletionStage<V>, Future<V> {
 
     /**
-     * 
+     *
      * @return error text, if any error occured.
      */
     String getError();
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index 1891671844..71a47fa470 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.net.SocketAddress;
 import java.net.URI;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -1045,7 +1044,7 @@ public <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec
         }
 
         @Override
-        public <K, V> CompletableFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisCodec<K, V> codec,
+        public <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisCodec<K, V> codec,
                 SocketAddress socketAddress) {
             return RedisClusterClient.this.connectToNodeAsync(codec, socketAddress.toString(), null, () -> socketAddress);
         }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
index 4e5ae11dfb..75a050503c 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
@@ -23,10 +23,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import com.lambdaworks.redis.LettuceStrings;
-import com.lambdaworks.redis.RedisCommandInterruptedException;
-import com.lambdaworks.redis.RedisConnectionException;
-import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
@@ -148,9 +145,9 @@ NodeTopologyViews getNodeSpecificViews(Requests requestedTopology, Requests requ
                             }
 
                             // record latency for later partition ordering
-                            latencies.put(partition.getNodeId(), nodeTopologyView.getLatency());
-                            clientCountByNodeId.put(partition.getNodeId(), nodeTopologyView.getConnectedClients());
-                        });
+                                latencies.put(partition.getNodeId(), nodeTopologyView.getLatency());
+                                clientCountByNodeId.put(partition.getNodeId(), nodeTopologyView.getConnectedClients());
+                            });
 
                 allNodes.addAll(nodeWithStats);
 
@@ -207,7 +204,7 @@ private AsyncConnections getConnections(Iterable<RedisURI> redisURIs) throws Int
             try {
                 SocketAddress socketAddress = SocketAddressResolver.resolve(redisURI, clientResources.dnsResolver());
 
-                CompletableFuture<StatefulRedisConnection<String, String>> connectionFuture = nodeConnectionFactory
+                ConnectionFuture<StatefulRedisConnection<String, String>> connectionFuture = nodeConnectionFactory
                         .connectToNodeAsync(CODEC, socketAddress);
 
                 CompletableFuture<StatefulRedisConnection<String, String>> sync = new CompletableFuture<>();
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java b/src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java
index 8563869eec..b425b97aeb 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package com.lambdaworks.redis.cluster.topology;
 
 import java.net.SocketAddress;
-import java.util.concurrent.CompletableFuture;
 
+import com.lambdaworks.redis.ConnectionFuture;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.codec.RedisCodec;
 
@@ -50,6 +50,6 @@ public interface NodeConnectionFactory {
      * @return a new {@link StatefulRedisConnection}
      * @since 4.4
      */
-    <K, V> CompletableFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisCodec<K, V> codec,
+    <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisCodec<K, V> codec,
             SocketAddress socketAddress);
 }
diff --git a/src/test/java/com/lambdaworks/Futures.java b/src/test/java/com/lambdaworks/Futures.java
index 42d603fcc8..ae34ff2605 100644
--- a/src/test/java/com/lambdaworks/Futures.java
+++ b/src/test/java/com/lambdaworks/Futures.java
@@ -15,17 +15,24 @@
  */
 package com.lambdaworks;
 
+import java.lang.reflect.Constructor;
+import java.net.SocketAddress;
 import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 
+import com.lambdaworks.redis.ConnectionFuture;
+
 /**
+ * Utility methods to synchronize and create futures.
+ *
  * @author Mark Paluch
  */
 public class Futures {
 
     /**
      * Check if all {@code futures} are {@link Future#isDone() completed}.
-     * 
+     *
      * @param futures
      * @return {@literal true} if all {@code futures} are {@link Future#isDone() completed}
      */
@@ -38,4 +45,27 @@ public static boolean areAllCompleted(Collection<? extends Future<?>> futures) {
         }
         return true;
     }
+
+    /**
+     * Create a {@link ConnectionFuture}.
+     *
+     * @param socketAddress the socket address.
+     * @param decorated future to decorate.
+     * @param <T>
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> ConnectionFuture<T> createConnectionFuture(SocketAddress socketAddress, CompletableFuture<T> decorated) {
+
+        try {
+            Class<ConnectionFuture> futureClass = (Class) Class.forName("com.lambdaworks.redis.DefaultConnectionFuture");
+            Constructor<ConnectionFuture> constructor = futureClass.getDeclaredConstructor(SocketAddress.class,
+                    CompletableFuture.class);
+            constructor.setAccessible(true);
+
+            return constructor.newInstance(socketAddress, decorated);
+        } catch (ReflectiveOperationException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java b/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
index 7028fbb82c..9aa8a35752 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
@@ -15,7 +15,6 @@
  */
 package com.lambdaworks.redis.cluster.topology;
 
-import static java.util.concurrent.CompletableFuture.completedFuture;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.Matchers.any;
@@ -36,8 +35,11 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import com.lambdaworks.Futures;
+import com.lambdaworks.redis.ConnectionFuture;
 import com.lambdaworks.redis.RedisException;
 import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.TestSettings;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
 import com.lambdaworks.redis.cluster.RedisClusterClient;
@@ -400,10 +402,16 @@ protected Requests createClientListRequests(int duration, String response) {
         return requests;
     }
 
-    private static <T> CompletableFuture<T> completedWithException(Exception e) {
+    private static <T> ConnectionFuture<T> completedFuture(T value) {
+        return Futures.createConnectionFuture(InetSocketAddress.createUnresolved(TestSettings.host(), TestSettings.port()),
+                CompletableFuture.completedFuture(value));
+    }
+
+    private static <T> ConnectionFuture<T> completedWithException(Exception e) {
 
         CompletableFuture<T> future = new CompletableFuture<T>();
         future.completeExceptionally(e);
-        return future;
+        return Futures.createConnectionFuture(InetSocketAddress.createUnresolved(TestSettings.host(), TestSettings.port()),
+                future);
     }
 }

From 76bd1c879e6c2550f8267a9cb6fb8234368cdd74 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 17 Feb 2017 20:35:09 +0100
Subject: [PATCH 148/808] Share cluster node connection progress with request
 threads #453

Threads requesting a cluster node connection now share the connection progress of the same connection attempt. Sharing connection progress improves failure behavior in which a remote peer is unresponsive or connections run into connection timeout.

Previously, connection progress was exclusive to a single thread. Multiple threads trying to connect had to wait in the order of requests until they progressed to make a connection attempt. If, say 100 threads, wanted to execute a command on a node, that was not reachable, the 100th thread had to wait 100 x the connection timeout time because each preceding thread waited until its connection timeout was reached before the connection attempt failed.
---
 .../com/lambdaworks/redis/RedisClient.java    |   2 +-
 .../AbstractClusterNodeConnectionFactory.java | 112 +++++++
 .../ClusterDistributionChannelWriter.java     |  19 +-
 .../cluster/ClusterNodeConnectionFactory.java | 109 +++++++
 .../ClusterPubSubConnectionProvider.java      |  68 +++-
 .../PooledClusterConnectionProvider.java      | 306 +++++-------------
 .../redis/cluster/RedisClusterClient.java     |  35 +-
 ...ynchronizingClusterConnectionProvider.java | 260 +++++++++++++++
 .../topology/ClusterTopologyRefresh.java      |   2 +-
 .../redis/cluster/ClusterRule.java            |   9 +-
 .../PooledClusterConnectionProviderTest.java  |  72 ++++-
 .../redis/cluster/RedisClusterSetupTest.java  |  59 ++--
 ...ronizingClusterConnectionProviderTest.java | 262 +++++++++++++++
 13 files changed, 1014 insertions(+), 301 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/AbstractClusterNodeConnectionFactory.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/ClusterNodeConnectionFactory.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProvider.java
 create mode 100644 src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java

diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/com/lambdaworks/redis/RedisClient.java
index 3b9d99ad60..179273d83b 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/AbstractClusterNodeConnectionFactory.java b/src/main/java/com/lambdaworks/redis/cluster/AbstractClusterNodeConnectionFactory.java
new file mode 100644
index 0000000000..4f8671e3ad
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/AbstractClusterNodeConnectionFactory.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster;
+
+import java.net.SocketAddress;
+import java.util.function.Supplier;
+
+import com.lambdaworks.redis.RedisURI;
+import com.lambdaworks.redis.cluster.models.partitions.Partitions;
+import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import com.lambdaworks.redis.resource.ClientResources;
+import com.lambdaworks.redis.resource.SocketAddressResolver;
+
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+/**
+ * Supporting class for {@link ClusterNodeConnectionFactory} implementations.
+ * <p>
+ * Provides utility methods to resolve {@link SocketAddress} and {@link Partitions}.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+abstract class AbstractClusterNodeConnectionFactory<K, V> implements ClusterNodeConnectionFactory<K, V> {
+
+    private static final InternalLogger logger = InternalLoggerFactory
+            .getInstance(PooledClusterConnectionProvider.DefaultClusterNodeConnectionFactory.class);
+
+    private final ClientResources clientResources;
+
+    private volatile Partitions partitions;
+
+    /**
+     * Create a new {@link AbstractClusterNodeConnectionFactory} given {@link ClientResources}.
+     *
+     * @param clientResources must not be {@literal null}.
+     */
+    public AbstractClusterNodeConnectionFactory(ClientResources clientResources) {
+        this.clientResources = clientResources;
+    }
+
+    public void setPartitions(Partitions partitions) {
+        this.partitions = partitions;
+    }
+
+    public Partitions getPartitions() {
+        return partitions;
+    }
+
+    /**
+     * Get a {@link Supplier} of {@link SocketAddress} for a
+     * {@link com.lambdaworks.redis.cluster.ClusterNodeConnectionFactory.ConnectionKey}.
+     * <p>
+     * This {@link Supplier} resolves the requested endpoint on each {@link Supplier#get()}.
+     *
+     * @param connectionKey must not be {@literal null}.
+     * @return
+     */
+    protected Supplier<SocketAddress> getSocketAddressSupplier(ConnectionKey connectionKey) {
+
+        return () -> {
+
+            if (connectionKey.nodeId != null) {
+
+                SocketAddress socketAddress = getSocketAddress(connectionKey.nodeId);
+                logger.debug("Resolved SocketAddress {} using for Cluster node {}", socketAddress, connectionKey.nodeId);
+                return socketAddress;
+            }
+
+            SocketAddress socketAddress = resolve(RedisURI.create(connectionKey.host, connectionKey.port));
+            logger.debug("Resolved SocketAddress {} using for Cluster node at {}:{}", socketAddress, connectionKey.host,
+                    connectionKey.port);
+            return socketAddress;
+        };
+    }
+
+    /**
+     * Get the {@link SocketAddress} for a {@code nodeId} from {@link Partitions}.
+     *
+     * @param nodeId
+     * @return the {@link SocketAddress}.
+     * @throws IllegalArgumentException if {@code nodeId} cannot be looked up.
+     */
+    protected SocketAddress getSocketAddress(String nodeId) {
+
+        for (RedisClusterNode partition : partitions) {
+            if (partition.getNodeId().equals(nodeId)) {
+                return resolve(partition.getUri());
+            }
+        }
+
+        throw new IllegalArgumentException(String.format("Cannot resolve a RedisClusterNode for nodeId %s", nodeId));
+    }
+
+    private SocketAddress resolve(RedisURI redisURI) {
+        return SocketAddressResolver.resolve(redisURI, clientResources.dnsResolver());
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
index 79b8d92aba..3989b69c70 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
@@ -104,17 +104,16 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
                         RedisChannelHandler<K, V> connection = (RedisChannelHandler<K, V>) clusterConnectionProvider
                                 .getConnection(Intent.WRITE, target.getHostText(), target.getPort());
 
-                        if (asking) {
-                            // set asking bit
-                        StatefulRedisConnection<K, V> statefulRedisConnection = (StatefulRedisConnection<K, V>) connection;
-                        statefulRedisConnection.async().asking();
+                        if (asking) { // set asking bit
+                            StatefulRedisConnection<K, V> statefulRedisConnection = (StatefulRedisConnection<K, V>) connection;
+                            statefulRedisConnection.async().asking();
+                        }
+
+                        connection.getChannelWriter().write(command);
+                    } catch (Exception e) {
+                        command.completeExceptionally(e);
                     }
-
-                    connection.getChannelWriter().write(command);
-                } catch (Exception e) {
-                    command.completeExceptionally(e);
-                }
-            })  ;
+                });
 
                 return command;
             }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeConnectionFactory.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeConnectionFactory.java
new file mode 100644
index 0000000000..20d109c367
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeConnectionFactory.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+
+import com.lambdaworks.redis.ConnectionFuture;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent;
+import com.lambdaworks.redis.cluster.models.partitions.Partitions;
+
+/**
+ * Specialized {@link Function} to obtain connections for Redis Cluster nodes. Connecting to a node returns a
+ * {@link CompletableFuture} for asynchronous connection and late synchronization.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ */
+interface ClusterNodeConnectionFactory<K, V> extends
+        Function<ClusterNodeConnectionFactory.ConnectionKey, ConnectionFuture<StatefulRedisConnection<K, V>>> {
+
+    /**
+     * Set the {@link Partitions}.
+     *
+     * @param partitions
+     */
+    void setPartitions(Partitions partitions);
+
+    /**
+     * Connection to identify a connection either by nodeId or host/port.
+     */
+    class ConnectionKey {
+
+        final Intent intent;
+        final String nodeId;
+        final String host;
+        final int port;
+
+        public ConnectionKey(Intent intent, String nodeId) {
+            this.intent = intent;
+            this.nodeId = nodeId;
+            this.host = null;
+            this.port = 0;
+        }
+
+        public ConnectionKey(Intent intent, String host, int port) {
+            this.intent = intent;
+            this.host = host;
+            this.port = port;
+            this.nodeId = null;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+
+            if (this == o)
+                return true;
+            if (!(o instanceof ConnectionKey))
+                return false;
+
+            ConnectionKey key = (ConnectionKey) o;
+
+            if (port != key.port)
+                return false;
+            if (intent != key.intent)
+                return false;
+            if (nodeId != null ? !nodeId.equals(key.nodeId) : key.nodeId != null)
+                return false;
+            return !(host != null ? !host.equals(key.host) : key.host != null);
+        }
+
+        @Override
+        public int hashCode() {
+
+            int result = intent != null ? intent.name().hashCode() : 0;
+            result = 31 * result + (nodeId != null ? nodeId.hashCode() : 0);
+            result = 31 * result + (host != null ? host.hashCode() : 0);
+            result = 31 * result + port;
+            return result;
+        }
+
+        @Override
+        public String toString() {
+
+            StringBuffer sb = new StringBuffer();
+            sb.append(getClass().getSimpleName());
+            sb.append(" [intent=").append(intent);
+            sb.append(", nodeId='").append(nodeId).append('\'');
+            sb.append(", host='").append(host).append('\'');
+            sb.append(", port=").append(port);
+            sb.append(']');
+            return sb.toString();
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterPubSubConnectionProvider.java b/src/main/java/com/lambdaworks/redis/cluster/ClusterPubSubConnectionProvider.java
index e43beca31a..e16002a85f 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterPubSubConnectionProvider.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/ClusterPubSubConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2015-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,16 @@
  */
 package com.lambdaworks.redis.cluster;
 
+import com.lambdaworks.redis.ConnectionFuture;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 import com.lambdaworks.redis.cluster.pubsub.RedisClusterPubSubListener;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.pubsub.RedisPubSubAdapter;
 import com.lambdaworks.redis.pubsub.RedisPubSubListener;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
+import com.lambdaworks.redis.resource.ClientResources;
 
 /**
  * {@link ClusterConnectionProvider} to provide {@link StatefulRedisPubSubConnection}s for Redis Cluster use.
@@ -40,7 +44,7 @@ class ClusterPubSubConnectionProvider<K, V> extends PooledClusterConnectionProvi
 
     /**
      * Creates a new {@link ClusterPubSubConnectionProvider}.
-     * 
+     *
      * @param redisClusterClient must not be {@literal null}.
      * @param clusterWriter must not be {@literal null}.
      * @param redisCodec must not be {@literal null}.
@@ -58,35 +62,65 @@ public ClusterPubSubConnectionProvider(RedisClusterClient redisClusterClient,
     }
 
     @Override
-    protected ClusterNodeConnectionFactory<K, V> getConnectionFactory() {
-        return new PubSubConnectionFactory();
+    protected ClusterNodeConnectionFactory<K, V> getConnectionFactory(RedisClusterClient redisClusterClient) {
+        return new DecoratingClusterNodeConnectionFactory(new PubSubNodeConnectionFactory(redisClusterClient.getResources()));
     }
 
-    private class PubSubConnectionFactory implements ClusterNodeConnectionFactory<K, V> {
+    @SuppressWarnings("unchecked")
+    private class PubSubNodeConnectionFactory extends AbstractClusterNodeConnectionFactory<K, V> {
 
-        @Override
-        public StatefulRedisPubSubConnection<K, V> apply(ConnectionKey key) {
+        public PubSubNodeConnectionFactory(ClientResources clientResources) {
+            super(clientResources);
+        }
 
-            StatefulRedisPubSubConnection<K, V> connection = null;
+        @Override
+        public ConnectionFuture<StatefulRedisConnection<K, V>> apply(ConnectionKey key) {
 
             if (key.nodeId != null) {
 
                 // NodeId connections do not provide command recovery due to cluster reconfiguration
-                connection = redisClusterClient.connectPubSubToNode(redisCodec, key.nodeId, getSocketAddressSupplier(key));
-
-                connection.addListener(new DelegatingRedisClusterPubSubListener(key.nodeId));
+                return redisClusterClient.connectPubSubToNodeAsync((RedisCodec) redisCodec, key.nodeId,
+                        getSocketAddressSupplier(key));
             }
 
-            if (key.host != null) {
+            // Host and port connections do provide command recovery due to cluster reconfiguration
+            return redisClusterClient.connectPubSubToNodeAsync((RedisCodec) redisCodec, key.host + ":" + key.port,
+                    getSocketAddressSupplier(key));
+        }
+    }
 
-                // Host and port connections do provide command recovery due to cluster reconfiguration
-                connection = redisClusterClient.connectPubSubToNode(redisCodec, key.host + ":" + key.port,
-                        getSocketAddressSupplier(key));
+    @SuppressWarnings("unchecked")
+    private class DecoratingClusterNodeConnectionFactory implements ClusterNodeConnectionFactory<K, V> {
+
+        private final ClusterNodeConnectionFactory<K, V> delegate;
 
-                connection.addListener(new DelegatingRedisClusterPubSubListener(key.host, key.port));
+        public DecoratingClusterNodeConnectionFactory(ClusterNodeConnectionFactory<K, V> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void setPartitions(Partitions partitions) {
+            delegate.setPartitions(partitions);
+        }
+
+        @Override
+        public ConnectionFuture<StatefulRedisConnection<K, V>> apply(ConnectionKey key) {
+
+            ConnectionFuture<StatefulRedisConnection<K, V>> future = delegate.apply(key);
+            if (key.nodeId != null) {
+                return future.thenApply(connection -> {
+                    ((StatefulRedisPubSubConnection) connection).addListener(new DelegatingRedisClusterPubSubListener(
+                            key.nodeId));
+                    return connection;
+                });
             }
 
-            return connection;
+            return future.thenApply(connection -> {
+                ((StatefulRedisPubSubConnection) connection).addListener(new DelegatingRedisClusterPubSubListener(key.host,
+                        key.port));
+
+                return connection;
+            });
         }
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java b/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
index 2419a64039..a54ff50f73 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
@@ -15,33 +15,30 @@
  */
 package com.lambdaworks.redis.cluster;
 
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
 import java.util.function.Function;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.StatefulConnection;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.cluster.ClusterNodeConnectionFactory.ConnectionKey;
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.internal.HostAndPort;
 import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceLists;
 import com.lambdaworks.redis.models.role.RedisInstance;
 import com.lambdaworks.redis.models.role.RedisNodeDescription;
-import com.lambdaworks.redis.resource.SocketAddressResolver;
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
  * Connection provider with built-in connection caching.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -53,15 +50,15 @@ class PooledClusterConnectionProvider<K, V> implements ClusterConnectionProvider
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(PooledClusterConnectionProvider.class);
 
     // Contains NodeId-identified and HostAndPort-identified connections.
-    private final Map<ConnectionKey, StatefulRedisConnection<K, V>> connections = new ConcurrentHashMap<>();
     private final Object stateLock = new Object();
     private final boolean debugEnabled = logger.isDebugEnabled();
     private final StatefulRedisConnection<K, V> writers[] = new StatefulRedisConnection[SlotHash.SLOT_COUNT];
     private final StatefulRedisConnection<K, V> readers[][] = new StatefulRedisConnection[SlotHash.SLOT_COUNT][];
     private final RedisClusterClient redisClusterClient;
-    private final ClusterNodeConnectionFactory connectionFactory;
+    private final ClusterNodeConnectionFactory<K, V> connectionFactory;
     private final RedisChannelWriter clusterWriter;
     private final RedisCodec<K, V> redisCodec;
+    private final SynchronizingClusterConnectionProvider<K, V> connectionProvider;
 
     private Partitions partitions;
     private boolean autoFlushCommands = true;
@@ -73,7 +70,8 @@ public PooledClusterConnectionProvider(RedisClusterClient redisClusterClient, Re
         this.redisCodec = redisCodec;
         this.redisClusterClient = redisClusterClient;
         this.clusterWriter = clusterWriter;
-        this.connectionFactory = new ConnectionPostProcessor(getConnectionFactory());
+        this.connectionFactory = new NodeConnectionPostProcessor(getConnectionFactory(redisClusterClient));
+        this.connectionProvider = new SynchronizingClusterConnectionProvider<>(this.connectionFactory);
     }
 
     @Override
@@ -96,6 +94,7 @@ public StatefulRedisConnection<K, V> getConnection(Intent intent, int slot) {
     }
 
     private StatefulRedisConnection<K, V> getWriteConnection(int slot) {
+
         StatefulRedisConnection<K, V> writer;// avoid races when reconfiguring partitions.
         synchronized (stateLock) {
             writer = writers[slot];
@@ -111,13 +110,14 @@ private StatefulRedisConnection<K, V> getWriteConnection(int slot) {
             // host because the nodeId can be handled by a different host.
             RedisURI uri = partition.getUri();
             ConnectionKey key = new ConnectionKey(Intent.WRITE, uri.getHost(), uri.getPort());
-            return writers[slot] = getOrCreateConnection(key);
+            return writers[slot] = connectionProvider.getConnection(key);
 
         }
         return writer;
     }
 
     protected StatefulRedisConnection<K, V> getReadConnection(int slot) {
+
         StatefulRedisConnection<K, V> readerCandidates[];// avoid races when reconfiguring partitions.
         synchronized (stateLock) {
             readerCandidates = readers[slot];
@@ -126,8 +126,8 @@ protected StatefulRedisConnection<K, V> getReadConnection(int slot) {
         if (readerCandidates == null) {
             RedisClusterNode master = partitions.getPartitionBySlot(slot);
             if (master == null) {
-                throw new RedisException(
-                        "Cannot determine a partition to read for slot " + slot + " (Partitions: " + partitions + ")");
+                throw new RedisException("Cannot determine a partition to read for slot " + slot + " (Partitions: "
+                        + partitions + ")");
             }
 
             List<RedisNodeDescription> candidates = getReadCandidates(master);
@@ -144,8 +144,8 @@ public Iterator<RedisNodeDescription> iterator() {
             });
 
             if (selection.isEmpty()) {
-                throw new RedisException("Cannot determine a partition to read for slot " + slot + " (Partitions: " + partitions
-                        + ") with setting " + readFrom);
+                throw new RedisException("Cannot determine a partition to read for slot " + slot + " (Partitions: "
+                        + partitions + ") with setting " + readFrom);
             }
 
             readerCandidates = getReadFromConnections(selection);
@@ -165,6 +165,7 @@ public Iterator<RedisNodeDescription> iterator() {
     }
 
     private StatefulRedisConnection<K, V>[] getReadFromConnections(List<RedisNodeDescription> selection) {
+
         StatefulRedisConnection<K, V>[] readerCandidates;
         // Use always host and port for slot-oriented operations. We don't want to get reconnected on a different
         // host because the nodeId can be handled by a different host.
@@ -175,11 +176,10 @@ private StatefulRedisConnection<K, V>[] getReadFromConnections(List<RedisNodeDes
             RedisNodeDescription redisClusterNode = selection.get(i);
 
             RedisURI uri = redisClusterNode.getUri();
-            ConnectionKey key = new ConnectionKey(
-                    redisClusterNode.getRole() == RedisInstance.Role.MASTER ? Intent.WRITE : Intent.READ, uri.getHost(),
-                    uri.getPort());
+            ConnectionKey key = new ConnectionKey(redisClusterNode.getRole() == RedisInstance.Role.MASTER ? Intent.WRITE
+                    : Intent.READ, uri.getHost(), uri.getPort());
 
-            readerCandidates[i] = getOrCreateConnection(key);
+            readerCandidates[i] = connectionProvider.getConnection(key);
         }
 
         return readerCandidates;
@@ -198,17 +198,19 @@ private boolean isReadCandidate(RedisClusterNode master, RedisClusterNode partit
 
     @Override
     public StatefulRedisConnection<K, V> getConnection(Intent intent, String nodeId) {
+
         if (debugEnabled) {
             logger.debug("getConnection(" + intent + ", " + nodeId + ")");
         }
 
         ConnectionKey key = new ConnectionKey(intent, nodeId);
-        return getOrCreateConnection(key);
+        return connectionProvider.getConnection(key);
     }
 
     @Override
     @SuppressWarnings({ "unchecked", "hiding", "rawtypes" })
     public StatefulRedisConnection<K, V> getConnection(Intent intent, String host, int port) {
+
         try {
             if (debugEnabled) {
                 logger.debug("getConnection(" + intent + ", " + host + ", " + port + ")");
@@ -224,7 +226,7 @@ public StatefulRedisConnection<K, V> getConnection(Intent intent, String host, i
             }
 
             ConnectionKey key = new ConnectionKey(intent, host, port);
-            return getOrCreateConnection(key);
+            return connectionProvider.getConnection(key);
         } catch (RedisException e) {
             throw e;
         } catch (RuntimeException e) {
@@ -248,24 +250,22 @@ public void close() {
 
         resetFastConnectionCache();
 
-        new HashMap<>(this.connections) //
-                .values().forEach(StatefulConnection::close);
-
-        this.connections.clear();
+        connectionProvider.close();
     }
 
     @Override
     public void reset() {
-        allConnections().forEach(StatefulRedisConnection::reset);
+        connectionProvider.forEach(StatefulRedisConnection::reset);
     }
 
     /**
      * Synchronize on {@code stateLock} to initiate a happens-before relation and clear the thread caches of other threads.
-     * 
+     *
      * @param partitions the new partitions.
      */
     @Override
     public void setPartitions(Partitions partitions) {
+
         boolean reconfigurePartitions = false;
 
         synchronized (stateLock) {
@@ -273,6 +273,7 @@ public void setPartitions(Partitions partitions) {
                 reconfigurePartitions = true;
             }
             this.partitions = partitions;
+            this.connectionFactory.setPartitions(partitions);
         }
 
         if (reconfigurePartitions) {
@@ -286,26 +287,11 @@ protected Partitions getPartitions() {
 
     private void reconfigurePartitions() {
 
-        if (!redisClusterClient.expireStaleConnections()) {
-            return;
-        }
-
-        Set<ConnectionKey> staleConnections = getStaleConnectionKeys();
-
-        for (ConnectionKey key : staleConnections) {
-            StatefulRedisConnection<K, V> connection = connections.get(key);
-
-            RedisChannelHandler<K, V> endpoint = (RedisChannelHandler<K, V>) connection;
+        resetFastConnectionCache();
 
-            if (endpoint.getChannelWriter() instanceof ClusterNodeEndpoint) {
-                ClusterNodeEndpoint clusterNodeEndpoint = (ClusterNodeEndpoint) endpoint
-                        .getChannelWriter();
-                clusterNodeEndpoint.prepareClose();
-            }
+        if (redisClusterClient.expireStaleConnections()) {
+            closeStaleConnections();
         }
-
-        resetFastConnectionCache();
-        closeStaleConnections(staleConnections);
     }
 
     /**
@@ -314,53 +300,34 @@ private void reconfigurePartitions() {
     @Override
     public void closeStaleConnections() {
 
-        Set<ConnectionKey> stale = getStaleConnectionKeys();
-        closeStaleConnections(stale);
-    }
-
-    protected void closeStaleConnections(Set<ConnectionKey> stale) {
-
         logger.debug("closeStaleConnections() count before expiring: {}", getConnectionCount());
 
-        for (ConnectionKey connectionKey : stale) {
-            StatefulRedisConnection<K, V> connection = connections.get(connectionKey);
-            if (connection != null) {
-                connections.remove(connectionKey);
-                connection.close();
+        connectionProvider.forEach((key, connection) -> {
+            if (isStale(key)) {
+                connectionProvider.close(key);
             }
-        }
+        });
 
         logger.debug("closeStaleConnections() count after expiring: {}", getConnectionCount());
     }
 
-    /**
-     * Retrieve a set of PoolKey's for all pooled connections that are within the pool but not within the {@link Partitions}.
-     * 
-     * @return Set of {@link ConnectionKey}s
-     */
-    private Set<ConnectionKey> getStaleConnectionKeys() {
-
-        Map<ConnectionKey, StatefulRedisConnection<K, V>> map = new HashMap<>(connections);
-        Set<ConnectionKey> stale = new HashSet<>();
+    private boolean isStale(ConnectionKey connectionKey) {
 
-        for (ConnectionKey connectionKey : map.keySet()) {
-
-            if (connectionKey.nodeId != null && partitions.getPartitionByNodeId(connectionKey.nodeId) != null) {
-                continue;
-            }
+        if (connectionKey.nodeId != null && partitions.getPartitionByNodeId(connectionKey.nodeId) != null) {
+            return false;
+        }
 
-            if (connectionKey.host != null && getPartition(connectionKey.host, connectionKey.port) != null) {
-                continue;
-            }
-            stale.add(connectionKey);
+        if (connectionKey.host != null && getPartition(connectionKey.host, connectionKey.port) != null) {
+            return false;
         }
-        return stale;
+
+        return true;
     }
 
     /**
      * Set auto-flush on all commands. Synchronize on {@code stateLock} to initiate a happens-before relation and clear the
      * thread caches of other threads.
-     * 
+     *
      * @param autoFlush state of autoFlush.
      */
     @Override
@@ -370,16 +337,12 @@ public void setAutoFlushCommands(boolean autoFlush) {
             this.autoFlushCommands = autoFlush;
         }
 
-        allConnections().forEach(connection -> connection.setAutoFlushCommands(autoFlush));
-    }
-
-    private Collection<StatefulRedisConnection<K, V>> allConnections() {
-        return LettuceLists.unmodifiableList(connections.values());
+        connectionProvider.forEach(connection -> connection.setAutoFlushCommands(autoFlush));
     }
 
     @Override
     public void flushCommands() {
-        allConnections().forEach(StatefulConnection::flushCommands);
+        connectionProvider.forEach(StatefulConnection::flushCommands);
     }
 
     @Override
@@ -401,7 +364,7 @@ public ReadFrom getReadFrom() {
      * @return number of connections.
      */
     long getConnectionCount() {
-        return connections.size();
+        return connectionProvider.getConnectionCount();
     }
 
     /**
@@ -419,102 +382,8 @@ private void resetFastConnectionCache() {
     }
 
     private static RuntimeException invalidConnectionPoint(String message) {
-        return new IllegalArgumentException(
-                "Connection to " + message + " not allowed. This connection point is not known in the cluster view");
-    }
-
-    Supplier<SocketAddress> getSocketAddressSupplier(final ConnectionKey connectionKey) {
-
-        return () -> {
-
-            if (connectionKey.nodeId != null) {
-                SocketAddress socketAddress = getSocketAddress(connectionKey.nodeId);
-                logger.debug("Resolved SocketAddress {} using for Cluster node {}", socketAddress, connectionKey.nodeId);
-                return socketAddress;
-            }
-
-            SocketAddress socketAddress = new InetSocketAddress(connectionKey.host, connectionKey.port);
-            logger.debug("Resolved SocketAddress {} using for Cluster node at {}:{}", socketAddress, connectionKey.host,
-                    connectionKey.port);
-            return socketAddress;
-        };
-    }
-
-    private SocketAddress getSocketAddress(String nodeId) {
-
-        for (RedisClusterNode partition : partitions) {
-            if (partition.getNodeId().equals(nodeId)) {
-                return SocketAddressResolver.resolve(partition.getUri(), redisClusterClient.getResources().dnsResolver());
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Connection to identify a connection either by nodeId or host/port.
-     */
-    static class ConnectionKey {
-
-        final ClusterConnectionProvider.Intent intent;
-        final String nodeId;
-        final String host;
-        final int port;
-
-        public ConnectionKey(Intent intent, String nodeId) {
-            this.intent = intent;
-            this.nodeId = nodeId;
-            this.host = null;
-            this.port = 0;
-        }
-
-        public ConnectionKey(Intent intent, String host, int port) {
-            this.intent = intent;
-            this.host = host;
-            this.port = port;
-            this.nodeId = null;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-
-            if (this == o)
-                return true;
-            if (!(o instanceof ConnectionKey))
-                return false;
-
-            ConnectionKey key = (ConnectionKey) o;
-
-            if (port != key.port)
-                return false;
-            if (intent != key.intent)
-                return false;
-            if (nodeId != null ? !nodeId.equals(key.nodeId) : key.nodeId != null)
-                return false;
-            return !(host != null ? !host.equals(key.host) : key.host != null);
-        }
-
-        @Override
-        public int hashCode() {
-
-            int result = intent != null ? intent.name().hashCode() : 0;
-            result = 31 * result + (nodeId != null ? nodeId.hashCode() : 0);
-            result = 31 * result + (host != null ? host.hashCode() : 0);
-            result = 31 * result + port;
-            return result;
-        }
-
-        @Override
-        public String toString() {
-
-            StringBuffer sb = new StringBuffer();
-            sb.append(getClass().getSimpleName());
-            sb.append(" [intent=").append(intent);
-            sb.append(", nodeId='").append(nodeId).append('\'');
-            sb.append(", host='").append(host).append('\'');
-            sb.append(", port=").append(port);
-            sb.append(']');
-            return sb.toString();
-        }
+        return new IllegalArgumentException("Connection to " + message
+                + " not allowed. This connection point is not known in the cluster view");
     }
 
     boolean validateClusterNodeMembership() {
@@ -522,27 +391,28 @@ boolean validateClusterNodeMembership() {
                 || redisClusterClient.getClusterClientOptions().isValidateClusterNodeMembership();
     }
 
-    private StatefulRedisConnection<K, V> getOrCreateConnection(ConnectionKey key) {
-        return connections.computeIfAbsent(key, connectionFactory);
-    }
-
     /**
      * @return a factory {@link Function}
      */
-    protected ClusterNodeConnectionFactory<K, V> getConnectionFactory() {
-        return new NodeConnectionFactoryImpl(redisClusterClient, redisCodec, clusterWriter);
+    protected ClusterNodeConnectionFactory<K, V> getConnectionFactory(RedisClusterClient redisClusterClient) {
+        return new DefaultClusterNodeConnectionFactory<>(redisClusterClient, redisCodec, clusterWriter);
     }
 
-    private class ConnectionPostProcessor implements ClusterNodeConnectionFactory<K, V> {
+    private class NodeConnectionPostProcessor implements ClusterNodeConnectionFactory<K, V> {
 
-        private final Function<ConnectionKey, StatefulRedisConnection<K, V>> delegate;
+        private final ClusterNodeConnectionFactory<K, V> delegate;
 
-        public ConnectionPostProcessor(Function<ConnectionKey, StatefulRedisConnection<K, V>> delegate) {
+        public NodeConnectionPostProcessor(ClusterNodeConnectionFactory<K, V> delegate) {
             this.delegate = delegate;
         }
 
         @Override
-        public StatefulRedisConnection<K, V> apply(ConnectionKey key) {
+        public void setPartitions(Partitions partitions) {
+            this.delegate.setPartitions(partitions);
+        }
+
+        @Override
+        public ConnectionFuture<StatefulRedisConnection<K, V>> apply(ConnectionKey key) {
 
             if (key.nodeId != null) {
                 if (getPartitions().getPartitionByNodeId(key.nodeId) == null) {
@@ -559,60 +429,60 @@ public StatefulRedisConnection<K, V> apply(ConnectionKey key) {
                 }
             }
 
-            StatefulRedisConnection<K, V> connection = delegate.apply(key);
+            ConnectionFuture<StatefulRedisConnection<K, V>> connection = delegate.apply(key);
 
-            LettuceAssert.notNull(connection, "Connection is null. Check ConnectionKey because host and nodeId are null");
+            LettuceAssert.notNull(connection, "Connection is null. Check ConnectionKey because host and nodeId are null.");
 
-            try {
-                if (key.intent == Intent.READ) {
-                    connection.sync().readOnly();
-                }
+            if (key.intent == Intent.READ) {
+
+                connection = connection.thenCompose(c -> {
+
+                    RedisFuture<String> stringRedisFuture = c.async().readOnly();
+                    return stringRedisFuture.thenApply(s -> c).whenCompleteAsync((s, throwable) -> {
+                        if (throwable != null) {
+                            c.close();
+                        }
+                    });
+                });
+            }
 
+            connection = connection.thenApply(c -> {
                 synchronized (stateLock) {
-                    connection.setAutoFlushCommands(autoFlushCommands);
+                    c.setAutoFlushCommands(autoFlushCommands);
                 }
-            } catch (RuntimeException e) {
-                connection.close();
-                throw e;
-            }
+                return c;
+            });
 
             return connection;
         }
     }
 
-    private class NodeConnectionFactoryImpl implements ClusterNodeConnectionFactory<K, V> {
+    static class DefaultClusterNodeConnectionFactory<K, V> extends AbstractClusterNodeConnectionFactory<K, V> {
 
         private final RedisClusterClient redisClusterClient;
         private final RedisCodec<K, V> redisCodec;
         private final RedisChannelWriter clusterWriter;
 
-        public NodeConnectionFactoryImpl(RedisClusterClient redisClusterClient, RedisCodec<K, V> redisCodec,
+        public DefaultClusterNodeConnectionFactory(RedisClusterClient redisClusterClient, RedisCodec<K, V> redisCodec,
                 RedisChannelWriter clusterWriter) {
+
+            super(redisClusterClient.getResources());
             this.redisClusterClient = redisClusterClient;
             this.redisCodec = redisCodec;
             this.clusterWriter = clusterWriter;
         }
 
         @Override
-        public StatefulRedisConnection<K, V> apply(ConnectionKey key) {
-
-            StatefulRedisConnection<K, V> connection = null;
+        public ConnectionFuture<StatefulRedisConnection<K, V>> apply(ConnectionKey key) {
 
             if (key.nodeId != null) {
                 // NodeId connections do not provide command recovery due to cluster reconfiguration
-                connection = redisClusterClient.connectToNode(redisCodec, key.nodeId, null, getSocketAddressSupplier(key));
-            }
-
-            if (key.host != null) {
-                // Host and port connections do provide command recovery due to cluster reconfiguration
-                connection = redisClusterClient.connectToNode(redisCodec, key.host + ":" + key.port, clusterWriter,
-                        getSocketAddressSupplier(key));
+                return redisClusterClient.connectToNodeAsync(redisCodec, key.nodeId, null, getSocketAddressSupplier(key));
             }
 
-            return connection;
+            // Host and port connections do provide command recovery due to cluster reconfiguration
+            return redisClusterClient.connectToNodeAsync(redisCodec, key.host + ":" + key.port, clusterWriter,
+                    getSocketAddressSupplier(key));
         }
     }
-
-    interface ClusterNodeConnectionFactory<K, V> extends Function<ConnectionKey, StatefulRedisConnection<K, V>> {
-    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index 71a47fa470..9926972796 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -405,7 +405,7 @@ <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, Strin
      * @param <V> Value type
      * @return A new connection
      */
-    private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisCodec<K, V> codec, String nodeId,
+    <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisCodec<K, V> codec, String nodeId,
             RedisChannelWriter clusterWriter, final Supplier<SocketAddress> socketAddressSupplier) {
 
         assertNotNull(codec);
@@ -440,7 +440,22 @@ private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsyn
      * @return A new connection
      */
     <K, V> StatefulRedisPubSubConnection<K, V> connectPubSubToNode(RedisCodec<K, V> codec, String nodeId,
-            final Supplier<SocketAddress> socketAddressSupplier) {
+            Supplier<SocketAddress> socketAddressSupplier) {
+        return getConnection(connectPubSubToNodeAsync(codec, nodeId, socketAddressSupplier));
+    }
+
+    /**
+     * Create a pub/sub connection to a redis socket address.
+     *
+     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
+     * @param nodeId the nodeId
+     * @param socketAddressSupplier supplier for the socket address
+     * @param <K> Key type
+     * @param <V> Value type
+     * @return A new connection
+     */
+    <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNodeAsync(RedisCodec<K, V> codec,
+            String nodeId, Supplier<SocketAddress> socketAddressSupplier) {
 
         assertNotNull(codec);
         assertNotEmpty(initialUris);
@@ -453,15 +468,13 @@ <K, V> StatefulRedisPubSubConnection<K, V> connectPubSubToNode(RedisCodec<K, V>
         StatefulRedisPubSubConnectionImpl<K, V> connection = new StatefulRedisPubSubConnectionImpl<>(endpoint, endpoint, codec,
                 timeout, unit);
 
-        try {
-            connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier, () -> new PubSubCommandHandler<K, V>(
-                    clientResources, codec, endpoint));
-        } catch (RedisException e) {
-            connection.close();
-            throw e;
-        }
-        return connection;
-
+        ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectionFuture = connectStatefulAsync(connection, endpoint,
+                getFirstUri(), socketAddressSupplier, () -> new PubSubCommandHandler<K, V>(clientResources, codec, endpoint));
+        return connectionFuture.whenComplete((conn, throwable) -> {
+            if (throwable != null) {
+                connection.close();
+            }
+        });
     }
 
     /**
diff --git a/src/main/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProvider.java b/src/main/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProvider.java
new file mode 100644
index 0000000000..47897ce6f5
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProvider.java
@@ -0,0 +1,260 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster;
+
+import java.util.Map;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+
+import com.lambdaworks.redis.ConnectionFuture;
+import com.lambdaworks.redis.RedisConnectionException;
+import com.lambdaworks.redis.RedisException;
+import com.lambdaworks.redis.api.StatefulConnection;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.cluster.ClusterNodeConnectionFactory.ConnectionKey;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Synchronizing provider for Redis Cluster node connections using {@link ClusterNodeConnectionFactory}.
+ * <p>
+ * {@link #getConnection(ConnectionKey) Connection requests} are synchronized with a shared {@link Sync synchronzer object} per
+ * {@link ConnectionKey}. Multiple threads requesting a connection for the same {@link ConnectionKey} share the same
+ * synchronizer and are not required to wait until a previous asynchronous connection is established but participate in existing
+ * connection initializations. Shared synchronization leads to a fair synchronization amongst multiple threads waiting to obtain
+ * a connection.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+class SynchronizingClusterConnectionProvider<K, V> {
+
+    private final ClusterNodeConnectionFactory<K, V> connectionFactory;
+    private final Map<ConnectionKey, Sync<K, V>> connections = new ConcurrentHashMap<>();
+    private volatile boolean closed;
+
+    /**
+     * Create a new {@link SynchronizingClusterConnectionProvider}.
+     *
+     * @param connectionFactory must not be {@literal null}.
+     */
+    public SynchronizingClusterConnectionProvider(ClusterNodeConnectionFactory<K, V> connectionFactory) {
+
+        LettuceAssert.notNull(connectionFactory, "AsyncClusterConnectionFactory must not be null");
+        this.connectionFactory = connectionFactory;
+    }
+
+    /**
+     * Obtain a {@link StatefulRedisConnection} to a cluster node given {@link ConnectionKey}.
+     *
+     * @param key the {@link ConnectionKey}.
+     * @return
+     * @throws RedisException if a {@link RedisException} occured
+     * @throws CompletionException
+     */
+    public StatefulRedisConnection<K, V> getConnection(ConnectionKey key) {
+
+        if (closed) {
+            throw new IllegalStateException("AsyncClusterConnectionProvider is already closed");
+        }
+
+        Sync<K, V> sync = connections.computeIfAbsent(key, connectionKey -> {
+
+            InProgress<K, V> createdSync = new InProgress<>(key, connectionFactory.apply(key), connections);
+
+            if (closed) {
+                createdSync.remove = InProgress.ST_FINISHED;
+                createdSync.future.thenAcceptAsync(StatefulConnection::close);
+            }
+
+            return createdSync;
+        });
+
+        return sync.getConnection();
+    }
+
+    /**
+     * @return number of established connections.
+     */
+    @SuppressWarnings("unchecked")
+    public int getConnectionCount() {
+
+        Sync<K, V>[] syncs = connections.values().toArray(new Sync[0]);
+        int count = 0;
+
+        for (Sync<K, V> sync : syncs) {
+            if (sync instanceof Finished) {
+                count++;
+            }
+        }
+
+        return count;
+    }
+
+    /**
+     * Close all connections. Pending connections are closed using future chaining.
+     */
+    public void close() {
+
+        this.closed = true;
+        forEach((connectionKey, connection) -> {
+            connection.close();
+            connections.remove(connectionKey);
+        });
+    }
+
+    /**
+     * Close a connection by its {@link ConnectionKey}. Pending connections are closed using future chaining.
+     *
+     * @param key must not be {@literal null}.
+     */
+    public void close(ConnectionKey key) {
+
+        LettuceAssert.notNull(key, "ConnectionKey must not be null!");
+
+        Sync<K, V> sync = connections.get(key);
+        if (sync != null) {
+            connections.remove(key);
+            sync.doWithSync(StatefulConnection::close);
+        }
+    }
+
+    /**
+     * Execute an action for all established and pending {@link StatefulRedisConnection}s.
+     *
+     * @param action the action.
+     */
+    public void forEach(Consumer<? super StatefulRedisConnection<K, V>> action) {
+        connections.values().forEach(sync -> sync.doWithSync(action));
+    }
+
+    /**
+     * Execute an action for all established and pending {@link StatefulRedisConnection}s.
+     *
+     * @param action the action.
+     */
+    public void forEach(BiConsumer<ConnectionKey, ? super StatefulRedisConnection<K, V>> action) {
+        connections.forEach((key, sync) -> sync.doWithSync(action));
+    }
+
+    interface Sync<K, V> {
+
+        /**
+         * Return the {@link StatefulRedisConnection}. May cause blocking if asynchronous connection is {@link InProgress}.
+         *
+         * @return
+         */
+        StatefulRedisConnection<K, V> getConnection();
+
+        /**
+         * Apply a {@link Consumer} callback to the {@link StatefulConnection}.
+         *
+         * @param action
+         */
+        void doWithSync(Consumer<? super StatefulRedisConnection<K, V>> action);
+
+        /**
+         * Apply a {@link BiConsumer} callback to the {@link ConnectionKey} and {@link StatefulConnection}.
+         *
+         * @param action
+         */
+        void doWithSync(BiConsumer<ConnectionKey, ? super StatefulRedisConnection<K, V>> action);
+    }
+
+    static class Finished<K, V> implements Sync<K, V> {
+
+        private final ConnectionKey key;
+        private StatefulRedisConnection<K, V> connection;
+
+        public Finished(ConnectionKey key, StatefulRedisConnection<K, V> connection) {
+            this.key = key;
+            this.connection = connection;
+        }
+
+        @Override
+        public StatefulRedisConnection<K, V> getConnection() {
+            return connection;
+        }
+
+        @Override
+        public void doWithSync(Consumer<? super StatefulRedisConnection<K, V>> action) {
+            action.accept(connection);
+        }
+
+        @Override
+        public void doWithSync(BiConsumer<ConnectionKey, ? super StatefulRedisConnection<K, V>> action) {
+            action.accept(key, connection);
+        }
+    }
+
+    static class InProgress<K, V> implements Sync<K, V> {
+
+        private static final int ST_IN_PROGRESS = 0;
+        private static final int ST_FINISHED = 1;
+
+        private final static AtomicIntegerFieldUpdater<InProgress> REMOVE = AtomicIntegerFieldUpdater.newUpdater(
+                InProgress.class, "remove");
+
+        // Updated with AtomicIntegerFieldUpdater
+        @SuppressWarnings("unused")
+        private volatile int remove = ST_IN_PROGRESS;
+
+        private final ConnectionKey key;
+        private final ConnectionFuture<StatefulRedisConnection<K, V>> future;
+        private final Map<ConnectionKey, Sync<K, V>> connections;
+
+        public InProgress(ConnectionKey key, ConnectionFuture<StatefulRedisConnection<K, V>> future,
+                Map<ConnectionKey, Sync<K, V>> connections) {
+
+            this.key = key;
+            this.future = future;
+            this.connections = connections;
+        }
+
+        public StatefulRedisConnection<K, V> getConnection() {
+
+            try {
+                return future.whenComplete((connection, throwable) -> {
+
+                    if (REMOVE.compareAndSet(this, 0, ST_FINISHED)) {
+
+                        if (throwable == null) {
+                            connections.replace(key, this, new Finished<>(key, connection));
+                        } else {
+                            connections.remove(key);
+                        }
+                    }
+
+                }).join();
+            } catch (CompletionException e) {
+                String msg = String.format("Unable to connect to %s", future.getRemoteAddress());
+                throw new RedisConnectionException(msg, e.getCause());
+            }
+        }
+
+        @Override
+        public void doWithSync(Consumer<? super StatefulRedisConnection<K, V>> action) {
+            future.thenAccept(action);
+        }
+
+        @Override
+        public void doWithSync(BiConsumer<ConnectionKey, ? super StatefulRedisConnection<K, V>> action) {
+            future.thenAccept(connection -> action.accept(key, connection));
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
index 75a050503c..cf6628e738 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterRule.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterRule.java
index b420e702ed..0719a75051 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterRule.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 import org.junit.runners.model.Statement;
 
 import com.lambdaworks.redis.api.async.RedisAsyncCommands;
+import com.lambdaworks.redis.api.async.RedisServerAsyncCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
 import com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser;
@@ -79,7 +80,7 @@ public void evaluate() throws Throwable {
     }
 
     /**
-     * 
+     *
      * @return true if the cluster state is {@code ok} and there are no failing nodes
      */
     public boolean isStable() {
@@ -123,13 +124,14 @@ public void flushdb() {
      * Cluster reset on all nodes.
      */
     public void clusterReset() {
+        onAllConnections(RedisServerAsyncCommands::flushall, true);
         onAllConnections(c -> c.clusterReset(true));
         onAllConnections(RedisClusterAsyncCommands::clusterFlushslots);
     }
 
     /**
      * Meet on all nodes.
-     * 
+     *
      * @param host
      * @param port
      */
@@ -162,7 +164,6 @@ private <T> void onAllConnections(Function<RedisClusterAsyncCommands<?, ?>, Futu
         }
     }
 
-
     private void await(List<Future<?>> futures, boolean ignoreExecutionException) throws InterruptedException,
             java.util.concurrent.ExecutionException, java.util.concurrent.TimeoutException {
         for (Future<?> future : futures) {
diff --git a/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java b/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
index e870344c50..0c53a6c2a7 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
@@ -19,10 +19,15 @@
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
 
+import java.net.SocketAddress;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -32,16 +37,22 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import com.lambdaworks.Futures;
 import com.lambdaworks.redis.ReadFrom;
 import com.lambdaworks.redis.RedisChannelWriter;
 import com.lambdaworks.redis.RedisException;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.api.async.RedisAsyncCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent;
 import com.lambdaworks.redis.cluster.models.partitions.Partitions;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 import com.lambdaworks.redis.codec.Utf8StringCodec;
+import com.lambdaworks.redis.protocol.AsyncCommand;
+import com.lambdaworks.redis.protocol.Command;
+import com.lambdaworks.redis.protocol.CommandType;
+import com.lambdaworks.redis.resource.ClientResources;
 
 /**
  * @author Mark Paluch
@@ -53,6 +64,9 @@ public class PooledClusterConnectionProviderTest {
 
     private PooledClusterConnectionProvider<String, String> sut;
 
+    @Mock
+    SocketAddress socketAddressMock;
+
     @Mock
     RedisClusterClient clientMock;
 
@@ -65,6 +79,12 @@ public class PooledClusterConnectionProviderTest {
     @Mock
     RedisCommands<String, String> commandsMock;
 
+    @Mock
+    RedisAsyncCommands<String, String> asyncCommandsMock;
+
+    @Mock
+    ClientResources clientResourcesMock;
+
     Partitions partitions = new Partitions();
 
     @Before
@@ -82,13 +102,14 @@ public void before() {
 
         sut.setPartitions(partitions);
 
-        when(nodeConnectionMock.sync()).thenReturn(commandsMock);
+        when(nodeConnectionMock.async()).thenReturn(asyncCommandsMock);
     }
 
     @Test
     public void shouldObtainConnection() {
 
-        when(clientMock.connectToNode(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(nodeConnectionMock);
+        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
+                Futures.createConnectionFuture(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         StatefulRedisConnection<String, String> connection = sut.getConnection(Intent.READ, 1);
 
@@ -100,23 +121,36 @@ public void shouldObtainConnection() {
     @Test
     public void shouldObtainConnectionReadFromSlave() {
 
-        when(clientMock.connectToNode(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(nodeConnectionMock);
+        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
+                Futures.createConnectionFuture(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<String, String, String>(
+                CommandType.READONLY, null, null));
+        async.complete();
+
+        when(asyncCommandsMock.readOnly()).thenReturn(async);
 
         sut.setReadFrom(ReadFrom.SLAVE);
 
         StatefulRedisConnection<String, String> connection = sut.getConnection(Intent.READ, 1);
 
         assertThat(connection).isSameAs(nodeConnectionMock);
-        verify(connection).sync();
-        verify(commandsMock).readOnly();
+        verify(connection).async();
+        verify(asyncCommandsMock).readOnly();
         verify(connection).setAutoFlushCommands(true);
     }
 
     @Test
     public void shouldCloseConnectionOnConnectFailure() {
 
-        when(clientMock.connectToNode(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(nodeConnectionMock);
-        doThrow(new RuntimeException()).when(commandsMock).readOnly();
+        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
+                Futures.createConnectionFuture(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<String, String, String>(
+                CommandType.READONLY, null, null));
+        async.completeExceptionally(new RuntimeException());
+
+        when(asyncCommandsMock.readOnly()).thenReturn(async);
 
         sut.setReadFrom(ReadFrom.SLAVE);
 
@@ -128,14 +162,20 @@ public void shouldCloseConnectionOnConnectFailure() {
         }
 
         verify(nodeConnectionMock).close();
-        verify(clientMock).connectToNode(eq(CODEC), eq("localhost:2"), any(), any());
+        verify(clientMock).connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any());
     }
 
     @Test
     public void shouldRetryConnectionAttemptAfterConnectionAttemptWasBroken() {
 
-        when(clientMock.connectToNode(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(nodeConnectionMock);
-        doThrow(new RuntimeException()).when(commandsMock).readOnly();
+        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
+                Futures.createConnectionFuture(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<String, String, String>(
+                CommandType.READONLY, null, null));
+        async.completeExceptionally(new RuntimeException());
+
+        when(asyncCommandsMock.readOnly()).thenReturn(async);
 
         sut.setReadFrom(ReadFrom.SLAVE);
 
@@ -147,17 +187,21 @@ public void shouldRetryConnectionAttemptAfterConnectionAttemptWasBroken() {
         }
         verify(nodeConnectionMock).close();
 
-        doReturn("OK").when(commandsMock).readOnly();
+        async = new AsyncCommand<>(new Command<String, String, String>(CommandType.READONLY, null, null));
+        async.complete();
+
+        when(asyncCommandsMock.readOnly()).thenReturn(async);
 
         sut.getConnection(Intent.READ, 1);
 
-        verify(clientMock, times(2)).connectToNode(eq(CODEC), eq("localhost:2"), any(), any());
+        verify(clientMock, times(2)).connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any());
     }
 
     @Test
     public void shouldCloseConnections() {
 
-        when(clientMock.connectToNode(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(nodeConnectionMock);
+        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
+                Futures.createConnectionFuture(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         StatefulRedisConnection<String, String> connection = sut.getConnection(Intent.READ, 1);
         assertThat(connection).isNotNull();
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
index e18fef4175..46a2750c0c 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,16 +17,19 @@
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
 import static com.google.code.tempusfugit.temporal.Timeout.timeout;
+import static com.lambdaworks.redis.cluster.AbstractClusterTest.createSlots;
 import static com.lambdaworks.redis.cluster.ClusterTestUtil.getNodeId;
 import static com.lambdaworks.redis.cluster.ClusterTestUtil.getOwnPartition;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
 
 import org.junit.*;
 
@@ -51,7 +54,7 @@
 
 /**
  * Test for mutable cluster setup scenarios.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -187,7 +190,8 @@ public void clusterSlotMigrationImport() throws Exception {
     @Test
     public void clusterTopologyRefresh() throws Exception {
 
-        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED).build());
+        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED)
+                .build());
         clusterClient.reloadPartitions();
 
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
@@ -280,8 +284,8 @@ public void disconnectedConnectionRejectTest() throws Exception {
         assertRoutedExecution(clusterConnection);
 
         RedisClusterNode partition1 = getOwnPartition(redis1);
-        RedisClusterAsyncCommands<String, String> node1Connection = clusterConnection
-                .getConnection(partition1.getUri().getHost(), partition1.getUri().getPort());
+        RedisClusterAsyncCommands<String, String> node1Connection = clusterConnection.getConnection(partition1.getUri()
+                .getHost(), partition1.getUri().getPort());
 
         shiftAllSlotsToNode1();
 
@@ -303,7 +307,9 @@ public void disconnectedConnectionRejectTest() throws Exception {
     @Test
     public void atLeastOnceForgetNodeFailover() throws Exception {
 
-        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED).build());
+
+        clusterClient.setOptions(
+                ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED).build());
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
         clusterClient.setOptions(ClusterClientOptions.create());
         ClusterSetup.setup2Masters(clusterRule);
@@ -312,8 +318,11 @@ public void atLeastOnceForgetNodeFailover() throws Exception {
 
         RedisClusterNode partition1 = getOwnPartition(redis1);
         RedisClusterNode partition2 = getOwnPartition(redis2);
-        RedisClusterAsyncCommands<String, String> node2Connection = clusterConnection
-                .getConnection(partition2.getUri().getHost(), partition2.getUri().getPort());
+        RedisClusterAsyncCommands<String, String> node1Connection = clusterConnection.getConnection(partition1.getUri()
+                .getHost(), partition1.getUri().getPort());
+
+        RedisClusterAsyncCommands<String, String> node2Connection = clusterConnection.getConnection(partition2.getUri()
+                .getHost(), partition2.getUri().getPort());
 
         shiftAllSlotsToNode1();
 
@@ -333,27 +342,29 @@ public void atLeastOnceForgetNodeFailover() throws Exception {
         redis1.clusterForget(partition2.getNodeId());
         redis2.clusterForget(partition1.getNodeId());
 
-        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED).build());
-        waitUntilOnlyOnePartition();
+        Partitions partitions = clusterClient.getPartitions();
+        partitions.remove(partition2);
+        partitions.getPartition(0).setSlots(Arrays.stream(createSlots(0, 16384)).boxed().collect(Collectors.toList()));
+        partitions.updateCache();
+        clusterClient.updatePartitionsInConnections();
 
         Wait.untilTrue(() -> Futures.areAllCompleted(futures)).waitOrTimeout();
 
         assertRoutedExecution(clusterConnection);
 
         clusterConnection.getStatefulConnection().close();
-
     }
 
     @Test
     public void expireStaleNodeIdConnections() throws Exception {
 
-        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED).build());
+        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED)
+                .build());
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
 
         ClusterSetup.setup2Masters(clusterRule);
 
-        PooledClusterConnectionProvider<String, String> clusterConnectionProvider = getPooledClusterConnectionProvider(
-                clusterConnection);
+        PooledClusterConnectionProvider<String, String> clusterConnectionProvider = getPooledClusterConnectionProvider(clusterConnection);
 
         assertThat(clusterConnectionProvider.getConnectionCount()).isEqualTo(0);
 
@@ -397,8 +408,7 @@ public void doNotExpireStaleNodeIdConnections() throws Exception {
 
         ClusterSetup.setup2Masters(clusterRule);
 
-        PooledClusterConnectionProvider<String, String> clusterConnectionProvider = getPooledClusterConnectionProvider(
-                clusterConnection);
+        PooledClusterConnectionProvider<String, String> clusterConnectionProvider = getPooledClusterConnectionProvider(clusterConnection);
 
         assertThat(clusterConnectionProvider.getConnectionCount()).isEqualTo(0);
 
@@ -436,8 +446,7 @@ public void expireStaleHostAndPortConnections() throws Exception {
 
         ClusterSetup.setup2Masters(clusterRule);
 
-        final PooledClusterConnectionProvider<String, String> clusterConnectionProvider = getPooledClusterConnectionProvider(
-                clusterConnection);
+        final PooledClusterConnectionProvider<String, String> clusterConnectionProvider = getPooledClusterConnectionProvider(clusterConnection);
 
         assertThat(clusterConnectionProvider.getConnectionCount()).isEqualTo(0);
 
@@ -528,8 +537,8 @@ private void waitUntilOnlyOnePartition() throws InterruptedException, TimeoutExc
         Wait.untilEquals(1, () -> clusterClient.getPartitions().size()).waitOrTimeout();
     }
 
-    private void suspendConnection(RedisClusterAsyncCommands<String, String> asyncCommands)
-            throws InterruptedException, TimeoutException {
+    private void suspendConnection(RedisClusterAsyncCommands<String, String> asyncCommands) throws InterruptedException,
+            TimeoutException {
         ConnectionTestUtil.getConnectionWatchdog(((RedisAsyncCommands<?, ?>) asyncCommands).getStatefulConnection())
                 .setReconnectSuspended(true);
         asyncCommands.quit();
@@ -538,8 +547,8 @@ private void suspendConnection(RedisClusterAsyncCommands<String, String> asyncCo
 
     protected void shiftAllSlotsToNode1() throws InterruptedException, TimeoutException {
 
-        redis1.clusterDelSlots(AbstractClusterTest.createSlots(12000, 16384));
-        redis2.clusterDelSlots(AbstractClusterTest.createSlots(12000, 16384));
+        redis1.clusterDelSlots(createSlots(12000, 16384));
+        redis2.clusterDelSlots(createSlots(12000, 16384));
 
         waitForSlots(redis2, 0);
 
@@ -566,7 +575,7 @@ private void removeRemaining(RedisClusterNode partition) {
             }
         }, timeout(seconds(10)));
 
-        redis1.clusterAddSlots(RedisClusterClientTest.createSlots(12000, 16384));
+        redis1.clusterAddSlots(createSlots(12000, 16384));
         waitForSlots(redis1, 16384);
 
         Wait.untilTrue(clusterRule::isStable).waitOrTimeout();
@@ -576,8 +585,8 @@ private int[] toIntArray(List<Integer> list) {
         return list.parallelStream().mapToInt(Integer::intValue).toArray();
     }
 
-    private void waitForSlots(RedisClusterCommands<String, String> connection, int slotCount)
-            throws InterruptedException, TimeoutException {
+    private void waitForSlots(RedisClusterCommands<String, String> connection, int slotCount) throws InterruptedException,
+            TimeoutException {
         Wait.untilEquals(slotCount, () -> getOwnPartition(connection).getSlots().size()).waitOrTimeout();
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java b/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java
new file mode 100644
index 0000000000..e059236ee8
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java
@@ -0,0 +1,262 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.*;
+import org.springframework.util.SocketUtils;
+import org.springframework.util.StopWatch;
+
+import com.lambdaworks.TestClientResources;
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.api.StatefulRedisConnection;
+import com.lambdaworks.redis.cluster.ClusterNodeConnectionFactory.ConnectionKey;
+import com.lambdaworks.redis.codec.StringCodec;
+
+/**
+ * @author Mark Paluch
+ */
+public class SynchronizingClusterConnectionProviderTest {
+
+    private static RedisClusterClient redisClient;
+    private ServerSocket serverSocket;
+    private CountDownLatch connectInitiated = new CountDownLatch(1);
+
+    private SynchronizingClusterConnectionProvider<String, String> sut;
+
+    @BeforeClass
+    public static void beforeClass() throws Exception {
+
+        RedisURI redisURI = RedisURI.create(TestSettings.host(), 1);
+        redisURI.setTimeout(5);
+        redisURI.setUnit(TimeUnit.SECONDS);
+
+        redisClient = RedisClusterClient.create(TestClientResources.create(), redisURI);
+        redisClient.setOptions(ClusterClientOptions.create());
+    }
+
+    @Before
+    public void before() throws Exception {
+
+        serverSocket = new ServerSocket(SocketUtils.findAvailableTcpPort(), 1);
+
+        sut = new SynchronizingClusterConnectionProvider<>(new AbstractClusterNodeConnectionFactory<String, String>(
+                redisClient.getResources()) {
+            @Override
+            public ConnectionFuture<StatefulRedisConnection<String, String>> apply(ConnectionKey connectionKey) {
+
+                RedisURI redisURI = RedisURI.create(TestSettings.host(), serverSocket.getLocalPort());
+                redisURI.setTimeout(5);
+                redisURI.setUnit(TimeUnit.SECONDS);
+
+                ConnectionFuture<StatefulRedisConnection<String, String>> future = redisClient.connectToNodeAsync(
+                        StringCodec.UTF8, "", null, () -> new InetSocketAddress("localhost", serverSocket.getLocalPort()));
+
+                connectInitiated.countDown();
+
+                return future;
+            }
+        });
+    }
+
+    @After
+    public void after() throws Exception {
+        serverSocket.close();
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        redisClient.shutdown();
+    }
+
+    @Test
+    public void shouldCreateConnection() throws IOException {
+
+        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "");
+        StatefulRedisConnection<String, String> connection = sut.getConnection(connectionKey);
+
+        assertThat(sut.getConnection(connectionKey)).isSameAs(connection);
+        sut.close();
+        serverSocket.accept();
+    }
+
+    @Test
+    public void shouldMaintainConnectionCount() throws IOException {
+
+        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "");
+
+        assertThat(sut.getConnectionCount()).isEqualTo(0);
+
+        sut.getConnection(connectionKey);
+
+        assertThat(sut.getConnectionCount()).isEqualTo(1);
+        sut.close();
+
+        serverSocket.accept();
+    }
+
+    @Test
+    public void shouldCloseConnectionByKey() throws IOException {
+
+        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "");
+
+        sut.getConnection(connectionKey);
+        sut.close(connectionKey);
+
+        assertThat(sut.getConnectionCount()).isEqualTo(0);
+        sut.close();
+
+        serverSocket.accept();
+    }
+
+    @Test
+    public void shouldCloseConnections() throws IOException {
+
+        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "");
+
+        sut.getConnection(connectionKey);
+        sut.close();
+
+        assertThat(sut.getConnectionCount()).isEqualTo(0);
+        sut.close();
+
+        serverSocket.accept();
+    }
+
+    @Test
+    public void connectShouldFail() throws Exception {
+
+        Socket socket = new Socket(TestSettings.host(), serverSocket.getLocalPort());
+
+        ClusterClientOptions clientOptions = ClusterClientOptions.builder()
+                .socketOptions(SocketOptions.builder().connectTimeout(1, TimeUnit.SECONDS).build()).build();
+
+        redisClient.setOptions(clientOptions);
+
+        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "");
+
+        StopWatch stopWatch = new StopWatch();
+
+        try {
+            sut.getConnection(connectionKey);
+            fail("Missing RedisConnectionException because of Timeout");
+        } catch (Exception e) {
+            assertThat(e).isInstanceOf(RedisConnectionException.class);
+        }
+        stopWatch.start();
+
+        try {
+            sut.getConnection(connectionKey);
+            fail("Missing RedisConnectionException because of Timeout");
+        } catch (Exception e) {
+            assertThat(e).isInstanceOf(RedisConnectionException.class);
+        }
+
+        stopWatch.stop();
+
+        assertThat(stopWatch.getLastTaskTimeMillis()).isBetween(999L, 1200L);
+
+        sut.close();
+
+        socket.close();
+    }
+
+    @Test
+    public void connectShouldFailConcurrently() throws Exception {
+
+        Socket socket = new Socket(TestSettings.host(), serverSocket.getLocalPort());
+
+        ClusterClientOptions clientOptions = ClusterClientOptions.builder()
+                .socketOptions(SocketOptions.builder().connectTimeout(1, TimeUnit.SECONDS).build()).build();
+
+        redisClient.setOptions(clientOptions);
+
+        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "");
+
+        Thread t1 = new Thread(() -> {
+            sut.getConnection(connectionKey);
+        });
+
+        Thread t2 = new Thread(() -> {
+            sut.getConnection(connectionKey);
+        });
+
+        t1.start();
+        t2.start();
+
+        connectInitiated.await();
+
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
+        t1.join(2000);
+        t2.join(2000);
+
+        stopWatch.stop();
+
+        assertThat(stopWatch.getLastTaskTimeMillis()).isBetween(999L, 1300L);
+
+        sut.close();
+        socket.close();
+    }
+
+    @Test
+    public void shouldCloseAsync() throws Exception {
+
+        Socket socket = new Socket("localhost", serverSocket.getLocalPort());
+
+        ClusterClientOptions clientOptions = ClusterClientOptions.builder()
+                .socketOptions(SocketOptions.builder().connectTimeout(1, TimeUnit.SECONDS).build()).build();
+
+        redisClient.setOptions(clientOptions);
+
+        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "");
+
+        CompletableFuture<StatefulRedisConnection<String, String>> createdConnection = new CompletableFuture<>();
+        Thread t1 = new Thread(() -> {
+            try {
+                StatefulRedisConnection<String, String> connection = sut.getConnection(connectionKey);
+                createdConnection.complete(connection);
+            } catch (Exception e) {
+                createdConnection.completeExceptionally(e);
+            }
+        });
+
+        t1.start();
+
+        connectInitiated.await();
+
+        sut.close();
+
+        serverSocket.accept();
+
+        StatefulRedisConnection<String, String> connection = createdConnection.join();
+
+        assertThat(connection.isOpen()).isFalse();
+
+        socket.close();
+    }
+}

From 732a6dd3ba61c58495d460d0905bd9f30489bfa9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 17 Feb 2017 21:41:55 +0100
Subject: [PATCH 149/808] Adopt lenient ServerSocket.backlog behavior on Linux

Use non-reachable host that drops packets for timeout tests.
---
 ...ronizingClusterConnectionProviderTest.java | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java b/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java
index e059236ee8..6386a20de6 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java
@@ -73,7 +73,8 @@ public ConnectionFuture<StatefulRedisConnection<String, String>> apply(Connectio
                 redisURI.setUnit(TimeUnit.SECONDS);
 
                 ConnectionFuture<StatefulRedisConnection<String, String>> future = redisClient.connectToNodeAsync(
-                        StringCodec.UTF8, "", null, () -> new InetSocketAddress("localhost", serverSocket.getLocalPort()));
+                        StringCodec.UTF8, "", null,
+                        () -> new InetSocketAddress(connectionKey.host, serverSocket.getLocalPort()));
 
                 connectInitiated.countDown();
 
@@ -95,7 +96,8 @@ public static void afterClass() {
     @Test
     public void shouldCreateConnection() throws IOException {
 
-        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "");
+        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, TestSettings.host(),
+                TestSettings.port());
         StatefulRedisConnection<String, String> connection = sut.getConnection(connectionKey);
 
         assertThat(sut.getConnection(connectionKey)).isSameAs(connection);
@@ -106,7 +108,8 @@ public void shouldCreateConnection() throws IOException {
     @Test
     public void shouldMaintainConnectionCount() throws IOException {
 
-        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "");
+        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, TestSettings.host(),
+                TestSettings.port());
 
         assertThat(sut.getConnectionCount()).isEqualTo(0);
 
@@ -121,7 +124,8 @@ public void shouldMaintainConnectionCount() throws IOException {
     @Test
     public void shouldCloseConnectionByKey() throws IOException {
 
-        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "");
+        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, TestSettings.host(),
+                TestSettings.port());
 
         sut.getConnection(connectionKey);
         sut.close(connectionKey);
@@ -135,7 +139,8 @@ public void shouldCloseConnectionByKey() throws IOException {
     @Test
     public void shouldCloseConnections() throws IOException {
 
-        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "");
+        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, TestSettings.host(),
+                TestSettings.port());
 
         sut.getConnection(connectionKey);
         sut.close();
@@ -156,7 +161,7 @@ public void connectShouldFail() throws Exception {
 
         redisClient.setOptions(clientOptions);
 
-        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "");
+        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "8.8.8.8", TestSettings.port());
 
         StopWatch stopWatch = new StopWatch();
 
@@ -194,7 +199,7 @@ public void connectShouldFailConcurrently() throws Exception {
 
         redisClient.setOptions(clientOptions);
 
-        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "");
+        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "8.8.8.8", TestSettings.port());
 
         Thread t1 = new Thread(() -> {
             sut.getConnection(connectionKey);
@@ -233,7 +238,8 @@ public void shouldCloseAsync() throws Exception {
 
         redisClient.setOptions(clientOptions);
 
-        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "");
+        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, TestSettings.host(),
+                TestSettings.port());
 
         CompletableFuture<StatefulRedisConnection<String, String>> createdConnection = new CompletableFuture<>();
         Thread t1 = new Thread(() -> {

From 9b74f518d2b83103098c09eb941ae998839a3008 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 19 Feb 2017 09:36:08 +0100
Subject: [PATCH 150/808] Improve JavaDoc #472

---
 .../redis/AbstractRedisClient.java            |  1 +
 .../com/lambdaworks/redis/RedisClient.java    | 36 +++++++++++---
 .../redis/cluster/RedisClusterClient.java     | 18 +++++--
 .../redis/masterslave/MasterSlave.java        | 13 ++---
 .../redis/resource/ClientResources.java       | 47 ++++++++++---------
 .../resource/DefaultClientResources.java      | 11 +++--
 6 files changed, 81 insertions(+), 45 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
index dab99600b3..11896fcfae 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
@@ -57,6 +57,7 @@
  *
  * @author Mark Paluch
  * @since 3.0
+ * @see ClientResources
  */
 public abstract class AbstractRedisClient {
 
diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/com/lambdaworks/redis/RedisClient.java
index 179273d83b..5c119711b9 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClient.java
@@ -41,13 +41,38 @@
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
 
 /**
- * A scalable thread-safe <a href="http://redis.io/">Redis</a> client. Multiple threads may share one connection if they avoid
- * blocking and transactional operations such as BLPOP and MULTI/EXEC. {@link RedisClient} is an expensive resource. It holds a
- * set of netty's {@link io.netty.channel.EventLoopGroup}'s that consist of up to {@code Number of CPU's * 4} threads. Reuse
- * this instance as much as possible.
+ * A scalable and thread-safe <a href="http://redis.io/">Redis</a> client supporting synchronous, asynchronous and reactive
+ * execution models. Multiple threads may share one connection if they avoid blocking and transactional operations such as BLPOP
+ * and MULTI/EXEC.
+ * <p>
+ * {@link RedisClient} can be used with:
+ * <ul>
+ * <li>Redis Standalone</li>
+ * <li>Redis Pub/Sub</li>
+ * <li>Redis Sentinel, Sentinel connections</li>
+ * <li>Redis Sentinel, Master connections</li>
+ * </ul>
+ *
+ * Redis Cluster is used through {@link com.lambdaworks.redis.cluster.RedisClusterClient}. Master/Slave connections through
+ * {@link com.lambdaworks.redis.masterslave.MasterSlave} provide connections to Redis Master/Slave setups which run either in a
+ * static Master/Slave setup or are managed by Redis Sentinel.
+ * <p>
+ * {@link RedisClient} is an expensive resource. It holds a set of netty's {@link io.netty.channel.EventLoopGroup}'s that use
+ * multiple threads. Reuse this instance as much as possible or share a {@link ClientResources} instance amongst multiple client
+ * instances.
  *
  * @author Will Glozer
  * @author Mark Paluch
+ * @see RedisURI
+ * @see StatefulRedisConnection
+ * @see RedisFuture
+ * @see reactor.core.publisher.Mono
+ * @see reactor.core.publisher.Flux
+ * @see RedisCodec
+ * @see ClientOptions
+ * @see ClientResources
+ * @see com.lambdaworks.redis.masterslave.MasterSlave
+ * @see com.lambdaworks.redis.cluster.RedisClusterClient
  */
 public class RedisClient extends AbstractRedisClient {
 
@@ -206,8 +231,7 @@ private <K, V> StatefulRedisConnection<K, V> connectStandalone(RedisCodec<K, V>
 
     @SuppressWarnings("unused")
     // Required by ReflectiveNodeConnectionFactory.
-    <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandaloneAsync(RedisCodec<K, V> codec,
-            RedisURI redisURI) {
+    <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandaloneAsync(RedisCodec<K, V> codec, RedisURI redisURI) {
         return connectStandaloneAsync(codec, redisURI, Timeout.from(redisURI));
     }
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
index 9926972796..2c4740692e 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
@@ -59,14 +59,16 @@
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
- * A scalable thread-safe <a href="http://redis.io/">Redis</a> cluster client. Multiple threads may share one connection. The
- * cluster client handles command routing based on the first key of the command and maintains a view of the cluster that is
- * available when calling the {@link #getPartitions()} method.
+ * A scalable and thread-safe <a href="http://redis.io/">Redis</a> cluster client supporting synchronous, asynchronous and
+ * reactive execution models. Multiple threads may share one connection. The cluster client handles command routing based on the
+ * first key of the command and maintains a view of the cluster that is available when calling the {@link #getPartitions()}
+ * method.
  *
  * <p>
  * Connections to the cluster members are opened on the first access to the cluster node and managed by the
  * {@link StatefulRedisClusterConnection}. You should not use transactional commands on cluster connections since {@code MULTI},
- * {@code EXEC} and {@code DISCARD} have no key and cannot be assigned to a particular node.
+ * {@code EXEC} and {@code DISCARD} have no key and cannot be assigned to a particular node. A cluster connection uses a default
+ * connection to run non-keyed commands.
  * </p>
  * <p>
  * The Redis cluster client provides a {@link RedisAdvancedClusterCommands sync}, {@link RedisAdvancedClusterAsyncCommands
@@ -120,10 +122,16 @@
  * </pre></code>
  * </p>
  *
- * {@link RedisClusterClient} is an expensive resource. Reuse this instance or the {@link ClientResources} as much as possible.
+ * {@link RedisClusterClient} is an expensive resource. Reuse this instance or share external {@link ClientResources} as much as
+ * possible.
  *
  * @author Mark Paluch
  * @since 3.0
+ * @see RedisURI
+ * @see StatefulRedisClusterConnection
+ * @see RedisCodec
+ * @see ClusterClientOptions
+ * @see ClientResources
  */
 public class RedisClusterClient extends AbstractRedisClient {
 
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java
index 1357f7102a..1f3685e29e 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java
+++ b/src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,14 +33,14 @@
 /**
  * Master-Slave connection API.
  * <p>
- * This API allows connections to Redis Master/Slave setups which run either Redis Standalone or are managed by Redis Sentinel.
- * Master-Slave connections can discover topologies and select a source for read operations using
+ * This API allows connections to Redis Master/Slave setups which run either in a static Master/Slave setup or are managed by
+ * Redis Sentinel. Master-Slave connections can discover topologies and select a source for read operations using
  * {@link com.lambdaworks.redis.ReadFrom}.
  * </p>
  * <p>
  *
  * Connections can be obtained by providing the {@link RedisClient}, a {@link RedisURI} and a {@link RedisCodec}.
- * 
+ *
  * <pre>
  *  &#064;code
  *   RedisClient client = RedisClient.create();
@@ -53,6 +53,7 @@
  *   client.shutdown();
  *   }
  * </pre>
+ *
  * </p>
  * <h3>Topology Discovery</h3>
  * <p>
@@ -282,8 +283,8 @@ private static RedisNodeDescription lookupMaster(List<RedisNodeDescription> node
     private static RedisNodeDescription getConnectedNode(RedisURI redisURI, List<RedisNodeDescription> nodes) {
 
         Optional<RedisNodeDescription> first = nodes.stream().filter(n -> equals(redisURI, n)).findFirst();
-        return first.orElseThrow(
-                () -> new IllegalStateException("Cannot lookup node descriptor for connected node at " + redisURI));
+        return first.orElseThrow(() -> new IllegalStateException("Cannot lookup node descriptor for connected node at "
+                + redisURI));
     }
 
     private static boolean equals(RedisURI redisURI, RedisNodeDescription node) {
diff --git a/src/main/java/com/lambdaworks/redis/resource/ClientResources.java b/src/main/java/com/lambdaworks/redis/resource/ClientResources.java
index 1070fa7901..aabc766513 100644
--- a/src/main/java/com/lambdaworks/redis/resource/ClientResources.java
+++ b/src/main/java/com/lambdaworks/redis/resource/ClientResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,31 +26,32 @@
 import io.netty.util.concurrent.Future;
 
 /**
- * Client Configuration. The client configuration provides heavy-weight resources such as thread pools. {@link ClientResources}
- * can be shared across different client instances. Shared instances are not shut down by the client, only dedicated instances
- * are shut down.
- * <p>
- * This interface defines the contract. See the {@link DefaultClientResources} class for the default implementation.
- * </p>
- * <p>
- * The {@link ClientResources} instance is stateful. You have to shutdown the instance if you're no longer using it.
- * </p>
+ * Strategy interface to provide all the infrastructure building blocks like environment settings and thread pools so that the
+ * client can work with it properly. {@link ClientResources} can be shared amongst multiple client instances if created outside
+ * the client creation. Implementations of {@link ClientResources} are stateful and must be {@link #shutdown()} after they are
+ * no longer in use.
  *
- * {@link ClientResources} provide:
+ * {@link ClientResources} provides in particular:
  * <ul>
- * <li>An instance of {@link EventLoopGroupProvider} to obtain particular {@link io.netty.channel.EventLoopGroup
- * EventLoopGroups}</li>
- * <li>An instance of {@link EventExecutorGroup} for performing internal computation tasks</li>
+ * <li>{@link EventLoopGroupProvider} to obtain particular {@link io.netty.channel.EventLoopGroup EventLoopGroups}</li>
+ * <li>{@link EventExecutorGroup} to perform internal computation tasks</li>
+ * <li>{@link Timer} for scheduling</li>
+ * <li>{@link EventBus} for client event dispatching</li>
+ * <li>{@link EventPublisherOptions}</li>
+ * <li>{@link CommandLatencyCollector} to collect latency details. Requires the {@literal HdrHistogram} library.</li>
+ * <li>{@link DnsResolver} to collect latency details. Requires the {@literal LatencyUtils} library.</li>
+ * <li>Reconnect {@link Delay}.</li>
  * </ul>
  *
  * @author Mark Paluch
  * @since 3.4
+ * @see DefaultClientResources
  */
 public interface ClientResources {
 
     /**
      * Shutdown the {@link ClientResources}.
-     * 
+     *
      * @return eventually the success/failure of the shutdown without errors.
      */
     Future<Boolean> shutdown();
@@ -73,16 +74,16 @@ public interface ClientResources {
      *
      * You can use {@link DefaultEventLoopGroupProvider} as default implementation or implement an own
      * {@link EventLoopGroupProvider} to share existing {@link io.netty.channel.EventLoopGroup EventLoopGroup's} with lettuce.
-     * 
-     * @return the {@link EventLoopGroupProvider} which provides access to the particular {@link io.netty.channel.EventLoopGroup
-     *         event loop groups}
+     *
+     * @return the {@link EventLoopGroupProvider} which provides access to the particular
+     *         {@link io.netty.channel.EventLoopGroup event loop groups}
      */
     EventLoopGroupProvider eventLoopGroupProvider();
 
     /**
      * Returns the computation pool used for internal operations. Such tasks are periodic Redis Cluster and Redis Sentinel
      * topology updates and scheduling of connection reconnection by {@link com.lambdaworks.redis.protocol.ConnectionWatchdog}.
-     * 
+     *
      * @return the computation pool used for internal operations
      */
     EventExecutorGroup eventExecutorGroup();
@@ -106,28 +107,28 @@ public interface ClientResources {
      * Returns the {@link Timer} to schedule events. A timer object may run single- or multi-threaded but must be used for
      * scheduling of short-running jobs only. Long-running jobs should be scheduled and executed using
      * {@link #eventExecutorGroup()}.
-     * 
+     *
      * @return the timer.
      */
     Timer timer();
 
     /**
      * Returns the event bus used to publish events.
-     * 
+     *
      * @return the event bus
      */
     EventBus eventBus();
 
     /**
      * Returns the {@link EventPublisherOptions} for latency event publishing.
-     * 
+     *
      * @return the {@link EventPublisherOptions} for latency event publishing
      */
     EventPublisherOptions commandLatencyPublisherOptions();
 
     /**
      * Returns the {@link CommandLatencyCollector}.
-     * 
+     *
      * @return the command latency collector
      */
     CommandLatencyCollector commandLatencyCollector();
diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
index da71c46ecb..382e1d4030 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,8 +88,10 @@ public class DefaultClientResources implements ClientResources {
     public static final Supplier<Delay> DEFAULT_RECONNECT_DELAY = Delay::exponential;
 
     static {
-        int threads = Math.max(1, SystemPropertyUtil.getInt("io.netty.eventLoopThreads",
-                Math.max(MIN_IO_THREADS, Runtime.getRuntime().availableProcessors())));
+        int threads = Math.max(
+                1,
+                SystemPropertyUtil.getInt("io.netty.eventLoopThreads",
+                        Math.max(MIN_IO_THREADS, Runtime.getRuntime().availableProcessors())));
 
         DEFAULT_IO_THREADS = threads;
         DEFAULT_COMPUTATION_THREADS = threads;
@@ -169,8 +171,7 @@ protected DefaultClientResources(Builder builder) {
                 if (builder.commandLatencyCollectorOptions != null) {
                     commandLatencyCollector = new DefaultCommandLatencyCollector(builder.commandLatencyCollectorOptions);
                 } else {
-                    commandLatencyCollector = new DefaultCommandLatencyCollector(
-                            DefaultCommandLatencyCollectorOptions.create());
+                    commandLatencyCollector = new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create());
                 }
             } else {
                 logger.debug("LatencyUtils/HdrUtils are not available, metrics are disabled");

From 8ea96c73f6b68d18da714bdddb2dad8e581b40cd Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 19 Feb 2017 17:06:37 +0100
Subject: [PATCH 151/808] Create a static call chain in InvocationProxyFactory
 #468
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

InvocationProxyFactory.createProxy(…) now uses an invocation handler with a static call chain and pooled invocation context. Invocation handler infrastructure does not create any objects during the invocation.

Committed above the skies.
---
 .../intercept/InvocationProxyFactory.java     |  37 +---
 .../intercept/MethodInterceptorChain.java     | 202 ++++++++++++++++++
 .../intercept/InvocationProxyFactoryTest.java |  61 +++++-
 .../InvocationProxyFactoryBenchmark.java      |  83 +++++++
 4 files changed, 341 insertions(+), 42 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptorChain.java
 create mode 100644 src/test/jmh/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryBenchmark.java

diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java b/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java
index c8e25ded07..1f3a1baee2 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java
+++ b/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java
@@ -18,12 +18,10 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import com.lambdaworks.redis.internal.AbstractInvocationHandler;
 import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceLists;
 
 /**
  * Factory to create invocation proxies.
@@ -47,7 +45,7 @@ public class InvocationProxyFactory {
 
     /**
      * Create a proxy instance give a {@link ClassLoader}.
-     * 
+     *
      * @param classLoader must not be {@literal null}.
      * @param <T> inferred result type.
      * @return the invocation proxy instance.
@@ -64,7 +62,7 @@ public <T> T createProxy(ClassLoader classLoader) {
 
     /**
      * Add a interface type that should be implemented by the resulting invocation proxy.
-     * 
+     *
      * @param ifc must not be {@literal null} and must be an interface type.
      */
     public void addInterface(Class<?> ifc) {
@@ -77,7 +75,7 @@ public void addInterface(Class<?> ifc) {
 
     /**
      * Add a {@link MethodInterceptor} to the interceptor chain.
-     * 
+     *
      * @param interceptor notNull
      */
     public void addInterceptor(MethodInterceptor interceptor) {
@@ -92,38 +90,15 @@ public void addInterceptor(MethodInterceptor interceptor) {
      */
     static class InterceptorChainInvocationHandler extends AbstractInvocationHandler {
 
-        private final List<MethodInterceptor> interceptors;
+        private final MethodInterceptorChain.Head context;
 
         InterceptorChainInvocationHandler(List<MethodInterceptor> interceptors) {
-            this.interceptors = LettuceLists.newList(interceptors);
+            this.context = MethodInterceptorChain.from(interceptors);
         }
 
         @Override
         protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
-
-            Iterator<MethodInterceptor> iterator = interceptors.iterator();
-
-            if (iterator.hasNext()) {
-                return iterator.next().invoke(getInvocation(method, args, iterator));
-            }
-
-            return null;
-        }
-
-        private DefaultMethodInvocation getInvocation(final Method method, final Object[] args,
-                final Iterator<MethodInterceptor> iterator) {
-
-            return new DefaultMethodInvocation(method, args) {
-
-                @Override
-                public Object proceed() throws Throwable {
-
-                    if (iterator.hasNext()) {
-                        return iterator.next().invoke(getInvocation(method, args, iterator));
-                    }
-                    return null;
-                }
-            };
+            return context.invoke(method, args);
         }
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptorChain.java b/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptorChain.java
new file mode 100644
index 0000000000..9d664736a5
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptorChain.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic.intercept;
+
+import java.lang.reflect.Method;
+import java.util.Iterator;
+
+/**
+ * Invocation context with a static call chain of {@link MethodInterceptor}s to handle method invocations.
+ * <p>
+ * {@link MethodInterceptorChain} is created from one or more {@link MethodInterceptor}s and compiled to a forward-only call
+ * chain. A chain of {@link MethodInterceptorChain} has a head and tail context. The tail context is no-op and simply returns
+ * {@literal null}.
+ * <p>
+ * Invocations are represented as {@link PooledMethodInvocation} using thread-local pooling. An invocation lives within the
+ * boundaries of a thread therefore it's safe to use thread-local object pooling.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ */
+abstract class MethodInterceptorChain {
+
+    private final ThreadLocal<PooledMethodInvocation> pool = ThreadLocal.withInitial(PooledMethodInvocation::new);
+    final MethodInterceptorChain next;
+
+    MethodInterceptorChain(MethodInterceptorChain next) {
+        this.next = next;
+    }
+
+    /**
+     * Create a {@link MethodInterceptorChain} from {@link MethodInterceptor}s. Chain elements are created eagerly by
+     * stack-walking {@code interceptors}. Make sure the {@link Iterable} does not exhaust the stack size.
+     *
+     * @param interceptors must not be {@literal null}.
+     * @return the {@link MethodInterceptorChain} that is an entry point for method invocations.
+     */
+    public static Head from(Iterable<? extends MethodInterceptor> interceptors) {
+        return new Head(next(interceptors.iterator()));
+    }
+
+    private static MethodInterceptorChain next(Iterator<? extends MethodInterceptor> iterator) {
+        return iterator.hasNext() ? createContext(iterator, iterator.next()) : Tail.INSTANCE;
+    }
+
+    private static MethodInterceptorChain createContext(Iterator<? extends MethodInterceptor> iterator,
+            MethodInterceptor interceptor) {
+        return new MethodInterceptorContext(next(iterator), interceptor);
+    }
+
+    /**
+     * Invoke a {@link Method} with its {@code args}.
+     *
+     * @param method must not be {@literal null}.
+     * @param args must not be {@literal null}.
+     * @return
+     * @throws Throwable
+     */
+    public Object invoke(Method method, Object[] args) throws Throwable {
+
+        PooledMethodInvocation invocation = getInvocation(method, args, next);
+
+        try {
+            // JIT hint
+            if (next instanceof MethodInterceptorContext) {
+                return next.proceed(invocation);
+            }
+            return next.proceed(invocation);
+        } finally {
+            invocation.clear();
+        }
+    }
+
+    private PooledMethodInvocation getInvocation(Method method, Object[] args, MethodInterceptorChain next) {
+
+        PooledMethodInvocation pooledMethodInvocation = pool.get();
+        pooledMethodInvocation.initialize(method, args, next);
+        return pooledMethodInvocation;
+    }
+
+    /**
+     * Proceed to the next {@link MethodInterceptorChain}.
+     *
+     * @param invocation must not be {@literal null}.
+     * @return
+     * @throws Throwable
+     */
+    abstract Object proceed(MethodInvocation invocation) throws Throwable;
+
+    /**
+     * {@link MethodInterceptorChain} using {@link MethodInterceptor} to handle invocations.
+     */
+    static class MethodInterceptorContext extends MethodInterceptorChain {
+
+        private final MethodInterceptor interceptor;
+
+        MethodInterceptorContext(MethodInterceptorChain next, MethodInterceptor interceptor) {
+            super(next);
+            this.interceptor = interceptor;
+        }
+
+        @Override
+        Object proceed(MethodInvocation invocation) throws Throwable {
+            return interceptor.invoke(invocation);
+        }
+    }
+
+    /**
+     * Head {@link MethodInterceptorChain} to delegate to the next {@link MethodInterceptorChain}.
+     */
+    static class Head extends MethodInterceptorChain {
+
+        protected Head(MethodInterceptorChain next) {
+            super(next);
+        }
+
+        @Override
+        Object proceed(MethodInvocation invocation) throws Throwable {
+            return next.proceed(invocation);
+        }
+    }
+
+    /**
+     * Tail {@link MethodInterceptorChain}, no-op.
+     */
+    static class Tail extends MethodInterceptorChain {
+
+        public static Tail INSTANCE = new Tail();
+
+        private Tail() {
+            super(null);
+        }
+
+        @Override
+        Object proceed(MethodInvocation invocation) throws Throwable {
+            return null;
+        }
+    }
+
+    /**
+     * Stateful {@link MethodInvocation} using {@link MethodInterceptorChain}. The state is only valid throughout a call.
+     */
+    static class PooledMethodInvocation implements MethodInvocation {
+
+        private Method method;
+        private Object args[];
+        private MethodInterceptorChain current;
+
+        PooledMethodInvocation() {
+        }
+
+        /**
+         * Initialize state from the method call.
+         *
+         * @param method
+         * @param args
+         * @param head
+         */
+        public void initialize(Method method, Object[] args, MethodInterceptorChain head) {
+            this.method = method;
+            this.args = args;
+            this.current = head;
+        }
+
+        /**
+         * Clear invocation state.
+         */
+        public void clear() {
+            this.method = null;
+            this.args = null;
+            this.current = null;
+        }
+
+        @Override
+        public Object proceed() throws Throwable {
+            current = current.next;
+            return current.proceed(this);
+        }
+
+        @Override
+        public Method getMethod() {
+            return method;
+        }
+
+        @Override
+        public Object[] getArguments() {
+            return args;
+        }
+    }
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java b/src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java
index 0a47a71632..296a9232a9 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,35 +28,74 @@ public class InvocationProxyFactoryTest {
     public void shouldDelegateCallsToInterceptor() {
 
         InvocationProxyFactory factory = new InvocationProxyFactory();
-        factory.addInterface(MyInterface.class);
-        factory.addInterceptor(new ReturnTrueMethodInterceptor());
+        factory.addInterface(TargetWithBooleanMethod.class);
+        factory.addInterceptor(new ReturnValue(Boolean.TRUE));
 
-        MyInterface myInterface = factory.createProxy(getClass().getClassLoader());
+        TargetWithBooleanMethod target = factory.createProxy(getClass().getClassLoader());
 
-        assertThat(myInterface.someMethod()).isTrue();
+        assertThat(target.someMethod()).isTrue();
     }
 
     @Test
     public void shouldNotFailWithoutFurtherInterceptors() {
 
         InvocationProxyFactory factory = new InvocationProxyFactory();
-        factory.addInterface(MyInterface.class);
+        factory.addInterface(TargetWithBooleanMethod.class);
 
-        MyInterface myInterface = factory.createProxy(getClass().getClassLoader());
+        TargetWithBooleanMethod target = factory.createProxy(getClass().getClassLoader());
 
-        assertThat(myInterface.someMethod()).isNull();
+        assertThat(target.someMethod()).isNull();
     }
 
-    private interface MyInterface {
+    @Test
+    public void shouldCallInterceptorsInOrder() throws InterruptedException {
+
+        InvocationProxyFactory factory = new InvocationProxyFactory();
+        factory.addInterface(TargetWithStringMethod.class);
+        factory.addInterceptor(new StringAppendingMethodInterceptor("-foo"));
+        factory.addInterceptor(new StringAppendingMethodInterceptor("-bar"));
+        factory.addInterceptor(new ReturnValue("actual"));
+
+        TargetWithStringMethod target = factory.createProxy(getClass().getClassLoader());
+
+        assertThat(target.run()).isEqualTo("actual-bar-foo");
+    }
+
+    private interface TargetWithBooleanMethod {
 
         Boolean someMethod();
     }
 
-    private static class ReturnTrueMethodInterceptor implements MethodInterceptor {
+    private static class ReturnValue implements MethodInterceptor {
+
+        private final Object value;
+
+        public ReturnValue(Object value) {
+            this.value = value;
+        }
 
         @Override
         public Object invoke(MethodInvocation invocation) {
-            return true;
+            return value;
+        }
+    }
+
+    private interface TargetWithStringMethod {
+
+        String run();
+    }
+
+    private static class StringAppendingMethodInterceptor implements MethodInterceptor {
+
+        private final String toAppend;
+
+        public StringAppendingMethodInterceptor(String toAppend) {
+            this.toAppend = toAppend;
+        }
+
+        @Override
+        public Object invoke(MethodInvocation invocation) throws Throwable {
+            return invocation.proceed().toString() + toAppend;
         }
     }
 }
diff --git a/src/test/jmh/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryBenchmark.java b/src/test/jmh/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryBenchmark.java
new file mode 100644
index 0000000000..0ab7baa3f8
--- /dev/null
+++ b/src/test/jmh/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryBenchmark.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.dynamic.intercept;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.infra.Blackhole;
+
+/**
+ * @author Mark Paluch
+ */
+@State(Scope.Benchmark)
+public class InvocationProxyFactoryBenchmark {
+
+    private final InvocationProxyFactory factory = new InvocationProxyFactory();
+    private BenchmarkInterface proxy;
+
+    @Setup
+    public void setup() {
+
+        factory.addInterface(BenchmarkInterface.class);
+        factory.addInterceptor(new StringAppendingMethodInterceptor("-foo"));
+        factory.addInterceptor(new StringAppendingMethodInterceptor("-bar"));
+        factory.addInterceptor(new ReturnValue("actual"));
+
+        proxy = factory.createProxy(getClass().getClassLoader());
+    }
+
+    @Benchmark
+    public void run(Blackhole blackhole) {
+        blackhole.consume(proxy.run());
+    }
+
+    private interface BenchmarkInterface {
+
+        String run();
+    }
+
+    private static class ReturnValue implements MethodInterceptor {
+
+        private final Object value;
+
+        public ReturnValue(Object value) {
+            this.value = value;
+        }
+
+        @Override
+        public Object invoke(MethodInvocation invocation) {
+            return value;
+        }
+
+    }
+
+    private static class StringAppendingMethodInterceptor implements MethodInterceptor {
+
+        private final String toAppend;
+
+        public StringAppendingMethodInterceptor(String toAppend) {
+            this.toAppend = toAppend;
+        }
+
+        @Override
+        public Object invoke(MethodInvocation invocation) throws Throwable {
+            return invocation.proceed().toString() + toAppend;
+        }
+    }
+
+}

From 47aedad8c1bbf2f64654aaf9a2f61f9ce9c7d5cf Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 19 Feb 2017 17:17:42 +0100
Subject: [PATCH 152/808] Read connect future in ReconnectHandler to local
 variable #465

ReconnectHandler reads now the connect future in a local variable prior to futher interaction to avoid races in which the connect future is set to null or a different value.
---
 .../com/lambdaworks/redis/protocol/ReconnectionHandler.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java b/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java
index 01ee7e6a16..9b83519049 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@ protected boolean reconnect(InternalLogLevel infoLevel) throws Exception {
             long start = System.nanoTime();
 
             logger.debug("Reconnecting to Redis at {}", remoteAddress);
-            currentFuture = bootstrap.connect(remoteAddress);
+            ChannelFuture currentFuture = this.currentFuture = bootstrap.connect(remoteAddress);
             if (!currentFuture.await(timeLeft, TimeUnit.NANOSECONDS)) {
                 if (currentFuture.isCancellable()) {
                     currentFuture.cancel(true);
@@ -119,7 +119,7 @@ protected boolean reconnect(InternalLogLevel infoLevel) throws Exception {
                 }
             }
         } finally {
-            currentFuture = null;
+            this.currentFuture = null;
         }
 
         return false;

From 7d508ab4631717255229f4eb6d23161b2a30c7f0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 19 Feb 2017 17:46:46 +0100
Subject: [PATCH 153/808] Upgrade dependencies #474

* RxJava 1 to 1.2.6
* RxJava 2 to 2.0.6
* Reactor Core to 3.0.5.RELEASE
* Reactor Test to 3.0.5.RELEASE
* rxjava-reactive-streams to 1.2.1
* tcnative to 1.1.33.Fork26
* Spring to 4.3.6.RELEASE
* Mockito to 2.7.9
* AssertJ to 3.6.2
* Log4j2 to 2.8
---
 pom.xml | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index b26d5ca1ed..e3af511d87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,7 @@
         <lettuce-release-version>4.2.2.Final</lettuce-release-version>
         <lettuce3-release-version>3.5.0.Final</lettuce3-release-version>
         <netty-version>4.1.8.Final</netty-version>
+        <spring-version>4.3.6.RELEASE</spring-version>
     </properties>
 
     <scm>
@@ -78,7 +79,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>3.0.4.RELEASE</version>
+            <version>3.0.5.RELEASE</version>
         </dependency>
 
         <!-- Netty -->
@@ -112,7 +113,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative</artifactId>
-            <version>1.1.33.Fork25</version>
+            <version>1.1.33.Fork26</version>
             <classifier>${os.detected.classifier}</classifier>
             <scope>provided</scope>
             <optional>true</optional>
@@ -139,21 +140,21 @@
         <dependency>
             <groupId>io.reactivex</groupId>
             <artifactId>rxjava</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.6</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>io.reactivex</groupId>
             <artifactId>rxjava-reactive-streams</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.6</version>
             <optional>true</optional>
         </dependency>
 
@@ -162,14 +163,14 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>4.2.4.RELEASE</version>
+            <version>${spring-version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>4.2.4.RELEASE</version>
+            <version>${spring-version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -209,7 +210,7 @@
         <dependency>
             <groupId>io.projectreactor.addons</groupId>
             <artifactId>reactor-test</artifactId>
-            <version>3.0.4.RELEASE</version>
+            <version>3.0.5.RELEASE</version>
             <scope>test</scope>
         </dependency>
 
@@ -223,7 +224,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.7.5</version>
+            <version>2.7.9</version>
             <scope>test</scope>
         </dependency>
 
@@ -251,35 +252,35 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.5.2</version>
+            <version>3.6.2</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.6.2</version>
+            <version>2.8</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.6.2</version>
+            <version>2.8</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>4.2.4.RELEASE</version>
+            <version>${spring-version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-expression</artifactId>
-            <version>4.2.4.RELEASE</version>
+            <version>${spring-version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -317,7 +318,7 @@
         <profile>
             <id>netty-40</id>
             <properties>
-                <netty-version>4.0.43.Final</netty-version>
+                <netty-version>4.0.44.Final</netty-version>
             </properties>
         </profile>
 

From 88c55eda8cf7c5eccb1fb2a6ae41728ee688da53 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 19 Feb 2017 20:00:19 +0100
Subject: [PATCH 154/808] Use Reactor's StepVerifier in tests #455

Remove TestSubscriber and replace .block calls with StepVerifier, where possible.
---
 .../lambdaworks/redis/ClientMetricsTest.java  |   40 +-
 .../lambdaworks/redis/CustomCodecTest.java    |   34 +-
 .../redis/ReactiveConnectionTest.java         |   63 +-
 .../redis/ReactiveStreamingOutputTest.java    |   85 +-
 .../cluster/AdvancedClusterReactiveTest.java  |  100 +-
 .../cluster/ClusterReactiveCommandTest.java   |   58 +-
 .../RedisReactiveClusterClientTest.java       |   49 +-
 .../StringClusterReactiveCommandTest.java     |   16 +-
 .../reactive/BitReactiveCommandTest.java      |   35 +-
 .../reactive/CustomReactiveCommandTest.java   |   22 +-
 .../reactive/GeoReactiveCommandTest.java      |   20 +-
 .../reactive/StringReactiveCommandTest.java   |   15 +-
 .../TransactionReactiveCommandTest.java       |  108 +-
 .../redis/dynamic/ConversionServiceTest.java  |    8 +-
 .../dynamic/ReactiveTypeAdaptionTest.java     |   16 +-
 .../dynamic/RedisCommandsReactiveTest.java    |   12 +-
 .../redis/event/DefaultEventBusTest.java      |   31 +-
 .../redis/pubsub/PubSubReactiveTest.java      |   27 +-
 .../redis/reactive/TestSubscriber.java        | 1143 -----------------
 .../resource/DefaultClientResourcesTest.java  |   20 +-
 20 files changed, 308 insertions(+), 1594 deletions(-)
 delete mode 100644 src/test/java/com/lambdaworks/redis/reactive/TestSubscriber.java

diff --git a/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java b/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
index 4f3eadfc69..08eb79f874 100644
--- a/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,15 +23,18 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import reactor.core.Disposable;
+import reactor.core.publisher.Flux;
+import reactor.test.StepVerifier;
+
 import com.lambdaworks.TestClientResources;
+import com.lambdaworks.Wait;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.event.EventBus;
 import com.lambdaworks.redis.event.metrics.CommandLatencyEvent;
@@ -70,20 +73,17 @@ public void testMetricsEvent() throws Exception {
                 "metricEventPublisher");
         publisher.emitMetricsEvent();
 
-        TestSubscriber<CommandLatencyEvent> subscriber = TestSubscriber.create();
-        eventBus.get().filter(redisEvent -> redisEvent instanceof CommandLatencyEvent).cast(CommandLatencyEvent.class)
-                .doOnNext(events::add).subscribe(subscriber);
+        Disposable disposable = eventBus.get().filter(redisEvent -> redisEvent instanceof CommandLatencyEvent)
+                .cast(CommandLatencyEvent.class).doOnNext(events::add).subscribe();
 
         generateTestData();
         publisher.emitMetricsEvent();
 
-        subscriber.request(1);
         Wait.untilTrue(() -> !events.isEmpty()).waitOrTimeout();
 
         assertThat(events).isNotEmpty();
 
-        subscriber.assertNotComplete();
-        subscriber.cancel();
+        disposable.dispose();
     }
 
     @Test
@@ -92,25 +92,25 @@ public void testMetrics() throws Exception {
         EventBus eventBus = client.getResources().eventBus();
         MetricEventPublisher publisher = (MetricEventPublisher) ReflectionTestUtils.getField(client.getResources(),
                 "metricEventPublisher");
-        publisher.emitMetricsEvent();
 
-        TestSubscriber<CommandLatencyEvent> subscriber = TestSubscriber.create();
-        eventBus.get().filter(redisEvent -> redisEvent instanceof CommandLatencyEvent).cast(CommandLatencyEvent.class)
-                .subscribe(subscriber);
-
-        generateTestData();
-        publisher.emitMetricsEvent();
+        Flux<CommandLatencyEvent> flux = eventBus.get().filter(redisEvent -> redisEvent instanceof CommandLatencyEvent)
+                .cast(CommandLatencyEvent.class);
 
-        subscriber.awaitAndAssertNextValuesWith(event -> {
+        StepVerifier.create(flux).then(() -> {
+            generateTestData();
+            publisher.emitMetricsEvent();
+        }).consumeNextWith(actual -> {
+            // just consume
+            }).consumeNextWith(actual -> {
 
-            Set<CommandLatencyId> ids = event.getLatencies().keySet();
-            CommandMetrics commandMetrics = event.getLatencies().get(ids.iterator().next());
+            Set<CommandLatencyId> ids = actual.getLatencies().keySet();
+            CommandMetrics commandMetrics = actual.getLatencies().get(ids.iterator().next());
             assertThat(commandMetrics.getCompletion().getMin()).isBetween(0L, TimeUnit.MILLISECONDS.toMicros(100));
             assertThat(commandMetrics.getCompletion().getMax()).isBetween(0L, TimeUnit.MILLISECONDS.toMicros(200));
 
             assertThat(commandMetrics.getFirstResponse().getMin()).isBetween(0L, TimeUnit.MILLISECONDS.toMicros(100));
             assertThat(commandMetrics.getFirstResponse().getMax()).isBetween(0L, TimeUnit.MILLISECONDS.toMicros(200));
-        });
+        }).thenCancel().verify();
 
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/CustomCodecTest.java b/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
index 7a1dbc9d89..ff60315e10 100644
--- a/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
+++ b/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,27 +17,20 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import java.io.*;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.List;
 
 import org.junit.Test;
 
+import reactor.test.StepVerifier;
+
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.reactive.TestSubscriber;
-import org.junit.Test;
-
 import com.lambdaworks.redis.codec.ByteArrayCodec;
 import com.lambdaworks.redis.codec.CompressionCodec;
 import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.protocol.CommandArgs;
 
 /**
  * @author Will Glozer
@@ -61,23 +54,18 @@ public void testJavaSerializer() throws Exception {
 
     @Test
     public void testJavaSerializerReactive() throws Exception {
+
         StatefulRedisConnection<String, Object> redisConnection = client.connect(new SerializedObjectCodec());
         List<String> list = list("one", "two");
 
-        TestSubscriber<String> subscriber = TestSubscriber.create();
-
-        redisConnection.reactive().set(key, list, SetArgs.Builder.ex(1)).subscribe(subscriber);
-        subscriber.awaitAndAssertNextValues("OK").assertComplete().assertNoError();
-
+        StepVerifier.create(redisConnection.reactive().set(key, list, SetArgs.Builder.ex(1))).expectNext("OK").verifyComplete();
         redisConnection.close();
     }
 
     @Test
     public void testDeflateCompressedJavaSerializer() throws Exception {
-        RedisCommands<String, Object> connection = client
-                .connect(
-                        CompressionCodec.valueCompressor(new SerializedObjectCodec(), CompressionCodec.CompressionType.DEFLATE))
-                .sync();
+        RedisCommands<String, Object> connection = client.connect(
+                CompressionCodec.valueCompressor(new SerializedObjectCodec(), CompressionCodec.CompressionType.DEFLATE)).sync();
         List<String> list = list("one", "two");
         connection.set(key, list);
         assertThat(connection.get(key)).isEqualTo(list);
@@ -87,9 +75,8 @@ public void testDeflateCompressedJavaSerializer() throws Exception {
 
     @Test
     public void testGzipompressedJavaSerializer() throws Exception {
-        RedisCommands<String, Object> connection = client
-                .connect(CompressionCodec.valueCompressor(new SerializedObjectCodec(), CompressionCodec.CompressionType.GZIP))
-                .sync();
+        RedisCommands<String, Object> connection = client.connect(
+                CompressionCodec.valueCompressor(new SerializedObjectCodec(), CompressionCodec.CompressionType.GZIP)).sync();
         List<String> list = list("one", "two");
         connection.set(key, list);
         assertThat(connection.get(key)).isEqualTo(list);
@@ -133,7 +120,6 @@ public void testByteBufferCodec() throws Exception {
         connection.getStatefulConnection().close();
     }
 
-
     public class SerializedObjectCodec implements RedisCodec<String, Object> {
 
         private Charset charset = Charset.forName("UTF-8");
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
index 23faab5a1f..2587d3d824 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,9 +20,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -36,13 +34,12 @@
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
+import reactor.test.StepVerifier;
 
 import com.lambdaworks.Delay;
 import com.lambdaworks.Wait;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
-import com.lambdaworks.redis.reactive.TestSubscriber;
 
 public class ReactiveConnectionTest extends AbstractRedisClientTest {
 
@@ -76,7 +73,7 @@ public void doNotFireCommandUntilObservation() throws Exception {
 
     @Test
     public void fireCommandAfterObserve() throws Exception {
-        assertThat(reactive.set(key, value).block()).isEqualTo("OK");
+        StepVerifier.create(reactive.set(key, value)).expectNext("OK").verifyComplete();
         assertThat(redis.get(key)).isEqualTo(value);
     }
 
@@ -94,7 +91,7 @@ public void getStatefulConnection() throws Exception {
     public void testCancelCommand() throws Exception {
 
         List<Object> result = new ArrayList<>();
-        reactive.clientPause(2000).subscribe(TestSubscriber.create());
+        reactive.clientPause(2000).subscribe();
         Delay.delay(millis(100));
 
         reactive.set(key, value).subscribe(new CompletionSubscriber(result));
@@ -106,8 +103,7 @@ public void testCancelCommand() throws Exception {
 
     @Test
     public void testEcho() throws Exception {
-        String result = reactive.echo("echo").block();
-        assertThat(result).isEqualTo("echo");
+        StepVerifier.create(reactive.echo("echo")).expectNext("echo").verifyComplete();
     }
 
     @Test
@@ -178,39 +174,21 @@ public void transactional() throws Exception {
         assertThat(result).isEqualTo("2");
     }
 
-    @Test
-    public void reactiveChain() throws Exception {
-
-        Map<String, String> map = new HashMap<>();
-        map.put(key, value);
-        map.put("key1", "value1");
-
-        reactive.mset(map).block();
-
-        List<String> values = reactive.keys("*").flatMap(s -> reactive.get(s)).collectList()
-                .subscribeOn(Schedulers.immediate()).block();
-
-        assertThat(values).hasSize(2).contains(value, "value1");
-    }
-
     @Test
     public void auth() throws Exception {
-        List<Throwable> errors = new ArrayList<>();
-        reactive.auth("error").doOnError(errors::add).subscribe(TestSubscriber.create());
-        Delay.delay(millis(50));
-        assertThat(errors).hasSize(1);
+        StepVerifier.create(reactive.auth("error")).expectError().verify();
     }
 
     @Test
     public void subscriberCompletingWithExceptionShouldBeHandledSafely() throws Exception {
 
-        Flux.concat(reactive.set("keyA", "valueA"), reactive.set("keyB", "valueB")).collectList().block();
+        StepVerifier.create(Flux.concat(reactive.set("keyA", "valueA"), reactive.set("keyB", "valueB"))).expectNextCount(2)
+                .verifyComplete();
 
         reactive.get("keyA").subscribe(createSubscriberWithExceptionOnComplete());
         reactive.get("keyA").subscribe(createSubscriberWithExceptionOnComplete());
 
-        String valueB = reactive.get("keyB").block();
-        assertThat(valueB).isEqualTo("valueB");
+        StepVerifier.create(reactive.get("keyB")).expectNext("valueB").verifyComplete();
     }
 
     @Test
@@ -218,22 +196,21 @@ public void subscribeWithDisconnectedClient() throws Exception {
 
         client.setOptions(ClientOptions.builder().disconnectedBehavior(REJECT_COMMANDS).autoReconnect(false).build());
 
-        try (StatefulRedisConnection<String, String> connection = client.connect()) {
+        StatefulRedisConnection<String, String> connection = client.connect();
 
-            connection.async().quit();
-            Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
+        connection.async().quit();
+        Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
 
-            Mono<String> ping = connection.reactive().ping();
+        StepVerifier
+                .create(connection.reactive().ping())
+                .consumeErrorWith(
+                        throwable -> {
+                            assertThat(throwable).isInstanceOf(RedisException.class).hasMessageContaining(
+                                    "not connected. Commands are rejected");
 
-            ping.subscribeWith(TestSubscriber.create())
-                    .assertErrorWith(
-                            throwable -> {
+                        }).verify();
 
-                                assertThat(throwable).isInstanceOf(RedisException.class).hasMessageContaining(
-                                        "not connected. Commands are rejected");
-
-                            }).await();
-        }
+        connection.close();
     }
 
     private static Subscriber<String> createSubscriberWithExceptionOnComplete() {
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java b/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
index 55d8bb9e11..14714f2e74 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
+++ b/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,29 +15,30 @@
  */
 package com.lambdaworks.redis;
 
+import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.Arrays;
 
-import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import reactor.test.StepVerifier;
+
 import com.lambdaworks.KeysAndValues;
 import com.lambdaworks.redis.GeoArgs.Unit;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
+/**
+ * @author Mark Paluch
+ */
 public class ReactiveStreamingOutputTest extends AbstractRedisClientTest {
 
     private RedisReactiveCommands<String, String> reactive;
-    private TestSubscriber<String> subscriber = TestSubscriber.create();
 
     @Rule
     public ExpectedException exception = ExpectedException.none();
@@ -59,18 +60,8 @@ public void keyListCommandShouldReturnAllElements() throws Exception {
 
         redis.mset(KeysAndValues.MAP);
 
-        reactive.keys("*").subscribe(subscriber);
-        subscriber.await();
-
-        assertThat(getValues()).containsAll(KeysAndValues.KEYS);
-    }
-
-    public  List<String> getValues() {
-        return (List) ReflectionTestUtils.getField(subscriber, "values");
-    }
-
-    public  <T> List<T> getValues(TestSubscriber<T> subscriber) {
-        return (List) ReflectionTestUtils.getField(subscriber, "values");
+        StepVerifier.create(reactive.keys("*")).recordWith(ArrayList::new).expectNextCount(KeysAndValues.COUNT)
+                .expectRecordedMatches(strings -> strings.containsAll(KeysAndValues.KEYS)).verifyComplete();
     }
 
     @Test
@@ -78,74 +69,54 @@ public void valueListCommandShouldReturnAllElements() throws Exception {
 
         redis.mset(KeysAndValues.MAP);
 
-        TestSubscriber<KeyValue<String, String>> subscriber = TestSubscriber.create();
-
-        reactive.mget(KeysAndValues.KEYS.toArray(new String[KeysAndValues.COUNT])).subscribe(subscriber);
-        subscriber.await();
-
-        assertThat(getValues(subscriber).stream().map(KeyValue::getValue).collect(Collectors.toList()))
-                .containsAll(KeysAndValues.VALUES);
-        assertThat(getValues(subscriber).stream().map(KeyValue::getKey).collect(Collectors.toList()))
-                .containsAll(KeysAndValues.KEYS);
+        StepVerifier.create(reactive.mget(KeysAndValues.KEYS.toArray(new String[KeysAndValues.COUNT])))
+                .expectNextCount(KeysAndValues.COUNT).verifyComplete();
     }
 
     @Test
     public void stringListCommandShouldReturnAllElements() throws Exception {
-
-        reactive.configGet("*").subscribe(subscriber);
-        subscriber.await();
-
-        assertThat(getValues().size()).isGreaterThan(120);
+        StepVerifier.create(reactive.configGet("*")).expectNextCount(120).thenCancel().verify();
     }
 
     @Test
     public void booleanListCommandShouldReturnAllElements() throws Exception {
-
-        TestSubscriber<Boolean> subscriber = TestSubscriber.create();
-
-        reactive.scriptExists("a", "b", "c").subscribe(subscriber);
-        subscriber.awaitAndAssertNextValueCount(3);
+        StepVerifier.create(reactive.scriptExists("a", "b", "c")).expectNextCount(3).verifyComplete();
     }
 
     @Test
     public void scoredValueListCommandShouldReturnAllElements() throws Exception {
 
-        TestSubscriber<List<ScoredValue<String>>> subscriber = TestSubscriber.create();
-
         redis.zadd(key, 1d, "v1", 2d, "v2", 3d, "v3");
 
-        reactive.zrangeWithScores(key, 0, -1).collectList().subscribe(subscriber);
-        subscriber.awaitAndAssertNextValuesWith(scoredValues -> {
-            assertThat(scoredValues).hasSize(3).contains(sv(1, "v1"), sv(2, "v2"), sv(3, "v3"));
-        });
+        StepVerifier.create(reactive.zrangeWithScores(key, 0, -1)).recordWith(ArrayList::new).expectNextCount(3)
+                .expectRecordedMatches(values -> values.containsAll(Arrays.asList(sv(1, "v1"), sv(2, "v2"), sv(3, "v3"))))
+                .verifyComplete();
     }
 
     @Test
     public void geoWithinListCommandShouldReturnAllElements() throws Exception {
 
-        TestSubscriber<GeoWithin<String>> subscriber = TestSubscriber.create();
-
         redis.geoadd(key, 50, 20, "value1");
         redis.geoadd(key, 50, 21, "value2");
 
-        reactive.georadius(key, 50, 20, 1000, Unit.km, new GeoArgs().withHash()).subscribe(subscriber);
-        subscriber.await();
+        StepVerifier
+                .create(reactive.georadius(key, 50, 20, 1000, Unit.km, new GeoArgs().withHash()))
+                .recordWith(ArrayList::new)
+                .expectNextCount(2)
+                .consumeRecordedWith(
+                        values -> {
+                            assertThat(values).hasSize(2).contains(new GeoWithin<>("value1", null, 3542523898362974L, null),
+                                    new GeoWithin<>("value2", null, 3542609801095198L, null));
 
-        assertThat(getValues(subscriber)).hasSize(2).contains(
-                new GeoWithin<String>("value1", null, 3542523898362974L, null),
-                new GeoWithin<>("value2", null, 3542609801095198L, null));
+                        }).verifyComplete();
     }
 
     @Test
     public void geoCoordinatesListCommandShouldReturnAllElements() throws Exception {
 
-        TestSubscriber<Value<GeoCoordinates>> subscriber = TestSubscriber.create();
-
         redis.geoadd(key, 50, 20, "value1");
         redis.geoadd(key, 50, 21, "value2");
 
-        reactive.geopos(key, "value1", "value2").subscribe(subscriber);
-        subscriber.awaitAndAssertNextValueCount(2);
+        StepVerifier.create(reactive.geopos(key, "value1", "value2")).expectNextCount(2).verifyComplete();
     }
-
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
index a7292f35f6..ef963754ef 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package com.lambdaworks.redis.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -27,6 +26,9 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
+import reactor.core.publisher.Flux;
+import reactor.test.StepVerifier;
+
 import com.lambdaworks.KeysAndValues;
 import com.lambdaworks.redis.*;
 import com.lambdaworks.redis.api.sync.RedisCommands;
@@ -38,8 +40,7 @@
 import com.lambdaworks.redis.codec.Utf8StringCodec;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
+import io.netty.util.internal.ConcurrentSet;
 
 /**
  * @author Mark Paluch
@@ -77,8 +78,7 @@ public void invalidHost() throws Exception {
     @Test
     public void msetCrossSlot() throws Exception {
 
-        Mono<String> mset = commands.mset(KeysAndValues.MAP);
-        assertThat(block(mset)).isEqualTo("OK");
+        StepVerifier.create(commands.mset(KeysAndValues.MAP)).expectNext("OK").verifyComplete();
 
         for (String mykey : KeysAndValues.KEYS) {
             String s1 = syncCommands.get(mykey);
@@ -94,8 +94,8 @@ public void msetnxCrossSlot() throws Exception {
         String key = mset.keySet().iterator().next();
         Map<String, String> submap = Collections.singletonMap(key, mset.get(key));
 
-        assertThat(block(commands.msetnx(submap))).isTrue();
-        assertThat(block(commands.msetnx(mset))).isFalse();
+        StepVerifier.create(commands.msetnx(submap)).expectNext(true).verifyComplete();
+        StepVerifier.create(commands.msetnx(mset)).expectNext(false).verifyComplete();
 
         for (String mykey : mset.keySet()) {
             String s1 = syncCommands.get(mykey);
@@ -125,11 +125,8 @@ public void mgetCrossSlotStreaming() throws Exception {
 
         KeyValueStreamingAdapter<String, String> result = new KeyValueStreamingAdapter<>();
 
-        Mono<Long> mono = commands.mget(result, KeysAndValues.KEYS.toArray(new String[KeysAndValues.COUNT]));
-        Long count = block(mono);
-
-        assertThat(result.getMap()).hasSize(KeysAndValues.COUNT);
-        assertThat(count).isEqualTo(KeysAndValues.COUNT);
+        StepVerifier.create(commands.mget(result, KeysAndValues.KEYS.toArray(new String[KeysAndValues.COUNT])))
+                .expectNext((long) KeysAndValues.COUNT).verifyComplete();
     }
 
     @Test
@@ -137,10 +134,8 @@ public void delCrossSlot() throws Exception {
 
         msetCrossSlot();
 
-        Mono<Long> mono = commands.del(KeysAndValues.KEYS.toArray(new String[KeysAndValues.COUNT]));
-        Long result = block(mono);
-
-        assertThat(result).isEqualTo(KeysAndValues.COUNT);
+        StepVerifier.create(commands.del(KeysAndValues.KEYS.toArray(new String[KeysAndValues.COUNT])))
+                .expectNext((long) KeysAndValues.COUNT).verifyComplete();
 
         for (String mykey : KeysAndValues.KEYS) {
             String s1 = syncCommands.get(mykey);
@@ -153,10 +148,8 @@ public void unlinkCrossSlot() throws Exception {
 
         msetCrossSlot();
 
-        Mono<Long> mono = commands.unlink(KeysAndValues.KEYS.toArray(new String[KeysAndValues.COUNT]));
-        Long result = block(mono);
-
-        assertThat(result).isEqualTo(KeysAndValues.COUNT);
+        StepVerifier.create(commands.unlink(KeysAndValues.KEYS.toArray(new String[KeysAndValues.COUNT])))
+                .expectNext((long) KeysAndValues.COUNT).verifyComplete();
 
         for (String mykey : KeysAndValues.KEYS) {
             String s1 = syncCommands.get(mykey);
@@ -171,7 +164,7 @@ public void clientSetname() throws Exception {
 
         assertThat(clusterClient.getPartitions().size()).isGreaterThan(0);
 
-        block(commands.clientSetname(name));
+        StepVerifier.create(commands.clientSetname(name)).expectNext("OK").verifyComplete();
 
         for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
             RedisClusterCommands<String, String> nodeConnection = commands.getStatefulConnection().sync()
@@ -180,9 +173,10 @@ public void clientSetname() throws Exception {
         }
     }
 
-    @Test(expected = Exception.class)
+    @Test
+    @Ignore("Multi-node-execution signals two errors")
     public void clientSetnameRunOnError() throws Exception {
-        block(commands.clientSetname("not allowed"));
+        StepVerifier.create(commands.clientSetname("not allowed")).expectError(RedisCommandExecutionException.class).verify();
     }
 
     @Test
@@ -190,8 +184,7 @@ public void dbSize() throws Exception {
 
         writeKeysToTwoNodes();
 
-        Long dbsize = block(commands.dbsize());
-        assertThat(dbsize).isEqualTo(2);
+        StepVerifier.create(commands.dbsize()).expectNext(2L).verifyComplete();
     }
 
     @Test
@@ -199,7 +192,7 @@ public void flushall() throws Exception {
 
         writeKeysToTwoNodes();
 
-        assertThat(block(commands.flushall())).isEqualTo("OK");
+        StepVerifier.create(commands.flushall()).expectNext("OK").verifyComplete();
 
         Long dbsize = syncCommands.dbsize();
         assertThat(dbsize).isEqualTo(0);
@@ -210,7 +203,7 @@ public void flushdb() throws Exception {
 
         writeKeysToTwoNodes();
 
-        assertThat(block(commands.flushdb())).isEqualTo("OK");
+        StepVerifier.create(commands.flushdb()).expectNext("OK").verifyComplete();
 
         Long dbsize = syncCommands.dbsize();
         assertThat(dbsize).isEqualTo(0);
@@ -221,9 +214,8 @@ public void keys() throws Exception {
 
         writeKeysToTwoNodes();
 
-        List<String> result = commands.keys("*").collectList().block();
-
-        assertThat(result).contains(KEY_ON_NODE_1, KEY_ON_NODE_2);
+        StepVerifier.create(commands.keys("*")).recordWith(ConcurrentSet::new).expectNextCount(2)
+                .consumeRecordedWith(actual -> assertThat(actual).contains(KEY_ON_NODE_1, KEY_ON_NODE_2)).verifyComplete();
     }
 
     @Test
@@ -232,7 +224,7 @@ public void keysStreaming() throws Exception {
         writeKeysToTwoNodes();
         ListStreamingAdapter<String> result = new ListStreamingAdapter<>();
 
-        assertThat(block(commands.keys(result, "*"))).isEqualTo(2);
+        StepVerifier.create(commands.keys(result, "*")).expectNext(2L).verifyComplete();
         assertThat(result.getList()).contains(KEY_ON_NODE_1, KEY_ON_NODE_2);
     }
 
@@ -241,17 +233,18 @@ public void randomKey() throws Exception {
 
         writeKeysToTwoNodes();
 
-        assertThat(block(commands.randomkey())).isIn(KEY_ON_NODE_1, KEY_ON_NODE_2);
+        StepVerifier.create(commands.randomkey())
+                .consumeNextWith(actual -> assertThat(actual).isIn(KEY_ON_NODE_1, KEY_ON_NODE_2)).verifyComplete();
     }
 
     @Test
     public void scriptFlush() throws Exception {
-        assertThat(block(commands.scriptFlush())).isEqualTo("OK");
+        StepVerifier.create(commands.scriptFlush()).expectNext("OK").verifyComplete();
     }
 
     @Test
     public void scriptKill() throws Exception {
-        assertThat(block(commands.scriptKill())).isEqualTo("OK");
+        StepVerifier.create(commands.scriptKill()).expectNext("OK").verifyComplete();
     }
 
     @Test
@@ -264,8 +257,9 @@ public void shutdown() throws Exception {
     public void readFromSlaves() throws Exception {
 
         RedisClusterReactiveCommands<String, String> connection = commands.getConnection(host, port4);
-        block(connection.readOnly());
-        block(commands.set(key, value));
+        connection.readOnly().subscribe();
+        commands.set(key, value).subscribe();
+
         NodeSelectionAsyncTest.waitForReplication(commands.getStatefulConnection().async(), key, port4);
 
         AtomicBoolean error = new AtomicBoolean();
@@ -273,14 +267,9 @@ public void readFromSlaves() throws Exception {
 
         assertThat(error.get()).isFalse();
 
-        block(connection.readWrite());
+        connection.readWrite().subscribe();
 
-        try {
-            block(connection.get(key).doOnError(throwable -> error.set(true)));
-            fail("Missing exception");
-        } catch (Exception e) {
-            assertThat(error.get()).isTrue();
-        }
+        StepVerifier.create(connection.get(key)).expectError(RedisCommandExecutionException.class).verify();
     }
 
     @Test
@@ -295,9 +284,9 @@ public void clusterScan() throws Exception {
         do {
 
             if (scanCursor == null) {
-                scanCursor = block(commands.scan());
+                scanCursor = commands.scan().block();
             } else {
-                scanCursor = block(commands.scan(scanCursor));
+                scanCursor = commands.scan(scanCursor).block();
             }
             allKeys.addAll(scanCursor.getKeys());
         } while (!scanCursor.isFinished());
@@ -318,9 +307,9 @@ public void clusterScanWithArgs() throws Exception {
         do {
 
             if (scanCursor == null) {
-                scanCursor = block(commands.scan(ScanArgs.Builder.matches("a*")));
+                scanCursor = commands.scan(ScanArgs.Builder.matches("a*")).block();
             } else {
-                scanCursor = block(commands.scan(scanCursor, ScanArgs.Builder.matches("a*")));
+                scanCursor = commands.scan(scanCursor, ScanArgs.Builder.matches("a*")).block();
             }
             allKeys.addAll(scanCursor.getKeys());
         } while (!scanCursor.isFinished());
@@ -342,9 +331,9 @@ public void clusterScanStreaming() throws Exception {
         do {
 
             if (scanCursor == null) {
-                scanCursor = block(commands.scan(adapter));
+                scanCursor = commands.scan(adapter).block();
             } else {
-                scanCursor = block(commands.scan(adapter, scanCursor));
+                scanCursor = commands.scan(adapter, scanCursor).block();
             }
         } while (!scanCursor.isFinished());
 
@@ -364,9 +353,9 @@ public void clusterScanStreamingWithArgs() throws Exception {
         do {
 
             if (scanCursor == null) {
-                scanCursor = block(commands.scan(adapter, ScanArgs.Builder.matches("a*")));
+                scanCursor = commands.scan(adapter, ScanArgs.Builder.matches("a*")).block();
             } else {
-                scanCursor = block(commands.scan(adapter, scanCursor, ScanArgs.Builder.matches("a*")));
+                scanCursor = commands.scan(adapter, scanCursor, ScanArgs.Builder.matches("a*")).block();
             }
         } while (!scanCursor.isFinished());
 
@@ -375,16 +364,11 @@ public void clusterScanStreamingWithArgs() throws Exception {
 
     }
 
-    private <T> T block(Mono<T> mono) {
-        return mono.block();
-    }
-
-
     private void writeKeysToTwoNodes() {
         syncCommands.set(KEY_ON_NODE_1, value);
         syncCommands.set(KEY_ON_NODE_2, value);
     }
-    
+
     protected Map<String, String> prepareMset() {
         Map<String, String> mset = new HashMap<>();
         for (char c = 'a'; c < 'z'; c++) {
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
index 84a9e39155..aa0aa94b45 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,12 @@
 
 import java.util.List;
 
-import com.lambdaworks.TestClientResources;
 import org.junit.*;
 import org.junit.runners.MethodSorters;
 
+import reactor.test.StepVerifier;
+
+import com.lambdaworks.TestClientResources;
 import com.lambdaworks.redis.FastShutdown;
 import com.lambdaworks.redis.RedisClient;
 import com.lambdaworks.redis.RedisURI;
@@ -33,8 +35,6 @@
 import com.lambdaworks.redis.cluster.models.slots.ClusterSlotsParser;
 import com.lambdaworks.redis.internal.LettuceLists;
 
-import reactor.core.publisher.Mono;
-
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SuppressWarnings("unchecked")
 public class ClusterReactiveCommandTest extends AbstractClusterTest {
@@ -48,7 +48,8 @@ public class ClusterReactiveCommandTest extends AbstractClusterTest {
     public static void setupClient() throws Exception {
         setupClusterClient();
         client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port1).build());
-        clusterClient = RedisClusterClient.create(TestClientResources.get(), LettuceLists.unmodifiableList(RedisURI.Builder.redis(host, port1).build()));
+        clusterClient = RedisClusterClient.create(TestClientResources.get(),
+                LettuceLists.unmodifiableList(RedisURI.Builder.redis(host, port1).build()));
 
     }
 
@@ -75,52 +76,38 @@ public void after() throws Exception {
 
     @Test
     public void testClusterBumpEpoch() throws Exception {
-
-        String result = block(reactive.clusterBumpepoch());
-
-        assertThat(result).matches("(BUMPED|STILL).*");
+        StepVerifier.create(reactive.clusterBumpepoch())
+                .consumeNextWith(actual -> assertThat(actual).matches("(BUMPED|STILL).*")).verifyComplete();
     }
 
     @Test
     public void testClusterInfo() throws Exception {
 
-        String status = block(reactive.clusterInfo());
-
-        assertThat(status).contains("cluster_known_nodes:");
-        assertThat(status).contains("cluster_slots_fail:0");
-        assertThat(status).contains("cluster_state:");
+        StepVerifier.create(reactive.clusterInfo()).consumeNextWith(actual -> {
+            assertThat(actual).contains("cluster_known_nodes:");
+            assertThat(actual).contains("cluster_slots_fail:0");
+            assertThat(actual).contains("cluster_state:");
+        }).verifyComplete();
     }
 
     @Test
     public void testClusterNodes() throws Exception {
 
-        String string = block(reactive.clusterNodes());
-
-        assertThat(string).contains("connected");
-        assertThat(string).contains("master");
-        assertThat(string).contains("myself");
-    }
-
-    @Test
-    public void testClusterNodesSync() throws Exception {
-
-        String string = block(reactive.clusterNodes());
-
-        assertThat(string).contains("connected");
-        assertThat(string).contains("master");
-        assertThat(string).contains("myself");
+        StepVerifier.create(reactive.clusterNodes()).consumeNextWith(actual -> {
+            assertThat(actual).contains("connected");
+            assertThat(actual).contains("master");
+            assertThat(actual).contains("myself");
+        }).verifyComplete();
     }
 
     @Test
     public void testClusterSlaves() throws Exception {
-
-        Long replication = block(reactive.waitForReplication(1, 5));
-        assertThat(replication).isNotNull();
+        StepVerifier.create(reactive.waitForReplication(1, 5)).expectNextCount(1).verifyComplete();
     }
 
     @Test
     public void testAsking() throws Exception {
-        assertThat(block(reactive.asking())).isEqualTo("OK");
+        StepVerifier.create(reactive.asking()).expectNext("OK").verifyComplete();
     }
 
     @Test
@@ -147,9 +134,4 @@ public void clusterSlaves() throws Exception {
 
         assertThat(result.size()).isGreaterThan(0);
     }
-
-    private <T> T block(Mono<T> mono) {
-        return mono.block();
-    }
-
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java
index cddc34bd01..d0cce6d98e 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,23 +19,21 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Collections;
-import java.util.List;
 
 import org.junit.*;
 import org.junit.runners.MethodSorters;
 
+import reactor.test.StepVerifier;
+
 import com.lambdaworks.TestClientResources;
 import com.lambdaworks.redis.FastShutdown;
 import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisException;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
 import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
 import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
 import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
 
-import reactor.core.publisher.Mono;
-
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SuppressWarnings("unchecked")
 public class RedisReactiveClusterClientTest extends AbstractClusterTest {
@@ -79,11 +77,12 @@ public void after() throws Exception {
 
     @Test
     public void testClusterCommandRedirection() throws Exception {
+
         // Command on node within the default connection
-        assertThat(block(reactive.set(KEY_B, "myValue1"))).isEqualTo("OK");
+        StepVerifier.create(reactive.set(KEY_B, "myValue1")).expectNext("OK").verifyComplete();
 
         // gets redirection to node 3
-        assertThat(block(reactive.set(KEY_A, "myValue1"))).isEqualTo("OK");
+        StepVerifier.create(reactive.set(KEY_A, "myValue1")).expectNext("OK").verifyComplete();
     }
 
     @Test
@@ -92,11 +91,8 @@ public void getKeysInSlot() throws Exception {
         sync.set(KEY_A, value);
         sync.set(KEY_B, value);
 
-        List<String> keysA = block(reactive.clusterGetKeysInSlot(SLOT_A, 10).collectList());
-        assertThat(keysA).isEqualTo(Collections.singletonList(KEY_A));
-
-        List<String> keysB = block(reactive.clusterGetKeysInSlot(SLOT_B, 10).collectList());
-        assertThat(keysB).isEqualTo(Collections.singletonList(KEY_B));
+        StepVerifier.create(reactive.clusterGetKeysInSlot(SLOT_A, 10)).expectNext(KEY_A).verifyComplete();
+        StepVerifier.create(reactive.clusterGetKeysInSlot(SLOT_B, 10)).expectNext(KEY_B).verifyComplete();
     }
 
     @Test
@@ -105,45 +101,36 @@ public void countKeysInSlot() throws Exception {
         sync.set(KEY_A, value);
         sync.set(KEY_B, value);
 
-        Long result = block(reactive.clusterCountKeysInSlot(SLOT_A));
-        assertThat(result).isEqualTo(1L);
-
-        result = block(reactive.clusterCountKeysInSlot(SLOT_B));
-        assertThat(result).isEqualTo(1L);
+        StepVerifier.create(reactive.clusterCountKeysInSlot(SLOT_A)).expectNext(1L).verifyComplete();
+        StepVerifier.create(reactive.clusterCountKeysInSlot(SLOT_B)).expectNext(1L).verifyComplete();
 
         int slotZZZ = SlotHash.getSlot("ZZZ".getBytes());
-        result = block(reactive.clusterCountKeysInSlot(slotZZZ));
-        assertThat(result).isEqualTo(0L);
+        StepVerifier.create(reactive.clusterCountKeysInSlot(slotZZZ)).expectNext(0L).verifyComplete();
     }
 
     @Test
     public void testClusterCountFailureReports() throws Exception {
         RedisClusterNode ownPartition = getOwnPartition(sync);
-        assertThat(block(reactive.clusterCountFailureReports(ownPartition.getNodeId()))).isGreaterThanOrEqualTo(0);
+        StepVerifier.create(reactive.clusterCountFailureReports(ownPartition.getNodeId())).consumeNextWith(actual -> {
+            assertThat(actual).isGreaterThanOrEqualTo(0);
+        }).verifyComplete();
     }
 
     @Test
     public void testClusterKeyslot() throws Exception {
-        assertThat(block(reactive.clusterKeyslot(KEY_A))).isEqualTo(SLOT_A);
+        StepVerifier.create(reactive.clusterKeyslot(KEY_A)).expectNext((long) SLOT_A).verifyComplete();
         assertThat(SlotHash.getSlot(KEY_A)).isEqualTo(SLOT_A);
     }
 
     @Test
     public void testClusterSaveconfig() throws Exception {
-        assertThat(block(reactive.clusterSaveconfig())).isEqualTo("OK");
+        StepVerifier.create(reactive.clusterSaveconfig()).expectNext("OK").verifyComplete();
     }
 
     @Test
     public void testClusterSetConfigEpoch() throws Exception {
-        try {
-            block(reactive.clusterSetConfigEpoch(1L));
-        } catch (RedisException e) {
+        StepVerifier.create(reactive.clusterSetConfigEpoch(1L)).consumeErrorWith(e -> {
             assertThat(e).hasMessageContaining("ERR The user can assign a config epoch only");
-        }
-    }
-
-    private <T> T block(Mono<T> mono) {
-        return mono.block();
+        }).verify();
     }
-
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java
index 52d72da7f1..1e64223e86 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +20,16 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import com.lambdaworks.redis.KeyValue;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import reactor.core.publisher.Flux;
+import reactor.test.StepVerifier;
+
 import com.lambdaworks.redis.FastShutdown;
+import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.RedisURI;
 import com.lambdaworks.redis.TestSettings;
 import com.lambdaworks.redis.api.sync.RedisCommands;
@@ -37,8 +40,6 @@
 import com.lambdaworks.redis.commands.StringCommandTest;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
-import reactor.core.publisher.Flux;
-
 /**
  * @author Mark Paluch
  */
@@ -48,7 +49,8 @@ public class StringClusterReactiveCommandTest extends StringCommandTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
+        redisClusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900))
+                .build());
     }
 
     @AfterClass
@@ -91,8 +93,6 @@ public void mget() throws Exception {
         RedisAdvancedClusterReactiveCommands<String, String> reactive = clusterConnection.reactive();
 
         Flux<KeyValue<String, String>> mget = reactive.mget(key, "key1", "key2");
-        KeyValue<String, String> first = mget.next().block();
-        assertThat(first).isEqualTo(KeyValue.just(key, value));
+        StepVerifier.create(mget.next()).expectNext(KeyValue.just(key, value)).verifyComplete();
     }
-
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
index 797764f5db..fa5b5a51dc 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@
 import static com.lambdaworks.redis.BitFieldArgs.OverflowType.FAIL;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
-
 import org.junit.Test;
 
+import reactor.test.StepVerifier;
+
 import com.lambdaworks.redis.BitFieldArgs;
 import com.lambdaworks.redis.Value;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
@@ -54,9 +54,9 @@ public void bitfield() throws Exception {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 1).set(5, 1).incrBy(2, 3).get().get(2);
 
-        List<Value<Long>> values = reactive.bitfield(key, bitFieldArgs).collectList().block();
+        StepVerifier.create(reactive.bitfield(key, bitFieldArgs))
+                .expectNext(Value.just(0L), Value.just(32L), Value.just(3L), Value.just(0L), Value.just(3L)).verifyComplete();
 
-        assertThat(values).containsExactly(Value.just(0L), Value.just(32L), Value.just(3L), Value.just(0L), Value.just(3L));
         assertThat(bitstring.get(key)).isEqualTo("0000000000010011");
     }
 
@@ -65,9 +65,8 @@ public void bitfieldGetWithOffset() throws Exception {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 1).get(signed(2), typeWidthBasedOffset(1));
 
-        List<Value<Long>> values = reactive.bitfield(key, bitFieldArgs).collectList().block();
+        StepVerifier.create(reactive.bitfield(key, bitFieldArgs)).expectNext(Value.just(0L), Value.just(0L)).verifyComplete();
 
-        assertThat(values).containsExactly(Value.just(0L), Value.just(0L));
         assertThat(bitstring.get(key)).isEqualTo("10000000");
     }
 
@@ -76,20 +75,22 @@ public void bitfieldSet() throws Exception {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 5).set(5);
 
-        List<Value<Long>> values = reactive.bitfield(key, bitFieldArgs).collectList().block();
+        StepVerifier.create(reactive.bitfield(key, bitFieldArgs)).expectNext(Value.just(0L), Value.just(5L)).verifyComplete();
 
-        assertThat(values).containsExactly(Value.just(0L), Value.just(5L));
         assertThat(bitstring.get(key)).isEqualTo("10100000");
     }
 
     @Test
     public void bitfieldWithOffsetSet() throws Exception {
 
-        reactive.bitfield(key, BitFieldArgs.Builder.set(signed(8), typeWidthBasedOffset(2), 5)).last().block();
+        StepVerifier.create(reactive.bitfield(key, BitFieldArgs.Builder.set(signed(8), typeWidthBasedOffset(2), 5)))
+                .expectNextCount(1).verifyComplete();
+
         assertThat(bitstring.get(key)).isEqualTo("000000000000000010100000");
 
         redis.del(key);
-        reactive.bitfield(key, BitFieldArgs.Builder.set(signed(8), offset(2), 5)).last().block();
+        StepVerifier.create(reactive.bitfield(key, BitFieldArgs.Builder.set(signed(8), offset(2), 5))).expectNextCount(1)
+                .verifyComplete();
         assertThat(bitstring.get(key)).isEqualTo("1000000000000010");
     }
 
@@ -98,20 +99,18 @@ public void bitfieldIncrBy() throws Exception {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 5).incrBy(1);
 
-        List<Value<Long>> values = reactive.bitfield(key, bitFieldArgs).collectList().block();
+        StepVerifier.create(reactive.bitfield(key, bitFieldArgs)).expectNext(Value.just(0L), Value.just(6L)).verifyComplete();
 
-        assertThat(values).containsExactly(Value.just(0L), Value.just(6L));
         assertThat(bitstring.get(key)).isEqualTo("01100000");
     }
 
     @Test
     public void bitfieldOverflow() throws Exception {
 
-        BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.overflow(FAIL).set(signed(8), 9, 5).incrBy(signed(8),
-                Integer.MAX_VALUE);
-
-        List<Value<Long>> values = reactive.bitfield(key, bitFieldArgs).collectList().block();
+        BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.overflow(FAIL).set(signed(8), 9, 5)
+                .incrBy(signed(8), Integer.MAX_VALUE);
 
-        assertThat(values).contains(Value.empty());
+        StepVerifier.create(reactive.bitfield(key, bitFieldArgs)).expectNext(Value.just(0L)).expectNext(Value.empty())
+                .verifyComplete();
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
index 3601b140f4..846251c4ec 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,9 @@
 
 import org.junit.Test;
 
+import reactor.core.publisher.Flux;
+import reactor.test.StepVerifier;
+
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.CustomCommandTest;
@@ -24,11 +27,8 @@
 import com.lambdaworks.redis.output.ValueOutput;
 import com.lambdaworks.redis.protocol.CommandArgs;
 import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.redis.reactive.TestSubscriber;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
-import reactor.core.publisher.Flux;
-
 /**
  * @author Mark Paluch
  */
@@ -45,11 +45,10 @@ public void dispatchGetAndSet() throws Exception {
         redis.set(key, value);
         RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
 
-        Flux<String> flux = reactive.dispatch(CommandType.GET, new ValueOutput<>(utf8StringCodec),
-                new CommandArgs<>(utf8StringCodec).addKey(key));
+        Flux<String> flux = reactive.dispatch(CommandType.GET, new ValueOutput<>(utf8StringCodec), new CommandArgs<>(
+                utf8StringCodec).addKey(key));
 
-        TestSubscriber<String> testSubscriber = TestSubscriber.subscribe(flux);
-        testSubscriber.awaitAndAssertNextValues(value).assertComplete().assertNoError();
+        StepVerifier.create(flux).expectNext(value).verifyComplete();
     }
 
     @Test
@@ -58,10 +57,9 @@ public void dispatchList() throws Exception {
         redis.rpush(key, "a", "b", "c");
         RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
 
-        Flux<String> flux = reactive.dispatch(CommandType.LRANGE, new ValueListOutput<>(utf8StringCodec),
-                new CommandArgs<>(utf8StringCodec).addKey(key).add(0).add(-1));
+        Flux<String> flux = reactive.dispatch(CommandType.LRANGE, new ValueListOutput<>(utf8StringCodec), new CommandArgs<>(
+                utf8StringCodec).addKey(key).add(0).add(-1));
 
-        TestSubscriber<String> testSubscriber = TestSubscriber.subscribe(flux);
-        testSubscriber.awaitAndAssertNextValues("a", "b", "c").assertComplete().assertNoError();
+        StepVerifier.create(flux).expectNext("a", "b", "c").verifyComplete();
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
index e497ce2e0a..40ccee4367 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,13 +18,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.offset;
 
-import java.util.List;
-
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.lambdaworks.redis.GeoCoordinates;
-import com.lambdaworks.redis.Value;
+import reactor.test.StepVerifier;
+
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.GeoCommandTest;
@@ -48,12 +46,14 @@ public void geopos() throws Exception {
 
         prepareGeo();
 
-        List<Value<GeoCoordinates>> geopos = reactive.geopos(key, "Weinheim", "foobar", "Bahn").collectList().block();
+        StepVerifier.create(reactive.geopos(key, "Weinheim", "foobar", "Bahn")).consumeNextWith(actual -> {
+            assertThat(actual.getValue().getX().doubleValue()).isEqualTo(8.6638, offset(0.001));
 
-        assertThat(geopos).hasSize(3);
-        assertThat(geopos.get(0).getValue().getX().doubleValue()).isEqualTo(8.6638, offset(0.001));
-        assertThat(geopos.get(1).hasValue()).isFalse();
-        assertThat(geopos.get(2).hasValue()).isTrue();
+        }).consumeNextWith(actual -> {
+            assertThat(actual.hasValue()).isFalse();
+        }).consumeNextWith(actual -> {
+            assertThat(actual.hasValue()).isTrue();
+        }).verifyComplete();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
index 65ab8deab4..42366d94ef 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,18 +15,17 @@
  */
 package com.lambdaworks.redis.commands.reactive;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Test;
 
+import reactor.core.publisher.Flux;
+import reactor.test.StepVerifier;
+
 import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.StringCommandTest;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
-import reactor.core.publisher.Flux;
-
 /**
  * @author Mark Paluch
  */
@@ -47,8 +46,7 @@ public void mget() throws Exception {
         connection.sync().set("key2", value);
 
         Flux<KeyValue<String, String>> mget = connection.reactive().mget(key, "key1", "key2");
-        KeyValue<String, String> first = mget.next().block();
-        assertThat(first).isEqualTo(KeyValue.just(key, value));
+        StepVerifier.create(mget.next()).expectNext(KeyValue.just(key, value)).thenCancel().verify();
 
         connection.close();
     }
@@ -61,8 +59,7 @@ public void mgetEmpty() throws Exception {
         connection.sync().set(key, value);
 
         Flux<KeyValue<String, String>> mget = connection.reactive().mget("unknown");
-        KeyValue<String, String> first = mget.next().block();
-        assertThat(first).isEqualTo(KeyValue.empty("unknown"));
+        StepVerifier.create(mget.next()).expectNext(KeyValue.empty("unknown")).thenCancel().verify();
 
         connection.close();
     }
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
index 9335b0198b..0dbe835e73 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,26 +17,21 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import reactor.test.StepVerifier;
+
 import com.lambdaworks.redis.ClientOptions;
 import com.lambdaworks.redis.KeyValue;
 import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.TransactionResult;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
 import com.lambdaworks.redis.api.sync.RedisCommands;
 import com.lambdaworks.redis.commands.TransactionCommandTest;
-import com.lambdaworks.redis.reactive.TestSubscriber;
 import com.lambdaworks.util.ReactiveSyncInvocationHandler;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 /**
  * @author Mark Paluch
  */
@@ -66,12 +61,13 @@ public void closeConnection() throws Exception {
 
     @Test
     public void discard() throws Exception {
-        assertThat(block(commands.multi())).isEqualTo("OK");
 
-        commands.set(key, value);
+        StepVerifier.create(commands.multi()).expectNext("OK").verifyComplete();
+
+        commands.set(key, value).subscribe();
 
-        assertThat(block(commands.discard())).isEqualTo("OK");
-        assertThat(block(commands.get(key))).isNull();
+        StepVerifier.create(commands.discard()).expectNext("OK").verifyComplete();
+        StepVerifier.create(commands.get(key)).verifyComplete();
     }
 
     @Test
@@ -81,88 +77,80 @@ public void watchRollback() throws Exception {
 
         otherConnection.sync().set(key, value);
 
-        assertThat(block(commands.watch(key))).isEqualTo("OK");
-        assertThat(block(commands.multi())).isEqualTo("OK");
+        StepVerifier.create(commands.watch(key)).expectNext("OK").verifyComplete();
+        StepVerifier.create(commands.multi()).expectNext("OK").verifyComplete();
 
-        commands.set(key, value);
+        commands.set(key, value).subscribe();
 
         otherConnection.sync().del(key);
 
-        TransactionResult transactionResult = block(commands.exec());
-        assertThat(transactionResult).isNotNull();
-        assertThat(transactionResult.wasRolledBack()).isTrue();
+        StepVerifier.create(commands.exec()).consumeNextWith(actual -> {
+            assertThat(actual).isNotNull();
+            assertThat(actual.wasRolledBack()).isTrue();
+        });
     }
 
     @Test
     public void execSingular() throws Exception {
 
-        assertThat(block(commands.multi())).isEqualTo("OK");
+        StepVerifier.create(commands.multi()).expectNext("OK").verifyComplete();
 
         redis.set(key, value);
 
-        assertThat(block(commands.exec())).contains("OK");
-        assertThat(block(commands.get(key))).isEqualTo(value);
+        StepVerifier.create(commands.exec()).consumeNextWith(actual -> assertThat(actual).contains("OK")).verifyComplete();
+        StepVerifier.create(commands.get(key)).expectNext(value).verifyComplete();
     }
 
     @Test
     public void errorInMulti() throws Exception {
-        commands.multi().subscribe(TestSubscriber.create());
-        commands.set(key, value).subscribe(TestSubscriber.create());
-        commands.lpop(key).subscribe(TestSubscriber.create());
-        commands.get(key).subscribe(TestSubscriber.create());
-
-        TransactionResult values = block(commands.exec());
-        assertThat((String) values.get(0)).isEqualTo("OK");
-        assertThat(values.get(1) instanceof RedisException).isTrue();
-        assertThat((String) values.get(2)).isEqualTo(value);
+
+        commands.multi().subscribe();
+        commands.set(key, value).subscribe();
+        commands.lpop(key).subscribe();
+        commands.get(key).subscribe();
+
+        StepVerifier.create(commands.exec()).consumeNextWith(actual -> {
+
+            assertThat((String) actual.get(0)).isEqualTo("OK");
+            assertThat(actual.get(1) instanceof RedisException).isTrue();
+            assertThat((String) actual.get(2)).isEqualTo(value);
+        }).verifyComplete();
     }
 
     @Test
     public void resultOfMultiIsContainedInCommandFlux() throws Exception {
 
-        TestSubscriber<String> set1 = TestSubscriber.create();
-        TestSubscriber<String> set2 = TestSubscriber.create();
-        TestSubscriber<KeyValue<String, String>> mget = TestSubscriber.create();
-        TestSubscriber<Long> llen = TestSubscriber.create();
-        TestSubscriber<Object> exec = TestSubscriber.create();
-
         commands.multi().subscribe();
-        commands.set("key1", "value1").subscribe(set1);
-        commands.set("key2", "value2").subscribe(set2);
-        commands.mget("key1", "key2").subscribe(mget);
-        commands.llen("something").subscribe(llen);
-        commands.exec().subscribe(exec);
-
-        exec.await();
-
-        set1.awaitAndAssertNextValues("OK");
-        set2.awaitAndAssertNextValues("OK");
-        mget.assertValues(KeyValue.just("key1", "value1"), KeyValue.just("key2", "value2"));
-        llen.awaitAndAssertNextValues(0L);
+
+        StepVerifier.Step<String> set1 = StepVerifier.create(commands.set("key1", "value1")).expectNext("OK").thenAwait();
+        StepVerifier.Step<String> set2 = StepVerifier.create(commands.set("key2", "value2")).expectNext("OK").thenAwait();
+        StepVerifier.Step<KeyValue<String, String>> mget = StepVerifier.create(commands.mget("key1", "key2"))
+                .expectNext(KeyValue.just("key1", "value1"), KeyValue.just("key2", "value2")).thenAwait();
+        StepVerifier.Step<Long> llen = StepVerifier.create(commands.llen("something")).expectNext(0L).thenAwait();
+
+        StepVerifier.create(commands.exec()).then(() -> {
+
+            set1.verifyComplete();
+            set2.verifyComplete();
+            mget.verifyComplete();
+            llen.verifyComplete();
+
+        }).expectNextCount(1).verifyComplete();
     }
 
     @Test
     public void resultOfMultiIsContainedInExecObservable() throws Exception {
 
-        TestSubscriber<TransactionResult> exec = TestSubscriber.create();
-
         commands.multi().subscribe();
         commands.set("key1", "value1").subscribe();
         commands.set("key2", "value2").subscribe();
         commands.mget("key1", "key2").subscribe();
         commands.llen("something").subscribe();
-        commands.exec().subscribe(exec);
 
-        exec.awaitAndAssertNextValuesWith(object -> {
-            assertThat(object).hasSize(4).containsExactly("OK", "OK", list(kv("key1", "value1"), kv("key2", "value2")), 0L);
-        }).assertNoError();
-    }
+        StepVerifier.create(commands.exec()).consumeNextWith(actual -> {
 
-    protected <T> T block(Mono<T> mono) {
-        return mono.block();
-    }
+            assertThat(actual).contains("OK", "OK", list(kv("key1", "value1"), kv("key2", "value2")), 0L);
 
-    protected <T> List<T> all(Flux<T> flux) {
-        return flux.collectList().block();
+        }).verifyComplete();
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java
index 8be5e8dc55..b4ae2fbfab 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
 
 import org.junit.Test;
 
-import io.reactivex.Observable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import io.reactivex.Observable;
 
 /**
  * @author Mark Paluch
@@ -67,7 +67,7 @@ public void convert() {
         sut.addConverter(new MonoToObservableConverter());
 
         Observable<String> observable = sut.convert(Mono.just("hello"), Observable.class);
-        assertThat(observable.blockingFirst()).isEqualTo("world");
+        observable.test().assertValue("world").assertComplete();
     }
 
     private class FluxToObservableConverter implements Function<Flux<?>, Observable<?>> {
@@ -84,4 +84,4 @@ public Observable<?> apply(Mono<?> source) {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java
index 63f0cadc45..b9f3d9ea3d 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,12 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.dynamic.annotation.Command;
-
 import rx.Observable;
 import rx.Single;
 
+import com.lambdaworks.redis.AbstractRedisClientTest;
+import com.lambdaworks.redis.dynamic.annotation.Command;
+
 /**
  * @author Mark Paluch
  */
@@ -62,28 +62,28 @@ public void rxJava1Observable() throws Exception {
     public void rxJava2Single() throws Exception {
 
         io.reactivex.Single<String> single = rxjava2.getRxJava2Single(key);
-        assertThat(single.blockingGet()).isEqualTo(value);
+        single.test().await().assertResult(value).assertComplete();
     }
 
     @Test
     public void rxJava2Maybe() throws Exception {
 
         io.reactivex.Maybe<String> maybe = rxjava2.getRxJava2Maybe(key);
-        assertThat(maybe.blockingGet()).isEqualTo(value);
+        maybe.test().await().assertResult(value).assertComplete();
     }
 
     @Test
     public void rxJava2Observable() throws Exception {
 
         io.reactivex.Observable<String> observable = rxjava2.getRxJava2Observable(key);
-        assertThat(observable.blockingFirst()).isEqualTo(value);
+        observable.test().await().assertResult(value).assertComplete();
     }
 
     @Test
     public void rxJava2Flowable() throws Exception {
 
         io.reactivex.Flowable<String> flowable = rxjava2.getRxJava2Flowable(key);
-        assertThat(flowable.blockingFirst()).isEqualTo(value);
+        flowable.test().await().assertResult(value).assertComplete();
     }
 
     static interface RxJava1Types extends Commands {
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsReactiveTest.java b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsReactiveTest.java
index a168d14915..9754abb3e0 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsReactiveTest.java
+++ b/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsReactiveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,14 @@
  */
 package com.lambdaworks.redis.dynamic;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Test;
 
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
 import com.lambdaworks.redis.AbstractRedisClientTest;
 import com.lambdaworks.redis.dynamic.annotation.Command;
 
-import reactor.core.publisher.Mono;
-
 /**
  * @author Mark Paluch
  */
@@ -36,8 +35,7 @@ public void reactive() throws Exception {
 
         MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
 
-        Mono<String> set = api.setReactive(key, value);
-        assertThat(set.block()).isEqualTo("OK");
+        StepVerifier.create(api.setReactive(key, value)).expectNext("OK").verifyComplete();
     }
 
     static interface MultipleExecutionModels extends Commands {
diff --git a/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java b/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
index 7930402897..51f0f8863a 100644
--- a/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
+++ b/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,18 @@
  */
 package com.lambdaworks.redis.event;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.concurrent.ArrayBlockingQueue;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import reactor.core.Disposable;
 import reactor.core.scheduler.Schedulers;
-
-import com.lambdaworks.redis.reactive.TestSubscriber;
+import reactor.test.StepVerifier;
 
 /**
  * @author Mark Paluch
@@ -38,12 +42,7 @@ public void publishToSubscriber() throws Exception {
 
         EventBus sut = new DefaultEventBus(Schedulers.immediate());
 
-        TestSubscriber<Event> subscriber = TestSubscriber.create();
-        sut.get().subscribe(subscriber);
-
-        sut.publish(event);
-
-        subscriber.awaitAndAssertNextValues(event);
+        StepVerifier.create(sut.get()).then(() -> sut.publish(event)).expectNext(event).thenCancel().verify();
     }
 
     @Test
@@ -51,14 +50,14 @@ public void publishToMultipleSubscribers() throws Exception {
 
         EventBus sut = new DefaultEventBus(Schedulers.immediate());
 
-        TestSubscriber<Event> subscriber1 = TestSubscriber.create();
-        TestSubscriber<Event> subscriber2 = TestSubscriber.create();
-        sut.get().subscribe(subscriber1);
-        sut.get().subscribe(subscriber2);
+        ArrayBlockingQueue<Event> arrayQueue = new ArrayBlockingQueue<>(5);
 
-        sut.publish(event);
+        Disposable disposable1 = sut.get().doOnNext(arrayQueue::add).subscribe();
+        StepVerifier.create(sut.get().doOnNext(arrayQueue::add)).then(() -> sut.publish(event)).expectNext(event).thenCancel()
+                .verify();
 
-        subscriber1.awaitAndAssertNextValues(event);
-        subscriber2.awaitAndAssertNextValues(event);
+        assertThat(arrayQueue.take()).isEqualTo(event);
+        assertThat(arrayQueue.take()).isEqualTo(event);
+        disposable1.dispose();
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java b/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
index a57c9414e4..10fe65337b 100644
--- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
+++ b/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,11 +24,16 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.reactive.TestSubscriber;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import reactor.core.Cancellation;
+import reactor.core.Disposable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
 import com.lambdaworks.Delay;
 import com.lambdaworks.TestClientResources;
 import com.lambdaworks.Wait;
@@ -42,10 +47,6 @@
 import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands;
 import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
 
-import reactor.core.Cancellation;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 /**
  * @author Mark Paluch
  */
@@ -87,19 +88,17 @@ public void observeChannels() throws Exception {
         block(pubsub.subscribe(channel));
 
         BlockingQueue<ChannelMessage<String, String>> channelMessages = LettuceFactories.newBlockingQueue();
-        TestSubscriber<ChannelMessage<String, String>> testSubscriber = TestSubscriber.create();
 
-        pubsub.observeChannels().doOnNext(channelMessages::add).subscribe(testSubscriber);
+        Disposable disposable = pubsub.observeChannels().doOnNext(channelMessages::add).subscribe();
 
         redis.publish(channel, message);
         redis.publish(channel, message);
         redis.publish(channel, message);
 
-        testSubscriber.awaitAndAssertNextValueCount(3);
-        Wait.untilEquals(3, () -> channelMessages.size()).waitOrTimeout();
+        Wait.untilEquals(3, channelMessages::size).waitOrTimeout();
         assertThat(channelMessages).hasSize(3);
 
-        testSubscriber.cancel();
+        disposable.dispose();
         redis.publish(channel, message);
         Delay.delay(millis(500));
         assertThat(channelMessages).hasSize(3);
@@ -228,10 +227,10 @@ public void pubsubChannels() throws Exception {
     @Test
     public void pubsubMultipleChannels() throws Exception {
 
-        block(pubsub.subscribe(channel, "channel1", "channel3"));
+        pubsub.subscribe(channel, "channel1", "channel3").subscribe();
 
-        List<String> result = all(pubsub2.pubsubChannels());
-        assertThat(result).contains(channel, "channel1", "channel3");
+        StepVerifier.create(pubsub2.pubsubChannels().collectList())
+                .consumeNextWith(actual -> assertThat(actual).contains(channel, "channel1", "channel3")).verifyComplete();
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/reactive/TestSubscriber.java b/src/test/java/com/lambdaworks/redis/reactive/TestSubscriber.java
deleted file mode 100644
index 814174dde9..0000000000
--- a/src/test/java/com/lambdaworks/redis/reactive/TestSubscriber.java
+++ /dev/null
@@ -1,1143 +0,0 @@
-/*
- * Copyright 2011-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.lambdaworks.redis.reactive;
-
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
-import java.util.function.BooleanSupplier;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-import org.reactivestreams.Publisher;
-import org.reactivestreams.Subscriber;
-import org.reactivestreams.Subscription;
-import reactor.core.Fuseable;
-import reactor.core.Receiver;
-import reactor.core.Trackable;
-import reactor.core.publisher.Operators;
-
-/**
- * A Subscriber implementation that hosts assertion tests for its state and allows
- * asynchronous cancellation and requesting.
- *
- * <p> To create a new instance of {@link TestSubscriber}, you have the choice between
- * these static methods:
- * <ul>
- *     <li>{@link TestSubscriber#subscribe(Publisher)}: create a new {@link TestSubscriber},
- *     subscribe to it with the specified {@link Publisher} and requests an unbounded
- *     number of elements.</li>
- *     <li>{@link TestSubscriber#subscribe(Publisher, long)}: create a new {@link TestSubscriber},
- *     subscribe to it with the specified {@link Publisher} and requests {@code n} elements
- *     (can be 0 if you want no initial demand).
- *     <li>{@link TestSubscriber#create()}: create a new {@link TestSubscriber} and requests
- *     an unbounded number of elements.</li>
- *     <li>{@link TestSubscriber#create(long)}: create a new {@link TestSubscriber} and
- *     requests {@code n} elements (can be 0 if you want no initial demand).
- * </ul>
- *
- * <p>If you are testing asynchronous publishers, don't forget to use one of the
- * {@code await*()} methods to wait for the data to assert.
- *
- * <p> You can extend this class but only the onNext, onError and onComplete can be overridden.
- * You can call {@link #request(long)} and {@link #cancel()} from any thread or from within
- * the overridable methods but you should avoid calling the assertXXX methods asynchronously.
- *
- * <p>Usage:
- * <pre>
- * {@code
- * TestSubscriber
- *   .subscribe(publisher)
- *   .await()
- *   .assertValues("ABC", "DEF");
- * }
- * </pre>
- *
- * @param <T> the value type.
- *
- * @author Sebastien Deleuze
- * @author David Karnok
- * @author Anatoly Kadyshev
- * @author Stephane Maldini
- * @author Brian Clozel
- */
-public class TestSubscriber<T>
-        implements Subscriber<T>, Subscription, Trackable, Receiver {
-
-	/**
-	 * Default timeout for waiting next values to be received
-	 */
-	public static final Duration DEFAULT_VALUES_TIMEOUT = Duration.ofSeconds(3);
-
-	@SuppressWarnings("rawtypes")
-    private static final AtomicLongFieldUpdater<TestSubscriber> REQUESTED =
-			AtomicLongFieldUpdater.newUpdater(TestSubscriber.class, "requested");
-
-	@SuppressWarnings("rawtypes")
-	private static final AtomicReferenceFieldUpdater<TestSubscriber, List> NEXT_VALUES =
-			AtomicReferenceFieldUpdater.newUpdater(TestSubscriber.class, List.class,
-					"values");
-
-	@SuppressWarnings("rawtypes")
-    private static final AtomicReferenceFieldUpdater<TestSubscriber, Subscription> S =
-			AtomicReferenceFieldUpdater.newUpdater(TestSubscriber.class, Subscription.class, "s");
-
-
-	private final List<Throwable> errors = new LinkedList<>();
-
-	private final CountDownLatch cdl = new CountDownLatch(1);
-
-	volatile Subscription s;
-
-	volatile long requested;
-
-	volatile List<T> values = new LinkedList<>();
-
-	/**
-	 * The fusion mode to request.
-	 */
-	private int requestedFusionMode = -1;
-
-	/**
-	 * The established fusion mode.
-	 */
-	private volatile int establishedFusionMode = -1;
-
-	/**
-	 * The fuseable QueueSubscription in case a fusion mode was specified.
-	 */
-	private Fuseable.QueueSubscription<T> qs;
-
-	private int subscriptionCount = 0;
-
-	private int completionCount = 0;
-
-	private volatile long valueCount = 0L;
-
-	private volatile long nextValueAssertedCount = 0L;
-
-	private Duration valuesTimeout = DEFAULT_VALUES_TIMEOUT;
-
-	private boolean valuesStorage = true;
-
-//	 ==============================================================================================================
-//	 Static methods
-//	 ==============================================================================================================
-
-	/**
-	 * Blocking method that waits until {@code conditionSupplier} returns true, or if it
-	 * does not before the specified timeout, throws an {@link AssertionError} with the
-	 * specified error message supplier.
-	 *
-	 * @param timeout the timeout duration
-	 * @param errorMessageSupplier the error message supplier
-	 * @param conditionSupplier condition to break out of the wait loop
-	 *
-	 * @throws AssertionError
-	 */
-	public static void await(Duration timeout, Supplier<String> errorMessageSupplier,
-			BooleanSupplier conditionSupplier) {
-
-		Objects.requireNonNull(errorMessageSupplier);
-		Objects.requireNonNull(conditionSupplier);
-		Objects.requireNonNull(timeout);
-
-		long timeoutNs = timeout.toNanos();
-		long startTime = System.nanoTime();
-		do {
-			if (conditionSupplier.getAsBoolean()) {
-				return;
-			}
-			try {
-				Thread.sleep(100);
-			}
-			catch (InterruptedException e) {
-				Thread.currentThread().interrupt();
-				throw new RuntimeException(e);
-			}
-		}
-		while (System.nanoTime() - startTime < timeoutNs);
-		throw new AssertionError(errorMessageSupplier.get());
-	}
-
-	/**
-	 * Blocking method that waits until {@code conditionSupplier} returns true, or if it
-	 * does not before the specified timeout, throw an {@link AssertionError} with the
-	 * specified error message.
-	 *
-	 * @param timeout the timeout duration
-	 * @param errorMessage the error message
-	 * @param conditionSupplier condition to break out of the wait loop
-	 *
-	 * @throws AssertionError
-	 */
-	public static void await(Duration timeout,
-			final String errorMessage,
-			BooleanSupplier conditionSupplier) {
-		await(timeout, new Supplier<String>() {
-			@Override
-			public String get() {
-				return errorMessage;
-			}
-		}, conditionSupplier);
-	}
-
-	/**
-	 * Create a new {@link TestSubscriber} that requests an unbounded number of elements.
-	 * <p>Be sure at least a publisher has subscribed to it via {@link Publisher#subscribe(Subscriber)}
-	 * before use assert methods.
-	 * @see #subscribe(Publisher)
-	 * @param <T> the observed value type
-	 * @return a fresh TestSubscriber instance
-	 */
-	public static <T> TestSubscriber<T> create() {
-		return new TestSubscriber<>();
-	}
-
-	/**
-	 * Create a new {@link TestSubscriber} that requests initially {@code n} elements. You
-	 * can then manage the demand with {@link Subscription#request(long)}.
-	 * <p>Be sure at least a publisher has subscribed to it via {@link Publisher#subscribe(Subscriber)}
-	 * before use assert methods.
-	 * @param n Number of elements to request (can be 0 if you want no initial demand).
-	 * @see #subscribe(Publisher, long)
-     * @param <T> the observed value type
-     * @return a fresh TestSubscriber instance
-	 */
-	public static <T> TestSubscriber<T> create(long n) {
-		return new TestSubscriber<>(n);
-	}
-
-	/**
-	 * Create a new {@link TestSubscriber} that requests an unbounded number of elements,
-	 * and make the specified {@code publisher} subscribe to it.
-	 * @param publisher The publisher to subscribe with
-     * @param <T> the observed value type
-     * @return a fresh TestSubscriber instance
-	 */
-	public static <T> TestSubscriber<T> subscribe(Publisher<T> publisher) {
-		TestSubscriber<T> subscriber = new TestSubscriber<>();
-		publisher.subscribe(subscriber);
-		return subscriber;
-	}
-
-	/**
-	 * Create a new {@link TestSubscriber} that requests initially {@code n} elements,
-	 * and make the specified {@code publisher} subscribe to it. You can then manage the
-	 * demand with {@link Subscription#request(long)}.
-	 * @param publisher The publisher to subscribe with
-	 * @param n Number of elements to request (can be 0 if you want no initial demand).
-     * @param <T> the observed value type
-     * @return a fresh TestSubscriber instance
-	 */
-	public static <T> TestSubscriber<T> subscribe(Publisher<T> publisher, long n) {
-		TestSubscriber<T> subscriber = new TestSubscriber<>(n);
-		publisher.subscribe(subscriber);
-		return subscriber;
-	}
-
-//	 ==============================================================================================================
-//	 Private constructors
-//	 ==============================================================================================================
-
-	private TestSubscriber() {
-		 this(Long.MAX_VALUE);
-	}
-
-	private TestSubscriber(long n) {
-		if (n < 0) {
-			throw new IllegalArgumentException("initialRequest >= required but it was " + n);
-		}
-		REQUESTED.lazySet(this, n);
-	}
-
-//	 ==============================================================================================================
-//	 Configuration
-//	 ==============================================================================================================
-
-
-	/**
-	 * Enable or disabled the values storage. It is enabled by default, and can be disable
-	 * in order to be able to perform performance benchmarks or tests with a huge amount
-	 * values.
-	 * @param enabled enable value storage?
-	 * @return this
-	 */
-	public final TestSubscriber<T> configureValuesStorage(boolean enabled) {
-		this.valuesStorage = enabled;
-		return this;
-	}
-
-	/**
-	 * Configure the timeout in seconds for waiting next values to be received (3 seconds
-	 * by default).
-	 * @param timeout the new default value timeout duration
-	 * @return this
-	 */
-	public final TestSubscriber<T> configureValuesTimeout(Duration timeout) {
-		this.valuesTimeout = timeout;
-		return this;
-	}
-
-	/**
-	 * Returns the established fusion mode or -1 if it was not enabled
-	 *
-	 * @return the fusion mode, see Fuseable constants
-	 */
-	public final int establishedFusionMode() {
-		return establishedFusionMode;
-	}
-
-//	 ==============================================================================================================
-//	 Assertions
-//	 ==============================================================================================================
-
-	/**
-	 * Assert a complete successfully signal has been received.
-	 * @return this
-	 */
-	public final TestSubscriber<T> assertComplete() {
-		int c = completionCount;
-		if (c == 0) {
-			throw new AssertionError("Not completed", null);
-		}
-		if (c > 1) {
-			throw new AssertionError("Multiple completions: " + c, null);
-		}
-		return this;
-	}
-
-	/**
-	 * Assert the specified values have been received. Values storage should be enabled to
-	 * use this method.
-	 * @param expectedValues the values to assert
-	 * @see #configureValuesStorage(boolean)
-	 * @return this
-	 */
-	public final TestSubscriber<T> assertContainValues(Set<? extends T> expectedValues) {
-		if (!valuesStorage) {
-			throw new IllegalStateException(
-					"Using assertNoValues() requires enabling values storage");
-		}
-		if (expectedValues.size() > values.size()) {
-			throw new AssertionError("Actual contains fewer elements" + values, null);
-		}
-
-		Iterator<? extends T> expected = expectedValues.iterator();
-
-		for (; ; ) {
-			boolean n2 = expected.hasNext();
-			if (n2) {
-				T t2 = expected.next();
-				if (!values.contains(t2)) {
-					throw new AssertionError("The element is not contained in the " +
-							"received resuls" +
-							" = " + valueAndClass(t2), null);
-				}
-			}
-			else{
-				break;
-			}
-		}
-		return this;
-	}
-
-	/**
-	 * Assert an error signal has been received.
-	 * @return this
-	 */
-	public final TestSubscriber<T> assertError() {
-		int s = errors.size();
-		if (s == 0) {
-			throw new AssertionError("No error", null);
-		}
-		if (s > 1) {
-			throw new AssertionError("Multiple errors: " + s, null);
-		}
-		return this;
-	}
-
-	/**
-	 * Assert an error signal has been received.
-	 * @param clazz The class of the exception contained in the error signal
-	 * @return this
-	 */
-	public final TestSubscriber<T> assertError(Class<? extends Throwable> clazz) {
-		 int s = errors.size();
-		if (s == 0) {
-			throw new AssertionError("No error", null);
-		}
-		if (s == 1) {
-			Throwable e = errors.get(0);
-			if (!clazz.isInstance(e)) {
-				throw new AssertionError("Error class incompatible: expected = " +
-						clazz + ", actual = " + e, null);
-			}
-		}
-		if (s > 1) {
-			throw new AssertionError("Multiple errors: " + s, null);
-		}
-		return this;
-	}
-
-	public final TestSubscriber<T> assertErrorMessage(String message) {
-		int s = errors.size();
-		if (s == 0) {
-			assertionError("No error", null);
-		}
-		if (s == 1) {
-			if (!Objects.equals(message,
-					errors.get(0)
-					      .getMessage())) {
-				assertionError("Error class incompatible: expected = \"" + message +
-						"\", actual = \"" + errors.get(0).getMessage() + "\"", null);
-			}
-		}
-		if (s > 1) {
-			assertionError("Multiple errors: " + s, null);
-		}
-
-		return this;
-	}
-
-	/**
-	 * Assert an error signal has been received.
-	 * @param expectation A method that can verify the exception contained in the error signal
-	 * and throw an exception (like an {@link AssertionError}) if the exception is not valid.
-	 * @return this
-	 */
-	public final TestSubscriber<T> assertErrorWith(Consumer<? super Throwable> expectation) {
-		int s = errors.size();
-		if (s == 0) {
-			throw new AssertionError("No error", null);
-		}
-		if (s == 1) {
-			expectation.accept(errors.get(0));
-		}
-		if (s > 1) {
-			throw new AssertionError("Multiple errors: " + s, null);
-		}
-		return this;
-	}
-
-	/**
-	 * Assert that the upstream was a Fuseable source.
-	 *
-	 * @return this
-	 */
-	public final TestSubscriber<T> assertFuseableSource() {
-		if (qs == null) {
-			throw new AssertionError("Upstream was not Fuseable");
-		}
-		return this;
-	}
-
-	/**
-	 * Assert that the fusion mode was granted.
-	 *
-	 * @return this
-	 */
-	public final TestSubscriber<T> assertFusionEnabled() {
-		if (establishedFusionMode != Fuseable.SYNC && establishedFusionMode != Fuseable.ASYNC) {
-			throw new AssertionError("Fusion was not enabled");
-		}
-		return this;
-	}
-
-	public final TestSubscriber<T> assertFusionMode(int expectedMode) {
-		if (establishedFusionMode != expectedMode) {
-			throw new AssertionError("Wrong fusion mode: expected: " + fusionModeName(
-					expectedMode) + ", actual: " + fusionModeName(establishedFusionMode));
-		}
-		return this;
-	}
-
-	/**
-	 * Assert that the fusion mode was granted.
-	 *
-	 * @return this
-	 */
-	public final TestSubscriber<T> assertFusionRejected() {
-		if (establishedFusionMode != Fuseable.NONE) {
-			throw new AssertionError("Fusion was granted");
-		}
-		return this;
-	}
-
-	/**
-	 * Assert no error signal has been received.
-     * @return this
-	 */
-	public final TestSubscriber<T> assertNoError() {
-		int s = errors.size();
-		if (s == 1) {
-			Throwable e = errors.get(0);
-			String valueAndClass = e == null ? null : e + " (" + e.getClass().getSimpleName() + ")";
-			throw new AssertionError("Error present: " + valueAndClass, null);
-		}
-		if (s > 1) {
-			throw new AssertionError("Multiple errors: " + s, null);
-		}
-		return this;
-	}
-
-	/**
-	 * Assert no values have been received.
-	 *
-	 * @return this
-	 */
-	public final TestSubscriber<T> assertNoValues() {
-		if (valueCount != 0) {
-			throw new AssertionError("No values expected but received: [length = " + values.size() + "] " + values,
-					null);
-		}
-		return this;
-	}
-
-	/**
-	 * Assert that the upstream was not a Fuseable source.
-	 * @return this
-	 */
-	public final TestSubscriber<T> assertNonFuseableSource() {
-		if (qs != null) {
-			throw new AssertionError("Upstream was Fuseable");
-		}
-		return this;
-	}
-
-	/**
-	 * Assert no complete successfully signal has been received.
-	 * @return this
-	 */
-	public final TestSubscriber<T> assertNotComplete() {
-		int c = completionCount;
-		if (c == 1) {
-			throw new AssertionError("Completed", null);
-		}
-		if (c > 1) {
-			throw new AssertionError("Multiple completions: " + c, null);
-		}
-		return this;
-	}
-
-	/**
-	 * Assert no subscription occurred.
-	 *
-	 * @return this
-	 */
-	public final TestSubscriber<T> assertNotSubscribed() {
-		int s = subscriptionCount;
-
-		if (s == 1) {
-			throw new AssertionError("OnSubscribe called once", null);
-		}
-		if (s > 1) {
-			throw new AssertionError("OnSubscribe called multiple times: " + s, null);
-		}
-
-		return this;
-	}
-
-	/**
-	 * Assert no complete successfully or error signal has been received.
-	 * @return this
-	 */
-	public final TestSubscriber<T> assertNotTerminated() {
-		if (cdl.getCount() == 0) {
-			throw new AssertionError("Terminated", null);
-		}
-		return this;
-	}
-
-	/**
-	 * Assert subscription occurred (once).
-	 * @return this
-	 */
-	public final TestSubscriber<T> assertSubscribed() {
-		int s = subscriptionCount;
-
-		if (s == 0) {
-			throw new AssertionError("OnSubscribe not called", null);
-		}
-		if (s > 1) {
-			throw new AssertionError("OnSubscribe called multiple times: " + s, null);
-		}
-
-		return this;
-	}
-
-	/**
-	 * Assert either complete successfully or error signal has been received.
-	 * @return this
-	 */
-	public final TestSubscriber<T> assertTerminated() {
-		if (cdl.getCount() != 0) {
-			throw new AssertionError("Not terminated", null);
-		}
-		return this;
-	}
-
-	/**
-	 * Assert {@code n} values has been received.
-	 *
-	 * @param n the expected value count
-	 *
-	 * @return this
-	 */
-	public final TestSubscriber<T> assertValueCount(long n) {
-		if (valueCount != n) {
-			throw new AssertionError("Different value count: expected = " + n + ", actual = " + valueCount,
-					null);
-		}
-		return this;
-	}
-
-	/**
-	 * Assert the specified values have been received in the same order read by the
-	 * passed {@link Iterable}. Values storage
-	 * should be enabled to
-	 * use this method.
-	 * @param expectedSequence the values to assert
-	 * @see #configureValuesStorage(boolean)
-     * @return this
-	 */
-	public final TestSubscriber<T> assertValueSequence(Iterable<? extends T> expectedSequence) {
-		if (!valuesStorage) {
-			throw new IllegalStateException("Using assertNoValues() requires enabling values storage");
-		}
-		Iterator<T> actual = values.iterator();
-		Iterator<? extends T> expected = expectedSequence.iterator();
-		int i = 0;
-		for (; ; ) {
-			boolean n1 = actual.hasNext();
-			boolean n2 = expected.hasNext();
-			if (n1 && n2) {
-				T t1 = actual.next();
-				T t2 = expected.next();
-				if (!Objects.equals(t1, t2)) {
-					throw new AssertionError("The element with index " + i + " does not match: expected = " + valueAndClass(t2) + ", actual = "
-					  + valueAndClass(
-					  t1), null);
-				}
-				i++;
-			} else if (n1 && !n2) {
-				throw new AssertionError("Actual contains more elements" + values, null);
-			} else if (!n1 && n2) {
-				throw new AssertionError("Actual contains fewer elements: " + values, null);
-			} else {
-				break;
-			}
-		}
-		return this;
-	}
-
-	/**
-	 * Assert the specified values have been received in the declared order. Values
-	 * storage should be enabled to use this method.
-	 *
-	 * @param expectedValues the values to assert
-	 *
-	 * @return this
-	 *
-	 * @see #configureValuesStorage(boolean)
-	 */
-	@SafeVarargs
-	public final TestSubscriber<T> assertValues(T... expectedValues) {
-		return assertValueSequence(Arrays.asList(expectedValues));
-	}
-
-	/**
-	 * Assert the specified values have been received in the declared order. Values
-	 * storage should be enabled to use this method.
-	 *
-	 * @param expectations One or more methods that can verify the values and throw a
-	 * exception (like an {@link AssertionError}) if the value is not valid.
-	 *
-	 * @return this
-	 *
-	 * @see #configureValuesStorage(boolean)
-	 */
-	@SafeVarargs
-	public final TestSubscriber<T> assertValuesWith(Consumer<T>... expectations) {
-		if (!valuesStorage) {
-			throw new IllegalStateException(
-					"Using assertNoValues() requires enabling values storage");
-		}
-		final int expectedValueCount = expectations.length;
-		if (expectedValueCount != values.size()) {
-			throw new AssertionError("Different value count: expected = " + expectedValueCount + ", actual = " + valueCount, null);
-		}
-		for (int i = 0; i < expectedValueCount; i++) {
-			Consumer<T> consumer = expectations[i];
-			T actualValue = values.get(i);
-			consumer.accept(actualValue);
-		}
-		return this;
-	}
-
-//	 ==============================================================================================================
-//	 Await methods
-//	 ==============================================================================================================
-
-	/**
-	 * Blocking method that waits until a complete successfully or error signal is received.
-     * @return this
-	 */
-	public final TestSubscriber<T> await() {
-		if (cdl.getCount() == 0) {
-			return this;
-		}
-		try {
-			cdl.await();
-		} catch (InterruptedException ex) {
-			throw new AssertionError("Wait interrupted", ex);
-		}
-		return this;
-	}
-
-	/**
-	 * Blocking method that waits until a complete successfully or error signal is received
-	 * or until a timeout occurs.
-	 * @param timeout The timeout value
-     * @return this
-	 */
-	public final TestSubscriber<T> await(Duration timeout) {
-		if (cdl.getCount() == 0) {
-			return this;
-		}
-		try {
-			if (!cdl.await(timeout.toMillis(), TimeUnit.MILLISECONDS)) {
-				throw new AssertionError("No complete or error signal before timeout");
-			}
-			return this;
-		}
-		catch (InterruptedException ex) {
-			throw new AssertionError("Wait interrupted", ex);
-		}
-	}
-
-	/**
-	 * Blocking method that waits until {@code n} next values have been received.
-	 *
-	 * @param n the value count to assert
-	 *
-	 * @return this
-	 */
-	public final TestSubscriber<T> awaitAndAssertNextValueCount(final long n) {
-		await(valuesTimeout, new Supplier<String>() {
-			@Override
-			public String get() {
-				return String.format("%d out of %d next values received within %d",
-						valueCount - nextValueAssertedCount,
-						n,
-						valuesTimeout.toMillis());
-			}
-		}, () -> valueCount == (nextValueAssertedCount + n));
-		nextValueAssertedCount += n;
-		return this;
-	}
-
-	/**
-	 * Blocking method that waits until {@code n} next values have been received (n is the
-	 * number of values provided) to assert them.
-	 *
-	 * @param values the values to assert
-	 *
-	 * @return this
-	 */
-	@SafeVarargs
-	@SuppressWarnings("unchecked")
-	public final TestSubscriber<T> awaitAndAssertNextValues(T... values) {
-		final int expectedNum = values.length;
-		final List<Consumer<T>> expectations = new ArrayList<>();
-		for (int i = 0; i < expectedNum; i++) {
-			final T expectedValue = values[i];
-			expectations.add(actualValue -> {
-				if (!actualValue.equals(expectedValue)) {
-					throw new AssertionError(String.format(
-							"Expected Next signal: %s, but got: %s",
-							expectedValue,
-							actualValue));
-				}
-			});
-		}
-		awaitAndAssertNextValuesWith(expectations.toArray((Consumer<T>[]) new Consumer[0]));
-		return this;
-	}
-
-	/**
-	 * Blocking method that waits until {@code n} next values have been received
-	 * (n is the number of expectations provided) to assert them.
-	 * @param expectations One or more methods that can verify the values and throw a
-	 * exception (like an {@link AssertionError}) if the value is not valid.
-     * @return this
-	 */
-	@SafeVarargs
-	public final TestSubscriber<T> awaitAndAssertNextValuesWith(Consumer<T>... expectations) {
-		valuesStorage = true;
-		final int expectedValueCount = expectations.length;
-		await(valuesTimeout, () -> {
-			return String.format("%d out of %d next values received within %d ms",
-					valueCount - nextValueAssertedCount,
-					expectedValueCount,
-					valuesTimeout.toMillis());
-		}, () -> valueCount >= (nextValueAssertedCount + expectedValueCount));
-		List<T> nextValuesSnapshot;
-		List<T> empty = new ArrayList<>();
-		for(;;){
-			nextValuesSnapshot = values;
-			if(NEXT_VALUES.compareAndSet(this, values, empty)){
-				break;
-			}
-		}
-		if (nextValuesSnapshot.size() < expectedValueCount) {
-			throw new AssertionError(String.format("Expected %d number of signals but received %d",
-					expectedValueCount,
-					nextValuesSnapshot.size()));
-		}
-		for (int i = 0; i < expectedValueCount; i++) {
-			Consumer<T> consumer = expectations[i];
-			T actualValue = nextValuesSnapshot.get(i);
-			consumer.accept(actualValue);
-		}
-		nextValueAssertedCount += expectedValueCount;
-		return this;
-	}
-
-//	 ==============================================================================================================
-//	 Overrides
-//	 ==============================================================================================================
-
-	@Override
-	public void cancel() {
-		Subscription a = s;
-		if (a != Operators.cancelledSubscription()) {
-			a = S.getAndSet(this, Operators.cancelledSubscription());
-			if (a != null && a != Operators.cancelledSubscription()) {
-				a.cancel();
-			}
-		}
-	}
-
-	@Override
-	public final boolean isCancelled() {
-		return s == Operators.cancelledSubscription();
-	}
-
-	@Override
-	public final boolean isStarted() {
-		return s != null;
-	}
-
-	@Override
-	public final boolean isTerminated() {
-		return isCancelled();
-	}
-
-	@Override
-	public void onComplete() {
-		completionCount++;
-		cdl.countDown();
-	}
-
-	@Override
-	public void onError(Throwable t) {
-		errors.add(t);
-		cdl.countDown();
-	}
-
-	@Override
-	public void onNext(T t) {
-		if (establishedFusionMode == Fuseable.ASYNC) {
-			for (; ; ) {
-				t = qs.poll();
-				if (t == null) {
-					break;
-				}
-				valueCount++;
-				if (valuesStorage) {
-					List<T> nextValuesSnapshot;
-					for (; ; ) {
-						nextValuesSnapshot = values;
-						nextValuesSnapshot.add(t);
-						if (NEXT_VALUES.compareAndSet(this,
-								nextValuesSnapshot,
-								nextValuesSnapshot)) {
-							break;
-						}
-					}
-				}
-			}
-		}
-		else {
-			valueCount++;
-			if (valuesStorage) {
-				List<T> nextValuesSnapshot;
-				for (; ; ) {
-					nextValuesSnapshot = values;
-					nextValuesSnapshot.add(t);
-					if (NEXT_VALUES.compareAndSet(this,
-							nextValuesSnapshot,
-							nextValuesSnapshot)) {
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void onSubscribe(Subscription s) {
-		subscriptionCount++;
-		int requestMode = requestedFusionMode;
-		if (requestMode >= 0) {
-			if (!setWithoutRequesting(s)) {
-				if (!isCancelled()) {
-					errors.add(new IllegalStateException("Subscription already set: " +
-							subscriptionCount));
-				}
-			} else {
-				if (s instanceof Fuseable.QueueSubscription) {
-					this.qs = (Fuseable.QueueSubscription<T>)s;
-
-					int m = qs.requestFusion(requestMode);
-					establishedFusionMode = m;
-
-					if (m == Fuseable.SYNC) {
-						for (;;) {
-							T v = qs.poll();
-							if (v == null) {
-								onComplete();
-								break;
-							}
-
-							onNext(v);
-						}
-					}
-					else {
-						requestDeferred();
-					}
-				}
-				else {
-					requestDeferred();
-				}
-			}
-		} else {
-			if (!set(s)) {
-				if (!isCancelled()) {
-					errors.add(new IllegalStateException("Subscription already set: " +
-							subscriptionCount));
-				}
-			}
-		}
-	}
-
-	@Override
-	public void request(long n) {
-		if (Operators.validate(n)) {
-			if (establishedFusionMode != Fuseable.SYNC) {
-				normalRequest(n);
-			}
-		}
-	}
-
-	@Override
-	public final long requestedFromDownstream() {
-		return requested;
-	}
-
-	/**
-	 * Setup what fusion mode should be requested from the incomining
-	 * Subscription if it happens to be QueueSubscription
-	 * @param requestMode the mode to request, see Fuseable constants
-	 * @return this
-	 */
-	public final TestSubscriber<T> requestedFusionMode(int requestMode) {
-		this.requestedFusionMode = requestMode;
-		return this;
-	}
-
-	@Override
-	public Subscription upstream() {
-		return s;
-	}
-
-
-//	 ==============================================================================================================
-//	 Non public methods
-//	 ==============================================================================================================
-
-	protected final void normalRequest(long n) {
-		Subscription a = s;
-		if (a != null) {
-			a.request(n);
-		} else {
-			Operators.addAndGet(REQUESTED, this, n);
-
-			a = s;
-
-			if (a != null) {
-				long r = REQUESTED.getAndSet(this, 0L);
-
-				if (r != 0L) {
-					a.request(r);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Requests the deferred amount if not zero.
-	 */
-	protected final void requestDeferred() {
-		long r = REQUESTED.getAndSet(this, 0L);
-
-		if (r != 0L) {
-			s.request(r);
-		}
-	}
-
-	/**
-	 * Atomically sets the single subscription and requests the missed amount from it.
-	 *
-	 * @param s
-	 * @return false if this arbiter is cancelled or there was a subscription already set
-	 */
-	protected final boolean set(Subscription s) {
-		Objects.requireNonNull(s, "s");
-		Subscription a = this.s;
-		if (a == Operators.cancelledSubscription()) {
-			s.cancel();
-			return false;
-		}
-		if (a != null) {
-			s.cancel();
-			Operators.reportSubscriptionSet();
-			return false;
-		}
-
-		if (S.compareAndSet(this, null, s)) {
-
-			long r = REQUESTED.getAndSet(this, 0L);
-
-			if (r != 0L) {
-				s.request(r);
-			}
-
-			return true;
-		}
-
-		a = this.s;
-
-		if (a != Operators.cancelledSubscription()) {
-			s.cancel();
-			return false;
-		}
-
-		Operators.reportSubscriptionSet();
-		return false;
-	}
-
-	/**
-	 * Sets the Subscription once but does not request anything.
-	 * @param s the Subscription to set
-	 * @return true if successful, false if the current subscription is not null
-	 */
-	protected final boolean setWithoutRequesting(Subscription s) {
-		Objects.requireNonNull(s, "s");
-		for (;;) {
-			Subscription a = this.s;
-			if (a == Operators.cancelledSubscription()) {
-				s.cancel();
-				return false;
-			}
-			if (a != null) {
-				s.cancel();
-				Operators.reportSubscriptionSet();
-				return false;
-			}
-
-			if (S.compareAndSet(this, null, s)) {
-				return true;
-			}
-		}
-	}
-
-	/**
-	 * Prepares and throws an AssertionError exception based on the message, cause, the
-	 * active state and the potential errors so far.
-	 *
-	 * @param message the message
-	 * @param cause the optional Throwable cause
-	 *
-	 * @throws AssertionError as expected
-	 */
-	protected final void assertionError(String message, Throwable cause) {
-		StringBuilder b = new StringBuilder();
-
-		if (cdl.getCount() != 0) {
-			b.append("(active) ");
-		}
-		b.append(message);
-
-		List<Throwable> err = errors;
-		if (!err.isEmpty()) {
-			b.append(" (+ ")
-			 .append(err.size())
-			 .append(" errors)");
-		}
-		AssertionError e = new AssertionError(b.toString(), cause);
-
-		for (Throwable t : err) {
-			e.addSuppressed(t);
-		}
-
-		throw e;
-	}
-
-	protected final String fusionModeName(int mode) {
-		switch (mode) {
-			case -1:
-				return "Disabled";
-			case Fuseable.NONE:
-				return "None";
-			case Fuseable.SYNC:
-				return "Sync";
-			case Fuseable.ASYNC:
-				return "Async";
-			default:
-				return "Unknown(" + mode + ")";
-		}
-	}
-
-	protected final String valueAndClass(Object o) {
-		if (o == null) {
-			return null;
-		}
-		return o + " (" + o.getClass().getSimpleName() + ")";
-	}
-
-}
diff --git a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java b/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
index 58ebcbafcb..b0a239dd4c 100644
--- a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
+++ b/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,17 +23,18 @@
 
 import java.util.concurrent.TimeUnit;
 
-import io.netty.util.Timer;
 import org.junit.Test;
 
+import reactor.test.StepVerifier;
+
 import com.lambdaworks.redis.FastShutdown;
 import com.lambdaworks.redis.event.Event;
 import com.lambdaworks.redis.event.EventBus;
 import com.lambdaworks.redis.metrics.CommandLatencyCollector;
 import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollectorOptions;
-import com.lambdaworks.redis.reactive.TestSubscriber;
 
 import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.util.Timer;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.Future;
 
@@ -106,8 +107,7 @@ public void testProvidedResources() throws Exception {
 
         DefaultClientResources sut = DefaultClientResources.builder().eventExecutorGroup(executorMock)
                 .eventLoopGroupProvider(groupProviderMock).timer(timerMock).eventBus(eventBusMock)
-                .commandLatencyCollector(latencyCollectorMock)
-                .build();
+                .commandLatencyCollector(latencyCollectorMock).build();
 
         assertThat(sut.eventExecutorGroup()).isSameAs(executorMock);
         assertThat(sut.eventLoopGroupProvider()).isSameAs(groupProviderMock);
@@ -144,17 +144,9 @@ public void testEventBus() throws Exception {
         DefaultClientResources sut = DefaultClientResources.create();
 
         EventBus eventBus = sut.eventBus();
-
-        final TestSubscriber<Event> testSubscriber = TestSubscriber.create();
-
-        eventBus.get().subscribe(testSubscriber);
-
         Event event = mock(Event.class);
-        eventBus.publish(event);
 
-        testSubscriber.awaitAndAssertNextValuesWith(receivedEvent -> {
-            assertThat(receivedEvent).isEqualTo(event);
-        });
+        StepVerifier.create(eventBus.get()).then(() -> eventBus.publish(event)).expectNext(event).thenCancel().verify();
 
         assertThat(sut.shutdown(0, 0, TimeUnit.MILLISECONDS).get()).isTrue();
     }

From 39d5fe39b7a6dd2eb7a312e105e5584227d5d7f8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 20 Feb 2017 17:46:32 -0500
Subject: [PATCH 155/808] Apply command timeout to PING before connection
 activation #470

PING before activate connection now applies the configured command timeout from RedisURI to guard connection initialization. Applying the timeout monitors the PING command (AUTH for connections using a password). If the timeout is reached, the initialization future is completed with a timeout exception which closed the connection. If the PING is completed in time, command monitoring is canceled.
---
 .../lambdaworks/redis/ConnectionBuilder.java  |  4 +-
 .../redis/PlainChannelInitializer.java        | 59 ++++++++++++++-----
 .../redis/SslConnectionBuilder.java           | 29 +++++----
 .../lambdaworks/redis/ClientOptionsTest.java  | 56 ++++++++++++++++--
 4 files changed, 115 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java b/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java
index 333a9337a3..dd420e09f5 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -124,7 +124,7 @@ protected ConnectionWatchdog createConnectionWatchdog() {
     }
 
     public RedisChannelInitializer build() {
-        return new PlainChannelInitializer(pingCommandSupplier, this::buildHandlers, clientResources.eventBus());
+        return new PlainChannelInitializer(pingCommandSupplier, this::buildHandlers, clientResources, timeout, timeUnit);
     }
 
     public ConnectionBuilder socketAddressSupplier(Supplier<SocketAddress> socketAddressSupplier) {
diff --git a/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java b/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
index 844d4318f6..c7ce995a65 100644
--- a/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
+++ b/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,17 +20,19 @@
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.event.EventBus;
 import com.lambdaworks.redis.event.connection.ConnectedEvent;
 import com.lambdaworks.redis.event.connection.ConnectionActivatedEvent;
 import com.lambdaworks.redis.event.connection.DisconnectedEvent;
 import com.lambdaworks.redis.protocol.AsyncCommand;
+import com.lambdaworks.redis.resource.ClientResources;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.Timeout;
 
 /**
  * @author Mark Paluch
@@ -41,16 +43,19 @@ class PlainChannelInitializer extends io.netty.channel.ChannelInitializer<Channe
 
     private final Supplier<List<ChannelHandler>> handlers;
     private final Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier;
-    private final EventBus eventBus;
+    private final ClientResources clientResources;
+    private final long timeout;
+    private final TimeUnit timeUnit;
 
     private volatile CompletableFuture<Boolean> initializedFuture = new CompletableFuture<>();
 
     PlainChannelInitializer(Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier, Supplier<List<ChannelHandler>> handlers,
-            EventBus eventBus) {
-
+            ClientResources clientResources, long timeout, TimeUnit timeUnit) {
         this.pingCommandSupplier = pingCommandSupplier;
         this.handlers = handlers;
-        this.eventBus = eventBus;
+        this.clientResources = clientResources;
+        this.timeout = timeout;
+        this.timeUnit = timeUnit;
     }
 
     @Override
@@ -70,7 +75,7 @@ public CompletableFuture<Boolean> channelInitialized() {
                 @Override
                 public void channelInactive(ChannelHandlerContext ctx) throws Exception {
 
-                    eventBus.publish(new DisconnectedEvent(local(ctx), remote(ctx)));
+                    clientResources.eventBus().publish(new DisconnectedEvent(local(ctx), remote(ctx)));
                     initializedFuture = new CompletableFuture<>();
                     pingCommand = null;
                     super.channelInactive(ctx);
@@ -82,7 +87,7 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
                     if (evt instanceof ConnectionEvents.Activated) {
                         if (!initializedFuture.isDone()) {
                             initializedFuture.complete(true);
-                            eventBus.publish(new ConnectionActivatedEvent(local(ctx), remote(ctx)));
+                            clientResources.eventBus().publish(new ConnectionActivatedEvent(local(ctx), remote(ctx)));
                         }
                     }
                     super.userEventTriggered(ctx, evt);
@@ -91,11 +96,11 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
                 @Override
                 public void channelActive(final ChannelHandlerContext ctx) throws Exception {
 
-                    eventBus.publish(new ConnectedEvent(local(ctx), remote(ctx)));
+                    clientResources.eventBus().publish(new ConnectedEvent(local(ctx), remote(ctx)));
 
                     if (pingCommandSupplier != NO_PING) {
                         pingCommand = pingCommandSupplier.get();
-                        pingBeforeActivate(pingCommand, initializedFuture, ctx);
+                        pingBeforeActivate(pingCommand, initializedFuture, ctx, clientResources, timeout, timeUnit);
                     } else {
                         super.channelActive(ctx);
                     }
@@ -116,19 +121,43 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
         }
     }
 
-    static void pingBeforeActivate(final AsyncCommand<?, ?, ?> cmd, final CompletableFuture<Boolean> initializedFuture,
-            final ChannelHandlerContext ctx) throws Exception {
-        cmd.handle((o, throwable) -> {
+    static void pingBeforeActivate(AsyncCommand<?, ?, ?> cmd, CompletableFuture<Boolean> initializedFuture,
+            ChannelHandlerContext ctx, ClientResources clientResources, long timeout, TimeUnit timeUnit) throws Exception {
+
+        ctx.channel().writeAndFlush(cmd);
+
+        Runnable timeoutGuard = () -> {
+
+            if (cmd.isDone() || initializedFuture.isDone()) {
+                return;
+            }
+
+            initializedFuture.completeExceptionally(new RedisCommandTimeoutException(String.format(
+                    "Cannot initialize channel (PING before activate) within %d %s", timeout, timeUnit)));
+        };
+
+        Timeout timeoutHandle = clientResources.timer().newTimeout(t -> {
+
+            if (clientResources.eventExecutorGroup().isShuttingDown()) {
+                timeoutGuard.run();
+                return;
+            }
+
+            clientResources.eventExecutorGroup().submit(timeoutGuard);
+        }, timeout, timeUnit);
+
+        cmd.whenComplete((o, throwable) -> {
+
+            timeoutHandle.cancel();
+
             if (throwable == null) {
                 ctx.fireChannelActive();
                 initializedFuture.complete(true);
             } else {
                 initializedFuture.completeExceptionally(throwable);
             }
-            return null;
         });
 
-        ctx.channel().writeAndFlush(cmd);
     }
 
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java b/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
index ace25e3fea..1515e91bf6 100644
--- a/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,16 +25,17 @@
 import java.security.KeyStore;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
 import javax.net.ssl.*;
 
-import com.lambdaworks.redis.event.EventBus;
 import com.lambdaworks.redis.event.connection.ConnectedEvent;
 import com.lambdaworks.redis.event.connection.ConnectionActivatedEvent;
 import com.lambdaworks.redis.event.connection.DisconnectedEvent;
 import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.protocol.AsyncCommand;
+import com.lambdaworks.redis.resource.ClientResources;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelDuplexHandler;
@@ -75,8 +76,8 @@ protected List<ChannelHandler> buildHandlers() {
     @Override
     public RedisChannelInitializer build() {
 
-        return new SslChannelInitializer(getPingCommandSupplier(), this::buildHandlers, redisURI, clientResources().eventBus(),
-                clientOptions().getSslOptions());
+        return new SslChannelInitializer(getPingCommandSupplier(), this::buildHandlers, redisURI, clientResources(),
+                getTimeout(), getTimeUnit(), clientOptions().getSslOptions());
     }
 
     /**
@@ -87,18 +88,23 @@ static class SslChannelInitializer extends io.netty.channel.ChannelInitializer<C
         private final Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier;
         private final Supplier<List<ChannelHandler>> handlers;
         private final RedisURI redisURI;
-        private final EventBus eventBus;
+        private final ClientResources clientResources;
+        private final long timeout;
+        private final TimeUnit timeUnit;
         private final SslOptions sslOptions;
 
         private volatile CompletableFuture<Boolean> initializedFuture = new CompletableFuture<>();
 
         public SslChannelInitializer(Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier,
-                Supplier<List<ChannelHandler>> handlers, RedisURI redisURI, EventBus eventBus, SslOptions sslOptions) {
+                Supplier<List<ChannelHandler>> handlers, RedisURI redisURI, ClientResources clientResources, long timeout,
+                TimeUnit timeUnit, SslOptions sslOptions) {
 
             this.pingCommandSupplier = pingCommandSupplier;
             this.handlers = handlers;
             this.redisURI = redisURI;
-            this.eventBus = eventBus;
+            this.clientResources = clientResources;
+            this.timeout = timeout;
+            this.timeUnit = timeUnit;
             this.sslOptions = sslOptions;
         }
 
@@ -131,13 +137,13 @@ protected void initChannel(Channel channel) throws Exception {
 
                     @Override
                     public void channelActive(ChannelHandlerContext ctx) throws Exception {
-                        eventBus.publish(new ConnectedEvent(local(ctx), remote(ctx)));
+                        clientResources.eventBus().publish(new ConnectedEvent(local(ctx), remote(ctx)));
                         super.channelActive(ctx);
                     }
 
                     @Override
                     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-                        eventBus.publish(new DisconnectedEvent(local(ctx), remote(ctx)));
+                        clientResources.eventBus().publish(new DisconnectedEvent(local(ctx), remote(ctx)));
                         super.channelInactive(ctx);
                     }
                 });
@@ -178,7 +184,7 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
                             if (event.isSuccess()) {
                                 if (pingCommandSupplier != PlainChannelInitializer.NO_PING) {
                                     pingCommand = pingCommandSupplier.get();
-                                    pingBeforeActivate(pingCommand, initializedFuture, ctx);
+                                    pingBeforeActivate(pingCommand, initializedFuture, ctx, clientResources, timeout, timeUnit);
                                 } else {
                                     ctx.fireChannelActive();
                                 }
@@ -190,7 +196,7 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
                         if (evt instanceof ConnectionEvents.Activated) {
                             if (!initializedFuture.isDone()) {
                                 initializedFuture.complete(true);
-                                eventBus.publish(new ConnectionActivatedEvent(local(ctx), remote(ctx)));
+                                clientResources.eventBus().publish(new ConnectionActivatedEvent(local(ctx), remote(ctx)));
                             }
                         }
 
@@ -234,6 +240,5 @@ private static TrustManagerFactory createTrustManagerFactory(InputStream inputSt
 
             return trustManagerFactory;
         }
-
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java b/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
index a323d35acb..cca2db8f1f 100644
--- a/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
+++ b/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
@@ -20,6 +20,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
+import java.net.ServerSocket;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
@@ -174,6 +175,26 @@ public void pingBeforeConnect() throws Exception {
         }
     }
 
+    @Test(timeout = 2000)
+    public void pingBeforeConnectTimeout() throws Exception {
+
+        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+
+        try (ServerSocket serverSocket = new ServerSocket(0)) {
+
+            RedisURI redisURI = RedisURI.builder().redis(TestSettings.host(), serverSocket.getLocalPort())
+                    .withTimeout(500, TimeUnit.MILLISECONDS).build();
+
+            try {
+                client.connect(redisURI);
+                fail("Missing RedisConnectionException");
+            } catch (RedisException e) {
+                assertThat(e).isInstanceOf(RedisConnectionException.class).hasRootCauseInstanceOf(
+                        RedisCommandTimeoutException.class);
+            }
+        }
+    }
+
     @Test
     public void pingBeforeConnectWithAuthentication() throws Exception {
 
@@ -197,6 +218,32 @@ protected void run(RedisClient client) throws Exception {
         };
     }
 
+    @Test(timeout = 2000)
+    public void pingBeforeConnectWithAuthenticationTimeout() throws Exception {
+
+        new WithPasswordRequired() {
+            @Override
+            protected void run(RedisClient client) throws Exception {
+
+                client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+
+                try (ServerSocket serverSocket = new ServerSocket(0)) {
+
+                    RedisURI redisURI = RedisURI.builder().redis(TestSettings.host(), serverSocket.getLocalPort())
+                            .withPassword(passwd).withTimeout(500, TimeUnit.MILLISECONDS).build();
+
+                    try {
+                        client.connect(redisURI);
+                        fail("Missing RedisConnectionException");
+                    } catch (RedisException e) {
+                        assertThat(e).isInstanceOf(RedisConnectionException.class).hasRootCauseInstanceOf(
+                                RedisCommandTimeoutException.class);
+                    }
+                }
+            }
+        };
+    }
+
     @Test
     public void pingBeforeConnectWithSslAndAuthentication() throws Exception {
 
@@ -234,8 +281,8 @@ protected void run(RedisClient client) throws Exception {
                 try {
                     client.connect(redisURI);
                     fail("Missing RedisConnectionException");
-                } catch (RedisConnectionException e) {
-                    assertThat(e).hasRootCauseInstanceOf(RedisCommandExecutionException.class);
+                } catch (RedisException e) {
+                    assertThat(e).isInstanceOf(RedisConnectionException.class);
                 }
             }
         };
@@ -254,8 +301,9 @@ protected void run(RedisClient client) throws Exception {
                 try {
                     client.connect(redisURI);
                     fail("Missing RedisConnectionException");
-                } catch (RedisConnectionException e) {
-                    assertThat(e).hasRootCauseInstanceOf(RedisCommandExecutionException.class);
+                } catch (RedisException e) {
+                    assertThat(e).isInstanceOf(RedisConnectionException.class).hasRootCauseInstanceOf(
+                            RedisCommandExecutionException.class);
                 }
             }
         };

From 79359f39d2f047145f73f8af04db6391279ca8ae Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 21 Feb 2017 08:56:49 -0500
Subject: [PATCH 156/808] Guard test to run if no network is available

---
 .../cluster/SynchronizingClusterConnectionProviderTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java b/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java
index 6386a20de6..5e82a6659d 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java
@@ -182,7 +182,7 @@ public void connectShouldFail() throws Exception {
 
         stopWatch.stop();
 
-        assertThat(stopWatch.getLastTaskTimeMillis()).isBetween(999L, 1200L);
+        assertThat(stopWatch.getLastTaskTimeMillis()).isBetween(0L, 1200L);
 
         sut.close();
 
@@ -222,7 +222,7 @@ public void connectShouldFailConcurrently() throws Exception {
 
         stopWatch.stop();
 
-        assertThat(stopWatch.getLastTaskTimeMillis()).isBetween(999L, 1300L);
+        assertThat(stopWatch.getLastTaskTimeMillis()).isBetween(0L, 1300L);
 
         sut.close();
         socket.close();

From 6ee3b918dbfe5dd005a401218fc4bc1f17f6dd1e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 21 Feb 2017 20:48:30 -0500
Subject: [PATCH 157/808] Fix StepVerifier expectations

---
 .../redis/commands/reactive/StringReactiveCommandTest.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
index 42366d94ef..2d323f4c2e 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
@@ -46,7 +46,7 @@ public void mget() throws Exception {
         connection.sync().set("key2", value);
 
         Flux<KeyValue<String, String>> mget = connection.reactive().mget(key, "key1", "key2");
-        StepVerifier.create(mget.next()).expectNext(KeyValue.just(key, value)).thenCancel().verify();
+        StepVerifier.create(mget.next()).expectNext(KeyValue.just(key, value)).verifyComplete();
 
         connection.close();
     }
@@ -59,7 +59,7 @@ public void mgetEmpty() throws Exception {
         connection.sync().set(key, value);
 
         Flux<KeyValue<String, String>> mget = connection.reactive().mget("unknown");
-        StepVerifier.create(mget.next()).expectNext(KeyValue.empty("unknown")).thenCancel().verify();
+        StepVerifier.create(mget.next()).expectNext(KeyValue.empty("unknown")).verifyComplete();
 
         connection.close();
     }

From 0f2b20811273a3c1b742d7d02d3998ebb3d16532 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 21 Feb 2017 20:52:44 -0500
Subject: [PATCH 158/808] Disable
 SynchronizingClusterConnectionProviderTest.shouldCloseAsync on non-Mac
 platforms

Test relies on ServerSocket backlog limiting to delay connection. Backlog control works on Mac but not necessarily on other platforms.
---
 .../cluster/SynchronizingClusterConnectionProviderTest.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java b/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java
index 5e82a6659d..19d87e781a 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java
@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
+import static org.junit.Assume.assumeTrue;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -231,6 +232,8 @@ public void connectShouldFailConcurrently() throws Exception {
     @Test
     public void shouldCloseAsync() throws Exception {
 
+        assumeTrue(System.getProperty("os.name").toLowerCase().contains("mac"));
+
         Socket socket = new Socket("localhost", serverSocket.getLocalPort());
 
         ClusterClientOptions clientOptions = ClusterClientOptions.builder()

From f905bbb739b17741864d122161eddcf9b29ca93f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 23 Feb 2017 09:12:03 -0500
Subject: [PATCH 159/808] Fix verifier expectation for multple error signals
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

clientSetname(…) is executed on multiple hosts and each Publisher emits an error signal. flatMap merges multiple errors into a new Throwable, original exceptions are nested as suppressed exceptions.

The test uses now the appropriate expectation.
---
 .../lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
index ef963754ef..1fe21cb9da 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
@@ -174,9 +174,8 @@ public void clientSetname() throws Exception {
     }
 
     @Test
-    @Ignore("Multi-node-execution signals two errors")
     public void clientSetnameRunOnError() throws Exception {
-        StepVerifier.create(commands.clientSetname("not allowed")).expectError(RedisCommandExecutionException.class).verify();
+        StepVerifier.create(commands.clientSetname("not allowed")).expectError().verify();
     }
 
     @Test

From 113fd3b85ccba1c60826ffd71e883068b2cd428a Mon Sep 17 00:00:00 2001
From: "HellyGuo@home" <buffoonguo@gmail.com>
Date: Tue, 14 Mar 2017 23:32:45 +0800
Subject: [PATCH 160/808] Initialize RedisStateMachine.LongProcessor in static
 initializer #481

Move netty version initialization and LongProcessor class resolution from constructor to static initializer. RedisStateMachine instance creation does no longer retrieve the netty version but benefits from caching.
---
 .../redis/protocol/RedisStateMachine.java     | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java b/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
index f0a096b481..e70fdce48a 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
@@ -44,6 +44,25 @@ public class RedisStateMachine {
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(RedisStateMachine.class);
     private static final ByteBuffer QUEUED = buffer("QUEUED");
 
+    private static final boolean USE_NETTY40_BYTEBUF_COMPATIBILITY;
+    private static final Class LONG_PROCESSOR_CLASS;
+
+    static {
+        Version nettyBufferVersion = Version.identify().get("netty-buffer");
+
+        USE_NETTY40_BYTEBUF_COMPATIBILITY =
+                nettyBufferVersion != null && nettyBufferVersion.artifactVersion().startsWith("4.0");
+        if (!USE_NETTY40_BYTEBUF_COMPATIBILITY) {
+            try {
+                LONG_PROCESSOR_CLASS = Class.forName("com.lambdaworks.redis.protocol.RedisStateMachine$Netty41LongProcessor");
+            } catch (ClassNotFoundException e) {
+                throw new RedisException("Cannot create Netty41ToLongProcessor instance", e);
+            }
+        } else {
+            LONG_PROCESSOR_CLASS = null;
+        }
+    }
+
     static class State {
         enum Type {
             SINGLE, ERROR, INTEGER, BULK, MULTI, BYTES
@@ -66,18 +85,10 @@ enum Type {
      */
     public RedisStateMachine() {
 
-        Version nettyBufferVersion = Version.identify().get("netty-buffer");
-
-        boolean useNetty40ByteBufCompatibility = false;
-        if (nettyBufferVersion != null) {
-            useNetty40ByteBufCompatibility = nettyBufferVersion.artifactVersion().startsWith("4.0");
-        }
-
         LongProcessor longProcessor;
-        if (!useNetty40ByteBufCompatibility) {
+        if (!USE_NETTY40_BYTEBUF_COMPATIBILITY) {
             try {
-                longProcessor = (LongProcessor) Class
-                        .forName("com.lambdaworks.redis.protocol.RedisStateMachine$Netty41LongProcessor").newInstance();
+                longProcessor = (LongProcessor) LONG_PROCESSOR_CLASS.newInstance();
             } catch (ReflectiveOperationException e) {
                 throw new RedisException("Cannot create Netty41ToLongProcessor instance", e);
             }

From 74129932de2daba7e806c9d02755086e8493d31f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 14 Mar 2017 20:14:24 +0100
Subject: [PATCH 161/808] Polishing #481

Add author tag. Reformat code.
---
 .../redis/protocol/RedisStateMachine.java           | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java b/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
index e70fdce48a..29841201c0 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@
  *
  * @author Will Glozer
  * @author Mark Paluch
+ * @author Helly Guo
  */
 public class RedisStateMachine {
 
@@ -48,15 +49,16 @@ public class RedisStateMachine {
     private static final Class LONG_PROCESSOR_CLASS;
 
     static {
+
         Version nettyBufferVersion = Version.identify().get("netty-buffer");
 
-        USE_NETTY40_BYTEBUF_COMPATIBILITY =
-                nettyBufferVersion != null && nettyBufferVersion.artifactVersion().startsWith("4.0");
+        USE_NETTY40_BYTEBUF_COMPATIBILITY = nettyBufferVersion != null
+                && nettyBufferVersion.artifactVersion().startsWith("4.0");
         if (!USE_NETTY40_BYTEBUF_COMPATIBILITY) {
             try {
                 LONG_PROCESSOR_CLASS = Class.forName("com.lambdaworks.redis.protocol.RedisStateMachine$Netty41LongProcessor");
             } catch (ClassNotFoundException e) {
-                throw new RedisException("Cannot create Netty41ToLongProcessor instance", e);
+                throw new RedisException("Cannot load Netty41LongProcessor class", e);
             }
         } else {
             LONG_PROCESSOR_CLASS = null;
@@ -86,11 +88,12 @@ enum Type {
     public RedisStateMachine() {
 
         LongProcessor longProcessor;
+
         if (!USE_NETTY40_BYTEBUF_COMPATIBILITY) {
             try {
                 longProcessor = (LongProcessor) LONG_PROCESSOR_CLASS.newInstance();
             } catch (ReflectiveOperationException e) {
-                throw new RedisException("Cannot create Netty41ToLongProcessor instance", e);
+                throw new RedisException("Cannot create Netty41LongProcessor instance", e);
             }
         } else {
             longProcessor = new LongProcessor();

From 1d07f094c91b4c7f17d7fff31169c9ec05904ddd Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 14 Mar 2017 20:46:02 +0100
Subject: [PATCH 162/808] Skip SO_KEEPALIVE and TCP_NODELAY options for Unix
 Domain Socket connections #476

Keep-alive and No-Delay options are not set for Unix Domain Socket connections. Setting these options causes warnings in the log and the options have no effect on the channel.
---
 .../com/lambdaworks/redis/AbstractRedisClient.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
index 11896fcfae..27b12283f2 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
@@ -133,16 +133,15 @@ protected void connectionBuilder(Supplier<SocketAddress> socketAddressSupplier,
 
         redisBootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS,
                 (int) socketOptions.getConnectTimeoutUnit().toMillis(socketOptions.getConnectTimeout()));
-        redisBootstrap.option(ChannelOption.SO_KEEPALIVE, socketOptions.isKeepAlive());
-        redisBootstrap.option(ChannelOption.TCP_NODELAY, socketOptions.isTcpNoDelay());
 
-        if (redisURI == null) {
-            connectionBuilder.timeout(timeout, unit);
-        } else {
-            connectionBuilder.timeout(redisURI.getTimeout(), redisURI.getUnit());
-            connectionBuilder.password(redisURI.getPassword());
+        if (LettuceStrings.isEmpty(redisURI.getSocket())) {
+            redisBootstrap.option(ChannelOption.SO_KEEPALIVE, socketOptions.isKeepAlive());
+            redisBootstrap.option(ChannelOption.TCP_NODELAY, socketOptions.isTcpNoDelay());
         }
 
+        connectionBuilder.timeout(redisURI.getTimeout(), redisURI.getUnit());
+        connectionBuilder.password(redisURI.getPassword());
+
         connectionBuilder.bootstrap(redisBootstrap);
         connectionBuilder.channelGroup(channels).connectionEvents(connectionEvents).timer(timer);
         connectionBuilder.socketAddressSupplier(socketAddressSupplier);

From 63767b8d64c9b77e98c84efa94833dfc3bdd9c8e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 14 Mar 2017 21:01:15 +0100
Subject: [PATCH 163/808] Switch optional dependencies from provided to
 optional #482

---
 pom.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index e3af511d87..01bf57ceaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,6 @@
             <artifactId>netty-transport-native-epoll</artifactId>
             <version>${netty-version}</version>
             <classifier>linux-x86_64</classifier>
-            <scope>provided</scope>
             <optional>true</optional>
         </dependency>
 
@@ -115,7 +114,6 @@
             <artifactId>netty-tcnative</artifactId>
             <version>1.1.33.Fork26</version>
             <classifier>${os.detected.classifier}</classifier>
-            <scope>provided</scope>
             <optional>true</optional>
         </dependency>
 
@@ -164,14 +162,14 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
             <version>${spring-version}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
             <version>${spring-version}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
 
         <!-- CDI -->
@@ -180,21 +178,20 @@
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
             <version>1</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
             <version>1.0</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
             <version>3.0.1</version>
-            <scope>provided</scope>
             <optional>true</optional>
         </dependency>
 

From ef39de1cd4935156878421b65e1a7c70c48375bc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 14 Mar 2017 21:04:25 +0100
Subject: [PATCH 164/808] Polishing #482

Reduce log noise during tests.
---
 pom.xml                                          | 16 ++++++++++++++--
 ...nchronizingClusterConnectionProviderTest.java | 10 ++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 01bf57ceaf..047891d4c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,6 +163,12 @@
             <artifactId>spring-beans</artifactId>
             <version>${spring-version}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -256,17 +262,23 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.8</version>
+            <version>2.8.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.8</version>
+            <version>2.8.1</version>
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>1.7.24</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
diff --git a/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java b/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java
index 19d87e781a..2848006669 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java
+++ b/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java
@@ -203,11 +203,17 @@ public void connectShouldFailConcurrently() throws Exception {
         ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "8.8.8.8", TestSettings.port());
 
         Thread t1 = new Thread(() -> {
-            sut.getConnection(connectionKey);
+            try {
+                sut.getConnection(connectionKey);
+            } catch (Exception e) {
+            }
         });
 
         Thread t2 = new Thread(() -> {
-            sut.getConnection(connectionKey);
+            try {
+                sut.getConnection(connectionKey);
+            } catch (Exception e) {
+            }
         });
 
         t1.start();

From 5444004e26ef371438754860bd222ba1d05f8848 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 14 Mar 2017 21:33:04 +0100
Subject: [PATCH 165/808] Synchronize ClientResources shutdown in client
 shutdown #475
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Synchronize on the ClientResources.close()-Future when shutting down a redis client instance via AbstractRedisClient.shutdown(…). Previously the close future was not used to synchronize shutdown which might leave running threads after leaving AbstractRedisClient.shutdown(…).

Client shutdown may take longer because of synchronization. The client may be shut down faster by calling the appropriate shutdown method with the desired timeout/quiet period.
---
 src/main/java/com/lambdaworks/redis/AbstractRedisClient.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
index 27b12283f2..8355565ee5 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
@@ -344,7 +344,8 @@ public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
             }
 
             if (!sharedResources) {
-                clientResources.shutdown(quietPeriod, timeout, timeUnit);
+                Future<?> groupCloseFuture = clientResources.shutdown(quietPeriod, timeout, timeUnit);
+                closeFutures.add(groupCloseFuture);
             } else {
                 for (EventLoopGroup eventExecutors : eventLoopGroups.values()) {
                     Future<?> groupCloseFuture = clientResources.eventLoopGroupProvider().release(eventExecutors, quietPeriod,

From da8dba40f94c366826112a7423963819c5112f42 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 17 Mar 2017 21:04:56 +0100
Subject: [PATCH 166/808] Fix cummulative metrics collection #487

Collect cummulative metrics if metrics reset is disable. Previously, the histogram was retrieved with getIntervalHistogram() that reset the underlying LatencyStats. Cummulative metrics collection obtains a histogram initially and adds subsequent interval histograms to the summarized histogram. The cummulative instance is used to emit the latency event.
---
 .../DefaultCommandLatencyCollector.java       | 97 +++++++++++++------
 .../DefaultCommandLatencyCollectorTest.java   | 28 ++++--
 2 files changed, 92 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java b/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java
index 46d07a7e90..c310fad35f 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java
+++ b/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,9 +75,7 @@ public void recordCommandLatency(SocketAddress local, SocketAddress remote, Prot
             return;
         }
 
-        CommandLatencyId id = createId(local, remote, commandType);
-        Latencies latencies = latencyMetrics.get(id);
-        if (latencies == null) {
+        Latencies latencies = latencyMetrics.computeIfAbsent(createId(local, remote, commandType), id -> {
 
             PauseDetectorWrapper wrapper = PAUSE_DETECTOR.get();
             if (wrapper == null) {
@@ -88,13 +86,14 @@ public void recordCommandLatency(SocketAddress local, SocketAddress remote, Prot
                 }
             }
 
-            latencies = new Latencies(PAUSE_DETECTOR.get().pauseDetector);
-            latencyMetrics.put(id, latencies);
-        }
+            if (options.resetLatenciesAfterEvent()) {
+                return new Latencies(PAUSE_DETECTOR.get().pauseDetector);
+            }
+            return new CummulativeLatencies(PAUSE_DETECTOR.get().pauseDetector);
+        });
 
         latencies.firstResponse.recordLatency(rangify(firstResponseLatency));
         latencies.completion.recordLatency(rangify(completionLatency));
-
     }
 
     private CommandLatencyId createId(SocketAddress local, SocketAddress remote, ProtocolKeyword commandType) {
@@ -112,6 +111,7 @@ public boolean isEnabled() {
 
     @Override
     public void shutdown() {
+
         if (latencyMetrics != null) {
             latencyMetrics.clear();
             latencyMetrics = null;
@@ -120,22 +120,26 @@ public void shutdown() {
 
     @Override
     public Map<CommandLatencyId, CommandMetrics> retrieveMetrics() {
-        Map<CommandLatencyId, Latencies> copy = new HashMap<>();
-        copy.putAll(latencyMetrics);
+
+        Map<CommandLatencyId, Latencies> copy = new HashMap<>(latencyMetrics);
+
         if (options.resetLatenciesAfterEvent()) {
             latencyMetrics.clear();
         }
 
-        Map<CommandLatencyId, CommandMetrics> latencies = getMetrics(copy);
-        return latencies;
+        return getMetrics(copy);
     }
 
     private Map<CommandLatencyId, CommandMetrics> getMetrics(Map<CommandLatencyId, Latencies> latencyMetrics) {
-        Map<CommandLatencyId, CommandMetrics> latencies = new TreeMap<>();
+
+        Map<CommandLatencyId, CommandMetrics> result = new TreeMap<>();
 
         for (Map.Entry<CommandLatencyId, Latencies> entry : latencyMetrics.entrySet()) {
-            Histogram firstResponse = entry.getValue().firstResponse.getIntervalHistogram();
-            Histogram completion = entry.getValue().completion.getIntervalHistogram();
+
+            Latencies latencies = entry.getValue();
+
+            Histogram firstResponse = latencies.getFirstResponseHistogram();
+            Histogram completion = latencies.getCompletionHistogram();
 
             if (firstResponse.getTotalCount() == 0 && completion.getTotalCount() == 0) {
                 continue;
@@ -147,33 +151,35 @@ private Map<CommandLatencyId, CommandMetrics> getMetrics(Map<CommandLatencyId, L
             CommandMetrics metrics = new CommandMetrics(firstResponse.getTotalCount(), options.targetUnit(),
                     firstResponseLatency, completionLatency);
 
-            latencies.put(entry.getKey(), metrics);
+            result.put(entry.getKey(), metrics);
         }
-        return latencies;
+
+        return result;
     }
 
     private CommandLatency getMetric(Histogram histogram) {
+
         Map<Double, Long> percentiles = getPercentiles(histogram);
 
         TimeUnit timeUnit = options.targetUnit();
-        CommandLatency metric = new CommandLatency(timeUnit.convert(histogram.getMinValue(), TimeUnit.NANOSECONDS),
-                timeUnit.convert(histogram.getMaxValue(), TimeUnit.NANOSECONDS), percentiles);
-
-        return metric;
+        return new CommandLatency(timeUnit.convert(histogram.getMinValue(), TimeUnit.NANOSECONDS), timeUnit.convert(
+                histogram.getMaxValue(), TimeUnit.NANOSECONDS), percentiles);
     }
 
     private Map<Double, Long> getPercentiles(Histogram histogram) {
+
         Map<Double, Long> percentiles = new TreeMap<Double, Long>();
         for (double targetPercentile : options.targetPercentiles()) {
             percentiles.put(targetPercentile,
                     options.targetUnit().convert(histogram.getValueAtPercentile(targetPercentile), TimeUnit.NANOSECONDS));
         }
+
         return percentiles;
     }
 
     /**
      * Returns {@literal true} if HdrUtils and LatencyUtils are available on the class path.
-     * 
+     *
      * @return
      */
     public static boolean isAvailable() {
@@ -182,7 +188,7 @@ public static boolean isAvailable() {
 
     /**
      * Returns a disabled no-op {@link CommandLatencyCollector}.
-     * 
+     *
      * @return
      */
     public static CommandLatencyCollector disabled() {
@@ -211,17 +217,54 @@ public boolean isEnabled() {
 
     private static class Latencies {
 
-        public final LatencyStats firstResponse;
-        public final LatencyStats completion;
+        private final LatencyStats firstResponse;
+        private final LatencyStats completion;
 
-        public Latencies(PauseDetector pauseDetector) {
+        Latencies(PauseDetector pauseDetector) {
             firstResponse = LatencyStats.Builder.create().pauseDetector(pauseDetector).build();
             completion = LatencyStats.Builder.create().pauseDetector(pauseDetector).build();
         }
+
+        public Histogram getFirstResponseHistogram() {
+            return firstResponse.getIntervalHistogram();
+        }
+
+        public Histogram getCompletionHistogram() {
+            return completion.getIntervalHistogram();
+        }
+    }
+
+    private static class CummulativeLatencies extends Latencies {
+
+        private final Histogram firstResponse;
+        private final Histogram completion;
+
+        CummulativeLatencies(PauseDetector pauseDetector) {
+            super(pauseDetector);
+
+            firstResponse = super.firstResponse.getIntervalHistogram();
+            completion = super.completion.getIntervalHistogram();
+        }
+
+        @Override
+        public Histogram getFirstResponseHistogram() {
+
+            firstResponse.add(super.getFirstResponseHistogram());
+            return firstResponse;
+        }
+
+        @Override
+        public Histogram getCompletionHistogram() {
+
+            completion.add(super.getFirstResponseHistogram());
+            return completion;
+        }
     }
 
     private static class PauseDetectorWrapper {
-        public static final AtomicLong counter = new AtomicLong();
+
+        private static final AtomicLong counter = new AtomicLong();
+
         PauseDetector pauseDetector;
 
         public void initialize() {
diff --git a/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java b/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java
index c30d1fc54c..daa957f356 100644
--- a/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java
+++ b/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,19 +35,22 @@
 @RunWith(MockitoJUnitRunner.class)
 public class DefaultCommandLatencyCollectorTest {
 
-    private static CommandLatencyCollectorOptions options = DefaultCommandLatencyCollectorOptions.create();
-
-    private DefaultCommandLatencyCollector sut = new DefaultCommandLatencyCollector(options);
+    private DefaultCommandLatencyCollector sut;
 
     @Test
-    public void shutdown() throws Exception {
+    public void shutdown() {
+
+        sut = new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create());
+
         sut.shutdown();
 
         assertThat(sut.isEnabled()).isFalse();
     }
 
     @Test
-    public void verifyMetrics() throws Exception {
+    public void verifyMetrics() {
+
+        sut = new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create());
 
         setupData();
 
@@ -70,6 +73,19 @@ public void verifyMetrics() throws Exception {
 
         assertThat(metrics.getTimeUnit()).isEqualTo(MICROSECONDS);
 
+        assertThat(sut.retrieveMetrics()).isEmpty();
+    }
+
+    @Test
+    public void verifyCummulativeMetrics() {
+
+        sut = new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.builder()
+                .resetLatenciesAfterEvent(false).build());
+
+        setupData();
+
+        assertThat(sut.retrieveMetrics()).hasSize(1);
+        assertThat(sut.retrieveMetrics()).hasSize(1);
     }
 
     private void setupData() {

From fc069c4f3fede1bf1d710d93956d422814c09ca2 Mon Sep 17 00:00:00 2001
From: Jongyeol Choi <jongyeol.choi@linecorp.com>
Date: Thu, 16 Mar 2017 16:06:19 +0900
Subject: [PATCH 167/808] Add shutdownAsync to AbstractRedisClient #485

Currently, if users call `shutdown()` in RedisFuture handler, it'll be a deadlock.
To solve this, introduced `shutdownAsync()` for RedisClient.
---
 .../redis/AbstractRedisClient.java            | 62 +++++++++++++++----
 .../redis/RedisClientConnectionTest.java      | 33 ++++++++++
 2 files changed, 84 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
index 8355565ee5..127ab19591 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
@@ -18,6 +18,7 @@
 import java.io.Closeable;
 import java.net.SocketAddress;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -313,6 +314,32 @@ public void shutdown() {
      * @param timeUnit the unit of {@code quietPeriod} and {@code timeout}
      */
     public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
+        try {
+            final CompletableFuture<Void> future = shutdownAsync(quietPeriod, timeout, timeUnit);
+            future.get();
+        } catch (Exception e) {
+            throw new RedisException(e);
+        }
+    }
+
+    /**
+     * Shutdown this client and close all open connections asynchronously. The client should be discarded
+     * after calling shutdown. The shutdown has 2 secs quiet time and a timeout of 15 secs.
+     */
+    public CompletableFuture<Void> shutdownAsync() {
+        return shutdownAsync(2, 15, TimeUnit.SECONDS);
+    }
+
+    /**
+     * Shutdown this client and close all open connections asynchronously. The client should be discarded
+     * after calling shutdown.
+     *
+     * @param quietPeriod the quiet period as described in the documentation
+     * @param timeout the maximum amount of time to wait until the executor is shutdown regardless if a task was submitted
+     *        during the quiet period
+     * @param timeUnit the unit of {@code quietPeriod} and {@code timeout}
+     */
+    public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, TimeUnit timeUnit) {
 
         if (shutdown.compareAndSet(false, true)) {
 
@@ -326,7 +353,7 @@ public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
                 closeableResources.remove(closeableResource);
             }
 
-            List<Future<?>> closeFutures = new ArrayList<>();
+            List<CompletableFuture<Void>> closeFutures = new ArrayList<>();
 
             for (Channel c : channels) {
                 ChannelPipeline pipeline = c.pipeline();
@@ -338,29 +365,25 @@ public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
             }
 
             try {
-                closeFutures.add(channels.close());
+                closeFutures.add(toCompletableFuture(channels.close()));
             } catch (Exception e) {
                 logger.debug("Cannot close channels", e);
             }
 
             if (!sharedResources) {
                 Future<?> groupCloseFuture = clientResources.shutdown(quietPeriod, timeout, timeUnit);
-                closeFutures.add(groupCloseFuture);
+                closeFutures.add(toCompletableFuture(groupCloseFuture));
             } else {
                 for (EventLoopGroup eventExecutors : eventLoopGroups.values()) {
                     Future<?> groupCloseFuture = clientResources.eventLoopGroupProvider().release(eventExecutors, quietPeriod,
                             timeout, timeUnit);
-                    closeFutures.add(groupCloseFuture);
+                    closeFutures.add(toCompletableFuture(groupCloseFuture));
                 }
             }
 
-            for (Future<?> future : closeFutures) {
-                try {
-                    future.get();
-                } catch (Exception e) {
-                    throw new RedisException(e);
-                }
-            }
+            return CompletableFuture.allOf(toArray(closeFutures));
+        } else {
+            return CompletableFuture.completedFuture(null);
         }
     }
 
@@ -415,4 +438,21 @@ protected void setOptions(ClientOptions clientOptions) {
         LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
         this.clientOptions = clientOptions;
     }
+
+    private static CompletableFuture<Void> toCompletableFuture(Future<?> future) {
+        final CompletableFuture<Void> promise = new CompletableFuture<>();
+        future.addListener(f -> {
+            if (f.isSuccess()) {
+                promise.complete(null);
+            } else {
+                promise.completeExceptionally(f.cause());
+            }
+        });
+        return promise;
+    }
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public static <T> CompletableFuture<T>[] toArray(Collection<CompletableFuture<T>> collection) {
+        return collection.stream().toArray(CompletableFuture[]::new);
+    }
 }
diff --git a/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java b/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java
index e5bf5c9426..9111f770ed 100644
--- a/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java
@@ -18,7 +18,9 @@
 import static com.lambdaworks.redis.RedisURI.Builder.redis;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -98,6 +100,37 @@ public void connectcodecSentinelMissingHostAndSocketUri() throws Exception {
         client.connect(CODEC, invalidSentinel());
     }
 
+    /*
+     * Client shutdown sync/async test.
+     */
+    @Test(expected = TimeoutException.class)
+    public void shutdownSyncInRedisFutureTest() throws Exception {
+        RedisClient redisClient = RedisClient.create();
+        StatefulRedisConnection<String, String> connection = redisClient.connect(redis(host, port).build());
+        CompletableFuture<String> f = connection.async()
+                                                .get("key1")
+                                                .whenComplete((result, e) -> {
+                                                    connection.close();
+                                                    redisClient.shutdown(); // deadlock.
+                                                })
+                                                .toCompletableFuture();
+        f.get(5, TimeUnit.SECONDS);
+    }
+
+    @Test
+    public void shutdownAsyncInRedisFutureTest() throws Exception {
+        RedisClient redisClient = RedisClient.create();
+        StatefulRedisConnection<String, String> connection = redisClient.connect(redis(host, port).build());
+        CompletableFuture<Void> f = connection.async()
+                                              .get("key1")
+                                              .thenCompose(result -> {
+                                                  connection.close();
+                                                  return redisClient.shutdownAsync();
+                                              })
+                                              .toCompletableFuture();
+        f.get(5, TimeUnit.SECONDS);
+    }
+
     /*
      * Standalone/PubSub Stateful
      */

From b96a1bca5cb006034e1105853fdf0132b515b997 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 19 Mar 2017 17:45:13 +0100
Subject: [PATCH 168/808] Polishing #485

Apply exception translation when synchronizing shutdown future. Inline CompletableFuture array creation. Refactor LettuceFutures to extract exception translation. Disable RedisClientConnectionTest.shutdownSyncInRedisFutureTest because it's non-deterministic. Add author and since JavaDoc tags.
---
 .../redis/AbstractRedisClient.java            | 37 +++++-----
 .../com/lambdaworks/redis/LettuceFutures.java | 68 +++++++++++--------
 .../redis/RedisClientConnectionTest.java      | 37 +++++-----
 3 files changed, 76 insertions(+), 66 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
index 127ab19591..431099ec41 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
+++ b/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
@@ -18,7 +18,6 @@
 import java.io.Closeable;
 import java.net.SocketAddress;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -57,6 +56,7 @@
  * </p>
  *
  * @author Mark Paluch
+ * @author Jongyeol Choi
  * @since 3.0
  * @see ClientResources
  */
@@ -314,30 +314,28 @@ public void shutdown() {
      * @param timeUnit the unit of {@code quietPeriod} and {@code timeout}
      */
     public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
-        try {
-            final CompletableFuture<Void> future = shutdownAsync(quietPeriod, timeout, timeUnit);
-            future.get();
-        } catch (Exception e) {
-            throw new RedisException(e);
-        }
+        LettuceFutures.translateException(() -> shutdownAsync(quietPeriod, timeout, timeUnit).get(), () -> null);
     }
 
     /**
-     * Shutdown this client and close all open connections asynchronously. The client should be discarded
-     * after calling shutdown. The shutdown has 2 secs quiet time and a timeout of 15 secs.
+     * Shutdown this client and close all open connections asynchronously. The client should be discarded after calling
+     * shutdown. The shutdown has 2 secs quiet time and a timeout of 15 secs.
+     *
+     * @since 4.4
      */
     public CompletableFuture<Void> shutdownAsync() {
         return shutdownAsync(2, 15, TimeUnit.SECONDS);
     }
 
     /**
-     * Shutdown this client and close all open connections asynchronously. The client should be discarded
-     * after calling shutdown.
+     * Shutdown this client and close all open connections asynchronously. The client should be discarded after calling
+     * shutdown.
      *
      * @param quietPeriod the quiet period as described in the documentation
      * @param timeout the maximum amount of time to wait until the executor is shutdown regardless if a task was submitted
      *        during the quiet period
      * @param timeUnit the unit of {@code quietPeriod} and {@code timeout}
+     * @since 4.4
      */
     public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, TimeUnit timeUnit) {
 
@@ -356,6 +354,7 @@ public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, Tim
             List<CompletableFuture<Void>> closeFutures = new ArrayList<>();
 
             for (Channel c : channels) {
+
                 ChannelPipeline pipeline = c.pipeline();
 
                 ConnectionWatchdog commandHandler = pipeline.get(ConnectionWatchdog.class);
@@ -381,10 +380,10 @@ public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, Tim
                 }
             }
 
-            return CompletableFuture.allOf(toArray(closeFutures));
-        } else {
-            return CompletableFuture.completedFuture(null);
+            return CompletableFuture.allOf(closeFutures.toArray(new CompletableFuture[closeFutures.size()]));
         }
+
+        return CompletableFuture.completedFuture(null);
     }
 
     protected int getResourceCount() {
@@ -440,7 +439,9 @@ protected void setOptions(ClientOptions clientOptions) {
     }
 
     private static CompletableFuture<Void> toCompletableFuture(Future<?> future) {
-        final CompletableFuture<Void> promise = new CompletableFuture<>();
+
+        CompletableFuture<Void> promise = new CompletableFuture<>();
+
         future.addListener(f -> {
             if (f.isSuccess()) {
                 promise.complete(null);
@@ -448,11 +449,7 @@ private static CompletableFuture<Void> toCompletableFuture(Future<?> future) {
                 promise.completeExceptionally(f.cause());
             }
         });
-        return promise;
-    }
 
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    public static <T> CompletableFuture<T>[] toArray(Collection<CompletableFuture<T>> collection) {
-        return collection.stream().toArray(CompletableFuture[]::new);
+        return promise;
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/LettuceFutures.java b/src/main/java/com/lambdaworks/redis/LettuceFutures.java
index 3478631b23..e1d787009c 100644
--- a/src/main/java/com/lambdaworks/redis/LettuceFutures.java
+++ b/src/main/java/com/lambdaworks/redis/LettuceFutures.java
@@ -15,10 +15,8 @@
  */
 package com.lambdaworks.redis;
 
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.*;
+import java.util.function.Supplier;
 
 /**
  * Utility to {@link #awaitAll(long, TimeUnit, Future[])} futures until they are done and to synchronize future execution using
@@ -42,38 +40,27 @@ private LettuceFutures() {
      * @return {@literal true} if all futures complete in time, otherwise {@literal false}
      */
     public static boolean awaitAll(long timeout, TimeUnit unit, Future<?>... futures) {
-        boolean complete;
 
-        try {
+        return translateException(() -> {
+
             long nanos = unit.toNanos(timeout);
             long time = System.nanoTime();
 
             for (Future<?> f : futures) {
+
                 if (nanos < 0) {
                     return false;
                 }
+
                 f.get(nanos, TimeUnit.NANOSECONDS);
+
                 long now = System.nanoTime();
                 nanos -= now - time;
                 time = now;
             }
 
-            complete = true;
-        } catch (TimeoutException e) {
-            complete = false;
-        } catch (ExecutionException e) {
-            if (e.getCause() instanceof RedisCommandExecutionException) {
-                throw new RedisCommandExecutionException(e.getCause().getMessage(), e.getCause());
-            }
-            throw new RedisException(e.getCause());
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new RedisCommandInterruptedException(e);
-        } catch (Exception e) {
-            throw new RedisCommandExecutionException(e);
-        }
-
-        return complete;
+            return true;
+        }, () -> false);
     }
 
     /**
@@ -89,21 +76,48 @@ public static boolean awaitAll(long timeout, TimeUnit unit, Future<?>... futures
      */
     public static <T> T awaitOrCancel(RedisFuture<T> cmd, long timeout, TimeUnit unit) {
 
-        try {
+        return translateException(() -> {
             if (!cmd.await(timeout, unit)) {
                 cmd.cancel(true);
                 throw new RedisCommandTimeoutException();
             }
-
             return cmd.get();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new RedisCommandInterruptedException(e);
+        }, () -> null);
+    }
+
+    /**
+     * Execute a {@link Callable} applying exception translation.
+     *
+     * @param callable the {@link Callable} to call.
+     * @param otherwiseTimeout {@link Supplier} for a fallback value when a {@link TimeoutException} is caught.
+     * @return result value of the {@link Callable} or {@link Supplier#get()} if a {@link TimeoutException} occurs.
+     * @since 4.4
+     */
+    protected static <T> T translateException(Callable<T> callable, Supplier<T> otherwiseTimeout) {
+
+        try {
+            return callable.call();
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (TimeoutException e) {
+            return otherwiseTimeout.get();
         } catch (ExecutionException e) {
+
             if (e.getCause() instanceof RedisCommandExecutionException) {
                 throw new RedisCommandExecutionException(e.getCause().getMessage(), e.getCause());
             }
+
+            if (e.getCause() instanceof RedisException) {
+                throw (RedisException) e.getCause();
+            }
+
             throw new RedisException(e.getCause());
+        } catch (InterruptedException e) {
+
+            Thread.currentThread().interrupt();
+            throw new RedisCommandInterruptedException(e);
+        } catch (Exception e) {
+            throw new RedisCommandExecutionException(e);
         }
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java b/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java
index 9111f770ed..90e8fdf9d8 100644
--- a/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java
+++ b/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import java.util.concurrent.TimeoutException;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
@@ -34,6 +35,7 @@
 
 /**
  * @author Mark Paluch
+ * @author Jongyeol Choi
  */
 public class RedisClientConnectionTest extends AbstractRedisClientTest {
 
@@ -100,34 +102,31 @@ public void connectcodecSentinelMissingHostAndSocketUri() throws Exception {
         client.connect(CODEC, invalidSentinel());
     }
 
-    /*
-     * Client shutdown sync/async test.
-     */
     @Test(expected = TimeoutException.class)
+    @Ignore("Non-deterministic behavior. Can cause a deadlock")
     public void shutdownSyncInRedisFutureTest() throws Exception {
+
         RedisClient redisClient = RedisClient.create();
         StatefulRedisConnection<String, String> connection = redisClient.connect(redis(host, port).build());
-        CompletableFuture<String> f = connection.async()
-                                                .get("key1")
-                                                .whenComplete((result, e) -> {
-                                                    connection.close();
-                                                    redisClient.shutdown(); // deadlock.
-                                                })
-                                                .toCompletableFuture();
-        f.get(5, TimeUnit.SECONDS);
+
+        CompletableFuture<String> f = connection.async().get("key1").whenComplete((result, e) -> {
+            connection.close();
+            redisClient.shutdown(0, 0, TimeUnit.SECONDS); // deadlock expected.
+            }).toCompletableFuture();
+
+        f.get(1, TimeUnit.SECONDS);
     }
 
     @Test
     public void shutdownAsyncInRedisFutureTest() throws Exception {
+
         RedisClient redisClient = RedisClient.create();
         StatefulRedisConnection<String, String> connection = redisClient.connect(redis(host, port).build());
-        CompletableFuture<Void> f = connection.async()
-                                              .get("key1")
-                                              .thenCompose(result -> {
-                                                  connection.close();
-                                                  return redisClient.shutdownAsync();
-                                              })
-                                              .toCompletableFuture();
+        CompletableFuture<Void> f = connection.async().get("key1").thenCompose(result -> {
+            connection.close();
+            return redisClient.shutdownAsync(0, 0, TimeUnit.SECONDS);
+        }).toCompletableFuture();
+
         f.get(5, TimeUnit.SECONDS);
     }
 

From a0f6fd4e2d5a08056938660d3b6fb4ec35ddafab Mon Sep 17 00:00:00 2001
From: Alexey Plotnik <odiszapc@gmail.com>
Date: Sun, 19 Mar 2017 21:17:21 +1000
Subject: [PATCH 169/808] Update Netty version to 4.1.9 #489

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 047891d4c8..71481c76bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
         <github.site.upload.skip>true</github.site.upload.skip>
         <lettuce-release-version>4.2.2.Final</lettuce-release-version>
         <lettuce3-release-version>3.5.0.Final</lettuce3-release-version>
-        <netty-version>4.1.8.Final</netty-version>
+        <netty-version>4.1.9.Final</netty-version>
         <spring-version>4.3.6.RELEASE</spring-version>
     </properties>
 
@@ -112,7 +112,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative</artifactId>
-            <version>1.1.33.Fork26</version>
+            <version>2.0.0.Final</version>
             <classifier>${os.detected.classifier}</classifier>
             <optional>true</optional>
         </dependency>
@@ -327,7 +327,7 @@
         <profile>
             <id>netty-40</id>
             <properties>
-                <netty-version>4.0.44.Final</netty-version>
+                <netty-version>4.0.45.Final</netty-version>
             </properties>
         </profile>
 

From 5b993b2994027ad6fc561add4a9f4ff80b81abfc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 20 Mar 2017 07:46:57 +0100
Subject: [PATCH 170/808] Rollback to netty-tcnative 1.1.33.Fork26 #489

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 71481c76bf..dd2778b916 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative</artifactId>
-            <version>2.0.0.Final</version>
+            <version>1.1.33.Fork26</version>
             <classifier>${os.detected.classifier}</classifier>
             <optional>true</optional>
         </dependency>

From 1a666814e36d13e859d7a35124ea480d1c343b94 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 20 Mar 2017 20:46:54 +0100
Subject: [PATCH 171/808] Calculate first response metrics from sent time #491

Latency collection calculates firstResponse latency using sent time as reference. First response latency reflects the time between sending and receiving (processing) the first chunk of data for the command.

Previously firstResponse latency was calculated between first response time and command completion.
---
 .../java/com/lambdaworks/redis/protocol/CommandHandler.java    | 2 +-
 .../redis/metrics/DefaultCommandLatencyCollectorTest.java      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java b/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
index 61dc9acc16..23bdc7e8cb 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
+++ b/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
@@ -377,7 +377,7 @@ private void recordLatency(WithLatency withLatency, ProtocolKeyword commandType)
 
         if (withLatency != null && clientResources.commandLatencyCollector().isEnabled() && channel != null && remote() != null) {
 
-            long firstResponseLatency = nanoTime() - withLatency.getFirstResponse();
+            long firstResponseLatency = withLatency.getSent() - withLatency.getFirstResponse();
             long completionLatency = nanoTime() - withLatency.getSent();
 
             clientResources.commandLatencyCollector().recordCommandLatency(local(), remote(), commandType,
diff --git a/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java b/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java
index daa957f356..133cf8e89f 100644
--- a/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java
+++ b/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java
@@ -71,6 +71,9 @@ public void verifyMetrics() {
         assertThat(metrics.getFirstResponse().getMax()).isBetween(290000L, 310000L);
         assertThat(metrics.getCompletion().getPercentiles()).containsKey(50.0d);
 
+        assertThat(metrics.getFirstResponse().getPercentiles().get(50d)).isLessThanOrEqualTo(
+                metrics.getCompletion().getPercentiles().get(50d));
+
         assertThat(metrics.getTimeUnit()).isEqualTo(MICROSECONDS);
 
         assertThat(sut.retrieveMetrics()).isEmpty();

From 3c8d0212c3a840c68ecffc4f129aac8f3034e42e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 1 Apr 2017 22:09:20 +0200
Subject: [PATCH 172/808] Resolve hostnames using netty's DNS resolver #498

Lettuce now defaults to netty's DNS resolution upon connect when using netty 4.1. DnsResolver returns an empty array of addresses to signal an unresolved address. Netty performs a non-blocking DNS lookup.
---
 .../resource/DefaultClientResources.java      | 10 +++++--
 .../redis/resource/DnsResolver.java           | 10 ++++---
 .../redis/resource/DnsResolvers.java          | 29 ++++++++++++++-----
 .../redis/resource/SocketAddressResolver.java | 15 ++++++----
 4 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
index 382e1d4030..2dcb9a3d62 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
@@ -36,6 +36,7 @@
 
 import io.netty.util.HashedWheelTimer;
 import io.netty.util.Timer;
+import io.netty.util.Version;
 import io.netty.util.concurrent.*;
 import io.netty.util.internal.SystemPropertyUtil;
 import io.netty.util.internal.logging.InternalLogger;
@@ -87,6 +88,8 @@ public class DefaultClientResources implements ClientResources {
      */
     public static final Supplier<Delay> DEFAULT_RECONNECT_DELAY = Delay::exponential;
 
+    private static final boolean NETTY_DNS_RESOLVER_SUPPORTED;
+
     static {
         int threads = Math.max(
                 1,
@@ -98,6 +101,9 @@ public class DefaultClientResources implements ClientResources {
         if (logger.isDebugEnabled()) {
             logger.debug("-Dio.netty.eventLoopThreads: {}", threads);
         }
+
+        Version version = Version.identify().get("netty-common");
+        NETTY_DNS_RESOLVER_SUPPORTED = version != null && version.artifactVersion().startsWith("4.1");
     }
 
     private final boolean sharedEventLoopGroupProvider;
@@ -195,7 +201,7 @@ protected DefaultClientResources(Builder builder) {
         }
 
         if (builder.dnsResolver == null) {
-            dnsResolver = DnsResolvers.JVM_DEFAULT;
+            dnsResolver = NETTY_DNS_RESOLVER_SUPPORTED ? DnsResolvers.UNRESOLVED : DnsResolvers.JVM_DEFAULT;
         } else {
             dnsResolver = builder.dnsResolver;
         }
@@ -235,7 +241,7 @@ public static class Builder {
         private CommandLatencyCollectorOptions commandLatencyCollectorOptions = DefaultCommandLatencyCollectorOptions.create();
         private CommandLatencyCollector commandLatencyCollector;
         private EventPublisherOptions commandLatencyPublisherOptions = DefaultEventPublisherOptions.create();
-        private DnsResolver dnsResolver = DnsResolvers.JVM_DEFAULT;
+        private DnsResolver dnsResolver = NETTY_DNS_RESOLVER_SUPPORTED ? DnsResolvers.UNRESOLVED : DnsResolvers.JVM_DEFAULT;
         private Supplier<Delay> reconnectDelay = DEFAULT_RECONNECT_DELAY;
 
         private Builder() {
diff --git a/src/main/java/com/lambdaworks/redis/resource/DnsResolver.java b/src/main/java/com/lambdaworks/redis/resource/DnsResolver.java
index 5412201d31..a2079215a9 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DnsResolver.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DnsResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 /**
  * Users may implement this interface to override the normal DNS lookup offered by the OS.
- * 
+ *
  * @author Mark Paluch
  * @since 4.2
  */
@@ -28,9 +28,11 @@ public interface DnsResolver {
 
     /**
      * Returns the IP address for the specified host name.
-     * 
+     *
      * @param host the hostname, must not be empty or {@literal null}.
-     * @return array of one or more {@link InetAddress adresses}
+     * @return array of one or more {@link InetAddress adresses}. An empty array indicates that DNS resolution is not supported
+     *         by this {@link DnsResolver} and should happen by netty, see
+     *         {@link java.net.InetSocketAddress#createUnresolved(String, int)}.
      * @throws UnknownHostException if the given host is not recognized or the associated IP address cannot be used to build an
      *         {@link InetAddress} instance
      */
diff --git a/src/main/java/com/lambdaworks/redis/resource/DnsResolvers.java b/src/main/java/com/lambdaworks/redis/resource/DnsResolvers.java
index 8d971ef01f..72ebee256d 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DnsResolvers.java
+++ b/src/main/java/com/lambdaworks/redis/resource/DnsResolvers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,8 @@
 import java.net.UnknownHostException;
 
 /**
- *
  * Predefined DNS resolvers.
- * 
+ *
  * @author Mark Paluch
  * @since 4.2
  */
@@ -30,10 +29,24 @@ public enum DnsResolvers implements DnsResolver {
     /**
      * Java VM default resolver.
      */
-    JVM_DEFAULT;
+    JVM_DEFAULT {
+        @Override
+        public InetAddress[] resolve(String host) throws UnknownHostException {
+            return InetAddress.getAllByName(host);
+        }
+    },
+
+    /**
+     * Non-resolving {@link DnsResolver}. Returns an empty {@link InetAddress} to indicate an unresolved address.
+     *
+     * @see java.net.InetSocketAddress#createUnresolved(String, int)
+     * @since 4.4
+     */
+    UNRESOLVED {
+        @Override
+        public InetAddress[] resolve(String host) throws UnknownHostException {
+            return new InetAddress[0];
+        }
+    };
 
-    @Override
-    public InetAddress[] resolve(String host) throws UnknownHostException {
-        return InetAddress.getAllByName(host);
-    }
 }
diff --git a/src/main/java/com/lambdaworks/redis/resource/SocketAddressResolver.java b/src/main/java/com/lambdaworks/redis/resource/SocketAddressResolver.java
index 35ed36580a..fb8deb8b21 100644
--- a/src/main/java/com/lambdaworks/redis/resource/SocketAddressResolver.java
+++ b/src/main/java/com/lambdaworks/redis/resource/SocketAddressResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,14 +24,14 @@
 
 /**
  * Resolves a {@link com.lambdaworks.redis.RedisURI} to a {@link java.net.SocketAddress}.
- * 
+ *
  * @author Mark Paluch
  */
 public class SocketAddressResolver {
 
     /**
      * Resolves a {@link com.lambdaworks.redis.RedisURI} to a {@link java.net.SocketAddress}.
-     * 
+     *
      * @param redisURI must not be {@literal null}
      * @param dnsResolver must not be {@literal null}
      * @return the resolved {@link SocketAddress}
@@ -43,8 +43,13 @@ public static SocketAddress resolve(RedisURI redisURI, DnsResolver dnsResolver)
         }
 
         try {
-            InetAddress inetAddress = dnsResolver.resolve(redisURI.getHost())[0];
-            return new InetSocketAddress(inetAddress, redisURI.getPort());
+            InetAddress[] inetAddress = dnsResolver.resolve(redisURI.getHost());
+
+            if (inetAddress.length == 0) {
+                return InetSocketAddress.createUnresolved(redisURI.getHost(), redisURI.getPort());
+            }
+
+            return new InetSocketAddress(inetAddress[0], redisURI.getPort());
         } catch (UnknownHostException e) {
             return redisURI.getResolvedAddress();
         }

From 8aed3e71c9a2fa7fdfaad2e6dd97e6f729f8f096 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 7 Mar 2017 19:40:46 +0100
Subject: [PATCH 173/808] Move to lettuce.io #493

Rename artifactId to lettuce-core with groupId io.lettuce and switch snapshot versioning scheme from -SNAPSHOT to .BUILD-SNAPSHOT. Relocate packages from com.lambdaworks.redis to io.lettuce.core.
---
 README.md                                     |  19 ++-
 pom.xml                                       |  91 ++------------
 src/assembly/bin.xml                          |   4 +-
 .../com/lambdaworks/codec/package-info.java   |   4 -
 .../redis/cluster/api/package-info.java       |   4 -
 .../redis/cluster/event/package-info.java     |   5 -
 .../redis/cluster/package-info.java           |   4 -
 .../redis/dynamic/intercept/package-info.java |   4 -
 .../redis/dynamic/output/package-info.java    |   4 -
 .../redis/dynamic/package-info.java           |   4 -
 .../redis/dynamic/parameter/package-info.java |   4 -
 .../redis/dynamic/segment/package-info.java   |   4 -
 .../redis/event/connection/package-info.java  |   5 -
 .../redis/event/metrics/package-info.java     |   5 -
 .../redis/masterslave/package-info.java       |   5 -
 .../com/lambdaworks/redis/package-info.java   |   4 -
 .../redis/sentinel/api/package-info.java      |   4 -
 .../redis/support/package-info.java           |   5 -
 .../core}/AbstractRedisAsyncCommands.java     |  20 ++--
 .../lettuce/core}/AbstractRedisClient.java    |  12 +-
 .../core}/AbstractRedisReactiveCommands.java  |  20 ++--
 .../lettuce/core}/BitFieldArgs.java           |  14 +--
 .../lettuce/core}/ChannelGroupListener.java   |   4 +-
 .../lettuce/core}/ClientOptions.java          |  32 ++---
 .../lettuce/core}/CloseEvents.java            |   4 +-
 .../lettuce/core}/CompositeArgument.java      |   6 +-
 .../lettuce/core}/ConnectionBuilder.java      |  10 +-
 .../lettuce/core}/ConnectionEventTrigger.java |   6 +-
 .../lettuce/core}/ConnectionEvents.java       |   4 +-
 .../lettuce/core}/ConnectionFuture.java       |   4 +-
 .../lettuce/core}/ConnectionId.java           |   8 +-
 .../lettuce/core}/ConnectionPoint.java        |   2 +-
 .../core}/DefaultConnectionFuture.java        |   2 +-
 .../lettuce/core}/EpollProvider.java          |  12 +-
 .../core}/FutureSyncInvocationHandler.java    |   8 +-
 .../redis => io/lettuce/core}/GeoArgs.java    |  30 ++---
 .../lettuce/core}/GeoCoordinates.java         |  10 +-
 .../lettuce/core}/GeoRadiusStoreArgs.java     |  10 +-
 .../redis => io/lettuce/core}/GeoWithin.java  |   4 +-
 .../lettuce/core}/JavaRuntime.java            |   6 +-
 .../lettuce/core}/KeyScanCursor.java          |   4 +-
 .../redis => io/lettuce/core}/KeyValue.java   |   4 +-
 .../redis => io/lettuce/core}/KillArgs.java   |   8 +-
 .../lettuce/core}/LettuceFutures.java         |   2 +-
 .../lettuce/core}/LettuceStrings.java         |  22 ++--
 .../redis => io/lettuce/core}/Limit.java      |   2 +-
 .../lettuce/core}/MapScanCursor.java          |   6 +-
 .../lettuce/core}/MigrateArgs.java            |  10 +-
 .../core}/PlainChannelInitializer.java        |  16 +--
 .../redis => io/lettuce/core}/Range.java      |  18 +--
 .../redis => io/lettuce/core}/ReadFrom.java   |   4 +-
 .../lettuce/core}/ReadFromImpl.java           |   8 +-
 .../lettuce/core}/RedisAsyncCommandsImpl.java |  10 +-
 .../lettuce/core}/RedisChannelHandler.java    |  10 +-
 .../core}/RedisChannelInitializer.java        |   4 +-
 .../core}/RedisChannelInitializerImpl.java    |   4 +-
 .../lettuce/core}/RedisChannelWriter.java     |   6 +-
 .../lettuce/core}/RedisClient.java            |  42 +++----
 .../lettuce/core}/RedisCommandBuilder.java    |  24 ++--
 .../core}/RedisCommandExecutionException.java |   2 +-
 .../RedisCommandInterruptedException.java     |   4 +-
 .../core}/RedisCommandTimeoutException.java   |   4 +-
 .../core}/RedisConnectionException.java       |   4 +-
 .../core}/RedisConnectionStateAdapter.java    |   4 +-
 .../core}/RedisConnectionStateListener.java   |  14 +--
 .../lettuce/core}/RedisException.java         |   4 +-
 .../lettuce/core}/RedisFuture.java            |   2 +-
 .../lettuce/core}/RedisPublisher.java         |  20 ++--
 .../core}/RedisReactiveCommandsImpl.java      |  10 +-
 .../redis => io/lettuce/core}/RedisURI.java   |  70 +++++------
 .../redis => io/lettuce/core}/ScanArgs.java   |  20 ++--
 .../redis => io/lettuce/core}/ScanCursor.java |  16 +--
 .../lettuce/core}/ScanIterator.java           |  18 +--
 .../lettuce/core}/ScoredValue.java            |   6 +-
 .../lettuce/core}/ScoredValueScanCursor.java  |   6 +-
 .../lettuce/core}/ScriptOutputType.java       |  10 +-
 .../redis => io/lettuce/core}/SetArgs.java    |   6 +-
 .../lettuce/core}/SocketOptions.java          |  12 +-
 .../redis => io/lettuce/core}/SortArgs.java   |  14 +--
 .../lettuce/core}/SslConnectionBuilder.java   |  20 ++--
 .../redis => io/lettuce/core}/SslOptions.java |   4 +-
 .../core}/StatefulRedisConnectionImpl.java    |  24 ++--
 .../lettuce/core}/StreamScanCursor.java       |   4 +-
 .../lettuce/core}/TransactionResult.java      |   2 +-
 .../redis => io/lettuce/core}/Transports.java |   4 +-
 .../redis => io/lettuce/core}/Value.java      |  10 +-
 .../lettuce/core}/ValueScanCursor.java        |   4 +-
 .../redis => io/lettuce/core}/ZAddArgs.java   |   6 +-
 .../redis => io/lettuce/core}/ZStoreArgs.java |   8 +-
 .../lettuce/core}/api/StatefulConnection.java |   6 +-
 .../core}/api/StatefulRedisConnection.java    |  20 ++--
 .../api/async/BaseRedisAsyncCommands.java     |  34 +++---
 .../core}/api/async/RedisAsyncCommands.java   |  16 +--
 .../api/async/RedisGeoAsyncCommands.java      |   6 +-
 .../api/async/RedisHLLAsyncCommands.java      |   8 +-
 .../api/async/RedisHashAsyncCommands.java     |  64 +++++-----
 .../api/async/RedisKeyAsyncCommands.java      |  98 +++++++--------
 .../api/async/RedisListAsyncCommands.java     |  48 ++++----
 .../async/RedisScriptingAsyncCommands.java    |  28 ++---
 .../api/async/RedisServerAsyncCommands.java   |  78 ++++++------
 .../api/async/RedisSetAsyncCommands.java      |  72 +++++------
 .../async/RedisSortedSetAsyncCommands.java    |  50 ++++----
 .../api/async/RedisStringAsyncCommands.java   |  14 +--
 .../RedisTransactionalAsyncCommands.java      |  12 +-
 .../lettuce/core}/api/async/package-info.java |   2 +-
 .../lettuce/core}/api/package-info.java       |   2 +-
 .../reactive/BaseRedisReactiveCommands.java   |  32 ++---
 .../reactive/RedisGeoReactiveCommands.java    |   6 +-
 .../reactive/RedisHLLReactiveCommands.java    |   6 +-
 .../reactive/RedisHashReactiveCommands.java   |  64 +++++-----
 .../reactive/RedisKeyReactiveCommands.java    |  98 +++++++--------
 .../reactive/RedisListReactiveCommands.java   |  46 +++----
 .../api/reactive/RedisReactiveCommands.java   |  14 +--
 .../RedisScriptingReactiveCommands.java       |  26 ++--
 .../reactive/RedisServerReactiveCommands.java |  76 ++++++------
 .../reactive/RedisSetReactiveCommands.java    |  78 ++++++------
 .../RedisSortedSetReactiveCommands.java       |  50 ++++----
 .../reactive/RedisStringReactiveCommands.java |  14 +--
 .../RedisTransactionalReactiveCommands.java   |  10 +-
 .../core}/api/reactive/package-info.java      |   2 +-
 .../core}/api/sync/BaseRedisCommands.java     |  32 ++---
 .../lettuce/core}/api/sync/RedisCommands.java |  16 +--
 .../core}/api/sync/RedisGeoCommands.java      |   6 +-
 .../core}/api/sync/RedisHLLCommands.java      |   6 +-
 .../core}/api/sync/RedisHashCommands.java     |  64 +++++-----
 .../core}/api/sync/RedisKeyCommands.java      |  98 +++++++--------
 .../core}/api/sync/RedisListCommands.java     |  46 +++----
 .../api/sync/RedisScriptingCommands.java      |  26 ++--
 .../core}/api/sync/RedisServerCommands.java   |  76 ++++++------
 .../core/api/sync}/RedisSetCommands.java      |  79 ++++++------
 .../api/sync/RedisSortedSetCommands.java      |  50 ++++----
 .../core}/api/sync/RedisStringCommands.java   |  12 +-
 .../api/sync/RedisTransactionalCommands.java  |  10 +-
 .../lettuce/core}/api/sync/package-info.java  |   2 +-
 .../AbstractClusterNodeConnectionFactory.java |  14 +--
 .../core}/cluster/AbstractNodeSelection.java  |  10 +-
 .../core}/cluster/AsyncExecutionsImpl.java    |   6 +-
 .../core}/cluster/ClusterClientOptions.java   |  24 ++--
 .../lettuce/core}/cluster/ClusterCommand.java |  16 +--
 .../cluster/ClusterConnectionProvider.java    |  30 ++---
 .../ClusterDistributionChannelWriter.java     |  18 +--
 .../core}/cluster/ClusterEventListener.java   |   2 +-
 .../ClusterFutureSyncInvocationHandler.java   |  22 ++--
 .../cluster/ClusterNodeConnectionFactory.java |  10 +-
 .../core}/cluster/ClusterNodeEndpoint.java    |  16 +--
 .../ClusterPubSubConnectionProvider.java      |  24 ++--
 .../core}/cluster/ClusterScanSupport.java     |  18 +--
 .../ClusterTopologyRefreshOptions.java        |  16 +--
 .../ClusterTopologyRefreshScheduler.java      |   4 +-
 .../core}/cluster/DynamicNodeSelection.java   |  10 +-
 .../core}/cluster/MultiNodeExecution.java     |  24 ++--
 .../NodeSelectionInvocationHandler.java       |  18 +--
 .../core}/cluster/PartitionAccessor.java      |   6 +-
 .../core}/cluster/PartitionsConsensus.java    |  14 +--
 .../cluster/PartitionsConsensusImpl.java      |  10 +-
 .../core}/cluster/PipelinedRedisFuture.java   |   6 +-
 .../PooledClusterConnectionProvider.java      |  24 ++--
 .../core}/cluster/PubSubClusterEndpoint.java  |  14 +--
 .../core}/cluster/ReactiveExecutionsImpl.java |   6 +-
 .../core}/cluster/ReadOnlyCommands.java       |   6 +-
 .../core}/cluster/ReconnectEventListener.java |   6 +-
 ...RedisAdvancedClusterAsyncCommandsImpl.java |  54 ++++-----
 ...isAdvancedClusterReactiveCommandsImpl.java |  32 ++---
 .../core}/cluster/RedisClusterClient.java     |  56 ++++-----
 .../RedisClusterPubSubAsyncCommandsImpl.java  |  26 ++--
 ...edisClusterPubSubReactiveCommandsImpl.java |  26 ++--
 .../core}/cluster/RedisClusterURIUtil.java    |  10 +-
 .../lettuce/core}/cluster/RoundRobin.java     |   6 +-
 .../RoundRobinSocketAddressSupplier.java      |  10 +-
 .../lettuce/core}/cluster/SlotHash.java       |  10 +-
 .../StatefulRedisClusterConnectionImpl.java   |  40 +++----
 ...tefulRedisClusterPubSubConnectionImpl.java |  42 +++----
 .../core}/cluster/StaticNodeSelection.java    |  10 +-
 .../core}/cluster/SyncExecutionsImpl.java     |   6 +-
 ...ynchronizingClusterConnectionProvider.java |  16 +--
 .../cluster/api/NodeSelectionSupport.java     |   8 +-
 .../api/StatefulRedisClusterConnection.java   |  30 ++---
 .../cluster/api/async/AsyncExecutions.java    |   4 +-
 .../cluster/api/async/AsyncNodeSelection.java |   8 +-
 .../async/BaseNodeSelectionAsyncCommands.java |  30 ++---
 .../api/async/NodeSelectionAsyncCommands.java |   6 +-
 .../async/NodeSelectionGeoAsyncCommands.java  |   6 +-
 .../async/NodeSelectionHLLAsyncCommands.java  |   6 +-
 .../async/NodeSelectionHashAsyncCommands.java |  64 +++++-----
 .../async/NodeSelectionKeyAsyncCommands.java  |  98 +++++++--------
 .../async/NodeSelectionListAsyncCommands.java |  46 +++----
 .../NodeSelectionScriptingAsyncCommands.java  |  24 ++--
 .../NodeSelectionServerAsyncCommands.java     |  74 ++++++------
 .../async/NodeSelectionSetAsyncCommands.java  |  78 ++++++------
 .../NodeSelectionSortedSetAsyncCommands.java  |  50 ++++----
 .../NodeSelectionStringAsyncCommands.java     |  12 +-
 .../RedisAdvancedClusterAsyncCommands.java    |  22 ++--
 .../api/async/RedisClusterAsyncCommands.java  |  22 ++--
 .../core}/cluster/api/async/package-info.java |   2 +-
 .../core/cluster/api/package-info.java        |   4 +
 .../api/reactive/ReactiveExecutions.java      |   6 +-
 .../RedisAdvancedClusterReactiveCommands.java |  18 +--
 .../RedisClusterReactiveCommands.java         |  18 +--
 .../cluster/api/reactive/package-info.java    |   2 +-
 .../api/sync/BaseNodeSelectionCommands.java   |  24 ++--
 .../core}/cluster/api/sync/Executions.java    |   6 +-
 .../core}/cluster/api/sync/NodeSelection.java |   8 +-
 .../api/sync/NodeSelectionCommands.java       |   6 +-
 .../api/sync/NodeSelectionGeoCommands.java    |   6 +-
 .../api/sync/NodeSelectionHLLCommands.java    |   6 +-
 .../api/sync/NodeSelectionHashCommands.java   |  64 +++++-----
 .../api/sync/NodeSelectionKeyCommands.java    |  98 +++++++--------
 .../api/sync/NodeSelectionListCommands.java   |  46 +++----
 .../sync/NodeSelectionScriptingCommands.java  |  24 ++--
 .../api/sync/NodeSelectionServerCommands.java |  74 ++++++------
 .../api/sync/NodeSelectionSetCommands.java    |  78 ++++++------
 .../sync/NodeSelectionSortedSetCommands.java  |  50 ++++----
 .../api/sync/NodeSelectionStringCommands.java |  12 +-
 .../sync/RedisAdvancedClusterCommands.java    |  38 +++---
 .../api/sync/RedisClusterCommands.java        |  48 ++++----
 .../core}/cluster/api/sync/package-info.java  |   2 +-
 .../event/ClusterTopologyChangedEvent.java    |  14 +--
 .../core/cluster/event/package-info.java      |   5 +
 .../partitions/ClusterPartitionParser.java    |  16 +--
 .../cluster/models/partitions/Partitions.java |  10 +-
 .../models/partitions/RedisClusterNode.java   |  48 ++++----
 .../models/partitions/package-info.java       |   2 +-
 .../models/slots/ClusterSlotRange.java        |  10 +-
 .../models/slots/ClusterSlotsParser.java      |  12 +-
 .../cluster/models/slots/package-info.java    |   2 +-
 .../io/lettuce/core/cluster/package-info.java |   4 +
 .../pubsub/RedisClusterPubSubAdapter.java     |   4 +-
 .../pubsub/RedisClusterPubSubListener.java    |  10 +-
 .../StatefulRedisClusterPubSubConnection.java |  24 ++--
 .../NodeSelectionPubSubAsyncCommands.java     |   6 +-
 .../api/async/PubSubAsyncNodeSelection.java   |   8 +-
 .../RedisClusterPubSubAsyncCommands.java      |   8 +-
 .../NodeSelectionPubSubReactiveCommands.java  |   4 +-
 .../reactive/PubSubReactiveNodeSelection.java |   8 +-
 .../RedisClusterPubSubReactiveCommands.java   |   8 +-
 .../api/sync/NodeSelectionPubSubCommands.java |   4 +-
 .../pubsub/api/sync/PubSubNodeSelection.java  |   6 +-
 .../api/sync/RedisClusterPubSubCommands.java  |   8 +-
 .../cluster/topology/AsyncConnections.java    |   8 +-
 .../topology/ClusterTopologyRefresh.java      |  16 +--
 .../core}/cluster/topology/Connections.java   |  18 +--
 .../topology/NodeConnectionFactory.java       |   8 +-
 .../cluster/topology/NodeTopologyView.java    |  12 +-
 .../cluster/topology/NodeTopologyViews.java   |   8 +-
 .../topology/RedisClusterNodeSnapshot.java    |   4 +-
 .../cluster/topology/RefreshFutures.java      |   2 +-
 .../core}/cluster/topology/Requests.java      |   6 +-
 .../cluster/topology/TimedAsyncCommand.java   |   6 +-
 .../cluster/topology/TopologyComparators.java |  14 +--
 .../core}/cluster/topology/package-info.java  |   2 +-
 .../lettuce/core}/codec/Base16.java           |  10 +-
 .../lettuce/core}/codec/ByteArrayCodec.java   |   4 +-
 .../core}/codec/ByteBufferInputStream.java    |   2 +-
 .../lettuce/core}/codec/CRC16.java            |   6 +-
 .../lettuce/core}/codec/CompressionCodec.java |  10 +-
 .../lettuce/core}/codec/RedisCodec.java       |   2 +-
 .../lettuce/core}/codec/StringCodec.java      |  10 +-
 .../lettuce/core}/codec/ToByteBufEncoder.java |   4 +-
 .../lettuce/core}/codec/Utf8StringCodec.java  |   6 +-
 .../lettuce/core}/codec/package-info.java     |   2 +-
 .../core}/dynamic/AsyncExecutableCommand.java |  16 +--
 .../AsyncExecutableCommandLookupStrategy.java |  10 +-
 .../core}/dynamic/BatchExecutableCommand.java |  20 ++--
 .../BatchExecutableCommandLookupStrategy.java |  14 +--
 .../lettuce/core}/dynamic/BatchTasks.java     |   6 +-
 .../lettuce/core}/dynamic/Batcher.java        |  10 +-
 .../CodecAwareMethodParametersAccessor.java   |  14 +--
 .../dynamic/CommandCreationException.java     |   8 +-
 .../lettuce/core}/dynamic/CommandFactory.java |   6 +-
 .../core}/dynamic/CommandFactoryResolver.java |   6 +-
 .../lettuce/core}/dynamic/CommandMethod.java  |  20 ++--
 .../dynamic/CommandMethodSyntaxException.java |   6 +-
 .../core}/dynamic/CommandMethodVerifier.java  |   8 +-
 .../dynamic/CommandSegmentCommandFactory.java |  30 ++---
 .../lettuce/core}/dynamic/Commands.java       |   4 +-
 .../core}/dynamic/ConversionService.java      |  12 +-
 .../core}/dynamic/ConvertingCommand.java      |   4 +-
 .../core}/dynamic/DeclaredCommandMethod.java  |  30 ++---
 .../dynamic/DefaultCommandMethodVerifier.java |  18 +--
 .../DefaultMethodParametersAccessor.java      |  18 +--
 .../dynamic/DefaultRedisCommandsMetadata.java |   8 +-
 .../core}/dynamic/ExecutableCommand.java      |   8 +-
 .../ExecutableCommandLookupStrategy.java      |   6 +-
 ...xecutableCommandLookupStrategySupport.java |  14 +--
 .../core}/dynamic/ParameterBinder.java        |  22 ++--
 .../ReactiveCommandSegmentCommandFactory.java |  18 +--
 .../dynamic/ReactiveExecutableCommand.java    |   6 +-
 ...activeExecutableCommandLookupStrategy.java |  18 +--
 .../core}/dynamic/ReactiveTypeAdapters.java   |   8 +-
 .../lettuce/core}/dynamic/ReactiveTypes.java  |   8 +-
 .../core}/dynamic/RedisCommandFactory.java    |  52 ++++----
 .../core}/dynamic/RedisCommandsMetadata.java  |   6 +-
 .../lettuce/core}/dynamic/SimpleBatcher.java  |  12 +-
 .../core}/dynamic/annotation/Command.java     |  12 +-
 .../dynamic/annotation/CommandNaming.java     |   2 +-
 .../lettuce/core}/dynamic/annotation/Key.java |   4 +-
 .../core}/dynamic/annotation/Param.java       |   4 +-
 .../core}/dynamic/annotation/Value.java       |   2 +-
 .../dynamic/annotation/package-info.java      |   2 +-
 .../core}/dynamic/batch/BatchException.java   |  10 +-
 .../core}/dynamic/batch/BatchExecutor.java    |   6 +-
 .../core}/dynamic/batch/BatchSize.java        |  14 +--
 .../core}/dynamic/batch/CommandBatching.java  |  22 ++--
 .../codec/AnnotationRedisCodecResolver.java   |  36 +++---
 .../dynamic/codec/RedisCodecResolver.java     |   8 +-
 .../lettuce/core}/dynamic/domain/Timeout.java |  10 +-
 .../core}/dynamic/domain/package-info.java    |   2 +-
 .../intercept/DefaultMethodInvocation.java    |   4 +-
 .../intercept/InvocationProxyFactory.java     |   6 +-
 .../dynamic/intercept/MethodInterceptor.java  |   4 +-
 .../intercept/MethodInterceptorChain.java     |   2 +-
 .../dynamic/intercept/MethodInvocation.java   |   4 +-
 .../core/dynamic/intercept/package-info.java  |   4 +
 .../CodecAwareOutputFactoryResolver.java      |  10 +-
 .../dynamic/output/CommandOutputFactory.java  |   8 +-
 .../output/CommandOutputFactoryResolver.java  |  16 +--
 .../output/CommandOutputResolverSupport.java  |   8 +-
 .../core}/dynamic/output/OutputRegistry.java  |  24 ++--
 ...tRegistryCommandOutputFactoryResolver.java |  12 +-
 .../core}/dynamic/output/OutputSelector.java  |  14 +--
 .../core}/dynamic/output/OutputType.java      |  24 ++--
 .../core}/dynamic/output/VoidOutput.java      |   8 +-
 .../core/dynamic/output/package-info.java     |   4 +
 .../io/lettuce/core/dynamic/package-info.java |   4 +
 .../ExecutionSpecificParameters.java          |  10 +-
 .../parameter/MethodParametersAccessor.java   |  10 +-
 .../core}/dynamic/parameter/Parameter.java    |  16 +--
 .../core}/dynamic/parameter/Parameters.java   |  10 +-
 .../core/dynamic/parameter/package-info.java  |   4 +
 .../AnnotationCommandSegmentFactory.java      |  18 +--
 .../core}/dynamic/segment/CommandSegment.java |  10 +-
 .../segment/CommandSegmentFactory.java        |   8 +-
 .../dynamic/segment/CommandSegments.java      |  10 +-
 .../core/dynamic/segment/package-info.java    |   4 +
 .../AnnotationParameterNameDiscoverer.java    |   6 +-
 .../dynamic/support/ClassTypeInformation.java |  16 +--
 .../CompositeParameterNameDiscoverer.java     |   4 +-
 .../support/GenericArrayTypeInformation.java  |   4 +-
 .../dynamic/support/GenericTypeResolver.java  |   4 +-
 .../dynamic/support/MethodParameter.java      |  54 ++++-----
 .../support/ParameterNameDiscoverer.java      |   6 +-
 .../support/ParametrizedTypeInformation.java  |   6 +-
 .../ParentTypeAwareTypeInformation.java       |   6 +-
 .../dynamic/support/ReflectionUtils.java      |  38 +++---
 .../core}/dynamic/support/ResolvableType.java |  98 +++++++--------
 ...dardReflectionParameterNameDiscoverer.java |   2 +-
 .../core}/dynamic/support/TypeDiscoverer.java |  12 +-
 .../dynamic/support/TypeInformation.java      |  28 ++---
 .../support/TypeVariableTypeInformation.java  |   8 +-
 .../core}/dynamic/support/TypeWrapper.java    |   6 +-
 .../support/WildcardTypeInformation.java      |   2 +-
 .../core}/dynamic/support/package-info.java   |   2 +-
 .../lettuce/core}/event/DefaultEventBus.java  |   4 +-
 .../event/DefaultEventPublisherOptions.java   |  10 +-
 .../lettuce/core}/event/Event.java            |   4 +-
 .../lettuce/core}/event/EventBus.java         |   4 +-
 .../core}/event/EventPublisherOptions.java    |   6 +-
 .../event/connection/ConnectedEvent.java      |   4 +-
 .../connection/ConnectionActivatedEvent.java  |   6 +-
 .../ConnectionDeactivatedEvent.java           |   4 +-
 .../event/connection/ConnectionEvent.java     |   8 +-
 .../connection/ConnectionEventSupport.java    |   8 +-
 .../event/connection/DisconnectedEvent.java   |   4 +-
 .../core/event/connection/package-info.java   |   5 +
 .../event/metrics/CommandLatencyEvent.java    |  12 +-
 .../DefaultCommandLatencyEventPublisher.java  |  10 +-
 .../event/metrics/MetricEventPublisher.java   |   8 +-
 .../core/event/metrics/package-info.java      |   5 +
 .../lettuce/core}/event/package-info.java     |   2 +-
 .../internal/AbstractInvocationHandler.java   |  12 +-
 .../lettuce/core}/internal/HostAndPort.java   |  10 +-
 .../lettuce/core}/internal/LettuceAssert.java |   6 +-
 .../core}/internal/LettuceClassUtils.java     |  10 +-
 .../core}/internal/LettuceFactories.java      |   2 +-
 .../lettuce/core}/internal/LettuceLists.java  |  10 +-
 .../lettuce/core}/internal/LettuceSets.java   |  10 +-
 .../lettuce/core}/internal/package-info.java  |   4 +-
 .../core}/masterslave/AsyncConnections.java   |   8 +-
 .../core}/masterslave/Connections.java        |  18 +--
 .../core}/masterslave/MasterSlave.java        |  22 ++--
 .../masterslave/MasterSlaveChannelWriter.java |  20 ++--
 .../MasterSlaveConnectionProvider.java        |  30 ++---
 .../MasterSlaveTopologyProvider.java          |  14 +--
 .../MasterSlaveTopologyRefresh.java           |  24 ++--
 .../core}/masterslave/MasterSlaveUtils.java   |  16 +--
 .../masterslave/NodeConnectionFactory.java    |   8 +-
 .../core}/masterslave/ReadOnlyCommands.java   |   6 +-
 .../masterslave/RedisMasterSlaveNode.java     |   8 +-
 .../ReflectiveNodeConnectionFactory.java      |  12 +-
 .../core}/masterslave/RefreshFutures.java     |   4 +-
 .../lettuce/core}/masterslave/Requests.java   |   6 +-
 .../masterslave/SentinelTopologyProvider.java |  20 ++--
 .../masterslave/SentinelTopologyRefresh.java  |  20 ++--
 .../StatefulRedisMasterSlaveConnection.java   |  12 +-
 ...tatefulRedisMasterSlaveConnectionImpl.java |   8 +-
 .../StaticMasterSlaveTopologyProvider.java    |  16 +--
 .../core}/masterslave/TimedAsyncCommand.java  |   6 +-
 .../lettuce/core}/masterslave/Timeout.java    |   4 +-
 .../masterslave/TopologyComparators.java      |   6 +-
 .../core}/masterslave/TopologyProvider.java   |  10 +-
 .../core/masterslave/package-info.java        |   5 +
 .../metrics/CommandLatencyCollector.java      |   8 +-
 .../CommandLatencyCollectorOptions.java       |  10 +-
 .../core}/metrics/CommandLatencyId.java       |  18 +--
 .../lettuce/core}/metrics/CommandMetrics.java |  18 +--
 .../DefaultCommandLatencyCollector.java       |  10 +-
 ...DefaultCommandLatencyCollectorOptions.java |  12 +-
 .../core}/metrics/MetricCollector.java        |   8 +-
 .../lettuce/core}/metrics/package-info.java   |   2 +-
 .../core}/models/command/CommandDetail.java   |   4 +-
 .../models/command/CommandDetailParser.java   |   8 +-
 .../core}/models/command/package-info.java    |   2 +-
 .../core}/models/role/RedisInstance.java      |   8 +-
 .../models/role/RedisMasterInstance.java      |  10 +-
 .../models/role/RedisNodeDescription.java     |   8 +-
 .../models/role/RedisSentinelInstance.java    |  10 +-
 .../core}/models/role/RedisSlaveInstance.java |  10 +-
 .../core}/models/role/ReplicationPartner.java |  10 +-
 .../lettuce/core}/models/role/RoleParser.java |  10 +-
 .../core}/models/role/package-info.java       |   2 +-
 .../lettuce/core}/output/ArrayOutput.java     |   8 +-
 .../core}/output/BooleanListOutput.java       |   6 +-
 .../lettuce/core}/output/BooleanOutput.java   |   6 +-
 .../lettuce/core}/output/ByteArrayOutput.java |   6 +-
 .../lettuce/core}/output/CommandOutput.java   |  30 ++---
 .../lettuce/core}/output/DateOutput.java      |   6 +-
 .../output/DefaultTransactionResult.java      |  10 +-
 .../lettuce/core}/output/DoubleOutput.java    |   6 +-
 .../output/GeoCoordinatesListOutput.java      |  10 +-
 .../output/GeoCoordinatesValueListOutput.java |  10 +-
 .../core}/output/GeoWithinListOutput.java     |  10 +-
 .../lettuce/core}/output/IntegerOutput.java   |   6 +-
 .../lettuce/core}/output/KeyListOutput.java   |   6 +-
 .../lettuce/core}/output/KeyOutput.java       |   8 +-
 .../lettuce/core}/output/KeyScanOutput.java   |  10 +-
 .../core}/output/KeyScanStreamingOutput.java  |   8 +-
 .../core}/output/KeyStreamingChannel.java     |   6 +-
 .../core}/output/KeyStreamingOutput.java      |   8 +-
 .../core}/output/KeyValueListOutput.java      |   8 +-
 .../lettuce/core}/output/KeyValueOutput.java  |   6 +-
 .../output/KeyValueScanStreamingOutput.java   |  10 +-
 .../output/KeyValueStreamingChannel.java      |   6 +-
 .../core}/output/KeyValueStreamingOutput.java |   8 +-
 .../core}/output/ListOfMapsOutput.java        |   8 +-
 .../lettuce/core}/output/ListSubscriber.java  |   6 +-
 .../lettuce/core}/output/MapOutput.java       |   4 +-
 .../lettuce/core}/output/MapScanOutput.java   |  10 +-
 .../lettuce/core}/output/MultiOutput.java     |  12 +-
 .../core}/output/NestedMultiOutput.java       |   8 +-
 .../lettuce/core}/output/ScanOutput.java      |  10 +-
 .../core}/output/ScoredValueListOutput.java   |   8 +-
 .../core}/output/ScoredValueScanOutput.java   |  12 +-
 .../ScoredValueScanStreamingOutput.java       |  10 +-
 .../output/ScoredValueStreamingChannel.java   |   8 +-
 .../output/ScoredValueStreamingOutput.java    |   8 +-
 .../lettuce/core}/output/StatusOutput.java    |   8 +-
 .../core}/output/StreamingChannel.java        |   4 +-
 .../lettuce/core}/output/StreamingOutput.java |   2 +-
 .../core}/output/StringListOutput.java        |   6 +-
 .../core}/output/StringValueListOutput.java   |  10 +-
 .../lettuce/core}/output/ValueListOutput.java |   6 +-
 .../lettuce/core}/output/ValueOutput.java     |   8 +-
 .../lettuce/core}/output/ValueScanOutput.java |  10 +-
 .../output/ValueScanStreamingOutput.java      |   8 +-
 .../lettuce/core}/output/ValueSetOutput.java  |   8 +-
 .../core}/output/ValueStreamingChannel.java   |   6 +-
 .../core}/output/ValueStreamingOutput.java    |   6 +-
 .../core}/output/ValueValueListOutput.java    |   8 +-
 .../lettuce/core}/output/package-info.java    |   2 +-
 .../java/io/lettuce/core/package-info.java    |   4 +
 .../lettuce/core}/protocol/AsyncCommand.java  |  24 ++--
 .../protocol/BaseRedisCommandBuilder.java     |  10 +-
 .../core}/protocol/ChannelLogDescriptor.java  |   2 +-
 .../lettuce/core}/protocol/Command.java       |   6 +-
 .../lettuce/core}/protocol/CommandArgs.java   |  56 ++++-----
 .../core}/protocol/CommandEncoder.java        |   4 +-
 .../core}/protocol/CommandHandler.java        |  14 +--
 .../core}/protocol/CommandKeyword.java        |   4 +-
 .../lettuce/core}/protocol/CommandType.java   |   2 +-
 .../core}/protocol/CommandWrapper.java        |   8 +-
 .../core}/protocol/CompleteableCommand.java   |   2 +-
 .../core}/protocol/ConnectionFacade.java      |   4 +-
 .../core}/protocol/ConnectionWatchdog.java    |  18 +--
 .../core}/protocol/DecoratedCommand.java      |   6 +-
 .../core}/protocol/DefaultEndpoint.java       |  16 +--
 .../lettuce/core}/protocol/DemandAware.java   |   6 +-
 .../lettuce/core}/protocol/Endpoint.java      |  14 +--
 .../core}/protocol/HasQueuedCommands.java     |   4 +-
 .../core}/protocol/LettuceCharsets.java       |   6 +-
 .../core}/protocol/ProtocolKeyword.java       |   8 +-
 .../core}/protocol/QueuedCommands.java        |  12 +-
 .../core}/protocol/ReconnectionHandler.java   |   8 +-
 .../core}/protocol/ReconnectionListener.java  |   8 +-
 .../lettuce/core}/protocol/RedisCommand.java  |  12 +-
 .../core}/protocol/RedisStateMachine.java     |  13 +-
 .../lettuce/core}/protocol/SharedLock.java    |  10 +-
 .../core}/protocol/TransactionalCommand.java  |   8 +-
 .../lettuce/core}/protocol/WithLatency.java   |   8 +-
 .../lettuce/core}/protocol/package-info.java  |   2 +-
 .../core}/pubsub/PubSubCommandArgs.java       |   8 +-
 .../core}/pubsub/PubSubCommandBuilder.java    |  30 ++---
 .../core}/pubsub/PubSubCommandHandler.java    |  16 +--
 .../lettuce/core}/pubsub/PubSubEndpoint.java  |   6 +-
 .../lettuce/core}/pubsub/PubSubOutput.java    |   8 +-
 .../core}/pubsub/RedisPubSubAdapter.java      |   6 +-
 .../pubsub/RedisPubSubAsyncCommandsImpl.java  |  10 +-
 .../core}/pubsub/RedisPubSubListener.java     |  16 +--
 .../RedisPubSubReactiveCommandsImpl.java      |  12 +-
 .../pubsub/StatefulRedisPubSubConnection.java |  24 ++--
 .../StatefulRedisPubSubConnectionImpl.java    |  20 ++--
 .../api/async/RedisPubSubAsyncCommands.java   |  18 +--
 .../core}/pubsub/api/async/package-info.java  |   2 +-
 .../pubsub/api/reactive/ChannelMessage.java   |   4 +-
 .../pubsub/api/reactive/PatternMessage.java   |   4 +-
 .../reactive/RedisPubSubReactiveCommands.java |  16 +--
 .../pubsub/api/reactive/package-info.java     |   2 +-
 .../pubsub/api/sync/RedisPubSubCommands.java  |  16 +--
 .../core}/pubsub/api/sync/package-info.java   |   2 +-
 .../lettuce/core}/pubsub/package-info.java    |   2 +-
 .../core}/resource/ClientResources.java       |  10 +-
 .../lettuce/core}/resource/ConstantDelay.java |   4 +-
 .../resource/DecorrelatedJitterDelay.java     |   6 +-
 .../resource/DefaultClientResources.java      |  40 +++----
 .../DefaultEventLoopGroupProvider.java        |  12 +-
 .../lettuce/core}/resource/Delay.java         |  14 +--
 .../core}/resource/DirContextDnsResolver.java |  18 +--
 .../lettuce/core}/resource/DnsResolver.java   |   2 +-
 .../lettuce/core}/resource/DnsResolvers.java  |   2 +-
 .../core}/resource/EqualJitterDelay.java      |   2 +-
 .../resource/EventLoopGroupProvider.java      |   8 +-
 .../core}/resource/ExponentialDelay.java      |   4 +-
 .../core}/resource/FullJitterDelay.java       |   2 +-
 .../lettuce/core}/resource/Futures.java       |  20 ++--
 .../core}/resource/SocketAddressResolver.java |   8 +-
 .../lettuce/core}/resource/package-info.java  |   2 +-
 .../RedisSentinelAsyncCommandsImpl.java       |  22 ++--
 .../RedisSentinelReactiveCommandsImpl.java    |  16 +--
 .../sentinel/SentinelCommandBuilder.java      |  22 ++--
 .../StatefulRedisSentinelConnectionImpl.java  |  22 ++--
 .../api/StatefulRedisSentinelConnection.java  |  20 ++--
 .../api/async/RedisSentinelAsyncCommands.java |  34 +++---
 .../sentinel/api/async/package-info.java      |   2 +-
 .../core/sentinel/api/package-info.java       |   4 +
 .../RedisSentinelReactiveCommands.java        |  32 ++---
 .../sentinel/api/reactive/package-info.java   |   2 +-
 .../api/sync/RedisSentinelCommands.java       |  32 ++---
 .../core}/sentinel/api/sync/package-info.java |   2 +-
 .../lettuce/core}/sentinel/package-info.java  |   2 +-
 .../core}/support/AbstractCdiBean.java        |   6 +-
 .../support/ClientResourcesFactoryBean.java   |   8 +-
 .../core}/support/ConnectionPoolSupport.java  |  18 +--
 .../core}/support/LettuceCdiExtension.java    |  20 ++--
 .../support/LettuceFactoryBeanSupport.java    |  18 +--
 .../core}/support/RedisClientCdiBean.java     |  10 +-
 .../core}/support/RedisClientFactoryBean.java |  10 +-
 .../support/RedisClusterClientCdiBean.java    |  10 +-
 .../RedisClusterClientFactoryBean.java        |  16 +--
 .../io/lettuce/core/support/package-info.java |   5 +
 src/main/javadoc/overview.html                |  20 ++--
 .../javax.enterprise.inject.spi.Extension     |   2 +-
 .../lettuce/core}/api/BaseRedisCommands.java  |  32 ++---
 .../lettuce/core}/api/RedisGeoCommands.java   |   6 +-
 .../lettuce/core}/api/RedisHLLCommands.java   |   6 +-
 .../lettuce/core}/api/RedisHashCommands.java  |  64 +++++-----
 .../lettuce/core}/api/RedisKeyCommands.java   |  98 +++++++--------
 .../lettuce/core}/api/RedisListCommands.java  |  46 +++----
 .../core}/api/RedisScriptingCommands.java     |  26 ++--
 .../core}/api/RedisSentinelCommands.java      |  32 ++---
 .../core}/api/RedisServerCommands.java        |  76 ++++++------
 .../lettuce/core/api}/RedisSetCommands.java   |  81 +++++++------
 .../core}/api/RedisSortedSetCommands.java     |  50 ++++----
 .../core}/api/RedisStringCommands.java        |  16 +--
 .../core}/api/RedisTransactionalCommands.java |  10 +-
 src/site/markdown/download.md.vm              |  74 ------------
 src/site/markdown/index.md.vm                 | 113 ------------------
 src/site/site.xml                             |  53 --------
 .../redis/extensibility/LettuceGeoDemo.java   |   4 +-
 .../extensibility/MyExtendedRedisClient.java  |  16 +--
 .../MyExtendedRedisClientTest.java            |  14 +--
 .../extensibility/MyPubSubConnection.java     |  12 +-
 .../lettuce}/CanConnect.java                  |   4 +-
 .../lettuce}/ConnectionTestUtil.java          |  29 +++--
 .../lambdaworks => io/lettuce}/Delay.java     |   4 +-
 .../lambdaworks => io/lettuce}/Futures.java   |   8 +-
 .../lettuce}/KeysAndValues.java               |   6 +-
 .../lettuce}/LoggingTestRule.java             |   4 +-
 .../lambdaworks => io/lettuce}/Sockets.java   |   4 +-
 .../lambdaworks => io/lettuce}/SslTest.java   |  19 ++-
 .../lettuce}/TestClientResources.java         |  18 +--
 .../{com/lambdaworks => io/lettuce}/Wait.java |  24 ++--
 .../apigenerator/CompilationUnitFactory.java  |   2 +-
 .../lettuce}/apigenerator/Constants.java      |   2 +-
 .../lettuce}/apigenerator/CreateAsyncApi.java |  11 +-
 .../CreateAsyncNodeSelectionClusterApi.java   |   9 +-
 .../apigenerator/CreateReactiveApi.java       |  18 +--
 .../lettuce}/apigenerator/CreateSyncApi.java  |  19 +--
 .../CreateSyncNodeSelectionClusterApi.java    |   7 +-
 .../GenerateCommandInterfaces.java            |   4 +-
 .../lettuce}/category/SlowTests.java          |   2 +-
 .../lettuce}/codec/CRC16Test.java             |   4 +-
 .../core}/AbstractRedisClientTest.java        |   7 +-
 .../lettuce/core}/AbstractTest.java           |   6 +-
 .../lettuce/core}/AllTheAPIsTest.java         |  10 +-
 .../lettuce/core}/AsyncConnectionTest.java    |   4 +-
 .../lettuce/core}/ClientMetricsTest.java      |  20 ++--
 .../lettuce/core}/ClientOptionsTest.java      |  20 ++--
 .../redis => io/lettuce/core}/ClientTest.java |  16 +--
 .../lettuce/core}/ConnectionCommandTest.java  |   8 +-
 .../lettuce/core}/CustomCodecTest.java        |  12 +-
 .../lettuce/core}/DefaultRedisClient.java     |   4 +-
 .../lettuce/core}/FastShutdown.java           |   6 +-
 .../lettuce/core}/GeoModelTest.java           |   2 +-
 .../lettuce/core}/JavaRuntimeTest.java        |   6 +-
 .../core}/KeyValueStreamingAdapter.java       |   8 +-
 .../lettuce/core}/KeyValueTest.java           |   2 +-
 .../lettuce/core}/LettuceFuturesTest.java     |   2 +-
 .../redis => io/lettuce/core}/LimitTest.java  |   2 +-
 .../lettuce/core}/ListStreamingAdapter.java   |  10 +-
 .../lettuce/core}/PipeliningTest.java         |   6 +-
 .../lettuce/core}/PrivateAccessorTest.java    |  20 ++--
 .../redis => io/lettuce/core}/RangeTest.java  |   6 +-
 .../ReactiveBackpressurePropagationTest.java  |  14 +--
 .../lettuce/core}/ReactiveConnectionTest.java |  12 +-
 .../core}/ReactiveStreamingOutputTest.java    |  10 +-
 .../core}/RedisClientConnectionTest.java      |  14 +--
 .../core}/RedisClientFactoryBeanTest.java     |   4 +-
 .../lettuce/core}/RedisClientFactoryTest.java |   9 +-
 .../core}/RedisClientListenerTest.java        |  12 +-
 .../lettuce/core}/RedisClientTest.java        |   8 +-
 .../lettuce/core}/RedisURIBuilderTest.java    |   2 +-
 .../lettuce/core}/RedisURITest.java           |   4 +-
 .../lettuce/core}/ScanCursorTest.java         |   2 +-
 .../lettuce/core}/ScanIteratorTest.java       |   6 +-
 .../core}/ScoredValueStreamingAdapter.java    |   4 +-
 .../lettuce/core}/ScoredValueTest.java        |   4 +-
 .../lettuce/core}/SocketOptionsTest.java      |   2 +-
 .../core}/SyncAsyncApiConvergenceTest.java    |   6 +-
 .../core}/TestEventLoopGroupProvider.java     |   8 +-
 .../lettuce/core}/TestRedisPublisher.java     |   6 +-
 .../lettuce/core}/TestSettings.java           |   6 +-
 .../lettuce/core}/UnixDomainSocketTest.java   |  12 +-
 .../lettuce/core}/Utf8StringCodecTest.java    |   2 +-
 .../redis => io/lettuce/core}/ValueTest.java  |   2 +-
 .../core}/cluster/AbstractClusterTest.java    |  14 +--
 .../cluster/AdvancedClusterClientTest.java    |  30 ++---
 .../cluster/AdvancedClusterReactiveTest.java  |  22 ++--
 .../core}/cluster/ByteCodecClusterTest.java   |   6 +-
 .../cluster/ClusterClientOptionsTest.java     |   2 +-
 .../cluster/ClusterCommandInternalsTest.java  |  14 +--
 .../core}/cluster/ClusterCommandTest.java     |  31 +++--
 .../ClusterDistributionChannelWriterTest.java |  12 +-
 .../cluster/ClusterNodeEndpointTest.java      |  22 ++--
 .../cluster/ClusterPartiallyDownTest.java     |  16 +--
 .../cluster/ClusterPartitionParserTest.java   |  12 +-
 .../cluster/ClusterReactiveCommandTest.java   |  22 ++--
 .../lettuce/core}/cluster/ClusterRule.java    |  16 +--
 .../lettuce/core}/cluster/ClusterSetup.java   |  18 +--
 .../core}/cluster/ClusterTestUtil.java        |  24 ++--
 .../ClusterTopologyRefreshOptionsTest.java    |   4 +-
 .../ClusterTopologyRefreshSchedulerTest.java  |   4 +-
 ...ealthyMajorityPartitionsConsensusTest.java |  14 +--
 .../KnownMajorityPartitionsConsensusTest.java |  14 +--
 .../core}/cluster/NodeSelectionAsyncTest.java |  26 ++--
 .../core}/cluster/NodeSelectionSyncTest.java  |  26 ++--
 .../PartitionsConsensusTestSupport.java       |   8 +-
 .../cluster/PipelinedRedisFutureTest.java     |   2 +-
 .../PooledClusterConnectionProviderTest.java  |  34 +++---
 .../lettuce/core}/cluster/ReadFromTest.java   |  10 +-
 .../core}/cluster/ReadOnlyCommandsTest.java   |   6 +-
 .../RedisClusterClientFactoryTest.java        |  12 +-
 .../core}/cluster/RedisClusterClientTest.java |  34 +++---
 .../RedisClusterPasswordSecuredSslTest.java   |  26 ++--
 .../cluster/RedisClusterReadFromTest.java     |  14 +--
 .../core}/cluster/RedisClusterSetupTest.java  |  40 +++----
 .../RedisClusterStressScenariosTest.java      |  26 ++--
 .../cluster/RedisClusterURIUtilTest.java      |   6 +-
 .../RedisReactiveClusterClientTest.java       |  20 ++--
 .../RoundRobinSocketAddressSupplierTest.java  |  12 +-
 .../core}/cluster/ScanIteratorTest.java       |  18 +--
 .../lettuce/core}/cluster/SlotHashTest.java   |   2 +-
 ...ronizingClusterConnectionProviderTest.java |  12 +-
 .../commands/CustomClusterCommandTest.java    |  30 ++---
 .../commands/GeoClusterCommandTest.java       |  22 ++--
 .../commands/HashClusterCommandTest.java      |  20 ++--
 .../commands/KeyClusterCommandTest.java       |  18 +--
 .../commands/ListClusterCommandTest.java      |  21 ++--
 .../commands/StringClusterCommandTest.java    |  17 ++-
 .../HashClusterReactiveCommandTest.java       |  20 ++--
 .../KeyClusterReativeCommandTest.java         |  22 ++--
 .../ListClusterReactiveCommandTest.java       |  20 ++--
 .../StringClusterReactiveCommandTest.java     |  24 ++--
 .../models/partitions/PartitionsTest.java     |   4 +-
 .../partitions/RedisClusterNodeTest.java      |   4 +-
 .../models/slots/ClusterSlotsParserTest.java  |   6 +-
 .../cluster/pubsub/PubSubClusterTest.java     |  24 ++--
 .../cluster/pubsub/PubSubConnectionTest.java  |  14 +--
 .../topology/ClusterTopologyRefreshTest.java  |  32 ++---
 .../topology/NodeTopologyViewsTest.java       |   4 +-
 .../core}/cluster/topology/RequestsTest.java  |  12 +-
 .../topology/TopologyComparatorsTest.java     |  14 +--
 .../cluster/topology/TopologyRefreshTest.java |  32 ++---
 .../core}/codec/CompressionCodecTest.java     |   2 +-
 .../lettuce/core}/codec/StringCodecTest.java  |   4 +-
 .../core}/commands/BitCommandTest.java        |  20 ++--
 .../core}/commands/CustomCommandTest.java     |  16 +--
 .../core}/commands/GeoCommandTest.java        |   4 +-
 .../core}/commands/HLLCommandTest.java        |   8 +-
 .../core}/commands/HashCommandTest.java       |   4 +-
 .../core}/commands/KeyCommandTest.java        |   4 +-
 .../core}/commands/ListCommandTest.java       |   6 +-
 .../core}/commands/NumericCommandTest.java    |   4 +-
 .../RunOnlyOnceServerCommandTest.java         |  18 +--
 .../core}/commands/ScriptingCommandTest.java  |  12 +-
 .../core}/commands/ServerCommandTest.java     |  20 ++--
 .../core}/commands/SetCommandTest.java        |   4 +-
 .../core}/commands/SortCommandTest.java       |  18 +--
 .../core}/commands/SortedSetCommandTest.java  |  14 +--
 .../core}/commands/StringCommandTest.java     |  14 +--
 .../commands/TransactionCommandTest.java      |  12 +-
 .../reactive/BitReactiveCommandTest.java      |  24 ++--
 .../reactive/CustomReactiveCommandTest.java   |  18 +--
 .../reactive/GeoReactiveCommandTest.java      |  10 +-
 .../reactive/HLLReactiveCommandTest.java      |   8 +-
 .../reactive/HashReactiveCommandTest.java     |   8 +-
 .../reactive/KeyReactiveCommandTest.java      |   8 +-
 .../reactive/ListReactiveCommandTest.java     |   8 +-
 .../reactive/NumericReactiveCommandTest.java  |   8 +-
 .../ScriptingReactiveCommandTest.java         |   8 +-
 .../reactive/ServerReactiveCommandTest.java   |  10 +-
 .../reactive/SetReactiveCommandTest.java      |   8 +-
 .../reactive/SortReactiveCommandTest.java     |   8 +-
 .../SortedSetReactiveCommandTest.java         |   8 +-
 .../reactive/StringReactiveCommandTest.java   |  12 +-
 .../TransactionReactiveCommandTest.java       |  18 +--
 .../transactional/BitTxCommandTest.java       |   6 +-
 .../transactional/GeoTxCommandTest.java       |   6 +-
 .../transactional/HLLTxCommandTest.java       |   6 +-
 .../transactional/HashTxCommandTest.java      |   6 +-
 .../transactional/KeyTxCommandTest.java       |   6 +-
 .../transactional/ListTxCommandTest.java      |   6 +-
 .../transactional/SetTxCommandTest.java       |   6 +-
 .../transactional/SortTxCommandTest.java      |   6 +-
 .../transactional/SortedSetTxCommandTest.java |   6 +-
 .../transactional/StringTxCommandTest.java    |   6 +-
 .../TxSyncInvocationHandler.java              |  14 +--
 ...chExecutableCommandLookupStrategyTest.java |  14 +--
 .../CommandSegmentCommandFactoryTest.java     |  34 +++---
 .../core}/dynamic/ConversionServiceTest.java  |   2 +-
 .../dynamic/DeclaredCommandMethodTest.java    |   2 +-
 .../DefaultCommandMethodVerifierTest.java     |  16 +--
 .../core}/dynamic/ParameterBinderTest.java    |  16 +--
 ...ctiveCommandSegmentCommandFactoryTest.java |  18 +--
 .../dynamic/ReactiveTypeAdaptersTest.java     |   4 +-
 .../dynamic/ReactiveTypeAdaptionTest.java     |   6 +-
 .../core}/dynamic/RedisCommandsAsyncTest.java |   4 +-
 .../dynamic/RedisCommandsBatchingTest.java    |  20 ++--
 .../dynamic/RedisCommandsClusterSyncTest.java |  24 ++--
 .../dynamic/RedisCommandsReactiveTest.java    |   6 +-
 .../core}/dynamic/RedisCommandsSyncTest.java  |  14 +--
 .../core}/dynamic/RedisCommandsTest.java      |   4 +-
 .../core}/dynamic/SimpleBatcherTest.java      |  16 +--
 .../AnnotationRedisCodecResolverTest.java     |  24 ++--
 .../dynamic/codec/ParameterWrappersTest.java  |  22 ++--
 .../intercept/InvocationProxyFactoryTest.java |   2 +-
 .../output/CodecAwareOutputResolverTest.java  |  12 +-
 ...istryCommandOutputFactoryResolverTest.java |  16 +--
 .../dynamic/output/OutputRegistryTest.java    |  16 +--
 .../AnnotationCommandSegmentFactoryTest.java  |  16 +--
 .../ParametrizedTypeInformationTest.java      |   4 +-
 .../support/WildcardTypeInformationTest.java  |   6 +-
 .../event/ConnectionEventsTriggeredTest.java  |  12 +-
 .../core}/event/DefaultEventBusTest.java      |   2 +-
 .../DefaultEventPublisherOptionsTest.java     |   2 +-
 .../AbstractInvocationHandlerTest.java        |   2 +-
 .../core}/internal/HostAndPortTest.java       |   2 +-
 .../core}/masterslave/CustomCommandTest.java  |  16 +--
 .../MasterSlaveChannelWriterTest.java         |  10 +-
 .../MasterSlaveConnectionProviderTest.java    |  14 +--
 .../masterslave/MasterSlaveSentinelTest.java  |  16 +--
 .../core}/masterslave/MasterSlaveTest.java    |  16 +--
 .../MasterSlaveTopologyProviderTest.java      |  12 +-
 .../masterslave/MasterSlaveUtilsTest.java     |   6 +-
 .../SentinelTopologyRefreshTest.java          |  18 +--
 .../masterslave/StaticMasterSlaveTest.java    |  14 +--
 .../core}/metrics/CommandLatencyIdTest.java   |   4 +-
 .../DefaultCommandLatencyCollectorTest.java   |   4 +-
 ...ultCommandLatencyCollectorOptionsTest.java |   2 +-
 .../command/CommandDetailParserTest.java      |   4 +-
 .../core}/models/role/RoleParserTest.java     |   6 +-
 .../core}/output/BooleanListOutputTest.java   |   4 +-
 .../output/GeoCoordinatesListOutputTest.java  |   6 +-
 .../GeoCoordinatesValueListOutputTest.java    |   8 +-
 .../core}/output/GeoWithinListOutputTest.java |  10 +-
 .../lettuce/core}/output/ListOutputTest.java  |   4 +-
 .../core}/output/NestedMultiOutputTest.java   |   8 +-
 .../output/ScoredValueListOutputTest.java     |   6 +-
 .../protocol/AsyncCommandInternalsTest.java   |  14 +--
 .../core}/protocol/CommandArgsTest.java       |   6 +-
 .../core}/protocol/CommandHandlerTest.java    |  14 +--
 .../core}/protocol/CommandInternalsTest.java  |  16 +--
 .../core}/protocol/ConnectionFailureTest.java |  16 +--
 .../core}/protocol/DefaultEndpointTest.java   |  14 +--
 .../core}/protocol/StateMachineTest.java      |  12 +-
 .../core}/pubsub/PubSubCommandTest.java       |  14 +--
 .../core}/pubsub/PubSubReactiveTest.java      |  26 ++--
 .../reactive/RedisPublisherVerification.java  |  20 ++--
 .../core}/reliability/AtLeastOnceTest.java    |  20 ++--
 .../core}/reliability/AtMostOnceTest.java     |  26 ++--
 .../core}/resource/ConstantDelayTest.java     |   2 +-
 .../resource/DecorrelatedJitterDelayTest.java |   2 +-
 .../resource/DefaultClientResourcesTest.java  |  12 +-
 .../DefaultEventLoopGroupProviderTest.java    |   2 +-
 .../resource/DirContextDnsResolverTest.java   |   2 +-
 .../core}/resource/EqualJitterDelayTest.java  |   2 +-
 .../core}/resource/ExponentialDelayTest.java  |   2 +-
 .../core}/resource/FullJitterDelayTest.java   |   2 +-
 .../lettuce/core}/resource/FuturesTest.java   |   2 +-
 .../core}/sentinel/AbstractSentinelTest.java  |  10 +-
 .../core}/sentinel/SentinelCommandTest.java   |  16 +--
 .../sentinel/SentinelConnectionTest.java      |  18 +--
 .../lettuce/core}/sentinel/SentinelRule.java  |  38 +++---
 .../sentinel/SentinelServerCommandTest.java   |  14 +--
 .../reactive/SentinelReactiveCommandTest.java |  14 +--
 .../SentinelServerReactiveCommandTest.java    |  14 +--
 .../core}/server/RandomResponseServer.java    |   4 +-
 .../core}/server/RandomServerHandler.java     |   2 +-
 .../lettuce/core}/support/CdiTest.java        |  14 +--
 .../support/ConnectionPoolSupportTest.java    |  36 +++---
 .../lettuce/core}/support/InjectedClient.java |   8 +-
 .../lettuce/core}/support/PersonDB.java       |   2 +-
 .../core}/support/PubSubTestListener.java     |   6 +-
 .../RedisClusterClientFactoryBeanTest.java    |   4 +-
 .../lettuce/core}/support/SpringTest.java     |   6 +-
 .../examples/ConnectToElastiCacheMaster.java  |  10 +-
 ...tToMasterSlaveUsingElastiCacheCluster.java |  15 ++-
 ...onnectToMasterSlaveUsingRedisSentinel.java |  14 +--
 .../lettuce}/examples/ConnectToRedis.java     |   6 +-
 .../examples/ConnectToRedisCluster.java       |   6 +-
 .../examples/ConnectToRedisClusterSSL.java    |   8 +-
 ...tToRedisClusterWithTopologyRefreshing.java |  10 +-
 .../lettuce}/examples/ConnectToRedisSSL.java  |   6 +-
 .../ConnectToRedisUsingRedisSentinel.java     |   6 +-
 .../lettuce}/examples/MySpringBean.java       |   9 +-
 .../lettuce}/examples/ReadWriteExample.java   |  10 +-
 .../lettuce}/examples/SpringExample.java      |   8 +-
 ...ConnectionDecoratingInvocationHandler.java |  14 +--
 .../util/ReactiveSyncInvocationHandler.java   |  19 ++-
 .../util/RoutingInvocationHandler.java        |   4 +-
 .../core}/EmptyRedisChannelWriter.java        |   6 +-
 .../core}/EmptyStatefulRedisConnection.java   |  14 +--
 .../lettuce/core}/RedisClientBenchmark.java   |   6 +-
 ...terDistributionChannelWriterBenchmark.java |  22 ++--
 .../cluster/EmptyRedisClusterClient.java      |  12 +-
 .../cluster/RedisClusterClientBenchmark.java  |  14 +--
 .../lettuce/core}/codec/JmhMain.java          |   4 +-
 .../core}/codec/StringCodecBenchmark.java     |   6 +-
 .../core}/codec/Utf8StringCodecBenchmark.java |   4 +-
 .../dynamic/RedisCommandFactoryBenchmark.java |  12 +-
 .../core}/dynamic/RedisCommandsBenchmark.java |  16 +--
 .../InvocationProxyFactoryBenchmark.java      |   2 +-
 .../core}/protocol/CommandBenchmark.java      |  12 +-
 .../protocol/CommandHandlerBenchmark.java     |  10 +-
 .../lettuce/core}/protocol/EmptyByteBuf.java  |   2 +-
 .../core}/protocol/EmptyClientResources.java  |  22 ++--
 .../lettuce/core}/protocol/EmptyContext.java  |   2 +-
 .../lettuce/core}/protocol/EmptyFuture.java   |   4 +-
 .../lettuce/core}/protocol/EmptyPromise.java  |   2 +-
 .../lettuce/core}/protocol/JmhMain.java       |   2 +-
 .../protocol/RedisEndpointBenchmark.java      |  10 +-
 .../protocol/RedisStateMachineBenchmark.java  |   6 +-
 .../core}/support/SpringTest-context.xml      |  16 +--
 .../lettuce}/examples/SpringTest-context.xml  |   4 +-
 src/test/resources/log4j2-test.xml            |   6 +-
 src/test/resources/spring-test.xml            |   4 +-
 874 files changed, 5914 insertions(+), 6249 deletions(-)
 delete mode 100644 src/main/java/com/lambdaworks/codec/package-info.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/cluster/api/package-info.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/cluster/event/package-info.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/cluster/package-info.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/dynamic/intercept/package-info.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/dynamic/output/package-info.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/dynamic/package-info.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/dynamic/parameter/package-info.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/dynamic/segment/package-info.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/event/connection/package-info.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/event/metrics/package-info.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/masterslave/package-info.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/package-info.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/sentinel/api/package-info.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/support/package-info.java
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/AbstractRedisAsyncCommands.java (99%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/AbstractRedisClient.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/AbstractRedisReactiveCommands.java (99%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/BitFieldArgs.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ChannelGroupListener.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ClientOptions.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/CloseEvents.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/CompositeArgument.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ConnectionBuilder.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ConnectionEventTrigger.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ConnectionEvents.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ConnectionFuture.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ConnectionId.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ConnectionPoint.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/DefaultConnectionFuture.java (99%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/EpollProvider.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/FutureSyncInvocationHandler.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/GeoArgs.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/GeoCoordinates.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/GeoRadiusStoreArgs.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/GeoWithin.java (99%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/JavaRuntime.java (89%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/KeyScanCursor.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/KeyValue.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/KillArgs.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/LettuceFutures.java (99%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/LettuceStrings.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/Limit.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/MapScanCursor.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/MigrateArgs.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/PlainChannelInitializer.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/Range.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ReadFrom.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ReadFromImpl.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisAsyncCommandsImpl.java (84%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisChannelHandler.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisChannelInitializer.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisChannelInitializerImpl.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisChannelWriter.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisClient.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisCommandBuilder.java (99%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisCommandExecutionException.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisCommandInterruptedException.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisCommandTimeoutException.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisConnectionException.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisConnectionStateAdapter.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisConnectionStateListener.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisException.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisFuture.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisPublisher.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisReactiveCommandsImpl.java (83%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/RedisURI.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ScanArgs.java (88%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ScanCursor.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ScanIterator.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ScoredValue.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ScoredValueScanCursor.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ScriptOutputType.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/SetArgs.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/SocketOptions.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/SortArgs.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/SslConnectionBuilder.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/SslOptions.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/StatefulRedisConnectionImpl.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/StreamScanCursor.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/TransactionResult.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/Transports.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/Value.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ValueScanCursor.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ZAddArgs.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/ZStoreArgs.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/StatefulConnection.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/StatefulRedisConnection.java (86%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/BaseRedisAsyncCommands.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisAsyncCommands.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisGeoAsyncCommands.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisHLLAsyncCommands.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisHashAsyncCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisKeyAsyncCommands.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisListAsyncCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisScriptingAsyncCommands.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisServerAsyncCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisSetAsyncCommands.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisSortedSetAsyncCommands.java (99%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisStringAsyncCommands.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisTransactionalAsyncCommands.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/package-info.java (62%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/package-info.java (55%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/BaseRedisReactiveCommands.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisGeoReactiveCommands.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisHLLReactiveCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisHashReactiveCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisKeyReactiveCommands.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisListReactiveCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisReactiveCommands.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisScriptingReactiveCommands.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisServerReactiveCommands.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisSetReactiveCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisSortedSetReactiveCommands.java (99%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisStringReactiveCommands.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/RedisTransactionalReactiveCommands.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/reactive/package-info.java (63%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/BaseRedisCommands.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisCommands.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisGeoCommands.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisHLLCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisHashCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisKeyCommands.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisListCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisScriptingCommands.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisServerCommands.java (94%)
 rename src/main/{templates/com/lambdaworks/redis/api => java/io/lettuce/core/api/sync}/RedisSetCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisSortedSetCommands.java (99%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisStringCommands.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisTransactionalCommands.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/package-info.java (62%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/AbstractClusterNodeConnectionFactory.java (89%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/AbstractNodeSelection.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/AsyncExecutionsImpl.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterClientOptions.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterCommand.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterConnectionProvider.java (85%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterDistributionChannelWriter.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterEventListener.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterFutureSyncInvocationHandler.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterNodeConnectionFactory.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterNodeEndpoint.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterPubSubConnectionProvider.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterScanSupport.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterTopologyRefreshOptions.java (99%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterTopologyRefreshScheduler.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/DynamicNodeSelection.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/MultiNodeExecution.java (85%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/NodeSelectionInvocationHandler.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PartitionAccessor.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PartitionsConsensus.java (84%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PartitionsConsensusImpl.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PipelinedRedisFuture.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PooledClusterConnectionProvider.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PubSubClusterEndpoint.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ReactiveExecutionsImpl.java (88%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ReadOnlyCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ReconnectEventListener.java (87%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisAdvancedClusterAsyncCommandsImpl.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisAdvancedClusterReactiveCommandsImpl.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterClient.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterPubSubAsyncCommandsImpl.java (80%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterPubSubReactiveCommandsImpl.java (80%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterURIUtil.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RoundRobin.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RoundRobinSocketAddressSupplier.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/SlotHash.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/StatefulRedisClusterConnectionImpl.java (86%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/StatefulRedisClusterPubSubConnectionImpl.java (79%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/StaticNodeSelection.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/SyncExecutionsImpl.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/SynchronizingClusterConnectionProvider.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/NodeSelectionSupport.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/StatefulRedisClusterConnection.java (85%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/AsyncExecutions.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/AsyncNodeSelection.java (83%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/BaseNodeSelectionAsyncCommands.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionAsyncCommands.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionGeoAsyncCommands.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionHLLAsyncCommands.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionHashAsyncCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionKeyAsyncCommands.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionListAsyncCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionScriptingAsyncCommands.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionServerAsyncCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionSetAsyncCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java (99%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionStringAsyncCommands.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/RedisAdvancedClusterAsyncCommands.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/RedisClusterAsyncCommands.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/package-info.java (57%)
 create mode 100644 src/main/java/io/lettuce/core/cluster/api/package-info.java
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/reactive/ReactiveExecutions.java (89%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/reactive/RedisClusterReactiveCommands.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/reactive/package-info.java (58%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/BaseNodeSelectionCommands.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/Executions.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelection.java (85%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionCommands.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionGeoCommands.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionHLLCommands.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionHashCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionKeyCommands.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionListCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionScriptingCommands.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionServerCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionSetCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionSortedSetCommands.java (99%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionStringCommands.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/RedisAdvancedClusterCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/RedisClusterCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/package-info.java (57%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/event/ClusterTopologyChangedEvent.java (92%)
 create mode 100644 src/main/java/io/lettuce/core/cluster/event/package-info.java
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/partitions/ClusterPartitionParser.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/partitions/Partitions.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/partitions/RedisClusterNode.java (89%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/partitions/package-info.java (62%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/slots/ClusterSlotRange.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/slots/ClusterSlotsParser.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/slots/package-info.java (55%)
 create mode 100644 src/main/java/io/lettuce/core/cluster/package-info.java
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/RedisClusterPubSubAdapter.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/RedisClusterPubSubListener.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/StatefulRedisClusterPubSubConnection.java (89%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java (82%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java (77%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/sync/PubSubNodeSelection.java (82%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/AsyncConnections.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/ClusterTopologyRefresh.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/Connections.java (89%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/NodeConnectionFactory.java (89%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/NodeTopologyView.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/NodeTopologyViews.java (89%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/RedisClusterNodeSnapshot.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/RefreshFutures.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/Requests.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/TimedAsyncCommand.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/TopologyComparators.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/package-info.java (51%)
 rename src/main/java/{com/lambdaworks => io/lettuce/core}/codec/Base16.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/codec/ByteArrayCodec.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/codec/ByteBufferInputStream.java (96%)
 rename src/main/java/{com/lambdaworks => io/lettuce/core}/codec/CRC16.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/codec/CompressionCodec.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/codec/RedisCodec.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/codec/StringCodec.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/codec/ToByteBufEncoder.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/codec/Utf8StringCodec.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/codec/package-info.java (56%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/AsyncExecutableCommand.java (88%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/AsyncExecutableCommandLookupStrategy.java (86%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/BatchExecutableCommand.java (87%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/BatchExecutableCommandLookupStrategy.java (89%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/BatchTasks.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/Batcher.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CodecAwareMethodParametersAccessor.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CommandCreationException.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CommandFactory.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CommandFactoryResolver.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CommandMethod.java (77%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CommandMethodSyntaxException.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CommandMethodVerifier.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CommandSegmentCommandFactory.java (79%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/Commands.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ConversionService.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ConvertingCommand.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/DeclaredCommandMethod.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/DefaultCommandMethodVerifier.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/DefaultMethodParametersAccessor.java (89%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/DefaultRedisCommandsMetadata.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ExecutableCommand.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ExecutableCommandLookupStrategy.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ExecutableCommandLookupStrategySupport.java (86%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ParameterBinder.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ReactiveCommandSegmentCommandFactory.java (79%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ReactiveExecutableCommand.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ReactiveExecutableCommandLookupStrategy.java (87%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ReactiveTypeAdapters.java (99%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ReactiveTypes.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandFactory.java (89%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandsMetadata.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/SimpleBatcher.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/annotation/Command.java (86%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/annotation/CommandNaming.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/annotation/Key.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/annotation/Param.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/annotation/Value.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/annotation/package-info.java (65%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/batch/BatchException.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/batch/BatchExecutor.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/batch/BatchSize.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/batch/CommandBatching.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/codec/AnnotationRedisCodecResolver.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/codec/RedisCodecResolver.java (87%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/domain/Timeout.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/domain/package-info.java (60%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/intercept/DefaultMethodInvocation.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/intercept/InvocationProxyFactory.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/intercept/MethodInterceptor.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/intercept/MethodInterceptorChain.java (99%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/intercept/MethodInvocation.java (96%)
 create mode 100644 src/main/java/io/lettuce/core/dynamic/intercept/package-info.java
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/CodecAwareOutputFactoryResolver.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/CommandOutputFactory.java (88%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/CommandOutputFactoryResolver.java (79%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/CommandOutputResolverSupport.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/OutputRegistry.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/OutputSelector.java (81%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/OutputType.java (80%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/VoidOutput.java (89%)
 create mode 100644 src/main/java/io/lettuce/core/dynamic/output/package-info.java
 create mode 100644 src/main/java/io/lettuce/core/dynamic/package-info.java
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/parameter/ExecutionSpecificParameters.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/parameter/MethodParametersAccessor.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/parameter/Parameter.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/parameter/Parameters.java (96%)
 create mode 100644 src/main/java/io/lettuce/core/dynamic/parameter/package-info.java
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/segment/AnnotationCommandSegmentFactory.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/segment/CommandSegment.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/segment/CommandSegmentFactory.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/segment/CommandSegments.java (93%)
 create mode 100644 src/main/java/io/lettuce/core/dynamic/segment/package-info.java
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/AnnotationParameterNameDiscoverer.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/ClassTypeInformation.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/CompositeParameterNameDiscoverer.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/GenericArrayTypeInformation.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/GenericTypeResolver.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/MethodParameter.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/ParameterNameDiscoverer.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/ParametrizedTypeInformation.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/ParentTypeAwareTypeInformation.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/ReflectionUtils.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/ResolvableType.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/StandardReflectionParameterNameDiscoverer.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/TypeDiscoverer.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/TypeInformation.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/TypeVariableTypeInformation.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/TypeWrapper.java (99%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/WildcardTypeInformation.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/package-info.java (57%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/DefaultEventBus.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/DefaultEventPublisherOptions.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/Event.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/EventBus.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/EventPublisherOptions.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/connection/ConnectedEvent.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/connection/ConnectionActivatedEvent.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/connection/ConnectionDeactivatedEvent.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/connection/ConnectionEvent.java (85%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/connection/ConnectionEventSupport.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/connection/DisconnectedEvent.java (94%)
 create mode 100644 src/main/java/io/lettuce/core/event/connection/package-info.java
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/metrics/CommandLatencyEvent.java (87%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/metrics/DefaultCommandLatencyEventPublisher.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/metrics/MetricEventPublisher.java (91%)
 create mode 100644 src/main/java/io/lettuce/core/event/metrics/package-info.java
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/event/package-info.java (55%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/internal/AbstractInvocationHandler.java (99%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/internal/HostAndPort.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/internal/LettuceAssert.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/internal/LettuceClassUtils.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/internal/LettuceFactories.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/internal/LettuceLists.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/internal/LettuceSets.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/internal/package-info.java (76%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/AsyncConnections.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/Connections.java (85%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlave.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveChannelWriter.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveConnectionProvider.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveTopologyProvider.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveTopologyRefresh.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveUtils.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/NodeConnectionFactory.java (87%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/ReadOnlyCommands.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/RedisMasterSlaveNode.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/ReflectiveNodeConnectionFactory.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/RefreshFutures.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/Requests.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/SentinelTopologyProvider.java (88%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/SentinelTopologyRefresh.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/StatefulRedisMasterSlaveConnection.java (89%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/StatefulRedisMasterSlaveConnectionImpl.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/StaticMasterSlaveTopologyProvider.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/TimedAsyncCommand.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/Timeout.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/TopologyComparators.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/TopologyProvider.java (87%)
 create mode 100644 src/main/java/io/lettuce/core/masterslave/package-info.java
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/CommandLatencyCollector.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/CommandLatencyCollectorOptions.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/CommandLatencyId.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/CommandMetrics.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/DefaultCommandLatencyCollector.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/DefaultCommandLatencyCollectorOptions.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/MetricCollector.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/package-info.java (52%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/command/CommandDetail.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/command/CommandDetailParser.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/command/package-info.java (65%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/RedisInstance.java (85%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/RedisMasterInstance.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/RedisNodeDescription.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/RedisSentinelInstance.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/RedisSlaveInstance.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/ReplicationPartner.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/RoleParser.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/package-info.java (57%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ArrayOutput.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/BooleanListOutput.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/BooleanOutput.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ByteArrayOutput.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/CommandOutput.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/DateOutput.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/DefaultTransactionResult.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/DoubleOutput.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/GeoCoordinatesListOutput.java (87%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/GeoCoordinatesValueListOutput.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/GeoWithinListOutput.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/IntegerOutput.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyListOutput.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyOutput.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyScanOutput.java (83%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyScanStreamingOutput.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyStreamingChannel.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyStreamingOutput.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyValueListOutput.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyValueOutput.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyValueScanStreamingOutput.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyValueStreamingChannel.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/KeyValueStreamingOutput.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ListOfMapsOutput.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ListSubscriber.java (87%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/MapOutput.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/MapScanOutput.java (85%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/MultiOutput.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/NestedMultiOutput.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ScanOutput.java (88%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ScoredValueListOutput.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ScoredValueScanOutput.java (83%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ScoredValueScanStreamingOutput.java (89%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ScoredValueStreamingChannel.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ScoredValueStreamingOutput.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/StatusOutput.java (87%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/StreamingChannel.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/StreamingOutput.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/StringListOutput.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/StringValueListOutput.java (87%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ValueListOutput.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ValueOutput.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ValueScanOutput.java (83%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ValueScanStreamingOutput.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ValueSetOutput.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ValueStreamingChannel.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ValueStreamingOutput.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/ValueValueListOutput.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/package-info.java (69%)
 create mode 100644 src/main/java/io/lettuce/core/package-info.java
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/AsyncCommand.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/BaseRedisCommandBuilder.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/ChannelLogDescriptor.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/Command.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandArgs.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandEncoder.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandHandler.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandKeyword.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandType.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandWrapper.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CompleteableCommand.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/ConnectionFacade.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/ConnectionWatchdog.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/DecoratedCommand.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/DefaultEndpoint.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/DemandAware.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/Endpoint.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/HasQueuedCommands.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/LettuceCharsets.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/ProtocolKeyword.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/QueuedCommands.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/ReconnectionHandler.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/ReconnectionListener.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/RedisCommand.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/RedisStateMachine.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/SharedLock.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/TransactionalCommand.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/WithLatency.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/package-info.java (52%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/PubSubCommandArgs.java (89%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/PubSubCommandBuilder.java (78%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/PubSubCommandHandler.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/PubSubEndpoint.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/PubSubOutput.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/RedisPubSubAdapter.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/RedisPubSubAsyncCommandsImpl.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/RedisPubSubListener.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/RedisPubSubReactiveCommandsImpl.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/StatefulRedisPubSubConnection.java (83%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/StatefulRedisPubSubConnectionImpl.java (89%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/api/async/RedisPubSubAsyncCommands.java (87%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/api/async/package-info.java (57%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/api/reactive/ChannelMessage.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/api/reactive/PatternMessage.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/api/reactive/RedisPubSubReactiveCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/api/reactive/package-info.java (58%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/api/sync/RedisPubSubCommands.java (88%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/api/sync/package-info.java (57%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/package-info.java (50%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/ClientResources.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/ConstantDelay.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DecorrelatedJitterDelay.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DefaultClientResources.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DefaultEventLoopGroupProvider.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/Delay.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DirContextDnsResolver.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DnsResolver.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DnsResolvers.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/EqualJitterDelay.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/EventLoopGroupProvider.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/ExponentialDelay.java (98%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/FullJitterDelay.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/Futures.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/SocketAddressResolver.java (86%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/resource/package-info.java (56%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/RedisSentinelAsyncCommandsImpl.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/RedisSentinelReactiveCommandsImpl.java (91%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/SentinelCommandBuilder.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/StatefulRedisSentinelConnectionImpl.java (81%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/api/StatefulRedisSentinelConnection.java (82%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/api/async/RedisSentinelAsyncCommands.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/api/async/package-info.java (56%)
 create mode 100644 src/main/java/io/lettuce/core/sentinel/api/package-info.java
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/api/reactive/RedisSentinelReactiveCommands.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/api/reactive/package-info.java (58%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/api/sync/RedisSentinelCommands.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/api/sync/package-info.java (57%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/package-info.java (53%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/AbstractCdiBean.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/ClientResourcesFactoryBean.java (94%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/ConnectionPoolSupport.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/LettuceCdiExtension.java (95%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/LettuceFactoryBeanSupport.java (92%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/RedisClientCdiBean.java (90%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/RedisClientFactoryBean.java (88%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/RedisClusterClientCdiBean.java (89%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/support/RedisClusterClientFactoryBean.java (89%)
 create mode 100644 src/main/java/io/lettuce/core/support/package-info.java
 rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/BaseRedisCommands.java (94%)
 rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisGeoCommands.java (98%)
 rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisHLLCommands.java (94%)
 rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisHashCommands.java (94%)
 rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisKeyCommands.java (95%)
 rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisListCommands.java (95%)
 rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisScriptingCommands.java (93%)
 rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisSentinelCommands.java (94%)
 rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisServerCommands.java (95%)
 rename src/main/{java/com/lambdaworks/redis/api/sync => templates/io/lettuce/core/api}/RedisSetCommands.java (93%)
 rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisSortedSetCommands.java (99%)
 rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisStringCommands.java (96%)
 rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisTransactionalCommands.java (92%)
 delete mode 100644 src/site/markdown/download.md.vm
 delete mode 100644 src/site/markdown/index.md.vm
 delete mode 100644 src/site/site.xml
 rename src/test/java/{com/lambdaworks => io/lettuce}/CanConnect.java (95%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/ConnectionTestUtil.java (88%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/Delay.java (91%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/Futures.java (92%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/KeysAndValues.java (95%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/LoggingTestRule.java (98%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/Sockets.java (93%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/SslTest.java (94%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/TestClientResources.java (79%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/Wait.java (91%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/apigenerator/CompilationUnitFactory.java (99%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/apigenerator/Constants.java (96%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/apigenerator/CreateAsyncApi.java (92%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/apigenerator/CreateAsyncNodeSelectionClusterApi.java (94%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/apigenerator/CreateReactiveApi.java (95%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/apigenerator/CreateSyncApi.java (93%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/apigenerator/CreateSyncNodeSelectionClusterApi.java (96%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/apigenerator/GenerateCommandInterfaces.java (96%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/category/SlowTests.java (95%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/codec/CRC16Test.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/AbstractRedisClientTest.java (94%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/AbstractTest.java (94%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/AllTheAPIsTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/AsyncConnectionTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ClientMetricsTest.java (88%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ClientOptionsTest.java (96%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ClientTest.java (94%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ConnectionCommandTest.java (96%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/CustomCodecTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/DefaultRedisClient.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/FastShutdown.java (92%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/GeoModelTest.java (99%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/JavaRuntimeTest.java (90%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/KeyValueStreamingAdapter.java (88%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/KeyValueTest.java (99%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/LettuceFuturesTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/LimitTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ListStreamingAdapter.java (86%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/PipeliningTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/PrivateAccessorTest.java (81%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/RangeTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ReactiveBackpressurePropagationTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ReactiveConnectionTest.java (96%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ReactiveStreamingOutputTest.java (94%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/RedisClientConnectionTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/RedisClientFactoryBeanTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/RedisClientFactoryTest.java (92%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/RedisClientListenerTest.java (94%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/RedisClientTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/RedisURIBuilderTest.java (99%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/RedisURITest.java (99%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ScanCursorTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ScanIteratorTest.java (99%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ScoredValueStreamingAdapter.java (91%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ScoredValueTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/SocketOptionsTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/SyncAsyncApiConvergenceTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/TestEventLoopGroupProvider.java (88%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/TestRedisPublisher.java (89%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/TestSettings.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/UnixDomainSocketTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/Utf8StringCodecTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/ValueTest.java (99%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/AbstractClusterTest.java (88%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/AdvancedClusterClientTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/AdvancedClusterReactiveTest.java (94%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ByteCodecClusterTest.java (87%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterClientOptionsTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterCommandInternalsTest.java (90%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterCommandTest.java (90%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterDistributionChannelWriterTest.java (92%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterNodeEndpointTest.java (89%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterPartiallyDownTest.java (91%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterPartitionParserTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterReactiveCommandTest.java (87%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterRule.java (91%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterSetup.java (91%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterTestUtil.java (84%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterTopologyRefreshOptionsTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterTopologyRefreshSchedulerTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/HealthyMajorityPartitionsConsensusTest.java (89%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/KnownMajorityPartitionsConsensusTest.java (91%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/NodeSelectionAsyncTest.java (91%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/NodeSelectionSyncTest.java (91%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PartitionsConsensusTestSupport.java (87%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PipelinedRedisFutureTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/PooledClusterConnectionProviderTest.java (88%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ReadFromTest.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ReadOnlyCommandsTest.java (89%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterClientFactoryTest.java (94%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterClientTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterPasswordSecuredSslTest.java (89%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterReadFromTest.java (89%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterSetupTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterStressScenariosTest.java (87%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterURIUtilTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisReactiveClusterClientTest.java (88%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/RoundRobinSocketAddressSupplierTest.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/ScanIteratorTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/SlotHashTest.java (96%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/SynchronizingClusterConnectionProviderTest.java (96%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/CustomClusterCommandTest.java (87%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/GeoClusterCommandTest.java (82%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/HashClusterCommandTest.java (77%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/KeyClusterCommandTest.java (86%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/ListClusterCommandTest.java (85%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/StringClusterCommandTest.java (85%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/reactive/HashClusterReactiveCommandTest.java (75%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/reactive/KeyClusterReativeCommandTest.java (73%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/reactive/ListClusterReactiveCommandTest.java (85%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/commands/reactive/StringClusterReactiveCommandTest.java (80%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/partitions/PartitionsTest.java (99%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/partitions/RedisClusterNodeTest.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/models/slots/ClusterSlotsParserTest.java (96%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/PubSubClusterTest.java (89%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/pubsub/PubSubConnectionTest.java (91%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/ClusterTopologyRefreshTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/NodeTopologyViewsTest.java (96%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/RequestsTest.java (94%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/TopologyComparatorsTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/topology/TopologyRefreshTest.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/codec/CompressionCodecTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/codec/StringCodecTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/BitCommandTest.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/CustomCommandTest.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/GeoCommandTest.java (99%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/HLLCommandTest.java (94%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/HashCommandTest.java (99%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/KeyCommandTest.java (99%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/ListCommandTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/NumericCommandTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/RunOnlyOnceServerCommandTest.java (90%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/ScriptingCommandTest.java (94%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/ServerCommandTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/SetCommandTest.java (99%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/SortCommandTest.java (86%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/SortedSetCommandTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/StringCommandTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/TransactionCommandTest.java (92%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/BitReactiveCommandTest.java (84%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/CustomReactiveCommandTest.java (79%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/GeoReactiveCommandTest.java (86%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/HLLReactiveCommandTest.java (80%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/HashReactiveCommandTest.java (80%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/KeyReactiveCommandTest.java (80%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/ListReactiveCommandTest.java (80%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/NumericReactiveCommandTest.java (79%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/ScriptingReactiveCommandTest.java (79%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/ServerReactiveCommandTest.java (88%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/SetReactiveCommandTest.java (80%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/SortReactiveCommandTest.java (80%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/SortedSetReactiveCommandTest.java (79%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/StringReactiveCommandTest.java (85%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/reactive/TransactionReactiveCommandTest.java (91%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/BitTxCommandTest.java (85%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/GeoTxCommandTest.java (91%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/HLLTxCommandTest.java (84%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/HashTxCommandTest.java (84%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/KeyTxCommandTest.java (85%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/ListTxCommandTest.java (84%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/SetTxCommandTest.java (84%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/SortTxCommandTest.java (84%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/SortedSetTxCommandTest.java (83%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/StringTxCommandTest.java (83%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/transactional/TxSyncInvocationHandler.java (92%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/BatchExecutableCommandLookupStrategyTest.java (90%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/CommandSegmentCommandFactoryTest.java (85%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ConversionServiceTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/DeclaredCommandMethodTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/DefaultCommandMethodVerifierTest.java (90%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ParameterBinderTest.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ReactiveCommandSegmentCommandFactoryTest.java (83%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ReactiveTypeAdaptersTest.java (99%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/ReactiveTypeAdaptionTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandsAsyncTest.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandsBatchingTest.java (91%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandsClusterSyncTest.java (83%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandsReactiveTest.java (89%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandsSyncTest.java (86%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandsTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/SimpleBatcherTest.java (92%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/codec/AnnotationRedisCodecResolverTest.java (85%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/codec/ParameterWrappersTest.java (89%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/intercept/InvocationProxyFactoryTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/CodecAwareOutputResolverTest.java (92%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/output/OutputRegistryTest.java (90%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/segment/AnnotationCommandSegmentFactoryTest.java (89%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/ParametrizedTypeInformationTest.java (99%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/dynamic/support/WildcardTypeInformationTest.java (96%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/event/ConnectionEventsTriggeredTest.java (86%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/event/DefaultEventBusTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/event/DefaultEventPublisherOptionsTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/internal/AbstractInvocationHandlerTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/internal/HostAndPortTest.java (99%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/CustomCommandTest.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveChannelWriterTest.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveConnectionProviderTest.java (86%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveSentinelTest.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveTest.java (94%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveTopologyProviderTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/MasterSlaveUtilsTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/SentinelTopologyRefreshTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/masterslave/StaticMasterSlaveTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/CommandLatencyIdTest.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/DefaultCommandLatencyCollectorTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/models/command/CommandDetailParserTest.java (96%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/models/role/RoleParserTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/output/BooleanListOutputTest.java (94%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/output/GeoCoordinatesListOutputTest.java (90%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/output/GeoCoordinatesValueListOutputTest.java (89%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/output/GeoWithinListOutputTest.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/output/ListOutputTest.java (96%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/output/NestedMultiOutputTest.java (84%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/output/ScoredValueListOutputTest.java (91%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/AsyncCommandInternalsTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandArgsTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandHandlerTest.java (96%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandInternalsTest.java (91%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/ConnectionFailureTest.java (96%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/DefaultEndpointTest.java (96%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/StateMachineTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/PubSubCommandTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/pubsub/PubSubReactiveTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/reactive/RedisPublisherVerification.java (84%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/reliability/AtLeastOnceTest.java (96%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/reliability/AtMostOnceTest.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/ConstantDelayTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DecorrelatedJitterDelayTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DefaultClientResourcesTest.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DefaultEventLoopGroupProviderTest.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/DirContextDnsResolverTest.java (99%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/EqualJitterDelayTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/ExponentialDelayTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/FullJitterDelayTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/resource/FuturesTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/AbstractSentinelTest.java (85%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/SentinelCommandTest.java (94%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/SentinelConnectionTest.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/SentinelRule.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/SentinelServerCommandTest.java (91%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/reactive/SentinelReactiveCommandTest.java (77%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/sentinel/reactive/SentinelServerReactiveCommandTest.java (77%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/server/RandomResponseServer.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/server/RandomServerHandler.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/support/CdiTest.java (89%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/support/ConnectionPoolSupportTest.java (92%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/support/InjectedClient.java (88%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/support/PersonDB.java (95%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/support/PubSubTestListener.java (93%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/support/RedisClusterClientFactoryBeanTest.java (98%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/support/SpringTest.java (93%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToElastiCacheMaster.java (83%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java (78%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToMasterSlaveUsingRedisSentinel.java (79%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToRedis.java (89%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToRedisCluster.java (87%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToRedisClusterSSL.java (86%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToRedisClusterWithTopologyRefreshing.java (85%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToRedisSSL.java (89%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ConnectToRedisUsingRedisSentinel.java (89%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/examples/MySpringBean.java (86%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/examples/ReadWriteExample.java (85%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/examples/SpringExample.java (88%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/util/ConnectionDecoratingInvocationHandler.java (84%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/util/ReactiveSyncInvocationHandler.java (89%)
 rename src/test/java/{com/lambdaworks => io/lettuce}/util/RoutingInvocationHandler.java (93%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/EmptyRedisChannelWriter.java (91%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/EmptyStatefulRedisConnection.java (86%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/RedisClientBenchmark.java (96%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/cluster/ClusterDistributionChannelWriterBenchmark.java (88%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/cluster/EmptyRedisClusterClient.java (80%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/cluster/RedisClusterClientBenchmark.java (92%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/codec/JmhMain.java (97%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/codec/StringCodecBenchmark.java (96%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/codec/Utf8StringCodecBenchmark.java (94%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandFactoryBenchmark.java (90%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/dynamic/RedisCommandsBenchmark.java (87%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/dynamic/intercept/InvocationProxyFactoryBenchmark.java (97%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandBenchmark.java (89%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandHandlerBenchmark.java (91%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/EmptyByteBuf.java (99%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/EmptyClientResources.java (84%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/EmptyContext.java (99%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/EmptyFuture.java (98%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/EmptyPromise.java (99%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/JmhMain.java (98%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/RedisEndpointBenchmark.java (91%)
 rename src/test/jmh/{com/lambdaworks/redis => io/lettuce/core}/protocol/RedisStateMachineBenchmark.java (94%)
 rename src/test/resources/{com/lambdaworks/redis => io/lettuce/core}/support/SpringTest-context.xml (61%)
 rename src/test/resources/{com/lambdaworks => io/lettuce}/examples/SpringTest-context.xml (69%)

diff --git a/README.md b/README.md
index d4ceedb753..d325f2f755 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,6 @@ Supports advanced Redis features such as Sentinel, Cluster, Pipelining, Auto-Rec
 
 This version of lettuce has been tested against the latest Redis source-build.
 
-* lettuce 3.x works with Java 6, 7 and 8, lettuce 4.x requires Java 8
 * [synchronous](https://github.com/mp911de/lettuce/wiki/Basic-usage), [asynchronous](https://github.com/mp911de/lettuce/wiki/Asynchronous-API-%284.0%29) and [reactive](https://github.com/mp911de/lettuce/wiki/Reactive-API-%284.0%29) usage
 * [Redis Sentinel](https://github.com/mp911de/lettuce/wiki/Redis-Sentinel)
 * [Redis Cluster](https://github.com/mp911de/lettuce/wiki/Redis-Cluster)
@@ -50,24 +49,24 @@ Example for Maven:
 
 ```xml
 <dependency>
-  <groupId>biz.paluch.redis</groupId>
-  <artifactId>lettuce</artifactId>
+  <groupId>io.lettuce</groupId>
+  <artifactId>lettuce-core</artifactId>
   <version>x.y.z</version>
 </dependency>
 ```
 
-Shaded JAR-File (packaged dependencies  and relocated to the `com.lambdaworks` package to prevent version conflicts)
+Shaded JAR-File (packaged dependencies  and relocated to the `io.lettuce.core` package to prevent version conflicts)
 
 ```xml
 <dependency>
-  <groupId>biz.paluch.redis</groupId>
-  <artifactId>lettuce</artifactId>
+  <groupId>io.lettuce</groupId>
+  <artifactId>lettuce-core</artifactId>
   <version>x.y.z</version>
   <classifier>shaded</classifier>
   <exclusions>
     <exclusion>
-      <groupId>io.reactivex</groupId>
-      <artifactId>rxjava</artifactId>
+      <groupId>io.projectreactor</groupId>
+      <artifactId>reactor-core</artifactId>
     </exclusion>
     <exclusion>
       <groupId>org.latencyutils</groupId>
@@ -89,10 +88,6 @@ Shaded JAR-File (packaged dependencies  and relocated to the `com.lambdaworks` p
       <groupId>io.netty</groupId>
       <artifactId>netty-codec</artifactId>
     </exclusion>
-    <exclusion>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </exclusion>
     <exclusion>
       <groupId>io.netty</groupId>
       <artifactId>netty-transport-native-epoll</artifactId>
diff --git a/pom.xml b/pom.xml
index dd2778b916..4a0a2adcb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,13 +8,13 @@
         <version>9</version>
     </parent>
 
-    <groupId>biz.paluch.redis</groupId>
-    <artifactId>lettuce</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <groupId>io.lettuce</groupId>
+    <artifactId>lettuce-core</artifactId>
+    <version>5.0.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>lettuce</name>
-    <url>http://github.com/mp911de/lettuce/wiki</url>
+    <url>http://github.com/lettuce-io/lettuce-core</url>
     <description>Advanced and thread-safe Java Redis client for synchronous, asynchronous, and
         reactive usage. Supports Cluster, Sentinel, Pipelining, Auto-Reconnect, Codecs
         and much more.
@@ -30,12 +30,12 @@
 
     <ciManagement>
         <system>Travis CI</system>
-        <url>https://travis-ci.org/mp911de/lettuce</url>
+        <url>https://travis-ci.org/lettuce-io/lettuce-core</url>
     </ciManagement>
 
     <issueManagement>
         <system>Github</system>
-        <url>https://github.com/mp911de/lettuce/issues</url>
+        <url>https://github.com/lettuce-io/lettuce-core/issues</url>
     </issueManagement>
 
     <developers>
@@ -63,9 +63,9 @@
     </properties>
 
     <scm>
-        <connection>scm:git:https://github.com/mp911de/lettuce.git</connection>
-        <developerConnection>scm:git:https://github.com/mp911de/lettuce.git</developerConnection>
-        <url>http://github.com/mp911de/lettuce</url>
+        <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
+        <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
+        <url>http://github.com/lettuce-io/lettuce-core</url>
         <tag>HEAD</tag>
     </scm>
 
@@ -670,79 +670,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.4</version>
-                <configuration>
-                    <relativizeDecorationLinks>false</relativizeDecorationLinks>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.doxia</groupId>
-                        <artifactId>doxia-module-markdown</artifactId>
-                        <version>1.6</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven.scm</groupId>
-                        <artifactId>maven-scm-provider-gitexe</artifactId>
-                        <version>1.9</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <version>1.1</version>
-                <configuration>
-                    <scmBranch>gh-pages</scmBranch>
-                    <content>${project.build.directory}/site</content>
-                    <skipCheckin>${github.site.upload.skip}</skipCheckin>
-                    <skipDeletedFiles>true</skipDeletedFiles>
-                    <pubScmUrl>scm:git:ssh://git@github.com/mp911de/redis.paluch.biz.git</pubScmUrl>
-                    <excludes>apidocs/**</excludes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.7</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>plugin-management</report>
-                            <report>distribution-management</report>
-                            <report>dependency-info</report>
-                            <report>dependencies</report>
-                            <report>scm</report>
-                            <report>issue-tracking</report>
-                            <report>cim</report>
-                            <report>dependency-management</report>
-                            <report>project-team</report>
-                            <report>summary</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
-
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/libs-snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
 </project>
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index 0dfa47f183..b7b0f88720 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -12,7 +12,7 @@
     <dependencySets>
         <dependencySet>
             <includes>
-                <include>biz.paluch.redis:lettuce:jar:${project.version}</include>
+                <include>io.lettuce:lettuce-core:jar:${project.version}</include>
             </includes>
             <outputDirectory></outputDirectory>
             <unpack>false</unpack>
@@ -41,7 +41,7 @@
         </dependencySet>
         <dependencySet>
             <includes>
-                <include>biz.paluch.redis:lettuce:*:javadoc</include>
+                <include>io.lettuce:lettuce-core:*:javadoc</include>
             </includes>
             <outputDirectory>apidocs</outputDirectory>
             <unpack>true</unpack>
diff --git a/src/main/java/com/lambdaworks/codec/package-info.java b/src/main/java/com/lambdaworks/codec/package-info.java
deleted file mode 100644
index c48584f769..0000000000
--- a/src/main/java/com/lambdaworks/codec/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Base16 and CRC16 codecs.
- */
-package com.lambdaworks.codec;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/package-info.java b/src/main/java/com/lambdaworks/redis/cluster/api/package-info.java
deleted file mode 100644
index cf228a573c..0000000000
--- a/src/main/java/com/lambdaworks/redis/cluster/api/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Redis Cluster connection API.
- */
-package com.lambdaworks.redis.cluster.api;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/event/package-info.java b/src/main/java/com/lambdaworks/redis/cluster/event/package-info.java
deleted file mode 100644
index 75bb219e15..0000000000
--- a/src/main/java/com/lambdaworks/redis/cluster/event/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Cluster event types.
- */
-package com.lambdaworks.redis.cluster.event;
-
diff --git a/src/main/java/com/lambdaworks/redis/cluster/package-info.java b/src/main/java/com/lambdaworks/redis/cluster/package-info.java
deleted file mode 100644
index 18a2d1dc02..0000000000
--- a/src/main/java/com/lambdaworks/redis/cluster/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Client for Redis Cluster, see {@link com.lambdaworks.redis.cluster.RedisClusterClient}.
- */
-package com.lambdaworks.redis.cluster;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/intercept/package-info.java
deleted file mode 100644
index dfeb3d6fa9..0000000000
--- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Invocation proxy support.
- */
-package com.lambdaworks.redis.dynamic.intercept;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/output/package-info.java
deleted file mode 100644
index e558ad6cbf..0000000000
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * {@link com.lambdaworks.redis.output.CommandOutput} resolution support.
- */
-package com.lambdaworks.redis.dynamic.output;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/package-info.java
deleted file mode 100644
index d3d087a524..0000000000
--- a/src/main/java/com/lambdaworks/redis/dynamic/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Core package for Redis Command Interface support through {@link com.lambdaworks.redis.dynamic.RedisCommandFactory}.
- */
-package com.lambdaworks.redis.dynamic;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/parameter/package-info.java
deleted file mode 100644
index 4ddb28ac0f..0000000000
--- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Parameter access and descriptors.
- */
-package com.lambdaworks.redis.dynamic.parameter;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/package-info.java b/src/main/java/com/lambdaworks/redis/dynamic/segment/package-info.java
deleted file mode 100644
index 2826cdedf7..0000000000
--- a/src/main/java/com/lambdaworks/redis/dynamic/segment/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Support for {@link com.lambdaworks.redis.dynamic.segment.CommandSegments} and segment parsing.
- */
-package com.lambdaworks.redis.dynamic.segment;
diff --git a/src/main/java/com/lambdaworks/redis/event/connection/package-info.java b/src/main/java/com/lambdaworks/redis/event/connection/package-info.java
deleted file mode 100644
index 61d07650fc..0000000000
--- a/src/main/java/com/lambdaworks/redis/event/connection/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Connection-related events.
- */
-package com.lambdaworks.redis.event.connection;
-
diff --git a/src/main/java/com/lambdaworks/redis/event/metrics/package-info.java b/src/main/java/com/lambdaworks/redis/event/metrics/package-info.java
deleted file mode 100644
index 9665bcda23..0000000000
--- a/src/main/java/com/lambdaworks/redis/event/metrics/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Metric events and publishing.
- */
-package com.lambdaworks.redis.event.metrics;
-
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/package-info.java b/src/main/java/com/lambdaworks/redis/masterslave/package-info.java
deleted file mode 100644
index e55b21491f..0000000000
--- a/src/main/java/com/lambdaworks/redis/masterslave/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Client support for Redis Master/Slave setups. {@link com.lambdaworks.redis.masterslave.MasterSlave} supports self-managed,
- * Redis Sentinel-managed, AWS ElastiCache and Azure Redis managed Master/Slave setups.
- */
-package com.lambdaworks.redis.masterslave;
diff --git a/src/main/java/com/lambdaworks/redis/package-info.java b/src/main/java/com/lambdaworks/redis/package-info.java
deleted file mode 100644
index a55a3a7f0f..0000000000
--- a/src/main/java/com/lambdaworks/redis/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * The redis client package containing {@link com.lambdaworks.redis.RedisClient} for regular and sentinel operations.
- */
-package com.lambdaworks.redis;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/package-info.java b/src/main/java/com/lambdaworks/redis/sentinel/api/package-info.java
deleted file mode 100644
index 088f267527..0000000000
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Redis Sentinel connection API.
- */
-package com.lambdaworks.redis.sentinel.api;
diff --git a/src/main/java/com/lambdaworks/redis/support/package-info.java b/src/main/java/com/lambdaworks/redis/support/package-info.java
deleted file mode 100644
index 274f0f7446..0000000000
--- a/src/main/java/com/lambdaworks/redis/support/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Supportive classes such as {@link com.lambdaworks.redis.support.RedisClientCdiBean} for CDI support, {@link com.lambdaworks.redis.support.RedisClientFactoryBean} for Spring.
- */
-package com.lambdaworks.redis.support;
-
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
similarity index 99%
rename from src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
rename to src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index e306fb2d9e..3229dbfb02 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.redis.protocol.CommandType.EXEC;
+import static io.lettuce.core.protocol.CommandType.EXEC;
 
 import java.util.Date;
 import java.util.List;
@@ -23,14 +23,14 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.GeoArgs.Unit;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.async.*;
-import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.output.*;
-import com.lambdaworks.redis.protocol.*;
+import io.lettuce.core.GeoArgs.Unit;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.async.*;
+import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.output.*;
+import io.lettuce.core.protocol.*;
 
 /**
  * An asynchronous and thread-safe API for a Redis connection.
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
rename to src/main/java/io/lettuce/core/AbstractRedisClient.java
index 431099ec41..77b294efcd 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.io.Closeable;
 import java.net.SocketAddress;
@@ -25,11 +25,11 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.Transports.NativeTransports;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.ConnectionWatchdog;
-import com.lambdaworks.redis.resource.ClientResources;
-import com.lambdaworks.redis.resource.DefaultClientResources;
+import io.lettuce.core.Transports.NativeTransports;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.ConnectionWatchdog;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.DefaultClientResources;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.PooledByteBufAllocator;
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
similarity index 99%
rename from src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
rename to src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index f111005f0f..75965c4834 100644
--- a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.redis.protocol.CommandType.EXEC;
+import static io.lettuce.core.protocol.CommandType.EXEC;
 
 import java.util.Date;
 import java.util.Map;
@@ -25,14 +25,14 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import com.lambdaworks.redis.GeoArgs.Unit;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.reactive.*;
-import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.output.*;
-import com.lambdaworks.redis.protocol.*;
+import io.lettuce.core.GeoArgs.Unit;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.reactive.*;
+import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.output.*;
+import io.lettuce.core.protocol.*;
 
 /**
  * A reactive and thread-safe API for a Redis connection.
diff --git a/src/main/java/com/lambdaworks/redis/BitFieldArgs.java b/src/main/java/io/lettuce/core/BitFieldArgs.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/BitFieldArgs.java
rename to src/main/java/io/lettuce/core/BitFieldArgs.java
index 3c1b22d2b2..e0ee570560 100644
--- a/src/main/java/com/lambdaworks/redis/BitFieldArgs.java
+++ b/src/main/java/io/lettuce/core/BitFieldArgs.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.redis.protocol.LettuceCharsets;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.LettuceCharsets;
+import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
  * Arguments and types for the {@code BITFIELD} command.
@@ -620,7 +620,7 @@ public String toString() {
     /**
      * Represents a bit field offset. See also <a href="http://redis.io/commands/bitfield#bits-and-positional-offsets">Bits and
      * positional offsets</a>
-     * 
+     *
      * @since 4.3
      */
     public static class Offset {
diff --git a/src/main/java/com/lambdaworks/redis/ChannelGroupListener.java b/src/main/java/io/lettuce/core/ChannelGroupListener.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/ChannelGroupListener.java
rename to src/main/java/io/lettuce/core/ChannelGroupListener.java
index c2e67e9837..49671d9bd0 100644
--- a/src/main/java/com/lambdaworks/redis/ChannelGroupListener.java
+++ b/src/main/java/io/lettuce/core/ChannelGroupListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
@@ -23,7 +23,7 @@
 /**
  * A netty {@link ChannelHandler} responsible for monitoring the channel and adding/removing the channel from/to the
  * ChannelGroup.
- * 
+ *
  * @author Will Glozer
  */
 class ChannelGroupListener extends ChannelInboundHandlerAdapter {
diff --git a/src/main/java/com/lambdaworks/redis/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/ClientOptions.java
rename to src/main/java/io/lettuce/core/ClientOptions.java
index 9a685c065c..888f53af80 100644
--- a/src/main/java/com/lambdaworks/redis/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.io.Serializable;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Client Options to control the behavior of {@link RedisClient}.
- * 
+ *
  * @author Mark Paluch
  */
 public class ClientOptions implements Serializable {
@@ -87,7 +87,7 @@ public static ClientOptions.Builder builder() {
 
     /**
      * Create a new instance of {@link ClientOptions} with default settings.
-     * 
+     *
      * @return a new instance of {@link ClientOptions} with default settings
      */
     public static ClientOptions create() {
@@ -114,7 +114,7 @@ protected Builder() {
         /**
          * Sets the {@literal PING} before activate connection flag. Defaults to {@literal false}. See
          * {@link #DEFAULT_PING_BEFORE_ACTIVATE_CONNECTION}.
-         * 
+         *
          * @param pingBeforeActivateConnection true/false
          * @return {@code this}
          */
@@ -126,7 +126,7 @@ public Builder pingBeforeActivateConnection(boolean pingBeforeActivateConnection
         /**
          * Enables or disables auto reconnection on connection loss. Defaults to {@literal true}. See
          * {@link #DEFAULT_AUTO_RECONNECT}.
-         * 
+         *
          * @param autoReconnect true/false
          * @return {@code this}
          */
@@ -138,7 +138,7 @@ public Builder autoReconnect(boolean autoReconnect) {
         /**
          * Suspends reconnect when reconnects run into protocol failures (SSL verification, PING before connect fails). Defaults
          * to {@literal false}. See {@link #DEFAULT_SUSPEND_RECONNECT_PROTO_FAIL}.
-         * 
+         *
          * @param suspendReconnectOnProtocolFailure true/false
          * @return {@code this}
          */
@@ -150,7 +150,7 @@ public Builder suspendReconnectOnProtocolFailure(boolean suspendReconnectOnProto
         /**
          * Allows cancelling queued commands in case a reconnect fails.Defaults to {@literal false}. See
          * {@link #DEFAULT_CANCEL_CMD_RECONNECT_FAIL}.
-         * 
+         *
          * @param cancelCommandsOnReconnectFailure true/false
          * @return {@code this}
          */
@@ -177,7 +177,7 @@ public Builder requestQueueSize(int requestQueueSize) {
         /**
          * Sets the behavior for command invocation when connections are in a disconnected state. Defaults to {@literal true}.
          * See {@link #DEFAULT_DISCONNECTED_BEHAVIOR}.
-         * 
+         *
          * @param disconnectedBehavior must not be {@literal null}.
          * @return {@code this}
          */
@@ -217,7 +217,7 @@ public Builder sslOptions(SslOptions sslOptions) {
 
         /**
          * Create a new instance of {@link ClientOptions}.
-         * 
+         *
          * @return new instance of {@link ClientOptions}
          */
         public ClientOptions build() {
@@ -242,7 +242,7 @@ public boolean isPingBeforeActivateConnection() {
      * queued commands.
      *
      * This flag has also the effect that disconnected connections will refuse commands and cancel these with an exception.
-     * 
+     *
      * @return {@literal true} if auto-reconnect is enabled.
      */
     public boolean isAutoReconnect() {
@@ -252,7 +252,7 @@ public boolean isAutoReconnect() {
     /**
      * If this flag is {@literal true} any queued commands will be canceled when a reconnect fails within the activation
      * sequence. Default is {@literal false}.
-     * 
+     *
      * @return {@literal true} if commands should be cancelled on reconnect failures.
      */
     public boolean isCancelCommandsOnReconnectFailure() {
@@ -262,7 +262,7 @@ public boolean isCancelCommandsOnReconnectFailure() {
     /**
      * If this flag is {@literal true} the reconnect will be suspended on protocol errors. Protocol errors are errors while SSL
      * negotiation or when PING before connect fails.
-     * 
+     *
      * @return {@literal true} if reconnect will be suspended on protocol errors.
      */
     public boolean isSuspendReconnectOnProtocolFailure() {
@@ -273,7 +273,7 @@ public boolean isSuspendReconnectOnProtocolFailure() {
      * Request queue size for a connection. This value applies per connection. The command invocation will throw a
      * {@link RedisException} if the queue size is exceeded and a new command is requested. Defaults to
      * {@link Integer#MAX_VALUE}.
-     * 
+     *
      * @return the request queue size.
      */
     public int getRequestQueueSize() {
@@ -283,7 +283,7 @@ public int getRequestQueueSize() {
     /**
      * Behavior for command invocation when connections are in a disconnected state. Defaults to
      * {@link DisconnectedBehavior#DEFAULT true}. See {@link #DEFAULT_DISCONNECTED_BEHAVIOR}.
-     * 
+     *
      * @return the behavior for command invocation when connections are in a disconnected state
      */
     public DisconnectedBehavior getDisconnectedBehavior() {
@@ -292,7 +292,7 @@ public DisconnectedBehavior getDisconnectedBehavior() {
 
     /**
      * Returns the {@link SocketOptions}.
-     * 
+     *
      * @return the {@link SocketOptions}.
      */
     public SocketOptions getSocketOptions() {
diff --git a/src/main/java/com/lambdaworks/redis/CloseEvents.java b/src/main/java/io/lettuce/core/CloseEvents.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/CloseEvents.java
rename to src/main/java/io/lettuce/core/CloseEvents.java
index 2cd4b28498..4da7672b4c 100644
--- a/src/main/java/com/lambdaworks/redis/CloseEvents.java
+++ b/src/main/java/io/lettuce/core/CloseEvents.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.Set;
 
@@ -21,7 +21,7 @@
 
 /**
  * Close Events Facility. Can register/unregister CloseListener and fire a closed event to all registered listeners.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
diff --git a/src/main/java/com/lambdaworks/redis/CompositeArgument.java b/src/main/java/io/lettuce/core/CompositeArgument.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/CompositeArgument.java
rename to src/main/java/io/lettuce/core/CompositeArgument.java
index d7f2811e59..7e44693eb3 100644
--- a/src/main/java/com/lambdaworks/redis/CompositeArgument.java
+++ b/src/main/java/io/lettuce/core/CompositeArgument.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import com.lambdaworks.redis.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandArgs;
 
 /**
  * Interface for composite command argument objects. Implementing classes of {@link CompositeArgument} consolidate multiple
@@ -24,7 +24,7 @@
  * <p>
  * Command builder call {@link #build(CommandArgs)} during command construction to contribute command arguments for command
  * invocation. A composite argument is usually stateless as it can be reused multiple times by different commands.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  * @see CommandArgs
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/ConnectionBuilder.java
rename to src/main/java/io/lettuce/core/ConnectionBuilder.java
index dd420e09f5..1e223c7291 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.net.SocketAddress;
 import java.util.ArrayList;
@@ -22,10 +22,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.*;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.*;
+import io.lettuce.core.resource.ClientResources;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.ChannelHandler;
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java b/src/main/java/io/lettuce/core/ConnectionEventTrigger.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java
rename to src/main/java/io/lettuce/core/ConnectionEventTrigger.java
index dc90d6846b..dd2b8bf25e 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionEventTrigger.java
+++ b/src/main/java/io/lettuce/core/ConnectionEventTrigger.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.net.SocketAddress;
 
-import com.lambdaworks.redis.event.EventBus;
-import com.lambdaworks.redis.event.connection.ConnectionDeactivatedEvent;
+import io.lettuce.core.event.EventBus;
+import io.lettuce.core.event.connection.ConnectionDeactivatedEvent;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionEvents.java b/src/main/java/io/lettuce/core/ConnectionEvents.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/ConnectionEvents.java
rename to src/main/java/io/lettuce/core/ConnectionEvents.java
index efe5636819..4803067477 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionEvents.java
+++ b/src/main/java/io/lettuce/core/ConnectionEvents.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.net.SocketAddress;
 import java.util.Set;
@@ -23,7 +23,7 @@
 
 /**
  * Close Events Facility. Can register/unregister CloseListener and fire a closed event to all registered listeners.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionFuture.java b/src/main/java/io/lettuce/core/ConnectionFuture.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/ConnectionFuture.java
rename to src/main/java/io/lettuce/core/ConnectionFuture.java
index f62781c8bd..fc9ddf7f83 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionFuture.java
+++ b/src/main/java/io/lettuce/core/ConnectionFuture.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.net.SocketAddress;
 import java.util.concurrent.*;
@@ -22,7 +22,7 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import com.lambdaworks.redis.api.StatefulConnection;
+import io.lettuce.core.api.StatefulConnection;
 
 /**
  * A {@code ConnectionFuture} represents the result of an asynchronous connection initialization. The future provides a
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionId.java b/src/main/java/io/lettuce/core/ConnectionId.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/ConnectionId.java
rename to src/main/java/io/lettuce/core/ConnectionId.java
index bb14cd6383..acda361018 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionId.java
+++ b/src/main/java/io/lettuce/core/ConnectionId.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.net.SocketAddress;
 
 /**
  * Connection identifier. A connection identifier consists of the {@link #localAddress()} and the {@link #remoteAddress()}.
- * 
+ *
  * @author Mark Paluch
  * @since 3.4
  */
@@ -27,14 +27,14 @@ public interface ConnectionId {
 
     /**
      * Returns the local address.
-     * 
+     *
      * @return the local address
      */
     SocketAddress localAddress();
 
     /**
      * Returns the remote address.
-     * 
+     *
      * @return the remote address
      */
     SocketAddress remoteAddress();
diff --git a/src/main/java/com/lambdaworks/redis/ConnectionPoint.java b/src/main/java/io/lettuce/core/ConnectionPoint.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/ConnectionPoint.java
rename to src/main/java/io/lettuce/core/ConnectionPoint.java
index 832fb4e8fe..ec437dd1db 100644
--- a/src/main/java/com/lambdaworks/redis/ConnectionPoint.java
+++ b/src/main/java/io/lettuce/core/ConnectionPoint.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 /**
  * Interface for a connection point described with a host and port or socket.
diff --git a/src/main/java/com/lambdaworks/redis/DefaultConnectionFuture.java b/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
similarity index 99%
rename from src/main/java/com/lambdaworks/redis/DefaultConnectionFuture.java
rename to src/main/java/io/lettuce/core/DefaultConnectionFuture.java
index 53b1749959..943a14c23d 100644
--- a/src/main/java/com/lambdaworks/redis/DefaultConnectionFuture.java
+++ b/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.net.SocketAddress;
 import java.util.concurrent.*;
diff --git a/src/main/java/com/lambdaworks/redis/EpollProvider.java b/src/main/java/io/lettuce/core/EpollProvider.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/EpollProvider.java
rename to src/main/java/io/lettuce/core/EpollProvider.java
index 297bae9e76..30522de3f2 100644
--- a/src/main/java/com/lambdaworks/redis/EpollProvider.java
+++ b/src/main/java/io/lettuce/core/EpollProvider.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.lang.reflect.Constructor;
 import java.net.SocketAddress;
 import java.util.Locale;
 import java.util.concurrent.ThreadFactory;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceClassUtils;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceClassUtils;
 
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
@@ -33,14 +33,14 @@
 /**
  * Wraps and provides Epoll classes. This is to protect the user from {@link ClassNotFoundException}'s caused by the absence of
  * the {@literal netty-transport-native-epoll} library during runtime. Internal API.
- * 
+ *
  * @author Mark Paluch
  */
 public class EpollProvider {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(EpollProvider.class);
 
-    private static final String EPOLL_ENABLED_KEY = "biz.paluch.lettuce.redis.epoll";
+    private static final String EPOLL_ENABLED_KEY = "io.lettuce.core.epoll";
     private static final boolean EPOLL_ENABLED = Boolean.parseBoolean(SystemPropertyUtil.get(EPOLL_ENABLED_KEY, "true"));
     private static final boolean EPOLL_COMPATIBLE = SystemPropertyUtil.get("os.name").toLowerCase(Locale.UK).trim()
             .startsWith("linux");
@@ -81,7 +81,7 @@ public static boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type)
 
     /**
      * Create a new {@link io.netty.channel.epoll.EpollEventLoopGroup}.
-     * 
+     *
      * @param nThreads
      * @param threadFactory
      * @return the {@link EventLoopGroup}.
diff --git a/src/main/java/com/lambdaworks/redis/FutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/FutureSyncInvocationHandler.java
rename to src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
index 10d8600aea..074c577938 100644
--- a/src/main/java/com/lambdaworks/redis/FutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.internal.AbstractInvocationHandler;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.internal.AbstractInvocationHandler;
 
 /**
  * Invocation-handler to synchronize API calls which use Futures as backend. This class leverages the need to implement a full
diff --git a/src/main/java/com/lambdaworks/redis/GeoArgs.java b/src/main/java/io/lettuce/core/GeoArgs.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/GeoArgs.java
rename to src/main/java/io/lettuce/core/GeoArgs.java
index 1363207ac3..63e65d563f 100644
--- a/src/main/java/com/lambdaworks/redis/GeoArgs.java
+++ b/src/main/java/io/lettuce/core/GeoArgs.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandKeyword;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandKeyword;
 
 /**
  * Args for {@literal GEORADIUS} and {@literal GEORADIUSBYMEMBER} commands.
- * 
+ *
  * @author Mark Paluch
  */
 public class GeoArgs implements CompositeArgument {
@@ -34,7 +34,7 @@ public class GeoArgs implements CompositeArgument {
 
     /**
      * Request distance for results.
-     * 
+     *
      * @return {@code this}
      */
     public GeoArgs withDistance() {
@@ -44,7 +44,7 @@ public GeoArgs withDistance() {
 
     /**
      * Request coordinates for results.
-     * 
+     *
      * @return {@code this}
      */
     public GeoArgs withCoordinates() {
@@ -54,7 +54,7 @@ public GeoArgs withCoordinates() {
 
     /**
      * Request geohash for results.
-     * 
+     *
      * @return {@code this}
      */
     public GeoArgs withHash() {
@@ -64,7 +64,7 @@ public GeoArgs withHash() {
 
     /**
      * Limit results to {@code count} entries.
-     * 
+     *
      * @param count number greater 0
      * @return {@code this}
      */
@@ -75,7 +75,7 @@ public GeoArgs withCount(long count) {
     }
 
     /**
-     * 
+     *
      * @return {@literal true} if distance is requested.
      */
     public boolean isWithDistance() {
@@ -83,7 +83,7 @@ public boolean isWithDistance() {
     }
 
     /**
-     * 
+     *
      * @return {@literal true} if coordinates are requested.
      */
     public boolean isWithCoordinates() {
@@ -91,7 +91,7 @@ public boolean isWithCoordinates() {
     }
 
     /**
-     * 
+     *
      * @return {@literal true} if geohash is requested.
      */
     public boolean isWithHash() {
@@ -100,7 +100,7 @@ public boolean isWithHash() {
 
     /**
      * Sort results ascending.
-     * 
+     *
      * @return {@code this}
      */
     public GeoArgs asc() {
@@ -109,7 +109,7 @@ public GeoArgs asc() {
 
     /**
      * Sort results descending.
-     * 
+     *
      * @return {@code this}
      */
     public GeoArgs desc() {
@@ -118,7 +118,7 @@ public GeoArgs desc() {
 
     /**
      * Sort results.
-     * 
+     *
      * @param sort sort order, must not be {@literal null}
      * @return {@code this}
      */
diff --git a/src/main/java/com/lambdaworks/redis/GeoCoordinates.java b/src/main/java/io/lettuce/core/GeoCoordinates.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/GeoCoordinates.java
rename to src/main/java/io/lettuce/core/GeoCoordinates.java
index 8fcb4a5061..afd9dec360 100644
--- a/src/main/java/com/lambdaworks/redis/GeoCoordinates.java
+++ b/src/main/java/io/lettuce/core/GeoCoordinates.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * A tuple consisting of numerical geo data points to describe geo coordinates.
- * 
+ *
  * @author Mark Paluch
  */
 public class GeoCoordinates {
@@ -29,7 +29,7 @@ public class GeoCoordinates {
 
     /**
      * Creates new {@link GeoCoordinates}.
-     * 
+     *
      * @param x the longitude, must not be {@literal null}.
      * @param y the latitude, must not be {@literal null}.
      */
@@ -44,7 +44,7 @@ public GeoCoordinates(Number x, Number y) {
 
     /**
      * Creates new {@link GeoCoordinates}.
-     * 
+     *
      * @param x the longitude, must not be {@literal null}.
      * @param y the latitude, must not be {@literal null}.
      * @return {@literal {@link GeoCoordinates}.
diff --git a/src/main/java/com/lambdaworks/redis/GeoRadiusStoreArgs.java b/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/GeoRadiusStoreArgs.java
rename to src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
index 9f959a4099..bc35e55acb 100644
--- a/src/main/java/com/lambdaworks/redis/GeoRadiusStoreArgs.java
+++ b/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import com.lambdaworks.redis.GeoArgs.Sort;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandKeyword;
+import io.lettuce.core.GeoArgs.Sort;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandKeyword;
 
 /**
  * Store Args for {@literal GEORADIUS} to store {@literal GEORADIUS} results or {@literal GEORADIUS} distances in a sorted set.
diff --git a/src/main/java/com/lambdaworks/redis/GeoWithin.java b/src/main/java/io/lettuce/core/GeoWithin.java
similarity index 99%
rename from src/main/java/com/lambdaworks/redis/GeoWithin.java
rename to src/main/java/io/lettuce/core/GeoWithin.java
index 5029c91c94..8983e0f4b7 100644
--- a/src/main/java/com/lambdaworks/redis/GeoWithin.java
+++ b/src/main/java/io/lettuce/core/GeoWithin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 /**
  * Geo element within a certain radius. Contains:
@@ -23,7 +23,7 @@
  * <li>the geohash (if requested)</li>
  * <li>the coordinates (if requested)</li>
  * </ul>
- * 
+ *
  * @param <V> Value type.
  * @author Mark Paluch
  */
diff --git a/src/main/java/com/lambdaworks/redis/JavaRuntime.java b/src/main/java/io/lettuce/core/JavaRuntime.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/JavaRuntime.java
rename to src/main/java/io/lettuce/core/JavaRuntime.java
index a8e19d2aa1..dbd8455de2 100644
--- a/src/main/java/com/lambdaworks/redis/JavaRuntime.java
+++ b/src/main/java/io/lettuce/core/JavaRuntime.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.redis.internal.LettuceClassUtils.isPresent;
+import static io.lettuce.core.internal.LettuceClassUtils.isPresent;
 
 /**
  * Utility to determine which Java runtime is used.
- * 
+ *
  * @author Mark Paluch
  */
 public class JavaRuntime {
diff --git a/src/main/java/com/lambdaworks/redis/KeyScanCursor.java b/src/main/java/io/lettuce/core/KeyScanCursor.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/KeyScanCursor.java
rename to src/main/java/io/lettuce/core/KeyScanCursor.java
index b668145aaf..7c8e69ac29 100644
--- a/src/main/java/com/lambdaworks/redis/KeyScanCursor.java
+++ b/src/main/java/io/lettuce/core/KeyScanCursor.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Cursor providing a list of keys.
- * 
+ *
  * @param <K> Key type.
  * @author Mark Paluch
  * @since 3.0
diff --git a/src/main/java/com/lambdaworks/redis/KeyValue.java b/src/main/java/io/lettuce/core/KeyValue.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/KeyValue.java
rename to src/main/java/io/lettuce/core/KeyValue.java
index f3cc4e4470..5783de4d76 100644
--- a/src/main/java/com/lambdaworks/redis/KeyValue.java
+++ b/src/main/java/io/lettuce/core/KeyValue.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.Optional;
 import java.util.function.Function;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * A key-value container extension to {@link Value}. A {@link KeyValue} requires always a non-null key on construction.
diff --git a/src/main/java/com/lambdaworks/redis/KillArgs.java b/src/main/java/io/lettuce/core/KillArgs.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/KillArgs.java
rename to src/main/java/io/lettuce/core/KillArgs.java
index 8de347a246..d4c29d9329 100644
--- a/src/main/java/com/lambdaworks/redis/KillArgs.java
+++ b/src/main/java/io/lettuce/core/KillArgs.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.redis.protocol.CommandKeyword.*;
-import static com.lambdaworks.redis.protocol.CommandType.*;
+import static io.lettuce.core.protocol.CommandKeyword.*;
+import static io.lettuce.core.protocol.CommandType.*;
 
-import com.lambdaworks.redis.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandArgs;
 
 /**
  *
diff --git a/src/main/java/com/lambdaworks/redis/LettuceFutures.java b/src/main/java/io/lettuce/core/LettuceFutures.java
similarity index 99%
rename from src/main/java/com/lambdaworks/redis/LettuceFutures.java
rename to src/main/java/io/lettuce/core/LettuceFutures.java
index e1d787009c..045883ee59 100644
--- a/src/main/java/com/lambdaworks/redis/LettuceFutures.java
+++ b/src/main/java/io/lettuce/core/LettuceFutures.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.concurrent.*;
 import java.util.function.Supplier;
diff --git a/src/main/java/com/lambdaworks/redis/LettuceStrings.java b/src/main/java/io/lettuce/core/LettuceStrings.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/LettuceStrings.java
rename to src/main/java/io/lettuce/core/LettuceStrings.java
index dcf786d760..f0d7ce6902 100644
--- a/src/main/java/com/lambdaworks/redis/LettuceStrings.java
+++ b/src/main/java/io/lettuce/core/LettuceStrings.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.nio.ByteBuffer;
 import java.security.MessageDigest;
@@ -21,11 +21,11 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-import com.lambdaworks.codec.Base16;
+import io.lettuce.core.codec.Base16;
 
 /**
  * Helper for {@link String} checks. This class is part of the internal API and may change without further notice.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -40,7 +40,7 @@ private LettuceStrings() {
 
     /**
      * Checks if a CharSequence is empty ("") or null.
-     * 
+     *
      * @param cs the char sequence
      * @return true if empty
      */
@@ -50,10 +50,10 @@ public static boolean isEmpty(final CharSequence cs) {
 
     /**
      * Checks if a CharSequence is not empty ("") and not null.
-     * 
+     *
      * @param cs the char sequence
      * @return true if not empty
-     * 
+     *
      */
     public static boolean isNotEmpty(final CharSequence cs) {
         return !isEmpty(cs);
@@ -61,7 +61,7 @@ public static boolean isNotEmpty(final CharSequence cs) {
 
     /**
      * Convert double to string. If double is infinite, returns positive/negative infinity {@code +inf} and {@code -inf}.
-     * 
+     *
      * @param n the double.
      * @return string representation of {@code n}
      */
@@ -74,7 +74,7 @@ public static String string(double n) {
 
     /**
      * Create SHA1 digest from Lua script.
-     * 
+     *
      * @param script the script
      * @return the Base16 encoded SHA1 value
      */
@@ -84,7 +84,7 @@ public static String digest(byte[] script) {
 
     /**
      * Create SHA1 digest from Lua script.
-     * 
+     *
      * @param script the script
      * @return the Base16 encoded SHA1 value
      */
@@ -102,7 +102,7 @@ public static String digest(ByteBuffer script) {
      * Convert a {@code String} array into a delimited {@code String} (e.g. CSV).
      * <p>
      * Useful for {@code toString()} implementations.
-     * 
+     *
      * @param arr the array to display
      * @param delim the delimiter to use (typically a ",")
      * @return the delimited {@code String}
@@ -131,7 +131,7 @@ public static String arrayToDelimitedString(Object[] arr, String delim) {
      * Convert a {@link Collection} to a delimited {@code String} (e.g. CSV).
      * <p>
      * Useful for {@code toString()} implementations.
-     * 
+     *
      * @param coll the {@code Collection} to convert
      * @param delim the delimiter to use (typically a ",")
      * @param prefix the {@code String} to start each element with
diff --git a/src/main/java/com/lambdaworks/redis/Limit.java b/src/main/java/io/lettuce/core/Limit.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/Limit.java
rename to src/main/java/io/lettuce/core/Limit.java
index d6c6193a47..6ea3cfaceb 100644
--- a/src/main/java/com/lambdaworks/redis/Limit.java
+++ b/src/main/java/io/lettuce/core/Limit.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 /**
  * Value object for a slice of data (offset/count).
diff --git a/src/main/java/com/lambdaworks/redis/MapScanCursor.java b/src/main/java/io/lettuce/core/MapScanCursor.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/MapScanCursor.java
rename to src/main/java/io/lettuce/core/MapScanCursor.java
index a2b96b02fe..ddaa8d096b 100644
--- a/src/main/java/com/lambdaworks/redis/MapScanCursor.java
+++ b/src/main/java/io/lettuce/core/MapScanCursor.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
  * Scan cursor for maps.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -31,7 +31,7 @@ public class MapScanCursor<K, V> extends ScanCursor {
     private final Map<K, V> map = new LinkedHashMap<>();
 
     /**
-     * 
+     *
      * @return the map result.
      */
     public Map<K, V> getMap() {
diff --git a/src/main/java/com/lambdaworks/redis/MigrateArgs.java b/src/main/java/io/lettuce/core/MigrateArgs.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/MigrateArgs.java
rename to src/main/java/io/lettuce/core/MigrateArgs.java
index c8b5f6b660..93d85e2755 100644
--- a/src/main/java/com/lambdaworks/redis/MigrateArgs.java
+++ b/src/main/java/io/lettuce/core/MigrateArgs.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandKeyword;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandKeyword;
+import io.lettuce.core.protocol.CommandType;
 
 /**
  * Argument list builder for the new redis <a href="http://redis.io/commands/migrate">MIGRATE</a> command. Static import
diff --git a/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
rename to src/main/java/io/lettuce/core/PlainChannelInitializer.java
index c7ce995a65..32d638d876 100644
--- a/src/main/java/com/lambdaworks/redis/PlainChannelInitializer.java
+++ b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.redis.ConnectionEventTrigger.local;
-import static com.lambdaworks.redis.ConnectionEventTrigger.remote;
+import static io.lettuce.core.ConnectionEventTrigger.local;
+import static io.lettuce.core.ConnectionEventTrigger.remote;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.event.connection.ConnectedEvent;
-import com.lambdaworks.redis.event.connection.ConnectionActivatedEvent;
-import com.lambdaworks.redis.event.connection.DisconnectedEvent;
-import com.lambdaworks.redis.protocol.AsyncCommand;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.event.connection.ConnectedEvent;
+import io.lettuce.core.event.connection.ConnectionActivatedEvent;
+import io.lettuce.core.event.connection.DisconnectedEvent;
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.resource.ClientResources;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
diff --git a/src/main/java/com/lambdaworks/redis/Range.java b/src/main/java/io/lettuce/core/Range.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/Range.java
rename to src/main/java/io/lettuce/core/Range.java
index 1e8c1bdeb5..a6f21aac5e 100644
--- a/src/main/java/com/lambdaworks/redis/Range.java
+++ b/src/main/java/io/lettuce/core/Range.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * {@link Range} defines {@literal lower} and {@literal upper} boundaries to retrieve items from a sorted set.
- * 
+ *
  * @author Mark Paluch
  * @since 4.3
  */
@@ -58,7 +58,7 @@ public static <T> Range<T> create(T lower, T upper) {
 
     /**
      * Create a new range from {@code lower} and {@code upper} boundaries.
-     * 
+     *
      * @param lower lower boundary, must not be {@literal null}.
      * @param upper upper boundary, must not be {@literal null}.
      * @param <T> value type.
@@ -78,7 +78,7 @@ public static <T> Range<T> unbounded() {
 
     /**
      * Greater than or equals {@code lower}.
-     * 
+     *
      * @param lower the lower boundary value.
      * @return {@code this} {@link Range} with {@code lower} applied.
      */
@@ -102,7 +102,7 @@ public Range<T> gt(T lower) {
 
     /**
      * Less than or equals {@code lower}.
-     * 
+     *
      * @param upper the upper boundary value.
      * @return {@code this} {@link Range} with {@code upper} applied.
      */
@@ -114,7 +114,7 @@ public Range<T> lte(T upper) {
 
     /**
      * Less than {@code lower}.
-     * 
+     *
      * @param upper the upper boundary value.
      * @return {@code this} {@link Range} with {@code upper} applied.
      */
@@ -163,7 +163,7 @@ private Boundary(T value, boolean including) {
 
         /**
          * Creates an unbounded (infinite) boundary that marks the beginning/end of the range.
-         * 
+         *
          * @return the unbounded boundary.
          * @param <T> inferred type.
          */
@@ -175,7 +175,7 @@ public static <T> Boundary<T> unbounded() {
         /**
          * Create a {@link Boundary} based on the {@code value} that includes the value when comparing ranges. Greater or
          * equals, less or equals. but not Greater or equal, less or equal to {@code value}.
-         * 
+         *
          * @param value must not be {@literal null}.
          * @param <T> value type.
          * @return the {@link Boundary}.
diff --git a/src/main/java/com/lambdaworks/redis/ReadFrom.java b/src/main/java/io/lettuce/core/ReadFrom.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/ReadFrom.java
rename to src/main/java/io/lettuce/core/ReadFrom.java
index efbd6844de..5438c47126 100644
--- a/src/main/java/com/lambdaworks/redis/ReadFrom.java
+++ b/src/main/java/io/lettuce/core/ReadFrom.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.List;
 
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
  * Defines from which Redis nodes data is read.
diff --git a/src/main/java/com/lambdaworks/redis/ReadFromImpl.java b/src/main/java/io/lettuce/core/ReadFromImpl.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/ReadFromImpl.java
rename to src/main/java/io/lettuce/core/ReadFromImpl.java
index 1cf86c5ad8..80fb5448b6 100644
--- a/src/main/java/com/lambdaworks/redis/ReadFromImpl.java
+++ b/src/main/java/io/lettuce/core/ReadFromImpl.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import com.lambdaworks.redis.internal.LettuceLists;
-import com.lambdaworks.redis.models.role.RedisInstance;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
+import io.lettuce.core.internal.LettuceLists;
+import io.lettuce.core.models.role.RedisInstance;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
  * Collection of common read setting implementations.
diff --git a/src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java
similarity index 84%
rename from src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java
rename to src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java
index 762c29d9ed..840f1c603d 100644
--- a/src/main/java/com/lambdaworks/redis/RedisAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * An asynchronous and thread-safe API for a Redis connection.
diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java b/src/main/java/io/lettuce/core/RedisChannelHandler.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/RedisChannelHandler.java
rename to src/main/java/io/lettuce/core/RedisChannelHandler.java
index 5ee51fd4a5..554d843074 100644
--- a/src/main/java/com/lambdaworks/redis/RedisChannelHandler.java
+++ b/src/main/java/io/lettuce/core/RedisChannelHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -22,10 +22,10 @@
 import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.ConnectionFacade;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.ConnectionFacade;
+import io.lettuce.core.protocol.RedisCommand;
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelInitializer.java b/src/main/java/io/lettuce/core/RedisChannelInitializer.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/RedisChannelInitializer.java
rename to src/main/java/io/lettuce/core/RedisChannelInitializer.java
index 4614df5550..be78ff7a6a 100644
--- a/src/main/java/com/lambdaworks/redis/RedisChannelInitializer.java
+++ b/src/main/java/io/lettuce/core/RedisChannelInitializer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.concurrent.Future;
 
@@ -22,7 +22,7 @@
 /**
  * Channel initializer to set up the transport before a Redis connection can be used. This is part of the internal API. This
  * class is part of the internal API.
- * 
+ *
  * @author Mark Paluch
  */
 public interface RedisChannelInitializer extends ChannelHandler {
diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelInitializerImpl.java b/src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/RedisChannelInitializerImpl.java
rename to src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java
index 54143abbf1..231989bf4a 100644
--- a/src/main/java/com/lambdaworks/redis/RedisChannelInitializerImpl.java
+++ b/src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import io.netty.channel.ChannelDuplexHandler;
 
 /**
  * Channel initializer to set up the transport before a Redis connection can be used. This class is part of the internal API.
- * 
+ *
  * @author Mark Paluch
  */
 abstract class RedisChannelInitializerImpl extends ChannelDuplexHandler implements RedisChannelInitializer {
diff --git a/src/main/java/com/lambdaworks/redis/RedisChannelWriter.java b/src/main/java/io/lettuce/core/RedisChannelWriter.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/RedisChannelWriter.java
rename to src/main/java/io/lettuce/core/RedisChannelWriter.java
index 4c02879822..5c04387011 100644
--- a/src/main/java/com/lambdaworks/redis/RedisChannelWriter.java
+++ b/src/main/java/io/lettuce/core/RedisChannelWriter.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.io.Closeable;
 import java.util.Collection;
 
-import com.lambdaworks.redis.protocol.ConnectionFacade;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.protocol.ConnectionFacade;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * Writer for a channel. Writers push commands on to the communication channel and maintain a state for the commands.
diff --git a/src/main/java/com/lambdaworks/redis/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/RedisClient.java
rename to src/main/java/io/lettuce/core/RedisClient.java
index 5c119711b9..52cc30b40e 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.redis.LettuceStrings.isEmpty;
-import static com.lambdaworks.redis.LettuceStrings.isNotEmpty;
+import static io.lettuce.core.LettuceStrings.isEmpty;
+import static io.lettuce.core.LettuceStrings.isNotEmpty;
 
 import java.net.SocketAddress;
 import java.util.List;
@@ -25,20 +25,20 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.CommandHandler;
-import com.lambdaworks.redis.protocol.DefaultEndpoint;
-import com.lambdaworks.redis.pubsub.PubSubCommandHandler;
-import com.lambdaworks.redis.pubsub.PubSubEndpoint;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl;
-import com.lambdaworks.redis.resource.ClientResources;
-import com.lambdaworks.redis.resource.SocketAddressResolver;
-import com.lambdaworks.redis.sentinel.StatefulRedisSentinelConnectionImpl;
-import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.CommandHandler;
+import io.lettuce.core.protocol.DefaultEndpoint;
+import io.lettuce.core.pubsub.PubSubCommandHandler;
+import io.lettuce.core.pubsub.PubSubEndpoint;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnectionImpl;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.SocketAddressResolver;
+import io.lettuce.core.sentinel.StatefulRedisSentinelConnectionImpl;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 
 /**
  * A scalable and thread-safe <a href="http://redis.io/">Redis</a> client supporting synchronous, asynchronous and reactive
@@ -53,8 +53,8 @@
  * <li>Redis Sentinel, Master connections</li>
  * </ul>
  *
- * Redis Cluster is used through {@link com.lambdaworks.redis.cluster.RedisClusterClient}. Master/Slave connections through
- * {@link com.lambdaworks.redis.masterslave.MasterSlave} provide connections to Redis Master/Slave setups which run either in a
+ * Redis Cluster is used through {@link io.lettuce.core.cluster.RedisClusterClient}. Master/Slave connections through
+ * {@link io.lettuce.core.masterslave.MasterSlave} provide connections to Redis Master/Slave setups which run either in a
  * static Master/Slave setup or are managed by Redis Sentinel.
  * <p>
  * {@link RedisClient} is an expensive resource. It holds a set of netty's {@link io.netty.channel.EventLoopGroup}'s that use
@@ -71,8 +71,8 @@
  * @see RedisCodec
  * @see ClientOptions
  * @see ClientResources
- * @see com.lambdaworks.redis.masterslave.MasterSlave
- * @see com.lambdaworks.redis.cluster.RedisClusterClient
+ * @see io.lettuce.core.masterslave.MasterSlave
+ * @see io.lettuce.core.cluster.RedisClusterClient
  */
 public class RedisClient extends AbstractRedisClient {
 
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
similarity index 99%
rename from src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
rename to src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 2150664708..8930b11dd3 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.redis.LettuceStrings.string;
-import static com.lambdaworks.redis.protocol.CommandKeyword.*;
-import static com.lambdaworks.redis.protocol.CommandType.*;
+import static io.lettuce.core.LettuceStrings.string;
+import static io.lettuce.core.protocol.CommandKeyword.*;
+import static io.lettuce.core.protocol.CommandType.*;
 
 import java.nio.ByteBuffer;
 import java.util.*;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.output.*;
-import com.lambdaworks.redis.protocol.BaseRedisCommandBuilder;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.output.*;
+import io.lettuce.core.protocol.BaseRedisCommandBuilder;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * @param <K>
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandExecutionException.java b/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/RedisCommandExecutionException.java
rename to src/main/java/io/lettuce/core/RedisCommandExecutionException.java
index 854f5defd0..168b3f9176 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandExecutionException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 /**
  * Exception for errors states reported by Redis.
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandInterruptedException.java b/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/RedisCommandInterruptedException.java
rename to src/main/java/io/lettuce/core/RedisCommandInterruptedException.java
index 3c6d9cfe35..6e9c3a84c6 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandInterruptedException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 /**
  * Exception thrown when the thread executing a redis command is interrupted.
- * 
+ *
  * @author Will Glozer
  */
 @SuppressWarnings("serial")
diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandTimeoutException.java b/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/RedisCommandTimeoutException.java
rename to src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
index 57c8d4ea1e..334860135b 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandTimeoutException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 /**
  * Exception thrown when the command waiting timeout is exceeded.
- * 
+ *
  * @author Mark Paluch
  */
 @SuppressWarnings("serial")
diff --git a/src/main/java/com/lambdaworks/redis/RedisConnectionException.java b/src/main/java/io/lettuce/core/RedisConnectionException.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/RedisConnectionException.java
rename to src/main/java/io/lettuce/core/RedisConnectionException.java
index ba94c81453..d8857f3efa 100644
--- a/src/main/java/com/lambdaworks/redis/RedisConnectionException.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionException.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 /**
  * Exception for connection failures.
- * 
+ *
  * @author Mark Paluch
  */
 @SuppressWarnings("serial")
diff --git a/src/main/java/com/lambdaworks/redis/RedisConnectionStateAdapter.java b/src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/RedisConnectionStateAdapter.java
rename to src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java
index cda5404118..3e86275fb2 100644
--- a/src/main/java/com/lambdaworks/redis/RedisConnectionStateAdapter.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.net.SocketAddress;
 
 /**
  * Convenience adapter with an empty implementation of all {@link RedisConnectionStateListener} callback methods.
- * 
+ *
  * @author Mark Paluch
  * @since 4.4
  */
diff --git a/src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java b/src/main/java/io/lettuce/core/RedisConnectionStateListener.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java
rename to src/main/java/io/lettuce/core/RedisConnectionStateListener.java
index 5d461a1513..a43499e93d 100644
--- a/src/main/java/com/lambdaworks/redis/RedisConnectionStateListener.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionStateListener.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.net.SocketAddress;
 
 /**
  * Simple interface for Redis connection state monitoring.
- * 
+ *
  * @author ze
  * @author Mark Paluch
  */
@@ -27,7 +27,7 @@ public interface RedisConnectionStateListener {
 
     /**
      * Event handler for successful connection event.
-     * 
+     *
      * @param connection Source connection.
      * @deprecated since 4.4, use {@link RedisConnectionStateListener#onRedisConnected(RedisChannelHandler, SocketAddress)}.
      */
@@ -48,17 +48,17 @@ default void onRedisConnected(RedisChannelHandler<?, ?> connection, SocketAddres
 
     /**
      * Event handler for disconnection event.
-     * 
+     *
      * @param connection Source connection.
      */
     void onRedisDisconnected(RedisChannelHandler<?, ?> connection);
 
     /**
-     * 
+     *
      * Event handler for exceptions.
-     * 
+     *
      * @param connection Source connection.
-     * 
+     *
      * @param cause Caught exception.
      */
     void onRedisExceptionCaught(RedisChannelHandler<?, ?> connection, Throwable cause);
diff --git a/src/main/java/com/lambdaworks/redis/RedisException.java b/src/main/java/io/lettuce/core/RedisException.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/RedisException.java
rename to src/main/java/io/lettuce/core/RedisException.java
index 8eeedf3337..2258211e09 100644
--- a/src/main/java/com/lambdaworks/redis/RedisException.java
+++ b/src/main/java/io/lettuce/core/RedisException.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 /**
  * Exception thrown when Redis returns an error message, or when the client fails for any reason.
- * 
+ *
  * @author Will Glozer
  */
 @SuppressWarnings("serial")
diff --git a/src/main/java/com/lambdaworks/redis/RedisFuture.java b/src/main/java/io/lettuce/core/RedisFuture.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/RedisFuture.java
rename to src/main/java/io/lettuce/core/RedisFuture.java
index 6c2c3e3021..36a91c32ed 100644
--- a/src/main/java/com/lambdaworks/redis/RedisFuture.java
+++ b/src/main/java/io/lettuce/core/RedisFuture.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Future;
diff --git a/src/main/java/com/lambdaworks/redis/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/RedisPublisher.java
rename to src/main/java/io/lettuce/core/RedisPublisher.java
index 62a7b0e9cf..75ed457f6c 100644
--- a/src/main/java/com/lambdaworks/redis/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -32,13 +32,13 @@
 import reactor.core.publisher.Operators;
 import reactor.util.concurrent.QueueSupplier;
 
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.output.StreamingOutput;
-import com.lambdaworks.redis.protocol.CommandWrapper;
-import com.lambdaworks.redis.protocol.DemandAware;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.output.StreamingOutput;
+import io.lettuce.core.protocol.CommandWrapper;
+import io.lettuce.core.protocol.DemandAware;
+import io.lettuce.core.protocol.RedisCommand;
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -50,7 +50,7 @@
  * individual elements instead of emitting collections. This publisher allows multiple subscriptions if it's backed by a
  * {@link Supplier command supplier}.
  * <p>
- * When using streaming outputs ({@link com.lambdaworks.redis.output.CommandOutput} that implement {@link StreamingOutput})
+ * When using streaming outputs ({@link io.lettuce.core.output.CommandOutput} that implement {@link StreamingOutput})
  * elements are emitted as they are decoded. Otherwise, results are processed at command completion.
  *
  * @author Mark Paluch
@@ -693,7 +693,7 @@ private void onError(Throwable throwable) {
     }
 
     /**
-     * Composite {@link com.lambdaworks.redis.output.StreamingOutput.Subscriber} that can notify multiple nested subscribers.
+     * Composite {@link io.lettuce.core.output.StreamingOutput.Subscriber} that can notify multiple nested subscribers.
      *
      * @param <T> element type
      */
diff --git a/src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
similarity index 83%
rename from src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java
rename to src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
index 5ff894fdd7..e0e90384b8 100644
--- a/src/main/java/com/lambdaworks/redis/RedisReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
-import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
+import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * A reactive and thread-safe API for a Redis Sentinel connection.
diff --git a/src/main/java/com/lambdaworks/redis/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/RedisURI.java
rename to src/main/java/io/lettuce/core/RedisURI.java
index 9e14520874..895d9758f6 100644
--- a/src/main/java/com/lambdaworks/redis/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.redis.LettuceStrings.isEmpty;
-import static com.lambdaworks.redis.LettuceStrings.isNotEmpty;
+import static io.lettuce.core.LettuceStrings.isEmpty;
+import static io.lettuce.core.LettuceStrings.isNotEmpty;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -28,10 +28,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.internal.HostAndPort;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceSets;
-import com.lambdaworks.redis.protocol.LettuceCharsets;
+import io.lettuce.core.internal.HostAndPort;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceSets;
+import io.lettuce.core.protocol.LettuceCharsets;
 
 /**
  * Redis URI. Contains connection details for the Redis/Sentinel connections. You can provide the database, client name,
@@ -49,8 +49,8 @@
  * <p>
  * {@code RedisURI.Builder.redis("localhost", 6379).withPassword("password").withDatabase(1).build(); }
  * </p>
- * See {@link com.lambdaworks.redis.RedisURI.Builder#redis(String)} and
- * {@link com.lambdaworks.redis.RedisURI.Builder#sentinel(String)} for more options.</li>
+ * See {@link io.lettuce.core.RedisURI.Builder#redis(String)} and
+ * {@link io.lettuce.core.RedisURI.Builder#sentinel(String)} for more options.</li>
  * <li>Construct your own instance:
  * <p>
  * {@code new RedisURI("localhost", 6379, 60, TimeUnit.SECONDS);}
@@ -111,7 +111,7 @@
  * </p>
  *
  * RedisURI supports Redis Standalone, Redis Sentinel and Redis Cluster with plain, SSL, TLS and unix domain socket connections.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -243,7 +243,7 @@ public static RedisURI create(URI uri) {
 
     /**
      * Returns the host.
-     * 
+     *
      * @return the host.
      */
     public String getHost() {
@@ -252,7 +252,7 @@ public String getHost() {
 
     /**
      * Sets the Redis host.
-     * 
+     *
      * @param host the host
      */
     public void setHost(String host) {
@@ -261,7 +261,7 @@ public void setHost(String host) {
 
     /**
      * Returns the Sentinel Master Id.
-     * 
+     *
      * @return the Sentinel Master Id.
      */
     public String getSentinelMasterId() {
@@ -270,7 +270,7 @@ public String getSentinelMasterId() {
 
     /**
      * Sets the Sentinel Master Id.
-     * 
+     *
      * @param sentinelMasterId the Sentinel Master Id.
      */
     public void setSentinelMasterId(String sentinelMasterId) {
@@ -279,7 +279,7 @@ public void setSentinelMasterId(String sentinelMasterId) {
 
     /**
      * Returns the Redis port.
-     * 
+     *
      * @return the Redis port
      */
     public int getPort() {
@@ -288,7 +288,7 @@ public int getPort() {
 
     /**
      * Sets the Redis port. Defaults to {@link #DEFAULT_REDIS_PORT}.
-     * 
+     *
      * @param port the Redis port
      */
     public void setPort(int port) {
@@ -297,7 +297,7 @@ public void setPort(int port) {
 
     /**
      * Returns the Unix Domain Socket path.
-     * 
+     *
      * @return the Unix Domain Socket path.
      */
     public String getSocket() {
@@ -306,7 +306,7 @@ public String getSocket() {
 
     /**
      * Sets the Unix Domain Socket path.
-     * 
+     *
      * @param socket the Unix Domain Socket path.
      */
     public void setSocket(String socket) {
@@ -315,7 +315,7 @@ public void setSocket(String socket) {
 
     /**
      * Returns the password.
-     * 
+     *
      * @return the password
      */
     public char[] getPassword() {
@@ -324,7 +324,7 @@ public char[] getPassword() {
 
     /**
      * Sets the password. Use empty string to skip authentication.
-     * 
+     *
      * @param password the password, must not be {@literal null}.
      */
     public void setPassword(String password) {
@@ -335,7 +335,7 @@ public void setPassword(String password) {
 
     /**
      * Returns the command timeout for synchronous command execution.
-     * 
+     *
      * @return the Timeout
      */
     public long getTimeout() {
@@ -344,7 +344,7 @@ public long getTimeout() {
 
     /**
      * Sets the command timeout for synchronous command execution.
-     * 
+     *
      * @param timeout the command timeout for synchronous command execution.
      */
     public void setTimeout(long timeout) {
@@ -353,7 +353,7 @@ public void setTimeout(long timeout) {
 
     /**
      * Returns the {@link TimeUnit} for the command timeout.
-     * 
+     *
      * @return the {@link TimeUnit} for the command timeout.
      */
     public TimeUnit getUnit() {
@@ -362,7 +362,7 @@ public TimeUnit getUnit() {
 
     /**
      * Sets the {@link TimeUnit} for the command timeout.
-     * 
+     *
      * @param unit the {@link TimeUnit} for the command timeout, must not be {@literal null}
      */
     public void setUnit(TimeUnit unit) {
@@ -373,7 +373,7 @@ public void setUnit(TimeUnit unit) {
 
     /**
      * Returns the Redis database number. Databases are only available for Redis Standalone and Redis Master/Slave.
-     * 
+     *
      * @return
      */
     public int getDatabase() {
@@ -382,7 +382,7 @@ public int getDatabase() {
 
     /**
      * Sets the Redis database number. Databases are only available for Redis Standalone and Redis Master/Slave.
-     * 
+     *
      * @param database the Redis database number.
      */
     public void setDatabase(int database) {
@@ -414,7 +414,7 @@ public void setClientName(String clientName) {
 
     /**
      * Returns {@literal true} if SSL mode is enabled.
-     * 
+     *
      * @return {@literal true} if SSL mode is enabled.
      */
     public boolean isSsl() {
@@ -423,7 +423,7 @@ public boolean isSsl() {
 
     /**
      * Sets whether to use SSL model.
-     * 
+     *
      * @param ssl
      */
     public void setSsl(boolean ssl) {
@@ -432,7 +432,7 @@ public void setSsl(boolean ssl) {
 
     /**
      * Sets whether to verify peers when using {@link #isSsl() SSL}.
-     * 
+     *
      * @return {@literal true} to verify peers when using {@link #isSsl() SSL}.
      */
     public boolean isVerifyPeer() {
@@ -441,7 +441,7 @@ public boolean isVerifyPeer() {
 
     /**
      * Sets whether to verify peers when using {@link #isSsl() SSL}.
-     * 
+     *
      * @param verifyPeer {@literal true} to verify peers when using {@link #isSsl() SSL}.
      */
     public void setVerifyPeer(boolean verifyPeer) {
@@ -450,7 +450,7 @@ public void setVerifyPeer(boolean verifyPeer) {
 
     /**
      * Returns {@literal true} if StartTLS is enabled.
-     * 
+     *
      * @return {@literal true} if StartTLS is enabled.
      */
     public boolean isStartTls() {
@@ -459,7 +459,7 @@ public boolean isStartTls() {
 
     /**
      * Returns whether StartTLS is enabled.
-     * 
+     *
      * @param startTls {@literal true} if StartTLS is enabled.
      */
     public void setStartTls(boolean startTls) {
@@ -476,7 +476,7 @@ public List<RedisURI> getSentinels() {
 
     /**
      * Creates an URI based on the RedisURI.
-     * 
+     *
      * @return URI based on the RedisURI
      */
     public URI toURI() {
@@ -658,7 +658,7 @@ private String toQueryParamUnit(TimeUnit unit) {
 
     /**
      * URL encode the {@code str} without slash escaping {@code %2F}
-     * 
+     *
      * @param str
      * @return the URL-encoded string
      */
@@ -1193,7 +1193,7 @@ public Builder withTimeout(long timeout, TimeUnit unit) {
 
         /**
          * Configures a sentinel master Id.
-         * 
+         *
          * @param sentinelMasterId sentinel master id, must not be empty or {@literal null}
          * @return the builder
          */
diff --git a/src/main/java/com/lambdaworks/redis/ScanArgs.java b/src/main/java/io/lettuce/core/ScanArgs.java
similarity index 88%
rename from src/main/java/com/lambdaworks/redis/ScanArgs.java
rename to src/main/java/io/lettuce/core/ScanArgs.java
index 625886517d..bfa5b1405b 100644
--- a/src/main/java/com/lambdaworks/redis/ScanArgs.java
+++ b/src/main/java/io/lettuce/core/ScanArgs.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.redis.protocol.CommandKeyword.COUNT;
-import static com.lambdaworks.redis.protocol.CommandKeyword.MATCH;
+import static io.lettuce.core.protocol.CommandKeyword.COUNT;
+import static io.lettuce.core.protocol.CommandKeyword.MATCH;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.CommandArgs;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.CommandArgs;
 
 /**
  * Argument list builder for the redis scan commans (scan, hscan, sscan, zscan) . Static import the methods from {@link Builder}
  * and chain the method calls: {@code matches("weight_*").limit(0, 2)}.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -47,7 +47,7 @@ private Builder() {
 
         /**
          * Create a new instance of {@link ScanArgs} with limit.
-         * 
+         *
          * @param count number of elements to scan
          * @return a new instance of {@link ScanArgs}
          */
@@ -57,7 +57,7 @@ public static ScanArgs limit(long count) {
 
         /**
          * Create a new instance of {@link ScanArgs} with match filter.
-         * 
+         *
          * @param matches the filter
          * @return a new instance of {@link ScanArgs}
          */
@@ -68,7 +68,7 @@ public static ScanArgs matches(String matches) {
 
     /**
      * Match filter
-     * 
+     *
      * @param match the filter
      * @return the current instance of {@link ScanArgs}
      */
@@ -80,7 +80,7 @@ public ScanArgs match(String match) {
 
     /**
      * Limit the scan by count
-     * 
+     *
      * @param count number of elements to scan
      * @return the current instance of {@link ScanArgs}
      */
diff --git a/src/main/java/com/lambdaworks/redis/ScanCursor.java b/src/main/java/io/lettuce/core/ScanCursor.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/ScanCursor.java
rename to src/main/java/io/lettuce/core/ScanCursor.java
index 7ce6f744d5..031fc92b1f 100644
--- a/src/main/java/com/lambdaworks/redis/ScanCursor.java
+++ b/src/main/java/io/lettuce/core/ScanCursor.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Generic Cursor data structure.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -46,7 +46,7 @@ public ScanCursor() {
 
     /**
      * Creates a new {@link ScanCursor}.
-     * 
+     *
      * @param cursor
      * @param finished
      */
@@ -56,7 +56,7 @@ public ScanCursor(String cursor, boolean finished) {
     }
 
     /**
-     * 
+     *
      * @return cursor id
      */
     public String getCursor() {
@@ -65,7 +65,7 @@ public String getCursor() {
 
     /**
      * Set the cursor
-     * 
+     *
      * @param cursor the cursor id
      */
     public void setCursor(String cursor) {
@@ -75,7 +75,7 @@ public void setCursor(String cursor) {
     }
 
     /**
-     * 
+     *
      * @return true if the scan operation of this cursor is finished.
      */
     public boolean isFinished() {
@@ -88,7 +88,7 @@ public void setFinished(boolean finished) {
 
     /**
      * Creates a Scan-Cursor reference.
-     * 
+     *
      * @param cursor the cursor id
      * @return ScanCursor
      */
diff --git a/src/main/java/com/lambdaworks/redis/ScanIterator.java b/src/main/java/io/lettuce/core/ScanIterator.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/ScanIterator.java
rename to src/main/java/io/lettuce/core/ScanIterator.java
index cf306af142..3dfd362f23 100644
--- a/src/main/java/com/lambdaworks/redis/ScanIterator.java
+++ b/src/main/java/io/lettuce/core/ScanIterator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
@@ -22,11 +22,11 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import com.lambdaworks.redis.api.sync.RedisHashCommands;
-import com.lambdaworks.redis.api.sync.RedisKeyCommands;
-import com.lambdaworks.redis.api.sync.RedisSetCommands;
-import com.lambdaworks.redis.api.sync.RedisSortedSetCommands;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.api.sync.RedisHashCommands;
+import io.lettuce.core.api.sync.RedisKeyCommands;
+import io.lettuce.core.api.sync.RedisSetCommands;
+import io.lettuce.core.api.sync.RedisSortedSetCommands;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Scan command support exposed through {@link Iterator}.
@@ -43,7 +43,7 @@ public abstract class ScanIterator<T> implements Iterator<T> {
 
     /**
      * Sequentially iterate over keys in the keyspace. This method uses {@code SCAN} to perform an iterative scan.
-     * 
+     *
      * @param commands the commands interface, must not be {@literal null}.
      * @param <K> Key type.
      * @param <V> Value type.
@@ -270,7 +270,7 @@ private ScoredValueScanCursor<V> getNextScanCursor(ScanCursor scanCursor) {
 
     /**
      * Returns a sequential {@code Stream} with this {@link ScanIterator} as its source.
-     * 
+     *
      * @return a {@link Stream} for this {@link ScanIterator}.
      */
     public Stream<T> stream() {
@@ -279,7 +279,7 @@ public Stream<T> stream() {
 
     /**
      * Synchronous {@link ScanIterator} implementation.
-     * 
+     *
      * @param <T>
      */
     private static abstract class SyncScanIterator<T> extends ScanIterator<T> {
diff --git a/src/main/java/com/lambdaworks/redis/ScoredValue.java b/src/main/java/io/lettuce/core/ScoredValue.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/ScoredValue.java
rename to src/main/java/io/lettuce/core/ScoredValue.java
index b18dfd0248..9977258381 100644
--- a/src/main/java/com/lambdaworks/redis/ScoredValue.java
+++ b/src/main/java/io/lettuce/core/ScoredValue.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.Optional;
 import java.util.function.Function;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * A scored-value extension to {@link Value}.
- * 
+ *
  * @param <V> Value type.
  * @author Will Glozer
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/ScoredValueScanCursor.java b/src/main/java/io/lettuce/core/ScoredValueScanCursor.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/ScoredValueScanCursor.java
rename to src/main/java/io/lettuce/core/ScoredValueScanCursor.java
index d34e139f6d..ee543c1c6d 100644
--- a/src/main/java/com/lambdaworks/redis/ScoredValueScanCursor.java
+++ b/src/main/java/io/lettuce/core/ScoredValueScanCursor.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Cursor providing a list of {@link com.lambdaworks.redis.ScoredValue}
- * 
+ * Cursor providing a list of {@link io.lettuce.core.ScoredValue}
+ *
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 3.0
diff --git a/src/main/java/com/lambdaworks/redis/ScriptOutputType.java b/src/main/java/io/lettuce/core/ScriptOutputType.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/ScriptOutputType.java
rename to src/main/java/io/lettuce/core/ScriptOutputType.java
index 0de83d291d..07089a5b08 100644
--- a/src/main/java/com/lambdaworks/redis/ScriptOutputType.java
+++ b/src/main/java/io/lettuce/core/ScriptOutputType.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 /**
  * A Lua script returns one of the following types:
- * 
+ *
  * <ul>
  * <li>{@link #BOOLEAN} boolean</li>
  * <li>{@link #INTEGER} 64-bit integer</li>
@@ -25,7 +25,7 @@
  * <li>{@link #VALUE} value</li>
  * <li>{@link #MULTI} of these types</li>
  * </ul>
- * 
+ *
  * <strong>Redis to Lua</strong> conversion table.
  * <ul>
  * <li>Redis integer reply -&gt; Lua number</li>
@@ -35,7 +35,7 @@
  * <li>Redis error reply -&gt; Lua table with a single {@code err} field containing the error</li>
  * <li>Redis Nil bulk reply and Nil multi bulk reply -&gt; Lua false boolean type</li>
  * </ul>
- * 
+ *
  * <strong>Lua to Redis</strong> conversion table.
  * <ul>
  * <li>Lua number -&gt; Redis integer reply (the number is converted into an integer)</li>
@@ -45,7 +45,7 @@
  * <li>Lua table with a single {@code err} field -&gt; Redis error reply</li>
  * <li>Lua boolean false -&gt; Redis Nil bulk reply.</li>
  * </ul>
- * 
+ *
  * @author Will Glozer
  */
 public enum ScriptOutputType {
diff --git a/src/main/java/com/lambdaworks/redis/SetArgs.java b/src/main/java/io/lettuce/core/SetArgs.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/SetArgs.java
rename to src/main/java/io/lettuce/core/SetArgs.java
index 46792705d7..4343d3fbe4 100644
--- a/src/main/java/com/lambdaworks/redis/SetArgs.java
+++ b/src/main/java/io/lettuce/core/SetArgs.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import com.lambdaworks.redis.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandArgs;
 
 /**
  * Argument list builder for the new redis <a href="http://redis.io/commands/set">SET</a> command starting from Redis 2.6.12.
  * Static import the methods from {@link Builder} and chain the method calls: {@code ex(10).nx()}.
- * 
+ *
  * @author Will Glozer
  * @author Vincent Rischmann
  */
diff --git a/src/main/java/com/lambdaworks/redis/SocketOptions.java b/src/main/java/io/lettuce/core/SocketOptions.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/SocketOptions.java
rename to src/main/java/io/lettuce/core/SocketOptions.java
index dc60be33b0..578bdeb407 100644
--- a/src/main/java/com/lambdaworks/redis/SocketOptions.java
+++ b/src/main/java/io/lettuce/core/SocketOptions.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Options to configure low-level socket options for the connections kept to Redis servers.
@@ -151,7 +151,7 @@ public SocketOptions build() {
 
     /**
      * Returns the connection timeout.
-     * 
+     *
      * @return the connection timeout.
      */
     public long getConnectTimeout() {
@@ -160,7 +160,7 @@ public long getConnectTimeout() {
 
     /**
      * Returns the the connection timeout unit.
-     * 
+     *
      * @return the connection timeout unit.
      */
     public TimeUnit getConnectTimeoutUnit() {
@@ -169,7 +169,7 @@ public TimeUnit getConnectTimeoutUnit() {
 
     /**
      * Returns whether to enable TCP keepalive.
-     * 
+     *
      * @return whether to enable TCP keepalive
      * @see java.net.SocketOptions#SO_KEEPALIVE
      */
@@ -179,7 +179,7 @@ public boolean isKeepAlive() {
 
     /**
      * Returns whether to use TCP NoDelay.
-     * 
+     *
      * @return {@literal true} to disable Nagle's algorithm, {@link false} to enable Nagle's algorithm.
      * @see java.net.SocketOptions#TCP_NODELAY
      */
diff --git a/src/main/java/com/lambdaworks/redis/SortArgs.java b/src/main/java/io/lettuce/core/SortArgs.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/SortArgs.java
rename to src/main/java/io/lettuce/core/SortArgs.java
index fc009c5814..e66da934be 100644
--- a/src/main/java/com/lambdaworks/redis/SortArgs.java
+++ b/src/main/java/io/lettuce/core/SortArgs.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.redis.protocol.CommandKeyword.*;
-import static com.lambdaworks.redis.protocol.CommandType.GET;
+import static io.lettuce.core.protocol.CommandKeyword.*;
+import static io.lettuce.core.protocol.CommandType.GET;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandKeyword;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandKeyword;
 
 /**
  * Argument list builder for the redis <a href="http://redis.io/commands/sort">SORT</a> command. Static import the methods from
  * {@link Builder} and chain the method calls: {@code by("weight_*").desc().limit(0, 2)}.
- * 
+ *
  * @author Will Glozer
  */
 public class SortArgs implements CompositeArgument {
diff --git a/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
rename to src/main/java/io/lettuce/core/SslConnectionBuilder.java
index 1515e91bf6..a5c1af25b6 100644
--- a/src/main/java/com/lambdaworks/redis/SslConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.redis.ConnectionEventTrigger.local;
-import static com.lambdaworks.redis.ConnectionEventTrigger.remote;
-import static com.lambdaworks.redis.PlainChannelInitializer.pingBeforeActivate;
+import static io.lettuce.core.ConnectionEventTrigger.local;
+import static io.lettuce.core.ConnectionEventTrigger.remote;
+import static io.lettuce.core.PlainChannelInitializer.pingBeforeActivate;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,12 +30,12 @@
 
 import javax.net.ssl.*;
 
-import com.lambdaworks.redis.event.connection.ConnectedEvent;
-import com.lambdaworks.redis.event.connection.ConnectionActivatedEvent;
-import com.lambdaworks.redis.event.connection.DisconnectedEvent;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.AsyncCommand;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.event.connection.ConnectedEvent;
+import io.lettuce.core.event.connection.ConnectionActivatedEvent;
+import io.lettuce.core.event.connection.DisconnectedEvent;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.resource.ClientResources;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelDuplexHandler;
diff --git a/src/main/java/com/lambdaworks/redis/SslOptions.java b/src/main/java/io/lettuce/core/SslOptions.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/SslOptions.java
rename to src/main/java/io/lettuce/core/SslOptions.java
index e09ae13e33..af0c866979 100644
--- a/src/main/java/com/lambdaworks/redis/SslOptions.java
+++ b/src/main/java/io/lettuce/core/SslOptions.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 import io.netty.handler.ssl.OpenSsl;
 import io.netty.handler.ssl.SslProvider;
diff --git a/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
rename to src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
index 905cd9b41e..de7ffec91d 100644
--- a/src/main/java/com/lambdaworks/redis/StatefulRedisConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.redis.protocol.CommandType.*;
+import static io.lettuce.core.protocol.CommandType.*;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23,16 +23,16 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.output.MultiOutput;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.output.MultiOutput;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.*;
 
 /**
  * A thread-safe connection to a Redis server. Multiple threads may share one {@link StatefulRedisConnectionImpl}
diff --git a/src/main/java/com/lambdaworks/redis/StreamScanCursor.java b/src/main/java/io/lettuce/core/StreamScanCursor.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/StreamScanCursor.java
rename to src/main/java/io/lettuce/core/StreamScanCursor.java
index 06e9258391..9685b0770e 100644
--- a/src/main/java/com/lambdaworks/redis/StreamScanCursor.java
+++ b/src/main/java/io/lettuce/core/StreamScanCursor.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 /**
  * Cursor result using the Streaming API. Provides the count of retrieved elements.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
diff --git a/src/main/java/com/lambdaworks/redis/TransactionResult.java b/src/main/java/io/lettuce/core/TransactionResult.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/TransactionResult.java
rename to src/main/java/io/lettuce/core/TransactionResult.java
index ebc27b6d84..dc402cf10a 100644
--- a/src/main/java/com/lambdaworks/redis/TransactionResult.java
+++ b/src/main/java/io/lettuce/core/TransactionResult.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.List;
 import java.util.stream.Stream;
diff --git a/src/main/java/com/lambdaworks/redis/Transports.java b/src/main/java/io/lettuce/core/Transports.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/Transports.java
rename to src/main/java/io/lettuce/core/Transports.java
index 330cb8d14b..758a879d12 100644
--- a/src/main/java/com/lambdaworks/redis/Transports.java
+++ b/src/main/java/io/lettuce/core/Transports.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
@@ -23,7 +23,7 @@
 /**
  * Transport infrastructure utility class. This class provides {@link EventLoopGroup} and {@link Channel} classes for socket and
  * native socket transports.
- * 
+ *
  * @author Mark Paluch
  * @since 4.4
  */
diff --git a/src/main/java/com/lambdaworks/redis/Value.java b/src/main/java/io/lettuce/core/Value.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/Value.java
rename to src/main/java/io/lettuce/core/Value.java
index 0c249e2680..6b3828eab7 100644
--- a/src/main/java/com/lambdaworks/redis/Value.java
+++ b/src/main/java/io/lettuce/core/Value.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.io.Serializable;
 import java.util.NoSuchElementException;
@@ -23,7 +23,7 @@
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * A value container object which may or may not contain a non-null value. If a value is present, {@code isPresent()} will
@@ -32,7 +32,7 @@
  * <p>
  * Additional methods that depend on the presence or absence of a contained value are provided, such as
  * {@link #getValueOrElse(java.lang.Object) getValueOrElse()} (return a default value if value not present).
- * 
+ *
  * @param <V> Value type.
  * @author Mark Paluch
  */
@@ -60,7 +60,7 @@ protected Value(V value) {
     /**
      * Creates a {@link Value} from an {@link Optional}. The resulting value contains the value from the {@link Optional} if a
      * value is present. Value is empty if the {@link Optional} is empty.
-     * 
+     *
      * @param optional the optional. May be empty but never {@literal null}.
      * @param <T>
      * @param <V>
@@ -269,7 +269,7 @@ public void ifEmpty(Runnable runnable) {
 
     /**
      * Returns an {@link Optional} wrapper for the value.
-     * 
+     *
      * @return {@link Optional} wrapper for the value.
      */
     public Optional<V> optional() {
diff --git a/src/main/java/com/lambdaworks/redis/ValueScanCursor.java b/src/main/java/io/lettuce/core/ValueScanCursor.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/ValueScanCursor.java
rename to src/main/java/io/lettuce/core/ValueScanCursor.java
index 4ce4fc16ba..571603c107 100644
--- a/src/main/java/com/lambdaworks/redis/ValueScanCursor.java
+++ b/src/main/java/io/lettuce/core/ValueScanCursor.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Cursor providing a list of values.
- * 
+ *
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 3.0
diff --git a/src/main/java/com/lambdaworks/redis/ZAddArgs.java b/src/main/java/io/lettuce/core/ZAddArgs.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/ZAddArgs.java
rename to src/main/java/io/lettuce/core/ZAddArgs.java
index 2137fcd3f1..ea620809a0 100644
--- a/src/main/java/com/lambdaworks/redis/ZAddArgs.java
+++ b/src/main/java/io/lettuce/core/ZAddArgs.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import com.lambdaworks.redis.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandArgs;
 
 /**
  * Argument list builder for the improved redis <a href="http://redis.io/commands/zadd">ZADD</a> command starting from Redis
  * 3.0.2. Static import the methods from {@link Builder} and call the methods: {@code xx()} or {@code nx()} .
- * 
+ *
  * @author Mark Paluch
  */
 public class ZAddArgs implements CompositeArgument {
diff --git a/src/main/java/com/lambdaworks/redis/ZStoreArgs.java b/src/main/java/io/lettuce/core/ZStoreArgs.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/ZStoreArgs.java
rename to src/main/java/io/lettuce/core/ZStoreArgs.java
index b0819c5d11..474cc3ccb9 100644
--- a/src/main/java/com/lambdaworks/redis/ZStoreArgs.java
+++ b/src/main/java/io/lettuce/core/ZStoreArgs.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.redis.protocol.CommandKeyword.*;
+import static io.lettuce.core.protocol.CommandKeyword.*;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandArgs;
 
 /**
  * Argument list builder for the redis <a href="http://redis.io/commands/zunionstore">ZUNIONSTORE</a> and
  * <a href="http://redis.io/commands/zinterstore">ZINTERSTORE</a> commands. Static import the methods from {@link Builder} and
  * chain the method calls: {@code weights(1, 2).max()}.
- * 
+ *
  * @author Will Glozer
  */
 public class ZStoreArgs implements CompositeArgument {
diff --git a/src/main/java/com/lambdaworks/redis/api/StatefulConnection.java b/src/main/java/io/lettuce/core/api/StatefulConnection.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/api/StatefulConnection.java
rename to src/main/java/io/lettuce/core/api/StatefulConnection.java
index 771632ad54..89c9303009 100644
--- a/src/main/java/com/lambdaworks/redis/api/StatefulConnection.java
+++ b/src/main/java/io/lettuce/core/api/StatefulConnection.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api;
+package io.lettuce.core.api;
 
 import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.ClientOptions;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * A stateful connection providing command dispatching, timeouts and open/close methods.
diff --git a/src/main/java/com/lambdaworks/redis/api/StatefulRedisConnection.java b/src/main/java/io/lettuce/core/api/StatefulRedisConnection.java
similarity index 86%
rename from src/main/java/com/lambdaworks/redis/api/StatefulRedisConnection.java
rename to src/main/java/io/lettuce/core/api/StatefulRedisConnection.java
index d0761e46c8..a4ad508501 100644
--- a/src/main/java/com/lambdaworks/redis/api/StatefulRedisConnection.java
+++ b/src/main/java/io/lettuce/core/api/StatefulRedisConnection.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api;
+package io.lettuce.core.api;
 
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.protocol.ConnectionWatchdog;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.protocol.ConnectionWatchdog;
 
 /**
  * A thread-safe connection to a redis server. Multiple threads may share one {@link StatefulRedisConnection}.
- * 
+ *
  * A {@link ConnectionWatchdog} monitors each connection and reconnects automatically until {@link #close} is called. All
  * pending commands will be (re)sent after successful reconnection.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -41,21 +41,21 @@ public interface StatefulRedisConnection<K, V> extends StatefulConnection<K, V>
 
     /**
      * Returns the {@link RedisCommands} API for the current connection. Does not create a new connection.
-     * 
+     *
      * @return the synchronous API for the underlying connection.
      */
     RedisCommands<K, V> sync();
 
     /**
      * Returns the {@link RedisAsyncCommands} API for the current connection. Does not create a new connection.
-     * 
+     *
      * @return the asynchronous API for the underlying connection.
      */
     RedisAsyncCommands<K, V> async();
 
     /**
      * Returns the {@link RedisReactiveCommands} API for the current connection. Does not create a new connection.
-     * 
+     *
      * @return the reactive API for the underlying connection.
      */
     RedisReactiveCommands<K, V> reactive();
diff --git a/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java
rename to src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
index aea62fdae5..10fc53a113 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/BaseRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
@@ -13,31 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.async;
+package io.lettuce.core.api.async;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.output.CommandOutput;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
- * 
+ *
  * Asynchronous executed commands for basic commands.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncApi
  */
 public interface BaseRedisAsyncCommands<K, V> {
 
     /**
      * Post a message to a channel.
-     * 
+     *
      * @param channel the channel type: key
      * @param message the message type: value
      * @return Long integer-reply the number of clients that received the message.
@@ -46,14 +46,14 @@ public interface BaseRedisAsyncCommands<K, V> {
 
     /**
      * Lists the currently *active channels*.
-     * 
+     *
      * @return List&lt;K&gt; array-reply a list of active channels, optionally matching the specified pattern.
      */
     RedisFuture<List<K>> pubsubChannels();
 
     /**
      * Lists the currently *active channels*.
-     * 
+     *
      * @param channel the key
      * @return List&lt;K&gt; array-reply a list of active channels, optionally matching the specified pattern.
      */
@@ -69,14 +69,14 @@ public interface BaseRedisAsyncCommands<K, V> {
 
     /**
      * Returns the number of subscriptions to patterns.
-     * 
+     *
      * @return Long integer-reply the number of patterns all the clients are subscribed to.
      */
     RedisFuture<Long> pubsubNumpat();
 
     /**
      * Echo the given string.
-     * 
+     *
      * @param msg the message type: value
      * @return V bulk-string-reply
      */
@@ -92,7 +92,7 @@ public interface BaseRedisAsyncCommands<K, V> {
 
     /**
      * Ping the server.
-     * 
+     *
      * @return String simple-string-reply
      */
     RedisFuture<String> ping();
@@ -113,14 +113,14 @@ public interface BaseRedisAsyncCommands<K, V> {
 
     /**
      * Close the connection.
-     * 
+     *
      * @return String simple-string-reply always OK.
      */
     RedisFuture<String> quit();
 
     /**
      * Wait for replication.
-     * 
+     *
      * @param replicas minimum number of replicas
      * @param timeout timeout in milliseconds
      * @return number of replicas
@@ -149,7 +149,7 @@ public interface BaseRedisAsyncCommands<K, V> {
     <T> RedisFuture<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args);
 
     /**
-     * 
+     *
      * @return true if the connection is open (connected and not closed).
      */
     boolean isOpen();
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java
rename to src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
index 1f22ccf184..ba0ea0aee2 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.async;
+package io.lettuce.core.api.async;
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
 
 /**
  * A complete asynchronous and thread-safe Redis API with 400+ Methods.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -37,7 +37,7 @@ public interface RedisAsyncCommands<K, V> extends RedisHashAsyncCommands<K, V>,
 
     /**
      * Set the default timeout for operations.
-     * 
+     *
      * @param timeout the timeout value
      * @param unit the unit of the timeout value
      */
@@ -45,7 +45,7 @@ public interface RedisAsyncCommands<K, V> extends RedisHashAsyncCommands<K, V>,
 
     /**
      * Authenticate to the server.
-     * 
+     *
      * @param password the password
      * @return String simple-string-reply
      */
@@ -53,7 +53,7 @@ public interface RedisAsyncCommands<K, V> extends RedisHashAsyncCommands<K, V>,
 
     /**
      * Change the selected database for the current connection.
-     * 
+     *
      * @param db the database number
      * @return String simple-string-reply
      */
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
rename to src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java
index 962e8c4742..28f806657f 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisGeoAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.async;
+package io.lettuce.core.api.async;
 
 import java.util.List;
 import java.util.Set;
 
-import com.lambdaworks.redis.*;
+import io.lettuce.core.*;
 
 /**
  * Asynchronous executed commands for the Geo-API.
  *
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncApi
  */
 public interface RedisGeoAsyncCommands<K, V> {
 
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisHLLAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/api/async/RedisHLLAsyncCommands.java
rename to src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java
index ce8b5c8d24..e1dbfa0b83 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisHLLAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.async;
+package io.lettuce.core.api.async;
 
-import com.lambdaworks.redis.RedisFuture;
+import io.lettuce.core.RedisFuture;
 
 /**
  * Asynchronous executed commands for HyperLogLog (PF* commands).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 3.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncApi
  */
 public interface RedisHLLAsyncCommands<K, V> {
 
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java
rename to src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
index 90806cc534..c972bb6249 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisHashAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
@@ -13,30 +13,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.async;
+package io.lettuce.core.api.async;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Asynchronous executed commands for Hashes (Key-Value pairs).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncApi
  */
 public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Delete one or more hash fields.
-     * 
+     *
      * @param key the key
      * @param fields the field type: key
      * @return Long integer-reply the number of fields that were removed from the hash, not including specified but non existing
@@ -46,11 +46,11 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Determine if a hash field exists.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the hash contains {@code field}. {@literal false} if the hash does not contain {@code field},
      *         or {@code key} does not exist.
      */
@@ -58,7 +58,7 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Get the value of a hash field.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @return V bulk-string-reply the value associated with {@code field}, or {@literal null} when {@code field} is not present
@@ -68,7 +68,7 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Increment the integer value of a hash field by the given number.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @param amount the increment type: long
@@ -78,7 +78,7 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Increment the float value of a hash field by the given amount.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @param amount the increment type: double
@@ -88,7 +88,7 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Get all the fields and values in a hash.
-     * 
+     *
      * @param key the key
      * @return Map&lt;K,V&gt; array-reply list of fields and their values stored in the hash, or an empty list when {@code key}
      *         does not exist.
@@ -97,17 +97,17 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Stream over all the fields and values in a hash.
-     * 
+     *
      * @param channel the channel
      * @param key the key
-     * 
+     *
      * @return Long count of the keys.
      */
     RedisFuture<Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key);
 
     /**
      * Get all the fields in a hash.
-     * 
+     *
      * @param key the key
      * @return List&lt;K&gt; array-reply list of fields in the hash, or an empty list when {@code key} does not exist.
      */
@@ -115,17 +115,17 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Stream over all the fields in a hash.
-     * 
+     *
      * @param channel the channel
      * @param key the key
-     * 
+     *
      * @return Long count of the keys.
      */
     RedisFuture<Long> hkeys(KeyStreamingChannel<K> channel, K key);
 
     /**
      * Get the number of fields in a hash.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply number of fields in the hash, or {@code 0} when {@code key} does not exist.
      */
@@ -133,7 +133,7 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Get the values of all the given hash fields.
-     * 
+     *
      * @param key the key
      * @param fields the field type: key
      * @return List&lt;V&gt; array-reply list of values associated with the given fields, in the same
@@ -142,18 +142,18 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Stream over the values of all the given hash fields.
-     * 
+     *
      * @param channel the channel
      * @param key the key
      * @param fields the fields
-     * 
+     *
      * @return Long count of the keys
      */
     RedisFuture<Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields);
 
     /**
      * Set multiple hash fields to multiple values.
-     * 
+     *
      * @param key the key
      * @param map the null
      * @return String simple-string-reply
@@ -162,7 +162,7 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
      */
@@ -170,7 +170,7 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanArgs scan arguments
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
@@ -179,7 +179,7 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -189,7 +189,7 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
@@ -198,7 +198,7 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @return StreamScanCursor scan cursor.
@@ -207,7 +207,7 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanArgs scan arguments
@@ -217,7 +217,7 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -228,7 +228,7 @@ public interface RedisHashAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java
rename to src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
index 2d3ca33f3f..d3ce167eb0 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisKeyAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.async;
+package io.lettuce.core.api.async;
 
 import java.util.Date;
 import java.util.List;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Asynchronous executed commands for Keys (Key manipulation/querying).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncApi
  */
 public interface RedisKeyAsyncCommands<K, V> {
 
@@ -51,7 +51,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Return a serialized version of the value stored at the specified key.
-     * 
+     *
      * @param key the key
      * @return byte[] bulk-string-reply the serialized value.
      */
@@ -67,11 +67,11 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Set a key's time to live in seconds.
-     * 
+     *
      * @param key the key
      * @param seconds the seconds type: long
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set.
      */
@@ -79,11 +79,11 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp.
-     * 
+     *
      * @param key the key
      * @param timestamp the timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -91,11 +91,11 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp.
-     * 
+     *
      * @param key the key
      * @param timestamp the timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -103,7 +103,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Find all keys matching the given pattern.
-     * 
+     *
      * @param pattern the pattern type: patternkey (pattern)
      * @return List&lt;K&gt; array-reply list of keys matching {@code pattern}.
      */
@@ -111,7 +111,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Find all keys matching the given pattern.
-     * 
+     *
      * @param channel the channel
      * @param pattern the pattern
      * @return Long array-reply list of keys matching {@code pattern}.
@@ -120,7 +120,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Atomically transfer a key from a Redis instance to another one.
-     * 
+     *
      * @param host the host
      * @param port the port
      * @param key the key
@@ -144,7 +144,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Move a key to another database.
-     * 
+     *
      * @param key the key
      * @param db the db type: long
      * @return Boolean integer-reply specifically:
@@ -153,7 +153,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * returns the kind of internal representation used in order to store the value associated with a key.
-     * 
+     *
      * @param key the key
      * @return String
      */
@@ -162,7 +162,7 @@ public interface RedisKeyAsyncCommands<K, V> {
     /**
      * returns the number of seconds since the object stored at the specified key is idle (not requested by read or write
      * operations).
-     * 
+     *
      * @param key the key
      * @return number of seconds since the object stored at the specified key is idle.
      */
@@ -170,7 +170,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * returns the number of references of the value associated with the specified key.
-     * 
+     *
      * @param key the key
      * @return Long
      */
@@ -178,10 +178,10 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Remove the expiration from a key.
-     * 
+     *
      * @param key the key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was removed. {@literal false} if {@code key} does not exist or does not have an
      *         associated timeout.
      */
@@ -189,11 +189,11 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Set a key's time to live in milliseconds.
-     * 
+     *
      * @param key the key
      * @param milliseconds the milliseconds type: long
      * @return integer-reply, specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set.
      */
@@ -201,11 +201,11 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
-     * 
+     *
      * @param key the key
      * @param timestamp the milliseconds-timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -213,11 +213,11 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
-     * 
+     *
      * @param key the key
      * @param timestamp the milliseconds-timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -225,7 +225,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Get the time to live for a key in milliseconds.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply TTL in milliseconds, or a negative value in order to signal an error (see the description
      *         above).
@@ -234,14 +234,14 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Return a random key from the keyspace.
-     * 
+     *
      * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
      */
     RedisFuture<V> randomkey();
 
     /**
      * Rename a key.
-     * 
+     *
      * @param key the key
      * @param newKey the newkey type: key
      * @return String simple-string-reply
@@ -250,18 +250,18 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Rename a key, only if the new key does not exist.
-     * 
+     *
      * @param key the key
      * @param newKey the newkey type: key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if {@code key} was renamed to {@code newkey}. {@literal false} if {@code newkey} already exists.
      */
     RedisFuture<Boolean> renamenx(K key, K newKey);
 
     /**
      * Create a key using the provided serialized value, previously obtained using DUMP.
-     * 
+     *
      * @param key the key
      * @param ttl the ttl type: long
      * @param value the serialized-value type: string
@@ -271,7 +271,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @return List&lt;V&gt; array-reply list of sorted elements.
      */
@@ -279,7 +279,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @return Long number of values.
@@ -288,7 +288,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @param sortArgs sort arguments
      * @return List&lt;V&gt; array-reply list of sorted elements.
@@ -297,7 +297,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param sortArgs sort arguments
@@ -307,7 +307,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @param sortArgs sort arguments
      * @param destination the destination key to store sort results
@@ -317,7 +317,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Touch one or more keys. Touch sets the last accessed time for a key. Non-exsitent keys wont get created.
-     * 
+     *
      * @param keys the keys
      * @return Long integer-reply the number of found keys.
      */
@@ -333,7 +333,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Determine the type stored at key.
-     * 
+     *
      * @param key the key
      * @return String simple-string-reply type of {@code key}, or {@code none} when {@code key} does not exist.
      */
@@ -341,14 +341,14 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
     RedisFuture<KeyScanCursor<K>> scan();
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanArgs scan arguments
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
@@ -356,7 +356,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
      * @return KeyScanCursor&lt;K&gt; scan cursor.
@@ -365,7 +365,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
@@ -373,7 +373,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @return StreamScanCursor scan cursor.
      */
@@ -381,7 +381,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
@@ -390,7 +390,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -400,7 +400,7 @@ public interface RedisKeyAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return StreamScanCursor scan cursor.
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java
rename to src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java
index 071461cf84..6cebfd1bf1 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisListAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java
@@ -13,32 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.async;
+package io.lettuce.core.api.async;
 
 import java.util.List;
 
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Asynchronous executed commands for Lists.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncApi
  */
 public interface RedisListAsyncCommands<K, V> {
 
     /**
      * Remove and get the first element in a list, or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param keys the keys
      * @return KeyValue&lt;K,V&gt; array-reply specifically:
-     * 
+     *
      *         A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk
      *         with the first element being the name of the key where an element was popped and the second element being the
      *         value of the popped element.
@@ -47,11 +47,11 @@ public interface RedisListAsyncCommands<K, V> {
 
     /**
      * Remove and get the last element in a list, or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param keys the keys
      * @return KeyValue&lt;K,V&gt; array-reply specifically:
-     * 
+     *
      *         A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk
      *         with the first element being the name of the key where an element was popped and the second element being the
      *         value of the popped element.
@@ -60,7 +60,7 @@ public interface RedisListAsyncCommands<K, V> {
 
     /**
      * Pop a value from a list, push it to another list and return it; or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param source the source key
      * @param destination the destination type: key
@@ -71,7 +71,7 @@ public interface RedisListAsyncCommands<K, V> {
 
     /**
      * Get an element from a list by its index.
-     * 
+     *
      * @param key the key
      * @param index the index type: long
      * @return V bulk-string-reply the requested element, or {@literal null} when {@code index} is out of range.
@@ -80,7 +80,7 @@ public interface RedisListAsyncCommands<K, V> {
 
     /**
      * Insert an element before or after another element in a list.
-     * 
+     *
      * @param key the key
      * @param before the before
      * @param pivot the pivot
@@ -92,7 +92,7 @@ public interface RedisListAsyncCommands<K, V> {
 
     /**
      * Get the length of a list.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the length of the list at {@code key}.
      */
@@ -100,7 +100,7 @@ public interface RedisListAsyncCommands<K, V> {
 
     /**
      * Remove and get the first element in a list.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of the first element, or {@literal null} when {@code key} does not exist.
      */
@@ -108,7 +108,7 @@ public interface RedisListAsyncCommands<K, V> {
 
     /**
      * Prepend one or multiple values to a list.
-     * 
+     *
      * @param key the key
      * @param values the value
      * @return Long integer-reply the length of the list after the push operations.
@@ -126,7 +126,7 @@ public interface RedisListAsyncCommands<K, V> {
 
     /**
      * Get a range of elements from a list.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param stop the stop type: long
@@ -136,7 +136,7 @@ public interface RedisListAsyncCommands<K, V> {
 
     /**
      * Get a range of elements from a list.
-     * 
+     *
      * @param channel the channel
      * @param key the key
      * @param start the start type: long
@@ -147,7 +147,7 @@ public interface RedisListAsyncCommands<K, V> {
 
     /**
      * Remove elements from a list.
-     * 
+     *
      * @param key the key
      * @param count the count type: long
      * @param value the value
@@ -157,7 +157,7 @@ public interface RedisListAsyncCommands<K, V> {
 
     /**
      * Set the value of an element in a list by its index.
-     * 
+     *
      * @param key the key
      * @param index the index type: long
      * @param value the value
@@ -167,7 +167,7 @@ public interface RedisListAsyncCommands<K, V> {
 
     /**
      * Trim a list to the specified range.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param stop the stop type: long
@@ -177,7 +177,7 @@ public interface RedisListAsyncCommands<K, V> {
 
     /**
      * Remove and get the last element in a list.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of the last element, or {@literal null} when {@code key} does not exist.
      */
@@ -185,7 +185,7 @@ public interface RedisListAsyncCommands<K, V> {
 
     /**
      * Remove the last element in a list, append it to another list and return it.
-     * 
+     *
      * @param source the source key
      * @param destination the destination type: key
      * @return V bulk-string-reply the element being popped and pushed.
@@ -194,7 +194,7 @@ public interface RedisListAsyncCommands<K, V> {
 
     /**
      * Append one or multiple values to a list.
-     * 
+     *
      * @param key the key
      * @param values the value
      * @return Long integer-reply the length of the list after the push operation.
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisScriptingAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/api/async/RedisScriptingAsyncCommands.java
rename to src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
index f6038c852b..ede1379ee1 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisScriptingAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
@@ -13,27 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.async;
+package io.lettuce.core.api.async;
 
 import java.util.List;
 
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.ScriptOutputType;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.ScriptOutputType;
 
 /**
  * Asynchronous executed commands for Scripting.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncApi
  */
 public interface RedisScriptingAsyncCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param script Lua 5.1 script.
      * @param type output type
      * @param keys key names
@@ -44,7 +44,7 @@ public interface RedisScriptingAsyncCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param script Lua 5.1 script.
      * @param type the type
      * @param keys the keys
@@ -56,7 +56,7 @@ public interface RedisScriptingAsyncCommands<K, V> {
 
     /**
      * Evaluates a script cached on the server side by its SHA1 digest
-     * 
+     *
      * @param digest SHA1 of the script
      * @param type the type
      * @param keys the keys
@@ -67,7 +67,7 @@ public interface RedisScriptingAsyncCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param digest SHA1 of the script
      * @param type the type
      * @param keys the keys
@@ -79,7 +79,7 @@ public interface RedisScriptingAsyncCommands<K, V> {
 
     /**
      * Check existence of scripts in the script cache.
-     * 
+     *
      * @param digests script digests
      * @return List&lt;Boolean&gt; array-reply The command returns an array of integers that correspond to the specified SHA1
      *         digest arguments. For every corresponding SHA1 digest of a script that actually exists in the script cache, an 1
@@ -89,21 +89,21 @@ public interface RedisScriptingAsyncCommands<K, V> {
 
     /**
      * Remove all the scripts from the script cache.
-     * 
+     *
      * @return String simple-string-reply
      */
     RedisFuture<String> scriptFlush();
 
     /**
      * Kill the script currently in execution.
-     * 
+     *
      * @return String simple-string-reply
      */
     RedisFuture<String> scriptKill();
 
     /**
      * Load the specified Lua script into the script cache.
-     * 
+     *
      * @param script script content
      * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
      */
@@ -111,7 +111,7 @@ public interface RedisScriptingAsyncCommands<K, V> {
 
     /**
      * Create a SHA1 digest from a Lua script.
-     * 
+     *
      * @param script script content
      * @return the SHA1 value
      */
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
rename to src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
index af87fe4b33..f558153371 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
@@ -13,50 +13,50 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.async;
+package io.lettuce.core.api.async;
 
 import java.util.Date;
 import java.util.List;
 
-import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.protocol.CommandType;
 
 /**
  * Asynchronous executed commands for Server Control.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncApi
  */
 public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Asynchronously rewrite the append-only file.
-     * 
+     *
      * @return String simple-string-reply always {@code OK}.
      */
     RedisFuture<String> bgrewriteaof();
 
     /**
      * Asynchronously save the dataset to disk.
-     * 
+     *
      * @return String simple-string-reply
      */
     RedisFuture<String> bgsave();
 
     /**
      * Get the current connection name.
-     * 
+     *
      * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set.
      */
     RedisFuture<K> clientGetname();
 
     /**
      * Set the current connection name.
-     * 
+     *
      * @param name the client name
      * @return simple-string-reply {@code OK} if the connection name was successfully set.
      */
@@ -64,7 +64,7 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Kill the connection of a client identified by ip:port.
-     * 
+     *
      * @param addr ip:port
      * @return String simple-string-reply {@code OK} if the connection exists and has been closed
      */
@@ -80,7 +80,7 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Stop processing commands from clients for some time.
-     * 
+     *
      * @param timeout the timeout value in milliseconds
      * @return String simple-string-reply The command returns OK or an error if the timeout is invalid.
      */
@@ -88,7 +88,7 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Get the list of client connections.
-     * 
+     *
      * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF),
      *         each line is composed of a succession of property=value fields separated by a space character.
      */
@@ -96,14 +96,14 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Returns an array reply of details about all Redis commands.
-     * 
+     *
      * @return List&lt;Object&gt; array-reply
      */
     RedisFuture<List<Object>> command();
 
     /**
      * Returns an array reply of details about the requested commands.
-     * 
+     *
      * @param commands the commands to query for
      * @return List&lt;Object&gt; array-reply
      */
@@ -111,7 +111,7 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Returns an array reply of details about the requested commands.
-     * 
+     *
      * @param commands the commands to query for
      * @return List&lt;Object&gt; array-reply
      */
@@ -119,14 +119,14 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Get total number of Redis commands.
-     * 
+     *
      * @return Long integer-reply of number of total commands in this Redis server.
      */
     RedisFuture<Long> commandCount();
 
     /**
      * Get the value of a configuration parameter.
-     * 
+     *
      * @param parameter name of the parameter
      * @return List&lt;String&gt; bulk-string-reply
      */
@@ -134,14 +134,14 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Reset the stats returned by INFO.
-     * 
+     *
      * @return String simple-string-reply always {@code OK}.
      */
     RedisFuture<String> configResetstat();
 
     /**
      * Rewrite the configuration file with the in memory configuration.
-     * 
+     *
      * @return String simple-string-reply {@code OK} when the configuration was rewritten properly. Otherwise an error is
      *         returned.
      */
@@ -149,7 +149,7 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Set a configuration parameter to the given value.
-     * 
+     *
      * @param parameter the parameter name
      * @param value the parameter value
      * @return String simple-string-reply: {@code OK} when the configuration was set properly. Otherwise an error is returned.
@@ -158,7 +158,7 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Return the number of keys in the selected database.
-     * 
+     *
      * @return Long integer-reply
      */
     RedisFuture<Long> dbsize();
@@ -180,7 +180,7 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Get debugging information about a key.
-     * 
+     *
      * @param key the key
      * @return String simple-string-reply
      */
@@ -220,7 +220,7 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Remove all keys from all databases.
-     * 
+     *
      * @return String simple-string-reply
      */
     RedisFuture<String> flushall();
@@ -234,7 +234,7 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Remove all keys from the current database.
-     * 
+     *
      * @return String simple-string-reply
      */
     RedisFuture<String> flushdb();
@@ -248,14 +248,14 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Get information and statistics about the server.
-     * 
+     *
      * @return String bulk-string-reply as a collection of text lines.
      */
     RedisFuture<String> info();
 
     /**
      * Get information and statistics about the server.
-     * 
+     *
      * @param section the section type: string
      * @return String bulk-string-reply as a collection of text lines.
      */
@@ -263,28 +263,28 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Get the UNIX time stamp of the last successful save to disk.
-     * 
+     *
      * @return Date integer-reply an UNIX time stamp.
      */
     RedisFuture<Date> lastsave();
 
     /**
      * Synchronously save the dataset to disk.
-     * 
+     *
      * @return String simple-string-reply The commands returns OK on success.
      */
     RedisFuture<String> save();
 
     /**
      * Synchronously save the dataset to disk and then shut down the server.
-     * 
+     *
      * @param save {@literal true} force save operation
      */
     void shutdown(boolean save);
 
     /**
      * Make the server a slave of another instance, or promote it as master.
-     * 
+     *
      * @param host the host type: string
      * @param port the port type: string
      * @return String simple-string-reply
@@ -293,21 +293,21 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Promote server as master.
-     * 
+     *
      * @return String simple-string-reply
      */
     RedisFuture<String> slaveofNoOne();
 
     /**
      * Read the slow log.
-     * 
+     *
      * @return List&lt;Object&gt; deeply nested multi bulk replies
      */
     RedisFuture<List<Object>> slowlogGet();
 
     /**
      * Read the slow log.
-     * 
+     *
      * @param count the count
      * @return List&lt;Object&gt; deeply nested multi bulk replies
      */
@@ -315,25 +315,25 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Obtaining the current length of the slow log.
-     * 
+     *
      * @return Long length of the slow log.
      */
     RedisFuture<Long> slowlogLen();
 
     /**
      * Resetting the slow log.
-     * 
+     *
      * @return String simple-string-reply The commands returns OK on success.
      */
     RedisFuture<String> slowlogReset();
 
     /**
      * Return the current server time.
-     * 
+     *
      * @return List&lt;V&gt; array-reply specifically:
-     * 
+     *
      *         A multi bulk reply containing two elements:
-     * 
+     *
      *         unix time in seconds. microseconds.
      */
     RedisFuture<List<V>> time();
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisSetAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/api/async/RedisSetAsyncCommands.java
rename to src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java
index 6177ae50f6..a09eae409d 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java
@@ -13,28 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.async;
+package io.lettuce.core.api.async;
 
 import java.util.List;
 import java.util.Set;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Asynchronous executed commands for Sets.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncApi
  */
 public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Add one or more members to a set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply the number of elements that were added to the set, not including all the elements already
@@ -44,7 +44,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Get the number of members in a set.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the cardinality (number of elements) of the set, or {@literal false} if {@code key} does not
      *         exist.
@@ -53,7 +53,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Subtract multiple sets.
-     * 
+     *
      * @param keys the key
      * @return Set&lt;V&gt; array-reply list with members of the resulting set.
      */
@@ -61,7 +61,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Subtract multiple sets.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -70,7 +70,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Subtract multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -79,7 +79,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Intersect multiple sets.
-     * 
+     *
      * @param keys the key
      * @return Set&lt;V&gt; array-reply list with members of the resulting set.
      */
@@ -87,7 +87,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Intersect multiple sets.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -96,7 +96,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Intersect multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -105,11 +105,11 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Determine if a given value is a member of a set.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the element is a member of the set. {@literal false} if the element is not a member of the
      *         set, or if {@code key} does not exist.
      */
@@ -117,12 +117,12 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Move a member from one set to another.
-     * 
+     *
      * @param source the source key
      * @param destination the destination type: key
      * @param member the member type: value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the element is moved. {@literal false} if the element is not a member of {@code source} and no
      *         operation was performed.
      */
@@ -130,7 +130,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Get all the members in a set.
-     * 
+     *
      * @param key the key
      * @return Set&lt;V&gt; array-reply all elements of the set.
      */
@@ -138,7 +138,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Get all the members in a set.
-     * 
+     *
      * @param channel the channel
      * @param key the keys
      * @return Long count of members of the resulting set.
@@ -147,7 +147,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Remove and return a random member from a set.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist.
      */
@@ -164,9 +164,9 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Get one random member from a set.
-     * 
+     *
      * @param key the key
-     * 
+     *
      * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply with the
      *         randomly selected element, or {@literal null} when {@code key} does not exist.
      */
@@ -174,7 +174,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Get one or multiple random members from a set.
-     * 
+     *
      * @param key the key
      * @param count the count type: long
      * @return Set&lt;V&gt; bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply
@@ -184,7 +184,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Get one or multiple random members from a set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param count the count
@@ -194,7 +194,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Remove one or more members from a set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply the number of members that were removed from the set, not including non existing members.
@@ -203,7 +203,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Add multiple sets.
-     * 
+     *
      * @param keys the key
      * @return Set&lt;V&gt; array-reply list with members of the resulting set.
      */
@@ -211,7 +211,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Add multiple sets.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -220,7 +220,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Add multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -229,7 +229,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @return ValueScanCursor&lt;V&gt; scan cursor.
      */
@@ -237,7 +237,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanArgs scan arguments
      * @return ValueScanCursor&lt;V&gt; scan cursor.
@@ -246,7 +246,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -256,7 +256,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return ValueScanCursor&lt;V&gt; scan cursor.
@@ -265,7 +265,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @return StreamScanCursor scan cursor.
@@ -274,7 +274,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanArgs scan arguments
@@ -284,7 +284,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -295,7 +295,7 @@ public interface RedisSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
similarity index 99%
rename from src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
rename to src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
index a76354f598..219ed0c723 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisSortedSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
@@ -13,34 +13,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.async;
+package io.lettuce.core.api.async;
 
 import java.util.List;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.ScoredValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Asynchronous executed commands for Sorted Sets.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncApi
  */
 public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param score the score
      * @param member the member
-     * 
+     *
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -48,11 +48,11 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param scoresAndValues the scoresAndValue tuples (score,value,score,value,...)
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -60,11 +60,11 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param scoredValues the scored values
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -100,12 +100,12 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the ke
      * @param zAddArgs arguments for zadd
      * @param scoredValues the scored values
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -137,7 +137,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Get the number of members in a sorted set.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the cardinality (number of elements) of the sorted set, or {@literal false} if {@code key}
      *         does not exist.
@@ -146,7 +146,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Count the members in a sorted set with scores within the given values.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -158,7 +158,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Count the members in a sorted set with scores within the given values.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -180,7 +180,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Increment the score of a member in a sorted set.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: long
      * @param member the member type: key
@@ -191,7 +191,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
-     * 
+     *
      * @param destination the destination
      * @param keys the keys
      * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
@@ -200,7 +200,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
-     * 
+     *
      * @param destination the destination
      * @param storeArgs the storeArgs
      * @param keys the keys
@@ -394,7 +394,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -407,7 +407,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -431,7 +431,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -446,7 +446,7 @@ public interface RedisSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
rename to src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java
index e58204512b..31369b450e 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisStringAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.async;
+package io.lettuce.core.api.async;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.BitFieldArgs;
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.SetArgs;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
+import io.lettuce.core.BitFieldArgs;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.SetArgs;
+import io.lettuce.core.output.KeyValueStreamingChannel;
 
 /**
  * Asynchronous executed commands for Strings.
@@ -31,7 +31,7 @@
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncApi
  */
 public interface RedisStringAsyncCommands<K, V> {
 
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java
rename to src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
index e7f55f29c5..3791ea3f77 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisTransactionalAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
@@ -13,25 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.async;
+package io.lettuce.core.api.async;
 
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.TransactionResult;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.TransactionResult;
 
 /**
  * Asynchronous executed commands for Transactions.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncApi
  */
 public interface RedisTransactionalAsyncCommands<K, V> {
 
     /**
      * Discard all commands issued after MULTI.
-     * 
+     *
      * @return String simple-string-reply always {@code OK}.
      */
     RedisFuture<String> discard();
diff --git a/src/main/java/com/lambdaworks/redis/api/async/package-info.java b/src/main/java/io/lettuce/core/api/async/package-info.java
similarity index 62%
rename from src/main/java/com/lambdaworks/redis/api/async/package-info.java
rename to src/main/java/io/lettuce/core/api/async/package-info.java
index b6fa5dbcde..31acaeaeef 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/package-info.java
+++ b/src/main/java/io/lettuce/core/api/async/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Standalone Redis API for asynchronous executed commands.
  */
-package com.lambdaworks.redis.api.async;
+package io.lettuce.core.api.async;
diff --git a/src/main/java/com/lambdaworks/redis/api/package-info.java b/src/main/java/io/lettuce/core/api/package-info.java
similarity index 55%
rename from src/main/java/com/lambdaworks/redis/api/package-info.java
rename to src/main/java/io/lettuce/core/api/package-info.java
index 3449aa0a0f..60e47de051 100644
--- a/src/main/java/com/lambdaworks/redis/api/package-info.java
+++ b/src/main/java/io/lettuce/core/api/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Standalone Redis connection API.
  */
-package com.lambdaworks.redis.api;
+package io.lettuce.core.api;
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java
rename to src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
index 735e33aa7c..c04300c715 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/BaseRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
@@ -13,32 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.reactive;
+package io.lettuce.core.api.reactive;
 
 import java.util.Map;
 
-import com.lambdaworks.redis.output.CommandOutput;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.ProtocolKeyword;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
- * 
+ *
  * Reactive executed commands for basic commands.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
+ * @generated by io.lettuce.apigenerator.CreateReactiveApi
  */
 public interface BaseRedisReactiveCommands<K, V> {
 
     /**
      * Post a message to a channel.
-     * 
+     *
      * @param channel the channel type: key
      * @param message the message type: value
      * @return Long integer-reply the number of clients that received the message.
@@ -47,14 +47,14 @@ public interface BaseRedisReactiveCommands<K, V> {
 
     /**
      * Lists the currently *active channels*.
-     * 
+     *
      * @return K array-reply a list of active channels, optionally matching the specified pattern.
      */
     Flux<K> pubsubChannels();
 
     /**
      * Lists the currently *active channels*.
-     * 
+     *
      * @param channel the key
      * @return K array-reply a list of active channels, optionally matching the specified pattern.
      */
@@ -70,14 +70,14 @@ public interface BaseRedisReactiveCommands<K, V> {
 
     /**
      * Returns the number of subscriptions to patterns.
-     * 
+     *
      * @return Long integer-reply the number of patterns all the clients are subscribed to.
      */
     Mono<Long> pubsubNumpat();
 
     /**
      * Echo the given string.
-     * 
+     *
      * @param msg the message type: value
      * @return V bulk-string-reply
      */
@@ -93,7 +93,7 @@ public interface BaseRedisReactiveCommands<K, V> {
 
     /**
      * Ping the server.
-     * 
+     *
      * @return String simple-string-reply
      */
     Mono<String> ping();
@@ -114,14 +114,14 @@ public interface BaseRedisReactiveCommands<K, V> {
 
     /**
      * Close the connection.
-     * 
+     *
      * @return String simple-string-reply always OK.
      */
     Mono<String> quit();
 
     /**
      * Wait for replication.
-     * 
+     *
      * @param replicas minimum number of replicas
      * @param timeout timeout in milliseconds
      * @return number of replicas
@@ -150,7 +150,7 @@ public interface BaseRedisReactiveCommands<K, V> {
     <T> Flux<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output, CommandArgs<K, V> args);
 
     /**
-     * 
+     *
      * @return true if the connection is open (connected and not closed).
      */
     boolean isOpen();
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java
rename to src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java
index 5de0c6ba20..73409827f2 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisGeoReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.reactive;
+package io.lettuce.core.api.reactive;
 
-import com.lambdaworks.redis.*;
+import io.lettuce.core.*;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -25,7 +25,7 @@
  *
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
+ * @generated by io.lettuce.apigenerator.CreateReactiveApi
  */
 public interface RedisGeoReactiveCommands<K, V> {
 
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java
rename to src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java
index 0eddbd8a14..7b9bb653b9 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisHLLReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.reactive;
+package io.lettuce.core.api.reactive;
 
 import reactor.core.publisher.Mono;
 
 /**
  * Reactive executed commands for HyperLogLog (PF* commands).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
+ * @generated by io.lettuce.apigenerator.CreateReactiveApi
  */
 public interface RedisHLLReactiveCommands<K, V> {
 
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java
rename to src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
index dd48f79069..3b8098567a 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisHashReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
@@ -13,32 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.reactive;
+package io.lettuce.core.api.reactive;
 
 import java.util.Map;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
  * Reactive executed commands for Hashes (Key-Value pairs).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
+ * @generated by io.lettuce.apigenerator.CreateReactiveApi
  */
 public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Delete one or more hash fields.
-     * 
+     *
      * @param key the key
      * @param fields the field type: key
      * @return Long integer-reply the number of fields that were removed from the hash, not including specified but non existing
@@ -48,11 +48,11 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Determine if a hash field exists.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the hash contains {@code field}. {@literal false} if the hash does not contain {@code field},
      *         or {@code key} does not exist.
      */
@@ -60,7 +60,7 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Get the value of a hash field.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @return V bulk-string-reply the value associated with {@code field}, or {@literal null} when {@code field} is not present
@@ -70,7 +70,7 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Increment the integer value of a hash field by the given number.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @param amount the increment type: long
@@ -80,7 +80,7 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Increment the float value of a hash field by the given amount.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @param amount the increment type: double
@@ -90,7 +90,7 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Get all the fields and values in a hash.
-     * 
+     *
      * @param key the key
      * @return Map&lt;K,V&gt; array-reply list of fields and their values stored in the hash, or an empty list when {@code key}
      *         does not exist.
@@ -99,17 +99,17 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Stream over all the fields and values in a hash.
-     * 
+     *
      * @param channel the channel
      * @param key the key
-     * 
+     *
      * @return Long count of the keys.
      */
     Mono<Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key);
 
     /**
      * Get all the fields in a hash.
-     * 
+     *
      * @param key the key
      * @return K array-reply list of fields in the hash, or an empty list when {@code key} does not exist.
      */
@@ -117,17 +117,17 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Stream over all the fields in a hash.
-     * 
+     *
      * @param channel the channel
      * @param key the key
-     * 
+     *
      * @return Long count of the keys.
      */
     Mono<Long> hkeys(KeyStreamingChannel<K> channel, K key);
 
     /**
      * Get the number of fields in a hash.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply number of fields in the hash, or {@code 0} when {@code key} does not exist.
      */
@@ -135,7 +135,7 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Get the values of all the given hash fields.
-     * 
+     *
      * @param key the key
      * @param fields the field type: key
      * @return V array-reply list of values associated with the given fields, in the same
@@ -144,18 +144,18 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Stream over the values of all the given hash fields.
-     * 
+     *
      * @param channel the channel
      * @param key the key
      * @param fields the fields
-     * 
+     *
      * @return Long count of the keys
      */
     Mono<Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields);
 
     /**
      * Set multiple hash fields to multiple values.
-     * 
+     *
      * @param key the key
      * @param map the null
      * @return String simple-string-reply
@@ -164,7 +164,7 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
      */
@@ -172,7 +172,7 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanArgs scan arguments
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
@@ -181,7 +181,7 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -191,7 +191,7 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
@@ -200,7 +200,7 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @return StreamScanCursor scan cursor.
@@ -209,7 +209,7 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanArgs scan arguments
@@ -219,7 +219,7 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -230,7 +230,7 @@ public interface RedisHashReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java
rename to src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
index 882bc699d7..d4c8cc318a 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisKeyReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
@@ -13,25 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.reactive;
+package io.lettuce.core.api.reactive;
 
 import java.util.Date;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
  * Reactive executed commands for Keys (Key manipulation/querying).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
+ * @generated by io.lettuce.apigenerator.CreateReactiveApi
  */
 public interface RedisKeyReactiveCommands<K, V> {
 
@@ -53,7 +53,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Return a serialized version of the value stored at the specified key.
-     * 
+     *
      * @param key the key
      * @return byte[] bulk-string-reply the serialized value.
      */
@@ -69,11 +69,11 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Set a key's time to live in seconds.
-     * 
+     *
      * @param key the key
      * @param seconds the seconds type: long
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set.
      */
@@ -81,11 +81,11 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp.
-     * 
+     *
      * @param key the key
      * @param timestamp the timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -93,11 +93,11 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp.
-     * 
+     *
      * @param key the key
      * @param timestamp the timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -105,7 +105,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Find all keys matching the given pattern.
-     * 
+     *
      * @param pattern the pattern type: patternkey (pattern)
      * @return K array-reply list of keys matching {@code pattern}.
      */
@@ -113,7 +113,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Find all keys matching the given pattern.
-     * 
+     *
      * @param channel the channel
      * @param pattern the pattern
      * @return Long array-reply list of keys matching {@code pattern}.
@@ -122,7 +122,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Atomically transfer a key from a Redis instance to another one.
-     * 
+     *
      * @param host the host
      * @param port the port
      * @param key the key
@@ -146,7 +146,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Move a key to another database.
-     * 
+     *
      * @param key the key
      * @param db the db type: long
      * @return Boolean integer-reply specifically:
@@ -155,7 +155,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * returns the kind of internal representation used in order to store the value associated with a key.
-     * 
+     *
      * @param key the key
      * @return String
      */
@@ -164,7 +164,7 @@ public interface RedisKeyReactiveCommands<K, V> {
     /**
      * returns the number of seconds since the object stored at the specified key is idle (not requested by read or write
      * operations).
-     * 
+     *
      * @param key the key
      * @return number of seconds since the object stored at the specified key is idle.
      */
@@ -172,7 +172,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * returns the number of references of the value associated with the specified key.
-     * 
+     *
      * @param key the key
      * @return Long
      */
@@ -180,10 +180,10 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Remove the expiration from a key.
-     * 
+     *
      * @param key the key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was removed. {@literal false} if {@code key} does not exist or does not have an
      *         associated timeout.
      */
@@ -191,11 +191,11 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Set a key's time to live in milliseconds.
-     * 
+     *
      * @param key the key
      * @param milliseconds the milliseconds type: long
      * @return integer-reply, specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set.
      */
@@ -203,11 +203,11 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
-     * 
+     *
      * @param key the key
      * @param timestamp the milliseconds-timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -215,11 +215,11 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
-     * 
+     *
      * @param key the key
      * @param timestamp the milliseconds-timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -227,7 +227,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Get the time to live for a key in milliseconds.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply TTL in milliseconds, or a negative value in order to signal an error (see the description
      *         above).
@@ -236,14 +236,14 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Return a random key from the keyspace.
-     * 
+     *
      * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
      */
     Mono<V> randomkey();
 
     /**
      * Rename a key.
-     * 
+     *
      * @param key the key
      * @param newKey the newkey type: key
      * @return String simple-string-reply
@@ -252,18 +252,18 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Rename a key, only if the new key does not exist.
-     * 
+     *
      * @param key the key
      * @param newKey the newkey type: key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if {@code key} was renamed to {@code newkey}. {@literal false} if {@code newkey} already exists.
      */
     Mono<Boolean> renamenx(K key, K newKey);
 
     /**
      * Create a key using the provided serialized value, previously obtained using DUMP.
-     * 
+     *
      * @param key the key
      * @param ttl the ttl type: long
      * @param value the serialized-value type: string
@@ -273,7 +273,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @return V array-reply list of sorted elements.
      */
@@ -281,7 +281,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @return Long number of values.
@@ -290,7 +290,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @param sortArgs sort arguments
      * @return V array-reply list of sorted elements.
@@ -299,7 +299,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param sortArgs sort arguments
@@ -309,7 +309,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @param sortArgs sort arguments
      * @param destination the destination key to store sort results
@@ -319,7 +319,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Touch one or more keys. Touch sets the last accessed time for a key. Non-exsitent keys wont get created.
-     * 
+     *
      * @param keys the keys
      * @return Long integer-reply the number of found keys.
      */
@@ -335,7 +335,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Determine the type stored at key.
-     * 
+     *
      * @param key the key
      * @return String simple-string-reply type of {@code key}, or {@code none} when {@code key} does not exist.
      */
@@ -343,14 +343,14 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
     Mono<KeyScanCursor<K>> scan();
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanArgs scan arguments
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
@@ -358,7 +358,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
      * @return KeyScanCursor&lt;K&gt; scan cursor.
@@ -367,7 +367,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
@@ -375,7 +375,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @return StreamScanCursor scan cursor.
      */
@@ -383,7 +383,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
@@ -392,7 +392,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -402,7 +402,7 @@ public interface RedisKeyReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return StreamScanCursor scan cursor.
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java
rename to src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java
index 7fb36bc541..393005297d 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisListReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java
@@ -13,32 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.reactive;
+package io.lettuce.core.api.reactive;
 
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
  * Reactive executed commands for Lists.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
+ * @generated by io.lettuce.apigenerator.CreateReactiveApi
  */
 public interface RedisListReactiveCommands<K, V> {
 
     /**
      * Remove and get the first element in a list, or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param keys the keys
      * @return KeyValue&lt;K,V&gt; array-reply specifically:
-     * 
+     *
      *         A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk
      *         with the first element being the name of the key where an element was popped and the second element being the
      *         value of the popped element.
@@ -47,11 +47,11 @@ public interface RedisListReactiveCommands<K, V> {
 
     /**
      * Remove and get the last element in a list, or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param keys the keys
      * @return KeyValue&lt;K,V&gt; array-reply specifically:
-     * 
+     *
      *         A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk
      *         with the first element being the name of the key where an element was popped and the second element being the
      *         value of the popped element.
@@ -60,7 +60,7 @@ public interface RedisListReactiveCommands<K, V> {
 
     /**
      * Pop a value from a list, push it to another list and return it; or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param source the source key
      * @param destination the destination type: key
@@ -71,7 +71,7 @@ public interface RedisListReactiveCommands<K, V> {
 
     /**
      * Get an element from a list by its index.
-     * 
+     *
      * @param key the key
      * @param index the index type: long
      * @return V bulk-string-reply the requested element, or {@literal null} when {@code index} is out of range.
@@ -80,7 +80,7 @@ public interface RedisListReactiveCommands<K, V> {
 
     /**
      * Insert an element before or after another element in a list.
-     * 
+     *
      * @param key the key
      * @param before the before
      * @param pivot the pivot
@@ -92,7 +92,7 @@ public interface RedisListReactiveCommands<K, V> {
 
     /**
      * Get the length of a list.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the length of the list at {@code key}.
      */
@@ -100,7 +100,7 @@ public interface RedisListReactiveCommands<K, V> {
 
     /**
      * Remove and get the first element in a list.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of the first element, or {@literal null} when {@code key} does not exist.
      */
@@ -108,7 +108,7 @@ public interface RedisListReactiveCommands<K, V> {
 
     /**
      * Prepend one or multiple values to a list.
-     * 
+     *
      * @param key the key
      * @param values the value
      * @return Long integer-reply the length of the list after the push operations.
@@ -126,7 +126,7 @@ public interface RedisListReactiveCommands<K, V> {
 
     /**
      * Get a range of elements from a list.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param stop the stop type: long
@@ -136,7 +136,7 @@ public interface RedisListReactiveCommands<K, V> {
 
     /**
      * Get a range of elements from a list.
-     * 
+     *
      * @param channel the channel
      * @param key the key
      * @param start the start type: long
@@ -147,7 +147,7 @@ public interface RedisListReactiveCommands<K, V> {
 
     /**
      * Remove elements from a list.
-     * 
+     *
      * @param key the key
      * @param count the count type: long
      * @param value the value
@@ -157,7 +157,7 @@ public interface RedisListReactiveCommands<K, V> {
 
     /**
      * Set the value of an element in a list by its index.
-     * 
+     *
      * @param key the key
      * @param index the index type: long
      * @param value the value
@@ -167,7 +167,7 @@ public interface RedisListReactiveCommands<K, V> {
 
     /**
      * Trim a list to the specified range.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param stop the stop type: long
@@ -177,7 +177,7 @@ public interface RedisListReactiveCommands<K, V> {
 
     /**
      * Remove and get the last element in a list.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of the last element, or {@literal null} when {@code key} does not exist.
      */
@@ -185,7 +185,7 @@ public interface RedisListReactiveCommands<K, V> {
 
     /**
      * Remove the last element in a list, append it to another list and return it.
-     * 
+     *
      * @param source the source key
      * @param destination the destination type: key
      * @return V bulk-string-reply the element being popped and pushed.
@@ -194,7 +194,7 @@ public interface RedisListReactiveCommands<K, V> {
 
     /**
      * Append one or multiple values to a list.
-     * 
+     *
      * @param key the key
      * @param values the value
      * @return Long integer-reply the length of the list after the push operation.
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java
rename to src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
index 7e93617b93..e79e649892 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.reactive;
+package io.lettuce.core.api.reactive;
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands;
 
 import reactor.core.publisher.Mono;
 
 /**
  * A complete reactive and thread-safe Redis API with 400+ Methods.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -38,7 +38,7 @@ public interface RedisReactiveCommands<K, V> extends RedisHashReactiveCommands<K
 
     /**
      * Set the default timeout for operations.
-     * 
+     *
      * @param timeout the timeout value
      * @param unit the unit of the timeout value
      */
@@ -46,7 +46,7 @@ public interface RedisReactiveCommands<K, V> extends RedisHashReactiveCommands<K
 
     /**
      * Authenticate to the server.
-     * 
+     *
      * @param password the password
      * @return String simple-string-reply
      */
@@ -54,7 +54,7 @@ public interface RedisReactiveCommands<K, V> extends RedisHashReactiveCommands<K
 
     /**
      * Change the selected database for the current connection.
-     * 
+     *
      * @param db the database number
      * @return String simple-string-reply
      */
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisScriptingReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisScriptingReactiveCommands.java
rename to src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
index c8fe5da3c1..5b5eee1260 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisScriptingReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
@@ -13,27 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.reactive;
+package io.lettuce.core.api.reactive;
 
-import com.lambdaworks.redis.ScriptOutputType;
+import io.lettuce.core.ScriptOutputType;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
  * Reactive executed commands for Scripting.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
+ * @generated by io.lettuce.apigenerator.CreateReactiveApi
  */
 public interface RedisScriptingReactiveCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param script Lua 5.1 script.
      * @param type output type
      * @param keys key names
@@ -44,7 +44,7 @@ public interface RedisScriptingReactiveCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param script Lua 5.1 script.
      * @param type the type
      * @param keys the keys
@@ -56,7 +56,7 @@ public interface RedisScriptingReactiveCommands<K, V> {
 
     /**
      * Evaluates a script cached on the server side by its SHA1 digest
-     * 
+     *
      * @param digest SHA1 of the script
      * @param type the type
      * @param keys the keys
@@ -67,7 +67,7 @@ public interface RedisScriptingReactiveCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param digest SHA1 of the script
      * @param type the type
      * @param keys the keys
@@ -79,7 +79,7 @@ public interface RedisScriptingReactiveCommands<K, V> {
 
     /**
      * Check existence of scripts in the script cache.
-     * 
+     *
      * @param digests script digests
      * @return Boolean array-reply The command returns an array of integers that correspond to the specified SHA1
      *         digest arguments. For every corresponding SHA1 digest of a script that actually exists in the script cache, an 1
@@ -89,21 +89,21 @@ public interface RedisScriptingReactiveCommands<K, V> {
 
     /**
      * Remove all the scripts from the script cache.
-     * 
+     *
      * @return String simple-string-reply
      */
     Mono<String> scriptFlush();
 
     /**
      * Kill the script currently in execution.
-     * 
+     *
      * @return String simple-string-reply
      */
     Mono<String> scriptKill();
 
     /**
      * Load the specified Lua script into the script cache.
-     * 
+     *
      * @param script script content
      * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
      */
@@ -111,7 +111,7 @@ public interface RedisScriptingReactiveCommands<K, V> {
 
     /**
      * Create a SHA1 digest from a Lua script.
-     * 
+     *
      * @param script script content
      * @return the SHA1 value
      */
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
rename to src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
index 67c8b0bb09..914a2a2d94 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisServerReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
@@ -13,51 +13,51 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.reactive;
+package io.lettuce.core.api.reactive;
 
 import java.util.Date;
 
-import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.protocol.CommandType;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
  * Reactive executed commands for Server Control.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
+ * @generated by io.lettuce.apigenerator.CreateReactiveApi
  */
 public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Asynchronously rewrite the append-only file.
-     * 
+     *
      * @return String simple-string-reply always {@code OK}.
      */
     Mono<String> bgrewriteaof();
 
     /**
      * Asynchronously save the dataset to disk.
-     * 
+     *
      * @return String simple-string-reply
      */
     Mono<String> bgsave();
 
     /**
      * Get the current connection name.
-     * 
+     *
      * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set.
      */
     Mono<K> clientGetname();
 
     /**
      * Set the current connection name.
-     * 
+     *
      * @param name the client name
      * @return simple-string-reply {@code OK} if the connection name was successfully set.
      */
@@ -65,7 +65,7 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Kill the connection of a client identified by ip:port.
-     * 
+     *
      * @param addr ip:port
      * @return String simple-string-reply {@code OK} if the connection exists and has been closed
      */
@@ -81,7 +81,7 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Stop processing commands from clients for some time.
-     * 
+     *
      * @param timeout the timeout value in milliseconds
      * @return String simple-string-reply The command returns OK or an error if the timeout is invalid.
      */
@@ -89,7 +89,7 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Get the list of client connections.
-     * 
+     *
      * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF),
      *         each line is composed of a succession of property=value fields separated by a space character.
      */
@@ -97,14 +97,14 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Returns an array reply of details about all Redis commands.
-     * 
+     *
      * @return Object array-reply
      */
     Flux<Object> command();
 
     /**
      * Returns an array reply of details about the requested commands.
-     * 
+     *
      * @param commands the commands to query for
      * @return Object array-reply
      */
@@ -112,7 +112,7 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Returns an array reply of details about the requested commands.
-     * 
+     *
      * @param commands the commands to query for
      * @return Object array-reply
      */
@@ -120,14 +120,14 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Get total number of Redis commands.
-     * 
+     *
      * @return Long integer-reply of number of total commands in this Redis server.
      */
     Mono<Long> commandCount();
 
     /**
      * Get the value of a configuration parameter.
-     * 
+     *
      * @param parameter name of the parameter
      * @return String bulk-string-reply
      */
@@ -135,14 +135,14 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Reset the stats returned by INFO.
-     * 
+     *
      * @return String simple-string-reply always {@code OK}.
      */
     Mono<String> configResetstat();
 
     /**
      * Rewrite the configuration file with the in memory configuration.
-     * 
+     *
      * @return String simple-string-reply {@code OK} when the configuration was rewritten properly. Otherwise an error is
      *         returned.
      */
@@ -150,7 +150,7 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Set a configuration parameter to the given value.
-     * 
+     *
      * @param parameter the parameter name
      * @param value the parameter value
      * @return String simple-string-reply: {@code OK} when the configuration was set properly. Otherwise an error is returned.
@@ -159,7 +159,7 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Return the number of keys in the selected database.
-     * 
+     *
      * @return Long integer-reply
      */
     Mono<Long> dbsize();
@@ -181,7 +181,7 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Get debugging information about a key.
-     * 
+     *
      * @param key the key
      * @return String simple-string-reply
      */
@@ -225,7 +225,7 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Remove all keys from all databases.
-     * 
+     *
      * @return String simple-string-reply
      */
     Mono<String> flushall();
@@ -239,7 +239,7 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Remove all keys from the current database.
-     * 
+     *
      * @return String simple-string-reply
      */
     Mono<String> flushdb();
@@ -253,14 +253,14 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Get information and statistics about the server.
-     * 
+     *
      * @return String bulk-string-reply as a collection of text lines.
      */
     Mono<String> info();
 
     /**
      * Get information and statistics about the server.
-     * 
+     *
      * @param section the section type: string
      * @return String bulk-string-reply as a collection of text lines.
      */
@@ -268,21 +268,21 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Get the UNIX time stamp of the last successful save to disk.
-     * 
+     *
      * @return Date integer-reply an UNIX time stamp.
      */
     Mono<Date> lastsave();
 
     /**
      * Synchronously save the dataset to disk.
-     * 
+     *
      * @return String simple-string-reply The commands returns OK on success.
      */
     Mono<String> save();
 
     /**
      * Synchronously save the dataset to disk and then shut down the server.
-     * 
+     *
      * @param save {@literal true} force save operation
      * @return String simple-string-reply The commands returns OK on success.
      */
@@ -290,7 +290,7 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Make the server a slave of another instance, or promote it as master.
-     * 
+     *
      * @param host the host type: string
      * @param port the port type: string
      * @return String simple-string-reply
@@ -299,21 +299,21 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Promote server as master.
-     * 
+     *
      * @return String simple-string-reply
      */
     Mono<String> slaveofNoOne();
 
     /**
      * Read the slow log.
-     * 
+     *
      * @return Object deeply nested multi bulk replies
      */
     Flux<Object> slowlogGet();
 
     /**
      * Read the slow log.
-     * 
+     *
      * @param count the count
      * @return Object deeply nested multi bulk replies
      */
@@ -321,25 +321,25 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Obtaining the current length of the slow log.
-     * 
+     *
      * @return Long length of the slow log.
      */
     Mono<Long> slowlogLen();
 
     /**
      * Resetting the slow log.
-     * 
+     *
      * @return String simple-string-reply The commands returns OK on success.
      */
     Mono<String> slowlogReset();
 
     /**
      * Return the current server time.
-     * 
+     *
      * @return V array-reply specifically:
-     * 
+     *
      *         A multi bulk reply containing two elements:
-     * 
+     *
      *         unix time in seconds. microseconds.
      */
     Flux<V> time();
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java
rename to src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java
index 80e9a1f44a..3dc60c1d7a 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSetReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java
@@ -13,31 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.reactive;
+package io.lettuce.core.api.reactive;
 
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
-import com.lambdaworks.redis.ValueScanCursor;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.ScanArgs;
+import io.lettuce.core.ScanCursor;
+import io.lettuce.core.StreamScanCursor;
+import io.lettuce.core.ValueScanCursor;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
  * Reactive executed commands for Sets.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
+ * @generated by io.lettuce.apigenerator.CreateReactiveApi
  */
 public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Add one or more members to a set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply the number of elements that were added to the set, not including all the elements already
@@ -47,7 +47,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Get the number of members in a set.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the cardinality (number of elements) of the set, or {@literal false} if {@code key} does not
      *         exist.
@@ -56,7 +56,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Subtract multiple sets.
-     * 
+     *
      * @param keys the key
      * @return V array-reply list with members of the resulting set.
      */
@@ -64,7 +64,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Subtract multiple sets.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -73,7 +73,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Subtract multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -82,7 +82,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Intersect multiple sets.
-     * 
+     *
      * @param keys the key
      * @return V array-reply list with members of the resulting set.
      */
@@ -90,7 +90,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Intersect multiple sets.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -99,7 +99,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Intersect multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -108,11 +108,11 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Determine if a given value is a member of a set.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the element is a member of the set. {@literal false} if the element is not a member of the
      *         set, or if {@code key} does not exist.
      */
@@ -120,12 +120,12 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Move a member from one set to another.
-     * 
+     *
      * @param source the source key
      * @param destination the destination type: key
      * @param member the member type: value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the element is moved. {@literal false} if the element is not a member of {@code source} and no
      *         operation was performed.
      */
@@ -133,7 +133,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Get all the members in a set.
-     * 
+     *
      * @param key the key
      * @return V array-reply all elements of the set.
      */
@@ -141,7 +141,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Get all the members in a set.
-     * 
+     *
      * @param channel the channel
      * @param key the keys
      * @return Long count of members of the resulting set.
@@ -150,7 +150,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Remove and return a random member from a set.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist.
      */
@@ -167,9 +167,9 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Get one random member from a set.
-     * 
+     *
      * @param key the key
-     * 
+     *
      * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply with the
      *         randomly selected element, or {@literal null} when {@code key} does not exist.
      */
@@ -177,7 +177,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Get one or multiple random members from a set.
-     * 
+     *
      * @param key the key
      * @param count the count type: long
      * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply
@@ -187,7 +187,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Get one or multiple random members from a set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param count the count
@@ -197,7 +197,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Remove one or more members from a set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply the number of members that were removed from the set, not including non existing members.
@@ -206,7 +206,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Add multiple sets.
-     * 
+     *
      * @param keys the key
      * @return V array-reply list with members of the resulting set.
      */
@@ -214,7 +214,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Add multiple sets.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -223,7 +223,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Add multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -232,7 +232,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @return ValueScanCursor&lt;V&gt; scan cursor.
      */
@@ -240,7 +240,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanArgs scan arguments
      * @return ValueScanCursor&lt;V&gt; scan cursor.
@@ -249,7 +249,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -259,7 +259,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return ValueScanCursor&lt;V&gt; scan cursor.
@@ -268,7 +268,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @return StreamScanCursor scan cursor.
@@ -277,7 +277,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanArgs scan arguments
@@ -287,7 +287,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -298,7 +298,7 @@ public interface RedisSetReactiveCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
similarity index 99%
rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
rename to src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
index b1b4cd7a3f..3c337e945b 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisSortedSetReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
@@ -13,35 +13,35 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.reactive;
+package io.lettuce.core.api.reactive;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.ScoredValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
  * Reactive executed commands for Sorted Sets.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
+ * @generated by io.lettuce.apigenerator.CreateReactiveApi
  */
 public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param score the score
      * @param member the member
-     * 
+     *
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -49,11 +49,11 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param scoresAndValues the scoresAndValue tuples (score,value,score,value,...)
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -61,11 +61,11 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param scoredValues the scored values
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -101,12 +101,12 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the ke
      * @param zAddArgs arguments for zadd
      * @param scoredValues the scored values
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -138,7 +138,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Get the number of members in a sorted set.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the cardinality (number of elements) of the sorted set, or {@literal false} if {@code key}
      *         does not exist.
@@ -147,7 +147,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Count the members in a sorted set with scores within the given values.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -159,7 +159,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Count the members in a sorted set with scores within the given values.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -181,7 +181,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Increment the score of a member in a sorted set.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: long
      * @param member the member type: key
@@ -192,7 +192,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
-     * 
+     *
      * @param destination the destination
      * @param keys the keys
      * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
@@ -201,7 +201,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
-     * 
+     *
      * @param destination the destination
      * @param storeArgs the storeArgs
      * @param keys the keys
@@ -395,7 +395,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -408,7 +408,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -432,7 +432,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Stream over range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -447,7 +447,7 @@ public interface RedisSortedSetReactiveCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java
rename to src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java
index 24ad9c610a..b5c72ffcb6 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisStringReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.reactive;
+package io.lettuce.core.api.reactive;
 
 import java.util.Map;
 
-import com.lambdaworks.redis.BitFieldArgs;
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.SetArgs;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
+import io.lettuce.core.BitFieldArgs;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.SetArgs;
+import io.lettuce.core.Value;
+import io.lettuce.core.output.KeyValueStreamingChannel;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -33,7 +33,7 @@
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
+ * @generated by io.lettuce.apigenerator.CreateReactiveApi
  */
 public interface RedisStringReactiveCommands<K, V> {
 
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java
rename to src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
index a25836c2aa..30f5d866fd 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/RedisTransactionalReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
@@ -13,26 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.reactive;
+package io.lettuce.core.api.reactive;
 
-import com.lambdaworks.redis.TransactionResult;
+import io.lettuce.core.TransactionResult;
 
 import reactor.core.publisher.Mono;
 
 /**
  * Reactive executed commands for Transactions.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
+ * @generated by io.lettuce.apigenerator.CreateReactiveApi
  */
 public interface RedisTransactionalReactiveCommands<K, V> {
 
     /**
      * Discard all commands issued after MULTI.
-     * 
+     *
      * @return String simple-string-reply always {@code OK}.
      */
     Mono<String> discard();
diff --git a/src/main/java/com/lambdaworks/redis/api/reactive/package-info.java b/src/main/java/io/lettuce/core/api/reactive/package-info.java
similarity index 63%
rename from src/main/java/com/lambdaworks/redis/api/reactive/package-info.java
rename to src/main/java/io/lettuce/core/api/reactive/package-info.java
index bd72cba31d..695b9fd7ab 100644
--- a/src/main/java/com/lambdaworks/redis/api/reactive/package-info.java
+++ b/src/main/java/io/lettuce/core/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Standalone Redis API for commands executed in a reactive manner.
  */
-package com.lambdaworks.redis.api.reactive;
+package io.lettuce.core.api.reactive;
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java b/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java
rename to src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
index b5d567ab86..993b0fe3ae 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/BaseRedisCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
@@ -13,30 +13,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.sync;
+package io.lettuce.core.api.sync;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.output.CommandOutput;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
- * 
+ *
  * Synchronous executed commands for basic commands.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncApi
+ * @generated by io.lettuce.apigenerator.CreateSyncApi
  */
 public interface BaseRedisCommands<K, V> {
 
     /**
      * Post a message to a channel.
-     * 
+     *
      * @param channel the channel type: key
      * @param message the message type: value
      * @return Long integer-reply the number of clients that received the message.
@@ -45,14 +45,14 @@ public interface BaseRedisCommands<K, V> {
 
     /**
      * Lists the currently *active channels*.
-     * 
+     *
      * @return List&lt;K&gt; array-reply a list of active channels, optionally matching the specified pattern.
      */
     List<K> pubsubChannels();
 
     /**
      * Lists the currently *active channels*.
-     * 
+     *
      * @param channel the key
      * @return List&lt;K&gt; array-reply a list of active channels, optionally matching the specified pattern.
      */
@@ -68,14 +68,14 @@ public interface BaseRedisCommands<K, V> {
 
     /**
      * Returns the number of subscriptions to patterns.
-     * 
+     *
      * @return Long integer-reply the number of patterns all the clients are subscribed to.
      */
     Long pubsubNumpat();
 
     /**
      * Echo the given string.
-     * 
+     *
      * @param msg the message type: value
      * @return V bulk-string-reply
      */
@@ -91,7 +91,7 @@ public interface BaseRedisCommands<K, V> {
 
     /**
      * Ping the server.
-     * 
+     *
      * @return String simple-string-reply
      */
     String ping();
@@ -112,14 +112,14 @@ public interface BaseRedisCommands<K, V> {
 
     /**
      * Close the connection.
-     * 
+     *
      * @return String simple-string-reply always OK.
      */
     String quit();
 
     /**
      * Wait for replication.
-     * 
+     *
      * @param replicas minimum number of replicas
      * @param timeout timeout in milliseconds
      * @return number of replicas
@@ -148,7 +148,7 @@ public interface BaseRedisCommands<K, V> {
     <T> T dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args);
 
     /**
-     * 
+     *
      * @return true if the connection is open (connected and not closed).
      */
     boolean isOpen();
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java
rename to src/main/java/io/lettuce/core/api/sync/RedisCommands.java
index c8ce6c73fe..96a94ccd03 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.sync;
+package io.lettuce.core.api.sync;
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
 
 /**
- * 
+ *
  * A complete synchronous and thread-safe Redis API with 400+ Methods.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -36,7 +36,7 @@ public interface RedisCommands<K, V> extends RedisHashCommands<K, V>, RedisKeyCo
 
     /**
      * Set the default timeout for operations.
-     * 
+     *
      * @param timeout the timeout value
      * @param unit the unit of the timeout value
      */
@@ -44,7 +44,7 @@ public interface RedisCommands<K, V> extends RedisHashCommands<K, V>, RedisKeyCo
 
     /**
      * Authenticate to the server.
-     * 
+     *
      * @param password the password
      * @return String simple-string-reply
      */
@@ -52,7 +52,7 @@ public interface RedisCommands<K, V> extends RedisHashCommands<K, V>, RedisKeyCo
 
     /**
      * Change the selected database for the current Commands.
-     * 
+     *
      * @param db the database number
      * @return String simple-string-reply
      */
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
rename to src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java
index 625ad6aaae..b6734b49c7 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisGeoCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.sync;
+package io.lettuce.core.api.sync;
 
 import java.util.List;
 import java.util.Set;
 
-import com.lambdaworks.redis.*;
+import io.lettuce.core.*;
 
 /**
  * Synchronous executed commands for the Geo-API.
  *
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncApi
+ * @generated by io.lettuce.apigenerator.CreateSyncApi
  */
 public interface RedisGeoCommands<K, V> {
 
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisHLLCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/api/sync/RedisHLLCommands.java
rename to src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java
index aa7386298d..04ea308c87 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisHLLCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.sync;
+package io.lettuce.core.api.sync;
 
 /**
  * Synchronous executed commands for HyperLogLog (PF* commands).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 3.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncApi
+ * @generated by io.lettuce.apigenerator.CreateSyncApi
  */
 public interface RedisHLLCommands<K, V> {
 
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java
rename to src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
index a6be8df68b..199f9d60a4 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisHashCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
@@ -13,30 +13,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.sync;
+package io.lettuce.core.api.sync;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Synchronous executed commands for Hashes (Key-Value pairs).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncApi
+ * @generated by io.lettuce.apigenerator.CreateSyncApi
  */
 public interface RedisHashCommands<K, V> {
 
     /**
      * Delete one or more hash fields.
-     * 
+     *
      * @param key the key
      * @param fields the field type: key
      * @return Long integer-reply the number of fields that were removed from the hash, not including specified but non existing
@@ -46,11 +46,11 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Determine if a hash field exists.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the hash contains {@code field}. {@literal false} if the hash does not contain {@code field},
      *         or {@code key} does not exist.
      */
@@ -58,7 +58,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Get the value of a hash field.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @return V bulk-string-reply the value associated with {@code field}, or {@literal null} when {@code field} is not present
@@ -68,7 +68,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Increment the integer value of a hash field by the given number.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @param amount the increment type: long
@@ -78,7 +78,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Increment the float value of a hash field by the given amount.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @param amount the increment type: double
@@ -88,7 +88,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Get all the fields and values in a hash.
-     * 
+     *
      * @param key the key
      * @return Map&lt;K,V&gt; array-reply list of fields and their values stored in the hash, or an empty list when {@code key}
      *         does not exist.
@@ -97,17 +97,17 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Stream over all the fields and values in a hash.
-     * 
+     *
      * @param channel the channel
      * @param key the key
-     * 
+     *
      * @return Long count of the keys.
      */
     Long hgetall(KeyValueStreamingChannel<K, V> channel, K key);
 
     /**
      * Get all the fields in a hash.
-     * 
+     *
      * @param key the key
      * @return List&lt;K&gt; array-reply list of fields in the hash, or an empty list when {@code key} does not exist.
      */
@@ -115,17 +115,17 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Stream over all the fields in a hash.
-     * 
+     *
      * @param channel the channel
      * @param key the key
-     * 
+     *
      * @return Long count of the keys.
      */
     Long hkeys(KeyStreamingChannel<K> channel, K key);
 
     /**
      * Get the number of fields in a hash.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply number of fields in the hash, or {@code 0} when {@code key} does not exist.
      */
@@ -133,7 +133,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Get the values of all the given hash fields.
-     * 
+     *
      * @param key the key
      * @param fields the field type: key
      * @return List&lt;V&gt; array-reply list of values associated with the given fields, in the same
@@ -142,18 +142,18 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Stream over the values of all the given hash fields.
-     * 
+     *
      * @param channel the channel
      * @param key the key
      * @param fields the fields
-     * 
+     *
      * @return Long count of the keys
      */
     Long hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields);
 
     /**
      * Set multiple hash fields to multiple values.
-     * 
+     *
      * @param key the key
      * @param map the null
      * @return String simple-string-reply
@@ -162,7 +162,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
      */
@@ -170,7 +170,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanArgs scan arguments
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
@@ -179,7 +179,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -189,7 +189,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
@@ -198,7 +198,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @return StreamScanCursor scan cursor.
@@ -207,7 +207,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanArgs scan arguments
@@ -217,7 +217,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -228,7 +228,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java
rename to src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
index 285b04d15f..9d0c9f107a 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisKeyCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.sync;
+package io.lettuce.core.api.sync;
 
 import java.util.Date;
 import java.util.List;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Synchronous executed commands for Keys (Key manipulation/querying).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncApi
+ * @generated by io.lettuce.apigenerator.CreateSyncApi
  */
 public interface RedisKeyCommands<K, V> {
 
@@ -51,7 +51,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Return a serialized version of the value stored at the specified key.
-     * 
+     *
      * @param key the key
      * @return byte[] bulk-string-reply the serialized value.
      */
@@ -67,11 +67,11 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Set a key's time to live in seconds.
-     * 
+     *
      * @param key the key
      * @param seconds the seconds type: long
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set.
      */
@@ -79,11 +79,11 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp.
-     * 
+     *
      * @param key the key
      * @param timestamp the timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -91,11 +91,11 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp.
-     * 
+     *
      * @param key the key
      * @param timestamp the timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -103,7 +103,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Find all keys matching the given pattern.
-     * 
+     *
      * @param pattern the pattern type: patternkey (pattern)
      * @return List&lt;K&gt; array-reply list of keys matching {@code pattern}.
      */
@@ -111,7 +111,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Find all keys matching the given pattern.
-     * 
+     *
      * @param channel the channel
      * @param pattern the pattern
      * @return Long array-reply list of keys matching {@code pattern}.
@@ -120,7 +120,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Atomically transfer a key from a Redis instance to another one.
-     * 
+     *
      * @param host the host
      * @param port the port
      * @param key the key
@@ -144,7 +144,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Move a key to another database.
-     * 
+     *
      * @param key the key
      * @param db the db type: long
      * @return Boolean integer-reply specifically:
@@ -153,7 +153,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * returns the kind of internal representation used in order to store the value associated with a key.
-     * 
+     *
      * @param key the key
      * @return String
      */
@@ -162,7 +162,7 @@ public interface RedisKeyCommands<K, V> {
     /**
      * returns the number of seconds since the object stored at the specified key is idle (not requested by read or write
      * operations).
-     * 
+     *
      * @param key the key
      * @return number of seconds since the object stored at the specified key is idle.
      */
@@ -170,7 +170,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * returns the number of references of the value associated with the specified key.
-     * 
+     *
      * @param key the key
      * @return Long
      */
@@ -178,10 +178,10 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Remove the expiration from a key.
-     * 
+     *
      * @param key the key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was removed. {@literal false} if {@code key} does not exist or does not have an
      *         associated timeout.
      */
@@ -189,11 +189,11 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Set a key's time to live in milliseconds.
-     * 
+     *
      * @param key the key
      * @param milliseconds the milliseconds type: long
      * @return integer-reply, specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set.
      */
@@ -201,11 +201,11 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
-     * 
+     *
      * @param key the key
      * @param timestamp the milliseconds-timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -213,11 +213,11 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
-     * 
+     *
      * @param key the key
      * @param timestamp the milliseconds-timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -225,7 +225,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Get the time to live for a key in milliseconds.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply TTL in milliseconds, or a negative value in order to signal an error (see the description
      *         above).
@@ -234,14 +234,14 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Return a random key from the keyspace.
-     * 
+     *
      * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
      */
     V randomkey();
 
     /**
      * Rename a key.
-     * 
+     *
      * @param key the key
      * @param newKey the newkey type: key
      * @return String simple-string-reply
@@ -250,18 +250,18 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Rename a key, only if the new key does not exist.
-     * 
+     *
      * @param key the key
      * @param newKey the newkey type: key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if {@code key} was renamed to {@code newkey}. {@literal false} if {@code newkey} already exists.
      */
     Boolean renamenx(K key, K newKey);
 
     /**
      * Create a key using the provided serialized value, previously obtained using DUMP.
-     * 
+     *
      * @param key the key
      * @param ttl the ttl type: long
      * @param value the serialized-value type: string
@@ -271,7 +271,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @return List&lt;V&gt; array-reply list of sorted elements.
      */
@@ -279,7 +279,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @return Long number of values.
@@ -288,7 +288,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @param sortArgs sort arguments
      * @return List&lt;V&gt; array-reply list of sorted elements.
@@ -297,7 +297,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param sortArgs sort arguments
@@ -307,7 +307,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @param sortArgs sort arguments
      * @param destination the destination key to store sort results
@@ -317,7 +317,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Touch one or more keys. Touch sets the last accessed time for a key. Non-exsitent keys wont get created.
-     * 
+     *
      * @param keys the keys
      * @return Long integer-reply the number of found keys.
      */
@@ -333,7 +333,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Determine the type stored at key.
-     * 
+     *
      * @param key the key
      * @return String simple-string-reply type of {@code key}, or {@code none} when {@code key} does not exist.
      */
@@ -341,14 +341,14 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
     KeyScanCursor<K> scan();
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanArgs scan arguments
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
@@ -356,7 +356,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
      * @return KeyScanCursor&lt;K&gt; scan cursor.
@@ -365,7 +365,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
@@ -373,7 +373,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @return StreamScanCursor scan cursor.
      */
@@ -381,7 +381,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
@@ -390,7 +390,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -400,7 +400,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return StreamScanCursor scan cursor.
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java
rename to src/main/java/io/lettuce/core/api/sync/RedisListCommands.java
index 93c1b00c0e..c35ef70288 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisListCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java
@@ -13,31 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.sync;
+package io.lettuce.core.api.sync;
 
 import java.util.List;
 
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Synchronous executed commands for Lists.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncApi
+ * @generated by io.lettuce.apigenerator.CreateSyncApi
  */
 public interface RedisListCommands<K, V> {
 
     /**
      * Remove and get the first element in a list, or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param keys the keys
      * @return KeyValue&lt;K,V&gt; array-reply specifically:
-     * 
+     *
      *         A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk
      *         with the first element being the name of the key where an element was popped and the second element being the
      *         value of the popped element.
@@ -46,11 +46,11 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Remove and get the last element in a list, or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param keys the keys
      * @return KeyValue&lt;K,V&gt; array-reply specifically:
-     * 
+     *
      *         A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk
      *         with the first element being the name of the key where an element was popped and the second element being the
      *         value of the popped element.
@@ -59,7 +59,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Pop a value from a list, push it to another list and return it; or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param source the source key
      * @param destination the destination type: key
@@ -70,7 +70,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Get an element from a list by its index.
-     * 
+     *
      * @param key the key
      * @param index the index type: long
      * @return V bulk-string-reply the requested element, or {@literal null} when {@code index} is out of range.
@@ -79,7 +79,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Insert an element before or after another element in a list.
-     * 
+     *
      * @param key the key
      * @param before the before
      * @param pivot the pivot
@@ -91,7 +91,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Get the length of a list.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the length of the list at {@code key}.
      */
@@ -99,7 +99,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Remove and get the first element in a list.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of the first element, or {@literal null} when {@code key} does not exist.
      */
@@ -107,7 +107,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Prepend one or multiple values to a list.
-     * 
+     *
      * @param key the key
      * @param values the value
      * @return Long integer-reply the length of the list after the push operations.
@@ -125,7 +125,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Get a range of elements from a list.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param stop the stop type: long
@@ -135,7 +135,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Get a range of elements from a list.
-     * 
+     *
      * @param channel the channel
      * @param key the key
      * @param start the start type: long
@@ -146,7 +146,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Remove elements from a list.
-     * 
+     *
      * @param key the key
      * @param count the count type: long
      * @param value the value
@@ -156,7 +156,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Set the value of an element in a list by its index.
-     * 
+     *
      * @param key the key
      * @param index the index type: long
      * @param value the value
@@ -166,7 +166,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Trim a list to the specified range.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param stop the stop type: long
@@ -176,7 +176,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Remove and get the last element in a list.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of the last element, or {@literal null} when {@code key} does not exist.
      */
@@ -184,7 +184,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Remove the last element in a list, append it to another list and return it.
-     * 
+     *
      * @param source the source key
      * @param destination the destination type: key
      * @return V bulk-string-reply the element being popped and pushed.
@@ -193,7 +193,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Append one or multiple values to a list.
-     * 
+     *
      * @param key the key
      * @param values the value
      * @return Long integer-reply the length of the list after the push operation.
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisScriptingCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/api/sync/RedisScriptingCommands.java
rename to src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
index 705e6a4f4d..f1a7601cbc 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisScriptingCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
@@ -13,26 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.sync;
+package io.lettuce.core.api.sync;
 
 import java.util.List;
 
-import com.lambdaworks.redis.ScriptOutputType;
+import io.lettuce.core.ScriptOutputType;
 
 /**
  * Synchronous executed commands for Scripting.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncApi
+ * @generated by io.lettuce.apigenerator.CreateSyncApi
  */
 public interface RedisScriptingCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param script Lua 5.1 script.
      * @param type output type
      * @param keys key names
@@ -43,7 +43,7 @@ public interface RedisScriptingCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param script Lua 5.1 script.
      * @param type the type
      * @param keys the keys
@@ -55,7 +55,7 @@ public interface RedisScriptingCommands<K, V> {
 
     /**
      * Evaluates a script cached on the server side by its SHA1 digest
-     * 
+     *
      * @param digest SHA1 of the script
      * @param type the type
      * @param keys the keys
@@ -66,7 +66,7 @@ public interface RedisScriptingCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param digest SHA1 of the script
      * @param type the type
      * @param keys the keys
@@ -78,7 +78,7 @@ public interface RedisScriptingCommands<K, V> {
 
     /**
      * Check existence of scripts in the script cache.
-     * 
+     *
      * @param digests script digests
      * @return List&lt;Boolean&gt; array-reply The command returns an array of integers that correspond to the specified SHA1
      *         digest arguments. For every corresponding SHA1 digest of a script that actually exists in the script cache, an 1
@@ -88,21 +88,21 @@ public interface RedisScriptingCommands<K, V> {
 
     /**
      * Remove all the scripts from the script cache.
-     * 
+     *
      * @return String simple-string-reply
      */
     String scriptFlush();
 
     /**
      * Kill the script currently in execution.
-     * 
+     *
      * @return String simple-string-reply
      */
     String scriptKill();
 
     /**
      * Load the specified Lua script into the script cache.
-     * 
+     *
      * @param script script content
      * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
      */
@@ -110,7 +110,7 @@ public interface RedisScriptingCommands<K, V> {
 
     /**
      * Create a SHA1 digest from a Lua script.
-     * 
+     *
      * @param script script content
      * @return the SHA1 value
      */
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
rename to src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
index 6adcfe2137..360b6a4f74 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisServerCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
@@ -13,49 +13,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.sync;
+package io.lettuce.core.api.sync;
 
 import java.util.Date;
 import java.util.List;
 
-import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.protocol.CommandType;
 
 /**
  * Synchronous executed commands for Server Control.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncApi
+ * @generated by io.lettuce.apigenerator.CreateSyncApi
  */
 public interface RedisServerCommands<K, V> {
 
     /**
      * Asynchronously rewrite the append-only file.
-     * 
+     *
      * @return String simple-string-reply always {@code OK}.
      */
     String bgrewriteaof();
 
     /**
      * Asynchronously save the dataset to disk.
-     * 
+     *
      * @return String simple-string-reply
      */
     String bgsave();
 
     /**
      * Get the current connection name.
-     * 
+     *
      * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set.
      */
     K clientGetname();
 
     /**
      * Set the current connection name.
-     * 
+     *
      * @param name the client name
      * @return simple-string-reply {@code OK} if the connection name was successfully set.
      */
@@ -63,7 +63,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Kill the connection of a client identified by ip:port.
-     * 
+     *
      * @param addr ip:port
      * @return String simple-string-reply {@code OK} if the connection exists and has been closed
      */
@@ -79,7 +79,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Stop processing commands from clients for some time.
-     * 
+     *
      * @param timeout the timeout value in milliseconds
      * @return String simple-string-reply The command returns OK or an error if the timeout is invalid.
      */
@@ -87,7 +87,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Get the list of client connections.
-     * 
+     *
      * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF),
      *         each line is composed of a succession of property=value fields separated by a space character.
      */
@@ -95,14 +95,14 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Returns an array reply of details about all Redis commands.
-     * 
+     *
      * @return List&lt;Object&gt; array-reply
      */
     List<Object> command();
 
     /**
      * Returns an array reply of details about the requested commands.
-     * 
+     *
      * @param commands the commands to query for
      * @return List&lt;Object&gt; array-reply
      */
@@ -110,7 +110,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Returns an array reply of details about the requested commands.
-     * 
+     *
      * @param commands the commands to query for
      * @return List&lt;Object&gt; array-reply
      */
@@ -118,14 +118,14 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Get total number of Redis commands.
-     * 
+     *
      * @return Long integer-reply of number of total commands in this Redis server.
      */
     Long commandCount();
 
     /**
      * Get the value of a configuration parameter.
-     * 
+     *
      * @param parameter name of the parameter
      * @return List&lt;String&gt; bulk-string-reply
      */
@@ -133,14 +133,14 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Reset the stats returned by INFO.
-     * 
+     *
      * @return String simple-string-reply always {@code OK}.
      */
     String configResetstat();
 
     /**
      * Rewrite the configuration file with the in memory configuration.
-     * 
+     *
      * @return String simple-string-reply {@code OK} when the configuration was rewritten properly. Otherwise an error is
      *         returned.
      */
@@ -148,7 +148,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Set a configuration parameter to the given value.
-     * 
+     *
      * @param parameter the parameter name
      * @param value the parameter value
      * @return String simple-string-reply: {@code OK} when the configuration was set properly. Otherwise an error is returned.
@@ -157,7 +157,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Return the number of keys in the selected database.
-     * 
+     *
      * @return Long integer-reply
      */
     Long dbsize();
@@ -179,7 +179,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Get debugging information about a key.
-     * 
+     *
      * @param key the key
      * @return String simple-string-reply
      */
@@ -219,7 +219,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Remove all keys from all databases.
-     * 
+     *
      * @return String simple-string-reply
      */
     String flushall();
@@ -233,7 +233,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Remove all keys from the current database.
-     * 
+     *
      * @return String simple-string-reply
      */
     String flushdb();
@@ -247,14 +247,14 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Get information and statistics about the server.
-     * 
+     *
      * @return String bulk-string-reply as a collection of text lines.
      */
     String info();
 
     /**
      * Get information and statistics about the server.
-     * 
+     *
      * @param section the section type: string
      * @return String bulk-string-reply as a collection of text lines.
      */
@@ -262,28 +262,28 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Get the UNIX time stamp of the last successful save to disk.
-     * 
+     *
      * @return Date integer-reply an UNIX time stamp.
      */
     Date lastsave();
 
     /**
      * Synchronously save the dataset to disk.
-     * 
+     *
      * @return String simple-string-reply The commands returns OK on success.
      */
     String save();
 
     /**
      * Synchronously save the dataset to disk and then shut down the server.
-     * 
+     *
      * @param save {@literal true} force save operation
      */
     void shutdown(boolean save);
 
     /**
      * Make the server a slave of another instance, or promote it as master.
-     * 
+     *
      * @param host the host type: string
      * @param port the port type: string
      * @return String simple-string-reply
@@ -292,21 +292,21 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Promote server as master.
-     * 
+     *
      * @return String simple-string-reply
      */
     String slaveofNoOne();
 
     /**
      * Read the slow log.
-     * 
+     *
      * @return List&lt;Object&gt; deeply nested multi bulk replies
      */
     List<Object> slowlogGet();
 
     /**
      * Read the slow log.
-     * 
+     *
      * @param count the count
      * @return List&lt;Object&gt; deeply nested multi bulk replies
      */
@@ -314,25 +314,25 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Obtaining the current length of the slow log.
-     * 
+     *
      * @return Long length of the slow log.
      */
     Long slowlogLen();
 
     /**
      * Resetting the slow log.
-     * 
+     *
      * @return String simple-string-reply The commands returns OK on success.
      */
     String slowlogReset();
 
     /**
      * Return the current server time.
-     * 
+     *
      * @return List&lt;V&gt; array-reply specifically:
-     * 
+     *
      *         A multi bulk reply containing two elements:
-     * 
+     *
      *         unix time in seconds. microseconds.
      */
     List<V> time();
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSetCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java
similarity index 94%
rename from src/main/templates/com/lambdaworks/redis/api/RedisSetCommands.java
rename to src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java
index 0db16cdb97..3d7ec1ef35 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisSetCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java
@@ -13,30 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api;
+package io.lettuce.core.api.sync;
 
 import java.util.List;
 import java.util.Set;
 
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
-import com.lambdaworks.redis.ValueScanCursor;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.ScanArgs;
+import io.lettuce.core.ScanCursor;
+import io.lettuce.core.StreamScanCursor;
+import io.lettuce.core.ValueScanCursor;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
- * ${intent} for Sets.
- * 
+ * Synchronous executed commands for Sets.
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
+ * @generated by io.lettuce.apigenerator.CreateSyncApi
  */
 public interface RedisSetCommands<K, V> {
 
     /**
      * Add one or more members to a set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply the number of elements that were added to the set, not including all the elements already
@@ -46,7 +47,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Get the number of members in a set.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the cardinality (number of elements) of the set, or {@literal false} if {@code key} does not
      *         exist.
@@ -55,7 +56,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Subtract multiple sets.
-     * 
+     *
      * @param keys the key
      * @return Set&lt;V&gt; array-reply list with members of the resulting set.
      */
@@ -63,7 +64,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Subtract multiple sets.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -72,7 +73,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Subtract multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -81,7 +82,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Intersect multiple sets.
-     * 
+     *
      * @param keys the key
      * @return Set&lt;V&gt; array-reply list with members of the resulting set.
      */
@@ -89,7 +90,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Intersect multiple sets.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -98,7 +99,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Intersect multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -107,11 +108,11 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Determine if a given value is a member of a set.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the element is a member of the set. {@literal false} if the element is not a member of the
      *         set, or if {@code key} does not exist.
      */
@@ -119,12 +120,12 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Move a member from one set to another.
-     * 
+     *
      * @param source the source key
      * @param destination the destination type: key
      * @param member the member type: value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the element is moved. {@literal false} if the element is not a member of {@code source} and no
      *         operation was performed.
      */
@@ -132,7 +133,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Get all the members in a set.
-     * 
+     *
      * @param key the key
      * @return Set&lt;V&gt; array-reply all elements of the set.
      */
@@ -140,7 +141,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Get all the members in a set.
-     * 
+     *
      * @param channel the channel
      * @param key the keys
      * @return Long count of members of the resulting set.
@@ -149,7 +150,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Remove and return a random member from a set.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist.
      */
@@ -166,9 +167,9 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Get one random member from a set.
-     * 
+     *
      * @param key the key
-     * 
+     *
      * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply with the
      *         randomly selected element, or {@literal null} when {@code key} does not exist.
      */
@@ -176,7 +177,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Get one or multiple random members from a set.
-     * 
+     *
      * @param key the key
      * @param count the count type: long
      * @return Set&lt;V&gt; bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply
@@ -186,7 +187,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Get one or multiple random members from a set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param count the count
@@ -196,7 +197,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Remove one or more members from a set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply the number of members that were removed from the set, not including non existing members.
@@ -205,7 +206,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Add multiple sets.
-     * 
+     *
      * @param keys the key
      * @return Set&lt;V&gt; array-reply list with members of the resulting set.
      */
@@ -213,7 +214,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Add multiple sets.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -222,7 +223,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Add multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -231,7 +232,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @return ValueScanCursor&lt;V&gt; scan cursor.
      */
@@ -239,7 +240,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanArgs scan arguments
      * @return ValueScanCursor&lt;V&gt; scan cursor.
@@ -248,7 +249,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -258,7 +259,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return ValueScanCursor&lt;V&gt; scan cursor.
@@ -267,7 +268,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @return StreamScanCursor scan cursor.
@@ -276,7 +277,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanArgs scan arguments
@@ -286,7 +287,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -297,7 +298,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
similarity index 99%
rename from src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
rename to src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
index 42baa2c1e6..46a874b3e7 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisSortedSetCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
@@ -13,34 +13,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.sync;
+package io.lettuce.core.api.sync;
 
 import java.util.List;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.ScoredValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Synchronous executed commands for Sorted Sets.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncApi
+ * @generated by io.lettuce.apigenerator.CreateSyncApi
  */
 public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param score the score
      * @param member the member
-     * 
+     *
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -48,11 +48,11 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param scoresAndValues the scoresAndValue tuples (score,value,score,value,...)
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -60,11 +60,11 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param scoredValues the scored values
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -100,12 +100,12 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the ke
      * @param zAddArgs arguments for zadd
      * @param scoredValues the scored values
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -137,7 +137,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Get the number of members in a sorted set.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the cardinality (number of elements) of the sorted set, or {@literal false} if {@code key}
      *         does not exist.
@@ -146,7 +146,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Count the members in a sorted set with scores within the given values.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -158,7 +158,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Count the members in a sorted set with scores within the given values.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -180,7 +180,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Increment the score of a member in a sorted set.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: long
      * @param member the member type: key
@@ -191,7 +191,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
-     * 
+     *
      * @param destination the destination
      * @param keys the keys
      * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
@@ -200,7 +200,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
-     * 
+     *
      * @param destination the destination
      * @param storeArgs the storeArgs
      * @param keys the keys
@@ -394,7 +394,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -407,7 +407,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -431,7 +431,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Stream over range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -446,7 +446,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
rename to src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java
index 3d504eeb42..3601db0f4a 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisStringCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.sync;
+package io.lettuce.core.api.sync;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.BitFieldArgs;
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.SetArgs;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
+import io.lettuce.core.BitFieldArgs;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.SetArgs;
+import io.lettuce.core.output.KeyValueStreamingChannel;
 
 /**
  * Synchronous executed commands for Strings.
@@ -30,7 +30,7 @@
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncApi
+ * @generated by io.lettuce.apigenerator.CreateSyncApi
  */
 public interface RedisStringCommands<K, V> {
 
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java
rename to src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
index 3c3ddd77df..453a6f89a1 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisTransactionalCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
@@ -13,24 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.sync;
+package io.lettuce.core.api.sync;
 
-import com.lambdaworks.redis.TransactionResult;
+import io.lettuce.core.TransactionResult;
 
 /**
  * Synchronous executed commands for Transactions.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncApi
+ * @generated by io.lettuce.apigenerator.CreateSyncApi
  */
 public interface RedisTransactionalCommands<K, V> {
 
     /**
      * Discard all commands issued after MULTI.
-     * 
+     *
      * @return String simple-string-reply always {@code OK}.
      */
     String discard();
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/package-info.java b/src/main/java/io/lettuce/core/api/sync/package-info.java
similarity index 62%
rename from src/main/java/com/lambdaworks/redis/api/sync/package-info.java
rename to src/main/java/io/lettuce/core/api/sync/package-info.java
index 6e79bb0948..a1a443a8d7 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/package-info.java
+++ b/src/main/java/io/lettuce/core/api/sync/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Standalone Redis API for synchronous executed commands.
  */
-package com.lambdaworks.redis.api.sync;
+package io.lettuce.core.api.sync;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/AbstractClusterNodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/cluster/AbstractClusterNodeConnectionFactory.java
rename to src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
index 4f8671e3ad..58910f83dd 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/AbstractClusterNodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.net.SocketAddress;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.resource.ClientResources;
-import com.lambdaworks.redis.resource.SocketAddressResolver;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.SocketAddressResolver;
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -63,7 +63,7 @@ public Partitions getPartitions() {
 
     /**
      * Get a {@link Supplier} of {@link SocketAddress} for a
-     * {@link com.lambdaworks.redis.cluster.ClusterNodeConnectionFactory.ConnectionKey}.
+     * {@link io.lettuce.core.cluster.ClusterNodeConnectionFactory.ConnectionKey}.
      * <p>
      * This {@link Supplier} resolves the requested endpoint on each {@link Supplier#get()}.
      *
diff --git a/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java b/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java
rename to src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java
index be1e8f2cdd..2a437a31b2 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/AbstractNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * Abstract base class to support node selections. A node selection represents a set of Redis Cluster nodes and allows command
  * execution on the selected cluster nodes.
- * 
+ *
  * @param <API> API type.
  * @param <CMD> Command command interface type to invoke multi-node operations.
  * @param <K> Key type.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/AsyncExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/cluster/AsyncExecutionsImpl.java
rename to src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
index f655b024bf..c215a6ae5d 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/AsyncExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -22,8 +22,8 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import com.lambdaworks.redis.cluster.api.async.AsyncExecutions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.api.async.AsyncExecutions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java
rename to src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index 6fcf2fbb33..893060c4a3 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.ClientOptions;
-import com.lambdaworks.redis.SocketOptions;
-import com.lambdaworks.redis.SslOptions;
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.SocketOptions;
+import io.lettuce.core.SslOptions;
 
 /**
  * Client Options to control the behavior of {@link RedisClusterClient}.
- * 
+ *
  * @author Mark Paluch
  */
 public class ClusterClientOptions extends ClientOptions {
@@ -209,7 +209,7 @@ public ClusterClientOptions build() {
      * Flag, whether regular cluster topology updates are updated. The client starts updating the cluster topology in the
      * intervals of {@link #getRefreshPeriod()} /{@link #getRefreshPeriodUnit()}. Defaults to {@literal false}. Returns the
      * value from {@link ClusterTopologyRefreshOptions} if provided.
-     * 
+     *
      * @return {@literal true} it the cluster topology view is updated periodically
      */
     public boolean isRefreshClusterView() {
@@ -219,7 +219,7 @@ public boolean isRefreshClusterView() {
     /**
      * Period between the regular cluster topology updates. Defaults to {@literal 60}. Returns the value from
      * {@link ClusterTopologyRefreshOptions} if provided.
-     * 
+     *
      * @return the period between the regular cluster topology updates
      */
     public long getRefreshPeriod() {
@@ -229,7 +229,7 @@ public long getRefreshPeriod() {
     /**
      * Unit for the {@link #getRefreshPeriod()}. Defaults to {@link TimeUnit#SECONDS}. Returns the value from
      * {@link ClusterTopologyRefreshOptions} if provided.
-     * 
+     *
      * @return unit for the {@link #getRefreshPeriod()}
      */
     public TimeUnit getRefreshPeriodUnit() {
@@ -240,7 +240,7 @@ public TimeUnit getRefreshPeriodUnit() {
      * Flag, whether to close stale connections when refreshing the cluster topology. Defaults to {@literal true}. Comes only
      * into effect if {@link #isRefreshClusterView()} is {@literal true}. Returns the value from
      * {@link ClusterTopologyRefreshOptions} if provided.
-     * 
+     *
      * @return {@literal true} if stale connections are cleaned up after cluster topology updates
      */
     public boolean isCloseStaleConnections() {
@@ -249,7 +249,7 @@ public boolean isCloseStaleConnections() {
 
     /**
      * Validate the cluster node membership before allowing connections to a cluster node. Defaults to {@literal true}.
-     * 
+     *
      * @return {@literal true} if validation is enabled.
      */
     public boolean isValidateClusterNodeMembership() {
@@ -259,7 +259,7 @@ public boolean isValidateClusterNodeMembership() {
     /**
      * Number of maximal of cluster redirects ({@literal -MOVED} and {@literal -ASK}) to follow in case a key was moved from one
      * node to another node. Defaults to {@literal 5}. See {@link ClusterClientOptions#DEFAULT_MAX_REDIRECTS}.
-     * 
+     *
      * @return the maximal number of followed cluster redirects
      */
     public int getMaxRedirects() {
@@ -268,7 +268,7 @@ public int getMaxRedirects() {
 
     /**
      * The {@link ClusterTopologyRefreshOptions} for detailed control of topology updates.
-     * 
+     *
      * @return the {@link ClusterTopologyRefreshOptions}.
      */
     public ClusterTopologyRefreshOptions getTopologyRefreshOptions() {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java b/src/main/java/io/lettuce/core/cluster/ClusterCommand.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java
rename to src/main/java/io/lettuce/core/cluster/ClusterCommand.java
index 1db9b7f4b2..3f0b27a40a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterCommand.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterCommand.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
-
-import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandKeyword;
-import com.lambdaworks.redis.protocol.CommandWrapper;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
-import com.lambdaworks.redis.protocol.RedisCommand;
+package io.lettuce.core.cluster;
+
+import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandKeyword;
+import io.lettuce.core.protocol.CommandWrapper;
+import io.lettuce.core.protocol.ProtocolKeyword;
+import io.lettuce.core.protocol.RedisCommand;
 import io.netty.buffer.ByteBuf;
 
 /**
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
similarity index 85%
rename from src/main/java/com/lambdaworks/redis/cluster/ClusterConnectionProvider.java
rename to src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
index 261564c5b1..a6320e5795 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.io.Closeable;
 
-import com.lambdaworks.redis.ReadFrom;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.models.partitions.Partitions;
 
 /**
  * Connection provider for cluster operations.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -33,9 +33,9 @@ interface ClusterConnectionProvider extends Closeable {
     /**
      * Provide a connection for the intent and cluster slot. The underlying connection is bound to the nodeId. If the slot
      * responsibility changes, the connection will not point to the updated nodeId.
-     * 
-     * @param intent {@link com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent#READ} or
-     *        {@link com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent#WRITE} {@literal READ} connections will be
+     *
+     * @param intent {@link io.lettuce.core.cluster.ClusterConnectionProvider.Intent#READ} or
+     *        {@link io.lettuce.core.cluster.ClusterConnectionProvider.Intent#WRITE} {@literal READ} connections will be
      *        provided in {@literal READONLY} mode
      * @param slot the slot-hash of the key, see {@link SlotHash}
      * @return a valid connection which handles the slot.
@@ -46,9 +46,9 @@ interface ClusterConnectionProvider extends Closeable {
     /**
      * Provide a connection for the intent and host/port. The connection can survive cluster topology updates. The connection *
      * will be closed if the node identified by {@code host} and {@code port} is no longer part of the cluster.
-     * 
-     * @param intent {@link com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent#READ} or
-     *        {@link com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent#WRITE} {@literal READ} connections will be
+     *
+     * @param intent {@link io.lettuce.core.cluster.ClusterConnectionProvider.Intent#READ} or
+     *        {@link io.lettuce.core.cluster.ClusterConnectionProvider.Intent#WRITE} {@literal READ} connections will be
      *        provided in {@literal READONLY} mode
      * @param host host of the node
      * @param port port of the node
@@ -60,7 +60,7 @@ interface ClusterConnectionProvider extends Closeable {
     /**
      * Provide a connection for the intent and nodeId. The connection can survive cluster topology updates. The connection will
      * be closed if the node identified by {@code nodeId} is no longer part of the cluster.
-     * 
+     *
      *
      * @param intent Connection intent {@literal READ} or {@literal WRITE}
      * @param nodeId the nodeId of the cluster node
@@ -111,14 +111,14 @@ interface ClusterConnectionProvider extends Closeable {
     /**
      * Set from which nodes data is read. The setting is used as default for read operations on this connection. See the
      * documentation for {@link ReadFrom} for more information.
-     * 
+     *
      * @param readFrom the read from setting, must not be {@literal null}
      */
     void setReadFrom(ReadFrom readFrom);
 
     /**
      * Gets the {@link ReadFrom} setting for this connection. Defaults to {@link ReadFrom#MASTER} if not set.
-     * 
+     *
      * @return the read from setting
      */
     ReadFrom getReadFrom();
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
rename to src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index 3989b69c70..4a4feb7922 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
-import static com.lambdaworks.redis.cluster.SlotHash.getSlot;
+import static io.lettuce.core.cluster.SlotHash.getSlot;
 
 import java.nio.ByteBuffer;
 import java.util.*;
 import java.util.stream.IntStream;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.internal.HostAndPort;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.*;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.ClusterConnectionProvider.Intent;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.internal.HostAndPort;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.*;
 
 import io.netty.util.concurrent.EventExecutorGroup;
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterEventListener.java b/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/cluster/ClusterEventListener.java
rename to src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
index 7dcc1b7976..ec1e9d0bd6 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterEventListener.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterFutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/cluster/ClusterFutureSyncInvocationHandler.java
rename to src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
index afa86b6260..1cbf7219ae 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterFutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -26,16 +26,16 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 
-import com.lambdaworks.redis.LettuceFutures;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.internal.AbstractInvocationHandler;
+import io.lettuce.core.LettuceFutures;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.internal.AbstractInvocationHandler;
 
 /**
  * Invocation-handler to synchronize API calls which use Futures as backend. This class leverages the need to implement a full
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/cluster/ClusterNodeConnectionFactory.java
rename to src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java
index 20d109c367..5059df1a89 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 
-import com.lambdaworks.redis.ConnectionFuture;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
+import io.lettuce.core.ConnectionFuture;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.ClusterConnectionProvider.Intent;
+import io.lettuce.core.cluster.models.partitions.Partitions;
 
 /**
  * Specialized {@link Function} to obtain connections for Redis Cluster nodes. Connecting to a node returns a
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeEndpoint.java b/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/cluster/ClusterNodeEndpoint.java
rename to src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
index 9103c6a71a..a4dd10385c 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterNodeEndpoint.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import com.lambdaworks.redis.ClientOptions;
-import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.protocol.ConnectionWatchdog;
-import com.lambdaworks.redis.protocol.RedisCommand;
-import com.lambdaworks.redis.protocol.DefaultEndpoint;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.protocol.ConnectionWatchdog;
+import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.protocol.DefaultEndpoint;
+import io.lettuce.core.resource.ClientResources;
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterPubSubConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/cluster/ClusterPubSubConnectionProvider.java
rename to src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
index e16002a85f..d5d62cb50c 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterPubSubConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
-
-import com.lambdaworks.redis.ConnectionFuture;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.cluster.pubsub.RedisClusterPubSubListener;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.pubsub.RedisPubSubAdapter;
-import com.lambdaworks.redis.pubsub.RedisPubSubListener;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
-import com.lambdaworks.redis.resource.ClientResources;
+package io.lettuce.core.cluster;
+
+import io.lettuce.core.ConnectionFuture;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.pubsub.RedisClusterPubSubListener;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.pubsub.RedisPubSubAdapter;
+import io.lettuce.core.pubsub.RedisPubSubListener;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * {@link ClusterConnectionProvider} to provide {@link StatefulRedisPubSubConnection}s for Redis Cluster use.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java b/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java
rename to src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java
index 65eb194cea..c0b0ab6309 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterScanSupport.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.function.Function;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
+import io.lettuce.core.*;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 import reactor.core.publisher.Mono;
 
 /**
  * Methods to support a Cluster-wide SCAN operation over multiple hosts.
- * 
+ *
  * @author Mark Paluch
  */
 class ClusterScanSupport {
@@ -85,7 +85,7 @@ public StreamScanCursor apply(StreamScanCursor streamScanCursor) {
 
     /**
      * Retrieve the cursor to continue the scan.
-     * 
+     *
      * @param scanCursor can be {@literal null}.
      * @return
      */
@@ -132,7 +132,7 @@ static String getCurrentNodeId(ScanCursor cursor, List<String> nodeIds) {
 
     /**
      * Retrieve a list of node Ids to use for the SCAN operation.
-     * 
+     *
      * @param connection
      * @return
      */
@@ -235,7 +235,7 @@ interface ClusterScanCursor {
 
     /**
      * State object for a cluster-wide SCAN using Key results.
-     * 
+     *
      * @param <K>
      */
     private static class ClusterKeyScanCursor<K> extends KeyScanCursor<K> implements ClusterScanCursor {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
similarity index 99%
rename from src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptions.java
rename to src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
index f837009a54..cd4d1585a2 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Options to control the Cluster topology refreshing of {@link RedisClusterClient}.
- * 
+ *
  * @author Mark Paluch
  * @since 4.2
  */
@@ -284,7 +284,7 @@ public ClusterTopologyRefreshOptions build() {
     /**
      * Flag, whether regular cluster topology updates are updated. The client starts updating the cluster topology in the
      * intervals of {@link #getRefreshPeriod()} /{@link #getRefreshPeriodUnit()}. Defaults to {@literal false}.
-     * 
+     *
      * @return {@literal true} it the cluster topology view is updated periodically
      */
     public boolean isPeriodicRefreshEnabled() {
@@ -293,7 +293,7 @@ public boolean isPeriodicRefreshEnabled() {
 
     /**
      * Period between the regular cluster topology updates. Defaults to {@literal 60}.
-     * 
+     *
      * @return the period between the regular cluster topology updates
      */
     public long getRefreshPeriod() {
@@ -302,7 +302,7 @@ public long getRefreshPeriod() {
 
     /**
      * Unit for the {@link #getRefreshPeriod()}. Defaults to {@link TimeUnit#SECONDS}.
-     * 
+     *
      * @return unit for the {@link #getRefreshPeriod()}
      */
     public TimeUnit getRefreshPeriodUnit() {
@@ -312,7 +312,7 @@ public TimeUnit getRefreshPeriodUnit() {
     /**
      * Flag, whether to close stale connections when refreshing the cluster topology. Defaults to {@literal true}. Comes only
      * into effect if {@link #isPeriodicRefreshEnabled()} is {@literal true}.
-     * 
+     *
      * @return {@literal true} if stale connections are cleaned up after cluster topology updates
      */
     public boolean isCloseStaleConnections() {
@@ -324,7 +324,7 @@ public boolean isCloseStaleConnections() {
      * refresh will query all discovered nodes for the cluster topology and calculate the number of clients for each node.If set
      * to {@literal false}, only the initial seed nodes will be used as sources for topology discovery and the number of clients
      * will be obtained only for the initial seed nodes. This can be useful when using Redis Cluster with many nodes.
-     * 
+     *
      * @return {@link true} if dynamic refresh sources are enabled
      */
     public boolean useDynamicRefreshSources() {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshScheduler.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshScheduler.java
rename to src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
index cadb0d6378..a10e296295 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshScheduler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.resource.ClientResources;
 
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.internal.logging.InternalLogger;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/DynamicNodeSelection.java b/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/cluster/DynamicNodeSelection.java
rename to src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
index 518d10b68e..4251080a77 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/DynamicNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.List;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * Dynamic selection of nodes.
- * 
+ *
  * @param <API> API type.
  * @param <CMD> Command command interface type to invoke multi-node operations.
  * @param <K> Key type.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/MultiNodeExecution.java b/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
similarity index 85%
rename from src/main/java/com/lambdaworks/redis/cluster/MultiNodeExecution.java
rename to src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
index 7f4ee88078..ad9d88dd16 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/MultiNodeExecution.java
+++ b/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.lang.reflect.Proxy;
 import java.util.Map;
@@ -22,20 +22,20 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Predicate;
 
-import com.lambdaworks.redis.RedisCommandInterruptedException;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.sync.NodeSelection;
-import com.lambdaworks.redis.cluster.api.sync.NodeSelectionCommands;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.RedisCommandInterruptedException;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.sync.NodeSelection;
+import io.lettuce.core.cluster.api.sync.NodeSelectionCommands;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * Utility to perform and synchronize command executions on multiple cluster nodes.
- * 
+ *
  * @author Mark Paluch
  */
 class MultiNodeExecution {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java
rename to src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
index a9077ae8f3..1237cb2735 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/NodeSelectionInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -21,14 +21,14 @@
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.RedisCommandExecutionException;
-import com.lambdaworks.redis.RedisCommandInterruptedException;
-import com.lambdaworks.redis.RedisCommandTimeoutException;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.internal.AbstractInvocationHandler;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.RedisCommandInterruptedException;
+import io.lettuce.core.RedisCommandTimeoutException;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.internal.AbstractInvocationHandler;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Invocation handler to trigger commands on multiple connections and return a holder for the values.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PartitionAccessor.java b/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/PartitionAccessor.java
rename to src/main/java/io/lettuce/core/cluster/PartitionAccessor.java
index d83ba4baac..b6bd6bc212 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PartitionAccessor.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.function.Predicate;
 
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * Accessor for Partitions.
- * 
+ *
  * @author Mark Paluch
  */
 class PartitionAccessor {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensus.java b/src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java
similarity index 84%
rename from src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensus.java
rename to src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java
index 64276a2e5c..150f2c7535 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensus.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java
@@ -13,24 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.Map;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.models.partitions.Partitions;
 
 /**
- * Consensus API to decide on the {@link com.lambdaworks.redis.cluster.models.partitions.Partitions topology view} to be used by
+ * Consensus API to decide on the {@link io.lettuce.core.cluster.models.partitions.Partitions topology view} to be used by
  * {@link RedisClusterClient}.
  * <p>
  * {@link PartitionsConsensus} takes the current {@link Partitions} and a {@link java.util.Map} of newly retrieved
  * {@link Partitions} to determine a view that shall be used. Implementing classes may reuse {@link Partitions} from input
  * arguments or construct a new {@link Partitions} object.
- * 
+ *
  * @author Mark Paluch
  * @since 4.2
- * @see com.lambdaworks.redis.cluster.models.partitions.Partitions
+ * @see io.lettuce.core.cluster.models.partitions.Partitions
  * @see RedisClusterClient
  */
 abstract class PartitionsConsensus {
@@ -47,7 +47,7 @@ abstract class PartitionsConsensus {
 
     /**
      * Determine the {@link Partitions} to be used by {@link RedisClusterClient}.
-     * 
+     *
      * @param current the currently used topology view, must not be {@literal null}.
      * @param topologyViews the newly retrieved views, must not be {@literal null}.
      * @return the resulting {@link Partitions} to be used by {@link RedisClusterClient}.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensusImpl.java b/src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensusImpl.java
rename to src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java
index 697fc358a8..31f6dcf396 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PartitionsConsensusImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * Implementations for {@link PartitionsConsensus}.
- * 
+ *
  * @author Mark Paluch
  * @since 4.2
  */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PipelinedRedisFuture.java b/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/cluster/PipelinedRedisFuture.java
rename to src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
index 798fbcf014..9d93212d0a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PipelinedRedisFuture.java
+++ b/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -22,11 +22,11 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
-import com.lambdaworks.redis.RedisFuture;
+import io.lettuce.core.RedisFuture;
 
 /**
  * Pipelining for commands that are executed on multiple cluster nodes. Merges results and emits one composite result.
- * 
+ *
  * @author Mark Paluch
  */
 class PipelinedRedisFuture<V> extends CompletableFuture<V> implements RedisFuture<V> {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
rename to src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
index a54ff50f73..f901494a33 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.Arrays;
 import java.util.Iterator;
@@ -21,17 +21,17 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.ClusterNodeConnectionFactory.ConnectionKey;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.HostAndPort;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.models.role.RedisInstance;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.ClusterNodeConnectionFactory.ConnectionKey;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.HostAndPort;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.models.role.RedisInstance;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/PubSubClusterEndpoint.java b/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/PubSubClusterEndpoint.java
rename to src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java
index f4286e1326..719756d32f 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/PubSubClusterEndpoint.java
+++ b/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import com.lambdaworks.redis.ClientOptions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.cluster.pubsub.RedisClusterPubSubAdapter;
-import com.lambdaworks.redis.cluster.pubsub.RedisClusterPubSubListener;
-import com.lambdaworks.redis.pubsub.PubSubEndpoint;
-import com.lambdaworks.redis.pubsub.PubSubOutput;
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.pubsub.RedisClusterPubSubAdapter;
+import io.lettuce.core.cluster.pubsub.RedisClusterPubSubListener;
+import io.lettuce.core.pubsub.PubSubEndpoint;
+import io.lettuce.core.pubsub.PubSubOutput;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ReactiveExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
similarity index 88%
rename from src/main/java/com/lambdaworks/redis/cluster/ReactiveExecutionsImpl.java
rename to src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
index 9860f69b3b..06faeddd1e 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ReactiveExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.Collection;
 import java.util.Map;
 
-import com.lambdaworks.redis.cluster.api.reactive.ReactiveExecutions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.api.reactive.ReactiveExecutions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
rename to src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
index d0cf5cdf0c..e46e0a440f 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ReadOnlyCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Set;
 
-import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
  * Contains all command names that are read-only commands.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/ReconnectEventListener.java b/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java
similarity index 87%
rename from src/main/java/com/lambdaworks/redis/cluster/ReconnectEventListener.java
rename to src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java
index 4a19ebde59..9332218638 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/ReconnectEventListener.java
+++ b/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
-import com.lambdaworks.redis.ConnectionEvents.Reconnect;
-import com.lambdaworks.redis.protocol.ReconnectionListener;
+import io.lettuce.core.ConnectionEvents.Reconnect;
+import io.lettuce.core.protocol.ReconnectionListener;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
rename to src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index a3faac49c6..83c79f501d 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
-import static com.lambdaworks.redis.cluster.ClusterScanSupport.asyncClusterKeyScanCursorMapper;
-import static com.lambdaworks.redis.cluster.ClusterScanSupport.asyncClusterStreamScanCursorMapper;
-import static com.lambdaworks.redis.cluster.NodeSelectionInvocationHandler.ExecutionModel.ASYNC;
-import static com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode.NodeFlag.MASTER;
+import static io.lettuce.core.cluster.ClusterScanSupport.asyncClusterKeyScanCursorMapper;
+import static io.lettuce.core.cluster.ClusterScanSupport.asyncClusterStreamScanCursorMapper;
+import static io.lettuce.core.cluster.NodeSelectionInvocationHandler.ExecutionModel.ASYNC;
+import static io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag.MASTER;
 
 import java.lang.reflect.Proxy;
 import java.util.*;
@@ -26,28 +26,28 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.async.RedisKeyAsyncCommands;
-import com.lambdaworks.redis.api.async.RedisScriptingAsyncCommands;
-import com.lambdaworks.redis.api.async.RedisServerAsyncCommands;
-import com.lambdaworks.redis.cluster.ClusterScanSupport.ScanCursorMapper;
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.async.AsyncNodeSelection;
-import com.lambdaworks.redis.cluster.api.async.NodeSelectionAsyncCommands;
-import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.output.IntegerOutput;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.protocol.AsyncCommand;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.async.RedisKeyAsyncCommands;
+import io.lettuce.core.api.async.RedisScriptingAsyncCommands;
+import io.lettuce.core.api.async.RedisServerAsyncCommands;
+import io.lettuce.core.cluster.ClusterScanSupport.ScanCursorMapper;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.async.AsyncNodeSelection;
+import io.lettuce.core.cluster.api.async.NodeSelectionAsyncCommands;
+import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands;
+import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.output.IntegerOutput;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandType;
 
 /**
  * An advanced asynchronous and thread-safe API for a Redis Cluster connection.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
rename to src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index 2583b5afd0..aae3544551 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
-import static com.lambdaworks.redis.cluster.ClusterScanSupport.reactiveClusterKeyScanCursorMapper;
-import static com.lambdaworks.redis.cluster.ClusterScanSupport.reactiveClusterStreamScanCursorMapper;
-import static com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode.NodeFlag.MASTER;
+import static io.lettuce.core.cluster.ClusterScanSupport.reactiveClusterKeyScanCursorMapper;
+import static io.lettuce.core.cluster.ClusterScanSupport.reactiveClusterStreamScanCursorMapper;
+import static io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag.MASTER;
 
 import java.util.*;
 import java.util.function.BiFunction;
@@ -29,18 +29,18 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.reactive.RedisKeyReactiveCommands;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
-import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceLists;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.reactive.RedisKeyReactiveCommands;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
+import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceLists;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.KeyValueStreamingChannel;
 
 /**
  * An advanced reactive and thread-safe API to a Redis Cluster connection.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
rename to src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 2c4740692e..1d18147459 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.io.Closeable;
 import java.net.SocketAddress;
@@ -27,32 +27,32 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
-import com.lambdaworks.redis.cluster.event.ClusterTopologyChangedEvent;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection;
-import com.lambdaworks.redis.cluster.topology.ClusterTopologyRefresh;
-import com.lambdaworks.redis.cluster.topology.NodeConnectionFactory;
-import com.lambdaworks.redis.cluster.topology.TopologyComparators;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceLists;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.protocol.CommandHandler;
-import com.lambdaworks.redis.protocol.DefaultEndpoint;
-import com.lambdaworks.redis.pubsub.PubSubCommandHandler;
-import com.lambdaworks.redis.pubsub.PubSubEndpoint;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl;
-import com.lambdaworks.redis.resource.ClientResources;
-import com.lambdaworks.redis.resource.SocketAddressResolver;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.core.cluster.event.ClusterTopologyChangedEvent;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection;
+import io.lettuce.core.cluster.topology.ClusterTopologyRefresh;
+import io.lettuce.core.cluster.topology.NodeConnectionFactory;
+import io.lettuce.core.cluster.topology.TopologyComparators;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceLists;
+import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.protocol.CommandHandler;
+import io.lettuce.core.protocol.DefaultEndpoint;
+import io.lettuce.core.pubsub.PubSubCommandHandler;
+import io.lettuce.core.pubsub.PubSubEndpoint;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnectionImpl;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.SocketAddressResolver;
 
 import io.netty.util.concurrent.ScheduledFuture;
 import io.netty.util.internal.logging.InternalLogger;
@@ -72,7 +72,7 @@
  * </p>
  * <p>
  * The Redis cluster client provides a {@link RedisAdvancedClusterCommands sync}, {@link RedisAdvancedClusterAsyncCommands
- * async} and {@link com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands reactive} API.
+ * async} and {@link io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands reactive} API.
  * </p>
  *
  * <p>
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
similarity index 80%
rename from src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubAsyncCommandsImpl.java
rename to src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
index 9d1deadcb8..ddb0d26e42 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
-import static com.lambdaworks.redis.cluster.NodeSelectionInvocationHandler.ExecutionModel.ASYNC;
+import static io.lettuce.core.cluster.NodeSelectionInvocationHandler.ExecutionModel.ASYNC;
 
 import java.lang.reflect.Proxy;
 import java.util.HashMap;
@@ -24,17 +24,17 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection;
-import com.lambdaworks.redis.cluster.pubsub.api.async.NodeSelectionPubSubAsyncCommands;
-import com.lambdaworks.redis.cluster.pubsub.api.async.PubSubAsyncNodeSelection;
-import com.lambdaworks.redis.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.pubsub.RedisPubSubAsyncCommandsImpl;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
-import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection;
+import io.lettuce.core.cluster.pubsub.api.async.NodeSelectionPubSubAsyncCommands;
+import io.lettuce.core.cluster.pubsub.api.async.PubSubAsyncNodeSelection;
+import io.lettuce.core.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.pubsub.RedisPubSubAsyncCommandsImpl;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
similarity index 80%
rename from src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubReactiveCommandsImpl.java
rename to src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
index 46bc3f1592..bc867c53b6 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterPubSubReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
@@ -13,26 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
-import static com.lambdaworks.redis.cluster.NodeSelectionInvocationHandler.ExecutionModel.REACTIVE;
+import static io.lettuce.core.cluster.NodeSelectionInvocationHandler.ExecutionModel.REACTIVE;
 
 import java.lang.reflect.Proxy;
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection;
-import com.lambdaworks.redis.cluster.pubsub.api.reactive.NodeSelectionPubSubReactiveCommands;
-import com.lambdaworks.redis.cluster.pubsub.api.reactive.PubSubReactiveNodeSelection;
-import com.lambdaworks.redis.cluster.pubsub.api.reactive.RedisClusterPubSubReactiveCommands;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.pubsub.RedisPubSubReactiveCommandsImpl;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
-import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection;
+import io.lettuce.core.cluster.pubsub.api.reactive.NodeSelectionPubSubReactiveCommands;
+import io.lettuce.core.cluster.pubsub.api.reactive.PubSubReactiveNodeSelection;
+import io.lettuce.core.cluster.pubsub.api.reactive.RedisClusterPubSubReactiveCommands;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.pubsub.RedisPubSubReactiveCommandsImpl;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterURIUtil.java b/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/RedisClusterURIUtil.java
rename to src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java
index fcdd7ca2c9..4719564469 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RedisClusterURIUtil.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.internal.HostAndPort;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.internal.HostAndPort;
 
 /**
  * {@link RedisClusterURIUtil} is a collection of {@link RedisURI}-based utility methods for {@link RedisClusterClient} use.
@@ -34,7 +34,7 @@ public class RedisClusterURIUtil {
      * Parse a Redis Cluster URI with potentially multiple hosts into a {@link List} of {@link RedisURI}.
      *
      * An URI follows the syntax: {@code redis://[password@]host[:port][,host2[:port2]]}
-     * 
+     *
      * @param uri must not be empty or {@literal null}.
      * @return {@link List} of {@link RedisURI}.
      */
@@ -62,7 +62,7 @@ public static List<RedisURI> toRedisURIs(URI uri) {
 
     /**
      * Apply {@link RedisURI} settings such as SSL/Timeout/password.
-     * 
+     *
      * @param from from {@link RedisURI}.
      * @param to from {@link RedisURI}.
      */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RoundRobin.java b/src/main/java/io/lettuce/core/cluster/RoundRobin.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/cluster/RoundRobin.java
rename to src/main/java/io/lettuce/core/cluster/RoundRobin.java
index 7ca004e76d..1ff014a518 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RoundRobin.java
+++ b/src/main/java/io/lettuce/core/cluster/RoundRobin.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.Collection;
 
 /**
  * Circular element provider. This class allows infinite scrolling over a collection with the possibility to provide an initial
  * offset.
- * 
+ *
  * @author Mark Paluch
  */
 class RoundRobin<V> {
@@ -40,7 +40,7 @@ public RoundRobin(Collection<? extends V> collection, V offset) {
 
     /**
      * Returns the next item.
-     * 
+     *
      * @return the next item
      */
     public V next() {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java b/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java
rename to src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
index 19a713d4bc..62e4b18dbd 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplier.java
+++ b/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.net.SocketAddress;
 import java.util.ArrayList;
@@ -21,10 +21,10 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.resource.ClientResources;
-import com.lambdaworks.redis.resource.SocketAddressResolver;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.SocketAddressResolver;
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/SlotHash.java b/src/main/java/io/lettuce/core/cluster/SlotHash.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/cluster/SlotHash.java
rename to src/main/java/io/lettuce/core/cluster/SlotHash.java
index a9df1901bf..f2b4440181 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/SlotHash.java
+++ b/src/main/java/io/lettuce/core/cluster/SlotHash.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.nio.ByteBuffer;
 import java.util.*;
 
-import com.lambdaworks.codec.CRC16;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.codec.CRC16;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Utility to calculate the slot from a key.
@@ -111,13 +111,13 @@ private static int indexOf(byte[] haystack, int start, byte needle) {
 
     /**
      * Partition keys by slot-hash. The resulting map honors order of the keys.
-     * 
+     *
      * @param codec codec to encode the key
      * @param keys iterable of keys
      * @param <K> Key type.
      * @param <V> Value type.
      * @result map between slot-hash and an ordered list of keys.
-     * 
+     *
      */
     static <K, V> Map<Integer, List<K>> partition(RedisCodec<K, V> codec, Iterable<K> keys) {
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
similarity index 86%
rename from src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
rename to src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
index 2e0d5567f9..12cb54e5b0 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
-import static com.lambdaworks.redis.protocol.CommandType.AUTH;
-import static com.lambdaworks.redis.protocol.CommandType.READONLY;
-import static com.lambdaworks.redis.protocol.CommandType.READWRITE;
+import static io.lettuce.core.protocol.CommandType.AUTH;
+import static io.lettuce.core.protocol.CommandType.READONLY;
+import static io.lettuce.core.protocol.CommandType.READWRITE;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
@@ -27,22 +27,22 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
-import com.lambdaworks.redis.cluster.api.sync.NodeSelection;
-import com.lambdaworks.redis.cluster.api.sync.NodeSelectionCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.*;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands;
+import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
+import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
+import io.lettuce.core.cluster.api.sync.NodeSelection;
+import io.lettuce.core.cluster.api.sync.NodeSelectionCommands;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.*;
 
 /**
  * A thread-safe connection to a Redis Cluster. Multiple threads may share one {@link StatefulRedisClusterConnectionImpl}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
similarity index 79%
rename from src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterPubSubConnectionImpl.java
rename to src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
index 4f6e3f2656..5a558289ee 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/StatefulRedisClusterPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
@@ -13,32 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.AbstractRedisClient;
-import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.cluster.pubsub.RedisClusterPubSubListener;
-import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection;
-import com.lambdaworks.redis.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands;
-import com.lambdaworks.redis.cluster.pubsub.api.reactive.RedisClusterPubSubReactiveCommands;
-import com.lambdaworks.redis.cluster.pubsub.api.sync.NodeSelectionPubSubCommands;
-import com.lambdaworks.redis.cluster.pubsub.api.sync.PubSubNodeSelection;
-import com.lambdaworks.redis.cluster.pubsub.api.sync.RedisClusterPubSubCommands;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.pubsub.RedisPubSubAsyncCommandsImpl;
-import com.lambdaworks.redis.pubsub.RedisPubSubReactiveCommandsImpl;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl;
-import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
-import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
+import io.lettuce.core.AbstractRedisClient;
+import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.pubsub.RedisClusterPubSubListener;
+import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection;
+import io.lettuce.core.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands;
+import io.lettuce.core.cluster.pubsub.api.reactive.RedisClusterPubSubReactiveCommands;
+import io.lettuce.core.cluster.pubsub.api.sync.NodeSelectionPubSubCommands;
+import io.lettuce.core.cluster.pubsub.api.sync.PubSubNodeSelection;
+import io.lettuce.core.cluster.pubsub.api.sync.RedisClusterPubSubCommands;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.pubsub.RedisPubSubAsyncCommandsImpl;
+import io.lettuce.core.pubsub.RedisPubSubReactiveCommandsImpl;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnectionImpl;
+import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
+import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/cluster/StaticNodeSelection.java b/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/cluster/StaticNodeSelection.java
rename to src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
index a6c228102d..7eab350943 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/StaticNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.List;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * Static selection of nodes.
- * 
+ *
  * @param <API> API type.
  * @param <CMD> Command command interface type to invoke multi-node operations.
  * @param <K> Key type.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/SyncExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/cluster/SyncExecutionsImpl.java
rename to src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java
index ded848df87..ff8606a54f 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/SyncExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -21,8 +21,8 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 
-import com.lambdaworks.redis.cluster.api.sync.Executions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.api.sync.Executions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProvider.java
rename to src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
index 47897ce6f5..935bb583e9 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.Map;
 import java.util.concurrent.CompletionException;
@@ -22,13 +22,13 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
-import com.lambdaworks.redis.ConnectionFuture;
-import com.lambdaworks.redis.RedisConnectionException;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.ClusterNodeConnectionFactory.ConnectionKey;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.ConnectionFuture;
+import io.lettuce.core.RedisConnectionException;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.ClusterNodeConnectionFactory.ConnectionKey;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Synchronizing provider for Redis Cluster node connections using {@link ClusterNodeConnectionFactory}.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/NodeSelectionSupport.java b/src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/cluster/api/NodeSelectionSupport.java
rename to src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java
index 46682a0ade..c556edb749 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/NodeSelectionSupport.java
+++ b/src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api;
+package io.lettuce.core.cluster.api;
 
 import java.util.Map;
 
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * A node selection represents a set of Redis Cluster nodes. Provides access to particular node connection APIs and allows the
  * execution of commands on the selected cluster nodes.
- * 
+ *
  * @param <API> API type.
  * @param <CMD> Command command interface type to invoke multi-node operations.
  * @author Mark Paluch
@@ -42,7 +42,7 @@ public interface NodeSelectionSupport<API, CMD> {
 
     /**
      * Obtain the connection/commands to a particular node.
-     * 
+     *
      * @param index index of the node
      * @return the connection/commands object
      */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java b/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
similarity index 85%
rename from src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java
rename to src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
index f2a7b15060..3c94985397 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/StatefulRedisClusterConnection.java
+++ b/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api;
+package io.lettuce.core.cluster.api;
 
-import com.lambdaworks.redis.ReadFrom;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.ClusterClientOptions;
-import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.ClusterClientOptions;
+import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands;
+import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.core.cluster.models.partitions.Partitions;
 
 /**
  * A stateful cluster connection. Advanced cluster connections provide transparent command routing based on the first
  * command key.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -65,8 +65,8 @@ public interface StatefulRedisClusterConnection<K, V> extends StatefulConnection
      * specified {@code nodeId} is no longer part of the cluster.
      *
      * Do not close the connections. Otherwise, unpredictable behavior will occur. The nodeId must be part of the cluster and is
-     * validated against the current topology view in {@link com.lambdaworks.redis.cluster.models.partitions.Partitions}.
-     * 
+     * validated against the current topology view in {@link io.lettuce.core.cluster.models.partitions.Partitions}.
+     *
      *
      * In contrast to the {@link StatefulRedisClusterConnection}, node-connections do not route commands to other cluster nodes.
      *
@@ -96,14 +96,14 @@ public interface StatefulRedisClusterConnection<K, V> extends StatefulConnection
     /**
      * Set from which nodes data is read. The setting is used as default for read operations on this connection. See the
      * documentation for {@link ReadFrom} for more information.
-     * 
+     *
      * @param readFrom the read from setting, must not be {@literal null}
      */
     void setReadFrom(ReadFrom readFrom);
 
     /**
      * Gets the {@link ReadFrom} setting for this connection. Defaults to {@link ReadFrom#MASTER} if not set.
-     * 
+     *
      * @return the read from setting
      */
     ReadFrom getReadFrom();
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncExecutions.java b/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncExecutions.java
rename to src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
index 11cf72ac69..a2de1e25ce 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncExecutions.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -21,7 +21,7 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * Result holder for a command that was executed asynchronously on multiple nodes.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncNodeSelection.java b/src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java
similarity index 83%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncNodeSelection.java
rename to src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java
index c206c4ffc3..f65f5a4714 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/AsyncNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
 
 /**
  * Node selection with access to asynchronous executed commands on the set.
- * 
+ *
  * @author Mark Paluch
  * @since 4.0
  */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
index 47b80257d0..60ce7836d0 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/BaseNodeSelectionAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
@@ -13,30 +13,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.output.CommandOutput;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
- * 
+ *
  * Asynchronous executed commands on a node selection for basic commands.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi
  */
 public interface BaseNodeSelectionAsyncCommands<K, V> {
 
     /**
      * Post a message to a channel.
-     * 
+     *
      * @param channel the channel type: key
      * @param message the message type: value
      * @return Long integer-reply the number of clients that received the message.
@@ -45,14 +45,14 @@ public interface BaseNodeSelectionAsyncCommands<K, V> {
 
     /**
      * Lists the currently *active channels*.
-     * 
+     *
      * @return List&lt;K&gt; array-reply a list of active channels, optionally matching the specified pattern.
      */
     AsyncExecutions<List<K>> pubsubChannels();
 
     /**
      * Lists the currently *active channels*.
-     * 
+     *
      * @param channel the key
      * @return List&lt;K&gt; array-reply a list of active channels, optionally matching the specified pattern.
      */
@@ -68,14 +68,14 @@ public interface BaseNodeSelectionAsyncCommands<K, V> {
 
     /**
      * Returns the number of subscriptions to patterns.
-     * 
+     *
      * @return Long integer-reply the number of patterns all the clients are subscribed to.
      */
     AsyncExecutions<Long> pubsubNumpat();
 
     /**
      * Echo the given string.
-     * 
+     *
      * @param msg the message type: value
      * @return V bulk-string-reply
      */
@@ -91,21 +91,21 @@ public interface BaseNodeSelectionAsyncCommands<K, V> {
 
     /**
      * Ping the server.
-     * 
+     *
      * @return String simple-string-reply
      */
     AsyncExecutions<String> ping();
 
     /**
      * Close the connection.
-     * 
+     *
      * @return String simple-string-reply always OK.
      */
     AsyncExecutions<String> quit();
 
     /**
      * Wait for replication.
-     * 
+     *
      * @param replicas minimum number of replicas
      * @param timeout timeout in milliseconds
      * @return number of replicas
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java
index c6b1b62d1c..1fc4d2e815 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
 
 /**
  * Asynchronous and thread-safe Redis API to execute commands on a {@link NodeSelectionSupport}.
- * 
+ *
  * @author Mark Paluch
  */
 public interface NodeSelectionAsyncCommands<K, V> extends BaseNodeSelectionAsyncCommands<K, V>,
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java
index ad290a4125..4893ffdeed 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionGeoAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
 import java.util.List;
 import java.util.Set;
 
-import com.lambdaworks.redis.*;
+import io.lettuce.core.*;
 
 /**
  * Asynchronous executed commands on a node selection for the Geo-API.
  *
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi
  */
 public interface NodeSelectionGeoAsyncCommands<K, V> {
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHLLAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHLLAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java
index ac0226b4e8..4b08735426 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHLLAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
 /**
  * Asynchronous executed commands on a node selection for HyperLogLog (PF* commands).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 3.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi
  */
 public interface NodeSelectionHLLAsyncCommands<K, V> {
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
index 36433c2f61..452655df90 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
@@ -13,30 +13,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Asynchronous executed commands on a node selection for Hashes (Key-Value pairs).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi
  */
 public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Delete one or more hash fields.
-     * 
+     *
      * @param key the key
      * @param fields the field type: key
      * @return Long integer-reply the number of fields that were removed from the hash, not including specified but non existing
@@ -46,11 +46,11 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Determine if a hash field exists.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the hash contains {@code field}. {@literal false} if the hash does not contain {@code field},
      *         or {@code key} does not exist.
      */
@@ -58,7 +58,7 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Get the value of a hash field.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @return V bulk-string-reply the value associated with {@code field}, or {@literal null} when {@code field} is not present
@@ -68,7 +68,7 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Increment the integer value of a hash field by the given number.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @param amount the increment type: long
@@ -78,7 +78,7 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Increment the float value of a hash field by the given amount.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @param amount the increment type: double
@@ -88,7 +88,7 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Get all the fields and values in a hash.
-     * 
+     *
      * @param key the key
      * @return Map&lt;K,V&gt; array-reply list of fields and their values stored in the hash, or an empty list when {@code key}
      *         does not exist.
@@ -97,17 +97,17 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Stream over all the fields and values in a hash.
-     * 
+     *
      * @param channel the channel
      * @param key the key
-     * 
+     *
      * @return Long count of the keys.
      */
     AsyncExecutions<Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key);
 
     /**
      * Get all the fields in a hash.
-     * 
+     *
      * @param key the key
      * @return List&lt;K&gt; array-reply list of fields in the hash, or an empty list when {@code key} does not exist.
      */
@@ -115,17 +115,17 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Stream over all the fields in a hash.
-     * 
+     *
      * @param channel the channel
      * @param key the key
-     * 
+     *
      * @return Long count of the keys.
      */
     AsyncExecutions<Long> hkeys(KeyStreamingChannel<K> channel, K key);
 
     /**
      * Get the number of fields in a hash.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply number of fields in the hash, or {@code 0} when {@code key} does not exist.
      */
@@ -133,7 +133,7 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Get the values of all the given hash fields.
-     * 
+     *
      * @param key the key
      * @param fields the field type: key
      * @return List&lt;V&gt; array-reply list of values associated with the given fields, in the same
@@ -142,18 +142,18 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Stream over the values of all the given hash fields.
-     * 
+     *
      * @param channel the channel
      * @param key the key
      * @param fields the fields
-     * 
+     *
      * @return Long count of the keys
      */
     AsyncExecutions<Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields);
 
     /**
      * Set multiple hash fields to multiple values.
-     * 
+     *
      * @param key the key
      * @param map the null
      * @return String simple-string-reply
@@ -162,7 +162,7 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
      */
@@ -170,7 +170,7 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanArgs scan arguments
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
@@ -179,7 +179,7 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -189,7 +189,7 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
@@ -198,7 +198,7 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @return StreamScanCursor scan cursor.
@@ -207,7 +207,7 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanArgs scan arguments
@@ -217,7 +217,7 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -228,7 +228,7 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
index 2bf737915e..2085ca4342 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionKeyAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
 import java.util.Date;
 import java.util.List;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Asynchronous executed commands on a node selection for Keys (Key manipulation/querying).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi
  */
 public interface NodeSelectionKeyAsyncCommands<K, V> {
 
@@ -51,7 +51,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Return a serialized version of the value stored at the specified key.
-     * 
+     *
      * @param key the key
      * @return byte[] bulk-string-reply the serialized value.
      */
@@ -67,11 +67,11 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Set a key's time to live in seconds.
-     * 
+     *
      * @param key the key
      * @param seconds the seconds type: long
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set.
      */
@@ -79,11 +79,11 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp.
-     * 
+     *
      * @param key the key
      * @param timestamp the timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -91,11 +91,11 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp.
-     * 
+     *
      * @param key the key
      * @param timestamp the timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -103,7 +103,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Find all keys matching the given pattern.
-     * 
+     *
      * @param pattern the pattern type: patternkey (pattern)
      * @return List&lt;K&gt; array-reply list of keys matching {@code pattern}.
      */
@@ -111,7 +111,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Find all keys matching the given pattern.
-     * 
+     *
      * @param channel the channel
      * @param pattern the pattern
      * @return Long array-reply list of keys matching {@code pattern}.
@@ -120,7 +120,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Atomically transfer a key from a Redis instance to another one.
-     * 
+     *
      * @param host the host
      * @param port the port
      * @param key the key
@@ -144,7 +144,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Move a key to another database.
-     * 
+     *
      * @param key the key
      * @param db the db type: long
      * @return Boolean integer-reply specifically:
@@ -153,7 +153,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * returns the kind of internal representation used in order to store the value associated with a key.
-     * 
+     *
      * @param key the key
      * @return String
      */
@@ -162,7 +162,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
     /**
      * returns the number of seconds since the object stored at the specified key is idle (not requested by read or write
      * operations).
-     * 
+     *
      * @param key the key
      * @return number of seconds since the object stored at the specified key is idle.
      */
@@ -170,7 +170,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * returns the number of references of the value associated with the specified key.
-     * 
+     *
      * @param key the key
      * @return Long
      */
@@ -178,10 +178,10 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Remove the expiration from a key.
-     * 
+     *
      * @param key the key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was removed. {@literal false} if {@code key} does not exist or does not have an
      *         associated timeout.
      */
@@ -189,11 +189,11 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Set a key's time to live in milliseconds.
-     * 
+     *
      * @param key the key
      * @param milliseconds the milliseconds type: long
      * @return integer-reply, specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set.
      */
@@ -201,11 +201,11 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
-     * 
+     *
      * @param key the key
      * @param timestamp the milliseconds-timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -213,11 +213,11 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
-     * 
+     *
      * @param key the key
      * @param timestamp the milliseconds-timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -225,7 +225,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Get the time to live for a key in milliseconds.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply TTL in milliseconds, or a negative value in order to signal an error (see the description
      *         above).
@@ -234,14 +234,14 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Return a random key from the keyspace.
-     * 
+     *
      * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
      */
     AsyncExecutions<V> randomkey();
 
     /**
      * Rename a key.
-     * 
+     *
      * @param key the key
      * @param newKey the newkey type: key
      * @return String simple-string-reply
@@ -250,18 +250,18 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Rename a key, only if the new key does not exist.
-     * 
+     *
      * @param key the key
      * @param newKey the newkey type: key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if {@code key} was renamed to {@code newkey}. {@literal false} if {@code newkey} already exists.
      */
     AsyncExecutions<Boolean> renamenx(K key, K newKey);
 
     /**
      * Create a key using the provided serialized value, previously obtained using DUMP.
-     * 
+     *
      * @param key the key
      * @param ttl the ttl type: long
      * @param value the serialized-value type: string
@@ -271,7 +271,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @return List&lt;V&gt; array-reply list of sorted elements.
      */
@@ -279,7 +279,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @return Long number of values.
@@ -288,7 +288,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @param sortArgs sort arguments
      * @return List&lt;V&gt; array-reply list of sorted elements.
@@ -297,7 +297,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param sortArgs sort arguments
@@ -307,7 +307,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @param sortArgs sort arguments
      * @param destination the destination key to store sort results
@@ -317,7 +317,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Touch one or more keys. Touch sets the last accessed time for a key. Non-exsitent keys wont get created.
-     * 
+     *
      * @param keys the keys
      * @return Long integer-reply the number of found keys.
      */
@@ -333,7 +333,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Determine the type stored at key.
-     * 
+     *
      * @param key the key
      * @return String simple-string-reply type of {@code key}, or {@code none} when {@code key} does not exist.
      */
@@ -341,14 +341,14 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
     AsyncExecutions<KeyScanCursor<K>> scan();
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanArgs scan arguments
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
@@ -356,7 +356,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
      * @return KeyScanCursor&lt;K&gt; scan cursor.
@@ -365,7 +365,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
@@ -373,7 +373,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @return StreamScanCursor scan cursor.
      */
@@ -381,7 +381,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
@@ -390,7 +390,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -400,7 +400,7 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return StreamScanCursor scan cursor.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java
index 9aab6b92de..4f0e04a710 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionListAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java
@@ -13,31 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
 import java.util.List;
 
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Asynchronous executed commands on a node selection for Lists.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi
  */
 public interface NodeSelectionListAsyncCommands<K, V> {
 
     /**
      * Remove and get the first element in a list, or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param keys the keys
      * @return KeyValue&lt;K,V&gt; array-reply specifically:
-     * 
+     *
      *         A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk
      *         with the first element being the name of the key where an element was popped and the second element being the
      *         value of the popped element.
@@ -46,11 +46,11 @@ public interface NodeSelectionListAsyncCommands<K, V> {
 
     /**
      * Remove and get the last element in a list, or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param keys the keys
      * @return KeyValue&lt;K,V&gt; array-reply specifically:
-     * 
+     *
      *         A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk
      *         with the first element being the name of the key where an element was popped and the second element being the
      *         value of the popped element.
@@ -59,7 +59,7 @@ public interface NodeSelectionListAsyncCommands<K, V> {
 
     /**
      * Pop a value from a list, push it to another list and return it; or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param source the source key
      * @param destination the destination type: key
@@ -70,7 +70,7 @@ public interface NodeSelectionListAsyncCommands<K, V> {
 
     /**
      * Get an element from a list by its index.
-     * 
+     *
      * @param key the key
      * @param index the index type: long
      * @return V bulk-string-reply the requested element, or {@literal null} when {@code index} is out of range.
@@ -79,7 +79,7 @@ public interface NodeSelectionListAsyncCommands<K, V> {
 
     /**
      * Insert an element before or after another element in a list.
-     * 
+     *
      * @param key the key
      * @param before the before
      * @param pivot the pivot
@@ -91,7 +91,7 @@ public interface NodeSelectionListAsyncCommands<K, V> {
 
     /**
      * Get the length of a list.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the length of the list at {@code key}.
      */
@@ -99,7 +99,7 @@ public interface NodeSelectionListAsyncCommands<K, V> {
 
     /**
      * Remove and get the first element in a list.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of the first element, or {@literal null} when {@code key} does not exist.
      */
@@ -107,7 +107,7 @@ public interface NodeSelectionListAsyncCommands<K, V> {
 
     /**
      * Prepend one or multiple values to a list.
-     * 
+     *
      * @param key the key
      * @param values the value
      * @return Long integer-reply the length of the list after the push operations.
@@ -125,7 +125,7 @@ public interface NodeSelectionListAsyncCommands<K, V> {
 
     /**
      * Get a range of elements from a list.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param stop the stop type: long
@@ -135,7 +135,7 @@ public interface NodeSelectionListAsyncCommands<K, V> {
 
     /**
      * Get a range of elements from a list.
-     * 
+     *
      * @param channel the channel
      * @param key the key
      * @param start the start type: long
@@ -146,7 +146,7 @@ public interface NodeSelectionListAsyncCommands<K, V> {
 
     /**
      * Remove elements from a list.
-     * 
+     *
      * @param key the key
      * @param count the count type: long
      * @param value the value
@@ -156,7 +156,7 @@ public interface NodeSelectionListAsyncCommands<K, V> {
 
     /**
      * Set the value of an element in a list by its index.
-     * 
+     *
      * @param key the key
      * @param index the index type: long
      * @param value the value
@@ -166,7 +166,7 @@ public interface NodeSelectionListAsyncCommands<K, V> {
 
     /**
      * Trim a list to the specified range.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param stop the stop type: long
@@ -176,7 +176,7 @@ public interface NodeSelectionListAsyncCommands<K, V> {
 
     /**
      * Remove and get the last element in a list.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of the last element, or {@literal null} when {@code key} does not exist.
      */
@@ -184,7 +184,7 @@ public interface NodeSelectionListAsyncCommands<K, V> {
 
     /**
      * Remove the last element in a list, append it to another list and return it.
-     * 
+     *
      * @param source the source key
      * @param destination the destination type: key
      * @return V bulk-string-reply the element being popped and pushed.
@@ -193,7 +193,7 @@ public interface NodeSelectionListAsyncCommands<K, V> {
 
     /**
      * Append one or multiple values to a list.
-     * 
+     *
      * @param key the key
      * @param values the value
      * @return Long integer-reply the length of the list after the push operation.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionScriptingAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
index 7e6ec4e76f..6d1abf2fd7 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
@@ -13,26 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
 import java.util.List;
 
-import com.lambdaworks.redis.ScriptOutputType;
+import io.lettuce.core.ScriptOutputType;
 
 /**
  * Asynchronous executed commands on a node selection for Scripting.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi
  */
 public interface NodeSelectionScriptingAsyncCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param script Lua 5.1 script.
      * @param type output type
      * @param keys key names
@@ -43,7 +43,7 @@ public interface NodeSelectionScriptingAsyncCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param script Lua 5.1 script.
      * @param type the type
      * @param keys the keys
@@ -55,7 +55,7 @@ public interface NodeSelectionScriptingAsyncCommands<K, V> {
 
     /**
      * Evaluates a script cached on the server side by its SHA1 digest
-     * 
+     *
      * @param digest SHA1 of the script
      * @param type the type
      * @param keys the keys
@@ -66,7 +66,7 @@ public interface NodeSelectionScriptingAsyncCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param digest SHA1 of the script
      * @param type the type
      * @param keys the keys
@@ -78,7 +78,7 @@ public interface NodeSelectionScriptingAsyncCommands<K, V> {
 
     /**
      * Check existence of scripts in the script cache.
-     * 
+     *
      * @param digests script digests
      * @return List&lt;Boolean&gt; array-reply The command returns an array of integers that correspond to the specified SHA1
      *         digest arguments. For every corresponding SHA1 digest of a script that actually exists in the script cache, an 1
@@ -88,21 +88,21 @@ public interface NodeSelectionScriptingAsyncCommands<K, V> {
 
     /**
      * Remove all the scripts from the script cache.
-     * 
+     *
      * @return String simple-string-reply
      */
     AsyncExecutions<String> scriptFlush();
 
     /**
      * Kill the script currently in execution.
-     * 
+     *
      * @return String simple-string-reply
      */
     AsyncExecutions<String> scriptKill();
 
     /**
      * Load the specified Lua script into the script cache.
-     * 
+     *
      * @param script script content
      * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
      */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
index aa73c895b0..0c14310977 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
@@ -13,49 +13,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
 import java.util.Date;
 import java.util.List;
 
-import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.protocol.CommandType;
 
 /**
  * Asynchronous executed commands on a node selection for Server Control.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi
  */
 public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Asynchronously rewrite the append-only file.
-     * 
+     *
      * @return String simple-string-reply always {@code OK}.
      */
     AsyncExecutions<String> bgrewriteaof();
 
     /**
      * Asynchronously save the dataset to disk.
-     * 
+     *
      * @return String simple-string-reply
      */
     AsyncExecutions<String> bgsave();
 
     /**
      * Get the current connection name.
-     * 
+     *
      * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set.
      */
     AsyncExecutions<K> clientGetname();
 
     /**
      * Set the current connection name.
-     * 
+     *
      * @param name the client name
      * @return simple-string-reply {@code OK} if the connection name was successfully set.
      */
@@ -63,7 +63,7 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Kill the connection of a client identified by ip:port.
-     * 
+     *
      * @param addr ip:port
      * @return String simple-string-reply {@code OK} if the connection exists and has been closed
      */
@@ -79,7 +79,7 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Stop processing commands from clients for some time.
-     * 
+     *
      * @param timeout the timeout value in milliseconds
      * @return String simple-string-reply The command returns OK or an error if the timeout is invalid.
      */
@@ -87,7 +87,7 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Get the list of client connections.
-     * 
+     *
      * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF),
      *         each line is composed of a succession of property=value fields separated by a space character.
      */
@@ -95,14 +95,14 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Returns an array reply of details about all Redis commands.
-     * 
+     *
      * @return List&lt;Object&gt; array-reply
      */
     AsyncExecutions<List<Object>> command();
 
     /**
      * Returns an array reply of details about the requested commands.
-     * 
+     *
      * @param commands the commands to query for
      * @return List&lt;Object&gt; array-reply
      */
@@ -110,7 +110,7 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Returns an array reply of details about the requested commands.
-     * 
+     *
      * @param commands the commands to query for
      * @return List&lt;Object&gt; array-reply
      */
@@ -118,14 +118,14 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Get total number of Redis commands.
-     * 
+     *
      * @return Long integer-reply of number of total commands in this Redis server.
      */
     AsyncExecutions<Long> commandCount();
 
     /**
      * Get the value of a configuration parameter.
-     * 
+     *
      * @param parameter name of the parameter
      * @return List&lt;String&gt; bulk-string-reply
      */
@@ -133,14 +133,14 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Reset the stats returned by INFO.
-     * 
+     *
      * @return String simple-string-reply always {@code OK}.
      */
     AsyncExecutions<String> configResetstat();
 
     /**
      * Rewrite the configuration file with the in memory configuration.
-     * 
+     *
      * @return String simple-string-reply {@code OK} when the configuration was rewritten properly. Otherwise an error is
      *         returned.
      */
@@ -148,7 +148,7 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Set a configuration parameter to the given value.
-     * 
+     *
      * @param parameter the parameter name
      * @param value the parameter value
      * @return String simple-string-reply: {@code OK} when the configuration was set properly. Otherwise an error is returned.
@@ -157,7 +157,7 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Return the number of keys in the selected database.
-     * 
+     *
      * @return Long integer-reply
      */
     AsyncExecutions<Long> dbsize();
@@ -179,7 +179,7 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Get debugging information about a key.
-     * 
+     *
      * @param key the key
      * @return String simple-string-reply
      */
@@ -209,7 +209,7 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Remove all keys from all databases.
-     * 
+     *
      * @return String simple-string-reply
      */
     AsyncExecutions<String> flushall();
@@ -223,7 +223,7 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Remove all keys from the current database.
-     * 
+     *
      * @return String simple-string-reply
      */
     AsyncExecutions<String> flushdb();
@@ -237,14 +237,14 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Get information and statistics about the server.
-     * 
+     *
      * @return String bulk-string-reply as a collection of text lines.
      */
     AsyncExecutions<String> info();
 
     /**
      * Get information and statistics about the server.
-     * 
+     *
      * @param section the section type: string
      * @return String bulk-string-reply as a collection of text lines.
      */
@@ -252,21 +252,21 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Get the UNIX time stamp of the last successful save to disk.
-     * 
+     *
      * @return Date integer-reply an UNIX time stamp.
      */
     AsyncExecutions<Date> lastsave();
 
     /**
      * Synchronously save the dataset to disk.
-     * 
+     *
      * @return String simple-string-reply The commands returns OK on success.
      */
     AsyncExecutions<String> save();
 
     /**
      * Make the server a slave of another instance, or promote it as master.
-     * 
+     *
      * @param host the host type: string
      * @param port the port type: string
      * @return String simple-string-reply
@@ -275,21 +275,21 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Promote server as master.
-     * 
+     *
      * @return String simple-string-reply
      */
     AsyncExecutions<String> slaveofNoOne();
 
     /**
      * Read the slow log.
-     * 
+     *
      * @return List&lt;Object&gt; deeply nested multi bulk replies
      */
     AsyncExecutions<List<Object>> slowlogGet();
 
     /**
      * Read the slow log.
-     * 
+     *
      * @param count the count
      * @return List&lt;Object&gt; deeply nested multi bulk replies
      */
@@ -297,25 +297,25 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Obtaining the current length of the slow log.
-     * 
+     *
      * @return Long length of the slow log.
      */
     AsyncExecutions<Long> slowlogLen();
 
     /**
      * Resetting the slow log.
-     * 
+     *
      * @return String simple-string-reply The commands returns OK on success.
      */
     AsyncExecutions<String> slowlogReset();
 
     /**
      * Return the current server time.
-     * 
+     *
      * @return List&lt;V&gt; array-reply specifically:
-     * 
+     *
      *         A multi bulk reply containing two elements:
-     * 
+     *
      *         unix time in seconds. microseconds.
      */
     AsyncExecutions<List<V>> time();
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java
index 6986a9b072..5aa225e87f 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java
@@ -13,31 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
 import java.util.List;
 import java.util.Set;
 
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
-import com.lambdaworks.redis.ValueScanCursor;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.ScanArgs;
+import io.lettuce.core.ScanCursor;
+import io.lettuce.core.StreamScanCursor;
+import io.lettuce.core.ValueScanCursor;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Asynchronous executed commands on a node selection for Sets.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi
  */
 public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Add one or more members to a set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply the number of elements that were added to the set, not including all the elements already
@@ -47,7 +47,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Get the number of members in a set.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the cardinality (number of elements) of the set, or {@literal false} if {@code key} does not
      *         exist.
@@ -56,7 +56,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Subtract multiple sets.
-     * 
+     *
      * @param keys the key
      * @return Set&lt;V&gt; array-reply list with members of the resulting set.
      */
@@ -64,7 +64,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Subtract multiple sets.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -73,7 +73,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Subtract multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -82,7 +82,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Intersect multiple sets.
-     * 
+     *
      * @param keys the key
      * @return Set&lt;V&gt; array-reply list with members of the resulting set.
      */
@@ -90,7 +90,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Intersect multiple sets.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -99,7 +99,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Intersect multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -108,11 +108,11 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Determine if a given value is a member of a set.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the element is a member of the set. {@literal false} if the element is not a member of the
      *         set, or if {@code key} does not exist.
      */
@@ -120,12 +120,12 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Move a member from one set to another.
-     * 
+     *
      * @param source the source key
      * @param destination the destination type: key
      * @param member the member type: value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the element is moved. {@literal false} if the element is not a member of {@code source} and no
      *         operation was performed.
      */
@@ -133,7 +133,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Get all the members in a set.
-     * 
+     *
      * @param key the key
      * @return Set&lt;V&gt; array-reply all elements of the set.
      */
@@ -141,7 +141,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Get all the members in a set.
-     * 
+     *
      * @param channel the channel
      * @param key the keys
      * @return Long count of members of the resulting set.
@@ -150,7 +150,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Remove and return a random member from a set.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist.
      */
@@ -167,9 +167,9 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Get one random member from a set.
-     * 
+     *
      * @param key the key
-     * 
+     *
      * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply with the
      *         randomly selected element, or {@literal null} when {@code key} does not exist.
      */
@@ -177,7 +177,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Get one or multiple random members from a set.
-     * 
+     *
      * @param key the key
      * @param count the count type: long
      * @return Set&lt;V&gt; bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply
@@ -187,7 +187,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Get one or multiple random members from a set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param count the count
@@ -197,7 +197,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Remove one or more members from a set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply the number of members that were removed from the set, not including non existing members.
@@ -206,7 +206,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Add multiple sets.
-     * 
+     *
      * @param keys the key
      * @return Set&lt;V&gt; array-reply list with members of the resulting set.
      */
@@ -214,7 +214,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Add multiple sets.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -223,7 +223,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Add multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -232,7 +232,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @return ValueScanCursor&lt;V&gt; scan cursor.
      */
@@ -240,7 +240,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanArgs scan arguments
      * @return ValueScanCursor&lt;V&gt; scan cursor.
@@ -249,7 +249,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -259,7 +259,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return ValueScanCursor&lt;V&gt; scan cursor.
@@ -268,7 +268,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @return StreamScanCursor scan cursor.
@@ -277,7 +277,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanArgs scan arguments
@@ -287,7 +287,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -298,7 +298,7 @@ public interface NodeSelectionSetAsyncCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
similarity index 99%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
index 2824320f06..9170a8cb66 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
@@ -13,34 +13,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
 import java.util.List;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.ScoredValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Asynchronous executed commands on a node selection for Sorted Sets.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi
  */
 public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param score the score
      * @param member the member
-     * 
+     *
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -48,11 +48,11 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param scoresAndValues the scoresAndValue tuples (score,value,score,value,...)
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -60,11 +60,11 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param scoredValues the scored values
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -100,12 +100,12 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the ke
      * @param zAddArgs arguments for zadd
      * @param scoredValues the scored values
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -137,7 +137,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Get the number of members in a sorted set.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the cardinality (number of elements) of the sorted set, or {@literal false} if {@code key}
      *         does not exist.
@@ -146,7 +146,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Count the members in a sorted set with scores within the given values.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -158,7 +158,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Count the members in a sorted set with scores within the given values.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -180,7 +180,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Increment the score of a member in a sorted set.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: long
      * @param member the member type: key
@@ -191,7 +191,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
-     * 
+     *
      * @param destination the destination
      * @param keys the keys
      * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
@@ -200,7 +200,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
-     * 
+     *
      * @param destination the destination
      * @param storeArgs the storeArgs
      * @param keys the keys
@@ -394,7 +394,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -407,7 +407,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -431,7 +431,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -446,7 +446,7 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java
index 43aaa246f1..f60a119346 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStringAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.BitFieldArgs;
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.SetArgs;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
+import io.lettuce.core.BitFieldArgs;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.SetArgs;
+import io.lettuce.core.output.KeyValueStreamingChannel;
 
 /**
  * Asynchronous executed commands on a node selection for Strings.
@@ -30,7 +30,7 @@
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi
  */
 public interface NodeSelectionStringAsyncCommands<K, V> {
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
index fc913e0941..25941a6363 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.async.RedisKeyAsyncCommands;
-import com.lambdaworks.redis.api.async.RedisScriptingAsyncCommands;
-import com.lambdaworks.redis.api.async.RedisServerAsyncCommands;
-import com.lambdaworks.redis.api.async.RedisStringAsyncCommands;
-import com.lambdaworks.redis.cluster.ClusterClientOptions;
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.api.async.RedisKeyAsyncCommands;
+import io.lettuce.core.api.async.RedisScriptingAsyncCommands;
+import io.lettuce.core.api.async.RedisServerAsyncCommands;
+import io.lettuce.core.api.async.RedisStringAsyncCommands;
+import io.lettuce.core.cluster.ClusterClientOptions;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.output.KeyStreamingChannel;
 
 /**
  * Advanced asynchronous and thread-safe Redis Cluster API.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
index 9e63cd812a..376015f524 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.api.async.*;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.api.async.*;
 
 /**
  * A complete asynchronous and thread-safe cluster Redis API with 400+ Methods.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -39,7 +39,7 @@ public interface RedisClusterAsyncCommands<K, V>
 
     /**
      * Set the default timeout for operations.
-     * 
+     *
      * @param timeout the timeout value
      * @param unit the unit of the timeout value
      */
@@ -47,7 +47,7 @@ public interface RedisClusterAsyncCommands<K, V>
 
     /**
      * Authenticate to the server.
-     * 
+     *
      * @param password the password
      * @return String simple-string-reply
      */
@@ -149,7 +149,7 @@ public interface RedisClusterAsyncCommands<K, V>
 
     /**
      * Obtain details about all cluster nodes. Can be parsed using
-     * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
+     * {@link io.lettuce.core.cluster.models.partitions.ClusterPartitionParser#parse}
      *
      * @return String bulk-string-reply as a collection of text lines
      */
@@ -157,7 +157,7 @@ public interface RedisClusterAsyncCommands<K, V>
 
     /**
      * List slaves for a certain node identified by its {@code nodeId}. Can be parsed using
-     * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
+     * {@link io.lettuce.core.cluster.models.partitions.ClusterPartitionParser#parse}
      *
      * @param nodeId node id of the master node
      * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as
@@ -195,7 +195,7 @@ public interface RedisClusterAsyncCommands<K, V>
     /**
      * Returns an integer identifying the hash slot the specified key hashes to. This command is mainly useful for debugging and
      * testing, since it exposes via an API the underlying Redis implementation of the hashing algorithm. Basically the same as
-     * {@link com.lambdaworks.redis.cluster.SlotHash#getSlot(byte[])}. If not, call Houston and report that we've got a problem.
+     * {@link io.lettuce.core.cluster.SlotHash#getSlot(byte[])}. If not, call Houston and report that we've got a problem.
      *
      * @param key the key.
      * @return Integer reply: The hash slot number.
@@ -223,7 +223,7 @@ public interface RedisClusterAsyncCommands<K, V>
 
     /**
      * Get array of cluster slots to node mappings.
-     * 
+     *
      * @return RedisFuture&lt;List&lt;Object&gt;&gt; array-reply nested list of slot ranges with IP/Port mappings.
      */
     RedisFuture<List<Object>> clusterSlots();
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/package-info.java b/src/main/java/io/lettuce/core/cluster/api/async/package-info.java
similarity index 57%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/package-info.java
rename to src/main/java/io/lettuce/core/cluster/api/async/package-info.java
index ed12267be8..c1297ebb83 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/package-info.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Cluster API for asynchronous executed commands.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
diff --git a/src/main/java/io/lettuce/core/cluster/api/package-info.java b/src/main/java/io/lettuce/core/cluster/api/package-info.java
new file mode 100644
index 0000000000..3d6f8eb663
--- /dev/null
+++ b/src/main/java/io/lettuce/core/cluster/api/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Redis Cluster connection API.
+ */
+package io.lettuce.core.cluster.api;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/ReactiveExecutions.java b/src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/cluster/api/reactive/ReactiveExecutions.java
rename to src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java
index 264b234d4a..e4c4080b3c 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/ReactiveExecutions.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.reactive;
+package io.lettuce.core.cluster.api.reactive;
 
 import java.util.Collection;
 
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 import reactor.core.publisher.Flux;
 
@@ -31,7 +31,7 @@ public interface ReactiveExecutions<T> {
 
     /**
      * Return a {@link Flux} that contains a combined stream of the multi-node execution.
-     * 
+     *
      * @return
      */
     Flux<T> flux();
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
index 9da78d7d24..cc3a3bf356 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.reactive;
+package io.lettuce.core.cluster.api.reactive;
 
 import java.util.Map;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.reactive.RedisKeyReactiveCommands;
-import com.lambdaworks.redis.api.reactive.RedisScriptingReactiveCommands;
-import com.lambdaworks.redis.api.reactive.RedisServerReactiveCommands;
-import com.lambdaworks.redis.api.reactive.RedisStringReactiveCommands;
-import com.lambdaworks.redis.cluster.ClusterClientOptions;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.api.reactive.RedisKeyReactiveCommands;
+import io.lettuce.core.api.reactive.RedisScriptingReactiveCommands;
+import io.lettuce.core.api.reactive.RedisServerReactiveCommands;
+import io.lettuce.core.api.reactive.RedisStringReactiveCommands;
+import io.lettuce.core.cluster.ClusterClientOptions;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.output.KeyStreamingChannel;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisClusterReactiveCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
index 0808aacaf8..7a17470333 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/RedisClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.reactive;
+package io.lettuce.core.cluster.api.reactive;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.api.reactive.*;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.api.reactive.*;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
  * A complete reactive and thread-safe cluster Redis API with 400+ Methods.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -39,7 +39,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
 
     /**
      * Set the default timeout for operations.
-     * 
+     *
      * @param timeout the timeout value
      * @param unit the unit of the timeout value
      */
@@ -47,7 +47,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
 
     /**
      * Authenticate to the server.
-     * 
+     *
      * @param password the password
      * @return String simple-string-reply
      */
@@ -149,7 +149,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
 
     /**
      * Obtain details about all cluster nodes. Can be parsed using
-     * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
+     * {@link io.lettuce.core.cluster.models.partitions.ClusterPartitionParser#parse}
      *
      * @return String bulk-string-reply as a collection of text lines
      */
@@ -157,7 +157,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
 
     /**
      * List slaves for a certain node identified by its {@code nodeId}. Can be parsed using
-     * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
+     * {@link io.lettuce.core.cluster.models.partitions.ClusterPartitionParser#parse}
      *
      * @param nodeId node id of the master node
      * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as
@@ -195,7 +195,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
     /**
      * Returns an integer identifying the hash slot the specified key hashes to. This command is mainly useful for debugging and
      * testing, since it exposes via an API the underlying Redis implementation of the hashing algorithm. Basically the same as
-     * {@link com.lambdaworks.redis.cluster.SlotHash#getSlot(byte[])}. If not, call Houston and report that we've got a problem.
+     * {@link io.lettuce.core.cluster.SlotHash#getSlot(byte[])}. If not, call Houston and report that we've got a problem.
      *
      * @param key the key.
      * @return Integer reply: The hash slot number.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java b/src/main/java/io/lettuce/core/cluster/api/reactive/package-info.java
similarity index 58%
rename from src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java
rename to src/main/java/io/lettuce/core/cluster/api/reactive/package-info.java
index 30e8b76556..d24fca4350 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/reactive/package-info.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Cluster API for commands executed in a reactive manner.
  */
-package com.lambdaworks.redis.cluster.api.reactive;
+package io.lettuce.core.cluster.api.reactive;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
index 834b4b8cfd..bf4bf606e8 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/BaseNodeSelectionCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
@@ -13,26 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
 import java.util.List;
 import java.util.Map;
 
 /**
- * 
+ *
  * Synchronous executed commands on a node selection for basic commands.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi
  */
 public interface BaseNodeSelectionCommands<K, V> {
 
     /**
      * Post a message to a channel.
-     * 
+     *
      * @param channel the channel type: key
      * @param message the message type: value
      * @return Long integer-reply the number of clients that received the message.
@@ -41,14 +41,14 @@ public interface BaseNodeSelectionCommands<K, V> {
 
     /**
      * Lists the currently *active channels*.
-     * 
+     *
      * @return List&lt;K&gt; array-reply a list of active channels, optionally matching the specified pattern.
      */
     Executions<List<K>> pubsubChannels();
 
     /**
      * Lists the currently *active channels*.
-     * 
+     *
      * @param channel the key
      * @return List&lt;K&gt; array-reply a list of active channels, optionally matching the specified pattern.
      */
@@ -64,14 +64,14 @@ public interface BaseNodeSelectionCommands<K, V> {
 
     /**
      * Returns the number of subscriptions to patterns.
-     * 
+     *
      * @return Long integer-reply the number of patterns all the clients are subscribed to.
      */
     Executions<Long> pubsubNumpat();
 
     /**
      * Echo the given string.
-     * 
+     *
      * @param msg the message type: value
      * @return V bulk-string-reply
      */
@@ -87,21 +87,21 @@ public interface BaseNodeSelectionCommands<K, V> {
 
     /**
      * Ping the server.
-     * 
+     *
      * @return String simple-string-reply
      */
     Executions<String> ping();
 
     /**
      * Close the connection.
-     * 
+     *
      * @return String simple-string-reply always OK.
      */
     Executions<String> quit();
 
     /**
      * Wait for replication.
-     * 
+     *
      * @param replicas minimum number of replicas
      * @param timeout timeout in milliseconds
      * @return number of replicas
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java b/src/main/java/io/lettuce/core/cluster/api/sync/Executions.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/Executions.java
index 302b1206f2..d13a85dd73 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/Executions.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/Executions.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
 import java.util.*;
 import java.util.concurrent.CompletionStage;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * Result holder for a command that was executed synchronously on multiple nodes.
- * 
+ *
  * @author Mark Paluch
  * @since 4.0
  */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelection.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java
similarity index 85%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelection.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java
index 1f330a9449..d78c1b767d 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
 
 /**
  * Node selection with access to synchronous executed commands on the set. Commands are triggered concurrently to the selected
  * nodes and synchronized afterwards.
- * 
+ *
  * @author Mark Paluch
  * @since 4.0
  */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java
index e85baa1f00..3c3e95f193 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
 
 /**
  * Synchronous and thread-safe Redis API to execute commands on a {@link NodeSelectionSupport}.
- * 
+ *
  * @author Mark Paluch
  */
 public interface NodeSelectionCommands<K, V> extends BaseNodeSelectionCommands<K, V>, NodeSelectionHashCommands<K, V>,
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java
index fce9623874..b4f45c4fa9 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionGeoCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
 import java.util.List;
 import java.util.Set;
 
-import com.lambdaworks.redis.*;
+import io.lettuce.core.*;
 
 /**
  * Synchronous executed commands on a node selection for the Geo-API.
  *
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi
  */
 public interface NodeSelectionGeoCommands<K, V> {
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHLLCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHLLCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java
index 29f124010a..b7ff92766d 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHLLCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
 /**
  * Synchronous executed commands on a node selection for HyperLogLog (PF* commands).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 3.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi
  */
 public interface NodeSelectionHLLCommands<K, V> {
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
index 2c4764680e..67f9e8c3bb 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionHashCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
@@ -13,30 +13,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Synchronous executed commands on a node selection for Hashes (Key-Value pairs).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi
  */
 public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Delete one or more hash fields.
-     * 
+     *
      * @param key the key
      * @param fields the field type: key
      * @return Long integer-reply the number of fields that were removed from the hash, not including specified but non existing
@@ -46,11 +46,11 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Determine if a hash field exists.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the hash contains {@code field}. {@literal false} if the hash does not contain {@code field},
      *         or {@code key} does not exist.
      */
@@ -58,7 +58,7 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Get the value of a hash field.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @return V bulk-string-reply the value associated with {@code field}, or {@literal null} when {@code field} is not present
@@ -68,7 +68,7 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Increment the integer value of a hash field by the given number.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @param amount the increment type: long
@@ -78,7 +78,7 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Increment the float value of a hash field by the given amount.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @param amount the increment type: double
@@ -88,7 +88,7 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Get all the fields and values in a hash.
-     * 
+     *
      * @param key the key
      * @return Map&lt;K,V&gt; array-reply list of fields and their values stored in the hash, or an empty list when {@code key}
      *         does not exist.
@@ -97,17 +97,17 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Stream over all the fields and values in a hash.
-     * 
+     *
      * @param channel the channel
      * @param key the key
-     * 
+     *
      * @return Long count of the keys.
      */
     Executions<Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key);
 
     /**
      * Get all the fields in a hash.
-     * 
+     *
      * @param key the key
      * @return List&lt;K&gt; array-reply list of fields in the hash, or an empty list when {@code key} does not exist.
      */
@@ -115,17 +115,17 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Stream over all the fields in a hash.
-     * 
+     *
      * @param channel the channel
      * @param key the key
-     * 
+     *
      * @return Long count of the keys.
      */
     Executions<Long> hkeys(KeyStreamingChannel<K> channel, K key);
 
     /**
      * Get the number of fields in a hash.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply number of fields in the hash, or {@code 0} when {@code key} does not exist.
      */
@@ -133,7 +133,7 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Get the values of all the given hash fields.
-     * 
+     *
      * @param key the key
      * @param fields the field type: key
      * @return List&lt;V&gt; array-reply list of values associated with the given fields, in the same
@@ -142,18 +142,18 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Stream over the values of all the given hash fields.
-     * 
+     *
      * @param channel the channel
      * @param key the key
      * @param fields the fields
-     * 
+     *
      * @return Long count of the keys
      */
     Executions<Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields);
 
     /**
      * Set multiple hash fields to multiple values.
-     * 
+     *
      * @param key the key
      * @param map the null
      * @return String simple-string-reply
@@ -162,7 +162,7 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
      */
@@ -170,7 +170,7 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanArgs scan arguments
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
@@ -179,7 +179,7 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -189,7 +189,7 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
@@ -198,7 +198,7 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @return StreamScanCursor scan cursor.
@@ -207,7 +207,7 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanArgs scan arguments
@@ -217,7 +217,7 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -228,7 +228,7 @@ public interface NodeSelectionHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
index d241449851..07e44f5c46 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
 import java.util.Date;
 import java.util.List;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Synchronous executed commands on a node selection for Keys (Key manipulation/querying).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi
  */
 public interface NodeSelectionKeyCommands<K, V> {
 
@@ -51,7 +51,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Return a serialized version of the value stored at the specified key.
-     * 
+     *
      * @param key the key
      * @return byte[] bulk-string-reply the serialized value.
      */
@@ -67,11 +67,11 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Set a key's time to live in seconds.
-     * 
+     *
      * @param key the key
      * @param seconds the seconds type: long
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set.
      */
@@ -79,11 +79,11 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp.
-     * 
+     *
      * @param key the key
      * @param timestamp the timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -91,11 +91,11 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp.
-     * 
+     *
      * @param key the key
      * @param timestamp the timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -103,7 +103,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Find all keys matching the given pattern.
-     * 
+     *
      * @param pattern the pattern type: patternkey (pattern)
      * @return List&lt;K&gt; array-reply list of keys matching {@code pattern}.
      */
@@ -111,7 +111,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Find all keys matching the given pattern.
-     * 
+     *
      * @param channel the channel
      * @param pattern the pattern
      * @return Long array-reply list of keys matching {@code pattern}.
@@ -120,7 +120,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Atomically transfer a key from a Redis instance to another one.
-     * 
+     *
      * @param host the host
      * @param port the port
      * @param key the key
@@ -144,7 +144,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Move a key to another database.
-     * 
+     *
      * @param key the key
      * @param db the db type: long
      * @return Boolean integer-reply specifically:
@@ -153,7 +153,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * returns the kind of internal representation used in order to store the value associated with a key.
-     * 
+     *
      * @param key the key
      * @return String
      */
@@ -162,7 +162,7 @@ public interface NodeSelectionKeyCommands<K, V> {
     /**
      * returns the number of seconds since the object stored at the specified key is idle (not requested by read or write
      * operations).
-     * 
+     *
      * @param key the key
      * @return number of seconds since the object stored at the specified key is idle.
      */
@@ -170,7 +170,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * returns the number of references of the value associated with the specified key.
-     * 
+     *
      * @param key the key
      * @return Long
      */
@@ -178,10 +178,10 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Remove the expiration from a key.
-     * 
+     *
      * @param key the key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was removed. {@literal false} if {@code key} does not exist or does not have an
      *         associated timeout.
      */
@@ -189,11 +189,11 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Set a key's time to live in milliseconds.
-     * 
+     *
      * @param key the key
      * @param milliseconds the milliseconds type: long
      * @return integer-reply, specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set.
      */
@@ -201,11 +201,11 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
-     * 
+     *
      * @param key the key
      * @param timestamp the milliseconds-timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -213,11 +213,11 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
-     * 
+     *
      * @param key the key
      * @param timestamp the milliseconds-timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -225,7 +225,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Get the time to live for a key in milliseconds.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply TTL in milliseconds, or a negative value in order to signal an error (see the description
      *         above).
@@ -234,14 +234,14 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Return a random key from the keyspace.
-     * 
+     *
      * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
      */
     Executions<V> randomkey();
 
     /**
      * Rename a key.
-     * 
+     *
      * @param key the key
      * @param newKey the newkey type: key
      * @return String simple-string-reply
@@ -250,18 +250,18 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Rename a key, only if the new key does not exist.
-     * 
+     *
      * @param key the key
      * @param newKey the newkey type: key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if {@code key} was renamed to {@code newkey}. {@literal false} if {@code newkey} already exists.
      */
     Executions<Boolean> renamenx(K key, K newKey);
 
     /**
      * Create a key using the provided serialized value, previously obtained using DUMP.
-     * 
+     *
      * @param key the key
      * @param ttl the ttl type: long
      * @param value the serialized-value type: string
@@ -271,7 +271,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @return List&lt;V&gt; array-reply list of sorted elements.
      */
@@ -279,7 +279,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @return Long number of values.
@@ -288,7 +288,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @param sortArgs sort arguments
      * @return List&lt;V&gt; array-reply list of sorted elements.
@@ -297,7 +297,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param sortArgs sort arguments
@@ -307,7 +307,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @param sortArgs sort arguments
      * @param destination the destination key to store sort results
@@ -317,7 +317,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Touch one or more keys. Touch sets the last accessed time for a key. Non-exsitent keys wont get created.
-     * 
+     *
      * @param keys the keys
      * @return Long integer-reply the number of found keys.
      */
@@ -333,7 +333,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Determine the type stored at key.
-     * 
+     *
      * @param key the key
      * @return String simple-string-reply type of {@code key}, or {@code none} when {@code key} does not exist.
      */
@@ -341,14 +341,14 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
     Executions<KeyScanCursor<K>> scan();
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanArgs scan arguments
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
@@ -356,7 +356,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
      * @return KeyScanCursor&lt;K&gt; scan cursor.
@@ -365,7 +365,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
@@ -373,7 +373,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @return StreamScanCursor scan cursor.
      */
@@ -381,7 +381,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
@@ -390,7 +390,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -400,7 +400,7 @@ public interface NodeSelectionKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return StreamScanCursor scan cursor.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java
index e6d5484183..40587e53b5 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionListCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java
@@ -13,31 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
 import java.util.List;
 
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Synchronous executed commands on a node selection for Lists.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi
  */
 public interface NodeSelectionListCommands<K, V> {
 
     /**
      * Remove and get the first element in a list, or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param keys the keys
      * @return KeyValue&lt;K,V&gt; array-reply specifically:
-     * 
+     *
      *         A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk
      *         with the first element being the name of the key where an element was popped and the second element being the
      *         value of the popped element.
@@ -46,11 +46,11 @@ public interface NodeSelectionListCommands<K, V> {
 
     /**
      * Remove and get the last element in a list, or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param keys the keys
      * @return KeyValue&lt;K,V&gt; array-reply specifically:
-     * 
+     *
      *         A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk
      *         with the first element being the name of the key where an element was popped and the second element being the
      *         value of the popped element.
@@ -59,7 +59,7 @@ public interface NodeSelectionListCommands<K, V> {
 
     /**
      * Pop a value from a list, push it to another list and return it; or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param source the source key
      * @param destination the destination type: key
@@ -70,7 +70,7 @@ public interface NodeSelectionListCommands<K, V> {
 
     /**
      * Get an element from a list by its index.
-     * 
+     *
      * @param key the key
      * @param index the index type: long
      * @return V bulk-string-reply the requested element, or {@literal null} when {@code index} is out of range.
@@ -79,7 +79,7 @@ public interface NodeSelectionListCommands<K, V> {
 
     /**
      * Insert an element before or after another element in a list.
-     * 
+     *
      * @param key the key
      * @param before the before
      * @param pivot the pivot
@@ -91,7 +91,7 @@ public interface NodeSelectionListCommands<K, V> {
 
     /**
      * Get the length of a list.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the length of the list at {@code key}.
      */
@@ -99,7 +99,7 @@ public interface NodeSelectionListCommands<K, V> {
 
     /**
      * Remove and get the first element in a list.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of the first element, or {@literal null} when {@code key} does not exist.
      */
@@ -107,7 +107,7 @@ public interface NodeSelectionListCommands<K, V> {
 
     /**
      * Prepend one or multiple values to a list.
-     * 
+     *
      * @param key the key
      * @param values the value
      * @return Long integer-reply the length of the list after the push operations.
@@ -125,7 +125,7 @@ public interface NodeSelectionListCommands<K, V> {
 
     /**
      * Get a range of elements from a list.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param stop the stop type: long
@@ -135,7 +135,7 @@ public interface NodeSelectionListCommands<K, V> {
 
     /**
      * Get a range of elements from a list.
-     * 
+     *
      * @param channel the channel
      * @param key the key
      * @param start the start type: long
@@ -146,7 +146,7 @@ public interface NodeSelectionListCommands<K, V> {
 
     /**
      * Remove elements from a list.
-     * 
+     *
      * @param key the key
      * @param count the count type: long
      * @param value the value
@@ -156,7 +156,7 @@ public interface NodeSelectionListCommands<K, V> {
 
     /**
      * Set the value of an element in a list by its index.
-     * 
+     *
      * @param key the key
      * @param index the index type: long
      * @param value the value
@@ -166,7 +166,7 @@ public interface NodeSelectionListCommands<K, V> {
 
     /**
      * Trim a list to the specified range.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param stop the stop type: long
@@ -176,7 +176,7 @@ public interface NodeSelectionListCommands<K, V> {
 
     /**
      * Remove and get the last element in a list.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of the last element, or {@literal null} when {@code key} does not exist.
      */
@@ -184,7 +184,7 @@ public interface NodeSelectionListCommands<K, V> {
 
     /**
      * Remove the last element in a list, append it to another list and return it.
-     * 
+     *
      * @param source the source key
      * @param destination the destination type: key
      * @return V bulk-string-reply the element being popped and pushed.
@@ -193,7 +193,7 @@ public interface NodeSelectionListCommands<K, V> {
 
     /**
      * Append one or multiple values to a list.
-     * 
+     *
      * @param key the key
      * @param values the value
      * @return Long integer-reply the length of the list after the push operation.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionScriptingCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionScriptingCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
index c8498524ba..fc6455d6e7 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionScriptingCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
@@ -13,26 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
 import java.util.List;
 
-import com.lambdaworks.redis.ScriptOutputType;
+import io.lettuce.core.ScriptOutputType;
 
 /**
  * Synchronous executed commands on a node selection for Scripting.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi
  */
 public interface NodeSelectionScriptingCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param script Lua 5.1 script.
      * @param type output type
      * @param keys key names
@@ -43,7 +43,7 @@ public interface NodeSelectionScriptingCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param script Lua 5.1 script.
      * @param type the type
      * @param keys the keys
@@ -55,7 +55,7 @@ public interface NodeSelectionScriptingCommands<K, V> {
 
     /**
      * Evaluates a script cached on the server side by its SHA1 digest
-     * 
+     *
      * @param digest SHA1 of the script
      * @param type the type
      * @param keys the keys
@@ -66,7 +66,7 @@ public interface NodeSelectionScriptingCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param digest SHA1 of the script
      * @param type the type
      * @param keys the keys
@@ -78,7 +78,7 @@ public interface NodeSelectionScriptingCommands<K, V> {
 
     /**
      * Check existence of scripts in the script cache.
-     * 
+     *
      * @param digests script digests
      * @return List&lt;Boolean&gt; array-reply The command returns an array of integers that correspond to the specified SHA1
      *         digest arguments. For every corresponding SHA1 digest of a script that actually exists in the script cache, an 1
@@ -88,21 +88,21 @@ public interface NodeSelectionScriptingCommands<K, V> {
 
     /**
      * Remove all the scripts from the script cache.
-     * 
+     *
      * @return String simple-string-reply
      */
     Executions<String> scriptFlush();
 
     /**
      * Kill the script currently in execution.
-     * 
+     *
      * @return String simple-string-reply
      */
     Executions<String> scriptKill();
 
     /**
      * Load the specified Lua script into the script cache.
-     * 
+     *
      * @param script script content
      * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
      */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
index 4779b8beec..4136f59b4a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
@@ -13,49 +13,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
 import java.util.Date;
 import java.util.List;
 
-import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.protocol.CommandType;
 
 /**
  * Synchronous executed commands on a node selection for Server Control.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi
  */
 public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Asynchronously rewrite the append-only file.
-     * 
+     *
      * @return String simple-string-reply always {@code OK}.
      */
     Executions<String> bgrewriteaof();
 
     /**
      * Asynchronously save the dataset to disk.
-     * 
+     *
      * @return String simple-string-reply
      */
     Executions<String> bgsave();
 
     /**
      * Get the current connection name.
-     * 
+     *
      * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set.
      */
     Executions<K> clientGetname();
 
     /**
      * Set the current connection name.
-     * 
+     *
      * @param name the client name
      * @return simple-string-reply {@code OK} if the connection name was successfully set.
      */
@@ -63,7 +63,7 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Kill the connection of a client identified by ip:port.
-     * 
+     *
      * @param addr ip:port
      * @return String simple-string-reply {@code OK} if the connection exists and has been closed
      */
@@ -79,7 +79,7 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Stop processing commands from clients for some time.
-     * 
+     *
      * @param timeout the timeout value in milliseconds
      * @return String simple-string-reply The command returns OK or an error if the timeout is invalid.
      */
@@ -87,7 +87,7 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Get the list of client connections.
-     * 
+     *
      * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF),
      *         each line is composed of a succession of property=value fields separated by a space character.
      */
@@ -95,14 +95,14 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Returns an array reply of details about all Redis commands.
-     * 
+     *
      * @return List&lt;Object&gt; array-reply
      */
     Executions<List<Object>> command();
 
     /**
      * Returns an array reply of details about the requested commands.
-     * 
+     *
      * @param commands the commands to query for
      * @return List&lt;Object&gt; array-reply
      */
@@ -110,7 +110,7 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Returns an array reply of details about the requested commands.
-     * 
+     *
      * @param commands the commands to query for
      * @return List&lt;Object&gt; array-reply
      */
@@ -118,14 +118,14 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Get total number of Redis commands.
-     * 
+     *
      * @return Long integer-reply of number of total commands in this Redis server.
      */
     Executions<Long> commandCount();
 
     /**
      * Get the value of a configuration parameter.
-     * 
+     *
      * @param parameter name of the parameter
      * @return List&lt;String&gt; bulk-string-reply
      */
@@ -133,14 +133,14 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Reset the stats returned by INFO.
-     * 
+     *
      * @return String simple-string-reply always {@code OK}.
      */
     Executions<String> configResetstat();
 
     /**
      * Rewrite the configuration file with the in memory configuration.
-     * 
+     *
      * @return String simple-string-reply {@code OK} when the configuration was rewritten properly. Otherwise an error is
      *         returned.
      */
@@ -148,7 +148,7 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Set a configuration parameter to the given value.
-     * 
+     *
      * @param parameter the parameter name
      * @param value the parameter value
      * @return String simple-string-reply: {@code OK} when the configuration was set properly. Otherwise an error is returned.
@@ -157,7 +157,7 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Return the number of keys in the selected database.
-     * 
+     *
      * @return Long integer-reply
      */
     Executions<Long> dbsize();
@@ -179,7 +179,7 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Get debugging information about a key.
-     * 
+     *
      * @param key the key
      * @return String simple-string-reply
      */
@@ -209,7 +209,7 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Remove all keys from all databases.
-     * 
+     *
      * @return String simple-string-reply
      */
     Executions<String> flushall();
@@ -223,7 +223,7 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Remove all keys from the current database.
-     * 
+     *
      * @return String simple-string-reply
      */
     Executions<String> flushdb();
@@ -237,14 +237,14 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Get information and statistics about the server.
-     * 
+     *
      * @return String bulk-string-reply as a collection of text lines.
      */
     Executions<String> info();
 
     /**
      * Get information and statistics about the server.
-     * 
+     *
      * @param section the section type: string
      * @return String bulk-string-reply as a collection of text lines.
      */
@@ -252,21 +252,21 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Get the UNIX time stamp of the last successful save to disk.
-     * 
+     *
      * @return Date integer-reply an UNIX time stamp.
      */
     Executions<Date> lastsave();
 
     /**
      * Synchronously save the dataset to disk.
-     * 
+     *
      * @return String simple-string-reply The commands returns OK on success.
      */
     Executions<String> save();
 
     /**
      * Make the server a slave of another instance, or promote it as master.
-     * 
+     *
      * @param host the host type: string
      * @param port the port type: string
      * @return String simple-string-reply
@@ -275,21 +275,21 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Promote server as master.
-     * 
+     *
      * @return String simple-string-reply
      */
     Executions<String> slaveofNoOne();
 
     /**
      * Read the slow log.
-     * 
+     *
      * @return List&lt;Object&gt; deeply nested multi bulk replies
      */
     Executions<List<Object>> slowlogGet();
 
     /**
      * Read the slow log.
-     * 
+     *
      * @param count the count
      * @return List&lt;Object&gt; deeply nested multi bulk replies
      */
@@ -297,25 +297,25 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Obtaining the current length of the slow log.
-     * 
+     *
      * @return Long length of the slow log.
      */
     Executions<Long> slowlogLen();
 
     /**
      * Resetting the slow log.
-     * 
+     *
      * @return String simple-string-reply The commands returns OK on success.
      */
     Executions<String> slowlogReset();
 
     /**
      * Return the current server time.
-     * 
+     *
      * @return List&lt;V&gt; array-reply specifically:
-     * 
+     *
      *         A multi bulk reply containing two elements:
-     * 
+     *
      *         unix time in seconds. microseconds.
      */
     Executions<List<V>> time();
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSetCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSetCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java
index 11f815be83..f903ce13ef 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSetCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java
@@ -13,31 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
 import java.util.List;
 import java.util.Set;
 
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
-import com.lambdaworks.redis.ValueScanCursor;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.ScanArgs;
+import io.lettuce.core.ScanCursor;
+import io.lettuce.core.StreamScanCursor;
+import io.lettuce.core.ValueScanCursor;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Synchronous executed commands on a node selection for Sets.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi
  */
 public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Add one or more members to a set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply the number of elements that were added to the set, not including all the elements already
@@ -47,7 +47,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Get the number of members in a set.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the cardinality (number of elements) of the set, or {@literal false} if {@code key} does not
      *         exist.
@@ -56,7 +56,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Subtract multiple sets.
-     * 
+     *
      * @param keys the key
      * @return Set&lt;V&gt; array-reply list with members of the resulting set.
      */
@@ -64,7 +64,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Subtract multiple sets.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -73,7 +73,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Subtract multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -82,7 +82,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Intersect multiple sets.
-     * 
+     *
      * @param keys the key
      * @return Set&lt;V&gt; array-reply list with members of the resulting set.
      */
@@ -90,7 +90,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Intersect multiple sets.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -99,7 +99,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Intersect multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -108,11 +108,11 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Determine if a given value is a member of a set.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the element is a member of the set. {@literal false} if the element is not a member of the
      *         set, or if {@code key} does not exist.
      */
@@ -120,12 +120,12 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Move a member from one set to another.
-     * 
+     *
      * @param source the source key
      * @param destination the destination type: key
      * @param member the member type: value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the element is moved. {@literal false} if the element is not a member of {@code source} and no
      *         operation was performed.
      */
@@ -133,7 +133,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Get all the members in a set.
-     * 
+     *
      * @param key the key
      * @return Set&lt;V&gt; array-reply all elements of the set.
      */
@@ -141,7 +141,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Get all the members in a set.
-     * 
+     *
      * @param channel the channel
      * @param key the keys
      * @return Long count of members of the resulting set.
@@ -150,7 +150,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Remove and return a random member from a set.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist.
      */
@@ -167,9 +167,9 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Get one random member from a set.
-     * 
+     *
      * @param key the key
-     * 
+     *
      * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply with the
      *         randomly selected element, or {@literal null} when {@code key} does not exist.
      */
@@ -177,7 +177,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Get one or multiple random members from a set.
-     * 
+     *
      * @param key the key
      * @param count the count type: long
      * @return Set&lt;V&gt; bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply
@@ -187,7 +187,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Get one or multiple random members from a set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param count the count
@@ -197,7 +197,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Remove one or more members from a set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply the number of members that were removed from the set, not including non existing members.
@@ -206,7 +206,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Add multiple sets.
-     * 
+     *
      * @param keys the key
      * @return Set&lt;V&gt; array-reply list with members of the resulting set.
      */
@@ -214,7 +214,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Add multiple sets.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -223,7 +223,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Add multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -232,7 +232,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @return ValueScanCursor&lt;V&gt; scan cursor.
      */
@@ -240,7 +240,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanArgs scan arguments
      * @return ValueScanCursor&lt;V&gt; scan cursor.
@@ -249,7 +249,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -259,7 +259,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return ValueScanCursor&lt;V&gt; scan cursor.
@@ -268,7 +268,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @return StreamScanCursor scan cursor.
@@ -277,7 +277,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanArgs scan arguments
@@ -287,7 +287,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -298,7 +298,7 @@ public interface NodeSelectionSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
similarity index 99%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
index 0e51823977..84d305d927 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionSortedSetCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
@@ -13,34 +13,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
 import java.util.List;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.ScoredValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Synchronous executed commands on a node selection for Sorted Sets.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi
  */
 public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param score the score
      * @param member the member
-     * 
+     *
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -48,11 +48,11 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param scoresAndValues the scoresAndValue tuples (score,value,score,value,...)
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -60,11 +60,11 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param scoredValues the scored values
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -100,12 +100,12 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the ke
      * @param zAddArgs arguments for zadd
      * @param scoredValues the scored values
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -137,7 +137,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Get the number of members in a sorted set.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the cardinality (number of elements) of the sorted set, or {@literal false} if {@code key}
      *         does not exist.
@@ -146,7 +146,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Count the members in a sorted set with scores within the given values.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -158,7 +158,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Count the members in a sorted set with scores within the given values.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -180,7 +180,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Increment the score of a member in a sorted set.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: long
      * @param member the member type: key
@@ -191,7 +191,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
-     * 
+     *
      * @param destination the destination
      * @param keys the keys
      * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
@@ -200,7 +200,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
-     * 
+     *
      * @param destination the destination
      * @param storeArgs the storeArgs
      * @param keys the keys
@@ -394,7 +394,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -407,7 +407,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -431,7 +431,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Stream over range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -446,7 +446,7 @@ public interface NodeSelectionSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java
index d10d413b16..7ec226380a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStringCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.BitFieldArgs;
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.SetArgs;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
+import io.lettuce.core.BitFieldArgs;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.SetArgs;
+import io.lettuce.core.output.KeyValueStreamingChannel;
 
 /**
  * Synchronous executed commands on a node selection for Strings.
@@ -30,7 +30,7 @@
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi
+ * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi
  */
 public interface NodeSelectionStringCommands<K, V> {
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
index f301435685..c3caf6d765 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisAdvancedClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
@@ -13,26 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.sync.RedisKeyCommands;
-import com.lambdaworks.redis.api.sync.RedisScriptingCommands;
-import com.lambdaworks.redis.api.sync.RedisServerCommands;
-import com.lambdaworks.redis.api.sync.RedisStringCommands;
-import com.lambdaworks.redis.cluster.ClusterClientOptions;
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.api.sync.RedisKeyCommands;
+import io.lettuce.core.api.sync.RedisScriptingCommands;
+import io.lettuce.core.api.sync.RedisServerCommands;
+import io.lettuce.core.api.sync.RedisStringCommands;
+import io.lettuce.core.cluster.ClusterClientOptions;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.output.KeyStreamingChannel;
 
 /**
  * Advanced synchronous and thread-safe Redis Cluster API.
- * 
+ *
  * @author Mark Paluch
  * @since 4.0
  */
@@ -41,7 +41,7 @@ public interface RedisAdvancedClusterCommands<K, V> extends RedisClusterCommands
     /**
      * Retrieve a connection to the specified cluster node using the nodeId. Host and port are looked up in the node list. In
      * contrast to the {@link RedisAdvancedClusterCommands}, node-connections do not route commands to other cluster nodes
-     * 
+     *
      * @param nodeId the node Id
      * @return a connection to the requested cluster node
      */
@@ -52,7 +52,7 @@ public interface RedisAdvancedClusterCommands<K, V> extends RedisClusterCommands
      * {@link RedisAdvancedClusterCommands}, node-connections do not route commands to other cluster nodes. Host and port
      * connections are verified by default for cluster membership, see
      * {@link ClusterClientOptions#isValidateClusterNodeMembership()}.
-     * 
+     *
      * @param host the host
      * @param port the port
      * @return a connection to the requested cluster node
@@ -159,7 +159,7 @@ default NodeSelection<K, V> all() {
     /**
      * Get the values of all the given keys with pipelining. Cross-slot keys will result in multiple calls to the particular
      * cluster nodes.
-     * 
+     *
      * @param keys the key
      * @return List&lt;V&gt; array-reply list of values at the specified keys.
      * @see RedisStringCommands#mget(Object[])
@@ -169,7 +169,7 @@ default NodeSelection<K, V> all() {
     /**
      * Set multiple keys to multiple values with pipelining. Cross-slot keys will result in multiple calls to the particular
      * cluster nodes.
-     * 
+     *
      * @param map the map
      * @return String simple-string-reply always {@code OK} since {@code MSET} can't fail.
      * @see RedisStringCommands#mset(Map)
@@ -179,10 +179,10 @@ default NodeSelection<K, V> all() {
     /**
      * Set multiple keys to multiple values, only if none of the keys exist with pipelining. Cross-slot keys will result in
      * multiple calls to the particular cluster nodes.
-     * 
+     *
      * @param map the null
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@code 1} if the all the keys were set. {@code 0} if no key was set (at least one key already existed).
      * @see RedisStringCommands#msetnx(Map)
      */
@@ -266,7 +266,7 @@ default NodeSelection<K, V> all() {
 
     /**
      * Synchronously save the dataset to disk and then shut down all nodes of the cluster.
-     * 
+     *
      * @param save {@literal true} force save operation
      * @see RedisServerCommands#shutdown(boolean)
      */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
index 4621f7d0d1..a5f9fdaa6f 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.api.sync.*;
+import io.lettuce.core.api.sync.*;
 
 /**
  * A complete synchronous and thread-safe Redis Cluster API with 400+ Methods.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -60,7 +60,7 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
     /**
      * Meet another cluster node to include the node into the cluster. The command starts the cluster handshake and returns with
      * {@literal OK} when the node was added to the cluster.
-     * 
+     *
      * @param ip IP address of the host
      * @param port port number.
      * @return String simple-string-reply
@@ -69,7 +69,7 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
 
     /**
      * Blacklist and remove the cluster node from the cluster.
-     * 
+     *
      * @param nodeId the node Id
      * @return String simple-string-reply
      */
@@ -77,7 +77,7 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
 
     /**
      * Adds slots to the cluster node. The current node will become the master for the specified slots.
-     * 
+     *
      * @param slots one or more slots from {@literal 0} to {@literal 16384}
      * @return String simple-string-reply
      */
@@ -85,7 +85,7 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
 
     /**
      * Removes slots from the cluster node.
-     * 
+     *
      * @param slots one or more slots from {@literal 0} to {@literal 16384}
      * @return String simple-string-reply
      */
@@ -94,7 +94,7 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
     /**
      * Assign a slot to a node. The command migrates the specified slot from the current node to the specified node in
      * {@code nodeId}
-     * 
+     *
      * @param slot the slot
      * @param nodeId the id of the node that will become the master for the slot
      * @return String simple-string-reply
@@ -112,7 +112,7 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
     /**
      * Flag a slot as {@literal MIGRATING} (outgoing) towards the node specified in {@code nodeId}. The slot must be handled by
      * the current node in order to be migrated.
-     * 
+     *
      * @param slot the slot
      * @param nodeId the id of the node is targeted to become the master for the slot
      * @return String simple-string-reply
@@ -121,7 +121,7 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
 
     /**
      * Flag a slot as {@literal IMPORTING} (incoming) from the node specified in {@code nodeId}.
-     * 
+     *
      * @param slot the slot
      * @param nodeId the id of the node is the master of the slot
      * @return String simple-string-reply
@@ -130,29 +130,29 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
 
     /**
      * Get information and statistics about the cluster viewed by the current node.
-     * 
+     *
      * @return String bulk-string-reply as a collection of text lines.
      */
     String clusterInfo();
 
     /**
      * Obtain the nodeId for the currently connected node.
-     * 
+     *
      * @return String simple-string-reply
      */
     String clusterMyId();
 
     /**
      * Obtain details about all cluster nodes. Can be parsed using
-     * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
-     * 
+     * {@link io.lettuce.core.cluster.models.partitions.ClusterPartitionParser#parse}
+     *
      * @return String bulk-string-reply as a collection of text lines
      */
     String clusterNodes();
 
     /**
      * List slaves for a certain node identified by its {@code nodeId}. Can be parsed using
-     * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
+     * {@link io.lettuce.core.cluster.models.partitions.ClusterPartitionParser#parse}
      *
      * @param nodeId node id of the master node
      * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as
@@ -162,7 +162,7 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
 
     /**
      * Retrieve the list of keys within the {@code slot}.
-     * 
+     *
      * @param slot the slot
      * @param count maximal number of keys
      * @return List&lt;K&gt; array-reply list of keys
@@ -190,7 +190,7 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
     /**
      * Returns an integer identifying the hash slot the specified key hashes to. This command is mainly useful for debugging and
      * testing, since it exposes via an API the underlying Redis implementation of the hashing algorithm. Basically the same as
-     * {@link com.lambdaworks.redis.cluster.SlotHash#getSlot(byte[])}. If not, call Houston and report that we've got a problem.
+     * {@link io.lettuce.core.cluster.SlotHash#getSlot(byte[])}. If not, call Houston and report that we've got a problem.
      *
      * @param key the key.
      * @return Integer reply: The hash slot number.
@@ -218,7 +218,7 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
 
     /**
      * Get array of cluster slots to node mappings.
-     * 
+     *
      * @return List&lt;Object&gt; array-reply nested list of slot ranges with IP/Port mappings.
      */
     List<Object> clusterSlots();
@@ -233,7 +233,7 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
 
     /**
      * Turn this node into a slave of the node with the id {@code nodeId}.
-     * 
+     *
      * @param nodeId master node id
      * @return String simple-string-reply
      */
@@ -241,7 +241,7 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
 
     /**
      * Failover a cluster node. Turns the currently connected node into a master and the master into its slave.
-     * 
+     *
      * @param force do not coordinate with master if {@literal true}
      * @return String simple-string-reply
      */
@@ -258,7 +258,7 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
      * <li>The new configuration is saved and the cluster state updated</li>
      * <li>If the node was a slave, the whole data set is flushed away</li>
      * </ul>
-     * 
+     *
      * @param hard {@literal true} for hard reset. Generates a new nodeId and currentEpoch/configEpoch are set to 0
      * @return String simple-string-reply
      */
@@ -266,7 +266,7 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
 
     /**
      * Delete all the slots associated with the specified node. The number of deleted slots is returned.
-     * 
+     *
      * @return String simple-string-reply
      */
     String clusterFlushslots();
@@ -274,14 +274,14 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
     /**
      * Tells a Redis cluster slave node that the client is ok reading possibly stale data and is not interested in running write
      * queries.
-     * 
+     *
      * @return String simple-string-reply
      */
     String readOnly();
 
     /**
      * Resets readOnly flag.
-     * 
+     *
      * @return String simple-string-reply
      */
     String readWrite();
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/package-info.java b/src/main/java/io/lettuce/core/cluster/api/sync/package-info.java
similarity index 57%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/package-info.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/package-info.java
index 8c779ca1f9..12e9559f96 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/package-info.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Cluster API for synchronous executed commands.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/event/ClusterTopologyChangedEvent.java b/src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/cluster/event/ClusterTopologyChangedEvent.java
rename to src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java
index 24adfab348..7b9eabd145 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/event/ClusterTopologyChangedEvent.java
+++ b/src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.event;
+package io.lettuce.core.cluster.event;
 
 import java.util.Collections;
 import java.util.List;
 
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.event.Event;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.event.Event;
 
 /**
  * Signals a discovered cluster topology change. The event carries the view {@link #before()} and {@link #after} the change.
- * 
+ *
  * @author Mark Paluch
  * @since 3.4
  */
@@ -34,7 +34,7 @@ public class ClusterTopologyChangedEvent implements Event {
 
     /**
      * Creates a new {@link ClusterTopologyChangedEvent}.
-     * 
+     *
      * @param before the cluster topology view before the topology changed, must not be {@literal null}
      * @param after the cluster topology view after the topology changed, must not be {@literal null}
      */
@@ -45,7 +45,7 @@ public ClusterTopologyChangedEvent(List<RedisClusterNode> before, List<RedisClus
 
     /**
      * Returns the cluster topology view before the topology changed.
-     * 
+     *
      * @return the cluster topology view before the topology changed.
      */
     public List<RedisClusterNode> before() {
@@ -54,7 +54,7 @@ public List<RedisClusterNode> before() {
 
     /**
      * Returns the cluster topology view after the topology changed.
-     * 
+     *
      * @return the cluster topology view after the topology changed.
      */
     public List<RedisClusterNode> after() {
diff --git a/src/main/java/io/lettuce/core/cluster/event/package-info.java b/src/main/java/io/lettuce/core/cluster/event/package-info.java
new file mode 100644
index 0000000000..1b6ed4555a
--- /dev/null
+++ b/src/main/java/io/lettuce/core/cluster/event/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Cluster event types.
+ */
+package io.lettuce.core.cluster.event;
+
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/ClusterPartitionParser.java b/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/cluster/models/partitions/ClusterPartitionParser.java
rename to src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
index a3ef6ea978..cbe853b9f2 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/ClusterPartitionParser.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.models.partitions;
+package io.lettuce.core.cluster.models.partitions;
 
 import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.LettuceStrings;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.internal.HostAndPort;
-import com.lambdaworks.redis.internal.LettuceLists;
+import io.lettuce.core.LettuceStrings;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.internal.HostAndPort;
+import io.lettuce.core.internal.LettuceLists;
 
 /**
  * Parser for node information output of {@code CLUSTER NODES} and {@code CLUSTER SLAVES}.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -65,7 +65,7 @@ private ClusterPartitionParser() {
 
     /**
      * Parse partition lines into Partitions object.
-     * 
+     *
      * @param nodes output of CLUSTER NODES
      * @return the partitions object.
      */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java
rename to src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
index d2a9a7be6e..41e5a03720 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/Partitions.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.models.partitions;
+package io.lettuce.core.cluster.models.partitions;
 
 import java.util.*;
 
-import com.lambdaworks.redis.cluster.SlotHash;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.cluster.SlotHash;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Cluster topology view. An instance of {@link Partitions} provides access to the partitions of a Redis Cluster. A partition is
@@ -33,8 +33,8 @@
  * Topology changes are:
  *
  * <ul>
- * <li>Changes in {@link com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode.NodeFlag#MASTER}/
- * {@link com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode.NodeFlag#SLAVE} state</li>
+ * <li>Changes in {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag#MASTER}/
+ * {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag#SLAVE} state</li>
  * <li>Newly added or removed nodes to/from the Redis Cluster</li>
  * <li>Changes in {@link RedisClusterNode#getSlots()} responsibility</li>
  * <li>Changes to the {@link RedisClusterNode#getSlaveOf() slave replication source} (the master of a slave)</li>
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNode.java b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNode.java
rename to src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
index e86037a1fe..6c670b0fa4 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNode.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
@@ -13,24 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.models.partitions;
+package io.lettuce.core.cluster.models.partitions;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceSets;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceSets;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
  * Representation of a Redis Cluster node. A {@link RedisClusterNode} is identified by its {@code nodeId}. A
  * {@link RedisClusterNode} can be a {@link #getRole() responsible master} for zero to
- * {@link com.lambdaworks.redis.cluster.SlotHash#SLOT_COUNT 16384} slots, a slave of one {@link #getSlaveOf() master} of carry
- * different {@link com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode.NodeFlag flags}.
- * 
+ * {@link io.lettuce.core.cluster.SlotHash#SLOT_COUNT 16384} slots, a slave of one {@link #getSlaveOf() master} of carry
+ * different {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag flags}.
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -79,7 +79,7 @@ public RedisClusterNode(RedisClusterNode redisClusterNode) {
 
     /**
      * Create a new instance of {@link RedisClusterNode} by passing the {@code nodeId}
-     * 
+     *
      * @param nodeId the nodeId
      * @return a new instance of {@link RedisClusterNode}
      */
@@ -95,7 +95,7 @@ public RedisURI getUri() {
 
     /**
      * Sets thhe connection point details. Usually the host/ip/port where a particular Redis Cluster node server is running.
-     * 
+     *
      * @param uri the {@link RedisURI}, must not be {@literal null}
      */
     public void setUri(RedisURI uri) {
@@ -109,7 +109,7 @@ public String getNodeId() {
 
     /**
      * Sets {@code nodeId}.
-     * 
+     *
      * @param nodeId the {@code nodeId}
      */
     public void setNodeId(String nodeId) {
@@ -124,7 +124,7 @@ public boolean isConnected() {
     /**
      * Sets the {@code connected} flag. The {@code connected} flag describes whether the node which provided details about the
      * node is connected to the particular {@link RedisClusterNode}.
-     * 
+     *
      * @param connected the {@code connected} flag
      */
     public void setConnected(boolean connected) {
@@ -137,7 +137,7 @@ public String getSlaveOf() {
 
     /**
      * Sets the replication source.
-     * 
+     *
      * @param slaveOf the replication source, can be {@literal null}
      */
     public void setSlaveOf(String slaveOf) {
@@ -150,7 +150,7 @@ public long getPingSentTimestamp() {
 
     /**
      * Sets the last {@code pingSentTimestamp}.
-     * 
+     *
      * @param pingSentTimestamp the last {@code pingSentTimestamp}
      */
     public void setPingSentTimestamp(long pingSentTimestamp) {
@@ -163,7 +163,7 @@ public long getPongReceivedTimestamp() {
 
     /**
      * Sets the last {@code pongReceivedTimestamp}.
-     * 
+     *
      * @param pongReceivedTimestamp the last {@code pongReceivedTimestamp}
      */
     public void setPongReceivedTimestamp(long pongReceivedTimestamp) {
@@ -176,7 +176,7 @@ public long getConfigEpoch() {
 
     /**
      * Sets the {@code configEpoch}.
-     * 
+     *
      * @param configEpoch the {@code configEpoch}
      */
     public void setConfigEpoch(long configEpoch) {
@@ -189,9 +189,9 @@ public List<Integer> getSlots() {
 
     /**
      * Sets the list of slots for which this {@link RedisClusterNode} is the
-     * {@link com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode.NodeFlag#MASTER}. The list is empty if this node
+     * {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag#MASTER}. The list is empty if this node
      * is not a master or the node is not responsible for any slots at all.
-     * 
+     *
      * @param slots list of slots, must not be {@literal null} but may be empty
      */
     public void setSlots(List<Integer> slots) {
@@ -205,8 +205,8 @@ public Set<NodeFlag> getFlags() {
     }
 
     /**
-     * Set of {@link com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode.NodeFlag node flags}.
-     * 
+     * Set of {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag node flags}.
+     *
      * @param flags the set of node flags.
      */
     public void setFlags(Set<NodeFlag> flags) {
@@ -257,7 +257,7 @@ public String toString() {
     }
 
     /**
-     * 
+     *
      * @param nodeFlag the node flag
      * @return true if the {@linkplain NodeFlag} is contained within the flags.
      */
@@ -266,7 +266,7 @@ public boolean is(NodeFlag nodeFlag) {
     }
 
     /**
-     * 
+     *
      * @param slot the slot hash
      * @return true if the slot is contained within the handled slots.
      */
@@ -275,9 +275,9 @@ public boolean hasSlot(int slot) {
     }
 
     /**
-     * Returns the {@link com.lambdaworks.redis.models.role.RedisInstance.Role} of the Redis Cluster node based on the
+     * Returns the {@link io.lettuce.core.models.role.RedisInstance.Role} of the Redis Cluster node based on the
      * {@link #getFlags() flags}.
-     * 
+     *
      * @return the Redis Cluster node role
      */
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/package-info.java b/src/main/java/io/lettuce/core/cluster/models/partitions/package-info.java
similarity index 62%
rename from src/main/java/com/lambdaworks/redis/cluster/models/partitions/package-info.java
rename to src/main/java/io/lettuce/core/cluster/models/partitions/package-info.java
index 761bc33538..46df050ab5 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/partitions/package-info.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Model and parser for the {@code CLUSTER NODES} and {@code CLUSTER SLAVES} output.
  */
-package com.lambdaworks.redis.cluster.models.partitions;
+package io.lettuce.core.cluster.models.partitions;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java
rename to src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java
index e09320e577..d55070aad4 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotRange.java
+++ b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.models.slots;
+package io.lettuce.core.cluster.models.slots;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -21,10 +21,10 @@
 import java.util.List;
 import java.util.Set;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.internal.HostAndPort;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.internal.HostAndPort;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Represents a range of slots together with its master and slaves.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParser.java b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParser.java
rename to src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
index 90ed428d3d..6bb63b2276 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParser.java
+++ b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.models.slots;
+package io.lettuce.core.cluster.models.slots;
 
 import java.util.*;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * Parser for redis <a href="http://redis.io/commands/cluster-slots">CLUSTER SLOTS</a> command output.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -37,8 +37,8 @@ private ClusterSlotsParser() {
 
     /**
      * Parse the output of the redis CLUSTER SLOTS command and convert it to a list of
-     * {@link com.lambdaworks.redis.cluster.models.slots.ClusterSlotRange}
-     * 
+     * {@link io.lettuce.core.cluster.models.slots.ClusterSlotRange}
+     *
      * @param clusterSlotsOutput output of CLUSTER SLOTS command
      * @return List&gt;ClusterSlotRange&gt;
      */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/models/slots/package-info.java b/src/main/java/io/lettuce/core/cluster/models/slots/package-info.java
similarity index 55%
rename from src/main/java/com/lambdaworks/redis/cluster/models/slots/package-info.java
rename to src/main/java/io/lettuce/core/cluster/models/slots/package-info.java
index 288791e2d9..005245a04b 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/models/slots/package-info.java
+++ b/src/main/java/io/lettuce/core/cluster/models/slots/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Model and parser for the {@code CLUSTER SLOTS} output.
  */
-package com.lambdaworks.redis.cluster.models.slots;
+package io.lettuce.core.cluster.models.slots;
diff --git a/src/main/java/io/lettuce/core/cluster/package-info.java b/src/main/java/io/lettuce/core/cluster/package-info.java
new file mode 100644
index 0000000000..26a38ed9b1
--- /dev/null
+++ b/src/main/java/io/lettuce/core/cluster/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Client for Redis Cluster, see {@link io.lettuce.core.cluster.RedisClusterClient}.
+ */
+package io.lettuce.core.cluster;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubAdapter.java b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubAdapter.java
rename to src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java
index 4b279848de..d7918989bd 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubAdapter.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.pubsub;
+package io.lettuce.core.cluster.pubsub;
 
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * Convenience adapter with an empty implementation of all {@link RedisClusterPubSubListener} callback methods.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubListener.java b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubListener.java
rename to src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java
index 5479c94717..e46f13a161 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/RedisClusterPubSubListener.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.pubsub;
+package io.lettuce.core.cluster.pubsub;
 
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * Interface for Redis Cluster Pub/Sub listeners.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -29,7 +29,7 @@ public interface RedisClusterPubSubListener<K, V> {
 
     /**
      * Message received from a channel subscription.
-     * 
+     *
      * @param node the {@link RedisClusterNode} where the {@literal message} originates.
      * @param channel Channel.
      * @param message Message.
@@ -57,7 +57,7 @@ public interface RedisClusterPubSubListener<K, V> {
 
     /**
      * Subscribed to a pattern.
-     * 
+     *
      * @param pattern Pattern.
      * @param count Subscription count.
      */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/StatefulRedisClusterPubSubConnection.java b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
rename to src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
index a0e9358256..39771cca8a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.pubsub;
+package io.lettuce.core.cluster.pubsub;
 
 import java.util.function.Predicate;
 
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.cluster.ClusterClientOptions;
-import com.lambdaworks.redis.cluster.api.sync.NodeSelection;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands;
-import com.lambdaworks.redis.cluster.pubsub.api.reactive.RedisClusterPubSubReactiveCommands;
-import com.lambdaworks.redis.cluster.pubsub.api.sync.RedisClusterPubSubCommands;
-import com.lambdaworks.redis.pubsub.RedisPubSubListener;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.cluster.ClusterClientOptions;
+import io.lettuce.core.cluster.api.sync.NodeSelection;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands;
+import io.lettuce.core.cluster.pubsub.api.reactive.RedisClusterPubSubReactiveCommands;
+import io.lettuce.core.cluster.pubsub.api.sync.RedisClusterPubSubCommands;
+import io.lettuce.core.pubsub.RedisPubSubListener;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 
 /**
  * A stateful Pub/Sub connection for Redis Cluster use. This connection type is intended for Pub/Sub messaging with Redis
@@ -101,7 +101,7 @@ public interface StatefulRedisClusterPubSubConnection<K, V> extends StatefulRedi
      * specified {@code nodeId} is no longer part of the cluster.
      *
      * Do not close the connections. Otherwise, unpredictable behavior will occur. The nodeId must be part of the cluster and is
-     * validated against the current topology view in {@link com.lambdaworks.redis.cluster.models.partitions.Partitions}.
+     * validated against the current topology view in {@link io.lettuce.core.cluster.models.partitions.Partitions}.
      *
      * @param nodeId the node Id
      * @return a connection to the requested cluster node
@@ -137,7 +137,7 @@ public interface StatefulRedisClusterPubSubConnection<K, V> extends StatefulRedi
      * connection facade. Registered {@link RedisPubSubListener} will receive messages from individual node subscriptions.
      * <p>
      * Node event propagation is disabled by default.
-     * 
+     *
      * @param enabled {@literal true} to enable node message propagation; {@literal false} (default) to disable message
      *        propagation.
      */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
index 10e367ae1b..7da4b188cc 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.pubsub.api.async;
+package io.lettuce.core.cluster.pubsub.api.async;
 
-import com.lambdaworks.redis.cluster.api.async.AsyncExecutions;
+import io.lettuce.core.cluster.api.async.AsyncExecutions;
 
 /**
  * Asynchronous executed commands on a node selection for Pub/Sub.
- * 
+ *
  * @author Mark Paluch
  * @since 4.4
  */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
similarity index 82%
rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
rename to src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
index 6cad1ae454..f183b4b98d 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.pubsub.api.async;
+package io.lettuce.core.cluster.pubsub.api.async;
 
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
-import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
 
 /**
  * Node selection with access to asynchronous executed commands on the set.
- * 
+ *
  * @author Mark Paluch
  * @since 4.4
  */
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
index 39d6826233..898635bf5a 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.pubsub.api.async;
+package io.lettuce.core.cluster.pubsub.api.async;
 
 import java.util.function.Predicate;
 
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection;
-import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection;
+import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
 
 /**
  * Asynchronous and thread-safe Redis Cluster PubSub API. Operations are executed either on the main connection or a
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
rename to src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
index 24dddfe903..196272241f 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.pubsub.api.reactive;
+package io.lettuce.core.cluster.pubsub.api.reactive;
 
-import com.lambdaworks.redis.cluster.api.reactive.ReactiveExecutions;
+import io.lettuce.core.cluster.api.reactive.ReactiveExecutions;
 
 /**
  * Reactive executed commands on a node selection for Pub/Sub.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
similarity index 77%
rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
rename to src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
index 1125a6abe9..4d9323f7bb 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.pubsub.api.reactive;
+package io.lettuce.core.cluster.pubsub.api.reactive;
 
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
-import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands;
-import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands;
+import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands;
 
 /**
  * Node selection with access to {@link RedisPubSubCommands}.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
rename to src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
index 0f15a30a31..e09ed28101 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.pubsub.api.reactive;
+package io.lettuce.core.cluster.pubsub.api.reactive;
 
 import java.util.function.Predicate;
 
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection;
-import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection;
+import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands;
 
 /**
  * Reactive and thread-safe Redis Cluster PubSub API. Operations are executed either on the main connection or a
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
rename to src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
index 87984dfdb1..73e6c2bcf4 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.pubsub.api.sync;
+package io.lettuce.core.cluster.pubsub.api.sync;
 
-import com.lambdaworks.redis.cluster.api.sync.Executions;
+import io.lettuce.core.cluster.api.sync.Executions;
 
 /**
  * Synchronous executed commands on a node selection for Pub/Sub.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/PubSubNodeSelection.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java
similarity index 82%
rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/PubSubNodeSelection.java
rename to src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java
index 4362952d4b..f7d00ede1d 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/PubSubNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.pubsub.api.sync;
+package io.lettuce.core.cluster.pubsub.api.sync;
 
-import com.lambdaworks.redis.cluster.api.NodeSelectionSupport;
-import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
+import io.lettuce.core.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands;
 
 /**
  * Node selection with access to {@link RedisPubSubCommands}.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
rename to src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
index 4bd2df92d3..e3145f62e0 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.pubsub.api.sync;
+package io.lettuce.core.cluster.pubsub.api.sync;
 
 import java.util.function.Predicate;
 
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection;
-import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection;
+import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands;
 
 /**
  * Synchronous and thread-safe Redis Cluster PubSub API. Operations are executed either on the main connection or a
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/AsyncConnections.java b/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/cluster/topology/AsyncConnections.java
rename to src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
index da15091ef1..df058f429d 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/AsyncConnections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -21,9 +21,9 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.RedisConnectionException;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
+import io.lettuce.core.RedisConnectionException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
rename to src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
index cf6628e738..a2c273a85e 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
 import java.net.SocketAddress;
 import java.util.*;
@@ -23,13 +23,13 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.resource.ClientResources;
-import com.lambdaworks.redis.resource.SocketAddressResolver;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.SocketAddressResolver;
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java
rename to src/main/java/io/lettuce/core/cluster/topology/Connections.java
index f23c045662..1fa0381294 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/Connections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
 import java.util.Map;
 import java.util.TreeMap;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandKeyword;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandKeyword;
+import io.lettuce.core.protocol.CommandType;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java
rename to src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java
index b425b97aeb..6720a65e11 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
 import java.net.SocketAddress;
 
-import com.lambdaworks.redis.ConnectionFuture;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.ConnectionFuture;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Factory interface to obtain {@link StatefulRedisConnection connections} to Redis cluster nodes.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyView.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyView.java
rename to src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
index 6fb1b51ceb..bbaf6a8855 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyView.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
 import java.util.concurrent.ExecutionException;
 
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViews.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViews.java
rename to src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
index 9a04065935..af686b0d0d 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViews.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 import java.util.*;
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/RedisClusterNodeSnapshot.java b/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/cluster/topology/RedisClusterNodeSnapshot.java
rename to src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java
index 694f1e5f09..a0493fc326 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/RedisClusterNodeSnapshot.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/RefreshFutures.java b/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/cluster/topology/RefreshFutures.java
rename to src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
index 57d03fdb59..8a6070d530 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/RefreshFutures.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
 import java.util.Collection;
 import java.util.concurrent.Future;
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java b/src/main/java/io/lettuce/core/cluster/topology/Requests.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java
rename to src/main/java/io/lettuce/core/cluster/topology/Requests.java
index bf3a555fe7..2104402d4f 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/Requests.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Requests.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.RedisURI;
+import io.lettuce.core.RedisURI;
 
 /**
  * Encapsulates asynchronously executed commands to multiple {@link RedisURI nodes}.
- * 
+ *
  * @author Mark Paluch
  */
 class Requests {
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/TimedAsyncCommand.java b/src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/cluster/topology/TimedAsyncCommand.java
rename to src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java
index 31900e54c9..206af6ecae 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/TimedAsyncCommand.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
-import com.lambdaworks.redis.protocol.AsyncCommand;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.protocol.RedisCommand;
 
 import io.netty.buffer.ByteBuf;
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/TopologyComparators.java b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/cluster/topology/TopologyComparators.java
rename to src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
index 5eca01d168..54e1b5c2fc 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/TopologyComparators.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceLists;
-import com.lambdaworks.redis.internal.LettuceSets;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceLists;
+import io.lettuce.core.internal.LettuceSets;
 
 /**
  * Comparators for {@link RedisClusterNode} and {@link RedisURI}.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/topology/package-info.java b/src/main/java/io/lettuce/core/cluster/topology/package-info.java
similarity index 51%
rename from src/main/java/com/lambdaworks/redis/cluster/topology/package-info.java
rename to src/main/java/io/lettuce/core/cluster/topology/package-info.java
index 9dcaa601a2..c83ce64b7e 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/topology/package-info.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/package-info.java
@@ -1,5 +1,5 @@
 /**
  * Support for cluster topology refresh.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
diff --git a/src/main/java/com/lambdaworks/codec/Base16.java b/src/main/java/io/lettuce/core/codec/Base16.java
similarity index 94%
rename from src/main/java/com/lambdaworks/codec/Base16.java
rename to src/main/java/io/lettuce/core/codec/Base16.java
index 39dce556d3..2647ae11ee 100644
--- a/src/main/java/com/lambdaworks/codec/Base16.java
+++ b/src/main/java/io/lettuce/core/codec/Base16.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.codec;
+package io.lettuce.core.codec;
 
 /**
  * High-performance base16 (AKA hex) codec.
- * 
+ *
  * @author Will Glozer
  */
 public class Base16 {
@@ -42,10 +42,10 @@ private Base16() {
 
     /**
      * Encode bytes to base16 chars.
-     * 
+     *
      * @param src Bytes to encode.
      * @param upper Use upper or lowercase chars.
-     * 
+     *
      * @return Encoded chars.
      */
     public static char[] encode(byte[] src, boolean upper) {
diff --git a/src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java b/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java
rename to src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
index ace3afaf87..e117a5f866 100644
--- a/src/main/java/com/lambdaworks/redis/codec/ByteArrayCodec.java
+++ b/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.codec;
+package io.lettuce.core.codec;
 
 import java.nio.ByteBuffer;
 
@@ -21,7 +21,7 @@
 
 /**
  * A {@link RedisCodec} that uses plain byte arrays without further transformations.
- * 
+ *
  * @author Mark Paluch
  * @since 3.3
  */
diff --git a/src/main/java/com/lambdaworks/redis/codec/ByteBufferInputStream.java b/src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/codec/ByteBufferInputStream.java
rename to src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java
index 9575f0af21..610a03ca8f 100644
--- a/src/main/java/com/lambdaworks/redis/codec/ByteBufferInputStream.java
+++ b/src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.codec;
+package io.lettuce.core.codec;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/com/lambdaworks/codec/CRC16.java b/src/main/java/io/lettuce/core/codec/CRC16.java
similarity index 97%
rename from src/main/java/com/lambdaworks/codec/CRC16.java
rename to src/main/java/io/lettuce/core/codec/CRC16.java
index 219105a5f5..2ca8471002 100644
--- a/src/main/java/com/lambdaworks/codec/CRC16.java
+++ b/src/main/java/io/lettuce/core/codec/CRC16.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.codec;
+package io.lettuce.core.codec;
 
 /**
  * @author Mark Paluch
@@ -59,7 +59,7 @@ private CRC16() {
 
     /**
      * Create a CRC16 checksum from the bytes.
-     * 
+     *
      * @param bytes input bytes
      * @return CRC16 as interger value
      */
diff --git a/src/main/java/com/lambdaworks/redis/codec/CompressionCodec.java b/src/main/java/io/lettuce/core/codec/CompressionCodec.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/codec/CompressionCodec.java
rename to src/main/java/io/lettuce/core/codec/CompressionCodec.java
index c710f0efc1..70e5ce6f18 100644
--- a/src/main/java/com/lambdaworks/redis/codec/CompressionCodec.java
+++ b/src/main/java/io/lettuce/core/codec/CompressionCodec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.codec;
+package io.lettuce.core.codec;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -25,19 +25,19 @@
 import java.util.zip.GZIPOutputStream;
 import java.util.zip.InflaterInputStream;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * A compressing/decompressing {@link RedisCodec} that wraps a typed {@link RedisCodec codec} and compresses values using GZIP
- * or Deflate. See {@link com.lambdaworks.redis.codec.CompressionCodec.CompressionType} for supported compression types.
- * 
+ * or Deflate. See {@link io.lettuce.core.codec.CompressionCodec.CompressionType} for supported compression types.
+ *
  * @author Mark Paluch
  */
 public class CompressionCodec {
 
     /**
      * A {@link RedisCodec} that compresses values from a delegating {@link RedisCodec}.
-     * 
+     *
      * @param delegate codec used for key-value encoding/decoding, must not be {@literal null}.
      * @param compressionType the compression type, must not be {@literal null}.
      * @param <K> Key type.
diff --git a/src/main/java/com/lambdaworks/redis/codec/RedisCodec.java b/src/main/java/io/lettuce/core/codec/RedisCodec.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/codec/RedisCodec.java
rename to src/main/java/io/lettuce/core/codec/RedisCodec.java
index 1bbde04db4..6e0a53849c 100644
--- a/src/main/java/com/lambdaworks/redis/codec/RedisCodec.java
+++ b/src/main/java/io/lettuce/core/codec/RedisCodec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.codec;
+package io.lettuce.core.codec;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/com/lambdaworks/redis/codec/StringCodec.java b/src/main/java/io/lettuce/core/codec/StringCodec.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/codec/StringCodec.java
rename to src/main/java/io/lettuce/core/codec/StringCodec.java
index 168ffd2ca2..36d415159a 100644
--- a/src/main/java/com/lambdaworks/redis/codec/StringCodec.java
+++ b/src/main/java/io/lettuce/core/codec/StringCodec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.codec;
+package io.lettuce.core.codec;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
@@ -22,8 +22,8 @@
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CoderResult;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.LettuceCharsets;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.LettuceCharsets;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
@@ -58,7 +58,7 @@ public StringCodec() {
 
     /**
      * Creates a new {@link StringCodec} for the given {@link Charset} that encodes and decodes keys and values.
-     * 
+     *
      * @param charset must not be {@literal null}.
      */
     public StringCodec(Charset charset) {
@@ -157,7 +157,7 @@ public ByteBuffer encodeValue(String value) {
 
     /**
      * Compatibility implementation.
-     * 
+     *
      * @param key
      * @return
      */
diff --git a/src/main/java/com/lambdaworks/redis/codec/ToByteBufEncoder.java b/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/codec/ToByteBufEncoder.java
rename to src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java
index a25c322813..dbc52acaf3 100644
--- a/src/main/java/com/lambdaworks/redis/codec/ToByteBufEncoder.java
+++ b/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.codec;
+package io.lettuce.core.codec;
 
 import io.netty.buffer.ByteBuf;
 
@@ -25,7 +25,7 @@
  * the {@link RedisCodec#encodeKey(Object)} and {@link RedisCodec#encodeValue(Object)} methods to ensure compatibility for users
  * that access the {@link RedisCodec} API only.
  * </p>
- * 
+ *
  * @author Mark Paluch
  * @since 4.3
  */
diff --git a/src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java b/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java
rename to src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
index 5996608824..5c128c005c 100644
--- a/src/main/java/com/lambdaworks/redis/codec/Utf8StringCodec.java
+++ b/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.codec;
+package io.lettuce.core.codec;
 
-import com.lambdaworks.redis.protocol.LettuceCharsets;
+import io.lettuce.core.protocol.LettuceCharsets;
 
 /**
  * A {@link RedisCodec} that handles UTF-8 encoded keys and values.
- * 
+ *
  * @author Will Glozer
  * @author Mark Paluch
  * @see StringCodec
diff --git a/src/main/java/com/lambdaworks/redis/codec/package-info.java b/src/main/java/io/lettuce/core/codec/package-info.java
similarity index 56%
rename from src/main/java/com/lambdaworks/redis/codec/package-info.java
rename to src/main/java/io/lettuce/core/codec/package-info.java
index 82dcb30d79..62a717318d 100644
--- a/src/main/java/com/lambdaworks/redis/codec/package-info.java
+++ b/src/main/java/io/lettuce/core/codec/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Codecs for key/value type conversion.
  */
-package com.lambdaworks.redis.codec;
+package io.lettuce.core.codec;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
similarity index 88%
rename from src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommand.java
rename to src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
index a1e4df4bea..c5acd2c92b 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.LettuceFutures;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.dynamic.domain.Timeout;
-import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
-import com.lambdaworks.redis.protocol.AsyncCommand;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.LettuceFutures;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.dynamic.domain.Timeout;
+import io.lettuce.core.dynamic.parameter.ExecutionSpecificParameters;
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * An {@link ExecutableCommand} that is executed asynchronously or synchronously.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java
similarity index 86%
rename from src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommandLookupStrategy.java
rename to src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java
index a1080c5a2a..b28f0d7a5f 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/AsyncExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.List;
 
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
similarity index 87%
rename from src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommand.java
rename to src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
index 7b42047a6f..51d624d7a2 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
@@ -13,25 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.LettuceFutures;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.dynamic.batch.BatchException;
-import com.lambdaworks.redis.dynamic.batch.CommandBatching;
-import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
-import com.lambdaworks.redis.protocol.AsyncCommand;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.LettuceFutures;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.dynamic.batch.BatchException;
+import io.lettuce.core.dynamic.batch.CommandBatching;
+import io.lettuce.core.dynamic.parameter.ExecutionSpecificParameters;
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * Executable command that uses a {@link Batcher} for command execution.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategy.java
rename to src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java
index b058c3112c..3f931a35a5 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -21,12 +21,12 @@
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.dynamic.batch.BatchExecutor;
-import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
-import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.dynamic.batch.BatchExecutor;
+import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver;
+import io.lettuce.core.dynamic.parameter.ExecutionSpecificParameters;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/BatchTasks.java b/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/dynamic/BatchTasks.java
rename to src/main/java/io/lettuce/core/dynamic/BatchTasks.java
index b5feb7cb39..b2b7790a0a 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/BatchTasks.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * Result of a batching request. Contains references to the batched {@link RedisCommand}s.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/Batcher.java b/src/main/java/io/lettuce/core/dynamic/Batcher.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/dynamic/Batcher.java
rename to src/main/java/io/lettuce/core/dynamic/Batcher.java
index 29abaae6eb..1c162c46f3 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/Batcher.java
+++ b/src/main/java/io/lettuce/core/dynamic/Batcher.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
-import com.lambdaworks.redis.dynamic.batch.CommandBatching;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.dynamic.batch.CommandBatching;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * Command batcher to enqueue commands and flush a batch once a flush is requested or a configured command threshold is reached.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  * @see SimpleBatcher
@@ -36,7 +36,7 @@ public interface Batcher {
 
     /**
      * Add command to the {@link Batcher}.
-     * 
+     *
      * @param command the command to batch.
      * @param batching invocation-specific {@link CommandBatching} control. May be {@literal null} to use default batching
      *        settings.
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java
rename to src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java
index c78397cbd4..79d9e8899e 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CodecAwareMethodParametersAccessor.java
+++ b/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.Iterator;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
-import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
-import com.lambdaworks.redis.dynamic.support.TypeInformation;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.dynamic.parameter.MethodParametersAccessor;
+import io.lettuce.core.dynamic.support.ClassTypeInformation;
+import io.lettuce.core.dynamic.support.TypeInformation;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Codec-aware {@link MethodParametersAccessor}. Identifies key and value types by checking value compatibility with
  * {@link RedisCodec} types.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java b/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java
rename to src/main/java/io/lettuce/core/dynamic/CommandCreationException.java
index a0ccf78cae..b04affc79b 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandCreationException.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
-import com.lambdaworks.redis.RedisException;
+import io.lettuce.core.RedisException;
 
 /**
  * Exception thrown if a command cannot be constructed from a {@link CommandMethod}.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -29,7 +29,7 @@ public class CommandCreationException extends RedisException {
 
     /**
      * Create a new {@link CommandCreationException} given {@link CommandMethod} and a message.
-     * 
+     *
      * @param commandMethod must not be {@literal null}.
      * @param msg must not be {@literal null}.
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java b/src/main/java/io/lettuce/core/dynamic/CommandFactory.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java
rename to src/main/java/io/lettuce/core/dynamic/CommandFactory.java
index 7d89ac45d8..cfdb685212 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandFactory.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * Strategy interface to create {@link RedisCommand}s.
@@ -29,7 +29,7 @@ interface CommandFactory {
 
     /**
      * Create a new {@link RedisCommand} given {@code parameters}.
-     * 
+     *
      * @param parameters must not be {@literal null}.
      * @return the {@link RedisCommand}.
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/dynamic/CommandFactoryResolver.java
rename to src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java
index c97e3bbf56..df254b859f 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 /**
  * Strategy interface to resolve a {@link CommandFactory}.
- * 
+ *
  * @since 5.0
  */
 interface CommandFactoryResolver {
 
     /**
      * Resolve a {@link CommandFactory} given a{@link DeclaredCommandMethod} and {@link RedisCommandsMetadata}.
-     * 
+     *
      * @param method must not be {@literal null}.
      * @param redisCommandsMetadata must not be {@literal null}.
      * @return the {@link CommandFactory}.
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java b/src/main/java/io/lettuce/core/dynamic/CommandMethod.java
similarity index 77%
rename from src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
rename to src/main/java/io/lettuce/core/dynamic/CommandMethod.java
index 914ef05765..c16c0b2092 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethod.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandMethod.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.concurrent.Future;
 
-import com.lambdaworks.redis.dynamic.parameter.Parameter;
-import com.lambdaworks.redis.dynamic.parameter.Parameters;
-import com.lambdaworks.redis.dynamic.support.ResolvableType;
+import io.lettuce.core.dynamic.parameter.Parameter;
+import io.lettuce.core.dynamic.parameter.Parameters;
+import io.lettuce.core.dynamic.support.ResolvableType;
 
 /**
  * Abstraction of a method that is designated to execute a Redis command method. Enriches the standard {@link Method} interface
- * with specific information that is necessary to construct {@link com.lambdaworks.redis.protocol.RedisCommand} for the method.
- * 
+ * with specific information that is necessary to construct {@link io.lettuce.core.protocol.RedisCommand} for the method.
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -43,18 +43,18 @@ public interface CommandMethod {
     Method getMethod();
 
     /**
-     * @return declared {@link Method} return {@link com.lambdaworks.redis.dynamic.support.TypeInformation}.
+     * @return declared {@link Method} return {@link io.lettuce.core.dynamic.support.TypeInformation}.
      */
     ResolvableType getReturnType();
 
     /**
-     * @return the actual {@link Method} return {@link com.lambdaworks.redis.dynamic.support.TypeInformation} after unwrapping.
+     * @return the actual {@link Method} return {@link io.lettuce.core.dynamic.support.TypeInformation} after unwrapping.
      */
     ResolvableType getActualReturnType();
 
     /**
      * Lookup a method annotation.
-     * 
+     *
      * @param annotationClass the annotation class.
      * @return the annotation object or {@literal null} if not found.
      */
@@ -83,7 +83,7 @@ public interface CommandMethod {
     boolean isReactiveExecution();
 
     /**
-     * @return {@literal true} if the method defines a {@link com.lambdaworks.redis.dynamic.batch.CommandBatching} argument.
+     * @return {@literal true} if the method defines a {@link io.lettuce.core.dynamic.batch.CommandBatching} argument.
      */
     boolean isBatchExecution();
 }
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java b/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java
rename to src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java
index 6125f75f81..3be70bec07 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodSyntaxException.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 /**
  * Exception thrown if the command syntax is invalid.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -25,7 +25,7 @@ public class CommandMethodSyntaxException extends CommandCreationException {
 
     /**
      * Create a new {@link CommandMethodSyntaxException} given {@link CommandMethod} and a message.
-     * 
+     *
      * @param commandMethod must not be {@literal null}.
      * @param msg must not be {@literal null}.
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java b/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
rename to src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java
index f820454b21..4c6d73cf17 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandMethodVerifier.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
-import com.lambdaworks.redis.dynamic.segment.CommandSegments;
+import io.lettuce.core.dynamic.segment.CommandSegments;
 
 /**
  * Verifies {@link CommandMethod} declarations by checking available Redis commands.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -34,7 +34,7 @@ interface CommandMethodVerifier {
     /**
      * Verify a {@link CommandMethod} with its {@link CommandSegments}. This method verifies that the command exists and that
      * the required number of arguments is declared.
-     * 
+     *
      * @param commandSegments must not be {@literal null}.
      * @param commandMethod must not be {@literal null}.
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java
similarity index 79%
rename from src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
rename to src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java
index 3e05505e5b..382640ce89 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
-
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.dynamic.CodecAwareMethodParametersAccessor.TypeContext;
-import com.lambdaworks.redis.dynamic.output.CommandOutputFactory;
-import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
-import com.lambdaworks.redis.dynamic.output.OutputSelector;
-import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
-import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
-import com.lambdaworks.redis.dynamic.segment.CommandSegments;
-import com.lambdaworks.redis.output.CommandOutput;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.RedisCommand;
+package io.lettuce.core.dynamic;
+
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.dynamic.CodecAwareMethodParametersAccessor.TypeContext;
+import io.lettuce.core.dynamic.output.CommandOutputFactory;
+import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver;
+import io.lettuce.core.dynamic.output.OutputSelector;
+import io.lettuce.core.dynamic.parameter.ExecutionSpecificParameters;
+import io.lettuce.core.dynamic.parameter.MethodParametersAccessor;
+import io.lettuce.core.dynamic.segment.CommandSegments;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * {@link CommandFactory} based on {@link CommandSegments}.
@@ -91,7 +91,7 @@ public RedisCommand<Object, Object, Object> createCommand(Object[] parameters) {
         CommandArgs<Object, Object> args = new CommandArgs<>(redisCodec);
 
         CommandOutput<Object, Object, ?> output = outputFactory.create(redisCodec);
-        Command<Object, Object, ?> command = new com.lambdaworks.redis.protocol.Command<>(this.segments.getCommandType(),
+        Command<Object, Object, ?> command = new io.lettuce.core.protocol.Command<>(this.segments.getCommandType(),
                 output, args);
 
         parameterBinder.bind(args, redisCodec, segments, parametersAccessor);
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/Commands.java b/src/main/java/io/lettuce/core/dynamic/Commands.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/dynamic/Commands.java
rename to src/main/java/io/lettuce/core/dynamic/Commands.java
index 69548b7262..ae4cc0f6e0 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/Commands.java
+++ b/src/main/java/io/lettuce/core/dynamic/Commands.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 /**
  * Marker interface for dynamic Redis commands. Typically used by Redis Command Interfaces as extension point to discover
  * interface declarations.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ConversionService.java b/src/main/java/io/lettuce/core/dynamic/ConversionService.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/dynamic/ConversionService.java
rename to src/main/java/io/lettuce/core/dynamic/ConversionService.java
index efff7cdb02..9d86c905dd 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ConversionService.java
+++ b/src/main/java/io/lettuce/core/dynamic/ConversionService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.HashMap;
 import java.util.List;
@@ -21,9 +21,9 @@
 import java.util.Optional;
 import java.util.function.Function;
 
-import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
-import com.lambdaworks.redis.dynamic.support.TypeInformation;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.dynamic.support.ClassTypeInformation;
+import io.lettuce.core.dynamic.support.TypeInformation;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * @author Mark Paluch
@@ -34,7 +34,7 @@ class ConversionService {
 
     /**
      * Register a converter {@link Function}.
-     * 
+     *
      * @param converter the converter.
      */
     public void addConverter(Function<?, ?> converter) {
@@ -93,7 +93,7 @@ final class ConvertiblePair {
 
         /**
          * Create a new source-to-target pair.
-         * 
+         *
          * @param sourceType the source type
          * @param targetType the target type
          */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ConvertingCommand.java b/src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/dynamic/ConvertingCommand.java
rename to src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java
index 4f71bc8deb..68e770243d 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ConvertingCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.concurrent.ExecutionException;
 
 /**
  * A {@link ExecutableCommand} that uses {@link ConversionService} to convert the result of a decorated
  * {@link ExecutableCommand}.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethod.java b/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethod.java
rename to src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java
index 6d20679bd7..9ca880f50a 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethod.java
+++ b/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -24,18 +24,18 @@
 
 import org.reactivestreams.Publisher;
 
-import com.lambdaworks.redis.dynamic.batch.BatchExecutor;
-import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
-import com.lambdaworks.redis.dynamic.parameter.Parameter;
-import com.lambdaworks.redis.dynamic.parameter.Parameters;
-import com.lambdaworks.redis.dynamic.support.ResolvableType;
-import com.lambdaworks.redis.dynamic.support.TypeInformation;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.dynamic.batch.BatchExecutor;
+import io.lettuce.core.dynamic.parameter.ExecutionSpecificParameters;
+import io.lettuce.core.dynamic.parameter.Parameter;
+import io.lettuce.core.dynamic.parameter.Parameters;
+import io.lettuce.core.dynamic.support.ResolvableType;
+import io.lettuce.core.dynamic.support.TypeInformation;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Abstraction of a method that is designated to execute a Redis command method. Enriches the standard {@link Method} interface
- * with specific information that is necessary to construct {@link com.lambdaworks.redis.protocol.RedisCommand} for the method.
- * 
+ * with specific information that is necessary to construct {@link io.lettuce.core.protocol.RedisCommand} for the method.
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -51,7 +51,7 @@ public class DeclaredCommandMethod implements CommandMethod {
 
     /**
      * Create a new {@link DeclaredCommandMethod} given a {@link Method}.
-     * 
+     *
      * @param method must not be null.
      */
     private DeclaredCommandMethod(Method method) {
@@ -60,7 +60,7 @@ private DeclaredCommandMethod(Method method) {
 
     /**
      * Create a new {@link DeclaredCommandMethod} given a {@link Method} and {@link Parameters}.
-     * 
+     *
      * @param method must not be null.
      * @param parameters must not be null.
      */
@@ -95,7 +95,7 @@ private DeclaredCommandMethod(Method method, ExecutionSpecificParameters paramet
 
     /**
      * Create a new {@link DeclaredCommandMethod} given a {@link Method}.
-     * 
+     *
      * @param method must not be null.
      */
     public static CommandMethod create(Method method) {
@@ -136,7 +136,7 @@ public ResolvableType getActualReturnType() {
 
     /**
      * Lookup a method annotation.
-     * 
+     *
      * @param annotationClass the annotation class.
      * @return the annotation object or {@literal null} if not found.
      */
@@ -179,7 +179,7 @@ public boolean isReactiveExecution() {
     }
 
     /**
-     * @return {@literal true} if the method defines a {@link com.lambdaworks.redis.dynamic.batch.CommandBatching} argument.
+     * @return {@literal true} if the method defines a {@link io.lettuce.core.dynamic.batch.CommandBatching} argument.
      */
     @Override
     public boolean isBatchExecution() {
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifier.java b/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifier.java
rename to src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java
index c37a5102ba..87f85317ba 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifier.java
+++ b/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.dynamic.parameter.Parameter;
-import com.lambdaworks.redis.dynamic.segment.CommandSegments;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceLists;
-import com.lambdaworks.redis.models.command.CommandDetail;
+import io.lettuce.core.*;
+import io.lettuce.core.dynamic.parameter.Parameter;
+import io.lettuce.core.dynamic.segment.CommandSegments;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceLists;
+import io.lettuce.core.models.command.CommandDetail;
 
 /**
  * Verifies {@link CommandMethod} declarations by checking available Redis commands.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -57,7 +57,7 @@ public DefaultCommandMethodVerifier(List<CommandDetail> commandDetails) {
     /**
      * Verify a {@link CommandMethod} with its {@link CommandSegments}. This method verifies that the command exists and that
      * the required number of arguments is declared.
-     * 
+     *
      * @param commandSegments
      * @param commandMethod
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java
rename to src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
index b96b7a6585..61392d65ab 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/DefaultMethodParametersAccessor.java
+++ b/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.dynamic.annotation.Key;
-import com.lambdaworks.redis.dynamic.annotation.Value;
-import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
-import com.lambdaworks.redis.dynamic.parameter.Parameter;
-import com.lambdaworks.redis.dynamic.parameter.Parameters;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.*;
+import io.lettuce.core.dynamic.annotation.Key;
+import io.lettuce.core.dynamic.annotation.Value;
+import io.lettuce.core.dynamic.parameter.MethodParametersAccessor;
+import io.lettuce.core.dynamic.parameter.Parameter;
+import io.lettuce.core.dynamic.parameter.Parameters;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Default {@link MethodParametersAccessor} implementation.
@@ -94,7 +94,7 @@ public boolean isBindableNullValue(int index) {
 
         Parameter bindableParameter = parameters.getBindableParameter(index);
 
-        if (bindableParameter.isAssignableTo(Limit.class) || bindableParameter.isAssignableTo(com.lambdaworks.redis.Value.class)
+        if (bindableParameter.isAssignableTo(Limit.class) || bindableParameter.isAssignableTo(io.lettuce.core.Value.class)
                 || bindableParameter.isAssignableTo(KeyValue.class) || bindableParameter.isAssignableTo(ScoredValue.class)
                 || bindableParameter.isAssignableTo(GeoCoordinates.class) || bindableParameter.isAssignableTo(Range.class)) {
             return false;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java b/src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java
rename to src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java
index 9f63f4943d..1c7dbd6eb0 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/DefaultRedisCommandsMetadata.java
+++ b/src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -23,11 +23,11 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Default implementation of {@link RedisCommandsMetadata}.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -40,7 +40,7 @@ class DefaultRedisCommandsMetadata implements RedisCommandsMetadata {
 
     /**
      * Create {@link DefaultRedisCommandsMetadata} given a {@link Class command interface}.
-     * 
+     *
      * @param apiInterface must not be {@literal null}.
      */
     DefaultRedisCommandsMetadata(Class<?> apiInterface) {
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommand.java
rename to src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java
index d209d5d18f..113053941e 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.concurrent.ExecutionException;
 
 /**
  * An executable command that can be executed calling {@link #execute(Object[])}.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -27,7 +27,7 @@ interface ExecutableCommand {
 
     /**
      * Executes the {@link ExecutableCommand} with the given parameters.
-     * 
+     *
      * @param parameters
      * @return
      */
@@ -35,7 +35,7 @@ interface ExecutableCommand {
 
     /**
      * Returns the {@link CommandMethod}.
-     * 
+     *
      * @return
      */
     CommandMethod getCommandMethod();
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategy.java
rename to src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java
index 5c9a12bc41..068b9e22b6 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.lang.reflect.Method;
 
 /**
  * Strategy interface to resolve {@link ExecutableCommand} from a {@link Method} and {@link RedisCommandsMetadata}.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -27,7 +27,7 @@ interface ExecutableCommandLookupStrategy {
 
     /**
      * Resolve a {@link ExecutableCommand} given the {@link Method} and {@link RedisCommandsMetadata}.
-     * 
+     *
      * @param method must not be {@literal null}.
      * @param metadata must not be {@literal null}.
      * @return the {@link ExecutableCommand}.
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategySupport.java b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java
similarity index 86%
rename from src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategySupport.java
rename to src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java
index 6c7d961561..9f1236801b 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ExecutableCommandLookupStrategySupport.java
+++ b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.List;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.dynamic.codec.AnnotationRedisCodecResolver;
-import com.lambdaworks.redis.dynamic.output.CodecAwareOutputFactoryResolver;
-import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
-import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory;
-import com.lambdaworks.redis.dynamic.segment.CommandSegments;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.dynamic.codec.AnnotationRedisCodecResolver;
+import io.lettuce.core.dynamic.output.CodecAwareOutputFactoryResolver;
+import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver;
+import io.lettuce.core.dynamic.segment.AnnotationCommandSegmentFactory;
+import io.lettuce.core.dynamic.segment.CommandSegments;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java b/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
rename to src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
index 4ef062f468..f15f2719c8 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ParameterBinder.java
+++ b/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
-import static com.lambdaworks.redis.protocol.CommandKeyword.LIMIT;
+import static io.lettuce.core.protocol.CommandKeyword.LIMIT;
 
 import java.lang.reflect.Array;
 import java.nio.ByteBuffer;
 import java.util.*;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
-import com.lambdaworks.redis.dynamic.segment.CommandSegment;
-import com.lambdaworks.redis.dynamic.segment.CommandSegments;
-import com.lambdaworks.redis.dynamic.segment.CommandSegment.ArgumentContribution;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
+import io.lettuce.core.*;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.dynamic.parameter.MethodParametersAccessor;
+import io.lettuce.core.dynamic.segment.CommandSegment;
+import io.lettuce.core.dynamic.segment.CommandSegments;
+import io.lettuce.core.dynamic.segment.CommandSegment.ArgumentContribution;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
  * Parameter binder for {@link CommandSegments}-based Redis Commands.
@@ -43,7 +43,7 @@ class ParameterBinder {
 
     /**
      * Bind {@link CommandSegments} and method parameters to {@link CommandArgs}.
-     * 
+     *
      * @param args the command arguments.
      * @param codec the codec.
      * @param commandSegments the command segments.
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java
similarity index 79%
rename from src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java
rename to src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java
index 8b2390b637..74551ae5f5 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.dynamic.output.CommandOutputFactory;
-import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
-import com.lambdaworks.redis.dynamic.output.OutputSelector;
-import com.lambdaworks.redis.dynamic.parameter.ExecutionSpecificParameters;
-import com.lambdaworks.redis.dynamic.segment.CommandSegments;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.dynamic.output.CommandOutputFactory;
+import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver;
+import io.lettuce.core.dynamic.output.OutputSelector;
+import io.lettuce.core.dynamic.parameter.ExecutionSpecificParameters;
+import io.lettuce.core.dynamic.segment.CommandSegments;
 
 /**
  * {@link CommandSegmentCommandFactory} for Reactive Command execution.
- * 
+ *
  * @author Mark Paluch
  */
 class ReactiveCommandSegmentCommandFactory extends CommandSegmentCommandFactory {
@@ -60,7 +60,7 @@ protected CommandOutputFactory resolveCommandOutputFactory(OutputSelector output
     }
 
     /**
-     * @return {@literal true} if the resolved {@link com.lambdaworks.redis.output.CommandOutput} should use streaming.
+     * @return {@literal true} if the resolved {@link io.lettuce.core.output.CommandOutput} should use streaming.
      */
     public boolean isStreamingExecution() {
         return streamingExecution;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommand.java
rename to src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java
index 079316e3f6..c537447512 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
-import com.lambdaworks.redis.AbstractRedisReactiveCommands;
+import io.lettuce.core.AbstractRedisReactiveCommands;
 
 /**
  * An {@link ExecutableCommand} that is executed using reactive infrastructure.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java
similarity index 87%
rename from src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommandLookupStrategy.java
rename to src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java
index f3d43d2ab0..adfed751db 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.List;
 
-import com.lambdaworks.redis.AbstractRedisReactiveCommands;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.dynamic.codec.AnnotationRedisCodecResolver;
-import com.lambdaworks.redis.dynamic.output.CodecAwareOutputFactoryResolver;
-import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
-import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory;
-import com.lambdaworks.redis.dynamic.segment.CommandSegments;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.AbstractRedisReactiveCommands;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.dynamic.codec.AnnotationRedisCodecResolver;
+import io.lettuce.core.dynamic.output.CodecAwareOutputFactoryResolver;
+import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver;
+import io.lettuce.core.dynamic.segment.AnnotationCommandSegmentFactory;
+import io.lettuce.core.dynamic.segment.CommandSegments;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java b/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java
similarity index 99%
rename from src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java
rename to src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java
index f5b79ac79e..4901dda767 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdapters.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.function.Function;
 
@@ -27,8 +27,8 @@
 import rx.Single;
 import rx.internal.reactivestreams.PublisherAdapter;
 
-import com.lambdaworks.redis.dynamic.ReactiveTypes.ReactiveLibrary;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.dynamic.ReactiveTypes.ReactiveLibrary;
+import io.lettuce.core.internal.LettuceAssert;
 
 import io.reactivex.BackpressureStrategy;
 import io.reactivex.Flowable;
@@ -42,7 +42,7 @@ class ReactiveTypeAdapters {
 
     /**
      * Register adapters in the conversion service.
-     * 
+     *
      * @param conversionService
      */
     static void registerIn(ConversionService conversionService) {
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypes.java b/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypes.java
rename to src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java
index 7066cebf95..ac7d86727e 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/ReactiveTypes.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.*;
 import java.util.Map.Entry;
@@ -21,8 +21,8 @@
 
 import org.reactivestreams.Publisher;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceClassUtils;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceClassUtils;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -249,4 +249,4 @@ public boolean isNoValue() {
             return this.isNoValue;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
rename to src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
index 9fee67502f..42ddb92bd6 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
@@ -13,33 +13,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.lang.reflect.Method;
 import java.util.*;
 
 import org.springframework.util.Assert;
 
-import com.lambdaworks.redis.AbstractRedisReactiveCommands;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.codec.ByteArrayCodec;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.dynamic.batch.BatchSize;
-import com.lambdaworks.redis.dynamic.intercept.InvocationProxyFactory;
-import com.lambdaworks.redis.dynamic.intercept.MethodInterceptor;
-import com.lambdaworks.redis.dynamic.intercept.MethodInvocation;
-import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
-import com.lambdaworks.redis.dynamic.output.OutputRegistry;
-import com.lambdaworks.redis.dynamic.output.OutputRegistryCommandOutputFactoryResolver;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceLists;
-import com.lambdaworks.redis.models.command.CommandDetail;
-import com.lambdaworks.redis.models.command.CommandDetailParser;
-import com.lambdaworks.redis.protocol.LettuceCharsets;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.AbstractRedisReactiveCommands;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.dynamic.batch.BatchSize;
+import io.lettuce.core.dynamic.intercept.InvocationProxyFactory;
+import io.lettuce.core.dynamic.intercept.MethodInterceptor;
+import io.lettuce.core.dynamic.intercept.MethodInvocation;
+import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver;
+import io.lettuce.core.dynamic.output.OutputRegistry;
+import io.lettuce.core.dynamic.output.OutputRegistryCommandOutputFactoryResolver;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceLists;
+import io.lettuce.core.models.command.CommandDetail;
+import io.lettuce.core.models.command.CommandDetailParser;
+import io.lettuce.core.protocol.LettuceCharsets;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * Factory to create Redis Command interface instances.
@@ -78,7 +78,7 @@ public interface MyRedisCommands {
  *
  * @author Mark Paluch
  * @since 5.0
- * @see com.lambdaworks.redis.dynamic.annotation.Command
+ * @see io.lettuce.core.dynamic.annotation.Command
  * @see CommandMethod
  */
 public class RedisCommandFactory {
@@ -94,7 +94,7 @@ public class RedisCommandFactory {
 
     /**
      * Create a new {@link CommandFactory} given {@link StatefulConnection}.
-     * 
+     *
      * @param connection must not be {@literal null}.
      */
     public RedisCommandFactory(StatefulConnection<?, ?> connection) {
@@ -139,7 +139,7 @@ private List<CommandDetail> getCommands(StatefulConnection<?, ?> connection) {
 
     /**
      * Set a {@link CommandOutputFactoryResolver}.
-     * 
+     *
      * @param commandOutputFactoryResolver must not be {@literal null}.
      */
     public void setCommandOutputFactoryResolver(CommandOutputFactoryResolver commandOutputFactoryResolver) {
@@ -151,7 +151,7 @@ public void setCommandOutputFactoryResolver(CommandOutputFactoryResolver command
 
     /**
      * Enables/disables command verification which checks the command name against Redis {@code COMMAND} and the argument count.
-     * 
+     *
      * @param verifyCommandMethods {@literal true} to enable command verification (default) or {@literal false} to disable
      *        command verification.
      */
@@ -161,7 +161,7 @@ public void setVerifyCommandMethods(boolean verifyCommandMethods) {
 
     /**
      * Returns a Redis Commands interface instance for the given interface.
-     * 
+     *
      * @param commandInterface must not be {@literal null}.
      * @param <T> command interface type.
      * @return the implemented Redis Commands interface.
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java
rename to src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java
index 4a35f662b1..930ec4c524 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/RedisCommandsMetadata.java
+++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -21,7 +21,7 @@
 
 /**
  * Interface exposing Redis command interface metadata.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -38,7 +38,7 @@ interface RedisCommandsMetadata {
 
     /**
      * Lookup an interface annotation.
-     * 
+     *
      * @param annotationClass the annotation class.
      * @return the annotation object or {@literal null} if not found.
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/SimpleBatcher.java b/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/dynamic/SimpleBatcher.java
rename to src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java
index db2bd98b9e..ab881081ef 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/SimpleBatcher.java
+++ b/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.dynamic.batch.CommandBatching;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.dynamic.batch.CommandBatching;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.RedisCommand;
 
 import io.netty.util.internal.shaded.org.jctools.queues.atomic.MpscLinkedAtomicQueue;
 
@@ -33,7 +33,7 @@
  * <li>Reaches the configured {@link #batchSize}</li>
  * <li>Encounters a {@link CommandBatching#flush() force flush}</li>
  * </ul>
- * 
+ *
  * @author Mark Paluch
  */
 class SimpleBatcher implements Batcher {
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java b/src/main/java/io/lettuce/core/dynamic/annotation/Command.java
similarity index 86%
rename from src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java
rename to src/main/java/io/lettuce/core/dynamic/annotation/Command.java
index 773fb62e03..40fbe85fad 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Command.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/Command.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.annotation;
+package io.lettuce.core.dynamic.annotation;
 
 import java.lang.annotation.*;
 
-import com.lambdaworks.redis.dynamic.domain.Timeout;
+import io.lettuce.core.dynamic.domain.Timeout;
 
 /**
  * Redis command method annotation specifying a command string. A command string can contain the command name, a sequence of
@@ -25,15 +25,15 @@
  * <p>
  * Parameters: Parameters can be referenced by their name {@code :myArg} or index {@code ?0}. Additional, not referenced
  * parameters are appended to the command in the order of their appearance. Declared parameters are matched against
- * {@link com.lambdaworks.redis.codec.RedisCodec} for codec resolution. Additional parameter types such as {@link Timeout}
+ * {@link io.lettuce.core.codec.RedisCodec} for codec resolution. Additional parameter types such as {@link Timeout}
  * control execution behavior and are not added to command arguments.
  * <p>
  * Usage:
- * 
+ *
  * <pre class="code">
  *     &#64;Command("SET ?0 ?1")
  *     public String setKey(String key, String value)
- * 
+ *
  *     &#64;Command("SET :key :value")
  *     public String setKeyNamed(@Param("key") String key, @Param("value") String value)
  * </pre>
@@ -47,7 +47,7 @@
  * @see Param
  * @see Key
  * @see Value
- * @see com.lambdaworks.redis.dynamic.codec.RedisCodecResolver
+ * @see io.lettuce.core.dynamic.codec.RedisCodecResolver
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/CommandNaming.java b/src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/dynamic/annotation/CommandNaming.java
rename to src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java
index cc4d4957d0..d8dd220ef0 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/CommandNaming.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.annotation;
+package io.lettuce.core.dynamic.annotation;
 
 import java.lang.annotation.*;
 
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Key.java b/src/main/java/io/lettuce/core/dynamic/annotation/Key.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/dynamic/annotation/Key.java
rename to src/main/java/io/lettuce/core/dynamic/annotation/Key.java
index fdc61163e9..a3a4de69ab 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Key.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/Key.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.annotation;
+package io.lettuce.core.dynamic.annotation;
 
 import java.lang.annotation.*;
 
 /**
  * Marker annotation to declare a method parameter as key.
- * 
+ *
  * @author Mark Paluch
  * @see Value
  * @since 5.0
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Param.java b/src/main/java/io/lettuce/core/dynamic/annotation/Param.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/dynamic/annotation/Param.java
rename to src/main/java/io/lettuce/core/dynamic/annotation/Param.java
index f52117a6da..62f01958ca 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Param.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/Param.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.annotation;
+package io.lettuce.core.dynamic.annotation;
 
 import java.lang.annotation.*;
 
@@ -31,7 +31,7 @@
 
     /**
      * Name of the parameter.
-     * 
+     *
      * @return
      */
     String value();
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Value.java b/src/main/java/io/lettuce/core/dynamic/annotation/Value.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/dynamic/annotation/Value.java
rename to src/main/java/io/lettuce/core/dynamic/annotation/Value.java
index 729f125193..6842b3e920 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/Value.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/Value.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.annotation;
+package io.lettuce.core.dynamic.annotation;
 
 import java.lang.annotation.*;
 
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/annotation/package-info.java b/src/main/java/io/lettuce/core/dynamic/annotation/package-info.java
similarity index 65%
rename from src/main/java/com/lambdaworks/redis/dynamic/annotation/package-info.java
rename to src/main/java/io/lettuce/core/dynamic/annotation/package-info.java
index 00242bde76..43894661b0 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/annotation/package-info.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Central domain abstractions to be used in combination with Redis Command interfaces.
  */
-package com.lambdaworks.redis.dynamic.annotation;
+package io.lettuce.core.dynamic.annotation;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchException.java b/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/dynamic/batch/BatchException.java
rename to src/main/java/io/lettuce/core/dynamic/batch/BatchException.java
index 63fe23566c..8daadcb95e 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchException.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.batch;
+package io.lettuce.core.dynamic.batch;
 
 import java.util.Collections;
 import java.util.List;
 
-import com.lambdaworks.redis.RedisCommandExecutionException;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * Batch exception to collect multiple errors from batched command execution.
  * <p>
  * Commands that fail during the batch cause a {@link BatchException} while non-failed commands remain executed successfully.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  * @see BatchExecutor
@@ -38,7 +38,7 @@ public class BatchException extends RedisCommandExecutionException {
 
     /**
      * Create a new {@link BatchException}.
-     * 
+     *
      * @param failedCommands {@link List} of failed {@link RedisCommand}s.
      */
     public BatchException(List<RedisCommand<?, ?, ?>> failedCommands) {
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchExecutor.java b/src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/dynamic/batch/BatchExecutor.java
rename to src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java
index 163126b108..85ccf988bb 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchExecutor.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.batch;
+package io.lettuce.core.dynamic.batch;
 
 /**
  * Batch executor interface to enforce command queue flushing using {@link BatchSize}.
@@ -22,7 +22,7 @@
  * the batch size is not reached, commands remain not executed.
  * <p>
  * Commands that fail during the batch cause a {@link BatchException} while non-failed commands remain executed successfully.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  * @see BatchSize
@@ -31,7 +31,7 @@ public interface BatchExecutor {
 
     /**
      * Flush the command queue resulting in the queued commands being executed.
-     * 
+     *
      * @throws BatchException if at least one command failed.
      */
     void flush() throws BatchException;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchSize.java b/src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/dynamic/batch/BatchSize.java
rename to src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java
index fad81fda7f..0139051983 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/batch/BatchSize.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.batch;
+package io.lettuce.core.dynamic.batch;
 
 import java.lang.annotation.*;
 
@@ -21,20 +21,20 @@
  * Redis command method annotation declaring a command interface to use batching with a specified {@code batchSize}.
  * <p>
  * Usage:
- * 
+ *
  * <pre class="code">
  * &#64;BatchSize(50)
  * public interface MyCommands extends Commands {
- *  
+ *
  *   public void set(String key, String value);
- *  
+ *
  *   public RedisFuture&lt;String&gt; get(String key)
  * }
  * </pre>
  * <p>
  * Command batching executes commands in a deferred nature. This also means that at the time of invocation no result is
  * available. Batching can be only used with synchronous methods without a return value ({@code void}) or asynchronous methods
- * returning a {@link com.lambdaworks.redis.RedisFuture}. Reactive command batching is not supported because reactive executed
+ * returning a {@link io.lettuce.core.RedisFuture}. Reactive command batching is not supported because reactive executed
  * commands maintain an own subscription lifecycle that is decoupled from command method batching.
  * <p>
  * Command methods participating in batching share a single batch queue. All method invocations are queued until reaching the
@@ -47,7 +47,7 @@
  * {@link BatchExecutor#flush() flushed}. If the batch size is not reached, commands remain not executed.
  * <p>
  * Batching command interfaces are thread-safe and can be shared amongst multiple threads.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  * @see CommandBatching
@@ -60,7 +60,7 @@
 
     /**
      * Declares the batch size for the command method.
-     * 
+     *
      * @return a positive, non-zero number of commands.
      */
     int value();
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/batch/CommandBatching.java b/src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/dynamic/batch/CommandBatching.java
rename to src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java
index 25b8f5b083..60a02d39ef 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/batch/CommandBatching.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java
@@ -13,34 +13,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.batch;
+package io.lettuce.core.dynamic.batch;
 
 /**
  * Programmatic command batching API.
  * <p>
  * {@link CommandBatching} is used to queue commands in a batch queue and flush the command queue on command invocation. Usage:
- * 
+ *
  * <pre class="code">
  * public interface MyCommands extends Commands {
- *  
+ *
  *   public void set(String key, String value, CommandBatching batching);
- *  
+ *
  *   public RedisFuture&lt;String&gt; get(String key, CommandBatching batching)
  * }
- * 
+ *
  * MyCommands commands = …
- * 
- * commands.set("key", "value", CommandBatching.queue()); 
+ *
+ * commands.set("key", "value", CommandBatching.queue());
  * commands.get("key", CommandBatching.flush());
  * </pre>
  * <p>
  * Using {@link CommandBatching} in a method signature turns the command method into a batched command method.<br/>
  * Command batching executes commands in a deferred nature. This also means that at the time of invocation no result is
  * available. Batching can be only used with synchronous methods without a return value ({@code void}) or asynchronous methods
- * returning a {@link com.lambdaworks.redis.RedisFuture}. Reactive command batching is not supported because reactive executed
+ * returning a {@link io.lettuce.core.RedisFuture}. Reactive command batching is not supported because reactive executed
  * commands maintain an own subscription lifecycle that is decoupled from command method batching.
  * <p>
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  * @see BatchSize
@@ -49,7 +49,7 @@ public abstract class CommandBatching {
 
     /**
      * Flush the command batch queue after adding a command to the batch queue.
-     * 
+     *
      * @return {@link CommandBatching} to flush the command batch queue after adding a command to the batch queue.
      */
     public static CommandBatching flush() {
@@ -58,7 +58,7 @@ public static CommandBatching flush() {
 
     /**
      * Enqueue the command to the batch queue.
-     * 
+     *
      * @return {@link CommandBatching} to enqueue the command to the batch queue.
      */
     public static CommandBatching queue() {
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java
rename to src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
index 431da9ee7c..771d50b42c 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.codec;
+package io.lettuce.core.dynamic.codec;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.dynamic.CommandMethod;
-import com.lambdaworks.redis.dynamic.annotation.Key;
-import com.lambdaworks.redis.dynamic.annotation.Value;
-import com.lambdaworks.redis.dynamic.parameter.Parameter;
-import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
-import com.lambdaworks.redis.dynamic.support.TypeInformation;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceLists;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.dynamic.CommandMethod;
+import io.lettuce.core.dynamic.annotation.Key;
+import io.lettuce.core.dynamic.annotation.Value;
+import io.lettuce.core.dynamic.parameter.Parameter;
+import io.lettuce.core.dynamic.support.ClassTypeInformation;
+import io.lettuce.core.dynamic.support.TypeInformation;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceLists;
 
 /**
  * Annotation-based {@link RedisCodecResolver}. Considers {@code @Key} and {@code @Value} annotations of method parameters to
@@ -227,10 +227,10 @@ protected static class ParameterWrappers {
 
         static {
 
-            WRAPPERS.add(com.lambdaworks.redis.Value.class);
-            WRAPPERS.add(com.lambdaworks.redis.KeyValue.class);
-            WRAPPERS.add(com.lambdaworks.redis.ScoredValue.class);
-            WRAPPERS.add(com.lambdaworks.redis.Range.class);
+            WRAPPERS.add(io.lettuce.core.Value.class);
+            WRAPPERS.add(io.lettuce.core.KeyValue.class);
+            WRAPPERS.add(io.lettuce.core.ScoredValue.class);
+            WRAPPERS.add(io.lettuce.core.Range.class);
 
             WRAPPERS.add(List.class);
             WRAPPERS.add(Collection.class);
@@ -238,10 +238,10 @@ protected static class ParameterWrappers {
             WRAPPERS.add(Iterable.class);
             WRAPPERS.add(Map.class);
 
-            WITH_VALUE_TYPE.add(com.lambdaworks.redis.Value.class);
-            WITH_VALUE_TYPE.add(com.lambdaworks.redis.KeyValue.class);
-            WITH_KEY_TYPE.add(com.lambdaworks.redis.KeyValue.class);
-            WITH_VALUE_TYPE.add(com.lambdaworks.redis.ScoredValue.class);
+            WITH_VALUE_TYPE.add(io.lettuce.core.Value.class);
+            WITH_VALUE_TYPE.add(io.lettuce.core.KeyValue.class);
+            WITH_KEY_TYPE.add(io.lettuce.core.KeyValue.class);
+            WITH_VALUE_TYPE.add(io.lettuce.core.ScoredValue.class);
 
             WITH_KEY_TYPE.add(Map.class);
             WITH_VALUE_TYPE.add(Map.class);
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/codec/RedisCodecResolver.java b/src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java
similarity index 87%
rename from src/main/java/com/lambdaworks/redis/dynamic/codec/RedisCodecResolver.java
rename to src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java
index 593046455a..a54e698112 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/codec/RedisCodecResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.codec;
+package io.lettuce.core.dynamic.codec;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.dynamic.CommandMethod;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.dynamic.CommandMethod;
 
 /**
  * Strategy interface to resolve a {@link RedisCodec} for a {@link CommandMethod}.
@@ -28,7 +28,7 @@ public interface RedisCodecResolver {
 
     /**
      * Resolve a {@link RedisCodec} for the given {@link CommandMethod}.
-     * 
+     *
      * @param commandMethod must not be {@literal null}.
      * @return the resolved {@link RedisCodec} or {@literal null} if not resolvable.
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/domain/Timeout.java b/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/dynamic/domain/Timeout.java
rename to src/main/java/io/lettuce/core/dynamic/domain/Timeout.java
index 513ae812ca..9bf219f817 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/domain/Timeout.java
+++ b/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.domain;
+package io.lettuce.core.dynamic.domain;
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.dynamic.annotation.Command;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.dynamic.annotation.Command;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Timeout value object to represent a timeout value with its {@link TimeUnit}.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  * @see Command
@@ -43,7 +43,7 @@ private Timeout(long timeout, TimeUnit timeUnit) {
 
     /**
      * Create a {@link Timeout}.
-     * 
+     *
      * @param timeout the timeout value, must be non-negative.
      * @param timeUnit the associated {@link TimeUnit}, must not be {@literal null}.
      * @return the {@link Timeout}.
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/domain/package-info.java b/src/main/java/io/lettuce/core/dynamic/domain/package-info.java
similarity index 60%
rename from src/main/java/com/lambdaworks/redis/dynamic/domain/package-info.java
rename to src/main/java/io/lettuce/core/dynamic/domain/package-info.java
index 66a8ab00ad..cfec978b77 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/domain/package-info.java
+++ b/src/main/java/io/lettuce/core/dynamic/domain/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Core annotations to be used with Redis Command interfaces.
  */
-package com.lambdaworks.redis.dynamic.domain;
+package io.lettuce.core.dynamic.domain;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/DefaultMethodInvocation.java b/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvocation.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/dynamic/intercept/DefaultMethodInvocation.java
rename to src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvocation.java
index a7698a3101..e3bc01aa94 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/DefaultMethodInvocation.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvocation.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.intercept;
+package io.lettuce.core.dynamic.intercept;
 
 import java.lang.reflect.Method;
 
 /**
  * Default implementation of {@link MethodInvocation}
- * 
+ *
  * @author Mark Paluch
  */
 abstract class DefaultMethodInvocation implements MethodInvocation {
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java
rename to src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
index 1f3a1baee2..efd5b69c2f 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.intercept;
+package io.lettuce.core.dynamic.intercept;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.internal.AbstractInvocationHandler;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.AbstractInvocationHandler;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Factory to create invocation proxies.
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptor.java b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptor.java
rename to src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java
index b7af3a53ad..858142c628 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptor.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.intercept;
+package io.lettuce.core.dynamic.intercept;
 
 /**
  * Intercepts calls on an interface on its way to the target. These are nested "on top" of the target.
@@ -29,7 +29,7 @@ public interface MethodInterceptor {
     /**
      * Implement this method to perform extra treatments before and after the invocation. Polite implementations would certainly
      * like to invoke {@link MethodInvocation#proceed()}.
-     * 
+     *
      * @param invocation the method invocation
      * @return the result of the call to {@link MethodInvocation#proceed()}, might be intercepted by the interceptor.
      * @throws Throwable if the interceptors or the target-object throws an exception.
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptorChain.java b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java
similarity index 99%
rename from src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptorChain.java
rename to src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java
index 9d664736a5..2a28158e43 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInterceptorChain.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.intercept;
+package io.lettuce.core.dynamic.intercept;
 
 import java.lang.reflect.Method;
 import java.util.Iterator;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInvocation.java b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInvocation.java
rename to src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java
index c16b5a9baf..0cbf2d1cea 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/intercept/MethodInvocation.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.intercept;
+package io.lettuce.core.dynamic.intercept;
 
 import java.lang.reflect.Method;
 
@@ -33,7 +33,7 @@ public interface MethodInvocation {
      * Proceed to the next interceptor in the chain.
      * <p>
      * The implementation and the semantics of this method depends on the actual joinpoint type (see the children interfaces).
-     * 
+     *
      * @return see the children interfaces' proceed definition
      * @throws Throwable if the invocation throws an exception
      */
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/package-info.java b/src/main/java/io/lettuce/core/dynamic/intercept/package-info.java
new file mode 100644
index 0000000000..36416377dc
--- /dev/null
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Invocation proxy support.
+ */
+package io.lettuce.core.dynamic.intercept;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java
rename to src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java
index eab6e4e17b..19900f0c10 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.output;
+package io.lettuce.core.dynamic.output;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * {@link RedisCodec}-aware implementation of {@link CommandOutputFactoryResolver}. This implementation inspects
  * {@link RedisCodec} regarding its type and enhances {@link OutputSelector} for {@link CommandOutputFactory} resolution.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -32,7 +32,7 @@ public class CodecAwareOutputFactoryResolver implements CommandOutputFactoryReso
 
     /**
      * Create a new {@link CodecAwareOutputFactoryResolver} given {@link CommandOutputFactoryResolver} and {@link RedisCodec}.
-     * 
+     *
      * @param delegate must not be {@literal null}.
      * @param redisCodec must not be {@literal null}.
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java
similarity index 88%
rename from src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java
rename to src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java
index a53d1eb5b1..e54f9438b4 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.output;
+package io.lettuce.core.dynamic.output;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.output.CommandOutput;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.output.CommandOutput;
 
 /**
  * Strategy interface to create {@link CommandOutput} given {@link RedisCodec}.
@@ -31,7 +31,7 @@ public interface CommandOutputFactory {
 
     /**
      * Create and initialize a new {@link CommandOutput} given {@link RedisCodec}.
-     * 
+     *
      * @param codec must not be {@literal null}.
      * @param <K> Key type.
      * @param <V> Value type.
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java
similarity index 79%
rename from src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactoryResolver.java
rename to src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java
index 95988051a9..704dc159cc 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.output;
+package io.lettuce.core.dynamic.output;
 
 /**
  * Strategy interface to resolve a {@link CommandOutputFactory} based on a {@link OutputSelector}. Resolution of
- * {@link CommandOutputFactory} is based on {@link com.lambdaworks.redis.dynamic.CommandMethod} result types and can be
+ * {@link CommandOutputFactory} is based on {@link io.lettuce.core.dynamic.CommandMethod} result types and can be
  * influenced whether the result type is a key or value result type. Additional type variables (based on the used
- * {@link com.lambdaworks.redis.codec.RedisCodec} are hints to improve output resolution.
- * 
+ * {@link io.lettuce.core.codec.RedisCodec} are hints to improve output resolution.
+ *
  * @author Mark Paluch
  * @since 5.0
  * @see OutputSelector
@@ -28,20 +28,20 @@
 public interface CommandOutputFactoryResolver {
 
     /**
-     * Resolve a regular {@link CommandOutputFactory} that produces the {@link com.lambdaworks.redis.output.CommandOutput}
+     * Resolve a regular {@link CommandOutputFactory} that produces the {@link io.lettuce.core.output.CommandOutput}
      * result component type.
-     * 
+     *
      * @param outputSelector must not be {@literal null}.
      * @return the {@link CommandOutputFactory} if resolved, {@literal null} otherwise.
      */
     CommandOutputFactory resolveCommandOutput(OutputSelector outputSelector);
 
     /**
-     * Resolve a streaming {@link CommandOutputFactory} that produces the {@link com.lambdaworks.redis.output.StreamingOutput}
+     * Resolve a streaming {@link CommandOutputFactory} that produces the {@link io.lettuce.core.output.StreamingOutput}
      * result component type.
      *
      * @param outputSelector must not be {@literal null}.
-     * @return the {@link CommandOutputFactory} that implements {@link com.lambdaworks.redis.output.StreamingOutput} if
+     * @return the {@link CommandOutputFactory} that implements {@link io.lettuce.core.output.StreamingOutput} if
      *         resolved, {@literal null} otherwise.
      */
     CommandOutputFactory resolveStreamingCommandOutput(OutputSelector outputSelector);
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java
rename to src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java
index 71a9caf860..9d092403cb 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/CommandOutputResolverSupport.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.output;
+package io.lettuce.core.dynamic.output;
 
-import com.lambdaworks.redis.dynamic.support.ResolvableType;
+import io.lettuce.core.dynamic.support.ResolvableType;
 
 /**
  * Base class for {@link CommandOutputFactory} resolution such as {@link OutputRegistryCommandOutputFactoryResolver}.
  * <p>
  * This class provides methods to check provider/selector type assignability. Subclasses are responsible for calling methods in
  * this class in the correct order.
- * 
+ *
  * @author Mark Paluch
  */
 public abstract class CommandOutputResolverSupport {
@@ -31,7 +31,7 @@ public abstract class CommandOutputResolverSupport {
      * Overridable hook to check whether {@code selector} can be assigned from the provider type {@code provider}.
      * <p>
      * This method descends the component type hierarchy and considers primitive/wrapper type conversion.
-     * 
+     *
      * @param selector must not be {@literal null}.
      * @param provider must not be {@literal null}.
      * @return {@literal true} if selector can be assigned from its provider type.
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java
rename to src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
index cf2e2ff4dc..35983fcbfd 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistry.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.output;
+package io.lettuce.core.dynamic.output;
 
 import java.lang.reflect.TypeVariable;
 import java.util.ArrayList;
@@ -21,16 +21,16 @@
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
-import com.lambdaworks.redis.dynamic.support.ResolvableType;
-import com.lambdaworks.redis.dynamic.support.TypeInformation;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.output.*;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.dynamic.support.ClassTypeInformation;
+import io.lettuce.core.dynamic.support.ResolvableType;
+import io.lettuce.core.dynamic.support.TypeInformation;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.output.*;
 
 /**
  * Registry for {@link CommandOutput} types and their {@link CommandOutputFactory factories}.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  * @see CommandOutput
@@ -81,7 +81,7 @@ public OutputRegistry() {
 
     /**
      * Create a new {@link OutputRegistry}.
-     * 
+     *
      * @param registerBuiltin {@literal true} to register builtin {@link CommandOutput} types.
      */
     public OutputRegistry(boolean registerBuiltin) {
@@ -93,7 +93,7 @@ public OutputRegistry(boolean registerBuiltin) {
 
     /**
      * Register a {@link CommandOutput} type with its {@link CommandOutputFactory}.
-     * 
+     *
      * @param commandOutputClass must not be {@literal null}.
      * @param commandOutputFactory must not be {@literal null}.
      */
@@ -108,7 +108,7 @@ public OutputRegistry(boolean registerBuiltin) {
 
     /**
      * Return the registry map.
-     * 
+     *
      * @return map of {@link OutputType} to {@link CommandOutputFactory}.
      */
     Map<OutputType, CommandOutputFactory> getRegistry() {
@@ -144,7 +144,7 @@ private static List<OutputType> getOutputTypes(Class<? extends CommandOutput> co
 
     /**
      * Retrieve {@link OutputType} for a {@link StreamingOutput} type.
-     * 
+     *
      * @param commandOutputClass
      * @return
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
rename to src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
index f15df526aa..a30fdcaa79 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.output;
+package io.lettuce.core.dynamic.output;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.output.CommandOutput;
+import io.lettuce.core.dynamic.support.ClassTypeInformation;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.output.CommandOutput;
 
 /**
  * {@link CommandOutputFactoryResolver} using {@link OutputRegistry} to resolve a {@link CommandOutputFactory}.
  * <p>
  * Types registered in {@link OutputRegistry} are inspected for the types they produce and matched with the declared repository
  * method. If resolution yields multiple {@link CommandOutput}s, the first matched output is used.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  * @see OutputRegistry
@@ -43,7 +43,7 @@ public class OutputRegistryCommandOutputFactoryResolver extends CommandOutputRes
 
     /**
      * Create a new {@link OutputRegistryCommandOutputFactoryResolver} given {@link OutputRegistry}.
-     * 
+     *
      * @param outputRegistry must not be {@literal null}.
      */
     public OutputRegistryCommandOutputFactoryResolver(OutputRegistry outputRegistry) {
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java b/src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java
similarity index 81%
rename from src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java
rename to src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java
index 04d60b5ac0..cc7bd550f4 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputSelector.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.output;
+package io.lettuce.core.dynamic.output;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.dynamic.support.ResolvableType;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.dynamic.support.ResolvableType;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Selector {@link CommandOutputFactory} resolution.
  * <p>
- * A {@link OutputSelector} is based on the result {@link ResolvableType} and {@link com.lambdaworks.redis.codec.RedisCodec}.
- * The codec supplies types for generics resolution of {@link com.lambdaworks.redis.output.CommandOutput}.
+ * A {@link OutputSelector} is based on the result {@link ResolvableType} and {@link io.lettuce.core.codec.RedisCodec}.
+ * The codec supplies types for generics resolution of {@link io.lettuce.core.output.CommandOutput}.
  *
  * @author Mark Paluch
  * @since 5.0
@@ -35,7 +35,7 @@ public class OutputSelector {
 
     /**
      * Creates a new {@link OutputSelector} given {@link ResolvableType} and {@link RedisCodec}.
-     * 
+     *
      * @param outputType must not be {@literal null}.
      * @param redisCodec must not be {@literal null}.
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java b/src/main/java/io/lettuce/core/dynamic/output/OutputType.java
similarity index 80%
rename from src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java
rename to src/main/java/io/lettuce/core/dynamic/output/OutputType.java
index 22f9a2cb9e..a4051f4e1a 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/OutputType.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputType.java
@@ -13,24 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.output;
+package io.lettuce.core.dynamic.output;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.dynamic.support.ResolvableType;
-import com.lambdaworks.redis.dynamic.support.TypeInformation;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.output.CommandOutput;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.dynamic.support.ResolvableType;
+import io.lettuce.core.dynamic.support.TypeInformation;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.output.CommandOutput;
 
 /**
- * Type descriptor for a {@link com.lambdaworks.redis.output.CommandOutput}.
+ * Type descriptor for a {@link io.lettuce.core.output.CommandOutput}.
  * <p>
  * This value object describes the primary output type and the produced {@link TypeInformation} by the {@link CommandOutput}
  * type.
  * <p>
  * {@link OutputType} makes a distinction whether a {@link CommandOutput} is a
- * {@link com.lambdaworks.redis.output.StreamingOutput} by providing {@code streaming}. Streaming outputs produce usually a
+ * {@link io.lettuce.core.output.StreamingOutput} by providing {@code streaming}. Streaming outputs produce usually a
  * component type hence they require an own {@link OutputType} descriptor.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -42,11 +42,11 @@ public class OutputType {
 
     /**
      * Create a new {@link OutputType} given {@code primaryType}, the {@code commandOutputClass}, {@link TypeInformation} and
-     * whether the {@link OutputType} is for a {@link com.lambdaworks.redis.output.StreamingOutput}.
-     * 
+     * whether the {@link OutputType} is for a {@link io.lettuce.core.output.StreamingOutput}.
+     *
      * @param commandOutputClass must not be {@literal null}.
      * @param typeInformation must not be {@literal null}.
-     * @param streaming {@literal true} if the type descriptor concerns the {@link com.lambdaworks.redis.output.StreamingOutput}
+     * @param streaming {@literal true} if the type descriptor concerns the {@link io.lettuce.core.output.StreamingOutput}
      */
     OutputType(Class<? extends CommandOutput> commandOutputClass, TypeInformation<?> typeInformation, boolean streaming) {
 
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/output/VoidOutput.java b/src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/dynamic/output/VoidOutput.java
rename to src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java
index 6a5049154c..2112a42120 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/output/VoidOutput.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.output;
+package io.lettuce.core.dynamic.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.output.CommandOutput;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.output.CommandOutput;
 
 /**
  * {@link Void} command output to consume data silently without actually processing it.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
diff --git a/src/main/java/io/lettuce/core/dynamic/output/package-info.java b/src/main/java/io/lettuce/core/dynamic/output/package-info.java
new file mode 100644
index 0000000000..efdb055558
--- /dev/null
+++ b/src/main/java/io/lettuce/core/dynamic/output/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * {@link io.lettuce.core.output.CommandOutput} resolution support.
+ */
+package io.lettuce.core.dynamic.output;
diff --git a/src/main/java/io/lettuce/core/dynamic/package-info.java b/src/main/java/io/lettuce/core/dynamic/package-info.java
new file mode 100644
index 0000000000..c77695040d
--- /dev/null
+++ b/src/main/java/io/lettuce/core/dynamic/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Core package for Redis Command Interface support through {@link io.lettuce.core.dynamic.RedisCommandFactory}.
+ */
+package io.lettuce.core.dynamic;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java b/src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java
rename to src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java
index fdd2aa44a7..fcccd62b94 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/ExecutionSpecificParameters.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.parameter;
+package io.lettuce.core.dynamic.parameter;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 
-import com.lambdaworks.redis.dynamic.batch.CommandBatching;
-import com.lambdaworks.redis.dynamic.domain.Timeout;
+import io.lettuce.core.dynamic.batch.CommandBatching;
+import io.lettuce.core.dynamic.domain.Timeout;
 
 /**
  * {@link Parameters}-implementation specific to execution. This implementation considers {@link Timeout} for a command method
  * applying the appropriate synchronization and {@link CommandBatching} to batch commands.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  * @see Timeout
@@ -40,7 +40,7 @@ public class ExecutionSpecificParameters extends Parameters<ExecutionSpecificPar
 
     /**
      * Create new {@link ExecutionSpecificParameters} given a {@link Method}.
-     * 
+     *
      * @param method must not be {@literal null}.
      */
     public ExecutionSpecificParameters(Method method) {
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/MethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/parameter/MethodParametersAccessor.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/dynamic/parameter/MethodParametersAccessor.java
rename to src/main/java/io/lettuce/core/dynamic/parameter/MethodParametersAccessor.java
index 32ca58b0e4..fc9514321b 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/MethodParametersAccessor.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/MethodParametersAccessor.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.parameter;
+package io.lettuce.core.dynamic.parameter;
 
 import java.util.Iterator;
 
-import com.lambdaworks.redis.dynamic.domain.Timeout;
+import io.lettuce.core.dynamic.domain.Timeout;
 
 /**
  * Accessor interface to method parameters during the actual invocation.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -66,7 +66,7 @@ public interface MethodParametersAccessor {
 
     /**
      * Resolve a parameter name to its index.
-     * 
+     *
      * @param name the name.
      * @return
      */
@@ -75,7 +75,7 @@ public interface MethodParametersAccessor {
     /**
      * Return {@literal true} if the parameter at {@code index} is a bindable {@literal null} value that requires a
      * {@literal null} value instead of being skipped.
-     * 
+     *
      * @param index parameter index.
      * @return {@literal true} if the parameter at {@code index} is a bindable {@literal null} value that requires a
      *         {@literal null} value instead of being skipped.
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameter.java b/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameter.java
rename to src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java
index cbc2355143..ab7945b4ea 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameter.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.parameter;
+package io.lettuce.core.dynamic.parameter;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
-import com.lambdaworks.redis.dynamic.support.*;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceClassUtils;
+import io.lettuce.core.dynamic.support.*;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceClassUtils;
 
 import io.netty.util.internal.ConcurrentSet;
 
 /**
  * Abstracts a method parameter and exposes access to type and parameter information.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -67,7 +67,7 @@ public Parameter(Method method, int parameterIndex) {
 
     /**
      * Return the parameter annotation of the given type, if available.
-     * 
+     *
      * @param annotationType the annotation type to look for
      * @return the annotation object, or {@code null} if not found
      */
@@ -90,7 +90,7 @@ public <A extends Annotation> A findAnnotation(Class<A> annotationType) {
 
     /**
      * Return all parameter annotations.
-     * 
+     *
      * @return the {@link List} of annotation objects.
      */
     public List<? extends Annotation> getAnnotations() {
@@ -123,7 +123,7 @@ public TypeInformation<?> getTypeInformation() {
 
     /**
      * Check whether the parameter is assignable to {@code target}.
-     * 
+     *
      * @param target must not be {@literal null}.
      * @return
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java b/src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java
rename to src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java
index b38d1a4347..a849e8c008 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/parameter/Parameters.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.parameter;
+package io.lettuce.core.dynamic.parameter;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Base class to abstract method {@link Parameter}s.
- * 
+ *
  * @author Mark Paluch
  */
 public abstract class Parameters<P extends Parameter> implements Iterable<P> {
@@ -55,7 +55,7 @@ public Parameters(Method method) {
 
     /**
      * Create a new {@link Parameters} for given a {@link Method} at {@code parameterIndex}.
-     * 
+     *
      * @param method must not be {@literal null}.
      * @param parameterIndex the parameter index.
      * @return the {@link Parameter}.
@@ -90,7 +90,7 @@ public List<P> getParameters() {
     /**
      * Get the bindable parameter according it's logical position in the command. Declarative position may differ because of
      * special parameters interleaved.
-     * 
+     *
      * @param index
      * @return the {@link Parameter}.
      */
diff --git a/src/main/java/io/lettuce/core/dynamic/parameter/package-info.java b/src/main/java/io/lettuce/core/dynamic/parameter/package-info.java
new file mode 100644
index 0000000000..4b0c60c051
--- /dev/null
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Parameter access and descriptors.
+ */
+package io.lettuce.core.dynamic.parameter;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactory.java b/src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactory.java
rename to src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java
index 061252a7cb..912f61de6e 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java
@@ -13,25 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.segment;
+package io.lettuce.core.dynamic.segment;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.regex.Pattern;
 
-import com.lambdaworks.redis.LettuceStrings;
-import com.lambdaworks.redis.dynamic.annotation.Command;
-import com.lambdaworks.redis.dynamic.annotation.CommandNaming;
-import com.lambdaworks.redis.dynamic.annotation.CommandNaming.LetterCase;
-import com.lambdaworks.redis.dynamic.annotation.CommandNaming.Strategy;
-import com.lambdaworks.redis.dynamic.CommandMethod;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.LettuceStrings;
+import io.lettuce.core.dynamic.annotation.Command;
+import io.lettuce.core.dynamic.annotation.CommandNaming;
+import io.lettuce.core.dynamic.annotation.CommandNaming.LetterCase;
+import io.lettuce.core.dynamic.annotation.CommandNaming.Strategy;
+import io.lettuce.core.dynamic.CommandMethod;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * {@link CommandSegmentFactory} implementation that creates {@link CommandSegments} considering {@link Command} and
  * {@link CommandNaming} annotations.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java
rename to src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java
index bb7dcea60b..44f73d2143 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegment.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.segment;
+package io.lettuce.core.dynamic.segment;
 
-import com.lambdaworks.redis.dynamic.parameter.MethodParametersAccessor;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.dynamic.parameter.MethodParametersAccessor;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Value object representing a segment within a Redis Command.
@@ -30,7 +30,7 @@ public abstract class CommandSegment {
 
     /**
      * Create a constant {@link CommandSegment}.
-     * 
+     *
      * @param content must not be empty or {@literal null}.
      * @return the {@link CommandSegment}.
      */
@@ -40,7 +40,7 @@ public static CommandSegment constant(String content) {
 
     /**
      * Create a named parameter reference {@link CommandSegment}.
-     * 
+     *
      * @param name must not be empty or {@literal null}.
      * @return
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java
rename to src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java
index 88f6206a96..8058adcf3b 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegmentFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.segment;
+package io.lettuce.core.dynamic.segment;
 
-import com.lambdaworks.redis.dynamic.CommandMethod;
+import io.lettuce.core.dynamic.CommandMethod;
 
 /**
  * Strategy interface to create {@link CommandSegments} for a {@link CommandMethod}.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -27,7 +27,7 @@ public interface CommandSegmentFactory {
 
     /**
      * Create {@link CommandSegments} for a {@link CommandMethod}.
-     * 
+     *
      * @param commandMethod must not be {@literal null}.
      * @return the {@link CommandSegments}.
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegments.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegments.java
rename to src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
index 2ade7d378d..b5c0703ad4 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/segment/CommandSegments.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.segment;
+package io.lettuce.core.dynamic.segment;
 
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
  * Value object abstracting multiple {@link CommandSegment}s.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -35,7 +35,7 @@ public class CommandSegments implements Iterable<CommandSegment> {
 
     /**
      * Create {@link CommandSegments} given a {@link List} of {@link CommandSegment}s.
-     * 
+     *
      * @param segments must not be {@literal null.}
      */
     public CommandSegments(List<CommandSegment> segments) {
diff --git a/src/main/java/io/lettuce/core/dynamic/segment/package-info.java b/src/main/java/io/lettuce/core/dynamic/segment/package-info.java
new file mode 100644
index 0000000000..a605d1ca31
--- /dev/null
+++ b/src/main/java/io/lettuce/core/dynamic/segment/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Support for {@link io.lettuce.core.dynamic.segment.CommandSegments} and segment parsing.
+ */
+package io.lettuce.core.dynamic.segment;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/AnnotationParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/AnnotationParameterNameDiscoverer.java
rename to src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java
index 73a33b5a64..589584792c 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/AnnotationParameterNameDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
@@ -21,11 +21,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.dynamic.annotation.Param;
+import io.lettuce.core.dynamic.annotation.Param;
 
 /**
  * {@link ParameterNameDiscoverer} based on {@link Param} annotations to resolve parameter names.
- * 
+ *
  * @author Mark Paluch
  */
 public class AnnotationParameterNameDiscoverer implements ParameterNameDiscoverer {
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java
rename to src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java
index 729f0c5921..95cf3cbde7 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/ClassTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
@@ -23,8 +23,8 @@
 import java.util.*;
 import java.util.Map.Entry;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceClassUtils;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceClassUtils;
 
 /**
  * {@link TypeInformation} for a plain {@link Class}.
@@ -51,7 +51,7 @@ public class ClassTypeInformation<S> extends TypeDiscoverer<S> {
 
     /**
      * Simple factory method to easily create new instances of {@link ClassTypeInformation}.
-     * 
+     *
      * @param <S>
      * @param type must not be {@literal null}.
      * @return
@@ -74,7 +74,7 @@ public static <S> ClassTypeInformation<S> from(Class<S> type) {
 
     /**
      * Creates a {@link TypeInformation} from the given method's return type.
-     * 
+     *
      * @param method must not be {@literal null}.
      * @return
      */
@@ -98,7 +98,7 @@ public static <S> TypeInformation<S> fromMethodParameter(Method method, int inde
 
     /**
      * Creates {@link ClassTypeInformation} for the given type.
-     * 
+     *
      * @param type
      */
     ClassTypeInformation(Class<S> type) {
@@ -109,7 +109,7 @@ public static <S> TypeInformation<S> fromMethodParameter(Method method, int inde
     /**
      * Return the user-defined class for the given class: usually simply the given class, but the original class in case of a
      * CGLIB-generated subclass.
-     * 
+     *
      * @param clazz the class to check
      * @return the user-defined class
      */
@@ -125,7 +125,7 @@ private static Class<?> getUserClass(Class<?> clazz) {
 
     /**
      * Little helper to allow us to create a generified map, actually just to satisfy the compiler.
-     * 
+     *
      * @param type must not be {@literal null}.
      * @return
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/CompositeParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/CompositeParameterNameDiscoverer.java
rename to src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java
index 4d803c6ec4..34e27a37ff 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/CompositeParameterNameDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -22,7 +22,7 @@
 
 /**
  * Composite {@link ParameterNameDiscoverer} to resolve parameter names using multiple {@link ParameterNameDiscoverer}s.
- * 
+ *
  * @author Mark Paluch
  */
 public class CompositeParameterNameDiscoverer implements ParameterNameDiscoverer {
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java
rename to src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java
index 26bad0ac3c..b6ceca5856 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/GenericArrayTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.GenericArrayType;
@@ -31,7 +31,7 @@ class GenericArrayTypeInformation<S> extends ParentTypeAwareTypeInformation<S> {
     /**
      * Creates a new {@link GenericArrayTypeInformation} for the given {@link GenericArrayTypeInformation} and
      * {@link TypeDiscoverer}.
-     * 
+     *
      * @param type must not be {@literal null}.
      * @param parent must not be {@literal null}.
      * @param typeVariableMap must not be {@literal null}.
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/GenericTypeResolver.java b/src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/GenericTypeResolver.java
rename to src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java
index b74e13026a..4e95a9dc0e 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/GenericTypeResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -44,7 +44,7 @@ public static Map<TypeVariable, Type> getTypeVariableMap(Class<?> clazz) {
     /**
      * Resolve the type arguments of the given generic interface against the given target class which is assumed to implement
      * the generic interface and possibly declare concrete types for its type variables.
-     * 
+     *
      * @param clazz the target class to check against
      * @param genericIfc the generic interface or superclass to resolve the type argument from
      * @return the resolved type of each argument, with the array size matching the number of actual type arguments, or
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/MethodParameter.java b/src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/MethodParameter.java
rename to src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java
index e93c65c263..c634bca384 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/MethodParameter.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.*;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Helper class that encapsulates the specification of a method parameter, i.e. a {@link Method} or {@link Constructor} plus a
@@ -53,7 +53,7 @@ public class MethodParameter {
 
     /**
      * Create a new {@code MethodParameter} for the given method, with nesting level 1.
-     * 
+     *
      * @param method the Method to specify a parameter for
      * @param parameterIndex the index of the parameter: -1 for the method return type; 0 for the first method parameter; 1 for
      *        the second method parameter, etc.
@@ -64,7 +64,7 @@ public MethodParameter(Method method, int parameterIndex) {
 
     /**
      * Create a new {@code MethodParameter} for the given method.
-     * 
+     *
      * @param method the Method to specify a parameter for
      * @param parameterIndex the index of the parameter: -1 for the method return type; 0 for the first method parameter; 1 for
      *        the second method parameter, etc.
@@ -83,7 +83,7 @@ public MethodParameter(Method method, int parameterIndex, int nestingLevel) {
 
     /**
      * Create a new MethodParameter for the given constructor, with nesting level 1.
-     * 
+     *
      * @param constructor the Constructor to specify a parameter for
      * @param parameterIndex the index of the parameter
      */
@@ -93,7 +93,7 @@ public MethodParameter(Constructor<?> constructor, int parameterIndex) {
 
     /**
      * Create a new MethodParameter for the given constructor.
-     * 
+     *
      * @param constructor the Constructor to specify a parameter for
      * @param parameterIndex the index of the parameter
      * @param nestingLevel the nesting level of the target type (typically 1; e.g. in case of a List of Lists, 1 would indicate
@@ -110,7 +110,7 @@ public MethodParameter(Constructor<?> constructor, int parameterIndex, int nesti
     /**
      * Copy constructor, resulting in an independent MethodParameter object based on the same metadata and cache state that the
      * original object was in.
-     * 
+     *
      * @param original the original MethodParameter object to copy from
      */
     public MethodParameter(MethodParameter original) {
@@ -132,7 +132,7 @@ public MethodParameter(MethodParameter original) {
      * Return the wrapped Method, if any.
      * <p>
      * Note: Either Method or Constructor is available.
-     * 
+     *
      * @return the Method, or {@code null} if none
      */
     public Method getMethod() {
@@ -143,7 +143,7 @@ public Method getMethod() {
      * Return the wrapped Constructor, if any.
      * <p>
      * Note: Either Method or Constructor is available.
-     * 
+     *
      * @return the Constructor, or {@code null} if none
      */
     public Constructor<?> getConstructor() {
@@ -152,7 +152,7 @@ public Constructor<?> getConstructor() {
 
     /**
      * Returns the wrapped member.
-     * 
+     *
      * @return the Method or Constructor as Member
      */
     public Member getMember() {
@@ -168,7 +168,7 @@ public Member getMember() {
 
     /**
      * Returns the wrapped annotated element.
-     * 
+     *
      * @return the Method or Constructor as AnnotatedElement
      */
     public AnnotatedElement getAnnotatedElement() {
@@ -191,7 +191,7 @@ public Class<?> getDeclaringClass() {
 
     /**
      * Return the index of the method/constructor parameter.
-     * 
+     *
      * @return the parameter index (-1 in case of the return type)
      */
     public int getParameterIndex() {
@@ -200,7 +200,7 @@ public int getParameterIndex() {
 
     /**
      * Increase this parameter's nesting level.
-     * 
+     *
      * @see #getNestingLevel()
      */
     public void increaseNestingLevel() {
@@ -209,7 +209,7 @@ public void increaseNestingLevel() {
 
     /**
      * Decrease this parameter's nesting level.
-     * 
+     *
      * @see #getNestingLevel()
      */
     public void decreaseNestingLevel() {
@@ -227,7 +227,7 @@ public int getNestingLevel() {
 
     /**
      * Set the type index for the current nesting level.
-     * 
+     *
      * @param typeIndex the corresponding type index (or {@code null} for the default type index)
      * @see #getNestingLevel()
      */
@@ -237,7 +237,7 @@ public void setTypeIndexForCurrentLevel(int typeIndex) {
 
     /**
      * Return the type index for the current nesting level.
-     * 
+     *
      * @return the corresponding type index, or {@code null} if none specified (indicating the default type index)
      * @see #getNestingLevel()
      */
@@ -247,7 +247,7 @@ public Integer getTypeIndexForCurrentLevel() {
 
     /**
      * Return the type index for the specified nesting level.
-     * 
+     *
      * @param nestingLevel the nesting level to check
      * @return the corresponding type index, or {@code null} if none specified (indicating the default type index)
      */
@@ -285,7 +285,7 @@ void setParameterType(Class<?> parameterType) {
 
     /**
      * Return the type of the method/constructor parameter.
-     * 
+     *
      * @return the parameter type (never {@code null})
      */
     public Class<?> getParameterType() {
@@ -302,7 +302,7 @@ public Class<?> getParameterType() {
 
     /**
      * Return the generic type of the method/constructor parameter.
-     * 
+     *
      * @return the parameter type (never {@code null})
      */
     public Type getGenericParameterType() {
@@ -319,7 +319,7 @@ public Type getGenericParameterType() {
 
     /**
      * Return the nested type of the method/constructor parameter.
-     * 
+     *
      * @return the parameter type (never {@code null})
      * @see #getNestingLevel()
      */
@@ -349,7 +349,7 @@ public Class<?> getNestedParameterType() {
 
     /**
      * Return the nested generic type of the method/constructor parameter.
-     * 
+     *
      * @return the parameter type (never {@code null})
      * @see #getNestingLevel()
      */
@@ -378,7 +378,7 @@ public Annotation[] getMethodAnnotations() {
 
     /**
      * Return the method/constructor annotation of the given type, if available.
-     * 
+     *
      * @param annotationType the annotation type to look for
      * @return the annotation object, or {@code null} if not found
      */
@@ -404,7 +404,7 @@ public Annotation[] getParameterAnnotations() {
 
     /**
      * Return the parameter annotation of the given type, if available.
-     * 
+     *
      * @param annotationType the annotation type to look for
      * @return the annotation object, or {@code null} if not found
      */
@@ -445,7 +445,7 @@ public void initParameterNameDiscovery(ParameterNameDiscoverer parameterNameDisc
 
     /**
      * Return the name of the method/constructor parameter.
-     * 
+     *
      * @return the parameter name (may be {@code null} if no parameter name metadata is contained in the class file or no
      *         {@link #initParameterNameDiscovery ParameterNameDiscoverer} has been set to begin with)
      */
@@ -466,7 +466,7 @@ public String getParameterName() {
      * A template method to post-process a given annotation instance before returning it to the caller.
      * <p>
      * The default implementation simply returns the given annotation as-is.
-     * 
+     *
      * @param annotation the annotation about to be returned
      * @return the post-processed annotation (or simply the original one)
      */
@@ -478,7 +478,7 @@ protected <A extends Annotation> A adaptAnnotation(A annotation) {
      * A template method to post-process a given annotation array before returning it to the caller.
      * <p>
      * The default implementation simply returns the given annotation array as-is.
-     * 
+     *
      * @param annotations the annotation array about to be returned
      * @return the post-processed annotation array (or simply the original one)
      */
@@ -507,7 +507,7 @@ public int hashCode() {
      * Create a new MethodParameter for the given method or constructor.
      * <p>
      * This is a convenience constructor for scenarios where a Method or Constructor reference is treated in a generic fashion.
-     * 
+     *
      * @param methodOrConstructor the Method or Constructor to specify a parameter for
      * @param parameterIndex the index of the parameter
      * @return the corresponding MethodParameter instance
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/ParameterNameDiscoverer.java
rename to src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java
index 5794365a3a..41f6721c41 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/ParameterNameDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -29,7 +29,7 @@ public interface ParameterNameDiscoverer {
 
     /**
      * Return parameter names for this method, or {@code null} if they cannot be determined.
-     * 
+     *
      * @param method method to find parameter names for
      * @return an array of parameter names if the names can be resolved, or {@code null} if they cannot
      */
@@ -37,7 +37,7 @@ public interface ParameterNameDiscoverer {
 
     /**
      * Return parameter names for this constructor, or {@code null} if they cannot be determined.
-     * 
+     *
      * @param ctor constructor to find parameter names for
      * @return an array of parameter names if the names can be resolved, or {@code null} if they cannot
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java
rename to src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java
index d5b115887d..a59f3ecd4f 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.util.*;
 
-import com.lambdaworks.redis.LettuceStrings;
+import io.lettuce.core.LettuceStrings;
 
 /**
  * Base class for all types that include parametrization of some kind. Crucial as we have to take note of the parent class we
@@ -33,7 +33,7 @@ class ParametrizedTypeInformation<T> extends ParentTypeAwareTypeInformation<T> {
 
     /**
      * Creates a new {@link ParametrizedTypeInformation} for the given {@link Type} and parent {@link TypeDiscoverer}.
-     * 
+     *
      * @param type must not be {@literal null}
      * @param parent must not be {@literal null}
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ParentTypeAwareTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/ParentTypeAwareTypeInformation.java
rename to src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java
index 935b5064a2..75d1a42911 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/ParentTypeAwareTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
@@ -30,7 +30,7 @@ abstract class ParentTypeAwareTypeInformation<S> extends TypeDiscoverer<S> {
 
     /**
      * Creates a new {@link ParentTypeAwareTypeInformation}.
-     * 
+     *
      * @param type must not be {@literal null}.
      * @param parent must not be {@literal null}.
      * @param map must not be {@literal null}.
@@ -43,7 +43,7 @@ protected ParentTypeAwareTypeInformation(Type type, TypeDiscoverer<?> parent, Ma
 
     /**
      * Merges the type variable maps of the given parent with the new map.
-     * 
+     *
      * @param parent must not be {@literal null}.
      * @param map must not be {@literal null}.
      * @return
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ReflectionUtils.java b/src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/ReflectionUtils.java
rename to src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java
index 4bcd5a6561..a06e718387 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/ReflectionUtils.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.lang.reflect.*;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Simple utility class for working with the reflection API and handling reflection exceptions.
@@ -36,7 +36,7 @@ public abstract class ReflectionUtils {
      * has a primitive type.
      * <p>
      * Thrown exceptions are handled via a call to {@link #handleReflectionException(Exception)}.
-     * 
+     *
      * @param field the field to get
      * @param target the target object from which to get the field
      * @return the field's current value
@@ -56,7 +56,7 @@ public static Object getField(Field field, Object target) {
      * superclasses up to {@code Object}.
      * <p>
      * Returns {@code null} if no {@link Method} can be found.
-     * 
+     *
      * @param clazz the class to introspect
      * @param name the name of the method
      * @return the Method object, or {@code null} if none found
@@ -70,7 +70,7 @@ public static Method findMethod(Class<?> clazz, String name) {
      * superclasses up to {@code Object}.
      * <p>
      * Returns {@code null} if no {@link Method} can be found.
-     * 
+     *
      * @param clazz the class to introspect
      * @param name the name of the method
      * @param paramTypes the parameter types of the method (may be {@code null} to indicate any signature)
@@ -98,7 +98,7 @@ public static Method findMethod(Class<?> clazz, String name, Class<?>... paramTy
      * {@code null} when invoking a static {@link Method}.
      * <p>
      * Thrown exceptions are handled via a call to {@link #handleReflectionException}.
-     * 
+     *
      * @param method the method to invoke
      * @param target the target object to invoke the method on
      * @return the invocation result, if any
@@ -113,7 +113,7 @@ public static Object invokeMethod(Method method, Object target) {
      * be {@code null} when invoking a static {@link Method}.
      * <p>
      * Thrown exceptions are handled via a call to {@link #handleReflectionException}.
-     * 
+     *
      * @param method the method to invoke
      * @param target the target object to invoke the method on
      * @param args the invocation arguments (may be {@code null})
@@ -134,7 +134,7 @@ public static Object invokeMethod(Method method, Object target, Object... args)
      * <p>
      * Throws the underlying RuntimeException or Error in case of an InvocationTargetException with such a root cause. Throws an
      * IllegalStateException with an appropriate message or UndeclaredThrowableException otherwise.
-     * 
+     *
      * @param ex the reflection exception to handle
      */
     public static void handleReflectionException(Exception ex) {
@@ -159,7 +159,7 @@ public static void handleReflectionException(Exception ex) {
      * <p>
      * Throws the underlying RuntimeException or Error in case of such a root cause. Throws an UndeclaredThrowableException
      * otherwise.
-     * 
+     *
      * @param ex the invocation target exception to handle
      */
     public static void handleInvocationTargetException(InvocationTargetException ex) {
@@ -173,7 +173,7 @@ public static void handleInvocationTargetException(InvocationTargetException ex)
      * <p>
      * Rethrows the underlying exception cast to a {@link RuntimeException} or {@link Error} if appropriate; otherwise, throws
      * an {@link UndeclaredThrowableException}.
-     * 
+     *
      * @param ex the exception to rethrow
      * @throws RuntimeException the rethrown exception
      */
@@ -191,7 +191,7 @@ public static void rethrowRuntimeException(Throwable ex) {
      * Perform the given callback operation on all matching methods of the given class and superclasses.
      * <p>
      * The same named method occurring on subclass and superclass will appear twice, unless excluded by a {@link MethodFilter}.
-     * 
+     *
      * @param clazz the class to introspect
      * @param mc the callback to invoke for each method
      * @see #doWithMethods(Class, MethodCallback, MethodFilter)
@@ -206,7 +206,7 @@ public static void doWithMethods(Class<?> clazz, MethodCallback mc) {
      * <p>
      * The same named method occurring on subclass and superclass will appear twice, unless excluded by the specified
      * {@link MethodFilter}.
-     * 
+     *
      * @param clazz the class to introspect
      * @param mc the callback to invoke for each method
      * @param mf the filter that determines the methods to apply the callback to
@@ -237,7 +237,7 @@ public static void doWithMethods(Class<?> clazz, MethodCallback mc, MethodFilter
      * This variant retrieves {@link Class#getDeclaredMethods()} from a local cache in order to avoid the JVM's SecurityManager
      * check and defensive array copying. In addition, it also includes Java 8 default methods from locally implemented
      * interfaces, since those are effectively to be treated just like declared methods.
-     * 
+     *
      * @param clazz the class to introspect
      * @return the cached array of methods
      * @see Class#getDeclaredMethods()
@@ -278,7 +278,7 @@ private static List<Method> findConcreteMethodsOnInterfaces(Class<?> clazz) {
 
     /**
      * Invoke the given callback on all fields in the target class, going up the class hierarchy to get all declared fields.
-     * 
+     *
      * @param clazz the target class to analyze
      * @param fc the callback to invoke for each field
      */
@@ -288,7 +288,7 @@ public static void doWithFields(Class<?> clazz, FieldCallback fc) {
 
     /**
      * Invoke the given callback on all fields in the target class, going up the class hierarchy to get all declared fields.
-     * 
+     *
      * @param clazz the target class to analyze
      * @param fc the callback to invoke for each field
      * @param ff the filter that determines the fields to apply the callback to
@@ -319,7 +319,7 @@ public interface MethodCallback {
 
         /**
          * Perform an operation using the given method.
-         * 
+         *
          * @param method the method to operate on
          */
         void doWith(Method method) throws IllegalArgumentException, IllegalAccessException;
@@ -332,7 +332,7 @@ public interface MethodFilter {
 
         /**
          * Determine whether the given method matches.
-         * 
+         *
          * @param method the method to check
          */
         boolean matches(Method method);
@@ -345,7 +345,7 @@ public interface FieldCallback {
 
         /**
          * Perform an operation using the given field.
-         * 
+         *
          * @param field the field to operate on
          */
         void doWith(Field field) throws IllegalArgumentException, IllegalAccessException;
@@ -358,7 +358,7 @@ public interface FieldFilter {
 
         /**
          * Determine whether the given field matches.
-         * 
+         *
          * @param field the field to check
          */
         boolean matches(Field field);
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java b/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java
rename to src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java
index bbaaae8f08..83e57ed727 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/ResolvableType.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.io.Serializable;
 import java.lang.reflect.*;
@@ -22,11 +22,11 @@
 import java.util.IdentityHashMap;
 import java.util.Map;
 
-import com.lambdaworks.redis.LettuceStrings;
-import com.lambdaworks.redis.dynamic.support.TypeWrapper.MethodParameterTypeProvider;
-import com.lambdaworks.redis.dynamic.support.TypeWrapper.TypeProvider;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceClassUtils;
+import io.lettuce.core.LettuceStrings;
+import io.lettuce.core.dynamic.support.TypeWrapper.MethodParameterTypeProvider;
+import io.lettuce.core.dynamic.support.TypeWrapper.TypeProvider;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceClassUtils;
 
 /**
  * Encapsulates a Java {@link java.lang.reflect.Type}, providing access to {@link #getSuperType() supertypes},
@@ -147,7 +147,7 @@ public Object getSource() {
 
     /**
      * Determine whether the given object is an instance of this {@code ResolvableType}.
-     * 
+     *
      * @param obj the object to check
      * @see #isAssignableFrom(Class)
      */
@@ -157,7 +157,7 @@ public boolean isInstance(Object obj) {
 
     /**
      * Determine whether this {@code ResolvableType} is assignable from the specified other type.
-     * 
+     *
      * @param other the type to be checked against (as a {@code Class})
      * @see #isAssignableFrom(ResolvableType)
      */
@@ -171,7 +171,7 @@ public boolean isAssignableFrom(Class<?> other) {
      * Attempts to follow the same rules as the Java compiler, considering whether both the {@link #resolve() resolved}
      * {@code Class} is {@link Class#isAssignableFrom(Class) assignable from} the given type as well as whether all
      * {@link #getGenerics() generics} are assignable.
-     * 
+     *
      * @param other the type to be checked against (as a {@code ResolvableType})
      * @return {@code true} if the specified other type can be assigned to this {@code ResolvableType}; {@code false} otherwise
      */
@@ -273,7 +273,7 @@ private boolean isAssignableFrom(ResolvableType other, Map<Type, Type> matchedBe
 
     /**
      * Return {@code true} if this type resolves to a Class that represents an array.
-     * 
+     *
      * @see #getComponentType()
      */
     public boolean isArray() {
@@ -287,7 +287,7 @@ public boolean isArray() {
     /**
      * Return the ResolvableType representing the component type of the array or {@link #NONE} if this type does not represent
      * an array.
-     * 
+     *
      * @see #isArray()
      */
     public ResolvableType getComponentType() {
@@ -310,7 +310,7 @@ public ResolvableType getComponentType() {
     /**
      * Convenience method to return this type as a resolvable {@link Collection} type. Returns {@link #NONE} if this type does
      * not implement or extend {@link Collection}.
-     * 
+     *
      * @see #as(Class)
      * @see #asMap()
      */
@@ -321,7 +321,7 @@ public ResolvableType asCollection() {
     /**
      * Convenience method to return this type as a resolvable {@link Map} type. Returns {@link #NONE} if this type does not
      * implement or extend {@link Map}.
-     * 
+     *
      * @see #as(Class)
      * @see #asCollection()
      */
@@ -333,7 +333,7 @@ public ResolvableType asMap() {
      * Return this type as a {@link ResolvableType} of the specified class. Searches {@link #getSuperType() supertype} and
      * {@link #getInterfaces() interface} hierarchies to find a match, returning {@link #NONE} if this type does not implement
      * or extend the specified class.
-     * 
+     *
      * @param type the required class type
      * @return a {@link ResolvableType} representing this object as the specified type, or {@link #NONE} if not resolvable as
      *         that type
@@ -361,7 +361,7 @@ public ResolvableType as(Class<?> type) {
     /**
      * Return a {@link ResolvableType} representing the direct supertype of this type. If no supertype is available this method
      * returns {@link #NONE}.
-     * 
+     *
      * @see #getInterfaces()
      */
     public ResolvableType getSuperType() {
@@ -378,7 +378,7 @@ public ResolvableType getSuperType() {
     /**
      * Return a {@link ResolvableType} array representing the direct interfaces implemented by this type. If this type does not
      * implement any interfaces an empty array is returned.
-     * 
+     *
      * @see #getSuperType()
      */
     public ResolvableType[] getInterfaces() {
@@ -395,7 +395,7 @@ public ResolvableType[] getInterfaces() {
 
     /**
      * Return {@code true} if this type contains generic parameters.
-     * 
+     *
      * @see #getGeneric(int...)
      * @see #getGenerics()
      */
@@ -486,7 +486,7 @@ private boolean isWildcardWithoutBounds() {
 
     /**
      * Return a {@link ResolvableType} for the specified nesting level. See {@link #getNested(int, Map)} for details.
-     * 
+     *
      * @param nestingLevel the nesting level
      * @return the {@link ResolvableType} type, or {@code #NONE}
      */
@@ -509,7 +509,7 @@ public ResolvableType getNested(int nestingLevel) {
      * <p>
      * If a type does not {@link #hasGenerics() contain} generics the {@link #getSuperType() supertype} hierarchy will be
      * considered.
-     * 
+     *
      * @param nestingLevel the required nesting level, indexed from 1 for the current type, 2 for the first nested generic, 3
      *        for the second and so on
      * @param typeIndexesPerLevel a map containing the generic index for a given nesting level (may be {@code null})
@@ -540,7 +540,7 @@ public ResolvableType getNested(int nestingLevel, Map<Integer, Integer> typeInde
      * {@code String} from the nested {@code List}. For convenience, if no indexes are specified the first generic is returned.
      * <p>
      * If no generic is available at the specified indexes {@link #NONE} is returned.
-     * 
+     *
      * @param indexes the indexes that refer to the generic parameter (may be omitted to return the first generic)
      * @return a {@link ResolvableType} for the specified generic or {@link #NONE}
      * @see #hasGenerics()
@@ -567,7 +567,7 @@ public ResolvableType getGeneric(int... indexes) {
      * Return an array of {@link ResolvableType}s representing the generic parameters of this type. If no generics are available
      * an empty array is returned. If you need to access a specific generic consider using the {@link #getGeneric(int...)}
      * method as it allows access to nested generics and protects against {@code IndexOutOfBoundsExceptions}.
-     * 
+     *
      * @return an array of {@link ResolvableType}s representing the generic parameters (never {@code null})
      * @see #hasGenerics()
      * @see #getGeneric(int...)
@@ -598,7 +598,7 @@ public ResolvableType[] getGenerics() {
 
     /**
      * Convenience method that will {@link #getGenerics() get} and {@link #resolve() resolve} generic parameters.
-     * 
+     *
      * @return an array of resolved generic parameters (the resulting array will never be {@code null}, but it may contain
      *         {@code null} elements})
      * @see #getGenerics()
@@ -611,7 +611,7 @@ public Class<?>[] resolveGenerics() {
     /**
      * Convenience method that will {@link #getGenerics() get} and {@link #resolve() resolve} generic parameters, using the
      * specified {@code fallback} if any type cannot be resolved.
-     * 
+     *
      * @param fallback the fallback class to use if resolution fails (may be {@code null})
      * @return an array of resolved generic parameters (the resulting array will never be {@code null}, but it may contain
      *         {@code null} elements})
@@ -630,7 +630,7 @@ public Class<?>[] resolveGenerics(Class<?> fallback) {
     /**
      * Convenience method that will {@link #getGeneric(int...) get} and {@link #resolve() resolve} a specific generic
      * parameters.
-     * 
+     *
      * @param indexes the indexes that refer to the generic parameter (may be omitted to return the first generic)
      * @return a resolved {@link Class} or {@code null}
      * @see #getGeneric(int...)
@@ -644,7 +644,7 @@ public Class<?> resolveGeneric(int... indexes) {
      * Resolve this type to a {@link java.lang.Class}, returning {@code null} if the type cannot be resolved. This method will
      * consider bounds of {@link TypeVariable}s and {@link WildcardType}s if direct resolution fails; however, bounds of
      * {@code Object.class} will be ignored.
-     * 
+     *
      * @return the resolved {@link Class}, or {@code null} if not resolvable
      * @see #resolve(Class)
      * @see #resolveGeneric(int...)
@@ -658,7 +658,7 @@ public Class<?> resolve() {
      * Resolve this type to a {@link java.lang.Class}, returning the specified {@code fallback} if the type cannot be resolved.
      * This method will consider bounds of {@link TypeVariable}s and {@link WildcardType}s if direct resolution fails; however,
      * bounds of {@code Object.class} will be ignored.
-     * 
+     *
      * @param fallback the fallback class to use if resolution fails (may be {@code null})
      * @return the resolved {@link Class} or the {@code fallback}
      * @see #resolve()
@@ -819,7 +819,7 @@ public String toString() {
     /**
      * Return a {@link ResolvableType} for the specified {@link Class}, using the full generic type information for
      * assignability checks. For example: {@code ResolvableType.forClass(MyArrayList.class)}.
-     * 
+     *
      * @param sourceClass the source class ({@code null} is semantically equivalent to {@code Object.class} for typical use
      *        cases here}
      * @return a {@link ResolvableType} for the specified class
@@ -834,7 +834,7 @@ public static ResolvableType forClass(Class<?> sourceClass) {
      * Return a {@link ResolvableType} for the specified {@link Class}, doing assignability checks against the raw class only
      * (analogous to {@link Class#isAssignableFrom}, which this serves as a wrapper for. For example:
      * {@code ResolvableType.forClass(MyArrayList.class)}.
-     * 
+     *
      * @param sourceClass the source class ({@code null} is semantically equivalent to {@code Object.class} for typical use
      *        cases here}
      * @return a {@link ResolvableType} for the specified class
@@ -853,7 +853,7 @@ public boolean isAssignableFrom(Class<?> other) {
     /**
      * Return a {@link ResolvableType} for the specified {@link Class} with a given implementation. For example:
      * {@code ResolvableType.forClass(List.class, MyArrayList.class)}.
-     * 
+     *
      * @param sourceClass the source class (must not be {@code null}
      * @param implementationClass the implementation class
      * @return a {@link ResolvableType} for the specified class backed by the given implementation class
@@ -868,7 +868,7 @@ public static ResolvableType forClass(Class<?> sourceClass, Class<?> implementat
 
     /**
      * Return a {@link ResolvableType} for the specified {@link Class} with pre-declared generics.
-     * 
+     *
      * @param sourceClass the source class
      * @param generics the generics of the class
      * @return a {@link ResolvableType} for the specific class and generics
@@ -886,7 +886,7 @@ public static ResolvableType forClassWithGenerics(Class<?> sourceClass, Class<?>
 
     /**
      * Return a {@link ResolvableType} for the specified {@link Class} with pre-declared generics.
-     * 
+     *
      * @param sourceClass the source class
      * @param generics the generics of the class
      * @return a {@link ResolvableType} for the specific class and generics
@@ -911,7 +911,7 @@ public static ResolvableType forClassWithGenerics(Class<?> sourceClass, Resolvab
 
     /**
      * Return a {@link ResolvableType} for the specified {@link Method} return type.
-     * 
+     *
      * @param method the source for the method return type
      * @return a {@link ResolvableType} for the specified method return
      * @see #forMethodReturnType(Method, Class)
@@ -924,7 +924,7 @@ public static ResolvableType forMethodReturnType(Method method) {
     /**
      * Return a {@link ResolvableType} for the specified {@link Method} return type. Use this variant when the class that
      * declares the method includes generic parameter variables that are satisfied by the implementation class.
-     * 
+     *
      * @param method the source for the method return type
      * @param implementationClass the implementation class
      * @return a {@link ResolvableType} for the specified method return
@@ -939,7 +939,7 @@ public static ResolvableType forMethodReturnType(Method method, Class<?> impleme
 
     /**
      * Return a {@link ResolvableType} for the specified {@link Method} parameter.
-     * 
+     *
      * @param method the source method (must not be {@code null})
      * @param parameterIndex the parameter index
      * @return a {@link ResolvableType} for the specified method parameter
@@ -955,7 +955,7 @@ public static ResolvableType forMethodParameter(Method method, int parameterInde
      * Return a {@link ResolvableType} for the specified {@link Method} parameter with a given implementation. Use this variant
      * when the class that declares the method includes generic parameter variables that are satisfied by the implementation
      * class.
-     * 
+     *
      * @param method the source method (must not be {@code null})
      * @param parameterIndex the parameter index
      * @param implementationClass the implementation class
@@ -972,7 +972,7 @@ public static ResolvableType forMethodParameter(Method method, int parameterInde
 
     /**
      * Return a {@link ResolvableType} for the specified {@link MethodParameter}.
-     * 
+     *
      * @param methodParameter the source method parameter (must not be {@code null})
      * @return a {@link ResolvableType} for the specified method parameter
      * @see #forMethodParameter(Method, int)
@@ -985,7 +985,7 @@ public static ResolvableType forMethodParameter(MethodParameter methodParameter)
      * Return a {@link ResolvableType} for the specified {@link MethodParameter} with a given implementation type. Use this
      * variant when the class that declares the method includes generic parameter variables that are satisfied by the
      * implementation type.
-     * 
+     *
      * @param methodParameter the source method parameter (must not be {@code null})
      * @param implementationType the implementation type
      * @return a {@link ResolvableType} for the specified method parameter
@@ -1002,7 +1002,7 @@ public static ResolvableType forMethodParameter(MethodParameter methodParameter,
     /**
      * Return a {@link ResolvableType} for the specified {@link MethodParameter}, overriding the target type to resolve with a
      * specific given type.
-     * 
+     *
      * @param methodParameter the source method parameter (must not be {@code null})
      * @param targetType the type to resolve (a part of the method parameter's type)
      * @return a {@link ResolvableType} for the specified method parameter
@@ -1017,7 +1017,7 @@ public static ResolvableType forMethodParameter(MethodParameter methodParameter,
 
     /**
      * Resolve the top-level parameter type of the given {@code MethodParameter}.
-     * 
+     *
      * @param methodParameter the method parameter to resolve
      * @see MethodParameter#setParameterType
      */
@@ -1030,7 +1030,7 @@ static void resolveMethodParameter(MethodParameter methodParameter) {
 
     /**
      * Return a {@link ResolvableType} as a array of the specified {@code componentType}.
-     * 
+     *
      * @param componentType the component type
      * @return a {@link ResolvableType} as an array of the specified component type
      */
@@ -1051,7 +1051,7 @@ private static ResolvableType[] forTypes(Type[] types, VariableResolver owner) {
     /**
      * Return a {@link ResolvableType} for the specified {@link Type}. Note: The resulting {@link ResolvableType} may not be
      * {@link Serializable}.
-     * 
+     *
      * @param type the source type or {@code null}
      * @return a {@link ResolvableType} for the specified {@link Type}
      * @see #forType(Type, ResolvableType)
@@ -1063,7 +1063,7 @@ public static ResolvableType forType(Type type) {
     /**
      * Return a {@link ResolvableType} for the specified {@link Type} backed by the given owner type. Note: The resulting
      * {@link ResolvableType} may not be {@link Serializable}.
-     * 
+     *
      * @param type the source type or {@code null}
      * @param owner the owner type used to resolve variables
      * @return a {@link ResolvableType} for the specified {@link Type} and owner
@@ -1079,7 +1079,7 @@ public static ResolvableType forType(Type type, ResolvableType owner) {
 
     /**
      * Return a {@link ResolvableType} for the specified {@link Type} backed by a given {@link VariableResolver}.
-     * 
+     *
      * @param type the source type or {@code null}
      * @param variableResolver the variable resolver or {@code null}
      * @return a {@link ResolvableType} for the specified {@link Type} and {@link VariableResolver}
@@ -1090,7 +1090,7 @@ public static ResolvableType forType(Type type, VariableResolver variableResolve
 
     /**
      * Return a {@link ResolvableType} for the specified {@link Type} backed by a given {@link VariableResolver}.
-     * 
+     *
      * @param type the source type or {@code null}
      * @param typeProvider the type provider or {@code null}
      * @param variableResolver the variable resolver or {@code null}
@@ -1125,7 +1125,7 @@ public interface VariableResolver extends Serializable {
 
         /**
          * Resolve the specified variable.
-         * 
+         *
          * @param variable the variable to resolve
          * @return the resolved variable, or {@code null} if not found
          */
@@ -1230,7 +1230,7 @@ private static class WildcardBounds {
 
         /**
          * Internal constructor to create a new {@link WildcardBounds} instance.
-         * 
+         *
          * @param kind the kind of bounds
          * @param bounds the bounds
          * @see #get(ResolvableType)
@@ -1249,7 +1249,7 @@ public boolean isSameKind(WildcardBounds bounds) {
 
         /**
          * Return {@code true} if this bounds is assignable to all the specified types.
-         * 
+         *
          * @param types the types to test against
          * @return {@code true} if this bounds is assignable to all types
          */
@@ -1278,7 +1278,7 @@ public ResolvableType[] getBounds() {
         /**
          * Get a {@link WildcardBounds} instance for the specified type, returning {@code null} if the specified type cannot be
          * resolved to a {@link WildcardType}.
-         * 
+         *
          * @param type the source type
          * @return a {@link WildcardBounds} instance or {@code null}
          */
@@ -1314,7 +1314,7 @@ enum Kind {
      * <p>
      * Compares arrays with {@code Arrays.equals}, performing an equality check based on the array elements rather than the
      * array reference.
-     * 
+     *
      * @param o1 first Object to compare
      * @param o2 second Object to compare
      * @return whether the given objects are equal
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/StandardReflectionParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/StandardReflectionParameterNameDiscoverer.java
rename to src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java
index a7c826fa48..f72e4c9027 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/StandardReflectionParameterNameDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java
rename to src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java
index b0e71adeb0..1815c9b8d0 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.lang.reflect.*;
 import java.util.*;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Basic {@link TypeDiscoverer} that contains basic functionality to discover property types.
@@ -39,7 +39,7 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
 
     /**
      * Creates a new {@link TypeDiscoverer} for the given type and type variable map.
-     * 
+     *
      * @param type must not be {@literal null}.
      * @param typeVariableMap must not be {@literal null}.
      */
@@ -55,7 +55,7 @@ protected TypeDiscoverer(Type type, Map<TypeVariable<?>, Type> typeVariableMap)
 
     /**
      * Returns the type variable map.
-     * 
+     *
      * @return
      */
     public Map<TypeVariable<?>, Type> getTypeVariableMap() {
@@ -64,7 +64,7 @@ public Map<TypeVariable<?>, Type> getTypeVariableMap() {
 
     /**
      * Creates {@link TypeInformation} for the given {@link Type}.
-     * 
+     *
      * @param fieldType
      * @return
      */
@@ -117,7 +117,7 @@ protected TypeInformation<?> createInfo(Type fieldType) {
 
     /**
      * Resolves the given type into a plain {@link Class}.
-     * 
+     *
      * @param type
      * @return
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java
rename to src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java
index 167a92c7b0..9345daef7f 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -31,7 +31,7 @@ public interface TypeInformation<S> {
 
     /**
      * Returns the {@link TypeInformation}s for the parameters of the given {@link Constructor}.
-     * 
+     *
      * @param constructor must not be {@literal null}.
      * @return
      */
@@ -41,14 +41,14 @@ public interface TypeInformation<S> {
      * Returns whether the type can be considered a collection, which means it's a container of elements, e.g. a
      * {@link java.util.Collection} and {@link java.lang.reflect.Array} or anything implementing {@link Iterable}. If this
      * returns {@literal true} you can expect {@link #getComponentType()} to return a non-{@literal null} value.
-     * 
+     *
      * @return
      */
     boolean isCollectionLike();
 
     /**
      * Returns the component type for {@link java.util.Collection}s or the key type for {@link java.util.Map}s.
-     * 
+     *
      * @return
      */
     TypeInformation<?> getComponentType();
@@ -56,28 +56,28 @@ public interface TypeInformation<S> {
     /**
      * Returns whether the property is a {@link java.util.Map}. If this returns {@literal true} you can expect
      * {@link #getComponentType()} as well as {@link #getMapValueType()} to return something not {@literal null}.
-     * 
+     *
      * @return
      */
     boolean isMap();
 
     /**
      * Will return the type of the value in case the underlying type is a {@link java.util.Map}.
-     * 
+     *
      * @return
      */
     TypeInformation<?> getMapValueType();
 
     /**
      * Returns the type of the property. Will resolve generics and the generic context of
-     * 
+     *
      * @return
      */
     Class<S> getType();
 
     /**
      * Returns a {@link ClassTypeInformation} to represent the {@link TypeInformation} of the raw type of the current instance.
-     * 
+     *
      * @return
      */
     ClassTypeInformation<?> getRawTypeInformation();
@@ -85,7 +85,7 @@ public interface TypeInformation<S> {
     /**
      * Transparently returns the {@link java.util.Map} value type if the type is a {@link java.util.Map}, returns the component
      * type if the type {@link #isCollectionLike()} or the simple type if none of this applies.
-     * 
+     *
      * @return
      */
     TypeInformation<?> getActualType();
@@ -93,7 +93,7 @@ public interface TypeInformation<S> {
     /**
      * Returns a {@link TypeInformation} for the return type of the given {@link Method}. Will potentially resolve generics
      * information against the current types type parameter bindings.
-     * 
+     *
      * @param method must not be {@literal null}.
      * @return
      */
@@ -101,7 +101,7 @@ public interface TypeInformation<S> {
 
     /**
      * Returns the {@link TypeInformation}s for the parameters of the given {@link Method}.
-     * 
+     *
      * @param method must not be {@literal null}.
      * @return
      */
@@ -109,7 +109,7 @@ public interface TypeInformation<S> {
 
     /**
      * Returns the {@link TypeInformation} for the given raw super type.
-     * 
+     *
      * @param superType must not be {@literal null}.
      * @return the {@link TypeInformation} for the given raw super type or {@literal null} in case the current
      *         {@link TypeInformation} does not implement the given type.
@@ -120,7 +120,7 @@ public interface TypeInformation<S> {
      * Returns if the current {@link TypeInformation} can be safely assigned to the given one. Mimics semantics of
      * {@link Class#isAssignableFrom(Class)} but takes generics into account. Thus it will allow to detect that a
      * {@code List<Long>} is assignable to {@code List<? extends Number>}.
-     * 
+     *
      * @param target
      * @return
      */
@@ -128,7 +128,7 @@ public interface TypeInformation<S> {
 
     /**
      * Returns the {@link TypeInformation} for the type arguments of the current {@link TypeInformation}.
-     * 
+     *
      * @return
      */
     List<TypeInformation<?>> getTypeArguments();
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java
rename to src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java
index 3d0ffae9fa..a3b1e4cf68 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeVariableTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Special {@link TypeDiscoverer} to determine the actual type for a {@link TypeVariable}. Will consider the context the
@@ -36,7 +36,7 @@ public class TypeVariableTypeInformation<T> extends ParentTypeAwareTypeInformati
     /**
      * Creates a bew {@link TypeVariableTypeInformation} for the given {@link TypeVariable} owning {@link Type} and parent
      * {@link TypeDiscoverer}.
-     * 
+     *
      * @param variable must not be {@literal null}
      * @param owningType must not be {@literal null}
      * @param parent
@@ -67,7 +67,7 @@ public Class<T> getType() {
 
     /**
      * Returns the index of the type parameter binding the given {@link TypeVariable}.
-     * 
+     *
      * @param variable
      * @return
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeWrapper.java b/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java
similarity index 99%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/TypeWrapper.java
rename to src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java
index 9e784ab900..29ea0ba463 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/TypeWrapper.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.lang.reflect.*;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Internal utility class that can be used to obtain wrapped {@link Serializable} variants of {@link java.lang.reflect.Type}s.
@@ -109,7 +109,7 @@ public Type getType() {
 
     /**
      * Unwrap the given type, effectively returning the original non-serializable type.
-     * 
+     *
      * @param type the type to unwrap
      * @return the original non-serializable type
      */
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformation.java
rename to src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java
index 47680f3530..a641f42f25 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
diff --git a/src/main/java/com/lambdaworks/redis/dynamic/support/package-info.java b/src/main/java/io/lettuce/core/dynamic/support/package-info.java
similarity index 57%
rename from src/main/java/com/lambdaworks/redis/dynamic/support/package-info.java
rename to src/main/java/io/lettuce/core/dynamic/support/package-info.java
index 283d71df4b..c393cb8389 100644
--- a/src/main/java/com/lambdaworks/redis/dynamic/support/package-info.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Support classes imported from the Spring Framework.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
diff --git a/src/main/java/com/lambdaworks/redis/event/DefaultEventBus.java b/src/main/java/io/lettuce/core/event/DefaultEventBus.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/event/DefaultEventBus.java
rename to src/main/java/io/lettuce/core/event/DefaultEventBus.java
index a80911706a..09d7e39315 100644
--- a/src/main/java/com/lambdaworks/redis/event/DefaultEventBus.java
+++ b/src/main/java/io/lettuce/core/event/DefaultEventBus.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event;
+package io.lettuce.core.event;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.TopicProcessor;
@@ -21,7 +21,7 @@
 
 /**
  * Default implementation for an {@link EventBus}. Events are published using a {@link Scheduler}.
- * 
+ *
  * @author Mark Paluch
  * @since 3.4
  */
diff --git a/src/main/java/com/lambdaworks/redis/event/DefaultEventPublisherOptions.java b/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/event/DefaultEventPublisherOptions.java
rename to src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java
index 2283d574a6..a3220988a2 100644
--- a/src/main/java/com/lambdaworks/redis/event/DefaultEventPublisherOptions.java
+++ b/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event;
+package io.lettuce.core.event;
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.metrics.CommandLatencyCollectorOptions;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.metrics.CommandLatencyCollectorOptions;
 
 /**
  * The default implementation of {@link CommandLatencyCollectorOptions}.
@@ -99,7 +99,7 @@ public TimeUnit eventEmitIntervalUnit() {
 
     /**
      * Create a new {@link DefaultEventPublisherOptions} using default settings.
-     * 
+     *
      * @return a new instance of a default {@link DefaultEventPublisherOptions} instance
      */
     public static DefaultEventPublisherOptions create() {
@@ -108,7 +108,7 @@ public static DefaultEventPublisherOptions create() {
 
     /**
      * Create a disabled {@link DefaultEventPublisherOptions} using default settings.
-     * 
+     *
      * @return a new instance of a default {@link DefaultEventPublisherOptions} instance with disabled event emission
      */
     public static DefaultEventPublisherOptions disabled() {
diff --git a/src/main/java/com/lambdaworks/redis/event/Event.java b/src/main/java/io/lettuce/core/event/Event.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/event/Event.java
rename to src/main/java/io/lettuce/core/event/Event.java
index c6101cadcc..1a79a478a9 100644
--- a/src/main/java/com/lambdaworks/redis/event/Event.java
+++ b/src/main/java/io/lettuce/core/event/Event.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event;
+package io.lettuce.core.event;
 
 /**
  *
  * Marker-interface for events that are published over the event bus.
- * 
+ *
  * @author Mark Paluch
  * @since 3.4
  */
diff --git a/src/main/java/com/lambdaworks/redis/event/EventBus.java b/src/main/java/io/lettuce/core/event/EventBus.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/event/EventBus.java
rename to src/main/java/io/lettuce/core/event/EventBus.java
index 758c8ca44f..309dbd8710 100644
--- a/src/main/java/com/lambdaworks/redis/event/EventBus.java
+++ b/src/main/java/io/lettuce/core/event/EventBus.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event;
+package io.lettuce.core.event;
 
 import reactor.core.publisher.Flux;
 
 /**
  * Interface for an EventBus. Events can be published over the bus that are delivered to the subscribers.
- * 
+ *
  * @author Mark Paluch
  * @since 3.4
  */
diff --git a/src/main/java/com/lambdaworks/redis/event/EventPublisherOptions.java b/src/main/java/io/lettuce/core/event/EventPublisherOptions.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/event/EventPublisherOptions.java
rename to src/main/java/io/lettuce/core/event/EventPublisherOptions.java
index 5fbeed4fd7..be8df5211b 100644
--- a/src/main/java/com/lambdaworks/redis/event/EventPublisherOptions.java
+++ b/src/main/java/io/lettuce/core/event/EventPublisherOptions.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event;
+package io.lettuce.core.event;
 
 import java.util.concurrent.TimeUnit;
 
 /**
  * Configuration interface for command latency collection.
- * 
+ *
  * @author Mark Paluch
  */
 public interface EventPublisherOptions {
 
     /**
      * Returns the interval for emit metrics.
-     * 
+     *
      * @return the interval for emit metrics
      */
     long eventEmitInterval();
diff --git a/src/main/java/com/lambdaworks/redis/event/connection/ConnectedEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/event/connection/ConnectedEvent.java
rename to src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java
index 4f5644113e..d127c2b83b 100644
--- a/src/main/java/com/lambdaworks/redis/event/connection/ConnectedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event.connection;
+package io.lettuce.core.event.connection;
 
 import java.net.SocketAddress;
 
 /**
  * Event for a established TCP-level connection.
- * 
+ *
  * @author Mark Paluch
  * @since 3.4
  */
diff --git a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionActivatedEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/event/connection/ConnectionActivatedEvent.java
rename to src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java
index 0c67cf0a4f..6a45e2dbb9 100644
--- a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionActivatedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event.connection;
+package io.lettuce.core.event.connection;
 
 import java.net.SocketAddress;
 
-import com.lambdaworks.redis.ClientOptions;
+import io.lettuce.core.ClientOptions;
 
 /**
  * Event for a connection activation (after SSL-handshake, {@link ClientOptions#isPingBeforeActivateConnection() PING before
  * activation}, and buffered command replay).
- * 
+ *
  * @author Mark Paluch
  * @since 3.4
  */
diff --git a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionDeactivatedEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/event/connection/ConnectionDeactivatedEvent.java
rename to src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java
index 17ef1a9bc6..51620f4b53 100644
--- a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionDeactivatedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event.connection;
+package io.lettuce.core.event.connection;
 
 import java.net.SocketAddress;
 
 /**
  * Event for a connection deactivation.
- * 
+ *
  * @author Mark Paluch
  * @since 3.4
  */
diff --git a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java
similarity index 85%
rename from src/main/java/com/lambdaworks/redis/event/connection/ConnectionEvent.java
rename to src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java
index f8a26c0d53..a32e3d280b 100644
--- a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event.connection;
+package io.lettuce.core.event.connection;
 
-import com.lambdaworks.redis.ConnectionId;
-import com.lambdaworks.redis.event.Event;
+import io.lettuce.core.ConnectionId;
+import io.lettuce.core.event.Event;
 
 /**
  * Interface for Connection-related events
- * 
+ *
  * @author Mark Paluch
  * @since 3.4
  */
diff --git a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEventSupport.java b/src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/event/connection/ConnectionEventSupport.java
rename to src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java
index 1834d8572e..a3a8e528c2 100644
--- a/src/main/java/com/lambdaworks/redis/event/connection/ConnectionEventSupport.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event.connection;
+package io.lettuce.core.event.connection;
 
 import java.net.SocketAddress;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * @author Mark Paluch
@@ -38,7 +38,7 @@ abstract class ConnectionEventSupport implements ConnectionEvent {
 
     /**
      * Returns the local address.
-     * 
+     *
      * @return the local address
      */
     public SocketAddress localAddress() {
@@ -47,7 +47,7 @@ public SocketAddress localAddress() {
 
     /**
      * Returns the remote address.
-     * 
+     *
      * @return the remote address
      */
     public SocketAddress remoteAddress() {
diff --git a/src/main/java/com/lambdaworks/redis/event/connection/DisconnectedEvent.java b/src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/event/connection/DisconnectedEvent.java
rename to src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java
index d425ae58de..cf14b0d196 100644
--- a/src/main/java/com/lambdaworks/redis/event/connection/DisconnectedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event.connection;
+package io.lettuce.core.event.connection;
 
 import java.net.SocketAddress;
 
 /**
  * Event for a disconnect on TCP-level.
- * 
+ *
  * @author Mark Paluch
  * @since 3.4
  */
diff --git a/src/main/java/io/lettuce/core/event/connection/package-info.java b/src/main/java/io/lettuce/core/event/connection/package-info.java
new file mode 100644
index 0000000000..70df7b17c5
--- /dev/null
+++ b/src/main/java/io/lettuce/core/event/connection/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Connection-related events.
+ */
+package io.lettuce.core.event.connection;
+
diff --git a/src/main/java/com/lambdaworks/redis/event/metrics/CommandLatencyEvent.java b/src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java
similarity index 87%
rename from src/main/java/com/lambdaworks/redis/event/metrics/CommandLatencyEvent.java
rename to src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java
index 68acb8f97b..fdc4c169de 100644
--- a/src/main/java/com/lambdaworks/redis/event/metrics/CommandLatencyEvent.java
+++ b/src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event.metrics;
+package io.lettuce.core.event.metrics;
 
 import java.util.Map;
 
-import com.lambdaworks.redis.event.Event;
-import com.lambdaworks.redis.metrics.CommandLatencyId;
-import com.lambdaworks.redis.metrics.CommandMetrics;
+import io.lettuce.core.event.Event;
+import io.lettuce.core.metrics.CommandLatencyId;
+import io.lettuce.core.metrics.CommandMetrics;
 
 /**
  * Event that transports command latency metrics. This event carries latencies for multiple commands and connections.
- * 
+ *
  * @author Mark Paluch
  */
 public class CommandLatencyEvent implements Event {
@@ -36,7 +36,7 @@ public CommandLatencyEvent(Map<CommandLatencyId, CommandMetrics> latencies) {
 
     /**
      * Returns the latencies mapped between {@link CommandLatencyId connection/command} and the {@link CommandMetrics metrics}.
-     * 
+     *
      * @return the latency map.
      */
     public Map<CommandLatencyId, CommandMetrics> getLatencies() {
diff --git a/src/main/java/com/lambdaworks/redis/event/metrics/DefaultCommandLatencyEventPublisher.java b/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/event/metrics/DefaultCommandLatencyEventPublisher.java
rename to src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
index 3771565a82..e05f09ca08 100644
--- a/src/main/java/com/lambdaworks/redis/event/metrics/DefaultCommandLatencyEventPublisher.java
+++ b/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event.metrics;
+package io.lettuce.core.event.metrics;
 
-import com.lambdaworks.redis.event.EventBus;
-import com.lambdaworks.redis.event.EventPublisherOptions;
-import com.lambdaworks.redis.metrics.CommandLatencyCollector;
+import io.lettuce.core.event.EventBus;
+import io.lettuce.core.event.EventPublisherOptions;
+import io.lettuce.core.metrics.CommandLatencyCollector;
 
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.ScheduledFuture;
 
 /**
  * Default implementation of a {@link CommandLatencyCollector} for command latencies.
- * 
+ *
  * @author Mark Paluch
  */
 public class DefaultCommandLatencyEventPublisher implements MetricEventPublisher {
diff --git a/src/main/java/com/lambdaworks/redis/event/metrics/MetricEventPublisher.java b/src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/event/metrics/MetricEventPublisher.java
rename to src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java
index 2ed948a5f4..5d017f855f 100644
--- a/src/main/java/com/lambdaworks/redis/event/metrics/MetricEventPublisher.java
+++ b/src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event.metrics;
+package io.lettuce.core.event.metrics;
 
-import com.lambdaworks.redis.event.Event;
+import io.lettuce.core.event.Event;
 
 /**
  * Event publisher which publishes metrics by the use of {@link Event events}.
- * 
+ *
  * @author Mark Paluch
  * @since 3.4
  */
@@ -32,7 +32,7 @@ public interface MetricEventPublisher {
 
     /**
      * Returns {@literal true} if the metric collector is enabled.
-     * 
+     *
      * @return {@literal true} if the metric collector is enabled
      */
     boolean isEnabled();
diff --git a/src/main/java/io/lettuce/core/event/metrics/package-info.java b/src/main/java/io/lettuce/core/event/metrics/package-info.java
new file mode 100644
index 0000000000..a40d1f39ba
--- /dev/null
+++ b/src/main/java/io/lettuce/core/event/metrics/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Metric events and publishing.
+ */
+package io.lettuce.core.event.metrics;
+
diff --git a/src/main/java/com/lambdaworks/redis/event/package-info.java b/src/main/java/io/lettuce/core/event/package-info.java
similarity index 55%
rename from src/main/java/com/lambdaworks/redis/event/package-info.java
rename to src/main/java/io/lettuce/core/event/package-info.java
index 633e6bba7f..3a6dd1e4bd 100644
--- a/src/main/java/com/lambdaworks/redis/event/package-info.java
+++ b/src/main/java/io/lettuce/core/event/package-info.java
@@ -1,5 +1,5 @@
 /**
  * Event publishing and subscription.
  */
-package com.lambdaworks.redis.event;
+package io.lettuce.core.event;
 
diff --git a/src/main/java/com/lambdaworks/redis/internal/AbstractInvocationHandler.java b/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
similarity index 99%
rename from src/main/java/com/lambdaworks/redis/internal/AbstractInvocationHandler.java
rename to src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
index fb3846e4db..3d7ce18da1 100644
--- a/src/main/java/com/lambdaworks/redis/internal/AbstractInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.internal;
+package io.lettuce.core.internal;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
@@ -23,7 +23,7 @@
 
 /**
  * Abstract base class for invocation handlers.
- * 
+ *
  * @since 4.2
  */
 public abstract class AbstractInvocationHandler implements InvocationHandler {
@@ -42,7 +42,7 @@ public abstract class AbstractInvocationHandler implements InvocationHandler {
      * </ul>
      * <li>other method calls are dispatched to {@link #handleInvocation}.
      * </ul>
-     * 
+     *
      * @param proxy the proxy instance that the method was invoked on
      *
      * @param method the {@code Method} instance corresponding to the interface method invoked on the proxy instance. The
@@ -83,7 +83,7 @@ public final Object invoke(Object proxy, Method method, Object[] args) throws Th
     /**
      * {@link #invoke} delegates to this method upon any method invocation on the proxy instance, except {@link Object#equals},
      * {@link Object#hashCode} and {@link Object#toString}. The result will be returned as the proxied method's return value.
-     * 
+     *
      * <p>
      * Unlike {@link #invoke}, {@code args} will never be null. When the method has no parameter, an empty array is passed in.
      *
@@ -123,7 +123,7 @@ public boolean equals(Object obj) {
     /**
      * By default delegates to {@link Object#hashCode}. The dynamic proxies' {@code hashCode()} will delegate to this method.
      * Subclasses can override this method to provide custom equality.
-     * 
+     *
      * @return a hash code value for this object.
      */
     @Override
@@ -134,7 +134,7 @@ public int hashCode() {
     /**
      * By default delegates to {@link Object#toString}. The dynamic proxies' {@code toString()} will delegate to this method.
      * Subclasses can override this method to provide custom string representation for the proxies.
-     * 
+     *
      * @return a string representation of the object.
      */
     @Override
diff --git a/src/main/java/com/lambdaworks/redis/internal/HostAndPort.java b/src/main/java/io/lettuce/core/internal/HostAndPort.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/internal/HostAndPort.java
rename to src/main/java/io/lettuce/core/internal/HostAndPort.java
index d6e2fb0c76..da2af0fe30 100644
--- a/src/main/java/com/lambdaworks/redis/internal/HostAndPort.java
+++ b/src/main/java/io/lettuce/core/internal/HostAndPort.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.internal;
+package io.lettuce.core.internal;
 
-import com.lambdaworks.redis.LettuceStrings;
+import io.lettuce.core.LettuceStrings;
 
 /**
  * An immutable representation of a host and port.
- * 
+ *
  * @author Mark Paluch
  * @since 4.2
  */
@@ -31,7 +31,7 @@ public class HostAndPort {
     public final int port;
 
     /**
-     * 
+     *
      * @param hostText must not be empty or {@literal null}.
      * @param port
      */
@@ -44,7 +44,7 @@ private HostAndPort(String hostText, int port) {
 
     /**
      * Create a {@link HostAndPort} of {@code host} and {@code port}
-     * 
+     *
      * @param host the hostname
      * @param port a valid port
      * @return the {@link HostAndPort} of {@code host} and {@code port}
diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceAssert.java b/src/main/java/io/lettuce/core/internal/LettuceAssert.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/internal/LettuceAssert.java
rename to src/main/java/io/lettuce/core/internal/LettuceAssert.java
index 611a6bf4d1..ab1a770d49 100644
--- a/src/main/java/com/lambdaworks/redis/internal/LettuceAssert.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceAssert.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.internal;
+package io.lettuce.core.internal;
 
-import com.lambdaworks.redis.LettuceStrings;
+import io.lettuce.core.LettuceStrings;
 
 import java.util.Collection;
 
 /**
  * Assertion utility class that assists in validating arguments. This class is part of the internal API and may change without
  * further notice.
- * 
+ *
  * @author Mark Paluch
  */
 public class LettuceAssert {
diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java b/src/main/java/io/lettuce/core/internal/LettuceClassUtils.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java
rename to src/main/java/io/lettuce/core/internal/LettuceClassUtils.java
index f3b2792638..6535aecbfe 100644
--- a/src/main/java/com/lambdaworks/redis/internal/LettuceClassUtils.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceClassUtils.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.internal;
+package io.lettuce.core.internal;
 
 import java.util.IdentityHashMap;
 import java.util.Map;
 
-import com.lambdaworks.redis.JavaRuntime;
+import io.lettuce.core.JavaRuntime;
 
 /**
  * Miscellaneous class utility methods. Mainly for internal use within the framework.
@@ -57,7 +57,7 @@ public class LettuceClassUtils {
     /**
      * Determine whether the {@link Class} identified by the supplied name is present and can be loaded. Will return
      * {@code false} if either the class or one of its dependencies is not present or cannot be loaded.
-     * 
+     *
      * @param className the name of the class to check
      * @return whether the specified class is present
      */
@@ -73,7 +73,7 @@ public static boolean isPresent(String className) {
 
     /**
      * Loads a class using the {@link #getDefaultClassLoader()}.
-     * 
+     *
      * @param className
      * @return
      */
@@ -137,7 +137,7 @@ private static ClassLoader getDefaultClassLoader() {
     /**
      * Check if the right-hand side type may be assigned to the left-hand side type, assuming setting by reflection. Considers
      * primitive wrapper classes as assignable to the corresponding primitive types.
-     * 
+     *
      * @param lhsType the target type
      * @param rhsType the value type that should be assigned to the target type
      * @return if the target type is assignable from the value type
diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceFactories.java b/src/main/java/io/lettuce/core/internal/LettuceFactories.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/internal/LettuceFactories.java
rename to src/main/java/io/lettuce/core/internal/LettuceFactories.java
index d8f93dd18a..f95370b50b 100644
--- a/src/main/java/com/lambdaworks/redis/internal/LettuceFactories.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceFactories.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.internal;
+package io.lettuce.core.internal;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceLists.java b/src/main/java/io/lettuce/core/internal/LettuceLists.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/internal/LettuceLists.java
rename to src/main/java/io/lettuce/core/internal/LettuceLists.java
index f66374e8f7..d4c519897d 100644
--- a/src/main/java/com/lambdaworks/redis/internal/LettuceLists.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceLists.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.internal;
+package io.lettuce.core.internal;
 
 import java.util.*;
 
 /**
  * Static utility methods for {@link List} instances. This class is part of the internal API and may change without further
  * notice.
- * 
+ *
  * @author Mark Paluch
  * @since 4.2
  */
@@ -35,7 +35,7 @@ private LettuceLists() {
 
     /**
      * Creates a new {@link ArrayList} containing all elements from {@code elements}.
-     * 
+     *
      * @param elements the elements that the list should contain, must not be {@literal null}.
      * @param <T> the element type
      * @return a new {@link ArrayList} containing all elements from {@code elements}.
@@ -52,7 +52,7 @@ public static <T> List<T> newList(T... elements) {
 
     /**
      * Creates a new {@link ArrayList} containing all elements from {@code elements}.
-     * 
+     *
      * @param elements the elements that the list should contain, must not be {@literal null}.
      * @param <T> the element type
      * @return a new {@link ArrayList} containing all elements from {@code elements}.
@@ -70,7 +70,7 @@ public static <T> List<T> newList(Iterable<? extends T> elements) {
 
     /**
      * Creates a new {@link ArrayList} containing all elements from {@code elements}.
-     * 
+     *
      * @param elements the elements that the list should contain, must not be {@literal null}.
      * @param <T> the element type
      * @return a new {@link ArrayList} containing all elements from {@code elements}.
diff --git a/src/main/java/com/lambdaworks/redis/internal/LettuceSets.java b/src/main/java/io/lettuce/core/internal/LettuceSets.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/internal/LettuceSets.java
rename to src/main/java/io/lettuce/core/internal/LettuceSets.java
index 2499ab4ecc..4e0a5c6a8e 100644
--- a/src/main/java/com/lambdaworks/redis/internal/LettuceSets.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceSets.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.internal;
+package io.lettuce.core.internal;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -23,7 +23,7 @@
 /**
  * Static utility methods for {@link Set} instances. This class is part of the internal API and may change without further
  * notice.
- * 
+ *
  * @author Mark Paluch
  * @since 4.2
  */
@@ -39,7 +39,7 @@ private LettuceSets() {
 
     /**
      * Creates a new {@code HashSet} containing all elements from {@code elements}.
-     * 
+     *
      * @param elements the elements that the set should contain, must not be {@literal null}.
      * @param <T> the element type
      * @return a new {@code HashSet} containing all elements from {@code elements}.
@@ -54,7 +54,7 @@ public static <T> Set<T> newHashSet(Collection<? extends T> elements) {
 
     /**
      * Creates a new {@code HashSet} containing all elements from {@code elements}.
-     * 
+     *
      * @param elements the elements that the set should contain, must not be {@literal null}.
      * @param <T> the element type
      * @return a new {@code HashSet} containing all elements from {@code elements}.
@@ -76,7 +76,7 @@ public static <T> Set<T> newHashSet(Iterable<? extends T> elements) {
 
     /**
      * Creates a new {@code HashSet} containing all elements from {@code elements}.
-     * 
+     *
      * @param elements the elements that the set should contain, must not be {@literal null}.
      * @param <T> the element type
      * @return a new {@code HashSet} containing all elements from {@code elements}.
diff --git a/src/main/java/com/lambdaworks/redis/internal/package-info.java b/src/main/java/io/lettuce/core/internal/package-info.java
similarity index 76%
rename from src/main/java/com/lambdaworks/redis/internal/package-info.java
rename to src/main/java/io/lettuce/core/internal/package-info.java
index a886c39099..283e588ea7 100644
--- a/src/main/java/com/lambdaworks/redis/internal/package-info.java
+++ b/src/main/java/io/lettuce/core/internal/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Contains internal API. Classes in this package are part of the internal API and may change without further notice.
- * 
+ *
  * @since 4.2
  */
-package com.lambdaworks.redis.internal;
+package io.lettuce.core.internal;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/AsyncConnections.java b/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/masterslave/AsyncConnections.java
rename to src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
index a136d0d97c..bcd156719f 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/AsyncConnections.java
+++ b/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,9 +24,9 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.RedisConnectionException;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
+import io.lettuce.core.RedisConnectionException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/Connections.java b/src/main/java/io/lettuce/core/masterslave/Connections.java
similarity index 85%
rename from src/main/java/com/lambdaworks/redis/masterslave/Connections.java
rename to src/main/java/io/lettuce/core/masterslave/Connections.java
index 1d84f48243..e85c6f8f36 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/Connections.java
+++ b/src/main/java/io/lettuce/core/masterslave/Connections.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.util.Map;
 import java.util.TreeMap;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandKeyword;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandKeyword;
+import io.lettuce.core.protocol.CommandType;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java
rename to src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index 1f3685e29e..346df0bebe 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.util.*;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceLists;
-import com.lambdaworks.redis.models.role.RedisInstance;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceLists;
+import io.lettuce.core.models.role.RedisInstance;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -35,7 +35,7 @@
  * <p>
  * This API allows connections to Redis Master/Slave setups which run either in a static Master/Slave setup or are managed by
  * Redis Sentinel. Master-Slave connections can discover topologies and select a source for read operations using
- * {@link com.lambdaworks.redis.ReadFrom}.
+ * {@link io.lettuce.core.ReadFrom}.
  * </p>
  * <p>
  *
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java
rename to src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
index 6ffed9b59a..f47be471b6 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriter.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.util.Collection;
 
-import com.lambdaworks.redis.ReadFrom;
-import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.masterslave.MasterSlaveConnectionProvider.Intent;
-import com.lambdaworks.redis.protocol.ConnectionFacade;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent;
+import io.lettuce.core.protocol.ConnectionFacade;
+import io.lettuce.core.protocol.ProtocolKeyword;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * Channel writer/dispatcher that dispatches commands based on the intent to different connections.
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
rename to src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
index fc5a9494dc..40b6192944 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
@@ -13,25 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
-import static com.lambdaworks.redis.masterslave.MasterSlaveUtils.findNodeByHostAndPort;
+import static io.lettuce.core.masterslave.MasterSlaveUtils.findNodeByHostAndPort;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
-import com.lambdaworks.redis.ReadFrom;
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceSets;
-import com.lambdaworks.redis.models.role.RedisInstance;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceSets;
+import io.lettuce.core.models.role.RedisInstance;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -71,8 +71,8 @@ public class MasterSlaveConnectionProvider<K, V> {
 
     /**
      * Retrieve a {@link StatefulRedisConnection} by the intent.
-     * {@link com.lambdaworks.redis.masterslave.MasterSlaveConnectionProvider.Intent#WRITE} intentions use the master
-     * connection, {@link com.lambdaworks.redis.masterslave.MasterSlaveConnectionProvider.Intent#READ} intentions lookup one or
+     * {@link io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent#WRITE} intentions use the master
+     * connection, {@link io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent#READ} intentions lookup one or
      * more read candidates using the {@link ReadFrom} setting.
      *
      * @param intent command intent
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java
rename to src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
index cdbc5c9508..54f34cd5fc 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.models.role.RedisInstance;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.models.role.RedisInstance;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java
rename to src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
index fe6550e58f..dbe6734c5b 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
-import static com.lambdaworks.redis.masterslave.MasterSlaveUtils.findNodeByUri;
+import static io.lettuce.core.masterslave.MasterSlaveUtils.findNodeByUri;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -24,21 +24,21 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisCommandInterruptedException;
-import com.lambdaworks.redis.RedisConnectionException;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisCommandInterruptedException;
+import io.lettuce.core.RedisConnectionException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
  * Utility to refresh the Master-Slave topology view based on {@link RedisNodeDescription}.
- * 
+ *
  * @author Mark Paluch
  */
 class MasterSlaveTopologyRefresh {
@@ -58,7 +58,7 @@ public MasterSlaveTopologyRefresh(RedisClient client, TopologyProvider topologyP
     /**
      * Load master slave nodes. Result contains an ordered list of {@link RedisNodeDescription}s. The sort key is the latency.
      * Nodes with lower latency come first.
-     * 
+     *
      * @param seed collection of {@link RedisURI}s
      * @return mapping between {@link RedisURI} and {@link Partitions}
      */
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveUtils.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveUtils.java
rename to src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
index df345b7c79..a67804a3e5 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/MasterSlaveUtils.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.util.Collection;
 import java.util.Comparator;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
  * @author Mark Paluch
@@ -30,7 +30,7 @@ class MasterSlaveUtils {
 
     /**
      * Check if properties changed.
-     * 
+     *
      * @param o1 the first object to be compared.
      * @param o2 the second object to be compared.
      * @return {@literal true} if {@code MASTER} or {@code SLAVE} flags changed or the URIs are changed.
@@ -52,7 +52,7 @@ static boolean isChanged(Collection<RedisNodeDescription> o1, Collection<RedisNo
 
     /**
      * Lookup a {@link RedisNodeDescription} by {@link RedisURI}.
-     * 
+     *
      * @param nodes
      * @param lookupUri
      * @return the {@link RedisNodeDescription} or {@literal null}
@@ -63,7 +63,7 @@ static RedisNodeDescription findNodeByUri(Collection<RedisNodeDescription> nodes
 
     /**
      * Lookup a {@link RedisNodeDescription} by {@code host} and {@code port}.
-     * 
+     *
      * @param nodes
      * @param host
      * @param port
@@ -81,7 +81,7 @@ static RedisNodeDescription findNodeByHostAndPort(Collection<RedisNodeDescriptio
 
     /**
      * Check for {@code MASTER} or {@code SLAVE} roles and the URI.
-     * 
+     *
      * @param o1 the first object to be compared.
      * @param o2 the second object to be compared.
      * @return {@literal true} if {@code MASTER} or {@code SLAVE} flags changed or the URI changed.
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/NodeConnectionFactory.java b/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
similarity index 87%
rename from src/main/java/com/lambdaworks/redis/masterslave/NodeConnectionFactory.java
rename to src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
index dc6b608f41..5fc71bf2b7 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/NodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.net.SocketAddress;
 import java.util.concurrent.CompletableFuture;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Factory interface to obtain {@link StatefulRedisConnection connections} to Redis nodes.
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
rename to src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
index f720ec8cc5..0684e163d2 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/ReadOnlyCommands.java
+++ b/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Set;
 
-import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
  * Contains all command names that are read-only commands.
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/RedisMasterSlaveNode.java b/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/masterslave/RedisMasterSlaveNode.java
rename to src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
index 7a84a207c9..a1fbb329f5 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/RedisMasterSlaveNode.java
+++ b/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
  * A node within a Redis Master-Slave setup.
- * 
+ *
  * @author Mark Paluch
  */
 class RedisMasterSlaveNode implements RedisNodeDescription {
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/ReflectiveNodeConnectionFactory.java b/src/main/java/io/lettuce/core/masterslave/ReflectiveNodeConnectionFactory.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/masterslave/ReflectiveNodeConnectionFactory.java
rename to src/main/java/io/lettuce/core/masterslave/ReflectiveNodeConnectionFactory.java
index 994cf8327c..570380e3ee 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/ReflectiveNodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/masterslave/ReflectiveNodeConnectionFactory.java
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.concurrent.CompletableFuture;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * {@link NodeConnectionFactory} implementation that operates via reflection on {@link RedisClient}. Using reflection does not
  * require utility methods to leak on the API.
- * 
+ *
  * @author Mark Paluch
  */
 @SuppressWarnings("unchecked")
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/RefreshFutures.java b/src/main/java/io/lettuce/core/masterslave/RefreshFutures.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/masterslave/RefreshFutures.java
rename to src/main/java/io/lettuce/core/masterslave/RefreshFutures.java
index 679712a5bf..f80543500b 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/RefreshFutures.java
+++ b/src/main/java/io/lettuce/core/masterslave/RefreshFutures.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.util.Collection;
 import java.util.concurrent.Future;
@@ -26,7 +26,7 @@ class RefreshFutures {
 
     /**
      * Await for either future completion or to reach the timeout. Successful/exceptional future completion is not substantial.
-     * 
+     *
      * @param timeout the timeout value.
      * @param timeUnit timeout unit.
      * @param futures {@link Collection} of {@literal Future}s.
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/Requests.java b/src/main/java/io/lettuce/core/masterslave/Requests.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/masterslave/Requests.java
rename to src/main/java/io/lettuce/core/masterslave/Requests.java
index e9a20b13b2..f3c4a64f60 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/Requests.java
+++ b/src/main/java/io/lettuce/core/masterslave/Requests.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.RedisURI;
+import io.lettuce.core.RedisURI;
 
 /**
  * Encapsulates asynchronously executed commands to multiple {@link RedisURI nodes}.
- * 
+ *
  * @author Mark Paluch
  */
 class Requests {
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
similarity index 88%
rename from src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyProvider.java
rename to src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
index f040ba88ae..bd64aa293b 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
-import static com.lambdaworks.redis.masterslave.MasterSlaveUtils.CODEC;
+import static io.lettuce.core.masterslave.MasterSlaveUtils.CODEC;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,14 +25,14 @@
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.models.role.RedisInstance;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
-import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.models.role.RedisInstance;
+import io.lettuce.core.models.role.RedisNodeDescription;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
rename to src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
index c87813fb78..f9f3557bcc 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.io.Closeable;
 import java.util.*;
@@ -25,14 +25,14 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisConnectionException;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.internal.LettuceLists;
-import com.lambdaworks.redis.protocol.LettuceCharsets;
-import com.lambdaworks.redis.pubsub.RedisPubSubAdapter;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisConnectionException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.LettuceLists;
+import io.lettuce.core.protocol.LettuceCharsets;
+import io.lettuce.core.pubsub.RedisPubSubAdapter;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.internal.logging.InternalLogger;
@@ -215,7 +215,7 @@ private static class TimedSemaphore {
 
         /**
          * Rate-limited method that notifies the given {@link Consumer} once the current {@link Timeout} is expired.
-         * 
+         *
          * @param timeoutConsumer callback.
          */
         protected void onEvent(Consumer<Timeout> timeoutConsumer) {
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnection.java b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnection.java
rename to src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
index 8b6d2d50f3..d24210f115 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnection.java
+++ b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
-import com.lambdaworks.redis.ReadFrom;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.api.StatefulRedisConnection;
 
 /**
  * Redis Master-Slave connection. The connection allows slave reads by setting {@link ReadFrom}.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -31,14 +31,14 @@ public interface StatefulRedisMasterSlaveConnection<K, V> extends StatefulRedisC
     /**
      * Set from which nodes data is read. The setting is used as default for read operations on this connection. See the
      * documentation for {@link ReadFrom} for more information.
-     * 
+     *
      * @param readFrom the read from setting, must not be {@literal null}
      */
     void setReadFrom(ReadFrom readFrom);
 
     /**
      * Gets the {@link ReadFrom} setting for this connection. Defaults to {@link ReadFrom#MASTER} if not set.
-     * 
+     *
      * @return the read from setting
      */
     ReadFrom getReadFrom();
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnectionImpl.java b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
rename to src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
index 04cca47e98..9e264945a1 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.ReadFrom;
-import com.lambdaworks.redis.StatefulRedisConnectionImpl;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.StatefulRedisConnectionImpl;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTopologyProvider.java
rename to src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
index 93e6085311..19392855b9 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.util.*;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.models.role.RedisInstance;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
-import com.lambdaworks.redis.models.role.RoleParser;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.models.role.RedisInstance;
+import io.lettuce.core.models.role.RedisNodeDescription;
+import io.lettuce.core.models.role.RoleParser;
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -33,7 +33,7 @@
  * Topology provider for a static node collection. This provider uses a static collection of nodes to determine the role of each
  * {@link RedisURI node}. Node roles may change during runtime but the configuration must remain the same. This
  * {@link TopologyProvider} does not auto-discover nodes.
- * 
+ *
  * @author Mark Paluch
  */
 public class StaticMasterSlaveTopologyProvider implements TopologyProvider {
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/TimedAsyncCommand.java b/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/masterslave/TimedAsyncCommand.java
rename to src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java
index f595f9cefe..7b638cf087 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/TimedAsyncCommand.java
+++ b/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
-import com.lambdaworks.redis.protocol.AsyncCommand;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.protocol.RedisCommand;
 
 import io.netty.buffer.ByteBuf;
 
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/Timeout.java b/src/main/java/io/lettuce/core/masterslave/Timeout.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/masterslave/Timeout.java
rename to src/main/java/io/lettuce/core/masterslave/Timeout.java
index 6cad33ddea..7c990c3173 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/Timeout.java
+++ b/src/main/java/io/lettuce/core/masterslave/Timeout.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.util.concurrent.TimeUnit;
 
 /**
  * Value object to represent a timeout.
- * 
+ *
  * @author Mark Paluch
  * @since 4.2
  */
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/TopologyComparators.java b/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/masterslave/TopologyComparators.java
rename to src/main/java/io/lettuce/core/masterslave/TopologyComparators.java
index be98fbba0f..1c3376029b 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/TopologyComparators.java
+++ b/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.util.Comparator;
 import java.util.Map;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
  * Comparators for {@link RedisNodeDescription} and {@link RedisURI}.
diff --git a/src/main/java/com/lambdaworks/redis/masterslave/TopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
similarity index 87%
rename from src/main/java/com/lambdaworks/redis/masterslave/TopologyProvider.java
rename to src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
index 7711e382d9..7a7d2b0ff9 100644
--- a/src/main/java/com/lambdaworks/redis/masterslave/TopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import java.util.List;
 
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
  * Topology provider for Master-Slave topology discovery during runtime. Implementors of this interface return an unordered list
  * of {@link RedisNodeDescription} instances.
- * 
+ *
  * @author Mark Paluch
  * @since 4.1
  */
@@ -32,7 +32,7 @@ public interface TopologyProvider {
 
     /**
      * Lookup nodes within the topology.
-     * 
+     *
      * @return list of {@link RedisNodeDescription} instances
      * @throws RedisException on errors that occured during the lookup
      */
diff --git a/src/main/java/io/lettuce/core/masterslave/package-info.java b/src/main/java/io/lettuce/core/masterslave/package-info.java
new file mode 100644
index 0000000000..6af53bc1c8
--- /dev/null
+++ b/src/main/java/io/lettuce/core/masterslave/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Client support for Redis Master/Slave setups. {@link io.lettuce.core.masterslave.MasterSlave} supports self-managed,
+ * Redis Sentinel-managed, AWS ElastiCache and Azure Redis managed Master/Slave setups.
+ */
+package io.lettuce.core.masterslave;
diff --git a/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollector.java
rename to src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java
index c4761a89b3..0a67e0b3ba 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.metrics;
+package io.lettuce.core.metrics;
 
 import java.net.SocketAddress;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
+import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
  * {@link MetricCollector} for command latencies. Command latencies are collected per connection (identified by local/remote
@@ -28,7 +28,7 @@
  * <li>Latency between command send and first response (first response received)</li>
  * <li>Latency between command send and command completion (complete response received)</li>
  * </ul>
- * 
+ *
  * @author Mark Paluch
  * @since 3.4
  */
@@ -36,7 +36,7 @@ public interface CommandLatencyCollector extends MetricCollector<Map<CommandLate
 
     /**
      * Record the command latency per {@code connectionPoint} and {@code commandType}.
-     * 
+     *
      * @param local the local address
      * @param remote the remote address
      * @param commandType the command type
diff --git a/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollectorOptions.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollectorOptions.java
rename to src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
index 5f88d11b6d..415f73ce0c 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyCollectorOptions.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.metrics;
+package io.lettuce.core.metrics;
 
 import java.util.concurrent.TimeUnit;
 
 /**
  * Configuration interface for command latency collection.
- * 
+ *
  * @author Mark Paluch
  */
 public interface CommandLatencyCollectorOptions {
@@ -40,7 +40,7 @@ public interface CommandLatencyCollectorOptions {
 
     /**
      * Returns whether the latencies should be reset once an event is emitted.
-     * 
+     *
      * @return {@literal true} if the latencies should be reset once an event is emitted.
      */
     boolean resetLatenciesAfterEvent();
@@ -50,14 +50,14 @@ public interface CommandLatencyCollectorOptions {
      * host/connection point will be recorded separately which allows to inspect every connection individually. If
      * {@literal false}, multiple connections to the same host/connection point will be recorded together. This allows a
      * consolidated view on one particular service.
-     * 
+     *
      * @return {@literal true} if latencies are recorded distinct on local level (per connection)
      */
     boolean localDistinction();
 
     /**
      * Returns whether the latency collector is enabled.
-     * 
+     *
      * @return {@literal true} if the latency collector is enabled
      */
     boolean isEnabled();
diff --git a/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyId.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/metrics/CommandLatencyId.java
rename to src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
index a2016c87aa..9812e517bf 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/CommandLatencyId.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.metrics;
+package io.lettuce.core.metrics;
 
 import java.io.Serializable;
 import java.net.SocketAddress;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
  * Identifier for a command latency. Consists of a local/remote tuple of {@link SocketAddress}es and a
- * {@link com.lambdaworks.redis.protocol.ProtocolKeyword commandType} part.
- * 
+ * {@link io.lettuce.core.protocol.ProtocolKeyword commandType} part.
+ *
  * @author Mark Paluch
  */
 public class CommandLatencyId implements Serializable, Comparable<CommandLatencyId> {
@@ -45,7 +45,7 @@ protected CommandLatencyId(SocketAddress localAddress, SocketAddress remoteAddre
 
     /**
      * Create a new instance of {@link CommandLatencyId}.
-     * 
+     *
      * @param localAddress the local address
      * @param remoteAddress the remote address
      * @param commandType the command type
@@ -57,7 +57,7 @@ public static CommandLatencyId create(SocketAddress localAddress, SocketAddress
 
     /**
      * Returns the local address.
-     * 
+     *
      * @return the local address
      */
     public SocketAddress localAddress() {
@@ -66,7 +66,7 @@ public SocketAddress localAddress() {
 
     /**
      * Returns the remote address.
-     * 
+     *
      * @return the remote address
      */
     public SocketAddress remoteAddress() {
@@ -75,7 +75,7 @@ public SocketAddress remoteAddress() {
 
     /**
      * Returns the command type.
-     * 
+     *
      * @return the command type
      */
     public ProtocolKeyword commandType() {
diff --git a/src/main/java/com/lambdaworks/redis/metrics/CommandMetrics.java b/src/main/java/io/lettuce/core/metrics/CommandMetrics.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/metrics/CommandMetrics.java
rename to src/main/java/io/lettuce/core/metrics/CommandMetrics.java
index f8747c906c..48979be2a7 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/CommandMetrics.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandMetrics.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.metrics;
+package io.lettuce.core.metrics;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /**
  * Latency metrics for commands. This class provides the count, time unit and firstResponse/completion latencies.
- * 
+ *
  * @author Mark Paluch
  */
 public class CommandMetrics {
@@ -38,7 +38,7 @@ public CommandMetrics(long count, TimeUnit timeUnit, CommandLatency firstRespons
     }
 
     /**
-     * 
+     *
      * @return the count
      */
     public long getCount() {
@@ -46,7 +46,7 @@ public long getCount() {
     }
 
     /**
-     * 
+     *
      * @return the time unit for the {@link #getFirstResponse()} and {@link #getCompletion()} latencies.
      */
     public TimeUnit getTimeUnit() {
@@ -54,7 +54,7 @@ public TimeUnit getTimeUnit() {
     }
 
     /**
-     * 
+     *
      * @return latencies between send and the first command response
      */
     public CommandLatency getFirstResponse() {
@@ -62,7 +62,7 @@ public CommandLatency getFirstResponse() {
     }
 
     /**
-     * 
+     *
      * @return latencies between send and the command completion
      */
     public CommandLatency getCompletion() {
@@ -92,7 +92,7 @@ public CommandLatency(long min, long max, Map<Double, Long> percentiles) {
         }
 
         /**
-         * 
+         *
          * @return the minimum time
          */
         public long getMin() {
@@ -100,7 +100,7 @@ public long getMin() {
         }
 
         /**
-         * 
+         *
          * @return the maximum time
          */
         public long getMax() {
@@ -108,7 +108,7 @@ public long getMax() {
         }
 
         /**
-         * 
+         *
          * @return percentile mapping
          */
         public Map<Double, Long> getPercentiles() {
diff --git a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java
rename to src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
index c310fad35f..52dfb19854 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.metrics;
+package io.lettuce.core.metrics;
 
-import com.lambdaworks.redis.metrics.CommandMetrics.CommandLatency;
-import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
+import io.lettuce.core.metrics.CommandMetrics.CommandLatency;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.ProtocolKeyword;
 import io.netty.channel.local.LocalAddress;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -36,7 +36,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.lambdaworks.redis.internal.LettuceClassUtils.isPresent;
+import static io.lettuce.core.internal.LettuceClassUtils.isPresent;
 
 /**
  * Default implementation of a {@link CommandLatencyCollector} for command latencies.
diff --git a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorOptions.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorOptions.java
rename to src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java
index 8a56a323d1..c565f03207 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorOptions.java
+++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.metrics;
+package io.lettuce.core.metrics;
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * The default implementation of {@link CommandLatencyCollectorOptions}.
@@ -93,7 +93,7 @@ private Builder() {
 
         /**
          * Disable the latency collector.
-         * 
+         *
          * @return this
          */
         public Builder disable() {
@@ -104,7 +104,7 @@ public Builder disable() {
         /**
          * Set the target unit for the latencies. Defaults to {@link TimeUnit#MILLISECONDS}. See
          * {@link DefaultCommandLatencyCollectorOptions#DEFAULT_TARGET_UNIT}.
-         * 
+         *
          * @param targetUnit the target unit, must not be {@literal null}
          * @return this
          *
@@ -120,7 +120,7 @@ public Builder targetUnit(TimeUnit targetUnit) {
          * {@link DefaultCommandLatencyCollectorOptions#DEFAULT_TARGET_PERCENTILES}.
          *
          * @param targetPercentiles the percentiles which should be emitted, must not be {@literal null}
-         * 
+         *
          * @return this
          */
         public Builder targetPercentiles(double[] targetPercentiles) {
@@ -135,7 +135,7 @@ public Builder targetPercentiles(double[] targetPercentiles) {
          *
          * @param resetLatenciesAfterEvent {@literal true} if the recorded latencies should be reset once the metrics event was
          *        emitted
-         * 
+         *
          * @return this
          */
         public Builder resetLatenciesAfterEvent(boolean resetLatenciesAfterEvent) {
diff --git a/src/main/java/com/lambdaworks/redis/metrics/MetricCollector.java b/src/main/java/io/lettuce/core/metrics/MetricCollector.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/metrics/MetricCollector.java
rename to src/main/java/io/lettuce/core/metrics/MetricCollector.java
index 4fde596c65..b5617cbd03 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/MetricCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/MetricCollector.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.metrics;
+package io.lettuce.core.metrics;
 
 /**
  * Generic metrics collector interface. A metrics collector collects metrics and emits metric events.
- * 
+ *
  * @author Mark Paluch
  * @param <T> data type of the metrics
  * @since 3.4
@@ -32,14 +32,14 @@ public interface MetricCollector<T> {
 
     /**
      * Returns the collected/aggregated metrics.
-     * 
+     *
      * @return the the collected/aggregated metrics
      */
     T retrieveMetrics();
 
     /**
      * Returns {@literal true} if the metric collector is enabled.
-     * 
+     *
      * @return {@literal true} if the metric collector is enabled
      */
     boolean isEnabled();
diff --git a/src/main/java/com/lambdaworks/redis/metrics/package-info.java b/src/main/java/io/lettuce/core/metrics/package-info.java
similarity index 52%
rename from src/main/java/com/lambdaworks/redis/metrics/package-info.java
rename to src/main/java/io/lettuce/core/metrics/package-info.java
index f62aa504a8..b3be1f51ff 100644
--- a/src/main/java/com/lambdaworks/redis/metrics/package-info.java
+++ b/src/main/java/io/lettuce/core/metrics/package-info.java
@@ -1,5 +1,5 @@
 /**
  * Collectors for client metrics.
  */
-package com.lambdaworks.redis.metrics;
+package io.lettuce.core.metrics;
 
diff --git a/src/main/java/com/lambdaworks/redis/models/command/CommandDetail.java b/src/main/java/io/lettuce/core/models/command/CommandDetail.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/models/command/CommandDetail.java
rename to src/main/java/io/lettuce/core/models/command/CommandDetail.java
index 215764ca77..147882da0c 100644
--- a/src/main/java/com/lambdaworks/redis/models/command/CommandDetail.java
+++ b/src/main/java/io/lettuce/core/models/command/CommandDetail.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.models.command;
+package io.lettuce.core.models.command;
 
 import java.io.Serializable;
 import java.util.Set;
@@ -37,7 +37,7 @@ public CommandDetail() {
 
     /**
      * Constructs a {@link CommandDetail}
-     * 
+     *
      * @param name name of the command, must not be {@literal null}
      * @param arity command arity specification
      * @param flags set of flags, must not be {@literal null} but may be empty
diff --git a/src/main/java/com/lambdaworks/redis/models/command/CommandDetailParser.java b/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/models/command/CommandDetailParser.java
rename to src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
index 7689b996b1..f403ce616a 100644
--- a/src/main/java/com/lambdaworks/redis/models/command/CommandDetailParser.java
+++ b/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.models.command;
+package io.lettuce.core.models.command;
 
 import java.util.*;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Parser for redis <a href="http://redis.io/commands/command">COMMAND</a>/<a
  * href="http://redis.io/commands/command-info">COMMAND INFO</a>command output.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -61,7 +61,7 @@ private CommandDetailParser() {
 
     /**
      * Parse the output of the redis COMMAND/COMMAND INFO command and convert to a list of {@link CommandDetail}.
-     * 
+     *
      * @param commandOutput the command output, must not be {@literal null}
      * @return RedisInstance
      */
diff --git a/src/main/java/com/lambdaworks/redis/models/command/package-info.java b/src/main/java/io/lettuce/core/models/command/package-info.java
similarity index 65%
rename from src/main/java/com/lambdaworks/redis/models/command/package-info.java
rename to src/main/java/io/lettuce/core/models/command/package-info.java
index d4dacfe222..79a0bba9ea 100644
--- a/src/main/java/com/lambdaworks/redis/models/command/package-info.java
+++ b/src/main/java/io/lettuce/core/models/command/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Model and parser to for the {@code COMMAND} and {@code COMMAND INFO} output.
  */
-package com.lambdaworks.redis.models.command;
+package io.lettuce.core.models.command;
diff --git a/src/main/java/com/lambdaworks/redis/models/role/RedisInstance.java b/src/main/java/io/lettuce/core/models/role/RedisInstance.java
similarity index 85%
rename from src/main/java/com/lambdaworks/redis/models/role/RedisInstance.java
rename to src/main/java/io/lettuce/core/models/role/RedisInstance.java
index 0fa1dad871..5e4fdbf698 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/RedisInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisInstance.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.models.role;
+package io.lettuce.core.models.role;
 
 /**
  * Represents a redis instance according to the {@code ROLE} output.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
 public interface RedisInstance {
 
     /**
-     * 
-     * @return Redis instance role, see {@link com.lambdaworks.redis.models.role.RedisInstance.Role}
+     *
+     * @return Redis instance role, see {@link io.lettuce.core.models.role.RedisInstance.Role}
      */
     Role getRole();
 
diff --git a/src/main/java/com/lambdaworks/redis/models/role/RedisMasterInstance.java b/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/models/role/RedisMasterInstance.java
rename to src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java
index f9d51f709b..5bdf8934a1 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/RedisMasterInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.models.role;
+package io.lettuce.core.models.role;
 
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Represents a master instance.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -38,7 +38,7 @@ public RedisMasterInstance() {
 
     /**
      * Constructs a {@link RedisMasterInstance}
-     * 
+     *
      * @param replicationOffset the replication offset
      * @param slaves list of slaves, must not be {@literal null} but may be empty
      */
@@ -50,7 +50,7 @@ public RedisMasterInstance(long replicationOffset, List<ReplicationPartner> slav
 
     /**
      *
-     * @return always {@link com.lambdaworks.redis.models.role.RedisInstance.Role#MASTER}
+     * @return always {@link io.lettuce.core.models.role.RedisInstance.Role#MASTER}
      */
     @Override
     public Role getRole() {
diff --git a/src/main/java/com/lambdaworks/redis/models/role/RedisNodeDescription.java b/src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/models/role/RedisNodeDescription.java
rename to src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java
index c224aaf64e..fcf1e7b2ac 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/RedisNodeDescription.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.models.role;
+package io.lettuce.core.models.role;
 
-import com.lambdaworks.redis.RedisURI;
+import io.lettuce.core.RedisURI;
 
 /**
  * Description of a single Redis Node.
- * 
+ *
  * @author Mark Paluch
  * @since 4.0
  */
 public interface RedisNodeDescription extends RedisInstance {
 
     /**
-     * 
+     *
      * @return the URI of the node
      */
     RedisURI getUri();
diff --git a/src/main/java/com/lambdaworks/redis/models/role/RedisSentinelInstance.java b/src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/models/role/RedisSentinelInstance.java
rename to src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java
index c596d89c53..872b7a16f1 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/RedisSentinelInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.models.role;
+package io.lettuce.core.models.role;
 
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Redis sentinel instance.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -36,7 +36,7 @@ public RedisSentinelInstance() {
 
     /**
      * Constructs a {@link RedisSentinelInstance}
-     * 
+     *
      * @param monitoredMasters list of monitored masters, must not be {@literal null} but may be empty
      */
     public RedisSentinelInstance(List<String> monitoredMasters) {
@@ -46,7 +46,7 @@ public RedisSentinelInstance(List<String> monitoredMasters) {
 
     /**
      *
-     * @return always {@link com.lambdaworks.redis.models.role.RedisInstance.Role#SENTINEL}
+     * @return always {@link io.lettuce.core.models.role.RedisInstance.Role#SENTINEL}
      */
     @Override
     public Role getRole() {
diff --git a/src/main/java/com/lambdaworks/redis/models/role/RedisSlaveInstance.java b/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/models/role/RedisSlaveInstance.java
rename to src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java
index 854cb579ff..030d7dc7e4 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/RedisSlaveInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.models.role;
+package io.lettuce.core.models.role;
 
 import java.io.Serializable;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Redis slave instance.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -35,7 +35,7 @@ public RedisSlaveInstance() {
 
     /**
      * Constructs a {@link RedisSlaveInstance}
-     * 
+     *
      * @param master master for the replication, must not be {@literal null}
      * @param state slave state, must not be {@literal null}
      */
@@ -48,7 +48,7 @@ public RedisSlaveInstance() {
 
     /**
      *
-     * @return always {@link com.lambdaworks.redis.models.role.RedisInstance.Role#SLAVE}
+     * @return always {@link io.lettuce.core.models.role.RedisInstance.Role#SLAVE}
      */
     @Override
     public Role getRole() {
diff --git a/src/main/java/com/lambdaworks/redis/models/role/ReplicationPartner.java b/src/main/java/io/lettuce/core/models/role/ReplicationPartner.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/models/role/ReplicationPartner.java
rename to src/main/java/io/lettuce/core/models/role/ReplicationPartner.java
index 524b3cdf41..764a867668 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/ReplicationPartner.java
+++ b/src/main/java/io/lettuce/core/models/role/ReplicationPartner.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.models.role;
+package io.lettuce.core.models.role;
 
 import java.io.Serializable;
 
-import com.lambdaworks.redis.internal.HostAndPort;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.HostAndPort;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Replication partner providing the host and the replication offset.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -37,7 +37,7 @@ public ReplicationPartner() {
 
     /**
      * Constructs a replication partner.
-     * 
+     *
      * @param host host information, must not be {@literal null}
      * @param replicationOffset the replication offset
      */
diff --git a/src/main/java/com/lambdaworks/redis/models/role/RoleParser.java b/src/main/java/io/lettuce/core/models/role/RoleParser.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/models/role/RoleParser.java
rename to src/main/java/io/lettuce/core/models/role/RoleParser.java
index 34e8ac7d81..1d51f6d75a 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/RoleParser.java
+++ b/src/main/java/io/lettuce/core/models/role/RoleParser.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.models.role;
+package io.lettuce.core.models.role;
 
 import java.util.*;
 
-import com.lambdaworks.redis.internal.HostAndPort;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.HostAndPort;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Parser for redis <a href="http://redis.io/commands/role">ROLE</a> command output.
- * 
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -58,7 +58,7 @@ private RoleParser() {
 
     /**
      * Parse the output of the redis ROLE command and convert to a RedisInstance.
-     * 
+     *
      * @param roleOutput output of the redis ROLE command
      * @return RedisInstance
      */
diff --git a/src/main/java/com/lambdaworks/redis/models/role/package-info.java b/src/main/java/io/lettuce/core/models/role/package-info.java
similarity index 57%
rename from src/main/java/com/lambdaworks/redis/models/role/package-info.java
rename to src/main/java/io/lettuce/core/models/role/package-info.java
index 884e807c15..2f6c92c430 100644
--- a/src/main/java/com/lambdaworks/redis/models/role/package-info.java
+++ b/src/main/java/io/lettuce/core/models/role/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Model and parser for the {@code ROLE} output.
  */
-package com.lambdaworks.redis.models.role;
+package io.lettuce.core.models.role;
diff --git a/src/main/java/com/lambdaworks/redis/output/ArrayOutput.java b/src/main/java/io/lettuce/core/output/ArrayOutput.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/output/ArrayOutput.java
rename to src/main/java/io/lettuce/core/output/ArrayOutput.java
index 9f0b91d053..2816154513 100644
--- a/src/main/java/com/lambdaworks/redis/output/ArrayOutput.java
+++ b/src/main/java/io/lettuce/core/output/ArrayOutput.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayDeque;
@@ -21,15 +21,15 @@
 import java.util.Deque;
 import java.util.List;
 
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * {@link java.util.List} of objects and lists to support dynamic nested structures (List with mixed content of values and
  * sublists).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
- * 
+ *
  * @author Mark Paluch
  */
 public class ArrayOutput<K, V> extends CommandOutput<K, V, List<Object>> {
diff --git a/src/main/java/com/lambdaworks/redis/output/BooleanListOutput.java b/src/main/java/io/lettuce/core/output/BooleanListOutput.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/output/BooleanListOutput.java
rename to src/main/java/io/lettuce/core/output/BooleanListOutput.java
index b95fa2e3fa..7b2c1e6e9b 100644
--- a/src/main/java/com/lambdaworks/redis/output/BooleanListOutput.java
+++ b/src/main/java/io/lettuce/core/output/BooleanListOutput.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * {@link java.util.List} of boolean output.
diff --git a/src/main/java/com/lambdaworks/redis/output/BooleanOutput.java b/src/main/java/io/lettuce/core/output/BooleanOutput.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/output/BooleanOutput.java
rename to src/main/java/io/lettuce/core/output/BooleanOutput.java
index 4a06f52b4e..8fdc696311 100644
--- a/src/main/java/com/lambdaworks/redis/output/BooleanOutput.java
+++ b/src/main/java/io/lettuce/core/output/BooleanOutput.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Boolean output. The actual value is returned as an integer where 0 indicates false and 1 indicates true, or as a null bulk
  * reply for script output.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
diff --git a/src/main/java/com/lambdaworks/redis/output/ByteArrayOutput.java b/src/main/java/io/lettuce/core/output/ByteArrayOutput.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/output/ByteArrayOutput.java
rename to src/main/java/io/lettuce/core/output/ByteArrayOutput.java
index 3351d44968..df4630284d 100644
--- a/src/main/java/com/lambdaworks/redis/output/ByteArrayOutput.java
+++ b/src/main/java/io/lettuce/core/output/ByteArrayOutput.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Byte array output.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
diff --git a/src/main/java/com/lambdaworks/redis/output/CommandOutput.java b/src/main/java/io/lettuce/core/output/CommandOutput.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/output/CommandOutput.java
rename to src/main/java/io/lettuce/core/output/CommandOutput.java
index a78970aff2..e16bb35674 100644
--- a/src/main/java/com/lambdaworks/redis/output/CommandOutput.java
+++ b/src/main/java/io/lettuce/core/output/CommandOutput.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Abstract representation of the output of a redis command.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @param <T> Output type.
@@ -36,7 +36,7 @@ public abstract class CommandOutput<K, V, T> {
 
     /**
      * Initialize a new instance that encodes and decodes keys and values using the supplied codec.
-     * 
+     *
      * @param codec Codec used to encode/decode keys and values, must not be {@literal null}.
      * @param output Initial value of output.
      */
@@ -48,7 +48,7 @@ public CommandOutput(RedisCodec<K, V> codec, T output) {
 
     /**
      * Get the command output.
-     * 
+     *
      * @return The command output.
      */
     public T get() {
@@ -58,7 +58,7 @@ public T get() {
     /**
      * Set the command output to a sequence of bytes, or null. Concrete {@link CommandOutput} implementations must override this
      * method unless they only receive an integer value which cannot be null.
-     * 
+     *
      * @param bytes The command output, or null.
      */
     public void set(ByteBuffer bytes) {
@@ -68,7 +68,7 @@ public void set(ByteBuffer bytes) {
     /**
      * Set the command output to a 64-bit signed integer. Concrete {@link CommandOutput} implementations must override this
      * method unless they only receive a byte array value.
-     * 
+     *
      * @param integer The command output.
      */
     public void set(long integer) {
@@ -77,7 +77,7 @@ public void set(long integer) {
 
     /**
      * Set command output to an error message from the server.
-     * 
+     *
      * @param error Error message.
      */
     public void setError(ByteBuffer error) {
@@ -86,7 +86,7 @@ public void setError(ByteBuffer error) {
 
     /**
      * Set command output to an error message from the client.
-     * 
+     *
      * @param error Error message.
      */
     public void setError(String error) {
@@ -95,7 +95,7 @@ public void setError(String error) {
 
     /**
      * Check if the command resulted in an error.
-     * 
+     *
      * @return true if command resulted in an error.
      */
     public boolean hasError() {
@@ -104,7 +104,7 @@ public boolean hasError() {
 
     /**
      * Get the error that occurred.
-     * 
+     *
      * @return The error.
      */
     public String getError() {
@@ -113,9 +113,9 @@ public String getError() {
 
     /**
      * Mark the command output complete.
-     * 
+     *
      * @param depth Remaining depth of output queue.
-     * 
+     *
      */
     public void complete(int depth) {
         // nothing to do by default
@@ -145,7 +145,7 @@ public String toString() {
 
     /**
      * Mark the beginning of a multi sequence (array).
-     * 
+     *
      * @param count expected number of elements in this multi sequence.
      */
     public void multi(int count) {
diff --git a/src/main/java/com/lambdaworks/redis/output/DateOutput.java b/src/main/java/io/lettuce/core/output/DateOutput.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/output/DateOutput.java
rename to src/main/java/io/lettuce/core/output/DateOutput.java
index ae9403da62..d9e9c8c3d1 100644
--- a/src/main/java/com/lambdaworks/redis/output/DateOutput.java
+++ b/src/main/java/io/lettuce/core/output/DateOutput.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.util.Date;
 
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Date output with no milliseconds.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
diff --git a/src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java b/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java
rename to src/main/java/io/lettuce/core/output/DefaultTransactionResult.java
index 78c14fd7a8..1e1070281d 100644
--- a/src/main/java/com/lambdaworks/redis/output/DefaultTransactionResult.java
+++ b/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Stream;
 
-import com.lambdaworks.redis.TransactionResult;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.TransactionResult;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Result of a {@code MULTI} transaction.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -35,7 +35,7 @@ class DefaultTransactionResult implements Iterable<Object>, TransactionResult {
 
     /**
      * Creates a new {@link DefaultTransactionResult}.
-     * 
+     *
      * @param wasRolledBack {@literal true} if the transaction was rolled back.
      * @param result the transaction result, must not be {@literal null}.
      */
diff --git a/src/main/java/com/lambdaworks/redis/output/DoubleOutput.java b/src/main/java/io/lettuce/core/output/DoubleOutput.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/output/DoubleOutput.java
rename to src/main/java/io/lettuce/core/output/DoubleOutput.java
index b30b3ab642..6f0c403fbd 100644
--- a/src/main/java/com/lambdaworks/redis/output/DoubleOutput.java
+++ b/src/main/java/io/lettuce/core/output/DoubleOutput.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.codec.RedisCodec;
 
 import static java.lang.Double.parseDouble;
 
 /**
  * Double output, may be null.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
diff --git a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
similarity index 87%
rename from src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java
rename to src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
index dcb175549b..cd70831b95 100644
--- a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import static java.lang.Double.parseDouble;
 
@@ -21,10 +21,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.GeoCoordinates;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.GeoCoordinates;
+import io.lettuce.core.Value;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * A list output that creates a list with {@link GeoCoordinates}'s.
diff --git a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutput.java
rename to src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
index bd36d82441..6bd381cffc 100644
--- a/src/main/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import static java.lang.Double.parseDouble;
 
@@ -21,10 +21,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.GeoCoordinates;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.GeoCoordinates;
+import io.lettuce.core.Value;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * A list output that creates a list with {@link GeoCoordinates} {@link Value}s.
diff --git a/src/main/java/com/lambdaworks/redis/output/GeoWithinListOutput.java b/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/output/GeoWithinListOutput.java
rename to src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
index f6c1f24caa..9e39a47413 100644
--- a/src/main/java/com/lambdaworks/redis/output/GeoWithinListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import static java.lang.Double.parseDouble;
 
@@ -21,10 +21,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.GeoCoordinates;
-import com.lambdaworks.redis.GeoWithin;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.GeoCoordinates;
+import io.lettuce.core.GeoWithin;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * A list output that creates a list with either double/long or {@link GeoCoordinates}'s.
diff --git a/src/main/java/com/lambdaworks/redis/output/IntegerOutput.java b/src/main/java/io/lettuce/core/output/IntegerOutput.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/output/IntegerOutput.java
rename to src/main/java/io/lettuce/core/output/IntegerOutput.java
index 612cb35104..26cc79bc0c 100644
--- a/src/main/java/com/lambdaworks/redis/output/IntegerOutput.java
+++ b/src/main/java/io/lettuce/core/output/IntegerOutput.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * 64-bit integer output, may be null.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyListOutput.java b/src/main/java/io/lettuce/core/output/KeyListOutput.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/output/KeyListOutput.java
rename to src/main/java/io/lettuce/core/output/KeyListOutput.java
index bc3d03347e..950dd58984 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyListOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyListOutput.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * {@link List} of keys output.
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyOutput.java b/src/main/java/io/lettuce/core/output/KeyOutput.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/output/KeyOutput.java
rename to src/main/java/io/lettuce/core/output/KeyOutput.java
index 866a99ecce..7874c89444 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyOutput.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Key output.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
- * 
+ *
  * @author Will Glozer
  */
 public class KeyOutput<K, V> extends CommandOutput<K, V, K> {
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyScanOutput.java b/src/main/java/io/lettuce/core/output/KeyScanOutput.java
similarity index 83%
rename from src/main/java/com/lambdaworks/redis/output/KeyScanOutput.java
rename to src/main/java/io/lettuce/core/output/KeyScanOutput.java
index 022e51c86f..a733bb19df 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyScanOutput.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.KeyScanCursor;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.KeyScanCursor;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
- * {@link com.lambdaworks.redis.KeyScanCursor} for scan cursor output.
- * 
+ * {@link io.lettuce.core.KeyScanCursor} for scan cursor output.
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/output/KeyScanStreamingOutput.java
rename to src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java
index 3d3316ddc1..fff2515b1e 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.StreamScanCursor;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.StreamScanCursor;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Streaming API for multiple Keys. You can implement this interface in order to receive a call to {@code onKey} on every key.
  * Key uniqueness is not guaranteed.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyStreamingChannel.java b/src/main/java/io/lettuce/core/output/KeyStreamingChannel.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/output/KeyStreamingChannel.java
rename to src/main/java/io/lettuce/core/output/KeyStreamingChannel.java
index 418b866185..893d709622 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/KeyStreamingChannel.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 /**
  * Streaming API for multiple Keys. You can implement this interface in order to receive a call to {@code onKey} on every key.
  * Key uniqueness is not guaranteed.
- * 
+ *
  * @param <K> Key type.
  * @author Mark Paluch
  * @since 3.0
@@ -27,7 +27,7 @@
 public interface KeyStreamingChannel<K> extends StreamingChannel{
     /**
      * Called on every incoming key.
-     * 
+     *
      * @param key the key
      */
     void onKey(K key);
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/output/KeyStreamingOutput.java
rename to src/main/java/io/lettuce/core/output/KeyStreamingOutput.java
index 9837f4a0e8..f70b8db3db 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Streaming-Output of Keys. Returns the count of all keys (including null).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
- * 
+ *
  */
 public class KeyStreamingOutput<K, V> extends CommandOutput<K, V, Long> {
     private final KeyStreamingChannel<K> channel;
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueListOutput.java b/src/main/java/io/lettuce/core/output/KeyValueListOutput.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/output/KeyValueListOutput.java
rename to src/main/java/io/lettuce/core/output/KeyValueListOutput.java
index 04edc56cd0..001ef201a9 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueListOutput.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * {@link List} of values output.
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueOutput.java b/src/main/java/io/lettuce/core/output/KeyValueOutput.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/output/KeyValueOutput.java
rename to src/main/java/io/lettuce/core/output/KeyValueOutput.java
index 0222f2b1da..4acb015f86 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyValueOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueOutput.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.codec.RedisCodec;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/output/KeyValueScanStreamingOutput.java
rename to src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java
index 019cd9473d..bef7f75bc5 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyValueScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.StreamScanCursor;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.StreamScanCursor;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Streaming-Output of Key Value Pairs. Returns the count of all Key-Value pairs (including null).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
- * 
+ *
  * @author Mark Paluch
  */
 public class KeyValueScanStreamingOutput<K, V> extends ScanOutput<K, V, StreamScanCursor> {
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/output/KeyValueStreamingChannel.java
rename to src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java
index 94370bd48e..10ebcc9888 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 /**
  * Streaming API for multiple keys and values (tuples). You can implement this interface in order to receive a call to
  * {@code onKeyValue} on every key-value.
- * 
+ *
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 5.0
@@ -28,7 +28,7 @@ public interface KeyValueStreamingChannel<K, V> extends StreamingChannel {
 
     /**
      * Called on every incoming key/value pair.
-     * 
+     *
      * @param key the key
      * @param value the value
      */
diff --git a/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/output/KeyValueStreamingOutput.java
rename to src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java
index 366ce5cdb3..7052abf680 100644
--- a/src/main/java/com/lambdaworks/redis/output/KeyValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 import java.util.Iterator;
 
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Streaming-Output of Key Value Pairs. Returns the count of all Key-Value pairs (including null).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
- * 
+ *
  * @author Mark Paluch
  */
 public class KeyValueStreamingOutput<K, V> extends CommandOutput<K, V, Long> {
diff --git a/src/main/java/com/lambdaworks/redis/output/ListOfMapsOutput.java b/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/output/ListOfMapsOutput.java
rename to src/main/java/io/lettuce/core/output/ListOfMapsOutput.java
index ce021060cf..e4fb298571 100644
--- a/src/main/java/com/lambdaworks/redis/output/ListOfMapsOutput.java
+++ b/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -21,14 +21,14 @@
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * {@link java.util.List} of maps output.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
- * 
+ *
  * @author Will Glozer
  */
 public class ListOfMapsOutput<K, V> extends CommandOutput<K, V, List<Map<K, V>>> {
diff --git a/src/main/java/com/lambdaworks/redis/output/ListSubscriber.java b/src/main/java/io/lettuce/core/output/ListSubscriber.java
similarity index 87%
rename from src/main/java/com/lambdaworks/redis/output/ListSubscriber.java
rename to src/main/java/io/lettuce/core/output/ListSubscriber.java
index b2a54d40d4..1b9aaab8e4 100644
--- a/src/main/java/com/lambdaworks/redis/output/ListSubscriber.java
+++ b/src/main/java/io/lettuce/core/output/ListSubscriber.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.util.List;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.output.StreamingOutput.Subscriber;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.output.StreamingOutput.Subscriber;
 
 /**
  * Simple subscriber
diff --git a/src/main/java/com/lambdaworks/redis/output/MapOutput.java b/src/main/java/io/lettuce/core/output/MapOutput.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/output/MapOutput.java
rename to src/main/java/io/lettuce/core/output/MapOutput.java
index 5344c5bc52..e30cb4e04f 100644
--- a/src/main/java/com/lambdaworks/redis/output/MapOutput.java
+++ b/src/main/java/io/lettuce/core/output/MapOutput.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * {@link Map} of keys and values output.
diff --git a/src/main/java/com/lambdaworks/redis/output/MapScanOutput.java b/src/main/java/io/lettuce/core/output/MapScanOutput.java
similarity index 85%
rename from src/main/java/com/lambdaworks/redis/output/MapScanOutput.java
rename to src/main/java/io/lettuce/core/output/MapScanOutput.java
index 1844e2d827..0014f4b390 100644
--- a/src/main/java/com/lambdaworks/redis/output/MapScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/MapScanOutput.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.MapScanCursor;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.MapScanCursor;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
- * {@link com.lambdaworks.redis.MapScanCursor} for scan cursor output.
- * 
+ * {@link io.lettuce.core.MapScanCursor} for scan cursor output.
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/output/MultiOutput.java b/src/main/java/io/lettuce/core/output/MultiOutput.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/output/MultiOutput.java
rename to src/main/java/io/lettuce/core/output/MultiOutput.java
index 3cdfd0100e..c00eeb7bdf 100644
--- a/src/main/java/com/lambdaworks/redis/output/MultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/MultiOutput.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Queue;
 
-import com.lambdaworks.redis.RedisCommandExecutionException;
-import com.lambdaworks.redis.TransactionResult;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceFactories;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.TransactionResult;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceFactories;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * Output of all commands within a MULTI block.
diff --git a/src/main/java/com/lambdaworks/redis/output/NestedMultiOutput.java b/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/output/NestedMultiOutput.java
rename to src/main/java/io/lettuce/core/output/NestedMultiOutput.java
index d72a2bc399..a59460b1b5 100644
--- a/src/main/java/com/lambdaworks/redis/output/NestedMultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Deque;
 import java.util.List;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceFactories;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceFactories;
 
 /**
  * {@link List} of command outputs, possibly deeply nested.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
diff --git a/src/main/java/com/lambdaworks/redis/output/ScanOutput.java b/src/main/java/io/lettuce/core/output/ScanOutput.java
similarity index 88%
rename from src/main/java/com/lambdaworks/redis/output/ScanOutput.java
rename to src/main/java/io/lettuce/core/output/ScanOutput.java
index 5b38f8da5d..d1a6c05f8f 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScanOutput.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.LettuceStrings;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.LettuceStrings;
+import io.lettuce.core.ScanCursor;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Cursor handling output.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @param <T> Cursor type.
diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueListOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/output/ScoredValueListOutput.java
rename to src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
index 2d30b990e4..6a79169eb5 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScoredValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.ScoredValue;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.ScoredValue;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * {@link List} of values and their associated scores.
diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueScanOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
similarity index 83%
rename from src/main/java/com/lambdaworks/redis/output/ScoredValueScanOutput.java
rename to src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
index 87ea706fed..8a2fc35713 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScoredValueScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.ScoredValue;
-import com.lambdaworks.redis.ScoredValueScanCursor;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.ScoredValue;
+import io.lettuce.core.ScoredValueScanCursor;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
- * {@link com.lambdaworks.redis.ScoredValueScanCursor} for scan cursor output.
- * 
+ * {@link io.lettuce.core.ScoredValueScanCursor} for scan cursor output.
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/output/ScoredValueScanStreamingOutput.java
rename to src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
index 11e5174b10..a923e72797 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScoredValueScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.ScoredValue;
-import com.lambdaworks.redis.StreamScanCursor;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.ScoredValue;
+import io.lettuce.core.StreamScanCursor;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Streaming-Output of of values and their associated scores. Returns the count of all values (including null).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingChannel.java
rename to src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java
index 33eaa2b3c1..f08e849444 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
-import com.lambdaworks.redis.ScoredValue;
+import io.lettuce.core.ScoredValue;
 
 /**
  * Streaming API for multiple Keys. You can implement this interface in order to receive a call to {@code onValue} on every
  * value.
- * 
+ *
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 3.0
@@ -29,7 +29,7 @@
 public interface ScoredValueStreamingChannel<V> extends StreamingChannel {
     /**
      * Called on every incoming ScoredValue.
-     * 
+     *
      * @param value the scored value
      */
     void onValue(ScoredValue<V> value);
diff --git a/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingOutput.java
rename to src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
index 782b0987de..debda979ca 100644
--- a/src/main/java/com/lambdaworks/redis/output/ScoredValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.ScoredValue;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.ScoredValue;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Streaming-Output of of values and their associated scores. Returns the count of all values (including null).
- * 
+ *
  * @author Mark Paluch
  * @param <K> Key type.
  * @param <V> Value type.
diff --git a/src/main/java/com/lambdaworks/redis/output/StatusOutput.java b/src/main/java/io/lettuce/core/output/StatusOutput.java
similarity index 87%
rename from src/main/java/com/lambdaworks/redis/output/StatusOutput.java
rename to src/main/java/io/lettuce/core/output/StatusOutput.java
index 32d52e27a1..5877b8d466 100644
--- a/src/main/java/com/lambdaworks/redis/output/StatusOutput.java
+++ b/src/main/java/io/lettuce/core/output/StatusOutput.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.codec.RedisCodec;
 
-import static com.lambdaworks.redis.protocol.LettuceCharsets.buffer;
+import static io.lettuce.core.protocol.LettuceCharsets.buffer;
 
 /**
  * Status message output.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
diff --git a/src/main/java/com/lambdaworks/redis/output/StreamingChannel.java b/src/main/java/io/lettuce/core/output/StreamingChannel.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/output/StreamingChannel.java
rename to src/main/java/io/lettuce/core/output/StreamingChannel.java
index 2fc0bbe3c9..7b5e19fc29 100644
--- a/src/main/java/com/lambdaworks/redis/output/StreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/StreamingChannel.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 /**
  * Marker interface for streaming channels.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
diff --git a/src/main/java/com/lambdaworks/redis/output/StreamingOutput.java b/src/main/java/io/lettuce/core/output/StreamingOutput.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/output/StreamingOutput.java
rename to src/main/java/io/lettuce/core/output/StreamingOutput.java
index 0849803bfb..14ea0082d3 100644
--- a/src/main/java/com/lambdaworks/redis/output/StreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/StreamingOutput.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 /**
  * Implementors of this class support a streaming {@link CommandOutput} while the command is still processed. The receiving
diff --git a/src/main/java/com/lambdaworks/redis/output/StringListOutput.java b/src/main/java/io/lettuce/core/output/StringListOutput.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/output/StringListOutput.java
rename to src/main/java/io/lettuce/core/output/StringListOutput.java
index 206d45a930..e99fccd05a 100644
--- a/src/main/java/com/lambdaworks/redis/output/StringListOutput.java
+++ b/src/main/java/io/lettuce/core/output/StringListOutput.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * {@link List} of string output.
diff --git a/src/main/java/com/lambdaworks/redis/output/StringValueListOutput.java b/src/main/java/io/lettuce/core/output/StringValueListOutput.java
similarity index 87%
rename from src/main/java/com/lambdaworks/redis/output/StringValueListOutput.java
rename to src/main/java/io/lettuce/core/output/StringValueListOutput.java
index 7a669dabfa..d3eaff0b5d 100644
--- a/src/main/java/com/lambdaworks/redis/output/StringValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/StringValueListOutput.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.Value;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
- * {@link List} of {@link com.lambdaworks.redis.Value} output.
+ * {@link List} of {@link io.lettuce.core.Value} output.
  *
  * @param <K> Key type.
  * @param <V> Value type.
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueListOutput.java b/src/main/java/io/lettuce/core/output/ValueListOutput.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/output/ValueListOutput.java
rename to src/main/java/io/lettuce/core/output/ValueListOutput.java
index 5a3a302a83..138030ec07 100644
--- a/src/main/java/com/lambdaworks/redis/output/ValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueListOutput.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * {@link List} of values output.
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueOutput.java b/src/main/java/io/lettuce/core/output/ValueOutput.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/output/ValueOutput.java
rename to src/main/java/io/lettuce/core/output/ValueOutput.java
index d8ee0bdc44..1cc33d3ad7 100644
--- a/src/main/java/com/lambdaworks/redis/output/ValueOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueOutput.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Value output.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
- * 
+ *
  * @author Will Glozer
  */
 public class ValueOutput<K, V> extends CommandOutput<K, V, V> {
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueScanOutput.java b/src/main/java/io/lettuce/core/output/ValueScanOutput.java
similarity index 83%
rename from src/main/java/com/lambdaworks/redis/output/ValueScanOutput.java
rename to src/main/java/io/lettuce/core/output/ValueScanOutput.java
index eabfeb2ae8..068f930c6f 100644
--- a/src/main/java/com/lambdaworks/redis/output/ValueScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueScanOutput.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.ValueScanCursor;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.ValueScanCursor;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
- * {@link com.lambdaworks.redis.ValueScanCursor} for scan cursor output.
- * 
+ * {@link io.lettuce.core.ValueScanCursor} for scan cursor output.
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/output/ValueScanStreamingOutput.java
rename to src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java
index 4abc1feda2..a10b3a8e3f 100644
--- a/src/main/java/com/lambdaworks/redis/output/ValueScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.StreamScanCursor;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.StreamScanCursor;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Streaming API for multiple Values. You can implement this interface in order to receive a call to {@code onValue} on every
  * key.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueSetOutput.java b/src/main/java/io/lettuce/core/output/ValueSetOutput.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/output/ValueSetOutput.java
rename to src/main/java/io/lettuce/core/output/ValueSetOutput.java
index 2870303e50..db0f75dae6 100644
--- a/src/main/java/com/lambdaworks/redis/output/ValueSetOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueSetOutput.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * {@link Set} of value output.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
- * 
+ *
  * @author Will Glozer
  */
 public class ValueSetOutput<K, V> extends CommandOutput<K, V, Set<V>> {
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/output/ValueStreamingChannel.java
rename to src/main/java/io/lettuce/core/output/ValueStreamingChannel.java
index e90e5db115..fd47ce28dd 100644
--- a/src/main/java/com/lambdaworks/redis/output/ValueStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 /**
  * Streaming API for multiple Keys. You can implement this interface in order to receive a call to {@code onValue} on every
  * value.
- * 
+ *
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 3.0
@@ -27,7 +27,7 @@
 public interface ValueStreamingChannel<V> {
     /**
      * Called on every incoming value.
-     * 
+     *
      * @param value the value
      */
     void onValue(V value);
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/output/ValueStreamingOutput.java
rename to src/main/java/io/lettuce/core/output/ValueStreamingOutput.java
index 0fae37d092..a948a84cb0 100644
--- a/src/main/java/com/lambdaworks/redis/output/ValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * Streaming-Output of Values. Returns the count of all values (including null).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/output/ValueValueListOutput.java b/src/main/java/io/lettuce/core/output/ValueValueListOutput.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/output/ValueValueListOutput.java
rename to src/main/java/io/lettuce/core/output/ValueValueListOutput.java
index 030edba528..e08f718a9d 100644
--- a/src/main/java/com/lambdaworks/redis/output/ValueValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueValueListOutput.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.Value;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * {@link List} of {@link Value} wrapped values output.
diff --git a/src/main/java/com/lambdaworks/redis/output/package-info.java b/src/main/java/io/lettuce/core/output/package-info.java
similarity index 69%
rename from src/main/java/com/lambdaworks/redis/output/package-info.java
rename to src/main/java/io/lettuce/core/output/package-info.java
index 988528e46d..fe6ec2fce2 100644
--- a/src/main/java/com/lambdaworks/redis/output/package-info.java
+++ b/src/main/java/io/lettuce/core/output/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Implementation of different output protocols including the Streaming API.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
diff --git a/src/main/java/io/lettuce/core/package-info.java b/src/main/java/io/lettuce/core/package-info.java
new file mode 100644
index 0000000000..de06bc9552
--- /dev/null
+++ b/src/main/java/io/lettuce/core/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * The redis client package containing {@link io.lettuce.core.RedisClient} for regular and sentinel operations.
+ */
+package io.lettuce.core;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/AsyncCommand.java b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/protocol/AsyncCommand.java
rename to src/main/java/io/lettuce/core/protocol/AsyncCommand.java
index 8018ada89f..78c1726d63 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/AsyncCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
@@ -13,28 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
-import com.lambdaworks.redis.RedisCommandExecutionException;
-import com.lambdaworks.redis.RedisCommandInterruptedException;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.output.CommandOutput;
+import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.RedisCommandInterruptedException;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.output.CommandOutput;
 import io.netty.buffer.ByteBuf;
 
 /**
  * An asynchronous redis command and its result. All successfully executed commands will eventually return a
  * {@link CommandOutput} object.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @param <T> Command output type.
- * 
+ *
  * @author Mark Paluch
  */
 public class AsyncCommand<K, V, T> extends CompletableFuture<T> implements RedisCommand<K, V, T>, RedisFuture<T>,
@@ -44,9 +44,9 @@ public class AsyncCommand<K, V, T> extends CompletableFuture<T> implements Redis
     protected RedisCommand<K, V, T> command;
 
     /**
-     * 
+     *
      * @param command the command, must not be {@literal null}.
-     * 
+     *
      */
     public AsyncCommand(RedisCommand<K, V, T> command) {
         LettuceAssert.notNull(command, "RedisCommand must not be null");
@@ -73,7 +73,7 @@ public boolean await(long timeout, TimeUnit unit) {
 
     /**
      * Get the object that holds this command's output.
-     * 
+     *
      * @return The command output object.
      */
     @Override
@@ -174,5 +174,5 @@ public void onComplete(Consumer<? super T> action) {
 	public RedisCommand<K, V, T> getDelegate() {
 		return command;
 	}
-	
+
 }
diff --git a/src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java b/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java
rename to src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java
index 1cfd0eb65b..025fcae28b 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/BaseRedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.ScriptOutputType;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.output.*;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.ScriptOutputType;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.output.*;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/protocol/ChannelLogDescriptor.java b/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/protocol/ChannelLogDescriptor.java
rename to src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java
index 28b2936a72..1f4da87f5a 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ChannelLogDescriptor.java
+++ b/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import io.netty.channel.Channel;
 
diff --git a/src/main/java/com/lambdaworks/redis/protocol/Command.java b/src/main/java/io/lettuce/core/protocol/Command.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/protocol/Command.java
rename to src/main/java/io/lettuce/core/protocol/Command.java
index aea8e5de0d..c9854decb6 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/Command.java
+++ b/src/main/java/io/lettuce/core/protocol/Command.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.output.CommandOutput;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.output.CommandOutput;
 
 import io.netty.buffer.ByteBuf;
 
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
rename to src/main/java/io/lettuce/core/protocol/CommandArgs.java
index bdcbca1e67..c86f3c9109 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandArgs.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -21,11 +21,11 @@
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.LettuceStrings;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.codec.ToByteBufEncoder;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.LettuceStrings;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.codec.ToByteBufEncoder;
+import io.lettuce.core.internal.LettuceAssert;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
@@ -38,13 +38,13 @@
  * <p>
  * Usage
  * </p>
- * 
+ *
  * <pre>
  *     <code>
  *         new CommandArgs<>(codec).addKey(key).addValue(value).add(CommandKeyword.FORCE);
  *     </code>
  * </pre>
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
@@ -80,7 +80,7 @@ public int count() {
 
     /**
      * Adds a key argument.
-     * 
+     *
      * @param key the key
      * @return the command args.
      */
@@ -96,7 +96,7 @@ public CommandArgs<K, V> addKey(K key) {
 
     /**
      * Add multiple key arguments.
-     * 
+     *
      * @param keys must not be {@literal null}.
      * @return the command args.
      */
@@ -112,7 +112,7 @@ public CommandArgs<K, V> addKeys(Iterable<K> keys) {
 
     /**
      * Add multiple key arguments.
-     * 
+     *
      * @param keys must not be {@literal null}.
      * @return the command args.
      */
@@ -128,7 +128,7 @@ public CommandArgs<K, V> addKeys(K... keys) {
 
     /**
      * Add a value argument.
-     * 
+     *
      * @param value the value
      * @return the command args.
      */
@@ -140,7 +140,7 @@ public CommandArgs<K, V> addValue(V value) {
 
     /**
      * Add multiple value arguments.
-     * 
+     *
      * @param values must not be {@literal null}.
      * @return the command args.
      */
@@ -156,7 +156,7 @@ public CommandArgs<K, V> addValues(Iterable<V> values) {
 
     /**
      * Add multiple value arguments.
-     * 
+     *
      * @param values must not be {@literal null}.
      * @return the command args.
      */
@@ -172,7 +172,7 @@ public CommandArgs<K, V> addValues(V... values) {
 
     /**
      * Add a map (hash) argument.
-     * 
+     *
      * @param map the map, must not be {@literal null}.
      * @return the command args.
      */
@@ -189,7 +189,7 @@ public CommandArgs<K, V> add(Map<K, V> map) {
 
     /**
      * Add a string argument. The argument is represented as bulk string.
-     * 
+     *
      * @param s the string.
      * @return the command args.
      */
@@ -205,7 +205,7 @@ public CommandArgs<K, V> add(String s) {
 
     /**
      * Add an 64-bit integer (long) argument.
-     * 
+     *
      * @param n the argument.
      * @return the command args.
      */
@@ -221,7 +221,7 @@ public CommandArgs<K, V> add(long n) {
 
     /**
      * Add a double argument.
-     * 
+     *
      * @param n the double argument.
      * @return the command args.
      */
@@ -233,7 +233,7 @@ public CommandArgs<K, V> add(double n) {
 
     /**
      * Add a byte-array argument. The argument is represented as bulk string.
-     * 
+     *
      * @param value the byte-array.
      * @return the command args.
      */
@@ -245,7 +245,7 @@ public CommandArgs<K, V> add(byte[] value) {
 
     /**
      * Add a {@link CommandKeyword} argument. The argument is represented as bulk string.
-     * 
+     *
      * @param keyword must not be {@literal null}.
      * @return the command args.
      */
@@ -257,7 +257,7 @@ public CommandArgs<K, V> add(CommandKeyword keyword) {
 
     /**
      * Add a {@link CommandType} argument. The argument is represented as bulk string.
-     * 
+     *
      * @param type must not be {@literal null}.
      * @return the command args.
      */
@@ -269,7 +269,7 @@ public CommandArgs<K, V> add(CommandType type) {
 
     /**
      * Add a {@link ProtocolKeyword} argument. The argument is represented as bulk string.
-     * 
+     *
      * @param keyword the keyword, must not be {@literal null}
      * @return the command args.
      */
@@ -313,7 +313,7 @@ public String toCommandString() {
 
     /**
      * Returns the first integer argument.
-     * 
+     *
      * @return the first integer argument or {@literal null}.
      */
     public Long getFirstInteger() {
@@ -322,7 +322,7 @@ public Long getFirstInteger() {
 
     /**
      * Returns the first string argument.
-     * 
+     *
      * @return the first string argument or {@literal null}.
      */
     public String getFirstString() {
@@ -331,7 +331,7 @@ public String getFirstString() {
 
     /**
      * Returns the first key argument in its byte-encoded representation.
-     * 
+     *
      * @return the first key argument in its byte-encoded representation or {@literal null}.
      */
     public ByteBuffer getFirstEncodedKey() {
@@ -349,7 +349,7 @@ public ByteBuffer getFirstEncodedKey() {
 
     /**
      * Encode the {@link CommandArgs} and write the arguments to the {@link ByteBuf}.
-     * 
+     *
      * @param buf the target buffer.
      */
     public void encode(ByteBuf buf) {
@@ -366,7 +366,7 @@ static abstract class SingularArgument {
 
         /**
          * Encode the argument and write it to the {@code buffer}.
-         * 
+         *
          * @param buffer
          */
         abstract void encode(ByteBuf buffer);
@@ -501,7 +501,7 @@ static class IntegerCache {
         static final IntegerArgument cache[];
 
         static {
-            int high = Integer.getInteger("biz.paluch.redis.CommandArgs.IntegerCache", 128);
+            int high = Integer.getInteger("io.lettuce.core.CommandArgs.IntegerCache", 128);
             cache = new IntegerArgument[high];
             for (int i = 0; i < high; i++) {
                 cache[i] = new IntegerArgument(i);
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java b/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java
rename to src/main/java/io/lettuce/core/protocol/CommandEncoder.java
index a9eb2430b9..402571748f 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandEncoder.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.nio.charset.Charset;
 import java.util.Collection;
@@ -29,7 +29,7 @@
 
 /**
  * A netty {@link ChannelHandler} responsible for encoding commands.
- * 
+ *
  * @author Mark Paluch
  */
 public class CommandEncoder extends MessageToByteEncoder<Object> {
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
rename to src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 23bdc7e8cb..202300c9b8 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.io.IOException;
 import java.net.SocketAddress;
@@ -24,12 +24,12 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.lambdaworks.redis.ConnectionEvents;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceFactories;
-import com.lambdaworks.redis.internal.LettuceSets;
-import com.lambdaworks.redis.output.CommandOutput;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.ConnectionEvents;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceFactories;
+import io.lettuce.core.internal.LettuceSets;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.resource.ClientResources;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.*;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandKeyword.java b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/protocol/CommandKeyword.java
rename to src/main/java/io/lettuce/core/protocol/CommandKeyword.java
index 990b48daa7..54ac8ff952 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandKeyword.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 /**
  * Keyword modifiers for redis commands.
- * 
+ *
  * @author Will Glozer
  */
 public enum CommandKeyword implements ProtocolKeyword {
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandType.java b/src/main/java/io/lettuce/core/protocol/CommandType.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/protocol/CommandType.java
rename to src/main/java/io/lettuce/core/protocol/CommandType.java
index 5e087a0cde..368af7f1f5 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandType.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 /**
  * Redis commands.
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandWrapper.java b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/protocol/CommandWrapper.java
rename to src/main/java/io/lettuce/core/protocol/CommandWrapper.java
index 56d1ad0806..8bf8bf69cc 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CommandWrapper.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 
-import com.lambdaworks.redis.output.CommandOutput;
+import io.lettuce.core.output.CommandOutput;
 import io.netty.buffer.ByteBuf;
 
 /**
  * Wrapper for a command.
- * 
+ *
  * @author Mark Paluch
  */
 public class CommandWrapper<K, V, T> implements RedisCommand<K, V, T>, CompleteableCommand<T>, DecoratedCommand<K, V, T> {
@@ -118,7 +118,7 @@ public RedisCommand<K, V, T> getDelegate() {
 
     /**
      * Unwrap a wrapped command.
-     * 
+     *
      * @param wrapped
      * @param <K>
      * @param <V>
diff --git a/src/main/java/com/lambdaworks/redis/protocol/CompleteableCommand.java b/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/protocol/CompleteableCommand.java
rename to src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
index f3747dd315..bbef912cc2 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/CompleteableCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.util.function.Consumer;
 
diff --git a/src/main/java/com/lambdaworks/redis/protocol/ConnectionFacade.java b/src/main/java/io/lettuce/core/protocol/ConnectionFacade.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/protocol/ConnectionFacade.java
rename to src/main/java/io/lettuce/core/protocol/ConnectionFacade.java
index 9ab1ae349e..bcead7d168 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ConnectionFacade.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionFacade.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 /**
  * Represents a stateful connection facade. Connections can be activated and deactivated and particular actions can be executed
  * upon connection activation/deactivation.
- * 
+ *
  * @author Mark Paluch
  */
 public interface ConnectionFacade {
diff --git a/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
rename to src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
index 8699004b30..39e5806518 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ConnectionWatchdog.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.net.SocketAddress;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.ClientOptions;
-import com.lambdaworks.redis.ConnectionEvents;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.resource.Delay;
-import com.lambdaworks.redis.resource.Delay.StatefulDelay;
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.ConnectionEvents;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.resource.Delay;
+import io.lettuce.core.resource.Delay.StatefulDelay;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.*;
@@ -38,7 +38,7 @@
 
 /**
  * A netty {@link ChannelHandler} responsible for monitoring the channel and reconnecting when the connection is lost.
- * 
+ *
  * @author Will Glozer
  * @author Mark Paluch
  */
@@ -68,7 +68,7 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
     /**
      * Create a new watchdog that adds to new connections to the supplied {@link ChannelGroup} and establishes a new
      * {@link Channel} when disconnected, while reconnect is true. The socketAddressSupplier can supply the reconnect address.
-     * 
+     *
      * @param reconnectDelay reconnect delay, must not be {@literal null}
      * @param clientOptions client options for the current connection, must not be {@literal null}
      * @param bootstrap Configuration for new channels, must not be {@literal null}
@@ -226,7 +226,7 @@ public void run(final Timeout timeout) throws Exception {
     /**
      * Reconnect to the remote address that the closed channel was connected to. This creates a new {@link ChannelPipeline} with
      * the same handler instances contained in the old channel's pipeline.
-     * 
+     *
      * @param attempt attempt counter
      *
      * @throws Exception when reconnection fails.
diff --git a/src/main/java/com/lambdaworks/redis/protocol/DecoratedCommand.java b/src/main/java/io/lettuce/core/protocol/DecoratedCommand.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/protocol/DecoratedCommand.java
rename to src/main/java/io/lettuce/core/protocol/DecoratedCommand.java
index 56f46acf0c..18235f3b0b 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/DecoratedCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/DecoratedCommand.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 /**
  * A decorated command allowing access to the underlying {@link #getDelegate()}.
- * 
+ *
  * @author Mark Paluch
  */
 public interface DecoratedCommand<K, V, T> {
 
     /**
      * The underlying command.
-     * 
+     *
      * @return never {@literal null}.
      */
     RedisCommand<K, V, T> getDelegate();
diff --git a/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
rename to src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index 10ff7db922..567aaaeacd 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
-import static com.lambdaworks.redis.protocol.CommandHandler.SUPPRESS_IO_EXCEPTION_MESSAGES;
+import static io.lettuce.core.protocol.CommandHandler.SUPPRESS_IO_EXCEPTION_MESSAGES;
 
 import java.io.IOException;
 import java.nio.channels.ClosedChannelException;
@@ -24,12 +24,12 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.ClientOptions;
-import com.lambdaworks.redis.ConnectionEvents;
-import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceFactories;
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.ConnectionEvents;
+import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceFactories;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/DemandAware.java b/src/main/java/io/lettuce/core/protocol/DemandAware.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/protocol/DemandAware.java
rename to src/main/java/io/lettuce/core/protocol/DemandAware.java
index f713444d97..d2e617b65c 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/DemandAware.java
+++ b/src/main/java/io/lettuce/core/protocol/DemandAware.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 /**
  * Interface for demand-aware components.
@@ -38,7 +38,7 @@ interface Sink {
          * Returns {@literal true} if the {@link Sink} has demand or {@literal false} if the source has no demand.
          * {@literal false} means either the {@link Sink} has no demand in general because data is not needed or the current
          * demand is saturated.
-         * 
+         *
          * @return {@literal true} if the {@link Sink} demands data.
          */
         boolean hasDemand();
@@ -46,7 +46,7 @@ interface Sink {
         /**
          * Sets the {@link Source} for a {@link Sink}. The {@link Sink} is notified by this {@link Source} if the source
          * indicates new demand or the sink catches up so it's ready to receive more data.
-         * 
+         *
          * @param source the reference to the data {@link Source}, must not be {@literal null}.
          */
         void setSource(Source source);
diff --git a/src/main/java/com/lambdaworks/redis/protocol/Endpoint.java b/src/main/java/io/lettuce/core/protocol/Endpoint.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/protocol/Endpoint.java
rename to src/main/java/io/lettuce/core/protocol/Endpoint.java
index e0d73b15f4..75f0e23bbc 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/Endpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/Endpoint.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.util.Optional;
 
@@ -29,28 +29,28 @@ public interface Endpoint {
 
     /**
      * Notify about channel activation.
-     * 
+     *
      * @param channel the channel
      */
     void notifyChannelActive(Channel channel);
 
     /**
      * Notify about channel deactivation.
-     * 
+     *
      * @param channel the channel
      */
     void notifyChannelInactive(Channel channel);
 
     /**
      * Notify about an exception occured in channel/command processing
-     * 
+     *
      * @param t the Exception
      */
     void notifyException(Throwable t);
 
     /**
      * Register a component holding a queue.
-     * 
+     *
      * @param queueHolder the queue holder.
      */
     void registerQueue(HasQueuedCommands queueHolder);
@@ -64,14 +64,14 @@ public interface Endpoint {
 
     /**
      * Signal the endpoint to drain queued commands from the queue holder.
-     * 
+     *
      * @param queuedCommands the queue holder.
      */
     void notifyDrainQueuedCommands(HasQueuedCommands queuedCommands);
 
     /**
      * Associate a {@link ConnectionWatchdog} with the {@link Endpoint}.
-     * 
+     *
      * @param connectionWatchdog the connection watchdog, may be empty.
      */
     void registerConnectionWatchdog(Optional<ConnectionWatchdog> connectionWatchdog);
diff --git a/src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java b/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java
rename to src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java
index b68e99b726..f72c101d57 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/HasQueuedCommands.java
+++ b/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.util.Queue;
 
@@ -27,7 +27,7 @@ public interface HasQueuedCommands {
 
     /**
      * The queue holding commands.
-     * 
+     *
      * @return the queue
      */
     Queue<RedisCommand<?, ?, ?>> getQueue();
diff --git a/src/main/java/com/lambdaworks/redis/protocol/LettuceCharsets.java b/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/protocol/LettuceCharsets.java
rename to src/main/java/io/lettuce/core/protocol/LettuceCharsets.java
index e6724aeb4b..18ac4ea616 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/LettuceCharsets.java
+++ b/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
 /**
  * {@link Charset}-related utilities.
- * 
+ *
  * @author Will Glozer
  */
 public class LettuceCharsets {
@@ -44,7 +44,7 @@ private LettuceCharsets() {
 
     /**
      * Create a ByteBuffer from a string using ASCII encoding.
-     * 
+     *
      * @param s the string
      * @return ByteBuffer
      */
diff --git a/src/main/java/com/lambdaworks/redis/protocol/ProtocolKeyword.java b/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/protocol/ProtocolKeyword.java
rename to src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java
index 13398a58c4..b2bd9d1700 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ProtocolKeyword.java
+++ b/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 /**
  * Interface for protocol keywords providing an encoded representation.
- * 
+ *
  * @author Mark Paluch
  */
 public interface ProtocolKeyword {
 
     /**
-     * 
+     *
      * @return byte[] encoded representation.
-     * 
+     *
      */
     byte[] getBytes();
 
diff --git a/src/main/java/com/lambdaworks/redis/protocol/QueuedCommands.java b/src/main/java/io/lettuce/core/protocol/QueuedCommands.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/protocol/QueuedCommands.java
rename to src/main/java/io/lettuce/core/protocol/QueuedCommands.java
index 67094a0c89..78d7da2781 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/QueuedCommands.java
+++ b/src/main/java/io/lettuce/core/protocol/QueuedCommands.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,7 +25,7 @@
 /**
  * Registry for all queued commands. This class allows to register/unregister {@link HasQueuedCommands queue holders}. It
  * provides queue maintenance commands.
- * 
+ *
  * @author Mark Paluch
  */
 class QueuedCommands {
@@ -34,7 +34,7 @@ class QueuedCommands {
 
     /**
      * Register queue holder.
-     * 
+     *
      * @param queueHolder the queue holder, must not be {@literal null}.
      */
     void register(HasQueuedCommands queueHolder) {
@@ -52,7 +52,7 @@ void unregister(HasQueuedCommands queueHolder) {
 
     /**
      * Remove a command from all registered queues.
-     * 
+     *
      * @param command the command.
      */
     public void remove(RedisCommand<?, ?, ?> command) {
@@ -76,7 +76,7 @@ void removeAll(Collection<? extends RedisCommand<?, ?, ?>> commands) {
 
     /**
      * Drain commands from all queues.
-     * 
+     *
      * @return the commands.
      */
     List<RedisCommand<?, ?, ?>> drainCommands() {
@@ -101,7 +101,7 @@ void removeAll(Collection<? extends RedisCommand<?, ?, ?>> commands) {
 
     /**
      * Check whether the registered queues exceed a global sized of the {@code requestQueueSize}.
-     * 
+     *
      * @param requestQueueSize the queue size limit.
      * @return {@literal true} if there are more queued commands than {@code requestQueueSize}
      */
diff --git a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java
rename to src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
index 9b83519049..73fbdf6832 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.net.SocketAddress;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.ClientOptions;
-import com.lambdaworks.redis.RedisChannelInitializer;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.RedisChannelInitializer;
+import io.lettuce.core.internal.LettuceAssert;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
diff --git a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionListener.java b/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/protocol/ReconnectionListener.java
rename to src/main/java/io/lettuce/core/protocol/ReconnectionListener.java
index 902bc6f279..b8a9fec58a 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/ReconnectionListener.java
+++ b/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
-import com.lambdaworks.redis.ConnectionEvents;
+import io.lettuce.core.ConnectionEvents;
 
 /**
  * Listener for reconnection events.
- * 
+ *
  * @author Mark Paluch
  * @since 4.2
  */
@@ -34,7 +34,7 @@ public void onReconnect(ConnectionEvents.Reconnect reconnect) {
 
     /**
      * Listener method notified on a reconnection attempt.
-     * 
+     *
      * @param reconnect the event payload.
      */
     void onReconnect(ConnectionEvents.Reconnect reconnect);
diff --git a/src/main/java/com/lambdaworks/redis/protocol/RedisCommand.java b/src/main/java/io/lettuce/core/protocol/RedisCommand.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/protocol/RedisCommand.java
rename to src/main/java/io/lettuce/core/protocol/RedisCommand.java
index a5dac8dfc0..780022724a 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/RedisCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisCommand.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
-import com.lambdaworks.redis.output.CommandOutput;
+import io.lettuce.core.output.CommandOutput;
 import io.netty.buffer.ByteBuf;
 
 /**
@@ -23,7 +23,7 @@
  *
  * Commands can be wrapped. Outer commands have to notify inner commands but inner commands do not communicate with outer
  * commands.
- * 
+ *
  * @author Mark Paluch
  * @param <K> Key type.
  * @param <V> Value type.
@@ -34,7 +34,7 @@ public interface RedisCommand<K, V, T> {
 
     /**
      * The command output. Can be null.
-     * 
+     *
      * @return the command output.
      */
     CommandOutput<K, V, T> getOutput();
@@ -50,7 +50,7 @@ public interface RedisCommand<K, V, T> {
     void cancel();
 
     /**
-     * 
+     *
      * @return the current command args
      */
     CommandArgs<K, V> getArgs();
@@ -90,7 +90,7 @@ public interface RedisCommand<K, V, T> {
 
     /**
      * Set a new output. Only possible as long as the command is not completed/cancelled.
-     * 
+     *
      * @param output the new command output
      * @throws IllegalStateException if the command is cancelled/completed
      */
diff --git a/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
rename to src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index 29841201c0..d350af0345 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -13,18 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
-import static com.lambdaworks.redis.protocol.LettuceCharsets.buffer;
-import static com.lambdaworks.redis.protocol.RedisStateMachine.State.Type.*;
+import static io.lettuce.core.protocol.LettuceCharsets.buffer;
+import static io.lettuce.core.protocol.RedisStateMachine.State.Type.*;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.output.CommandOutput;
-
+import io.lettuce.core.RedisException;
+import io.lettuce.core.output.CommandOutput;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufProcessor;
 import io.netty.buffer.PooledByteBufAllocator;
@@ -56,7 +55,7 @@ public class RedisStateMachine {
                 && nettyBufferVersion.artifactVersion().startsWith("4.0");
         if (!USE_NETTY40_BYTEBUF_COMPATIBILITY) {
             try {
-                LONG_PROCESSOR_CLASS = Class.forName("com.lambdaworks.redis.protocol.RedisStateMachine$Netty41LongProcessor");
+                LONG_PROCESSOR_CLASS = Class.forName("io.lettuce.core.protocol.RedisStateMachine$Netty41LongProcessor");
             } catch (ClassNotFoundException e) {
                 throw new RedisException("Cannot load Netty41LongProcessor class", e);
             }
diff --git a/src/main/java/com/lambdaworks/redis/protocol/SharedLock.java b/src/main/java/io/lettuce/core/protocol/SharedLock.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/protocol/SharedLock.java
rename to src/main/java/io/lettuce/core/protocol/SharedLock.java
index 10446df6cd..522806724c 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/SharedLock.java
+++ b/src/main/java/io/lettuce/core/protocol/SharedLock.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Shared locking facade that supports shared and exclusive locking.
@@ -29,7 +29,7 @@
  * Exclusive locking is reentrant. An exclusive lock owner is permitted to acquire and release shared locks. Shared/exclusive
  * lock requests by other threads than the thread which holds the exclusive lock, are forced to wait until the exclusive lock is
  * released.
- * 
+ *
  * @author Mark Paluch
  */
 class SharedLock {
@@ -71,7 +71,7 @@ void decrementWriters() {
 
     /**
      * Execute a {@link Runnable} guarded by an exclusive lock.
-     * 
+     *
      * @param runnable the runnable, must not be {@literal null}.
      */
     void doExclusive(Runnable runnable) {
@@ -86,7 +86,7 @@ void doExclusive(Runnable runnable) {
 
     /**
      * Retrieve a value produced by a {@link Supplier} guarded by an exclusive lock.
-     * 
+     *
      * @param supplier the {@link Supplier}, must not be {@literal null}.
      * @param <T> the return type
      * @return the return value
diff --git a/src/main/java/com/lambdaworks/redis/protocol/TransactionalCommand.java b/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/protocol/TransactionalCommand.java
rename to src/main/java/io/lettuce/core/protocol/TransactionalCommand.java
index 2a281f7ffb..5f6d741832 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/TransactionalCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.util.concurrent.CountDownLatch;
 
@@ -21,12 +21,12 @@
  * A wrapper for commands within a {@literal MULTI} transaction. Commands triggered within a transaction will be completed
  * twice. Once on the submission and once during {@literal EXEC}. Only the second completion will complete the underlying
  * command.
- * 
- * 
+ *
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @param <T> Command output type.
- * 
+ *
  * @author Mark Paluch
  */
 public class TransactionalCommand<K, V, T> extends AsyncCommand<K, V, T> implements RedisCommand<K, V, T> {
diff --git a/src/main/java/com/lambdaworks/redis/protocol/WithLatency.java b/src/main/java/io/lettuce/core/protocol/WithLatency.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/protocol/WithLatency.java
rename to src/main/java/io/lettuce/core/protocol/WithLatency.java
index cad57a5ce7..f3c2f086d8 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/WithLatency.java
+++ b/src/main/java/io/lettuce/core/protocol/WithLatency.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 /**
  * Interface to items recording a latency. Unit of time depends on the actual implementation.
- * 
+ *
  * @author Mark Paluch
  */
 interface WithLatency {
@@ -46,13 +46,13 @@ interface WithLatency {
 	long getSent();
 
 	/**
-	 * 
+	 *
 	 * @return the time of the first response.
      */
 	long getFirstResponse();
 
 	/**
-	 * 
+	 *
 	 * @return the time of completion.
      */
 	long getCompleted();
diff --git a/src/main/java/com/lambdaworks/redis/protocol/package-info.java b/src/main/java/io/lettuce/core/protocol/package-info.java
similarity index 52%
rename from src/main/java/com/lambdaworks/redis/protocol/package-info.java
rename to src/main/java/io/lettuce/core/protocol/package-info.java
index a84a938889..a28811c1f9 100644
--- a/src/main/java/com/lambdaworks/redis/protocol/package-info.java
+++ b/src/main/java/io/lettuce/core/protocol/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis protocol layer abstraction.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandArgs.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandArgs.java
rename to src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java
index d6ddd852d7..243cfdf931 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandArgs.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub;
+package io.lettuce.core.pubsub;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.protocol.CommandArgs;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.protocol.CommandArgs;
 
 /**
  *
  * Command args for Pub/Sub connections. This implementation hides the first key as PubSub keys are not keys from the key-space.
- * 
+ *
  * @author Mark Paluch
  * @since 4.2
  */
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandBuilder.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java
similarity index 78%
rename from src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandBuilder.java
rename to src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java
index 72793d2625..3a98d5b5e0 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java
@@ -13,29 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub;
+package io.lettuce.core.pubsub;
 
-import static com.lambdaworks.redis.protocol.CommandKeyword.CHANNELS;
-import static com.lambdaworks.redis.protocol.CommandKeyword.NUMSUB;
-import static com.lambdaworks.redis.protocol.CommandType.*;
+import static io.lettuce.core.protocol.CommandKeyword.CHANNELS;
+import static io.lettuce.core.protocol.CommandKeyword.NUMSUB;
+import static io.lettuce.core.protocol.CommandType.*;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.output.CommandOutput;
-import com.lambdaworks.redis.output.IntegerOutput;
-import com.lambdaworks.redis.output.KeyListOutput;
-import com.lambdaworks.redis.output.MapOutput;
-import com.lambdaworks.redis.protocol.BaseRedisCommandBuilder;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.output.IntegerOutput;
+import io.lettuce.core.output.KeyListOutput;
+import io.lettuce.core.output.MapOutput;
+import io.lettuce.core.protocol.BaseRedisCommandBuilder;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandType;
 
 /**
  * Dedicated pub/sub command builder to build pub/sub commands.
- * 
+ *
  * @author Mark Paluch
  * @since 4.2
  */
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java
rename to src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
index 752c7788fe..c99facf1a8 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub;
+package io.lettuce.core.pubsub;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.output.CommandOutput;
-import com.lambdaworks.redis.protocol.CommandHandler;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.protocol.CommandHandler;
+import io.lettuce.core.resource.ClientResources;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
@@ -27,10 +27,10 @@
 /**
  * A netty {@link ChannelHandler} responsible for writing redis pub/sub commands and reading the response stream from the
  * server.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
- * 
+ *
  * @author Will Glozer
  */
 public class PubSubCommandHandler<K, V> extends CommandHandler {
@@ -41,7 +41,7 @@ public class PubSubCommandHandler<K, V> extends CommandHandler {
 
     /**
      * Initialize a new instance.
-     * 
+     *
      * @param clientResources client resources for this connection
      * @param codec Codec.
      * @param endpoint the Pub/Sub endpoint for Pub/Sub callback.
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java
rename to src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
index fe1817613d..8d884445c5 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubEndpoint.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub;
+package io.lettuce.core.pubsub;
 
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import com.lambdaworks.redis.ClientOptions;
-import com.lambdaworks.redis.protocol.DefaultEndpoint;
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.protocol.DefaultEndpoint;
 
 import io.netty.util.internal.ConcurrentSet;
 
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubOutput.java b/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/pubsub/PubSubOutput.java
rename to src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
index 2060d771dd..5679b8c98b 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubOutput.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub;
+package io.lettuce.core.pubsub;
 
 import java.nio.ByteBuffer;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.output.CommandOutput;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.output.CommandOutput;
 
 /**
  * One element of the redis pub/sub stream. May be a message or notification of subscription details.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @param <T> Result type.
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAdapter.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAdapter.java
rename to src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java
index bd7e0133dc..8c5f618e93 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAdapter.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub;
+package io.lettuce.core.pubsub;
 
 /**
  * Convenience adapter with an empty implementation of all {@link RedisPubSubListener} callback methods.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
- * 
+ *
  * @author Will Glozer
  */
 public class RedisPubSubAdapter<K, V> implements RedisPubSubListener<K, V> {
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
rename to src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java
index 87f8355c1a..e38e9ab601 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub;
+package io.lettuce.core.pubsub;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.RedisAsyncCommandsImpl;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
+import io.lettuce.core.RedisAsyncCommandsImpl;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
 
 /**
  * An asynchronous and thread-safe API for a Redis pub/sub connection.
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubListener.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubListener.java
rename to src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java
index 32c29d4e39..fdb829ef9e 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubListener.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub;
+package io.lettuce.core.pubsub;
 
 /**
  * Interface for redis pub/sub listeners.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
@@ -25,7 +25,7 @@
 public interface RedisPubSubListener<K, V> {
     /**
      * Message received from a channel subscription.
-     * 
+     *
      * @param channel Channel.
      * @param message Message.
      */
@@ -33,7 +33,7 @@ public interface RedisPubSubListener<K, V> {
 
     /**
      * Message received from a pattern subscription.
-     * 
+     *
      * @param pattern Pattern
      * @param channel Channel
      * @param message Message
@@ -42,7 +42,7 @@ public interface RedisPubSubListener<K, V> {
 
     /**
      * Subscribed to a channel.
-     * 
+     *
      * @param channel Channel
      * @param count Subscription count.
      */
@@ -50,7 +50,7 @@ public interface RedisPubSubListener<K, V> {
 
     /**
      * Subscribed to a pattern.
-     * 
+     *
      * @param pattern Pattern.
      * @param count Subscription count.
      */
@@ -58,7 +58,7 @@ public interface RedisPubSubListener<K, V> {
 
     /**
      * Unsubscribed from a channel.
-     * 
+     *
      * @param channel Channel
      * @param count Subscription count.
      */
@@ -66,7 +66,7 @@ public interface RedisPubSubListener<K, V> {
 
     /**
      * Unsubscribed from a pattern.
-     * 
+     *
      * @param pattern Channel
      * @param count Subscription count.
      */
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
rename to src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
index 809a67fd7f..070bb95e7f 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/RedisPubSubReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub;
+package io.lettuce.core.pubsub;
 
 import java.util.Map;
 
@@ -21,11 +21,11 @@
 import reactor.core.publisher.FluxSink;
 import reactor.core.publisher.Mono;
 
-import com.lambdaworks.redis.RedisReactiveCommandsImpl;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.pubsub.api.reactive.ChannelMessage;
-import com.lambdaworks.redis.pubsub.api.reactive.PatternMessage;
-import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands;
+import io.lettuce.core.RedisReactiveCommandsImpl;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.pubsub.api.reactive.ChannelMessage;
+import io.lettuce.core.pubsub.api.reactive.PatternMessage;
+import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands;
 
 /**
  * A reactive and thread-safe API for a Redis pub/sub connection.
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java
similarity index 83%
rename from src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java
rename to src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java
index e5d8cbd78e..b559a00a8f 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnection.java
+++ b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub;
+package io.lettuce.core.pubsub;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
-import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands;
-import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
+import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands;
+import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands;
 
 /**
  * An asynchronous thread-safe pub/sub connection to a redis server. After one or more channels are subscribed to only pub/sub
  * related commands or {@literal QUIT} may be called.
- * 
+ *
  * Incoming messages and results of the {@literal subscribe}/{@literal unsubscribe} calls will be passed to all registered
  * {@link RedisPubSubListener}s.
- * 
- * A {@link com.lambdaworks.redis.protocol.ConnectionWatchdog} monitors each connection and reconnects automatically until
+ *
+ * A {@link io.lettuce.core.protocol.ConnectionWatchdog} monitors each connection and reconnects automatically until
  * {@link #close} is called. Channel and pattern subscriptions are renewed after reconnecting.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -39,14 +39,14 @@ public interface StatefulRedisPubSubConnection<K, V> extends StatefulRedisConnec
 
     /**
      * Returns the {@link RedisPubSubCommands} API for the current connection. Does not create a new connection.
-     * 
+     *
      * @return the synchronous API for the underlying connection.
      */
     RedisPubSubCommands<K, V> sync();
 
     /**
      * Returns the {@link RedisPubSubAsyncCommands} API for the current connection. Does not create a new connection.
-     * 
+     *
      * @return the asynchronous API for the underlying connection.
      */
     RedisPubSubAsyncCommands<K, V> async();
@@ -67,7 +67,7 @@ public interface StatefulRedisPubSubConnection<K, V> extends StatefulRedisConnec
 
     /**
      * Remove an existing {@link RedisPubSubListener listener}..
-     * 
+     *
      * @param listener the listener, must not be {@literal null}.
      */
     void removeListener(RedisPubSubListener<K, V> listener);
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
rename to src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
index e0e4b4251b..fcec08ef5c 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/StatefulRedisPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub;
+package io.lettuce.core.pubsub;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
@@ -23,14 +23,14 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.StatefulRedisConnectionImpl;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.protocol.ConnectionWatchdog;
-import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
-import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands;
-import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
+import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.StatefulRedisConnectionImpl;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.protocol.ConnectionWatchdog;
+import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
+import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands;
+import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands;
 
 import io.netty.channel.ChannelHandler;
 import io.netty.util.internal.ConcurrentSet;
@@ -40,7 +40,7 @@
  *
  * A {@link ConnectionWatchdog} monitors each connection and reconnects automatically until {@link #close} is called. All
  * pending commands will be (re)sent after successful reconnection.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java
similarity index 87%
rename from src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java
rename to src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java
index 6e98e33186..c2b9dcb32e 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/async/RedisPubSubAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub.api.async;
+package io.lettuce.core.pubsub.api.async;
 
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.pubsub.RedisPubSubListener;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.pubsub.RedisPubSubListener;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 
 /**
  * Asynchronous and thread-safe Redis PubSub API.
@@ -32,7 +32,7 @@ public interface RedisPubSubAsyncCommands<K, V> extends RedisAsyncCommands<K, V>
 
     /**
      * Listen for messages published to channels matching the given patterns.
-     * 
+     *
      * @param patterns the patterns
      * @return RedisFuture&lt;Void&gt; Future to synchronize {@code psubscribe} completion
      */
@@ -40,7 +40,7 @@ public interface RedisPubSubAsyncCommands<K, V> extends RedisAsyncCommands<K, V>
 
     /**
      * Stop listening for messages posted to channels matching the given patterns.
-     * 
+     *
      * @param patterns the patterns
      * @return RedisFuture&lt;Void&gt; Future to synchronize {@code punsubscribe} completion
      */
@@ -48,7 +48,7 @@ public interface RedisPubSubAsyncCommands<K, V> extends RedisAsyncCommands<K, V>
 
     /**
      * Listen for messages published to the given channels.
-     * 
+     *
      * @param channels the channels
      * @return RedisFuture&lt;Void&gt; Future to synchronize {@code subscribe} completion
      */
@@ -56,7 +56,7 @@ public interface RedisPubSubAsyncCommands<K, V> extends RedisAsyncCommands<K, V>
 
     /**
      * Stop listening for messages posted to the given channels.
-     * 
+     *
      * @param channels the channels
      * @return RedisFuture&lt;Void&gt; Future to synchronize {@code unsubscribe} completion.
      */
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/async/package-info.java b/src/main/java/io/lettuce/core/pubsub/api/async/package-info.java
similarity index 57%
rename from src/main/java/com/lambdaworks/redis/pubsub/api/async/package-info.java
rename to src/main/java/io/lettuce/core/pubsub/api/async/package-info.java
index f82360b4bb..98a910594e 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/async/package-info.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/async/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Pub/Sub Redis API for asynchronous executed commands.
  */
-package com.lambdaworks.redis.pubsub.api.async;
+package io.lettuce.core.pubsub.api.async;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/ChannelMessage.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/pubsub/api/reactive/ChannelMessage.java
rename to src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java
index 32a7ca75b5..6213fc3e6b 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/ChannelMessage.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub.api.reactive;
+package io.lettuce.core.pubsub.api.reactive;
 
 /**
  * Message payload for a subscription to a channel.
- * 
+ *
  * @author Mark Paluch
  */
 public class ChannelMessage<K, V> {
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/PatternMessage.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/pubsub/api/reactive/PatternMessage.java
rename to src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java
index 135166ca7c..a8b21bca17 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/PatternMessage.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub.api.reactive;
+package io.lettuce.core.pubsub.api.reactive;
 
 /**
  * Message payload for a subscription to a pattern.
- * 
+ *
  * @author Mark Paluch
  */
 public class PatternMessage<K, V> {
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java
rename to src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java
index 8e2d6d00d7..88bdf60836 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/RedisPubSubReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub.api.reactive;
+package io.lettuce.core.pubsub.api.reactive;
 
-import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.FluxSink;
@@ -63,7 +63,7 @@ public interface RedisPubSubReactiveCommands<K, V> extends RedisReactiveCommands
      * and may lead to {@link OutOfMemoryError}. Use {@link #observeChannels(FluxSink.OverflowStrategy)} to specify a different
      * strategy.
      * </p>
-     * 
+     *
      * @return hot Flux for subscriptions to {@literal message}'s.
      */
     Flux<ChannelMessage<K, V>> observeChannels();
@@ -79,7 +79,7 @@ public interface RedisPubSubReactiveCommands<K, V> extends RedisReactiveCommands
 
     /**
      * Listen for messages published to channels matching the given patterns.
-     * 
+     *
      * @param patterns the patterns
      * @return Flux&lt;Success&gt; Flux for {@code psubscribe} command
      */
@@ -87,7 +87,7 @@ public interface RedisPubSubReactiveCommands<K, V> extends RedisReactiveCommands
 
     /**
      * Stop listening for messages posted to channels matching the given patterns.
-     * 
+     *
      * @param patterns the patterns
      * @return Flux&lt;Success&gt; Flux for {@code punsubscribe} command
      */
@@ -95,7 +95,7 @@ public interface RedisPubSubReactiveCommands<K, V> extends RedisReactiveCommands
 
     /**
      * Listen for messages published to the given channels.
-     * 
+     *
      * @param channels the channels
      * @return Flux&lt;Success&gt; Flux for {@code subscribe} command
      */
@@ -103,7 +103,7 @@ public interface RedisPubSubReactiveCommands<K, V> extends RedisReactiveCommands
 
     /**
      * Stop listening for messages posted to the given channels.
-     * 
+     *
      * @param channels the channels
      * @return Flux&lt;Success&gt; Flux for {@code unsubscribe} command.
      */
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/package-info.java
similarity index 58%
rename from src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java
rename to src/main/java/io/lettuce/core/pubsub/api/reactive/package-info.java
index 17e7b200e6..874cc9e353 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/reactive/package-info.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Pub/Sub Redis API for commands executed in a reactive manner.
  */
-package com.lambdaworks.redis.pubsub.api.reactive;
+package io.lettuce.core.pubsub.api.reactive;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java b/src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java
similarity index 88%
rename from src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java
rename to src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java
index 55ddaf7d56..bfe016db6b 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/RedisPubSubCommands.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub.api.sync;
+package io.lettuce.core.pubsub.api.sync;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 
 /**
  * Synchronous and thread-safe Redis PubSub API.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -30,28 +30,28 @@ public interface RedisPubSubCommands<K, V> extends RedisCommands<K, V> {
 
     /**
      * Listen for messages published to channels matching the given patterns.
-     * 
+     *
      * @param patterns the patterns
      */
     void psubscribe(K... patterns);
 
     /**
      * Stop listening for messages posted to channels matching the given patterns.
-     * 
+     *
      * @param patterns the patterns
      */
     void punsubscribe(K... patterns);
 
     /**
      * Listen for messages published to the given channels.
-     * 
+     *
      * @param channels the channels
      */
     void subscribe(K... channels);
 
     /**
      * Stop listening for messages posted to the given channels.
-     * 
+     *
      * @param channels the channels
      */
     void unsubscribe(K... channels);
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/package-info.java b/src/main/java/io/lettuce/core/pubsub/api/sync/package-info.java
similarity index 57%
rename from src/main/java/com/lambdaworks/redis/pubsub/api/sync/package-info.java
rename to src/main/java/io/lettuce/core/pubsub/api/sync/package-info.java
index 3def5e254a..a6ecbb76ab 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/api/sync/package-info.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/sync/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Pub/Sub Redis API for synchronous executed commands.
  */
-package com.lambdaworks.redis.pubsub.api.sync;
+package io.lettuce.core.pubsub.api.sync;
diff --git a/src/main/java/com/lambdaworks/redis/pubsub/package-info.java b/src/main/java/io/lettuce/core/pubsub/package-info.java
similarity index 50%
rename from src/main/java/com/lambdaworks/redis/pubsub/package-info.java
rename to src/main/java/io/lettuce/core/pubsub/package-info.java
index b698510a89..2e0e22ad16 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/package-info.java
+++ b/src/main/java/io/lettuce/core/pubsub/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Pub/Sub connection classes.
  */
-package com.lambdaworks.redis.pubsub;
+package io.lettuce.core.pubsub;
diff --git a/src/main/java/com/lambdaworks/redis/resource/ClientResources.java b/src/main/java/io/lettuce/core/resource/ClientResources.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/resource/ClientResources.java
rename to src/main/java/io/lettuce/core/resource/ClientResources.java
index aabc766513..cda60a8b5c 100644
--- a/src/main/java/com/lambdaworks/redis/resource/ClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/ClientResources.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.event.EventBus;
-import com.lambdaworks.redis.event.EventPublisherOptions;
-import com.lambdaworks.redis.metrics.CommandLatencyCollector;
+import io.lettuce.core.event.EventBus;
+import io.lettuce.core.event.EventPublisherOptions;
+import io.lettuce.core.metrics.CommandLatencyCollector;
 
 import io.netty.util.Timer;
 import io.netty.util.concurrent.EventExecutorGroup;
@@ -82,7 +82,7 @@ public interface ClientResources {
 
     /**
      * Returns the computation pool used for internal operations. Such tasks are periodic Redis Cluster and Redis Sentinel
-     * topology updates and scheduling of connection reconnection by {@link com.lambdaworks.redis.protocol.ConnectionWatchdog}.
+     * topology updates and scheduling of connection reconnection by {@link io.lettuce.core.protocol.ConnectionWatchdog}.
      *
      * @return the computation pool used for internal operations
      */
diff --git a/src/main/java/com/lambdaworks/redis/resource/ConstantDelay.java b/src/main/java/io/lettuce/core/resource/ConstantDelay.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/resource/ConstantDelay.java
rename to src/main/java/io/lettuce/core/resource/ConstantDelay.java
index 4776e2050a..313eb3764a 100644
--- a/src/main/java/com/lambdaworks/redis/resource/ConstantDelay.java
+++ b/src/main/java/io/lettuce/core/resource/ConstantDelay.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import java.util.concurrent.TimeUnit;
 
 /**
  * {@link Delay} with a constant delay for each attempt.
- * 
+ *
  * @author Mark Paluch
  */
 class ConstantDelay extends Delay {
diff --git a/src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java b/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java
rename to src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java
index 5e0b072fb0..d5d0d92756 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelay.java
+++ b/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.resource.Delay.StatefulDelay;
+import io.lettuce.core.resource.Delay.StatefulDelay;
 
 /**
  * Stateful delay that increases using decorrelated jitter strategy.
@@ -29,7 +29,7 @@
  * This strategy is based on <a href="https://www.awsarchitectureblog.com/2015/03/backoff.html">Exponential Backoff and
  * Jitter</a>.
  * </p>
- * 
+ *
  * @author Jongyeol Choi
  * @since 4.2
  * @see StatefulDelay
diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
rename to src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index 2dcb9a3d62..611881c37a 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -13,26 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
-import static com.lambdaworks.redis.resource.Futures.toBooleanPromise;
+import static io.lettuce.core.resource.Futures.toBooleanPromise;
 
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.event.DefaultEventBus;
-import com.lambdaworks.redis.event.DefaultEventPublisherOptions;
-import com.lambdaworks.redis.event.EventBus;
-import com.lambdaworks.redis.event.EventPublisherOptions;
-import com.lambdaworks.redis.event.metrics.DefaultCommandLatencyEventPublisher;
-import com.lambdaworks.redis.event.metrics.MetricEventPublisher;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.internal.LettuceLists;
-import com.lambdaworks.redis.metrics.CommandLatencyCollector;
-import com.lambdaworks.redis.metrics.CommandLatencyCollectorOptions;
-import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollector;
-import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollectorOptions;
-import com.lambdaworks.redis.resource.Delay.StatefulDelay;
+import io.lettuce.core.event.DefaultEventBus;
+import io.lettuce.core.event.DefaultEventPublisherOptions;
+import io.lettuce.core.event.EventBus;
+import io.lettuce.core.event.EventPublisherOptions;
+import io.lettuce.core.event.metrics.DefaultCommandLatencyEventPublisher;
+import io.lettuce.core.event.metrics.MetricEventPublisher;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceLists;
+import io.lettuce.core.metrics.CommandLatencyCollector;
+import io.lettuce.core.metrics.CommandLatencyCollectorOptions;
+import io.lettuce.core.metrics.DefaultCommandLatencyCollector;
+import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
+import io.lettuce.core.resource.Delay.StatefulDelay;
 
 import io.netty.util.HashedWheelTimer;
 import io.netty.util.Timer;
@@ -58,7 +58,7 @@
  * {@code computationThreadPoolSize}.</li>
  * <li>an {@code eventBus} which is a provided instance of {@link EventBus}.</li>
  * <li>a {@code commandLatencyCollector} which is a provided instance of
- * {@link com.lambdaworks.redis.metrics.CommandLatencyCollector}.</li>
+ * {@link io.lettuce.core.metrics.CommandLatencyCollector}.</li>
  * <li>a {@code dnsResolver} which is a provided instance of {@link DnsResolver}.</li>
  * <li>a {@code timer} that is a provided instance of {@link io.netty.util.HashedWheelTimer}.</li>
  * </ul>
@@ -264,7 +264,7 @@ public Builder ioThreadPoolSize(int ioThreadPoolSize) {
 
         /**
          * Sets a shared {@link EventLoopGroupProvider event executor provider} that can be used across different instances of
-         * {@link com.lambdaworks.redis.RedisClient} and {@link com.lambdaworks.redis.cluster.RedisClusterClient}. The provided
+         * {@link io.lettuce.core.RedisClient} and {@link io.lettuce.core.cluster.RedisClusterClient}. The provided
          * {@link EventLoopGroupProvider} instance will not be shut down when shutting down the client resources. You have to
          * take care of that. This is an advanced configuration that should only be used if you know what you are doing.
          *
@@ -296,7 +296,7 @@ public Builder computationThreadPoolSize(int computationThreadPoolSize) {
 
         /**
          * Sets a shared {@link EventExecutorGroup event executor group} that can be used across different instances of
-         * {@link com.lambdaworks.redis.RedisClient} and {@link com.lambdaworks.redis.cluster.RedisClusterClient}. The provided
+         * {@link io.lettuce.core.RedisClient} and {@link io.lettuce.core.cluster.RedisClusterClient}. The provided
          * {@link EventExecutorGroup} instance will not be shut down when shutting down the client resources. You have to take
          * care of that. This is an advanced configuration that should only be used if you know what you are doing.
          *
@@ -312,8 +312,8 @@ public Builder eventExecutorGroup(EventExecutorGroup eventExecutorGroup) {
         }
 
         /**
-         * Sets a shared {@link Timer} that can be used across different instances of {@link com.lambdaworks.redis.RedisClient}
-         * and {@link com.lambdaworks.redis.cluster.RedisClusterClient} The provided {@link Timer} instance will not be shut
+         * Sets a shared {@link Timer} that can be used across different instances of {@link io.lettuce.core.RedisClient}
+         * and {@link io.lettuce.core.cluster.RedisClusterClient} The provided {@link Timer} instance will not be shut
          * down when shutting down the client resources. You have to take care of that. This is an advanced configuration that
          * should only be used if you know what you are doing.
          *
diff --git a/src/main/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProvider.java
rename to src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
index 5cac9a7172..abb5f38dd3 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProvider.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
-import static com.lambdaworks.redis.resource.Futures.toBooleanPromise;
+import static io.lettuce.core.resource.Futures.toBooleanPromise;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -23,7 +23,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.EpollProvider;
+import io.lettuce.core.EpollProvider;
 
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -33,7 +33,7 @@
 
 /**
  * Default implementation which manages one event loop group instance per type.
- * 
+ *
  * @author Mark Paluch
  * @since 3.4
  */
@@ -50,7 +50,7 @@ public class DefaultEventLoopGroupProvider implements EventLoopGroupProvider {
 
     /**
      * Creates a new instance of {@link DefaultEventLoopGroupProvider}.
-     * 
+     *
      * @param numberOfThreads number of threads (pool size)
      */
     public DefaultEventLoopGroupProvider(int numberOfThreads) {
@@ -124,7 +124,7 @@ private <T extends EventLoopGroup> T getOrCreate(Class<T> type) {
      * <li>NioEventLoopGroup</li>
      * <li>EpollEventLoopGroup</li>
      * </ul>
-     * 
+     *
      * @param type the type
      * @param numberOfThreads the number of threads to use for the {@link EventExecutorGroup}
      * @param <T> type parameter
diff --git a/src/main/java/com/lambdaworks/redis/resource/Delay.java b/src/main/java/io/lettuce/core/resource/Delay.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/resource/Delay.java
rename to src/main/java/io/lettuce/core/resource/Delay.java
index d1c8ca4773..e06fbe4cbe 100644
--- a/src/main/java/com/lambdaworks/redis/resource/Delay.java
+++ b/src/main/java/io/lettuce/core/resource/Delay.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Base class for delays and factory class to create particular instances. {@link Delay} can be subclassed to create custom
@@ -28,7 +28,7 @@
  * Delays are usually stateless instances that can be shared amongst multiple users (such as connections). Stateful
  * {@link Delay} implementations must implement {@link StatefulDelay} to reset their internal state after the delay is not
  * required anymore.
- * 
+ *
  * @author Mark Paluch
  * @author Jongyeol Choi
  * @since 4.2
@@ -45,9 +45,9 @@ public abstract class Delay {
      * Interface to be implemented by stateful {@link Delay}s. Stateful delays can get reset once a condition (such as
      * successful reconnect) is met. Stateful delays should not be shared by multiple connections but each connection should use
      * its own instance.
-     * 
+     *
      * @see Supplier
-     * @see com.lambdaworks.redis.resource.DefaultClientResources.Builder#reconnectDelay(Supplier)
+     * @see io.lettuce.core.resource.DefaultClientResources.Builder#reconnectDelay(Supplier)
      */
     public interface StatefulDelay {
 
@@ -76,7 +76,7 @@ protected Delay(TimeUnit timeUnit) {
 
     /**
      * Returns the {@link TimeUnit} associated with this {@link Delay}.
-     * 
+     *
      * @return the {@link TimeUnit} associated with this {@link Delay}.
      */
     public TimeUnit getTimeUnit() {
@@ -222,7 +222,7 @@ public static Supplier<Delay> decorrelatedJitter(long lower, long upper, long ba
 
     /**
      * Generates a random long value within {@code min} and {@code max} boundaries.
-     * 
+     *
      * @param min
      * @param max
      * @return a random value
diff --git a/src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java b/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java
rename to src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java
index 64cf2d2bea..1a56dddc94 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DirContextDnsResolver.java
+++ b/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -33,8 +33,8 @@
 import javax.naming.directory.Attributes;
 import javax.naming.directory.InitialDirContext;
 
-import com.lambdaworks.redis.LettuceStrings;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.LettuceStrings;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * DNS Resolver based on Java's {@link com.sun.jndi.dns.DnsContextFactory}. This resolver resolves hostnames to IPv4 and IPv6
@@ -78,7 +78,7 @@ public DirContextDnsResolver() {
 
     /**
      * Creates a new {@link DirContextDnsResolver} using a collection of DNS servers.
-     * 
+     *
      * @param dnsServer must not be {@literal null} and not empty.
      */
     public DirContextDnsResolver(String dnsServer) {
@@ -96,7 +96,7 @@ public DirContextDnsResolver(Iterable<String> dnsServers) {
 
     /**
      * Creates a new {@link DirContextDnsResolver} for the given stack preference and {@code properties}.
-     * 
+     *
      * @param preferIpv4 flag to prefer IPv4 over IPv6 address resolution.
      * @param preferIpv6 flag to prefer IPv6 over IPv4 address resolution.
      * @param properties custom properties for creating the context, must not be {@literal null}.
@@ -150,7 +150,7 @@ public void close() throws IOException {
 
     /**
      * Perform hostname to address resolution.
-     * 
+     *
      * @param host the hostname, must not be empty or {@literal null}.
      * @return array of one or more {@link InetAddress adresses}
      * @throws UnknownHostException
@@ -178,7 +178,7 @@ public InetAddress[] resolve(String host) throws UnknownHostException {
 
     /**
      * Resolve a hostname
-     * 
+     *
      * @param hostname
      * @param inetAddresses
      * @throws NamingException
@@ -203,7 +203,7 @@ private void resolve(String hostname, List<InetAddress> inetAddresses) throws Na
 
     /**
      * Resolves {@code CNAME} records to {@link InetAddress adresses}.
-     * 
+     *
      * @param hostname
      * @return
      * @throws NamingException
@@ -242,7 +242,7 @@ private List<InetAddress> resolveCname(String hostname) throws NamingException {
 
     /**
      * Resolve an attribute for a hostname.
-     * 
+     *
      * @param hostname
      * @param attrName
      * @return
diff --git a/src/main/java/com/lambdaworks/redis/resource/DnsResolver.java b/src/main/java/io/lettuce/core/resource/DnsResolver.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/resource/DnsResolver.java
rename to src/main/java/io/lettuce/core/resource/DnsResolver.java
index a2079215a9..790779131e 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DnsResolver.java
+++ b/src/main/java/io/lettuce/core/resource/DnsResolver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/src/main/java/com/lambdaworks/redis/resource/DnsResolvers.java b/src/main/java/io/lettuce/core/resource/DnsResolvers.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/resource/DnsResolvers.java
rename to src/main/java/io/lettuce/core/resource/DnsResolvers.java
index 72ebee256d..53ecde04b8 100644
--- a/src/main/java/com/lambdaworks/redis/resource/DnsResolvers.java
+++ b/src/main/java/io/lettuce/core/resource/DnsResolvers.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java b/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java
rename to src/main/java/io/lettuce/core/resource/EqualJitterDelay.java
index 954dbe581e..bd266f9bd8 100644
--- a/src/main/java/com/lambdaworks/redis/resource/EqualJitterDelay.java
+++ b/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/main/java/com/lambdaworks/redis/resource/EventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/resource/EventLoopGroupProvider.java
rename to src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java
index 5f7cf33fba..14109b3d15 100644
--- a/src/main/java/com/lambdaworks/redis/resource/EventLoopGroupProvider.java
+++ b/src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import java.util.concurrent.TimeUnit;
 
@@ -27,7 +27,7 @@
  * instances open can exhaust the number of open files.
  * <p>
  * Usually, the default settings are sufficient. However, customizing might be useful for some special cases where multiple
- * {@link com.lambdaworks.redis.RedisClient} or {@link com.lambdaworks.redis.cluster.RedisClusterClient} instances are needed
+ * {@link io.lettuce.core.RedisClient} or {@link io.lettuce.core.cluster.RedisClusterClient} instances are needed
  * that share one or more event loop groups.
  * </p>
  * <p>
@@ -37,7 +37,7 @@
  * </p>
  * You can implement your own {@link EventLoopGroupProvider} to share existing {@link EventLoopGroup EventLoopGroup's} with
  * lettuce.
- * 
+ *
  * @author Mark Paluch
  * @since 3.4
  */
@@ -65,7 +65,7 @@ public interface EventLoopGroupProvider {
     /**
      * Release a {@code eventLoopGroup} instance. The method will shutdown/terminate the {@link EventExecutorGroup} if it is no longer
      * needed.
-     * 
+     *
      * @param eventLoopGroup the eventLoopGroup instance, must not be {@literal null}
      * @param quietPeriod the quiet period
      * @param timeout the timeout
diff --git a/src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java b/src/main/java/io/lettuce/core/resource/ExponentialDelay.java
similarity index 98%
rename from src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java
rename to src/main/java/io/lettuce/core/resource/ExponentialDelay.java
index 445588ed79..787305ac99 100644
--- a/src/main/java/com/lambdaworks/redis/resource/ExponentialDelay.java
+++ b/src/main/java/io/lettuce/core/resource/ExponentialDelay.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import java.util.concurrent.TimeUnit;
 
@@ -66,7 +66,7 @@ public long createDelay(long attempt) {
 
     /**
      * Apply bounds to the given {@code delay}.
-     * 
+     *
      * @param delay the delay
      * @return the delay normalized to its lower and upper bounds.
      */
diff --git a/src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java b/src/main/java/io/lettuce/core/resource/FullJitterDelay.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java
rename to src/main/java/io/lettuce/core/resource/FullJitterDelay.java
index 428fdcc662..937eb95301 100644
--- a/src/main/java/com/lambdaworks/redis/resource/FullJitterDelay.java
+++ b/src/main/java/io/lettuce/core/resource/FullJitterDelay.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/main/java/com/lambdaworks/redis/resource/Futures.java b/src/main/java/io/lettuce/core/resource/Futures.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/resource/Futures.java
rename to src/main/java/io/lettuce/core/resource/Futures.java
index c9df5ab771..3a04196478 100644
--- a/src/main/java/com/lambdaworks/redis/resource/Futures.java
+++ b/src/main/java/io/lettuce/core/resource/Futures.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 import io.netty.util.concurrent.*;
 
 /**
  * Utility class to support netty's future handling.
- * 
+ *
  * @author Mark Paluch
  * @since 3.4
  */
@@ -32,7 +32,7 @@ class Futures {
 
     /**
      * Create a promise that emits a {@code Boolean} value on completion of the {@code future}
-     * 
+     *
      * @param future the future.
      * @return Promise emitting a {@code Boolean} value. {@literal true} if the {@code future} completed successfully, otherwise
      *         the cause wil be transported.
@@ -57,15 +57,15 @@ public void operationComplete(Future<Object> future) throws Exception {
     /**
      * Promise aggregator that aggregates multiple promises into one {@link Promise}. The aggregator workflow is:
      * <ol>
-     * <li>Create a new instance of {@link com.lambdaworks.redis.resource.Futures.PromiseAggregator}</li>
+     * <li>Create a new instance of {@link io.lettuce.core.resource.Futures.PromiseAggregator}</li>
      * <li>Call {@link #expectMore(int)} until the number of expected futures is reached</li>
      * <li>Arm the aggregator using {@link #arm()}</li>
      * <li>Add the number of futures using {@link #add(Promise[])} until the expectation is met. The added futures can be either
      * done or in progress.</li>
      * <li>The {@code aggregatePromise} is released/finished as soon as the last future/promise completes</li>
-     * 
+     *
      * </ol>
-     * 
+     *
      * @param <V> Result value type
      * @param <F> Future type
      */
@@ -89,7 +89,7 @@ public PromiseAggregator(Promise<V> aggregatePromise) {
 
         /**
          * Add the number of {@code count} to the count of expected promises.
-         * 
+         *
          * @param count number of futures/promises, that is added to the overall expectation count.
          * @throws IllegalStateException if the aggregator was armed
          */
@@ -101,7 +101,7 @@ public void expectMore(int count) {
 
         /**
          * Arm the aggregator to expect completion of the futures.
-         * 
+         *
          * @throws IllegalStateException if the aggregator was armed
          */
         public void arm() {
@@ -111,7 +111,7 @@ public void arm() {
 
         /**
          * Add the given {@link Promise}s to the aggregator.
-         * 
+         *
          * @param promises the promises
          * @throws IllegalStateException if the aggregator was not armed
          */
diff --git a/src/main/java/com/lambdaworks/redis/resource/SocketAddressResolver.java b/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
similarity index 86%
rename from src/main/java/com/lambdaworks/redis/resource/SocketAddressResolver.java
rename to src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
index fb8deb8b21..9afc4a0020 100644
--- a/src/main/java/com/lambdaworks/redis/resource/SocketAddressResolver.java
+++ b/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
@@ -13,24 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.net.UnknownHostException;
 
-import com.lambdaworks.redis.RedisURI;
+import io.lettuce.core.RedisURI;
 
 /**
- * Resolves a {@link com.lambdaworks.redis.RedisURI} to a {@link java.net.SocketAddress}.
+ * Resolves a {@link io.lettuce.core.RedisURI} to a {@link java.net.SocketAddress}.
  *
  * @author Mark Paluch
  */
 public class SocketAddressResolver {
 
     /**
-     * Resolves a {@link com.lambdaworks.redis.RedisURI} to a {@link java.net.SocketAddress}.
+     * Resolves a {@link io.lettuce.core.RedisURI} to a {@link java.net.SocketAddress}.
      *
      * @param redisURI must not be {@literal null}
      * @param dnsResolver must not be {@literal null}
diff --git a/src/main/java/com/lambdaworks/redis/resource/package-info.java b/src/main/java/io/lettuce/core/resource/package-info.java
similarity index 56%
rename from src/main/java/com/lambdaworks/redis/resource/package-info.java
rename to src/main/java/io/lettuce/core/resource/package-info.java
index 6fdd5e515f..b4c223bf4e 100644
--- a/src/main/java/com/lambdaworks/redis/resource/package-info.java
+++ b/src/main/java/io/lettuce/core/resource/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Client resource infrastructure providers.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
rename to src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
index 02ee4ca0bf..31b6cba72c 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.sentinel;
+package io.lettuce.core.sentinel;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -22,16 +22,16 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.atomic.AtomicReference;
 
-import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.AsyncCommand;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.RedisCommand;
-import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
-import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
 
 /**
  * An asynchronous and thread-safe API for a Redis Sentinel connection.
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
rename to src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
index a963fa70cf..9cb3277942 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/RedisSentinelReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.sentinel;
+package io.lettuce.core.sentinel;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -22,13 +22,13 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import com.lambdaworks.redis.AbstractRedisReactiveCommands;
-import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
-import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands;
+import io.lettuce.core.AbstractRedisReactiveCommands;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands;
 
 /**
  * A reactive and thread-safe API for a Redis Sentinel connection.
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/SentinelCommandBuilder.java b/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/sentinel/SentinelCommandBuilder.java
rename to src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java
index 7381d7b334..0fabef1042 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/SentinelCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.sentinel;
+package io.lettuce.core.sentinel;
 
-import static com.lambdaworks.redis.protocol.CommandKeyword.*;
-import static com.lambdaworks.redis.protocol.CommandType.*;
+import static io.lettuce.core.protocol.CommandKeyword.*;
+import static io.lettuce.core.protocol.CommandType.*;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.output.*;
-import com.lambdaworks.redis.protocol.BaseRedisCommandBuilder;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandKeyword;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.output.*;
+import io.lettuce.core.protocol.BaseRedisCommandBuilder;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandKeyword;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
similarity index 81%
rename from src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
rename to src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
index 2d29e2bd87..2177791150 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/StatefulRedisSentinelConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.sentinel;
+package io.lettuce.core.sentinel;
 
 import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.RedisChannelHandler;
-import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.*;
-import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
-import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
-import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands;
-import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
+import io.lettuce.core.RedisChannelHandler;
+import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.*;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
+import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands;
+import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/StatefulRedisSentinelConnection.java b/src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java
similarity index 82%
rename from src/main/java/com/lambdaworks/redis/sentinel/api/StatefulRedisSentinelConnection.java
rename to src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java
index e559f47483..e5640bb473 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/StatefulRedisSentinelConnection.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.sentinel.api;
+package io.lettuce.core.sentinel.api;
 
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.protocol.ConnectionWatchdog;
-import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
-import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands;
-import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.protocol.ConnectionWatchdog;
+import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
+import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands;
+import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
 
 /**
  * A thread-safe connection to a redis server. Multiple threads may share one {@link StatefulRedisSentinelConnection}.
- * 
+ *
  * A {@link ConnectionWatchdog} monitors each connection and reconnects automatically until {@link #close} is called. All
  * pending commands will be (re)sent after successful reconnection.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -36,14 +36,14 @@ public interface StatefulRedisSentinelConnection<K, V> extends StatefulConnectio
 
     /**
      * Returns the {@link RedisSentinelCommands} API for the current connection. Does not create a new connection.
-     * 
+     *
      * @return the synchronous API for the underlying connection.
      */
     RedisSentinelCommands<K, V> sync();
 
     /**
      * Returns the {@link RedisSentinelAsyncCommands} API for the current connection. Does not create a new connection.
-     * 
+     *
      * @return the asynchronous API for the underlying connection.
      */
     RedisSentinelAsyncCommands<K, V> async();
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java b/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java
rename to src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
index 6ce644bbd9..f05767df25 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/async/RedisSentinelAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
@@ -13,29 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.sentinel.api.async;
+package io.lettuce.core.sentinel.api.async;
 
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
-import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
-import com.lambdaworks.redis.RedisFuture;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.RedisFuture;
 
 /**
  * Asynchronous executed commands for Redis Sentinel.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
+ * @generated by io.lettuce.apigenerator.CreateAsyncApi
  */
 public interface RedisSentinelAsyncCommands<K, V> {
 
     /**
      * Return the ip and port number of the master with that name.
-     * 
+     *
      * @param key the key
      * @return SocketAddress;
      */
@@ -43,14 +43,14 @@ public interface RedisSentinelAsyncCommands<K, V> {
 
     /**
      * Enumerates all the monitored masters and their states.
-     * 
+     *
      * @return Map&lt;K, V&gt;&gt;
      */
     RedisFuture<List<Map<K, V>>> masters();
 
     /**
      * Show the state and info of the specified master.
-     * 
+     *
      * @param key the key
      * @return Map&lt;K, V&gt;
      */
@@ -58,7 +58,7 @@ public interface RedisSentinelAsyncCommands<K, V> {
 
     /**
      * Provides a list of slaves for the master with the specified name.
-     * 
+     *
      * @param key the key
      * @return List&lt;Map&lt;K, V&gt;&gt;
      */
@@ -66,7 +66,7 @@ public interface RedisSentinelAsyncCommands<K, V> {
 
     /**
      * This command will reset all the masters with matching name.
-     * 
+     *
      * @param key the key
      * @return Long
      */
@@ -74,7 +74,7 @@ public interface RedisSentinelAsyncCommands<K, V> {
 
     /**
      * Perform a failover.
-     * 
+     *
      * @param key the master id
      * @return String
      */
@@ -82,7 +82,7 @@ public interface RedisSentinelAsyncCommands<K, V> {
 
     /**
      * This command tells the Sentinel to start monitoring a new master with the specified name, ip, port, and quorum.
-     * 
+     *
      * @param key the key
      * @param ip the IP address
      * @param port the port
@@ -93,18 +93,18 @@ public interface RedisSentinelAsyncCommands<K, V> {
 
     /**
      * Multiple option / value pairs can be specified (or none at all).
-     * 
+     *
      * @param key the key
      * @param option the option
      * @param value the value
-     * 
+     *
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     RedisFuture<String> set(K key, String option, V value);
 
     /**
      * remove the specified master.
-     * 
+     *
      * @param key the key
      * @return String
      */
@@ -174,7 +174,7 @@ public interface RedisSentinelAsyncCommands<K, V> {
 
     /**
      * Ping the server.
-     * 
+     *
      * @return String simple-string-reply
      */
     RedisFuture<String> ping();
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/async/package-info.java b/src/main/java/io/lettuce/core/sentinel/api/async/package-info.java
similarity index 56%
rename from src/main/java/com/lambdaworks/redis/sentinel/api/async/package-info.java
rename to src/main/java/io/lettuce/core/sentinel/api/async/package-info.java
index b58008bef1..9e8e976232 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/async/package-info.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/async/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Sentinel API for asynchronous executed commands.
  */
-package com.lambdaworks.redis.sentinel.api.async;
+package io.lettuce.core.sentinel.api.async;
diff --git a/src/main/java/io/lettuce/core/sentinel/api/package-info.java b/src/main/java/io/lettuce/core/sentinel/api/package-info.java
new file mode 100644
index 0000000000..9ff01b61e5
--- /dev/null
+++ b/src/main/java/io/lettuce/core/sentinel/api/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Redis Sentinel connection API.
+ */
+package io.lettuce.core.sentinel.api;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java b/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java
rename to src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
index d784f09935..1b0c55df10 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/RedisSentinelReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
@@ -13,30 +13,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.sentinel.api.reactive;
+package io.lettuce.core.sentinel.api.reactive;
 
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
-import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
  * Reactive executed commands for Redis Sentinel.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
+ * @generated by io.lettuce.apigenerator.CreateReactiveApi
  */
 public interface RedisSentinelReactiveCommands<K, V> {
 
     /**
      * Return the ip and port number of the master with that name.
-     * 
+     *
      * @param key the key
      * @return SocketAddress;
      */
@@ -44,14 +44,14 @@ public interface RedisSentinelReactiveCommands<K, V> {
 
     /**
      * Enumerates all the monitored masters and their states.
-     * 
+     *
      * @return Map&lt;K, V&gt;&gt;
      */
     Flux<Map<K, V>> masters();
 
     /**
      * Show the state and info of the specified master.
-     * 
+     *
      * @param key the key
      * @return Map&lt;K, V&gt;
      */
@@ -59,7 +59,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
 
     /**
      * Provides a list of slaves for the master with the specified name.
-     * 
+     *
      * @param key the key
      * @return Map&lt;K, V&gt;
      */
@@ -67,7 +67,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
 
     /**
      * This command will reset all the masters with matching name.
-     * 
+     *
      * @param key the key
      * @return Long
      */
@@ -75,7 +75,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
 
     /**
      * Perform a failover.
-     * 
+     *
      * @param key the master id
      * @return String
      */
@@ -83,7 +83,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
 
     /**
      * This command tells the Sentinel to start monitoring a new master with the specified name, ip, port, and quorum.
-     * 
+     *
      * @param key the key
      * @param ip the IP address
      * @param port the port
@@ -94,18 +94,18 @@ public interface RedisSentinelReactiveCommands<K, V> {
 
     /**
      * Multiple option / value pairs can be specified (or none at all).
-     * 
+     *
      * @param key the key
      * @param option the option
      * @param value the value
-     * 
+     *
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     Mono<String> set(K key, String option, V value);
 
     /**
      * remove the specified master.
-     * 
+     *
      * @param key the key
      * @return String
      */
@@ -175,7 +175,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
 
     /**
      * Ping the server.
-     * 
+     *
      * @return String simple-string-reply
      */
     Mono<String> ping();
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/package-info.java b/src/main/java/io/lettuce/core/sentinel/api/reactive/package-info.java
similarity index 58%
rename from src/main/java/com/lambdaworks/redis/sentinel/api/reactive/package-info.java
rename to src/main/java/io/lettuce/core/sentinel/api/reactive/package-info.java
index 09c4f53bb4..b83bef6914 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/reactive/package-info.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Sentinel API for commands executed in a reactive manner.
  */
-package com.lambdaworks.redis.sentinel.api.reactive;
+package io.lettuce.core.sentinel.api.reactive;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java b/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java
rename to src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
index 52b5e76cea..5d392a7239 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/RedisSentinelCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
@@ -13,28 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.sentinel.api.sync;
+package io.lettuce.core.sentinel.api.sync;
 
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
-import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 
 /**
  * Synchronous executed commands for Redis Sentinel.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncApi
+ * @generated by io.lettuce.apigenerator.CreateSyncApi
  */
 public interface RedisSentinelCommands<K, V> {
 
     /**
      * Return the ip and port number of the master with that name.
-     * 
+     *
      * @param key the key
      * @return SocketAddress;
      */
@@ -42,14 +42,14 @@ public interface RedisSentinelCommands<K, V> {
 
     /**
      * Enumerates all the monitored masters and their states.
-     * 
+     *
      * @return Map&lt;K, V&gt;&gt;
      */
     List<Map<K, V>> masters();
 
     /**
      * Show the state and info of the specified master.
-     * 
+     *
      * @param key the key
      * @return Map&lt;K, V&gt;
      */
@@ -57,7 +57,7 @@ public interface RedisSentinelCommands<K, V> {
 
     /**
      * Provides a list of slaves for the master with the specified name.
-     * 
+     *
      * @param key the key
      * @return List&lt;Map&lt;K, V&gt;&gt;
      */
@@ -65,7 +65,7 @@ public interface RedisSentinelCommands<K, V> {
 
     /**
      * This command will reset all the masters with matching name.
-     * 
+     *
      * @param key the key
      * @return Long
      */
@@ -73,7 +73,7 @@ public interface RedisSentinelCommands<K, V> {
 
     /**
      * Perform a failover.
-     * 
+     *
      * @param key the master id
      * @return String
      */
@@ -81,7 +81,7 @@ public interface RedisSentinelCommands<K, V> {
 
     /**
      * This command tells the Sentinel to start monitoring a new master with the specified name, ip, port, and quorum.
-     * 
+     *
      * @param key the key
      * @param ip the IP address
      * @param port the port
@@ -92,18 +92,18 @@ public interface RedisSentinelCommands<K, V> {
 
     /**
      * Multiple option / value pairs can be specified (or none at all).
-     * 
+     *
      * @param key the key
      * @param option the option
      * @param value the value
-     * 
+     *
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     String set(K key, String option, V value);
 
     /**
      * remove the specified master.
-     * 
+     *
      * @param key the key
      * @return String
      */
@@ -173,7 +173,7 @@ public interface RedisSentinelCommands<K, V> {
 
     /**
      * Ping the server.
-     * 
+     *
      * @return String simple-string-reply
      */
     String ping();
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/package-info.java b/src/main/java/io/lettuce/core/sentinel/api/sync/package-info.java
similarity index 57%
rename from src/main/java/com/lambdaworks/redis/sentinel/api/sync/package-info.java
rename to src/main/java/io/lettuce/core/sentinel/api/sync/package-info.java
index cba7adbd66..f9c00bcc69 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/api/sync/package-info.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/sync/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Sentinel API for synchronous executed commands.
  */
-package com.lambdaworks.redis.sentinel.api.sync;
+package io.lettuce.core.sentinel.api.sync;
diff --git a/src/main/java/com/lambdaworks/redis/sentinel/package-info.java b/src/main/java/io/lettuce/core/sentinel/package-info.java
similarity index 53%
rename from src/main/java/com/lambdaworks/redis/sentinel/package-info.java
rename to src/main/java/io/lettuce/core/sentinel/package-info.java
index 223b2531d3..5b5ab61d61 100644
--- a/src/main/java/com/lambdaworks/redis/sentinel/package-info.java
+++ b/src/main/java/io/lettuce/core/sentinel/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Redis Sentinel connection classes.
  */
-package com.lambdaworks.redis.sentinel;
+package io.lettuce.core.sentinel;
diff --git a/src/main/java/com/lambdaworks/redis/support/AbstractCdiBean.java b/src/main/java/io/lettuce/core/support/AbstractCdiBean.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/support/AbstractCdiBean.java
rename to src/main/java/io/lettuce/core/support/AbstractCdiBean.java
index 8655992a3c..a54e406bdd 100644
--- a/src/main/java/com/lambdaworks/redis/support/AbstractCdiBean.java
+++ b/src/main/java/io/lettuce/core/support/AbstractCdiBean.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
@@ -27,8 +27,8 @@
 import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.InjectionPoint;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * @author Mark Paluch
diff --git a/src/main/java/com/lambdaworks/redis/support/ClientResourcesFactoryBean.java b/src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/support/ClientResourcesFactoryBean.java
rename to src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java
index 9a7a9aade9..1e6d27ec1f 100644
--- a/src/main/java/com/lambdaworks/redis/support/ClientResourcesFactoryBean.java
+++ b/src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 
-import com.lambdaworks.redis.resource.ClientResources;
-import com.lambdaworks.redis.resource.DefaultClientResources;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.DefaultClientResources;
 
 /**
  * {@link FactoryBean} that creates a {@link ClientResources} instance representing the infrastructure resources (thread pools)
  * for a Redis Client.
- * 
+ *
  * @author Mark Paluch
  */
 public class ClientResourcesFactoryBean extends AbstractFactoryBean<ClientResources> {
diff --git a/src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java
rename to src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
index 1a9b880aff..69c470d158 100644
--- a/src/main/java/com/lambdaworks/redis/support/ConnectionPoolSupport.java
+++ b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -31,11 +31,11 @@
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.apache.commons.pool2.impl.SoftReferenceObjectPool;
 
-import com.lambdaworks.redis.ClientOptions;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.internal.AbstractInvocationHandler;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.internal.AbstractInvocationHandler;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Connection pool support for {@link GenericObjectPool} and {@link SoftReferenceObjectPool}. Connection pool creation requires
@@ -58,18 +58,18 @@
  * the blocking command is resolved.
  *
  * <h2>Example usage</h2>
- * 
+ *
  * <pre>
  * // application initialization
  * RedisClusterClient clusterClient = RedisClusterClient.create(RedisURI.create(host, port));
  * GenericObjectPool&lt;StatefulRedisClusterConnection&lt;String, String&gt;&gt; pool = ConnectionPoolSupport
  *         .createGenericObjectPool(() -&gt; clusterClient.connect(), new GenericObjectPoolConfig());
- * 
+ *
  * // executing work
  * try (StatefulRedisClusterConnection&lt;String, String&gt; connection = pool.borrowObject()) {
  *     // perform some work
  * }
- * 
+ *
  * // terminating
  * pool.close();
  * clusterClient.shutdown();
diff --git a/src/main/java/com/lambdaworks/redis/support/LettuceCdiExtension.java b/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
similarity index 95%
rename from src/main/java/com/lambdaworks/redis/support/LettuceCdiExtension.java
rename to src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
index 8f5fad902d..d49a0fed0f 100644
--- a/src/main/java/com/lambdaworks/redis/support/LettuceCdiExtension.java
+++ b/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
@@ -26,11 +26,11 @@
 import javax.enterprise.inject.Default;
 import javax.enterprise.inject.spi.*;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.internal.LettuceSets;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.internal.LettuceSets;
+import io.lettuce.core.resource.ClientResources;
 
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -53,12 +53,12 @@
  *     public RedisURI redisURI() {
  *         return RedisURI.Builder.redis("localhost", 6379).build();
  *     }
- * 
+ *
  *     &#64;Produces
  *     public ClientResources clientResources() {
  *         return DefaultClientResources.create()
  *     }
- * 
+ *
  *     public void shutdownClientResources(@Disposes ClientResources clientResources) throws Exception {
  *         clientResources.shutdown().get();
  *     }
@@ -72,13 +72,13 @@
  *   public class Consumer {
  *      &#64;Inject
  *      private RedisClient client;
- * 
+ *
  *      &#64;Inject
  *      private RedisClusterClient clusterClient;
  * }
  *  </code>
  * </pre>
- * 
+ *
  * @author Mark Paluch
  */
 public class LettuceCdiExtension implements Extension {
diff --git a/src/main/java/com/lambdaworks/redis/support/LettuceFactoryBeanSupport.java b/src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java
similarity index 92%
rename from src/main/java/com/lambdaworks/redis/support/LettuceFactoryBeanSupport.java
rename to src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java
index 56958af9c9..755cfd9fc6 100644
--- a/src/main/java/com/lambdaworks/redis/support/LettuceFactoryBeanSupport.java
+++ b/src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
 import java.net.URI;
 
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * Adapter for Springs {@link org.springframework.beans.factory.FactoryBean} interface to allow easy setup of
- * {@link com.lambdaworks.redis.RedisClient} factories via Spring configuration.
- * 
+ * {@link io.lettuce.core.RedisClient} factories via Spring configuration.
+ *
  * @author Mark Paluch
  * @since 3.0
  */
@@ -53,7 +53,7 @@ public URI getUri() {
     /**
      * Set the URI for connecting Redis. The URI follows the URI conventions. See {@link RedisURI} for URL schemes. Either the
      * URI of the RedisURI must be set in order to connect to Redis.
-     * 
+     *
      * @param uri the URI
      */
     public void setUri(URI uri) {
@@ -67,7 +67,7 @@ public RedisURI getRedisURI() {
     /**
      * Set the RedisURI for connecting Redis. See {@link RedisURI} for URL schemes. Either the URI of the RedisURI must be set
      * in order to connect to Redis.
-     * 
+     *
      * @param redisURI the RedisURI
      */
     public void setRedisURI(RedisURI redisURI) {
@@ -81,7 +81,7 @@ public String getPassword() {
     /**
      * Sets the password to use for a Redis connection. If the password is set, it has higher precedence than the password
      * provided within the URI meaning the password from the URI is replaced by this one.
-     * 
+     *
      * @param password the password
      */
     public void setPassword(String password) {
@@ -100,7 +100,7 @@ public ClientResources getClientResources() {
     /**
      * Set shared client resources to reuse across different client instances. If not set, each client instance will provide
      * their own {@link ClientResources} instance.
-     * 
+     *
      * @param clientResources the client resources
      */
     public void setClientResources(ClientResources clientResources) {
diff --git a/src/main/java/com/lambdaworks/redis/support/RedisClientCdiBean.java b/src/main/java/io/lettuce/core/support/RedisClientCdiBean.java
similarity index 90%
rename from src/main/java/com/lambdaworks/redis/support/RedisClientCdiBean.java
rename to src/main/java/io/lettuce/core/support/RedisClientCdiBean.java
index dd17c9f6dc..922e7c2def 100644
--- a/src/main/java/com/lambdaworks/redis/support/RedisClientCdiBean.java
+++ b/src/main/java/io/lettuce/core/support/RedisClientCdiBean.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
 import java.lang.annotation.Annotation;
 import java.util.Set;
@@ -22,13 +22,13 @@
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * Factory Bean for {@link RedisClient} instances. Requires a {@link RedisURI} and allows to reuse
- * {@link com.lambdaworks.redis.resource.ClientResources}. URI Formats:
+ * {@link io.lettuce.core.resource.ClientResources}. URI Formats:
  * {@code
  *     redis-sentinel://host[:port][,host2[:port2]][/databaseNumber]#sentinelMasterId
  * }
diff --git a/src/main/java/com/lambdaworks/redis/support/RedisClientFactoryBean.java b/src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java
similarity index 88%
rename from src/main/java/com/lambdaworks/redis/support/RedisClientFactoryBean.java
rename to src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java
index ba97203f6a..46cf7c7787 100644
--- a/src/main/java/com/lambdaworks/redis/support/RedisClientFactoryBean.java
+++ b/src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
-import static com.lambdaworks.redis.LettuceStrings.isNotEmpty;
+import static io.lettuce.core.LettuceStrings.isNotEmpty;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
 
 /**
  * Factory Bean for {@link RedisClient} instances. Needs either a {@link java.net.URI} or a {@link RedisURI} as input and allows
- * to reuse {@link com.lambdaworks.redis.resource.ClientResources}. URI Formats:
+ * to reuse {@link io.lettuce.core.resource.ClientResources}. URI Formats:
  * {@code
  *     redis-sentinel://host[:port][,host2[:port2]][/databaseNumber]#sentinelMasterId
  * }
diff --git a/src/main/java/com/lambdaworks/redis/support/RedisClusterClientCdiBean.java b/src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/support/RedisClusterClientCdiBean.java
rename to src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java
index 56d5c5b493..3b1f53e613 100644
--- a/src/main/java/com/lambdaworks/redis/support/RedisClusterClientCdiBean.java
+++ b/src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
 import java.lang.annotation.Annotation;
 import java.util.Set;
@@ -22,13 +22,13 @@
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * Factory Bean for {@link RedisClusterClient} instances. Requires a {@link RedisURI} and allows to reuse
- * {@link com.lambdaworks.redis.resource.ClientResources}. URI Format: {@code
+ * {@link io.lettuce.core.resource.ClientResources}. URI Format: {@code
  *     redis://[password@]host[:port]
  * }
  *
diff --git a/src/main/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBean.java b/src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java
similarity index 89%
rename from src/main/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBean.java
rename to src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java
index 66a68bd158..bbb198086d 100644
--- a/src/main/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBean.java
+++ b/src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java
@@ -13,26 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
-import static com.lambdaworks.redis.LettuceStrings.isNotEmpty;
+import static io.lettuce.core.LettuceStrings.isNotEmpty;
 
 import java.net.URI;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.RedisClusterURIUtil;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.RedisClusterURIUtil;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Factory Bean for {@link RedisClusterClient} instances. Needs either a {@link URI} or a {@link RedisURI} as input and allows
- * to reuse {@link com.lambdaworks.redis.resource.ClientResources}. URI Format: {@code
+ * to reuse {@link io.lettuce.core.resource.ClientResources}. URI Format: {@code
  *     redis://[password@]host[:port][,host2[:port2]]
  * }
- * 
+ *
  * {@code
  *     rediss://[password@]host[:port][,host2[:port2]]
  * }
diff --git a/src/main/java/io/lettuce/core/support/package-info.java b/src/main/java/io/lettuce/core/support/package-info.java
new file mode 100644
index 0000000000..ad8c9bdedc
--- /dev/null
+++ b/src/main/java/io/lettuce/core/support/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Supportive classes such as {@link io.lettuce.core.support.RedisClientCdiBean} for CDI support, {@link io.lettuce.core.support.RedisClientFactoryBean} for Spring.
+ */
+package io.lettuce.core.support;
+
diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
index aec3a3ec1e..69c4beeaac 100644
--- a/src/main/javadoc/overview.html
+++ b/src/main/javadoc/overview.html
@@ -1,10 +1,10 @@
 <body>
 <a href="http://github.com/mp911de/lettuce">lettuce</a> is a scalable thread-safe Java
-{@link com.lambdaworks.redis.RedisClient RedisClient} providing
-{@link com.lambdaworks.redis.api.sync.RedisCommands synchronous},
-{@link com.lambdaworks.redis.api.async.RedisAsyncCommands asynchronous} and
-{@link com.lambdaworks.redis.api.reactive.RedisReactiveCommands reactive} APIs for Redis Standalone, PubSub,
-Redis Sentinel and {@link com.lambdaworks.redis.cluster.RedisClusterClient Redis Cluster}.
+{@link io.lettuce.core.RedisClient RedisClient} providing
+{@link io.lettuce.core.api.sync.RedisCommands synchronous},
+{@link io.lettuce.core.api.async.RedisAsyncCommands asynchronous} and
+{@link io.lettuce.core.api.reactive.RedisReactiveCommands reactive} APIs for Redis Standalone, PubSub,
+Redis Sentinel and {@link io.lettuce.core.cluster.RedisClusterClient Redis Cluster}.
 
 Multiple threads may share one connection if they avoid blocking and transactional
   operations such as <a href="http://redis.io/commands/blpop">BLPOP</a> and
@@ -16,8 +16,8 @@
     Each redis command is implemented by one or more methods with names identical to the lowercase
     redis command name. Complex commands with multiple modifiers that change the result type include
     the CamelCased modifier as part of the command name, e.g.
-    {@link com.lambdaworks.redis.api.sync.RedisCommands#zrangebyscore zrangebyscore} and
-    {@link com.lambdaworks.redis.api.sync.RedisCommands#zrangebyscoreWithScores zrangebyscoreWithScores}.
+    {@link io.lettuce.core.api.sync.RedisCommands#zrangebyscore zrangebyscore} and
+    {@link io.lettuce.core.api.sync.RedisCommands#zrangebyscoreWithScores zrangebyscoreWithScores}.
   </p>
 
   <p>
@@ -27,10 +27,10 @@
   </p>
 
   <p>
-    All connections inherit a default timeout from their {@link com.lambdaworks.redis.RedisClient}
-    and will throw a {@link com.lambdaworks.redis.RedisException} when non-blocking commands fail
+    All connections inherit a default timeout from their {@link io.lettuce.core.RedisClient}
+    and will throw a {@link io.lettuce.core.RedisException} when non-blocking commands fail
     to return a result before the timeout expires. The timeout defaults to 60 seconds and
-    may be changed via {@link com.lambdaworks.redis.RedisClient#setDefaultTimeout} or for
+    may be changed via {@link io.lettuce.core.RedisClient#setDefaultTimeout} or for
     each individual connection.
   </p>
 </body>
diff --git a/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
index d5f09da89b..b6c82fbdad 100644
--- a/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ b/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -1 +1 @@
-com.lambdaworks.redis.support.LettuceCdiExtension
+io.lettuce.core.support.LettuceCdiExtension
diff --git a/src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java b/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java
similarity index 94%
rename from src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java
rename to src/main/templates/io/lettuce/core/api/BaseRedisCommands.java
index 22671507a7..6a9930bd35 100644
--- a/src/main/templates/com/lambdaworks/redis/api/BaseRedisCommands.java
+++ b/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
-import com.lambdaworks.redis.output.CommandOutput;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.ProtocolKeyword;
+import io.lettuce.core.output.CommandOutput;
 
 /**
- * 
+ *
  * ${intent} for basic commands.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -35,7 +35,7 @@ public interface BaseRedisCommands<K, V>  {
 
     /**
      * Post a message to a channel.
-     * 
+     *
      * @param channel the channel type: key
      * @param message the message type: value
      * @return Long integer-reply the number of clients that received the message.
@@ -44,14 +44,14 @@ public interface BaseRedisCommands<K, V>  {
 
     /**
      * Lists the currently *active channels*.
-     * 
+     *
      * @return List&lt;K&gt; array-reply a list of active channels, optionally matching the specified pattern.
      */
     List<K> pubsubChannels();
 
     /**
      * Lists the currently *active channels*.
-     * 
+     *
      * @param channel the key
      * @return List&lt;K&gt; array-reply a list of active channels, optionally matching the specified pattern.
      */
@@ -67,14 +67,14 @@ public interface BaseRedisCommands<K, V>  {
 
     /**
      * Returns the number of subscriptions to patterns.
-     * 
+     *
      * @return Long integer-reply the number of patterns all the clients are subscribed to.
      */
     Long pubsubNumpat();
 
     /**
      * Echo the given string.
-     * 
+     *
      * @param msg the message type: value
      * @return V bulk-string-reply
      */
@@ -90,7 +90,7 @@ public interface BaseRedisCommands<K, V>  {
 
     /**
      * Ping the server.
-     * 
+     *
      * @return String simple-string-reply
      */
     String ping();
@@ -111,14 +111,14 @@ public interface BaseRedisCommands<K, V>  {
 
     /**
      * Close the connection.
-     * 
+     *
      * @return String simple-string-reply always OK.
      */
     String quit();
 
     /**
      * Wait for replication.
-     * 
+     *
      * @param replicas minimum number of replicas
      * @param timeout timeout in milliseconds
      * @return number of replicas
@@ -147,7 +147,7 @@ public interface BaseRedisCommands<K, V>  {
     <T> T dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args);
 
     /**
-     * 
+     *
      * @return true if the connection is open (connected and not closed).
      */
     boolean isOpen();
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java b/src/main/templates/io/lettuce/core/api/RedisGeoCommands.java
similarity index 98%
rename from src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java
rename to src/main/templates/io/lettuce/core/api/RedisGeoCommands.java
index 04bd3ff2d7..3d19bc918e 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisGeoCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisGeoCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import com.lambdaworks.redis.*;
+import io.lettuce.core.*;
 import java.util.List;
 import java.util.Set;
 
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisHLLCommands.java b/src/main/templates/io/lettuce/core/api/RedisHLLCommands.java
similarity index 94%
rename from src/main/templates/com/lambdaworks/redis/api/RedisHLLCommands.java
rename to src/main/templates/io/lettuce/core/api/RedisHLLCommands.java
index f3fdc6bd48..826075116a 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisHLLCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisHLLCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api;
+package io.lettuce.core.api;
 
 /**
  * ${intent} for HyperLogLog (PF* commands).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java b/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
similarity index 94%
rename from src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java
rename to src/main/templates/io/lettuce/core/api/RedisHashCommands.java
index 408df3049a..a01241eb98 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisHashCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api;
+package io.lettuce.core.api;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * ${intent} for Hashes (Key-Value pairs).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -35,7 +35,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Delete one or more hash fields.
-     * 
+     *
      * @param key the key
      * @param fields the field type: key
      * @return Long integer-reply the number of fields that were removed from the hash, not including specified but non existing
@@ -45,11 +45,11 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Determine if a hash field exists.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the hash contains {@code field}. {@literal false} if the hash does not contain {@code field},
      *         or {@code key} does not exist.
      */
@@ -57,7 +57,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Get the value of a hash field.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @return V bulk-string-reply the value associated with {@code field}, or {@literal null} when {@code field} is not present
@@ -67,7 +67,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Increment the integer value of a hash field by the given number.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @param amount the increment type: long
@@ -77,7 +77,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Increment the float value of a hash field by the given amount.
-     * 
+     *
      * @param key the key
      * @param field the field type: key
      * @param amount the increment type: double
@@ -87,7 +87,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Get all the fields and values in a hash.
-     * 
+     *
      * @param key the key
      * @return Map&lt;K,V&gt; array-reply list of fields and their values stored in the hash, or an empty list when {@code key}
      *         does not exist.
@@ -96,17 +96,17 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Stream over all the fields and values in a hash.
-     * 
+     *
      * @param channel the channel
      * @param key the key
-     * 
+     *
      * @return Long count of the keys.
      */
     Long hgetall(KeyValueStreamingChannel<K, V> channel, K key);
 
     /**
      * Get all the fields in a hash.
-     * 
+     *
      * @param key the key
      * @return List&lt;K&gt; array-reply list of fields in the hash, or an empty list when {@code key} does not exist.
      */
@@ -114,17 +114,17 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Stream over all the fields in a hash.
-     * 
+     *
      * @param channel the channel
      * @param key the key
-     * 
+     *
      * @return Long count of the keys.
      */
     Long hkeys(KeyStreamingChannel<K> channel, K key);
 
     /**
      * Get the number of fields in a hash.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply number of fields in the hash, or {@code 0} when {@code key} does not exist.
      */
@@ -132,7 +132,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Get the values of all the given hash fields.
-     * 
+     *
      * @param key the key
      * @param fields the field type: key
      * @return List&lt;V&gt; array-reply list of values associated with the given fields, in the same
@@ -141,18 +141,18 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Stream over the values of all the given hash fields.
-     * 
+     *
      * @param channel the channel
      * @param key the key
      * @param fields the fields
-     * 
+     *
      * @return Long count of the keys
      */
     Long hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields);
 
     /**
      * Set multiple hash fields to multiple values.
-     * 
+     *
      * @param key the key
      * @param map the null
      * @return String simple-string-reply
@@ -161,7 +161,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
      */
@@ -169,7 +169,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanArgs scan arguments
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
@@ -178,7 +178,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -188,7 +188,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return MapScanCursor&lt;K, V&gt; map scan cursor.
@@ -197,7 +197,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @return StreamScanCursor scan cursor.
@@ -206,7 +206,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanArgs scan arguments
@@ -216,7 +216,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -227,7 +227,7 @@ public interface RedisHashCommands<K, V> {
 
     /**
      * Incrementally iterate hash fields and associated values.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key-value pair
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java b/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
similarity index 95%
rename from src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java
rename to src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
index 9ca45cc9a7..b7a4803d7a 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisKeyCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api;
+package io.lettuce.core.api;
 
 import java.util.Date;
 import java.util.List;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * ${intent} for Keys (Key manipulation/querying).
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -50,7 +50,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Return a serialized version of the value stored at the specified key.
-     * 
+     *
      * @param key the key
      * @return byte[] bulk-string-reply the serialized value.
      */
@@ -66,11 +66,11 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Set a key's time to live in seconds.
-     * 
+     *
      * @param key the key
      * @param seconds the seconds type: long
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set.
      */
@@ -78,11 +78,11 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp.
-     * 
+     *
      * @param key the key
      * @param timestamp the timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -90,11 +90,11 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp.
-     * 
+     *
      * @param key the key
      * @param timestamp the timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -102,7 +102,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Find all keys matching the given pattern.
-     * 
+     *
      * @param pattern the pattern type: patternkey (pattern)
      * @return List&lt;K&gt; array-reply list of keys matching {@code pattern}.
      */
@@ -110,7 +110,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Find all keys matching the given pattern.
-     * 
+     *
      * @param channel the channel
      * @param pattern the pattern
      * @return Long array-reply list of keys matching {@code pattern}.
@@ -119,7 +119,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Atomically transfer a key from a Redis instance to another one.
-     * 
+     *
      * @param host the host
      * @param port the port
      * @param key the key
@@ -143,7 +143,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Move a key to another database.
-     * 
+     *
      * @param key the key
      * @param db the db type: long
      * @return Boolean integer-reply specifically:
@@ -152,7 +152,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * returns the kind of internal representation used in order to store the value associated with a key.
-     * 
+     *
      * @param key the key
      * @return String
      */
@@ -161,7 +161,7 @@ public interface RedisKeyCommands<K, V> {
     /**
      * returns the number of seconds since the object stored at the specified key is idle (not requested by read or write
      * operations).
-     * 
+     *
      * @param key the key
      * @return number of seconds since the object stored at the specified key is idle.
      */
@@ -169,7 +169,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * returns the number of references of the value associated with the specified key.
-     * 
+     *
      * @param key the key
      * @return Long
      */
@@ -177,10 +177,10 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Remove the expiration from a key.
-     * 
+     *
      * @param key the key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was removed. {@literal false} if {@code key} does not exist or does not have an
      *         associated timeout.
      */
@@ -188,11 +188,11 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Set a key's time to live in milliseconds.
-     * 
+     *
      * @param key the key
      * @param milliseconds the milliseconds type: long
      * @return integer-reply, specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set.
      */
@@ -200,11 +200,11 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
-     * 
+     *
      * @param key the key
      * @param timestamp the milliseconds-timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -212,11 +212,11 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
-     * 
+     *
      * @param key the key
      * @param timestamp the milliseconds-timestamp type: posix time
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the timeout was set. {@literal false} if {@code key} does not exist or the timeout could not
      *         be set (see: {@code EXPIRE}).
      */
@@ -224,7 +224,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Get the time to live for a key in milliseconds.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply TTL in milliseconds, or a negative value in order to signal an error (see the description
      *         above).
@@ -233,14 +233,14 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Return a random key from the keyspace.
-     * 
+     *
      * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
      */
     V randomkey();
 
     /**
      * Rename a key.
-     * 
+     *
      * @param key the key
      * @param newKey the newkey type: key
      * @return String simple-string-reply
@@ -249,18 +249,18 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Rename a key, only if the new key does not exist.
-     * 
+     *
      * @param key the key
      * @param newKey the newkey type: key
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if {@code key} was renamed to {@code newkey}. {@literal false} if {@code newkey} already exists.
      */
     Boolean renamenx(K key, K newKey);
 
     /**
      * Create a key using the provided serialized value, previously obtained using DUMP.
-     * 
+     *
      * @param key the key
      * @param ttl the ttl type: long
      * @param value the serialized-value type: string
@@ -270,7 +270,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @return List&lt;V&gt; array-reply list of sorted elements.
      */
@@ -278,7 +278,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @return Long number of values.
@@ -287,7 +287,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @param sortArgs sort arguments
      * @return List&lt;V&gt; array-reply list of sorted elements.
@@ -296,7 +296,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param sortArgs sort arguments
@@ -306,7 +306,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Sort the elements in a list, set or sorted set.
-     * 
+     *
      * @param key the key
      * @param sortArgs sort arguments
      * @param destination the destination key to store sort results
@@ -316,7 +316,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Touch one or more keys. Touch sets the last accessed time for a key. Non-exsitent keys wont get created.
-     * 
+     *
      * @param keys the keys
      * @return Long integer-reply the number of found keys.
      */
@@ -332,7 +332,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Determine the type stored at key.
-     * 
+     *
      * @param key the key
      * @return String simple-string-reply type of {@code key}, or {@code none} when {@code key} does not exist.
      */
@@ -340,14 +340,14 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
     KeyScanCursor<K> scan();
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanArgs scan arguments
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
@@ -355,7 +355,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
      * @return KeyScanCursor&lt;K&gt; scan cursor.
@@ -364,7 +364,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return KeyScanCursor&lt;K&gt; scan cursor.
      */
@@ -372,7 +372,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @return StreamScanCursor scan cursor.
      */
@@ -380,7 +380,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanArgs scan arguments
      * @return StreamScanCursor scan cursor.
@@ -389,7 +389,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -399,7 +399,7 @@ public interface RedisKeyCommands<K, V> {
 
     /**
      * Incrementally iterate the keys space.
-     * 
+     *
      * @param channel streaming channel that receives a call for every key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return StreamScanCursor scan cursor.
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisListCommands.java b/src/main/templates/io/lettuce/core/api/RedisListCommands.java
similarity index 95%
rename from src/main/templates/com/lambdaworks/redis/api/RedisListCommands.java
rename to src/main/templates/io/lettuce/core/api/RedisListCommands.java
index f2d97520b9..8c0cd58d6c 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisListCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisListCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api;
+package io.lettuce.core.api;
 
 import java.util.List;
 
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * ${intent} for Lists.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -32,11 +32,11 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Remove and get the first element in a list, or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param keys the keys
      * @return KeyValue&lt;K,V&gt; array-reply specifically:
-     * 
+     *
      *         A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk
      *         with the first element being the name of the key where an element was popped and the second element being the
      *         value of the popped element.
@@ -45,11 +45,11 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Remove and get the last element in a list, or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param keys the keys
      * @return KeyValue&lt;K,V&gt; array-reply specifically:
-     * 
+     *
      *         A {@literal null} multi-bulk when no element could be popped and the timeout expired. A two-element multi-bulk
      *         with the first element being the name of the key where an element was popped and the second element being the
      *         value of the popped element.
@@ -58,7 +58,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Pop a value from a list, push it to another list and return it; or block until one is available.
-     * 
+     *
      * @param timeout the timeout in seconds
      * @param source the source key
      * @param destination the destination type: key
@@ -69,7 +69,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Get an element from a list by its index.
-     * 
+     *
      * @param key the key
      * @param index the index type: long
      * @return V bulk-string-reply the requested element, or {@literal null} when {@code index} is out of range.
@@ -78,7 +78,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Insert an element before or after another element in a list.
-     * 
+     *
      * @param key the key
      * @param before the before
      * @param pivot the pivot
@@ -90,7 +90,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Get the length of a list.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the length of the list at {@code key}.
      */
@@ -98,7 +98,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Remove and get the first element in a list.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of the first element, or {@literal null} when {@code key} does not exist.
      */
@@ -106,7 +106,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Prepend one or multiple values to a list.
-     * 
+     *
      * @param key the key
      * @param values the value
      * @return Long integer-reply the length of the list after the push operations.
@@ -124,7 +124,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Get a range of elements from a list.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param stop the stop type: long
@@ -134,7 +134,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Get a range of elements from a list.
-     * 
+     *
      * @param channel the channel
      * @param key the key
      * @param start the start type: long
@@ -145,7 +145,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Remove elements from a list.
-     * 
+     *
      * @param key the key
      * @param count the count type: long
      * @param value the value
@@ -155,7 +155,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Set the value of an element in a list by its index.
-     * 
+     *
      * @param key the key
      * @param index the index type: long
      * @param value the value
@@ -165,7 +165,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Trim a list to the specified range.
-     * 
+     *
      * @param key the key
      * @param start the start type: long
      * @param stop the stop type: long
@@ -175,7 +175,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Remove and get the last element in a list.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the value of the last element, or {@literal null} when {@code key} does not exist.
      */
@@ -183,7 +183,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Remove the last element in a list, append it to another list and return it.
-     * 
+     *
      * @param source the source key
      * @param destination the destination type: key
      * @return V bulk-string-reply the element being popped and pushed.
@@ -192,7 +192,7 @@ public interface RedisListCommands<K, V> {
 
     /**
      * Append one or multiple values to a list.
-     * 
+     *
      * @param key the key
      * @param values the value
      * @return Long integer-reply the length of the list after the push operation.
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisScriptingCommands.java b/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java
similarity index 93%
rename from src/main/templates/com/lambdaworks/redis/api/RedisScriptingCommands.java
rename to src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java
index f5c562eafe..afd4cd9658 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisScriptingCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api;
+package io.lettuce.core.api;
 
 import java.util.List;
 
-import com.lambdaworks.redis.ScriptOutputType;
+import io.lettuce.core.ScriptOutputType;
 
 /**
  * ${intent} for Scripting.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -30,7 +30,7 @@
 public interface RedisScriptingCommands<K, V> {
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param script Lua 5.1 script.
      * @param type output type
      * @param keys key names
@@ -41,7 +41,7 @@ public interface RedisScriptingCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param script Lua 5.1 script.
      * @param type the type
      * @param keys the keys
@@ -53,7 +53,7 @@ public interface RedisScriptingCommands<K, V> {
 
     /**
      * Evaluates a script cached on the server side by its SHA1 digest
-     * 
+     *
      * @param digest SHA1 of the script
      * @param type the type
      * @param keys the keys
@@ -64,7 +64,7 @@ public interface RedisScriptingCommands<K, V> {
 
     /**
      * Execute a Lua script server side.
-     * 
+     *
      * @param digest SHA1 of the script
      * @param type the type
      * @param keys the keys
@@ -76,7 +76,7 @@ public interface RedisScriptingCommands<K, V> {
 
     /**
      * Check existence of scripts in the script cache.
-     * 
+     *
      * @param digests script digests
      * @return List&lt;Boolean&gt; array-reply The command returns an array of integers that correspond to the specified SHA1
      *         digest arguments. For every corresponding SHA1 digest of a script that actually exists in the script cache, an 1
@@ -86,21 +86,21 @@ public interface RedisScriptingCommands<K, V> {
 
     /**
      * Remove all the scripts from the script cache.
-     * 
+     *
      * @return String simple-string-reply
      */
     String scriptFlush();
 
     /**
      * Kill the script currently in execution.
-     * 
+     *
      * @return String simple-string-reply
      */
     String scriptKill();
 
     /**
      * Load the specified Lua script into the script cache.
-     * 
+     *
      * @param script script content
      * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
      */
@@ -108,7 +108,7 @@ public interface RedisScriptingCommands<K, V> {
 
     /**
      * Create a SHA1 digest from a Lua script.
-     * 
+     *
      * @param script script content
      * @return the SHA1 value
      */
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java b/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java
similarity index 94%
rename from src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java
rename to src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java
index 44c9d44f11..da845eaeb1 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisSentinelCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 
 /**
  * ${intent} for Redis Sentinel.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -34,7 +34,7 @@ public interface RedisSentinelCommands<K, V> {
 
     /**
      * Return the ip and port number of the master with that name.
-     * 
+     *
      * @param key the key
      * @return SocketAddress;
      */
@@ -42,14 +42,14 @@ public interface RedisSentinelCommands<K, V> {
 
     /**
      * Enumerates all the monitored masters and their states.
-     * 
+     *
      * @return Map&lt;K, V&gt;&gt;
      */
     List<Map<K, V>> masters();
 
     /**
      * Show the state and info of the specified master.
-     * 
+     *
      * @param key the key
      * @return Map&lt;K, V&gt;
      */
@@ -57,7 +57,7 @@ public interface RedisSentinelCommands<K, V> {
 
     /**
      * Provides a list of slaves for the master with the specified name.
-     * 
+     *
      * @param key the key
      * @return List&lt;Map&lt;K, V&gt;&gt;
      */
@@ -65,7 +65,7 @@ public interface RedisSentinelCommands<K, V> {
 
     /**
      * This command will reset all the masters with matching name.
-     * 
+     *
      * @param key the key
      * @return Long
      */
@@ -73,7 +73,7 @@ public interface RedisSentinelCommands<K, V> {
 
     /**
      * Perform a failover.
-     * 
+     *
      * @param key the master id
      * @return String
      */
@@ -81,7 +81,7 @@ public interface RedisSentinelCommands<K, V> {
 
     /**
      * This command tells the Sentinel to start monitoring a new master with the specified name, ip, port, and quorum.
-     * 
+     *
      * @param key the key
      * @param ip the IP address
      * @param port the port
@@ -92,18 +92,18 @@ public interface RedisSentinelCommands<K, V> {
 
     /**
      * Multiple option / value pairs can be specified (or none at all).
-     * 
+     *
      * @param key the key
      * @param option the option
      * @param value the value
-     * 
+     *
      * @return String simple-string-reply {@code OK} if {@code SET} was executed correctly.
      */
     String set(K key, String option, V value);
 
     /**
      * remove the specified master.
-     * 
+     *
      * @param key the key
      * @return String
      */
@@ -173,7 +173,7 @@ public interface RedisSentinelCommands<K, V> {
 
     /**
      * Ping the server.
-     * 
+     *
      * @return String simple-string-reply
      */
     String ping();
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisServerCommands.java b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
similarity index 95%
rename from src/main/templates/com/lambdaworks/redis/api/RedisServerCommands.java
rename to src/main/templates/io/lettuce/core/api/RedisServerCommands.java
index d0e92d1d21..08aa50b04b 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisServerCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api;
+package io.lettuce.core.api;
 
 import java.util.Date;
 import java.util.List;
 
-import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.protocol.CommandType;
 
 /**
  * ${intent} for Server Control.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -33,28 +33,28 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Asynchronously rewrite the append-only file.
-     * 
+     *
      * @return String simple-string-reply always {@code OK}.
      */
     String bgrewriteaof();
 
     /**
      * Asynchronously save the dataset to disk.
-     * 
+     *
      * @return String simple-string-reply
      */
     String bgsave();
 
     /**
      * Get the current connection name.
-     * 
+     *
      * @return K bulk-string-reply The connection name, or a null bulk reply if no name is set.
      */
     K clientGetname();
 
     /**
      * Set the current connection name.
-     * 
+     *
      * @param name the client name
      * @return simple-string-reply {@code OK} if the connection name was successfully set.
      */
@@ -62,7 +62,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Kill the connection of a client identified by ip:port.
-     * 
+     *
      * @param addr ip:port
      * @return String simple-string-reply {@code OK} if the connection exists and has been closed
      */
@@ -78,7 +78,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Stop processing commands from clients for some time.
-     * 
+     *
      * @param timeout the timeout value in milliseconds
      * @return String simple-string-reply The command returns OK or an error if the timeout is invalid.
      */
@@ -86,7 +86,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Get the list of client connections.
-     * 
+     *
      * @return String bulk-string-reply a unique string, formatted as follows: One client connection per line (separated by LF),
      *         each line is composed of a succession of property=value fields separated by a space character.
      */
@@ -94,14 +94,14 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Returns an array reply of details about all Redis commands.
-     * 
+     *
      * @return List&lt;Object&gt; array-reply
      */
     List<Object> command();
 
     /**
      * Returns an array reply of details about the requested commands.
-     * 
+     *
      * @param commands the commands to query for
      * @return List&lt;Object&gt; array-reply
      */
@@ -109,7 +109,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Returns an array reply of details about the requested commands.
-     * 
+     *
      * @param commands the commands to query for
      * @return List&lt;Object&gt; array-reply
      */
@@ -117,14 +117,14 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Get total number of Redis commands.
-     * 
+     *
      * @return Long integer-reply of number of total commands in this Redis server.
      */
     Long commandCount();
 
     /**
      * Get the value of a configuration parameter.
-     * 
+     *
      * @param parameter name of the parameter
      * @return List&lt;String&gt; bulk-string-reply
      */
@@ -132,14 +132,14 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Reset the stats returned by INFO.
-     * 
+     *
      * @return String simple-string-reply always {@code OK}.
      */
     String configResetstat();
 
     /**
      * Rewrite the configuration file with the in memory configuration.
-     * 
+     *
      * @return String simple-string-reply {@code OK} when the configuration was rewritten properly. Otherwise an error is
      *         returned.
      */
@@ -147,7 +147,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Set a configuration parameter to the given value.
-     * 
+     *
      * @param parameter the parameter name
      * @param value the parameter value
      * @return String simple-string-reply: {@code OK} when the configuration was set properly. Otherwise an error is returned.
@@ -156,7 +156,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Return the number of keys in the selected database.
-     * 
+     *
      * @return Long integer-reply
      */
     Long dbsize();
@@ -178,7 +178,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Get debugging information about a key.
-     * 
+     *
      * @param key the key
      * @return String simple-string-reply
      */
@@ -222,7 +222,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Remove all keys from all databases.
-     * 
+     *
      * @return String simple-string-reply
      */
     String flushall();
@@ -236,7 +236,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Remove all keys from the current database.
-     * 
+     *
      * @return String simple-string-reply
      */
     String flushdb();
@@ -250,14 +250,14 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Get information and statistics about the server.
-     * 
+     *
      * @return String bulk-string-reply as a collection of text lines.
      */
     String info();
 
     /**
      * Get information and statistics about the server.
-     * 
+     *
      * @param section the section type: string
      * @return String bulk-string-reply as a collection of text lines.
      */
@@ -265,28 +265,28 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Get the UNIX time stamp of the last successful save to disk.
-     * 
+     *
      * @return Date integer-reply an UNIX time stamp.
      */
     Date lastsave();
 
     /**
      * Synchronously save the dataset to disk.
-     * 
+     *
      * @return String simple-string-reply The commands returns OK on success.
      */
     String save();
 
     /**
      * Synchronously save the dataset to disk and then shut down the server.
-     * 
+     *
      * @param save {@literal true} force save operation
      */
     void shutdown(boolean save);
 
     /**
      * Make the server a slave of another instance, or promote it as master.
-     * 
+     *
      * @param host the host type: string
      * @param port the port type: string
      * @return String simple-string-reply
@@ -295,21 +295,21 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Promote server as master.
-     * 
+     *
      * @return String simple-string-reply
      */
     String slaveofNoOne();
 
     /**
      * Read the slow log.
-     * 
+     *
      * @return List&lt;Object&gt; deeply nested multi bulk replies
      */
     List<Object> slowlogGet();
 
     /**
      * Read the slow log.
-     * 
+     *
      * @param count the count
      * @return List&lt;Object&gt; deeply nested multi bulk replies
      */
@@ -317,25 +317,25 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Obtaining the current length of the slow log.
-     * 
+     *
      * @return Long length of the slow log.
      */
     Long slowlogLen();
 
     /**
      * Resetting the slow log.
-     * 
+     *
      * @return String simple-string-reply The commands returns OK on success.
      */
     String slowlogReset();
 
     /**
      * Return the current server time.
-     * 
+     *
      * @return List&lt;V&gt; array-reply specifically:
-     * 
+     *
      *         A multi bulk reply containing two elements:
-     * 
+     *
      *         unix time in seconds. microseconds.
      */
     List<V> time();
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisSetCommands.java b/src/main/templates/io/lettuce/core/api/RedisSetCommands.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/api/sync/RedisSetCommands.java
rename to src/main/templates/io/lettuce/core/api/RedisSetCommands.java
index 69e8220df9..193d5f2142 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisSetCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,31 +13,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.sync;
+package io.lettuce.core.api;
 
 import java.util.List;
 import java.util.Set;
 
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanCursor;
-import com.lambdaworks.redis.StreamScanCursor;
-import com.lambdaworks.redis.ValueScanCursor;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.ScanArgs;
+import io.lettuce.core.ScanCursor;
+import io.lettuce.core.StreamScanCursor;
+import io.lettuce.core.ValueScanCursor;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
- * Synchronous executed commands for Sets.
- * 
+ * ${intent} for Sets.
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
- * @generated by com.lambdaworks.apigenerator.CreateSyncApi
  */
 public interface RedisSetCommands<K, V> {
 
     /**
      * Add one or more members to a set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply the number of elements that were added to the set, not including all the elements already
@@ -47,7 +46,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Get the number of members in a set.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the cardinality (number of elements) of the set, or {@literal false} if {@code key} does not
      *         exist.
@@ -56,7 +55,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Subtract multiple sets.
-     * 
+     *
      * @param keys the key
      * @return Set&lt;V&gt; array-reply list with members of the resulting set.
      */
@@ -64,7 +63,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Subtract multiple sets.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -73,7 +72,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Subtract multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -82,7 +81,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Intersect multiple sets.
-     * 
+     *
      * @param keys the key
      * @return Set&lt;V&gt; array-reply list with members of the resulting set.
      */
@@ -90,7 +89,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Intersect multiple sets.
-     * 
+     *
      * @param channel the channel
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -99,7 +98,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Intersect multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -108,11 +107,11 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Determine if a given value is a member of a set.
-     * 
+     *
      * @param key the key
      * @param member the member type: value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the element is a member of the set. {@literal false} if the element is not a member of the
      *         set, or if {@code key} does not exist.
      */
@@ -120,12 +119,12 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Move a member from one set to another.
-     * 
+     *
      * @param source the source key
      * @param destination the destination type: key
      * @param member the member type: value
      * @return Boolean integer-reply specifically:
-     * 
+     *
      *         {@literal true} if the element is moved. {@literal false} if the element is not a member of {@code source} and no
      *         operation was performed.
      */
@@ -133,7 +132,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Get all the members in a set.
-     * 
+     *
      * @param key the key
      * @return Set&lt;V&gt; array-reply all elements of the set.
      */
@@ -141,7 +140,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Get all the members in a set.
-     * 
+     *
      * @param channel the channel
      * @param key the keys
      * @return Long count of members of the resulting set.
@@ -150,7 +149,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Remove and return a random member from a set.
-     * 
+     *
      * @param key the key
      * @return V bulk-string-reply the removed element, or {@literal null} when {@code key} does not exist.
      */
@@ -167,9 +166,9 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Get one random member from a set.
-     * 
+     *
      * @param key the key
-     * 
+     *
      * @return V bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply with the
      *         randomly selected element, or {@literal null} when {@code key} does not exist.
      */
@@ -177,7 +176,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Get one or multiple random members from a set.
-     * 
+     *
      * @param key the key
      * @param count the count type: long
      * @return Set&lt;V&gt; bulk-string-reply without the additional {@code count} argument the command returns a Bulk Reply
@@ -187,7 +186,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Get one or multiple random members from a set.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param count the count
@@ -197,7 +196,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Remove one or more members from a set.
-     * 
+     *
      * @param key the key
      * @param members the member type: value
      * @return Long integer-reply the number of members that were removed from the set, not including non existing members.
@@ -206,7 +205,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Add multiple sets.
-     * 
+     *
      * @param keys the key
      * @return Set&lt;V&gt; array-reply list with members of the resulting set.
      */
@@ -214,7 +213,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Add multiple sets.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param keys the keys
      * @return Long count of members of the resulting set.
@@ -223,7 +222,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Add multiple sets and store the resulting set in a key.
-     * 
+     *
      * @param destination the destination type: key
      * @param keys the key
      * @return Long integer-reply the number of elements in the resulting set.
@@ -232,7 +231,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @return ValueScanCursor&lt;V&gt; scan cursor.
      */
@@ -240,7 +239,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanArgs scan arguments
      * @return ValueScanCursor&lt;V&gt; scan cursor.
@@ -249,7 +248,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @param scanArgs scan arguments
@@ -259,7 +258,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
      * @return ValueScanCursor&lt;V&gt; scan cursor.
@@ -268,7 +267,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @return StreamScanCursor scan cursor.
@@ -277,7 +276,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanArgs scan arguments
@@ -287,7 +286,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
@@ -298,7 +297,7 @@ public interface RedisSetCommands<K, V> {
 
     /**
      * Incrementally iterate Set elements.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param scanCursor cursor to resume from a previous scan, must not be {@literal null}
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java b/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
similarity index 99%
rename from src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
rename to src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
index d6a4eda2e1..0256d83d48 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisSortedSetCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api;
+package io.lettuce.core.api;
 
 import java.util.List;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.*;
+import io.lettuce.core.output.ScoredValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * ${intent} for Sorted Sets.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -33,13 +33,13 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param score the score
      * @param member the member
-     * 
+     *
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -47,11 +47,11 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param scoresAndValues the scoresAndValue tuples (score,value,score,value,...)
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -59,11 +59,11 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the key
      * @param scoredValues the scored values
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -99,12 +99,12 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
-     * 
+     *
      * @param key the ke
      * @param zAddArgs arguments for zadd
      * @param scoredValues the scored values
      * @return Long integer-reply specifically:
-     * 
+     *
      *         The number of elements added to the sorted sets, not including elements already existing for which the score was
      *         updated.
      */
@@ -136,7 +136,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Get the number of members in a sorted set.
-     * 
+     *
      * @param key the key
      * @return Long integer-reply the cardinality (number of elements) of the sorted set, or {@literal false} if {@code key}
      *         does not exist.
@@ -145,7 +145,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Count the members in a sorted set with scores within the given values.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -157,7 +157,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Count the members in a sorted set with scores within the given values.
-     * 
+     *
      * @param key the key
      * @param min min score
      * @param max max score
@@ -179,7 +179,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Increment the score of a member in a sorted set.
-     * 
+     *
      * @param key the key
      * @param amount the increment type: long
      * @param member the member type: key
@@ -190,7 +190,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
-     * 
+     *
      * @param destination the destination
      * @param keys the keys
      * @return Long integer-reply the number of elements in the resulting sorted set at {@code destination}.
@@ -199,7 +199,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
-     * 
+     *
      * @param destination the destination
      * @param storeArgs the storeArgs
      * @param keys the keys
@@ -393,7 +393,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -406,7 +406,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -430,7 +430,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Stream over range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
@@ -445,7 +445,7 @@ public interface RedisSortedSetCommands<K, V> {
 
     /**
      * Stream over a range of members in a sorted set, by score.
-     * 
+     *
      * @param channel streaming channel that receives a call for every value
      * @param key the key
      * @param min min score
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java b/src/main/templates/io/lettuce/core/api/RedisStringCommands.java
similarity index 96%
rename from src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java
rename to src/main/templates/io/lettuce/core/api/RedisStringCommands.java
index e01479587a..5baf4752f7 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisStringCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisStringCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api;
+package io.lettuce.core.api;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
-import com.lambdaworks.redis.BitFieldArgs;
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.SetArgs;
-import com.lambdaworks.redis.Value;
+import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
+import io.lettuce.core.BitFieldArgs;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.SetArgs;
+import io.lettuce.core.Value;
 
 /**
  * ${intent} for Strings.
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisTransactionalCommands.java b/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java
similarity index 92%
rename from src/main/templates/com/lambdaworks/redis/api/RedisTransactionalCommands.java
rename to src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java
index 54f499100a..c7fc8acf59 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisTransactionalCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api;
+package io.lettuce.core.api;
 
 import java.util.List;
-import com.lambdaworks.redis.TransactionResult;
+import io.lettuce.core.TransactionResult;
 
 /**
  * ${intent} for Transactions.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
@@ -30,7 +30,7 @@ public interface RedisTransactionalCommands<K, V> {
 
     /**
      * Discard all commands issued after MULTI.
-     * 
+     *
      * @return String simple-string-reply always {@code OK}.
      */
     String discard();
diff --git a/src/site/markdown/download.md.vm b/src/site/markdown/download.md.vm
deleted file mode 100644
index eeee9ca6a8..0000000000
--- a/src/site/markdown/download.md.vm
+++ /dev/null
@@ -1,74 +0,0 @@
-Download lettuce
-======================
-
- lettuce is distributed under the
- [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt).
-
-  The checksum and signature are links to the originals on the main distribution server.
-
-
-lettuce 3.x
------------
-
-|                   | Download     | Checksum     | Signature    |
-| ----------------- |:-------------|:-------------|:-------------|
-| lettuce (jar) | [lettuce-${lettuce3-release-version}.jar](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}.jar)|[lettuce-${lettuce3-release-version}.jar.md5](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}.jar.md5)|[lettuce-${lettuce3-release-version}.jar.asc](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}.jar.asc)|
-| lettuce shaded (jar) | [lettuce-${lettuce3-release-version}-shaded.jar](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-shaded.jar)|[lettuce-${lettuce3-release-version}-shaded.jar.md5](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-shaded.jar.md5)|[lettuce-${lettuce3-release-version}-shaded.jar.asc](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-shaded.jar.asc)|
-| lettuce binary (zip) | [lettuce-${lettuce3-release-version}-bin.zip](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.zip)|[lettuce-${lettuce3-release-version}-bin.zip.md5](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.zip.md5)|[lettuce-${lettuce3-release-version}-bin.zip.asc](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.zip.asc)|
-| lettuce binary (tar.gz) | [lettuce-${lettuce3-release-version}-bin.tar.gz](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.tar.gz)|[lettuce-${lettuce3-release-version}-bin.tar.gz.md5](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.tar.gz.md5)|[lettuce-${lettuce3-release-version}-bin.tar.gz.asc](https://github.com/mp911de/lettuce/releases/download/${lettuce3-release-version}/lettuce-${lettuce3-release-version}-bin.tar.gz.asc)|
-
-
-lettuce 4.x
------------
-
-|                   | Download     | Checksum     | Signature    |
-| ----------------- |:-------------|:-------------|:-------------|
-| lettuce (jar) | [lettuce-${lettuce-release-version}.jar](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce-release-version}/lettuce-${lettuce-release-version}.jar)|[lettuce-${lettuce-release-version}.jar.md5](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce-release-version}/lettuce-${lettuce-release-version}.jar.md5)|[lettuce-${lettuce-release-version}.jar.asc](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce-release-version}/lettuce-${lettuce-release-version}.jar.asc)|
-| lettuce shaded (jar) | [lettuce-${lettuce-release-version}-shaded.jar](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce-release-version}/lettuce-${lettuce-release-version}-shaded.jar)|[lettuce-${lettuce-release-version}-shaded.jar.md5](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce-release-version}/lettuce-${lettuce-release-version}-shaded.jar.md5)|[lettuce-${lettuce-release-version}-shaded.jar.asc](http://search.maven.org/remotecontent?filepath=biz/paluch/redis/lettuce/${lettuce-release-version}/lettuce-${lettuce-release-version}-shaded.jar.asc)|
-| lettuce binary (zip) | [lettuce-${lettuce-release-version}-bin.zip](https://github.com/mp911de/lettuce/releases/download/${lettuce-release-version}/lettuce-${lettuce-release-version}-bin.zip)|[lettuce-${lettuce-release-version}-bin.zip.md5](https://github.com/mp911de/lettuce/releases/download/${lettuce-release-version}/lettuce-${lettuce-release-version}-bin.zip.md5)|[lettuce-${lettuce-release-version}-bin.zip.asc](https://github.com/mp911de/lettuce/releases/download/${lettuce-release-version}/lettuce-${lettuce-release-version}-bin.zip.asc)|
-| lettuce binary (tar.gz) | [lettuce-${lettuce-release-version}-bin.tar.gz](https://github.com/mp911de/lettuce/releases/download/${lettuce-release-version}/lettuce-${lettuce-release-version}-bin.tar.gz)|[lettuce-${lettuce-release-version}-bin.tar.gz.md5](https://github.com/mp911de/lettuce/releases/download/${lettuce-release-version}/lettuce-${lettuce-release-version}-bin.tar.gz.md5)|[lettuce-${lettuce-release-version}-bin.tar.gz.asc](https://github.com/mp911de/lettuce/releases/download/${lettuce-release-version}/lettuce-${lettuce-release-version}-bin.tar.gz.asc)|
-
-
-
-It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures.
-
-The PGP signatures can be verified using PGP or GPG. First download the
-[KEYS](http://redis.paluch.biz/KEYS) as well as the asc signature file for the relevant distribution.
-Make sure you get these files from Maven Central rather
-than from a mirror. Then verify the signatures using
-
-
-    % gpg --import KEYS
-    % gpg --verify lettuce-${lettuce-release-version}.jar.asc
-
-
-Alternatively, you can verify the MD5 signature on the files. A unix program called md5 or md5sum is included
-in many unix distributions.
-
-
-Previous Releases
------------------
-
-  All previous releases of lettuce can be found in 
-  [Maven Central](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22biz.paluch.redis%22%20AND%20a%3A%22lettuce%22).
-
-
-Using lettuce on your classpath
------------------
-
-  To use lettuce in your application make sure that the jars are in the application's classpath. Add
-  the dependencies listed below to your classpath.
-
-    lettuce-${lettuce-release-version}.jar
-    netty-buffer-${netty-version}.jar
-    netty-codec-${netty-version}.Final.jar
-    netty-common-${netty-version}.Final.jar
-    netty-transport-${netty-version}.jar
-    netty-transport-native-epoll-${netty-version}.jar
-    netty-handler-${netty-version}.jar
-    reactor-3.0.0.RELEASE.jar
-    LatencyUtils-2.0.3.jar
-    HdrHistogram-2.1.8.jar
-    commons-pool2-2.4.2.jar
-
-You can do this from the command line or a manifest file.
diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm
deleted file mode 100644
index 8ec6b81d05..0000000000
--- a/src/site/markdown/index.md.vm
+++ /dev/null
@@ -1,113 +0,0 @@
-Introduction
-=============
-
-Lettuce is a scalable thread-safe Redis client for synchronous,
-asynchronous and reactive usage. Multiple threads may share one connection if they avoid blocking and transactional
-operations such as `BLPOP` and  `MULTI`/`EXEC`.
-lettuce is built with [netty](https://github.com/netty/netty).
-Supports advanced Redis features such as Sentinel, Cluster, Pipelining, Auto-Reconnect and Redis data models.
-
-
-This version of lettuce has been tested against Redis and 3.0.
-
-* lettuce 3.x works with Java 6, 7 and 8, lettuce 4.x requires Java 8
-* [synchronous](https://github.com/mp911de/lettuce/wiki/Basic-usage), [asynchronous](https://github.com/mp911de/lettuce/wiki/Asynchronous-API-%284.0%29) and  [reactive](https://github.com/mp911de/lettuce/wiki/Reactive-API-%284.0%29) usage
-* [Redis Sentinel](https://github.com/mp911de/lettuce/wiki/Redis-Sentinel)
-* [Redis Cluster](https://github.com/mp911de/lettuce/wiki/Redis-Cluster)
-* [SSL](https://github.com/mp911de/lettuce/wiki/SSL-Connections) and [Unix Domain Socket](https://github.com/mp911de/lettuce/wiki/Unix-Domain-Sockets) connections
-* [Streaming API](https://github.com/mp911de/lettuce/wiki/Streaming-API)
-* [CDI](https://github.com/mp911de/lettuce/wiki/CDI-Support) and [Spring](https://github.com/mp911de/lettuce/wiki/Spring-Support) integration
-* [Codecs](https://github.com/mp911de/lettuce/wiki/Codecs) (for UTF8/bit/JSON etc. representation of your data)
-* multiple [Command Interfaces](https://github.com/mp911de/lettuce/wiki/Command-Interfaces-%284.0%29)
-
-See the [Wiki](https://github.com/mp911de/lettuce/wiki) for more docs.
-
-I'm developing and maintaining actively the fork of https://github.com/wg/lettuce
-
-[![Join the chat at https://gitter.im/mp911de/lettuce](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mp911de/lettuce) [![Build Status](https://travis-ci.org/mp911de/lettuce.svg)](https://travis-ci.org/mp911de/lettuce) [![Coverage Status](https://img.shields.io/coveralls/mp911de/lettuce.svg)](https://coveralls.io/r/mp911de/lettuce) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/biz.paluch.redis/lettuce/badge.svg)](https://maven-badges.herokuapp.com/maven-central/biz.paluch.redis/lettuce)
-
-- - -
-
-3.x and 4.x
-------------
-lettuce is available in two major versions. The 3.x stream and the 4.x stream. Both streams are maintained. 
-
-After this release, the 4.x branch will be promoted to the default branch.
-Following rules should give a guidance for the stream in which a particular change is done:
-
-**Changes affecting both streams**
-
-* New Redis commands (such as HSTRLEN)
-* Bugfixes
-
-**Changes for the 4.x stream only**
-
-* New Redis paradigms
-* Enriching the API (such as multi-key command execution in the Cluster API)
-* Technical improvements to the client (such as the Reactive API)
-
-The 3.x stream will be maintained at least until end of 2016.
-
-- - -
-
-How to get
--------------
-
-```
-<dependency>
-  <groupId>biz.paluch.redis</groupId>
-  <artifactId>lettuce</artifactId>
-  <version>${lettuce-release-version}</version>
-</dependency>
-```
-   
-Shaded JAR-File (packaged dependencies  and relocated to the `com.lambdaworks` package to prevent version conflicts)
-   
-```
-<dependency>
-  <groupId>biz.paluch.redis</groupId>
-  <artifactId>lettuce</artifactId>
-  <version>${lettuce-release-version}</version>
-  <classifier>shaded</classifier>
-  
-  <exclusions>
-    <exclusion>
-      <groupId>io.projectreactor</groupId>
-      <artifactId>reactor-core</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>org.latencyutils</groupId>
-      <artifactId>LatencyUtils</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-handler</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport-native-epoll</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-pool2</artifactId>
-    </exclusion>
-  </exclusions>
-</dependency>
-```
-
-All versions: [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22biz.paluch.redis%22%20AND%20a%3A%22lettuce%22)
-
-Snapshots: [Sonatype OSS Repository](https://oss.sonatype.org/#nexus-search;gav~biz.paluch.redis~lettuce~~~) 
-
diff --git a/src/site/site.xml b/src/site/site.xml
deleted file mode 100644
index ad9fce6483..0000000000
--- a/src/site/site.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<project xmlns="http://maven.apache.org/DECORATION/1.6.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"
-         name="lettuce">
-    <bannerLeft>
-        <name>lettuce - Advanced Java Redis client</name>
-        <href>http://redis.paluch.biz/</href>
-    </bannerLeft>
-
-    <body>
-        <menu name="Overview">
-            <item name="Introduction" href="index.html"/>
-            <item name="Downloads" href="download.html" collapse="true">
-                <item name="Archive" href="https://github.com/mp911de/lettuce/wiki/Download"/>
-            </item>
-            <item name="Releases" href="https://github.com/mp911de/lettuce/releases"/>
-            <item name="Compatibility notes" href="https://github.com/mp911de/lettuce/wiki/Dependency-Compatibility-Matrix"/>
-        </menu>
-
-        <menu name="Project Documentation">
-            <item name="JavaDoc (3.x)" href="docs/api/releases/latest-3.x/index.html"/>
-            <item name="JavaDoc (4.x)" href="docs/api/releases/latest-4.x/index.html"/>
-            <item name="JavaDoc (archive)" href="docs/api/releases/"/>
-        </menu>
-
-        <menu ref="reports"/>
-    </body>
-
-    <custom>
-        <fluidoSkin>
-            <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
-            <gitHub>
-                <projectId>mp911de/lettuce</projectId>
-                <ribbonOrientation>right</ribbonOrientation>
-                <ribbonColor>black</ribbonColor>
-            </gitHub>
-            <twitter>
-                <user>mp911de</user>
-                <showUser>true</showUser>
-                <showFollowers>true</showFollowers>
-            </twitter>
-            <piwik>
-                <piwikUrl>piwik.paluch.biz</piwikUrl>
-                <idsite>6</idsite>
-            </piwik>
-        </fluidoSkin>
-    </custom>
-
-    <skin>
-        <groupId>org.apache.maven.skins</groupId>
-        <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
-    </skin>
-</project>
diff --git a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
index ec0308e6b6..cc2ed18b63 100644
--- a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
+++ b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
@@ -18,8 +18,8 @@
 import java.util.List;
 import java.util.Set;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.sync.RedisCommands;
+import io.lettuce.core.*;
+import io.lettuce.core.api.sync.RedisCommands;
 
 public class LettuceGeoDemo {
 
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
index 32735c92fc..6575812545 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
@@ -19,17 +19,17 @@
 
 import javax.enterprise.inject.Alternative;
 
-import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.pubsub.PubSubEndpoint;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.pubsub.PubSubEndpoint;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnectionImpl;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * Demo code for extending a RedisClient.
- * 
+ *
  * @author Mark Paluch
  */
 @Alternative
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
index 71b2e1b528..1207a049cc 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
@@ -21,13 +21,13 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.pubsub.RedisPubSubAsyncCommandsImpl;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
-import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.pubsub.RedisPubSubAsyncCommandsImpl;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
 
 /**
  * Test for override/extensability of RedisClient
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
index a66ff7df98..87ea76691b 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
@@ -18,12 +18,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.redis.protocol.RedisCommand;
-import com.lambdaworks.redis.pubsub.PubSubEndpoint;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnectionImpl;
+import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.pubsub.PubSubEndpoint;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnectionImpl;
 
 /**
  * Demo code for extending a RedisPubSubConnectionImpl.
diff --git a/src/test/java/com/lambdaworks/CanConnect.java b/src/test/java/io/lettuce/CanConnect.java
similarity index 95%
rename from src/test/java/com/lambdaworks/CanConnect.java
rename to src/test/java/io/lettuce/CanConnect.java
index 8788791377..cbc2d8addd 100644
--- a/src/test/java/com/lambdaworks/CanConnect.java
+++ b/src/test/java/io/lettuce/CanConnect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks;
+package io.lettuce;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/src/test/java/com/lambdaworks/ConnectionTestUtil.java b/src/test/java/io/lettuce/ConnectionTestUtil.java
similarity index 88%
rename from src/test/java/com/lambdaworks/ConnectionTestUtil.java
rename to src/test/java/io/lettuce/ConnectionTestUtil.java
index a2c4c36c12..35b4537b97 100644
--- a/src/test/java/com/lambdaworks/ConnectionTestUtil.java
+++ b/src/test/java/io/lettuce/ConnectionTestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,20 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks;
+package io.lettuce;
 
 import java.util.Queue;
 
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.lambdaworks.redis.RedisChannelHandler;
-import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.internal.LettuceFactories;
-import com.lambdaworks.redis.protocol.CommandHandler;
-import com.lambdaworks.redis.protocol.ConnectionWatchdog;
-import com.lambdaworks.redis.protocol.DefaultEndpoint;
-
+import io.lettuce.core.RedisChannelHandler;
+import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.internal.LettuceFactories;
+import io.lettuce.core.protocol.CommandHandler;
+import io.lettuce.core.protocol.ConnectionWatchdog;
+import io.lettuce.core.protocol.DefaultEndpoint;
 import io.netty.channel.Channel;
 
 /**
@@ -37,7 +36,7 @@ public class ConnectionTestUtil {
 
     /**
      * Extract the {@link Channel} from a {@link StatefulConnection}.
-     * 
+     *
      * @param connection the connection
      * @return the {@link Channel}
      */
@@ -49,7 +48,7 @@ public static Channel getChannel(StatefulConnection<?, ?> connection) {
 
     /**
      * Extract the {@link ConnectionWatchdog} from a {@link StatefulConnection}.
-     * 
+     *
      * @param connection the connection
      * @return the {@link ConnectionWatchdog}
      */
@@ -65,7 +64,7 @@ public static ConnectionWatchdog getConnectionWatchdog(StatefulConnection<?, ?>
 
     /**
      * Extract the {@link RedisChannelWriter} from a {@link StatefulConnection}.
-     * 
+     *
      * @param connection the connection
      * @return the {@link RedisChannelWriter}
      */
@@ -93,7 +92,7 @@ public static Queue<Object> getQueue(StatefulConnection<?, ?> connection) {
 
     /**
      * Extract the command buffer from a from a {@link StatefulConnection}.
-     * 
+     *
      * @param connection the connection
      * @return the queue
      */
@@ -109,7 +108,7 @@ public static Queue<Object> getCommandBuffer(StatefulConnection<?, ?> connection
 
     /**
      * Extract the connection state from a from a {@link StatefulConnection}.
-     * 
+     *
      * @param connection the connection
      * @return the connection state as {@link String}
      */
diff --git a/src/test/java/com/lambdaworks/Delay.java b/src/test/java/io/lettuce/Delay.java
similarity index 91%
rename from src/test/java/com/lambdaworks/Delay.java
rename to src/test/java/io/lettuce/Delay.java
index 4935f3646e..e03006baae 100644
--- a/src/test/java/com/lambdaworks/Delay.java
+++ b/src/test/java/io/lettuce/Delay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks;
+package io.lettuce;
 
 import com.google.code.tempusfugit.temporal.Duration;
 
diff --git a/src/test/java/com/lambdaworks/Futures.java b/src/test/java/io/lettuce/Futures.java
similarity index 92%
rename from src/test/java/com/lambdaworks/Futures.java
rename to src/test/java/io/lettuce/Futures.java
index ae34ff2605..f60a9aa329 100644
--- a/src/test/java/com/lambdaworks/Futures.java
+++ b/src/test/java/io/lettuce/Futures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks;
+package io.lettuce;
 
 import java.lang.reflect.Constructor;
 import java.net.SocketAddress;
@@ -21,7 +21,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 
-import com.lambdaworks.redis.ConnectionFuture;
+import io.lettuce.core.ConnectionFuture;
 
 /**
  * Utility methods to synchronize and create futures.
@@ -58,7 +58,7 @@ public static boolean areAllCompleted(Collection<? extends Future<?>> futures) {
     public static <T> ConnectionFuture<T> createConnectionFuture(SocketAddress socketAddress, CompletableFuture<T> decorated) {
 
         try {
-            Class<ConnectionFuture> futureClass = (Class) Class.forName("com.lambdaworks.redis.DefaultConnectionFuture");
+            Class<ConnectionFuture> futureClass = (Class) Class.forName("io.lettuce.core.DefaultConnectionFuture");
             Constructor<ConnectionFuture> constructor = futureClass.getDeclaredConstructor(SocketAddress.class,
                     CompletableFuture.class);
             constructor.setAccessible(true);
diff --git a/src/test/java/com/lambdaworks/KeysAndValues.java b/src/test/java/io/lettuce/KeysAndValues.java
similarity index 95%
rename from src/test/java/com/lambdaworks/KeysAndValues.java
rename to src/test/java/io/lettuce/KeysAndValues.java
index 381969f309..4dadc9598b 100644
--- a/src/test/java/com/lambdaworks/KeysAndValues.java
+++ b/src/test/java/io/lettuce/KeysAndValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks;
+package io.lettuce;
 
 import java.util.*;
 
 /**
  * Keys for testing slot-hashes.
- * 
+ *
  * @author Mark Paluch
  */
 public class KeysAndValues {
diff --git a/src/test/java/com/lambdaworks/LoggingTestRule.java b/src/test/java/io/lettuce/LoggingTestRule.java
similarity index 98%
rename from src/test/java/com/lambdaworks/LoggingTestRule.java
rename to src/test/java/io/lettuce/LoggingTestRule.java
index a1c054c78a..389ffedb9f 100644
--- a/src/test/java/com/lambdaworks/LoggingTestRule.java
+++ b/src/test/java/io/lettuce/LoggingTestRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks;
+package io.lettuce;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
diff --git a/src/test/java/com/lambdaworks/Sockets.java b/src/test/java/io/lettuce/Sockets.java
similarity index 93%
rename from src/test/java/com/lambdaworks/Sockets.java
rename to src/test/java/io/lettuce/Sockets.java
index 63f0f73987..5d538f7606 100644
--- a/src/test/java/com/lambdaworks/Sockets.java
+++ b/src/test/java/io/lettuce/Sockets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks;
+package io.lettuce;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/src/test/java/com/lambdaworks/SslTest.java b/src/test/java/io/lettuce/SslTest.java
similarity index 94%
rename from src/test/java/com/lambdaworks/SslTest.java
rename to src/test/java/io/lettuce/SslTest.java
index a92a36d2f0..90e08c2697 100644
--- a/src/test/java/com/lambdaworks/SslTest.java
+++ b/src/test/java/io/lettuce/SslTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks;
+package io.lettuce;
 
-import static com.lambdaworks.redis.TestSettings.host;
-import static com.lambdaworks.redis.TestSettings.sslPort;
+import static io.lettuce.core.TestSettings.host;
+import static io.lettuce.core.TestSettings.sslPort;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 import static org.junit.Assume.assumeTrue;
@@ -29,12 +29,11 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
-import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
-
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
+import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands;
 import io.netty.handler.codec.DecoderException;
 import io.netty.handler.ssl.OpenSsl;
 
diff --git a/src/test/java/com/lambdaworks/TestClientResources.java b/src/test/java/io/lettuce/TestClientResources.java
similarity index 79%
rename from src/test/java/com/lambdaworks/TestClientResources.java
rename to src/test/java/io/lettuce/TestClientResources.java
index 58b102d60a..ca37871fe7 100644
--- a/src/test/java/com/lambdaworks/TestClientResources.java
+++ b/src/test/java/io/lettuce/TestClientResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks;
+package io.lettuce;
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.TestEventLoopGroupProvider;
-import com.lambdaworks.redis.resource.ClientResources;
-import com.lambdaworks.redis.resource.DefaultClientResources;
+import io.lettuce.core.TestEventLoopGroupProvider;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.DefaultClientResources;
 
 /**
- * Client-Resources suitable for testing. Uses {@link com.lambdaworks.redis.TestEventLoopGroupProvider} to preserve the event
- * loop groups between tests. Every time a new {@link TestClientResources} instance is created, shutdown hook is added
+ * Client-Resources suitable for testing. Uses {@link io.lettuce.core.TestEventLoopGroupProvider} to preserve the event loop
+ * groups between tests. Every time a new {@link TestClientResources} instance is created, shutdown hook is added
  * {@link Runtime#addShutdownHook(Thread)}.
- * 
+ *
  * @author Mark Paluch
  */
 public class TestClientResources {
@@ -36,7 +36,7 @@ public class TestClientResources {
     /**
      * Creates a new {@link ClientResources} instance and registers a shutdown hook to de-allocate the instance upon JVM
      * shutdown.
-     * 
+     *
      * @return a new {@link ClientResources} instance.
      */
     public static ClientResources create() {
diff --git a/src/test/java/com/lambdaworks/Wait.java b/src/test/java/io/lettuce/Wait.java
similarity index 91%
rename from src/test/java/com/lambdaworks/Wait.java
rename to src/test/java/io/lettuce/Wait.java
index 1769839df9..6120b17dc8 100644
--- a/src/test/java/com/lambdaworks/Wait.java
+++ b/src/test/java/io/lettuce/Wait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks;
+package io.lettuce;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
@@ -27,14 +27,14 @@
 
 /**
  * Wait-Until helper.
- * 
+ *
  * @author Mark Paluch
  */
 public class Wait {
 
     /**
-     * Initialize a {@link com.lambdaworks.Wait.WaitBuilder} to wait until the {@code supplier} supplies {@literal true}
-     * 
+     * Initialize a {@link Wait.WaitBuilder} to wait until the {@code supplier} supplies {@literal true}
+     *
      * @param supplier
      * @return
      */
@@ -48,8 +48,8 @@ public static WaitBuilder<Boolean> untilTrue(Supplier<Boolean> supplier) {
     }
 
     /**
-     * Initialize a {@link com.lambdaworks.Wait.WaitBuilder} to wait until the {@code condition} does not throw exceptions
-     * 
+     * Initialize a {@link Wait.WaitBuilder} to wait until the {@code condition} does not throw exceptions
+     *
      * @param condition
      * @return
      */
@@ -73,9 +73,9 @@ public static WaitBuilder<?> untilNoException(VoidWaitCondition condition) {
     }
 
     /**
-     * Initialize a {@link com.lambdaworks.Wait.WaitBuilder} to wait until the {@code actualSupplier} provides an object that is
-     * not equal to {@code expectation}
-     * 
+     * Initialize a {@link Wait.WaitBuilder} to wait until the {@code actualSupplier} provides an object that is not equal to
+     * {@code expectation}
+     *
      * @param expectation
      * @param actualSupplier
      * @param <T>
@@ -115,8 +115,8 @@ public static <T> WaitBuilder<T> untilNotEquals(T expectation, Supplier<T> actua
     }
 
     /**
-     * Initialize a {@link com.lambdaworks.Wait.WaitBuilder} to wait until the {@code actualSupplier} provides an object that is
-     * not equal to {@code expectation}
+     * Initialize a {@link Wait.WaitBuilder} to wait until the {@code actualSupplier} provides an object that is not equal to
+     * {@code expectation}
      *
      * @param expectation
      * @param actualSupplier
diff --git a/src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java b/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
similarity index 99%
rename from src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java
rename to src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
index 1954e5d566..8c7460bcc5 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CompilationUnitFactory.java
+++ b/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.apigenerator;
+package io.lettuce.apigenerator;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/src/test/java/com/lambdaworks/apigenerator/Constants.java b/src/test/java/io/lettuce/apigenerator/Constants.java
similarity index 96%
rename from src/test/java/com/lambdaworks/apigenerator/Constants.java
rename to src/test/java/io/lettuce/apigenerator/Constants.java
index 26535efaf5..9c01e624ad 100644
--- a/src/test/java/com/lambdaworks/apigenerator/Constants.java
+++ b/src/test/java/io/lettuce/apigenerator/Constants.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.apigenerator;
+package io.lettuce.apigenerator;
 
 import java.io.File;
 
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
similarity index 92%
rename from src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java
rename to src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
index a0cb4c791e..5edc38a276 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.apigenerator;
+package io.lettuce.apigenerator;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -32,7 +32,8 @@
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.ast.type.ReferenceType;
 import com.github.javaparser.ast.type.Type;
-import com.lambdaworks.redis.internal.LettuceSets;
+
+import io.lettuce.core.internal.LettuceSets;
 
 /**
  * Create async API based on the templates.
@@ -69,9 +70,9 @@ public CreateAsyncApi(String templateName) {
         String targetPackage;
 
         if (templateName.contains("RedisSentinel")) {
-            targetPackage = "com.lambdaworks.redis.sentinel.api.async";
+            targetPackage = "io.lettuce.core.sentinel.api.async";
         } else {
-            targetPackage = "com.lambdaworks.redis.api.async";
+            targetPackage = "io.lettuce.core.api.async";
         }
 
         factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(),
@@ -116,7 +117,7 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
      * @return
      */
     protected Supplier<List<String>> importSupplier() {
-        return () -> Collections.singletonList("com.lambdaworks.redis.RedisFuture");
+        return () -> Collections.singletonList("io.lettuce.core.RedisFuture");
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
similarity index 94%
rename from src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
rename to src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
index 571d6f0aa2..c2177c4c6c 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateAsyncNodeSelectionClusterApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.apigenerator;
+package io.lettuce.apigenerator;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -33,7 +33,8 @@
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.ast.type.ReferenceType;
 import com.github.javaparser.ast.type.Type;
-import com.lambdaworks.redis.internal.LettuceSets;
+
+import io.lettuce.core.internal.LettuceSets;
 
 /**
  * Create async API based on the templates.
@@ -69,7 +70,7 @@ public CreateAsyncNodeSelectionClusterApi(String templateName) {
 
         String targetName = templateName.replace("Commands", "AsyncCommands").replace("Redis", "NodeSelection");
         File templateFile = new File(Constants.TEMPLATES, "com/lambdaworks/redis/api/" + templateName + ".java");
-        String targetPackage = "com.lambdaworks.redis.cluster.api.async";
+        String targetPackage = "io.lettuce.core.cluster.api.async";
 
         factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(),
                 methodTypeMutator(), methodFilter(), importSupplier(), null, null);
@@ -130,7 +131,7 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
      * @return
      */
     protected Supplier<List<String>> importSupplier() {
-        return () -> Collections.singletonList("com.lambdaworks.redis.RedisFuture");
+        return () -> Collections.singletonList("io.lettuce.core.RedisFuture");
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
similarity index 95%
rename from src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
rename to src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
index dae8a7b7ef..2eecf76a80 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateReactiveApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.apigenerator;
+package io.lettuce.apigenerator;
 
 import java.io.File;
 import java.util.*;
 import java.util.function.Function;
-import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 import org.junit.Test;
@@ -31,11 +30,12 @@
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.ast.type.ReferenceType;
 import com.github.javaparser.ast.type.Type;
-import com.lambdaworks.redis.internal.LettuceSets;
+
+import io.lettuce.core.internal.LettuceSets;
 
 /**
  * Create reactive API based on the templates.
- * 
+ *
  * @author Mark Paluch
  */
 @RunWith(Parameterized.class)
@@ -80,9 +80,9 @@ public CreateReactiveApi(String templateName) {
         String targetPackage;
 
         if (templateName.contains("RedisSentinel")) {
-            targetPackage = "com.lambdaworks.redis.sentinel.api.reactive";
+            targetPackage = "io.lettuce.core.sentinel.api.reactive";
         } else {
-            targetPackage = "com.lambdaworks.redis.api.reactive";
+            targetPackage = "io.lettuce.core.api.reactive";
         }
 
         factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(),
@@ -91,7 +91,7 @@ public CreateReactiveApi(String templateName) {
 
     /**
      * Mutate type comment.
-     * 
+     *
      * @return
      */
     protected Function<String, String> commentMutator() {
@@ -111,7 +111,7 @@ protected Function<Comment, Comment> methodCommentMutator() {
 
     /**
      * Mutate type to async result.
-     * 
+     *
      * @return
      */
     protected Function<MethodDeclaration, Type> methodTypeMutator() {
@@ -170,7 +170,7 @@ private String getResultType(MethodDeclaration method,
 
     /**
      * Supply additional imports.
-     * 
+     *
      * @return
      */
     protected Supplier<List<String>> importSupplier() {
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
similarity index 93%
rename from src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java
rename to src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
index 843dff8191..06d19c6fd5 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateSyncApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.apigenerator;
+package io.lettuce.apigenerator;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -24,18 +24,19 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
-import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
-import com.lambdaworks.redis.internal.LettuceSets;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.body.MethodDeclaration;
 import com.github.javaparser.ast.type.Type;
 
+import io.lettuce.core.internal.LettuceSets;
+
 /**
  * Create sync API based on the templates.
- * 
+ *
  * @author Mark Paluch
  */
 @RunWith(Parameterized.class)
@@ -67,9 +68,9 @@ public CreateSyncApi(String templateName) {
         String targetPackage;
 
         if (templateName.contains("RedisSentinel")) {
-            targetPackage = "com.lambdaworks.redis.sentinel.api.sync";
+            targetPackage = "io.lettuce.core.sentinel.api.sync";
         } else {
-            targetPackage = "com.lambdaworks.redis.api.sync";
+            targetPackage = "io.lettuce.core.api.sync";
         }
 
         factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(),
@@ -78,7 +79,7 @@ public CreateSyncApi(String templateName) {
 
     /**
      * Mutate type comment.
-     * 
+     *
      * @return
      */
     protected Function<String, String> commentMutator() {
@@ -105,7 +106,7 @@ protected Predicate<MethodDeclaration> methodFilter() {
 
     /**
      * Mutate type to async result.
-     * 
+     *
      * @return
      */
     protected Function<MethodDeclaration, Type> methodTypeMutator() {
@@ -114,7 +115,7 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
 
     /**
      * Supply additional imports.
-     * 
+     *
      * @return
      */
     protected Supplier<List<String>> importSupplier() {
diff --git a/src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
similarity index 96%
rename from src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java
rename to src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
index 990c6025c1..19cc29ecb8 100644
--- a/src/test/java/com/lambdaworks/apigenerator/CreateSyncNodeSelectionClusterApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.apigenerator;
+package io.lettuce.apigenerator;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -33,7 +33,8 @@
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.ast.type.ReferenceType;
 import com.github.javaparser.ast.type.Type;
-import com.lambdaworks.redis.internal.LettuceSets;
+
+import io.lettuce.core.internal.LettuceSets;
 
 /**
  * Create sync API based on the templates.
@@ -69,7 +70,7 @@ public CreateSyncNodeSelectionClusterApi(String templateName) {
 
         String targetName = templateName.replace("Redis", "NodeSelection");
         File templateFile = new File(Constants.TEMPLATES, "com/lambdaworks/redis/api/" + templateName + ".java");
-        String targetPackage = "com.lambdaworks.redis.cluster.api.sync";
+        String targetPackage = "io.lettuce.core.cluster.api.sync";
 
         // todo: remove AutoCloseable from BaseNodeSelectionAsyncCommands
         factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(),
diff --git a/src/test/java/com/lambdaworks/apigenerator/GenerateCommandInterfaces.java b/src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java
similarity index 96%
rename from src/test/java/com/lambdaworks/apigenerator/GenerateCommandInterfaces.java
rename to src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java
index e3e25f79b2..158bd79ba1 100644
--- a/src/test/java/com/lambdaworks/apigenerator/GenerateCommandInterfaces.java
+++ b/src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.apigenerator;
+package io.lettuce.apigenerator;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 /**
  * Entrypoint to generate all Redis command interfaces from {@code src/main/templates}.
- * 
+ *
  * @author Mark Paluch
  */
 @RunWith(Suite.class)
diff --git a/src/test/java/com/lambdaworks/category/SlowTests.java b/src/test/java/io/lettuce/category/SlowTests.java
similarity index 95%
rename from src/test/java/com/lambdaworks/category/SlowTests.java
rename to src/test/java/io/lettuce/category/SlowTests.java
index 77d4836f2c..7b173ad8f5 100644
--- a/src/test/java/com/lambdaworks/category/SlowTests.java
+++ b/src/test/java/io/lettuce/category/SlowTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.category;
+package io.lettuce.category;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/codec/CRC16Test.java b/src/test/java/io/lettuce/codec/CRC16Test.java
similarity index 97%
rename from src/test/java/com/lambdaworks/codec/CRC16Test.java
rename to src/test/java/io/lettuce/codec/CRC16Test.java
index 94399b7df0..e0338dec1b 100644
--- a/src/test/java/com/lambdaworks/codec/CRC16Test.java
+++ b/src/test/java/io/lettuce/codec/CRC16Test.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.codec;
+package io.lettuce.codec;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -24,6 +24,8 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import io.lettuce.core.codec.CRC16;
+
 @RunWith(Parameterized.class)
 public class CRC16Test {
 
diff --git a/src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
similarity index 94%
rename from src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java
rename to src/test/java/io/lettuce/core/AbstractRedisClientTest.java
index 23a4b3d9c7..3343eb58e5 100644
--- a/src/test/java/com/lambdaworks/redis/AbstractRedisClientTest.java
+++ b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.api.StatefulConnection;
+import io.lettuce.TestClientResources;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
+import io.lettuce.core.api.sync.RedisCommands;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/com/lambdaworks/redis/AbstractTest.java b/src/test/java/io/lettuce/core/AbstractTest.java
similarity index 94%
rename from src/test/java/com/lambdaworks/redis/AbstractTest.java
rename to src/test/java/io/lettuce/core/AbstractTest.java
index df3e32a3c7..5cafe4fc3e 100644
--- a/src/test/java/com/lambdaworks/redis/AbstractTest.java
+++ b/src/test/java/io/lettuce/core/AbstractTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.Arrays;
 import java.util.List;
@@ -23,8 +23,8 @@
 import org.apache.logging.log4j.Logger;
 import org.junit.Rule;
 
-import com.lambdaworks.LoggingTestRule;
-import com.lambdaworks.redis.internal.LettuceSets;
+import io.lettuce.LoggingTestRule;
+import io.lettuce.core.internal.LettuceSets;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java b/src/test/java/io/lettuce/core/AllTheAPIsTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java
rename to src/test/java/io/lettuce/core/AllTheAPIsTest.java
index 313807ae8b..1c103c7431 100644
--- a/src/test/java/com/lambdaworks/redis/AllTheAPIsTest.java
+++ b/src/test/java/io/lettuce/core/AllTheAPIsTest.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import com.lambdaworks.TestClientResources;
+import io.lettuce.TestClientResources;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.async.AsyncNodeSelection;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.async.AsyncNodeSelection;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java b/src/test/java/io/lettuce/core/AsyncConnectionTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java
rename to src/test/java/io/lettuce/core/AsyncConnectionTest.java
index 3805e1a61a..3ce0bdbfc1 100644
--- a/src/test/java/com/lambdaworks/redis/AsyncConnectionTest.java
+++ b/src/test/java/io/lettuce/core/AsyncConnectionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.async.RedisAsyncCommands;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java b/src/test/java/io/lettuce/core/ClientMetricsTest.java
similarity index 88%
rename from src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
rename to src/test/java/io/lettuce/core/ClientMetricsTest.java
index 08eb79f874..fe2529c680 100644
--- a/src/test/java/com/lambdaworks/redis/ClientMetricsTest.java
+++ b/src/test/java/io/lettuce/core/ClientMetricsTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.redis.AbstractRedisClientTest.client;
+import static io.lettuce.core.AbstractRedisClientTest.client;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
@@ -33,14 +33,14 @@
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.event.EventBus;
-import com.lambdaworks.redis.event.metrics.CommandLatencyEvent;
-import com.lambdaworks.redis.event.metrics.MetricEventPublisher;
-import com.lambdaworks.redis.metrics.CommandLatencyId;
-import com.lambdaworks.redis.metrics.CommandMetrics;
+import io.lettuce.TestClientResources;
+import io.lettuce.Wait;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.event.EventBus;
+import io.lettuce.core.event.metrics.CommandLatencyEvent;
+import io.lettuce.core.event.metrics.MetricEventPublisher;
+import io.lettuce.core.metrics.CommandLatencyId;
+import io.lettuce.core.metrics.CommandMetrics;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java b/src/test/java/io/lettuce/core/ClientOptionsTest.java
similarity index 96%
rename from src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
rename to src/test/java/io/lettuce/core/ClientOptionsTest.java
index cca2db8f1f..fadd50f8e7 100644
--- a/src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.ConnectionTestUtil.getChannel;
-import static com.lambdaworks.ConnectionTestUtil.getConnectionWatchdog;
+import static io.lettuce.ConnectionTestUtil.getChannel;
+import static io.lettuce.ConnectionTestUtil.getConnectionWatchdog;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
@@ -25,13 +25,13 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.*;
+import io.lettuce.Wait;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.*;
 
 import io.netty.channel.Channel;
 
diff --git a/src/test/java/com/lambdaworks/redis/ClientTest.java b/src/test/java/io/lettuce/core/ClientTest.java
similarity index 94%
rename from src/test/java/com/lambdaworks/redis/ClientTest.java
rename to src/test/java/io/lettuce/core/ClientTest.java
index 0480b83854..898f70bf79 100644
--- a/src/test/java/com/lambdaworks/redis/ClientTest.java
+++ b/src/test/java/io/lettuce/core/ClientTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -25,13 +25,13 @@
 import org.junit.rules.ExpectedException;
 import org.junit.runners.MethodSorters;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandWrapper;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.TestClientResources;
+import io.lettuce.Wait;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandWrapper;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java b/src/test/java/io/lettuce/core/ConnectionCommandTest.java
similarity index 96%
rename from src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
rename to src/test/java/io/lettuce/core/ConnectionCommandTest.java
index 342a450f9b..6825bcd175 100644
--- a/src/test/java/com/lambdaworks/redis/ConnectionCommandTest.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -25,9 +25,9 @@
 import org.junit.runners.MethodSorters;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.sync.RedisCommands;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/com/lambdaworks/redis/CustomCodecTest.java b/src/test/java/io/lettuce/core/CustomCodecTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/CustomCodecTest.java
rename to src/test/java/io/lettuce/core/CustomCodecTest.java
index ff60315e10..674b9a9626 100644
--- a/src/test/java/com/lambdaworks/redis/CustomCodecTest.java
+++ b/src/test/java/io/lettuce/core/CustomCodecTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -26,11 +26,11 @@
 
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.codec.ByteArrayCodec;
-import com.lambdaworks.redis.codec.CompressionCodec;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.codec.CompressionCodec;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/com/lambdaworks/redis/DefaultRedisClient.java b/src/test/java/io/lettuce/core/DefaultRedisClient.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/DefaultRedisClient.java
rename to src/test/java/io/lettuce/core/DefaultRedisClient.java
index c539c20314..e2ad0a3b0e 100644
--- a/src/test/java/com/lambdaworks/redis/DefaultRedisClient.java
+++ b/src/test/java/io/lettuce/core/DefaultRedisClient.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.concurrent.TimeUnit;
 
@@ -38,7 +38,7 @@ public void run() {
 
     /**
      * Do not close the client.
-     * 
+     *
      * @return the default redis client for the tests.
      */
     public static RedisClient get() {
diff --git a/src/test/java/com/lambdaworks/redis/FastShutdown.java b/src/test/java/io/lettuce/core/FastShutdown.java
similarity index 92%
rename from src/test/java/com/lambdaworks/redis/FastShutdown.java
rename to src/test/java/io/lettuce/core/FastShutdown.java
index 8f8a67b57d..d6f8192661 100644
--- a/src/test/java/com/lambdaworks/redis/FastShutdown.java
+++ b/src/test/java/io/lettuce/core/FastShutdown.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * @author Mark Paluch
@@ -26,7 +26,7 @@ public class FastShutdown {
 
     /**
      * Shut down a {@link AbstractRedisClient} with a timeout of 10ms.
-     * 
+     *
      * @param redisClient
      */
     public static void shutdown(AbstractRedisClient redisClient) {
diff --git a/src/test/java/com/lambdaworks/redis/GeoModelTest.java b/src/test/java/io/lettuce/core/GeoModelTest.java
similarity index 99%
rename from src/test/java/com/lambdaworks/redis/GeoModelTest.java
rename to src/test/java/io/lettuce/core/GeoModelTest.java
index be531c99bd..89e3d0a11c 100644
--- a/src/test/java/com/lambdaworks/redis/GeoModelTest.java
+++ b/src/test/java/io/lettuce/core/GeoModelTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.*;
 
diff --git a/src/test/java/com/lambdaworks/redis/JavaRuntimeTest.java b/src/test/java/io/lettuce/core/JavaRuntimeTest.java
similarity index 90%
rename from src/test/java/com/lambdaworks/redis/JavaRuntimeTest.java
rename to src/test/java/io/lettuce/core/JavaRuntimeTest.java
index 76d6b69888..8a6bed4596 100644
--- a/src/test/java/com/lambdaworks/redis/JavaRuntimeTest.java
+++ b/src/test/java/io/lettuce/core/JavaRuntimeTest.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.startsWith;
 import static org.junit.Assume.assumeThat;
 
-import com.lambdaworks.redis.internal.LettuceClassUtils;
+import io.lettuce.core.internal.LettuceClassUtils;
 import org.junit.Test;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 public class JavaRuntimeTest {
 
diff --git a/src/test/java/com/lambdaworks/redis/KeyValueStreamingAdapter.java b/src/test/java/io/lettuce/core/KeyValueStreamingAdapter.java
similarity index 88%
rename from src/test/java/com/lambdaworks/redis/KeyValueStreamingAdapter.java
rename to src/test/java/io/lettuce/core/KeyValueStreamingAdapter.java
index 038cb6a7c1..d9ae72d1f3 100644
--- a/src/test/java/com/lambdaworks/redis/KeyValueStreamingAdapter.java
+++ b/src/test/java/io/lettuce/core/KeyValueStreamingAdapter.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.KeyValueStreamingChannel;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.KeyValueStreamingChannel;
 
 /**
  * Adapter for a {@link KeyStreamingChannel}. Stores the output in a map.
- * 
+ *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/KeyValueTest.java b/src/test/java/io/lettuce/core/KeyValueTest.java
similarity index 99%
rename from src/test/java/com/lambdaworks/redis/KeyValueTest.java
rename to src/test/java/io/lettuce/core/KeyValueTest.java
index 99e53789ee..4e4a3bb978 100644
--- a/src/test/java/com/lambdaworks/redis/KeyValueTest.java
+++ b/src/test/java/io/lettuce/core/KeyValueTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/LettuceFuturesTest.java b/src/test/java/io/lettuce/core/LettuceFuturesTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/LettuceFuturesTest.java
rename to src/test/java/io/lettuce/core/LettuceFuturesTest.java
index aa605c13d9..cb7bd91051 100644
--- a/src/test/java/com/lambdaworks/redis/LettuceFuturesTest.java
+++ b/src/test/java/io/lettuce/core/LettuceFuturesTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/com/lambdaworks/redis/LimitTest.java b/src/test/java/io/lettuce/core/LimitTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/LimitTest.java
rename to src/test/java/io/lettuce/core/LimitTest.java
index e6f3e75f80..cbcbf1fc16 100644
--- a/src/test/java/com/lambdaworks/redis/LimitTest.java
+++ b/src/test/java/io/lettuce/core/LimitTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/ListStreamingAdapter.java b/src/test/java/io/lettuce/core/ListStreamingAdapter.java
similarity index 86%
rename from src/test/java/com/lambdaworks/redis/ListStreamingAdapter.java
rename to src/test/java/io/lettuce/core/ListStreamingAdapter.java
index 9129f0c6fc..271dade297 100644
--- a/src/test/java/com/lambdaworks/redis/ListStreamingAdapter.java
+++ b/src/test/java/io/lettuce/core/ListStreamingAdapter.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
-import com.lambdaworks.redis.output.KeyStreamingChannel;
-import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
-import com.lambdaworks.redis.output.ValueStreamingChannel;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.ScoredValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Streaming adapter which stores every key or/and value in a list. This adapter can be used in KeyStreamingChannels and
  * ValueStreamingChannels.
- * 
+ *
  * @author Mark Paluch
  * @param <T> Value-Type.
  * @since 3.0
diff --git a/src/test/java/com/lambdaworks/redis/PipeliningTest.java b/src/test/java/io/lettuce/core/PipeliningTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/PipeliningTest.java
rename to src/test/java/io/lettuce/core/PipeliningTest.java
index 36fb41036f..2353ea4139 100644
--- a/src/test/java/com/lambdaworks/redis/PipeliningTest.java
+++ b/src/test/java/io/lettuce/core/PipeliningTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -23,8 +23,8 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.async.RedisAsyncCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/PrivateAccessorTest.java b/src/test/java/io/lettuce/core/PrivateAccessorTest.java
similarity index 81%
rename from src/test/java/com/lambdaworks/redis/PrivateAccessorTest.java
rename to src/test/java/io/lettuce/core/PrivateAccessorTest.java
index 95908f1b16..c4ae7f168e 100644
--- a/src/test/java/com/lambdaworks/redis/PrivateAccessorTest.java
+++ b/src/test/java/io/lettuce/core/PrivateAccessorTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -26,15 +26,15 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.lambdaworks.codec.Base16;
-import com.lambdaworks.codec.CRC16;
-import com.lambdaworks.redis.cluster.SlotHash;
-import com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser;
-import com.lambdaworks.redis.cluster.models.slots.ClusterSlotsParser;
-import com.lambdaworks.redis.internal.LettuceLists;
-import com.lambdaworks.redis.models.command.CommandDetailParser;
-import com.lambdaworks.redis.models.role.RoleParser;
-import com.lambdaworks.redis.protocol.LettuceCharsets;
+import io.lettuce.core.codec.Base16;
+import io.lettuce.core.codec.CRC16;
+import io.lettuce.core.cluster.SlotHash;
+import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser;
+import io.lettuce.core.cluster.models.slots.ClusterSlotsParser;
+import io.lettuce.core.internal.LettuceLists;
+import io.lettuce.core.models.command.CommandDetailParser;
+import io.lettuce.core.models.role.RoleParser;
+import io.lettuce.core.protocol.LettuceCharsets;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/RangeTest.java b/src/test/java/io/lettuce/core/RangeTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/RangeTest.java
rename to src/test/java/io/lettuce/core/RangeTest.java
index 44d5726b1d..6b5a2b04e6 100644
--- a/src/test/java/com/lambdaworks/redis/RangeTest.java
+++ b/src/test/java/io/lettuce/core/RangeTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.redis.Range.Boundary.excluding;
-import static com.lambdaworks.redis.Range.Boundary.including;
+import static io.lettuce.core.Range.Boundary.excluding;
+import static io.lettuce.core.Range.Boundary.including;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveBackpressurePropagationTest.java b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/ReactiveBackpressurePropagationTest.java
rename to src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
index 8d9f3284b8..eb53b6ad23 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveBackpressurePropagationTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
@@ -32,12 +32,12 @@
 import reactor.core.publisher.Flux;
 import reactor.core.scheduler.Schedulers;
 
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.metrics.CommandLatencyCollector;
-import com.lambdaworks.redis.output.ValueListOutput;
-import com.lambdaworks.redis.protocol.*;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.metrics.CommandLatencyCollector;
+import io.lettuce.core.output.ValueListOutput;
+import io.lettuce.core.protocol.*;
+import io.lettuce.core.resource.ClientResources;
 
 import io.netty.buffer.Unpooled;
 import io.netty.channel.embedded.EmbeddedChannel;
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java b/src/test/java/io/lettuce/core/ReactiveConnectionTest.java
similarity index 96%
rename from src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
rename to src/test/java/io/lettuce/core/ReactiveConnectionTest.java
index 2587d3d824..6addd2b657 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveConnectionTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveConnectionTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static com.google.code.tempusfugit.temporal.Duration.millis;
-import static com.lambdaworks.redis.ClientOptions.DisconnectedBehavior.REJECT_COMMANDS;
+import static io.lettuce.core.ClientOptions.DisconnectedBehavior.REJECT_COMMANDS;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
@@ -36,10 +36,10 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.Delay;
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
+import io.lettuce.Delay;
+import io.lettuce.Wait;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
 
 public class ReactiveConnectionTest extends AbstractRedisClientTest {
 
diff --git a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java b/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java
similarity index 94%
rename from src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
rename to src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java
index 14714f2e74..b6f9009de6 100644
--- a/src/test/java/com/lambdaworks/redis/ReactiveStreamingOutputTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -28,10 +28,10 @@
 
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.KeysAndValues;
-import com.lambdaworks.redis.GeoArgs.Unit;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
+import io.lettuce.KeysAndValues;
+import io.lettuce.core.GeoArgs.Unit;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java b/src/test/java/io/lettuce/core/RedisClientConnectionTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java
rename to src/test/java/io/lettuce/core/RedisClientConnectionTest.java
index 90e8fdf9d8..310e71bd48 100644
--- a/src/test/java/com/lambdaworks/redis/RedisClientConnectionTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientConnectionTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import static com.lambdaworks.redis.RedisURI.Builder.redis;
+import static io.lettuce.core.RedisURI.Builder.redis;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 import java.util.concurrent.CompletableFuture;
@@ -27,11 +27,11 @@
 import org.junit.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
-import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/RedisClientFactoryBeanTest.java b/src/test/java/io/lettuce/core/RedisClientFactoryBeanTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/RedisClientFactoryBeanTest.java
rename to src/test/java/io/lettuce/core/RedisClientFactoryBeanTest.java
index 876b9daf08..9798137eda 100644
--- a/src/test/java/com/lambdaworks/redis/RedisClientFactoryBeanTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientFactoryBeanTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -23,7 +23,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.redis.support.RedisClientFactoryBean;
+import io.lettuce.core.support.RedisClientFactoryBean;
 
 public class RedisClientFactoryBeanTest {
     private RedisClientFactoryBean sut = new RedisClientFactoryBean();
diff --git a/src/test/java/com/lambdaworks/redis/RedisClientFactoryTest.java b/src/test/java/io/lettuce/core/RedisClientFactoryTest.java
similarity index 92%
rename from src/test/java/com/lambdaworks/redis/RedisClientFactoryTest.java
rename to src/test/java/io/lettuce/core/RedisClientFactoryTest.java
index 372bd09c7c..cfe975988d 100644
--- a/src/test/java/com/lambdaworks/redis/RedisClientFactoryTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientFactoryTest.java
@@ -13,15 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
-import com.lambdaworks.TestClientResources;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import io.lettuce.TestClientResources;
 import org.junit.Test;
 
-import com.lambdaworks.redis.resource.ClientResources;
-import com.lambdaworks.redis.resource.DefaultClientResources;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/RedisClientListenerTest.java b/src/test/java/io/lettuce/core/RedisClientListenerTest.java
similarity index 94%
rename from src/test/java/com/lambdaworks/redis/RedisClientListenerTest.java
rename to src/test/java/io/lettuce/core/RedisClientListenerTest.java
index 786e1d76c1..6b76246cfe 100644
--- a/src/test/java/com/lambdaworks/redis/RedisClientListenerTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientListenerTest.java
@@ -13,27 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
 import static com.google.code.tempusfugit.temporal.WaitFor.waitOrTimeout;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.net.SocketAddress;
-import java.util.concurrent.TimeUnit;
 
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.google.code.tempusfugit.temporal.Timeout;
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * Integration tests for {@link RedisConnectionStateListener} via {@link RedisClient}.
- * 
+ *
  * @author Mark Paluch
  */
 public class RedisClientListenerTest extends AbstractTest {
diff --git a/src/test/java/com/lambdaworks/redis/RedisClientTest.java b/src/test/java/io/lettuce/core/RedisClientTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/RedisClientTest.java
rename to src/test/java/io/lettuce/core/RedisClientTest.java
index a488f3677a..87b6bc5777 100644
--- a/src/test/java/com/lambdaworks/redis/RedisClientTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -23,9 +23,9 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.resource.ClientResources;
-import com.lambdaworks.redis.resource.DefaultClientResources;
-import com.lambdaworks.redis.resource.DefaultEventLoopGroupProvider;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.DefaultClientResources;
+import io.lettuce.core.resource.DefaultEventLoopGroupProvider;
 import io.netty.util.concurrent.EventExecutorGroup;
 
 /**
diff --git a/src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java b/src/test/java/io/lettuce/core/RedisURIBuilderTest.java
similarity index 99%
rename from src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java
rename to src/test/java/io/lettuce/core/RedisURIBuilderTest.java
index 8737991561..1f4ce6d262 100644
--- a/src/test/java/com/lambdaworks/redis/RedisURIBuilderTest.java
+++ b/src/test/java/io/lettuce/core/RedisURIBuilderTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/RedisURITest.java b/src/test/java/io/lettuce/core/RedisURITest.java
similarity index 99%
rename from src/test/java/com/lambdaworks/redis/RedisURITest.java
rename to src/test/java/io/lettuce/core/RedisURITest.java
index f0898ea236..6c4641079f 100644
--- a/src/test/java/com/lambdaworks/redis/RedisURITest.java
+++ b/src/test/java/io/lettuce/core/RedisURITest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,7 +22,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.internal.LettuceSets;
+import io.lettuce.core.internal.LettuceSets;
 import org.junit.Test;
 
 /**
diff --git a/src/test/java/com/lambdaworks/redis/ScanCursorTest.java b/src/test/java/io/lettuce/core/ScanCursorTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/ScanCursorTest.java
rename to src/test/java/io/lettuce/core/ScanCursorTest.java
index e47fbd5ceb..9d26918c95 100644
--- a/src/test/java/com/lambdaworks/redis/ScanCursorTest.java
+++ b/src/test/java/io/lettuce/core/ScanCursorTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/ScanIteratorTest.java b/src/test/java/io/lettuce/core/ScanIteratorTest.java
similarity index 99%
rename from src/test/java/com/lambdaworks/redis/ScanIteratorTest.java
rename to src/test/java/io/lettuce/core/ScanIteratorTest.java
index 911bc8462b..7e72610360 100644
--- a/src/test/java/com/lambdaworks/redis/ScanIteratorTest.java
+++ b/src/test/java/io/lettuce/core/ScanIteratorTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.AssertionsForClassTypes.fail;
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
@@ -25,7 +25,7 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.KeysAndValues;
+import io.lettuce.KeysAndValues;
 
 /**
  * @author Mark Paluch
@@ -232,4 +232,4 @@ public void zsetMultiPass() throws Exception {
 
         assertThat(values).containsAll(values);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/ScoredValueStreamingAdapter.java b/src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java
similarity index 91%
rename from src/test/java/com/lambdaworks/redis/ScoredValueStreamingAdapter.java
rename to src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java
index 1b03ac06ee..9a5ec567e8 100644
--- a/src/test/java/com/lambdaworks/redis/ScoredValueStreamingAdapter.java
+++ b/src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.output.ScoredValueStreamingChannel;
+import io.lettuce.core.output.ScoredValueStreamingChannel;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/ScoredValueTest.java b/src/test/java/io/lettuce/core/ScoredValueTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/ScoredValueTest.java
rename to src/test/java/io/lettuce/core/ScoredValueTest.java
index aec53eed3a..f2d8e5d580 100644
--- a/src/test/java/com/lambdaworks/redis/ScoredValueTest.java
+++ b/src/test/java/io/lettuce/core/ScoredValueTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.offset;
@@ -41,7 +41,7 @@ public void shouldCreateEmptyScoredValueFromOptional() {
     public void shouldCreateEmptyValue() {
 
         ScoredValue<String> value = ScoredValue.empty();
-        
+
         assertThat(value.hasValue()).isFalse();
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/SocketOptionsTest.java b/src/test/java/io/lettuce/core/SocketOptionsTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/SocketOptionsTest.java
rename to src/test/java/io/lettuce/core/SocketOptionsTest.java
index 85051e8740..f7afdde0e4 100644
--- a/src/test/java/com/lambdaworks/redis/SocketOptionsTest.java
+++ b/src/test/java/io/lettuce/core/SocketOptionsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
diff --git a/src/test/java/com/lambdaworks/redis/SyncAsyncApiConvergenceTest.java b/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/SyncAsyncApiConvergenceTest.java
rename to src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java
index 905d46c805..4817a257bf 100644
--- a/src/test/java/com/lambdaworks/redis/SyncAsyncApiConvergenceTest.java
+++ b/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -25,8 +25,8 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.sync.RedisCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/TestEventLoopGroupProvider.java b/src/test/java/io/lettuce/core/TestEventLoopGroupProvider.java
similarity index 88%
rename from src/test/java/com/lambdaworks/redis/TestEventLoopGroupProvider.java
rename to src/test/java/io/lettuce/core/TestEventLoopGroupProvider.java
index 0c5b218ec4..07d1e7becf 100644
--- a/src/test/java/com/lambdaworks/redis/TestEventLoopGroupProvider.java
+++ b/src/test/java/io/lettuce/core/TestEventLoopGroupProvider.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.resource.DefaultEventLoopGroupProvider;
+import io.lettuce.core.resource.DefaultEventLoopGroupProvider;
 
 import io.netty.util.concurrent.DefaultPromise;
 import io.netty.util.concurrent.EventExecutorGroup;
@@ -25,10 +25,10 @@
 import io.netty.util.concurrent.Promise;
 
 /**
- * A {@link com.lambdaworks.redis.resource.EventLoopGroupProvider} suitable for testing. Preserves the event loop groups between
+ * A {@link io.lettuce.core.resource.EventLoopGroupProvider} suitable for testing. Preserves the event loop groups between
  * tests. Every time a new {@link TestEventLoopGroupProvider} instance is created, shutdown hook is added
  * {@link Runtime#addShutdownHook(Thread)}.
- * 
+ *
  * @author Mark Paluch
  */
 public class TestEventLoopGroupProvider extends DefaultEventLoopGroupProvider {
diff --git a/src/test/java/com/lambdaworks/redis/TestRedisPublisher.java b/src/test/java/io/lettuce/core/TestRedisPublisher.java
similarity index 89%
rename from src/test/java/com/lambdaworks/redis/TestRedisPublisher.java
rename to src/test/java/io/lettuce/core/TestRedisPublisher.java
index ff14a1321a..fc7cd67caa 100644
--- a/src/test/java/com/lambdaworks/redis/TestRedisPublisher.java
+++ b/src/test/java/io/lettuce/core/TestRedisPublisher.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/TestSettings.java b/src/test/java/io/lettuce/core/TestSettings.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/TestSettings.java
rename to src/test/java/io/lettuce/core/TestSettings.java
index a8942940af..15359418c7 100644
--- a/src/test/java/com/lambdaworks/redis/TestSettings.java
+++ b/src/test/java/io/lettuce/core/TestSettings.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.net.Inet4Address;
 import java.net.InetAddress;
@@ -21,7 +21,7 @@
 
 /**
  * This class provides settings used while testing. You can override these using system properties.
- * 
+ *
  * @author Mark Paluch
  */
 public class TestSettings {
@@ -30,7 +30,7 @@ private TestSettings() {
     }
 
     /**
-     * 
+     *
      * @return hostname of your redis instance. Defaults to {@literal localhost}. Can be overriden with
      *         {@code -Dhost=YourHostName}
      */
diff --git a/src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java b/src/test/java/io/lettuce/core/UnixDomainSocketTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java
rename to src/test/java/io/lettuce/core/UnixDomainSocketTest.java
index b3444fd554..18ddd362b0 100644
--- a/src/test/java/com/lambdaworks/redis/UnixDomainSocketTest.java
+++ b/src/test/java/io/lettuce/core/UnixDomainSocketTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -23,7 +23,7 @@
 import java.io.IOException;
 import java.util.Locale;
 
-import com.lambdaworks.TestClientResources;
+import io.lettuce.TestClientResources;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.AfterClass;
@@ -31,10 +31,10 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.sentinel.SentinelRule;
-import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.sentinel.SentinelRule;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 
 import io.netty.util.internal.SystemPropertyUtil;
 
diff --git a/src/test/java/com/lambdaworks/redis/Utf8StringCodecTest.java b/src/test/java/io/lettuce/core/Utf8StringCodecTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/Utf8StringCodecTest.java
rename to src/test/java/io/lettuce/core/Utf8StringCodecTest.java
index 908240ae33..896d4d85f3 100644
--- a/src/test/java/com/lambdaworks/redis/Utf8StringCodecTest.java
+++ b/src/test/java/io/lettuce/core/Utf8StringCodecTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/ValueTest.java b/src/test/java/io/lettuce/core/ValueTest.java
similarity index 99%
rename from src/test/java/com/lambdaworks/redis/ValueTest.java
rename to src/test/java/io/lettuce/core/ValueTest.java
index 19fd545e11..3a3de5c5a4 100644
--- a/src/test/java/com/lambdaworks/redis/ValueTest.java
+++ b/src/test/java/io/lettuce/core/ValueTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java b/src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java
similarity index 88%
rename from src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java
rename to src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java
index dfb94151f7..6bc200e5df 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AbstractClusterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
-import com.lambdaworks.TestClientResources;
+import io.lettuce.TestClientResources;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 
-import com.lambdaworks.redis.AbstractTest;
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.internal.LettuceLists;
+import io.lettuce.core.AbstractTest;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.internal.LettuceLists;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
rename to src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
index 6631c6f848..6c10fadc5b 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -26,18 +26,18 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.lambdaworks.KeysAndValues;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
-import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.KeysAndValues;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands;
+import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
+import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
+import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * @author Mark Paluch
@@ -171,7 +171,7 @@ public void msetnxCrossSlot() throws Exception {
 
         String key = mset.keySet().iterator().next();
         Map<String, String> submap = Collections.singletonMap(key, mset.get(key));
-        
+
         assertThat(commands.msetnx(submap).get()).isTrue();
         assertThat(commands.msetnx(mset).get()).isFalse();
 
@@ -594,7 +594,7 @@ private void writeKeysToTwoNodes() {
         syncCommands.set(KEY_ON_NODE_1, value);
         syncCommands.set(KEY_ON_NODE_2, value);
     }
-    
+
     protected Map<String, String> prepareMset() {
         Map<String, String> mset = new HashMap<>();
         for (char c = 'a'; c < 'z'; c++) {
diff --git a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
similarity index 94%
rename from src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
rename to src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
index 1fe21cb9da..6f0c8616bc 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -29,16 +29,16 @@
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.KeysAndValues;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
-import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.KeysAndValues;
+import io.lettuce.core.*;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
+import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 import io.netty.util.internal.ConcurrentSet;
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ByteCodecClusterTest.java b/src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java
similarity index 87%
rename from src/test/java/com/lambdaworks/redis/cluster/ByteCodecClusterTest.java
rename to src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java
index 0180a1875a..8ec8c53cc9 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ByteCodecClusterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.codec.ByteArrayCodec;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.codec.ByteArrayCodec;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterClientOptionsTest.java b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/cluster/ClusterClientOptionsTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java
index c196599c42..4f7cfc7c4e 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterClientOptionsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandInternalsTest.java
similarity index 90%
rename from src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterCommandInternalsTest.java
index 2992b5db2d..c7251cdbb6 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandInternalsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandInternalsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.verify;
@@ -28,12 +28,12 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.AsyncCommand;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandType;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ClusterCommandInternalsTest {
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java
similarity index 90%
rename from src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java
index 67dc03b200..fc60af2542 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java
@@ -13,34 +13,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
 import static com.google.code.tempusfugit.temporal.Timeout.timeout;
-import static com.lambdaworks.redis.cluster.ClusterTestUtil.getNodeId;
+import static io.lettuce.core.cluster.ClusterTestUtil.getNodeId;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import com.lambdaworks.TestClientResources;
+import io.lettuce.TestClientResources;
 import org.junit.*;
 import org.junit.runners.MethodSorters;
 
 import com.google.code.tempusfugit.temporal.WaitFor;
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
-import com.lambdaworks.redis.cluster.models.slots.ClusterSlotRange;
-import com.lambdaworks.redis.cluster.models.slots.ClusterSlotsParser;
-import com.lambdaworks.redis.internal.LettuceLists;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.core.cluster.models.slots.ClusterSlotRange;
+import io.lettuce.core.cluster.models.slots.ClusterSlotsParser;
+import io.lettuce.core.internal.LettuceLists;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ClusterCommandTest extends AbstractClusterTest {
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterTest.java b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterTest.java
similarity index 92%
rename from src/test/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterTest.java
index d3a2bef3a7..9456b012ce 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,11 +22,11 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent;
-import com.lambdaworks.redis.internal.HostAndPort;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.cluster.ClusterConnectionProvider.Intent;
+import io.lettuce.core.internal.HostAndPort;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
similarity index 89%
rename from src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
index 57f27a1b16..5296dea0fe 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterNodeEndpointTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.fail;
@@ -31,16 +31,16 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.lambdaworks.redis.ClientOptions;
-import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.AsyncCommand;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.redis.protocol.RedisCommand;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
similarity index 91%
rename from src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
index 24cb6666c3..bf98c73a55 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterPartiallyDownTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
@@ -28,13 +28,13 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.internal.LettuceLists;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.*;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.internal.LettuceLists;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterPartitionParserTest.java b/src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/cluster/ClusterPartitionParserTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java
index 924e159c98..70a58c9f44 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterPartitionParserTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.hasItem;
@@ -25,11 +25,11 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.internal.LettuceLists;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.internal.LettuceLists;
 
 public class ClusterPartitionParserTest {
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandTest.java
similarity index 87%
rename from src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandTest.java
index aa0aa94b45..1753f5d94a 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
-import static com.lambdaworks.redis.cluster.ClusterTestUtil.getNodeId;
+import static io.lettuce.core.cluster.ClusterTestUtil.getNodeId;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
@@ -25,15 +25,15 @@
 
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.cluster.api.reactive.RedisClusterReactiveCommands;
-import com.lambdaworks.redis.cluster.models.slots.ClusterSlotRange;
-import com.lambdaworks.redis.cluster.models.slots.ClusterSlotsParser;
-import com.lambdaworks.redis.internal.LettuceLists;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands;
+import io.lettuce.core.cluster.models.slots.ClusterSlotRange;
+import io.lettuce.core.cluster.models.slots.ClusterSlotsParser;
+import io.lettuce.core.internal.LettuceLists;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SuppressWarnings("unchecked")
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterRule.java b/src/test/java/io/lettuce/core/cluster/ClusterRule.java
similarity index 91%
rename from src/test/java/com/lambdaworks/redis/cluster/ClusterRule.java
rename to src/test/java/io/lettuce/core/cluster/ClusterRule.java
index 0719a75051..31be102c4c 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterRule.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterRule.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -30,13 +30,13 @@
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.async.RedisServerAsyncCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.async.RedisServerAsyncCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
+import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
similarity index 91%
rename from src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java
rename to src/test/java/io/lettuce/core/cluster/ClusterSetup.java
index 9afc44cf56..0ec9c549fb 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterSetup.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Stream;
 
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.Wait;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands;
+import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java b/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java
similarity index 84%
rename from src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java
rename to src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java
index 32874e98f2..b0066b294c 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterTestUtil.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
-import com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.util.RoutingInvocationHandler;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.util.RoutingInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -34,7 +34,7 @@ public class ClusterTestUtil {
 
     /**
      * Retrieve the cluster node Id from the {@code connection}.
-     * 
+     *
      * @param connection
      * @return
      */
@@ -49,7 +49,7 @@ public static String getNodeId(RedisClusterCommands<?, ?> connection) {
 
     /**
      * Retrieve the {@link RedisClusterNode} from the {@code connection}.
-     * 
+     *
      * @param connection
      * @return
      */
@@ -66,7 +66,7 @@ public static RedisClusterNode getOwnPartition(RedisClusterCommands<?, ?> connec
 
     /**
      * Flush databases of all cluster nodes.
-     * 
+     *
      * @param connection the cluster connection
      */
     public static void flushDatabaseOfAllNodes(StatefulRedisClusterConnection<?, ?> connection) {
@@ -82,7 +82,7 @@ public static void flushDatabaseOfAllNodes(StatefulRedisClusterConnection<?, ?>
 
     /**
      * Create an API wrapper which exposes the {@link RedisCommands} API by using internally a cluster connection.
-     * 
+     *
      * @param connection
      * @return
      */
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptionsTest.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptionsTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java
index 6e967cbb85..c5e506ffa5 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshOptionsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -21,7 +21,7 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.cluster.ClusterTopologyRefreshOptions.RefreshTrigger;
+import io.lettuce.core.cluster.ClusterTopologyRefreshOptions.RefreshTrigger;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshSchedulerTest.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshSchedulerTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java
index 79c2fc45a0..1729852909 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ClusterTopologyRefreshSchedulerTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.never;
@@ -29,7 +29,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.resource.ClientResources;
 
 import io.netty.util.concurrent.EventExecutorGroup;
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/HealthyMajorityPartitionsConsensusTest.java b/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusTest.java
similarity index 89%
rename from src/test/java/com/lambdaworks/redis/cluster/HealthyMajorityPartitionsConsensusTest.java
rename to src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusTest.java
index a4eed8edad..a4619fdfdb 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/HealthyMajorityPartitionsConsensusTest.java
+++ b/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
-import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createMap;
-import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createNode;
-import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createPartitions;
+import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createMap;
+import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createNode;
+import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createPartitions;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
@@ -26,9 +26,9 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/KnownMajorityPartitionsConsensusTest.java b/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusTest.java
similarity index 91%
rename from src/test/java/com/lambdaworks/redis/cluster/KnownMajorityPartitionsConsensusTest.java
rename to src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusTest.java
index 1449cc017b..626683421c 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/KnownMajorityPartitionsConsensusTest.java
+++ b/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
-import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createMap;
-import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createNode;
-import static com.lambdaworks.redis.cluster.PartitionsConsensusTestSupport.createPartitions;
+import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createMap;
+import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createNode;
+import static io.lettuce.core.cluster.PartitionsConsensusTestSupport.createPartitions;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
@@ -25,9 +25,9 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java
similarity index 91%
rename from src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java
rename to src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java
index abdf8b76f2..a45b7a761d 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionAsyncTest.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
-import static com.lambdaworks.redis.ScriptOutputType.STATUS;
+import static io.lettuce.core.ScriptOutputType.STATUS;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.*;
@@ -26,17 +26,17 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.async.AsyncExecutions;
-import com.lambdaworks.redis.cluster.api.async.AsyncNodeSelection;
-import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.internal.LettuceSets;
+import io.lettuce.Wait;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.async.AsyncExecutions;
+import io.lettuce.core.cluster.api.async.AsyncNodeSelection;
+import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands;
+import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.internal.LettuceSets;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionSyncTest.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncTest.java
similarity index 91%
rename from src/test/java/com/lambdaworks/redis/cluster/NodeSelectionSyncTest.java
rename to src/test/java/io/lettuce/core/cluster/NodeSelectionSyncTest.java
index 30c9a59205..a8c5118796 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/NodeSelectionSyncTest.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncTest.java
@@ -13,30 +13,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
-import static com.lambdaworks.redis.ScriptOutputType.STATUS;
+import static io.lettuce.core.ScriptOutputType.STATUS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.internal.LettuceSets;
+import io.lettuce.core.internal.LettuceSets;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.RedisCommandExecutionException;
-import com.lambdaworks.redis.RedisCommandTimeoutException;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.sync.Executions;
-import com.lambdaworks.redis.cluster.api.sync.NodeSelection;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.Wait;
+import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.RedisCommandTimeoutException;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.sync.Executions;
+import io.lettuce.core.cluster.api.sync.NodeSelection;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/PartitionsConsensusTestSupport.java b/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java
similarity index 87%
rename from src/test/java/com/lambdaworks/redis/cluster/PartitionsConsensusTestSupport.java
rename to src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java
index 3e65683f76..73455e622d 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/PartitionsConsensusTestSupport.java
+++ b/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.*;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/PipelinedRedisFutureTest.java b/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/cluster/PipelinedRedisFutureTest.java
rename to src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureTest.java
index dd41522887..5e662ded02 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/PipelinedRedisFutureTest.java
+++ b/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
similarity index 88%
rename from src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
rename to src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
index 0c53a6c2a7..cd03233cf1 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/PooledClusterConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
@@ -37,22 +37,22 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.lambdaworks.Futures;
-import com.lambdaworks.redis.ReadFrom;
-import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.ClusterConnectionProvider.Intent;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.protocol.AsyncCommand;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.Futures;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.ClusterConnectionProvider.Intent;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ReadFromTest.java b/src/test/java/io/lettuce/core/cluster/ReadFromTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/cluster/ReadFromTest.java
rename to src/test/java/io/lettuce/core/cluster/ReadFromTest.java
index 42e92e4da3..2d3f64f041 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ReadFromTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadFromTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -24,10 +24,10 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.redis.ReadFrom;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java
similarity index 89%
rename from src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
rename to src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java
index 7aa4b7206b..839da9754d 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ReadOnlyCommandsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.redis.protocol.ProtocolKeyword;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientFactoryTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTest.java
similarity index 94%
rename from src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientFactoryTest.java
rename to src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTest.java
index 900841164d..f604fb693b 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientFactoryTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTest.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Test;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.internal.LettuceLists;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.internal.LettuceLists;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
rename to src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
index 9926601184..8f38f3712a 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
-import static com.lambdaworks.redis.RedisClientConnectionTest.CODEC;
-import static com.lambdaworks.redis.cluster.ClusterTestUtil.getOwnPartition;
+import static io.lettuce.core.RedisClientConnectionTest.CODEC;
+import static io.lettuce.core.cluster.ClusterTestUtil.getOwnPartition;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
@@ -30,20 +30,20 @@
 import org.junit.runners.MethodSorters;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.cluster.pubsub.StatefulRedisClusterPubSubConnection;
-import com.lambdaworks.redis.protocol.AsyncCommand;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection;
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SuppressWarnings("unchecked")
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterPasswordSecuredSslTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
similarity index 89%
rename from src/test/java/com/lambdaworks/redis/cluster/RedisClusterPasswordSecuredSslTest.java
rename to src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
index a7558b2bab..5c53842f94 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterPasswordSecuredSslTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
-import static com.lambdaworks.redis.TestSettings.*;
+import static io.lettuce.core.TestSettings.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.junit.Assume.*;
 
@@ -23,21 +23,21 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.lambdaworks.TestClientResources;
+import io.lettuce.TestClientResources;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.Sockets;
-import com.lambdaworks.redis.AbstractTest;
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisCommandExecutionException;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.sync.Executions;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.Sockets;
+import io.lettuce.core.AbstractTest;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.sync.Executions;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromTest.java
similarity index 89%
rename from src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
rename to src/test/java/io/lettuce/core/cluster/RedisClusterReadFromTest.java
index 9d1d82ee85..2bfa8a6f31 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterReadFromTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -21,12 +21,12 @@
 
 import org.junit.*;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.ReadFrom;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
 
 @SuppressWarnings("unchecked")
 public class RedisClusterReadFromTest extends AbstractClusterTest {
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
rename to src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
index 46a2750c0c..45994d1077 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
 import static com.google.code.tempusfugit.temporal.Timeout.timeout;
-import static com.lambdaworks.redis.cluster.AbstractClusterTest.createSlots;
-import static com.lambdaworks.redis.cluster.ClusterTestUtil.getNodeId;
-import static com.lambdaworks.redis.cluster.ClusterTestUtil.getOwnPartition;
+import static io.lettuce.core.cluster.AbstractClusterTest.createSlots;
+import static io.lettuce.core.cluster.ClusterTestUtil.getNodeId;
+import static io.lettuce.core.cluster.ClusterTestUtil.getOwnPartition;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
 
@@ -35,22 +35,22 @@
 
 import com.google.code.tempusfugit.temporal.Condition;
 import com.google.code.tempusfugit.temporal.WaitFor;
-import com.lambdaworks.ConnectionTestUtil;
-import com.lambdaworks.Futures;
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.Wait;
-import com.lambdaworks.category.SlowTests;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
-import com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.ConnectionTestUtil;
+import io.lettuce.Futures;
+import io.lettuce.TestClientResources;
+import io.lettuce.Wait;
+import io.lettuce.category.SlowTests;
+import io.lettuce.core.*;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands;
+import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * Test for mutable cluster setup scenarios.
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
similarity index 87%
rename from src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
rename to src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
index 8dc5931f8e..41ed471fbf 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterStressScenariosTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
@@ -13,37 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
 import static com.google.code.tempusfugit.temporal.Timeout.timeout;
-import static com.lambdaworks.redis.cluster.ClusterTestUtil.getOwnPartition;
+import static io.lettuce.core.cluster.ClusterTestUtil.getOwnPartition;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import com.lambdaworks.TestClientResources;
+import io.lettuce.TestClientResources;
 import org.junit.*;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.core.api.sync.RedisCommands;
 import org.junit.runners.MethodSorters;
 
 import com.google.code.tempusfugit.temporal.Duration;
 import com.google.code.tempusfugit.temporal.ThreadSleep;
 import com.google.code.tempusfugit.temporal.WaitFor;
-import com.lambdaworks.Wait;
-import com.lambdaworks.category.SlowTests;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisClusterCommands;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.Wait;
+import io.lettuce.category.SlowTests;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SuppressWarnings("unchecked")
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterURIUtilTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/cluster/RedisClusterURIUtilTest.java
rename to src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilTest.java
index 334c67e4b1..ed500ace79 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterURIUtilTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,7 +22,7 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.RedisURI;
+import io.lettuce.core.RedisURI;
 
 /**
  * @author Mark Paluch
@@ -109,4 +109,4 @@ public void testSslWithPasswordMultipleHosts() {
         assertThat(host2.getHost()).isEqualTo("host2");
         assertThat(host2.getPort()).isEqualTo(6380);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java
similarity index 88%
rename from src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java
rename to src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java
index d0cce6d98e..87f6bf9881 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RedisReactiveClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
-import static com.lambdaworks.redis.cluster.ClusterTestUtil.getOwnPartition;
+import static io.lettuce.core.cluster.ClusterTestUtil.getOwnPartition;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Collections;
@@ -25,14 +25,14 @@
 
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SuppressWarnings("unchecked")
diff --git a/src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java
rename to src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
index 1fba569461..3bfcf81ef6 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/RoundRobinSocketAddressSupplierTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
@@ -29,11 +29,11 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.resource.ClientResources;
-import com.lambdaworks.redis.resource.DnsResolvers;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.DnsResolvers;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/ScanIteratorTest.java b/src/test/java/io/lettuce/core/cluster/ScanIteratorTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/cluster/ScanIteratorTest.java
rename to src/test/java/io/lettuce/core/cluster/ScanIteratorTest.java
index 964a3963ff..b49c806a19 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/ScanIteratorTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ScanIteratorTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.AssertionsForClassTypes.fail;
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
@@ -27,13 +27,13 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.KeysAndValues;
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.ScanIterator;
-import com.lambdaworks.redis.ScoredValue;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.KeysAndValues;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.ScanArgs;
+import io.lettuce.core.ScanIterator;
+import io.lettuce.core.ScoredValue;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
 
 /**
  * @author Mark Paluch
@@ -250,4 +250,4 @@ public void zsetMultiPass() throws Exception {
 
         assertThat(values).containsAll(values);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/cluster/SlotHashTest.java b/src/test/java/io/lettuce/core/cluster/SlotHashTest.java
similarity index 96%
rename from src/test/java/com/lambdaworks/redis/cluster/SlotHashTest.java
rename to src/test/java/io/lettuce/core/cluster/SlotHashTest.java
index a27f40347b..bbd835a14a 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/SlotHashTest.java
+++ b/src/test/java/io/lettuce/core/cluster/SlotHashTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.*;
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java b/src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java
similarity index 96%
rename from src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java
rename to src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java
index 2848006669..99fc014b4d 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/SynchronizingClusterConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -31,11 +31,11 @@
 import org.springframework.util.SocketUtils;
 import org.springframework.util.StopWatch;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.ClusterNodeConnectionFactory.ConnectionKey;
-import com.lambdaworks.redis.codec.StringCodec;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.ClusterNodeConnectionFactory.ConnectionKey;
+import io.lettuce.core.codec.StringCodec;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java
similarity index 87%
rename from src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java
index 62ee954444..44300baaa9 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/CustomClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.commands;
+package io.lettuce.core.cluster.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -24,20 +24,20 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisCommandExecutionException;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.cluster.AbstractClusterTest;
-import com.lambdaworks.redis.cluster.ClusterTestUtil;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.commands.CustomCommandTest;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.*;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.cluster.AbstractClusterTest;
+import io.lettuce.core.cluster.ClusterTestUtil;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.commands.CustomCommandTest;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.*;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
similarity index 82%
rename from src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
index c9b055a9e7..466f088d8b 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/GeoClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
@@ -13,24 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.commands;
+package io.lettuce.core.cluster.commands;
 
-import static com.lambdaworks.redis.cluster.ClusterTestUtil.flushDatabaseOfAllNodes;
+import static io.lettuce.core.cluster.ClusterTestUtil.flushDatabaseOfAllNodes;
 
-import com.lambdaworks.TestClientResources;
+import io.lettuce.TestClientResources;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.ClusterTestUtil;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.commands.GeoCommandTest;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.ClusterTestUtil;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.commands.GeoCommandTest;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java
similarity index 77%
rename from src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java
index 31b560c282..da7a22cf28 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/HashClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.commands;
+package io.lettuce.core.cluster.commands;
 
-import com.lambdaworks.TestClientResources;
+import io.lettuce.TestClientResources;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.ClusterTestUtil;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.commands.HashCommandTest;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.ClusterTestUtil;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.commands.HashCommandTest;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/KeyClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
similarity index 86%
rename from src/test/java/com/lambdaworks/redis/cluster/commands/KeyClusterCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
index 564cdf8874..3feba895f0 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/KeyClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.commands;
+package io.lettuce.core.cluster.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,14 +22,14 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.ClusterTestUtil;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.ClusterTestUtil;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java
similarity index 85%
rename from src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java
index ecf7cd0b57..090569ad20 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/ListClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java
@@ -13,23 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.commands;
+package io.lettuce.core.cluster.commands;
 
-import com.lambdaworks.TestClientResources;
-import org.assertj.core.api.Assertions;
+import io.lettuce.TestClientResources;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.ClusterTestUtil;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.commands.ListCommandTest;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.ClusterTestUtil;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.commands.ListCommandTest;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java
similarity index 85%
rename from src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java
index 43e7068059..59976dfe6b 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/StringClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java
@@ -13,26 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.commands;
+package io.lettuce.core.cluster.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.*;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.*;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.ClusterTestUtil;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.commands.StringCommandTest;
-import com.lambdaworks.redis.internal.LettuceSets;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.ClusterTestUtil;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.commands.StringCommandTest;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/HashClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
similarity index 75%
rename from src/test/java/com/lambdaworks/redis/cluster/commands/reactive/HashClusterReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
index 7f2a7c10db..cf22f3ce9d 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/HashClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.commands.reactive;
+package io.lettuce.core.cluster.commands.reactive;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.ClusterTestUtil;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.commands.HashCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.ClusterTestUtil;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.commands.HashCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/KeyClusterReativeCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java
similarity index 73%
rename from src/test/java/com/lambdaworks/redis/cluster/commands/reactive/KeyClusterReativeCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java
index 4849012feb..9d30831e01 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/KeyClusterReativeCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.commands.reactive;
+package io.lettuce.core.cluster.commands.reactive;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.TestClientResources;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.ClusterTestUtil;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.commands.KeyClusterCommandTest;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.ClusterTestUtil;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.commands.KeyClusterCommandTest;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
similarity index 85%
rename from src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
index 13748e51d9..a506bc44b2 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/ListClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.commands.reactive;
+package io.lettuce.core.cluster.commands.reactive;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.ClusterTestUtil;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.commands.ListCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.ClusterTestUtil;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.commands.ListCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
similarity index 80%
rename from src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
index 1e64223e86..b4e1890fb6 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/commands/reactive/StringClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.commands.reactive;
+package io.lettuce.core.cluster.commands.reactive;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -28,17 +28,17 @@
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.ClusterTestUtil;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
-import com.lambdaworks.redis.commands.StringCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.ClusterTestUtil;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
+import io.lettuce.core.commands.StringCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/models/partitions/PartitionsTest.java b/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java
similarity index 99%
rename from src/test/java/com/lambdaworks/redis/cluster/models/partitions/PartitionsTest.java
rename to src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java
index a2aef43e2a..74e6ddc204 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/models/partitions/PartitionsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.models.partitions;
+package io.lettuce.core.cluster.models.partitions;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
@@ -23,7 +23,7 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.RedisURI;
+import io.lettuce.core.RedisURI;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNodeTest.java b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNodeTest.java
rename to src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java
index ec02b1c15f..1483f8d20c 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/models/partitions/RedisClusterNodeTest.java
+++ b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.models.partitions;
+package io.lettuce.core.cluster.models.partitions;
 
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.RedisURI;
+import io.lettuce.core.RedisURI;
 
 public class RedisClusterNodeTest {
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParserTest.java b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java
similarity index 96%
rename from src/test/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParserTest.java
rename to src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java
index 6e7281b931..b9c682b768 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/models/slots/ClusterSlotsParserTest.java
+++ b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.models.slots;
+package io.lettuce.core.cluster.models.slots;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -23,8 +23,8 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.internal.LettuceLists;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.internal.LettuceLists;
 
 @SuppressWarnings("unchecked")
 public class ClusterSlotsParserTest {
diff --git a/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubClusterTest.java b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
similarity index 89%
rename from src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubClusterTest.java
rename to src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
index b52cf8aedb..f62e0bbc8a 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubClusterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.pubsub;
+package io.lettuce.core.cluster.pubsub;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -25,17 +25,17 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.AbstractClusterTest;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.cluster.pubsub.api.async.NodeSelectionPubSubAsyncCommands;
-import com.lambdaworks.redis.cluster.pubsub.api.async.PubSubAsyncNodeSelection;
-import com.lambdaworks.redis.cluster.pubsub.api.reactive.NodeSelectionPubSubReactiveCommands;
-import com.lambdaworks.redis.cluster.pubsub.api.reactive.PubSubReactiveNodeSelection;
-import com.lambdaworks.redis.cluster.pubsub.api.sync.NodeSelectionPubSubCommands;
-import com.lambdaworks.redis.cluster.pubsub.api.sync.PubSubNodeSelection;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
-import com.lambdaworks.redis.support.PubSubTestListener;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.AbstractClusterTest;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.pubsub.api.async.NodeSelectionPubSubAsyncCommands;
+import io.lettuce.core.cluster.pubsub.api.async.PubSubAsyncNodeSelection;
+import io.lettuce.core.cluster.pubsub.api.reactive.NodeSelectionPubSubReactiveCommands;
+import io.lettuce.core.cluster.pubsub.api.reactive.PubSubReactiveNodeSelection;
+import io.lettuce.core.cluster.pubsub.api.sync.NodeSelectionPubSubCommands;
+import io.lettuce.core.cluster.pubsub.api.sync.PubSubNodeSelection;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.support.PubSubTestListener;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubConnectionTest.java b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java
similarity index 91%
rename from src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubConnectionTest.java
rename to src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java
index d3ef4ebcdf..d5012241ef 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/pubsub/PubSubConnectionTest.java
+++ b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.pubsub;
+package io.lettuce.core.cluster.pubsub;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -23,12 +23,12 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.AbstractClusterTest;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
-import com.lambdaworks.redis.support.PubSubTestListener;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.AbstractClusterTest;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.support.PubSubTestListener;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
rename to src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
index 9aa8a35752..e6c2b7fb3b 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/ClusterTopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -35,21 +35,21 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.lambdaworks.Futures;
-import com.lambdaworks.redis.ConnectionFuture;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.redis.protocol.RedisCommand;
-import com.lambdaworks.redis.resource.ClientResources;
-import com.lambdaworks.redis.resource.DnsResolvers;
+import io.lettuce.Futures;
+import io.lettuce.core.ConnectionFuture;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.DnsResolvers;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViewsTest.java b/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java
similarity index 96%
rename from src/test/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViewsTest.java
rename to src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java
index c2e1e34416..daf6843093 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/NodeTopologyViewsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,7 +22,7 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.RedisURI;
+import io.lettuce.core.RedisURI;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/RequestsTest.java b/src/test/java/io/lettuce/core/cluster/topology/RequestsTest.java
similarity index 94%
rename from src/test/java/com/lambdaworks/redis/cluster/topology/RequestsTest.java
rename to src/test/java/io/lettuce/core/cluster/topology/RequestsTest.java
index 89e62d564b..d31bd32f37 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/RequestsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/RequestsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,11 +22,11 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandType;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyComparatorsTest.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/cluster/topology/TopologyComparatorsTest.java
rename to src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsTest.java
index 4512f5c5cf..4366baafdf 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyComparatorsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsTest.java
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
-import static com.lambdaworks.redis.cluster.topology.TopologyComparators.isChanged;
+import static io.lettuce.core.cluster.topology.TopologyComparators.isChanged;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.util.Lists.newArrayList;
 
 import java.util.*;
 
-import com.lambdaworks.redis.RedisURI;
+import io.lettuce.core.RedisURI;
 import org.junit.Test;
 
-import com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.internal.LettuceLists;
+import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.internal.LettuceLists;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyRefreshTest.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/cluster/topology/TopologyRefreshTest.java
rename to src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java
index 6c7ce2f9f1..c1669d7e0e 100644
--- a/src/test/java/com/lambdaworks/redis/cluster/topology/TopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.topology;
+package io.lettuce.core.cluster.topology;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -27,21 +27,21 @@
 import org.junit.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.lambdaworks.Wait;
-import com.lambdaworks.category.SlowTests;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.async.BaseRedisAsyncCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.AbstractClusterTest;
-import com.lambdaworks.redis.cluster.ClusterClientOptions;
-import com.lambdaworks.redis.cluster.ClusterTopologyRefreshOptions;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.async.RedisClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.Wait;
+import io.lettuce.category.SlowTests;
+import io.lettuce.core.*;
+import io.lettuce.core.api.async.BaseRedisAsyncCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.AbstractClusterTest;
+import io.lettuce.core.cluster.ClusterClientOptions;
+import io.lettuce.core.cluster.ClusterTopologyRefreshOptions;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands;
+import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 import io.netty.util.concurrent.ScheduledFuture;
 
diff --git a/src/test/java/com/lambdaworks/redis/codec/CompressionCodecTest.java b/src/test/java/io/lettuce/core/codec/CompressionCodecTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/codec/CompressionCodecTest.java
rename to src/test/java/io/lettuce/core/codec/CompressionCodecTest.java
index 82201b36b2..5671ffb9fd 100644
--- a/src/test/java/com/lambdaworks/redis/codec/CompressionCodecTest.java
+++ b/src/test/java/io/lettuce/core/codec/CompressionCodecTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.codec;
+package io.lettuce.core.codec;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/codec/StringCodecTest.java b/src/test/java/io/lettuce/core/codec/StringCodecTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/codec/StringCodecTest.java
rename to src/test/java/io/lettuce/core/codec/StringCodecTest.java
index 81c38dddc5..2eafa1180a 100644
--- a/src/test/java/com/lambdaworks/redis/codec/StringCodecTest.java
+++ b/src/test/java/io/lettuce/core/codec/StringCodecTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.codec;
+package io.lettuce.core.codec;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,7 +22,7 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.protocol.LettuceCharsets;
+import io.lettuce.core.protocol.LettuceCharsets;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
diff --git a/src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java b/src/test/java/io/lettuce/core/commands/BitCommandTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java
rename to src/test/java/io/lettuce/core/commands/BitCommandTest.java
index 96c432a495..75214b6101 100644
--- a/src/test/java/com/lambdaworks/redis/commands/BitCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/BitCommandTest.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
-import static com.lambdaworks.redis.BitFieldArgs.offset;
-import static com.lambdaworks.redis.BitFieldArgs.signed;
-import static com.lambdaworks.redis.BitFieldArgs.typeWidthBasedOffset;
-import static com.lambdaworks.redis.BitFieldArgs.unsigned;
-import static com.lambdaworks.redis.BitFieldArgs.OverflowType.WRAP;
+import static io.lettuce.core.BitFieldArgs.offset;
+import static io.lettuce.core.BitFieldArgs.signed;
+import static io.lettuce.core.BitFieldArgs.typeWidthBasedOffset;
+import static io.lettuce.core.BitFieldArgs.unsigned;
+import static io.lettuce.core.BitFieldArgs.OverflowType.WRAP;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.nio.ByteBuffer;
@@ -27,10 +27,10 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.BitFieldArgs;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.BitFieldArgs;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java b/src/test/java/io/lettuce/core/commands/CustomCommandTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
rename to src/test/java/io/lettuce/core/commands/CustomCommandTest.java
index eb7dedee8c..e80a852d48 100644
--- a/src/test/java/com/lambdaworks/redis/commands/CustomCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/CustomCommandTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
@@ -22,13 +22,13 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.RedisCommandExecutionException;
-import com.lambdaworks.redis.TransactionResult;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.*;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.TransactionResult;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.*;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java b/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
similarity index 99%
rename from src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
rename to src/test/java/io/lettuce/core/commands/GeoCommandTest.java
index 5e3ceec851..0e2db3051f 100644
--- a/src/test/java/com/lambdaworks/redis/commands/GeoCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.offset;
@@ -25,7 +25,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import com.lambdaworks.redis.*;
+import io.lettuce.core.*;
 
 public class GeoCommandTest extends AbstractRedisClientTest {
 
diff --git a/src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java b/src/test/java/io/lettuce/core/commands/HLLCommandTest.java
similarity index 94%
rename from src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java
rename to src/test/java/io/lettuce/core/commands/HLLCommandTest.java
index 28075f4a06..e2dd07792c 100644
--- a/src/test/java/com/lambdaworks/redis/commands/HLLCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/HLLCommandTest.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
 
-import com.lambdaworks.redis.cluster.SlotHash;
+import io.lettuce.core.cluster.SlotHash;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.api.sync.RedisHLLCommands;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.api.sync.RedisHLLCommands;
 
 public class HLLCommandTest extends AbstractRedisClientTest {
     @Rule
diff --git a/src/test/java/com/lambdaworks/redis/commands/HashCommandTest.java b/src/test/java/io/lettuce/core/commands/HashCommandTest.java
similarity index 99%
rename from src/test/java/com/lambdaworks/redis/commands/HashCommandTest.java
rename to src/test/java/io/lettuce/core/commands/HashCommandTest.java
index afc3dc969e..f09e8858aa 100644
--- a/src/test/java/com/lambdaworks/redis/commands/HashCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/HashCommandTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.offset;
@@ -26,7 +26,7 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.*;
+import io.lettuce.core.*;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/com/lambdaworks/redis/commands/KeyCommandTest.java b/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
similarity index 99%
rename from src/test/java/com/lambdaworks/redis/commands/KeyCommandTest.java
rename to src/test/java/io/lettuce/core/commands/KeyCommandTest.java
index bafb01aa18..a82f6bcb60 100644
--- a/src/test/java/com/lambdaworks/redis/commands/KeyCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertNotEquals;
@@ -24,7 +24,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import com.lambdaworks.redis.*;
+import io.lettuce.core.*;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/com/lambdaworks/redis/commands/ListCommandTest.java b/src/test/java/io/lettuce/core/commands/ListCommandTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/commands/ListCommandTest.java
rename to src/test/java/io/lettuce/core/commands/ListCommandTest.java
index ae18b23c2c..2a98569785 100644
--- a/src/test/java/com/lambdaworks/redis/commands/ListCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ListCommandTest.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.ListStreamingAdapter;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.ListStreamingAdapter;
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
diff --git a/src/test/java/com/lambdaworks/redis/commands/NumericCommandTest.java b/src/test/java/io/lettuce/core/commands/NumericCommandTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/commands/NumericCommandTest.java
rename to src/test/java/io/lettuce/core/commands/NumericCommandTest.java
index 93306c6079..edf32da9ea 100644
--- a/src/test/java/com/lambdaworks/redis/commands/NumericCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/NumericCommandTest.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.offset;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
+import io.lettuce.core.AbstractRedisClientTest;
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
diff --git a/src/test/java/com/lambdaworks/redis/commands/RunOnlyOnceServerCommandTest.java b/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java
similarity index 90%
rename from src/test/java/com/lambdaworks/redis/commands/RunOnlyOnceServerCommandTest.java
rename to src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java
index fedf43693c..9c71dc5f5a 100644
--- a/src/test/java/com/lambdaworks/redis/commands/RunOnlyOnceServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
 import static com.google.code.tempusfugit.temporal.Timeout.timeout;
-import static com.lambdaworks.redis.TestSettings.host;
-import static com.lambdaworks.redis.TestSettings.port;
+import static io.lettuce.core.TestSettings.host;
+import static io.lettuce.core.TestSettings.port;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
 
@@ -29,12 +29,12 @@
 import org.junit.runners.MethodSorters;
 
 import com.google.code.tempusfugit.temporal.WaitFor;
-import com.lambdaworks.CanConnect;
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.MigrateArgs;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
+import io.lettuce.CanConnect;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.MigrateArgs;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.api.async.RedisAsyncCommands;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/com/lambdaworks/redis/commands/ScriptingCommandTest.java b/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
similarity index 94%
rename from src/test/java/com/lambdaworks/redis/commands/ScriptingCommandTest.java
rename to src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
index d41050c1f5..6006959f39 100644
--- a/src/test/java/com/lambdaworks/redis/commands/ScriptingCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
-import static com.lambdaworks.redis.ScriptOutputType.*;
+import static io.lettuce.core.ScriptOutputType.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
@@ -27,10 +27,10 @@
 import org.junit.rules.ExpectedException;
 import org.junit.runners.MethodSorters;
 
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
+import io.lettuce.Wait;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.api.StatefulRedisConnection;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java
rename to src/test/java/io/lettuce/core/commands/ServerCommandTest.java
index c6cc1cd9f5..69a97f906d 100644
--- a/src/test/java/com/lambdaworks/redis/commands/ServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.containsString;
@@ -29,15 +29,15 @@
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.models.command.CommandDetail;
-import com.lambdaworks.redis.models.command.CommandDetailParser;
-import com.lambdaworks.redis.models.role.RedisInstance;
-import com.lambdaworks.redis.models.role.RoleParser;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.models.command.CommandDetail;
+import io.lettuce.core.models.command.CommandDetailParser;
+import io.lettuce.core.models.role.RedisInstance;
+import io.lettuce.core.models.role.RoleParser;
+import io.lettuce.core.protocol.CommandType;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/com/lambdaworks/redis/commands/SetCommandTest.java b/src/test/java/io/lettuce/core/commands/SetCommandTest.java
similarity index 99%
rename from src/test/java/com/lambdaworks/redis/commands/SetCommandTest.java
rename to src/test/java/io/lettuce/core/commands/SetCommandTest.java
index 032b292c0e..e220426262 100644
--- a/src/test/java/com/lambdaworks/redis/commands/SetCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SetCommandTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -24,7 +24,7 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.*;
+import io.lettuce.core.*;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/com/lambdaworks/redis/commands/SortCommandTest.java b/src/test/java/io/lettuce/core/commands/SortCommandTest.java
similarity index 86%
rename from src/test/java/com/lambdaworks/redis/commands/SortCommandTest.java
rename to src/test/java/io/lettuce/core/commands/SortCommandTest.java
index bc267bb2ea..61f9c06481 100644
--- a/src/test/java/com/lambdaworks/redis/commands/SortCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SortCommandTest.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
-import static com.lambdaworks.redis.SortArgs.Builder.alpha;
-import static com.lambdaworks.redis.SortArgs.Builder.asc;
-import static com.lambdaworks.redis.SortArgs.Builder.by;
-import static com.lambdaworks.redis.SortArgs.Builder.desc;
-import static com.lambdaworks.redis.SortArgs.Builder.get;
-import static com.lambdaworks.redis.SortArgs.Builder.limit;
+import static io.lettuce.core.SortArgs.Builder.alpha;
+import static io.lettuce.core.SortArgs.Builder.asc;
+import static io.lettuce.core.SortArgs.Builder.by;
+import static io.lettuce.core.SortArgs.Builder.desc;
+import static io.lettuce.core.SortArgs.Builder.get;
+import static io.lettuce.core.SortArgs.Builder.limit;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.ListStreamingAdapter;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.ListStreamingAdapter;
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
diff --git a/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java b/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
rename to src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
index 74d88c4b3d..55eeef5949 100644
--- a/src/test/java/com/lambdaworks/redis/commands/SortedSetCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
-import static com.lambdaworks.redis.ZStoreArgs.Builder.max;
-import static com.lambdaworks.redis.ZStoreArgs.Builder.min;
-import static com.lambdaworks.redis.ZStoreArgs.Builder.sum;
-import static com.lambdaworks.redis.ZStoreArgs.Builder.weights;
+import static io.lettuce.core.ZStoreArgs.Builder.max;
+import static io.lettuce.core.ZStoreArgs.Builder.min;
+import static io.lettuce.core.ZStoreArgs.Builder.sum;
+import static io.lettuce.core.ZStoreArgs.Builder.weights;
 import static java.lang.Double.NEGATIVE_INFINITY;
 import static java.lang.Double.POSITIVE_INFINITY;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -29,8 +29,8 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.Range.Boundary;
+import io.lettuce.core.*;
+import io.lettuce.core.Range.Boundary;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/com/lambdaworks/redis/commands/StringCommandTest.java b/src/test/java/io/lettuce/core/commands/StringCommandTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/commands/StringCommandTest.java
rename to src/test/java/io/lettuce/core/commands/StringCommandTest.java
index c49b726eb0..b14a6e350c 100644
--- a/src/test/java/com/lambdaworks/redis/commands/StringCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/StringCommandTest.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
-import static com.lambdaworks.redis.SetArgs.Builder.ex;
-import static com.lambdaworks.redis.SetArgs.Builder.nx;
-import static com.lambdaworks.redis.SetArgs.Builder.px;
-import static com.lambdaworks.redis.SetArgs.Builder.xx;
+import static io.lettuce.core.SetArgs.Builder.ex;
+import static io.lettuce.core.SetArgs.Builder.nx;
+import static io.lettuce.core.SetArgs.Builder.px;
+import static io.lettuce.core.SetArgs.Builder.xx;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.codec.ByteArrayCodec;
+import io.lettuce.core.*;
+import io.lettuce.core.codec.ByteArrayCodec;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
diff --git a/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java b/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
similarity index 92%
rename from src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java
rename to src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
index e777f41d26..f5eafd085c 100644
--- a/src/test/java/com/lambdaworks/redis/commands/TransactionCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
 
-import com.lambdaworks.redis.TransactionResult;
+import io.lettuce.core.TransactionResult;
 import org.assertj.core.api.Assertions;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.RedisCommandExecutionException;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.api.sync.RedisCommands;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.api.sync.RedisCommands;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java
similarity index 84%
rename from src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java
index fa5b5a51dc..80e3dd4f2f 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/BitReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java
@@ -13,25 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.reactive;
+package io.lettuce.core.commands.reactive;
 
-import static com.lambdaworks.redis.BitFieldArgs.offset;
-import static com.lambdaworks.redis.BitFieldArgs.signed;
-import static com.lambdaworks.redis.BitFieldArgs.typeWidthBasedOffset;
-import static com.lambdaworks.redis.BitFieldArgs.OverflowType.FAIL;
+import static io.lettuce.core.BitFieldArgs.offset;
+import static io.lettuce.core.BitFieldArgs.signed;
+import static io.lettuce.core.BitFieldArgs.typeWidthBasedOffset;
+import static io.lettuce.core.BitFieldArgs.OverflowType.FAIL;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.redis.BitFieldArgs;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.reactive.RedisStringReactiveCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.BitCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.BitFieldArgs;
+import io.lettuce.core.Value;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.reactive.RedisStringReactiveCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.BitCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java
similarity index 79%
rename from src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java
index 846251c4ec..1fd61026ca 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/CustomReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.reactive;
+package io.lettuce.core.commands.reactive;
 
 import org.junit.Test;
 
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.CustomCommandTest;
-import com.lambdaworks.redis.output.ValueListOutput;
-import com.lambdaworks.redis.output.ValueOutput;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.CustomCommandTest;
+import io.lettuce.core.output.ValueListOutput;
+import io.lettuce.core.output.ValueOutput;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
similarity index 86%
rename from src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
index 40ccee4367..397b6baddd 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/GeoReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.reactive;
+package io.lettuce.core.commands.reactive;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.offset;
@@ -23,10 +23,10 @@
 
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.GeoCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.GeoCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java
similarity index 80%
rename from src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java
index bf2a83b507..582ba6cd5c 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/HLLReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.reactive;
+package io.lettuce.core.commands.reactive;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.HLLCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.HLLCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java
similarity index 80%
rename from src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java
index 58ce441207..a9cc514648 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/HashReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.reactive;
+package io.lettuce.core.commands.reactive;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.HashCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.HashCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java
similarity index 80%
rename from src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java
index 7e6afc1e83..7d420062d9 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/KeyReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.reactive;
+package io.lettuce.core.commands.reactive;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.KeyCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.KeyCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java
similarity index 80%
rename from src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java
index f8cce9ed1d..3e342b6d72 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/ListReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.reactive;
+package io.lettuce.core.commands.reactive;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.ListCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.ListCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java
similarity index 79%
rename from src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java
index 8a830a0028..363a19bfcc 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/NumericReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.reactive;
+package io.lettuce.core.commands.reactive;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.NumericCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.NumericCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java
similarity index 79%
rename from src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java
index 112012bb2b..2e253144f4 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/ScriptingReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.reactive;
+package io.lettuce.core.commands.reactive;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.ScriptingCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.ScriptingCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
similarity index 88%
rename from src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
index 891bb89e60..7ba61f8d2a 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/ServerReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.reactive;
+package io.lettuce.core.commands.reactive;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.ServerCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.ServerCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java
similarity index 80%
rename from src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java
index 4e18646bb1..5097e4051f 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/SetReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.reactive;
+package io.lettuce.core.commands.reactive;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.SetCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.SetCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java
similarity index 80%
rename from src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java
index 28d02b8177..15e2b66b28 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/SortReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.reactive;
+package io.lettuce.core.commands.reactive;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.SortCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.SortCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java
similarity index 79%
rename from src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java
index 5b82a25fca..cb391868e6 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/SortedSetReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.reactive;
+package io.lettuce.core.commands.reactive;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.SortedSetCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.SortedSetCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java
similarity index 85%
rename from src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java
index 2d323f4c2e..f72ac03849 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/StringReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.reactive;
+package io.lettuce.core.commands.reactive;
 
 import org.junit.Test;
 
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.StringCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.StringCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
similarity index 91%
rename from src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
index 0dbe835e73..76393876fe 100644
--- a/src/test/java/com/lambdaworks/redis/commands/reactive/TransactionReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.reactive;
+package io.lettuce.core.commands.reactive;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -23,14 +23,14 @@
 
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.redis.ClientOptions;
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.TransactionCommandTest;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.TransactionCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/BitTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java
similarity index 85%
rename from src/test/java/com/lambdaworks/redis/commands/transactional/BitTxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java
index 1c72912cc3..cae3ca7598 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/BitTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.transactional;
+package io.lettuce.core.commands.transactional;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.BitCommandTest;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.BitCommandTest;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/GeoTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
similarity index 91%
rename from src/test/java/com/lambdaworks/redis/commands/transactional/GeoTxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
index f513054081..039862a3f3 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/GeoTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.transactional;
+package io.lettuce.core.commands.transactional;
 
 import org.junit.Ignore;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.GeoCommandTest;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.GeoCommandTest;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/HLLTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java
similarity index 84%
rename from src/test/java/com/lambdaworks/redis/commands/transactional/HLLTxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java
index 31c9feb2e4..5294963d7c 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/HLLTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.transactional;
+package io.lettuce.core.commands.transactional;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.HLLCommandTest;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.HLLCommandTest;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/HashTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java
similarity index 84%
rename from src/test/java/com/lambdaworks/redis/commands/transactional/HashTxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java
index 1c641e71b0..77acc48899 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/HashTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.transactional;
+package io.lettuce.core.commands.transactional;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.HashCommandTest;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.HashCommandTest;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/KeyTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java
similarity index 85%
rename from src/test/java/com/lambdaworks/redis/commands/transactional/KeyTxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java
index d93386a252..891fa91c0b 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/KeyTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.transactional;
+package io.lettuce.core.commands.transactional;
 
 import org.junit.Ignore;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.KeyCommandTest;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.KeyCommandTest;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/ListTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java
similarity index 84%
rename from src/test/java/com/lambdaworks/redis/commands/transactional/ListTxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java
index b803506e83..42280ac5dd 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/ListTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.transactional;
+package io.lettuce.core.commands.transactional;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.ListCommandTest;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.ListCommandTest;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/SetTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java
similarity index 84%
rename from src/test/java/com/lambdaworks/redis/commands/transactional/SetTxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java
index 50f9849276..4ee98ecabe 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/SetTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.transactional;
+package io.lettuce.core.commands.transactional;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.SetCommandTest;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.SetCommandTest;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/SortTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java
similarity index 84%
rename from src/test/java/com/lambdaworks/redis/commands/transactional/SortTxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java
index 837ecb0dd1..e491f21282 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/SortTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.transactional;
+package io.lettuce.core.commands.transactional;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.SortCommandTest;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.SortCommandTest;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/SortedSetTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java
similarity index 83%
rename from src/test/java/com/lambdaworks/redis/commands/transactional/SortedSetTxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java
index 61ccebb74a..e7b596bc62 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/SortedSetTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.transactional;
+package io.lettuce.core.commands.transactional;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.SortedSetCommandTest;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.SortedSetCommandTest;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/StringTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java
similarity index 83%
rename from src/test/java/com/lambdaworks/redis/commands/transactional/StringTxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java
index da6f4a6746..fc1c037497 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/StringTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.transactional;
+package io.lettuce.core.commands.transactional;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.StringCommandTest;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.StringCommandTest;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/commands/transactional/TxSyncInvocationHandler.java b/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java
similarity index 92%
rename from src/test/java/com/lambdaworks/redis/commands/transactional/TxSyncInvocationHandler.java
rename to src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java
index b1fe12c5dd..e055d7cdd0 100644
--- a/src/test/java/com/lambdaworks/redis/commands/transactional/TxSyncInvocationHandler.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.transactional;
+package io.lettuce.core.commands.transactional;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.List;
 
-import com.lambdaworks.redis.TransactionResult;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.internal.AbstractInvocationHandler;
+import io.lettuce.core.TransactionResult;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.internal.AbstractInvocationHandler;
 
 /**
  * Invocation handler for testing purposes that wraps each call into a transaction.
- * 
+ *
  * @param <K>
  * @param <V>
  */
@@ -101,7 +101,7 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
 
     /**
      * Create a transactional wrapper proxy for {@link RedisCommands}.
-     * 
+     *
      * @param connection the connection
      * @return the wrapper proxy.
      */
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategyTest.java b/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyTest.java
similarity index 90%
rename from src/test/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategyTest.java
rename to src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyTest.java
index d89ad82ab1..771628e4c2 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/BatchExecutableCommandLookupStrategyTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
@@ -28,11 +28,11 @@
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.dynamic.domain.Timeout;
-import com.lambdaworks.redis.dynamic.output.CommandOutputFactory;
-import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.dynamic.domain.Timeout;
+import io.lettuce.core.dynamic.output.CommandOutputFactory;
+import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver;
 
 /**
  * @author Mark Paluch
@@ -101,4 +101,4 @@ static interface BatchingCommands {
 
         void justVoid();
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java
similarity index 85%
rename from src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
rename to src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java
index aef5c95b68..08d953fcdb 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/CommandSegmentCommandFactoryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
@@ -22,22 +22,22 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.ScanArgs;
-import com.lambdaworks.redis.SetArgs;
-import com.lambdaworks.redis.codec.ByteArrayCodec;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.dynamic.annotation.Command;
-import com.lambdaworks.redis.dynamic.annotation.Param;
-import com.lambdaworks.redis.dynamic.annotation.Value;
-import com.lambdaworks.redis.dynamic.domain.Timeout;
-import com.lambdaworks.redis.dynamic.output.CodecAwareOutputFactoryResolver;
-import com.lambdaworks.redis.dynamic.output.OutputRegistry;
-import com.lambdaworks.redis.dynamic.output.OutputRegistryCommandOutputFactoryResolver;
-import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory;
-import com.lambdaworks.redis.dynamic.segment.CommandSegmentFactory;
-import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.ScanArgs;
+import io.lettuce.core.SetArgs;
+import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.dynamic.annotation.Command;
+import io.lettuce.core.dynamic.annotation.Param;
+import io.lettuce.core.dynamic.annotation.Value;
+import io.lettuce.core.dynamic.domain.Timeout;
+import io.lettuce.core.dynamic.output.CodecAwareOutputFactoryResolver;
+import io.lettuce.core.dynamic.output.OutputRegistry;
+import io.lettuce.core.dynamic.output.OutputRegistryCommandOutputFactoryResolver;
+import io.lettuce.core.dynamic.segment.AnnotationCommandSegmentFactory;
+import io.lettuce.core.dynamic.segment.CommandSegmentFactory;
+import io.lettuce.core.dynamic.support.ReflectionUtils;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java b/src/test/java/io/lettuce/core/dynamic/ConversionServiceTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java
rename to src/test/java/io/lettuce/core/dynamic/ConversionServiceTest.java
index b4ae2fbfab..ecae52ad96 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ConversionServiceTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/ConversionServiceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethodTest.java b/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethodTest.java
rename to src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodTest.java
index 33f3de88ff..6d639de56c 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/DeclaredCommandMethodTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifierTest.java b/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierTest.java
similarity index 90%
rename from src/test/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifierTest.java
rename to src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierTest.java
index a103deedd7..fc40e07077 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/DefaultCommandMethodVerifierTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
@@ -24,13 +24,13 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.redis.GeoCoordinates;
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.dynamic.segment.CommandSegment;
-import com.lambdaworks.redis.dynamic.segment.CommandSegments;
-import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
-import com.lambdaworks.redis.internal.LettuceLists;
-import com.lambdaworks.redis.models.command.CommandDetail;
+import io.lettuce.core.GeoCoordinates;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.dynamic.segment.CommandSegment;
+import io.lettuce.core.dynamic.segment.CommandSegments;
+import io.lettuce.core.dynamic.support.ReflectionUtils;
+import io.lettuce.core.internal.LettuceLists;
+import io.lettuce.core.models.command.CommandDetail;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java b/src/test/java/io/lettuce/core/dynamic/ParameterBinderTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
rename to src/test/java/io/lettuce/core/dynamic/ParameterBinderTest.java
index 94907b10c9..bd972776fb 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ParameterBinderTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/ParameterBinderTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -25,12 +25,12 @@
 import org.springframework.util.Base64Utils;
 import org.springframework.util.ReflectionUtils;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.dynamic.segment.CommandSegment;
-import com.lambdaworks.redis.dynamic.segment.CommandSegments;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.*;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.dynamic.segment.CommandSegment;
+import io.lettuce.core.dynamic.segment.CommandSegments;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandType;
 
 /**
  * @author Mark Paluch
@@ -207,6 +207,6 @@ private interface MyCommands {
 
         void justObject(Object object);
 
-        void valueRange(@com.lambdaworks.redis.dynamic.annotation.Value Range<String> value);
+        void valueRange(@io.lettuce.core.dynamic.annotation.Value Range<String> value);
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
similarity index 83%
rename from src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
rename to src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
index e2616fe812..e6303fdf5b 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -29,14 +29,14 @@
 import org.mockito.runners.MockitoJUnitRunner;
 import org.reactivestreams.Publisher;
 
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.dynamic.domain.Timeout;
-import com.lambdaworks.redis.dynamic.output.CommandOutputFactory;
-import com.lambdaworks.redis.dynamic.output.CommandOutputFactoryResolver;
-import com.lambdaworks.redis.dynamic.segment.AnnotationCommandSegmentFactory;
-import com.lambdaworks.redis.dynamic.segment.CommandSegments;
-import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.dynamic.domain.Timeout;
+import io.lettuce.core.dynamic.output.CommandOutputFactory;
+import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver;
+import io.lettuce.core.dynamic.segment.AnnotationCommandSegmentFactory;
+import io.lettuce.core.dynamic.segment.CommandSegments;
+import io.lettuce.core.dynamic.support.ReflectionUtils;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersTest.java
similarity index 99%
rename from src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java
rename to src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersTest.java
index 3c99cd8a44..c37447113e 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptersTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -157,4 +157,4 @@ public void toWrapperShouldConvertMonoToFlux() {
         Mono<String> foo = Mono.just("foo");
         assertThat(conversionService.convert(foo, Flux.class)).isInstanceOf(Flux.class);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java
rename to src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionTest.java
index b9f3d9ea3d..2958a43199 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/ReactiveTypeAdaptionTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -23,8 +23,8 @@
 import rx.Observable;
 import rx.Single;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.dynamic.annotation.Command;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.dynamic.annotation.Command;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsAsyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsAsyncTest.java
rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncTest.java
index b35021bdb5..6bf30ecbf5 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsAsyncTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,7 +22,7 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
+import io.lettuce.core.AbstractRedisClientTest;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsBatchingTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingTest.java
similarity index 91%
rename from src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsBatchingTest.java
rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingTest.java
index 2639162fbf..92403093c3 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsBatchingTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
@@ -22,15 +22,15 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.LettuceFutures;
-import com.lambdaworks.redis.RedisCommandExecutionException;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.dynamic.annotation.Command;
-import com.lambdaworks.redis.dynamic.batch.BatchException;
-import com.lambdaworks.redis.dynamic.batch.BatchExecutor;
-import com.lambdaworks.redis.dynamic.batch.BatchSize;
-import com.lambdaworks.redis.dynamic.batch.CommandBatching;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.LettuceFutures;
+import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.dynamic.annotation.Command;
+import io.lettuce.core.dynamic.batch.BatchException;
+import io.lettuce.core.dynamic.batch.BatchExecutor;
+import io.lettuce.core.dynamic.batch.BatchSize;
+import io.lettuce.core.dynamic.batch.CommandBatching;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsClusterSyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
similarity index 83%
rename from src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsClusterSyncTest.java
rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
index 8b72d28099..2618f8f99e 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsClusterSyncTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,17 +22,17 @@
 
 import org.junit.*;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.AbstractTest;
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.cluster.ClusterRule;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.dynamic.annotation.Command;
-import com.lambdaworks.redis.dynamic.domain.Timeout;
-import com.lambdaworks.redis.internal.LettuceLists;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.AbstractTest;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.Value;
+import io.lettuce.core.cluster.ClusterRule;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.dynamic.annotation.Command;
+import io.lettuce.core.dynamic.domain.Timeout;
+import io.lettuce.core.internal.LettuceLists;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsReactiveTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveTest.java
similarity index 89%
rename from src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsReactiveTest.java
rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveTest.java
index 9754abb3e0..e245ba9296 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsReactiveTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveTest.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import org.junit.Test;
 
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.dynamic.annotation.Command;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.dynamic.annotation.Command;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsSyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java
similarity index 86%
rename from src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsSyncTest.java
rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java
index c7afbde633..e8f4fbef0c 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsSyncTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,12 +22,12 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.codec.ByteArrayCodec;
-import com.lambdaworks.redis.dynamic.annotation.Command;
-import com.lambdaworks.redis.dynamic.domain.Timeout;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.Value;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.dynamic.annotation.Command;
+import io.lettuce.core.dynamic.domain.Timeout;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java
index 9d30c2831d..976aec1693 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/RedisCommandsTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
+import io.lettuce.core.AbstractRedisClientTest;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/SimpleBatcherTest.java b/src/test/java/io/lettuce/core/dynamic/SimpleBatcherTest.java
similarity index 92%
rename from src/test/java/com/lambdaworks/redis/dynamic/SimpleBatcherTest.java
rename to src/test/java/io/lettuce/core/dynamic/SimpleBatcherTest.java
index 9830d30338..4456773fe8 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/SimpleBatcherTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/SimpleBatcherTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.verify;
@@ -26,12 +26,12 @@
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.dynamic.batch.CommandBatching;
-import com.lambdaworks.redis.protocol.AsyncCommand;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.dynamic.batch.CommandBatching;
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * @author Mark Paluch
@@ -143,4 +143,4 @@ public void shouldBatchWithBatchControlFlush() {
     private static RedisCommand<Object, Object, Object> createCommand() {
         return new AsyncCommand<>(new Command<>(CommandType.COMMAND, null, null));
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverTest.java
similarity index 85%
rename from src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java
rename to src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverTest.java
index 7f43d0314d..f744093f39 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/codec/AnnotationRedisCodecResolverTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.codec;
+package io.lettuce.core.dynamic.codec;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -25,15 +25,15 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.Range;
-import com.lambdaworks.redis.codec.ByteArrayCodec;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.dynamic.CommandMethod;
-import com.lambdaworks.redis.dynamic.DeclaredCommandMethod;
-import com.lambdaworks.redis.dynamic.annotation.Key;
-import com.lambdaworks.redis.dynamic.annotation.Value;
-import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
+import io.lettuce.core.Range;
+import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.dynamic.CommandMethod;
+import io.lettuce.core.dynamic.DeclaredCommandMethod;
+import io.lettuce.core.dynamic.annotation.Key;
+import io.lettuce.core.dynamic.annotation.Value;
+import io.lettuce.core.dynamic.support.ReflectionUtils;
 
 /**
  * @author Mark Paluch
@@ -98,7 +98,7 @@ public void resolutionShouldFail() {
     public void shouldDiscoverCodecTypesFromWrappers() {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "withWrappers", Range.class,
-                com.lambdaworks.redis.Value.class);
+                io.lettuce.core.Value.class);
 
         Set<Class<?>> types = new AnnotationRedisCodecResolver(codecs).findTypes(DeclaredCommandMethod.create(method),
                 Value.class);
@@ -128,7 +128,7 @@ private static interface CommandMethods {
 
         String mixedTypes(@Key String key, @Value byte[] value);
 
-        String withWrappers(@Value Range<String> range, @Value com.lambdaworks.redis.Value<Number> value);
+        String withWrappers(@Value Range<String> range, @Value io.lettuce.core.Value<Number> value);
 
         String withMap(Map<Integer, String> map);
     }
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/codec/ParameterWrappersTest.java b/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersTest.java
similarity index 89%
rename from src/test/java/com/lambdaworks/redis/dynamic/codec/ParameterWrappersTest.java
rename to src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersTest.java
index 4747cd283b..d743c7d0a4 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/codec/ParameterWrappersTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.codec;
+package io.lettuce.core.dynamic.codec;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -23,13 +23,13 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.KeyValue;
-import com.lambdaworks.redis.Range;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.dynamic.codec.AnnotationRedisCodecResolver.ParameterWrappers;
-import com.lambdaworks.redis.dynamic.parameter.Parameter;
-import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
-import com.lambdaworks.redis.dynamic.support.TypeInformation;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.Range;
+import io.lettuce.core.Value;
+import io.lettuce.core.dynamic.codec.AnnotationRedisCodecResolver.ParameterWrappers;
+import io.lettuce.core.dynamic.parameter.Parameter;
+import io.lettuce.core.dynamic.support.ReflectionUtils;
+import io.lettuce.core.dynamic.support.TypeInformation;
 
 /**
  * @author Mark Paluch
@@ -136,12 +136,12 @@ private static interface CommandMethods {
 
         String byteArray(byte[] values);
 
-        String withWrappers(Range<String> range, com.lambdaworks.redis.Value<Number> value,
-                com.lambdaworks.redis.KeyValue<Integer, Long> keyValue);
+        String withWrappers(Range<String> range, io.lettuce.core.Value<Number> value,
+                io.lettuce.core.KeyValue<Integer, Long> keyValue);
 
         String withList(List<String> map);
 
         String withMap(Map<Integer, String> map);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java
rename to src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryTest.java
index 296a9232a9..b3a3dd249e 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.intercept;
+package io.lettuce.core.dynamic.intercept;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java b/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverTest.java
similarity index 92%
rename from src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java
rename to src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverTest.java
index e6eea7cb66..59628695d3 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/output/CodecAwareOutputResolverTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.output;
+package io.lettuce.core.dynamic.output;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -24,11 +24,11 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.dynamic.CommandMethod;
-import com.lambdaworks.redis.dynamic.DeclaredCommandMethod;
-import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
-import com.lambdaworks.redis.output.*;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.dynamic.CommandMethod;
+import io.lettuce.core.dynamic.DeclaredCommandMethod;
+import io.lettuce.core.dynamic.support.ReflectionUtils;
+import io.lettuce.core.output.*;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
rename to src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
index 1e51436aa4..5e166ba531 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.output;
+package io.lettuce.core.dynamic.output;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -23,13 +23,13 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.GeoCoordinates;
-import com.lambdaworks.redis.ScoredValue;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.dynamic.DeclaredCommandMethod;
-import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
-import com.lambdaworks.redis.output.*;
+import io.lettuce.core.GeoCoordinates;
+import io.lettuce.core.ScoredValue;
+import io.lettuce.core.Value;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.dynamic.DeclaredCommandMethod;
+import io.lettuce.core.dynamic.support.ReflectionUtils;
+import io.lettuce.core.output.*;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java
similarity index 90%
rename from src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java
rename to src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java
index e3d13e5a21..142e8598f1 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/output/OutputRegistryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.output;
+package io.lettuce.core.dynamic.output;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,13 +22,13 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.ScoredValue;
-import com.lambdaworks.redis.codec.ByteArrayCodec;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.dynamic.support.ClassTypeInformation;
-import com.lambdaworks.redis.dynamic.support.ResolvableType;
-import com.lambdaworks.redis.output.*;
+import io.lettuce.core.ScoredValue;
+import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.dynamic.support.ClassTypeInformation;
+import io.lettuce.core.dynamic.support.ResolvableType;
+import io.lettuce.core.output.*;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
similarity index 89%
rename from src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
rename to src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
index 695084ad97..52a86b0f4a 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.segment;
+package io.lettuce.core.dynamic.segment;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.dynamic.CommandMethod;
-import com.lambdaworks.redis.dynamic.DeclaredCommandMethod;
-import com.lambdaworks.redis.dynamic.annotation.Command;
-import com.lambdaworks.redis.dynamic.annotation.CommandNaming;
-import com.lambdaworks.redis.dynamic.annotation.CommandNaming.LetterCase;
-import com.lambdaworks.redis.dynamic.annotation.CommandNaming.Strategy;
-import com.lambdaworks.redis.dynamic.support.ReflectionUtils;
+import io.lettuce.core.dynamic.CommandMethod;
+import io.lettuce.core.dynamic.DeclaredCommandMethod;
+import io.lettuce.core.dynamic.annotation.Command;
+import io.lettuce.core.dynamic.annotation.CommandNaming;
+import io.lettuce.core.dynamic.annotation.CommandNaming.LetterCase;
+import io.lettuce.core.dynamic.annotation.CommandNaming.Strategy;
+import io.lettuce.core.dynamic.support.ReflectionUtils;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformationTest.java b/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationTest.java
similarity index 99%
rename from src/test/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformationTest.java
rename to src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationTest.java
index 6522b120f6..bc921daae8 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/support/ParametrizedTypeInformationTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -137,4 +137,4 @@ static interface ListOfString extends List<String> {
     static interface ListOfInteger extends List<Integer> {
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformationTest.java b/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationTest.java
similarity index 96%
rename from src/test/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformationTest.java
rename to src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationTest.java
index 29d4874c56..e9eba26346 100644
--- a/src/test/java/com/lambdaworks/redis/dynamic/support/WildcardTypeInformationTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.support;
+package io.lettuce.core.dynamic.support;
 
-import static com.lambdaworks.redis.dynamic.support.ClassTypeInformation.from;
+import static io.lettuce.core.dynamic.support.ClassTypeInformation.from;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.lang.reflect.Method;
@@ -111,4 +111,4 @@ static interface GenericReturnTypes {
 
         List<? extends Number> atLeastNumber();
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java
similarity index 86%
rename from src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
rename to src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java
index 502481d1e7..333fbe7295 100644
--- a/src/test/java/com/lambdaworks/redis/event/ConnectionEventsTriggeredTest.java
+++ b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event;
+package io.lettuce.core.event;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -25,11 +25,11 @@
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.AbstractTest;
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.event.connection.ConnectionEvent;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.AbstractTest;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.event.connection.ConnectionEvent;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java b/src/test/java/io/lettuce/core/event/DefaultEventBusTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
rename to src/test/java/io/lettuce/core/event/DefaultEventBusTest.java
index 51f0f8863a..b6e1c133ca 100644
--- a/src/test/java/com/lambdaworks/redis/event/DefaultEventBusTest.java
+++ b/src/test/java/io/lettuce/core/event/DefaultEventBusTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event;
+package io.lettuce.core.event;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/event/DefaultEventPublisherOptionsTest.java b/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/event/DefaultEventPublisherOptionsTest.java
rename to src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java
index ecc9e22ad6..a0a66d4af2 100644
--- a/src/test/java/com/lambdaworks/redis/event/DefaultEventPublisherOptionsTest.java
+++ b/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.event;
+package io.lettuce.core.event;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/internal/AbstractInvocationHandlerTest.java b/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/internal/AbstractInvocationHandlerTest.java
rename to src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerTest.java
index 10c62102a7..1a9336f51b 100644
--- a/src/test/java/com/lambdaworks/redis/internal/AbstractInvocationHandlerTest.java
+++ b/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.internal;
+package io.lettuce.core.internal;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/internal/HostAndPortTest.java b/src/test/java/io/lettuce/core/internal/HostAndPortTest.java
similarity index 99%
rename from src/test/java/com/lambdaworks/redis/internal/HostAndPortTest.java
rename to src/test/java/io/lettuce/core/internal/HostAndPortTest.java
index 61ffeff438..fa1feb78e3 100644
--- a/src/test/java/com/lambdaworks/redis/internal/HostAndPortTest.java
+++ b/src/test/java/io/lettuce/core/internal/HostAndPortTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.internal;
+package io.lettuce.core.internal;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/CustomCommandTest.java b/src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/masterslave/CustomCommandTest.java
rename to src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java
index d862321105..eefb893a52 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/CustomCommandTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
@@ -22,13 +22,13 @@
 
 import org.junit.*;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.*;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.*;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriterTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriterTest.java
rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java
index 231e41dfc1..0c463d1db4 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveChannelWriterTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,9 +22,9 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandType;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * @author Mark Paluch
@@ -77,4 +77,4 @@ public void shouldReturnIntentForMixedCommands() {
                 MasterSlaveConnectionProvider.Intent.WRITE);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProviderTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java
similarity index 86%
rename from src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProviderTest.java
rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java
index 9b7b11237c..4e47dbd5cf 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
@@ -30,12 +30,12 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.models.role.RedisInstance;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.models.role.RedisInstance;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java
rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
index 5ab7ff8ac3..46b9e42661 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveSentinelTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
-import static com.lambdaworks.redis.TestSettings.port;
-import static com.lambdaworks.redis.masterslave.MasterSlaveTest.slaveCall;
+import static io.lettuce.core.TestSettings.port;
+import static io.lettuce.core.masterslave.MasterSlaveTest.slaveCall;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 
@@ -29,11 +29,11 @@
 import org.junit.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.sentinel.AbstractSentinelTest;
-import com.lambdaworks.redis.sentinel.SentinelRule;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.*;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.sentinel.AbstractSentinelTest;
+import io.lettuce.core.sentinel.SentinelRule;
 
 import io.netty.channel.group.ChannelGroup;
 
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
similarity index 94%
rename from src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java
rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
index 5f05b36354..88a6836a49 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
@@ -28,13 +28,13 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.models.role.RedisInstance;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
-import com.lambdaworks.redis.models.role.RoleParser;
+import io.lettuce.core.*;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.models.role.RedisInstance;
+import io.lettuce.core.models.role.RedisNodeDescription;
+import io.lettuce.core.models.role.RoleParser;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProviderTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProviderTest.java
rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderTest.java
index 59c93c9783..239dbf91ed 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveTopologyProviderTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -22,11 +22,11 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.models.role.RedisInstance;
-import com.lambdaworks.redis.models.role.RedisNodeDescription;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.models.role.RedisInstance;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveUtilsTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveUtilsTest.java
rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsTest.java
index d7b11a00bf..446174f7eb 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/MasterSlaveUtilsTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
@@ -21,8 +21,8 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.models.role.RedisInstance;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.models.role.RedisInstance;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java
rename to src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
index 2b49d9ead8..af8471bd8b 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/SentinelTopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
@@ -34,14 +34,14 @@
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisConnectionException;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.pubsub.RedisPubSubAdapter;
-import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
-import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisConnectionException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.pubsub.RedisPubSubAdapter;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
+import io.lettuce.core.resource.ClientResources;
 
 import io.netty.util.concurrent.EventExecutorGroup;
 
diff --git a/src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java
rename to src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
index 9c6f09fd44..0e12554654 100644
--- a/src/test/java/com/lambdaworks/redis/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.masterslave;
+package io.lettuce.core.masterslave;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
@@ -28,12 +28,12 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.models.role.RedisInstance;
-import com.lambdaworks.redis.models.role.RoleParser;
+import io.lettuce.core.*;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.models.role.RedisInstance;
+import io.lettuce.core.models.role.RoleParser;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/metrics/CommandLatencyIdTest.java b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/metrics/CommandLatencyIdTest.java
rename to src/test/java/io/lettuce/core/metrics/CommandLatencyIdTest.java
index 5d1cae1fb5..1864df21ed 100644
--- a/src/test/java/com/lambdaworks/redis/metrics/CommandLatencyIdTest.java
+++ b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.metrics;
+package io.lettuce.core.metrics;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.lambdaworks.redis.protocol.CommandKeyword;
+import io.lettuce.core.protocol.CommandKeyword;
 import io.netty.channel.local.LocalAddress;
 import org.junit.Test;
 
diff --git a/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java
rename to src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java
index 133cf8e89f..0a28b23369 100644
--- a/src/test/java/com/lambdaworks/redis/metrics/DefaultCommandLatencyCollectorTest.java
+++ b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.metrics;
+package io.lettuce.core.metrics;
 
 import static java.util.concurrent.TimeUnit.MICROSECONDS;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -25,7 +25,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.protocol.CommandType;
 
 import io.netty.channel.local.LocalAddress;
 
diff --git a/src/test/java/com/lambdaworks/redis/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java b/src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java
rename to src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java
index 4b9cc2b05c..1f8675316d 100644
--- a/src/test/java/com/lambdaworks/redis/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java
+++ b/src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.metrics;
+package io.lettuce.core.metrics;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/models/command/CommandDetailParserTest.java b/src/test/java/io/lettuce/core/models/command/CommandDetailParserTest.java
similarity index 96%
rename from src/test/java/com/lambdaworks/redis/models/command/CommandDetailParserTest.java
rename to src/test/java/io/lettuce/core/models/command/CommandDetailParserTest.java
index cb52aad822..3fab834a02 100644
--- a/src/test/java/com/lambdaworks/redis/models/command/CommandDetailParserTest.java
+++ b/src/test/java/io/lettuce/core/models/command/CommandDetailParserTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.models.command;
+package io.lettuce.core.models.command;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -23,7 +23,7 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.internal.LettuceLists;
+import io.lettuce.core.internal.LettuceLists;
 
 public class CommandDetailParserTest {
 
diff --git a/src/test/java/com/lambdaworks/redis/models/role/RoleParserTest.java b/src/test/java/io/lettuce/core/models/role/RoleParserTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/models/role/RoleParserTest.java
rename to src/test/java/io/lettuce/core/models/role/RoleParserTest.java
index b4cdc3ce32..9e829430b5 100644
--- a/src/test/java/com/lambdaworks/redis/models/role/RoleParserTest.java
+++ b/src/test/java/io/lettuce/core/models/role/RoleParserTest.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.models.role;
+package io.lettuce.core.models.role;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lambdaworks.redis.internal.HostAndPort;
+import io.lettuce.core.internal.HostAndPort;
 import org.junit.Test;
 
-import com.lambdaworks.redis.internal.LettuceLists;
+import io.lettuce.core.internal.LettuceLists;
 
 public class RoleParserTest {
     public static final long REPLICATION_OFFSET_1 = 3167038L;
diff --git a/src/test/java/com/lambdaworks/redis/output/BooleanListOutputTest.java b/src/test/java/io/lettuce/core/output/BooleanListOutputTest.java
similarity index 94%
rename from src/test/java/com/lambdaworks/redis/output/BooleanListOutputTest.java
rename to src/test/java/io/lettuce/core/output/BooleanListOutputTest.java
index 09f7d85106..6c72631020 100644
--- a/src/test/java/com/lambdaworks/redis/output/BooleanListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/BooleanListOutputTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -21,7 +21,7 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.codec.Utf8StringCodec;
+import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java
similarity index 90%
rename from src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java
rename to src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java
index a93d3d7b12..f38c3935f3 100644
--- a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -21,8 +21,8 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.GeoCoordinates;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
+import io.lettuce.core.GeoCoordinates;
+import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutputTest.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java
similarity index 89%
rename from src/test/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutputTest.java
rename to src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java
index d46f158ac2..ff83960180 100644
--- a/src/test/java/com/lambdaworks/redis/output/GeoCoordinatesValueListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -21,9 +21,9 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.GeoCoordinates;
-import com.lambdaworks.redis.Value;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
+import io.lettuce.core.GeoCoordinates;
+import io.lettuce.core.Value;
+import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/output/GeoWithinListOutputTest.java b/src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/output/GeoWithinListOutputTest.java
rename to src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java
index e5e45617ca..140adb922f 100644
--- a/src/test/java/com/lambdaworks/redis/output/GeoWithinListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -21,10 +21,10 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.GeoCoordinates;
-import com.lambdaworks.redis.GeoWithin;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
+import io.lettuce.core.GeoCoordinates;
+import io.lettuce.core.GeoWithin;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/output/ListOutputTest.java b/src/test/java/io/lettuce/core/output/ListOutputTest.java
similarity index 96%
rename from src/test/java/com/lambdaworks/redis/output/ListOutputTest.java
rename to src/test/java/io/lettuce/core/output/ListOutputTest.java
index 0c76577c8d..a1fe45155f 100644
--- a/src/test/java/com/lambdaworks/redis/output/ListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/ListOutputTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -28,7 +28,7 @@
 import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.lambdaworks.redis.codec.Utf8StringCodec;
+import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/output/NestedMultiOutputTest.java b/src/test/java/io/lettuce/core/output/NestedMultiOutputTest.java
similarity index 84%
rename from src/test/java/com/lambdaworks/redis/output/NestedMultiOutputTest.java
rename to src/test/java/io/lettuce/core/output/NestedMultiOutputTest.java
index 9c2f915d67..6d8e3a7e53 100644
--- a/src/test/java/com/lambdaworks/redis/output/NestedMultiOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/NestedMultiOutputTest.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
-import static com.lambdaworks.redis.protocol.LettuceCharsets.buffer;
+import static io.lettuce.core.protocol.LettuceCharsets.buffer;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/output/ScoredValueListOutputTest.java b/src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java
similarity index 91%
rename from src/test/java/com/lambdaworks/redis/output/ScoredValueListOutputTest.java
rename to src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java
index 71dfe783ce..dc2eef51a9 100644
--- a/src/test/java/com/lambdaworks/redis/output/ScoredValueListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -21,8 +21,8 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.ScoredValue;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
+import io.lettuce.core.ScoredValue;
+import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/protocol/AsyncCommandInternalsTest.java b/src/test/java/io/lettuce/core/protocol/AsyncCommandInternalsTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/protocol/AsyncCommandInternalsTest.java
rename to src/test/java/io/lettuce/core/protocol/AsyncCommandInternalsTest.java
index ec9ef31d75..f2716222e7 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/AsyncCommandInternalsTest.java
+++ b/src/test/java/io/lettuce/core/protocol/AsyncCommandInternalsTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
-import static com.lambdaworks.redis.protocol.LettuceCharsets.buffer;
+import static io.lettuce.core.protocol.LettuceCharsets.buffer;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.CancellationException;
@@ -26,11 +26,11 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.output.CommandOutput;
-import com.lambdaworks.redis.output.StatusOutput;
+import io.lettuce.core.*;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.output.StatusOutput;
 
 public class AsyncCommandInternalsTest {
     protected RedisCodec<String, String> codec = new Utf8StringCodec();
diff --git a/src/test/java/com/lambdaworks/redis/protocol/CommandArgsTest.java b/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/protocol/CommandArgsTest.java
rename to src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
index e6107131ea..a668e3cbdf 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/CommandArgsTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,8 +22,8 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.codec.ByteArrayCodec;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
+import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.codec.Utf8StringCodec;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
diff --git a/src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
similarity index 96%
rename from src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java
rename to src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
index 6a32bbc079..f8e61d1944 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/CommandHandlerTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
@@ -41,12 +41,12 @@
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.lambdaworks.redis.ConnectionEvents;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollector;
-import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollectorOptions;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.ConnectionEvents;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.metrics.DefaultCommandLatencyCollector;
+import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.resource.ClientResources;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
diff --git a/src/test/java/com/lambdaworks/redis/protocol/CommandInternalsTest.java b/src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java
similarity index 91%
rename from src/test/java/com/lambdaworks/redis/protocol/CommandInternalsTest.java
rename to src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java
index fdb612e4b1..b163f0e160 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/CommandInternalsTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
-import static com.lambdaworks.redis.protocol.LettuceCharsets.buffer;
+import static io.lettuce.core.protocol.LettuceCharsets.buffer;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.output.CommandOutput;
-import com.lambdaworks.redis.output.NestedMultiOutput;
-import com.lambdaworks.redis.output.StatusOutput;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.output.NestedMultiOutput;
+import io.lettuce.core.output.StatusOutput;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
similarity index 96%
rename from src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java
rename to src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
index 41e6a6a7f7..a733b73ecf 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/ConnectionFailureTest.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,12 +22,12 @@
 import org.junit.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.lambdaworks.ConnectionTestUtil;
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.server.RandomResponseServer;
+import io.lettuce.ConnectionTestUtil;
+import io.lettuce.Wait;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.server.RandomResponseServer;
 
 /**
  * @author Mark Paluch
@@ -113,7 +113,7 @@ public void pingBeforeConnectFailOnReconnect() throws Exception {
     /**
      * Simulates a failure on reconnect by changing the port to a invalid server and triggering a reconnect.
      *
-     * Expectation: {@link com.lambdaworks.redis.ConnectionEvents.Reconnect} events are sent.
+     * Expectation: {@link io.lettuce.core.ConnectionEvents.Reconnect} events are sent.
      *
      * @throws Exception
      */
diff --git a/src/test/java/com/lambdaworks/redis/protocol/DefaultEndpointTest.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
similarity index 96%
rename from src/test/java/com/lambdaworks/redis/protocol/DefaultEndpointTest.java
rename to src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
index f83f585ab1..4bb410e858 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/DefaultEndpointTest.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
@@ -44,12 +44,12 @@
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.lambdaworks.redis.ClientOptions;
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.internal.LettuceFactories;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.resource.ClientResources;
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.internal.LettuceFactories;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.resource.ClientResources;
 
 import edu.umd.cs.mtc.MultithreadedTestCase;
 import edu.umd.cs.mtc.TestFramework;
diff --git a/src/test/java/com/lambdaworks/redis/protocol/StateMachineTest.java b/src/test/java/io/lettuce/core/protocol/StateMachineTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/protocol/StateMachineTest.java
rename to src/test/java/io/lettuce/core/protocol/StateMachineTest.java
index c6033962e7..5317601253 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/StateMachineTest.java
+++ b/src/test/java/io/lettuce/core/protocol/StateMachineTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
-import static com.lambdaworks.redis.protocol.RedisStateMachine.State;
+import static io.lettuce.core.protocol.RedisStateMachine.State;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.nio.charset.Charset;
@@ -32,10 +32,10 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.lambdaworks.redis.RedisException;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.output.*;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.output.*;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
rename to src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
index e38cc32021..809df3b36d 100644
--- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubCommandTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub;
+package io.lettuce.core.pubsub;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
@@ -30,12 +30,12 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.internal.LettuceFactories;
-import com.lambdaworks.redis.pubsub.api.async.RedisPubSubAsyncCommands;
+import io.lettuce.TestClientResources;
+import io.lettuce.Wait;
+import io.lettuce.core.*;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.internal.LettuceFactories;
+import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
rename to src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
index 10fe65337b..0fd6306222 100644
--- a/src/test/java/com/lambdaworks/redis/pubsub/PubSubReactiveTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.pubsub;
+package io.lettuce.core.pubsub;
 
 import static com.google.code.tempusfugit.temporal.Duration.millis;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -34,18 +34,18 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.Delay;
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.internal.LettuceFactories;
-import com.lambdaworks.redis.pubsub.api.reactive.ChannelMessage;
-import com.lambdaworks.redis.pubsub.api.reactive.PatternMessage;
-import com.lambdaworks.redis.pubsub.api.reactive.RedisPubSubReactiveCommands;
-import com.lambdaworks.redis.pubsub.api.sync.RedisPubSubCommands;
+import io.lettuce.Delay;
+import io.lettuce.TestClientResources;
+import io.lettuce.Wait;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.internal.LettuceFactories;
+import io.lettuce.core.pubsub.api.reactive.ChannelMessage;
+import io.lettuce.core.pubsub.api.reactive.PatternMessage;
+import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands;
+import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/reactive/RedisPublisherVerification.java b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
similarity index 84%
rename from src/test/java/com/lambdaworks/redis/reactive/RedisPublisherVerification.java
rename to src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
index 1d6ebaa84a..8c2052adb5 100644
--- a/src/test/java/com/lambdaworks/redis/reactive/RedisPublisherVerification.java
+++ b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.reactive;
+package io.lettuce.core.reactive;
 
-import static com.lambdaworks.redis.protocol.CommandType.LRANGE;
+import static io.lettuce.core.protocol.CommandType.LRANGE;
 
 import java.util.List;
 import java.util.UUID;
@@ -27,14 +27,14 @@
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.output.ValueListOutput;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandArgs;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.output.ValueListOutput;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandArgs;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
similarity index 96%
rename from src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java
rename to src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
index fa6e156a34..622196410d 100644
--- a/src/test/java/com/lambdaworks/redis/reliability/AtLeastOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.reliability;
+package io.lettuce.core.reliability;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
@@ -25,15 +25,15 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.ConnectionTestUtil;
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.output.IntegerOutput;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.*;
+import io.lettuce.ConnectionTestUtil;
+import io.lettuce.Wait;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.output.IntegerOutput;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.*;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
diff --git a/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java
rename to src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
index fadf76ad05..b151783ba4 100644
--- a/src/test/java/com/lambdaworks/redis/reliability/AtMostOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.reliability;
+package io.lettuce.core.reliability;
 
 import static com.google.code.tempusfugit.temporal.Duration.millis;
-import static com.lambdaworks.ConnectionTestUtil.getCommandBuffer;
-import static com.lambdaworks.ConnectionTestUtil.getQueue;
+import static io.lettuce.ConnectionTestUtil.getCommandBuffer;
+import static io.lettuce.ConnectionTestUtil.getQueue;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
 
@@ -25,19 +25,19 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.Delay;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
+import io.lettuce.Delay;
+import io.lettuce.core.api.StatefulRedisConnection;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lambdaworks.ConnectionTestUtil;
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.output.IntegerOutput;
-import com.lambdaworks.redis.output.StatusOutput;
-import com.lambdaworks.redis.protocol.*;
+import io.lettuce.ConnectionTestUtil;
+import io.lettuce.Wait;
+import io.lettuce.core.*;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.output.IntegerOutput;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.*;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
diff --git a/src/test/java/com/lambdaworks/redis/resource/ConstantDelayTest.java b/src/test/java/io/lettuce/core/resource/ConstantDelayTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/resource/ConstantDelayTest.java
rename to src/test/java/io/lettuce/core/resource/ConstantDelayTest.java
index ce8e96dfd1..3e495caef6 100644
--- a/src/test/java/com/lambdaworks/redis/resource/ConstantDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/ConstantDelayTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java b/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java
rename to src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java
index 9750c98f15..f211fa5fde 100644
--- a/src/test/java/com/lambdaworks/redis/resource/DecorrelatedJitterDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
rename to src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java
index b0a239dd4c..6d9da18eff 100644
--- a/src/test/java/com/lambdaworks/redis/resource/DefaultClientResourcesTest.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -27,11 +27,11 @@
 
 import reactor.test.StepVerifier;
 
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.event.Event;
-import com.lambdaworks.redis.event.EventBus;
-import com.lambdaworks.redis.metrics.CommandLatencyCollector;
-import com.lambdaworks.redis.metrics.DefaultCommandLatencyCollectorOptions;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.event.Event;
+import io.lettuce.core.event.EventBus;
+import io.lettuce.core.metrics.CommandLatencyCollector;
+import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
 
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.Timer;
diff --git a/src/test/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProviderTest.java b/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderTest.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProviderTest.java
rename to src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderTest.java
index 4010a44c9e..3174119d0c 100644
--- a/src/test/java/com/lambdaworks/redis/resource/DefaultEventLoopGroupProviderTest.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/test/java/com/lambdaworks/redis/resource/DirContextDnsResolverTest.java b/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTest.java
similarity index 99%
rename from src/test/java/com/lambdaworks/redis/resource/DirContextDnsResolverTest.java
rename to src/test/java/io/lettuce/core/resource/DirContextDnsResolverTest.java
index 4fa79e5715..e79dea6275 100644
--- a/src/test/java/com/lambdaworks/redis/resource/DirContextDnsResolverTest.java
+++ b/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java b/src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java
rename to src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java
index 42cd096f7d..6172815427 100644
--- a/src/test/java/com/lambdaworks/redis/resource/EqualJitterDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/resource/ExponentialDelayTest.java b/src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/resource/ExponentialDelayTest.java
rename to src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java
index 8ff5da7aba..f465378cf3 100644
--- a/src/test/java/com/lambdaworks/redis/resource/ExponentialDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java b/src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java
rename to src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java
index c5c1106378..0cd453df40 100644
--- a/src/test/java/com/lambdaworks/redis/resource/FullJitterDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/com/lambdaworks/redis/resource/FuturesTest.java b/src/test/java/io/lettuce/core/resource/FuturesTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/resource/FuturesTest.java
rename to src/test/java/io/lettuce/core/resource/FuturesTest.java
index 4a9310fd52..c761e1dc19 100644
--- a/src/test/java/com/lambdaworks/redis/resource/FuturesTest.java
+++ b/src/test/java/io/lettuce/core/resource/FuturesTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.resource;
+package io.lettuce.core.resource;
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
 import static com.google.code.tempusfugit.temporal.Timeout.timeout;
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java b/src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java
similarity index 85%
rename from src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java
rename to src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java
index 855d451328..8ed0cc0acd 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/AbstractSentinelTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.sentinel;
+package io.lettuce.core.sentinel;
 
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 
-import com.lambdaworks.redis.AbstractTest;
-import com.lambdaworks.redis.FastShutdown;
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
+import io.lettuce.core.AbstractTest;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
similarity index 94%
rename from src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
rename to src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
index b2e4b19351..3f53995a9e 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.sentinel;
+package io.lettuce.core.sentinel;
 
-import static com.lambdaworks.redis.TestSettings.hostAddr;
+import static io.lettuce.core.TestSettings.hostAddr;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
@@ -24,17 +24,17 @@
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.TestClientResources;
+import io.lettuce.TestClientResources;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
+import io.lettuce.Wait;
+import io.lettuce.core.*;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
rename to src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java
index c388f65010..6b2b1dcefd 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelConnectionTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.sentinel;
+package io.lettuce.core.sentinel;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -26,14 +26,14 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.codec.ByteArrayCodec;
-import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
-import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
-import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
+import io.lettuce.TestClientResources;
+import io.lettuce.Wait;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
+import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java b/src/test/java/io/lettuce/core/sentinel/SentinelRule.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
rename to src/test/java/io/lettuce/core/sentinel/SentinelRule.java
index a5f8864fdf..1bc56a4a0a 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelRule.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelRule.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.sentinel;
+package io.lettuce.core.sentinel;
 
 import static com.google.code.tempusfugit.temporal.Duration.seconds;
 
@@ -28,15 +28,15 @@
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
-import com.lambdaworks.Wait;
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.models.role.RedisInstance;
-import com.lambdaworks.redis.models.role.RoleParser;
-import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
-import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
+import io.lettuce.Wait;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.models.role.RedisInstance;
+import io.lettuce.core.models.role.RoleParser;
+import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
+import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
 
 /**
  * Rule to simplify Redis Sentinel handling.
@@ -60,7 +60,7 @@ public class SentinelRule implements TestRule {
     protected Logger log = LogManager.getLogger(getClass());
 
     /**
-     * 
+     *
      * @param redisClient
      * @param flushBeforeTest
      * @param sentinelPorts
@@ -125,7 +125,7 @@ public void flush() {
     /**
      * Requires a master with a slave. If no master or slave is present, the rule flushes known masters and sets up a master
      * with a slave.
-     * 
+     *
      * @param masterId
      * @param redisPorts
      */
@@ -142,7 +142,7 @@ public void needMasterWithSlave(String masterId, int... redisPorts) {
 
     /**
      * Wait until the master has a connected slave.
-     * 
+     *
      * @param masterId
      */
     public void waitForConnectedSlaves(String masterId) {
@@ -153,7 +153,7 @@ public void waitForConnectedSlaves(String masterId) {
 
     /**
      * Wait until sentinel can provide an address for the master.
-     * 
+     *
      * @param masterId
      */
     public void waitForMaster(String masterId) {
@@ -204,7 +204,7 @@ public void monitor(final String key, String ip, int port, int quorum, boolean s
 
     /**
      * Check if the master has slaves at all (no check for connection/alive).
-     * 
+     *
      * @param masterId
      * @return
      */
@@ -225,7 +225,7 @@ public boolean hasSlaves(String masterId) {
 
     /**
      * Check if a master runs on any of the given ports.
-     * 
+     *
      * @param redisPorts
      * @return
      */
@@ -253,7 +253,7 @@ public boolean hasMaster(int... redisPorts) {
 
     /**
      * Check if the master has connected slaves.
-     * 
+     *
      * @param masterId
      * @return
      */
@@ -293,7 +293,7 @@ public boolean hasConnectedSlaves(String masterId) {
 
     /**
      * Setup a master with one or more slaves (depending on port count).
-     * 
+     *
      * @param redisPorts
      * @return
      */
@@ -335,7 +335,7 @@ public int setupMasterSlave(int... redisPorts) {
 
     /**
      * Retrieve the port of the first found master.
-     * 
+     *
      * @param connections
      * @return
      */
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/SentinelServerCommandTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java
similarity index 91%
rename from src/test/java/com/lambdaworks/redis/sentinel/SentinelServerCommandTest.java
rename to src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java
index 283041f5d6..3d7712b94e 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/SentinelServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.sentinel;
+package io.lettuce.core.sentinel;
 
-import static com.lambdaworks.redis.TestSettings.hostAddr;
+import static io.lettuce.core.TestSettings.hostAddr;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.regex.Matcher;
@@ -26,11 +26,11 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import com.lambdaworks.redis.KillArgs;
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
similarity index 77%
rename from src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
index 4f8e1319ea..0bfe7d12f1 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.sentinel.reactive;
+package io.lettuce.core.sentinel.reactive;
 
-import static com.lambdaworks.redis.TestSettings.hostAddr;
+import static io.lettuce.core.TestSettings.hostAddr;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
-import com.lambdaworks.redis.sentinel.SentinelCommandTest;
-import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
-import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands;
+import io.lettuce.core.TestSettings;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.sentinel.SentinelCommandTest;
+import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
+import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
similarity index 77%
rename from src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelServerReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
index 6eaea17ac8..f875d7fdca 100644
--- a/src/test/java/com/lambdaworks/redis/sentinel/reactive/SentinelServerReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.sentinel.reactive;
+package io.lettuce.core.sentinel.reactive;
 
-import static com.lambdaworks.redis.TestSettings.hostAddr;
+import static io.lettuce.core.TestSettings.hostAddr;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.sentinel.SentinelServerCommandTest;
-import com.lambdaworks.redis.sentinel.api.async.RedisSentinelAsyncCommands;
-import com.lambdaworks.redis.sentinel.api.reactive.RedisSentinelReactiveCommands;
-import com.lambdaworks.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.sentinel.SentinelServerCommandTest;
+import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
+import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/server/RandomResponseServer.java b/src/test/java/io/lettuce/core/server/RandomResponseServer.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/server/RandomResponseServer.java
rename to src/test/java/io/lettuce/core/server/RandomResponseServer.java
index ee181acc18..07bc99d186 100644
--- a/src/test/java/com/lambdaworks/redis/server/RandomResponseServer.java
+++ b/src/test/java/io/lettuce/core/server/RandomResponseServer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.server;
+package io.lettuce.core.server;
 
 import java.util.concurrent.TimeUnit;
 
@@ -25,7 +25,7 @@
 
 /**
  * Tiny netty server to generate random base64 data on message reception.
- * 
+ *
  * @author Mark Paluch
  */
 public class RandomResponseServer {
diff --git a/src/test/java/com/lambdaworks/redis/server/RandomServerHandler.java b/src/test/java/io/lettuce/core/server/RandomServerHandler.java
similarity index 97%
rename from src/test/java/com/lambdaworks/redis/server/RandomServerHandler.java
rename to src/test/java/io/lettuce/core/server/RandomServerHandler.java
index 4743e7dd2c..d238b4565a 100644
--- a/src/test/java/com/lambdaworks/redis/server/RandomServerHandler.java
+++ b/src/test/java/io/lettuce/core/server/RandomServerHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.server;
+package io.lettuce.core.server;
 
 import java.security.SecureRandom;
 import java.util.Arrays;
diff --git a/src/test/java/com/lambdaworks/redis/support/CdiTest.java b/src/test/java/io/lettuce/core/support/CdiTest.java
similarity index 89%
rename from src/test/java/com/lambdaworks/redis/support/CdiTest.java
rename to src/test/java/io/lettuce/core/support/CdiTest.java
index dc28b3d18c..5ac548f669 100644
--- a/src/test/java/com/lambdaworks/redis/support/CdiTest.java
+++ b/src/test/java/io/lettuce/core/support/CdiTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -21,18 +21,18 @@
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
 
-import com.lambdaworks.redis.AbstractRedisClientTest;
-import com.lambdaworks.redis.FastShutdown;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.FastShutdown;
 import org.apache.webbeans.cditest.CdiTestContainer;
 import org.apache.webbeans.cditest.CdiTestContainerLoader;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.lambdaworks.redis.RedisConnectionStateListener;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.resource.ClientResources;
-import com.lambdaworks.redis.resource.DefaultClientResources;
+import io.lettuce.core.RedisConnectionStateListener;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.DefaultClientResources;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java
similarity index 92%
rename from src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java
rename to src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java
index cb39a76ee1..51b69807b0 100644
--- a/src/test/java/com/lambdaworks/redis/support/ConnectionPoolSupportTest.java
+++ b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -26,23 +26,23 @@
 import org.apache.commons.pool2.impl.SoftReferenceObjectPool;
 import org.junit.Test;
 
-import com.lambdaworks.TestClientResources;
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.RedisAdvancedClusterAsyncCommandsImpl;
-import com.lambdaworks.redis.cluster.RedisAdvancedClusterReactiveCommandsImpl;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.StatefulRedisClusterConnectionImpl;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.cluster.api.async.RedisAdvancedClusterAsyncCommands;
-import com.lambdaworks.redis.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
-import com.lambdaworks.redis.cluster.api.sync.RedisAdvancedClusterCommands;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.masterslave.MasterSlave;
-import com.lambdaworks.redis.masterslave.StatefulRedisMasterSlaveConnection;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.RedisAdvancedClusterAsyncCommandsImpl;
+import io.lettuce.core.cluster.RedisAdvancedClusterReactiveCommandsImpl;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.StatefulRedisClusterConnectionImpl;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands;
+import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.masterslave.MasterSlave;
+import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/support/InjectedClient.java b/src/test/java/io/lettuce/core/support/InjectedClient.java
similarity index 88%
rename from src/test/java/com/lambdaworks/redis/support/InjectedClient.java
rename to src/test/java/io/lettuce/core/support/InjectedClient.java
index 25c86e3572..82102f03e1 100644
--- a/src/test/java/com/lambdaworks/redis/support/InjectedClient.java
+++ b/src/test/java/io/lettuce/core/support/InjectedClient.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.RedisClusterClient;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/support/PersonDB.java b/src/test/java/io/lettuce/core/support/PersonDB.java
similarity index 95%
rename from src/test/java/com/lambdaworks/redis/support/PersonDB.java
rename to src/test/java/io/lettuce/core/support/PersonDB.java
index 5963a96928..8b9eb167c8 100644
--- a/src/test/java/com/lambdaworks/redis/support/PersonDB.java
+++ b/src/test/java/io/lettuce/core/support/PersonDB.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/test/java/com/lambdaworks/redis/support/PubSubTestListener.java b/src/test/java/io/lettuce/core/support/PubSubTestListener.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/support/PubSubTestListener.java
rename to src/test/java/io/lettuce/core/support/PubSubTestListener.java
index c4c2ac753c..4fdf75f4e0 100644
--- a/src/test/java/com/lambdaworks/redis/support/PubSubTestListener.java
+++ b/src/test/java/io/lettuce/core/support/PubSubTestListener.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
 import java.util.concurrent.BlockingQueue;
 
-import com.lambdaworks.redis.internal.LettuceFactories;
-import com.lambdaworks.redis.pubsub.RedisPubSubListener;
+import io.lettuce.core.internal.LettuceFactories;
+import io.lettuce.core.pubsub.RedisPubSubListener;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBeanTest.java b/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java
similarity index 98%
rename from src/test/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBeanTest.java
rename to src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java
index 9399a92b45..1e85559174 100644
--- a/src/test/java/com/lambdaworks/redis/support/RedisClusterClientFactoryBeanTest.java
+++ b/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -23,7 +23,7 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.RedisURI;
+import io.lettuce.core.RedisURI;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/redis/support/SpringTest.java b/src/test/java/io/lettuce/core/support/SpringTest.java
similarity index 93%
rename from src/test/java/com/lambdaworks/redis/support/SpringTest.java
rename to src/test/java/io/lettuce/core/support/SpringTest.java
index b5629463c9..379ddd7373 100644
--- a/src/test/java/com/lambdaworks/redis/support/SpringTest.java
+++ b/src/test/java/io/lettuce/core/support/SpringTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.support;
+package io.lettuce.core.support;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -24,8 +24,8 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.cluster.RedisClusterClient;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToElastiCacheMaster.java b/src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java
similarity index 83%
rename from src/test/java/com/lambdaworks/examples/ConnectToElastiCacheMaster.java
rename to src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java
index fd78c38de3..ba7d3936fc 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToElastiCacheMaster.java
+++ b/src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.examples;
+package io.lettuce.examples;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.resource.DefaultClientResources;
-import com.lambdaworks.redis.resource.DirContextDnsResolver;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.resource.DefaultClientResources;
+import io.lettuce.core.resource.DirContextDnsResolver;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
similarity index 78%
rename from src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
rename to src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
index 145db6ab12..645dd5d9f8 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
+++ b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
@@ -13,18 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.examples;
+package io.lettuce.examples;
 
 import java.util.Arrays;
 import java.util.List;
 
-import com.lambdaworks.redis.ReadFrom;
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.masterslave.MasterSlave;
-import com.lambdaworks.redis.masterslave.StatefulRedisMasterSlaveConnection;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.masterslave.MasterSlave;
+import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingRedisSentinel.java b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
similarity index 79%
rename from src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingRedisSentinel.java
rename to src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
index caeca3c0aa..cb78276380 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToMasterSlaveUsingRedisSentinel.java
+++ b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.examples;
+package io.lettuce.examples;
 
-import com.lambdaworks.redis.ReadFrom;
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.masterslave.MasterSlave;
-import com.lambdaworks.redis.masterslave.StatefulRedisMasterSlaveConnection;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.masterslave.MasterSlave;
+import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedis.java b/src/test/java/io/lettuce/examples/ConnectToRedis.java
similarity index 89%
rename from src/test/java/com/lambdaworks/examples/ConnectToRedis.java
rename to src/test/java/io/lettuce/examples/ConnectToRedis.java
index 2592209929..8549f58795 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToRedis.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedis.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.examples;
+package io.lettuce.examples;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.StatefulRedisConnection;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedisCluster.java b/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
similarity index 87%
rename from src/test/java/com/lambdaworks/examples/ConnectToRedisCluster.java
rename to src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
index d9a9e568e4..733c75f5c4 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToRedisCluster.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.examples;
+package io.lettuce.examples;
 
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedisClusterSSL.java b/src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java
similarity index 86%
rename from src/test/java/com/lambdaworks/examples/ConnectToRedisClusterSSL.java
rename to src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java
index 1ea69e6087..84fa931ae7 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToRedisClusterSSL.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.examples;
+package io.lettuce.examples;
 
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedisClusterWithTopologyRefreshing.java b/src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java
similarity index 85%
rename from src/test/java/com/lambdaworks/examples/ConnectToRedisClusterWithTopologyRefreshing.java
rename to src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java
index cb0d5179e1..46cee0c6e0 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToRedisClusterWithTopologyRefreshing.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.examples;
+package io.lettuce.examples;
 
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.cluster.ClusterClientOptions;
-import com.lambdaworks.redis.cluster.ClusterTopologyRefreshOptions;
-import com.lambdaworks.redis.cluster.RedisClusterClient;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.ClusterClientOptions;
+import io.lettuce.core.cluster.ClusterTopologyRefreshOptions;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedisSSL.java b/src/test/java/io/lettuce/examples/ConnectToRedisSSL.java
similarity index 89%
rename from src/test/java/com/lambdaworks/examples/ConnectToRedisSSL.java
rename to src/test/java/io/lettuce/examples/ConnectToRedisSSL.java
index 2fa7390a53..650cd11168 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToRedisSSL.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisSSL.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.examples;
+package io.lettuce.examples;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.StatefulRedisConnection;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/examples/ConnectToRedisUsingRedisSentinel.java b/src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java
similarity index 89%
rename from src/test/java/com/lambdaworks/examples/ConnectToRedisUsingRedisSentinel.java
rename to src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java
index 9e6f6455c4..daf6ce6e6c 100644
--- a/src/test/java/com/lambdaworks/examples/ConnectToRedisUsingRedisSentinel.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.examples;
+package io.lettuce.examples;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.StatefulRedisConnection;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/examples/MySpringBean.java b/src/test/java/io/lettuce/examples/MySpringBean.java
similarity index 86%
rename from src/test/java/com/lambdaworks/examples/MySpringBean.java
rename to src/test/java/io/lettuce/examples/MySpringBean.java
index abced3b3d3..b034c9029e 100644
--- a/src/test/java/com/lambdaworks/examples/MySpringBean.java
+++ b/src/test/java/io/lettuce/examples/MySpringBean.java
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.examples;
+package io.lettuce.examples;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+
 /**
  * @author Mark Paluch
  */
diff --git a/src/test/java/com/lambdaworks/examples/ReadWriteExample.java b/src/test/java/io/lettuce/examples/ReadWriteExample.java
similarity index 85%
rename from src/test/java/com/lambdaworks/examples/ReadWriteExample.java
rename to src/test/java/io/lettuce/examples/ReadWriteExample.java
index 49449ee206..6d6b9235b2 100644
--- a/src/test/java/com/lambdaworks/examples/ReadWriteExample.java
+++ b/src/test/java/io/lettuce/examples/ReadWriteExample.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.examples;
+package io.lettuce.examples;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/examples/SpringExample.java b/src/test/java/io/lettuce/examples/SpringExample.java
similarity index 88%
rename from src/test/java/com/lambdaworks/examples/SpringExample.java
rename to src/test/java/io/lettuce/examples/SpringExample.java
index 4e32dacb3c..283ab59060 100644
--- a/src/test/java/com/lambdaworks/examples/SpringExample.java
+++ b/src/test/java/io/lettuce/examples/SpringExample.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.examples;
+package io.lettuce.examples;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java b/src/test/java/io/lettuce/util/ConnectionDecoratingInvocationHandler.java
similarity index 84%
rename from src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java
rename to src/test/java/io/lettuce/util/ConnectionDecoratingInvocationHandler.java
index d908754fd8..d9b9dc636a 100644
--- a/src/test/java/com/lambdaworks/util/ConnectionDecoratingInvocationHandler.java
+++ b/src/test/java/io/lettuce/util/ConnectionDecoratingInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.util;
+package io.lettuce.util;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.internal.AbstractInvocationHandler;
-import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.internal.AbstractInvocationHandler;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/com/lambdaworks/util/ReactiveSyncInvocationHandler.java b/src/test/java/io/lettuce/util/ReactiveSyncInvocationHandler.java
similarity index 89%
rename from src/test/java/com/lambdaworks/util/ReactiveSyncInvocationHandler.java
rename to src/test/java/io/lettuce/util/ReactiveSyncInvocationHandler.java
index 36c854bd2c..604958706b 100644
--- a/src/test/java/com/lambdaworks/util/ReactiveSyncInvocationHandler.java
+++ b/src/test/java/io/lettuce/util/ReactiveSyncInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.util;
+package io.lettuce.util;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -21,16 +21,15 @@
 import java.util.List;
 import java.util.Set;
 
-import com.lambdaworks.redis.api.StatefulConnection;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.internal.LettuceSets;
-import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
-import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.internal.LettuceSets;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
 
 /**
  * Invocation handler for testing purposes.
diff --git a/src/test/java/com/lambdaworks/util/RoutingInvocationHandler.java b/src/test/java/io/lettuce/util/RoutingInvocationHandler.java
similarity index 93%
rename from src/test/java/com/lambdaworks/util/RoutingInvocationHandler.java
rename to src/test/java/io/lettuce/util/RoutingInvocationHandler.java
index 00088fea55..b0b5a9bd93 100644
--- a/src/test/java/com/lambdaworks/util/RoutingInvocationHandler.java
+++ b/src/test/java/io/lettuce/util/RoutingInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.util;
+package io.lettuce.util;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
diff --git a/src/test/jmh/com/lambdaworks/redis/EmptyRedisChannelWriter.java b/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
similarity index 91%
rename from src/test/jmh/com/lambdaworks/redis/EmptyRedisChannelWriter.java
rename to src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
index 7379217bee..b8095d51c4 100644
--- a/src/test/jmh/com/lambdaworks/redis/EmptyRedisChannelWriter.java
+++ b/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.Collection;
 
-import com.lambdaworks.redis.protocol.ConnectionFacade;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.protocol.ConnectionFacade;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/jmh/com/lambdaworks/redis/EmptyStatefulRedisConnection.java b/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
similarity index 86%
rename from src/test/jmh/com/lambdaworks/redis/EmptyStatefulRedisConnection.java
rename to src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
index 202ed9f047..9f1d5f8b8b 100644
--- a/src/test/jmh/com/lambdaworks/redis/EmptyStatefulRedisConnection.java
+++ b/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.api.async.RedisAsyncCommands;
-import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.protocol.ConnectionFacade;
-import com.lambdaworks.redis.protocol.RedisCommand;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.protocol.ConnectionFacade;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/jmh/com/lambdaworks/redis/RedisClientBenchmark.java b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
similarity index 96%
rename from src/test/jmh/com/lambdaworks/redis/RedisClientBenchmark.java
rename to src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
index 2d6c63705e..5329e1c9dc 100644
--- a/src/test/jmh/com/lambdaworks/redis/RedisClientBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import org.openjdk.jmh.annotations.*;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.codec.ByteArrayCodec;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.ByteArrayCodec;
 
 /**
  * Benchmark for {@link RedisClient}.
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
similarity index 88%
rename from src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java
rename to src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
index 111d86b801..27451e1abd 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/ClusterDistributionChannelWriterBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.net.SocketAddress;
 import java.util.Arrays;
@@ -28,16 +28,16 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.cluster.models.partitions.Partitions;
-import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode;
-import com.lambdaworks.redis.codec.ByteArrayCodec;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.output.ValueOutput;
-import com.lambdaworks.redis.protocol.Command;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.output.ValueOutput;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandType;
 
 /**
  * Benchmark for {@link ClusterDistributionChannelWriter}.
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java b/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java
similarity index 80%
rename from src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java
rename to src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java
index b2be6479ad..f29935888d 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/EmptyRedisClusterClient.java
+++ b/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import java.net.SocketAddress;
 import java.util.Collections;
 import java.util.function.Supplier;
 
-import com.lambdaworks.redis.EmptyStatefulRedisConnection;
-import com.lambdaworks.redis.RedisChannelWriter;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.codec.RedisCodec;
+import io.lettuce.core.EmptyStatefulRedisConnection;
+import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.RedisCodec;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/jmh/com/lambdaworks/redis/cluster/RedisClusterClientBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
similarity index 92%
rename from src/test/jmh/com/lambdaworks/redis/cluster/RedisClusterClientBenchmark.java
rename to src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
index 7bf8eaa623..5553d103fa 100644
--- a/src/test/jmh/com/lambdaworks/redis/cluster/RedisClusterClientBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster;
+package io.lettuce.core.cluster;
 
 import org.openjdk.jmh.annotations.*;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.cluster.api.StatefulRedisClusterConnection;
-import com.lambdaworks.redis.codec.ByteArrayCodec;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.codec.ByteArrayCodec;
 
 /**
  * Benchmark for {@link RedisClusterClient}.
@@ -37,7 +37,7 @@
  * <li>reactive command execution with batching</li>
  * <li>reactive command execution with delayed flushing</li>
  * </ul>
- * 
+ *
  * @author Mark Paluch
  */
 @State(Scope.Benchmark)
diff --git a/src/test/jmh/com/lambdaworks/redis/codec/JmhMain.java b/src/test/jmh/io/lettuce/core/codec/JmhMain.java
similarity index 97%
rename from src/test/jmh/com/lambdaworks/redis/codec/JmhMain.java
rename to src/test/jmh/io/lettuce/core/codec/JmhMain.java
index 15e902a6bf..9abc0dec8e 100644
--- a/src/test/jmh/com/lambdaworks/redis/codec/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/codec/JmhMain.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.codec;
+package io.lettuce.core.codec;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
@@ -27,7 +27,7 @@
 
 /**
  * Manual JMH Test Launcher.
- * 
+ *
  * @author Mark Paluch
  */
 public class JmhMain {
diff --git a/src/test/jmh/com/lambdaworks/redis/codec/StringCodecBenchmark.java b/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java
similarity index 96%
rename from src/test/jmh/com/lambdaworks/redis/codec/StringCodecBenchmark.java
rename to src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java
index cd3541bdcb..a4510700bc 100644
--- a/src/test/jmh/com/lambdaworks/redis/codec/StringCodecBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.codec;
+package io.lettuce.core.codec;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -24,14 +24,14 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.infra.Blackhole;
 
-import com.lambdaworks.redis.protocol.LettuceCharsets;
+import io.lettuce.core.protocol.LettuceCharsets;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
 /**
  * Benchmark for {@link StringCodec}.
- * 
+ *
  * @author Mark Paluch
  */
 public class StringCodecBenchmark {
diff --git a/src/test/jmh/com/lambdaworks/redis/codec/Utf8StringCodecBenchmark.java b/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java
similarity index 94%
rename from src/test/jmh/com/lambdaworks/redis/codec/Utf8StringCodecBenchmark.java
rename to src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java
index facdefcaaf..6f98a5b82d 100644
--- a/src/test/jmh/com/lambdaworks/redis/codec/Utf8StringCodecBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.codec;
+package io.lettuce.core.codec;
 
 import java.nio.ByteBuffer;
 
@@ -23,7 +23,7 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.infra.Blackhole;
 
-import com.lambdaworks.redis.protocol.LettuceCharsets;
+import io.lettuce.core.protocol.LettuceCharsets;
 
 /**
  * Benchmark for {@link Utf8StringCodec}.
diff --git a/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandFactoryBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java
similarity index 90%
rename from src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandFactoryBenchmark.java
rename to src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java
index 222a0ff20b..94feb9fcc6 100644
--- a/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandFactoryBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import org.mockito.Mockito;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -21,11 +21,11 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.api.reactive.RedisReactiveCommands;
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.dynamic.batch.BatchSize;
+import io.lettuce.core.*;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.dynamic.batch.BatchSize;
 
 /**
  * Benchmark for commands executed through {@link RedisCommandFactory}.
diff --git a/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandsBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
similarity index 87%
rename from src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandsBenchmark.java
rename to src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
index 19c84aa61b..0aaedbcbd1 100644
--- a/src/test/jmh/com/lambdaworks/redis/dynamic/RedisCommandsBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic;
+package io.lettuce.core.dynamic;
 
 import java.util.concurrent.CompletableFuture;
 
 import org.openjdk.jmh.annotations.*;
 
-import com.lambdaworks.redis.RedisClient;
-import com.lambdaworks.redis.RedisFuture;
-import com.lambdaworks.redis.RedisURI;
-import com.lambdaworks.redis.TestSettings;
-import com.lambdaworks.redis.api.StatefulRedisConnection;
-import com.lambdaworks.redis.codec.ByteArrayCodec;
-import com.lambdaworks.redis.dynamic.batch.BatchSize;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.dynamic.batch.BatchSize;
 
 /**
  * Benchmark for commands executed through {@link StatefulRedisConnection}.
diff --git a/src/test/jmh/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java
similarity index 97%
rename from src/test/jmh/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryBenchmark.java
rename to src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java
index 0ab7baa3f8..b6db4a5231 100644
--- a/src/test/jmh/com/lambdaworks/redis/dynamic/intercept/InvocationProxyFactoryBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.dynamic.intercept;
+package io.lettuce.core.dynamic.intercept;
 
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
similarity index 89%
rename from src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java
rename to src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
index 594e27bff4..ff02e2455b 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/CommandBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.nio.charset.StandardCharsets;
 
@@ -21,11 +21,11 @@
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
 
-import com.lambdaworks.redis.codec.ByteArrayCodec;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.codec.Utf8StringCodec;
-import com.lambdaworks.redis.output.ValueOutput;
+import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.output.ValueOutput;
 
 /**
  * Benchmark for {@link Command}. Test cases:
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/CommandHandlerBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
similarity index 91%
rename from src/test/jmh/com/lambdaworks/redis/protocol/CommandHandlerBenchmark.java
rename to src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
index e2e7451439..20c56a3b60 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/CommandHandlerBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 
-import com.lambdaworks.redis.ClientOptions;
-import com.lambdaworks.redis.codec.ByteArrayCodec;
-import com.lambdaworks.redis.output.ValueOutput;
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.output.ValueOutput;
 
 /**
  * Benchmark for {@link CommandHandler}. Test cases:
  * <ul>
  * <li>netty (in-eventloop) writes</li>
  * </ul>
- * 
+ *
  * @author Mark Paluch
  */
 @State(Scope.Benchmark)
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyByteBuf.java b/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
similarity index 99%
rename from src/test/jmh/com/lambdaworks/redis/protocol/EmptyByteBuf.java
rename to src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
index 874abed595..c3b7194012 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyByteBuf.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
similarity index 84%
rename from src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java
rename to src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
index 9a50f1b90c..67acdb193f 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyClientResources.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.net.SocketAddress;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.event.DefaultEventPublisherOptions;
-import com.lambdaworks.redis.event.EventBus;
-import com.lambdaworks.redis.event.EventPublisherOptions;
-import com.lambdaworks.redis.metrics.CommandLatencyCollector;
-import com.lambdaworks.redis.metrics.CommandLatencyId;
-import com.lambdaworks.redis.metrics.CommandMetrics;
-import com.lambdaworks.redis.resource.ClientResources;
-import com.lambdaworks.redis.resource.Delay;
-import com.lambdaworks.redis.resource.DnsResolver;
-import com.lambdaworks.redis.resource.EventLoopGroupProvider;
+import io.lettuce.core.event.DefaultEventPublisherOptions;
+import io.lettuce.core.event.EventBus;
+import io.lettuce.core.event.EventPublisherOptions;
+import io.lettuce.core.metrics.CommandLatencyCollector;
+import io.lettuce.core.metrics.CommandLatencyId;
+import io.lettuce.core.metrics.CommandMetrics;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.Delay;
+import io.lettuce.core.resource.DnsResolver;
+import io.lettuce.core.resource.EventLoopGroupProvider;
 import io.netty.util.Timer;
 import io.netty.util.concurrent.*;
 
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyContext.java b/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
similarity index 99%
rename from src/test/jmh/com/lambdaworks/redis/protocol/EmptyContext.java
rename to src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
index 89cf7a089c..4cf66c7ddb 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyContext.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyFuture.java b/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java
similarity index 98%
rename from src/test/jmh/com/lambdaworks/redis/protocol/EmptyFuture.java
rename to src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java
index 39943f0eec..7ff2cf1ea3 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyFuture.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
@@ -28,7 +28,7 @@
  * @author Mark Paluch
  */
 class EmptyFuture implements ChannelFuture {
-    
+
     @Override
     public Channel channel() {
         return null;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyPromise.java b/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
similarity index 99%
rename from src/test/jmh/com/lambdaworks/redis/protocol/EmptyPromise.java
rename to src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
index 372eed8a42..ed68201683 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/EmptyPromise.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
similarity index 98%
rename from src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java
rename to src/test/jmh/io/lettuce/core/protocol/JmhMain.java
index 7f15361ad5..2b8af8aa97 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
similarity index 91%
rename from src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java
rename to src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
index 0e0126eefb..00e8170ebf 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/RedisEndpointBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import org.openjdk.jmh.annotations.*;
 
-import com.lambdaworks.redis.ClientOptions;
-import com.lambdaworks.redis.EmptyStatefulRedisConnection;
-import com.lambdaworks.redis.codec.ByteArrayCodec;
-import com.lambdaworks.redis.output.ValueOutput;
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.EmptyStatefulRedisConnection;
+import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.output.ValueOutput;
 
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelPromise;
diff --git a/src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
similarity index 94%
rename from src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java
rename to src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
index e67019df36..b25351b889 100644
--- a/src/test/jmh/com/lambdaworks/redis/protocol/RedisStateMachineBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import java.nio.ByteBuffer;
 import java.util.List;
 
 import org.openjdk.jmh.annotations.*;
 
-import com.lambdaworks.redis.codec.ByteArrayCodec;
-import com.lambdaworks.redis.output.ArrayOutput;
+import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.output.ArrayOutput;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
diff --git a/src/test/resources/com/lambdaworks/redis/support/SpringTest-context.xml b/src/test/resources/io/lettuce/core/support/SpringTest-context.xml
similarity index 61%
rename from src/test/resources/com/lambdaworks/redis/support/SpringTest-context.xml
rename to src/test/resources/io/lettuce/core/support/SpringTest-context.xml
index f5e6fa68c4..058bccac2d 100644
--- a/src/test/resources/com/lambdaworks/redis/support/SpringTest-context.xml
+++ b/src/test/resources/io/lettuce/core/support/SpringTest-context.xml
@@ -3,35 +3,35 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="TestSettings" class="com.lambdaworks.redis.TestSettings"></bean>
+    <bean id="TestSettings" class="io.lettuce.core.TestSettings"></bean>
     <bean id="ClientResources"
-          class="com.lambdaworks.redis.support.ClientResourcesFactoryBean"></bean>
+          class="io.lettuce.core.support.ClientResourcesFactoryBean"></bean>
 
-    <bean id="MasterUri" class="com.lambdaworks.redis.RedisURI">
+    <bean id="MasterUri" class="io.lettuce.core.RedisURI">
         <property name="host" value="#{TestSettings.host()}"/>
         <property name="port" value="#{TestSettings.port()}"/>
     </bean>
 
-    <bean id="RedisClient1" class="com.lambdaworks.redis.support.RedisClientFactoryBean">
+    <bean id="RedisClient1" class="io.lettuce.core.support.RedisClientFactoryBean">
         <property name="redisURI" ref="MasterUri"/>
         <property name="clientResources" ref="ClientResources"/>
     </bean>
 
-    <bean id="RedisClient2" class="com.lambdaworks.redis.support.RedisClientFactoryBean">
+    <bean id="RedisClient2" class="io.lettuce.core.support.RedisClientFactoryBean">
         <property name="uri" value="redis://#{TestSettings.host()}:#{TestSettings.port()}/0"/>
         <property name="clientResources" ref="ClientResources"/>
     </bean>
 
-    <bean id="RedisClient3" class="com.lambdaworks.redis.support.RedisClientFactoryBean">
+    <bean id="RedisClient3" class="io.lettuce.core.support.RedisClientFactoryBean">
         <property name="uri" value="redis-sentinel://#{TestSettings.host()}:#{TestSettings.port()}/0#master"/>
     </bean>
 
-    <bean id="RedisClusterClient1" class="com.lambdaworks.redis.support.RedisClusterClientFactoryBean">
+    <bean id="RedisClusterClient1" class="io.lettuce.core.support.RedisClusterClientFactoryBean">
         <property name="redisURI" ref="MasterUri"/>
         <property name="clientResources" ref="ClientResources"/>
     </bean>
 
-    <bean id="RedisClusterClient2" class="com.lambdaworks.redis.support.RedisClusterClientFactoryBean">
+    <bean id="RedisClusterClient2" class="io.lettuce.core.support.RedisClusterClientFactoryBean">
         <property name="uri" value="redis://#{TestSettings.host()}:#{TestSettings.port()}/0"/>
     </bean>
 </beans>
diff --git a/src/test/resources/com/lambdaworks/examples/SpringTest-context.xml b/src/test/resources/io/lettuce/examples/SpringTest-context.xml
similarity index 69%
rename from src/test/resources/com/lambdaworks/examples/SpringTest-context.xml
rename to src/test/resources/io/lettuce/examples/SpringTest-context.xml
index 24e5b3f1ea..eab55942bf 100644
--- a/src/test/resources/com/lambdaworks/examples/SpringTest-context.xml
+++ b/src/test/resources/io/lettuce/examples/SpringTest-context.xml
@@ -3,10 +3,10 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="RedisClient" class="com.lambdaworks.redis.support.RedisClientFactoryBean">
+    <bean id="RedisClient" class="io.lettuce.core.support.RedisClientFactoryBean">
         <property name="uri" value="redis://localhost:6379"/>
     </bean>
 
-    <bean class="com.lambdaworks.examples.MySpringBean" autowire="byType"/>
+    <bean class="io.lettuce.examples.MySpringBean" autowire="byType"/>
 
 </beans>
diff --git a/src/test/resources/log4j2-test.xml b/src/test/resources/log4j2-test.xml
index 672acaaa90..1b10de22c6 100644
--- a/src/test/resources/log4j2-test.xml
+++ b/src/test/resources/log4j2-test.xml
@@ -13,9 +13,9 @@
 
     <Loggers>
         <Logger name="io.netty" level="INFO"/>
-        <Logger name="com.lambdaworks.redis" level="INFO"/>
-        <Logger name="com.lambdaworks.redis.cluster" level="INFO"/>
-        <Logger name="com.lambdaworks.redis.protocol" level="INFO"/>
+        <Logger name="io.lettuce.core" level="INFO"/>
+        <Logger name="io.lettuce.core.cluster" level="INFO"/>
+        <Logger name="io.lettuce.core.protocol" level="INFO"/>
         <Logger name="io.netty" level="INFO"/>
         <Root level="INFO">
             <AppenderRef ref="Console"/>
diff --git a/src/test/resources/spring-test.xml b/src/test/resources/spring-test.xml
index 4804d43392..9e2f82bf67 100644
--- a/src/test/resources/spring-test.xml
+++ b/src/test/resources/spring-test.xml
@@ -2,7 +2,7 @@
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-    <bean id="redisClient" class="com.lambdaworks.redis.support.RedisClientFactoryBean">
+    <bean id="redisClient" class="io.lettuce.core.support.RedisClientFactoryBean">
         <property name="password" value="mypassword" />
         <!-- Redis Uri Format: redis://host[:port]/database -->
         <!-- Redis Uri: Specify Database as Path -->
@@ -12,4 +12,4 @@
         <!-- Redis Sentinel Uri: You can specify multiple sentinels. Specify Database as Path, Master Id as Fragment. -->
         <property name="uri" value="redis-sentinel://localhost,localhost2,localhost3/1#myMaster" />
     </bean>
-</beans>
\ No newline at end of file
+</beans>

From 16ab23c94b0fbf4095ad9a5d5a5ea056ef986d92 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 21 Jan 2017 01:21:03 +0100
Subject: [PATCH 174/808] Create reference documentation #494

---
 pom.xml                                       |  201 +-
 src/assembly/bin.xml                          |    6 +-
 src/assembly/docs.xml                         |   17 +
 src/main/asciidoc/advanced-usage.asciidoc     |   46 +
 src/main/asciidoc/connecting-redis.asciidoc   |    0
 src/main/asciidoc/getting-started.asciidoc    |   33 +
 src/main/asciidoc/ha-sharding.asciidoc        |   26 +
 src/main/asciidoc/images/golo/body-bg.png     |  Bin 0 -> 264510 bytes
 src/main/asciidoc/images/golo/pre-bg.png      |  Bin 0 -> 301360 bytes
 src/main/asciidoc/index.asciidoc              |   22 +
 .../asciidoc/integration-extension.asciidoc   |   15 +
 src/main/asciidoc/overview.asciidoc           |   67 +
 .../redis-command-interfaces.asciidoc         |    4 +
 src/main/asciidoc/stylesheets/golo.css        | 2002 +++++++++++++++++
 src/main/javadoc/stylesheet.css               |  640 ++++++
 15 files changed, 3075 insertions(+), 4 deletions(-)
 create mode 100644 src/assembly/docs.xml
 create mode 100644 src/main/asciidoc/advanced-usage.asciidoc
 create mode 100644 src/main/asciidoc/connecting-redis.asciidoc
 create mode 100644 src/main/asciidoc/getting-started.asciidoc
 create mode 100644 src/main/asciidoc/ha-sharding.asciidoc
 create mode 100644 src/main/asciidoc/images/golo/body-bg.png
 create mode 100644 src/main/asciidoc/images/golo/pre-bg.png
 create mode 100644 src/main/asciidoc/index.asciidoc
 create mode 100644 src/main/asciidoc/integration-extension.asciidoc
 create mode 100644 src/main/asciidoc/overview.asciidoc
 create mode 100644 src/main/asciidoc/redis-command-interfaces.asciidoc
 create mode 100644 src/main/asciidoc/stylesheets/golo.css
 create mode 100644 src/main/javadoc/stylesheet.css

diff --git a/pom.xml b/pom.xml
index 4a0a2adcb3..06c8e9512d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,13 +13,21 @@
     <version>5.0.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>lettuce</name>
-    <url>http://github.com/lettuce-io/lettuce-core</url>
+    <name>Lettuce</name>
+
     <description>Advanced and thread-safe Java Redis client for synchronous, asynchronous, and
         reactive usage. Supports Cluster, Sentinel, Pipelining, Auto-Reconnect, Codecs
         and much more.
     </description>
 
+    <url>http://github.com/lettuce-io/lettuce-core</url>
+
+    <organization>
+        <name>lettuce.io</name>
+        <url>https://lettuce.io</url>
+    </organization>
+
+
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -324,8 +332,10 @@
     </dependencies>
 
     <profiles>
+
         <profile>
             <id>netty-40</id>
+
             <properties>
                 <netty-version>4.0.45.Final</netty-version>
             </properties>
@@ -355,7 +365,9 @@
         </profile>
 
         <profile>
+
             <id>sonatype-oss-release</id>
+
             <build>
                 <plugins>
                     <plugin>
@@ -439,7 +451,9 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
+
             <id>jmh</id>
 
             <dependencies>
@@ -529,6 +543,178 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+
+            <id>no-install</id>
+
+            <properties>
+                <maven.install.skip>true</maven.install.skip>
+                <skipTests>true</skipTests>
+            </properties>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-install-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                            <uniqueVersion>false</uniqueVersion>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+
+            <id>documentation</id>
+
+            <build>
+
+                <plugins>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.8</version>
+                        <executions>
+
+                            <execution>
+                                <id>rename-reference-docs</id>
+                                <phase>process-resources</phase>
+                                <configuration>
+                                    <target>
+                                        <copy failonerror="false"
+                                              file="${project.build.directory}/generated-docs/index.pdf"
+                                              tofile="target/site/reference/pdf/lettuce-reference.pdf"/>
+                                    </target>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.asciidoctor</groupId>
+                        <artifactId>asciidoctor-maven-plugin</artifactId>
+                    </plugin>
+
+                </plugins>
+
+
+                <pluginManagement>
+                    <plugins>
+
+                        <!--
+                            Asciidoctor
+                        -->
+
+                        <plugin>
+                            <groupId>org.asciidoctor</groupId>
+                            <artifactId>asciidoctor-maven-plugin</artifactId>
+                            <version>1.5.3</version>
+                            <dependencies>
+                                <dependency>
+                                    <groupId>org.asciidoctor</groupId>
+                                    <artifactId>asciidoctorj-pdf</artifactId>
+                                    <version>1.5.0-alpha.11</version>
+                                </dependency>
+                            </dependencies>
+                            <executions>
+
+                                <execution>
+                                    <id>html</id>
+                                    <phase>generate-resources</phase>
+                                    <goals>
+                                        <goal>process-asciidoc</goal>
+                                    </goals>
+                                    <configuration>
+                                        <backend>html5</backend>
+                                        <outputDirectory>${project.build.directory}/site/reference/html
+                                        </outputDirectory>
+                                        <sectids>false</sectids>
+                                        <doctype>book</doctype>
+                                        <attributes>
+                                            <linkcss>true</linkcss>
+                                            <sectanchors>true</sectanchors>
+                                            <stylesdir>stylesheets</stylesdir>
+                                            <stylesheet>golo.css</stylesheet>
+                                        </attributes>
+                                    </configuration>
+                                </execution>
+
+                                <execution>
+                                    <id>pdf</id>
+                                    <phase>generate-resources</phase>
+                                    <goals>
+                                        <goal>process-asciidoc</goal>
+                                    </goals>
+                                    <configuration>
+                                        <backend>pdf</backend>
+                                    </configuration>
+                                </execution>
+
+                            </executions>
+
+                            <configuration>
+                                <sourceDirectory>src/main/asciidoc</sourceDirectory>
+                                <sourceDocumentName>index.asciidoc</sourceDocumentName>
+                                <doctype>book</doctype>
+                                <attributes>
+                                    <version>${project.version}</version>
+                                    <allow-uri-read>true</allow-uri-read>
+                                    <toclevels>3</toclevels>
+                                    <numbered>true</numbered>
+                                    <ext-doc>https://raw.githubusercontent.com/wiki/mp911de/lettuce/</ext-doc>
+                                    <allow-uri-read></allow-uri-read>
+                                    <docinfo></docinfo>
+                                    <toc2></toc2>
+                                    <icons>font</icons>
+                                    <source-highlighter>coderay</source-highlighter>
+                                </attributes>
+                            </configuration>
+                        </plugin>
+
+
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-assembly-plugin</artifactId>
+                            <version>2.4</version>
+                            <executions>
+                                <execution>
+                                    <id>docs</id>
+                                    <phase>package</phase>
+                                    <goals>
+                                        <goal>single</goal>
+                                    </goals>
+                                    <configuration>
+                                        <finalName>${project.artifactId}-${project.version}</finalName>
+                                        <descriptors>
+                                            <descriptor>src/assembly/docs.xml</descriptor>
+                                        </descriptors>
+                                        <tarLongFileMode>gnu</tarLongFileMode>
+                                        <attach>true</attach>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
+
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
     </profiles>
 
     <build>
@@ -571,10 +757,19 @@
                 </executions>
                 <configuration>
                     <level>public</level>
+                    <overview>src/javadoc/overview.html</overview>
+                    <author>true</author>
+                    <header>Lettuce</header>
+                    <stylesheetfile>src/main/javadoc/stylesheet.css</stylesheetfile>
                     <links>
                         <link>http://netty.io/4.1/api/</link>
                         <link>http://commons.apache.org/proper/commons-pool/api-2.4.2/</link>
                         <link>https://docs.oracle.com/javase/8/docs/api/</link>
+                        <link>https://projectreactor.io/docs/core/release/api/</link>
+                        <link>http://www.reactive-streams.org/reactive-streams-1.0.0-javadoc/</link>
+                        <link>http://reactivex.io/RxJava/javadoc/</link>
+                        <link>http://reactivex.io/RxJava/2.x/javadoc/</link>
+                        <link>https://docs.spring.io/spring/docs/current/javadoc-api/</link>
                     </links>
                     <additionalparam>-Xdoclint:all -Xdoclint:-html -Xdoclint:-syntax -Xdoclint:-missing
                     </additionalparam>
@@ -611,7 +806,7 @@
                 <artifactId>maven-release-plugin</artifactId>
                 <version>2.5</version>
                 <configuration>
-                    <releaseProfiles>sonatype-oss-release</releaseProfiles>
+                    <releaseProfiles>sonatype-oss-release,documentation</releaseProfiles>
                     <arguments>-DskipSigning=false</arguments>
                     <goals>deploy</goals>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index b7b0f88720..891bfdcf58 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -43,7 +43,7 @@
             <includes>
                 <include>io.lettuce:lettuce-core:*:javadoc</include>
             </includes>
-            <outputDirectory>apidocs</outputDirectory>
+            <outputDirectory>docs/apidocs</outputDirectory>
             <unpack>true</unpack>
             <useProjectArtifact>false</useProjectArtifact>
             <useProjectAttachments>true</useProjectAttachments>
@@ -58,5 +58,9 @@
                 <include>RELEASE-NOTES.md</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/site/reference</directory>
+            <outputDirectory>docs/reference</outputDirectory>
+        </fileSet>
     </fileSets>
 </assembly>
diff --git a/src/assembly/docs.xml b/src/assembly/docs.xml
new file mode 100644
index 0000000000..9971aab3f3
--- /dev/null
+++ b/src/assembly/docs.xml
@@ -0,0 +1,17 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+    <id>docs</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <baseDirectory>/</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.directory}/site/reference/html</directory>
+            <outputDirectory>/</outputDirectory>
+            <useDefaultExcludes>true</useDefaultExcludes>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/src/main/asciidoc/advanced-usage.asciidoc b/src/main/asciidoc/advanced-usage.asciidoc
new file mode 100644
index 0000000000..a99b48cbad
--- /dev/null
+++ b/src/main/asciidoc/advanced-usage.asciidoc
@@ -0,0 +1,46 @@
+:auto-reconnect-link: <<client-options,auto-reconnection>>
+:client-options-link: <<client-resources>>
+:client-resources-link: <<client-options>>
+
+:custom-commands-command-output-link: <<custom-commands.outputs>>
+:custom-commands-command-exec-model-link: <<custom-commands.synchronous-asynchronous-and-reactive,Custom commands>>
+
+[[advanced-usage]]
+== Advanced usage
+
+[[client-resources]]
+=== Configuring Client resources
+include::{ext-doc}/Configuring-Client-resources.asciidoc[leveloffset=+2]
+
+[[client-options]]
+=== Client options
+include::{ext-doc}/Client-options.asciidoc[leveloffset=+2]
+
+[[ssl]]
+=== SSL Connections
+include::{ext-doc}/SSL-Connections.asciidoc[leveloffset=+2]
+
+[[unix-domain-sockets]]
+=== Unix Domain Sockets
+include::{ext-doc}/Unix-Domain-Sockets.asciidoc[leveloffset=+2]
+
+[[streaming-api]]
+=== Streaming API
+include::{ext-doc}/Streaming-API.asciidoc[leveloffset=+1]
+
+[[events]]
+=== Events
+include::{ext-doc}/Connection-Events.asciidoc[leveloffset=+2]
+
+=== Pipelining and command flushing
+include::{ext-doc}/Pipelining-and-command-flushing.asciidoc[leveloffset=+2]
+
+=== Connection Pooling
+include::{ext-doc}/Connection-Pooling.asciidoc[leveloffset=+2]
+
+=== Custom commands
+include::{ext-doc}/Custom-commands%2C-outputs-and-command-mechanics.asciidoc[leveloffset=+2]
+
+[[command-execution-reliability]]
+=== Command execution reliability
+include::{ext-doc}/Command-execution-reliability.asciidoc[leveloffset=+2]
diff --git a/src/main/asciidoc/connecting-redis.asciidoc b/src/main/asciidoc/connecting-redis.asciidoc
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/main/asciidoc/getting-started.asciidoc b/src/main/asciidoc/getting-started.asciidoc
new file mode 100644
index 0000000000..c48ad355c3
--- /dev/null
+++ b/src/main/asciidoc/getting-started.asciidoc
@@ -0,0 +1,33 @@
+:ssl-link: <<ssl>>
+:uds-link: <<unix-domain-sockets>>
+:basic-synchronous-link: <<basic-usage,Synchronous>>
+:asynchronous-api-link: <<asynchronous-api>>
+:reactive-api-link: <<reactive-api>>
+:asynchronous-link: <<asynchronous-api,asynchronous>>
+:reactive-link: <<reactive-api,reactive>>
+
+[[getting-started]]
+== Getting Started
+include::{ext-doc}/Getting-started-%285.0%29.asciidoc[leveloffset=+1]
+
+[[connecting-redis]]
+== Connecting Redis
+include::{ext-doc}/Redis-URI-and-connection-details.asciidoc[leveloffset=+1]
+
+[[basic-usage]]
+=== Basic Usage
+include::{ext-doc}/Basic-usage.asciidoc[leveloffset=+1]
+
+[[asynchronous-api]]
+=== Asynchronous API
+include::{ext-doc}/Asynchronous-API.asciidoc[leveloffset=+2]
+
+[[reactive-api]]
+=== Reactive API
+include::{ext-doc}/Reactive-API-%285.0%29.asciidoc[leveloffset=+2]
+
+=== Publish/Subscribe
+include::{ext-doc}/Pub-Sub.asciidoc[leveloffset=+1]
+
+=== Transactions/Multi
+include::{ext-doc}/Transactions.asciidoc[leveloffset=+1]
diff --git a/src/main/asciidoc/ha-sharding.asciidoc b/src/main/asciidoc/ha-sharding.asciidoc
new file mode 100644
index 0000000000..9ba0776c67
--- /dev/null
+++ b/src/main/asciidoc/ha-sharding.asciidoc
@@ -0,0 +1,26 @@
+:redis-sentinel-link: <<redis-sentinel>>
+:master-slave-api-link: <<master-slave>>
+:cco-up-to-5-times: <<clientoptions.cluster-specific-options,up to 5 times>>
+:cco-link: <<clientoptions.cluster-specific-options,Cluster-specific Client options>>
+:cco-periodic-link: <<clientoptions.cluster-specific-options,Periodic updates>>
+:cco-adaptive-link: <<clientoptions.cluster-specific-options,Adaptive updates>>
+
+[[ha-sharding]]
+== High-Availability and Sharding
+
+[[master-slave]]
+=== Master/Slave
+include::{ext-doc}/Master-Slave.asciidoc[leveloffset=+2]
+
+[[redis-sentinel]]
+=== Redis Sentinel
+include::{ext-doc}/Redis-Sentinel.asciidoc[leveloffset=+2]
+
+[[redis-cluster]]
+=== Redis Cluster
+include::{ext-doc}/Redis-Cluster.asciidoc[leveloffset=+2]
+
+[[readfrom-settings]]
+=== ReadFrom Settings
+include::{ext-doc}/ReadFrom-Settings.asciidoc[leveloffset=+2]
+
diff --git a/src/main/asciidoc/images/golo/body-bg.png b/src/main/asciidoc/images/golo/body-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e43a16c7b19c16d3837e8c0ab5d23bab64ca334
GIT binary patch
literal 264510
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%0DJnqeRg2@Mqr-1#(PS@$kk9wZcje@?i
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
YA0=r{W89?=Pyhe`07*qoM6N<$f-&rBlmGw#

literal 0
HcmV?d00001

diff --git a/src/main/asciidoc/images/golo/pre-bg.png b/src/main/asciidoc/images/golo/pre-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd9ab78e69415f818c4bc1b70752d02b75babf38
GIT binary patch
literal 301360
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%0AG`t-EV26>}<mg&Ui+URE<L<INO@nDuT2UPO
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%0A#^Ti~<M^nRD5
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%0D(=E>V6s6Feek
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
Q>Hq)$07*qoM6N<$f)@6f=Kufz

literal 0
HcmV?d00001

diff --git a/src/main/asciidoc/index.asciidoc b/src/main/asciidoc/index.asciidoc
new file mode 100644
index 0000000000..0589c3d6a5
--- /dev/null
+++ b/src/main/asciidoc/index.asciidoc
@@ -0,0 +1,22 @@
+= Lettuce Reference Guide
+Mark Paluch <https://twitter.com/mp911de[@mp911de]>;
+:ext-doc: https://raw.githubusercontent.com/wiki/mp911de/lettuce/
+{version}
+:doctype: book
+:icons: font
+:toc:
+:sectnums:
+:sectanchors:
+
+include::overview.asciidoc[]
+
+include::getting-started.asciidoc[]
+
+include::ha-sharding.asciidoc[]
+
+include::redis-command-interfaces.asciidoc[]
+
+include::advanced-usage.asciidoc[]
+
+include::integration-extension.asciidoc[]
+
diff --git a/src/main/asciidoc/integration-extension.asciidoc b/src/main/asciidoc/integration-extension.asciidoc
new file mode 100644
index 0000000000..b66fccd3cc
--- /dev/null
+++ b/src/main/asciidoc/integration-extension.asciidoc
@@ -0,0 +1,15 @@
+[[integration-extension]]
+== Integration and Extension
+
+[[codecs]]
+=== Codecs
+include::{ext-doc}/Codecs.asciidoc[leveloffset=+1]
+
+[[cdi-support]]
+=== CDI Support
+include::{ext-doc}/CDI-Support.asciidoc[leveloffset=+1]
+
+[[spring-support]]
+=== Spring Support
+include::{ext-doc}/Spring-Support.asciidoc[leveloffset=+1]
+
diff --git a/src/main/asciidoc/overview.asciidoc b/src/main/asciidoc/overview.asciidoc
new file mode 100644
index 0000000000..edcddb60e4
--- /dev/null
+++ b/src/main/asciidoc/overview.asciidoc
@@ -0,0 +1,67 @@
+[[overview]]
+== Overview
+
+This document is the reference guide for lettuce. It explains how to use lettuce, its concepts, semantics, and the syntax.
+
+You can read this reference guide in a linear fashion, or you can skip sections if something does not interest you.
+
+This section provides some basic introduction to Redis. The rest of the document refers only to lettuce features and assumes the user is familiar with Redis concepts.
+
+[[overview.redis]]
+=== Knowing Redis
+NoSQL stores have taken the storage world by storm. It is a vast domain with a plethora of solutions, terms and patterns (to make things worse even the term itself has multiple http://www.google.com/search?q=nosoql+acronym[meanings]). While some of the principles are common, it is crucial that the user is familiar to some degree with Redis. The best way to get acquainted to this solutions is to read their documentation and follow their documentation - it usually doesn't take more then 5-10 minutes to go through them and if you are coming from an RDMBS-only background many times these exercises can be an eye opener.
+
+The jumping off ground for learning about Redis is http://www.redis.io/[redis.io]. Here is a list of other useful resources:
+
+* The http://try.redis.io/[interactive tutorial] introduces Redis.
+* The http://redis.io/commands[command references] explains Redis commands and contains links to getting started guides, reference documentation and tutorials.
+
+=== Project Reactor
+
+https://projectreactor.io[Reactor] is a highly optimized reactive library for building efficient, non-blocking
+applications on the JVM based on the https://github.com/reactive-streams/reactive-streams-jvm[Reactive Streams Specification].
+Reactor based applications can sustain very high throughput message rates and operate with a very low memory footprint,
+making it suitable for building efficient event-driven applications using the microservices architecture.
+
+Reactor implements two publishers https://projectreactor.io/docs/core/release/api/reactor/core/publisher/Flux.html[Flux<T>] and
+https://projectreactor.io/docs/core/release/api/reactor/core/publisher/Mono.html[Mono<T>], both of which support non-blocking back-pressure.
+This enables exchange of data between threads with well-defined memory usage, avoiding unnecessary intermediate buffering or blocking.
+
+=== Non-blocking API for Redis
+
+Lettuce is a scalable thread-safe Redis client based on http://netty.io[netty] and Reactor. Lettuce provides <<basic-usage,synchronous>>, <<asynchronous-api,asynchronous>> and <<reactive-api,reactive>> APIs to interact with Redis.
+
+[[overview.requirements]]
+=== Requirements
+
+lettuce 4.x and 5.x binaries requires JDK level 8.0 and above.
+
+In terms of http://redis.io/[Redis], at least 2.6.
+
+=== Additional Help Resources
+
+Learning a new framework is not always straight forward. In this section, we try to provide what we think is an easy to follow guide for starting with lettuce. However, if you encounter issues or you are just looking for an advice, feel free to use one of the links below:
+
+[[overview.support]]
+==== Support
+
+There are a few support options available:
+
+ * Lettuce on Stackoverflow http://stackoverflow.com/questions/tagged/lettuce[Stackoverflow] is a tag for all lettuce users to share information and help each other. Note that registration is needed *only* for posting.
+ * Get in touch with the community on https://gitter.im/mp911de/lettuce[Gitter].
+ * Google Group: https://groups.google.com/d/forum/lettuce-redis-client-users[lettuce-redis-client-users] or mailto:lettuce-redis-client-users@googlegroups.com
+ * Report bugs (or ask questions) in Github issues https://github.com/mp911de/lettuce/issues
+
+[[overview.development]]
+==== Following Development
+
+For information on the lettuce source code repository, nightly builds and snapshot artifacts please see the https://redis.paluch.biz[lettuce homepage]. You can help make lettuce best serve the needs of the lettuce community by interacting with developers through the Community on http://stackoverflow.com/questions/tagged/lettuce[Stackoverflow]. To follow developer activity look for the mailing list information on the https://redis.paluch.biz[lettuce homepage]. If you encounter a bug or want to suggest an improvement, please create a ticket on the lettuce issue https://github.com/mp911de/lettuce/issues[tracker].
+
+=== Where to go from here
+ * Head to <<getting-started>> if you feel like jumping straight into the code.
+ * Go to <<ha-sharding>> for Master/Slave, Redis Sentinel and Redis Cluster topics.
+ * In order to dig deeper into the core features of Reactor:
+ ** If you’re looking for client configuration options, performance related behavior and how to use various transports, go to <<advanced-usage>>.
+ ** See <<integration-extension>> for extending lettuce with codecs or integrate it in your CDI/Spring application.
+ ** You want to know more about *at-least-once* and *at-most-once*? Take a look into <<command-execution-reliability>>.
+
diff --git a/src/main/asciidoc/redis-command-interfaces.asciidoc b/src/main/asciidoc/redis-command-interfaces.asciidoc
new file mode 100644
index 0000000000..ae5b750bf6
--- /dev/null
+++ b/src/main/asciidoc/redis-command-interfaces.asciidoc
@@ -0,0 +1,4 @@
+
+[[redis-command-interfaces]]
+include::{ext-doc}/Redis-Command-Interfaces.asciidoc[leveloffset=+1]
+
diff --git a/src/main/asciidoc/stylesheets/golo.css b/src/main/asciidoc/stylesheets/golo.css
new file mode 100644
index 0000000000..ad9599836d
--- /dev/null
+++ b/src/main/asciidoc/stylesheets/golo.css
@@ -0,0 +1,2002 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@import url('https://fonts.googleapis.com/css?family=Raleway:300:400:700');
+@import url(http://cdnjs.cloudflare.com/ajax/libs/semantic-ui/1.6.2/semantic.min.css);
+
+
+#header .details br+span.author:before {
+    content: "\00a0\0026\00a0";
+    color: rgba(0,0,0,.85);
+}
+
+#header .details br+span.email:before {
+    content: "(";
+}
+
+#header .details br+span.email:after {
+    content: ")";
+}
+
+/*! normalize.css v2.1.2 | MIT License | git.io/normalize */
+/* ========================================================================== HTML5 display definitions ========================================================================== */
+/** Correct `block` display not defined in IE 8/9. */
+@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.1/css/font-awesome.css);
+
+article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary {
+    display: block;
+}
+
+/** Correct `inline-block` display not defined in IE 8/9. */
+audio, canvas, video {
+    display: inline-block;
+}
+
+/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
+audio:not([controls]) {
+    display: none;
+    height: 0;
+}
+
+/** Address `[hidden]` styling not present in IE 8/9. Hide the `template` element in IE, Safari, and Firefox < 22. */
+[hidden], template {
+    display: none;
+}
+
+script {
+    display: none !important;
+}
+
+/* ========================================================================== Base ========================================================================== */
+/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
+html {
+    font-family: sans-serif; /* 1 */
+    -ms-text-size-adjust: 100%; /* 2 */
+    -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/** Remove default margin. */
+body {
+    margin: 0;
+}
+
+/* ========================================================================== Links ========================================================================== */
+/** Remove the gray background color from active links in IE 10. */
+a {
+    background: transparent;
+}
+
+/** Address `outline` inconsistency between Chrome and other browsers. */
+a:focus {
+    outline: thin dotted;
+}
+
+/** Improve readability when focused and also mouse hovered in all browsers. */
+a:active, a:hover {
+    outline: 0;
+}
+
+/* ========================================================================== Typography ========================================================================== */
+/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari 5, and Chrome. */
+h1 {
+    font-size: 2em;
+    margin: 1.2em 0;
+}
+
+/** Address styling not present in IE 8/9, Safari 5, and Chrome. */
+abbr[title] {
+    border-bottom: 1px dotted;
+}
+
+/** Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome. */
+b, strong {
+    font-weight: bold;
+}
+
+/** Address styling not present in Safari 5 and Chrome. */
+dfn {
+    font-style: italic;
+}
+
+/** Address differences between Firefox and other browsers. */
+hr {
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+    height: 0;
+}
+
+/** Address styling not present in IE 8/9. */
+mark {
+    background: #ff0;
+    color: #000;
+}
+
+/** Correct font family set oddly in Safari 5 and Chrome. */
+code, kbd, pre, samp {
+    font-family: Menlo, Monaco, 'Liberation Mono', Consolas, monospace;
+    font-size: 1em;
+}
+
+/** Improve readability of pre-formatted text in all browsers. */
+pre {
+    white-space: pre-wrap;
+}
+
+/** Set consistent quote types. */
+q {
+    quotes: "\201C" "\201D" "\2018" "\2019";
+}
+
+/** Address inconsistent and variable font size in all browsers. */
+small {
+    font-size: 80%;
+}
+
+/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
+sub, sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
+}
+
+sup {
+    top: -0.5em;
+}
+
+sub {
+    bottom: -0.25em;
+}
+
+/* ========================================================================== Embedded content ========================================================================== */
+/** Remove border when inside `a` element in IE 8/9. */
+img {
+    border: 0;
+}
+
+/** Correct overflow displayed oddly in IE 9. */
+svg:not(:root) {
+    overflow: hidden;
+}
+
+/* ========================================================================== Figures ========================================================================== */
+/** Address margin not present in IE 8/9 and Safari 5. */
+figure {
+    margin: 0;
+}
+
+/* ========================================================================== Forms ========================================================================== */
+/** Define consistent border, margin, and padding. */
+fieldset {
+    border: 1px solid #c0c0c0;
+    margin: 0 2px;
+    padding: 0.35em 0.625em 0.75em;
+}
+
+/** 1. Correct `color` not being inherited in IE 8/9. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
+legend {
+    border: 0; /* 1 */
+    padding: 0; /* 2 */
+}
+
+/** 1. Correct font family not being inherited in all browsers. 2. Correct font size not being inherited in all browsers. 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome. */
+button, input, select, textarea {
+    font-family: inherit; /* 1 */
+    font-size: 100%; /* 2 */
+    margin: 0; /* 3 */
+}
+
+/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
+button, input {
+    line-height: normal;
+}
+
+/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+. Correct `select` style inheritance in Firefox 4+ and Opera. */
+button, select {
+    text-transform: none;
+}
+
+/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
+button, html input[type="button"], input[type="reset"], input[type="submit"] {
+    -webkit-appearance: button; /* 2 */
+    cursor: pointer; /* 3 */
+}
+
+/** Re-set default cursor for disabled elements. */
+button[disabled], html input[disabled] {
+    cursor: default;
+}
+
+/** 1. Address box sizing set to `content-box` in IE 8/9. 2. Remove excess padding in IE 8/9. */
+input[type="checkbox"], input[type="radio"] {
+    box-sizing: border-box; /* 1 */
+    padding: 0; /* 2 */
+}
+
+/** 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome (include `-moz` to future-proof). */
+input[type="search"] {
+    -webkit-appearance: textfield; /* 1 */
+    -moz-box-sizing: content-box;
+    -webkit-box-sizing: content-box; /* 2 */
+    box-sizing: content-box;
+}
+
+/** Remove inner padding and search cancel button in Safari 5 and Chrome on OS X. */
+input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration {
+    -webkit-appearance: none;
+}
+
+/** Remove inner padding and border in Firefox 4+. */
+button::-moz-focus-inner, input::-moz-focus-inner {
+    border: 0;
+    padding: 0;
+}
+
+/** 1. Remove default vertical scrollbar in IE 8/9. 2. Improve readability and alignment in all browsers. */
+textarea {
+    overflow: auto; /* 1 */
+    vertical-align: top; /* 2 */
+}
+
+/* ========================================================================== Tables ========================================================================== */
+/** Remove most spacing between table cells. */
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}
+
+meta.foundation-mq-small {
+    font-family: "only screen and (min-width: 768px)";
+    width: 768px;
+}
+
+meta.foundation-mq-medium {
+    font-family: "only screen and (min-width:1280px)";
+    width: 1280px;
+}
+
+meta.foundation-mq-large {
+    font-family: "only screen and (min-width:1440px)";
+    width: 1440px;
+}
+
+*, *:before, *:after {
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+html, body {
+    font-size: 100%;
+}
+
+body {
+    background: white;
+    color: #34302d;
+    padding: 0;
+    margin: 0;
+    font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
+    font-weight: 400;
+    font-style: normal;
+    line-height: 1.8em;
+    position: relative;
+    cursor: auto;
+}
+
+#content, #content p {
+    line-height: 1.8em;
+    margin-top: 1.5em;
+}
+
+#content li p {
+  margin-top: 0.25em;
+}
+
+a:hover {
+    cursor: pointer;
+}
+
+img, object, embed {
+    max-width: 100%;
+    height: auto;
+}
+
+object, embed {
+    height: 100%;
+}
+
+img {
+    -ms-interpolation-mode: bicubic;
+}
+
+#map_canvas img, #map_canvas embed, #map_canvas object, .map_canvas img, .map_canvas embed, .map_canvas object {
+    max-width: none !important;
+}
+
+.left {
+    float: left !important;
+}
+
+.right {
+    float: right !important;
+}
+
+.text-left {
+    text-align: left !important;
+}
+
+.text-right {
+    text-align: right !important;
+}
+
+.text-center {
+    text-align: center !important;
+}
+
+.text-justify {
+    text-align: justify !important;
+}
+
+.hide {
+    display: none;
+}
+
+.antialiased, body {
+    -webkit-font-smoothing: antialiased;
+}
+
+img {
+    display: inline-block;
+    vertical-align: middle;
+}
+
+textarea {
+    height: auto;
+    min-height: 50px;
+}
+
+select {
+    width: 100%;
+}
+
+p.lead, .paragraph.lead > p, #preamble > .sectionbody > .paragraph:first-of-type p {
+    font-size: 1.21875em;
+}
+
+.subheader, #content #toctitle, .admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .listingblock > .title, .literalblock > .title, .mathblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .videoblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title, .tableblock > caption {
+    color: #6db33f;
+    font-weight: 300;
+    margin-top: 0.2em;
+    margin-bottom: 0.5em;
+}
+
+/* Typography resets */
+div, dl, dt, dd, ul, ol, li, h1, h2, h3, #toctitle, .sidebarblock > .content > .title, h4, h5, h6, pre, form, p, blockquote, th, td {
+    margin: 0;
+    padding: 0;
+    direction: ltr;
+}
+
+/* Default Link Styles */
+a {
+    color: #6db33f;
+    line-height: inherit;
+    text-decoration: none;
+}
+
+a:hover, a:focus {
+    color: #6db33f;
+    text-decoration: underline;
+}
+
+a img {
+    border: none;
+}
+
+/* Default paragraph styles */
+p {
+    font-family: inherit;
+    font-weight: normal;
+    font-size: 1em;
+    margin-bottom: 1.25em;
+    text-rendering: optimizeLegibility;
+}
+
+p aside {
+    font-size: 0.875em;
+    font-style: italic;
+}
+
+/* Default header styles */
+h1, h2, h3, #toctitle, .sidebarblock > .content > .title, h4, h5, h6 {
+    font-family: "Raleway", Arial, sans-serif;
+    font-weight: normal;
+    font-style: normal;
+    color: #34302d;
+    text-rendering: optimizeLegibility;
+    margin-top: 1.6em;
+    margin-bottom: 0.6em;
+}
+
+h1 small, h2 small, h3 small, #toctitle small, .sidebarblock > .content > .title small, h4 small, h5 small, h6 small {
+    font-size: 60%;
+    color: #6db33f;
+    line-height: 0;
+}
+
+h1 {
+    font-size: 2.125em;
+}
+
+h2 {
+    font-size: 1.6875em;
+}
+
+h3, #toctitle, .sidebarblock > .content > .title {
+    font-size: 1.375em;
+}
+
+h4 {
+    font-size: 1.125em;
+}
+
+h5 {
+    font-size: 1.125em;
+}
+
+h6 {
+    font-size: 1em;
+}
+
+hr {
+    border: solid #dcd2c9;
+    border-width: 1px 0 0;
+    clear: both;
+    margin: 1.25em 0 1.1875em;
+    height: 0;
+}
+
+/* Helpful Typography Defaults */
+em, i {
+    font-style: italic;
+    line-height: inherit;
+}
+
+strong, b {
+    font-weight: bold;
+    line-height: inherit;
+}
+
+small {
+    font-size: 60%;
+    line-height: inherit;
+}
+
+code {
+    font-family: Consolas, "Liberation Mono", Courier, monospace;
+    font-weight: bold;
+    color: #305CB5;
+}
+
+/* Lists */
+ul, ol, dl {
+    font-size: 1em;
+    margin-bottom: 1.25em;
+    list-style-position: outside;
+    font-family: inherit;
+}
+
+ul, ol {
+    margin-left: 1.5em;
+}
+
+ul.no-bullet, ol.no-bullet {
+    margin-left: 1.5em;
+}
+
+/* Unordered Lists */
+ul li ul, ul li ol {
+    margin-left: 1.25em;
+    margin-bottom: 0;
+    font-size: 1em; /* Override nested font-size change */
+}
+
+ul.square li ul, ul.circle li ul, ul.disc li ul {
+    list-style: inherit;
+}
+
+ul.square {
+    list-style-type: square;
+}
+
+ul.circle {
+    list-style-type: circle;
+}
+
+ul.disc {
+    list-style-type: disc;
+}
+
+ul.no-bullet {
+    list-style: none;
+}
+
+/* Ordered Lists */
+ol li ul, ol li ol {
+    margin-left: 1.25em;
+    margin-bottom: 0;
+}
+
+/* Definition Lists */
+dl dt {
+    margin-bottom: 0.3125em;
+    font-weight: bold;
+}
+
+dl dd {
+    margin-bottom: 1.25em;
+}
+
+/* Abbreviations */
+abbr, acronym {
+    text-transform: uppercase;
+    font-size: 90%;
+    color: #34302d;
+    border-bottom: 1px dotted #dddddd;
+    cursor: help;
+}
+
+abbr {
+    text-transform: none;
+}
+
+/* Blockquotes */
+blockquote {
+    margin: 0 0 1.25em;
+    padding: 0.5625em 1.25em 0 1.1875em;
+    border-left: 1px solid #dddddd;
+}
+
+blockquote cite {
+    display: block;
+    font-size: 0.8125em;
+    color: #655241;
+}
+
+blockquote cite:before {
+    content: "\2014 \0020";
+}
+
+blockquote cite a, blockquote cite a:visited {
+    color: #655241;
+}
+
+blockquote, blockquote p {
+    color: #34302d;
+}
+
+/* Microformats */
+.vcard {
+    display: inline-block;
+    margin: 0 0 1.25em 0;
+    border: 1px solid #dddddd;
+    padding: 0.625em 0.75em;
+}
+
+.vcard li {
+    margin: 0;
+    display: block;
+}
+
+.vcard .fn {
+    font-weight: bold;
+    font-size: 0.9375em;
+}
+
+.vevent .summary {
+    font-weight: bold;
+}
+
+.vevent abbr {
+    cursor: auto;
+    text-decoration: none;
+    font-weight: bold;
+    border: none;
+    padding: 0 0.0625em;
+}
+
+@media only screen and (min-width: 768px) {
+    h1, h2, h3, #toctitle, .sidebarblock > .content > .title, h4, h5, h6 {
+    }
+
+    h1 {
+        font-size: 2.75em;
+    }
+
+    h2 {
+        font-size: 2.3125em;
+    }
+
+    h3, #toctitle, .sidebarblock > .content > .title {
+        font-size: 1.6875em;
+    }
+
+    h4 {
+        font-size: 1.4375em;
+    }
+}
+
+/* Print styles.  Inlined to avoid required HTTP connection: www.phpied.com/delay-loading-your-print-css/ Credit to Paul Irish and HTML5 Boilerplate (html5boilerplate.com)
+*/
+.print-only {
+    display: none !important;
+}
+
+@media print {
+    * {
+        background: transparent !important;
+        color: #000 !important; /* Black prints faster: h5bp.com/s */
+        box-shadow: none !important;
+        text-shadow: none !important;
+    }
+
+    a, a:visited {
+        text-decoration: underline;
+    }
+
+    a[href]:after {
+        content: " (" attr(href) ")";
+    }
+
+    abbr[title]:after {
+        content: " (" attr(title) ")";
+    }
+
+    .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after {
+        content: "";
+    }
+
+    pre, blockquote {
+        border: 1px solid #999;
+        page-break-inside: avoid;
+    }
+
+    thead {
+        display: table-header-group; /* h5bp.com/t */
+    }
+
+    tr, img {
+        page-break-inside: avoid;
+    }
+
+    img {
+        max-width: 100% !important;
+    }
+
+    @page {
+        margin: 0.5cm;
+    }
+
+    p, h2, h3, #toctitle, .sidebarblock > .content > .title {
+        orphans: 3;
+        widows: 3;
+    }
+
+    h2, h3, #toctitle, .sidebarblock > .content > .title {
+        page-break-after: avoid;
+    }
+
+    .hide-on-print {
+        display: none !important;
+    }
+
+    .print-only {
+        display: block !important;
+    }
+
+    .hide-for-print {
+        display: none !important;
+    }
+
+    .show-for-print {
+        display: inherit !important;
+    }
+}
+
+/* Tables */
+table {
+    background: white;
+    margin-bottom: 1.25em;
+    border: solid 1px #34302d;
+}
+
+table thead, table tfoot {
+    font-weight: bold;
+}
+
+table thead tr th, table thead tr td, table tfoot tr th, table tfoot tr td {
+    padding: 0.5em 0.625em 0.625em;
+    font-size: inherit;
+    color: #34302d;
+    text-align: left;
+}
+
+table thead tr th {
+    color: white;
+    background: #34302d;
+}
+
+table tr th, table tr td {
+    padding: 0.5625em 0.625em;
+    font-size: inherit;
+    color: #34302d;
+    border: 0 none;
+}
+
+table tr.even, table tr.alt, table tr:nth-of-type(even) {
+    background: #f2F2F2;
+}
+
+table thead tr th, table tfoot tr th, table tbody tr td, table tr td, table tfoot tr td {
+    display: table-cell;
+}
+
+.clearfix:before, .clearfix:after, .float-group:before, .float-group:after {
+    content: " ";
+    display: table;
+}
+
+.clearfix:after, .float-group:after {
+    clear: both;
+}
+
+*:not(pre) > code {
+    font-size: inherit;
+    padding: 0;
+    white-space: nowrap;
+    background-color: inherit;
+    border: 0 solid #dddddd;
+    -webkit-border-radius: 6px;
+    border-radius: 6px;
+    text-shadow: none;
+}
+
+pre, pre > code {
+    color: black;
+    font-family: monospace, serif;
+    font-weight: normal;
+}
+
+.keyseq {
+    color: #774417;
+}
+
+kbd:not(.keyseq) {
+    display: inline-block;
+    color: #211306;
+    font-size: 0.75em;
+    background-color: #F7F7F7;
+    border: 1px solid #ccc;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset;
+    box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset;
+    margin: -0.15em 0.15em 0 0.15em;
+    padding: 0.2em 0.6em 0.2em 0.5em;
+    vertical-align: middle;
+    white-space: nowrap;
+}
+
+.keyseq kbd:first-child {
+    margin-left: 0;
+}
+
+.keyseq kbd:last-child {
+    margin-right: 0;
+}
+
+.menuseq, .menu {
+    color: black;
+}
+
+b.button:before, b.button:after {
+    position: relative;
+    top: -1px;
+    font-weight: normal;
+}
+
+b.button:before {
+    content: "[";
+    padding: 0 3px 0 2px;
+}
+
+b.button:after {
+    content: "]";
+    padding: 0 2px 0 3px;
+}
+
+p a > code:hover {
+    color: #541312;
+}
+
+#header, #content, #footnotes, #footer {
+    width: 100%;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 0;
+    margin-bottom: 0;
+    max-width: 62.5em;
+    *zoom: 1;
+    position: relative;
+    padding-left: 4em;
+    padding-right: 4em;
+}
+
+#header:before, #header:after, #content:before, #content:after, #footnotes:before, #footnotes:after, #footer:before, #footer:after {
+    content: " ";
+    display: table;
+}
+
+#header:after, #content:after, #footnotes:after, #footer:after {
+    clear: both;
+}
+
+#header {
+    margin-bottom: 2.5em;
+}
+
+#header > h1 {
+    color: #34302d;
+    font-weight: 400;
+}
+
+#header span {
+    color: #34302d;
+}
+
+#header #revnumber {
+    text-transform: capitalize;
+}
+
+#header br {
+    display: none;
+}
+
+#header br + span {
+}
+
+#revdate {
+    display: block;
+}
+
+#toc {
+    border-bottom: 1px solid #e6dfd8;
+    padding-bottom: 1.25em;
+}
+
+#toc > ul {
+    margin-left: 0.25em;
+}
+
+#toc ul.sectlevel0 > li > a {
+    font-style: italic;
+}
+
+#toc ul.sectlevel0 ul.sectlevel1 {
+    margin-left: 0;
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+}
+
+#toc ul {
+    list-style-type: none;
+}
+
+#toctitle {
+    color: #385dbd;
+}
+
+@media only screen and (min-width: 768px) {
+    body.toc2 {
+        padding-left: 15em;
+        padding-right: 0;
+    }
+
+    #toc.toc2 {
+        position: fixed;
+        width: 15em;
+        left: 0;
+        border-bottom: 0;
+        z-index: 1000;
+        padding: 1em;
+        height: 100%;
+        top: 0px;
+        background: #F1F1F1;
+        overflow: auto;
+
+        -moz-transition-property: top;
+        -o-transition-property: top;
+        -webkit-transition-property: top;
+        transition-property: top;
+        -moz-transition-duration: 0.4s;
+        -o-transition-duration: 0.4s;
+        -webkit-transition-duration: 0.4s;
+        transition-duration: 0.4s;
+    }
+
+    #reactor-header {
+        position: fixed;
+        top: -75px;
+        left: 0;
+        right: 0;
+        height: 75px;
+
+
+        -moz-transition-property: top;
+        -o-transition-property: top;
+        -webkit-transition-property: top;
+        transition-property: top;
+        -moz-transition-duration: 0.4s;
+        -o-transition-duration: 0.4s;
+        -webkit-transition-duration: 0.4s;
+        transition-duration: 0.4s;
+    }
+
+    body.head-show #toc.toc2 {
+        top: 75px;
+    }
+    body.head-show #reactor-header {
+        top: 0;
+    }
+
+    #toc.toc2 a {
+        color: #34302d;
+        font-family: "Raleway", Arial, sans-serif;
+    }
+
+    #toc.toc2 #toctitle {
+        margin-top: 0;
+        font-size: 1.2em;
+    }
+
+    #toc.toc2 > ul {
+        font-size: .90em;
+    }
+
+    #toc.toc2 ul ul {
+        margin-left: 0;
+        padding-left: 0.4em;
+    }
+
+    #toc.toc2 ul.sectlevel0 ul.sectlevel1 {
+        padding-left: 0;
+        margin-top: 0.5em;
+        margin-bottom: 0.5em;
+    }
+
+    body.toc2.toc-right {
+        padding-left: 0;
+        padding-right: 15em;
+    }
+
+    body.toc2.toc-right #toc.toc2 {
+        border-right: 0;
+        border-left: 1px solid #e6dfd8;
+        left: auto;
+        right: 0;
+    }
+}
+
+@media only screen and (min-width: 1280px) {
+    body.toc2 {
+        padding-left: 20em;
+        padding-right: 0;
+    }
+
+    #toc.toc2 {
+        width: 20em;
+    }
+
+    #toc.toc2 #toctitle {
+        font-size: 1.375em;
+    }
+
+    #toc.toc2 > ul {
+        font-size: 0.95em;
+    }
+
+    #toc.toc2 ul ul {
+        padding-left: 1.25em;
+    }
+
+    body.toc2.toc-right {
+        padding-left: 0;
+        padding-right: 20em;
+    }
+}
+
+#content #toc {
+    border-style: solid;
+    border-width: 1px;
+    border-color: #d9d9d9;
+    margin-bottom: 1.25em;
+    padding: 1.25em;
+    background: #f2f2f2;
+    border-width: 0;
+    -webkit-border-radius: 6px;
+    border-radius: 6px;
+}
+
+#content #toc > :first-child {
+    margin-top: 0;
+}
+
+#content #toc > :last-child {
+    margin-bottom: 0;
+}
+
+#content #toc a {
+    text-decoration: none;
+}
+
+#content #toctitle {
+    font-weight: bold;
+    font-family: "Raleway", Arial, sans-serif;
+    font-size: 1em;
+    padding-left: 0.125em;
+}
+
+#footer {
+    max-width: 100%;
+    background-color: white;
+    padding: 1.25em;
+    color: #CCC;
+    border-top: 3px solid #F1F1F1;
+}
+
+#footer-text {
+    color: #444;
+    line-height: 1.44;
+}
+
+.sect1 {
+    padding-bottom: 1.25em;
+}
+
+.sect1 + .sect1 {
+    border-top: 1px solid #e6dfd8;
+}
+
+#content h1 > a.anchor, h2 > a.anchor, h3 > a.anchor, #toctitle > a.anchor, .sidebarblock > .content > .title > a.anchor, h4 > a.anchor, h5 > a.anchor, h6 > a.anchor {
+    position: absolute;
+    width: 1em;
+    margin-left: -1em;
+    display: block;
+    text-decoration: none;
+    visibility: hidden;
+    text-align: center;
+    font-weight: normal;
+}
+
+#content h1 > a.anchor:before, h2 > a.anchor:before, h3 > a.anchor:before, #toctitle > a.anchor:before, .sidebarblock > .content > .title > a.anchor:before, h4 > a.anchor:before, h5 > a.anchor:before, h6 > a.anchor:before {
+    content: '\00A7';
+    font-size: .85em;
+    vertical-align: text-top;
+    display: block;
+    margin-top: 0.05em;
+}
+
+#content h1:hover > a.anchor, #content h1 > a.anchor:hover, h2:hover > a.anchor, h2 > a.anchor:hover, h3:hover > a.anchor, #toctitle:hover > a.anchor, .sidebarblock > .content > .title:hover > a.anchor, h3 > a.anchor:hover, #toctitle > a.anchor:hover, .sidebarblock > .content > .title > a.anchor:hover, h4:hover > a.anchor, h4 > a.anchor:hover, h5:hover > a.anchor, h5 > a.anchor:hover, h6:hover > a.anchor, h6 > a.anchor:hover {
+    visibility: visible;
+}
+
+#content h1 > a.link, h2 > a.link, h3 > a.link, #toctitle > a.link, .sidebarblock > .content > .title > a.link, h4 > a.link, h5 > a.link, h6 > a.link {
+    color: #34302d;
+    text-decoration: none;
+}
+
+#content h1 > a.link:hover, h2 > a.link:hover, h3 > a.link:hover, #toctitle > a.link:hover, .sidebarblock > .content > .title > a.link:hover, h4 > a.link:hover, h5 > a.link:hover, h6 > a.link:hover {
+    color: #34302d;
+}
+
+.imageblock, .literalblock, .listingblock, .mathblock, .verseblock, .videoblock {
+    margin-bottom: 1.25em;
+    margin-top: 1.25em;
+}
+
+.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .listingblock > .title, .literalblock > .title, .mathblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .videoblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title {
+    text-align: left;
+    font-weight: bold;
+}
+
+.tableblock > caption {
+    text-align: left;
+    font-weight: bold;
+    white-space: nowrap;
+    overflow: visible;
+    max-width: 0;
+}
+
+table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p {
+    font-size: inherit;
+}
+
+.admonitionblock > table {
+    border: 0;
+    background: none;
+    width: 100%;
+}
+
+.admonitionblock > table td.icon {
+    text-align: center;
+    width: 80px;
+}
+
+.admonitionblock > table td.icon img {
+    max-width: none;
+}
+
+.admonitionblock > table td.icon .title {
+    font-weight: bold;
+    text-transform: uppercase;
+}
+
+.admonitionblock > table td.content {
+    padding-left: 1.125em;
+    padding-right: 1.25em;
+    border-left: 1px solid #dcd2c9;
+    color: #34302d;
+}
+
+.admonitionblock > table td.content > :last-child > :last-child {
+    margin-bottom: 0;
+}
+
+.exampleblock > .content {
+    border-top: 1px solid #6db33f;
+    border-bottom: 1px solid #6db33f;
+    margin-bottom: 1.25em;
+    padding: 1.25em;
+    background: white;
+}
+
+.exampleblock > .content > :first-child {
+    margin-top: 0;
+}
+
+.exampleblock > .content > :last-child {
+    margin-bottom: 0;
+}
+
+.exampleblock > .content h1, .exampleblock > .content h2, .exampleblock > .content h3, .exampleblock > .content #toctitle, .sidebarblock.exampleblock > .content > .title, .exampleblock > .content h4, .exampleblock > .content h5, .exampleblock > .content h6, .exampleblock > .content p {
+    color: #333333;
+}
+
+.exampleblock > .content h1, .exampleblock > .content h2, .exampleblock > .content h3, .exampleblock > .content #toctitle, .sidebarblock.exampleblock > .content > .title, .exampleblock > .content h4, .exampleblock > .content h5, .exampleblock > .content h6 {
+    margin-bottom: 0.625em;
+}
+
+.exampleblock > .content h1.subheader, .exampleblock > .content h2.subheader, .exampleblock > .content h3.subheader, .exampleblock > .content .subheader#toctitle, .sidebarblock.exampleblock > .content > .subheader.title, .exampleblock > .content h4.subheader, .exampleblock > .content h5.subheader, .exampleblock > .content h6.subheader {
+}
+
+.exampleblock.result > .content {
+    -webkit-box-shadow: 0 1px 8px #d9d9d9;
+    box-shadow: 0 1px 8px #d9d9d9;
+}
+
+.sidebarblock {
+    padding: 1.25em 2em;
+    background: #F1F1F1;
+    margin: 2em -2em;
+
+}
+
+.sidebarblock > :first-child {
+    margin-top: 0;
+}
+
+.sidebarblock > :last-child {
+    margin-bottom: 0;
+}
+
+.sidebarblock h1, .sidebarblock h2, .sidebarblock h3, .sidebarblock #toctitle, .sidebarblock > .content > .title, .sidebarblock h4, .sidebarblock h5, .sidebarblock h6, .sidebarblock p {
+    color: #333333;
+}
+
+.sidebarblock h1, .sidebarblock h2, .sidebarblock h3, .sidebarblock #toctitle, .sidebarblock > .content > .title, .sidebarblock h4, .sidebarblock h5, .sidebarblock h6 {
+    margin-bottom: 0.625em;
+}
+
+.sidebarblock h1.subheader, .sidebarblock h2.subheader, .sidebarblock h3.subheader, .sidebarblock .subheader#toctitle, .sidebarblock > .content > .subheader.title, .sidebarblock h4.subheader, .sidebarblock h5.subheader, .sidebarblock h6.subheader {
+}
+
+.sidebarblock > .content > .title {
+    color: #6db33f;
+    margin-top: 0;
+    font-size: 1.2em;
+}
+
+.exampleblock > .content > :last-child > :last-child, .exampleblock > .content .olist > ol > li:last-child > :last-child, .exampleblock > .content .ulist > ul > li:last-child > :last-child, .exampleblock > .content .qlist > ol > li:last-child > :last-child, .sidebarblock > .content > :last-child > :last-child, .sidebarblock > .content .olist > ol > li:last-child > :last-child, .sidebarblock > .content .ulist > ul > li:last-child > :last-child, .sidebarblock > .content .qlist > ol > li:last-child > :last-child {
+    margin-bottom: 0;
+}
+
+.literalblock pre:not([class]), .listingblock pre:not([class]) {
+    background-color:#f2f2f2;
+}
+
+.literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
+    border-width: 1px;
+    border-style: solid;
+    border-color: rgba(21, 35, 71, 0.1);
+    -webkit-border-radius: 6px;
+    border-radius: 6px;
+    padding: 0.8em;
+    word-wrap: break-word;
+}
+
+.literalblock pre.nowrap, .literalblock pre[class].nowrap, .listingblock pre.nowrap, .listingblock pre[class].nowrap {
+    overflow-x: auto;
+    white-space: pre;
+    word-wrap: normal;
+}
+
+.literalblock pre > code, .literalblock pre[class] > code, .listingblock pre > code, .listingblock pre[class] > code {
+    display: block;
+}
+
+@media only screen {
+    .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
+        font-size: 0.72em;
+    }
+}
+
+@media only screen and (min-width: 768px) {
+    .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
+        font-size: 0.81em;
+    }
+}
+
+@media only screen and (min-width: 1280px) {
+    .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
+        font-size: 0.9em;
+    }
+}
+
+.listingblock pre.highlight {
+    padding: 0;
+    line-height: 1.4em;
+}
+
+.listingblock pre.highlight > code {
+    padding: 0.8em;
+}
+
+.listingblock > .content {
+    position: relative;
+}
+
+.listingblock:hover code[class*=" language-"]:before {
+    text-transform: uppercase;
+    font-size: 0.9em;
+    color: #999;
+    position: absolute;
+    top: 0.375em;
+    right: 0.375em;
+}
+
+.listingblock:hover code.asciidoc:before {
+    content: "asciidoc";
+}
+
+.listingblock:hover code.clojure:before {
+    content: "clojure";
+}
+
+.listingblock:hover code.css:before {
+    content: "css";
+}
+
+.listingblock:hover code.groovy:before {
+    content: "groovy";
+}
+
+.listingblock:hover code.html:before {
+    content: "html";
+}
+
+.listingblock:hover code.java:before {
+    content: "java";
+}
+
+.listingblock:hover code.javascript:before {
+    content: "javascript";
+}
+
+.listingblock:hover code.python:before {
+    content: "python";
+}
+
+.listingblock:hover code.ruby:before {
+    content: "ruby";
+}
+
+.listingblock:hover code.sass:before {
+    content: "sass";
+}
+
+.listingblock:hover code.scss:before {
+    content: "scss";
+}
+
+.listingblock:hover code.xml:before {
+    content: "xml";
+}
+
+.listingblock:hover code.yaml:before {
+    content: "yaml";
+}
+
+.listingblock.terminal pre .command:before {
+    content: attr(data-prompt);
+    padding-right: 0.5em;
+    color: #999;
+}
+
+.listingblock.terminal pre .command:not([data-prompt]):before {
+    content: '$';
+}
+
+table.pyhltable {
+    border: 0;
+    margin-bottom: 0;
+}
+
+table.pyhltable td {
+    vertical-align: top;
+    padding-top: 0;
+    padding-bottom: 0;
+}
+
+table.pyhltable td.code {
+    padding-left: .75em;
+    padding-right: 0;
+}
+
+.highlight.pygments .lineno, table.pyhltable td:not(.code) {
+    color: #999;
+    padding-left: 0;
+    padding-right: .5em;
+    border-right: 1px solid #dcd2c9;
+}
+
+.highlight.pygments .lineno {
+    display: inline-block;
+    margin-right: .25em;
+}
+
+table.pyhltable .linenodiv {
+    background-color: transparent !important;
+    padding-right: 0 !important;
+}
+
+.quoteblock {
+    margin: 0 0 1.25em;
+    padding: 0.5625em 1.25em 0 1.1875em;
+    border-left: 3px solid #dddddd;
+}
+
+.quoteblock blockquote {
+    margin: 0 0 1.25em 0;
+    padding: 0 0 0.5625em 0;
+    border: 0;
+}
+
+.quoteblock blockquote > .paragraph:last-child p {
+    margin-bottom: 0;
+}
+
+.quoteblock .attribution {
+    margin-top: -.25em;
+    padding-bottom: 0.5625em;
+    font-size: 0.8125em;
+}
+
+.quoteblock .attribution br {
+    display: none;
+}
+
+.quoteblock .attribution cite {
+    display: block;
+    margin-bottom: 0.625em;
+}
+
+table thead th, table tfoot th {
+    font-weight: bold;
+}
+
+table.tableblock.grid-all {
+    border-collapse: separate;
+    border-radius: 6px;
+    border-top: 1px solid #34302d;
+    border-bottom: 1px solid #34302d;
+}
+
+table.tableblock.frame-topbot, table.tableblock.frame-none {
+    border-left: 0;
+    border-right: 0;
+}
+
+table.tableblock.frame-sides, table.tableblock.frame-none {
+    border-top: 0;
+    border-bottom: 0;
+}
+
+table.tableblock td .paragraph:last-child p > p:last-child, table.tableblock th > p:last-child, table.tableblock td > p:last-child {
+    margin-bottom: 0;
+}
+
+th.tableblock.halign-left, td.tableblock.halign-left {
+    text-align: left;
+}
+
+th.tableblock.halign-right, td.tableblock.halign-right {
+    text-align: right;
+}
+
+th.tableblock.halign-center, td.tableblock.halign-center {
+    text-align: center;
+}
+
+th.tableblock.valign-top, td.tableblock.valign-top {
+    vertical-align: top;
+}
+
+th.tableblock.valign-bottom, td.tableblock.valign-bottom {
+    vertical-align: bottom;
+}
+
+th.tableblock.valign-middle, td.tableblock.valign-middle {
+    vertical-align: middle;
+}
+
+tbody tr th {
+    display: table-cell;
+    background: rgba(105, 60, 22, 0.25);
+}
+
+tbody tr th, tbody tr th p, tfoot tr th, tfoot tr th p {
+    color: #211306;
+    font-weight: bold;
+}
+
+td > div.verse {
+    white-space: pre;
+}
+
+ol {
+    margin-left: 1.75em;
+}
+
+ul li ol {
+    margin-left: 1.5em;
+}
+
+dl dd {
+    margin-left: 1.125em;
+}
+
+dl dd:last-child, dl dd:last-child > :last-child {
+    margin-bottom: 0;
+}
+
+ol > li p, ul > li p, ul dd, ol dd, .olist .olist, .ulist .ulist, .ulist .olist, .olist .ulist {
+    margin-bottom: 0.625em;
+}
+
+ul.unstyled, ol.unnumbered, ul.checklist, ul.none {
+    list-style-type: none;
+}
+
+ul.unstyled, ol.unnumbered, ul.checklist {
+    margin-left: 0.625em;
+}
+
+ul.checklist li > p:first-child > i[class^="icon-check"]:first-child, ul.checklist li > p:first-child > input[type="checkbox"]:first-child {
+    margin-right: 0.25em;
+}
+
+ul.checklist li > p:first-child > input[type="checkbox"]:first-child {
+    position: relative;
+    top: 1px;
+}
+
+ul.inline {
+    margin: 0 auto 0.625em auto;
+    margin-left: -1.375em;
+    margin-right: 0;
+    padding: 0;
+    list-style: none;
+    overflow: hidden;
+}
+
+ul.inline > li {
+    list-style: none;
+    float: left;
+    margin-left: 1.375em;
+    display: block;
+}
+
+ul.inline > li > * {
+    display: block;
+}
+
+.unstyled dl dt {
+    font-weight: normal;
+    font-style: normal;
+}
+
+ol.arabic {
+    list-style-type: decimal;
+}
+
+ol.decimal {
+    list-style-type: decimal-leading-zero;
+}
+
+ol.loweralpha {
+    list-style-type: lower-alpha;
+}
+
+ol.upperalpha {
+    list-style-type: upper-alpha;
+}
+
+ol.lowerroman {
+    list-style-type: lower-roman;
+}
+
+ol.upperroman {
+    list-style-type: upper-roman;
+}
+
+ol.lowergreek {
+    list-style-type: lower-greek;
+}
+
+.hdlist > table, .colist > table {
+    border: 0;
+    background: none;
+}
+
+.hdlist > table > tbody > tr, .colist > table > tbody > tr {
+    background: none;
+}
+
+td.hdlist1 {
+    padding-right: .75em;
+    font-weight: bold;
+}
+
+td.hdlist1, td.hdlist2 {
+    vertical-align: top;
+}
+
+.literalblock + .colist, .listingblock + .colist {
+    margin-top: -0.5em;
+}
+
+.colist > table tr > td:first-of-type {
+    padding: 0 .75em;
+}
+
+.colist > table tr > td:last-of-type {
+    padding: 0.25em 0;
+}
+
+.qanda > ol > li > p > em:only-child {
+    color: #063f40;
+}
+
+.thumb, .th {
+    line-height: 0;
+    display: inline-block;
+    border: solid 4px white;
+    -webkit-box-shadow: 0 0 0 1px #dddddd;
+    box-shadow: 0 0 0 1px #dddddd;
+}
+
+.imageblock.left, .imageblock[style*="float: left"] {
+    margin: 0.25em 0.625em 1.25em 0;
+}
+
+.imageblock.right, .imageblock[style*="float: right"] {
+    margin: 0.25em 0 1.25em 0.625em;
+}
+
+.imageblock > .title {
+    margin-bottom: 0;
+}
+
+.imageblock.thumb, .imageblock.th {
+    border-width: 6px;
+}
+
+.imageblock.thumb > .title, .imageblock.th > .title {
+    padding: 0 0.125em;
+}
+
+.image.left, .image.right {
+    margin-top: 0.25em;
+    margin-bottom: 0.25em;
+    display: inline-block;
+    line-height: 0;
+}
+
+.image.left {
+    margin-right: 0.625em;
+}
+
+.image.right {
+    margin-left: 0.625em;
+}
+
+a.image {
+    text-decoration: none;
+}
+
+span.footnote, span.footnoteref {
+    vertical-align: super;
+    font-size: 0.875em;
+}
+
+span.footnote a, span.footnoteref a {
+    text-decoration: none;
+}
+
+#footnotes {
+    padding-top: 0.75em;
+    padding-bottom: 0.75em;
+    margin-bottom: 0.625em;
+}
+
+#footnotes hr {
+    width: 20%;
+    min-width: 6.25em;
+    margin: -.25em 0 .75em 0;
+    border-width: 1px 0 0 0;
+}
+
+#footnotes .footnote {
+    padding: 0 0.375em;
+    font-size: 0.875em;
+    margin-left: 1.2em;
+    text-indent: -1.2em;
+    margin-bottom: .2em;
+}
+
+#footnotes .footnote a:first-of-type {
+    font-weight: bold;
+    text-decoration: none;
+}
+
+#footnotes .footnote:last-of-type {
+    margin-bottom: 0;
+}
+
+#content #footnotes {
+    margin-top: -0.625em;
+    margin-bottom: 0;
+    padding: 0.75em 0;
+}
+
+.gist .file-data > table {
+    border: none;
+    background: #fff;
+    width: 100%;
+    margin-bottom: 0;
+}
+
+.gist .file-data > table td.line-data {
+    width: 99%;
+}
+
+div.unbreakable {
+    page-break-inside: avoid;
+}
+
+.big {
+    font-size: larger;
+}
+
+.small {
+    font-size: smaller;
+}
+
+.underline {
+    text-decoration: underline;
+}
+
+.overline {
+    text-decoration: overline;
+}
+
+.line-through {
+    text-decoration: line-through;
+}
+
+.aqua {
+    color: #00bfbf;
+}
+
+.aqua-background {
+    background-color: #00fafa;
+}
+
+.black {
+    color: black;
+}
+
+.black-background {
+    background-color: black;
+}
+
+.blue {
+    color: #0000bf;
+}
+
+.blue-background {
+    background-color: #0000fa;
+}
+
+.fuchsia {
+    color: #bf00bf;
+}
+
+.fuchsia-background {
+    background-color: #fa00fa;
+}
+
+.gray {
+    color: #606060;
+}
+
+.gray-background {
+    background-color: #7d7d7d;
+}
+
+.green {
+    color: #006000;
+}
+
+.green-background {
+    background-color: #007d00;
+}
+
+.lime {
+    color: #00bf00;
+}
+
+.lime-background {
+    background-color: #00fa00;
+}
+
+.maroon {
+    color: #600000;
+}
+
+.maroon-background {
+    background-color: #7d0000;
+}
+
+.navy {
+    color: #000060;
+}
+
+.navy-background {
+    background-color: #00007d;
+}
+
+.olive {
+    color: #606000;
+}
+
+.olive-background {
+    background-color: #7d7d00;
+}
+
+.purple {
+    color: #600060;
+}
+
+.purple-background {
+    background-color: #7d007d;
+}
+
+.red {
+    color: #bf0000;
+}
+
+.red-background {
+    background-color: #fa0000;
+}
+
+.silver {
+    color: #909090;
+}
+
+.silver-background {
+    background-color: #bcbcbc;
+}
+
+.teal {
+    color: #006060;
+}
+
+.teal-background {
+    background-color: #007d7d;
+}
+
+.white {
+    color: #bfbfbf;
+}
+
+.white-background {
+    background-color: #fafafa;
+}
+
+.yellow {
+    color: #bfbf00;
+}
+
+.yellow-background {
+    background-color: #fafa00;
+}
+
+span.icon > [class^="icon-"], span.icon > [class*=" icon-"] {
+    cursor: default;
+}
+
+.admonitionblock td.icon [class^="icon-"]:before {
+    font-size: 2.5em;
+    text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
+    cursor: default;
+}
+
+.admonitionblock td.icon .icon-note:before {
+    content: "\f05a";
+    color: #095557;
+    color: #064042;
+}
+
+.admonitionblock td.icon .icon-tip:before {
+    content: "\f0eb";
+    text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8);
+    color: #111;
+}
+
+.admonitionblock td.icon .icon-warning:before {
+    content: "\f071";
+    color: #bf6900;
+}
+
+.admonitionblock td.icon .icon-caution:before {
+    content: "\f06d";
+    color: #bf3400;
+}
+
+.admonitionblock td.icon .icon-important:before {
+    content: "\f06a";
+    color: #bf0000;
+}
+
+.conum {
+    display: inline-block;
+    color: white !important;
+    background-color: #211306;
+    -webkit-border-radius: 100px;
+    border-radius: 100px;
+    text-align: center;
+    width: 20px;
+    height: 20px;
+    font-size: 12px;
+    font-weight: bold;
+    line-height: 20px;
+    font-family: Arial, sans-serif;
+    font-style: normal;
+    position: relative;
+    top: -2px;
+    letter-spacing: -1px;
+}
+
+.conum * {
+    color: white !important;
+}
+
+.conum + b {
+    display: none;
+}
+
+.conum:after {
+    content: attr(data-value);
+}
+
+.conum:not([data-value]):empty {
+    display: none;
+}
+
+body {
+    padding-top: 60px;
+}
+
+#toc.toc2 ul ul {
+    padding-left: 1em;
+}
+#toc.toc2 ul ul.sectlevel2 {
+}
+
+#toctitle {
+    color: #34302d;
+    display: none;
+}
+
+#header h1 {
+    font-weight: bold;
+    position: relative;
+    left: -0.0625em;
+}
+
+#header h1 span.lo {
+    color: #dc9424;
+}
+
+#content h2, #content h3, #content #toctitle, #content .sidebarblock > .content > .title, #content h4, #content h5, #content #toctitle {
+    font-weight: normal;
+    position: relative;
+    left: -0.0625em;
+}
+
+#content h2 {
+    font-weight: bold;
+}
+
+.literalblock .content pre.highlight, .listingblock .content pre.highlight {
+    background-color:#f2f2f2;
+}
+
+.admonitionblock > table td.content {
+    border-color: #e6dfd8;
+}
+
+table.tableblock.grid-all {
+    -webkit-border-radius: 0;
+    border-radius: 0;
+}
+
+#footer {
+    background-color: #while;
+    color: #34302d;
+}
+
+.imageblock .title {
+    text-align: center;
+}
+
+#content h1.sect0 {
+    font-size: 48px;
+}
+
+#toc > ul > li > a {
+    font-size: large;
+}
diff --git a/src/main/javadoc/stylesheet.css b/src/main/javadoc/stylesheet.css
new file mode 100644
index 0000000000..707664e2f5
--- /dev/null
+++ b/src/main/javadoc/stylesheet.css
@@ -0,0 +1,640 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Javadoc style sheet */
+/*
+Overall document style
+@import url('resources/fonts/dejavu.css');
+*/
+
+body {
+    background-color:#ffffff;
+    color:#353833;
+    font-family: 'Source Sans Pro', sans-serif;
+    font-size:15px;
+    line-height: 22px;
+    margin:0;
+}
+
+.indexContainer ul li a:link, .indexContainer ul li a:visited{
+    color:#34302d;
+}
+
+
+.marble {
+    width: 500px;
+}
+
+a:link, a:visited {
+    text-decoration:none;
+    color:#6db33f;
+}
+a:hover, a:focus {
+    text-decoration:underline;
+    color:#6db33f;
+}
+a:active {
+    text-decoration:none;
+    color:#6db33f;
+}
+a[name] {
+    color:#353833;
+}
+a[name]:hover {
+    text-decoration:none;
+    color:#353833;
+}
+pre {
+    font-family: Consolas, monospace;
+    font-size:14px;
+}
+h1 {
+    font-size:20px;
+}
+h2 {
+    font-size:18px;
+}
+h3 {
+    font-size:16px;
+    font-style:italic;
+}
+h4 {
+    font-size:13px;
+}
+h5 {
+    font-size:12px;
+}
+h6 {
+    font-size:11px;
+}
+ul {
+    list-style-type:disc;
+}
+code, tt {
+    font-family: Consolas, monospace;
+    font-size:14px;
+    padding-top:4px;
+    margin-top:8px;
+    line-height:1.4em;
+}
+dt code {
+    font-family:Consolas, monospace;
+    font-size:14px;
+    padding-top:4px;
+}
+table tr td dt code {
+    font-family:Consolas, monospace;
+    font-size:14px;
+    vertical-align:top;
+    padding-top:4px;
+}
+sup {
+    font-size:8px;
+}
+.clear {
+    clear:both;
+    height:0px;
+    overflow:hidden;
+}
+.aboutLanguage {
+    position: absolute;
+    right: 2em;
+    top: 0.5em;
+    background: url(https://lettuce.io/assets/img/apple-touch-icon-180.png) no-repeat 0 0;
+    background-size: 40px 40px;
+    height: 40px;
+    width: 40px;
+    text-indent: -6000em;
+}
+.legalCopy {
+    margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+    color:#FFFFFF;
+    text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+    color:#bb7a2a;
+}
+.tab {
+    background-color:#0066FF;
+    color:#ffffff;
+    padding:8px;
+    width:5em;
+    font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+    background-color:#34302d;
+    color:#FFFFFF;
+    padding:.8em .5em .4em .8em;
+    height:auto;/*height:1.8em;*/
+    font-size:11px;
+    margin:0;
+}
+h1.bar {
+    line-height: 30px;
+    padding: 5px 8px;
+    text-transform: uppercase;
+    font-size: 12Px;
+}
+.topNav {
+    position: relative;
+    background-color: #34302d;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    padding-top:10px;
+    padding-bottom:10px;
+    overflow:hidden;
+    font-size:12px;
+}
+.bottomNav {
+    position: relative;
+    margin-top:10px;
+    background-color:#34302d;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    padding-top:10px;
+    padding-bottom:10px;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav {
+    background-color:#423e3c;
+    overflow:hidden;
+    font-size:12px;
+    color: white;
+    font-weight: bold;
+    padding: 0 10px;
+}
+.subNav div {
+    clear:left;
+    float:left;
+    text-transform:uppercase;
+    line-height: 40px;
+}
+ul.navList, ul.subNavList {
+    float:left;
+    margin:0 25px 0 0;
+    padding:0 15px;
+}
+ul.navList li{
+    list-style:none;
+    float:left;
+    padding: 5px 6px;
+    text-transform:uppercase;
+}
+ul.subNavList li{
+    list-style:none;
+    float:left;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+    color:#FFFFFF;
+    text-decoration:none;
+    text-transform:uppercase;
+}
+.topNav a:hover, .bottomNav a:hover {
+    text-decoration:none;
+    color:#6db33f;
+    text-transform:uppercase;
+}
+.navBarCell1Rev {
+    background-color:#6db33f;
+    color:#FFFFFF;
+    font-weight: bold;
+    margin: auto 5px;
+}
+.skipNav {
+    position:absolute;
+    top:auto;
+    left:-9999px;
+    overflow:hidden;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+    clear:both;
+    margin:0 40px;
+    padding:5px 0 0 0;
+}
+.indexHeader {
+    margin:10px;
+    position:relative;
+}
+.indexHeader span{
+    margin-right:15px;
+}
+.indexHeader h1 {
+    font-size:13px;
+}
+.title {
+    color:#34302d;
+    margin:10px 0;
+
+}
+
+.header h1.title {
+    padding-top: 20px;
+}
+.subTitle {
+    margin:5px 0 0 0;
+}
+.header ul {
+    margin:0 0 15px 0;
+    padding:0;
+}
+.footer ul {
+    margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+    list-style:none;
+    font-size:13px;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+    background-color:#EEE;
+    /*border:1px solid #d0d9e0;*/
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    background-color:#f1f1f1;
+    /*border:1px solid #d0d9e0;*/
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+    padding:0;
+    margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+    padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
+    clear:both;
+    padding:10px 40px;
+    position:relative;
+}
+.indexContainer {
+    margin:10px;
+    position:relative;
+    font-size:12px;
+}
+.indexContainer h2 {
+    font-size:13px;
+    padding:0 0 3px 0;
+    margin: 0;
+}
+.indexContainer ul {
+    margin:0;
+    padding:0;
+}
+.indexContainer ul li {
+    list-style:none;
+    padding-top:2px;
+}
+.indexContainer ul li a {
+    color: #353833;
+    font-size: 14px;
+}
+.indexContainer ul li a:hover {
+    color: #6db33f;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+    font-size:14px;
+    font-weight:bold;
+    margin:10px 0 0 0;
+    color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+    margin:5px 0 10px 0px;
+    font-size:15px;
+    font-family: 'Source Sans Pro', sans-serif;
+}
+.serializedFormContainer dl.nameValue dt {
+    margin-left:1px;
+    font-size:1.1em;
+    display:inline;
+    font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+    margin:0 0 0 1px;
+    font-size:1.1em;
+    display:inline;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+    display:inline;
+    font-size:0.9em;
+}
+ul.inheritance {
+    margin:0;
+    padding:0;
+}
+ul.inheritance li {
+    display:inline;
+    list-style:none;
+}
+ul.inheritance li ul.inheritance {
+    margin-left:15px;
+    padding-left:15px;
+    padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+    margin:10px 0 10px 0;
+    padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+    list-style:none;
+    margin-bottom:15px;
+    line-height:1.4;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+    padding:0px 20px 5px 10px;
+    border:1px solid #ededed;
+    background-color:#f8f8f8;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
+    padding:0 0 5px 8px;
+    background-color:#ffffff;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+    margin-left:0;
+    padding-left:0;
+    padding-bottom:15px;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+    list-style:none;
+    border-bottom:none;
+    padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+    margin-top:0;
+    margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
+    width:100%;
+    border-left:1px solid #EEE;
+    border-right:1px solid #EEE;
+    border-bottom:1px solid #EEE;
+}
+.overviewSummary, .memberSummary  {
+    padding:0px;
+}
+.overviewSummary caption, .memberSummary caption, .typeSummary caption,
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
+    position:relative;
+    text-align:left;
+    background-repeat:no-repeat;
+    color:#253441;
+    font-weight:bold;
+    clear:none;
+    overflow:hidden;
+    padding:0px;
+    padding-top:10px;
+    padding-left:1px;
+    margin:0px;
+    white-space:pre;
+}
+.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
+.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
+.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
+.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
+.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
+.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
+.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
+.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
+    color:#FFFFFF;
+}
+.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    padding-bottom:7px;
+    display:inline-block;
+    float:left;
+    background-color:#6db33f;
+    border: none;
+    color: white;
+}
+.memberSummary caption span.activeTableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#6db33f;
+    color: white;
+    font-size: 13px;
+}
+.memberSummary caption span.tableTab span {
+    white-space:nowrap;
+    padding: 5px 12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#e0e0e0;
+}
+.memberSummary caption span.tableTab span a {
+    color: #353833;
+    font-size: 13px;
+}
+
+.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
+    padding-top:0px;
+    padding-left:0px;
+    padding-right:0px;
+    background-image:none;
+    float:none;
+    display:inline;
+}
+.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
+    display:none;
+    width:5px;
+    position:relative;
+    float:left;
+    background-color:#6db33f;
+    color: white;
+}
+.memberSummary .activeTableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative;
+    float:left;
+    background-color:#6db33f;
+    color: white;
+}
+.memberSummary .tableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative;
+    background-color:#4D7A97;
+    float:left;
+
+}
+
+.overviewSummary td, .memberSummary td, .typeSummary td,
+.useSummary td, .constantsSummary td, .deprecatedSummary td {
+    text-align:left;
+    padding:0px 0px 12px 10px;
+}
+th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
+td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
+    vertical-align:top;
+    padding-right:0px;
+    padding-top:8px;
+    padding-bottom: 8px;
+}
+th.colFirst, th.colLast, th.colOne, .constantsSummary th {
+    background:#f1f1f1;
+    text-align:left;
+    padding:8px;
+}
+td.colFirst, th.colFirst {
+    white-space:nowrap;
+    font-size:13px;
+}
+td.colLast, th.colLast {
+    font-size:13px;
+}
+td.colOne, th.colOne {
+    font-size:13px;
+}
+.overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.useSummary td.colFirst, .useSummary th.colFirst,
+.overviewSummary td.colOne, .overviewSummary th.colOne,
+.memberSummary td.colFirst, .memberSummary th.colFirst,
+.memberSummary td.colOne, .memberSummary th.colOne,
+.typeSummary td.colFirst{
+    width:25%;
+    vertical-align:top;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+    font-weight:bold;
+}
+.tableSubHeadingColor {
+    background-color:#EEEEFF;
+}
+.altColor {
+    background-color:#FFFFFF;
+}
+.rowColor {
+    background-color:#F1F1F1;
+}
+/*
+Content styles
+*/
+.description pre {
+    margin-top:0;
+}
+.deprecatedContent {
+    margin:0;
+    padding:10px 0;
+}
+.docSummary {
+    padding:0;
+}
+
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    font-style:normal;
+}
+
+div.block {
+    font-size:15px;
+    font-family:'Source Sans Pro', sans-serif;
+}
+
+td.colLast div {
+    padding-top:0px;
+}
+
+
+td.colLast a {
+    padding-bottom:3px;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+    color:green;
+    padding:0 30px 0 0;
+}
+h1.hidden {
+    visibility:hidden;
+    overflow:hidden;
+    font-size:10px;
+}
+.block {
+    display:block;
+    margin:3px 10px 2px 0px;
+    color:#474747;
+}
+.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
+.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
+.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
+    font-weight:bold;
+}
+.deprecationComment, .emphasizedPhrase, .interfaceName {
+    font-style:italic;
+}
+
+div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
+div.block div.block span.interfaceName {
+    font-style:normal;
+}
+
+div.contentContainer ul.blockList li.blockList h2{
+    padding-bottom:0px;
+}
+
+hr {
+    display: block;
+    -webkit-margin-before: 0.5em;
+    -webkit-margin-after: 0.5em;
+    -webkit-margin-start: auto;
+    -webkit-margin-end: auto;
+    border-style: inset;
+    border-width: 0;
+    border-bottom: 1px solid #d0d9e0;
+}

From d9a53ee0a772151eec855ccf300d939725c16c65 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 11 Apr 2017 14:33:09 +0200
Subject: [PATCH 175/808] Switch to codecov #504

---
 .travis.yml | 16 ++++++++++++++--
 Makefile    | 26 +++++++++++++++-----------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 21d7cdeda9..0e03616379 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,40 @@
 dist: trusty
+
 language: java
+
 jdk:
   - oraclejdk8
+
 env:
   matrix:
     - PROFILE=netty-40
     - PROFILE=netty-41
     - PROFILE=jmh
+
 sudo: false
+
 before_install:
   - if [[ ! -f stunnel.tar.gz ]]; then wget -O stunnel.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.33.tar.gz; fi
   - if [[ ! -f ./stunnel-5.33/configure ]]; then tar -xzf stunnel.tar.gz; fi
   - if [[ ! -f ./stunnel-5.33/src/stunnel ]]; then cd ./stunnel-5.33; ./configure; make; cd ..; fi
   - export PATH="$PATH:$(pwd)/stunnel-5.33/src"
+
 install: make prepare ssl-keys
-script: make test-coveralls PROFILE=${PROFILE}
+
+script: make test-coverage PROFILE=${PROFILE}
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+
 cache:
   directories:
     - '$HOME/.m2/repository'
     - '$TRAVIS_BUILD_DIR/stunnel-5.33'
+
 notifications:
   webhooks:
     urls:
       - https://webhooks.gitter.im/e/c34b69f37ca13d2f8642
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
\ No newline at end of file
+    on_start: false     # default: false
diff --git a/Makefile b/Makefile
index 2b4ecb6b57..9431d23f44 100644
--- a/Makefile
+++ b/Makefile
@@ -48,22 +48,22 @@ endef
 
 define REDIS_CLUSTER_CONFIG_SSL_1
 27f88788f03a86296b7d860152f4ae24ee59c8c9 127.0.0.1:7479@17479 myself,master - 0 1434887920102 1 connected 0-10000
-1c541b6daf98719769e6aacf338a7d81f108a180 127.0.0.1:7480@17480 slave 27f88788f03a86296b7d860152f4ae24ee59c8c9 0 1434887920102 3 connected 
-2c07344ffa94ede5ea57a2367f190af6144c1adb 127.0.0.1:7481@17481 master  - 0 0 2 connected 10001-16384 
+1c541b6daf98719769e6aacf338a7d81f108a180 127.0.0.1:7480@17480 slave 27f88788f03a86296b7d860152f4ae24ee59c8c9 0 1434887920102 3 connected
+2c07344ffa94ede5ea57a2367f190af6144c1adb 127.0.0.1:7481@17481 master  - 0 0 2 connected 10001-16384
 vars currentEpoch 3 lastVoteEpoch 0
 endef
 
 define REDIS_CLUSTER_CONFIG_SSL_2
 27f88788f03a86296b7d860152f4ae24ee59c8c9 127.0.0.1:7479@17479 master - 0 1434887920102 1 connected 0-10000
-1c541b6daf98719769e6aacf338a7d81f108a180 127.0.0.1:7480@17480 myself,slave 27f88788f03a86296b7d860152f4ae24ee59c8c9 0 1434887920102 3 connected 
-2c07344ffa94ede5ea57a2367f190af6144c1adb 127.0.0.1:7481@17481 master  - 0 0 2 connected 10001-16384 
+1c541b6daf98719769e6aacf338a7d81f108a180 127.0.0.1:7480@17480 myself,slave 27f88788f03a86296b7d860152f4ae24ee59c8c9 0 1434887920102 3 connected
+2c07344ffa94ede5ea57a2367f190af6144c1adb 127.0.0.1:7481@17481 master  - 0 0 2 connected 10001-16384
 vars currentEpoch 3 lastVoteEpoch 0
 endef
 
 define REDIS_CLUSTER_CONFIG_SSL_3
 27f88788f03a86296b7d860152f4ae24ee59c8c9 127.0.0.1:7479@17479 master - 0 1434887920102 1 connected 0-10000
-1c541b6daf98719769e6aacf338a7d81f108a180 127.0.0.1:7480@17480 slave 27f88788f03a86296b7d860152f4ae24ee59c8c9 0 1434887920102 3 connected 
-2c07344ffa94ede5ea57a2367f190af6144c1adb 127.0.0.1:7481@17481 myself,master  - 0 0 2 connected 10001-16384 
+1c541b6daf98719769e6aacf338a7d81f108a180 127.0.0.1:7480@17480 slave 27f88788f03a86296b7d860152f4ae24ee59c8c9 0 1434887920102 3 connected
+2c07344ffa94ede5ea57a2367f190af6144c1adb 127.0.0.1:7481@17481 myself,master  - 0 0 2 connected 10001-16384
 vars currentEpoch 3 lastVoteEpoch 0
 endef
 
@@ -246,19 +246,19 @@ work/stunnel.conf:
 	@echo cert=$(ROOT_DIR)/work/localhost.pem >> $@
 	@echo capath=$(ROOT_DIR)/work/localhost.pem >> $@
 	@echo cafile=$(ROOT_DIR)/work/localhost.pem >> $@
-	
+
 	@echo [ssl-cluster-node-1] >> $@
 	@echo accept = 127.0.0.1:7443 >> $@
 	@echo connect = 127.0.0.1:7479 >> $@
-		
+
 	@echo [ssl-cluster-node-2] >> $@
 	@echo accept = 127.0.0.1:7444 >> $@
-	@echo connect = 127.0.0.1:7480 >> $@	
-	
+	@echo connect = 127.0.0.1:7480 >> $@
+
 	@echo [ssl-cluster-node-3] >> $@
 	@echo accept = 127.0.0.1:7445 >> $@
 	@echo connect = 127.0.0.1:7481 >> $@
-	
+
 
 work/stunnel.pid: work/stunnel.conf ssl-keys
 	which stunnel4 >/dev/null 2>&1 && stunnel4 $(ROOT_DIR)/work/stunnel.conf || stunnel $(ROOT_DIR)/work/stunnel.conf
@@ -328,6 +328,10 @@ test-coveralls: start
 	mvn -B -DskipTests=false clean compile test jacoco:report coveralls:report -P$(PROFILE)
 	$(MAKE) stop
 
+test-coverage: start
+	mvn -B -DskipTests=false clean compile test jacoco:report -P$(PROFILE)
+	$(MAKE) stop
+
 test: start
 	mvn -B -DskipTests=false clean compile test -P$(PROFILE)
 	$(MAKE) stop

From 0ab98724520ad1438eb59f5753f8a8c959bcbe81 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 11 Apr 2017 14:46:10 +0200
Subject: [PATCH 176/808] Remove coveralls #504

---
 Makefile  |  4 ----
 README.md |  3 ++-
 pom.xml   | 13 -------------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 9431d23f44..3fd1942b51 100644
--- a/Makefile
+++ b/Makefile
@@ -324,10 +324,6 @@ stop:
 	pkill redis-server && sleep 1 || true
 	pkill redis-sentinel && sleep 1 || true
 
-test-coveralls: start
-	mvn -B -DskipTests=false clean compile test jacoco:report coveralls:report -P$(PROFILE)
-	$(MAKE) stop
-
 test-coverage: start
 	mvn -B -DskipTests=false clean compile test jacoco:report -P$(PROFILE)
 	$(MAKE) stop
diff --git a/README.md b/README.md
index d325f2f755..7a26e7d4f0 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 lettuce - Advanced Java Redis client
 ===============================
 
-[![Build Status](https://travis-ci.org/mp911de/lettuce.svg)](https://travis-ci.org/mp911de/lettuce) [![Coverage Status](https://img.shields.io/coveralls/mp911de/lettuce.svg)](https://coveralls.io/r/mp911de/lettuce) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/biz.paluch.redis/lettuce/badge.svg)](https://maven-badges.herokuapp.com/maven-central/biz.paluch.redis/lettuce)
+[![Build Status](https://travis-ci.org/lettuce-io/lettuce-core.svg)](https://travis-ci.org/lettuce-io/lettuce-core) [![codecov](https://codecov.io/gh/lettuce-io/lettuce-core/branch/master/graph/badge.svg)](https://codecov.io/gh/lettuce-io/lettuce-core)
+ [![Maven Central](https://maven-badges.herokuapp.com/maven-central/biz.paluch.redis/lettuce/badge.svg)](https://maven-badges.herokuapp.com/maven-central/biz.paluch.redis/lettuce)
 
 Lettuce is a scalable thread-safe Redis client for synchronous,
 asynchronous and reactive usage. Multiple threads may share one connection if they avoid blocking and transactional
diff --git a/pom.xml b/pom.xml
index 06c8e9512d..7149fad4e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -479,13 +479,6 @@
                             <skip>true</skip>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>org.eluder.coveralls</groupId>
-                        <artifactId>coveralls-maven-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
@@ -846,12 +839,6 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.eluder.coveralls</groupId>
-                <artifactId>coveralls-maven-plugin</artifactId>
-                <version>3.1.0</version>
-            </plugin>
-
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>

From 43fc2290a9cbc8aceaeec78f0c5a422e5f9b4623 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 12 Apr 2017 09:52:48 +0200
Subject: [PATCH 177/808] Upgrade to Reactor 3.1.0 #505

Move off removed then/flatMap methods and adopt to changed Disposable API
---
 pom.xml                                                      | 4 ++--
 .../cluster/RedisAdvancedClusterReactiveCommandsImpl.java    | 5 ++---
 .../lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java | 4 ++--
 .../core/sentinel/RedisSentinelReactiveCommandsImpl.java     | 4 ++--
 .../io/lettuce/core/ReactiveBackpressurePropagationTest.java | 4 ++--
 src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java | 3 +--
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7149fad4e1..7ca66f52af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>3.0.5.RELEASE</version>
+            <version>3.1.0.BUILD-SNAPSHOT</version>
         </dependency>
 
         <!-- Netty -->
@@ -221,7 +221,7 @@
         <dependency>
             <groupId>io.projectreactor.addons</groupId>
             <artifactId>reactor-test</artifactId>
-            <version>3.0.5.RELEASE</version>
+            <version>3.1.0.BUILD-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index aae3544551..bca806029a 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -178,11 +178,10 @@ public Flux<KeyValue<K, V>> mget(Iterable<K> keys) {
                 offset += entry.getValue().size();
             }
 
-            List<KeyValue<K, V>> objects = new ArrayList<>(Arrays.asList(values));
-            return objects;
+            return Arrays.asList(values);
         });
 
-        return map.flatMap(Flux::fromIterable);
+        return map.flatMapIterable(keyValues -> keyValues);
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
index 070bb95e7f..1fcd6f38a8 100644
--- a/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
@@ -71,7 +71,7 @@ public void message(K pattern, K channel, V message) {
             StatefulRedisPubSubConnection<K, V> statefulConnection = getStatefulConnection();
             statefulConnection.addListener(listener);
 
-            sink.setCancellation(() -> {
+            sink.onDispose(() -> {
                 statefulConnection.removeListener(listener);
             });
 
@@ -99,7 +99,7 @@ public void message(K channel, V message) {
             StatefulRedisPubSubConnection<K, V> statefulConnection = getStatefulConnection();
             statefulConnection.addListener(listener);
 
-            sink.setCancellation(() -> {
+            sink.onDispose(() -> {
                 statefulConnection.removeListener(listener);
             });
 
diff --git a/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
index 9cb3277942..789f89aef3 100644
--- a/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
@@ -56,14 +56,14 @@ public Mono<SocketAddress> getMasterAddrByName(K key) {
         return flux.collectList().flatMap(list -> {
 
             if (list.isEmpty()) {
-                return Flux.empty();
+                return Mono.empty();
             }
 
             LettuceAssert.isTrue(list.size() == 2, "List must contain exact 2 entries (Hostname, Port)");
             String hostname = (String) list.get(0);
             String port = (String) list.get(1);
             return Mono.just(new InetSocketAddress(hostname, Integer.parseInt(port)));
-        }).cast(SocketAddress.class).next();
+        }).cast(SocketAddress.class);
     }
 
     @Override
diff --git a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
index eb53b6ad23..f6e58f73e6 100644
--- a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
@@ -28,7 +28,7 @@
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import reactor.core.Cancellation;
+import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
 import reactor.core.scheduler.Schedulers;
 
@@ -144,7 +144,7 @@ public void writeCommandAndCancelInTheMiddle() throws Exception {
         CountDownLatch buildPressure = new CountDownLatch(1);
         CountDownLatch waitForPressureReduced = new CountDownLatch(2);
 
-        Cancellation cancellation = Flux.from(publisher).limitRate(2).publishOn(Schedulers.single()).doOnNext(s -> {
+        Disposable cancellation = Flux.from(publisher).limitRate(2).publishOn(Schedulers.single()).doOnNext(s -> {
 
             try {
                 pressureArrived.countDown();
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
index 0fd6306222..0bcea9dece 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
@@ -28,7 +28,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import reactor.core.Cancellation;
 import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -153,7 +152,7 @@ public void observePatternsWithUnsubscribe() throws Exception {
 
         BlockingQueue<PatternMessage<String, String>> patternMessages = LettuceFactories.newBlockingQueue();
 
-        Cancellation subscription = pubsub.observePatterns().doOnNext(patternMessages::add).subscribe();
+        Disposable subscription = pubsub.observePatterns().doOnNext(patternMessages::add).subscribe();
 
         redis.publish(channel, message);
         redis.publish(channel, message);

From 985ccf3570330a08d1f36a418648cd7285a74c48 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 12 Apr 2017 09:57:17 +0200
Subject: [PATCH 178/808] Upgrade integrations from mp911de/lettuce to
 lettuce-io/lettuce-core #506

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0e03616379..478399a919 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ cache:
 notifications:
   webhooks:
     urls:
-      - https://webhooks.gitter.im/e/c34b69f37ca13d2f8642
+      - https://webhooks.gitter.im/e/7c2a962829d225c47a31
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
+    on_start: false     # default: false
\ No newline at end of file

From 5a9d91258538e456f0aeb3c72603b9833143cbb3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 12 Apr 2017 10:06:24 +0200
Subject: [PATCH 179/808] Add Spring Snapshots repo to include Reactor Core
 snapshot #505

---
 pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pom.xml b/pom.xml
index 7ca66f52af..ce5beb6ff1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,17 @@
         </developer>
     </developers>
 
+    <repositories>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/libs-snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- Not every build should be signed, disabled by default -->

From 96f55e8106ba149045033e535f8e000aafe4ca6b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 13 Apr 2017 11:08:45 +0200
Subject: [PATCH 180/808] Introduce NettyCustomizer API #499

Lettuce now provides a NettyCustomizer with callback hooks to customize Bootstrap and Channel after applying all configured driver options. NettyCustomizer is configured via ClientResources.
---
 .../io/lettuce/core/AbstractRedisClient.java  |  2 +
 .../lettuce/core/PlainChannelInitializer.java |  2 +
 .../io/lettuce/core/SslConnectionBuilder.java |  2 +
 .../core/resource/ClientResources.java        | 11 ++++
 .../core/resource/DefaultClientResources.java | 54 +++++++++++++++----
 .../core/resource/DefaultNettyCustomizer.java | 40 ++++++++++++++
 .../core/resource/NettyCustomizer.java        | 51 ++++++++++++++++++
 .../resource/DefaultClientResourcesTest.java  |  6 ++-
 8 files changed, 157 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/resource/DefaultNettyCustomizer.java
 create mode 100644 src/main/java/io/lettuce/core/resource/NettyCustomizer.java

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 77b294efcd..345eedcedb 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -250,6 +250,8 @@ protected <K, V, T extends RedisChannelHandler<K, V>> ConnectionFuture<T> initia
 
         RedisChannelInitializer initializer = connectionBuilder.build();
         redisBootstrap.handler(initializer);
+
+        clientResources.nettyCustomizer().afterBootstrapInitialized(redisBootstrap);
         ChannelFuture connectFuture = redisBootstrap.connect(redisAddress);
 
         connectFuture.addListener(future -> {
diff --git a/src/main/java/io/lettuce/core/PlainChannelInitializer.java b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
index 32d638d876..ddcb14a79f 100644
--- a/src/main/java/io/lettuce/core/PlainChannelInitializer.java
+++ b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
@@ -119,6 +119,8 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
         for (ChannelHandler handler : handlers.get()) {
             channel.pipeline().addLast(handler);
         }
+
+        clientResources.nettyCustomizer().afterChannelInitialized(channel);
     }
 
     static void pingBeforeActivate(AsyncCommand<?, ?, ?> cmd, CompletableFuture<Boolean> initializedFuture,
diff --git a/src/main/java/io/lettuce/core/SslConnectionBuilder.java b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
index a5c1af25b6..ec2423ec87 100644
--- a/src/main/java/io/lettuce/core/SslConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
@@ -216,6 +216,8 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
             for (ChannelHandler handler : handlers.get()) {
                 channel.pipeline().addLast(handler);
             }
+
+            clientResources.nettyCustomizer().afterChannelInitialized(channel);
         }
 
         @Override
diff --git a/src/main/java/io/lettuce/core/resource/ClientResources.java b/src/main/java/io/lettuce/core/resource/ClientResources.java
index cda60a8b5c..e13eac1034 100644
--- a/src/main/java/io/lettuce/core/resource/ClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/ClientResources.java
@@ -109,6 +109,7 @@ public interface ClientResources {
      * {@link #eventExecutorGroup()}.
      *
      * @return the timer.
+     * @since 4.3
      */
     Timer timer();
 
@@ -137,6 +138,7 @@ public interface ClientResources {
      * Returns the {@link DnsResolver}.
      *
      * @return the DNS resolver
+     * @since 4.3
      */
     DnsResolver dnsResolver();
 
@@ -144,6 +146,15 @@ public interface ClientResources {
      * Returns the {@link Delay} for reconnect attempts. May return a different instance on each call.
      *
      * @return the reconnect {@link Delay}.
+     * @since 4.3
      */
     Delay reconnectDelay();
+
+    /**
+     * Returns the {@link NettyCustomizer} to customize netty components.
+     *
+     * @return the configured {@link NettyCustomizer}.
+     * @since 4.4
+     */
+    NettyCustomizer nettyCustomizer();
 }
diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index 611881c37a..36834e12a1 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -61,6 +61,7 @@
  * {@link io.lettuce.core.metrics.CommandLatencyCollector}.</li>
  * <li>a {@code dnsResolver} which is a provided instance of {@link DnsResolver}.</li>
  * <li>a {@code timer} that is a provided instance of {@link io.netty.util.HashedWheelTimer}.</li>
+ * <li>a {@code nettyCustomizer} that is a provided instance of {@link NettyCustomizer}.</li>
  * </ul>
  *
  * @author Mark Paluch
@@ -88,9 +89,15 @@ public class DefaultClientResources implements ClientResources {
      */
     public static final Supplier<Delay> DEFAULT_RECONNECT_DELAY = Delay::exponential;
 
+    /**
+     * Default (no-op) {@link NettyCustomizer}.
+     */
+    public static final NettyCustomizer DEFAULT_NETTY_CUSTOMIZER = DefaultNettyCustomizer.INSTANCE;
+
     private static final boolean NETTY_DNS_RESOLVER_SUPPORTED;
 
     static {
+
         int threads = Math.max(
                 1,
                 SystemPropertyUtil.getInt("io.netty.eventLoopThreads",
@@ -119,6 +126,7 @@ public class DefaultClientResources implements ClientResources {
     private final MetricEventPublisher metricEventPublisher;
     private final DnsResolver dnsResolver;
     private final Supplier<Delay> reconnectDelay;
+    private final NettyCustomizer nettyCustomizer;
 
     private volatile boolean shutdownCalled = false;
 
@@ -207,6 +215,7 @@ protected DefaultClientResources(Builder builder) {
         }
 
         reconnectDelay = builder.reconnectDelay;
+        nettyCustomizer = builder.nettyCustomizer;
     }
 
     /**
@@ -243,6 +252,7 @@ public static class Builder {
         private EventPublisherOptions commandLatencyPublisherOptions = DefaultEventPublisherOptions.create();
         private DnsResolver dnsResolver = NETTY_DNS_RESOLVER_SUPPORTED ? DnsResolvers.UNRESOLVED : DnsResolvers.JVM_DEFAULT;
         private Supplier<Delay> reconnectDelay = DEFAULT_RECONNECT_DELAY;
+        private NettyCustomizer nettyCustomizer = DEFAULT_NETTY_CUSTOMIZER;
 
         private Builder() {
         }
@@ -252,7 +262,7 @@ private Builder() {
          * thread pool size is only effective if no {@code eventLoopGroupProvider} is provided.
          *
          * @param ioThreadPoolSize the thread pool size, must be greater {@code 0}.
-         * @return this
+         * @return {@code this} {@link Builder}.
          */
         public Builder ioThreadPoolSize(int ioThreadPoolSize) {
 
@@ -269,7 +279,7 @@ public Builder ioThreadPoolSize(int ioThreadPoolSize) {
          * take care of that. This is an advanced configuration that should only be used if you know what you are doing.
          *
          * @param eventLoopGroupProvider the shared eventLoopGroupProvider, must not be {@literal null}.
-         * @return this
+         * @return {@code this} {@link Builder}.
          */
         public Builder eventLoopGroupProvider(EventLoopGroupProvider eventLoopGroupProvider) {
 
@@ -284,7 +294,7 @@ public Builder eventLoopGroupProvider(EventLoopGroupProvider eventLoopGroupProvi
          * CPUs). The thread pool size is only effective if no {@code eventExecutorGroup} is provided.
          *
          * @param computationThreadPoolSize the thread pool size, must be greater {@code 0}.
-         * @return this
+         * @return {@code this} {@link Builder}.
          */
         public Builder computationThreadPoolSize(int computationThreadPoolSize) {
 
@@ -301,7 +311,7 @@ public Builder computationThreadPoolSize(int computationThreadPoolSize) {
          * care of that. This is an advanced configuration that should only be used if you know what you are doing.
          *
          * @param eventExecutorGroup the shared eventExecutorGroup, must not be {@literal null}.
-         * @return this
+         * @return {@code this} {@link Builder}.
          */
         public Builder eventExecutorGroup(EventExecutorGroup eventExecutorGroup) {
 
@@ -318,7 +328,8 @@ public Builder eventExecutorGroup(EventExecutorGroup eventExecutorGroup) {
          * should only be used if you know what you are doing.
          *
          * @param timer the shared {@link Timer}, must not be {@literal null}.
-         * @return this
+         * @return {@code this} {@link Builder}.
+         * @since 4.3
          */
         public Builder timer(Timer timer) {
 
@@ -332,7 +343,7 @@ public Builder timer(Timer timer) {
          * Sets the {@link EventBus} that can that can be used across different instances of the RedisClient.
          *
          * @param eventBus the event bus, must not be {@literal null}.
-         * @return this
+         * @return {@code this} {@link Builder}.
          */
         public Builder eventBus(EventBus eventBus) {
 
@@ -347,7 +358,7 @@ public Builder eventBus(EventBus eventBus) {
          *
          * @param commandLatencyPublisherOptions the {@link EventPublisherOptions} to publish command latency metrics using the
          *        {@link EventBus}, must not be {@literal null}.
-         * @return this
+         * @return {@code this} {@link Builder}.
          */
         public Builder commandLatencyPublisherOptions(EventPublisherOptions commandLatencyPublisherOptions) {
 
@@ -362,7 +373,7 @@ public Builder commandLatencyPublisherOptions(EventPublisherOptions commandLaten
          * RedisClient. The options are only effective if no {@code commandLatencyCollector} is provided.
          *
          * @param commandLatencyCollectorOptions the command latency collector options, must not be {@link null}.
-         * @return this
+         * @return {@code this} {@link Builder}.
          */
         public Builder commandLatencyCollectorOptions(CommandLatencyCollectorOptions commandLatencyCollectorOptions) {
 
@@ -376,7 +387,7 @@ public Builder commandLatencyCollectorOptions(CommandLatencyCollectorOptions com
          * Sets the {@link CommandLatencyCollector} that can that can be used across different instances of the RedisClient.
          *
          * @param commandLatencyCollector the command latency collector, must not be {@literal null}.
-         * @return this
+         * @return {@code this} {@link Builder}.
          */
         public Builder commandLatencyCollector(CommandLatencyCollector commandLatencyCollector) {
 
@@ -391,7 +402,8 @@ public Builder commandLatencyCollector(CommandLatencyCollector commandLatencyCol
          * {@link DnsResolvers#JVM_DEFAULT}
          *
          * @param dnsResolver the DNS resolver, must not be {@link null}.
-         * @return this
+         * @return {@code this} {@link Builder}.
+         * @since 4.3
          */
         public Builder dnsResolver(DnsResolver dnsResolver) {
 
@@ -407,6 +419,7 @@ public Builder dnsResolver(DnsResolver dnsResolver) {
          *
          * @param reconnectDelay the reconnect delay, must not be {@literal null}.
          * @return this
+         * @since 4.3
          */
         public Builder reconnectDelay(Delay reconnectDelay) {
 
@@ -422,6 +435,7 @@ public Builder reconnectDelay(Delay reconnectDelay) {
          *
          * @param reconnectDelay the reconnect delay, must not be {@literal null}.
          * @return this
+         * @since 4.3
          */
         public Builder reconnectDelay(Supplier<Delay> reconnectDelay) {
 
@@ -431,6 +445,21 @@ public Builder reconnectDelay(Supplier<Delay> reconnectDelay) {
             return this;
         }
 
+        /**
+         * Sets the {@link NettyCustomizer} instance to customize netty components during connection.
+         *
+         * @param nettyCustomizer the netty customizer instance, must not be {@literal null}.
+         * @return this
+         * @since 4.4
+         */
+        public Builder nettyCustomizer(NettyCustomizer nettyCustomizer) {
+
+            LettuceAssert.notNull(nettyCustomizer, "NettyCustomizer must not be null");
+
+            this.nettyCustomizer = nettyCustomizer;
+            return this;
+        }
+
         /**
          *
          * @return a new instance of {@link DefaultClientResources}.
@@ -570,4 +599,9 @@ public DnsResolver dnsResolver() {
     public Delay reconnectDelay() {
         return reconnectDelay.get();
     }
+
+    @Override
+    public NettyCustomizer nettyCustomizer() {
+        return nettyCustomizer;
+    }
 }
diff --git a/src/main/java/io/lettuce/core/resource/DefaultNettyCustomizer.java b/src/main/java/io/lettuce/core/resource/DefaultNettyCustomizer.java
new file mode 100644
index 0000000000..fa965e92d8
--- /dev/null
+++ b/src/main/java/io/lettuce/core/resource/DefaultNettyCustomizer.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.resource;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+
+/**
+ * Default (empty) {@link NettyCustomizer} implementation.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+enum DefaultNettyCustomizer implements NettyCustomizer {
+
+    INSTANCE;
+
+    @Override
+    public void afterBootstrapInitialized(Bootstrap bootstrap) {
+        // no-op
+    }
+
+    @Override
+    public void afterChannelInitialized(Channel channel) {
+        // no-op
+    }
+}
diff --git a/src/main/java/io/lettuce/core/resource/NettyCustomizer.java b/src/main/java/io/lettuce/core/resource/NettyCustomizer.java
new file mode 100644
index 0000000000..2bdf77e91d
--- /dev/null
+++ b/src/main/java/io/lettuce/core/resource/NettyCustomizer.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.resource;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+
+/**
+ * Strategy interface to customize netty {@link io.netty.bootstrap.Bootstrap} and {@link io.netty.channel.Channel} via callback
+ * hooks. <br/>
+ * <b>Extending the NettyCustomizer API</b>
+ * <p>
+ * Contrary to other driver options, the options available in this class should be considered as advanced feature and as such,
+ * they should only be modified by expert users. A misconfiguration introduced by the means of this API can have unexpected
+ * results and cause the driver to completely fail to connect.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public interface NettyCustomizer {
+
+    /**
+     * Hook invoked each time the driver creates a new Connection and configures a new instance of Bootstrap for it. This hook
+     * is called after the driver has applied all {@link java.net.SocketOption}s. This is a good place to add extra
+     * {@link io.netty.channel.ChannelOption}s to the {@link Bootstrap}.
+     *
+     * @param bootstrap must not be {@literal null}.
+     */
+    void afterBootstrapInitialized(Bootstrap bootstrap);
+
+    /**
+     * Hook invoked each time the driver initializes the channel. This hook is called after the driver has registered all its
+     * internal channel handlers, and applied the configured options.
+     *
+     * @param channel must not be {@literal null}.
+     */
+    void afterChannelInitialized(Channel channel);
+}
diff --git a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java
index 6d9da18eff..73fec266ff 100644
--- a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java
@@ -104,15 +104,19 @@ public void testProvidedResources() throws Exception {
         Timer timerMock = mock(Timer.class);
         EventBus eventBusMock = mock(EventBus.class);
         CommandLatencyCollector latencyCollectorMock = mock(CommandLatencyCollector.class);
+        NettyCustomizer nettyCustomizer = mock(NettyCustomizer.class);
 
         DefaultClientResources sut = DefaultClientResources.builder().eventExecutorGroup(executorMock)
                 .eventLoopGroupProvider(groupProviderMock).timer(timerMock).eventBus(eventBusMock)
-                .commandLatencyCollector(latencyCollectorMock).build();
+                .commandLatencyCollector(latencyCollectorMock)
+                .nettyCustomizer(nettyCustomizer)
+                .build();
 
         assertThat(sut.eventExecutorGroup()).isSameAs(executorMock);
         assertThat(sut.eventLoopGroupProvider()).isSameAs(groupProviderMock);
         assertThat(sut.timer()).isSameAs(timerMock);
         assertThat(sut.eventBus()).isSameAs(eventBusMock);
+        assertThat(sut.nettyCustomizer()).isSameAs(nettyCustomizer);
 
         assertThat(sut.shutdown().get()).isTrue();
 

From 160b31b991da45b826d37a3b8cd34257f75bea32 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 13 Apr 2017 13:26:46 +0200
Subject: [PATCH 181/808] Adopt EmptyClientResources to NettyCustomizer #499

---
 .../lettuce/core/protocol/EmptyClientResources.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
index 67acdb193f..e38c7fd9a2 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
@@ -25,13 +25,8 @@
 import io.lettuce.core.metrics.CommandLatencyCollector;
 import io.lettuce.core.metrics.CommandLatencyId;
 import io.lettuce.core.metrics.CommandMetrics;
-import io.lettuce.core.resource.ClientResources;
-import io.lettuce.core.resource.Delay;
-import io.lettuce.core.resource.DnsResolver;
-import io.lettuce.core.resource.EventLoopGroupProvider;
+import io.lettuce.core.resource.*;
 import io.netty.util.Timer;
-import io.netty.util.concurrent.*;
-
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GlobalEventExecutor;
@@ -106,6 +101,11 @@ public Delay reconnectDelay() {
         return null;
     }
 
+    @Override
+    public NettyCustomizer nettyCustomizer() {
+        return null;
+    }
+
     public static class EmptyCommandLatencyCollector implements CommandLatencyCollector {
 
         @Override

From efabc02a7127d826c661c805b3482de2a1ef366d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 20 Mar 2017 21:47:46 +0100
Subject: [PATCH 182/808] Propagate asynchronous connections to
 ClusterConnectionProvider #486

Lettuce now propagates the asynchronous connection state to ClusterConnectionProvider so asynchronous and reactive execution are not required to synchronize and wait for the connect result. ClusterDistributionChannelWriter uses CompletableFuture chaining to write the command on the appropriate RedisChannelWriter.

RedisAdvancedClusterAsyncCommandsImpl and RedisAdvancedClusterReactiveCommandsImpl use asynchronous connections for multi-node command execution and construct a result handle from the underlying CompletableFuture operations.

Asynchronous connection propagation impacts on exception handling. Previously, synchronization allowed verification exceptions to be thrown in the caller's thread and crossing the ClusterDistributionChannelWriter.write() boundary up to the caller. Asynchronous connection propagates all exceptions to the sent command.
---
 .../io/lettuce/core/AbstractRedisClient.java  |   9 +-
 .../java/io/lettuce/core/LettuceFutures.java  |   4 -
 .../core/RedisConnectionException.java        |  15 +-
 .../AsyncClusterConnectionProvider.java       |  75 ++++++++
 .../cluster/ClusterConnectionProvider.java    |  26 ++-
 .../ClusterDistributionChannelWriter.java     |  53 ++++--
 .../core/cluster/MultiNodeExecution.java      |  38 ++--
 .../core/cluster/PipelinedRedisFuture.java    |   8 +-
 .../PooledClusterConnectionProvider.java      | 174 +++++++++++++-----
 ...RedisAdvancedClusterAsyncCommandsImpl.java | 112 +++++++----
 ...isAdvancedClusterReactiveCommandsImpl.java | 116 +++++++-----
 ...ynchronizingClusterConnectionProvider.java |  67 +++++--
 .../cluster/ClusterPartiallyDownTest.java     |   2 +-
 ...ngleThreadedReactiveClusterClientTest.java | 100 ++++++++++
 .../core/protocol/ConnectionFailureTest.java  |  26 +--
 15 files changed, 614 insertions(+), 211 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/cluster/AsyncClusterConnectionProvider.java
 create mode 100644 src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 345eedcedb..6118419333 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -30,7 +30,6 @@
 import io.lettuce.core.protocol.ConnectionWatchdog;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
-
 import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.channel.*;
@@ -209,20 +208,18 @@ private void checkForEpollLibrary() {
      */
     protected <T> T getConnection(ConnectionFuture<T> connectionFuture) {
 
-        String msg = String.format("Unable to connect to %s", connectionFuture.getRemoteAddress());
-
         try {
             return connectionFuture.get();
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
-            throw new RedisConnectionException(msg, e);
+            throw RedisConnectionException.create(connectionFuture.getRemoteAddress(), e);
         } catch (Exception e) {
 
             if (e instanceof ExecutionException) {
-                throw new RedisConnectionException(msg, e.getCause());
+                throw RedisConnectionException.create(connectionFuture.getRemoteAddress(), e.getCause());
             }
 
-            throw new RedisConnectionException(msg, e);
+            throw RedisConnectionException.create(connectionFuture.getRemoteAddress(), e);
         }
     }
 
diff --git a/src/main/java/io/lettuce/core/LettuceFutures.java b/src/main/java/io/lettuce/core/LettuceFutures.java
index 045883ee59..0272b66eb7 100644
--- a/src/main/java/io/lettuce/core/LettuceFutures.java
+++ b/src/main/java/io/lettuce/core/LettuceFutures.java
@@ -107,10 +107,6 @@ protected static <T> T translateException(Callable<T> callable, Supplier<T> othe
                 throw new RedisCommandExecutionException(e.getCause().getMessage(), e.getCause());
             }
 
-            if (e.getCause() instanceof RedisException) {
-                throw (RedisException) e.getCause();
-            }
-
             throw new RedisException(e.getCause());
         } catch (InterruptedException e) {
 
diff --git a/src/main/java/io/lettuce/core/RedisConnectionException.java b/src/main/java/io/lettuce/core/RedisConnectionException.java
index d8857f3efa..b1a5556855 100644
--- a/src/main/java/io/lettuce/core/RedisConnectionException.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package io.lettuce.core;
 
+import java.net.SocketAddress;
+
 /**
  * Exception for connection failures.
  *
@@ -31,4 +33,15 @@ public RedisConnectionException(String msg, Throwable e) {
         super(msg, e);
     }
 
+    /**
+     * Create a new {@link RedisConnectionException} given {@link SocketAddress} and the {@link Throwable cause}.
+     *
+     * @param remoteAddress
+     * @param cause
+     * @return
+     * @since 4.4
+     */
+    public static RedisConnectionException create(SocketAddress remoteAddress, Throwable cause) {
+        return new RedisConnectionException(String.format("Unable to connect to %s", remoteAddress), cause);
+    }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/AsyncClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/AsyncClusterConnectionProvider.java
new file mode 100644
index 0000000000..6af43b02e0
--- /dev/null
+++ b/src/main/java/io/lettuce/core/cluster/AsyncClusterConnectionProvider.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster;
+
+import java.io.Closeable;
+import java.util.concurrent.CompletableFuture;
+
+import io.lettuce.core.RedisException;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.ClusterConnectionProvider.Intent;
+
+/**
+ * Asynchronous connection provider for cluster operations.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+interface AsyncClusterConnectionProvider extends Closeable {
+
+    /**
+     * Provide a connection for the intent and cluster slot. The underlying connection is bound to the nodeId. If the slot
+     * responsibility changes, the connection will not point to the updated nodeId.
+     *
+     * @param intent {@link Intent#READ} or {@link Intent#WRITE}. {@literal READ} connections will be provided with
+     *        {@literal READONLY} mode set.
+     * @param slot the slot-hash of the key, see {@link SlotHash}.
+     * @return a valid connection which handles the slot.
+     * @throws RedisException if no know node can be found for the slot
+     */
+    <K, V> CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(Intent intent, int slot);
+
+    /**
+     * Provide a connection for the intent and host/port. The connection can survive cluster topology updates. The connection
+     * will be closed if the node identified by {@code host} and {@code port} is no longer part of the cluster.
+     *
+     * @param intent {@link Intent#READ} or {@link Intent#WRITE}. {@literal READ} connections will be provided with
+     *        {@literal READONLY} mode set.
+     * @param host host of the node.
+     * @param port port of the node.
+     * @return a valid connection to the given host.
+     * @throws RedisException if the host is not part of the cluster
+     */
+    <K, V> CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(Intent intent, String host, int port);
+
+    /**
+     * Provide a connection for the intent and nodeId. The connection can survive cluster topology updates. The connection will
+     * be closed if the node identified by {@code nodeId} is no longer part of the cluster.
+     *
+     * @param intent {@link Intent#READ} or {@link Intent#WRITE}. {@literal READ} connections will be provided with
+     *        {@literal READONLY} mode set.
+     * @param nodeId the nodeId of the cluster node.
+     * @return a valid connection to the given nodeId.
+     * @throws RedisException if the {@code nodeId} is not part of the cluster
+     */
+    <K, V> CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(Intent intent, String nodeId);
+
+    /**
+     * Close the connections and free all resources.
+     */
+    @Override
+    void close();
+}
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
index a6320e5795..f6285ca873 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,24 +34,22 @@ interface ClusterConnectionProvider extends Closeable {
      * Provide a connection for the intent and cluster slot. The underlying connection is bound to the nodeId. If the slot
      * responsibility changes, the connection will not point to the updated nodeId.
      *
-     * @param intent {@link io.lettuce.core.cluster.ClusterConnectionProvider.Intent#READ} or
-     *        {@link io.lettuce.core.cluster.ClusterConnectionProvider.Intent#WRITE} {@literal READ} connections will be
-     *        provided in {@literal READONLY} mode
-     * @param slot the slot-hash of the key, see {@link SlotHash}
+     * @param intent {@link Intent#READ} or {@link ClusterConnectionProvider.Intent#WRITE}. {@literal READ} connections will be
+     *        provided with {@literal READONLY} mode set.
+     * @param slot the slot-hash of the key, see {@link SlotHash}.
      * @return a valid connection which handles the slot.
      * @throws RedisException if no know node can be found for the slot
      */
     <K, V> StatefulRedisConnection<K, V> getConnection(Intent intent, int slot);
 
     /**
-     * Provide a connection for the intent and host/port. The connection can survive cluster topology updates. The connection *
+     * Provide a connection for the intent and host/port. The connection can survive cluster topology updates. The connection
      * will be closed if the node identified by {@code host} and {@code port} is no longer part of the cluster.
      *
-     * @param intent {@link io.lettuce.core.cluster.ClusterConnectionProvider.Intent#READ} or
-     *        {@link io.lettuce.core.cluster.ClusterConnectionProvider.Intent#WRITE} {@literal READ} connections will be
-     *        provided in {@literal READONLY} mode
-     * @param host host of the node
-     * @param port port of the node
+     * @param intent {@link Intent#READ} or {@link Intent#WRITE}. {@literal READ} connections will be provided with
+     *        {@literal READONLY} mode set.
+     * @param host host of the node.
+     * @param port port of the node.
      * @return a valid connection to the given host.
      * @throws RedisException if the host is not part of the cluster
      */
@@ -61,9 +59,9 @@ interface ClusterConnectionProvider extends Closeable {
      * Provide a connection for the intent and nodeId. The connection can survive cluster topology updates. The connection will
      * be closed if the node identified by {@code nodeId} is no longer part of the cluster.
      *
-     *
-     * @param intent Connection intent {@literal READ} or {@literal WRITE}
-     * @param nodeId the nodeId of the cluster node
+     * @param intent {@link Intent#READ} or {@link Intent#WRITE}. {@literal READ} connections will be provided with
+     *        {@literal READONLY} mode set.
+     * @param nodeId the nodeId of the cluster node.
      * @return a valid connection to the given nodeId.
      * @throws RedisException if the {@code nodeId} is not part of the cluster
      */
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index 4a4feb7922..ebcb8046c1 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -19,6 +19,7 @@
 
 import java.nio.ByteBuffer;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.IntStream;
 
 import io.lettuce.core.*;
@@ -28,7 +29,6 @@
 import io.lettuce.core.internal.HostAndPort;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.*;
-
 import io.netty.util.concurrent.EventExecutorGroup;
 
 /**
@@ -40,6 +40,7 @@
 class ClusterDistributionChannelWriter implements RedisChannelWriter {
 
     private final RedisChannelWriter defaultWriter;
+    private final CompletableFuture<RedisChannelWriter> defaultWriterFuture;
     private final ClusterEventListener clusterEventListener;
     private final EventExecutorGroup eventExecutors;
     private final int executionLimit;
@@ -60,6 +61,8 @@ class ClusterDistributionChannelWriter implements RedisChannelWriter {
         this.defaultWriter = defaultWriter;
         this.clusterEventListener = clusterEventListener;
         this.eventExecutors = eventExecutors;
+
+        this.defaultWriterFuture = CompletableFuture.completedFuture(defaultWriter);
     }
 
     @SuppressWarnings("unchecked")
@@ -119,35 +122,49 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
             }
         }
 
-        RedisChannelWriter channelWriter = null;
+        CompletableFuture<RedisChannelWriter> channelWriter = defaultWriterFuture;
 
         ByteBuffer firstEncodedKey = args != null ? args.getFirstEncodedKey() : null;
         if (firstEncodedKey != null) {
             int hash = getSlot(args.getFirstEncodedKey());
             Intent intent = getIntent(command.getType());
 
-            RedisChannelHandler<K, V> connection = (RedisChannelHandler<K, V>) clusterConnectionProvider.getConnection(intent,
-                    hash);
-
-            channelWriter = connection.getChannelWriter();
+            channelWriter = ((AsyncClusterConnectionProvider) clusterConnectionProvider)
+                    .<K, V> getConnectionAsync(intent, hash)
+                    .thenApply(kvStatefulRedisConnection -> (RedisChannelHandler<K, V>) kvStatefulRedisConnection)
+                    .thenApply(RedisChannelHandler::getChannelWriter);
         }
 
-        if (channelWriter instanceof ClusterDistributionChannelWriter) {
-            ClusterDistributionChannelWriter writer = (ClusterDistributionChannelWriter) channelWriter;
-            channelWriter = writer.defaultWriter;
-        }
+        RedisCommand<K, V, T> fnCommandToSend = commandToSend;
 
-        if (command.getOutput() != null) {
-            commandToSend.getOutput().setError((String) null);
-        }
+        channelWriter.thenApply(writer -> {
 
-        if (channelWriter != null && channelWriter != this && channelWriter != defaultWriter) {
-            return channelWriter.write(commandToSend);
-        }
+            if (writer instanceof ClusterDistributionChannelWriter) {
+                return ((ClusterDistributionChannelWriter) writer).defaultWriter;
+            }
+
+            return writer;
+        }).handle((writer, throwable) -> {
+
+            if (throwable != null) {
+
+                fnCommandToSend.completeExceptionally(throwable);
+                return null;
+            }
+
+            try {
+                if (command.getOutput() != null) {
+                    fnCommandToSend.getOutput().setError((String) null);
+                }
+                writer.write(fnCommandToSend);
+            } catch (Exception e) {
+                fnCommandToSend.completeExceptionally(e);
+            }
 
-        defaultWriter.write(commandToSend);
+            return null;
+        });
 
-        return command;
+        return commandToSend;
     }
 
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java b/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
index ad9d88dd16..b6aa42c74d 100644
--- a/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
+++ b/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,23 +15,15 @@
  */
 package io.lettuce.core.cluster;
 
-import java.lang.reflect.Proxy;
 import java.util.Map;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Predicate;
 
 import io.lettuce.core.RedisCommandInterruptedException;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.RedisFuture;
-import io.lettuce.core.api.StatefulConnection;
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.cluster.api.NodeSelectionSupport;
-import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
-import io.lettuce.core.cluster.api.sync.NodeSelection;
-import io.lettuce.core.cluster.api.sync.NodeSelectionCommands;
-import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * Utility to perform and synchronize command executions on multiple cluster nodes.
@@ -54,11 +46,12 @@ static <T> T execute(Callable<T> function) {
      * @param executions mapping of a key to the future
      * @return future producing an aggregation result
      */
-    protected static RedisFuture<Long> aggregateAsync(Map<?, RedisFuture<Long>> executions) {
+    protected static RedisFuture<Long> aggregateAsync(Map<?, ? extends CompletionStage<Long>> executions) {
+
         return new PipelinedRedisFuture<>(executions, objectPipelinedRedisFuture -> {
             AtomicLong result = new AtomicLong();
-            for (RedisFuture<Long> future : executions.values()) {
-                Long value = execute(() -> future.get());
+            for (CompletionStage<Long> future : executions.values()) {
+                Long value = execute(() -> future.toCompletableFuture().get());
                 if (value != null) {
                     result.getAndAdd(value);
                 }
@@ -75,14 +68,15 @@ protected static RedisFuture<Long> aggregateAsync(Map<?, RedisFuture<Long>> exec
      * @param <T> result type
      * @return future returning the first result.
      */
-    protected static <T> RedisFuture<T> firstOfAsync(Map<?, RedisFuture<T>> executions) {
+    protected static <T> RedisFuture<T> firstOfAsync(Map<?, ? extends CompletionStage<T>> executions) {
+
         return new PipelinedRedisFuture<>(executions, objectPipelinedRedisFuture -> {
             // make sure, that all futures are executed before returning the result.
-                for (RedisFuture<T> future : executions.values()) {
-                    execute(() -> future.get());
+                for (CompletionStage<T> future : executions.values()) {
+                    execute(() -> future.toCompletableFuture().get());
                 }
-                for (RedisFuture<T> future : executions.values()) {
-                    return execute(() -> future.get());
+                for (CompletionStage<T> future : executions.values()) {
+                    return execute(() -> future.toCompletableFuture().get());
                 }
                 return null;
             });
@@ -94,12 +88,13 @@ protected static <T> RedisFuture<T> firstOfAsync(Map<?, RedisFuture<T>> executio
      * @param executions mapping of a key to the future
      * @return future returning the first result.
      */
-    protected static RedisFuture<String> alwaysOkOfAsync(Map<?, RedisFuture<String>> executions) {
+    protected static RedisFuture<String> alwaysOkOfAsync(Map<?, ? extends CompletionStage<String>> executions) {
+
         return new PipelinedRedisFuture<>(executions, objectPipelinedRedisFuture -> {
             // make sure, that all futures are executed before returning the result.
-                for (RedisFuture<String> future : executions.values()) {
+                for (CompletionStage<String> future : executions.values()) {
                     try {
-                        future.get();
+                        future.toCompletableFuture().get();
                     } catch (InterruptedException e) {
                         Thread.currentThread().interrupt();
                         throw new RedisCommandInterruptedException(e);
@@ -108,6 +103,7 @@ protected static RedisFuture<String> alwaysOkOfAsync(Map<?, RedisFuture<String>>
             }
         }
         return "OK";
+
     }   );
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java b/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
index 9d93212d0a..589fd177dc 100644
--- a/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
+++ b/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,10 @@ class PipelinedRedisFuture<V> extends CompletableFuture<V> implements RedisFutur
 
     private final CountDownLatch latch = new CountDownLatch(1);
 
+    public PipelinedRedisFuture(CompletionStage<V> completionStage) {
+        this(completionStage, v -> v);
+    }
+
     public PipelinedRedisFuture(CompletionStage<V> completionStage, Function<V, V> converter) {
         completionStage.thenAccept(v -> complete(converter.apply(v)))
                 .exceptionally(throwable -> {
@@ -41,7 +45,7 @@ public PipelinedRedisFuture(CompletionStage<V> completionStage, Function<V, V> c
                 });
     }
 
-    public PipelinedRedisFuture(Map<?, ? extends RedisFuture<?>> executions, Function<PipelinedRedisFuture<V>, V> converter) {
+    public PipelinedRedisFuture(Map<?, ? extends CompletionStage<?>> executions, Function<PipelinedRedisFuture<V>, V> converter) {
 
         CompletableFuture.allOf(executions.values().toArray(new CompletableFuture<?>[executions.size()]))
                 .thenRun(() -> complete(converter.apply(this))).exceptionally(throwable -> {
diff --git a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
index f901494a33..dca8fd72ee 100644
--- a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
@@ -18,6 +18,9 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -32,7 +35,6 @@
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
-
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -45,15 +47,15 @@
  * @since 3.0
  */
 @SuppressWarnings({ "unchecked", "rawtypes" })
-class PooledClusterConnectionProvider<K, V> implements ClusterConnectionProvider {
+class PooledClusterConnectionProvider<K, V> implements ClusterConnectionProvider, AsyncClusterConnectionProvider {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(PooledClusterConnectionProvider.class);
 
     // Contains NodeId-identified and HostAndPort-identified connections.
     private final Object stateLock = new Object();
     private final boolean debugEnabled = logger.isDebugEnabled();
-    private final StatefulRedisConnection<K, V> writers[] = new StatefulRedisConnection[SlotHash.SLOT_COUNT];
-    private final StatefulRedisConnection<K, V> readers[][] = new StatefulRedisConnection[SlotHash.SLOT_COUNT][];
+    private final CompletableFuture<StatefulRedisConnection<K, V>> writers[] = new CompletableFuture[SlotHash.SLOT_COUNT];
+    private final CompletableFuture<StatefulRedisConnection<K, V>> readers[][] = new CompletableFuture[SlotHash.SLOT_COUNT][];
     private final RedisClusterClient redisClusterClient;
     private final ClusterNodeConnectionFactory<K, V> connectionFactory;
     private final RedisChannelWriter clusterWriter;
@@ -75,27 +77,38 @@ public PooledClusterConnectionProvider(RedisClusterClient redisClusterClient, Re
     }
 
     @Override
-    @SuppressWarnings({ "unchecked", "hiding", "rawtypes" })
     public StatefulRedisConnection<K, V> getConnection(Intent intent, int slot) {
-        if (debugEnabled) {
-            logger.debug("getConnection(" + intent + ", " + slot + ")");
-        }
 
         try {
-            if (intent == Intent.READ && readFrom != null) {
-                return getReadConnection(slot);
-            }
-            return getWriteConnection(slot);
+            return getConnectionAsync(intent, slot).get();
         } catch (RedisException e) {
             throw e;
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RedisCommandInterruptedException(e);
+        } catch (ExecutionException e) {
+            throw new RedisException(e.getCause());
         } catch (RuntimeException e) {
             throw new RedisException(e);
         }
     }
 
-    private StatefulRedisConnection<K, V> getWriteConnection(int slot) {
+    @Override
+    public CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(Intent intent, int slot) {
 
-        StatefulRedisConnection<K, V> writer;// avoid races when reconfiguring partitions.
+        if (debugEnabled) {
+            logger.debug("getConnection(" + intent + ", " + slot + ")");
+        }
+
+        if (intent == Intent.READ && readFrom != null) {
+            return getReadConnection(slot);
+        }
+        return getWriteConnection(slot);
+    }
+
+    private CompletableFuture<StatefulRedisConnection<K, V>> getWriteConnection(int slot) {
+
+        CompletableFuture<StatefulRedisConnection<K, V>> writer;// avoid races when reconfiguring partitions.
         synchronized (stateLock) {
             writer = writers[slot];
         }
@@ -110,15 +123,25 @@ private StatefulRedisConnection<K, V> getWriteConnection(int slot) {
             // host because the nodeId can be handled by a different host.
             RedisURI uri = partition.getUri();
             ConnectionKey key = new ConnectionKey(Intent.WRITE, uri.getHost(), uri.getPort());
-            return writers[slot] = connectionProvider.getConnection(key);
+            return getConnectionAsync(key).thenApply(connection -> {
+
+                synchronized (stateLock) {
+                    if (writers[slot] == null) {
+                        writers[slot] = CompletableFuture.completedFuture(connection);
+                    }
+                }
 
+                return connection;
+            });
         }
+
         return writer;
     }
 
-    protected StatefulRedisConnection<K, V> getReadConnection(int slot) {
+    protected CompletableFuture<StatefulRedisConnection<K, V>> getReadConnection(int slot) {
+
+        CompletableFuture<StatefulRedisConnection<K, V>> readerCandidates[];// avoid races when reconfiguring partitions.
 
-        StatefulRedisConnection<K, V> readerCandidates[];// avoid races when reconfiguring partitions.
         synchronized (stateLock) {
             readerCandidates = readers[slot];
         }
@@ -149,37 +172,48 @@ public Iterator<RedisNodeDescription> iterator() {
             }
 
             readerCandidates = getReadFromConnections(selection);
-            readers[slot] = readerCandidates;
         }
 
-        // try working connections at first
-        for (StatefulRedisConnection<K, V> readerCandidate : readerCandidates) {
-            if (!readerCandidate.isOpen()) {
-                continue;
+        CompletableFuture<StatefulRedisConnection<K, V>> selectedReaderCandidates[] = readerCandidates;
+
+        return CompletableFuture.allOf(readerCandidates).thenRun(() -> {
+
+            synchronized (stateLock) {
+                if (readers[slot] == null) {
+                    readers[slot] = selectedReaderCandidates;
+                }
             }
-            return readerCandidate;
-        }
+        }).thenApply(v -> {
+
+            for (CompletableFuture<StatefulRedisConnection<K, V>> fnReaderCandidate : selectedReaderCandidates) {
 
-        // fall-back to the first connection for same behavior as writing
-        return readerCandidates[0];
+                StatefulRedisConnection<K, V> connection = fnReaderCandidate.join();
+
+                if (connection.isOpen()) {
+                    return connection;
+                }
+            }
+            return selectedReaderCandidates[0].join();
+        });
     }
 
-    private StatefulRedisConnection<K, V>[] getReadFromConnections(List<RedisNodeDescription> selection) {
+    private CompletableFuture<StatefulRedisConnection<K, V>>[] getReadFromConnections(List<RedisNodeDescription> selection) {
 
-        StatefulRedisConnection<K, V>[] readerCandidates;
+        CompletableFuture<StatefulRedisConnection<K, V>>[] readerCandidates;
         // Use always host and port for slot-oriented operations. We don't want to get reconnected on a different
         // host because the nodeId can be handled by a different host.
 
-        readerCandidates = new StatefulRedisConnection[selection.size()];
+        readerCandidates = new CompletableFuture[selection.size()];
 
         for (int i = 0; i < selection.size(); i++) {
+
             RedisNodeDescription redisClusterNode = selection.get(i);
 
             RedisURI uri = redisClusterNode.getUri();
             ConnectionKey key = new ConnectionKey(redisClusterNode.getRole() == RedisInstance.Role.MASTER ? Intent.WRITE
                     : Intent.READ, uri.getHost(), uri.getPort());
 
-            readerCandidates[i] = connectionProvider.getConnection(key);
+            readerCandidates[i] = getConnectionAsync(key);
         }
 
         return readerCandidates;
@@ -203,28 +237,52 @@ public StatefulRedisConnection<K, V> getConnection(Intent intent, String nodeId)
             logger.debug("getConnection(" + intent + ", " + nodeId + ")");
         }
 
-        ConnectionKey key = new ConnectionKey(intent, nodeId);
-        return connectionProvider.getConnection(key);
+        return connectionProvider.getConnection(new ConnectionKey(intent, nodeId));
     }
 
     @Override
-    @SuppressWarnings({ "unchecked", "hiding", "rawtypes" })
-    public StatefulRedisConnection<K, V> getConnection(Intent intent, String host, int port) {
+    public CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(Intent intent, String nodeId) {
 
-        try {
-            if (debugEnabled) {
-                logger.debug("getConnection(" + intent + ", " + host + ", " + port + ")");
-            }
+        if (debugEnabled) {
+            logger.debug("getConnection(" + intent + ", " + nodeId + ")");
+        }
+
+        return getConnectionAsync(new ConnectionKey(intent, nodeId));
+    }
+
+    protected CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(ConnectionKey key) {
+
+        CompletionStage<StatefulRedisConnection<K, V>> future = connectionProvider.getConnectionAsync(key);
 
-            if (validateClusterNodeMembership()) {
-                RedisClusterNode redisClusterNode = getPartition(host, port);
+        CompletableFuture<StatefulRedisConnection<K, V>> result = new CompletableFuture<>();
 
-                if (redisClusterNode == null) {
-                    HostAndPort hostAndPort = HostAndPort.of(host, port);
-                    throw invalidConnectionPoint(hostAndPort.toString());
+        future.handle((connection, throwable) -> {
+
+            if (throwable != null) {
+
+                if (future instanceof ConnectionFuture) {
+                    ConnectionFuture<?> connectionFuture = (ConnectionFuture<?>) future;
+                    result.completeExceptionally(RedisConnectionException.create(connectionFuture.getRemoteAddress(), throwable));
+                } else {
+                    result.completeExceptionally(throwable);
                 }
+            } else {
+                result.complete(connection);
             }
 
+            return null;
+        });
+
+        return result;
+    }
+
+    @Override
+    @SuppressWarnings({ "unchecked", "hiding", "rawtypes" })
+    public StatefulRedisConnection<K, V> getConnection(Intent intent, String host, int port) {
+
+        try {
+            beforeGetConnection(intent, host, port);
+
             ConnectionKey key = new ConnectionKey(intent, host, port);
             return connectionProvider.getConnection(key);
         } catch (RedisException e) {
@@ -234,6 +292,36 @@ public StatefulRedisConnection<K, V> getConnection(Intent intent, String host, i
         }
     }
 
+    @Override
+    public CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(Intent intent, String host, int port) {
+
+        try {
+            beforeGetConnection(intent, host, port);
+
+            return connectionProvider.getConnectionAsync(new ConnectionKey(intent, host, port)).toCompletableFuture();
+        } catch (RedisException e) {
+            throw e;
+        } catch (RuntimeException e) {
+            throw new RedisException(e);
+        }
+    }
+
+    private void beforeGetConnection(Intent intent, String host, int port) {
+
+        if (debugEnabled) {
+            logger.debug("getConnection(" + intent + ", " + host + ", " + port + ")");
+        }
+
+        if (validateClusterNodeMembership()) {
+            RedisClusterNode redisClusterNode = getPartition(host, port);
+
+            if (redisClusterNode == null) {
+                HostAndPort hostAndPort = HostAndPort.of(host, port);
+                throw invalidConnectionPoint(hostAndPort.toString());
+            }
+        }
+    }
+
     protected RedisClusterNode getPartition(String host, int port) {
 
         for (RedisClusterNode partition : partitions) {
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index 83c79f501d..eb45125799 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -22,6 +22,7 @@
 
 import java.lang.reflect.Proxy;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -57,7 +58,7 @@
  */
 @SuppressWarnings("unchecked")
 public class RedisAdvancedClusterAsyncCommandsImpl<K, V> extends AbstractRedisAsyncCommands<K, V> implements
-         RedisAdvancedClusterAsyncCommands<K, V> {
+        RedisAdvancedClusterAsyncCommands<K, V> {
 
     private final Random random = new Random();
     private final RedisCodec<K, V> codec;
@@ -80,6 +81,7 @@ public RedisFuture<Long> del(K... keys) {
 
     @Override
     public RedisFuture<Long> del(Iterable<K> keys) {
+
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
 
         if (partitioned.size() < 2) {
@@ -103,6 +105,7 @@ public RedisFuture<Long> unlink(K... keys) {
 
     @Override
     public RedisFuture<Long> unlink(Iterable<K> keys) {
+
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
 
         if (partitioned.size() < 2) {
@@ -125,6 +128,7 @@ public RedisFuture<Long> exists(K... keys) {
     }
 
     public RedisFuture<Long> exists(Iterable<K> keys) {
+
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
 
         if (partitioned.size() < 2) {
@@ -202,6 +206,7 @@ public RedisFuture<Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K
 
     @Override
     public RedisFuture<String> mset(Map<K, V> map) {
+
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, map.keySet());
 
         if (partitioned.size() < 2) {
@@ -224,6 +229,7 @@ public RedisFuture<String> mset(Map<K, V> map) {
 
     @Override
     public RedisFuture<Boolean> msetnx(Map<K, V> map) {
+
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, map.keySet());
 
         if (partitioned.size() < 2) {
@@ -256,19 +262,34 @@ public RedisFuture<Boolean> msetnx(Map<K, V> map) {
 
     @Override
     public RedisFuture<String> clientSetname(K name) {
-        Map<String, RedisFuture<String>> executions = new HashMap<>();
+
+        Map<String, CompletableFuture<String>> executions = new HashMap<>();
+
+        CompletableFuture<String> ok = CompletableFuture.completedFuture("OK");
 
         for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
-            StatefulRedisConnection<K, V> byNodeId = getStatefulConnection().getConnection(redisClusterNode.getNodeId());
-            if (byNodeId.isOpen()) {
-                executions.put("NodeId: " + redisClusterNode.getNodeId(), byNodeId.async().clientSetname(name));
-            }
 
             RedisURI uri = redisClusterNode.getUri();
-            StatefulRedisConnection<K, V> byHost = getStatefulConnection().getConnection(uri.getHost(), uri.getPort());
-            if (byHost.isOpen()) {
-                executions.put("HostAndPort: " + redisClusterNode.getNodeId(), byHost.async().clientSetname(name));
-            }
+
+            CompletableFuture<RedisClusterAsyncCommands<K, V>> byNodeId = getConnectionAsync(redisClusterNode.getNodeId());
+
+            executions.put("NodeId: " + redisClusterNode.getNodeId(), byNodeId.thenCompose(c -> {
+
+                if (c.isOpen()) {
+                    return c.clientSetname(name);
+                }
+                return ok;
+            }));
+
+            CompletableFuture<RedisClusterAsyncCommands<K, V>> byHost = getConnectionAsync(uri.getHost(), uri.getPort());
+
+            executions.put("HostAndPort: " + redisClusterNode.getNodeId(), byHost.thenCompose(c -> {
+
+                if (c.isOpen()) {
+                    return c.clientSetname(name);
+                }
+                return ok;
+            }));
         }
 
         return MultiNodeExecution.firstOfAsync(executions);
@@ -276,6 +297,7 @@ public RedisFuture<String> clientSetname(K name) {
 
     @Override
     public RedisFuture<List<K>> clusterGetKeysInSlot(int slot, int count) {
+
         RedisClusterAsyncCommands<K, V> connectionBySlot = findConnectionBySlot(slot);
 
         if (connectionBySlot != null) {
@@ -287,6 +309,7 @@ public RedisFuture<List<K>> clusterGetKeysInSlot(int slot, int count) {
 
     @Override
     public RedisFuture<Long> clusterCountKeysInSlot(int slot) {
+
         RedisClusterAsyncCommands<K, V> connectionBySlot = findConnectionBySlot(slot);
 
         if (connectionBySlot != null) {
@@ -298,32 +321,31 @@ public RedisFuture<Long> clusterCountKeysInSlot(int slot) {
 
     @Override
     public RedisFuture<Long> dbsize() {
-        Map<String, RedisFuture<Long>> executions = executeOnMasters(RedisServerAsyncCommands::dbsize);
-        return MultiNodeExecution.aggregateAsync(executions);
+        return MultiNodeExecution.aggregateAsync(executeOnMasters(RedisServerAsyncCommands::dbsize));
     }
 
     @Override
     public RedisFuture<String> flushall() {
-        Map<String, RedisFuture<String>> executions = executeOnMasters(RedisServerAsyncCommands::flushall);
-        return MultiNodeExecution.firstOfAsync(executions);
+        return MultiNodeExecution.firstOfAsync(executeOnMasters(RedisServerAsyncCommands::flushall));
     }
 
     @Override
     public RedisFuture<String> flushdb() {
-        Map<String, RedisFuture<String>> executions = executeOnMasters(RedisServerAsyncCommands::flushdb);
-        return MultiNodeExecution.firstOfAsync(executions);
+        return MultiNodeExecution.firstOfAsync(executeOnMasters(RedisServerAsyncCommands::flushdb));
     }
 
     @Override
     public RedisFuture<String> scriptFlush() {
-        Map<String, RedisFuture<String>> executions = executeOnNodes(RedisScriptingAsyncCommands::scriptFlush,
+
+        Map<String, CompletableFuture<String>> executions = executeOnNodes(RedisScriptingAsyncCommands::scriptFlush,
                 redisClusterNode -> true);
         return MultiNodeExecution.firstOfAsync(executions);
     }
 
     @Override
     public RedisFuture<String> scriptKill() {
-        Map<String, RedisFuture<String>> executions = executeOnNodes(RedisScriptingAsyncCommands::scriptFlush,
+
+        Map<String, CompletableFuture<String>> executions = executeOnNodes(RedisScriptingAsyncCommands::scriptFlush,
                 redisClusterNode -> true);
         return MultiNodeExecution.alwaysOkOfAsync(executions);
     }
@@ -333,18 +355,22 @@ public RedisFuture<V> randomkey() {
 
         Partitions partitions = getStatefulConnection().getPartitions();
         int index = random.nextInt(partitions.size());
+        RedisClusterNode partition = partitions.getPartition(index);
+
+        CompletableFuture<V> future = getConnectionAsync(partition.getUri().getHost(), partition.getUri().getPort())
+                .thenCompose(RedisKeyAsyncCommands::randomkey);
 
-        RedisClusterAsyncCommands<K, V> connection = getConnection(partitions.getPartition(index).getNodeId());
-        return connection.randomkey();
+        return new PipelinedRedisFuture<>(future);
     }
 
     @Override
     public RedisFuture<List<K>> keys(K pattern) {
-        Map<String, RedisFuture<List<K>>> executions = executeOnMasters(commands -> commands.keys(pattern));
+
+        Map<String, CompletableFuture<List<K>>> executions = executeOnMasters(commands -> commands.keys(pattern));
 
         return new PipelinedRedisFuture<>(executions, objectPipelinedRedisFuture -> {
             List<K> result = new ArrayList<>();
-            for (RedisFuture<List<K>> future : executions.values()) {
+            for (CompletableFuture<List<K>> future : executions.values()) {
                 result.addAll(MultiNodeExecution.execute(future::get));
             }
             return result;
@@ -353,7 +379,8 @@ public RedisFuture<List<K>> keys(K pattern) {
 
     @Override
     public RedisFuture<Long> keys(KeyStreamingChannel<K> channel, K pattern) {
-        Map<String, RedisFuture<Long>> executions = executeOnMasters(commands -> commands.keys(channel, pattern));
+
+        Map<String, CompletableFuture<Long>> executions = executeOnMasters(commands -> commands.keys(channel, pattern));
         return MultiNodeExecution.aggregateAsync(executions);
     }
 
@@ -399,7 +426,7 @@ public RedisFuture<Long> touch(Iterable<K> keys) {
      * @param <T> result type
      * @return map of a key (counter) and commands.
      */
-    protected <T> Map<String, RedisFuture<T>> executeOnMasters(
+    protected <T> Map<String, CompletableFuture<T>> executeOnMasters(
             Function<RedisClusterAsyncCommands<K, V>, RedisFuture<T>> function) {
         return executeOnNodes(function, redisClusterNode -> redisClusterNode.is(MASTER));
     }
@@ -412,9 +439,9 @@ protected <T> Map<String, RedisFuture<T>> executeOnMasters(
      * @param <T> result type
      * @return map of a key (counter) and commands.
      */
-    protected <T> Map<String, RedisFuture<T>> executeOnNodes(Function<RedisClusterAsyncCommands<K, V>, RedisFuture<T>> function,
-            Function<RedisClusterNode, Boolean> filter) {
-        Map<String, RedisFuture<T>> executions = new HashMap<>();
+    protected <T> Map<String, CompletableFuture<T>> executeOnNodes(
+            Function<RedisClusterAsyncCommands<K, V>, RedisFuture<T>> function, Function<RedisClusterNode, Boolean> filter) {
+        Map<String, CompletableFuture<T>> executions = new HashMap<>();
 
         for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
 
@@ -423,10 +450,10 @@ protected <T> Map<String, RedisFuture<T>> executeOnNodes(Function<RedisClusterAs
             }
 
             RedisURI uri = redisClusterNode.getUri();
-            StatefulRedisConnection<K, V> connection = getStatefulConnection().getConnection(uri.getHost(), uri.getPort());
-            if (connection.isOpen()) {
-                executions.put(redisClusterNode.getNodeId(), function.apply(connection.async()));
-            }
+            CompletableFuture<RedisClusterAsyncCommands<K, V>> connection = getConnectionAsync(uri.getHost(), uri.getPort());
+
+            executions.put(redisClusterNode.getNodeId(), connection.thenCompose(function::apply));
+
         }
         return executions;
     }
@@ -450,9 +477,24 @@ public RedisClusterAsyncCommands<K, V> getConnection(String host, int port) {
         return getStatefulConnection().getConnection(host, port).async();
     }
 
+    private CompletableFuture<RedisClusterAsyncCommands<K, V>> getConnectionAsync(String nodeId) {
+        return getConnectionProvider().<K, V> getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, nodeId).thenApply(
+                StatefulRedisConnection::async);
+    }
+
+    private CompletableFuture<RedisClusterAsyncCommands<K, V>> getConnectionAsync(String host, int port) {
+        return getConnectionProvider().<K, V> getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, host, port).thenApply(
+                StatefulRedisConnection::async);
+    }
+
     @Override
-    public StatefulRedisClusterConnection<K, V> getStatefulConnection() {
-        return (StatefulRedisClusterConnection<K, V>) super.getConnection();
+    public StatefulRedisClusterConnectionImpl<K, V> getStatefulConnection() {
+        return (StatefulRedisClusterConnectionImpl<K, V>) super.getConnection();
+    }
+
+    protected AsyncClusterConnectionProvider getConnectionProvider() {
+        return (AsyncClusterConnectionProvider) getStatefulConnection().getClusterDistributionChannelWriter()
+                .getClusterConnectionProvider();
     }
 
     @Override
@@ -487,8 +529,8 @@ protected AsyncNodeSelection<K, V> nodes(Predicate<RedisClusterNode> predicate,
 
         NodeSelectionInvocationHandler h = new NodeSelectionInvocationHandler((AbstractNodeSelection<?, ?, ?, ?>) selection,
                 RedisClusterAsyncCommands.class, ASYNC);
-        return (AsyncNodeSelection<K, V>) Proxy.newProxyInstance(NodeSelectionSupport.class.getClassLoader(),
-                new Class<?>[] { NodeSelectionAsyncCommands.class, AsyncNodeSelection.class }, h);
+        return (AsyncNodeSelection<K, V>) Proxy.newProxyInstance(NodeSelectionSupport.class.getClassLoader(), new Class<?>[] {
+                NodeSelectionAsyncCommands.class, AsyncNodeSelection.class }, h);
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index bca806029a..79d8df4d50 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -20,6 +20,7 @@
 import static io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag.MASTER;
 
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -28,11 +29,10 @@
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.reactive.RedisKeyReactiveCommands;
-import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.ClusterConnectionProvider.Intent;
 import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
 import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands;
 import io.lettuce.core.cluster.models.partitions.Partitions;
@@ -48,8 +48,8 @@
  * @author Mark Paluch
  * @since 4.0
  */
-public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedisReactiveCommands<K, V>
-        implements RedisAdvancedClusterReactiveCommands<K, V> {
+public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedisReactiveCommands<K, V> implements
+        RedisAdvancedClusterReactiveCommands<K, V> {
 
     private final Random random = new Random();
     private final RedisCodec<K, V> codec;
@@ -60,8 +60,7 @@ public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedi
      * @param connection the stateful connection
      * @param codec Codec used to encode/decode keys and values.
      */
-    public RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnectionImpl<K, V> connection,
-            RedisCodec<K, V> codec) {
+    public RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnectionImpl<K, V> connection, RedisCodec<K, V> codec) {
         super(connection, codec);
         this.codec = codec;
     }
@@ -224,41 +223,47 @@ public Mono<String> mset(Map<K, V> map) {
 
     @Override
     public Flux<K> clusterGetKeysInSlot(int slot, int count) {
-        RedisClusterReactiveCommands<K, V> connectionBySlot = findConnectionBySlot(slot);
 
-        if (connectionBySlot != null) {
-            return connectionBySlot.clusterGetKeysInSlot(slot, count);
-        }
+        Mono<RedisClusterReactiveCommands<K, V>> connectionBySlot = findConnectionBySlotReactive(slot);
 
-        return super.clusterGetKeysInSlot(slot, count);
+        return connectionBySlot.flatMapMany(conn -> conn.clusterGetKeysInSlot(slot, count));
     }
 
     @Override
     public Mono<Long> clusterCountKeysInSlot(int slot) {
-        RedisClusterReactiveCommands<K, V> connectionBySlot = findConnectionBySlot(slot);
 
-        if (connectionBySlot != null) {
-            return connectionBySlot.clusterCountKeysInSlot(slot);
-        }
+        Mono<RedisClusterReactiveCommands<K, V>> connectionBySlot = findConnectionBySlotReactive(slot);
 
-        return super.clusterCountKeysInSlot(slot);
+        return connectionBySlot.flatMap(cmd -> cmd.clusterCountKeysInSlot(slot));
     }
 
     @Override
     public Mono<String> clientSetname(K name) {
+
         List<Publisher<String>> publishers = new ArrayList<>();
 
         for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
-            StatefulRedisConnection<K, V> byNodeId = getStatefulConnection().getConnection(redisClusterNode.getNodeId());
-            if (byNodeId.isOpen()) {
-                publishers.add(byNodeId.reactive().clientSetname(name));
-            }
 
-            StatefulRedisConnection<K, V> byHost = getStatefulConnection().getConnection(redisClusterNode.getUri().getHost(),
+            Mono<RedisClusterReactiveCommands<K, V>> byNodeId = getConnectionReactive(redisClusterNode.getNodeId());
+
+            publishers.add(byNodeId.flatMap(conn -> {
+
+                if (conn.isOpen()) {
+                    return conn.clientSetname(name);
+                }
+                return Mono.empty();
+            }));
+
+            Mono<RedisClusterReactiveCommands<K, V>> byHost = getConnectionReactive(redisClusterNode.getUri().getHost(),
                     redisClusterNode.getUri().getPort());
-            if (byHost.isOpen()) {
-                publishers.add(byHost.reactive().clientSetname(name));
-            }
+
+            publishers.add(byHost.flatMap(conn -> {
+
+                if (conn.isOpen()) {
+                    return conn.clientSetname(name);
+                }
+                return Mono.empty();
+            }));
         }
 
         return Flux.merge(publishers).last();
@@ -266,31 +271,36 @@ public Mono<String> clientSetname(K name) {
 
     @Override
     public Mono<Long> dbsize() {
+
         Map<String, Flux<Long>> publishers = executeOnMasters((commands) -> commands.dbsize().flux());
         return Flux.merge(publishers.values()).reduce((accu, next) -> accu + next);
     }
 
     @Override
     public Mono<String> flushall() {
-        Map<String, Flux<String>> publishers = executeOnMasters(
-                (kvRedisClusterReactiveCommancommandss) -> kvRedisClusterReactiveCommancommandss.flushall().flux());
+
+        Map<String, Flux<String>> publishers = executeOnMasters((kvRedisClusterReactiveCommancommandss) -> kvRedisClusterReactiveCommancommandss
+                .flushall().flux());
         return Flux.merge(publishers.values()).last();
     }
 
     @Override
     public Mono<String> flushdb() {
+
         Map<String, Flux<String>> publishers = executeOnMasters((commands) -> commands.flushdb().flux());
         return Flux.merge(publishers.values()).last();
     }
 
     @Override
     public Flux<K> keys(K pattern) {
+
         Map<String, Flux<K>> publishers = executeOnMasters(commands -> commands.keys(pattern));
         return Flux.merge(publishers.values());
     }
 
     @Override
     public Mono<Long> keys(KeyStreamingChannel<K> channel, K pattern) {
+
         Map<String, Flux<Long>> publishers = executeOnMasters(commands -> commands.keys(channel, pattern).flux());
         return Flux.merge(publishers.values()).reduce((accu, next) -> accu + next);
     }
@@ -301,8 +311,8 @@ public Mono<V> randomkey() {
         Partitions partitions = getStatefulConnection().getPartitions();
         int index = random.nextInt(partitions.size());
 
-        RedisClusterReactiveCommands<K, V> connection = getConnection(partitions.getPartition(index).getNodeId());
-        return connection.randomkey();
+        Mono<RedisClusterReactiveCommands<K, V>> connection = getConnectionReactive(partitions.getPartition(index).getNodeId());
+        return connection.flatMap(RedisKeyReactiveCommands::randomkey);
     }
 
     @Override
@@ -370,6 +380,7 @@ protected <T> Map<String, Flux<T>> executeOnMasters(Function<RedisClusterReactiv
      */
     protected <T> Map<String, Flux<T>> executeOnNodes(Function<RedisClusterReactiveCommands<K, V>, Flux<T>> function,
             Function<RedisClusterNode, Boolean> filter) {
+
         Map<String, Flux<T>> executions = new HashMap<>();
 
         for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
@@ -379,26 +390,26 @@ protected <T> Map<String, Flux<T>> executeOnNodes(Function<RedisClusterReactiveC
             }
 
             RedisURI uri = redisClusterNode.getUri();
-            StatefulRedisConnection<K, V> connection = getStatefulConnection().getConnection(uri.getHost(), uri.getPort());
-            if (connection.isOpen()) {
-                executions.put(redisClusterNode.getNodeId(), function.apply(connection.reactive()));
-            }
+            Mono<RedisClusterReactiveCommands<K, V>> connection = getConnectionReactive(uri.getHost(), uri.getPort());
+
+            executions.put(redisClusterNode.getNodeId(), connection.flatMapMany(function::apply));
         }
         return executions;
     }
 
-    private RedisClusterReactiveCommands<K, V> findConnectionBySlot(int slot) {
+    private Mono<RedisClusterReactiveCommands<K, V>> findConnectionBySlotReactive(int slot) {
+
         RedisClusterNode node = getStatefulConnection().getPartitions().getPartitionBySlot(slot);
         if (node != null) {
-            return getConnection(node.getUri().getHost(), node.getUri().getPort());
+            return getConnectionReactive(node.getUri().getHost(), node.getUri().getPort());
         }
 
-        return null;
+        return Mono.error(new RedisException("No partition for slot " + slot));
     }
 
     @Override
-    public StatefulRedisClusterConnection<K, V> getStatefulConnection() {
-        return (StatefulRedisClusterConnection<K, V>) super.getConnection();
+    public StatefulRedisClusterConnectionImpl<K, V> getStatefulConnection() {
+        return (StatefulRedisClusterConnectionImpl<K, V>) super.getConnection();
     }
 
     @Override
@@ -406,11 +417,26 @@ public RedisClusterReactiveCommands<K, V> getConnection(String nodeId) {
         return getStatefulConnection().getConnection(nodeId).reactive();
     }
 
+    private Mono<RedisClusterReactiveCommands<K, V>> getConnectionReactive(String nodeId) {
+        return getMono(getConnectionProvider().<K, V> getConnectionAsync(Intent.WRITE, nodeId)).map(
+                StatefulRedisConnection::reactive);
+    }
+
     @Override
     public RedisClusterReactiveCommands<K, V> getConnection(String host, int port) {
         return getStatefulConnection().getConnection(host, port).reactive();
     }
 
+    private Mono<RedisClusterReactiveCommands<K, V>> getConnectionReactive(String host, int port) {
+        return getMono(getConnectionProvider().<K, V> getConnectionAsync(Intent.WRITE, host, port)).map(
+                StatefulRedisConnection::reactive);
+    }
+
+    private AsyncClusterConnectionProvider getConnectionProvider() {
+        return (AsyncClusterConnectionProvider) getStatefulConnection().getClusterDistributionChannelWriter()
+                .getClusterConnectionProvider();
+    }
+
     @Override
     public Mono<KeyScanCursor<K>> scan() {
         return clusterScan(ScanCursor.INITIAL, (connection, cursor) -> connection.scan(), reactiveClusterKeyScanCursorMapper());
@@ -430,7 +456,7 @@ public Mono<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs) {
 
     @Override
     public Mono<KeyScanCursor<K>> scan(ScanCursor scanCursor) {
-        return clusterScan(scanCursor, (connection, cursor) -> connection.scan(cursor), reactiveClusterKeyScanCursorMapper());
+        return clusterScan(scanCursor, RedisKeyReactiveCommands::scan, reactiveClusterKeyScanCursorMapper());
     }
 
     @Override
@@ -457,6 +483,7 @@ public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor sc
                 reactiveClusterStreamScanCursorMapper());
     }
 
+    @SuppressWarnings("unchecked")
     private <T extends ScanCursor> Mono<T> clusterScan(ScanCursor cursor,
             BiFunction<RedisKeyReactiveCommands<K, V>, ScanCursor, Mono<T>> scanFunction,
             ClusterScanSupport.ScanCursorMapper<Mono<T>> resultMapper) {
@@ -468,15 +495,19 @@ private <T extends ScanCursor> Mono<T> clusterScan(ScanCursor cursor,
      * Perform a SCAN in the cluster.
      *
      */
-    static <T extends ScanCursor, K, V> Mono<T> clusterScan(StatefulRedisClusterConnection<K, V> connection, ScanCursor cursor,
-            BiFunction<RedisKeyReactiveCommands<K, V>, ScanCursor, Mono<T>> scanFunction,
+    static <T extends ScanCursor, K, V> Mono<T> clusterScan(StatefulRedisClusterConnectionImpl<K, V> connection,
+            ScanCursor cursor, BiFunction<RedisKeyReactiveCommands<K, V>, ScanCursor, Mono<T>> scanFunction,
             ClusterScanSupport.ScanCursorMapper<Mono<T>> mapper) {
 
         List<String> nodeIds = ClusterScanSupport.getNodeIds(connection, cursor);
         String currentNodeId = ClusterScanSupport.getCurrentNodeId(cursor, nodeIds);
         ScanCursor continuationCursor = ClusterScanSupport.getContinuationCursor(cursor);
 
-        Mono<T> scanCursor = scanFunction.apply(connection.getConnection(currentNodeId).reactive(), continuationCursor);
+        AsyncClusterConnectionProvider connectionProvider = (AsyncClusterConnectionProvider) connection
+                .getClusterDistributionChannelWriter().getClusterConnectionProvider();
+
+        Mono<T> scanCursor = getMono(connectionProvider.<K, V> getConnectionAsync(Intent.WRITE, currentNodeId)).flatMap(
+                conn -> scanFunction.apply(conn.reactive(), continuationCursor));
         return mapper.map(nodeIds, currentNodeId, scanCursor);
     }
 
@@ -498,4 +529,7 @@ private <T> Flux<T> pipeliningWithMap(Map<K, V> map, Function<Map<K, V>, Flux<T>
         return resultFunction.apply(Flux.merge(publishers));
     }
 
+    private static <T> Mono<T> getMono(CompletableFuture<T> future) {
+        return Mono.fromCompletionStage(future);
+    }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
index 935bb583e9..20cdba993c 100644
--- a/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
@@ -16,7 +16,9 @@
 package io.lettuce.core.cluster;
 
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.function.BiConsumer;
@@ -68,6 +70,30 @@ public SynchronizingClusterConnectionProvider(ClusterNodeConnectionFactory<K, V>
      * @throws CompletionException
      */
     public StatefulRedisConnection<K, V> getConnection(ConnectionKey key) {
+        return getConnectionSync(key).getConnection();
+    }
+
+    /**
+     * Obtain a {@link CompletableFuture}-wrapped connection to a cluster node given {@link ConnectionKey}.
+     *
+     * @param key the {@link ConnectionKey}.
+     * @return
+     * @throws RedisException if a {@link RedisException} occured
+     * @throws CompletionException
+     */
+    public CompletionStage<StatefulRedisConnection<K, V>> getConnectionAsync(ConnectionKey key) {
+        return getConnectionSync(key).getConnectionAsync();
+    }
+
+    /**
+     * Obtain a {@link StatefulRedisConnection} to a cluster node given {@link ConnectionKey}.
+     *
+     * @param key the {@link ConnectionKey}.
+     * @return
+     * @throws RedisException if a {@link RedisException} occured
+     * @throws CompletionException
+     */
+    private Sync<K, V> getConnectionSync(ConnectionKey key) {
 
         if (closed) {
             throw new IllegalStateException("AsyncClusterConnectionProvider is already closed");
@@ -85,7 +111,7 @@ public StatefulRedisConnection<K, V> getConnection(ConnectionKey key) {
             return createdSync;
         });
 
-        return sync.getConnection();
+        return sync;
     }
 
     /**
@@ -161,6 +187,8 @@ interface Sync<K, V> {
          */
         StatefulRedisConnection<K, V> getConnection();
 
+        CompletionStage<StatefulRedisConnection<K, V>> getConnectionAsync();
+
         /**
          * Apply a {@link Consumer} callback to the {@link StatefulConnection}.
          *
@@ -179,11 +207,13 @@ interface Sync<K, V> {
     static class Finished<K, V> implements Sync<K, V> {
 
         private final ConnectionKey key;
-        private StatefulRedisConnection<K, V> connection;
+        private final StatefulRedisConnection<K, V> connection;
+        private final CompletableFuture<StatefulRedisConnection<K, V>> future;
 
         public Finished(ConnectionKey key, StatefulRedisConnection<K, V> connection) {
             this.key = key;
             this.connection = connection;
+            this.future = CompletableFuture.completedFuture(connection);
         }
 
         @Override
@@ -191,6 +221,11 @@ public StatefulRedisConnection<K, V> getConnection() {
             return connection;
         }
 
+        @Override
+        public CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync() {
+            return future;
+        }
+
         @Override
         public void doWithSync(Consumer<? super StatefulRedisConnection<K, V>> action) {
             action.accept(connection);
@@ -226,24 +261,28 @@ public InProgress(ConnectionKey key, ConnectionFuture<StatefulRedisConnection<K,
             this.connections = connections;
         }
 
-        public StatefulRedisConnection<K, V> getConnection() {
+        @Override
+        public CompletionStage<StatefulRedisConnection<K, V>> getConnectionAsync() {
 
-            try {
-                return future.whenComplete((connection, throwable) -> {
+            return future.whenComplete((connection, throwable) -> {
 
-                    if (REMOVE.compareAndSet(this, 0, ST_FINISHED)) {
+                if (REMOVE.compareAndSet(this, 0, ST_FINISHED)) {
 
-                        if (throwable == null) {
-                            connections.replace(key, this, new Finished<>(key, connection));
-                        } else {
-                            connections.remove(key);
-                        }
+                    if (throwable == null) {
+                        connections.replace(key, this, new Finished<>(key, connection));
+                    } else {
+                        connections.remove(key);
                     }
+                }
+            });
+        }
 
-                }).join();
+        public StatefulRedisConnection<K, V> getConnection() {
+
+            try {
+                return getConnectionAsync().toCompletableFuture().join();
             } catch (CompletionException e) {
-                String msg = String.format("Unable to connect to %s", future.getRemoteAddress());
-                throw new RedisConnectionException(msg, e.getCause());
+                throw RedisConnectionException.create(future.getRemoteAddress(), e.getCause());
             }
         }
 
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
index bf98c73a55..fdddc30d51 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
@@ -95,7 +95,7 @@ public void operateOnPartiallyDownCluster() throws Exception {
         try {
             connection.sync().get(key_10439);
             fail("Missing RedisException");
-        } catch (RedisConnectionException e) {
+        } catch (RedisException e) {
             assertThat(e).hasRootCauseInstanceOf(ConnectException.class);
         }
 
diff --git a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java
new file mode 100644
index 0000000000..81d14c7fa6
--- /dev/null
+++ b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
+import io.lettuce.core.resource.DefaultClientResources;
+import io.lettuce.core.resource.EventLoopGroupProvider;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.util.concurrent.EventExecutorGroup;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.ImmediateEventExecutor;
+import io.netty.util.concurrent.SucceededFuture;
+
+/**
+ * @author Mark Paluch
+ */
+public class SingleThreadedReactiveClusterClientTest {
+
+    RedisClusterClient client;
+
+    @Before
+    public void before() {
+
+        NioEventLoopGroup nioEventLoopGroup = new NioEventLoopGroup(1);
+        DefaultClientResources clientResources = DefaultClientResources.builder()
+                .eventExecutorGroup(ImmediateEventExecutor.INSTANCE).eventLoopGroupProvider(new EventLoopGroupProvider() {
+                    @Override
+                    public <T extends EventLoopGroup> T allocate(Class<T> type) {
+                        return (T) nioEventLoopGroup;
+                    }
+
+                    @Override
+                    public int threadPoolSize() {
+                        return 0;
+                    }
+
+                    @Override
+                    public Future<Boolean> release(EventExecutorGroup eventLoopGroup, long quietPeriod, long timeout,
+                            TimeUnit unit) {
+                        return new SucceededFuture<>(ImmediateEventExecutor.INSTANCE, true);
+                    }
+
+                    @Override
+                    public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
+                        nioEventLoopGroup.shutdownGracefully(quietPeriod, timeout, timeUnit);
+                        return new SucceededFuture<>(ImmediateEventExecutor.INSTANCE, true);
+                    }
+
+                }).commandLatencyCollectorOptions(DefaultCommandLatencyCollectorOptions.disabled()).build();
+
+        client = RedisClusterClient.create(clientResources, RedisURI.create("localhost", 7379));
+    }
+
+    @After
+    public void tearDown() {
+
+        client.shutdown();
+        client.getResources().shutdown();
+    }
+
+    @Test
+    public void shouldPropagateAsynchronousConnections() {
+
+        StatefulRedisClusterConnection<String, String> connect = client.connect();
+        connect.sync().flushall();
+
+        List<String> keys = connect.reactive().set("key", "value").flatMap(s -> connect.reactive().set("foo", "bar"))
+                .flatMapMany(s -> connect.reactive().keys("*")) //
+                .doOnError(Throwable::printStackTrace) //
+                .collectList() //
+                .block();
+
+        assertThat(keys).contains("key", "foo");
+    }
+}
diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
index a733b73ecf..56e9b70623 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
@@ -84,7 +84,8 @@ public void pingBeforeConnectFailOnReconnect() throws Exception {
 
         try {
             RedisAsyncCommands<String, String> connection = client.connect(redisUri).async();
-            ConnectionWatchdog connectionWatchdog = ConnectionTestUtil.getConnectionWatchdog(connection.getStatefulConnection());
+            ConnectionWatchdog connectionWatchdog = ConnectionTestUtil
+                    .getConnectionWatchdog(connection.getStatefulConnection());
 
             assertThat(connectionWatchdog.isListenOnChannelInactive()).isTrue();
             assertThat(connectionWatchdog.isReconnectSuspended()).isFalse();
@@ -120,8 +121,8 @@ public void pingBeforeConnectFailOnReconnect() throws Exception {
     @Test(timeout = 120000)
     public void pingBeforeConnectFailOnReconnectShouldSendEvents() throws Exception {
 
-        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true)
-                .suspendReconnectOnProtocolFailure(false).build());
+        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).suspendReconnectOnProtocolFailure(false)
+                .build());
 
         RandomResponseServer ts = getRandomResponseServer();
 
@@ -133,7 +134,8 @@ public void pingBeforeConnectFailOnReconnectShouldSendEvents() throws Exception
             final BlockingQueue<ConnectionEvents.Reconnect> events = new LinkedBlockingDeque<>();
 
             RedisAsyncCommands<String, String> connection = client.connect(redisUri).async();
-            ConnectionWatchdog connectionWatchdog = ConnectionTestUtil.getConnectionWatchdog(connection.getStatefulConnection());
+            ConnectionWatchdog connectionWatchdog = ConnectionTestUtil
+                    .getConnectionWatchdog(connection.getStatefulConnection());
 
             ReconnectionListener reconnectionListener = new ReconnectionListener() {
                 @Override
@@ -172,17 +174,18 @@ public void onReconnect(ConnectionEvents.Reconnect reconnect) {
     @Test(timeout = 10000)
     public void cancelCommandsOnReconnectFailure() throws Exception {
 
-        client.setOptions(
-                ClientOptions.builder().pingBeforeActivateConnection(true).cancelCommandsOnReconnectFailure(true).build());
+        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).cancelCommandsOnReconnectFailure(true)
+                .build());
 
         RandomResponseServer ts = getRandomResponseServer();
 
         RedisURI redisUri = RedisURI.create(defaultRedisUri.toURI());
 
         try {
-            RedisAsyncCommandsImpl<String, String> connection = (RedisAsyncCommandsImpl<String, String>) client
-                    .connect(redisUri).async();
-            ConnectionWatchdog connectionWatchdog = ConnectionTestUtil.getConnectionWatchdog(connection.getStatefulConnection());
+            RedisAsyncCommandsImpl<String, String> connection = (RedisAsyncCommandsImpl<String, String>) client.connect(
+                    redisUri).async();
+            ConnectionWatchdog connectionWatchdog = ConnectionTestUtil
+                    .getConnectionWatchdog(connection.getStatefulConnection());
 
             assertThat(connectionWatchdog.isListenOnChannelInactive()).isTrue();
 
@@ -239,8 +242,8 @@ public void closingDisconnectedConnectionShouldDisableConnectionWatchdog() throw
 
         client.setOptions(ClientOptions.create());
 
-        RedisURI redisUri = RedisURI.Builder.redis(TestSettings.host(), TestSettings.port())
-                .withTimeout(10, TimeUnit.MINUTES).build();
+        RedisURI redisUri = RedisURI.Builder.redis(TestSettings.host(), TestSettings.port()).withTimeout(10, TimeUnit.MINUTES)
+                .build();
 
         StatefulRedisConnection<String, String> connection = client.connect(redisUri);
 
@@ -257,6 +260,7 @@ public void closingDisconnectedConnectionShouldDisableConnectionWatchdog() throw
         Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
 
         connection.close();
+        Thread.sleep(100);
 
         assertThat(connectionWatchdog.isReconnectSuspended()).isTrue();
         assertThat(connectionWatchdog.isListenOnChannelInactive()).isFalse();

From da3f9e9a0ec65e2335ffc78251797ed3a8e6cf70 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 13 Apr 2017 13:35:04 +0200
Subject: [PATCH 183/808] Use ThreadLocalRandom instead of Random #510

ThreadLocalRandom yields better performance in multi-threaded arrangements than Random.
---
 .../core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java    | 3 ++-
 .../core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index eb45125799..cf52ec26fb 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -23,6 +23,7 @@
 import java.lang.reflect.Proxy;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -60,7 +61,7 @@
 public class RedisAdvancedClusterAsyncCommandsImpl<K, V> extends AbstractRedisAsyncCommands<K, V> implements
         RedisAdvancedClusterAsyncCommands<K, V> {
 
-    private final Random random = new Random();
+    private final Random random = ThreadLocalRandom.current();
     private final RedisCodec<K, V> codec;
 
     /**
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index 79d8df4d50..f11588583b 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -21,6 +21,7 @@
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -51,7 +52,7 @@
 public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedisReactiveCommands<K, V> implements
         RedisAdvancedClusterReactiveCommands<K, V> {
 
-    private final Random random = new Random();
+    private final Random random = ThreadLocalRandom.current();
     private final RedisCodec<K, V> codec;
 
     /**

From 0327ab14020633154af0ced11956b93c20b28396 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 13 Apr 2017 17:21:10 +0200
Subject: [PATCH 184/808] Inline ThreadLocalRandom field #510

Use ThreadLocalRandom.current() directly instead through a pre-initialized field to obtain the Thread's current Random instance. Thanks @Spikhalskiy for discovering the issue.
---
 .../core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java    | 3 +--
 .../core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index cf52ec26fb..f5831664da 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -61,7 +61,6 @@
 public class RedisAdvancedClusterAsyncCommandsImpl<K, V> extends AbstractRedisAsyncCommands<K, V> implements
         RedisAdvancedClusterAsyncCommands<K, V> {
 
-    private final Random random = ThreadLocalRandom.current();
     private final RedisCodec<K, V> codec;
 
     /**
@@ -355,7 +354,7 @@ public RedisFuture<String> scriptKill() {
     public RedisFuture<V> randomkey() {
 
         Partitions partitions = getStatefulConnection().getPartitions();
-        int index = random.nextInt(partitions.size());
+        int index = ThreadLocalRandom.current().nextInt(partitions.size());
         RedisClusterNode partition = partitions.getPartition(index);
 
         CompletableFuture<V> future = getConnectionAsync(partition.getUri().getHost(), partition.getUri().getPort())
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index f11588583b..ebf69e4c04 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -52,7 +52,6 @@
 public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedisReactiveCommands<K, V> implements
         RedisAdvancedClusterReactiveCommands<K, V> {
 
-    private final Random random = ThreadLocalRandom.current();
     private final RedisCodec<K, V> codec;
 
     /**
@@ -310,7 +309,7 @@ public Mono<Long> keys(KeyStreamingChannel<K> channel, K pattern) {
     public Mono<V> randomkey() {
 
         Partitions partitions = getStatefulConnection().getPartitions();
-        int index = random.nextInt(partitions.size());
+        int index = ThreadLocalRandom.current().nextInt(partitions.size());
 
         Mono<RedisClusterReactiveCommands<K, V>> connection = getConnectionReactive(partitions.getPartition(index).getNodeId());
         return connection.flatMap(RedisKeyReactiveCommands::randomkey);

From cca74fd0de3f23755660633a17513fca275d8c72 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 13 Apr 2017 15:17:19 +0200
Subject: [PATCH 185/808] Implement counting Deque #507

Provide a decorated Deque implementation (FastCountingDeque) to provide a fast size() operation on top of any arbitrary Deque implementation.

ConcurrentLinkedDeque is a very efficient implementation but the cost for size() is O(n) so FastCountingDeque can benefit from the efficient implementation while providing a fast counter.
---
 .../core/internal/FastCountingDeque.java      | 327 ++++++++++++++++++
 .../core/internal/ForwardingDeque.java        | 253 ++++++++++++++
 .../core/internal/LettuceFactories.java       |  10 +-
 3 files changed, 585 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/internal/FastCountingDeque.java
 create mode 100644 src/main/java/io/lettuce/core/internal/ForwardingDeque.java

diff --git a/src/main/java/io/lettuce/core/internal/FastCountingDeque.java b/src/main/java/io/lettuce/core/internal/FastCountingDeque.java
new file mode 100644
index 0000000000..bcf456d9a3
--- /dev/null
+++ b/src/main/java/io/lettuce/core/internal/FastCountingDeque.java
@@ -0,0 +1,327 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.internal;
+
+import java.util.Collection;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.function.Predicate;
+
+/**
+ * {@link Deque} implementing a fast counting strategy by updating its count after applying modifications
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public class FastCountingDeque<E> extends ForwardingDeque<E> implements Deque<E> {
+
+    private final static AtomicIntegerFieldUpdater<FastCountingDeque> UPDATER = AtomicIntegerFieldUpdater.newUpdater(
+            FastCountingDeque.class, "count");
+
+    // accessed through AtomicIntegerFieldUpdater.
+    private volatile int count = 0;
+
+    public FastCountingDeque(Deque<E> delegate) {
+        super(delegate);
+    }
+
+    @Override
+    public void addFirst(E e) {
+        increment();
+        super.addFirst(e);
+    }
+
+    @Override
+    public void addLast(E e) {
+        increment();
+        super.addLast(e);
+    }
+
+    @Override
+    public boolean offerFirst(E e) {
+        if (super.offerFirst(e)) {
+            increment();
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean offerLast(E e) {
+        if (super.offerLast(e)) {
+            increment();
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public E removeFirst() {
+        E element = super.removeFirst();
+        if (element != null) {
+            decrement();
+        }
+        return element;
+    }
+
+    @Override
+    public E removeLast() {
+        E element = super.removeLast();
+        if (element != null) {
+            decrement();
+        }
+        return element;
+    }
+
+    @Override
+    public E pollFirst() {
+        E element = super.pollFirst();
+        if (element != null) {
+            decrement();
+        }
+        return element;
+    }
+
+    @Override
+    public E pollLast() {
+        E element = super.pollLast();
+        if (element != null) {
+            decrement();
+        }
+        return element;
+    }
+
+    @Override
+    public E getFirst() {
+        return super.getFirst();
+    }
+
+    @Override
+    public E getLast() {
+        return super.getLast();
+    }
+
+    @Override
+    public E peekFirst() {
+        return super.peekFirst();
+    }
+
+    @Override
+    public E peekLast() {
+        return super.peekLast();
+    }
+
+    @Override
+    public boolean removeFirstOccurrence(Object o) {
+        if (super.removeFirstOccurrence(o)) {
+            decrement();
+
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean removeLastOccurrence(Object o) {
+        if (super.removeLastOccurrence(o)) {
+            decrement();
+
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean add(E e) {
+
+        if (super.add(e)) {
+            increment();
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean offer(E e) {
+
+        if (super.offer(e)) {
+            increment();
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public E remove() {
+        E element = super.remove();
+        if (element != null) {
+            decrement();
+        }
+        return element;
+    }
+
+    @Override
+    public E poll() {
+        E element = super.poll();
+        if (element != null) {
+            decrement();
+        }
+        return element;
+    }
+
+    @Override
+    public E element() {
+        return super.element();
+    }
+
+    @Override
+    public E peek() {
+        return super.peek();
+    }
+
+    @Override
+    public void push(E e) {
+        super.push(e);
+        increment();
+    }
+
+    @Override
+    public E pop() {
+        E element = super.pop();
+        if (element != null) {
+            decrement();
+        }
+        return element;
+    }
+
+    @Override
+    public boolean remove(Object o) {
+        if (super.remove(o)) {
+            decrement();
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return super.contains(o);
+    }
+
+    @Override
+    public int size() {
+        return UPDATER.get(this);
+    }
+
+    @Override
+    public Iterator<E> iterator() {
+        return new UnmodifiableIterator<>(super.iterator());
+    }
+
+    @Override
+    public Iterator<E> descendingIterator() {
+        return new UnmodifiableIterator<>(super.descendingIterator());
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return super.isEmpty();
+    }
+
+    @Override
+    public Object[] toArray() {
+        return super.toArray();
+    }
+
+    @Override
+    public <T> T[] toArray(T[] a) {
+        return super.toArray(a);
+    }
+
+    @Override
+    public boolean containsAll(Collection<?> c) {
+        return super.containsAll(c);
+    }
+
+    @Override
+    public boolean addAll(Collection<? extends E> c) {
+        boolean state = super.addAll(c);
+        count = super.size();
+        return state;
+    }
+
+    @Override
+    public boolean removeAll(Collection<?> c) {
+        boolean state = super.removeAll(c);
+        count = super.size();
+        return state;
+    }
+
+    @Override
+    public boolean removeIf(Predicate<? super E> filter) {
+        boolean state = super.removeIf(filter);
+        count = super.size();
+        return state;
+    }
+
+    @Override
+    public boolean retainAll(Collection<?> c) {
+        boolean state = super.retainAll(c);
+        count = super.size();
+        return state;
+    }
+
+    @Override
+    public void clear() {
+        super.clear();
+        UPDATER.set(this, 0);
+    }
+
+    protected void increment() {
+        assert UPDATER.incrementAndGet(this) > 0;
+    }
+
+    protected void decrement() {
+        assert UPDATER.decrementAndGet(this) >= 0;
+    }
+
+    private static class UnmodifiableIterator<E> implements Iterator<E> {
+
+        private final Iterator<E> delegate;
+
+        public UnmodifiableIterator(Iterator<E> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public boolean hasNext() {
+            return delegate.hasNext();
+        }
+
+        @Override
+        public E next() {
+            return delegate.next();
+        }
+
+        @Override
+        public void remove() {
+            throw new UnsupportedOperationException();
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/internal/ForwardingDeque.java b/src/main/java/io/lettuce/core/internal/ForwardingDeque.java
new file mode 100644
index 0000000000..d23f355387
--- /dev/null
+++ b/src/main/java/io/lettuce/core/internal/ForwardingDeque.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.internal;
+
+import java.util.Collection;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.Spliterator;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+/**
+ * Delegating {@link Deque} allowing to override particular methods and not changing the underlying {@link Deque} behavior. This
+ * class is applying the decorator pattern to the underlying {@link Deque}.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public abstract class ForwardingDeque<E> implements Deque<E> {
+
+    protected final Deque<E> delegate;
+
+    public ForwardingDeque(Deque<E> delegate) {
+
+        LettuceAssert.notNull(delegate, "Deque delegate must not be null");
+
+        this.delegate = delegate;
+    }
+
+    @Override
+    public void addFirst(E e) {
+        delegate.addFirst(e);
+    }
+
+    @Override
+    public void addLast(E e) {
+        delegate.addLast(e);
+    }
+
+    @Override
+    public boolean offerFirst(E e) {
+        return delegate.offerFirst(e);
+    }
+
+    @Override
+    public boolean offerLast(E e) {
+        return delegate.offerLast(e);
+    }
+
+    @Override
+    public E removeFirst() {
+        return delegate.removeFirst();
+    }
+
+    @Override
+    public E removeLast() {
+        return delegate.removeLast();
+    }
+
+    @Override
+    public E pollFirst() {
+        return delegate.pollFirst();
+    }
+
+    @Override
+    public E pollLast() {
+        return delegate.pollLast();
+    }
+
+    @Override
+    public E getFirst() {
+        return delegate.getFirst();
+    }
+
+    @Override
+    public E getLast() {
+        return delegate.getLast();
+    }
+
+    @Override
+    public E peekFirst() {
+        return delegate.peekFirst();
+    }
+
+    @Override
+    public E peekLast() {
+        return delegate.peekLast();
+    }
+
+    @Override
+    public boolean removeFirstOccurrence(Object o) {
+        return delegate.removeFirstOccurrence(o);
+    }
+
+    @Override
+    public boolean removeLastOccurrence(Object o) {
+        return delegate.removeLastOccurrence(o);
+    }
+
+    @Override
+    public boolean add(E e) {
+        return delegate.add(e);
+    }
+
+    @Override
+    public boolean offer(E e) {
+        return delegate.offer(e);
+    }
+
+    @Override
+    public E remove() {
+        return delegate.remove();
+    }
+
+    @Override
+    public E poll() {
+        return delegate.poll();
+    }
+
+    @Override
+    public E element() {
+        return delegate.element();
+    }
+
+    @Override
+    public E peek() {
+        return delegate.peek();
+    }
+
+    @Override
+    public void push(E e) {
+        delegate.push(e);
+    }
+
+    @Override
+    public E pop() {
+        return delegate.pop();
+    }
+
+    @Override
+    public boolean remove(Object o) {
+        return delegate.remove(o);
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return delegate.contains(o);
+    }
+
+    @Override
+    public int size() {
+        return delegate.size();
+    }
+
+    @Override
+    public Iterator<E> iterator() {
+        return delegate.iterator();
+    }
+
+    @Override
+    public Iterator<E> descendingIterator() {
+        return delegate.descendingIterator();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return delegate.isEmpty();
+    }
+
+    @Override
+    public Object[] toArray() {
+        return delegate.toArray();
+    }
+
+    @Override
+    public <T> T[] toArray(T[] a) {
+        return delegate.toArray(a);
+    }
+
+    @Override
+    public boolean containsAll(Collection<?> c) {
+        return delegate.containsAll(c);
+    }
+
+    @Override
+    public boolean addAll(Collection<? extends E> c) {
+        return delegate.addAll(c);
+    }
+
+    @Override
+    public boolean removeAll(Collection<?> c) {
+        return delegate.removeAll(c);
+    }
+
+    @Override
+    public boolean removeIf(Predicate<? super E> filter) {
+        return delegate.removeIf(filter);
+    }
+
+    @Override
+    public boolean retainAll(Collection<?> c) {
+        return delegate.retainAll(c);
+    }
+
+    @Override
+    public void clear() {
+        delegate.clear();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return delegate.equals(o);
+    }
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+
+    @Override
+    public Spliterator<E> spliterator() {
+        return delegate.spliterator();
+    }
+
+    @Override
+    public Stream<E> stream() {
+        return delegate.stream();
+    }
+
+    @Override
+    public Stream<E> parallelStream() {
+        return delegate.parallelStream();
+    }
+
+    @Override
+    public void forEach(Consumer<? super E> action) {
+        delegate.forEach(action);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/internal/LettuceFactories.java b/src/main/java/io/lettuce/core/internal/LettuceFactories.java
index f95370b50b..175919c27b 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceFactories.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceFactories.java
@@ -36,8 +36,8 @@ public class LettuceFactories {
      * @param <T>
      * @return a new, empty {@link ConcurrentLinkedDeque}.
      */
-    public static final <T> Deque<T> newConcurrentQueue() {
-        return new ConcurrentLinkedDeque<T>();
+    public static <T> Deque<T> newConcurrentQueue() {
+        return new FastCountingDeque<>(new ConcurrentLinkedDeque<>());
     }
 
     /**
@@ -46,17 +46,17 @@ public static final <T> Deque<T> newConcurrentQueue() {
      * @param <T>
      * @return a new, empty {@link ArrayDeque}.
      */
-    public static final <T> Deque<T> newSpScQueue() {
+    public static <T> Deque<T> newSpScQueue() {
         return new ArrayDeque<>();
     }
 
     /**
      * Creates a new {@link BlockingQueue}.
      *
-     * @param <E>
+     * @param <T>
      * @return a new, empty {@link BlockingQueue}.
      */
-    public static <E> BlockingQueue<E> newBlockingQueue() {
+    public static <T> LinkedBlockingQueue<T> newBlockingQueue() {
         return new LinkedBlockingQueue<>();
     }
 }

From 79b872cd2625ffe4f4c9d828919f5a86dd4f4bc8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 13 Apr 2017 15:35:32 +0200
Subject: [PATCH 186/808] Replace consumer completion List in CommandWrapper
 with Array #511

CommandWrapper previously used a List (ArrayList) to keep track of on-completion actions where as CommandWrapper.onComplete is used only with connection-state-changing commands. These commands are usually triggered at connection setup or in dedicated use-cases.

CommandWrapper.onCompletion now uses a growing array updated with AtomicReferenceFieldUpdater to reduce object allocation on the hot code path.
---
 .../lettuce/core/protocol/CommandWrapper.java | 39 ++++++++---
 .../redis/protocol/CommandWrapperTest.java    | 64 +++++++++++++++++++
 2 files changed, 94 insertions(+), 9 deletions(-)
 create mode 100644 src/test/java/com/lambdaworks/redis/protocol/CommandWrapperTest.java

diff --git a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
index 8bf8bf69cc..8860e49882 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
@@ -15,8 +15,7 @@
  */
 package io.lettuce.core.protocol;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import java.util.function.Consumer;
 
 import io.lettuce.core.output.CommandOutput;
@@ -29,8 +28,14 @@
  */
 public class CommandWrapper<K, V, T> implements RedisCommand<K, V, T>, CompleteableCommand<T>, DecoratedCommand<K, V, T> {
 
+    private final static AtomicReferenceFieldUpdater<CommandWrapper, Consumer[]> ONCOMPLETE = AtomicReferenceFieldUpdater
+            .newUpdater(CommandWrapper.class, Consumer[].class, "onComplete");
+    private final static Consumer<?>[] EMPTY = new Consumer[0];
+
     protected final RedisCommand<K, V, T> command;
-    private final List<Consumer<? super T>> onComplete = new ArrayList<>();
+
+    // accessed via AtomicReferenceFieldUpdater.
+    private volatile Consumer<?>[] onComplete = EMPTY;
 
     public CommandWrapper(RedisCommand<K, V, T> command) {
         this.command = command;
@@ -42,15 +47,20 @@ public CommandOutput<K, V, T> getOutput() {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public void complete() {
 
         command.complete();
 
-        for (Consumer<? super T> consumer : onComplete) {
-            if (getOutput() != null) {
-                consumer.accept(getOutput().get());
-            } else {
-                consumer.accept(null);
+        Consumer[] consumers = ONCOMPLETE.get(this);
+        if (consumers != EMPTY && ONCOMPLETE.compareAndSet(this, consumers, EMPTY)) {
+
+            for (Consumer<? super T> consumer : consumers) {
+                if (getOutput() != null) {
+                    consumer.accept(getOutput().get());
+                } else {
+                    consumer.accept(null);
+                }
             }
         }
     }
@@ -92,7 +102,18 @@ public void setOutput(CommandOutput<K, V, T> output) {
 
     @Override
     public void onComplete(Consumer<? super T> action) {
-        onComplete.add(action);
+
+        for (;;) {
+
+            Consumer[] existing = ONCOMPLETE.get(this);
+            Consumer[] updated = new Consumer[existing.length + 1];
+            System.arraycopy(existing, 0, updated, 0, existing.length);
+            updated[existing.length] = action;
+
+            if (ONCOMPLETE.compareAndSet(this, existing, updated)) {
+                return;
+            }
+        }
     }
 
     @Override
diff --git a/src/test/java/com/lambdaworks/redis/protocol/CommandWrapperTest.java b/src/test/java/com/lambdaworks/redis/protocol/CommandWrapperTest.java
new file mode 100644
index 0000000000..a3919f5f1a
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/protocol/CommandWrapperTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.protocol;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.CommandWrapper;
+
+/**
+ * @author Mark Paluch
+ */
+public class CommandWrapperTest {
+
+    protected RedisCodec<String, String> codec = StringCodec.UTF8;
+    protected Command<String, String, String> sut;
+
+    @Before
+    public final void createCommand() throws Exception {
+
+        CommandOutput<String, String, String> output = new StatusOutput<>(codec);
+        sut = new Command<>(CommandType.INFO, output, null);
+    }
+
+    @Test
+    public void shouldAppendOnComplete() {
+
+        AtomicReference<Boolean> v1 = new AtomicReference<>();
+        AtomicReference<Boolean> v2 = new AtomicReference<>();
+
+        CommandWrapper<String, String, String> commandWrapper = new CommandWrapper<>(sut);
+
+        commandWrapper.onComplete(s -> v1.set(true));
+        commandWrapper.onComplete(s -> v2.set(true));
+
+        commandWrapper.complete();
+
+        assertThat(v1.get()).isEqualTo(true);
+        assertThat(v2.get()).isEqualTo(true);
+    }
+}

From 43658b569232ff20d82ac261c15a403ce1910183 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 16 Apr 2017 13:00:06 +0200
Subject: [PATCH 187/808] Consider ConnectionFuture state in
 ClusterDistributionChannelWriter #511

ClusterDistributionChannelWriter now considers the completion state of ConnectionFuture during cluster command routing. Successfully completed futures are joined into the current thread and the resulting node connection is used directly to dispatch the command. All other states continue using future chaining.

Align redirection handling from blocking connect to asynchronous connection state propagation and inspect the connection future completion state whether joining is possible. Use future chaining for in-progress/failed futures. Switching from blocking to non-blocking redirection handling removes the need to execute work on the computational EventExecutorGroup.
---
 .../lettuce/core/cluster/ClusterCommand.java  |   9 +-
 .../ClusterDistributionChannelWriter.java     | 143 ++++++++++--------
 .../core/cluster/RedisClusterClient.java      |   4 +-
 .../StatefulRedisClusterConnectionImpl.java   |  23 +--
 .../core/protocol/CommandArgsTest.java        |  13 +-
 ...terDistributionChannelWriterBenchmark.java |   2 +-
 6 files changed, 111 insertions(+), 83 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/ClusterCommand.java b/src/main/java/io/lettuce/core/cluster/ClusterCommand.java
index 3f0b27a40a..7d300b2cca 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterCommand.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterCommand.java
@@ -55,7 +55,7 @@ public void complete() {
             boolean retryCommand = maxRedirections > redirections;
             redirections++;
 
-            if(retryCommand) {
+            if (retryCommand) {
                 try {
                     retry.write(this);
                 } catch (Exception e) {
@@ -69,17 +69,20 @@ public void complete() {
     }
 
     public boolean isMoved() {
-        if (command.getOutput() != null && command.getOutput().getError() != null
-                && command.getOutput().getError().startsWith(CommandKeyword.MOVED.name())) {
+
+        if (getError() != null && getError().startsWith(CommandKeyword.MOVED.name())) {
             return true;
         }
+
         return false;
     }
 
     public boolean isAsk() {
+
         if (getError() != null && getError().startsWith(CommandKeyword.ASK.name())) {
             return true;
         }
+
         return false;
     }
 
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index ebcb8046c1..64919743da 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -29,7 +29,6 @@
 import io.lettuce.core.internal.HostAndPort;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.*;
-import io.netty.util.concurrent.EventExecutorGroup;
 
 /**
  * Channel writer for cluster operation. This writer looks up the right partition by hash/slot for the operation.
@@ -40,17 +39,16 @@
 class ClusterDistributionChannelWriter implements RedisChannelWriter {
 
     private final RedisChannelWriter defaultWriter;
-    private final CompletableFuture<RedisChannelWriter> defaultWriterFuture;
     private final ClusterEventListener clusterEventListener;
-    private final EventExecutorGroup eventExecutors;
     private final int executionLimit;
 
     private ClusterConnectionProvider clusterConnectionProvider;
+    private AsyncClusterConnectionProvider asyncClusterConnectionProvider;
     private boolean closed = false;
     private volatile Partitions partitions;
 
     ClusterDistributionChannelWriter(ClientOptions clientOptions, RedisChannelWriter defaultWriter,
-            ClusterEventListener clusterEventListener, EventExecutorGroup eventExecutors) {
+            ClusterEventListener clusterEventListener) {
 
         if (clientOptions instanceof ClusterClientOptions) {
             this.executionLimit = ((ClusterClientOptions) clientOptions).getMaxRedirects();
@@ -60,9 +58,6 @@ class ClusterDistributionChannelWriter implements RedisChannelWriter {
 
         this.defaultWriter = defaultWriter;
         this.clusterEventListener = clusterEventListener;
-        this.eventExecutors = eventExecutors;
-
-        this.defaultWriterFuture = CompletableFuture.completedFuture(defaultWriter);
     }
 
     @SuppressWarnings("unchecked")
@@ -75,16 +70,9 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
             throw new RedisException("Connection is closed");
         }
 
-        RedisCommand<K, V, T> commandToSend = command;
-        CommandArgs<K, V> args = command.getArgs();
-
-        if (!(command instanceof ClusterCommand)) {
-            commandToSend = new ClusterCommand<>(command, this, executionLimit);
-        }
-
-        if (commandToSend instanceof ClusterCommand && !commandToSend.isDone()) {
+        if (command instanceof ClusterCommand && !command.isDone()) {
 
-            ClusterCommand<K, V, T> clusterCommand = (ClusterCommand<K, V, T>) commandToSend;
+            ClusterCommand<K, V, T> clusterCommand = (ClusterCommand<K, V, T>) command;
             if (clusterCommand.isMoved() || clusterCommand.isAsk()) {
 
                 HostAndPort target;
@@ -99,72 +87,104 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
                     clusterEventListener.onAskRedirection();
                 }
 
-                commandToSend.getOutput().setError((String) null);
+                command.getOutput().setError((String) null);
 
-                eventExecutors.submit(() -> {
+                CompletableFuture<StatefulRedisConnection<K, V>> connectFuture = asyncClusterConnectionProvider
+                        .getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, target.getHostText(), target.getPort());
 
-                    try {
-                        RedisChannelHandler<K, V> connection = (RedisChannelHandler<K, V>) clusterConnectionProvider
-                                .getConnection(Intent.WRITE, target.getHostText(), target.getPort());
+                if (isSuccessfullyCompleted(connectFuture)) {
+                    writeCommand(command, asking, connectFuture.join(), null);
+                } else {
+                    connectFuture.whenComplete((connection, throwable) -> writeCommand(command, asking, connection, throwable));
+                }
 
-                        if (asking) { // set asking bit
-                            StatefulRedisConnection<K, V> statefulRedisConnection = (StatefulRedisConnection<K, V>) connection;
-                            statefulRedisConnection.async().asking();
-                        }
+                return command;
+            }
+        }
 
-                        connection.getChannelWriter().write(command);
-                    } catch (Exception e) {
-                        command.completeExceptionally(e);
-                    }
-                });
+        ClusterCommand<K, V, T> commandToSend = getCommandToSend(command);
+        CommandArgs<K, V> args = command.getArgs();
 
-                return command;
+        if (args != null) {
+
+            ByteBuffer encodedKey = CommandArgsAccessor.encodeFirstKey(args);
+            if (encodedKey != null) {
+
+                int hash = getSlot(encodedKey);
+                ClusterConnectionProvider.Intent intent = getIntent(command.getType());
+
+                CompletableFuture<StatefulRedisConnection<K, V>> connectFuture = ((AsyncClusterConnectionProvider) clusterConnectionProvider)
+                        .getConnectionAsync(intent, hash);
+
+                if (isSuccessfullyCompleted(connectFuture)) {
+                    writeCommand(commandToSend, false, connectFuture.join(), null);
+                } else {
+                    connectFuture.whenComplete((connection, throwable) -> writeCommand(commandToSend, false, connection,
+                            throwable));
+                }
+
+                return commandToSend;
             }
         }
 
-        CompletableFuture<RedisChannelWriter> channelWriter = defaultWriterFuture;
+        writeCommand(commandToSend, defaultWriter);
 
-        ByteBuffer firstEncodedKey = args != null ? args.getFirstEncodedKey() : null;
-        if (firstEncodedKey != null) {
-            int hash = getSlot(args.getFirstEncodedKey());
-            Intent intent = getIntent(command.getType());
+        return commandToSend;
+    }
+
+    private static boolean isSuccessfullyCompleted(CompletableFuture<?> connectFuture) {
+        return connectFuture.isDone() && !connectFuture.isCompletedExceptionally();
+    }
+
+    @SuppressWarnings("unchecked")
+    private <K, V, T> ClusterCommand<K, V, T> getCommandToSend(RedisCommand<K, V, T> command) {
 
-            channelWriter = ((AsyncClusterConnectionProvider) clusterConnectionProvider)
-                    .<K, V> getConnectionAsync(intent, hash)
-                    .thenApply(kvStatefulRedisConnection -> (RedisChannelHandler<K, V>) kvStatefulRedisConnection)
-                    .thenApply(RedisChannelHandler::getChannelWriter);
+        if (command instanceof ClusterCommand) {
+            return (ClusterCommand<K, V, T>) command;
         }
 
-        RedisCommand<K, V, T> fnCommandToSend = commandToSend;
+        return new ClusterCommand<>(command, this, executionLimit);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <K, V> void writeCommand(RedisCommand<K, V, ?> command, boolean asking,
+            StatefulRedisConnection<K, V> connection, Throwable throwable) {
+
+        if (throwable != null) {
+            command.completeExceptionally(throwable);
+            return;
+        }
 
-        channelWriter.thenApply(writer -> {
+        try {
 
-            if (writer instanceof ClusterDistributionChannelWriter) {
-                return ((ClusterDistributionChannelWriter) writer).defaultWriter;
+            if (asking) { // set asking bit
+                StatefulRedisConnection<K, V> statefulRedisConnection = (StatefulRedisConnection<K, V>) connection;
+                statefulRedisConnection.async().asking();
             }
 
-            return writer;
-        }).handle((writer, throwable) -> {
+            writeCommand(command, ((RedisChannelHandler<K, V>) connection).getChannelWriter());
+        } catch (Exception e) {
+            command.completeExceptionally(e);
+        }
+    }
 
-            if (throwable != null) {
+    private static <K, V> void writeCommand(RedisCommand<K, V, ?> command, RedisChannelWriter writer) {
 
-                fnCommandToSend.completeExceptionally(throwable);
-                return null;
-            }
+        try {
+            getWriterToUse(writer).write(command);
+        } catch (Exception e) {
+            command.completeExceptionally(e);
+        }
+    }
 
-            try {
-                if (command.getOutput() != null) {
-                    fnCommandToSend.getOutput().setError((String) null);
-                }
-                writer.write(fnCommandToSend);
-            } catch (Exception e) {
-                fnCommandToSend.completeExceptionally(e);
-            }
+    private static RedisChannelWriter getWriterToUse(RedisChannelWriter writer) {
 
-            return null;
-        });
+        RedisChannelWriter writerToUse = writer;
 
-        return commandToSend;
+        if (writer instanceof ClusterDistributionChannelWriter) {
+            writerToUse = ((ClusterDistributionChannelWriter) writer).defaultWriter;
+        }
+        return writerToUse;
     }
 
     @SuppressWarnings("unchecked")
@@ -343,6 +363,7 @@ public void reset() {
 
     public void setClusterConnectionProvider(ClusterConnectionProvider clusterConnectionProvider) {
         this.clusterConnectionProvider = clusterConnectionProvider;
+        this.asyncClusterConnectionProvider = (AsyncClusterConnectionProvider) clusterConnectionProvider;
     }
 
     public void setPartitions(Partitions partitions) {
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 1d18147459..f924b6a935 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -508,7 +508,7 @@ <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K,
         DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
 
         ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, endpoint,
-                clusterTopologyRefreshScheduler, getResources().eventExecutorGroup());
+                clusterTopologyRefreshScheduler);
         PooledClusterConnectionProvider<K, V> pooledClusterConnectionProvider = new PooledClusterConnectionProvider<K, V>(this,
                 clusterWriter, codec);
 
@@ -571,7 +571,7 @@ <K, V> StatefulRedisClusterPubSubConnection<K, V> connectClusterPubSubImpl(Redis
         PubSubClusterEndpoint<K, V> endpoint = new PubSubClusterEndpoint<K, V>(clientOptions);
 
         ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, endpoint,
-                clusterTopologyRefreshScheduler, getResources().eventExecutorGroup());
+                clusterTopologyRefreshScheduler);
 
         StatefulRedisClusterPubSubConnectionImpl<K, V> connection = new StatefulRedisClusterPubSubConnectionImpl<>(endpoint,
                 clusterWriter, codec, timeout, unit);
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
index 12cb54e5b0..0d416174dd 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
@@ -53,8 +53,8 @@
  * @author Mark Paluch
  * @since 4.0
  */
-public class StatefulRedisClusterConnectionImpl<K, V> extends RedisChannelHandler<K, V>
-        implements StatefulRedisClusterConnection<K, V> {
+public class StatefulRedisClusterConnectionImpl<K, V> extends RedisChannelHandler<K, V> implements
+        StatefulRedisClusterConnection<K, V> {
 
     private Partitions partitions;
 
@@ -125,15 +125,15 @@ public StatefulRedisConnection<K, V> getConnection(String nodeId) {
             throw new RedisException("NodeId " + nodeId + " does not belong to the cluster");
         }
 
-        return getClusterDistributionChannelWriter().getClusterConnectionProvider()
-                .getConnection(ClusterConnectionProvider.Intent.WRITE, nodeId);
+        return getClusterDistributionChannelWriter().getClusterConnectionProvider().getConnection(
+                ClusterConnectionProvider.Intent.WRITE, nodeId);
     }
 
     @Override
     public StatefulRedisConnection<K, V> getConnection(String host, int port) {
 
-        return getClusterDistributionChannelWriter().getClusterConnectionProvider()
-                .getConnection(ClusterConnectionProvider.Intent.WRITE, host, port);
+        return getClusterDistributionChannelWriter().getClusterConnectionProvider().getConnection(
+                ClusterConnectionProvider.Intent.WRITE, host, port);
     }
 
     public ClusterDistributionChannelWriter getClusterDistributionChannelWriter() {
@@ -161,8 +161,8 @@ public void activated() {
     void setClientName(String clientName) {
 
         CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.SETNAME).addValue(clientName);
-        AsyncCommand<String, String, String> async = new AsyncCommand<>(
-                new Command<>(CommandType.CLIENT, new StatusOutput<>(StringCodec.UTF8), args));
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.CLIENT, new StatusOutput<>(
+                StringCodec.UTF8), args));
         this.clientName = clientName;
 
         dispatch((RedisCommand) async);
@@ -190,8 +190,11 @@ private <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> comman
 
         if (local.getType().name().equals(AUTH.name())) {
             local = attachOnComplete(local, status -> {
-                if (status.equals("OK") && command.getArgs().getFirstString() != null) {
-                    this.password = command.getArgs().getFirstString().toCharArray();
+                if (status.equals("OK")) {
+                    String password = CommandArgsAccessor.getFirstString(cmd.getArgs());
+                    if (password != null) {
+                        this.password = password.toCharArray();
+                    }
                 }
             });
         }
diff --git a/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java b/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
index a668e3cbdf..4c891e4c3f 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
@@ -22,6 +22,7 @@
 
 import org.junit.Test;
 
+import com.lambdaworks.redis.codec.ByteArrayCodec;
 import io.lettuce.core.codec.ByteArrayCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 
@@ -40,7 +41,7 @@ public void getFirstIntegerShouldReturnNull() throws Exception {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec);
 
-        assertThat(args.getFirstInteger()).isNull();
+        assertThat(CommandArgsAccessor.getFirstInteger(args)).isNull();
     }
 
     @Test
@@ -48,7 +49,7 @@ public void getFirstIntegerShouldReturnFirstInteger() throws Exception {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).add(1L).add(127).add(128).add(129).add(0).add(-1);
 
-        assertThat(args.getFirstInteger()).isEqualTo(1L);
+        assertThat(CommandArgsAccessor.getFirstInteger(args)).isEqualTo(1L);
     }
 
     @Test
@@ -56,7 +57,7 @@ public void getFirstStringShouldReturnNull() throws Exception {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec);
 
-        assertThat(args.getFirstString()).isNull();
+        assertThat(CommandArgsAccessor.getFirstString(args)).isNull();
     }
 
     @Test
@@ -64,7 +65,7 @@ public void getFirstStringShouldReturnFirstString() throws Exception {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).add("one").add("two");
 
-        assertThat(args.getFirstString()).isEqualTo("one");
+        assertThat(CommandArgsAccessor.getFirstString(args)).isEqualTo("one");
     }
 
     @Test
@@ -72,7 +73,7 @@ public void getFirstEncodedKeyShouldReturnNull() throws Exception {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec);
 
-        assertThat(args.getFirstString()).isNull();
+        assertThat(CommandArgsAccessor.getFirstString(args)).isNull();
     }
 
     @Test
@@ -80,7 +81,7 @@ public void getFirstEncodedKeyShouldReturnFirstKey() throws Exception {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).addKey("one").addKey("two");
 
-        assertThat(args.getFirstEncodedKey()).isEqualTo(ByteBuffer.wrap("one".getBytes()));
+        assertThat(CommandArgsAccessor.encodeFirstKey(args)).isEqualTo(ByteBuffer.wrap("one".getBytes()));
     }
 
     @Test
diff --git a/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
index 27451e1abd..19fdbb6a05 100644
--- a/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
@@ -72,7 +72,7 @@ public class ClusterDistributionChannelWriterBenchmark {
     @Setup
     public void setup() {
 
-        writer = new ClusterDistributionChannelWriter(CLIENT_OPTIONS, EMPTY_WRITER, ClusterEventListener.NO_OP, null);
+        writer = new ClusterDistributionChannelWriter(CLIENT_OPTIONS, EMPTY_WRITER, ClusterEventListener.NO_OP);
 
         Partitions partitions = new Partitions();
 

From 87721bc3d5f5fde7a0a7bfffdd1fb512eb9b883e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 16 Apr 2017 20:56:47 +0200
Subject: [PATCH 188/808] Replace first arg fields in CommandArgs with
 CommandArgsAccessor #511

Replace CommandArgs fields for firstInteger/String/Key/encodedKey with CommandArgsAccessor. CommandArgsAccessor now exposes encodeFirstKey/getFirstInteger/getFirstString.
---
 .../core/StatefulRedisConnectionImpl.java     | 16 ++--
 .../ClusterDistributionChannelWriter.java     |  2 +-
 .../StatefulRedisClusterConnectionImpl.java   |  2 +-
 ...tefulRedisClusterPubSubConnectionImpl.java |  8 +-
 .../io/lettuce/core/protocol/CommandArgs.java | 36 ++------
 .../core/protocol/CommandArgsAccessor.java    | 88 +++++++++++++++++++
 .../core/protocol/CommandArgsTest.java        |  2 -
 7 files changed, 112 insertions(+), 42 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java

diff --git a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
index de7ffec91d..e96c660b9e 100644
--- a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
@@ -32,7 +32,7 @@
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.MultiOutput;
 import io.lettuce.core.output.StatusOutput;
-import io.lettuce.core.protocol.*;
+import  io.lettuce.core.protocol.*;
 
 /**
  * A thread-safe connection to a Redis server. Multiple threads may share one {@link StatefulRedisConnectionImpl}
@@ -180,16 +180,22 @@ protected <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> cmd)
 
         if (local.getType().name().equals(AUTH.name())) {
             local = attachOnComplete(local, status -> {
-                if ("OK".equals(status) && cmd.getArgs().getFirstString() != null) {
-                    this.password = cmd.getArgs().getFirstString().toCharArray();
+                if ("OK".equals(status)) {
+                    String password = CommandArgsAccessor.getFirstString(cmd.getArgs());
+                    if (password != null) {
+                        this.password = password.toCharArray();
+                    }
                 }
             });
         }
 
         if (local.getType().name().equals(SELECT.name())) {
             local = attachOnComplete(local, status -> {
-                if ("OK".equals(status) && cmd.getArgs().getFirstInteger() != null) {
-                    this.db = cmd.getArgs().getFirstInteger().intValue();
+                if ("OK".equals(status)) {
+                    Long db = CommandArgsAccessor.getFirstInteger(cmd.getArgs());
+                    if (db != null) {
+                        this.db = db.intValue();
+                    }
                 }
             });
         }
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index 64919743da..ba3c47c649 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -107,7 +107,7 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
 
         if (args != null) {
 
-            ByteBuffer encodedKey = CommandArgsAccessor.encodeFirstKey(args);
+            ByteBuffer encodedKey = args.getFirstEncodedKey();
             if (encodedKey != null) {
 
                 int hash = getSlot(encodedKey);
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
index 0d416174dd..7d72033aae 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
@@ -191,7 +191,7 @@ private <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> comman
         if (local.getType().name().equals(AUTH.name())) {
             local = attachOnComplete(local, status -> {
                 if (status.equals("OK")) {
-                    String password = CommandArgsAccessor.getFirstString(cmd.getArgs());
+                    String password = CommandArgsAccessor.getFirstString(command.getArgs());
                     if (password != null) {
                         this.password = password.toCharArray();
                     }
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
index 5a558289ee..fda9e32c33 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
@@ -43,8 +43,8 @@
 /**
  * @author Mark Paluch
  */
-class StatefulRedisClusterPubSubConnectionImpl<K, V> extends StatefulRedisPubSubConnectionImpl<K, V>
-        implements StatefulRedisClusterPubSubConnection<K, V> {
+class StatefulRedisClusterPubSubConnectionImpl<K, V> extends StatefulRedisPubSubConnectionImpl<K, V> implements
+        StatefulRedisClusterPubSubConnection<K, V> {
 
     private final PubSubClusterEndpoint<K, V> endpoint;
     private volatile Partitions partitions;
@@ -83,8 +83,8 @@ public RedisClusterPubSubCommands<K, V> sync() {
     @Override
     protected RedisPubSubCommands<K, V> newRedisSyncCommandsImpl() {
 
-        return (RedisPubSubCommands) Proxy.newProxyInstance(AbstractRedisClient.class.getClassLoader(),
-                new Class<?>[] { RedisClusterPubSubCommands.class, RedisPubSubCommands.class }, syncInvocationHandler());
+        return (RedisPubSubCommands) Proxy.newProxyInstance(AbstractRedisClient.class.getClassLoader(), new Class<?>[] {
+                RedisClusterPubSubCommands.class, RedisPubSubCommands.class }, syncInvocationHandler());
     }
 
     private InvocationHandler syncInvocationHandler() {
diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgs.java b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
index c86f3c9109..07b8757a81 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandArgs.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
@@ -55,11 +55,8 @@ public class CommandArgs<K, V> {
     static final byte[] CRLF = "\r\n".getBytes(LettuceCharsets.ASCII);
 
     protected final RedisCodec<K, V> codec;
-    private final List<SingularArgument> singularArguments = new ArrayList<>(10);
-    private Long firstInteger;
-    private String firstString;
-    private ByteBuffer firstEncodedKey;
-    private K firstKey;
+
+    final List<SingularArgument> singularArguments = new ArrayList<>(10);
 
     /**
      * @param codec Codec used to encode/decode keys and values, must not be {@literal null}.
@@ -86,10 +83,6 @@ public int count() {
      */
     public CommandArgs<K, V> addKey(K key) {
 
-        if (firstKey == null) {
-            firstKey = key;
-        }
-
         singularArguments.add(KeyArgument.of(key, codec));
         return this;
     }
@@ -195,10 +188,6 @@ public CommandArgs<K, V> add(Map<K, V> map) {
      */
     public CommandArgs<K, V> add(String s) {
 
-        if (firstString == null) {
-            firstString = s;
-        }
-
         singularArguments.add(StringArgument.of(s));
         return this;
     }
@@ -211,10 +200,6 @@ public CommandArgs<K, V> add(String s) {
      */
     public CommandArgs<K, V> add(long n) {
 
-        if (firstInteger == null) {
-            firstInteger = n;
-        }
-
         singularArguments.add(IntegerArgument.of(n));
         return this;
     }
@@ -316,8 +301,9 @@ public String toCommandString() {
      *
      * @return the first integer argument or {@literal null}.
      */
+    @Deprecated
     public Long getFirstInteger() {
-        return firstInteger;
+        return CommandArgsAccessor.getFirstInteger(this);
     }
 
     /**
@@ -325,8 +311,9 @@ public Long getFirstInteger() {
      *
      * @return the first string argument or {@literal null}.
      */
+    @Deprecated
     public String getFirstString() {
-        return firstString;
+        return CommandArgsAccessor.getFirstString(this);
     }
 
     /**
@@ -335,16 +322,7 @@ public String getFirstString() {
      * @return the first key argument in its byte-encoded representation or {@literal null}.
      */
     public ByteBuffer getFirstEncodedKey() {
-
-        if (firstKey == null) {
-            return null;
-        }
-
-        if (firstEncodedKey == null) {
-            firstEncodedKey = codec.encodeKey(firstKey);
-        }
-
-        return firstEncodedKey.duplicate();
+        return CommandArgsAccessor.encodeFirstKey(this);
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java b/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
new file mode 100644
index 0000000000..7690b34631
--- /dev/null
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.protocol;
+
+import java.nio.ByteBuffer;
+
+import io.lettuce.core.protocol.CommandArgs.SingularArgument;
+import io.lettuce.core.protocol.CommandArgs.StringArgument;
+
+/**
+ * Accessor for first encoded key, first string and first {@link Long integer} argument of {@link CommandArgs}. This class is
+ * part of the internal API and may change without further notice.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public class CommandArgsAccessor {
+
+    /**
+     * Get the first encoded key for cluster command routing.
+     *
+     * @param commandArgs must not be null.
+     * @return the first encoded key or {@literal null}.
+     */
+    @SuppressWarnings("unchecked")
+    public static <K, V> ByteBuffer encodeFirstKey(CommandArgs<K, V> commandArgs) {
+
+        for (SingularArgument singularArgument : commandArgs.singularArguments) {
+
+            if (singularArgument instanceof CommandArgs.KeyArgument) {
+                return commandArgs.codec.encodeKey(((CommandArgs.KeyArgument<K, V>) singularArgument).key);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the first {@link String} argument.
+     *
+     * @param commandArgs must not be null.
+     * @return the first {@link String} argument or {@literal null}.
+     */
+    @SuppressWarnings("unchecked")
+    public static <K, V> String getFirstString(CommandArgs<K, V> commandArgs) {
+
+        for (SingularArgument singularArgument : commandArgs.singularArguments) {
+
+            if (singularArgument instanceof StringArgument) {
+                return ((StringArgument) singularArgument).val;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the first {@link Long integer} argument.
+     *
+     * @param commandArgs must not be null.
+     * @return the first {@link Long integer} argument or {@literal null}.
+     */
+    @SuppressWarnings("unchecked")
+    public static <K, V> Long getFirstInteger(CommandArgs<K, V> commandArgs) {
+
+        for (SingularArgument singularArgument : commandArgs.singularArguments) {
+
+            if (singularArgument instanceof CommandArgs.IntegerArgument) {
+                return ((CommandArgs.IntegerArgument) singularArgument).val;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java b/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
index 4c891e4c3f..1159eb2c0a 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
@@ -22,10 +22,8 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.codec.ByteArrayCodec;
 import io.lettuce.core.codec.ByteArrayCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 

From b8032c59a492859ce94342772774a1d798a5f01c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 16 Apr 2017 21:07:21 +0200
Subject: [PATCH 189/808] Merge Command completion state fields to a single
 status field #511

Replace completed/cancelled boolean flags in Command with a single status variable. Completed/cancelled are mutually exclusive and are represented as a single status field.
---
 .../io/lettuce/core/protocol/Command.java     | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/Command.java b/src/main/java/io/lettuce/core/protocol/Command.java
index c9854decb6..f5e4cd437a 100644
--- a/src/main/java/io/lettuce/core/protocol/Command.java
+++ b/src/main/java/io/lettuce/core/protocol/Command.java
@@ -21,8 +21,8 @@
 import io.netty.buffer.ByteBuf;
 
 /**
- * A Redis command with a {@link ProtocolKeyword command type}, {@link CommandArgs arguments} and an optional {@link CommandOutput
- * output}. All successfully executed commands will eventually return a {@link CommandOutput} object.
+ * A Redis command with a {@link ProtocolKeyword command type}, {@link CommandArgs arguments} and an optional
+ * {@link CommandOutput output}. All successfully executed commands will eventually return a {@link CommandOutput} object.
  *
  * @param <K> Key type.
  * @param <V> Value type.
@@ -33,13 +33,16 @@
  */
 public class Command<K, V, T> implements RedisCommand<K, V, T>, WithLatency {
 
+    protected final static byte ST_INITIAL = 0;
+    protected final static byte ST_COMPLETED = 1;
+    protected final static byte ST_CANCELLED = 2;
+
     private final ProtocolKeyword type;
 
     protected CommandArgs<K, V> args;
     protected CommandOutput<K, V, T> output;
     protected Throwable exception;
-    protected boolean cancelled = false;
-    protected boolean completed = false;
+    protected volatile byte status = ST_INITIAL;
     protected long sentNs = -1;
     protected long firstResponseNs = -1;
     protected long completedNs = -1;
@@ -93,12 +96,12 @@ public boolean completeExceptionally(Throwable throwable) {
      */
     @Override
     public void complete() {
-        completed = true;
+        this.status = ST_COMPLETED;
     }
 
     @Override
     public void cancel() {
-        cancelled = true;
+        this.status = ST_CANCELLED;
     }
 
     /**
@@ -152,7 +155,7 @@ public String toString() {
     }
 
     public void setOutput(CommandOutput<K, V, T> output) {
-        if (isCancelled() || completed) {
+        if (this.status != ST_INITIAL) {
             throw new IllegalStateException("Command is completed/cancelled. Cannot set a new output");
         }
         this.output = output;
@@ -165,12 +168,12 @@ public ProtocolKeyword getType() {
 
     @Override
     public boolean isCancelled() {
-        return cancelled;
+        return status == ST_CANCELLED;
     }
 
     @Override
     public boolean isDone() {
-        return completed;
+        return status == ST_COMPLETED;
     }
 
     @Override

From f9542d53b307e72f6b87bd7109e8f1374f91f11d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 16 Apr 2017 22:13:09 +0200
Subject: [PATCH 190/808] Move command latency metrics to LatencyMeteredCommand
 #511

---
 .../io/lettuce/core/protocol/Command.java     | 39 +---------
 .../lettuce/core/protocol/CommandHandler.java | 78 +++++++++++--------
 .../core/protocol/DefaultEndpoint.java        |  5 +-
 .../core/protocol/LatencyMeteredCommand.java  | 65 ++++++++++++++++
 src/test/java/io/lettuce/core/ClientTest.java |  7 +-
 .../ReactiveBackpressurePropagationTest.java  |  8 +-
 .../core/cluster/ClusterNodeEndpointTest.java |  2 +
 .../core/protocol/CommandHandlerTest.java     | 27 +++----
 .../core}/protocol/CommandWrapperTest.java    |  5 +-
 9 files changed, 135 insertions(+), 101 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/protocol/LatencyMeteredCommand.java
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/protocol/CommandWrapperTest.java (91%)

diff --git a/src/main/java/io/lettuce/core/protocol/Command.java b/src/main/java/io/lettuce/core/protocol/Command.java
index f5e4cd437a..ca64d986c5 100644
--- a/src/main/java/io/lettuce/core/protocol/Command.java
+++ b/src/main/java/io/lettuce/core/protocol/Command.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class Command<K, V, T> implements RedisCommand<K, V, T>, WithLatency {
+public class Command<K, V, T> implements RedisCommand<K, V, T> {
 
     protected final static byte ST_INITIAL = 0;
     protected final static byte ST_COMPLETED = 1;
@@ -43,9 +43,6 @@ public class Command<K, V, T> implements RedisCommand<K, V, T>, WithLatency {
     protected CommandOutput<K, V, T> output;
     protected Throwable exception;
     protected volatile byte status = ST_INITIAL;
-    protected long sentNs = -1;
-    protected long firstResponseNs = -1;
-    protected long completedNs = -1;
 
     /**
      * Create a new command with the supplied type.
@@ -175,36 +172,4 @@ public boolean isCancelled() {
     public boolean isDone() {
         return status == ST_COMPLETED;
     }
-
-    @Override
-    public void sent(long timeNs) {
-        sentNs = timeNs;
-        firstResponseNs = -1;
-        completedNs = -1;
-    }
-
-    @Override
-    public void firstResponse(long timeNs) {
-        firstResponseNs = timeNs;
-    }
-
-    @Override
-    public void completed(long timeNs) {
-        completedNs = timeNs;
-    }
-
-    @Override
-    public long getSent() {
-        return sentNs;
-    }
-
-    @Override
-    public long getFirstResponse() {
-        return firstResponseNs;
-    }
-
-    @Override
-    public long getCompleted() {
-        return completedNs;
-    }
 }
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 202300c9b8..3d7aa15d4c 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -30,7 +30,6 @@
 import io.lettuce.core.internal.LettuceSets;
 import io.lettuce.core.output.CommandOutput;
 import io.lettuce.core.resource.ClientResources;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.*;
 import io.netty.channel.local.LocalAddress;
@@ -62,6 +61,7 @@ public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCom
     private final RedisStateMachine rsm = new RedisStateMachine();
     private final boolean traceEnabled = logger.isTraceEnabled();
     private final boolean debugEnabled = logger.isDebugEnabled();
+    private final boolean latencyMetricsEnabled;
     private final BackpressureSource backpressureSource = new BackpressureSource();
 
     private final ClientResources clientResources;
@@ -85,6 +85,7 @@ public CommandHandler(ClientResources clientResources, Endpoint endpoint) {
 
         this.clientResources = clientResources;
         this.endpoint = endpoint;
+        this.latencyMetricsEnabled = clientResources.commandLatencyCollector().isEnabled();
     }
 
     /**
@@ -311,31 +312,28 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
                 logger.debug("{} Queue contains: {} commands", logPrefix(), queue.size());
             }
 
-            WithLatency withLatency = getWithLatency(command);
+            if (latencyMetricsEnabled && command instanceof WithLatency) {
 
-            if (!rsm.decode(buffer, command, command.getOutput())) {
+                WithLatency withLatency = (WithLatency) command;
+                if (withLatency.getFirstResponse() == -1) {
+                    withLatency.firstResponse(nanoTime());
+                }
 
-                if (command instanceof DemandAware.Sink) {
+                if (!decode(ctx, buffer, command)) {
+                    return;
+                }
 
-                    DemandAware.Sink sink = (DemandAware.Sink) command;
-                    sink.setSource(backpressureSource);
+                recordLatency(withLatency, command.getType());
 
-                    if (!sink.hasDemand()) {
-                        ctx.channel().config().setAutoRead(false);
-                    }
-                }
+            } else {
 
-                return;
-            }
+                if (!decode(ctx, buffer, command)) {
+                    return;
+                }
 
-            if (!ctx.channel().config().isAutoRead()) {
-                ctx.channel().config().setAutoRead(true);
             }
 
-            recordLatency(withLatency, command.getType());
-
             queue.poll();
-
             try {
                 command.complete();
             } catch (Exception e) {
@@ -348,25 +346,28 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
         }
     }
 
-    private WithLatency getWithLatency(RedisCommand<?, ?, ?> command) {
+    private boolean decode(ChannelHandlerContext ctx, ByteBuf buffer, RedisCommand<?, ?, ?> command) {
 
-        WithLatency withLatency = null;
+        if (!rsm.decode(buffer, command, command.getOutput())) {
 
-        if (clientResources.commandLatencyCollector().isEnabled()) {
+            if (command instanceof DemandAware.Sink) {
 
-            RedisCommand<?, ?, ?> unwrappedCommand = CommandWrapper.unwrap(command);
+                DemandAware.Sink sink = (DemandAware.Sink) command;
+                sink.setSource(backpressureSource);
 
-            if (unwrappedCommand instanceof WithLatency) {
-
-                withLatency = (WithLatency) unwrappedCommand;
-
-                if (withLatency.getFirstResponse() == -1) {
-                    withLatency.firstResponse(nanoTime());
+                if (!sink.hasDemand()) {
+                    ctx.channel().config().setAutoRead(false);
                 }
             }
+
+            return false;
+        }
+
+        if (!ctx.channel().config().isAutoRead()) {
+            ctx.channel().config().setAutoRead(true);
         }
 
-        return withLatency;
+        return true;
     }
 
     protected boolean decode(ByteBuf buffer, CommandOutput<?, ?, ?> output) {
@@ -459,15 +460,26 @@ private void queueCommand(RedisCommand<?, ?, ?> command, ChannelPromise promise)
                 command.complete();
             } else {
 
-                queue.add(command);
+                if (latencyMetricsEnabled) {
+
+                    if (command instanceof WithLatency) {
+
+                        WithLatency withLatency = (WithLatency) command;
 
-                if (clientResources.commandLatencyCollector().isEnabled()) {
-                    RedisCommand<?, ?, ?> unwrappedCommand = CommandWrapper.unwrap(command);
-                    if (unwrappedCommand instanceof WithLatency) {
-                        WithLatency withLatency = (WithLatency) unwrappedCommand;
                         withLatency.firstResponse(-1);
                         withLatency.sent(nanoTime());
+
+                        queue.add(command);
+                    } else {
+
+                        LatencyMeteredCommand<?, ?, ?> latencyMeteredCommand = new LatencyMeteredCommand<>(command);
+                        latencyMeteredCommand.firstResponse(-1);
+                        latencyMeteredCommand.sent(nanoTime());
+
+                        queue.add(latencyMeteredCommand);
                     }
+                } else {
+                    queue.add(command);
                 }
             }
         } catch (Exception e) {
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index 567aaaeacd..bb6205541a 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -30,7 +30,6 @@
 import io.lettuce.core.RedisException;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceFactories;
-
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
@@ -534,6 +533,10 @@ private ChannelFuture writeAndFlush(RedisCommand<?, ?, ?> command) {
 
         RedisCommand<?, ?, ?> cmd;
         while ((cmd = source.poll()) != null) {
+
+            if (cmd instanceof LatencyMeteredCommand<?, ?, ?>) {
+                cmd = ((LatencyMeteredCommand<?, ?, ?>) cmd).getDelegate();
+            }
             target.add(cmd);
         }
 
diff --git a/src/main/java/io/lettuce/core/protocol/LatencyMeteredCommand.java b/src/main/java/io/lettuce/core/protocol/LatencyMeteredCommand.java
new file mode 100644
index 0000000000..35c8b390ba
--- /dev/null
+++ b/src/main/java/io/lettuce/core/protocol/LatencyMeteredCommand.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.protocol;
+
+/**
+ * {@link CommandWrapper} implementation to track {@link WithLatency command latency}.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+class LatencyMeteredCommand<K, V, T> extends CommandWrapper<K, V, T> implements WithLatency {
+
+    private long sentNs = -1;
+    private long firstResponseNs = -1;
+    private long completedNs = -1;
+
+    public LatencyMeteredCommand(RedisCommand<K, V, T> command) {
+        super(command);
+    }
+
+    @Override
+    public void sent(long timeNs) {
+        sentNs = timeNs;
+        firstResponseNs = -1;
+        completedNs = -1;
+    }
+
+    @Override
+    public void firstResponse(long timeNs) {
+        firstResponseNs = timeNs;
+    }
+
+    @Override
+    public void completed(long timeNs) {
+        completedNs = timeNs;
+    }
+
+    @Override
+    public long getSent() {
+        return sentNs;
+    }
+
+    @Override
+    public long getFirstResponse() {
+        return firstResponseNs;
+    }
+
+    @Override
+    public long getCompleted() {
+        return completedNs;
+    }
+}
diff --git a/src/test/java/io/lettuce/core/ClientTest.java b/src/test/java/io/lettuce/core/ClientTest.java
index 898f70bf79..91ebc3a5a7 100644
--- a/src/test/java/io/lettuce/core/ClientTest.java
+++ b/src/test/java/io/lettuce/core/ClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -155,6 +155,7 @@ public void testExceptionWithCause() throws Exception {
 
     @Test(timeout = 20000)
     public void reset() throws Exception {
+
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisAsyncCommands<String, String> async = connection.async();
 
@@ -165,9 +166,7 @@ public void reset() throws Exception {
 
         RedisFuture<KeyValue<String, String>> eval = async.blpop(5, key);
 
-        Command unwrapped = (Command) CommandWrapper.unwrap((RedisCommand) eval);
-
-        Wait.untilNotEquals(0L, unwrapped::getSent).waitOrTimeout();
+        Thread.sleep(500);
 
         assertThat(eval.isDone()).isFalse();
         assertThat(eval.isCancelled()).isFalse();
diff --git a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
index f6e58f73e6..139aa723a7 100644
--- a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
@@ -26,19 +26,17 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
 import reactor.core.scheduler.Schedulers;
-
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.metrics.CommandLatencyCollector;
 import io.lettuce.core.output.ValueListOutput;
 import io.lettuce.core.protocol.*;
 import io.lettuce.core.resource.ClientResources;
-
 import io.netty.buffer.Unpooled;
 import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.channel.local.LocalAddress;
@@ -67,8 +65,6 @@ public class ReactiveBackpressurePropagationTest {
     @Before
     public void before() throws Exception {
 
-        commandHandler = new CommandHandler(clientResources, endpoint);
-
         when(clientResources.commandLatencyCollector()).thenReturn(latencyCollector);
         when(statefulConnection.dispatch(any(RedisCommand.class))).thenAnswer(invocation -> {
 
@@ -77,6 +73,8 @@ public void before() throws Exception {
             return command;
         });
 
+        commandHandler = new CommandHandler(clientResources, endpoint);
+
         embeddedChannel = new EmbeddedChannel(commandHandler);
         embeddedChannel.connect(new LocalAddress("remote"));
     }
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
index 5296dea0fe..dff4546bc5 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
@@ -35,6 +35,7 @@
 import io.lettuce.core.RedisChannelWriter;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.metrics.DefaultCommandLatencyCollector;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.protocol.Command;
@@ -67,6 +68,7 @@ public class ClusterNodeEndpointTest {
     @Before
     public void before() throws Exception {
 
+        when(clientResources.commandLatencyCollector()).thenReturn(DefaultCommandLatencyCollector.disabled());
         sut = new ClusterNodeEndpoint(clientOptions, clientResources, clusterChannelWriter);
         queue = (Queue) sut.getQueue();
     }
diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
index f8e61d1944..5460cb500d 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,6 @@
 import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.resource.ClientResources;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.*;
@@ -296,7 +295,8 @@ public void shouldWriteActiveCommands() throws Exception {
         sut.write(context, command, null);
 
         verify(context).write(command, null);
-        assertThat((Collection) ReflectionTestUtils.getField(sut, "queue")).containsOnly(command);
+        assertThat((Collection) ReflectionTestUtils.getField(sut, "queue")).hasSize(1).allMatch(
+                o -> o instanceof LatencyMeteredCommand);
     }
 
     @Test
@@ -316,14 +316,15 @@ public void shouldWriteActiveCommandsInBatch() throws Exception {
         sut.write(context, commands, null);
 
         verify(context).write(commands, null);
-        assertThat((Collection) ReflectionTestUtils.getField(sut, "queue")).containsOnly(command);
+        assertThat((Collection) ReflectionTestUtils.getField(sut, "queue")).hasSize(1);
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void shouldWriteActiveCommandsInMixedBatch() throws Exception {
 
-        Command<String, String, String> command2 = new Command<>(CommandType.APPEND, new StatusOutput<String, String>(
-                new Utf8StringCodec()), null);
+        Command<String, String, String> command2 = new Command<>(CommandType.APPEND, new StatusOutput<>(new Utf8StringCodec()),
+                null);
 
         command.cancel();
 
@@ -333,7 +334,9 @@ public void shouldWriteActiveCommandsInMixedBatch() throws Exception {
         verify(context).write(captor.capture(), any());
 
         assertThat(captor.getValue()).containsOnly(command2);
-        assertThat((Collection) ReflectionTestUtils.getField(sut, "queue")).containsOnly(command2);
+        assertThat((Collection) ReflectionTestUtils.getField(sut, "queue")).hasSize(1)
+                .allMatch(o -> o instanceof LatencyMeteredCommand)
+                .allMatch(o -> CommandWrapper.unwrap((RedisCommand) o) == command2);
     }
 
     @Test
@@ -346,14 +349,4 @@ public void shouldIgnoreNonReadableBuffers() throws Exception {
 
         verify(byteBufMock, never()).release();
     }
-
-    @Test
-    public void shouldSetLatency() throws Exception {
-
-        sut.write(context, Arrays.asList(command), null);
-
-        assertThat(command.sentNs).isNotEqualTo(-1);
-        assertThat(command.firstResponseNs).isEqualTo(-1);
-    }
-
 }
diff --git a/src/test/java/com/lambdaworks/redis/protocol/CommandWrapperTest.java b/src/test/java/io/lettuce/core/protocol/CommandWrapperTest.java
similarity index 91%
rename from src/test/java/com/lambdaworks/redis/protocol/CommandWrapperTest.java
rename to src/test/java/io/lettuce/core/protocol/CommandWrapperTest.java
index a3919f5f1a..36cde7066b 100644
--- a/src/test/java/com/lambdaworks/redis/protocol/CommandWrapperTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandWrapperTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.protocol;
+package io.lettuce.core.protocol;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -26,9 +26,6 @@
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.CommandOutput;
 import io.lettuce.core.output.StatusOutput;
-import io.lettuce.core.protocol.Command;
-import io.lettuce.core.protocol.CommandType;
-import io.lettuce.core.protocol.CommandWrapper;
 
 /**
  * @author Mark Paluch

From f88af0a830d3bc27c54f1685b6089abb87138393 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 17 Apr 2017 19:44:14 +0200
Subject: [PATCH 191/808] Fix JMH test

---
 ...terDistributionChannelWriterBenchmark.java | 20 +++----
 .../jmh/io/lettuce/core/cluster/JmhMain.java  | 55 +++++++++++++++++++
 2 files changed, 63 insertions(+), 12 deletions(-)
 create mode 100644 src/test/jmh/io/lettuce/core/cluster/JmhMain.java

diff --git a/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
index 19fdbb6a05..7b4a9d0608 100644
--- a/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
@@ -15,11 +15,10 @@
  */
 package io.lettuce.core.cluster;
 
-import java.net.SocketAddress;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.function.Supplier;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -29,11 +28,9 @@
 import org.openjdk.jmh.annotations.State;
 
 import io.lettuce.core.*;
-import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.codec.ByteArrayCodec;
-import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.output.ValueOutput;
 import io.lettuce.core.protocol.Command;
 import io.lettuce.core.protocol.CommandArgs;
@@ -84,16 +81,15 @@ public void setup() {
 
         partitions.updateCache();
 
-        writer.setPartitions(partitions);
-        writer.setClusterConnectionProvider(new PooledClusterConnectionProvider<>(new RedisClusterClient() {
+        CompletableFuture<EmptyStatefulRedisConnection> connectionFuture = CompletableFuture.completedFuture(CONNECTION);
 
-            @Override
-            <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, String nodeId,
-                    RedisChannelWriter clusterWriter, Supplier<SocketAddress> socketAddressSupplier) {
-                return CONNECTION;
+        writer.setPartitions(partitions);
+        writer.setClusterConnectionProvider(new PooledClusterConnectionProvider(new EmptyRedisClusterClient(RedisURI.create(
+                "localhost", 7379)), EMPTY_WRITER, ByteArrayCodec.INSTANCE) {
+            public CompletableFuture getConnectionAsync(Intent intent, int slot) {
+                return connectionFuture;
             }
-        }, EMPTY_WRITER, ByteArrayCodec.INSTANCE));
-
+        });
         writer.setPartitions(partitions);
     }
 
diff --git a/src/test/jmh/io/lettuce/core/cluster/JmhMain.java b/src/test/jmh/io/lettuce/core/cluster/JmhMain.java
new file mode 100644
index 0000000000..b66c5f40a4
--- /dev/null
+++ b/src/test/jmh/io/lettuce/core/cluster/JmhMain.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster;
+
+import java.util.concurrent.TimeUnit;
+
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.ChainedOptionsBuilder;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+import org.openjdk.jmh.runner.options.TimeValue;
+
+/**
+ * Manual JMH Test Launcher.
+ *
+ * @author Mark Paluch
+ */
+public class JmhMain {
+
+    public static void main(String... args) throws RunnerException {
+
+        runClusterDistributionChannelWriterBenchmark();
+    }
+
+    private static void runClusterDistributionChannelWriterBenchmark() throws RunnerException {
+
+        new Runner(prepareOptions().mode(Mode.AverageTime) //
+                .timeUnit(TimeUnit.NANOSECONDS) //
+                .include(".*ClusterDistributionChannelWriterBenchmark.*") //
+                .build()).run();
+    }
+
+    private static ChainedOptionsBuilder prepareOptions() {
+        return new OptionsBuilder()//
+                .forks(1) //
+                .warmupIterations(5)//
+                .threads(1) //
+                .measurementIterations(5) //
+                .timeout(TimeValue.seconds(2));
+    }
+}

From e06b506fbf961b95513bb64198f328e24efbff0e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 17 Apr 2017 20:59:36 +0200
Subject: [PATCH 192/808] Move to lettuce.io #493

---
 formatting.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formatting.xml b/formatting.xml
index ff57cdcb77..4128eb0641 100644
--- a/formatting.xml
+++ b/formatting.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <profiles version="11">
-    <profile kind="CodeFormatterProfile" name="Formatter" version="11">
+    <profile kind="CodeFormatterProfile" name="lettuce.io Code Style" version="11">
         <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert" />
         <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off" />
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert" />

From 18e1863d1c6e912aa060fe6066c39fc28e8dc4d5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 19 Apr 2017 21:07:40 +0200
Subject: [PATCH 193/808] Allow setting the Redis password as char-array #513

RedisURI and authentication now propagates the authentication password as char array to reduce String-interning and allowing an early GC of the password if it's no longer in use.
---
 .../core/AbstractRedisAsyncCommands.java      |  6 ++-
 .../io/lettuce/core/RedisCommandBuilder.java  |  9 +++-
 src/main/java/io/lettuce/core/RedisURI.java   | 41 ++++++++++++---
 .../core/StatefulRedisConnectionImpl.java     | 22 +++++---
 .../StatefulRedisClusterConnectionImpl.java   | 16 ++++--
 .../MasterSlaveConnectionProvider.java        |  3 +-
 .../io/lettuce/core/protocol/CommandArgs.java | 51 ++++++++++++++++++-
 .../core/protocol/CommandArgsAccessor.java    | 20 ++++++++
 8 files changed, 142 insertions(+), 26 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 3229dbfb02..617a5d0a32 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -69,11 +69,13 @@ public RedisFuture<Long> append(K key, V value) {
 
     @Override
     public String auth(String password) {
-        AsyncCommand<K, V, String> cmd = authAsync(password);
+
+        LettuceAssert.notNull(password, "Password must not be null");
+        AsyncCommand<K, V, String> cmd = authAsync(password.toCharArray());
         return LettuceFutures.awaitOrCancel(cmd, connection.getTimeout(), connection.getTimeoutUnit());
     }
 
-    public AsyncCommand<K, V, String> authAsync(String password) {
+    public AsyncCommand<K, V, String> authAsync(char[] password) {
         return dispatch(commandBuilder.auth(password));
     }
 
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 8930b11dd3..a0cd922a0a 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,6 +62,13 @@ public Command<K, V, String> auth(String password) {
         LettuceAssert.notNull(password, "Password " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(password, "Password " + MUST_NOT_BE_EMPTY);
 
+        return auth(password.toCharArray());
+    }
+
+    public Command<K, V, String> auth(char[] password) {
+        LettuceAssert.notNull(password, "Password " + MUST_NOT_BE_NULL);
+        LettuceAssert.isTrue(password.length > 0, "Password " + MUST_NOT_BE_EMPTY);
+
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(password);
         return createCommand(AUTH, new StatusOutput<K, V>(codec), args);
     }
diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 895d9758f6..eba3f9173c 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,16 +49,15 @@
  * <p>
  * {@code RedisURI.Builder.redis("localhost", 6379).withPassword("password").withDatabase(1).build(); }
  * </p>
- * See {@link io.lettuce.core.RedisURI.Builder#redis(String)} and
- * {@link io.lettuce.core.RedisURI.Builder#sentinel(String)} for more options.</li>
+ * See {@link io.lettuce.core.RedisURI.Builder#redis(String)} and {@link io.lettuce.core.RedisURI.Builder#sentinel(String)} for
+ * more options.</li>
  * <li>Construct your own instance:
  * <p>
  * {@code new RedisURI("localhost", 6379, 60, TimeUnit.SECONDS);}
  * </p>
  * or
  * <p>
- * {@code RedisURI uri = new RedisURI();
- *     uri.setHost("localhost");
+ * {@code RedisURI uri = new RedisURI(); uri.setHost("localhost");
  *     }
  * </p>
  * </li>
@@ -333,6 +332,18 @@ public void setPassword(String password) {
         this.password = password.toCharArray();
     }
 
+    /**
+     * Sets the password. Use empty char array to skip authentication.
+     *
+     * @param password the password, must not be {@literal null}.
+     * @since 4.4
+     */
+    public void setPassword(char[] password) {
+
+        LettuceAssert.notNull(password, "Password must not be null");
+        this.password = Arrays.copyOf(password, password.length);
+    }
+
     /**
      * Returns the command timeout for synchronous command execution.
      *
@@ -1170,7 +1181,21 @@ public Builder withPassword(String password) {
 
             LettuceAssert.notNull(password, "Password must not be null");
 
-            this.password = password.toCharArray();
+            return withPassword(password.toCharArray());
+        }
+
+        /**
+         * Configures authentication.
+         *
+         * @param password the password
+         * @return the builder
+         * @since 4.4
+         */
+        public Builder withPassword(char[] password) {
+
+            LettuceAssert.notNull(password, "Password must not be null");
+
+            this.password = Arrays.copyOf(password, password.length);
             return this;
         }
 
@@ -1218,7 +1243,9 @@ public RedisURI build() {
             RedisURI redisURI = new RedisURI();
             redisURI.setHost(host);
             redisURI.setPort(port);
-            redisURI.password = password;
+            if (password != null) {
+                redisURI.setPassword(password);
+            }
             redisURI.setDatabase(database);
             redisURI.setClientName(clientName);
 
diff --git a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
index e96c660b9e..b13f4d9872 100644
--- a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
@@ -32,7 +32,7 @@
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.MultiOutput;
 import io.lettuce.core.output.StatusOutput;
-import  io.lettuce.core.protocol.*;
+import io.lettuce.core.protocol.*;
 
 /**
  * A thread-safe connection to a Redis server. Multiple threads may share one {@link StatefulRedisConnectionImpl}
@@ -127,7 +127,7 @@ public void activated() {
         super.activated();
         // do not block in here, since the channel flow will be interrupted.
         if (password != null) {
-            async.authAsync(new String(password));
+            async.authAsync(password);
         }
 
         if (db != 0) {
@@ -174,16 +174,24 @@ public <T> RedisCommand<K, V, T> dispatch(RedisCommand<K, V, T> command) {
         return super.dispatch(sentCommands);
     }
 
-    protected <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> cmd) {
+    protected <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> command) {
 
-        RedisCommand<K, V, T> local = cmd;
+        RedisCommand<K, V, T> local = command;
 
         if (local.getType().name().equals(AUTH.name())) {
             local = attachOnComplete(local, status -> {
                 if ("OK".equals(status)) {
-                    String password = CommandArgsAccessor.getFirstString(cmd.getArgs());
+
+                    char[] password = CommandArgsAccessor.getFirstCharArray(command.getArgs());
+
                     if (password != null) {
-                        this.password = password.toCharArray();
+                        this.password = password;
+                    } else {
+
+                        String stringPassword = CommandArgsAccessor.getFirstString(command.getArgs());
+                        if (stringPassword != null) {
+                            this.password = stringPassword.toCharArray();
+                        }
                     }
                 }
             });
@@ -192,7 +200,7 @@ protected <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> cmd)
         if (local.getType().name().equals(SELECT.name())) {
             local = attachOnComplete(local, status -> {
                 if ("OK".equals(status)) {
-                    Long db = CommandArgsAccessor.getFirstInteger(cmd.getArgs());
+                    Long db = CommandArgsAccessor.getFirstInteger(command.getArgs());
                     if (db != null) {
                         this.db = db.intValue();
                     }
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
index 7d72033aae..d31e5b1a31 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
@@ -75,8 +75,7 @@ public class StatefulRedisClusterConnectionImpl<K, V> extends RedisChannelHandle
      * @param timeout Maximum time to wait for a response.
      * @param unit Unit of time for the timeout.
      */
-    public StatefulRedisClusterConnectionImpl(RedisChannelWriter writer, RedisCodec<K, V> codec, long timeout,
-            TimeUnit unit) {
+    public StatefulRedisClusterConnectionImpl(RedisChannelWriter writer, RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
         super(writer, timeout, unit);
         this.codec = codec;
 
@@ -146,7 +145,7 @@ public void activated() {
         super.activated();
         // do not block in here, since the channel flow will be interrupted.
         if (password != null) {
-            async.authAsync(new String(password));
+            async.authAsync(password);
         }
 
         if (clientName != null) {
@@ -191,9 +190,16 @@ private <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> comman
         if (local.getType().name().equals(AUTH.name())) {
             local = attachOnComplete(local, status -> {
                 if (status.equals("OK")) {
-                    String password = CommandArgsAccessor.getFirstString(command.getArgs());
+                    char[] password = CommandArgsAccessor.getFirstCharArray(command.getArgs());
+
                     if (password != null) {
-                        this.password = password.toCharArray();
+                        this.password = password;
+                    } else {
+
+                        String stringPassword = CommandArgsAccessor.getFirstString(command.getArgs());
+                        if (stringPassword != null) {
+                            this.password = stringPassword.toCharArray();
+                        }
                     }
                 }
             });
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
index 40b6192944..e46245ca28 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
@@ -32,7 +32,6 @@
 import io.lettuce.core.internal.LettuceSets;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
-
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -252,7 +251,7 @@ public StatefulRedisConnection<K, V> apply(ConnectionKey key) {
             RedisURI.Builder builder = RedisURI.Builder.redis(key.host, key.port);
 
             if (initialRedisUri.getPassword() != null && initialRedisUri.getPassword().length != 0) {
-                builder.withPassword(new String(initialRedisUri.getPassword()));
+                builder.withPassword(initialRedisUri.getPassword());
             }
 
             if (initialRedisUri.getClientName() != null) {
diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgs.java b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
index 07b8757a81..c7333f236f 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandArgs.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.ToByteBufEncoder;
 import io.lettuce.core.internal.LettuceAssert;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
 
@@ -192,6 +191,18 @@ public CommandArgs<K, V> add(String s) {
         return this;
     }
 
+    /**
+     * Add a string as char-array. The argument is represented as bulk string.
+     *
+     * @param cs the string.
+     * @return the command args.
+     */
+    public CommandArgs<K, V> add(char[] cs) {
+
+        singularArguments.add(CharArrayArgument.of(cs));
+        return this;
+    }
+
     /**
      * Add an 64-bit integer (long) argument.
      *
@@ -546,6 +557,42 @@ public String toString() {
         }
     }
 
+    static class CharArrayArgument extends SingularArgument {
+
+        final char[] val;
+
+        private CharArrayArgument(char[] val) {
+            this.val = val;
+        }
+
+        static CharArrayArgument of(char[] val) {
+            return new CharArrayArgument(val);
+        }
+
+        @Override
+        void encode(ByteBuf target) {
+            writeString(target, val);
+        }
+
+        static void writeString(ByteBuf target, char[] value) {
+
+            target.writeByte('$');
+
+            IntegerArgument.writeInteger(target, value.length);
+            target.writeBytes(CRLF);
+
+            for (int i = 0; i < value.length; i++) {
+                target.writeByte((byte) value[i]);
+            }
+            target.writeBytes(CRLF);
+        }
+
+        @Override
+        public String toString() {
+            return new String(val);
+        }
+    }
+
     static class KeyArgument<K, V> extends SingularArgument {
 
         final K key;
diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java b/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
index 7690b34631..5c6fc4c3c1 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
@@ -17,6 +17,7 @@
 
 import java.nio.ByteBuffer;
 
+import io.lettuce.core.protocol.CommandArgs.CharArrayArgument;
 import io.lettuce.core.protocol.CommandArgs.SingularArgument;
 import io.lettuce.core.protocol.CommandArgs.StringArgument;
 
@@ -67,6 +68,25 @@ public static <K, V> String getFirstString(CommandArgs<K, V> commandArgs) {
         return null;
     }
 
+    /**
+     * Get the first {@link char}-array argument.
+     *
+     * @param commandArgs must not be null.
+     * @return the first {@link String} argument or {@literal null}.
+     */
+    @SuppressWarnings("unchecked")
+    public static <K, V> char[] getFirstCharArray(CommandArgs<K, V> commandArgs) {
+
+        for (SingularArgument singularArgument : commandArgs.singularArguments) {
+
+            if (singularArgument instanceof CharArrayArgument) {
+                return ((CharArrayArgument) singularArgument).val;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Get the first {@link Long integer} argument.
      *

From 6ebce4f36d502a6f89af45d8c5cd157dd14b4cbe Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 17 Apr 2017 21:11:57 +0200
Subject: [PATCH 194/808] Use appropriate EventLoopGroup in
 SingleThreadedReactiveClusterClientTest #486

Create the requested EventLoopGroup type in SingleThreadedReactiveClusterClientTest to ensure compatibility with the SocketChannel implementation.
---
 ...ingleThreadedReactiveClusterClientTest.java | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java
index 81d14c7fa6..3296938825 100644
--- a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java
@@ -19,6 +19,7 @@
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.After;
 import org.junit.Before;
@@ -30,6 +31,7 @@
 import io.lettuce.core.resource.DefaultClientResources;
 import io.lettuce.core.resource.EventLoopGroupProvider;
 import io.netty.channel.EventLoopGroup;
+import io.netty.channel.epoll.EpollEventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.Future;
@@ -46,12 +48,22 @@ public class SingleThreadedReactiveClusterClientTest {
     @Before
     public void before() {
 
-        NioEventLoopGroup nioEventLoopGroup = new NioEventLoopGroup(1);
+        AtomicReference<EventLoopGroup> ref = new AtomicReference<>();
         DefaultClientResources clientResources = DefaultClientResources.builder()
                 .eventExecutorGroup(ImmediateEventExecutor.INSTANCE).eventLoopGroupProvider(new EventLoopGroupProvider() {
                     @Override
                     public <T extends EventLoopGroup> T allocate(Class<T> type) {
-                        return (T) nioEventLoopGroup;
+
+                        if (ref.get() == null) {
+
+                            if (type == EpollEventLoopGroup.class) {
+                                ref.set(new EpollEventLoopGroup(1));
+                            } else {
+                                ref.set(new NioEventLoopGroup(1));
+                            }
+                        }
+
+                        return (T) ref.get();
                     }
 
                     @Override
@@ -67,7 +79,7 @@ public Future<Boolean> release(EventExecutorGroup eventLoopGroup, long quietPeri
 
                     @Override
                     public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
-                        nioEventLoopGroup.shutdownGracefully(quietPeriod, timeout, timeUnit);
+                        ref.get().shutdownGracefully(quietPeriod, timeout, timeUnit);
                         return new SucceededFuture<>(ImmediateEventExecutor.INSTANCE, true);
                     }
 

From fdf5143eea4f14753085712d4639081ae6897d58 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 19 Apr 2017 22:16:31 +0200
Subject: [PATCH 195/808] Polishing

Use TestClientResources in tests where possible.
---
 .../core/cluster/RedisClusterClientTest.java  | 47 ++++++++++---------
 .../commands/KeyClusterCommandTest.java       |  5 +-
 .../HashClusterReactiveCommandTest.java       |  4 +-
 .../ListClusterReactiveCommandTest.java       |  8 ++--
 .../StringClusterReactiveCommandTest.java     |  6 +--
 .../core/sentinel/SentinelCommandTest.java    |  8 ++--
 .../sentinel/SentinelServerCommandTest.java   |  4 +-
 7 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
index 8f38f3712a..70cb151a5a 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
@@ -67,8 +67,8 @@ public class RedisClusterClientTest extends AbstractClusterTest {
     public static void setupClient() throws Exception {
         setupClusterClient();
         client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port1).build());
-        clusterClient = RedisClusterClient
-                .create(TestClientResources.get(), Collections.singletonList(RedisURI.Builder.redis(host, port1).withClientName("my-client").build()));
+        clusterClient = RedisClusterClient.create(TestClientResources.get(),
+                Collections.singletonList(RedisURI.Builder.redis(host, port1).withClientName("my-client").build()));
     }
 
     @AfterClass
@@ -180,8 +180,8 @@ public void clusterConnectionShouldSetClientName() throws Exception {
         connection.sync().quit();
         assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
 
-        StatefulRedisConnection<String, String> nodeConnection = connection
-                .getConnection(connection.getPartitions().getPartition(0).getNodeId());
+        StatefulRedisConnection<String, String> nodeConnection = connection.getConnection(connection.getPartitions()
+                .getPartition(0).getNodeId());
         assertThat(nodeConnection.sync().clientGetname()).isEqualTo("my-client");
         nodeConnection.sync().quit();
         assertThat(nodeConnection.sync().clientGetname()).isEqualTo("my-client");
@@ -198,8 +198,8 @@ public void pubSubclusterConnectionShouldSetClientName() throws Exception {
         connection.sync().quit();
         assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
 
-        StatefulRedisConnection<String, String> nodeConnection = connection
-                .getConnection(connection.getPartitions().getPartition(0).getNodeId());
+        StatefulRedisConnection<String, String> nodeConnection = connection.getConnection(connection.getPartitions()
+                .getPartition(0).getNodeId());
         assertThat(nodeConnection.sync().clientGetname()).isEqualTo("my-client");
         nodeConnection.sync().quit();
         assertThat(nodeConnection.sync().clientGetname()).isEqualTo("my-client");
@@ -244,7 +244,6 @@ public void testClusteredOperations() throws Exception {
         clusterClient.reloadPartitions();
         RedisAdvancedClusterCommands<String, String> connection = clusterClient.connect().sync();
 
-
         assertThat(connection.set(KEY_A, value)).isEqualTo("OK");
         assertThat(connection.set(KEY_B, "myValue2")).isEqualTo("OK");
         assertThat(connection.set(KEY_D, "myValue2")).isEqualTo("OK");
@@ -359,19 +358,19 @@ public void closeConnection() throws Exception {
 
         RedisAdvancedClusterCommands<String, String> connection = clusterClient.connect().sync();
 
-            List<String> time = connection.time();
-            assertThat(time).hasSize(2);
+        List<String> time = connection.time();
+        assertThat(time).hasSize(2);
 
-            connection.getStatefulConnection().close();
+        connection.getStatefulConnection().close();
 
-            connection.time();
+        connection.time();
     }
 
     @Test
     public void clusterAuth() throws Exception {
 
-        RedisClusterClient clusterClient = RedisClusterClient
-                .create(RedisURI.Builder.redis(TestSettings.host(), port7).withPassword("foobared").build());
+        RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(),
+                RedisURI.Builder.redis(TestSettings.host(), port7).withPassword("foobared").build());
 
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
         RedisAdvancedClusterCommands<String, String> sync = connection.sync();
@@ -394,8 +393,8 @@ public void clusterAuth() throws Exception {
     @Test
     public void clusterAuthPingBeforeConnect() throws Exception {
 
-        RedisClusterClient clusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), port7)
-                .withPassword("foobared").build());
+        RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(),
+                RedisURI.Builder.redis(TestSettings.host(), port7).withPassword("foobared").build());
         clusterClient.setOptions(ClusterClientOptions.builder().pingBeforeActivateConnection(true).build());
 
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
@@ -416,8 +415,8 @@ public void clusterAuthPingBeforeConnect() throws Exception {
     @Test(expected = RedisException.class)
     public void clusterNeedsAuthButNotSupplied() throws Exception {
 
-        RedisClusterClient clusterClient = RedisClusterClient
-                .create(RedisURI.Builder.redis(TestSettings.host(), port7).build());
+        RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(),
+                RedisURI.Builder.redis(TestSettings.host(), port7).build());
 
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
 
@@ -433,13 +432,14 @@ public void clusterNeedsAuthButNotSupplied() throws Exception {
     @Test
     public void noClusterNodeAvailable() throws Exception {
 
-        RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, 40400).build());
+        RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(),
+                RedisURI.Builder.redis(host, 40400).build());
         try {
             clusterClient.connect();
             fail("Missing RedisException");
         } catch (RedisException e) {
             assertThat(e).isInstanceOf(RedisException.class);
-        }finally {
+        } finally {
             FastShutdown.shutdown(clusterClient);
         }
     }
@@ -462,8 +462,8 @@ public void operateOnNodeConnection() throws Exception {
         sync.set(KEY_A, value);
         sync.set(KEY_B, "d");
 
-        StatefulRedisConnection<String, String> statefulRedisConnection = sync.getStatefulConnection()
-                .getConnection(TestSettings.hostAddr(), port2);
+        StatefulRedisConnection<String, String> statefulRedisConnection = sync.getStatefulConnection().getConnection(
+                TestSettings.hostAddr(), port2);
 
         RedisClusterCommands<String, String> connection = statefulRedisConnection.sync();
 
@@ -511,13 +511,14 @@ public void readOnlyOnCluster() throws Exception {
         sync.readWrite();
 
         assertThat(ReflectionTestUtils.getField(sync.getStatefulConnection(), "readOnly")).isEqualTo(Boolean.FALSE);
-        RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, 40400).build());
+        RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(),
+                RedisURI.Builder.redis(host, 40400).build());
         try {
             clusterClient.connect();
             fail("Missing RedisException");
         } catch (RedisException e) {
             assertThat(e).isInstanceOf(RedisException.class);
-        }finally {
+        } finally {
             FastShutdown.shutdown(clusterClient);
         }
     }
diff --git a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
index 3feba895f0..6a5cc8108b 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
@@ -22,6 +22,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import io.lettuce.TestClientResources;
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
@@ -41,8 +42,8 @@ public class KeyClusterCommandTest extends AbstractRedisClientTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = RedisClusterClient
-                .create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
+        redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
+                RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
     @AfterClass
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
index cf22f3ce9d..432387c39f 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
@@ -19,6 +19,7 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 
+import io.lettuce.TestClientResources;
 import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.TestSettings;
@@ -39,7 +40,8 @@ public class HashClusterReactiveCommandTest extends HashCommandTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
+        redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
+                RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
     @AfterClass
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
index a506bc44b2..ef9aa91bc6 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
@@ -15,11 +15,14 @@
  */
 package io.lettuce.core.cluster.commands.reactive;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import io.lettuce.TestClientResources;
 import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.TestSettings;
@@ -30,8 +33,6 @@
 import io.lettuce.core.commands.ListCommandTest;
 import io.lettuce.util.ReactiveSyncInvocationHandler;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 /**
  * @author Mark Paluch
  */
@@ -41,7 +42,8 @@ public class ListClusterReactiveCommandTest extends ListCommandTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
+        redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
+                RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
     @AfterClass
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
index b4e1890fb6..0c070dcd87 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
@@ -27,7 +27,7 @@
 
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
-
+import io.lettuce.TestClientResources;
 import io.lettuce.core.FastShutdown;
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.RedisURI;
@@ -49,8 +49,8 @@ public class StringClusterReactiveCommandTest extends StringCommandTest {
 
     @BeforeClass
     public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900))
-                .build());
+        redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
+                RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
     @AfterClass
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
index 3f53995a9e..9e24d74ca3 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
@@ -24,12 +24,12 @@
 import java.util.List;
 import java.util.Map;
 
-import io.lettuce.TestClientResources;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 
+import io.lettuce.TestClientResources;
 import io.lettuce.Wait;
 import io.lettuce.core.*;
 import io.lettuce.core.api.async.RedisAsyncCommands;
@@ -46,7 +46,8 @@ public class SentinelCommandTest extends AbstractSentinelTest {
 
     @BeforeClass
     public static void setupClient() {
-        sentinelClient = RedisClient.create(RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
+        sentinelClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder
+                .sentinel(TestSettings.host(), MASTER_ID).build());
     }
 
     @Before
@@ -134,8 +135,7 @@ public void sentinelConnect() throws Exception {
         RedisClient client = DefaultRedisClient.get();
 
         RedisURI redisURI = RedisURI.Builder.redis(TestSettings.host(), TestSettings.port()).build();
-        RedisSentinelCommands<String, String> connection = client
-                .connectSentinel(redisURI).sync();
+        RedisSentinelCommands<String, String> connection = client.connectSentinel(redisURI).sync();
         assertThat(connection.ping()).isEqualTo("PONG");
 
         connection.getStatefulConnection().close();
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java
index 3d7712b94e..b85d4cc7ec 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java
@@ -26,6 +26,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 
+import io.lettuce.TestClientResources;
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
@@ -42,7 +43,8 @@ public class SentinelServerCommandTest extends AbstractSentinelTest {
 
     @BeforeClass
     public static void setupClient() {
-        sentinelClient = RedisClient.create(RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
+        sentinelClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder
+                .sentinel(TestSettings.host(), MASTER_ID).build());
     }
 
     @Before

From 627ddf4f8edd1ae38790808691c86e6e7946d1db Mon Sep 17 00:00:00 2001
From: Jongyeol Choi <jongyeol.choi@linecorp.com>
Date: Mon, 17 Apr 2017 16:39:00 +0900
Subject: [PATCH 196/808] Close the connection when Redis protocol is corrupted
 #512

Lettuce now closes the Redis connection when running into a decoding error caught from RedisStateMachine. The currently processed command is completed exceptionally. Any other queued commands are either retried (if auto-connect is enabled) or left in the queue until the connection is closed.
---
 .../lettuce/core/protocol/CommandHandler.java | 50 ++++++++++++-------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 3d7aa15d4c..d686ad795b 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@
  *
  * @author Will Glozer
  * @author Mark Paluch
+ * @author Jongyeol Choi
  */
 public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCommands {
 
@@ -161,7 +162,12 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
                 logger.debug("{} Storing exception in {}", logPrefix(), command);
             }
             logLevel = InternalLogLevel.DEBUG;
-            command.completeExceptionally(cause);
+
+            try {
+                command.completeExceptionally(cause);
+            } catch (Exception ex) {
+                logger.warn("{} Unexpected exception during command completion exceptionally: {}", logPrefix, ex.toString(), ex);
+            }
         }
 
         if (channel == null || !channel.isActive() || !isConnected()) {
@@ -312,25 +318,14 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
                 logger.debug("{} Queue contains: {} commands", logPrefix(), queue.size());
             }
 
-            if (latencyMetricsEnabled && command instanceof WithLatency) {
-
-                WithLatency withLatency = (WithLatency) command;
-                if (withLatency.getFirstResponse() == -1) {
-                    withLatency.firstResponse(nanoTime());
-                }
-
-                if (!decode(ctx, buffer, command)) {
-                    return;
-                }
-
-                recordLatency(withLatency, command.getType());
-
-            } else {
-
+            try {
                 if (!decode(ctx, buffer, command)) {
                     return;
                 }
+            } catch (Exception e) {
 
+                ctx.close();
+                throw e;
             }
 
             queue.poll();
@@ -348,6 +343,27 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
 
     private boolean decode(ChannelHandlerContext ctx, ByteBuf buffer, RedisCommand<?, ?, ?> command) {
 
+        if (latencyMetricsEnabled && command instanceof WithLatency) {
+
+            WithLatency withLatency = (WithLatency) command;
+            if (withLatency.getFirstResponse() == -1) {
+                withLatency.firstResponse(nanoTime());
+            }
+
+            if (!decode0(ctx, buffer, command)) {
+                return false;
+            }
+
+            recordLatency(withLatency, command.getType());
+
+            return true;
+        }
+
+        return decode0(ctx, buffer, command);
+    }
+
+    private boolean decode0(ChannelHandlerContext ctx, ByteBuf buffer, RedisCommand<?, ?, ?> command) {
+
         if (!rsm.decode(buffer, command, command.getOutput())) {
 
             if (command instanceof DemandAware.Sink) {

From 15b4f8d10dc28781041ee5fd5039327a753cbe93 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 20 Apr 2017 21:12:02 +0200
Subject: [PATCH 197/808] Replace synchronized reconnect in ConnectionWatchdog
 with asynchronous connect #514

ConnectionWatchdog uses future chaining to reconnect disconnected channels. The connection future propagates its state asynchronously and is canceled if reconnect timeout is exceeded. The change impacts logging of exceptions. The future is completed by EventLoop threads and logging is attached through a future listener. Execution Exceptions (Timeout, Connection exceptions) are logged without stack trace. All other exceptions are logged with a trace.

Previously, the reconnect sequence was a synchronized flow that blocked the executing Thread until the connection yielded success or ran into a timeout.
---
 .../lettuce/core/RedisChannelInitializer.java |   7 +-
 .../core/protocol/ConnectionWatchdog.java     |  71 +++----
 .../core/protocol/ReconnectionHandler.java    | 176 +++++++++++++-----
 3 files changed, 167 insertions(+), 87 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisChannelInitializer.java b/src/main/java/io/lettuce/core/RedisChannelInitializer.java
index be78ff7a6a..d8c3c9294a 100644
--- a/src/main/java/io/lettuce/core/RedisChannelInitializer.java
+++ b/src/main/java/io/lettuce/core/RedisChannelInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core;
 
-import java.util.concurrent.Future;
+import java.util.concurrent.CompletableFuture;
 
 import io.netty.channel.ChannelHandler;
 
@@ -28,8 +28,7 @@
 public interface RedisChannelInitializer extends ChannelHandler {
 
     /**
-     *
      * @return future to synchronize channel initialization. Returns a new future for every reconnect.
      */
-    Future<Boolean> channelInitialized();
+    CompletableFuture<Boolean> channelInitialized();
 }
diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
index 39e5806518..e0410f91b0 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,13 +24,11 @@
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.resource.Delay;
 import io.lettuce.core.resource.Delay.StatefulDelay;
-
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.*;
 import io.netty.channel.group.ChannelGroup;
 import io.netty.util.Timeout;
 import io.netty.util.Timer;
-import io.netty.util.TimerTask;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.internal.logging.InternalLogLevel;
 import io.netty.util.internal.logging.InternalLogger;
@@ -113,8 +111,8 @@ public SocketAddress get() {
             }
         };
 
-        this.reconnectionHandler = new ReconnectionHandler(clientOptions, bootstrap, wrappedSocketAddressSupplier,
-                connectionFacade);
+        this.reconnectionHandler = new ReconnectionHandler(clientOptions, bootstrap, wrappedSocketAddressSupplier, timer,
+                reconnectWorkers, connectionFacade);
 
         resetReconnectDelay();
     }
@@ -203,20 +201,18 @@ public synchronized void scheduleReconnect() {
             final int attempt = attempts;
             int timeout = (int) reconnectDelay.getTimeUnit().toMillis(reconnectDelay.createDelay(attempt));
             logger.debug("{} Reconnect attempt {}, delay {}ms", logPrefix(), attempt, timeout);
-            this.reconnectScheduleTimeout = timer.newTimeout(new TimerTask() {
-                @Override
-                public void run(final Timeout timeout) throws Exception {
 
-                    if (!isEventLoopGroupActive()) {
-                        logger.debug("isEventLoopGroupActive() == false");
-                        return;
-                    }
+            this.reconnectScheduleTimeout = timer.newTimeout(it -> {
 
-                    reconnectWorkers.submit(() -> {
-                        ConnectionWatchdog.this.run(attempt);
-                        return null;
-                    });
+                if (!isEventLoopGroupActive()) {
+                    logger.debug("isEventLoopGroupActive() == false");
+                    return;
                 }
+
+                reconnectWorkers.submit(() -> {
+                    ConnectionWatchdog.this.run(attempt);
+                    return null;
+                });
             }, timeout, TimeUnit.MILLISECONDS);
         } else {
             logger.debug("{} Skipping scheduleReconnect() because I have an active channel", logPrefix());
@@ -257,24 +253,35 @@ public void run(int attempt) throws Exception {
             infoLevel = InternalLogLevel.DEBUG;
         }
 
+        InternalLogLevel warnLevelToUse = warnLevel;
+
         try {
             reconnectionListener.onReconnect(new ConnectionEvents.Reconnect(attempt));
-            reconnect(infoLevel, warnLevel);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw e;
-        } catch (Exception e) {
-            logger.log(warnLevel, "Cannot connect: {}", e.toString());
-            if (!isReconnectSuspended()) {
-                scheduleReconnect();
-            }
-        }
-    }
+            logger.log(infoLevel, "Reconnecting, last destination was {}", remoteAddress);
+
+            ChannelFuture future = reconnectionHandler.reconnect();
 
-    protected void reconnect(InternalLogLevel infoLevel, InternalLogLevel warnLevel) throws Exception {
+            future.addListener(it -> {
 
-        logger.log(infoLevel, "Reconnecting, last destination was {}", remoteAddress);
-        reconnectionHandler.reconnect(infoLevel);
+                if (it.isSuccess() || it.cause() == null) {
+                    return;
+                }
+
+                Throwable throwable = it.cause();
+
+                if (ReconnectionHandler.isExecutionException(throwable)) {
+                    logger.log(warnLevelToUse, "Cannot reconnect: {}", throwable.toString());
+                } else {
+                    logger.log(warnLevelToUse, "Cannot reconnect: {}", throwable.toString(), throwable);
+                }
+
+                if (!isReconnectSuspended()) {
+                    scheduleReconnect();
+                }
+            });
+        } catch (Exception e) {
+            logger.log(warnLevel, "Cannot reconnect: {}", e.toString());
+        }
     }
 
     private boolean isEventLoopGroupActive() {
@@ -286,8 +293,8 @@ private boolean isEventLoopGroupActive() {
         return true;
     }
 
-    private boolean isEventLoopGroupActive(EventExecutorGroup executorService) {
-        return !(executorService.isShutdown() || executorService.isTerminated() || executorService.isShuttingDown());
+    private static boolean isEventLoopGroupActive(EventExecutorGroup executorService) {
+        return !(executorService.isShuttingDown());
     }
 
     private boolean shouldLog() {
diff --git a/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
index 73fbdf6832..1d9a798025 100644
--- a/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
@@ -15,19 +15,27 @@
  */
 package io.lettuce.core.protocol;
 
+import java.net.ConnectException;
 import java.net.SocketAddress;
+import java.util.Set;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
 
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.RedisChannelInitializer;
+import io.lettuce.core.RedisCommandTimeoutException;
 import io.lettuce.core.internal.LettuceAssert;
-
+import io.lettuce.core.internal.LettuceSets;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
-import io.netty.util.internal.logging.InternalLogLevel;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.Timeout;
+import io.netty.util.Timer;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -38,9 +46,14 @@ class ReconnectionHandler {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(ReconnectionHandler.class);
 
-    private final Supplier<SocketAddress> socketAddressSupplier;
+    private static final Set<Class<?>> EXECUTION_EXCEPTION_TYPES = LettuceSets.unmodifiableSet(TimeoutException.class,
+            CancellationException.class, RedisCommandTimeoutException.class, ConnectException.class);
+
     private final ClientOptions clientOptions;
     private final Bootstrap bootstrap;
+    private final Supplier<SocketAddress> socketAddressSupplier;
+    private final Timer timer;
+    private final ExecutorService reconnectWorkers;
     private final ConnectionFacade connectionFacade;
 
     private TimeUnit timeoutUnit = TimeUnit.SECONDS;
@@ -50,83 +63,129 @@ class ReconnectionHandler {
     private volatile boolean reconnectSuspended;
 
     ReconnectionHandler(ClientOptions clientOptions, Bootstrap bootstrap, Supplier<SocketAddress> socketAddressSupplier,
-            ConnectionFacade connectionFacade) {
+            Timer timer, ExecutorService reconnectWorkers, ConnectionFacade connectionFacade) {
 
         LettuceAssert.notNull(socketAddressSupplier, "SocketAddressSupplier must not be null");
-        LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
         LettuceAssert.notNull(bootstrap, "Bootstrap must not be null");
+        LettuceAssert.notNull(timer, "Timer must not be null");
+        LettuceAssert.notNull(reconnectWorkers, "ExecutorService must not be null");
         LettuceAssert.notNull(connectionFacade, "ConnectionFacade must not be null");
 
         this.socketAddressSupplier = socketAddressSupplier;
         this.bootstrap = bootstrap;
         this.clientOptions = clientOptions;
+        this.timer = timer;
+        this.reconnectWorkers = reconnectWorkers;
         this.connectionFacade = connectionFacade;
     }
 
-    protected boolean reconnect(InternalLogLevel infoLevel) throws Exception {
+    /**
+     * Initiate reconnect and return a {@link ChannelFuture} for synchronization. The resulting future either succeeds or fails.
+     * It can be {@link ChannelFuture#cancel(boolean) canceled} to interrupt reconnection and channel initialization. A failed
+     * {@link ChannelFuture} will close the channel.
+     *
+     * @return reconnect {@link ChannelFuture}.
+     */
+    protected ChannelFuture reconnect() {
 
         SocketAddress remoteAddress = socketAddressSupplier.get();
 
-        try {
-            long timeLeft = timeoutUnit.toNanos(timeout);
-            long start = System.nanoTime();
+        logger.debug("Reconnecting to Redis at {}", remoteAddress);
+
+        ChannelFuture connectFuture = bootstrap.connect(remoteAddress);
+        ChannelPromise initFuture = connectFuture.channel().newPromise();
 
-            logger.debug("Reconnecting to Redis at {}", remoteAddress);
-            ChannelFuture currentFuture = this.currentFuture = bootstrap.connect(remoteAddress);
-            if (!currentFuture.await(timeLeft, TimeUnit.NANOSECONDS)) {
-                if (currentFuture.isCancellable()) {
-                    currentFuture.cancel(true);
-                }
+        initFuture.addListener((ChannelFuture it) -> {
 
-                throw new TimeoutException("Reconnection attempt exceeded timeout of " + timeout + " " + timeoutUnit);
+            if (it.cause() != null) {
+
+                connectFuture.cancel(true);
+                close(it.channel());
             }
+        });
+
+        connectFuture.addListener((ChannelFuture it) -> {
 
-            currentFuture.sync();
+            if (it.cause() != null) {
 
-            Channel channel = currentFuture.channel();
+                initFuture.tryFailure(it.cause());
+                return;
+            }
 
-            RedisChannelInitializer channelInitializer = channel.pipeline().get(RedisChannelInitializer.class);
+            ChannelPipeline pipeline = it.channel().pipeline();
+
+            RedisChannelInitializer channelInitializer = pipeline.get(RedisChannelInitializer.class);
 
             if (channelInitializer == null) {
-                logger.warn("Reconnection attempt without a RedisChannelInitializer in the channel pipeline");
-                close(channel);
-                return false;
+
+                initFuture.tryFailure(new IllegalStateException(
+                        "Reconnection attempt without a RedisChannelInitializer in the channel pipeline"));
+                return;
             }
 
-            try {
-                timeLeft -= System.nanoTime() - start;
-                channelInitializer.channelInitialized().get(Math.max(0, timeLeft), TimeUnit.NANOSECONDS);
-                if (logger.isDebugEnabled()) {
-                    logger.log(infoLevel, "Reconnected to {}, Channel {}", remoteAddress,
-                            ChannelLogDescriptor.logDescriptor(channel));
-                } else {
-                    logger.log(infoLevel, "Reconnected to {}", remoteAddress);
-                }
-                return true;
-            } catch (TimeoutException e) {
-                channelInitializer.channelInitialized().cancel(true);
-            } catch (Exception e) {
-                if (clientOptions.isCancelCommandsOnReconnectFailure()) {
-                    connectionFacade.reset();
-                }
-
-                if (clientOptions.isSuspendReconnectOnProtocolFailure()) {
-                    logger.error("Cannot initialize channel. Disabling autoReconnect", e);
-                    setReconnectSuspended(true);
-                } else {
-                    logger.error("Cannot initialize channel.", e);
-                    throw e;
-                }
+            channelInitializer.channelInitialized().whenComplete(
+                    (state, throwable) -> {
+
+                        if (throwable != null) {
+
+                            if (isExecutionException(throwable)) {
+                                initFuture.tryFailure(throwable);
+                                return;
+                            }
+
+                            if (clientOptions.isCancelCommandsOnReconnectFailure()) {
+                                connectionFacade.reset();
+                            }
+
+                            if (clientOptions.isSuspendReconnectOnProtocolFailure()) {
+
+                                logger.error("Disabling autoReconnect due to initialization failure", throwable);
+                                setReconnectSuspended(true);
+                            }
+
+                            initFuture.tryFailure(throwable);
+
+                            return;
+                        }
+
+                        if (logger.isDebugEnabled()) {
+                            logger.info("Reconnected to {}, Channel {}", remoteAddress,
+                                    ChannelLogDescriptor.logDescriptor(it.channel()));
+                        } else {
+                            logger.info("Reconnected to {}", remoteAddress);
+                        }
+
+                        initFuture.trySuccess();
+                    });
+        });
+
+        Runnable timeoutAction = () -> {
+            initFuture.tryFailure(new TimeoutException(String.format("Reconnection attempt exceeded timeout of %d %s ",
+                    timeout, timeoutUnit)));
+        };
+
+        Timeout timeoutHandle = timer.newTimeout(it -> {
+
+            if (connectFuture.isDone() && initFuture.isDone()) {
+                return;
             }
-        } finally {
-            this.currentFuture = null;
-        }
 
-        return false;
+            if (reconnectWorkers.isShutdown()) {
+                timeoutAction.run();
+                return;
+            }
+
+            reconnectWorkers.submit(timeoutAction);
+
+        }, this.timeout, timeoutUnit);
+
+        initFuture.addListener(it -> timeoutHandle.cancel());
+
+        return this.currentFuture = initFuture;
     }
 
     private void close(Channel channel) {
-        if (channel != null && channel.isOpen()) {
+        if (channel != null) {
             channel.close();
         }
     }
@@ -155,6 +214,21 @@ void prepareClose() {
         }
     }
 
+    /**
+     * @param throwable
+     * @return {@literal true} if {@code throwable} is an execution {@link Exception}.
+     */
+    public static boolean isExecutionException(Throwable throwable) {
+
+        for (Class<?> type : EXECUTION_EXCEPTION_TYPES) {
+            if (type.isAssignableFrom(throwable.getClass())) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     ClientOptions getClientOptions() {
         return clientOptions;
     }

From 50416bc1f83ec717acccefa09c143848fcdbc870 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 25 Apr 2017 20:33:53 +0200
Subject: [PATCH 198/808] Stop LatencyStats on removal #517

Lettuce now stops LatencyStats when removing the object from latency collection scope. Stopping LatencyStats unregisters from the associated PauseDetector and removes listener resources so GC can remove the object.
---
 .../DefaultCommandLatencyCollector.java       | 62 +++++++++++++------
 1 file changed, 42 insertions(+), 20 deletions(-)

diff --git a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
index 52dfb19854..b7cae7d5c5 100644
--- a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
@@ -15,16 +15,7 @@
  */
 package io.lettuce.core.metrics;
 
-import io.lettuce.core.metrics.CommandMetrics.CommandLatency;
-import io.lettuce.core.protocol.CommandType;
-import io.lettuce.core.protocol.ProtocolKeyword;
-import io.netty.channel.local.LocalAddress;
-import io.netty.util.internal.logging.InternalLogger;
-import io.netty.util.internal.logging.InternalLoggerFactory;
-import org.HdrHistogram.Histogram;
-import org.LatencyUtils.LatencyStats;
-import org.LatencyUtils.PauseDetector;
-import org.LatencyUtils.SimplePauseDetector;
+import static io.lettuce.core.internal.LettuceClassUtils.isPresent;
 
 import java.net.SocketAddress;
 import java.util.Collections;
@@ -36,7 +27,17 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static io.lettuce.core.internal.LettuceClassUtils.isPresent;
+import org.HdrHistogram.Histogram;
+import org.LatencyUtils.LatencyStats;
+import org.LatencyUtils.PauseDetector;
+import org.LatencyUtils.SimplePauseDetector;
+
+import io.lettuce.core.metrics.CommandMetrics.CommandLatency;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.ProtocolKeyword;
+import io.netty.channel.local.LocalAddress;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
  * Default implementation of a {@link CommandLatencyCollector} for command latencies.
@@ -53,7 +54,10 @@ public class DefaultCommandLatencyCollector implements CommandLatencyCollector {
     private static final long MAX_LATENCY = TimeUnit.MINUTES.toNanos(5);
 
     private final CommandLatencyCollectorOptions options;
-    private Map<CommandLatencyId, Latencies> latencyMetrics = new ConcurrentHashMap<>(CommandType.values().length);
+    private final AtomicReference<Map<CommandLatencyId, Latencies>> latencyMetricsRef = new AtomicReference<>(
+            createNewLatencyMap());
+
+    private volatile boolean stopped;
 
     public DefaultCommandLatencyCollector(CommandLatencyCollectorOptions options) {
         this.options = options;
@@ -75,7 +79,7 @@ public void recordCommandLatency(SocketAddress local, SocketAddress remote, Prot
             return;
         }
 
-        Latencies latencies = latencyMetrics.computeIfAbsent(createId(local, remote, commandType), id -> {
+        Latencies latencies = latencyMetricsRef.get().computeIfAbsent(createId(local, remote, commandType), id -> {
 
             PauseDetectorWrapper wrapper = PAUSE_DETECTOR.get();
             if (wrapper == null) {
@@ -106,28 +110,37 @@ private long rangify(long latency) {
 
     @Override
     public boolean isEnabled() {
-        return latencyMetrics != null && options.isEnabled();
+        return options.isEnabled() && !stopped;
     }
 
     @Override
     public void shutdown() {
 
-        if (latencyMetrics != null) {
-            latencyMetrics.clear();
-            latencyMetrics = null;
+        stopped = true;
+
+        Map<CommandLatencyId, Latencies> latenciesMap = latencyMetricsRef.get();
+        if (latencyMetricsRef.compareAndSet(latenciesMap, Collections.emptyMap())) {
+            latenciesMap.values().forEach(Latencies::stop);
         }
     }
 
     @Override
     public Map<CommandLatencyId, CommandMetrics> retrieveMetrics() {
 
-        Map<CommandLatencyId, Latencies> copy = new HashMap<>(latencyMetrics);
+        Map<CommandLatencyId, Latencies> latenciesMap = latencyMetricsRef.get();
+        Map<CommandLatencyId, Latencies> metricsToUse;
 
         if (options.resetLatenciesAfterEvent()) {
-            latencyMetrics.clear();
+
+            metricsToUse = latenciesMap;
+            latencyMetricsRef.set(createNewLatencyMap());
+
+            metricsToUse.values().forEach(Latencies::stop);
+        } else {
+            metricsToUse = new HashMap<>(latenciesMap);
         }
 
-        return getMetrics(copy);
+        return getMetrics(metricsToUse);
     }
 
     private Map<CommandLatencyId, CommandMetrics> getMetrics(Map<CommandLatencyId, Latencies> latencyMetrics) {
@@ -186,6 +199,10 @@ public static boolean isAvailable() {
         return LATENCY_UTILS_AVAILABLE && HDR_UTILS_AVAILABLE;
     }
 
+    private static ConcurrentHashMap<CommandLatencyId, Latencies> createNewLatencyMap() {
+        return new ConcurrentHashMap<>(CommandType.values().length);
+    }
+
     /**
      * Returns a disabled no-op {@link CommandLatencyCollector}.
      *
@@ -232,6 +249,11 @@ public Histogram getFirstResponseHistogram() {
         public Histogram getCompletionHistogram() {
             return completion.getIntervalHistogram();
         }
+
+        public void stop() {
+            firstResponse.stop();
+            completion.stop();
+        }
     }
 
     private static class CummulativeLatencies extends Latencies {

From 494b47c7fd6e10e8d47980457f5772fca683d6e6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 25 Apr 2017 21:02:14 +0200
Subject: [PATCH 199/808] Improve cleanup of PauseDetector #516

Lettuce now attempts eager shutdown of PauseDetector by applying reference counting with a global PauseDetector instance. The first recorded latency initializes a PauseDetector instance and DefaultCommandLatencyCollector shutdown decrements reference count. The last reference release will shuts PauseDetector down and releases the instance for GC cleanup. A JVM shutdown hook is still registered to cleanup PauseDetector in case DefaultCommandLatencyCollector was not shut down.

Previously, PauseDetector was shut down at JVM shutdown using a shutdown hook.
---
 .../DefaultCommandLatencyCollector.java       | 98 ++++++++++++++-----
 .../DefaultCommandLatencyCollectorTest.java   | 49 +++++++++-
 2 files changed, 124 insertions(+), 23 deletions(-)

diff --git a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
index b7cae7d5c5..b8b9408b74 100644
--- a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
@@ -26,6 +26,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
 import org.HdrHistogram.Histogram;
 import org.LatencyUtils.LatencyStats;
@@ -46,7 +47,11 @@
  */
 public class DefaultCommandLatencyCollector implements CommandLatencyCollector {
 
-    private static final AtomicReference<PauseDetectorWrapper> PAUSE_DETECTOR = new AtomicReference<>();
+    private static final AtomicReferenceFieldUpdater<DefaultCommandLatencyCollector, PauseDetectorWrapper> PAUSE_DETECTOR_UPDATER = AtomicReferenceFieldUpdater
+            .newUpdater(DefaultCommandLatencyCollector.class, PauseDetectorWrapper.class, "pauseDetectorWrapper");
+
+    private static final PauseDetectorWrapper GLOBAL_PAUSE_DETECTOR = new PauseDetectorWrapper();
+
     private static final boolean LATENCY_UTILS_AVAILABLE = isPresent("org.LatencyUtils.PauseDetector");
     private static final boolean HDR_UTILS_AVAILABLE = isPresent("org.HdrHistogram.Histogram");
 
@@ -54,6 +59,10 @@ public class DefaultCommandLatencyCollector implements CommandLatencyCollector {
     private static final long MAX_LATENCY = TimeUnit.MINUTES.toNanos(5);
 
     private final CommandLatencyCollectorOptions options;
+
+    // Updated via PAUSE_DETECTOR_UPDATER
+    private volatile PauseDetectorWrapper pauseDetectorWrapper;
+
     private final AtomicReference<Map<CommandLatencyId, Latencies>> latencyMetricsRef = new AtomicReference<>(
             createNewLatencyMap());
 
@@ -81,19 +90,18 @@ public void recordCommandLatency(SocketAddress local, SocketAddress remote, Prot
 
         Latencies latencies = latencyMetricsRef.get().computeIfAbsent(createId(local, remote, commandType), id -> {
 
-            PauseDetectorWrapper wrapper = PAUSE_DETECTOR.get();
-            if (wrapper == null) {
-                wrapper = new PauseDetectorWrapper();
-
-                if (PAUSE_DETECTOR.compareAndSet(null, wrapper)) {
-                    wrapper.initialize();
+            if (PAUSE_DETECTOR_UPDATER.get(this) == null) {
+                if (PAUSE_DETECTOR_UPDATER.compareAndSet(this, null, GLOBAL_PAUSE_DETECTOR)) {
+                    PAUSE_DETECTOR_UPDATER.get(this).retain();
                 }
             }
+            PauseDetector pauseDetector = PAUSE_DETECTOR_UPDATER.get(this).getPauseDetector();
 
             if (options.resetLatenciesAfterEvent()) {
-                return new Latencies(PAUSE_DETECTOR.get().pauseDetector);
+                return new Latencies(pauseDetector);
             }
-            return new CummulativeLatencies(PAUSE_DETECTOR.get().pauseDetector);
+
+            return new CummulativeLatencies(pauseDetector);
         });
 
         latencies.firstResponse.recordLatency(rangify(firstResponseLatency));
@@ -118,6 +126,11 @@ public void shutdown() {
 
         stopped = true;
 
+        PauseDetectorWrapper pauseDetectorWrapper = PAUSE_DETECTOR_UPDATER.get(this);
+        if (pauseDetectorWrapper != null && PAUSE_DETECTOR_UPDATER.compareAndSet(this, pauseDetectorWrapper, null)) {
+            pauseDetectorWrapper.release();
+        }
+
         Map<CommandLatencyId, Latencies> latenciesMap = latencyMetricsRef.get();
         if (latencyMetricsRef.compareAndSet(latenciesMap, Collections.emptyMap())) {
             latenciesMap.values().forEach(Latencies::stop);
@@ -283,26 +296,67 @@ public Histogram getCompletionHistogram() {
         }
     }
 
-    private static class PauseDetectorWrapper {
+    /**
+     * Reference-counted wrapper for {@link PauseDetector} instances.
+     */
+    static class PauseDetectorWrapper {
+
+        private static final AtomicLong instanceCounter = new AtomicLong();
+
+        private final AtomicLong counter = new AtomicLong();
 
-        private static final AtomicLong counter = new AtomicLong();
+        private volatile PauseDetector pauseDetector;
 
-        PauseDetector pauseDetector;
+        /**
+         * Creates or initializes a {@link PauseDetector} instance.
+         *
+         * @return
+         */
+        public PauseDetector getPauseDetector() {
 
-        public void initialize() {
+            while (pauseDetector == null) {
 
-            if (counter.getAndIncrement() > 0) {
-                InternalLogger instance = InternalLoggerFactory.getInstance(getClass());
-                instance.info("Initialized PauseDetectorWrapper more than once.");
+                try {
+                    Thread.sleep(1);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    return pauseDetector;
+                }
             }
 
-            pauseDetector = new SimplePauseDetector(TimeUnit.MILLISECONDS.toNanos(10), TimeUnit.MILLISECONDS.toNanos(10), 3);
-            Runtime.getRuntime().addShutdownHook(new Thread("ShutdownHook for SimplePauseDetector") {
-                @Override
-                public void run() {
-                    pauseDetector.shutdown();
+            return pauseDetector;
+        }
+
+        public void retain() {
+
+            if (counter.incrementAndGet() == 1) {
+
+                if (instanceCounter.getAndIncrement() > 0) {
+                    InternalLogger instance = InternalLoggerFactory.getInstance(getClass());
+                    instance.info("Initialized PauseDetectorWrapper more than once.");
                 }
-            });
+
+                pauseDetector = new SimplePauseDetector(TimeUnit.MILLISECONDS.toNanos(10), TimeUnit.MILLISECONDS.toNanos(10), 3);
+                Runtime.getRuntime().addShutdownHook(new Thread("ShutdownHook for SimplePauseDetector") {
+                    @Override
+                    public void run() {
+                        if (pauseDetector != null) {
+                            pauseDetector.shutdown();
+                        }
+                    }
+                });
+            }
+        }
+
+        public void release() {
+
+            if (counter.decrementAndGet() == 0) {
+
+                instanceCounter.decrementAndGet();
+                pauseDetector.shutdown();
+                pauseDetector = null;
+
+            }
         }
     }
 }
diff --git a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java
index 0a28b23369..262c79b297 100644
--- a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java
+++ b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java
@@ -24,9 +24,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.test.util.ReflectionTestUtils;
 
+import io.lettuce.core.metrics.DefaultCommandLatencyCollector.PauseDetectorWrapper;
 import io.lettuce.core.protocol.CommandType;
-
 import io.netty.channel.local.LocalAddress;
 
 /**
@@ -47,6 +48,48 @@ public void shutdown() {
         assertThat(sut.isEnabled()).isFalse();
     }
 
+    @Test
+    public void simpleCreateShouldNotInitializePauseDetector() {
+
+        sut = new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create());
+        PauseDetectorWrapper wrapper = (PauseDetectorWrapper) ReflectionTestUtils.getField(sut, "pauseDetectorWrapper");
+
+        assertThat(wrapper).isNull();
+    }
+
+    @Test
+    public void latencyRecordShouldInitializePauseDetectorWrapper() {
+
+        sut = new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create());
+
+        setupData();
+
+        PauseDetectorWrapper wrapper = (PauseDetectorWrapper) ReflectionTestUtils.getField(sut, "pauseDetectorWrapper");
+        assertThat(wrapper).isNotNull();
+
+        sut.shutdown();
+
+        wrapper = (PauseDetectorWrapper) ReflectionTestUtils.getField(sut, "pauseDetectorWrapper");
+        assertThat(wrapper).isNull();
+    }
+
+    @Test
+    public void shutdownShouldReleasePauseDetector() {
+
+        sut = new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create());
+        PauseDetectorWrapper wrapper = (PauseDetectorWrapper) ReflectionTestUtils.getField(sut, "pauseDetectorWrapper");
+
+        assertThat(wrapper).isNull();
+
+        setupData();
+
+        wrapper = (PauseDetectorWrapper) ReflectionTestUtils.getField(sut, "pauseDetectorWrapper");
+
+        assertThat(wrapper).isNotNull();
+
+        sut.shutdown();
+    }
+
     @Test
     public void verifyMetrics() {
 
@@ -77,6 +120,8 @@ public void verifyMetrics() {
         assertThat(metrics.getTimeUnit()).isEqualTo(MICROSECONDS);
 
         assertThat(sut.retrieveMetrics()).isEmpty();
+
+        sut.shutdown();
     }
 
     @Test
@@ -89,6 +134,8 @@ public void verifyCummulativeMetrics() {
 
         assertThat(sut.retrieveMetrics()).hasSize(1);
         assertThat(sut.retrieveMetrics()).hasSize(1);
+
+        sut.shutdown();
     }
 
     private void setupData() {

From f54542f539abcfa5b74985a65280fd1de95d5602 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 26 Apr 2017 10:51:49 +0200
Subject: [PATCH 200/808] Gracefully degrade to successfully connected Cluster
 read candidates #503

Lettuce now considers the connect outcome of node connections obtained through a ReadFrom selection. Node connections that connected successfully are considered as candidates for connection selection in the next selection stage. Failed node connections (connection timeout, protocol errors, other causes) are filtered from the candidate selection and are not considered for connection selection. Using only successful connect results does not fail the entire connection selection anymore. It's now possible that one or more nodes are not reachable initially while the command dispatch can still succeed if at least one node was able to connect successfully. If all connects fail, the connection error is propagated as Exception.

Previously, a single connection error caused the whole connection selection to fail while other healthy nodes were not considered for connection selection.
---
 .../PooledClusterConnectionProvider.java      | 91 +++++++++++++++++--
 .../PooledClusterConnectionProviderTest.java  | 67 +++++++++++++-
 2 files changed, 146 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
index dca8fd72ee..e3ad177de5 100644
--- a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.cluster;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
@@ -142,11 +143,14 @@ protected CompletableFuture<StatefulRedisConnection<K, V>> getReadConnection(int
 
         CompletableFuture<StatefulRedisConnection<K, V>> readerCandidates[];// avoid races when reconfiguring partitions.
 
+        boolean cached = true;
+
         synchronized (stateLock) {
             readerCandidates = readers[slot];
         }
 
         if (readerCandidates == null) {
+
             RedisClusterNode master = partitions.getPartitionBySlot(slot);
             if (master == null) {
                 throw new RedisException("Cannot determine a partition to read for slot " + slot + " (Partitions: "
@@ -172,28 +176,99 @@ public Iterator<RedisNodeDescription> iterator() {
             }
 
             readerCandidates = getReadFromConnections(selection);
+            cached = false;
         }
 
         CompletableFuture<StatefulRedisConnection<K, V>> selectedReaderCandidates[] = readerCandidates;
 
-        return CompletableFuture.allOf(readerCandidates).thenRun(() -> {
+        if (cached) {
+
+            return CompletableFuture.allOf(readerCandidates).thenCompose(v -> {
 
-            synchronized (stateLock) {
-                if (readers[slot] == null) {
-                    readers[slot] = selectedReaderCandidates;
+                for (CompletableFuture<StatefulRedisConnection<K, V>> candidate : selectedReaderCandidates) {
+
+                    if (candidate.join().isOpen()) {
+                        return candidate;
+                    }
                 }
+
+                return selectedReaderCandidates[0];
+            });
+        }
+
+        CompletableFuture<StatefulRedisConnection<K, V>[]> filteredReaderCandidates = new CompletableFuture<>();
+
+        CompletableFuture.allOf(readerCandidates).thenApply(v -> selectedReaderCandidates)
+                .whenComplete((candidates, throwable) -> {
+
+                    if (throwable == null) {
+                        filteredReaderCandidates.complete(getConnections(candidates));
+                        return;
+                    }
+
+                    StatefulRedisConnection<K, V>[] connections = getConnections(selectedReaderCandidates);
+
+                    if (connections.length == 0) {
+                        filteredReaderCandidates.completeExceptionally(throwable);
+                        return;
+                    }
+
+                    filteredReaderCandidates.complete(connections);
+                });
+
+        return filteredReaderCandidates
+                .thenApply(statefulRedisConnections -> {
+
+                    CompletableFuture<StatefulRedisConnection<K, V>> toCache[] = new CompletableFuture[statefulRedisConnections.length];
+
+                    for (int i = 0; i < toCache.length; i++) {
+                        toCache[i] = CompletableFuture.completedFuture(statefulRedisConnections[i]);
+                    }
+                    synchronized (stateLock) {
+                        readers[slot] = toCache;
+                    }
+
+                    for (StatefulRedisConnection<K, V> candidate : statefulRedisConnections) {
+                        if (candidate.isOpen()) {
+                            return candidate;
+                        }
+                    }
+
+                    return statefulRedisConnections[0];
+                });
+    }
+
+    private StatefulRedisConnection<K, V>[] getConnections(
+            CompletableFuture<StatefulRedisConnection<K, V>>[] selectedReaderCandidates) {
+
+        List<StatefulRedisConnection<K, V>> connections = new ArrayList<>(selectedReaderCandidates.length);
+
+        for (CompletableFuture<StatefulRedisConnection<K, V>> candidate : selectedReaderCandidates) {
+
+            try {
+                connections.add(candidate.join());
+            } catch (Exception o_O) {
             }
-        }).thenApply(v -> {
+        }
+
+        StatefulRedisConnection<K, V>[] result = new StatefulRedisConnection[connections.size()];
+        connections.toArray(result);
+        return result;
+    }
+
+    private static <K, V> CompletableFuture<StatefulRedisConnection<K, V>> getConnection(
+
+    CompletableFuture<StatefulRedisConnection<K, V>[]> root) {
 
-            for (CompletableFuture<StatefulRedisConnection<K, V>> fnReaderCandidate : selectedReaderCandidates) {
+        return root.thenApply((StatefulRedisConnection<K, V>[] connections) -> {
 
-                StatefulRedisConnection<K, V> connection = fnReaderCandidate.join();
+            for (StatefulRedisConnection<K, V> connection : connections) {
 
                 if (connection.isOpen()) {
                     return connection;
                 }
             }
-            return selectedReaderCandidates[0].join();
+            return connections[0];
         });
     }
 
diff --git a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
index cd03233cf1..f84e0a9a3a 100644
--- a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
@@ -38,10 +38,7 @@
 import org.mockito.junit.MockitoJUnitRunner;
 
 import io.lettuce.Futures;
-import io.lettuce.core.ReadFrom;
-import io.lettuce.core.RedisChannelWriter;
-import io.lettuce.core.RedisException;
-import io.lettuce.core.RedisURI;
+import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -197,6 +194,68 @@ public void shouldRetryConnectionAttemptAfterConnectionAttemptWasBroken() {
         verify(clientMock, times(2)).connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any());
     }
 
+    @Test
+    public void shouldSelectSuccessfulConnectionIfOtherNodesFailed() {
+
+        CompletableFuture<StatefulRedisConnection<String, String>> failed = new CompletableFuture<>();
+        failed.completeExceptionally(new IllegalStateException());
+
+        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
+                Futures.createConnectionFuture(socketAddressMock, failed));
+
+        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
+                Futures.createConnectionFuture(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<String, String, String>(
+                CommandType.READONLY, null, null));
+        async.complete("OK");
+
+        when(asyncCommandsMock.readOnly()).thenReturn(async);
+
+        sut.setReadFrom(ReadFrom.MASTER_PREFERRED);
+
+        assertThat(sut.getConnection(Intent.READ, 1)).isNotNull().isSameAs(nodeConnectionMock);
+
+        // cache access
+        assertThat(sut.getConnection(Intent.READ, 1)).isNotNull().isSameAs(nodeConnectionMock);
+
+        verify(clientMock).connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any());
+        verify(clientMock).connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any());
+    }
+
+    @Test
+    public void shouldFailIfAllReadCandidateNodesFail() {
+
+        CompletableFuture<StatefulRedisConnection<String, String>> failed1 = new CompletableFuture<>();
+        failed1.completeExceptionally(new IllegalStateException());
+
+        CompletableFuture<StatefulRedisConnection<String, String>> failed2 = new CompletableFuture<>();
+        failed2.completeExceptionally(new IllegalStateException());
+
+        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
+                Futures.createConnectionFuture(socketAddressMock, failed2));
+
+        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
+                Futures.createConnectionFuture(socketAddressMock, failed2));
+
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<String, String, String>(
+                CommandType.READONLY, null, null));
+        async.complete("OK");
+
+        sut.setReadFrom(ReadFrom.MASTER_PREFERRED);
+
+        try {
+            sut.getConnection(Intent.READ, 1);
+            fail("Missing RedisException");
+        } catch (RedisException e) {
+            assertThat(e).hasCauseInstanceOf(RedisConnectionException.class).hasRootCauseExactlyInstanceOf(
+                    IllegalStateException.class);
+        }
+
+        verify(clientMock).connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any());
+        verify(clientMock).connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any());
+    }
+
     @Test
     public void shouldCloseConnections() {
 

From 871b7dd33f46a65b47d8e505c1ed612ce51b8eaf Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 26 Apr 2017 18:04:17 +0200
Subject: [PATCH 201/808] Guard PauseDetectorWrapper initialization against
 absence of LatencyUtils #520

LatencyUtils is an optional dependency that is allowed to be absent. A previous change introduced a static initialization path to load PauseDetector, a type from LatencyUtils which caused DefaultCommandLatencyCollector initialization to fail.

Lettuce now encapsulates PauseDetector in a lazy-loading wrapper without defining PauseDetector on the wrapper type but a subtype to prevent NoClassDefFoundError if LatencyUtils is absent.
---
 .../DefaultCommandLatencyCollector.java       | 47 +++++++++++++++++--
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
index b8b9408b74..aed10b56f5 100644
--- a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
@@ -50,10 +50,9 @@ public class DefaultCommandLatencyCollector implements CommandLatencyCollector {
     private static final AtomicReferenceFieldUpdater<DefaultCommandLatencyCollector, PauseDetectorWrapper> PAUSE_DETECTOR_UPDATER = AtomicReferenceFieldUpdater
             .newUpdater(DefaultCommandLatencyCollector.class, PauseDetectorWrapper.class, "pauseDetectorWrapper");
 
-    private static final PauseDetectorWrapper GLOBAL_PAUSE_DETECTOR = new PauseDetectorWrapper();
-
     private static final boolean LATENCY_UTILS_AVAILABLE = isPresent("org.LatencyUtils.PauseDetector");
     private static final boolean HDR_UTILS_AVAILABLE = isPresent("org.HdrHistogram.Histogram");
+    private static final PauseDetectorWrapper GLOBAL_PAUSE_DETECTOR = PauseDetectorWrapper.create();
 
     private static final long MIN_LATENCY = 1000;
     private static final long MAX_LATENCY = TimeUnit.MINUTES.toNanos(5);
@@ -95,7 +94,7 @@ public void recordCommandLatency(SocketAddress local, SocketAddress remote, Prot
                     PAUSE_DETECTOR_UPDATER.get(this).retain();
                 }
             }
-            PauseDetector pauseDetector = PAUSE_DETECTOR_UPDATER.get(this).getPauseDetector();
+            PauseDetector pauseDetector = ((DefaultPauseDetectorWrapper) PAUSE_DETECTOR_UPDATER.get(this)).getPauseDetector();
 
             if (options.resetLatenciesAfterEvent()) {
                 return new Latencies(pauseDetector);
@@ -296,10 +295,48 @@ public Histogram getCompletionHistogram() {
         }
     }
 
+    /**
+     * Wrapper for initialization of {@link PauseDetector}. Encapsulates absence of LatencyUtils.
+     */
+    interface PauseDetectorWrapper {
+
+        /**
+         * No-operation {@link PauseDetectorWrapper} implementation.
+         */
+        PauseDetectorWrapper NO_OP = new PauseDetectorWrapper() {
+            @Override
+            public void release() {
+            }
+
+            @Override
+            public void retain() {
+            }
+        };
+
+        static PauseDetectorWrapper create() {
+
+            if (HDR_UTILS_AVAILABLE && LATENCY_UTILS_AVAILABLE) {
+                return new DefaultPauseDetectorWrapper();
+            }
+
+            return NO_OP;
+        }
+
+        /**
+         * Retain reference to {@link PauseDetectorWrapper} and increment reference counter.
+         */
+        void retain();
+
+        /**
+         * Release reference to {@link PauseDetectorWrapper} and decrement reference counter.
+         */
+        void release();
+    }
+
     /**
      * Reference-counted wrapper for {@link PauseDetector} instances.
      */
-    static class PauseDetectorWrapper {
+    static class DefaultPauseDetectorWrapper implements PauseDetectorWrapper {
 
         private static final AtomicLong instanceCounter = new AtomicLong();
 
@@ -312,7 +349,7 @@ static class PauseDetectorWrapper {
          *
          * @return
          */
-        public PauseDetector getPauseDetector() {
+        PauseDetector getPauseDetector() {
 
             while (pauseDetector == null) {
 

From 036937f3a0e31091500f740a7aa60828b7e2b49d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 27 Apr 2017 14:56:06 +0200
Subject: [PATCH 202/808] Use asynchronous node connect in NodeSelection #500
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lettuce now uses AsyncClusterConnectionProvider and asynchronous connects in the NodeSelection API for non-blocking command invocation. The asynchronous connection state is used to execute node selection commands asynchronously, as soon as the connection completes.

Asynchronous NodeSelection and Reactive NodeSelection implementations are now end-to-end non-blocking. Futures are synchronized in NodeSelection through NodeSelection.asMap() and NodeSelection.commands(…) to return the resulting connection APIs.
---
 .../core/cluster/AbstractNodeSelection.java   |  19 ++--
 .../core/cluster/DynamicNodeSelection.java    |  13 ++-
 .../NodeSelectionInvocationHandler.java       | 104 ++++++++++++------
 .../core/cluster/ReactiveExecutionsImpl.java  |  18 +--
 .../RedisClusterPubSubAsyncCommandsImpl.java  |  28 ++---
 ...edisClusterPubSubReactiveCommandsImpl.java |  29 ++---
 .../core/cluster/StaticNodeSelection.java     |  13 ++-
 7 files changed, 138 insertions(+), 86 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java b/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java
index 2a437a31b2..870d531834 100644
--- a/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,11 @@
  */
 package io.lettuce.core.cluster;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -40,10 +42,10 @@ abstract class AbstractNodeSelection<API, CMD, K, V> implements NodeSelectionSup
     @Override
     public Map<RedisClusterNode, API> asMap() {
 
-        List<RedisClusterNode> list = nodes().stream().collect(Collectors.toList());
-        Map<RedisClusterNode, API> map = new HashMap<>();
+        List<RedisClusterNode> list = new ArrayList<>(nodes());
+        Map<RedisClusterNode, API> map = new HashMap<>(list.size(), 1);
 
-        list.forEach((key) -> map.put(key, getApi(key)));
+        list.forEach((key) -> map.put(key, getApi(key).join()));
 
         return map;
     }
@@ -66,14 +68,14 @@ public CMD commands() {
 
     @Override
     public API commands(int index) {
-        return getApi(node(index));
+        return getApi(node(index)).join();
     }
 
     /**
      *
      * @return {@link Map} between a {@link RedisClusterNode} to its actual {@link StatefulRedisConnection}.
      */
-    protected  Map<RedisClusterNode, ? extends StatefulRedisConnection<K, V>> statefulMap() {
+    protected Map<RedisClusterNode, CompletableFuture<? extends StatefulRedisConnection<K, V>>> statefulMap() {
         return nodes().stream().collect(Collectors.toMap(redisClusterNode -> redisClusterNode, this::getConnection));
     }
 
@@ -83,7 +85,8 @@ public API commands(int index) {
      * @param redisClusterNode must not be {@literal null}.
      * @return
      */
-    protected abstract StatefulRedisConnection<K, V> getConnection(RedisClusterNode redisClusterNode);
+    protected abstract CompletableFuture<? extends StatefulRedisConnection<K, V>> getConnection(
+            RedisClusterNode redisClusterNode);
 
     /**
      * Template method to be implemented by implementing classes to obtain a the API object given a {@link RedisClusterNode}.
@@ -91,7 +94,7 @@ public API commands(int index) {
      * @param redisClusterNode must not be {@literal null}.
      * @return
      */
-    protected  abstract API getApi(RedisClusterNode redisClusterNode);
+    protected abstract CompletableFuture<API> getApi(RedisClusterNode redisClusterNode);
 
     /**
      * @return List of involved nodes
diff --git a/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java b/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
index 4251080a77..de113199b0 100644
--- a/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package io.lettuce.core.cluster;
 
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -50,15 +51,17 @@ public DynamicNodeSelection(ClusterDistributionChannelWriter writer, Predicate<R
     }
 
     @Override
-    protected StatefulRedisConnection<K, V> getConnection(RedisClusterNode redisClusterNode) {
+    protected CompletableFuture<StatefulRedisConnection<K, V>> getConnection(RedisClusterNode redisClusterNode) {
 
         RedisURI uri = redisClusterNode.getUri();
-        return writer.getClusterConnectionProvider().getConnection(intent, uri.getHost(), uri.getPort());
+        AsyncClusterConnectionProvider async = (AsyncClusterConnectionProvider) writer.getClusterConnectionProvider();
+
+        return async.getConnectionAsync(intent, uri.getHost(), uri.getPort());
     }
 
     @Override
-    protected API getApi(RedisClusterNode redisClusterNode) {
-        return apiExtractor.apply(getConnection(redisClusterNode));
+    protected CompletableFuture<API> getApi(RedisClusterNode redisClusterNode) {
+        return getConnection(redisClusterNode).thenApply(apiExtractor);
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
index 1237cb2735..7da850f1a9 100644
--- a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,10 +44,10 @@ class NodeSelectionInvocationHandler extends AbstractInvocationHandler {
     private final Map<Method, Method> connectionMethod = new ConcurrentHashMap<>();
     private final Class<?> commandsInterface;
 
-    private AbstractNodeSelection<?, ?, ?, ?> selection;
-    private ExecutionModel executionModel;
-    private long timeout;
-    private TimeUnit unit;
+    private final AbstractNodeSelection<?, ?, ?, ?> selection;
+    private final ExecutionModel executionModel;
+    private final long timeout;
+    private final TimeUnit unit;
 
     static {
         try {
@@ -90,57 +90,89 @@ private NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selecti
     protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
 
         try {
+
+            if (method.getName().equals("commands") && args.length == 0) {
+                return proxy;
+            }
+
             Method targetMethod = findMethod(commandsInterface, method, connectionMethod);
 
-            Map<RedisClusterNode, StatefulRedisConnection<?, ?>> connections = new HashMap<>(selection.size(), 1);
+            if (targetMethod == null) {
+
+                Method nodeSelectionMethod = findMethod(NodeSelectionSupport.class, method, nodeSelectionMethods);
+                return nodeSelectionMethod.invoke(selection, args);
+            }
+
+            Map<RedisClusterNode, CompletableFuture<? extends StatefulRedisConnection<?, ?>>> connections = new LinkedHashMap<>(
+                    selection.size(), 1);
             connections.putAll(selection.statefulMap());
+            Map<RedisClusterNode, Object> executions = new LinkedHashMap<>(selection.size(), 1);
 
-            if (targetMethod != null) {
+            for (Map.Entry<RedisClusterNode, CompletableFuture<? extends StatefulRedisConnection<?, ?>>> entry : connections
+                    .entrySet()) {
 
-                Map<RedisClusterNode, Object> executions = new HashMap<>();
+                CompletableFuture<? extends StatefulRedisConnection<?, ?>> connection = entry.getValue();
 
-                for (Map.Entry<RedisClusterNode, StatefulRedisConnection<?, ?>> entry : connections.entrySet()) {
+                CompletableFuture<Object> result = connection.thenCompose(it -> {
 
-                    StatefulRedisConnection<?, ?> connection = entry.getValue();
-                    Object result = targetMethod.invoke(
-                            executionModel == ExecutionModel.REACTIVE ? connection.reactive() : connection.async(), args);
+                    try {
 
-                    executions.put(entry.getKey(), result);
-                }
+                        Object resultValue = targetMethod.invoke(
+                                executionModel == ExecutionModel.REACTIVE ? it.reactive() : it.async(), args);
 
-                if (executionModel == ExecutionModel.SYNC) {
+                        if (resultValue instanceof CompletionStage<?>) {
+                            return (CompletionStage<Object>) resultValue;
+                        }
 
-                    Map<RedisClusterNode, CompletionStage<?>> asyncExecutions = (Map) executions;
-                    if (!awaitAll(timeout, unit, asyncExecutions.values())) {
-                        throw createTimeoutException(asyncExecutions);
-                    }
+                        return CompletableFuture.completedFuture(resultValue);
+                    } catch (InvocationTargetException e) {
+
+                        CompletableFuture<Object> future = new CompletableFuture<>();
+                        future.completeExceptionally(e.getTargetException());
+                        return future;
+                    } catch (Exception e) {
 
-                    if (atLeastOneFailed(asyncExecutions)) {
-                        throw createExecutionException(asyncExecutions);
+                        CompletableFuture<Object> future = new CompletableFuture<>();
+                        future.completeExceptionally(e);
+                        return future;
                     }
+                });
 
-                    return new SyncExecutionsImpl(asyncExecutions);
-                }
+                executions.put(entry.getKey(), result);
+            }
 
-                if (executionModel == ExecutionModel.REACTIVE) {
-                    return new ReactiveExecutionsImpl(executions);
+            return getExecutions(executions);
+        } catch (InvocationTargetException e) {
+            throw e.getTargetException();
+        }
+    }
 
-                }
-                return new AsyncExecutionsImpl(executions);
+    @SuppressWarnings("unchecked")
+    private Object getExecutions(Map<RedisClusterNode, Object> executions) throws ExecutionException, InterruptedException {
+
+        if (executionModel == ExecutionModel.SYNC) {
+
+            Map<RedisClusterNode, CompletionStage<?>> asyncExecutions = (Map) executions;
+            if (!awaitAll(timeout, unit, asyncExecutions.values())) {
+                throw createTimeoutException(asyncExecutions);
             }
 
-            if (method.getName().equals("commands") && args.length == 0) {
-                return proxy;
+            if (atLeastOneFailed(asyncExecutions)) {
+                throw createExecutionException(asyncExecutions);
             }
 
-            targetMethod = findMethod(NodeSelectionSupport.class, method, nodeSelectionMethods);
-            return targetMethod.invoke(selection, args);
-        } catch (InvocationTargetException e) {
-            throw e.getTargetException();
+            return new SyncExecutionsImpl(asyncExecutions);
         }
+
+        if (executionModel == ExecutionModel.REACTIVE) {
+            return new ReactiveExecutionsImpl(executions);
+        }
+
+        return new AsyncExecutionsImpl(executions);
     }
 
-    public static boolean awaitAll(long timeout, TimeUnit unit, Collection<CompletionStage<?>> futures) {
+    private static boolean awaitAll(long timeout, TimeUnit unit, Collection<CompletionStage<?>> futures) {
+
         boolean complete;
 
         try {
@@ -177,17 +209,20 @@ private boolean atLeastOneFailed(Map<RedisClusterNode, CompletionStage<?>> execu
     }
 
     private RedisCommandTimeoutException createTimeoutException(Map<RedisClusterNode, CompletionStage<?>> executions) {
+
         List<RedisClusterNode> notFinished = new ArrayList<>();
         executions.forEach((redisClusterNode, completionStage) -> {
             if (!completionStage.toCompletableFuture().isDone()) {
                 notFinished.add(redisClusterNode);
             }
         });
+
         String description = getNodeDescription(notFinished);
         return new RedisCommandTimeoutException("Command timed out for node(s): " + description);
     }
 
     private RedisCommandExecutionException createExecutionException(Map<RedisClusterNode, CompletionStage<?>> executions) {
+
         List<RedisClusterNode> failed = new ArrayList<>();
         executions.forEach((redisClusterNode, completionStage) -> {
             if (!completionStage.toCompletableFuture().isCompletedExceptionally()) {
@@ -221,6 +256,7 @@ private String getNodeDescription(List<RedisClusterNode> notFinished) {
     }
 
     private String getDescriptor(RedisClusterNode redisClusterNode) {
+
         StringBuffer buffer = new StringBuffer(redisClusterNode.getNodeId());
         buffer.append(" (");
 
diff --git a/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
index 06faeddd1e..ad560765a6 100644
--- a/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,14 @@
 
 import java.util.Collection;
 import java.util.Map;
-
-import io.lettuce.core.cluster.api.reactive.ReactiveExecutions;
-import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import java.util.concurrent.CompletableFuture;
 
 import org.reactivestreams.Publisher;
+
 import reactor.core.publisher.Flux;
-import rx.Observable;
+import reactor.core.publisher.Mono;
+import io.lettuce.core.cluster.api.reactive.ReactiveExecutions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * Default implementation of {@link ReactiveExecutions}.
@@ -33,15 +34,16 @@
  */
 class ReactiveExecutionsImpl<T> implements ReactiveExecutions<T> {
 
-    private Map<RedisClusterNode, ? extends Publisher<T>> executions;
+    private Map<RedisClusterNode, CompletableFuture<? extends Publisher<T>>> executions;
 
-    public ReactiveExecutionsImpl(Map<RedisClusterNode, ? extends Publisher<T>> executions) {
+    public ReactiveExecutionsImpl(Map<RedisClusterNode, CompletableFuture<? extends Publisher<T>>> executions) {
         this.executions = executions;
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public Flux<T> flux() {
-        return Flux.merge(executions.values());
+        return Flux.fromIterable(executions.values()).flatMap(Mono::fromCompletionStage).flatMap(f -> f);
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
index ddb0d26e42..8fa9e34d87 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,8 @@
 import static io.lettuce.core.cluster.NodeSelectionInvocationHandler.ExecutionModel.ASYNC;
 
 import java.lang.reflect.Proxy;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -39,8 +38,8 @@
 /**
  * @author Mark Paluch
  */
-class RedisClusterPubSubAsyncCommandsImpl<K, V> extends RedisPubSubAsyncCommandsImpl<K, V>
-        implements RedisClusterPubSubAsyncCommands<K, V> {
+class RedisClusterPubSubAsyncCommandsImpl<K, V> extends RedisPubSubAsyncCommandsImpl<K, V> implements
+        RedisClusterPubSubAsyncCommands<K, V> {
 
     /**
      * Initialize a new connection.
@@ -69,9 +68,9 @@ public PubSubAsyncNodeSelection<K, V> nodes(Predicate<RedisClusterNode> predicat
                 new Class<?>[] { NodeSelectionPubSubAsyncCommands.class, PubSubAsyncNodeSelection.class }, h);
     }
 
-    private static class StaticPubSubAsyncNodeSelection<K, V>
-            extends AbstractNodeSelection<RedisPubSubAsyncCommands<K, V>, NodeSelectionPubSubAsyncCommands<K, V>, K, V>
-            implements PubSubAsyncNodeSelection<K, V> {
+    private static class StaticPubSubAsyncNodeSelection<K, V> extends
+            AbstractNodeSelection<RedisPubSubAsyncCommands<K, V>, NodeSelectionPubSubAsyncCommands<K, V>, K, V> implements
+            PubSubAsyncNodeSelection<K, V> {
 
         private final List<RedisClusterNode> redisClusterNodes;
         private final ClusterDistributionChannelWriter writer;
@@ -86,8 +85,8 @@ public StaticPubSubAsyncNodeSelection(StatefulRedisClusterPubSubConnection<K, V>
         }
 
         @Override
-        protected RedisPubSubAsyncCommands<K, V> getApi(RedisClusterNode redisClusterNode) {
-            return getConnection(redisClusterNode).async();
+        protected CompletableFuture<RedisPubSubAsyncCommands<K, V>> getApi(RedisClusterNode redisClusterNode) {
+            return getConnection(redisClusterNode).thenApply(StatefulRedisPubSubConnection::async);
         }
 
         protected List<RedisClusterNode> nodes() {
@@ -95,10 +94,13 @@ protected List<RedisClusterNode> nodes() {
         }
 
         @SuppressWarnings("unchecked")
-        protected StatefulRedisPubSubConnection<K, V> getConnection(RedisClusterNode redisClusterNode) {
+        protected CompletableFuture<StatefulRedisPubSubConnection<K, V>> getConnection(RedisClusterNode redisClusterNode) {
+
             RedisURI uri = redisClusterNode.getUri();
-            return (StatefulRedisPubSubConnection<K, V>) writer.getClusterConnectionProvider()
-                    .getConnection(ClusterConnectionProvider.Intent.WRITE, uri.getHost(), uri.getPort());
+            AsyncClusterConnectionProvider async = (AsyncClusterConnectionProvider) writer.getClusterConnectionProvider();
+
+            return async.getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, uri.getHost(), uri.getPort()).thenApply(
+                    it -> (StatefulRedisPubSubConnection<K, V>) it);
         }
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
index bc867c53b6..062f566ff7 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 
 import java.lang.reflect.Proxy;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -37,8 +38,8 @@
 /**
  * @author Mark Paluch
  */
-class RedisClusterPubSubReactiveCommandsImpl<K, V> extends RedisPubSubReactiveCommandsImpl<K, V>
-        implements RedisClusterPubSubReactiveCommands<K, V> {
+class RedisClusterPubSubReactiveCommandsImpl<K, V> extends RedisPubSubReactiveCommandsImpl<K, V> implements
+        RedisClusterPubSubReactiveCommands<K, V> {
 
     /**
      * Initialize a new connection.
@@ -46,8 +47,7 @@ class RedisClusterPubSubReactiveCommandsImpl<K, V> extends RedisPubSubReactiveCo
      * @param connection the connection .
      * @param codec Codec used to encode/decode keys and values.
      */
-    public RedisClusterPubSubReactiveCommandsImpl(StatefulRedisClusterPubSubConnection<K, V> connection,
-            RedisCodec<K, V> codec) {
+    public RedisClusterPubSubReactiveCommandsImpl(StatefulRedisClusterPubSubConnection<K, V> connection, RedisCodec<K, V> codec) {
         super(connection, codec);
     }
 
@@ -69,9 +69,9 @@ public PubSubReactiveNodeSelection<K, V> nodes(Predicate<RedisClusterNode> predi
                 new Class<?>[] { NodeSelectionPubSubReactiveCommands.class, PubSubReactiveNodeSelection.class }, h);
     }
 
-    private static class StaticPubSubReactiveNodeSelection<K, V>
-            extends AbstractNodeSelection<RedisPubSubReactiveCommands<K, V>, NodeSelectionPubSubReactiveCommands<K, V>, K, V>
-            implements PubSubReactiveNodeSelection<K, V> {
+    private static class StaticPubSubReactiveNodeSelection<K, V> extends
+            AbstractNodeSelection<RedisPubSubReactiveCommands<K, V>, NodeSelectionPubSubReactiveCommands<K, V>, K, V> implements
+            PubSubReactiveNodeSelection<K, V> {
 
         private final List<RedisClusterNode> redisClusterNodes;
         private final ClusterDistributionChannelWriter writer;
@@ -86,8 +86,8 @@ public StaticPubSubReactiveNodeSelection(StatefulRedisClusterPubSubConnection<K,
         }
 
         @Override
-        protected RedisPubSubReactiveCommands<K, V> getApi(RedisClusterNode redisClusterNode) {
-            return getConnection(redisClusterNode).reactive();
+        protected CompletableFuture<RedisPubSubReactiveCommands<K, V>> getApi(RedisClusterNode redisClusterNode) {
+            return getConnection(redisClusterNode).thenApply(StatefulRedisPubSubConnection::reactive);
         }
 
         protected List<RedisClusterNode> nodes() {
@@ -95,10 +95,13 @@ protected List<RedisClusterNode> nodes() {
         }
 
         @SuppressWarnings("unchecked")
-        protected StatefulRedisPubSubConnection<K, V> getConnection(RedisClusterNode redisClusterNode) {
+        protected CompletableFuture<StatefulRedisPubSubConnection<K, V>> getConnection(RedisClusterNode redisClusterNode) {
             RedisURI uri = redisClusterNode.getUri();
-            return (StatefulRedisPubSubConnection<K, V>) writer.getClusterConnectionProvider()
-                    .getConnection(ClusterConnectionProvider.Intent.WRITE, uri.getHost(), uri.getPort());
+
+            AsyncClusterConnectionProvider async = (AsyncClusterConnectionProvider) writer.getClusterConnectionProvider();
+
+            return async.getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, uri.getHost(), uri.getPort()).thenApply(
+                    it -> (StatefulRedisPubSubConnection<K, V>) it);
         }
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java b/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
index 7eab350943..f773da4d3d 100644
--- a/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package io.lettuce.core.cluster;
 
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -51,15 +52,17 @@ public StaticNodeSelection(ClusterDistributionChannelWriter writer, Predicate<Re
     }
 
     @Override
-    protected StatefulRedisConnection<K, V> getConnection(RedisClusterNode redisClusterNode) {
+    protected CompletableFuture<StatefulRedisConnection<K, V>> getConnection(RedisClusterNode redisClusterNode) {
 
         RedisURI uri = redisClusterNode.getUri();
-        return writer.getClusterConnectionProvider().getConnection(intent, uri.getHost(), uri.getPort());
+
+        AsyncClusterConnectionProvider async = (AsyncClusterConnectionProvider) writer.getClusterConnectionProvider();
+        return async.getConnectionAsync(intent, uri.getHost(), uri.getPort());
     }
 
     @Override
-    protected API getApi(RedisClusterNode redisClusterNode) {
-        return apiExtractor.apply(getConnection(redisClusterNode));
+    protected CompletableFuture<API> getApi(RedisClusterNode redisClusterNode) {
+        return getConnection(redisClusterNode).thenApply(apiExtractor);
     }
 
     @Override

From e1f831eaa763afbd22460c2e63044e2a7fdc2bce Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 27 Apr 2017 20:41:31 +0200
Subject: [PATCH 203/808] Upgrade AsyncExecutions to use CompletableFuture #522

---
 .../core/cluster/AsyncExecutionsImpl.java     | 21 ++++++++-------
 .../cluster/api/async/AsyncExecutions.java    | 27 ++++---------------
 2 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
index c215a6ae5d..816f47978b 100644
--- a/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
@@ -15,12 +15,8 @@
  */
 package io.lettuce.core.cluster;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
 
 import io.lettuce.core.cluster.api.async.AsyncExecutions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
@@ -30,29 +26,34 @@
  */
 class AsyncExecutionsImpl<T> implements AsyncExecutions<T> {
 
-    private Map<RedisClusterNode, CompletionStage<T>> executions;
+    private Map<RedisClusterNode, CompletableFuture<T>> executions;
 
-    public AsyncExecutionsImpl(Map<RedisClusterNode, CompletionStage<T>> executions) {
+    public AsyncExecutionsImpl(Map<RedisClusterNode, CompletableFuture<T>> executions) {
         this.executions = Collections.unmodifiableMap(new HashMap<>(executions));
     }
 
     @Override
-    public Map<RedisClusterNode, CompletionStage<T>> asMap() {
+    public Map<RedisClusterNode, CompletableFuture<T>> asMap() {
         return executions;
     }
 
+    @Override
+    public Iterator<CompletableFuture<T>> iterator() {
+        return asMap().values().iterator();
+    }
+
     @Override
     public Collection<RedisClusterNode> nodes() {
         return executions.keySet();
     }
 
     @Override
-    public CompletionStage<T> get(RedisClusterNode redisClusterNode) {
+    public CompletableFuture<T> get(RedisClusterNode redisClusterNode) {
         return executions.get(redisClusterNode);
     }
 
     @Override
-    @SuppressWarnings("rawtypes")
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     public CompletableFuture<T>[] futures() {
         return executions.values().toArray(new CompletableFuture[executions.size()]);
     }
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java b/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
index a2de1e25ce..942f8804dd 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
@@ -15,7 +15,8 @@
  */
 package io.lettuce.core.cluster.api.async;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.stream.Stream;
@@ -29,13 +30,13 @@
  * @author Mark Paluch
  * @since 4.0
  */
-public interface AsyncExecutions<T> extends Iterable<CompletionStage<T>> {
+public interface AsyncExecutions<T> extends Iterable<CompletableFuture<T>> {
 
     /**
      *
      * @return map between {@link RedisClusterNode} and the {@link CompletionStage}
      */
-    Map<RedisClusterNode, CompletionStage<T>> asMap();
+    Map<RedisClusterNode, CompletableFuture<T>> asMap();
 
     /**
      *
@@ -56,28 +57,10 @@ public interface AsyncExecutions<T> extends Iterable<CompletionStage<T>> {
      */
     CompletableFuture<T>[] futures();
 
-    /**
-     *
-     * @return iterator over the {@link CompletionStage}s
-     */
-    @Override
-    default Iterator<CompletionStage<T>> iterator() {
-        return asMap().values().iterator();
-    }
-
-    /**
-     *
-     * @return a {@code Spliterator} over the {@link CompletionStage CompletionStages} in this collection
-     */
-    @Override
-    default Spliterator<CompletionStage<T>> spliterator() {
-        return Spliterators.spliterator(iterator(), nodes().size(), 0);
-    }
-
     /**
      * @return a sequential {@code Stream} over the {@link CompletionStage CompletionStages} in this collection
      */
-    default Stream<CompletionStage<T>> stream() {
+    default Stream<CompletableFuture<T>> stream() {
         return StreamSupport.stream(spliterator(), false);
     }
 }

From c21952afc8a600ba558bd92d048f10aaa8acd2a7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 27 Apr 2017 20:43:37 +0200
Subject: [PATCH 204/808] Upgrade to Project Reactor 3.1.0.M1 #523

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ce5beb6ff1..f934bc3b94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>3.1.0.BUILD-SNAPSHOT</version>
+            <version>3.1.0.M1</version>
         </dependency>
 
         <!-- Netty -->

From 990aababcc196ee5cdf929a4a7758f100403fb22 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 27 Apr 2017 20:45:05 +0200
Subject: [PATCH 205/808] Upgrade to RxJava 1.2.10 #524

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f934bc3b94..b5ba00e05b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,7 +157,7 @@
         <dependency>
             <groupId>io.reactivex</groupId>
             <artifactId>rxjava</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.10</version>
             <optional>true</optional>
         </dependency>
 

From d9784a916a8844d8d1a368c0c9786f624b373ff9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 27 Apr 2017 20:45:46 +0200
Subject: [PATCH 206/808] Upgrade to RxJava2 2.0.9 #525

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b5ba00e05b..f47a27f0d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,7 +171,7 @@
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.9</version>
             <optional>true</optional>
         </dependency>
 

From eb78c4dc1414f0772818c193d1f079c8cee3a0e8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 27 Apr 2017 20:50:27 +0200
Subject: [PATCH 207/808] Switch jcl-over-slf4j dependency to test scope #526

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index f47a27f0d2..4438ac3114 100644
--- a/pom.xml
+++ b/pom.xml
@@ -296,6 +296,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
             <version>1.7.24</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>

From a6bac0ba7a7e96ac347b234d140c661fff8d01b6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 27 Apr 2017 21:22:54 +0200
Subject: [PATCH 208/808] Polishing

Replace Assert with LettuceAssert.
---
 .../java/io/lettuce/core/dynamic/RedisCommandFactory.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
index 42ddb92bd6..c276e3b99c 100644
--- a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
@@ -18,8 +18,6 @@
 import java.lang.reflect.Method;
 import java.util.*;
 
-import org.springframework.util.Assert;
-
 import io.lettuce.core.AbstractRedisReactiveCommands;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -49,7 +47,7 @@
  * analyze method declarations and derive from those factories to create and execute {@link RedisCommand}s.
  *
  * <h3>Example</h3> <code><pre>
-public interface MyRedisCommands {
+public interface MyRedisCommands extends Commands {
 
     String get(String key); // Synchronous Execution of GET
 
@@ -241,7 +239,7 @@ class CompositeCommandLookupStrategy implements ExecutableCommandLookupStrategy
                 reactive = (AbstractRedisReactiveCommands) ((StatefulRedisClusterConnection) connection).reactive();
             }
 
-            Assert.state(reactive != null, "Reactive commands is null");
+            LettuceAssert.isTrue(reactive != null, "Reactive commands is null");
 
             this.async = new AsyncExecutableCommandLookupStrategy(redisCodecs, commandOutputFactoryResolver, verifier,
                     (StatefulConnection) connection);

From e6b9144b386e8be59394946ada7af938b4e60512 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 28 Apr 2017 10:07:43 +0200
Subject: [PATCH 209/808] Prepare release

---
 Makefile         |   5 -
 RELEASE-NOTES.md | 543 ++++++++++++++---------------------------------
 2 files changed, 156 insertions(+), 392 deletions(-)

diff --git a/Makefile b/Makefile
index 3fd1942b51..eaa83913ba 100644
--- a/Makefile
+++ b/Makefile
@@ -380,8 +380,3 @@ release:
 	mvn release:perform -Psonatype-oss-release
 	ls target/checkout/target/*-bin.zip | xargs gpg -b -a
 	ls target/checkout/target/*-bin.tar.gz | xargs gpg -b -a
-	cd target/checkout && mvn site:site && mvn -o scm-publish:publish-scm -Dgithub.site.upload.skip=false
-
-apidocs:
-	mvn site:site
-	./apidocs.sh
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 24efea1a71..70b40ffc99 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,438 +1,207 @@
-lettuce 5.0.0 Beta 1 RELEASE NOTES
+Lettuce 5.0.0 M2 RELEASE NOTES
 ==================================
 
-This is a major release coming with several breaking changes and new interesting
-features. It's similar to the simultaneously released version 4.3.0 but 
-comes with major changes.
-
-Lettuce 5.0 removes deprecated interfaces RedisConnection and RedisAsyncConnection
-and their segregated interfaces in favor of StatefulRedisConnection and RedisCommands et al.
-
-This release removes dependencies to Guava. Lettuce requires only Netty and Project Reactor
-which brings us to the next change. The reactive API is based on Reactive Streams by using 
-Project Reactor types `Mono` and `Flux` instead of RxJava 1 and `Observable`.
-Existing users can convert `Mono` and `Flux` by using `rxjava-reactive-streams`.
-
-Finally, this release introduces the dynamic Redis Commands API. This programming
-model enables you to declare command methods and invoke commands to your needs and
-support Redis Modules without waiting for lettuce to support new commands.
-
-This beta/candidate release is to give you a chance to try out new features, 
-get feedback and improve for the final release.
-
-You will find the full change log at the end of this document.
-
-Thanks to all contributors that made lettuce 5.0.0 possible.
-
-lettuce 5.0.0 requires Java 8 and cannot be used with Java 6 or 7.
-
-
-Good bye, Guava
----------------
-
-Lettuce 5.0 no longer uses Google's Guava library. Guava was a good friend
-back in the Java 6-compatible days where `Future` synchronization and callbacks
-were no fun to use. That changed with Java 8 and `CompletableFuture`.
-
-Other uses like `HostAndPort` or `LoadingCache` could be either inlined or
-replaced by Java 8's Collection framework.
-
-
-Removal of deprecated interfaces and methods
---------------------------------------------
-
-This release removes deprecated interfaces `RedisConnection` and `RedisAsyncConnection`
-and their segregated interfaces in favor of `StatefulRedisConnection` and `RedisCommands`.
+This is the second milestone release for Lettuce 5.0. We made a few breaking changes in this release:
  
-You will notice slight differences when using that API. Transactional commands and 
-database selection are no longer available through the Redis Cluster API as the 
-old API was derived from the standalone API. `RedisCommands` and `RedisAsyncCommands`
-are no longer `Closeable`. Please use `commands.getStatefulConnection().close()` to 
-close a connection. This change removes ambiguity over closing the commands interface
-over closing the connection.
-
-
-Migration to Reactive Streams (Project Reactor)
------------------------------------------------
-
-Lettuce 4.0 introduced a reactive API based on RxJava 1 and `Observable`.
-This was the beginning of reactive Redis support. Lettuce used `Observable`
-all over the place as other reactive types like `Single` and `Completable` were
-still beta or in development.
-
-Since that time, a lot changed in the reactive space. RxJava 2 is still in the
-works towards a final release supporting Reactive Streams, while other composition
-libraries are already available and polish on sharp edges. This means, 
-it was just a matter of time that lettuce adopts Reactive Streams.
-
-This also means, no `null` values and usage of dedicated value types to express
-value multiplicity (`0|1` and `0|1|N`) on the API.
-
-With lettuce 5.0, the reactive API uses Project Reactor, `Mono` and `Flux`.
-
-**4.3 and earlier**
-
-```java
-Observable<Long> del(K... keys);
-
-Observable<K> keys(K pattern);
-
-Observable<V> mget(K... keys);
-
-```
-
-**5.0**
-
-```java
-Mono<Long> del(K... keys);
-
-Flux<K> keys(K pattern);
-
-Flux<KeyValue<K, V>> mget(K... keys);
-```
-
-Switching from RxJava 1 to Project Reactor use requires switching the library. Most
-operators use similar or even same names. If you're required to stick to RxJava 1,
-the use `rxjava-reactive-streams` to adopt reactive types (RxJava 1 <-> Reactive Streams).
-
-Migrating to Reactive Streams requires value wrapping to indicate absence of values.
-You will find differences in comparison to the previous API and to the sync/async API
-in cases where commands can return `null` values. Lettuce 5.0 comes with
-new `Value` types that are monads encapsulating a value (or their absence).
-
-See also: https://github.com/mp911de/lettuce/wiki/Reactive-API-%285.0%29
-
-
-Value, KeyValue, and other value types
---------------------------------------
-
-This release enhances existing value types and introduces new types
-to reduce `null` usage and facilitate functional programming. 
-
-Value types are based on `Value` and `KeyValue`/`ScoredValue` extend from there.
-Value is a wrapper type encapsulating a value or its absence. A `Value` can
-be created in different ways:
-
-```java
-Value<String> value = Value.from(Optional.of("hello"));
-
-Value<String> value = Value.fromNullable(null);
-
-Value<String> value = Value.just("hello");
-
-KeyValue<Long, String> value = KeyValue.from(1L, Optional.of("hello"));
+ 1. We moved the artifact coordinates from biz.paluch.redis:lettuce to io.lettuce:lettuce-core
+ 2. We relocated packages from biz.paluch.redis to io.lettuce.core. The migration path is
+    straight-forward by replacing the old package name in your imports with the new package name.
+ 3. No one (not even me) knew whether it was lettuce or Lettuce when mentioning the driver
+    on a website, mail or some documentation. We fixed that: Lettuce is now written with an uppercase L. 
+    We also have a beautiful logo and project website at https://lettuce.io.
+ 4. We removed some deprecated methods, see below for full details.
  
-KeyValue<String, String> value = KeyValue.just("key", "hello");
-```
+Besides the breaking changes, this release comes with 96 completed issues.
 
-It transforms to `Optional` and `Stream` to integrate with other 
-functional uses and allows value mapping.
+This release introduces a new reference guide that is shipped along the regular artifacts. The reference guide
+is bound to a particular version and does not change over time, such as the Wiki.
 
-```java
-Value.just("hello").stream().filter(…).count();
+Lettuce defaults to native transport (epoll) on Linux systems if the epoll dependency is available.
+You can disable this behavior by setting the system property `io.lettuce.core.epoll` to `false`.
 
-KeyValue.just("hello").optional().isPresent();
+Browse the docs at https://lettuce.io/core/snapshot/reference/.
 
-Value.from(Optional.of("hello")).map(s -> s + "-world").getValue();
 
-ScoredValue.just(42, "hello").mapScore(number -> number.doubleValue() * 3.14d).getScore();
-```
-
-You will also find that all public fields of value types are encapsulated with
-getters and these fields are no longer accessible.
-
-
-Dynamic Redis Commands API
+Command Interface Batching
 --------------------------
+Command interfaces support command batching to collect multiple commands in a batch queue and 
+flush the batch in a single write to the transport. Command batching executes commands in a 
+deferred nature. This means that at the time of invocation no result is available.
+ Batching can be only used with synchronous methods without a return value (void) or asynchronous 
+ methods returning a RedisFuture.
 
-The Redis Command Interface abstraction provides a dynamic way for typesafe Redis 
-command invocation. It allows you to declare an interface with command methods to 
-significantly reduce boilerplate code required to invoke a Redis command.
-
-Redis is a data store supporting over 190 documented commands and over 450 command permutations. 
-Command growth and keeping track with upcoming modules are challenging for client 
-developers and Redis user as there is no full command coverage for each module in a single Redis client.
+Command batching can be enabled on two levels:
 
-Invoking a custom command with lettuce several lines of code to define command structures
-pass in arguments and specify the return type.
+* On class level by annotating the command interface with @BatchSize. 
+  All methods participate in command batching.
+* On method level by adding CommandBatching to the arguments. 
+  Method participates selectively in command batching.
 
 ```java
-RedisCodec<String, String> codec = new StringCodec();
-RedisCommands<String, String> commands = ...
+@BatchSize(50)
+interface StringCommands extends Commands {
 
-String response = redis.dispatch(CommandType.SET, new StatusOutput<>(codec),
-                new CommandArgs<>(codec)
-                       .addKey(key)
-                       .addValue(value));
-```
+    void set(String key, String value);
 
-The central interface in lettuce Command Interface abstraction is `Commands`. 
-This interface acts primarily as a marker interface to help you to discover 
-interfaces that extend this one. You can declare your own command interfaces 
-and argument sequences where the command name is derived from the method name or 
-provided with `@Command`. Introduction of new commands does not require you 
-to wait for a new lettuce release but they can invoke commands through own declaration. 
-That interface could be also supporting different key and value types, depending on the use-case.
+    RedisFuture<String> get(String key);
 
-Commands are executed applying synchronization, asynchronous and in a reactive fashion, 
-depending on the method declaration.
-
-```java
-public interface MyRedisCommands extends Commands {
-
-    String get(String key); // Synchronous Execution of GET
-
-    @Command("GET")
-    byte[] getAsBytes(String key); // Synchronous Execution of GET returning data as byte array
-
-    @Command("SET") // synchronous execution applying a Timeout
-    String setSync(String key, String value, Timeout timeout);
-
-    Future<String> set(String key, String value); // asynchronous SET execution
-
-    @Command("SET")
-    Mono<String> setReactive(String key, String value); // reactive SET execution using SetArgs
-
-    @CommandNaming(split = DOT) // support for Redis Module command notation -> NR.RUN
-    double nrRun(String key, int... indexes);
+    RedisFuture<String> get(String key, CommandBatching batching);
 }
 
-RedisCommandFactory factory = new RedisCommandFactory(connection);
-
-MyRedisCommands commands = factory.getCommands(MyRedisCommands.class);
-
-String value = commands.get("key");
-```
-
-You get a whole lot new possibilities with Redis Command Interfaces. This release
-provides initial support. Future versions are likely to support RxJava 1/2 reactive
-types so RxJava 1 users have a migration path that allows using native types without
-further conversion.
-
-See also: https://github.com/mp911de/lettuce/wiki/Redis-Command-Interfaces
-
-
-Backoff/Delay strategies
-------------------------
-
-_Thanks to @jongyeol_
-
-When running cloud-based services with a multitude of services that use Redis,
-then network partitions impact Redis server connection heavily once 
-the partition ends. A network partition impacts all disconnected applications 
-at the same time and all nodes start reconnecting more or less at the same time.
-
-As soon as the partition ends, the majority of applications reconnect at the same time.
-Jitter backoff strategies leverage the impact as the time of reconnecting is randomized.
-
-Lettuce comes with various backoff implementations:
-
-* Equal Jitter
-* Full Jitter
-* Decorrelated Jitter
-
-These are configured in `ClientResources`:
-
-```java
-DefaultClientResources.builder()
-        .reconnectDelay(Delay.decorrelatedJitter())
-        .build();
-
-DefaultClientResources.builder()
-        .reconnectDelay(Delay.equalJitter())
-        .build();
-```
-
-See also: https://www.awsarchitectureblog.com/2015/03/backoff.html and
-https://github.com/mp911de/lettuce/wiki/Configuring-Client-resources
+StringCommands commands = …
 
+commands.set("key", "value"); // queued until 50 command invocations reached.
+                              // The 50th invocation flushes the queue.
 
-New API for Z...RANGE commands
--------------------------------
-
-Sorted Sets range commands come with a streamlined API regarding method overloads.
-Commands like `ZRANGEBYSCORE`, `ZRANGEBYLEX`, `ZREMRANGEBYLEX` and several others
-now declare methods accepting `Range` and `Limit` objects instead of an growing
-parameter list. The new `Range` allows score and value types applying the proper
-binary encoding.
-
-**4.2 and earlier**
-
-```java
-commands.zcount(key, 1.0, 3.0)
-
-commands.zrangebyscore(key, "-inf", "+inf")
-
-commands.zrangebyscoreWithScores(key, "[1.0", "(4.0")
-
-commands.zrangebyscoreWithScores(key, "-inf", "+inf", 2, 2)
-```
-
-**Since 4.3**
-
-```java
-commands.zcount(key, Range.create(1.0, 3.0));
-
-commands.zrangebyscore(key, Range.unbounded());
-
-commands.zrangebyscoreWithScores(key, Range.from(Boundary.including(1.0), Boundary.excluding(4.0));
-
-commands.zrangebyscoreWithScores(key, Range.unbounded(), Limit.create(2, 2));
+commands.get("key", CommandBatching.queue()); // invocation-level queueing control
+commands.get("key", CommandBatching.flush()); // invocation-level queueing control,
+                                              // flushes all queued commands
 ```
 
+Read more: https://github.com/lettuce-io/lettuce-core/wiki/Redis-Command-Interfaces#batch-execution
 
-Connection pooling deprecation
-------------------------------
-
-It took quite a while but 4.3 finally deprecates Lettuce's existing connection pooling
-support. That are in particular `RedisClient.pool(…)` and `RedisClient.asyncPool(…)`. 
-These methods are removed with lettuce 5.0.
+Asynchronous Connection Propagation
+-----------------------------------
 
-Connection pooling had very limited support and would require additional overloads
-that clutter the API to expose pooling for all supported connections.
-This release brings a replacement, that is customizable
-and does not pollute the API. `ConnectionPoolSupport` provides methods to
-create a connection pool accepting a factory method and pool configuration.
+Lettuce is inherently non-blocking, yet we synchronize in some places that causes blocking behavior. 
+Cluster node connections is one of these areas.
+Commands dispatched to a cluster node require a connection to be dispatched. We connected, waited until
+the connection is available and then we proceeded. This synchronization keeps threads busy.
 
-Returned connection objects are proxies that return the connection to its pool
-when calling `close()`. `StatefulConnection` implement `Closeable` to
-allow usage of try-with-resources.
+With this release, we are fully non-blocking. Cluster node connections are obtained now asynchronously and
+we use the connection state (via `CompletableFuture`) to asynchronously dispatch commands.
 
-```java
-GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
-        .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig());
+Asynchronous connection propagation solves a few issues such as netty deadlocks if cluster commands are
+sent within a future callback or in a reactive sequence.
 
 
-try(StatefulRedisConnection<String, String> connection = pool.borrowObject()) {
-    // Work
-}
-
-
-pool.close();
-```
-
-
-Redis Cluster topology refresh consensus
-----------------------------------------
-
-Cluster topology refreshing can lead in some cases (dynamic topology sources)
-to orphaning. This can happen if a cluster node is removed from the cluster and
-lettuce decides to accept the topology view of that removed node. Lettuce 
-gets stuck with that node and is not able to use the remaining cluster.
-
-This release introduces `PartitionsConsensus` strategies to determine the most
-appropriate topology view if multiple views are acquired. The strategy can be
-customized by overriding 
-`RedisClusterClient.determinePartitions(Partitions, Map<RedisURI, Partitions>)`.
-
-Lettuce defaults choosing the topology view with the majority of previously known
-cluster nodes. This helps lettuce to stick with the cluster that consists of the
-most nodes.
- 
-See also: https://github.com/mp911de/lettuce/issues/355
+Thanks to all contributors that made Lettuce 5.0.0 possible.
 
+Lettuce 5.0.0 requires Java 8 and cannot be used with Java 6 or 7.
 
-If you need any support, meet lettuce at:
+If you need any support, meet Lettuce at:
 
 * Google Group: https://groups.google.com/d/forum/lettuce-redis-client-users
-* Gitter: https://gitter.im/mp911de/lettuce
-* Github Issues: https://github.com/mp911de/lettuce/issues
+* Gitter: https://gitter.im/lettuce-io/Lobby
+* GitHub Issues: https://github.com/lettuce-io/lettuce-core/issues
+* Documentation: https://lettuce.io/docs/
 
 
 Commands
 --------
-* Add support for TOUCH command #270
-* Add support for variadic LPUSHX and RPUSHX #267
-* Provide a more conceise API for Sorted Set query operations using Range/Limit #363
-* Add support for ZREVRANGEBYLEX command #369 (Thanks to @christophstrobl)
-* Add support for SWAPDB #375
+* Adopt fixed GEODIST/GEOHASH behavior in tests #362
+* Support CLIENT and INFO commands for Redis Sentinel #415
+* Disable WAIT as Read-Only command #418
 
 Enhancements
 ------------
-* Remove deprecated interfaces and methods #156
-* Remove Google Guava usage #217
-* Add SocketOptions to ClientOptions #269
-* Add support for OpenSSL as SSL provider #249
-* Replacement support for connection pooling #264
-* Add ToByteBufEncoder and improved StringCodec #275
-* Allow configuration of a trust store password #292
-* Replace Guava Cache by ConcurrentHashMap #300
-* Eager initialization of API wrappers in stateful connections #302 (Thanks to @jongyeol)
-* Change MethodTranslator's loadfactor to 1.0 for sync APIs performance #305 (Thanks to @jongyeol)
-* Reattempt initially failed Sentinel connections in Master/Slave API #306
-* Decouple CommandHandler #317
-* Use TransactionResult for transaction results #320
-* Replace synchronized setters with volatile fields #326 (Thanks to @guperrot)
-* Add workaround for IPv6 parsing #332
-* Provide multi-key-routing for exists and unlink commands using Redis Cluster #334
-* Migrate lettuce reactive API to Reactive Streams #349
-* Provide Value types #350
-* Add ConnectionWatchdog as last handler #335
-* Provide Timer as part of ClientResources #354 (Thanks to @plokhotnyuk)
-* Add support for topology consensus #355
-* Use Limit in SortArgs #364
-* Add jitter backoff strategies for spreading reconnection timing #365 (Thanks to @jongyeol)
-* Add EVAL and EVALSHA to ReadOnlyCommands #366 (Thanks to @amilnarski)
-* Add support for ZADD INCR with ZAddArgs #367 (Thanks to @christophstrobl)
-* Accept double in ZStoreArgs.weights #368 (Thanks to @christophstrobl)
-* Consider role changes as trigger for update using MasterSlave connections #370
-* Provide a dynamic Redis Command API #371
-* Support lettuce parameter types #381
-* Expose Value.map methods #386 
+* Use MethodHandle.Lookup.findSpecial(…) for default method lookup #310
+* Use StringCodec from Utf8StringCodec #393
+* Add reactive wrapper converters for RxJava1 and 2 #383
+* Provide synchronous ScanIterator API #397
+* Support value ranges #384
+* Allow Pub/Sub subscriptions on a node selection within Redis Cluster #385
+* [BREAKING] Remove deprecated LettuceFutures.await method #388
+* [BREAKING] Remove ExperimentalByteArrayCodec and enhance ByteArrayCodec #389
+* Propagate backpressure to the transport channel #394
+* Default to epoll transport if available #402
+* Simplify NodeSelection implementation #408
+* [BREAKING] Remove addListener/removeListener methods from execution-specific Pub/Sub interfaces #412
+* [BREAKING] Remove close method from Redis Sentinel command interfaces #415
+* Allow setting client name with RedisURI #416
+* Extend RedisConnectionStateListener.onRedisConnected by adding SocketAddress #419
+* Decompose array parameters into single command arguments #421
+* Consider key/value type of parameter wrappers in codec resolution #423
+* Connect asynchronously in cluster topology refresh #424
+* Perform resilient Master/Slave topology refresh ping #424
+* Return ClusterClientOptions.Builder in socketOptions and sslOptions methods #425
+* Use ResolvableType for type resolution #426
+* Propagate cause if cluster topology refresh can't connect to any node #427
+* Propagate asynchronous connection initialization #429
+* Dynamic API: Support command batching #432
+* Reuse stale connections collection when closing stale connections #443
+* Add ReadFrom.SLAVE_PREFERRED #452
+* Share cluster node connection progress with request threads #453
+* Send collection of commands as batch through StatefulConnection and ChannelWriter #456
+* Use EnumSet to determine Read-Only commands #457
+* Encapsulate fields in Commands implementations and command builder #458
+* Refactor command creation and execution to ExecutableCommand creation #463
+* Use String-Codec for COMMAND #467
+* Create a static call chain in InvocationProxyFactory #468
+* Initialize RedisStateMachine.LongProcessor in static initializer #481 (Thanks to @hellyguo)
+* Add shutdownAsync to AbstractRedisClient #485 (Thanks to @jongyeol)
+* Propagate asynchronous connections to ClusterConnectionProvider #486 (@Thanks to @jeniok)
+* Resolve hostnames using netty's DNS resolver #498
+* Introduce NettyCustomizer API #499 (Thanks to @jongyeol)
+* Use asynchronous node connect in NodeSelection #500
+* Gracefully degrade to successfully connected Cluster read candidates #503 (Thanks to @eliotw)
+* Implement counting Deque #507 (Thanks to @CodingFabian)
+* Use ThreadLocalRandom instead of Random #510
+* Replace consumer completion List in CommandWrapper with Array #511
+* Consider ConnectionFuture state in ClusterDistributionChannelWriter #511
+* Replace first arg fields in CommandArgs with CommandArgsAccessor #511
+* Merge Command completion state fields to a single status field #511
+* Move command latency metrics to LatencyMeteredCommand #511
+* Close the connection when Redis protocol is corrupted #512 (Thanks to @jongyeol)
+* Allow setting the Redis password as char-array #513
+* Replace synchronized reconnect in ConnectionWatchdog with asynchronous connect #514
+* Improve cleanup of PauseDetector #516
+* Upgrade AsyncExecutions to use CompletableFuture #522
 
 Fixes
 -----
-* Fix JavaDoc for blocking list commands #272
-* Guard key parameters against null values #287
-* CommandArgs.ExperimentalByteArrayCodec fails to encode bulk string #288
-* Guard value parameters against null values #291 (Thanks to @christophstrobl)
-* Allow MasterSlave connection using Sentinel if some Sentinels are not available #304 (Thanks to @RahulBabbar)
-* Allow coordinated cross-slot execution using Iterable #303 (Thanks to @agodet)
-* Use at least 3 Threads when configuring default thread count #309
-* Replace own partition host and port only if the reported connection point is empty #312
-* Lettuce RedisClusterClient calls AUTH twice #313
-* CommandHandler notifications called out of order #315
-* Disable SYNC command #319
-* Record sent-time on command queueing #314 (Thanks to @HaloFour)
-* ASK bit not set on ASK redirection #321 (Thanks to @kaibaemon)
-* Check for isUnsubscribed() before calling subscriber methods #323 (Thanks to @vleushin)
-* Avoid timeouts for cancelling command #325 (Thanks to @jongyeol)
-* Guard command completion against exceptions #331
-* Store error at output-level when using NestedMultiOutput #328 (Thanks to @jongyeol)
-* Fix master and slave address parsing for IPv6 addresses #329 (Thanks to @maksimlikharev)
-* Fix srandmember return type from Set to List #330 (Thanks to @jongyeol)
-* Add synchronization to Partitions/Use read-view for consistent Partition usage during Partitions updates #333 (Thanks to @OutOfBrain)
-* Run cluster command redirects on event executor threads #340 (Thanks to @oklahomer)
-* Close connections in PooledClusterConnectionProvider on connection failures #343
-* Consider number of redirections instead of executions for cluster commands #344 (Thanks to @Spikhalskiy)
-* Ensure unique reconnect scheduling #346
-* Guard ConnectionWatchdog against NPE from missing CommandHandler #358
-* Fix RedisAdvancedClusterAsyncCommandsImpl.msetnx return value #376 (Thanks to @mjaow)
-* Allow hostnames in MasterSlaveTopologyProvider when parsing in master_host #377 (Thanks to @szabowexler)
-* Allow empty values in BITFIELD using the reactive API #378
-* Support integer width multiplied offsets in BITFIELD #379 (Thanks to @christophstrobl)
-* Propagate array sizes in MultiOutput #380 (Thanks to @christophstrobl)
+* Update code samples in readme to Lettuce 4.0 #410
+* Apply proxy wrapper to obtained pooled connections #411
+* Allow databases greater than 15 in RedisURI #420
+* Consider Wildcard types in type information and assignability #431
+* Expose a protected default constructor for RedisClusterClient #438
+* Ensure RoundRobinSocketAddressSupplier consistency before returning a SocketAddress #440
+* Fix Partitions.addPartition(…) and Partitions.reload(…) synchronization #442
+* Fix authenticated PING before connect with Redis Sentinel #448
+* Close connections in PooledClusterConnectionProvider.close() #460
+* Read connect future in ReconnectHandler to local variable #465
+* Apply command timeout to PING before connection activation #470
+* Synchronize ClientResources shutdown in client shutdown #475
+* Skip SO_KEEPALIVE and TCP_NODELAY options for Unix Domain Socket connections #476 (Thanks to @magdkudama)
+* Fix cummulative metrics collection #487 (Thanks to @ameenhere)
+* Stop LatencyStats on removal #517
+* Guard PauseDetectorWrapper initialization against absence of LatencyUtils #520
 
 Other
 ------
-* Improve test synchronization #216
-* Upgrade to stunnel 5.33 #290
-* Upgrade logging to log4j2 for tests #316
-* Upgrade to AssertJ 3.5.2 #352
-* Add test to verify behavior of GEODIST if a geoset is unknown #362
-* Update license/author headers #387
-* Upgrade to netty 4.0.42.Final/4.1.6.Final 390
-* Upgrade to Project Reactor 3.0.3 #395
-* Disable shaded jar #396
-
-
-lettuce requires a minimum of Java 8 to build and run. It is tested continuously
+* Upgrade to Java 9-compatible build #310
+* Mark NodeSelection API as stable #389
+* Document RedisClient and RedisClusterClient implementation hooks #392
+* Upgrade to netty 4.1.7 #436
+* Fix ClientResources usage in tests #445
+* Enable JMH tests on TravisCI #454
+* Create benchmarks for RedisClient, RedisClusterClient and ClusterDistributionChannelWriter #454
+* Use Reactor's StepVerifier in tests #455
+* Upgrade to TravisCI trusty #461
+* Upgrade to Mockito 2.7.5 #469
+* Improve JavaDoc #472
+* Upgrade dependencies #474
+* Switch optional dependencies from provided to optional #482
+* Use appropriate EventLoopGroup in SingleThreadedReactiveClusterClientTest #486
+* Update Netty version to 4.1.9 #489 (Thanks to @odiszapc)
+* Calculate first response metrics from sent time #491
+* [BREAKING] Move to lettuce.io #493
+* Create reference documentation #494
+* Switch to codecov #504
+* Upgrade to Reactor 3.1.0 SNAPSHOT #505
+* Upgrade integrations from mp911de/lettuce to lettuce-io/lettuce-core #506
+* Upgrade to Project Reactor 3.1.0.M1 #523
+* Upgrade to RxJava 1.2.10 #524
+* Upgrade to RxJava2 2.0.9 #525
+* Switch jcl-over-slf4j dependency to test scope #526
+
+Lettuce requires a minimum of Java 8 to build and run. It is tested continuously
 against the latest Redis source-build.
 
-If you need any support, meet lettuce at
+If you need any support, meet Lettuce at
 
 * Google Group: https://groups.google.com/d/forum/lettuce-redis-client-users
 or lettuce-redis-client-users@googlegroups.com
-* Join the chat at https://gitter.im/mp911de/lettuce
-* Github Issues: https://github.com/mp911de/lettuce/issues
-* Wiki: https://github.com/mp911de/lettuce/wiki
+* Join the chat at https://gitter.im/lettuce-io/Lobby
+* GitHub Issues: https://github.com/lettuce-io/lettuce-core/issues
+* Documentation: https://lettuce.io/docs/

From 820e2adb7a2abff3ff8b61193227fb956c9a27b0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 28 Apr 2017 10:53:21 +0200
Subject: [PATCH 210/808] Polishing

Improve JavaDoc.
---
 pom.xml                                       |  1 -
 .../core/api/reactive/package-info.java       |  2 +-
 .../core/cluster/RedisClusterClient.java      | 10 ++--
 .../cluster/api/reactive/package-info.java    |  2 +-
 .../StatefulRedisClusterPubSubConnection.java |  4 +-
 .../pubsub/api/async/package-info.java        |  5 ++
 .../pubsub/api/reactive/package-info.java     |  5 ++
 .../cluster/pubsub/api/sync/package-info.java |  5 ++
 .../core/cluster/pubsub/package-info.java     |  5 ++
 .../core/dynamic/RedisCommandFactory.java     | 58 ++++++++++---------
 .../core/dynamic/batch/package-info.java      |  5 ++
 .../core/dynamic/codec/package-info.java      |  5 ++
 .../lettuce/core/masterslave/MasterSlave.java | 18 +++---
 .../core/masterslave/package-info.java        | 15 +++++
 .../java/io/lettuce/core/package-info.java    |  2 +-
 .../io/lettuce/core/protocol/CommandArgs.java | 10 +---
 .../pubsub/api/reactive/package-info.java     |  2 +-
 .../sentinel/api/reactive/package-info.java   |  2 +-
 .../core/support/ConnectionPoolSupport.java   | 44 +++++++-------
 .../core/support/LettuceCdiExtension.java     | 33 +++++------
 src/main/javadoc/overview.html                |  2 +-
 21 files changed, 134 insertions(+), 101 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/cluster/pubsub/api/async/package-info.java
 create mode 100644 src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/package-info.java
 create mode 100644 src/main/java/io/lettuce/core/cluster/pubsub/api/sync/package-info.java
 create mode 100644 src/main/java/io/lettuce/core/cluster/pubsub/package-info.java
 create mode 100644 src/main/java/io/lettuce/core/dynamic/batch/package-info.java
 create mode 100644 src/main/java/io/lettuce/core/dynamic/codec/package-info.java

diff --git a/pom.xml b/pom.xml
index 4438ac3114..4853c985de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -762,7 +762,6 @@
                 </executions>
                 <configuration>
                     <level>public</level>
-                    <overview>src/javadoc/overview.html</overview>
                     <author>true</author>
                     <header>Lettuce</header>
                     <stylesheetfile>src/main/javadoc/stylesheet.css</stylesheetfile>
diff --git a/src/main/java/io/lettuce/core/api/reactive/package-info.java b/src/main/java/io/lettuce/core/api/reactive/package-info.java
index 695b9fd7ab..0aab03df8b 100644
--- a/src/main/java/io/lettuce/core/api/reactive/package-info.java
+++ b/src/main/java/io/lettuce/core/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
- * Standalone Redis API for commands executed in a reactive manner.
+ * Standalone Redis API for reactive command execution.
  */
 package io.lettuce.core.api.reactive;
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index f924b6a935..67606de5ef 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -53,7 +53,6 @@
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnectionImpl;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.SocketAddressResolver;
-
 import io.netty.util.concurrent.ScheduledFuture;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -115,11 +114,12 @@
  * Cluster commands can be issued to multiple hosts in parallel by using the {@link NodeSelectionSupport} API. A set of nodes is
  * selected using a {@link java.util.function.Predicate} and commands can be issued to the node selection
  *
- * <code><pre>
- * AsyncExecutions<String> ping = commands.masters().commands().ping();
- * Collection<RedisClusterNode> nodes = ping.nodes();
+ * <pre class="code">
+ * AsyncExecutions&lt;String&gt; ping = commands.masters().commands().ping();
+ * Collection&lt;RedisClusterNode&gt; nodes = ping.nodes();
  * nodes.stream().forEach(redisClusterNode -&gt; ping.get(redisClusterNode));
- * </pre></code>
+ * </pre>
+ *
  * </p>
  *
  * {@link RedisClusterClient} is an expensive resource. Reuse this instance or share external {@link ClientResources} as much as
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/package-info.java b/src/main/java/io/lettuce/core/cluster/api/reactive/package-info.java
index d24fca4350..70344a7387 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/package-info.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
- * Redis Cluster API for commands executed in a reactive manner.
+ * Redis Cluster API for reactive command execution.
  */
 package io.lettuce.core.cluster.api.reactive;
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
index 39771cca8a..e7979d316d 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
@@ -35,15 +35,13 @@
  * messages are broadcasted across the cluster and a client can connect to any arbitrary node to participate with a
  * subscription.
  *
- * <pre>
- *     <code>
+ * <pre class="code">
  *  StatefulRedisClusterPubSubConnection<String, String> connection = clusterClient.connectPubSub();
  *  connection.addListener(…);
  *
  *  RedisClusterPubSubCommands<String, String> sync = connection.sync();
  *  sync.subscribe("channel");
  *  sync.publish("channel", "message");
- *     </code>
  * </pre>
  *
  * <h3>Keyspace notifications</h3> Redis clients can subscribe to user-space Pub/Sub messages and Redis keyspace notifications.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/package-info.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/package-info.java
new file mode 100644
index 0000000000..f6267411e9
--- /dev/null
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Redis Cluster Pub/Sub API for asynchronous executed commands.
+ */
+package io.lettuce.core.cluster.pubsub.api.async;
+
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/package-info.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/package-info.java
new file mode 100644
index 0000000000..07677fe01b
--- /dev/null
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Redis Cluster Pub/Sub API for reactive command execution.
+ */
+package io.lettuce.core.cluster.pubsub.api.reactive;
+
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/package-info.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/package-info.java
new file mode 100644
index 0000000000..1f420acda0
--- /dev/null
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Redis Cluster Pub/Sub API for synchronous executed commands.
+ */
+package io.lettuce.core.cluster.pubsub.api.sync;
+
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/package-info.java b/src/main/java/io/lettuce/core/cluster/pubsub/package-info.java
new file mode 100644
index 0000000000..897d3f2252
--- /dev/null
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Redis Cluster Pub/Sub support.
+ */
+package io.lettuce.core.cluster.pubsub;
+
diff --git a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
index c276e3b99c..31a38a7008 100644
--- a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
@@ -46,33 +46,37 @@
  * interfaces provide a dynamic API that are declared in userland code. {@link RedisCommandFactory} and its supportive classes
  * analyze method declarations and derive from those factories to create and execute {@link RedisCommand}s.
  *
- * <h3>Example</h3> <code><pre>
-public interface MyRedisCommands extends Commands {
-
-    String get(String key); // Synchronous Execution of GET
-
-    &#64;Command("GET")
-    byte[] getAsBytes(String key); // Synchronous Execution of GET returning data as byte array
-
-    &#64;Command("SET") // synchronous execution applying a Timeout
-    String setSync(String key, String value, Timeout timeout);
-
-    Future<String> set(String key, String value); // asynchronous SET execution
-
-    &#64;Command("SET")
-    Mono<String> setReactive(String key, String value, SetArgs setArgs); // reactive SET execution using SetArgs
-
-    &#64;CommandNaming(split = DOT) // support for Redis Module command notation -> NR.RUN
-    double nrRun(String key, int... indexes);
-}
-
- RedisCommandFactory factory = new RedisCommandFactory(connection);
-
- MyRedisCommands commands = factory.getCommands(MyRedisCommands.class);
-
- String value = commands.get("key");
-
- * </pre></code>
+ * <h3>Example</h3>
+ *
+ * <pre class="code">
+ * public interface MyRedisCommands extends Commands {
+ *
+ *     String get(String key); // Synchronous Execution of GET
+ *
+ *     &#064;Command(&quot;GET&quot;)
+ *     byte[] getAsBytes(String key); // Synchronous Execution of GET returning data as byte array
+ *
+ *     &#064;Command(&quot;SET&quot;)
+ *     // synchronous execution applying a Timeout
+ *     String setSync(String key, String value, Timeout timeout);
+ *
+ *     Future&lt;String&gt; set(String key, String value); // asynchronous SET execution
+ *
+ *     &#064;Command(&quot;SET&quot;)
+ *     Mono&lt;String&gt; setReactive(String key, String value, SetArgs setArgs); // reactive SET execution using SetArgs
+ *
+ *     &#064;CommandNaming(split = DOT)
+ *     // support for Redis Module command notation -&gt; NR.RUN
+ *     double nrRun(String key, int... indexes);
+ * }
+ *
+ * RedisCommandFactory factory = new RedisCommandFactory(connection);
+ *
+ * MyRedisCommands commands = factory.getCommands(MyRedisCommands.class);
+ *
+ * String value = commands.get(&quot;key&quot;);
+ *
+ * </pre>
  *
  * @author Mark Paluch
  * @since 5.0
diff --git a/src/main/java/io/lettuce/core/dynamic/batch/package-info.java b/src/main/java/io/lettuce/core/dynamic/batch/package-info.java
new file mode 100644
index 0000000000..87e83e2f04
--- /dev/null
+++ b/src/main/java/io/lettuce/core/dynamic/batch/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Batching with Redis Command interfaces.
+ */
+package io.lettuce.core.dynamic.batch;
+
diff --git a/src/main/java/io/lettuce/core/dynamic/codec/package-info.java b/src/main/java/io/lettuce/core/dynamic/codec/package-info.java
new file mode 100644
index 0000000000..cf1743f4c9
--- /dev/null
+++ b/src/main/java/io/lettuce/core/dynamic/codec/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * {@link io.lettuce.core.codec.RedisCodec} resolution support.
+ */
+package io.lettuce.core.dynamic.codec;
+
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index 346df0bebe..be171bba67 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -26,7 +26,6 @@
 import io.lettuce.core.internal.LettuceLists;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
-
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -41,17 +40,14 @@
  *
  * Connections can be obtained by providing the {@link RedisClient}, a {@link RedisURI} and a {@link RedisCodec}.
  *
- * <pre>
- *  &#064;code
- *   RedisClient client = RedisClient.create();
- *   StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(client,
- *                                                                      RedisURI.create("redis://localhost"),
- *                                                                      new Utf8StringCodec());
- *   // ...
+ * <pre class="code">
+ * RedisClient client = RedisClient.create();
+ * StatefulRedisMasterSlaveConnection&lt;String, String&gt; connection = MasterSlave.connect(client,
+ *         RedisURI.create(&quot;redis://localhost&quot;), StringCodec.UTF8);
+ * // ...
  *
- *   connection.close();
- *   client.shutdown();
- *   }
+ * connection.close();
+ * client.shutdown();
  * </pre>
  *
  * </p>
diff --git a/src/main/java/io/lettuce/core/masterslave/package-info.java b/src/main/java/io/lettuce/core/masterslave/package-info.java
index 6af53bc1c8..8b70f6f791 100644
--- a/src/main/java/io/lettuce/core/masterslave/package-info.java
+++ b/src/main/java/io/lettuce/core/masterslave/package-info.java
@@ -1,5 +1,20 @@
 /**
  * Client support for Redis Master/Slave setups. {@link io.lettuce.core.masterslave.MasterSlave} supports self-managed,
  * Redis Sentinel-managed, AWS ElastiCache and Azure Redis managed Master/Slave setups.
+ *
+ * Connections can be obtained by providing the {@link io.lettuce.core.RedisClient}, a {@link io.lettuce.core.RedisURI} and a {@link io.lettuce.core.codec.RedisCodec}.
+ *
+ * <pre class="code">
+ *
+ *   RedisClient client = RedisClient.create();
+ *   StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(client,
+ *                                                                      RedisURI.create("redis://localhost"),
+ *                                                                      StringCodec.UTF8);
+ *   // ...
+ *
+ *   connection.close();
+ *   client.shutdown();
+ * </pre>
  */
 package io.lettuce.core.masterslave;
+
diff --git a/src/main/java/io/lettuce/core/package-info.java b/src/main/java/io/lettuce/core/package-info.java
index de06bc9552..ac406c557c 100644
--- a/src/main/java/io/lettuce/core/package-info.java
+++ b/src/main/java/io/lettuce/core/package-info.java
@@ -1,4 +1,4 @@
 /**
- * The redis client package containing {@link io.lettuce.core.RedisClient} for regular and sentinel operations.
+ * The Redis client package containing {@link io.lettuce.core.RedisClient} for Redis Standalone and Redis Sentinel operations.
  */
 package io.lettuce.core;
diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgs.java b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
index c7333f236f..a9791381a9 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandArgs.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
@@ -34,14 +34,10 @@
  * encoded using the {@link RedisCodec} to their byte representation. {@link CommandArgs} provides a fluent style of adding
  * multiple arguments. A {@link CommandArgs} instance can be reused across multiple commands and invocations.
  *
- * <p>
- * Usage
- * </p>
+ * <h3>Example</h3>
  *
- * <pre>
- *     <code>
- *         new CommandArgs<>(codec).addKey(key).addValue(value).add(CommandKeyword.FORCE);
- *     </code>
+ * <pre class="code">
+ * new CommandArgs&lt;&gt;(codec).addKey(key).addValue(value).add(CommandKeyword.FORCE);
  * </pre>
  *
  * @param <K> Key type.
diff --git a/src/main/java/io/lettuce/core/pubsub/api/reactive/package-info.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/package-info.java
index 874cc9e353..64d21261d9 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/reactive/package-info.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
- * Pub/Sub Redis API for commands executed in a reactive manner.
+ * Pub/Sub Redis API for reactive command execution.
  */
 package io.lettuce.core.pubsub.api.reactive;
diff --git a/src/main/java/io/lettuce/core/sentinel/api/reactive/package-info.java b/src/main/java/io/lettuce/core/sentinel/api/reactive/package-info.java
index b83bef6914..2d19a46424 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/reactive/package-info.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/reactive/package-info.java
@@ -1,4 +1,4 @@
 /**
- * Redis Sentinel API for commands executed in a reactive manner.
+ * Redis Sentinel API for reactive command execution.
  */
 package io.lettuce.core.sentinel.api.reactive;
diff --git a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
index 69c470d158..9630d8455a 100644
--- a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
+++ b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
@@ -57,13 +57,13 @@
  * Transactions and command batching affect connection state. Blocking commands won't propagate queued commands to Redis until
  * the blocking command is resolved.
  *
- * <h2>Example usage</h2>
+ * <h3>Example</h3>
  *
- * <pre>
+ * <pre class="code">
  * // application initialization
  * RedisClusterClient clusterClient = RedisClusterClient.create(RedisURI.create(host, port));
- * GenericObjectPool&lt;StatefulRedisClusterConnection&lt;String, String&gt;&gt; pool = ConnectionPoolSupport
- *         .createGenericObjectPool(() -&gt; clusterClient.connect(), new GenericObjectPoolConfig());
+ * GenericObjectPool&lt;StatefulRedisClusterConnection&lt;String, String&gt;&gt; pool = ConnectionPoolSupport.createGenericObjectPool(
+ *         () -&gt; clusterClient.connect(), new GenericObjectPoolConfig());
  *
  * // executing work
  * try (StatefulRedisClusterConnection&lt;String, String&gt; connection = pool.borrowObject()) {
@@ -285,23 +285,25 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
 
             try {
 
-                if (method.getName().equals("sync") || method.getName().equals("async")
-                        || method.getName().equals("reactive")) {
-                    return connectionProxies.computeIfAbsent(method, m -> {
-
-                        try {
-                            Object result = method.invoke(connection, args);
-
-                            result = Proxy.newProxyInstance(getClass().getClassLoader(), result.getClass().getInterfaces(),
-                                    new DelegateCloseToConnectionInvocationHandler((AutoCloseable) proxiedConnection, result));
-
-                            return result;
-                        } catch (IllegalAccessException e) {
-                            throw new RedisException(e);
-                        } catch (InvocationTargetException e) {
-                            throw new RedisException(e.getTargetException());
-                        }
-                    });
+                if (method.getName().equals("sync") || method.getName().equals("async") || method.getName().equals("reactive")) {
+                    return connectionProxies.computeIfAbsent(
+                            method,
+                            m -> {
+
+                                try {
+                                    Object result = method.invoke(connection, args);
+
+                                    result = Proxy.newProxyInstance(getClass().getClassLoader(), result.getClass()
+                                            .getInterfaces(), new DelegateCloseToConnectionInvocationHandler(
+                                            (AutoCloseable) proxiedConnection, result));
+
+                                    return result;
+                                } catch (IllegalAccessException e) {
+                                    throw new RedisException(e);
+                                } catch (InvocationTargetException e) {
+                                    throw new RedisException(e.getTargetException());
+                                }
+                            });
                 }
 
                 return method.invoke(connection, args);
diff --git a/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java b/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
index d49a0fed0f..1a9f43d338 100644
--- a/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
+++ b/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
@@ -18,8 +18,8 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.enterprise.event.Observes;
@@ -31,7 +31,6 @@
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.internal.LettuceSets;
 import io.lettuce.core.resource.ClientResources;
-
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -42,19 +41,16 @@
  * shared across multiple client instances (Standalone, Cluster) by providing a {@link ClientResources} bean with the same
  * qualifiers as the {@link RedisURI}.
  *
- * <p>
- * <strong>Example:</strong>
- * </p>
+ * <h3>Example</h3>
  *
- * <pre>
- * <code>
- *  public class Producers {
- *     &#64;Produces
+ * <pre class="code">
+ * public class Producers {
+ *     &#064;Produces
  *     public RedisURI redisURI() {
- *         return RedisURI.Builder.redis("localhost", 6379).build();
+ *         return RedisURI.Builder.redis(&quot;localhost&quot;, 6379).build();
  *     }
  *
- *     &#64;Produces
+ *     &#064;Produces
  *     public ClientResources clientResources() {
  *         return DefaultClientResources.create()
  *     }
@@ -63,20 +59,17 @@
  *         clientResources.shutdown().get();
  *     }
  * }
- * </code>
  * </pre>
  *
  *
- * <pre>
- *  <code>
- *   public class Consumer {
- *      &#64;Inject
- *      private RedisClient client;
+ * <pre class="code">
+ * public class Consumer {
+ *     &#064;Inject
+ *     private RedisClient client;
  *
- *      &#64;Inject
- *      private RedisClusterClient clusterClient;
+ *     &#064;Inject
+ *     private RedisClusterClient clusterClient;
  * }
- *  </code>
  * </pre>
  *
  * @author Mark Paluch
diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
index 69c4beeaac..63ea922fe1 100644
--- a/src/main/javadoc/overview.html
+++ b/src/main/javadoc/overview.html
@@ -1,5 +1,5 @@
 <body>
-<a href="http://github.com/mp911de/lettuce">lettuce</a> is a scalable thread-safe Java
+<a href="http://github.com/lettuce-io/lettuce-core">lettuce</a> is a scalable thread-safe Java
 {@link io.lettuce.core.RedisClient RedisClient} providing
 {@link io.lettuce.core.api.sync.RedisCommands synchronous},
 {@link io.lettuce.core.api.async.RedisAsyncCommands asynchronous} and

From 45c592ab9ac3f354549792fb2e1578d25ef6744c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 28 Apr 2017 19:22:08 +0200
Subject: [PATCH 211/808] Upgrade to Project Reactor 3.1.0.M1 #523

---
 pom.xml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4853c985de..fb4002ce18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,12 +59,9 @@
 
     <repositories>
         <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/libs-snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/libs-milestone</url>
         </repository>
     </repositories>
 
@@ -74,9 +71,6 @@
         <skipSigning>true</skipSigning>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
-        <github.site.upload.skip>true</github.site.upload.skip>
-        <lettuce-release-version>4.2.2.Final</lettuce-release-version>
-        <lettuce3-release-version>3.5.0.Final</lettuce3-release-version>
         <netty-version>4.1.9.Final</netty-version>
         <spring-version>4.3.6.RELEASE</spring-version>
     </properties>
@@ -232,7 +226,7 @@
         <dependency>
             <groupId>io.projectreactor.addons</groupId>
             <artifactId>reactor-test</artifactId>
-            <version>3.1.0.BUILD-SNAPSHOT</version>
+            <version>3.1.0.M1</version>
             <scope>test</scope>
         </dependency>
 

From 969f460ad2e64210635259669badd24c8c85643c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 28 Apr 2017 19:23:49 +0200
Subject: [PATCH 212/808] [maven-release-plugin] prepare release 5.0.0.M2

---
 pom.xml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index fb4002ce18..a917cf69c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -10,7 +9,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.0.0.BUILD-SNAPSHOT</version>
+    <version>5.0.0.M2</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -79,7 +78,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-        <tag>HEAD</tag>
+        <tag>5.0.0.M2</tag>
     </scm>
 
     <prerequisites>
@@ -521,7 +520,7 @@
                                     <arguments>
                                         <argument>-Xmx2G</argument>
                                         <argument>-classpath</argument>
-                                        <classpath/>
+                                        <classpath />
                                         <argument>org.openjdk.jmh.Main</argument>
                                         <argument>.*</argument>
                                         <argument>-tu</argument>
@@ -592,9 +591,7 @@
                                 <phase>process-resources</phase>
                                 <configuration>
                                     <target>
-                                        <copy failonerror="false"
-                                              file="${project.build.directory}/generated-docs/index.pdf"
-                                              tofile="target/site/reference/pdf/lettuce-reference.pdf"/>
+                                        <copy failonerror="false" file="${project.build.directory}/generated-docs/index.pdf" tofile="target/site/reference/pdf/lettuce-reference.pdf" />
                                     </target>
                                 </configuration>
                                 <goals>
@@ -677,9 +674,9 @@
                                     <toclevels>3</toclevels>
                                     <numbered>true</numbered>
                                     <ext-doc>https://raw.githubusercontent.com/wiki/mp911de/lettuce/</ext-doc>
-                                    <allow-uri-read></allow-uri-read>
-                                    <docinfo></docinfo>
-                                    <toc2></toc2>
+                                    <allow-uri-read />
+                                    <docinfo />
+                                    <toc2 />
                                     <icons>font</icons>
                                     <source-highlighter>coderay</source-highlighter>
                                 </attributes>

From 40b3eb1f3f34262a77e365cd7d42c723bdc49ed4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 28 Apr 2017 19:23:55 +0200
Subject: [PATCH 213/808] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a917cf69c3..f77c9936f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.0.0.M2</version>
+    <version>5.0.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -78,7 +78,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-        <tag>5.0.0.M2</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <prerequisites>

From 4edbaa8e4de2f1790331fe168eccb49cb0ef2fcc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 29 Apr 2017 12:49:24 +0200
Subject: [PATCH 214/808] Fix zset score parsing for infinite scores #528

Lettuce now parses positive and negative infinite scores correctly. Infinite scores are received as inf and -inf that require appropriate transformation instead of parsing the floating point value.

Previously parsing caused NumberFormatException.
---
 .../java/io/lettuce/core/LettuceStrings.java  | 26 +++++-
 .../core/output/ScoredValueListOutput.java    | 10 ++-
 .../core/output/ScoredValueScanOutput.java    |  5 +-
 .../ScoredValueScanStreamingOutput.java       |  5 +-
 .../output/ScoredValueStreamingOutput.java    |  5 +-
 .../core/commands/SortedSetCommandTest.java   | 88 +++++++++++++------
 6 files changed, 102 insertions(+), 37 deletions(-)

diff --git a/src/main/java/io/lettuce/core/LettuceStrings.java b/src/main/java/io/lettuce/core/LettuceStrings.java
index f0d7ce6902..a31a1fbfc5 100644
--- a/src/main/java/io/lettuce/core/LettuceStrings.java
+++ b/src/main/java/io/lettuce/core/LettuceStrings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,8 @@ public static boolean isNotEmpty(final CharSequence cs) {
     }
 
     /**
-     * Convert double to string. If double is infinite, returns positive/negative infinity {@code +inf} and {@code -inf}.
+     * Convert {@code double} to {@link String}. If {@code n} is infinite, returns positive/negative infinity {@code +inf} and
+     * {@code -inf}.
      *
      * @param n the double.
      * @return string representation of {@code n}
@@ -72,6 +73,27 @@ public static String string(double n) {
         return Double.toString(n);
     }
 
+    /**
+     * Convert {@link String} to {@code double}. If {@code s} is {@literal +inf}/{@literal -inf}, returns positive/negative
+     * infinity.
+     *
+     * @param s string representation of the number
+     * @return the {@code double} value.
+     * @since 4.3.3
+     */
+    public static double toDouble(String s) {
+
+        if ("+inf".equals(s) || "inf".equals(s)) {
+            return Double.POSITIVE_INFINITY;
+        }
+
+        if ("-inf".equals(s)) {
+            return Double.NEGATIVE_INFINITY;
+        }
+
+        return Double.parseDouble(s);
+    }
+
     /**
      * Create SHA1 digest from Lua script.
      *
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
index 6a79169eb5..478d956858 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import io.lettuce.core.LettuceStrings;
 import io.lettuce.core.ScoredValue;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.internal.LettuceAssert;
@@ -30,8 +31,9 @@
  * @param <V> Value type.
  * @author Will Glozer
  */
-public class ScoredValueListOutput<K, V> extends CommandOutput<K, V, List<ScoredValue<V>>>
-        implements StreamingOutput<ScoredValue<V>> {
+public class ScoredValueListOutput<K, V> extends CommandOutput<K, V, List<ScoredValue<V>>> implements
+        StreamingOutput<ScoredValue<V>> {
+
     private V value;
     private Subscriber<ScoredValue<V>> subscriber;
 
@@ -47,7 +49,7 @@ public void set(ByteBuffer bytes) {
             return;
         }
 
-        double score = Double.parseDouble(decodeAscii(bytes));
+        double score = LettuceStrings.toDouble(decodeAscii(bytes));
         subscriber.onNext(ScoredValue.fromNullable(score, value));
         value = null;
     }
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
index 8a2fc35713..73bdd218fc 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import java.nio.ByteBuffer;
 
+import io.lettuce.core.LettuceStrings;
 import io.lettuce.core.ScoredValue;
 import io.lettuce.core.ScoredValueScanCursor;
 import io.lettuce.core.codec.RedisCodec;
@@ -44,7 +45,7 @@ protected void setOutput(ByteBuffer bytes) {
             return;
         }
 
-        double score = Double.parseDouble(decodeAscii(bytes));
+        double score = LettuceStrings.toDouble(decodeAscii(bytes));
         output.getValues().add(ScoredValue.fromNullable(score, value));
         value = null;
     }
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
index a923e72797..5015578ae3 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import java.nio.ByteBuffer;
 
+import io.lettuce.core.LettuceStrings;
 import io.lettuce.core.ScoredValue;
 import io.lettuce.core.StreamScanCursor;
 import io.lettuce.core.codec.RedisCodec;
@@ -45,7 +46,7 @@ protected void setOutput(ByteBuffer bytes) {
             return;
         }
 
-        double score = Double.parseDouble(decodeAscii(bytes));
+        double score = LettuceStrings.toDouble(decodeAscii(bytes));
         channel.onValue(ScoredValue.fromNullable(score, value));
         value = null;
         output.setCount(output.getCount() + 1);
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
index debda979ca..e431d61d4b 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import java.nio.ByteBuffer;
 
+import io.lettuce.core.LettuceStrings;
 import io.lettuce.core.ScoredValue;
 import io.lettuce.core.codec.RedisCodec;
 
@@ -44,7 +45,7 @@ public void set(ByteBuffer bytes) {
             return;
         }
 
-        double score = Double.parseDouble(decodeAscii(bytes));
+        double score = LettuceStrings.toDouble(decodeAscii(bytes));
         channel.onValue(ScoredValue.fromNullable(score, value));
         value = null;
         output = output.longValue() + 1;
diff --git a/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java b/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
index 55eeef5949..ceae0f08ca 100644
--- a/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.commands;
 
+import static io.lettuce.core.Range.Boundary.including;
 import static io.lettuce.core.ZStoreArgs.Builder.max;
 import static io.lettuce.core.ZStoreArgs.Builder.min;
 import static io.lettuce.core.ZStoreArgs.Builder.sum;
@@ -146,7 +147,7 @@ public void zcount() throws Exception {
         assertThat(redis.zcount(key, Range.create(1.0, 2.0))).isEqualTo(2);
         assertThat(redis.zcount(key, Range.create(NEGATIVE_INFINITY, POSITIVE_INFINITY))).isEqualTo(3);
 
-        assertThat(redis.zcount(key, Range.from(Boundary.excluding(1.0), Boundary.including(3.0)))).isEqualTo(2);
+        assertThat(redis.zcount(key, Range.from(Boundary.excluding(1.0), including(3.0)))).isEqualTo(2);
         assertThat(redis.zcount(key, Range.unbounded())).isEqualTo(3);
     }
 
@@ -219,7 +220,8 @@ public void zrangebyscore() throws Exception {
         assertThat(redis.zrangebyscore(key, "-inf", "+inf", 2, 2)).isEqualTo(list("c", "d"));
 
         assertThat(redis.zrangebyscore(key, Range.create(2.0, 3.0))).isEqualTo(list("b", "c"));
-        assertThat(redis.zrangebyscore(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(list("b", "c"));
+        assertThat(redis.zrangebyscore(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(
+                list("b", "c"));
         assertThat(redis.zrangebyscore(key, Range.unbounded())).isEqualTo(list("a", "b", "c", "d"));
         assertThat(redis.zrangebyscore(key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(list("b", "c", "d"));
         assertThat(redis.zrangebyscore(key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(list("c", "d"));
@@ -239,7 +241,8 @@ public void zrangebyscoreStreaming() throws Exception {
         assertThat(redis.zrangebyscore(streamingAdapter, key, "-inf", "+inf", 2, 2)).isEqualTo(2);
 
         assertThat(redis.zrangebyscore(streamingAdapter, key, Range.create(2.0, 3.0))).isEqualTo(2);
-        assertThat(redis.zrangebyscore(streamingAdapter, key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(2);
+        assertThat(redis.zrangebyscore(streamingAdapter, key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0))))
+                .isEqualTo(2);
         assertThat(redis.zrangebyscore(streamingAdapter, key, Range.unbounded())).isEqualTo(4);
         assertThat(redis.zrangebyscore(streamingAdapter, key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(3);
         assertThat(redis.zrangebyscore(streamingAdapter, key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(2);
@@ -262,12 +265,30 @@ public void zrangebyscoreWithScores() throws Exception {
         assertThat(redis.zrangebyscoreWithScores(key, "-inf", "+inf", 2, 2)).isEqualTo(svlist(sv(3.0, "c"), sv(4.0, "d")));
 
         assertThat(redis.zrangebyscoreWithScores(key, Range.create(2.0, 3.0))).isEqualTo(svlist(sv(2.0, "b"), sv(3.0, "c")));
-        assertThat(redis.zrangebyscoreWithScores(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(svlist(sv(2.0, "b"), sv(3.0, "c")));
+        assertThat(redis.zrangebyscoreWithScores(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(
+                svlist(sv(2.0, "b"), sv(3.0, "c")));
         assertThat(redis.zrangebyscoreWithScores(key, Range.unbounded())).isEqualTo(
                 svlist(sv(1.0, "a"), sv(2.0, "b"), sv(3.0, "c"), sv(4.0, "d")));
         assertThat(redis.zrangebyscoreWithScores(key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(
                 svlist(sv(2.0, "b"), sv(3.0, "c"), sv(4.0, "d")));
-        assertThat(redis.zrangebyscoreWithScores(key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(svlist(sv(3.0, "c"), sv(4.0, "d")));
+        assertThat(redis.zrangebyscoreWithScores(key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(
+                svlist(sv(3.0, "c"), sv(4.0, "d")));
+    }
+
+    @Test
+    @SuppressWarnings({ "unchecked" })
+    public void zrangebyscoreWithScoresInfinity() throws Exception {
+
+        redis.zadd(key, Double.POSITIVE_INFINITY, "a", Double.NEGATIVE_INFINITY, "b");
+
+        assertThat(redis.zrangebyscoreWithScores(key, "-inf", "+inf")).hasSize(2);
+
+        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
+
+        Range<Double> range = Range.from(including(Double.NEGATIVE_INFINITY), including(Double.POSITIVE_INFINITY));
+        redis.zrangebyscoreWithScores(streamingAdapter, key, range);
+
+        assertThat(streamingAdapter.getList()).hasSize(2);
     }
 
     @Test
@@ -284,11 +305,14 @@ public void zrangebyscoreWithScoresStreaming() throws Exception {
         assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key, 0.0, 4.0, 1, 3).longValue()).isEqualTo(3);
         assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key, "-inf", "+inf", 2, 2).longValue()).isEqualTo(2);
 
-        assertThat(redis.zrangebyscoreWithScores(streamingAdapter,key, Range.create(2.0, 3.0))).isEqualTo(2);
-        assertThat(redis.zrangebyscoreWithScores(streamingAdapter,key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(2);
-        assertThat(redis.zrangebyscoreWithScores(streamingAdapter,key, Range.unbounded())).isEqualTo(4);
-        assertThat(redis.zrangebyscoreWithScores(streamingAdapter,key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(3);
-        assertThat(redis.zrangebyscoreWithScores(streamingAdapter,key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(2);
+        assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key, Range.create(2.0, 3.0))).isEqualTo(2);
+        assertThat(
+                redis.zrangebyscoreWithScores(streamingAdapter, key,
+                        Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(2);
+        assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key, Range.unbounded())).isEqualTo(4);
+        assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(
+                3);
+        assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(2);
 
     }
 
@@ -380,8 +404,9 @@ public void zrevrangebylex() throws Exception {
 
         assertThat(redis.zrevrangebylex(key, Range.unbounded())).hasSize(100);
         assertThat(redis.zrevrangebylex(key, Range.create("value", "zzz"))).hasSize(100);
-        assertThat(redis.zrevrangebylex(key, Range.from(Boundary.including("value98"), Boundary.including("value99")))).containsSequence("value99", "value98");
-        assertThat(redis.zrevrangebylex(key, Range.from(Boundary.including("value99"), Boundary.unbounded()))).hasSize(1);
+        assertThat(redis.zrevrangebylex(key, Range.from(including("value98"), including("value99")))).containsSequence(
+                "value99", "value98");
+        assertThat(redis.zrevrangebylex(key, Range.from(including("value99"), Boundary.unbounded()))).hasSize(1);
         assertThat(redis.zrevrangebylex(key, Range.from(Boundary.excluding("value99"), Boundary.unbounded()))).hasSize(0);
     }
 
@@ -398,7 +423,8 @@ public void zrevrangebyscore() throws Exception {
         assertThat(redis.zrevrangebyscore(key, "+inf", "-inf", 2, 2)).isEqualTo(list("b", "a"));
 
         assertThat(redis.zrevrangebyscore(key, Range.create(2.0, 3.0))).isEqualTo(list("c", "b"));
-        assertThat(redis.zrevrangebyscore(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(list("c", "b"));
+        assertThat(redis.zrevrangebyscore(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(
+                list("c", "b"));
         assertThat(redis.zrevrangebyscore(key, Range.unbounded())).isEqualTo(list("d", "c", "b", "a"));
         assertThat(redis.zrevrangebyscore(key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(list("c", "b", "a"));
         assertThat(redis.zrevrangebyscore(key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(list("b", "a"));
@@ -420,12 +446,14 @@ public void zrevrangebyscoreWithScores() throws Exception {
         assertThat(redis.zrevrangebyscoreWithScores(key, "+inf", "-inf", 2, 2)).isEqualTo(svlist(sv(2.0, "b"), sv(1.0, "a")));
 
         assertThat(redis.zrevrangebyscoreWithScores(key, Range.create(2.0, 3.0))).isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b")));
-        assertThat(redis.zrevrangebyscoreWithScores(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b")));
+        assertThat(redis.zrevrangebyscoreWithScores(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0))))
+                .isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b")));
         assertThat(redis.zrevrangebyscoreWithScores(key, Range.unbounded())).isEqualTo(
                 svlist(sv(4.0, "d"), sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
         assertThat(redis.zrevrangebyscoreWithScores(key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(
                 svlist(sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
-        assertThat(redis.zrevrangebyscoreWithScores(key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(svlist(sv(2.0, "b"), sv(1.0, "a")));
+        assertThat(redis.zrevrangebyscoreWithScores(key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(
+                svlist(sv(2.0, "b"), sv(1.0, "a")));
     }
 
     @Test
@@ -442,10 +470,14 @@ public void zrevrangebyscoreStreaming() throws Exception {
         assertThat(redis.zrevrangebyscore(streamingAdapter, key, "+inf", "-inf", 2, 2).longValue()).isEqualTo(2);
 
         assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.create(2.0, 3.0)).longValue()).isEqualTo(2);
-        assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0))).longValue()).isEqualTo(2);
+        assertThat(
+                redis.zrevrangebyscore(streamingAdapter, key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))
+                        .longValue()).isEqualTo(2);
         assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.unbounded()).longValue()).isEqualTo(4);
-        assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.create(0.0, 4.0), Limit.create(1, 3)).longValue()).isEqualTo(3);
-        assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.unbounded(), Limit.create(2, 2)).longValue()).isEqualTo(2);
+        assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.create(0.0, 4.0), Limit.create(1, 3)).longValue())
+                .isEqualTo(3);
+        assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.unbounded(), Limit.create(2, 2)).longValue()).isEqualTo(
+                2);
     }
 
     @Test
@@ -463,10 +495,15 @@ public void zrevrangebyscoreWithScoresStreaming() throws Exception {
         assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, "+inf", "-inf", 2, 2)).isEqualTo(2);
 
         assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, Range.create(2.0, 3.0)).longValue()).isEqualTo(2);
-        assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0))).longValue()).isEqualTo(2);
+        assertThat(
+                redis.zrevrangebyscoreWithScores(streamingAdapter, key,
+                        Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0))).longValue()).isEqualTo(2);
         assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, Range.unbounded()).longValue()).isEqualTo(4);
-        assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, Range.create(0.0, 4.0), Limit.create(1, 3)).longValue()).isEqualTo(3);
-        assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, Range.unbounded(), Limit.create(2, 2)).longValue()).isEqualTo(2);
+        assertThat(
+                redis.zrevrangebyscoreWithScores(streamingAdapter, key, Range.create(0.0, 4.0), Limit.create(1, 3)).longValue())
+                .isEqualTo(3);
+        assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, Range.unbounded(), Limit.create(2, 2)).longValue())
+                .isEqualTo(2);
     }
 
     @Test
@@ -656,7 +693,7 @@ public void zlexcount() throws Exception {
 
         assertThat(redis.zlexcount(key, Range.unbounded())).isEqualTo(100);
         assertThat(redis.zlexcount(key, Range.create("value", "zzz"))).isEqualTo(100);
-        assertThat(redis.zlexcount(key, Range.from(Boundary.including("value99"), Boundary.unbounded()))).isEqualTo(1);
+        assertThat(redis.zlexcount(key, Range.from(including("value99"), Boundary.unbounded()))).isEqualTo(1);
         assertThat(redis.zlexcount(key, Range.from(Boundary.excluding("value99"), Boundary.unbounded()))).isEqualTo(0);
     }
 
@@ -669,8 +706,9 @@ public void zrangebylex() throws Exception {
 
         assertThat(redis.zrangebylex(key, Range.unbounded())).hasSize(100);
         assertThat(redis.zrangebylex(key, Range.create("value", "zzz"))).hasSize(100);
-        assertThat(redis.zrangebylex(key, Range.from(Boundary.including("value98"), Boundary.including("value99")))).containsSequence("value98", "value99");
-        assertThat(redis.zrangebylex(key, Range.from(Boundary.including("value99"), Boundary.unbounded()))).hasSize(1);
+        assertThat(redis.zrangebylex(key, Range.from(including("value98"), including("value99")))).containsSequence("value98",
+                "value99");
+        assertThat(redis.zrangebylex(key, Range.from(including("value99"), Boundary.unbounded()))).hasSize(1);
         assertThat(redis.zrangebylex(key, Range.from(Boundary.excluding("value99"), Boundary.unbounded()))).hasSize(0);
     }
 

From 53bc0f19a0efed949f7a5157ef9e95d2f0c80cd0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 29 Apr 2017 21:06:46 +0200
Subject: [PATCH 215/808] Guard flakey tests

---
 .../cluster/AdvancedClusterReactiveTest.java  | 63 ++++++++++---------
 .../cluster/pubsub/PubSubClusterTest.java     |  2 -
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
index 6f0c8616bc..3322131443 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
@@ -28,7 +28,6 @@
 
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
-
 import io.lettuce.KeysAndValues;
 import io.lettuce.core.*;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -39,7 +38,6 @@
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.util.ReactiveSyncInvocationHandler;
-
 import io.netty.util.internal.ConcurrentSet;
 
 /**
@@ -54,29 +52,29 @@ public class AdvancedClusterReactiveTest extends AbstractClusterTest {
     private RedisCommands<String, String> syncCommands;
 
     @Before
-    public void before() throws Exception {
+    public void before() {
         commands = clusterClient.connect().reactive();
         syncCommands = ReactiveSyncInvocationHandler.sync(commands.getStatefulConnection());
     }
 
     @After
-    public void after() throws Exception {
+    public void after() {
         commands.getStatefulConnection().close();
     }
 
     @Test(expected = RedisException.class)
-    public void unknownNodeId() throws Exception {
+    public void unknownNodeId() {
 
         commands.getConnection("unknown");
     }
 
     @Test(expected = RedisException.class)
-    public void invalidHost() throws Exception {
+    public void invalidHost() {
         commands.getConnection("invalid-host", -1);
     }
 
     @Test
-    public void msetCrossSlot() throws Exception {
+    public void msetCrossSlot() {
 
         StepVerifier.create(commands.mset(KeysAndValues.MAP)).expectNext("OK").verifyComplete();
 
@@ -87,7 +85,7 @@ public void msetCrossSlot() throws Exception {
     }
 
     @Test
-    public void msetnxCrossSlot() throws Exception {
+    public void msetnxCrossSlot() {
 
         Map<String, String> mset = prepareMset();
 
@@ -104,7 +102,7 @@ public void msetnxCrossSlot() throws Exception {
     }
 
     @Test
-    public void mgetCrossSlot() throws Exception {
+    public void mgetCrossSlot() {
 
         msetCrossSlot();
 
@@ -119,7 +117,7 @@ public void mgetCrossSlot() throws Exception {
     }
 
     @Test
-    public void mgetCrossSlotStreaming() throws Exception {
+    public void mgetCrossSlotStreaming() {
 
         msetCrossSlot();
 
@@ -130,7 +128,7 @@ public void mgetCrossSlotStreaming() throws Exception {
     }
 
     @Test
-    public void delCrossSlot() throws Exception {
+    public void delCrossSlot() {
 
         msetCrossSlot();
 
@@ -144,7 +142,7 @@ public void delCrossSlot() throws Exception {
     }
 
     @Test
-    public void unlinkCrossSlot() throws Exception {
+    public void unlinkCrossSlot() {
 
         msetCrossSlot();
 
@@ -158,7 +156,7 @@ public void unlinkCrossSlot() throws Exception {
     }
 
     @Test
-    public void clientSetname() throws Exception {
+    public void clientSetname() {
 
         String name = "test-cluster-client";
 
@@ -174,12 +172,21 @@ public void clientSetname() throws Exception {
     }
 
     @Test
-    public void clientSetnameRunOnError() throws Exception {
-        StepVerifier.create(commands.clientSetname("not allowed")).expectError().verify();
+    public void clientSetnameRunOnError() {
+
+        try {
+            StepVerifier.create(commands.clientSetname("not allowed")).expectError().verify();
+        } catch (RuntimeException e) {
+
+            // sometimes reactor.core.Exceptions$CancelException: The subscriber has denied dispatching happens
+            if (!e.getClass().getSimpleName().contains("CancelException")) {
+                throw e;
+            }
+        }
     }
 
     @Test
-    public void dbSize() throws Exception {
+    public void dbSize() {
 
         writeKeysToTwoNodes();
 
@@ -187,7 +194,7 @@ public void dbSize() throws Exception {
     }
 
     @Test
-    public void flushall() throws Exception {
+    public void flushall() {
 
         writeKeysToTwoNodes();
 
@@ -198,7 +205,7 @@ public void flushall() throws Exception {
     }
 
     @Test
-    public void flushdb() throws Exception {
+    public void flushdb() {
 
         writeKeysToTwoNodes();
 
@@ -209,7 +216,7 @@ public void flushdb() throws Exception {
     }
 
     @Test
-    public void keys() throws Exception {
+    public void keys() {
 
         writeKeysToTwoNodes();
 
@@ -218,7 +225,7 @@ public void keys() throws Exception {
     }
 
     @Test
-    public void keysStreaming() throws Exception {
+    public void keysStreaming() {
 
         writeKeysToTwoNodes();
         ListStreamingAdapter<String> result = new ListStreamingAdapter<>();
@@ -228,7 +235,7 @@ public void keysStreaming() throws Exception {
     }
 
     @Test
-    public void randomKey() throws Exception {
+    public void randomKey() {
 
         writeKeysToTwoNodes();
 
@@ -237,18 +244,18 @@ public void randomKey() throws Exception {
     }
 
     @Test
-    public void scriptFlush() throws Exception {
+    public void scriptFlush() {
         StepVerifier.create(commands.scriptFlush()).expectNext("OK").verifyComplete();
     }
 
     @Test
-    public void scriptKill() throws Exception {
+    public void scriptKill() {
         StepVerifier.create(commands.scriptKill()).expectNext("OK").verifyComplete();
     }
 
     @Test
     @Ignore("Run me manually, I will shutdown all your cluster nodes so you need to restart the Redis Cluster after this test")
-    public void shutdown() throws Exception {
+    public void shutdown() {
         commands.shutdown(true).subscribe();
     }
 
@@ -272,7 +279,7 @@ public void readFromSlaves() throws Exception {
     }
 
     @Test
-    public void clusterScan() throws Exception {
+    public void clusterScan() {
 
         RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
         sync.mset(KeysAndValues.MAP);
@@ -295,7 +302,7 @@ public void clusterScan() throws Exception {
     }
 
     @Test
-    public void clusterScanWithArgs() throws Exception {
+    public void clusterScanWithArgs() {
 
         RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
         sync.mset(KeysAndValues.MAP);
@@ -319,7 +326,7 @@ public void clusterScanWithArgs() throws Exception {
     }
 
     @Test
-    public void clusterScanStreaming() throws Exception {
+    public void clusterScanStreaming() {
 
         RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
         sync.mset(KeysAndValues.MAP);
@@ -341,7 +348,7 @@ public void clusterScanStreaming() throws Exception {
     }
 
     @Test
-    public void clusterScanStreamingWithArgs() throws Exception {
+    public void clusterScanStreamingWithArgs() {
 
         RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
         sync.mset(KeysAndValues.MAP);
diff --git a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
index f62e0bbc8a..eea78678fd 100644
--- a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
@@ -123,7 +123,6 @@ public void testAsyncSubscription() throws Exception {
         assertThat(masters.size()).isEqualTo(2);
         assertThat(connectionListener.getMessages().take()).isEqualTo("message");
         assertThat(connectionListener.getMessages().take()).isEqualTo("message");
-        assertThat(connectionListener.getMessages().poll()).isNull();
     }
 
     @Test
@@ -141,7 +140,6 @@ public void testSyncSubscription() throws Exception {
         assertThat(masters.size()).isEqualTo(2);
         assertThat(connectionListener.getMessages().take()).isEqualTo("message");
         assertThat(connectionListener.getMessages().take()).isEqualTo("message");
-        assertThat(connectionListener.getMessages().poll()).isNull();
     }
 
     @Test

From 078bf8c008e2c52580c60768fa27c45d594555c2 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 30 Apr 2017 21:51:28 +0200
Subject: [PATCH 216/808] Remove method synchronization in
 ConnectionPoolSupport #531

borrowObject and returnObject methods are no longer synchronized to use the pool synchronization and to solve a deadlock in which the pool is exhausted, a new connection is requested, and a connection cannot be returned to the pool because of instance-level locking.

Previously, if a client got stuck in the borrowObject method (pool exhausted, long connect duration) and a concurrent thread tried to return the connection via returnObject, the second thread was blocked by the first thread. Synchronized methods use the object instance to create a synchronization lock. The instance was locked by the first thread and so the second thread had to wait (an indefinite time) for a release, that would likely never happen.
---
 .../io/lettuce/core/support/ConnectionPoolSupport.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
index 9630d8455a..f3593a8606 100644
--- a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
+++ b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -120,12 +120,12 @@ private ConnectionPoolSupport() {
         GenericObjectPool<T> pool = new GenericObjectPool<T>(new RedisPooledObjectFactory<T>(connectionSupplier), config) {
 
             @Override
-            public synchronized T borrowObject() throws Exception {
+            public T borrowObject() throws Exception {
                 return wrapConnections ? wrapConnection(super.borrowObject(), this) : super.borrowObject();
             }
 
             @Override
-            public synchronized void returnObject(T obj) {
+            public void returnObject(T obj) {
 
                 if (wrapConnections && obj instanceof HasTargetConnection) {
                     super.returnObject((T) ((HasTargetConnection) obj).getTargetConnection());
@@ -173,12 +173,12 @@ public synchronized void returnObject(T obj) {
 
         SoftReferenceObjectPool<T> pool = new SoftReferenceObjectPool<T>(new RedisPooledObjectFactory<>(connectionSupplier)) {
             @Override
-            public synchronized T borrowObject() throws Exception {
+            public T borrowObject() throws Exception {
                 return wrapConnections ? wrapConnection(super.borrowObject(), this) : super.borrowObject();
             }
 
             @Override
-            public synchronized void returnObject(T obj) throws Exception {
+            public void returnObject(T obj) throws Exception {
 
                 if (wrapConnections && obj instanceof HasTargetConnection) {
                     super.returnObject((T) ((HasTargetConnection) obj).getTargetConnection());

From 25560f9d4e31ac59b37309eb704774d5a896e89e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 1 May 2017 19:54:26 +0200
Subject: [PATCH 217/808] Upgrade to netty 4.1.10 #532

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f77c9936f7..6778d42c9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
         <skipSigning>true</skipSigning>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
-        <netty-version>4.1.9.Final</netty-version>
+        <netty-version>4.1.10.Final</netty-version>
         <spring-version>4.3.6.RELEASE</spring-version>
     </properties>
 
@@ -342,7 +342,7 @@
             <id>netty-40</id>
 
             <properties>
-                <netty-version>4.0.45.Final</netty-version>
+                <netty-version>4.0.46.Final</netty-version>
             </properties>
         </profile>
 

From cf94379bdb90031781559d2c8cea3364ddd85e0d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 9 May 2017 16:27:55 +0200
Subject: [PATCH 218/808] Improve epoll availability detection #535

Lettuce now checks for class path availability of epoll and additionally with Epoll.isAvailable() to make sure all components can be initialized properly.
---
 .../java/io/lettuce/core/EpollProvider.java   | 94 ++++++-------------
 1 file changed, 31 insertions(+), 63 deletions(-)

diff --git a/src/main/java/io/lettuce/core/EpollProvider.java b/src/main/java/io/lettuce/core/EpollProvider.java
index 30522de3f2..fec8e9b1a4 100644
--- a/src/main/java/io/lettuce/core/EpollProvider.java
+++ b/src/main/java/io/lettuce/core/EpollProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,17 @@
  */
 package io.lettuce.core;
 
-import java.lang.reflect.Constructor;
 import java.net.SocketAddress;
-import java.util.Locale;
 import java.util.concurrent.ThreadFactory;
 
 import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.internal.LettuceClassUtils;
-
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
+import io.netty.channel.epoll.Epoll;
+import io.netty.channel.epoll.EpollDomainSocketChannel;
+import io.netty.channel.epoll.EpollEventLoopGroup;
+import io.netty.channel.epoll.EpollSocketChannel;
+import io.netty.channel.unix.DomainSocketAddress;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.internal.SystemPropertyUtil;
 import io.netty.util.internal.logging.InternalLogger;
@@ -42,29 +43,26 @@ public class EpollProvider {
 
     private static final String EPOLL_ENABLED_KEY = "io.lettuce.core.epoll";
     private static final boolean EPOLL_ENABLED = Boolean.parseBoolean(SystemPropertyUtil.get(EPOLL_ENABLED_KEY, "true"));
-    private static final boolean EPOLL_COMPATIBLE = SystemPropertyUtil.get("os.name").toLowerCase(Locale.UK).trim()
-            .startsWith("linux");
-    private static final Class<EventLoopGroup> epollEventLoopGroupClass;
-    private static final Class<Channel> epollDomainSocketChannelClass;
-    private static final Class<Channel> epollSocketChannelClass;
-    private static final Class<SocketAddress> domainSocketAddressClass;
+
+    private static final boolean EPOLL_AVAILABLE;
 
     static {
 
-        epollEventLoopGroupClass = getClass("io.netty.channel.epoll.EpollEventLoopGroup");
-        epollDomainSocketChannelClass = getClass("io.netty.channel.epoll.EpollDomainSocketChannel");
-        epollSocketChannelClass = getClass("io.netty.channel.epoll.EpollSocketChannel");
-        domainSocketAddressClass = getClass("io.netty.channel.unix.DomainSocketAddress");
+        boolean availability = false;
+        try {
 
-        if (epollDomainSocketChannelClass == null || epollEventLoopGroupClass == null || epollSocketChannelClass == null) {
-            logger.debug("Starting without optional Epoll library");
-        } else {
+            Class.forName("io.netty.channel.epoll.Epoll");
+            availability = Epoll.isAvailable();
+        } catch (ClassNotFoundException e) {
+        }
 
+        EPOLL_AVAILABLE = availability;
+
+        if (EPOLL_AVAILABLE) {
             logger.debug("Starting with Epoll library");
 
-            if (!EPOLL_COMPATIBLE) {
-                logger.debug(String.format("Epoll not compatible with %s", SystemPropertyUtil.get("os.name")));
-            }
+        } else {
+            logger.debug("Starting without optional Epoll library");
         }
     }
 
@@ -76,7 +74,7 @@ public static boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type)
 
         LettuceAssert.notNull(type, "EventLoopGroup type must not be null");
 
-        return type.equals(epollEventLoopGroupClass);
+        return type.equals(EpollEventLoopGroup.class);
     }
 
     /**
@@ -87,45 +85,35 @@ public static boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type)
      * @return the {@link EventLoopGroup}.
      */
     public static EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
-
-        try {
-            Constructor<EventLoopGroup> constructor = epollEventLoopGroupClass.getConstructor(Integer.TYPE,
-                    ThreadFactory.class);
-            return constructor.newInstance(nThreads, threadFactory);
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
+        return new EpollEventLoopGroup(nThreads, threadFactory);
     }
 
     /**
      * @return {@literal true} if epoll is available.
      */
     public static boolean isAvailable() {
-        return domainSocketAddressClass != null && epollDomainSocketChannelClass != null && EPOLL_ENABLED && EPOLL_COMPATIBLE;
+        return EPOLL_AVAILABLE && EPOLL_ENABLED;
     }
 
     /**
-     *
      * @return the {@link io.netty.channel.epoll.EpollDomainSocketChannel} class.
      */
     static Class<? extends Channel> domainSocketChannelClass() {
-        return epollDomainSocketChannelClass;
+        return EpollDomainSocketChannel.class;
     }
 
     /**
-     *
      * @return the {@link io.netty.channel.epoll.EpollSocketChannel} class.
      */
     static Class<? extends Channel> socketChannelClass() {
-        return epollSocketChannelClass;
+        return EpollSocketChannel.class;
     }
 
     /**
-     *
      * @return the {@link io.netty.channel.epoll.EpollEventLoopGroup} class.
      */
     static Class<? extends EventLoopGroup> eventLoopGroupClass() {
-        return epollEventLoopGroupClass;
+        return EpollEventLoopGroup.class;
     }
 
     /**
@@ -136,35 +124,15 @@ static Class<? extends EventLoopGroup> eventLoopGroupClass() {
      */
     static void checkForEpollLibrary() {
 
-        LettuceAssert.assertState(EPOLL_ENABLED && EPOLL_COMPATIBLE,
+        LettuceAssert.assertState(EPOLL_ENABLED,
                 String.format("epoll use is disabled via System properties (%s)", EPOLL_ENABLED_KEY));
-        LettuceAssert.assertState(isAvailable(),
-                "Cannot connect using sockets without the optional netty-transport-native-epoll library on the class path");
+        LettuceAssert
+                .assertState(
+                        isAvailable(),
+                        "Cannot connect using sockets without Epoll support. Make sure netty-transport-native-epoll library on the class path and supported by your operating system.");
     }
 
     static SocketAddress newSocketAddress(String socketPath) {
-
-        try {
-            Constructor<SocketAddress> constructor = domainSocketAddressClass.getConstructor(String.class);
-            return constructor.newInstance(socketPath);
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    /**
-     * Try to load class {@literal className}.
-     *
-     * @param className
-     * @param <T> Expected return type for casting.
-     * @return instance of {@literal className} or null
-     */
-    private static <T> Class<T> getClass(String className) {
-        try {
-            return (Class) LettuceClassUtils.forName(className);
-        } catch (ClassNotFoundException e) {
-            logger.debug("Cannot load class " + className, e);
-        }
-        return null;
+        return new DomainSocketAddress(socketPath);
     }
 }

From 96b692d1616505ae9b6fc4cd3d2881a611bdd35d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 11 May 2017 08:33:52 +0200
Subject: [PATCH 219/808] Improve epoll availability detection #535

Encapsulate access to Epoll types in Epoll resources class to prevent NoClassDefFoundErrors.
---
 .../java/io/lettuce/core/EpollProvider.java   | 198 +++++++++++++++---
 src/main/java/io/lettuce/core/Transports.java |   6 +-
 2 files changed, 171 insertions(+), 33 deletions(-)

diff --git a/src/main/java/io/lettuce/core/EpollProvider.java b/src/main/java/io/lettuce/core/EpollProvider.java
index fec8e9b1a4..7d5b96e1bb 100644
--- a/src/main/java/io/lettuce/core/EpollProvider.java
+++ b/src/main/java/io/lettuce/core/EpollProvider.java
@@ -45,6 +45,7 @@ public class EpollProvider {
     private static final boolean EPOLL_ENABLED = Boolean.parseBoolean(SystemPropertyUtil.get(EPOLL_ENABLED_KEY, "true"));
 
     private static final boolean EPOLL_AVAILABLE;
+    private static final EpollResources epollResources;
 
     static {
 
@@ -59,22 +60,43 @@ public class EpollProvider {
         EPOLL_AVAILABLE = availability;
 
         if (EPOLL_AVAILABLE) {
-            logger.debug("Starting with Epoll library");
+            logger.warn("Starting with Epoll library");
+            epollResources = AvailableEpollResources.INSTANCE;
 
         } else {
-            logger.debug("Starting without optional Epoll library");
+            logger.warn("Starting without optional Epoll library");
+            epollResources = UnavailableEpollResources.INSTANCE;
         }
     }
 
+    /**
+     * @return {@literal true} if epoll is available.
+     */
+    public static boolean isAvailable() {
+        return EPOLL_AVAILABLE && EPOLL_ENABLED;
+    }
+
+    /**
+     * Check whether the Epoll library is available on the class path.
+     *
+     * @throws IllegalStateException if the {@literal netty-transport-native-epoll} library is not available
+     */
+    static void checkForEpollLibrary() {
+
+        LettuceAssert.assertState(EPOLL_ENABLED,
+                String.format("epoll use is disabled via System properties (%s)", EPOLL_ENABLED_KEY));
+        LettuceAssert
+                .assertState(
+                        isAvailable(),
+                        "Cannot connect using sockets without Epoll support. Make sure netty-transport-native-epoll library on the class path and supported by your operating system.");
+    }
+
     /**
      * @param type must not be {@literal null}.
      * @return {@literal true} if {@code type} is a {@link io.netty.channel.epoll.EpollEventLoopGroup}.
      */
     public static boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type) {
-
-        LettuceAssert.notNull(type, "EventLoopGroup type must not be null");
-
-        return type.equals(EpollEventLoopGroup.class);
+        return epollResources.isEventLoopGroup(type);
     }
 
     /**
@@ -85,54 +107,170 @@ public static boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type)
      * @return the {@link EventLoopGroup}.
      */
     public static EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
-        return new EpollEventLoopGroup(nThreads, threadFactory);
-    }
-
-    /**
-     * @return {@literal true} if epoll is available.
-     */
-    public static boolean isAvailable() {
-        return EPOLL_AVAILABLE && EPOLL_ENABLED;
+        return epollResources.newEventLoopGroup(nThreads, threadFactory);
     }
 
     /**
      * @return the {@link io.netty.channel.epoll.EpollDomainSocketChannel} class.
      */
     static Class<? extends Channel> domainSocketChannelClass() {
-        return EpollDomainSocketChannel.class;
+        return epollResources.domainSocketChannelClass();
     }
 
     /**
      * @return the {@link io.netty.channel.epoll.EpollSocketChannel} class.
      */
     static Class<? extends Channel> socketChannelClass() {
-        return EpollSocketChannel.class;
+        return epollResources.socketChannelClass();
     }
 
     /**
      * @return the {@link io.netty.channel.epoll.EpollEventLoopGroup} class.
      */
     static Class<? extends EventLoopGroup> eventLoopGroupClass() {
-        return EpollEventLoopGroup.class;
+        return epollResources.eventLoopGroupClass();
+    }
+
+    static SocketAddress newSocketAddress(String socketPath) {
+        return epollResources.newSocketAddress(socketPath);
     }
 
     /**
-     * Check whether the Epoll library is available on the class path.
-     *
-     * @throws IllegalStateException if the {@literal netty-transport-native-epoll} library is not available
-     *
+     * @author Mark Paluch
      */
-    static void checkForEpollLibrary() {
+    public interface EpollResources {
 
-        LettuceAssert.assertState(EPOLL_ENABLED,
-                String.format("epoll use is disabled via System properties (%s)", EPOLL_ENABLED_KEY));
-        LettuceAssert
-                .assertState(
-                        isAvailable(),
-                        "Cannot connect using sockets without Epoll support. Make sure netty-transport-native-epoll library on the class path and supported by your operating system.");
+        /**
+         * @param type must not be {@literal null}.
+         * @return {@literal true} if {@code type} is a {@link EpollEventLoopGroup}.
+         */
+        boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type);
+
+        /**
+         * Create a new {@link EpollEventLoopGroup}.
+         *
+         * @param nThreads
+         * @param threadFactory
+         * @return the {@link EventLoopGroup}.
+         */
+        EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory);
+
+        /**
+         * @return the {@link EpollDomainSocketChannel} class.
+         */
+        Class<? extends Channel> domainSocketChannelClass();
+
+        /**
+         * @return the {@link EpollSocketChannel} class.
+         */
+        Class<? extends Channel> socketChannelClass();
+
+        /**
+         * @return the {@link EpollEventLoopGroup} class.
+         */
+        Class<? extends EventLoopGroup> eventLoopGroupClass();
+
+        SocketAddress newSocketAddress(String socketPath);
     }
 
-    static SocketAddress newSocketAddress(String socketPath) {
-        return new DomainSocketAddress(socketPath);
+    /**
+     * {@link EpollResources} for unavailable EPoll.
+     */
+    enum UnavailableEpollResources implements EpollResources {
+
+        INSTANCE;
+
+        @Override
+        public Class<? extends Channel> domainSocketChannelClass() {
+
+            checkForEpollLibrary();
+            return null;
+        }
+
+        @Override
+        public Class<? extends EventLoopGroup> eventLoopGroupClass() {
+
+            checkForEpollLibrary();
+            return null;
+        }
+
+        @Override
+        public boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type) {
+
+            checkForEpollLibrary();
+            return false;
+        }
+
+        @Override
+        public EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
+
+            checkForEpollLibrary();
+            return null;
+        }
+
+        @Override
+        public SocketAddress newSocketAddress(String socketPath) {
+
+            checkForEpollLibrary();
+            return null;
+        }
+
+        @Override
+        public Class<? extends Channel> socketChannelClass() {
+
+            checkForEpollLibrary();
+            return null;
+        }
+    }
+
+    /**
+     * {@link EpollResources} for available Epoll.
+     */
+    enum AvailableEpollResources implements EpollResources {
+
+        INSTANCE;
+
+        @Override
+        public boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type) {
+
+            LettuceAssert.notNull(type, "EventLoopGroup type must not be null");
+
+            return type.equals(EpollEventLoopGroup.class);
+        }
+
+        @Override
+        public EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
+
+            checkForEpollLibrary();
+            return new EpollEventLoopGroup(nThreads, threadFactory);
+        }
+
+        @Override
+        public Class<? extends Channel> domainSocketChannelClass() {
+
+            checkForEpollLibrary();
+            return EpollDomainSocketChannel.class;
+        }
+
+        @Override
+        public Class<? extends Channel> socketChannelClass() {
+
+            checkForEpollLibrary();
+            return EpollSocketChannel.class;
+        }
+
+        @Override
+        public Class<? extends EventLoopGroup> eventLoopGroupClass() {
+
+            checkForEpollLibrary();
+            return EpollEventLoopGroup.class;
+        }
+
+        @Override
+        public SocketAddress newSocketAddress(String socketPath) {
+
+            checkForEpollLibrary();
+            return new DomainSocketAddress(socketPath);
+        }
     }
 }
diff --git a/src/main/java/io/lettuce/core/Transports.java b/src/main/java/io/lettuce/core/Transports.java
index 758a879d12..515360f49f 100644
--- a/src/main/java/io/lettuce/core/Transports.java
+++ b/src/main/java/io/lettuce/core/Transports.java
@@ -34,7 +34,7 @@ class Transports {
      */
     static Class<? extends EventLoopGroup> eventLoopGroupClass() {
 
-        if (NativeTransports.isSocketSupport()) {
+        if (NativeTransports.isSocketSupported()) {
             return NativeTransports.eventLoopGroupClass();
         }
 
@@ -46,7 +46,7 @@ static Class<? extends EventLoopGroup> eventLoopGroupClass() {
      */
     static Class<? extends Channel> socketChannelClass() {
 
-        if (NativeTransports.isSocketSupport()) {
+        if (NativeTransports.isSocketSupported()) {
             return NativeTransports.socketChannelClass();
         }
 
@@ -61,7 +61,7 @@ static class NativeTransports {
         /**
          * @return {@literal true} if a native transport is available.
          */
-        static boolean isSocketSupport() {
+        static boolean isSocketSupported() {
             return EpollProvider.isAvailable();
         }
 

From e62852ef66eb4feeb03878b162bdcff9b066a95f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 12 May 2017 14:12:10 +0200
Subject: [PATCH 220/808] Align log prefix for CommandHandler and
 ConnectionWatchdog #538

Motivation: Debug log of CommandHandler and ConnectionWatchdog is hard to read because the log prefix varies between CommandHandler and ConnectionWatchdog.
---
 .../java/io/lettuce/core/protocol/ChannelLogDescriptor.java   | 4 ++--
 src/main/java/io/lettuce/core/protocol/CommandHandler.java    | 4 ++--
 .../java/io/lettuce/core/protocol/ConnectionWatchdog.java     | 4 ++--
 src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java b/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java
index 1f4da87f5a..26e03c7155 100644
--- a/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java
+++ b/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ static String logDescriptor(Channel channel) {
         buffer.append("channel=").append(getId(channel)).append(", ");
 
         if (channel.localAddress() != null && channel.remoteAddress() != null) {
-            buffer.append(channel.localAddress()).append(" -> ");
+            buffer.append(channel.localAddress()).append(" -> ").append(channel.remoteAddress());
         } else {
             buffer.append(channel);
         }
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index d686ad795b..c3d0e130b7 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -548,8 +548,8 @@ protected String logPrefix() {
         }
 
         StringBuilder buffer = new StringBuilder(64);
-        buffer.append('[').append("chid=0x").append(Long.toHexString(commandHandlerId)).append(", ")
-                .append(ChannelLogDescriptor.logDescriptor(channel)).append(']');
+        buffer.append('[').append(ChannelLogDescriptor.logDescriptor(channel)).append(", ")
+                .append("chid=0x").append(Long.toHexString(commandHandlerId)).append(']');
         return logPrefix = buffer.toString();
     }
 
diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
index e0410f91b0..1a2709b85c 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
@@ -346,8 +346,8 @@ private String logPrefix() {
         }
 
         StringBuilder buffer = new StringBuilder(64);
-        buffer.append('[').append("Last known addr=").append(remoteAddress).append(", ")
-                .append(ChannelLogDescriptor.logDescriptor(channel)).append(']');
+        buffer.append('[')
+                .append(ChannelLogDescriptor.logDescriptor(channel)).append(", last known addr=").append(remoteAddress).append(']');
         return logPrefix = buffer.toString();
     }
 
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index bb6205541a..f0ec343e6d 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -570,8 +570,8 @@ protected String logPrefix() {
         }
 
         StringBuffer buffer = new StringBuffer(64);
-        buffer.append('[').append("epid=0x").append(Long.toHexString(endpointId)).append(", ")
-                .append(ChannelLogDescriptor.logDescriptor(channel)).append(']');
+        buffer.append('[').append(ChannelLogDescriptor.logDescriptor(channel)).append(", ")
+                .append("epid=0x").append(Long.toHexString(endpointId)).append(']');
         return logPrefix = buffer.toString();
     }
 

From 10fd5b36b15629aa838ad9906cca5f2708e342c6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 12 May 2017 14:30:40 +0200
Subject: [PATCH 221/808] Upgrade to netty 4.0.11 #537

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6778d42c9c..345ff5fee6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
         <skipSigning>true</skipSigning>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
-        <netty-version>4.1.10.Final</netty-version>
+        <netty-version>4.1.11.Final</netty-version>
         <spring-version>4.3.6.RELEASE</spring-version>
     </properties>
 
@@ -342,7 +342,7 @@
             <id>netty-40</id>
 
             <properties>
-                <netty-version>4.0.46.Final</netty-version>
+                <netty-version>4.0.47.Final</netty-version>
             </properties>
         </profile>
 

From 215c8205b74068584620142ee9e4e5a8d1c3e886 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 12 May 2017 14:48:31 +0200
Subject: [PATCH 222/808] Polishing

Cleanup pom.xml. Move signing and javadoc to release profile.
---
 pom.xml | 147 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 72 insertions(+), 75 deletions(-)

diff --git a/pom.xml b/pom.xml
index 345ff5fee6..412e3e7fb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -26,7 +27,6 @@
         <url>https://lettuce.io</url>
     </organization>
 
-
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -66,8 +66,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <!-- Not every build should be signed, disabled by default -->
-        <skipSigning>true</skipSigning>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
         <netty-version>4.1.11.Final</netty-version>
@@ -81,13 +79,10 @@
         <tag>HEAD</tag>
     </scm>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
     <dependencies>
 
         <!-- Start of Core Dependencies -->
+
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
@@ -95,6 +90,7 @@
         </dependency>
 
         <!-- Netty -->
+
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-common</artifactId>
@@ -339,7 +335,8 @@
     <profiles>
 
         <profile>
-            <id>netty-40</id>
+
+        <id>netty-40</id>
 
             <properties>
                 <netty-version>4.0.47.Final</netty-version>
@@ -347,11 +344,15 @@
         </profile>
 
         <profile>
-            <id>netty-41</id>
+
+        <id>netty-41</id>
+
         </profile>
 
         <profile>
-            <id>java9</id>
+
+        <id>java9</id>
+
             <activation>
                 <jdk>9</jdk>
             </activation>
@@ -375,6 +376,59 @@
 
             <build>
                 <plugins>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.10.4</version>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <level>public</level>
+                            <author>true</author>
+                            <header>Lettuce</header>
+                            <stylesheetfile>src/main/javadoc/stylesheet.css</stylesheetfile>
+                            <links>
+                                <link>http://netty.io/4.1/api/</link>
+                                <link>http://commons.apache.org/proper/commons-pool/api-2.4.2/</link>
+                                <link>http://docs.guava-libraries.googlecode.com/git/javadoc/</link>
+                                <link>http://reactivex.io/RxJava/javadoc/</link>
+                                <link>https://docs.spring.io/spring/docs/current/javadoc-api/</link>
+                            </links>
+                            <additionalparam>-Xdoclint:all -Xdoclint:-html -Xdoclint:-syntax -Xdoclint:-missing
+                            </additionalparam>
+                            <quiet>true</quiet>
+                            <tags>
+                                <tag>
+                                    <name>generated</name>
+                                    <placement>a</placement>
+                                    <head>Generated class:</head>
+                                </tag>
+                            </tags>
+                        </configuration>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
@@ -520,7 +574,7 @@
                                     <arguments>
                                         <argument>-Xmx2G</argument>
                                         <argument>-classpath</argument>
-                                        <classpath />
+                                        <classpath/>
                                         <argument>org.openjdk.jmh.Main</argument>
                                         <argument>.*</argument>
                                         <argument>-tu</argument>
@@ -591,7 +645,9 @@
                                 <phase>process-resources</phase>
                                 <configuration>
                                     <target>
-                                        <copy failonerror="false" file="${project.build.directory}/generated-docs/index.pdf" tofile="target/site/reference/pdf/lettuce-reference.pdf" />
+                                        <copy failonerror="false"
+                                              file="${project.build.directory}/generated-docs/index.pdf"
+                                              tofile="target/site/reference/pdf/lettuce-reference.pdf"/>
                                     </target>
                                 </configuration>
                                 <goals>
@@ -609,7 +665,6 @@
 
                 </plugins>
 
-
                 <pluginManagement>
                     <plugins>
 
@@ -674,9 +729,9 @@
                                     <toclevels>3</toclevels>
                                     <numbered>true</numbered>
                                     <ext-doc>https://raw.githubusercontent.com/wiki/mp911de/lettuce/</ext-doc>
-                                    <allow-uri-read />
-                                    <docinfo />
-                                    <toc2 />
+                                    <allow-uri-read/>
+                                    <docinfo/>
+                                    <toc2/>
                                     <icons>font</icons>
                                     <source-highlighter>coderay</source-highlighter>
                                 </attributes>
@@ -739,45 +794,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <level>public</level>
-                    <author>true</author>
-                    <header>Lettuce</header>
-                    <stylesheetfile>src/main/javadoc/stylesheet.css</stylesheetfile>
-                    <links>
-                        <link>http://netty.io/4.1/api/</link>
-                        <link>http://commons.apache.org/proper/commons-pool/api-2.4.2/</link>
-                        <link>https://docs.oracle.com/javase/8/docs/api/</link>
-                        <link>https://projectreactor.io/docs/core/release/api/</link>
-                        <link>http://www.reactive-streams.org/reactive-streams-1.0.0-javadoc/</link>
-                        <link>http://reactivex.io/RxJava/javadoc/</link>
-                        <link>http://reactivex.io/RxJava/2.x/javadoc/</link>
-                        <link>https://docs.spring.io/spring/docs/current/javadoc-api/</link>
-                    </links>
-                    <additionalparam>-Xdoclint:all -Xdoclint:-html -Xdoclint:-syntax -Xdoclint:-missing
-                    </additionalparam>
-                    <tags>
-                        <tag>
-                            <name>generated</name>
-                            <placement>a</placement>
-                            <head>Generated class:</head>
-                        </tag>
-                    </tags>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -802,31 +818,12 @@
                 <version>2.5</version>
                 <configuration>
                     <releaseProfiles>sonatype-oss-release,documentation</releaseProfiles>
-                    <arguments>-DskipSigning=false</arguments>
                     <goals>deploy</goals>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <tagNameFormat>@{project.version}</tagNameFormat>
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.5</version>
-                <configuration>
-                    <skip>${skipSigning}</skip>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>sign-artifacts</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>sign</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>

From 8b4dc44d51c9ec6164336317493883435a8a4abf Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 12 May 2017 14:46:31 +0200
Subject: [PATCH 223/808] Upgrade maven plugins

---
 pom.xml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 412e3e7fb4..3bcd22c9d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -432,7 +432,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.4</version>
+                        <version>3.0.0</version>
                         <executions>
                             <execution>
                                 <id>src</id>
@@ -441,7 +441,6 @@
                                     <goal>single</goal>
                                 </goals>
                                 <configuration>
-                                    <finalName>${project.artifactId}-${project.version}</finalName>
                                     <descriptors>
                                         <descriptor>src/assembly/src.xml</descriptor>
                                     </descriptors>
@@ -452,7 +451,6 @@
                             <execution>
                                 <id>bin</id>
                                 <configuration>
-                                    <finalName>${project.artifactId}-${project.version}</finalName>
                                     <descriptors>
                                         <descriptor>src/assembly/bin.xml</descriptor>
                                     </descriptors>
@@ -470,7 +468,7 @@
                     <plugin>
                         <groupId>net.ju-n.maven.plugins</groupId>
                         <artifactId>checksum-maven-plugin</artifactId>
-                        <version>1.2</version>
+                        <version>1.4</version>
                         <configuration>
                             <algorithms>
                                 <algorithm>MD5</algorithm>
@@ -541,7 +539,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>1.7</version>
+                        <version>3.0.0</version>
                         <executions>
                             <execution>
                                 <id>add-source</id>
@@ -560,7 +558,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.5.0</version>
+                        <version>1.6.0</version>
                         <executions>
                             <execution>
                                 <id>run-benchmarks</id>
@@ -783,7 +781,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.6.1</version>
                 <configuration>
                     <compilerArgument>-Xlint:all,-deprecation,-unchecked</compilerArgument>
                     <testCompilerArgument>-Xlint:none</testCompilerArgument>
@@ -797,7 +795,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.17</version>
+                <version>2.20</version>
                 <configuration>
                     <systemProperties>
                         <io.netty.eventLoopThreads>4</io.netty.eventLoopThreads>
@@ -815,7 +813,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.5</version>
+                <version>2.5.3</version>
                 <configuration>
                     <releaseProfiles>sonatype-oss-release,documentation</releaseProfiles>
                     <goals>deploy</goals>
@@ -827,7 +825,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.3</version>
+                <version>3.0.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>

From 92040e74dfa3a894f3222d54b742cdb278d2f374 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 12 May 2017 14:56:38 +0200
Subject: [PATCH 224/808] Enable docs creation with documentation profile

---
 pom.xml | 191 ++++++++++++++++++++++++++------------------------------
 1 file changed, 87 insertions(+), 104 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3bcd22c9d9..12cf1344c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -336,7 +336,7 @@
 
         <profile>
 
-        <id>netty-40</id>
+            <id>netty-40</id>
 
             <properties>
                 <netty-version>4.0.47.Final</netty-version>
@@ -345,13 +345,13 @@
 
         <profile>
 
-        <id>netty-41</id>
+            <id>netty-41</id>
 
         </profile>
 
         <profile>
 
-        <id>java9</id>
+            <id>java9</id>
 
             <activation>
                 <jdk>9</jdk>
@@ -659,109 +659,92 @@
                     <plugin>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctor-maven-plugin</artifactId>
+                        <version>1.5.5</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.asciidoctor</groupId>
+                                <artifactId>asciidoctorj-pdf</artifactId>
+                                <version>1.5.0-alpha.14</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+
+                            <execution>
+                                <id>html</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>process-asciidoc</goal>
+                                </goals>
+                                <configuration>
+                                    <backend>html5</backend>
+                                    <outputDirectory>${project.build.directory}/site/reference/html
+                                    </outputDirectory>
+                                    <sectids>false</sectids>
+                                    <doctype>book</doctype>
+                                    <attributes>
+                                        <linkcss>true</linkcss>
+                                        <sectanchors>true</sectanchors>
+                                        <stylesdir>stylesheets</stylesdir>
+                                        <stylesheet>golo.css</stylesheet>
+                                    </attributes>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>pdf</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>process-asciidoc</goal>
+                                </goals>
+                                <configuration>
+                                    <backend>pdf</backend>
+                                </configuration>
+                            </execution>
+
+                        </executions>
+
+                        <configuration>
+                            <sourceDirectory>src/main/asciidoc</sourceDirectory>
+                            <sourceDocumentName>index.asciidoc</sourceDocumentName>
+                            <doctype>book</doctype>
+                            <attributes>
+                                <version>${project.version}</version>
+                                <allow-uri-read>true</allow-uri-read>
+                                <toclevels>3</toclevels>
+                                <numbered>true</numbered>
+                                <ext-doc>https://raw.githubusercontent.com/wiki/mp911de/lettuce/</ext-doc>
+                                <allow-uri-read/>
+                                <docinfo/>
+                                <toc2/>
+                                <icons>font</icons>
+                                <source-highlighter>coderay</source-highlighter>
+                            </attributes>
+                        </configuration>
                     </plugin>
 
-                </plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>3.0.0</version>
+                        <executions>
+                            <execution>
+                                <id>docs</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/assembly/docs.xml</descriptor>
+                                    </descriptors>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                    <attach>true</attach>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
 
-                <pluginManagement>
-                    <plugins>
-
-                        <!--
-                            Asciidoctor
-                        -->
-
-                        <plugin>
-                            <groupId>org.asciidoctor</groupId>
-                            <artifactId>asciidoctor-maven-plugin</artifactId>
-                            <version>1.5.3</version>
-                            <dependencies>
-                                <dependency>
-                                    <groupId>org.asciidoctor</groupId>
-                                    <artifactId>asciidoctorj-pdf</artifactId>
-                                    <version>1.5.0-alpha.11</version>
-                                </dependency>
-                            </dependencies>
-                            <executions>
-
-                                <execution>
-                                    <id>html</id>
-                                    <phase>generate-resources</phase>
-                                    <goals>
-                                        <goal>process-asciidoc</goal>
-                                    </goals>
-                                    <configuration>
-                                        <backend>html5</backend>
-                                        <outputDirectory>${project.build.directory}/site/reference/html
-                                        </outputDirectory>
-                                        <sectids>false</sectids>
-                                        <doctype>book</doctype>
-                                        <attributes>
-                                            <linkcss>true</linkcss>
-                                            <sectanchors>true</sectanchors>
-                                            <stylesdir>stylesheets</stylesdir>
-                                            <stylesheet>golo.css</stylesheet>
-                                        </attributes>
-                                    </configuration>
-                                </execution>
-
-                                <execution>
-                                    <id>pdf</id>
-                                    <phase>generate-resources</phase>
-                                    <goals>
-                                        <goal>process-asciidoc</goal>
-                                    </goals>
-                                    <configuration>
-                                        <backend>pdf</backend>
-                                    </configuration>
-                                </execution>
-
-                            </executions>
-
-                            <configuration>
-                                <sourceDirectory>src/main/asciidoc</sourceDirectory>
-                                <sourceDocumentName>index.asciidoc</sourceDocumentName>
-                                <doctype>book</doctype>
-                                <attributes>
-                                    <version>${project.version}</version>
-                                    <allow-uri-read>true</allow-uri-read>
-                                    <toclevels>3</toclevels>
-                                    <numbered>true</numbered>
-                                    <ext-doc>https://raw.githubusercontent.com/wiki/mp911de/lettuce/</ext-doc>
-                                    <allow-uri-read/>
-                                    <docinfo/>
-                                    <toc2/>
-                                    <icons>font</icons>
-                                    <source-highlighter>coderay</source-highlighter>
-                                </attributes>
-                            </configuration>
-                        </plugin>
-
-
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-assembly-plugin</artifactId>
-                            <version>2.4</version>
-                            <executions>
-                                <execution>
-                                    <id>docs</id>
-                                    <phase>package</phase>
-                                    <goals>
-                                        <goal>single</goal>
-                                    </goals>
-                                    <configuration>
-                                        <finalName>${project.artifactId}-${project.version}</finalName>
-                                        <descriptors>
-                                            <descriptor>src/assembly/docs.xml</descriptor>
-                                        </descriptors>
-                                        <tarLongFileMode>gnu</tarLongFileMode>
-                                        <attach>true</attach>
-                                    </configuration>
-                                </execution>
-                            </executions>
-                        </plugin>
-
-                    </plugins>
-                </pluginManagement>
+                </plugins>
             </build>
         </profile>
     </profiles>
@@ -805,7 +788,7 @@
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>surefire-junit47</artifactId>
-                        <version>2.17</version>
+                        <version>2.20</version>
                     </dependency>
                 </dependencies>
             </plugin>

From daaded8f8f88929cbd2ee68166383d49e4c6ca93 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 12 May 2017 15:50:11 +0200
Subject: [PATCH 225/808] Remove unnecessary stubbings

---
 .../core/cluster/ClusterNodeEndpointTest.java |  8 -----
 .../core/protocol/DefaultEndpointTest.java    | 29 ++++---------------
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
index dff4546bc5..c13f1f3822 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
@@ -35,7 +35,6 @@
 import io.lettuce.core.RedisChannelWriter;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.Utf8StringCodec;
-import io.lettuce.core.metrics.DefaultCommandLatencyCollector;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.protocol.Command;
@@ -68,7 +67,6 @@ public class ClusterNodeEndpointTest {
     @Before
     public void before() throws Exception {
 
-        when(clientResources.commandLatencyCollector()).thenReturn(DefaultCommandLatencyCollector.disabled());
         sut = new ClusterNodeEndpoint(clientOptions, clientResources, clusterChannelWriter);
         queue = (Queue) sut.getQueue();
     }
@@ -83,7 +81,6 @@ public void closeWithoutCommands() throws Exception {
     @Test
     public void closeWithQueuedCommands() throws Exception {
 
-        when(clientOptions.isAutoReconnect()).thenReturn(true);
         queue.add(command);
 
         sut.close();
@@ -94,7 +91,6 @@ public void closeWithQueuedCommands() throws Exception {
     @Test
     public void closeWithCancelledQueuedCommands() throws Exception {
 
-        when(clientOptions.isAutoReconnect()).thenReturn(true);
         queue.add(command);
         command.cancel();
 
@@ -106,7 +102,6 @@ public void closeWithCancelledQueuedCommands() throws Exception {
     @Test
     public void closeWithQueuedCommandsFails() throws Exception {
 
-        when(clientOptions.isAutoReconnect()).thenReturn(true);
         queue.add(command);
         when(clusterChannelWriter.write(any(RedisCommand.class))).thenThrow(new RedisException("meh"));
 
@@ -126,7 +121,6 @@ public void closeWithQueuedCommandsFails() throws Exception {
     @Test
     public void closeWithBufferedCommands() throws Exception {
 
-        when(clientOptions.isAutoReconnect()).thenReturn(true);
         when(clientOptions.getRequestQueueSize()).thenReturn(1000);
         when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS);
         sut.write(command);
@@ -139,7 +133,6 @@ public void closeWithBufferedCommands() throws Exception {
     @Test
     public void closeWithCancelledBufferedCommands() throws Exception {
 
-        when(clientOptions.isAutoReconnect()).thenReturn(true);
         when(clientOptions.getRequestQueueSize()).thenReturn(1000);
         when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS);
         sut.write(command);
@@ -153,7 +146,6 @@ public void closeWithCancelledBufferedCommands() throws Exception {
     @Test
     public void closeWithBufferedCommandsFails() throws Exception {
 
-        when(clientOptions.isAutoReconnect()).thenReturn(true);
         when(clientOptions.getRequestQueueSize()).thenReturn(1000);
         when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS);
         sut.write(command);
diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
index 4bb410e858..119291cbde 100644
--- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
@@ -41,18 +41,17 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import edu.umd.cs.mtc.MultithreadedTestCase;
+import edu.umd.cs.mtc.TestFramework;
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.internal.LettuceFactories;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.resource.ClientResources;
-
-import edu.umd.cs.mtc.MultithreadedTestCase;
-import edu.umd.cs.mtc.TestFramework;
 import io.netty.channel.Channel;
 import io.netty.channel.DefaultChannelPromise;
 
@@ -63,8 +62,8 @@ public class DefaultEndpointTest {
 
     private DefaultEndpoint sut;
 
-    private final Command<String, String, String> command = new Command<>(CommandType.APPEND,
-            new StatusOutput<String, String>(new Utf8StringCodec()), null);
+    private final Command<String, String, String> command = new Command<>(CommandType.APPEND, new StatusOutput<String, String>(
+            new Utf8StringCodec()), null);
 
     @Mock
     private Channel channel;
@@ -97,19 +96,6 @@ public static void afterClass() {
     @Before
     public void before() throws Exception {
 
-        when(channel.write(any())).thenAnswer(invocation -> {
-
-            if (invocation.getArguments()[0] instanceof RedisCommand) {
-                q.add((RedisCommand) invocation.getArguments()[0]);
-            }
-
-            if (invocation.getArguments()[0] instanceof Collection) {
-                q.addAll((Collection) invocation.getArguments()[0]);
-            }
-
-            return new DefaultChannelPromise(channel);
-        });
-
         when(channel.writeAndFlush(any())).thenAnswer(invocation -> {
             if (invocation.getArguments()[0] instanceof RedisCommand) {
                 q.add((RedisCommand) invocation.getArguments()[0]);
@@ -129,7 +115,6 @@ public void before() throws Exception {
     public void writeConnectedShouldWriteCommandToChannel() throws Exception {
 
         when(channel.isActive()).thenReturn(true);
-        when(channel.isWritable()).thenReturn(true);
 
         sut.notifyChannelActive(channel);
         sut.write(command);
@@ -141,9 +126,6 @@ public void writeConnectedShouldWriteCommandToChannel() throws Exception {
     @Test
     public void writeDisconnectedShouldBufferCommands() throws Exception {
 
-        when(channel.isActive()).thenReturn(true);
-        when(channel.isWritable()).thenReturn(true);
-
         sut.write(command);
 
         assertThat(sut.getQueue()).contains(command);
@@ -212,7 +194,6 @@ public void notifyDrainQueuedCommandsShouldBufferCommands() throws Exception {
     public void notifyDrainQueuedCommandsShouldWriteCommands() throws Exception {
 
         when(channel.isActive()).thenReturn(true);
-        when(channel.isWritable()).thenReturn(true);
 
         Queue<RedisCommand<?, ?, ?>> q = LettuceFactories.newConcurrentQueue();
         q.add(command);

From 7adddc8d6cd4c12e5eacb04c280d43fef3c749da Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 12 May 2017 21:54:32 +0200
Subject: [PATCH 226/808] Add support for kqueue transport #539

Lettuce now supports Unix Domain Socket connections on MacOS with netty 4.1.11.Final or newer. Availability of netty-transport-native-kqueue enables kqueue transport by default for all TCP connections and provides UDS support.

Kqueue can be disabled by setting the io.lettuce.core.kqueue system property to false.
---
 pom.xml                                       |  16 +
 .../io/lettuce/core/AbstractRedisClient.java  |  10 +-
 .../java/io/lettuce/core/EpollProvider.java   |   3 +-
 .../java/io/lettuce/core/KqueueProvider.java  | 298 ++++++++++++++++++
 src/main/java/io/lettuce/core/RedisURI.java   |   9 +-
 src/main/java/io/lettuce/core/Transports.java |  26 +-
 .../DefaultEventLoopGroupProvider.java        |  16 +-
 .../io/lettuce/core/UnixDomainSocketTest.java |  72 +++--
 ...ngleThreadedReactiveClusterClientTest.java |  49 +--
 9 files changed, 403 insertions(+), 96 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/KqueueProvider.java

diff --git a/pom.xml b/pom.xml
index 12cf1344c1..d6dcef0db2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,6 +117,8 @@
             <optional>true</optional>
         </dependency>
 
+        <!-- netty-transport-native-kqueue is included with the netty-41 profile -->
+
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative</artifactId>
@@ -347,6 +349,20 @@
 
             <id>netty-41</id>
 
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+
+            <dependencies>
+                <dependency>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-transport-native-kqueue</artifactId>
+                    <version>${netty-version}</version>
+                    <classifier>osx-x86_64</classifier>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+
         </profile>
 
         <profile>
diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 6118419333..ca77a6738a 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -154,7 +154,7 @@ protected void channelType(ConnectionBuilder connectionBuilder, ConnectionPoint
         connectionBuilder.bootstrap().group(getEventLoopGroup(connectionPoint));
 
         if (connectionPoint.getSocket() != null) {
-            checkForEpollLibrary();
+            NativeTransports.assertAvailable();
             connectionBuilder.bootstrap().channel(NativeTransports.domainSocketChannelClass());
         } else {
             connectionBuilder.bootstrap().channel(Transports.socketChannelClass());
@@ -170,7 +170,7 @@ private synchronized EventLoopGroup getEventLoopGroup(ConnectionPoint connection
 
         if (connectionPoint.getSocket() != null) {
 
-            checkForEpollLibrary();
+            NativeTransports.assertAvailable();
 
             Class<? extends EventLoopGroup> eventLoopGroupClass = NativeTransports.eventLoopGroupClass();
 
@@ -185,17 +185,13 @@ private synchronized EventLoopGroup getEventLoopGroup(ConnectionPoint connection
         }
 
         if (connectionPoint.getSocket() != null) {
-            checkForEpollLibrary();
+            NativeTransports.assertAvailable();
             return eventLoopGroups.get(NativeTransports.eventLoopGroupClass());
         }
 
         throw new IllegalStateException("This should not have happened in a binary decision. Please file a bug.");
     }
 
-    private void checkForEpollLibrary() {
-        EpollProvider.checkForEpollLibrary();
-    }
-
     /**
      * Retrieve the connection from {@link ConnectionFuture}. Performs a blocking {@link ConnectionFuture#get()} to synchronize
      * the channel/connection initialization. Any exception is rethrown as {@link RedisConnectionException}.
diff --git a/src/main/java/io/lettuce/core/EpollProvider.java b/src/main/java/io/lettuce/core/EpollProvider.java
index 7d5b96e1bb..51f084ceac 100644
--- a/src/main/java/io/lettuce/core/EpollProvider.java
+++ b/src/main/java/io/lettuce/core/EpollProvider.java
@@ -36,6 +36,7 @@
  * the {@literal netty-transport-native-epoll} library during runtime. Internal API.
  *
  * @author Mark Paluch
+ * @since 4.4
  */
 public class EpollProvider {
 
@@ -88,7 +89,7 @@ static void checkForEpollLibrary() {
         LettuceAssert
                 .assertState(
                         isAvailable(),
-                        "Cannot connect using sockets without Epoll support. Make sure netty-transport-native-epoll library on the class path and supported by your operating system.");
+                        "netty-transport-native-epoll is not available. Make sure netty-transport-native-epoll library on the class path and supported by your operating system.");
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/KqueueProvider.java b/src/main/java/io/lettuce/core/KqueueProvider.java
new file mode 100644
index 0000000000..aabafa302d
--- /dev/null
+++ b/src/main/java/io/lettuce/core/KqueueProvider.java
@@ -0,0 +1,298 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.net.SocketAddress;
+import java.util.concurrent.ThreadFactory;
+
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceClassUtils;
+import io.netty.channel.Channel;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.unix.DomainSocketAddress;
+import io.netty.util.concurrent.EventExecutorGroup;
+import io.netty.util.internal.SystemPropertyUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+/**
+ * Wraps and provides kqueue classes. This is to protect the user from {@link ClassNotFoundException}'s caused by the absence of
+ * the {@literal netty-transport-native-kqueue} library during runtime. Internal API.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public class KqueueProvider {
+
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(KqueueProvider.class);
+
+    private static final String KQUEUE_ENABLED_KEY = "io.lettuce.core.kqueue";
+    private static final boolean KQUEUE_ENABLED = Boolean.parseBoolean(SystemPropertyUtil.get(KQUEUE_ENABLED_KEY, "true"));
+
+    private static final boolean KQUEUE_AVAILABLE;
+    private static final KqueueResources KQUEUE_RESOURCES;
+
+    static {
+
+        boolean availability = false;
+        try {
+
+            Class<?> kqueue = Class.forName("io.netty.channel.kqueue.KQueue");
+
+            Method isAvailable = kqueue.getDeclaredMethod("isAvailable");
+
+            availability = (Boolean) isAvailable.invoke(null);
+        } catch (ReflectiveOperationException e) {
+        }
+
+        KQUEUE_AVAILABLE = availability;
+
+        if (KQUEUE_AVAILABLE) {
+            logger.warn("Starting with kqueue library");
+            KQUEUE_RESOURCES = AvailableKqueueResources.INSTANCE;
+
+        } else {
+            logger.warn("Starting without optional kqueue library");
+            KQUEUE_RESOURCES = UnavailableKqueueResources.INSTANCE;
+        }
+    }
+
+    /**
+     * @return {@literal true} if kqueue is available.
+     */
+    public static boolean isAvailable() {
+        return KQUEUE_AVAILABLE && KQUEUE_ENABLED;
+    }
+
+    /**
+     * Check whether the kqueue library is available on the class path.
+     *
+     * @throws IllegalStateException if the {@literal netty-transport-native-kqueue} library is not available
+     */
+    static void checkForKqueueLibrary() {
+
+        LettuceAssert.assertState(KQUEUE_ENABLED,
+                String.format("kqueue use is disabled via System properties (%s)", KQUEUE_ENABLED_KEY));
+        LettuceAssert
+                .assertState(
+                        isAvailable(),
+                        "netty-transport-native-kqueue is not available. Make sure netty-transport-native-kqueue library on the class path and supported by your operating system.");
+    }
+
+    /**
+     * @param type must not be {@literal null}.
+     * @return {@literal true} if {@code type} is a {@link io.netty.channel.kqueue.KQueueEventLoopGroup}.
+     */
+    public static boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type) {
+        return KQUEUE_RESOURCES.isEventLoopGroup(type);
+    }
+
+    /**
+     * Create a new {@link io.netty.channel.kqueue.KQueueEventLoopGroup}.
+     *
+     * @param nThreads
+     * @param threadFactory
+     * @return the {@link EventLoopGroup}.
+     */
+    public static EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
+        return KQUEUE_RESOURCES.newEventLoopGroup(nThreads, threadFactory);
+    }
+
+    /**
+     * @return the {@link io.netty.channel.kqueue.KQueueDomainSocketChannel} class.
+     */
+    static Class<? extends Channel> domainSocketChannelClass() {
+        return KQUEUE_RESOURCES.domainSocketChannelClass();
+    }
+
+    /**
+     * @return the {@link io.netty.channel.kqueue.KQueueSocketChannel} class.
+     */
+    static Class<? extends Channel> socketChannelClass() {
+        return KQUEUE_RESOURCES.socketChannelClass();
+    }
+
+    /**
+     * @return the {@link io.netty.channel.kqueue.KQueueEventLoopGroup} class.
+     */
+    static Class<? extends EventLoopGroup> eventLoopGroupClass() {
+        return KQUEUE_RESOURCES.eventLoopGroupClass();
+    }
+
+    static SocketAddress newSocketAddress(String socketPath) {
+        return KQUEUE_RESOURCES.newSocketAddress(socketPath);
+    }
+
+    /**
+     * @author Mark Paluch
+     */
+    public interface KqueueResources {
+
+        /**
+         * @param type must not be {@literal null}.
+         * @return {@literal true} if {@code type} is a {@link io.netty.channel.kqueue.KQueueEventLoopGroup}.
+         */
+        boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type);
+
+        /**
+         * Create a new {@link io.netty.channel.kqueue.KQueueEventLoopGroup}.
+         *
+         * @param nThreads
+         * @param threadFactory
+         * @return the {@link EventLoopGroup}.
+         */
+        EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory);
+
+        /**
+         * @return the {@link io.netty.channel.kqueue.KQueueDomainSocketChannel} class.
+         */
+        Class<? extends Channel> domainSocketChannelClass();
+
+        /**
+         * @return the {@link io.netty.channel.kqueue.KQueueSocketChannel} class.
+         */
+        Class<? extends Channel> socketChannelClass();
+
+        /**
+         * @return the {@link io.netty.channel.kqueue.KQueueEventLoopGroup} class.
+         */
+        Class<? extends EventLoopGroup> eventLoopGroupClass();
+
+        SocketAddress newSocketAddress(String socketPath);
+    }
+
+    /**
+     * {@link KqueueResources} for unavailable EPoll.
+     */
+    enum UnavailableKqueueResources implements KqueueResources {
+
+        INSTANCE;
+
+        @Override
+        public Class<? extends Channel> domainSocketChannelClass() {
+
+            checkForKqueueLibrary();
+            return null;
+        }
+
+        @Override
+        public Class<? extends EventLoopGroup> eventLoopGroupClass() {
+
+            checkForKqueueLibrary();
+            return null;
+        }
+
+        @Override
+        public boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type) {
+
+            checkForKqueueLibrary();
+            return false;
+        }
+
+        @Override
+        public EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
+
+            checkForKqueueLibrary();
+            return null;
+        }
+
+        @Override
+        public SocketAddress newSocketAddress(String socketPath) {
+
+            checkForKqueueLibrary();
+            return null;
+        }
+
+        @Override
+        public Class<? extends Channel> socketChannelClass() {
+
+            checkForKqueueLibrary();
+            return null;
+        }
+    }
+
+    /**
+     * {@link KqueueResources} for available kqueue.
+     */
+    enum AvailableKqueueResources implements KqueueResources {
+
+        INSTANCE;
+
+        @Override
+        public boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type) {
+
+            LettuceAssert.notNull(type, "EventLoopGroup type must not be null");
+
+            return type.equals(eventLoopGroupClass());
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
+
+            checkForKqueueLibrary();
+
+            try {
+                Constructor<EventLoopGroup> constructor = (Constructor) eventLoopGroupClass().getDeclaredConstructor(
+                        Integer.TYPE, ThreadFactory.class);
+
+                return constructor.newInstance(nThreads, threadFactory);
+            } catch (ReflectiveOperationException e) {
+                throw new IllegalStateException("Cannot create KQueueEventLoopGroup");
+            }
+        }
+
+        @Override
+        public Class<? extends Channel> domainSocketChannelClass() {
+
+            checkForKqueueLibrary();
+            return forName("io.netty.channel.kqueue.KQueueDomainSocketChannel");
+        }
+
+        @Override
+        public Class<? extends Channel> socketChannelClass() {
+
+            checkForKqueueLibrary();
+            return forName("io.netty.channel.kqueue.KQueueSocketChannel");
+        }
+
+        @Override
+        public Class<? extends EventLoopGroup> eventLoopGroupClass() {
+
+            checkForKqueueLibrary();
+            return forName("io.netty.channel.kqueue.KQueueEventLoopGroup");
+        }
+
+        @Override
+        public SocketAddress newSocketAddress(String socketPath) {
+
+            checkForKqueueLibrary();
+            return new DomainSocketAddress(socketPath);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    static <T> Class<T> forName(String name) {
+
+        try {
+            return (Class) LettuceClassUtils.forName(name);
+        } catch (ClassNotFoundException e) {
+            throw new NoClassDefFoundError(name);
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index eba3f9173c..49f5c3f5f9 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -686,12 +686,17 @@ private String urlEncode(String str) {
      * @return the resolved {@link SocketAddress} based either on host/port or the socket.
      */
     public SocketAddress getResolvedAddress() {
+
         if (getSocket() != null) {
+
+            if (KqueueProvider.isAvailable()) {
+                return KqueueProvider.newSocketAddress(getSocket());
+            }
+
             return EpollProvider.newSocketAddress(getSocket());
         }
-        InetSocketAddress socketAddress = new InetSocketAddress(host, port);
 
-        return socketAddress;
+        return new InetSocketAddress(host, port);
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/Transports.java b/src/main/java/io/lettuce/core/Transports.java
index 515360f49f..29ab94b595 100644
--- a/src/main/java/io/lettuce/core/Transports.java
+++ b/src/main/java/io/lettuce/core/Transports.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core;
 
+import io.lettuce.core.internal.LettuceAssert;
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -62,13 +63,18 @@ static class NativeTransports {
          * @return {@literal true} if a native transport is available.
          */
         static boolean isSocketSupported() {
-            return EpollProvider.isAvailable();
+            return EpollProvider.isAvailable() || KqueueProvider.isAvailable();
         }
 
         /**
          * @return the native transport socket {@link Channel} class.
          */
         static Class<? extends Channel> socketChannelClass() {
+
+            if (KqueueProvider.isAvailable()) {
+                return KqueueProvider.socketChannelClass();
+            }
+
             return EpollProvider.socketChannelClass();
         }
 
@@ -76,6 +82,11 @@ static Class<? extends Channel> socketChannelClass() {
          * @return the native transport domain socket {@link Channel} class.
          */
         static Class<? extends Channel> domainSocketChannelClass() {
+
+            if (KqueueProvider.isAvailable()) {
+                return KqueueProvider.domainSocketChannelClass();
+            }
+
             return EpollProvider.domainSocketChannelClass();
         }
 
@@ -83,7 +94,18 @@ static Class<? extends Channel> domainSocketChannelClass() {
          * @return the native transport {@link EventLoopGroup} class.
          */
         static Class<? extends EventLoopGroup> eventLoopGroupClass() {
+
+            if (KqueueProvider.isAvailable()) {
+                return KqueueProvider.eventLoopGroupClass();
+            }
+
             return EpollProvider.eventLoopGroupClass();
         }
+
+        static void assertAvailable() {
+
+            LettuceAssert.assertState(NativeTransports.isSocketSupported(),
+                    "A unix domain socket connections requires epoll or kqueue and neither is available");
+        }
     }
 }
diff --git a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
index abb5f38dd3..13c0ea17e5 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 import java.util.concurrent.TimeUnit;
 
 import io.lettuce.core.EpollProvider;
+import io.lettuce.core.KqueueProvider;
 
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -66,9 +67,9 @@ public <T extends EventLoopGroup> T allocate(Class<T> type) {
 
     private <T extends ExecutorService> T addReference(T reference) {
 
-        synchronized (refCounter){
+        synchronized (refCounter) {
             long counter = 0;
-            if(refCounter.containsKey(reference)){
+            if (refCounter.containsKey(reference)) {
                 counter = refCounter.get(reference);
             }
 
@@ -145,7 +146,11 @@ public static <T extends EventExecutorGroup> EventExecutorGroup createEventLoopG
             return EpollProvider.newEventLoopGroup(numberOfThreads, new DefaultThreadFactory("lettuce-epollEventLoop", true));
         }
 
-        throw new IllegalArgumentException("Type " + type.getName() + " not supported");
+        if (KqueueProvider.isAvailable() && KqueueProvider.isEventLoopGroup(type)) {
+            return KqueueProvider.newEventLoopGroup(numberOfThreads, new DefaultThreadFactory("lettuce-kqueueEventLoop", true));
+        }
+
+        throw new IllegalArgumentException(String.format("Type %s not supported", type.getName()));
     }
 
     @Override
@@ -194,8 +199,7 @@ public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUni
 
         DefaultPromise<Boolean> overall = new DefaultPromise<Boolean>(GlobalEventExecutor.INSTANCE);
         DefaultPromise<Boolean> lastRelease = new DefaultPromise<Boolean>(GlobalEventExecutor.INSTANCE);
-        Futures.PromiseAggregator<Boolean, Promise<Boolean>> aggregator = new Futures.PromiseAggregator<Boolean, Promise<Boolean>>(
-                overall);
+        Futures.PromiseAggregator<Boolean, Promise<Boolean>> aggregator = new Futures.PromiseAggregator<Boolean, Promise<Boolean>>(overall);
 
         aggregator.expectMore(1 + copy.size());
 
diff --git a/src/test/java/io/lettuce/core/UnixDomainSocketTest.java b/src/test/java/io/lettuce/core/UnixDomainSocketTest.java
index 18ddd362b0..e39dc19f3b 100644
--- a/src/test/java/io/lettuce/core/UnixDomainSocketTest.java
+++ b/src/test/java/io/lettuce/core/UnixDomainSocketTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 import java.io.IOException;
 import java.util.Locale;
 
-import io.lettuce.TestClientResources;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.AfterClass;
@@ -31,11 +30,12 @@
 import org.junit.Rule;
 import org.junit.Test;
 
+import io.lettuce.TestClientResources;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.sentinel.SentinelRule;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
-
 import io.netty.util.internal.SystemPropertyUtil;
 
 /**
@@ -43,32 +43,35 @@
  */
 public class UnixDomainSocketTest {
 
-    public static final String MASTER_ID = "mymaster";
+    private static final String MASTER_ID = "mymaster";
 
     private static RedisClient sentinelClient;
+    private static ClientResources clientResources;
 
     @Rule
     public SentinelRule sentinelRule = new SentinelRule(sentinelClient, false, 26379, 26380);
 
-    protected Logger log = LogManager.getLogger(getClass());
-
-    protected String key = "key";
-    protected String value = "value";
+    private Logger log = LogManager.getLogger(getClass());
+    private String key = "key";
+    private String value = "value";
 
     @BeforeClass
     public static void setupClient() {
+
+        clientResources = TestClientResources.create();
         sentinelClient = getRedisSentinelClient();
     }
 
     @AfterClass
     public static void shutdownClient() {
         FastShutdown.shutdown(sentinelClient);
+        FastShutdown.shutdown(clientResources);
     }
 
     @Test
-    public void standalone_Linux_x86_64_RedisClientWithSocket() throws Exception {
+    public void standalone_RedisClientWithSocket() throws Exception {
 
-        linuxOnly();
+        assumeTestSupported();
 
         RedisURI redisURI = getSocketRedisUri();
 
@@ -83,9 +86,9 @@ public void standalone_Linux_x86_64_RedisClientWithSocket() throws Exception {
     }
 
     @Test
-    public void standalone_Linux_x86_64_ConnectToSocket() throws Exception {
+    public void standalone_ConnectToSocket() throws Exception {
 
-        linuxOnly();
+        assumeTestSupported();
 
         RedisURI redisURI = getSocketRedisUri();
 
@@ -99,25 +102,10 @@ public void standalone_Linux_x86_64_ConnectToSocket() throws Exception {
         FastShutdown.shutdown(redisClient);
     }
 
-    private void linuxOnly() {
-        String osName = SystemPropertyUtil.get("os.name").toLowerCase(Locale.UK).trim();
-        assumeTrue("Only supported on Linux, your os is " + osName, osName.startsWith("linux"));
-    }
-
-    private RedisURI getSocketRedisUri() throws IOException {
-        File file = new File(TestSettings.socket()).getCanonicalFile();
-        return RedisURI.create(RedisURI.URI_SCHEME_REDIS_SOCKET + "://" + file.getCanonicalPath());
-    }
-
-    private RedisURI getSentinelSocketRedisUri() throws IOException {
-        File file = new File(TestSettings.sentinelSocket()).getCanonicalFile();
-        return RedisURI.create(RedisURI.URI_SCHEME_REDIS_SOCKET + "://" + file.getCanonicalPath());
-    }
-
     @Test
-    public void sentinel_Linux_x86_64_RedisClientWithSocket() throws Exception {
+    public void sentinel_RedisClientWithSocket() throws Exception {
 
-        linuxOnly();
+        assumeTestSupported();
 
         RedisURI uri = new RedisURI();
         uri.getSentinels().add(getSentinelSocketRedisUri());
@@ -140,9 +128,9 @@ public void sentinel_Linux_x86_64_RedisClientWithSocket() throws Exception {
     }
 
     @Test
-    public void sentinel_Linux_x86_64_ConnectToSocket() throws Exception {
+    public void sentinel_ConnectToSocket() throws Exception {
 
-        linuxOnly();
+        assumeTestSupported();
 
         RedisURI uri = new RedisURI();
         uri.getSentinels().add(getSentinelSocketRedisUri());
@@ -165,10 +153,10 @@ public void sentinel_Linux_x86_64_ConnectToSocket() throws Exception {
     }
 
     @Test
-    public void sentinel_Linux_x86_64_socket_and_inet() throws Exception {
+    public void sentinel_socket_and_inet() throws Exception {
 
         sentinelRule.waitForMaster(MASTER_ID);
-        linuxOnly();
+        assumeTestSupported();
 
         RedisURI uri = new RedisURI();
         uri.getSentinels().add(getSentinelSocketRedisUri());
@@ -199,7 +187,23 @@ private void someRedisAction(RedisCommands<String, String> connection) {
         assertThat(result).isEqualTo(value);
     }
 
-    protected static RedisClient getRedisSentinelClient() {
+    private static RedisClient getRedisSentinelClient() {
         return RedisClient.create(TestClientResources.get(), RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
     }
+
+    private void assumeTestSupported() {
+        String osName = SystemPropertyUtil.get("os.name").toLowerCase(Locale.UK).trim();
+        assumeTrue("Only supported on Linux, your os is " + osName, osName.startsWith("linux"));
+    }
+
+    private static RedisURI getSocketRedisUri() throws IOException {
+        File file = new File(TestSettings.socket()).getCanonicalFile();
+        return RedisURI.create(RedisURI.URI_SCHEME_REDIS_SOCKET + "://" + file.getCanonicalPath());
+    }
+
+    private static RedisURI getSentinelSocketRedisUri() throws IOException {
+        File file = new File(TestSettings.sentinelSocket()).getCanonicalFile();
+        return RedisURI.create(RedisURI.URI_SCHEME_REDIS_SOCKET + "://" + file.getCanonicalPath());
+    }
+
 }
diff --git a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java
index 3296938825..b11c7f3eb2 100644
--- a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java
@@ -18,8 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.After;
 import org.junit.Before;
@@ -29,14 +27,9 @@
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
 import io.lettuce.core.resource.DefaultClientResources;
-import io.lettuce.core.resource.EventLoopGroupProvider;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.epoll.EpollEventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.util.concurrent.EventExecutorGroup;
-import io.netty.util.concurrent.Future;
+import io.lettuce.core.resource.DefaultEventLoopGroupProvider;
+
 import io.netty.util.concurrent.ImmediateEventExecutor;
-import io.netty.util.concurrent.SucceededFuture;
 
 /**
  * @author Mark Paluch
@@ -48,42 +41,10 @@ public class SingleThreadedReactiveClusterClientTest {
     @Before
     public void before() {
 
-        AtomicReference<EventLoopGroup> ref = new AtomicReference<>();
         DefaultClientResources clientResources = DefaultClientResources.builder()
-                .eventExecutorGroup(ImmediateEventExecutor.INSTANCE).eventLoopGroupProvider(new EventLoopGroupProvider() {
-                    @Override
-                    public <T extends EventLoopGroup> T allocate(Class<T> type) {
-
-                        if (ref.get() == null) {
-
-                            if (type == EpollEventLoopGroup.class) {
-                                ref.set(new EpollEventLoopGroup(1));
-                            } else {
-                                ref.set(new NioEventLoopGroup(1));
-                            }
-                        }
-
-                        return (T) ref.get();
-                    }
-
-                    @Override
-                    public int threadPoolSize() {
-                        return 0;
-                    }
-
-                    @Override
-                    public Future<Boolean> release(EventExecutorGroup eventLoopGroup, long quietPeriod, long timeout,
-                            TimeUnit unit) {
-                        return new SucceededFuture<>(ImmediateEventExecutor.INSTANCE, true);
-                    }
-
-                    @Override
-                    public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
-                        ref.get().shutdownGracefully(quietPeriod, timeout, timeUnit);
-                        return new SucceededFuture<>(ImmediateEventExecutor.INSTANCE, true);
-                    }
-
-                }).commandLatencyCollectorOptions(DefaultCommandLatencyCollectorOptions.disabled()).build();
+                .eventExecutorGroup(ImmediateEventExecutor.INSTANCE)
+                .eventLoopGroupProvider(new DefaultEventLoopGroupProvider(1))
+                .commandLatencyCollectorOptions(DefaultCommandLatencyCollectorOptions.disabled()).build();
 
         client = RedisClusterClient.create(clientResources, RedisURI.create("localhost", 7379));
     }

From 16c5799055a384755fdd88804e957541a3fa318f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 12 May 2017 22:12:18 +0200
Subject: [PATCH 227/808] Disable javadoc linter

---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d6dcef0db2..7f503432bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -417,8 +417,7 @@
                                 <link>http://reactivex.io/RxJava/javadoc/</link>
                                 <link>https://docs.spring.io/spring/docs/current/javadoc-api/</link>
                             </links>
-                            <additionalparam>-Xdoclint:all -Xdoclint:-html -Xdoclint:-syntax -Xdoclint:-missing
-                            </additionalparam>
+                            <additionalparam>-Xdoclint:none</additionalparam>
                             <quiet>true</quiet>
                             <tags>
                                 <tag>

From 7d183e67974f484ade1cfe55afec03a102d90d33 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 28 May 2017 18:28:37 +0200
Subject: [PATCH 228/808] Add support for client certificate authentication
 #540

Lettuce supports now client certificate authentication with SSL connections via SslOptions.

 SslOptions sslOptions = SslOptions.builder()
                .jdkSslProvider()
                .keystore(new File("keystore.jks"), "changeit".toCharArray())
                .truststore(new File("truststore.jks"))
                .build();
---
 Makefile                                      |  42 +++---
 .../io/lettuce/core/SslConnectionBuilder.java |  33 ++++-
 src/main/java/io/lettuce/core/SslOptions.java | 106 ++++++++++++++-
 src/test/bash/create_certificates.sh          | 128 ++++++++++++++++++
 src/test/bash/openssl.cnf                     | 106 +++++++++++++++
 src/test/java/io/lettuce/SslTest.java         |  65 ++++++---
 .../RedisClusterPasswordSecuredSslTest.java   |  28 ++--
 7 files changed, 440 insertions(+), 68 deletions(-)
 create mode 100755 src/test/bash/create_certificates.sh
 create mode 100644 src/test/bash/openssl.cnf

diff --git a/Makefile b/Makefile
index eaa83913ba..e02dde8665 100644
--- a/Makefile
+++ b/Makefile
@@ -228,10 +228,10 @@ cluster-start: work/cluster-node-7379.pid work/cluster-node-7380.pid work/cluste
 work/stunnel.conf:
 	@mkdir -p $(@D)
 
-	@echo cert=$(ROOT_DIR)/work/cert.pem >> $@
-	@echo key=$(ROOT_DIR)/work/key.pem >> $@
-	@echo capath=$(ROOT_DIR)/work/cert.pem >> $@
-	@echo cafile=$(ROOT_DIR)/work/cert.pem >> $@
+	@echo cert=$(ROOT_DIR)/work/ca/certs/foo-host.cert.pem >> $@
+	@echo key=$(ROOT_DIR)/work/ca/private/foo-host.decrypted.key.pem >> $@
+	@echo capath=$(ROOT_DIR)/work/ca/certs/ca.cert.pem >> $@
+	@echo cafile=$(ROOT_DIR)/work/ca/certs/ca.cert.pem >> $@
 	@echo delay=yes >> $@
 	@echo pid=$(ROOT_DIR)/work/stunnel.pid >> $@
 	@echo foreground = no >> $@
@@ -243,9 +243,10 @@ work/stunnel.conf:
 	@echo [stunnel-2] >> $@
 	@echo accept = 127.0.0.1:6444 >> $@
 	@echo connect = 127.0.0.1:6479 >> $@
-	@echo cert=$(ROOT_DIR)/work/localhost.pem >> $@
-	@echo capath=$(ROOT_DIR)/work/localhost.pem >> $@
-	@echo cafile=$(ROOT_DIR)/work/localhost.pem >> $@
+	@echo cert=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
+	@echo key=$(ROOT_DIR)/work/ca/private/localhost.decrypted.key.pem >> $@
+	@echo capath=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
+	@echo cafile=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
 
 	@echo [ssl-cluster-node-1] >> $@
 	@echo accept = 127.0.0.1:7443 >> $@
@@ -259,6 +260,15 @@ work/stunnel.conf:
 	@echo accept = 127.0.0.1:7445 >> $@
 	@echo connect = 127.0.0.1:7481 >> $@
 
+	@echo [stunnel-client-cert] >> $@
+	@echo accept = 127.0.0.1:6445 >> $@
+	@echo connect = 127.0.0.1:6479 >> $@
+	@echo cert=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
+	@echo key=$(ROOT_DIR)/work/ca/private/localhost.decrypted.key.pem >> $@
+	@echo cafile=$(ROOT_DIR)/work/ca/certs/ca.cert.pem >> $@
+	@echo verifyChain=yes >> $@
+	@echo verify=2 >> $@
+
 
 work/stunnel.pid: work/stunnel.conf ssl-keys
 	which stunnel4 >/dev/null 2>&1 && stunnel4 $(ROOT_DIR)/work/stunnel.conf || stunnel $(ROOT_DIR)/work/stunnel.conf
@@ -301,23 +311,13 @@ cleanup: stop
 # SSL Keys
 #  - remove Java keystore as becomes stale
 ##########
-work/key.pem work/cert.pem:
-	@mkdir -p $(@D)
-	openssl genrsa -out work/key.pem 4096
-	openssl req -new -x509 -key work/key.pem -out work/cert.pem -days 365 -subj "/O=lettuce/ST=Some-State/C=DE/CN=lettuce-test"
-	openssl req -new -x509 -key work/key.pem -out work/localhost.pem -days 365 -subj "/O=lettuce/ST=Some-State/C=DE/CN=localhost"
-	chmod go-rwx work/key.pem
-	chmod go-rwx work/cert.pem
-	chmod go-rwx work/localhost.pem
-	- rm -f work/keystore.jks
-	- rm -f work/keystore-localhost.jks
-
 work/keystore.jks:
 	@mkdir -p $(@D)
-	$$JAVA_HOME/bin/keytool -importcert -keystore work/keystore.jks -file work/cert.pem -noprompt -storepass changeit
-	$$JAVA_HOME/bin/keytool -importcert -keystore work/keystore-localhost.jks -file work/localhost.pem -noprompt -storepass different
+	- rm -f work/*.jks
+	- rm -Rf work/ca
+	src/test/bash/create_certificates.sh
 
-ssl-keys: work/key.pem work/cert.pem work/keystore.jks
+ssl-keys: work/keystore.jks
 
 stop:
 	pkill stunnel || true
diff --git a/src/main/java/io/lettuce/core/SslConnectionBuilder.java b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
index ec2423ec87..738f822dc5 100644
--- a/src/main/java/io/lettuce/core/SslConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
@@ -23,6 +23,9 @@
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
@@ -120,6 +123,13 @@ protected void initChannel(Channel channel) throws Exception {
                 sslContextBuilder.trustManager(InsecureTrustManagerFactory.INSTANCE);
             }
 
+            if (sslOptions.getKeystore() != null) {
+                try (InputStream is = sslOptions.getKeystore().openStream()) {
+                    sslContextBuilder.keyManager(createKeyManagerFactory(is,
+                            sslOptions.getKeystorePassword().length == 0 ? null : sslOptions.getKeystorePassword()));
+                }
+            }
+
             if (sslOptions.getTruststore() != null) {
                 try (InputStream is = sslOptions.getTruststore().openStream()) {
                     sslContextBuilder.trustManager(createTrustManagerFactory(is,
@@ -225,16 +235,33 @@ public CompletableFuture<Boolean> channelInitialized() {
             return initializedFuture;
         }
 
-        private static TrustManagerFactory createTrustManagerFactory(InputStream inputStream, char[] storePassword)
+        private static KeyManagerFactory createKeyManagerFactory(InputStream inputStream, char[] storePassword)
                 throws GeneralSecurityException, IOException {
 
-            KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+            KeyStore keyStore = getKeyStore(inputStream, storePassword);
+
+            KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            keyManagerFactory.init(keyStore, storePassword == null ? new char[0] : storePassword);
+
+            return keyManagerFactory;
+        }
+
+        private static KeyStore getKeyStore(InputStream inputStream, char[] storePassword) throws KeyStoreException,
+                IOException, NoSuchAlgorithmException, CertificateException {
+            KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
 
             try {
-                trustStore.load(inputStream, storePassword);
+                keyStore.load(inputStream, storePassword);
             } finally {
                 inputStream.close();
             }
+            return keyStore;
+        }
+
+        private static TrustManagerFactory createTrustManagerFactory(InputStream inputStream, char[] storePassword)
+                throws GeneralSecurityException, IOException {
+
+            KeyStore trustStore = getKeyStore(inputStream, storePassword);
 
             TrustManagerFactory trustManagerFactory = TrustManagerFactory
                     .getInstance(TrustManagerFactory.getDefaultAlgorithm());
diff --git a/src/main/java/io/lettuce/core/SslOptions.java b/src/main/java/io/lettuce/core/SslOptions.java
index af0c866979..4783a3a7e9 100644
--- a/src/main/java/io/lettuce/core/SslOptions.java
+++ b/src/main/java/io/lettuce/core/SslOptions.java
@@ -18,6 +18,7 @@
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Arrays;
 
 import io.lettuce.core.internal.LettuceAssert;
 
@@ -35,17 +36,23 @@ public class SslOptions {
     public static final SslProvider DEFAULT_SSL_PROVIDER = SslProvider.JDK;
 
     private final SslProvider sslProvider;
+    private final URL keystore;
+    private final char[] keystorePassword;
     private final URL truststore;
     private final char[] truststorePassword;
 
     protected SslOptions(Builder builder) {
         this.sslProvider = builder.sslProvider;
+        this.keystore = builder.keystore;
+        this.keystorePassword = builder.keystorePassword;
         this.truststore = builder.truststore;
         this.truststorePassword = builder.truststorePassword;
     }
 
     protected SslOptions(SslOptions original) {
         this.sslProvider = original.getSslProvider();
+        this.keystore = original.keystore;
+        this.keystorePassword = original.keystorePassword;
         this.truststore = original.getTruststore();
         this.truststorePassword = original.getTruststorePassword();
     }
@@ -84,6 +91,8 @@ public static SslOptions create() {
     public static class Builder {
 
         private SslProvider sslProvider = DEFAULT_SSL_PROVIDER;
+        private URL keystore;
+        private char[] keystorePassword = new char[0];
         private URL truststore;
         private char[] truststorePassword = new char[0];
 
@@ -100,8 +109,8 @@ public Builder jdkSslProvider() {
         }
 
         /**
-         * Use the OpenSSL provider for SSL connections. The OpenSSL provider requires the
-         * <a href="http://netty.io/wiki/forked-tomcat-native.html">{@code netty-tcnative}</a> dependency with the OpenSSL JNI
+         * Use the OpenSSL provider for SSL connections. The OpenSSL provider requires the <a
+         * href="http://netty.io/wiki/forked-tomcat-native.html">{@code netty-tcnative}</a> dependency with the OpenSSL JNI
          * binary.
          *
          * @return {@code this}
@@ -124,6 +133,80 @@ private Builder sslProvider(SslProvider sslProvider) {
             return this;
         }
 
+        /**
+         * Sets the Keystore file to load client certificates. The key store file must be supported by
+         * {@link java.security.KeyStore} which is {@code jks} by default. Keystores are reloaded on each connection attempt
+         * that allows to replace certificates during runtime.
+         *
+         * @param keystore the keystore file, must not be {@literal null}.
+         * @return {@code this}
+         * @since 4.4
+         */
+        public Builder keystore(File keystore) {
+            return keystore(keystore, new char[0]);
+        }
+
+        /**
+         * Sets the Keystore file to load client certificates. The key store file must be supported by
+         * {@link java.security.KeyStore} which is {@code jks} by default. Keystores are reloaded on each connection attempt
+         * that allows to replace certificates during runtime.
+         *
+         * @param keystore the keystore file, must not be {@literal null}.
+         * @param keystorePassword the keystore password. May be empty to omit password and the keystore integrity check.
+         * @return {@code this}
+         * @since 4.4
+         */
+        public Builder keystore(File keystore, char[] keystorePassword) {
+
+            LettuceAssert.notNull(keystore, "Keystore must not be null");
+            LettuceAssert.isTrue(keystore.exists(), String.format("Keystore file %s does not exist", truststore));
+            LettuceAssert.isTrue(keystore.isFile(), String.format("Keystore file %s is not a file", truststore));
+
+            try {
+                return keystore(keystore.toURI().toURL(), keystorePassword);
+            } catch (MalformedURLException e) {
+                throw new IllegalArgumentException(e);
+            }
+        }
+
+        /**
+         * Sets the Keystore resource to load client certificates. The trust store file must be supported by
+         * {@link java.security.KeyStore} which is {@code jks} by default. Keystore are reloaded on each connection attempt that
+         * allows to replace certificates during runtime.
+         *
+         * @param keystore the keystore file, must not be {@literal null}.
+         * @return {@code this}
+         * @since 4.4
+         */
+        public Builder keystore(URL keystore) {
+            return keystore(keystore, new char[0]);
+        }
+
+        /**
+         * Sets the Keystore resource to load client certificates. The trust store file must be supported by
+         * {@link java.security.KeyStore} which is {@code jks} by default. Keystores are reloaded on each connection attempt
+         * that allows to replace certificates during runtime.
+         *
+         * @param keystore the keystore file, must not be {@literal null}.
+         * @param keystorePassword the keystore password. May be empty to omit password and the keystore integrity check.
+         * @return {@code this}
+         * @since 4.4
+         */
+        public Builder keystore(URL keystore, char[] keystorePassword) {
+
+            LettuceAssert.notNull(keystore, "Keystore must not be null");
+
+            this.keystore = keystore;
+
+            if (keystorePassword != null) {
+                this.keystorePassword = Arrays.copyOf(keystorePassword, keystorePassword.length);
+            } else {
+                this.keystorePassword = new char[0];
+            }
+
+            return this;
+        }
+
         /**
          * Sets the Truststore file to load trusted certificates. The trust store file must be supported by
          * {@link java.security.KeyStore} which is {@code jks} by default. Truststores are reloaded on each connection attempt
@@ -212,7 +295,6 @@ public SslOptions build() {
     }
 
     /**
-     *
      * @return the configured {@link SslProvider}.
      */
     public SslProvider getSslProvider() {
@@ -220,7 +302,20 @@ public SslProvider getSslProvider() {
     }
 
     /**
-     *
+     * @return the keystore {@link URL}.
+     */
+    public URL getKeystore() {
+        return keystore;
+    }
+
+    /**
+     * @return the password for the keystore. May be empty.
+     */
+    public char[] getKeystorePassword() {
+        return Arrays.copyOf(keystorePassword, keystorePassword.length);
+    }
+
+    /**
      * @return the truststore {@link URL}.
      */
     public URL getTruststore() {
@@ -228,10 +323,9 @@ public URL getTruststore() {
     }
 
     /**
-     *
      * @return the password for the truststore. May be empty.
      */
     public char[] getTruststorePassword() {
-        return truststorePassword;
+        return Arrays.copyOf(truststorePassword, truststorePassword.length);
     }
 }
diff --git a/src/test/bash/create_certificates.sh b/src/test/bash/create_certificates.sh
new file mode 100755
index 0000000000..616a70ab3c
--- /dev/null
+++ b/src/test/bash/create_certificates.sh
@@ -0,0 +1,128 @@
+#!/bin/bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+CA_DIR=work/ca
+TRUSTSTORE_FILE=work/truststore.jks
+KEYSTORE_FILE=work/keystore.jks
+
+if [[ -d work/ca ]] ; then
+    rm -Rf ${CA_DIR}
+fi
+
+if [[ -f ${TRUSTSTORE_FILE} ]] ; then
+    rm -Rf ${TRUSTSTORE_FILE}
+fi
+
+if [[ -f ${KEYSTORE_FILE} ]] ; then
+    rm -Rf ${KEYSTORE_FILE}
+fi
+
+if [ ! -x "$(which openssl)" ] ; then
+   echo "[ERROR] No openssl in PATH"
+   exit 1
+fi
+
+KEYTOOL=keytool
+
+if [  ! -x "${KEYTOOL}" ] ; then
+   KEYTOOL=${JAVA_HOME}/bin/keytool
+fi
+
+if [  ! -x "${KEYTOOL}" ] ; then
+   echo "[ERROR] No keytool in PATH/JAVA_HOME"
+   exit 1
+fi
+
+mkdir -p ${CA_DIR}/private ${CA_DIR}/certs ${CA_DIR}/crl ${CA_DIR}/csr ${CA_DIR}/newcerts ${CA_DIR}/intermediate
+
+echo "[INFO] Generating CA private key"
+# Less bits = less secure = faster to generate
+openssl genrsa -passout pass:changeit -aes256 -out ${CA_DIR}/private/ca.key.pem 2048
+
+chmod 400 ${CA_DIR}/private/ca.key.pem
+
+echo "[INFO] Generating CA certificate"
+openssl req -config ${DIR}/openssl.cnf \
+      -key ${CA_DIR}/private/ca.key.pem \
+      -new -x509 -days 7300 -sha256 -extensions v3_ca \
+      -out ${CA_DIR}/certs/ca.cert.pem \
+      -passin pass:changeit \
+      -subj "/C=NN/ST=Unknown/L=Unknown/O=lettuce/CN=CA Certificate"
+
+echo "[INFO] Prepare CA database"
+echo 1000 > ${CA_DIR}/serial
+touch ${CA_DIR}/index.txt
+
+function generateKey {
+
+    host=$1
+
+    echo "[INFO] Generating server private key"
+    openssl genrsa -aes256 \
+          -passout pass:changeit \
+          -out ${CA_DIR}/private/${host}.key.pem 2048
+
+    openssl rsa -in ${CA_DIR}/private/${host}.key.pem \
+          -out ${CA_DIR}/private/${host}.decrypted.key.pem \
+          -passin pass:changeit
+
+    chmod 400 ${CA_DIR}/private/${host}.key.pem
+    chmod 400 ${CA_DIR}/private/${host}.decrypted.key.pem
+
+    echo "[INFO] Generating server certificate request"
+    openssl req -config ${DIR}/openssl.cnf \
+          -key ${CA_DIR}/private/${host}.key.pem \
+          -passin pass:changeit \
+          -new -sha256 -out ${CA_DIR}/csr/${host}.csr.pem \
+          -subj "/C=NN/ST=Unknown/L=Unknown/O=lettuce/CN=${host}"
+
+    echo "[INFO] Signing certificate request"
+    openssl ca -config ${DIR}/openssl.cnf \
+          -extensions server_cert -days 375 -notext -md sha256 \
+          -passin pass:changeit \
+          -batch \
+          -in ${CA_DIR}/csr/${host}.csr.pem \
+          -out ${CA_DIR}/certs/${host}.cert.pem
+}
+
+generateKey "localhost"
+generateKey "foo-host"
+
+echo "[INFO] Generating client auth private key"
+openssl genrsa -aes256 \
+      -passout pass:changeit \
+      -out ${CA_DIR}/private/client.key.pem 2048
+
+openssl rsa -in ${CA_DIR}/private/client.key.pem \
+      -out ${CA_DIR}/private/client.decrypted.key.pem \
+      -passin pass:changeit
+
+chmod 400 ${CA_DIR}/private/client.key.pem
+
+echo "[INFO] Generating client certificate request"
+openssl req -config ${DIR}/openssl.cnf \
+      -key ${CA_DIR}/private/client.key.pem \
+      -passin pass:changeit \
+      -new -sha256 -out ${CA_DIR}/csr/client.csr.pem \
+      -subj "/C=NN/ST=Unknown/L=Unknown/O=lettuce/CN=client"
+
+echo "[INFO] Signing certificate request"
+openssl ca -config ${DIR}/openssl.cnf \
+      -extensions usr_cert -days 375 -notext -md sha256 \
+      -passin pass:changeit \
+      -batch \
+      -in ${CA_DIR}/csr/client.csr.pem \
+      -out ${CA_DIR}/certs/client.cert.pem
+
+echo "[INFO] Creating PKCS12 file with client certificate"
+openssl pkcs12 -export -clcerts \
+      -in ${CA_DIR}/certs/client.cert.pem \
+      -inkey ${CA_DIR}/private/client.decrypted.key.pem \
+      -passout pass:changeit \
+      -out ${CA_DIR}/client.p12
+
+${KEYTOOL} -importcert -keystore ${TRUSTSTORE_FILE} -file ${CA_DIR}/certs/ca.cert.pem -noprompt -storepass changeit
+${KEYTOOL} -importkeystore \
+                              -srckeystore ${CA_DIR}/client.p12 -srcstoretype PKCS12 -srcstorepass changeit\
+                              -destkeystore ${KEYSTORE_FILE} -deststoretype JKS \
+                              -noprompt -storepass changeit
diff --git a/src/test/bash/openssl.cnf b/src/test/bash/openssl.cnf
new file mode 100644
index 0000000000..fdf9064d8e
--- /dev/null
+++ b/src/test/bash/openssl.cnf
@@ -0,0 +1,106 @@
+[ ca ]
+# `man ca`
+default_ca = CA_default
+
+[ CA_default ]
+# Directory and file locations.
+dir               = work/ca
+certs             = $dir/certs
+crl_dir           = $dir/crl
+new_certs_dir     = $dir/newcerts
+database          = $dir/index.txt
+serial            = $dir/serial
+RANDFILE          = $dir/private/.rand
+
+# The root key and root certificate.
+private_key       = $dir/private/ca.key.pem
+certificate       = $dir/certs/ca.cert.pem
+
+# For certificate revocation lists.
+crlnumber         = $dir/crlnumber
+crl               = $dir/crl/ca.crl.pem
+crl_extensions    = crl_ext
+default_crl_days  = 30
+
+# SHA-1 is deprecated, so use SHA-2 instead.
+default_md        = sha256
+
+name_opt          = ca_default
+cert_opt          = ca_default
+default_days      = 375
+preserve          = no
+policy            = policy_strict
+
+[ policy_strict ]
+# The root CA should only sign intermediate certificates that match.
+# See the POLICY FORMAT section of `man ca`.
+countryName             = match
+stateOrProvinceName     = match
+organizationName        = match
+organizationalUnitName  = optional
+commonName              = supplied
+emailAddress            = optional
+
+[ req ]
+# Options for the `req` tool (`man req`).
+default_bits        = 2048
+distinguished_name  = req_distinguished_name
+string_mask         = utf8only
+
+# SHA-1 is deprecated, so use SHA-2 instead.
+default_md          = sha256
+
+# Extension to add when the -x509 option is used.
+x509_extensions     = v3_ca
+
+[ req_distinguished_name ]
+# See <https://en.wikipedia.org/wiki/Certificate_signing_request>.
+countryName                     = Country Name (2 letter code)
+stateOrProvinceName             = State or Province Name
+localityName                    = Locality Name
+0.organizationName              = Organization Name
+organizationalUnitName          = Organizational Unit Name
+commonName                      = Common Name
+emailAddress                    = Email Address
+
+# Optionally, specify some defaults.
+countryName_default             = NN
+stateOrProvinceName_default     = Vault Test
+localityName_default            =
+0.organizationName_default      = spring-cloud-vault-config
+#organizationalUnitName_default =
+#emailAddress_default           = info@spring-cloud-vault-config.dummy
+
+[ v3_ca ]
+# Extensions for a typical CA (`man x509v3_config`).
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer
+basicConstraints = critical, CA:true
+keyUsage = critical, digitalSignature, cRLSign, keyCertSign
+
+[ v3_intermediate_ca ]
+# Extensions for a typical intermediate CA (`man x509v3_config`).
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer
+basicConstraints = critical, CA:true, pathlen:0
+keyUsage = critical, digitalSignature, cRLSign, keyCertSign
+
+[ usr_cert ]
+# Extensions for client certificates (`man x509v3_config`).
+basicConstraints = CA:FALSE
+nsCertType = client, email
+nsComment = "OpenSSL Generated Client Certificate"
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid,issuer
+keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment
+extendedKeyUsage = clientAuth, emailProtection
+
+[ server_cert ]
+# Extensions for server certificates (`man x509v3_config`).
+basicConstraints = CA:FALSE
+nsCertType = server
+nsComment = "OpenSSL Generated Server Certificate"
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid,issuer:always
+keyUsage = critical, digitalSignature, keyEncipherment
+extendedKeyUsage = serverAuth
\ No newline at end of file
diff --git a/src/test/java/io/lettuce/SslTest.java b/src/test/java/io/lettuce/SslTest.java
index 90e08c2697..debf270d0d 100644
--- a/src/test/java/io/lettuce/SslTest.java
+++ b/src/test/java/io/lettuce/SslTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@
 public class SslTest extends AbstractTest {
 
     private static final String KEYSTORE = "work/keystore.jks";
-    private static final String LOCALHOST_KEYSTORE = "work/keystore-localhost.jks";
+    private static final String TRUSTSTORE = "work/truststore.jks";
     private static final RedisClient redisClient = DefaultRedisClient.get();
 
     private static final RedisURI URI_NO_VERIFY = RedisURI.Builder.redis(host(), sslPort()) //
@@ -56,18 +56,22 @@ public class SslTest extends AbstractTest {
             .withVerifyPeer(true) //
             .build();
 
+    private static final RedisURI URI_CLIENT_CERT_AUTH = RedisURI.Builder.redis(host(), sslPort(2)) //
+            .withSsl(true) //
+            .withVerifyPeer(true) //
+            .build();
+
     @Before
-    public void before() throws Exception {
+    public void before() {
 
         assumeTrue("Assume that stunnel runs on port 6443", Sockets.isOpen(host(), sslPort()));
-        assertThat(new File(KEYSTORE)).exists();
+        assertThat(new File(TRUSTSTORE)).exists();
 
-        System.setProperty("javax.net.ssl.trustStore", KEYSTORE);
         redisClient.setOptions(ClientOptions.create());
     }
 
     @Test
-    public void standaloneWithSsl() throws Exception {
+    public void standaloneWithSsl() {
 
         RedisCommands<String, String> connection = redisClient.connect(URI_NO_VERIFY).sync();
         connection.set("key", "value");
@@ -76,11 +80,11 @@ public void standaloneWithSsl() throws Exception {
     }
 
     @Test
-    public void standaloneWithJdkSsl() throws Exception {
+    public void standaloneWithJdkSsl() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(new File(LOCALHOST_KEYSTORE)) //
+                .truststore(new File(TRUSTSTORE)) //
                 .build();
         setOptions(sslOptions);
 
@@ -92,19 +96,44 @@ public void standaloneWithJdkSslUsingTruststoreUrl() throws Exception {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(new File(LOCALHOST_KEYSTORE).toURI().toURL()) //
+                .truststore(new File(TRUSTSTORE)) //
                 .build();
         setOptions(sslOptions);
 
         verifyConnection(URI_VERIFY);
     }
 
+    @Test
+    public void standaloneWithClientCertificates() throws Exception {
+
+        SslOptions sslOptions = SslOptions.builder() //
+                .jdkSslProvider() //
+                .keystore(new File(KEYSTORE), "changeit".toCharArray()) //
+                .truststore(new File(TRUSTSTORE)) //
+                .build();
+        setOptions(sslOptions);
+
+        verifyConnection(URI_CLIENT_CERT_AUTH);
+    }
+
+    @Test(expected = RedisConnectionException.class)
+    public void standaloneWithClientCertificatesWithoutKeystore() throws Exception {
+
+        SslOptions sslOptions = SslOptions.builder() //
+                .jdkSslProvider() //
+                .truststore(new File(TRUSTSTORE)) //
+                .build();
+        setOptions(sslOptions);
+
+        verifyConnection(URI_CLIENT_CERT_AUTH);
+    }
+
     @Test(expected = RedisConnectionException.class)
     public void standaloneWithJdkSslUsingTruststoreUrlWithWrongPassword() throws Exception {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(new File(LOCALHOST_KEYSTORE).toURI().toURL(), "knödel") //
+                .truststore(new File(TRUSTSTORE), "knödel") //
                 .build();
         setOptions(sslOptions);
 
@@ -112,7 +141,7 @@ public void standaloneWithJdkSslUsingTruststoreUrlWithWrongPassword() throws Exc
     }
 
     @Test(expected = RedisConnectionException.class)
-    public void standaloneWithJdkSslFailsWithWrongTruststore() throws Exception {
+    public void standaloneWithJdkSslFailsWithWrongTruststore() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
@@ -123,13 +152,13 @@ public void standaloneWithJdkSslFailsWithWrongTruststore() throws Exception {
     }
 
     @Test
-    public void standaloneWithOpenSsl() throws Exception {
+    public void standaloneWithOpenSsl() {
 
         assumeTrue(OpenSsl.isAvailable());
 
         SslOptions sslOptions = SslOptions.builder() //
                 .openSslProvider() //
-                .truststore(new File(LOCALHOST_KEYSTORE)) //
+                .truststore(new File(TRUSTSTORE)) //
                 .build();
         setOptions(sslOptions);
 
@@ -137,7 +166,7 @@ public void standaloneWithOpenSsl() throws Exception {
     }
 
     @Test(expected = RedisConnectionException.class)
-    public void standaloneWithOpenSslFailsWithWrongTruststore() throws Exception {
+    public void standaloneWithOpenSslFailsWithWrongTruststore() {
 
         assumeTrue(OpenSsl.isAvailable());
 
@@ -150,7 +179,7 @@ public void standaloneWithOpenSslFailsWithWrongTruststore() throws Exception {
     }
 
     @Test
-    public void pingBeforeActivate() throws Exception {
+    public void pingBeforeActivate() {
 
         redisClient.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
 
@@ -160,7 +189,6 @@ public void pingBeforeActivate() throws Exception {
     @Test
     public void regularSslWithReconnect() throws Exception {
 
-
         RedisCommands<String, String> connection = redisClient.connect(URI_NO_VERIFY).sync();
         connection.quit();
         Thread.sleep(200);
@@ -169,7 +197,7 @@ public void regularSslWithReconnect() throws Exception {
     }
 
     @Test(expected = RedisConnectionException.class)
-    public void sslWithVerificationWillFail() throws Exception {
+    public void sslWithVerificationWillFail() {
 
         RedisURI redisUri = RedisURI.create("rediss://" + host() + ":" + sslPort());
         redisClient.connect(redisUri).sync();
@@ -200,8 +228,7 @@ public void pubSubSsl() throws Exception {
     @Test(timeout = 10000)
     public void pubSubSslAndBreakConnection() throws Exception {
 
-        RedisURI redisURI = RedisURI.Builder.redis(host(), sslPort()).withSsl(true).withVerifyPeer(false)
-                .build();
+        RedisURI redisURI = RedisURI.Builder.redis(host(), sslPort()).withSsl(true).withVerifyPeer(false).build();
         redisClient.setOptions(ClientOptions.builder().suspendReconnectOnProtocolFailure(true).build());
 
         RedisPubSubAsyncCommands<String, String> connection = redisClient.connectPubSub(redisURI).async();
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
index 5c53842f94..6a74d79354 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,25 +15,21 @@
  */
 package io.lettuce.core.cluster;
 
-import static io.lettuce.core.TestSettings.*;
-import static org.assertj.core.api.Assertions.*;
-import static org.junit.Assume.*;
+import static io.lettuce.core.TestSettings.host;
+import static io.lettuce.core.TestSettings.hostAddr;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assume.assumeTrue;
 
-import java.io.File;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import io.lettuce.TestClientResources;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
 
 import io.lettuce.Sockets;
-import io.lettuce.core.AbstractTest;
-import io.lettuce.core.FastShutdown;
-import io.lettuce.core.RedisCommandExecutionException;
-import io.lettuce.core.RedisException;
-import io.lettuce.core.RedisURI;
+import io.lettuce.TestClientResources;
+import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.sync.Executions;
@@ -44,8 +40,6 @@
  */
 public class RedisClusterPasswordSecuredSslTest extends AbstractTest {
 
-    public static final String KEYSTORE = "work/keystore.jks";
-
     public static final int CLUSTER_PORT_SSL_1 = 7443;
     public static final int CLUSTER_PORT_SSL_2 = 7444;
     public static final int CLUSTER_PORT_SSL_3 = 7445;
@@ -62,8 +56,6 @@ public void before() throws Exception {
         assumeTrue("Assume that stunnel runs on port 7443", Sockets.isOpen(host(), CLUSTER_PORT_SSL_1));
         assumeTrue("Assume that stunnel runs on port 7444", Sockets.isOpen(host(), CLUSTER_PORT_SSL_2));
         assumeTrue("Assume that stunnel runs on port 7445", Sockets.isOpen(host(), CLUSTER_PORT_SSL_3));
-        assertThat(new File(KEYSTORE)).exists();
-        System.setProperty("javax.net.ssl.trustStore", KEYSTORE);
     }
 
     @AfterClass
@@ -137,8 +129,7 @@ public void nodeSelectionApiShouldWork() throws Exception {
     @Test
     public void connectionWithoutPasswordShouldFail() throws Exception {
 
-        RedisURI redisURI = RedisURI.builder().redis(host(), CLUSTER_PORT_SSL_1).withSsl(true).withVerifyPeer(false)
-                .build();
+        RedisURI redisURI = RedisURI.builder().redis(host(), CLUSTER_PORT_SSL_1).withSsl(true).withVerifyPeer(false).build();
         RedisClusterClient redisClusterClient = RedisClusterClient.create(TestClientResources.get(), redisURI);
 
         try {
@@ -153,8 +144,7 @@ public void connectionWithoutPasswordShouldFail() throws Exception {
     @Test
     public void connectionWithoutPasswordShouldFail2() throws Exception {
 
-        RedisURI redisURI = RedisURI.builder().redis(host(), CLUSTER_PORT_SSL_1).withSsl(true).withVerifyPeer(false)
-                .build();
+        RedisURI redisURI = RedisURI.builder().redis(host(), CLUSTER_PORT_SSL_1).withSsl(true).withVerifyPeer(false).build();
         RedisClusterClient redisClusterClient = RedisClusterClient.create(TestClientResources.get(), redisURI);
 
         try {

From 4b8b413a9fb429f8941b142dd1fd6911227837ec Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 28 May 2017 18:29:50 +0200
Subject: [PATCH 229/808] Polishing

Reuse existing methods in SslOptions. Reformat code.
---
 src/main/java/io/lettuce/core/SslOptions.java | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/lettuce/core/SslOptions.java b/src/main/java/io/lettuce/core/SslOptions.java
index 4783a3a7e9..c32efd0f51 100644
--- a/src/main/java/io/lettuce/core/SslOptions.java
+++ b/src/main/java/io/lettuce/core/SslOptions.java
@@ -235,18 +235,10 @@ public Builder truststore(File truststore, String truststorePassword) {
             LettuceAssert.isTrue(truststore.isFile(), String.format("Truststore file %s is not a file", truststore));
 
             try {
-                this.truststore = truststore.toURI().toURL();
+                return truststore(truststore.toURI().toURL(), truststorePassword);
             } catch (MalformedURLException e) {
                 throw new IllegalArgumentException(e);
             }
-
-            if (LettuceStrings.isNotEmpty(truststorePassword)) {
-                this.truststorePassword = truststorePassword.toCharArray();
-            } else {
-                this.truststorePassword = new char[0];
-            }
-
-            return this;
         }
 
         /**
@@ -273,6 +265,7 @@ public Builder truststore(URL truststore) {
         public Builder truststore(URL truststore, String truststorePassword) {
 
             LettuceAssert.notNull(truststore, "Truststore must not be null");
+
             this.truststore = truststore;
 
             if (LettuceStrings.isNotEmpty(truststorePassword)) {

From 96f4af2168309b9e6354ffd37a16ec9442f7f3f6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 28 May 2017 18:47:24 +0200
Subject: [PATCH 230/808] Remove Java 9 build profile #310

Lettuce build does not require a specific build profile anymore.
---
 pom.xml | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7f503432bc..6e5b2251a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -365,27 +365,6 @@
 
         </profile>
 
-        <profile>
-
-            <id>java9</id>
-
-            <activation>
-                <jdk>9</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>--add-opens=java.base/java.nio=ALL-UNNAMED
-                                --add-opens=java.base/java.lang=ALL-UNNAMED
-                            </argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
 
             <id>sonatype-oss-release</id>
@@ -762,6 +741,7 @@
                 </plugins>
             </build>
         </profile>
+
     </profiles>
 
     <build>

From cdbb3376bfb3d2e93b12e6c8baa8e47d646de505 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 28 May 2017 19:11:03 +0200
Subject: [PATCH 231/808] Remove verifyChain from stunnel config

verifyChain is not available across all involved versions.
---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index e02dde8665..9e10e2358e 100644
--- a/Makefile
+++ b/Makefile
@@ -266,7 +266,6 @@ work/stunnel.conf:
 	@echo cert=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
 	@echo key=$(ROOT_DIR)/work/ca/private/localhost.decrypted.key.pem >> $@
 	@echo cafile=$(ROOT_DIR)/work/ca/certs/ca.cert.pem >> $@
-	@echo verifyChain=yes >> $@
 	@echo verify=2 >> $@
 
 

From 06b05e0afa8966d16ff4fd4d2fba1444eb30e52a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 28 May 2017 19:12:18 +0200
Subject: [PATCH 232/808] Adjust dependencies for Java 9 build #310

Upgrade to Spring Framework 5.0 RC1. Provide CDI beans to prevent hits from JMH class path scanning.
---
 pom.xml                                          | 16 +++++++++++++++-
 .../java/io/lettuce/core/support/CdiTest.java    | 13 +++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e5b2251a1..0a4e0ff936 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
         <netty-version>4.1.11.Final</netty-version>
-        <spring-version>4.3.6.RELEASE</spring-version>
+        <spring-version>5.0.0.RC1</spring-version>
     </properties>
 
     <scm>
@@ -188,6 +188,20 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring-version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>${spring-version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <!-- CDI -->
 
         <dependency>
diff --git a/src/test/java/io/lettuce/core/support/CdiTest.java b/src/test/java/io/lettuce/core/support/CdiTest.java
index 5ac548f669..149781893c 100644
--- a/src/test/java/io/lettuce/core/support/CdiTest.java
+++ b/src/test/java/io/lettuce/core/support/CdiTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,14 +21,14 @@
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
 
-import io.lettuce.core.AbstractRedisClientTest;
-import io.lettuce.core.FastShutdown;
 import org.apache.webbeans.cditest.CdiTestContainer;
 import org.apache.webbeans.cditest.CdiTestContainerLoader;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisConnectionStateListener;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.resource.ClientResources;
@@ -56,11 +56,16 @@ public RedisURI redisURI() {
     }
 
     @Produces
-    @PersonDB
     public ClientResources clientResources() {
         return DefaultClientResources.create();
     }
 
+    @Produces
+    @PersonDB
+    public ClientResources personClientResources() {
+        return DefaultClientResources.create();
+    }
+
     public void shutdownClientResources(@Disposes ClientResources clientResources) throws Exception {
         FastShutdown.shutdown(clientResources);
     }

From 714718e8fa196f7401c43b5bd5fe8181f90b1a4f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 28 May 2017 19:14:03 +0200
Subject: [PATCH 233/808] Mention Java 9 compatibility #310

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 7a26e7d4f0..9ba99b4645 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ This version of lettuce has been tested against the latest Redis source-build.
 * [CDI](https://github.com/mp911de/lettuce/wiki/CDI-Support) and [Spring](https://github.com/mp911de/lettuce/wiki/Spring-Support) integration
 * [Codecs](https://github.com/mp911de/lettuce/wiki/Codecs) (for UTF8/bit/JSON etc. representation of your data)
 * multiple [Command Interfaces](https://github.com/mp911de/lettuce/wiki/Command-Interfaces-%284.0%29)
+* Compatible with Java 8 and 9 (automatic module w/o descriptors)
 
 See the [Wiki](https://github.com/mp911de/lettuce/wiki) for more docs.
 

From 363272cce0bbbccf999b7f47476cc0be3f5b5a5f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 28 May 2017 19:21:32 +0200
Subject: [PATCH 234/808] Add Spring Milestone repo for 5.0 RC1 artifacts #310

---
 pom.xml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0a4e0ff936..c72d90b708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,14 +56,6 @@
         </developer>
     </developers>
 
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/libs-milestone</url>
-        </repository>
-    </repositories>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
@@ -79,6 +71,16 @@
         <tag>HEAD</tag>
     </scm>
 
+    <!-- Required for Spring RC artifacts -->
+
+    <repositories>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/libs-milestone</url>
+        </repository>
+    </repositories>
+
     <dependencies>
 
         <!-- Start of Core Dependencies -->

From db213457f99744b3043a4c09ac8af3c14e6c3ac4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 31 May 2017 23:32:53 +0200
Subject: [PATCH 235/808] Reduce cross-thread queue sharing #544
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Queues used in CommandHandler are no longer used as a single queue across all threads (user threads, netty I/O) threads but aligned by their usage type.

Transit queue
The transit queue was intended to not lose commands if a write operation runs into an error. The transit queue is now replaced with netty write future listeners that either cancel commands (at most once) or retry commands (at least once).

Queue (now: Disconnected buffer)
The previous queue was used to enqueue commands after a command has reached the netty I/O thread and was written to the I/O. It was also used as protocol stack to process Redis responses and correlate the responses. The queue is now renamed to disconnectedBuffer and used only for command queueing that are issued when the connection is disconnected. A disconnect will move (prepend) the protocol stack to the disconnected buffer.

Stack
Handles the Redis protocol response stack to correlate responses. Backed by ArrayDeque

Command buffer
To buffer commands when setAutoFlushCommands is false.

Disconnected buffer and Command buffer use bounded queues if request queue limiting is activated: LinkedBlockingQueue for large limits (above 200000 items, configurable with -Dio.lettuce.core.LettuceFactories.array-queue-threshold=…), ArrayBlockingQueue for small queue sizes, otherwise ConcurrentLinkedDeque.

Before appending commands to any queue (Disconnected buffer, Command buffer, Stack), a bound check is performed on best effort basis to gracefully complete commands with a full queue exception.
---
 .../io/lettuce/core/ConnectionBuilder.java    |   6 +-
 .../io/lettuce/core/ConnectionEvents.java     |  23 +-
 .../lettuce/core/PlainChannelInitializer.java |   4 +-
 .../java/io/lettuce/core/RedisClient.java     |   6 +-
 .../core/cluster/ClusterNodeEndpoint.java     |  38 +-
 .../core/cluster/RedisClusterClient.java      |   9 +-
 .../core/internal/FastCountingDeque.java      | 327 ---------------
 .../core/internal/ForwardingDeque.java        | 253 ------------
 .../core/internal/LettuceFactories.java       |  27 +-
 .../lettuce/core/protocol/AsyncCommand.java   |  41 +-
 .../lettuce/core/protocol/CommandHandler.java | 373 +++++++++++-------
 .../lettuce/core/protocol/CommandWrapper.java |  36 +-
 .../core/protocol/DefaultEndpoint.java        | 337 ++++++++++------
 .../io/lettuce/core/protocol/Endpoint.java    |  20 +-
 .../core/protocol/HasQueuedCommands.java      |  10 +-
 .../lettuce/core/protocol/QueuedCommands.java | 125 ------
 .../core/pubsub/PubSubCommandHandler.java     |  18 +-
 .../java/io/lettuce/ConnectionTestUtil.java   |  53 ++-
 .../ReactiveBackpressurePropagationTest.java  |   2 +-
 .../core/cluster/ClusterNodeEndpointTest.java |  20 +-
 .../core/protocol/CommandHandlerTest.java     |  29 +-
 .../core/protocol/DefaultEndpointTest.java    |  64 ++-
 .../core/reliability/AtLeastOnceTest.java     |  39 +-
 .../core/reliability/AtMostOnceTest.java      |  12 +-
 .../protocol/CommandHandlerBenchmark.java     |   4 +-
 .../jmh/io/lettuce/core/protocol/JmhMain.java |   7 +-
 26 files changed, 709 insertions(+), 1174 deletions(-)
 delete mode 100644 src/main/java/io/lettuce/core/internal/FastCountingDeque.java
 delete mode 100644 src/main/java/io/lettuce/core/internal/ForwardingDeque.java
 delete mode 100644 src/main/java/io/lettuce/core/protocol/QueuedCommands.java

diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index 1e223c7291..5303617439 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -18,7 +18,6 @@
 import java.net.SocketAddress;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
@@ -26,7 +25,6 @@
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.*;
 import io.lettuce.core.resource.ClientResources;
-
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.group.ChannelGroup;
@@ -83,8 +81,6 @@ protected List<ChannelHandler> buildHandlers() {
 
         if (clientOptions.isAutoReconnect()) {
             handlers.add(createConnectionWatchdog());
-        } else {
-            endpoint.registerConnectionWatchdog(Optional.empty());
         }
 
         handlers.add(new ConnectionEventTrigger(connectionEvents, connection, clientResources.eventBus()));
@@ -117,7 +113,7 @@ protected ConnectionWatchdog createConnectionWatchdog() {
         ConnectionWatchdog watchdog = new ConnectionWatchdog(clientResources.reconnectDelay(), clientOptions, bootstrap, timer,
                 clientResources.eventExecutorGroup(), socketAddressSupplier, reconnectionListener, connection);
 
-        endpoint.registerConnectionWatchdog(Optional.of(watchdog));
+        endpoint.registerConnectionWatchdog(watchdog);
 
         connectionWatchdog = watchdog;
         return watchdog;
diff --git a/src/main/java/io/lettuce/core/ConnectionEvents.java b/src/main/java/io/lettuce/core/ConnectionEvents.java
index 4803067477..15782e784f 100644
--- a/src/main/java/io/lettuce/core/ConnectionEvents.java
+++ b/src/main/java/io/lettuce/core/ConnectionEvents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,13 @@
 
 import java.net.SocketAddress;
 import java.util.Set;
-import java.util.concurrent.CompletableFuture;
 
+import io.lettuce.core.protocol.RedisCommand;
 import io.netty.util.internal.ConcurrentSet;
 
 /**
- * Close Events Facility. Can register/unregister CloseListener and fire a closed event to all registered listeners.
+ * Close Events Facility. Can register/unregister CloseListener and fire a closed event to all registered listeners. This class
+ * is part of the internal API and may change without further notice.
  *
  * @author Mark Paluch
  * @since 3.0
@@ -69,6 +70,22 @@ public static class Reset {
     public static class Activated {
     }
 
+    /**
+     * Internal event when a channel is activated.
+     */
+    public static class PingBeforeActivate {
+
+        private final RedisCommand<?, ?, ?> command;
+
+        public PingBeforeActivate(RedisCommand<?, ?, ?> command) {
+            this.command = command;
+        }
+
+        public RedisCommand<?, ?, ?> getCommand() {
+            return command;
+        }
+    }
+
     /**
      * Internal event when a reconnect is initiated.
      */
diff --git a/src/main/java/io/lettuce/core/PlainChannelInitializer.java b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
index ddcb14a79f..cbe72c0297 100644
--- a/src/main/java/io/lettuce/core/PlainChannelInitializer.java
+++ b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
@@ -23,12 +23,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
+import io.lettuce.core.ConnectionEvents.PingBeforeActivate;
 import io.lettuce.core.event.connection.ConnectedEvent;
 import io.lettuce.core.event.connection.ConnectionActivatedEvent;
 import io.lettuce.core.event.connection.DisconnectedEvent;
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.resource.ClientResources;
-
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
@@ -126,7 +126,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
     static void pingBeforeActivate(AsyncCommand<?, ?, ?> cmd, CompletableFuture<Boolean> initializedFuture,
             ChannelHandlerContext ctx, ClientResources clientResources, long timeout, TimeUnit timeUnit) throws Exception {
 
-        ctx.channel().writeAndFlush(cmd);
+        ctx.fireUserEventTriggered(new PingBeforeActivate(cmd));
 
         Runnable timeoutGuard = () -> {
 
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 52cc30b40e..b3ed478d0b 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -248,7 +248,7 @@ private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandalone
         StatefulRedisConnectionImpl<K, V> connection = newStatefulRedisConnection(endpoint, codec, timeout.timeout,
                 timeout.timeUnit);
         ConnectionFuture<StatefulRedisConnection<K, V>> future = connectStatefulAsync(connection, endpoint, redisURI,
-                () -> new CommandHandler(clientResources, endpoint));
+                () -> new CommandHandler(clientOptions, clientResources, endpoint));
 
         future.whenComplete((channelHandler, throwable) -> {
 
@@ -386,7 +386,7 @@ private <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V
                 timeout.timeout, timeout.timeUnit);
 
         ConnectionFuture<StatefulRedisConnectionImpl<K, V>> future = connectStatefulAsync(connection, endpoint, redisURI,
-                () -> new PubSubCommandHandler<>(clientResources, codec, endpoint));
+                () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec, endpoint));
 
         getConnection(future.whenComplete((conn, throwable) -> {
 
@@ -462,7 +462,7 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
 
         logger.debug("Trying to get a Redis Sentinel connection for one of: " + redisURI.getSentinels());
 
-        connectionBuilder.endpoint(endpoint).commandHandler(() -> new CommandHandler(clientResources, endpoint))
+        connectionBuilder.endpoint(endpoint).commandHandler(() -> new CommandHandler(clientOptions, clientResources, endpoint))
                 .connection(connection);
         connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
 
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java b/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
index a4dd10385c..e6bd38eedf 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,17 +15,14 @@
  */
 package io.lettuce.core.cluster;
 
-import java.util.ArrayList;
 import java.util.Collection;
 
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.RedisChannelWriter;
 import io.lettuce.core.RedisException;
-import io.lettuce.core.protocol.ConnectionWatchdog;
-import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.protocol.DefaultEndpoint;
+import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.resource.ClientResources;
-
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -55,18 +52,6 @@ public ClusterNodeEndpoint(ClientOptions clientOptions, ClientResources clientRe
         this.clusterChannelWriter = clusterChannelWriter;
     }
 
-    /**
-     * Prepare the closing of the channel.
-     */
-    public void prepareClose() {
-        if (channel != null) {
-            ConnectionWatchdog connectionWatchdog = channel.pipeline().get(ConnectionWatchdog.class);
-            if (connectionWatchdog != null) {
-                connectionWatchdog.setReconnectSuspended(true);
-            }
-        }
-    }
-
     /**
      * Move queued and buffered commands from the inactive connection to the master command writer. This is done only if the
      * current connection is disconnected and auto-reconnect is enabled (command-retries). If the connection would be open, we
@@ -79,9 +64,7 @@ public void close() {
         logger.debug("{} close()", logPrefix());
 
         if (clusterChannelWriter != null) {
-
-            Collection<RedisCommand<?, ?, ?>> commands = shiftCommands(getQueue());
-            retriggerCommands(commands);
+            retriggerCommands(doExclusive(this::drainCommands));
         }
 
         super.close();
@@ -90,7 +73,6 @@ public void close() {
     protected void retriggerCommands(Collection<RedisCommand<?, ?, ?>> commands) {
 
         for (RedisCommand<?, ?, ?> queuedCommand : commands) {
-
             if (queuedCommand == null || queuedCommand.isCancelled()) {
                 continue;
             }
@@ -103,18 +85,4 @@ protected void retriggerCommands(Collection<RedisCommand<?, ?, ?>> commands) {
         }
     }
 
-    /**
-     * Retrieve commands within a lock to prevent concurrent modification
-     */
-    private Collection<RedisCommand<?, ?, ?>> shiftCommands(Collection<? extends RedisCommand<?, ?, ?>> source) {
-
-        return doExclusive(() -> {
-            try {
-                return new ArrayList<>(source);
-            } finally {
-                source.clear();
-            }
-        });
-    }
-
 }
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 67606de5ef..60c46a091f 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -428,7 +428,7 @@ <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisC
         StatefulRedisConnectionImpl<K, V> connection = new StatefulRedisConnectionImpl<K, V>(endpoint, codec, timeout, unit);
 
         ConnectionFuture<StatefulRedisConnection<K, V>> connectionFuture = connectStatefulAsync(connection, endpoint,
-                getFirstUri(), socketAddressSupplier, () -> new CommandHandler(clientResources, endpoint));
+                getFirstUri(), socketAddressSupplier, () -> new CommandHandler(clientOptions, clientResources, endpoint));
 
         return connectionFuture.whenComplete((conn, throwable) -> {
             if (throwable != null) {
@@ -477,7 +477,8 @@ <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNode
                 timeout, unit);
 
         ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectionFuture = connectStatefulAsync(connection, endpoint,
-                getFirstUri(), socketAddressSupplier, () -> new PubSubCommandHandler<K, V>(clientResources, codec, endpoint));
+                getFirstUri(), socketAddressSupplier, () -> new PubSubCommandHandler<K, V>(clientOptions, clientResources,
+                        codec, endpoint));
         return connectionFuture.whenComplete((conn, throwable) -> {
             if (throwable != null) {
                 connection.close();
@@ -527,7 +528,7 @@ <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K,
         for (int i = 0; i < connectionAttempts; i++) {
             try {
                 connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier, () -> new CommandHandler(
-                        clientResources, endpoint));
+                        clientOptions, clientResources, endpoint));
                 connected = true;
                 break;
             } catch (RedisException e) {
@@ -590,7 +591,7 @@ <K, V> StatefulRedisClusterPubSubConnection<K, V> connectClusterPubSubImpl(Redis
         for (int i = 0; i < connectionAttempts; i++) {
             try {
                 connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier,
-                        () -> new PubSubCommandHandler<K, V>(clientResources, codec, endpoint));
+                        () -> new PubSubCommandHandler<K, V>(clientOptions, clientResources, codec, endpoint));
                 connected = true;
                 break;
             } catch (RedisException e) {
diff --git a/src/main/java/io/lettuce/core/internal/FastCountingDeque.java b/src/main/java/io/lettuce/core/internal/FastCountingDeque.java
deleted file mode 100644
index bcf456d9a3..0000000000
--- a/src/main/java/io/lettuce/core/internal/FastCountingDeque.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.internal;
-
-import java.util.Collection;
-import java.util.Deque;
-import java.util.Iterator;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
-import java.util.function.Predicate;
-
-/**
- * {@link Deque} implementing a fast counting strategy by updating its count after applying modifications
- *
- * @author Mark Paluch
- * @since 4.4
- */
-public class FastCountingDeque<E> extends ForwardingDeque<E> implements Deque<E> {
-
-    private final static AtomicIntegerFieldUpdater<FastCountingDeque> UPDATER = AtomicIntegerFieldUpdater.newUpdater(
-            FastCountingDeque.class, "count");
-
-    // accessed through AtomicIntegerFieldUpdater.
-    private volatile int count = 0;
-
-    public FastCountingDeque(Deque<E> delegate) {
-        super(delegate);
-    }
-
-    @Override
-    public void addFirst(E e) {
-        increment();
-        super.addFirst(e);
-    }
-
-    @Override
-    public void addLast(E e) {
-        increment();
-        super.addLast(e);
-    }
-
-    @Override
-    public boolean offerFirst(E e) {
-        if (super.offerFirst(e)) {
-            increment();
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean offerLast(E e) {
-        if (super.offerLast(e)) {
-            increment();
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public E removeFirst() {
-        E element = super.removeFirst();
-        if (element != null) {
-            decrement();
-        }
-        return element;
-    }
-
-    @Override
-    public E removeLast() {
-        E element = super.removeLast();
-        if (element != null) {
-            decrement();
-        }
-        return element;
-    }
-
-    @Override
-    public E pollFirst() {
-        E element = super.pollFirst();
-        if (element != null) {
-            decrement();
-        }
-        return element;
-    }
-
-    @Override
-    public E pollLast() {
-        E element = super.pollLast();
-        if (element != null) {
-            decrement();
-        }
-        return element;
-    }
-
-    @Override
-    public E getFirst() {
-        return super.getFirst();
-    }
-
-    @Override
-    public E getLast() {
-        return super.getLast();
-    }
-
-    @Override
-    public E peekFirst() {
-        return super.peekFirst();
-    }
-
-    @Override
-    public E peekLast() {
-        return super.peekLast();
-    }
-
-    @Override
-    public boolean removeFirstOccurrence(Object o) {
-        if (super.removeFirstOccurrence(o)) {
-            decrement();
-
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean removeLastOccurrence(Object o) {
-        if (super.removeLastOccurrence(o)) {
-            decrement();
-
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean add(E e) {
-
-        if (super.add(e)) {
-            increment();
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean offer(E e) {
-
-        if (super.offer(e)) {
-            increment();
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public E remove() {
-        E element = super.remove();
-        if (element != null) {
-            decrement();
-        }
-        return element;
-    }
-
-    @Override
-    public E poll() {
-        E element = super.poll();
-        if (element != null) {
-            decrement();
-        }
-        return element;
-    }
-
-    @Override
-    public E element() {
-        return super.element();
-    }
-
-    @Override
-    public E peek() {
-        return super.peek();
-    }
-
-    @Override
-    public void push(E e) {
-        super.push(e);
-        increment();
-    }
-
-    @Override
-    public E pop() {
-        E element = super.pop();
-        if (element != null) {
-            decrement();
-        }
-        return element;
-    }
-
-    @Override
-    public boolean remove(Object o) {
-        if (super.remove(o)) {
-            decrement();
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean contains(Object o) {
-        return super.contains(o);
-    }
-
-    @Override
-    public int size() {
-        return UPDATER.get(this);
-    }
-
-    @Override
-    public Iterator<E> iterator() {
-        return new UnmodifiableIterator<>(super.iterator());
-    }
-
-    @Override
-    public Iterator<E> descendingIterator() {
-        return new UnmodifiableIterator<>(super.descendingIterator());
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return super.isEmpty();
-    }
-
-    @Override
-    public Object[] toArray() {
-        return super.toArray();
-    }
-
-    @Override
-    public <T> T[] toArray(T[] a) {
-        return super.toArray(a);
-    }
-
-    @Override
-    public boolean containsAll(Collection<?> c) {
-        return super.containsAll(c);
-    }
-
-    @Override
-    public boolean addAll(Collection<? extends E> c) {
-        boolean state = super.addAll(c);
-        count = super.size();
-        return state;
-    }
-
-    @Override
-    public boolean removeAll(Collection<?> c) {
-        boolean state = super.removeAll(c);
-        count = super.size();
-        return state;
-    }
-
-    @Override
-    public boolean removeIf(Predicate<? super E> filter) {
-        boolean state = super.removeIf(filter);
-        count = super.size();
-        return state;
-    }
-
-    @Override
-    public boolean retainAll(Collection<?> c) {
-        boolean state = super.retainAll(c);
-        count = super.size();
-        return state;
-    }
-
-    @Override
-    public void clear() {
-        super.clear();
-        UPDATER.set(this, 0);
-    }
-
-    protected void increment() {
-        assert UPDATER.incrementAndGet(this) > 0;
-    }
-
-    protected void decrement() {
-        assert UPDATER.decrementAndGet(this) >= 0;
-    }
-
-    private static class UnmodifiableIterator<E> implements Iterator<E> {
-
-        private final Iterator<E> delegate;
-
-        public UnmodifiableIterator(Iterator<E> delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public boolean hasNext() {
-            return delegate.hasNext();
-        }
-
-        @Override
-        public E next() {
-            return delegate.next();
-        }
-
-        @Override
-        public void remove() {
-            throw new UnsupportedOperationException();
-        }
-    }
-}
diff --git a/src/main/java/io/lettuce/core/internal/ForwardingDeque.java b/src/main/java/io/lettuce/core/internal/ForwardingDeque.java
deleted file mode 100644
index d23f355387..0000000000
--- a/src/main/java/io/lettuce/core/internal/ForwardingDeque.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.internal;
-
-import java.util.Collection;
-import java.util.Deque;
-import java.util.Iterator;
-import java.util.Spliterator;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
-/**
- * Delegating {@link Deque} allowing to override particular methods and not changing the underlying {@link Deque} behavior. This
- * class is applying the decorator pattern to the underlying {@link Deque}.
- *
- * @author Mark Paluch
- * @since 4.4
- */
-public abstract class ForwardingDeque<E> implements Deque<E> {
-
-    protected final Deque<E> delegate;
-
-    public ForwardingDeque(Deque<E> delegate) {
-
-        LettuceAssert.notNull(delegate, "Deque delegate must not be null");
-
-        this.delegate = delegate;
-    }
-
-    @Override
-    public void addFirst(E e) {
-        delegate.addFirst(e);
-    }
-
-    @Override
-    public void addLast(E e) {
-        delegate.addLast(e);
-    }
-
-    @Override
-    public boolean offerFirst(E e) {
-        return delegate.offerFirst(e);
-    }
-
-    @Override
-    public boolean offerLast(E e) {
-        return delegate.offerLast(e);
-    }
-
-    @Override
-    public E removeFirst() {
-        return delegate.removeFirst();
-    }
-
-    @Override
-    public E removeLast() {
-        return delegate.removeLast();
-    }
-
-    @Override
-    public E pollFirst() {
-        return delegate.pollFirst();
-    }
-
-    @Override
-    public E pollLast() {
-        return delegate.pollLast();
-    }
-
-    @Override
-    public E getFirst() {
-        return delegate.getFirst();
-    }
-
-    @Override
-    public E getLast() {
-        return delegate.getLast();
-    }
-
-    @Override
-    public E peekFirst() {
-        return delegate.peekFirst();
-    }
-
-    @Override
-    public E peekLast() {
-        return delegate.peekLast();
-    }
-
-    @Override
-    public boolean removeFirstOccurrence(Object o) {
-        return delegate.removeFirstOccurrence(o);
-    }
-
-    @Override
-    public boolean removeLastOccurrence(Object o) {
-        return delegate.removeLastOccurrence(o);
-    }
-
-    @Override
-    public boolean add(E e) {
-        return delegate.add(e);
-    }
-
-    @Override
-    public boolean offer(E e) {
-        return delegate.offer(e);
-    }
-
-    @Override
-    public E remove() {
-        return delegate.remove();
-    }
-
-    @Override
-    public E poll() {
-        return delegate.poll();
-    }
-
-    @Override
-    public E element() {
-        return delegate.element();
-    }
-
-    @Override
-    public E peek() {
-        return delegate.peek();
-    }
-
-    @Override
-    public void push(E e) {
-        delegate.push(e);
-    }
-
-    @Override
-    public E pop() {
-        return delegate.pop();
-    }
-
-    @Override
-    public boolean remove(Object o) {
-        return delegate.remove(o);
-    }
-
-    @Override
-    public boolean contains(Object o) {
-        return delegate.contains(o);
-    }
-
-    @Override
-    public int size() {
-        return delegate.size();
-    }
-
-    @Override
-    public Iterator<E> iterator() {
-        return delegate.iterator();
-    }
-
-    @Override
-    public Iterator<E> descendingIterator() {
-        return delegate.descendingIterator();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return delegate.isEmpty();
-    }
-
-    @Override
-    public Object[] toArray() {
-        return delegate.toArray();
-    }
-
-    @Override
-    public <T> T[] toArray(T[] a) {
-        return delegate.toArray(a);
-    }
-
-    @Override
-    public boolean containsAll(Collection<?> c) {
-        return delegate.containsAll(c);
-    }
-
-    @Override
-    public boolean addAll(Collection<? extends E> c) {
-        return delegate.addAll(c);
-    }
-
-    @Override
-    public boolean removeAll(Collection<?> c) {
-        return delegate.removeAll(c);
-    }
-
-    @Override
-    public boolean removeIf(Predicate<? super E> filter) {
-        return delegate.removeIf(filter);
-    }
-
-    @Override
-    public boolean retainAll(Collection<?> c) {
-        return delegate.retainAll(c);
-    }
-
-    @Override
-    public void clear() {
-        delegate.clear();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return delegate.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return delegate.hashCode();
-    }
-
-    @Override
-    public Spliterator<E> spliterator() {
-        return delegate.spliterator();
-    }
-
-    @Override
-    public Stream<E> stream() {
-        return delegate.stream();
-    }
-
-    @Override
-    public Stream<E> parallelStream() {
-        return delegate.parallelStream();
-    }
-
-    @Override
-    public void forEach(Consumer<? super E> action) {
-        delegate.forEach(action);
-    }
-}
diff --git a/src/main/java/io/lettuce/core/internal/LettuceFactories.java b/src/main/java/io/lettuce/core/internal/LettuceFactories.java
index 175919c27b..e537294f6d 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceFactories.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceFactories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.Queue;
+import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -31,19 +32,30 @@
 public class LettuceFactories {
 
     /**
-     * Creates a new {@link Queue} that does not require external synchronization.
+     * Threshold used to determine queue implementation. A queue size above the size indicates usage of
+     * {@link LinkedBlockingQueue} otherwise {@link ArrayBlockingQueue}.
+     */
+    private static final int ARRAY_QUEUE_THRESHOLD = Integer.getInteger(
+            "io.lettuce.core.LettuceFactories.array-queue-threshold", 200000);
+
+    /**
+     * Creates a new, optionally bounded, {@link Queue} that does not require external synchronization.
      *
-     * @param <T>
-     * @return a new, empty {@link ConcurrentLinkedDeque}.
+     * @param maxSize queue size. If {@link Integer#MAX_VALUE}, then creates an {@link ConcurrentLinkedDeque unbounded queue}.
+     * @return a new, empty {@link Queue}.
      */
-    public static <T> Deque<T> newConcurrentQueue() {
-        return new FastCountingDeque<>(new ConcurrentLinkedDeque<>());
+    public static <T> Queue<T> newConcurrentQueue(int maxSize) {
+
+        if (maxSize == Integer.MAX_VALUE) {
+            return new ConcurrentLinkedDeque<>();
+        }
+
+        return maxSize > ARRAY_QUEUE_THRESHOLD ? new LinkedBlockingQueue<>(maxSize) : new ArrayBlockingQueue<>(maxSize);
     }
 
     /**
      * Creates a new {@link Queue} for single producer/single consumer.
      *
-     * @param <T>
      * @return a new, empty {@link ArrayDeque}.
      */
     public static <T> Deque<T> newSpScQueue() {
@@ -53,7 +65,6 @@ public static <T> Deque<T> newSpScQueue() {
     /**
      * Creates a new {@link BlockingQueue}.
      *
-     * @param <T>
      * @return a new, empty {@link BlockingQueue}.
      */
     public static <T> LinkedBlockingQueue<T> newBlockingQueue() {
diff --git a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
index 78c1726d63..77c277ac86 100644
--- a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
@@ -170,9 +170,42 @@ public void onComplete(Consumer<? super T> action) {
         thenAccept(action);
     }
 
-	@Override
-	public RedisCommand<K, V, T> getDelegate() {
-		return command;
-	}
+    @Override
+    public RedisCommand<K, V, T> getDelegate() {
+        return command;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+
+        if (this == o)
+            return true;
+        if (!(o instanceof RedisCommand)) {
+            return false;
+        }
+
+        RedisCommand<?, ?, ?> left = command;
+        while (left instanceof DecoratedCommand) {
+            left = CommandWrapper.unwrap(left);
+        }
+
+        RedisCommand<?, ?, ?> right = (RedisCommand<?, ?, ?>) o;
+        while (right instanceof DecoratedCommand) {
+            right = CommandWrapper.unwrap(right);
+        }
+
+        return left == right;
+    }
+
+    @Override
+    public int hashCode() {
+
+        RedisCommand<?, ?, ?> toHash = command;
+        while (toHash instanceof DecoratedCommand) {
+            toHash = CommandWrapper.unwrap(toHash);
+        }
+
+        return toHash != null ? toHash.hashCode() : 0;
+    }
 
 }
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index c3d0e130b7..3c4b4aff91 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -15,18 +15,19 @@
  */
 package io.lettuce.core.protocol;
 
+import static io.lettuce.core.ConnectionEvents.Activated;
+import static io.lettuce.core.ConnectionEvents.PingBeforeActivate;
+import static io.lettuce.core.ConnectionEvents.Reset;
+
 import java.io.IOException;
 import java.net.SocketAddress;
 import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Queue;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
 
-import io.lettuce.core.ConnectionEvents;
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.RedisException;
 import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.internal.LettuceFactories;
 import io.lettuce.core.internal.LettuceSets;
 import io.lettuce.core.output.CommandOutput;
 import io.lettuce.core.resource.ClientResources;
@@ -57,17 +58,19 @@ public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCom
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(CommandHandler.class);
     private static final AtomicLong COMMAND_HANDLER_COUNTER = new AtomicLong();
 
+    private final ClientOptions clientOptions;
+    private final ClientResources clientResources;
+    private final Endpoint endpoint;
+
+    private final Deque<RedisCommand<?, ?, ?>> stack = new ArrayDeque<>();
     private final long commandHandlerId = COMMAND_HANDLER_COUNTER.incrementAndGet();
-    private final Queue<RedisCommand<?, ?, ?>> queue = LettuceFactories.newConcurrentQueue();
+
     private final RedisStateMachine rsm = new RedisStateMachine();
     private final boolean traceEnabled = logger.isTraceEnabled();
     private final boolean debugEnabled = logger.isDebugEnabled();
     private final boolean latencyMetricsEnabled;
     private final BackpressureSource backpressureSource = new BackpressureSource();
 
-    private final ClientResources clientResources;
-    private final Endpoint endpoint;
-
     Channel channel;
     private ByteBuf buffer;
     private LifecycleState lifecycleState = LifecycleState.NOT_CONNECTED;
@@ -76,19 +79,46 @@ public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCom
     /**
      * Initialize a new instance that handles commands from the supplied queue.
      *
+     * @param clientOptions client options for this connection, must not be {@literal null}
      * @param clientResources client resources for this connection, must not be {@literal null}
-     * @param endpoint
+     * @param endpoint must not be {@literal null}.
      */
-    public CommandHandler(ClientResources clientResources, Endpoint endpoint) {
+    public CommandHandler(ClientOptions clientOptions, ClientResources clientResources, Endpoint endpoint) {
 
+        LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
         LettuceAssert.notNull(clientResources, "ClientResources must not be null");
         LettuceAssert.notNull(endpoint, "RedisEndpoint must not be null");
 
+        this.clientOptions = clientOptions;
         this.clientResources = clientResources;
         this.endpoint = endpoint;
         this.latencyMetricsEnabled = clientResources.commandLatencyCollector().isEnabled();
     }
 
+    public Queue<RedisCommand<?, ?, ?>> getStack() {
+        return stack;
+    }
+
+    protected void setState(LifecycleState lifecycleState) {
+
+        if (this.lifecycleState != LifecycleState.CLOSED) {
+            this.lifecycleState = lifecycleState;
+        }
+    }
+
+    @Override
+    public Collection<RedisCommand<?, ?, ?>> drainQueue() {
+        return drainCommands(stack);
+    }
+
+    protected LifecycleState getState() {
+        return lifecycleState;
+    }
+
+    public boolean isClosed() {
+        return lifecycleState == LifecycleState.CLOSED;
+    }
+
     /**
      * @see io.netty.channel.ChannelInboundHandlerAdapter#channelRegistered(io.netty.channel.ChannelHandlerContext)
      */
@@ -108,13 +138,13 @@ public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
 
         setState(LifecycleState.REGISTERED);
 
-        endpoint.registerQueue(this);
-
         buffer = ctx.alloc().directBuffer(8192 * 8);
         ctx.fireChannelRegistered();
-
     }
 
+    /**
+     * @see io.netty.channel.ChannelInboundHandlerAdapter#channelUnregistered(io.netty.channel.ChannelHandlerContext)
+     */
     @Override
     public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
 
@@ -131,8 +161,6 @@ public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
         channel = null;
         buffer.release();
 
-        endpoint.unregisterQueue(this);
-
         reset();
 
         setState(LifecycleState.CLOSED);
@@ -141,13 +169,24 @@ public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
         ctx.fireChannelUnregistered();
     }
 
+    /**
+     * @see io.netty.channel.ChannelInboundHandlerAdapter#userEventTriggered(io.netty.channel.ChannelHandlerContext, Object)
+     */
     @Override
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
 
-        if (evt instanceof ConnectionEvents.Reset) {
+        if (evt instanceof Reset) {
             reset();
         }
 
+        if (evt instanceof PingBeforeActivate) {
+
+            PingBeforeActivate pba = (PingBeforeActivate) evt;
+
+            stack.addFirst(pba.getCommand());
+            ctx.writeAndFlush(pba.getCommand());
+        }
+
         super.userEventTriggered(ctx, evt);
     }
 
@@ -156,8 +195,8 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
 
         InternalLogLevel logLevel = InternalLogLevel.WARN;
 
-        if (!queue.isEmpty()) {
-            RedisCommand<?, ?, ?> command = queue.poll();
+        if (!stack.isEmpty()) {
+            RedisCommand<?, ?, ?> command = stack.poll();
             if (debugEnabled) {
                 logger.debug("{} Storing exception in {}", logPrefix(), command);
             }
@@ -190,6 +229,9 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
         logger.log(logLevel, "{} Unexpected exception during request: {}", logPrefix, cause.toString(), cause);
     }
 
+    /**
+     * @see io.netty.channel.ChannelInboundHandlerAdapter#channelActive(io.netty.channel.ChannelHandlerContext)
+     */
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
 
@@ -206,8 +248,7 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
         super.channelActive(ctx);
 
         if (channel != null) {
-            channel.eventLoop().submit(
-                    (Runnable) () -> channel.pipeline().fireUserEventTriggered(new ConnectionEvents.Activated()));
+            channel.eventLoop().submit((Runnable) () -> channel.pipeline().fireUserEventTriggered(new Activated()));
         }
 
         if (debugEnabled) {
@@ -215,6 +256,18 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
         }
     }
 
+    private static <T> List<T> drainCommands(Queue<T> source) {
+
+        List<T> target = new ArrayList<>(source.size());
+
+        T cmd;
+        while ((cmd = source.poll()) != null) {
+            target.add(cmd);
+        }
+
+        return target;
+    }
+
     /**
      * @see io.netty.channel.ChannelInboundHandlerAdapter#channelInactive(io.netty.channel.ChannelHandlerContext)
      */
@@ -244,6 +297,7 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
         if (debugEnabled) {
             logger.debug("{} channelInactive() done", logPrefix());
         }
+
         super.channelInactive(ctx);
     }
 
@@ -269,6 +323,131 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
         }
     }
 
+    private void writeSingleCommand(ChannelHandlerContext ctx, RedisCommand<?, ?, ?> command, ChannelPromise promise)
+            throws Exception {
+
+        if (!isWriteable(command)) {
+            return;
+        }
+
+        addToStack(command, promise);
+        ctx.write(command, promise);
+    }
+
+    private void writeBatch(ChannelHandlerContext ctx, Collection<RedisCommand<?, ?, ?>> batch, ChannelPromise promise)
+            throws Exception {
+
+        Collection<RedisCommand<?, ?, ?>> toWrite = batch;
+        int commandsToWrite = 0;
+
+        boolean cancelledCommands = false;
+        for (RedisCommand<?, ?, ?> command : batch) {
+
+            if (!isWriteable(command)) {
+                cancelledCommands = true;
+                break;
+            }
+
+            commandsToWrite++;
+        }
+
+        try {
+            validateWrite(commandsToWrite);
+        } catch (Exception e) {
+
+            for (RedisCommand<?, ?, ?> redisCommand : toWrite) {
+                redisCommand.completeExceptionally(e);
+            }
+
+            promise.setFailure(e);
+            return;
+        }
+
+        if (cancelledCommands) {
+
+            toWrite = new ArrayList<>(batch.size());
+
+            for (RedisCommand<?, ?, ?> command : batch) {
+
+                if (!isWriteable(command)) {
+                    continue;
+                }
+
+                toWrite.add(command);
+            }
+        }
+
+        for (RedisCommand<?, ?, ?> command : toWrite) {
+            addToStack(command, promise);
+        }
+
+        if (!toWrite.isEmpty()) {
+            ctx.write(toWrite, promise);
+        }
+    }
+
+    private void addToStack(RedisCommand<?, ?, ?> command, ChannelPromise promise) throws Exception {
+
+        try {
+
+            validateWrite(1);
+
+            if (command.getOutput() == null) {
+                // fire&forget commands are excluded from metrics
+                command.complete();
+            } else {
+
+                if (latencyMetricsEnabled) {
+                    stack.add(getLatencyCommand(command));
+                } else {
+                    stack.add(command);
+                }
+            }
+
+        } catch (Exception e) {
+            command.completeExceptionally(e);
+            promise.setFailure(e);
+            throw e;
+        }
+    }
+
+    private void validateWrite(int commands) {
+
+        if (usesBoundedQueues()) {
+
+            if (stack.size() + commands > clientOptions.getRequestQueueSize())
+                throw new RedisException("Internal stack size exceeded: " + clientOptions.getRequestQueueSize()
+                        + ". Commands are not accepted until the stack size drops.");
+        }
+    }
+
+    private boolean usesBoundedQueues() {
+        return clientOptions.getRequestQueueSize() != Integer.MAX_VALUE;
+    }
+
+    private static boolean isWriteable(RedisCommand<?, ?, ?> command) {
+        return !command.isCancelled() && !command.isDone();
+    }
+
+    private RedisCommand<?, ?, ?> getLatencyCommand(RedisCommand<?, ?, ?> command) {
+
+        if (command instanceof WithLatency) {
+
+            WithLatency withLatency = (WithLatency) command;
+
+            withLatency.firstResponse(-1);
+            withLatency.sent(nanoTime());
+
+            return command;
+        }
+
+        LatencyMeteredCommand<?, ?, ?> latencyMeteredCommand = new LatencyMeteredCommand<>(command);
+        latencyMeteredCommand.firstResponse(-1);
+        latencyMeteredCommand.sent(nanoTime());
+
+        return latencyMeteredCommand;
+    }
+
     /**
      * @see io.netty.channel.ChannelInboundHandlerAdapter#channelRead(io.netty.channel.ChannelHandlerContext, java.lang.Object)
      */
@@ -283,7 +462,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
         }
 
         if (debugEnabled) {
-            logger.debug("{} Received: {} bytes, {} queued commands", logPrefix(), input.readableBytes(), queue.size());
+            logger.debug("{} Received: {} bytes, {} commands in the stack", logPrefix(), input.readableBytes(), stack.size());
         }
 
         try {
@@ -311,11 +490,11 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
 
     protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws InterruptedException {
 
-        while (!queue.isEmpty()) {
+        while (canDecode(buffer)) {
 
-            RedisCommand<?, ?, ?> command = queue.peek();
+            RedisCommand<?, ?, ?> command = stack.peek();
             if (debugEnabled) {
-                logger.debug("{} Queue contains: {} commands", logPrefix(), queue.size());
+                logger.debug("{} Stack contains: {} commands", logPrefix(), stack.size());
             }
 
             try {
@@ -328,7 +507,8 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
                 throw e;
             }
 
-            queue.poll();
+            stack.poll();
+
             try {
                 command.complete();
             } catch (Exception e) {
@@ -341,6 +521,10 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
         }
     }
 
+    protected boolean canDecode(ByteBuf buffer) {
+        return !stack.isEmpty() && buffer.isReadable();
+    }
+
     private boolean decode(ChannelHandlerContext ctx, ByteBuf buffer, RedisCommand<?, ?, ?> command) {
 
         if (latencyMetricsEnabled && command instanceof WithLatency) {
@@ -364,7 +548,7 @@ private boolean decode(ChannelHandlerContext ctx, ByteBuf buffer, RedisCommand<?
 
     private boolean decode0(ChannelHandlerContext ctx, ByteBuf buffer, RedisCommand<?, ?, ?> command) {
 
-        if (!rsm.decode(buffer, command, command.getOutput())) {
+        if (!decode(buffer, command, command.getOutput())) {
 
             if (command instanceof DemandAware.Sink) {
 
@@ -390,6 +574,10 @@ protected boolean decode(ByteBuf buffer, CommandOutput<?, ?, ?> output) {
         return rsm.decode(buffer, output);
     }
 
+    protected boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutput<?, ?, ?> output) {
+        return rsm.decode(buffer, command, output);
+    }
+
     private void recordLatency(WithLatency withLatency, ProtocolKeyword commandType) {
 
         if (withLatency != null && clientResources.commandLatencyCollector().isEnabled() && channel != null && remote() != null) {
@@ -418,144 +606,45 @@ boolean isConnected() {
                 && lifecycleState.ordinal() < LifecycleState.DISCONNECTED.ordinal();
     }
 
-    private void writeSingleCommand(ChannelHandlerContext ctx, RedisCommand<?, ?, ?> command, ChannelPromise promise)
-            throws Exception {
-
-        if (command.isCancelled()) {
-            return;
-        }
-
-        queueCommand(command, promise);
-        ctx.write(command, promise);
-    }
-
-    private void writeBatch(ChannelHandlerContext ctx, Collection<RedisCommand<?, ?, ?>> batch, ChannelPromise promise)
-            throws Exception {
-
-        Collection<RedisCommand<?, ?, ?>> toWrite = batch;
-
-        boolean cancelledCommands = false;
-        for (RedisCommand<?, ?, ?> command : batch) {
-            if (command.isCancelled()) {
-                cancelledCommands = true;
-                break;
-            }
-        }
-
-        if (cancelledCommands) {
-
-            toWrite = new ArrayList<>(batch.size());
-
-            for (RedisCommand<?, ?, ?> command : batch) {
-
-                if (command.isCancelled()) {
-                    continue;
-                }
-
-                toWrite.add(command);
-                queueCommand(command, promise);
-            }
-        } else {
-
-            for (RedisCommand<?, ?, ?> command : toWrite) {
-                queueCommand(command, promise);
-            }
-        }
-
-        if (!toWrite.isEmpty()) {
-            ctx.write(toWrite, promise);
-        }
-    }
-
-    private void queueCommand(RedisCommand<?, ?, ?> command, ChannelPromise promise) throws Exception {
-
-        try {
-
-            if (command.getOutput() == null) {
-                // fire&forget commands are excluded from metrics
-                command.complete();
-            } else {
-
-                if (latencyMetricsEnabled) {
-
-                    if (command instanceof WithLatency) {
-
-                        WithLatency withLatency = (WithLatency) command;
-
-                        withLatency.firstResponse(-1);
-                        withLatency.sent(nanoTime());
-
-                        queue.add(command);
-                    } else {
-
-                        LatencyMeteredCommand<?, ?, ?> latencyMeteredCommand = new LatencyMeteredCommand<>(command);
-                        latencyMeteredCommand.firstResponse(-1);
-                        latencyMeteredCommand.sent(nanoTime());
+    private void reset() {
 
-                        queue.add(latencyMeteredCommand);
-                    }
-                } else {
-                    queue.add(command);
-                }
-            }
-        } catch (Exception e) {
-            command.completeExceptionally(e);
-            promise.setFailure(e);
-            throw e;
-        }
+        resetInternals();
+        cancelCommands("Reset", drainCommands(stack));
     }
 
-    private long nanoTime() {
-        return System.nanoTime();
-    }
+    private void resetInternals() {
 
-    protected void setState(LifecycleState lifecycleState) {
+        rsm.reset();
 
-        if (this.lifecycleState != LifecycleState.CLOSED) {
-            this.lifecycleState = lifecycleState;
+        if (buffer.refCnt() > 0) {
+            buffer.clear();
         }
     }
 
-    protected LifecycleState getState() {
-        return lifecycleState;
-    }
+    private static void cancelCommands(String message, List<RedisCommand<?, ?, ?>> toCancel) {
 
-    public boolean isClosed() {
-        return lifecycleState == LifecycleState.CLOSED;
-    }
-
-    private void reset() {
-
-        rsm.reset();
-
-        RedisCommand<?, ?, ?> cmd;
-        while ((cmd = queue.poll()) != null) {
+        for (RedisCommand<?, ?, ?> cmd : toCancel) {
             if (cmd.getOutput() != null) {
-                cmd.getOutput().setError("Reset");
+                cmd.getOutput().setError(message);
             }
             cmd.cancel();
         }
-
-        if (buffer.refCnt() > 0) {
-            buffer.clear();
-        }
     }
 
-    protected String logPrefix() {
+    private String logPrefix() {
 
         if (logPrefix != null) {
             return logPrefix;
         }
 
         StringBuilder buffer = new StringBuilder(64);
-        buffer.append('[').append(ChannelLogDescriptor.logDescriptor(channel)).append(", ")
-                .append("chid=0x").append(Long.toHexString(commandHandlerId)).append(']');
+        buffer.append('[').append(ChannelLogDescriptor.logDescriptor(channel)).append(", ").append("chid=0x")
+                .append(Long.toHexString(commandHandlerId)).append(']');
         return logPrefix = buffer.toString();
     }
 
-    @Override
-    public Queue<RedisCommand<?, ?, ?>> getQueue() {
-        return queue;
+    private static long nanoTime() {
+        return System.nanoTime();
     }
 
     public enum LifecycleState {
diff --git a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
index 8860e49882..012d978a7b 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
@@ -141,9 +141,6 @@ public RedisCommand<K, V, T> getDelegate() {
      * Unwrap a wrapped command.
      *
      * @param wrapped
-     * @param <K>
-     * @param <V>
-     * @param <T>
      * @return
      */
     public static <K, V, T> RedisCommand<K, V, T> unwrap(RedisCommand<K, V, T> wrapped) {
@@ -155,4 +152,37 @@ public static <K, V, T> RedisCommand<K, V, T> unwrap(RedisCommand<K, V, T> wrapp
 
         return result;
     }
+
+    @Override
+    public boolean equals(Object o) {
+
+        if (this == o)
+            return true;
+        if (!(o instanceof RedisCommand)) {
+            return false;
+        }
+
+        RedisCommand<?, ?, ?> left = command;
+        while (left instanceof DecoratedCommand) {
+            left = CommandWrapper.unwrap(left);
+        }
+
+        RedisCommand<?, ?, ?> right = (RedisCommand<?, ?, ?>) o;
+        while (right instanceof DecoratedCommand) {
+            right = CommandWrapper.unwrap(right);
+        }
+
+        return left == right;
+    }
+
+    @Override
+    public int hashCode() {
+
+        RedisCommand<?, ?, ?> toHash = command;
+        while (toHash instanceof DecoratedCommand) {
+            toHash = CommandWrapper.unwrap(toHash);
+        }
+
+        return toHash != null ? toHash.hashCode() : 0;
+    }
 }
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index f0ec343e6d..da1b4f2bb3 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -21,6 +21,7 @@
 import java.nio.channels.ClosedChannelException;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 
@@ -44,24 +45,25 @@
  *
  * @author Mark Paluch
  */
-public class DefaultEndpoint implements RedisChannelWriter, Endpoint, HasQueuedCommands {
+public class DefaultEndpoint implements RedisChannelWriter, Endpoint {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(DefaultEndpoint.class);
     private static final AtomicLong ENDPOINT_COUNTER = new AtomicLong();
+    private static final AtomicIntegerFieldUpdater<DefaultEndpoint> QUEUE_SIZE = AtomicIntegerFieldUpdater.newUpdater(
+            DefaultEndpoint.class, "queueSize");
 
-    private final long endpointId = ENDPOINT_COUNTER.incrementAndGet();
-    private final AtomicBoolean closed = new AtomicBoolean();
-    private final Deque<RedisCommand<?, ?, ?>> commandBuffer = LettuceFactories.newConcurrentQueue();
-
-    private final SharedLock sharedLock = new SharedLock();
+    protected volatile Channel channel;
 
     private final Reliability reliability;
     private final ClientOptions clientOptions;
+    private final Queue<RedisCommand<?, ?, ?>> disconnectedBuffer;
+    private final Queue<RedisCommand<?, ?, ?>> commandBuffer;
 
-    private final QueuedCommands queuedCommands = new QueuedCommands();
+    private final long endpointId = ENDPOINT_COUNTER.incrementAndGet();
+    private final AtomicBoolean closed = new AtomicBoolean();
+    private final SharedLock sharedLock = new SharedLock();
     private final boolean debugEnabled = logger.isDebugEnabled();
 
-    protected volatile Channel channel;
     private String logPrefix;
     private boolean autoFlushCommands = true;
 
@@ -70,6 +72,9 @@ public class DefaultEndpoint implements RedisChannelWriter, Endpoint, HasQueuedC
 
     private Throwable connectionError;
 
+    // access via QUEUE_SIZE
+    private volatile int queueSize = 0;
+
     /**
      * Create a new {@link DefaultEndpoint}.
      *
@@ -81,7 +86,18 @@ public DefaultEndpoint(ClientOptions clientOptions) {
 
         this.clientOptions = clientOptions;
         this.reliability = clientOptions.isAutoReconnect() ? Reliability.AT_LEAST_ONCE : Reliability.AT_MOST_ONCE;
-        this.queuedCommands.register(this);
+        this.commandBuffer = LettuceFactories.newConcurrentQueue(clientOptions.getRequestQueueSize());
+        this.disconnectedBuffer = LettuceFactories.newConcurrentQueue(clientOptions.getRequestQueueSize());
+    }
+
+    @Override
+    public void setConnectionFacade(ConnectionFacade connectionFacade) {
+        this.connectionFacade = connectionFacade;
+    }
+
+    @Override
+    public void setAutoFlushCommands(boolean autoFlush) {
+        this.autoFlushCommands = autoFlush;
     }
 
     @Override
@@ -92,14 +108,14 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         try {
             sharedLock.incrementWriters();
 
-            validateWrite();
+            validateWrite(1);
 
             if (autoFlushCommands) {
 
                 if (isConnected()) {
                     writeToChannel(command);
                 } else {
-                    writeToBuffer(command);
+                    writeToDisconnectedBuffer(command);
                 }
 
             } else {
@@ -124,14 +140,14 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         try {
             sharedLock.incrementWriters();
 
-            validateWrite();
+            validateWrite(commands.size());
 
             if (autoFlushCommands) {
 
                 if (isConnected()) {
                     writeToChannel(commands);
                 } else {
-                    writeToBuffer(commands);
+                    writeToDisconnectedBuffer(commands);
                 }
 
             } else {
@@ -147,40 +163,105 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         return (Collection<RedisCommand<K, V, ?>>) commands;
     }
 
-    private void validateWrite() {
+    private void validateWrite(int commands) {
 
         if (isClosed()) {
             throw new RedisException("Connection is closed");
         }
 
-        if (queuedCommands.exceedsLimit(clientOptions.getRequestQueueSize())) {
-            throw new RedisException("Request queue size exceeded: " + clientOptions.getRequestQueueSize()
-                    + ". Commands are not accepted until the queue size drops.");
+        if (usesBoundedQueues()) {
+
+            if (QUEUE_SIZE.get(this) + commands > clientOptions.getRequestQueueSize()) {
+                throw new RedisException("Request queue size exceeded: " + clientOptions.getRequestQueueSize()
+                        + ". Commands are not accepted until the queue size drops.");
+            }
+
+            if (disconnectedBuffer.size() + commands > clientOptions.getRequestQueueSize()) {
+                throw new RedisException("Request queue size exceeded: " + clientOptions.getRequestQueueSize()
+                        + ". Commands are not accepted until the queue size drops.");
+            }
+
+            if (commandBuffer.size() + commands > clientOptions.getRequestQueueSize()) {
+                throw new RedisException("Command buffer size exceeded: " + clientOptions.getRequestQueueSize()
+                        + ". Commands are not accepted until the queue size drops.");
+            }
         }
 
-        if ((channel == null || !isConnected()) && isRejectCommand()) {
+        if (!isConnected() && isRejectCommand()) {
             throw new RedisException("Currently not connected. Commands are rejected.");
         }
     }
 
+    private boolean usesBoundedQueues() {
+        return clientOptions.getRequestQueueSize() != Integer.MAX_VALUE;
+    }
+
     private void writeToBuffer(Iterable<? extends RedisCommand<?, ?, ?>> commands) {
-        commands.forEach(this::writeToBuffer);
+
+        for (RedisCommand<?, ?, ?> command : commands) {
+            writeToBuffer(command);
+        }
+    }
+
+    private void writeToDisconnectedBuffer(Collection<? extends RedisCommand<?, ?, ?>> commands) {
+        for (RedisCommand<?, ?, ?> command : commands) {
+            writeToDisconnectedBuffer(command);
+        }
+    }
+
+    private void writeToDisconnectedBuffer(RedisCommand<?, ?, ?> command) {
+
+        if (disconnectedBuffer.contains(command)) {
+            return;
+        }
+
+        if (connectionError != null) {
+            if (debugEnabled) {
+                logger.debug("{} writeToDisconnectedBuffer() Completing command {} due to connection error", logPrefix(),
+                        command);
+            }
+            command.completeExceptionally(connectionError);
+
+            return;
+        }
+
+        if (debugEnabled) {
+            logger.debug("{} writeToDisconnectedBuffer() buffering (disconnected) command {}", logPrefix(), command);
+        }
+
+        disconnectedBuffer.add(command);
     }
 
-    private <C extends RedisCommand<?, ?, T>, T> void writeToBuffer(C command) {
+    protected <C extends RedisCommand<?, ?, T>, T> void writeToBuffer(C command) {
 
         if (commandBuffer.contains(command)) {
             return;
         }
 
-        bufferCommand(command);
+        if (debugEnabled) {
+            logger.debug("{} writeToBuffer() buffering command {}", logPrefix(), command);
+        }
+
+        if (connectionError != null) {
+
+            if (debugEnabled) {
+                logger.debug("{} writeToBuffer() Completing command {} due to connection error", logPrefix(), command);
+            }
+            command.completeExceptionally(connectionError);
+
+            return;
+        }
+
+        commandBuffer.add(command);
     }
 
     private void writeToChannel(RedisCommand<?, ?, ?> command) {
 
+        QUEUE_SIZE.incrementAndGet(this);
+
         if (reliability == Reliability.AT_MOST_ONCE) {
             // cancel on exceptions and remove from queue, because there is no housekeeping
-            writeAndFlush(command).addListener(new AtMostOnceWriteListener(command, queuedCommands));
+            writeAndFlush(command).addListener(new AtMostOnceWriteListener(command));
         }
 
         if (reliability == Reliability.AT_LEAST_ONCE) {
@@ -191,9 +272,11 @@ private void writeToChannel(RedisCommand<?, ?, ?> command) {
 
     private void writeToChannel(Collection<? extends RedisCommand<?, ?, ?>> commands) {
 
+        QUEUE_SIZE.addAndGet(this, commands.size());
+
         if (reliability == Reliability.AT_MOST_ONCE) {
             // cancel on exceptions and remove from queue, because there is no housekeeping
-            writeAndFlush(commands).addListener(new AtMostOnceWriteListener(commands, queuedCommands));
+            writeAndFlush(commands).addListener(new AtMostOnceWriteListener(commands));
         }
 
         if (reliability == Reliability.AT_LEAST_ONCE) {
@@ -202,23 +285,22 @@ private void writeToChannel(Collection<? extends RedisCommand<?, ?, ?>> commands
         }
     }
 
-    protected void bufferCommand(RedisCommand<?, ?, ?> command) {
+    private ChannelFuture writeAndFlush(RedisCommand<?, ?, ?> command) {
 
         if (debugEnabled) {
-            logger.debug("{} write() buffering command {}", logPrefix(), command);
+            logger.debug("{} write() writeAndFlush command {}", logPrefix(), command);
         }
 
-        if (connectionError != null) {
+        return channel.writeAndFlush(command);
+    }
 
-            if (debugEnabled) {
-                logger.debug("{} writeToBuffer() Completing command {} due to connection error", logPrefix(), command);
-            }
-            command.completeExceptionally(connectionError);
+    private ChannelFuture writeAndFlush(Collection<? extends RedisCommand<?, ?, ?>> commands) {
 
-            return;
+        if (debugEnabled) {
+            logger.debug("{} write() writeAndFlush commands {}", logPrefix(), commands);
         }
 
-        commandBuffer.add(command);
+        return channel.writeAndFlush(commands);
     }
 
     private boolean isRejectCommand() {
@@ -244,16 +326,6 @@ private boolean isRejectCommand() {
         }
     }
 
-    @Override
-    public void registerQueue(HasQueuedCommands queueHolder) {
-        queuedCommands.register(queueHolder);
-    }
-
-    @Override
-    public void unregisterQueue(HasQueuedCommands queueHolder) {
-        queuedCommands.unregister(queueHolder);
-    }
-
     @Override
     public void notifyChannelActive(Channel channel) {
 
@@ -281,7 +353,7 @@ public void notifyChannelActive(Channel channel) {
 
                 if (debugEnabled) {
                     logger.debug("{} activateEndpointAndExecuteBufferedCommands {} command(s) buffered", logPrefix(),
-                            commandBuffer.size());
+                            disconnectedBuffer.size());
                 }
 
                 if (debugEnabled) {
@@ -290,7 +362,7 @@ public void notifyChannelActive(Channel channel) {
 
                 connectionFacade.activated();
 
-                flushCommands();
+                flushCommands(disconnectedBuffer);
             } catch (Exception e) {
 
                 if (debugEnabled) {
@@ -304,7 +376,6 @@ public void notifyChannelActive(Channel channel) {
                 throw e;
             }
         });
-
     }
 
     @Override
@@ -337,18 +408,17 @@ public void notifyException(Throwable t) {
     }
 
     @Override
-    public void registerConnectionWatchdog(Optional<ConnectionWatchdog> connectionWatchdog) {
-        this.connectionWatchdog = connectionWatchdog.orElse(null);
-    }
-
-    @Override
-    public Queue<RedisCommand<?, ?, ?>> getQueue() {
-        return commandBuffer;
+    public void registerConnectionWatchdog(ConnectionWatchdog connectionWatchdog) {
+        this.connectionWatchdog = connectionWatchdog;
     }
 
     @Override
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public void flushCommands() {
+        flushCommands(commandBuffer);
+    }
+
+    private void flushCommands(Queue<RedisCommand<?, ?, ?>> queue) {
 
         if (debugEnabled) {
             logger.debug("{} flushCommands()", logPrefix());
@@ -358,11 +428,11 @@ public void flushCommands() {
 
             List<RedisCommand<?, ?, ?>> commands = sharedLock.doExclusive(() -> {
 
-                if (commandBuffer.isEmpty()) {
+                if (queue.isEmpty()) {
                     return Collections.<RedisCommand<?, ?, ?>> emptyList();
                 }
 
-                return drainCommands(commandBuffer);
+                return drainCommands(queue);
             });
 
             if (debugEnabled) {
@@ -373,7 +443,7 @@ public void flushCommands() {
 
                 if (reliability == Reliability.AT_MOST_ONCE) {
                     // cancel on exceptions and remove from queue, because there is no housekeeping
-                    writeAndFlush(commands).addListener(new AtMostOnceWriteListener(commands, queuedCommands));
+                    writeAndFlush(commands).addListener(new AtMostOnceWriteListener(commands));
                 }
 
                 if (reliability == Reliability.AT_LEAST_ONCE) {
@@ -404,6 +474,8 @@ public void close() {
                 connectionWatchdog.prepareClose();
             }
 
+            cancelBufferedCommands("Close");
+
             Channel currentChannel = this.channel;
             if (currentChannel != null) {
 
@@ -432,16 +504,6 @@ public void reset() {
         cancelBufferedCommands("Reset");
     }
 
-    @Override
-    public void setConnectionFacade(ConnectionFacade connectionFacade) {
-        this.connectionFacade = connectionFacade;
-    }
-
-    @Override
-    public void setAutoFlushCommands(boolean autoFlush) {
-        this.autoFlushCommands = autoFlush;
-    }
-
     /**
      * Reset the command-handler to the initial not-connected state.
      */
@@ -463,13 +525,14 @@ public void initialState() {
     public void notifyDrainQueuedCommands(HasQueuedCommands queuedCommands) {
 
         if (isClosed()) {
-            cancelCommands("Connection closed", queuedCommands.getQueue());
+            cancelCommands("Connection closed", queuedCommands.drainQueue());
+            cancelCommands("Connection closed", drainCommands());
             return;
         }
 
         sharedLock.doExclusive(() -> {
 
-            List<RedisCommand<?, ?, ?>> commands = drainCommands(queuedCommands.getQueue());
+            Collection<RedisCommand<?, ?, ?>> commands = queuedCommands.drainQueue();
 
             for (RedisCommand<?, ?, ?> command : commands) {
 
@@ -478,18 +541,24 @@ public void notifyDrainQueuedCommands(HasQueuedCommands queuedCommands) {
                 }
             }
 
-            Collections.reverse(commands);
+            logger.debug("{} notifyQueuedCommands adding {} command(s) to buffer", logPrefix(), commands.size());
 
-            logger.debug("{} notifyQueuedCommands {} command(s) added to buffer", logPrefix(), commands.size());
+            commands.addAll(drainCommands(disconnectedBuffer));
+
+            disconnectedBuffer.removeAll(commands);
 
             for (RedisCommand<?, ?, ?> command : commands) {
-                if (!commandBuffer.contains(command)) {
-                    commandBuffer.addFirst(command);
+                try {
+                    if (!disconnectedBuffer.contains(command)) {
+                        disconnectedBuffer.add(command);
+                    }
+                } catch (Exception e) {
+                    command.completeExceptionally(e);
                 }
             }
 
             if (isConnected()) {
-                flushCommands();
+                flushCommands(disconnectedBuffer);
             }
         });
     }
@@ -509,25 +578,17 @@ protected <T> T doExclusive(Supplier<T> supplier) {
         return sharedLock.doExclusive(supplier);
     }
 
-    private ChannelFuture writeAndFlush(Iterable<? extends RedisCommand<?, ?, ?>> commands) {
+    protected List<RedisCommand<?, ?, ?>> drainCommands() {
 
-        if (debugEnabled) {
-            logger.debug("{} write() writeAndFlush commands {}", logPrefix(), commands);
-        }
+        List<RedisCommand<?, ?, ?>> target = new ArrayList<>();
 
-        return channel.writeAndFlush(commands);
-    }
+        target.addAll(drainCommands(disconnectedBuffer));
+        target.addAll(drainCommands(commandBuffer));
 
-    private ChannelFuture writeAndFlush(RedisCommand<?, ?, ?> command) {
-
-        if (debugEnabled) {
-            logger.debug("{} write() writeAndFlush command {}", logPrefix(), command);
-        }
-
-        return channel.writeAndFlush(command);
+        return target;
     }
 
-    private List<RedisCommand<?, ?, ?>> drainCommands(Queue<? extends RedisCommand<?, ?, ?>> source) {
+    private static List<RedisCommand<?, ?, ?>> drainCommands(Queue<? extends RedisCommand<?, ?, ?>> source) {
 
         List<RedisCommand<?, ?, ?>> target = new ArrayList<>(source.size());
 
@@ -544,9 +605,7 @@ private ChannelFuture writeAndFlush(RedisCommand<?, ?, ?> command) {
     }
 
     private void cancelBufferedCommands(String message) {
-
-        List<RedisCommand<?, ?, ?>> toCancel = sharedLock.doExclusive(queuedCommands::drainCommands);
-        cancelCommands(message, toCancel);
+        cancelCommands(message, doExclusive(this::drainCommands));
     }
 
     private void cancelCommands(String message, Iterable<? extends RedisCommand<?, ?, ?>> toCancel) {
@@ -570,87 +629,109 @@ protected String logPrefix() {
         }
 
         StringBuffer buffer = new StringBuffer(64);
-        buffer.append('[').append(ChannelLogDescriptor.logDescriptor(channel)).append(", ")
-                .append("epid=0x").append(Long.toHexString(endpointId)).append(']');
+        buffer.append('[').append(ChannelLogDescriptor.logDescriptor(channel)).append(", ").append("epid=0x")
+                .append(Long.toHexString(endpointId)).append(']');
         return logPrefix = buffer.toString();
     }
 
-    private static class AtMostOnceWriteListener implements ChannelFutureListener {
+    private class ListenerSupport {
 
-        private final Collection<? extends RedisCommand<?, ?, ?>> sentCommands;
-        private final RedisCommand<?, ?, ?> sentCommand;
-        private final QueuedCommands queuedCommands;
+        final Collection<? extends RedisCommand<?, ?, ?>> sentCommands;
+        final RedisCommand<?, ?, ?> sentCommand;
 
-        AtMostOnceWriteListener(RedisCommand<?, ?, ?> sentCommand, QueuedCommands queuedCommands) {
+        ListenerSupport(RedisCommand<?, ?, ?> sentCommand) {
             this.sentCommand = sentCommand;
             this.sentCommands = null;
-            this.queuedCommands = queuedCommands;
         }
 
-        AtMostOnceWriteListener(Collection<? extends RedisCommand<?, ?, ?>> sentCommands, QueuedCommands queuedCommands) {
+        ListenerSupport(Collection<? extends RedisCommand<?, ?, ?>> sentCommands) {
             this.sentCommand = null;
             this.sentCommands = sentCommands;
-            this.queuedCommands = queuedCommands;
         }
 
-        @Override
-        public void operationComplete(ChannelFuture future) throws Exception {
-            future.await();
+        void dequeue() {
+            if (sentCommand != null) {
+                QUEUE_SIZE.decrementAndGet(DefaultEndpoint.this);
+            }
 
-            if (future.cause() != null) {
+            if (sentCommands != null) {
+                QUEUE_SIZE.addAndGet(DefaultEndpoint.this, -sentCommands.size());
+            }
+        }
 
-                if (sentCommand != null) {
+        protected void complete(Throwable t) {
 
-                    sentCommand.completeExceptionally(future.cause());
-                    queuedCommands.remove(sentCommand);
-                }
+            if (sentCommand != null) {
+                sentCommand.completeExceptionally(t);
+            }
 
-                if (sentCommands != null) {
+            if (sentCommands != null) {
 
-                    for (RedisCommand<?, ?, ?> sentCommand : sentCommands) {
-                        sentCommand.completeExceptionally(future.cause());
-                    }
-                    queuedCommands.removeAll(sentCommands);
+                for (RedisCommand<?, ?, ?> sentCommand : sentCommands) {
+                    sentCommand.completeExceptionally(t);
                 }
             }
         }
     }
 
+    private class AtMostOnceWriteListener extends ListenerSupport implements ChannelFutureListener {
+
+        AtMostOnceWriteListener(RedisCommand<?, ?, ?> sentCommand) {
+            super(sentCommand);
+        }
+
+        AtMostOnceWriteListener(Collection<? extends RedisCommand<?, ?, ?>> sentCommands) {
+            super(sentCommands);
+        }
+
+        @Override
+        public void operationComplete(ChannelFuture future) throws Exception {
+
+            dequeue();
+
+            if (future.cause() != null) {
+                complete(future.cause());
+
+            }
+        }
+    }
+
     /**
      * A generic future listener which retries unsuccessful writes.
      */
-    private class RetryListener implements GenericFutureListener<Future<Void>> {
+    private class RetryListener extends ListenerSupport implements GenericFutureListener<Future<Void>> {
 
-        private final Collection<? extends RedisCommand<?, ?, ?>> sentCommands;
-        private final RedisCommand<?, ?, ?> sentCommand;
-
-        RetryListener(Collection<? extends RedisCommand<?, ?, ?>> sentCommands) {
-            this.sentCommands = sentCommands;
-            this.sentCommand = null;
+        RetryListener(RedisCommand<?, ?, ?> sentCommand) {
+            super(sentCommand);
         }
 
-        RetryListener(RedisCommand<?, ?, ?> sentCommand) {
-            this.sentCommands = null;
-            this.sentCommand = sentCommand;
+        RetryListener(Collection<? extends RedisCommand<?, ?, ?>> sentCommands) {
+            super(sentCommands);
         }
 
+        @SuppressWarnings("unchecked")
         @Override
         public void operationComplete(Future<Void> future) throws Exception {
 
             Throwable cause = future.cause();
 
+            dequeue();
+
             if (!future.isSuccess()) {
+
                 if (sentCommand != null) {
-                    if (!sentCommand.isCancelled() && !sentCommand.isDone()) {
+                    try {
                         write(sentCommand);
+                    } catch (Exception e) {
+                        complete(e);
                     }
                 }
 
                 if (sentCommands != null) {
-                    for (RedisCommand<?, ?, ?> command : sentCommands) {
-                        if (!command.isCancelled() && !command.isDone()) {
-                            write(command);
-                        }
+                    try {
+                        write((Collection) sentCommands);
+                    } catch (Exception e) {
+                        complete(e);
                     }
                 }
             }
@@ -670,7 +751,7 @@ public void operationComplete(Future<Void> future) throws Exception {
     }
 
     private enum Reliability {
-        AT_MOST_ONCE, AT_LEAST_ONCE;
+        AT_MOST_ONCE, AT_LEAST_ONCE
     }
 
 }
diff --git a/src/main/java/io/lettuce/core/protocol/Endpoint.java b/src/main/java/io/lettuce/core/protocol/Endpoint.java
index 75f0e23bbc..ab7a4a54b5 100644
--- a/src/main/java/io/lettuce/core/protocol/Endpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/Endpoint.java
@@ -15,8 +15,6 @@
  */
 package io.lettuce.core.protocol;
 
-import java.util.Optional;
-
 import io.netty.channel.Channel;
 
 /**
@@ -48,20 +46,6 @@ public interface Endpoint {
      */
     void notifyException(Throwable t);
 
-    /**
-     * Register a component holding a queue.
-     *
-     * @param queueHolder the queue holder.
-     */
-    void registerQueue(HasQueuedCommands queueHolder);
-
-    /**
-     * Unregister a component holding a queue.
-     *
-     * @param queueHolder the queue holder.
-     */
-    void unregisterQueue(HasQueuedCommands queueHolder);
-
     /**
      * Signal the endpoint to drain queued commands from the queue holder.
      *
@@ -72,8 +56,8 @@ public interface Endpoint {
     /**
      * Associate a {@link ConnectionWatchdog} with the {@link Endpoint}.
      *
-     * @param connectionWatchdog the connection watchdog, may be empty.
+     * @param connectionWatchdog the connection watchdog.
      */
-    void registerConnectionWatchdog(Optional<ConnectionWatchdog> connectionWatchdog);
+    void registerConnectionWatchdog(ConnectionWatchdog connectionWatchdog);
 
 }
diff --git a/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java b/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java
index f72c101d57..2c3a537455 100644
--- a/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java
+++ b/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.protocol;
 
+import java.util.Collection;
 import java.util.Queue;
 
 /**
@@ -23,12 +24,7 @@
  *
  * @author Mark Paluch
  */
-public interface HasQueuedCommands {
+interface HasQueuedCommands {
 
-    /**
-     * The queue holding commands.
-     *
-     * @return the queue
-     */
-    Queue<RedisCommand<?, ?, ?>> getQueue();
+    Collection<RedisCommand<?,?,?>> drainQueue();
 }
diff --git a/src/main/java/io/lettuce/core/protocol/QueuedCommands.java b/src/main/java/io/lettuce/core/protocol/QueuedCommands.java
deleted file mode 100644
index 78d7da2781..0000000000
--- a/src/main/java/io/lettuce/core/protocol/QueuedCommands.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2011-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.protocol;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import io.netty.util.internal.ConcurrentSet;
-
-/**
- * Registry for all queued commands. This class allows to register/unregister {@link HasQueuedCommands queue holders}. It
- * provides queue maintenance commands.
- *
- * @author Mark Paluch
- */
-class QueuedCommands {
-
-    private Set<HasQueuedCommands> queues = new ConcurrentSet<>();
-
-    /**
-     * Register queue holder.
-     *
-     * @param queueHolder the queue holder, must not be {@literal null}.
-     */
-    void register(HasQueuedCommands queueHolder) {
-        queues.add(queueHolder);
-    }
-
-    /**
-     * Unregister queue holder.
-     *
-     * @param queueHolder the queue holder, must not be {@literal null}.
-     */
-    void unregister(HasQueuedCommands queueHolder) {
-        queues.remove(queueHolder);
-    }
-
-    /**
-     * Remove a command from all registered queues.
-     *
-     * @param command the command.
-     */
-    public void remove(RedisCommand<?, ?, ?> command) {
-
-        for (HasQueuedCommands queue : queues) {
-            queue.getQueue().remove(command);
-        }
-    }
-
-    /**
-     * Remove multiple commands from all registered queues.
-     *
-     * @param commands the commands.
-     */
-    void removeAll(Collection<? extends RedisCommand<?, ?, ?>> commands) {
-
-        for (HasQueuedCommands queue : queues) {
-            queue.getQueue().removeAll(commands);
-        }
-    }
-
-    /**
-     * Drain commands from all queues.
-     *
-     * @return the commands.
-     */
-    List<RedisCommand<?, ?, ?>> drainCommands() {
-
-        int size = 0;
-
-        for (HasQueuedCommands queue : queues) {
-            size += queue.getQueue().size();
-        }
-
-        List<RedisCommand<?, ?, ?>> target = new ArrayList<>(size);
-
-        RedisCommand<?, ?, ?> cmd;
-        for (HasQueuedCommands queue : queues) {
-            while ((cmd = queue.getQueue().poll()) != null) {
-                target.add(cmd);
-            }
-        }
-
-        return target;
-    }
-
-    /**
-     * Check whether the registered queues exceed a global sized of the {@code requestQueueSize}.
-     *
-     * @param requestQueueSize the queue size limit.
-     * @return {@literal true} if there are more queued commands than {@code requestQueueSize}
-     */
-    boolean exceedsLimit(int requestQueueSize) {
-
-        if (requestQueueSize == Integer.MAX_VALUE) {
-            return false;
-        }
-
-        int current = 0;
-
-        for (HasQueuedCommands queue : queues) {
-            current += queue.getQueue().size();
-            if (current >= requestQueueSize) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
index c99facf1a8..497b38f954 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,11 @@
  */
 package io.lettuce.core.pubsub;
 
+import io.lettuce.core.ClientOptions;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.output.CommandOutput;
 import io.lettuce.core.protocol.CommandHandler;
 import io.lettuce.core.resource.ClientResources;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
@@ -42,31 +42,33 @@ public class PubSubCommandHandler<K, V> extends CommandHandler {
     /**
      * Initialize a new instance.
      *
+     * @param clientOptions client options for this connection, must not be {@literal null}
      * @param clientResources client resources for this connection
      * @param codec Codec.
      * @param endpoint the Pub/Sub endpoint for Pub/Sub callback.
      */
-    public PubSubCommandHandler(ClientResources clientResources, RedisCodec<K, V> codec, PubSubEndpoint<K, V> endpoint) {
+    public PubSubCommandHandler(ClientOptions clientOptions, ClientResources clientResources, RedisCodec<K, V> codec,
+            PubSubEndpoint<K, V> endpoint) {
 
-        super(clientResources, endpoint);
+        super(clientOptions, clientResources, endpoint);
 
+        this.endpoint = endpoint;
         this.codec = codec;
         this.output = new PubSubOutput<>(codec);
-        this.endpoint = endpoint;
     }
 
     @SuppressWarnings("unchecked")
     @Override
     protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws InterruptedException {
 
-        while (output.type() == null && !getQueue().isEmpty()) {
-            CommandOutput<?, ?, ?> currentOutput = getQueue().peek().getOutput();
+        while (output.type() == null && canDecode(buffer)) {
+            CommandOutput<?, ?, ?> currentOutput = getStack().peek().getOutput();
 
             if (!super.decode(buffer, currentOutput)) {
                 return;
             }
 
-            getQueue().poll().complete();
+            getStack().poll().complete();
 
             buffer.discardReadBytes();
 
diff --git a/src/test/java/io/lettuce/ConnectionTestUtil.java b/src/test/java/io/lettuce/ConnectionTestUtil.java
index 35b4537b97..4b9e465b60 100644
--- a/src/test/java/io/lettuce/ConnectionTestUtil.java
+++ b/src/test/java/io/lettuce/ConnectionTestUtil.java
@@ -22,7 +22,6 @@
 import io.lettuce.core.RedisChannelHandler;
 import io.lettuce.core.RedisChannelWriter;
 import io.lettuce.core.api.StatefulConnection;
-import io.lettuce.core.internal.LettuceFactories;
 import io.lettuce.core.protocol.CommandHandler;
 import io.lettuce.core.protocol.ConnectionWatchdog;
 import io.lettuce.core.protocol.DefaultEndpoint;
@@ -73,37 +72,73 @@ public static RedisChannelWriter getChannelWriter(StatefulConnection<?, ?> conne
     }
 
     /**
-     * Extract the queue from a from a {@link StatefulConnection}.
+     * Extract the stack from a from a {@link StatefulConnection}.
      *
      * @param connection the connection
-     * @return the queue
+     * @return the stack
      */
-    public static Queue<Object> getQueue(StatefulConnection<?, ?> connection) {
+    public static Queue<Object> getStack(StatefulConnection<?, ?> connection) {
 
         Channel channel = getChannel(connection);
 
         if (channel != null) {
             CommandHandler commandHandler = channel.pipeline().get(CommandHandler.class);
-            return (Queue) commandHandler.getQueue();
+            return (Queue) commandHandler.getStack();
         }
 
-        return LettuceFactories.newConcurrentQueue();
+        throw new IllegalArgumentException("Cannot obtain stack from " + connection);
     }
 
     /**
-     * Extract the command buffer from a from a {@link StatefulConnection}.
+     * Extract the disconnected buffer from a from a {@link StatefulConnection}.
      *
      * @param connection the connection
      * @return the queue
      */
+    public static Queue<Object> getDisconnectedBuffer(StatefulConnection<?, ?> connection) {
+
+        RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection);
+        if (channelWriter instanceof DefaultEndpoint) {
+            return getDisconnectedBuffer((DefaultEndpoint) channelWriter);
+        }
+
+        throw new IllegalArgumentException("Cannot disconnected command buffer from " + connection);
+    }
+
+    /**
+     * Extract the disconnected buffer from a {@link DefaultEndpoint}.
+     *
+     * @param endpoint the endpoint
+     * @return the queue
+     */
+    public static Queue<Object> getDisconnectedBuffer(DefaultEndpoint endpoint) {
+        return (Queue) ReflectionTestUtils.getField(endpoint, "disconnectedBuffer");
+    }
+
+    /**
+     * Extract the active command queue size a {@link DefaultEndpoint}.
+     *
+     * @param endpoint the endpoint
+     * @return the queue
+     */
+    public static int getQueueSize(DefaultEndpoint endpoint) {
+        return (Integer) ReflectionTestUtils.getField(endpoint, "queueSize");
+    }
+
+    /**
+     * Extract the command buffer from a {@link StatefulConnection}.
+     *
+     * @param connection the connection
+     * @return the command buffer
+     */
     public static Queue<Object> getCommandBuffer(StatefulConnection<?, ?> connection) {
 
         RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection);
         if (channelWriter instanceof DefaultEndpoint) {
-            return (Queue) ((DefaultEndpoint) channelWriter).getQueue();
+            return (Queue) ReflectionTestUtils.getField(channelWriter, "commandBuffer");
         }
 
-        return LettuceFactories.newConcurrentQueue();
+        throw new IllegalArgumentException("Cannot obtain command buffer from " + channelWriter);
     }
 
     /**
diff --git a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
index 139aa723a7..7222f8a082 100644
--- a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
@@ -73,7 +73,7 @@ public void before() throws Exception {
             return command;
         });
 
-        commandHandler = new CommandHandler(clientResources, endpoint);
+        commandHandler = new CommandHandler(ClientOptions.create(), clientResources, endpoint);
 
         embeddedChannel = new EmbeddedChannel(commandHandler);
         embeddedChannel.connect(new LocalAddress("remote"));
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
index c13f1f3822..80d15f1f4f 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
@@ -30,6 +30,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.RedisChannelWriter;
@@ -49,9 +50,9 @@
 public class ClusterNodeEndpointTest {
 
     private AsyncCommand<String, String, String> command = new AsyncCommand<>(new Command<>(CommandType.APPEND,
-            new StatusOutput<String, String>(new Utf8StringCodec()), null));
+            new StatusOutput<>(new Utf8StringCodec()), null));
 
-    private Queue<RedisCommand<String, String, ?>> queue;
+    private Queue<RedisCommand<String, String, ?>> disconnectedBuffer;
 
     @Mock
     private ClientOptions clientOptions;
@@ -65,10 +66,12 @@ public class ClusterNodeEndpointTest {
     private ClusterNodeEndpoint sut;
 
     @Before
-    public void before() throws Exception {
+    public void before() {
+
+        when(clientOptions.getRequestQueueSize()).thenReturn(1000);
 
         sut = new ClusterNodeEndpoint(clientOptions, clientResources, clusterChannelWriter);
-        queue = (Queue) sut.getQueue();
+        disconnectedBuffer = (Queue) ReflectionTestUtils.getField(sut, "disconnectedBuffer");
     }
 
     @Test
@@ -81,7 +84,7 @@ public void closeWithoutCommands() throws Exception {
     @Test
     public void closeWithQueuedCommands() throws Exception {
 
-        queue.add(command);
+        disconnectedBuffer.add(command);
 
         sut.close();
 
@@ -91,7 +94,7 @@ public void closeWithQueuedCommands() throws Exception {
     @Test
     public void closeWithCancelledQueuedCommands() throws Exception {
 
-        queue.add(command);
+        disconnectedBuffer.add(command);
         command.cancel();
 
         sut.close();
@@ -102,7 +105,7 @@ public void closeWithCancelledQueuedCommands() throws Exception {
     @Test
     public void closeWithQueuedCommandsFails() throws Exception {
 
-        queue.add(command);
+        disconnectedBuffer.add(command);
         when(clusterChannelWriter.write(any(RedisCommand.class))).thenThrow(new RedisException("meh"));
 
         sut.close();
@@ -121,7 +124,6 @@ public void closeWithQueuedCommandsFails() throws Exception {
     @Test
     public void closeWithBufferedCommands() throws Exception {
 
-        when(clientOptions.getRequestQueueSize()).thenReturn(1000);
         when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS);
         sut.write(command);
 
@@ -133,7 +135,6 @@ public void closeWithBufferedCommands() throws Exception {
     @Test
     public void closeWithCancelledBufferedCommands() throws Exception {
 
-        when(clientOptions.getRequestQueueSize()).thenReturn(1000);
         when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS);
         sut.write(command);
         command.cancel();
@@ -146,7 +147,6 @@ public void closeWithCancelledBufferedCommands() throws Exception {
     @Test
     public void closeWithBufferedCommandsFails() throws Exception {
 
-        when(clientOptions.getRequestQueueSize()).thenReturn(1000);
         when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS);
         sut.write(command);
         when(clusterChannelWriter.write(any(RedisCommand.class))).thenThrow(new RedisException(""));
diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
index 5460cb500d..1f146b324e 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
@@ -41,6 +41,7 @@
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import io.lettuce.core.ClientOptions;
 import io.lettuce.core.ConnectionEvents;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.metrics.DefaultCommandLatencyCollector;
@@ -55,7 +56,7 @@
 @RunWith(MockitoJUnitRunner.class)
 public class CommandHandlerTest {
 
-    private Queue<RedisCommand<String, String, ?>> q;
+    private Queue<RedisCommand<String, String, ?>> stack;
 
     private CommandHandler sut;
 
@@ -115,8 +116,8 @@ public void before() throws Exception {
         when(clientResources.commandLatencyCollector()).thenReturn(
                 new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create()));
 
-        sut = new CommandHandler(clientResources, endpoint);
-        q = (Queue) ReflectionTestUtils.getField(sut, "queue");
+        sut = new CommandHandler(ClientOptions.create(), clientResources, endpoint);
+        stack = (Queue) ReflectionTestUtils.getField(sut, "stack");
     }
 
     @Test
@@ -154,14 +155,14 @@ public void testExceptionChannelInactive() throws Exception {
     @Test
     public void testExceptionWithQueue() throws Exception {
         sut.setState(CommandHandler.LifecycleState.ACTIVE);
-        q.clear();
+        stack.clear();
 
         sut.channelActive(context);
 
-        q.add(command);
+        stack.add(command);
         sut.exceptionCaught(context, new Exception());
 
-        assertThat(q).isEmpty();
+        assertThat(stack).isEmpty();
         command.get();
 
         assertThat(ReflectionTestUtils.getField(command, "exception")).isNotNull();
@@ -246,7 +247,7 @@ public void shouldNotWriteCancelledCommands() throws Exception {
         sut.write(context, command, null);
 
         verifyZeroInteractions(context);
-        assertThat((Collection) ReflectionTestUtils.getField(sut, "queue")).isEmpty();
+        assertThat(stack).isEmpty();
     }
 
     @Test
@@ -265,7 +266,7 @@ public void shouldCancelCommandOnQueueSingleFailure() throws Exception {
             assertThat(e).isSameAs(exception);
         }
 
-        assertThat((Collection) ReflectionTestUtils.getField(sut, "queue")).isEmpty();
+        assertThat(stack).isEmpty();
         verify(commandMock).completeExceptionally(exception);
     }
 
@@ -285,7 +286,7 @@ public void shouldCancelCommandOnQueueBatchFailure() throws Exception {
             assertThat(e).isSameAs(exception);
         }
 
-        assertThat((Collection) ReflectionTestUtils.getField(sut, "queue")).isEmpty();
+        assertThat(stack).isEmpty();
         verify(commandMock).completeExceptionally(exception);
     }
 
@@ -295,8 +296,7 @@ public void shouldWriteActiveCommands() throws Exception {
         sut.write(context, command, null);
 
         verify(context).write(command, null);
-        assertThat((Collection) ReflectionTestUtils.getField(sut, "queue")).hasSize(1).allMatch(
-                o -> o instanceof LatencyMeteredCommand);
+        assertThat(stack).hasSize(1).allMatch(o -> o instanceof LatencyMeteredCommand);
     }
 
     @Test
@@ -306,7 +306,7 @@ public void shouldNotWriteCancelledCommandBatch() throws Exception {
         sut.write(context, Arrays.asList(command), null);
 
         verifyZeroInteractions(context);
-        assertThat((Collection) ReflectionTestUtils.getField(sut, "queue")).isEmpty();
+        assertThat((Collection) ReflectionTestUtils.getField(sut, "stack")).isEmpty();
     }
 
     @Test
@@ -316,7 +316,7 @@ public void shouldWriteActiveCommandsInBatch() throws Exception {
         sut.write(context, commands, null);
 
         verify(context).write(commands, null);
-        assertThat((Collection) ReflectionTestUtils.getField(sut, "queue")).hasSize(1);
+        assertThat(stack).hasSize(1);
     }
 
     @Test
@@ -334,8 +334,7 @@ public void shouldWriteActiveCommandsInMixedBatch() throws Exception {
         verify(context).write(captor.capture(), any());
 
         assertThat(captor.getValue()).containsOnly(command2);
-        assertThat((Collection) ReflectionTestUtils.getField(sut, "queue")).hasSize(1)
-                .allMatch(o -> o instanceof LatencyMeteredCommand)
+        assertThat(stack).hasSize(1).allMatch(o -> o instanceof LatencyMeteredCommand)
                 .allMatch(o -> CommandWrapper.unwrap((RedisCommand) o) == command2);
     }
 
diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
index 119291cbde..b888a411f9 100644
--- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
@@ -19,14 +19,12 @@
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.anyObject;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Optional;
 import java.util.Queue;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -46,6 +44,7 @@
 
 import edu.umd.cs.mtc.MultithreadedTestCase;
 import edu.umd.cs.mtc.TestFramework;
+import io.lettuce.ConnectionTestUtil;
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.Utf8StringCodec;
@@ -58,7 +57,7 @@
 @RunWith(MockitoJUnitRunner.class)
 public class DefaultEndpointTest {
 
-    private Queue<RedisCommand<String, String, ?>> q = LettuceFactories.newConcurrentQueue();
+    private Queue<RedisCommand<String, String, ?>> queue = LettuceFactories.newConcurrentQueue(1000);
 
     private DefaultEndpoint sut;
 
@@ -94,15 +93,15 @@ public static void afterClass() {
     }
 
     @Before
-    public void before() throws Exception {
+    public void before() {
 
         when(channel.writeAndFlush(any())).thenAnswer(invocation -> {
             if (invocation.getArguments()[0] instanceof RedisCommand) {
-                q.add((RedisCommand) invocation.getArguments()[0]);
+                queue.add((RedisCommand) invocation.getArguments()[0]);
             }
 
             if (invocation.getArguments()[0] instanceof Collection) {
-                q.addAll((Collection) invocation.getArguments()[0]);
+                queue.addAll((Collection) invocation.getArguments()[0]);
             }
             return new DefaultChannelPromise(channel);
         });
@@ -112,29 +111,29 @@ public void before() throws Exception {
     }
 
     @Test
-    public void writeConnectedShouldWriteCommandToChannel() throws Exception {
+    public void writeConnectedShouldWriteCommandToChannel() {
 
         when(channel.isActive()).thenReturn(true);
 
         sut.notifyChannelActive(channel);
         sut.write(command);
 
-        assertThat(sut.getQueue()).isEmpty();
+        assertThat(ConnectionTestUtil.getQueueSize(sut)).isEqualTo(1);
         verify(channel).writeAndFlush(command);
     }
 
     @Test
-    public void writeDisconnectedShouldBufferCommands() throws Exception {
+    public void writeDisconnectedShouldBufferCommands() {
 
         sut.write(command);
 
-        assertThat(sut.getQueue()).contains(command);
+        assertThat(ConnectionTestUtil.getDisconnectedBuffer(sut)).contains(command);
 
-        verify(channel, never()).writeAndFlush(anyObject(), any());
+        verify(channel, never()).writeAndFlush(any());
     }
 
     @Test
-    public void notifyChannelActiveActivatesFacade() throws Exception {
+    public void notifyChannelActiveActivatesFacade() {
 
         sut.notifyChannelActive(channel);
 
@@ -142,9 +141,9 @@ public void notifyChannelActiveActivatesFacade() throws Exception {
     }
 
     @Test
-    public void notifyChannelActiveArmsConnectionWatchdog() throws Exception {
+    public void notifyChannelActiveArmsConnectionWatchdog() {
 
-        sut.registerConnectionWatchdog(Optional.of(connectionWatchdog));
+        sut.registerConnectionWatchdog(connectionWatchdog);
 
         sut.notifyChannelActive(channel);
 
@@ -152,7 +151,7 @@ public void notifyChannelActiveArmsConnectionWatchdog() throws Exception {
     }
 
     @Test
-    public void notifyChannelInactiveDeactivatesFacade() throws Exception {
+    public void notifyChannelInactiveDeactivatesFacade() {
 
         sut.notifyChannelInactive(channel);
 
@@ -160,7 +159,7 @@ public void notifyChannelInactiveDeactivatesFacade() throws Exception {
     }
 
     @Test
-    public void notifyExceptionShouldStoreException() throws Exception {
+    public void notifyExceptionShouldStoreException() {
 
         sut.notifyException(new IllegalStateException());
         sut.write(command);
@@ -169,7 +168,7 @@ public void notifyExceptionShouldStoreException() throws Exception {
     }
 
     @Test
-    public void notifyChannelActiveClearsStoredException() throws Exception {
+    public void notifyChannelActiveClearsStoredException() {
 
         sut.notifyException(new IllegalStateException());
         sut.notifyChannelActive(channel);
@@ -179,34 +178,33 @@ public void notifyChannelActiveClearsStoredException() throws Exception {
     }
 
     @Test
-    public void notifyDrainQueuedCommandsShouldBufferCommands() throws Exception {
+    public void notifyDrainQueuedCommandsShouldBufferCommands() {
 
-        Queue<RedisCommand<?, ?, ?>> q = LettuceFactories.newConcurrentQueue();
+        Queue<RedisCommand<?, ?, ?>> q = LettuceFactories.newConcurrentQueue(100);
         q.add(command);
 
         sut.notifyDrainQueuedCommands(() -> q);
 
-        assertThat(q).isEmpty();
-        assertThat(sut.getQueue()).contains(command);
+        assertThat(ConnectionTestUtil.getDisconnectedBuffer(sut)).contains(command);
+        verify(channel, never()).writeAndFlush(any());
     }
 
     @Test
-    public void notifyDrainQueuedCommandsShouldWriteCommands() throws Exception {
+    public void notifyDrainQueuedCommandsShouldWriteCommands() {
 
         when(channel.isActive()).thenReturn(true);
 
-        Queue<RedisCommand<?, ?, ?>> q = LettuceFactories.newConcurrentQueue();
+        Queue<RedisCommand<?, ?, ?>> q = LettuceFactories.newConcurrentQueue(100);
         q.add(command);
 
         sut.notifyChannelActive(channel);
         sut.notifyDrainQueuedCommands(() -> q);
 
-        assertThat(q).isEmpty();
         verify(channel).writeAndFlush(eq(Arrays.asList(command)));
     }
 
     @Test
-    public void writeShouldRejectCommandsInDisconnectedState() throws Exception {
+    public void writeShouldRejectCommandsInDisconnectedState() {
 
         sut = new DefaultEndpoint(ClientOptions.builder() //
                 .disconnectedBehavior(ClientOptions.DisconnectedBehavior.REJECT_COMMANDS) //
@@ -221,7 +219,7 @@ public void writeShouldRejectCommandsInDisconnectedState() throws Exception {
     }
 
     @Test
-    public void writeShouldRejectCommandsInClosedState() throws Exception {
+    public void writeShouldRejectCommandsInClosedState() {
 
         sut.close();
 
@@ -234,7 +232,7 @@ public void writeShouldRejectCommandsInClosedState() throws Exception {
     }
 
     @Test
-    public void writeWithoutAutoReconnectShouldRejectCommandsInDisconnectedState() throws Exception {
+    public void writeWithoutAutoReconnectShouldRejectCommandsInDisconnectedState() {
 
         sut = new DefaultEndpoint(ClientOptions.builder() //
                 .autoReconnect(false) //
@@ -250,10 +248,10 @@ public void writeWithoutAutoReconnectShouldRejectCommandsInDisconnectedState() t
     }
 
     @Test
-    public void closeCleansUpResources() throws Exception {
+    public void closeCleansUpResources() {
 
         sut.notifyChannelActive(channel);
-        sut.registerConnectionWatchdog(Optional.of(connectionWatchdog));
+        sut.registerConnectionWatchdog(connectionWatchdog);
 
         sut.close();
 
@@ -262,10 +260,10 @@ public void closeCleansUpResources() throws Exception {
     }
 
     @Test
-    public void closeAllowsOnlyOneCall() throws Exception {
+    public void closeAllowsOnlyOneCall() {
 
         sut.notifyChannelActive(channel);
-        sut.registerConnectionWatchdog(Optional.of(connectionWatchdog));
+        sut.registerConnectionWatchdog(connectionWatchdog);
 
         sut.close();
         sut.close();
@@ -294,7 +292,7 @@ public MTCConcurrentConcurrentWrite(Command<String, String, String> command) {
             handler = new TestableEndpoint(ClientOptions.create()) {
 
                 @Override
-                protected void bufferCommand(RedisCommand<?, ?, ?> command) {
+                protected <C extends RedisCommand<?, ?, T>, T> void writeToBuffer(C command) {
 
                     waitForTick(2);
 
@@ -302,7 +300,7 @@ protected void bufferCommand(RedisCommand<?, ?, ?> command) {
                     AtomicLong writers = (AtomicLong) ReflectionTestUtils.getField(sharedLock, "writers");
                     assertThat(writers.get()).isEqualTo(2);
                     waitForTick(3);
-                    super.bufferCommand(command);
+                    super.writeToBuffer(command);
                 }
             };
         }
diff --git a/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
index 622196410d..6f3e78d940 100644
--- a/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
@@ -34,7 +34,6 @@
 import io.lettuce.core.output.IntegerOutput;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.handler.codec.EncoderException;
@@ -102,7 +101,7 @@ public void noBufferedCommandsAfterExecute() throws Exception {
 
         connection.set(key, "1");
 
-        assertThat(ConnectionTestUtil.getQueue(connection.getStatefulConnection())).isEmpty();
+        assertThat(ConnectionTestUtil.getStack(connection.getStatefulConnection())).isEmpty();
         assertThat(ConnectionTestUtil.getCommandBuffer(connection.getStatefulConnection())).isEmpty();
 
         connection.getStatefulConnection().close();
@@ -134,14 +133,14 @@ public void commandFailsWhenFailOnEncode() throws Exception {
         RedisCommands<String, String> verificationConnection = client.connect().sync();
 
         connection.set(key, "1");
-        AsyncCommand<String, String, String> working = new AsyncCommand<>(
-                new Command<>(CommandType.INCR, new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key)));
+        AsyncCommand<String, String, String> working = new AsyncCommand<>(new Command<>(CommandType.INCR, new IntegerOutput(
+                CODEC), new CommandArgs<>(CODEC).addKey(key)));
         channelWriter.write(working);
         assertThat(working.await(2, TimeUnit.SECONDS)).isTrue();
         assertThat(connection.get(key)).isEqualTo("2");
 
-        AsyncCommand<String, String, Object> command = new AsyncCommand(
-                new Command<>(CommandType.INCR, new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key))) {
+        AsyncCommand<String, String, Object> command = new AsyncCommand(new Command<>(CommandType.INCR,
+                new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key))) {
 
             @Override
             public void encode(ByteBuf buf) {
@@ -157,7 +156,7 @@ public void encode(ByteBuf buf) {
 
         assertThat(verificationConnection.get(key)).isEqualTo("2");
 
-        assertThat(ConnectionTestUtil.getQueue(connection.getStatefulConnection())).isNotEmpty();
+        assertThat(ConnectionTestUtil.getStack(connection.getStatefulConnection())).isNotEmpty();
 
         connection.getStatefulConnection().close();
     }
@@ -198,7 +197,7 @@ public void commandNotFailedChannelClosesWhileFlush() throws Exception {
 
         assertThat(verificationConnection.get(key)).isEqualTo("1");
 
-        assertThat(ConnectionTestUtil.getQueue(connection)).isEmpty();
+        assertThat(ConnectionTestUtil.getStack(connection)).isEmpty();
         assertThat(ConnectionTestUtil.getCommandBuffer(connection)).isNotEmpty().contains(command);
 
         connection.close();
@@ -245,7 +244,7 @@ public void commandRetriedChannelClosesWhileFlush() throws Exception {
 
         assertThat(verificationConnection.get(key)).isEqualTo("2");
 
-        assertThat(ConnectionTestUtil.getQueue(sync.getStatefulConnection())).isEmpty();
+        assertThat(ConnectionTestUtil.getStack(sync.getStatefulConnection())).isEmpty();
         assertThat(ConnectionTestUtil.getCommandBuffer(sync.getStatefulConnection())).isEmpty();
 
         sync.getStatefulConnection().close();
@@ -253,8 +252,8 @@ public void commandRetriedChannelClosesWhileFlush() throws Exception {
     }
 
     protected AsyncCommand<String, String, Object> getBlockOnEncodeCommand(final CountDownLatch block) {
-        return new AsyncCommand<String, String, Object>(
-                new Command<>(CommandType.INCR, new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key))) {
+        return new AsyncCommand<String, String, Object>(new Command<>(CommandType.INCR, new IntegerOutput(CODEC),
+                new CommandArgs<>(CODEC).addKey(key))) {
 
             @Override
             public void encode(ByteBuf buf) {
@@ -276,8 +275,8 @@ public void commandFailsDuringDecode() throws Exception {
 
         connection.set(key, "1");
 
-        AsyncCommand<String, String, String> command = new AsyncCommand(
-                new Command<>(CommandType.INCR, new StatusOutput<>(CODEC), new CommandArgs<>(CODEC).addKey(key)));
+        AsyncCommand<String, String, String> command = new AsyncCommand(new Command<>(CommandType.INCR, new StatusOutput<>(
+                CODEC), new CommandArgs<>(CODEC).addKey(key)));
 
         channelWriter.write(command);
 
@@ -316,13 +315,14 @@ public void commandCancelledOverSyncAPIAfterConnectionIsDisconnected() throws Ex
 
         assertThat(verificationConnection.get("key")).isEqualTo("1");
 
-        assertThat(ConnectionTestUtil.getQueue(connection)).isEmpty();
-        assertThat(ConnectionTestUtil.getCommandBuffer(connection).size()).isGreaterThan(0);
+        assertThat(ConnectionTestUtil.getDisconnectedBuffer(connection).size()).isGreaterThan(0);
+        assertThat(ConnectionTestUtil.getCommandBuffer(connection)).isEmpty();
 
         connectionWatchdog.setListenOnChannelInactive(true);
         connectionWatchdog.scheduleReconnect();
 
-        while (!ConnectionTestUtil.getCommandBuffer(connection).isEmpty() || !ConnectionTestUtil.getQueue(connection).isEmpty()) {
+        while (!ConnectionTestUtil.getCommandBuffer(connection).isEmpty()
+                || !ConnectionTestUtil.getDisconnectedBuffer(connection).isEmpty()) {
             Thread.sleep(10);
         }
 
@@ -352,13 +352,14 @@ public void retryAfterConnectionIsDisconnected() throws Exception {
 
         assertThat(verificationConnection.get("key")).isEqualTo("1");
 
-        assertThat(ConnectionTestUtil.getQueue(connection)).isEmpty();
-        assertThat(ConnectionTestUtil.getCommandBuffer(connection).size()).isGreaterThan(0);
+        assertThat(ConnectionTestUtil.getDisconnectedBuffer(connection).size()).isGreaterThan(0);
+        assertThat(ConnectionTestUtil.getCommandBuffer(connection)).isEmpty();
 
         connectionWatchdog.setListenOnChannelInactive(true);
         connectionWatchdog.scheduleReconnect();
 
-        while (!ConnectionTestUtil.getCommandBuffer(connection).isEmpty() || !ConnectionTestUtil.getQueue(connection).isEmpty()) {
+        while (!ConnectionTestUtil.getCommandBuffer(connection).isEmpty()
+                || !ConnectionTestUtil.getDisconnectedBuffer(connection).isEmpty()) {
             Thread.sleep(10);
         }
 
diff --git a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
index b151783ba4..528d422562 100644
--- a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
@@ -17,7 +17,7 @@
 
 import static com.google.code.tempusfugit.temporal.Duration.millis;
 import static io.lettuce.ConnectionTestUtil.getCommandBuffer;
-import static io.lettuce.ConnectionTestUtil.getQueue;
+import static io.lettuce.ConnectionTestUtil.getStack;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
 
@@ -105,7 +105,7 @@ public void noBufferedCommandsAfterExecute() throws Exception {
 
         sync.set(key, "1");
 
-        assertThat(getQueue(connection)).isEmpty();
+        assertThat(getStack(connection)).isEmpty();
         assertThat(getCommandBuffer(connection)).isEmpty();
 
         connection.close();
@@ -159,12 +159,12 @@ public void encode(ByteBuf buf) {
         assertThat(command.await(2, TimeUnit.SECONDS)).isTrue();
         assertThat(command.isCancelled()).isFalse();
         assertThat(getException(command)).isInstanceOf(EncoderException.class);
-        assertThat(ConnectionTestUtil.getQueue(connection)).isNotEmpty();
-        ConnectionTestUtil.getQueue(connection).clear();
+        assertThat(ConnectionTestUtil.getStack(connection)).isNotEmpty();
+        ConnectionTestUtil.getStack(connection).clear();
 
         assertThat(sync.get(key)).isEqualTo("2");
 
-        assertThat(ConnectionTestUtil.getQueue(connection)).isEmpty();
+        assertThat(ConnectionTestUtil.getStack(connection)).isEmpty();
         assertThat(ConnectionTestUtil.getCommandBuffer(connection)).isEmpty();
 
         connection.close();
@@ -213,7 +213,7 @@ public void encode(ByteBuf buf) {
 
         assertThat(verificationConnection.get(key)).isEqualTo("1");
 
-        assertThat(getQueue(connection)).isEmpty();
+        assertThat(getStack(connection)).isEmpty();
         assertThat(getCommandBuffer(connection)).isEmpty();
 
         connection.close();
diff --git a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
index 20c56a3b60..8129b15c18 100644
--- a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
@@ -46,7 +46,7 @@ public class CommandHandlerBenchmark {
     @Setup
     public void setup() {
 
-        commandHandler = new CommandHandler(EmptyClientResources.INSTANCE, new DefaultEndpoint(CLIENT_OPTIONS));
+        commandHandler = new CommandHandler(CLIENT_OPTIONS, EmptyClientResources.INSTANCE, new DefaultEndpoint(CLIENT_OPTIONS));
         command = new Command(CommandType.GET, new ValueOutput<>(CODEC), new CommandArgs(CODEC).addKey(KEY));
 
         commandHandler.setState(CommandHandler.LifecycleState.CONNECTED);
@@ -58,6 +58,6 @@ public void measureNettyWrite() throws Exception {
         commandHandler.write(CHANNEL_HANDLER_CONTEXT, command, null);
 
         // Prevent OOME
-        commandHandler.getQueue().clear();
+        commandHandler.getStack().clear();
     }
 }
diff --git a/src/test/jmh/io/lettuce/core/protocol/JmhMain.java b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
index 2b8af8aa97..ecadd51588 100644
--- a/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
@@ -35,17 +35,16 @@ public class JmhMain {
     public static void main(String... args) throws IOException, RunnerException {
 
         // run selectively
-        runCommandBenchmark();
+        // runCommandBenchmark();
         runCommandHandlerBenchmark();
-        runRedisStateMachineBenchmark();
-        runCommandEncoderBenchmark();
+        // runRedisStateMachineBenchmark();
+        // runCommandEncoderBenchmark();
 
         // or all
         //runBenchmarks();
     }
 
     private static void runBenchmarks() throws RunnerException {
-
         new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).build()).run();
     }
 

From ef774f7c90f461818d99254ad7caaf6947c72f83 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 7 Jun 2017 09:02:58 +0200
Subject: [PATCH 236/808] Close connections in pooling destroy hook #545

Lettuce now closes connections if the underlying pool wants to destroy a pooled object. Object destroy happens if connections are no longer valid, the pool attempts to shrink or the pool is closed.

Previously, connections were not closed which caused connections to linger and eat up resources.
---
 .../core/support/ConnectionPoolSupport.java   |   5 +
 .../support/ConnectionPoolSupportTest.java    | 126 ++++++++++++------
 2 files changed, 90 insertions(+), 41 deletions(-)

diff --git a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
index f3593a8606..a2ad28ed07 100644
--- a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
+++ b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
@@ -225,6 +225,11 @@ public T create() throws Exception {
             return connectionSupplier.get();
         }
 
+        @Override
+        public void destroyObject(PooledObject<T> p) throws Exception {
+            p.getObject().close();
+        }
+
         @Override
         public PooledObject<T> wrap(T obj) {
             return new DefaultPooledObject<>(obj);
diff --git a/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java
index 51b69807b0..3827db6f1e 100644
--- a/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java
+++ b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java
@@ -16,15 +16,19 @@
 package io.lettuce.core.support;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.junit.Assert.fail;
 
 import java.lang.reflect.Proxy;
+import java.util.Set;
 
 import org.apache.commons.pool2.ObjectPool;
 import org.apache.commons.pool2.impl.GenericObjectPool;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.apache.commons.pool2.impl.SoftReferenceObjectPool;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.TestClientResources;
 import io.lettuce.core.*;
@@ -43,17 +47,34 @@
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.masterslave.MasterSlave;
 import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection;
+import io.netty.channel.group.ChannelGroup;
 
 /**
  * @author Mark Paluch
  */
-public class ConnectionPoolSupportTest extends AbstractRedisClientTest {
+public class ConnectionPoolSupportTest extends AbstractTest {
+
+    private static RedisClient client;
+    private static Set<?> channels;
+
+    @BeforeClass
+    public static void setupClient() {
+        client = RedisClient.create(TestClientResources.create(), RedisURI.Builder.redis(host, port).build());
+        client.setOptions(ClientOptions.create());
+        channels = (ChannelGroup) ReflectionTestUtils.getField(client, "channels");
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        FastShutdown.shutdown(client);
+        FastShutdown.shutdown(client.getResources());
+    }
 
     @Test
     public void genericPoolShouldWorkWithWrappedConnections() throws Exception {
 
-        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
-                .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig());
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
+                () -> client.connect(), new GenericObjectPoolConfig());
 
         borrowAndReturn(pool);
         borrowAndClose(pool);
@@ -62,30 +83,48 @@ public void genericPoolShouldWorkWithWrappedConnections() throws Exception {
         pool.returnObject(pool.borrowObject().sync().getStatefulConnection());
         pool.returnObject(pool.borrowObject().async().getStatefulConnection());
 
+        assertThat(channels).hasSize(1);
+
         pool.close();
+
+        assertThat(channels).isEmpty();
     }
 
     @Test
-    public void softReferencePoolShouldWorkWithWrappedConnections() throws Exception {
+    public void genericPoolShouldCloseConnectionsAboveMaxIdleSize() throws Exception {
 
-        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
-                .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig());
+        GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
+        poolConfig.setMaxIdle(2);
+
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
+                () -> client.connect(), poolConfig);
 
         borrowAndReturn(pool);
         borrowAndClose(pool);
         borrowAndCloseTryWithResources(pool);
 
-        pool.returnObject(pool.borrowObject().sync().getStatefulConnection());
-        pool.returnObject(pool.borrowObject().async().getStatefulConnection());
+        StatefulRedisConnection<String, String> c1 = pool.borrowObject();
+        StatefulRedisConnection<String, String> c2 = pool.borrowObject();
+        StatefulRedisConnection<String, String> c3 = pool.borrowObject();
+
+        assertThat(channels).hasSize(3);
+
+        pool.returnObject(c1);
+        pool.returnObject(c2);
+        pool.returnObject(c3);
+
+        assertThat(channels).hasSize(2);
 
         pool.close();
+
+        assertThat(channels).isEmpty();
     }
 
     @Test
     public void genericPoolShouldWorkWithPlainConnections() throws Exception {
 
-        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
-                .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig(), false);
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
+                () -> client.connect(), new GenericObjectPoolConfig(), false);
 
         borrowAndReturn(pool);
 
@@ -115,8 +154,8 @@ public void softReferencePoolShouldWorkWithPlainConnections() throws Exception {
     @Test
     public void genericPoolUsingWrappingShouldPropagateExceptionsCorrectly() throws Exception {
 
-        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
-                .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig());
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
+                () -> client.connect(), new GenericObjectPoolConfig());
 
         StatefulRedisConnection<String, String> connection = pool.borrowObject();
         RedisCommands<String, String> sync = connection.sync();
@@ -136,20 +175,20 @@ public void genericPoolUsingWrappingShouldPropagateExceptionsCorrectly() throws
     @Test
     public void wrappedConnectionShouldUseWrappers() throws Exception {
 
-        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
-                .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig());
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
+                () -> client.connect(), new GenericObjectPoolConfig());
 
         StatefulRedisConnection<String, String> connection = pool.borrowObject();
         RedisCommands<String, String> sync = connection.sync();
 
-        assertThat(connection).isInstanceOf(StatefulRedisConnection.class)
-                .isNotInstanceOf(StatefulRedisClusterConnectionImpl.class);
+        assertThat(connection).isInstanceOf(StatefulRedisConnection.class).isNotInstanceOf(
+                StatefulRedisClusterConnectionImpl.class);
         assertThat(Proxy.isProxyClass(connection.getClass())).isTrue();
 
         assertThat(sync).isInstanceOf(RedisCommands.class);
         assertThat(connection.async()).isInstanceOf(RedisAsyncCommands.class).isNotInstanceOf(RedisAsyncCommandsImpl.class);
-        assertThat(connection.reactive()).isInstanceOf(RedisReactiveCommands.class)
-                .isNotInstanceOf(RedisReactiveCommandsImpl.class);
+        assertThat(connection.reactive()).isInstanceOf(RedisReactiveCommands.class).isNotInstanceOf(
+                RedisReactiveCommandsImpl.class);
         assertThat(sync.getStatefulConnection()).isInstanceOf(StatefulRedisConnection.class)
                 .isNotInstanceOf(StatefulRedisConnectionImpl.class).isSameAs(connection);
 
@@ -172,8 +211,8 @@ public void wrappedMasterSlaveConnectionShouldUseWrappers() throws Exception {
 
         assertThat(sync).isInstanceOf(RedisCommands.class);
         assertThat(connection.async()).isInstanceOf(RedisAsyncCommands.class).isNotInstanceOf(RedisAsyncCommandsImpl.class);
-        assertThat(connection.reactive()).isInstanceOf(RedisReactiveCommands.class)
-                .isNotInstanceOf(RedisReactiveCommandsImpl.class);
+        assertThat(connection.reactive()).isInstanceOf(RedisReactiveCommands.class).isNotInstanceOf(
+                RedisReactiveCommandsImpl.class);
         assertThat(sync.getStatefulConnection()).isInstanceOf(StatefulRedisConnection.class)
                 .isNotInstanceOf(StatefulRedisConnectionImpl.class).isSameAs(connection);
 
@@ -187,21 +226,21 @@ public void wrappedClusterConnectionShouldUseWrappers() throws Exception {
         RedisClusterClient redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.create(TestSettings.host(), 7379));
 
-        GenericObjectPool<StatefulRedisClusterConnection<String, String>> pool = ConnectionPoolSupport
-                .createGenericObjectPool(redisClusterClient::connect, new GenericObjectPoolConfig());
+        GenericObjectPool<StatefulRedisClusterConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
+                redisClusterClient::connect, new GenericObjectPoolConfig());
 
         StatefulRedisClusterConnection<String, String> connection = pool.borrowObject();
         RedisAdvancedClusterCommands<String, String> sync = connection.sync();
 
-        assertThat(connection).isInstanceOf(StatefulRedisClusterConnection.class)
-                .isNotInstanceOf(StatefulRedisClusterConnectionImpl.class);
+        assertThat(connection).isInstanceOf(StatefulRedisClusterConnection.class).isNotInstanceOf(
+                StatefulRedisClusterConnectionImpl.class);
         assertThat(Proxy.isProxyClass(connection.getClass())).isTrue();
 
         assertThat(sync).isInstanceOf(RedisAdvancedClusterCommands.class);
-        assertThat(connection.async()).isInstanceOf(RedisAdvancedClusterAsyncCommands.class)
-                .isNotInstanceOf(RedisAdvancedClusterAsyncCommandsImpl.class);
-        assertThat(connection.reactive()).isInstanceOf(RedisAdvancedClusterReactiveCommands.class)
-                .isNotInstanceOf(RedisAdvancedClusterReactiveCommandsImpl.class);
+        assertThat(connection.async()).isInstanceOf(RedisAdvancedClusterAsyncCommands.class).isNotInstanceOf(
+                RedisAdvancedClusterAsyncCommandsImpl.class);
+        assertThat(connection.reactive()).isInstanceOf(RedisAdvancedClusterReactiveCommands.class).isNotInstanceOf(
+                RedisAdvancedClusterReactiveCommandsImpl.class);
         assertThat(sync.getStatefulConnection()).isInstanceOf(StatefulRedisClusterConnection.class)
                 .isNotInstanceOf(StatefulRedisClusterConnectionImpl.class).isSameAs(connection);
 
@@ -214,22 +253,22 @@ public void wrappedClusterConnectionShouldUseWrappers() throws Exception {
     @Test
     public void plainConnectionShouldNotUseWrappers() throws Exception {
 
-        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
-                .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig(), false);
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
+                () -> client.connect(), new GenericObjectPoolConfig(), false);
 
         StatefulRedisConnection<String, String> connection = pool.borrowObject();
         RedisCommands<String, String> sync = connection.sync();
 
-        assertThat(connection).isInstanceOf(StatefulRedisConnection.class)
-                .isNotInstanceOf(StatefulRedisClusterConnectionImpl.class);
+        assertThat(connection).isInstanceOf(StatefulRedisConnection.class).isNotInstanceOf(
+                StatefulRedisClusterConnectionImpl.class);
         assertThat(Proxy.isProxyClass(connection.getClass())).isFalse();
 
         assertThat(sync).isInstanceOf(RedisCommands.class);
         assertThat(connection.async()).isInstanceOf(RedisAsyncCommands.class).isInstanceOf(RedisAsyncCommandsImpl.class);
-        assertThat(connection.reactive()).isInstanceOf(RedisReactiveCommands.class)
-                .isInstanceOf(RedisReactiveCommandsImpl.class);
-        assertThat(sync.getStatefulConnection()).isInstanceOf(StatefulRedisConnection.class)
-                .isInstanceOf(StatefulRedisConnectionImpl.class);
+        assertThat(connection.reactive()).isInstanceOf(RedisReactiveCommands.class).isInstanceOf(
+                RedisReactiveCommandsImpl.class);
+        assertThat(sync.getStatefulConnection()).isInstanceOf(StatefulRedisConnection.class).isInstanceOf(
+                StatefulRedisConnectionImpl.class);
 
         pool.returnObject(connection);
         pool.close();
@@ -242,18 +281,23 @@ public void softRefPoolShouldWorkWithWrappedConnections() throws Exception {
                 .createSoftReferenceObjectPool(() -> client.connect());
 
         StatefulRedisConnection<String, String> connection = pool.borrowObject();
+
+        assertThat(channels).hasSize(1);
+
         RedisCommands<String, String> sync = connection.sync();
         sync.ping();
 
         connection.close();
         pool.close();
+
+        assertThat(channels).isEmpty();
     }
 
     @Test
     public void wrappedObjectClosedAfterReturn() throws Exception {
 
-        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
-                .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig(), true);
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
+                () -> client.connect(), new GenericObjectPoolConfig(), true);
 
         StatefulRedisConnection<String, String> connection = pool.borrowObject();
         RedisCommands<String, String> sync = connection.sync();
@@ -274,8 +318,8 @@ public void wrappedObjectClosedAfterReturn() throws Exception {
     @Test
     public void tryWithResourcesReturnsConnectionToPool() throws Exception {
 
-        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
-                .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig());
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
+                () -> client.connect(), new GenericObjectPoolConfig());
 
         StatefulRedisConnection<String, String> usedConnection = null;
         try (StatefulRedisConnection<String, String> connection = pool.borrowObject()) {

From 9985c2e4a3ae9577fa4746656660b330f6b5b3ac Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 7 Jun 2017 15:17:10 +0200
Subject: [PATCH 237/808] Include JMH benchmark starter for EndpointBenchmark

---
 src/test/jmh/io/lettuce/core/protocol/JmhMain.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/test/jmh/io/lettuce/core/protocol/JmhMain.java b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
index ecadd51588..e5cc192d96 100644
--- a/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
@@ -37,6 +37,7 @@ public static void main(String... args) throws IOException, RunnerException {
         // run selectively
         // runCommandBenchmark();
         runCommandHandlerBenchmark();
+        runRedisEndpointBenchmark();
         // runRedisStateMachineBenchmark();
         // runCommandEncoderBenchmark();
 
@@ -65,6 +66,14 @@ private static void runCommandHandlerBenchmark() throws RunnerException {
         // Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS).include(".*CommandHandlerBenchmark.*").build()).run();
     }
 
+    private static void runRedisEndpointBenchmark() throws RunnerException {
+
+        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).include(".*RedisEndpointBenchmark.*")
+                .build()).run();
+        // new
+        // Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS).include(".*CommandHandlerBenchmark.*").build()).run();
+    }
+
     private static void runCommandEncoderBenchmark() throws RunnerException {
 
         new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS)

From b7772b64dc04a6d2f5dc199634f99ef29ff603d8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 9 Jun 2017 15:16:33 +0200
Subject: [PATCH 238/808] Upgrade to netty 4.1.12.Final #548

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c72d90b708..6acfb9ead8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
-        <netty-version>4.1.11.Final</netty-version>
+        <netty-version>4.1.12.Final</netty-version>
         <spring-version>5.0.0.RC1</spring-version>
     </properties>
 
@@ -357,7 +357,7 @@
             <id>netty-40</id>
 
             <properties>
-                <netty-version>4.0.47.Final</netty-version>
+                <netty-version>4.0.48.Final</netty-version>
             </properties>
         </profile>
 

From 50d1541e53f287716331c32ee118a23d42948efd Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 13 Jun 2017 14:36:15 +0200
Subject: [PATCH 239/808] Improve test server resource handling

---
 .../core/server/RandomResponseServer.java     | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/test/java/io/lettuce/core/server/RandomResponseServer.java b/src/test/java/io/lettuce/core/server/RandomResponseServer.java
index 07bc99d186..f38161e8fb 100644
--- a/src/test/java/io/lettuce/core/server/RandomResponseServer.java
+++ b/src/test/java/io/lettuce/core/server/RandomResponseServer.java
@@ -36,8 +36,8 @@ public class RandomResponseServer {
 
     public void initialize(int port) throws InterruptedException {
 
-        bossGroup = new NioEventLoopGroup(1);
-        workerGroup = new NioEventLoopGroup();
+        bossGroup = Resources.bossGroup;
+        workerGroup = Resources.workerGroup;
 
         ServerBootstrap b = new ServerBootstrap();
         b.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class).option(ChannelOption.SO_BACKLOG, 100)
@@ -58,7 +58,23 @@ public void initChannel(SocketChannel ch) throws Exception {
 
     public void shutdown() {
         channel.close();
-        bossGroup.shutdownGracefully(100, 100, TimeUnit.MILLISECONDS);
-        workerGroup.shutdownGracefully(100, 100, TimeUnit.MILLISECONDS);
+    }
+
+    private static class Resources {
+
+        private static final EventLoopGroup bossGroup;
+        private static final EventLoopGroup workerGroup;
+
+        static {
+            bossGroup = new NioEventLoopGroup(1);
+            workerGroup = new NioEventLoopGroup();
+
+            Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+                bossGroup.shutdownGracefully(0, 0, TimeUnit.MILLISECONDS);
+                workerGroup.shutdownGracefully(0, 0, TimeUnit.MILLISECONDS);
+
+            }, "RandomResponseServer-shutdown"));
+        }
+
     }
 }

From e242e51bf8434f94f15c154ca00681875bc9fccf Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 13 Jun 2017 14:38:00 +0200
Subject: [PATCH 240/808] Improve test synchronization

Catch timeout exceptions if the command is queued at a time when the connection is disconnected but the cause is not propagated yet.
---
 .../java/io/lettuce/core/protocol/ConnectionFailureTest.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
index 56e9b70623..ebcc998a50 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
@@ -100,10 +100,12 @@ public void pingBeforeConnectFailOnReconnect() throws Exception {
             assertThat(connectionWatchdog.isListenOnChannelInactive()).isTrue();
 
             try {
-                connection.info().get(1, TimeUnit.MINUTES);
+                connection.info().get(5, TimeUnit.SECONDS);
             } catch (ExecutionException e) {
                 assertThat(e).hasRootCauseExactlyInstanceOf(RedisException.class);
                 assertThat(e.getCause()).hasMessageStartingWith("Invalid first byte");
+            } catch (TimeoutException e) {
+                // happens once in a while...
             }
             connection.getStatefulConnection().close();
         } finally {

From ef82be27e118126659010aedd5e8ba09e93713b3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 13 Jun 2017 14:49:15 +0200
Subject: [PATCH 241/808] Upgrade to Reactor 3.1 M2 #549

---
 pom.xml                                       |  6 ++---
 .../TransactionReactiveCommandTest.java       | 25 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6acfb9ead8..690cbfa751 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>3.1.0.M1</version>
+            <version>3.1.0.M2</version>
         </dependency>
 
         <!-- Netty -->
@@ -237,9 +237,9 @@
         </dependency>
 
         <dependency>
-            <groupId>io.projectreactor.addons</groupId>
+            <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
-            <version>3.1.0.M1</version>
+            <version>3.1.0.M2</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
index 76393876fe..82366cea33 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
@@ -22,7 +22,6 @@
 import org.junit.Test;
 
 import reactor.test.StepVerifier;
-
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.RedisException;
@@ -64,7 +63,7 @@ public void discard() throws Exception {
 
         StepVerifier.create(commands.multi()).expectNext("OK").verifyComplete();
 
-        commands.set(key, value).subscribe();
+        commands.set(key, value).toProcessor();
 
         StepVerifier.create(commands.discard()).expectNext("OK").verifyComplete();
         StepVerifier.create(commands.get(key)).verifyComplete();
@@ -80,7 +79,7 @@ public void watchRollback() throws Exception {
         StepVerifier.create(commands.watch(key)).expectNext("OK").verifyComplete();
         StepVerifier.create(commands.multi()).expectNext("OK").verifyComplete();
 
-        commands.set(key, value).subscribe();
+        commands.set(key, value).toProcessor();
 
         otherConnection.sync().del(key);
 
@@ -104,10 +103,10 @@ public void execSingular() throws Exception {
     @Test
     public void errorInMulti() throws Exception {
 
-        commands.multi().subscribe();
-        commands.set(key, value).subscribe();
-        commands.lpop(key).subscribe();
-        commands.get(key).subscribe();
+        commands.multi().toProcessor();
+        commands.set(key, value).toProcessor();
+        commands.lpop(key).toProcessor();
+        commands.get(key).toProcessor();
 
         StepVerifier.create(commands.exec()).consumeNextWith(actual -> {
 
@@ -120,7 +119,7 @@ public void errorInMulti() throws Exception {
     @Test
     public void resultOfMultiIsContainedInCommandFlux() throws Exception {
 
-        commands.multi().subscribe();
+        commands.multi().toProcessor();
 
         StepVerifier.Step<String> set1 = StepVerifier.create(commands.set("key1", "value1")).expectNext("OK").thenAwait();
         StepVerifier.Step<String> set2 = StepVerifier.create(commands.set("key2", "value2")).expectNext("OK").thenAwait();
@@ -141,11 +140,11 @@ public void resultOfMultiIsContainedInCommandFlux() throws Exception {
     @Test
     public void resultOfMultiIsContainedInExecObservable() throws Exception {
 
-        commands.multi().subscribe();
-        commands.set("key1", "value1").subscribe();
-        commands.set("key2", "value2").subscribe();
-        commands.mget("key1", "key2").subscribe();
-        commands.llen("something").subscribe();
+        commands.multi().toProcessor();
+        commands.set("key1", "value1").toProcessor();
+        commands.set("key2", "value2").toProcessor();
+        commands.mget("key1", "key2").collectList().toProcessor();
+        commands.llen("something").toProcessor();
 
         StepVerifier.create(commands.exec()).consumeNextWith(actual -> {
 

From 4157f474c727a3093474f3f660bb6954d98b6b81 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 19 Jun 2017 08:19:28 +0200
Subject: [PATCH 242/808] Adopt to changed SLOWLOG output #551

---
 src/test/java/io/lettuce/core/commands/ServerCommandTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
index 69a97f906d..4bc016e54d 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
@@ -327,14 +327,14 @@ public void slowlog() throws Exception {
         assertThat(log).hasSize(2);
 
         List<Object> entry = (List<Object>) log.get(0);
-        assertThat(entry).hasSize(4);
+        assertThat(entry.size()).isGreaterThanOrEqualTo(4);
         assertThat(entry.get(0) instanceof Long).isTrue();
         assertThat((Long) entry.get(1) >= start).isTrue();
         assertThat(entry.get(2) instanceof Long).isTrue();
         assertThat(entry.get(3)).isEqualTo(list("SET", key, value));
 
         entry = (List<Object>) log.get(1);
-        assertThat(entry).hasSize(4);
+        assertThat(entry.size()).isGreaterThanOrEqualTo(4);
         assertThat(entry.get(0) instanceof Long).isTrue();
         assertThat((Long) entry.get(1) >= start).isTrue();
         assertThat(entry.get(2) instanceof Long).isTrue();

From a81a8ab97ba6b880e4257878a83eb377e49dd6ca Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 19 Jun 2017 09:58:54 +0200
Subject: [PATCH 243/808] Allow Redis version pinning for build #552

---
 .travis.yml                                   |   8 +-
 Makefile                                      |  10 +-
 src/test/java/io/lettuce/RedisConditions.java | 309 ++++++++++++++++++
 .../core/ReactiveStreamingOutputTest.java     |  25 +-
 .../cluster/AdvancedClusterClientTest.java    |  20 +-
 .../cluster/AdvancedClusterReactiveTest.java  |   4 +
 .../RedisClusterPasswordSecuredSslTest.java   |   3 +
 .../commands/GeoClusterCommandTest.java       |   8 +-
 .../commands/KeyClusterCommandTest.java       |   6 +
 .../lettuce/core/commands/BitCommandTest.java |  16 +
 .../lettuce/core/commands/GeoCommandTest.java |  45 ++-
 .../core/commands/HashCommandTest.java        |   6 +-
 .../lettuce/core/commands/KeyCommandTest.java |  14 +-
 .../core/commands/ListCommandTest.java        |  13 +-
 .../core/commands/ServerCommandTest.java      |  74 +++--
 .../lettuce/core/commands/SetCommandTest.java |   5 +
 .../core/commands/StringCommandTest.java      |  30 +-
 .../reactive/ServerReactiveCommandTest.java   |   8 +-
 18 files changed, 505 insertions(+), 99 deletions(-)
 create mode 100644 src/test/java/io/lettuce/RedisConditions.java

diff --git a/.travis.yml b/.travis.yml
index 478399a919..4ad07e6e60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,11 @@ jdk:
 
 env:
   matrix:
-    - PROFILE=netty-40
-    - PROFILE=netty-41
+    - PROFILE=netty-40 REDIS=unstable
+    - PROFILE=netty-41 REDIS=unstable
     - PROFILE=jmh
+    - REDIS=4.0-rc3
+    - REDIS=3.2.9
 
 sudo: false
 
@@ -21,7 +23,7 @@ before_install:
 
 install: make prepare ssl-keys
 
-script: make test-coverage PROFILE=${PROFILE}
+script: make test-coverage PROFILE=${PROFILE:-netty-41}
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/Makefile b/Makefile
index 9e10e2358e..7003e2cd4f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ BREW_BIN := $(shell which brew)
 YUM_BIN := $(shell which yum)
 APT_BIN := $(shell which apt-get)
 PROFILE ?= netty-41
+REDIS ?= 4.0-rc3
 
 define REDIS_CLUSTER_CONFIG1
 c2043458aa5646cee429fdd5e3c18220dddf2ce5 127.0.0.1:7380 master - 1434887920102 1434887920002 0 connected 12000-16383
@@ -217,7 +218,7 @@ work/cluster-node-%.conf:
 	@echo cluster-config-file $(shell pwd)/work/cluster-node-config-$*.conf >> $@
 
 work/cluster-node-%.pid: work/cluster-node-%.conf work/redis-git/src/redis-server
-	work/redis-git/src/redis-server $<
+	work/redis-git/src/redis-server $< || true
 
 cluster-start: work/cluster-node-7379.pid work/cluster-node-7380.pid work/cluster-node-7381.pid work/cluster-node-7382.pid work/cluster-node-7383.pid work/cluster-node-7384.pid work/cluster-node-7385.pid work/cluster-node-7479.pid work/cluster-node-7480.pid work/cluster-node-7481.pid work/cluster-node-7582.pid
 
@@ -364,8 +365,11 @@ endif
 endif
 
 work/redis-git/src/redis-cli work/redis-git/src/redis-server:
-	[ ! -e work/redis-git ] && git clone https://github.com/antirez/redis.git --branch unstable --single-branch work/redis-git && cd work/redis-git|| true
-	[ -e work/redis-git ] && cd work/redis-git && git fetch && git merge origin/unstable || true
+	[ ! -e work/redis-git ] && git clone https://github.com/antirez/redis.git work/redis-git && cd work/redis-git && git co $(REDIS) || true
+	$(eval REDIS_BRANCH = -v $(shell git -C work/redis-git branch --no-color | sed 's/\* //g'))
+	cd work/redis-git && git reset --hard || true
+	[ "$(REDIS)" != "$(REDIS_BRANCH)" ] && cd work/redis-git && git checkout $(REDIS) || true
+	[ "$(REDIS)" == "unstable" ] && cd work/redis-git && git fetch && git merge origin/unstable || true
 	$(MAKE) -C work/redis-git clean
 	$(MAKE) -C work/redis-git -j4
 
diff --git a/src/test/java/io/lettuce/RedisConditions.java b/src/test/java/io/lettuce/RedisConditions.java
new file mode 100644
index 0000000000..090f9afdb2
--- /dev/null
+++ b/src/test/java/io/lettuce/RedisConditions.java
@@ -0,0 +1,309 @@
+package io.lettuce;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.stream.Collectors;
+
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.core.models.command.CommandDetail;
+import io.lettuce.core.models.command.CommandDetailParser;
+
+/**
+ * Collection of utility methods to test conditions during test execution.
+ *
+ * @author Mark Paluch
+ */
+public class RedisConditions {
+
+    private final Map<String, Integer> commands;
+    private final Version version;
+
+    private RedisConditions(RedisClusterCommands<String, String> commands) {
+
+        List<CommandDetail> result = CommandDetailParser.parse(commands.command());
+
+        this.commands = result.stream().collect(
+                Collectors.toMap(commandDetail -> commandDetail.getName().toUpperCase(), CommandDetail::getArity));
+
+        String info = commands.info("server");
+
+        try {
+            ByteArrayInputStream inputStream = new ByteArrayInputStream(info.getBytes());
+            Properties p = new Properties();
+            p.load(inputStream);
+
+            version = Version.parse(p.getProperty("redis_version"));
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    /**
+     * Create {@link RedisCommands} given {@link StatefulRedisConnection}.
+     *
+     * @param connection must not be {@literal null}.
+     * @return
+     */
+    public static RedisConditions of(StatefulRedisConnection<String, String> connection) {
+        return new RedisConditions(connection.sync());
+    }
+
+    /**
+     * Create {@link RedisCommands} given {@link StatefulRedisClusterConnection}.
+     *
+     * @param connection must not be {@literal null}.
+     * @return
+     */
+    public static RedisConditions of(StatefulRedisClusterConnection<String, String> connection) {
+        return new RedisConditions(connection.sync());
+    }
+
+    /**
+     * Create {@link RedisConditions} given {@link RedisCommands}.
+     *
+     * @param commands must not be {@literal null}.
+     * @return
+     */
+    public static RedisConditions of(RedisCommands<String, String> commands) {
+        return new RedisConditions(commands);
+    }
+
+    /**
+     * @param command
+     * @return {@literal true} if the command is present.
+     */
+    public boolean hasCommand(String command) {
+        return commands.containsKey(command.toUpperCase());
+    }
+
+    /**
+     * @param command command name.
+     * @param arity expected arity.
+     * @return {@literal true} if the command is present with the given arity.
+     */
+    public boolean hasCommandArity(String command, int arity) {
+        return commands.get(command.toUpperCase()) == arity;
+    }
+
+    /**
+     * @param versionNumber
+     * @return {@literal true} if the version number is met.
+     */
+    public boolean hasVersionGreaterOrEqualsTo(String versionNumber) {
+        return version.isGreaterThanOrEqualTo(Version.parse(versionNumber));
+    }
+
+    /**
+     * Value object to represent a Version consisting of major, minor and bugfix part.
+     */
+    public static class Version implements Comparable<Version> {
+
+        private static final String VERSION_PARSE_ERROR = "Invalid version string! Could not parse segment %s within %s.";
+
+        private final int major;
+        private final int minor;
+        private final int bugfix;
+        private final int build;
+
+        /**
+         * Creates a new {@link Version} from the given integer values. At least one value has to be given but a maximum of 4.
+         *
+         * @param parts must not be {@literal null} or empty.
+         */
+        public Version(int... parts) {
+
+            Assert.notNull(parts, "Parts must not be null!");
+            Assert.isTrue(parts.length > 0 && parts.length < 5, String.format("Invalid parts length. 0 < %s < 5", parts.length));
+
+            this.major = parts[0];
+            this.minor = parts.length > 1 ? parts[1] : 0;
+            this.bugfix = parts.length > 2 ? parts[2] : 0;
+            this.build = parts.length > 3 ? parts[3] : 0;
+
+            Assert.isTrue(major >= 0, "Major version must be greater or equal zero!");
+            Assert.isTrue(minor >= 0, "Minor version must be greater or equal zero!");
+            Assert.isTrue(bugfix >= 0, "Bugfix version must be greater or equal zero!");
+            Assert.isTrue(build >= 0, "Build version must be greater or equal zero!");
+        }
+
+        /**
+         * Parses the given string representation of a version into a {@link Version} object.
+         *
+         * @param version must not be {@literal null} or empty.
+         * @return
+         */
+        public static Version parse(String version) {
+
+            Assert.hasText(version, "Version must not be null o empty!");
+
+            String[] parts = version.trim().split("\\.");
+            int[] intParts = new int[parts.length];
+
+            for (int i = 0; i < parts.length; i++) {
+
+                String input = i == parts.length - 1 ? parts[i].replaceAll("\\D.*", "") : parts[i];
+
+                if (StringUtils.hasText(input)) {
+                    try {
+                        intParts[i] = Integer.parseInt(input);
+                    } catch (IllegalArgumentException o_O) {
+                        throw new IllegalArgumentException(String.format(VERSION_PARSE_ERROR, input, version), o_O);
+                    }
+                }
+            }
+
+            return new Version(intParts);
+        }
+
+        /**
+         * Returns whether the current {@link Version} is greater (newer) than the given one.
+         *
+         * @param version
+         * @return
+         */
+        public boolean isGreaterThan(Version version) {
+            return compareTo(version) > 0;
+        }
+
+        /**
+         * Returns whether the current {@link Version} is greater (newer) or the same as the given one.
+         *
+         * @param version
+         * @return
+         */
+        public boolean isGreaterThanOrEqualTo(Version version) {
+            return compareTo(version) >= 0;
+        }
+
+        /**
+         * Returns whether the current {@link Version} is the same as the given one.
+         *
+         * @param version
+         * @return
+         */
+        public boolean is(Version version) {
+            return equals(version);
+        }
+
+        /**
+         * Returns whether the current {@link Version} is less (older) than the given one.
+         *
+         * @param version
+         * @return
+         */
+        public boolean isLessThan(Version version) {
+            return compareTo(version) < 0;
+        }
+
+        /**
+         * Returns whether the current {@link Version} is less (older) or equal to the current one.
+         *
+         * @param version
+         * @return
+         */
+        public boolean isLessThanOrEqualTo(Version version) {
+            return compareTo(version) <= 0;
+        }
+
+        /*
+         * (non-Javadoc)
+         *
+         * @see java.lang.Comparable#compareTo(java.lang.Object)
+         */
+        public int compareTo(Version that) {
+
+            if (that == null) {
+                return 1;
+            }
+
+            if (major != that.major) {
+                return major - that.major;
+            }
+
+            if (minor != that.minor) {
+                return minor - that.minor;
+            }
+
+            if (bugfix != that.bugfix) {
+                return bugfix - that.bugfix;
+            }
+
+            if (build != that.build) {
+                return build - that.build;
+            }
+
+            return 0;
+        }
+
+        /*
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#equals(java.lang.Object)
+         */
+        @Override
+        public boolean equals(Object obj) {
+
+            if (this == obj) {
+                return true;
+            }
+
+            if (!(obj instanceof Version)) {
+                return false;
+            }
+
+            Version that = (Version) obj;
+
+            return this.major == that.major && this.minor == that.minor && this.bugfix == that.bugfix
+                    && this.build == that.build;
+        }
+
+        /*
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#hashCode()
+         */
+        @Override
+        public int hashCode() {
+
+            int result = 17;
+            result += 31 * major;
+            result += 31 * minor;
+            result += 31 * bugfix;
+            result += 31 * build;
+            return result;
+        }
+
+        /*
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#toString()
+         */
+        @Override
+        public String toString() {
+
+            List<Integer> digits = new ArrayList<>();
+            digits.add(major);
+            digits.add(minor);
+
+            if (build != 0 || bugfix != 0) {
+                digits.add(bugfix);
+            }
+
+            if (build != 0) {
+                digits.add(build);
+            }
+
+            return StringUtils.collectionToDelimitedString(digits, ".");
+        }
+    }
+}
diff --git a/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java b/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java
index b6f9009de6..5c702d1ccf 100644
--- a/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java
@@ -16,6 +16,7 @@
 package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assume.assumeTrue;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,8 +28,8 @@
 import org.junit.rules.ExpectedException;
 
 import reactor.test.StepVerifier;
-
 import io.lettuce.KeysAndValues;
+import io.lettuce.RedisConditions;
 import io.lettuce.core.GeoArgs.Unit;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.reactive.RedisReactiveCommands;
@@ -45,18 +46,18 @@ public class ReactiveStreamingOutputTest extends AbstractRedisClientTest {
     private StatefulRedisConnection<String, String> stateful;
 
     @Before
-    public void openReactiveConnection() throws Exception {
+    public void openReactiveConnection() {
         stateful = client.connect();
         reactive = stateful.reactive();
     }
 
     @After
-    public void closeReactiveConnection() throws Exception {
+    public void closeReactiveConnection() {
         reactive.getStatefulConnection().close();
     }
 
     @Test
-    public void keyListCommandShouldReturnAllElements() throws Exception {
+    public void keyListCommandShouldReturnAllElements() {
 
         redis.mset(KeysAndValues.MAP);
 
@@ -65,7 +66,7 @@ public void keyListCommandShouldReturnAllElements() throws Exception {
     }
 
     @Test
-    public void valueListCommandShouldReturnAllElements() throws Exception {
+    public void valueListCommandShouldReturnAllElements() {
 
         redis.mset(KeysAndValues.MAP);
 
@@ -74,17 +75,17 @@ public void valueListCommandShouldReturnAllElements() throws Exception {
     }
 
     @Test
-    public void stringListCommandShouldReturnAllElements() throws Exception {
+    public void stringListCommandShouldReturnAllElements() {
         StepVerifier.create(reactive.configGet("*")).expectNextCount(120).thenCancel().verify();
     }
 
     @Test
-    public void booleanListCommandShouldReturnAllElements() throws Exception {
+    public void booleanListCommandShouldReturnAllElements() {
         StepVerifier.create(reactive.scriptExists("a", "b", "c")).expectNextCount(3).verifyComplete();
     }
 
     @Test
-    public void scoredValueListCommandShouldReturnAllElements() throws Exception {
+    public void scoredValueListCommandShouldReturnAllElements() {
 
         redis.zadd(key, 1d, "v1", 2d, "v2", 3d, "v3");
 
@@ -94,7 +95,9 @@ public void scoredValueListCommandShouldReturnAllElements() throws Exception {
     }
 
     @Test
-    public void geoWithinListCommandShouldReturnAllElements() throws Exception {
+    public void geoWithinListCommandShouldReturnAllElements() {
+
+        assumeTrue(RedisConditions.of(redis).hasCommand("GEORADIUS"));
 
         redis.geoadd(key, 50, 20, "value1");
         redis.geoadd(key, 50, 21, "value2");
@@ -112,7 +115,9 @@ public void geoWithinListCommandShouldReturnAllElements() throws Exception {
     }
 
     @Test
-    public void geoCoordinatesListCommandShouldReturnAllElements() throws Exception {
+    public void geoCoordinatesListCommandShouldReturnAllElements() {
+
+        assumeTrue(RedisConditions.of(redis).hasCommand("GEOPOS"));
 
         redis.geoadd(key, 50, 20, "value1");
         redis.geoadd(key, 50, 21, "value2");
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
index 6c10fadc5b..b544943465 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assume.assumeTrue;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -27,6 +28,7 @@
 import org.junit.Test;
 
 import io.lettuce.KeysAndValues;
+import io.lettuce.RedisConditions;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
@@ -101,8 +103,8 @@ public void differentConnections() throws Exception {
 
         for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
             RedisClusterAsyncCommands<String, String> nodeId = commands.getConnection(redisClusterNode.getNodeId());
-            RedisClusterAsyncCommands<String, String> hostAndPort = commands
-                    .getConnection(redisClusterNode.getUri().getHost(), redisClusterNode.getUri().getPort());
+            RedisClusterAsyncCommands<String, String> hostAndPort = commands.getConnection(redisClusterNode.getUri().getHost(),
+                    redisClusterNode.getUri().getPort());
 
             assertThat(nodeId).isNotSameAs(hostAndPort);
         }
@@ -111,8 +113,8 @@ public void differentConnections() throws Exception {
         for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
 
             StatefulRedisConnection<String, String> nodeId = statefulConnection.getConnection(redisClusterNode.getNodeId());
-            StatefulRedisConnection<String, String> hostAndPort = statefulConnection
-                    .getConnection(redisClusterNode.getUri().getHost(), redisClusterNode.getUri().getPort());
+            StatefulRedisConnection<String, String> hostAndPort = statefulConnection.getConnection(redisClusterNode.getUri()
+                    .getHost(), redisClusterNode.getUri().getPort());
 
             assertThat(nodeId).isNotSameAs(hostAndPort);
         }
@@ -211,6 +213,8 @@ public void mgetCrossSlot() throws Exception {
     @Test
     public void delRegular() throws Exception {
 
+        assumeTrue(RedisConditions.of(syncCommands.getStatefulConnection()).hasCommand("UNLINK"));
+
         msetRegular();
         Long result = syncCommands.unlink(key);
 
@@ -236,6 +240,8 @@ public void delCrossSlot() throws Exception {
     @Test
     public void unlinkRegular() throws Exception {
 
+        assumeTrue(RedisConditions.of(syncCommands.getStatefulConnection()).hasCommand("UNLINK"));
+
         msetRegular();
         Long result = syncCommands.unlink(key);
 
@@ -246,6 +252,8 @@ public void unlinkRegular() throws Exception {
     @Test
     public void unlinkCrossSlot() throws Exception {
 
+        assumeTrue(RedisConditions.of(syncCommands.getStatefulConnection()).hasCommand("UNLINK"));
+
         List<String> keys = prepareKeys();
 
         Long result = syncCommands.unlink(keys.toArray(new String[keys.size()]));
@@ -567,8 +575,8 @@ public void clusterScanStreamingWithArgs() throws Exception {
             }
         } while (!scanCursor.isFinished());
 
-        assertThat(adapter.getList())
-                .containsAll(KeysAndValues.KEYS.stream().filter(k -> k.startsWith("a")).collect(Collectors.toList()));
+        assertThat(adapter.getList()).containsAll(
+                KeysAndValues.KEYS.stream().filter(k -> k.startsWith("a")).collect(Collectors.toList()));
 
     }
 
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
index 3322131443..b8bef4116e 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assume.assumeTrue;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -29,6 +30,7 @@
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 import io.lettuce.KeysAndValues;
+import io.lettuce.RedisConditions;
 import io.lettuce.core.*;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
@@ -144,6 +146,8 @@ public void delCrossSlot() {
     @Test
     public void unlinkCrossSlot() {
 
+        assumeTrue(RedisConditions.of(syncCommands).hasCommand("UNLINK"));
+
         msetCrossSlot();
 
         StepVerifier.create(commands.unlink(KeysAndValues.KEYS.toArray(new String[KeysAndValues.COUNT])))
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
index 6a74d79354..e40497db0d 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
@@ -56,6 +56,9 @@ public void before() throws Exception {
         assumeTrue("Assume that stunnel runs on port 7443", Sockets.isOpen(host(), CLUSTER_PORT_SSL_1));
         assumeTrue("Assume that stunnel runs on port 7444", Sockets.isOpen(host(), CLUSTER_PORT_SSL_2));
         assumeTrue("Assume that stunnel runs on port 7445", Sockets.isOpen(host(), CLUSTER_PORT_SSL_3));
+        assumeTrue("Assume that Redis runs on port 7479", Sockets.isOpen(host(), 7479));
+        assumeTrue("Assume that Redis runs on port 7480", Sockets.isOpen(host(), 7480));
+        assumeTrue("Assume that Redis runs on port 7481", Sockets.isOpen(host(), 7481));
     }
 
     @AfterClass
diff --git a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
index 466f088d8b..d9cac4013e 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
@@ -16,13 +16,15 @@
 package io.lettuce.core.cluster.commands;
 
 import static io.lettuce.core.cluster.ClusterTestUtil.flushDatabaseOfAllNodes;
+import static org.junit.Assume.assumeTrue;
 
-import io.lettuce.TestClientResources;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 
+import io.lettuce.RedisConditions;
+import io.lettuce.TestClientResources;
 import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.TestSettings;
@@ -43,6 +45,10 @@ public class GeoClusterCommandTest extends GeoCommandTest {
     public static void setupClient() {
         redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
+
+        try (StatefulRedisClusterConnection<String, String> connection = redisClusterClient.connect()) {
+            assumeTrue(RedisConditions.of(connection).hasCommand("GEOADD"));
+        }
     }
 
     @AfterClass
diff --git a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
index 6a5cc8108b..1a85e837bf 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
@@ -16,12 +16,14 @@
 package io.lettuce.core.cluster.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assume.assumeTrue;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import io.lettuce.RedisConditions;
 import io.lettuce.TestClientResources;
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.FastShutdown;
@@ -92,6 +94,8 @@ public void exists() throws Exception {
     @Test
     public void touch() throws Exception {
 
+        assumeTrue(RedisConditions.of(redis).hasCommand("TOUCH"));
+
         redis.set(key, "value");
         redis.set("a", "value");
         redis.set("b", "value");
@@ -103,6 +107,8 @@ public void touch() throws Exception {
     @Test
     public void unlink() throws Exception {
 
+        assumeTrue(RedisConditions.of(redis).hasCommand("UNLINK"));
+
         redis.set(key, "value");
         redis.set("a", "value");
         redis.set("b", "value");
diff --git a/src/test/java/io/lettuce/core/commands/BitCommandTest.java b/src/test/java/io/lettuce/core/commands/BitCommandTest.java
index 75214b6101..26186d0d43 100644
--- a/src/test/java/io/lettuce/core/commands/BitCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/BitCommandTest.java
@@ -21,12 +21,14 @@
 import static io.lettuce.core.BitFieldArgs.unsigned;
 import static io.lettuce.core.BitFieldArgs.OverflowType.WRAP;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assume.assumeTrue;
 
 import java.nio.ByteBuffer;
 import java.util.List;
 
 import org.junit.Test;
 
+import io.lettuce.RedisConditions;
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.BitFieldArgs;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -104,6 +106,8 @@ public void bitfieldArgsTest() throws Exception {
     @Test
     public void bitfield() throws Exception {
 
+        assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
+
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 1).set(5, 1).incrBy(2, 3).get().get(2);
 
         List<Long> values = redis.bitfield(key, bitFieldArgs);
@@ -115,6 +119,8 @@ public void bitfield() throws Exception {
     @Test
     public void bitfieldGetWithOffset() throws Exception {
 
+        assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
+
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 1).get(signed(2), typeWidthBasedOffset(1));
 
         List<Long> values = redis.bitfield(key, bitFieldArgs);
@@ -126,6 +132,8 @@ public void bitfieldGetWithOffset() throws Exception {
     @Test
     public void bitfieldSet() throws Exception {
 
+        assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
+
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 5).set(5);
 
         List<Long> values = redis.bitfield(key, bitFieldArgs);
@@ -137,6 +145,8 @@ public void bitfieldSet() throws Exception {
     @Test
     public void bitfieldWithOffsetSet() throws Exception {
 
+        assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
+
         redis.bitfield(key, BitFieldArgs.Builder.set(signed(8), typeWidthBasedOffset(2), 5));
         assertThat(bitstring.get(key)).isEqualTo("000000000000000010100000");
 
@@ -148,6 +158,8 @@ public void bitfieldWithOffsetSet() throws Exception {
     @Test
     public void bitfieldIncrBy() throws Exception {
 
+        assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
+
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 5).incrBy(1);
 
         List<Long> values = redis.bitfield(key, bitFieldArgs);
@@ -159,6 +171,8 @@ public void bitfieldIncrBy() throws Exception {
     @Test
     public void bitfieldWithOffsetIncrBy() throws Exception {
 
+        assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
+
         redis.bitfield(key, BitFieldArgs.Builder.incrBy(signed(8), typeWidthBasedOffset(2), 1));
         assertThat(bitstring.get(key)).isEqualTo("000000000000000010000000");
 
@@ -170,6 +184,8 @@ public void bitfieldWithOffsetIncrBy() throws Exception {
     @Test
     public void bitfieldOverflow() throws Exception {
 
+        assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
+
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.overflow(WRAP).set(signed(8), 9, Integer.MAX_VALUE).get(signed(8));
 
         List<Long> values = redis.bitfield(key, bitFieldArgs);
diff --git a/src/test/java/io/lettuce/core/commands/GeoCommandTest.java b/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
index 0e2db3051f..8ffc3b825e 100644
--- a/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
@@ -17,21 +17,35 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.offset;
+import static org.junit.Assume.assumeTrue;
 
 import java.util.List;
 import java.util.Set;
 
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import io.lettuce.RedisConditions;
 import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
 
 public class GeoCommandTest extends AbstractRedisClientTest {
 
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 
+    @BeforeClass
+    public static void setupClient() {
+        client = DefaultRedisClient.get();
+        client.setOptions(ClientOptions.create());
+
+        try (StatefulRedisConnection<String, String> connection = client.connect()) {
+            assumeTrue(RedisConditions.of(connection).hasCommand("GEOADD"));
+        }
+    }
+
     @Test
     public void geoadd() throws Exception {
 
@@ -121,6 +135,7 @@ public void geodist() throws Exception {
     @Test
     public void geodistMissingElements() throws Exception {
 
+        assumeTrue(RedisConditions.of(redis).hasVersionGreaterOrEqualsTo("3.4"));
         prepareGeo();
 
         assertThat(redis.geodist("Unknown", "Unknown", "Bahn", GeoArgs.Unit.km)).isNull();
@@ -251,6 +266,8 @@ public void geohash() throws Exception {
     @Test
     public void geohashUnknownKey() throws Exception {
 
+        assumeTrue(RedisConditions.of(redis).hasVersionGreaterOrEqualsTo("3.4"));
+
         prepareGeo();
 
         List<Value<String>> geohash = redis.geohash("dunno", "member");
@@ -294,8 +311,8 @@ public void georadiusStoreWithCountAndSort() throws Exception {
         prepareGeo();
 
         String resultKey = "38o54"; // yields in same slot as "key"
-        Long result = redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km,
-                new GeoRadiusStoreArgs<>().withCount(1).desc().withStore(resultKey));
+        Long result = redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, new GeoRadiusStoreArgs<>().withCount(1)
+                .desc().withStore(resultKey));
         assertThat(result).isEqualTo(1);
 
         List<ScoredValue<String>> results = redis.zrangeWithScores(resultKey, 0, -1);
@@ -323,8 +340,8 @@ public void georadiusStoreDistWithCountAndSort() throws Exception {
         prepareGeo();
 
         String resultKey = "38o54"; // yields in same slot as "key"
-        Long result = redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km,
-                new GeoRadiusStoreArgs<>().withCount(1).desc().withStoreDist("38o54"));
+        Long result = redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, new GeoRadiusStoreArgs<>().withCount(1)
+                .desc().withStoreDist("38o54"));
         assertThat(result).isEqualTo(1);
 
         List<ScoredValue<String>> dist = redis.zrangeWithScores(resultKey, 0, -1);
@@ -361,8 +378,8 @@ public void georadiusbymemberStoreDistWithCountAndSort() throws Exception {
         prepareGeo();
 
         String resultKey = "38o54"; // yields in same slot as "key"
-        Long result = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km,
-                new GeoRadiusStoreArgs<>().withCount(1).desc().withStoreDist("38o54"));
+        Long result = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km, new GeoRadiusStoreArgs<>().withCount(1).desc()
+                .withStoreDist("38o54"));
         assertThat(result).isEqualTo(1);
 
         List<ScoredValue<String>> dist = redis.zrangeWithScores(resultKey, 0, -1);
@@ -376,8 +393,8 @@ public void georadiusbymemberWithArgs() throws Exception {
 
         prepareGeo();
 
-        List<GeoWithin<String>> empty = redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km,
-                new GeoArgs().withHash().withCoordinates().withDistance().desc());
+        List<GeoWithin<String>> empty = redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km, new GeoArgs().withHash()
+                .withCoordinates().withDistance().desc());
         assertThat(empty).isNotEmpty();
 
         List<GeoWithin<String>> withDistanceAndCoordinates = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km,
@@ -390,8 +407,8 @@ public void georadiusbymemberWithArgs() throws Exception {
         assertThat(weinheim.getDistance()).isNotNull();
         assertThat(weinheim.getCoordinates()).isNotNull();
 
-        List<GeoWithin<String>> withDistanceAndHash = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km,
-                new GeoArgs().withDistance().withHash().desc());
+        List<GeoWithin<String>> withDistanceAndHash = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km, new GeoArgs()
+                .withDistance().withHash().desc());
         assertThat(withDistanceAndHash).hasSize(2);
 
         GeoWithin<String> weinheimDistanceHash = withDistanceAndHash.get(0);
@@ -400,8 +417,8 @@ public void georadiusbymemberWithArgs() throws Exception {
         assertThat(weinheimDistanceHash.getDistance()).isNotNull();
         assertThat(weinheimDistanceHash.getCoordinates()).isNull();
 
-        List<GeoWithin<String>> withCoordinates = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km,
-                new GeoArgs().withCoordinates().desc());
+        List<GeoWithin<String>> withCoordinates = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km, new GeoArgs()
+                .withCoordinates().desc());
         assertThat(withCoordinates).hasSize(2);
 
         GeoWithin<String> weinheimCoordinates = withCoordinates.get(0);
@@ -417,8 +434,8 @@ public void georadiusbymemberWithArgsAndTransaction() throws Exception {
         prepareGeo();
 
         redis.multi();
-        redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km,
-                new GeoArgs().withHash().withCoordinates().withDistance().desc());
+        redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km, new GeoArgs().withHash().withCoordinates().withDistance()
+                .desc());
         redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km, new GeoArgs().withCoordinates().withDistance().desc());
         redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km, new GeoArgs().withDistance().withHash().desc());
         redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km, new GeoArgs().withCoordinates().desc());
diff --git a/src/test/java/io/lettuce/core/commands/HashCommandTest.java b/src/test/java/io/lettuce/core/commands/HashCommandTest.java
index f09e8858aa..6e21f8a56a 100644
--- a/src/test/java/io/lettuce/core/commands/HashCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/HashCommandTest.java
@@ -17,8 +17,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.offset;
+import static org.junit.Assume.assumeTrue;
 
-import java.security.Key;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -26,6 +26,7 @@
 
 import org.junit.Test;
 
+import io.lettuce.RedisConditions;
 import io.lettuce.core.*;
 
 /**
@@ -140,6 +141,9 @@ public void hlen() throws Exception {
 
     @Test
     public void hstrlen() throws Exception {
+
+        assumeTrue(RedisConditions.of(redis).hasCommand("HSTRLEN"));
+
         assertThat((long) redis.hstrlen(key, "one")).isEqualTo(0);
         redis.hset(key, "one", value);
         assertThat((long) redis.hstrlen(key, "one")).isEqualTo(value.length());
diff --git a/src/test/java/io/lettuce/core/commands/KeyCommandTest.java b/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
index a82f6bcb60..92f8ac4613 100644
--- a/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assume.assumeTrue;
 
 import java.util.*;
 
@@ -24,6 +25,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import io.lettuce.RedisConditions;
 import io.lettuce.core.*;
 
 /**
@@ -47,6 +49,9 @@ public void del() throws Exception {
 
     @Test
     public void unlink() throws Exception {
+
+        assumeTrue(RedisConditions.of(redis).hasCommand("UNLINK"));
+
         redis.set(key, value);
         assertThat((long) redis.unlink(key)).isEqualTo(1);
         redis.set(key + "1", value);
@@ -229,12 +234,6 @@ public void renamenxNonexistentKey() throws Exception {
         redis.renamenx(key, key + "X");
     }
 
-    @Test
-    public void renamenxIdenticalKeys() throws Exception {
-        redis.set(key, value);
-        assertThat(redis.renamenx(key, key)).isFalse();
-    }
-
     @Test
     public void restore() throws Exception {
         redis.set(key, value);
@@ -254,6 +253,9 @@ public void restore() throws Exception {
 
     @Test
     public void touch() throws Exception {
+
+        assumeTrue(RedisConditions.of(redis).hasCommand("TOUCH"));
+
         assertThat((long) redis.touch(key)).isEqualTo(0);
         redis.set(key, value);
         assertThat((long) redis.touch(key, "key2")).isEqualTo(1);
diff --git a/src/test/java/io/lettuce/core/commands/ListCommandTest.java b/src/test/java/io/lettuce/core/commands/ListCommandTest.java
index 2a98569785..74fa3cc34c 100644
--- a/src/test/java/io/lettuce/core/commands/ListCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ListCommandTest.java
@@ -16,20 +16,23 @@
 package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assume.assumeTrue;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import org.junit.Test;
+
+import io.lettuce.RedisConditions;
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.ListStreamingAdapter;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
 public class ListCommandTest extends AbstractRedisClientTest {
+
     @Test
     public void blpop() throws Exception {
         redis.rpush("two", "2", "3");
@@ -112,6 +115,9 @@ public void lpushx() throws Exception {
 
     @Test
     public void lpushxVariadic() throws Exception {
+
+        assumeTrue(RedisConditions.of(redis).hasCommandArity("LPUSHX", -3));
+
         assertThat((long) redis.lpushx(key, "one", "two")).isEqualTo(0);
         redis.lpush(key, "two");
         assertThat((long) redis.lpushx(key, "one", "zero")).isEqualTo(3);
@@ -217,6 +223,9 @@ public void rpushx() throws Exception {
 
     @Test
     public void rpushxVariadic() throws Exception {
+
+        assumeTrue(RedisConditions.of(redis).hasCommandArity("RPUSHX", -3));
+
         assertThat((long) redis.rpushx(key, "two", "three")).isEqualTo(0);
         redis.rpush(key, "one");
         assertThat((long) redis.rpushx(key, "two", "three")).isEqualTo(3);
diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
index 4bc016e54d..0d048ca197 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
@@ -18,6 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeTrue;
 
 import java.util.Date;
 import java.util.List;
@@ -29,6 +30,7 @@
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import io.lettuce.RedisConditions;
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.TestSettings;
@@ -46,7 +48,7 @@
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ServerCommandTest extends AbstractRedisClientTest {
     @Test
-    public void bgrewriteaof() throws Exception {
+    public void bgrewriteaof() {
         String msg = "Background append only file rewriting";
         assertThat(redis.bgrewriteaof(), containsString(msg));
     }
@@ -61,7 +63,7 @@ public void bgsave() throws Exception {
     }
 
     @Test
-    public void clientGetSetname() throws Exception {
+    public void clientGetSetname() {
         assertThat(redis.clientGetname()).isNull();
         assertThat(redis.clientSetname("test")).isEqualTo("OK");
         assertThat(redis.clientGetname()).isEqualTo("test");
@@ -70,12 +72,12 @@ public void clientGetSetname() throws Exception {
     }
 
     @Test
-    public void clientPause() throws Exception {
+    public void clientPause() {
         assertThat(redis.clientPause(10)).isEqualTo("OK");
     }
 
     @Test
-    public void clientKill() throws Exception {
+    public void clientKill() {
         Pattern p = Pattern.compile(".*addr=([^ ]+).*");
         String clients = redis.clientList();
         Matcher m = p.matcher(clients);
@@ -85,7 +87,7 @@ public void clientKill() throws Exception {
     }
 
     @Test
-    public void clientKillExtended() throws Exception {
+    public void clientKillExtended() {
 
         RedisCommands<String, String> connection2 = client.connect().sync();
         connection2.clientSetname("killme");
@@ -107,17 +109,17 @@ public void clientKillExtended() throws Exception {
     }
 
     @Test
-    public void clientList() throws Exception {
+    public void clientList() {
         assertThat(redis.clientList().contains("addr=")).isTrue();
     }
 
     @Test
-    public void commandCount() throws Exception {
+    public void commandCount() {
         assertThat(redis.commandCount()).isGreaterThan(100);
     }
 
     @Test
-    public void command() throws Exception {
+    public void command() {
 
         List<Object> result = redis.command();
 
@@ -128,7 +130,7 @@ public void command() throws Exception {
     }
 
     @Test
-    public void commandInfo() throws Exception {
+    public void commandInfo() {
 
         List<Object> result = redis.commandInfo(CommandType.GETRANGE, CommandType.SET);
 
@@ -144,12 +146,12 @@ public void commandInfo() throws Exception {
     }
 
     @Test
-    public void configGet() throws Exception {
+    public void configGet() {
         assertThat(redis.configGet("maxmemory")).isEqualTo(list("maxmemory", "0"));
     }
 
     @Test
-    public void configResetstat() throws Exception {
+    public void configResetstat() {
         redis.get(key);
         redis.get(key);
         assertThat(redis.configResetstat()).isEqualTo("OK");
@@ -157,7 +159,7 @@ public void configResetstat() throws Exception {
     }
 
     @Test
-    public void configSet() throws Exception {
+    public void configSet() {
         String maxmemory = redis.configGet("maxmemory").get(1);
         assertThat(redis.configSet("maxmemory", "1024")).isEqualTo("OK");
         assertThat(redis.configGet("maxmemory").get(1)).isEqualTo("1024");
@@ -165,14 +167,14 @@ public void configSet() throws Exception {
     }
 
     @Test
-    public void configRewrite() throws Exception {
+    public void configRewrite() {
 
         String result = redis.configRewrite();
         assertThat(result).isEqualTo("OK");
     }
 
     @Test
-    public void dbsize() throws Exception {
+    public void dbsize() {
         assertThat(redis.dbsize()).isEqualTo(0);
         redis.set(key, value);
         assertThat(redis.dbsize()).isEqualTo(1);
@@ -180,7 +182,7 @@ public void dbsize() throws Exception {
 
     @Test
     @Ignore("Causes instabilities")
-    public void debugCrashAndRecover() throws Exception {
+    public void debugCrashAndRecover() {
         try {
             assertThat(redis.debugCrashAndRecover(1L)).isNotNull();
         } catch (Exception e) {
@@ -189,26 +191,26 @@ public void debugCrashAndRecover() throws Exception {
     }
 
     @Test
-    public void debugHtstats() throws Exception {
+    public void debugHtstats() {
         redis.set(key, value);
         String result = redis.debugHtstats(0);
         assertThat(result).contains("table size");
     }
 
     @Test
-    public void debugObject() throws Exception {
+    public void debugObject() {
         redis.set(key, value);
         redis.debugObject(key);
     }
 
     @Test
-    public void debugReload() throws Exception {
+    public void debugReload() {
         assertThat(redis.debugReload()).isEqualTo("OK");
     }
 
     @Test
     @Ignore("Causes instabilities")
-    public void debugRestart() throws Exception {
+    public void debugRestart() {
         try {
             assertThat(redis.debugRestart(1L)).isNotNull();
         } catch (Exception e) {
@@ -217,7 +219,7 @@ public void debugRestart() throws Exception {
     }
 
     @Test
-    public void debugSdslen() throws Exception {
+    public void debugSdslen() {
         redis.set(key, value);
         String result = redis.debugSdslen(key);
         assertThat(result).contains("key_sds_len");
@@ -226,24 +228,27 @@ public void debugSdslen() throws Exception {
     /**
      * this test causes a stop of the redis. This means, you cannot repeat the test without restarting your redis.
      *
-     * @throws Exception
+     * @
      */
     @Test
-    public void flushall() throws Exception {
+    public void flushall() {
         redis.set(key, value);
         assertThat(redis.flushall()).isEqualTo("OK");
         assertThat(redis.get(key)).isNull();
     }
 
     @Test
-    public void flushallAsync() throws Exception {
+    public void flushallAsync() {
+
+        assumeTrue(RedisConditions.of(redis).hasVersionGreaterOrEqualsTo("3.4"));
+
         redis.set(key, value);
         assertThat(redis.flushallAsync()).isEqualTo("OK");
         assertThat(redis.get(key)).isNull();
     }
 
     @Test
-    public void flushdb() throws Exception {
+    public void flushdb() {
         redis.set(key, value);
         redis.select(1);
         redis.set(key, value + "X");
@@ -254,7 +259,10 @@ public void flushdb() throws Exception {
     }
 
     @Test
-    public void flushdbAsync() throws Exception {
+    public void flushdbAsync() {
+
+        assumeTrue(RedisConditions.of(redis).hasVersionGreaterOrEqualsTo("3.4"));
+
         redis.set(key, value);
         redis.select(1);
         redis.set(key, value + "X");
@@ -265,13 +273,13 @@ public void flushdbAsync() throws Exception {
     }
 
     @Test
-    public void info() throws Exception {
+    public void info() {
         assertThat(redis.info().contains("redis_version")).isTrue();
         assertThat(redis.info("server").contains("redis_version")).isTrue();
     }
 
     @Test
-    public void lastsave() throws Exception {
+    public void lastsave() {
         Date start = new Date(System.currentTimeMillis() / 1000);
         assertThat(start.compareTo(redis.lastsave()) <= 0).isTrue();
     }
@@ -286,19 +294,19 @@ public void save() throws Exception {
     }
 
     @Test
-    public void slaveof() throws Exception {
+    public void slaveof() {
 
         assertThat(redis.slaveof(TestSettings.host(), 0)).isEqualTo("OK");
         redis.slaveofNoOne();
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void slaveofEmptyHost() throws Exception {
+    public void slaveofEmptyHost() {
         redis.slaveof("", 0);
     }
 
     @Test
-    public void role() throws Exception {
+    public void role() {
 
         List<Object> objects = redis.role();
 
@@ -310,13 +318,13 @@ public void role() throws Exception {
     }
 
     @Test
-    public void slaveofNoOne() throws Exception {
+    public void slaveofNoOne() {
         assertThat(redis.slaveofNoOne()).isEqualTo("OK");
     }
 
     @Test
     @SuppressWarnings("unchecked")
-    public void slowlog() throws Exception {
+    public void slowlog() {
         long start = System.currentTimeMillis() / 1000;
 
         assertThat(redis.configSet("slowlog-log-slower-than", "0")).isEqualTo("OK");
@@ -349,6 +357,8 @@ public void slowlog() throws Exception {
     @Test
     public void swapdb() {
 
+        assumeTrue(RedisConditions.of(redis).hasCommand("SWAPDB"));
+
         redis.select(1);
         redis.set(key, "value1");
 
diff --git a/src/test/java/io/lettuce/core/commands/SetCommandTest.java b/src/test/java/io/lettuce/core/commands/SetCommandTest.java
index e220426262..06ba04b109 100644
--- a/src/test/java/io/lettuce/core/commands/SetCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SetCommandTest.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assume.assumeTrue;
 
 import java.util.HashSet;
 import java.util.List;
@@ -24,6 +25,7 @@
 
 import org.junit.Test;
 
+import io.lettuce.RedisConditions;
 import io.lettuce.core.*;
 
 /**
@@ -138,6 +140,9 @@ public void spop() throws Exception {
 
     @Test
     public void spopMultiple() throws Exception {
+
+        assumeTrue(RedisConditions.of(redis).hasCommandArity("SPOP", -2));
+
         assertThat(redis.spop(key)).isNull();
         redis.sadd(key, "a", "b", "c");
         Set<String> rand = redis.spop(key, 2);
diff --git a/src/test/java/io/lettuce/core/commands/StringCommandTest.java b/src/test/java/io/lettuce/core/commands/StringCommandTest.java
index b14a6e350c..c092d9e8c6 100644
--- a/src/test/java/io/lettuce/core/commands/StringCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/StringCommandTest.java
@@ -25,12 +25,15 @@
 import java.util.List;
 import java.util.Map;
 
-import io.lettuce.core.*;
-import io.lettuce.core.codec.ByteArrayCodec;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.KeyValueStreamingAdapter;
+import io.lettuce.core.RedisException;
+
 /**
  * @author Will Glozer
  * @author Mark Paluch
@@ -41,8 +44,8 @@ public class StringCommandTest extends AbstractRedisClientTest {
 
     @Test
     public void append() throws Exception {
-        assertThat(redis.append(key, value)).isEqualTo( value.length() );
-        assertThat(redis.append(key, "X")).isEqualTo( value.length() + 1 );
+        assertThat(redis.append(key, value)).isEqualTo(value.length());
+        assertThat(redis.append(key, "X")).isEqualTo(value.length() + 1);
     }
 
     @Test
@@ -61,16 +64,16 @@ public void getbit() throws Exception {
 
     @Test
     public void getrange() throws Exception {
-        assertThat(redis.getrange(key, 0, -1)).isEqualTo( "" );
+        assertThat(redis.getrange(key, 0, -1)).isEqualTo("");
         redis.set(key, "foobar");
-        assertThat(redis.getrange(key, 2, 4)).isEqualTo( "oba" );
-        assertThat(redis.getrange(key, 3, -1)).isEqualTo( "bar" );
+        assertThat(redis.getrange(key, 2, 4)).isEqualTo("oba");
+        assertThat(redis.getrange(key, 3, -1)).isEqualTo("bar");
     }
 
     @Test
     public void getset() throws Exception {
         assertThat(redis.getset(key, value)).isNull();
-        assertThat(redis.getset(key, "two")).isEqualTo( value );
+        assertThat(redis.getset(key, "two")).isEqualTo(value);
         assertThat(redis.get(key)).isEqualTo("two");
     }
 
@@ -128,11 +131,11 @@ public void set() throws Exception {
         assertThat(redis.set(key, value, px(20000))).isEqualTo("OK");
         assertThat(redis.set(key, value, ex(10))).isEqualTo("OK");
         assertThat(redis.get(key)).isEqualTo(value);
-        assertThat(redis.ttl(key)).isGreaterThanOrEqualTo( 9 );
+        assertThat(redis.ttl(key)).isGreaterThanOrEqualTo(9);
 
         assertThat(redis.set(key, value, px(10000))).isEqualTo("OK");
         assertThat(redis.get(key)).isEqualTo(value);
-        assertThat(redis.ttl(key)).isGreaterThanOrEqualTo( 9 );
+        assertThat(redis.ttl(key)).isGreaterThanOrEqualTo(9);
 
         assertThat(redis.set(key, value, nx())).isNull();
         assertThat(redis.set(key, value, xx())).isEqualTo("OK");
@@ -159,13 +162,6 @@ public void setNegativePX() throws Exception {
         redis.set(key, value, px(-1000));
     }
 
-    @Test
-    public void setExWithPx() throws Exception {
-        exception.expect(RedisCommandExecutionException.class);
-        exception.expectMessage("ERR syntax error");
-        redis.set(key, value, ex(10).px(20000).nx());
-    }
-
     @Test
     public void setbit() throws Exception {
         assertThat(redis.setbit(key, 0, 1)).isEqualTo(0);
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
index 7ba61f8d2a..6b7319ba10 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
@@ -47,25 +47,25 @@ protected RedisCommands<String, String> connect() {
      * Luckily these commands do not destroy anything in contrast to sync/async.
      */
     @Test
-    public void shutdown() throws Exception {
+    public void shutdown() {
         reactive.shutdown(true);
         assertThat(reactive.getStatefulConnection().isOpen()).isTrue();
     }
 
     @Test
-    public void debugOom() throws Exception {
+    public void debugOom() {
         reactive.debugOom();
         assertThat(reactive.getStatefulConnection().isOpen()).isTrue();
     }
 
     @Test
-    public void debugSegfault() throws Exception {
+    public void debugSegfault() {
         reactive.debugSegfault();
         assertThat(reactive.getStatefulConnection().isOpen()).isTrue();
     }
 
     @Test
-    public void debugRestart() throws Exception {
+    public void debugRestart() {
         reactive.debugRestart(1L);
         assertThat(reactive.getStatefulConnection().isOpen()).isTrue();
     }

From c998d16e88e16bb318b579cfa2623539f1dfae30 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 24 Jun 2017 16:14:56 +0200
Subject: [PATCH 244/808] Refactor method handle lookup for default methods
 into DefaultMethods #527

---
 .../ClusterFutureSyncInvocationHandler.java   |  40 +----
 .../lettuce/core/internal/DefaultMethods.java | 148 ++++++++++++++++++
 2 files changed, 155 insertions(+), 33 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/internal/DefaultMethods.java

diff --git a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
index 1cbf7219ae..04f467048a 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
@@ -16,9 +16,6 @@
 package io.lettuce.core.cluster;
 
 import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
@@ -36,6 +33,7 @@
 import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.internal.AbstractInvocationHandler;
+import io.lettuce.core.internal.DefaultMethods;
 
 /**
  * Invocation-handler to synchronize API calls which use Futures as backend. This class leverages the need to implement a full
@@ -58,23 +56,7 @@ class ClusterFutureSyncInvocationHandler<K, V> extends AbstractInvocationHandler
     private final Map<Method, Method> apiMethodCache = new ConcurrentHashMap<>(RedisClusterCommands.class.getMethods().length,
             1);
     private final Map<Method, Method> connectionMethodCache = new ConcurrentHashMap<>(5, 1);
-
-    private static final Constructor<MethodHandles.Lookup> LOOKUP_CONSTRUCTOR;
-
-    static {
-        try {
-            LOOKUP_CONSTRUCTOR = MethodHandles.Lookup.class.getDeclaredConstructor(Class.class, int.class);
-        } catch (NoSuchMethodException e) {
-            throw new IllegalStateException(e);
-        }
-
-        try {
-            if (!LOOKUP_CONSTRUCTOR.isAccessible()) {
-                LOOKUP_CONSTRUCTOR.setAccessible(true);
-            }
-        } catch (Throwable jdk9) {
-        }
-    }
+    private final Map<Method, MethodHandle> methodHandleCache = new ConcurrentHashMap<>(5, 1);
 
     ClusterFutureSyncInvocationHandler(StatefulConnection<K, V> connection, Class<?> asyncCommandsInterface,
             Class<?> nodeSelectionInterface, Class<?> nodeSelectionCommandsInterface, Object asyncApi) {
@@ -86,7 +68,6 @@ class ClusterFutureSyncInvocationHandler<K, V> extends AbstractInvocationHandler
     }
 
     /**
-     *
      * @see AbstractInvocationHandler#handleInvocation(Object, Method, Object[])
      */
     @Override
@@ -95,7 +76,8 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
         try {
 
             if (method.isDefault()) {
-                return getDefaultMethodHandle(method).bindTo(proxy).invokeWithArguments(args);
+                return methodHandleCache.computeIfAbsent(method, this::lookupDefaultMethod).bindTo(proxy)
+                        .invokeWithArguments(args);
             }
 
             if (method.getName().equals("getConnection") && args.length > 0) {
@@ -190,20 +172,12 @@ protected Object nodes(Predicate<RedisClusterNode> predicate, ClusterConnectionP
                 nodeSelectionCommandsInterface, nodeSelectionInterface }, h);
     }
 
-    private static MethodHandle getDefaultMethodHandle(Method method) {
-
-        Class<?> declaringClass = method.getDeclaringClass();
+    private MethodHandle lookupDefaultMethod(Method method) {
 
         try {
-            if (LOOKUP_CONSTRUCTOR.isAccessible()) {
-                MethodHandles.Lookup result = LOOKUP_CONSTRUCTOR.newInstance(declaringClass, MethodHandles.Lookup.PRIVATE);
-                return result.unreflectSpecial(method, declaringClass);
-            }
-
-            return MethodHandles.lookup().findSpecial(method.getDeclaringClass(), method.getName(),
-                    MethodType.methodType(method.getReturnType(), method.getParameterTypes()), method.getDeclaringClass());
+            return DefaultMethods.lookupMethodHandle(method);
         } catch (ReflectiveOperationException e) {
-            throw new IllegalArgumentException("Did not pass in an interface method: " + method, e);
+            throw new IllegalArgumentException(e);
         }
     }
 }
diff --git a/src/main/java/io/lettuce/core/internal/DefaultMethods.java b/src/main/java/io/lettuce/core/internal/DefaultMethods.java
new file mode 100644
index 0000000000..5fa81075bc
--- /dev/null
+++ b/src/main/java/io/lettuce/core/internal/DefaultMethods.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.internal;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.MethodHandles.Lookup;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * Collection of utility methods to lookup {@link MethodHandle}s for default interface {@link Method}s.This class is part of the
+ * internal API and may change without further notice.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public class DefaultMethods {
+
+    private final static MethodHandleLookup methodHandleLookup = MethodHandleLookup.getMethodHandleLookup();
+
+    /**
+     * Lookup a {@link MethodHandle} for a default {@link Method}.
+     *
+     * @param method must be a {@link Method#isDefault() default} {@link Method}.
+     * @return the {@link MethodHandle}.
+     */
+    public static MethodHandle lookupMethodHandle(Method method) throws ReflectiveOperationException {
+
+        LettuceAssert.notNull(method, "Method must not be null");
+        LettuceAssert.isTrue(method.isDefault(), "Method is not a default method");
+
+        return methodHandleLookup.lookup(method);
+    }
+
+    /**
+     * Strategies for {@link MethodHandle} lookup.
+     */
+    enum MethodHandleLookup {
+
+        /**
+         * Open (via reflection construction of {@link Lookup}) method handle lookup. Works with Java 8 and with Java 9
+         * permitting illegal access.
+         */
+        OPEN {
+
+            private final Optional<Constructor<Lookup>> constructor = getLookupConstructor();
+
+            @Override
+            MethodHandle lookup(Method method) throws ReflectiveOperationException {
+
+                Constructor<Lookup> constructor = this.constructor.orElseThrow(() -> new IllegalStateException(
+                        "Could not obtain MethodHandles.lookup constructor"));
+
+                return constructor.newInstance(method.getDeclaringClass()).unreflectSpecial(method, method.getDeclaringClass());
+            }
+
+            @Override
+            boolean isAvailable() {
+                return constructor.isPresent();
+            }
+        },
+
+        /**
+         * Encapsulated {@link MethodHandle} lookup working on Java 9.
+         */
+        ENCAPSULATED {
+
+            @Override
+            MethodHandle lookup(Method method) throws ReflectiveOperationException {
+
+                MethodType methodType = MethodType.methodType(method.getReturnType(), method.getParameterTypes());
+
+                return MethodHandles.lookup().findSpecial(method.getDeclaringClass(), method.getName(), methodType,
+                        method.getDeclaringClass());
+            }
+
+            @Override
+            boolean isAvailable() {
+                return true;
+            }
+        };
+
+        /**
+         * Lookup a {@link MethodHandle} given {@link Method} to look up.
+         *
+         * @param method must not be {@literal null}.
+         * @return the method handle.
+         * @throws ReflectiveOperationException
+         */
+        abstract MethodHandle lookup(Method method) throws ReflectiveOperationException;
+
+        /**
+         * @return {@literal true} if the lookup is available.
+         */
+        abstract boolean isAvailable();
+
+        /**
+         * Obtain the first available {@link MethodHandleLookup}.
+         *
+         * @return the {@link MethodHandleLookup}
+         * @throws IllegalStateException if no {@link MethodHandleLookup} is available.
+         */
+        public static MethodHandleLookup getMethodHandleLookup() {
+
+            return Arrays.stream(MethodHandleLookup.values()).filter(MethodHandleLookup::isAvailable).findFirst()
+                    .orElseThrow(() -> new IllegalStateException("No MethodHandleLookup available!"));
+        }
+
+        private static Optional<Constructor<Lookup>> getLookupConstructor() {
+
+            try {
+
+                Constructor<Lookup> constructor = Lookup.class.getDeclaredConstructor(Class.class);
+                if (!constructor.isAccessible()) {
+                    constructor.setAccessible(true);
+                }
+
+                return Optional.of(constructor);
+
+            } catch (Exception ex) {
+
+                // this is the signal that we are on Java 9 (encapsulated) and can't use the accessible constructor approach.
+                if (ex.getClass().getName().equals("java.lang.reflect.InaccessibleObjectException")) {
+                    return Optional.empty();
+                }
+
+                throw new IllegalStateException(ex);
+            }
+        }
+    }
+}

From cbba6e78cdf69821f97d764694411bb1a63a6806 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 24 Jun 2017 20:22:09 +0200
Subject: [PATCH 245/808] Support default methods on dynamic command interfaces
 #527

---
 .../core/dynamic/RedisCommandFactory.java     |  3 +
 .../DefaultMethodInvokingInterceptor.java     | 64 +++++++++++++++++++
 .../intercept/InvocationProxyFactory.java     |  2 +-
 ...ion.java => InvocationTargetProvider.java} | 32 +++-------
 .../intercept/MethodInterceptorChain.java     | 22 +++++--
 .../core/dynamic/RedisCommandsSyncTest.java   | 25 +++++++-
 6 files changed, 115 insertions(+), 33 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvokingInterceptor.java
 rename src/main/java/io/lettuce/core/dynamic/intercept/{DefaultMethodInvocation.java => InvocationTargetProvider.java} (52%)

diff --git a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
index 31a38a7008..8be859273f 100644
--- a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
@@ -26,6 +26,7 @@
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.dynamic.batch.BatchSize;
+import io.lettuce.core.dynamic.intercept.DefaultMethodInvokingInterceptor;
 import io.lettuce.core.dynamic.intercept.InvocationProxyFactory;
 import io.lettuce.core.dynamic.intercept.MethodInterceptor;
 import io.lettuce.core.dynamic.intercept.MethodInvocation;
@@ -180,7 +181,9 @@ public <T extends Commands> T getCommands(Class<T> commandInterface) {
         BatchAwareCommandLookupStrategy lookupStrategy = new BatchAwareCommandLookupStrategy(
                 new CompositeCommandLookupStrategy(), metadata);
 
+        factory.addInterceptor(new DefaultMethodInvokingInterceptor());
         factory.addInterceptor(new CommandFactoryExecutorMethodInterceptor(metadata, lookupStrategy));
+
         return factory.createProxy(commandInterface.getClassLoader());
     }
 
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvokingInterceptor.java b/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvokingInterceptor.java
new file mode 100644
index 0000000000..6f86273aea
--- /dev/null
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvokingInterceptor.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.dynamic.intercept;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import io.lettuce.core.internal.DefaultMethods;
+import io.lettuce.core.internal.LettuceAssert;
+
+/**
+ * Invokes default interface methods. Requires {@link MethodInvocation} to implement {@link InvocationTargetProvider} to
+ * determine the target object.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ * @see MethodInvocation
+ * @see InvocationTargetProvider
+ */
+public class DefaultMethodInvokingInterceptor implements MethodInterceptor {
+
+    private final Map<Method, MethodHandle> methodHandleCache = new ConcurrentHashMap<>();
+
+    @Override
+    public Object invoke(MethodInvocation invocation) throws Throwable {
+
+        Method method = invocation.getMethod();
+
+        if (!method.isDefault()) {
+            return invocation.proceed();
+        }
+
+        LettuceAssert.isTrue(invocation instanceof InvocationTargetProvider,
+                "Invocation must provide a target object via InvocationTargetProvider");
+
+        InvocationTargetProvider targetProvider = (InvocationTargetProvider) invocation;
+
+        return methodHandleCache.computeIfAbsent(method, DefaultMethodInvokingInterceptor::lookupMethodHandle)
+                .bindTo(targetProvider.getInvocationTarget()).invokeWithArguments(invocation.getArguments());
+    }
+
+    private static MethodHandle lookupMethodHandle(Method method) {
+        try {
+            return DefaultMethods.lookupMethodHandle(method);
+        } catch (ReflectiveOperationException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
index efd5b69c2f..9a74e74974 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
@@ -98,7 +98,7 @@ static class InterceptorChainInvocationHandler extends AbstractInvocationHandler
 
         @Override
         protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
-            return context.invoke(method, args);
+            return context.invoke(proxy, method, args);
         }
     }
 }
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvocation.java b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationTargetProvider.java
similarity index 52%
rename from src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvocation.java
rename to src/main/java/io/lettuce/core/dynamic/intercept/InvocationTargetProvider.java
index e3bc01aa94..dd64d6ec31 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvocation.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationTargetProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,31 +15,17 @@
  */
 package io.lettuce.core.dynamic.intercept;
 
-import java.lang.reflect.Method;
-
 /**
- * Default implementation of {@link MethodInvocation}
+ * Provides an invocation target object.
  *
+ * @see MethodInterceptor
  * @author Mark Paluch
+ * @since 5.0
  */
-abstract class DefaultMethodInvocation implements MethodInvocation {
-
-    private final Method method;
-    private final Object[] arguments;
-
-    DefaultMethodInvocation(Method method, Object[] arguments) {
-
-        this.method = method;
-        this.arguments = arguments;
-    }
-
-    @Override
-    public Method getMethod() {
-        return method;
-    }
+public interface InvocationTargetProvider {
 
-    @Override
-    public Object[] getArguments() {
-        return arguments;
-    }
+    /**
+     * @return the invocation target.
+     */
+    Object getInvocationTarget();
 }
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java
index 2a28158e43..b5c6faf7af 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java
@@ -63,14 +63,15 @@ private static MethodInterceptorChain createContext(Iterator<? extends MethodInt
     /**
      * Invoke a {@link Method} with its {@code args}.
      *
+     * @param target must not be {@literal null}.
      * @param method must not be {@literal null}.
      * @param args must not be {@literal null}.
      * @return
      * @throws Throwable
      */
-    public Object invoke(Method method, Object[] args) throws Throwable {
+    public Object invoke(Object target, Method method, Object[] args) throws Throwable {
 
-        PooledMethodInvocation invocation = getInvocation(method, args, next);
+        PooledMethodInvocation invocation = getInvocation(target, method, args, next);
 
         try {
             // JIT hint
@@ -83,10 +84,10 @@ public Object invoke(Method method, Object[] args) throws Throwable {
         }
     }
 
-    private PooledMethodInvocation getInvocation(Method method, Object[] args, MethodInterceptorChain next) {
+    private PooledMethodInvocation getInvocation(Object target, Method method, Object[] args, MethodInterceptorChain next) {
 
         PooledMethodInvocation pooledMethodInvocation = pool.get();
-        pooledMethodInvocation.initialize(method, args, next);
+        pooledMethodInvocation.initialize(target, method, args, next);
         return pooledMethodInvocation;
     }
 
@@ -152,8 +153,9 @@ Object proceed(MethodInvocation invocation) throws Throwable {
     /**
      * Stateful {@link MethodInvocation} using {@link MethodInterceptorChain}. The state is only valid throughout a call.
      */
-    static class PooledMethodInvocation implements MethodInvocation {
+    static class PooledMethodInvocation implements MethodInvocation, InvocationTargetProvider {
 
+        private Object target;
         private Method method;
         private Object args[];
         private MethodInterceptorChain current;
@@ -164,11 +166,13 @@ static class PooledMethodInvocation implements MethodInvocation {
         /**
          * Initialize state from the method call.
          *
+         * @param target
          * @param method
          * @param args
          * @param head
          */
-        public void initialize(Method method, Object[] args, MethodInterceptorChain head) {
+        public void initialize(Object target, Method method, Object[] args, MethodInterceptorChain head) {
+            this.target = target;
             this.method = method;
             this.args = args;
             this.current = head;
@@ -178,6 +182,7 @@ public void initialize(Method method, Object[] args, MethodInterceptorChain head
          * Clear invocation state.
          */
         public void clear() {
+            this.target = null;
             this.method = null;
             this.args = null;
             this.current = null;
@@ -189,6 +194,11 @@ public Object proceed() throws Throwable {
             return current.proceed(this);
         }
 
+        @Override
+        public Object getInvocationTarget() {
+            return target;
+        }
+
         @Override
         public Method getMethod() {
             return method;
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java
index e8f4fbef0c..2ae07c9ae1 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java
@@ -35,7 +35,7 @@
 public class RedisCommandsSyncTest extends AbstractRedisClientTest {
 
     @Test
-    public void sync() throws Exception {
+    public void sync() {
 
         StatefulRedisConnection<byte[], byte[]> connection = client.connect(ByteArrayCodec.INSTANCE);
         RedisCommandFactory factory = new RedisCommandFactory(connection);
@@ -50,7 +50,22 @@ public void sync() throws Exception {
     }
 
     @Test
-    public void mgetAsValues() throws Exception {
+    public void defaultMethod() {
+
+        StatefulRedisConnection<byte[], byte[]> connection = client.connect(ByteArrayCodec.INSTANCE);
+        RedisCommandFactory factory = new RedisCommandFactory(connection);
+
+        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
+
+        api.setSync(key, value, Timeout.create(10, TimeUnit.SECONDS));
+
+        assertThat(api.getAsBytes()).isEqualTo("value".getBytes());
+
+        connection.close();
+    }
+
+    @Test
+    public void mgetAsValues() {
 
         redis.set(key, value);
 
@@ -64,10 +79,14 @@ public void mgetAsValues() throws Exception {
         assertThat(values.get(1)).isEqualTo(Value.empty());
     }
 
-    static interface MultipleExecutionModels extends Commands {
+    interface MultipleExecutionModels extends Commands {
 
         String get(String key);
 
+        default byte[] getAsBytes() {
+            return getAsBytes("key");
+        }
+
         @Command("GET")
         byte[] getAsBytes(String key);
 

From 3c423f3298ebe9af656025509da998e4e9124a37 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 24 Jun 2017 21:44:15 +0200
Subject: [PATCH 246/808] Polishing

Reduce warnings. Refactor code to methods.
---
 .../io/lettuce/core/AbstractRedisClient.java  | 10 ++-
 .../java/io/lettuce/core/ClientOptions.java   |  3 +-
 .../core/FutureSyncInvocationHandler.java     | 24 ++++---
 .../io/lettuce/core/GeoRadiusStoreArgs.java   | 11 ++--
 .../java/io/lettuce/core/MigrateArgs.java     | 15 ++---
 .../io/lettuce/core/RedisChannelHandler.java  |  4 +-
 .../io/lettuce/core/RedisCommandBuilder.java  | 33 +++++-----
 .../java/io/lettuce/core/RedisPublisher.java  | 16 ++---
 .../java/io/lettuce/core/ScoredValue.java     |  3 +-
 .../core/cluster/AsyncExecutionsImpl.java     | 11 ++--
 .../core/cluster/ClusterClientOptions.java    |  3 +-
 .../ClusterDistributionChannelWriter.java     |  3 +-
 .../ClusterFutureSyncInvocationHandler.java   | 49 +++++++++------
 .../NodeSelectionInvocationHandler.java       | 22 ++++---
 .../core/cluster/ReactiveExecutionsImpl.java  |  6 +-
 ...RedisAdvancedClusterAsyncCommandsImpl.java |  4 +-
 ...isAdvancedClusterReactiveCommandsImpl.java |  2 +-
 .../core/cluster/RedisClusterClient.java      |  6 +-
 .../core/cluster/SyncExecutionsImpl.java      |  6 +-
 ...ynchronizingClusterConnectionProvider.java |  8 ++-
 .../topology/RedisClusterNodeSnapshot.java    |  3 +-
 .../io/lettuce/core/dynamic/BatchTasks.java   |  3 +-
 .../CodecAwareMethodParametersAccessor.java   |  1 +
 .../dynamic/CommandCreationException.java     |  1 +
 .../lettuce/core/dynamic/CommandFactory.java  |  1 +
 .../core/dynamic/CommandFactoryResolver.java  |  1 +
 .../dynamic/CommandMethodSyntaxException.java |  1 +
 .../core/dynamic/CommandMethodVerifier.java   |  1 +
 .../core/dynamic/ConversionService.java       |  5 +-
 .../DefaultMethodParametersAccessor.java      |  9 +--
 .../ExecutableCommandLookupStrategy.java      |  1 +
 .../core/dynamic/RedisCommandFactory.java     |  4 +-
 .../core/dynamic/batch/BatchException.java    |  1 +
 .../codec/AnnotationRedisCodecResolver.java   | 63 ++++++++++---------
 .../intercept/InvocationProxyFactory.java     |  4 +-
 .../dynamic/output/CommandOutputFactory.java  |  3 +-
 .../core/dynamic/output/OutputRegistry.java   | 17 ++---
 ...tRegistryCommandOutputFactoryResolver.java |  7 ++-
 .../core/dynamic/output/OutputType.java       |  9 +--
 .../masterslave/MasterSlaveChannelWriter.java |  3 +-
 .../core/metrics/CommandLatencyId.java        |  3 +-
 .../lettuce/core/protocol/CommandWrapper.java | 12 +++-
 .../core/protocol/RedisStateMachine.java      |  2 +-
 .../io/lettuce/core/resource/Futures.java     | 17 +++--
 .../core/support/ConnectionPoolSupport.java   | 37 ++++++-----
 .../dynamic/output/OutputRegistryTest.java    |  2 +-
 46 files changed, 254 insertions(+), 196 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index ca77a6738a..444ce7c94f 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -15,6 +15,9 @@
  */
 package io.lettuce.core;
 
+import static java.util.concurrent.CompletableFuture.allOf;
+import static java.util.concurrent.CompletableFuture.completedFuture;
+
 import java.io.Closeable;
 import java.net.SocketAddress;
 import java.util.ArrayList;
@@ -257,7 +260,7 @@ protected <K, V, T extends RedisChannelHandler<K, V>> ConnectionFuture<T> initia
                 return;
             }
 
-            CompletableFuture<Boolean> initFuture = (CompletableFuture<Boolean>) initializer.channelInitialized();
+            CompletableFuture<Boolean> initFuture = initializer.channelInitialized();
             initFuture.whenComplete((success, throwable) -> {
 
                 if (throwable == null) {
@@ -332,6 +335,7 @@ public CompletableFuture<Void> shutdownAsync() {
      * @param timeUnit the unit of {@code quietPeriod} and {@code timeout}
      * @since 4.4
      */
+    @SuppressWarnings("rawtypes")
     public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, TimeUnit timeUnit) {
 
         if (shutdown.compareAndSet(false, true)) {
@@ -375,10 +379,10 @@ public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, Tim
                 }
             }
 
-            return CompletableFuture.allOf(closeFutures.toArray(new CompletableFuture[closeFutures.size()]));
+            return allOf(closeFutures.toArray(new CompletableFuture[0]));
         }
 
-        return CompletableFuture.completedFuture(null);
+        return completedFuture(null);
     }
 
     protected int getResourceCount() {
diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index 888f53af80..d5afabd7cb 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
  *
  * @author Mark Paluch
  */
+@SuppressWarnings("serial")
 public class ClientOptions implements Serializable {
 
     public static final boolean DEFAULT_PING_BEFORE_ACTIVATE_CONNECTION = false;
diff --git a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
index 074c577938..bb811a4100 100644
--- a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,12 +26,10 @@
  * Invocation-handler to synchronize API calls which use Futures as backend. This class leverages the need to implement a full
  * sync class which just delegates every request.
  *
- * @param <K> Key type.
- * @param <V> Value type.
  * @author Mark Paluch
  * @since 3.0
  */
-class FutureSyncInvocationHandler<K, V> extends AbstractInvocationHandler {
+class FutureSyncInvocationHandler extends AbstractInvocationHandler {
 
     private final StatefulConnection<?, ?> connection;
     private final Object asyncApi;
@@ -52,21 +50,29 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
             Method targetMethod = this.translator.get(method);
             Object result = targetMethod.invoke(asyncApi, args);
 
-            if (result instanceof RedisFuture) {
+            if (result instanceof RedisFuture<?>) {
+
                 RedisFuture<?> command = (RedisFuture<?>) result;
-                if (!method.getName().equals("exec") && !method.getName().equals("multi")) {
-                    if (connection instanceof StatefulRedisConnection && ((StatefulRedisConnection) connection).isMulti()) {
-                        return null;
-                    }
+
+                if (isNonTxControlMethod(method.getName()) && isTransactionActive(connection)) {
+                    return null;
                 }
 
                 LettuceFutures.awaitOrCancel(command, connection.getTimeout(), connection.getTimeoutUnit());
                 return command.get();
             }
+
             return result;
         } catch (InvocationTargetException e) {
             throw e.getTargetException();
         }
+    }
+
+    private static boolean isTransactionActive(StatefulConnection<?, ?> connection) {
+        return connection instanceof StatefulRedisConnection && ((StatefulRedisConnection) connection).isMulti();
+    }
 
+    private static boolean isNonTxControlMethod(String methodName) {
+        return !methodName.equals("exec") && !methodName.equals("multi");
     }
 }
diff --git a/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java b/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
index bc35e55acb..65773f9016 100644
--- a/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
+++ b/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,8 +33,8 @@ public class GeoRadiusStoreArgs<K> implements CompositeArgument {
     private Sort sort = Sort.none;
 
     /**
-     * Store the resulting members with their location in the new Geo set {@code storeKey}.
-     * Cannot be used together with {@link #withStoreDist(Object)}.
+     * Store the resulting members with their location in the new Geo set {@code storeKey}. Cannot be used together with
+     * {@link #withStoreDist(Object)}.
      *
      * @param storeKey the destination key.
      * @return {@code this}
@@ -46,8 +46,8 @@ public GeoRadiusStoreArgs withStore(K storeKey) {
     }
 
     /**
-     * Store the resulting members with their distance in the sorted set {@code storeKey}.
-     * Cannot be used together with {@link #withStore(Object)}.
+     * Store the resulting members with their distance in the sorted set {@code storeKey}. Cannot be used together with
+     * {@link #withStore(Object)}.
      *
      * @param storeKey the destination key.
      * @return {@code this}
@@ -117,6 +117,7 @@ public GeoRadiusStoreArgs sort(Sort sort) {
         return this;
     }
 
+    @SuppressWarnings("unchecked")
     public <K, V> void build(CommandArgs<K, V> args) {
 
         if (sort != null && sort != Sort.none) {
diff --git a/src/main/java/io/lettuce/core/MigrateArgs.java b/src/main/java/io/lettuce/core/MigrateArgs.java
index 93d85e2755..1d943034c2 100644
--- a/src/main/java/io/lettuce/core/MigrateArgs.java
+++ b/src/main/java/io/lettuce/core/MigrateArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package io.lettuce.core;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import io.lettuce.core.internal.LettuceAssert;
@@ -25,8 +24,8 @@
 import io.lettuce.core.protocol.CommandType;
 
 /**
- * Argument list builder for the new redis <a href="http://redis.io/commands/migrate">MIGRATE</a> command. Static import
- * the methods from {@link Builder} and chain the method calls: {@code ex(10).nx()}.
+ * Argument list builder for the new redis <a href="http://redis.io/commands/migrate">MIGRATE</a> command. Static import the
+ * methods from {@link Builder} and chain the method calls: {@code ex(10).nx()}.
  *
  * @author Mark Paluch
  */
@@ -94,9 +93,8 @@ public final MigrateArgs<K> keys(K... keys) {
 
     public MigrateArgs<K> keys(Iterable<K> keys) {
         LettuceAssert.notNull(keys, "Keys must not be null");
-        Iterator<K> iterator = keys.iterator();
-        while (iterator.hasNext()) {
-            this.keys.add(iterator.next());
+        for (K key : keys) {
+            this.keys.add(key);
         }
         return this;
     }
@@ -114,8 +112,7 @@ public <K, V> void build(CommandArgs<K, V> args) {
 
         if (keys.size() > 1) {
             args.add(CommandType.KEYS);
-            args.addKeys((Iterable<K>) keys);
+            args.addKeys((List<K>) keys);
         }
-
     }
 }
diff --git a/src/main/java/io/lettuce/core/RedisChannelHandler.java b/src/main/java/io/lettuce/core/RedisChannelHandler.java
index 554d843074..6cea480fa8 100644
--- a/src/main/java/io/lettuce/core/RedisChannelHandler.java
+++ b/src/main/java/io/lettuce/core/RedisChannelHandler.java
@@ -26,7 +26,6 @@
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.ConnectionFacade;
 import io.lettuce.core.protocol.RedisCommand;
-
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -212,8 +211,9 @@ public TimeUnit getTimeoutUnit() {
         return unit;
     }
 
+    @SuppressWarnings("unchecked")
     protected <T> T syncHandler(Object asyncApi, Class<?>... interfaces) {
-        FutureSyncInvocationHandler<K, V> h = new FutureSyncInvocationHandler<>((StatefulConnection) this, asyncApi, interfaces);
+        FutureSyncInvocationHandler h = new FutureSyncInvocationHandler((StatefulConnection<?, ?>) this, asyncApi, interfaces);
         return (T) Proxy.newProxyInstance(AbstractRedisClient.class.getClassLoader(), interfaces, h);
     }
 
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index a0cd922a0a..1a204614ca 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -2705,14 +2705,13 @@ public Command<K, V, Long> georadiusbymember(K key, V member, double distance, S
         return createCommand(GEORADIUSBYMEMBER, new IntegerOutput<K, V>(codec), args);
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     public Command<K, V, List<GeoCoordinates>> geopos(K key, V[] members) {
         notNullKey(key);
         LettuceAssert.notNull(members, "Members " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(members, "Members " + MUST_NOT_BE_EMPTY);
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValues(members);
 
-        return (Command) createCommand(GEOPOS, new GeoCoordinatesListOutput<K, V>(codec), args);
+        return createCommand(GEOPOS, new GeoCoordinatesListOutput<K, V>(codec), args);
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -2739,67 +2738,67 @@ public Command<K, V, Double> geodist(K key, V from, V to, GeoArgs.Unit unit) {
         return createCommand(GEODIST, new DoubleOutput<K, V>(codec), args);
     }
 
-    public void notNull(ScoredValueStreamingChannel<?> channel) {
+    public static void notNull(ScoredValueStreamingChannel<?> channel) {
         LettuceAssert.notNull(channel, "ScoredValueStreamingChannel " + MUST_NOT_BE_NULL);
     }
 
-    public void notNull(KeyStreamingChannel<?> channel) {
+    public static void notNull(KeyStreamingChannel<?> channel) {
         LettuceAssert.notNull(channel, "KeyValueStreamingChannel " + MUST_NOT_BE_NULL);
     }
 
-    public void notNull(ValueStreamingChannel<?> channel) {
+    public static void notNull(ValueStreamingChannel<?> channel) {
         LettuceAssert.notNull(channel, "ValueStreamingChannel " + MUST_NOT_BE_NULL);
     }
 
-    public void notNull(KeyValueStreamingChannel<?, ?> channel) {
+    public static void notNull(KeyValueStreamingChannel<?, ?> channel) {
         LettuceAssert.notNull(channel, "KeyValueStreamingChannel " + MUST_NOT_BE_NULL);
     }
 
-    private void notNullKey(K key) {
+    private static void notNullKey(Object key) {
         LettuceAssert.notNull(key, "Key " + MUST_NOT_BE_NULL);
     }
 
-    private void notNullRange(Range<?> range) {
+    private static void notNullRange(Range<?> range) {
         LettuceAssert.notNull(range, "Range " + MUST_NOT_BE_NULL);
     }
 
-    private void notNullLimit(Limit limit) {
+    private static void notNullLimit(Limit limit) {
         LettuceAssert.notNull(limit, "Limit " + MUST_NOT_BE_NULL);
     }
 
-    public void notNullMinMax(String min, String max) {
+    public static void notNullMinMax(String min, String max) {
         LettuceAssert.notNull(min, "Min " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(max, "Max " + MUST_NOT_BE_NULL);
     }
 
-    private void notEmpty(K[] keys) {
+    private static void notEmpty(Object[] keys) {
         LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(keys, "Keys " + MUST_NOT_BE_EMPTY);
     }
 
-    private void notEmptyValues(V[] values) {
+    private static void notEmptyValues(Object[] values) {
         LettuceAssert.notNull(values, "Values " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(values, "Values " + MUST_NOT_BE_EMPTY);
     }
 
-    private void assertNodeId(String nodeId) {
+    private static void assertNodeId(String nodeId) {
         LettuceAssert.notNull(nodeId, "NodeId " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(nodeId, "NodeId " + MUST_NOT_BE_EMPTY);
     }
 
-    private void notEmptySlots(int[] slots) {
+    private static void notEmptySlots(int[] slots) {
         LettuceAssert.notNull(slots, "Slots " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(slots, "Slots " + MUST_NOT_BE_EMPTY);
     }
 
-    private void addLimit(CommandArgs<K, V> args, Limit limit) {
+    private static void addLimit(CommandArgs<?, ?> args, Limit limit) {
 
         if (limit.isLimited()) {
             args.add(LIMIT).add(limit.getOffset()).add(limit.getCount());
         }
     }
 
-    private String min(Range<? extends Number> range) {
+    private static String min(Range<? extends Number> range) {
 
         Range.Boundary<? extends Number> lower = range.getLower();
 
@@ -2815,7 +2814,7 @@ private String min(Range<? extends Number> range) {
         return lower.getValue().toString();
     }
 
-    private String max(Range<? extends Number> range) {
+    private static String max(Range<? extends Number> range) {
 
         Range.Boundary<? extends Number> upper = range.getUpper();
 
diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index 75ed457f6c..ade32934e9 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,6 @@
 import reactor.core.Exceptions;
 import reactor.core.publisher.Operators;
 import reactor.util.concurrent.QueueSupplier;
-
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.internal.LettuceAssert;
@@ -39,7 +38,6 @@
 import io.lettuce.core.protocol.CommandWrapper;
 import io.lettuce.core.protocol.DemandAware;
 import io.lettuce.core.protocol.RedisCommand;
-
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -50,8 +48,8 @@
  * individual elements instead of emitting collections. This publisher allows multiple subscriptions if it's backed by a
  * {@link Supplier command supplier}.
  * <p>
- * When using streaming outputs ({@link io.lettuce.core.output.CommandOutput} that implement {@link StreamingOutput})
- * elements are emitted as they are decoded. Otherwise, results are processed at command completion.
+ * When using streaming outputs ({@link io.lettuce.core.output.CommandOutput} that implement {@link StreamingOutput}) elements
+ * are emitted as they are decoded. Otherwise, results are processed at command completion.
  *
  * @author Mark Paluch
  * @since 5.0
@@ -129,6 +127,7 @@ static class RedisSubscription<T> implements Subscription, StreamingOutput.Subsc
 
         static final InternalLogger LOG = InternalLoggerFactory.getInstance(RedisPublisher.class);
 
+        @SuppressWarnings({ "rawtypes", "unchecked" })
         static final AtomicLongFieldUpdater<RedisSubscription> DEMAND = AtomicLongFieldUpdater.newUpdater(
                 RedisSubscription.class, "demand");
 
@@ -142,6 +141,8 @@ static class RedisSubscription<T> implements Subscription, StreamingOutput.Subsc
         final AtomicReference<State> state = new AtomicReference<>(State.UNSUBSCRIBED);
         final AtomicReference<CommandDispatch> commandDispatch = new AtomicReference<>(CommandDispatch.UNDISPATCHED);
 
+        @SuppressWarnings("unused")
+        // accessed via AtomicLongFieldUpdater
         volatile long demand;
         volatile boolean allDataRead = false;
 
@@ -291,7 +292,7 @@ protected T read() {
         }
 
         private boolean hasDemand() {
-            return this.demand > 0;
+            return DEMAND.get(this) > 0;
         }
 
         private boolean changeState(State oldState, State newState) {
@@ -605,7 +606,8 @@ public SubscriptionCommand(RedisCommand<K, V, T> command, RedisSubscription<T> s
         public boolean hasDemand() {
 
             // signal demand as completed commands just no-op on incoming data.
-            return completed || subscription.state() == State.COMPLETED || subscription.demand > subscription.data.size();
+            return completed || subscription.state() == State.COMPLETED
+                    || RedisSubscription.DEMAND.get(subscription) > subscription.data.size();
         }
 
         @Override
diff --git a/src/main/java/io/lettuce/core/ScoredValue.java b/src/main/java/io/lettuce/core/ScoredValue.java
index 9977258381..0dd867f19b 100644
--- a/src/main/java/io/lettuce/core/ScoredValue.java
+++ b/src/main/java/io/lettuce/core/ScoredValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
  * @author Will Glozer
  * @author Mark Paluch
  */
+@SuppressWarnings("serial")
 public class ScoredValue<V> extends Value<V> {
 
     private static final ScoredValue<Object> EMPTY = new ScoredValue<>(0, null);
diff --git a/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
index 816f47978b..07b3b84e84 100644
--- a/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 
 import io.lettuce.core.cluster.api.async.AsyncExecutions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
@@ -28,8 +29,10 @@ class AsyncExecutionsImpl<T> implements AsyncExecutions<T> {
 
     private Map<RedisClusterNode, CompletableFuture<T>> executions;
 
-    public AsyncExecutionsImpl(Map<RedisClusterNode, CompletableFuture<T>> executions) {
-        this.executions = Collections.unmodifiableMap(new HashMap<>(executions));
+    @SuppressWarnings("unchecked")
+    public AsyncExecutionsImpl(Map<RedisClusterNode, CompletionStage<? extends T>> executions) {
+        Map<RedisClusterNode, CompletionStage<? extends T>> map = new HashMap<>(executions);
+        this.executions = Collections.unmodifiableMap((Map) map);
     }
 
     @Override
@@ -55,6 +58,6 @@ public CompletableFuture<T> get(RedisClusterNode redisClusterNode) {
     @Override
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public CompletableFuture<T>[] futures() {
-        return executions.values().toArray(new CompletableFuture[executions.size()]);
+        return executions.values().toArray(new CompletableFuture[0]);
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index 893060c4a3..491d331fb2 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
  *
  * @author Mark Paluch
  */
+@SuppressWarnings("serial")
 public class ClusterClientOptions extends ClientOptions {
 
     public static final boolean DEFAULT_REFRESH_CLUSTER_VIEW = false;
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index ba3c47c649..4797d88cbd 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -158,8 +158,7 @@ private static <K, V> void writeCommand(RedisCommand<K, V, ?> command, boolean a
         try {
 
             if (asking) { // set asking bit
-                StatefulRedisConnection<K, V> statefulRedisConnection = (StatefulRedisConnection<K, V>) connection;
-                statefulRedisConnection.async().asking();
+                connection.async().asking();
             }
 
             writeCommand(command, ((RedisChannelHandler<K, V>) connection).getChannelWriter());
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
index 04f467048a..b11b6c112d 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
@@ -81,24 +81,7 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
             }
 
             if (method.getName().equals("getConnection") && args.length > 0) {
-                Method targetMethod = connectionMethodCache.computeIfAbsent(method, key -> {
-                    try {
-                        return connection.getClass().getMethod(key.getName(), key.getParameterTypes());
-                    } catch (NoSuchMethodException e) {
-                        throw new IllegalStateException(e);
-                    }
-                });
-
-                Object result = targetMethod.invoke(connection, args);
-                if (result instanceof StatefulRedisClusterConnection) {
-                    StatefulRedisClusterConnection<K, V> connection = (StatefulRedisClusterConnection<K, V>) result;
-                    return connection.sync();
-                }
-
-                if (result instanceof StatefulRedisConnection) {
-                    StatefulRedisConnection<K, V> connection = (StatefulRedisConnection<K, V>) result;
-                    return connection.sync();
-                }
+                return getConnection(method, args);
             }
 
             if (method.getName().equals("readonly") && args.length == 1) {
@@ -141,13 +124,39 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
         }
     }
 
+    private Object getConnection(Method method, Object[] args) throws Exception {
+
+        Method targetMethod = connectionMethodCache.computeIfAbsent(method, this::lookupMethod);
+
+        Object result = targetMethod.invoke(connection, args);
+        if (result instanceof StatefulRedisClusterConnection) {
+            StatefulRedisClusterConnection<K, V> connection = (StatefulRedisClusterConnection<K, V>) result;
+            return connection.sync();
+        }
+
+        if (result instanceof StatefulRedisConnection) {
+            StatefulRedisConnection<K, V> connection = (StatefulRedisConnection<K, V>) result;
+            return connection.sync();
+        }
+
+        throw new IllegalArgumentException("Cannot call method " + method);
+    }
+
+    private Method lookupMethod(Method key) {
+        try {
+            return connection.getClass().getMethod(key.getName(), key.getParameterTypes());
+        } catch (NoSuchMethodException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
     protected Object nodes(Predicate<RedisClusterNode> predicate, ClusterConnectionProvider.Intent intent, boolean dynamic) {
 
         NodeSelectionSupport<RedisCommands<K, V>, ?> selection = null;
 
         if (connection instanceof StatefulRedisClusterConnectionImpl) {
 
-            StatefulRedisClusterConnectionImpl impl = (StatefulRedisClusterConnectionImpl) connection;
+            StatefulRedisClusterConnectionImpl<K, V> impl = (StatefulRedisClusterConnectionImpl<K, V>) connection;
 
             if (dynamic) {
                 selection = new DynamicNodeSelection<RedisCommands<K, V>, Object, K, V>(
@@ -161,7 +170,7 @@ protected Object nodes(Predicate<RedisClusterNode> predicate, ClusterConnectionP
 
         if (connection instanceof StatefulRedisClusterPubSubConnectionImpl) {
 
-            StatefulRedisClusterPubSubConnectionImpl impl = (StatefulRedisClusterPubSubConnectionImpl) connection;
+            StatefulRedisClusterPubSubConnectionImpl<K, V> impl = (StatefulRedisClusterPubSubConnectionImpl<K, V>) connection;
             selection = new StaticNodeSelection<RedisCommands<K, V>, Object, K, V>(impl.getClusterDistributionChannelWriter(),
                     predicate, intent, StatefulRedisConnection::sync);
         }
diff --git a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
index 7da850f1a9..a418673f0f 100644
--- a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
@@ -21,6 +21,8 @@
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
+import org.reactivestreams.Publisher;
+
 import io.lettuce.core.RedisCommandExecutionException;
 import io.lettuce.core.RedisCommandInterruptedException;
 import io.lettuce.core.RedisCommandTimeoutException;
@@ -150,9 +152,15 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
     @SuppressWarnings("unchecked")
     private Object getExecutions(Map<RedisClusterNode, Object> executions) throws ExecutionException, InterruptedException {
 
+        if (executionModel == ExecutionModel.REACTIVE) {
+            Map<RedisClusterNode, CompletionStage<? extends Publisher<?>>> reactiveExecutions = (Map) executions;
+            return new ReactiveExecutionsImpl<>(reactiveExecutions);
+        }
+
+        Map<RedisClusterNode, CompletionStage<?>> asyncExecutions = (Map) executions;
+
         if (executionModel == ExecutionModel.SYNC) {
 
-            Map<RedisClusterNode, CompletionStage<?>> asyncExecutions = (Map) executions;
             if (!awaitAll(timeout, unit, asyncExecutions.values())) {
                 throw createTimeoutException(asyncExecutions);
             }
@@ -161,14 +169,10 @@ private Object getExecutions(Map<RedisClusterNode, Object> executions) throws Ex
                 throw createExecutionException(asyncExecutions);
             }
 
-            return new SyncExecutionsImpl(asyncExecutions);
-        }
-
-        if (executionModel == ExecutionModel.REACTIVE) {
-            return new ReactiveExecutionsImpl(executions);
+            return new SyncExecutionsImpl<>(asyncExecutions);
         }
 
-        return new AsyncExecutionsImpl(executions);
+        return new AsyncExecutionsImpl<>(asyncExecutions);
     }
 
     private static boolean awaitAll(long timeout, TimeUnit unit, Collection<CompletionStage<?>> futures) {
@@ -257,7 +261,7 @@ private String getNodeDescription(List<RedisClusterNode> notFinished) {
 
     private String getDescriptor(RedisClusterNode redisClusterNode) {
 
-        StringBuffer buffer = new StringBuffer(redisClusterNode.getNodeId());
+        StringBuilder buffer = new StringBuilder(redisClusterNode.getNodeId());
         buffer.append(" (");
 
         if (redisClusterNode.getUri() != null) {
@@ -291,6 +295,6 @@ private Method findMethod(Class<?> type, Method method, Map<Method, Method> cach
     }
 
     enum ExecutionModel {
-        SYNC, ASYNC, REACTIVE;
+        SYNC, ASYNC, REACTIVE
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
index ad560765a6..0ababfad34 100644
--- a/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
@@ -17,7 +17,7 @@
 
 import java.util.Collection;
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 
 import org.reactivestreams.Publisher;
 
@@ -34,9 +34,9 @@
  */
 class ReactiveExecutionsImpl<T> implements ReactiveExecutions<T> {
 
-    private Map<RedisClusterNode, CompletableFuture<? extends Publisher<T>>> executions;
+    private Map<RedisClusterNode, CompletionStage<? extends Publisher<? extends T>>> executions;
 
-    public ReactiveExecutionsImpl(Map<RedisClusterNode, CompletableFuture<? extends Publisher<T>>> executions) {
+    public ReactiveExecutionsImpl(Map<RedisClusterNode, CompletionStage<? extends Publisher<? extends T>>> executions) {
         this.executions = executions;
     }
 
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index f5831664da..8d67bc4c80 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -183,7 +183,7 @@ public RedisFuture<List<KeyValue<K, V>>> mget(Iterable<K> keys) {
 
     @Override
     public RedisFuture<Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys) {
-       return mget(channel, Arrays.asList(keys));
+        return mget(channel, Arrays.asList(keys));
     }
 
     @Override
@@ -518,7 +518,7 @@ protected AsyncNodeSelection<K, V> nodes(Predicate<RedisClusterNode> predicate,
 
         NodeSelectionSupport<RedisAsyncCommands<K, V>, ?> selection;
 
-        StatefulRedisClusterConnectionImpl impl = (StatefulRedisClusterConnectionImpl) getConnection();
+        StatefulRedisClusterConnectionImpl<K, V> impl = (StatefulRedisClusterConnectionImpl<K, V>) getConnection();
         if (dynamic) {
             selection = new DynamicNodeSelection<RedisAsyncCommands<K, V>, Object, K, V>(
                     impl.getClusterDistributionChannelWriter(), predicate, intent, StatefulRedisConnection::async);
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index ebf69e4c04..f2c8a233ab 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -140,7 +140,7 @@ public Flux<KeyValue<K, V>> mget(K... keys) {
         return mget(Arrays.asList(keys));
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public Flux<KeyValue<K, V>> mget(Iterable<K> keys) {
 
         List<K> keyList = LettuceLists.newList(keys);
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 60c46a091f..507061b3b6 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -472,13 +472,13 @@ <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNode
 
         logger.debug("connectPubSubToNode(" + nodeId + ")");
 
-        PubSubEndpoint endpoint = new PubSubEndpoint(clientOptions);
+        PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<>(clientOptions);
         StatefulRedisPubSubConnectionImpl<K, V> connection = new StatefulRedisPubSubConnectionImpl<>(endpoint, endpoint, codec,
                 timeout, unit);
 
         ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectionFuture = connectStatefulAsync(connection, endpoint,
-                getFirstUri(), socketAddressSupplier, () -> new PubSubCommandHandler<K, V>(clientOptions, clientResources,
-                        codec, endpoint));
+                getFirstUri(), socketAddressSupplier, () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec,
+                        endpoint));
         return connectionFuture.whenComplete((conn, throwable) -> {
             if (throwable != null) {
                 connection.close();
diff --git a/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java
index ff8606a54f..3aafab5316 100644
--- a/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,11 +32,11 @@ class SyncExecutionsImpl<T> implements Executions<T> {
 
     private Map<RedisClusterNode, T> executions;
 
-    public SyncExecutionsImpl(Map<RedisClusterNode, CompletionStage<T>> executions) throws ExecutionException,
+    public SyncExecutionsImpl(Map<RedisClusterNode, CompletionStage<? extends T>> executions) throws ExecutionException,
             InterruptedException {
 
         Map<RedisClusterNode, T> result = new HashMap<>(executions.size(), 1);
-        for (Map.Entry<RedisClusterNode, CompletionStage<T>> entry : executions.entrySet()) {
+        for (Map.Entry<RedisClusterNode, CompletionStage<? extends T>> entry : executions.entrySet()) {
             result.put(entry.getKey(), entry.getValue().toCompletableFuture().get());
         }
 
diff --git a/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
index 20cdba993c..95fde38950 100644
--- a/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
@@ -48,6 +48,7 @@ class SynchronizingClusterConnectionProvider<K, V> {
 
     private final ClusterNodeConnectionFactory<K, V> connectionFactory;
     private final Map<ConnectionKey, Sync<K, V>> connections = new ConcurrentHashMap<>();
+
     private volatile boolean closed;
 
     /**
@@ -117,13 +118,13 @@ private Sync<K, V> getConnectionSync(ConnectionKey key) {
     /**
      * @return number of established connections.
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public int getConnectionCount() {
 
-        Sync<K, V>[] syncs = connections.values().toArray(new Sync[0]);
+        Object[] syncs = connections.values().toArray(new Object[0]);
         int count = 0;
 
-        for (Sync<K, V> sync : syncs) {
+        for (Object sync : syncs) {
             if (sync instanceof Finished) {
                 count++;
             }
@@ -242,6 +243,7 @@ static class InProgress<K, V> implements Sync<K, V> {
         private static final int ST_IN_PROGRESS = 0;
         private static final int ST_FINISHED = 1;
 
+        @SuppressWarnings({ "rawtypes", "unchecked" })
         private final static AtomicIntegerFieldUpdater<InProgress> REMOVE = AtomicIntegerFieldUpdater.newUpdater(
                 InProgress.class, "remove");
 
diff --git a/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java b/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java
index a0493fc326..f43f4a60cd 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 /**
  * @author Mark Paluch
  */
+@SuppressWarnings("serial")
 class RedisClusterNodeSnapshot extends RedisClusterNode {
 
     private Long latencyNs;
diff --git a/src/main/java/io/lettuce/core/dynamic/BatchTasks.java b/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
index b2b7790a0a..cb555f4f58 100644
--- a/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
@@ -42,7 +42,8 @@ class BatchTasks implements Iterable<RedisCommand<?, ?, ?>> {
         return futures.iterator();
     }
 
+    @SuppressWarnings("rawtypes")
     public RedisCommand<?, ?, ?>[] toArray() {
-        return futures.toArray(new RedisCommand[futures.size()]);
+        return futures.toArray(new RedisCommand[0]);
     }
 }
diff --git a/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java
index 79d9e8899e..9370d8ad4c 100644
--- a/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java
+++ b/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java
@@ -126,6 +126,7 @@ public static class TypeContext {
         final TypeInformation<?> keyType;
         final TypeInformation<?> valueType;
 
+        @SuppressWarnings("rawtypes")
         public TypeContext(RedisCodec<?, ?> redisCodec) {
 
             LettuceAssert.notNull(redisCodec, "RedisCodec must not be null");
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java b/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java
index b04affc79b..b3bf56a221 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java
@@ -23,6 +23,7 @@
  * @author Mark Paluch
  * @since 5.0
  */
+@SuppressWarnings("serial")
 public class CommandCreationException extends RedisException {
 
     private final CommandMethod commandMethod;
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandFactory.java b/src/main/java/io/lettuce/core/dynamic/CommandFactory.java
index cfdb685212..1b71f8c176 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandFactory.java
@@ -25,6 +25,7 @@
  * @author Mark Paluch
  * @since 5.0
  */
+@FunctionalInterface
 interface CommandFactory {
 
     /**
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java
index df254b859f..52c2380055 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java
@@ -20,6 +20,7 @@
  *
  * @since 5.0
  */
+@FunctionalInterface
 interface CommandFactoryResolver {
 
     /**
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java b/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java
index 3be70bec07..7c8eccbfb6 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java
@@ -21,6 +21,7 @@
  * @author Mark Paluch
  * @since 5.0
  */
+@SuppressWarnings("serial")
 public class CommandMethodSyntaxException extends CommandCreationException {
 
     /**
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java b/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java
index 4c6d73cf17..f7ae87870a 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java
@@ -23,6 +23,7 @@
  * @author Mark Paluch
  * @since 5.0
  */
+@FunctionalInterface
 interface CommandMethodVerifier {
 
     /**
diff --git a/src/main/java/io/lettuce/core/dynamic/ConversionService.java b/src/main/java/io/lettuce/core/dynamic/ConversionService.java
index 9d86c905dd..a168d830a9 100644
--- a/src/main/java/io/lettuce/core/dynamic/ConversionService.java
+++ b/src/main/java/io/lettuce/core/dynamic/ConversionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,14 +37,13 @@ class ConversionService {
      *
      * @param converter the converter.
      */
+    @SuppressWarnings("rawtypes")
     public void addConverter(Function<?, ?> converter) {
 
         LettuceAssert.notNull(converter, "Converter must not be null");
 
         ClassTypeInformation<? extends Function> classTypeInformation = ClassTypeInformation.from(converter.getClass());
-
         TypeInformation<?> typeInformation = classTypeInformation.getSuperTypeInformation(Function.class);
-
         List<TypeInformation<?>> typeArguments = typeInformation.getTypeArguments();
 
         ConvertiblePair pair = new ConvertiblePair(typeArguments.get(0).getType(), typeArguments.get(1).getType());
diff --git a/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
index 61392d65ab..e1ac4de759 100644
--- a/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
+++ b/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,10 +35,10 @@
  */
 class DefaultMethodParametersAccessor implements MethodParametersAccessor {
 
-    private final Parameters parameters;
+    private final Parameters<? extends Parameter> parameters;
     private final List<Object> values;
 
-    public DefaultMethodParametersAccessor(Parameters parameters, Object... values) {
+    public DefaultMethodParametersAccessor(Parameters<? extends Parameter> parameters, Object... values) {
 
         LettuceAssert.notNull(parameters, "Parameters must not be null");
         LettuceAssert.notNull(values, "Values must not be null");
@@ -74,7 +74,8 @@ public Iterator<Object> iterator() {
     @Override
     public int resolveParameterIndex(String name) {
 
-        List<Parameter> bindableParameters = parameters.getBindableParameters();
+        List<? extends Parameter> bindableParameters = parameters.getBindableParameters();
+
         for (int i = 0; i < bindableParameters.size(); i++) {
 
             if (name.equals(bindableParameters.get(i).getName())) {
diff --git a/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java
index 068b9e22b6..2c01704907 100644
--- a/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java
@@ -23,6 +23,7 @@
  * @author Mark Paluch
  * @since 5.0
  */
+@FunctionalInterface
 interface ExecutableCommandLookupStrategy {
 
     /**
diff --git a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
index 8be859273f..55e681e9ef 100644
--- a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -228,6 +228,7 @@ private boolean hasFactoryFor(Method method) {
         }
     }
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     class CompositeCommandLookupStrategy implements ExecutableCommandLookupStrategy {
 
         private final AsyncExecutableCommandLookupStrategy async;
@@ -266,6 +267,7 @@ public ExecutableCommand resolveCommandMethod(CommandMethod method, RedisCommand
         }
     }
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     class BatchAwareCommandLookupStrategy implements ExecutableCommandLookupStrategy {
 
         private final ExecutableCommandLookupStrategy fallbackStrategy;
diff --git a/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java b/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java
index 8daadcb95e..5564d55eb3 100644
--- a/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java
@@ -32,6 +32,7 @@
  * @see BatchSize
  * @see CommandBatching
  */
+@SuppressWarnings("serial")
 public class BatchException extends RedisCommandExecutionException {
 
     private final List<RedisCommand<?, ?, ?>> failedCommands;
diff --git a/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
index 771d50b42c..0167445962 100644
--- a/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -89,34 +89,7 @@ public AnnotationRedisCodecResolver(List<RedisCodec<?, ?>> codecs) {
                 .collect(Collectors.toList());
 
         commandMethod.getParameters().getBindableParameters().forEach(parameter -> {
-
-            for (Voted<RedisCodec<?, ?>> vote : votes) {
-
-                ClassTypeInformation<? extends RedisCodec> typeInformation = ClassTypeInformation.from(vote.subject.getClass());
-
-                TypeInformation<?> superTypeInformation = typeInformation.getSuperTypeInformation(RedisCodec.class);
-
-                List<TypeInformation<?>> typeArguments = superTypeInformation.getTypeArguments();
-
-                if (typeArguments.size() != 2) {
-                    continue;
-                }
-
-                TypeInformation<?> parameterType = parameter.getTypeInformation();
-                TypeInformation<?> parameterKeyType = ParameterWrappers.getKeyType(parameterType);
-                TypeInformation<?> parameterValueType = ParameterWrappers.getValueType(parameterType);
-
-                TypeInformation<?> keyType = typeArguments.get(0);
-                TypeInformation<?> valueType = typeArguments.get(1);
-
-                if (keyType.isAssignableFrom(parameterKeyType)) {
-                    vote.votes++;
-                }
-
-                if (valueType.isAssignableFrom(parameterValueType)) {
-                    vote.votes++;
-                }
-            }
+            vote(votes, parameter);
         });
 
         Collections.sort(votes);
@@ -133,6 +106,38 @@ public AnnotationRedisCodecResolver(List<RedisCodec<?, ?>> codecs) {
         return voted;
     }
 
+    @SuppressWarnings("rawtypes")
+    private static void vote(List<Voted<RedisCodec<?, ?>>> votes, Parameter parameter) {
+
+        for (Voted<RedisCodec<?, ?>> vote : votes) {
+
+            ClassTypeInformation<? extends RedisCodec> typeInformation = ClassTypeInformation.from(vote.subject.getClass());
+
+            TypeInformation<?> superTypeInformation = typeInformation.getSuperTypeInformation(RedisCodec.class);
+
+            List<TypeInformation<?>> typeArguments = superTypeInformation.getTypeArguments();
+
+            if (typeArguments.size() != 2) {
+                continue;
+            }
+
+            TypeInformation<?> parameterType = parameter.getTypeInformation();
+            TypeInformation<?> parameterKeyType = ParameterWrappers.getKeyType(parameterType);
+            TypeInformation<?> parameterValueType = ParameterWrappers.getValueType(parameterType);
+
+            TypeInformation<?> keyType = typeArguments.get(0);
+            TypeInformation<?> valueType = typeArguments.get(1);
+
+            if (keyType.isAssignableFrom(parameterKeyType)) {
+                vote.votes++;
+            }
+
+            if (valueType.isAssignableFrom(parameterValueType)) {
+                vote.votes++;
+            }
+        }
+    }
+
     private RedisCodec<?, ?> resolveCodec(Set<Class<?>> keyTypes, Set<Class<?>> valueTypes) {
 
         Class<?> keyType = keyTypes.isEmpty() ? null : keyTypes.iterator().next();
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
index 9a74e74974..64e740c452 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
@@ -50,12 +50,12 @@ public class InvocationProxyFactory {
      * @param <T> inferred result type.
      * @return the invocation proxy instance.
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public <T> T createProxy(ClassLoader classLoader) {
 
         LettuceAssert.notNull(classLoader, "ClassLoader must not be null");
 
-        Class<?>[] interfaces = this.interfaces.toArray(new Class[this.interfaces.size()]);
+        Class<?>[] interfaces = this.interfaces.toArray(new Class[0]);
 
         return (T) Proxy.newProxyInstance(classLoader, interfaces, new InterceptorChainInvocationHandler(interceptors));
     }
diff --git a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java
index e54f9438b4..e53bc85103 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
  * @author Mark Paluch
  * @since 5.0
  */
+@FunctionalInterface
 public interface CommandOutputFactory {
 
     /**
diff --git a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
index 35983fcbfd..37d8bd179f 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@
  * @since 5.0
  * @see CommandOutput
  */
+@SuppressWarnings("rawtypes")
 public class OutputRegistry {
 
     private final static Map<OutputType, CommandOutputFactory> BUILTIN = new LinkedHashMap<>();
@@ -115,7 +116,7 @@ Map<OutputType, CommandOutputFactory> getRegistry() {
         return registry;
     }
 
-    private static <T extends CommandOutput> void register(Map<OutputType, CommandOutputFactory> registry,
+    private static <T extends CommandOutput<?, ?, ?>> void register(Map<OutputType, CommandOutputFactory> registry,
             Class<T> commandOutputClass, CommandOutputFactory commandOutputFactory) {
 
         List<OutputType> outputTypes = getOutputTypes(commandOutputClass);
@@ -125,7 +126,7 @@ private static <T extends CommandOutput> void register(Map<OutputType, CommandOu
         }
     }
 
-    private static List<OutputType> getOutputTypes(Class<? extends CommandOutput> commandOutputClass) {
+    private static List<OutputType> getOutputTypes(Class<? extends CommandOutput<?, ?, ?>> commandOutputClass) {
 
         OutputType streamingType = getStreamingType(commandOutputClass);
         OutputType componentOutputType = getOutputComponentType(commandOutputClass);
@@ -148,6 +149,7 @@ private static List<OutputType> getOutputTypes(Class<? extends CommandOutput> co
      * @param commandOutputClass
      * @return
      */
+    @SuppressWarnings("rawtypes")
     static OutputType getStreamingType(Class<? extends CommandOutput> commandOutputClass) {
 
         ClassTypeInformation<? extends CommandOutput> classTypeInformation = ClassTypeInformation.from(commandOutputClass);
@@ -167,8 +169,8 @@ public ResolvableType withCodec(RedisCodec<?, ?> codec) {
 
                 TypeInformation<?> typeInformation = ClassTypeInformation.from(codec.getClass());
 
-                ResolvableType resolvableType = ResolvableType.forType(commandOutputClass,
-                        new CodecVariableTypeResolver(typeInformation));
+                ResolvableType resolvableType = ResolvableType.forType(commandOutputClass, new CodecVariableTypeResolver(
+                        typeInformation));
 
                 while (resolvableType != ResolvableType.NONE) {
 
@@ -212,8 +214,8 @@ public ResolvableType withCodec(RedisCodec<?, ?> codec) {
 
                 TypeInformation<?> typeInformation = ClassTypeInformation.from(codec.getClass());
 
-                ResolvableType resolvableType = ResolvableType.forType(commandOutputClass,
-                        new CodecVariableTypeResolver(typeInformation));
+                ResolvableType resolvableType = ResolvableType.forType(commandOutputClass, new CodecVariableTypeResolver(
+                        typeInformation));
 
                 while (!resolvableType.getRawClass().equals(CommandOutput.class)) {
                     resolvableType = resolvableType.getSuperType();
@@ -224,6 +226,7 @@ public ResolvableType withCodec(RedisCodec<?, ?> codec) {
         };
     }
 
+    @SuppressWarnings("serial")
     static class CodecVariableTypeResolver implements ResolvableType.VariableResolver {
 
         private final TypeInformation<?> codecType;
diff --git a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
index a30fdcaa79..772f3a65ca 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,9 +34,10 @@
  * @since 5.0
  * @see OutputRegistry
  */
-public class OutputRegistryCommandOutputFactoryResolver extends CommandOutputResolverSupport
-        implements CommandOutputFactoryResolver {
+public class OutputRegistryCommandOutputFactoryResolver extends CommandOutputResolverSupport implements
+        CommandOutputFactoryResolver {
 
+    @SuppressWarnings("rawtypes")
     private static final ClassTypeInformation<CommandOutput> COMMAND_OUTPUT = ClassTypeInformation.from(CommandOutput.class);
 
     private final OutputRegistry outputRegistry;
diff --git a/src/main/java/io/lettuce/core/dynamic/output/OutputType.java b/src/main/java/io/lettuce/core/dynamic/output/OutputType.java
index a4051f4e1a..445d59acf7 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/OutputType.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,13 +27,14 @@
  * This value object describes the primary output type and the produced {@link TypeInformation} by the {@link CommandOutput}
  * type.
  * <p>
- * {@link OutputType} makes a distinction whether a {@link CommandOutput} is a
- * {@link io.lettuce.core.output.StreamingOutput} by providing {@code streaming}. Streaming outputs produce usually a
- * component type hence they require an own {@link OutputType} descriptor.
+ * {@link OutputType} makes a distinction whether a {@link CommandOutput} is a {@link io.lettuce.core.output.StreamingOutput} by
+ * providing {@code streaming}. Streaming outputs produce usually a component type hence they require an own {@link OutputType}
+ * descriptor.
  *
  * @author Mark Paluch
  * @since 5.0
  */
+@SuppressWarnings("rawtypes")
 public class OutputType {
 
     private final Class<? extends CommandOutput> commandOutputClass;
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
index f47be471b6..d7a63d98d4 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
@@ -129,13 +129,12 @@ public void close() {
         }
     }
 
-    public MasterSlaveConnectionProvider getMasterSlaveConnectionProvider() {
+    public MasterSlaveConnectionProvider<K, V> getMasterSlaveConnectionProvider() {
         return masterSlaveConnectionProvider;
     }
 
     @Override
     public void setConnectionFacade(ConnectionFacade connection) {
-
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
index 9812e517bf..06fe5edfcb 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
  *
  * @author Mark Paluch
  */
+@SuppressWarnings("serial")
 public class CommandLatencyId implements Serializable, Comparable<CommandLatencyId> {
 
     private final SocketAddress localAddress;
diff --git a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
index 012d978a7b..265329210c 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,13 +28,17 @@
  */
 public class CommandWrapper<K, V, T> implements RedisCommand<K, V, T>, CompleteableCommand<T>, DecoratedCommand<K, V, T> {
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     private final static AtomicReferenceFieldUpdater<CommandWrapper, Consumer[]> ONCOMPLETE = AtomicReferenceFieldUpdater
             .newUpdater(CommandWrapper.class, Consumer[].class, "onComplete");
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     private final static Consumer<?>[] EMPTY = new Consumer[0];
 
     protected final RedisCommand<K, V, T> command;
 
     // accessed via AtomicReferenceFieldUpdater.
+    @SuppressWarnings("unused")
     private volatile Consumer<?>[] onComplete = EMPTY;
 
     public CommandWrapper(RedisCommand<K, V, T> command) {
@@ -47,7 +51,7 @@ public CommandOutput<K, V, T> getOutput() {
     }
 
     @Override
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     public void complete() {
 
         command.complete();
@@ -101,6 +105,7 @@ public void setOutput(CommandOutput<K, V, T> output) {
     }
 
     @Override
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     public void onComplete(Consumer<? super T> action) {
 
         for (;;) {
@@ -118,7 +123,7 @@ public void onComplete(Consumer<? super T> action) {
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
         sb.append(getClass().getSimpleName());
         sb.append(" [type=").append(getType());
         sb.append(", output=").append(getOutput());
@@ -143,6 +148,7 @@ public RedisCommand<K, V, T> getDelegate() {
      * @param wrapped
      * @return
      */
+    @SuppressWarnings("unchecked")
     public static <K, V, T> RedisCommand<K, V, T> unwrap(RedisCommand<K, V, T> wrapped) {
 
         RedisCommand<K, V, T> result = wrapped;
diff --git a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index d350af0345..135288ebee 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -45,7 +45,7 @@ public class RedisStateMachine {
     private static final ByteBuffer QUEUED = buffer("QUEUED");
 
     private static final boolean USE_NETTY40_BYTEBUF_COMPATIBILITY;
-    private static final Class LONG_PROCESSOR_CLASS;
+    private static final Class<?> LONG_PROCESSOR_CLASS;
 
     static {
 
diff --git a/src/main/java/io/lettuce/core/resource/Futures.java b/src/main/java/io/lettuce/core/resource/Futures.java
index 3a04196478..415c13b702 100644
--- a/src/main/java/io/lettuce/core/resource/Futures.java
+++ b/src/main/java/io/lettuce/core/resource/Futures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,17 +38,14 @@ class Futures {
      *         the cause wil be transported.
      */
     static Promise<Boolean> toBooleanPromise(Future<?> future) {
-        final DefaultPromise<Boolean> result = new DefaultPromise<Boolean>(GlobalEventExecutor.INSTANCE);
 
-        future.addListener(new GenericFutureListener<Future<Object>>() {
-            @Override
-            public void operationComplete(Future<Object> future) throws Exception {
+        DefaultPromise<Boolean> result = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
+        future.addListener((GenericFutureListener<Future<Object>>) f -> {
 
-                if (future.isSuccess()) {
-                    result.setSuccess(true);
-                } else {
-                    result.setFailure(future.cause());
-                }
+            if (f.isSuccess()) {
+                result.setSuccess(true);
+            } else {
+                result.setFailure(f.cause());
             }
         });
         return result;
diff --git a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
index a2ad28ed07..2b5f3d52dc 100644
--- a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
+++ b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
@@ -192,7 +192,7 @@ public void returnObject(T obj) throws Exception {
         return pool;
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     private static <T> T wrapConnection(T connection, ObjectPool<T> pool) {
 
         ReturnObjectOnCloseInvocationHandler<T> handler = new ReturnObjectOnCloseInvocationHandler<T>(connection, pool);
@@ -293,22 +293,7 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
                 if (method.getName().equals("sync") || method.getName().equals("async") || method.getName().equals("reactive")) {
                     return connectionProxies.computeIfAbsent(
                             method,
-                            m -> {
-
-                                try {
-                                    Object result = method.invoke(connection, args);
-
-                                    result = Proxy.newProxyInstance(getClass().getClassLoader(), result.getClass()
-                                            .getInterfaces(), new DelegateCloseToConnectionInvocationHandler(
-                                            (AutoCloseable) proxiedConnection, result));
-
-                                    return result;
-                                } catch (IllegalAccessException e) {
-                                    throw new RedisException(e);
-                                } catch (InvocationTargetException e) {
-                                    throw new RedisException(e.getTargetException());
-                                }
-                            });
+ m -> getInnerProxy(method, args));
                 }
 
                 return method.invoke(connection, args);
@@ -318,6 +303,24 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
             }
         }
 
+        @SuppressWarnings("unchecked")
+        private Object getInnerProxy(Method method, Object[] args) {
+
+            try {
+                Object result = method.invoke(connection, args);
+
+                result = Proxy.newProxyInstance(getClass().getClassLoader(), result.getClass().getInterfaces(),
+                        new DelegateCloseToConnectionInvocationHandler<>((AutoCloseable) proxiedConnection, result));
+
+                return result;
+            } catch (IllegalAccessException e) {
+                throw new RedisException(e);
+            } catch (InvocationTargetException e) {
+                throw new RedisException(e.getTargetException());
+
+            }
+        }
+
         public T getConnection() {
             return connection;
         }
diff --git a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java
index 142e8598f1..0429c490f7 100644
--- a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 230894a2006528eefcad5c0de44a99e92fc4c177 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 25 Jun 2017 21:37:56 +0200
Subject: [PATCH 247/808] Simplify benchmark

---
 .../io/lettuce/core/protocol/RedisStateMachineBenchmark.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
index b25351b889..a4d1456053 100644
--- a/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
@@ -82,7 +82,8 @@ public void tearDown() {
 
     @Benchmark
     public void measureDecode() {
-        stateMachine.decode(masterBuffer.duplicate(), byteArrayCommand, byteArrayCommand.getOutput());
+        stateMachine.decode(masterBuffer, byteArrayCommand, byteArrayCommand.getOutput());
+        masterBuffer.readerIndex(0);
     }
 
     public static void main(String[] args) {

From dcb3a143eebc1b5571644a2ea3bf8e71251624ca Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 25 Jun 2017 22:29:52 +0200
Subject: [PATCH 248/808] Use pre-instantiated ByteBufProcessor in
 RedisStateMachine to find EOL #557
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

RedisStateMachine now uses a pre-instantiated ByteBufProcessor to lookup EOL instead of using ByteBuf.indexOf(…) to prevent object allocations and retain compatible with Netty 4.0.

Using ByteBufProcessor.FIND_LF fails when using Netty 4.0 because the interface hierarchy has changed and we compile against Netty 4.1.
---
 .../core/protocol/RedisStateMachine.java      | 48 ++++++++++++++++++-
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index 135288ebee..1df6247764 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -46,6 +46,7 @@ public class RedisStateMachine {
 
     private static final boolean USE_NETTY40_BYTEBUF_COMPATIBILITY;
     private static final Class<?> LONG_PROCESSOR_CLASS;
+    private static final Class<?> INDEX_OF_LINEBREAK_PROCESSOR_CLASS;
 
     static {
 
@@ -59,8 +60,15 @@ public class RedisStateMachine {
             } catch (ClassNotFoundException e) {
                 throw new RedisException("Cannot load Netty41LongProcessor class", e);
             }
+            try {
+                INDEX_OF_LINEBREAK_PROCESSOR_CLASS = Class
+                        .forName("io.lettuce.core.protocol.RedisStateMachine$Netty41IndexOfLineBreakProcessor");
+            } catch (ClassNotFoundException e) {
+                throw new RedisException("Cannot load Netty41IndexOfLineBreakProcessor class", e);
+            }
         } else {
             LONG_PROCESSOR_CLASS = null;
+            INDEX_OF_LINEBREAK_PROCESSOR_CLASS = null;
         }
     }
 
@@ -76,6 +84,7 @@ enum Type {
     private final State[] stack = new State[32];
     private final boolean debugEnabled = logger.isDebugEnabled();
     private final LongProcessor longProcessor;
+    private final IndexOfLineBreakProcessor indexOfLineBreakProcessor;
     private final ByteBuf responseElementBuffer = PooledByteBufAllocator.DEFAULT.directBuffer(1024);
     private final AtomicBoolean closed = new AtomicBoolean();
 
@@ -87,6 +96,7 @@ enum Type {
     public RedisStateMachine() {
 
         LongProcessor longProcessor;
+        IndexOfLineBreakProcessor indexOfLineBreakProcessor;
 
         if (!USE_NETTY40_BYTEBUF_COMPATIBILITY) {
             try {
@@ -94,11 +104,19 @@ public RedisStateMachine() {
             } catch (ReflectiveOperationException e) {
                 throw new RedisException("Cannot create Netty41LongProcessor instance", e);
             }
+
+            try {
+                indexOfLineBreakProcessor = (IndexOfLineBreakProcessor) INDEX_OF_LINEBREAK_PROCESSOR_CLASS.newInstance();
+            } catch (ReflectiveOperationException e) {
+                throw new RedisException("Cannot create Netty41IndexOfLineBreakProcessor instance", e);
+            }
         } else {
             longProcessor = new LongProcessor();
+            indexOfLineBreakProcessor = new IndexOfLineBreakProcessor();
         }
 
         this.longProcessor = longProcessor;
+        this.indexOfLineBreakProcessor = indexOfLineBreakProcessor;
     }
 
     /**
@@ -247,8 +265,7 @@ public void close() {
 
     private int findLineEnd(ByteBuf buffer) {
 
-        int start = buffer.readerIndex();
-        int index = buffer.indexOf(start, buffer.writerIndex(), (byte) '\n');
+        int index = (int) indexOfLineBreakProcessor.getValue(buffer, buffer.readerIndex(), buffer.writerIndex());
         return (index > 0 && buffer.getByte(index - 1) == '\r') ? index : -1;
     }
 
@@ -517,4 +534,31 @@ public boolean process(byte value) throws Exception {
             return true;
         }
     }
+
+    /**
+     * Compatibility code that works also on Netty 4.0.
+     */
+    static class IndexOfLineBreakProcessor {
+
+        public long getValue(ByteBuf buffer, int start, int end) {
+            return buffer.indexOf(start, buffer.writerIndex(), (byte) '\n');
+        }
+    }
+
+    /**
+     * Processor for Netty 4.1. Note {@link ByteBufProcessor} is deprecated but ByteProcessor does not exist in Netty 4.0. So we
+     * need to stick to that as long as we support Netty 4.0.
+     */
+    static class Netty41IndexOfLineBreakProcessor extends IndexOfLineBreakProcessor implements ByteBufProcessor {
+
+        @Override
+        public long getValue(ByteBuf buffer, int start, int end) {
+            return buffer.forEachByte(start, end - start, this);
+        }
+
+        @Override
+        public boolean process(byte value) throws Exception {
+            return value != (byte) '\n';
+        }
+    }
 }

From 327337856bb01dc3a260b4deb4eae48a18570ff7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 27 Jun 2017 20:53:22 +0200
Subject: [PATCH 249/808] Reduce (eliminate byte[]) duplication during slot
 hash calculation #558

---
 .../io/lettuce/core/cluster/SlotHash.java     | 38 ++++++------
 .../java/io/lettuce/core/codec/CRC16.java     | 44 ++++++++++++--
 .../io/lettuce/core/cluster/SlotHashTest.java | 29 ++++++++--
 .../jmh/io/lettuce/core/cluster/JmhMain.java  | 11 +++-
 .../core/cluster/SlotHashBenchmark.java       | 58 +++++++++++++++++++
 5 files changed, 153 insertions(+), 27 deletions(-)
 create mode 100644 src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java

diff --git a/src/main/java/io/lettuce/core/cluster/SlotHash.java b/src/main/java/io/lettuce/core/cluster/SlotHash.java
index f2b4440181..8d80b1c26f 100644
--- a/src/main/java/io/lettuce/core/cluster/SlotHash.java
+++ b/src/main/java/io/lettuce/core/cluster/SlotHash.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,7 +64,7 @@ public static final int getSlot(String key) {
      * @param key the key
      * @return slot
      */
-    public static final int getSlot(byte[] key) {
+    public static int getSlot(byte[] key) {
         return getSlot(ByteBuffer.wrap(key));
     }
 
@@ -74,34 +74,38 @@ public static final int getSlot(byte[] key) {
      * @param key the key
      * @return slot
      */
-    public static final int getSlot(ByteBuffer key) {
+    public static int getSlot(ByteBuffer key) {
 
-        byte[] input = new byte[key.remaining()];
-        key.duplicate().get(input);
+        int limit = key.limit();
+        int position = key.position();
 
-        byte[] finalKey = input;
-
-        int start = indexOf(input, SUBKEY_START);
+        int start = indexOf(key, SUBKEY_START);
         if (start != -1) {
-            int end = indexOf(input, start + 1, SUBKEY_END);
+            int end = indexOf(key, start + 1, SUBKEY_END);
             if (end != -1 && end != start + 1) {
+                key.position(start + 1).limit(end);
+            }
+        }
 
-                finalKey = new byte[end - (start + 1)];
-                System.arraycopy(input, start + 1, finalKey, 0, finalKey.length);
+        try {
+            if (key.hasArray()) {
+                return CRC16.crc16(key.array(), key.position(), key.limit() - key.position()) % SLOT_COUNT;
             }
+            return CRC16.crc16(key) % SLOT_COUNT;
+        } finally {
+            key.position(position).limit(limit);
         }
-        return CRC16.crc16(finalKey) % SLOT_COUNT;
     }
 
-    private static int indexOf(byte[] haystack, byte needle) {
-        return indexOf(haystack, 0, needle);
+    private static int indexOf(ByteBuffer haystack, byte needle) {
+        return indexOf(haystack, haystack.position(), needle);
     }
 
-    private static int indexOf(byte[] haystack, int start, byte needle) {
+    private static int indexOf(ByteBuffer haystack, int start, byte needle) {
 
-        for (int i = start; i < haystack.length; i++) {
+        for (int i = start; i < haystack.remaining(); i++) {
 
-            if (haystack[i] == needle) {
+            if (haystack.get(i) == needle) {
                 return i;
             }
         }
diff --git a/src/main/java/io/lettuce/core/codec/CRC16.java b/src/main/java/io/lettuce/core/codec/CRC16.java
index 2ca8471002..cff4ca4869 100644
--- a/src/main/java/io/lettuce/core/codec/CRC16.java
+++ b/src/main/java/io/lettuce/core/codec/CRC16.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package io.lettuce.core.codec;
 
+import java.nio.ByteBuffer;
+
 /**
  * @author Mark Paluch
  *         <ul>
@@ -61,15 +63,49 @@ private CRC16() {
      * Create a CRC16 checksum from the bytes.
      *
      * @param bytes input bytes
-     * @return CRC16 as interger value
+     * @return CRC16 as integer value
      */
     public static int crc16(byte[] bytes) {
+        return crc16(bytes, 0, bytes.length);
+    }
+
+    /**
+     * Create a CRC16 checksum from the bytes.
+     *
+     * @param bytes input bytes
+     * @return CRC16 as integer value
+     */
+    public static int crc16(byte[] bytes, int off, int len) {
+
+        int crc = 0x0000;
+        int end = off + len;
+
+        for (int i = off; i < end; i++) {
+            crc = doCrc(bytes[i], crc);
+        }
+
+        return crc & 0xFFFF;
+    }
+
+    /**
+     * Create a CRC16 checksum from the bytes.
+     *
+     * @param bytes input bytes
+     * @return CRC16 as integer value
+     * @since 4.4
+     */
+    public static int crc16(ByteBuffer bytes) {
+
         int crc = 0x0000;
 
-        for (byte b : bytes) {
-            crc = ((crc << 8) ^ LOOKUP_TABLE[((crc >>> 8) ^ (b & 0xFF)) & 0xFF]);
+        while (bytes.hasRemaining()) {
+            crc = doCrc(bytes.get(), crc);
         }
+
         return crc & 0xFFFF;
     }
 
+    private static int doCrc(byte b, int crc) {
+        return ((crc << 8) ^ LOOKUP_TABLE[((crc >>> 8) ^ (b & 0xFF)) & 0xFF]);
+    }
 }
diff --git a/src/test/java/io/lettuce/core/cluster/SlotHashTest.java b/src/test/java/io/lettuce/core/cluster/SlotHashTest.java
index bbd835a14a..275a24122e 100644
--- a/src/test/java/io/lettuce/core/cluster/SlotHashTest.java
+++ b/src/test/java/io/lettuce/core/cluster/SlotHashTest.java
@@ -15,7 +15,9 @@
  */
 package io.lettuce.core.cluster;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.nio.ByteBuffer;
 
 import org.junit.Test;
 
@@ -25,17 +27,34 @@
  */
 public class SlotHashTest {
 
+    static final byte[] BYTES = "123456789".getBytes();
+    static final byte[] TAGGED = "key{123456789}a".getBytes();
+
     @Test
-    public void testHash() throws Exception {
-        int result = SlotHash.getSlot("123456789".getBytes());
+    public void shouldGetSlotHeap() {
+
+        int result = SlotHash.getSlot(BYTES);
         assertThat(result).isEqualTo(0x31C3);
+    }
+
+    @Test
+    public void shouldGetTaggedSlotHeap() {
 
+        int result = SlotHash.getSlot(TAGGED);
+        assertThat(result).isEqualTo(0x31C3);
     }
 
     @Test
-    public void testHashWithHash() throws Exception {
-        int result = SlotHash.getSlot("key{123456789}a".getBytes());
+    public void shouldGetSlotDirect() {
+
+        int result = SlotHash.getSlot((ByteBuffer) ByteBuffer.allocateDirect(BYTES.length).put(BYTES).flip());
         assertThat(result).isEqualTo(0x31C3);
+    }
 
+    @Test
+    public void testHashWithHash() {
+
+        int result = SlotHash.getSlot((ByteBuffer) ByteBuffer.allocateDirect(TAGGED.length).put(TAGGED).flip());
+        assertThat(result).isEqualTo(0x31C3);
     }
 }
diff --git a/src/test/jmh/io/lettuce/core/cluster/JmhMain.java b/src/test/jmh/io/lettuce/core/cluster/JmhMain.java
index b66c5f40a4..6354e7666d 100644
--- a/src/test/jmh/io/lettuce/core/cluster/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/cluster/JmhMain.java
@@ -33,7 +33,8 @@ public class JmhMain {
 
     public static void main(String... args) throws RunnerException {
 
-        runClusterDistributionChannelWriterBenchmark();
+        // runClusterDistributionChannelWriterBenchmark();
+        runSlotHashBenchmark();
     }
 
     private static void runClusterDistributionChannelWriterBenchmark() throws RunnerException {
@@ -44,6 +45,14 @@ private static void runClusterDistributionChannelWriterBenchmark() throws Runner
                 .build()).run();
     }
 
+    private static void runSlotHashBenchmark() throws RunnerException {
+
+        new Runner(prepareOptions().mode(Mode.AverageTime) //
+                .timeUnit(TimeUnit.NANOSECONDS) //
+                .include(".*SlotHashBenchmark.*") //
+                .build()).run();
+    }
+
     private static ChainedOptionsBuilder prepareOptions() {
         return new OptionsBuilder()//
                 .forks(1) //
diff --git a/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java
new file mode 100644
index 0000000000..fc85107a2a
--- /dev/null
+++ b/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster;
+
+import java.nio.ByteBuffer;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.infra.Blackhole;
+
+/**
+ * @author Mark Paluch
+ */
+@State(Scope.Benchmark)
+public class SlotHashBenchmark {
+
+    private final static byte[] data = "this is my buffer".getBytes();
+    private final static byte[] tagged = "this is{my buffer}".getBytes();
+    private final static ByteBuffer heap = (ByteBuffer) ByteBuffer.allocate(data.length).put(data).flip();
+    private final static ByteBuffer direct = (ByteBuffer) ByteBuffer.allocateDirect(data.length).put(data).flip();
+
+    private final static ByteBuffer heapTagged = (ByteBuffer) ByteBuffer.allocate(tagged.length).put(tagged).flip();
+    private final static ByteBuffer directTagged = (ByteBuffer) ByteBuffer.allocateDirect(tagged.length).put(tagged).flip();
+
+    @Benchmark
+    public void measureSlotHashHeap(Blackhole blackhole) {
+        blackhole.consume(SlotHash.getSlot(heap));
+    }
+
+    @Benchmark
+    public void measureSlotHashDirect(Blackhole blackhole) {
+        blackhole.consume(SlotHash.getSlot(direct));
+    }
+
+    @Benchmark
+    public void measureSlotHashTaggedHeap(Blackhole blackhole) {
+        blackhole.consume(SlotHash.getSlot(heapTagged));
+    }
+
+    @Benchmark
+    public void measureSlotHashTaggedDirect(Blackhole blackhole) {
+        blackhole.consume(SlotHash.getSlot(directTagged));
+    }
+}

From eee87dda34dbdfc1fd82e237d9e03f74491bb2a7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 27 Jun 2017 21:33:12 +0200
Subject: [PATCH 250/808] Replace CountDownLatch in AsyncCommand with
 AtomicFieldUpdater #559

---
 .../lettuce/core/protocol/AsyncCommand.java   | 49 +++++++++++++------
 .../core/protocol/TransactionalCommand.java   |  7 +--
 .../core/protocol/CommandBenchmark.java       | 12 +++--
 3 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
index 77c277ac86..7b9e412161 100644
--- a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,10 @@
 package io.lettuce.core.protocol;
 
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.function.Consumer;
 
 import io.lettuce.core.RedisCommandExecutionException;
@@ -40,17 +42,27 @@
 public class AsyncCommand<K, V, T> extends CompletableFuture<T> implements RedisCommand<K, V, T>, RedisFuture<T>,
         CompleteableCommand<T>, DecoratedCommand<K, V, T> {
 
-    protected CountDownLatch latch = new CountDownLatch(1);
-    protected RedisCommand<K, V, T> command;
+    private static final AtomicIntegerFieldUpdater<AsyncCommand> COUNT_UPDATER = AtomicIntegerFieldUpdater.newUpdater(
+            AsyncCommand.class, "count");
+
+    private final RedisCommand<K, V, T> command;
+
+    private volatile int count = 1;
 
     /**
-     *
      * @param command the command, must not be {@literal null}.
-     *
      */
     public AsyncCommand(RedisCommand<K, V, T> command) {
+        this(command, 1);
+    }
+
+    /**
+     * @param command the command, must not be {@literal null}.
+     */
+    protected AsyncCommand(RedisCommand<K, V, T> command, int count) {
         LettuceAssert.notNull(command, "RedisCommand must not be null");
         this.command = command;
+        this.count = count;
     }
 
     /**
@@ -64,10 +76,15 @@ public AsyncCommand(RedisCommand<K, V, T> command) {
     @Override
     public boolean await(long timeout, TimeUnit unit) {
         try {
-            return latch.await(timeout, unit);
+            get(timeout, unit);
+            return true;
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
             throw new RedisCommandInterruptedException(e);
+        } catch (ExecutionException e) {
+            return true;
+        } catch (TimeoutException e) {
+            return false;
         }
     }
 
@@ -86,18 +103,17 @@ public CommandOutput<K, V, T> getOutput() {
      */
     @Override
     public void complete() {
-        if (latch.getCount() == 1) {
+        if (COUNT_UPDATER.decrementAndGet(this) == 0) {
             completeResult();
             command.complete();
         }
-        latch.countDown();
     }
 
     protected void completeResult() {
         if (command.getOutput() == null) {
             complete(null);
         } else if (command.getOutput().hasError()) {
-            completeExceptionally(new RedisCommandExecutionException(command.getOutput().getError()));
+            doCompleteExceptionally(new RedisCommandExecutionException(command.getOutput().getError()));
         } else {
             complete(command.getOutput().get());
         }
@@ -106,21 +122,24 @@ protected void completeResult() {
     @Override
     public boolean completeExceptionally(Throwable ex) {
         boolean result = false;
-        if (latch.getCount() == 1) {
-            command.completeExceptionally(ex);
-            result = super.completeExceptionally(ex);
+        if (COUNT_UPDATER.decrementAndGet(this) == 0) {
+            result = doCompleteExceptionally(ex);
         }
-        latch.countDown();
         return result;
     }
 
+    private boolean doCompleteExceptionally(Throwable ex) {
+        command.completeExceptionally(ex);
+        return super.completeExceptionally(ex);
+    }
+
     @Override
     public boolean cancel(boolean mayInterruptIfRunning) {
         try {
             command.cancel();
             return super.cancel(mayInterruptIfRunning);
         } finally {
-            latch.countDown();
+            COUNT_UPDATER.set(this, 0);
         }
     }
 
diff --git a/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java b/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java
index 5f6d741832..b54d687eff 100644
--- a/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package io.lettuce.core.protocol;
 
-import java.util.concurrent.CountDownLatch;
-
 /**
  * A wrapper for commands within a {@literal MULTI} transaction. Commands triggered within a transaction will be completed
  * twice. Once on the submission and once during {@literal EXEC}. Only the second completion will complete the underlying
@@ -32,8 +30,7 @@
 public class TransactionalCommand<K, V, T> extends AsyncCommand<K, V, T> implements RedisCommand<K, V, T> {
 
     public TransactionalCommand(RedisCommand<K, V, T> command) {
-        super(command);
-        latch = new CountDownLatch(2);
+        super(command, 2);
     }
 
 }
diff --git a/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
index ff02e2455b..605b186765 100644
--- a/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.infra.Blackhole;
 
 import io.lettuce.core.codec.ByteArrayCodec;
 import io.lettuce.core.codec.RedisCodec;
@@ -48,8 +49,13 @@ public class CommandBenchmark {
     private final static byte[] BYTE_KEY = "key".getBytes();
 
     @Benchmark
-    public void createCommandUsingByteArrayCodec() {
-        createCommand(BYTE_KEY, BYTE_ARRAY_CODEC);
+    public void createCommandUsingByteArrayCodec(Blackhole blackhole) {
+        blackhole.consume(createCommand(BYTE_KEY, BYTE_ARRAY_CODEC));
+    }
+
+    @Benchmark
+    public void createAsyncCommandUsingByteArrayCodec(Blackhole blackhole) {
+        blackhole.consume(new AsyncCommand<>(createCommand(BYTE_KEY, BYTE_ARRAY_CODEC)));
     }
 
     @Benchmark

From 9996b6035c1d5d3a710ad9d7b4f52c262aa1e525 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 27 Jun 2017 21:33:56 +0200
Subject: [PATCH 251/808] Polishing

Replace capturing lambdas with pre-instantiated function to prevent allocations on each invocation.
---
 .../ClusterFutureSyncInvocationHandler.java   |  6 ++--
 .../DefaultCommandLatencyCollector.java       | 34 +++++++++++--------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
index b11b6c112d..19c7832735 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
@@ -76,8 +76,8 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
         try {
 
             if (method.isDefault()) {
-                return methodHandleCache.computeIfAbsent(method, this::lookupDefaultMethod).bindTo(proxy)
-                        .invokeWithArguments(args);
+                return methodHandleCache.computeIfAbsent(method, ClusterFutureSyncInvocationHandler::lookupDefaultMethod)
+                        .bindTo(proxy).invokeWithArguments(args);
             }
 
             if (method.getName().equals("getConnection") && args.length > 0) {
@@ -181,7 +181,7 @@ protected Object nodes(Predicate<RedisClusterNode> predicate, ClusterConnectionP
                 nodeSelectionCommandsInterface, nodeSelectionInterface }, h);
     }
 
-    private MethodHandle lookupDefaultMethod(Method method) {
+    private static MethodHandle lookupDefaultMethod(Method method) {
 
         try {
             return DefaultMethods.lookupMethodHandle(method);
diff --git a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
index aed10b56f5..fd58450f1a 100644
--- a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
@@ -27,6 +27,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import java.util.function.Function;
 
 import org.HdrHistogram.Histogram;
 import org.LatencyUtils.LatencyStats;
@@ -66,9 +67,26 @@ public class DefaultCommandLatencyCollector implements CommandLatencyCollector {
             createNewLatencyMap());
 
     private volatile boolean stopped;
+    private final Function<CommandLatencyId, Latencies> createLatencies;
 
     public DefaultCommandLatencyCollector(CommandLatencyCollectorOptions options) {
+
         this.options = options;
+        this.createLatencies = id -> {
+
+            if (PAUSE_DETECTOR_UPDATER.get(this) == null) {
+                if (PAUSE_DETECTOR_UPDATER.compareAndSet(this, null, GLOBAL_PAUSE_DETECTOR)) {
+                    PAUSE_DETECTOR_UPDATER.get(this).retain();
+                }
+            }
+            PauseDetector pauseDetector = ((DefaultPauseDetectorWrapper) PAUSE_DETECTOR_UPDATER.get(this)).getPauseDetector();
+
+            if (options.resetLatenciesAfterEvent()) {
+                return new Latencies(pauseDetector);
+            }
+
+            return new CummulativeLatencies(pauseDetector);
+        };
     }
 
     /**
@@ -87,21 +105,7 @@ public void recordCommandLatency(SocketAddress local, SocketAddress remote, Prot
             return;
         }
 
-        Latencies latencies = latencyMetricsRef.get().computeIfAbsent(createId(local, remote, commandType), id -> {
-
-            if (PAUSE_DETECTOR_UPDATER.get(this) == null) {
-                if (PAUSE_DETECTOR_UPDATER.compareAndSet(this, null, GLOBAL_PAUSE_DETECTOR)) {
-                    PAUSE_DETECTOR_UPDATER.get(this).retain();
-                }
-            }
-            PauseDetector pauseDetector = ((DefaultPauseDetectorWrapper) PAUSE_DETECTOR_UPDATER.get(this)).getPauseDetector();
-
-            if (options.resetLatenciesAfterEvent()) {
-                return new Latencies(pauseDetector);
-            }
-
-            return new CummulativeLatencies(pauseDetector);
-        });
+        Latencies latencies = latencyMetricsRef.get().computeIfAbsent(createId(local, remote, commandType), createLatencies);
 
         latencies.firstResponse.recordLatency(rangify(firstResponseLatency));
         latencies.completion.recordLatency(rangify(completionLatency));

From 6c23477774cb65256ec0286e1eb2abd8520f3f91 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 6 Jul 2017 21:02:05 +0200
Subject: [PATCH 252/808] =?UTF-8?q?Apply=20client=20name=20via=20clientSet?=
 =?UTF-8?q?name(=E2=80=A6)=20also=20to=20default=20connection=20#563?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Using clientSetname(…) on the cluster command API now executes also on the default connection. Previously, the client name was only set on nodes known from the topology by id and by host/port.

CLIENT commands also are now excluded from cluster key routing and hit always the default connection.
---
 .../core/cluster/ClusterDistributionChannelWriter.java       | 3 ++-
 .../core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java  | 5 ++++-
 .../cluster/RedisAdvancedClusterReactiveCommandsImpl.java    | 2 ++
 .../io/lettuce/core/cluster/AdvancedClusterClientTest.java   | 4 +++-
 .../io/lettuce/core/cluster/AdvancedClusterReactiveTest.java | 3 ++-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index 4797d88cbd..bbe18836b0 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -105,7 +105,8 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         ClusterCommand<K, V, T> commandToSend = getCommandToSend(command);
         CommandArgs<K, V> args = command.getArgs();
 
-        if (args != null) {
+        // exclude CLIENT commands from cluster routing
+        if (args != null && !CommandType.CLIENT.equals(commandToSend.getType())) {
 
             ByteBuffer encodedKey = args.getFirstEncodedKey();
             if (encodedKey != null) {
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index 8d67bc4c80..277cf1f356 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -23,6 +23,7 @@
 import java.lang.reflect.Proxy;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -263,10 +264,12 @@ public RedisFuture<Boolean> msetnx(Map<K, V> map) {
     @Override
     public RedisFuture<String> clientSetname(K name) {
 
-        Map<String, CompletableFuture<String>> executions = new HashMap<>();
+        Map<String, CompletionStage<String>> executions = new HashMap<>();
 
         CompletableFuture<String> ok = CompletableFuture.completedFuture("OK");
 
+        executions.put("Default", super.clientSetname(name).toCompletableFuture());
+
         for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
 
             RedisURI uri = redisClusterNode.getUri();
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index f2c8a233ab..83e95f115d 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -242,6 +242,8 @@ public Mono<String> clientSetname(K name) {
 
         List<Publisher<String>> publishers = new ArrayList<>();
 
+        publishers.add(super.clientSetname(name));
+
         for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
 
             Mono<RedisClusterReactiveCommands<K, V>> byNodeId = getConnectionReactive(redisClusterNode.getNodeId());
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
index b544943465..df799decaa 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -290,6 +290,8 @@ public void clientSetname() throws Exception {
                     .getConnection(redisClusterNode.getNodeId());
             assertThat(nodeConnection.clientList()).contains(name);
         }
+
+        assertThat(syncCommands.clientGetname()).isEqualTo(name);
     }
 
     @Test(expected = RedisCommandExecutionException.class)
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
index b8bef4116e..6853ea56f0 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
@@ -173,6 +173,8 @@ public void clientSetname() {
                     .getConnection(redisClusterNode.getNodeId());
             assertThat(nodeConnection.clientList()).contains(name);
         }
+
+        StepVerifier.create(commands.clientGetname()).expectNext(name).verifyComplete();
     }
 
     @Test
@@ -371,7 +373,6 @@ public void clusterScanStreamingWithArgs() {
 
         assertThat(adapter.getList()).containsAll(
                 KeysAndValues.KEYS.stream().filter(k -> k.startsWith("a")).collect(Collectors.toList()));
-
     }
 
     private void writeKeysToTwoNodes() {

From 568006f3b090a2a45ceedbdc4d45b66f3fca188d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 7 Jul 2017 09:47:53 +0200
Subject: [PATCH 253/808] Adopt to read-only variant GEORADIUS(BYMEMBER)_RO
 #564

Lettuce now uses GEORADIUS_RO/GEORADISBYMEMBER_RO for cluster connections if the readonly command is available and applicable. Command availability is derived from COMMANDS output and cached until the connection is closed. We assume that availability is given across the cluster. A mix of Redis versions can (some nodes support GEORADIUS_RO and some not) cause errors because not every node is inspected individually but only the node with the default connection.
---
 .../core/AbstractRedisAsyncCommands.java      | 28 +++++--
 .../core/AbstractRedisReactiveCommands.java   | 35 ++++++--
 .../io/lettuce/core/RedisCommandBuilder.java  | 24 +++---
 ...RedisAdvancedClusterAsyncCommandsImpl.java | 42 ++++++++++
 ...isAdvancedClusterReactiveCommandsImpl.java | 43 ++++++++++
 .../core/cluster/RedisClusterClient.java      |  3 +
 .../RedisClusterPubSubAsyncCommandsImpl.java  | 51 +++++++++++-
 ...edisClusterPubSubReactiveCommandsImpl.java | 51 +++++++++++-
 .../io/lettuce/core/cluster/RedisState.java   | 81 +++++++++++++++++++
 .../StatefulRedisClusterConnectionImpl.java   | 11 +++
 ...tefulRedisClusterPubSubConnectionImpl.java | 10 +++
 .../io/lettuce/core/protocol/CommandType.java |  4 +-
 12 files changed, 353 insertions(+), 30 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/cluster/RedisState.java

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 617a5d0a32..56ebbfecdc 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core;
 
-import static io.lettuce.core.protocol.CommandType.EXEC;
+import static io.lettuce.core.protocol.CommandType.*;
 
 import java.util.Date;
 import java.util.List;
@@ -1845,13 +1845,22 @@ public RedisFuture<List<Value<String>>> geohash(K key, V... members) {
 
     @Override
     public RedisFuture<Set<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
-        return dispatch(commandBuilder.georadius(key, longitude, latitude, distance, unit.name()));
+        return dispatch(commandBuilder.georadius(GEORADIUS, key, longitude, latitude, distance, unit.name()));
+    }
+
+    protected RedisFuture<Set<V>> georadius_ro(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
+        return dispatch(commandBuilder.georadius(GEORADIUS_RO, key, longitude, latitude, distance, unit.name()));
     }
 
     @Override
     public RedisFuture<List<GeoWithin<V>>> georadius(K key, double longitude, double latitude, double distance,
             GeoArgs.Unit unit, GeoArgs geoArgs) {
-        return dispatch(commandBuilder.georadius(key, longitude, latitude, distance, unit.name(), geoArgs));
+        return dispatch(commandBuilder.georadius(GEORADIUS, key, longitude, latitude, distance, unit.name(), geoArgs));
+    }
+
+    protected RedisFuture<List<GeoWithin<V>>> georadius_ro(K key, double longitude, double latitude, double distance,
+            GeoArgs.Unit unit, GeoArgs geoArgs) {
+        return dispatch(commandBuilder.georadius(GEORADIUS_RO, key, longitude, latitude, distance, unit.name(), geoArgs));
     }
 
     @Override
@@ -1862,13 +1871,22 @@ public RedisFuture<Long> georadius(K key, double longitude, double latitude, dou
 
     @Override
     public RedisFuture<Set<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit) {
-        return dispatch(commandBuilder.georadiusbymember(key, member, distance, unit.name()));
+        return dispatch(commandBuilder.georadiusbymember(GEORADIUSBYMEMBER, key, member, distance, unit.name()));
+    }
+
+    protected RedisFuture<Set<V>> georadiusbymember_ro(K key, V member, double distance, GeoArgs.Unit unit) {
+        return dispatch(commandBuilder.georadiusbymember(GEORADIUSBYMEMBER_RO, key, member, distance, unit.name()));
     }
 
     @Override
     public RedisFuture<List<GeoWithin<V>>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit,
             GeoArgs geoArgs) {
-        return dispatch(commandBuilder.georadiusbymember(key, member, distance, unit.name(), geoArgs));
+        return dispatch(commandBuilder.georadiusbymember(GEORADIUSBYMEMBER, key, member, distance, unit.name(), geoArgs));
+    }
+
+    protected RedisFuture<List<GeoWithin<V>>> georadiusbymember_ro(K key, V member, double distance, GeoArgs.Unit unit,
+            GeoArgs geoArgs) {
+        return dispatch(commandBuilder.georadiusbymember(GEORADIUSBYMEMBER_RO, key, member, distance, unit.name(), geoArgs));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 75965c4834..ddb1dcd2d5 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core;
 
-import static io.lettuce.core.protocol.CommandType.EXEC;
+import static io.lettuce.core.protocol.CommandType.*;
 
 import java.util.Date;
 import java.util.Map;
@@ -24,7 +24,6 @@
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-
 import io.lettuce.core.GeoArgs.Unit;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.reactive.*;
@@ -1842,12 +1841,24 @@ public Flux<Value<String>> geohash(K key, V... members) {
 
     @Override
     public Flux<V> georadius(K key, double longitude, double latitude, double distance, Unit unit) {
-        return createDissolvingFlux(() -> commandBuilder.georadius(key, longitude, latitude, distance, unit.name()));
+        return createDissolvingFlux(() -> commandBuilder.georadius(GEORADIUS, key, longitude, latitude, distance, unit.name()));
+    }
+
+    protected Flux<V> georadius_ro(K key, double longitude, double latitude, double distance, Unit unit) {
+        return createDissolvingFlux(() -> commandBuilder.georadius(GEORADIUS_RO, key, longitude, latitude, distance,
+                unit.name()));
     }
 
     @Override
     public Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, Unit unit, GeoArgs geoArgs) {
-        return createDissolvingFlux(() -> commandBuilder.georadius(key, longitude, latitude, distance, unit.name(), geoArgs));
+        return createDissolvingFlux(() -> commandBuilder.georadius(GEORADIUS, key, longitude, latitude, distance, unit.name(),
+                geoArgs));
+    }
+
+    protected Flux<GeoWithin<V>> georadius_ro(K key, double longitude, double latitude, double distance, Unit unit,
+            GeoArgs geoArgs) {
+        return createDissolvingFlux(() -> commandBuilder.georadius(GEORADIUS_RO, key, longitude, latitude, distance,
+                unit.name(), geoArgs));
     }
 
     @Override
@@ -1858,12 +1869,24 @@ public Mono<Long> georadius(K key, double longitude, double latitude, double dis
 
     @Override
     public Flux<V> georadiusbymember(K key, V member, double distance, Unit unit) {
-        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(key, member, distance, unit.name()));
+        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER, key, member, distance,
+                unit.name()));
+    }
+
+    protected Flux<V> georadiusbymember_ro(K key, V member, double distance, Unit unit) {
+        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER_RO, key, member, distance,
+                unit.name()));
     }
 
     @Override
     public Flux<GeoWithin<V>> georadiusbymember(K key, V member, double distance, Unit unit, GeoArgs geoArgs) {
-        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(key, member, distance, unit.name(), geoArgs));
+        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER, key, member, distance,
+                unit.name(), geoArgs));
+    }
+
+    protected Flux<GeoWithin<V>> georadiusbymember_ro(K key, V member, double distance, Unit unit, GeoArgs geoArgs) {
+        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER_RO, key, member, distance,
+                unit.name(), geoArgs));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 1a204614ca..193e813bc8 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -26,10 +26,7 @@
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.output.*;
-import io.lettuce.core.protocol.BaseRedisCommandBuilder;
-import io.lettuce.core.protocol.Command;
-import io.lettuce.core.protocol.CommandArgs;
-import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.protocol.*;
 
 /**
  * @param <K>
@@ -2624,16 +2621,18 @@ public Command<K, V, List<Value<String>>> geohash(K key, V... members) {
         return createCommand(GEOHASH, new StringValueListOutput<K, V>(codec), args);
     }
 
-    public Command<K, V, Set<V>> georadius(K key, double longitude, double latitude, double distance, String unit) {
+    public Command<K, V, Set<V>> georadius(CommandType commandType, K key, double longitude, double latitude, double distance,
+            String unit) {
         notNullKey(key);
         LettuceAssert.notNull(unit, "Unit " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(unit, "Unit " + MUST_NOT_BE_EMPTY);
 
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(longitude).add(latitude).add(distance).add(unit);
-        return createCommand(GEORADIUS, new ValueSetOutput<K, V>(codec), args);
+        return createCommand(commandType, new ValueSetOutput<K, V>(codec), args);
     }
 
-    public Command<K, V, List<GeoWithin<V>>> georadius(K key, double longitude, double latitude, double distance, String unit,
+    public Command<K, V, List<GeoWithin<V>>> georadius(CommandType commandType, K key, double longitude, double latitude,
+            double distance, String unit,
             GeoArgs geoArgs) {
 
         notNullKey(key);
@@ -2643,7 +2642,7 @@ public Command<K, V, List<GeoWithin<V>>> georadius(K key, double longitude, doub
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(longitude).add(latitude).add(distance).add(unit);
         geoArgs.build(args);
 
-        return createCommand(GEORADIUS, new GeoWithinListOutput<K, V>(codec, geoArgs.isWithDistance(), geoArgs.isWithHash(),
+        return createCommand(commandType, new GeoWithinListOutput<K, V>(codec, geoArgs.isWithDistance(), geoArgs.isWithHash(),
                 geoArgs.isWithCoordinates()), args);
     }
 
@@ -2663,17 +2662,18 @@ public Command<K, V, Long> georadius(K key, double longitude, double latitude, d
         return createCommand(GEORADIUS, new IntegerOutput<K, V>(codec), args);
     }
 
-    public Command<K, V, Set<V>> georadiusbymember(K key, V member, double distance, String unit) {
+    public Command<K, V, Set<V>> georadiusbymember(CommandType commandType, K key, V member, double distance, String unit) {
 
         notNullKey(key);
         LettuceAssert.notNull(unit, "Unit " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(unit, "Unit " + MUST_NOT_BE_EMPTY);
 
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValue(member).add(distance).add(unit);
-        return createCommand(GEORADIUSBYMEMBER, new ValueSetOutput<K, V>(codec), args);
+        return createCommand(commandType, new ValueSetOutput<K, V>(codec), args);
     }
 
-    public Command<K, V, List<GeoWithin<V>>> georadiusbymember(K key, V member, double distance, String unit, GeoArgs geoArgs) {
+    public Command<K, V, List<GeoWithin<V>>> georadiusbymember(CommandType commandType, K key, V member, double distance,
+            String unit, GeoArgs geoArgs) {
 
         notNullKey(key);
         LettuceAssert.notNull(geoArgs, "GeoArgs " + MUST_NOT_BE_NULL);
@@ -2684,7 +2684,7 @@ public Command<K, V, List<GeoWithin<V>>> georadiusbymember(K key, V member, doub
         geoArgs.build(args);
 
         return createCommand(
-                GEORADIUSBYMEMBER,
+commandType,
                 new GeoWithinListOutput<K, V>(codec, geoArgs.isWithDistance(), geoArgs.isWithHash(), geoArgs
                         .isWithCoordinates()), args);
     }
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index 277cf1f356..e248252716 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -337,6 +337,48 @@ public RedisFuture<String> flushdb() {
         return MultiNodeExecution.firstOfAsync(executeOnMasters(RedisServerAsyncCommands::flushdb));
     }
 
+    @Override
+    public RedisFuture<Set<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
+
+        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+            return super.georadius_ro(key, longitude, latitude, distance, unit);
+        }
+
+        return super.georadius(key, longitude, latitude, distance, unit);
+    }
+
+    @Override
+    public RedisFuture<List<GeoWithin<V>>> georadius(K key, double longitude, double latitude, double distance,
+            GeoArgs.Unit unit, GeoArgs geoArgs) {
+
+        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+            return super.georadius_ro(key, longitude, latitude, distance, unit, geoArgs);
+        }
+
+        return super.georadius(key, longitude, latitude, distance, unit, geoArgs);
+    }
+
+    @Override
+    public RedisFuture<Set<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit) {
+
+        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUSBYMEMBER_RO)) {
+            return super.georadiusbymember_ro(key, member, distance, unit);
+        }
+
+        return super.georadiusbymember(key, member, distance, unit);
+    }
+
+    @Override
+    public RedisFuture<List<GeoWithin<V>>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit,
+            GeoArgs geoArgs) {
+
+        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUSBYMEMBER_RO)) {
+            return super.georadiusbymember_ro(key, member, distance, unit, geoArgs);
+        }
+
+        return super.georadiusbymember(key, member, distance, unit, geoArgs);
+    }
+
     @Override
     public RedisFuture<String> scriptFlush() {
 
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index 83e95f115d..f1d009e1db 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -18,6 +18,8 @@
 import static io.lettuce.core.cluster.ClusterScanSupport.reactiveClusterKeyScanCursorMapper;
 import static io.lettuce.core.cluster.ClusterScanSupport.reactiveClusterStreamScanCursorMapper;
 import static io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag.MASTER;
+import static io.lettuce.core.protocol.CommandType.GEORADIUSBYMEMBER_RO;
+import static io.lettuce.core.protocol.CommandType.GEORADIUS_RO;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -293,6 +295,47 @@ public Mono<String> flushdb() {
         return Flux.merge(publishers.values()).last();
     }
 
+    @Override
+    public Flux<V> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
+
+        if (getStatefulConnection().getState().hasCommand(GEORADIUS_RO)) {
+            return super.georadius_ro(key, longitude, latitude, distance, unit);
+        }
+
+        return super.georadius(key, longitude, latitude, distance, unit);
+    }
+
+    @Override
+    public Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit,
+            GeoArgs geoArgs) {
+
+        if (getStatefulConnection().getState().hasCommand(GEORADIUS_RO)) {
+            return super.georadius_ro(key, longitude, latitude, distance, unit, geoArgs);
+        }
+
+        return super.georadius(key, longitude, latitude, distance, unit, geoArgs);
+    }
+
+    @Override
+    public Flux<V> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit) {
+
+        if (getStatefulConnection().getState().hasCommand(GEORADIUSBYMEMBER_RO)) {
+            return super.georadiusbymember_ro(key, member, distance, unit);
+        }
+
+        return super.georadiusbymember(key, member, distance, unit);
+    }
+
+    @Override
+    public Flux<GeoWithin<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs) {
+
+        if (getStatefulConnection().getState().hasCommand(GEORADIUSBYMEMBER_RO)) {
+            return super.georadiusbymember_ro(key, member, distance, unit, geoArgs);
+        }
+
+        return super.georadiusbymember(key, member, distance, unit, geoArgs);
+    }
+
     @Override
     public Flux<K> keys(K pattern) {
 
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 507061b3b6..f8b5efb8bf 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -529,6 +529,7 @@ <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K,
             try {
                 connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier, () -> new CommandHandler(
                         clientOptions, clientResources, endpoint));
+                connection.inspectRedisState();
                 connected = true;
                 break;
             } catch (RedisException e) {
@@ -546,6 +547,7 @@ <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K,
 
         connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider);
 
+
         return connection;
     }
 
@@ -592,6 +594,7 @@ <K, V> StatefulRedisClusterPubSubConnection<K, V> connectClusterPubSubImpl(Redis
             try {
                 connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier,
                         () -> new PubSubCommandHandler<K, V>(clientOptions, clientResources, codec, endpoint));
+                connection.inspectRedisState();
                 connected = true;
                 break;
             } catch (RedisException e) {
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
index 8fa9e34d87..e55268de5b 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
@@ -19,10 +19,14 @@
 
 import java.lang.reflect.Proxy;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import io.lettuce.core.GeoArgs;
+import io.lettuce.core.GeoWithin;
+import io.lettuce.core.RedisFuture;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.api.NodeSelectionSupport;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
@@ -31,6 +35,7 @@
 import io.lettuce.core.cluster.pubsub.api.async.PubSubAsyncNodeSelection;
 import io.lettuce.core.cluster.pubsub.api.async.RedisClusterPubSubAsyncCommands;
 import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.pubsub.RedisPubSubAsyncCommandsImpl;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
@@ -52,8 +57,50 @@ public RedisClusterPubSubAsyncCommandsImpl(StatefulRedisClusterPubSubConnection<
     }
 
     @Override
-    public StatefulRedisClusterPubSubConnection<K, V> getStatefulConnection() {
-        return (StatefulRedisClusterPubSubConnection<K, V>) super.getStatefulConnection();
+    public RedisFuture<Set<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
+
+        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+            return super.georadius_ro(key, longitude, latitude, distance, unit);
+        }
+
+        return super.georadius(key, longitude, latitude, distance, unit);
+    }
+
+    @Override
+    public RedisFuture<List<GeoWithin<V>>> georadius(K key, double longitude, double latitude, double distance,
+            GeoArgs.Unit unit, GeoArgs geoArgs) {
+
+        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+            return super.georadius_ro(key, longitude, latitude, distance, unit, geoArgs);
+        }
+
+        return super.georadius(key, longitude, latitude, distance, unit, geoArgs);
+    }
+
+    @Override
+    public RedisFuture<Set<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit) {
+
+        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUSBYMEMBER_RO)) {
+            return super.georadiusbymember_ro(key, member, distance, unit);
+        }
+
+        return super.georadiusbymember(key, member, distance, unit);
+    }
+
+    @Override
+    public RedisFuture<List<GeoWithin<V>>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit,
+            GeoArgs geoArgs) {
+
+        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUSBYMEMBER_RO)) {
+            return super.georadiusbymember_ro(key, member, distance, unit, geoArgs);
+        }
+
+        return super.georadiusbymember(key, member, distance, unit, geoArgs);
+    }
+
+    @Override
+    public StatefulRedisClusterPubSubConnectionImpl<K, V> getStatefulConnection() {
+        return (StatefulRedisClusterPubSubConnectionImpl<K, V>) super.getStatefulConnection();
     }
 
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
index 062f566ff7..74041d08cd 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
@@ -23,6 +23,9 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import reactor.core.publisher.Flux;
+import io.lettuce.core.GeoArgs;
+import io.lettuce.core.GeoWithin;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.api.NodeSelectionSupport;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
@@ -31,6 +34,7 @@
 import io.lettuce.core.cluster.pubsub.api.reactive.PubSubReactiveNodeSelection;
 import io.lettuce.core.cluster.pubsub.api.reactive.RedisClusterPubSubReactiveCommands;
 import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.pubsub.RedisPubSubReactiveCommandsImpl;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands;
@@ -44,7 +48,7 @@ class RedisClusterPubSubReactiveCommandsImpl<K, V> extends RedisPubSubReactiveCo
     /**
      * Initialize a new connection.
      *
-     * @param connection the connection .
+     * @param connection the connection.
      * @param codec Codec used to encode/decode keys and values.
      */
     public RedisClusterPubSubReactiveCommandsImpl(StatefulRedisClusterPubSubConnection<K, V> connection, RedisCodec<K, V> codec) {
@@ -52,8 +56,49 @@ public RedisClusterPubSubReactiveCommandsImpl(StatefulRedisClusterPubSubConnecti
     }
 
     @Override
-    public StatefulRedisClusterPubSubConnection<K, V> getStatefulConnection() {
-        return (StatefulRedisClusterPubSubConnection<K, V>) super.getStatefulConnection();
+    public Flux<V> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
+
+        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+            return super.georadius_ro(key, longitude, latitude, distance, unit);
+        }
+
+        return super.georadius(key, longitude, latitude, distance, unit);
+    }
+
+    @Override
+    public Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit,
+            GeoArgs geoArgs) {
+
+        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+            return super.georadius_ro(key, longitude, latitude, distance, unit, geoArgs);
+        }
+
+        return super.georadius(key, longitude, latitude, distance, unit, geoArgs);
+    }
+
+    @Override
+    public Flux<V> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit) {
+
+        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+            return super.georadiusbymember_ro(key, member, distance, unit);
+        }
+
+        return super.georadiusbymember(key, member, distance, unit);
+    }
+
+    @Override
+    public Flux<GeoWithin<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs) {
+
+        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+            return super.georadiusbymember_ro(key, member, distance, unit, geoArgs);
+        }
+
+        return super.georadiusbymember(key, member, distance, unit, geoArgs);
+    }
+
+    @Override
+    public StatefulRedisClusterPubSubConnectionImpl<K, V> getStatefulConnection() {
+        return (StatefulRedisClusterPubSubConnectionImpl<K, V>) super.getStatefulConnection();
     }
 
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/io/lettuce/core/cluster/RedisState.java b/src/main/java/io/lettuce/core/cluster/RedisState.java
new file mode 100644
index 0000000000..2a2ec5a84a
--- /dev/null
+++ b/src/main/java/io/lettuce/core/cluster/RedisState.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster;
+
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+import io.lettuce.core.models.command.CommandDetail;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.ProtocolKeyword;
+
+/**
+ * Value object representing the current Redis state regarding its commands.
+ * <p>
+ * {@link RedisState} caches command details and uses {@link CommandType}.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+class RedisState {
+
+    private final Map<String, CommandDetail> commands;
+    private final EnumSet<CommandType> availableCommands = EnumSet.noneOf(CommandType.class);
+
+    public RedisState(Collection<CommandDetail> commands) {
+
+        Map<String, CommandDetail> map = new HashMap<>();
+
+        for (CommandDetail command : commands) {
+
+            map.put(command.getName().toLowerCase(), command);
+
+            CommandType commandType = getCommandType(command);
+            if (commandType != null) {
+                availableCommands.add(commandType);
+            }
+        }
+
+        this.commands = map;
+    }
+
+    private static CommandType getCommandType(CommandDetail command) {
+
+        try {
+            return CommandType.valueOf(command.getName().toLowerCase());
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Check whether Redis supports a particular command given a {@link ProtocolKeyword}. Querying commands using
+     * {@link CommandType} yields a better performance than other subtypes of {@link ProtocolKeyword}.
+     *
+     * @param commandName the command name, must not be {@literal null}.
+     * @return {@literal true} if the command is supported/available.
+     */
+    public boolean hasCommand(ProtocolKeyword commandName) {
+
+        if (commandName instanceof CommandType) {
+            return availableCommands.contains(commandName);
+        }
+
+        return commands.containsKey(commandName.name().toLowerCase());
+    }
+}
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
index d31e5b1a31..04e438be10 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
@@ -41,6 +41,7 @@
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.models.command.CommandDetailParser;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
 
@@ -67,6 +68,8 @@ public class StatefulRedisClusterConnectionImpl<K, V> extends RedisChannelHandle
     protected final RedisAdvancedClusterAsyncCommandsImpl<K, V> async;
     protected final RedisAdvancedClusterReactiveCommandsImpl<K, V> reactive;
 
+    private volatile RedisState state;
+
     /**
      * Initialize a new connection.
      *
@@ -105,6 +108,14 @@ public RedisAdvancedClusterReactiveCommands<K, V> reactive() {
         return reactive;
     }
 
+    void inspectRedisState() {
+        this.state = new RedisState(CommandDetailParser.parse(sync().command()));
+    }
+
+    RedisState getState() {
+        return state;
+    }
+
     private RedisURI lookup(String nodeId) {
 
         for (RedisClusterNode partition : partitions) {
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
index fda9e32c33..ad21b088db 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
@@ -33,6 +33,7 @@
 import io.lettuce.core.cluster.pubsub.api.sync.PubSubNodeSelection;
 import io.lettuce.core.cluster.pubsub.api.sync.RedisClusterPubSubCommands;
 import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.models.command.CommandDetailParser;
 import io.lettuce.core.pubsub.RedisPubSubAsyncCommandsImpl;
 import io.lettuce.core.pubsub.RedisPubSubReactiveCommandsImpl;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
@@ -48,6 +49,7 @@ class StatefulRedisClusterPubSubConnectionImpl<K, V> extends StatefulRedisPubSub
 
     private final PubSubClusterEndpoint<K, V> endpoint;
     private volatile Partitions partitions;
+    private volatile RedisState redisState;
 
     /**
      * Initialize a new connection.
@@ -102,6 +104,14 @@ protected RedisPubSubReactiveCommandsImpl<K, V> newRedisReactiveCommandsImpl() {
         return new RedisClusterPubSubReactiveCommandsImpl<K, V>(this, codec);
     }
 
+    void inspectRedisState() {
+        this.redisState = new RedisState(CommandDetailParser.parse(sync().command()));
+    }
+
+    RedisState getState() {
+        return redisState;
+    }
+
     @Override
     public void activated() {
         super.activated();
diff --git a/src/main/java/io/lettuce/core/protocol/CommandType.java b/src/main/java/io/lettuce/core/protocol/CommandType.java
index 368af7f1f5..c164f16e94 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandType.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,7 +79,7 @@ public enum CommandType implements ProtocolKeyword {
     BITCOUNT, BITFIELD, BITOP, GETBIT, SETBIT, BITPOS,
 
     // Geo
-    GEOADD, GEORADIUS, GEORADIUSBYMEMBER, GEOENCODE, GEODECODE, GEOPOS, GEODIST, GEOHASH,
+    GEOADD, GEORADIUS, GEORADIUS_RO, GEORADIUSBYMEMBER, GEORADIUSBYMEMBER_RO, GEOENCODE, GEODECODE, GEOPOS, GEODIST, GEOHASH,
 
     // Others
     TIME, WAIT,

From 6feb65a97e5d3ad211f3503662e7d0acea6c8859 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 7 Jul 2017 10:29:16 +0200
Subject: [PATCH 254/808] Polishing

Order command methods in advanced cluster API by name.
---
 ...RedisAdvancedClusterAsyncCommandsImpl.java | 402 +++++++++---------
 ...isAdvancedClusterReactiveCommandsImpl.java | 398 ++++++++---------
 2 files changed, 400 insertions(+), 400 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index e248252716..8b656e28cb 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -76,48 +76,90 @@ public RedisAdvancedClusterAsyncCommandsImpl(StatefulRedisClusterConnectionImpl<
     }
 
     @Override
-    public RedisFuture<Long> del(K... keys) {
-        return del(Arrays.asList(keys));
+    public RedisFuture<String> clientSetname(K name) {
+
+        Map<String, CompletionStage<String>> executions = new HashMap<>();
+
+        CompletableFuture<String> ok = CompletableFuture.completedFuture("OK");
+
+        executions.put("Default", super.clientSetname(name).toCompletableFuture());
+
+        for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
+
+            RedisURI uri = redisClusterNode.getUri();
+
+            CompletableFuture<RedisClusterAsyncCommands<K, V>> byNodeId = getConnectionAsync(redisClusterNode.getNodeId());
+
+            executions.put("NodeId: " + redisClusterNode.getNodeId(), byNodeId.thenCompose(c -> {
+
+                if (c.isOpen()) {
+                    return c.clientSetname(name);
+                }
+                return ok;
+            }));
+
+            CompletableFuture<RedisClusterAsyncCommands<K, V>> byHost = getConnectionAsync(uri.getHost(), uri.getPort());
+
+            executions.put("HostAndPort: " + redisClusterNode.getNodeId(), byHost.thenCompose(c -> {
+
+                if (c.isOpen()) {
+                    return c.clientSetname(name);
+                }
+                return ok;
+            }));
+        }
+
+        return MultiNodeExecution.firstOfAsync(executions);
     }
 
     @Override
-    public RedisFuture<Long> del(Iterable<K> keys) {
+    public RedisFuture<Long> clusterCountKeysInSlot(int slot) {
 
-        Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
+        RedisClusterAsyncCommands<K, V> connectionBySlot = findConnectionBySlot(slot);
 
-        if (partitioned.size() < 2) {
-            return super.del(keys);
+        if (connectionBySlot != null) {
+            return connectionBySlot.clusterCountKeysInSlot(slot);
         }
 
-        Map<Integer, RedisFuture<Long>> executions = new HashMap<>();
+        return super.clusterCountKeysInSlot(slot);
+    }
 
-        for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            RedisFuture<Long> del = super.del(entry.getValue());
-            executions.put(entry.getKey(), del);
+    @Override
+    public RedisFuture<List<K>> clusterGetKeysInSlot(int slot, int count) {
+
+        RedisClusterAsyncCommands<K, V> connectionBySlot = findConnectionBySlot(slot);
+
+        if (connectionBySlot != null) {
+            return connectionBySlot.clusterGetKeysInSlot(slot, count);
         }
 
-        return MultiNodeExecution.aggregateAsync(executions);
+        return super.clusterGetKeysInSlot(slot, count);
     }
 
     @Override
-    public RedisFuture<Long> unlink(K... keys) {
-        return unlink(Arrays.asList(keys));
+    public RedisFuture<Long> dbsize() {
+        return MultiNodeExecution.aggregateAsync(executeOnMasters(RedisServerAsyncCommands::dbsize));
     }
 
     @Override
-    public RedisFuture<Long> unlink(Iterable<K> keys) {
+    public RedisFuture<Long> del(K... keys) {
+        return del(Arrays.asList(keys));
+    }
+
+    @Override
+    public RedisFuture<Long> del(Iterable<K> keys) {
 
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
 
         if (partitioned.size() < 2) {
-            return super.unlink(keys);
+            return super.del(keys);
         }
 
         Map<Integer, RedisFuture<Long>> executions = new HashMap<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            RedisFuture<Long> unlink = super.unlink(entry.getValue());
-            executions.put(entry.getKey(), unlink);
+            RedisFuture<Long> del = super.del(entry.getValue());
+            executions.put(entry.getKey(), del);
         }
 
         return MultiNodeExecution.aggregateAsync(executions);
@@ -146,6 +188,79 @@ public RedisFuture<Long> exists(Iterable<K> keys) {
         return MultiNodeExecution.aggregateAsync(executions);
     }
 
+    @Override
+    public RedisFuture<String> flushall() {
+        return MultiNodeExecution.firstOfAsync(executeOnMasters(RedisServerAsyncCommands::flushall));
+    }
+
+    @Override
+    public RedisFuture<String> flushdb() {
+        return MultiNodeExecution.firstOfAsync(executeOnMasters(RedisServerAsyncCommands::flushdb));
+    }
+
+    @Override
+    public RedisFuture<Set<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
+
+        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+            return super.georadius_ro(key, longitude, latitude, distance, unit);
+        }
+
+        return super.georadius(key, longitude, latitude, distance, unit);
+    }
+
+    @Override
+    public RedisFuture<List<GeoWithin<V>>> georadius(K key, double longitude, double latitude, double distance,
+            GeoArgs.Unit unit, GeoArgs geoArgs) {
+
+        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+            return super.georadius_ro(key, longitude, latitude, distance, unit, geoArgs);
+        }
+
+        return super.georadius(key, longitude, latitude, distance, unit, geoArgs);
+    }
+
+    @Override
+    public RedisFuture<Set<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit) {
+
+        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUSBYMEMBER_RO)) {
+            return super.georadiusbymember_ro(key, member, distance, unit);
+        }
+
+        return super.georadiusbymember(key, member, distance, unit);
+    }
+
+    @Override
+    public RedisFuture<List<GeoWithin<V>>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit,
+            GeoArgs geoArgs) {
+
+        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUSBYMEMBER_RO)) {
+            return super.georadiusbymember_ro(key, member, distance, unit, geoArgs);
+        }
+
+        return super.georadiusbymember(key, member, distance, unit, geoArgs);
+    }
+
+    @Override
+    public RedisFuture<List<K>> keys(K pattern) {
+
+        Map<String, CompletableFuture<List<K>>> executions = executeOnMasters(commands -> commands.keys(pattern));
+
+        return new PipelinedRedisFuture<>(executions, objectPipelinedRedisFuture -> {
+            List<K> result = new ArrayList<>();
+            for (CompletableFuture<List<K>> future : executions.values()) {
+                result.addAll(MultiNodeExecution.execute(future::get));
+            }
+            return result;
+        });
+    }
+
+    @Override
+    public RedisFuture<Long> keys(KeyStreamingChannel<K> channel, K pattern) {
+
+        Map<String, CompletableFuture<Long>> executions = executeOnMasters(commands -> commands.keys(channel, pattern));
+        return MultiNodeExecution.aggregateAsync(executions);
+    }
+
     @Override
     public RedisFuture<List<KeyValue<K, V>>> mget(K... keys) {
         return mget(Arrays.asList(keys));
@@ -262,121 +377,16 @@ public RedisFuture<Boolean> msetnx(Map<K, V> map) {
     }
 
     @Override
-    public RedisFuture<String> clientSetname(K name) {
-
-        Map<String, CompletionStage<String>> executions = new HashMap<>();
-
-        CompletableFuture<String> ok = CompletableFuture.completedFuture("OK");
-
-        executions.put("Default", super.clientSetname(name).toCompletableFuture());
-
-        for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
-
-            RedisURI uri = redisClusterNode.getUri();
-
-            CompletableFuture<RedisClusterAsyncCommands<K, V>> byNodeId = getConnectionAsync(redisClusterNode.getNodeId());
-
-            executions.put("NodeId: " + redisClusterNode.getNodeId(), byNodeId.thenCompose(c -> {
-
-                if (c.isOpen()) {
-                    return c.clientSetname(name);
-                }
-                return ok;
-            }));
-
-            CompletableFuture<RedisClusterAsyncCommands<K, V>> byHost = getConnectionAsync(uri.getHost(), uri.getPort());
-
-            executions.put("HostAndPort: " + redisClusterNode.getNodeId(), byHost.thenCompose(c -> {
-
-                if (c.isOpen()) {
-                    return c.clientSetname(name);
-                }
-                return ok;
-            }));
-        }
-
-        return MultiNodeExecution.firstOfAsync(executions);
-    }
-
-    @Override
-    public RedisFuture<List<K>> clusterGetKeysInSlot(int slot, int count) {
-
-        RedisClusterAsyncCommands<K, V> connectionBySlot = findConnectionBySlot(slot);
-
-        if (connectionBySlot != null) {
-            return connectionBySlot.clusterGetKeysInSlot(slot, count);
-        }
-
-        return super.clusterGetKeysInSlot(slot, count);
-    }
-
-    @Override
-    public RedisFuture<Long> clusterCountKeysInSlot(int slot) {
-
-        RedisClusterAsyncCommands<K, V> connectionBySlot = findConnectionBySlot(slot);
-
-        if (connectionBySlot != null) {
-            return connectionBySlot.clusterCountKeysInSlot(slot);
-        }
-
-        return super.clusterCountKeysInSlot(slot);
-    }
-
-    @Override
-    public RedisFuture<Long> dbsize() {
-        return MultiNodeExecution.aggregateAsync(executeOnMasters(RedisServerAsyncCommands::dbsize));
-    }
-
-    @Override
-    public RedisFuture<String> flushall() {
-        return MultiNodeExecution.firstOfAsync(executeOnMasters(RedisServerAsyncCommands::flushall));
-    }
-
-    @Override
-    public RedisFuture<String> flushdb() {
-        return MultiNodeExecution.firstOfAsync(executeOnMasters(RedisServerAsyncCommands::flushdb));
-    }
-
-    @Override
-    public RedisFuture<Set<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
-
-        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
-            return super.georadius_ro(key, longitude, latitude, distance, unit);
-        }
-
-        return super.georadius(key, longitude, latitude, distance, unit);
-    }
-
-    @Override
-    public RedisFuture<List<GeoWithin<V>>> georadius(K key, double longitude, double latitude, double distance,
-            GeoArgs.Unit unit, GeoArgs geoArgs) {
-
-        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
-            return super.georadius_ro(key, longitude, latitude, distance, unit, geoArgs);
-        }
-
-        return super.georadius(key, longitude, latitude, distance, unit, geoArgs);
-    }
-
-    @Override
-    public RedisFuture<Set<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit) {
-
-        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUSBYMEMBER_RO)) {
-            return super.georadiusbymember_ro(key, member, distance, unit);
-        }
-
-        return super.georadiusbymember(key, member, distance, unit);
-    }
+    public RedisFuture<V> randomkey() {
 
-    @Override
-    public RedisFuture<List<GeoWithin<V>>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit,
-            GeoArgs geoArgs) {
+        Partitions partitions = getStatefulConnection().getPartitions();
+        int index = ThreadLocalRandom.current().nextInt(partitions.size());
+        RedisClusterNode partition = partitions.getPartition(index);
 
-        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUSBYMEMBER_RO)) {
-            return super.georadiusbymember_ro(key, member, distance, unit, geoArgs);
-        }
+        CompletableFuture<V> future = getConnectionAsync(partition.getUri().getHost(), partition.getUri().getPort())
+                .thenCompose(RedisKeyAsyncCommands::randomkey);
 
-        return super.georadiusbymember(key, member, distance, unit, geoArgs);
+        return new PipelinedRedisFuture<>(future);
     }
 
     @Override
@@ -395,40 +405,6 @@ public RedisFuture<String> scriptKill() {
         return MultiNodeExecution.alwaysOkOfAsync(executions);
     }
 
-    @Override
-    public RedisFuture<V> randomkey() {
-
-        Partitions partitions = getStatefulConnection().getPartitions();
-        int index = ThreadLocalRandom.current().nextInt(partitions.size());
-        RedisClusterNode partition = partitions.getPartition(index);
-
-        CompletableFuture<V> future = getConnectionAsync(partition.getUri().getHost(), partition.getUri().getPort())
-                .thenCompose(RedisKeyAsyncCommands::randomkey);
-
-        return new PipelinedRedisFuture<>(future);
-    }
-
-    @Override
-    public RedisFuture<List<K>> keys(K pattern) {
-
-        Map<String, CompletableFuture<List<K>>> executions = executeOnMasters(commands -> commands.keys(pattern));
-
-        return new PipelinedRedisFuture<>(executions, objectPipelinedRedisFuture -> {
-            List<K> result = new ArrayList<>();
-            for (CompletableFuture<List<K>> future : executions.values()) {
-                result.addAll(MultiNodeExecution.execute(future::get));
-            }
-            return result;
-        });
-    }
-
-    @Override
-    public RedisFuture<Long> keys(KeyStreamingChannel<K> channel, K pattern) {
-
-        Map<String, CompletableFuture<Long>> executions = executeOnMasters(commands -> commands.keys(channel, pattern));
-        return MultiNodeExecution.aggregateAsync(executions);
-    }
-
     @Override
     public void shutdown(boolean save) {
 
@@ -464,52 +440,28 @@ public RedisFuture<Long> touch(Iterable<K> keys) {
         return MultiNodeExecution.aggregateAsync(executions);
     }
 
-    /**
-     * Run a command on all available masters,
-     *
-     * @param function function producing the command
-     * @param <T> result type
-     * @return map of a key (counter) and commands.
-     */
-    protected <T> Map<String, CompletableFuture<T>> executeOnMasters(
-            Function<RedisClusterAsyncCommands<K, V>, RedisFuture<T>> function) {
-        return executeOnNodes(function, redisClusterNode -> redisClusterNode.is(MASTER));
+    @Override
+    public RedisFuture<Long> unlink(K... keys) {
+        return unlink(Arrays.asList(keys));
     }
 
-    /**
-     * Run a command on all available nodes that match {@code filter}.
-     *
-     * @param function function producing the command
-     * @param filter filter function for the node selection
-     * @param <T> result type
-     * @return map of a key (counter) and commands.
-     */
-    protected <T> Map<String, CompletableFuture<T>> executeOnNodes(
-            Function<RedisClusterAsyncCommands<K, V>, RedisFuture<T>> function, Function<RedisClusterNode, Boolean> filter) {
-        Map<String, CompletableFuture<T>> executions = new HashMap<>();
-
-        for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
-
-            if (!filter.apply(redisClusterNode)) {
-                continue;
-            }
-
-            RedisURI uri = redisClusterNode.getUri();
-            CompletableFuture<RedisClusterAsyncCommands<K, V>> connection = getConnectionAsync(uri.getHost(), uri.getPort());
+    @Override
+    public RedisFuture<Long> unlink(Iterable<K> keys) {
 
-            executions.put(redisClusterNode.getNodeId(), connection.thenCompose(function::apply));
+        Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
 
+        if (partitioned.size() < 2) {
+            return super.unlink(keys);
         }
-        return executions;
-    }
 
-    private RedisClusterAsyncCommands<K, V> findConnectionBySlot(int slot) {
-        RedisClusterNode node = getStatefulConnection().getPartitions().getPartitionBySlot(slot);
-        if (node != null) {
-            return getConnection(node.getUri().getHost(), node.getUri().getPort());
+        Map<Integer, RedisFuture<Long>> executions = new HashMap<>();
+
+        for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
+            RedisFuture<Long> unlink = super.unlink(entry.getValue());
+            executions.put(entry.getKey(), unlink);
         }
 
-        return null;
+        return MultiNodeExecution.aggregateAsync(executions);
     }
 
     @Override
@@ -631,6 +583,54 @@ private <T extends ScanCursor> RedisFuture<T> clusterScan(ScanCursor cursor,
         return clusterScan(getStatefulConnection(), cursor, scanFunction, resultMapper);
     }
 
+    /**
+     * Run a command on all available masters,
+     *
+     * @param function function producing the command
+     * @param <T> result type
+     * @return map of a key (counter) and commands.
+     */
+    protected <T> Map<String, CompletableFuture<T>> executeOnMasters(
+            Function<RedisClusterAsyncCommands<K, V>, RedisFuture<T>> function) {
+        return executeOnNodes(function, redisClusterNode -> redisClusterNode.is(MASTER));
+    }
+
+    /**
+     * Run a command on all available nodes that match {@code filter}.
+     *
+     * @param function function producing the command
+     * @param filter filter function for the node selection
+     * @param <T> result type
+     * @return map of a key (counter) and commands.
+     */
+    protected <T> Map<String, CompletableFuture<T>> executeOnNodes(
+            Function<RedisClusterAsyncCommands<K, V>, RedisFuture<T>> function, Function<RedisClusterNode, Boolean> filter) {
+        Map<String, CompletableFuture<T>> executions = new HashMap<>();
+
+        for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
+
+            if (!filter.apply(redisClusterNode)) {
+                continue;
+            }
+
+            RedisURI uri = redisClusterNode.getUri();
+            CompletableFuture<RedisClusterAsyncCommands<K, V>> connection = getConnectionAsync(uri.getHost(), uri.getPort());
+
+            executions.put(redisClusterNode.getNodeId(), connection.thenCompose(function::apply));
+
+        }
+        return executions;
+    }
+
+    private RedisClusterAsyncCommands<K, V> findConnectionBySlot(int slot) {
+        RedisClusterNode node = getStatefulConnection().getPartitions().getPartitionBySlot(slot);
+        if (node != null) {
+            return getConnection(node.getUri().getHost(), node.getUri().getPort());
+        }
+
+        return null;
+    }
+
     /**
      * Perform a SCAN in the cluster.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index f1d009e1db..b2484cb8aa 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -68,46 +68,80 @@ public RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnectionIm
     }
 
     @Override
-    public Mono<Long> del(K... keys) {
-        return del(Arrays.asList(keys));
+    public Mono<String> clientSetname(K name) {
+
+        List<Publisher<String>> publishers = new ArrayList<>();
+
+        publishers.add(super.clientSetname(name));
+
+        for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
+
+            Mono<RedisClusterReactiveCommands<K, V>> byNodeId = getConnectionReactive(redisClusterNode.getNodeId());
+
+            publishers.add(byNodeId.flatMap(conn -> {
+
+                if (conn.isOpen()) {
+                    return conn.clientSetname(name);
+                }
+                return Mono.empty();
+            }));
+
+            Mono<RedisClusterReactiveCommands<K, V>> byHost = getConnectionReactive(redisClusterNode.getUri().getHost(),
+                    redisClusterNode.getUri().getPort());
+
+            publishers.add(byHost.flatMap(conn -> {
+
+                if (conn.isOpen()) {
+                    return conn.clientSetname(name);
+                }
+                return Mono.empty();
+            }));
+        }
+
+        return Flux.merge(publishers).last();
     }
 
     @Override
-    public Mono<Long> del(Iterable<K> keys) {
+    public Mono<Long> clusterCountKeysInSlot(int slot) {
 
-        Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
+        Mono<RedisClusterReactiveCommands<K, V>> connectionBySlot = findConnectionBySlotReactive(slot);
 
-        if (partitioned.size() < 2) {
-            return super.del(keys);
-        }
+        return connectionBySlot.flatMap(cmd -> cmd.clusterCountKeysInSlot(slot));
+    }
 
-        List<Publisher<Long>> publishers = new ArrayList<>();
+    @Override
+    public Flux<K> clusterGetKeysInSlot(int slot, int count) {
 
-        for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            publishers.add(super.del(entry.getValue()));
-        }
+        Mono<RedisClusterReactiveCommands<K, V>> connectionBySlot = findConnectionBySlotReactive(slot);
 
-        return Flux.merge(publishers).reduce((accu, next) -> accu + next);
+        return connectionBySlot.flatMapMany(conn -> conn.clusterGetKeysInSlot(slot, count));
     }
 
     @Override
-    public Mono<Long> unlink(K... keys) {
-        return unlink(Arrays.asList(keys));
+    public Mono<Long> dbsize() {
+
+        Map<String, Flux<Long>> publishers = executeOnMasters((commands) -> commands.dbsize().flux());
+        return Flux.merge(publishers.values()).reduce((accu, next) -> accu + next);
     }
 
     @Override
-    public Mono<Long> unlink(Iterable<K> keys) {
+    public Mono<Long> del(K... keys) {
+        return del(Arrays.asList(keys));
+    }
+
+    @Override
+    public Mono<Long> del(Iterable<K> keys) {
 
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
 
         if (partitioned.size() < 2) {
-            return super.unlink(keys);
+            return super.del(keys);
         }
 
         List<Publisher<Long>> publishers = new ArrayList<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            publishers.add(super.unlink(entry.getValue()));
+            publishers.add(super.del(entry.getValue()));
         }
 
         return Flux.merge(publishers).reduce((accu, next) -> accu + next);
@@ -137,6 +171,76 @@ public Mono<Long> exists(Iterable<K> keys) {
         return Flux.merge(publishers).reduce((accu, next) -> accu + next);
     }
 
+    @Override
+    public Mono<String> flushall() {
+
+        Map<String, Flux<String>> publishers = executeOnMasters((kvRedisClusterReactiveCommancommandss) -> kvRedisClusterReactiveCommancommandss
+                .flushall().flux());
+        return Flux.merge(publishers.values()).last();
+    }
+
+    @Override
+    public Mono<String> flushdb() {
+
+        Map<String, Flux<String>> publishers = executeOnMasters((commands) -> commands.flushdb().flux());
+        return Flux.merge(publishers.values()).last();
+    }
+
+    @Override
+    public Flux<V> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
+
+        if (getStatefulConnection().getState().hasCommand(GEORADIUS_RO)) {
+            return super.georadius_ro(key, longitude, latitude, distance, unit);
+        }
+
+        return super.georadius(key, longitude, latitude, distance, unit);
+    }
+
+    @Override
+    public Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit,
+            GeoArgs geoArgs) {
+
+        if (getStatefulConnection().getState().hasCommand(GEORADIUS_RO)) {
+            return super.georadius_ro(key, longitude, latitude, distance, unit, geoArgs);
+        }
+
+        return super.georadius(key, longitude, latitude, distance, unit, geoArgs);
+    }
+
+    @Override
+    public Flux<V> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit) {
+
+        if (getStatefulConnection().getState().hasCommand(GEORADIUSBYMEMBER_RO)) {
+            return super.georadiusbymember_ro(key, member, distance, unit);
+        }
+
+        return super.georadiusbymember(key, member, distance, unit);
+    }
+
+    @Override
+    public Flux<GeoWithin<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs) {
+
+        if (getStatefulConnection().getState().hasCommand(GEORADIUSBYMEMBER_RO)) {
+            return super.georadiusbymember_ro(key, member, distance, unit, geoArgs);
+        }
+
+        return super.georadiusbymember(key, member, distance, unit, geoArgs);
+    }
+
+    @Override
+    public Flux<K> keys(K pattern) {
+
+        Map<String, Flux<K>> publishers = executeOnMasters(commands -> commands.keys(pattern));
+        return Flux.merge(publishers.values());
+    }
+
+    @Override
+    public Mono<Long> keys(KeyStreamingChannel<K> channel, K pattern) {
+
+        Map<String, Flux<Long>> publishers = executeOnMasters(commands -> commands.keys(channel, pattern).flux());
+        return Flux.merge(publishers.values()).reduce((accu, next) -> accu + next);
+    }
+
     @Override
     public Flux<KeyValue<K, V>> mget(K... keys) {
         return mget(Arrays.asList(keys));
@@ -223,133 +327,6 @@ public Mono<String> mset(Map<K, V> map) {
                 booleanFlux -> booleanFlux).last();
     }
 
-    @Override
-    public Flux<K> clusterGetKeysInSlot(int slot, int count) {
-
-        Mono<RedisClusterReactiveCommands<K, V>> connectionBySlot = findConnectionBySlotReactive(slot);
-
-        return connectionBySlot.flatMapMany(conn -> conn.clusterGetKeysInSlot(slot, count));
-    }
-
-    @Override
-    public Mono<Long> clusterCountKeysInSlot(int slot) {
-
-        Mono<RedisClusterReactiveCommands<K, V>> connectionBySlot = findConnectionBySlotReactive(slot);
-
-        return connectionBySlot.flatMap(cmd -> cmd.clusterCountKeysInSlot(slot));
-    }
-
-    @Override
-    public Mono<String> clientSetname(K name) {
-
-        List<Publisher<String>> publishers = new ArrayList<>();
-
-        publishers.add(super.clientSetname(name));
-
-        for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
-
-            Mono<RedisClusterReactiveCommands<K, V>> byNodeId = getConnectionReactive(redisClusterNode.getNodeId());
-
-            publishers.add(byNodeId.flatMap(conn -> {
-
-                if (conn.isOpen()) {
-                    return conn.clientSetname(name);
-                }
-                return Mono.empty();
-            }));
-
-            Mono<RedisClusterReactiveCommands<K, V>> byHost = getConnectionReactive(redisClusterNode.getUri().getHost(),
-                    redisClusterNode.getUri().getPort());
-
-            publishers.add(byHost.flatMap(conn -> {
-
-                if (conn.isOpen()) {
-                    return conn.clientSetname(name);
-                }
-                return Mono.empty();
-            }));
-        }
-
-        return Flux.merge(publishers).last();
-    }
-
-    @Override
-    public Mono<Long> dbsize() {
-
-        Map<String, Flux<Long>> publishers = executeOnMasters((commands) -> commands.dbsize().flux());
-        return Flux.merge(publishers.values()).reduce((accu, next) -> accu + next);
-    }
-
-    @Override
-    public Mono<String> flushall() {
-
-        Map<String, Flux<String>> publishers = executeOnMasters((kvRedisClusterReactiveCommancommandss) -> kvRedisClusterReactiveCommancommandss
-                .flushall().flux());
-        return Flux.merge(publishers.values()).last();
-    }
-
-    @Override
-    public Mono<String> flushdb() {
-
-        Map<String, Flux<String>> publishers = executeOnMasters((commands) -> commands.flushdb().flux());
-        return Flux.merge(publishers.values()).last();
-    }
-
-    @Override
-    public Flux<V> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
-
-        if (getStatefulConnection().getState().hasCommand(GEORADIUS_RO)) {
-            return super.georadius_ro(key, longitude, latitude, distance, unit);
-        }
-
-        return super.georadius(key, longitude, latitude, distance, unit);
-    }
-
-    @Override
-    public Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit,
-            GeoArgs geoArgs) {
-
-        if (getStatefulConnection().getState().hasCommand(GEORADIUS_RO)) {
-            return super.georadius_ro(key, longitude, latitude, distance, unit, geoArgs);
-        }
-
-        return super.georadius(key, longitude, latitude, distance, unit, geoArgs);
-    }
-
-    @Override
-    public Flux<V> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit) {
-
-        if (getStatefulConnection().getState().hasCommand(GEORADIUSBYMEMBER_RO)) {
-            return super.georadiusbymember_ro(key, member, distance, unit);
-        }
-
-        return super.georadiusbymember(key, member, distance, unit);
-    }
-
-    @Override
-    public Flux<GeoWithin<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs) {
-
-        if (getStatefulConnection().getState().hasCommand(GEORADIUSBYMEMBER_RO)) {
-            return super.georadiusbymember_ro(key, member, distance, unit, geoArgs);
-        }
-
-        return super.georadiusbymember(key, member, distance, unit, geoArgs);
-    }
-
-    @Override
-    public Flux<K> keys(K pattern) {
-
-        Map<String, Flux<K>> publishers = executeOnMasters(commands -> commands.keys(pattern));
-        return Flux.merge(publishers.values());
-    }
-
-    @Override
-    public Mono<Long> keys(KeyStreamingChannel<K> channel, K pattern) {
-
-        Map<String, Flux<Long>> publishers = executeOnMasters(commands -> commands.keys(channel, pattern).flux());
-        return Flux.merge(publishers.values()).reduce((accu, next) -> accu + next);
-    }
-
     @Override
     public Mono<V> randomkey() {
 
@@ -404,52 +381,27 @@ public Mono<Long> touch(Iterable<K> keys) {
         return Flux.merge(publishers).reduce((accu, next) -> accu + next);
     }
 
-    /**
-     * Run a command on all available masters,
-     *
-     * @param function function producing the command
-     * @param <T> result type
-     * @return map of a key (counter) and commands.
-     */
-    protected <T> Map<String, Flux<T>> executeOnMasters(Function<RedisClusterReactiveCommands<K, V>, Flux<T>> function) {
-        return executeOnNodes(function, redisClusterNode -> redisClusterNode.is(MASTER));
+    @Override
+    public Mono<Long> unlink(K... keys) {
+        return unlink(Arrays.asList(keys));
     }
 
-    /**
-     * Run a command on all available nodes that match {@code filter}.
-     *
-     * @param function function producing the command
-     * @param filter filter function for the node selection
-     * @param <T> result type
-     * @return map of a key (counter) and commands.
-     */
-    protected <T> Map<String, Flux<T>> executeOnNodes(Function<RedisClusterReactiveCommands<K, V>, Flux<T>> function,
-            Function<RedisClusterNode, Boolean> filter) {
-
-        Map<String, Flux<T>> executions = new HashMap<>();
-
-        for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
-
-            if (!filter.apply(redisClusterNode)) {
-                continue;
-            }
+    @Override
+    public Mono<Long> unlink(Iterable<K> keys) {
 
-            RedisURI uri = redisClusterNode.getUri();
-            Mono<RedisClusterReactiveCommands<K, V>> connection = getConnectionReactive(uri.getHost(), uri.getPort());
+        Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
 
-            executions.put(redisClusterNode.getNodeId(), connection.flatMapMany(function::apply));
+        if (partitioned.size() < 2) {
+            return super.unlink(keys);
         }
-        return executions;
-    }
 
-    private Mono<RedisClusterReactiveCommands<K, V>> findConnectionBySlotReactive(int slot) {
+        List<Publisher<Long>> publishers = new ArrayList<>();
 
-        RedisClusterNode node = getStatefulConnection().getPartitions().getPartitionBySlot(slot);
-        if (node != null) {
-            return getConnectionReactive(node.getUri().getHost(), node.getUri().getPort());
+        for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
+            publishers.add(super.unlink(entry.getValue()));
         }
 
-        return Mono.error(new RedisException("No partition for slot " + slot));
+        return Flux.merge(publishers).reduce((accu, next) -> accu + next);
     }
 
     @Override
@@ -536,6 +488,72 @@ private <T extends ScanCursor> Mono<T> clusterScan(ScanCursor cursor,
         return clusterScan(getStatefulConnection(), cursor, scanFunction, (ClusterScanSupport.ScanCursorMapper) resultMapper);
     }
 
+    private <T> Flux<T> pipeliningWithMap(Map<K, V> map, Function<Map<K, V>, Flux<T>> function,
+            Function<Flux<T>, Flux<T>> resultFunction) {
+
+        Map<Integer, List<K>> partitioned = SlotHash.partition(codec, map.keySet());
+
+        if (partitioned.size() < 2) {
+            return function.apply(map);
+        }
+
+        List<Flux<T>> publishers = partitioned.values().stream().map(ks -> {
+            Map<K, V> op = new HashMap<>();
+            ks.forEach(k -> op.put(k, map.get(k)));
+            return function.apply(op);
+        }).collect(Collectors.toList());
+
+        return resultFunction.apply(Flux.merge(publishers));
+    }
+
+    /**
+     * Run a command on all available masters,
+     *
+     * @param function function producing the command
+     * @param <T> result type
+     * @return map of a key (counter) and commands.
+     */
+    protected <T> Map<String, Flux<T>> executeOnMasters(Function<RedisClusterReactiveCommands<K, V>, Flux<T>> function) {
+        return executeOnNodes(function, redisClusterNode -> redisClusterNode.is(MASTER));
+    }
+
+    /**
+     * Run a command on all available nodes that match {@code filter}.
+     *
+     * @param function function producing the command
+     * @param filter filter function for the node selection
+     * @param <T> result type
+     * @return map of a key (counter) and commands.
+     */
+    protected <T> Map<String, Flux<T>> executeOnNodes(Function<RedisClusterReactiveCommands<K, V>, Flux<T>> function,
+            Function<RedisClusterNode, Boolean> filter) {
+
+        Map<String, Flux<T>> executions = new HashMap<>();
+
+        for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
+
+            if (!filter.apply(redisClusterNode)) {
+                continue;
+            }
+
+            RedisURI uri = redisClusterNode.getUri();
+            Mono<RedisClusterReactiveCommands<K, V>> connection = getConnectionReactive(uri.getHost(), uri.getPort());
+
+            executions.put(redisClusterNode.getNodeId(), connection.flatMapMany(function::apply));
+        }
+        return executions;
+    }
+
+    private Mono<RedisClusterReactiveCommands<K, V>> findConnectionBySlotReactive(int slot) {
+
+        RedisClusterNode node = getStatefulConnection().getPartitions().getPartitionBySlot(slot);
+        if (node != null) {
+            return getConnectionReactive(node.getUri().getHost(), node.getUri().getPort());
+        }
+
+        return Mono.error(new RedisException("No partition for slot " + slot));
+    }
+
     /**
      * Perform a SCAN in the cluster.
      *
@@ -556,24 +574,6 @@ static <T extends ScanCursor, K, V> Mono<T> clusterScan(StatefulRedisClusterConn
         return mapper.map(nodeIds, currentNodeId, scanCursor);
     }
 
-    private <T> Flux<T> pipeliningWithMap(Map<K, V> map, Function<Map<K, V>, Flux<T>> function,
-            Function<Flux<T>, Flux<T>> resultFunction) {
-
-        Map<Integer, List<K>> partitioned = SlotHash.partition(codec, map.keySet());
-
-        if (partitioned.size() < 2) {
-            return function.apply(map);
-        }
-
-        List<Flux<T>> publishers = partitioned.values().stream().map(ks -> {
-            Map<K, V> op = new HashMap<>();
-            ks.forEach(k -> op.put(k, map.get(k)));
-            return function.apply(op);
-        }).collect(Collectors.toList());
-
-        return resultFunction.apply(Flux.merge(publishers));
-    }
-
     private static <T> Mono<T> getMono(CompletableFuture<T> future) {
         return Mono.fromCompletionStage(future);
     }

From 7bc417221a51a5d0bf0494f8417c7e30f9d5119b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 7 Jul 2017 10:43:24 +0200
Subject: [PATCH 255/808] Upgrade to netty 4.1.13/4.0.49 #565

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 690cbfa751..d665b892a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
-        <netty-version>4.1.12.Final</netty-version>
+        <netty-version>4.1.13.Final</netty-version>
         <spring-version>5.0.0.RC1</spring-version>
     </properties>
 
@@ -357,7 +357,7 @@
             <id>netty-40</id>
 
             <properties>
-                <netty-version>4.0.48.Final</netty-version>
+                <netty-version>4.0.49.Final</netty-version>
             </properties>
         </profile>
 

From 5b06bfbe92aa133b71016dd6f90b7ee6cde3004a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 12 Jul 2017 22:12:55 +0200
Subject: [PATCH 256/808] Refactor CONFIG GET output from List<String> to
 Map<String, String> #562

Change return type from a List to Map for easier value lookup. Queries return a List in a key-value style which make it quite convenient to retrieve a single value. Retrieving configuration using wildcards returns more entries so lists requires a positional lookup. Using a Map representation represents configuration in a more natural style.
---
 .../io/lettuce/core/AbstractRedisAsyncCommands.java  |  2 +-
 .../lettuce/core/AbstractRedisReactiveCommands.java  |  4 ++--
 .../java/io/lettuce/core/RedisCommandBuilder.java    |  6 +++---
 .../core/api/async/RedisServerAsyncCommands.java     |  7 ++++---
 .../api/reactive/RedisServerReactiveCommands.java    | 12 ++++++------
 .../lettuce/core/api/sync/RedisServerCommands.java   |  7 ++++---
 .../api/async/NodeSelectionServerAsyncCommands.java  |  7 ++++---
 .../api/sync/NodeSelectionServerCommands.java        |  7 ++++---
 .../io/lettuce/core/api/RedisServerCommands.java     |  4 ++--
 .../io/lettuce/core/ReactiveStreamingOutputTest.java |  5 -----
 .../io/lettuce/core/commands/ServerCommandTest.java  | 10 +++++-----
 11 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 56ebbfecdc..1ea1351006 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -205,7 +205,7 @@ public RedisFuture<Long> commandCount() {
     }
 
     @Override
-    public RedisFuture<List<String>> configGet(String parameter) {
+    public RedisFuture<Map<String, String>> configGet(String parameter) {
         return dispatch(commandBuilder.configGet(parameter));
     }
 
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index ddb1dcd2d5..ff8a90a7ad 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -199,8 +199,8 @@ public Mono<Long> commandCount() {
     }
 
     @Override
-    public Flux<String> configGet(String parameter) {
-        return createDissolvingFlux(() -> commandBuilder.configGet(parameter));
+    public Mono<Map<String, String>> configGet(String parameter) {
+        return createMono(() -> commandBuilder.configGet(parameter));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 193e813bc8..f953dc72e4 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -260,12 +260,12 @@ public Command<K, V, String> configRewrite() {
         return createCommand(CONFIG, new StatusOutput<K, V>(codec), args);
     }
 
-    public Command<K, V, List<String>> configGet(String parameter) {
+    public Command<K, V, Map<String, String>> configGet(String parameter) {
         LettuceAssert.notNull(parameter, "Parameter " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(parameter, "Parameter " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(GET).add(parameter);
-        return createCommand(CONFIG, new StringListOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>((RedisCodec) STRING_CODEC).add(GET).add(parameter);
+        return createCommand(CONFIG, new MapOutput<>((RedisCodec) STRING_CODEC), args);
     }
 
     public Command<K, V, String> configResetstat() {
diff --git a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
index f558153371..46f783db2f 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.RedisFuture;
@@ -128,9 +129,9 @@ public interface RedisServerAsyncCommands<K, V> {
      * Get the value of a configuration parameter.
      *
      * @param parameter name of the parameter
-     * @return List&lt;String&gt; bulk-string-reply
+     * @return Map&lt;String, String&gt; bulk-string-reply
      */
-    RedisFuture<List<String>> configGet(String parameter);
+    RedisFuture<Map<String, String>> configGet(String parameter);
 
     /**
      * Reset the stats returned by INFO.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
index 914a2a2d94..7ee15f130c 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
 package io.lettuce.core.api.reactive;
 
 import java.util.Date;
-
-import io.lettuce.core.KillArgs;
-import io.lettuce.core.protocol.CommandType;
+import java.util.Map;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.protocol.CommandType;
 
 /**
  * Reactive executed commands for Server Control.
@@ -129,9 +129,9 @@ public interface RedisServerReactiveCommands<K, V> {
      * Get the value of a configuration parameter.
      *
      * @param parameter name of the parameter
-     * @return String bulk-string-reply
+     * @return Map bulk-string-reply
      */
-    Flux<String> configGet(String parameter);
+    Mono<Map<String, String>> configGet(String parameter);
 
     /**
      * Reset the stats returned by INFO.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
index 360b6a4f74..1af64d3094 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.protocol.CommandType;
@@ -127,9 +128,9 @@ public interface RedisServerCommands<K, V> {
      * Get the value of a configuration parameter.
      *
      * @param parameter name of the parameter
-     * @return List&lt;String&gt; bulk-string-reply
+     * @return Map&lt;String,String&gt; bulk-string-reply
      */
-    List<String> configGet(String parameter);
+    Map<String, String> configGet(String parameter);
 
     /**
      * Reset the stats returned by INFO.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
index 0c14310977..a89650822e 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.protocol.CommandType;
@@ -127,9 +128,9 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
      * Get the value of a configuration parameter.
      *
      * @param parameter name of the parameter
-     * @return List&lt;String&gt; bulk-string-reply
+     * @return Map&lt;String,String&gt; bulk-string-reply
      */
-    AsyncExecutions<List<String>> configGet(String parameter);
+    AsyncExecutions<Map<String, String>> configGet(String parameter);
 
     /**
      * Reset the stats returned by INFO.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
index 4136f59b4a..6627248182 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.protocol.CommandType;
@@ -127,9 +128,9 @@ public interface NodeSelectionServerCommands<K, V> {
      * Get the value of a configuration parameter.
      *
      * @param parameter name of the parameter
-     * @return List&lt;String&gt; bulk-string-reply
+     * @return Map&lt;String,String&gt; bulk-string-reply
      */
-    Executions<List<String>> configGet(String parameter);
+    Executions<Map<String, String>> configGet(String parameter);
 
     /**
      * Reset the stats returned by INFO.
diff --git a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
index 08aa50b04b..f4520d3fce 100644
--- a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
@@ -126,9 +126,9 @@ public interface RedisServerCommands<K, V> {
      * Get the value of a configuration parameter.
      *
      * @param parameter name of the parameter
-     * @return List&lt;String&gt; bulk-string-reply
+     * @return Map&lt;String, String&gt; bulk-string-reply
      */
-    List<String> configGet(String parameter);
+    Map<String, String> configGet(String parameter);
 
     /**
      * Reset the stats returned by INFO.
diff --git a/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java b/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java
index 5c702d1ccf..c11fc2ac7e 100644
--- a/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java
@@ -74,11 +74,6 @@ public void valueListCommandShouldReturnAllElements() {
                 .expectNextCount(KeysAndValues.COUNT).verifyComplete();
     }
 
-    @Test
-    public void stringListCommandShouldReturnAllElements() {
-        StepVerifier.create(reactive.configGet("*")).expectNextCount(120).thenCancel().verify();
-    }
-
     @Test
     public void booleanListCommandShouldReturnAllElements() {
         StepVerifier.create(reactive.scriptExists("a", "b", "c")).expectNextCount(3).verifyComplete();
diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
index 0d048ca197..f9371d0866 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,6 +47,7 @@
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ServerCommandTest extends AbstractRedisClientTest {
+
     @Test
     public void bgrewriteaof() {
         String msg = "Background append only file rewriting";
@@ -142,12 +143,11 @@ public void commandInfo() {
         result = redis.commandInfo("a missing command");
 
         assertThat(result.size()).isEqualTo(0);
-
     }
 
     @Test
     public void configGet() {
-        assertThat(redis.configGet("maxmemory")).isEqualTo(list("maxmemory", "0"));
+        assertThat(redis.configGet("maxmemory")).containsEntry("maxmemory", "0");
     }
 
     @Test
@@ -160,9 +160,9 @@ public void configResetstat() {
 
     @Test
     public void configSet() {
-        String maxmemory = redis.configGet("maxmemory").get(1);
+        String maxmemory = redis.configGet("maxmemory").get("maxmemory");
         assertThat(redis.configSet("maxmemory", "1024")).isEqualTo("OK");
-        assertThat(redis.configGet("maxmemory").get(1)).isEqualTo("1024");
+        assertThat(redis.configGet("maxmemory")).containsEntry("maxmemory", "1024");
         redis.configSet("maxmemory", maxmemory);
     }
 

From b0c85d108320980915e74d0308c05208832e198d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 17 Jul 2017 21:49:54 +0200
Subject: [PATCH 257/808] Drop netty 4.0 compatibility #518

Remove compatibility code and build infrastructure for netty 4.0.
---
 .travis.yml                                   |   7 +-
 pom.xml                                       |  39 ++----
 .../core/protocol/RedisStateMachine.java      | 119 +-----------------
 .../core/resource/DefaultClientResources.java |  29 ++---
 4 files changed, 28 insertions(+), 166 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4ad07e6e60..14f228cd19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,7 @@ jdk:
 
 env:
   matrix:
-    - PROFILE=netty-40 REDIS=unstable
-    - PROFILE=netty-41 REDIS=unstable
+    - REDIS=unstable
     - PROFILE=jmh
     - REDIS=4.0-rc3
     - REDIS=3.2.9
@@ -23,7 +22,7 @@ before_install:
 
 install: make prepare ssl-keys
 
-script: make test-coverage PROFILE=${PROFILE:-netty-41}
+script: make test-coverage PROFILE=${PROFILE:-documentation}
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
@@ -39,4 +38,4 @@ notifications:
       - https://webhooks.gitter.im/e/7c2a962829d225c47a31
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
\ No newline at end of file
+    on_start: false     # default: false
diff --git a/pom.xml b/pom.xml
index d665b892a9..4927e9cd24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,8 @@
             <version>${netty-version}</version>
         </dependency>
 
+        <!-- OS-native transports -->
+
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-epoll</artifactId>
@@ -119,7 +121,13 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- netty-transport-native-kqueue is included with the netty-41 profile -->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-kqueue</artifactId>
+            <version>${netty-version}</version>
+            <classifier>osx-x86_64</classifier>
+            <optional>true</optional>
+        </dependency>
 
         <dependency>
             <groupId>io.netty</groupId>
@@ -352,35 +360,6 @@
 
     <profiles>
 
-        <profile>
-
-            <id>netty-40</id>
-
-            <properties>
-                <netty-version>4.0.49.Final</netty-version>
-            </properties>
-        </profile>
-
-        <profile>
-
-            <id>netty-41</id>
-
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-
-            <dependencies>
-                <dependency>
-                    <groupId>io.netty</groupId>
-                    <artifactId>netty-transport-native-kqueue</artifactId>
-                    <version>${netty-version}</version>
-                    <classifier>osx-x86_64</classifier>
-                    <optional>true</optional>
-                </dependency>
-            </dependencies>
-
-        </profile>
-
         <profile>
 
             <id>sonatype-oss-release</id>
diff --git a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index 1df6247764..5cd68362db 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -25,9 +25,8 @@
 import io.lettuce.core.RedisException;
 import io.lettuce.core.output.CommandOutput;
 import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufProcessor;
 import io.netty.buffer.PooledByteBufAllocator;
-import io.netty.util.Version;
+import io.netty.util.ByteProcessor;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -44,34 +43,6 @@ public class RedisStateMachine {
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(RedisStateMachine.class);
     private static final ByteBuffer QUEUED = buffer("QUEUED");
 
-    private static final boolean USE_NETTY40_BYTEBUF_COMPATIBILITY;
-    private static final Class<?> LONG_PROCESSOR_CLASS;
-    private static final Class<?> INDEX_OF_LINEBREAK_PROCESSOR_CLASS;
-
-    static {
-
-        Version nettyBufferVersion = Version.identify().get("netty-buffer");
-
-        USE_NETTY40_BYTEBUF_COMPATIBILITY = nettyBufferVersion != null
-                && nettyBufferVersion.artifactVersion().startsWith("4.0");
-        if (!USE_NETTY40_BYTEBUF_COMPATIBILITY) {
-            try {
-                LONG_PROCESSOR_CLASS = Class.forName("io.lettuce.core.protocol.RedisStateMachine$Netty41LongProcessor");
-            } catch (ClassNotFoundException e) {
-                throw new RedisException("Cannot load Netty41LongProcessor class", e);
-            }
-            try {
-                INDEX_OF_LINEBREAK_PROCESSOR_CLASS = Class
-                        .forName("io.lettuce.core.protocol.RedisStateMachine$Netty41IndexOfLineBreakProcessor");
-            } catch (ClassNotFoundException e) {
-                throw new RedisException("Cannot load Netty41IndexOfLineBreakProcessor class", e);
-            }
-        } else {
-            LONG_PROCESSOR_CLASS = null;
-            INDEX_OF_LINEBREAK_PROCESSOR_CLASS = null;
-        }
-    }
-
     static class State {
         enum Type {
             SINGLE, ERROR, INTEGER, BULK, MULTI, BYTES
@@ -83,8 +54,7 @@ enum Type {
 
     private final State[] stack = new State[32];
     private final boolean debugEnabled = logger.isDebugEnabled();
-    private final LongProcessor longProcessor;
-    private final IndexOfLineBreakProcessor indexOfLineBreakProcessor;
+    private final LongProcessor longProcessor = new LongProcessor();
     private final ByteBuf responseElementBuffer = PooledByteBufAllocator.DEFAULT.directBuffer(1024);
     private final AtomicBoolean closed = new AtomicBoolean();
 
@@ -94,29 +64,6 @@ enum Type {
      * Initialize a new instance.
      */
     public RedisStateMachine() {
-
-        LongProcessor longProcessor;
-        IndexOfLineBreakProcessor indexOfLineBreakProcessor;
-
-        if (!USE_NETTY40_BYTEBUF_COMPATIBILITY) {
-            try {
-                longProcessor = (LongProcessor) LONG_PROCESSOR_CLASS.newInstance();
-            } catch (ReflectiveOperationException e) {
-                throw new RedisException("Cannot create Netty41LongProcessor instance", e);
-            }
-
-            try {
-                indexOfLineBreakProcessor = (IndexOfLineBreakProcessor) INDEX_OF_LINEBREAK_PROCESSOR_CLASS.newInstance();
-            } catch (ReflectiveOperationException e) {
-                throw new RedisException("Cannot create Netty41IndexOfLineBreakProcessor instance", e);
-            }
-        } else {
-            longProcessor = new LongProcessor();
-            indexOfLineBreakProcessor = new IndexOfLineBreakProcessor();
-        }
-
-        this.longProcessor = longProcessor;
-        this.indexOfLineBreakProcessor = indexOfLineBreakProcessor;
     }
 
     /**
@@ -265,7 +212,7 @@ public void close() {
 
     private int findLineEnd(ByteBuf buffer) {
 
-        int index = (int) indexOfLineBreakProcessor.getValue(buffer, buffer.readerIndex(), buffer.writerIndex());
+        int index = buffer.forEachByte(ByteProcessor.FIND_LF);
         return (index > 0 && buffer.getByte(index - 1) == '\r') ? index : -1;
     }
 
@@ -461,43 +408,13 @@ protected void safeSetError(CommandOutput<?, ?, ?> output, ByteBuffer bytes, Red
         }
     }
 
-    /**
-     * Compatibility code that works also on Netty 4.0.
-     */
-    static class LongProcessor {
-
-        public long getValue(ByteBuf buffer, int start, int end) {
-
-            long value = 0;
-
-            boolean negative = buffer.getByte(start) == '-';
-            int offset = negative ? start + 1 : start;
-            while (offset < end - 1) {
-                int digit = buffer.getByte(offset++) - '0';
-                value = value * 10 - digit;
-            }
-            if (!negative) {
-                value = -value;
-            }
-
-            buffer.readerIndex(end + 1);
-            buffer.markReaderIndex();
-            return value;
-        }
-    }
-
-    /**
-     * Processor for Netty 4.1. Note {@link ByteBufProcessor} is deprecated but ByteProcessor does not exist in Netty 4.0. So we
-     * need to stick to that as long as we support Netty 4.0.
-     */
     @SuppressWarnings("unused")
-    static class Netty41LongProcessor extends LongProcessor implements ByteBufProcessor {
+    static class LongProcessor implements ByteProcessor {
 
         long result;
         boolean negative;
         boolean first;
 
-        @Override
         public long getValue(ByteBuf buffer, int start, int end) {
 
             this.result = 0;
@@ -513,6 +430,7 @@ public long getValue(ByteBuf buffer, int start, int end) {
             return this.result;
         }
 
+        @Override
         public boolean process(byte value) throws Exception {
 
             if (first) {
@@ -534,31 +452,4 @@ public boolean process(byte value) throws Exception {
             return true;
         }
     }
-
-    /**
-     * Compatibility code that works also on Netty 4.0.
-     */
-    static class IndexOfLineBreakProcessor {
-
-        public long getValue(ByteBuf buffer, int start, int end) {
-            return buffer.indexOf(start, buffer.writerIndex(), (byte) '\n');
-        }
-    }
-
-    /**
-     * Processor for Netty 4.1. Note {@link ByteBufProcessor} is deprecated but ByteProcessor does not exist in Netty 4.0. So we
-     * need to stick to that as long as we support Netty 4.0.
-     */
-    static class Netty41IndexOfLineBreakProcessor extends IndexOfLineBreakProcessor implements ByteBufProcessor {
-
-        @Override
-        public long getValue(ByteBuf buffer, int start, int end) {
-            return buffer.forEachByte(start, end - start, this);
-        }
-
-        @Override
-        public boolean process(byte value) throws Exception {
-            return value != (byte) '\n';
-        }
-    }
 }
diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index 36834e12a1..96a08ef155 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -20,6 +20,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
+import reactor.core.scheduler.Schedulers;
 import io.lettuce.core.event.DefaultEventBus;
 import io.lettuce.core.event.DefaultEventPublisherOptions;
 import io.lettuce.core.event.EventBus;
@@ -33,15 +34,12 @@
 import io.lettuce.core.metrics.DefaultCommandLatencyCollector;
 import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
 import io.lettuce.core.resource.Delay.StatefulDelay;
-
 import io.netty.util.HashedWheelTimer;
 import io.netty.util.Timer;
-import io.netty.util.Version;
 import io.netty.util.concurrent.*;
 import io.netty.util.internal.SystemPropertyUtil;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
-import reactor.core.scheduler.Schedulers;
 
 /**
  * Default instance of the client resources.
@@ -57,8 +55,8 @@
  * <li>a {@code eventExecutorGroup} which is a provided instance of {@link EventExecutorGroup}. Higher precedence than
  * {@code computationThreadPoolSize}.</li>
  * <li>an {@code eventBus} which is a provided instance of {@link EventBus}.</li>
- * <li>a {@code commandLatencyCollector} which is a provided instance of
- * {@link io.lettuce.core.metrics.CommandLatencyCollector}.</li>
+ * <li>a {@code commandLatencyCollector} which is a provided instance of {@link io.lettuce.core.metrics.CommandLatencyCollector}
+ * .</li>
  * <li>a {@code dnsResolver} which is a provided instance of {@link DnsResolver}.</li>
  * <li>a {@code timer} that is a provided instance of {@link io.netty.util.HashedWheelTimer}.</li>
  * <li>a {@code nettyCustomizer} that is a provided instance of {@link NettyCustomizer}.</li>
@@ -94,8 +92,6 @@ public class DefaultClientResources implements ClientResources {
      */
     public static final NettyCustomizer DEFAULT_NETTY_CUSTOMIZER = DefaultNettyCustomizer.INSTANCE;
 
-    private static final boolean NETTY_DNS_RESOLVER_SUPPORTED;
-
     static {
 
         int threads = Math.max(
@@ -108,9 +104,6 @@ public class DefaultClientResources implements ClientResources {
         if (logger.isDebugEnabled()) {
             logger.debug("-Dio.netty.eventLoopThreads: {}", threads);
         }
-
-        Version version = Version.identify().get("netty-common");
-        NETTY_DNS_RESOLVER_SUPPORTED = version != null && version.artifactVersion().startsWith("4.1");
     }
 
     private final boolean sharedEventLoopGroupProvider;
@@ -209,7 +202,7 @@ protected DefaultClientResources(Builder builder) {
         }
 
         if (builder.dnsResolver == null) {
-            dnsResolver = NETTY_DNS_RESOLVER_SUPPORTED ? DnsResolvers.UNRESOLVED : DnsResolvers.JVM_DEFAULT;
+            dnsResolver = DnsResolvers.UNRESOLVED;
         } else {
             dnsResolver = builder.dnsResolver;
         }
@@ -250,7 +243,7 @@ public static class Builder {
         private CommandLatencyCollectorOptions commandLatencyCollectorOptions = DefaultCommandLatencyCollectorOptions.create();
         private CommandLatencyCollector commandLatencyCollector;
         private EventPublisherOptions commandLatencyPublisherOptions = DefaultEventPublisherOptions.create();
-        private DnsResolver dnsResolver = NETTY_DNS_RESOLVER_SUPPORTED ? DnsResolvers.UNRESOLVED : DnsResolvers.JVM_DEFAULT;
+        private DnsResolver dnsResolver = DnsResolvers.UNRESOLVED;
         private Supplier<Delay> reconnectDelay = DEFAULT_RECONNECT_DELAY;
         private NettyCustomizer nettyCustomizer = DEFAULT_NETTY_CUSTOMIZER;
 
@@ -322,10 +315,10 @@ public Builder eventExecutorGroup(EventExecutorGroup eventExecutorGroup) {
         }
 
         /**
-         * Sets a shared {@link Timer} that can be used across different instances of {@link io.lettuce.core.RedisClient}
-         * and {@link io.lettuce.core.cluster.RedisClusterClient} The provided {@link Timer} instance will not be shut
-         * down when shutting down the client resources. You have to take care of that. This is an advanced configuration that
-         * should only be used if you know what you are doing.
+         * Sets a shared {@link Timer} that can be used across different instances of {@link io.lettuce.core.RedisClient} and
+         * {@link io.lettuce.core.cluster.RedisClusterClient} The provided {@link Timer} instance will not be shut down when
+         * shutting down the client resources. You have to take care of that. This is an advanced configuration that should only
+         * be used if you know what you are doing.
          *
          * @param timer the shared {@link Timer}, must not be {@literal null}.
          * @return {@code this} {@link Builder}.
@@ -430,8 +423,8 @@ public Builder reconnectDelay(Delay reconnectDelay) {
         }
 
         /**
-         * Sets the stateful reconnect {@link Supplier} to delay reconnect attempts. Defaults to binary exponential delay capped at
-         * {@literal 30 SECONDS}.
+         * Sets the stateful reconnect {@link Supplier} to delay reconnect attempts. Defaults to binary exponential delay capped
+         * at {@literal 30 SECONDS}.
          *
          * @param reconnectDelay the reconnect delay, must not be {@literal null}.
          * @return this

From 74249d24fc856b72abcddcc64b5a5cdcd5ffa0d4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 18 Jul 2017 08:25:24 +0200
Subject: [PATCH 258/808] Upgrade to Reactor 3.1.0 M3 #567

---
 pom.xml                                         | 17 +++++++++++++++--
 .../java/io/lettuce/core/RedisPublisher.java    |  4 ++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4927e9cd24..9cf7e0cebd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,7 @@
         <skipTests>true</skipTests>
         <netty-version>4.1.13.Final</netty-version>
         <spring-version>5.0.0.RC1</spring-version>
+        <reactor-version>Bismuth-M3</reactor-version>
     </properties>
 
     <scm>
@@ -81,6 +82,20 @@
         </repository>
     </repositories>
 
+    <dependencyManagement>
+        <dependencies>
+
+            <dependency>
+                <groupId>io.projectreactor</groupId>
+                <artifactId>reactor-bom</artifactId>
+                <version>${reactor-version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
 
         <!-- Start of Core Dependencies -->
@@ -88,7 +103,6 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>3.1.0.M2</version>
         </dependency>
 
         <!-- Netty -->
@@ -247,7 +261,6 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
-            <version>3.1.0.M2</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index ade32934e9..f1e178b618 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -30,7 +30,7 @@
 
 import reactor.core.Exceptions;
 import reactor.core.publisher.Operators;
-import reactor.util.concurrent.QueueSupplier;
+import reactor.util.concurrent.Queues;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.internal.LettuceAssert;
@@ -134,7 +134,7 @@ static class RedisSubscription<T> implements Subscription, StreamingOutput.Subsc
         private final SubscriptionCommand<?, ?, T> subscriptionCommand;
         private final boolean traceEnabled = LOG.isTraceEnabled();
 
-        final Queue<T> data = QueueSupplier.<T> unbounded().get();
+        final Queue<T> data = Queues.<T> unbounded().get();
         final StatefulConnection<?, ?> connection;
         final RedisCommand<?, ?, T> command;
         final boolean dissolve;

From 80064e08f2b5aa1ab1e6af026308be47de58e766 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 18 Jul 2017 08:27:34 +0200
Subject: [PATCH 259/808] Use BOM to manage netty and Spring dependencies #568

---
 pom.xml | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9cf7e0cebd..2e3da4355e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
         <netty-version>4.1.13.Final</netty-version>
-        <spring-version>5.0.0.RC1</spring-version>
+        <spring-version>5.0.0.RC2</spring-version>
         <reactor-version>Bismuth-M3</reactor-version>
     </properties>
 
@@ -85,6 +85,14 @@
     <dependencyManagement>
         <dependencies>
 
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-bom</artifactId>
+                <version>${netty-version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <dependency>
                 <groupId>io.projectreactor</groupId>
                 <artifactId>reactor-bom</artifactId>
@@ -93,6 +101,14 @@
                 <scope>import</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>${spring-version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -110,19 +126,16 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-common</artifactId>
-            <version>${netty-version}</version>
         </dependency>
 
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport</artifactId>
-            <version>${netty-version}</version>
         </dependency>
 
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
-            <version>${netty-version}</version>
         </dependency>
 
         <!-- OS-native transports -->
@@ -130,7 +143,6 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-epoll</artifactId>
-            <version>${netty-version}</version>
             <classifier>linux-x86_64</classifier>
             <optional>true</optional>
         </dependency>
@@ -138,7 +150,6 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-kqueue</artifactId>
-            <version>${netty-version}</version>
             <classifier>osx-x86_64</classifier>
             <optional>true</optional>
         </dependency>
@@ -195,7 +206,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>${spring-version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -208,21 +218,18 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring-version}</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>${spring-version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
-            <version>${spring-version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -330,7 +337,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${spring-version}</version>
             <scope>test</scope>
         </dependency>
 

From 685488cf2e84a0423c302969c4b7440253d5413b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 18 Jul 2017 08:41:21 +0200
Subject: [PATCH 260/808] Upgrade dependencies #569

* rxjava1 1.2.10 -> 1.3.0
* rxjava2 2.0.9 -> 2.1.1
* mockito 2.7.9 -> 2.8.47
* assertj 3.6.2 -> 3.8.0
* log4j-core 2.8.1 -> 2.8.2
* slf4j 1.7.24 -> 1.7.25
* javaparser 2.3.0 -> 2.5.1
* commons-lang3 3.4 -> 3.6
---
 pom.xml                                        | 18 +++++++++---------
 .../cluster/topology/TopologyRefreshTest.java  |  7 +++----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2e3da4355e..1d0ea352d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,7 +183,7 @@
         <dependency>
             <groupId>io.reactivex</groupId>
             <artifactId>rxjava</artifactId>
-            <version>1.2.10</version>
+            <version>1.3.0</version>
             <optional>true</optional>
         </dependency>
 
@@ -197,7 +197,7 @@
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
-            <version>2.0.9</version>
+            <version>2.1.1</version>
             <optional>true</optional>
         </dependency>
 
@@ -281,7 +281,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.7.9</version>
+            <version>2.8.47</version>
             <scope>test</scope>
         </dependency>
 
@@ -309,28 +309,28 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.6.2</version>
+            <version>3.8.0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.8.1</version>
+            <version>2.8.2</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.8.1</version>
+            <version>2.8.2</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.7.24</version>
+            <version>1.7.25</version>
             <scope>test</scope>
         </dependency>
 
@@ -364,14 +364,14 @@
         <dependency>
             <groupId>com.github.javaparser</groupId>
             <artifactId>javaparser-core</artifactId>
-            <version>2.3.0</version>
+            <version>2.5.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.4</version>
+            <version>3.6</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java
index c1669d7e0e..e137fb079f 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java
@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -42,7 +43,6 @@
 import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
-
 import io.netty.util.concurrent.ScheduledFuture;
 
 /**
@@ -93,7 +93,7 @@ public void shouldUnsubscribeTopologyRefresh() throws Exception {
                 .getField(clusterClient, "clusterTopologyRefreshFuture");
 
         assertThat(clusterTopologyRefreshActivated.get()).isTrue();
-        assertThat(clusterTopologyRefreshFuture.get()).isNotNull();
+        assertThat((Future) clusterTopologyRefreshFuture.get()).isNotNull();
 
         ScheduledFuture<?> scheduledFuture = clusterTopologyRefreshFuture.get();
 
@@ -102,9 +102,8 @@ public void shouldUnsubscribeTopologyRefresh() throws Exception {
         FastShutdown.shutdown(clusterClient);
 
         assertThat(clusterTopologyRefreshActivated.get()).isFalse();
-        assertThat(clusterTopologyRefreshFuture.get()).isNull();
+        assertThat((Future) clusterTopologyRefreshFuture.get()).isNull();
         assertThat(scheduledFuture.isCancelled()).isTrue();
-
     }
 
     @Test

From 176eb8df6be65bc2c61ff17a7b5567a6a8ef72ed Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 18 Jul 2017 09:45:35 +0200
Subject: [PATCH 261/808] Remove documentation profile from TravisCI build

Use less memory in build.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 14f228cd19..794fd0b9a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ before_install:
 
 install: make prepare ssl-keys
 
-script: make test-coverage PROFILE=${PROFILE:-documentation}
+script: make test-coverage PROFILE=${PROFILE:-netty41}
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

From e25b18c6ebe75181e6e90caad78d4a0ddaa3e725 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 20 Jul 2017 00:07:55 +0200
Subject: [PATCH 262/808] Switch to Duration for timeouts #570

Lettuce now uses Duration instead of timeout value/TimeUnit tuples for timeouts, delays and periods. Methods to set timeouts are deprecated now. Functionality requiring a target TimeUnit (such as aggregation of metrics, delay calculation) additionaly can be configured using Duration and TimeUnit, depending on the context.

Duration improves type safety without the possibility of disjoin between the timeout value and its unit which makes configuration safer. Only a single value is required instead of two values.
---
 .../core/AbstractRedisAsyncCommands.java      |  10 +-
 .../io/lettuce/core/AbstractRedisClient.java  |  44 ++++-
 .../core/AbstractRedisReactiveCommands.java   |   5 +
 .../io/lettuce/core/ConnectionBuilder.java    |  16 +-
 .../core/FutureSyncInvocationHandler.java     |   3 +-
 .../lettuce/core/PlainChannelInitializer.java |  15 +-
 .../io/lettuce/core/RedisChannelHandler.java  |  35 ++--
 .../java/io/lettuce/core/RedisClient.java     | 104 +++++------
 src/main/java/io/lettuce/core/RedisURI.java   | 117 +++++++++++--
 .../java/io/lettuce/core/SocketOptions.java   |  46 ++---
 .../io/lettuce/core/SslConnectionBuilder.java |  15 +-
 .../core/StatefulRedisConnectionImpl.java     |   8 +-
 .../lettuce/core/api/StatefulConnection.java  |  16 +-
 .../core/api/async/RedisAsyncCommands.java    |  12 +-
 .../api/reactive/RedisReactiveCommands.java   |  15 +-
 .../lettuce/core/api/sync/RedisCommands.java  |  12 +-
 .../core/cluster/ClusterClientOptions.java    |  29 +---
 .../ClusterFutureSyncInvocationHandler.java   |   5 +-
 .../ClusterTopologyRefreshOptions.java        | 114 +++++++-----
 .../ClusterTopologyRefreshScheduler.java      |  12 +-
 .../NodeSelectionInvocationHandler.java       |  19 +-
 .../core/cluster/RedisClusterClient.java      |  11 +-
 .../StatefulRedisClusterConnectionImpl.java   |   8 +-
 ...tefulRedisClusterPubSubConnectionImpl.java |  10 +-
 .../api/async/RedisClusterAsyncCommands.java  |  11 ++
 .../RedisClusterReactiveCommands.java         |  16 +-
 .../api/sync/RedisClusterCommands.java        |  11 ++
 .../core/dynamic/AsyncExecutableCommand.java  |   7 +-
 .../core/dynamic/BatchExecutableCommand.java  |   6 +-
 .../lettuce/core/dynamic/domain/Timeout.java  |  37 ++--
 .../event/DefaultEventPublisherOptions.java   |  47 +++--
 .../core/event/EventPublisherOptions.java     |  13 +-
 .../DefaultCommandLatencyEventPublisher.java  |  21 +--
 .../lettuce/core/masterslave/MasterSlave.java |   6 +-
 .../MasterSlaveTopologyRefresh.java           |   5 +-
 .../masterslave/SentinelTopologyProvider.java |  12 +-
 ...tatefulRedisMasterSlaveConnectionImpl.java |  11 +-
 .../core/protocol/ConnectionWatchdog.java     |   2 +-
 .../StatefulRedisPubSubConnectionImpl.java    |  19 +-
 .../lettuce/core/resource/ConstantDelay.java  |  12 +-
 .../resource/DecorrelatedJitterDelay.java     |  19 +-
 .../java/io/lettuce/core/resource/Delay.java  | 162 ++++++++++++++----
 .../core/resource/EqualJitterDelay.java       |  14 +-
 .../core/resource/ExponentialDelay.java       |  18 +-
 .../core/resource/FullJitterDelay.java        |  20 ++-
 .../StatefulRedisSentinelConnectionImpl.java  |   8 +-
 .../extensibility/MyExtendedRedisClient.java  |   8 +-
 .../extensibility/MyPubSubConnection.java     |   8 +-
 .../io/lettuce/core/ClientOptionsTest.java    |   4 +-
 src/test/java/io/lettuce/core/ClientTest.java |   3 -
 .../core/RedisClientConnectionTest.java       |  42 ++---
 .../io/lettuce/core/RedisURIBuilderTest.java  |  17 +-
 .../java/io/lettuce/core/RedisURITest.java    |  13 +-
 .../io/lettuce/core/SocketOptionsTest.java    |   9 +-
 .../cluster/ClusterClientOptionsTest.java     |   3 +-
 .../cluster/ClusterPartitionParserTest.java   |   6 +-
 .../ClusterTopologyRefreshOptionsTest.java    |  35 ++--
 .../core/cluster/RedisClusterClientTest.java  |  21 +--
 .../RoundRobinSocketAddressSupplierTest.java  |  32 ++--
 .../dynamic/RedisCommandsClusterSyncTest.java |   4 +-
 .../DefaultEventPublisherOptionsTest.java     |  18 +-
 .../core/resource/ConstantDelayTest.java      |  11 +-
 .../resource/DecorrelatedJitterDelayTest.java |  33 ++--
 .../core/resource/EqualJitterDelayTest.java   |  46 ++---
 .../core/resource/ExponentialDelayTest.java   |  56 +++---
 .../core/resource/FullJitterDelayTest.java    |  46 ++---
 .../core/EmptyStatefulRedisConnection.java    |  13 +-
 67 files changed, 893 insertions(+), 693 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 1ea1351006..2bc8c9105d 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -17,6 +17,7 @@
 
 import static io.lettuce.core.protocol.CommandType.*;
 
+import java.time.Duration;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -72,7 +73,7 @@ public String auth(String password) {
 
         LettuceAssert.notNull(password, "Password must not be null");
         AsyncCommand<K, V, String> cmd = authAsync(password.toCharArray());
-        return LettuceFutures.awaitOrCancel(cmd, connection.getTimeout(), connection.getTimeoutUnit());
+        return LettuceFutures.awaitOrCancel(cmd, connection.getTimeout().toNanos(), TimeUnit.NANOSECONDS);
     }
 
     public AsyncCommand<K, V, String> authAsync(char[] password) {
@@ -822,8 +823,7 @@ public RedisFuture<Long> sdiffstore(K destination, K... keys) {
 
     public String select(int db) {
         AsyncCommand<K, V, String> cmd = selectAsync(db);
-        String status = LettuceFutures.awaitOrCancel(cmd, connection.getTimeout(), connection.getTimeoutUnit());
-        return status;
+        return LettuceFutures.awaitOrCancel(cmd, connection.getTimeout().toNanos(), TimeUnit.NANOSECONDS);
     }
 
     protected AsyncCommand<K, V, String> selectAsync(int db) {
@@ -1941,6 +1941,10 @@ public <T> AsyncCommand<K, V, T> dispatch(RedisCommand<K, V, T> cmd) {
         return asyncCommand;
     }
 
+    public void setTimeout(Duration timeout) {
+        connection.setTimeout(timeout);
+    }
+
     public void setTimeout(long timeout, TimeUnit unit) {
         connection.setTimeout(timeout, unit);
     }
diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 444ce7c94f..8f5294be17 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -20,6 +20,7 @@
 
 import java.io.Closeable;
 import java.net.SocketAddress;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -77,8 +78,7 @@ public abstract class AbstractRedisClient {
 
     protected volatile ClientOptions clientOptions = ClientOptions.builder().build();
 
-    protected long timeout = 60;
-    protected TimeUnit unit;
+    protected Duration timeout = RedisURI.DEFAULT_TIMEOUT_DURATION;
 
     private final boolean sharedResources;
     private final AtomicBoolean shutdown = new AtomicBoolean();
@@ -99,22 +99,37 @@ protected AbstractRedisClient(ClientResources clientResources) {
             this.clientResources = clientResources;
         }
 
-        unit = TimeUnit.SECONDS;
         genericWorkerPool = this.clientResources.eventExecutorGroup();
         channels = new DefaultChannelGroup(genericWorkerPool.next());
         timer = (HashedWheelTimer) this.clientResources.timer();
     }
 
+    /**
+     * Set the default timeout for connections created by this client. The timeout applies to connection attempts and
+     * non-blocking commands.
+     *
+     * @param timeout default connection timeout, must not be {@literal null}.
+     * @since 5.0
+     */
+    public void setDefaultTimeout(Duration timeout) {
+
+        LettuceAssert.notNull(timeout, "Timeout duration must not be null");
+        LettuceAssert.isTrue(!timeout.isNegative(), "Timeout duration must be greater or equal to zero");
+
+        this.timeout = timeout;
+    }
+
     /**
      * Set the default timeout for connections created by this client. The timeout applies to connection attempts and
      * non-blocking commands.
      *
      * @param timeout Default connection timeout.
      * @param unit Unit of time for the timeout.
+     * @deprecated since 5.0, use {@link #setDefaultTimeout(long, TimeUnit)}.
      */
+    @Deprecated
     public void setDefaultTimeout(long timeout, TimeUnit unit) {
-        this.timeout = timeout;
-        this.unit = unit;
+        setDefaultTimeout(Duration.ofNanos(unit.toNanos(timeout)));
     }
 
     /**
@@ -135,14 +150,14 @@ protected void connectionBuilder(Supplier<SocketAddress> socketAddressSupplier,
         SocketOptions socketOptions = getOptions().getSocketOptions();
 
         redisBootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS,
-                (int) socketOptions.getConnectTimeoutUnit().toMillis(socketOptions.getConnectTimeout()));
+                Math.toIntExact(socketOptions.getConnectTimeout().toMillis()));
 
         if (LettuceStrings.isEmpty(redisURI.getSocket())) {
             redisBootstrap.option(ChannelOption.SO_KEEPALIVE, socketOptions.isKeepAlive());
             redisBootstrap.option(ChannelOption.TCP_NODELAY, socketOptions.isTcpNoDelay());
         }
 
-        connectionBuilder.timeout(redisURI.getTimeout(), redisURI.getUnit());
+        connectionBuilder.timeout(redisURI.getTimeoutDuration());
         connectionBuilder.password(redisURI.getPassword());
 
         connectionBuilder.bootstrap(redisBootstrap);
@@ -279,7 +294,7 @@ protected <K, V, T extends RedisChannelHandler<K, V>> ConnectionFuture<T> initia
                     failure = throwable;
                 } else if (throwable instanceof TimeoutException) {
                     failure = new RedisConnectionException("Could not initialize channel within "
-                            + connectionBuilder.getTimeout() + " " + connectionBuilder.getTimeUnit(), throwable);
+                            + connectionBuilder.getTimeout(), throwable);
                 } else {
                     failure = throwable;
                 }
@@ -303,6 +318,19 @@ public void shutdown() {
         shutdown(2, 15, TimeUnit.SECONDS);
     }
 
+    /**
+     * Shutdown this client and close all open connections. The client should be discarded after calling shutdown.
+     *
+     * @param quietPeriod the quiet period as described in the documentation
+     * @param timeout the maximum amount of time to wait until the executor is shutdown regardless if a task was submitted
+     *        during the quiet period
+     * @since 5.0
+     */
+    public void shutdown(Duration quietPeriod, Duration timeout) {
+        LettuceFutures.translateException(() -> shutdownAsync(quietPeriod.toNanos(), timeout.toNanos(), TimeUnit.NANOSECONDS)
+                .get(), () -> null);
+    }
+
     /**
      * Shutdown this client and close all open connections. The client should be discarded after calling shutdown.
      *
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index ff8a90a7ad..413df44338 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -17,6 +17,7 @@
 
 import static io.lettuce.core.protocol.CommandType.*;
 
+import java.time.Duration;
 import java.util.Date;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -1940,6 +1941,10 @@ public <T, R> Flux<R> createDissolvingFlux(Supplier<RedisCommand<K, V, T>> comma
         return (Flux<R>) Flux.from(new RedisPublisher<>(commandSupplier, connection, true));
     }
 
+    public void setTimeout(Duration timeout) {
+        connection.setTimeout(timeout);
+    }
+
     public void setTimeout(long timeout, TimeUnit unit) {
         connection.setTimeout(timeout, unit);
     }
diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index 5303617439..9f3b8767a5 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -16,9 +16,9 @@
 package io.lettuce.core;
 
 import java.net.SocketAddress;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
 import io.lettuce.core.codec.Utf8StringCodec;
@@ -51,8 +51,7 @@ public class ConnectionBuilder {
     private Timer timer;
     private Bootstrap bootstrap;
     private ClientOptions clientOptions;
-    private long timeout;
-    private TimeUnit timeUnit;
+    private Duration timeout;
     private ClientResources clientResources;
     private char[] password;
     private ReconnectionListener reconnectionListener = ReconnectionListener.NO_OP;
@@ -120,7 +119,7 @@ protected ConnectionWatchdog createConnectionWatchdog() {
     }
 
     public RedisChannelInitializer build() {
-        return new PlainChannelInitializer(pingCommandSupplier, this::buildHandlers, clientResources, timeout, timeUnit);
+        return new PlainChannelInitializer(pingCommandSupplier, this::buildHandlers, clientResources, timeout);
     }
 
     public ConnectionBuilder socketAddressSupplier(Supplier<SocketAddress> socketAddressSupplier) {
@@ -133,20 +132,15 @@ public SocketAddress socketAddress() {
         return socketAddressSupplier.get();
     }
 
-    public ConnectionBuilder timeout(long timeout, TimeUnit timeUnit) {
+    public ConnectionBuilder timeout(Duration timeout) {
         this.timeout = timeout;
-        this.timeUnit = timeUnit;
         return this;
     }
 
-    public long getTimeout() {
+    public Duration getTimeout() {
         return timeout;
     }
 
-    public TimeUnit getTimeUnit() {
-        return timeUnit;
-    }
-
     public ConnectionBuilder reconnectionListener(ReconnectionListener reconnectionListener) {
 
         LettuceAssert.notNull(reconnectionListener, "ReconnectionListener must not be null");
diff --git a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
index bb811a4100..d017f44995 100644
--- a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
@@ -17,6 +17,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;
 
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -58,7 +59,7 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
                     return null;
                 }
 
-                LettuceFutures.awaitOrCancel(command, connection.getTimeout(), connection.getTimeoutUnit());
+                LettuceFutures.awaitOrCancel(command, connection.getTimeout().toNanos(), TimeUnit.NANOSECONDS);
                 return command.get();
             }
 
diff --git a/src/main/java/io/lettuce/core/PlainChannelInitializer.java b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
index cbe72c0297..f306e6dc45 100644
--- a/src/main/java/io/lettuce/core/PlainChannelInitializer.java
+++ b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
@@ -18,6 +18,7 @@
 import static io.lettuce.core.ConnectionEventTrigger.local;
 import static io.lettuce.core.ConnectionEventTrigger.remote;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
@@ -44,18 +45,16 @@ class PlainChannelInitializer extends io.netty.channel.ChannelInitializer<Channe
     private final Supplier<List<ChannelHandler>> handlers;
     private final Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier;
     private final ClientResources clientResources;
-    private final long timeout;
-    private final TimeUnit timeUnit;
+    private final Duration timeout;
 
     private volatile CompletableFuture<Boolean> initializedFuture = new CompletableFuture<>();
 
     PlainChannelInitializer(Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier, Supplier<List<ChannelHandler>> handlers,
-            ClientResources clientResources, long timeout, TimeUnit timeUnit) {
+            ClientResources clientResources, Duration timeout) {
         this.pingCommandSupplier = pingCommandSupplier;
         this.handlers = handlers;
         this.clientResources = clientResources;
         this.timeout = timeout;
-        this.timeUnit = timeUnit;
     }
 
     @Override
@@ -100,7 +99,7 @@ public void channelActive(final ChannelHandlerContext ctx) throws Exception {
 
                     if (pingCommandSupplier != NO_PING) {
                         pingCommand = pingCommandSupplier.get();
-                        pingBeforeActivate(pingCommand, initializedFuture, ctx, clientResources, timeout, timeUnit);
+                        pingBeforeActivate(pingCommand, initializedFuture, ctx, clientResources, timeout);
                     } else {
                         super.channelActive(ctx);
                     }
@@ -124,7 +123,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
     }
 
     static void pingBeforeActivate(AsyncCommand<?, ?, ?> cmd, CompletableFuture<Boolean> initializedFuture,
-            ChannelHandlerContext ctx, ClientResources clientResources, long timeout, TimeUnit timeUnit) throws Exception {
+            ChannelHandlerContext ctx, ClientResources clientResources, Duration timeout) throws Exception {
 
         ctx.fireUserEventTriggered(new PingBeforeActivate(cmd));
 
@@ -135,7 +134,7 @@ static void pingBeforeActivate(AsyncCommand<?, ?, ?> cmd, CompletableFuture<Bool
             }
 
             initializedFuture.completeExceptionally(new RedisCommandTimeoutException(String.format(
-                    "Cannot initialize channel (PING before activate) within %d %s", timeout, timeUnit)));
+                    "Cannot initialize channel (PING before activate) within %s", timeout)));
         };
 
         Timeout timeoutHandle = clientResources.timer().newTimeout(t -> {
@@ -146,7 +145,7 @@ static void pingBeforeActivate(AsyncCommand<?, ?, ?> cmd, CompletableFuture<Bool
             }
 
             clientResources.eventExecutorGroup().submit(timeoutGuard);
-        }, timeout, timeUnit);
+        }, timeout.toNanos(), TimeUnit.NANOSECONDS);
 
         cmd.whenComplete((o, throwable) -> {
 
diff --git a/src/main/java/io/lettuce/core/RedisChannelHandler.java b/src/main/java/io/lettuce/core/RedisChannelHandler.java
index 6cea480fa8..ef07b26e89 100644
--- a/src/main/java/io/lettuce/core/RedisChannelHandler.java
+++ b/src/main/java/io/lettuce/core/RedisChannelHandler.java
@@ -18,6 +18,7 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.lang.reflect.Proxy;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.concurrent.TimeUnit;
@@ -41,8 +42,7 @@ public abstract class RedisChannelHandler<K, V> implements Closeable, Connection
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(RedisChannelHandler.class);
 
-    private long timeout;
-    private TimeUnit unit;
+    private Duration timeout;
     private CloseEvents closeEvents = new CloseEvents();
 
     private final RedisChannelWriter channelWriter;
@@ -55,26 +55,39 @@ public abstract class RedisChannelHandler<K, V> implements Closeable, Connection
     /**
      * @param writer the channel writer
      * @param timeout timeout value
-     * @param unit unit of the timeout
      */
-    public RedisChannelHandler(RedisChannelWriter writer, long timeout, TimeUnit unit) {
+    public RedisChannelHandler(RedisChannelWriter writer, Duration timeout) {
 
         this.channelWriter = writer;
 
         writer.setConnectionFacade(this);
-        setTimeout(timeout, unit);
+        setTimeout(timeout);
     }
 
     /**
      * Set the command timeout for this connection.
      *
      * @param timeout Command timeout.
-     * @param unit Unit of time for the timeout.
+     * @since 5.0
      */
-    public void setTimeout(long timeout, TimeUnit unit) {
+    public void setTimeout(Duration timeout) {
+
+        LettuceAssert.notNull(timeout, "Timeout duration must not be null");
+        LettuceAssert.isTrue(!timeout.isNegative(), "Timeout duration must be greater or equal to zero");
 
         this.timeout = timeout;
-        this.unit = unit;
+    }
+
+    /**
+     * Set the command timeout for this connection.
+     *
+     * @param timeout Command timeout.
+     * @param unit Unit of time for the timeout.
+     * @deprecated since 5.0, use {@link #setTimeout(Duration)}
+     */
+    @Deprecated
+    public void setTimeout(long timeout, TimeUnit unit) {
+        setTimeout(Duration.ofNanos(unit.toNanos(timeout)));
     }
 
     /**
@@ -203,14 +216,10 @@ public void setOptions(ClientOptions clientOptions) {
         this.clientOptions = clientOptions;
     }
 
-    public long getTimeout() {
+    public Duration getTimeout() {
         return timeout;
     }
 
-    public TimeUnit getTimeoutUnit() {
-        return unit;
-    }
-
     @SuppressWarnings("unchecked")
     protected <T> T syncHandler(Object asyncApi, Class<?>... interfaces) {
         FutureSyncInvocationHandler h = new FutureSyncInvocationHandler((StatefulConnection<?, ?>) this, asyncApi, interfaces);
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index b3ed478d0b..37f12dc4cb 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -19,6 +19,7 @@
 import static io.lettuce.core.LettuceStrings.isNotEmpty;
 
 import java.net.SocketAddress;
+import java.time.Duration;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -54,8 +55,8 @@
  * </ul>
  *
  * Redis Cluster is used through {@link io.lettuce.core.cluster.RedisClusterClient}. Master/Slave connections through
- * {@link io.lettuce.core.masterslave.MasterSlave} provide connections to Redis Master/Slave setups which run either in a
- * static Master/Slave setup or are managed by Redis Sentinel.
+ * {@link io.lettuce.core.masterslave.MasterSlave} provide connections to Redis Master/Slave setups which run either in a static
+ * Master/Slave setup or are managed by Redis Sentinel.
  * <p>
  * {@link RedisClient} is an expensive resource. It holds a set of netty's {@link io.netty.channel.EventLoopGroup}'s that use
  * multiple threads. Reuse this instance as much as possible or share a {@link ClientResources} instance amongst multiple client
@@ -81,12 +82,13 @@ public class RedisClient extends AbstractRedisClient {
     private final RedisURI redisURI;
 
     protected RedisClient(ClientResources clientResources, RedisURI redisURI) {
+
         super(clientResources);
 
         assertNotNull(redisURI);
 
         this.redisURI = redisURI;
-        setDefaultTimeout(redisURI.getTimeout(), redisURI.getUnit());
+        setDefaultTimeout(redisURI.getTimeoutDuration());
     }
 
     /**
@@ -195,8 +197,9 @@ public StatefulRedisConnection<String, String> connect() {
      * @return A new stateful Redis connection
      */
     public <K, V> StatefulRedisConnection<K, V> connect(RedisCodec<K, V> codec) {
+
         checkForRedisURI();
-        return connectStandalone(codec, this.redisURI, defaultTimeout());
+        return connectStandalone(codec, this.redisURI, timeout);
     }
 
     /**
@@ -206,7 +209,9 @@ public <K, V> StatefulRedisConnection<K, V> connect(RedisCodec<K, V> codec) {
      * @return A new connection
      */
     public StatefulRedisConnection<String, String> connect(RedisURI redisURI) {
-        return connectStandalone(newStringStringCodec(), redisURI, Timeout.from(redisURI));
+
+        assertNotNull(redisURI);
+        return connectStandalone(newStringStringCodec(), redisURI, redisURI.getTimeoutDuration());
     }
 
     /**
@@ -220,10 +225,12 @@ public StatefulRedisConnection<String, String> connect(RedisURI redisURI) {
      * @return A new connection
      */
     public <K, V> StatefulRedisConnection<K, V> connect(RedisCodec<K, V> codec, RedisURI redisURI) {
-        return connectStandalone(codec, redisURI, Timeout.from(redisURI));
+
+        assertNotNull(redisURI);
+        return connectStandalone(codec, redisURI, redisURI.getTimeoutDuration());
     }
 
-    private <K, V> StatefulRedisConnection<K, V> connectStandalone(RedisCodec<K, V> codec, RedisURI redisURI, Timeout timeout) {
+    private <K, V> StatefulRedisConnection<K, V> connectStandalone(RedisCodec<K, V> codec, RedisURI redisURI, Duration timeout) {
 
         ConnectionFuture<StatefulRedisConnection<K, V>> future = connectStandaloneAsync(codec, redisURI, timeout);
         return getConnection(future);
@@ -232,11 +239,13 @@ private <K, V> StatefulRedisConnection<K, V> connectStandalone(RedisCodec<K, V>
     @SuppressWarnings("unused")
     // Required by ReflectiveNodeConnectionFactory.
     <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandaloneAsync(RedisCodec<K, V> codec, RedisURI redisURI) {
-        return connectStandaloneAsync(codec, redisURI, Timeout.from(redisURI));
+
+        assertNotNull(redisURI);
+        return connectStandaloneAsync(codec, redisURI, redisURI.getTimeoutDuration());
     }
 
     private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandaloneAsync(RedisCodec<K, V> codec,
-            RedisURI redisURI, Timeout timeout) {
+            RedisURI redisURI, Duration timeout) {
 
         assertNotNull(codec);
         checkValidRedisURI(redisURI);
@@ -245,8 +254,7 @@ private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandalone
 
         DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
 
-        StatefulRedisConnectionImpl<K, V> connection = newStatefulRedisConnection(endpoint, codec, timeout.timeout,
-                timeout.timeUnit);
+        StatefulRedisConnectionImpl<K, V> connection = newStatefulRedisConnection(endpoint, codec, timeout);
         ConnectionFuture<StatefulRedisConnection<K, V>> future = connectStatefulAsync(connection, endpoint, redisURI,
                 () -> new CommandHandler(clientOptions, clientResources, endpoint));
 
@@ -333,7 +341,7 @@ private boolean hasPassword(RedisURI redisURI) {
      * @return A new stateful pub/sub connection
      */
     public StatefulRedisPubSubConnection<String, String> connectPubSub() {
-        return connectPubSub(newStringStringCodec(), redisURI, defaultTimeout());
+        return connectPubSub(newStringStringCodec(), redisURI, timeout);
     }
 
     /**
@@ -344,7 +352,9 @@ public StatefulRedisPubSubConnection<String, String> connectPubSub() {
      * @return A new stateful pub/sub connection
      */
     public StatefulRedisPubSubConnection<String, String> connectPubSub(RedisURI redisURI) {
-        return connectPubSub(newStringStringCodec(), redisURI, Timeout.from(redisURI));
+
+        assertNotNull(redisURI);
+        return connectPubSub(newStringStringCodec(), redisURI, redisURI.getTimeoutDuration());
     }
 
     /**
@@ -358,7 +368,7 @@ public StatefulRedisPubSubConnection<String, String> connectPubSub(RedisURI redi
      */
     public <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec) {
         checkForRedisURI();
-        return connectPubSub(codec, redisURI, defaultTimeout());
+        return connectPubSub(codec, redisURI, timeout);
     }
 
     /**
@@ -372,10 +382,12 @@ public <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V>
      * @return A new connection
      */
     public <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec, RedisURI redisURI) {
-        return connectPubSub(codec, redisURI, Timeout.from(redisURI));
+
+        assertNotNull(redisURI);
+        return connectPubSub(codec, redisURI, redisURI.getTimeoutDuration());
     }
 
-    private <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec, RedisURI redisURI, Timeout timeout) {
+    private <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec, RedisURI redisURI, Duration timeout) {
 
         assertNotNull(codec);
         checkValidRedisURI(redisURI);
@@ -383,7 +395,7 @@ private <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V
         PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<K, V>(clientOptions);
 
         StatefulRedisPubSubConnectionImpl<K, V> connection = newStatefulRedisPubSubConnection(endpoint, endpoint, codec,
-                timeout.timeout, timeout.timeUnit);
+                timeout);
 
         ConnectionFuture<StatefulRedisConnectionImpl<K, V>> future = connectStatefulAsync(connection, endpoint, redisURI,
                 () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec, endpoint));
@@ -418,7 +430,7 @@ public StatefulRedisSentinelConnection<String, String> connectSentinel() {
      */
     public <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K, V> codec) {
         checkForRedisURI();
-        return connectSentinel(codec, redisURI, defaultTimeout());
+        return connectSentinel(codec, redisURI, timeout);
     }
 
     /**
@@ -429,7 +441,9 @@ public <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K
      * @return A new connection
      */
     public StatefulRedisSentinelConnection<String, String> connectSentinel(RedisURI redisURI) {
-        return connectSentinel(newStringStringCodec(), redisURI, Timeout.from(redisURI));
+
+        assertNotNull(redisURI);
+        return connectSentinel(newStringStringCodec(), redisURI, redisURI.getTimeoutDuration());
     }
 
     /**
@@ -443,11 +457,13 @@ public StatefulRedisSentinelConnection<String, String> connectSentinel(RedisURI
      * @return A new connection
      */
     public <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K, V> codec, RedisURI redisURI) {
-        return connectSentinel(codec, redisURI, Timeout.from(redisURI));
+
+        assertNotNull(redisURI);
+        return connectSentinel(codec, redisURI, redisURI.getTimeoutDuration());
     }
 
     private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K, V> codec, RedisURI redisURI,
-            Timeout timeout) {
+            Duration timeout) {
         assertNotNull(codec);
         checkValidRedisURI(redisURI);
 
@@ -457,8 +473,7 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
 
         DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
 
-        StatefulRedisSentinelConnectionImpl<K, V> connection = newStatefulRedisSentinelConnection(endpoint, codec,
-                timeout.timeout, timeout.timeUnit);
+        StatefulRedisSentinelConnectionImpl<K, V> connection = newStatefulRedisSentinelConnection(endpoint, codec, timeout);
 
         logger.debug("Trying to get a Redis Sentinel connection for one of: " + redisURI.getSentinels());
 
@@ -553,14 +568,13 @@ public ClientResources getResources() {
      * @param channelWriter the channel writer
      * @param codec codec
      * @param timeout default timeout
-     * @param unit default timeout unit
      * @param <K> Key-Type
      * @param <V> Value Type
      * @return new instance of StatefulRedisPubSubConnectionImpl
      */
     protected <K, V> StatefulRedisPubSubConnectionImpl<K, V> newStatefulRedisPubSubConnection(PubSubEndpoint<K, V> endpoint,
-            RedisChannelWriter channelWriter, RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
-        return new StatefulRedisPubSubConnectionImpl<>(endpoint, channelWriter, codec, timeout, unit);
+            RedisChannelWriter channelWriter, RedisCodec<K, V> codec, Duration timeout) {
+        return new StatefulRedisPubSubConnectionImpl<>(endpoint, channelWriter, codec, timeout);
     }
 
     /**
@@ -571,14 +585,13 @@ protected <K, V> StatefulRedisPubSubConnectionImpl<K, V> newStatefulRedisPubSubC
      * @param channelWriter the channel writer
      * @param codec codec
      * @param timeout default timeout
-     * @param unit default timeout unit
      * @param <K> Key-Type
      * @param <V> Value Type
      * @return new instance of StatefulRedisSentinelConnectionImpl
      */
     protected <K, V> StatefulRedisSentinelConnectionImpl<K, V> newStatefulRedisSentinelConnection(
-            RedisChannelWriter channelWriter, RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
-        return new StatefulRedisSentinelConnectionImpl<>(channelWriter, codec, timeout, unit);
+            RedisChannelWriter channelWriter, RedisCodec<K, V> codec, Duration timeout) {
+        return new StatefulRedisSentinelConnectionImpl<>(channelWriter, codec, timeout);
     }
 
     /**
@@ -589,14 +602,13 @@ protected <K, V> StatefulRedisSentinelConnectionImpl<K, V> newStatefulRedisSenti
      * @param channelWriter the channel writer
      * @param codec codec
      * @param timeout default timeout
-     * @param unit default timeout unit
      * @param <K> Key-Type
      * @param <V> Value Type
      * @return new instance of StatefulRedisConnectionImpl
      */
     protected <K, V> StatefulRedisConnectionImpl<K, V> newStatefulRedisConnection(RedisChannelWriter channelWriter,
-            RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
-        return new StatefulRedisConnectionImpl<>(channelWriter, codec, timeout, unit);
+            RedisCodec<K, V> codec, Duration timeout) {
+        return new StatefulRedisConnectionImpl<>(channelWriter, codec, timeout);
     }
 
     /**
@@ -678,7 +690,8 @@ private Supplier<SocketAddress> getSocketAddressSupplier(final RedisURI redisURI
 
     private SocketAddress lookupRedis(RedisURI sentinelUri) throws InterruptedException, TimeoutException, ExecutionException {
         try (StatefulRedisSentinelConnection<String, String> connection = connectSentinel(sentinelUri)) {
-            return connection.async().getMasterAddrByName(sentinelUri.getSentinelMasterId()).get(timeout, unit);
+            return connection.async().getMasterAddrByName(sentinelUri.getSentinelMasterId())
+                    .get(timeout.toNanos(), TimeUnit.NANOSECONDS);
         }
     }
 
@@ -722,29 +735,4 @@ private void checkForRedisURI() {
                         "RedisURI is not available. Use RedisClient(Host), RedisClient(Host, Port) or RedisClient(RedisURI) to construct your client.");
         checkValidRedisURI(this.redisURI);
     }
-
-    private Timeout defaultTimeout() {
-        return Timeout.of(timeout, unit);
-    }
-
-    private static class Timeout {
-
-        final long timeout;
-        final TimeUnit timeUnit;
-
-        private Timeout(long timeout, TimeUnit timeUnit) {
-            this.timeout = timeout;
-            this.timeUnit = timeUnit;
-        }
-
-        private static Timeout of(long timeout, TimeUnit timeUnit) {
-            return new Timeout(timeout, timeUnit);
-        }
-
-        private static Timeout from(RedisURI redisURI) {
-
-            LettuceAssert.notNull(redisURI, "A valid RedisURI is needed");
-            return new Timeout(redisURI.getTimeout(), redisURI.getUnit());
-        }
-    }
 }
diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 49f5c3f5f9..b3ac7396e5 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -24,6 +24,7 @@
 import java.net.SocketAddress;
 import java.net.URI;
 import java.net.URLEncoder;
+import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -159,6 +160,7 @@ public class RedisURI implements Serializable, ConnectionPoint {
      */
     public static final long DEFAULT_TIMEOUT = 60;
     public static final TimeUnit DEFAULT_TIMEOUT_UNIT = TimeUnit.SECONDS;
+    public static final Duration DEFAULT_TIMEOUT_DURATION = Duration.ofSeconds(DEFAULT_TIMEOUT);
 
     private String host;
     private String socket;
@@ -170,8 +172,8 @@ public class RedisURI implements Serializable, ConnectionPoint {
     private boolean ssl = false;
     private boolean verifyPeer = true;
     private boolean startTls = false;
-    private long timeout = 60;
-    private TimeUnit unit = TimeUnit.SECONDS;
+    private Duration timeout = DEFAULT_TIMEOUT_DURATION;
+    private TimeUnit unit = DEFAULT_TIMEOUT_UNIT;
     private final List<RedisURI> sentinels = new ArrayList<>();
 
     /**
@@ -180,6 +182,25 @@ public class RedisURI implements Serializable, ConnectionPoint {
     public RedisURI() {
     }
 
+    /**
+     * Constructor with host/port and timeout.
+     *
+     * @param host the host
+     * @param port the port
+     * @param timeout timeout value
+     * @param timeout unit of the timeout value
+     */
+    public RedisURI(String host, int port, Duration timeout) {
+
+        LettuceAssert.notEmpty(host, "Host must not be empty");
+        LettuceAssert.notNull(timeout, "Timeout duration must not be null");
+        LettuceAssert.isTrue(!timeout.isNegative(), "Timeout duration must be greater or equal to zero");
+
+        setHost(host);
+        setPort(port);
+        setTimeout(timeout);
+    }
+
     /**
      * Constructor with host/port and timeout.
      *
@@ -187,12 +208,15 @@ public RedisURI() {
      * @param port the port
      * @param timeout timeout value
      * @param unit unit of the timeout value
+     * @deprecated since 5.0, use {@link #RedisURI(String, int, Duration)}
      */
+    @Deprecated
     public RedisURI(String host, int port, long timeout, TimeUnit unit) {
-        this.host = host;
-        this.port = port;
-        this.timeout = timeout;
-        this.unit = unit;
+
+        setHost(host);
+        setPort(port);
+        setUnit(unit);
+        setTimeout(timeout);
     }
 
     /**
@@ -348,8 +372,20 @@ public void setPassword(char[] password) {
      * Returns the command timeout for synchronous command execution.
      *
      * @return the Timeout
+     * @deprecated since 5.0, use {@link #getTimeoutDuration()}.
      */
+    @Deprecated
     public long getTimeout() {
+        return unit.convert(timeout.toNanos(), TimeUnit.NANOSECONDS);
+    }
+
+    /**
+     * Returns the command timeout for synchronous command execution.
+     *
+     * @return the Timeout
+     * @since 5.0
+     */
+    public Duration getTimeoutDuration() {
         return timeout;
     }
 
@@ -357,16 +393,41 @@ public long getTimeout() {
      * Sets the command timeout for synchronous command execution.
      *
      * @param timeout the command timeout for synchronous command execution.
+     * @deprecated since 5.0, use {@link #setTimeout(Duration)}.
      */
+    @Deprecated
     public void setTimeout(long timeout) {
+
+        LettuceAssert.isTrue(timeout >= 0, "Timeout must be greater or equal 0");
+
+        this.timeout = Duration.ofNanos(unit.toNanos(timeout));
+    }
+
+    /**
+     * Sets the command timeout for synchronous command execution.
+     *
+     * @param timeout the command timeout for synchronous command execution.
+     * @since 5.0
+     */
+    public void setTimeout(Duration timeout) {
+
+        LettuceAssert.notNull(timeout, "Timeout must not be null");
+        LettuceAssert.isTrue(!timeout.isNegative(), "Timeout must be greater or equal 0");
+
         this.timeout = timeout;
+
+        if (timeout.getNano() != 0) {
+            setUnit(TimeUnit.NANOSECONDS);
+        }
     }
 
     /**
      * Returns the {@link TimeUnit} for the command timeout.
      *
      * @return the {@link TimeUnit} for the command timeout.
+     * @deprecated since 5.0, use {@link #setTimeout(Duration)}.
      */
+    @Deprecated
     public TimeUnit getUnit() {
         return unit;
     }
@@ -375,7 +436,9 @@ public TimeUnit getUnit() {
      * Sets the {@link TimeUnit} for the command timeout.
      *
      * @param unit the {@link TimeUnit} for the command timeout, must not be {@literal null}
+     * @deprecated since 5.0, use {@link #setTimeout(Duration)}.
      */
+    @Deprecated
     public void setUnit(TimeUnit unit) {
 
         LettuceAssert.notNull(unit, "TimeUnit must not be null");
@@ -602,6 +665,7 @@ private String getAuthority(final String scheme) {
     }
 
     private String getQueryString() {
+
         List<String> queryPairs = new ArrayList<>();
 
         if (database != 0) {
@@ -616,8 +680,13 @@ private String getQueryString() {
             queryPairs.add(PARAMETER_NAME_SENTINEL_MASTER_ID + "=" + urlEncode(sentinelMasterId));
         }
 
-        if (timeout != 0 && unit != null && (timeout != DEFAULT_TIMEOUT && !unit.equals(DEFAULT_TIMEOUT_UNIT))) {
-            queryPairs.add(PARAMETER_NAME_TIMEOUT + "=" + timeout + toQueryParamUnit(unit));
+        if (timeout.getSeconds() != DEFAULT_TIMEOUT) {
+
+            if (timeout.getNano() == 0) {
+                queryPairs.add(PARAMETER_NAME_TIMEOUT + "=" + timeout.getSeconds() + toQueryParamUnit(TimeUnit.SECONDS));
+            } else {
+                queryPairs.add(PARAMETER_NAME_TIMEOUT + "=" + timeout.toMillis() + toQueryParamUnit(TimeUnit.MILLISECONDS));
+            }
         }
 
         return queryPairs.stream().collect(Collectors.joining("&"));
@@ -780,7 +849,7 @@ private static void parseTimeout(Builder builder, String queryParam) {
         } else {
             String timeoutValueString = timeoutString.substring(0, numbersEnd);
             long timeoutValue = Long.parseLong(timeoutValueString);
-            builder.withTimeout(timeoutValue, TimeUnit.MILLISECONDS);
+            builder.withTimeout(Duration.ofMillis(timeoutValue));
 
             String suffix = timeoutString.substring(numbersEnd);
             TimeUnit timeoutUnit = TIME_UNIT_MAP.get(suffix);
@@ -943,8 +1012,7 @@ public static class Builder {
         private boolean ssl = false;
         private boolean verifyPeer = true;
         private boolean startTls = false;
-        private long timeout = 60;
-        private TimeUnit unit = TimeUnit.SECONDS;
+        private Duration timeout = DEFAULT_TIMEOUT_DURATION;
         private final List<HostAndPort> sentinels = new ArrayList<>();
 
         private Builder() {
@@ -1204,21 +1272,36 @@ public Builder withPassword(char[] password) {
             return this;
         }
 
+        /**
+         * Configures a timeout.
+         *
+         * @param timeout must not be {@literal null} or negative.
+         * @return the builder
+         */
+        public Builder withTimeout(Duration timeout) {
+
+            LettuceAssert.notNull(timeout, "Timeout must not be null");
+            LettuceAssert.notNull(!timeout.isNegative(), "Timeout must be greater or equal 0");
+
+            this.timeout = timeout;
+            return this;
+        }
+
         /**
          * Configures a timeout.
          *
          * @param timeout must be greater or equal 0.
          * @param unit the timeout time unit.
          * @return the builder
+         * @deprecated since 5.0, use {@link #withTimeout(Duration)}.
          */
+        @Deprecated
         public Builder withTimeout(long timeout, TimeUnit unit) {
 
             LettuceAssert.notNull(unit, "TimeUnit must not be null");
             LettuceAssert.isTrue(timeout >= 0, "Timeout must be greater or equal 0");
 
-            this.timeout = timeout;
-            this.unit = unit;
-            return this;
+            return withTimeout(Duration.ofNanos(unit.toNanos(timeout)));
         }
 
         /**
@@ -1248,25 +1331,25 @@ public RedisURI build() {
             RedisURI redisURI = new RedisURI();
             redisURI.setHost(host);
             redisURI.setPort(port);
+
             if (password != null) {
                 redisURI.setPassword(password);
             }
+
             redisURI.setDatabase(database);
             redisURI.setClientName(clientName);
 
             redisURI.setSentinelMasterId(sentinelMasterId);
 
             for (HostAndPort sentinel : sentinels) {
-                redisURI.getSentinels().add(new RedisURI(sentinel.getHostText(), sentinel.getPort(), timeout, unit));
+                redisURI.getSentinels().add(new RedisURI(sentinel.getHostText(), sentinel.getPort(), timeout));
             }
 
             redisURI.setSocket(socket);
             redisURI.setSsl(ssl);
             redisURI.setStartTls(startTls);
             redisURI.setVerifyPeer(verifyPeer);
-
             redisURI.setTimeout(timeout);
-            redisURI.setUnit(unit);
 
             return redisURI;
         }
diff --git a/src/main/java/io/lettuce/core/SocketOptions.java b/src/main/java/io/lettuce/core/SocketOptions.java
index 578bdeb407..53424e7bb1 100644
--- a/src/main/java/io/lettuce/core/SocketOptions.java
+++ b/src/main/java/io/lettuce/core/SocketOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import io.lettuce.core.internal.LettuceAssert;
@@ -29,26 +30,24 @@ public class SocketOptions {
 
     public static final long DEFAULT_CONNECT_TIMEOUT = 10;
     public static final TimeUnit DEFAULT_CONNECT_TIMEOUT_UNIT = TimeUnit.SECONDS;
+    public static final Duration DEFAULT_CONNECT_TIMEOUT_DURATION = Duration.ofSeconds(DEFAULT_CONNECT_TIMEOUT);
 
     public static final boolean DEFAULT_SO_KEEPALIVE = false;
     public static final boolean DEFAULT_SO_NO_DELAY = false;
 
-    private final long connectTimeout;
-    private final TimeUnit connectTimeoutUnit;
+    private final Duration connectTimeout;
     private final boolean keepAlive;
     private final boolean tcpNoDelay;
 
     protected SocketOptions(Builder builder) {
 
         this.connectTimeout = builder.connectTimeout;
-        this.connectTimeoutUnit = builder.connectTimeoutUnit;
         this.keepAlive = builder.keepAlive;
         this.tcpNoDelay = builder.tcpNoDelay;
     }
 
     protected SocketOptions(SocketOptions original) {
         this.connectTimeout = original.getConnectTimeout();
-        this.connectTimeoutUnit = original.getConnectTimeoutUnit();
         this.keepAlive = original.isKeepAlive();
         this.tcpNoDelay = original.isTcpNoDelay();
     }
@@ -86,14 +85,30 @@ public static SocketOptions create() {
      */
     public static class Builder {
 
-        private long connectTimeout = DEFAULT_CONNECT_TIMEOUT;
-        private TimeUnit connectTimeoutUnit = DEFAULT_CONNECT_TIMEOUT_UNIT;
+        private Duration connectTimeout = DEFAULT_CONNECT_TIMEOUT_DURATION;
         private boolean keepAlive = DEFAULT_SO_KEEPALIVE;
         private boolean tcpNoDelay = DEFAULT_SO_NO_DELAY;
 
         private Builder() {
         }
 
+        /**
+         * Set connection timeout. Defaults to {@literal 10 SECONDS}. See {@link #DEFAULT_CONNECT_TIMEOUT} and
+         * {@link #DEFAULT_CONNECT_TIMEOUT_UNIT}.
+         *
+         * @param connectTimeout connection timeout, must be greater {@literal 0}.
+         * @return {@code this}
+         * @since 5.0
+         */
+        public Builder connectTimeout(Duration connectTimeout) {
+
+            LettuceAssert.notNull(connectTimeout, "Connection timeout must not be null");
+            LettuceAssert.isTrue(connectTimeout.toNanos() > 0, "Connect timeout must be greater 0");
+
+            this.connectTimeout = connectTimeout;
+            return this;
+        }
+
         /**
          * Set connection timeout. Defaults to {@literal 10 SECONDS}. See {@link #DEFAULT_CONNECT_TIMEOUT} and
          * {@link #DEFAULT_CONNECT_TIMEOUT_UNIT}.
@@ -101,15 +116,15 @@ private Builder() {
          * @param connectTimeout connection timeout, must be greater {@literal 0}.
          * @param connectTimeoutUnit unit for {@code connectTimeout}, must not be {@literal null}.
          * @return {@code this}
+         * @deprecated since 5.0, use {@link #connectTimeout(Duration)}
          */
+        @Deprecated
         public Builder connectTimeout(long connectTimeout, TimeUnit connectTimeoutUnit) {
 
             LettuceAssert.isTrue(connectTimeout > 0, "Connect timeout must be greater 0");
             LettuceAssert.notNull(connectTimeoutUnit, "TimeUnit must not be null");
 
-            this.connectTimeout = connectTimeout;
-            this.connectTimeoutUnit = connectTimeoutUnit;
-            return this;
+            return connectTimeout(Duration.ofNanos(connectTimeoutUnit.toNanos(connectTimeout)));
         }
 
         /**
@@ -154,19 +169,10 @@ public SocketOptions build() {
      *
      * @return the connection timeout.
      */
-    public long getConnectTimeout() {
+    public Duration getConnectTimeout() {
         return connectTimeout;
     }
 
-    /**
-     * Returns the the connection timeout unit.
-     *
-     * @return the connection timeout unit.
-     */
-    public TimeUnit getConnectTimeoutUnit() {
-        return connectTimeoutUnit;
-    }
-
     /**
      * Returns whether to enable TCP keepalive.
      *
diff --git a/src/main/java/io/lettuce/core/SslConnectionBuilder.java b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
index 738f822dc5..2f1c579c0b 100644
--- a/src/main/java/io/lettuce/core/SslConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
@@ -26,9 +26,9 @@
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
+import java.time.Duration;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
 import javax.net.ssl.*;
@@ -39,7 +39,6 @@
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.resource.ClientResources;
-
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandler;
@@ -80,7 +79,7 @@ protected List<ChannelHandler> buildHandlers() {
     public RedisChannelInitializer build() {
 
         return new SslChannelInitializer(getPingCommandSupplier(), this::buildHandlers, redisURI, clientResources(),
-                getTimeout(), getTimeUnit(), clientOptions().getSslOptions());
+                getTimeout(), clientOptions().getSslOptions());
     }
 
     /**
@@ -92,22 +91,20 @@ static class SslChannelInitializer extends io.netty.channel.ChannelInitializer<C
         private final Supplier<List<ChannelHandler>> handlers;
         private final RedisURI redisURI;
         private final ClientResources clientResources;
-        private final long timeout;
-        private final TimeUnit timeUnit;
+        private final Duration timeout;
         private final SslOptions sslOptions;
 
         private volatile CompletableFuture<Boolean> initializedFuture = new CompletableFuture<>();
 
         public SslChannelInitializer(Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier,
-                Supplier<List<ChannelHandler>> handlers, RedisURI redisURI, ClientResources clientResources, long timeout,
-                TimeUnit timeUnit, SslOptions sslOptions) {
+                Supplier<List<ChannelHandler>> handlers, RedisURI redisURI, ClientResources clientResources, Duration timeout,
+                SslOptions sslOptions) {
 
             this.pingCommandSupplier = pingCommandSupplier;
             this.handlers = handlers;
             this.redisURI = redisURI;
             this.clientResources = clientResources;
             this.timeout = timeout;
-            this.timeUnit = timeUnit;
             this.sslOptions = sslOptions;
         }
 
@@ -194,7 +191,7 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
                             if (event.isSuccess()) {
                                 if (pingCommandSupplier != PlainChannelInitializer.NO_PING) {
                                     pingCommand = pingCommandSupplier.get();
-                                    pingBeforeActivate(pingCommand, initializedFuture, ctx, clientResources, timeout, timeUnit);
+                                    pingBeforeActivate(pingCommand, initializedFuture, ctx, clientResources, timeout);
                                 } else {
                                     ctx.fireChannelActive();
                                 }
diff --git a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
index b13f4d9872..c25ce4c79a 100644
--- a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
@@ -17,10 +17,10 @@
 
 import static io.lettuce.core.protocol.CommandType.*;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -63,10 +63,10 @@ public class StatefulRedisConnectionImpl<K, V> extends RedisChannelHandler<K, V>
      * @param writer the channel writer
      * @param codec Codec used to encode/decode keys and values.
      * @param timeout Maximum time to wait for a response.
-     * @param unit Unit of time for the timeout.
      */
-    public StatefulRedisConnectionImpl(RedisChannelWriter writer, RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
-        super(writer, timeout, unit);
+    public StatefulRedisConnectionImpl(RedisChannelWriter writer, RedisCodec<K, V> codec, Duration timeout) {
+
+        super(writer, timeout);
 
         this.codec = codec;
         this.async = newRedisAsyncCommandsImpl();
diff --git a/src/main/java/io/lettuce/core/api/StatefulConnection.java b/src/main/java/io/lettuce/core/api/StatefulConnection.java
index 89c9303009..7dd09212b4 100644
--- a/src/main/java/io/lettuce/core/api/StatefulConnection.java
+++ b/src/main/java/io/lettuce/core/api/StatefulConnection.java
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.api;
 
+import java.time.Duration;
 import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
@@ -35,19 +36,24 @@ public interface StatefulConnection<K, V> extends AutoCloseable {
      * Set the default command timeout for this connection.
      *
      * @param timeout Command timeout.
-     * @param unit Unit of time for the timeout.
+     * @since 5.0
      */
-    void setTimeout(long timeout, TimeUnit unit);
+    void setTimeout(Duration timeout);
 
     /**
-     * @return the timeout unit.
+     * Set the default command timeout for this connection.
+     *
+     * @param timeout Command timeout.
+     * @param unit Unit of time for the timeout.
+     * @deprecated since 5.0, use {@link #setTimeout(Duration)}
      */
-    TimeUnit getTimeoutUnit();
+    @Deprecated
+    void setTimeout(long timeout, TimeUnit unit);
 
     /**
      * @return the timeout.
      */
-    long getTimeout();
+    Duration getTimeout();
 
     /**
      * Dispatch a command. Write a command on the channel. The command may be changed/wrapped during write and the written
diff --git a/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
index ba0ea0aee2..c7c5fd9928 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package io.lettuce.core.api.async;
 
-import java.util.concurrent.TimeUnit;
-
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
@@ -35,14 +33,6 @@ public interface RedisAsyncCommands<K, V> extends RedisHashAsyncCommands<K, V>,
         RedisHLLAsyncCommands<K, V>, BaseRedisAsyncCommands<K, V>, RedisClusterAsyncCommands<K, V>,
         RedisTransactionalAsyncCommands<K, V>, RedisGeoAsyncCommands<K, V> {
 
-    /**
-     * Set the default timeout for operations.
-     *
-     * @param timeout the timeout value
-     * @param unit the unit of the timeout value
-     */
-    void setTimeout(long timeout, TimeUnit unit);
-
     /**
      * Authenticate to the server.
      *
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
index e79e649892..6878b9860a 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,10 @@
  */
 package io.lettuce.core.api.reactive;
 
-import java.util.concurrent.TimeUnit;
-
+import reactor.core.publisher.Mono;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands;
 
-import reactor.core.publisher.Mono;
-
 /**
  * A complete reactive and thread-safe Redis API with 400+ Methods.
  *
@@ -36,14 +33,6 @@ public interface RedisReactiveCommands<K, V> extends RedisHashReactiveCommands<K
         RedisHLLReactiveCommands<K, V>, BaseRedisReactiveCommands<K, V>, RedisClusterReactiveCommands<K, V>,
         RedisTransactionalReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V> {
 
-    /**
-     * Set the default timeout for operations.
-     *
-     * @param timeout the timeout value
-     * @param unit the unit of the timeout value
-     */
-    void setTimeout(long timeout, TimeUnit unit);
-
     /**
      * Authenticate to the server.
      *
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
index 96a94ccd03..ff2452ff3d 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package io.lettuce.core.api.sync;
 
-import java.util.concurrent.TimeUnit;
-
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
 
@@ -34,14 +32,6 @@ public interface RedisCommands<K, V> extends RedisHashCommands<K, V>, RedisKeyCo
         RedisServerCommands<K, V>, RedisHLLCommands<K, V>, BaseRedisCommands<K, V>, RedisClusterCommands<K, V>,
         RedisTransactionalCommands<K, V>, RedisGeoCommands<K, V> {
 
-    /**
-     * Set the default timeout for operations.
-     *
-     * @param timeout the timeout value
-     * @param unit the unit of the timeout value
-     */
-    void setTimeout(long timeout, TimeUnit unit);
-
     /**
      * Authenticate to the server.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index 491d331fb2..10e2991203 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core.cluster;
 
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.SocketOptions;
@@ -31,7 +31,7 @@ public class ClusterClientOptions extends ClientOptions {
 
     public static final boolean DEFAULT_REFRESH_CLUSTER_VIEW = false;
     public static final long DEFAULT_REFRESH_PERIOD = 60;
-    public static final TimeUnit DEFAULT_REFRESH_PERIOD_UNIT = TimeUnit.SECONDS;
+    public static final Duration DEFAULT_REFRESH_PERIOD_DURATION = Duration.ofSeconds(DEFAULT_REFRESH_PERIOD);
     public static final boolean DEFAULT_CLOSE_STALE_CONNECTIONS = true;
     public static final boolean DEFAULT_VALIDATE_CLUSTER_MEMBERSHIP = true;
     public static final int DEFAULT_MAX_REDIRECTS = 5;
@@ -51,9 +51,9 @@ protected ClusterClientOptions(Builder builder) {
 
         if (refreshOptions == null) {
             refreshOptions = ClusterTopologyRefreshOptions.builder() //
-                    .enablePeriodicRefresh(builder.refreshClusterView)//
-                    .refreshPeriod(builder.refreshPeriod, builder.refreshPeriodUnit)//
-                    .closeStaleConnections(builder.closeStaleConnections)//
+                    .enablePeriodicRefresh(DEFAULT_REFRESH_CLUSTER_VIEW) //
+                    .refreshPeriod(DEFAULT_REFRESH_PERIOD_DURATION) //
+                    .closeStaleConnections(builder.closeStaleConnections) //
                     .build();
         }
 
@@ -102,9 +102,6 @@ public static ClusterClientOptions create() {
      */
     public static class Builder extends ClientOptions.Builder {
 
-        private boolean refreshClusterView = DEFAULT_REFRESH_CLUSTER_VIEW;
-        private long refreshPeriod = DEFAULT_REFRESH_PERIOD;
-        private TimeUnit refreshPeriodUnit = DEFAULT_REFRESH_PERIOD_UNIT;
         private boolean closeStaleConnections = DEFAULT_CLOSE_STALE_CONNECTIONS;
         private boolean validateClusterNodeMembership = DEFAULT_VALIDATE_CLUSTER_MEMBERSHIP;
         private int maxRedirects = DEFAULT_MAX_REDIRECTS;
@@ -208,8 +205,8 @@ public ClusterClientOptions build() {
 
     /**
      * Flag, whether regular cluster topology updates are updated. The client starts updating the cluster topology in the
-     * intervals of {@link #getRefreshPeriod()} /{@link #getRefreshPeriodUnit()}. Defaults to {@literal false}. Returns the
-     * value from {@link ClusterTopologyRefreshOptions} if provided.
+     * intervals of {@link #getRefreshPeriod()}. Defaults to {@literal false}. Returns the value from
+     * {@link ClusterTopologyRefreshOptions} if provided.
      *
      * @return {@literal true} it the cluster topology view is updated periodically
      */
@@ -223,20 +220,10 @@ public boolean isRefreshClusterView() {
      *
      * @return the period between the regular cluster topology updates
      */
-    public long getRefreshPeriod() {
+    public Duration getRefreshPeriod() {
         return topologyRefreshOptions.getRefreshPeriod();
     }
 
-    /**
-     * Unit for the {@link #getRefreshPeriod()}. Defaults to {@link TimeUnit#SECONDS}. Returns the value from
-     * {@link ClusterTopologyRefreshOptions} if provided.
-     *
-     * @return unit for the {@link #getRefreshPeriod()}
-     */
-    public TimeUnit getRefreshPeriodUnit() {
-        return topologyRefreshOptions.getRefreshPeriodUnit();
-    }
-
     /**
      * Flag, whether to close stale connections when refreshing the cluster topology. Defaults to {@literal true}. Comes only
      * into effect if {@link #isRefreshClusterView()} is {@literal true}. Returns the value from
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
index 19c7832735..64e7b46c50 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
@@ -21,6 +21,7 @@
 import java.lang.reflect.Proxy;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 
 import io.lettuce.core.LettuceFutures;
@@ -114,7 +115,7 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
                         return null;
                     }
                 }
-                return LettuceFutures.awaitOrCancel(command, connection.getTimeout(), connection.getTimeoutUnit());
+                return LettuceFutures.awaitOrCancel(command, connection.getTimeout().toNanos(), TimeUnit.NANOSECONDS);
             }
 
             return result;
@@ -176,7 +177,7 @@ protected Object nodes(Predicate<RedisClusterNode> predicate, ClusterConnectionP
         }
 
         NodeSelectionInvocationHandler h = new NodeSelectionInvocationHandler((AbstractNodeSelection<?, ?, ?, ?>) selection,
-                asyncCommandsInterface, connection.getTimeout(), connection.getTimeoutUnit());
+                asyncCommandsInterface, connection.getTimeout());
         return Proxy.newProxyInstance(NodeSelectionSupport.class.getClassLoader(), new Class<?>[] {
                 nodeSelectionCommandsInterface, nodeSelectionInterface }, h);
     }
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
index cd4d1585a2..402d993380 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.cluster;
 
+import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -31,33 +32,32 @@ public class ClusterTopologyRefreshOptions {
     public static final boolean DEFAULT_PERIODIC_REFRESH_ENABLED = false;
     public static final long DEFAULT_REFRESH_PERIOD = 60;
     public static final TimeUnit DEFAULT_REFRESH_PERIOD_UNIT = TimeUnit.SECONDS;
+    public static final Duration DEFAULT_REFRESH_PERIOD_DURATION = Duration.ofSeconds(DEFAULT_REFRESH_PERIOD);
     public static final boolean DEFAULT_DYNAMIC_REFRESH_SOURCES = true;
     public static final Set<RefreshTrigger> DEFAULT_ADAPTIVE_REFRESH_TRIGGERS = Collections.emptySet();
     public static final long DEFAULT_ADAPTIVE_REFRESH_TIMEOUT = 30;
     public static final TimeUnit DEFAULT_ADAPTIVE_REFRESH_TIMEOUT_UNIT = TimeUnit.SECONDS;
+    public static final Duration DEFAULT_ADAPTIVE_REFRESH_TIMEOUT_DURATION = Duration
+            .ofSeconds(DEFAULT_ADAPTIVE_REFRESH_TIMEOUT);
     public static final int DEFAULT_REFRESH_TRIGGERS_RECONNECT_ATTEMPTS = 5;
     public static final boolean DEFAULT_CLOSE_STALE_CONNECTIONS = true;
 
     private final boolean periodicRefreshEnabled;
-    private final long refreshPeriod;
-    private final TimeUnit refreshPeriodUnit;
+    private final Duration refreshPeriod;
     private final boolean closeStaleConnections;
     private final boolean dynamicRefreshSources;
     private final Set<RefreshTrigger> adaptiveRefreshTriggers;
-    private final long adaptiveRefreshTimeout;
-    private final TimeUnit adaptiveRefreshTimeoutUnit;
+    private final Duration adaptiveRefreshTimeout;
     private final int refreshTriggersReconnectAttempts;
 
     protected ClusterTopologyRefreshOptions(Builder builder) {
 
         this.periodicRefreshEnabled = builder.periodicRefreshEnabled;
         this.refreshPeriod = builder.refreshPeriod;
-        this.refreshPeriodUnit = builder.refreshPeriodUnit;
         this.closeStaleConnections = builder.closeStaleConnections;
         this.dynamicRefreshSources = builder.dynamicRefreshSources;
         this.adaptiveRefreshTriggers = Collections.unmodifiableSet(new HashSet<>(builder.adaptiveRefreshTriggers));
         this.adaptiveRefreshTimeout = builder.adaptiveRefreshTimeout;
-        this.adaptiveRefreshTimeoutUnit = builder.adaptiveRefreshTimeoutUnit;
         this.refreshTriggersReconnectAttempts = builder.refreshTriggersReconnectAttempts;
     }
 
@@ -65,12 +65,10 @@ protected ClusterTopologyRefreshOptions(ClusterTopologyRefreshOptions original)
 
         this.periodicRefreshEnabled = original.periodicRefreshEnabled;
         this.refreshPeriod = original.refreshPeriod;
-        this.refreshPeriodUnit = original.refreshPeriodUnit;
         this.closeStaleConnections = original.closeStaleConnections;
         this.dynamicRefreshSources = original.dynamicRefreshSources;
         this.adaptiveRefreshTriggers = Collections.unmodifiableSet(new HashSet<>(original.adaptiveRefreshTriggers));
         this.adaptiveRefreshTimeout = original.adaptiveRefreshTimeout;
-        this.adaptiveRefreshTimeoutUnit = original.adaptiveRefreshTimeoutUnit;
         this.refreshTriggersReconnectAttempts = original.refreshTriggersReconnectAttempts;
     }
 
@@ -117,13 +115,11 @@ public static ClusterTopologyRefreshOptions enabled() {
     public static class Builder {
 
         private boolean periodicRefreshEnabled = DEFAULT_PERIODIC_REFRESH_ENABLED;
-        private long refreshPeriod = DEFAULT_REFRESH_PERIOD;
-        private TimeUnit refreshPeriodUnit = DEFAULT_REFRESH_PERIOD_UNIT;
+        private Duration refreshPeriod = DEFAULT_REFRESH_PERIOD_DURATION;
         private boolean closeStaleConnections = DEFAULT_CLOSE_STALE_CONNECTIONS;
         private boolean dynamicRefreshSources = DEFAULT_DYNAMIC_REFRESH_SOURCES;
         private Set<RefreshTrigger> adaptiveRefreshTriggers = new HashSet<>(DEFAULT_ADAPTIVE_REFRESH_TRIGGERS);
-        private long adaptiveRefreshTimeout = DEFAULT_ADAPTIVE_REFRESH_TIMEOUT;
-        private TimeUnit adaptiveRefreshTimeoutUnit = DEFAULT_ADAPTIVE_REFRESH_TIMEOUT_UNIT;
+        private Duration adaptiveRefreshTimeout = DEFAULT_ADAPTIVE_REFRESH_TIMEOUT_DURATION;
         private int refreshTriggersReconnectAttempts = DEFAULT_REFRESH_TRIGGERS_RECONNECT_ATTEMPTS;
 
         private Builder() {
@@ -151,6 +147,19 @@ public Builder enablePeriodicRefresh(boolean enabled) {
             return this;
         }
 
+        /**
+         * Enables periodic refresh and sets the refresh period. Defaults to {@literal 60 SECONDS}. See
+         * {@link #DEFAULT_REFRESH_PERIOD} and {@link #DEFAULT_REFRESH_PERIOD_UNIT}. This method is a shortcut for
+         * {@link #refreshPeriod(long, TimeUnit)} and {@link #enablePeriodicRefresh()}.
+         *
+         * @param refreshPeriod period for triggering topology updates, must be greater {@literal 0}
+         * @return {@code this}
+         * @since 5.0
+         */
+        public Builder enablePeriodicRefresh(Duration refreshPeriod) {
+            return refreshPeriod(refreshPeriod).enablePeriodicRefresh();
+        }
+
         /**
          * Enables periodic refresh and sets the refresh period. Defaults to {@literal 60 SECONDS}. See
          * {@link #DEFAULT_REFRESH_PERIOD} and {@link #DEFAULT_REFRESH_PERIOD_UNIT}. This method is a shortcut for
@@ -159,11 +168,30 @@ public Builder enablePeriodicRefresh(boolean enabled) {
          * @param refreshPeriod period for triggering topology updates, must be greater {@literal 0}
          * @param refreshPeriodUnit unit for {@code refreshPeriod}, must not be {@literal null}
          * @return {@code this}
+         * @deprecated since 5.0, use {@link #enablePeriodicRefresh(Duration)}.
          */
+        @Deprecated
         public Builder enablePeriodicRefresh(long refreshPeriod, TimeUnit refreshPeriodUnit) {
             return refreshPeriod(refreshPeriod, refreshPeriodUnit).enablePeriodicRefresh();
         }
 
+        /**
+         * Set the refresh period. Defaults to {@literal 60 SECONDS}. See {@link #DEFAULT_REFRESH_PERIOD} and
+         * {@link #DEFAULT_REFRESH_PERIOD_UNIT}.
+         *
+         * @param refreshPeriod period for triggering topology updates, must be greater {@literal 0}
+         * @return {@code this}
+         * @since 5.0
+         */
+        public Builder refreshPeriod(Duration refreshPeriod) {
+
+            LettuceAssert.notNull(refreshPeriod, "RefreshPeriod duration must not be null");
+            LettuceAssert.isTrue(refreshPeriod.toNanos() > 0, "RefreshPeriod must be greater 0");
+
+            this.refreshPeriod = refreshPeriod;
+            return this;
+        }
+
         /**
          * Set the refresh period. Defaults to {@literal 60 SECONDS}. See {@link #DEFAULT_REFRESH_PERIOD} and
          * {@link #DEFAULT_REFRESH_PERIOD_UNIT}.
@@ -171,15 +199,15 @@ public Builder enablePeriodicRefresh(long refreshPeriod, TimeUnit refreshPeriodU
          * @param refreshPeriod period for triggering topology updates, must be greater {@literal 0}
          * @param refreshPeriodUnit unit for {@code refreshPeriod}, must not be {@literal null}
          * @return {@code this}
+         * @deprecated since 5.0, use {@link #refreshPeriod(Duration)}.
          */
+        @Deprecated
         public Builder refreshPeriod(long refreshPeriod, TimeUnit refreshPeriodUnit) {
 
             LettuceAssert.isTrue(refreshPeriod > 0, "RefreshPeriod must be greater 0");
             LettuceAssert.notNull(refreshPeriodUnit, "TimeUnit must not be null");
 
-            this.refreshPeriod = refreshPeriod;
-            this.refreshPeriodUnit = refreshPeriodUnit;
-            return this;
+            return refreshPeriod(Duration.ofNanos(refreshPeriodUnit.toNanos(refreshPeriod)));
         }
 
         /**
@@ -222,8 +250,10 @@ public Builder dynamicRefreshSources(boolean dynamicRefreshSources) {
          * @return {@code this}
          */
         public Builder enableAdaptiveRefreshTrigger(RefreshTrigger... refreshTrigger) {
+
             LettuceAssert.notNull(refreshTrigger, "RefreshTriggers must not be null");
             LettuceAssert.noNullElements(refreshTrigger, "RefreshTriggers must not contain null elements");
+
             adaptiveRefreshTriggers.addAll(Arrays.asList(refreshTrigger));
             return this;
         }
@@ -242,6 +272,24 @@ public Builder enableAllAdaptiveRefreshTriggers() {
             return this;
         }
 
+        /**
+         * Set the timeout for adaptive topology updates. This timeout is to rate-limit topology updates initiated by refresh
+         * triggers to one topology refresh per timeout. Defaults to {@literal 30 SECONDS}. See {@link #DEFAULT_REFRESH_PERIOD}
+         * and {@link #DEFAULT_REFRESH_PERIOD_UNIT}.
+         *
+         * @param timeout timeout for rate-limit adaptive topology updates, must be greater than {@literal 0}.
+         * @return {@code this}
+         * @since 5.0
+         */
+        public Builder adaptiveRefreshTriggersTimeout(Duration timeout) {
+
+            LettuceAssert.notNull(refreshPeriod, "Adaptive refresh triggers timeout must not be null");
+            LettuceAssert.isTrue(refreshPeriod.toNanos() > 0, "Adaptive refresh triggers timeout must be greater 0");
+
+            this.adaptiveRefreshTimeout = timeout;
+            return this;
+        }
+
         /**
          * Set the timeout for adaptive topology updates. This timeout is to rate-limit topology updates initiated by refresh
          * triggers to one topology refresh per timeout. Defaults to {@literal 30 SECONDS}. See {@link #DEFAULT_REFRESH_PERIOD}
@@ -250,11 +298,15 @@ public Builder enableAllAdaptiveRefreshTriggers() {
          * @param timeout timeout for rate-limit adaptive topology updates
          * @param unit unit for {@code timeout}
          * @return {@code this}
+         * @deprecated since 5.0, use {@link #adaptiveRefreshTriggersTimeout(Duration)}.
          */
+        @Deprecated
         public Builder adaptiveRefreshTriggersTimeout(long timeout, TimeUnit unit) {
-            this.adaptiveRefreshTimeout = timeout;
-            this.adaptiveRefreshTimeoutUnit = unit;
-            return this;
+
+            LettuceAssert.isTrue(timeout > 0, "Triggers timeout must be greater 0");
+            LettuceAssert.notNull(unit, "TimeUnit must not be null");
+
+            return adaptiveRefreshTriggersTimeout(Duration.ofNanos(unit.toNanos(timeout)));
         }
 
         /**
@@ -283,7 +335,7 @@ public ClusterTopologyRefreshOptions build() {
 
     /**
      * Flag, whether regular cluster topology updates are updated. The client starts updating the cluster topology in the
-     * intervals of {@link #getRefreshPeriod()} /{@link #getRefreshPeriodUnit()}. Defaults to {@literal false}.
+     * intervals of {@link #getRefreshPeriod()}. Defaults to {@literal false}.
      *
      * @return {@literal true} it the cluster topology view is updated periodically
      */
@@ -296,19 +348,10 @@ public boolean isPeriodicRefreshEnabled() {
      *
      * @return the period between the regular cluster topology updates
      */
-    public long getRefreshPeriod() {
+    public Duration getRefreshPeriod() {
         return refreshPeriod;
     }
 
-    /**
-     * Unit for the {@link #getRefreshPeriod()}. Defaults to {@link TimeUnit#SECONDS}.
-     *
-     * @return unit for the {@link #getRefreshPeriod()}
-     */
-    public TimeUnit getRefreshPeriodUnit() {
-        return refreshPeriodUnit;
-    }
-
     /**
      * Flag, whether to close stale connections when refreshing the cluster topology. Defaults to {@literal true}. Comes only
      * into effect if {@link #isPeriodicRefreshEnabled()} is {@literal true}.
@@ -348,19 +391,10 @@ public Set<RefreshTrigger> getAdaptiveRefreshTriggers() {
      *
      * @return the period between the regular cluster topology updates
      */
-    public long getAdaptiveRefreshTimeout() {
+    public Duration getAdaptiveRefreshTimeout() {
         return adaptiveRefreshTimeout;
     }
 
-    /**
-     * Unit for the {@link #getAdaptiveRefreshTimeout()}. Defaults to {@link TimeUnit#SECONDS}.
-     *
-     * @return unit for the {@link #getRefreshPeriod()}
-     */
-    public TimeUnit getAdaptiveRefreshTimeoutUnit() {
-        return adaptiveRefreshTimeoutUnit;
-    }
-
     /**
      * Threshold for {@link RefreshTrigger#PERSISTENT_RECONNECTS}. Topology updates based on persistent reconnects lead only to
      * a refresh if the reconnect process tries at least {@code refreshTriggersReconnectAttempts}. See
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
index a10e296295..03fa04c6dc 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,10 @@
  */
 package io.lettuce.core.cluster;
 
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.lettuce.core.resource.ClientResources;
-
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -103,8 +102,7 @@ private boolean acquireTimeout() {
         }
 
         ClusterTopologyRefreshOptions refreshOptions = getClusterTopologyRefreshOptions();
-        Timeout timeout = new Timeout(refreshOptions.getAdaptiveRefreshTimeout(),
-                refreshOptions.getAdaptiveRefreshTimeoutUnit());
+        Timeout timeout = new Timeout(refreshOptions.getAdaptiveRefreshTimeout());
 
         if (timeoutRef.compareAndSet(existingTimeout, timeout)) {
             return true;
@@ -163,8 +161,8 @@ private class Timeout {
 
         private final long expiresMs;
 
-        public Timeout(long timeout, TimeUnit timeUnit) {
-            this.expiresMs = System.currentTimeMillis() + timeUnit.toMillis(timeout);
+        public Timeout(Duration duration) {
+            this.expiresMs = System.currentTimeMillis() + duration.toMillis();
         }
 
         public boolean isExpired() {
diff --git a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
index a418673f0f..ff0704a5bc 100644
--- a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
@@ -17,6 +17,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -48,8 +49,7 @@ class NodeSelectionInvocationHandler extends AbstractInvocationHandler {
 
     private final AbstractNodeSelection<?, ?, ?, ?> selection;
     private final ExecutionModel executionModel;
-    private final long timeout;
-    private final TimeUnit unit;
+    private final Duration timeout;
 
     static {
         try {
@@ -62,27 +62,24 @@ class NodeSelectionInvocationHandler extends AbstractInvocationHandler {
 
     NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selection, Class<?> commandsInterface,
             ExecutionModel executionModel) {
-        this(selection, commandsInterface, 0, null, executionModel);
+        this(selection, commandsInterface, Duration.ZERO, executionModel);
     }
 
-    NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selection, Class<?> commandsInterface, long timeout,
-            TimeUnit unit) {
-        this(selection, commandsInterface, timeout, unit, ExecutionModel.SYNC);
+    NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selection, Class<?> commandsInterface, Duration timeout) {
+        this(selection, commandsInterface, timeout, ExecutionModel.SYNC);
     }
 
     private NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selection, Class<?> commandsInterface,
-            long timeout, TimeUnit unit, ExecutionModel executionModel) {
+            Duration timeout, ExecutionModel executionModel) {
 
         if (executionModel == ExecutionModel.SYNC) {
-            LettuceAssert.isTrue(timeout > 0, "Timeout must be greater 0 when using sync mode");
-            LettuceAssert.notNull(unit, "Unit must not be null when using sync mode");
+            LettuceAssert.isTrue(timeout.toNanos() > 0, "Timeout must be greater 0 when using sync mode");
         }
 
         LettuceAssert.notNull(executionModel, "ExecutionModel must not be null");
 
         this.selection = selection;
         this.commandsInterface = commandsInterface;
-        this.unit = unit;
         this.timeout = timeout;
         this.executionModel = executionModel;
     }
@@ -161,7 +158,7 @@ private Object getExecutions(Map<RedisClusterNode, Object> executions) throws Ex
 
         if (executionModel == ExecutionModel.SYNC) {
 
-            if (!awaitAll(timeout, unit, asyncExecutions.values())) {
+            if (!awaitAll(timeout.toNanos(), TimeUnit.NANOSECONDS, asyncExecutions.values())) {
                 throw createTimeoutException(asyncExecutions);
             }
 
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index f8b5efb8bf..6aadc1e2ce 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -425,7 +425,7 @@ <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisC
         logger.debug(String.format("connectToNodeAsync(%s at %s)", nodeId, socketAddress));
 
         ClusterNodeEndpoint endpoint = new ClusterNodeEndpoint(clientOptions, getResources(), clusterWriter);
-        StatefulRedisConnectionImpl<K, V> connection = new StatefulRedisConnectionImpl<K, V>(endpoint, codec, timeout, unit);
+        StatefulRedisConnectionImpl<K, V> connection = new StatefulRedisConnectionImpl<K, V>(endpoint, codec, timeout);
 
         ConnectionFuture<StatefulRedisConnection<K, V>> connectionFuture = connectStatefulAsync(connection, endpoint,
                 getFirstUri(), socketAddressSupplier, () -> new CommandHandler(clientOptions, clientResources, endpoint));
@@ -474,7 +474,7 @@ <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNode
 
         PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<>(clientOptions);
         StatefulRedisPubSubConnectionImpl<K, V> connection = new StatefulRedisPubSubConnectionImpl<>(endpoint, endpoint, codec,
-                timeout, unit);
+                timeout);
 
         ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectionFuture = connectStatefulAsync(connection, endpoint,
                 getFirstUri(), socketAddressSupplier, () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec,
@@ -516,7 +516,7 @@ <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K,
         clusterWriter.setClusterConnectionProvider(pooledClusterConnectionProvider);
 
         StatefulRedisClusterConnectionImpl<K, V> connection = new StatefulRedisClusterConnectionImpl<>(clusterWriter, codec,
-                timeout, unit);
+                timeout);
 
         connection.setReadFrom(ReadFrom.MASTER);
         connection.setPartitions(partitions);
@@ -547,7 +547,6 @@ <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K,
 
         connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider);
 
-
         return connection;
     }
 
@@ -577,7 +576,7 @@ <K, V> StatefulRedisClusterPubSubConnection<K, V> connectClusterPubSubImpl(Redis
                 clusterTopologyRefreshScheduler);
 
         StatefulRedisClusterPubSubConnectionImpl<K, V> connection = new StatefulRedisClusterPubSubConnectionImpl<>(endpoint,
-                clusterWriter, codec, timeout, unit);
+                clusterWriter, codec, timeout);
 
         ClusterPubSubConnectionProvider<K, V> pooledClusterConnectionProvider = new ClusterPubSubConnectionProvider<>(this,
                 clusterWriter, codec, connection.getUpstreamListener());
@@ -838,7 +837,7 @@ private void activateTopologyRefreshIfNeeded() {
 
             if (clusterTopologyRefreshActivated.compareAndSet(false, true)) {
                 ScheduledFuture<?> scheduledFuture = genericWorkerPool.scheduleAtFixedRate(clusterTopologyRefreshScheduler,
-                        options.getRefreshPeriod(), options.getRefreshPeriod(), options.getRefreshPeriodUnit());
+                        options.getRefreshPeriod().toNanos(), options.getRefreshPeriod().toNanos(), TimeUnit.NANOSECONDS);
                 clusterTopologyRefreshFuture.set(scheduledFuture);
             }
         }
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
index 04e438be10..6a56507fcf 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
@@ -21,10 +21,10 @@
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
 import io.lettuce.core.*;
@@ -76,10 +76,10 @@ public class StatefulRedisClusterConnectionImpl<K, V> extends RedisChannelHandle
      * @param writer the channel writer
      * @param codec Codec used to encode/decode keys and values.
      * @param timeout Maximum time to wait for a response.
-     * @param unit Unit of time for the timeout.
      */
-    public StatefulRedisClusterConnectionImpl(RedisChannelWriter writer, RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
-        super(writer, timeout, unit);
+    public StatefulRedisClusterConnectionImpl(RedisChannelWriter writer, RedisCodec<K, V> codec, Duration timeout) {
+
+        super(writer, timeout);
         this.codec = codec;
 
         this.async = new RedisAdvancedClusterAsyncCommandsImpl<>(this, codec);
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
index ad21b088db..34c7b0ff48 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 
 import io.lettuce.core.AbstractRedisClient;
 import io.lettuce.core.RedisChannelWriter;
@@ -57,12 +57,12 @@ class StatefulRedisClusterPubSubConnectionImpl<K, V> extends StatefulRedisPubSub
      * @param writer the channel writer
      * @param codec Codec used to encode/decode keys and values.
      * @param timeout Maximum time to wait for a response.
-     * @param unit Unit of time for the timeout.
      */
     public StatefulRedisClusterPubSubConnectionImpl(PubSubClusterEndpoint<K, V> endpoint, RedisChannelWriter writer,
-            RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
+            RedisCodec<K, V> codec, Duration timeout) {
+
+        super(endpoint, writer, codec, timeout);
 
-        super(endpoint, writer, codec, timeout, unit);
         this.endpoint = endpoint;
     }
 
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
index 376015f524..22a37ad034 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.cluster.api.async;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -37,12 +38,22 @@ public interface RedisClusterAsyncCommands<K, V>
         RedisScriptingAsyncCommands<K, V>, RedisServerAsyncCommands<K, V>, RedisHLLAsyncCommands<K, V>,
         RedisGeoAsyncCommands<K, V>, BaseRedisAsyncCommands<K, V> {
 
+    /**
+     * Set the default timeout for operations.
+     *
+     * @param timeout the timeout value
+     * @since 5.0
+     */
+    void setTimeout(Duration timeout);
+
     /**
      * Set the default timeout for operations.
      *
      * @param timeout the timeout value
      * @param unit the unit of the timeout value
+     * @deprecated since 5.0, use {@link #setTimeout(Duration)}.
      */
+    @Deprecated
     void setTimeout(long timeout, TimeUnit unit);
 
     /**
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
index 7a17470333..4cdcd66826 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
@@ -15,14 +15,14 @@
  */
 package io.lettuce.core.cluster.api.reactive;
 
+import java.time.Duration;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import io.lettuce.core.KeyValue;
-import io.lettuce.core.api.reactive.*;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.api.reactive.*;
 
 /**
  * A complete reactive and thread-safe cluster Redis API with 400+ Methods.
@@ -37,12 +37,22 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
         RedisSortedSetReactiveCommands<K, V>, RedisScriptingReactiveCommands<K, V>, RedisServerReactiveCommands<K, V>,
         RedisHLLReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>, BaseRedisReactiveCommands<K, V> {
 
+    /**
+     * Set the default timeout for operations.
+     *
+     * @param timeout the timeout value
+     * @since 5.0
+     */
+    void setTimeout(Duration timeout);
+
     /**
      * Set the default timeout for operations.
      *
      * @param timeout the timeout value
      * @param unit the unit of the timeout value
+     * @deprecated since 5.0, use {@link #setTimeout(Duration)}.
      */
+    @Deprecated
     void setTimeout(long timeout, TimeUnit unit);
 
     /**
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
index a5f9fdaa6f..66433feb2b 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.cluster.api.sync;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -32,12 +33,22 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
         RedisListCommands<K, V>, RedisSetCommands<K, V>, RedisSortedSetCommands<K, V>, RedisScriptingCommands<K, V>,
         RedisServerCommands<K, V>, RedisHLLCommands<K, V>, RedisGeoCommands<K, V>, BaseRedisCommands<K, V> {
 
+    /**
+     * Set the default timeout for operations.
+     *
+     * @param timeout the timeout value
+     * @since 5.0
+     */
+    void setTimeout(Duration timeout);
+
     /**
      * Set the default timeout for operations.
      *
      * @param timeout the timeout value
      * @param unit the unit of the timeout value
+     * @deprecated since 5.0, use {@link #setTimeout(Duration)}.
      */
+    @Deprecated
     void setTimeout(long timeout, TimeUnit unit);
 
     /**
diff --git a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
index c5acd2c92b..761e9974da 100644
--- a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.dynamic;
 
+import java.time.Duration;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
@@ -64,8 +65,7 @@ protected Object dispatchCommand(Object[] arguments, RedisCommand<Object, Object
 
         connection.dispatch(asyncCommand);
 
-        long timeout = connection.getTimeout();
-        TimeUnit unit = connection.getTimeoutUnit();
+        Duration timeout = connection.getTimeout();
 
         if (commandMethod.getParameters() instanceof ExecutionSpecificParameters) {
             ExecutionSpecificParameters executionSpecificParameters = (ExecutionSpecificParameters) commandMethod
@@ -75,12 +75,11 @@ protected Object dispatchCommand(Object[] arguments, RedisCommand<Object, Object
                 Timeout timeoutArg = (Timeout) arguments[executionSpecificParameters.getTimeoutIndex()];
                 if (timeoutArg != null) {
                     timeout = timeoutArg.getTimeout();
-                    unit = timeoutArg.getTimeUnit();
                 }
             }
         }
 
-        LettuceFutures.awaitAll(timeout, unit, asyncCommand);
+        LettuceFutures.awaitAll(timeout.toNanos(), TimeUnit.NANOSECONDS, asyncCommand);
 
         return asyncCommand.get();
     }
diff --git a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
index 51d624d7a2..40687a0852 100644
--- a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.dynamic;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -83,15 +84,14 @@ protected static Object synchronize(BatchTasks batchTasks, StatefulConnection<Ob
             return null;
         }
 
-        long timeout = connection.getTimeout();
-        TimeUnit unit = connection.getTimeoutUnit();
+        Duration timeout = connection.getTimeout();
 
         BatchException exception = null;
         List<RedisCommand<?, ?, ?>> failures = null;
         for (RedisCommand<?, ?, ?> batchTask : batchTasks) {
 
             try {
-                LettuceFutures.awaitAll(timeout, unit, (RedisFuture) batchTask);
+                LettuceFutures.awaitAll(timeout.toNanos(), TimeUnit.NANOSECONDS, (RedisFuture) batchTask);
             } catch (Exception e) {
                 if (exception == null) {
                     failures = new ArrayList<>();
diff --git a/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java b/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java
index 9bf219f817..88bf60af08 100644
--- a/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java
+++ b/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.dynamic.domain;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import io.lettuce.core.dynamic.annotation.Command;
@@ -29,42 +30,44 @@
  */
 public class Timeout {
 
-    private final long timeout;
-    private final TimeUnit timeUnit;
+    private final Duration timeout;
 
-    private Timeout(long timeout, TimeUnit timeUnit) {
+    private Timeout(Duration timeout) {
 
-        LettuceAssert.isTrue(timeout >= 0, "Timeout must be greater or equal to zero");
-        LettuceAssert.notNull(timeUnit, "TimeUnit must not be null");
+        LettuceAssert.notNull(timeout, "Timeout must not be null");
+        LettuceAssert.isTrue(!timeout.isNegative(), "Timeout must be greater or equal to zero");
 
         this.timeout = timeout;
-        this.timeUnit = timeUnit;
     }
 
     /**
      * Create a {@link Timeout}.
      *
      * @param timeout the timeout value, must be non-negative.
-     * @param timeUnit the associated {@link TimeUnit}, must not be {@literal null}.
      * @return the {@link Timeout}.
      */
-    public static Timeout create(long timeout, TimeUnit timeUnit) {
-        return new Timeout(timeout, timeUnit);
+    public static Timeout create(Duration timeout) {
+        return new Timeout(timeout);
     }
 
     /**
+     * Create a {@link Timeout}.
      *
-     * @return the timeout value.
+     * @param timeout the timeout value, must be non-negative.
+     * @param timeUnit the associated {@link TimeUnit}, must not be {@literal null}.
+     * @return the {@link Timeout}.
      */
-    public long getTimeout() {
-        return timeout;
+    public static Timeout create(long timeout, TimeUnit timeUnit) {
+
+        LettuceAssert.notNull(timeUnit, "TimeUnit must not be null");
+
+        return new Timeout(Duration.ofNanos(timeUnit.toNanos(timeout)));
     }
 
     /**
-     *
-     * @return the {@link TimeUnit}.
+     * @return the timeout value.
      */
-    public TimeUnit getTimeUnit() {
-        return timeUnit;
+    public Duration getTimeout() {
+        return timeout;
     }
 }
diff --git a/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java b/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java
index a3220988a2..2354196468 100644
--- a/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java
+++ b/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.event;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import io.lettuce.core.internal.LettuceAssert;
@@ -29,15 +30,14 @@ public class DefaultEventPublisherOptions implements EventPublisherOptions {
 
     public static final long DEFAULT_EMIT_INTERVAL = 10;
     public static final TimeUnit DEFAULT_EMIT_INTERVAL_UNIT = TimeUnit.MINUTES;
+    public static final Duration DEFAULT_EMIT_INTERVAL_DURATION = Duration.ofMinutes(DEFAULT_EMIT_INTERVAL);
 
-    private static final DefaultEventPublisherOptions DISABLED = new Builder().eventEmitInterval(0, TimeUnit.SECONDS).build();
+    private static final DefaultEventPublisherOptions DISABLED = new Builder().eventEmitInterval(Duration.ZERO).build();
 
-    private final long eventEmitInterval;
-    private final TimeUnit eventEmitIntervalUnit;
+    private final Duration eventEmitInterval;
 
     private DefaultEventPublisherOptions(Builder builder) {
         this.eventEmitInterval = builder.eventEmitInterval;
-        this.eventEmitIntervalUnit = builder.eventEmitIntervalUnit;
     }
 
     /**
@@ -45,7 +45,7 @@ private DefaultEventPublisherOptions(Builder builder) {
      *
      * @return a new {@link DefaultEventPublisherOptions.Builder} to construct {@link DefaultEventPublisherOptions}.
      */
-    public static Builder builder(){
+    public static Builder builder() {
         return new Builder();
     }
 
@@ -54,12 +54,29 @@ public static Builder builder(){
      */
     public static class Builder {
 
-        private long eventEmitInterval = DEFAULT_EMIT_INTERVAL;
-        private TimeUnit eventEmitIntervalUnit = DEFAULT_EMIT_INTERVAL_UNIT;
+        private Duration eventEmitInterval = DEFAULT_EMIT_INTERVAL_DURATION;
 
         private Builder() {
         }
 
+        /**
+         * Sets the emit interval and the interval unit. Event emission will be disabled if the {@code eventEmitInterval} is set
+         * to 0}. Defaults to 10} {@link TimeUnit#MINUTES}. See {@link DefaultEventPublisherOptions#DEFAULT_EMIT_INTERVAL}
+         * {@link DefaultEventPublisherOptions#DEFAULT_EMIT_INTERVAL_UNIT}.
+         *
+         * @param eventEmitInterval the event interval, must be greater or equal to 0}
+         * @return this
+         * @since 5.0
+         */
+        public Builder eventEmitInterval(Duration eventEmitInterval) {
+
+            LettuceAssert.notNull(eventEmitInterval, "EventEmitInterval must not be null");
+            LettuceAssert.isTrue(!eventEmitInterval.isNegative(), "EventEmitInterval must be greater or equal to 0");
+
+            this.eventEmitInterval = eventEmitInterval;
+            return this;
+        }
+
         /**
          * Sets the emit interval and the interval unit. Event emission will be disabled if the {@code eventEmitInterval} is set
          * to 0}. Defaults to 10} {@link TimeUnit#MINUTES}. See {@link DefaultEventPublisherOptions#DEFAULT_EMIT_INTERVAL}
@@ -68,14 +85,15 @@ private Builder() {
          * @param eventEmitInterval the event interval, must be greater or equal to 0}
          * @param eventEmitIntervalUnit the {@link TimeUnit} for the interval, must not be null
          * @return this
+         * @deprecated since 5.0, use {@link #eventEmitInterval(Duration)}
          */
+        @Deprecated
         public Builder eventEmitInterval(long eventEmitInterval, TimeUnit eventEmitIntervalUnit) {
+
             LettuceAssert.isTrue(eventEmitInterval >= 0, "EventEmitInterval must be greater or equal to 0");
             LettuceAssert.notNull(eventEmitIntervalUnit, "EventEmitIntervalUnit must not be null");
 
-            this.eventEmitInterval = eventEmitInterval;
-            this.eventEmitIntervalUnit = eventEmitIntervalUnit;
-            return this;
+            return eventEmitInterval(Duration.ofNanos(eventEmitIntervalUnit.toNanos(eventEmitInterval)));
         }
 
         /**
@@ -88,15 +106,10 @@ public DefaultEventPublisherOptions build() {
     }
 
     @Override
-    public long eventEmitInterval() {
+    public Duration eventEmitInterval() {
         return eventEmitInterval;
     }
 
-    @Override
-    public TimeUnit eventEmitIntervalUnit() {
-        return eventEmitIntervalUnit;
-    }
-
     /**
      * Create a new {@link DefaultEventPublisherOptions} using default settings.
      *
diff --git a/src/main/java/io/lettuce/core/event/EventPublisherOptions.java b/src/main/java/io/lettuce/core/event/EventPublisherOptions.java
index be8df5211b..858957f260 100644
--- a/src/main/java/io/lettuce/core/event/EventPublisherOptions.java
+++ b/src/main/java/io/lettuce/core/event/EventPublisherOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core.event;
 
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 
 /**
  * Configuration interface for command latency collection.
@@ -29,12 +29,5 @@ public interface EventPublisherOptions {
      *
      * @return the interval for emit metrics
      */
-    long eventEmitInterval();
-
-    /**
-     * Returns the {@link TimeUnit} for the event emit interval.
-     *
-     * @return the {@link TimeUnit} for the event emit interval
-     */
-    TimeUnit eventEmitIntervalUnit();
+    Duration eventEmitInterval();
 }
diff --git a/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java b/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
index e05f09ca08..c068a178fd 100644
--- a/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
+++ b/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,11 @@
  */
 package io.lettuce.core.event.metrics;
 
+import java.util.concurrent.TimeUnit;
+
 import io.lettuce.core.event.EventBus;
 import io.lettuce.core.event.EventPublisherOptions;
 import io.lettuce.core.metrics.CommandLatencyCollector;
-
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.ScheduledFuture;
 
@@ -34,31 +35,27 @@ public class DefaultCommandLatencyEventPublisher implements MetricEventPublisher
     private final EventBus eventBus;
     private final CommandLatencyCollector commandLatencyCollector;
 
-    private final Runnable EMITTER = new Runnable() {
-        @Override
-        public void run() {
-            emitMetricsEvent();
-        }
-    };
+    private final Runnable EMITTER = this::emitMetricsEvent;
 
     private volatile ScheduledFuture<?> scheduledFuture;
 
     public DefaultCommandLatencyEventPublisher(EventExecutorGroup eventExecutorGroup, EventPublisherOptions options,
             EventBus eventBus, CommandLatencyCollector commandLatencyCollector) {
+
         this.eventExecutorGroup = eventExecutorGroup;
         this.options = options;
         this.eventBus = eventBus;
         this.commandLatencyCollector = commandLatencyCollector;
 
-        if (options.eventEmitInterval() > 0) {
-            scheduledFuture = this.eventExecutorGroup.scheduleAtFixedRate(EMITTER, options.eventEmitInterval(),
-                    options.eventEmitInterval(), options.eventEmitIntervalUnit());
+        if (!options.eventEmitInterval().isZero()) {
+            scheduledFuture = this.eventExecutorGroup.scheduleAtFixedRate(EMITTER, options.eventEmitInterval().toMillis(),
+                    options.eventEmitInterval().toMillis(), TimeUnit.MILLISECONDS);
         }
     }
 
     @Override
     public boolean isEnabled() {
-        return options.eventEmitInterval() > 0 && scheduledFuture != null;
+        return !options.eventEmitInterval().isZero() && scheduledFuture != null;
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index be171bba67..e5b3fb2b49 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -163,7 +163,7 @@ private static <K, V> StatefulRedisMasterSlaveConnection<K, V> connectSentinel(R
 
         MasterSlaveChannelWriter<K, V> channelWriter = new MasterSlaveChannelWriter<>(connectionProvider);
         StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(channelWriter,
-                codec, redisURI.getTimeout(), redisURI.getUnit());
+                codec, redisURI.getTimeoutDuration());
 
         Runnable runnable = () -> {
             try {
@@ -222,7 +222,7 @@ private static <K, V> StatefulRedisMasterSlaveConnection<K, V> connectMasterSlav
             MasterSlaveChannelWriter<K, V> channelWriter = new MasterSlaveChannelWriter<>(connectionProvider);
 
             StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(
-                    channelWriter, codec, redisURI.getTimeout(), redisURI.getUnit());
+                    channelWriter, codec, redisURI.getTimeoutDuration());
 
             return connection;
 
@@ -258,7 +258,7 @@ private static <K, V> StatefulRedisMasterSlaveConnection<K, V> connectStaticMast
             MasterSlaveChannelWriter<K, V> channelWriter = new MasterSlaveChannelWriter<>(connectionProvider);
 
             StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(
-                    channelWriter, codec, seedNode.getTimeout(), seedNode.getUnit());
+                    channelWriter, codec, seedNode.getTimeoutDuration());
 
             return connection;
 
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
index dbe6734c5b..1715a046c9 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.models.role.RedisNodeDescription;
-
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -101,7 +100,7 @@ private List<RedisNodeDescription> getNodeSpecificViews(Requests requestedPing,
 
         List<RedisNodeDescription> result = new ArrayList<>();
 
-        long timeout = seed.getUnit().toNanos(seed.getTimeout());
+        long timeout = seed.getTimeoutDuration().toNanos();
         Map<RedisNodeDescription, Long> latencies = new HashMap<>();
 
         requestedPing.await(timeout, TimeUnit.NANOSECONDS);
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
index bd64aa293b..fe234ff7ae 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
@@ -17,6 +17,7 @@
 
 import static io.lettuce.core.masterslave.MasterSlaveUtils.CODEC;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -33,7 +34,6 @@
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
-
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -50,8 +50,7 @@ public class SentinelTopologyProvider implements TopologyProvider {
     private final String masterId;
     private final RedisClient redisClient;
     private final RedisURI sentinelUri;
-    private final long timeout;
-    private final TimeUnit timeUnit;
+    private final Duration timeout;
 
     /**
      * Creates a new {@link SentinelTopologyProvider}.
@@ -69,8 +68,7 @@ public SentinelTopologyProvider(String masterId, RedisClient redisClient, RedisU
         this.masterId = masterId;
         this.redisClient = redisClient;
         this.sentinelUri = sentinelUri;
-        this.timeout = sentinelUri.getTimeout();
-        this.timeUnit = sentinelUri.getUnit();
+        this.timeout = sentinelUri.getTimeoutDuration();
     }
 
     @Override
@@ -85,8 +83,8 @@ public List<RedisNodeDescription> getNodes() {
 
             List<RedisNodeDescription> result = new ArrayList<>();
             try {
-                Map<String, String> master = masterFuture.get(timeout, timeUnit);
-                List<Map<String, String>> slaves = slavesFuture.get(timeout, timeUnit);
+                Map<String, String> master = masterFuture.get(timeout.toNanos(), TimeUnit.NANOSECONDS);
+                List<Map<String, String>> slaves = slavesFuture.get(timeout.toNanos(), TimeUnit.NANOSECONDS);
 
                 result.add(toNode(master, RedisInstance.Role.MASTER));
                 result.addAll(slaves.stream().filter(SentinelTopologyProvider::isAvailable)
diff --git a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
index 9e264945a1..f1202e3974 100644
--- a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core.masterslave;
 
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 
 import io.lettuce.core.ReadFrom;
 import io.lettuce.core.StatefulRedisConnectionImpl;
@@ -33,11 +33,10 @@ class StatefulRedisMasterSlaveConnectionImpl<K, V> extends StatefulRedisConnecti
      * @param writer the channel writer
      * @param codec Codec used to encode/decode keys and values.
      * @param timeout Maximum time to wait for a response.
-     * @param unit Unit of time for the timeout.
      */
-    public StatefulRedisMasterSlaveConnectionImpl(MasterSlaveChannelWriter<K, V> writer, RedisCodec<K, V> codec, long timeout,
-            TimeUnit unit) {
-        super(writer, codec, timeout, unit);
+    public StatefulRedisMasterSlaveConnectionImpl(MasterSlaveChannelWriter<K, V> writer, RedisCodec<K, V> codec,
+            Duration timeout) {
+        super(writer, codec, timeout);
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
index 1a2709b85c..e746e4b9ac 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
@@ -199,7 +199,7 @@ public synchronized void scheduleReconnect() {
             attempts++;
 
             final int attempt = attempts;
-            int timeout = (int) reconnectDelay.getTimeUnit().toMillis(reconnectDelay.createDelay(attempt));
+            int timeout = (int) reconnectDelay.createDelay(attempt).toMillis();
             logger.debug("{} Reconnect attempt {}, delay {}ms", logPrefix(), attempt, timeout);
 
             this.reconnectScheduleTimeout = timer.newTimeout(it -> {
diff --git a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
index fcec08ef5c..8b0c57598d 100644
--- a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,10 @@
 package io.lettuce.core.pubsub;
 
 import java.lang.reflect.Array;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.TimeUnit;
 
 import io.lettuce.core.RedisChannelWriter;
 import io.lettuce.core.RedisFuture;
@@ -32,9 +30,6 @@
 import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands;
 import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands;
 
-import io.netty.channel.ChannelHandler;
-import io.netty.util.internal.ConcurrentSet;
-
 /**
  * An thread-safe pub/sub connection to a Redis server. Multiple threads may share one {@link StatefulRedisPubSubConnectionImpl}
  *
@@ -57,11 +52,11 @@ public class StatefulRedisPubSubConnectionImpl<K, V> extends StatefulRedisConnec
      * @param writer the writer used to write commands
      * @param codec Codec used to encode/decode keys and values.
      * @param timeout Maximum time to wait for a response.
-     * @param unit Unit of time for the timeout.
      */
-    public StatefulRedisPubSubConnectionImpl(PubSubEndpoint<K, V> endpoint, RedisChannelWriter writer, RedisCodec<K, V> codec, long timeout,
-            TimeUnit unit) {
-        super(writer, codec, timeout, unit);
+    public StatefulRedisPubSubConnectionImpl(PubSubEndpoint<K, V> endpoint, RedisChannelWriter writer, RedisCodec<K, V> codec,
+            Duration timeout) {
+
+        super(writer, codec, timeout);
 
         this.endpoint = endpoint;
     }
@@ -143,8 +138,6 @@ private <T> T[] toArray(Collection<T> c) {
         return c.toArray(array);
     }
 
-
-
     @Override
     public void activated() {
         super.activated();
diff --git a/src/main/java/io/lettuce/core/resource/ConstantDelay.java b/src/main/java/io/lettuce/core/resource/ConstantDelay.java
index 313eb3764a..cf0bd1124f 100644
--- a/src/main/java/io/lettuce/core/resource/ConstantDelay.java
+++ b/src/main/java/io/lettuce/core/resource/ConstantDelay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core.resource;
 
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 
 /**
  * {@link Delay} with a constant delay for each attempt.
@@ -24,16 +24,14 @@
  */
 class ConstantDelay extends Delay {
 
-    private final long delay;
+    private final Duration delay;
 
-    ConstantDelay(long delay, TimeUnit timeUnit) {
-
-        super(timeUnit);
+    ConstantDelay(Duration delay) {
         this.delay = delay;
     }
 
     @Override
-    public long createDelay(long attempt) {
+    public Duration createDelay(long attempt) {
         return delay;
     }
 }
diff --git a/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java b/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java
index d5d0d92756..53492c729e 100644
--- a/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java
+++ b/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.resource;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import io.lettuce.core.resource.Delay.StatefulDelay;
@@ -31,33 +32,35 @@
  * </p>
  *
  * @author Jongyeol Choi
+ * @author Mark Paluch
  * @since 4.2
  * @see StatefulDelay
  */
 class DecorrelatedJitterDelay extends Delay implements StatefulDelay {
 
-    private final long lower;
-    private final long upper;
+    private final Duration lower;
+    private final Duration upper;
     private final long base;
+    private final TimeUnit targetTimeUnit;
 
     /*
      * Delays may be used by different threads, this one is volatile to prevent visibility issues
      */
     private volatile long prevDelay;
 
-    DecorrelatedJitterDelay(long lower, long upper, long base, TimeUnit unit) {
-        super(unit);
+    DecorrelatedJitterDelay(Duration lower, Duration upper, long base, TimeUnit targetTimeUnit) {
         this.lower = lower;
         this.upper = upper;
         this.base = base;
+        this.targetTimeUnit = targetTimeUnit;
         reset();
     }
 
     @Override
-    public long createDelay(long attempt) {
+    public Duration createDelay(long attempt) {
         long value = randomBetween(base, Math.max(base, prevDelay * 3));
-        long delay = applyBounds(value, lower, upper);
-        prevDelay = delay;
+        Duration delay = applyBounds(Duration.ofNanos(targetTimeUnit.toNanos(value)), lower, upper);
+        prevDelay = delay.toNanos();
         return delay;
     }
 
diff --git a/src/main/java/io/lettuce/core/resource/Delay.java b/src/main/java/io/lettuce/core/resource/Delay.java
index e06fbe4cbe..d93bc7af06 100644
--- a/src/main/java/io/lettuce/core/resource/Delay.java
+++ b/src/main/java/io/lettuce/core/resource/Delay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.resource;
 
+import java.time.Duration;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
@@ -36,8 +37,8 @@
  */
 public abstract class Delay {
 
-    private static long DEFAULT_LOWER_BOUND = 0;
-    private static long DEFAULT_UPPER_BOUND = TimeUnit.SECONDS.toMillis(30);
+    private static Duration DEFAULT_LOWER_BOUND = Duration.ZERO;
+    private static Duration DEFAULT_UPPER_BOUND = Duration.ofSeconds(30);
     private static int DEFAULT_POWER_OF = 2;
     private static TimeUnit DEFAULT_TIMEUNIT = TimeUnit.MILLISECONDS;
 
@@ -57,30 +58,10 @@ public interface StatefulDelay {
         void reset();
     }
 
-    /**
-     * The time unit of the delay.
-     */
-    private final TimeUnit timeUnit;
-
     /**
      * Creates a new {@link Delay}.
-     *
-     * @param timeUnit the time unit.
      */
-    protected Delay(TimeUnit timeUnit) {
-
-        LettuceAssert.notNull(timeUnit, "TimeUnit must not be null");
-
-        this.timeUnit = timeUnit;
-    }
-
-    /**
-     * Returns the {@link TimeUnit} associated with this {@link Delay}.
-     *
-     * @return the {@link TimeUnit} associated with this {@link Delay}.
-     */
-    public TimeUnit getTimeUnit() {
-        return timeUnit;
+    protected Delay() {
     }
 
     /**
@@ -92,7 +73,21 @@ public TimeUnit getTimeUnit() {
      * @param attempt the attempt to calculate the delay from.
      * @return the calculated delay.
      */
-    public abstract long createDelay(long attempt);
+    public abstract Duration createDelay(long attempt);
+
+    /**
+     * Creates a new {@link ConstantDelay}.
+     *
+     * @param delay the delay, must be greater or equal to {@literal 0}.
+     * @return a created {@link ConstantDelay}.
+     */
+    public static Delay constant(Duration delay) {
+
+        LettuceAssert.notNull(delay, "Delay must not be null");
+        LettuceAssert.isTrue(delay.toNanos() >= 0, "Delay must be greater or equal to 0");
+
+        return new ConstantDelay(delay);
+    }
 
     /**
      * Creates a new {@link ConstantDelay}.
@@ -100,12 +95,14 @@ public TimeUnit getTimeUnit() {
      * @param delay the delay, must be greater or equal to 0
      * @param timeUnit the unit of the delay.
      * @return a created {@link ConstantDelay}.
+     * @deprecated since 5.0, use {@link #constant(Duration)}
      */
+    @Deprecated
     public static Delay constant(int delay, TimeUnit timeUnit) {
 
-        LettuceAssert.isTrue(delay >= 0, "Delay must be greater or equal to 0");
+        LettuceAssert.notNull(timeUnit, "TimeUnit must not be null");
 
-        return new ConstantDelay(delay, timeUnit);
+        return constant(Duration.ofNanos(timeUnit.toNanos(delay)));
     }
 
     /**
@@ -115,7 +112,31 @@ public static Delay constant(int delay, TimeUnit timeUnit) {
      * @return a created {@link ExponentialDelay}.
      */
     public static Delay exponential() {
-        return exponential(DEFAULT_LOWER_BOUND, DEFAULT_UPPER_BOUND, DEFAULT_TIMEUNIT, DEFAULT_POWER_OF);
+        return exponential(DEFAULT_LOWER_BOUND, DEFAULT_UPPER_BOUND, DEFAULT_POWER_OF, DEFAULT_TIMEUNIT);
+    }
+
+    /**
+     * Creates a new {@link ExponentialDelay} on with custom boundaries and factor (eg. with upper 9000, lower 0, powerOf 10: 1,
+     * 10, 100, 1000, 9000, 9000, 9000, ...).
+     *
+     * @param lower the lower boundary, must be non-negative
+     * @param upper the upper boundary, must be greater than the lower boundary
+     * @param powersOf the base for exponential growth (eg. powers of 2, powers of 10, etc...), must be non-negative and greater
+     *        than 1
+     * @param targetTimeUnit the unit of the delay.
+     * @return a created {@link ExponentialDelay}.
+     * @since 5.0
+     */
+    public static Delay exponential(Duration lower, Duration upper, int powersOf, TimeUnit targetTimeUnit) {
+
+        LettuceAssert.notNull(lower, "Lower boundary must not be null");
+        LettuceAssert.isTrue(lower.toNanos() >= 0, "Lower boundary must be greater or equal to 0");
+        LettuceAssert.notNull(upper, "Upper boundary must not be null");
+        LettuceAssert.isTrue(upper.toNanos() > lower.toNanos(), "Upper boundary must be greater than the lower boundary");
+        LettuceAssert.isTrue(powersOf > 1, "PowersOf must be greater than 1");
+        LettuceAssert.notNull(targetTimeUnit, "Target TimeUnit must not be null");
+
+        return new ExponentialDelay(lower, upper, powersOf, targetTimeUnit);
     }
 
     /**
@@ -134,8 +155,9 @@ public static Delay exponential(long lower, long upper, TimeUnit unit, int power
         LettuceAssert.isTrue(lower >= 0, "Lower boundary must be greater or equal to 0");
         LettuceAssert.isTrue(upper > lower, "Upper boundary must be greater than the lower boundary");
         LettuceAssert.isTrue(powersOf > 1, "PowersOf must be greater than 1");
+        LettuceAssert.notNull(unit, "TimeUnit must not be null");
 
-        return new ExponentialDelay(lower, upper, unit, powersOf);
+        return exponential(Duration.ofNanos(unit.toNanos(lower)), Duration.ofNanos(unit.toNanos(upper)), powersOf, unit);
     }
 
     /**
@@ -147,6 +169,28 @@ public static Delay equalJitter() {
         return equalJitter(DEFAULT_LOWER_BOUND, DEFAULT_UPPER_BOUND, 1L, DEFAULT_TIMEUNIT);
     }
 
+    /**
+     * Creates a new {@link EqualJitterDelay}.
+     *
+     * @param lower the lower boundary, must be non-negative
+     * @param upper the upper boundary, must be greater than the lower boundary
+     * @param base the base, must be greater or equal to 1
+     * @param targetTimeUnit the unit of the delay.
+     * @return a created {@link EqualJitterDelay}.
+     * @since 5.0
+     */
+    public static Delay equalJitter(Duration lower, Duration upper, long base, TimeUnit targetTimeUnit) {
+
+        LettuceAssert.notNull(lower, "Lower boundary must not be null");
+        LettuceAssert.isTrue(lower.toNanos() >= 0, "Lower boundary must be greater or equal to 0");
+        LettuceAssert.notNull(upper, "Upper boundary must not be null");
+        LettuceAssert.isTrue(upper.toNanos() > lower.toNanos(), "Upper boundary must be greater than the lower boundary");
+        LettuceAssert.isTrue(base >= 1, "Base must be greater or equal to 1");
+        LettuceAssert.notNull(targetTimeUnit, "Target TimeUnit must not be null");
+
+        return new EqualJitterDelay(lower, upper, base, targetTimeUnit);
+    }
+
     /**
      * Creates a new {@link EqualJitterDelay}.
      *
@@ -161,8 +205,9 @@ public static Delay equalJitter(long lower, long upper, long base, TimeUnit unit
         LettuceAssert.isTrue(lower >= 0, "Lower boundary must be greater or equal to 0");
         LettuceAssert.isTrue(upper > lower, "Upper boundary must be greater than the lower boundary");
         LettuceAssert.isTrue(base >= 1, "Base must be greater or equal to 1");
+        LettuceAssert.notNull(unit, "TimeUnit must not be null");
 
-        return new EqualJitterDelay(lower, upper, base, unit);
+        return equalJitter(Duration.ofNanos(unit.toNanos(lower)), Duration.ofNanos(unit.toNanos(upper)), base, unit);
     }
 
     /**
@@ -174,6 +219,28 @@ public static Delay fullJitter() {
         return fullJitter(DEFAULT_LOWER_BOUND, DEFAULT_UPPER_BOUND, 1L, DEFAULT_TIMEUNIT);
     }
 
+    /**
+     * Creates a new {@link FullJitterDelay}.
+     *
+     * @param lower the lower boundary, must be non-negative
+     * @param upper the upper boundary, must be greater than the lower boundary
+     * @param base the base, must be greater or equal to 1
+     * @param targetTimeUnit the unit of the delay.
+     * @return a created {@link FullJitterDelay}.
+     * @since 5.0
+     */
+    public static Delay fullJitter(Duration lower, Duration upper, long base, TimeUnit targetTimeUnit) {
+
+        LettuceAssert.notNull(lower, "Lower boundary must not be null");
+        LettuceAssert.isTrue(lower.toNanos() >= 0, "Lower boundary must be greater or equal to 0");
+        LettuceAssert.notNull(upper, "Upper boundary must not be null");
+        LettuceAssert.isTrue(upper.toNanos() > lower.toNanos(), "Upper boundary must be greater than the lower boundary");
+        LettuceAssert.isTrue(base >= 1, "Base must be greater or equal to 1");
+        LettuceAssert.notNull(targetTimeUnit, "Target TimeUnit must not be null");
+
+        return new FullJitterDelay(lower, upper, base, targetTimeUnit);
+    }
+
     /**
      * Creates a new {@link FullJitterDelay}.
      *
@@ -188,8 +255,9 @@ public static Delay fullJitter(long lower, long upper, long base, TimeUnit unit)
         LettuceAssert.isTrue(lower >= 0, "Lower boundary must be greater or equal to 0");
         LettuceAssert.isTrue(upper > lower, "Upper boundary must be greater than the lower boundary");
         LettuceAssert.isTrue(base >= 1, "Base must be greater or equal to 1");
+        LettuceAssert.notNull(unit, "TimeUnit must not be null");
 
-        return new FullJitterDelay(lower, upper, base, unit);
+        return fullJitter(Duration.ofNanos(unit.toNanos(lower)), Duration.ofNanos(unit.toNanos(upper)), base, unit);
     }
 
     /**
@@ -201,6 +269,29 @@ public static Supplier<Delay> decorrelatedJitter() {
         return decorrelatedJitter(DEFAULT_LOWER_BOUND, DEFAULT_UPPER_BOUND, 0L, DEFAULT_TIMEUNIT);
     }
 
+    /**
+     * Creates a {@link Supplier} that constructs new {@link DecorrelatedJitterDelay} instances.
+     *
+     * @param lower the lower boundary, must be non-negative
+     * @param upper the upper boundary, must be greater than the lower boundary
+     * @param base the base, must be greater or equal to 0
+     * @param targetTimeUnit the unit of the delay.
+     * @return a new {@link Supplier} of {@link DecorrelatedJitterDelay}.
+     * @since 5.0
+     */
+    public static Supplier<Delay> decorrelatedJitter(Duration lower, Duration upper, long base, TimeUnit targetTimeUnit) {
+
+        LettuceAssert.notNull(lower, "Lower boundary must not be null");
+        LettuceAssert.isTrue(lower.toNanos() >= 0, "Lower boundary must be greater or equal to 0");
+        LettuceAssert.notNull(upper, "Upper boundary must not be null");
+        LettuceAssert.isTrue(upper.toNanos() > lower.toNanos(), "Upper boundary must be greater than the lower boundary");
+        LettuceAssert.isTrue(base >= 0, "Base must be greater or equal to 1");
+        LettuceAssert.notNull(targetTimeUnit, "Target TimeUnit must not be null");
+
+        // Create new Delay because it has state.
+        return () -> new DecorrelatedJitterDelay(lower, upper, base, targetTimeUnit);
+    }
+
     /**
      * Creates a {@link Supplier} that constructs new {@link DecorrelatedJitterDelay} instances.
      *
@@ -215,9 +306,10 @@ public static Supplier<Delay> decorrelatedJitter(long lower, long upper, long ba
         LettuceAssert.isTrue(lower >= 0, "Lower boundary must be greater or equal to 0");
         LettuceAssert.isTrue(upper > lower, "Upper boundary must be greater than the lower boundary");
         LettuceAssert.isTrue(base >= 0, "Base must be greater or equal to 0");
+        LettuceAssert.notNull(unit, "TimeUnit must not be null");
 
         // Create new Delay because it has state.
-        return () -> new DecorrelatedJitterDelay(lower, upper, base, unit);
+        return decorrelatedJitter(Duration.ofNanos(unit.toNanos(lower)), Duration.ofNanos(unit.toNanos(upper)), base, unit);
     }
 
     /**
@@ -235,13 +327,13 @@ protected static long randomBetween(long min, long max) {
         return ThreadLocalRandom.current().nextLong(min, max);
     }
 
-    protected static long applyBounds(long calculatedValue, long lower, long upper) {
+    protected static Duration applyBounds(Duration calculatedValue, Duration lower, Duration upper) {
 
-        if (calculatedValue < lower) {
+        if (calculatedValue.compareTo(lower) < 0) {
             return lower;
         }
 
-        if (calculatedValue > upper) {
+        if (calculatedValue.compareTo(upper) > 0) {
             return upper;
         }
 
diff --git a/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java b/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java
index bd266f9bd8..e7e3fc63a8 100644
--- a/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java
+++ b/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.resource;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -29,20 +30,23 @@
  * </p>
  *
  * @author Jongyeol Choi
+ * @author Mark Paluch
  * @since 4.2
  */
 class EqualJitterDelay extends ExponentialDelay {
 
     private final long base;
+    private final TimeUnit targetTimeUnit;
 
-    EqualJitterDelay(long lower, long upper, long base, TimeUnit unit) {
-        super(lower, upper, unit, 2);
+    EqualJitterDelay(Duration lower, Duration upper, long base, TimeUnit targetTimeUnit) {
+        super(lower, upper, 2, targetTimeUnit);
         this.base = base;
+        this.targetTimeUnit = targetTimeUnit;
     }
 
     @Override
-    public long createDelay(long attempt) {
+    public Duration createDelay(long attempt) {
         long value = randomBetween(0, base * calculatePowerOfTwo(attempt));
-        return applyBounds(value);
+        return applyBounds(Duration.ofNanos(targetTimeUnit.toNanos(value)));
     }
 }
diff --git a/src/main/java/io/lettuce/core/resource/ExponentialDelay.java b/src/main/java/io/lettuce/core/resource/ExponentialDelay.java
index 787305ac99..8a45b1e7eb 100644
--- a/src/main/java/io/lettuce/core/resource/ExponentialDelay.java
+++ b/src/main/java/io/lettuce/core/resource/ExponentialDelay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.resource;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -37,20 +38,21 @@
  */
 class ExponentialDelay extends Delay {
 
-    private final long lower;
-    private final long upper;
+    private final Duration lower;
+    private final Duration upper;
     private final int powersOf;
+    private final TimeUnit targetTimeUnit;
 
-    ExponentialDelay(long lower, long upper, TimeUnit unit, int powersOf) {
+    ExponentialDelay(Duration lower, Duration upper, int powersOf, TimeUnit targetTimeUnit) {
 
-        super(unit);
         this.lower = lower;
         this.upper = upper;
         this.powersOf = powersOf;
+        this.targetTimeUnit = targetTimeUnit;
     }
 
     @Override
-    public long createDelay(long attempt) {
+    public Duration createDelay(long attempt) {
 
         long delay;
         if (attempt <= 0) { // safeguard against underflow
@@ -61,7 +63,7 @@ public long createDelay(long attempt) {
             delay = calculateAlternatePower(attempt);
         }
 
-        return applyBounds(delay);
+        return applyBounds(Duration.ofNanos(targetTimeUnit.toNanos(delay)));
     }
 
     /**
@@ -70,7 +72,7 @@ public long createDelay(long attempt) {
      * @param delay the delay
      * @return the delay normalized to its lower and upper bounds.
      */
-    protected long applyBounds(long delay) {
+    protected Duration applyBounds(Duration delay) {
         return applyBounds(delay, lower, upper);
     }
 
diff --git a/src/main/java/io/lettuce/core/resource/FullJitterDelay.java b/src/main/java/io/lettuce/core/resource/FullJitterDelay.java
index 937eb95301..4acc00b1d6 100644
--- a/src/main/java/io/lettuce/core/resource/FullJitterDelay.java
+++ b/src/main/java/io/lettuce/core/resource/FullJitterDelay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.resource;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -30,23 +31,28 @@
  * </p>
  *
  * @author Jongyeol Choi
+ * @author Mark Paluch
  * @since 4.2
  */
 class FullJitterDelay extends ExponentialDelay {
 
+    private final Duration upper;
     private final long base;
-    private final long upper;
+    private final TimeUnit targetTimeUnit;
 
-    FullJitterDelay(long lower, long upper, long base, TimeUnit unit) {
-        super(lower, upper, unit, 2);
+    FullJitterDelay(Duration lower, Duration upper, long base, TimeUnit targetTimeUnit) {
+        super(lower, upper, 2, targetTimeUnit);
         this.upper = upper;
         this.base = base;
+        this.targetTimeUnit = targetTimeUnit;
     }
 
     @Override
-    public long createDelay(long attempt) {
-        long temp = Math.min(upper, base * calculatePowerOfTwo(attempt));
+    public Duration createDelay(long attempt) {
+
+        long upperTarget = targetTimeUnit.convert(upper.toNanos(), TimeUnit.NANOSECONDS);
+        long temp = Math.min(upperTarget, base * calculatePowerOfTwo(attempt));
         long delay = temp / 2 + randomBetween(0, temp / 2);
-        return applyBounds(delay);
+        return applyBounds(Duration.ofNanos(targetTimeUnit.toNanos(delay)));
     }
 }
diff --git a/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
index 2177791150..1629023fba 100644
--- a/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
@@ -15,8 +15,8 @@
  */
 package io.lettuce.core.sentinel;
 
+import java.time.Duration;
 import java.util.Collection;
-import java.util.concurrent.TimeUnit;
 
 import io.lettuce.core.RedisChannelHandler;
 import io.lettuce.core.RedisChannelWriter;
@@ -42,9 +42,9 @@ public class StatefulRedisSentinelConnectionImpl<K, V> extends RedisChannelHandl
 
     private String clientName;
 
-    public StatefulRedisSentinelConnectionImpl(RedisChannelWriter writer, RedisCodec<K, V> codec, long timeout,
-            TimeUnit unit) {
-        super(writer, timeout, unit);
+    public StatefulRedisSentinelConnectionImpl(RedisChannelWriter writer, RedisCodec<K, V> codec, Duration timeout) {
+
+        super(writer, timeout);
 
         this.codec = codec;
         this.async = new RedisSentinelAsyncCommandsImpl<>(this, codec);
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
index 6575812545..0f66827ec5 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package biz.paluch.redis.extensibility;
 
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 
 import javax.enterprise.inject.Alternative;
 
@@ -44,7 +44,7 @@ public MyExtendedRedisClient() {
 
     @Override
     protected <K, V> StatefulRedisPubSubConnectionImpl<K, V> newStatefulRedisPubSubConnection(PubSubEndpoint<K, V> endpoint,
-            RedisChannelWriter channelWriter, RedisCodec<K, V> codec, long timeout, TimeUnit unit) {
-        return new MyPubSubConnection<>(endpoint, channelWriter, codec, timeout, unit);
+            RedisChannelWriter channelWriter, RedisCodec<K, V> codec, Duration timeout) {
+        return new MyPubSubConnection<>(endpoint, channelWriter, codec, timeout);
     }
 }
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
index 87ea76691b..7289d174a0 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
@@ -15,7 +15,7 @@
  */
 package biz.paluch.redis.extensibility;
 
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import io.lettuce.core.RedisChannelWriter;
@@ -42,11 +42,9 @@ public class MyPubSubConnection<K, V> extends StatefulRedisPubSubConnectionImpl<
      * @param writer the channel writer
      * @param codec Codec used to encode/decode keys and values.
      * @param timeout Maximum time to wait for a response.
-     * @param unit Unit of time for the timeout.
      */
-    public MyPubSubConnection(PubSubEndpoint<K, V> endpoint, RedisChannelWriter writer, RedisCodec<K, V> codec, long timeout,
-            TimeUnit unit) {
-        super(endpoint, writer, codec, timeout, unit);
+    public MyPubSubConnection(PubSubEndpoint<K, V> endpoint, RedisChannelWriter writer, RedisCodec<K, V> codec, Duration timeout) {
+        super(endpoint, writer, codec, timeout);
     }
 
     @Override
diff --git a/src/test/java/io/lettuce/core/ClientOptionsTest.java b/src/test/java/io/lettuce/core/ClientOptionsTest.java
index fadd50f8e7..6e56a84b84 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsTest.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsTest.java
@@ -21,6 +21,7 @@
 import static org.assertj.core.api.Assertions.fail;
 
 import java.net.ServerSocket;
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
@@ -32,7 +33,6 @@
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
-
 import io.netty.channel.Channel;
 
 /**
@@ -230,7 +230,7 @@ protected void run(RedisClient client) throws Exception {
                 try (ServerSocket serverSocket = new ServerSocket(0)) {
 
                     RedisURI redisURI = RedisURI.builder().redis(TestSettings.host(), serverSocket.getLocalPort())
-                            .withPassword(passwd).withTimeout(500, TimeUnit.MILLISECONDS).build();
+                            .withPassword(passwd).withTimeout(Duration.ofMillis(500)).build();
 
                     try {
                         client.connect(redisURI);
diff --git a/src/test/java/io/lettuce/core/ClientTest.java b/src/test/java/io/lettuce/core/ClientTest.java
index 91ebc3a5a7..2d7fa727a4 100644
--- a/src/test/java/io/lettuce/core/ClientTest.java
+++ b/src/test/java/io/lettuce/core/ClientTest.java
@@ -29,9 +29,6 @@
 import io.lettuce.Wait;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
-import io.lettuce.core.protocol.Command;
-import io.lettuce.core.protocol.CommandWrapper;
-import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * @author Will Glozer
diff --git a/src/test/java/io/lettuce/core/RedisClientConnectionTest.java b/src/test/java/io/lettuce/core/RedisClientConnectionTest.java
index 310e71bd48..984f66cea7 100644
--- a/src/test/java/io/lettuce/core/RedisClientConnectionTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientConnectionTest.java
@@ -18,6 +18,7 @@
 import static io.lettuce.core.RedisURI.Builder.redis;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
+import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -25,9 +26,7 @@
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.springframework.test.util.ReflectionTestUtils;
 
-import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
@@ -40,12 +39,11 @@
 public class RedisClientConnectionTest extends AbstractRedisClientTest {
 
     public static final Utf8StringCodec CODEC = new Utf8StringCodec();
-    public static final int EXPECTED_TIMEOUT = 500;
-    public static final TimeUnit EXPECTED_TIME_UNIT = TimeUnit.MILLISECONDS;
+    public static final Duration EXPECTED_TIMEOUT = Duration.ofMillis(500);
 
     @Before
     public void before() throws Exception {
-        client.setDefaultTimeout(EXPECTED_TIMEOUT, EXPECTED_TIME_UNIT);
+        client.setDefaultTimeout(EXPECTED_TIMEOUT);
     }
 
     /*
@@ -55,14 +53,14 @@ public void before() throws Exception {
     public void connectClientUri() throws Exception {
 
         StatefulRedisConnection<String, String> connection = client.connect();
-        assertTimeout(connection, EXPECTED_TIMEOUT, EXPECTED_TIME_UNIT);
+        assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
         connection.close();
     }
 
     @Test
     public void connectCodecClientUri() throws Exception {
         StatefulRedisConnection<String, String> connection = client.connect(CODEC);
-        assertTimeout(connection, EXPECTED_TIMEOUT, EXPECTED_TIME_UNIT);
+        assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
         connection.close();
     }
 
@@ -70,7 +68,7 @@ public void connectCodecClientUri() throws Exception {
     public void connectOwnUri() throws Exception {
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisConnection<String, String> connection = client.connect(redisURI);
-        assertTimeout(connection, redisURI.getTimeout(), redisURI.getUnit());
+        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeoutDuration());
         connection.close();
     }
 
@@ -88,7 +86,7 @@ public void connectSentinelMissingHostAndSocketUri() throws Exception {
     public void connectCodecOwnUri() throws Exception {
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisConnection<String, String> connection = client.connect(CODEC, redisURI);
-        assertTimeout(connection, redisURI.getTimeout(), redisURI.getUnit());
+        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeoutDuration());
         connection.close();
     }
 
@@ -136,14 +134,14 @@ public void shutdownAsyncInRedisFutureTest() throws Exception {
     @Test
     public void connectPubSubClientUri() throws Exception {
         StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub();
-        assertTimeout(connection, EXPECTED_TIMEOUT, EXPECTED_TIME_UNIT);
+        assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
         connection.close();
     }
 
     @Test
     public void connectPubSubCodecClientUri() throws Exception {
         StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub(CODEC);
-        assertTimeout(connection, EXPECTED_TIMEOUT, EXPECTED_TIME_UNIT);
+        assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
         connection.close();
     }
 
@@ -151,7 +149,7 @@ public void connectPubSubCodecClientUri() throws Exception {
     public void connectPubSubOwnUri() throws Exception {
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub(redisURI);
-        assertTimeout(connection, redisURI.getTimeout(), redisURI.getUnit());
+        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeoutDuration());
         connection.close();
     }
 
@@ -169,7 +167,7 @@ public void connectPubSubSentinelMissingHostAndSocketUri() throws Exception {
     public void connectPubSubCodecOwnUri() throws Exception {
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub(CODEC, redisURI);
-        assertTimeout(connection, redisURI.getTimeout(), redisURI.getUnit());
+        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeoutDuration());
         connection.close();
     }
 
@@ -189,14 +187,14 @@ public void connectPubSubCodecSentinelMissingHostAndSocketUri() throws Exception
     @Test
     public void connectSentinelClientUri() throws Exception {
         StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel();
-        assertTimeout(connection, EXPECTED_TIMEOUT, EXPECTED_TIME_UNIT);
+        assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
         connection.close();
     }
 
     @Test
     public void connectSentinelCodecClientUri() throws Exception {
         StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel(CODEC);
-        assertTimeout(connection, EXPECTED_TIMEOUT, EXPECTED_TIME_UNIT);
+        assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
         connection.close();
     }
 
@@ -214,15 +212,16 @@ public void connectSentinelSentinelMissingHostAndSocketUri() throws Exception {
     public void connectSentinelOwnUri() throws Exception {
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel(redisURI);
-        assertTimeout(connection, redisURI.getTimeout(), redisURI.getUnit());
+        assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(1));
         connection.close();
     }
 
     @Test
     public void connectSentinelCodecOwnUri() throws Exception {
+
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel(CODEC, redisURI);
-        assertTimeout(connection, redisURI.getTimeout(), redisURI.getUnit());
+        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeoutDuration());
         connection.close();
     }
 
@@ -236,16 +235,11 @@ public void connectSentinelCodecSentinelMissingHostAndSocketUri() throws Excepti
         client.connectSentinel(CODEC, invalidSentinel());
     }
 
-    private RedisURI invalidSentinel() {
+    private static RedisURI invalidSentinel() {
+
         RedisURI redisURI = new RedisURI();
         redisURI.getSentinels().add(new RedisURI());
 
         return redisURI;
     }
-
-    private void assertTimeout(StatefulConnection<?, ?> connection, long expectedTimeout, TimeUnit expectedTimeUnit) {
-
-        assertThat(ReflectionTestUtils.getField(connection, "timeout")).isEqualTo(expectedTimeout);
-        assertThat(ReflectionTestUtils.getField(connection, "unit")).isEqualTo(expectedTimeUnit);
-    }
 }
diff --git a/src/test/java/io/lettuce/core/RedisURIBuilderTest.java b/src/test/java/io/lettuce/core/RedisURIBuilderTest.java
index 1f4ce6d262..21584df43b 100644
--- a/src/test/java/io/lettuce/core/RedisURIBuilderTest.java
+++ b/src/test/java/io/lettuce/core/RedisURIBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.File;
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
@@ -29,10 +30,11 @@ public class RedisURIBuilderTest {
 
     @Test
     public void sentinel() throws Exception {
-        RedisURI result = RedisURI.Builder.sentinel("localhost").withTimeout(2, TimeUnit.HOURS).build();
+        RedisURI result = RedisURI.Builder.sentinel("localhost").withTimeout(Duration.ofHours(2)).build();
         assertThat(result.getSentinels()).hasSize(1);
-        assertThat(result.getTimeout()).isEqualTo(2);
-        assertThat(result.getUnit()).isEqualTo(TimeUnit.HOURS);
+        assertThat(result.getTimeout()).isEqualTo(TimeUnit.HOURS.toSeconds(2));
+        assertThat(result.getUnit()).isEqualTo(TimeUnit.SECONDS);
+        assertThat(result.getTimeoutDuration()).isEqualTo(Duration.ofHours(2));
     }
 
     @Test(expected = IllegalStateException.class)
@@ -42,10 +44,11 @@ public void sentinelWithHostShouldFail() throws Exception {
 
     @Test
     public void sentinelWithPort() throws Exception {
-        RedisURI result = RedisURI.Builder.sentinel("localhost", 1).withTimeout(2, TimeUnit.HOURS).build();
+        RedisURI result = RedisURI.Builder.sentinel("localhost", 1).withTimeout(Duration.ofHours(2)).build();
         assertThat(result.getSentinels()).hasSize(1);
-        assertThat(result.getTimeout()).isEqualTo(2);
-        assertThat(result.getUnit()).isEqualTo(TimeUnit.HOURS);
+        assertThat(result.getTimeout()).isEqualTo(TimeUnit.HOURS.toSeconds(2));
+        assertThat(result.getUnit()).isEqualTo(TimeUnit.SECONDS);
+        assertThat(result.getTimeoutDuration()).isEqualTo(Duration.ofHours(2));
     }
 
     @Test(expected = IllegalStateException.class)
diff --git a/src/test/java/io/lettuce/core/RedisURITest.java b/src/test/java/io/lettuce/core/RedisURITest.java
index 6c4641079f..1fe8c50d74 100644
--- a/src/test/java/io/lettuce/core/RedisURITest.java
+++ b/src/test/java/io/lettuce/core/RedisURITest.java
@@ -22,9 +22,10 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import io.lettuce.core.internal.LettuceSets;
 import org.junit.Test;
 
+import io.lettuce.core.internal.LettuceSets;
+
 /**
  * @author Mark Paluch
  */
@@ -159,6 +160,7 @@ public void socketAltUriTest() {
 
     @Test
     public void timeoutParsingTest() {
+
         checkUriTimeout("redis://auth@localhost:1234/5?timeout=5000", 5000, TimeUnit.MILLISECONDS);
         checkUriTimeout("redis://auth@localhost:1234/5?timeout=5000ms", 5000, TimeUnit.MILLISECONDS);
         checkUriTimeout("redis://auth@localhost:1234/5?timeout=5s", 5, TimeUnit.SECONDS);
@@ -174,7 +176,7 @@ public void timeoutParsingTest() {
         checkUriTimeout("redis://auth@localhost:1234/5?timeout=junk", defaultUri.getTimeout(), defaultUri.getUnit());
 
         RedisURI redisURI = RedisURI.create("redis://auth@localhost:1234/5?timeout=5000ms");
-        assertThat(redisURI.toURI().toString()).isEqualTo("redis://auth@localhost:1234?database=5&timeout=5000ms");
+        assertThat(redisURI.toURI().toString()).isEqualTo("redis://auth@localhost:1234?database=5&timeout=5s");
     }
 
     @Test
@@ -194,10 +196,9 @@ public void timeoutParsingWithJunkParamTest() {
     }
 
     private RedisURI checkUriTimeout(String uri, long expectedTimeout, TimeUnit expectedUnit) {
-        RedisURI redisURI1 = RedisURI.create(uri);
-        assertThat(redisURI1.getTimeout()).isEqualTo(expectedTimeout);
-        assertThat(redisURI1.getUnit()).isEqualTo(expectedUnit);
-        return redisURI1;
+        RedisURI redisURI = RedisURI.create(uri);
+        assertThat(expectedUnit.convert(redisURI.getTimeout(), redisURI.getUnit())).isEqualTo(expectedTimeout);
+        return redisURI;
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/SocketOptionsTest.java b/src/test/java/io/lettuce/core/SocketOptionsTest.java
index f7afdde0e4..c6e2ba8db3 100644
--- a/src/test/java/io/lettuce/core/SocketOptionsTest.java
+++ b/src/test/java/io/lettuce/core/SocketOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import static org.assertj.core.api.Assertions.fail;
 
 import java.net.SocketException;
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
@@ -43,8 +44,7 @@ public void testBuilder() throws Exception {
 
         assertThat(sut.isKeepAlive()).isEqualTo(true);
         assertThat(sut.isTcpNoDelay()).isEqualTo(true);
-        assertThat(sut.getConnectTimeout()).isEqualTo(1);
-        assertThat(sut.getConnectTimeoutUnit()).isEqualTo(TimeUnit.MINUTES);
+        assertThat(sut.getConnectTimeout()).isEqualTo(Duration.ofMinutes(1));
     }
 
     @Test
@@ -55,8 +55,7 @@ public void testCopy() throws Exception {
     protected void checkAssertions(SocketOptions sut) {
         assertThat(sut.isKeepAlive()).isEqualTo(false);
         assertThat(sut.isTcpNoDelay()).isEqualTo(false);
-        assertThat(sut.getConnectTimeout()).isEqualTo(10);
-        assertThat(sut.getConnectTimeoutUnit()).isEqualTo(TimeUnit.SECONDS);
+        assertThat(sut.getConnectTimeout()).isEqualTo(Duration.ofSeconds(10));
     }
 
     @Test(timeout = 1000)
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java
index 4f7cfc7c4e..4377e6b2de 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,6 @@ public void testCopy() throws Exception {
         ClusterClientOptions copy = ClusterClientOptions.copyOf(options);
 
         assertThat(copy.getRefreshPeriod()).isEqualTo(options.getRefreshPeriod());
-        assertThat(copy.getRefreshPeriodUnit()).isEqualTo(options.getRefreshPeriodUnit());
         assertThat(copy.isCloseStaleConnections()).isEqualTo(options.isCloseStaleConnections());
         assertThat(copy.isRefreshClusterView()).isEqualTo(options.isRefreshClusterView());
         assertThat(copy.isValidateClusterNodeMembership()).isEqualTo(options.isValidateClusterNodeMembership());
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java b/src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java
index 70a58c9f44..9921edf450 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.junit.Assert.assertThat;
 
+import java.time.Duration;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
 
@@ -139,7 +139,7 @@ protected RedisClusterNode mockRedisClusterNode() {
         node.setPongReceivedTimestamp(3);
         node.setSlaveOf("me");
         node.setSlots(LettuceLists.unmodifiableList(1, 2, 3));
-        node.setUri(new RedisURI("localhost", 1, 1, TimeUnit.DAYS));
+        node.setUri(new RedisURI("localhost", 1, Duration.ofDays(1)));
         return node;
     }
 
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java
index c5e506ffa5..3303667660 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
@@ -40,13 +41,11 @@ public void testBuilder() throws Exception {
                 .refreshTriggersReconnectAttempts(2)//
                 .build();
 
-        assertThat(options.getRefreshPeriod()).isEqualTo(10);
-        assertThat(options.getRefreshPeriodUnit()).isEqualTo(TimeUnit.MINUTES);
+        assertThat(options.getRefreshPeriod()).isEqualTo(Duration.ofMinutes(10));
         assertThat(options.isCloseStaleConnections()).isEqualTo(false);
         assertThat(options.isPeriodicRefreshEnabled()).isTrue();
         assertThat(options.useDynamicRefreshSources()).isFalse();
-        assertThat(options.getAdaptiveRefreshTimeout()).isEqualTo(15);
-        assertThat(options.getAdaptiveRefreshTimeoutUnit()).isEqualTo(TimeUnit.MILLISECONDS);
+        assertThat(options.getAdaptiveRefreshTimeout()).isEqualTo(Duration.ofMillis(15));
         assertThat(options.getAdaptiveRefreshTriggers()).containsOnly(RefreshTrigger.MOVED_REDIRECT);
         assertThat(options.getRefreshTriggersReconnectAttempts()).isEqualTo(2);
     }
@@ -65,13 +64,11 @@ public void testCopy() throws Exception {
 
         ClusterTopologyRefreshOptions options = ClusterTopologyRefreshOptions.copyOf(master);
 
-        assertThat(options.getRefreshPeriod()).isEqualTo(10);
-        assertThat(options.getRefreshPeriodUnit()).isEqualTo(TimeUnit.MINUTES);
+        assertThat(options.getRefreshPeriod()).isEqualTo(Duration.ofMinutes(10));
         assertThat(options.isCloseStaleConnections()).isEqualTo(false);
         assertThat(options.isPeriodicRefreshEnabled()).isTrue();
         assertThat(options.useDynamicRefreshSources()).isFalse();
-        assertThat(options.getAdaptiveRefreshTimeout()).isEqualTo(15);
-        assertThat(options.getAdaptiveRefreshTimeoutUnit()).isEqualTo(TimeUnit.MILLISECONDS);
+        assertThat(options.getAdaptiveRefreshTimeout()).isEqualTo(Duration.ofMillis(15));
         assertThat(options.getAdaptiveRefreshTriggers()).containsOnly(RefreshTrigger.MOVED_REDIRECT);
         assertThat(options.getRefreshTriggersReconnectAttempts()).isEqualTo(2);
     }
@@ -81,20 +78,18 @@ public void testDefault() throws Exception {
 
         ClusterTopologyRefreshOptions options = ClusterTopologyRefreshOptions.create();
 
-        assertThat(options.getRefreshPeriod()).isEqualTo(ClusterTopologyRefreshOptions.DEFAULT_REFRESH_PERIOD);
-        assertThat(options.getRefreshPeriodUnit()).isEqualTo(ClusterTopologyRefreshOptions.DEFAULT_REFRESH_PERIOD_UNIT);
+        assertThat(options.getRefreshPeriod()).isEqualTo(ClusterTopologyRefreshOptions.DEFAULT_REFRESH_PERIOD_DURATION);
         assertThat(options.isCloseStaleConnections()).isEqualTo(ClusterTopologyRefreshOptions.DEFAULT_CLOSE_STALE_CONNECTIONS);
-        assertThat(options.isPeriodicRefreshEnabled()).isEqualTo(ClusterTopologyRefreshOptions.DEFAULT_PERIODIC_REFRESH_ENABLED).isFalse();
+        assertThat(options.isPeriodicRefreshEnabled())
+                .isEqualTo(ClusterTopologyRefreshOptions.DEFAULT_PERIODIC_REFRESH_ENABLED).isFalse();
         assertThat(options.useDynamicRefreshSources()).isEqualTo(ClusterTopologyRefreshOptions.DEFAULT_DYNAMIC_REFRESH_SOURCES)
                 .isTrue();
-        assertThat(options.getAdaptiveRefreshTimeout())
-                .isEqualTo(ClusterTopologyRefreshOptions.DEFAULT_ADAPTIVE_REFRESH_TIMEOUT);
-        assertThat(options.getAdaptiveRefreshTimeoutUnit())
-                .isEqualTo(ClusterTopologyRefreshOptions.DEFAULT_ADAPTIVE_REFRESH_TIMEOUT_UNIT);
-        assertThat(options.getAdaptiveRefreshTriggers())
-                .isEqualTo(ClusterTopologyRefreshOptions.DEFAULT_ADAPTIVE_REFRESH_TRIGGERS);
-        assertThat(options.getRefreshTriggersReconnectAttempts())
-                .isEqualTo(ClusterTopologyRefreshOptions.DEFAULT_REFRESH_TRIGGERS_RECONNECT_ATTEMPTS);
+        assertThat(options.getAdaptiveRefreshTimeout()).isEqualTo(
+                ClusterTopologyRefreshOptions.DEFAULT_ADAPTIVE_REFRESH_TIMEOUT_DURATION);
+        assertThat(options.getAdaptiveRefreshTriggers()).isEqualTo(
+                ClusterTopologyRefreshOptions.DEFAULT_ADAPTIVE_REFRESH_TRIGGERS);
+        assertThat(options.getRefreshTriggersReconnectAttempts()).isEqualTo(
+                ClusterTopologyRefreshOptions.DEFAULT_REFRESH_TRIGGERS_RECONNECT_ATTEMPTS);
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
index 70cb151a5a..07e3bd0038 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
@@ -20,19 +20,18 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.assertj.core.api.AssertionsForClassTypes;
 import org.junit.*;
 import org.junit.runners.MethodSorters;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.TestClientResources;
 import io.lettuce.core.*;
-import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
@@ -130,8 +129,8 @@ public void shouldApplyTimeoutOnRegularConnection() throws Exception {
 
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
 
-        assertTimeout(connection, 1, TimeUnit.MINUTES);
-        assertTimeout(connection.getConnection(host, port1), 1, TimeUnit.MINUTES);
+        assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(1));
+        assertThat(connection.getConnection(host, port1).getTimeout()).isEqualTo(Duration.ofMinutes(1));
 
         connection.close();
     }
@@ -143,8 +142,8 @@ public void shouldApplyTimeoutOnRegularConnectionUsingCodec() throws Exception {
 
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect(CODEC);
 
-        assertTimeout(connection, 1, TimeUnit.MINUTES);
-        assertTimeout(connection.getConnection(host, port1), 1, TimeUnit.MINUTES);
+        assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(1));
+        assertThat(connection.getConnection(host, port1).getTimeout()).isEqualTo(Duration.ofMinutes(1));
 
         connection.close();
     }
@@ -156,7 +155,7 @@ public void shouldApplyTimeoutOnPubSubConnection() throws Exception {
 
         StatefulRedisPubSubConnection<String, String> connection = clusterClient.connectPubSub();
 
-        assertTimeout(connection, 1, TimeUnit.MINUTES);
+        assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(1));
         connection.close();
     }
 
@@ -167,7 +166,7 @@ public void shouldApplyTimeoutOnPubSubConnectionUsingCodec() throws Exception {
 
         StatefulRedisPubSubConnection<String, String> connection = clusterClient.connectPubSub(CODEC);
 
-        assertTimeout(connection, 1, TimeUnit.MINUTES);
+        assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(1));
         connection.close();
     }
 
@@ -612,10 +611,4 @@ public void testPfmerge() throws Exception {
 
         connection.getStatefulConnection().close();
     }
-
-    private void assertTimeout(StatefulConnection<?, ?> connection, long expectedTimeout, TimeUnit expectedTimeUnit) {
-
-        AssertionsForClassTypes.assertThat(ReflectionTestUtils.getField(connection, "timeout")).isEqualTo(expectedTimeout);
-        AssertionsForClassTypes.assertThat(ReflectionTestUtils.getField(connection, "unit")).isEqualTo(expectedTimeUnit);
-    }
 }
diff --git a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
index 3bfcf81ef6..9eec76326c 100644
--- a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.concurrent.TimeUnit;
 
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -41,10 +41,10 @@
 @RunWith(MockitoJUnitRunner.class)
 public class RoundRobinSocketAddressSupplierTest {
 
-    private static RedisURI hap1 = new RedisURI("127.0.0.1", 1, 1, TimeUnit.SECONDS);
-    private static RedisURI hap2 = new RedisURI("127.0.0.1", 2, 1, TimeUnit.SECONDS);
-    private static RedisURI hap3 = new RedisURI("127.0.0.1", 3, 1, TimeUnit.SECONDS);
-    private static RedisURI hap4 = new RedisURI("127.0.0.1", 4, 1, TimeUnit.SECONDS);
+    private static RedisURI hap1 = new RedisURI("127.0.0.1", 1, Duration.ofSeconds(1));
+    private static RedisURI hap2 = new RedisURI("127.0.0.1", 2, Duration.ofSeconds(1));
+    private static RedisURI hap3 = new RedisURI("127.0.0.1", 3, Duration.ofSeconds(1));
+    private static RedisURI hap4 = new RedisURI("127.0.0.1", 4, Duration.ofSeconds(1));
     private static Partitions partitions;
 
     @Mock
@@ -64,12 +64,9 @@ public void before() throws Exception {
         when(clientResourcesMock.dnsResolver()).thenReturn(DnsResolvers.JVM_DEFAULT);
 
         partitions = new Partitions();
-        partitions.addPartition(
-                new RedisClusterNode(hap1, "1", true, "", 0, 0, 0, new ArrayList<>(), new HashSet<>()));
-        partitions.addPartition(
-                new RedisClusterNode(hap2, "2", true, "", 0, 0, 0, new ArrayList<>(), new HashSet<>()));
-        partitions.addPartition(
-                new RedisClusterNode(hap3, "3", true, "", 0, 0, 0, new ArrayList<>(), new HashSet<>()));
+        partitions.addPartition(new RedisClusterNode(hap1, "1", true, "", 0, 0, 0, new ArrayList<>(), new HashSet<>()));
+        partitions.addPartition(new RedisClusterNode(hap2, "2", true, "", 0, 0, 0, new ArrayList<>(), new HashSet<>()));
+        partitions.addPartition(new RedisClusterNode(hap3, "3", true, "", 0, 0, 0, new ArrayList<>(), new HashSet<>()));
 
         partitions.updateCache();
     }
@@ -77,8 +74,8 @@ public void before() throws Exception {
     @Test
     public void noOffset() throws Exception {
 
-        RoundRobinSocketAddressSupplier sut = new RoundRobinSocketAddressSupplier(partitions, redisClusterNodes -> redisClusterNodes,
-                clientResourcesMock);
+        RoundRobinSocketAddressSupplier sut = new RoundRobinSocketAddressSupplier(partitions,
+                redisClusterNodes -> redisClusterNodes, clientResourcesMock);
 
         assertThat(sut.get()).isEqualTo(hap1.getResolvedAddress());
         assertThat(sut.get()).isEqualTo(hap2.getResolvedAddress());
@@ -91,14 +88,13 @@ public void noOffset() throws Exception {
     @Test
     public void partitionTableChangesNewNode() throws Exception {
 
-        RoundRobinSocketAddressSupplier sut = new RoundRobinSocketAddressSupplier(partitions, redisClusterNodes -> redisClusterNodes,
-                clientResourcesMock);
+        RoundRobinSocketAddressSupplier sut = new RoundRobinSocketAddressSupplier(partitions,
+                redisClusterNodes -> redisClusterNodes, clientResourcesMock);
 
         assertThat(sut.get()).isEqualTo(hap1.getResolvedAddress());
         assertThat(sut.get()).isEqualTo(hap2.getResolvedAddress());
 
-        partitions.add(
-                new RedisClusterNode(hap4, "4", true, "", 0, 0, 0, new ArrayList<>(), new HashSet<>()));
+        partitions.add(new RedisClusterNode(hap4, "4", true, "", 0, 0, 0, new ArrayList<>(), new HashSet<>()));
 
         assertThat(sut.get()).isEqualTo(hap1.getResolvedAddress());
         assertThat(sut.get()).isEqualTo(hap2.getResolvedAddress());
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
index 2618f8f99e..9932dcc8e3 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
@@ -17,8 +17,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.Duration;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 import org.junit.*;
 
@@ -79,7 +79,7 @@ public void sync() {
 
         SynchronousCommands api = factory.getCommands(SynchronousCommands.class);
 
-        api.setSync(key, value, Timeout.create(10, TimeUnit.SECONDS));
+        api.setSync(key, value, Timeout.create(Duration.ofSeconds(10)));
         assertThat(api.get("key")).isEqualTo("value");
         assertThat(api.getAsBytes("key")).isEqualTo("value".getBytes());
     }
diff --git a/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java b/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java
index a0a66d4af2..a5479bee85 100644
--- a/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java
+++ b/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
@@ -27,30 +28,27 @@
 public class DefaultEventPublisherOptionsTest {
 
     @Test
-    public void testDefault() throws Exception {
+    public void testDefault() {
 
         DefaultEventPublisherOptions sut = DefaultEventPublisherOptions.create();
 
-        assertThat(sut.eventEmitInterval()).isEqualTo(10);
-        assertThat(sut.eventEmitIntervalUnit()).isEqualTo(TimeUnit.MINUTES);
+        assertThat(sut.eventEmitInterval()).isEqualTo(Duration.ofMinutes(10));
     }
 
     @Test
-    public void testDisabled() throws Exception {
+    public void testDisabled() {
 
         DefaultEventPublisherOptions sut = DefaultEventPublisherOptions.disabled();
 
-        assertThat(sut.eventEmitInterval()).isEqualTo(0);
-        assertThat(sut.eventEmitIntervalUnit()).isEqualTo(TimeUnit.SECONDS);
+        assertThat(sut.eventEmitInterval()).isEqualTo(Duration.ZERO);
     }
 
     @Test
-    public void testBuilder() throws Exception {
+    public void testBuilder() {
 
         DefaultEventPublisherOptions sut = DefaultEventPublisherOptions.builder().eventEmitInterval(1, TimeUnit.SECONDS)
                 .build();
 
-        assertThat(sut.eventEmitInterval()).isEqualTo(1);
-        assertThat(sut.eventEmitIntervalUnit()).isEqualTo(TimeUnit.SECONDS);
+        assertThat(sut.eventEmitInterval()).isEqualTo(Duration.ofSeconds(1));
     }
 }
diff --git a/src/test/java/io/lettuce/core/resource/ConstantDelayTest.java b/src/test/java/io/lettuce/core/resource/ConstantDelayTest.java
index 3e495caef6..14a6205da4 100644
--- a/src/test/java/io/lettuce/core/resource/ConstantDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/ConstantDelayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
@@ -36,8 +37,8 @@ public void shouldCreateZeroDelay() throws Exception {
 
         Delay delay = Delay.constant(0, TimeUnit.MILLISECONDS);
 
-        assertThat(delay.createDelay(0)).isEqualTo(0);
-        assertThat(delay.createDelay(5)).isEqualTo(0);
+        assertThat(delay.createDelay(0)).isEqualTo(Duration.ZERO);
+        assertThat(delay.createDelay(5)).isEqualTo(Duration.ZERO);
     }
 
     @Test
@@ -45,7 +46,7 @@ public void shouldCreateConstantDelay() throws Exception {
 
         Delay delay = Delay.constant(100, TimeUnit.MILLISECONDS);
 
-        assertThat(delay.createDelay(0)).isEqualTo(100);
-        assertThat(delay.createDelay(5)).isEqualTo(100);
+        assertThat(delay.createDelay(0)).isEqualTo(Duration.ofMillis(100));
+        assertThat(delay.createDelay(5)).isEqualTo(Duration.ofMillis(100));
     }
 }
diff --git a/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java b/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java
index f211fa5fde..19892884b8 100644
--- a/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
 
 /**
  * @author Jongyeol Choi
+ * @author Mark Paluch
  */
 public class DecorrelatedJitterDelayTest {
 
@@ -41,7 +43,7 @@ public void negativeAttemptShouldReturnZero() throws Exception {
 
         Delay delay = Delay.decorrelatedJitter().get();
 
-        assertThat(delay.createDelay(-1)).isEqualTo(0);
+        assertThat(delay.createDelay(-1)).isEqualTo(Duration.ZERO);
     }
 
     @Test
@@ -49,7 +51,7 @@ public void zeroShouldReturnZero() throws Exception {
 
         Delay delay = Delay.decorrelatedJitter().get();
 
-        assertThat(delay.createDelay(0)).isEqualTo(0);
+        assertThat(delay.createDelay(0)).isEqualTo(Duration.ZERO);
     }
 
     @Test
@@ -57,21 +59,20 @@ public void testDefaultDelays() throws Exception {
 
         Delay delay = Delay.decorrelatedJitter().get();
 
-        assertThat(delay.getTimeUnit()).isEqualTo(TimeUnit.MILLISECONDS);
 
         for (int i = 0; i < 1000; i++) {
-            assertThat(delay.createDelay(1)).isBetween(0L, 1L);
-            assertThat(delay.createDelay(2)).isBetween(0L, 3L);
-            assertThat(delay.createDelay(3)).isBetween(0L, 9L);
-            assertThat(delay.createDelay(4)).isBetween(0L, 27L);
-            assertThat(delay.createDelay(5)).isBetween(0L, 81L);
-            assertThat(delay.createDelay(6)).isBetween(0L, 243L);
-            assertThat(delay.createDelay(7)).isBetween(0L, 729L);
-            assertThat(delay.createDelay(8)).isBetween(0L, 2187L);
-            assertThat(delay.createDelay(9)).isBetween(0L, 6561L);
-            assertThat(delay.createDelay(10)).isBetween(0L, 19683L);
-            assertThat(delay.createDelay(11)).isBetween(0L, 30000L);
-            assertThat(delay.createDelay(Integer.MAX_VALUE)).isBetween(0L, 30000L);
+            assertThat(delay.createDelay(1).toMillis()).isBetween(0L, 1L);
+            assertThat(delay.createDelay(2).toMillis()).isBetween(0L, 3L);
+            assertThat(delay.createDelay(3).toMillis()).isBetween(0L, 9L);
+            assertThat(delay.createDelay(4).toMillis()).isBetween(0L, 27L);
+            assertThat(delay.createDelay(5).toMillis()).isBetween(0L, 81L);
+            assertThat(delay.createDelay(6).toMillis()).isBetween(0L, 243L);
+            assertThat(delay.createDelay(7).toMillis()).isBetween(0L, 729L);
+            assertThat(delay.createDelay(8).toMillis()).isBetween(0L, 2187L);
+            assertThat(delay.createDelay(9).toMillis()).isBetween(0L, 6561L);
+            assertThat(delay.createDelay(10).toMillis()).isBetween(0L, 19683L);
+            assertThat(delay.createDelay(11).toMillis()).isBetween(0L, 30000L);
+            assertThat(delay.createDelay(Integer.MAX_VALUE).toMillis()).isBetween(0L, 30000L);
         }
     }
 }
diff --git a/src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java b/src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java
index 6172815427..67150caed3 100644
--- a/src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
 
 /**
  * @author Jongyeol Choi
+ * @author Mark Paluch
  */
 public class EqualJitterDelayTest {
 
@@ -41,7 +43,7 @@ public void negativeAttemptShouldReturnZero() throws Exception {
 
         Delay delay = Delay.equalJitter();
 
-        assertThat(delay.createDelay(-1)).isEqualTo(0);
+        assertThat(delay.createDelay(-1)).isEqualTo(Duration.ZERO);
     }
 
     @Test
@@ -49,7 +51,7 @@ public void zeroShouldReturnZero() throws Exception {
 
         Delay delay = Delay.equalJitter();
 
-        assertThat(delay.createDelay(0)).isEqualTo(0);
+        assertThat(delay.createDelay(0)).isEqualTo(Duration.ZERO);
     }
 
     @Test
@@ -57,25 +59,23 @@ public void testDefaultDelays() throws Exception {
 
         Delay delay = Delay.equalJitter();
 
-        assertThat(delay.getTimeUnit()).isEqualTo(TimeUnit.MILLISECONDS);
-
-        assertThat(delay.createDelay(1)).isBetween(0L, 1L);
-        assertThat(delay.createDelay(2)).isBetween(0L, 2L);
-        assertThat(delay.createDelay(3)).isBetween(0L, 4L);
-        assertThat(delay.createDelay(4)).isBetween(0L, 8L);
-        assertThat(delay.createDelay(5)).isBetween(0L, 16L);
-        assertThat(delay.createDelay(6)).isBetween(0L, 32L);
-        assertThat(delay.createDelay(7)).isBetween(0L, 64L);
-        assertThat(delay.createDelay(8)).isBetween(0L, 128L);
-        assertThat(delay.createDelay(9)).isBetween(0L, 256L);
-        assertThat(delay.createDelay(10)).isBetween(0L, 512L);
-        assertThat(delay.createDelay(11)).isBetween(0L, 1024L);
-        assertThat(delay.createDelay(12)).isBetween(0L, 2048L);
-        assertThat(delay.createDelay(13)).isBetween(0L, 4096L);
-        assertThat(delay.createDelay(14)).isBetween(0L, 8192L);
-        assertThat(delay.createDelay(15)).isBetween(0L, 16384L);
-        assertThat(delay.createDelay(16)).isBetween(0L, 30000L);
-        assertThat(delay.createDelay(17)).isBetween(0L, 30000L);
-        assertThat(delay.createDelay(Integer.MAX_VALUE)).isBetween(0L, 30000L);
+        assertThat(delay.createDelay(1).toMillis()).isBetween(0L, 1L);
+        assertThat(delay.createDelay(2).toMillis()).isBetween(0L, 2L);
+        assertThat(delay.createDelay(3).toMillis()).isBetween(0L, 4L);
+        assertThat(delay.createDelay(4).toMillis()).isBetween(0L, 8L);
+        assertThat(delay.createDelay(5).toMillis()).isBetween(0L, 16L);
+        assertThat(delay.createDelay(6).toMillis()).isBetween(0L, 32L);
+        assertThat(delay.createDelay(7).toMillis()).isBetween(0L, 64L);
+        assertThat(delay.createDelay(8).toMillis()).isBetween(0L, 128L);
+        assertThat(delay.createDelay(9).toMillis()).isBetween(0L, 256L);
+        assertThat(delay.createDelay(10).toMillis()).isBetween(0L, 512L);
+        assertThat(delay.createDelay(11).toMillis()).isBetween(0L, 1024L);
+        assertThat(delay.createDelay(12).toMillis()).isBetween(0L, 2048L);
+        assertThat(delay.createDelay(13).toMillis()).isBetween(0L, 4096L);
+        assertThat(delay.createDelay(14).toMillis()).isBetween(0L, 8192L);
+        assertThat(delay.createDelay(15).toMillis()).isBetween(0L, 16384L);
+        assertThat(delay.createDelay(16).toMillis()).isBetween(0L, 30000L);
+        assertThat(delay.createDelay(17).toMillis()).isBetween(0L, 30000L);
+        assertThat(delay.createDelay(Integer.MAX_VALUE).toMillis()).isBetween(0L, 30000L);
     }
 }
diff --git a/src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java b/src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java
index f465378cf3..215214d2c4 100644
--- a/src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ public void negativeAttemptShouldReturnZero() throws Exception {
 
         Delay delay = Delay.exponential();
 
-        assertThat(delay.createDelay(-1)).isEqualTo(0);
+        assertThat(delay.createDelay(-1).toMillis()).isEqualTo(0);
     }
 
     @Test
@@ -54,7 +54,7 @@ public void zeroShouldReturnZero() throws Exception {
 
         Delay delay = Delay.exponential();
 
-        assertThat(delay.createDelay(0)).isEqualTo(0);
+        assertThat(delay.createDelay(0).toMillis()).isEqualTo(0);
     }
 
     @Test
@@ -62,26 +62,24 @@ public void testDefaultDelays() throws Exception {
 
         Delay delay = Delay.exponential();
 
-        assertThat(delay.getTimeUnit()).isEqualTo(TimeUnit.MILLISECONDS);
-
-        assertThat(delay.createDelay(1)).isEqualTo(1);
-        assertThat(delay.createDelay(2)).isEqualTo(2);
-        assertThat(delay.createDelay(3)).isEqualTo(4);
-        assertThat(delay.createDelay(4)).isEqualTo(8);
-        assertThat(delay.createDelay(5)).isEqualTo(16);
-        assertThat(delay.createDelay(6)).isEqualTo(32);
-        assertThat(delay.createDelay(7)).isEqualTo(64);
-        assertThat(delay.createDelay(8)).isEqualTo(128);
-        assertThat(delay.createDelay(9)).isEqualTo(256);
-        assertThat(delay.createDelay(10)).isEqualTo(512);
-        assertThat(delay.createDelay(11)).isEqualTo(1024);
-        assertThat(delay.createDelay(12)).isEqualTo(2048);
-        assertThat(delay.createDelay(13)).isEqualTo(4096);
-        assertThat(delay.createDelay(14)).isEqualTo(8192);
-        assertThat(delay.createDelay(15)).isEqualTo(16384);
-        assertThat(delay.createDelay(16)).isEqualTo(30000);
-        assertThat(delay.createDelay(17)).isEqualTo(30000);
-        assertThat(delay.createDelay(Integer.MAX_VALUE)).isEqualTo(30000);
+        assertThat(delay.createDelay(1).toMillis()).isEqualTo(1);
+        assertThat(delay.createDelay(2).toMillis()).isEqualTo(2);
+        assertThat(delay.createDelay(3).toMillis()).isEqualTo(4);
+        assertThat(delay.createDelay(4).toMillis()).isEqualTo(8);
+        assertThat(delay.createDelay(5).toMillis()).isEqualTo(16);
+        assertThat(delay.createDelay(6).toMillis()).isEqualTo(32);
+        assertThat(delay.createDelay(7).toMillis()).isEqualTo(64);
+        assertThat(delay.createDelay(8).toMillis()).isEqualTo(128);
+        assertThat(delay.createDelay(9).toMillis()).isEqualTo(256);
+        assertThat(delay.createDelay(10).toMillis()).isEqualTo(512);
+        assertThat(delay.createDelay(11).toMillis()).isEqualTo(1024);
+        assertThat(delay.createDelay(12).toMillis()).isEqualTo(2048);
+        assertThat(delay.createDelay(13).toMillis()).isEqualTo(4096);
+        assertThat(delay.createDelay(14).toMillis()).isEqualTo(8192);
+        assertThat(delay.createDelay(15).toMillis()).isEqualTo(16384);
+        assertThat(delay.createDelay(16).toMillis()).isEqualTo(30000);
+        assertThat(delay.createDelay(17).toMillis()).isEqualTo(30000);
+        assertThat(delay.createDelay(Integer.MAX_VALUE).toMillis()).isEqualTo(30000);
     }
 
     @Test
@@ -89,11 +87,11 @@ public void testPow10Delays() throws Exception {
 
         Delay delay = Delay.exponential(100, 10000, TimeUnit.MILLISECONDS, 10);
 
-        assertThat(delay.createDelay(1)).isEqualTo(100);
-        assertThat(delay.createDelay(2)).isEqualTo(100);
-        assertThat(delay.createDelay(3)).isEqualTo(100);
-        assertThat(delay.createDelay(4)).isEqualTo(1000);
-        assertThat(delay.createDelay(5)).isEqualTo(10000);
-        assertThat(delay.createDelay(Integer.MAX_VALUE)).isEqualTo(10000);
+        assertThat(delay.createDelay(1).toMillis()).isEqualTo(100);
+        assertThat(delay.createDelay(2).toMillis()).isEqualTo(100);
+        assertThat(delay.createDelay(3).toMillis()).isEqualTo(100);
+        assertThat(delay.createDelay(4).toMillis()).isEqualTo(1000);
+        assertThat(delay.createDelay(5).toMillis()).isEqualTo(10000);
+        assertThat(delay.createDelay(Integer.MAX_VALUE).toMillis()).isEqualTo(10000);
     }
 }
diff --git a/src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java b/src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java
index 0cd453df40..88897adbf3 100644
--- a/src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
 
 /**
  * @author Jongyeol Choi
+ * @author Mark Paluch
  */
 public class FullJitterDelayTest {
 
@@ -41,7 +43,7 @@ public void negativeAttemptShouldReturnZero() throws Exception {
 
         Delay delay = Delay.fullJitter();
 
-        assertThat(delay.createDelay(-1)).isEqualTo(0);
+        assertThat(delay.createDelay(-1)).isEqualTo(Duration.ZERO);
     }
 
     @Test
@@ -49,7 +51,7 @@ public void zeroShouldReturnZero() throws Exception {
 
         Delay delay = Delay.fullJitter();
 
-        assertThat(delay.createDelay(0)).isEqualTo(0);
+        assertThat(delay.createDelay(0)).isEqualTo(Duration.ZERO);
     }
 
     @Test
@@ -57,25 +59,23 @@ public void testDefaultDelays() throws Exception {
 
         Delay delay = Delay.fullJitter();
 
-        assertThat(delay.getTimeUnit()).isEqualTo(TimeUnit.MILLISECONDS);
-
-        assertThat(delay.createDelay(1)).isBetween(0L, 1L);
-        assertThat(delay.createDelay(2)).isBetween(1L, 2L);
-        assertThat(delay.createDelay(3)).isBetween(2L, 4L);
-        assertThat(delay.createDelay(4)).isBetween(4L, 8L);
-        assertThat(delay.createDelay(5)).isBetween(8L, 16L);
-        assertThat(delay.createDelay(6)).isBetween(16L, 32L);
-        assertThat(delay.createDelay(7)).isBetween(32L, 64L);
-        assertThat(delay.createDelay(8)).isBetween(64L, 128L);
-        assertThat(delay.createDelay(9)).isBetween(128L, 256L);
-        assertThat(delay.createDelay(10)).isBetween(256L, 512L);
-        assertThat(delay.createDelay(11)).isBetween(512L, 1024L);
-        assertThat(delay.createDelay(12)).isBetween(1024L, 2048L);
-        assertThat(delay.createDelay(13)).isBetween(2048L, 4096L);
-        assertThat(delay.createDelay(14)).isBetween(4096L, 8192L);
-        assertThat(delay.createDelay(15)).isBetween(8192L, 16384L);
-        assertThat(delay.createDelay(16)).isBetween(15000L, 30000L);
-        assertThat(delay.createDelay(17)).isBetween(15000L, 30000L);
-        assertThat(delay.createDelay(Integer.MAX_VALUE)).isBetween(15000L, 30000L);
+        assertThat(delay.createDelay(1).toMillis()).isBetween(0L, 1L);
+        assertThat(delay.createDelay(2).toMillis()).isBetween(1L, 2L);
+        assertThat(delay.createDelay(3).toMillis()).isBetween(2L, 4L);
+        assertThat(delay.createDelay(4).toMillis()).isBetween(4L, 8L);
+        assertThat(delay.createDelay(5).toMillis()).isBetween(8L, 16L);
+        assertThat(delay.createDelay(6).toMillis()).isBetween(16L, 32L);
+        assertThat(delay.createDelay(7).toMillis()).isBetween(32L, 64L);
+        assertThat(delay.createDelay(8).toMillis()).isBetween(64L, 128L);
+        assertThat(delay.createDelay(9).toMillis()).isBetween(128L, 256L);
+        assertThat(delay.createDelay(10).toMillis()).isBetween(256L, 512L);
+        assertThat(delay.createDelay(11).toMillis()).isBetween(512L, 1024L);
+        assertThat(delay.createDelay(12).toMillis()).isBetween(1024L, 2048L);
+        assertThat(delay.createDelay(13).toMillis()).isBetween(2048L, 4096L);
+        assertThat(delay.createDelay(14).toMillis()).isBetween(4096L, 8192L);
+        assertThat(delay.createDelay(15).toMillis()).isBetween(8192L, 16384L);
+        assertThat(delay.createDelay(16).toMillis()).isBetween(15000L, 30000L);
+        assertThat(delay.createDelay(17).toMillis()).isBetween(15000L, 30000L);
+        assertThat(delay.createDelay(Integer.MAX_VALUE).toMillis()).isBetween(15000L, 30000L);
     }
 }
diff --git a/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java b/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
index 9f1d5f8b8b..717f2ac817 100644
--- a/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
+++ b/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core;
 
+import java.time.Duration;
 import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
@@ -34,7 +35,7 @@ public class EmptyStatefulRedisConnection extends RedisChannelHandler implements
             EmptyRedisChannelWriter.INSTANCE);
 
     public EmptyStatefulRedisConnection(RedisChannelWriter writer) {
-        super(writer, 0, TimeUnit.MINUTES);
+        super(writer, Duration.ZERO);
     }
 
     @Override
@@ -61,16 +62,6 @@ public RedisReactiveCommands reactive() {
     public void setTimeout(long timeout, TimeUnit unit) {
     }
 
-    @Override
-    public TimeUnit getTimeoutUnit() {
-        return null;
-    }
-
-    @Override
-    public long getTimeout() {
-        return 0;
-    }
-
     @Override
     public void close() {
     }

From 8030149d152ca10ac1ac1407e75740afec7b63ae Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 20 Jul 2017 11:41:15 +0200
Subject: [PATCH 263/808] Switch RedisURI.getTimeout() type to Duration #570

---
 .../io/lettuce/core/AbstractRedisClient.java  |  2 +-
 .../java/io/lettuce/core/LettuceFutures.java  | 16 ++++-
 .../java/io/lettuce/core/RedisClient.java     | 16 ++---
 src/main/java/io/lettuce/core/RedisURI.java   | 59 +------------------
 .../core/cluster/RedisClusterClient.java      |  2 +-
 .../core/cluster/RedisClusterURIUtil.java     | 12 ++--
 .../topology/ClusterTopologyRefresh.java      |  3 +-
 .../core/dynamic/AsyncExecutableCommand.java  |  3 +-
 .../core/dynamic/BatchExecutableCommand.java  |  3 +-
 .../lettuce/core/masterslave/MasterSlave.java |  6 +-
 .../MasterSlaveTopologyRefresh.java           |  7 +--
 .../masterslave/SentinelTopologyProvider.java |  4 +-
 .../StaticMasterSlaveTopologyProvider.java    |  6 +-
 .../core/RedisClientConnectionTest.java       | 10 ++--
 .../io/lettuce/core/RedisURIBuilderTest.java  |  9 +--
 .../java/io/lettuce/core/RedisURITest.java    | 11 ++--
 ...ronizingClusterConnectionProviderTest.java |  7 +--
 .../core/protocol/ConnectionFailureTest.java  |  9 ++-
 18 files changed, 67 insertions(+), 118 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 8f5294be17..bdcac4df00 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -157,7 +157,7 @@ protected void connectionBuilder(Supplier<SocketAddress> socketAddressSupplier,
             redisBootstrap.option(ChannelOption.TCP_NODELAY, socketOptions.isTcpNoDelay());
         }
 
-        connectionBuilder.timeout(redisURI.getTimeoutDuration());
+        connectionBuilder.timeout(redisURI.getTimeout());
         connectionBuilder.password(redisURI.getPassword());
 
         connectionBuilder.bootstrap(redisBootstrap);
diff --git a/src/main/java/io/lettuce/core/LettuceFutures.java b/src/main/java/io/lettuce/core/LettuceFutures.java
index 0272b66eb7..9ee6c993b9 100644
--- a/src/main/java/io/lettuce/core/LettuceFutures.java
+++ b/src/main/java/io/lettuce/core/LettuceFutures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core;
 
+import java.time.Duration;
 import java.util.concurrent.*;
 import java.util.function.Supplier;
 
@@ -30,6 +31,19 @@ public class LettuceFutures {
     private LettuceFutures() {
     }
 
+    /**
+     * Wait until futures are complete or the supplied timeout is reached. Commands are not canceled (in contrast to
+     * {@link #awaitOrCancel(RedisFuture, long, TimeUnit)}) when the timeout expires.
+     *
+     * @param timeout Maximum time to wait for futures to complete.
+     * @param futures Futures to wait for.
+     * @return {@literal true} if all futures complete in time, otherwise {@literal false}
+     * @since 5.0
+     */
+    public static boolean awaitAll(Duration timeout, Future<?>... futures) {
+        return awaitAll(timeout.toNanos(), TimeUnit.NANOSECONDS, futures);
+    }
+
     /**
      * Wait until futures are complete or the supplied timeout is reached. Commands are not canceled (in contrast to
      * {@link #awaitOrCancel(RedisFuture, long, TimeUnit)}) when the timeout expires.
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 37f12dc4cb..ac73a7802b 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -88,7 +88,7 @@ protected RedisClient(ClientResources clientResources, RedisURI redisURI) {
         assertNotNull(redisURI);
 
         this.redisURI = redisURI;
-        setDefaultTimeout(redisURI.getTimeoutDuration());
+        setDefaultTimeout(redisURI.getTimeout());
     }
 
     /**
@@ -211,7 +211,7 @@ public <K, V> StatefulRedisConnection<K, V> connect(RedisCodec<K, V> codec) {
     public StatefulRedisConnection<String, String> connect(RedisURI redisURI) {
 
         assertNotNull(redisURI);
-        return connectStandalone(newStringStringCodec(), redisURI, redisURI.getTimeoutDuration());
+        return connectStandalone(newStringStringCodec(), redisURI, redisURI.getTimeout());
     }
 
     /**
@@ -227,7 +227,7 @@ public StatefulRedisConnection<String, String> connect(RedisURI redisURI) {
     public <K, V> StatefulRedisConnection<K, V> connect(RedisCodec<K, V> codec, RedisURI redisURI) {
 
         assertNotNull(redisURI);
-        return connectStandalone(codec, redisURI, redisURI.getTimeoutDuration());
+        return connectStandalone(codec, redisURI, redisURI.getTimeout());
     }
 
     private <K, V> StatefulRedisConnection<K, V> connectStandalone(RedisCodec<K, V> codec, RedisURI redisURI, Duration timeout) {
@@ -241,7 +241,7 @@ private <K, V> StatefulRedisConnection<K, V> connectStandalone(RedisCodec<K, V>
     <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandaloneAsync(RedisCodec<K, V> codec, RedisURI redisURI) {
 
         assertNotNull(redisURI);
-        return connectStandaloneAsync(codec, redisURI, redisURI.getTimeoutDuration());
+        return connectStandaloneAsync(codec, redisURI, redisURI.getTimeout());
     }
 
     private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandaloneAsync(RedisCodec<K, V> codec,
@@ -354,7 +354,7 @@ public StatefulRedisPubSubConnection<String, String> connectPubSub() {
     public StatefulRedisPubSubConnection<String, String> connectPubSub(RedisURI redisURI) {
 
         assertNotNull(redisURI);
-        return connectPubSub(newStringStringCodec(), redisURI, redisURI.getTimeoutDuration());
+        return connectPubSub(newStringStringCodec(), redisURI, redisURI.getTimeout());
     }
 
     /**
@@ -384,7 +384,7 @@ public <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V>
     public <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec, RedisURI redisURI) {
 
         assertNotNull(redisURI);
-        return connectPubSub(codec, redisURI, redisURI.getTimeoutDuration());
+        return connectPubSub(codec, redisURI, redisURI.getTimeout());
     }
 
     private <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec, RedisURI redisURI, Duration timeout) {
@@ -443,7 +443,7 @@ public <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K
     public StatefulRedisSentinelConnection<String, String> connectSentinel(RedisURI redisURI) {
 
         assertNotNull(redisURI);
-        return connectSentinel(newStringStringCodec(), redisURI, redisURI.getTimeoutDuration());
+        return connectSentinel(newStringStringCodec(), redisURI, redisURI.getTimeout());
     }
 
     /**
@@ -459,7 +459,7 @@ public StatefulRedisSentinelConnection<String, String> connectSentinel(RedisURI
     public <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K, V> codec, RedisURI redisURI) {
 
         assertNotNull(redisURI);
-        return connectSentinel(codec, redisURI, redisURI.getTimeoutDuration());
+        return connectSentinel(codec, redisURI, redisURI.getTimeout());
     }
 
     private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K, V> codec, RedisURI redisURI,
diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index b3ac7396e5..3557a574c5 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -173,7 +173,6 @@ public class RedisURI implements Serializable, ConnectionPoint {
     private boolean verifyPeer = true;
     private boolean startTls = false;
     private Duration timeout = DEFAULT_TIMEOUT_DURATION;
-    private TimeUnit unit = DEFAULT_TIMEOUT_UNIT;
     private final List<RedisURI> sentinels = new ArrayList<>();
 
     /**
@@ -215,8 +214,7 @@ public RedisURI(String host, int port, long timeout, TimeUnit unit) {
 
         setHost(host);
         setPort(port);
-        setUnit(unit);
-        setTimeout(timeout);
+        setTimeout(Duration.ofNanos(unit.toNanos(timeout)));
     }
 
     /**
@@ -368,41 +366,16 @@ public void setPassword(char[] password) {
         this.password = Arrays.copyOf(password, password.length);
     }
 
-    /**
-     * Returns the command timeout for synchronous command execution.
-     *
-     * @return the Timeout
-     * @deprecated since 5.0, use {@link #getTimeoutDuration()}.
-     */
-    @Deprecated
-    public long getTimeout() {
-        return unit.convert(timeout.toNanos(), TimeUnit.NANOSECONDS);
-    }
-
     /**
      * Returns the command timeout for synchronous command execution.
      *
      * @return the Timeout
      * @since 5.0
      */
-    public Duration getTimeoutDuration() {
+    public Duration getTimeout() {
         return timeout;
     }
 
-    /**
-     * Sets the command timeout for synchronous command execution.
-     *
-     * @param timeout the command timeout for synchronous command execution.
-     * @deprecated since 5.0, use {@link #setTimeout(Duration)}.
-     */
-    @Deprecated
-    public void setTimeout(long timeout) {
-
-        LettuceAssert.isTrue(timeout >= 0, "Timeout must be greater or equal 0");
-
-        this.timeout = Duration.ofNanos(unit.toNanos(timeout));
-    }
-
     /**
      * Sets the command timeout for synchronous command execution.
      *
@@ -415,34 +388,6 @@ public void setTimeout(Duration timeout) {
         LettuceAssert.isTrue(!timeout.isNegative(), "Timeout must be greater or equal 0");
 
         this.timeout = timeout;
-
-        if (timeout.getNano() != 0) {
-            setUnit(TimeUnit.NANOSECONDS);
-        }
-    }
-
-    /**
-     * Returns the {@link TimeUnit} for the command timeout.
-     *
-     * @return the {@link TimeUnit} for the command timeout.
-     * @deprecated since 5.0, use {@link #setTimeout(Duration)}.
-     */
-    @Deprecated
-    public TimeUnit getUnit() {
-        return unit;
-    }
-
-    /**
-     * Sets the {@link TimeUnit} for the command timeout.
-     *
-     * @param unit the {@link TimeUnit} for the command timeout, must not be {@literal null}
-     * @deprecated since 5.0, use {@link #setTimeout(Duration)}.
-     */
-    @Deprecated
-    public void setUnit(TimeUnit unit) {
-
-        LettuceAssert.notNull(unit, "TimeUnit must not be null");
-        this.unit = unit;
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 6aadc1e2ce..620be9a7ae 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -175,7 +175,7 @@ protected RedisClusterClient(ClientResources clientResources, Iterable<RedisURI>
 
         this.initialUris = Collections.unmodifiableList(LettuceLists.newList(redisURIs));
 
-        setDefaultTimeout(getFirstUri().getTimeout(), getFirstUri().getUnit());
+        setDefaultTimeout(getFirstUri().getTimeout());
         setOptions(ClusterClientOptions.builder().build());
     }
 
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java b/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java
index 4719564469..656e435417 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,10 @@
  * @author Mark Paluch
  * @since 4.4
  */
-public class RedisClusterURIUtil {
+public abstract class RedisClusterURIUtil {
+
+    private RedisClusterURIUtil() {
+    }
 
     /**
      * Parse a Redis Cluster URI with potentially multiple hosts into a {@link List} of {@link RedisURI}.
@@ -49,8 +52,8 @@ public static List<RedisURI> toRedisURIs(URI uri) {
         for (String part : parts) {
             HostAndPort hostAndPort = HostAndPort.parse(part);
 
-            RedisURI nodeUri = RedisURI.create(hostAndPort.getHostText(),
-                    hostAndPort.hasPort() ? hostAndPort.getPort() : redisURI.getPort());
+            RedisURI nodeUri = RedisURI.create(hostAndPort.getHostText(), hostAndPort.hasPort() ? hostAndPort.getPort()
+                    : redisURI.getPort());
 
             applyUriConnectionSettings(redisURI, nodeUri);
 
@@ -73,7 +76,6 @@ static void applyUriConnectionSettings(RedisURI from, RedisURI to) {
         }
 
         to.setTimeout(from.getTimeout());
-        to.setUnit(from.getUnit());
         to.setSsl(from.isSsl());
         to.setStartTls(from.isStartTls());
         to.setVerifyPeer(from.isVerifyPeer());
diff --git a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
index a2c273a85e..217df40aab 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
@@ -30,7 +30,6 @@
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.SocketAddressResolver;
-
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -269,6 +268,6 @@ private static <E> Set<E> difference(Set<E> set1, Set<E> set2) {
     private long getCommandTimeoutNs(Iterable<RedisURI> redisURIs) {
 
         RedisURI redisURI = redisURIs.iterator().next();
-        return redisURI.getUnit().toNanos(redisURI.getTimeout());
+        return redisURI.getTimeout().toNanos();
     }
 }
diff --git a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
index 761e9974da..396716091b 100644
--- a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
@@ -17,7 +17,6 @@
 
 import java.time.Duration;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 
 import io.lettuce.core.LettuceFutures;
 import io.lettuce.core.api.StatefulConnection;
@@ -79,7 +78,7 @@ protected Object dispatchCommand(Object[] arguments, RedisCommand<Object, Object
             }
         }
 
-        LettuceFutures.awaitAll(timeout.toNanos(), TimeUnit.NANOSECONDS, asyncCommand);
+        LettuceFutures.awaitAll(timeout, asyncCommand);
 
         return asyncCommand.get();
     }
diff --git a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
index 40687a0852..67532673b6 100644
--- a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 
 import io.lettuce.core.LettuceFutures;
 import io.lettuce.core.RedisFuture;
@@ -91,7 +90,7 @@ protected static Object synchronize(BatchTasks batchTasks, StatefulConnection<Ob
         for (RedisCommand<?, ?, ?> batchTask : batchTasks) {
 
             try {
-                LettuceFutures.awaitAll(timeout.toNanos(), TimeUnit.NANOSECONDS, (RedisFuture) batchTask);
+                LettuceFutures.awaitAll(timeout, (RedisFuture) batchTask);
             } catch (Exception e) {
                 if (exception == null) {
                     failures = new ArrayList<>();
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index e5b3fb2b49..4595699bc1 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -163,7 +163,7 @@ private static <K, V> StatefulRedisMasterSlaveConnection<K, V> connectSentinel(R
 
         MasterSlaveChannelWriter<K, V> channelWriter = new MasterSlaveChannelWriter<>(connectionProvider);
         StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(channelWriter,
-                codec, redisURI.getTimeoutDuration());
+                codec, redisURI.getTimeout());
 
         Runnable runnable = () -> {
             try {
@@ -222,7 +222,7 @@ private static <K, V> StatefulRedisMasterSlaveConnection<K, V> connectMasterSlav
             MasterSlaveChannelWriter<K, V> channelWriter = new MasterSlaveChannelWriter<>(connectionProvider);
 
             StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(
-                    channelWriter, codec, redisURI.getTimeoutDuration());
+                    channelWriter, codec, redisURI.getTimeout());
 
             return connection;
 
@@ -258,7 +258,7 @@ private static <K, V> StatefulRedisMasterSlaveConnection<K, V> connectStaticMast
             MasterSlaveChannelWriter<K, V> channelWriter = new MasterSlaveChannelWriter<>(connectionProvider);
 
             StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(
-                    channelWriter, codec, seedNode.getTimeoutDuration());
+                    channelWriter, codec, seedNode.getTimeout());
 
             return connection;
 
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
index 1715a046c9..3d6e39f9df 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
@@ -71,11 +71,10 @@ public List<RedisNodeDescription> getNodes(RedisURI seed) {
         Connections connections = null;
 
         try {
-
-            connections = asyncConnections.get(seed.getTimeout(), seed.getUnit());
+            connections = asyncConnections.get(seed.getTimeout().toNanos(), TimeUnit.NANOSECONDS);
             Requests requestedPing = connections.requestPing();
-            return getNodeSpecificViews(requestedPing, nodes, seed);
 
+            return getNodeSpecificViews(requestedPing, nodes, seed);
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
             throw new RedisCommandInterruptedException(e);
@@ -100,7 +99,7 @@ private List<RedisNodeDescription> getNodeSpecificViews(Requests requestedPing,
 
         List<RedisNodeDescription> result = new ArrayList<>();
 
-        long timeout = seed.getTimeoutDuration().toNanos();
+        long timeout = seed.getTimeout().toNanos();
         Map<RedisNodeDescription, Long> latencies = new HashMap<>();
 
         requestedPing.await(timeout, TimeUnit.NANOSECONDS);
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
index fe234ff7ae..cfac2886d8 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,7 +68,7 @@ public SentinelTopologyProvider(String masterId, RedisClient redisClient, RedisU
         this.masterId = masterId;
         this.redisClient = redisClient;
         this.sentinelUri = sentinelUri;
-        this.timeout = sentinelUri.getTimeoutDuration();
+        this.timeout = sentinelUri.getTimeout();
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
index 19392855b9..c60fbac7d2 100644
--- a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.core.models.role.RoleParser;
-
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -73,8 +72,7 @@ public List<RedisNodeDescription> getNodes() {
             }
 
             RedisURI next = redisURIs.iterator().next();
-            boolean success = LettuceFutures.awaitAll(next.getTimeout(), next.getUnit(),
-                    roles.values().toArray(new Future[roles.size()]));
+            boolean success = LettuceFutures.awaitAll(next.getTimeout(), roles.values().toArray(new Future[roles.size()]));
 
             if (success) {
 
diff --git a/src/test/java/io/lettuce/core/RedisClientConnectionTest.java b/src/test/java/io/lettuce/core/RedisClientConnectionTest.java
index 984f66cea7..d55b63b39a 100644
--- a/src/test/java/io/lettuce/core/RedisClientConnectionTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientConnectionTest.java
@@ -68,7 +68,7 @@ public void connectCodecClientUri() throws Exception {
     public void connectOwnUri() throws Exception {
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisConnection<String, String> connection = client.connect(redisURI);
-        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeoutDuration());
+        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
         connection.close();
     }
 
@@ -86,7 +86,7 @@ public void connectSentinelMissingHostAndSocketUri() throws Exception {
     public void connectCodecOwnUri() throws Exception {
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisConnection<String, String> connection = client.connect(CODEC, redisURI);
-        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeoutDuration());
+        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
         connection.close();
     }
 
@@ -149,7 +149,7 @@ public void connectPubSubCodecClientUri() throws Exception {
     public void connectPubSubOwnUri() throws Exception {
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub(redisURI);
-        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeoutDuration());
+        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
         connection.close();
     }
 
@@ -167,7 +167,7 @@ public void connectPubSubSentinelMissingHostAndSocketUri() throws Exception {
     public void connectPubSubCodecOwnUri() throws Exception {
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub(CODEC, redisURI);
-        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeoutDuration());
+        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
         connection.close();
     }
 
@@ -221,7 +221,7 @@ public void connectSentinelCodecOwnUri() throws Exception {
 
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel(CODEC, redisURI);
-        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeoutDuration());
+        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
         connection.close();
     }
 
diff --git a/src/test/java/io/lettuce/core/RedisURIBuilderTest.java b/src/test/java/io/lettuce/core/RedisURIBuilderTest.java
index 21584df43b..4d421a8d8f 100644
--- a/src/test/java/io/lettuce/core/RedisURIBuilderTest.java
+++ b/src/test/java/io/lettuce/core/RedisURIBuilderTest.java
@@ -19,7 +19,6 @@
 
 import java.io.File;
 import java.time.Duration;
-import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
 
@@ -32,9 +31,7 @@ public class RedisURIBuilderTest {
     public void sentinel() throws Exception {
         RedisURI result = RedisURI.Builder.sentinel("localhost").withTimeout(Duration.ofHours(2)).build();
         assertThat(result.getSentinels()).hasSize(1);
-        assertThat(result.getTimeout()).isEqualTo(TimeUnit.HOURS.toSeconds(2));
-        assertThat(result.getUnit()).isEqualTo(TimeUnit.SECONDS);
-        assertThat(result.getTimeoutDuration()).isEqualTo(Duration.ofHours(2));
+        assertThat(result.getTimeout()).isEqualTo(Duration.ofHours(2));
     }
 
     @Test(expected = IllegalStateException.class)
@@ -46,9 +43,7 @@ public void sentinelWithHostShouldFail() throws Exception {
     public void sentinelWithPort() throws Exception {
         RedisURI result = RedisURI.Builder.sentinel("localhost", 1).withTimeout(Duration.ofHours(2)).build();
         assertThat(result.getSentinels()).hasSize(1);
-        assertThat(result.getTimeout()).isEqualTo(TimeUnit.HOURS.toSeconds(2));
-        assertThat(result.getUnit()).isEqualTo(TimeUnit.SECONDS);
-        assertThat(result.getTimeoutDuration()).isEqualTo(Duration.ofHours(2));
+        assertThat(result.getTimeout()).isEqualTo(Duration.ofHours(2));
     }
 
     @Test(expected = IllegalStateException.class)
diff --git a/src/test/java/io/lettuce/core/RedisURITest.java b/src/test/java/io/lettuce/core/RedisURITest.java
index 1fe8c50d74..8f8acb2f39 100644
--- a/src/test/java/io/lettuce/core/RedisURITest.java
+++ b/src/test/java/io/lettuce/core/RedisURITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.Duration;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
@@ -173,7 +174,8 @@ public void timeoutParsingTest() {
         checkUriTimeout("redis://auth@localhost:1234/5?timeout=-1", 0, TimeUnit.MILLISECONDS);
 
         RedisURI defaultUri = new RedisURI();
-        checkUriTimeout("redis://auth@localhost:1234/5?timeout=junk", defaultUri.getTimeout(), defaultUri.getUnit());
+        checkUriTimeout("redis://auth@localhost:1234/5?timeout=junk", defaultUri.getTimeout().getSeconds(),
+                RedisURI.DEFAULT_TIMEOUT_UNIT);
 
         RedisURI redisURI = RedisURI.create("redis://auth@localhost:1234/5?timeout=5000ms");
         assertThat(redisURI.toURI().toString()).isEqualTo("redis://auth@localhost:1234?database=5&timeout=5s");
@@ -190,14 +192,13 @@ public void queryStringDecodingTest() {
     @Test
     public void timeoutParsingWithJunkParamTest() {
         RedisURI redisURI1 = RedisURI.create("redis-sentinel://auth@localhost:1234/5?timeout=5s;junkparam=#master-instance");
-        assertThat(redisURI1.getTimeout()).isEqualTo(5);
-        assertThat(redisURI1.getUnit()).isEqualTo(TimeUnit.SECONDS);
+        assertThat(redisURI1.getTimeout()).isEqualTo(Duration.ofSeconds(5));
         assertThat(redisURI1.getSentinelMasterId()).isEqualTo("master-instance");
     }
 
     private RedisURI checkUriTimeout(String uri, long expectedTimeout, TimeUnit expectedUnit) {
         RedisURI redisURI = RedisURI.create(uri);
-        assertThat(expectedUnit.convert(redisURI.getTimeout(), redisURI.getUnit())).isEqualTo(expectedTimeout);
+        assertThat(expectedUnit.convert(redisURI.getTimeout().toNanos(), TimeUnit.NANOSECONDS)).isEqualTo(expectedTimeout);
         return redisURI;
     }
 
diff --git a/src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java b/src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java
index 99fc014b4d..a6baa709cf 100644
--- a/src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java
@@ -23,6 +23,7 @@
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -52,8 +53,7 @@ public class SynchronizingClusterConnectionProviderTest {
     public static void beforeClass() throws Exception {
 
         RedisURI redisURI = RedisURI.create(TestSettings.host(), 1);
-        redisURI.setTimeout(5);
-        redisURI.setUnit(TimeUnit.SECONDS);
+        redisURI.setTimeout(Duration.ofSeconds(5));
 
         redisClient = RedisClusterClient.create(TestClientResources.create(), redisURI);
         redisClient.setOptions(ClusterClientOptions.create());
@@ -70,8 +70,7 @@ public void before() throws Exception {
             public ConnectionFuture<StatefulRedisConnection<String, String>> apply(ConnectionKey connectionKey) {
 
                 RedisURI redisURI = RedisURI.create(TestSettings.host(), serverSocket.getLocalPort());
-                redisURI.setTimeout(5);
-                redisURI.setUnit(TimeUnit.SECONDS);
+                redisURI.setTimeout(Duration.ofSeconds(5));
 
                 ConnectionFuture<StatefulRedisConnection<String, String>> future = redisClient.connectToNodeAsync(
                         StringCodec.UTF8, "", null,
diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
index ebcc998a50..3765306ab7 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.Duration;
 import java.util.concurrent.*;
 
 import org.junit.Test;
@@ -79,8 +80,7 @@ public void pingBeforeConnectFailOnReconnect() throws Exception {
         RandomResponseServer ts = getRandomResponseServer();
 
         RedisURI redisUri = RedisURI.Builder.redis(TestSettings.host(), TestSettings.port()).build();
-        redisUri.setTimeout(5);
-        redisUri.setUnit(TimeUnit.SECONDS);
+        redisUri.setTimeout(Duration.ofSeconds(5));
 
         try {
             RedisAsyncCommands<String, String> connection = client.connect(redisUri).async();
@@ -129,8 +129,7 @@ public void pingBeforeConnectFailOnReconnectShouldSendEvents() throws Exception
         RandomResponseServer ts = getRandomResponseServer();
 
         RedisURI redisUri = RedisURI.create(defaultRedisUri.toURI());
-        redisUri.setTimeout(5);
-        redisUri.setUnit(TimeUnit.SECONDS);
+        redisUri.setTimeout(Duration.ofSeconds(5));
 
         try {
             final BlockingQueue<ConnectionEvents.Reconnect> events = new LinkedBlockingDeque<>();

From 668944b6a1992f29281d1c5923574f7170edcec7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 20 Jul 2017 11:57:50 +0200
Subject: [PATCH 264/808] Polishing

Reduce epoll/kqueue discovery logging level from WARN to INFO.
---
 src/main/java/io/lettuce/core/EpollProvider.java  | 4 ++--
 src/main/java/io/lettuce/core/KqueueProvider.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/EpollProvider.java b/src/main/java/io/lettuce/core/EpollProvider.java
index 51f084ceac..882b1c8139 100644
--- a/src/main/java/io/lettuce/core/EpollProvider.java
+++ b/src/main/java/io/lettuce/core/EpollProvider.java
@@ -61,11 +61,11 @@ public class EpollProvider {
         EPOLL_AVAILABLE = availability;
 
         if (EPOLL_AVAILABLE) {
-            logger.warn("Starting with Epoll library");
+            logger.info("Starting with epoll library");
             epollResources = AvailableEpollResources.INSTANCE;
 
         } else {
-            logger.warn("Starting without optional Epoll library");
+            logger.info("Starting without optional epoll library");
             epollResources = UnavailableEpollResources.INSTANCE;
         }
     }
diff --git a/src/main/java/io/lettuce/core/KqueueProvider.java b/src/main/java/io/lettuce/core/KqueueProvider.java
index aabafa302d..9377b1be7d 100644
--- a/src/main/java/io/lettuce/core/KqueueProvider.java
+++ b/src/main/java/io/lettuce/core/KqueueProvider.java
@@ -63,11 +63,11 @@ public class KqueueProvider {
         KQUEUE_AVAILABLE = availability;
 
         if (KQUEUE_AVAILABLE) {
-            logger.warn("Starting with kqueue library");
+            logger.info("Starting with kqueue library");
             KQUEUE_RESOURCES = AvailableKqueueResources.INSTANCE;
 
         } else {
-            logger.warn("Starting without optional kqueue library");
+            logger.info("Starting without optional kqueue library");
             KQUEUE_RESOURCES = UnavailableKqueueResources.INSTANCE;
         }
     }

From 293fafaa1e7c67dbd187aadd63f7af1e59e0149e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 20 Jul 2017 13:26:34 +0200
Subject: [PATCH 265/808] Expose asynchronous connection methods on RedisClient
 #561
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

RedisClient now exposes connectAsync(…) and connectPubSubAsync(…) methods for non-blocking, asynchronous connects.
---
 .../java/io/lettuce/core/RedisClient.java     | 64 ++++++++++---
 .../core/RedisClientConnectionTest.java       | 94 +++++++++++--------
 .../core/cluster/RedisClusterClientTest.java  |  8 +-
 3 files changed, 109 insertions(+), 57 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index ac73a7802b..59d699e888 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -230,15 +230,33 @@ public <K, V> StatefulRedisConnection<K, V> connect(RedisCodec<K, V> codec, Redi
         return connectStandalone(codec, redisURI, redisURI.getTimeout());
     }
 
+    /**
+     * Open asynchronously a new connection to a Redis server using the supplied {@link RedisURI} and the supplied
+     * {@link RedisCodec codec} to encode/decode keys.
+     *
+     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
+     * @param redisURI the Redis server to connect to, must not be {@literal null}
+     * @param <K> Key type
+     * @param <V> Value type
+     * @return {@link ConnectionFuture} to indicate success or failure to connect.
+     * @since 5.0
+     */
+    public <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectAsync(RedisCodec<K, V> codec, RedisURI redisURI) {
+
+        assertNotNull(redisURI);
+        return connectStandaloneAsync(codec, redisURI, redisURI.getTimeout());
+    }
+
     private <K, V> StatefulRedisConnection<K, V> connectStandalone(RedisCodec<K, V> codec, RedisURI redisURI, Duration timeout) {
 
         ConnectionFuture<StatefulRedisConnection<K, V>> future = connectStandaloneAsync(codec, redisURI, timeout);
         return getConnection(future);
     }
 
-    @SuppressWarnings("unused")
     // Required by ReflectiveNodeConnectionFactory.
-    <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandaloneAsync(RedisCodec<K, V> codec, RedisURI redisURI) {
+    @SuppressWarnings("unused")
+    private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandaloneAsync(RedisCodec<K, V> codec,
+            RedisURI redisURI) {
 
         assertNotNull(redisURI);
         return connectStandaloneAsync(codec, redisURI, redisURI.getTimeout());
@@ -269,9 +287,8 @@ private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandalone
     }
 
     @SuppressWarnings("unchecked")
-    private <K, V, T extends RedisChannelHandler<K, V>, S> ConnectionFuture<S> connectStatefulAsync(
-            StatefulRedisConnectionImpl<K, V> connection, DefaultEndpoint endpoint, RedisURI redisURI,
-            Supplier<CommandHandler> commandHandlerSupplier) {
+    private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnectionImpl<K, V> connection,
+            DefaultEndpoint endpoint, RedisURI redisURI, Supplier<CommandHandler> commandHandlerSupplier) {
 
         ConnectionBuilder connectionBuilder;
         if (redisURI.isSsl()) {
@@ -341,7 +358,7 @@ private boolean hasPassword(RedisURI redisURI) {
      * @return A new stateful pub/sub connection
      */
     public StatefulRedisPubSubConnection<String, String> connectPubSub() {
-        return connectPubSub(newStringStringCodec(), redisURI, timeout);
+        return getConnection(connectPubSubAsync(newStringStringCodec(), redisURI, timeout));
     }
 
     /**
@@ -354,7 +371,7 @@ public StatefulRedisPubSubConnection<String, String> connectPubSub() {
     public StatefulRedisPubSubConnection<String, String> connectPubSub(RedisURI redisURI) {
 
         assertNotNull(redisURI);
-        return connectPubSub(newStringStringCodec(), redisURI, redisURI.getTimeout());
+        return getConnection(connectPubSubAsync(newStringStringCodec(), redisURI, redisURI.getTimeout()));
     }
 
     /**
@@ -368,7 +385,7 @@ public StatefulRedisPubSubConnection<String, String> connectPubSub(RedisURI redi
      */
     public <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec) {
         checkForRedisURI();
-        return connectPubSub(codec, redisURI, timeout);
+        return getConnection(connectPubSubAsync(codec, redisURI, timeout));
     }
 
     /**
@@ -384,10 +401,29 @@ public <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V>
     public <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec, RedisURI redisURI) {
 
         assertNotNull(redisURI);
-        return connectPubSub(codec, redisURI, redisURI.getTimeout());
+        return getConnection(connectPubSubAsync(codec, redisURI, redisURI.getTimeout()));
     }
 
-    private <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec, RedisURI redisURI, Duration timeout) {
+    /**
+     * Open asynchronously a new pub/sub connection to the Redis server using the supplied {@link RedisURI} and use the supplied
+     * {@link RedisCodec codec} to encode/decode keys and values.
+     *
+     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
+     * @param redisURI the redis server to connect to, must not be {@literal null}
+     * @param <K> Key type
+     * @param <V> Value type
+     * @return {@link ConnectionFuture} to indicate success or failure to connect.
+     * @since 5.0
+     */
+    public <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubAsync(RedisCodec<K, V> codec,
+            RedisURI redisURI) {
+
+        assertNotNull(redisURI);
+        return connectPubSubAsync(codec, redisURI, redisURI.getTimeout());
+    }
+
+    private <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubAsync(RedisCodec<K, V> codec,
+            RedisURI redisURI, Duration timeout) {
 
         assertNotNull(codec);
         checkValidRedisURI(redisURI);
@@ -397,17 +433,15 @@ private <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V
         StatefulRedisPubSubConnectionImpl<K, V> connection = newStatefulRedisPubSubConnection(endpoint, endpoint, codec,
                 timeout);
 
-        ConnectionFuture<StatefulRedisConnectionImpl<K, V>> future = connectStatefulAsync(connection, endpoint, redisURI,
+        ConnectionFuture<StatefulRedisPubSubConnection<K, V>> future = connectStatefulAsync(connection, endpoint, redisURI,
                 () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec, endpoint));
 
-        getConnection(future.whenComplete((conn, throwable) -> {
+        return future.whenComplete((conn, throwable) -> {
 
             if (throwable != null) {
                 conn.close();
             }
-        }));
-
-        return connection;
+        });
     }
 
     /**
diff --git a/src/test/java/io/lettuce/core/RedisClientConnectionTest.java b/src/test/java/io/lettuce/core/RedisClientConnectionTest.java
index d55b63b39a..72d2be9415 100644
--- a/src/test/java/io/lettuce/core/RedisClientConnectionTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientConnectionTest.java
@@ -38,11 +38,10 @@
  */
 public class RedisClientConnectionTest extends AbstractRedisClientTest {
 
-    public static final Utf8StringCodec CODEC = new Utf8StringCodec();
     public static final Duration EXPECTED_TIMEOUT = Duration.ofMillis(500);
 
     @Before
-    public void before() throws Exception {
+    public void before() {
         client.setDefaultTimeout(EXPECTED_TIMEOUT);
     }
 
@@ -50,7 +49,7 @@ public void before() throws Exception {
      * Standalone/Stateful
      */
     @Test
-    public void connectClientUri() throws Exception {
+    public void connectClientUri() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
@@ -58,14 +57,14 @@ public void connectClientUri() throws Exception {
     }
 
     @Test
-    public void connectCodecClientUri() throws Exception {
-        StatefulRedisConnection<String, String> connection = client.connect(CODEC);
+    public void connectCodecClientUri() {
+        StatefulRedisConnection<String, String> connection = client.connect(Utf8StringCodec.UTF8);
         assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
         connection.close();
     }
 
     @Test
-    public void connectOwnUri() throws Exception {
+    public void connectOwnUri() {
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisConnection<String, String> connection = client.connect(redisURI);
         assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
@@ -73,31 +72,40 @@ public void connectOwnUri() throws Exception {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void connectMissingHostAndSocketUri() throws Exception {
+    public void connectMissingHostAndSocketUri() {
         client.connect(new RedisURI());
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void connectSentinelMissingHostAndSocketUri() throws Exception {
+    public void connectSentinelMissingHostAndSocketUri() {
         client.connect(invalidSentinel());
     }
 
     @Test
-    public void connectCodecOwnUri() throws Exception {
+    public void connectCodecOwnUri() {
         RedisURI redisURI = redis(host, port).build();
-        StatefulRedisConnection<String, String> connection = client.connect(CODEC, redisURI);
+        StatefulRedisConnection<String, String> connection = client.connect(Utf8StringCodec.UTF8, redisURI);
+        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
+        connection.close();
+    }
+
+    @Test
+    public void connectAsyncCodecOwnUri() {
+        RedisURI redisURI = redis(host, port).build();
+        ConnectionFuture<StatefulRedisConnection<String, String>> future = client.connectAsync(Utf8StringCodec.UTF8, redisURI);
+        StatefulRedisConnection<String, String> connection = future.join();
         assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
         connection.close();
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void connectCodecMissingHostAndSocketUri() throws Exception {
-        client.connect(CODEC, new RedisURI());
+    public void connectCodecMissingHostAndSocketUri() {
+        client.connect(Utf8StringCodec.UTF8, new RedisURI());
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void connectcodecSentinelMissingHostAndSocketUri() throws Exception {
-        client.connect(CODEC, invalidSentinel());
+    public void connectcodecSentinelMissingHostAndSocketUri() {
+        client.connect(Utf8StringCodec.UTF8, invalidSentinel());
     }
 
     @Test(expected = TimeoutException.class)
@@ -132,21 +140,21 @@ public void shutdownAsyncInRedisFutureTest() throws Exception {
      * Standalone/PubSub Stateful
      */
     @Test
-    public void connectPubSubClientUri() throws Exception {
+    public void connectPubSubClientUri() {
         StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub();
         assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
         connection.close();
     }
 
     @Test
-    public void connectPubSubCodecClientUri() throws Exception {
-        StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub(CODEC);
+    public void connectPubSubCodecClientUri() {
+        StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub(Utf8StringCodec.UTF8);
         assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
         connection.close();
     }
 
     @Test
-    public void connectPubSubOwnUri() throws Exception {
+    public void connectPubSubOwnUri() {
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub(redisURI);
         assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
@@ -154,62 +162,72 @@ public void connectPubSubOwnUri() throws Exception {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void connectPubSubMissingHostAndSocketUri() throws Exception {
+    public void connectPubSubMissingHostAndSocketUri() {
         client.connectPubSub(new RedisURI());
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void connectPubSubSentinelMissingHostAndSocketUri() throws Exception {
+    public void connectPubSubSentinelMissingHostAndSocketUri() {
         client.connectPubSub(invalidSentinel());
     }
 
     @Test
-    public void connectPubSubCodecOwnUri() throws Exception {
+    public void connectPubSubCodecOwnUri() {
+        RedisURI redisURI = redis(host, port).build();
+        StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub(Utf8StringCodec.UTF8, redisURI);
+        assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
+        connection.close();
+    }
+
+    @Test
+    public void connectPubSubAsync() {
         RedisURI redisURI = redis(host, port).build();
-        StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub(CODEC, redisURI);
+        ConnectionFuture<StatefulRedisPubSubConnection<String, String>> future = client.connectPubSubAsync(
+                Utf8StringCodec.UTF8, redisURI);
+        StatefulRedisPubSubConnection<String, String> connection = future.join();
         assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
         connection.close();
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void connectPubSubCodecMissingHostAndSocketUri() throws Exception {
-        client.connectPubSub(CODEC, new RedisURI());
+    public void connectPubSubCodecMissingHostAndSocketUri() {
+        client.connectPubSub(Utf8StringCodec.UTF8, new RedisURI());
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void connectPubSubCodecSentinelMissingHostAndSocketUri() throws Exception {
-        client.connectPubSub(CODEC, invalidSentinel());
+    public void connectPubSubCodecSentinelMissingHostAndSocketUri() {
+        client.connectPubSub(Utf8StringCodec.UTF8, invalidSentinel());
     }
 
     /*
      * Sentinel Stateful
      */
     @Test
-    public void connectSentinelClientUri() throws Exception {
+    public void connectSentinelClientUri() {
         StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel();
         assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
         connection.close();
     }
 
     @Test
-    public void connectSentinelCodecClientUri() throws Exception {
-        StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel(CODEC);
+    public void connectSentinelCodecClientUri() {
+        StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel(Utf8StringCodec.UTF8);
         assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
         connection.close();
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void connectSentinelAndMissingHostAndSocketUri() throws Exception {
+    public void connectSentinelAndMissingHostAndSocketUri() {
         client.connectSentinel(new RedisURI());
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void connectSentinelSentinelMissingHostAndSocketUri() throws Exception {
+    public void connectSentinelSentinelMissingHostAndSocketUri() {
         client.connectSentinel(invalidSentinel());
     }
 
     @Test
-    public void connectSentinelOwnUri() throws Exception {
+    public void connectSentinelOwnUri() {
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel(redisURI);
         assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(1));
@@ -217,22 +235,22 @@ public void connectSentinelOwnUri() throws Exception {
     }
 
     @Test
-    public void connectSentinelCodecOwnUri() throws Exception {
+    public void connectSentinelCodecOwnUri() {
 
         RedisURI redisURI = redis(host, port).build();
-        StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel(CODEC, redisURI);
+        StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel(Utf8StringCodec.UTF8, redisURI);
         assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
         connection.close();
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void connectSentinelCodecMissingHostAndSocketUri() throws Exception {
-        client.connectSentinel(CODEC, new RedisURI());
+    public void connectSentinelCodecMissingHostAndSocketUri() {
+        client.connectSentinel(Utf8StringCodec.UTF8, new RedisURI());
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void connectSentinelCodecSentinelMissingHostAndSocketUri() throws Exception {
-        client.connectSentinel(CODEC, invalidSentinel());
+    public void connectSentinelCodecSentinelMissingHostAndSocketUri() {
+        client.connectSentinel(Utf8StringCodec.UTF8, invalidSentinel());
     }
 
     private static RedisURI invalidSentinel() {
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
index 07e3bd0038..2e0440bb6b 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package io.lettuce.core.cluster;
 
-import static io.lettuce.core.RedisClientConnectionTest.CODEC;
 import static io.lettuce.core.cluster.ClusterTestUtil.getOwnPartition;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -41,6 +40,7 @@
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection;
+import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 
@@ -140,7 +140,7 @@ public void shouldApplyTimeoutOnRegularConnectionUsingCodec() throws Exception {
 
         clusterClient.setDefaultTimeout(1, TimeUnit.MINUTES);
 
-        StatefulRedisClusterConnection<String, String> connection = clusterClient.connect(CODEC);
+        StatefulRedisClusterConnection<String, String> connection = clusterClient.connect(Utf8StringCodec.UTF8);
 
         assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(1));
         assertThat(connection.getConnection(host, port1).getTimeout()).isEqualTo(Duration.ofMinutes(1));
@@ -164,7 +164,7 @@ public void shouldApplyTimeoutOnPubSubConnectionUsingCodec() throws Exception {
 
         clusterClient.setDefaultTimeout(1, TimeUnit.MINUTES);
 
-        StatefulRedisPubSubConnection<String, String> connection = clusterClient.connectPubSub(CODEC);
+        StatefulRedisPubSubConnection<String, String> connection = clusterClient.connectPubSub(Utf8StringCodec.UTF8);
 
         assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(1));
         connection.close();

From 9accea566c8dc76d95626ce3ef42e3bc991d4047 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 20 Jul 2017 14:16:17 +0200
Subject: [PATCH 266/808] Expose asynchronous connection methods on Redis
 Cluster connections #561
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cluster connections now expose connectAsync(…) and connectPubSubAsync(…) methods for non-blocking, asynchronous connection retrieval to cluster nodes.
---
 .../io/lettuce/core/ConnectionFuture.java     | 15 +++++-
 .../PooledClusterConnectionProvider.java      | 49 ++++++-------------
 .../StatefulRedisClusterConnectionImpl.java   | 25 ++++++++++
 ...tefulRedisClusterPubSubConnectionImpl.java | 26 ++++++++++
 ...ynchronizingClusterConnectionProvider.java | 18 +++----
 .../api/StatefulRedisClusterConnection.java   | 49 +++++++++++++++++--
 .../StatefulRedisClusterPubSubConnection.java | 39 +++++++++++++--
 .../core/cluster/RedisClusterClientTest.java  | 49 ++++++++++++++-----
 .../cluster/pubsub/PubSubClusterTest.java     |  2 +-
 .../cluster/pubsub/PubSubConnectionTest.java  | 28 +++++++++--
 10 files changed, 230 insertions(+), 70 deletions(-)

diff --git a/src/main/java/io/lettuce/core/ConnectionFuture.java b/src/main/java/io/lettuce/core/ConnectionFuture.java
index fc9ddf7f83..1cc1aecb6f 100644
--- a/src/main/java/io/lettuce/core/ConnectionFuture.java
+++ b/src/main/java/io/lettuce/core/ConnectionFuture.java
@@ -30,7 +30,20 @@
  *
  * @since 4.4
  */
-public interface ConnectionFuture<T> extends CompletionStage<T> {
+public interface ConnectionFuture<T> extends CompletionStage<T>, Future<T> {
+
+    /**
+     * Create a {@link ConnectionFuture} given {@link SocketAddress} and {@link CompletableFuture} holding the connection
+     * progress.
+     *
+     * @param remoteAddress initial connection endpoint, must not be {@literal null}.
+     * @param delegate must not be {@literal null}.
+     * @return the {@link ConnectionFuture} for {@link SocketAddress} and {@link CompletableFuture}.
+     * @since 5.0
+     */
+    static <T> ConnectionFuture<T> from(SocketAddress remoteAddress, CompletableFuture<T> delegate) {
+        return new DefaultConnectionFuture<>(remoteAddress, delegate);
+    }
 
     /**
      * Waits if necessary for the computation to complete, and then retrieves its result.
diff --git a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
index e3ad177de5..187eaacf98 100644
--- a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
@@ -20,7 +20,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -104,7 +103,7 @@ public CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(Inten
         if (intent == Intent.READ && readFrom != null) {
             return getReadConnection(slot);
         }
-        return getWriteConnection(slot);
+        return getWriteConnection(slot).toCompletableFuture();
     }
 
     private CompletableFuture<StatefulRedisConnection<K, V>> getWriteConnection(int slot) {
@@ -124,7 +123,10 @@ private CompletableFuture<StatefulRedisConnection<K, V>> getWriteConnection(int
             // host because the nodeId can be handled by a different host.
             RedisURI uri = partition.getUri();
             ConnectionKey key = new ConnectionKey(Intent.WRITE, uri.getHost(), uri.getPort());
-            return getConnectionAsync(key).thenApply(connection -> {
+
+            ConnectionFuture<StatefulRedisConnection<K, V>> future = getConnectionAsync(key);
+
+            return future.thenApply(connection -> {
 
                 synchronized (stateLock) {
                     if (writers[slot] == null) {
@@ -133,7 +135,7 @@ private CompletableFuture<StatefulRedisConnection<K, V>> getWriteConnection(int
                 }
 
                 return connection;
-            });
+            }).toCompletableFuture();
         }
 
         return writer;
@@ -256,29 +258,12 @@ private StatefulRedisConnection<K, V>[] getConnections(
         return result;
     }
 
-    private static <K, V> CompletableFuture<StatefulRedisConnection<K, V>> getConnection(
-
-    CompletableFuture<StatefulRedisConnection<K, V>[]> root) {
-
-        return root.thenApply((StatefulRedisConnection<K, V>[] connections) -> {
-
-            for (StatefulRedisConnection<K, V> connection : connections) {
-
-                if (connection.isOpen()) {
-                    return connection;
-                }
-            }
-            return connections[0];
-        });
-    }
-
     private CompletableFuture<StatefulRedisConnection<K, V>>[] getReadFromConnections(List<RedisNodeDescription> selection) {
 
-        CompletableFuture<StatefulRedisConnection<K, V>>[] readerCandidates;
         // Use always host and port for slot-oriented operations. We don't want to get reconnected on a different
         // host because the nodeId can be handled by a different host.
 
-        readerCandidates = new CompletableFuture[selection.size()];
+        CompletableFuture<StatefulRedisConnection<K, V>>[] readerCandidates = new CompletableFuture[selection.size()];
 
         for (int i = 0; i < selection.size(); i++) {
 
@@ -288,7 +273,7 @@ private CompletableFuture<StatefulRedisConnection<K, V>>[] getReadFromConnection
             ConnectionKey key = new ConnectionKey(redisClusterNode.getRole() == RedisInstance.Role.MASTER ? Intent.WRITE
                     : Intent.READ, uri.getHost(), uri.getPort());
 
-            readerCandidates[i] = getConnectionAsync(key);
+            readerCandidates[i] = getConnectionAsync(key).toCompletableFuture();
         }
 
         return readerCandidates;
@@ -322,25 +307,19 @@ public CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(Inten
             logger.debug("getConnection(" + intent + ", " + nodeId + ")");
         }
 
-        return getConnectionAsync(new ConnectionKey(intent, nodeId));
+        return getConnectionAsync(new ConnectionKey(intent, nodeId)).toCompletableFuture();
     }
 
-    protected CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(ConnectionKey key) {
-
-        CompletionStage<StatefulRedisConnection<K, V>> future = connectionProvider.getConnectionAsync(key);
+    protected ConnectionFuture<StatefulRedisConnection<K, V>> getConnectionAsync(ConnectionKey key) {
 
+        ConnectionFuture<StatefulRedisConnection<K, V>> connectionFuture = connectionProvider.getConnectionAsync(key);
         CompletableFuture<StatefulRedisConnection<K, V>> result = new CompletableFuture<>();
 
-        future.handle((connection, throwable) -> {
+        connectionFuture.handle((connection, throwable) -> {
 
             if (throwable != null) {
 
-                if (future instanceof ConnectionFuture) {
-                    ConnectionFuture<?> connectionFuture = (ConnectionFuture<?>) future;
-                    result.completeExceptionally(RedisConnectionException.create(connectionFuture.getRemoteAddress(), throwable));
-                } else {
-                    result.completeExceptionally(throwable);
-                }
+                result.completeExceptionally(RedisConnectionException.create(connectionFuture.getRemoteAddress(), throwable));
             } else {
                 result.complete(connection);
             }
@@ -348,7 +327,7 @@ protected CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(Co
             return null;
         });
 
-        return result;
+        return ConnectionFuture.from(connectionFuture.getRemoteAddress(), result);
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
index 6a56507fcf..e45b449a85 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
@@ -25,6 +25,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
 import io.lettuce.core.*;
@@ -139,6 +140,21 @@ public StatefulRedisConnection<K, V> getConnection(String nodeId) {
                 ClusterConnectionProvider.Intent.WRITE, nodeId);
     }
 
+    @Override
+    public CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(String nodeId) {
+
+        RedisURI redisURI = lookup(nodeId);
+
+        if (redisURI == null) {
+            throw new RedisException("NodeId " + nodeId + " does not belong to the cluster");
+        }
+
+        AsyncClusterConnectionProvider provider = (AsyncClusterConnectionProvider) getClusterDistributionChannelWriter()
+                .getClusterConnectionProvider();
+
+        return provider.getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, nodeId);
+    }
+
     @Override
     public StatefulRedisConnection<K, V> getConnection(String host, int port) {
 
@@ -146,6 +162,15 @@ public StatefulRedisConnection<K, V> getConnection(String host, int port) {
                 ClusterConnectionProvider.Intent.WRITE, host, port);
     }
 
+    @Override
+    public CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(String host, int port) {
+
+        AsyncClusterConnectionProvider provider = (AsyncClusterConnectionProvider) getClusterDistributionChannelWriter()
+                .getClusterConnectionProvider();
+
+        return provider.getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, host, port);
+    }
+
     public ClusterDistributionChannelWriter getClusterDistributionChannelWriter() {
         return (ClusterDistributionChannelWriter) super.getChannelWriter();
     }
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
index 34c7b0ff48..903d079269 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
@@ -18,6 +18,7 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
 import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
 
 import io.lettuce.core.AbstractRedisClient;
 import io.lettuce.core.RedisChannelWriter;
@@ -131,6 +132,22 @@ public StatefulRedisPubSubConnection<K, V> getConnection(String nodeId) {
                 .getConnection(ClusterConnectionProvider.Intent.WRITE, nodeId);
     }
 
+    @Override
+    @SuppressWarnings("unchecked")
+    public CompletableFuture<StatefulRedisPubSubConnection<K, V>> getConnectionAsync(String nodeId) {
+
+        RedisURI redisURI = lookup(nodeId);
+
+        if (redisURI == null) {
+            throw new RedisException("NodeId " + nodeId + " does not belong to the cluster");
+        }
+
+        AsyncClusterConnectionProvider provider = (AsyncClusterConnectionProvider) getClusterDistributionChannelWriter()
+                .getClusterConnectionProvider();
+        return (CompletableFuture) provider.getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, nodeId);
+
+    }
+
     @Override
     public StatefulRedisPubSubConnection<K, V> getConnection(String host, int port) {
 
@@ -138,6 +155,15 @@ public StatefulRedisPubSubConnection<K, V> getConnection(String host, int port)
                 .getConnection(ClusterConnectionProvider.Intent.WRITE, host, port);
     }
 
+    @Override
+    public CompletableFuture<StatefulRedisPubSubConnection<K, V>> getConnectionAsync(String host, int port) {
+
+        AsyncClusterConnectionProvider provider = (AsyncClusterConnectionProvider) getClusterDistributionChannelWriter()
+                .getClusterConnectionProvider();
+
+        return (CompletableFuture) provider.getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, host, port);
+    }
+
     public void setPartitions(Partitions partitions) {
         this.partitions = partitions;
         getClusterDistributionChannelWriter().setPartitions(partitions);
diff --git a/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
index 95fde38950..4a3488985c 100644
--- a/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
@@ -15,10 +15,10 @@
  */
 package io.lettuce.core.cluster;
 
+import java.net.SocketAddress;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
-import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.function.BiConsumer;
@@ -82,7 +82,7 @@ public StatefulRedisConnection<K, V> getConnection(ConnectionKey key) {
      * @throws RedisException if a {@link RedisException} occured
      * @throws CompletionException
      */
-    public CompletionStage<StatefulRedisConnection<K, V>> getConnectionAsync(ConnectionKey key) {
+    public ConnectionFuture<StatefulRedisConnection<K, V>> getConnectionAsync(ConnectionKey key) {
         return getConnectionSync(key).getConnectionAsync();
     }
 
@@ -188,7 +188,7 @@ interface Sync<K, V> {
          */
         StatefulRedisConnection<K, V> getConnection();
 
-        CompletionStage<StatefulRedisConnection<K, V>> getConnectionAsync();
+        ConnectionFuture<StatefulRedisConnection<K, V>> getConnectionAsync();
 
         /**
          * Apply a {@link Consumer} callback to the {@link StatefulConnection}.
@@ -209,12 +209,12 @@ static class Finished<K, V> implements Sync<K, V> {
 
         private final ConnectionKey key;
         private final StatefulRedisConnection<K, V> connection;
-        private final CompletableFuture<StatefulRedisConnection<K, V>> future;
+        private final ConnectionFuture<StatefulRedisConnection<K, V>> future;
 
-        public Finished(ConnectionKey key, StatefulRedisConnection<K, V> connection) {
+        public Finished(ConnectionKey key, SocketAddress remoteAddress, StatefulRedisConnection<K, V> connection) {
             this.key = key;
             this.connection = connection;
-            this.future = CompletableFuture.completedFuture(connection);
+            this.future = ConnectionFuture.from(remoteAddress, CompletableFuture.completedFuture(connection));
         }
 
         @Override
@@ -223,7 +223,7 @@ public StatefulRedisConnection<K, V> getConnection() {
         }
 
         @Override
-        public CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync() {
+        public ConnectionFuture<StatefulRedisConnection<K, V>> getConnectionAsync() {
             return future;
         }
 
@@ -264,14 +264,14 @@ public InProgress(ConnectionKey key, ConnectionFuture<StatefulRedisConnection<K,
         }
 
         @Override
-        public CompletionStage<StatefulRedisConnection<K, V>> getConnectionAsync() {
+        public ConnectionFuture<StatefulRedisConnection<K, V>> getConnectionAsync() {
 
             return future.whenComplete((connection, throwable) -> {
 
                 if (REMOVE.compareAndSet(this, 0, ST_FINISHED)) {
 
                     if (throwable == null) {
-                        connections.replace(key, this, new Finished<>(key, connection));
+                        connections.replace(key, this, new Finished<>(key, future.getRemoteAddress(), connection));
                     } else {
                         connections.remove(key);
                     }
diff --git a/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java b/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
index 3c94985397..8a760f5d3e 100644
--- a/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
+++ b/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package io.lettuce.core.cluster.api;
 
+import java.util.concurrent.CompletableFuture;
+
 import io.lettuce.core.ReadFrom;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.api.StatefulConnection;
@@ -26,8 +28,8 @@
 import io.lettuce.core.cluster.models.partitions.Partitions;
 
 /**
- * A stateful cluster connection. Advanced cluster connections provide transparent command routing based on the first
- * command key.
+ * A stateful cluster connection. Advanced cluster connections provide transparent command routing based on the first command
+ * key.
  *
  * @param <K> Key type.
  * @param <V> Value type.
@@ -76,14 +78,33 @@ public interface StatefulRedisClusterConnection<K, V> extends StatefulConnection
      */
     StatefulRedisConnection<K, V> getConnection(String nodeId);
 
+    /**
+     * Retrieve asynchronously a connection to the specified cluster node using the nodeId. Host and port are looked up in the
+     * node list. This connection is bound to the node id. Once the cluster topology view is updated, the connection will try to
+     * reconnect the to the node with the specified {@code nodeId}, that behavior can also lead to a closed connection once the
+     * node with the specified {@code nodeId} is no longer part of the cluster.
+     *
+     * Do not close the connections. Otherwise, unpredictable behavior will occur. The nodeId must be part of the cluster and is
+     * validated against the current topology view in {@link io.lettuce.core.cluster.models.partitions.Partitions}.
+     *
+     *
+     * In contrast to the {@link StatefulRedisClusterConnection}, node-connections do not route commands to other cluster nodes.
+     *
+     * @param nodeId the node Id
+     * @return {@link CompletableFuture} to indicate success or failure to connect to the requested cluster node.
+     * @throws RedisException if the requested node identified by {@code nodeId} is not part of the cluster
+     * @since 5.0
+     */
+    CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(String nodeId);
+
     /**
      * Retrieve a connection to the specified cluster node using host and port. This connection is bound to a host and port.
      * Updates to the cluster topology view can close the connection once the host, identified by {@code host} and {@code port},
      * are no longer part of the cluster.
-     *
+     * <p>
      * Do not close the connections. Otherwise, unpredictable behavior will occur. Host and port connections are verified by
      * default for cluster membership, see {@link ClusterClientOptions#isValidateClusterNodeMembership()}.
-     *
+     * <p>
      * In contrast to the {@link StatefulRedisClusterConnection}, node-connections do not route commands to other cluster nodes.
      *
      * @param host the host
@@ -93,6 +114,24 @@ public interface StatefulRedisClusterConnection<K, V> extends StatefulConnection
      */
     StatefulRedisConnection<K, V> getConnection(String host, int port);
 
+    /**
+     * Retrieve asynchronously a connection to the specified cluster node using host and port. This connection is bound to a
+     * host and port. Updates to the cluster topology view can close the connection once the host, identified by {@code host}
+     * and {@code port}, are no longer part of the cluster.
+     * <p>
+     * Do not close the connections. Otherwise, unpredictable behavior will occur. Host and port connections are verified by
+     * default for cluster membership, see {@link ClusterClientOptions#isValidateClusterNodeMembership()}.
+     * <p>
+     * In contrast to the {@link StatefulRedisClusterConnection}, node-connections do not route commands to other cluster nodes.
+     *
+     * @param host the host
+     * @param port the port
+     * @return {@link CompletableFuture} to indicate success or failure to connect to the requested cluster node.
+     * @throws RedisException if the requested node identified by {@code host} and {@code port} is not part of the cluster
+     * @since 5.0
+     */
+    CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(String host, int port);
+
     /**
      * Set from which nodes data is read. The setting is used as default for read operations on this connection. See the
      * documentation for {@link ReadFrom} for more information.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
index e7979d316d..c2c1ae5dcc 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.cluster.pubsub;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
 
 import io.lettuce.core.RedisException;
@@ -97,7 +98,7 @@ public interface StatefulRedisClusterPubSubConnection<K, V> extends StatefulRedi
      * connection is bound to the node id. Once the cluster topology view is updated, the connection will try to reconnect the
      * to the node with the specified {@code nodeId}, that behavior can also lead to a closed connection once the node with the
      * specified {@code nodeId} is no longer part of the cluster.
-     *
+     * <p>
      * Do not close the connections. Otherwise, unpredictable behavior will occur. The nodeId must be part of the cluster and is
      * validated against the current topology view in {@link io.lettuce.core.cluster.models.partitions.Partitions}.
      *
@@ -107,11 +108,27 @@ public interface StatefulRedisClusterPubSubConnection<K, V> extends StatefulRedi
      */
     StatefulRedisPubSubConnection<K, V> getConnection(String nodeId);
 
+    /**
+     * Retrieve asynchronously a connection to the specified cluster node using the nodeId. Host and port are looked up in the
+     * node list. This connection is bound to the node id. Once the cluster topology view is updated, the connection will try to
+     * reconnect the to the node with the specified {@code nodeId}, that behavior can also lead to a closed connection once the
+     * node with the specified {@code nodeId} is no longer part of the cluster.
+     * <p>
+     * Do not close the connections. Otherwise, unpredictable behavior will occur. The nodeId must be part of the cluster and is
+     * validated against the current topology view in {@link io.lettuce.core.cluster.models.partitions.Partitions}.
+     *
+     * @param nodeId the node Id
+     * @return {@link CompletableFuture} to indicate success or failure to connect to the requested cluster node.
+     * @throws RedisException if the requested node identified by {@code nodeId} is not part of the cluster
+     * @since 5.0
+     */
+    CompletableFuture<StatefulRedisPubSubConnection<K, V>> getConnectionAsync(String nodeId);
+
     /**
      * Retrieve a connection to the specified cluster node using host and port. This connection is bound to a host and port.
      * Updates to the cluster topology view can close the connection once the host, identified by {@code host} and {@code port},
      * are no longer part of the cluster.
-     *
+     * <p>
      * Do not close the connections. Otherwise, unpredictable behavior will occur. Host and port connections are verified by
      * default for cluster membership, see {@link ClusterClientOptions#isValidateClusterNodeMembership()}.
      *
@@ -122,6 +139,22 @@ public interface StatefulRedisClusterPubSubConnection<K, V> extends StatefulRedi
      */
     StatefulRedisPubSubConnection<K, V> getConnection(String host, int port);
 
+    /**
+     * Retrieve a connection to the specified cluster node using host and port. This connection is bound to a host and port.
+     * Updates to the cluster topology view can close the connection once the host, identified by {@code host} and {@code port},
+     * are no longer part of the cluster.
+     * <p>
+     * Do not close the connections. Otherwise, unpredictable behavior will occur. Host and port connections are verified by
+     * default for cluster membership, see {@link ClusterClientOptions#isValidateClusterNodeMembership()}.
+     *
+     * @param host the host
+     * @param port the port
+     * @return {@link CompletableFuture} to indicate success or failure to connect to the requested cluster node.
+     * @throws RedisException if the requested node identified by {@code host} and {@code port} is not part of the cluster
+     * @since 5.0
+     */
+    CompletableFuture<StatefulRedisPubSubConnection<K, V>> getConnectionAsync(String host, int port);
+
     /**
      * @return Known partitions for this connection.
      */
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
index 2e0440bb6b..51f39b4f11 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
@@ -61,6 +61,7 @@ public class RedisClusterClientTest extends AbstractClusterTest {
     private RedisCommands<String, String> redissync4;
 
     protected RedisAdvancedClusterCommands<String, String> sync;
+    protected StatefulRedisClusterConnection<String, String> connection;
 
     @BeforeClass
     public static void setupClient() throws Exception {
@@ -94,12 +95,13 @@ public void before() throws Exception {
         redissync4 = redis4.sync();
 
         clusterClient.reloadPartitions();
-        sync = clusterClient.connect().sync();
+        connection = clusterClient.connect();
+        sync = connection.sync();
     }
 
     @After
     public void after() throws Exception {
-        sync.getStatefulConnection().close();
+        connection.close();
         redis1.close();
 
         redissync1.getStatefulConnection().close();
@@ -112,14 +114,14 @@ public void after() throws Exception {
     public void statefulConnectionFromSync() throws Exception {
         RedisAdvancedClusterCommands<String, String> sync = clusterClient.connect().sync();
         assertThat(sync.getStatefulConnection().sync()).isSameAs(sync);
-        sync.getStatefulConnection().close();
+        connection.close();
     }
 
     @Test
     public void statefulConnectionFromAsync() throws Exception {
         RedisAdvancedClusterAsyncCommands<String, String> async = clusterClient.connect().async();
         assertThat(async.getStatefulConnection().async()).isSameAs(async);
-        async.getStatefulConnection().close();
+        connection.close();
     }
 
     @Test
@@ -461,8 +463,8 @@ public void operateOnNodeConnection() throws Exception {
         sync.set(KEY_A, value);
         sync.set(KEY_B, "d");
 
-        StatefulRedisConnection<String, String> statefulRedisConnection = sync.getStatefulConnection().getConnection(
-                TestSettings.hostAddr(), port2);
+        StatefulRedisConnection<String, String> statefulRedisConnection = connection.getConnection(TestSettings.hostAddr(),
+                port2);
 
         RedisClusterCommands<String, String> connection = statefulRedisConnection.sync();
 
@@ -475,9 +477,30 @@ public void operateOnNodeConnection() throws Exception {
         }
     }
 
+    @Test
+    public void testGetConnectionAsyncByNodeId() {
+
+        RedisClusterNode partition = connection.getPartitions().getPartition(0);
+
+        StatefulRedisConnection<String, String> node = connection.getConnectionAsync(partition.getNodeId()).join();
+
+        assertThat(node.sync().ping()).isEqualTo("PONG");
+    }
+
+    @Test
+    public void testGetConnectionAsyncByHostAndPort() {
+
+        RedisClusterNode partition = connection.getPartitions().getPartition(0);
+
+        RedisURI uri = partition.getUri();
+        StatefulRedisConnection<String, String> node = connection.getConnectionAsync(uri.getHost(), uri.getPort()).join();
+
+        assertThat(node.sync().ping()).isEqualTo("PONG");
+    }
+
     @Test
     public void testStatefulConnection() throws Exception {
-        RedisAdvancedClusterAsyncCommands<String, String> async = sync.getStatefulConnection().async();
+        RedisAdvancedClusterAsyncCommands<String, String> async = connection.async();
 
         assertThat(async.ping().get()).isEqualTo("PONG");
     }
@@ -488,7 +511,7 @@ public void getButNoPartitionForSlothash() throws Exception {
         for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
             redisClusterNode.setSlots(new ArrayList<>());
         }
-        RedisChannelHandler rch = (RedisChannelHandler) sync.getStatefulConnection();
+        RedisChannelHandler rch = (RedisChannelHandler) connection;
         ClusterDistributionChannelWriter writer = (ClusterDistributionChannelWriter) rch.getChannelWriter();
         writer.setPartitions(clusterClient.getPartitions());
         clusterClient.getPartitions().reload(clusterClient.getPartitions().getPartitions());
@@ -503,13 +526,13 @@ public void readOnlyOnCluster() throws Exception {
         // commands are dispatched to a different connection, therefore it works for us.
         sync.set(KEY_B, value);
 
-        sync.getStatefulConnection().async().quit().get();
+        connection.async().quit().get();
 
-        assertThat(ReflectionTestUtils.getField(sync.getStatefulConnection(), "readOnly")).isEqualTo(Boolean.TRUE);
+        assertThat(ReflectionTestUtils.getField(connection, "readOnly")).isEqualTo(Boolean.TRUE);
 
         sync.readWrite();
 
-        assertThat(ReflectionTestUtils.getField(sync.getStatefulConnection(), "readOnly")).isEqualTo(Boolean.FALSE);
+        assertThat(ReflectionTestUtils.getField(connection, "readOnly")).isEqualTo(Boolean.FALSE);
         RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.Builder.redis(host, 40400).build());
         try {
@@ -582,7 +605,7 @@ public void testClusterSetConfigEpoch() throws Exception {
 
     @Test
     public void testReadFrom() throws Exception {
-        StatefulRedisClusterConnection<String, String> statefulConnection = sync.getStatefulConnection();
+        StatefulRedisClusterConnection<String, String> statefulConnection = connection;
 
         assertThat(statefulConnection.getReadFrom()).isEqualTo(ReadFrom.MASTER);
 
@@ -592,7 +615,7 @@ public void testReadFrom() throws Exception {
 
     @Test(expected = IllegalArgumentException.class)
     public void testReadFromNull() throws Exception {
-        sync.getStatefulConnection().setReadFrom(null);
+        connection.setReadFrom(null);
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
index eea78678fd..71f86542f9 100644
--- a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java
index d5012241ef..6fe2b079e2 100644
--- a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java
+++ b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.AbstractClusterTest;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
@@ -38,8 +39,8 @@ public class PubSubConnectionTest extends AbstractClusterTest {
     private PubSubTestListener listener = new PubSubTestListener();
 
     private StatefulRedisClusterConnection<String, String> connection;
-    private StatefulRedisPubSubConnection<String, String> pubSubConnection;
-    private StatefulRedisPubSubConnection<String, String> pubSubConnection2;
+    private StatefulRedisClusterPubSubConnection<String, String> pubSubConnection;
+    private StatefulRedisClusterPubSubConnection<String, String> pubSubConnection2;
 
     @Before
     public void openPubSubConnection() throws Exception {
@@ -125,7 +126,28 @@ public void testRegularClientPubSubPublish() throws Exception {
         RedisCommands<String, String> otherNodeConnection = connection.getConnection(otherNode.getNodeId()).sync();
         otherNodeConnection.publish(key, value);
         assertThat(listener.getChannels().take()).isEqualTo(key);
+    }
+
+    @Test
+    public void testGetConnectionAsyncByNodeId() {
+
+        RedisClusterNode partition = pubSubConnection.getPartitions().getPartition(0);
+
+        StatefulRedisPubSubConnection<String, String> node = pubSubConnection.getConnectionAsync(partition.getNodeId()).join();
+
+        assertThat(node.sync().ping()).isEqualTo("PONG");
+    }
+
+    @Test
+    public void testGetConnectionAsyncByHostAndPort() {
+
+        RedisClusterNode partition = pubSubConnection.getPartitions().getPartition(0);
+
+        RedisURI uri = partition.getUri();
+        StatefulRedisPubSubConnection<String, String> node = pubSubConnection.getConnectionAsync(uri.getHost(), uri.getPort())
+                .join();
 
+        assertThat(node.sync().ping()).isEqualTo("PONG");
     }
 
     private RedisClusterNode getOtherThan(String nodeId) {

From fb1c0d32144bea69302c8f0996dd5c3d0fa71f45 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 20 Jul 2017 14:37:15 +0200
Subject: [PATCH 267/808] Update release notes #572

---
 RELEASE-NOTES.md | 253 +++++++++++++++++++----------------------------
 1 file changed, 100 insertions(+), 153 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 70b40ffc99..720d3a0b7e 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,83 +1,100 @@
-Lettuce 5.0.0 M2 RELEASE NOTES
+Lettuce 5.0.0 RC1 RELEASE NOTES
 ==================================
 
-This is the second milestone release for Lettuce 5.0. We made a few breaking changes in this release:
- 
- 1. We moved the artifact coordinates from biz.paluch.redis:lettuce to io.lettuce:lettuce-core
- 2. We relocated packages from biz.paluch.redis to io.lettuce.core. The migration path is
-    straight-forward by replacing the old package name in your imports with the new package name.
- 3. No one (not even me) knew whether it was lettuce or Lettuce when mentioning the driver
-    on a website, mail or some documentation. We fixed that: Lettuce is now written with an uppercase L. 
-    We also have a beautiful logo and project website at https://lettuce.io.
- 4. We removed some deprecated methods, see below for full details.
- 
-Besides the breaking changes, this release comes with 96 completed issues.
+This release comes with 29 completed issues and drops support for netty 4.0.
 
-This release introduces a new reference guide that is shipped along the regular artifacts. The reference guide
-is bound to a particular version and does not change over time, such as the Wiki.
+This release introduces ships with few breaking changes such as `Duration` use 
+for timeouts and delays and changes the return type for `configGet` 
+from `List<String>` to `Map<String, String>`.
 
-Lettuce defaults to native transport (epoll) on Linux systems if the epoll dependency is available.
-You can disable this behavior by setting the system property `io.lettuce.core.epoll` to `false`.
+Lettuce now contains a range of performance improvements to lower GC pressure, 
+introduces kqueue native transport on BSD-like systems and asynchronous,
+connection initialization.
 
 Browse the docs at https://lettuce.io/core/snapshot/reference/.
 
+This release asserts compatibility in class-path mode with Java 9 requiring 
+at least netty 4.1.11.Final.
 
-Command Interface Batching
---------------------------
-Command interfaces support command batching to collect multiple commands in a batch queue and 
-flush the batch in a single write to the transport. Command batching executes commands in a 
-deferred nature. This means that at the time of invocation no result is available.
- Batching can be only used with synchronous methods without a return value (void) or asynchronous 
- methods returning a RedisFuture.
 
-Command batching can be enabled on two levels:
+Redis Cluster Pub/Sub on Node-Selections
+----------------------------------------
+`RedisClusterClient.connectPubSub()` now returns a 
+`StatefulRedisClusterPubSubConnection` that allows registration of 
+`RedisClusterPubSubListener`s and subscription on particular cluster nodes.
 
-* On class level by annotating the command interface with @BatchSize. 
-  All methods participate in command batching.
-* On method level by adding CommandBatching to the arguments. 
-  Method participates selectively in command batching.
+Cluster node-specific subscriptions allow usage of keyspace notifications. 
+Keyspace notifications are different from userspace Pub/Sub since keyspace 
+notifications don't broadcast to the entire cluster but are published only 
+on the node the notification happens. A common usecase is when a key expires 
+in the cluster.
 
-```java
-@BatchSize(50)
-interface StringCommands extends Commands {
+```
+StatefulRedisClusterPubSubConnection connection = client.connectPubSub();
+
+connection.addListener(…);
+
+connection.setNodeMessagePropagation(true);
 
-    void set(String key, String value);
+RedisClusterPubSubCommands<String, String> sync = connection.sync();
+sync.slaves().commands().psubscribe("__key*__:expire");
+```
 
-    RedisFuture<String> get(String key);
 
-    RedisFuture<String> get(String key, CommandBatching batching);
-}
+Native Transports
+-----------------
+Lettuce now uses native transports by default, if the operating system is 
+qualified and dependencies are available. Lettuce supports epoll (on 
+Linux-based systems) since 4.0 and since this version kqueue (BSD-based
+systems, like macOS).
 
-StringCommands commands = …
+Epoll usage can be disabled with system properties by setting 
+`io.lettuce.core.epoll=false`. In a similar way, kqueue can be disabled 
+with `io.lettuce.core.kqueue=false`.
 
-commands.set("key", "value"); // queued until 50 command invocations reached.
-                              // The 50th invocation flushes the queue.
+Epoll dependency:
 
-commands.get("key", CommandBatching.queue()); // invocation-level queueing control
-commands.get("key", CommandBatching.flush()); // invocation-level queueing control,
-                                              // flushes all queued commands
+```xml
+<dependency>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-transport-native-epoll</artifactId>
+    <version>${netty-version}</version>
+    <classifier>linux-x86_64</classifier>
+</dependency>
 ```
 
-Read more: https://github.com/lettuce-io/lettuce-core/wiki/Redis-Command-Interfaces#batch-execution
+Kqueue dependency:
 
-Asynchronous Connection Propagation
------------------------------------
+```xml
+<dependency>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-transport-native-kqueue</artifactId>
+    <version>${netty-version}</version>
+    <classifier>osx-x86_64</classifier>
+</dependency>
+```
 
-Lettuce is inherently non-blocking, yet we synchronize in some places that causes blocking behavior. 
-Cluster node connections is one of these areas.
-Commands dispatched to a cluster node require a connection to be dispatched. We connected, waited until
-the connection is available and then we proceeded. This synchronization keeps threads busy.
 
-With this release, we are fully non-blocking. Cluster node connections are obtained now asynchronously and
-we use the connection state (via `CompletableFuture`) to asynchronously dispatch commands.
+Asynchronous Connections in Redis Cluster
+-----------------------------------------
+RedisClusterClient now connects asynchronously without intermediate 
+synchronization to cluster nodes. The connection progress is shared between
+multiple threads that request a cluster node connection for the first time.
+Previously, connection was sequential-synchronous. Each connection attempt
+blocked subsequent attempts from other threads. If a cluster node connection
+ran into a timeout, threads were penalized with a growing wait time. If, say, 10 
+threads waited for a connection, the last thread had to wait up to 10 times 
+the connection timeout.
 
-Asynchronous connection propagation solves a few issues such as netty deadlocks if cluster commands are
-sent within a future callback or in a reactive sequence.
+Asynchronous connection initiates the connection once using internally a 
+`Future` so multiple concurrent connection attempts share the resulting
+`Future`. Errors fail now faster and cluster node usage is fully asynchronous
+without synchronization and without the danger to run into a threading deadlock.
 
 
-Thanks to all contributors that made Lettuce 5.0.0 possible.
+Thanks to all contributors that made Lettuce 5.0.0.RC1 possible.
 
-Lettuce 5.0.0 requires Java 8 and cannot be used with Java 6 or 7.
+Lettuce 5.0.0.RC1 requires Java 8 and cannot be used with Java 6 or 7.
 
 If you need any support, meet Lettuce at:
 
@@ -87,113 +104,43 @@ If you need any support, meet Lettuce at:
 * Documentation: https://lettuce.io/docs/
 
 
-Commands
---------
-* Adopt fixed GEODIST/GEOHASH behavior in tests #362
-* Support CLIENT and INFO commands for Redis Sentinel #415
-* Disable WAIT as Read-Only command #418
-
 Enhancements
 ------------
-* Use MethodHandle.Lookup.findSpecial(…) for default method lookup #310
-* Use StringCodec from Utf8StringCodec #393
-* Add reactive wrapper converters for RxJava1 and 2 #383
-* Provide synchronous ScanIterator API #397
-* Support value ranges #384
-* Allow Pub/Sub subscriptions on a node selection within Redis Cluster #385
-* [BREAKING] Remove deprecated LettuceFutures.await method #388
-* [BREAKING] Remove ExperimentalByteArrayCodec and enhance ByteArrayCodec #389
-* Propagate backpressure to the transport channel #394
-* Default to epoll transport if available #402
-* Simplify NodeSelection implementation #408
-* [BREAKING] Remove addListener/removeListener methods from execution-specific Pub/Sub interfaces #412
-* [BREAKING] Remove close method from Redis Sentinel command interfaces #415
-* Allow setting client name with RedisURI #416
-* Extend RedisConnectionStateListener.onRedisConnected by adding SocketAddress #419
-* Decompose array parameters into single command arguments #421
-* Consider key/value type of parameter wrappers in codec resolution #423
-* Connect asynchronously in cluster topology refresh #424
-* Perform resilient Master/Slave topology refresh ping #424
-* Return ClusterClientOptions.Builder in socketOptions and sslOptions methods #425
-* Use ResolvableType for type resolution #426
-* Propagate cause if cluster topology refresh can't connect to any node #427
-* Propagate asynchronous connection initialization #429
-* Dynamic API: Support command batching #432
-* Reuse stale connections collection when closing stale connections #443
-* Add ReadFrom.SLAVE_PREFERRED #452
-* Share cluster node connection progress with request threads #453
-* Send collection of commands as batch through StatefulConnection and ChannelWriter #456
-* Use EnumSet to determine Read-Only commands #457
-* Encapsulate fields in Commands implementations and command builder #458
-* Refactor command creation and execution to ExecutableCommand creation #463
-* Use String-Codec for COMMAND #467
-* Create a static call chain in InvocationProxyFactory #468
-* Initialize RedisStateMachine.LongProcessor in static initializer #481 (Thanks to @hellyguo)
-* Add shutdownAsync to AbstractRedisClient #485 (Thanks to @jongyeol)
-* Propagate asynchronous connections to ClusterConnectionProvider #486 (@Thanks to @jeniok)
-* Resolve hostnames using netty's DNS resolver #498
-* Introduce NettyCustomizer API #499 (Thanks to @jongyeol)
-* Use asynchronous node connect in NodeSelection #500
-* Gracefully degrade to successfully connected Cluster read candidates #503 (Thanks to @eliotw)
-* Implement counting Deque #507 (Thanks to @CodingFabian)
-* Use ThreadLocalRandom instead of Random #510
-* Replace consumer completion List in CommandWrapper with Array #511
-* Consider ConnectionFuture state in ClusterDistributionChannelWriter #511
-* Replace first arg fields in CommandArgs with CommandArgsAccessor #511
-* Merge Command completion state fields to a single status field #511
-* Move command latency metrics to LatencyMeteredCommand #511
-* Close the connection when Redis protocol is corrupted #512 (Thanks to @jongyeol)
-* Allow setting the Redis password as char-array #513
-* Replace synchronized reconnect in ConnectionWatchdog with asynchronous connect #514
-* Improve cleanup of PauseDetector #516
-* Upgrade AsyncExecutions to use CompletableFuture #522
+* Drop netty 4.0 compatibility #518
+* Support default methods on Command Interfaces #527
+* Align log prefix for CommandHandler and ConnectionWatchdog #538
+* Add support for kqueue transport #539
+* Add support for client certificate authentication #540
+* Adopt to changed SLOWLOG output #551
+* Use pre-instantiated ByteBufProcessor in RedisStateMachine to find EOL #557
+* SlotHash.getSlot(…) duplicates bytes while slot calculation #558
+* Replace CountDownLatch in AsyncCommand with AtomicFieldUpdater #559
+* Expose asynchronous connection creation API #561
+* [BREAKING] Refactor CONFIG GET output from List<String> to Map<String, String> #562
+* Adopt to read-only variant GEORADIUS(BYMEMBER)_RO #564
+* [BREAKING] Switch to Duration for timeouts #570
 
 Fixes
 -----
-* Update code samples in readme to Lettuce 4.0 #410
-* Apply proxy wrapper to obtained pooled connections #411
-* Allow databases greater than 15 in RedisURI #420
-* Consider Wildcard types in type information and assignability #431
-* Expose a protected default constructor for RedisClusterClient #438
-* Ensure RoundRobinSocketAddressSupplier consistency before returning a SocketAddress #440
-* Fix Partitions.addPartition(…) and Partitions.reload(…) synchronization #442
-* Fix authenticated PING before connect with Redis Sentinel #448
-* Close connections in PooledClusterConnectionProvider.close() #460
-* Read connect future in ReconnectHandler to local variable #465
-* Apply command timeout to PING before connection activation #470
-* Synchronize ClientResources shutdown in client shutdown #475
-* Skip SO_KEEPALIVE and TCP_NODELAY options for Unix Domain Socket connections #476 (Thanks to @magdkudama)
-* Fix cummulative metrics collection #487 (Thanks to @ameenhere)
-* Stop LatencyStats on removal #517
-* Guard PauseDetectorWrapper initialization against absence of LatencyUtils #520
+* NumberFormatException on `inf` zscore #528 (Thanks to @DarkSeraphim)
+* Connection pool deadlock #531 (Thanks to @DarkSeraphim)
+* Improve Epoll availability detection #535
+* Fix FastCountingDeque not recording correct size. #544 (Thanks to @kojilin)
+* Lettuce doesn't call QUIT when a pooled connection is destroyed. #545 (Thanks to @robbiemc)
+* clientSetname does not set client name on default connection #563
 
 Other
 ------
-* Upgrade to Java 9-compatible build #310
-* Mark NodeSelection API as stable #389
-* Document RedisClient and RedisClusterClient implementation hooks #392
-* Upgrade to netty 4.1.7 #436
-* Fix ClientResources usage in tests #445
-* Enable JMH tests on TravisCI #454
-* Create benchmarks for RedisClient, RedisClusterClient and ClusterDistributionChannelWriter #454
-* Use Reactor's StepVerifier in tests #455
-* Upgrade to TravisCI trusty #461
-* Upgrade to Mockito 2.7.5 #469
-* Improve JavaDoc #472
-* Upgrade dependencies #474
-* Switch optional dependencies from provided to optional #482
-* Use appropriate EventLoopGroup in SingleThreadedReactiveClusterClientTest #486
-* Update Netty version to 4.1.9 #489 (Thanks to @odiszapc)
-* Calculate first response metrics from sent time #491
-* [BREAKING] Move to lettuce.io #493
-* Create reference documentation #494
-* Switch to codecov #504
-* Upgrade to Reactor 3.1.0 SNAPSHOT #505
-* Upgrade integrations from mp911de/lettuce to lettuce-io/lettuce-core #506
-* Upgrade to Project Reactor 3.1.0.M1 #523
-* Upgrade to RxJava 1.2.10 #524
-* Upgrade to RxJava2 2.0.9 #525
-* Switch jcl-over-slf4j dependency to test scope #526
+* Test with JDK 9 Early Access builds #310
+* Upgrade to netty 4.1.10 #532
+* Upgrade to netty 4.0.11 #537
+* Upgrade to netty 4.1.12 (4.0.48) #548
+* Upgrade to Reactor 3.1 M2 #549
+* Allow Redis version pinning for build #552
+* Upgrade to netty 4.1.13/4.0.49 #565
+* Upgrade to Reactor 3.1.0 M3 (Bismuth M3) #567
+* Use BOM to manage netty and Spring dependencies #568
+* Upgrade dependencies #569
 
 Lettuce requires a minimum of Java 8 to build and run. It is tested continuously
 against the latest Redis source-build.

From e9e7cd023bb5647bcea59e7842be0e363f8bea2b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 20 Jul 2017 14:47:53 +0200
Subject: [PATCH 268/808] [maven-release-plugin] prepare release 5.0.0.RC1

---
 pom.xml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1d0ea352d8..e5b05dc35f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -10,7 +9,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.0.0.BUILD-SNAPSHOT</version>
+    <version>5.0.0.RC1</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -69,7 +68,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-        <tag>HEAD</tag>
+        <tag>5.0.0.RC1</tag>
     </scm>
 
     <!-- Required for Spring RC artifacts -->
@@ -580,7 +579,7 @@
                                     <arguments>
                                         <argument>-Xmx2G</argument>
                                         <argument>-classpath</argument>
-                                        <classpath/>
+                                        <classpath />
                                         <argument>org.openjdk.jmh.Main</argument>
                                         <argument>.*</argument>
                                         <argument>-tu</argument>
@@ -651,9 +650,7 @@
                                 <phase>process-resources</phase>
                                 <configuration>
                                     <target>
-                                        <copy failonerror="false"
-                                              file="${project.build.directory}/generated-docs/index.pdf"
-                                              tofile="target/site/reference/pdf/lettuce-reference.pdf"/>
+                                        <copy failonerror="false" file="${project.build.directory}/generated-docs/index.pdf" tofile="target/site/reference/pdf/lettuce-reference.pdf" />
                                     </target>
                                 </configuration>
                                 <goals>
@@ -721,9 +718,9 @@
                                 <toclevels>3</toclevels>
                                 <numbered>true</numbered>
                                 <ext-doc>https://raw.githubusercontent.com/wiki/mp911de/lettuce/</ext-doc>
-                                <allow-uri-read/>
-                                <docinfo/>
-                                <toc2/>
+                                <allow-uri-read />
+                                <docinfo />
+                                <toc2 />
                                 <icons>font</icons>
                                 <source-highlighter>coderay</source-highlighter>
                             </attributes>

From f23c798a3f39f93694030f95e0026f1e43312d45 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 20 Jul 2017 14:49:51 +0200
Subject: [PATCH 269/808] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e5b05dc35f..85fcd550f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.0.0.RC1</version>
+    <version>5.0.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -68,7 +68,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-        <tag>5.0.0.RC1</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <!-- Required for Spring RC artifacts -->

From ccfc9f4c34a758dab9bc9ec5f813556a1ed5098c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 23 Jul 2017 13:08:42 +0200
Subject: [PATCH 270/808] Polishing

Return constant byte array if remaining count is zero.
---
 .../java/io/lettuce/core/codec/ByteArrayCodec.java  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java b/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
index e117a5f866..ed96e300d3 100644
--- a/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
+++ b/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
@@ -75,11 +75,20 @@ public ByteBuffer encodeKey(byte[] key) {
 
     @Override
     public ByteBuffer encodeValue(byte[] value) {
-        return encodeKey(value);
+
+
+            return encodeKey(value);
     }
 
     private static byte[] getBytes(ByteBuffer buffer) {
-        byte[] b = new byte[buffer.remaining()];
+
+        int remaining = buffer.remaining();
+
+        if (remaining == 0) {
+            return EMPTY;
+        }
+
+        byte[] b = new byte[remaining];
         buffer.get(b);
         return b;
     }

From fb962acb12e74fdcbe2862b8f05ca63d8d6760e0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 23 Jul 2017 00:30:15 +0200
Subject: [PATCH 271/808] Polishing

---
 src/main/java/io/lettuce/core/codec/ByteArrayCodec.java    | 4 +---
 src/main/java/io/lettuce/core/output/BooleanOutput.java    | 4 +++-
 src/main/java/io/lettuce/core/output/ByteArrayOutput.java  | 4 +++-
 src/main/java/io/lettuce/core/output/DateOutput.java       | 4 +++-
 src/main/java/io/lettuce/core/output/DoubleOutput.java     | 7 ++++---
 src/main/java/io/lettuce/core/output/IntegerOutput.java    | 4 +++-
 src/main/java/io/lettuce/core/output/KeyOutput.java        | 4 +++-
 src/main/java/io/lettuce/core/output/KeyScanOutput.java    | 3 +--
 .../io/lettuce/core/output/KeyScanStreamingOutput.java     | 3 +--
 .../java/io/lettuce/core/output/KeyStreamingOutput.java    | 5 ++---
 src/main/java/io/lettuce/core/output/KeyValueOutput.java   | 6 ++++--
 .../io/lettuce/core/output/KeyValueStreamingOutput.java    | 4 ++--
 src/main/java/io/lettuce/core/output/MapScanOutput.java    | 3 +--
 .../java/io/lettuce/core/output/ScoredValueScanOutput.java | 1 -
 .../core/output/ScoredValueScanStreamingOutput.java        | 3 ++-
 .../lettuce/core/output/ScoredValueStreamingChannel.java   | 2 +-
 .../io/lettuce/core/output/ScoredValueStreamingOutput.java | 2 +-
 src/main/java/io/lettuce/core/output/StatusOutput.java     | 7 ++++---
 src/main/java/io/lettuce/core/output/ValueOutput.java      | 4 +++-
 src/main/java/io/lettuce/core/output/ValueScanOutput.java  | 3 +--
 .../io/lettuce/core/output/ValueScanStreamingOutput.java   | 3 +--
 .../java/io/lettuce/core/output/ValueStreamingChannel.java | 3 ++-
 .../java/io/lettuce/core/output/ValueStreamingOutput.java  | 3 ++-
 23 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java b/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
index ed96e300d3..aa0caf64b0 100644
--- a/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
+++ b/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
@@ -75,9 +75,7 @@ public ByteBuffer encodeKey(byte[] key) {
 
     @Override
     public ByteBuffer encodeValue(byte[] value) {
-
-
-            return encodeKey(value);
+        return encodeKey(value);
     }
 
     private static byte[] getBytes(ByteBuffer buffer) {
diff --git a/src/main/java/io/lettuce/core/output/BooleanOutput.java b/src/main/java/io/lettuce/core/output/BooleanOutput.java
index 8fdc696311..91a8695a76 100644
--- a/src/main/java/io/lettuce/core/output/BooleanOutput.java
+++ b/src/main/java/io/lettuce/core/output/BooleanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,10 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public class BooleanOutput<K, V> extends CommandOutput<K, V, Boolean> {
+
     public BooleanOutput(RedisCodec<K, V> codec) {
         super(codec, null);
     }
diff --git a/src/main/java/io/lettuce/core/output/ByteArrayOutput.java b/src/main/java/io/lettuce/core/output/ByteArrayOutput.java
index df4630284d..ab30226d0a 100644
--- a/src/main/java/io/lettuce/core/output/ByteArrayOutput.java
+++ b/src/main/java/io/lettuce/core/output/ByteArrayOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,10 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public class ByteArrayOutput<K, V> extends CommandOutput<K, V, byte[]> {
+
     public ByteArrayOutput(RedisCodec<K, V> codec) {
         super(codec, null);
     }
diff --git a/src/main/java/io/lettuce/core/output/DateOutput.java b/src/main/java/io/lettuce/core/output/DateOutput.java
index d9e9c8c3d1..b279fc4074 100644
--- a/src/main/java/io/lettuce/core/output/DateOutput.java
+++ b/src/main/java/io/lettuce/core/output/DateOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,10 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public class DateOutput<K, V> extends CommandOutput<K, V, Date> {
+
     public DateOutput(RedisCodec<K, V> codec) {
         super(codec, null);
     }
diff --git a/src/main/java/io/lettuce/core/output/DoubleOutput.java b/src/main/java/io/lettuce/core/output/DoubleOutput.java
index 6f0c403fbd..4f48c5ee91 100644
--- a/src/main/java/io/lettuce/core/output/DoubleOutput.java
+++ b/src/main/java/io/lettuce/core/output/DoubleOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  */
 package io.lettuce.core.output;
 
+import static java.lang.Double.parseDouble;
+
 import java.nio.ByteBuffer;
 
 import io.lettuce.core.codec.RedisCodec;
 
-import static java.lang.Double.parseDouble;
-
 /**
  * Double output, may be null.
  *
@@ -29,6 +29,7 @@
  * @author Will Glozer
  */
 public class DoubleOutput<K, V> extends CommandOutput<K, V, Double> {
+
     public DoubleOutput(RedisCodec<K, V> codec) {
         super(codec, null);
     }
diff --git a/src/main/java/io/lettuce/core/output/IntegerOutput.java b/src/main/java/io/lettuce/core/output/IntegerOutput.java
index 26cc79bc0c..e584232651 100644
--- a/src/main/java/io/lettuce/core/output/IntegerOutput.java
+++ b/src/main/java/io/lettuce/core/output/IntegerOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,10 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public class IntegerOutput<K, V> extends CommandOutput<K, V, Long> {
+
     public IntegerOutput(RedisCodec<K, V> codec) {
         super(codec, null);
     }
diff --git a/src/main/java/io/lettuce/core/output/KeyOutput.java b/src/main/java/io/lettuce/core/output/KeyOutput.java
index 7874c89444..d5848642e4 100644
--- a/src/main/java/io/lettuce/core/output/KeyOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,10 @@
  * @param <V> Value type.
  *
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public class KeyOutput<K, V> extends CommandOutput<K, V, K> {
+
     public KeyOutput(RedisCodec<K, V> codec) {
         super(codec, null);
     }
diff --git a/src/main/java/io/lettuce/core/output/KeyScanOutput.java b/src/main/java/io/lettuce/core/output/KeyScanOutput.java
index a733bb19df..288528d048 100644
--- a/src/main/java/io/lettuce/core/output/KeyScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyScanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,5 +37,4 @@ public KeyScanOutput(RedisCodec<K, V> codec) {
     protected void setOutput(ByteBuffer bytes) {
         output.getKeys().add(bytes == null ? null : codec.decodeKey(bytes));
     }
-
 }
diff --git a/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java
index fff2515b1e..072203a7f8 100644
--- a/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,5 +42,4 @@ protected void setOutput(ByteBuffer bytes) {
         channel.onKey(bytes == null ? null : codec.decodeKey(bytes));
         output.setCount(output.getCount() + 1);
     }
-
 }
diff --git a/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java
index f70b8db3db..6c1b281265 100644
--- a/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,9 +25,9 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
- *
  */
 public class KeyStreamingOutput<K, V> extends CommandOutput<K, V, Long> {
+
     private final KeyStreamingChannel<K> channel;
 
     public KeyStreamingOutput(RedisCodec<K, V> codec, KeyStreamingChannel<K> channel) {
@@ -41,5 +41,4 @@ public void set(ByteBuffer bytes) {
         channel.onKey(bytes == null ? null : codec.decodeKey(bytes));
         output = output.longValue() + 1;
     }
-
 }
diff --git a/src/main/java/io/lettuce/core/output/KeyValueOutput.java b/src/main/java/io/lettuce/core/output/KeyValueOutput.java
index 4acb015f86..79b626794e 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,11 @@
  *
  * @param <K> Key type.
  * @param <V> Value type.
- *
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public class KeyValueOutput<K, V> extends CommandOutput<K, V, KeyValue<K, V>> {
+
     private K key;
 
     public KeyValueOutput(RedisCodec<K, V> codec) {
@@ -37,6 +38,7 @@ public KeyValueOutput(RedisCodec<K, V> codec) {
 
     @Override
     public void set(ByteBuffer bytes) {
+
         if (bytes != null) {
             if (key == null) {
                 key = codec.decodeKey(bytes);
diff --git a/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java
index 7052abf680..d292835aad 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
  *
  * @param <K> Key type.
  * @param <V> Value type.
- *
  * @author Mark Paluch
  */
 public class KeyValueStreamingOutput<K, V> extends CommandOutput<K, V, Long> {
@@ -48,6 +47,7 @@ public KeyValueStreamingOutput(RedisCodec<K, V> codec, KeyValueStreamingChannel<
 
     @Override
     public void set(ByteBuffer bytes) {
+
         if (keys == null) {
             if (key == null) {
                 key = codec.decodeKey(bytes);
diff --git a/src/main/java/io/lettuce/core/output/MapScanOutput.java b/src/main/java/io/lettuce/core/output/MapScanOutput.java
index 0014f4b390..ea68847efa 100644
--- a/src/main/java/io/lettuce/core/output/MapScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/MapScanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,5 +47,4 @@ protected void setOutput(ByteBuffer bytes) {
         output.getMap().put(key, value);
         key = null;
     }
-
 }
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
index 73bdd218fc..2ee0d9ae5f 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
@@ -49,5 +49,4 @@ protected void setOutput(ByteBuffer bytes) {
         output.getValues().add(ScoredValue.fromNullable(score, value));
         value = null;
     }
-
 }
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
index 5015578ae3..020acfb862 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
@@ -31,9 +31,10 @@
  */
 public class ScoredValueScanStreamingOutput<K, V> extends ScanOutput<K, V, StreamScanCursor> {
 
-    private V value;
     private final ScoredValueStreamingChannel<V> channel;
 
+    private V value;
+
     public ScoredValueScanStreamingOutput(RedisCodec<K, V> codec, ScoredValueStreamingChannel<V> channel) {
         super(codec, new StreamScanCursor());
         this.channel = channel;
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java
index f08e849444..5b71a8b0e9 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
index e431d61d4b..6ddbc74bc8 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
@@ -29,6 +29,7 @@
  * @param <V> Value type.
  */
 public class ScoredValueStreamingOutput<K, V> extends CommandOutput<K, V, Long> {
+
     private V value;
     private final ScoredValueStreamingChannel<V> channel;
 
@@ -50,5 +51,4 @@ public void set(ByteBuffer bytes) {
         value = null;
         output = output.longValue() + 1;
     }
-
 }
diff --git a/src/main/java/io/lettuce/core/output/StatusOutput.java b/src/main/java/io/lettuce/core/output/StatusOutput.java
index 5877b8d466..593e476678 100644
--- a/src/main/java/io/lettuce/core/output/StatusOutput.java
+++ b/src/main/java/io/lettuce/core/output/StatusOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  */
 package io.lettuce.core.output;
 
+import static io.lettuce.core.protocol.LettuceCharsets.buffer;
+
 import java.nio.ByteBuffer;
 
 import io.lettuce.core.codec.RedisCodec;
 
-import static io.lettuce.core.protocol.LettuceCharsets.buffer;
-
 /**
  * Status message output.
  *
@@ -29,6 +29,7 @@
  * @author Will Glozer
  */
 public class StatusOutput<K, V> extends CommandOutput<K, V, String> {
+
     private static final ByteBuffer OK = buffer("OK");
 
     public StatusOutput(RedisCodec<K, V> codec) {
diff --git a/src/main/java/io/lettuce/core/output/ValueOutput.java b/src/main/java/io/lettuce/core/output/ValueOutput.java
index 1cc33d3ad7..a2eb069bc1 100644
--- a/src/main/java/io/lettuce/core/output/ValueOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,10 @@
  * @param <V> Value type.
  *
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public class ValueOutput<K, V> extends CommandOutput<K, V, V> {
+
     public ValueOutput(RedisCodec<K, V> codec) {
         super(codec, null);
     }
diff --git a/src/main/java/io/lettuce/core/output/ValueScanOutput.java b/src/main/java/io/lettuce/core/output/ValueScanOutput.java
index 068f930c6f..ee397e6794 100644
--- a/src/main/java/io/lettuce/core/output/ValueScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueScanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,5 +37,4 @@ public ValueScanOutput(RedisCodec<K, V> codec) {
     protected void setOutput(ByteBuffer bytes) {
         output.getValues().add(bytes == null ? null : codec.decodeValue(bytes));
     }
-
 }
diff --git a/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java
index a10b3a8e3f..9a068258e5 100644
--- a/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,5 +42,4 @@ protected void setOutput(ByteBuffer bytes) {
         channel.onValue(bytes == null ? null : codec.decodeValue(bytes));
         output.setCount(output.getCount() + 1);
     }
-
 }
diff --git a/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java
index fd47ce28dd..53e5b363a2 100644
--- a/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
  */
 @FunctionalInterface
 public interface ValueStreamingChannel<V> {
+
     /**
      * Called on every incoming value.
      *
diff --git a/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java
index a948a84cb0..91d48d35e0 100644
--- a/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
  * @author Mark Paluch
  */
 public class ValueStreamingOutput<K, V> extends CommandOutput<K, V, Long> {
+
     private final ValueStreamingChannel<V> channel;
 
     public ValueStreamingOutput(RedisCodec<K, V> codec, ValueStreamingChannel<V> channel) {

From b44c1d2aa7ceca8326758ef4e67b317c511b0302 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 23 Jul 2017 00:47:49 +0200
Subject: [PATCH 272/808] Allocate lazily of array outputs targets #573

Lettuce now allocates lazily array output targets (Maps, ArrayList) with the appropriate size initialization. Optimize Subscriber to pass in the target to avoid ListSubscriber instances and convert it to a class for improved CHA/omit call-devirtualization.
---
 .../java/io/lettuce/core/RedisPublisher.java  | 25 +++--
 .../io/lettuce/core/output/ArrayOutput.java   | 17 +++-
 .../core/output/BooleanListOutput.java        | 21 +++-
 .../core/output/GeoCoordinatesListOutput.java | 38 ++++++--
 .../output/GeoCoordinatesValueListOutput.java | 21 ++--
 .../core/output/GeoWithinListOutput.java      | 14 +--
 .../io/lettuce/core/output/KeyListOutput.java | 22 +++--
 .../core/output/KeyValueListOutput.java       | 24 +++--
 .../lettuce/core/output/ListOfMapsOutput.java |  8 +-
 .../lettuce/core/output/ListSubscriber.java   | 27 +++---
 .../io/lettuce/core/output/MapOutput.java     | 14 ++-
 .../io/lettuce/core/output/MultiOutput.java   |  2 +-
 .../core/output/NestedMultiOutput.java        | 16 +++-
 .../io/lettuce/core/output/OutputFactory.java | 42 ++++++++
 .../core/output/ScoredValueListOutput.java    | 21 +++-
 .../lettuce/core/output/StreamingOutput.java  | 21 +++-
 .../lettuce/core/output/StringListOutput.java | 43 +++++----
 .../core/output/StringValueListOutput.java    | 22 +++--
 .../lettuce/core/output/ValueListOutput.java  | 22 +++--
 .../lettuce/core/output/ValueSetOutput.java   | 18 +++-
 .../core/output/ValueValueListOutput.java     | 21 ++--
 .../core/output/BooleanListOutputTest.java    |  5 +-
 .../output/GeoCoordinatesListOutputTest.java  |  5 +-
 .../GeoCoordinatesValueListOutputTest.java    | 21 ++--
 .../core/output/GeoWithinListOutputTest.java  | 23 +++--
 .../lettuce/core/output/ListOutputTest.java   | 11 ++-
 .../output/ScoredValueListOutputTest.java     | 13 ++-
 src/test/jmh/io/lettuce/core/JmhMain.java     | 81 ++++++++++++++++
 .../io/lettuce/core/RedisClientBenchmark.java | 24 ++++-
 .../jmh/io/lettuce/core/output/JmhMain.java   | 56 +++++++++++
 .../core/output/ValueListOutputBenchmark.java | 95 +++++++++++++++++++
 31 files changed, 639 insertions(+), 154 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/output/OutputFactory.java
 create mode 100644 src/test/jmh/io/lettuce/core/JmhMain.java
 create mode 100644 src/test/jmh/io/lettuce/core/output/JmhMain.java
 create mode 100644 src/test/jmh/io/lettuce/core/output/ValueListOutputBenchmark.java

diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index f1e178b618..5ec73b3209 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -16,7 +16,6 @@
 package io.lettuce.core;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Queue;
@@ -123,7 +122,7 @@ public void subscribe(Subscriber<? super T> subscriber) {
      *
      * @param <T> data element type
      */
-    static class RedisSubscription<T> implements Subscription, StreamingOutput.Subscriber<T> {
+    static class RedisSubscription<T> extends StreamingOutput.Subscriber<T> implements Subscription {
 
         static final InternalLogger LOG = InternalLoggerFactory.getInstance(RedisPublisher.class);
 
@@ -162,8 +161,7 @@ static class RedisSubscription<T> implements Subscription, StreamingOutput.Subsc
                 StreamingOutput<T> streamingOutput = (StreamingOutput<T>) command.getOutput();
 
                 if (connection instanceof StatefulRedisConnection<?, ?> && ((StatefulRedisConnection) connection).isMulti()) {
-                    streamingOutput.setSubscriber(new CompositeSubscriber<>(
-                            Arrays.asList(this, streamingOutput.getSubscriber())));
+                    streamingOutput.setSubscriber(new CompositeSubscriber<>(this, streamingOutput.getSubscriber()));
                 } else {
                     streamingOutput.setSubscriber(this);
                 }
@@ -699,17 +697,26 @@ private void onError(Throwable throwable) {
      *
      * @param <T> element type
      */
-    private static class CompositeSubscriber<T> implements StreamingOutput.Subscriber<T> {
+    private static class CompositeSubscriber<T> extends StreamingOutput.Subscriber<T> {
 
-        private final Collection<StreamingOutput.Subscriber<T>> subscribers;
+        private final StreamingOutput.Subscriber<T> first;
+        private final StreamingOutput.Subscriber<T> second;
 
-        CompositeSubscriber(Collection<StreamingOutput.Subscriber<T>> subscribers) {
-            this.subscribers = subscribers;
+        public CompositeSubscriber(StreamingOutput.Subscriber<T> first, StreamingOutput.Subscriber<T> second) {
+            this.first = first;
+            this.second = second;
         }
 
         @Override
         public void onNext(T t) {
-            subscribers.forEach(subscriber -> subscriber.onNext(t));
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void onNext(Collection<T> outputTarget, T t) {
+
+            first.onNext(outputTarget, t);
+            second.onNext(outputTarget, t);
         }
     }
 }
diff --git a/src/main/java/io/lettuce/core/output/ArrayOutput.java b/src/main/java/io/lettuce/core/output/ArrayOutput.java
index 2816154513..88fa1faa01 100644
--- a/src/main/java/io/lettuce/core/output/ArrayOutput.java
+++ b/src/main/java/io/lettuce/core/output/ArrayOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import java.nio.ByteBuffer;
 import java.util.ArrayDeque;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Deque;
 import java.util.List;
 
@@ -29,15 +29,16 @@
  *
  * @param <K> Key type.
  * @param <V> Value type.
- *
  * @author Mark Paluch
  */
 public class ArrayOutput<K, V> extends CommandOutput<K, V, List<Object>> {
+
+    private boolean initialized;
     private Deque<Integer> counts = new ArrayDeque<Integer>();
     private Deque<List<Object>> stack = new ArrayDeque<List<Object>>();
 
     public ArrayOutput(RedisCodec<K, V> codec) {
-        super(codec, new ArrayList<>());
+        super(codec, Collections.emptyList());
     }
 
     @Override
@@ -72,10 +73,16 @@ public void complete(int depth) {
 
     @Override
     public void multi(int count) {
+
+        if (!initialized) {
+            output = OutputFactory.newList(count);
+            initialized = true;
+        }
+
         if (stack.isEmpty()) {
             stack.push(output);
         } else {
-            stack.push(new ArrayList<>(count));
+            stack.push(OutputFactory.newList(count));
 
         }
         counts.push(count);
diff --git a/src/main/java/io/lettuce/core/output/BooleanListOutput.java b/src/main/java/io/lettuce/core/output/BooleanListOutput.java
index 7b2c1e6e9b..7938b1059f 100644
--- a/src/main/java/io/lettuce/core/output/BooleanListOutput.java
+++ b/src/main/java/io/lettuce/core/output/BooleanListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core.output;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import io.lettuce.core.codec.RedisCodec;
@@ -27,19 +27,30 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public class BooleanListOutput<K, V> extends CommandOutput<K, V, List<Boolean>> implements StreamingOutput<Boolean> {
 
+    private boolean initialized;
     private Subscriber<Boolean> subscriber;
 
     public BooleanListOutput(RedisCodec<K, V> codec) {
-        super(codec, new ArrayList<>());
-        setSubscriber(ListSubscriber.of(output));
+        super(codec, Collections.emptyList());
+        setSubscriber(ListSubscriber.instance());
     }
 
     @Override
     public void set(long integer) {
-        subscriber.onNext((integer == 1) ? Boolean.TRUE : Boolean.FALSE);
+        subscriber.onNext(output, (integer == 1) ? Boolean.TRUE : Boolean.FALSE);
+    }
+
+    @Override
+    public void multi(int count) {
+
+        if (!initialized) {
+            output = OutputFactory.newList(count);
+            initialized = true;
+        }
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
index cd70831b95..538034dc19 100644
--- a/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,11 +18,10 @@
 import static java.lang.Double.parseDouble;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import io.lettuce.core.GeoCoordinates;
-import io.lettuce.core.Value;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.internal.LettuceAssert;
 
@@ -31,13 +30,17 @@
  *
  * @author Mark Paluch
  */
-public class GeoCoordinatesListOutput<K, V> extends CommandOutput<K, V, List<GeoCoordinates>>  {
+public class GeoCoordinatesListOutput<K, V> extends CommandOutput<K, V, List<GeoCoordinates>> implements
+        StreamingOutput<GeoCoordinates> {
 
     private Double x;
+    private boolean initialized;
+    private Subscriber<GeoCoordinates> subscriber;
 
-	public GeoCoordinatesListOutput(RedisCodec<K, V> codec) {
-        super(codec, new ArrayList<>());
-	}
+    public GeoCoordinatesListOutput(RedisCodec<K, V> codec) {
+        super(codec, Collections.emptyList());
+        setSubscriber(ListSubscriber.instance());
+    }
 
     @Override
     public void set(ByteBuffer bytes) {
@@ -49,14 +52,31 @@ public void set(ByteBuffer bytes) {
             return;
         }
 
-        output.add(new GeoCoordinates(x, value));
+        subscriber.onNext(output, new GeoCoordinates(x, value));
         x = null;
     }
 
     @Override
     public void multi(int count) {
+
+        if (!initialized) {
+            output = OutputFactory.newList(count / 2);
+            initialized = true;
+        }
+
         if (count == -1) {
-            output.add(null);
+            subscriber.onNext(output, null);
         }
     }
+
+    @Override
+    public void setSubscriber(Subscriber<GeoCoordinates> subscriber) {
+        LettuceAssert.notNull(subscriber, "Subscriber must not be null");
+        this.subscriber = subscriber;
+    }
+
+    @Override
+    public Subscriber<GeoCoordinates> getSubscriber() {
+        return subscriber;
+    }
 }
diff --git a/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
index 6bd381cffc..07dbc68007 100644
--- a/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
@@ -18,7 +18,7 @@
 import static java.lang.Double.parseDouble;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import io.lettuce.core.GeoCoordinates;
@@ -31,15 +31,16 @@
  *
  * @author Mark Paluch
  */
-public class GeoCoordinatesValueListOutput<K, V> extends CommandOutput<K, V, List<Value<GeoCoordinates>>>
-        implements StreamingOutput<Value<GeoCoordinates>> {
+public class GeoCoordinatesValueListOutput<K, V> extends CommandOutput<K, V, List<Value<GeoCoordinates>>> implements
+        StreamingOutput<Value<GeoCoordinates>> {
 
     private Double x;
+    private boolean initialized;
     private Subscriber<Value<GeoCoordinates>> subscriber;
 
     public GeoCoordinatesValueListOutput(RedisCodec<K, V> codec) {
-        super(codec, new ArrayList<>());
-        setSubscriber(ListSubscriber.of(output));
+        super(codec, Collections.emptyList());
+        setSubscriber(ListSubscriber.instance());
     }
 
     @Override
@@ -52,14 +53,20 @@ public void set(ByteBuffer bytes) {
             return;
         }
 
-        subscriber.onNext(Value.fromNullable(new GeoCoordinates(x, value)));
+        subscriber.onNext(output, Value.fromNullable(new GeoCoordinates(x, value)));
         x = null;
     }
 
     @Override
     public void multi(int count) {
+
+        if (!initialized) {
+            output = OutputFactory.newList(count / 2);
+            initialized = true;
+        }
+
         if (count == -1) {
-            subscriber.onNext(Value.empty());
+            subscriber.onNext(output, Value.empty());
         }
     }
 
diff --git a/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java b/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
index 9e39a47413..7c5b23e6eb 100644
--- a/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 import static java.lang.Double.parseDouble;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
 import java.util.List;
 
 import io.lettuce.core.GeoCoordinates;
@@ -31,8 +30,7 @@
  *
  * @author Mark Paluch
  */
-public class GeoWithinListOutput<K, V> extends CommandOutput<K, V, List<GeoWithin<V>>>
-        implements StreamingOutput<GeoWithin<V>> {
+public class GeoWithinListOutput<K, V> extends CommandOutput<K, V, List<GeoWithin<V>>> implements StreamingOutput<GeoWithin<V>> {
 
     private V member;
     private Double distance;
@@ -47,15 +45,16 @@ public class GeoWithinListOutput<K, V> extends CommandOutput<K, V, List<GeoWithi
     private Subscriber<GeoWithin<V>> subscriber;
 
     public GeoWithinListOutput(RedisCodec<K, V> codec, boolean withDistance, boolean withHash, boolean withCoordinates) {
-        super(codec, new ArrayList<>());
+        super(codec, OutputFactory.newList(16));
         this.withDistance = withDistance;
         this.withHash = withHash;
         this.withCoordinates = withCoordinates;
-        setSubscriber(ListSubscriber.of(output));
+        setSubscriber(ListSubscriber.instance());
     }
 
     @Override
     public void set(long integer) {
+
         if (member == null) {
             member = (V) (Long) integer;
             return;
@@ -94,8 +93,9 @@ public void set(ByteBuffer bytes) {
 
     @Override
     public void complete(int depth) {
+
         if (depth == 1) {
-            subscriber.onNext(new GeoWithin<V>(member, distance, geohash, coordinates));
+            subscriber.onNext(output, new GeoWithin<V>(member, distance, geohash, coordinates));
 
             member = null;
             distance = null;
diff --git a/src/main/java/io/lettuce/core/output/KeyListOutput.java b/src/main/java/io/lettuce/core/output/KeyListOutput.java
index 950dd58984..8a0a3b1382 100644
--- a/src/main/java/io/lettuce/core/output/KeyListOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import io.lettuce.core.codec.RedisCodec;
@@ -27,21 +27,31 @@
  *
  * @param <K> Key type.
  * @param <V> Value type.
- *
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public class KeyListOutput<K, V> extends CommandOutput<K, V, List<K>> implements StreamingOutput<K> {
 
+    private boolean initialized;
     private Subscriber<K> subscriber;
 
     public KeyListOutput(RedisCodec<K, V> codec) {
-        super(codec, new ArrayList<>());
-        setSubscriber(ListSubscriber.of(output));
+        super(codec, Collections.emptyList());
+        setSubscriber(ListSubscriber.instance());
     }
 
     @Override
     public void set(ByteBuffer bytes) {
-        subscriber.onNext(codec.decodeKey(bytes));
+        subscriber.onNext(output, codec.decodeKey(bytes));
+    }
+
+    @Override
+    public void multi(int count) {
+
+        if (!initialized) {
+            output = OutputFactory.newList(count);
+            initialized = true;
+        }
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/output/KeyValueListOutput.java b/src/main/java/io/lettuce/core/output/KeyValueListOutput.java
index 001ef201a9..68649a593e 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueListOutput.java
@@ -16,7 +16,7 @@
 package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -32,27 +32,37 @@
  *
  * @author Mark Paluch
  */
-public class KeyValueListOutput<K, V> extends CommandOutput<K, V, List<KeyValue<K, V>>>
-        implements StreamingOutput<KeyValue<K, V>> {
+public class KeyValueListOutput<K, V> extends CommandOutput<K, V, List<KeyValue<K, V>>> implements
+        StreamingOutput<KeyValue<K, V>> {
 
+    private boolean initialized;
     private Subscriber<KeyValue<K, V>> subscriber;
     private Iterable<K> keys;
     private Iterator<K> keyIterator;
 
     public KeyValueListOutput(RedisCodec<K, V> codec, Iterable<K> keys) {
-        super(codec, new ArrayList<>());
-        setSubscriber(ListSubscriber.of(output));
+        super(codec, Collections.emptyList());
+        setSubscriber(ListSubscriber.instance());
         this.keys = keys;
     }
 
     @Override
     public void set(ByteBuffer bytes) {
 
-        if(keyIterator == null) {
+        if (keyIterator == null) {
             keyIterator = keys.iterator();
         }
 
-        subscriber.onNext(KeyValue.fromNullable(keyIterator.next(), bytes == null ? null : codec.decodeValue(bytes)));
+        subscriber.onNext(output, KeyValue.fromNullable(keyIterator.next(), bytes == null ? null : codec.decodeValue(bytes)));
+    }
+
+    @Override
+    public void multi(int count) {
+
+        if (!initialized) {
+            output = OutputFactory.newList(count);
+            initialized = true;
+        }
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java b/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java
index e4fb298571..a9bd27cedc 100644
--- a/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java
+++ b/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,9 +32,10 @@
  * @author Will Glozer
  */
 public class ListOfMapsOutput<K, V> extends CommandOutput<K, V, List<Map<K, V>>> {
+
     private MapOutput<K, V> nested;
     private int mapCount = -1;
-    private List<Integer> counts = new ArrayList<>();
+    private final List<Integer> counts = new ArrayList<>();
 
     public ListOfMapsOutput(RedisCodec<K, V> codec) {
         super(codec, new ArrayList<>());
@@ -62,6 +63,9 @@ public void complete(int depth) {
 
     @Override
     public void multi(int count) {
+
+        nested.multi(count);
+
         if (mapCount == -1) {
             mapCount = count;
         } else {
diff --git a/src/main/java/io/lettuce/core/output/ListSubscriber.java b/src/main/java/io/lettuce/core/output/ListSubscriber.java
index 1b9aaab8e4..5a128a5ff0 100644
--- a/src/main/java/io/lettuce/core/output/ListSubscriber.java
+++ b/src/main/java/io/lettuce/core/output/ListSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,32 +15,35 @@
  */
 package io.lettuce.core.output;
 
-import java.util.List;
+import java.util.Collection;
 
-import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.output.StreamingOutput.Subscriber;
 
 /**
  * Simple subscriber
+ *
  * @author Mark Paluch
  * @since 4.2
  */
-class ListSubscriber<T> implements Subscriber<T> {
+class ListSubscriber<T> extends Subscriber<T> {
 
-    private List<T> target;
+    private final static ListSubscriber<Object> INSTANCE = new ListSubscriber<>();
 
-    private ListSubscriber(List<T> target) {
+    private ListSubscriber() {
+    }
 
-        LettuceAssert.notNull(target, "Target must not be null");
-		this.target = target;
+    @SuppressWarnings("unchecked")
+    public static <T> ListSubscriber<T> instance() {
+        return (ListSubscriber<T>) INSTANCE;
     }
 
     @Override
     public void onNext(T t) {
-        target.add(t);
+        throw new UnsupportedOperationException();
     }
 
-    static <T> ListSubscriber<T> of(List<T> target) {
-		return new ListSubscriber<>(target);
-	}
+    @Override
+    public void onNext(Collection<T> outputTarget, T t) {
+        outputTarget.add(t);
+    }
 }
diff --git a/src/main/java/io/lettuce/core/output/MapOutput.java b/src/main/java/io/lettuce/core/output/MapOutput.java
index e30cb4e04f..d59b52aa9d 100644
--- a/src/main/java/io/lettuce/core/output/MapOutput.java
+++ b/src/main/java/io/lettuce/core/output/MapOutput.java
@@ -28,16 +28,19 @@
  * @param <V> Value type.
  *
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public class MapOutput<K, V> extends CommandOutput<K, V, Map<K, V>> {
+
     private K key;
 
     public MapOutput(RedisCodec<K, V> codec) {
-        super(codec, new LinkedHashMap<>());
+        super(codec, null);
     }
 
     @Override
     public void set(ByteBuffer bytes) {
+
         if (key == null) {
             key = codec.decodeKey(bytes);
             return;
@@ -51,6 +54,7 @@ public void set(ByteBuffer bytes) {
     @Override
     @SuppressWarnings("unchecked")
     public void set(long integer) {
+
         if (key == null) {
             key = (K) Long.valueOf(integer);
             return;
@@ -60,4 +64,12 @@ public void set(long integer) {
         output.put(key, value);
         key = null;
     }
+
+    @Override
+    public void multi(int count) {
+
+        if (output == null) {
+            output = new LinkedHashMap<>(count / 2, 1);
+        }
+    }
 }
diff --git a/src/main/java/io/lettuce/core/output/MultiOutput.java b/src/main/java/io/lettuce/core/output/MultiOutput.java
index c00eeb7bdf..098402504a 100644
--- a/src/main/java/io/lettuce/core/output/MultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/MultiOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/NestedMultiOutput.java b/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
index a59460b1b5..9afd0b1a65 100644
--- a/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Deque;
 import java.util.List;
 
@@ -31,11 +31,13 @@
  * @author Will Glozer
  */
 public class NestedMultiOutput<K, V> extends CommandOutput<K, V, List<Object>> {
+
     private final Deque<List<Object>> stack;
     private int depth;
+    private boolean initialized;
 
     public NestedMultiOutput(RedisCodec<K, V> codec) {
-        super(codec, new ArrayList<>());
+        super(codec, Collections.emptyList());
         stack = LettuceFactories.newSpScQueue();
         depth = 0;
     }
@@ -60,7 +62,13 @@ public void complete(int depth) {
 
     @Override
     public void multi(int count) {
-        List<Object> a = new ArrayList<>(count);
+
+        if (!initialized) {
+            output = OutputFactory.newList(count);
+            initialized = true;
+        }
+
+        List<Object> a = OutputFactory.newList(count);
         output.add(a);
         stack.push(output);
         output = a;
diff --git a/src/main/java/io/lettuce/core/output/OutputFactory.java b/src/main/java/io/lettuce/core/output/OutputFactory.java
new file mode 100644
index 0000000000..b135e4d739
--- /dev/null
+++ b/src/main/java/io/lettuce/core/output/OutputFactory.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.output;
+
+import java.util.*;
+
+/**
+ * @author Mark Paluch
+ */
+class OutputFactory {
+
+    static <T> List<T> newList(int capacity) {
+
+        if (capacity < 1) {
+            return Collections.emptyList();
+        }
+
+        return new ArrayList<>(Math.max(1, capacity));
+    }
+
+    static <V> Set<V> newSet(int capacity) {
+
+        if (capacity < 1) {
+            return Collections.emptySet();
+        }
+
+        return new HashSet<>(capacity, 1);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
index 478d956858..45de974260 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
@@ -16,7 +16,7 @@
 package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import io.lettuce.core.LettuceStrings;
@@ -34,26 +34,37 @@
 public class ScoredValueListOutput<K, V> extends CommandOutput<K, V, List<ScoredValue<V>>> implements
         StreamingOutput<ScoredValue<V>> {
 
-    private V value;
+    private boolean initialized;
     private Subscriber<ScoredValue<V>> subscriber;
+    private V value;
 
     public ScoredValueListOutput(RedisCodec<K, V> codec) {
-        super(codec, new ArrayList<>());
-        setSubscriber(ListSubscriber.of(output));
+        super(codec, Collections.emptyList());
+        setSubscriber(ListSubscriber.instance());
     }
 
     @Override
     public void set(ByteBuffer bytes) {
+
         if (value == null) {
             value = codec.decodeValue(bytes);
             return;
         }
 
         double score = LettuceStrings.toDouble(decodeAscii(bytes));
-        subscriber.onNext(ScoredValue.fromNullable(score, value));
+        subscriber.onNext(output, ScoredValue.fromNullable(score, value));
         value = null;
     }
 
+    @Override
+    public void multi(int count) {
+
+        if (!initialized) {
+            output = OutputFactory.newList(count);
+            initialized = true;
+        }
+    }
+
     @Override
     public void setSubscriber(Subscriber<ScoredValue<V>> subscriber) {
         LettuceAssert.notNull(subscriber, "Subscriber must not be null");
diff --git a/src/main/java/io/lettuce/core/output/StreamingOutput.java b/src/main/java/io/lettuce/core/output/StreamingOutput.java
index 14ea0082d3..880463fa3b 100644
--- a/src/main/java/io/lettuce/core/output/StreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/StreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,11 @@
  */
 package io.lettuce.core.output;
 
+import java.util.Collection;
+
 /**
  * Implementors of this class support a streaming {@link CommandOutput} while the command is still processed. The receiving
- * {@link Subscriber} receives {@link Subscriber#onNext(Object)} calls while the command is active.
+ * {@link Subscriber} receives {@link Subscriber#onNext(Collection, Object)} calls while the command is active.
  *
  * @author Mark Paluch
  * @since 4.2
@@ -43,14 +45,23 @@ public interface StreamingOutput<T> {
      *
      * @param <T>
      */
-    interface Subscriber<T> {
+    abstract class Subscriber<T> {
 
         /**
          * Data notification sent by the {@link StreamingOutput}.
          *
          * @param t element
          */
-        void onNext(T t);
-    }
+        public abstract void onNext(T t);
 
+        /**
+         * Data notification sent by the {@link StreamingOutput}.
+         *
+         * @param outputTarget target
+         * @param t element
+         */
+        public void onNext(Collection<T> outputTarget, T t) {
+            onNext(t);
+        }
+    }
 }
diff --git a/src/main/java/io/lettuce/core/output/StringListOutput.java b/src/main/java/io/lettuce/core/output/StringListOutput.java
index e99fccd05a..40c47fcfa0 100644
--- a/src/main/java/io/lettuce/core/output/StringListOutput.java
+++ b/src/main/java/io/lettuce/core/output/StringListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import io.lettuce.core.codec.RedisCodec;
@@ -28,29 +28,40 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
+ * @author Mark Paluch
  */
-public class StringListOutput<K, V> extends CommandOutput<K, V, List<String>> implements StreamingOutput<String>{
+public class StringListOutput<K, V> extends CommandOutput<K, V, List<String>> implements StreamingOutput<String> {
 
-	private Subscriber<String> subscriber;
+    private boolean initialized;
+    private Subscriber<String> subscriber;
 
-	public StringListOutput(RedisCodec<K, V> codec) {
-		super(codec, new ArrayList<>());
-		setSubscriber(ListSubscriber.of(output));
+    public StringListOutput(RedisCodec<K, V> codec) {
+        super(codec, Collections.emptyList());
+        setSubscriber(ListSubscriber.instance());
     }
 
     @Override
     public void set(ByteBuffer bytes) {
-        subscriber.onNext(bytes == null ? null : decodeAscii(bytes));
+        subscriber.onNext(output, bytes == null ? null : decodeAscii(bytes));
     }
 
-	@Override
-	public void setSubscriber(Subscriber<String> subscriber) {
+    @Override
+    public void multi(int count) {
+
+        if (!initialized) {
+            output = OutputFactory.newList(count);
+            initialized = true;
+        }
+    }
+
+    @Override
+    public void setSubscriber(Subscriber<String> subscriber) {
         LettuceAssert.notNull(subscriber, "Subscriber must not be null");
-		this.subscriber = subscriber;
-	}
+        this.subscriber = subscriber;
+    }
 
-	@Override
-	public Subscriber<String> getSubscriber() {
-		return subscriber;
-	}
+    @Override
+    public Subscriber<String> getSubscriber() {
+        return subscriber;
+    }
 }
diff --git a/src/main/java/io/lettuce/core/output/StringValueListOutput.java b/src/main/java/io/lettuce/core/output/StringValueListOutput.java
index d3eaff0b5d..0a355bbf1e 100644
--- a/src/main/java/io/lettuce/core/output/StringValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/StringValueListOutput.java
@@ -16,7 +16,7 @@
 package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import io.lettuce.core.Value;
@@ -31,19 +31,29 @@
  * @author Mark Paluch
  * @since 5.0
  */
-public class StringValueListOutput<K, V> extends CommandOutput<K, V, List<Value<String>>>
-        implements StreamingOutput<Value<String>> {
+public class StringValueListOutput<K, V> extends CommandOutput<K, V, List<Value<String>>> implements
+        StreamingOutput<Value<String>> {
 
+    private boolean initialized;
     private Subscriber<Value<String>> subscriber;
 
     public StringValueListOutput(RedisCodec<K, V> codec) {
-        super(codec, new ArrayList<>());
-        setSubscriber(ListSubscriber.of(output));
+        super(codec, Collections.emptyList());
+        setSubscriber(ListSubscriber.instance());
     }
 
     @Override
     public void set(ByteBuffer bytes) {
-        subscriber.onNext(bytes == null ? Value.empty() : Value.fromNullable(decodeAscii(bytes)));
+        subscriber.onNext(output, bytes == null ? Value.empty() : Value.fromNullable(decodeAscii(bytes)));
+    }
+
+    @Override
+    public void multi(int count) {
+
+        if (!initialized) {
+            output = OutputFactory.newList(count);
+            initialized = true;
+        }
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/output/ValueListOutput.java b/src/main/java/io/lettuce/core/output/ValueListOutput.java
index 138030ec07..dee1d6d615 100644
--- a/src/main/java/io/lettuce/core/output/ValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import io.lettuce.core.codec.RedisCodec;
@@ -27,21 +27,31 @@
  *
  * @param <K> Key type.
  * @param <V> Value type.
- *
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public class ValueListOutput<K, V> extends CommandOutput<K, V, List<V>> implements StreamingOutput<V> {
 
+    private boolean initialized;
     private Subscriber<V> subscriber;
 
     public ValueListOutput(RedisCodec<K, V> codec) {
-        super(codec, new ArrayList<>());
-        setSubscriber(ListSubscriber.of(output));
+        super(codec, Collections.emptyList());
+        setSubscriber(ListSubscriber.instance());
     }
 
     @Override
     public void set(ByteBuffer bytes) {
-        subscriber.onNext(bytes == null ? null : codec.decodeValue(bytes));
+        subscriber.onNext(output, bytes == null ? null : codec.decodeValue(bytes));
+    }
+
+    @Override
+    public void multi(int count) {
+
+        if (!initialized) {
+            output = OutputFactory.newList(count);
+            initialized = true;
+        }
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/output/ValueSetOutput.java b/src/main/java/io/lettuce/core/output/ValueSetOutput.java
index db0f75dae6..035272323d 100644
--- a/src/main/java/io/lettuce/core/output/ValueSetOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueSetOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
-import java.util.HashSet;
+import java.util.Collections;
 import java.util.Set;
 
 import io.lettuce.core.codec.RedisCodec;
@@ -30,12 +30,24 @@
  * @author Will Glozer
  */
 public class ValueSetOutput<K, V> extends CommandOutput<K, V, Set<V>> {
+
+    private boolean initialized;
+
     public ValueSetOutput(RedisCodec<K, V> codec) {
-        super(codec, new HashSet<>());
+        super(codec, Collections.emptySet());
     }
 
     @Override
     public void set(ByteBuffer bytes) {
         output.add(bytes == null ? null : codec.decodeValue(bytes));
     }
+
+    @Override
+    public void multi(int count) {
+
+        if (!initialized) {
+            output = OutputFactory.newSet(count);
+            initialized = true;
+        }
+    }
 }
diff --git a/src/main/java/io/lettuce/core/output/ValueValueListOutput.java b/src/main/java/io/lettuce/core/output/ValueValueListOutput.java
index e08f718a9d..1d667f6f59 100644
--- a/src/main/java/io/lettuce/core/output/ValueValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueValueListOutput.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011-2016 the original author or authors.
  *
@@ -17,7 +16,7 @@
 package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import io.lettuce.core.Value;
@@ -34,21 +33,31 @@
  */
 public class ValueValueListOutput<K, V> extends CommandOutput<K, V, List<Value<V>>> implements StreamingOutput<Value<V>> {
 
+    private boolean initialized;
     private Subscriber<Value<V>> subscriber;
 
     public ValueValueListOutput(RedisCodec<K, V> codec) {
-        super(codec, new ArrayList<>());
-        setSubscriber(ListSubscriber.of(output));
+        super(codec, Collections.emptyList());
+        setSubscriber(ListSubscriber.instance());
     }
 
     @Override
     public void set(ByteBuffer bytes) {
-        subscriber.onNext(Value.fromNullable(bytes == null ? null : codec.decodeValue(bytes)));
+        subscriber.onNext(output, Value.fromNullable(bytes == null ? null : codec.decodeValue(bytes)));
     }
 
     @Override
     public void set(long integer) {
-        subscriber.onNext(Value.fromNullable((V) Long.valueOf(integer)));
+        subscriber.onNext(output, Value.fromNullable((V) Long.valueOf(integer)));
+    }
+
+    @Override
+    public void multi(int count) {
+
+        if (!initialized) {
+            output = OutputFactory.newList(count);
+            initialized = true;
+        }
     }
 
     @Override
diff --git a/src/test/java/io/lettuce/core/output/BooleanListOutputTest.java b/src/test/java/io/lettuce/core/output/BooleanListOutputTest.java
index 6c72631020..e3f758a705 100644
--- a/src/test/java/io/lettuce/core/output/BooleanListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/BooleanListOutputTest.java
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core.output;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.nio.ByteBuffer;
 
@@ -38,7 +38,8 @@ public void defaultSubscriberIsSet() throws Exception {
     @Test
     public void commandOutputCorrectlyDecoded() throws Exception {
 
-		sut.set(1L);
+        sut.multi(3);
+        sut.set(1L);
         sut.set(0L);
         sut.set(2L);
 
diff --git a/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java
index f38c3935f3..2a67d05b8c 100644
--- a/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,8 +37,9 @@ public void setIntegerShouldFail() throws Exception {
     }
 
     @Test
-    public void commandOutputCorrectlyDecoded() throws Exception {
+    public void commandOutputCorrectlyDecoded() {
 
+        sut.multi(2);
         sut.set(ByteBuffer.wrap("1.234".getBytes()));
         sut.set(ByteBuffer.wrap("4.567".getBytes()));
         sut.multi(-1);
diff --git a/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java
index ff83960180..eda6fec011 100644
--- a/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,9 @@
  */
 public class GeoCoordinatesValueListOutputTest {
 
-	private GeoCoordinatesValueListOutput<?, ?> sut = new GeoCoordinatesValueListOutput<>(new Utf8StringCodec());
+    private GeoCoordinatesValueListOutput<?, ?> sut = new GeoCoordinatesValueListOutput<>(new Utf8StringCodec());
 
-	 @Test
+    @Test
     public void defaultSubscriberIsSet() throws Exception {
         assertThat(sut.getSubscriber()).isNotNull().isInstanceOf(ListSubscriber.class);
     }
@@ -42,13 +42,14 @@ public void setIntegerShouldFail() throws Exception {
         sut.set(123L);
     }
 
-	@Test
-    public void commandOutputCorrectlyDecoded() throws Exception {
+    @Test
+    public void commandOutputCorrectlyDecoded() {
 
-		sut.set(ByteBuffer.wrap("1.234".getBytes()));
-		sut.set(ByteBuffer.wrap("4.567".getBytes()));
-		sut.multi(-1);
+        sut.multi(2);
+        sut.set(ByteBuffer.wrap("1.234".getBytes()));
+        sut.set(ByteBuffer.wrap("4.567".getBytes()));
+        sut.multi(-1);
 
-		assertThat(sut.get()).contains(Value.just(new GeoCoordinates(1.234, 4.567)));
-	}
+        assertThat(sut.get()).contains(Value.just(new GeoCoordinates(1.234, 4.567)));
+    }
 }
diff --git a/src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java b/src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java
index 140adb922f..671fb526a0 100644
--- a/src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core.output;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.nio.ByteBuffer;
 
@@ -34,13 +34,16 @@ public class GeoWithinListOutputTest {
     private GeoWithinListOutput<String, String> sut = new GeoWithinListOutput<>(new Utf8StringCodec(), false, false, false);
 
     @Test
-    public void defaultSubscriberIsSet() throws Exception {
+    public void defaultSubscriberIsSet() {
+
+        sut.multi(1);
         assertThat(sut.getSubscriber()).isNotNull().isInstanceOf(ListSubscriber.class);
     }
 
     @Test
-    public void commandOutputKeyOnlyDecoded() throws Exception {
+    public void commandOutputKeyOnlyDecoded() {
 
+        sut.multi(1);
         sut.set(ByteBuffer.wrap("key".getBytes()));
         sut.set(ByteBuffer.wrap("4.567".getBytes()));
         sut.complete(1);
@@ -49,10 +52,11 @@ public void commandOutputKeyOnlyDecoded() throws Exception {
     }
 
     @Test
-    public void commandOutputKeyAndDistanceDecoded() throws Exception {
+    public void commandOutputKeyAndDistanceDecoded() {
 
         sut = new GeoWithinListOutput<>(new Utf8StringCodec(), true, false, false);
 
+        sut.multi(1);
         sut.set(ByteBuffer.wrap("key".getBytes()));
         sut.set(ByteBuffer.wrap("4.567".getBytes()));
         sut.complete(1);
@@ -61,10 +65,11 @@ public void commandOutputKeyAndDistanceDecoded() throws Exception {
     }
 
     @Test
-    public void commandOutputKeyAndHashDecoded() throws Exception {
+    public void commandOutputKeyAndHashDecoded() {
 
         sut = new GeoWithinListOutput<>(new Utf8StringCodec(), false, true, false);
 
+        sut.multi(1);
         sut.set(ByteBuffer.wrap("key".getBytes()));
         sut.set(4567);
         sut.complete(1);
@@ -73,10 +78,11 @@ public void commandOutputKeyAndHashDecoded() throws Exception {
     }
 
     @Test
-    public void commandOutputLongKeyAndHashDecoded() throws Exception {
+    public void commandOutputLongKeyAndHashDecoded() {
 
         GeoWithinListOutput<Long, Long> sut = new GeoWithinListOutput<>((RedisCodec) new Utf8StringCodec(), false, true, false);
 
+        sut.multi(1);
         sut.set(1234);
         sut.set(4567);
         sut.complete(1);
@@ -85,10 +91,11 @@ public void commandOutputLongKeyAndHashDecoded() throws Exception {
     }
 
     @Test
-    public void commandOutputKeyAndCoordinatesDecoded() throws Exception {
+    public void commandOutputKeyAndCoordinatesDecoded() {
 
         sut = new GeoWithinListOutput<>(new Utf8StringCodec(), false, false, true);
 
+        sut.multi(1);
         sut.set(ByteBuffer.wrap("key".getBytes()));
         sut.set(ByteBuffer.wrap("1.234".getBytes()));
         sut.set(ByteBuffer.wrap("4.567".getBytes()));
diff --git a/src/test/java/io/lettuce/core/output/ListOutputTest.java b/src/test/java/io/lettuce/core/output/ListOutputTest.java
index a1fe45155f..ddef92069e 100644
--- a/src/test/java/io/lettuce/core/output/ListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/ListOutputTest.java
@@ -67,22 +67,25 @@ public static Collection<Object[]> parameters() {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void settingEmptySubscriberShouldFail() throws Exception {
+    public void settingEmptySubscriberShouldFail() {
         streamingOutput.setSubscriber(null);
     }
 
     @Test
-    public void defaultSubscriberIsSet() throws Exception {
+    public void defaultSubscriberIsSet() {
+        commandOutput.multi(1);
         assertThat(streamingOutput.getSubscriber()).isNotNull().isInstanceOf(ListSubscriber.class);
     }
 
     @Test(expected = IllegalStateException.class)
-    public void setIntegerShouldFail() throws Exception {
+    public void setIntegerShouldFail() {
         commandOutput.set(123L);
     }
 
     @Test
-    public void setValueShouldConvert() throws Exception {
+    public void setValueShouldConvert() {
+
+        commandOutput.multi(1);
         commandOutput.set(ByteBuffer.wrap(valueBytes));
 
         assertThat(commandOutput.get()).contains(value);
diff --git a/src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java b/src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java
index dc2eef51a9..b1ffe255bb 100644
--- a/src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core.output;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.nio.ByteBuffer;
 
@@ -32,18 +32,21 @@ public class ScoredValueListOutputTest {
     private ScoredValueListOutput<String, String> sut = new ScoredValueListOutput<>(new Utf8StringCodec());
 
     @Test
-    public void defaultSubscriberIsSet() throws Exception {
+    public void defaultSubscriberIsSet() {
+
+        sut.multi(1);
         assertThat(sut.getSubscriber()).isNotNull().isInstanceOf(ListSubscriber.class);
     }
 
     @Test(expected = IllegalStateException.class)
-    public void setIntegerShouldFail() throws Exception {
+    public void setIntegerShouldFail() {
         sut.set(123L);
     }
 
     @Test
-    public void commandOutputCorrectlyDecoded() throws Exception {
+    public void commandOutputCorrectlyDecoded() {
 
+        sut.multi(1);
         sut.set(ByteBuffer.wrap("key".getBytes()));
         sut.set(ByteBuffer.wrap("4.567".getBytes()));
         sut.multi(-1);
diff --git a/src/test/jmh/io/lettuce/core/JmhMain.java b/src/test/jmh/io/lettuce/core/JmhMain.java
new file mode 100644
index 0000000000..f18d8f6f88
--- /dev/null
+++ b/src/test/jmh/io/lettuce/core/JmhMain.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.ChainedOptionsBuilder;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+import org.openjdk.jmh.runner.options.TimeValue;
+
+/**
+ * Manual JMH Test Launcher.
+ *
+ * @author Mark Paluch
+ */
+public class JmhMain {
+
+    public static void main(String... args) throws IOException, RunnerException {
+
+        runCommandHandlerBenchmark();
+    }
+
+    private static void runBenchmarks() throws RunnerException {
+        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).build()).run();
+    }
+
+    private static void runCommandBenchmark() throws RunnerException {
+
+        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).include(".*CommandBenchmark.*")
+                .build()).run();
+
+        new Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS).include(".*CommandBenchmark.*").build())
+                .run();
+    }
+
+    private static void runCommandHandlerBenchmark() throws RunnerException {
+
+        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).include(".*RedisClientBenchmark.*")
+                .build()).run();
+        // new
+        // Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS).include(".*CommandHandlerBenchmark.*").build()).run();
+    }
+
+    private static void runCommandEncoderBenchmark() throws RunnerException {
+
+        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS)
+                .include(".*CommandEncoderBenchmark.*").build()).run();
+        // new
+        // Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS).include(".*CommandHandlerBenchmark.*").build()).run();
+    }
+
+    private static void runRedisStateMachineBenchmark() throws RunnerException {
+
+        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS)
+                .include(".*RedisStateMachineBenchmark.*").build()).run();
+        // new
+        // Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS).include(".*CommandHandlerBenchmark.*").build()).run();
+    }
+
+    private static ChainedOptionsBuilder prepareOptions() {
+        return new OptionsBuilder().forks(1).warmupIterations(5).threads(1).measurementIterations(5)
+                .timeout(TimeValue.seconds(2));
+    }
+}
diff --git a/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
index 5329e1c9dc..5600abd7fa 100644
--- a/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
@@ -15,6 +15,8 @@
  */
 package io.lettuce.core;
 
+import java.util.concurrent.TimeUnit;
+
 import org.openjdk.jmh.annotations.*;
 
 import reactor.core.publisher.Flux;
@@ -44,6 +46,7 @@ public class RedisClientBenchmark {
 
     private final static int BATCH_SIZE = 20;
     private final static byte[] KEY = "benchmark".getBytes();
+    private final static byte[] FOO = "foo".getBytes();
 
     private RedisClient redisClient;
     private StatefulRedisConnection<byte[], byte[]> connection;
@@ -63,7 +66,7 @@ public void setup() {
     public void tearDown() {
 
         connection.close();
-        redisClient.shutdown();
+        redisClient.shutdown(0, 0, TimeUnit.SECONDS);
     }
 
     @Benchmark
@@ -107,6 +110,14 @@ public void syncSet() {
         connection.sync().set(KEY, KEY);
     }
 
+    @Benchmark
+    public void syncList() {
+        connection.async().del(FOO);
+        connection.sync().lpush(FOO, FOO, FOO, FOO, FOO, FOO, FOO, FOO, FOO, FOO, FOO, FOO, FOO, FOO, FOO, FOO, FOO, FOO, FOO,
+                FOO);
+        connection.sync().lrange(FOO, 0, -1);
+    }
+
     @Benchmark
     public void reactiveSet() {
         connection.reactive().set(KEY, KEY).block();
@@ -140,4 +151,15 @@ public void reactiveSetBatchFlush() throws Exception {
 
         }).blockLast();
     }
+
+    public static void main(String[] args) throws InterruptedException {
+
+        RedisClientBenchmark b = new RedisClientBenchmark();
+        b.setup();
+
+        Thread.sleep(10000);
+        while (true) {
+            b.syncList();
+        }
+    }
 }
diff --git a/src/test/jmh/io/lettuce/core/output/JmhMain.java b/src/test/jmh/io/lettuce/core/output/JmhMain.java
new file mode 100644
index 0000000000..78bcda6b6e
--- /dev/null
+++ b/src/test/jmh/io/lettuce/core/output/JmhMain.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.output;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.ChainedOptionsBuilder;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+import org.openjdk.jmh.runner.options.TimeValue;
+
+/**
+ * Manual JMH Test Launcher.
+ *
+ * @author Mark Paluch
+ */
+public class JmhMain {
+
+    public static void main(String... args) throws IOException, RunnerException {
+        runValueListOutputBenchmark();
+    }
+
+    private static void runValueListOutputBenchmark() throws RunnerException {
+
+        new Runner(prepareOptions().mode(Mode.AverageTime) //
+                .timeUnit(TimeUnit.NANOSECONDS) //
+                .include(".*ValueListOutputBenchmark.*") //
+                .build()).run();
+    }
+
+    private static ChainedOptionsBuilder prepareOptions() {
+
+        return new OptionsBuilder()//
+                .forks(1) //
+                .warmupIterations(5)//
+                .threads(1) //
+                .measurementIterations(5) //
+                .timeout(TimeValue.seconds(2));
+    }
+}
diff --git a/src/test/jmh/io/lettuce/core/output/ValueListOutputBenchmark.java b/src/test/jmh/io/lettuce/core/output/ValueListOutputBenchmark.java
new file mode 100644
index 0000000000..d782dec057
--- /dev/null
+++ b/src/test/jmh/io/lettuce/core/output/ValueListOutputBenchmark.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.output;
+
+import java.nio.ByteBuffer;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+
+import io.lettuce.core.codec.ByteArrayCodec;
+
+/**
+ * @author Mark Paluch
+ */
+@State(Scope.Benchmark)
+public class ValueListOutputBenchmark {
+
+    private static final ByteArrayCodec CODEC = ByteArrayCodec.INSTANCE;
+    private final ByteBuffer BUFFER = ByteBuffer.wrap(new byte[0]);
+
+    @Benchmark
+    public void measureZeroElement() {
+
+        ValueListOutput<byte[], byte[]> output = new ValueListOutput<>(CODEC);
+        output.multi(0);
+        output.complete(1);
+    }
+
+    @Benchmark
+    public void measureSingleElement() {
+
+        ValueListOutput<byte[], byte[]> output = new ValueListOutput<>(CODEC);
+        output.multi(1);
+        output.set(BUFFER);
+        output.complete(1);
+    }
+
+    @Benchmark
+    public void measure16Elements() {
+
+        ValueListOutput<byte[], byte[]> output = new ValueListOutput<>(CODEC);
+        output.multi(16);
+        for (int i = 0; i < 16; i++) {
+            output.set(BUFFER);
+        }
+        output.complete(1);
+    }
+
+    @Benchmark
+    public void measure16ElementsWithResizeElement() {
+
+        ValueListOutput<byte[], byte[]> output = new ValueListOutput<>(CODEC);
+        output.multi(10);
+        for (int i = 0; i < 16; i++) {
+            output.set(BUFFER);
+        }
+        output.complete(1);
+    }
+
+    @Benchmark
+    public void measure100Elements() {
+
+        ValueListOutput<byte[], byte[]> output = new ValueListOutput<>(CODEC);
+        output.multi(100);
+        for (int i = 0; i < 100; i++) {
+            output.set(BUFFER);
+        }
+        output.complete(1);
+    }
+
+    @Benchmark
+    public void measure100ElementsWithResizeElement() {
+
+        ValueListOutput<byte[], byte[]> output = new ValueListOutput<>(CODEC);
+        output.multi(10);
+        for (int i = 0; i < 100; i++) {
+            output.set(BUFFER);
+        }
+        output.complete(1);
+    }
+}

From ddad7fcc32fc7d546332c71582813631ca18b039 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 23 Jul 2017 01:28:53 +0200
Subject: [PATCH 273/808] =?UTF-8?q?Inline=20LettuceFutures.translateExcept?=
 =?UTF-8?q?ion(=E2=80=A6)=20to=20prevent=20capturing=20lambda=20instance?=
 =?UTF-8?q?=20creation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/lettuce/core/AbstractRedisClient.java  | 23 +++++++--
 .../java/io/lettuce/core/LettuceFutures.java  | 47 ++++++++++---------
 2 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index bdcac4df00..c6824aea1e 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -327,8 +327,7 @@ public void shutdown() {
      * @since 5.0
      */
     public void shutdown(Duration quietPeriod, Duration timeout) {
-        LettuceFutures.translateException(() -> shutdownAsync(quietPeriod.toNanos(), timeout.toNanos(), TimeUnit.NANOSECONDS)
-                .get(), () -> null);
+        shutdown(quietPeriod.toNanos(), timeout.toNanos(), TimeUnit.NANOSECONDS);
     }
 
     /**
@@ -340,7 +339,25 @@ public void shutdown(Duration quietPeriod, Duration timeout) {
      * @param timeUnit the unit of {@code quietPeriod} and {@code timeout}
      */
     public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
-        LettuceFutures.translateException(() -> shutdownAsync(quietPeriod, timeout, timeUnit).get(), () -> null);
+
+        try {
+            shutdownAsync(quietPeriod, timeout, timeUnit).get();
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (ExecutionException e) {
+
+            if (e.getCause() instanceof RedisCommandExecutionException) {
+                throw new RedisCommandExecutionException(e.getCause().getMessage(), e.getCause());
+            }
+
+            throw new RedisException(e.getCause());
+        } catch (InterruptedException e) {
+
+            Thread.currentThread().interrupt();
+            throw new RedisCommandInterruptedException(e);
+        } catch (Exception e) {
+            throw new RedisCommandExecutionException(e);
+        }
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/LettuceFutures.java b/src/main/java/io/lettuce/core/LettuceFutures.java
index 9ee6c993b9..cb6ad26090 100644
--- a/src/main/java/io/lettuce/core/LettuceFutures.java
+++ b/src/main/java/io/lettuce/core/LettuceFutures.java
@@ -16,8 +16,10 @@
 package io.lettuce.core;
 
 import java.time.Duration;
-import java.util.concurrent.*;
-import java.util.function.Supplier;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 /**
  * Utility to {@link #awaitAll(long, TimeUnit, Future[])} futures until they are done and to synchronize future execution using
@@ -55,8 +57,7 @@ public static boolean awaitAll(Duration timeout, Future<?>... futures) {
      */
     public static boolean awaitAll(long timeout, TimeUnit unit, Future<?>... futures) {
 
-        return translateException(() -> {
-
+        try {
             long nanos = unit.toNanos(timeout);
             long time = System.nanoTime();
 
@@ -74,7 +75,24 @@ public static boolean awaitAll(long timeout, TimeUnit unit, Future<?>... futures
             }
 
             return true;
-        }, () -> false);
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (TimeoutException e) {
+            return false;
+        } catch (ExecutionException e) {
+
+            if (e.getCause() instanceof RedisCommandExecutionException) {
+                throw new RedisCommandExecutionException(e.getCause().getMessage(), e.getCause());
+            }
+
+            throw new RedisException(e.getCause());
+        } catch (InterruptedException e) {
+
+            Thread.currentThread().interrupt();
+            throw new RedisCommandInterruptedException(e);
+        } catch (Exception e) {
+            throw new RedisCommandExecutionException(e);
+        }
     }
 
     /**
@@ -90,31 +108,14 @@ public static boolean awaitAll(long timeout, TimeUnit unit, Future<?>... futures
      */
     public static <T> T awaitOrCancel(RedisFuture<T> cmd, long timeout, TimeUnit unit) {
 
-        return translateException(() -> {
+        try {
             if (!cmd.await(timeout, unit)) {
                 cmd.cancel(true);
                 throw new RedisCommandTimeoutException();
             }
             return cmd.get();
-        }, () -> null);
-    }
-
-    /**
-     * Execute a {@link Callable} applying exception translation.
-     *
-     * @param callable the {@link Callable} to call.
-     * @param otherwiseTimeout {@link Supplier} for a fallback value when a {@link TimeoutException} is caught.
-     * @return result value of the {@link Callable} or {@link Supplier#get()} if a {@link TimeoutException} occurs.
-     * @since 4.4
-     */
-    protected static <T> T translateException(Callable<T> callable, Supplier<T> otherwiseTimeout) {
-
-        try {
-            return callable.call();
         } catch (RuntimeException e) {
             throw e;
-        } catch (TimeoutException e) {
-            return otherwiseTimeout.get();
         } catch (ExecutionException e) {
 
             if (e.getCause() instanceof RedisCommandExecutionException) {

From 54117f7a00378618d186b285fced9f06defbb230 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 23 Jul 2017 12:29:06 +0200
Subject: [PATCH 274/808] Enhance SingularArgument caching #575

Add cache for negative integer argument values, add cache for known ProtocolKeywords.
---
 .../io/lettuce/core/protocol/CommandArgs.java | 93 +++++++++++++------
 .../core/protocol/CommandArgsTest.java        |  8 ++
 2 files changed, 75 insertions(+), 26 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgs.java b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
index a9791381a9..b98e006867 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandArgs.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
@@ -244,7 +244,8 @@ public CommandArgs<K, V> add(byte[] value) {
     public CommandArgs<K, V> add(CommandKeyword keyword) {
 
         LettuceAssert.notNull(keyword, "CommandKeyword must not be null");
-        return add((ProtocolKeyword) keyword);
+        singularArguments.add(ProtocolKeywordArgument.of(keyword));
+        return this;
     }
 
     /**
@@ -256,7 +257,8 @@ public CommandArgs<K, V> add(CommandKeyword keyword) {
     public CommandArgs<K, V> add(CommandType type) {
 
         LettuceAssert.notNull(type, "CommandType must not be null");
-        return add(type.bytes);
+        singularArguments.add(ProtocolKeywordArgument.of(type));
+        return this;
     }
 
     /**
@@ -268,7 +270,6 @@ public CommandArgs<K, V> add(CommandType type) {
     public CommandArgs<K, V> add(ProtocolKeyword keyword) {
 
         LettuceAssert.notNull(keyword, "CommandKeyword must not be null");
-
         singularArguments.add(ProtocolKeywordArgument.of(keyword));
         return this;
     }
@@ -357,29 +358,6 @@ static abstract class SingularArgument {
         abstract void encode(ByteBuf buffer);
     }
 
-    static class ProtocolKeywordArgument extends SingularArgument {
-
-        final ProtocolKeyword protocolKeyword;
-
-        private ProtocolKeywordArgument(ProtocolKeyword protocolKeyword) {
-            this.protocolKeyword = protocolKeyword;
-        }
-
-        static ProtocolKeywordArgument of(ProtocolKeyword val) {
-            return new ProtocolKeywordArgument(val);
-        }
-
-        @Override
-        void encode(ByteBuf buffer) {
-            BytesArgument.writeBytes(buffer, protocolKeyword.getBytes());
-        }
-
-        @Override
-        public String toString() {
-            return protocolKeyword.name();
-        }
-    }
-
     static class BytesArgument extends SingularArgument {
 
         final byte[] val;
@@ -414,6 +392,62 @@ public String toString() {
         }
     }
 
+    static class ProtocolKeywordArgument extends BytesArgument {
+
+        private final ProtocolKeyword protocolKeyword;
+
+        private ProtocolKeywordArgument(ProtocolKeyword protocolKeyword) {
+            super(protocolKeyword.getBytes());
+            this.protocolKeyword = protocolKeyword;
+        }
+
+        static BytesArgument of(ProtocolKeyword protocolKeyword) {
+
+            if (protocolKeyword instanceof CommandType) {
+                return CommandTypeCache.cache[((Enum) protocolKeyword).ordinal()];
+            }
+
+            if (protocolKeyword instanceof CommandKeyword) {
+                return CommandKeywordCache.cache[((Enum) protocolKeyword).ordinal()];
+            }
+
+            return ProtocolKeywordArgument.of(protocolKeyword.getBytes());
+        }
+
+        @Override
+        public String toString() {
+            return protocolKeyword.name();
+        }
+    }
+
+    static class CommandTypeCache {
+
+        static final ProtocolKeywordArgument cache[];
+
+        static {
+
+            CommandType[] values = CommandType.values();
+            cache = new ProtocolKeywordArgument[values.length];
+            for (int i = 0; i < cache.length; i++) {
+                cache[i] = new ProtocolKeywordArgument(values[i]);
+            }
+        }
+    }
+
+    static class CommandKeywordCache {
+
+        static final ProtocolKeywordArgument cache[];
+
+        static {
+
+            CommandKeyword[] values = CommandKeyword.values();
+            cache = new ProtocolKeywordArgument[values.length];
+            for (int i = 0; i < cache.length; i++) {
+                cache[i] = new ProtocolKeywordArgument(values[i]);
+            }
+        }
+    }
+
     static class ByteBufferArgument {
 
         static void writeByteBuffer(ByteBuf target, ByteBuffer value) {
@@ -453,6 +487,10 @@ static IntegerArgument of(long val) {
                 return IntegerCache.cache[(int) val];
             }
 
+            if (val < 0 && -val < IntegerCache.cache.length) {
+                return IntegerCache.negativeCache[(int) -val];
+            }
+
             return new IntegerArgument(val);
         }
 
@@ -484,12 +522,15 @@ static void writeInteger(ByteBuf target, long value) {
     static class IntegerCache {
 
         static final IntegerArgument cache[];
+        static final IntegerArgument negativeCache[];
 
         static {
             int high = Integer.getInteger("io.lettuce.core.CommandArgs.IntegerCache", 128);
             cache = new IntegerArgument[high];
+            negativeCache = new IntegerArgument[high];
             for (int i = 0; i < high; i++) {
                 cache[i] = new IntegerArgument(i);
+                negativeCache[i] = new IntegerArgument(-i);
             }
         }
     }
diff --git a/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java b/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
index 1159eb2c0a..d8bba0ce23 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
@@ -50,6 +50,14 @@ public void getFirstIntegerShouldReturnFirstInteger() throws Exception {
         assertThat(CommandArgsAccessor.getFirstInteger(args)).isEqualTo(1L);
     }
 
+    @Test
+    public void getFirstIntegerShouldReturnFirstNegativeInteger() throws Exception {
+
+        CommandArgs<String, String> args = new CommandArgs<>(codec).add(-1L).add(-127).add(-128).add(-129);
+
+        assertThat(CommandArgsAccessor.getFirstInteger(args)).isEqualTo(-1L);
+    }
+
     @Test
     public void getFirstStringShouldReturnNull() throws Exception {
 

From 59851c43aa574a51a53f8eeee3787232189693f0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 24 Jul 2017 10:03:33 +0200
Subject: [PATCH 275/808] Reuse CommandHandler decoding via
 PubSubCommandHandler #576

Regular commands read by PubSub connections are now decoded with the regular CommandHandler decoding. Previously, decoding used an own code path which diverged from what happened in CommandHandler.
---
 .../lettuce/core/protocol/CommandHandler.java |  11 ++
 .../core/pubsub/PubSubCommandHandler.java     |  34 +++---
 .../core/pubsub/PubSubCommandHandlerTest.java | 112 ++++++++++++++++++
 3 files changed, 141 insertions(+), 16 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 3c4b4aff91..c79252ba2b 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -518,6 +518,8 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
             if (buffer.refCnt() != 0) {
                 buffer.discardReadBytes();
             }
+
+            afterComplete(ctx, command);
         }
     }
 
@@ -578,6 +580,15 @@ protected boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandO
         return rsm.decode(buffer, command, output);
     }
 
+    /**
+     * Hook method called after command completion.
+     *
+     * @param ctx
+     * @param command
+     */
+    protected void afterComplete(ChannelHandlerContext ctx, RedisCommand<?, ?, ?> command) {
+    }
+
     private void recordLatency(WithLatency withLatency, ProtocolKeyword commandType) {
 
         if (withLatency != null && clientResources.commandLatencyCollector().isEnabled() && channel != null && remote() != null) {
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
index 497b38f954..b9f315db0d 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
@@ -17,8 +17,8 @@
 
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.codec.RedisCodec;
-import io.lettuce.core.output.CommandOutput;
 import io.lettuce.core.protocol.CommandHandler;
+import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.resource.ClientResources;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
@@ -30,8 +30,8 @@
  *
  * @param <K> Key type.
  * @param <V> Value type.
- *
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public class PubSubCommandHandler<K, V> extends CommandHandler {
 
@@ -49,7 +49,6 @@ public class PubSubCommandHandler<K, V> extends CommandHandler {
      */
     public PubSubCommandHandler(ClientOptions clientOptions, ClientResources clientResources, RedisCodec<K, V> codec,
             PubSubEndpoint<K, V> endpoint) {
-
         super(clientOptions, clientResources, endpoint);
 
         this.endpoint = endpoint;
@@ -61,28 +60,31 @@ public PubSubCommandHandler(ClientOptions clientOptions, ClientResources clientR
     @Override
     protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws InterruptedException {
 
-        while (output.type() == null && canDecode(buffer)) {
-            CommandOutput<?, ?, ?> currentOutput = getStack().peek().getOutput();
+        super.decode(ctx, buffer);
 
-            if (!super.decode(buffer, currentOutput)) {
+        while (buffer.isReadable()) {
+
+            if (!super.decode(buffer, output)) {
                 return;
             }
 
-            getStack().poll().complete();
+            endpoint.notifyMessage(output);
+            output = new PubSubOutput<>(codec);
 
             buffer.discardReadBytes();
-
-            if (currentOutput instanceof PubSubOutput) {
-                endpoint.notifyMessage((PubSubOutput) currentOutput);
-            }
         }
+    }
 
-        while (super.decode(buffer, output)) {
-
-            endpoint.notifyMessage(output);
-            output = new PubSubOutput<>(codec);
+    @Override
+    protected boolean canDecode(ByteBuf buffer) {
+        return super.canDecode(buffer) && output.type() == null;
+    }
 
-            buffer.discardReadBytes();
+    @Override
+    @SuppressWarnings("unchecked")
+    protected void afterComplete(ChannelHandlerContext ctx, RedisCommand<?, ?, ?> command) {
+        if (command.getOutput() instanceof PubSubOutput) {
+            endpoint.notifyMessage((PubSubOutput) command.getOutput());
         }
     }
 }
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java
new file mode 100644
index 0000000000..9c7ad20390
--- /dev/null
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.pubsub;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
+
+import java.util.Queue;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.metrics.DefaultCommandLatencyCollector;
+import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.resource.ClientResources;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.*;
+
+/**
+ * @author Mark Paluch
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class PubSubCommandHandlerTest {
+
+    private Queue<RedisCommand<String, String, ?>> stack;
+
+    private PubSubCommandHandler<String, String> sut;
+
+    private final Command<String, String, String> command = new Command<>(CommandType.APPEND, new StatusOutput<>(
+            new Utf8StringCodec()), null);
+
+    @Mock
+    private ChannelHandlerContext context;
+
+    @Mock
+    private Channel channel;
+
+    @Mock
+    private ChannelConfig channelConfig;
+
+    @Mock
+    private ChannelPipeline pipeline;
+
+    @Mock
+    private EventLoop eventLoop;
+
+    @Mock
+    private ClientResources clientResources;
+
+    @Mock
+    private PubSubEndpoint<String, String> endpoint;
+
+    @SuppressWarnings("unchecked")
+    @Before
+    public void before() throws Exception {
+
+        when(channel.config()).thenReturn(channelConfig);
+        when(context.alloc()).thenReturn(ByteBufAllocator.DEFAULT);
+        when(context.channel()).thenReturn(channel);
+        when(channel.pipeline()).thenReturn(pipeline);
+        when(channel.eventLoop()).thenReturn(eventLoop);
+        when(eventLoop.submit(any(Runnable.class))).thenAnswer(invocation -> {
+            Runnable r = (Runnable) invocation.getArguments()[0];
+            r.run();
+            return null;
+        });
+
+        when(clientResources.commandLatencyCollector()).thenReturn(
+                new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create()));
+
+        sut = new PubSubCommandHandler<>(ClientOptions.create(), clientResources, StringCodec.UTF8, endpoint);
+        stack = (Queue) ReflectionTestUtils.getField(sut, "stack");
+    }
+
+    @Test
+    public void shouldCompleteCommandExceptionallyOnOutputFailure() throws Exception {
+
+        sut.channelRegistered(context);
+        sut.channelActive(context);
+        stack.add(command);
+
+        sut.channelRead(context, Unpooled.wrappedBuffer(":1000\r\n".getBytes()));
+
+        assertThat(ReflectionTestUtils.getField(command, "exception")).isInstanceOf(IllegalStateException.class);
+    }
+}

From 5a3939f300f39049febd8ba11038e1ed8ee76a9c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 28 Jul 2017 17:33:14 +0200
Subject: [PATCH 276/808] Introduce MethodTranslator caching #580

---
 .../core/FutureSyncInvocationHandler.java     |  2 +-
 .../internal/AbstractInvocationHandler.java   | 33 ++++++++++++++-----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
index d017f44995..a9abf8a7bf 100644
--- a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
@@ -39,7 +39,7 @@ class FutureSyncInvocationHandler extends AbstractInvocationHandler {
     public FutureSyncInvocationHandler(StatefulConnection<?, ?> connection, Object asyncApi, Class<?>[] interfaces) {
         this.connection = connection;
         this.asyncApi = asyncApi;
-        this.translator = new MethodTranslator(asyncApi.getClass(), interfaces);
+        this.translator = MethodTranslator.of(asyncApi.getClass(), interfaces);
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java b/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
index 3d7ce18da1..90132dc58f 100644
--- a/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -144,21 +144,35 @@ public String toString() {
 
     private static boolean isProxyOfSameInterfaces(Object arg, Class<?> proxyClass) {
         return proxyClass.isInstance(arg)
-                // Equal proxy instances should mostly be instance of proxyClass
-                // Under some edge cases (such as the proxy of JDK types serialized and then deserialized)
-                // the proxy type may not be the same.
-                // We first check isProxyClass() so that the common case of comparing with non-proxy objects
-                // is efficient.
-                || (Proxy.isProxyClass(arg.getClass())
-                        && Arrays.equals(arg.getClass().getInterfaces(), proxyClass.getInterfaces()));
+        // Equal proxy instances should mostly be instance of proxyClass
+        // Under some edge cases (such as the proxy of JDK types serialized and then deserialized)
+        // the proxy type may not be the same.
+        // We first check isProxyClass() so that the common case of comparing with non-proxy objects
+        // is efficient.
+                || (Proxy.isProxyClass(arg.getClass()) && Arrays.equals(arg.getClass().getInterfaces(),
+                        proxyClass.getInterfaces()));
     }
 
     protected static class MethodTranslator {
 
+        private final static WeakHashMap<Class<?>, MethodTranslator> TRANSLATOR_MAP = new WeakHashMap<>(32);
         private final Map<Method, Method> map;
 
-        public MethodTranslator(Class<?> delegate, Class<?>... methodSources) {
+        private MethodTranslator(Class<?> delegate, Class<?>... methodSources) {
 
+            map = createMethodMap(delegate, methodSources);
+        }
+
+        public static MethodTranslator of(Class<?> delegate, Class<?>... methodSources) {
+
+            synchronized (TRANSLATOR_MAP) {
+                return TRANSLATOR_MAP.computeIfAbsent(delegate, key -> new MethodTranslator(key, methodSources));
+            }
+        }
+
+        private Map<Method, Method> createMethodMap(Class<?> delegate, Class<?>[] methodSources) {
+
+            Map<Method, Method> map;
             List<Method> methods = new ArrayList<>();
             for (Class<?> sourceClass : methodSources) {
                 methods.addAll(getMethods(sourceClass));
@@ -173,6 +187,7 @@ public MethodTranslator(Class<?> delegate, Class<?>... methodSources) {
                 } catch (NoSuchMethodException ignore) {
                 }
             }
+            return map;
         }
 
         private Collection<? extends Method> getMethods(Class<?> sourceClass) {

From 507b57ae13ea5c54b3685d5e0db7d5220cddfa84 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 28 Jul 2017 17:53:49 +0200
Subject: [PATCH 277/808] Prevent dead listener callback failure in shutdown
 sequence #581

Complete shutdown futures without listener if the future is already done or cancelled to prevent unresolved futures (infinite wait) because of missing callbacks.
---
 .../java/io/lettuce/core/AbstractRedisClient.java |  9 +++++++++
 .../java/io/lettuce/core/resource/Futures.java    | 10 ++++++++++
 src/test/java/io/lettuce/TestClientResources.java | 15 ++++++++-------
 .../io/lettuce/core/UnixDomainSocketTest.java     |  9 ++-------
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index c6824aea1e..8d22b64df0 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -486,6 +486,15 @@ private static CompletableFuture<Void> toCompletableFuture(Future<?> future) {
 
         CompletableFuture<Void> promise = new CompletableFuture<>();
 
+        if (future.isDone() || future.isCancelled()) {
+            if (future.isSuccess()) {
+                promise.complete(null);
+            } else {
+                promise.completeExceptionally(future.cause());
+            }
+            return promise;
+        }
+
         future.addListener(f -> {
             if (f.isSuccess()) {
                 promise.complete(null);
diff --git a/src/main/java/io/lettuce/core/resource/Futures.java b/src/main/java/io/lettuce/core/resource/Futures.java
index 415c13b702..653d3f1990 100644
--- a/src/main/java/io/lettuce/core/resource/Futures.java
+++ b/src/main/java/io/lettuce/core/resource/Futures.java
@@ -40,6 +40,16 @@ class Futures {
     static Promise<Boolean> toBooleanPromise(Future<?> future) {
 
         DefaultPromise<Boolean> result = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
+
+        if (future.isDone() || future.isCancelled()) {
+            if (future.isSuccess()) {
+                result.setSuccess(true);
+            } else {
+                result.setFailure(future.cause());
+            }
+            return result;
+        }
+
         future.addListener((GenericFutureListener<Future<Object>>) f -> {
 
             if (f.isSuccess()) {
diff --git a/src/test/java/io/lettuce/TestClientResources.java b/src/test/java/io/lettuce/TestClientResources.java
index ca37871fe7..7f37f8c3ae 100644
--- a/src/test/java/io/lettuce/TestClientResources.java
+++ b/src/test/java/io/lettuce/TestClientResources.java
@@ -33,6 +33,14 @@ public class TestClientResources {
     private final static TestClientResources instance = new TestClientResources();
     private ClientResources clientResources = create();
 
+    /**
+     * @return the default {@link ClientResources} instance used across multiple tests. The returned instance must not be shut
+     *         down.
+     */
+    public static ClientResources get() {
+        return instance.clientResources;
+    }
+
     /**
      * Creates a new {@link ClientResources} instance and registers a shutdown hook to de-allocate the instance upon JVM
      * shutdown.
@@ -58,11 +66,4 @@ public void run() {
         return resources;
     }
 
-    /**
-     * @return the default {@link ClientResources} instance used across multiple tests. The returned instance must not be shut
-     *         down.
-     */
-    public static ClientResources get() {
-        return instance.clientResources;
-    }
 }
diff --git a/src/test/java/io/lettuce/core/UnixDomainSocketTest.java b/src/test/java/io/lettuce/core/UnixDomainSocketTest.java
index e39dc19f3b..7e7016642c 100644
--- a/src/test/java/io/lettuce/core/UnixDomainSocketTest.java
+++ b/src/test/java/io/lettuce/core/UnixDomainSocketTest.java
@@ -33,7 +33,6 @@
 import io.lettuce.TestClientResources;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.sentinel.SentinelRule;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 import io.netty.util.internal.SystemPropertyUtil;
@@ -46,7 +45,6 @@ public class UnixDomainSocketTest {
     private static final String MASTER_ID = "mymaster";
 
     private static RedisClient sentinelClient;
-    private static ClientResources clientResources;
 
     @Rule
     public SentinelRule sentinelRule = new SentinelRule(sentinelClient, false, 26379, 26380);
@@ -57,15 +55,12 @@ public class UnixDomainSocketTest {
 
     @BeforeClass
     public static void setupClient() {
-
-        clientResources = TestClientResources.create();
         sentinelClient = getRedisSentinelClient();
     }
 
     @AfterClass
     public static void shutdownClient() {
         FastShutdown.shutdown(sentinelClient);
-        FastShutdown.shutdown(clientResources);
     }
 
     @Test
@@ -78,7 +73,6 @@ public void standalone_RedisClientWithSocket() throws Exception {
         RedisClient redisClient = RedisClient.create(TestClientResources.get(), redisURI);
 
         StatefulRedisConnection<String, String> connection = redisClient.connect();
-
         someRedisAction(connection.sync());
         connection.close();
 
@@ -193,7 +187,8 @@ private static RedisClient getRedisSentinelClient() {
 
     private void assumeTestSupported() {
         String osName = SystemPropertyUtil.get("os.name").toLowerCase(Locale.UK).trim();
-        assumeTrue("Only supported on Linux, your os is " + osName, osName.startsWith("linux"));
+        assumeTrue("Only supported on Linux/OSX, your os is " + osName + " with epoll/kqueue support.",
+                Transports.NativeTransports.isSocketSupported());
     }
 
     private static RedisURI getSocketRedisUri() throws IOException {

From c3463b9a45a8530eb7ea8332d5b490df8df1727c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 31 Jul 2017 08:56:17 +0200
Subject: [PATCH 278/808] Merge SslTest from master

---
 src/test/java/io/lettuce/SslTest.java | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/test/java/io/lettuce/SslTest.java b/src/test/java/io/lettuce/SslTest.java
index debf270d0d..b92efc148e 100644
--- a/src/test/java/io/lettuce/SslTest.java
+++ b/src/test/java/io/lettuce/SslTest.java
@@ -26,7 +26,9 @@
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import io.lettuce.core.*;
@@ -44,7 +46,7 @@ public class SslTest extends AbstractTest {
 
     private static final String KEYSTORE = "work/keystore.jks";
     private static final String TRUSTSTORE = "work/truststore.jks";
-    private static final RedisClient redisClient = DefaultRedisClient.get();
+    private static RedisClient redisClient;
 
     private static final RedisURI URI_NO_VERIFY = RedisURI.Builder.redis(host(), sslPort()) //
             .withSsl(true) //
@@ -61,15 +63,25 @@ public class SslTest extends AbstractTest {
             .withVerifyPeer(true) //
             .build();
 
-    @Before
-    public void before() {
+    @BeforeClass
+    public static void beforeClass() {
 
         assumeTrue("Assume that stunnel runs on port 6443", Sockets.isOpen(host(), sslPort()));
         assertThat(new File(TRUSTSTORE)).exists();
 
+        redisClient = RedisClient.create(TestClientResources.get());
+    }
+
+    @Before
+    public void before() {
         redisClient.setOptions(ClientOptions.create());
     }
 
+    @AfterClass
+    public static void afterClass() {
+        FastShutdown.shutdown(redisClient);
+    }
+
     @Test
     public void standaloneWithSsl() {
 

From dcc2dc8e9809f41d45a9d5397aeee53f7ab6fe1b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 31 Jul 2017 10:08:51 +0200
Subject: [PATCH 279/808] Fix JavaDoc for BitFieldArgs #583

---
 .../java/io/lettuce/core/BitFieldArgs.java    | 96 ++++++++++---------
 1 file changed, 49 insertions(+), 47 deletions(-)

diff --git a/src/main/java/io/lettuce/core/BitFieldArgs.java b/src/main/java/io/lettuce/core/BitFieldArgs.java
index e0ee570560..f320474171 100644
--- a/src/main/java/io/lettuce/core/BitFieldArgs.java
+++ b/src/main/java/io/lettuce/core/BitFieldArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,22 +57,22 @@ private Builder() {
         }
 
         /**
-         * Create a new {@link Get} subcommand.
+         * Create a new {@code GET} subcommand.
          *
          * @param bitFieldType the bit field type, must not be {@literal null}.
          * @param offset bitfield offset
-         * @return a new {@link Get} subcommand for the given {@code bitFieldType} and {@code offset}.
+         * @return a new {@code GET} subcommand for the given {@code bitFieldType} and {@code offset}.
          */
         public static BitFieldArgs get(BitFieldType bitFieldType, int offset) {
             return new BitFieldArgs().get(bitFieldType, offset);
         }
 
         /**
-         * Create a new {@link Get} subcommand.
+         * Create a new {@code GET} subcommand.
          *
          * @param bitFieldType the bit field type, must not be {@literal null}.
          * @param offset bitfield offset, must not be {@literal null}.
-         * @return a new {@link Get} subcommand for the given {@code bitFieldType} and {@code offset}.
+         * @return a new {@code GET} subcommand for the given {@code bitFieldType} and {@code offset}.
          * @since 4.3
          */
         public static BitFieldArgs get(BitFieldType bitFieldType, Offset offset) {
@@ -80,24 +80,24 @@ public static BitFieldArgs get(BitFieldType bitFieldType, Offset offset) {
         }
 
         /**
-         * Create a new {@link Set} subcommand.
+         * Create a new {@code SET} subcommand.
          *
          * @param bitFieldType the bit field type, must not be {@literal null}.
          * @param offset bitfield offset
          * @param value the value
-         * @return a new {@link Set} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+         * @return a new {@code SET} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
          */
         public static BitFieldArgs set(BitFieldType bitFieldType, int offset, long value) {
             return new BitFieldArgs().set(bitFieldType, offset, value);
         }
 
         /**
-         * Create a new {@link Set} subcommand.
+         * Create a new {@code SET} subcommand.
          *
          * @param bitFieldType the bit field type, must not be {@literal null}.
          * @param offset bitfield offset, must not be {@literal null}.
          * @param value the value
-         * @return a new {@link Set} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+         * @return a new {@code SET} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
          * @since 4.3
          */
         public static BitFieldArgs set(BitFieldType bitFieldType, Offset offset, long value) {
@@ -105,24 +105,26 @@ public static BitFieldArgs set(BitFieldType bitFieldType, Offset offset, long va
         }
 
         /**
-         * Create a new {@link IncrBy} subcommand.
+         * Create a new {@@code INCRBY} subcommand.
          *
          * @param bitFieldType the bit field type, must not be {@literal null}.
          * @param offset bitfield offset
          * @param value the value
-         * @return a new {@link IncrBy} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+         * @return a new {@@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}
+         *         .
          */
         public static BitFieldArgs incrBy(BitFieldType bitFieldType, int offset, long value) {
             return new BitFieldArgs().incrBy(bitFieldType, offset, value);
         }
 
         /**
-         * Create a new {@link IncrBy} subcommand.
+         * Create a new {@@code INCRBY} subcommand.
          *
          * @param bitFieldType the bit field type, must not be {@literal null}.
          * @param offset bitfield offset, must not be {@literal null}.
          * @param value the value
-         * @return a new {@link IncrBy} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+         * @return a new {@@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}
+         *         .
          * @since 4.3
          */
         public static BitFieldArgs incrBy(BitFieldType bitFieldType, Offset offset, long value) {
@@ -130,10 +132,10 @@ public static BitFieldArgs incrBy(BitFieldType bitFieldType, Offset offset, long
         }
 
         /**
-         * Adds a new {@link Overflow} subcommand.
+         * Adds a new {@code OVERFLOW} subcommand.
          *
          * @param overflowType type of overflow, must not be {@literal null}.
-         * @return a new {@link Overflow} subcommand for the given {@code overflowType}.
+         * @return a new {@code OVERFLOW} subcommand for the given {@code overflowType}.
          */
         public static BitFieldArgs overflow(OverflowType overflowType) {
             return new BitFieldArgs().overflow(overflowType);
@@ -199,9 +201,9 @@ private BitFieldArgs addSubCommand(SubCommand subCommand) {
     }
 
     /**
-     * Adds a new {@link Get} subcommand using offset {@code 0} and the field type of the previous command.
+     * Adds a new {@code GET} subcommand using offset {@code 0} and the field type of the previous command.
      *
-     * @return a new {@link Get} subcommand for the given {@code bitFieldType} and {@code offset}.
+     * @return a new {@code GET} subcommand for the given {@code bitFieldType} and {@code offset}.
      * @throws IllegalStateException if no previous field type was found
      */
     public BitFieldArgs get() {
@@ -209,32 +211,32 @@ public BitFieldArgs get() {
     }
 
     /**
-     * Adds a new {@link Get} subcommand using offset {@code 0}.
+     * Adds a new {@code GET} subcommand using offset {@code 0}.
      *
      * @param bitFieldType the bit field type, must not be {@literal null}.
-     * @return a new {@link Get} subcommand for the given {@code bitFieldType} and {@code offset}.
+     * @return a new {@code GET} subcommand for the given {@code bitFieldType} and {@code offset}.
      */
     public BitFieldArgs get(BitFieldType bitFieldType) {
         return get(bitFieldType, 0);
     }
 
     /**
-     * Adds a new {@link Get} subcommand.
+     * Adds a new {@code GET} subcommand.
      *
      * @param bitFieldType the bit field type, must not be {@literal null}.
      * @param offset bitfield offset
-     * @return a new {@link Get} subcommand for the given {@code bitFieldType} and {@code offset}.
+     * @return a new {@code GET} subcommand for the given {@code bitFieldType} and {@code offset}.
      */
     public BitFieldArgs get(BitFieldType bitFieldType, int offset) {
         return addSubCommand(new Get(bitFieldType, false, offset));
     }
 
     /**
-     * Adds a new {@link Get} subcommand.
+     * Adds a new {@code GET} subcommand.
      *
      * @param bitFieldType the bit field type, must not be {@literal null}.
      * @param offset bitfield offset
-     * @return a new {@link Get} subcommand for the given {@code bitFieldType} and {@code offset}.
+     * @return a new {@code GET} subcommand for the given {@code bitFieldType} and {@code offset}.
      * @since 4.3
      */
     public BitFieldArgs get(BitFieldType bitFieldType, Offset offset) {
@@ -245,10 +247,10 @@ public BitFieldArgs get(BitFieldType bitFieldType, Offset offset) {
     }
 
     /**
-     * Adds a new {@link Get} subcommand using the field type of the previous command.
+     * Adds a new {@code GET} subcommand using the field type of the previous command.
      *
      * @param offset bitfield offset
-     * @return a new {@link Get} subcommand for the given {@code bitFieldType} and {@code offset}.
+     * @return a new {@code GET} subcommand for the given {@code bitFieldType} and {@code offset}.
      * @throws IllegalStateException if no previous field type was found
      */
     public BitFieldArgs get(int offset) {
@@ -256,10 +258,10 @@ public BitFieldArgs get(int offset) {
     }
 
     /**
-     * Adds a new {@link Set} subcommand using offset {@code 0} and the field type of the previous command.
+     * Adds a new {@code SET} subcommand using offset {@code 0} and the field type of the previous command.
      *
      * @param value the value
-     * @return a new {@link Set} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @return a new {@code SET} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      * @throws IllegalStateException if no previous field type was found
      */
     public BitFieldArgs set(long value) {
@@ -267,22 +269,22 @@ public BitFieldArgs set(long value) {
     }
 
     /**
-     * Adds a new {@link Set} subcommand using offset {@code 0}.
+     * Adds a new {@code SET} subcommand using offset {@code 0}.
      *
      * @param bitFieldType the bit field type, must not be {@literal null}.
      * @param value the value
-     * @return a new {@link Set} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @return a new {@code SET} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      */
     public BitFieldArgs set(BitFieldType bitFieldType, long value) {
         return set(bitFieldType, 0, value);
     }
 
     /**
-     * Adds a new {@link Set} subcommand using the field type of the previous command.
+     * Adds a new {@code SET} subcommand using the field type of the previous command.
      *
      * @param offset bitfield offset
      * @param value the value
-     * @return a new {@link Set} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @return a new {@code SET} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      * @throws IllegalStateException if no previous field type was found
      */
     public BitFieldArgs set(int offset, long value) {
@@ -290,24 +292,24 @@ public BitFieldArgs set(int offset, long value) {
     }
 
     /**
-     * Adds a new {@link Set} subcommand.
+     * Adds a new {@code SET} subcommand.
      *
      * @param bitFieldType the bit field type, must not be {@literal null}.
      * @param offset bitfield offset
      * @param value the value
-     * @return a new {@link Set} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @return a new {@code SET} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      */
     public BitFieldArgs set(BitFieldType bitFieldType, int offset, long value) {
         return addSubCommand(new Set(bitFieldType, false, offset, value));
     }
 
     /**
-     * Adds a new {@link Set} subcommand.
+     * Adds a new {@code SET} subcommand.
      *
      * @param bitFieldType the bit field type, must not be {@literal null}.
      * @param offset bitfield offset, must not be {@literal null}.
      * @param value the value
-     * @return a new {@link Set} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @return a new {@code SET} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      * @since 4.3
      */
     public BitFieldArgs set(BitFieldType bitFieldType, Offset offset, long value) {
@@ -318,10 +320,10 @@ public BitFieldArgs set(BitFieldType bitFieldType, Offset offset, long value) {
     }
 
     /**
-     * Adds a new {@link IncrBy} subcommand using offset {@code 0} and the field type of the previous command.
+     * Adds a new {@@code INCRBY} subcommand using offset {@code 0} and the field type of the previous command.
      *
      * @param value the value
-     * @return a new {@link IncrBy} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @return a new {@@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      * @throws IllegalStateException if no previous field type was found
      */
     public BitFieldArgs incrBy(long value) {
@@ -329,22 +331,22 @@ public BitFieldArgs incrBy(long value) {
     }
 
     /**
-     * Adds a new {@link IncrBy} subcommand using offset {@code 0}.
+     * Adds a new {@@code INCRBY} subcommand using offset {@code 0}.
      *
      * @param bitFieldType the bit field type, must not be {@literal null}.
      * @param value the value
-     * @return a new {@link IncrBy} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @return a new {@@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      */
     public BitFieldArgs incrBy(BitFieldType bitFieldType, long value) {
         return incrBy(bitFieldType, 0, value);
     }
 
     /**
-     * Adds a new {@link IncrBy} subcommand using the field type of the previous command.
+     * Adds a new {@@code INCRBY} subcommand using the field type of the previous command.
      *
      * @param offset bitfield offset
      * @param value the value
-     * @return a new {@link IncrBy} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @return a new {@@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      * @throws IllegalStateException if no previous field type was found
      */
     public BitFieldArgs incrBy(int offset, long value) {
@@ -352,24 +354,24 @@ public BitFieldArgs incrBy(int offset, long value) {
     }
 
     /**
-     * Adds a new {@link IncrBy} subcommand.
+     * Adds a new {@@code INCRBY} subcommand.
      *
      * @param bitFieldType the bit field type, must not be {@literal null}.
      * @param offset bitfield offset
      * @param value the value
-     * @return a new {@link IncrBy} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @return a new {@@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      */
     public BitFieldArgs incrBy(BitFieldType bitFieldType, int offset, long value) {
         return addSubCommand(new IncrBy(bitFieldType, false, offset, value));
     }
 
     /**
-     * Adds a new {@link IncrBy} subcommand.
+     * Adds a new {@@code INCRBY} subcommand.
      *
      * @param bitFieldType the bit field type, must not be {@literal null}.
      * @param offset bitfield offset, must not be {@literal null}.
      * @param value the value
-     * @return a new {@link IncrBy} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @return a new {@@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      * @since 4.3
      */
     public BitFieldArgs incrBy(BitFieldType bitFieldType, Offset offset, long value) {
@@ -380,10 +382,10 @@ public BitFieldArgs incrBy(BitFieldType bitFieldType, Offset offset, long value)
     }
 
     /**
-     * Adds a new {@link Overflow} subcommand.
+     * Adds a new {@code OVERFLOW} subcommand.
      *
      * @param overflowType type of overflow, must not be {@literal null}.
-     * @return a new {@link Overflow} subcommand for the given {@code overflowType}.
+     * @return a new {@code OVERFLOW} subcommand for the given {@code overflowType}.
      */
     public BitFieldArgs overflow(OverflowType overflowType) {
         return addSubCommand(new Overflow(overflowType));

From b12b136599a42ef80afcd2ce5835ae54effadad4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 31 Jul 2017 10:22:40 +0200
Subject: [PATCH 280/808] Update maven badge to io.lettuce coordinates

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9ba99b4645..d7eeee688d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ lettuce - Advanced Java Redis client
 ===============================
 
 [![Build Status](https://travis-ci.org/lettuce-io/lettuce-core.svg)](https://travis-ci.org/lettuce-io/lettuce-core) [![codecov](https://codecov.io/gh/lettuce-io/lettuce-core/branch/master/graph/badge.svg)](https://codecov.io/gh/lettuce-io/lettuce-core)
- [![Maven Central](https://maven-badges.herokuapp.com/maven-central/biz.paluch.redis/lettuce/badge.svg)](https://maven-badges.herokuapp.com/maven-central/biz.paluch.redis/lettuce)
+ [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.lettuce/lettuce-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.lettuce/lettuce-core)
 
 Lettuce is a scalable thread-safe Redis client for synchronous,
 asynchronous and reactive usage. Multiple threads may share one connection if they avoid blocking and transactional

From 162e9e3810e5e6fd7c82f6ece268e88708e33c24 Mon Sep 17 00:00:00 2001
From: Andrew Hart <andrew.hart@xyleminc.com>
Date: Thu, 17 Aug 2017 18:29:07 -0600
Subject: [PATCH 281/808] Fix IllegalArgumentException in
 RedisClient.connectSentinel #588

Use appropriate RedisURI for socket address resolution. The resolved socket address is logged on debug level.
---
 src/main/java/io/lettuce/core/RedisClient.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 59d699e888..e400470294 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -542,7 +542,7 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
                 connectionBuilder.socketAddressSupplier(getSocketAddressSupplier(uri));
 
                 if (logger.isDebugEnabled()) {
-                    SocketAddress socketAddress = SocketAddressResolver.resolve(redisURI, clientResources.dnsResolver());
+                    SocketAddress socketAddress = SocketAddressResolver.resolve(uri, clientResources.dnsResolver());
                     logger.debug("Connecting to Redis Sentinel, address: " + socketAddress);
                 }
                 try {

From a02bb28e6f962d1ad70383d0d5f43681d9de662c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 25 Aug 2017 15:05:58 +0200
Subject: [PATCH 282/808] Reinstantiate lenient acceptance of non-array
 responses #589

NestedMultiOutput now accepts non-array responses again. Previously, NestedMultiOutput expected only array responses to which require multi(n) to initialize the result list.
---
 .../io/lettuce/core/output/NestedMultiOutput.java   | 13 ++++++++++++-
 .../lettuce/core/commands/ScriptingCommandTest.java | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/output/NestedMultiOutput.java b/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
index 9afd0b1a65..630e52f5f4 100644
--- a/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.List;
@@ -44,11 +45,21 @@ public NestedMultiOutput(RedisCodec<K, V> codec) {
 
     @Override
     public void set(long integer) {
+
+        if (!initialized) {
+            output = new ArrayList<>();
+        }
+
         output.add(integer);
     }
 
     @Override
     public void set(ByteBuffer bytes) {
+
+        if (!initialized) {
+            output = new ArrayList<>();
+        }
+
         output.add(bytes == null ? null : codec.decodeValue(bytes));
     }
 
@@ -64,7 +75,7 @@ public void complete(int depth) {
     public void multi(int count) {
 
         if (!initialized) {
-            output = OutputFactory.newList(count);
+            output = OutputFactory.newList(Math.max(1, count));
             initialized = true;
         }
 
diff --git a/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java b/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
index 6006959f39..022ff7c245 100644
--- a/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 import static io.lettuce.core.ScriptOutputType.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.junit.After;
@@ -66,6 +67,16 @@ public void eval() throws Exception {
         redis.eval("return {err='Oops!'}", STATUS);
     }
 
+    @Test
+    public void evalWithSingleKey() throws Exception {
+        assertThat((List<?>) redis.eval("return KEYS[1]", MULTI, "one")).isEqualTo(list("one"));
+    }
+
+    @Test
+    public void evalReturningNullInMulti() throws Exception {
+        assertThat((List<?>) redis.eval("return nil", MULTI, "one")).isEqualTo(Collections.singletonList(null));
+    }
+
     @Test
     public void evalWithKeys() throws Exception {
         assertThat((List<?>) redis.eval("return {KEYS[1], KEYS[2]}", MULTI, "one", "two")).isEqualTo(list("one", "two"));

From 911f94c58a77b044a25432e1ea24ea7bc0b729e3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 25 Aug 2017 23:36:27 +0200
Subject: [PATCH 283/808] Use LinkedBlockingQueue in test to avoid visibility
 issues

---
 src/test/java/io/lettuce/core/ClientMetricsTest.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/test/java/io/lettuce/core/ClientMetricsTest.java b/src/test/java/io/lettuce/core/ClientMetricsTest.java
index fe2529c680..9cca1ed562 100644
--- a/src/test/java/io/lettuce/core/ClientMetricsTest.java
+++ b/src/test/java/io/lettuce/core/ClientMetricsTest.java
@@ -18,9 +18,9 @@
 import static io.lettuce.core.AbstractRedisClientTest.client;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Collection;
 import java.util.Set;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.AfterClass;
@@ -32,7 +32,6 @@
 import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
-
 import io.lettuce.TestClientResources;
 import io.lettuce.Wait;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -67,7 +66,7 @@ public static void afterClass() {
     @Test
     public void testMetricsEvent() throws Exception {
 
-        List<CommandLatencyEvent> events = new ArrayList<>();
+        Collection<CommandLatencyEvent> events = new LinkedBlockingQueue<>();
         EventBus eventBus = client.getResources().eventBus();
         MetricEventPublisher publisher = (MetricEventPublisher) ReflectionTestUtils.getField(client.getResources(),
                 "metricEventPublisher");

From 92d043643550d17318e4cf465565ef80a6d50f11 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 26 Aug 2017 00:22:01 +0200
Subject: [PATCH 284/808] Disable metrics tests

---
 .../io/lettuce/core/ClientMetricsTest.java    | 34 -------------------
 1 file changed, 34 deletions(-)

diff --git a/src/test/java/io/lettuce/core/ClientMetricsTest.java b/src/test/java/io/lettuce/core/ClientMetricsTest.java
index 9cca1ed562..93774e2d98 100644
--- a/src/test/java/io/lettuce/core/ClientMetricsTest.java
+++ b/src/test/java/io/lettuce/core/ClientMetricsTest.java
@@ -19,9 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Collection;
-import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
 
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -30,16 +28,12 @@
 import org.springframework.test.util.ReflectionTestUtils;
 
 import reactor.core.Disposable;
-import reactor.core.publisher.Flux;
-import reactor.test.StepVerifier;
 import io.lettuce.TestClientResources;
 import io.lettuce.Wait;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.event.EventBus;
 import io.lettuce.core.event.metrics.CommandLatencyEvent;
 import io.lettuce.core.event.metrics.MetricEventPublisher;
-import io.lettuce.core.metrics.CommandLatencyId;
-import io.lettuce.core.metrics.CommandMetrics;
 
 /**
  * @author Mark Paluch
@@ -85,34 +79,6 @@ public void testMetricsEvent() throws Exception {
         disposable.dispose();
     }
 
-    @Test
-    public void testMetrics() throws Exception {
-
-        EventBus eventBus = client.getResources().eventBus();
-        MetricEventPublisher publisher = (MetricEventPublisher) ReflectionTestUtils.getField(client.getResources(),
-                "metricEventPublisher");
-
-        Flux<CommandLatencyEvent> flux = eventBus.get().filter(redisEvent -> redisEvent instanceof CommandLatencyEvent)
-                .cast(CommandLatencyEvent.class);
-
-        StepVerifier.create(flux).then(() -> {
-            generateTestData();
-            publisher.emitMetricsEvent();
-        }).consumeNextWith(actual -> {
-            // just consume
-            }).consumeNextWith(actual -> {
-
-            Set<CommandLatencyId> ids = actual.getLatencies().keySet();
-            CommandMetrics commandMetrics = actual.getLatencies().get(ids.iterator().next());
-            assertThat(commandMetrics.getCompletion().getMin()).isBetween(0L, TimeUnit.MILLISECONDS.toMicros(100));
-            assertThat(commandMetrics.getCompletion().getMax()).isBetween(0L, TimeUnit.MILLISECONDS.toMicros(200));
-
-            assertThat(commandMetrics.getFirstResponse().getMin()).isBetween(0L, TimeUnit.MILLISECONDS.toMicros(100));
-            assertThat(commandMetrics.getFirstResponse().getMax()).isBetween(0L, TimeUnit.MILLISECONDS.toMicros(200));
-        }).thenCancel().verify();
-
-    }
-
     private void generateTestData() {
         redis.set(key, value);
         redis.set(key, value);

From b2c02f6d47a034fda7d39dc2f0c248d5e20080ff Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 26 Aug 2017 00:27:00 +0200
Subject: [PATCH 285/808] Fix javadoc

---
 .../java/io/lettuce/core/BitFieldArgs.java    | 34 +++++++++----------
 .../core/cluster/RedisClusterClient.java      |  4 +--
 .../lettuce/core/codec/ToByteBufEncoder.java  |  4 +--
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/main/java/io/lettuce/core/BitFieldArgs.java b/src/main/java/io/lettuce/core/BitFieldArgs.java
index f320474171..d867ded05f 100644
--- a/src/main/java/io/lettuce/core/BitFieldArgs.java
+++ b/src/main/java/io/lettuce/core/BitFieldArgs.java
@@ -105,26 +105,24 @@ public static BitFieldArgs set(BitFieldType bitFieldType, Offset offset, long va
         }
 
         /**
-         * Create a new {@@code INCRBY} subcommand.
+         * Create a new {@code INCRBY} subcommand.
          *
          * @param bitFieldType the bit field type, must not be {@literal null}.
          * @param offset bitfield offset
          * @param value the value
-         * @return a new {@@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}
-         *         .
+         * @return a new {@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value} .
          */
         public static BitFieldArgs incrBy(BitFieldType bitFieldType, int offset, long value) {
             return new BitFieldArgs().incrBy(bitFieldType, offset, value);
         }
 
         /**
-         * Create a new {@@code INCRBY} subcommand.
+         * Create a new {@code INCRBY} subcommand.
          *
          * @param bitFieldType the bit field type, must not be {@literal null}.
          * @param offset bitfield offset, must not be {@literal null}.
          * @param value the value
-         * @return a new {@@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}
-         *         .
+         * @return a new {@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value} .
          * @since 4.3
          */
         public static BitFieldArgs incrBy(BitFieldType bitFieldType, Offset offset, long value) {
@@ -320,10 +318,10 @@ public BitFieldArgs set(BitFieldType bitFieldType, Offset offset, long value) {
     }
 
     /**
-     * Adds a new {@@code INCRBY} subcommand using offset {@code 0} and the field type of the previous command.
+     * Adds a new {@code INCRBY} subcommand using offset {@code 0} and the field type of the previous command.
      *
      * @param value the value
-     * @return a new {@@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @return a new {@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      * @throws IllegalStateException if no previous field type was found
      */
     public BitFieldArgs incrBy(long value) {
@@ -331,22 +329,22 @@ public BitFieldArgs incrBy(long value) {
     }
 
     /**
-     * Adds a new {@@code INCRBY} subcommand using offset {@code 0}.
+     * Adds a new {@code INCRBY} subcommand using offset {@code 0}.
      *
      * @param bitFieldType the bit field type, must not be {@literal null}.
      * @param value the value
-     * @return a new {@@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @return a new {@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      */
     public BitFieldArgs incrBy(BitFieldType bitFieldType, long value) {
         return incrBy(bitFieldType, 0, value);
     }
 
     /**
-     * Adds a new {@@code INCRBY} subcommand using the field type of the previous command.
+     * Adds a new {@code INCRBY} subcommand using the field type of the previous command.
      *
      * @param offset bitfield offset
      * @param value the value
-     * @return a new {@@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @return a new {@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      * @throws IllegalStateException if no previous field type was found
      */
     public BitFieldArgs incrBy(int offset, long value) {
@@ -354,24 +352,24 @@ public BitFieldArgs incrBy(int offset, long value) {
     }
 
     /**
-     * Adds a new {@@code INCRBY} subcommand.
+     * Adds a new {@code INCRBY} subcommand.
      *
      * @param bitFieldType the bit field type, must not be {@literal null}.
      * @param offset bitfield offset
      * @param value the value
-     * @return a new {@@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @return a new {@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      */
     public BitFieldArgs incrBy(BitFieldType bitFieldType, int offset, long value) {
         return addSubCommand(new IncrBy(bitFieldType, false, offset, value));
     }
 
     /**
-     * Adds a new {@@code INCRBY} subcommand.
+     * Adds a new {@code INCRBY} subcommand.
      *
      * @param bitFieldType the bit field type, must not be {@literal null}.
      * @param offset bitfield offset, must not be {@literal null}.
      * @param value the value
-     * @return a new {@@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
+     * @return a new {@code INCRBY} subcommand for the given {@code bitFieldType}, {@code offset} and {@code value}.
      * @since 4.3
      */
     public BitFieldArgs incrBy(BitFieldType bitFieldType, Offset offset, long value) {
@@ -637,8 +635,8 @@ private Offset(boolean multiplyByTypeWidth, int offset) {
         }
 
         /**
-         * @return {@literal true} if the offset should be multiplied by integer width that is represented with a leading hash
-         *         ({@code #}) when constructing the command
+         * @return {@literal true} if the offset should be multiplied by integer width that is represented with a leading hash (
+         *         {@code #}) when constructing the command
          */
         public boolean isMultiplyByTypeWidth() {
             return multiplyByTypeWidth;
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 620be9a7ae..11d4229817 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -1003,12 +1003,12 @@ protected Iterable<RedisURI> getTopologyRefreshSource() {
     }
 
     /**
-     * Returns {@link true} if {@link ClusterTopologyRefreshOptions#useDynamicRefreshSources() dynamic refresh sources} are
+     * Returns {@literal true} if {@link ClusterTopologyRefreshOptions#useDynamicRefreshSources() dynamic refresh sources} are
      * enabled.
      * <p>
      * Subclasses of {@link RedisClusterClient} may override that method.
      *
-     * @return {@link true} if dynamic refresh sources are used.
+     * @return {@literal true} if dynamic refresh sources are used.
      * @see ClusterTopologyRefreshOptions#useDynamicRefreshSources()
      */
     protected boolean useDynamicRefreshSources() {
diff --git a/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java b/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java
index dbc52acaf3..dc83de065f 100644
--- a/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java
+++ b/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ public interface ToByteBufEncoder<K, V> {
      * Estimates the size of the resulting byte stream. This method is called for keys and values to estimate the size for the
      * temporary buffer to allocate.
      *
-     * @param keyOrValue the key or value, may be {@link null}.
+     * @param keyOrValue the key or value, may be {@literal null}.
      * @return the estimated number of bytes in the encoded representation.
      */
     int estimateSize(Object keyOrValue);

From 460d1b5bb8bc9d313a231efaad7531bbe6b9f56a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 27 Aug 2017 15:04:21 +0200
Subject: [PATCH 286/808] Fix GeoCoordinatesListOutput output initialization
 #591

Use array size count instead dividing by two.
---
 .../io/lettuce/core/output/GeoCoordinatesListOutput.java | 2 +-
 .../java/io/lettuce/core/commands/GeoCommandTest.java    | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
index 538034dc19..d575ea1cf8 100644
--- a/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
@@ -60,7 +60,7 @@ public void set(ByteBuffer bytes) {
     public void multi(int count) {
 
         if (!initialized) {
-            output = OutputFactory.newList(count / 2);
+            output = OutputFactory.newList(count);
             initialized = true;
         }
 
diff --git a/src/test/java/io/lettuce/core/commands/GeoCommandTest.java b/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
index 8ffc3b825e..513438e98c 100644
--- a/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -161,7 +161,12 @@ public void geopos() throws Exception {
 
         prepareGeo();
 
-        List<GeoCoordinates> geopos = redis.geopos(key, "Weinheim", "foobar", "Bahn");
+        List<GeoCoordinates> geopos = redis.geopos(key, "Weinheim");
+
+        assertThat(geopos).hasSize(1);
+        assertThat(geopos.get(0).getX().doubleValue()).isEqualTo(8.6638, offset(0.001));
+
+        geopos = redis.geopos(key, "Weinheim", "foobar", "Bahn");
 
         assertThat(geopos).hasSize(3);
         assertThat(geopos.get(0).getX().doubleValue()).isEqualTo(8.6638, offset(0.001));

From c429abdd1fda9178e28159967118ea970cd4a058 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 27 Aug 2017 15:44:39 +0200
Subject: [PATCH 287/808] =?UTF-8?q?Execute=20RedisAdvancedClusterCommands.?=
 =?UTF-8?q?scriptLoad(=E2=80=A6)=20on=20all=20nodes=20#590?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Calls to scriptLoad(…) to load a Lua script to the server cache is now executed on all cluster nodes. Calling a script via evalSha no longer requires client-code iterating and load on all server nodes but is done by Lettuce.
---
 .../core/cluster/MultiNodeExecution.java      | 54 ++++++++++++++-----
 ...RedisAdvancedClusterAsyncCommandsImpl.java |  8 +++
 ...isAdvancedClusterReactiveCommandsImpl.java | 24 +++++----
 .../RedisAdvancedClusterAsyncCommands.java    | 10 +++-
 .../RedisAdvancedClusterReactiveCommands.java | 15 ++++--
 .../cluster/AdvancedClusterClientTest.java    | 16 ++++++
 .../cluster/AdvancedClusterReactiveTest.java  | 16 ++++++
 7 files changed, 116 insertions(+), 27 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java b/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
index b6aa42c74d..28a85664c6 100644
--- a/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
+++ b/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
@@ -35,6 +35,9 @@ class MultiNodeExecution {
     static <T> T execute(Callable<T> function) {
         try {
             return function.call();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RedisCommandInterruptedException(e);
         } catch (Exception e) {
             throw new RedisException(e);
         }
@@ -83,27 +86,52 @@ protected static <T> RedisFuture<T> firstOfAsync(Map<?, ? extends CompletionStag
     }
 
     /**
-     * Returns always {@literal OK} and guarantee that all futures are finished.
+     * Returns the result of the last {@link RedisFuture} and guarantee that all futures are finished.
      *
      * @param executions mapping of a key to the future
+     * @param <T> result type
      * @return future returning the first result.
      */
-    protected static RedisFuture<String> alwaysOkOfAsync(Map<?, ? extends CompletionStage<String>> executions) {
+    static <T> RedisFuture<T> lastOfAsync(Map<?, ? extends CompletionStage<T>> executions) {
 
         return new PipelinedRedisFuture<>(executions, objectPipelinedRedisFuture -> {
             // make sure, that all futures are executed before returning the result.
-                for (CompletionStage<String> future : executions.values()) {
-                    try {
-                        future.toCompletableFuture().get();
-                    } catch (InterruptedException e) {
-                        Thread.currentThread().interrupt();
-                        throw new RedisCommandInterruptedException(e);
-                    } catch (ExecutionException e) {
-                        // swallow exceptions
+                T result = null;
+                for (CompletionStage<T> future : executions.values()) {
+                    result = execute(() -> future.toCompletableFuture().get());
+                }
+                return result;
+            });
+    }
+
+    /**
+     * Returns always {@literal OK} and guarantee that all futures are finished.
+     *
+     * @param executions mapping of a key to the future
+     * @return future returning the first result.
+     */
+    static RedisFuture<String> alwaysOkOfAsync(Map<?, ? extends CompletionStage<String>> executions) {
+
+        return new PipelinedRedisFuture<>(executions, objectPipelinedRedisFuture -> {
+
+            synchronize(executions);
+
+            return "OK";
+        });
+    }
+
+    private static void synchronize(Map<?, ? extends CompletionStage<String>> executions) {
+
+        // make sure, that all futures are executed before returning the result.
+        for (CompletionStage<String> future : executions.values()) {
+            try {
+                future.toCompletableFuture().get();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new RedisCommandInterruptedException(e);
+            } catch (ExecutionException e) {
+                // swallow exceptions
             }
         }
-        return "OK";
-
-    }   );
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index 8b656e28cb..bd3232c217 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -405,6 +405,14 @@ public RedisFuture<String> scriptKill() {
         return MultiNodeExecution.alwaysOkOfAsync(executions);
     }
 
+    @Override
+    public RedisFuture<String> scriptLoad(V script) {
+
+        Map<String, CompletableFuture<String>> executions = executeOnNodes(cmd -> cmd.scriptLoad(script),
+                redisClusterNode -> true);
+        return MultiNodeExecution.lastOfAsync(executions);
+    }
+
     @Override
     public void shutdown(boolean save) {
 
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index b2484cb8aa..29c6e7e322 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -26,6 +26,7 @@
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import org.reactivestreams.Publisher;
@@ -54,6 +55,8 @@
 public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedisReactiveCommands<K, V> implements
         RedisAdvancedClusterReactiveCommands<K, V> {
 
+    private static final Predicate<RedisClusterNode> ALL_NODES = node -> true;
+
     private final RedisCodec<K, V> codec;
 
     /**
@@ -339,22 +342,25 @@ public Mono<V> randomkey() {
 
     @Override
     public Mono<String> scriptFlush() {
-        Map<String, Flux<String>> publishers = executeOnNodes((commands) -> commands.scriptFlush().flux(),
-                redisClusterNode -> true);
+        Map<String, Flux<String>> publishers = executeOnNodes((commands) -> commands.scriptFlush().flux(), ALL_NODES);
         return Flux.merge(publishers.values()).last();
     }
 
     @Override
     public Mono<String> scriptKill() {
-        Map<String, Flux<String>> publishers = executeOnNodes((commands) -> commands.scriptFlush().flux(),
-                redisClusterNode -> true);
+        Map<String, Flux<String>> publishers = executeOnNodes((commands) -> commands.scriptFlush().flux(), ALL_NODES);
         return Flux.merge(publishers.values()).onErrorReturn("OK").last();
     }
 
+    @Override
+    public Mono<String> scriptLoad(V script) {
+        Map<String, Flux<String>> publishers = executeOnNodes((commands) -> commands.scriptLoad(script), ALL_NODES);
+        return Flux.merge(publishers.values()).last();
+    }
+
     @Override
     public Mono<Void> shutdown(boolean save) {
-        Map<String, Flux<Void>> publishers = executeOnNodes(commands -> commands.shutdown(save).flux(),
-                redisClusterNode -> true);
+        Map<String, Flux<Void>> publishers = executeOnNodes(commands -> commands.shutdown(save).flux(), ALL_NODES);
         return Flux.merge(publishers.values()).then();
     }
 
@@ -525,14 +531,14 @@ protected <T> Map<String, Flux<T>> executeOnMasters(Function<RedisClusterReactiv
      * @param <T> result type
      * @return map of a key (counter) and commands.
      */
-    protected <T> Map<String, Flux<T>> executeOnNodes(Function<RedisClusterReactiveCommands<K, V>, Flux<T>> function,
-            Function<RedisClusterNode, Boolean> filter) {
+    protected <T, P extends Flux<T>> Map<String, Flux<T>> executeOnNodes(
+            Function<RedisClusterReactiveCommands<K, V>, ? extends Publisher<T>> function, Predicate<RedisClusterNode> filter) {
 
         Map<String, Flux<T>> executions = new HashMap<>();
 
         for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
 
-            if (!filter.apply(redisClusterNode)) {
+            if (!filter.test(redisClusterNode)) {
                 continue;
             }
 
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
index 25941a6363..5730fcbfa7 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -267,6 +267,14 @@ default AsyncNodeSelection<K, V> all() {
      */
     RedisFuture<String> scriptKill();
 
+    /**
+     * Load the specified Lua script into the script cache on all cluster nodes.
+     *
+     * @param script script content
+     * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     */
+    RedisFuture<String> scriptLoad(V script);
+
     /**
      * Synchronously save the dataset to disk and then shut down all nodes of the cluster.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
index cc3a3bf356..1c760eba7c 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
 
 import java.util.Map;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import io.lettuce.core.*;
 import io.lettuce.core.api.reactive.RedisKeyReactiveCommands;
 import io.lettuce.core.api.reactive.RedisScriptingReactiveCommands;
@@ -26,9 +28,6 @@
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.output.KeyStreamingChannel;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 /**
  * Advanced reactive and thread-safe Redis Cluster API.
  *
@@ -200,6 +199,14 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      */
     Mono<String> scriptKill();
 
+    /**
+     * Load the specified Lua script into the script cache on all cluster nodes.
+     *
+     * @param script script content
+     * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     */
+    Mono<String> scriptLoad(V script);
+
     /**
      * Synchronously save the dataset to disk and then shut down all nodes of the cluster.
      *
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
index df799decaa..9865757a5c 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
@@ -372,6 +372,22 @@ public void scriptKill() throws Exception {
         assertThat(syncCommands.scriptKill()).isEqualTo("OK");
     }
 
+    @Test
+    public void scriptLoad() throws Exception {
+
+        assertThat(syncCommands.scriptFlush()).isEqualTo("OK");
+
+        String script = "return true";
+
+        String sha = LettuceStrings.digest(script.getBytes());
+        assertThat(syncCommands.scriptExists(sha)).contains(false);
+
+        String returnedSha = syncCommands.scriptLoad(script);
+
+        assertThat(returnedSha).isEqualTo(sha);
+        assertThat(syncCommands.scriptExists(sha)).contains(true);
+    }
+
     @Test
     @Ignore("Run me manually, I will shutdown all your cluster nodes so you need to restart the Redis Cluster after this test")
     public void shutdown() throws Exception {
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
index 6853ea56f0..c5f3d72214 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
@@ -259,6 +259,22 @@ public void scriptKill() {
         StepVerifier.create(commands.scriptKill()).expectNext("OK").verifyComplete();
     }
 
+    @Test
+    public void scriptLoad() throws Exception {
+
+        scriptFlush();
+
+        String script = "return true";
+
+        String sha = LettuceStrings.digest(script.getBytes());
+
+        StepVerifier.create(commands.scriptExists(sha)).expectNext(false).verifyComplete();
+
+        StepVerifier.create(commands.scriptLoad(script)).expectNext(sha).verifyComplete();
+
+        StepVerifier.create(commands.scriptExists(sha)).expectNext(true).verifyComplete();
+    }
+
     @Test
     @Ignore("Run me manually, I will shutdown all your cluster nodes so you need to restart the Redis Cluster after this test")
     public void shutdown() {

From 70ba990556d76f0feeece9c83d05099f055b2b62 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 27 Aug 2017 16:00:01 +0200
Subject: [PATCH 288/808] Polishing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reduce executeOn…(…) publisher type from Flux to Publisher.
---
 ...isAdvancedClusterReactiveCommandsImpl.java | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index 29c6e7e322..bf98284e48 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -36,6 +36,8 @@
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.reactive.RedisKeyReactiveCommands;
+import io.lettuce.core.api.reactive.RedisScriptingReactiveCommands;
+import io.lettuce.core.api.reactive.RedisServerReactiveCommands;
 import io.lettuce.core.cluster.ClusterConnectionProvider.Intent;
 import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
 import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands;
@@ -108,7 +110,6 @@ public Mono<String> clientSetname(K name) {
     public Mono<Long> clusterCountKeysInSlot(int slot) {
 
         Mono<RedisClusterReactiveCommands<K, V>> connectionBySlot = findConnectionBySlotReactive(slot);
-
         return connectionBySlot.flatMap(cmd -> cmd.clusterCountKeysInSlot(slot));
     }
 
@@ -116,14 +117,13 @@ public Mono<Long> clusterCountKeysInSlot(int slot) {
     public Flux<K> clusterGetKeysInSlot(int slot, int count) {
 
         Mono<RedisClusterReactiveCommands<K, V>> connectionBySlot = findConnectionBySlotReactive(slot);
-
         return connectionBySlot.flatMapMany(conn -> conn.clusterGetKeysInSlot(slot, count));
     }
 
     @Override
     public Mono<Long> dbsize() {
 
-        Map<String, Flux<Long>> publishers = executeOnMasters((commands) -> commands.dbsize().flux());
+        Map<String, Publisher<Long>> publishers = executeOnMasters(RedisServerReactiveCommands::dbsize);
         return Flux.merge(publishers.values()).reduce((accu, next) -> accu + next);
     }
 
@@ -177,15 +177,14 @@ public Mono<Long> exists(Iterable<K> keys) {
     @Override
     public Mono<String> flushall() {
 
-        Map<String, Flux<String>> publishers = executeOnMasters((kvRedisClusterReactiveCommancommandss) -> kvRedisClusterReactiveCommancommandss
-                .flushall().flux());
+        Map<String, Publisher<String>> publishers = executeOnMasters(RedisServerReactiveCommands::flushall);
         return Flux.merge(publishers.values()).last();
     }
 
     @Override
     public Mono<String> flushdb() {
 
-        Map<String, Flux<String>> publishers = executeOnMasters((commands) -> commands.flushdb().flux());
+        Map<String, Publisher<String>> publishers = executeOnMasters(RedisServerReactiveCommands::flushdb);
         return Flux.merge(publishers.values()).last();
     }
 
@@ -233,14 +232,14 @@ public Flux<GeoWithin<V>> georadiusbymember(K key, V member, double distance, Ge
     @Override
     public Flux<K> keys(K pattern) {
 
-        Map<String, Flux<K>> publishers = executeOnMasters(commands -> commands.keys(pattern));
+        Map<String, Publisher<K>> publishers = executeOnMasters(commands -> commands.keys(pattern));
         return Flux.merge(publishers.values());
     }
 
     @Override
     public Mono<Long> keys(KeyStreamingChannel<K> channel, K pattern) {
 
-        Map<String, Flux<Long>> publishers = executeOnMasters(commands -> commands.keys(channel, pattern).flux());
+        Map<String, Publisher<Long>> publishers = executeOnMasters(commands -> commands.keys(channel, pattern));
         return Flux.merge(publishers.values()).reduce((accu, next) -> accu + next);
     }
 
@@ -342,25 +341,25 @@ public Mono<V> randomkey() {
 
     @Override
     public Mono<String> scriptFlush() {
-        Map<String, Flux<String>> publishers = executeOnNodes((commands) -> commands.scriptFlush().flux(), ALL_NODES);
+        Map<String, Publisher<String>> publishers = executeOnNodes(RedisScriptingReactiveCommands::scriptFlush, ALL_NODES);
         return Flux.merge(publishers.values()).last();
     }
 
     @Override
     public Mono<String> scriptKill() {
-        Map<String, Flux<String>> publishers = executeOnNodes((commands) -> commands.scriptFlush().flux(), ALL_NODES);
+        Map<String, Publisher<String>> publishers = executeOnNodes(RedisScriptingReactiveCommands::scriptFlush, ALL_NODES);
         return Flux.merge(publishers.values()).onErrorReturn("OK").last();
     }
 
     @Override
     public Mono<String> scriptLoad(V script) {
-        Map<String, Flux<String>> publishers = executeOnNodes((commands) -> commands.scriptLoad(script), ALL_NODES);
+        Map<String, Publisher<String>> publishers = executeOnNodes((commands) -> commands.scriptLoad(script), ALL_NODES);
         return Flux.merge(publishers.values()).last();
     }
 
     @Override
     public Mono<Void> shutdown(boolean save) {
-        Map<String, Flux<Void>> publishers = executeOnNodes(commands -> commands.shutdown(save).flux(), ALL_NODES);
+        Map<String, Publisher<Void>> publishers = executeOnNodes(commands -> commands.shutdown(save), ALL_NODES);
         return Flux.merge(publishers.values()).then();
     }
 
@@ -381,7 +380,7 @@ public Mono<Long> touch(Iterable<K> keys) {
         List<Publisher<Long>> publishers = new ArrayList<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            publishers.add(super.touch(entry.getValue()).flux());
+            publishers.add(super.touch(entry.getValue()));
         }
 
         return Flux.merge(publishers).reduce((accu, next) -> accu + next);
@@ -519,7 +518,8 @@ private <T> Flux<T> pipeliningWithMap(Map<K, V> map, Function<Map<K, V>, Flux<T>
      * @param <T> result type
      * @return map of a key (counter) and commands.
      */
-    protected <T> Map<String, Flux<T>> executeOnMasters(Function<RedisClusterReactiveCommands<K, V>, Flux<T>> function) {
+    protected <T> Map<String, Publisher<T>> executeOnMasters(
+            Function<RedisClusterReactiveCommands<K, V>, ? extends Publisher<T>> function) {
         return executeOnNodes(function, redisClusterNode -> redisClusterNode.is(MASTER));
     }
 
@@ -531,10 +531,10 @@ protected <T> Map<String, Flux<T>> executeOnMasters(Function<RedisClusterReactiv
      * @param <T> result type
      * @return map of a key (counter) and commands.
      */
-    protected <T, P extends Flux<T>> Map<String, Flux<T>> executeOnNodes(
+    protected <T> Map<String, Publisher<T>> executeOnNodes(
             Function<RedisClusterReactiveCommands<K, V>, ? extends Publisher<T>> function, Predicate<RedisClusterNode> filter) {
 
-        Map<String, Flux<T>> executions = new HashMap<>();
+        Map<String, Publisher<T>> executions = new HashMap<>();
 
         for (RedisClusterNode redisClusterNode : getStatefulConnection().getPartitions()) {
 

From 9a733f909bb016926f6f9a2a5b0f8e1d0f0e9c46 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 8 Sep 2017 12:11:28 +0200
Subject: [PATCH 289/808] Upgrade to netty 4.1.15 #600

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 85fcd550f0..8022b5289f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
-        <netty-version>4.1.13.Final</netty-version>
+        <netty-version>4.1.15.Final</netty-version>
         <spring-version>5.0.0.RC2</spring-version>
         <reactor-version>Bismuth-M3</reactor-version>
     </properties>

From d8ba023e7b039fb1dd19d0f805740a34e8b44904 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 11 Sep 2017 09:42:49 +0200
Subject: [PATCH 290/808] Move to LinkedBlockingQueue in SimpleBatcher #602

JCTools no longer ship with MpscLinkedAtomicQueue.
---
 src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java b/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java
index ab881081ef..4ba97b21f9 100644
--- a/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java
+++ b/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java
@@ -18,6 +18,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import io.lettuce.core.api.StatefulConnection;
@@ -25,10 +27,8 @@
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.RedisCommand;
 
-import io.netty.util.internal.shaded.org.jctools.queues.atomic.MpscLinkedAtomicQueue;
-
 /**
- * Simple threadsafe and lock-free {@link Batcher} that flushes queued command when either:
+ * Simple threadsafe {@link Batcher} that flushes queued command when either:
  * <ul>
  * <li>Reaches the configured {@link #batchSize}</li>
  * <li>Encounters a {@link CommandBatching#flush() force flush}</li>
@@ -40,7 +40,7 @@ class SimpleBatcher implements Batcher {
 
     private final StatefulConnection<Object, Object> connection;
     private final int batchSize;
-    private final MpscLinkedAtomicQueue<RedisCommand<Object, Object, Object>> queue = new MpscLinkedAtomicQueue<>();
+    private final BlockingQueue<RedisCommand<Object, Object, Object>> queue = new LinkedBlockingQueue<>();
     private final AtomicBoolean flushing = new AtomicBoolean();
 
     public SimpleBatcher(StatefulConnection<Object, Object> connection, int batchSize) {

From 981a8d1321f0ba05050107e5be21ebfee1e6a0d3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 11 Sep 2017 09:59:47 +0200
Subject: [PATCH 291/808] Upgrade to Reactor Core 3.1.0 RC1 #602

---
 pom.xml                                           |  2 +-
 src/main/java/io/lettuce/core/RedisPublisher.java | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8022b5289f..a15b7be1d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <skipTests>true</skipTests>
         <netty-version>4.1.15.Final</netty-version>
         <spring-version>5.0.0.RC2</spring-version>
-        <reactor-version>Bismuth-M3</reactor-version>
+        <reactor-version>Bismuth-M4</reactor-version>
     </properties>
 
     <scm>
diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index 5ec73b3209..b899154539 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -27,9 +27,11 @@
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 
+import reactor.core.CoreSubscriber;
 import reactor.core.Exceptions;
 import reactor.core.publisher.Operators;
 import reactor.util.concurrent.Queues;
+import reactor.util.context.Context;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.internal.LettuceAssert;
@@ -232,7 +234,12 @@ public void onNext(T t) {
 
             if (!data.offer(t)) {
 
-                Throwable e = Operators.onOperatorError(this, Exceptions.failWithOverflow(), t);
+                Context context = Context.empty();
+                if (subscriber instanceof CoreSubscriber) {
+                    context = ((CoreSubscriber) subscriber).currentContext();
+                }
+
+                Throwable e = Operators.onOperatorError(this, Exceptions.failWithOverflow(), t, context);
                 onError(e);
                 return;
             }
@@ -436,7 +443,7 @@ void subscribe(RedisSubscription<?> subscription, Subscriber<?> subscriber) {
             @Override
             void request(RedisSubscription<?> subscription, long n) {
 
-                if (Operators.checkRequest(n, subscription.subscriber)) {
+                if (Operators.validate(n)) {
 
                     Operators.getAndAddCap(RedisSubscription.DEMAND, subscription, n);
 
@@ -485,7 +492,7 @@ void onDataAvailable(RedisSubscription<?> subscription) {
             @Override
             void request(RedisSubscription<?> subscription, long n) {
 
-                if (Operators.checkRequest(n, subscription.subscriber)) {
+                if (Operators.validate(n)) {
                     Operators.getAndAddCap(RedisSubscription.DEMAND, subscription, n);
                 }
             }
@@ -496,7 +503,7 @@ void request(RedisSubscription<?> subscription, long n) {
             @Override
             void request(RedisSubscription<?> subscription, long n) {
 
-                if (Operators.checkRequest(n, subscription.subscriber)) {
+                if (Operators.validate(n)) {
                     Operators.getAndAddCap(RedisSubscription.DEMAND, subscription, n);
                 }
             }

From 86d37525b2496153a46e2af6e08aaf0c9029108a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 11 Sep 2017 10:01:31 +0200
Subject: [PATCH 292/808] Upgrade build profiles

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 794fd0b9a7..16a20e6321 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,8 @@ env:
   matrix:
     - REDIS=unstable
     - PROFILE=jmh
-    - REDIS=4.0-rc3
-    - REDIS=3.2.9
+    - REDIS=4.0.1
+    - REDIS=3.2.10
 
 sudo: false
 

From bf427e572eb5701b66247bd9e266972537d36507 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 11 Sep 2017 10:09:45 +0200
Subject: [PATCH 293/808] Upgrade Redis to 4.0.1

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7003e2cd4f..de98bda5b9 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ BREW_BIN := $(shell which brew)
 YUM_BIN := $(shell which yum)
 APT_BIN := $(shell which apt-get)
 PROFILE ?= netty-41
-REDIS ?= 4.0-rc3
+REDIS ?= 4.0.1
 
 define REDIS_CLUSTER_CONFIG1
 c2043458aa5646cee429fdd5e3c18220dddf2ce5 127.0.0.1:7380 master - 1434887920102 1434887920002 0 connected 12000-16383
@@ -365,7 +365,7 @@ endif
 endif
 
 work/redis-git/src/redis-cli work/redis-git/src/redis-server:
-	[ ! -e work/redis-git ] && git clone https://github.com/antirez/redis.git work/redis-git && cd work/redis-git && git co $(REDIS) || true
+	[ ! -e work/redis-git ] && git clone https://github.com/antirez/redis.git work/redis-git && cd work/redis-git && git checkout $(REDIS) || true
 	$(eval REDIS_BRANCH = -v $(shell git -C work/redis-git branch --no-color | sed 's/\* //g'))
 	cd work/redis-git && git reset --hard || true
 	[ "$(REDIS)" != "$(REDIS_BRANCH)" ] && cd work/redis-git && git checkout $(REDIS) || true

From ac2a01c2dd9cb3254a1162b392cf7621b130338b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 11 Sep 2017 10:25:58 +0200
Subject: [PATCH 294/808] Update release notes #603

---
 RELEASE-NOTES.md | 135 ++++++-----------------------------------------
 1 file changed, 17 insertions(+), 118 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 720d3a0b7e..4258e2d7b0 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,100 +1,17 @@
-Lettuce 5.0.0 RC1 RELEASE NOTES
+Lettuce 5.0.0 RC2 RELEASE NOTES
 ==================================
 
-This release comes with 29 completed issues and drops support for netty 4.0.
-
-This release introduces ships with few breaking changes such as `Duration` use 
-for timeouts and delays and changes the return type for `configGet` 
-from `List<String>` to `Map<String, String>`.
-
-Lettuce now contains a range of performance improvements to lower GC pressure, 
-introduces kqueue native transport on BSD-like systems and asynchronous,
-connection initialization.
+This release ships with 12 issues resolved and upgraded dependencies that are 
+breaking for Lettuce. 
 
 Browse the docs at https://lettuce.io/core/snapshot/reference/.
 
 This release asserts compatibility in class-path mode with Java 9 requiring 
 at least netty 4.1.11.Final.
 
+Thanks to all contributors that made Lettuce 5.0.0.RC2 possible.
 
-Redis Cluster Pub/Sub on Node-Selections
-----------------------------------------
-`RedisClusterClient.connectPubSub()` now returns a 
-`StatefulRedisClusterPubSubConnection` that allows registration of 
-`RedisClusterPubSubListener`s and subscription on particular cluster nodes.
-
-Cluster node-specific subscriptions allow usage of keyspace notifications. 
-Keyspace notifications are different from userspace Pub/Sub since keyspace 
-notifications don't broadcast to the entire cluster but are published only 
-on the node the notification happens. A common usecase is when a key expires 
-in the cluster.
-
-```
-StatefulRedisClusterPubSubConnection connection = client.connectPubSub();
-
-connection.addListener(…);
-
-connection.setNodeMessagePropagation(true);
-
-RedisClusterPubSubCommands<String, String> sync = connection.sync();
-sync.slaves().commands().psubscribe("__key*__:expire");
-```
-
-
-Native Transports
------------------
-Lettuce now uses native transports by default, if the operating system is 
-qualified and dependencies are available. Lettuce supports epoll (on 
-Linux-based systems) since 4.0 and since this version kqueue (BSD-based
-systems, like macOS).
-
-Epoll usage can be disabled with system properties by setting 
-`io.lettuce.core.epoll=false`. In a similar way, kqueue can be disabled 
-with `io.lettuce.core.kqueue=false`.
-
-Epoll dependency:
-
-```xml
-<dependency>
-    <groupId>io.netty</groupId>
-    <artifactId>netty-transport-native-epoll</artifactId>
-    <version>${netty-version}</version>
-    <classifier>linux-x86_64</classifier>
-</dependency>
-```
-
-Kqueue dependency:
-
-```xml
-<dependency>
-    <groupId>io.netty</groupId>
-    <artifactId>netty-transport-native-kqueue</artifactId>
-    <version>${netty-version}</version>
-    <classifier>osx-x86_64</classifier>
-</dependency>
-```
-
-
-Asynchronous Connections in Redis Cluster
------------------------------------------
-RedisClusterClient now connects asynchronously without intermediate 
-synchronization to cluster nodes. The connection progress is shared between
-multiple threads that request a cluster node connection for the first time.
-Previously, connection was sequential-synchronous. Each connection attempt
-blocked subsequent attempts from other threads. If a cluster node connection
-ran into a timeout, threads were penalized with a growing wait time. If, say, 10 
-threads waited for a connection, the last thread had to wait up to 10 times 
-the connection timeout.
-
-Asynchronous connection initiates the connection once using internally a 
-`Future` so multiple concurrent connection attempts share the resulting
-`Future`. Errors fail now faster and cluster node usage is fully asynchronous
-without synchronization and without the danger to run into a threading deadlock.
-
-
-Thanks to all contributors that made Lettuce 5.0.0.RC1 possible.
-
-Lettuce 5.0.0.RC1 requires Java 8 and cannot be used with Java 6 or 7.
+Lettuce 5.0.0.RC2 requires Java 8 and cannot be used with Java 6 or 7.
 
 If you need any support, meet Lettuce at:
 
@@ -103,44 +20,26 @@ If you need any support, meet Lettuce at:
 * GitHub Issues: https://github.com/lettuce-io/lettuce-core/issues
 * Documentation: https://lettuce.io/docs/
 
-
 Enhancements
 ------------
-* Drop netty 4.0 compatibility #518
-* Support default methods on Command Interfaces #527
-* Align log prefix for CommandHandler and ConnectionWatchdog #538
-* Add support for kqueue transport #539
-* Add support for client certificate authentication #540
-* Adopt to changed SLOWLOG output #551
-* Use pre-instantiated ByteBufProcessor in RedisStateMachine to find EOL #557
-* SlotHash.getSlot(…) duplicates bytes while slot calculation #558
-* Replace CountDownLatch in AsyncCommand with AtomicFieldUpdater #559
-* Expose asynchronous connection creation API #561
-* [BREAKING] Refactor CONFIG GET output from List<String> to Map<String, String> #562
-* Adopt to read-only variant GEORADIUS(BYMEMBER)_RO #564
-* [BREAKING] Switch to Duration for timeouts #570
+* Optimization for ValueListOutput #573 (Thanks to @CodingFabian)
+* Enhance argument caching #575
+* Introduce MethodTranslator caching #580
+* Execute RedisAdvancedClusterCommands.scriptLoad(…) on all nodes #590
 
 Fixes
 -----
-* NumberFormatException on `inf` zscore #528 (Thanks to @DarkSeraphim)
-* Connection pool deadlock #531 (Thanks to @DarkSeraphim)
-* Improve Epoll availability detection #535
-* Fix FastCountingDeque not recording correct size. #544 (Thanks to @kojilin)
-* Lettuce doesn't call QUIT when a pooled connection is destroyed. #545 (Thanks to @robbiemc)
-* clientSetname does not set client name on default connection #563
+* NPE in RedisStateMachine #576 (Thanks to @nikolayspb)
+* Prevent dead listener callbacks in shutdown sequence #581
+* Javadoc in BitFieldArgs contains invalid links #583
+* Fix IllegalArgumentException in RedisClient.connectSentinel #588 (Thanks to @andrewsensus)
+* UnsupportedOperationException (List#add) in NestedMultiOutput #589 (Thanks to @zapl)
+* GEOPOS fails with a single member in the var args #591 (Thanks to @FerhatSavci)
 
 Other
 ------
-* Test with JDK 9 Early Access builds #310
-* Upgrade to netty 4.1.10 #532
-* Upgrade to netty 4.0.11 #537
-* Upgrade to netty 4.1.12 (4.0.48) #548
-* Upgrade to Reactor 3.1 M2 #549
-* Allow Redis version pinning for build #552
-* Upgrade to netty 4.1.13/4.0.49 #565
-* Upgrade to Reactor 3.1.0 M3 (Bismuth M3) #567
-* Use BOM to manage netty and Spring dependencies #568
-* Upgrade dependencies #569
+* Upgrade to Reactor Core 3.1.0 RC1 #602
+* Upgrade to netty 4.1.15 #600
 
 Lettuce requires a minimum of Java 8 to build and run. It is tested continuously
 against the latest Redis source-build.

From 9aff8c4b7f0898ecd3e4a7254a49ddcf45fd898c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 11 Sep 2017 10:27:26 +0200
Subject: [PATCH 295/808] [maven-release-plugin] prepare release 5.0.0.RC2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a15b7be1d4..467b82333e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.0.0.BUILD-SNAPSHOT</version>
+    <version>5.0.0.RC2</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -68,7 +68,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-        <tag>HEAD</tag>
+        <tag>5.0.0.RC2</tag>
     </scm>
 
     <!-- Required for Spring RC artifacts -->

From e9050a7f45b1d17c291ceed704821e187e56c0b4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 11 Sep 2017 10:27:31 +0200
Subject: [PATCH 296/808] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 467b82333e..a15b7be1d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.0.0.RC2</version>
+    <version>5.0.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -68,7 +68,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-        <tag>5.0.0.RC2</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <!-- Required for Spring RC artifacts -->

From 6e6f8d2a9abd8a029b11e7a4df35e6cf4878be77 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 26 Sep 2017 10:07:57 +0200
Subject: [PATCH 297/808] Upgrade to Project Reactor 3.1.0 GA #585

Inline required methods from reactor.core.publisher.Operators and adapt to API changes.
---
 pom.xml                                       |   2 +-
 src/main/java/io/lettuce/core/Operators.java  | 232 ++++++++++++++++++
 .../java/io/lettuce/core/RedisPublisher.java  |  12 +-
 3 files changed, 238 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/Operators.java

diff --git a/pom.xml b/pom.xml
index a15b7be1d4..008a8bc43f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <skipTests>true</skipTests>
         <netty-version>4.1.15.Final</netty-version>
         <spring-version>5.0.0.RC2</spring-version>
-        <reactor-version>Bismuth-M4</reactor-version>
+        <reactor-version>Bismuth-RELEASE</reactor-version>
     </properties>
 
     <scm>
diff --git a/src/main/java/io/lettuce/core/Operators.java b/src/main/java/io/lettuce/core/Operators.java
new file mode 100644
index 0000000000..6bc7b85e2b
--- /dev/null
+++ b/src/main/java/io/lettuce/core/Operators.java
@@ -0,0 +1,232 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Queue;
+import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+import java.util.function.BiFunction;
+import java.util.function.Supplier;
+
+import org.reactivestreams.Subscription;
+
+import reactor.core.Exceptions;
+import reactor.core.publisher.Hooks;
+import reactor.util.annotation.Nullable;
+import reactor.util.concurrent.Queues;
+import reactor.util.context.Context;
+import io.lettuce.core.internal.LettuceFactories;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+/**
+ * Operator utilities to handle noop subscriptions, validate request size and to cap concurrent additive operations to
+ * Long.MAX_VALUE, which is generic to {@link Subscription#request(long)} handling.
+ * <p/>
+ * This class duplicates some methods from {@link reactor.core.publisher.Operators} to be independent from Reactor API changes.
+ * 
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class Operators {
+
+    private static final InternalLogger LOG = InternalLoggerFactory.getInstance(Operators.class);
+
+    /**
+     * A key that can be used to store a sequence-specific {@link Hooks#onOperatorError(BiFunction)} hook in a {@link Context},
+     * as a {@link BiFunction BiFunction&lt;Throwable, Object, Throwable&gt;}.
+     */
+    private static final String KEY_ON_OPERATOR_ERROR = "reactor.onOperatorError.local";
+    private static final Field onOperatorErrorHook = findOnOperatorErrorHookField();
+    private static final Supplier queueSupplier = getQueueSupplier();
+
+    private static Field findOnOperatorErrorHookField() {
+
+        try {
+            return AccessController.doPrivileged((PrivilegedExceptionAction<Field>) () -> {
+
+                Field field = Hooks.class.getDeclaredField("onOperatorErrorHook");
+
+                if (!field.isAccessible()) {
+                    field.setAccessible(true);
+                }
+
+                return field;
+            });
+
+        } catch (PrivilegedActionException e) {
+            return null;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Supplier<Queue<Object>> getQueueSupplier() {
+
+        try {
+            return AccessController.doPrivileged((PrivilegedExceptionAction<Supplier>) () -> {
+                Method unbounded = Queues.class.getMethod("unbounded");
+                return (Supplier) unbounded.invoke(Queues.class);
+            });
+
+        } catch (PrivilegedActionException e) {
+            return LettuceFactories::newSpScQueue;
+        }
+    }
+
+    /**
+     * Cap an addition to Long.MAX_VALUE
+     *
+     * @param a left operand
+     * @param b right operand
+     *
+     * @return Addition result or Long.MAX_VALUE if overflow
+     */
+    static long addCap(long a, long b) {
+
+        long res = a + b;
+        if (res < 0L) {
+            return Long.MAX_VALUE;
+        }
+        return res;
+    }
+
+    /**
+     * Concurrent addition bound to Long.MAX_VALUE. Any concurrent write will "happen before" this operation.
+     *
+     * @param <T> the parent instance type
+     * @param updater current field updater
+     * @param instance current instance to update
+     * @param toAdd delta to add
+     * @return value before addition or Long.MAX_VALUE
+     */
+    static <T> long addCap(AtomicLongFieldUpdater<T> updater, T instance, long toAdd) {
+
+        long r, u;
+        for (;;) {
+            r = updater.get(instance);
+            if (r == Long.MAX_VALUE) {
+                return Long.MAX_VALUE;
+            }
+            u = addCap(r, toAdd);
+            if (updater.compareAndSet(instance, r, u)) {
+                return r;
+            }
+        }
+    }
+
+    /**
+     * Evaluate if a request is strictly positive otherwise {@link #reportBadRequest(long)}
+     * 
+     * @param n the request value
+     * @return true if valid
+     */
+    static boolean validate(long n) {
+
+        if (n <= 0) {
+            reportBadRequest(n);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Log an {@link IllegalArgumentException} if the request is null or negative.
+     *
+     * @param n the failing demand
+     *
+     * @see Exceptions#nullOrNegativeRequestException(long)
+     */
+    static void reportBadRequest(long n) {
+
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Negative request", Exceptions.nullOrNegativeRequestException(n));
+        }
+    }
+
+    /**
+     * @param elements the invalid requested demand
+     *
+     * @return a new {@link IllegalArgumentException} with a cause message abiding to reactive stream specification rule 3.9.
+     */
+    static IllegalArgumentException nullOrNegativeRequestException(long elements) {
+        return new IllegalArgumentException("Spec. Rule 3.9 - Cannot request a non strictly positive number: " + elements);
+    }
+
+    /**
+     * Map an "operator" error given an operator parent {@link Subscription}. The result error will be passed via onError to the
+     * operator downstream. {@link Subscription} will be cancelled after checking for fatal error via
+     * {@link Exceptions#throwIfFatal(Throwable)}. Takes an additional signal, which can be added as a suppressed exception if
+     * it is a {@link Throwable} and the default {@link Hooks#onOperatorError(BiFunction) hook} is in place.
+     *
+     * @param subscription the linked operator parent {@link Subscription}
+     * @param error the callback or operator error
+     * @param dataSignal the value (onNext or onError) signal processed during failure
+     * @param context a context that might hold a local error consumer
+     * @return mapped {@link Throwable}
+     */
+    static Throwable onOperatorError(@Nullable Subscription subscription, Throwable error, @Nullable Object dataSignal,
+            Context context) {
+
+        Exceptions.throwIfFatal(error);
+        if (subscription != null) {
+            subscription.cancel();
+        }
+
+        Throwable t = Exceptions.unwrap(error);
+        BiFunction<? super Throwable, Object, ? extends Throwable> hook = context.getOrDefault(KEY_ON_OPERATOR_ERROR, null);
+        if (hook == null && onOperatorErrorHook != null) {
+            hook = getOnOperatorErrorHook();
+        }
+
+        if (hook == null) {
+            if (dataSignal != null) {
+                if (dataSignal != t && dataSignal instanceof Throwable) {
+                    t = Exceptions.addSuppressed(t, (Throwable) dataSignal);
+                }
+                // do not wrap original value to avoid strong references
+                /*
+                 * else { }
+                 */
+            }
+            return t;
+        }
+        return hook.apply(error, dataSignal);
+    }
+
+    /**
+     * Create a new {@link Queue}.
+     * 
+     * @return the new queue.
+     */
+    @SuppressWarnings("unchecked")
+    static <T> Queue<T> newQueue() {
+        return (Queue<T>) queueSupplier.get();
+    }
+
+    @SuppressWarnings("unchecked")
+    private static BiFunction<? super Throwable, Object, ? extends Throwable> getOnOperatorErrorHook() {
+
+        try {
+            return (BiFunction<? super Throwable, Object, ? extends Throwable>) onOperatorErrorHook.get(Hooks.class);
+        } catch (ReflectiveOperationException e) {
+            return null;
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index b899154539..3a843202a7 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -29,8 +29,6 @@
 
 import reactor.core.CoreSubscriber;
 import reactor.core.Exceptions;
-import reactor.core.publisher.Operators;
-import reactor.util.concurrent.Queues;
 import reactor.util.context.Context;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -135,7 +133,7 @@ static class RedisSubscription<T> extends StreamingOutput.Subscriber<T> implemen
         private final SubscriptionCommand<?, ?, T> subscriptionCommand;
         private final boolean traceEnabled = LOG.isTraceEnabled();
 
-        final Queue<T> data = Queues.<T> unbounded().get();
+        final Queue<T> data = Operators.newQueue();
         final StatefulConnection<?, ?> connection;
         final RedisCommand<?, ?, T> command;
         final boolean dissolve;
@@ -342,7 +340,7 @@ private boolean readAndPublish() throws IOException {
 
                     this.subscriber.onNext(data);
 
-                    if (Operators.addAndGet(DEMAND, this, -1) == 0) {
+                    if (Operators.addCap(DEMAND, this, -1) == 0) {
                         return false;
                     }
                 } else {
@@ -445,7 +443,7 @@ void request(RedisSubscription<?> subscription, long n) {
 
                 if (Operators.validate(n)) {
 
-                    Operators.getAndAddCap(RedisSubscription.DEMAND, subscription, n);
+                    Operators.addCap(RedisSubscription.DEMAND, subscription, n);
 
                     if (subscription.changeState(this, DEMAND)) {
 
@@ -493,7 +491,7 @@ void onDataAvailable(RedisSubscription<?> subscription) {
             void request(RedisSubscription<?> subscription, long n) {
 
                 if (Operators.validate(n)) {
-                    Operators.getAndAddCap(RedisSubscription.DEMAND, subscription, n);
+                    Operators.addCap(RedisSubscription.DEMAND, subscription, n);
                 }
             }
 
@@ -504,7 +502,7 @@ void request(RedisSubscription<?> subscription, long n) {
             void request(RedisSubscription<?> subscription, long n) {
 
                 if (Operators.validate(n)) {
-                    Operators.getAndAddCap(RedisSubscription.DEMAND, subscription, n);
+                    Operators.addCap(RedisSubscription.DEMAND, subscription, n);
                 }
             }
         },

From 08c69421deb0283cc94fa75a0a08d0c59c2f8859 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 26 Sep 2017 10:14:56 +0200
Subject: [PATCH 298/808] Downgrade to Spring Framework 4.3.11 #584

Downgrade because a Spring Framework 5 dependency does not provide too much benefit as we're building against factory beans only.
---
 pom.xml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 008a8bc43f..be574d0aa1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
         <netty-version>4.1.15.Final</netty-version>
-        <spring-version>5.0.0.RC2</spring-version>
+        <spring-version>4.3.11.RELEASE</spring-version>
         <reactor-version>Bismuth-RELEASE</reactor-version>
     </properties>
 
@@ -71,16 +71,6 @@
         <tag>HEAD</tag>
     </scm>
 
-    <!-- Required for Spring RC artifacts -->
-
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/libs-milestone</url>
-        </repository>
-    </repositories>
-
     <dependencyManagement>
         <dependencies>
 

From 2642ed9307df066168f09a45d17a2c4c00e5e8d9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 26 Sep 2017 10:39:54 +0200
Subject: [PATCH 299/808] Polishing #604

Remove public keywords in RedisCommandBuilder. Replace explicit type arguments with diamond syntax. Order by method name in AbstractRedisAsyncCommands, RedisCommandBuilder, and AbstractRedisReactiveCommands.
---
 .../core/AbstractRedisAsyncCommands.java      | 1312 +++----
 .../core/AbstractRedisReactiveCommands.java   | 1340 +++----
 .../io/lettuce/core/RedisCommandBuilder.java  | 3155 ++++++++---------
 3 files changed, 2901 insertions(+), 2906 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 2bc8c9105d..459cf5ee73 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -47,9 +47,9 @@ public abstract class AbstractRedisAsyncCommands<K, V> implements RedisHashAsync
         RedisHLLAsyncCommands<K, V>, BaseRedisAsyncCommands<K, V>, RedisTransactionalAsyncCommands<K, V>,
         RedisGeoAsyncCommands<K, V>, RedisClusterAsyncCommands<K, V> {
 
-    private final RedisCommandBuilder<K, V> commandBuilder;
-    private final RedisCodec<K, V> codec;
     private final StatefulConnection<K, V> connection;
+    private final RedisCodec<K, V> codec;
+    private final RedisCommandBuilder<K, V> commandBuilder;
 
     /**
      * Initialize a new instance.
@@ -60,7 +60,7 @@ public abstract class AbstractRedisAsyncCommands<K, V> implements RedisHashAsync
     public AbstractRedisAsyncCommands(StatefulConnection<K, V> connection, RedisCodec<K, V> codec) {
         this.connection = connection;
         this.codec = codec;
-        this.commandBuilder = new RedisCommandBuilder<K, V>(codec);
+        this.commandBuilder = new RedisCommandBuilder<>(codec);
     }
 
     @Override
@@ -68,6 +68,11 @@ public RedisFuture<Long> append(K key, V value) {
         return dispatch(commandBuilder.append(key, value));
     }
 
+    @Override
+    public RedisFuture<String> asking() {
+        return dispatch(commandBuilder.asking());
+    }
+
     @Override
     public String auth(String password) {
 
@@ -105,16 +110,6 @@ public RedisFuture<List<Long>> bitfield(K key, BitFieldArgs bitFieldArgs) {
         return dispatch(commandBuilder.bitfield(key, bitFieldArgs));
     }
 
-    @Override
-    public RedisFuture<Long> bitpos(K key, boolean state) {
-        return dispatch(commandBuilder.bitpos(key, state));
-    }
-
-    @Override
-    public RedisFuture<Long> bitpos(K key, boolean state, long start, long end) {
-        return dispatch(commandBuilder.bitpos(key, state, start, end));
-    }
-
     @Override
     public RedisFuture<Long> bitopAnd(K destination, K... keys) {
         return dispatch(commandBuilder.bitopAnd(destination, keys));
@@ -135,6 +130,16 @@ public RedisFuture<Long> bitopXor(K destination, K... keys) {
         return dispatch(commandBuilder.bitopXor(destination, keys));
     }
 
+    @Override
+    public RedisFuture<Long> bitpos(K key, boolean state) {
+        return dispatch(commandBuilder.bitpos(key, state));
+    }
+
+    @Override
+    public RedisFuture<Long> bitpos(K key, boolean state, long start, long end) {
+        return dispatch(commandBuilder.bitpos(key, state, start, end));
+    }
+
     @Override
     public RedisFuture<KeyValue<K, V>> blpop(long timeout, K... keys) {
         return dispatch(commandBuilder.blpop(timeout, keys));
@@ -155,11 +160,6 @@ public RedisFuture<K> clientGetname() {
         return dispatch(commandBuilder.clientGetname());
     }
 
-    @Override
-    public RedisFuture<String> clientSetname(K name) {
-        return dispatch(commandBuilder.clientSetname(name));
-    }
-
     @Override
     public RedisFuture<String> clientKill(String addr) {
         return dispatch(commandBuilder.clientKill(addr));
@@ -170,14 +170,139 @@ public RedisFuture<Long> clientKill(KillArgs killArgs) {
         return dispatch(commandBuilder.clientKill(killArgs));
     }
 
+    @Override
+    public RedisFuture<String> clientList() {
+        return dispatch(commandBuilder.clientList());
+    }
+
     @Override
     public RedisFuture<String> clientPause(long timeout) {
         return dispatch(commandBuilder.clientPause(timeout));
     }
 
     @Override
-    public RedisFuture<String> clientList() {
-        return dispatch(commandBuilder.clientList());
+    public RedisFuture<String> clientSetname(K name) {
+        return dispatch(commandBuilder.clientSetname(name));
+    }
+
+    @Override
+    public RedisFuture<String> clusterAddSlots(int... slots) {
+        return dispatch(commandBuilder.clusterAddslots(slots));
+    }
+
+    @Override
+    public RedisFuture<String> clusterBumpepoch() {
+        return dispatch(commandBuilder.clusterBumpepoch());
+    }
+
+    @Override
+    public RedisFuture<Long> clusterCountFailureReports(String nodeId) {
+        return dispatch(commandBuilder.clusterCountFailureReports(nodeId));
+    }
+
+    @Override
+    public RedisFuture<Long> clusterCountKeysInSlot(int slot) {
+        return dispatch(commandBuilder.clusterCountKeysInSlot(slot));
+    }
+
+    @Override
+    public RedisFuture<String> clusterDelSlots(int... slots) {
+        return dispatch(commandBuilder.clusterDelslots(slots));
+    }
+
+    @Override
+    public RedisFuture<String> clusterFailover(boolean force) {
+        return dispatch(commandBuilder.clusterFailover(force));
+    }
+
+    @Override
+    public RedisFuture<String> clusterFlushslots() {
+        return dispatch(commandBuilder.clusterFlushslots());
+    }
+
+    @Override
+    public RedisFuture<String> clusterForget(String nodeId) {
+        return dispatch(commandBuilder.clusterForget(nodeId));
+    }
+
+    @Override
+    public RedisFuture<List<K>> clusterGetKeysInSlot(int slot, int count) {
+        return dispatch(commandBuilder.clusterGetKeysInSlot(slot, count));
+    }
+
+    @Override
+    public RedisFuture<String> clusterInfo() {
+        return dispatch(commandBuilder.clusterInfo());
+    }
+
+    @Override
+    public RedisFuture<Long> clusterKeyslot(K key) {
+        return dispatch(commandBuilder.clusterKeyslot(key));
+    }
+
+    @Override
+    public RedisFuture<String> clusterMeet(String ip, int port) {
+        return dispatch(commandBuilder.clusterMeet(ip, port));
+    }
+
+    @Override
+    public RedisFuture<String> clusterMyId() {
+        return dispatch(commandBuilder.clusterMyId());
+    }
+
+    @Override
+    public RedisFuture<String> clusterNodes() {
+        return dispatch(commandBuilder.clusterNodes());
+    }
+
+    @Override
+    public RedisFuture<String> clusterReplicate(String nodeId) {
+        return dispatch(commandBuilder.clusterReplicate(nodeId));
+    }
+
+    @Override
+    public RedisFuture<String> clusterReset(boolean hard) {
+        return dispatch(commandBuilder.clusterReset(hard));
+    }
+
+    @Override
+    public RedisFuture<String> clusterSaveconfig() {
+        return dispatch(commandBuilder.clusterSaveconfig());
+    }
+
+    @Override
+    public RedisFuture<String> clusterSetConfigEpoch(long configEpoch) {
+        return dispatch(commandBuilder.clusterSetConfigEpoch(configEpoch));
+    }
+
+    @Override
+    public RedisFuture<String> clusterSetSlotImporting(int slot, String nodeId) {
+        return dispatch(commandBuilder.clusterSetSlotImporting(slot, nodeId));
+    }
+
+    @Override
+    public RedisFuture<String> clusterSetSlotMigrating(int slot, String nodeId) {
+        return dispatch(commandBuilder.clusterSetSlotMigrating(slot, nodeId));
+    }
+
+    @Override
+    public RedisFuture<String> clusterSetSlotNode(int slot, String nodeId) {
+        return dispatch(commandBuilder.clusterSetSlotNode(slot, nodeId));
+    }
+
+    @Override
+    public RedisFuture<String> clusterSetSlotStable(int slot) {
+        return dispatch(commandBuilder.clusterSetSlotStable(slot));
+    }
+
+    @Override
+    public RedisFuture<List<String>> clusterSlaves(String nodeId) {
+        return dispatch(commandBuilder.clusterSlaves(nodeId));
+    }
+
+    @Override
+    public RedisFuture<List<Object>> clusterSlots() {
+        return dispatch(commandBuilder.clusterSlots());
     }
 
     @Override
@@ -185,6 +310,11 @@ public RedisFuture<List<Object>> command() {
         return dispatch(commandBuilder.command());
     }
 
+    @Override
+    public RedisFuture<Long> commandCount() {
+        return dispatch(commandBuilder.commandCount());
+    }
+
     @Override
     public RedisFuture<List<Object>> commandInfo(String... commands) {
         return dispatch(commandBuilder.commandInfo(commands));
@@ -200,11 +330,6 @@ public RedisFuture<List<Object>> commandInfo(CommandType... commands) {
         return commandInfo(stringCommands);
     }
 
-    @Override
-    public RedisFuture<Long> commandCount() {
-        return dispatch(commandBuilder.commandCount());
-    }
-
     @Override
     public RedisFuture<Map<String, String>> configGet(String parameter) {
         return dispatch(commandBuilder.configGet(parameter));
@@ -216,13 +341,13 @@ public RedisFuture<String> configResetstat() {
     }
 
     @Override
-    public RedisFuture<String> configSet(String parameter, String value) {
-        return dispatch(commandBuilder.configSet(parameter, value));
+    public RedisFuture<String> configRewrite() {
+        return dispatch(commandBuilder.configRewrite());
     }
 
     @Override
-    public RedisFuture<String> configRewrite() {
-        return dispatch(commandBuilder.configRewrite());
+    public RedisFuture<String> configSet(String parameter, String value) {
+        return dispatch(commandBuilder.configSet(parameter, value));
     }
 
     @Override
@@ -290,12 +415,8 @@ public RedisFuture<Long> del(Iterable<K> keys) {
     }
 
     @Override
-    public RedisFuture<Long> unlink(K... keys) {
-        return dispatch(commandBuilder.unlink(keys));
-    }
-
-    public RedisFuture<Long> unlink(Iterable<K> keys) {
-        return dispatch(commandBuilder.unlink(keys));
+    public String digest(V script) {
+        return LettuceStrings.digest(codec.encodeValue(script));
     }
 
     @Override
@@ -303,6 +424,42 @@ public RedisFuture<String> discard() {
         return dispatch(commandBuilder.discard());
     }
 
+    @Override
+    public <T> RedisFuture<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output) {
+
+        LettuceAssert.notNull(type, "Command type must not be null");
+        LettuceAssert.notNull(output, "CommandOutput type must not be null");
+
+        return dispatch(new AsyncCommand<>(new Command<>(type, output)));
+    }
+
+    @Override
+    public <T> RedisFuture<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args) {
+
+        LettuceAssert.notNull(type, "Command type must not be null");
+        LettuceAssert.notNull(output, "CommandOutput type must not be null");
+        LettuceAssert.notNull(args, "CommandArgs type must not be null");
+
+        return dispatch(new AsyncCommand<>(new Command<>(type, output, args)));
+    }
+
+    protected <T> RedisFuture<T> dispatch(CommandType type, CommandOutput<K, V, T> output) {
+        return dispatch(type, output, null);
+    }
+
+    protected <T> RedisFuture<T> dispatch(CommandType type, CommandOutput<K, V, T> output, CommandArgs<K, V> args) {
+        return dispatch(new AsyncCommand<>(new Command<>(type, output, args)));
+    }
+
+    public <T> AsyncCommand<K, V, T> dispatch(RedisCommand<K, V, T> cmd) {
+        AsyncCommand<K, V, T> asyncCommand = new AsyncCommand<>(cmd);
+        RedisCommand<K, V, T> dispatched = connection.dispatch(asyncCommand);
+        if (dispatched instanceof AsyncCommand) {
+            return (AsyncCommand<K, V, T>) dispatched;
+        }
+        return asyncCommand;
+    }
+
     @Override
     public RedisFuture<byte[]> dump(K key) {
         return dispatch(commandBuilder.dump(key));
@@ -337,6 +494,11 @@ public <T> RedisFuture<T> evalsha(String digest, ScriptOutputType type, K[] keys
         return (RedisFuture<T>) dispatch(commandBuilder.evalsha(digest, type, keys, values));
     }
 
+    @Override
+    public RedisFuture<TransactionResult> exec() {
+        return dispatch(EXEC, null);
+    }
+
     @Override
     public RedisFuture<Long> exists(K... keys) {
         return dispatch(commandBuilder.exists(keys));
@@ -362,8 +524,8 @@ public RedisFuture<Boolean> expireat(K key, long timestamp) {
     }
 
     @Override
-    public RedisFuture<TransactionResult> exec() {
-        return dispatch(EXEC, null);
+    public void flushCommands() {
+        connection.flushCommands();
     }
 
     @Override
@@ -387,48 +549,119 @@ public RedisFuture<String> flushdbAsync() {
     }
 
     @Override
-    public RedisFuture<V> get(K key) {
-        return dispatch(commandBuilder.get(key));
+    public RedisFuture<Long> geoadd(K key, double longitude, double latitude, V member) {
+        return dispatch(commandBuilder.geoadd(key, longitude, latitude, member));
     }
 
     @Override
-    public RedisFuture<Long> getbit(K key, long offset) {
-        return dispatch(commandBuilder.getbit(key, offset));
+    public RedisFuture<Long> geoadd(K key, Object... lngLatMember) {
+        return dispatch(commandBuilder.geoadd(key, lngLatMember));
     }
 
     @Override
-    public RedisFuture<V> getrange(K key, long start, long end) {
-        return dispatch(commandBuilder.getrange(key, start, end));
+    public RedisFuture<Double> geodist(K key, V from, V to, GeoArgs.Unit unit) {
+        return dispatch(commandBuilder.geodist(key, from, to, unit));
     }
 
     @Override
-    public RedisFuture<V> getset(K key, V value) {
-        return dispatch(commandBuilder.getset(key, value));
+    public RedisFuture<List<Value<String>>> geohash(K key, V... members) {
+        return dispatch(commandBuilder.geohash(key, members));
     }
 
     @Override
-    public RedisFuture<Long> hdel(K key, K... fields) {
-        return dispatch(commandBuilder.hdel(key, fields));
+    public RedisFuture<List<GeoCoordinates>> geopos(K key, V... members) {
+        return dispatch(commandBuilder.geopos(key, members));
     }
 
     @Override
-    public RedisFuture<Boolean> hexists(K key, K field) {
-        return dispatch(commandBuilder.hexists(key, field));
+    public RedisFuture<Set<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
+        return dispatch(commandBuilder.georadius(GEORADIUS, key, longitude, latitude, distance, unit.name()));
     }
 
     @Override
-    public RedisFuture<V> hget(K key, K field) {
-        return dispatch(commandBuilder.hget(key, field));
+    public RedisFuture<List<GeoWithin<V>>> georadius(K key, double longitude, double latitude, double distance,
+            GeoArgs.Unit unit, GeoArgs geoArgs) {
+        return dispatch(commandBuilder.georadius(GEORADIUS, key, longitude, latitude, distance, unit.name(), geoArgs));
     }
 
     @Override
-    public RedisFuture<Long> hincrby(K key, K field, long amount) {
-        return dispatch(commandBuilder.hincrby(key, field, amount));
+    public RedisFuture<Long> georadius(K key, double longitude, double latitude, double distance, Unit unit,
+            GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
+        return dispatch(commandBuilder.georadius(key, longitude, latitude, distance, unit.name(), geoRadiusStoreArgs));
+    }
+
+    protected RedisFuture<Set<V>> georadius_ro(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
+        return dispatch(commandBuilder.georadius(GEORADIUS_RO, key, longitude, latitude, distance, unit.name()));
+    }
+
+    protected RedisFuture<List<GeoWithin<V>>> georadius_ro(K key, double longitude, double latitude, double distance,
+            GeoArgs.Unit unit, GeoArgs geoArgs) {
+        return dispatch(commandBuilder.georadius(GEORADIUS_RO, key, longitude, latitude, distance, unit.name(), geoArgs));
     }
 
     @Override
-    public RedisFuture<Double> hincrbyfloat(K key, K field, double amount) {
-        return dispatch(commandBuilder.hincrbyfloat(key, field, amount));
+    public RedisFuture<Set<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit) {
+        return dispatch(commandBuilder.georadiusbymember(GEORADIUSBYMEMBER, key, member, distance, unit.name()));
+    }
+
+    @Override
+    public RedisFuture<List<GeoWithin<V>>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit,
+            GeoArgs geoArgs) {
+        return dispatch(commandBuilder.georadiusbymember(GEORADIUSBYMEMBER, key, member, distance, unit.name(), geoArgs));
+    }
+
+    @Override
+    public RedisFuture<Long> georadiusbymember(K key, V member, double distance, Unit unit,
+            GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
+        return dispatch(commandBuilder.georadiusbymember(key, member, distance, unit.name(), geoRadiusStoreArgs));
+    }
+
+    protected RedisFuture<Set<V>> georadiusbymember_ro(K key, V member, double distance, GeoArgs.Unit unit) {
+        return dispatch(commandBuilder.georadiusbymember(GEORADIUSBYMEMBER_RO, key, member, distance, unit.name()));
+    }
+
+    protected RedisFuture<List<GeoWithin<V>>> georadiusbymember_ro(K key, V member, double distance, GeoArgs.Unit unit,
+            GeoArgs geoArgs) {
+        return dispatch(commandBuilder.georadiusbymember(GEORADIUSBYMEMBER_RO, key, member, distance, unit.name(), geoArgs));
+    }
+
+    @Override
+    public RedisFuture<V> get(K key) {
+        return dispatch(commandBuilder.get(key));
+    }
+
+    public StatefulConnection<K, V> getConnection() {
+        return connection;
+    }
+
+    @Override
+    public RedisFuture<Long> getbit(K key, long offset) {
+        return dispatch(commandBuilder.getbit(key, offset));
+    }
+
+    @Override
+    public RedisFuture<V> getrange(K key, long start, long end) {
+        return dispatch(commandBuilder.getrange(key, start, end));
+    }
+
+    @Override
+    public RedisFuture<V> getset(K key, V value) {
+        return dispatch(commandBuilder.getset(key, value));
+    }
+
+    @Override
+    public RedisFuture<Long> hdel(K key, K... fields) {
+        return dispatch(commandBuilder.hdel(key, fields));
+    }
+
+    @Override
+    public RedisFuture<Boolean> hexists(K key, K field) {
+        return dispatch(commandBuilder.hexists(key, field));
+    }
+
+    @Override
+    public RedisFuture<V> hget(K key, K field) {
+        return dispatch(commandBuilder.hget(key, field));
     }
 
     @Override
@@ -441,6 +674,16 @@ public RedisFuture<Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key)
         return dispatch(commandBuilder.hgetall(channel, key));
     }
 
+    @Override
+    public RedisFuture<Long> hincrby(K key, K field, long amount) {
+        return dispatch(commandBuilder.hincrby(key, field, amount));
+    }
+
+    @Override
+    public RedisFuture<Double> hincrbyfloat(K key, K field, double amount) {
+        return dispatch(commandBuilder.hincrbyfloat(key, field, amount));
+    }
+
     @Override
     public RedisFuture<List<K>> hkeys(K key) {
         return dispatch(commandBuilder.hkeys(key));
@@ -456,11 +699,6 @@ public RedisFuture<Long> hlen(K key) {
         return dispatch(commandBuilder.hlen(key));
     }
 
-    @Override
-    public RedisFuture<Long> hstrlen(K key, K field) {
-        return dispatch(commandBuilder.hstrlen(key, field));
-    }
-
     @Override
     public RedisFuture<List<KeyValue<K, V>>> hmget(K key, K... fields) {
         return dispatch(commandBuilder.hmgetKeyValue(key, fields));
@@ -476,6 +714,47 @@ public RedisFuture<String> hmset(K key, Map<K, V> map) {
         return dispatch(commandBuilder.hmset(key, map));
     }
 
+    @Override
+    public RedisFuture<MapScanCursor<K, V>> hscan(K key) {
+        return dispatch(commandBuilder.hscan(key));
+    }
+
+    @Override
+    public RedisFuture<MapScanCursor<K, V>> hscan(K key, ScanArgs scanArgs) {
+        return dispatch(commandBuilder.hscan(key, scanArgs));
+    }
+
+    @Override
+    public RedisFuture<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return dispatch(commandBuilder.hscan(key, scanCursor, scanArgs));
+    }
+
+    @Override
+    public RedisFuture<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor) {
+        return dispatch(commandBuilder.hscan(key, scanCursor));
+    }
+
+    @Override
+    public RedisFuture<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key) {
+        return dispatch(commandBuilder.hscanStreaming(channel, key));
+    }
+
+    @Override
+    public RedisFuture<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanArgs scanArgs) {
+        return dispatch(commandBuilder.hscanStreaming(channel, key, scanArgs));
+    }
+
+    @Override
+    public RedisFuture<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor,
+            ScanArgs scanArgs) {
+        return dispatch(commandBuilder.hscanStreaming(channel, key, scanCursor, scanArgs));
+    }
+
+    @Override
+    public RedisFuture<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor) {
+        return dispatch(commandBuilder.hscanStreaming(channel, key, scanCursor));
+    }
+
     @Override
     public RedisFuture<Boolean> hset(K key, K field, V value) {
         return dispatch(commandBuilder.hset(key, field, value));
@@ -486,6 +765,11 @@ public RedisFuture<Boolean> hsetnx(K key, K field, V value) {
         return dispatch(commandBuilder.hsetnx(key, field, value));
     }
 
+    @Override
+    public RedisFuture<Long> hstrlen(K key, K field) {
+        return dispatch(commandBuilder.hstrlen(key, field));
+    }
+
     @Override
     public RedisFuture<List<V>> hvals(K key) {
         return dispatch(commandBuilder.hvals(key));
@@ -521,6 +805,11 @@ public RedisFuture<String> info(String section) {
         return dispatch(commandBuilder.info(section));
     }
 
+    @Override
+    public boolean isOpen() {
+        return connection.isOpen();
+    }
+
     @Override
     public RedisFuture<List<K>> keys(K pattern) {
         return dispatch(commandBuilder.keys(pattern));
@@ -591,16 +880,6 @@ public RedisFuture<String> ltrim(K key, long start, long stop) {
         return dispatch(commandBuilder.ltrim(key, start, stop));
     }
 
-    @Override
-    public RedisFuture<String> migrate(String host, int port, K key, int db, long timeout) {
-        return dispatch(commandBuilder.migrate(host, port, key, db, timeout));
-    }
-
-    @Override
-    public RedisFuture<String> migrate(String host, int port, int db, long timeout, MigrateArgs<K> migrateArgs) {
-        return dispatch(commandBuilder.migrate(host, port, db, timeout, migrateArgs));
-    }
-
     @Override
     public RedisFuture<List<KeyValue<K, V>>> mget(K... keys) {
         return dispatch(commandBuilder.mgetKeyValue(keys));
@@ -620,13 +899,18 @@ public RedisFuture<Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K
     }
 
     @Override
-    public RedisFuture<Boolean> move(K key, int db) {
-        return dispatch(commandBuilder.move(key, db));
+    public RedisFuture<String> migrate(String host, int port, K key, int db, long timeout) {
+        return dispatch(commandBuilder.migrate(host, port, key, db, timeout));
     }
 
     @Override
-    public RedisFuture<String> multi() {
-        return dispatch(commandBuilder.multi());
+    public RedisFuture<String> migrate(String host, int port, int db, long timeout, MigrateArgs<K> migrateArgs) {
+        return dispatch(commandBuilder.migrate(host, port, db, timeout, migrateArgs));
+    }
+
+    @Override
+    public RedisFuture<Boolean> move(K key, int db) {
+        return dispatch(commandBuilder.move(key, db));
     }
 
     @Override
@@ -639,6 +923,11 @@ public RedisFuture<Boolean> msetnx(Map<K, V> map) {
         return dispatch(commandBuilder.msetnx(map));
     }
 
+    @Override
+    public RedisFuture<String> multi() {
+        return dispatch(commandBuilder.multi());
+    }
+
     @Override
     public RedisFuture<String> objectEncoding(K key) {
         return dispatch(commandBuilder.objectEncoding(key));
@@ -675,20 +964,28 @@ public RedisFuture<Boolean> pexpireat(K key, long timestamp) {
     }
 
     @Override
-    public RedisFuture<String> ping() {
-        return dispatch(commandBuilder.ping());
+    public RedisFuture<Long> pfadd(K key, V... values) {
+        return dispatch(commandBuilder.pfadd(key, values));
     }
 
     @Override
-    public RedisFuture<String> readOnly() {
-        AsyncCommand<K, V, String> cmd = dispatch(commandBuilder.readOnly());
-        return cmd;
+    public RedisFuture<Long> pfcount(K... keys) {
+        return dispatch(commandBuilder.pfcount(keys));
     }
 
     @Override
-    public RedisFuture<String> readWrite() {
-        AsyncCommand<K, V, String> cmd = dispatch(commandBuilder.readWrite());
-        return cmd;
+    public RedisFuture<String> pfmerge(K destkey, K... sourcekeys) {
+        return dispatch(commandBuilder.pfmerge(destkey, sourcekeys));
+    }
+
+    @Override
+    public RedisFuture<String> ping() {
+        return dispatch(commandBuilder.ping());
+    }
+
+    @Override
+    public RedisFuture<String> psetex(K key, long milliseconds, V value) {
+        return dispatch(commandBuilder.psetex(key, milliseconds, value));
     }
 
     @Override
@@ -712,13 +1009,13 @@ public RedisFuture<List<K>> pubsubChannels(K channel) {
     }
 
     @Override
-    public RedisFuture<Map<K, Long>> pubsubNumsub(K... channels) {
-        return dispatch(commandBuilder.pubsubNumsub(channels));
+    public RedisFuture<Long> pubsubNumpat() {
+        return dispatch(commandBuilder.pubsubNumpat());
     }
 
     @Override
-    public RedisFuture<Long> pubsubNumpat() {
-        return dispatch(commandBuilder.pubsubNumpat());
+    public RedisFuture<Map<K, Long>> pubsubNumsub(K... channels) {
+        return dispatch(commandBuilder.pubsubNumsub(channels));
     }
 
     @Override
@@ -727,13 +1024,20 @@ public RedisFuture<String> quit() {
     }
 
     @Override
-    public RedisFuture<List<Object>> role() {
-        return dispatch(commandBuilder.role());
+    public RedisFuture<V> randomkey() {
+        return dispatch(commandBuilder.randomkey());
     }
 
     @Override
-    public RedisFuture<V> randomkey() {
-        return dispatch(commandBuilder.randomkey());
+    public RedisFuture<String> readOnly() {
+        AsyncCommand<K, V, String> cmd = dispatch(commandBuilder.readOnly());
+        return cmd;
+    }
+
+    @Override
+    public RedisFuture<String> readWrite() {
+        AsyncCommand<K, V, String> cmd = dispatch(commandBuilder.readWrite());
+        return cmd;
     }
 
     @Override
@@ -746,11 +1050,21 @@ public RedisFuture<Boolean> renamenx(K key, K newKey) {
         return dispatch(commandBuilder.renamenx(key, newKey));
     }
 
+    @Override
+    public void reset() {
+        getConnection().reset();
+    }
+
     @Override
     public RedisFuture<String> restore(K key, long ttl, byte[] value) {
         return dispatch(commandBuilder.restore(key, ttl, value));
     }
 
+    @Override
+    public RedisFuture<List<Object>> role() {
+        return dispatch(commandBuilder.role());
+    }
+
     @Override
     public RedisFuture<V> rpop(K key) {
         return dispatch(commandBuilder.rpop(key));
@@ -782,28 +1096,68 @@ public RedisFuture<String> save() {
     }
 
     @Override
-    public RedisFuture<Long> scard(K key) {
-        return dispatch(commandBuilder.scard(key));
+    public RedisFuture<KeyScanCursor<K>> scan() {
+        return dispatch(commandBuilder.scan());
     }
 
     @Override
-    public RedisFuture<List<Boolean>> scriptExists(String... digests) {
-        return dispatch(commandBuilder.scriptExists(digests));
+    public RedisFuture<KeyScanCursor<K>> scan(ScanArgs scanArgs) {
+        return dispatch(commandBuilder.scan(scanArgs));
     }
 
     @Override
-    public RedisFuture<String> scriptFlush() {
-        return dispatch(commandBuilder.scriptFlush());
+    public RedisFuture<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs) {
+        return dispatch(commandBuilder.scan(scanCursor, scanArgs));
     }
 
     @Override
-    public RedisFuture<String> scriptKill() {
-        return dispatch(commandBuilder.scriptKill());
+    public RedisFuture<KeyScanCursor<K>> scan(ScanCursor scanCursor) {
+        return dispatch(commandBuilder.scan(scanCursor));
     }
 
     @Override
-    public RedisFuture<String> scriptLoad(V script) {
-        return dispatch(commandBuilder.scriptLoad(script));
+    public RedisFuture<StreamScanCursor> scan(KeyStreamingChannel<K> channel) {
+        return dispatch(commandBuilder.scanStreaming(channel));
+    }
+
+    @Override
+    public RedisFuture<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs) {
+        return dispatch(commandBuilder.scanStreaming(channel, scanArgs));
+    }
+
+    @Override
+    public RedisFuture<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return dispatch(commandBuilder.scanStreaming(channel, scanCursor, scanArgs));
+    }
+
+    @Override
+    public RedisFuture<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor) {
+        return dispatch(commandBuilder.scanStreaming(channel, scanCursor));
+    }
+
+    @Override
+    public RedisFuture<Long> scard(K key) {
+        return dispatch(commandBuilder.scard(key));
+    }
+
+    @Override
+    public RedisFuture<List<Boolean>> scriptExists(String... digests) {
+        return dispatch(commandBuilder.scriptExists(digests));
+    }
+
+    @Override
+    public RedisFuture<String> scriptFlush() {
+        return dispatch(commandBuilder.scriptFlush());
+    }
+
+    @Override
+    public RedisFuture<String> scriptKill() {
+        return dispatch(commandBuilder.scriptKill());
+    }
+
+    @Override
+    public RedisFuture<String> scriptLoad(V script) {
+        return dispatch(commandBuilder.scriptLoad(script));
     }
 
     @Override
@@ -830,10 +1184,6 @@ protected AsyncCommand<K, V, String> selectAsync(int db) {
         return dispatch(commandBuilder.select(db));
     }
 
-    public RedisFuture<String> swapdb(int db1, int db2) {
-        return dispatch(commandBuilder.swapdb(db1, db2));
-    }
-
     @Override
     public RedisFuture<String> set(K key, V value) {
         return dispatch(commandBuilder.set(key, value));
@@ -844,6 +1194,19 @@ public RedisFuture<String> set(K key, V value, SetArgs setArgs) {
         return dispatch(commandBuilder.set(key, value, setArgs));
     }
 
+    @Override
+    public void setAutoFlushCommands(boolean autoFlush) {
+        connection.setAutoFlushCommands(autoFlush);
+    }
+
+    public void setTimeout(Duration timeout) {
+        connection.setTimeout(timeout);
+    }
+
+    public void setTimeout(long timeout, TimeUnit unit) {
+        connection.setTimeout(timeout, unit);
+    }
+
     @Override
     public RedisFuture<Long> setbit(K key, long offset, int value) {
         return dispatch(commandBuilder.setbit(key, offset, value));
@@ -854,11 +1217,6 @@ public RedisFuture<String> setex(K key, long seconds, V value) {
         return dispatch(commandBuilder.setex(key, seconds, value));
     }
 
-    @Override
-    public RedisFuture<String> psetex(K key, long milliseconds, V value) {
-        return dispatch(commandBuilder.psetex(key, milliseconds, value));
-    }
-
     @Override
     public RedisFuture<Boolean> setnx(K key, V value) {
         return dispatch(commandBuilder.setnx(key, value));
@@ -894,11 +1252,6 @@ public RedisFuture<Boolean> sismember(K key, V member) {
         return dispatch(commandBuilder.sismember(key, member));
     }
 
-    @Override
-    public RedisFuture<Boolean> smove(K source, K destination, V member) {
-        return dispatch(commandBuilder.smove(source, destination, member));
-    }
-
     @Override
     public RedisFuture<String> slaveof(String host, int port) {
         return dispatch(commandBuilder.slaveof(host, port));
@@ -939,6 +1292,11 @@ public RedisFuture<Long> smembers(ValueStreamingChannel<V> channel, K key) {
         return dispatch(commandBuilder.smembers(channel, key));
     }
 
+    @Override
+    public RedisFuture<Boolean> smove(K source, K destination, V member) {
+        return dispatch(commandBuilder.smove(source, destination, member));
+    }
+
     @Override
     public RedisFuture<List<V>> sort(K key) {
         return dispatch(commandBuilder.sort(key));
@@ -994,6 +1352,51 @@ public RedisFuture<Long> srem(K key, V... members) {
         return dispatch(commandBuilder.srem(key, members));
     }
 
+    @Override
+    public RedisFuture<ValueScanCursor<V>> sscan(K key) {
+        return dispatch(commandBuilder.sscan(key));
+    }
+
+    @Override
+    public RedisFuture<ValueScanCursor<V>> sscan(K key, ScanArgs scanArgs) {
+        return dispatch(commandBuilder.sscan(key, scanArgs));
+    }
+
+    @Override
+    public RedisFuture<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return dispatch(commandBuilder.sscan(key, scanCursor, scanArgs));
+    }
+
+    @Override
+    public RedisFuture<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor) {
+        return dispatch(commandBuilder.sscan(key, scanCursor));
+    }
+
+    @Override
+    public RedisFuture<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key) {
+        return dispatch(commandBuilder.sscanStreaming(channel, key));
+    }
+
+    @Override
+    public RedisFuture<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanArgs scanArgs) {
+        return dispatch(commandBuilder.sscanStreaming(channel, key, scanArgs));
+    }
+
+    @Override
+    public RedisFuture<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return dispatch(commandBuilder.sscanStreaming(channel, key, scanCursor, scanArgs));
+    }
+
+    @Override
+    public RedisFuture<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
+        return dispatch(commandBuilder.sscanStreaming(channel, key, scanCursor));
+    }
+
+    @Override
+    public RedisFuture<Long> strlen(K key) {
+        return dispatch(commandBuilder.strlen(key));
+    }
+
     @Override
     public RedisFuture<Set<V>> sunion(K... keys) {
         return dispatch(commandBuilder.sunion(keys));
@@ -1009,9 +1412,13 @@ public RedisFuture<Long> sunionstore(K destination, K... keys) {
         return dispatch(commandBuilder.sunionstore(destination, keys));
     }
 
+    public RedisFuture<String> swapdb(int db1, int db2) {
+        return dispatch(commandBuilder.swapdb(db1, db2));
+    }
+
     @Override
-    public RedisFuture<Long> strlen(K key) {
-        return dispatch(commandBuilder.strlen(key));
+    public RedisFuture<List<V>> time() {
+        return dispatch(commandBuilder.time());
     }
 
     @Override
@@ -1034,8 +1441,12 @@ public RedisFuture<String> type(K key) {
     }
 
     @Override
-    public RedisFuture<String> watch(K... keys) {
-        return dispatch(commandBuilder.watch(keys));
+    public RedisFuture<Long> unlink(K... keys) {
+        return dispatch(commandBuilder.unlink(keys));
+    }
+
+    public RedisFuture<Long> unlink(Iterable<K> keys) {
+        return dispatch(commandBuilder.unlink(keys));
     }
 
     @Override
@@ -1043,6 +1454,16 @@ public RedisFuture<String> unwatch() {
         return dispatch(commandBuilder.unwatch());
     }
 
+    @Override
+    public RedisFuture<Long> waitForReplication(int replicas, long timeout) {
+        return dispatch(commandBuilder.wait(replicas, timeout));
+    }
+
+    @Override
+    public RedisFuture<String> watch(K... keys) {
+        return dispatch(commandBuilder.watch(keys));
+    }
+
     @Override
     public RedisFuture<Long> zadd(K key, double score, V member) {
         return dispatch(commandBuilder.zadd(key, null, score, member));
@@ -1119,83 +1540,83 @@ public RedisFuture<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... k
     }
 
     @Override
-    public RedisFuture<List<V>> zrange(K key, long start, long stop) {
-        return dispatch(commandBuilder.zrange(key, start, stop));
+    public RedisFuture<Long> zlexcount(K key, String min, String max) {
+        return dispatch(commandBuilder.zlexcount(key, min, max));
     }
 
     @Override
-    public RedisFuture<List<ScoredValue<V>>> zrangeWithScores(K key, long start, long stop) {
-        return dispatch(commandBuilder.zrangeWithScores(key, start, stop));
+    public RedisFuture<Long> zlexcount(K key, Range<? extends V> range) {
+        return dispatch(commandBuilder.zlexcount(key, range));
     }
 
     @Override
-    public RedisFuture<List<V>> zrangebyscore(K key, double min, double max) {
-        return dispatch(commandBuilder.zrangebyscore(key, min, max));
+    public RedisFuture<List<V>> zrange(K key, long start, long stop) {
+        return dispatch(commandBuilder.zrange(key, start, stop));
     }
 
     @Override
-    public RedisFuture<List<V>> zrangebyscore(K key, String min, String max) {
-        return dispatch(commandBuilder.zrangebyscore(key, min, max));
+    public RedisFuture<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return dispatch(commandBuilder.zrange(channel, key, start, stop));
     }
 
     @Override
-    public RedisFuture<List<V>> zrangebyscore(K key, Range<? extends Number> range) {
-        return dispatch(commandBuilder.zrangebyscore(key, range, Limit.unlimited()));
+    public RedisFuture<List<ScoredValue<V>>> zrangeWithScores(K key, long start, long stop) {
+        return dispatch(commandBuilder.zrangeWithScores(key, start, stop));
     }
 
     @Override
-    public RedisFuture<List<V>> zrangebyscore(K key, double min, double max, long offset, long count) {
-        return dispatch(commandBuilder.zrangebyscore(key, min, max, offset, count));
+    public RedisFuture<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return dispatch(commandBuilder.zrangeWithScores(channel, key, start, stop));
     }
 
     @Override
-    public RedisFuture<List<V>> zrangebyscore(K key, String min, String max, long offset, long count) {
-        return dispatch(commandBuilder.zrangebyscore(key, min, max, offset, count));
+    public RedisFuture<List<V>> zrangebylex(K key, String min, String max) {
+        return dispatch(commandBuilder.zrangebylex(key, min, max));
     }
 
     @Override
-    public RedisFuture<List<V>> zrangebyscore(K key, Range<? extends Number> range, Limit limit) {
-        return dispatch(commandBuilder.zrangebyscore(key, range, limit));
+    public RedisFuture<List<V>> zrangebylex(K key, Range<? extends V> range) {
+        return dispatch(commandBuilder.zrangebylex(key, range, Limit.unlimited()));
     }
 
     @Override
-    public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max) {
-        return dispatch(commandBuilder.zrangebyscoreWithScores(key, min, max));
+    public RedisFuture<List<V>> zrangebylex(K key, String min, String max, long offset, long count) {
+        return dispatch(commandBuilder.zrangebylex(key, min, max, offset, count));
     }
 
     @Override
-    public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max) {
-        return dispatch(commandBuilder.zrangebyscoreWithScores(key, min, max));
+    public RedisFuture<List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit) {
+        return dispatch(commandBuilder.zrangebylex(key, range, limit));
     }
 
     @Override
-    public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range) {
-        return dispatch(commandBuilder.zrangebyscoreWithScores(key, range, Limit.unlimited()));
+    public RedisFuture<List<V>> zrangebyscore(K key, double min, double max) {
+        return dispatch(commandBuilder.zrangebyscore(key, min, max));
     }
 
     @Override
-    public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count) {
-        return dispatch(commandBuilder.zrangebyscoreWithScores(key, min, max, offset, count));
+    public RedisFuture<List<V>> zrangebyscore(K key, String min, String max) {
+        return dispatch(commandBuilder.zrangebyscore(key, min, max));
     }
 
     @Override
-    public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count) {
-        return dispatch(commandBuilder.zrangebyscoreWithScores(key, min, max, offset, count));
+    public RedisFuture<List<V>> zrangebyscore(K key, Range<? extends Number> range) {
+        return dispatch(commandBuilder.zrangebyscore(key, range, Limit.unlimited()));
     }
 
     @Override
-    public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
-        return dispatch(commandBuilder.zrangebyscoreWithScores(key, range, limit));
+    public RedisFuture<List<V>> zrangebyscore(K key, double min, double max, long offset, long count) {
+        return dispatch(commandBuilder.zrangebyscore(key, min, max, offset, count));
     }
 
     @Override
-    public RedisFuture<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return dispatch(commandBuilder.zrange(channel, key, start, stop));
+    public RedisFuture<List<V>> zrangebyscore(K key, String min, String max, long offset, long count) {
+        return dispatch(commandBuilder.zrangebyscore(key, min, max, offset, count));
     }
 
     @Override
-    public RedisFuture<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return dispatch(commandBuilder.zrangeWithScores(channel, key, start, stop));
+    public RedisFuture<List<V>> zrangebyscore(K key, Range<? extends Number> range, Limit limit) {
+        return dispatch(commandBuilder.zrangebyscore(key, range, limit));
     }
 
     @Override
@@ -1230,6 +1651,36 @@ public RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key,
         return dispatch(commandBuilder.zrangebyscore(channel, key, range, limit));
     }
 
+    @Override
+    public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max) {
+        return dispatch(commandBuilder.zrangebyscoreWithScores(key, min, max));
+    }
+
+    @Override
+    public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max) {
+        return dispatch(commandBuilder.zrangebyscoreWithScores(key, min, max));
+    }
+
+    @Override
+    public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range) {
+        return dispatch(commandBuilder.zrangebyscoreWithScores(key, range, Limit.unlimited()));
+    }
+
+    @Override
+    public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count) {
+        return dispatch(commandBuilder.zrangebyscoreWithScores(key, min, max, offset, count));
+    }
+
+    @Override
+    public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count) {
+        return dispatch(commandBuilder.zrangebyscoreWithScores(key, min, max, offset, count));
+    }
+
+    @Override
+    public RedisFuture<List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
+        return dispatch(commandBuilder.zrangebyscoreWithScores(key, range, limit));
+    }
+
     @Override
     public RedisFuture<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max) {
         return dispatch(commandBuilder.zrangebyscoreWithScores(channel, key, min, max));
@@ -1274,6 +1725,16 @@ public RedisFuture<Long> zrem(K key, V... members) {
         return dispatch(commandBuilder.zrem(key, members));
     }
 
+    @Override
+    public RedisFuture<Long> zremrangebylex(K key, String min, String max) {
+        return dispatch(commandBuilder.zremrangebylex(key, min, max));
+    }
+
+    @Override
+    public RedisFuture<Long> zremrangebylex(K key, Range<? extends V> range) {
+        return dispatch(commandBuilder.zremrangebylex(key, range));
+    }
+
     @Override
     public RedisFuture<Long> zremrangebyrank(K key, long start, long stop) {
         return dispatch(commandBuilder.zremrangebyrank(key, start, stop));
@@ -1299,14 +1760,24 @@ public RedisFuture<List<V>> zrevrange(K key, long start, long stop) {
         return dispatch(commandBuilder.zrevrange(key, start, stop));
     }
 
+    @Override
+    public RedisFuture<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return dispatch(commandBuilder.zrevrange(channel, key, start, stop));
+    }
+
     @Override
     public RedisFuture<List<ScoredValue<V>>> zrevrangeWithScores(K key, long start, long stop) {
         return dispatch(commandBuilder.zrevrangeWithScores(key, start, stop));
     }
 
     @Override
-    public RedisFuture<List<V>> zrevrangebylex(K key, Range<? extends V> range) {
-        return dispatch(commandBuilder.zrevrangebylex(key, range, Limit.unlimited()));
+    public RedisFuture<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return dispatch(commandBuilder.zrevrangeWithScores(channel, key, start, stop));
+    }
+
+    @Override
+    public RedisFuture<List<V>> zrevrangebylex(K key, Range<? extends V> range) {
+        return dispatch(commandBuilder.zrevrangebylex(key, range, Limit.unlimited()));
     }
 
     @Override
@@ -1345,76 +1816,66 @@ public RedisFuture<List<V>> zrevrangebyscore(K key, Range<? extends Number> rang
     }
 
     @Override
-    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min) {
-        return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, max, min));
-    }
-
-    @Override
-    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min) {
-        return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, max, min));
-    }
-
-    @Override
-    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range) {
-        return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, range, Limit.unlimited()));
+    public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min) {
+        return dispatch(commandBuilder.zrevrangebyscore(channel, key, max, min));
     }
 
     @Override
-    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count) {
-        return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
+    public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min) {
+        return dispatch(commandBuilder.zrevrangebyscore(channel, key, max, min));
     }
 
     @Override
-    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count) {
-        return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
+    public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range) {
+        return dispatch(commandBuilder.zrevrangebyscore(channel, key, range, Limit.unlimited()));
     }
 
     @Override
-    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
-        return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, range, limit));
+    public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset,
+            long count) {
+        return dispatch(commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
     }
 
     @Override
-    public RedisFuture<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return dispatch(commandBuilder.zrevrange(channel, key, start, stop));
+    public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset,
+            long count) {
+        return dispatch(commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
     }
 
     @Override
-    public RedisFuture<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return dispatch(commandBuilder.zrevrangeWithScores(channel, key, start, stop));
+    public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
+            Limit limit) {
+        return dispatch(commandBuilder.zrevrangebyscore(channel, key, range, limit));
     }
 
     @Override
-    public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min) {
-        return dispatch(commandBuilder.zrevrangebyscore(channel, key, max, min));
+    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min) {
+        return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, max, min));
     }
 
     @Override
-    public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min) {
-        return dispatch(commandBuilder.zrevrangebyscore(channel, key, max, min));
+    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min) {
+        return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, max, min));
     }
 
     @Override
-    public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range) {
-        return dispatch(commandBuilder.zrevrangebyscore(channel, key, range, Limit.unlimited()));
+    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range) {
+        return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, range, Limit.unlimited()));
     }
 
     @Override
-    public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset,
-            long count) {
-        return dispatch(commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
+    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count) {
+        return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
     }
 
     @Override
-    public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset,
-            long count) {
-        return dispatch(commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
+    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count) {
+        return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
     }
 
     @Override
-    public RedisFuture<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
-            Limit limit) {
-        return dispatch(commandBuilder.zrevrangebyscore(channel, key, range, limit));
+    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
+        return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, range, limit));
     }
 
     @Override
@@ -1456,142 +1917,6 @@ public RedisFuture<Long> zrevrank(K key, V member) {
         return dispatch(commandBuilder.zrevrank(key, member));
     }
 
-    @Override
-    public RedisFuture<Double> zscore(K key, V member) {
-        return dispatch(commandBuilder.zscore(key, member));
-    }
-
-    @Override
-    public RedisFuture<Long> zunionstore(K destination, K... keys) {
-        return dispatch(commandBuilder.zunionstore(destination, keys));
-    }
-
-    @Override
-    public RedisFuture<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
-        return dispatch(commandBuilder.zunionstore(destination, storeArgs, keys));
-    }
-
-    @Override
-    public RedisFuture<KeyScanCursor<K>> scan() {
-        return dispatch(commandBuilder.scan());
-    }
-
-    @Override
-    public RedisFuture<KeyScanCursor<K>> scan(ScanArgs scanArgs) {
-        return dispatch(commandBuilder.scan(scanArgs));
-    }
-
-    @Override
-    public RedisFuture<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs) {
-        return dispatch(commandBuilder.scan(scanCursor, scanArgs));
-    }
-
-    @Override
-    public RedisFuture<KeyScanCursor<K>> scan(ScanCursor scanCursor) {
-        return dispatch(commandBuilder.scan(scanCursor));
-    }
-
-    @Override
-    public RedisFuture<StreamScanCursor> scan(KeyStreamingChannel<K> channel) {
-        return dispatch(commandBuilder.scanStreaming(channel));
-    }
-
-    @Override
-    public RedisFuture<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs) {
-        return dispatch(commandBuilder.scanStreaming(channel, scanArgs));
-    }
-
-    @Override
-    public RedisFuture<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return dispatch(commandBuilder.scanStreaming(channel, scanCursor, scanArgs));
-    }
-
-    @Override
-    public RedisFuture<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor) {
-        return dispatch(commandBuilder.scanStreaming(channel, scanCursor));
-    }
-
-    @Override
-    public RedisFuture<ValueScanCursor<V>> sscan(K key) {
-        return dispatch(commandBuilder.sscan(key));
-    }
-
-    @Override
-    public RedisFuture<ValueScanCursor<V>> sscan(K key, ScanArgs scanArgs) {
-        return dispatch(commandBuilder.sscan(key, scanArgs));
-    }
-
-    @Override
-    public RedisFuture<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return dispatch(commandBuilder.sscan(key, scanCursor, scanArgs));
-    }
-
-    @Override
-    public RedisFuture<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor) {
-        return dispatch(commandBuilder.sscan(key, scanCursor));
-    }
-
-    @Override
-    public RedisFuture<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key) {
-        return dispatch(commandBuilder.sscanStreaming(channel, key));
-    }
-
-    @Override
-    public RedisFuture<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanArgs scanArgs) {
-        return dispatch(commandBuilder.sscanStreaming(channel, key, scanArgs));
-    }
-
-    @Override
-    public RedisFuture<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return dispatch(commandBuilder.sscanStreaming(channel, key, scanCursor, scanArgs));
-    }
-
-    @Override
-    public RedisFuture<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
-        return dispatch(commandBuilder.sscanStreaming(channel, key, scanCursor));
-    }
-
-    @Override
-    public RedisFuture<MapScanCursor<K, V>> hscan(K key) {
-        return dispatch(commandBuilder.hscan(key));
-    }
-
-    @Override
-    public RedisFuture<MapScanCursor<K, V>> hscan(K key, ScanArgs scanArgs) {
-        return dispatch(commandBuilder.hscan(key, scanArgs));
-    }
-
-    @Override
-    public RedisFuture<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return dispatch(commandBuilder.hscan(key, scanCursor, scanArgs));
-    }
-
-    @Override
-    public RedisFuture<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor) {
-        return dispatch(commandBuilder.hscan(key, scanCursor));
-    }
-
-    @Override
-    public RedisFuture<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key) {
-        return dispatch(commandBuilder.hscanStreaming(channel, key));
-    }
-
-    @Override
-    public RedisFuture<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanArgs scanArgs) {
-        return dispatch(commandBuilder.hscanStreaming(channel, key, scanArgs));
-    }
-
-    @Override
-    public RedisFuture<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor,
-            ScanArgs scanArgs) {
-        return dispatch(commandBuilder.hscanStreaming(channel, key, scanCursor, scanArgs));
-    }
-
-    @Override
-    public RedisFuture<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor) {
-        return dispatch(commandBuilder.hscanStreaming(channel, key, scanCursor));
-    }
-
     @Override
     public RedisFuture<ScoredValueScanCursor<V>> zscan(K key) {
         return dispatch(commandBuilder.zscan(key));
@@ -1634,342 +1959,17 @@ public RedisFuture<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channe
     }
 
     @Override
-    public String digest(V script) {
-        return LettuceStrings.digest(codec.encodeValue(script));
-    }
-
-    @Override
-    public RedisFuture<List<V>> time() {
-        return dispatch(commandBuilder.time());
-    }
-
-    @Override
-    public RedisFuture<Long> waitForReplication(int replicas, long timeout) {
-        return dispatch(commandBuilder.wait(replicas, timeout));
-    }
-
-    @Override
-    public RedisFuture<Long> pfadd(K key, V... values) {
-        return dispatch(commandBuilder.pfadd(key, values));
-    }
-
-    @Override
-    public RedisFuture<String> pfmerge(K destkey, K... sourcekeys) {
-        return dispatch(commandBuilder.pfmerge(destkey, sourcekeys));
-    }
-
-    @Override
-    public RedisFuture<Long> pfcount(K... keys) {
-        return dispatch(commandBuilder.pfcount(keys));
-    }
-
-    @Override
-    public RedisFuture<String> clusterBumpepoch() {
-        return dispatch(commandBuilder.clusterBumpepoch());
-    }
-
-    @Override
-    public RedisFuture<String> clusterMeet(String ip, int port) {
-        return dispatch(commandBuilder.clusterMeet(ip, port));
-    }
-
-    @Override
-    public RedisFuture<String> clusterForget(String nodeId) {
-        return dispatch(commandBuilder.clusterForget(nodeId));
+    public RedisFuture<Double> zscore(K key, V member) {
+        return dispatch(commandBuilder.zscore(key, member));
     }
 
     @Override
-    public RedisFuture<String> clusterAddSlots(int... slots) {
-        return dispatch(commandBuilder.clusterAddslots(slots));
+    public RedisFuture<Long> zunionstore(K destination, K... keys) {
+        return dispatch(commandBuilder.zunionstore(destination, keys));
     }
 
     @Override
-    public RedisFuture<String> clusterDelSlots(int... slots) {
-        return dispatch(commandBuilder.clusterDelslots(slots));
-    }
-
-    @Override
-    public RedisFuture<String> clusterInfo() {
-        return dispatch(commandBuilder.clusterInfo());
-    }
-
-    @Override
-    public RedisFuture<String> clusterMyId() {
-        return dispatch(commandBuilder.clusterMyId());
-    }
-
-    @Override
-    public RedisFuture<String> clusterNodes() {
-        return dispatch(commandBuilder.clusterNodes());
-    }
-
-    @Override
-    public RedisFuture<List<K>> clusterGetKeysInSlot(int slot, int count) {
-        return dispatch(commandBuilder.clusterGetKeysInSlot(slot, count));
-    }
-
-    @Override
-    public RedisFuture<Long> clusterCountKeysInSlot(int slot) {
-        return dispatch(commandBuilder.clusterCountKeysInSlot(slot));
-    }
-
-    @Override
-    public RedisFuture<Long> clusterCountFailureReports(String nodeId) {
-        return dispatch(commandBuilder.clusterCountFailureReports(nodeId));
-    }
-
-    @Override
-    public RedisFuture<Long> clusterKeyslot(K key) {
-        return dispatch(commandBuilder.clusterKeyslot(key));
-    }
-
-    @Override
-    public RedisFuture<String> clusterSaveconfig() {
-        return dispatch(commandBuilder.clusterSaveconfig());
-    }
-
-    @Override
-    public RedisFuture<String> clusterSetConfigEpoch(long configEpoch) {
-        return dispatch(commandBuilder.clusterSetConfigEpoch(configEpoch));
-    }
-
-    @Override
-    public RedisFuture<List<Object>> clusterSlots() {
-        return dispatch(commandBuilder.clusterSlots());
-    }
-
-    @Override
-    public RedisFuture<String> clusterSetSlotNode(int slot, String nodeId) {
-        return dispatch(commandBuilder.clusterSetSlotNode(slot, nodeId));
-    }
-
-    @Override
-    public RedisFuture<String> clusterSetSlotStable(int slot) {
-        return dispatch(commandBuilder.clusterSetSlotStable(slot));
-    }
-
-    @Override
-    public RedisFuture<String> clusterSetSlotMigrating(int slot, String nodeId) {
-        return dispatch(commandBuilder.clusterSetSlotMigrating(slot, nodeId));
-    }
-
-    @Override
-    public RedisFuture<String> clusterSetSlotImporting(int slot, String nodeId) {
-        return dispatch(commandBuilder.clusterSetSlotImporting(slot, nodeId));
-    }
-
-    @Override
-    public RedisFuture<String> clusterFailover(boolean force) {
-        return dispatch(commandBuilder.clusterFailover(force));
-    }
-
-    @Override
-    public RedisFuture<String> clusterReset(boolean hard) {
-        return dispatch(commandBuilder.clusterReset(hard));
-    }
-
-    @Override
-    public RedisFuture<String> asking() {
-        return dispatch(commandBuilder.asking());
-    }
-
-    @Override
-    public RedisFuture<String> clusterReplicate(String nodeId) {
-        return dispatch(commandBuilder.clusterReplicate(nodeId));
-    }
-
-    @Override
-    public RedisFuture<String> clusterFlushslots() {
-        return dispatch(commandBuilder.clusterFlushslots());
-    }
-
-    @Override
-    public RedisFuture<List<String>> clusterSlaves(String nodeId) {
-        return dispatch(commandBuilder.clusterSlaves(nodeId));
-    }
-
-    @Override
-    public RedisFuture<Long> zlexcount(K key, String min, String max) {
-        return dispatch(commandBuilder.zlexcount(key, min, max));
-    }
-
-    @Override
-    public RedisFuture<Long> zlexcount(K key, Range<? extends V> range) {
-        return dispatch(commandBuilder.zlexcount(key, range));
-    }
-
-    @Override
-    public RedisFuture<Long> zremrangebylex(K key, String min, String max) {
-        return dispatch(commandBuilder.zremrangebylex(key, min, max));
-    }
-
-    @Override
-    public RedisFuture<Long> zremrangebylex(K key, Range<? extends V> range) {
-        return dispatch(commandBuilder.zremrangebylex(key, range));
-    }
-
-    @Override
-    public RedisFuture<List<V>> zrangebylex(K key, String min, String max) {
-        return dispatch(commandBuilder.zrangebylex(key, min, max));
-    }
-
-    @Override
-    public RedisFuture<List<V>> zrangebylex(K key, Range<? extends V> range) {
-        return dispatch(commandBuilder.zrangebylex(key, range, Limit.unlimited()));
-    }
-
-    @Override
-    public RedisFuture<List<V>> zrangebylex(K key, String min, String max, long offset, long count) {
-        return dispatch(commandBuilder.zrangebylex(key, min, max, offset, count));
-    }
-
-    @Override
-    public RedisFuture<List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit) {
-        return dispatch(commandBuilder.zrangebylex(key, range, limit));
-    }
-
-    @Override
-    public RedisFuture<Long> geoadd(K key, double longitude, double latitude, V member) {
-        return dispatch(commandBuilder.geoadd(key, longitude, latitude, member));
-    }
-
-    @Override
-    public RedisFuture<Long> geoadd(K key, Object... lngLatMember) {
-        return dispatch(commandBuilder.geoadd(key, lngLatMember));
-    }
-
-    @Override
-    public RedisFuture<List<Value<String>>> geohash(K key, V... members) {
-        return dispatch(commandBuilder.geohash(key, members));
-    }
-
-    @Override
-    public RedisFuture<Set<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
-        return dispatch(commandBuilder.georadius(GEORADIUS, key, longitude, latitude, distance, unit.name()));
-    }
-
-    protected RedisFuture<Set<V>> georadius_ro(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
-        return dispatch(commandBuilder.georadius(GEORADIUS_RO, key, longitude, latitude, distance, unit.name()));
-    }
-
-    @Override
-    public RedisFuture<List<GeoWithin<V>>> georadius(K key, double longitude, double latitude, double distance,
-            GeoArgs.Unit unit, GeoArgs geoArgs) {
-        return dispatch(commandBuilder.georadius(GEORADIUS, key, longitude, latitude, distance, unit.name(), geoArgs));
-    }
-
-    protected RedisFuture<List<GeoWithin<V>>> georadius_ro(K key, double longitude, double latitude, double distance,
-            GeoArgs.Unit unit, GeoArgs geoArgs) {
-        return dispatch(commandBuilder.georadius(GEORADIUS_RO, key, longitude, latitude, distance, unit.name(), geoArgs));
-    }
-
-    @Override
-    public RedisFuture<Long> georadius(K key, double longitude, double latitude, double distance, Unit unit,
-            GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
-        return dispatch(commandBuilder.georadius(key, longitude, latitude, distance, unit.name(), geoRadiusStoreArgs));
-    }
-
-    @Override
-    public RedisFuture<Set<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit) {
-        return dispatch(commandBuilder.georadiusbymember(GEORADIUSBYMEMBER, key, member, distance, unit.name()));
-    }
-
-    protected RedisFuture<Set<V>> georadiusbymember_ro(K key, V member, double distance, GeoArgs.Unit unit) {
-        return dispatch(commandBuilder.georadiusbymember(GEORADIUSBYMEMBER_RO, key, member, distance, unit.name()));
-    }
-
-    @Override
-    public RedisFuture<List<GeoWithin<V>>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit,
-            GeoArgs geoArgs) {
-        return dispatch(commandBuilder.georadiusbymember(GEORADIUSBYMEMBER, key, member, distance, unit.name(), geoArgs));
-    }
-
-    protected RedisFuture<List<GeoWithin<V>>> georadiusbymember_ro(K key, V member, double distance, GeoArgs.Unit unit,
-            GeoArgs geoArgs) {
-        return dispatch(commandBuilder.georadiusbymember(GEORADIUSBYMEMBER_RO, key, member, distance, unit.name(), geoArgs));
-    }
-
-    @Override
-    public RedisFuture<Long> georadiusbymember(K key, V member, double distance, Unit unit,
-            GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
-        return dispatch(commandBuilder.georadiusbymember(key, member, distance, unit.name(), geoRadiusStoreArgs));
-    }
-
-    @Override
-    public RedisFuture<List<GeoCoordinates>> geopos(K key, V... members) {
-        return dispatch(commandBuilder.geopos(key, members));
-    }
-
-    @Override
-    public RedisFuture<Double> geodist(K key, V from, V to, GeoArgs.Unit unit) {
-        return dispatch(commandBuilder.geodist(key, from, to, unit));
-    }
-
-    @Override
-    public <T> RedisFuture<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output) {
-
-        LettuceAssert.notNull(type, "Command type must not be null");
-        LettuceAssert.notNull(output, "CommandOutput type must not be null");
-
-        return dispatch(new AsyncCommand<>(new Command<>(type, output)));
-    }
-
-    @Override
-    public <T> RedisFuture<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args) {
-
-        LettuceAssert.notNull(type, "Command type must not be null");
-        LettuceAssert.notNull(output, "CommandOutput type must not be null");
-        LettuceAssert.notNull(args, "CommandArgs type must not be null");
-
-        return dispatch(new AsyncCommand<>(new Command<>(type, output, args)));
-    }
-
-    protected <T> RedisFuture<T> dispatch(CommandType type, CommandOutput<K, V, T> output) {
-        return dispatch(type, output, null);
-    }
-
-    protected <T> RedisFuture<T> dispatch(CommandType type, CommandOutput<K, V, T> output, CommandArgs<K, V> args) {
-        return dispatch(new AsyncCommand<>(new Command<>(type, output, args)));
-    }
-
-    public <T> AsyncCommand<K, V, T> dispatch(RedisCommand<K, V, T> cmd) {
-        AsyncCommand<K, V, T> asyncCommand = new AsyncCommand<>(cmd);
-        RedisCommand<K, V, T> dispatched = connection.dispatch(asyncCommand);
-        if (dispatched instanceof AsyncCommand) {
-            return (AsyncCommand<K, V, T>) dispatched;
-        }
-        return asyncCommand;
-    }
-
-    public void setTimeout(Duration timeout) {
-        connection.setTimeout(timeout);
-    }
-
-    public void setTimeout(long timeout, TimeUnit unit) {
-        connection.setTimeout(timeout, unit);
-    }
-
-    @Override
-    public boolean isOpen() {
-        return connection.isOpen();
-    }
-
-    @Override
-    public void reset() {
-        getConnection().reset();
-    }
-
-    public StatefulConnection<K, V> getConnection() {
-        return connection;
-    }
-
-    @Override
-    public void setAutoFlushCommands(boolean autoFlush) {
-        connection.setAutoFlushCommands(autoFlush);
-    }
-
-    @Override
-    public void flushCommands() {
-        connection.flushCommands();
+    public RedisFuture<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
+        return dispatch(commandBuilder.zunionstore(destination, storeArgs, keys));
     }
 }
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 413df44338..d4f6343983 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -48,9 +48,9 @@ public abstract class AbstractRedisReactiveCommands<K, V> implements RedisHashRe
         RedisServerReactiveCommands<K, V>, RedisHLLReactiveCommands<K, V>, BaseRedisReactiveCommands<K, V>,
         RedisTransactionalReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>, RedisClusterReactiveCommands<K, V> {
 
-    private final RedisCommandBuilder<K, V> commandBuilder;
-    private final RedisCodec<K, V> codec;
     private final StatefulConnection<K, V> connection;
+    private final RedisCodec<K, V> codec;
+    private final RedisCommandBuilder<K, V> commandBuilder;
 
     /**
      * Initialize a new instance.
@@ -61,7 +61,7 @@ public abstract class AbstractRedisReactiveCommands<K, V> implements RedisHashRe
     public AbstractRedisReactiveCommands(StatefulConnection<K, V> connection, RedisCodec<K, V> codec) {
         this.connection = connection;
         this.codec = codec;
-        this.commandBuilder = new RedisCommandBuilder<K, V>(codec);
+        this.commandBuilder = new RedisCommandBuilder<>(codec);
     }
 
     @Override
@@ -69,6 +69,11 @@ public Mono<Long> append(K key, V value) {
         return createMono(() -> commandBuilder.append(key, value));
     }
 
+    @Override
+    public Mono<String> asking() {
+        return createMono(commandBuilder::asking);
+    }
+
     @Override
     public Mono<String> auth(String password) {
         return createMono(() -> commandBuilder.auth(password));
@@ -99,16 +104,6 @@ public Flux<Value<Long>> bitfield(K key, BitFieldArgs args) {
         return createDissolvingFlux(() -> commandBuilder.bitfieldValue(key, args));
     }
 
-    @Override
-    public Mono<Long> bitpos(K key, boolean state) {
-        return createMono(() -> commandBuilder.bitpos(key, state));
-    }
-
-    @Override
-    public Mono<Long> bitpos(K key, boolean state, long start, long end) {
-        return createMono(() -> commandBuilder.bitpos(key, state, start, end));
-    }
-
     @Override
     public Mono<Long> bitopAnd(K destination, K... keys) {
         return createMono(() -> commandBuilder.bitopAnd(destination, keys));
@@ -129,6 +124,16 @@ public Mono<Long> bitopXor(K destination, K... keys) {
         return createMono(() -> commandBuilder.bitopXor(destination, keys));
     }
 
+    @Override
+    public Mono<Long> bitpos(K key, boolean state) {
+        return createMono(() -> commandBuilder.bitpos(key, state));
+    }
+
+    @Override
+    public Mono<Long> bitpos(K key, boolean state, long start, long end) {
+        return createMono(() -> commandBuilder.bitpos(key, state, start, end));
+    }
+
     @Override
     public Mono<KeyValue<K, V>> blpop(long timeout, K... keys) {
         return createMono(() -> commandBuilder.blpop(timeout, keys));
@@ -149,11 +154,6 @@ public Mono<K> clientGetname() {
         return createMono(commandBuilder::clientGetname);
     }
 
-    @Override
-    public Mono<String> clientSetname(K name) {
-        return createMono(() -> commandBuilder.clientSetname(name));
-    }
-
     @Override
     public Mono<String> clientKill(String addr) {
         return createMono(() -> commandBuilder.clientKill(addr));
@@ -164,14 +164,143 @@ public Mono<Long> clientKill(KillArgs killArgs) {
         return createMono(() -> commandBuilder.clientKill(killArgs));
     }
 
+    @Override
+    public Mono<String> clientList() {
+        return createMono(commandBuilder::clientList);
+    }
+
     @Override
     public Mono<String> clientPause(long timeout) {
         return createMono(() -> commandBuilder.clientPause(timeout));
     }
 
     @Override
-    public Mono<String> clientList() {
-        return createMono(commandBuilder::clientList);
+    public Mono<String> clientSetname(K name) {
+        return createMono(() -> commandBuilder.clientSetname(name));
+    }
+
+    public void close() {
+        connection.close();
+    }
+
+    @Override
+    public Mono<String> clusterAddSlots(int... slots) {
+        return createMono(() -> commandBuilder.clusterAddslots(slots));
+    }
+
+    @Override
+    public Mono<String> clusterBumpepoch() {
+        return createMono(() -> commandBuilder.clusterBumpepoch());
+    }
+
+    @Override
+    public Mono<Long> clusterCountFailureReports(String nodeId) {
+        return createMono(() -> commandBuilder.clusterCountFailureReports(nodeId));
+    }
+
+    @Override
+    public Mono<Long> clusterCountKeysInSlot(int slot) {
+        return createMono(() -> commandBuilder.clusterCountKeysInSlot(slot));
+    }
+
+    @Override
+    public Mono<String> clusterDelSlots(int... slots) {
+        return createMono(() -> commandBuilder.clusterDelslots(slots));
+    }
+
+    @Override
+    public Mono<String> clusterFailover(boolean force) {
+        return createMono(() -> commandBuilder.clusterFailover(force));
+    }
+
+    @Override
+    public Mono<String> clusterFlushslots() {
+        return createMono(commandBuilder::clusterFlushslots);
+    }
+
+    @Override
+    public Mono<String> clusterForget(String nodeId) {
+        return createMono(() -> commandBuilder.clusterForget(nodeId));
+    }
+
+    @Override
+    public Flux<K> clusterGetKeysInSlot(int slot, int count) {
+        return createDissolvingFlux(() -> commandBuilder.clusterGetKeysInSlot(slot, count));
+    }
+
+    @Override
+    public Mono<String> clusterInfo() {
+        return createMono(commandBuilder::clusterInfo);
+    }
+
+    @Override
+    public Mono<Long> clusterKeyslot(K key) {
+        return createMono(() -> commandBuilder.clusterKeyslot(key));
+    }
+
+    @Override
+    public Mono<String> clusterMeet(String ip, int port) {
+        return createMono(() -> commandBuilder.clusterMeet(ip, port));
+    }
+
+    @Override
+    public Mono<String> clusterMyId() {
+        return createMono(commandBuilder::clusterMyId);
+    }
+
+    @Override
+    public Mono<String> clusterNodes() {
+        return createMono(commandBuilder::clusterNodes);
+    }
+
+    @Override
+    public Mono<String> clusterReplicate(String nodeId) {
+        return createMono(() -> commandBuilder.clusterReplicate(nodeId));
+    }
+
+    @Override
+    public Mono<String> clusterReset(boolean hard) {
+        return createMono(() -> commandBuilder.clusterReset(hard));
+    }
+
+    @Override
+    public Mono<String> clusterSaveconfig() {
+        return createMono(() -> commandBuilder.clusterSaveconfig());
+    }
+
+    @Override
+    public Mono<String> clusterSetConfigEpoch(long configEpoch) {
+        return createMono(() -> commandBuilder.clusterSetConfigEpoch(configEpoch));
+    }
+
+    @Override
+    public Mono<String> clusterSetSlotImporting(int slot, String nodeId) {
+        return createMono(() -> commandBuilder.clusterSetSlotImporting(slot, nodeId));
+    }
+
+    @Override
+    public Mono<String> clusterSetSlotMigrating(int slot, String nodeId) {
+        return createMono(() -> commandBuilder.clusterSetSlotMigrating(slot, nodeId));
+    }
+
+    @Override
+    public Mono<String> clusterSetSlotNode(int slot, String nodeId) {
+        return createMono(() -> commandBuilder.clusterSetSlotNode(slot, nodeId));
+    }
+
+    @Override
+    public Mono<String> clusterSetSlotStable(int slot) {
+        return createMono(() -> commandBuilder.clusterSetSlotStable(slot));
+    }
+
+    @Override
+    public Flux<String> clusterSlaves(String nodeId) {
+        return createDissolvingFlux(() -> commandBuilder.clusterSlaves(nodeId));
+    }
+
+    @Override
+    public Flux<Object> clusterSlots() {
+        return createDissolvingFlux(commandBuilder::clusterSlots);
     }
 
     @Override
@@ -179,6 +308,11 @@ public Flux<Object> command() {
         return createDissolvingFlux(commandBuilder::command);
     }
 
+    @Override
+    public Mono<Long> commandCount() {
+        return createMono(commandBuilder::commandCount);
+    }
+
     @Override
     public Flux<Object> commandInfo(String... commands) {
         return createDissolvingFlux(() -> commandBuilder.commandInfo(commands));
@@ -194,11 +328,6 @@ public Flux<Object> commandInfo(CommandType... commands) {
         return commandInfo(stringCommands);
     }
 
-    @Override
-    public Mono<Long> commandCount() {
-        return createMono(commandBuilder::commandCount);
-    }
-
     @Override
     public Mono<Map<String, String>> configGet(String parameter) {
         return createMono(() -> commandBuilder.configGet(parameter));
@@ -209,14 +338,31 @@ public Mono<String> configResetstat() {
         return createMono(commandBuilder::configResetstat);
     }
 
+    @Override
+    public Mono<String> configRewrite() {
+        return createMono(commandBuilder::configRewrite);
+    }
+
     @Override
     public Mono<String> configSet(String parameter, String value) {
         return createMono(() -> commandBuilder.configSet(parameter, value));
     }
 
-    @Override
-    public Mono<String> configRewrite() {
-        return createMono(commandBuilder::configRewrite);
+    @SuppressWarnings("unchecked")
+    public <T, R> Flux<R> createDissolvingFlux(Supplier<RedisCommand<K, V, T>> commandSupplier) {
+        return (Flux<R>) Flux.from(new RedisPublisher<>(commandSupplier, connection, true));
+    }
+
+    public <T> Flux<T> createFlux(Supplier<RedisCommand<K, V, T>> commandSupplier) {
+        return Flux.from(new RedisPublisher<>(commandSupplier, connection, false));
+    }
+
+    protected <T> Mono<T> createMono(CommandType type, CommandOutput<K, V, T> output, CommandArgs<K, V> args) {
+        return createMono(() -> new Command<>(type, output, args));
+    }
+
+    public <T> Mono<T> createMono(Supplier<RedisCommand<K, V, T>> commandSupplier) {
+        return Mono.from(new RedisPublisher<>(commandSupplier, connection, false));
     }
 
     @Override
@@ -284,12 +430,8 @@ public Mono<Long> del(Iterable<K> keys) {
     }
 
     @Override
-    public Mono<Long> unlink(K... keys) {
-        return createMono(() -> commandBuilder.unlink(keys));
-    }
-
-    public Mono<Long> unlink(Iterable<K> keys) {
-        return createMono(() -> commandBuilder.unlink(keys));
+    public String digest(V script) {
+        return LettuceStrings.digest(codec.encodeValue(script));
     }
 
     @Override
@@ -297,6 +439,25 @@ public Mono<String> discard() {
         return createMono(commandBuilder::discard);
     }
 
+    @SuppressWarnings("unchecked")
+    public <T> Flux<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output) {
+
+        LettuceAssert.notNull(type, "Command type must not be null");
+        LettuceAssert.notNull(output, "CommandOutput type must not be null");
+
+        return (Flux) createFlux(() -> new Command<>(type, output));
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> Flux<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output, CommandArgs<K, V> args) {
+
+        LettuceAssert.notNull(type, "Command type must not be null");
+        LettuceAssert.notNull(output, "CommandOutput type must not be null");
+        LettuceAssert.notNull(args, "CommandArgs type must not be null");
+
+        return (Flux) createFlux(() -> new Command<>(type, output, args));
+    }
+
     @Override
     public Mono<byte[]> dump(K key) {
         return createMono(() -> commandBuilder.dump(key));
@@ -331,6 +492,11 @@ public <T> Flux<T> evalsha(String digest, ScriptOutputType type, K[] keys, V...
         return (Flux<T>) createFlux(() -> commandBuilder.evalsha(digest, type, keys, values));
     }
 
+    @Override
+    public Mono<TransactionResult> exec() {
+        return createMono(EXEC, null, null);
+    }
+
     public Mono<Boolean> exists(K key) {
         return createMono(() -> commandBuilder.exists(key));
     }
@@ -360,8 +526,8 @@ public Mono<Boolean> expireat(K key, Date timestamp) {
     }
 
     @Override
-    public Mono<TransactionResult> exec() {
-        return createMono(EXEC, null, null);
+    public void flushCommands() {
+        connection.flushCommands();
     }
 
     @Override
@@ -385,48 +551,122 @@ public Mono<String> flushdbAsync() {
     }
 
     @Override
-    public Mono<V> get(K key) {
-        return createMono(() -> commandBuilder.get(key));
+    public Mono<Long> geoadd(K key, double longitude, double latitude, V member) {
+        return createMono(() -> commandBuilder.geoadd(key, longitude, latitude, member));
     }
 
     @Override
-    public Mono<Long> getbit(K key, long offset) {
-        return createMono(() -> commandBuilder.getbit(key, offset));
+    public Mono<Long> geoadd(K key, Object... lngLatMember) {
+        return createMono(() -> commandBuilder.geoadd(key, lngLatMember));
     }
 
     @Override
-    public Mono<V> getrange(K key, long start, long end) {
-        return createMono(() -> commandBuilder.getrange(key, start, end));
+    public Mono<Double> geodist(K key, V from, V to, Unit unit) {
+        return createMono(() -> commandBuilder.geodist(key, from, to, unit));
     }
 
     @Override
-    public Mono<V> getset(K key, V value) {
-        return createMono(() -> commandBuilder.getset(key, value));
+    public Flux<Value<String>> geohash(K key, V... members) {
+        return createDissolvingFlux(() -> commandBuilder.geohash(key, members));
     }
 
     @Override
-    public Mono<Long> hdel(K key, K... fields) {
-        return createMono(() -> commandBuilder.hdel(key, fields));
+    public Flux<Value<GeoCoordinates>> geopos(K key, V... members) {
+        return createDissolvingFlux(() -> commandBuilder.geoposValues(key, members));
     }
 
     @Override
-    public Mono<Boolean> hexists(K key, K field) {
-        return createMono(() -> commandBuilder.hexists(key, field));
+    public Flux<V> georadius(K key, double longitude, double latitude, double distance, Unit unit) {
+        return createDissolvingFlux(() -> commandBuilder.georadius(GEORADIUS, key, longitude, latitude, distance, unit.name()));
     }
 
     @Override
-    public Mono<V> hget(K key, K field) {
-        return createMono(() -> commandBuilder.hget(key, field));
+    public Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, Unit unit, GeoArgs geoArgs) {
+        return createDissolvingFlux(() -> commandBuilder.georadius(GEORADIUS, key, longitude, latitude, distance, unit.name(),
+                geoArgs));
     }
 
     @Override
-    public Mono<Long> hincrby(K key, K field, long amount) {
-        return createMono(() -> commandBuilder.hincrby(key, field, amount));
+    public Mono<Long> georadius(K key, double longitude, double latitude, double distance, Unit unit,
+            GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
+        return createMono(() -> commandBuilder.georadius(key, longitude, latitude, distance, unit.name(), geoRadiusStoreArgs));
+    }
+
+    protected Flux<V> georadius_ro(K key, double longitude, double latitude, double distance, Unit unit) {
+        return createDissolvingFlux(() -> commandBuilder.georadius(GEORADIUS_RO, key, longitude, latitude, distance,
+                unit.name()));
+    }
+
+    protected Flux<GeoWithin<V>> georadius_ro(K key, double longitude, double latitude, double distance, Unit unit,
+            GeoArgs geoArgs) {
+        return createDissolvingFlux(() -> commandBuilder.georadius(GEORADIUS_RO, key, longitude, latitude, distance,
+                unit.name(), geoArgs));
     }
 
     @Override
-    public Mono<Double> hincrbyfloat(K key, K field, double amount) {
-        return createMono(() -> commandBuilder.hincrbyfloat(key, field, amount));
+    public Flux<V> georadiusbymember(K key, V member, double distance, Unit unit) {
+        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER, key, member, distance,
+                unit.name()));
+    }
+
+    @Override
+    public Flux<GeoWithin<V>> georadiusbymember(K key, V member, double distance, Unit unit, GeoArgs geoArgs) {
+        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER, key, member, distance,
+                unit.name(), geoArgs));
+    }
+
+    @Override
+    public Mono<Long> georadiusbymember(K key, V member, double distance, Unit unit, GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
+        return createMono(() -> commandBuilder.georadiusbymember(key, member, distance, unit.name(), geoRadiusStoreArgs));
+    }
+
+    protected Flux<V> georadiusbymember_ro(K key, V member, double distance, Unit unit) {
+        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER_RO, key, member, distance,
+                unit.name()));
+    }
+
+    protected Flux<GeoWithin<V>> georadiusbymember_ro(K key, V member, double distance, Unit unit, GeoArgs geoArgs) {
+        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER_RO, key, member, distance,
+                unit.name(), geoArgs));
+    }
+
+    @Override
+    public Mono<V> get(K key) {
+        return createMono(() -> commandBuilder.get(key));
+    }
+
+    public StatefulConnection<K, V> getConnection() {
+        return connection;
+    }
+
+    @Override
+    public Mono<Long> getbit(K key, long offset) {
+        return createMono(() -> commandBuilder.getbit(key, offset));
+    }
+
+    @Override
+    public Mono<V> getrange(K key, long start, long end) {
+        return createMono(() -> commandBuilder.getrange(key, start, end));
+    }
+
+    @Override
+    public Mono<V> getset(K key, V value) {
+        return createMono(() -> commandBuilder.getset(key, value));
+    }
+
+    @Override
+    public Mono<Long> hdel(K key, K... fields) {
+        return createMono(() -> commandBuilder.hdel(key, fields));
+    }
+
+    @Override
+    public Mono<Boolean> hexists(K key, K field) {
+        return createMono(() -> commandBuilder.hexists(key, field));
+    }
+
+    @Override
+    public Mono<V> hget(K key, K field) {
+        return createMono(() -> commandBuilder.hget(key, field));
     }
 
     @Override
@@ -439,6 +679,16 @@ public Mono<Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key) {
         return createMono(() -> commandBuilder.hgetall(channel, key));
     }
 
+    @Override
+    public Mono<Long> hincrby(K key, K field, long amount) {
+        return createMono(() -> commandBuilder.hincrby(key, field, amount));
+    }
+
+    @Override
+    public Mono<Double> hincrbyfloat(K key, K field, double amount) {
+        return createMono(() -> commandBuilder.hincrbyfloat(key, field, amount));
+    }
+
     @Override
     public Flux<K> hkeys(K key) {
         return createDissolvingFlux(() -> commandBuilder.hkeys(key));
@@ -454,11 +704,6 @@ public Mono<Long> hlen(K key) {
         return createMono(() -> commandBuilder.hlen(key));
     }
 
-    @Override
-    public Mono<Long> hstrlen(K key, K field) {
-        return createMono(() -> commandBuilder.hstrlen(key, field));
-    }
-
     @Override
     public Flux<KeyValue<K, V>> hmget(K key, K... fields) {
         return createDissolvingFlux(() -> commandBuilder.hmgetKeyValue(key, fields));
@@ -474,6 +719,46 @@ public Mono<String> hmset(K key, Map<K, V> map) {
         return createMono(() -> commandBuilder.hmset(key, map));
     }
 
+    @Override
+    public Mono<MapScanCursor<K, V>> hscan(K key) {
+        return createMono(() -> commandBuilder.hscan(key));
+    }
+
+    @Override
+    public Mono<MapScanCursor<K, V>> hscan(K key, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.hscan(key, scanArgs));
+    }
+
+    @Override
+    public Mono<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.hscan(key, scanCursor, scanArgs));
+    }
+
+    @Override
+    public Mono<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor) {
+        return createMono(() -> commandBuilder.hscan(key, scanCursor));
+    }
+
+    @Override
+    public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key) {
+        return createMono(() -> commandBuilder.hscanStreaming(channel, key));
+    }
+
+    @Override
+    public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.hscanStreaming(channel, key, scanArgs));
+    }
+
+    @Override
+    public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.hscanStreaming(channel, key, scanCursor, scanArgs));
+    }
+
+    @Override
+    public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor) {
+        return createMono(() -> commandBuilder.hscanStreaming(channel, key, scanCursor));
+    }
+
     @Override
     public Mono<Boolean> hset(K key, K field, V value) {
         return createMono(() -> commandBuilder.hset(key, field, value));
@@ -484,6 +769,11 @@ public Mono<Boolean> hsetnx(K key, K field, V value) {
         return createMono(() -> commandBuilder.hsetnx(key, field, value));
     }
 
+    @Override
+    public Mono<Long> hstrlen(K key, K field) {
+        return createMono(() -> commandBuilder.hstrlen(key, field));
+    }
+
     @Override
     public Flux<V> hvals(K key) {
         return createDissolvingFlux(() -> commandBuilder.hvals(key));
@@ -519,6 +809,11 @@ public Mono<String> info(String section) {
         return createMono(() -> commandBuilder.info(section));
     }
 
+    @Override
+    public boolean isOpen() {
+        return connection.isOpen();
+    }
+
     @Override
     public Flux<K> keys(K pattern) {
         return createDissolvingFlux(() -> commandBuilder.keys(pattern));
@@ -589,16 +884,6 @@ public Mono<String> ltrim(K key, long start, long stop) {
         return createMono(() -> commandBuilder.ltrim(key, start, stop));
     }
 
-    @Override
-    public Mono<String> migrate(String host, int port, K key, int db, long timeout) {
-        return createMono(() -> commandBuilder.migrate(host, port, key, db, timeout));
-    }
-
-    @Override
-    public Mono<String> migrate(String host, int port, int db, long timeout, MigrateArgs<K> migrateArgs) {
-        return createMono(() -> commandBuilder.migrate(host, port, db, timeout, migrateArgs));
-    }
-
     @Override
     public Flux<KeyValue<K, V>> mget(K... keys) {
         return createDissolvingFlux(() -> commandBuilder.mgetKeyValue(keys));
@@ -622,13 +907,18 @@ public Mono<Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K> keys)
     }
 
     @Override
-    public Mono<Boolean> move(K key, int db) {
-        return createMono(() -> commandBuilder.move(key, db));
+    public Mono<String> migrate(String host, int port, K key, int db, long timeout) {
+        return createMono(() -> commandBuilder.migrate(host, port, key, db, timeout));
     }
 
     @Override
-    public Mono<String> multi() {
-        return createMono(commandBuilder::multi);
+    public Mono<String> migrate(String host, int port, int db, long timeout, MigrateArgs<K> migrateArgs) {
+        return createMono(() -> commandBuilder.migrate(host, port, db, timeout, migrateArgs));
+    }
+
+    @Override
+    public Mono<Boolean> move(K key, int db) {
+        return createMono(() -> commandBuilder.move(key, db));
     }
 
     @Override
@@ -641,6 +931,11 @@ public Mono<Boolean> msetnx(Map<K, V> map) {
         return createMono(() -> commandBuilder.msetnx(map));
     }
 
+    @Override
+    public Mono<String> multi() {
+        return createMono(commandBuilder::multi);
+    }
+
     @Override
     public Mono<String> objectEncoding(K key) {
         return createMono(() -> commandBuilder.objectEncoding(key));
@@ -677,18 +972,40 @@ public Mono<Boolean> pexpireat(K key, long timestamp) {
     }
 
     @Override
-    public Mono<String> ping() {
-        return createMono(commandBuilder::ping);
+    public Mono<Long> pfadd(K key, V... values) {
+        return createMono(() -> commandBuilder.pfadd(key, values));
+    }
+
+    public Mono<Long> pfadd(K key, V value, V... values) {
+        return createMono(() -> commandBuilder.pfadd(key, value, values));
     }
 
     @Override
-    public Mono<String> readOnly() {
-        return createMono(commandBuilder::readOnly);
+    public Mono<Long> pfcount(K... keys) {
+        return createMono(() -> commandBuilder.pfcount(keys));
+    }
+
+    public Mono<Long> pfcount(K key, K... keys) {
+        return createMono(() -> commandBuilder.pfcount(key, keys));
     }
 
     @Override
-    public Mono<String> readWrite() {
-        return createMono(commandBuilder::readWrite);
+    public Mono<String> pfmerge(K destkey, K... sourcekeys) {
+        return createMono(() -> commandBuilder.pfmerge(destkey, sourcekeys));
+    }
+
+    public Mono<String> pfmerge(K destkey, K sourceKey, K... sourcekeys) {
+        return createMono(() -> commandBuilder.pfmerge(destkey, sourceKey, sourcekeys));
+    }
+
+    @Override
+    public Mono<String> ping() {
+        return createMono(commandBuilder::ping);
+    }
+
+    @Override
+    public Mono<String> psetex(K key, long milliseconds, V value) {
+        return createMono(() -> commandBuilder.psetex(key, milliseconds, value));
     }
 
     @Override
@@ -712,13 +1029,13 @@ public Flux<K> pubsubChannels(K channel) {
     }
 
     @Override
-    public Mono<Map<K, Long>> pubsubNumsub(K... channels) {
-        return createMono(() -> commandBuilder.pubsubNumsub(channels));
+    public Mono<Long> pubsubNumpat() {
+        return createMono(commandBuilder::pubsubNumpat);
     }
 
     @Override
-    public Mono<Long> pubsubNumpat() {
-        return createMono(commandBuilder::pubsubNumpat);
+    public Mono<Map<K, Long>> pubsubNumsub(K... channels) {
+        return createMono(() -> commandBuilder.pubsubNumsub(channels));
     }
 
     @Override
@@ -727,13 +1044,18 @@ public Mono<String> quit() {
     }
 
     @Override
-    public Flux<Object> role() {
-        return createDissolvingFlux(commandBuilder::role);
+    public Mono<V> randomkey() {
+        return createMono(commandBuilder::randomkey);
     }
 
     @Override
-    public Mono<V> randomkey() {
-        return createMono(commandBuilder::randomkey);
+    public Mono<String> readOnly() {
+        return createMono(commandBuilder::readOnly);
+    }
+
+    @Override
+    public Mono<String> readWrite() {
+        return createMono(commandBuilder::readWrite);
     }
 
     @Override
@@ -746,11 +1068,21 @@ public Mono<Boolean> renamenx(K key, K newKey) {
         return createMono(() -> commandBuilder.renamenx(key, newKey));
     }
 
+    @Override
+    public void reset() {
+        getConnection().reset();
+    }
+
     @Override
     public Mono<String> restore(K key, long ttl, byte[] value) {
         return createMono(() -> commandBuilder.restore(key, ttl, value));
     }
 
+    @Override
+    public Flux<Object> role() {
+        return createDissolvingFlux(commandBuilder::role);
+    }
+
     @Override
     public Mono<V> rpop(K key) {
         return createMono(() -> commandBuilder.rpop(key));
@@ -782,13 +1114,53 @@ public Mono<String> save() {
     }
 
     @Override
-    public Mono<Long> scard(K key) {
-        return createMono(() -> commandBuilder.scard(key));
+    public Mono<KeyScanCursor<K>> scan() {
+        return createMono(commandBuilder::scan);
     }
 
     @Override
-    public Flux<Boolean> scriptExists(String... digests) {
-        return createDissolvingFlux(() -> commandBuilder.scriptExists(digests));
+    public Mono<KeyScanCursor<K>> scan(ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.scan(scanArgs));
+    }
+
+    @Override
+    public Mono<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.scan(scanCursor, scanArgs));
+    }
+
+    @Override
+    public Mono<KeyScanCursor<K>> scan(ScanCursor scanCursor) {
+        return createMono(() -> commandBuilder.scan(scanCursor));
+    }
+
+    @Override
+    public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel) {
+        return createMono(() -> commandBuilder.scanStreaming(channel));
+    }
+
+    @Override
+    public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.scanStreaming(channel, scanArgs));
+    }
+
+    @Override
+    public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.scanStreaming(channel, scanCursor, scanArgs));
+    }
+
+    @Override
+    public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor) {
+        return createMono(() -> commandBuilder.scanStreaming(channel, scanCursor));
+    }
+
+    @Override
+    public Mono<Long> scard(K key) {
+        return createMono(() -> commandBuilder.scard(key));
+    }
+
+    @Override
+    public Flux<Boolean> scriptExists(String... digests) {
+        return createDissolvingFlux(() -> commandBuilder.scriptExists(digests));
     }
 
     @Override
@@ -825,10 +1197,6 @@ public Mono<String> select(int db) {
         return createMono(() -> commandBuilder.select(db));
     }
 
-    public Mono<String> swapdb(int db1, int db2) {
-        return createMono(() -> commandBuilder.swapdb(db1, db2));
-    }
-
     @Override
     public Mono<String> set(K key, V value) {
         return createMono(() -> commandBuilder.set(key, value));
@@ -839,6 +1207,19 @@ public Mono<String> set(K key, V value, SetArgs setArgs) {
         return createMono(() -> commandBuilder.set(key, value, setArgs));
     }
 
+    @Override
+    public void setAutoFlushCommands(boolean autoFlush) {
+        connection.setAutoFlushCommands(autoFlush);
+    }
+
+    public void setTimeout(Duration timeout) {
+        connection.setTimeout(timeout);
+    }
+
+    public void setTimeout(long timeout, TimeUnit unit) {
+        connection.setTimeout(timeout, unit);
+    }
+
     @Override
     public Mono<Long> setbit(K key, long offset, int value) {
         return createMono(() -> commandBuilder.setbit(key, offset, value));
@@ -849,11 +1230,6 @@ public Mono<String> setex(K key, long seconds, V value) {
         return createMono(() -> commandBuilder.setex(key, seconds, value));
     }
 
-    @Override
-    public Mono<String> psetex(K key, long milliseconds, V value) {
-        return createMono(() -> commandBuilder.psetex(key, milliseconds, value));
-    }
-
     @Override
     public Mono<Boolean> setnx(K key, V value) {
         return createMono(() -> commandBuilder.setnx(key, value));
@@ -889,11 +1265,6 @@ public Mono<Boolean> sismember(K key, V member) {
         return createMono(() -> commandBuilder.sismember(key, member));
     }
 
-    @Override
-    public Mono<Boolean> smove(K source, K destination, V member) {
-        return createMono(() -> commandBuilder.smove(source, destination, member));
-    }
-
     @Override
     public Mono<String> slaveof(String host, int port) {
         return createMono(() -> commandBuilder.slaveof(host, port));
@@ -934,6 +1305,11 @@ public Mono<Long> smembers(ValueStreamingChannel<V> channel, K key) {
         return createMono(() -> commandBuilder.smembers(channel, key));
     }
 
+    @Override
+    public Mono<Boolean> smove(K source, K destination, V member) {
+        return createMono(() -> commandBuilder.smove(source, destination, member));
+    }
+
     @Override
     public Flux<V> sort(K key) {
         return createDissolvingFlux(() -> commandBuilder.sort(key));
@@ -989,6 +1365,51 @@ public Mono<Long> srem(K key, V... members) {
         return createMono(() -> commandBuilder.srem(key, members));
     }
 
+    @Override
+    public Mono<ValueScanCursor<V>> sscan(K key) {
+        return createMono(() -> commandBuilder.sscan(key));
+    }
+
+    @Override
+    public Mono<ValueScanCursor<V>> sscan(K key, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.sscan(key, scanArgs));
+    }
+
+    @Override
+    public Mono<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.sscan(key, scanCursor, scanArgs));
+    }
+
+    @Override
+    public Mono<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor) {
+        return createMono(() -> commandBuilder.sscan(key, scanCursor));
+    }
+
+    @Override
+    public Mono<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key) {
+        return createMono(() -> commandBuilder.sscanStreaming(channel, key));
+    }
+
+    @Override
+    public Mono<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.sscanStreaming(channel, key, scanArgs));
+    }
+
+    @Override
+    public Mono<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+        return createMono(() -> commandBuilder.sscanStreaming(channel, key, scanCursor, scanArgs));
+    }
+
+    @Override
+    public Mono<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
+        return createMono(() -> commandBuilder.sscanStreaming(channel, key, scanCursor));
+    }
+
+    @Override
+    public Mono<Long> strlen(K key) {
+        return createMono(() -> commandBuilder.strlen(key));
+    }
+
     @Override
     public Flux<V> sunion(K... keys) {
         return createDissolvingFlux(() -> commandBuilder.sunion(keys));
@@ -1004,9 +1425,13 @@ public Mono<Long> sunionstore(K destination, K... keys) {
         return createMono(() -> commandBuilder.sunionstore(destination, keys));
     }
 
+    public Mono<String> swapdb(int db1, int db2) {
+        return createMono(() -> commandBuilder.swapdb(db1, db2));
+    }
+
     @Override
-    public Mono<Long> strlen(K key) {
-        return createMono(() -> commandBuilder.strlen(key));
+    public Flux<V> time() {
+        return createDissolvingFlux(commandBuilder::time);
     }
 
     @Override
@@ -1029,8 +1454,12 @@ public Mono<String> type(K key) {
     }
 
     @Override
-    public Mono<String> watch(K... keys) {
-        return createMono(() -> commandBuilder.watch(keys));
+    public Mono<Long> unlink(K... keys) {
+        return createMono(() -> commandBuilder.unlink(keys));
+    }
+
+    public Mono<Long> unlink(Iterable<K> keys) {
+        return createMono(() -> commandBuilder.unlink(keys));
     }
 
     @Override
@@ -1038,6 +1467,16 @@ public Mono<String> unwatch() {
         return createMono(commandBuilder::unwatch);
     }
 
+    @Override
+    public Mono<Long> waitForReplication(int replicas, long timeout) {
+        return createMono(() -> commandBuilder.wait(replicas, timeout));
+    }
+
+    @Override
+    public Mono<String> watch(K... keys) {
+        return createMono(() -> commandBuilder.watch(keys));
+    }
+
     @Override
     public Mono<Long> zadd(K key, double score, V member) {
         return createMono(() -> commandBuilder.zadd(key, null, score, member));
@@ -1092,6 +1531,11 @@ public Mono<Long> zcount(K key, String min, String max) {
         return createMono(() -> commandBuilder.zcount(key, min, max));
     }
 
+    @Override
+    public Mono<Long> zcount(K key, Range<? extends Number> range) {
+        return createMono(() -> commandBuilder.zcount(key, range));
+    }
+
     @Override
     public Mono<Double> zincrby(K key, double amount, K member) {
         return createMono(() -> commandBuilder.zincrby(key, amount, member));
@@ -1102,94 +1546,89 @@ public Mono<Long> zinterstore(K destination, K... keys) {
         return createMono(() -> commandBuilder.zinterstore(destination, keys));
     }
 
-    @Override
-    public Mono<Long> zcount(K key, Range<? extends Number> range) {
-        return createMono(() -> commandBuilder.zcount(key, range));
-    }
-
     @Override
     public Mono<Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys) {
         return createMono(() -> commandBuilder.zinterstore(destination, storeArgs, keys));
     }
 
     @Override
-    public Flux<V> zrange(K key, long start, long stop) {
-        return createDissolvingFlux(() -> commandBuilder.zrange(key, start, stop));
+    public Mono<Long> zlexcount(K key, String min, String max) {
+        return createMono(() -> commandBuilder.zlexcount(key, min, max));
     }
 
     @Override
-    public Flux<ScoredValue<V>> zrangeWithScores(K key, long start, long stop) {
-        return createDissolvingFlux(() -> commandBuilder.zrangeWithScores(key, start, stop));
+    public Mono<Long> zlexcount(K key, Range<? extends V> range) {
+        return createMono(() -> commandBuilder.zlexcount(key, range));
     }
 
     @Override
-    public Flux<V> zrangebyscore(K key, double min, double max) {
-        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, min, max));
+    public Flux<V> zrange(K key, long start, long stop) {
+        return createDissolvingFlux(() -> commandBuilder.zrange(key, start, stop));
     }
 
     @Override
-    public Flux<V> zrangebyscore(K key, String min, String max) {
-        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, min, max));
+    public Mono<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return createMono(() -> commandBuilder.zrange(channel, key, start, stop));
     }
 
     @Override
-    public Flux<V> zrangebyscore(K key, double min, double max, long offset, long count) {
-        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, min, max, offset, count));
+    public Flux<ScoredValue<V>> zrangeWithScores(K key, long start, long stop) {
+        return createDissolvingFlux(() -> commandBuilder.zrangeWithScores(key, start, stop));
     }
 
     @Override
-    public Flux<V> zrangebyscore(K key, String min, String max, long offset, long count) {
-        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, min, max, offset, count));
+    public Mono<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return createMono(() -> commandBuilder.zrangeWithScores(channel, key, start, stop));
     }
 
     @Override
-    public Flux<V> zrangebyscore(K key, Range<? extends Number> range) {
-        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, range, Limit.unlimited()));
+    public Flux<V> zrangebylex(K key, String min, String max) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebylex(key, min, max));
     }
 
     @Override
-    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max) {
-        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, min, max));
+    public Flux<V> zrangebylex(K key, Range<? extends V> range) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebylex(key, range, Limit.unlimited()));
     }
 
     @Override
-    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max) {
-        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, min, max));
+    public Flux<V> zrangebylex(K key, String min, String max, long offset, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebylex(key, min, max, offset, count));
     }
 
     @Override
-    public Flux<V> zrangebyscore(K key, Range<? extends Number> range, Limit limit) {
-        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, range, limit));
+    public Flux<V> zrangebylex(K key, Range<? extends V> range, Limit limit) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebylex(key, range, limit));
     }
 
     @Override
-    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count) {
-        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, min, max, offset, count));
+    public Flux<V> zrangebyscore(K key, double min, double max) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, min, max));
     }
 
     @Override
-    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count) {
-        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, min, max, offset, count));
+    public Flux<V> zrangebyscore(K key, String min, String max) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, min, max));
     }
 
     @Override
-    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range) {
-        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, range, Limit.unlimited()));
+    public Flux<V> zrangebyscore(K key, double min, double max, long offset, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, min, max, offset, count));
     }
 
     @Override
-    public Mono<Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return createMono(() -> commandBuilder.zrange(channel, key, start, stop));
+    public Flux<V> zrangebyscore(K key, String min, String max, long offset, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, min, max, offset, count));
     }
 
     @Override
-    public Mono<Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return createMono(() -> commandBuilder.zrangeWithScores(channel, key, start, stop));
+    public Flux<V> zrangebyscore(K key, Range<? extends Number> range) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, range, Limit.unlimited()));
     }
 
     @Override
-    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
-        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, range, limit));
+    public Flux<V> zrangebyscore(K key, Range<? extends Number> range, Limit limit) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscore(key, range, limit));
     }
 
     @Override
@@ -1222,6 +1661,36 @@ public Mono<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<?
         return createMono(() -> commandBuilder.zrangebyscore(channel, key, range, limit));
     }
 
+    @Override
+    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, min, max));
+    }
+
+    @Override
+    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, min, max));
+    }
+
+    @Override
+    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, min, max, offset, count));
+    }
+
+    @Override
+    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, min, max, offset, count));
+    }
+
+    @Override
+    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, range, Limit.unlimited()));
+    }
+
+    @Override
+    public Flux<ScoredValue<V>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
+        return createDissolvingFlux(() -> commandBuilder.zrangebyscoreWithScores(key, range, limit));
+    }
+
     @Override
     public Mono<Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max) {
         return createMono(() -> commandBuilder.zrangebyscoreWithScores(channel, key, min, max));
@@ -1266,17 +1735,27 @@ public Mono<Long> zrem(K key, V... members) {
     }
 
     @Override
-    public Mono<Long> zremrangebyrank(K key, long start, long stop) {
-        return createMono(() -> commandBuilder.zremrangebyrank(key, start, stop));
+    public Mono<Long> zremrangebylex(K key, String min, String max) {
+        return createMono(() -> commandBuilder.zremrangebylex(key, min, max));
     }
 
     @Override
-    public Mono<Long> zremrangebyscore(K key, double min, double max) {
-        return createMono(() -> commandBuilder.zremrangebyscore(key, min, max));
+    public Mono<Long> zremrangebylex(K key, Range<? extends V> range) {
+        return createMono(() -> commandBuilder.zremrangebylex(key, range));
     }
 
     @Override
-    public Mono<Long> zremrangebyscore(K key, String min, String max) {
+    public Mono<Long> zremrangebyrank(K key, long start, long stop) {
+        return createMono(() -> commandBuilder.zremrangebyrank(key, start, stop));
+    }
+
+    @Override
+    public Mono<Long> zremrangebyscore(K key, double min, double max) {
+        return createMono(() -> commandBuilder.zremrangebyscore(key, min, max));
+    }
+
+    @Override
+    public Mono<Long> zremrangebyscore(K key, String min, String max) {
         return createMono(() -> commandBuilder.zremrangebyscore(key, min, max));
     }
 
@@ -1290,11 +1769,21 @@ public Flux<V> zrevrange(K key, long start, long stop) {
         return createDissolvingFlux(() -> commandBuilder.zrevrange(key, start, stop));
     }
 
+    @Override
+    public Mono<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return createMono(() -> commandBuilder.zrevrange(channel, key, start, stop));
+    }
+
     @Override
     public Flux<ScoredValue<V>> zrevrangeWithScores(K key, long start, long stop) {
         return createDissolvingFlux(() -> commandBuilder.zrevrangeWithScores(key, start, stop));
     }
 
+    @Override
+    public Mono<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
+        return createMono(() -> commandBuilder.zrevrangeWithScores(channel, key, start, stop));
+    }
+
     @Override
     public Flux<V> zrevrangebylex(K key, Range<? extends V> range) {
         return createDissolvingFlux(() -> commandBuilder.zrevrangebylex(key, range, Limit.unlimited()));
@@ -1336,73 +1825,63 @@ public Flux<V> zrevrangebyscore(K key, Range<? extends Number> range, Limit limi
     }
 
     @Override
-    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min) {
-        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min));
-    }
-
-    @Override
-    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min) {
-        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min));
-    }
-
-    @Override
-    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range) {
-        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, range, Limit.unlimited()));
+    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min) {
+        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min));
     }
 
     @Override
-    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count) {
-        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
+    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min) {
+        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min));
     }
 
     @Override
-    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count) {
-        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
+    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range) {
+        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, range, Limit.unlimited()));
     }
 
     @Override
-    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
-        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, range, limit));
+    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count) {
+        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
     }
 
     @Override
-    public Mono<Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return createMono(() -> commandBuilder.zrevrange(channel, key, start, stop));
+    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count) {
+        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
     }
 
     @Override
-    public Mono<Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
-        return createMono(() -> commandBuilder.zrevrangeWithScores(channel, key, start, stop));
+    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
+        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, range, limit));
     }
 
     @Override
-    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min) {
-        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min));
+    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min));
     }
 
     @Override
-    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min) {
-        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min));
+    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min));
     }
 
     @Override
-    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range) {
-        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, range, Limit.unlimited()));
+    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, range, Limit.unlimited()));
     }
 
     @Override
-    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count) {
-        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
+    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
     }
 
     @Override
-    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count) {
-        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
+    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
     }
 
     @Override
-    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
-        return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, range, limit));
+    public Flux<ScoredValue<V>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
+        return createDissolvingFlux(() -> commandBuilder.zrevrangebyscoreWithScores(key, range, limit));
     }
 
     @Override
@@ -1443,141 +1922,6 @@ public Mono<Long> zrevrank(K key, V member) {
         return createMono(() -> commandBuilder.zrevrank(key, member));
     }
 
-    @Override
-    public Mono<Double> zscore(K key, V member) {
-        return createMono(() -> commandBuilder.zscore(key, member));
-    }
-
-    @Override
-    public Mono<Long> zunionstore(K destination, K... keys) {
-        return createMono(() -> commandBuilder.zunionstore(destination, keys));
-    }
-
-    @Override
-    public Mono<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
-        return createMono(() -> commandBuilder.zunionstore(destination, storeArgs, keys));
-    }
-
-    @Override
-    public Mono<KeyScanCursor<K>> scan() {
-        return createMono(commandBuilder::scan);
-    }
-
-    @Override
-    public Mono<KeyScanCursor<K>> scan(ScanArgs scanArgs) {
-        return createMono(() -> commandBuilder.scan(scanArgs));
-    }
-
-    @Override
-    public Mono<KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createMono(() -> commandBuilder.scan(scanCursor, scanArgs));
-    }
-
-    @Override
-    public Mono<KeyScanCursor<K>> scan(ScanCursor scanCursor) {
-        return createMono(() -> commandBuilder.scan(scanCursor));
-    }
-
-    @Override
-    public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel) {
-        return createMono(() -> commandBuilder.scanStreaming(channel));
-    }
-
-    @Override
-    public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanArgs scanArgs) {
-        return createMono(() -> commandBuilder.scanStreaming(channel, scanArgs));
-    }
-
-    @Override
-    public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createMono(() -> commandBuilder.scanStreaming(channel, scanCursor, scanArgs));
-    }
-
-    @Override
-    public Mono<StreamScanCursor> scan(KeyStreamingChannel<K> channel, ScanCursor scanCursor) {
-        return createMono(() -> commandBuilder.scanStreaming(channel, scanCursor));
-    }
-
-    @Override
-    public Mono<ValueScanCursor<V>> sscan(K key) {
-        return createMono(() -> commandBuilder.sscan(key));
-    }
-
-    @Override
-    public Mono<ValueScanCursor<V>> sscan(K key, ScanArgs scanArgs) {
-        return createMono(() -> commandBuilder.sscan(key, scanArgs));
-    }
-
-    @Override
-    public Mono<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createMono(() -> commandBuilder.sscan(key, scanCursor, scanArgs));
-    }
-
-    @Override
-    public Mono<ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor) {
-        return createMono(() -> commandBuilder.sscan(key, scanCursor));
-    }
-
-    @Override
-    public Mono<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key) {
-        return createMono(() -> commandBuilder.sscanStreaming(channel, key));
-    }
-
-    @Override
-    public Mono<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanArgs scanArgs) {
-        return createMono(() -> commandBuilder.sscanStreaming(channel, key, scanArgs));
-    }
-
-    @Override
-    public Mono<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createMono(() -> commandBuilder.sscanStreaming(channel, key, scanCursor, scanArgs));
-    }
-
-    @Override
-    public Mono<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
-        return createMono(() -> commandBuilder.sscanStreaming(channel, key, scanCursor));
-    }
-
-    @Override
-    public Mono<MapScanCursor<K, V>> hscan(K key) {
-        return createMono(() -> commandBuilder.hscan(key));
-    }
-
-    @Override
-    public Mono<MapScanCursor<K, V>> hscan(K key, ScanArgs scanArgs) {
-        return createMono(() -> commandBuilder.hscan(key, scanArgs));
-    }
-
-    @Override
-    public Mono<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createMono(() -> commandBuilder.hscan(key, scanCursor, scanArgs));
-    }
-
-    @Override
-    public Mono<MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor) {
-        return createMono(() -> commandBuilder.hscan(key, scanCursor));
-    }
-
-    @Override
-    public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key) {
-        return createMono(() -> commandBuilder.hscanStreaming(channel, key));
-    }
-
-    @Override
-    public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanArgs scanArgs) {
-        return createMono(() -> commandBuilder.hscanStreaming(channel, key, scanArgs));
-    }
-
-    @Override
-    public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        return createMono(() -> commandBuilder.hscanStreaming(channel, key, scanCursor, scanArgs));
-    }
-
-    @Override
-    public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor) {
-        return createMono(() -> commandBuilder.hscanStreaming(channel, key, scanCursor));
-    }
-
     @Override
     public Mono<ScoredValueScanCursor<V>> zscan(K key) {
         return createMono(() -> commandBuilder.zscan(key));
@@ -1619,361 +1963,17 @@ public Mono<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K ke
     }
 
     @Override
-    public String digest(V script) {
-        return LettuceStrings.digest(codec.encodeValue(script));
-    }
-
-    @Override
-    public Flux<V> time() {
-        return createDissolvingFlux(commandBuilder::time);
-    }
-
-    @Override
-    public Mono<Long> waitForReplication(int replicas, long timeout) {
-        return createMono(() -> commandBuilder.wait(replicas, timeout));
-    }
-
-    @Override
-    public Mono<Long> pfadd(K key, V... values) {
-        return createMono(() -> commandBuilder.pfadd(key, values));
-    }
-
-    public Mono<Long> pfadd(K key, V value, V... values) {
-        return createMono(() -> commandBuilder.pfadd(key, value, values));
-    }
-
-    @Override
-    public Mono<String> pfmerge(K destkey, K... sourcekeys) {
-        return createMono(() -> commandBuilder.pfmerge(destkey, sourcekeys));
-    }
-
-    public Mono<String> pfmerge(K destkey, K sourceKey, K... sourcekeys) {
-        return createMono(() -> commandBuilder.pfmerge(destkey, sourceKey, sourcekeys));
+    public Mono<Double> zscore(K key, V member) {
+        return createMono(() -> commandBuilder.zscore(key, member));
     }
 
     @Override
-    public Mono<Long> pfcount(K... keys) {
-        return createMono(() -> commandBuilder.pfcount(keys));
-    }
-
-    public Mono<Long> pfcount(K key, K... keys) {
-        return createMono(() -> commandBuilder.pfcount(key, keys));
+    public Mono<Long> zunionstore(K destination, K... keys) {
+        return createMono(() -> commandBuilder.zunionstore(destination, keys));
     }
 
     @Override
-    public Mono<String> clusterBumpepoch() {
-        return createMono(() -> commandBuilder.clusterBumpepoch());
-    }
-
-    @Override
-    public Mono<String> clusterMeet(String ip, int port) {
-        return createMono(() -> commandBuilder.clusterMeet(ip, port));
-    }
-
-    @Override
-    public Mono<String> clusterForget(String nodeId) {
-        return createMono(() -> commandBuilder.clusterForget(nodeId));
-    }
-
-    @Override
-    public Mono<String> clusterAddSlots(int... slots) {
-        return createMono(() -> commandBuilder.clusterAddslots(slots));
-    }
-
-    @Override
-    public Mono<String> clusterDelSlots(int... slots) {
-        return createMono(() -> commandBuilder.clusterDelslots(slots));
-    }
-
-    @Override
-    public Mono<String> clusterInfo() {
-        return createMono(commandBuilder::clusterInfo);
-    }
-
-    @Override
-    public Mono<String> clusterMyId() {
-        return createMono(commandBuilder::clusterMyId);
-    }
-
-    @Override
-    public Mono<String> clusterNodes() {
-        return createMono(commandBuilder::clusterNodes);
-    }
-
-    @Override
-    public Flux<K> clusterGetKeysInSlot(int slot, int count) {
-        return createDissolvingFlux(() -> commandBuilder.clusterGetKeysInSlot(slot, count));
-    }
-
-    @Override
-    public Mono<Long> clusterCountKeysInSlot(int slot) {
-        return createMono(() -> commandBuilder.clusterCountKeysInSlot(slot));
-    }
-
-    @Override
-    public Mono<Long> clusterCountFailureReports(String nodeId) {
-        return createMono(() -> commandBuilder.clusterCountFailureReports(nodeId));
-    }
-
-    @Override
-    public Mono<Long> clusterKeyslot(K key) {
-        return createMono(() -> commandBuilder.clusterKeyslot(key));
-    }
-
-    @Override
-    public Mono<String> clusterSaveconfig() {
-        return createMono(() -> commandBuilder.clusterSaveconfig());
-    }
-
-    @Override
-    public Mono<String> clusterSetConfigEpoch(long configEpoch) {
-        return createMono(() -> commandBuilder.clusterSetConfigEpoch(configEpoch));
-    }
-
-    @Override
-    public Flux<Object> clusterSlots() {
-        return createDissolvingFlux(commandBuilder::clusterSlots);
-    }
-
-    @Override
-    public Mono<String> clusterSetSlotNode(int slot, String nodeId) {
-        return createMono(() -> commandBuilder.clusterSetSlotNode(slot, nodeId));
-    }
-
-    @Override
-    public Mono<String> clusterSetSlotStable(int slot) {
-        return createMono(() -> commandBuilder.clusterSetSlotStable(slot));
-    }
-
-    @Override
-    public Mono<String> clusterSetSlotMigrating(int slot, String nodeId) {
-        return createMono(() -> commandBuilder.clusterSetSlotMigrating(slot, nodeId));
-    }
-
-    @Override
-    public Mono<String> clusterSetSlotImporting(int slot, String nodeId) {
-        return createMono(() -> commandBuilder.clusterSetSlotImporting(slot, nodeId));
-    }
-
-    @Override
-    public Mono<String> clusterFailover(boolean force) {
-        return createMono(() -> commandBuilder.clusterFailover(force));
-    }
-
-    @Override
-    public Mono<String> clusterReset(boolean hard) {
-        return createMono(() -> commandBuilder.clusterReset(hard));
-    }
-
-    @Override
-    public Mono<String> asking() {
-        return createMono(commandBuilder::asking);
-    }
-
-    @Override
-    public Mono<String> clusterReplicate(String nodeId) {
-        return createMono(() -> commandBuilder.clusterReplicate(nodeId));
-    }
-
-    @Override
-    public Mono<String> clusterFlushslots() {
-        return createMono(commandBuilder::clusterFlushslots);
-    }
-
-    @Override
-    public Flux<String> clusterSlaves(String nodeId) {
-        return createDissolvingFlux(() -> commandBuilder.clusterSlaves(nodeId));
-    }
-
-    @Override
-    public Mono<Long> zlexcount(K key, String min, String max) {
-        return createMono(() -> commandBuilder.zlexcount(key, min, max));
-    }
-
-    @Override
-    public Mono<Long> zlexcount(K key, Range<? extends V> range) {
-        return createMono(() -> commandBuilder.zlexcount(key, range));
-    }
-
-    @Override
-    public Mono<Long> zremrangebylex(K key, String min, String max) {
-        return createMono(() -> commandBuilder.zremrangebylex(key, min, max));
-    }
-
-    @Override
-    public Mono<Long> zremrangebylex(K key, Range<? extends V> range) {
-        return createMono(() -> commandBuilder.zremrangebylex(key, range));
-    }
-
-    @Override
-    public Flux<V> zrangebylex(K key, String min, String max) {
-        return createDissolvingFlux(() -> commandBuilder.zrangebylex(key, min, max));
-    }
-
-    @Override
-    public Flux<V> zrangebylex(K key, Range<? extends V> range) {
-        return createDissolvingFlux(() -> commandBuilder.zrangebylex(key, range, Limit.unlimited()));
-    }
-
-    @Override
-    public Flux<V> zrangebylex(K key, String min, String max, long offset, long count) {
-        return createDissolvingFlux(() -> commandBuilder.zrangebylex(key, min, max, offset, count));
-    }
-
-    @Override
-    public Flux<V> zrangebylex(K key, Range<? extends V> range, Limit limit) {
-        return createDissolvingFlux(() -> commandBuilder.zrangebylex(key, range, limit));
-    }
-
-    @Override
-    public Mono<Long> geoadd(K key, double longitude, double latitude, V member) {
-        return createMono(() -> commandBuilder.geoadd(key, longitude, latitude, member));
-    }
-
-    @Override
-    public Mono<Long> geoadd(K key, Object... lngLatMember) {
-        return createMono(() -> commandBuilder.geoadd(key, lngLatMember));
-    }
-
-    @Override
-    public Flux<Value<String>> geohash(K key, V... members) {
-        return createDissolvingFlux(() -> commandBuilder.geohash(key, members));
-    }
-
-    @Override
-    public Flux<V> georadius(K key, double longitude, double latitude, double distance, Unit unit) {
-        return createDissolvingFlux(() -> commandBuilder.georadius(GEORADIUS, key, longitude, latitude, distance, unit.name()));
-    }
-
-    protected Flux<V> georadius_ro(K key, double longitude, double latitude, double distance, Unit unit) {
-        return createDissolvingFlux(() -> commandBuilder.georadius(GEORADIUS_RO, key, longitude, latitude, distance,
-                unit.name()));
-    }
-
-    @Override
-    public Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, Unit unit, GeoArgs geoArgs) {
-        return createDissolvingFlux(() -> commandBuilder.georadius(GEORADIUS, key, longitude, latitude, distance, unit.name(),
-                geoArgs));
-    }
-
-    protected Flux<GeoWithin<V>> georadius_ro(K key, double longitude, double latitude, double distance, Unit unit,
-            GeoArgs geoArgs) {
-        return createDissolvingFlux(() -> commandBuilder.georadius(GEORADIUS_RO, key, longitude, latitude, distance,
-                unit.name(), geoArgs));
-    }
-
-    @Override
-    public Mono<Long> georadius(K key, double longitude, double latitude, double distance, Unit unit,
-            GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
-        return createMono(() -> commandBuilder.georadius(key, longitude, latitude, distance, unit.name(), geoRadiusStoreArgs));
-    }
-
-    @Override
-    public Flux<V> georadiusbymember(K key, V member, double distance, Unit unit) {
-        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER, key, member, distance,
-                unit.name()));
-    }
-
-    protected Flux<V> georadiusbymember_ro(K key, V member, double distance, Unit unit) {
-        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER_RO, key, member, distance,
-                unit.name()));
-    }
-
-    @Override
-    public Flux<GeoWithin<V>> georadiusbymember(K key, V member, double distance, Unit unit, GeoArgs geoArgs) {
-        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER, key, member, distance,
-                unit.name(), geoArgs));
-    }
-
-    protected Flux<GeoWithin<V>> georadiusbymember_ro(K key, V member, double distance, Unit unit, GeoArgs geoArgs) {
-        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER_RO, key, member, distance,
-                unit.name(), geoArgs));
-    }
-
-    @Override
-    public Mono<Long> georadiusbymember(K key, V member, double distance, Unit unit, GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
-        return createMono(() -> commandBuilder.georadiusbymember(key, member, distance, unit.name(), geoRadiusStoreArgs));
-    }
-
-    @Override
-    public Flux<Value<GeoCoordinates>> geopos(K key, V... members) {
-        return createDissolvingFlux(() -> commandBuilder.geoposValues(key, members));
-    }
-
-    @Override
-    public Mono<Double> geodist(K key, V from, V to, Unit unit) {
-        return createMono(() -> commandBuilder.geodist(key, from, to, unit));
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> Flux<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output) {
-
-        LettuceAssert.notNull(type, "Command type must not be null");
-        LettuceAssert.notNull(output, "CommandOutput type must not be null");
-
-        return (Flux) createFlux(() -> new Command<>(type, output));
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> Flux<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output, CommandArgs<K, V> args) {
-
-        LettuceAssert.notNull(type, "Command type must not be null");
-        LettuceAssert.notNull(output, "CommandOutput type must not be null");
-        LettuceAssert.notNull(args, "CommandArgs type must not be null");
-
-        return (Flux) createFlux(() -> new Command<>(type, output, args));
-    }
-
-    public <T> Flux<T> createFlux(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return Flux.from(new RedisPublisher<>(commandSupplier, connection, false));
-    }
-
-    protected <T> Mono<T> createMono(CommandType type, CommandOutput<K, V, T> output, CommandArgs<K, V> args) {
-        return createMono(() -> new Command<>(type, output, args));
-    }
-
-    public <T> Mono<T> createMono(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return Mono.from(new RedisPublisher<>(commandSupplier, connection, false));
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T, R> Flux<R> createDissolvingFlux(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return (Flux<R>) Flux.from(new RedisPublisher<>(commandSupplier, connection, true));
-    }
-
-    public void setTimeout(Duration timeout) {
-        connection.setTimeout(timeout);
-    }
-
-    public void setTimeout(long timeout, TimeUnit unit) {
-        connection.setTimeout(timeout, unit);
-    }
-
-    public void close() {
-        connection.close();
-    }
-
-    @Override
-    public boolean isOpen() {
-        return connection.isOpen();
-    }
-
-    @Override
-    public void reset() {
-        getConnection().reset();
-    }
-
-    public StatefulConnection<K, V> getConnection() {
-        return connection;
-    }
-
-    @Override
-    public void setAutoFlushCommands(boolean autoFlush) {
-        connection.setAutoFlushCommands(autoFlush);
-    }
-
-    @Override
-    public void flushCommands() {
-        connection.flushCommands();
+    public Mono<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
+        return createMono(() -> commandBuilder.zunionstore(destination, storeArgs, keys));
     }
 }
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index f953dc72e4..911f3a7892 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -33,209 +33,384 @@
  * @param <V>
  * @author Mark Paluch
  */
-@SuppressWarnings({ "unchecked", "Convert2Diamond", "WeakerAccess", "varargs" })
+@SuppressWarnings({ "unchecked", "varargs" })
 class RedisCommandBuilder<K, V> extends BaseRedisCommandBuilder<K, V> {
 
-    static final String MUST_NOT_CONTAIN_NULL_ELEMENTS = "must not contain null elements";
-    static final String MUST_NOT_BE_EMPTY = "must not be empty";
-    static final String MUST_NOT_BE_NULL = "must not be null";
+    private static final String MUST_NOT_CONTAIN_NULL_ELEMENTS = "must not contain null elements";
+    private static final String MUST_NOT_BE_EMPTY = "must not be empty";
+    private static final String MUST_NOT_BE_NULL = "must not be null";
 
     private static final byte[] MINUS_BYTES = { '-' };
     private static final byte[] PLUS_BYTES = { '+' };
 
     private final RedisCodec<String, String> STRING_CODEC = new Utf8StringCodec();
 
-    public RedisCommandBuilder(RedisCodec<K, V> codec) {
+    RedisCommandBuilder(RedisCodec<K, V> codec) {
         super(codec);
     }
 
-    public Command<K, V, Long> append(K key, V value) {
+    Command<K, V, Long> append(K key, V value) {
         notNullKey(key);
 
-        return createCommand(APPEND, new IntegerOutput<K, V>(codec), key, value);
+        return createCommand(APPEND, new IntegerOutput<>(codec), key, value);
     }
 
-    public Command<K, V, String> auth(String password) {
+    Command<K, V, String> asking() {
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        return createCommand(ASKING, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> auth(String password) {
         LettuceAssert.notNull(password, "Password " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(password, "Password " + MUST_NOT_BE_EMPTY);
 
         return auth(password.toCharArray());
     }
 
-    public Command<K, V, String> auth(char[] password) {
+    Command<K, V, String> auth(char[] password) {
         LettuceAssert.notNull(password, "Password " + MUST_NOT_BE_NULL);
         LettuceAssert.isTrue(password.length > 0, "Password " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(password);
-        return createCommand(AUTH, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(password);
+        return createCommand(AUTH, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, String> bgrewriteaof() {
-        return createCommand(BGREWRITEAOF, new StatusOutput<K, V>(codec));
+    Command<K, V, String> bgrewriteaof() {
+        return createCommand(BGREWRITEAOF, new StatusOutput<>(codec));
     }
 
-    public Command<K, V, String> bgsave() {
-        return createCommand(BGSAVE, new StatusOutput<K, V>(codec));
+    Command<K, V, String> bgsave() {
+        return createCommand(BGSAVE, new StatusOutput<>(codec));
     }
 
-    public Command<K, V, Long> bitcount(K key) {
+    Command<K, V, Long> bitcount(K key) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key);
-        return createCommand(BITCOUNT, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
+        return createCommand(BITCOUNT, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> bitcount(K key, long start, long end) {
+    Command<K, V, Long> bitcount(K key, long start, long end) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.addKey(key).add(start).add(end);
-        return createCommand(BITCOUNT, new IntegerOutput<K, V>(codec), args);
+        return createCommand(BITCOUNT, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, List<Long>> bitfield(K key, BitFieldArgs bitFieldArgs) {
+    Command<K, V, List<Long>> bitfield(K key, BitFieldArgs bitFieldArgs) {
         notNullKey(key);
         LettuceAssert.notNull(bitFieldArgs, "BitFieldArgs must not be null");
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.addKey(key);
 
         bitFieldArgs.build(args);
 
-        return createCommand(BITFIELD, (CommandOutput) new ArrayOutput<K, V>(codec), args);
+        return createCommand(BITFIELD, (CommandOutput) new ArrayOutput<>(codec), args);
     }
 
-    public Command<K, V, List<Value<Long>>> bitfieldValue(K key, BitFieldArgs bitFieldArgs) {
+    Command<K, V, List<Value<Long>>> bitfieldValue(K key, BitFieldArgs bitFieldArgs) {
         notNullKey(key);
         LettuceAssert.notNull(bitFieldArgs, "BitFieldArgs must not be null");
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.addKey(key);
 
         bitFieldArgs.build(args);
 
-        return createCommand(BITFIELD, (CommandOutput) new ValueValueListOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, Long> bitpos(K key, boolean state) {
-        notNullKey(key);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(state ? 1 : 0);
-        return createCommand(BITPOS, new IntegerOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, Long> bitpos(K key, boolean state, long start, long end) {
-        notNullKey(key);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(state ? 1 : 0).add(start).add(end);
-        return createCommand(BITPOS, new IntegerOutput<K, V>(codec), args);
+        return createCommand(BITFIELD, (CommandOutput) new ValueValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> bitopAnd(K destination, K... keys) {
+    Command<K, V, Long> bitopAnd(K destination, K... keys) {
         LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
         notEmpty(keys);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.add(AND).addKey(destination).addKeys(keys);
-        return createCommand(BITOP, new IntegerOutput<K, V>(codec), args);
+        return createCommand(BITOP, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> bitopNot(K destination, K source) {
+    Command<K, V, Long> bitopNot(K destination, K source) {
         LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(source, "Source " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.add(NOT).addKey(destination).addKey(source);
-        return createCommand(BITOP, new IntegerOutput<K, V>(codec), args);
+        return createCommand(BITOP, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> bitopOr(K destination, K... keys) {
+    Command<K, V, Long> bitopOr(K destination, K... keys) {
         LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
         notEmpty(keys);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.add(OR).addKey(destination).addKeys(keys);
-        return createCommand(BITOP, new IntegerOutput<K, V>(codec), args);
+        return createCommand(BITOP, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> bitopXor(K destination, K... keys) {
+    Command<K, V, Long> bitopXor(K destination, K... keys) {
         LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
         notEmpty(keys);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.add(XOR).addKey(destination).addKeys(keys);
-        return createCommand(BITOP, new IntegerOutput<K, V>(codec), args);
+        return createCommand(BITOP, new IntegerOutput<>(codec), args);
+    }
+
+    Command<K, V, Long> bitpos(K key, boolean state) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(key).add(state ? 1 : 0);
+        return createCommand(BITPOS, new IntegerOutput<>(codec), args);
+    }
+
+    Command<K, V, Long> bitpos(K key, boolean state, long start, long end) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(key).add(state ? 1 : 0).add(start).add(end);
+        return createCommand(BITPOS, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, KeyValue<K, V>> blpop(long timeout, K... keys) {
+    Command<K, V, KeyValue<K, V>> blpop(long timeout, K... keys) {
         notEmpty(keys);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys).add(timeout);
-        return createCommand(BLPOP, new KeyValueOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys).add(timeout);
+        return createCommand(BLPOP, new KeyValueOutput<>(codec), args);
     }
 
-    public Command<K, V, KeyValue<K, V>> brpop(long timeout, K... keys) {
+    Command<K, V, KeyValue<K, V>> brpop(long timeout, K... keys) {
         notEmpty(keys);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys).add(timeout);
-        return createCommand(BRPOP, new KeyValueOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys).add(timeout);
+        return createCommand(BRPOP, new KeyValueOutput<>(codec), args);
     }
 
-    public Command<K, V, V> brpoplpush(long timeout, K source, K destination) {
+    Command<K, V, V> brpoplpush(long timeout, K source, K destination) {
         LettuceAssert.notNull(source, "Source " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.addKey(source).addKey(destination).add(timeout);
-        return createCommand(BRPOPLPUSH, new ValueOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, K> clientGetname() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(GETNAME);
-        return createCommand(CLIENT, new KeyOutput<K, V>(codec), args);
+        return createCommand(BRPOPLPUSH, new ValueOutput<>(codec), args);
     }
 
-    public Command<K, V, String> clientSetname(K name) {
-        LettuceAssert.notNull(name, "Name " + MUST_NOT_BE_NULL);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(SETNAME).addKey(name);
-        return createCommand(CLIENT, new StatusOutput<K, V>(codec), args);
+    Command<K, V, K> clientGetname() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(GETNAME);
+        return createCommand(CLIENT, new KeyOutput<>(codec), args);
     }
 
-    public Command<K, V, String> clientKill(String addr) {
+    Command<K, V, String> clientKill(String addr) {
         LettuceAssert.notNull(addr, "Addr " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(addr, "Addr " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(KILL).add(addr);
-        return createCommand(CLIENT, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(KILL).add(addr);
+        return createCommand(CLIENT, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> clientKill(KillArgs killArgs) {
+    Command<K, V, Long> clientKill(KillArgs killArgs) {
         LettuceAssert.notNull(killArgs, "KillArgs " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(KILL);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(KILL);
         killArgs.build(args);
-        return createCommand(CLIENT, new IntegerOutput<K, V>(codec), args);
+        return createCommand(CLIENT, new IntegerOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clientList() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(LIST);
+        return createCommand(CLIENT, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clientPause(long timeout) {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(PAUSE).add(timeout);
+        return createCommand(CLIENT, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clientSetname(K name) {
+        LettuceAssert.notNull(name, "Name " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(SETNAME).addKey(name);
+        return createCommand(CLIENT, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterAddslots(int[] slots) {
+        notEmptySlots(slots);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(ADDSLOTS);
+
+        for (int slot : slots) {
+            args.add(slot);
+        }
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterBumpepoch() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(BUMPEPOCH);
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, Long> clusterCountFailureReports(String nodeId) {
+        assertNodeId(nodeId);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add("COUNT-FAILURE-REPORTS").add(nodeId);
+        return createCommand(CLUSTER, new IntegerOutput<>(codec), args);
+    }
+
+    Command<K, V, Long> clusterCountKeysInSlot(int slot) {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(COUNTKEYSINSLOT).add(slot);
+        return createCommand(CLUSTER, new IntegerOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterDelslots(int[] slots) {
+        notEmptySlots(slots);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(DELSLOTS);
+
+        for (int slot : slots) {
+            args.add(slot);
+        }
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterFailover(boolean force) {
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(FAILOVER);
+        if (force) {
+            args.add(FORCE);
+        }
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterFlushslots() {
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(FLUSHSLOTS);
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterForget(String nodeId) {
+        assertNodeId(nodeId);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(FORGET).add(nodeId);
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, List<K>> clusterGetKeysInSlot(int slot, int count) {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(GETKEYSINSLOT).add(slot).add(count);
+        return createCommand(CLUSTER, new KeyListOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterInfo() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(INFO);
+
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, Long> clusterKeyslot(K key) {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(KEYSLOT).addKey(key);
+        return createCommand(CLUSTER, new IntegerOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterMeet(String ip, int port) {
+        LettuceAssert.notNull(ip, "IP " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(ip, "IP " + MUST_NOT_BE_EMPTY);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(MEET).add(ip).add(port);
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterMyId() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(MYID);
+
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterNodes() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(NODES);
+
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterReplicate(String nodeId) {
+        assertNodeId(nodeId);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(REPLICATE).add(nodeId);
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterReset(boolean hard) {
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(RESET);
+        if (hard) {
+            args.add(HARD);
+        } else {
+            args.add(SOFT);
+        }
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterSaveconfig() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(SAVECONFIG);
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterSetConfigEpoch(long configEpoch) {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add("SET-CONFIG-EPOCH").add(configEpoch);
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterSetSlotImporting(int slot, String nodeId) {
+        assertNodeId(nodeId);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(SETSLOT).add(slot).add(IMPORTING).add(nodeId);
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterSetSlotMigrating(int slot, String nodeId) {
+        assertNodeId(nodeId);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(SETSLOT).add(slot).add(MIGRATING).add(nodeId);
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterSetSlotNode(int slot, String nodeId) {
+        assertNodeId(nodeId);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(SETSLOT).add(slot).add(NODE).add(nodeId);
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> clusterSetSlotStable(int slot) {
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(SETSLOT).add(slot).add(STABLE);
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, String> clientPause(long timeout) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(PAUSE).add(timeout);
-        return createCommand(CLIENT, new StatusOutput<K, V>(codec), args);
+    Command<K, V, List<String>> clusterSlaves(String nodeId) {
+        assertNodeId(nodeId);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(SLAVES).add(nodeId);
+        return createCommand(CLUSTER, new StringListOutput<>(codec), args);
     }
 
-    public Command<K, V, String> clientList() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(LIST);
-        return createCommand(CLIENT, new StatusOutput<K, V>(codec), args);
+    Command<K, V, List<Object>> clusterSlots() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(SLOTS);
+        return createCommand(CLUSTER, new ArrayOutput<>(codec), args);
     }
 
-    public Command<K, V, List<Object>> command() {
+    Command<K, V, List<Object>> command() {
         CommandArgs<K, V> args = new CommandArgs<K, V>((RedisCodec) STRING_CODEC);
         return createCommand(COMMAND, new ArrayOutput<K, V>((RedisCodec) STRING_CODEC), args);
     }
 
-    public Command<K, V, List<Object>> commandInfo(String... commands) {
+    Command<K, V, Long> commandCount() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(COUNT);
+        return createCommand(COMMAND, new IntegerOutput<>(codec), args);
+    }
+
+    Command<K, V, List<Object>> commandInfo(String... commands) {
         LettuceAssert.notNull(commands, "Commands " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(commands, "Commands " + MUST_NOT_BE_EMPTY);
         LettuceAssert.noNullElements(commands, "Commands " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
@@ -250,17 +425,7 @@ public Command<K, V, List<Object>> commandInfo(String... commands) {
         return createCommand(COMMAND, new ArrayOutput<K, V>((RedisCodec) STRING_CODEC), args);
     }
 
-    public Command<K, V, Long> commandCount() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(COUNT);
-        return createCommand(COMMAND, new IntegerOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> configRewrite() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(REWRITE);
-        return createCommand(CONFIG, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, Map<String, String>> configGet(String parameter) {
+    Command<K, V, Map<String, String>> configGet(String parameter) {
         LettuceAssert.notNull(parameter, "Parameter " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(parameter, "Parameter " + MUST_NOT_BE_EMPTY);
 
@@ -268,1223 +433,1620 @@ public Command<K, V, Map<String, String>> configGet(String parameter) {
         return createCommand(CONFIG, new MapOutput<>((RedisCodec) STRING_CODEC), args);
     }
 
-    public Command<K, V, String> configResetstat() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(RESETSTAT);
-        return createCommand(CONFIG, new StatusOutput<K, V>(codec), args);
+    Command<K, V, String> configResetstat() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(RESETSTAT);
+        return createCommand(CONFIG, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> configRewrite() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(REWRITE);
+        return createCommand(CONFIG, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, String> configSet(String parameter, String value) {
+    Command<K, V, String> configSet(String parameter, String value) {
         LettuceAssert.notNull(parameter, "Parameter " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(parameter, "Parameter " + MUST_NOT_BE_EMPTY);
         LettuceAssert.notNull(value, "Value " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(SET).add(parameter).add(value);
-        return createCommand(CONFIG, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(SET).add(parameter).add(value);
+        return createCommand(CONFIG, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> dbsize() {
-        return createCommand(DBSIZE, new IntegerOutput<K, V>(codec));
+    Command<K, V, Long> dbsize() {
+        return createCommand(DBSIZE, new IntegerOutput<>(codec));
     }
 
-    public Command<K, V, String> debugCrashAndRecover(Long delay) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add("CRASH-AND-RECOVER");
+    Command<K, V, String> debugCrashAndRecover(Long delay) {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add("CRASH-AND-RECOVER");
         if (delay != null) {
             args.add(delay);
         }
-        return createCommand(DEBUG, new StatusOutput<K, V>(codec), args);
+        return createCommand(DEBUG, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, String> debugObject(K key) {
-        notNullKey(key);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(OBJECT).addKey(key);
-        return createCommand(DEBUG, new StatusOutput<K, V>(codec), args);
+    Command<K, V, String> debugHtstats(int db) {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(HTSTATS).add(db);
+        return createCommand(DEBUG, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, Void> debugOom() {
-        return createCommand(DEBUG, null, new CommandArgs<K, V>(codec).add("OOM"));
+    Command<K, V, String> debugObject(K key) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(OBJECT).addKey(key);
+        return createCommand(DEBUG, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, String> debugHtstats(int db) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(HTSTATS).add(db);
-        return createCommand(DEBUG, new StatusOutput<K, V>(codec), args);
+    Command<K, V, Void> debugOom() {
+        return createCommand(DEBUG, null, new CommandArgs<>(codec).add("OOM"));
     }
 
-    public Command<K, V, String> debugReload() {
-        return createCommand(DEBUG, new StatusOutput<K, V>(codec), new CommandArgs<K, V>(codec).add(RELOAD));
+    Command<K, V, String> debugReload() {
+        return createCommand(DEBUG, new StatusOutput<>(codec), new CommandArgs<>(codec).add(RELOAD));
     }
 
-    public Command<K, V, String> debugRestart(Long delay) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(RESTART);
+    Command<K, V, String> debugRestart(Long delay) {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(RESTART);
         if (delay != null) {
             args.add(delay);
         }
-        return createCommand(DEBUG, new StatusOutput<K, V>(codec), args);
+        return createCommand(DEBUG, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, String> debugSdslen(K key) {
+    Command<K, V, String> debugSdslen(K key) {
         notNullKey(key);
 
-        return createCommand(DEBUG, new StatusOutput<K, V>(codec), new CommandArgs<K, V>(codec).add("SDSLEN").addKey(key));
+        return createCommand(DEBUG, new StatusOutput<>(codec), new CommandArgs<>(codec).add("SDSLEN").addKey(key));
     }
 
-    public Command<K, V, Void> debugSegfault() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(SEGFAULT);
+    Command<K, V, Void> debugSegfault() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(SEGFAULT);
         return createCommand(DEBUG, null, args);
     }
 
-    public Command<K, V, Long> decr(K key) {
+    Command<K, V, Long> decr(K key) {
         notNullKey(key);
 
-        return createCommand(DECR, new IntegerOutput<K, V>(codec), key);
+        return createCommand(DECR, new IntegerOutput<>(codec), key);
     }
 
-    public Command<K, V, Long> decrby(K key, long amount) {
+    Command<K, V, Long> decrby(K key, long amount) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(amount);
-        return createCommand(DECRBY, new IntegerOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, Long> del(K... keys) {
-        notEmpty(keys);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(DEL, new IntegerOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, Long> del(Iterable<K> keys) {
-        LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(DEL, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(amount);
+        return createCommand(DECRBY, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> unlink(K... keys) {
+    Command<K, V, Long> del(K... keys) {
         notEmpty(keys);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(UNLINK, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(DEL, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> unlink(Iterable<K> keys) {
+    Command<K, V, Long> del(Iterable<K> keys) {
         LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(UNLINK, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(DEL, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, String> discard() {
-        return createCommand(DISCARD, new StatusOutput<K, V>(codec));
+    Command<K, V, String> discard() {
+        return createCommand(DISCARD, new StatusOutput<>(codec));
     }
 
-    public Command<K, V, byte[]> dump(K key) {
+    Command<K, V, byte[]> dump(K key) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key);
-        return createCommand(DUMP, new ByteArrayOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
+        return createCommand(DUMP, new ByteArrayOutput<>(codec), args);
     }
 
-    public Command<K, V, V> echo(V msg) {
+    Command<K, V, V> echo(V msg) {
         LettuceAssert.notNull(msg, "message " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addValue(msg);
-        return createCommand(ECHO, new ValueOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addValue(msg);
+        return createCommand(ECHO, new ValueOutput<>(codec), args);
     }
 
-    public <T> Command<K, V, T> eval(String script, ScriptOutputType type, K... keys) {
+    <T> Command<K, V, T> eval(String script, ScriptOutputType type, K... keys) {
         LettuceAssert.notNull(script, "Script " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(script, "Script " + MUST_NOT_BE_EMPTY);
         LettuceAssert.notNull(type, "ScriptOutputType " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.add(script).add(keys.length).addKeys(keys);
         CommandOutput<K, V, T> output = newScriptOutput(codec, type);
         return createCommand(EVAL, output, args);
     }
 
-    public <T> Command<K, V, T> eval(String script, ScriptOutputType type, K[] keys, V... values) {
+    <T> Command<K, V, T> eval(String script, ScriptOutputType type, K[] keys, V... values) {
         LettuceAssert.notNull(script, "Script " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(script, "Script " + MUST_NOT_BE_EMPTY);
         LettuceAssert.notNull(type, "ScriptOutputType " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(values, "Values " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.add(script).add(keys.length).addKeys(keys).addValues(values);
         CommandOutput<K, V, T> output = newScriptOutput(codec, type);
         return createCommand(EVAL, output, args);
     }
 
-    public <T> Command<K, V, T> evalsha(String digest, ScriptOutputType type, K... keys) {
+    <T> Command<K, V, T> evalsha(String digest, ScriptOutputType type, K... keys) {
         LettuceAssert.notNull(digest, "Digest " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(digest, "Digest " + MUST_NOT_BE_EMPTY);
         LettuceAssert.notNull(type, "ScriptOutputType " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.add(digest).add(keys.length).addKeys(keys);
         CommandOutput<K, V, T> output = newScriptOutput(codec, type);
         return createCommand(EVALSHA, output, args);
     }
 
-    public <T> Command<K, V, T> evalsha(String digest, ScriptOutputType type, K[] keys, V... values) {
+    <T> Command<K, V, T> evalsha(String digest, ScriptOutputType type, K[] keys, V... values) {
         LettuceAssert.notNull(digest, "Digest " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(digest, "Digest " + MUST_NOT_BE_EMPTY);
         LettuceAssert.notNull(type, "ScriptOutputType " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(values, "Values " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.add(digest).add(keys.length).addKeys(keys).addValues(values);
         CommandOutput<K, V, T> output = newScriptOutput(codec, type);
         return createCommand(EVALSHA, output, args);
     }
 
-    public Command<K, V, Boolean> exists(K key) {
+    Command<K, V, Boolean> exists(K key) {
         notNullKey(key);
 
-        return createCommand(EXISTS, new BooleanOutput<K, V>(codec), key);
+        return createCommand(EXISTS, new BooleanOutput<>(codec), key);
     }
 
-    public Command<K, V, Long> exists(K... keys) {
+    Command<K, V, Long> exists(K... keys) {
         notEmpty(keys);
 
-        return createCommand(EXISTS, new IntegerOutput<K, V>(codec), new CommandArgs<K, V>(codec).addKeys(keys));
+        return createCommand(EXISTS, new IntegerOutput<>(codec), new CommandArgs<>(codec).addKeys(keys));
     }
 
-    public Command<K, V, Long> exists(Iterable<K> keys) {
+    Command<K, V, Long> exists(Iterable<K> keys) {
         LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
 
-        return createCommand(EXISTS, new IntegerOutput<K, V>(codec), new CommandArgs<K, V>(codec).addKeys(keys));
+        return createCommand(EXISTS, new IntegerOutput<>(codec), new CommandArgs<>(codec).addKeys(keys));
     }
 
-    public Command<K, V, Boolean> expire(K key, long seconds) {
+    Command<K, V, Boolean> expire(K key, long seconds) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(seconds);
-        return createCommand(EXPIRE, new BooleanOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(seconds);
+        return createCommand(EXPIRE, new BooleanOutput<>(codec), args);
     }
 
-    public Command<K, V, Boolean> expireat(K key, long timestamp) {
+    Command<K, V, Boolean> expireat(K key, long timestamp) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(timestamp);
-        return createCommand(EXPIREAT, new BooleanOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(timestamp);
+        return createCommand(EXPIREAT, new BooleanOutput<>(codec), args);
     }
 
-    public Command<K, V, String> flushall() {
-        return createCommand(FLUSHALL, new StatusOutput<K, V>(codec));
+    Command<K, V, String> flushall() {
+        return createCommand(FLUSHALL, new StatusOutput<>(codec));
     }
 
-    public Command<K, V, String> flushallAsync() {
-        return createCommand(FLUSHALL, new StatusOutput<K, V>(codec), new CommandArgs<K, V>(codec).add(ASYNC));
+    Command<K, V, String> flushallAsync() {
+        return createCommand(FLUSHALL, new StatusOutput<>(codec), new CommandArgs<>(codec).add(ASYNC));
     }
 
-    public Command<K, V, String> flushdb() {
-        return createCommand(FLUSHDB, new StatusOutput<K, V>(codec));
+    Command<K, V, String> flushdb() {
+        return createCommand(FLUSHDB, new StatusOutput<>(codec));
     }
 
-    public Command<K, V, String> flushdbAsync() {
-        return createCommand(FLUSHDB, new StatusOutput<K, V>(codec), new CommandArgs<K, V>(codec).add(ASYNC));
+    Command<K, V, String> flushdbAsync() {
+        return createCommand(FLUSHDB, new StatusOutput<>(codec), new CommandArgs<>(codec).add(ASYNC));
     }
 
-    public Command<K, V, V> get(K key) {
+    Command<K, V, Long> geoadd(K key, double longitude, double latitude, V member) {
         notNullKey(key);
 
-        return createCommand(GET, new ValueOutput<K, V>(codec), key);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(longitude).add(latitude).addValue(member);
+        return createCommand(GEOADD, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> getbit(K key, long offset) {
+    Command<K, V, Long> geoadd(K key, Object[] lngLatMember) {
+
         notNullKey(key);
+        LettuceAssert.notNull(lngLatMember, "LngLatMember " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(lngLatMember, "LngLatMember " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.noNullElements(lngLatMember, "LngLatMember " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
+        LettuceAssert
+                .isTrue(lngLatMember.length % 3 == 0,
+                        "LngLatMember.length must be a multiple of 3 and contain a "
+                                + "sequence of longitude1, latitude1, member1, longitude2, latitude2, member2, ... longitudeN, latitudeN, memberN");
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(offset);
-        return createCommand(GETBIT, new IntegerOutput<K, V>(codec), args);
-    }
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
 
-    public Command<K, V, V> getrange(K key, long start, long end) {
-        notNullKey(key);
+        for (int i = 0; i < lngLatMember.length; i += 3) {
+            args.add((Double) lngLatMember[i]);
+            args.add((Double) lngLatMember[i + 1]);
+            args.addValue((V) lngLatMember[i + 2]);
+        }
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(start).add(end);
-        return createCommand(GETRANGE, new ValueOutput<K, V>(codec), args);
+        return createCommand(GEOADD, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, V> getset(K key, V value) {
+    Command<K, V, Double> geodist(K key, V from, V to, GeoArgs.Unit unit) {
         notNullKey(key);
+        LettuceAssert.notNull(from, "From " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(from, "To " + MUST_NOT_BE_NULL);
 
-        return createCommand(GETSET, new ValueOutput<K, V>(codec), key, value);
-    }
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addValue(from).addValue(to);
 
-    public Command<K, V, Long> hdel(K key, K... fields) {
-        notNullKey(key);
-        LettuceAssert.notNull(fields, "Fields " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(fields, "Fields " + MUST_NOT_BE_EMPTY);
+        if (unit != null) {
+            args.add(unit.name());
+        }
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKeys(fields);
-        return createCommand(HDEL, new IntegerOutput<K, V>(codec), args);
+        return createCommand(GEODIST, new DoubleOutput<>(codec), args);
     }
 
-    public Command<K, V, Boolean> hexists(K key, K field) {
+    Command<K, V, List<Value<String>>> geohash(K key, V... members) {
         notNullKey(key);
-        LettuceAssert.notNull(field, "Field " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(members, "Members " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(members, "Members " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKey(field);
-        return createCommand(HEXISTS, new BooleanOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addValues(members);
+        return createCommand(GEOHASH, new StringValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, V> hget(K key, K field) {
+    Command<K, V, List<GeoCoordinates>> geopos(K key, V[] members) {
         notNullKey(key);
-        LettuceAssert.notNull(field, "Field " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(members, "Members " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(members, "Members " + MUST_NOT_BE_EMPTY);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addValues(members);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKey(field);
-        return createCommand(HGET, new ValueOutput<K, V>(codec), args);
+        return createCommand(GEOPOS, new GeoCoordinatesListOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> hincrby(K key, K field, long amount) {
+    Command<K, V, List<Value<GeoCoordinates>>> geoposValues(K key, V[] members) {
         notNullKey(key);
-        LettuceAssert.notNull(field, "Field " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(members, "Members " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(members, "Members " + MUST_NOT_BE_EMPTY);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addValues(members);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKey(field).add(amount);
-        return createCommand(HINCRBY, new IntegerOutput<K, V>(codec), args);
+        return createCommand(GEOPOS, new GeoCoordinatesValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, Double> hincrbyfloat(K key, K field, double amount) {
+    Command<K, V, Set<V>> georadius(CommandType commandType, K key, double longitude, double latitude, double distance,
+            String unit) {
         notNullKey(key);
-        LettuceAssert.notNull(field, "Field " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(unit, "Unit " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(unit, "Unit " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKey(field).add(amount);
-        return createCommand(HINCRBYFLOAT, new DoubleOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(longitude).add(latitude).add(distance).add(unit);
+        return createCommand(commandType, new ValueSetOutput<>(codec), args);
     }
 
-    public Command<K, V, Map<K, V>> hgetall(K key) {
+    Command<K, V, List<GeoWithin<V>>> georadius(CommandType commandType, K key, double longitude, double latitude,
+            double distance, String unit, GeoArgs geoArgs) {
+
         notNullKey(key);
+        LettuceAssert.notNull(unit, "Unit " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(unit, "Unit " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.notNull(geoArgs, "GeoArgs " + MUST_NOT_BE_NULL);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(longitude).add(latitude).add(distance).add(unit);
+        geoArgs.build(args);
 
-        return createCommand(HGETALL, new MapOutput<K, V>(codec), key);
+        return createCommand(commandType, new GeoWithinListOutput<>(codec, geoArgs.isWithDistance(), geoArgs.isWithHash(),
+                geoArgs.isWithCoordinates()), args);
     }
 
-    public Command<K, V, Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key) {
+    Command<K, V, Long> georadius(K key, double longitude, double latitude, double distance, String unit,
+            GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
+
         notNullKey(key);
-        notNull(channel);
+        LettuceAssert.notNull(unit, "Unit " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(unit, "Unit " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.notNull(geoRadiusStoreArgs, "GeoRadiusStoreArgs " + MUST_NOT_BE_NULL);
+        LettuceAssert.isTrue(geoRadiusStoreArgs.getStoreKey() != null || geoRadiusStoreArgs.getStoreDistKey() != null,
+                "At least STORE key or STORDIST key is required");
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(longitude).add(latitude).add(distance).add(unit);
+        geoRadiusStoreArgs.build(args);
 
-        return createCommand(HGETALL, new KeyValueStreamingOutput<K, V>(codec, channel), key);
+        return createCommand(GEORADIUS, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, List<K>> hkeys(K key) {
+    Command<K, V, Set<V>> georadiusbymember(CommandType commandType, K key, V member, double distance, String unit) {
+
         notNullKey(key);
+        LettuceAssert.notNull(unit, "Unit " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(unit, "Unit " + MUST_NOT_BE_EMPTY);
 
-        return createCommand(HKEYS, new KeyListOutput<K, V>(codec), key);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addValue(member).add(distance).add(unit);
+        return createCommand(commandType, new ValueSetOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> hkeys(KeyStreamingChannel<K> channel, K key) {
+    Command<K, V, List<GeoWithin<V>>> georadiusbymember(CommandType commandType, K key, V member, double distance, String unit,
+            GeoArgs geoArgs) {
+
         notNullKey(key);
-        notNull(channel);
+        LettuceAssert.notNull(geoArgs, "GeoArgs " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(unit, "Unit " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(unit, "Unit " + MUST_NOT_BE_EMPTY);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addValue(member).add(distance).add(unit);
+        geoArgs.build(args);
 
-        return createCommand(HKEYS, new KeyStreamingOutput<K, V>(codec, channel), key);
+        return createCommand(commandType, new GeoWithinListOutput<>(codec, geoArgs.isWithDistance(), geoArgs.isWithHash(),
+                geoArgs.isWithCoordinates()), args);
     }
 
-    public Command<K, V, Long> hlen(K key) {
+    Command<K, V, Long> georadiusbymember(K key, V member, double distance, String unit,
+            GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
+
         notNullKey(key);
+        LettuceAssert.notNull(geoRadiusStoreArgs, "GeoRadiusStoreArgs " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(unit, "Unit " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(unit, "Unit " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.isTrue(geoRadiusStoreArgs.getStoreKey() != null || geoRadiusStoreArgs.getStoreDistKey() != null,
+                "At least STORE key or STORDIST key is required");
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addValue(member).add(distance).add(unit);
+        geoRadiusStoreArgs.build(args);
 
-        return createCommand(HLEN, new IntegerOutput<K, V>(codec), key);
+        return createCommand(GEORADIUSBYMEMBER, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> hstrlen(K key, K field) {
+    Command<K, V, V> get(K key) {
         notNullKey(key);
-        LettuceAssert.notNull(field, "Field " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKey(field);
-        return createCommand(HSTRLEN, new IntegerOutput<K, V>(codec), args);
+        return createCommand(GET, new ValueOutput<>(codec), key);
     }
 
-    public Command<K, V, List<V>> hmget(K key, K... fields) {
+    Command<K, V, Long> getbit(K key, long offset) {
         notNullKey(key);
-        LettuceAssert.notNull(fields, "Fields " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(fields, "Fields " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKeys(fields);
-        return createCommand(HMGET, new ValueListOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(offset);
+        return createCommand(GETBIT, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, List<KeyValue<K, V>>> hmgetKeyValue(K key, K... fields) {
+    Command<K, V, V> getrange(K key, long start, long end) {
         notNullKey(key);
-        LettuceAssert.notNull(fields, "Fields " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(fields, "Fields " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKeys(fields);
-        return createCommand(HMGET, new KeyValueListOutput<K, V>(codec, Arrays.asList(fields)), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(start).add(end);
+        return createCommand(GETRANGE, new ValueOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> hmget(ValueStreamingChannel<V> channel, K key, K... fields) {
+    Command<K, V, V> getset(K key, V value) {
         notNullKey(key);
-        LettuceAssert.notNull(fields, "Fields " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(fields, "Fields " + MUST_NOT_BE_EMPTY);
-        notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKeys(fields);
-        return createCommand(HMGET, new ValueStreamingOutput<K, V>(codec, channel), args);
+        return createCommand(GETSET, new ValueOutput<>(codec), key, value);
     }
 
-    public Command<K, V, Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields) {
+    Command<K, V, Long> hdel(K key, K... fields) {
         notNullKey(key);
         LettuceAssert.notNull(fields, "Fields " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(fields, "Fields " + MUST_NOT_BE_EMPTY);
-        notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKeys(fields);
-        return createCommand(HMGET, new KeyValueStreamingOutput<K, V>(codec, channel, Arrays.asList(fields)), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKeys(fields);
+        return createCommand(HDEL, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, String> hmset(K key, Map<K, V> map) {
+    Command<K, V, Boolean> hexists(K key, K field) {
         notNullKey(key);
-        LettuceAssert.notNull(map, "Map " + MUST_NOT_BE_NULL);
-        LettuceAssert.isTrue(!map.isEmpty(), "Map " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.notNull(field, "Field " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(map);
-        return createCommand(HMSET, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKey(field);
+        return createCommand(HEXISTS, new BooleanOutput<>(codec), args);
     }
 
-    public Command<K, V, Boolean> hset(K key, K field, V value) {
+    Command<K, V, V> hget(K key, K field) {
         notNullKey(key);
         LettuceAssert.notNull(field, "Field " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKey(field).addValue(value);
-        return createCommand(HSET, new BooleanOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKey(field);
+        return createCommand(HGET, new ValueOutput<>(codec), args);
     }
 
-    public Command<K, V, Boolean> hsetnx(K key, K field, V value) {
+    Command<K, V, Map<K, V>> hgetall(K key) {
         notNullKey(key);
-        LettuceAssert.notNull(field, "Field " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKey(field).addValue(value);
-        return createCommand(HSETNX, new BooleanOutput<K, V>(codec), args);
+        return createCommand(HGETALL, new MapOutput<>(codec), key);
     }
 
-    public Command<K, V, List<V>> hvals(K key) {
+    Command<K, V, Long> hgetall(KeyValueStreamingChannel<K, V> channel, K key) {
         notNullKey(key);
+        notNull(channel);
 
-        return createCommand(HVALS, new ValueListOutput<K, V>(codec), key);
+        return createCommand(HGETALL, new KeyValueStreamingOutput<>(codec, channel), key);
     }
 
-    public Command<K, V, Long> hvals(ValueStreamingChannel<V> channel, K key) {
+    Command<K, V, Long> hincrby(K key, K field, long amount) {
         notNullKey(key);
-        notNull(channel);
+        LettuceAssert.notNull(field, "Field " + MUST_NOT_BE_NULL);
 
-        return createCommand(HVALS, new ValueStreamingOutput<K, V>(codec, channel), key);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKey(field).add(amount);
+        return createCommand(HINCRBY, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> incr(K key) {
+    Command<K, V, Double> hincrbyfloat(K key, K field, double amount) {
         notNullKey(key);
+        LettuceAssert.notNull(field, "Field " + MUST_NOT_BE_NULL);
 
-        return createCommand(INCR, new IntegerOutput<K, V>(codec), key);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKey(field).add(amount);
+        return createCommand(HINCRBYFLOAT, new DoubleOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> incrby(K key, long amount) {
+    Command<K, V, List<K>> hkeys(K key) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(amount);
-        return createCommand(INCRBY, new IntegerOutput<K, V>(codec), args);
+        return createCommand(HKEYS, new KeyListOutput<>(codec), key);
     }
 
-    public Command<K, V, Double> incrbyfloat(K key, double amount) {
+    Command<K, V, Long> hkeys(KeyStreamingChannel<K> channel, K key) {
         notNullKey(key);
+        notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(amount);
-        return createCommand(INCRBYFLOAT, new DoubleOutput<K, V>(codec), args);
+        return createCommand(HKEYS, new KeyStreamingOutput<>(codec, channel), key);
     }
 
-    public Command<K, V, String> info() {
-        return createCommand(INFO, new StatusOutput<K, V>(codec));
+    Command<K, V, Long> hlen(K key) {
+        notNullKey(key);
+
+        return createCommand(HLEN, new IntegerOutput<>(codec), key);
     }
 
-    public Command<K, V, String> info(String section) {
-        LettuceAssert.notNull(section, "Section " + MUST_NOT_BE_NULL);
+    Command<K, V, List<V>> hmget(K key, K... fields) {
+        notNullKey(key);
+        LettuceAssert.notNull(fields, "Fields " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(fields, "Fields " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(section);
-        return createCommand(INFO, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKeys(fields);
+        return createCommand(HMGET, new ValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, List<K>> keys(K pattern) {
-        LettuceAssert.notNull(pattern, "Pattern " + MUST_NOT_BE_NULL);
+    Command<K, V, Long> hmget(ValueStreamingChannel<V> channel, K key, K... fields) {
+        notNullKey(key);
+        LettuceAssert.notNull(fields, "Fields " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(fields, "Fields " + MUST_NOT_BE_EMPTY);
+        notNull(channel);
 
-        return createCommand(KEYS, new KeyListOutput<K, V>(codec), pattern);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKeys(fields);
+        return createCommand(HMGET, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, Long> keys(KeyStreamingChannel<K> channel, K pattern) {
-        LettuceAssert.notNull(pattern, "Pattern " + MUST_NOT_BE_NULL);
+    Command<K, V, Long> hmget(KeyValueStreamingChannel<K, V> channel, K key, K... fields) {
+        notNullKey(key);
+        LettuceAssert.notNull(fields, "Fields " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(fields, "Fields " + MUST_NOT_BE_EMPTY);
         notNull(channel);
 
-        return createCommand(KEYS, new KeyStreamingOutput<K, V>(codec, channel), pattern);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKeys(fields);
+        return createCommand(HMGET, new KeyValueStreamingOutput<>(codec, channel, Arrays.asList(fields)), args);
     }
 
-    public Command<K, V, Date> lastsave() {
-        return createCommand(LASTSAVE, new DateOutput<K, V>(codec));
+    Command<K, V, List<KeyValue<K, V>>> hmgetKeyValue(K key, K... fields) {
+        notNullKey(key);
+        LettuceAssert.notNull(fields, "Fields " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(fields, "Fields " + MUST_NOT_BE_EMPTY);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKeys(fields);
+        return createCommand(HMGET, new KeyValueListOutput<>(codec, Arrays.asList(fields)), args);
     }
 
-    public Command<K, V, V> lindex(K key, long index) {
+    Command<K, V, String> hmset(K key, Map<K, V> map) {
         notNullKey(key);
+        LettuceAssert.notNull(map, "Map " + MUST_NOT_BE_NULL);
+        LettuceAssert.isTrue(!map.isEmpty(), "Map " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(index);
-        return createCommand(LINDEX, new ValueOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(map);
+        return createCommand(HMSET, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> linsert(K key, boolean before, V pivot, V value) {
+    Command<K, V, MapScanCursor<K, V>> hscan(K key) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(before ? BEFORE : AFTER).addValue(pivot).addValue(value);
-        return createCommand(LINSERT, new IntegerOutput<K, V>(codec), args);
+        return hscan(key, ScanCursor.INITIAL, null);
     }
 
-    public Command<K, V, Long> llen(K key) {
+    Command<K, V, MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor) {
         notNullKey(key);
 
-        return createCommand(LLEN, new IntegerOutput<K, V>(codec), key);
+        return hscan(key, scanCursor, null);
     }
 
-    public Command<K, V, V> lpop(K key) {
+    Command<K, V, MapScanCursor<K, V>> hscan(K key, ScanArgs scanArgs) {
         notNullKey(key);
 
-        return createCommand(LPOP, new ValueOutput<K, V>(codec), key);
+        return hscan(key, ScanCursor.INITIAL, scanArgs);
     }
 
-    public Command<K, V, Long> lpush(K key, V... values) {
+    Command<K, V, MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
         notNullKey(key);
-        notEmptyValues(values);
 
-        return createCommand(LPUSH, new IntegerOutput<K, V>(codec), key, values);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(key);
+
+        scanArgs(scanCursor, scanArgs, args);
+
+        MapScanOutput<K, V> output = new MapScanOutput<>(codec);
+        return createCommand(HSCAN, output, args);
     }
 
-    public Command<K, V, Long> lpushx(K key, V... values) {
+    Command<K, V, StreamScanCursor> hscanStreaming(KeyValueStreamingChannel<K, V> channel, K key) {
         notNullKey(key);
-        notEmptyValues(values);
+        notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValues(values);
+        return hscanStreaming(channel, key, ScanCursor.INITIAL, null);
+    }
+
+    Command<K, V, StreamScanCursor> hscanStreaming(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor) {
+        notNullKey(key);
+        notNull(channel);
 
-        return createCommand(LPUSHX, new IntegerOutput<K, V>(codec), args);
+        return hscanStreaming(channel, key, scanCursor, null);
     }
 
-    public Command<K, V, List<V>> lrange(K key, long start, long stop) {
+    Command<K, V, StreamScanCursor> hscanStreaming(KeyValueStreamingChannel<K, V> channel, K key, ScanArgs scanArgs) {
         notNullKey(key);
+        notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(start).add(stop);
-        return createCommand(LRANGE, new ValueListOutput<K, V>(codec), args);
+        return hscanStreaming(channel, key, ScanCursor.INITIAL, scanArgs);
     }
 
-    public Command<K, V, Long> lrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
+    Command<K, V, StreamScanCursor> hscanStreaming(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor,
+            ScanArgs scanArgs) {
         notNullKey(key);
         notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(start).add(stop);
-        return createCommand(LRANGE, new ValueStreamingOutput<K, V>(codec, channel), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+
+        args.addKey(key);
+        scanArgs(scanCursor, scanArgs, args);
+
+        KeyValueScanStreamingOutput<K, V> output = new KeyValueScanStreamingOutput<>(codec, channel);
+        return createCommand(HSCAN, output, args);
     }
 
-    public Command<K, V, Long> lrem(K key, long count, V value) {
+    Command<K, V, Boolean> hset(K key, K field, V value) {
         notNullKey(key);
+        LettuceAssert.notNull(field, "Field " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(count).addValue(value);
-        return createCommand(LREM, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKey(field).addValue(value);
+        return createCommand(HSET, new BooleanOutput<>(codec), args);
     }
 
-    public Command<K, V, String> lset(K key, long index, V value) {
+    Command<K, V, Boolean> hsetnx(K key, K field, V value) {
         notNullKey(key);
+        LettuceAssert.notNull(field, "Field " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(index).addValue(value);
-        return createCommand(LSET, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKey(field).addValue(value);
+        return createCommand(HSETNX, new BooleanOutput<>(codec), args);
     }
 
-    public Command<K, V, String> ltrim(K key, long start, long stop) {
+    Command<K, V, Long> hstrlen(K key, K field) {
         notNullKey(key);
+        LettuceAssert.notNull(field, "Field " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(start).add(stop);
-        return createCommand(LTRIM, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKey(field);
+        return createCommand(HSTRLEN, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, String> migrate(String host, int port, K key, int db, long timeout) {
-        LettuceAssert.notNull(host, "Host " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(host, "Host " + MUST_NOT_BE_EMPTY);
+    Command<K, V, List<V>> hvals(K key) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.add(host).add(port).addKey(key).add(db).add(timeout);
-        return createCommand(MIGRATE, new StatusOutput<K, V>(codec), args);
+        return createCommand(HVALS, new ValueListOutput<>(codec), key);
     }
 
-    public Command<K, V, String> migrate(String host, int port, int db, long timeout, MigrateArgs<K> migrateArgs) {
-        LettuceAssert.notNull(host, "Host " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(host, "Host " + MUST_NOT_BE_EMPTY);
-        LettuceAssert.notNull(migrateArgs, "migrateArgs " + MUST_NOT_BE_NULL);
+    Command<K, V, Long> hvals(ValueStreamingChannel<V> channel, K key) {
+        notNullKey(key);
+        notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        return createCommand(HVALS, new ValueStreamingOutput<>(codec, channel), key);
+    }
 
-        args.add(host).add(port);
+    Command<K, V, Long> incr(K key) {
+        notNullKey(key);
 
-        if (migrateArgs.keys.size() == 1) {
-            args.addKey(migrateArgs.keys.get(0));
-        } else {
-            args.add("");
-        }
+        return createCommand(INCR, new IntegerOutput<>(codec), key);
+    }
 
-        args.add(db).add(timeout);
-        migrateArgs.build(args);
+    Command<K, V, Long> incrby(K key, long amount) {
+        notNullKey(key);
 
-        return createCommand(MIGRATE, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(amount);
+        return createCommand(INCRBY, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, List<V>> mget(K... keys) {
-        notEmpty(keys);
+    Command<K, V, Double> incrbyfloat(K key, double amount) {
+        notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(MGET, new ValueListOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(amount);
+        return createCommand(INCRBYFLOAT, new DoubleOutput<>(codec), args);
     }
 
-    public Command<K, V, List<KeyValue<K, V>>> mgetKeyValue(K... keys) {
-        notEmpty(keys);
+    Command<K, V, String> info() {
+        return createCommand(INFO, new StatusOutput<>(codec));
+    }
+
+    Command<K, V, String> info(String section) {
+        LettuceAssert.notNull(section, "Section " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(MGET, new KeyValueListOutput<K, V>(codec, Arrays.asList(keys)), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(section);
+        return createCommand(INFO, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, List<V>> mget(Iterable<K> keys) {
-        LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
+    Command<K, V, List<K>> keys(K pattern) {
+        LettuceAssert.notNull(pattern, "Pattern " + MUST_NOT_BE_NULL);
+
+        return createCommand(KEYS, new KeyListOutput<>(codec), pattern);
+    }
+
+    Command<K, V, Long> keys(KeyStreamingChannel<K> channel, K pattern) {
+        LettuceAssert.notNull(pattern, "Pattern " + MUST_NOT_BE_NULL);
+        notNull(channel);
+
+        return createCommand(KEYS, new KeyStreamingOutput<>(codec, channel), pattern);
+    }
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(MGET, new ValueListOutput<K, V>(codec), args);
+    Command<K, V, Date> lastsave() {
+        return createCommand(LASTSAVE, new DateOutput<>(codec));
     }
 
-    public Command<K, V, List<KeyValue<K, V>>> mgetKeyValue(Iterable<K> keys) {
+    Command<K, V, V> lindex(K key, long index) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(index);
+        return createCommand(LINDEX, new ValueOutput<>(codec), args);
+    }
+
+    Command<K, V, Long> linsert(K key, boolean before, V pivot, V value) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(key).add(before ? BEFORE : AFTER).addValue(pivot).addValue(value);
+        return createCommand(LINSERT, new IntegerOutput<>(codec), args);
+    }
+
+    Command<K, V, Long> llen(K key) {
+        notNullKey(key);
+
+        return createCommand(LLEN, new IntegerOutput<>(codec), key);
+    }
+
+    Command<K, V, V> lpop(K key) {
+        notNullKey(key);
+
+        return createCommand(LPOP, new ValueOutput<>(codec), key);
+    }
+
+    Command<K, V, Long> lpush(K key, V... values) {
+        notNullKey(key);
+        notEmptyValues(values);
+
+        return createCommand(LPUSH, new IntegerOutput<>(codec), key, values);
+    }
+
+    Command<K, V, Long> lpushx(K key, V... values) {
+        notNullKey(key);
+        notEmptyValues(values);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addValues(values);
+
+        return createCommand(LPUSHX, new IntegerOutput<>(codec), args);
+    }
+
+    Command<K, V, List<V>> lrange(K key, long start, long stop) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(start).add(stop);
+        return createCommand(LRANGE, new ValueListOutput<>(codec), args);
+    }
+
+    Command<K, V, Long> lrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
+        notNullKey(key);
+        notNull(channel);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(start).add(stop);
+        return createCommand(LRANGE, new ValueStreamingOutput<>(codec, channel), args);
+    }
+
+    Command<K, V, Long> lrem(K key, long count, V value) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(count).addValue(value);
+        return createCommand(LREM, new IntegerOutput<>(codec), args);
+    }
+
+    Command<K, V, String> lset(K key, long index, V value) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(index).addValue(value);
+        return createCommand(LSET, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> ltrim(K key, long start, long stop) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(start).add(stop);
+        return createCommand(LTRIM, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, List<V>> mget(K... keys) {
+        notEmpty(keys);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(MGET, new ValueListOutput<>(codec), args);
+    }
+
+    Command<K, V, List<V>> mget(Iterable<K> keys) {
         LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(MGET, new KeyValueListOutput<K, V>(codec, keys), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(MGET, new ValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> mget(ValueStreamingChannel<V> channel, K... keys) {
+    Command<K, V, Long> mget(ValueStreamingChannel<V> channel, K... keys) {
         notEmpty(keys);
         notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(MGET, new ValueStreamingOutput<K, V>(codec, channel), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(MGET, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys) {
+    Command<K, V, Long> mget(KeyValueStreamingChannel<K, V> channel, K... keys) {
         notEmpty(keys);
         notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(MGET, new KeyValueStreamingOutput<K, V>(codec, channel, Arrays.asList(keys)), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(MGET, new KeyValueStreamingOutput<>(codec, channel, Arrays.asList(keys)), args);
     }
 
-    public Command<K, V, Long> mget(ValueStreamingChannel<V> channel, Iterable<K> keys) {
+    Command<K, V, Long> mget(ValueStreamingChannel<V> channel, Iterable<K> keys) {
         LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
         notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(MGET, new ValueStreamingOutput<K, V>(codec, channel), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(MGET, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K> keys) {
+    Command<K, V, Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K> keys) {
         LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
         notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(MGET, new KeyValueStreamingOutput<K, V>(codec, channel, keys), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(MGET, new KeyValueStreamingOutput<>(codec, channel, keys), args);
+    }
+
+    Command<K, V, List<KeyValue<K, V>>> mgetKeyValue(K... keys) {
+        notEmpty(keys);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(MGET, new KeyValueListOutput<>(codec, Arrays.asList(keys)), args);
+    }
+
+    Command<K, V, List<KeyValue<K, V>>> mgetKeyValue(Iterable<K> keys) {
+        LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(MGET, new KeyValueListOutput<>(codec, keys), args);
     }
 
-    public Command<K, V, Boolean> move(K key, int db) {
+    Command<K, V, String> migrate(String host, int port, K key, int db, long timeout) {
+        LettuceAssert.notNull(host, "Host " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(host, "Host " + MUST_NOT_BE_EMPTY);
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(db);
-        return createCommand(MOVE, new BooleanOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.add(host).add(port).addKey(key).add(db).add(timeout);
+        return createCommand(MIGRATE, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, String> migrate(String host, int port, int db, long timeout, MigrateArgs<K> migrateArgs) {
+        LettuceAssert.notNull(host, "Host " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(host, "Host " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.notNull(migrateArgs, "migrateArgs " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+
+        args.add(host).add(port);
+
+        if (migrateArgs.keys.size() == 1) {
+            args.addKey(migrateArgs.keys.get(0));
+        } else {
+            args.add("");
+        }
+
+        args.add(db).add(timeout);
+        migrateArgs.build(args);
+
+        return createCommand(MIGRATE, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, String> multi() {
-        return createCommand(MULTI, new StatusOutput<K, V>(codec));
+    Command<K, V, Boolean> move(K key, int db) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(db);
+        return createCommand(MOVE, new BooleanOutput<>(codec), args);
     }
 
-    public Command<K, V, String> mset(Map<K, V> map) {
+    Command<K, V, String> mset(Map<K, V> map) {
         LettuceAssert.notNull(map, "Map " + MUST_NOT_BE_NULL);
         LettuceAssert.isTrue(!map.isEmpty(), "Map " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(map);
-        return createCommand(MSET, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(map);
+        return createCommand(MSET, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, Boolean> msetnx(Map<K, V> map) {
+    Command<K, V, Boolean> msetnx(Map<K, V> map) {
         LettuceAssert.notNull(map, "Map " + MUST_NOT_BE_NULL);
         LettuceAssert.isTrue(!map.isEmpty(), "Map " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(map);
-        return createCommand(MSETNX, new BooleanOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(map);
+        return createCommand(MSETNX, new BooleanOutput<>(codec), args);
+    }
+
+    Command<K, V, String> multi() {
+        return createCommand(MULTI, new StatusOutput<>(codec));
+    }
+
+    Command<K, V, String> objectEncoding(K key) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(ENCODING).addKey(key);
+        return createCommand(OBJECT, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, Long> objectIdletime(K key) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(IDLETIME).addKey(key);
+        return createCommand(OBJECT, new IntegerOutput<>(codec), args);
+    }
+
+    Command<K, V, Long> objectRefcount(K key) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(REFCOUNT).addKey(key);
+        return createCommand(OBJECT, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, String> objectEncoding(K key) {
+    Command<K, V, Boolean> persist(K key) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(ENCODING).addKey(key);
-        return createCommand(OBJECT, new StatusOutput<K, V>(codec), args);
+        return createCommand(PERSIST, new BooleanOutput<>(codec), key);
     }
 
-    public Command<K, V, Long> objectIdletime(K key) {
+    Command<K, V, Boolean> pexpire(K key, long milliseconds) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(IDLETIME).addKey(key);
-        return createCommand(OBJECT, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(milliseconds);
+        return createCommand(PEXPIRE, new BooleanOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> objectRefcount(K key) {
+    Command<K, V, Boolean> pexpireat(K key, long timestamp) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(REFCOUNT).addKey(key);
-        return createCommand(OBJECT, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(timestamp);
+        return createCommand(PEXPIREAT, new BooleanOutput<>(codec), args);
     }
 
-    public Command<K, V, Boolean> persist(K key) {
+    Command<K, V, Long> pfadd(K key, V value, V... moreValues) {
         notNullKey(key);
+        LettuceAssert.notNull(value, "Value " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(moreValues, "MoreValues " + MUST_NOT_BE_NULL);
+        LettuceAssert.noNullElements(moreValues, "MoreValues " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
 
-        return createCommand(PERSIST, new BooleanOutput<K, V>(codec), key);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addValue(value).addValues(moreValues);
+        return createCommand(PFADD, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Boolean> pexpire(K key, long milliseconds) {
+    Command<K, V, Long> pfadd(K key, V... values) {
         notNullKey(key);
+        notEmptyValues(values);
+        LettuceAssert.noNullElements(values, "Values " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(milliseconds);
-        return createCommand(PEXPIRE, new BooleanOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addValues(values);
+        return createCommand(PFADD, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Boolean> pexpireat(K key, long timestamp) {
+    Command<K, V, Long> pfcount(K key, K... moreKeys) {
         notNullKey(key);
+        LettuceAssert.notNull(moreKeys, "MoreKeys " + MUST_NOT_BE_NULL);
+        LettuceAssert.noNullElements(moreKeys, "MoreKeys " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKeys(moreKeys);
+        return createCommand(PFCOUNT, new IntegerOutput<>(codec), args);
+    }
+
+    Command<K, V, Long> pfcount(K... keys) {
+        notEmpty(keys);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(PFCOUNT, new IntegerOutput<>(codec), args);
+    }
+
+    @SuppressWarnings("unchecked")
+    Command<K, V, String> pfmerge(K destkey, K sourcekey, K... moreSourceKeys) {
+        LettuceAssert.notNull(destkey, "Destkey " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(sourcekey, "Sourcekey " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(moreSourceKeys, "MoreSourceKeys " + MUST_NOT_BE_NULL);
+        LettuceAssert.noNullElements(moreSourceKeys, "MoreSourceKeys " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(timestamp);
-        return createCommand(PEXPIREAT, new BooleanOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(destkey).addKey(sourcekey).addKeys(moreSourceKeys);
+        return createCommand(PFMERGE, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, String> ping() {
-        return createCommand(PING, new StatusOutput<K, V>(codec));
+    @SuppressWarnings("unchecked")
+    Command<K, V, String> pfmerge(K destkey, K... sourcekeys) {
+        LettuceAssert.notNull(destkey, "Destkey " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(sourcekeys, "Sourcekeys " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(sourcekeys, "Sourcekeys " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.noNullElements(sourcekeys, "Sourcekeys " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(destkey).addKeys(sourcekeys);
+        return createCommand(PFMERGE, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, String> readOnly() {
-        return createCommand(READONLY, new StatusOutput<K, V>(codec));
+    Command<K, V, String> ping() {
+        return createCommand(PING, new StatusOutput<>(codec));
     }
 
-    public Command<K, V, String> readWrite() {
-        return createCommand(READWRITE, new StatusOutput<K, V>(codec));
+    Command<K, V, String> psetex(K key, long milliseconds, V value) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(milliseconds).addValue(value);
+        return createCommand(PSETEX, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> pttl(K key) {
+    Command<K, V, Long> pttl(K key) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key);
-        return createCommand(PTTL, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
+        return createCommand(PTTL, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> publish(K channel, V message) {
+    Command<K, V, Long> publish(K channel, V message) {
         LettuceAssert.notNull(channel, "Channel " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(channel).addValue(message);
-        return createCommand(PUBLISH, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(channel).addValue(message);
+        return createCommand(PUBLISH, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, List<K>> pubsubChannels() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(CHANNELS);
-        return createCommand(PUBSUB, new KeyListOutput<K, V>(codec), args);
+    Command<K, V, List<K>> pubsubChannels() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(CHANNELS);
+        return createCommand(PUBSUB, new KeyListOutput<>(codec), args);
     }
 
-    public Command<K, V, List<K>> pubsubChannels(K pattern) {
+    Command<K, V, List<K>> pubsubChannels(K pattern) {
         LettuceAssert.notNull(pattern, "Pattern " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(CHANNELS).addKey(pattern);
-        return createCommand(PUBSUB, new KeyListOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(CHANNELS).addKey(pattern);
+        return createCommand(PUBSUB, new KeyListOutput<>(codec), args);
+    }
+
+    Command<K, V, Long> pubsubNumpat() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(NUMPAT);
+        return createCommand(PUBSUB, new IntegerOutput<>(codec), args);
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public Command<K, V, Map<K, Long>> pubsubNumsub(K... pattern) {
+    Command<K, V, Map<K, Long>> pubsubNumsub(K... pattern) {
         LettuceAssert.notNull(pattern, "Pattern " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(pattern, "Pattern " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(NUMSUB).addKeys(pattern);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(NUMSUB).addKeys(pattern);
         return createCommand(PUBSUB, (MapOutput) new MapOutput<K, Long>((RedisCodec) codec), args);
     }
 
-    public Command<K, V, Long> pubsubNumpat() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(NUMPAT);
-        return createCommand(PUBSUB, new IntegerOutput<K, V>(codec), args);
+    Command<K, V, String> quit() {
+        return createCommand(QUIT, new StatusOutput<>(codec));
     }
 
-    public Command<K, V, String> quit() {
-        return createCommand(QUIT, new StatusOutput<K, V>(codec));
+    Command<K, V, V> randomkey() {
+        return createCommand(RANDOMKEY, new ValueOutput<>(codec));
     }
 
-    public Command<K, V, V> randomkey() {
-        return createCommand(RANDOMKEY, new ValueOutput<K, V>(codec));
+    Command<K, V, String> readOnly() {
+        return createCommand(READONLY, new StatusOutput<>(codec));
     }
 
-    public Command<K, V, List<Object>> role() {
-        return createCommand(ROLE, new ArrayOutput<K, V>(codec));
+    Command<K, V, String> readWrite() {
+        return createCommand(READWRITE, new StatusOutput<>(codec));
     }
 
-    public Command<K, V, String> rename(K key, K newKey) {
+    Command<K, V, String> rename(K key, K newKey) {
         notNullKey(key);
         LettuceAssert.notNull(newKey, "NewKey " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKey(newKey);
-        return createCommand(RENAME, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKey(newKey);
+        return createCommand(RENAME, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, Boolean> renamenx(K key, K newKey) {
+    Command<K, V, Boolean> renamenx(K key, K newKey) {
         notNullKey(key);
         LettuceAssert.notNull(newKey, "NewKey " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKey(newKey);
-        return createCommand(RENAMENX, new BooleanOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKey(newKey);
+        return createCommand(RENAMENX, new BooleanOutput<>(codec), args);
     }
 
-    public Command<K, V, String> restore(K key, long ttl, byte[] value) {
+    Command<K, V, String> restore(K key, long ttl, byte[] value) {
         notNullKey(key);
         LettuceAssert.notNull(value, "Value " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(ttl).add(value);
-        return createCommand(RESTORE, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(ttl).add(value);
+        return createCommand(RESTORE, new StatusOutput<>(codec), args);
+    }
+
+    Command<K, V, List<Object>> role() {
+        return createCommand(ROLE, new ArrayOutput<>(codec));
     }
 
-    public Command<K, V, V> rpop(K key) {
+    Command<K, V, V> rpop(K key) {
         notNullKey(key);
 
-        return createCommand(RPOP, new ValueOutput<K, V>(codec), key);
+        return createCommand(RPOP, new ValueOutput<>(codec), key);
     }
 
-    public Command<K, V, V> rpoplpush(K source, K destination) {
+    Command<K, V, V> rpoplpush(K source, K destination) {
         LettuceAssert.notNull(source, "Source " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(source).addKey(destination);
-        return createCommand(RPOPLPUSH, new ValueOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(source).addKey(destination);
+        return createCommand(RPOPLPUSH, new ValueOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> rpush(K key, V... values) {
+    Command<K, V, Long> rpush(K key, V... values) {
         notNullKey(key);
         notEmptyValues(values);
 
-        return createCommand(RPUSH, new IntegerOutput<K, V>(codec), key, values);
+        return createCommand(RPUSH, new IntegerOutput<>(codec), key, values);
     }
 
-    public Command<K, V, Long> rpushx(K key, V... values) {
+    Command<K, V, Long> rpushx(K key, V... values) {
         notNullKey(key);
         notEmptyValues(values);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValues(values);
-        return createCommand(RPUSHX, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addValues(values);
+        return createCommand(RPUSHX, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> sadd(K key, V... members) {
+    Command<K, V, Long> sadd(K key, V... members) {
         notNullKey(key);
         LettuceAssert.notNull(members, "Members " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(members, "Members " + MUST_NOT_BE_EMPTY);
 
-        return createCommand(SADD, new IntegerOutput<K, V>(codec), key, members);
+        return createCommand(SADD, new IntegerOutput<>(codec), key, members);
+    }
+
+    Command<K, V, String> save() {
+        return createCommand(SAVE, new StatusOutput<>(codec));
+    }
+
+    Command<K, V, KeyScanCursor<K>> scan() {
+        return scan(ScanCursor.INITIAL, null);
+    }
+
+    Command<K, V, KeyScanCursor<K>> scan(ScanCursor scanCursor) {
+        return scan(scanCursor, null);
+    }
+
+    Command<K, V, KeyScanCursor<K>> scan(ScanArgs scanArgs) {
+        return scan(ScanCursor.INITIAL, scanArgs);
+    }
+
+    Command<K, V, KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs) {
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+
+        scanArgs(scanCursor, scanArgs, args);
+
+        KeyScanOutput<K, V> output = new KeyScanOutput<>(codec);
+        return createCommand(SCAN, output, args);
+    }
+
+    protected void scanArgs(ScanCursor scanCursor, ScanArgs scanArgs, CommandArgs<K, V> args) {
+        LettuceAssert.notNull(scanCursor, "ScanCursor " + MUST_NOT_BE_NULL);
+        LettuceAssert.isTrue(!scanCursor.isFinished(), "ScanCursor must not be finished");
+
+        args.add(scanCursor.getCursor());
+
+        if (scanArgs != null) {
+            scanArgs.build(args);
+        }
+    }
+
+    Command<K, V, StreamScanCursor> scanStreaming(KeyStreamingChannel<K> channel) {
+        notNull(channel);
+        LettuceAssert.notNull(channel, "KeyStreamingChannel " + MUST_NOT_BE_NULL);
+
+        return scanStreaming(channel, ScanCursor.INITIAL, null);
+    }
+
+    Command<K, V, StreamScanCursor> scanStreaming(KeyStreamingChannel<K> channel, ScanCursor scanCursor) {
+        notNull(channel);
+        LettuceAssert.notNull(channel, "KeyStreamingChannel " + MUST_NOT_BE_NULL);
+
+        return scanStreaming(channel, scanCursor, null);
+    }
+
+    Command<K, V, StreamScanCursor> scanStreaming(KeyStreamingChannel<K> channel, ScanArgs scanArgs) {
+        notNull(channel);
+        LettuceAssert.notNull(channel, "KeyStreamingChannel " + MUST_NOT_BE_NULL);
+
+        return scanStreaming(channel, ScanCursor.INITIAL, scanArgs);
     }
 
-    public Command<K, V, String> save() {
-        return createCommand(SAVE, new StatusOutput<K, V>(codec));
+    Command<K, V, StreamScanCursor> scanStreaming(KeyStreamingChannel<K> channel, ScanCursor scanCursor, ScanArgs scanArgs) {
+        notNull(channel);
+        LettuceAssert.notNull(channel, "KeyStreamingChannel " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        scanArgs(scanCursor, scanArgs, args);
+
+        KeyScanStreamingOutput<K, V> output = new KeyScanStreamingOutput<>(codec, channel);
+        return createCommand(SCAN, output, args);
     }
 
-    public Command<K, V, Long> scard(K key) {
+    Command<K, V, Long> scard(K key) {
         notNullKey(key);
 
-        return createCommand(SCARD, new IntegerOutput<K, V>(codec), key);
+        return createCommand(SCARD, new IntegerOutput<>(codec), key);
     }
 
-    public Command<K, V, List<Boolean>> scriptExists(String... digests) {
+    Command<K, V, List<Boolean>> scriptExists(String... digests) {
         LettuceAssert.notNull(digests, "Digests " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(digests, "Digests " + MUST_NOT_BE_EMPTY);
         LettuceAssert.noNullElements(digests, "Digests " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(EXISTS);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(EXISTS);
         for (String sha : digests) {
             args.add(sha);
         }
-        return createCommand(SCRIPT, new BooleanListOutput<K, V>(codec), args);
+        return createCommand(SCRIPT, new BooleanListOutput<>(codec), args);
     }
 
-    public Command<K, V, String> scriptFlush() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(FLUSH);
-        return createCommand(SCRIPT, new StatusOutput<K, V>(codec), args);
+    Command<K, V, String> scriptFlush() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(FLUSH);
+        return createCommand(SCRIPT, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, String> scriptKill() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(KILL);
-        return createCommand(SCRIPT, new StatusOutput<K, V>(codec), args);
+    Command<K, V, String> scriptKill() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(KILL);
+        return createCommand(SCRIPT, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, String> scriptLoad(V script) {
+    Command<K, V, String> scriptLoad(V script) {
         LettuceAssert.notNull(script, "Script " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(LOAD).addValue(script);
-        return createCommand(SCRIPT, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(LOAD).addValue(script);
+        return createCommand(SCRIPT, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, Set<V>> sdiff(K... keys) {
+    Command<K, V, Set<V>> sdiff(K... keys) {
         notEmpty(keys);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(SDIFF, new ValueSetOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(SDIFF, new ValueSetOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> sdiff(ValueStreamingChannel<V> channel, K... keys) {
+    Command<K, V, Long> sdiff(ValueStreamingChannel<V> channel, K... keys) {
         notEmpty(keys);
         notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(SDIFF, new ValueStreamingOutput<K, V>(codec, channel), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(SDIFF, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, Long> sdiffstore(K destination, K... keys) {
+    Command<K, V, Long> sdiffstore(K destination, K... keys) {
         notEmpty(keys);
         LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(destination).addKeys(keys);
-        return createCommand(SDIFFSTORE, new IntegerOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> select(int db) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(db);
-        return createCommand(SELECT, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(destination).addKeys(keys);
+        return createCommand(SDIFFSTORE, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, String> swapdb(int db1, int db2) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(db1).add(db2);
-        return createCommand(SWAPDB, new StatusOutput<K, V>(codec), args);
+    Command<K, V, String> select(int db) {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(db);
+        return createCommand(SELECT, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, String> set(K key, V value) {
+    Command<K, V, String> set(K key, V value) {
         notNullKey(key);
 
-        return createCommand(SET, new StatusOutput<K, V>(codec), key, value);
+        return createCommand(SET, new StatusOutput<>(codec), key, value);
     }
 
-    public Command<K, V, String> set(K key, V value, SetArgs setArgs) {
+    Command<K, V, String> set(K key, V value, SetArgs setArgs) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValue(value);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addValue(value);
         setArgs.build(args);
-        return createCommand(SET, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, Long> setbit(K key, long offset, int value) {
-        notNullKey(key);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(offset).add(value);
-        return createCommand(SETBIT, new IntegerOutput<K, V>(codec), args);
+        return createCommand(SET, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, String> setex(K key, long seconds, V value) {
+    Command<K, V, Long> setbit(K key, long offset, int value) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(seconds).addValue(value);
-        return createCommand(SETEX, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(offset).add(value);
+        return createCommand(SETBIT, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, String> psetex(K key, long milliseconds, V value) {
+    Command<K, V, String> setex(K key, long seconds, V value) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(milliseconds).addValue(value);
-        return createCommand(PSETEX, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(seconds).addValue(value);
+        return createCommand(SETEX, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, Boolean> setnx(K key, V value) {
+    Command<K, V, Boolean> setnx(K key, V value) {
         notNullKey(key);
-        return createCommand(SETNX, new BooleanOutput<K, V>(codec), key, value);
+        return createCommand(SETNX, new BooleanOutput<>(codec), key, value);
     }
 
-    public Command<K, V, Long> setrange(K key, long offset, V value) {
+    Command<K, V, Long> setrange(K key, long offset, V value) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(offset).addValue(value);
-        return createCommand(SETRANGE, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(offset).addValue(value);
+        return createCommand(SETRANGE, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, String> shutdown(boolean save) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        return createCommand(SHUTDOWN, new StatusOutput<K, V>(codec), save ? args.add(SAVE) : args.add(NOSAVE));
+    Command<K, V, String> shutdown(boolean save) {
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        return createCommand(SHUTDOWN, new StatusOutput<>(codec), save ? args.add(SAVE) : args.add(NOSAVE));
     }
 
-    public Command<K, V, Set<V>> sinter(K... keys) {
+    Command<K, V, Set<V>> sinter(K... keys) {
         notEmpty(keys);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(SINTER, new ValueSetOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(SINTER, new ValueSetOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> sinter(ValueStreamingChannel<V> channel, K... keys) {
+    Command<K, V, Long> sinter(ValueStreamingChannel<V> channel, K... keys) {
         notEmpty(keys);
         notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(SINTER, new ValueStreamingOutput<K, V>(codec, channel), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(SINTER, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, Long> sinterstore(K destination, K... keys) {
+    Command<K, V, Long> sinterstore(K destination, K... keys) {
         LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
         notEmpty(keys);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(destination).addKeys(keys);
-        return createCommand(SINTERSTORE, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(destination).addKeys(keys);
+        return createCommand(SINTERSTORE, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Boolean> sismember(K key, V member) {
+    Command<K, V, Boolean> sismember(K key, V member) {
         notNullKey(key);
-        return createCommand(SISMEMBER, new BooleanOutput<K, V>(codec), key, member);
-    }
-
-    public Command<K, V, Boolean> smove(K source, K destination, V member) {
-        LettuceAssert.notNull(source, "Source " + MUST_NOT_BE_NULL);
-        LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(source).addKey(destination).addValue(member);
-        return createCommand(SMOVE, new BooleanOutput<K, V>(codec), args);
+        return createCommand(SISMEMBER, new BooleanOutput<>(codec), key, member);
     }
 
-    public Command<K, V, String> slaveof(String host, int port) {
+    Command<K, V, String> slaveof(String host, int port) {
         LettuceAssert.notNull(host, "Host " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(host, "Host " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(host).add(port);
-        return createCommand(SLAVEOF, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(host).add(port);
+        return createCommand(SLAVEOF, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, String> slaveofNoOne() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(NO).add(ONE);
-        return createCommand(SLAVEOF, new StatusOutput<K, V>(codec), args);
+    Command<K, V, String> slaveofNoOne() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(NO).add(ONE);
+        return createCommand(SLAVEOF, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, List<Object>> slowlogGet() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(GET);
-        return createCommand(SLOWLOG, new NestedMultiOutput<K, V>(codec), args);
+    Command<K, V, List<Object>> slowlogGet() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(GET);
+        return createCommand(SLOWLOG, new NestedMultiOutput<>(codec), args);
     }
 
-    public Command<K, V, List<Object>> slowlogGet(int count) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(GET).add(count);
-        return createCommand(SLOWLOG, new NestedMultiOutput<K, V>(codec), args);
+    Command<K, V, List<Object>> slowlogGet(int count) {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(GET).add(count);
+        return createCommand(SLOWLOG, new NestedMultiOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> slowlogLen() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(LEN);
-        return createCommand(SLOWLOG, new IntegerOutput<K, V>(codec), args);
+    Command<K, V, Long> slowlogLen() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(LEN);
+        return createCommand(SLOWLOG, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, String> slowlogReset() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(RESET);
-        return createCommand(SLOWLOG, new StatusOutput<K, V>(codec), args);
+    Command<K, V, String> slowlogReset() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(RESET);
+        return createCommand(SLOWLOG, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, Set<V>> smembers(K key) {
+    Command<K, V, Set<V>> smembers(K key) {
         notNullKey(key);
 
-        return createCommand(SMEMBERS, new ValueSetOutput<K, V>(codec), key);
+        return createCommand(SMEMBERS, new ValueSetOutput<>(codec), key);
     }
 
-    public Command<K, V, Long> smembers(ValueStreamingChannel<V> channel, K key) {
+    Command<K, V, Long> smembers(ValueStreamingChannel<V> channel, K key) {
         notNullKey(key);
         notNull(channel);
 
-        return createCommand(SMEMBERS, new ValueStreamingOutput<K, V>(codec, channel), key);
+        return createCommand(SMEMBERS, new ValueStreamingOutput<>(codec, channel), key);
     }
 
-    public Command<K, V, List<V>> sort(K key) {
+    Command<K, V, Boolean> smove(K source, K destination, V member) {
+        LettuceAssert.notNull(source, "Source " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(source).addKey(destination).addValue(member);
+        return createCommand(SMOVE, new BooleanOutput<>(codec), args);
+    }
+
+    Command<K, V, List<V>> sort(K key) {
         notNullKey(key);
 
-        return createCommand(SORT, new ValueListOutput<K, V>(codec), key);
+        return createCommand(SORT, new ValueListOutput<>(codec), key);
     }
 
-    public Command<K, V, List<V>> sort(K key, SortArgs sortArgs) {
+    Command<K, V, List<V>> sort(K key, SortArgs sortArgs) {
         notNullKey(key);
         LettuceAssert.notNull(sortArgs, "SortArgs " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
         sortArgs.build(args, null);
-        return createCommand(SORT, new ValueListOutput<K, V>(codec), args);
+        return createCommand(SORT, new ValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> sort(ValueStreamingChannel<V> channel, K key) {
+    Command<K, V, Long> sort(ValueStreamingChannel<V> channel, K key) {
         notNullKey(key);
         notNull(channel);
 
-        return createCommand(SORT, new ValueStreamingOutput<K, V>(codec, channel), key);
+        return createCommand(SORT, new ValueStreamingOutput<>(codec, channel), key);
     }
 
-    public Command<K, V, Long> sort(ValueStreamingChannel<V> channel, K key, SortArgs sortArgs) {
+    Command<K, V, Long> sort(ValueStreamingChannel<V> channel, K key, SortArgs sortArgs) {
         notNullKey(key);
         notNull(channel);
         LettuceAssert.notNull(sortArgs, "SortArgs " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
         sortArgs.build(args, null);
-        return createCommand(SORT, new ValueStreamingOutput<K, V>(codec, channel), args);
+        return createCommand(SORT, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, Long> sortStore(K key, SortArgs sortArgs, K destination) {
+    Command<K, V, Long> sortStore(K key, SortArgs sortArgs, K destination) {
         notNullKey(key);
         LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(sortArgs, "SortArgs " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
         sortArgs.build(args, destination);
-        return createCommand(SORT, new IntegerOutput<K, V>(codec), args);
+        return createCommand(SORT, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, V> spop(K key) {
+    Command<K, V, V> spop(K key) {
         notNullKey(key);
 
-        return createCommand(SPOP, new ValueOutput<K, V>(codec), key);
+        return createCommand(SPOP, new ValueOutput<>(codec), key);
     }
 
-    public Command<K, V, Set<V>> spop(K key, long count) {
+    Command<K, V, Set<V>> spop(K key, long count) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(count);
-        return createCommand(SPOP, new ValueSetOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(count);
+        return createCommand(SPOP, new ValueSetOutput<>(codec), args);
     }
 
-    public Command<K, V, V> srandmember(K key) {
+    Command<K, V, V> srandmember(K key) {
         notNullKey(key);
 
-        return createCommand(SRANDMEMBER, new ValueOutput<K, V>(codec), key);
+        return createCommand(SRANDMEMBER, new ValueOutput<>(codec), key);
     }
 
-    public Command<K, V, List<V>> srandmember(K key, long count) {
+    Command<K, V, List<V>> srandmember(K key, long count) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(count);
-        return createCommand(SRANDMEMBER, new ValueListOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(count);
+        return createCommand(SRANDMEMBER, new ValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> srandmember(ValueStreamingChannel<V> channel, K key, long count) {
+    Command<K, V, Long> srandmember(ValueStreamingChannel<V> channel, K key, long count) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(count);
-        return createCommand(SRANDMEMBER, new ValueStreamingOutput<K, V>(codec, channel), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(count);
+        return createCommand(SRANDMEMBER, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, Long> srem(K key, V... members) {
+    Command<K, V, Long> srem(K key, V... members) {
         notNullKey(key);
         LettuceAssert.notNull(members, "Members " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(members, "Members " + MUST_NOT_BE_EMPTY);
 
-        return createCommand(SREM, new IntegerOutput<K, V>(codec), key, members);
+        return createCommand(SREM, new IntegerOutput<>(codec), key, members);
+    }
+
+    Command<K, V, ValueScanCursor<V>> sscan(K key) {
+        notNullKey(key);
+
+        return sscan(key, ScanCursor.INITIAL, null);
+    }
+
+    Command<K, V, ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor) {
+        notNullKey(key);
+
+        return sscan(key, scanCursor, null);
+    }
+
+    Command<K, V, ValueScanCursor<V>> sscan(K key, ScanArgs scanArgs) {
+        notNullKey(key);
+
+        return sscan(key, ScanCursor.INITIAL, scanArgs);
+    }
+
+    Command<K, V, ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(key);
+
+        scanArgs(scanCursor, scanArgs, args);
+
+        ValueScanOutput<K, V> output = new ValueScanOutput<>(codec);
+        return createCommand(SSCAN, output, args);
+    }
+
+    Command<K, V, StreamScanCursor> sscanStreaming(ValueStreamingChannel<V> channel, K key) {
+        notNullKey(key);
+        notNull(channel);
+
+        return sscanStreaming(channel, key, ScanCursor.INITIAL, null);
+    }
+
+    Command<K, V, StreamScanCursor> sscanStreaming(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
+        notNullKey(key);
+        notNull(channel);
+
+        return sscanStreaming(channel, key, scanCursor, null);
+    }
+
+    Command<K, V, StreamScanCursor> sscanStreaming(ValueStreamingChannel<V> channel, K key, ScanArgs scanArgs) {
+        notNullKey(key);
+        notNull(channel);
+
+        return sscanStreaming(channel, key, ScanCursor.INITIAL, scanArgs);
+    }
+
+    Command<K, V, StreamScanCursor> sscanStreaming(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor,
+            ScanArgs scanArgs) {
+        notNullKey(key);
+        notNull(channel);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+
+        args.addKey(key);
+        scanArgs(scanCursor, scanArgs, args);
+
+        ValueScanStreamingOutput<K, V> output = new ValueScanStreamingOutput<>(codec, channel);
+        return createCommand(SSCAN, output, args);
+    }
+
+    Command<K, V, Long> strlen(K key) {
+        notNullKey(key);
+
+        return createCommand(STRLEN, new IntegerOutput<>(codec), key);
     }
 
-    public Command<K, V, Set<V>> sunion(K... keys) {
+    Command<K, V, Set<V>> sunion(K... keys) {
         notEmpty(keys);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(SUNION, new ValueSetOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(SUNION, new ValueSetOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> sunion(ValueStreamingChannel<V> channel, K... keys) {
+    Command<K, V, Long> sunion(ValueStreamingChannel<V> channel, K... keys) {
         notEmpty(keys);
         notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(SUNION, new ValueStreamingOutput<K, V>(codec, channel), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(SUNION, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, Long> sunionstore(K destination, K... keys) {
+    Command<K, V, Long> sunionstore(K destination, K... keys) {
         LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
         notEmpty(keys);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(destination).addKeys(keys);
-        return createCommand(SUNIONSTORE, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(destination).addKeys(keys);
+        return createCommand(SUNIONSTORE, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, String> sync() {
-        return createCommand(SYNC, new StatusOutput<K, V>(codec));
+    Command<K, V, String> swapdb(int db1, int db2) {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(db1).add(db2);
+        return createCommand(SWAPDB, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> strlen(K key) {
-        notNullKey(key);
+    Command<K, V, String> sync() {
+        return createCommand(SYNC, new StatusOutput<>(codec));
+    }
 
-        return createCommand(STRLEN, new IntegerOutput<K, V>(codec), key);
+    Command<K, V, List<V>> time() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        return createCommand(TIME, new ValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> touch(K... keys) {
+    Command<K, V, Long> touch(K... keys) {
         notEmpty(keys);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(TOUCH, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(TOUCH, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> touch(Iterable<K> keys) {
+    Command<K, V, Long> touch(Iterable<K> keys) {
         LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(TOUCH, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(TOUCH, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> ttl(K key) {
+    Command<K, V, Long> ttl(K key) {
         notNullKey(key);
 
-        return createCommand(TTL, new IntegerOutput<K, V>(codec), key);
+        return createCommand(TTL, new IntegerOutput<>(codec), key);
     }
 
-    public Command<K, V, String> type(K key) {
+    Command<K, V, String> type(K key) {
         notNullKey(key);
 
-        return createCommand(TYPE, new StatusOutput<K, V>(codec), key);
+        return createCommand(TYPE, new StatusOutput<>(codec), key);
     }
 
-    public Command<K, V, String> watch(K... keys) {
+    Command<K, V, Long> unlink(K... keys) {
         notEmpty(keys);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(WATCH, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(UNLINK, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> wait(int replicas, long timeout) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(replicas).add(timeout);
+    Command<K, V, Long> unlink(Iterable<K> keys) {
+        LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
 
-        return createCommand(WAIT, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(UNLINK, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, String> unwatch() {
-        return createCommand(UNWATCH, new StatusOutput<K, V>(codec));
+    Command<K, V, String> unwatch() {
+        return createCommand(UNWATCH, new StatusOutput<>(codec));
     }
 
-    public Command<K, V, Long> zadd(K key, ZAddArgs zAddArgs, double score, V member) {
-        notNullKey(key);
+    Command<K, V, Long> wait(int replicas, long timeout) {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(replicas).add(timeout);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key);
+        return createCommand(WAIT, new IntegerOutput<>(codec), args);
+    }
 
-        if (zAddArgs != null) {
-            zAddArgs.build(args);
-        }
-        args.add(score).addValue(member);
+    Command<K, V, String> watch(K... keys) {
+        notEmpty(keys);
 
-        return createCommand(ZADD, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);
+        return createCommand(WATCH, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, Double> zaddincr(K key, ZAddArgs zAddArgs, double score, V member) {
+    Command<K, V, Long> zadd(K key, ZAddArgs zAddArgs, double score, V member) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
 
         if (zAddArgs != null) {
             zAddArgs.build(args);
         }
-
-        args.add(INCR);
         args.add(score).addValue(member);
 
-        return createCommand(ZADD, new DoubleOutput<K, V>(codec), args);
+        return createCommand(ZADD, new IntegerOutput<>(codec), args);
     }
 
     @SuppressWarnings("unchecked")
-    public Command<K, V, Long> zadd(K key, ZAddArgs zAddArgs, Object... scoresAndValues) {
+    Command<K, V, Long> zadd(K key, ZAddArgs zAddArgs, Object... scoresAndValues) {
         notNullKey(key);
         LettuceAssert.notNull(scoresAndValues, "ScoresAndValues " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(scoresAndValues, "ScoresAndValues " + MUST_NOT_BE_EMPTY);
         LettuceAssert.noNullElements(scoresAndValues, "ScoresAndValues " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
 
         if (zAddArgs != null) {
             zAddArgs.build(args);
@@ -1510,464 +2072,532 @@ public Command<K, V, Long> zadd(K key, ZAddArgs zAddArgs, Object... scoresAndVal
             }
         }
 
-        return createCommand(ZADD, new IntegerOutput<K, V>(codec), args);
+        return createCommand(ZADD, new IntegerOutput<>(codec), args);
     }
 
-    private boolean allElementsInstanceOf(Object[] objects, Class<?> expectedAssignableType) {
+    Command<K, V, Double> zaddincr(K key, ZAddArgs zAddArgs, double score, V member) {
+        notNullKey(key);
 
-        for (Object object : objects) {
-            if (!expectedAssignableType.isAssignableFrom(object.getClass())) {
-                return false;
-            }
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
+
+        if (zAddArgs != null) {
+            zAddArgs.build(args);
         }
 
-        return true;
+        args.add(INCR);
+        args.add(score).addValue(member);
+
+        return createCommand(ZADD, new DoubleOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> zcard(K key) {
+    Command<K, V, Long> zcard(K key) {
         notNullKey(key);
 
-        return createCommand(ZCARD, new IntegerOutput<K, V>(codec), key);
+        return createCommand(ZCARD, new IntegerOutput<>(codec), key);
     }
 
-    public Command<K, V, Long> zcount(K key, double min, double max) {
+    Command<K, V, Long> zcount(K key, double min, double max) {
         return zcount(key, string(min), string(max));
     }
 
-    public Command<K, V, Long> zcount(K key, String min, String max) {
+    Command<K, V, Long> zcount(K key, String min, String max) {
         notNullKey(key);
         notNullMinMax(min, max);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(min).add(max);
-        return createCommand(ZCOUNT, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(min).add(max);
+        return createCommand(ZCOUNT, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> zcount(K key, Range<? extends Number> range) {
+    Command<K, V, Long> zcount(K key, Range<? extends Number> range) {
         notNullKey(key);
         notNullRange(range);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(min(range)).add(max(range));
-        return createCommand(ZCOUNT, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(min(range)).add(max(range));
+        return createCommand(ZCOUNT, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Double> zincrby(K key, double amount, K member) {
+    Command<K, V, Double> zincrby(K key, double amount, K member) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(amount).addKey(member);
-        return createCommand(ZINCRBY, new DoubleOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(amount).addKey(member);
+        return createCommand(ZINCRBY, new DoubleOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> zinterstore(K destination, K... keys) {
+    Command<K, V, Long> zinterstore(K destination, K... keys) {
         notEmpty(keys);
 
         return zinterstore(destination, new ZStoreArgs(), keys);
     }
 
-    public Command<K, V, Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys) {
+    Command<K, V, Long> zinterstore(K destination, ZStoreArgs storeArgs, K... keys) {
         LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(storeArgs, "ZStoreArgs " + MUST_NOT_BE_NULL);
         notEmpty(keys);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(destination).add(keys.length).addKeys(keys);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(destination).add(keys.length).addKeys(keys);
         storeArgs.build(args);
-        return createCommand(ZINTERSTORE, new IntegerOutput<K, V>(codec), args);
+        return createCommand(ZINTERSTORE, new IntegerOutput<>(codec), args);
+    }
+
+    RedisCommand<K, V, Long> zlexcount(K key, String min, String max) {
+        notNullKey(key);
+        notNullMinMax(min, max);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(key).add(min).add(max);
+        return createCommand(ZLEXCOUNT, new IntegerOutput<>(codec), args);
+    }
+
+    RedisCommand<K, V, Long> zlexcount(K key, Range<? extends V> range) {
+        notNullKey(key);
+        notNullRange(range);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(key).add(minValue(range)).add(maxValue(range));
+        return createCommand(ZLEXCOUNT, new IntegerOutput<>(codec), args);
+    }
+
+    Command<K, V, List<V>> zrange(K key, long start, long stop) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(start).add(stop);
+        return createCommand(ZRANGE, new ValueListOutput<>(codec), args);
+    }
+
+    Command<K, V, Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(start).add(stop);
+        return createCommand(ZRANGE, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, List<V>> zrange(K key, long start, long stop) {
+    Command<K, V, List<ScoredValue<V>>> zrangeWithScores(K key, long start, long stop) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(start).add(stop);
-        return createCommand(ZRANGE, new ValueListOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(key).add(start).add(stop).add(WITHSCORES);
+        return createCommand(ZRANGE, new ScoredValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, List<ScoredValue<V>>> zrangeWithScores(K key, long start, long stop) {
+    Command<K, V, Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
         notNullKey(key);
+        notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.addKey(key).add(start).add(stop).add(WITHSCORES);
-        return createCommand(ZRANGE, new ScoredValueListOutput<K, V>(codec), args);
+        return createCommand(ZRANGE, new ScoredValueStreamingOutput<>(codec, channel), args);
+    }
+
+    RedisCommand<K, V, List<V>> zrangebylex(K key, String min, String max) {
+        notNullKey(key);
+        notNullMinMax(min, max);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(key).add(min).add(max);
+        return createCommand(ZRANGEBYLEX, new ValueListOutput<>(codec), args);
+    }
+
+    RedisCommand<K, V, List<V>> zrangebylex(K key, String min, String max, long offset, long count) {
+        notNullKey(key);
+        notNullMinMax(min, max);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        addLimit(args.addKey(key).add(min).add(max), Limit.create(offset, count));
+        return createCommand(ZRANGEBYLEX, new ValueListOutput<>(codec), args);
+    }
+
+    RedisCommand<K, V, List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit) {
+        notNullKey(key);
+        notNullRange(range);
+        notNullLimit(limit);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        addLimit(args.addKey(key).add(minValue(range)).add(maxValue(range)), limit);
+        return createCommand(ZRANGEBYLEX, new ValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, List<V>> zrangebyscore(K key, double min, double max) {
+    Command<K, V, List<V>> zrangebyscore(K key, double min, double max) {
         return zrangebyscore(key, string(min), string(max));
     }
 
-    public Command<K, V, List<V>> zrangebyscore(K key, String min, String max) {
+    Command<K, V, List<V>> zrangebyscore(K key, String min, String max) {
         notNullKey(key);
         notNullMinMax(min, max);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(min).add(max);
-        return createCommand(ZRANGEBYSCORE, new ValueListOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(min).add(max);
+        return createCommand(ZRANGEBYSCORE, new ValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, List<V>> zrangebyscore(K key, double min, double max, long offset, long count) {
+    Command<K, V, List<V>> zrangebyscore(K key, double min, double max, long offset, long count) {
         return zrangebyscore(key, string(min), string(max), offset, count);
     }
 
-    public Command<K, V, List<V>> zrangebyscore(K key, String min, String max, long offset, long count) {
+    Command<K, V, List<V>> zrangebyscore(K key, String min, String max, long offset, long count) {
         notNullKey(key);
         notNullMinMax(min, max);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.addKey(key).add(min).add(max).add(LIMIT).add(offset).add(count);
-        return createCommand(ZRANGEBYSCORE, new ValueListOutput<K, V>(codec), args);
+        return createCommand(ZRANGEBYSCORE, new ValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, List<V>> zrangebyscore(K key, Range<? extends Number> range, Limit limit) {
+    Command<K, V, List<V>> zrangebyscore(K key, Range<? extends Number> range, Limit limit) {
         notNullKey(key);
         notNullRange(range);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.addKey(key).add(min(range)).add(max(range));
 
         if (limit.isLimited()) {
             args.add(LIMIT).add(limit.getOffset()).add(limit.getCount());
         }
-        return createCommand(ZRANGEBYSCORE, new ValueListOutput<K, V>(codec), args);
+        return createCommand(ZRANGEBYSCORE, new ValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max) {
-        return zrangebyscoreWithScores(key, string(min), string(max));
+    Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max) {
+        return zrangebyscore(channel, key, string(min), string(max));
     }
 
-    public Command<K, V, List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max) {
+    Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max) {
         notNullKey(key);
         notNullMinMax(min, max);
+        LettuceAssert.notNull(channel, "ScoredValueStreamingChannel " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(min).add(max).add(WITHSCORES);
-        return createCommand(ZRANGEBYSCORE, new ScoredValueListOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(min).add(max);
+        return createCommand(ZRANGEBYSCORE, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count) {
-        return zrangebyscoreWithScores(key, string(min), string(max), offset, count);
+    Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset,
+            long count) {
+        return zrangebyscore(channel, key, string(min), string(max), offset, count);
     }
 
-    public Command<K, V, List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count) {
+    Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset,
+            long count) {
         notNullKey(key);
         notNullMinMax(min, max);
+        LettuceAssert.notNull(channel, "ScoredValueStreamingChannel " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        addLimit(args.addKey(key).add(min).add(max).add(WITHSCORES), Limit.create(offset, count));
-        return createCommand(ZRANGEBYSCORE, new ScoredValueListOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        addLimit(args.addKey(key).add(min).add(max), Limit.create(offset, count));
+        return createCommand(ZRANGEBYSCORE, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
+    Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
         notNullKey(key);
         notNullRange(range);
         notNullLimit(limit);
+        LettuceAssert.notNull(channel, "ScoredValueStreamingChannel " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        addLimit(args.addKey(key).add(min(range)).add(max(range)).add(WITHSCORES), limit);
-        return createCommand(ZRANGEBYSCORE, new ScoredValueListOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, Long> zrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(start).add(stop);
-        return createCommand(ZRANGE, new ValueStreamingOutput<K, V>(codec, channel), args);
-    }
-
-    public Command<K, V, Long> zrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
-        notNullKey(key);
-        notNull(channel);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(start).add(stop).add(WITHSCORES);
-        return createCommand(ZRANGE, new ScoredValueStreamingOutput<K, V>(codec, channel), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        addLimit(args.addKey(key).add(min(range)).add(max(range)), limit);
+        return createCommand(ZRANGEBYSCORE, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max) {
-        return zrangebyscore(channel, key, string(min), string(max));
+    Command<K, V, List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max) {
+        return zrangebyscoreWithScores(key, string(min), string(max));
     }
 
-    public Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max) {
+    Command<K, V, List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max) {
         notNullKey(key);
         notNullMinMax(min, max);
-        LettuceAssert.notNull(channel, "ScoredValueStreamingChannel " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(min).add(max);
-        return createCommand(ZRANGEBYSCORE, new ValueStreamingOutput<K, V>(codec, channel), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(key).add(min).add(max).add(WITHSCORES);
+        return createCommand(ZRANGEBYSCORE, new ScoredValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset,
-            long count) {
-        return zrangebyscore(channel, key, string(min), string(max), offset, count);
+    Command<K, V, List<ScoredValue<V>>> zrangebyscoreWithScores(K key, double min, double max, long offset, long count) {
+        return zrangebyscoreWithScores(key, string(min), string(max), offset, count);
     }
 
-    public Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset,
-            long count) {
+    Command<K, V, List<ScoredValue<V>>> zrangebyscoreWithScores(K key, String min, String max, long offset, long count) {
         notNullKey(key);
         notNullMinMax(min, max);
-        LettuceAssert.notNull(channel, "ScoredValueStreamingChannel " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        addLimit(args.addKey(key).add(min).add(max), Limit.create(offset, count));
-        return createCommand(ZRANGEBYSCORE, new ValueStreamingOutput<K, V>(codec, channel), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        addLimit(args.addKey(key).add(min).add(max).add(WITHSCORES), Limit.create(offset, count));
+        return createCommand(ZRANGEBYSCORE, new ScoredValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
+    Command<K, V, List<ScoredValue<V>>> zrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
         notNullKey(key);
         notNullRange(range);
         notNullLimit(limit);
-        LettuceAssert.notNull(channel, "ScoredValueStreamingChannel " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        addLimit(args.addKey(key).add(min(range)).add(max(range)), limit);
-        return createCommand(ZRANGEBYSCORE, new ValueStreamingOutput<K, V>(codec, channel), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        addLimit(args.addKey(key).add(min(range)).add(max(range)).add(WITHSCORES), limit);
+        return createCommand(ZRANGEBYSCORE, new ScoredValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max) {
+    Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max) {
         return zrangebyscoreWithScores(channel, key, string(min), string(max));
     }
 
-    public Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max) {
+    Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max) {
         notNullKey(key);
         notNullMinMax(min, max);
         notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.addKey(key).add(min).add(max).add(WITHSCORES);
-        return createCommand(ZRANGEBYSCORE, new ScoredValueStreamingOutput<K, V>(codec, channel), args);
+        return createCommand(ZRANGEBYSCORE, new ScoredValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max,
+    Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max,
             long offset, long count) {
         return zrangebyscoreWithScores(channel, key, string(min), string(max), offset, count);
     }
 
-    public Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max,
+    Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max,
             long offset, long count) {
         notNullKey(key);
         notNullMinMax(min, max);
         notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         addLimit(args.addKey(key).add(min).add(max).add(WITHSCORES), Limit.create(offset, count));
-        return createCommand(ZRANGEBYSCORE, new ScoredValueStreamingOutput<K, V>(codec, channel), args);
+        return createCommand(ZRANGEBYSCORE, new ScoredValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key,
+    Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key,
             Range<? extends Number> range, Limit limit) {
         notNullKey(key);
         notNullRange(range);
         notNullLimit(limit);
         notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         addLimit(args.addKey(key).add(min(range)).add(max(range)).add(WITHSCORES), limit);
-        return createCommand(ZRANGEBYSCORE, new ScoredValueStreamingOutput<K, V>(codec, channel), args);
+        return createCommand(ZRANGEBYSCORE, new ScoredValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, Long> zrank(K key, V member) {
+    Command<K, V, Long> zrank(K key, V member) {
         notNullKey(key);
 
-        return createCommand(ZRANK, new IntegerOutput<K, V>(codec), key, member);
+        return createCommand(ZRANK, new IntegerOutput<>(codec), key, member);
     }
 
-    public Command<K, V, Long> zrem(K key, V... members) {
+    Command<K, V, Long> zrem(K key, V... members) {
         notNullKey(key);
         LettuceAssert.notNull(members, "Members " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(members, "Members " + MUST_NOT_BE_EMPTY);
 
-        return createCommand(ZREM, new IntegerOutput<K, V>(codec), key, members);
+        return createCommand(ZREM, new IntegerOutput<>(codec), key, members);
+    }
+
+    RedisCommand<K, V, Long> zremrangebylex(K key, String min, String max) {
+        notNullKey(key);
+        notNullMinMax(min, max);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(key).add(min).add(max);
+        return createCommand(ZREMRANGEBYLEX, new IntegerOutput<>(codec), args);
+    }
+
+    RedisCommand<K, V, Long> zremrangebylex(K key, Range<? extends V> range) {
+        notNullKey(key);
+        notNullRange(range);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(key).add(minValue(range)).add(maxValue(range));
+        return createCommand(ZREMRANGEBYLEX, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> zremrangebyrank(K key, long start, long stop) {
+    Command<K, V, Long> zremrangebyrank(K key, long start, long stop) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(start).add(stop);
-        return createCommand(ZREMRANGEBYRANK, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(start).add(stop);
+        return createCommand(ZREMRANGEBYRANK, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> zremrangebyscore(K key, double min, double max) {
+    Command<K, V, Long> zremrangebyscore(K key, double min, double max) {
         return zremrangebyscore(key, string(min), string(max));
     }
 
-    public Command<K, V, Long> zremrangebyscore(K key, String min, String max) {
+    Command<K, V, Long> zremrangebyscore(K key, String min, String max) {
         notNullKey(key);
         notNullMinMax(min, max);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(min).add(max);
-        return createCommand(ZREMRANGEBYSCORE, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(min).add(max);
+        return createCommand(ZREMRANGEBYSCORE, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> zremrangebyscore(K key, Range<? extends Number> range) {
+    Command<K, V, Long> zremrangebyscore(K key, Range<? extends Number> range) {
         notNullKey(key);
         notNullRange(range);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(min(range)).add(max(range));
-        return createCommand(ZREMRANGEBYSCORE, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(min(range)).add(max(range));
+        return createCommand(ZREMRANGEBYSCORE, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, List<V>> zrevrange(K key, long start, long stop) {
+    Command<K, V, List<V>> zrevrange(K key, long start, long stop) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(start).add(stop);
-        return createCommand(ZREVRANGE, new ValueListOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(start).add(stop);
+        return createCommand(ZREVRANGE, new ValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, List<V>> zrevrangebylex(K key, Range<? extends V> range, Limit limit) {
+    Command<K, V, Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
         notNullKey(key);
-        notNullRange(range);
-        notNullLimit(limit);
+        notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        addLimit(args.addKey(key).add(maxValue(range)).add(minValue(range)), limit);
-        return createCommand(ZREVRANGEBYLEX, new ValueListOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(start).add(stop);
+        return createCommand(ZREVRANGE, new ValueStreamingOutput<>(codec, channel), args);
+    }
+
+    Command<K, V, List<ScoredValue<V>>> zrevrangeWithScores(K key, long start, long stop) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(key).add(start).add(stop).add(WITHSCORES);
+        return createCommand(ZREVRANGE, new ScoredValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, List<ScoredValue<V>>> zrevrangeWithScores(K key, long start, long stop) {
+    Command<K, V, Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
         notNullKey(key);
+        LettuceAssert.notNull(channel, "ValueStreamingChannel " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.addKey(key).add(start).add(stop).add(WITHSCORES);
-        return createCommand(ZREVRANGE, new ScoredValueListOutput<K, V>(codec), args);
+        return createCommand(ZREVRANGE, new ScoredValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, List<V>> zrevrangebyscore(K key, double max, double min) {
+    Command<K, V, List<V>> zrevrangebylex(K key, Range<? extends V> range, Limit limit) {
+        notNullKey(key);
+        notNullRange(range);
+        notNullLimit(limit);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        addLimit(args.addKey(key).add(maxValue(range)).add(minValue(range)), limit);
+        return createCommand(ZREVRANGEBYLEX, new ValueListOutput<>(codec), args);
+    }
+
+    Command<K, V, List<V>> zrevrangebyscore(K key, double max, double min) {
         return zrevrangebyscore(key, string(max), string(min));
     }
 
-    public Command<K, V, List<V>> zrevrangebyscore(K key, String max, String min) {
+    Command<K, V, List<V>> zrevrangebyscore(K key, String max, String min) {
         notNullKey(key);
         notNullMinMax(min, max);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(max).add(min);
-        return createCommand(ZREVRANGEBYSCORE, new ValueListOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(max).add(min);
+        return createCommand(ZREVRANGEBYSCORE, new ValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, List<V>> zrevrangebyscore(K key, double max, double min, long offset, long count) {
+    Command<K, V, List<V>> zrevrangebyscore(K key, double max, double min, long offset, long count) {
         return zrevrangebyscore(key, string(max), string(min), offset, count);
     }
 
-    public Command<K, V, List<V>> zrevrangebyscore(K key, String max, String min, long offset, long count) {
+    Command<K, V, List<V>> zrevrangebyscore(K key, String max, String min, long offset, long count) {
         notNullKey(key);
         notNullMinMax(min, max);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         addLimit(args.addKey(key).add(max).add(min), Limit.create(offset, count));
-        return createCommand(ZREVRANGEBYSCORE, new ValueListOutput<K, V>(codec), args);
+        return createCommand(ZREVRANGEBYSCORE, new ValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, List<V>> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit) {
+    Command<K, V, List<V>> zrevrangebyscore(K key, Range<? extends Number> range, Limit limit) {
         notNullKey(key);
         notNullRange(range);
         notNullLimit(limit);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         addLimit(args.addKey(key).add(max(range)).add(min(range)), limit);
-        return createCommand(ZREVRANGEBYSCORE, new ValueListOutput<K, V>(codec), args);
+        return createCommand(ZREVRANGEBYSCORE, new ValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min) {
-        return zrevrangebyscoreWithScores(key, string(max), string(min));
+    Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min) {
+        return zrevrangebyscore(channel, key, string(max), string(min));
     }
 
-    public Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min) {
+    Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min) {
         notNullKey(key);
         notNullMinMax(min, max);
+        notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(max).add(min).add(WITHSCORES);
-        return createCommand(ZREVRANGEBYSCORE, new ScoredValueListOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(max).add(min);
+        return createCommand(ZREVRANGEBYSCORE, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count) {
-        return zrevrangebyscoreWithScores(key, string(max), string(min), offset, count);
+    Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset,
+            long count) {
+        return zrevrangebyscore(channel, key, string(max), string(min), offset, count);
     }
 
-    public Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count) {
+    Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset,
+            long count) {
         notNullKey(key);
         notNullMinMax(min, max);
+        notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        addLimit(args.addKey(key).add(max).add(min).add(WITHSCORES), Limit.create(offset, count));
-        return createCommand(ZREVRANGEBYSCORE, new ScoredValueListOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        addLimit(args.addKey(key).add(max).add(min), Limit.create(offset, count));
+        return createCommand(ZREVRANGEBYSCORE, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
+    Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
+            Limit limit) {
         notNullKey(key);
         notNullRange(range);
         notNullLimit(limit);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        addLimit(args.addKey(key).add(max(range)).add(min(range)).add(WITHSCORES), limit);
-        return createCommand(ZREVRANGEBYSCORE, new ScoredValueListOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, Long> zrevrange(ValueStreamingChannel<V> channel, K key, long start, long stop) {
-        notNullKey(key);
         notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(start).add(stop);
-        return createCommand(ZREVRANGE, new ValueStreamingOutput<K, V>(codec, channel), args);
-    }
-
-    public Command<K, V, Long> zrevrangeWithScores(ScoredValueStreamingChannel<V> channel, K key, long start, long stop) {
-        notNullKey(key);
-        LettuceAssert.notNull(channel, "ValueStreamingChannel " + MUST_NOT_BE_NULL);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(start).add(stop).add(WITHSCORES);
-        return createCommand(ZREVRANGE, new ScoredValueStreamingOutput<K, V>(codec, channel), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        addLimit(args.addKey(key).add(max(range)).add(min(range)), limit);
+        return createCommand(ZREVRANGEBYSCORE, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min) {
-        return zrevrangebyscore(channel, key, string(max), string(min));
+    Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min) {
+        return zrevrangebyscoreWithScores(key, string(max), string(min));
     }
 
-    public Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min) {
+    Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min) {
         notNullKey(key);
         notNullMinMax(min, max);
-        notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(max).add(min);
-        return createCommand(ZREVRANGEBYSCORE, new ValueStreamingOutput<K, V>(codec, channel), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(key).add(max).add(min).add(WITHSCORES);
+        return createCommand(ZREVRANGEBYSCORE, new ScoredValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset,
-            long count) {
-        return zrevrangebyscore(channel, key, string(max), string(min), offset, count);
+    Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count) {
+        return zrevrangebyscoreWithScores(key, string(max), string(min), offset, count);
     }
 
-    public Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset,
-            long count) {
+    Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count) {
         notNullKey(key);
         notNullMinMax(min, max);
-        notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        addLimit(args.addKey(key).add(max).add(min), Limit.create(offset, count));
-        return createCommand(ZREVRANGEBYSCORE, new ValueStreamingOutput<K, V>(codec, channel), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        addLimit(args.addKey(key).add(max).add(min).add(WITHSCORES), Limit.create(offset, count));
+        return createCommand(ZREVRANGEBYSCORE, new ScoredValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
-            Limit limit) {
+    Command<K, V, List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range<? extends Number> range, Limit limit) {
         notNullKey(key);
         notNullRange(range);
         notNullLimit(limit);
-        notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        addLimit(args.addKey(key).add(max(range)).add(min(range)), limit);
-        return createCommand(ZREVRANGEBYSCORE, new ValueStreamingOutput<K, V>(codec, channel), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        addLimit(args.addKey(key).add(max(range)).add(min(range)).add(WITHSCORES), limit);
+        return createCommand(ZREVRANGEBYSCORE, new ScoredValueListOutput<>(codec), args);
     }
 
-    public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min) {
+    Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min) {
         return zrevrangebyscoreWithScores(channel, key, string(max), string(min));
     }
 
-    public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min) {
+    Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min) {
         notNullKey(key);
         notNullMinMax(min, max);
         notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         args.addKey(key).add(max).add(min).add(WITHSCORES);
-        return createCommand(ZREVRANGEBYSCORE, new ScoredValueStreamingOutput<K, V>(codec, channel), args);
+        return createCommand(ZREVRANGEBYSCORE, new ScoredValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max,
+    Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max,
             double min, long offset, long count) {
         notNullKey(key);
         LettuceAssert.notNull(min, "Min " + MUST_NOT_BE_NULL);
@@ -1976,821 +2606,184 @@ public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChanne
         return zrevrangebyscoreWithScores(channel, key, string(max), string(min), offset, count);
     }
 
-    public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max,
+    Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max,
             String min, long offset, long count) {
         notNullKey(key);
         notNullMinMax(min, max);
         notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         addLimit(args.addKey(key).add(max).add(min).add(WITHSCORES), Limit.create(offset, count));
-        return createCommand(ZREVRANGEBYSCORE, new ScoredValueStreamingOutput<K, V>(codec, channel), args);
+        return createCommand(ZREVRANGEBYSCORE, new ScoredValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key,
+    Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key,
             Range<? extends Number> range, Limit limit) {
         notNullKey(key);
         notNullRange(range);
         notNullLimit(limit);
         notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
         addLimit(args.addKey(key).add(max(range)).add(min(range)).add(WITHSCORES), limit);
-        return createCommand(ZREVRANGEBYSCORE, new ScoredValueStreamingOutput<K, V>(codec, channel), args);
+        return createCommand(ZREVRANGEBYSCORE, new ScoredValueStreamingOutput<>(codec, channel), args);
     }
 
-    public Command<K, V, Long> zrevrank(K key, V member) {
+    Command<K, V, Long> zrevrank(K key, V member) {
         notNullKey(key);
 
-        return createCommand(ZREVRANK, new IntegerOutput<K, V>(codec), key, member);
+        return createCommand(ZREVRANK, new IntegerOutput<>(codec), key, member);
     }
 
-    public Command<K, V, Double> zscore(K key, V member) {
+    Command<K, V, ScoredValueScanCursor<V>> zscan(K key) {
         notNullKey(key);
 
-        return createCommand(ZSCORE, new DoubleOutput<K, V>(codec), key, member);
+        return zscan(key, ScanCursor.INITIAL, null);
     }
 
-    public Command<K, V, Long> zunionstore(K destination, K... keys) {
-        notEmpty(keys);
-        LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
+    Command<K, V, ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor) {
+        notNullKey(key);
 
-        return zunionstore(destination, new ZStoreArgs(), keys);
+        return zscan(key, scanCursor, null);
     }
 
-    public Command<K, V, Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
-        notEmpty(keys);
+    Command<K, V, ScoredValueScanCursor<V>> zscan(K key, ScanArgs scanArgs) {
+        notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(destination).add(keys.length).addKeys(keys);
-        storeArgs.build(args);
-        return createCommand(ZUNIONSTORE, new IntegerOutput<K, V>(codec), args);
+        return zscan(key, ScanCursor.INITIAL, scanArgs);
     }
 
-    public RedisCommand<K, V, Long> zlexcount(K key, String min, String max) {
+    Command<K, V, ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
         notNullKey(key);
-        notNullMinMax(min, max);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(min).add(max);
-        return createCommand(ZLEXCOUNT, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(key);
+
+        scanArgs(scanCursor, scanArgs, args);
+
+        ScoredValueScanOutput<K, V> output = new ScoredValueScanOutput<>(codec);
+        return createCommand(ZSCAN, output, args);
     }
 
-    public RedisCommand<K, V, Long> zlexcount(K key, Range<? extends V> range) {
+    Command<K, V, StreamScanCursor> zscanStreaming(ScoredValueStreamingChannel<V> channel, K key) {
         notNullKey(key);
-        notNullRange(range);
+        notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(minValue(range)).add(maxValue(range));
-        return createCommand(ZLEXCOUNT, new IntegerOutput<K, V>(codec), args);
+        return zscanStreaming(channel, key, ScanCursor.INITIAL, null);
     }
 
-    public RedisCommand<K, V, Long> zremrangebylex(K key, String min, String max) {
+    Command<K, V, StreamScanCursor> zscanStreaming(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
         notNullKey(key);
-        notNullMinMax(min, max);
+        notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(min).add(max);
-        return createCommand(ZREMRANGEBYLEX, new IntegerOutput<K, V>(codec), args);
+        return zscanStreaming(channel, key, scanCursor, null);
     }
 
-    public RedisCommand<K, V, Long> zremrangebylex(K key, Range<? extends V> range) {
+    Command<K, V, StreamScanCursor> zscanStreaming(ScoredValueStreamingChannel<V> channel, K key, ScanArgs scanArgs) {
         notNullKey(key);
-        notNullRange(range);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(minValue(range)).add(maxValue(range));
-        return createCommand(ZREMRANGEBYLEX, new IntegerOutput<K, V>(codec), args);
-    }
-
-    public RedisCommand<K, V, List<V>> zrangebylex(K key, String min, String max) {
-        notNullKey(key);
-        notNullMinMax(min, max);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key).add(min).add(max);
-        return createCommand(ZRANGEBYLEX, new ValueListOutput<K, V>(codec), args);
-    }
-
-    public RedisCommand<K, V, List<V>> zrangebylex(K key, String min, String max, long offset, long count) {
-        notNullKey(key);
-        notNullMinMax(min, max);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        addLimit(args.addKey(key).add(min).add(max), Limit.create(offset, count));
-        return createCommand(ZRANGEBYLEX, new ValueListOutput<K, V>(codec), args);
-    }
-
-    public RedisCommand<K, V, List<V>> zrangebylex(K key, Range<? extends V> range, Limit limit) {
-        notNullKey(key);
-        notNullRange(range);
-        notNullLimit(limit);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        addLimit(args.addKey(key).add(minValue(range)).add(maxValue(range)), limit);
-        return createCommand(ZRANGEBYLEX, new ValueListOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, List<V>> time() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        return createCommand(TIME, new ValueListOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, KeyScanCursor<K>> scan() {
-        return scan(ScanCursor.INITIAL, null);
-    }
-
-    public Command<K, V, KeyScanCursor<K>> scan(ScanCursor scanCursor) {
-        return scan(scanCursor, null);
-    }
-
-    public Command<K, V, KeyScanCursor<K>> scan(ScanArgs scanArgs) {
-        return scan(ScanCursor.INITIAL, scanArgs);
-    }
-
-    public Command<K, V, KeyScanCursor<K>> scan(ScanCursor scanCursor, ScanArgs scanArgs) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-
-        scanArgs(scanCursor, scanArgs, args);
-
-        KeyScanOutput<K, V> output = new KeyScanOutput<K, V>(codec);
-        return createCommand(SCAN, output, args);
-    }
-
-    protected void scanArgs(ScanCursor scanCursor, ScanArgs scanArgs, CommandArgs<K, V> args) {
-        LettuceAssert.notNull(scanCursor, "ScanCursor " + MUST_NOT_BE_NULL);
-        LettuceAssert.isTrue(!scanCursor.isFinished(), "ScanCursor must not be finished");
-
-        args.add(scanCursor.getCursor());
-
-        if (scanArgs != null) {
-            scanArgs.build(args);
-        }
-    }
-
-    public Command<K, V, StreamScanCursor> scanStreaming(KeyStreamingChannel<K> channel) {
-        notNull(channel);
-        LettuceAssert.notNull(channel, "KeyStreamingChannel " + MUST_NOT_BE_NULL);
-
-        return scanStreaming(channel, ScanCursor.INITIAL, null);
-    }
-
-    public Command<K, V, StreamScanCursor> scanStreaming(KeyStreamingChannel<K> channel, ScanCursor scanCursor) {
-        notNull(channel);
-        LettuceAssert.notNull(channel, "KeyStreamingChannel " + MUST_NOT_BE_NULL);
-
-        return scanStreaming(channel, scanCursor, null);
-    }
-
-    public Command<K, V, StreamScanCursor> scanStreaming(KeyStreamingChannel<K> channel, ScanArgs scanArgs) {
-        notNull(channel);
-        LettuceAssert.notNull(channel, "KeyStreamingChannel " + MUST_NOT_BE_NULL);
-
-        return scanStreaming(channel, ScanCursor.INITIAL, scanArgs);
-    }
-
-    public Command<K, V, StreamScanCursor> scanStreaming(KeyStreamingChannel<K> channel, ScanCursor scanCursor,
-            ScanArgs scanArgs) {
-        notNull(channel);
-        LettuceAssert.notNull(channel, "KeyStreamingChannel " + MUST_NOT_BE_NULL);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        scanArgs(scanCursor, scanArgs, args);
-
-        KeyScanStreamingOutput<K, V> output = new KeyScanStreamingOutput<K, V>(codec, channel);
-        return createCommand(SCAN, output, args);
-    }
-
-    public Command<K, V, ValueScanCursor<V>> sscan(K key) {
-        notNullKey(key);
-
-        return sscan(key, ScanCursor.INITIAL, null);
-    }
-
-    public Command<K, V, ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor) {
-        notNullKey(key);
-
-        return sscan(key, scanCursor, null);
-    }
-
-    public Command<K, V, ValueScanCursor<V>> sscan(K key, ScanArgs scanArgs) {
-        notNullKey(key);
-
-        return sscan(key, ScanCursor.INITIAL, scanArgs);
-    }
-
-    public Command<K, V, ValueScanCursor<V>> sscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        notNullKey(key);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key);
-
-        scanArgs(scanCursor, scanArgs, args);
-
-        ValueScanOutput<K, V> output = new ValueScanOutput<K, V>(codec);
-        return createCommand(SSCAN, output, args);
-    }
-
-    public Command<K, V, StreamScanCursor> sscanStreaming(ValueStreamingChannel<V> channel, K key) {
-        notNullKey(key);
-        notNull(channel);
-
-        return sscanStreaming(channel, key, ScanCursor.INITIAL, null);
-    }
-
-    public Command<K, V, StreamScanCursor> sscanStreaming(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
-        notNullKey(key);
-        notNull(channel);
-
-        return sscanStreaming(channel, key, scanCursor, null);
-    }
-
-    public Command<K, V, StreamScanCursor> sscanStreaming(ValueStreamingChannel<V> channel, K key, ScanArgs scanArgs) {
-        notNullKey(key);
-        notNull(channel);
-
-        return sscanStreaming(channel, key, ScanCursor.INITIAL, scanArgs);
-    }
-
-    public Command<K, V, StreamScanCursor> sscanStreaming(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor,
-            ScanArgs scanArgs) {
-        notNullKey(key);
-        notNull(channel);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-
-        args.addKey(key);
-        scanArgs(scanCursor, scanArgs, args);
-
-        ValueScanStreamingOutput<K, V> output = new ValueScanStreamingOutput<K, V>(codec, channel);
-        return createCommand(SSCAN, output, args);
-    }
-
-    public Command<K, V, MapScanCursor<K, V>> hscan(K key) {
-        notNullKey(key);
-
-        return hscan(key, ScanCursor.INITIAL, null);
-    }
-
-    public Command<K, V, MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor) {
-        notNullKey(key);
-
-        return hscan(key, scanCursor, null);
-    }
-
-    public Command<K, V, MapScanCursor<K, V>> hscan(K key, ScanArgs scanArgs) {
-        notNullKey(key);
-
-        return hscan(key, ScanCursor.INITIAL, scanArgs);
-    }
-
-    public Command<K, V, MapScanCursor<K, V>> hscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        notNullKey(key);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key);
-
-        scanArgs(scanCursor, scanArgs, args);
-
-        MapScanOutput<K, V> output = new MapScanOutput<K, V>(codec);
-        return createCommand(HSCAN, output, args);
-    }
-
-    public Command<K, V, StreamScanCursor> hscanStreaming(KeyValueStreamingChannel<K, V> channel, K key) {
-        notNullKey(key);
-        notNull(channel);
-
-        return hscanStreaming(channel, key, ScanCursor.INITIAL, null);
-    }
-
-    public Command<K, V, StreamScanCursor> hscanStreaming(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor) {
-        notNullKey(key);
-        notNull(channel);
-
-        return hscanStreaming(channel, key, scanCursor, null);
-    }
-
-    public Command<K, V, StreamScanCursor> hscanStreaming(KeyValueStreamingChannel<K, V> channel, K key, ScanArgs scanArgs) {
-        notNullKey(key);
-        notNull(channel);
-
-        return hscanStreaming(channel, key, ScanCursor.INITIAL, scanArgs);
-    }
-
-    public Command<K, V, StreamScanCursor> hscanStreaming(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor,
-            ScanArgs scanArgs) {
-        notNullKey(key);
-        notNull(channel);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-
-        args.addKey(key);
-        scanArgs(scanCursor, scanArgs, args);
-
-        KeyValueScanStreamingOutput<K, V> output = new KeyValueScanStreamingOutput<K, V>(codec, channel);
-        return createCommand(HSCAN, output, args);
-    }
-
-    public Command<K, V, ScoredValueScanCursor<V>> zscan(K key) {
-        notNullKey(key);
-
-        return zscan(key, ScanCursor.INITIAL, null);
-    }
-
-    public Command<K, V, ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor) {
-        notNullKey(key);
-
-        return zscan(key, scanCursor, null);
-    }
-
-    public Command<K, V, ScoredValueScanCursor<V>> zscan(K key, ScanArgs scanArgs) {
-        notNullKey(key);
-
-        return zscan(key, ScanCursor.INITIAL, scanArgs);
-    }
-
-    public Command<K, V, ScoredValueScanCursor<V>> zscan(K key, ScanCursor scanCursor, ScanArgs scanArgs) {
-        notNullKey(key);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        args.addKey(key);
-
-        scanArgs(scanCursor, scanArgs, args);
-
-        ScoredValueScanOutput<K, V> output = new ScoredValueScanOutput<K, V>(codec);
-        return createCommand(ZSCAN, output, args);
-    }
-
-    public Command<K, V, StreamScanCursor> zscanStreaming(ScoredValueStreamingChannel<V> channel, K key) {
-        notNullKey(key);
-        notNull(channel);
-
-        return zscanStreaming(channel, key, ScanCursor.INITIAL, null);
-    }
-
-    public Command<K, V, StreamScanCursor> zscanStreaming(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor) {
-        notNullKey(key);
-        notNull(channel);
-
-        return zscanStreaming(channel, key, scanCursor, null);
-    }
-
-    public Command<K, V, StreamScanCursor> zscanStreaming(ScoredValueStreamingChannel<V> channel, K key, ScanArgs scanArgs) {
-        notNullKey(key);
-        notNull(channel);
-
-        return zscanStreaming(channel, key, ScanCursor.INITIAL, scanArgs);
-    }
-
-    public Command<K, V, StreamScanCursor> zscanStreaming(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor,
-            ScanArgs scanArgs) {
-        notNullKey(key);
-        notNull(channel);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-
-        args.addKey(key);
-        scanArgs(scanCursor, scanArgs, args);
-
-        ScoredValueScanStreamingOutput<K, V> output = new ScoredValueScanStreamingOutput<K, V>(codec, channel);
-        return createCommand(ZSCAN, output, args);
-    }
-
-    public Command<K, V, Long> pfadd(K key, V value, V... moreValues) {
-        notNullKey(key);
-        LettuceAssert.notNull(value, "Value " + MUST_NOT_BE_NULL);
-        LettuceAssert.notNull(moreValues, "MoreValues " + MUST_NOT_BE_NULL);
-        LettuceAssert.noNullElements(moreValues, "MoreValues " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValue(value).addValues(moreValues);
-        return createCommand(PFADD, new IntegerOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, Long> pfadd(K key, V... values) {
-        notNullKey(key);
-        notEmptyValues(values);
-        LettuceAssert.noNullElements(values, "Values " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValues(values);
-        return createCommand(PFADD, new IntegerOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, Long> pfcount(K key, K... moreKeys) {
-        notNullKey(key);
-        LettuceAssert.notNull(moreKeys, "MoreKeys " + MUST_NOT_BE_NULL);
-        LettuceAssert.noNullElements(moreKeys, "MoreKeys " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addKeys(moreKeys);
-        return createCommand(PFCOUNT, new IntegerOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, Long> pfcount(K... keys) {
-        notEmpty(keys);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(keys);
-        return createCommand(PFCOUNT, new IntegerOutput<K, V>(codec), args);
-    }
-
-    @SuppressWarnings("unchecked")
-    public Command<K, V, String> pfmerge(K destkey, K sourcekey, K... moreSourceKeys) {
-        LettuceAssert.notNull(destkey, "Destkey " + MUST_NOT_BE_NULL);
-        LettuceAssert.notNull(sourcekey, "Sourcekey " + MUST_NOT_BE_NULL);
-        LettuceAssert.notNull(moreSourceKeys, "MoreSourceKeys " + MUST_NOT_BE_NULL);
-        LettuceAssert.noNullElements(moreSourceKeys, "MoreSourceKeys " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(destkey).addKey(sourcekey).addKeys(moreSourceKeys);
-        return createCommand(PFMERGE, new StatusOutput<K, V>(codec), args);
-    }
-
-    @SuppressWarnings("unchecked")
-    public Command<K, V, String> pfmerge(K destkey, K... sourcekeys) {
-        LettuceAssert.notNull(destkey, "Destkey " + MUST_NOT_BE_NULL);
-        LettuceAssert.notNull(sourcekeys, "Sourcekeys " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(sourcekeys, "Sourcekeys " + MUST_NOT_BE_EMPTY);
-        LettuceAssert.noNullElements(sourcekeys, "Sourcekeys " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKeys(destkey).addKeys(sourcekeys);
-        return createCommand(PFMERGE, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterBumpepoch() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(BUMPEPOCH);
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterMeet(String ip, int port) {
-        LettuceAssert.notNull(ip, "IP " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(ip, "IP " + MUST_NOT_BE_EMPTY);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(MEET).add(ip).add(port);
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterForget(String nodeId) {
-        assertNodeId(nodeId);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(FORGET).add(nodeId);
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterAddslots(int[] slots) {
-        notEmptySlots(slots);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(ADDSLOTS);
-
-        for (int slot : slots) {
-            args.add(slot);
-        }
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterDelslots(int[] slots) {
-        notEmptySlots(slots);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(DELSLOTS);
-
-        for (int slot : slots) {
-            args.add(slot);
-        }
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterInfo() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(INFO);
-
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterMyId() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(MYID);
-
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterNodes() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(NODES);
-
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, List<K>> clusterGetKeysInSlot(int slot, int count) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(GETKEYSINSLOT).add(slot).add(count);
-        return createCommand(CLUSTER, new KeyListOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, Long> clusterCountKeysInSlot(int slot) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(COUNTKEYSINSLOT).add(slot);
-        return createCommand(CLUSTER, new IntegerOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, Long> clusterCountFailureReports(String nodeId) {
-        assertNodeId(nodeId);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add("COUNT-FAILURE-REPORTS").add(nodeId);
-        return createCommand(CLUSTER, new IntegerOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, Long> clusterKeyslot(K key) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(KEYSLOT).addKey(key);
-        return createCommand(CLUSTER, new IntegerOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterSaveconfig() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(SAVECONFIG);
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterSetConfigEpoch(long configEpoch) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add("SET-CONFIG-EPOCH").add(configEpoch);
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, List<Object>> clusterSlots() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(SLOTS);
-        return createCommand(CLUSTER, new ArrayOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterSetSlotNode(int slot, String nodeId) {
-        assertNodeId(nodeId);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(SETSLOT).add(slot).add(NODE).add(nodeId);
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterSetSlotStable(int slot) {
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(SETSLOT).add(slot).add(STABLE);
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterSetSlotMigrating(int slot, String nodeId) {
-        assertNodeId(nodeId);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(SETSLOT).add(slot).add(MIGRATING).add(nodeId);
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterSetSlotImporting(int slot, String nodeId) {
-        assertNodeId(nodeId);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(SETSLOT).add(slot).add(IMPORTING).add(nodeId);
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterReplicate(String nodeId) {
-        assertNodeId(nodeId);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(REPLICATE).add(nodeId);
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> asking() {
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec);
-        return createCommand(ASKING, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterFlushslots() {
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(FLUSHSLOTS);
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, List<String>> clusterSlaves(String nodeId) {
-        assertNodeId(nodeId);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(SLAVES).add(nodeId);
-        return createCommand(CLUSTER, new StringListOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterFailover(boolean force) {
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(FAILOVER);
-        if (force) {
-            args.add(FORCE);
-        }
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, String> clusterReset(boolean hard) {
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(RESET);
-        if (hard) {
-            args.add(HARD);
-        } else {
-            args.add(SOFT);
-        }
-        return createCommand(CLUSTER, new StatusOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, Long> geoadd(K key, double longitude, double latitude, V member) {
-        notNullKey(key);
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(longitude).add(latitude).addValue(member);
-        return createCommand(GEOADD, new IntegerOutput<K, V>(codec), args);
-    }
-
-    public Command<K, V, Long> geoadd(K key, Object[] lngLatMember) {
-
-        notNullKey(key);
-        LettuceAssert.notNull(lngLatMember, "LngLatMember " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(lngLatMember, "LngLatMember " + MUST_NOT_BE_EMPTY);
-        LettuceAssert.noNullElements(lngLatMember, "LngLatMember " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
-        LettuceAssert
-                .isTrue(lngLatMember.length % 3 == 0,
-                        "LngLatMember.length must be a multiple of 3 and contain a "
-                                + "sequence of longitude1, latitude1, member1, longitude2, latitude2, member2, ... longitudeN, latitudeN, memberN");
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key);
-
-        for (int i = 0; i < lngLatMember.length; i += 3) {
-            args.add((Double) lngLatMember[i]);
-            args.add((Double) lngLatMember[i + 1]);
-            args.addValue((V) lngLatMember[i + 2]);
-        }
+        notNull(channel);
 
-        return createCommand(GEOADD, new IntegerOutput<K, V>(codec), args);
+        return zscanStreaming(channel, key, ScanCursor.INITIAL, scanArgs);
     }
 
-    public Command<K, V, List<Value<String>>> geohash(K key, V... members) {
+    Command<K, V, StreamScanCursor> zscanStreaming(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor,
+            ScanArgs scanArgs) {
         notNullKey(key);
-        LettuceAssert.notNull(members, "Members " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(members, "Members " + MUST_NOT_BE_EMPTY);
+        notNull(channel);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValues(members);
-        return createCommand(GEOHASH, new StringValueListOutput<K, V>(codec), args);
-    }
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
 
-    public Command<K, V, Set<V>> georadius(CommandType commandType, K key, double longitude, double latitude, double distance,
-            String unit) {
-        notNullKey(key);
-        LettuceAssert.notNull(unit, "Unit " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(unit, "Unit " + MUST_NOT_BE_EMPTY);
+        args.addKey(key);
+        scanArgs(scanCursor, scanArgs, args);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(longitude).add(latitude).add(distance).add(unit);
-        return createCommand(commandType, new ValueSetOutput<K, V>(codec), args);
+        ScoredValueScanStreamingOutput<K, V> output = new ScoredValueScanStreamingOutput<>(codec, channel);
+        return createCommand(ZSCAN, output, args);
     }
 
-    public Command<K, V, List<GeoWithin<V>>> georadius(CommandType commandType, K key, double longitude, double latitude,
-            double distance, String unit,
-            GeoArgs geoArgs) {
-
+    Command<K, V, Double> zscore(K key, V member) {
         notNullKey(key);
-        LettuceAssert.notNull(unit, "Unit " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(unit, "Unit " + MUST_NOT_BE_EMPTY);
-        LettuceAssert.notNull(geoArgs, "GeoArgs " + MUST_NOT_BE_NULL);
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(longitude).add(latitude).add(distance).add(unit);
-        geoArgs.build(args);
 
-        return createCommand(commandType, new GeoWithinListOutput<K, V>(codec, geoArgs.isWithDistance(), geoArgs.isWithHash(),
-                geoArgs.isWithCoordinates()), args);
+        return createCommand(ZSCORE, new DoubleOutput<>(codec), key, member);
     }
 
-    public Command<K, V, Long> georadius(K key, double longitude, double latitude, double distance, String unit,
-            GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
-
-        notNullKey(key);
-        LettuceAssert.notNull(unit, "Unit " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(unit, "Unit " + MUST_NOT_BE_EMPTY);
-        LettuceAssert.notNull(geoRadiusStoreArgs, "GeoRadiusStoreArgs " + MUST_NOT_BE_NULL);
-        LettuceAssert.isTrue(geoRadiusStoreArgs.getStoreKey() != null || geoRadiusStoreArgs.getStoreDistKey() != null,
-                "At least STORE key or STORDIST key is required");
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(longitude).add(latitude).add(distance).add(unit);
-        geoRadiusStoreArgs.build(args);
+    Command<K, V, Long> zunionstore(K destination, K... keys) {
+        notEmpty(keys);
+        LettuceAssert.notNull(destination, "Destination " + MUST_NOT_BE_NULL);
 
-        return createCommand(GEORADIUS, new IntegerOutput<K, V>(codec), args);
+        return zunionstore(destination, new ZStoreArgs(), keys);
     }
 
-    public Command<K, V, Set<V>> georadiusbymember(CommandType commandType, K key, V member, double distance, String unit) {
-
-        notNullKey(key);
-        LettuceAssert.notNull(unit, "Unit " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(unit, "Unit " + MUST_NOT_BE_EMPTY);
+    Command<K, V, Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
+        notEmpty(keys);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValue(member).add(distance).add(unit);
-        return createCommand(commandType, new ValueSetOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(destination).add(keys.length).addKeys(keys);
+        storeArgs.build(args);
+        return createCommand(ZUNIONSTORE, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, List<GeoWithin<V>>> georadiusbymember(CommandType commandType, K key, V member, double distance,
-            String unit, GeoArgs geoArgs) {
-
-        notNullKey(key);
-        LettuceAssert.notNull(geoArgs, "GeoArgs " + MUST_NOT_BE_NULL);
-        LettuceAssert.notNull(unit, "Unit " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(unit, "Unit " + MUST_NOT_BE_EMPTY);
+    private boolean allElementsInstanceOf(Object[] objects, Class<?> expectedAssignableType) {
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValue(member).add(distance).add(unit);
-        geoArgs.build(args);
+        for (Object object : objects) {
+            if (!expectedAssignableType.isAssignableFrom(object.getClass())) {
+                return false;
+            }
+        }
 
-        return createCommand(
-commandType,
-                new GeoWithinListOutput<K, V>(codec, geoArgs.isWithDistance(), geoArgs.isWithHash(), geoArgs
-                        .isWithCoordinates()), args);
+        return true;
     }
 
-    public Command<K, V, Long> georadiusbymember(K key, V member, double distance, String unit,
-            GeoRadiusStoreArgs<K> geoRadiusStoreArgs) {
-
-        notNullKey(key);
-        LettuceAssert.notNull(geoRadiusStoreArgs, "GeoRadiusStoreArgs " + MUST_NOT_BE_NULL);
-        LettuceAssert.notNull(unit, "Unit " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(unit, "Unit " + MUST_NOT_BE_EMPTY);
-        LettuceAssert.isTrue(geoRadiusStoreArgs.getStoreKey() != null || geoRadiusStoreArgs.getStoreDistKey() != null,
-                "At least STORE key or STORDIST key is required");
-
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValue(member).add(distance).add(unit);
-        geoRadiusStoreArgs.build(args);
-
-        return createCommand(GEORADIUSBYMEMBER, new IntegerOutput<K, V>(codec), args);
-    }
+    private byte[] maxValue(Range<? extends V> range) {
 
-    public Command<K, V, List<GeoCoordinates>> geopos(K key, V[] members) {
-        notNullKey(key);
-        LettuceAssert.notNull(members, "Members " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(members, "Members " + MUST_NOT_BE_EMPTY);
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValues(members);
+        Range.Boundary<? extends V> upper = range.getUpper();
 
-        return createCommand(GEOPOS, new GeoCoordinatesListOutput<K, V>(codec), args);
-    }
+        if (upper.getValue() == null) {
+            return PLUS_BYTES;
+        }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public Command<K, V, List<Value<GeoCoordinates>>> geoposValues(K key, V[] members) {
-        notNullKey(key);
-        LettuceAssert.notNull(members, "Members " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(members, "Members " + MUST_NOT_BE_EMPTY);
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValues(members);
+        ByteBuffer encoded = codec.encodeValue(upper.getValue());
+        ByteBuffer allocated = ByteBuffer.allocate(encoded.remaining() + 1);
+        allocated.put(upper.isIncluding() ? (byte) '[' : (byte) '(').put(encoded);
 
-        return (Command) createCommand(GEOPOS, new GeoCoordinatesValueListOutput<K, V>(codec), args);
+        return allocated.array();
     }
 
-    public Command<K, V, Double> geodist(K key, V from, V to, GeoArgs.Unit unit) {
-        notNullKey(key);
-        LettuceAssert.notNull(from, "From " + MUST_NOT_BE_NULL);
-        LettuceAssert.notNull(from, "To " + MUST_NOT_BE_NULL);
+    private byte[] minValue(Range<? extends V> range) {
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValue(from).addValue(to);
+        Range.Boundary<? extends V> lower = range.getLower();
 
-        if (unit != null) {
-            args.add(unit.name());
+        if (lower.getValue() == null) {
+            return MINUS_BYTES;
         }
 
-        return createCommand(GEODIST, new DoubleOutput<K, V>(codec), args);
+        ByteBuffer encoded = codec.encodeValue(lower.getValue());
+        ByteBuffer allocated = ByteBuffer.allocate(encoded.remaining() + 1);
+        allocated.put(lower.isIncluding() ? (byte) '[' : (byte) '(').put(encoded);
+
+        return allocated.array();
     }
 
-    public static void notNull(ScoredValueStreamingChannel<?> channel) {
+    static void notNull(ScoredValueStreamingChannel<?> channel) {
         LettuceAssert.notNull(channel, "ScoredValueStreamingChannel " + MUST_NOT_BE_NULL);
     }
 
-    public static void notNull(KeyStreamingChannel<?> channel) {
+    static void notNull(KeyStreamingChannel<?> channel) {
         LettuceAssert.notNull(channel, "KeyValueStreamingChannel " + MUST_NOT_BE_NULL);
     }
 
-    public static void notNull(ValueStreamingChannel<?> channel) {
+    static void notNull(ValueStreamingChannel<?> channel) {
         LettuceAssert.notNull(channel, "ValueStreamingChannel " + MUST_NOT_BE_NULL);
     }
 
-    public static void notNull(KeyValueStreamingChannel<?, ?> channel) {
+    static void notNull(KeyValueStreamingChannel<?, ?> channel) {
         LettuceAssert.notNull(channel, "KeyValueStreamingChannel " + MUST_NOT_BE_NULL);
     }
 
-    private static void notNullKey(Object key) {
-        LettuceAssert.notNull(key, "Key " + MUST_NOT_BE_NULL);
-    }
-
-    private static void notNullRange(Range<?> range) {
-        LettuceAssert.notNull(range, "Range " + MUST_NOT_BE_NULL);
-    }
-
-    private static void notNullLimit(Limit limit) {
-        LettuceAssert.notNull(limit, "Limit " + MUST_NOT_BE_NULL);
-    }
-
-    public static void notNullMinMax(String min, String max) {
+    static void notNullMinMax(String min, String max) {
         LettuceAssert.notNull(min, "Min " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(max, "Max " + MUST_NOT_BE_NULL);
     }
 
-    private static void notEmpty(Object[] keys) {
-        LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(keys, "Keys " + MUST_NOT_BE_EMPTY);
-    }
-
-    private static void notEmptyValues(Object[] values) {
-        LettuceAssert.notNull(values, "Values " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(values, "Values " + MUST_NOT_BE_EMPTY);
-    }
-
-    private static void assertNodeId(String nodeId) {
-        LettuceAssert.notNull(nodeId, "NodeId " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(nodeId, "NodeId " + MUST_NOT_BE_EMPTY);
-    }
-
-    private static void notEmptySlots(int[] slots) {
-        LettuceAssert.notNull(slots, "Slots " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(slots, "Slots " + MUST_NOT_BE_EMPTY);
-    }
-
     private static void addLimit(CommandArgs<?, ?> args, Limit limit) {
 
         if (limit.isLimited()) {
@@ -2798,20 +2791,9 @@ private static void addLimit(CommandArgs<?, ?> args, Limit limit) {
         }
     }
 
-    private static String min(Range<? extends Number> range) {
-
-        Range.Boundary<? extends Number> lower = range.getLower();
-
-        if (lower.getValue() == null || lower.getValue() instanceof Double
-                && lower.getValue().doubleValue() == Double.NEGATIVE_INFINITY) {
-            return "-inf";
-        }
-
-        if (!lower.isIncluding()) {
-            return "(" + lower.getValue();
-        }
-
-        return lower.getValue().toString();
+    private static void assertNodeId(String nodeId) {
+        LettuceAssert.notNull(nodeId, "NodeId " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(nodeId, "NodeId " + MUST_NOT_BE_EMPTY);
     }
 
     private static String max(Range<? extends Number> range) {
@@ -2830,33 +2812,46 @@ private static String max(Range<? extends Number> range) {
         return upper.getValue().toString();
     }
 
-    private byte[] minValue(Range<? extends V> range) {
+    private static String min(Range<? extends Number> range) {
 
-        Range.Boundary<? extends V> lower = range.getLower();
+        Range.Boundary<? extends Number> lower = range.getLower();
 
-        if (lower.getValue() == null) {
-            return MINUS_BYTES;
+        if (lower.getValue() == null || lower.getValue() instanceof Double
+                && lower.getValue().doubleValue() == Double.NEGATIVE_INFINITY) {
+            return "-inf";
         }
 
-        ByteBuffer encoded = codec.encodeValue(lower.getValue());
-        ByteBuffer allocated = ByteBuffer.allocate(encoded.remaining() + 1);
-        allocated.put(lower.isIncluding() ? (byte) '[' : (byte) '(').put(encoded);
+        if (!lower.isIncluding()) {
+            return "(" + lower.getValue();
+        }
 
-        return allocated.array();
+        return lower.getValue().toString();
     }
 
-    private byte[] maxValue(Range<? extends V> range) {
+    private static void notEmpty(Object[] keys) {
+        LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(keys, "Keys " + MUST_NOT_BE_EMPTY);
+    }
 
-        Range.Boundary<? extends V> upper = range.getUpper();
+    private static void notEmptySlots(int[] slots) {
+        LettuceAssert.notNull(slots, "Slots " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(slots, "Slots " + MUST_NOT_BE_EMPTY);
+    }
 
-        if (upper.getValue() == null) {
-            return PLUS_BYTES;
-        }
+    private static void notEmptyValues(Object[] values) {
+        LettuceAssert.notNull(values, "Values " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(values, "Values " + MUST_NOT_BE_EMPTY);
+    }
 
-        ByteBuffer encoded = codec.encodeValue(upper.getValue());
-        ByteBuffer allocated = ByteBuffer.allocate(encoded.remaining() + 1);
-        allocated.put(upper.isIncluding() ? (byte) '[' : (byte) '(').put(encoded);
+    private static void notNullKey(Object key) {
+        LettuceAssert.notNull(key, "Key " + MUST_NOT_BE_NULL);
+    }
 
-        return allocated.array();
+    private static void notNullLimit(Limit limit) {
+        LettuceAssert.notNull(limit, "Limit " + MUST_NOT_BE_NULL);
+    }
+
+    private static void notNullRange(Range<?> range) {
+        LettuceAssert.notNull(range, "Range " + MUST_NOT_BE_NULL);
     }
 }

From ddc3a10bba93190eebd9d60bb3b7751c4c2f0f30 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 28 Sep 2017 11:25:02 +0200
Subject: [PATCH 300/808] Extend documentation #610

Add what's new section. Include native transport documentation. CSS polishing.
---
 README.md                                     |  51 ++++++++++--------
 src/main/asciidoc/advanced-usage.asciidoc     |   8 ++-
 src/main/asciidoc/connecting-redis.asciidoc   |   0
 src/main/asciidoc/getting-started.asciidoc    |   3 +-
 .../asciidoc/images/apple-touch-icon-144.png  | Bin 0 -> 18372 bytes
 .../asciidoc/images/apple-touch-icon-180.png  | Bin 0 -> 19515 bytes
 .../asciidoc/images/lettuce-green-text@2x.png | Bin 0 -> 11672 bytes
 .../asciidoc/images/touch-icon-192x192.png    | Bin 0 -> 19800 bytes
 src/main/asciidoc/index-docinfo.html          |   5 ++
 src/main/asciidoc/index.asciidoc              |  12 ++++-
 src/main/asciidoc/new-features.adoc           |  15 ++++++
 src/main/asciidoc/overview.asciidoc           |  28 ++++++----
 src/main/asciidoc/stylesheets/golo.css        |   3 ++
 src/main/javadoc/overview.html                |   2 +-
 src/main/javadoc/stylesheet.css               |   7 +++
 15 files changed, 96 insertions(+), 38 deletions(-)
 delete mode 100644 src/main/asciidoc/connecting-redis.asciidoc
 create mode 100644 src/main/asciidoc/images/apple-touch-icon-144.png
 create mode 100644 src/main/asciidoc/images/apple-touch-icon-180.png
 create mode 100644 src/main/asciidoc/images/lettuce-green-text@2x.png
 create mode 100644 src/main/asciidoc/images/touch-icon-192x192.png
 create mode 100644 src/main/asciidoc/index-docinfo.html
 create mode 100644 src/main/asciidoc/new-features.adoc

diff --git a/README.md b/README.md
index d7eeee688d..2574142744 100644
--- a/README.md
+++ b/README.md
@@ -7,36 +7,37 @@ lettuce - Advanced Java Redis client
 Lettuce is a scalable thread-safe Redis client for synchronous,
 asynchronous and reactive usage. Multiple threads may share one connection if they avoid blocking and transactional
 operations such as `BLPOP` and  `MULTI`/`EXEC`.
-lettuce is built with [netty](https://github.com/netty/netty).
+Lettuce is built with [netty](https://github.com/netty/netty).
 Supports advanced Redis features such as Sentinel, Cluster, Pipelining, Auto-Reconnect and Redis data models.
 
-This version of lettuce has been tested against the latest Redis source-build.
+This version of Lettuce has been tested against the latest Redis source-build.
 
-* [synchronous](https://github.com/mp911de/lettuce/wiki/Basic-usage), [asynchronous](https://github.com/mp911de/lettuce/wiki/Asynchronous-API-%284.0%29) and [reactive](https://github.com/mp911de/lettuce/wiki/Reactive-API-%284.0%29) usage
-* [Redis Sentinel](https://github.com/mp911de/lettuce/wiki/Redis-Sentinel)
-* [Redis Cluster](https://github.com/mp911de/lettuce/wiki/Redis-Cluster)
-* [SSL](https://github.com/mp911de/lettuce/wiki/SSL-Connections) and [Unix Domain Socket](https://github.com/mp911de/lettuce/wiki/Unix-Domain-Sockets) connections
-* [Streaming API](https://github.com/mp911de/lettuce/wiki/Streaming-API)
-* [CDI](https://github.com/mp911de/lettuce/wiki/CDI-Support) and [Spring](https://github.com/mp911de/lettuce/wiki/Spring-Support) integration
-* [Codecs](https://github.com/mp911de/lettuce/wiki/Codecs) (for UTF8/bit/JSON etc. representation of your data)
-* multiple [Command Interfaces](https://github.com/mp911de/lettuce/wiki/Command-Interfaces-%284.0%29)
-* Compatible with Java 8 and 9 (automatic module w/o descriptors)
+* [synchronous](https://github.com/lettuce-io/lettuce-core/wiki/Basic-usage), [asynchronous](https://github.com/lettuce-io/lettuce-core/wiki/Asynchronous-API-%284.0%29) and [reactive](https://github.com/lettuce-io/lettuce-core/wiki/Reactive-API-%284.0%29) usage
+* [Redis Sentinel](https://github.com/lettuce-io/lettuce-core/wiki/Redis-Sentinel)
+* [Redis Cluster](https://github.com/lettuce-io/lettuce-core/wiki/Redis-Cluster)
+* [SSL](https://github.com/lettuce-io/lettuce-core/wiki/SSL-Connections) and [Unix Domain Socket](https://github.com/lettuce-io/lettuce-core/wiki/Unix-Domain-Sockets) connections
+* [Streaming API](https://github.com/lettuce-io/lettuce-core/wiki/Streaming-API)
+* [CDI](https://github.com/lettuce-io/lettuce-core/wiki/CDI-Support) and [Spring](https://github.com/lettuce-io/lettuce-core/wiki/Spring-Support) integration
+* [Codecs](https://github.com/lettuce-io/lettuce-core/wiki/Codecs) (for UTF8/bit/JSON etc. representation of your data)
+* multiple [Command Interfaces](https://github.com/lettuce-io/lettuce-core/wiki/Command-Interfaces-%284.0%29)
+* Compatible with Java 8 and 9 (implicit automatic module w/o descriptors)
 
-See the [Wiki](https://github.com/mp911de/lettuce/wiki) for more docs.
+See the [reference documentation](https://lettuce.io/docs/) and [Wiki](https://github.com/lettuce-io/lettuce-core/wiki) for more details.
 
 
 Communication
 ---------------
 
 * Google Group: [lettuce-redis-client-users](https://groups.google.com/d/forum/lettuce-redis-client-users) or lettuce-redis-client-users@googlegroups.com
-* [![Join the chat at https://gitter.im/mp911de/lettuce](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mp911de/lettuce?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-* [Github Issues](https://github.com/mp911de/lettuce/issues)
+* [![Join the chat at https://gitter.im/lettuce-io/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lettuce-io/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+* [Github Issues](https://github.com/lettuce-io/lettuce-core/issues)
 
 
 Documentation
 ---------------
 
-* [Wiki](https://github.com/mp911de/lettuce/wiki)
+* [Reference documentation](https://lettuce.io/docs/)
+* [Wiki](https://github.com/lettuce-io/lettuce-core/wiki)
 * [Javadoc](http://redis.paluch.biz/docs/api/releases/latest/)
 
 
@@ -45,7 +46,7 @@ Binaries/Download
 
 Binaries and dependency information for Maven, Ivy, Gradle and others can be found at http://search.maven.org.
 
-Releases of lettuce are available in the maven central repository. Take also a look at the [Download](https://github.com/mp911de/lettuce/wiki/Download) page in the [Wiki](https://github.com/mp911de/lettuce/wiki).
+Releases of lettuce are available in the Maven Central repository. Take also a look at the [Releases](https://github.com/lettuce-io/lettuce-core/releases).
 
 Example for Maven:
 
@@ -94,6 +95,10 @@ Shaded JAR-File (packaged dependencies  and relocated to the `io.lettuce.core` p
       <groupId>io.netty</groupId>
       <artifactId>netty-transport-native-epoll</artifactId>
     </exclusion>
+    <exclusion>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport-native-kqueue</artifactId>
+    </exclusion>
     <exclusion>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-pool2</artifactId>
@@ -119,7 +124,7 @@ to the lowercase Redis command name. Complex commands with multiple modifiers
 that change the result type include the CamelCased modifier as part of the
 command name, e.g. zrangebyscore and zrangebyscoreWithScores.
 
-See [Basic usage](https://github.com/mp911de/lettuce/wiki/Basic-usage) for further details.
+See [Basic usage](https://github.com/lettuce-io/lettuce-core/wiki/Basic-usage) for further details.
 
 Asynchronous API
 ------------------------
@@ -136,7 +141,7 @@ set.get() == "OK"
 get.get() == "value"
 ```
 
-See [Asynchronous API](https://github.com/mp911de/lettuce/wiki/Asynchronous-API-%284.0%29) for further details.
+See [Asynchronous API](https://github.com/lettuce-io/lettuce-core/wiki/Asynchronous-API-%284.0%29) for further details.
 
 Reactive API
 ------------------------
@@ -152,7 +157,7 @@ set.subscribe();
 get.toBlocking().single() == "value"
 ```
 
-See [Reactive API](https://github.com/mp911de/lettuce/wiki/Reactive-API-%284.0%29) for further details.
+See [Reactive API](https://github.com/lettuce-io/lettuce-core/wiki/Reactive-API-%284.0%29) for further details.
 
 Pub/Sub
 -------
@@ -172,7 +177,7 @@ are configured using a ```Makefile```. All tests run against Redis branch 3.0
 To build:
 
 ```
-$ git clone https://github.com/mp911de/lettuce.git
+$ git clone https://github.com/lettuce-io/lettuce-core.git
 $ cd lettuce/
 $ make prepare ssl-keys
 $ make test
@@ -187,7 +192,7 @@ $ make test
 Bugs and Feedback
 -----------
 
-For bugs, questions and discussions please use the [Github Issues](https://github.com/mp911de/lettuce/issues).
+For bugs, questions and discussions please use the [Github Issues](https://github.com/lettuce-io/lettuce-core/issues).
 
 License
 -------
@@ -199,5 +204,5 @@ Contributing
 -------
 
 Github is for social coding: if you want to write code, I encourage contributions through pull requests from forks of this repository. 
-Create Github tickets for bugs and new features and comment on the ones that you are interested in and take a look into [CONTRIBUTING.md](https://github.com/mp911de/lettuce/blob/master/.github/CONTRIBUTING.md)
-                  
+Create Github tickets for bugs and new features and comment on the ones that you are interested in and take a look into [CONTRIBUTING.md](https://github.com/lettuce-io/lettuce-core/blob/master/.github/CONTRIBUTING.md)
+                  
\ No newline at end of file
diff --git a/src/main/asciidoc/advanced-usage.asciidoc b/src/main/asciidoc/advanced-usage.asciidoc
index a99b48cbad..2c81355cf2 100644
--- a/src/main/asciidoc/advanced-usage.asciidoc
+++ b/src/main/asciidoc/advanced-usage.asciidoc
@@ -13,13 +13,17 @@
 include::{ext-doc}/Configuring-Client-resources.asciidoc[leveloffset=+2]
 
 [[client-options]]
-=== Client options
-include::{ext-doc}/Client-options.asciidoc[leveloffset=+2]
+=== Client Options
+include::{ext-doc}/Client-Options.asciidoc[leveloffset=+2]
 
 [[ssl]]
 === SSL Connections
 include::{ext-doc}/SSL-Connections.asciidoc[leveloffset=+2]
 
+[[native-transports]]
+=== Native Transports
+include::{ext-doc}/Native-Transports.asciidoc[leveloffset=+2]
+
 [[unix-domain-sockets]]
 === Unix Domain Sockets
 include::{ext-doc}/Unix-Domain-Sockets.asciidoc[leveloffset=+2]
diff --git a/src/main/asciidoc/connecting-redis.asciidoc b/src/main/asciidoc/connecting-redis.asciidoc
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/main/asciidoc/getting-started.asciidoc b/src/main/asciidoc/getting-started.asciidoc
index c48ad355c3..6cbfcec23a 100644
--- a/src/main/asciidoc/getting-started.asciidoc
+++ b/src/main/asciidoc/getting-started.asciidoc
@@ -1,5 +1,6 @@
 :ssl-link: <<ssl>>
 :uds-link: <<unix-domain-sockets>>
+:native-transport-link: <<native-transports>>
 :basic-synchronous-link: <<basic-usage,Synchronous>>
 :asynchronous-api-link: <<asynchronous-api>>
 :reactive-api-link: <<reactive-api>>
@@ -12,7 +13,7 @@ include::{ext-doc}/Getting-started-%285.0%29.asciidoc[leveloffset=+1]
 
 [[connecting-redis]]
 == Connecting Redis
-include::{ext-doc}/Redis-URI-and-connection-details.asciidoc[leveloffset=+1]
+include::{ext-doc}/Redis-URI-and-connection-details.asciidoc[]
 
 [[basic-usage]]
 === Basic Usage
diff --git a/src/main/asciidoc/images/apple-touch-icon-144.png b/src/main/asciidoc/images/apple-touch-icon-144.png
new file mode 100644
index 0000000000000000000000000000000000000000..8adb9fff097aa835424a0fb1c0fea7797fef91a3
GIT binary patch
literal 18372
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

literal 0
HcmV?d00001

diff --git a/src/main/asciidoc/images/apple-touch-icon-180.png b/src/main/asciidoc/images/apple-touch-icon-180.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0928b5316ed19c37568eb4af5e8053277f8c269
GIT binary patch
literal 19515
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
Q^WS@!n^+lF!MtMr2cS_A=Kufz

literal 0
HcmV?d00001

diff --git a/src/main/asciidoc/images/lettuce-green-text@2x.png b/src/main/asciidoc/images/lettuce-green-text@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..adff15525a19361a304f718107bcb8bf12b9a458
GIT binary patch
literal 11672
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
OQB&6Xt6b4K<o^Mb=WeI~

literal 0
HcmV?d00001

diff --git a/src/main/asciidoc/images/touch-icon-192x192.png b/src/main/asciidoc/images/touch-icon-192x192.png
new file mode 100644
index 0000000000000000000000000000000000000000..450da57d8a41635d5598440b154b7442ea57d7d4
GIT binary patch
literal 19800
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

literal 0
HcmV?d00001

diff --git a/src/main/asciidoc/index-docinfo.html b/src/main/asciidoc/index-docinfo.html
new file mode 100644
index 0000000000..d47a3c38a1
--- /dev/null
+++ b/src/main/asciidoc/index-docinfo.html
@@ -0,0 +1,5 @@
+<link rel="icon" type="image/png" href="images/apple-touch-icon-144.png"/>
+<link rel="apple-touch-icon-precomposed" sizes="180x180" href="images/apple-touch-icon-180.png">
+<link rel="shortcut icon" href="images/touch-icon-192x192.png">
+<meta name="msapplication-TileImage" content="images/apple-touch-icon-144.png">
+<link rel="icon" sizes="192x192" href="images/touch-icon-192x192.png">
\ No newline at end of file
diff --git a/src/main/asciidoc/index.asciidoc b/src/main/asciidoc/index.asciidoc
index 0589c3d6a5..91f3a34d2d 100644
--- a/src/main/asciidoc/index.asciidoc
+++ b/src/main/asciidoc/index.asciidoc
@@ -1,15 +1,25 @@
 = Lettuce Reference Guide
 Mark Paluch <https://twitter.com/mp911de[@mp911de]>;
-:ext-doc: https://raw.githubusercontent.com/wiki/mp911de/lettuce/
+:ext-doc: https://raw.githubusercontent.com/wiki/lettuce-core/lettuce-io
 {version}
 :doctype: book
 :icons: font
 :toc:
 :sectnums:
 :sectanchors:
+:docinfo:
+ifdef::backend-pdf[]
+:title-logo-image: images/lettuce-green-text@2x.png
+endif::[]
+
+ifdef::backend-html5[]
+image::lettuce-green-text@2x.png[width=50%,link=https://lettuce.io]
+endif::[]
 
 include::overview.asciidoc[]
 
+include::new-features.adoc[leveloffset=+1]
+
 include::getting-started.asciidoc[]
 
 include::ha-sharding.asciidoc[]
diff --git a/src/main/asciidoc/new-features.adoc b/src/main/asciidoc/new-features.adoc
new file mode 100644
index 0000000000..bb2cf6380e
--- /dev/null
+++ b/src/main/asciidoc/new-features.adoc
@@ -0,0 +1,15 @@
+[[new-features]]
+= New & Noteworthy
+
+[[new-features.5-0-0]]
+== What's new in Lettuce 5.0
+* New artifact coordinates: `io.lettuce:lettuce-core` and packages moved from `com.lambdaworks.redis` to `io.lettuce.core`.
+* <<reactive-api,Reactive API>> now Reactive Streams-based using https://projectreactor.io/[Project Reactor].
+* <<redis-command-interfaces,Redis Command Interfaces>> supporting dynamic command invocation and Redis Modules.
+* Enhanced, immutable Key-Value objects.
+* Asynchronous Cluster connect.
+* Native transport support for Kqueue on macOS systems.
+* Removal of support for Guava.
+* Removal of deprecated `RedisConnection` and `RedisAsyncConnection` interfaces.
+* Java 9 compatibility.
+* HTML and PDF reference documentation along with a new project website: https://lettuce.io.
diff --git a/src/main/asciidoc/overview.asciidoc b/src/main/asciidoc/overview.asciidoc
index edcddb60e4..6426f263ac 100644
--- a/src/main/asciidoc/overview.asciidoc
+++ b/src/main/asciidoc/overview.asciidoc
@@ -1,11 +1,11 @@
 [[overview]]
 == Overview
 
-This document is the reference guide for lettuce. It explains how to use lettuce, its concepts, semantics, and the syntax.
+This document is the reference guide for Lettuce. It explains how to use Lettuce, its concepts, semantics, and the syntax.
 
 You can read this reference guide in a linear fashion, or you can skip sections if something does not interest you.
 
-This section provides some basic introduction to Redis. The rest of the document refers only to lettuce features and assumes the user is familiar with Redis concepts.
+This section provides some basic introduction to Redis. The rest of the document refers only to Lettuce features and assumes the user is familiar with Redis concepts.
 
 [[overview.redis]]
 === Knowing Redis
@@ -34,34 +34,42 @@ Lettuce is a scalable thread-safe Redis client based on http://netty.io[netty] a
 [[overview.requirements]]
 === Requirements
 
-lettuce 4.x and 5.x binaries requires JDK level 8.0 and above.
+Lettuce 4.x and 5.x binaries requires JDK level 8.0 and above.
 
 In terms of http://redis.io/[Redis], at least 2.6.
 
 === Additional Help Resources
 
-Learning a new framework is not always straight forward. In this section, we try to provide what we think is an easy to follow guide for starting with lettuce. However, if you encounter issues or you are just looking for an advice, feel free to use one of the links below:
+Learning a new framework is not always straight forward. In this section, we try to provide what we think is an easy to follow guide for starting with Lettuce. However, if you encounter issues or you are just looking for an advice, feel free to use one of the links below:
 
 [[overview.support]]
 ==== Support
 
 There are a few support options available:
 
- * Lettuce on Stackoverflow http://stackoverflow.com/questions/tagged/lettuce[Stackoverflow] is a tag for all lettuce users to share information and help each other. Note that registration is needed *only* for posting.
- * Get in touch with the community on https://gitter.im/mp911de/lettuce[Gitter].
- * Google Group: https://groups.google.com/d/forum/lettuce-redis-client-users[lettuce-redis-client-users] or mailto:lettuce-redis-client-users@googlegroups.com
- * Report bugs (or ask questions) in Github issues https://github.com/mp911de/lettuce/issues
+ * Lettuce on Stackoverflow http://stackoverflow.com/questions/tagged/lettuce[Stackoverflow] is a tag for all Lettuce users to share information and help each other. Note that registration is needed *only* for posting.
+ * Get in touch with the community on https://gitter.im/lettuce-io/Lobby[Gitter].
+ * Google Group: https://groups.google.com/d/forum/lettuce-redis-client-users[lettuce-redis-client-users] or mailto:lettuce-redis-client-users@googlegroups.com[lettuce-redis-client-users@googlegroups.com].
+ * Report bugs (or ask questions) in Github issues https://github.com/lettuce-io/lettuce-core/issues.
 
 [[overview.development]]
 ==== Following Development
 
-For information on the lettuce source code repository, nightly builds and snapshot artifacts please see the https://redis.paluch.biz[lettuce homepage]. You can help make lettuce best serve the needs of the lettuce community by interacting with developers through the Community on http://stackoverflow.com/questions/tagged/lettuce[Stackoverflow]. To follow developer activity look for the mailing list information on the https://redis.paluch.biz[lettuce homepage]. If you encounter a bug or want to suggest an improvement, please create a ticket on the lettuce issue https://github.com/mp911de/lettuce/issues[tracker].
+For information on the Lettuce source code repository, nightly builds and snapshot artifacts please see the https://lettuce.io[Lettuce homepage]. You can help make lettuce best serve the needs of the lettuce community by interacting with developers through the Community on http://stackoverflow.com/questions/tagged/lettuce[Stackoverflow]. To follow developer activity look for the mailing list information on the https://lettuce.io[lettuce homepage]. If you encounter a bug or want to suggest an improvement, please create a ticket on the lettuce issue https://github.com/lettuce-io/lettuce-core/issues[tracker].
+
+==== Project Metadata
+
+* Version Control – https://github.com/lettuce-io/lettuce-core
+* Releases and Binary Packages – https://github.com/lettuce-io/lettuce-core/releases
+* Issue tracker – https://github.com/lettuce-io/lettuce-core/issues
+* Release repository – https://repo1.maven.org/maven2/ (Maven Central)
+* Snapshot repository – https://oss.sonatype.org/content/repositories/snapshots/ (OSS Sonatype Snapshots)
 
 === Where to go from here
  * Head to <<getting-started>> if you feel like jumping straight into the code.
  * Go to <<ha-sharding>> for Master/Slave, Redis Sentinel and Redis Cluster topics.
  * In order to dig deeper into the core features of Reactor:
  ** If you’re looking for client configuration options, performance related behavior and how to use various transports, go to <<advanced-usage>>.
- ** See <<integration-extension>> for extending lettuce with codecs or integrate it in your CDI/Spring application.
+ ** See <<integration-extension>> for extending Lettuce with codecs or integrate it in your CDI/Spring application.
  ** You want to know more about *at-least-once* and *at-most-once*? Take a look into <<command-execution-reliability>>.
 
diff --git a/src/main/asciidoc/stylesheets/golo.css b/src/main/asciidoc/stylesheets/golo.css
index ad9599836d..d767f003d5 100644
--- a/src/main/asciidoc/stylesheets/golo.css
+++ b/src/main/asciidoc/stylesheets/golo.css
@@ -438,14 +438,17 @@ h1 small, h2 small, h3 small, #toctitle small, .sidebarblock > .content > .title
 
 h1 {
     font-size: 2.125em;
+    line-height: 2em;
 }
 
 h2 {
     font-size: 1.6875em;
+    line-height: 1.5em;
 }
 
 h3, #toctitle, .sidebarblock > .content > .title {
     font-size: 1.375em;
+    line-height: 1.3em;
 }
 
 h4 {
diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
index 63ea922fe1..4a82900436 100644
--- a/src/main/javadoc/overview.html
+++ b/src/main/javadoc/overview.html
@@ -1,5 +1,5 @@
 <body>
-<a href="http://github.com/lettuce-io/lettuce-core">lettuce</a> is a scalable thread-safe Java
+<a href="http://github.com/lettuce-io/lettuce-core">Lettuce</a> is a scalable thread-safe Java
 {@link io.lettuce.core.RedisClient RedisClient} providing
 {@link io.lettuce.core.api.sync.RedisCommands synchronous},
 {@link io.lettuce.core.api.async.RedisAsyncCommands asynchronous} and
diff --git a/src/main/javadoc/stylesheet.css b/src/main/javadoc/stylesheet.css
index 707664e2f5..57fb64b57e 100644
--- a/src/main/javadoc/stylesheet.css
+++ b/src/main/javadoc/stylesheet.css
@@ -50,6 +50,10 @@ a:active {
     text-decoration:none;
     color:#6db33f;
 }
+a[href^="http"] {
+    color: #16906a;
+}
+
 a[name] {
     color:#353833;
 }
@@ -104,6 +108,9 @@ table tr td dt code {
 sup {
     font-size:8px;
 }
+/*
+Document title and Copyright styles
+*/
 .clear {
     clear:both;
     height:0px;

From 9eb8b1ec2e520d0d324c2b7a09b3570c3dc7ff80 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 28 Sep 2017 11:27:34 +0200
Subject: [PATCH 301/808] Update release notes #607

---
 RELEASE-NOTES.md | 685 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 676 insertions(+), 9 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 4258e2d7b0..caa476f539 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,17 +1,482 @@
-Lettuce 5.0.0 RC2 RELEASE NOTES
-==================================
+Lettuce 5.0.0 RELEASE NOTES
+===========================
 
-This release ships with 12 issues resolved and upgraded dependencies that are 
-breaking for Lettuce. 
+After a 13 months development phase and 208 solved tickets, 
+it is my pleasure to announce general availability of Lettuce 5.0.
 
-Browse the docs at https://lettuce.io/core/snapshot/reference/.
+This is a major release coming with several breaking changes and new interesting
+features. 
 
-This release asserts compatibility in class-path mode with Java 9 requiring 
-at least netty 4.1.11.Final.
+Lettuce 5 introduces the dynamic Redis Commands API. This programming
+model enables you to declare command methods and invoke commands to your needs and
+support Redis Modules without waiting for Lettuce to support new commands.
 
-Thanks to all contributors that made Lettuce 5.0.0.RC2 possible.
+Lettuce defaults to native transport (epoll, kqueue) on Linux respective macOS systems 
+if the native dependency is available. You can disable this behavior by setting the 
+system property `io.lettuce.core.epoll` and `io.lettuce.core.kqueue` to `false`.
 
-Lettuce 5.0.0.RC2 requires Java 8 and cannot be used with Java 6 or 7.
+Lettuce 5 comes with breaking changes; it removes deprecated interfaces 
+RedisConnection and RedisAsyncConnection and their segregated interfaces in 
+favor of StatefulRedisConnection and RedisCommands et al.
+
+Major breaking changes:
+
+ 1. We moved the artifact coordinates from biz.paluch.redis:lettuce to io.lettuce:lettuce-core
+ 2. We relocated packages from biz.paluch.redis to io.lettuce.core. The migration path is
+    straight-forward by replacing the old package name in your imports with the new package name.
+ 3. The documentation has moved from http://redis.paluch.biz to https://lettuce.io.
+ 4. Removed Guava.
+ 5. We removed some deprecated methods, see below for full details.
+
+Lettuce requires only Netty and Project Reactor which brings us to the next change. 
+The reactive API is based on Reactive Streams by using 
+Project Reactor types `Mono` and `Flux` instead of RxJava 1 and `Observable`.
+Existing users can convert `Mono` and `Flux` by using `rxjava-reactive-streams`.
+
+This release introduces a new reference guide that is shipped along the regular artifacts. 
+The reference guide is bound to a particular version and does not change over time, 
+such as the Wiki.
+
+Reference documentation: https://lettuce.io/core/release/reference/.
+JavaDoc documentation: https://lettuce.io/core/release/api/.
+
+```xml
+<dependency>
+  <groupId>io.lettuce</groupId>
+  <artifactId>lettuce-core</artifactId>
+  <version>5.0.0.RELEASE</version>
+</dependency>
+```
+
+You can find the full change log, containing all changes since the first 5.0 milestone release,
+at the end of this document. Watch out for BREAKING changes.
+
+Thanks to all contributors that made Lettuce 5 possible.
+
+
+Dynamic Redis Commands API
+--------------------------
+
+The Redis Command Interface abstraction provides a dynamic way for typesafe Redis 
+command invocation. It allows you to declare an interface with command methods to 
+significantly reduce boilerplate code required to invoke a Redis command.
+
+Redis is a data store supporting over 190 documented commands and over 450 
+command permutations.  Command growth and keeping track with upcoming 
+modules are challenging for client developers and Redis user as there is no 
+full command coverage for each module in a single Redis client.
+
+Invoking a custom command with Lettuce requires several lines of code to 
+define command structures pass in arguments and specify the return type.
+
+```java
+RedisCodec<String, String> codec = new StringCodec();
+RedisCommands<String, String> commands = ...
+
+String response = redis.dispatch(CommandType.SET, new StatusOutput<>(codec),
+                new CommandArgs<>(codec)
+                       .addKey(key)
+                       .addValue(value));
+```
+
+The central interface in Lettuce Command Interface abstraction is `Commands`. 
+This interface acts primarily as a marker interface to help you to discover 
+interfaces that extend this one. You can declare your own command interfaces 
+and argument sequences where the command name is derived from the method name or 
+provided with `@Command`. Introduction of new commands does not require you 
+to wait for a new Lettuce release but they can invoke commands through own declaration. 
+That interface could be also supporting different key and value types, depending on the use-case.
+
+Commands are executed applying synchronization, asynchronous and in a reactive fashion, 
+depending on the method declaration.
+
+```java
+public interface MyRedisCommands extends Commands {
+
+    String get(String key); // Synchronous Execution of GET
+
+    @Command("GET")
+    byte[] getAsBytes(String key); // Synchronous Execution of GET returning data as byte array
+
+    @Command("SET") // synchronous execution applying a Timeout
+    String setSync(String key, String value, Timeout timeout);
+
+    Future<String> set(String key, String value); // asynchronous SET execution
+
+    @Command("SET")
+    Mono<String> setReactive(String key, String value); // reactive SET execution using SetArgs
+
+    @CommandNaming(split = DOT) // support for Redis Module command notation -> NR.RUN
+    double nrRun(String key, int... indexes);
+}
+
+RedisCommandFactory factory = new RedisCommandFactory(connection);
+
+MyRedisCommands commands = factory.getCommands(MyRedisCommands.class);
+
+String value = commands.get("key");
+```
+
+You get a whole lot new possibilities with Redis Command Interfaces. This release
+provides initial support. Future versions are likely to support RxJava 1/2 reactive
+types so RxJava 1 users have a migration path that allows using native types without
+further conversion.
+
+See also: https://lettuce.io/core/snapshot/reference/#redis-command-interfaces
+
+Command Interface Batching
+--------------------------
+
+Command interfaces support command batching to collect multiple commands in a 
+batch queue and flush the batch in a single write to the transport. 
+Command batching executes commands in a deferred nature. This means that 
+at the time of invocation no result is available. Batching can be only used 
+with synchronous methods without a return value (void) or asynchronous 
+methods returning a RedisFuture.
+
+Command batching can be enabled on two levels:
+
+* On class level by annotating the command interface with @BatchSize. 
+  All methods participate in command batching.
+* On method level by adding CommandBatching to the arguments. 
+  Method participates selectively in command batching.
+
+```java
+@BatchSize(50)
+interface StringCommands extends Commands {
+
+    void set(String key, String value);
+
+    RedisFuture<String> get(String key);
+
+    RedisFuture<String> get(String key, CommandBatching batching);
+}
+
+StringCommands commands = …
+
+commands.set("key", "value"); // queued until 50 command invocations reached.
+                              // The 50th invocation flushes the queue.
+
+commands.get("key", CommandBatching.queue()); // invocation-level queueing control
+commands.get("key", CommandBatching.flush()); // invocation-level queueing control,
+                                              // flushes all queued commands
+```
+
+Read more: https://lettuce.io/core/snapshot/reference/#command-interfaces.batch
+
+
+Migration to Reactive Streams (Project Reactor)
+-----------------------------------------------
+
+Lettuce 4.0 introduced a reactive API based on RxJava 1 and `Observable`.
+This was the beginning of reactive Redis support. Lettuce used `Observable`
+all over the place as other reactive types like `Single` and `Completable` were
+still beta or in development.
+
+Since that time, a lot changed in the reactive space. RxJava 2 is the successor
+of RxJava 1 which has now reached end of life. RxJava 2 is not entirely 
+based on Reactive Streams and baselines to Java 6 while other composition
+libraries can benefit from a Java 8. 
+
+This also means, no `null` values and usage of dedicated value types to express
+value multiplicity (`0|1` and `0|1|N`) on the API.
+
+With Lettuce 5.0, the reactive API uses Project Reactor with
+its `Mono` and `Flux` types.
+
+**4.3 and earlier**
+
+```java
+Observable<Long> del(K... keys);
+
+Observable<K> keys(K pattern);
+
+Observable<V> mget(K... keys);
+```
+
+**5.0**
+
+```java
+Mono<Long> del(K... keys);
+
+Flux<K> keys(K pattern);
+
+Flux<KeyValue<K, V>> mget(K... keys);
+```
+
+Switching from RxJava 1 to Project Reactor use requires switching the library. Most
+operators use similar or even same names. If you're required to stick to RxJava 1,
+the use `rxjava-reactive-streams` to adopt reactive types (RxJava 1 <-> Reactive Streams).
+
+Migrating to Reactive Streams requires value wrapping to indicate absence of values.
+You will find differences in comparison to the previous API and to the sync/async API
+in cases where commands can return `null` values. Lettuce 5.0 comes with
+new `Value` types that are monads encapsulating a value (or their absence).
+
+See also: https://lettuce.io/core/snapshot/reference/#reactive-api
+
+
+Value, KeyValue, and other value types
+--------------------------------------
+
+The reactive story facilitates immutable types so this release enhances existing value 
+types and introduces new types to reduce `null` usage and facilitate functional programming. 
+
+Value types are based on `Value` and `KeyValue`/`ScoredValue` extend from there.
+Value is a wrapper type encapsulating a value or its absence. A `Value` can
+be created in different ways:
+
+```java
+Value<String> value = Value.from(Optional.of("hello"));
+
+Value<String> value = Value.fromNullable(null);
+
+Value<String> value = Value.just("hello");
+
+KeyValue<Long, String> value = KeyValue.from(1L, Optional.of("hello"));
+ 
+KeyValue<String, String> value = KeyValue.just("key", "hello");
+```
+
+It transforms to `Optional` and `Stream` to integrate with other 
+functional uses and allows value mapping.
+
+```java
+Value.just("hello").stream().filter(…).count();
+
+KeyValue.just("hello").optional().isPresent();
+
+Value.from(Optional.of("hello")).map(s -> s + "-world").getValue();
+
+ScoredValue.just(42, "hello").mapScore(number -> number.doubleValue() * 3.14d).getScore();
+```
+
+You will also find that all public fields of value types are encapsulated with
+getters and these fields are no longer accessible.
+
+
+Backoff/Delay strategies
+------------------------
+
+_Thanks to @jongyeol_
+
+When running cloud-based services with a multitude of services that use Redis,
+then network partitions impact Redis server connection heavily once 
+the partition ends. A network partition impacts all disconnected applications 
+at the same time and all nodes start reconnecting more or less at the same time.
+
+As soon as the partition ends, the majority of applications reconnect at the same time.
+Jitter backoff strategies leverage the impact as the time of reconnecting is randomized.
+
+Lettuce comes with various backoff implementations:
+
+* Equal Jitter
+* Full Jitter
+* Decorrelated Jitter
+
+These are configured in `ClientResources`:
+
+```java
+DefaultClientResources.builder()
+        .reconnectDelay(Delay.decorrelatedJitter())
+        .build();
+
+DefaultClientResources.builder()
+        .reconnectDelay(Delay.equalJitter())
+        .build();
+```
+
+See also: https://www.awsarchitectureblog.com/2015/03/backoff.html and
+https://lettuce.io/core/snapshot/reference/#clientresources.advanced-settings
+
+
+New API for Z...RANGE commands
+-------------------------------
+
+Sorted Sets range commands come with a streamlined API regarding method overloads.
+Commands like `ZRANGEBYSCORE`, `ZRANGEBYLEX`, `ZREMRANGEBYLEX` and several others
+now declare methods accepting `Range` and `Limit` objects instead of an growing
+parameter list. The new `Range` allows score and value types applying the proper
+binary encoding.
+
+**4.2 and earlier**
+
+```java
+commands.zcount(key, 1.0, 3.0)
+
+commands.zrangebyscore(key, "-inf", "+inf")
+
+commands.zrangebyscoreWithScores(key, "[1.0", "(4.0")
+
+commands.zrangebyscoreWithScores(key, "-inf", "+inf", 2, 2)
+```
+
+**Since 5.0**
+
+```java
+commands.zcount(key, Range.create(1.0, 3.0));
+
+commands.zrangebyscore(key, Range.unbounded());
+
+commands.zrangebyscoreWithScores(key, Range.from(Boundary.including(1.0), Boundary.excluding(4.0));
+
+commands.zrangebyscoreWithScores(key, Range.unbounded(), Limit.create(2, 2));
+```
+
+Good bye, Guava
+---------------
+
+Lettuce 5.0 no longer uses Google's Guava library. Guava was a good friend
+back in the Java 6-compatible days where `Future` synchronization and callbacks
+were no fun to use. That changed with Java 8 and `CompletableFuture`.
+
+Other uses like `HostAndPort` or `LoadingCache` could be either inlined or
+replaced by Java 8's Collection framework.
+
+
+Removal of deprecated interfaces and methods
+--------------------------------------------
+
+This release removes deprecated interfaces `RedisConnection` and `RedisAsyncConnection`
+and their segregated interfaces in favor of `StatefulRedisConnection` and `RedisCommands`.
+ 
+You will notice slight differences when using that API. Transactional commands and 
+database selection are no longer available through the Redis Cluster API as the 
+old API was derived from the standalone API. `RedisCommands` and `RedisAsyncCommands`
+are no longer `Closeable`. Please use `commands.getStatefulConnection().close()` to 
+close a connection. This change removes ambiguity over closing the commands interface
+over closing the connection.
+
+Connection pooling replacement
+------------------------------
+
+It took quite a while but 4.3 deprecated Lettuce's existing connection pooling
+support. That are in particular `RedisClient.pool(…)` and `RedisClient.asyncPool(…)`. 
+These methods are removed with Lettuce 5.0.
+
+Connection pooling had very limited support and would require additional overloads
+that clutter the API to expose pooling for all supported connections.
+This release brings a replacement, that is customizable
+and does not pollute the API. `ConnectionPoolSupport` provides methods to
+create a connection pool accepting a factory method and pool configuration.
+
+Returned connection objects are proxies that return the connection to its pool
+when calling `close()`. `StatefulConnection` implement `Closeable` to
+allow usage of try-with-resources.
+
+```java
+GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
+        .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig());
+
+
+try(StatefulRedisConnection<String, String> connection = pool.borrowObject()) {
+    // Work
+}
+
+
+pool.close();
+```
+
+
+Redis Cluster topology refresh consensus
+----------------------------------------
+
+Cluster topology refreshing can lead in some cases (dynamic topology sources)
+to orphaning. This can happen if a cluster node is removed from the cluster and
+lettuce decides to accept the topology view of that removed node. Lettuce 
+gets stuck with that node and is not able to use the remaining cluster.
+
+This release introduces `PartitionsConsensus` strategies to determine the most
+appropriate topology view if multiple views are acquired. The strategy can be
+customized by overriding 
+`RedisClusterClient.determinePartitions(Partitions, Map<RedisURI, Partitions>)`.
+
+Lettuce defaults choosing the topology view with the majority of previously known
+cluster nodes. This helps Lettuce to stick with the cluster that consists of the
+most nodes.
+ 
+See also: https://github.com/lettuce-io/lettuce-core/issues/355
+
+
+Asynchronous Connections in Redis Cluster
+-----------------------------------------
+
+RedisClusterClient now connects asynchronously without intermediate 
+blocking to cluster nodes. The connection progress is shared between
+multiple threads that request a cluster node connection for the first time.
+Previously, connection was sequential-synchronous. Each connection attempt
+blocked subsequent attempts from other threads. If a cluster node connection
+ran into a timeout, threads were penalized with a growing wait time. If, say, 10 
+threads waited for a connection, the last thread had to wait up to 10 times 
+the connection timeout.
+
+Asynchronous connection initiates the connection once using internally a 
+`Future` so multiple concurrent connection attempts share the resulting
+`Future`. Errors fail now faster and cluster node usage is fully asynchronous
+without synchronization and without the danger to run into a threading deadlock.
+
+
+Redis Cluster Pub/Sub on Node-Selections
+----------------------------------------
+`RedisClusterClient.connectPubSub()` now returns a 
+`StatefulRedisClusterPubSubConnection` that allows registration of 
+`RedisClusterPubSubListener`s and subscription on particular cluster nodes.
+
+Cluster node-specific subscriptions allow usage of keyspace notifications. 
+Keyspace notifications are different from userspace Pub/Sub since keyspace 
+notifications don't broadcast to the entire cluster but are published only 
+on the node the notification happens. A common usecase is when a key expires 
+in the cluster.
+
+```
+StatefulRedisClusterPubSubConnection connection = client.connectPubSub();
+
+connection.addListener(…);
+
+connection.setNodeMessagePropagation(true);
+
+RedisClusterPubSubCommands<String, String> sync = connection.sync();
+sync.slaves().commands().psubscribe("__key*__:expire");
+```
+
+
+Native Transports
+-----------------
+Lettuce now uses native transports by default, if the operating system is 
+qualified and dependencies are available. Lettuce supports epoll (on 
+Linux-based systems) since 4.0 and since this version kqueue (BSD-based
+systems, like macOS).
+
+Epoll usage can be disabled with system properties by setting 
+`io.lettuce.core.epoll=false`. In a similar way, kqueue can be disabled 
+with `io.lettuce.core.kqueue=false`.
+
+Epoll dependency:
+
+```xml
+<dependency>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-transport-native-epoll</artifactId>
+    <version>${netty-version}</version>
+    <classifier>linux-x86_64</classifier>
+</dependency>
+```
+
+Kqueue dependency:
+
+```xml
+<dependency>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-transport-native-kqueue</artifactId>
+    <version>${netty-version}</version>
+    <classifier>osx-x86_64</classifier>
+</dependency>
+```
+
+
+Thanks to all contributors that made Lettuce 5.0.0.RELEASE possible.
+
+Lettuce 5.0.0.RELEASE requires Java 8 and cannot be used with Java 6 or 7.
 
 If you need any support, meet Lettuce at:
 
@@ -20,8 +485,117 @@ If you need any support, meet Lettuce at:
 * GitHub Issues: https://github.com/lettuce-io/lettuce-core/issues
 * Documentation: https://lettuce.io/docs/
 
+
+Commands
+--------
+* Add support for TOUCH command #270
+* Add support for variadic LPUSHX and RPUSHX #267
+* Adopt fixed GEODIST/GEOHASH behavior in tests #362
+* Provide a more conceise API for Sorted Set query operations using Range/Limit #363
+* Add EVAL and EVALSHA to ReadOnlyCommands #366 (Thanks to @amilnarski)
+* Add support for ZADD INCR with ZAddArgs #367 (Thanks to @christophstrobl)
+* Add support for ZREVRANGEBYLEX command #369 (Thanks to @christophstrobl)
+* Add support for SWAPDB #375
+* Support CLIENT and INFO commands for Redis Sentinel #415
+* Disable WAIT as Read-Only command #418
+
 Enhancements
 ------------
+* [BREAKING] Remove deprecated interfaces and methods #156
+* [BREAKING] Remove Google Guava usage #217
+* Add support for OpenSSL as SSL provider #249
+* Add SocketOptions to ClientOptions #269
+* [BREAKING] Replacement support for connection pooling #264
+* Add ToByteBufEncoder and improved StringCodec #275
+* Allow configuration of a trust store password #292
+* Replace Guava Cache by ConcurrentHashMap #300
+* Eager initialization of API wrappers in stateful connections #302 (Thanks to @jongyeol)
+* Change MethodTranslator's loadfactor to 1.0 for sync APIs performance #305 (Thanks to @jongyeol)
+* Reattempt initially failed Sentinel connections in Master/Slave API #306
+* Use MethodHandle.Lookup.findSpecial(…) for default method lookup #310
+* Decouple CommandHandler #317
+* [BREAKING] Use TransactionResult for transaction results #320
+* Replace synchronized setters with volatile fields #326 (Thanks to @guperrot)
+* Add workaround for IPv6 parsing #332
+* Add ConnectionWatchdog as last handler #335
+* Provide multi-key-routing for exists and unlink commands using Redis Cluster #334
+* [BREAKING] Migrate lettuce reactive API to Reactive Streams #349
+* Provide Value types #350
+* Provide Timer as part of ClientResources #354 (Thanks to @plokhotnyuk)
+* Add support for topology consensus #355
+* Use Limit in SortArgs #364
+* Add jitter backoff strategies for spreading reconnection timing #365 (Thanks to @jongyeol)
+* Accept double in ZStoreArgs.weights #368 (Thanks to @christophstrobl)
+* Consider role changes as trigger for update using MasterSlave connections #370
+* Provide a dynamic Redis Command API #371
+* Support lettuce parameter types #381
+* Add reactive wrapper converters for RxJava1 and 2 #383
+* Support value ranges #384
+* Allow Pub/Sub subscriptions on a node selection within Redis Cluster #385
+* Expose Value.map methods #386
+* [BREAKING] Remove deprecated LettuceFutures.await method #388
+* [BREAKING] Remove ExperimentalByteArrayCodec and enhance ByteArrayCodec #389
+* Use StringCodec from Utf8StringCodec #393
+* Provide synchronous ScanIterator API #397
+* Propagate backpressure to the transport channel #394
+* Default to epoll transport if available #402
+* Simplify NodeSelection implementation #408
+* [BREAKING] Remove addListener/removeListener methods from execution-specific Pub/Sub interfaces #412
+* [BREAKING] Remove close method from Redis Sentinel command interfaces #415
+* Allow setting client name with RedisURI #416
+* Extend RedisConnectionStateListener.onRedisConnected by adding SocketAddress #419
+* Decompose array parameters into single command arguments #421
+* Consider key/value type of parameter wrappers in codec resolution #423
+* Connect asynchronously in cluster topology refresh #424
+* Perform resilient Master/Slave topology refresh ping #424
+* Return ClusterClientOptions.Builder in socketOptions and sslOptions methods #425
+* Use ResolvableType for type resolution #426
+* Propagate cause if cluster topology refresh can't connect to any node #427
+* Propagate asynchronous connection initialization #429
+* Dynamic API: Support command batching #432
+* Reuse stale connections collection when closing stale connections #443
+* Add ReadFrom.SLAVE_PREFERRED #452
+* Share cluster node connection progress with request threads #453
+* Send collection of commands as batch through StatefulConnection and ChannelWriter #456
+* Use EnumSet to determine Read-Only commands #457
+* Encapsulate fields in Commands implementations and command builder #458
+* Refactor command creation and execution to ExecutableCommand creation #463
+* [BREAKING] Use String-Codec for COMMAND #467
+* Create a static call chain in InvocationProxyFactory #468
+* Initialize RedisStateMachine.LongProcessor in static initializer #481 (Thanks to @hellyguo)
+* Add shutdownAsync to AbstractRedisClient #485 (Thanks to @jongyeol)
+* Propagate asynchronous connections to ClusterConnectionProvider #486 (@Thanks to @jeniok)
+* Resolve hostnames using netty's DNS resolver #498
+* Introduce NettyCustomizer API #499 (Thanks to @jongyeol)
+* Use asynchronous node connect in NodeSelection #500
+* Gracefully degrade to successfully connected Cluster read candidates #503 (Thanks to @eliotw)
+* Implement counting Deque #507 (Thanks to @CodingFabian)
+* Use ThreadLocalRandom instead of Random #510
+* Replace consumer completion List in CommandWrapper with Array #511
+* Consider ConnectionFuture state in ClusterDistributionChannelWriter #511
+* Replace first arg fields in CommandArgs with CommandArgsAccessor #511
+* Merge Command completion state fields to a single status field #511
+* Move command latency metrics to LatencyMeteredCommand #511
+* Close the connection when Redis protocol is corrupted #512 (Thanks to @jongyeol)
+* Allow setting the Redis password as char-array #513
+* Replace synchronized reconnect in ConnectionWatchdog with asynchronous connect #514
+* Improve cleanup of PauseDetector #516
+* [BREAKING] Drop netty 4.0 compatibility #518
+* Upgrade AsyncExecutions to use CompletableFuture #522
+* Support default methods on Command Interfaces #527
+* Improve Epoll availability detection #535
+* Align log prefix for CommandHandler and ConnectionWatchdog #538
+* Add support for kqueue transport #539
+* Add support for client certificate authentication #540
+* Adopt to changed SLOWLOG output #551
+* Use pre-instantiated ByteBufProcessor in RedisStateMachine to find EOL #557
+* SlotHash.getSlot(…) duplicates bytes while slot calculation #558
+* Replace CountDownLatch in AsyncCommand with AtomicFieldUpdater #559
+* Expose asynchronous connection creation API #561
+* [BREAKING] Refactor CONFIG GET output from List<String> to Map<String, String> #562
+* clientSetname does not set client name on default connection #563 
+* Adopt to read-only variant GEORADIUS(BYMEMBER)_RO #564
+* [BREAKING] Switch to Duration for timeouts #570
 * Optimization for ValueListOutput #573 (Thanks to @CodingFabian)
 * Enhance argument caching #575
 * Introduce MethodTranslator caching #580
@@ -29,6 +603,56 @@ Enhancements
 
 Fixes
 -----
+* Fix JavaDoc for blocking list commands #272
+* Guard key parameters against null values #287
+* CommandArgs.ExperimentalByteArrayCodec fails to encode bulk string #288
+* Guard value parameters against null values #291 (Thanks to @christophstrobl)
+* Allow coordinated cross-slot execution using Iterable #303 (Thanks to @agodet)
+* Allow MasterSlave connection using Sentinel if some Sentinels are not available #304 (Thanks to @RahulBabbar)
+* Use at least 3 Threads when configuring default thread count #309
+* Replace own partition host and port only if the reported connection point is empty #312
+* Lettuce RedisClusterClient calls AUTH twice #313
+* Record sent-time on command queueing #314 (Thanks to @HaloFour)
+* CommandHandler notifications called out of order #315
+* [BREAKING] Disable SYNC command #319
+* ASK bit not set on ASK redirection #321 (Thanks to @kaibaemon)
+* Check for isUnsubscribed() before calling subscriber methods #323 (Thanks to @vleushin)
+* Avoid timeouts for cancelling command #325 (Thanks to @jongyeol)
+* Guard command completion against exceptions #331
+* Store error at output-level when using NestedMultiOutput #328 (Thanks to @jongyeol)
+* Fix master and slave address parsing for IPv6 addresses #329 (Thanks to @maksimlikharev)
+* Fix srandmember return type from Set to List #330 (Thanks to @jongyeol)
+* Add synchronization to Partitions/Use read-view for consistent Partition usage during Partitions updates #333 (Thanks to @OutOfBrain)
+* Run cluster command redirects on event executor threads #340 (Thanks to @oklahomer)
+* Close connections in PooledClusterConnectionProvider on connection failures #343
+* Consider number of redirections instead of executions for cluster commands #344 (Thanks to @Spikhalskiy)
+* Ensure unique reconnect scheduling #346
+* Guard ConnectionWatchdog against NPE from missing CommandHandler #358
+* Fix RedisAdvancedClusterAsyncCommandsImpl.msetnx return value #376 (Thanks to @mjaow)
+* Allow hostnames in MasterSlaveTopologyProvider when parsing in master_host #377 (Thanks to @szabowexler)
+* Allow empty values in BITFIELD using the reactive API #378
+* Support integer width multiplied offsets in BITFIELD #379 (Thanks to @christophstrobl)
+* Propagate array sizes in MultiOutput #380 (Thanks to @christophstrobl)
+* Update code samples in readme to Lettuce 4.0 #410
+* Apply proxy wrapper to obtained pooled connections #411
+* Allow databases greater than 15 in RedisURI #420
+* Consider Wildcard types in type information and assignability #431
+* Expose a protected default constructor for RedisClusterClient #438
+* Ensure RoundRobinSocketAddressSupplier consistency before returning a SocketAddress #440
+* Fix Partitions.addPartition(…) and Partitions.reload(…) synchronization #442
+* Fix authenticated PING before connect with Redis Sentinel #448
+* Close connections in PooledClusterConnectionProvider.close() #460
+* Read connect future in ReconnectHandler to local variable #465
+* Apply command timeout to PING before connection activation #470
+* Synchronize ClientResources shutdown in client shutdown #475
+* Skip SO_KEEPALIVE and TCP_NODELAY options for Unix Domain Socket connections #476 (Thanks to @magdkudama)
+* Fix cummulative metrics collection #487 (Thanks to @ameenhere)
+* Stop LatencyStats on removal #517
+* Guard PauseDetectorWrapper initialization against absence of LatencyUtils #520
+* Connection pool deadlock #531 (Thanks to @DarkSeraphim)
+* NumberFormatException on `inf` zscore #528 (Thanks to @DarkSeraphim)
+* Fix FastCountingDeque not recording correct size. #544 (Thanks to @kojilin)
+* Lettuce doesn't call QUIT when a pooled connection is destroyed. #545 (Thanks to @robbiemc)
 * NPE in RedisStateMachine #576 (Thanks to @nikolayspb)
 * Prevent dead listener callbacks in shutdown sequence #581
 * Javadoc in BitFieldArgs contains invalid links #583
@@ -38,8 +662,51 @@ Fixes
 
 Other
 ------
+* Upgrade to stunnel 5.33 #290
+* Upgrade to Java 9-compatible build #310
+* Upgrade logging to log4j2 for tests #316
+* Upgrade to AssertJ 3.5.2 #352
+* Add test to verify behavior of GEODIST if a geoset is unknown #362
+* Update license/author headers #387
+* Upgrade to netty 4.0.42.Final/4.1.6.Final 390
+* Mark NodeSelection API as stable #389
+* Document RedisClient and RedisClusterClient implementation hooks #392
+* Upgrade to Project Reactor 3.0.3 #395
+* Disable shaded jar #396
+* Upgrade to netty 4.1.7 #436
+* Fix ClientResources usage in tests #445
+* Create benchmarks for RedisClient, RedisClusterClient and ClusterDistributionChannelWriter #454
+* Use Reactor's StepVerifier in tests #455
+* Upgrade to TravisCI trusty #461
+* Upgrade to Mockito 2.7.5 #469
+* Improve JavaDoc #472
+* Upgrade dependencies #474
+* Switch optional dependencies from provided to optional #482
+* Use appropriate EventLoopGroup in SingleThreadedReactiveClusterClientTest #486
+* Update Netty version to 4.1.9 #489 (Thanks to @odiszapc)
+* Calculate first response metrics from sent time #491
+* [BREAKING] Move to lettuce.io #493
+* Create reference documentation #494
+* Switch to codecov #504
+* Upgrade to Reactor 3.1.0 SNAPSHOT #505
+* Upgrade integrations from lettuce-io/lettuce-core to lettuce-io/lettuce-core #506
+* Upgrade to Project Reactor 3.1.0.M1 #523
+* Upgrade to RxJava 1.2.10 #524
+* Upgrade to RxJava2 2.0.9 #525
+* Switch jcl-over-slf4j dependency to test scope #526
+* Upgrade to netty 4.1.10 #532
+* Upgrade to netty 4.0.11 #537
+* Upgrade to netty 4.1.12 (4.0.48) #548
+* Upgrade to Reactor 3.1 M2 #549
+* Allow Redis version pinning for build #552
+* Upgrade to netty 4.1.13/4.0.49 #565
+* Upgrade to Reactor 3.1.0 M3 (Bismuth M3) #567
+* Use BOM to manage netty and Spring dependencies #568
+* Upgrade dependencies #569
 * Upgrade to Reactor Core 3.1.0 RC1 #602
 * Upgrade to netty 4.1.15 #600
+* Release Lettuce 5.0 GA #607
+* Extend documentation #610
 
 Lettuce requires a minimum of Java 8 to build and run. It is tested continuously
 against the latest Redis source-build.

From 5b0e3870bf572e287e70c602f4a4e115dc47f30c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 28 Sep 2017 11:43:53 +0200
Subject: [PATCH 302/808] Update LICENSE text and add NOTICE file #612

---
 pom.xml                             |  7 +++++++
 src/main/resources/META-INF/LICENSE | 25 +++++++++++++++++++++++++
 src/main/resources/META-INF/NOTICE  | 11 +++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 src/main/resources/META-INF/NOTICE

diff --git a/pom.xml b/pom.xml
index be574d0aa1..2176e7d5e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -747,6 +747,13 @@
 
     <build>
 
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
         <extensions>
             <extension>
                 <groupId>kr.motd.maven</groupId>
diff --git a/src/main/resources/META-INF/LICENSE b/src/main/resources/META-INF/LICENSE
index f433b1a53f..d645695673 100644
--- a/src/main/resources/META-INF/LICENSE
+++ b/src/main/resources/META-INF/LICENSE
@@ -175,3 +175,28 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000000..1584506339
--- /dev/null
+++ b/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,11 @@
+Lettuce Java Redis Client ${version}
+Copyright (c) 2011-2017 Mark Paluch
+
+This product is licensed to you under the Apache License, Version 2.0
+(the "License"). You may not use this product except in compliance with
+the License.
+
+This product may include a number of subcomponents with separate
+copyright notices and license terms. Your use of the source code for
+these subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the license file.

From 0424bf819b3ffcd17d238c6af0066ac3995d1771 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 28 Sep 2017 11:49:54 +0200
Subject: [PATCH 303/808] Fix flakey tests.

Tests run sometimes into ConnectException and sometimes ClosedChannelException. Generalized to IOException.
---
 .../cluster/ClusterPartiallyDownTest.java     |  8 +++----
 .../masterslave/MasterSlaveSentinelTest.java  | 21 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
index fdddc30d51..0828bce4f1 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
 
-import java.net.ConnectException;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -96,7 +96,7 @@ public void operateOnPartiallyDownCluster() throws Exception {
             connection.sync().get(key_10439);
             fail("Missing RedisException");
         } catch (RedisException e) {
-            assertThat(e).hasRootCauseInstanceOf(ConnectException.class);
+            assertThat(e).hasRootCauseInstanceOf(IOException.class);
         }
 
         connection.close();
@@ -133,7 +133,7 @@ public void partitionNodesAreOffline() throws Exception {
             redisClusterClient.connect();
             fail("Missing RedisConnectionException");
         } catch (RedisConnectionException e) {
-            assertThat(e).hasRootCauseInstanceOf(ConnectException.class);
+            assertThat(e).hasRootCauseInstanceOf(IOException.class);
         }
     }
 }
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
index 46b9e42661..71ab5eb04f 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 
-import java.net.ConnectException;
+import java.io.IOException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -34,7 +34,6 @@
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.sentinel.AbstractSentinelTest;
 import io.lettuce.core.sentinel.SentinelRule;
-
 import io.netty.channel.group.ChannelGroup;
 
 /**
@@ -43,8 +42,8 @@
 public class MasterSlaveSentinelTest extends AbstractSentinelTest {
 
     static {
-        sentinelClient = RedisClient.create(TestClientResources.get(),
-                RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build());
+        sentinelClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder
+                .sentinel(TestSettings.host(), MASTER_ID).build());
     }
 
     @Rule
@@ -61,8 +60,8 @@ public void before() throws Exception {
     @Test
     public void testMasterSlaveSentinelBasic() throws Exception {
 
-        RedisURI uri = RedisURI.create(
-                "redis-sentinel://127.0.0.1:21379,127.0.0.1:22379,127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
+        RedisURI uri = RedisURI
+                .create("redis-sentinel://127.0.0.1:21379,127.0.0.1:22379,127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
         StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(sentinelClient,
                 new Utf8StringCodec(), uri);
 
@@ -91,8 +90,8 @@ public void masterSlaveConnectionShouldSetClientName() throws Exception {
     @Test
     public void testMasterSlaveSentinelWithTwoUnavailableSentinels() throws Exception {
 
-        RedisURI uri = RedisURI.create(
-                "redis-sentinel://127.0.0.1:21379,127.0.0.1:22379,127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
+        RedisURI uri = RedisURI
+                .create("redis-sentinel://127.0.0.1:21379,127.0.0.1:22379,127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
         StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(sentinelClient,
                 new Utf8StringCodec(), uri);
 
@@ -112,7 +111,7 @@ public void testMasterSlaveSentinelWithUnavailableSentinels() throws Exception {
             MasterSlave.connect(sentinelClient, new Utf8StringCodec(), uri);
             fail("Missing RedisConnectionException");
         } catch (RedisConnectionException e) {
-            assertThat(e.getCause()).hasCauseInstanceOf(ConnectException.class);
+            assertThat(e.getCause()).hasCauseInstanceOf(IOException.class);
         }
     }
 
@@ -129,7 +128,7 @@ public void testMasterSlaveSentinelConnectionCount() throws Exception {
         connection.setReadFrom(ReadFrom.SLAVE);
         slaveCall(connection);
 
-        assertThat(channels.size()).isEqualTo(count + 2 /* connections */ + 1 /* sentinel connections */);
+        assertThat(channels.size()).isEqualTo(count + 2 /* connections */+ 1 /* sentinel connections */);
 
         connection.close();
     }

From 0534e2b16461a76f93d4387d3415c7158a499312 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 28 Sep 2017 12:21:37 +0200
Subject: [PATCH 304/808] Remove quiet time and decrease shutdown timeout to 2
 seconds #613

---
 RELEASE-NOTES.md                                            | 1 +
 src/main/java/io/lettuce/core/AbstractRedisClient.java      | 4 ++--
 .../io/lettuce/core/resource/DefaultClientResources.java    | 2 +-
 src/test/java/io/lettuce/core/FastShutdown.java             | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index caa476f539..435f41a99d 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -600,6 +600,7 @@ Enhancements
 * Enhance argument caching #575
 * Introduce MethodTranslator caching #580
 * Execute RedisAdvancedClusterCommands.scriptLoad(…) on all nodes #590
+* Reduce default shutdown timeout #613
 
 Fixes
 -----
diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 8d22b64df0..7cc4a82e53 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -312,10 +312,10 @@ protected <K, V, T extends RedisChannelHandler<K, V>> ConnectionFuture<T> initia
 
     /**
      * Shutdown this client and close all open connections. The client should be discarded after calling shutdown. The shutdown
-     * has 2 secs quiet time and a timeout of 15 secs.
+     * has no quiet time and a timeout of 2 seconds.
      */
     public void shutdown() {
-        shutdown(2, 15, TimeUnit.SECONDS);
+        shutdown(0, 2, TimeUnit.SECONDS);
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index 96a08ef155..7e9616f22c 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -478,7 +478,7 @@ protected void finalize() throws Throwable {
      */
     @Override
     public Future<Boolean> shutdown() {
-        return shutdown(2, 15, TimeUnit.SECONDS);
+        return shutdown(0, 2, TimeUnit.SECONDS);
     }
 
     /**
diff --git a/src/test/java/io/lettuce/core/FastShutdown.java b/src/test/java/io/lettuce/core/FastShutdown.java
index d6f8192661..67e6a9cab2 100644
--- a/src/test/java/io/lettuce/core/FastShutdown.java
+++ b/src/test/java/io/lettuce/core/FastShutdown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ public class FastShutdown {
      * @param redisClient
      */
     public static void shutdown(AbstractRedisClient redisClient) {
-        redisClient.shutdown(10, 10, TimeUnit.MILLISECONDS);
+        redisClient.shutdown(0, 10, TimeUnit.MILLISECONDS);
     }
 
     /**
@@ -39,6 +39,6 @@ public static void shutdown(AbstractRedisClient redisClient) {
      * @param clientResources
      */
     public static void shutdown(ClientResources clientResources) {
-        clientResources.shutdown(10, 10, TimeUnit.MILLISECONDS);
+        clientResources.shutdown(0, 10, TimeUnit.MILLISECONDS);
     }
 }

From 2683d8c892ead54062ecf5d93f35997fe8c9d1bb Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 28 Sep 2017 12:45:55 +0200
Subject: [PATCH 305/808] Polishing

Fix typos and improve wording. Mention Java 9 compatibility.
---
 RELEASE-NOTES.md | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 435f41a99d..ec5b75ebcf 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -5,7 +5,7 @@ After a 13 months development phase and 208 solved tickets,
 it is my pleasure to announce general availability of Lettuce 5.0.
 
 This is a major release coming with several breaking changes and new interesting
-features. 
+features Java 9 compatibility. 
 
 Lettuce 5 introduces the dynamic Redis Commands API. This programming
 model enables you to declare command methods and invoke commands to your needs and
@@ -31,7 +31,9 @@ Major breaking changes:
 Lettuce requires only Netty and Project Reactor which brings us to the next change. 
 The reactive API is based on Reactive Streams by using 
 Project Reactor types `Mono` and `Flux` instead of RxJava 1 and `Observable`.
-Existing users can convert `Mono` and `Flux` by using `rxjava-reactive-streams`.
+If you require RxJava's `Single` and `Observable` in your code, 
+then use publisher adapters in `rxjava-reactive-streams` to adapt `Mono` and `Flux`.
+
 
 This release introduces a new reference guide that is shipped along the regular artifacts. 
 The reference guide is bound to a particular version and does not change over time, 
@@ -87,7 +89,7 @@ provided with `@Command`. Introduction of new commands does not require you
 to wait for a new Lettuce release but they can invoke commands through own declaration. 
 That interface could be also supporting different key and value types, depending on the use-case.
 
-Commands are executed applying synchronization, asynchronous and in a reactive fashion, 
+Commands are executed synchronously, asynchronous or with a reactive execution model, 
 depending on the method declaration.
 
 ```java
@@ -117,12 +119,14 @@ MyRedisCommands commands = factory.getCommands(MyRedisCommands.class);
 String value = commands.get("key");
 ```
 
-You get a whole lot new possibilities with Redis Command Interfaces. This release
-provides initial support. Future versions are likely to support RxJava 1/2 reactive
-types so RxJava 1 users have a migration path that allows using native types without
+You get a whole lot new possibilities with Redis Command Interfaces. 
+One of them is transparent reactive type adoption. Lettuce's reactive API is based on Reactive Streams, 
+however with command interfaces you can declare a RxJava 1 or RxJava 2 return 
+type and Lettuce will handle the adoption for you. 
+RxJava 1 users have a migration path that allows using native types without
 further conversion.
 
-See also: https://lettuce.io/core/snapshot/reference/#redis-command-interfaces
+See also: https://lettuce.io/core/5.0.0.RELEASE/reference/#redis-command-interfaces
 
 Command Interface Batching
 --------------------------
@@ -162,7 +166,7 @@ commands.get("key", CommandBatching.flush()); // invocation-level queueing contr
                                               // flushes all queued commands
 ```
 
-Read more: https://lettuce.io/core/snapshot/reference/#command-interfaces.batch
+Read more: https://lettuce.io/core/5.0.0.RELEASE//reference/#command-interfaces.batch
 
 
 Migration to Reactive Streams (Project Reactor)
@@ -213,7 +217,7 @@ You will find differences in comparison to the previous API and to the sync/asyn
 in cases where commands can return `null` values. Lettuce 5.0 comes with
 new `Value` types that are monads encapsulating a value (or their absence).
 
-See also: https://lettuce.io/core/snapshot/reference/#reactive-api
+See also: https://lettuce.io/core/5.0.0.RELEASE/reference/#reactive-api
 
 
 Value, KeyValue, and other value types
@@ -287,7 +291,7 @@ DefaultClientResources.builder()
 ```
 
 See also: https://www.awsarchitectureblog.com/2015/03/backoff.html and
-https://lettuce.io/core/snapshot/reference/#clientresources.advanced-settings
+https://lettuce.io/core/5.0.0.RELEASE/reference/#clientresources.advanced-settings
 
 
 New API for Z...RANGE commands
@@ -373,7 +377,6 @@ try(StatefulRedisConnection<String, String> connection = pool.borrowObject()) {
     // Work
 }
 
-
 pool.close();
 ```
 

From c54e85d970863453f01228f92190b1441fe33abf Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 28 Sep 2017 13:02:28 +0200
Subject: [PATCH 306/808] Fix encapsulated default method lookup on interfaces
 #614

Use MethodHandles.privateLookupIn() instead of plain MethodHandles.lookup() to enable private lookups on Java 9.
---
 .../lettuce/core/internal/DefaultMethods.java | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/internal/DefaultMethods.java b/src/main/java/io/lettuce/core/internal/DefaultMethods.java
index 5fa81075bc..ac4a57f113 100644
--- a/src/main/java/io/lettuce/core/internal/DefaultMethods.java
+++ b/src/main/java/io/lettuce/core/internal/DefaultMethods.java
@@ -82,13 +82,39 @@ boolean isAvailable() {
          */
         ENCAPSULATED {
 
+            Method privateLookupIn = findBridgeMethod();
+
             @Override
             MethodHandle lookup(Method method) throws ReflectiveOperationException {
 
                 MethodType methodType = MethodType.methodType(method.getReturnType(), method.getParameterTypes());
 
-                return MethodHandles.lookup().findSpecial(method.getDeclaringClass(), method.getName(), methodType,
-                        method.getDeclaringClass());
+                return getLookup(method.getDeclaringClass()).findSpecial(method.getDeclaringClass(), method.getName(),
+                        methodType, method.getDeclaringClass());
+            }
+
+            private Method findBridgeMethod() {
+
+                try {
+                    return MethodHandles.class.getDeclaredMethod("privateLookupIn", Class.class, Lookup.class);
+                } catch (ReflectiveOperationException e) {
+                    return null;
+                }
+            }
+
+            private Lookup getLookup(Class<?> declaringClass) {
+
+                Lookup lookup = MethodHandles.lookup();
+
+                if (privateLookupIn != null) {
+                    try {
+                        return (Lookup) privateLookupIn.invoke(null, declaringClass, lookup);
+                    } catch (ReflectiveOperationException e) {
+                        return lookup;
+                    }
+                }
+
+                return lookup;
             }
 
             @Override

From 0a95043d1511879dab2f92b4bb3840bf52764fa2 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 28 Sep 2017 14:15:14 +0200
Subject: [PATCH 307/808] [maven-release-plugin] prepare release 5.0.0.RELEASE

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2176e7d5e0..9b4803c8e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.0.0.BUILD-SNAPSHOT</version>
+    <version>5.0.0.RELEASE</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -68,7 +68,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-        <tag>HEAD</tag>
+        <tag>5.0.0.RELEASE</tag>
     </scm>
 
     <dependencyManagement>

From 54b7c5cd3dbac2f1084451c309f91e73fbe23b5c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 28 Sep 2017 14:15:20 +0200
Subject: [PATCH 308/808] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9b4803c8e7..63de5c2012 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.0.0.RELEASE</version>
+    <version>5.1.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -68,7 +68,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-        <tag>5.0.0.RELEASE</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <dependencyManagement>

From 4b709d060db3a6545dabdef05093a29101dc7411 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 28 Sep 2017 15:11:23 +0200
Subject: [PATCH 309/808] Polishing.

Remove superfluous images from docs assets.
---
 src/main/asciidoc/images/golo/body-bg.png | Bin 264510 -> 0 bytes
 src/main/asciidoc/images/golo/pre-bg.png  | Bin 301360 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src/main/asciidoc/images/golo/body-bg.png
 delete mode 100644 src/main/asciidoc/images/golo/pre-bg.png

diff --git a/src/main/asciidoc/images/golo/body-bg.png b/src/main/asciidoc/images/golo/body-bg.png
deleted file mode 100644
index 0e43a16c7b19c16d3837e8c0ab5d23bab64ca334..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 264510
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%0DJnqeRg2@Mqr-1#(PS@$kk9wZcje@?i
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
YA0=r{W89?=Pyhe`07*qoM6N<$f-&rBlmGw#

diff --git a/src/main/asciidoc/images/golo/pre-bg.png b/src/main/asciidoc/images/golo/pre-bg.png
deleted file mode 100644
index bd9ab78e69415f818c4bc1b70752d02b75babf38..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 301360
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%0AG`t-EV26>}<mg&Ui+URE<L<INO@nDuT2UPO
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%0A#^Ti~<M^nRD5
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%0D(=E>V6s6Feek
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
Q>Hq)$07*qoM6N<$f)@6f=Kufz


From 4d9a076c6f74c8881ba5ad89566e7006b06651e6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 4 Oct 2017 13:00:51 +0200
Subject: [PATCH 310/808] Remove unique command check from
 CommandHandler.rebuildQueue() #615

rebuildQueue now no longer removes duplicate commands but just rebuilds the queues which reduces rebuild duration to a few milliseconds. Unique commands are guaranteed by eager wrapping for latency tracking and verification guards when adding commands to the stack. Duplicate commands are generally rejected.
---
 .../lettuce/core/protocol/CommandHandler.java | 27 ++++++--
 .../core/protocol/DefaultEndpoint.java        | 69 +++++++++----------
 .../core/cluster/ClusterNodeEndpointTest.java | 11 +--
 .../core/protocol/CommandHandlerTest.java     | 20 ++++--
 .../protocol/CommandHandlerBenchmark.java     |  5 +-
 .../lettuce/core/protocol/EmptyPromise.java   | 16 +++--
 6 files changed, 89 insertions(+), 59 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index c79252ba2b..e296037c11 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -69,6 +69,7 @@ public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCom
     private final boolean traceEnabled = logger.isTraceEnabled();
     private final boolean debugEnabled = logger.isDebugEnabled();
     private final boolean latencyMetricsEnabled;
+    private final boolean boundedQueues;
     private final BackpressureSource backpressureSource = new BackpressureSource();
 
     Channel channel;
@@ -93,6 +94,7 @@ public CommandHandler(ClientOptions clientOptions, ClientResources clientResourc
         this.clientResources = clientResources;
         this.endpoint = endpoint;
         this.latencyMetricsEnabled = clientResources.commandLatencyCollector().isEnabled();
+        this.boundedQueues = clientOptions.getRequestQueueSize() != Integer.MAX_VALUE;
     }
 
     public Queue<RedisCommand<?, ?, ?>> getStack() {
@@ -397,13 +399,22 @@ private void addToStack(RedisCommand<?, ?, ?> command, ChannelPromise promise) t
                 command.complete();
             } else {
 
-                if (latencyMetricsEnabled) {
-                    stack.add(getLatencyCommand(command));
-                } else {
-                    stack.add(command);
+                if (stack.contains(command)) {
+                    throw new RedisException("Attempting to write duplicate command that is already enqueued: " + command);
                 }
             }
 
+            RedisCommand<?, ?, ?> redisCommand = potentiallyWrapLatencyCommand(command);
+
+            if (promise.isVoid()) {
+                stack.add(redisCommand);
+            } else {
+                promise.addListener(future -> {
+                    if (future.isSuccess()) {
+                        stack.add(redisCommand);
+                    }
+                });
+            }
         } catch (Exception e) {
             command.completeExceptionally(e);
             promise.setFailure(e);
@@ -422,14 +433,18 @@ private void validateWrite(int commands) {
     }
 
     private boolean usesBoundedQueues() {
-        return clientOptions.getRequestQueueSize() != Integer.MAX_VALUE;
+        return boundedQueues;
     }
 
     private static boolean isWriteable(RedisCommand<?, ?, ?> command) {
         return !command.isCancelled() && !command.isDone();
     }
 
-    private RedisCommand<?, ?, ?> getLatencyCommand(RedisCommand<?, ?, ?> command) {
+    private RedisCommand<?, ?, ?> potentiallyWrapLatencyCommand(RedisCommand<?, ?, ?> command) {
+
+        if (!latencyMetricsEnabled) {
+            return command;
+        }
 
         if (command instanceof WithLatency) {
 
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index da1b4f2bb3..77dc8e8e23 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -58,6 +58,7 @@ public class DefaultEndpoint implements RedisChannelWriter, Endpoint {
     private final ClientOptions clientOptions;
     private final Queue<RedisCommand<?, ?, ?>> disconnectedBuffer;
     private final Queue<RedisCommand<?, ?, ?>> commandBuffer;
+    private final boolean boundedQueues;
 
     private final long endpointId = ENDPOINT_COUNTER.incrementAndGet();
     private final AtomicBoolean closed = new AtomicBoolean();
@@ -73,6 +74,7 @@ public class DefaultEndpoint implements RedisChannelWriter, Endpoint {
     private Throwable connectionError;
 
     // access via QUEUE_SIZE
+    @SuppressWarnings("unused")
     private volatile int queueSize = 0;
 
     /**
@@ -86,8 +88,9 @@ public DefaultEndpoint(ClientOptions clientOptions) {
 
         this.clientOptions = clientOptions;
         this.reliability = clientOptions.isAutoReconnect() ? Reliability.AT_LEAST_ONCE : Reliability.AT_MOST_ONCE;
-        this.commandBuffer = LettuceFactories.newConcurrentQueue(clientOptions.getRequestQueueSize());
         this.disconnectedBuffer = LettuceFactories.newConcurrentQueue(clientOptions.getRequestQueueSize());
+        this.commandBuffer = LettuceFactories.newConcurrentQueue(clientOptions.getRequestQueueSize());
+        this.boundedQueues = clientOptions.getRequestQueueSize() != Integer.MAX_VALUE;
     }
 
     @Override
@@ -193,7 +196,7 @@ private void validateWrite(int commands) {
     }
 
     private boolean usesBoundedQueues() {
-        return clientOptions.getRequestQueueSize() != Integer.MAX_VALUE;
+        return boundedQueues;
     }
 
     private void writeToBuffer(Iterable<? extends RedisCommand<?, ?, ?>> commands) {
@@ -544,18 +547,7 @@ public void notifyDrainQueuedCommands(HasQueuedCommands queuedCommands) {
             logger.debug("{} notifyQueuedCommands adding {} command(s) to buffer", logPrefix(), commands.size());
 
             commands.addAll(drainCommands(disconnectedBuffer));
-
-            disconnectedBuffer.removeAll(commands);
-
-            for (RedisCommand<?, ?, ?> command : commands) {
-                try {
-                    if (!disconnectedBuffer.contains(command)) {
-                        disconnectedBuffer.add(command);
-                    }
-                } catch (Exception e) {
-                    command.completeExceptionally(e);
-                }
-            }
+            disconnectedBuffer.addAll(commands);
 
             if (isConnected()) {
                 flushCommands(disconnectedBuffer);
@@ -594,10 +586,6 @@ protected <T> T doExclusive(Supplier<T> supplier) {
 
         RedisCommand<?, ?, ?> cmd;
         while ((cmd = source.poll()) != null) {
-
-            if (cmd instanceof LatencyMeteredCommand<?, ?, ?>) {
-                cmd = ((LatencyMeteredCommand<?, ?, ?>) cmd).getDelegate();
-            }
             target.add(cmd);
         }
 
@@ -619,6 +607,8 @@ private void cancelCommands(String message, Iterable<? extends RedisCommand<?, ?
     }
 
     private boolean isConnected() {
+
+        Channel channel = this.channel;
         return channel != null && channel.isActive();
     }
 
@@ -691,7 +681,6 @@ public void operationComplete(ChannelFuture future) throws Exception {
 
             if (future.cause() != null) {
                 complete(future.cause());
-
             }
         }
     }
@@ -715,24 +704,15 @@ public void operationComplete(Future<Void> future) throws Exception {
 
             Throwable cause = future.cause();
 
+            boolean success = future.isSuccess();
             dequeue();
 
-            if (!future.isSuccess()) {
-
-                if (sentCommand != null) {
-                    try {
-                        write(sentCommand);
-                    } catch (Exception e) {
-                        complete(e);
-                    }
-                }
-
-                if (sentCommands != null) {
-                    try {
-                        write((Collection) sentCommands);
-                    } catch (Exception e) {
-                        complete(e);
-                    }
+            if (!success) {
+                Channel channel = DefaultEndpoint.this.channel;
+                if (channel != null) {
+                    channel.eventLoop().submit(this::requeueCommands);
+                } else {
+                    requeueCommands();
                 }
             }
 
@@ -748,6 +728,25 @@ public void operationComplete(Future<Void> future) throws Exception {
                 logger.log(logLevel, message, cause.toString(), cause);
             }
         }
+
+        private void requeueCommands() {
+
+            if (sentCommand != null) {
+                try {
+                    write(sentCommand);
+                } catch (Exception e) {
+                    complete(e);
+                }
+            }
+
+            if (sentCommands != null) {
+                try {
+                    write((Collection) sentCommands);
+                } catch (Exception e) {
+                    complete(e);
+                }
+            }
+        }
     }
 
     private enum Reliability {
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
index 80d15f1f4f..0cc367b8ff 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
@@ -75,14 +75,14 @@ public void before() {
     }
 
     @Test
-    public void closeWithoutCommands() throws Exception {
+    public void closeWithoutCommands() {
 
         sut.close();
         verifyZeroInteractions(clusterChannelWriter);
     }
 
     @Test
-    public void closeWithQueuedCommands() throws Exception {
+    public void closeWithQueuedCommands() {
 
         disconnectedBuffer.add(command);
 
@@ -92,7 +92,7 @@ public void closeWithQueuedCommands() throws Exception {
     }
 
     @Test
-    public void closeWithCancelledQueuedCommands() throws Exception {
+    public void closeWithCancelledQueuedCommands() {
 
         disconnectedBuffer.add(command);
         command.cancel();
@@ -122,9 +122,10 @@ public void closeWithQueuedCommandsFails() throws Exception {
     }
 
     @Test
-    public void closeWithBufferedCommands() throws Exception {
+    public void closeWithBufferedCommands() {
 
         when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS);
+
         sut.write(command);
 
         sut.close();
@@ -133,7 +134,7 @@ public void closeWithBufferedCommands() throws Exception {
     }
 
     @Test
-    public void closeWithCancelledBufferedCommands() throws Exception {
+    public void closeWithCancelledBufferedCommands() {
 
         when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS);
         sut.write(command);
diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
index 1f146b324e..7127e22fb0 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
@@ -84,6 +84,9 @@ public class CommandHandlerTest {
     @Mock
     private Endpoint endpoint;
 
+    @Mock
+    private ChannelPromise promise;
+
     @BeforeClass
     public static void beforeClass() {
         LoggerContext ctx = (LoggerContext) LogManager.getContext();
@@ -293,9 +296,11 @@ public void shouldCancelCommandOnQueueBatchFailure() throws Exception {
     @Test
     public void shouldWriteActiveCommands() throws Exception {
 
-        sut.write(context, command, null);
+        when(promise.isVoid()).thenReturn(true);
 
-        verify(context).write(command, null);
+        sut.write(context, command, promise);
+
+        verify(context).write(command, promise);
         assertThat(stack).hasSize(1).allMatch(o -> o instanceof LatencyMeteredCommand);
     }
 
@@ -303,7 +308,7 @@ public void shouldWriteActiveCommands() throws Exception {
     public void shouldNotWriteCancelledCommandBatch() throws Exception {
 
         command.cancel();
-        sut.write(context, Arrays.asList(command), null);
+        sut.write(context, Arrays.asList(command), promise);
 
         verifyZeroInteractions(context);
         assertThat((Collection) ReflectionTestUtils.getField(sut, "stack")).isEmpty();
@@ -313,9 +318,10 @@ public void shouldNotWriteCancelledCommandBatch() throws Exception {
     public void shouldWriteActiveCommandsInBatch() throws Exception {
 
         List<Command<String, String, String>> commands = Arrays.asList(command);
-        sut.write(context, commands, null);
+        when(promise.isVoid()).thenReturn(true);
+        sut.write(context, commands, promise);
 
-        verify(context).write(commands, null);
+        verify(context).write(commands, promise);
         assertThat(stack).hasSize(1);
     }
 
@@ -325,10 +331,10 @@ public void shouldWriteActiveCommandsInMixedBatch() throws Exception {
 
         Command<String, String, String> command2 = new Command<>(CommandType.APPEND, new StatusOutput<>(new Utf8StringCodec()),
                 null);
-
         command.cancel();
+        when(promise.isVoid()).thenReturn(true);
 
-        sut.write(context, Arrays.asList(command, command2), null);
+        sut.write(context, Arrays.asList(command, command2), promise);
 
         ArgumentCaptor<List> captor = ArgumentCaptor.forClass(List.class);
         verify(context).write(captor.capture(), any());
diff --git a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
index 8129b15c18..64022e02be 100644
--- a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@ public class CommandHandlerBenchmark {
     private final static ClientOptions CLIENT_OPTIONS = ClientOptions.create();
     private final static EmptyContext CHANNEL_HANDLER_CONTEXT = new EmptyContext();
     private final static byte[] KEY = "key".getBytes();
+    private final EmptyPromise PROMISE = new EmptyPromise();
 
     private CommandHandler commandHandler;
     private Command command;
@@ -55,7 +56,7 @@ public void setup() {
     @Benchmark
     public void measureNettyWrite() throws Exception {
 
-        commandHandler.write(CHANNEL_HANDLER_CONTEXT, command, null);
+        commandHandler.write(CHANNEL_HANDLER_CONTEXT, command, PROMISE);
 
         // Prevent OOME
         commandHandler.getStack().clear();
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java b/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
index ed68201683..34cc1efaec 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
@@ -27,7 +27,7 @@
 /**
  * @author Mark Paluch
  */
-class EmptyPromise implements ChannelPromise{
+class EmptyPromise implements ChannelPromise {
 
     @Override
     public Channel channel() {
@@ -71,7 +71,7 @@ public boolean setUncancellable() {
 
     @Override
     public boolean isSuccess() {
-        return false;
+        return true;
     }
 
     @Override
@@ -86,12 +86,20 @@ public Throwable cause() {
 
     @Override
     public ChannelPromise addListener(GenericFutureListener<? extends Future<? super Void>> listener) {
-        return null;
+        try {
+            ((GenericFutureListener) listener).operationComplete(this);
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+        return this;
     }
 
     @Override
     public ChannelPromise addListeners(GenericFutureListener<? extends Future<? super Void>>... listeners) {
-        return null;
+        for (GenericFutureListener<? extends Future<? super Void>> listener : listeners) {
+            addListener(listener);
+        }
+        return this;
     }
 
     @Override

From 3fa206f38ec73cccadb5ea1541a3ed11684bd117 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 4 Oct 2017 13:01:10 +0200
Subject: [PATCH 311/808] Polishing

Document field access via AtomicIntegerFieldUpdater.
---
 src/main/java/io/lettuce/core/protocol/AsyncCommand.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
index 7b9e412161..73c5deadb4 100644
--- a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
@@ -47,6 +47,8 @@ public class AsyncCommand<K, V, T> extends CompletableFuture<T> implements Redis
 
     private final RedisCommand<K, V, T> command;
 
+    // access via COUNT_UPDATER
+    @SuppressWarnings({ "unused" })
     private volatile int count = 1;
 
     /**

From bd073d6dce6ae15ef4527c5ce77c3440d17c4e2c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 5 Oct 2017 12:22:46 +0200
Subject: [PATCH 312/808] Remove duplicate command checks from disconnected and
 command buffers #615

---
 .../java/io/lettuce/core/protocol/DefaultEndpoint.java    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index 77dc8e8e23..8193adb07f 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -214,10 +214,6 @@ private void writeToDisconnectedBuffer(Collection<? extends RedisCommand<?, ?, ?
 
     private void writeToDisconnectedBuffer(RedisCommand<?, ?, ?> command) {
 
-        if (disconnectedBuffer.contains(command)) {
-            return;
-        }
-
         if (connectionError != null) {
             if (debugEnabled) {
                 logger.debug("{} writeToDisconnectedBuffer() Completing command {} due to connection error", logPrefix(),
@@ -237,10 +233,6 @@ private void writeToDisconnectedBuffer(RedisCommand<?, ?, ?> command) {
 
     protected <C extends RedisCommand<?, ?, T>, T> void writeToBuffer(C command) {
 
-        if (commandBuffer.contains(command)) {
-            return;
-        }
-
         if (debugEnabled) {
             logger.debug("{} writeToBuffer() buffering command {}", logPrefix(), command);
         }

From 1ed5403131c84067a38291777d02b7ad8c0d0a7b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 6 Oct 2017 10:30:23 +0200
Subject: [PATCH 313/808] Cancel overcommitted commands #616

Lettuce now cancels overcommitted commands that exceed the queue size. Overcommitted commands can happen if commands were written to the protocol stack and a disconnect attempts to copy these commands to a smaller disconnected buffer.
---
 .../core/protocol/DefaultEndpoint.java        |  22 +++-
 .../lettuce/core/AbstractRedisClientTest.java |   4 +-
 .../io/lettuce/core/ClientOptionsTest.java    | 110 +++++++++++++++---
 3 files changed, 113 insertions(+), 23 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index 8193adb07f..338d305b7b 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -529,6 +529,12 @@ public void notifyDrainQueuedCommands(HasQueuedCommands queuedCommands) {
 
             Collection<RedisCommand<?, ?, ?>> commands = queuedCommands.drainQueue();
 
+            if (debugEnabled) {
+                logger.debug("{} notifyQueuedCommands adding {} command(s) to buffer", logPrefix(), commands.size());
+            }
+
+            commands.addAll(drainCommands(disconnectedBuffer));
+
             for (RedisCommand<?, ?, ?> command : commands) {
 
                 if (command instanceof DemandAware.Sink) {
@@ -536,10 +542,20 @@ public void notifyDrainQueuedCommands(HasQueuedCommands queuedCommands) {
                 }
             }
 
-            logger.debug("{} notifyQueuedCommands adding {} command(s) to buffer", logPrefix(), commands.size());
+            try {
+                disconnectedBuffer.addAll(commands);
+            } catch (RuntimeException e) {
+
+                if (debugEnabled) {
+                    logger.debug("{} notifyQueuedCommands Queue overcommit. Cannot add all commands to buffer (disconnected).",
+                            logPrefix(), commands.size());
+                }
+                commands.removeAll(disconnectedBuffer);
 
-            commands.addAll(drainCommands(disconnectedBuffer));
-            disconnectedBuffer.addAll(commands);
+                for (RedisCommand<?, ?, ?> command : commands) {
+                    command.completeExceptionally(e);
+                }
+            }
 
             if (isConnected()) {
                 flushCommands(disconnectedBuffer);
diff --git a/src/test/java/io/lettuce/core/AbstractRedisClientTest.java b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
index 3343eb58e5..96f3fd71c8 100644
--- a/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
+++ b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
@@ -82,7 +82,7 @@ public void closeConnection() throws Exception {
     public abstract class WithPasswordRequired {
         protected abstract void run(RedisClient client) throws Exception;
 
-        public WithPasswordRequired() throws Exception {
+        public WithPasswordRequired() {
             try {
                 redis.configSet("requirepass", passwd);
                 redis.auth(passwd);
@@ -90,6 +90,8 @@ public WithPasswordRequired() throws Exception {
                 RedisClient client = newRedisClient();
                 try {
                     run(client);
+                } catch (Exception e) {
+                    throw new IllegalStateException(e);
                 } finally {
                     FastShutdown.shutdown(client);
                 }
diff --git a/src/test/java/io/lettuce/core/ClientOptionsTest.java b/src/test/java/io/lettuce/core/ClientOptionsTest.java
index 6e56a84b84..88a154215c 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsTest.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsTest.java
@@ -17,11 +17,16 @@
 
 import static io.lettuce.ConnectionTestUtil.getChannel;
 import static io.lettuce.ConnectionTestUtil.getConnectionWatchdog;
+import static io.lettuce.ConnectionTestUtil.getStack;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.fail;
 
 import java.net.ServerSocket;
 import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Queue;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
@@ -30,6 +35,7 @@
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
@@ -41,17 +47,17 @@
 public class ClientOptionsTest extends AbstractRedisClientTest {
 
     @Test
-    public void testNew() throws Exception {
+    public void testNew() {
         checkAssertions(ClientOptions.create());
     }
 
     @Test
-    public void testBuilder() throws Exception {
+    public void testBuilder() {
         checkAssertions(ClientOptions.builder().build());
     }
 
     @Test
-    public void testCopy() throws Exception {
+    public void testCopy() {
         checkAssertions(ClientOptions.copyOf(ClientOptions.builder().build()));
     }
 
@@ -64,7 +70,7 @@ protected void checkAssertions(ClientOptions sut) {
     }
 
     @Test
-    public void variousClientOptions() throws Exception {
+    public void variousClientOptions() {
 
         StatefulRedisConnection<String, String> connection1 = client.connect();
 
@@ -83,7 +89,7 @@ public void variousClientOptions() throws Exception {
     }
 
     @Test
-    public void requestQueueSize() throws Exception {
+    public void requestQueueSize() {
 
         client.setOptions(ClientOptions.builder().requestQueueSize(10).build());
 
@@ -109,7 +115,73 @@ public void requestQueueSize() throws Exception {
     }
 
     @Test
-    public void disconnectedWithoutReconnect() throws Exception {
+    public void requestQueueSizeAppliedForReconnect() {
+
+        client.setOptions(ClientOptions.builder().requestQueueSize(10).build());
+
+        RedisAsyncCommands<String, String> connection = client.connect().async();
+        ConnectionWatchdog watchdog = getConnectionWatchdog(connection.getStatefulConnection());
+
+        watchdog.setListenOnChannelInactive(false);
+
+        connection.quit();
+
+        Wait.untilTrue(() -> !connection.getStatefulConnection().isOpen()).waitOrTimeout();
+
+        List<RedisFuture<String>> pings = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            pings.add(connection.ping());
+        }
+
+        watchdog.setListenOnChannelInactive(true);
+        watchdog.scheduleReconnect();
+
+        for (RedisFuture<String> ping : pings) {
+            assertThat(ping.toCompletableFuture().join()).isEqualTo("PONG");
+        }
+
+        connection.getStatefulConnection().close();
+    }
+
+    @Test
+    public void requestQueueSizeOvercommittedReconnect() throws Exception {
+
+        client.setOptions(ClientOptions.builder().requestQueueSize(10).build());
+
+        StatefulRedisConnection<String, String> connection = client.connect();
+        ConnectionWatchdog watchdog = getConnectionWatchdog(connection);
+
+        watchdog.setListenOnChannelInactive(false);
+
+        Queue<Object> buffer = getStack(connection);
+        List<RedisFuture<String>> pings = new ArrayList<>();
+        for (int i = 0; i < 11; i++) {
+
+            AsyncCommand<String, String, String> command = new AsyncCommand<>(new Command<>(CommandType.PING,
+                    new StatusOutput<>(StringCodec.UTF8)));
+            pings.add(command);
+            buffer.add(command);
+        }
+
+        getChannel(connection).disconnect();
+
+        Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
+
+        watchdog.setListenOnChannelInactive(true);
+        watchdog.scheduleReconnect();
+
+        for (int i = 0; i < 10; i++) {
+            assertThat(pings.get(i).get()).isEqualTo("PONG");
+        }
+
+        assertThatThrownBy(() -> pings.get(10).toCompletableFuture().join()).hasCauseInstanceOf(IllegalStateException.class)
+                .hasMessage("java.lang.IllegalStateException: Queue full");
+
+        connection.close();
+    }
+
+    @Test
+    public void disconnectedWithoutReconnect() {
 
         client.setOptions(ClientOptions.builder().autoReconnect(false).build());
 
@@ -127,7 +199,7 @@ public void disconnectedWithoutReconnect() throws Exception {
     }
 
     @Test
-    public void disconnectedRejectCommands() throws Exception {
+    public void disconnectedRejectCommands() {
 
         client.setOptions(ClientOptions.builder().disconnectedBehavior(ClientOptions.DisconnectedBehavior.REJECT_COMMANDS)
                 .build());
@@ -147,7 +219,7 @@ public void disconnectedRejectCommands() throws Exception {
     }
 
     @Test
-    public void disconnectedAcceptCommands() throws Exception {
+    public void disconnectedAcceptCommands() {
 
         client.setOptions(ClientOptions.builder().autoReconnect(false)
                 .disconnectedBehavior(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS).build());
@@ -161,7 +233,7 @@ public void disconnectedAcceptCommands() throws Exception {
     }
 
     @Test(timeout = 10000)
-    public void pingBeforeConnect() throws Exception {
+    public void pingBeforeConnect() {
 
         redis.set(key, value);
         client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
@@ -196,11 +268,11 @@ public void pingBeforeConnectTimeout() throws Exception {
     }
 
     @Test
-    public void pingBeforeConnectWithAuthentication() throws Exception {
+    public void pingBeforeConnectWithAuthentication() {
 
         new WithPasswordRequired() {
             @Override
-            protected void run(RedisClient client) throws Exception {
+            protected void run(RedisClient client) {
 
                 client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
                 RedisURI redisURI = RedisURI.Builder.redis(host, port).withPassword(passwd).build();
@@ -219,7 +291,7 @@ protected void run(RedisClient client) throws Exception {
     }
 
     @Test(timeout = 2000)
-    public void pingBeforeConnectWithAuthenticationTimeout() throws Exception {
+    public void pingBeforeConnectWithAuthenticationTimeout() {
 
         new WithPasswordRequired() {
             @Override
@@ -245,11 +317,11 @@ protected void run(RedisClient client) throws Exception {
     }
 
     @Test
-    public void pingBeforeConnectWithSslAndAuthentication() throws Exception {
+    public void pingBeforeConnectWithSslAndAuthentication() {
 
         new WithPasswordRequired() {
             @Override
-            protected void run(RedisClient client) throws Exception {
+            protected void run(RedisClient client) {
 
                 client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
                 RedisURI redisURI = RedisURI.Builder.redis(host, 6443).withPassword(passwd).withVerifyPeer(false).withSsl(true)
@@ -269,11 +341,11 @@ protected void run(RedisClient client) throws Exception {
     }
 
     @Test
-    public void pingBeforeConnectWithAuthenticationFails() throws Exception {
+    public void pingBeforeConnectWithAuthenticationFails() {
 
         new WithPasswordRequired() {
             @Override
-            protected void run(RedisClient client) throws Exception {
+            protected void run(RedisClient client) {
 
                 client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
                 RedisURI redisURI = RedisURI.builder().redis(host, port).build();
@@ -289,11 +361,11 @@ protected void run(RedisClient client) throws Exception {
     }
 
     @Test
-    public void pingBeforeConnectWithSslAndAuthenticationFails() throws Exception {
+    public void pingBeforeConnectWithSslAndAuthenticationFails() {
 
         new WithPasswordRequired() {
             @Override
-            protected void run(RedisClient client) throws Exception {
+            protected void run(RedisClient client) {
 
                 client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
                 RedisURI redisURI = RedisURI.builder().redis(host, 6443).withVerifyPeer(false).withSsl(true).build();
@@ -351,7 +423,7 @@ public void pingBeforeConnectWithQueuedCommandsAndReconnect() throws Exception {
     }
 
     @Test(timeout = 10000)
-    public void authenticatedPingBeforeConnectWithQueuedCommandsAndReconnect() throws Exception {
+    public void authenticatedPingBeforeConnectWithQueuedCommandsAndReconnect() {
 
         new WithPasswordRequired() {
 

From 2a6b3eeeb83f5cbb7890b6b0839f8ba6bc656a36 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 6 Oct 2017 11:35:06 +0200
Subject: [PATCH 314/808] Allow only pub/sub commands for subscribed
 connections #579

Pub/Sub connections that are subscribed to at least channel/pattern allow only subscription commands to be executed and reject execution of commands other than SUBSCRIBE, PSUBSCRIBE, UNSUBSCRIBE, PUNSUBSCRIBE and QUIT.

Response correlation cannot be guaranteed because Redis can publish a message first and then process the actual command which would parse the message as command response and treat the actual command response as pub/sub message. A deep response inspection could help to identify non-pub/sub message responses but it's no guarantee.
---
 .../lettuce/core/pubsub/PubSubEndpoint.java   | 34 +++++++++++++++++--
 src/test/java/io/lettuce/SslTest.java         |  4 +--
 .../core/pubsub/PubSubCommandTest.java        | 16 ++++++++-
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
index 8d884445c5..e93fed80c2 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,16 @@
  */
 package io.lettuce.core.pubsub;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import io.lettuce.core.ClientOptions;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.protocol.DefaultEndpoint;
-
+import io.lettuce.core.protocol.RedisCommand;
 import io.netty.util.internal.ConcurrentSet;
 
 /**
@@ -29,10 +32,22 @@
  */
 public class PubSubEndpoint<K, V> extends DefaultEndpoint {
 
+    private static final Set<String> ALLOWED_COMMANDS_SUBSCRIBED;
     private final List<RedisPubSubListener<K, V>> listeners = new CopyOnWriteArrayList<>();
     private final Set<K> channels;
     private final Set<K> patterns;
 
+    static {
+
+        ALLOWED_COMMANDS_SUBSCRIBED = new HashSet<>(5, 1);
+
+        ALLOWED_COMMANDS_SUBSCRIBED.add(CommandType.SUBSCRIBE.name());
+        ALLOWED_COMMANDS_SUBSCRIBED.add(CommandType.PSUBSCRIBE.name());
+        ALLOWED_COMMANDS_SUBSCRIBED.add(CommandType.UNSUBSCRIBE.name());
+        ALLOWED_COMMANDS_SUBSCRIBED.add(CommandType.PUNSUBSCRIBE.name());
+        ALLOWED_COMMANDS_SUBSCRIBED.add(CommandType.QUIT.name());
+    }
+
     /**
      * Initialize a new instance that handles commands from the supplied queue.
      *
@@ -75,6 +90,21 @@ public Set<K> getPatterns() {
         return patterns;
     }
 
+    @Override
+    public <K1, V1, T> RedisCommand<K1, V1, T> write(RedisCommand<K1, V1, T> command) {
+
+        if (!channels.isEmpty() || !patterns.isEmpty()) {
+
+            if (!ALLOWED_COMMANDS_SUBSCRIBED.contains(command.getType().name())) {
+
+                throw new RedisException(String.format("Command %s not allowed while subscribed. Allowed commands are: %s",
+                        command.getType().name(), ALLOWED_COMMANDS_SUBSCRIBED));
+            }
+        }
+
+        return super.write(command);
+    }
+
     public void notifyMessage(PubSubOutput<K, V, V> output) {
 
         // drop empty messages
diff --git a/src/test/java/io/lettuce/SslTest.java b/src/test/java/io/lettuce/SslTest.java
index b92efc148e..132ccf6dea 100644
--- a/src/test/java/io/lettuce/SslTest.java
+++ b/src/test/java/io/lettuce/SslTest.java
@@ -261,10 +261,10 @@ public void pubSubSslAndBreakConnection() throws Exception {
         assertThat(future.get()).doesNotContain("c1", "c2");
         assertThat(future.isDone()).isEqualTo(true);
 
-        RedisFuture<List<String>> defectFuture = connection.pubsubChannels();
+        RedisFuture<Void> defectFuture = connection.subscribe("foo");
 
         try {
-            assertThat(defectFuture.get()).doesNotContain("c1", "c2");
+            defectFuture.get();
             fail("Missing ExecutionException with nested SSLHandshakeException");
         } catch (InterruptedException e) {
             fail("Missing ExecutionException with nested SSLHandshakeException");
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
index 809df3b36d..177d734530 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package io.lettuce.core.pubsub;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Fail.fail;
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.junit.Assert.assertThat;
@@ -382,6 +383,19 @@ public void removeListener() throws Exception {
         assertThat(messages.poll(10, TimeUnit.MILLISECONDS)).isNull();
     }
 
+    @Test
+    public void pingNotAllowedInSubscriptionState() throws Exception {
+
+        pubsub.subscribe(channel).get();
+
+        assertThatThrownBy(() -> pubsub.ping().get()).isInstanceOf(RedisException.class).hasMessageContaining("not allowed");
+        pubsub.unsubscribe(channel);
+
+        Wait.untilTrue(() -> channels.size() == 2).waitOrTimeout();
+
+        assertThat(pubsub.ping().get()).isEqualTo("PONG");
+    }
+
     // RedisPubSubListener implementation
 
     @Override

From f350431e54e8a7a2e49da7658686a61e18f2906b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 9 Oct 2017 10:51:03 +0200
Subject: [PATCH 315/808] Introduce object pooling for stack appender.

AppendToStack is now pooled for lower GC pressure. Lower GC pressure comes at the cost of higher CPU usage.
---
 .../lettuce/core/protocol/CommandHandler.java | 56 +++++++++++++++++--
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index e296037c11..ca403c5e0b 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -34,6 +34,9 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.*;
 import io.netty.channel.local.LocalAddress;
+import io.netty.util.Recycler;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
 import io.netty.util.internal.logging.InternalLogLevel;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -409,11 +412,7 @@ private void addToStack(RedisCommand<?, ?, ?> command, ChannelPromise promise) t
             if (promise.isVoid()) {
                 stack.add(redisCommand);
             } else {
-                promise.addListener(future -> {
-                    if (future.isSuccess()) {
-                        stack.add(redisCommand);
-                    }
-                });
+                promise.addListener(AppendToStack.newInstance(stack, command));
             }
         } catch (Exception e) {
             command.completeExceptionally(e);
@@ -690,4 +689,51 @@ public void requestMore() {
             }
         }
     }
+
+    static class AppendToStack implements GenericFutureListener<Future<Void>> {
+
+        private final Recycler.Handle<AppendToStack> handle;
+        private Collection<RedisCommand<?, ?, ?>> stack;
+        private RedisCommand<?, ?, ?> command;
+
+        private static final Recycler<AppendToStack> RECYCLER = new Recycler<AppendToStack>() {
+            @Override
+            protected AppendToStack newObject(Handle<AppendToStack> handle) {
+                return new AppendToStack(handle);
+            }
+        };
+
+        private AppendToStack(Recycler.Handle<AppendToStack> handle) {
+            this.handle = handle;
+        }
+
+        static AppendToStack newInstance(Collection<RedisCommand<?, ?, ?>> stack, RedisCommand<?, ?, ?> command) {
+            return RECYCLER.get().init(stack, command);
+        }
+
+        private AppendToStack init(Collection<RedisCommand<?, ?, ?>> stack, RedisCommand<?, ?, ?> command) {
+
+            this.stack = stack;
+            this.command = command;
+            return this;
+        }
+
+        public void recycle() {
+            handle.recycle(this);
+        }
+
+        @Override
+        public void operationComplete(Future<Void> future) throws Exception {
+
+            if (future.isSuccess()) {
+
+                stack.add(command);
+
+                stack = null;
+                command = null;
+            }
+
+            recycle();
+        }
+    }
 }

From 7e1120db7cae72b07d78fb677bb700cddac56c87 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 9 Oct 2017 22:57:56 +0200
Subject: [PATCH 316/808] Introduce BITPOS override to accept start without end
 position #623

---
 pom.xml                                       |  2 +-
 .../core/AbstractRedisAsyncCommands.java      |  5 +++
 .../core/AbstractRedisReactiveCommands.java   |  5 +++
 .../io/lettuce/core/RedisCommandBuilder.java  |  8 +++++
 .../api/async/RedisStringAsyncCommands.java   | 35 ++++++++++++++-----
 .../reactive/RedisStringReactiveCommands.java | 31 +++++++++++-----
 .../core/api/sync/RedisStringCommands.java    | 33 +++++++++++++----
 .../NodeSelectionStringAsyncCommands.java     | 34 ++++++++++++++----
 .../api/sync/NodeSelectionStringCommands.java | 33 +++++++++++++----
 .../lettuce/core/api/RedisStringCommands.java | 25 ++++++++++---
 .../lettuce/apigenerator/CreateAsyncApi.java  |  2 +-
 .../CreateAsyncNodeSelectionClusterApi.java   |  2 +-
 .../apigenerator/CreateReactiveApi.java       |  2 +-
 .../lettuce/apigenerator/CreateSyncApi.java   |  2 +-
 .../CreateSyncNodeSelectionClusterApi.java    |  2 +-
 .../lettuce/core/commands/BitCommandTest.java |  6 ++--
 16 files changed, 178 insertions(+), 49 deletions(-)

diff --git a/pom.xml b/pom.xml
index 63de5c2012..9b07e22a2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -353,7 +353,7 @@
         <dependency>
             <groupId>com.github.javaparser</groupId>
             <artifactId>javaparser-core</artifactId>
-            <version>2.5.1</version>
+            <version>2.3.0</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 459cf5ee73..8dd3aa3b2d 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -135,6 +135,11 @@ public RedisFuture<Long> bitpos(K key, boolean state) {
         return dispatch(commandBuilder.bitpos(key, state));
     }
 
+    @Override
+    public RedisFuture<Long> bitpos(K key, boolean state, long start) {
+        return dispatch(commandBuilder.bitpos(key, state, start));
+    }
+
     @Override
     public RedisFuture<Long> bitpos(K key, boolean state, long start, long end) {
         return dispatch(commandBuilder.bitpos(key, state, start, end));
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index d4f6343983..6937754974 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -129,6 +129,11 @@ public Mono<Long> bitpos(K key, boolean state) {
         return createMono(() -> commandBuilder.bitpos(key, state));
     }
 
+    @Override
+    public Mono<Long> bitpos(K key, boolean state, long start) {
+        return createMono(() -> commandBuilder.bitpos(key, state, start));
+    }
+
     @Override
     public Mono<Long> bitpos(K key, boolean state, long start, long end) {
         return createMono(() -> commandBuilder.bitpos(key, state, start, end));
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 911f3a7892..5f1aded5d2 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -167,6 +167,14 @@ Command<K, V, Long> bitpos(K key, boolean state) {
         return createCommand(BITPOS, new IntegerOutput<>(codec), args);
     }
 
+    Command<K, V, Long> bitpos(K key, boolean state, long start) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+        args.addKey(key).add(state ? 1 : 0).add(start);
+        return createCommand(BITPOS, new IntegerOutput<>(codec), args);
+    }
+
     Command<K, V, Long> bitpos(K key, boolean state, long start, long end) {
         notNullKey(key);
 
diff --git a/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java
index 31369b450e..98c2cf7c5b 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,14 @@
 
 import java.util.List;
 import java.util.Map;
-
+import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 import io.lettuce.core.BitFieldArgs;
 import io.lettuce.core.KeyValue;
-import io.lettuce.core.RedisFuture;
 import io.lettuce.core.SetArgs;
-import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.Value;
+import io.lettuce.core.RedisFuture;
+import reactor.core.publisher.Mono;
 
 /**
  * Asynchronous executed commands for Strings.
@@ -91,13 +93,30 @@ public interface RedisStringAsyncCommands<K, V> {
      *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
-     *         However this behavior changes if you are looking for clear bits and specify a range with both
-     *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
-     *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
      */
     RedisFuture<Long> bitpos(K key, boolean state);
 
+    /**
+     * Find first bit set or clear in a string.
+     *
+     * @param key the key
+     * @param state the bit type: long
+     * @param start the start type: long
+     * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
+     *
+     *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
+     *         returned.
+     *
+     *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
+     *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
+     *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
+     *
+     *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
+     *         specify no range or the <em>start</em> argument <strong>only</strong>.
+     * @since 5.0.1
+     */
+    RedisFuture<Long> bitpos(K key, boolean state, long start);
+
     /**
      * Find first bit set or clear in a string.
      *
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java
index b5c72ffcb6..584a657f36 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,11 @@
 package io.lettuce.core.api.reactive;
 
 import java.util.Map;
-
+import io.lettuce.core.output.KeyValueStreamingChannel;
 import io.lettuce.core.BitFieldArgs;
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.SetArgs;
 import io.lettuce.core.Value;
-import io.lettuce.core.output.KeyValueStreamingChannel;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -93,13 +91,30 @@ public interface RedisStringReactiveCommands<K, V> {
      *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
-     *         However this behavior changes if you are looking for clear bits and specify a range with both
-     *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
-     *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
      */
     Mono<Long> bitpos(K key, boolean state);
 
+    /**
+     * Find first bit set or clear in a string.
+     *
+     * @param key the key
+     * @param state the bit type: long
+     * @param start the start type: long
+     * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
+     *
+     *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
+     *         returned.
+     *
+     *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
+     *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
+     *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
+     *
+     *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
+     *         specify no range or the <em>start</em> argument <strong>only</strong>.
+     * @since 5.0.1
+     */
+    Mono<Long> bitpos(K key, boolean state, long start);
+
     /**
      * Find first bit set or clear in a string.
      *
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java
index 3601db0f4a..8ceea6670a 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,13 @@
 
 import java.util.List;
 import java.util.Map;
-
+import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 import io.lettuce.core.BitFieldArgs;
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.SetArgs;
-import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.Value;
+import reactor.core.publisher.Mono;
 
 /**
  * Synchronous executed commands for Strings.
@@ -90,13 +92,30 @@ public interface RedisStringCommands<K, V> {
      *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
-     *         However this behavior changes if you are looking for clear bits and specify a range with both
-     *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
-     *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
      */
     Long bitpos(K key, boolean state);
 
+    /**
+     * Find first bit set or clear in a string.
+     *
+     * @param key the key
+     * @param state the bit type: long
+     * @param start the start type: long
+     * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
+     *
+     *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
+     *         returned.
+     *
+     *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
+     *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
+     *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
+     *
+     *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
+     *         specify no range or the <em>start</em> argument <strong>only</strong>.
+     * @since 5.0.1
+     */
+    Long bitpos(K key, boolean state, long start);
+
     /**
      * Find first bit set or clear in a string.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java
index f60a119346..f592160533 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,14 @@
 
 import java.util.List;
 import java.util.Map;
-
+import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 import io.lettuce.core.BitFieldArgs;
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.SetArgs;
-import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.Value;
+import io.lettuce.core.RedisFuture;
+import reactor.core.publisher.Mono;
 
 /**
  * Asynchronous executed commands on a node selection for Strings.
@@ -90,13 +93,30 @@ public interface NodeSelectionStringAsyncCommands<K, V> {
      *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
-     *         However this behavior changes if you are looking for clear bits and specify a range with both
-     *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
-     *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
      */
     AsyncExecutions<Long> bitpos(K key, boolean state);
 
+    /**
+     * Find first bit set or clear in a string.
+     *
+     * @param key the key
+     * @param state the bit type: long
+     * @param start the start type: long
+     * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
+     *
+     *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
+     *         returned.
+     *
+     *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
+     *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
+     *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
+     *
+     *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
+     *         specify no range or the <em>start</em> argument <strong>only</strong>.
+     * @since 5.0.1
+     */
+    AsyncExecutions<Long> bitpos(K key, boolean state, long start);
+
     /**
      * Find first bit set or clear in a string.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java
index 7ec226380a..d1611df66e 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,13 @@
 
 import java.util.List;
 import java.util.Map;
-
+import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
 import io.lettuce.core.BitFieldArgs;
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.SetArgs;
-import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.Value;
+import reactor.core.publisher.Mono;
 
 /**
  * Synchronous executed commands on a node selection for Strings.
@@ -90,13 +92,30 @@ public interface NodeSelectionStringCommands<K, V> {
      *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
-     *         However this behavior changes if you are looking for clear bits and specify a range with both
-     *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
-     *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
      */
     Executions<Long> bitpos(K key, boolean state);
 
+    /**
+     * Find first bit set or clear in a string.
+     *
+     * @param key the key
+     * @param state the bit type: long
+     * @param start the start type: long
+     * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
+     *
+     *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
+     *         returned.
+     *
+     *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
+     *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
+     *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
+     *
+     *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
+     *         specify no range or the <em>start</em> argument <strong>only</strong>.
+     * @since 5.0.1
+     */
+    Executions<Long> bitpos(K key, boolean state, long start);
+
     /**
      * Find first bit set or clear in a string.
      *
diff --git a/src/main/templates/io/lettuce/core/api/RedisStringCommands.java b/src/main/templates/io/lettuce/core/api/RedisStringCommands.java
index 5baf4752f7..76c04da110 100644
--- a/src/main/templates/io/lettuce/core/api/RedisStringCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisStringCommands.java
@@ -91,13 +91,30 @@ public interface RedisStringCommands<K, V> {
      *
      *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
      *         specify no range or the <em>start</em> argument <strong>only</strong>.
-     *
-     *         However this behavior changes if you are looking for clear bits and specify a range with both
-     *         <strong>start</strong> and <strong>end</strong>. If no clear bit is found in the specified range, the function
-     *         returns -1 as the user specified a clear range and there are no 0 bits in that range.
      */
     Long bitpos(K key, boolean state);
 
+        /**
+     * Find first bit set or clear in a string.
+     *
+     * @param key the key
+     * @param state the bit type: long
+     * @param start the start type: long
+     * @return Long integer-reply The command returns the position of the first bit set to 1 or 0 according to the request.
+     *
+     *         If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is
+     *         returned.
+     *
+     *         If we look for clear bits (the bit argument is 0) and the string only contains bit set to 1, the function returns
+     *         the first bit not part of the string on the right. So if the string is tree bytes set to the value 0xff the
+     *         command {@code BITPOS key 0} will return 24, since up to bit 23 all the bits are 1.
+     *
+     *         Basically the function consider the right of the string as padded with zeros if you look for clear bits and
+     *         specify no range or the <em>start</em> argument <strong>only</strong>.
+     * @since 5.0.1
+     */
+    Long bitpos(K key, boolean state, long start);
+
     /**
      * Find first bit set or clear in a string.
      *
diff --git a/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
index 5edc38a276..24cbf927b9 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
@@ -66,7 +66,7 @@ public CreateAsyncApi(String templateName) {
 
         String targetName = templateName.replace("Commands", "AsyncCommands");
 
-        File templateFile = new File(Constants.TEMPLATES, "com/lambdaworks/redis/api/" + templateName + ".java");
+        File templateFile = new File(Constants.TEMPLATES, "io/lettuce/core/api/" + templateName + ".java");
         String targetPackage;
 
         if (templateName.contains("RedisSentinel")) {
diff --git a/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
index c2177c4c6c..e55ce7b2df 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
@@ -69,7 +69,7 @@ public static List<Object[]> arguments() {
     public CreateAsyncNodeSelectionClusterApi(String templateName) {
 
         String targetName = templateName.replace("Commands", "AsyncCommands").replace("Redis", "NodeSelection");
-        File templateFile = new File(Constants.TEMPLATES, "com/lambdaworks/redis/api/" + templateName + ".java");
+        File templateFile = new File(Constants.TEMPLATES, "io/lettuce/core/api/" + templateName + ".java");
         String targetPackage = "io.lettuce.core.cluster.api.async";
 
         factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(),
diff --git a/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
index 2eecf76a80..269e1820f7 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
@@ -76,7 +76,7 @@ public static List<Object[]> arguments() {
     public CreateReactiveApi(String templateName) {
 
         String targetName = templateName.replace("Commands", "ReactiveCommands");
-        File templateFile = new File(Constants.TEMPLATES, "com/lambdaworks/redis/api/" + templateName + ".java");
+        File templateFile = new File(Constants.TEMPLATES, "io/lettuce/core/api/" + templateName + ".java");
         String targetPackage;
 
         if (templateName.contains("RedisSentinel")) {
diff --git a/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
index 06d19c6fd5..3b84a1bde0 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
@@ -64,7 +64,7 @@ public static List<Object[]> arguments() {
     public CreateSyncApi(String templateName) {
 
         String targetName = templateName;
-        File templateFile = new File(Constants.TEMPLATES, "com/lambdaworks/redis/api/" + templateName + ".java");
+        File templateFile = new File(Constants.TEMPLATES, "io/lettuce/core/api/" + templateName + ".java");
         String targetPackage;
 
         if (templateName.contains("RedisSentinel")) {
diff --git a/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
index 19cc29ecb8..041a947be5 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
@@ -69,7 +69,7 @@ public static List<Object[]> arguments() {
     public CreateSyncNodeSelectionClusterApi(String templateName) {
 
         String targetName = templateName.replace("Redis", "NodeSelection");
-        File templateFile = new File(Constants.TEMPLATES, "com/lambdaworks/redis/api/" + templateName + ".java");
+        File templateFile = new File(Constants.TEMPLATES, "io/lettuce/core/api/" + templateName + ".java");
         String targetPackage = "io.lettuce.core.cluster.api.sync";
 
         // todo: remove AutoCloseable from BaseNodeSelectionAsyncCommands
diff --git a/src/test/java/io/lettuce/core/commands/BitCommandTest.java b/src/test/java/io/lettuce/core/commands/BitCommandTest.java
index 26186d0d43..23c0cbe40f 100644
--- a/src/test/java/io/lettuce/core/commands/BitCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/BitCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -212,11 +212,13 @@ public void bitposOffset() throws Exception {
         redis.setbit(key, 3, 0);
         redis.setbit(key, 4, 0);
         redis.setbit(key, 5, 1);
+        redis.setbit(key, 16, 1);
 
         assertThat((long) bitstring.getbit(key, 1)).isEqualTo(1);
         assertThat((long) bitstring.getbit(key, 4)).isEqualTo(0);
         assertThat((long) bitstring.getbit(key, 5)).isEqualTo(1);
-        assertThat(bitstring.get(key)).isEqualTo("00100011");
+        assertThat(bitstring.get(key)).isEqualTo("001000110000000000000001");
+        assertThat((long) redis.bitpos(key, true, 1)).isEqualTo(16);
         assertThat((long) redis.bitpos(key, false, 0, 0)).isEqualTo(2);
     }
 

From 218f9fa4988a7f2f96da960e285f1e9e8f24e77c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 9 Oct 2017 21:51:45 +0200
Subject: [PATCH 317/808] Add commands to stack through write promise #616

Lettuce now appends written commands to the command stack using the write promise. Appending the command with the promise does not require command dequeueing on write failures but increases GC pressure.
---
 .../io/lettuce/core/protocol/AsyncCommand.java   | 16 +++-------------
 .../lettuce/core/protocol/DefaultEndpoint.java   |  4 +++-
 .../core/cluster/ClusterPartiallyDownTest.java   |  1 +
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
index 73c5deadb4..192418fcfd 100644
--- a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
@@ -205,15 +205,8 @@ public boolean equals(Object o) {
             return false;
         }
 
-        RedisCommand<?, ?, ?> left = command;
-        while (left instanceof DecoratedCommand) {
-            left = CommandWrapper.unwrap(left);
-        }
-
-        RedisCommand<?, ?, ?> right = (RedisCommand<?, ?, ?>) o;
-        while (right instanceof DecoratedCommand) {
-            right = CommandWrapper.unwrap(right);
-        }
+        RedisCommand<?, ?, ?> left = CommandWrapper.unwrap(command);
+        RedisCommand<?, ?, ?> right = CommandWrapper.unwrap((RedisCommand<?, ?, ?>) o);
 
         return left == right;
     }
@@ -221,10 +214,7 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
 
-        RedisCommand<?, ?, ?> toHash = command;
-        while (toHash instanceof DecoratedCommand) {
-            toHash = CommandWrapper.unwrap(toHash);
-        }
+        RedisCommand<?, ?, ?> toHash = CommandWrapper.unwrap(command);
 
         return toHash != null ? toHash.hashCode() : 0;
     }
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index 338d305b7b..beade54e19 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -436,6 +436,8 @@ private void flushCommands(Queue<RedisCommand<?, ?, ?>> queue) {
 
             if (!commands.isEmpty()) {
 
+                QUEUE_SIZE.addAndGet(this, commands.size());
+                
                 if (reliability == Reliability.AT_MOST_ONCE) {
                     // cancel on exceptions and remove from queue, because there is no housekeeping
                     writeAndFlush(commands).addListener(new AtMostOnceWriteListener(commands));
@@ -724,7 +726,7 @@ public void operationComplete(Future<Void> future) throws Exception {
                 }
             }
 
-            if (!future.isSuccess() && !(cause instanceof ClosedChannelException)) {
+            if (!success && !(cause instanceof ClosedChannelException)) {
 
                 String message = "Unexpected exception during request: {}";
                 InternalLogLevel logLevel = InternalLogLevel.WARN;
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
index 0828bce4f1..77504a19f2 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
@@ -18,6 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
 
+import java.io.IOException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;

From 8c7ef98a018672e70d7c40197b4ae23a4ddd5ae0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 9 Oct 2017 22:21:09 +0200
Subject: [PATCH 318/808] Adapt JMH tests

---
 .../jmh/io/lettuce/core/protocol/EmptyPromise.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java b/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
index 34cc1efaec..a35fdcd8c2 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
@@ -86,20 +86,20 @@ public Throwable cause() {
 
     @Override
     public ChannelPromise addListener(GenericFutureListener<? extends Future<? super Void>> listener) {
+
         try {
             ((GenericFutureListener) listener).operationComplete(this);
         } catch (Exception e) {
-            throw new IllegalStateException(e);
+            throw new RuntimeException(e);
         }
-        return this;
+        return null;
     }
 
     @Override
     public ChannelPromise addListeners(GenericFutureListener<? extends Future<? super Void>>... listeners) {
-        for (GenericFutureListener<? extends Future<? super Void>> listener : listeners) {
+for (GenericFutureListener<? extends Future<? super Void>> listener : listeners) {
             addListener(listener);
-        }
-        return this;
+        }        return this;
     }
 
     @Override

From 6bd1eb7e2711c5ba83857d839ca908c6984693c7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 11 Oct 2017 15:58:26 +0200
Subject: [PATCH 319/808] Introduce dedicated exceptions for NOSCRIPT and BUSY
 responses #620

Lettuce now reports NOSCRIPT and BUSY errors RedisNoScriptException respective RedisBusyException. Both are subtypes of RedisCommandExecutionException and allow fine-grained error introspection.
---
 .../io/lettuce/core/AbstractRedisClient.java  |  2 +-
 .../io/lettuce/core/ExceptionFactory.java     | 66 +++++++++++++++++++
 .../java/io/lettuce/core/LettuceFutures.java  |  4 +-
 .../io/lettuce/core/RedisBusyException.java   | 45 +++++++++++++
 .../lettuce/core/RedisNoScriptException.java  | 46 +++++++++++++
 .../java/io/lettuce/core/RedisPublisher.java  |  2 +-
 .../NodeSelectionInvocationHandler.java       |  4 +-
 .../io/lettuce/core/output/MultiOutput.java   |  4 +-
 .../lettuce/core/protocol/AsyncCommand.java   |  4 +-
 .../lettuce/core/AbstractRedisClientTest.java | 16 ++---
 .../io/lettuce/core/ExceptionFactoryTest.java | 61 +++++++++++++++++
 .../core/commands/ScriptingCommandTest.java   |  3 +
 12 files changed, 239 insertions(+), 18 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/ExceptionFactory.java
 create mode 100644 src/main/java/io/lettuce/core/RedisBusyException.java
 create mode 100644 src/main/java/io/lettuce/core/RedisNoScriptException.java
 create mode 100644 src/test/java/io/lettuce/core/ExceptionFactoryTest.java

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 7cc4a82e53..b734fbd138 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -347,7 +347,7 @@ public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
         } catch (ExecutionException e) {
 
             if (e.getCause() instanceof RedisCommandExecutionException) {
-                throw new RedisCommandExecutionException(e.getCause().getMessage(), e.getCause());
+                throw ExceptionFactory.createExecutionException(e.getCause().getMessage(), e.getCause());
             }
 
             throw new RedisException(e.getCause());
diff --git a/src/main/java/io/lettuce/core/ExceptionFactory.java b/src/main/java/io/lettuce/core/ExceptionFactory.java
new file mode 100644
index 0000000000..de0f707cce
--- /dev/null
+++ b/src/main/java/io/lettuce/core/ExceptionFactory.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+/**
+ * Factory for Redis exceptions.
+ * 
+ * @author Mark Paluch
+ * @since 4.5
+ */
+public abstract class ExceptionFactory {
+
+    private ExceptionFactory() {
+    }
+
+    /**
+     * Create a {@link RedisCommandExecutionException} with a detail message. Specific Redis error messages may create subtypes
+     * of {@link RedisCommandExecutionException}.
+     * 
+     * @param message the detail message.
+     * @return the {@link RedisCommandExecutionException}.
+     */
+    public static RedisCommandExecutionException createExecutionException(String message) {
+        return createExecutionException(message, null);
+    }
+
+    /**
+     * Create a {@link RedisCommandExecutionException} with a detail message. Specific Redis error messages may create subtypes
+     * of {@link RedisCommandExecutionException}.
+     * 
+     * @param message the detail message.
+     * @param cause the nested exception.
+     * @return the {@link RedisCommandExecutionException}.
+     */
+    public static RedisCommandExecutionException createExecutionException(String message, Throwable cause) {
+
+        if (message != null) {
+
+            if (message.startsWith("BUSY")) {
+                return cause != null ? new RedisBusyException(message, cause) : new RedisBusyException(message);
+            }
+
+            if (message.startsWith("NOSCRIPT")) {
+                return cause != null ? new RedisNoScriptException(message, cause) : new RedisNoScriptException(message);
+            }
+
+            return cause != null ? new RedisCommandExecutionException(message, cause) : new RedisCommandExecutionException(
+                    message);
+        }
+
+        return new RedisCommandExecutionException(cause);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/LettuceFutures.java b/src/main/java/io/lettuce/core/LettuceFutures.java
index cb6ad26090..5137decbd3 100644
--- a/src/main/java/io/lettuce/core/LettuceFutures.java
+++ b/src/main/java/io/lettuce/core/LettuceFutures.java
@@ -82,7 +82,7 @@ public static boolean awaitAll(long timeout, TimeUnit unit, Future<?>... futures
         } catch (ExecutionException e) {
 
             if (e.getCause() instanceof RedisCommandExecutionException) {
-                throw new RedisCommandExecutionException(e.getCause().getMessage(), e.getCause());
+                throw ExceptionFactory.createExecutionException(e.getCause().getMessage(), e.getCause());
             }
 
             throw new RedisException(e.getCause());
@@ -119,7 +119,7 @@ public static <T> T awaitOrCancel(RedisFuture<T> cmd, long timeout, TimeUnit uni
         } catch (ExecutionException e) {
 
             if (e.getCause() instanceof RedisCommandExecutionException) {
-                throw new RedisCommandExecutionException(e.getCause().getMessage(), e.getCause());
+                throw ExceptionFactory.createExecutionException(e.getCause().getMessage(), e.getCause());
             }
 
             throw new RedisException(e.getCause());
diff --git a/src/main/java/io/lettuce/core/RedisBusyException.java b/src/main/java/io/lettuce/core/RedisBusyException.java
new file mode 100644
index 0000000000..8da4462f7a
--- /dev/null
+++ b/src/main/java/io/lettuce/core/RedisBusyException.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+/**
+ * Exception that gets thrown when Redis is busy executing a Lua script with a {@code BUSY} error response.
+ * 
+ * @author Mark Paluch
+ * @since 4.5
+ */
+@SuppressWarnings("serial")
+public class RedisBusyException extends RedisCommandExecutionException {
+
+    /**
+     * Create a {@code RedisBusyException} with the specified detail message.
+     * 
+     * @param msg the detail message.
+     */
+    public RedisBusyException(String msg) {
+        super(msg);
+    }
+
+    /**
+     * Create a {@code RedisNoScriptException} with the specified detail message and nested exception.
+     * 
+     * @param msg the detail message.
+     * @param cause the nested exception.
+     */
+    public RedisBusyException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/RedisNoScriptException.java b/src/main/java/io/lettuce/core/RedisNoScriptException.java
new file mode 100644
index 0000000000..10a1deffd8
--- /dev/null
+++ b/src/main/java/io/lettuce/core/RedisNoScriptException.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+/**
+ * Exception that gets thrown when Redis indicates absence of a Lua script referenced by its SHA1 digest with a {@code NOSCRIPT}
+ * error response.
+ * 
+ * @author Mark Paluch
+ * @since 4.5
+ */
+@SuppressWarnings("serial")
+public class RedisNoScriptException extends RedisCommandExecutionException {
+
+    /**
+     * Create a {@code RedisNoScriptException} with the specified detail message.
+     * 
+     * @param msg the detail message.
+     */
+    public RedisNoScriptException(String msg) {
+        super(msg);
+    }
+
+    /**
+     * Create a {@code RedisNoScriptException} with the specified detail message and nested exception.
+     * 
+     * @param msg the detail message.
+     * @param cause the nested exception.
+     */
+    public RedisNoScriptException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index 3a843202a7..a0d3c989c3 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -628,7 +628,7 @@ public void complete() {
                     Object result = getOutput().get();
 
                     if (getOutput().hasError()) {
-                        onError(new RedisCommandExecutionException(getOutput().getError()));
+                        onError(ExceptionFactory.createExecutionException(getOutput().getError()));
                         completed = true;
                         return;
                     }
diff --git a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
index ff0704a5bc..10cb22e9de 100644
--- a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
@@ -24,6 +24,7 @@
 
 import org.reactivestreams.Publisher;
 
+import io.lettuce.core.ExceptionFactory;
 import io.lettuce.core.RedisCommandExecutionException;
 import io.lettuce.core.RedisCommandInterruptedException;
 import io.lettuce.core.RedisCommandTimeoutException;
@@ -231,7 +232,8 @@ private RedisCommandExecutionException createExecutionException(Map<RedisCluster
             }
         });
 
-        RedisCommandExecutionException e = new RedisCommandExecutionException(
+        RedisCommandExecutionException e = ExceptionFactory
+                .createExecutionException(
                 "Multi-node command execution failed on node(s): " + getNodeDescription(failed));
 
         executions.forEach((redisClusterNode, completionStage) -> {
diff --git a/src/main/java/io/lettuce/core/output/MultiOutput.java b/src/main/java/io/lettuce/core/output/MultiOutput.java
index 098402504a..fe16faa400 100644
--- a/src/main/java/io/lettuce/core/output/MultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/MultiOutput.java
@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.Queue;
 
-import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.ExceptionFactory;
 import io.lettuce.core.TransactionResult;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.internal.LettuceFactories;
@@ -104,7 +104,7 @@ public void complete(int depth) {
         if (depth == 1) {
             RedisCommand<K, V, ?> cmd = queue.remove();
             CommandOutput<K, V, ?> o = cmd.getOutput();
-            responses.add(!o.hasError() ? o.get() : new RedisCommandExecutionException(o.getError()));
+            responses.add(!o.hasError() ? o.get() : ExceptionFactory.createExecutionException(o.getError()));
             cmd.complete();
         } else if (depth == 0 && !queue.isEmpty()) {
             for (RedisCommand<K, V, ?> cmd : queue) {
diff --git a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
index 192418fcfd..2c26f69437 100644
--- a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
@@ -22,7 +22,7 @@
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.function.Consumer;
 
-import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.ExceptionFactory;
 import io.lettuce.core.RedisCommandInterruptedException;
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.internal.LettuceAssert;
@@ -115,7 +115,7 @@ protected void completeResult() {
         if (command.getOutput() == null) {
             complete(null);
         } else if (command.getOutput().hasError()) {
-            doCompleteExceptionally(new RedisCommandExecutionException(command.getOutput().getError()));
+            doCompleteExceptionally(ExceptionFactory.createExecutionException(command.getOutput().getError()));
         } else {
             complete(command.getOutput().get());
         }
diff --git a/src/test/java/io/lettuce/core/AbstractRedisClientTest.java b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
index 96f3fd71c8..58ed1ad910 100644
--- a/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
+++ b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
@@ -58,15 +58,13 @@ public void openConnection() throws Exception {
             try {
                 redis.flushall();
                 redis.flushdb();
-            } catch (RedisException e) {
-                if (e.getMessage() != null && e.getMessage().contains("BUSY")) {
-                    scriptRunning = true;
-                    try {
-                        redis.scriptKill();
-                    } catch (RedisException e1) {
-                        // I know, it sounds crazy, but there is a possibility where one of the commands above raises BUSY.
-                        // Meanwhile the script ends and a call to SCRIPT KILL says NOTBUSY.
-                    }
+            } catch (RedisBusyException e) {
+                scriptRunning = true;
+                try {
+                    redis.scriptKill();
+                } catch (RedisException e1) {
+                    // I know, it sounds crazy, but there is a possibility where one of the commands above raises BUSY.
+                    // Meanwhile the script ends and a call to SCRIPT KILL says NOTBUSY.
                 }
             }
         } while (scriptRunning);
diff --git a/src/test/java/io/lettuce/core/ExceptionFactoryTest.java b/src/test/java/io/lettuce/core/ExceptionFactoryTest.java
new file mode 100644
index 0000000000..62b71122f8
--- /dev/null
+++ b/src/test/java/io/lettuce/core/ExceptionFactoryTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.lettuce.core.ExceptionFactory;
+import io.lettuce.core.RedisBusyException;
+import io.lettuce.core.RedisNoScriptException;
+import org.junit.Test;
+
+/**
+ * @author Mark Paluch
+ */
+public class ExceptionFactoryTest {
+
+    @Test
+    public void shouldCreateBusyException() {
+
+        assertThat(ExceptionFactory.createExecutionException("BUSY foo bar")).isInstanceOf(RedisBusyException.class)
+                .hasMessage("BUSY foo bar").hasNoCause();
+        assertThat(ExceptionFactory.createExecutionException("BUSY foo bar", new IllegalStateException()))
+                .isInstanceOf(RedisBusyException.class).hasMessage("BUSY foo bar")
+                .hasRootCauseInstanceOf(IllegalStateException.class);
+    }
+
+    @Test
+    public void shouldCreateNoscriptException() {
+
+        assertThat(ExceptionFactory.createExecutionException("NOSCRIPT foo bar")).isInstanceOf(RedisNoScriptException.class)
+                .hasMessage("NOSCRIPT foo bar").hasNoCause();
+        assertThat(ExceptionFactory.createExecutionException("NOSCRIPT foo bar", new IllegalStateException()))
+                .isInstanceOf(RedisNoScriptException.class).hasMessage("NOSCRIPT foo bar")
+                .hasRootCauseInstanceOf(IllegalStateException.class);
+    }
+
+    @Test
+    public void shouldCreateExecutionException() {
+
+        assertThat(ExceptionFactory.createExecutionException("ERR foo bar")).isInstanceOf(RedisCommandExecutionException.class)
+                .hasMessage("ERR foo bar").hasNoCause();
+        assertThat(ExceptionFactory.createExecutionException("ERR foo bar", new IllegalStateException()))
+                .isInstanceOf(RedisCommandExecutionException.class).hasMessage("ERR foo bar")
+                .hasRootCauseInstanceOf(IllegalStateException.class);
+        assertThat(ExceptionFactory.createExecutionException(null, new IllegalStateException())).isInstanceOf(
+                RedisCommandExecutionException.class).hasRootCauseInstanceOf(IllegalStateException.class);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java b/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
index 022ff7c245..456f88b7de 100644
--- a/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
@@ -32,6 +32,7 @@
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.RedisNoScriptException;
 
 /**
  * @author Will Glozer
@@ -95,6 +96,7 @@ public void evalsha() throws Exception {
         String digest = redis.digest(script);
         assertThat((Number) redis.eval(script, INTEGER)).isEqualTo(2L);
         assertThat((Number) redis.evalsha(digest, INTEGER)).isEqualTo(2L);
+        exception.expect(RedisNoScriptException.class);
         exception.expectMessage("NOSCRIPT No matching script. Please use EVAL.");
         redis.evalsha(redis.digest("return 1 + 1 == 4"), INTEGER);
     }
@@ -103,6 +105,7 @@ public void evalsha() throws Exception {
     public void evalshaWithMulti() throws Exception {
         redis.scriptFlush();
         String digest = redis.digest("return {1234, 5678}");
+        exception.expect(RedisNoScriptException.class);
         exception.expectMessage("NOSCRIPT No matching script. Please use EVAL.");
         redis.evalsha(digest, MULTI);
     }

From e344a0a8e1f2082fab1db3f8ee0d3f43d92da98e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 11 Oct 2017 16:15:45 +0200
Subject: [PATCH 320/808] Polishing #620

Add Javadoc to exceptions. Extend ExceptionFactory usage.
---
 .../io/lettuce/core/AbstractRedisClient.java  |  2 +-
 .../io/lettuce/core/ExceptionFactory.java     | 77 ++++++++++++++++++-
 .../java/io/lettuce/core/LettuceFutures.java  |  6 +-
 .../lettuce/core/PlainChannelInitializer.java |  6 +-
 .../core/RedisCommandExecutionException.java  | 29 +++++--
 .../RedisCommandInterruptedException.java     | 12 ++-
 .../core/RedisCommandTimeoutException.java    | 10 ++-
 .../core/RedisConnectionException.java        | 21 +++--
 .../java/io/lettuce/core/RedisException.java  | 20 ++++-
 .../NodeSelectionInvocationHandler.java       |  7 +-
 .../io/lettuce/core/ExceptionFactoryTest.java | 31 +++++++-
 11 files changed, 189 insertions(+), 32 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index b734fbd138..99cd97a4c8 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -356,7 +356,7 @@ public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
             Thread.currentThread().interrupt();
             throw new RedisCommandInterruptedException(e);
         } catch (Exception e) {
-            throw new RedisCommandExecutionException(e);
+            throw ExceptionFactory.createExecutionException(null, e);
         }
     }
 
diff --git a/src/main/java/io/lettuce/core/ExceptionFactory.java b/src/main/java/io/lettuce/core/ExceptionFactory.java
index de0f707cce..3f8e265a8f 100644
--- a/src/main/java/io/lettuce/core/ExceptionFactory.java
+++ b/src/main/java/io/lettuce/core/ExceptionFactory.java
@@ -15,6 +15,12 @@
  */
 package io.lettuce.core;
 
+import java.time.Duration;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.ChronoField;
+
 /**
  * Factory for Redis exceptions.
  * 
@@ -23,9 +29,74 @@
  */
 public abstract class ExceptionFactory {
 
+    private static final DateTimeFormatter MINUTES = new DateTimeFormatterBuilder().appendText(ChronoField.MINUTE_OF_DAY)
+            .appendLiteral(" minute(s)").toFormatter();
+
+    private static final DateTimeFormatter SECONDS = new DateTimeFormatterBuilder().appendText(ChronoField.SECOND_OF_DAY)
+            .appendLiteral(" second(s)").toFormatter();
+
+    private static final DateTimeFormatter MILLISECONDS = new DateTimeFormatterBuilder().appendText(ChronoField.MILLI_OF_DAY)
+            .appendLiteral(" millisecond(s)").toFormatter();
+
     private ExceptionFactory() {
     }
 
+    /**
+     * Create a {@link RedisCommandTimeoutException} with a detail message given the timeout.
+     * 
+     * @param timeout the timeout value.
+     * @return the {@link RedisCommandTimeoutException}.
+     */
+    public static RedisCommandTimeoutException createTimeoutException(Duration timeout) {
+        return new RedisCommandTimeoutException(String.format("Command timed out after %s", formatTimeout(timeout)));
+    }
+
+    /**
+     * Create a {@link RedisCommandTimeoutException} with a detail message given the message and timeout.
+     * 
+     * @param message the detail message.
+     * @param timeout the timeout value.
+     * @return the {@link RedisCommandTimeoutException}.
+     */
+    public static RedisCommandTimeoutException createTimeoutException(String message, Duration timeout) {
+        return new RedisCommandTimeoutException(
+                String.format("%s. Command timed out after %s", message, formatTimeout(timeout)));
+    }
+
+    static String formatTimeout(Duration duration) {
+
+        if (duration.isZero()) {
+            return "no timeout";
+        }
+
+        LocalTime time = LocalTime.MIDNIGHT.plus(duration);
+        if (isExactMinutes(duration)) {
+            return MINUTES.format(time);
+        }
+
+        if (isExactSeconds(duration)) {
+            return SECONDS.format(time);
+        }
+
+        if (isExactMillis(duration)) {
+            return MILLISECONDS.format(time);
+        }
+
+        return String.format("%d ns", duration.toNanos());
+    }
+
+    private static boolean isExactMinutes(Duration duration) {
+        return duration.toMillis() % (1000 * 60) == 0 && duration.getNano() == 0;
+    }
+
+    private static boolean isExactSeconds(Duration duration) {
+        return duration.toMillis() % (1000) == 0 && duration.getNano() == 0;
+    }
+
+    private static boolean isExactMillis(Duration duration) {
+        return duration.toNanos() % (1000 * 1000) == 0;
+    }
+
     /**
      * Create a {@link RedisCommandExecutionException} with a detail message. Specific Redis error messages may create subtypes
      * of {@link RedisCommandExecutionException}.
@@ -38,11 +109,11 @@ public static RedisCommandExecutionException createExecutionException(String mes
     }
 
     /**
-     * Create a {@link RedisCommandExecutionException} with a detail message. Specific Redis error messages may create subtypes
-     * of {@link RedisCommandExecutionException}.
+     * Create a {@link RedisCommandExecutionException} with a detail message and optionally a {@link Throwable cause}. Specific
+     * Redis error messages may create subtypes of {@link RedisCommandExecutionException}.
      * 
      * @param message the detail message.
-     * @param cause the nested exception.
+     * @param cause the nested exception, may be {@literal null}.
      * @return the {@link RedisCommandExecutionException}.
      */
     public static RedisCommandExecutionException createExecutionException(String message, Throwable cause) {
diff --git a/src/main/java/io/lettuce/core/LettuceFutures.java b/src/main/java/io/lettuce/core/LettuceFutures.java
index 5137decbd3..95e08faddb 100644
--- a/src/main/java/io/lettuce/core/LettuceFutures.java
+++ b/src/main/java/io/lettuce/core/LettuceFutures.java
@@ -91,7 +91,7 @@ public static boolean awaitAll(long timeout, TimeUnit unit, Future<?>... futures
             Thread.currentThread().interrupt();
             throw new RedisCommandInterruptedException(e);
         } catch (Exception e) {
-            throw new RedisCommandExecutionException(e);
+            throw ExceptionFactory.createExecutionException(null, e);
         }
     }
 
@@ -111,7 +111,7 @@ public static <T> T awaitOrCancel(RedisFuture<T> cmd, long timeout, TimeUnit uni
         try {
             if (!cmd.await(timeout, unit)) {
                 cmd.cancel(true);
-                throw new RedisCommandTimeoutException();
+                throw ExceptionFactory.createTimeoutException(Duration.ofNanos(unit.toNanos(timeout)));
             }
             return cmd.get();
         } catch (RuntimeException e) {
@@ -128,7 +128,7 @@ public static <T> T awaitOrCancel(RedisFuture<T> cmd, long timeout, TimeUnit uni
             Thread.currentThread().interrupt();
             throw new RedisCommandInterruptedException(e);
         } catch (Exception e) {
-            throw new RedisCommandExecutionException(e);
+            throw ExceptionFactory.createExecutionException(null, e);
         }
     }
 }
diff --git a/src/main/java/io/lettuce/core/PlainChannelInitializer.java b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
index f306e6dc45..ac0ba775f2 100644
--- a/src/main/java/io/lettuce/core/PlainChannelInitializer.java
+++ b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
@@ -132,9 +132,9 @@ static void pingBeforeActivate(AsyncCommand<?, ?, ?> cmd, CompletableFuture<Bool
             if (cmd.isDone() || initializedFuture.isDone()) {
                 return;
             }
-
-            initializedFuture.completeExceptionally(new RedisCommandTimeoutException(String.format(
-                    "Cannot initialize channel (PING before activate) within %s", timeout)));
+            
+            initializedFuture.completeExceptionally(ExceptionFactory.createTimeoutException(
+                    "Cannot initialize channel (PING before activate)", timeout));
         };
 
         Timeout timeoutHandle = clientResources.timer().newTimeout(t -> {
diff --git a/src/main/java/io/lettuce/core/RedisCommandExecutionException.java b/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
index 168b3f9176..cccd744443 100644
--- a/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
@@ -23,16 +23,33 @@
 @SuppressWarnings("serial")
 public class RedisCommandExecutionException extends RedisException {
 
-    public RedisCommandExecutionException(Throwable cause) {
-        super(cause);
-    }
-
+    /**
+     * Create a {@code RedisCommandExecutionException} with the specified detail message.
+     *
+     * @param msg the detail message.
+     */
     public RedisCommandExecutionException(String msg) {
         super(msg);
     }
 
-    public RedisCommandExecutionException(String msg, Throwable e) {
-        super(msg, e);
+    /**
+     * Create a {@code RedisCommandExecutionException} with the specified detail message and nested exception.
+     * 
+     * @param msg the detail message.
+     * @param cause the nested exception.
+     */
+    public RedisCommandExecutionException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+
+    /**
+     * Create a {@code RedisCommandExecutionException} with the specified nested exception.
+     *
+     * @param msg the detail message.
+     * @param cause the nested exception.
+     */
+    public RedisCommandExecutionException(Throwable cause) {
+        super(cause);
     }
 
 }
diff --git a/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java b/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java
index 6e9c3a84c6..35feed641e 100644
--- a/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,17 @@
  * Exception thrown when the thread executing a redis command is interrupted.
  *
  * @author Will Glozer
+ * @author Mark Paluch
  */
 @SuppressWarnings("serial")
 public class RedisCommandInterruptedException extends RedisException {
 
-    public RedisCommandInterruptedException(Throwable e) {
-        super("Command interrupted", e);
+    /**
+     * Create a {@code RedisCommandInterruptedException} with the specified nested exception.
+     *
+     * @param cause the nested exception.
+     */
+    public RedisCommandInterruptedException(Throwable cause) {
+        super("Command interrupted", cause);
     }
 }
diff --git a/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java b/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
index 334860135b..864ca72b20 100644
--- a/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,18 @@
 @SuppressWarnings("serial")
 public class RedisCommandTimeoutException extends RedisException {
 
+    /**
+     * Create a {@code RedisCommandTimeoutException} with a default message.
+     */
     public RedisCommandTimeoutException() {
         super("Command timed out");
     }
 
+    /**
+     * Create a {@code RedisCommandTimeoutException} with the specified detail message.
+     *
+     * @param msg the detail message.
+     */
     public RedisCommandTimeoutException(String msg) {
         super(msg);
     }
diff --git a/src/main/java/io/lettuce/core/RedisConnectionException.java b/src/main/java/io/lettuce/core/RedisConnectionException.java
index b1a5556855..043b1fc245 100644
--- a/src/main/java/io/lettuce/core/RedisConnectionException.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionException.java
@@ -25,20 +25,31 @@
 @SuppressWarnings("serial")
 public class RedisConnectionException extends RedisException {
 
+    /**
+     * Create a {@code RedisConnectionException} with the specified detail message.
+     *
+     * @param msg the detail message.
+     */
     public RedisConnectionException(String msg) {
         super(msg);
     }
 
-    public RedisConnectionException(String msg, Throwable e) {
-        super(msg, e);
+    /**
+     * Create a {@code RedisConnectionException} with the specified detail message and nested exception.
+     * 
+     * @param msg the detail message.
+     * @param cause the nested exception.
+     */
+    public RedisConnectionException(String msg, Throwable cause) {
+        super(msg, cause);
     }
 
     /**
      * Create a new {@link RedisConnectionException} given {@link SocketAddress} and the {@link Throwable cause}.
      *
-     * @param remoteAddress
-     * @param cause
-     * @return
+     * @param remoteAddress remote socket address.
+     * @param cause the nested exception.
+     * @return the {@link RedisConnectionException}.
      * @since 4.4
      */
     public static RedisConnectionException create(SocketAddress remoteAddress, Throwable cause) {
diff --git a/src/main/java/io/lettuce/core/RedisException.java b/src/main/java/io/lettuce/core/RedisException.java
index 2258211e09..a85dca86d1 100644
--- a/src/main/java/io/lettuce/core/RedisException.java
+++ b/src/main/java/io/lettuce/core/RedisException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,18 +19,36 @@
  * Exception thrown when Redis returns an error message, or when the client fails for any reason.
  *
  * @author Will Glozer
+ * @author Mark Paluch
  */
 @SuppressWarnings("serial")
 public class RedisException extends RuntimeException {
 
+    /**
+     * Create a {@code RedisException} with the specified detail message.
+     * 
+     * @param msg the detail message.
+     */
     public RedisException(String msg) {
         super(msg);
     }
 
+    /**
+     * Create a {@code RedisException} with the specified detail message and nested exception.
+     * 
+     * @param msg the detail message.
+     * @param cause the nested exception.
+     */
     public RedisException(String msg, Throwable e) {
         super(msg, e);
     }
 
+    /**
+     * Create a {@code RedisException} with the specified nested exception.
+     * 
+     * @param msg the detail message.
+     * @param cause the nested exception.
+     */
     public RedisException(Throwable cause) {
         super(cause);
     }
diff --git a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
index 10cb22e9de..3cb1b251bd 100644
--- a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
@@ -160,7 +160,7 @@ private Object getExecutions(Map<RedisClusterNode, Object> executions) throws Ex
         if (executionModel == ExecutionModel.SYNC) {
 
             if (!awaitAll(timeout.toNanos(), TimeUnit.NANOSECONDS, asyncExecutions.values())) {
-                throw createTimeoutException(asyncExecutions);
+                throw createTimeoutException(asyncExecutions, timeout);
             }
 
             if (atLeastOneFailed(asyncExecutions)) {
@@ -210,7 +210,8 @@ private boolean atLeastOneFailed(Map<RedisClusterNode, CompletionStage<?>> execu
                 .anyMatch(completionStage -> completionStage.toCompletableFuture().isCompletedExceptionally());
     }
 
-    private RedisCommandTimeoutException createTimeoutException(Map<RedisClusterNode, CompletionStage<?>> executions) {
+    private RedisCommandTimeoutException createTimeoutException(Map<RedisClusterNode, CompletionStage<?>> executions,
+            Duration timeout) {
 
         List<RedisClusterNode> notFinished = new ArrayList<>();
         executions.forEach((redisClusterNode, completionStage) -> {
@@ -220,7 +221,7 @@ private RedisCommandTimeoutException createTimeoutException(Map<RedisClusterNode
         });
 
         String description = getNodeDescription(notFinished);
-        return new RedisCommandTimeoutException("Command timed out for node(s): " + description);
+        return ExceptionFactory.createTimeoutException("Command timed out for node(s): " + description, timeout);
     }
 
     private RedisCommandExecutionException createExecutionException(Map<RedisClusterNode, CompletionStage<?>> executions) {
diff --git a/src/test/java/io/lettuce/core/ExceptionFactoryTest.java b/src/test/java/io/lettuce/core/ExceptionFactoryTest.java
index 62b71122f8..7d1584d405 100644
--- a/src/test/java/io/lettuce/core/ExceptionFactoryTest.java
+++ b/src/test/java/io/lettuce/core/ExceptionFactoryTest.java
@@ -17,9 +17,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.lettuce.core.ExceptionFactory;
-import io.lettuce.core.RedisBusyException;
-import io.lettuce.core.RedisNoScriptException;
+import java.time.Duration;
+
 import org.junit.Test;
 
 /**
@@ -58,4 +57,30 @@ public void shouldCreateExecutionException() {
         assertThat(ExceptionFactory.createExecutionException(null, new IllegalStateException())).isInstanceOf(
                 RedisCommandExecutionException.class).hasRootCauseInstanceOf(IllegalStateException.class);
     }
+
+    @Test
+    public void shouldFormatExactUnits() {
+
+        assertThat(ExceptionFactory.formatTimeout(Duration.ofMinutes(2))).isEqualTo("2 minute(s)");
+        assertThat(ExceptionFactory.formatTimeout(Duration.ofMinutes(1))).isEqualTo("1 minute(s)");
+        assertThat(ExceptionFactory.formatTimeout(Duration.ofMinutes(0))).isEqualTo("no timeout");
+
+        assertThat(ExceptionFactory.formatTimeout(Duration.ofSeconds(2))).isEqualTo("2 second(s)");
+        assertThat(ExceptionFactory.formatTimeout(Duration.ofSeconds(1))).isEqualTo("1 second(s)");
+        assertThat(ExceptionFactory.formatTimeout(Duration.ofSeconds(0))).isEqualTo("no timeout");
+
+        assertThat(ExceptionFactory.formatTimeout(Duration.ofMillis(2))).isEqualTo("2 millisecond(s)");
+        assertThat(ExceptionFactory.formatTimeout(Duration.ofMillis(1))).isEqualTo("1 millisecond(s)");
+        assertThat(ExceptionFactory.formatTimeout(Duration.ofMillis(0))).isEqualTo("no timeout");
+    }
+
+    @Test
+    public void shouldFormatToMinmalApplicableTimeunit() {
+
+        assertThat(ExceptionFactory.formatTimeout(Duration.ofMinutes(2).plus(Duration.ofSeconds(10)))).isEqualTo(
+                "130 second(s)");
+        assertThat(ExceptionFactory.formatTimeout(Duration.ofSeconds(2).plus(Duration.ofMillis(5)))).isEqualTo(
+                "2005 millisecond(s)");
+        assertThat(ExceptionFactory.formatTimeout(Duration.ofNanos(2))).isEqualTo("2 ns");
+    }
 }
\ No newline at end of file

From c1774ea5aad2087bc044c839bb13585b287cfdda Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 12 Oct 2017 09:28:06 +0200
Subject: [PATCH 321/808] Bind byte arrays nested in an Iterable argument #627

Byte arrays passed within an Iterable are now unrolled and bound correctly. Previously, byte arrays were not bound and silently dropped.
---
 .../lettuce/core/dynamic/ParameterBinder.java  | 18 ++++++++++++++++--
 .../core/dynamic/RedisCommandsSyncTest.java    | 16 ++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java b/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
index f15f2719c8..d34a3542ca 100644
--- a/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
+++ b/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
@@ -136,12 +136,15 @@ private <K, V> void bind(CommandArgs<K, V> args, RedisCodec<K, V> codec, Object
         }
 
         if (argument instanceof Iterable) {
+
             for (Object argumentElement : (Iterable<Object>) argument) {
                 bindArgument(args, argumentElement);
             }
-        } else {
-            bindArgument(args, argument);
+
+            return;
         }
+
+        bindArgument(args, argument);
     }
 
     /*
@@ -151,14 +154,22 @@ private <K, V> void bind(CommandArgs<K, V> args, RedisCodec<K, V> codec, Object
     @SuppressWarnings("unchecked")
     private static <K, V> void bindArgument(CommandArgs<K, V> args, Object argument) {
 
+        if (argument instanceof byte[]) {
+            args.add((byte[]) argument);
+            return;
+        }
+
         if (argument instanceof String) {
             args.add((String) argument);
+            return;
         }
 
         if (argument instanceof Double) {
             args.add(((Double) argument));
+            return;
         } else if (argument instanceof Number) {
             args.add(((Number) argument).longValue());
+            return;
         }
 
         if (argument instanceof ProtocolKeyword) {
@@ -229,7 +240,10 @@ private static <K, V> void bindArgument(CommandArgs<K, V> args, Object argument)
 
         if (argument instanceof CompositeArgument) {
             ((CompositeArgument) argument).build(args);
+            return;
         }
+
+        throw new IllegalArgumentException("Cannot bind unsupported command argument " + args);
     }
 
     private static <K, V> void bindValueRange(CommandArgs<K, V> args, RedisCodec<K, V> codec, Range<? extends V> range) {
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java
index 2ae07c9ae1..3be4ebd7ea 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java
@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -79,8 +80,23 @@ public void mgetAsValues() {
         assertThat(values.get(1)).isEqualTo(Value.empty());
     }
 
+    @Test
+    public void mgetByteArray() {
+
+        redis.set(key, value);
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
+
+        List<byte[]> values = api.mget(Collections.singleton(key.getBytes()));
+        assertThat(values).hasSize(1).contains(value.getBytes());
+    }
+
     interface MultipleExecutionModels extends Commands {
 
+        List<byte[]> mget(Iterable<byte[]> keys);
+
         String get(String key);
 
         default byte[] getAsBytes() {

From a8828575a91bf289e493ccba77bc84292fe48eab Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 12 Oct 2017 09:28:52 +0200
Subject: [PATCH 322/808] Polishing #627

Improve null-handling of KeyList/Map outputs. Report command name via StringCommandType.
---
 .../core/dynamic/segment/CommandSegments.java       | 13 +++++++++----
 .../java/io/lettuce/core/output/KeyListOutput.java  |  2 +-
 src/main/java/io/lettuce/core/output/MapOutput.java |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
index b5c0703ad4..2dad3198c5 100644
--- a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
@@ -42,8 +42,8 @@ public CommandSegments(List<CommandSegment> segments) {
 
         LettuceAssert.isTrue(!segments.isEmpty(), "Command segments must not be empty");
 
-        this.segments = segments.size() > 1 ? Collections.unmodifiableList(segments.subList(1, segments.size()))
-                : Collections.emptyList();
+        this.segments = segments.size() > 1 ? Collections.unmodifiableList(segments.subList(1, segments.size())) : Collections
+                .emptyList();
         this.commandType = new StringCommandType(segments.get(0).asString());
     }
 
@@ -60,12 +60,12 @@ public int size() {
         return segments.size();
     }
 
-    private static class StringCommandType implements ProtocolKeyword {
+    static class StringCommandType implements ProtocolKeyword {
 
         private final byte[] commandTypeBytes;
         private final String commandType;
 
-        public StringCommandType(String commandType) {
+        StringCommandType(String commandType) {
             this.commandType = commandType;
             this.commandTypeBytes = commandType.getBytes();
         }
@@ -79,6 +79,11 @@ public byte[] getBytes() {
         public String name() {
             return commandType;
         }
+
+        @Override
+        public String toString() {
+            return name();
+        }
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/output/KeyListOutput.java b/src/main/java/io/lettuce/core/output/KeyListOutput.java
index 8a0a3b1382..f10ca8d4f3 100644
--- a/src/main/java/io/lettuce/core/output/KeyListOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyListOutput.java
@@ -42,7 +42,7 @@ public KeyListOutput(RedisCodec<K, V> codec) {
 
     @Override
     public void set(ByteBuffer bytes) {
-        subscriber.onNext(output, codec.decodeKey(bytes));
+        subscriber.onNext(output, bytes == null ? null : codec.decodeKey(bytes));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/output/MapOutput.java b/src/main/java/io/lettuce/core/output/MapOutput.java
index d59b52aa9d..a171b3cead 100644
--- a/src/main/java/io/lettuce/core/output/MapOutput.java
+++ b/src/main/java/io/lettuce/core/output/MapOutput.java
@@ -42,7 +42,7 @@ public MapOutput(RedisCodec<K, V> codec) {
     public void set(ByteBuffer bytes) {
 
         if (key == null) {
-            key = codec.decodeKey(bytes);
+            key = (bytes == null) ? null : codec.decodeKey(bytes);
             return;
         }
 

From 9118137d067b23edc0f1036f7e94e14906f7553c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 12 Oct 2017 09:43:29 +0200
Subject: [PATCH 323/808] Bind byte arrays as keys using command interfaces and
 a binary codec #628

---
 .../io/lettuce/core/dynamic/ParameterBinder.java |  6 +++++-
 .../dynamic/RedisCommandsClusterSyncTest.java    | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java b/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
index d34a3542ca..e3c867155f 100644
--- a/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
+++ b/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
@@ -99,7 +99,11 @@ private <K, V> void bind(CommandArgs<K, V> args, RedisCodec<K, V> codec, Object
         }
 
         if (argument instanceof byte[]) {
-            args.add((byte[]) argument);
+            if (index != -1 && accessor.isKey(index)) {
+                args.addKey((K) argument);
+            } else {
+                args.add((byte[]) argument);
+            }
             return;
         }
 
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
index 9932dcc8e3..61ed3787e2 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
@@ -84,6 +84,18 @@ public void sync() {
         assertThat(api.getAsBytes("key")).isEqualTo("value".getBytes());
     }
 
+    @Test
+    public void shouldRouteBinaryKey() {
+
+        connection.sync().set(key, value);
+
+        RedisCommandFactory factory = new RedisCommandFactory(connection);
+
+        SynchronousCommands api = factory.getCommands(SynchronousCommands.class);
+
+        assertThat(api.get(key.getBytes())).isEqualTo(value.getBytes());
+    }
+
     @Test
     public void mgetAsValues() {
 
@@ -98,7 +110,9 @@ public void mgetAsValues() {
         assertThat(values.get(0)).isEqualTo(Value.just(value));
     }
 
-    static interface SynchronousCommands extends Commands {
+    interface SynchronousCommands extends Commands {
+
+        byte[] get(byte[] key);
 
         String get(String key);
 

From 88320c8bbdbb9917fbc6174f39c1e828e894e1d9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 12 Oct 2017 14:32:24 +0200
Subject: [PATCH 324/808] Report protected mode connection failures properly
 #608

Lettuce now reports DENIED connection errors properly for connections without a previous handshake (PING before connection activation). When Redis is in protected mode, it sends the DENIED error upon connect and immediately disconnects the connection.
---
 .../core/RedisConnectionException.java        |   9 ++
 .../lettuce/core/protocol/CommandHandler.java |  92 +++++++++++-
 .../core/protocol/DefaultEndpoint.java        |  19 ++-
 .../protocol/PristineFallbackCommand.java     | 106 +++++++++++++
 .../io/lettuce/core/ProtectedModeTests.java   | 141 ++++++++++++++++++
 .../io/lettuce/core/server/MockTcpServer.java |  91 +++++++++++
 .../core/server/RandomResponseServer.java     |  60 +-------
 .../core/server/RandomServerHandler.java      |   5 +-
 8 files changed, 453 insertions(+), 70 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/protocol/PristineFallbackCommand.java
 create mode 100644 src/test/java/io/lettuce/core/ProtectedModeTests.java
 create mode 100644 src/test/java/io/lettuce/core/server/MockTcpServer.java

diff --git a/src/main/java/io/lettuce/core/RedisConnectionException.java b/src/main/java/io/lettuce/core/RedisConnectionException.java
index 043b1fc245..7984c52753 100644
--- a/src/main/java/io/lettuce/core/RedisConnectionException.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionException.java
@@ -55,4 +55,13 @@ public RedisConnectionException(String msg, Throwable cause) {
     public static RedisConnectionException create(SocketAddress remoteAddress, Throwable cause) {
         return new RedisConnectionException(String.format("Unable to connect to %s", remoteAddress), cause);
     }
+
+    /**
+     * @param error the error message.
+     * @return {@literal true} if the {@code error} message indicates Redis protected mode.
+     * @since 5.0.1
+     */
+    public static boolean isProtectedMode(String error) {
+        return error != null && error.startsWith("DENIED");
+    }
 }
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index ca403c5e0b..bb2b457e2a 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -26,6 +26,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import io.lettuce.core.ClientOptions;
+import io.lettuce.core.RedisConnectionException;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceSets;
@@ -79,6 +80,8 @@ public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCom
     private ByteBuf buffer;
     private LifecycleState lifecycleState = LifecycleState.NOT_CONNECTED;
     private String logPrefix;
+    private PristineFallbackCommand fallbackCommand;
+    private boolean pristine;
 
     /**
      * Initialize a new instance that handles commands from the supplied queue.
@@ -241,6 +244,8 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
 
         logPrefix = null;
+        pristine = true;
+        fallbackCommand = null;
 
         if (debugEnabled) {
             logger.debug("{} channelActive()", logPrefix());
@@ -297,6 +302,11 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
 
         setState(LifecycleState.DEACTIVATED);
 
+        PristineFallbackCommand command = this.fallbackCommand;
+        if (isProtectedMode(command)) {
+            onProtectedMode(command.getOutput().getError());
+        }
+
         rsm.reset();
 
         if (debugEnabled) {
@@ -504,6 +514,19 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
 
     protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws InterruptedException {
 
+        if (pristine && stack.isEmpty() && buffer.isReadable()) {
+
+            if (debugEnabled) {
+                logger.debug("{} Received response without a command context (empty stack)", logPrefix());
+            }
+
+            if (consumeResponse(buffer)) {
+                pristine = false;
+            }
+
+            return;
+        }
+
         while (canDecode(buffer)) {
 
             RedisCommand<?, ?, ?> command = stack.peek();
@@ -511,6 +534,8 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
                 logger.debug("{} Stack contains: {} commands", logPrefix(), stack.size());
             }
 
+            pristine = false;
+
             try {
                 if (!decode(ctx, buffer, command)) {
                     return;
@@ -521,12 +546,17 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
                 throw e;
             }
 
-            stack.poll();
+            if (isProtectedMode(command)) {
+                onProtectedMode(command.getOutput().getError());
+            } else {
 
-            try {
-                command.complete();
-            } catch (Exception e) {
-                logger.warn("{} Unexpected exception during request: {}", logPrefix, e.toString(), e);
+                stack.poll();
+
+                try {
+                    command.complete();
+                } catch (Exception e) {
+                    logger.warn("{} Unexpected exception during request: {}", logPrefix, e.toString(), e);
+                }
             }
 
             if (buffer.refCnt() != 0) {
@@ -594,6 +624,58 @@ protected boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandO
         return rsm.decode(buffer, command, output);
     }
 
+    /**
+     * Consume a response without having a command on the stack.
+     *
+     * @param buffer
+     * @return {@literal true} if the buffer decode was successful. {@literal false} if the buffer was not decoded.
+     */
+    private boolean consumeResponse(ByteBuf buffer) {
+
+        PristineFallbackCommand command = this.fallbackCommand;
+
+        if (command == null || !command.isDone()) {
+
+            if (debugEnabled) {
+                logger.debug("{} Consuming response using FallbackCommand", logPrefix());
+            }
+
+            if (command == null) {
+                command = new PristineFallbackCommand();
+                this.fallbackCommand = command;
+            }
+
+            if (!decode(buffer, command.getOutput())) {
+                return false;
+            }
+
+            if (isProtectedMode(command)) {
+                onProtectedMode(command.getOutput().getError());
+            }
+        }
+
+        return true;
+    }
+
+    private boolean isProtectedMode(RedisCommand<?, ?, ?> command) {
+        return command != null && command.getOutput() != null && command.getOutput().hasError()
+                && RedisConnectionException.isProtectedMode(command.getOutput().getError());
+    }
+
+    private void onProtectedMode(String message) {
+
+        RedisConnectionException exception = new RedisConnectionException(message);
+
+        endpoint.notifyException(exception);
+
+        if (channel != null) {
+            channel.disconnect();
+        }
+
+        stack.forEach(cmd -> cmd.completeExceptionally(exception));
+        stack.clear();
+    }
+
     /**
      * Hook method called after command completion.
      *
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index beade54e19..09369257a1 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -25,10 +25,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 
-import io.lettuce.core.ClientOptions;
-import io.lettuce.core.ConnectionEvents;
-import io.lettuce.core.RedisChannelWriter;
-import io.lettuce.core.RedisException;
+import io.lettuce.core.*;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceFactories;
 import io.netty.channel.Channel;
@@ -397,6 +394,18 @@ public void notifyChannelInactive(Channel channel) {
     @Override
     public void notifyException(Throwable t) {
 
+        if (t instanceof RedisConnectionException && RedisConnectionException.isProtectedMode(t.getMessage())) {
+
+            connectionError = t;
+
+            if (connectionWatchdog != null) {
+                connectionWatchdog.setListenOnChannelInactive(false);
+                connectionWatchdog.setReconnectSuspended(false);
+            }
+
+            doExclusive(this::drainCommands).forEach(cmd -> cmd.completeExceptionally(t));
+        }
+
         if (!isConnected()) {
             connectionError = t;
         }
@@ -437,7 +446,7 @@ private void flushCommands(Queue<RedisCommand<?, ?, ?>> queue) {
             if (!commands.isEmpty()) {
 
                 QUEUE_SIZE.addAndGet(this, commands.size());
-                
+
                 if (reliability == Reliability.AT_MOST_ONCE) {
                     // cancel on exceptions and remove from queue, because there is no housekeeping
                     writeAndFlush(commands).addListener(new AtMostOnceWriteListener(commands));
diff --git a/src/main/java/io/lettuce/core/protocol/PristineFallbackCommand.java b/src/main/java/io/lettuce/core/protocol/PristineFallbackCommand.java
new file mode 100644
index 0000000000..bc14398484
--- /dev/null
+++ b/src/main/java/io/lettuce/core/protocol/PristineFallbackCommand.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.protocol;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.output.CommandOutput;
+import io.netty.buffer.ByteBuf;
+
+/**
+ * Generic fallback command to collect arbitrary Redis responses in a {@link List} represented as String. Used as buffer when
+ * received a Redis response without a command to correlate.
+ * 
+ * @author Mark Paluch
+ * @since 4.5
+ */
+class PristineFallbackCommand implements RedisCommand<String, String, List<String>> {
+
+    private final CommandOutput<String, String, List<String>> output;
+    private volatile boolean complete;
+
+    PristineFallbackCommand() {
+        this.output = new FallbackOutput();
+    }
+
+    @Override
+    public CommandOutput<String, String, List<String>> getOutput() {
+        return output;
+    }
+
+    @Override
+    public void complete() {
+        complete = true;
+    }
+
+    @Override
+    public void cancel() {
+        complete = true;
+    }
+
+    @Override
+    public CommandArgs<String, String> getArgs() {
+        return null;
+    }
+
+    @Override
+    public boolean completeExceptionally(Throwable throwable) {
+        return false;
+    }
+
+    @Override
+    public ProtocolKeyword getType() {
+        return null;
+    }
+
+    @Override
+    public void encode(ByteBuf buf) {
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return false;
+    }
+
+    @Override
+    public boolean isDone() {
+        return complete;
+    }
+
+    @Override
+    public void setOutput(CommandOutput<String, String, List<String>> output) {
+    }
+
+    static class FallbackOutput extends CommandOutput<String, String, List<String>> {
+
+        FallbackOutput() {
+            super(StringCodec.ASCII, new ArrayList<>());
+        }
+
+        @Override
+        public void set(ByteBuffer bytes) {
+            output.add(bytes != null ? codec.decodeKey(bytes) : null);
+        }
+
+        @Override
+        public void set(long integer) {
+            output.add("" + integer);
+        }
+    }
+}
diff --git a/src/test/java/io/lettuce/core/ProtectedModeTests.java b/src/test/java/io/lettuce/core/ProtectedModeTests.java
new file mode 100644
index 0000000000..416daf7108
--- /dev/null
+++ b/src/test/java/io/lettuce/core/ProtectedModeTests.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import io.lettuce.TestClientResources;
+import io.lettuce.Wait;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.server.MockTcpServer;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+
+/**
+ * @author Mark Paluch
+ */
+public class ProtectedModeTests {
+
+    private static MockTcpServer server;
+    private static RedisClient client;
+
+    @BeforeClass
+    public static void beforeClass() throws Exception {
+
+        server = new MockTcpServer();
+
+        server.addHandler(() -> {
+            return new ChannelInboundHandlerAdapter() {
+                @Override
+                public void channelActive(ChannelHandlerContext ctx) throws Exception {
+
+                    String message = getMessage();
+                    ByteBuf buffer = ctx.alloc().buffer(message.length() + 3);
+                    buffer.writeCharSequence("-", StandardCharsets.US_ASCII);
+                    buffer.writeCharSequence(message, StandardCharsets.US_ASCII);
+                    buffer.writeByte('\r').writeByte('\n');
+
+                    ctx.writeAndFlush(buffer).addListener(future -> {
+                        ctx.close();
+                    });
+                }
+            };
+        });
+
+        server.initialize(TestSettings.nonexistentPort());
+
+        client = RedisClient.create(TestClientResources.get(),
+                RedisURI.create(TestSettings.host(), TestSettings.nonexistentPort()));
+    }
+
+    @AfterClass
+    public static void afterClass() {
+
+        server.shutdown();
+        FastShutdown.shutdown(client);
+    }
+
+    @Before
+    public void before() {
+        client.setOptions(ClientOptions.create());
+    }
+
+    @Test
+    public void regularClientFailsOnFirstCommand() {
+
+        try (StatefulRedisConnection<String, String> connect = client.connect()) {
+
+            connect.sync().ping();
+        } catch (RedisException e) {
+            if (e.getCause() instanceof IOException) {
+                assertThat(e).hasCauseInstanceOf(IOException.class);
+            } else {
+                assertThat(e.getCause()).hasMessageContaining("DENIED");
+            }
+        }
+    }
+
+    @Test
+    public void regularClientFailsOnFirstCommandWithDelay() {
+
+        try (StatefulRedisConnection<String, String> connect = client.connect()) {
+
+            Wait.untilEquals(false, connect::isOpen).waitOrTimeout();
+
+            connect.sync().ping();
+        } catch (RedisException e) {
+            if (e.getCause() instanceof IOException) {
+                assertThat(e).hasCauseInstanceOf(IOException.class);
+            } else {
+                assertThat(e.getCause()).hasMessageContaining("DENIED");
+            }
+        }
+    }
+
+    @Test
+    public void pingBeforeConnectFailsOnPing() {
+
+        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+        assertThatThrownBy(() -> client.connect()).isInstanceOf(RedisConnectionException.class).hasCauseInstanceOf(
+                RedisConnectionException.class);
+    }
+
+    private static String getMessage() {
+
+        return "DENIED Redis is running in protected mode because protected mode is enabled, no bind address was specified, "
+                + "no authentication password is requested to clients. In this mode connections are only accepted from the "
+                + "loopback interface. If you want to connect from external computers to Redis you may adopt one of the "
+                + "following solutions: 1) Just disable protected mode sending the command 'CONFIG SET protected-mode no' "
+                + "from the loopback interface by connecting to Redis from the same host the server is running, however "
+                + "MAKE SURE Redis is not publicly accessible from internet if you do so. Use CONFIG REWRITE to make this "
+                + "change permanent. 2) Alternatively you can just disable the protected mode by editing the Redis "
+                + "configuration file, and setting the protected mode option to 'no', and then restarting the server. "
+                + "3) If you started the server manually just for testing, restart it with the '--protected-mode no' option. "
+                + "4) Setup a bind address or an authentication password. NOTE: You only need to do one of the above "
+                + "things in order for the server to start accepting connections from the outside.";
+
+    }
+}
diff --git a/src/test/java/io/lettuce/core/server/MockTcpServer.java b/src/test/java/io/lettuce/core/server/MockTcpServer.java
new file mode 100644
index 0000000000..bb697fab03
--- /dev/null
+++ b/src/test/java/io/lettuce/core/server/MockTcpServer.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.server;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.*;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+
+/**
+ * Tiny netty server to generate a response.
+ *
+ * @author Mark Paluch
+ */
+public class MockTcpServer {
+
+    private EventLoopGroup bossGroup;
+    private EventLoopGroup workerGroup;
+    private Channel channel;
+    private List<Supplier<? extends ChannelHandler>> handlers = new ArrayList<>();
+
+    public void addHandler(Supplier<? extends ChannelHandler> supplier) {
+        handlers.add(supplier);
+    }
+
+    public void initialize(int port) throws InterruptedException {
+
+        bossGroup = Resources.bossGroup;
+        workerGroup = Resources.workerGroup;
+
+        ServerBootstrap b = new ServerBootstrap();
+        b.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class).option(ChannelOption.SO_BACKLOG, 100)
+                .childHandler(new ChannelInitializer<SocketChannel>() {
+                    @Override
+                    public void initChannel(SocketChannel ch) throws Exception {
+                        ChannelPipeline p = ch.pipeline();
+                        // p.addLast(new LoggingHandler(LogLevel.INFO));
+
+                        for (Supplier<? extends ChannelHandler> handler : handlers) {
+                            p.addLast(handler.get());
+                        }
+                    }
+                });
+
+        // Start the server.
+        ChannelFuture f = b.bind(port).sync();
+
+        channel = f.channel();
+    }
+
+    public void shutdown() {
+        channel.close();
+    }
+
+    private static class Resources {
+
+        private static final EventLoopGroup bossGroup;
+        private static final EventLoopGroup workerGroup;
+
+        static {
+            bossGroup = new NioEventLoopGroup(1);
+            workerGroup = new NioEventLoopGroup();
+
+            Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+                bossGroup.shutdownGracefully(0, 0, TimeUnit.MILLISECONDS);
+                workerGroup.shutdownGracefully(0, 0, TimeUnit.MILLISECONDS);
+
+            }, "MockRedisServer-shutdown"));
+        }
+
+    }
+}
diff --git a/src/test/java/io/lettuce/core/server/RandomResponseServer.java b/src/test/java/io/lettuce/core/server/RandomResponseServer.java
index f38161e8fb..4c940f015a 100644
--- a/src/test/java/io/lettuce/core/server/RandomResponseServer.java
+++ b/src/test/java/io/lettuce/core/server/RandomResponseServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,66 +15,14 @@
  */
 package io.lettuce.core.server;
 
-import java.util.concurrent.TimeUnit;
-
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.*;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-
 /**
  * Tiny netty server to generate random base64 data on message reception.
  *
  * @author Mark Paluch
  */
-public class RandomResponseServer {
-
-    private EventLoopGroup bossGroup;
-    private EventLoopGroup workerGroup;
-    private Channel channel;
-
-    public void initialize(int port) throws InterruptedException {
-
-        bossGroup = Resources.bossGroup;
-        workerGroup = Resources.workerGroup;
-
-        ServerBootstrap b = new ServerBootstrap();
-        b.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class).option(ChannelOption.SO_BACKLOG, 100)
-                .childHandler(new ChannelInitializer<SocketChannel>() {
-                    @Override
-                    public void initChannel(SocketChannel ch) throws Exception {
-                        ChannelPipeline p = ch.pipeline();
-                        // p.addLast(new LoggingHandler(LogLevel.INFO));
-                        p.addLast(new RandomServerHandler());
-                    }
-                });
-
-        // Start the server.
-        ChannelFuture f = b.bind(port).sync();
-
-        channel = f.channel();
-    }
-
-    public void shutdown() {
-        channel.close();
-    }
-
-    private static class Resources {
-
-        private static final EventLoopGroup bossGroup;
-        private static final EventLoopGroup workerGroup;
-
-        static {
-            bossGroup = new NioEventLoopGroup(1);
-            workerGroup = new NioEventLoopGroup();
-
-            Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-                bossGroup.shutdownGracefully(0, 0, TimeUnit.MILLISECONDS);
-                workerGroup.shutdownGracefully(0, 0, TimeUnit.MILLISECONDS);
-
-            }, "RandomResponseServer-shutdown"));
-        }
+public class RandomResponseServer extends MockTcpServer {
 
+    public RandomResponseServer() {
+        addHandler(RandomServerHandler::new);
     }
 }
diff --git a/src/test/java/io/lettuce/core/server/RandomServerHandler.java b/src/test/java/io/lettuce/core/server/RandomServerHandler.java
index d238b4565a..7489346457 100644
--- a/src/test/java/io/lettuce/core/server/RandomServerHandler.java
+++ b/src/test/java/io/lettuce/core/server/RandomServerHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,15 +19,12 @@
 import java.util.Arrays;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.handler.codec.base64.Base64;
 
 /**
  * Handler to generate random base64 data.
  */
-@ChannelHandler.Sharable
 public class RandomServerHandler extends ChannelInboundHandlerAdapter {
 
     private SecureRandom random = new SecureRandom();

From a04ec7713ec8144b4149d95a1c6568683c062d91 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 12 Oct 2017 16:30:28 +0200
Subject: [PATCH 325/808] Fix flaky tests

---
 src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java  | 2 +-
 src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java | 3 +--
 src/test/java/io/lettuce/core/server/MockTcpServer.java      | 5 +++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
index 177d734530..6a320c5c0c 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
@@ -233,7 +233,7 @@ public void pubsubNumsub() throws Exception {
 
         Map<String, Long> result = redis.pubsubNumsub(channel);
         assertThat(result.size()).isGreaterThan(0);
-        assertThat(result.get(channel)).isGreaterThan(0); // Redis sometimes keeps old references
+        assertThat(result).containsKeys(channel);
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
index 0bcea9dece..058807f850 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
@@ -32,7 +32,6 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
-
 import io.lettuce.Delay;
 import io.lettuce.TestClientResources;
 import io.lettuce.Wait;
@@ -250,7 +249,7 @@ public void pubsubNumsub() throws Exception {
 
         Map<String, Long> result = block(pubsub2.pubsubNumsub(channel));
         assertThat(result).hasSize(1);
-        assertThat(result.get(channel)).isGreaterThan(0);
+        assertThat(result).containsKeys(channel);
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/server/MockTcpServer.java b/src/test/java/io/lettuce/core/server/MockTcpServer.java
index bb697fab03..01c278d7f6 100644
--- a/src/test/java/io/lettuce/core/server/MockTcpServer.java
+++ b/src/test/java/io/lettuce/core/server/MockTcpServer.java
@@ -25,6 +25,7 @@
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.util.concurrent.DefaultThreadFactory;
 
 /**
  * Tiny netty server to generate a response.
@@ -77,8 +78,8 @@ private static class Resources {
         private static final EventLoopGroup workerGroup;
 
         static {
-            bossGroup = new NioEventLoopGroup(1);
-            workerGroup = new NioEventLoopGroup();
+            bossGroup = new NioEventLoopGroup(1, new DefaultThreadFactory(NioEventLoopGroup.class, true));
+            workerGroup = new NioEventLoopGroup(5, new DefaultThreadFactory(NioEventLoopGroup.class, true));
 
             Runtime.getRuntime().addShutdownHook(new Thread(() -> {
                 bossGroup.shutdownGracefully(0, 0, TimeUnit.MILLISECONDS);

From 982c4d37d06500b58d123f920dbe436742b18767 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 11 Oct 2017 20:53:23 +0200
Subject: [PATCH 326/808] Polishing

Replace fqcn with imported class name.
---
 .../io/lettuce/core/dynamic/CommandSegmentCommandFactory.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java
index 382640ce89..49831a5807 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java
@@ -91,7 +91,7 @@ public RedisCommand<Object, Object, Object> createCommand(Object[] parameters) {
         CommandArgs<Object, Object> args = new CommandArgs<>(redisCodec);
 
         CommandOutput<Object, Object, ?> output = outputFactory.create(redisCodec);
-        Command<Object, Object, ?> command = new io.lettuce.core.protocol.Command<>(this.segments.getCommandType(),
+        Command<Object, Object, ?> command = new Command<>(this.segments.getCommandType(),
                 output, args);
 
         parameterBinder.bind(args, redisCodec, segments, parametersAccessor);

From 52b21e3f9a56697d4dd7fc92e5bf9e2a7d8e6ce7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 12 Oct 2017 17:32:19 +0200
Subject: [PATCH 327/808] Streamline tests

---
 .../java/io/lettuce/core/support/CdiTest.java | 25 +++++++------------
 .../RedisClusterClientFactoryBeanTest.java    | 10 ++++++++
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/test/java/io/lettuce/core/support/CdiTest.java b/src/test/java/io/lettuce/core/support/CdiTest.java
index 149781893c..5f7501d7ed 100644
--- a/src/test/java/io/lettuce/core/support/CdiTest.java
+++ b/src/test/java/io/lettuce/core/support/CdiTest.java
@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
 
 import org.apache.webbeans.cditest.CdiTestContainer;
@@ -27,8 +26,8 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import io.lettuce.TestClientResources;
 import io.lettuce.core.AbstractRedisClientTest;
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisConnectionStateListener;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.resource.ClientResources;
@@ -50,6 +49,13 @@ public static void setUp() throws Exception {
         container.startApplicationScope();
     }
 
+    @AfterClass
+    public static void afterClass() throws Exception {
+
+        container.stopApplicationScope();
+        container.shutdownContainer();
+    }
+
     @Produces
     public RedisURI redisURI() {
         return RedisURI.Builder.redis(AbstractRedisClientTest.host, AbstractRedisClientTest.port).build();
@@ -57,7 +63,7 @@ public RedisURI redisURI() {
 
     @Produces
     public ClientResources clientResources() {
-        return DefaultClientResources.create();
+        return TestClientResources.get();
     }
 
     @Produces
@@ -66,10 +72,6 @@ public ClientResources personClientResources() {
         return DefaultClientResources.create();
     }
 
-    public void shutdownClientResources(@Disposes ClientResources clientResources) throws Exception {
-        FastShutdown.shutdown(clientResources);
-    }
-
     @PersonDB
     @Produces
     public RedisURI redisURIQualified() {
@@ -97,13 +99,4 @@ public void testInjection() {
 
         injectedClient.pingRedis();
     }
-
-    @AfterClass
-    public static void afterClass() throws Exception {
-
-        container.stopApplicationScope();
-        container.shutdownContainer();
-
-    }
-
 }
diff --git a/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java b/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java
index 1e85559174..35e0f4a62f 100644
--- a/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java
+++ b/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java
@@ -53,6 +53,8 @@ public void validUri() throws Exception {
         sut.afterPropertiesSet();
         assertThat(getRedisURI().getHost()).isEqualTo("host");
         assertThat(getRedisURI().getPassword()).isEqualTo("password".toCharArray());
+
+        sut.destroy();
     }
 
     @Test
@@ -64,6 +66,8 @@ public void validUriPasswordOverride() throws Exception {
         sut.afterPropertiesSet();
         assertThat(getRedisURI().getHost()).isEqualTo("host");
         assertThat(getRedisURI().getPassword()).isEqualTo("thepassword".toCharArray());
+
+        sut.destroy();
     }
 
     @Test
@@ -84,6 +88,8 @@ public void multiNodeUri() throws Exception {
 
         assertThat(host2.getHost()).isEqualTo("host2");
         assertThat(host2.getPassword()).isEqualTo("password".toCharArray());
+
+        sut.destroy();
     }
 
     @Test
@@ -106,6 +112,8 @@ public void multiNodeUriPasswordOverride() throws Exception {
 
         assertThat(host2.getHost()).isEqualTo("host2");
         assertThat(host2.getPassword()).isEqualTo("thepassword".toCharArray());
+
+        sut.destroy();
     }
 
     @Test
@@ -118,6 +126,8 @@ public void supportsSsl() throws Exception {
         assertThat(getRedisURI().getPassword()).isEqualTo("password".toCharArray());
         assertThat(getRedisURI().isVerifyPeer()).isFalse();
         assertThat(getRedisURI().isSsl()).isTrue();
+
+        sut.destroy();
     }
 
     private RedisURI getRedisURI() {

From eab7f7c5a92833feab3006c84edeb184f66d8669 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 12 Oct 2017 23:40:25 +0200
Subject: [PATCH 328/808] Guard initialization against premature disconnect
 #608

Properly propagate connect/disconnect events to prevent a race in which the disconnect is faster than setting up future chaining for event propagation.
---
 src/main/java/io/lettuce/core/AbstractRedisClient.java     | 2 +-
 src/main/java/io/lettuce/core/PlainChannelInitializer.java | 7 ++++++-
 src/main/java/io/lettuce/core/SslConnectionBuilder.java    | 6 ++++++
 .../java/io/lettuce/core/protocol/DefaultEndpoint.java     | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 99cd97a4c8..30c03de05c 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -263,6 +263,7 @@ protected <K, V, T extends RedisChannelHandler<K, V>> ConnectionFuture<T> initia
         redisBootstrap.handler(initializer);
 
         clientResources.nettyCustomizer().afterBootstrapInitialized(redisBootstrap);
+        CompletableFuture<Boolean> initFuture = initializer.channelInitialized();
         ChannelFuture connectFuture = redisBootstrap.connect(redisAddress);
 
         connectFuture.addListener(future -> {
@@ -275,7 +276,6 @@ protected <K, V, T extends RedisChannelHandler<K, V>> ConnectionFuture<T> initia
                 return;
             }
 
-            CompletableFuture<Boolean> initFuture = initializer.channelInitialized();
             initFuture.whenComplete((success, throwable) -> {
 
                 if (throwable == null) {
diff --git a/src/main/java/io/lettuce/core/PlainChannelInitializer.java b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
index ac0ba775f2..108d691574 100644
--- a/src/main/java/io/lettuce/core/PlainChannelInitializer.java
+++ b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
@@ -75,6 +75,11 @@ public CompletableFuture<Boolean> channelInitialized() {
                 public void channelInactive(ChannelHandlerContext ctx) throws Exception {
 
                     clientResources.eventBus().publish(new DisconnectedEvent(local(ctx), remote(ctx)));
+
+                    if (!initializedFuture.isDone()) {
+                        initializedFuture.completeExceptionally(new RedisConnectionException("Connection closed prematurely"));
+                    }
+
                     initializedFuture = new CompletableFuture<>();
                     pingCommand = null;
                     super.channelInactive(ctx);
@@ -132,7 +137,7 @@ static void pingBeforeActivate(AsyncCommand<?, ?, ?> cmd, CompletableFuture<Bool
             if (cmd.isDone() || initializedFuture.isDone()) {
                 return;
             }
-            
+
             initializedFuture.completeExceptionally(ExceptionFactory.createTimeoutException(
                     "Cannot initialize channel (PING before activate)", timeout));
         };
diff --git a/src/main/java/io/lettuce/core/SslConnectionBuilder.java b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
index 2f1c579c0b..c3f1ea8a93 100644
--- a/src/main/java/io/lettuce/core/SslConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
@@ -171,6 +171,12 @@ public CompletableFuture<Boolean> channelInitialized() {
 
                     @Override
                     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+
+                        if (!initializedFuture.isDone()) {
+                            initializedFuture.completeExceptionally(new RedisConnectionException(
+                                    "Connection closed prematurely"));
+                        }
+
                         initializedFuture = new CompletableFuture<>();
                         pingCommand = null;
                         super.channelInactive(ctx);
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index 09369257a1..e5d0cfeb06 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -68,7 +68,7 @@ public class DefaultEndpoint implements RedisChannelWriter, Endpoint {
     private ConnectionWatchdog connectionWatchdog;
     private ConnectionFacade connectionFacade;
 
-    private Throwable connectionError;
+    private volatile Throwable connectionError;
 
     // access via QUEUE_SIZE
     @SuppressWarnings("unused")

From e243847c7e7bff14cbde236d00ae10d9e8ce45e4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 13 Oct 2017 20:49:54 +0200
Subject: [PATCH 329/808] Reduce test logging level

---
 src/test/java/io/lettuce/LoggingTestRule.java | 20 +++++++++++--------
 src/test/resources/log4j2-test.xml            |  1 +
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/test/java/io/lettuce/LoggingTestRule.java b/src/test/java/io/lettuce/LoggingTestRule.java
index 389ffedb9f..5b0ad04308 100644
--- a/src/test/java/io/lettuce/LoggingTestRule.java
+++ b/src/test/java/io/lettuce/LoggingTestRule.java
@@ -45,10 +45,12 @@ public Statement apply(Statement base, FrameworkMethod method, Object target) {
             @Override
             public void evaluate() throws Throwable {
                 Logger logger = LogManager.getLogger(method.getMethod().getDeclaringClass());
-                logger.info("---------------------------------------");
-                logger.info("-- Invoke method " + method.getMethod().getDeclaringClass().getSimpleName() + "."
-                        + method.getName());
-                logger.info("---------------------------------------");
+                if (logger.isInfoEnabled()) {
+                    logger.info("---------------------------------------");
+                    logger.info("-- Invoke method " + method.getMethod().getDeclaringClass().getSimpleName() + "."
+                            + method.getName());
+                    logger.info("---------------------------------------");
+                }
 
                 try {
                     base.evaluate();
@@ -59,10 +61,12 @@ public void evaluate() throws Throwable {
 
                     throw t;
                 } finally {
-                    logger.info("---------------------------------------");
-                    logger.info("-- Finished method " + method.getMethod().getDeclaringClass().getSimpleName() + "."
-                            + method.getName());
-                    logger.info("---------------------------------------");
+                    if (logger.isInfoEnabled()) {
+                        logger.info("---------------------------------------");
+                        logger.info("-- Finished method " + method.getMethod().getDeclaringClass().getSimpleName() + "."
+                                + method.getName());
+                        logger.info("---------------------------------------");
+                    }
                 }
             }
         };
diff --git a/src/test/resources/log4j2-test.xml b/src/test/resources/log4j2-test.xml
index 1b10de22c6..5fd40668a3 100644
--- a/src/test/resources/log4j2-test.xml
+++ b/src/test/resources/log4j2-test.xml
@@ -8,6 +8,7 @@
 
         <File name="File" fileName="target/lettuce.log" bufferedIO="true">
             <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} [%-5p] [%t] %m (%c{1}:%L)%n"/>
+            <ThresholdFilter level="FATAL"/>
         </File>
     </Appenders>
 

From a7ec7db16129b551ac908063a70cbd000b597250 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 17 Oct 2017 09:50:08 +0200
Subject: [PATCH 330/808] Report done status for Command.isDone() if command
 was canceled #629

---
 .../io/lettuce/core/protocol/Command.java     |  3 +-
 .../lettuce/core/protocol/CommandHandler.java |  2 +-
 .../core/protocol/CommandInternalsTest.java   | 33 ++++++++++++-------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/Command.java b/src/main/java/io/lettuce/core/protocol/Command.java
index ca64d986c5..56f8a3dfcf 100644
--- a/src/main/java/io/lettuce/core/protocol/Command.java
+++ b/src/main/java/io/lettuce/core/protocol/Command.java
@@ -17,7 +17,6 @@
 
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.output.CommandOutput;
-
 import io.netty.buffer.ByteBuf;
 
 /**
@@ -170,6 +169,6 @@ public boolean isCancelled() {
 
     @Override
     public boolean isDone() {
-        return status == ST_COMPLETED;
+        return status != ST_INITIAL;
     }
 }
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index bb2b457e2a..44e92b6442 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -446,7 +446,7 @@ private boolean usesBoundedQueues() {
     }
 
     private static boolean isWriteable(RedisCommand<?, ?, ?> command) {
-        return !command.isCancelled() && !command.isDone();
+        return !command.isDone();
     }
 
     private RedisCommand<?, ?, ?> potentiallyWrapLatencyCommand(RedisCommand<?, ?, ?> command) {
diff --git a/src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java b/src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java
index b163f0e160..9a3ffb2d1e 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java
@@ -25,7 +25,6 @@
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.CommandOutput;
-import io.lettuce.core.output.NestedMultiOutput;
 import io.lettuce.core.output.StatusOutput;
 
 /**
@@ -33,57 +32,67 @@
  * @author Mark Paluch
  */
 public class CommandInternalsTest {
+
     protected RedisCodec<String, String> codec = new Utf8StringCodec();
     protected Command<String, String, String> sut;
 
     @Before
-    public final void createCommand() throws Exception {
+    public void createCommand() {
+
         CommandOutput<String, String, String> output = new StatusOutput<String, String>(codec);
         sut = new Command<>(CommandType.INFO, output, null);
     }
 
     @Test
-    public void isCancelled() throws Exception {
+    public void isCancelled() {
         assertThat(sut.isCancelled()).isFalse();
+        assertThat(sut.isDone()).isFalse();
+
         sut.cancel();
 
         assertThat(sut.isCancelled()).isTrue();
+        assertThat(sut.isDone()).isTrue();
+
         sut.cancel();
     }
 
     @Test
-    public void isDone() throws Exception {
+    public void isDone() {
+        assertThat(sut.isCancelled()).isFalse();
         assertThat(sut.isDone()).isFalse();
+
         sut.complete();
+
+        assertThat(sut.isCancelled()).isFalse();
         assertThat(sut.isDone()).isTrue();
     }
 
     @Test
-    public void get() throws Exception {
+    public void get() {
         assertThat(sut.get()).isNull();
         sut.getOutput().set(buffer("one"));
         assertThat(sut.get()).isEqualTo("one");
     }
 
     @Test
-    public void getError() throws Exception {
+    public void getError() {
         sut.getOutput().setError("error");
         assertThat(sut.getError()).isEqualTo("error");
     }
 
     @Test(expected = IllegalStateException.class)
-    public void setOutputAfterCompleted() throws Exception {
+    public void setOutputAfterCompleted() {
         sut.complete();
         sut.setOutput(new StatusOutput<>(codec));
     }
 
     @Test
-    public void testToString() throws Exception {
+    public void testToString() {
         assertThat(sut.toString()).contains("Command");
     }
 
     @Test
-    public void customKeyword() throws Exception {
+    public void customKeyword() {
 
         sut = new Command<String, String, String>(MyKeywords.DUMMY, null, null);
         sut.setOutput(new StatusOutput<String, String>(codec));
@@ -92,14 +101,14 @@ public void customKeyword() throws Exception {
     }
 
     @Test
-    public void customKeywordWithArgs() throws Exception {
+    public void customKeywordWithArgs() {
         sut = new Command<String, String, String>(MyKeywords.DUMMY, null, new CommandArgs<String, String>(codec));
         sut.getArgs().add(MyKeywords.DUMMY);
         assertThat(sut.getArgs().toString()).contains(MyKeywords.DUMMY.name());
     }
 
     @Test
-    public void getWithTimeout() throws Exception {
+    public void getWithTimeout() {
         sut.getOutput().set(buffer("one"));
         sut.complete();
 
@@ -129,7 +138,7 @@ public String get() throws RedisException {
     }
 
     @Test
-    public void sillyTestsForEmmaCoverage() throws Exception {
+    public void sillyTestsForEmmaCoverage() {
         assertThat(CommandType.valueOf("APPEND")).isEqualTo(CommandType.APPEND);
         assertThat(CommandKeyword.valueOf("AFTER")).isEqualTo(CommandKeyword.AFTER);
     }

From 0e698e97fc3920327de8dc7f4c5b6eea133c8504 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 17 Oct 2017 09:50:49 +0200
Subject: [PATCH 331/808] Polishing #629

---
 .../java/io/lettuce/core/AbstractRedisClient.java     |  2 +-
 .../io/lettuce/core/FutureSyncInvocationHandler.java  |  2 +-
 src/main/java/io/lettuce/core/RedisException.java     | 11 +++++------
 .../io/lettuce/core/cluster/ClusterNodeEndpoint.java  |  4 ++--
 .../java/io/lettuce/core/masterslave/MasterSlave.java |  6 ++++++
 .../io/lettuce/core/protocol/CompleteableCommand.java | 10 ++++++++++
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 30c03de05c..96dc306aa0 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -125,7 +125,7 @@ public void setDefaultTimeout(Duration timeout) {
      *
      * @param timeout Default connection timeout.
      * @param unit Unit of time for the timeout.
-     * @deprecated since 5.0, use {@link #setDefaultTimeout(long, TimeUnit)}.
+     * @deprecated since 5.0, use {@link #setDefaultTimeout(Duration)}.
      */
     @Deprecated
     public void setDefaultTimeout(long timeout, TimeUnit unit) {
diff --git a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
index a9abf8a7bf..fc659ae353 100644
--- a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
@@ -36,7 +36,7 @@ class FutureSyncInvocationHandler extends AbstractInvocationHandler {
     private final Object asyncApi;
     private final MethodTranslator translator;
 
-    public FutureSyncInvocationHandler(StatefulConnection<?, ?> connection, Object asyncApi, Class<?>[] interfaces) {
+    FutureSyncInvocationHandler(StatefulConnection<?, ?> connection, Object asyncApi, Class<?>[] interfaces) {
         this.connection = connection;
         this.asyncApi = asyncApi;
         this.translator = MethodTranslator.of(asyncApi.getClass(), interfaces);
diff --git a/src/main/java/io/lettuce/core/RedisException.java b/src/main/java/io/lettuce/core/RedisException.java
index a85dca86d1..4890b079be 100644
--- a/src/main/java/io/lettuce/core/RedisException.java
+++ b/src/main/java/io/lettuce/core/RedisException.java
@@ -26,7 +26,7 @@ public class RedisException extends RuntimeException {
 
     /**
      * Create a {@code RedisException} with the specified detail message.
-     * 
+     *
      * @param msg the detail message.
      */
     public RedisException(String msg) {
@@ -35,18 +35,17 @@ public RedisException(String msg) {
 
     /**
      * Create a {@code RedisException} with the specified detail message and nested exception.
-     * 
+     *
      * @param msg the detail message.
      * @param cause the nested exception.
      */
-    public RedisException(String msg, Throwable e) {
-        super(msg, e);
+    public RedisException(String msg, Throwable cause) {
+        super(msg, cause);
     }
 
     /**
      * Create a {@code RedisException} with the specified nested exception.
-     * 
-     * @param msg the detail message.
+     *
      * @param cause the nested exception.
      */
     public RedisException(Throwable cause) {
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java b/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
index e6bd38eedf..551de33695 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
@@ -42,8 +42,8 @@ class ClusterNodeEndpoint extends DefaultEndpoint {
     /**
      * Initialize a new instance that handles commands from the supplied queue.
      *
-     * @param clientOptions client options for this connection
-     * @param clientResources client resources for this connection
+     * @param clientOptions client options for this connection.
+     * @param clientResources client resources for this connection.
      * @param clusterChannelWriter top-most channel writer.
      */
     public ClusterNodeEndpoint(ClientOptions clientOptions, ClientResources clientResources,
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index 4595699bc1..c579c6bdba 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -165,6 +165,8 @@ private static <K, V> StatefulRedisMasterSlaveConnection<K, V> connectSentinel(R
         StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(channelWriter,
                 codec, redisURI.getTimeout());
 
+        connection.setOptions(redisClient.getOptions());
+
         Runnable runnable = () -> {
             try {
 
@@ -224,6 +226,8 @@ private static <K, V> StatefulRedisMasterSlaveConnection<K, V> connectMasterSlav
             StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(
                     channelWriter, codec, redisURI.getTimeout());
 
+            connection.setOptions(redisClient.getOptions());
+
             return connection;
 
         } catch (RuntimeException e) {
@@ -260,6 +264,8 @@ private static <K, V> StatefulRedisMasterSlaveConnection<K, V> connectStaticMast
             StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(
                     channelWriter, codec, seedNode.getTimeout());
 
+            connection.setOptions(redisClient.getOptions());
+
             return connection;
 
         } catch (RuntimeException e) {
diff --git a/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java b/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
index bbef912cc2..0da1d46666 100644
--- a/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
@@ -18,10 +18,20 @@
 import java.util.function.Consumer;
 
 /**
+ * Extension to commands that provide registration of command completion callbacks. Completion callbacks allow execution of
+ * tasks after successive, failed or any completion outcome. A callback must be non-blocking. Callback registration gives no
+ * guarantee over callback ordering.
+ *
  * @author Mark Paluch
  */
 public interface CompleteableCommand<T> {
 
+    /**
+     * Register a command callback for command completion that notifies the callback with the command result or the failure
+     * resulting from command completion.
+     *
+     * @param action must not be {@literal null}.
+     */
     void onComplete(Consumer<? super T> action);
 
 }

From bd69f8e0ebb79cc5c018df5b65af6802dd612ab0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 9 Oct 2017 21:06:18 +0200
Subject: [PATCH 332/808] Add support to timeout commands #435
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lettuce now supports configuration of timeouts used to timeout commands. Timeouts now apply to all command dispatch methods so asynchronously/reactive command dispatch will propagate timeouts to prevent commands from never being completed.

TimeoutOptions allow using the default connection timeout, a fixed timeout or providing an own TimeoutSource.

RedisClient client = …;
client.setOptions(ClientOptions.builder().timeoutOptions(TimeoutOptions.enabled()).build());
---
 .../java/io/lettuce/core/ClientOptions.java   |  29 ++
 .../io/lettuce/core/ConnectionBuilder.java    |   6 +-
 .../core/FutureSyncInvocationHandler.java     |  18 +-
 .../java/io/lettuce/core/LettuceFutures.java  |  10 +
 .../io/lettuce/core/RedisChannelHandler.java  |   5 +
 .../java/io/lettuce/core/RedisClient.java     |  30 ++-
 .../core/RedisCommandTimeoutException.java    |   9 +
 .../java/io/lettuce/core/TimeoutOptions.java  | 254 ++++++++++++++++++
 .../core/cluster/ClusterClientOptions.java    |   7 +
 .../ClusterFutureSyncInvocationHandler.java   |  18 +-
 .../ClusterPubSubConnectionProvider.java      |   6 +-
 .../NodeSelectionInvocationHandler.java       |  38 ++-
 .../core/cluster/RedisClusterClient.java      |  37 ++-
 .../core/internal/TimeoutProvider.java        |  94 +++++++
 .../lettuce/core/masterslave/MasterSlave.java |   2 +
 .../lettuce/core/protocol/AsyncCommand.java   |   6 +
 .../core/protocol/CommandExpiryWriter.java    | 171 ++++++++++++
 .../lettuce/core/protocol/CommandWrapper.java |  87 +++++-
 .../core/protocol/CompleteableCommand.java    |  11 +-
 .../core/protocol/DefaultEndpoint.java        |  31 ++-
 .../io/lettuce/core/protocol/Endpoint.java    |   7 +
 .../io/lettuce/core/ClientOptionsTest.java    |  66 ++++-
 .../io/lettuce/core/TimeoutOptionsTest.java   |  61 +++++
 .../core/cluster/NodeSelectionAsyncTest.java  |  14 +-
 src/test/jmh/io/lettuce/core/JmhMain.java     |  37 +--
 .../io/lettuce/core/RedisClientBenchmark.java |   4 +-
 26 files changed, 949 insertions(+), 109 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/TimeoutOptions.java
 create mode 100644 src/main/java/io/lettuce/core/internal/TimeoutProvider.java
 create mode 100644 src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
 create mode 100644 src/test/java/io/lettuce/core/TimeoutOptionsTest.java

diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index d5afabd7cb..2507f14ce7 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -35,6 +35,7 @@ public class ClientOptions implements Serializable {
     public static final DisconnectedBehavior DEFAULT_DISCONNECTED_BEHAVIOR = DisconnectedBehavior.DEFAULT;
     public static final SocketOptions DEFAULT_SOCKET_OPTIONS = SocketOptions.create();
     public static final SslOptions DEFAULT_SSL_OPTIONS = SslOptions.create();
+    public static final TimeoutOptions DEFAULT_TIMEOUT_OPTIONS = TimeoutOptions.create();
 
     private final boolean pingBeforeActivateConnection;
     private final boolean autoReconnect;
@@ -44,6 +45,7 @@ public class ClientOptions implements Serializable {
     private final DisconnectedBehavior disconnectedBehavior;
     private final SocketOptions socketOptions;
     private final SslOptions sslOptions;
+    private final TimeoutOptions timeoutOptions;
 
     protected ClientOptions(Builder builder) {
         pingBeforeActivateConnection = builder.pingBeforeActivateConnection;
@@ -54,6 +56,7 @@ protected ClientOptions(Builder builder) {
         disconnectedBehavior = builder.disconnectedBehavior;
         socketOptions = builder.socketOptions;
         sslOptions = builder.sslOptions;
+        timeoutOptions = builder.timeoutOptions;
     }
 
     protected ClientOptions(ClientOptions original) {
@@ -65,6 +68,7 @@ protected ClientOptions(ClientOptions original) {
         this.disconnectedBehavior = original.getDisconnectedBehavior();
         this.socketOptions = original.getSocketOptions();
         this.sslOptions = original.getSslOptions();
+        this.timeoutOptions = original.getTimeoutOptions();
     }
 
     /**
@@ -108,6 +112,7 @@ public static class Builder {
         private DisconnectedBehavior disconnectedBehavior = DEFAULT_DISCONNECTED_BEHAVIOR;
         private SocketOptions socketOptions = DEFAULT_SOCKET_OPTIONS;
         private SslOptions sslOptions = DEFAULT_SSL_OPTIONS;
+        private TimeoutOptions timeoutOptions = DEFAULT_TIMEOUT_OPTIONS;
 
         protected Builder() {
         }
@@ -216,6 +221,20 @@ public Builder sslOptions(SslOptions sslOptions) {
             return this;
         }
 
+        /**
+         * Sets the {@link TimeoutOptions} to expire and cancel commands. See {@link #DEFAULT_TIMEOUT_OPTIONS}.
+         *
+         * @param timeoutOptions must not be {@literal null}.
+         * @return {@code this}
+         * @since 5.1
+         */
+        public Builder timeoutOptions(TimeoutOptions timeoutOptions) {
+
+            LettuceAssert.notNull(timeoutOptions, "TimeoutOptions must not be null");
+            this.timeoutOptions = timeoutOptions;
+            return this;
+        }
+
         /**
          * Create a new instance of {@link ClientOptions}.
          *
@@ -309,6 +328,16 @@ public SslOptions getSslOptions() {
         return sslOptions;
     }
 
+    /**
+     * Returns the {@link TimeoutOptions}.
+     *
+     * @return the {@link TimeoutOptions}.
+     * @since 5.1
+     */
+    public TimeoutOptions getTimeoutOptions() {
+        return timeoutOptions;
+    }
+
     /**
      * Behavior of connections in disconnected state.
      */
diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index 9f3b8767a5..20248cbe48 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -45,7 +45,7 @@ public class ConnectionBuilder {
     private Supplier<SocketAddress> socketAddressSupplier;
     private ConnectionEvents connectionEvents;
     private RedisChannelHandler<?, ?> connection;
-    private DefaultEndpoint endpoint;
+    private Endpoint endpoint;
     private Supplier<CommandHandler> commandHandlerSupplier;
     private ChannelGroup channelGroup;
     private Timer timer;
@@ -183,7 +183,7 @@ public ConnectionBuilder bootstrap(Bootstrap bootstrap) {
         return this;
     }
 
-    public ConnectionBuilder endpoint(DefaultEndpoint endpoint) {
+    public ConnectionBuilder endpoint(Endpoint endpoint) {
         this.endpoint = endpoint;
         return this;
     }
@@ -218,7 +218,7 @@ public char[] password() {
         return password;
     }
 
-    public DefaultEndpoint endpoint() {
+    public Endpoint endpoint() {
         return endpoint;
     }
 
diff --git a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
index fc659ae353..dfdde39d9d 100644
--- a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
@@ -22,6 +22,8 @@
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.internal.AbstractInvocationHandler;
+import io.lettuce.core.internal.TimeoutProvider;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * Invocation-handler to synchronize API calls which use Futures as backend. This class leverages the need to implement a full
@@ -33,11 +35,14 @@
 class FutureSyncInvocationHandler extends AbstractInvocationHandler {
 
     private final StatefulConnection<?, ?> connection;
+    private final TimeoutProvider timeoutProvider;
     private final Object asyncApi;
     private final MethodTranslator translator;
 
     FutureSyncInvocationHandler(StatefulConnection<?, ?> connection, Object asyncApi, Class<?>[] interfaces) {
         this.connection = connection;
+        this.timeoutProvider = new TimeoutProvider(() -> connection.getOptions().getTimeoutOptions(), () -> connection
+                .getTimeout().toNanos());
         this.asyncApi = asyncApi;
         this.translator = MethodTranslator.of(asyncApi.getClass(), interfaces);
     }
@@ -59,7 +64,9 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
                     return null;
                 }
 
-                LettuceFutures.awaitOrCancel(command, connection.getTimeout().toNanos(), TimeUnit.NANOSECONDS);
+                long timeout = getTimeoutNs(command);
+
+                LettuceFutures.awaitOrCancel(command, timeout, TimeUnit.NANOSECONDS);
                 return command.get();
             }
 
@@ -69,6 +76,15 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
         }
     }
 
+    private long getTimeoutNs(RedisFuture<?> command) {
+
+        if (command instanceof RedisCommand) {
+            return timeoutProvider.getTimeoutNs((RedisCommand) command);
+        }
+
+        return connection.getTimeout().toNanos();
+    }
+
     private static boolean isTransactionActive(StatefulConnection<?, ?> connection) {
         return connection instanceof StatefulRedisConnection && ((StatefulRedisConnection) connection).isMulti();
     }
diff --git a/src/main/java/io/lettuce/core/LettuceFutures.java b/src/main/java/io/lettuce/core/LettuceFutures.java
index 95e08faddb..bb2cd8098b 100644
--- a/src/main/java/io/lettuce/core/LettuceFutures.java
+++ b/src/main/java/io/lettuce/core/LettuceFutures.java
@@ -20,6 +20,11 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.function.LongSupplier;
+
+import io.lettuce.core.TimeoutOptions.TimeoutSource;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * Utility to {@link #awaitAll(long, TimeUnit, Future[])} futures until they are done and to synchronize future execution using
@@ -122,6 +127,10 @@ public static <T> T awaitOrCancel(RedisFuture<T> cmd, long timeout, TimeUnit uni
                 throw ExceptionFactory.createExecutionException(e.getCause().getMessage(), e.getCause());
             }
 
+            if (e.getCause() instanceof RedisCommandTimeoutException) {
+                throw new RedisCommandTimeoutException(e.getCause());
+            }
+
             throw new RedisException(e.getCause());
         } catch (InterruptedException e) {
 
@@ -131,4 +140,5 @@ public static <T> T awaitOrCancel(RedisFuture<T> cmd, long timeout, TimeUnit uni
             throw ExceptionFactory.createExecutionException(null, e);
         }
     }
+
 }
diff --git a/src/main/java/io/lettuce/core/RedisChannelHandler.java b/src/main/java/io/lettuce/core/RedisChannelHandler.java
index ef07b26e89..7bd6c74fd5 100644
--- a/src/main/java/io/lettuce/core/RedisChannelHandler.java
+++ b/src/main/java/io/lettuce/core/RedisChannelHandler.java
@@ -25,6 +25,7 @@
 
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.CommandExpiryWriter;
 import io.lettuce.core.protocol.ConnectionFacade;
 import io.lettuce.core.protocol.RedisCommand;
 import io.netty.util.internal.logging.InternalLogger;
@@ -76,6 +77,10 @@ public void setTimeout(Duration timeout) {
         LettuceAssert.isTrue(!timeout.isNegative(), "Timeout duration must be greater or equal to zero");
 
         this.timeout = timeout;
+
+        if (channelWriter instanceof CommandExpiryWriter) {
+            ((CommandExpiryWriter) channelWriter).setTimeout(timeout);
+        }
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index e400470294..6df2e4e736 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -30,8 +30,10 @@
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.CommandExpiryWriter;
 import io.lettuce.core.protocol.CommandHandler;
 import io.lettuce.core.protocol.DefaultEndpoint;
+import io.lettuce.core.protocol.Endpoint;
 import io.lettuce.core.pubsub.PubSubCommandHandler;
 import io.lettuce.core.pubsub.PubSubEndpoint;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
@@ -271,8 +273,13 @@ private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandalone
         logger.debug("Trying to get a Redis connection for: " + redisURI);
 
         DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
+        RedisChannelWriter writer = endpoint;
 
-        StatefulRedisConnectionImpl<K, V> connection = newStatefulRedisConnection(endpoint, codec, timeout);
+        if (CommandExpiryWriter.isSupported(clientOptions)) {
+            writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
+        }
+
+        StatefulRedisConnectionImpl<K, V> connection = newStatefulRedisConnection(writer, codec, timeout);
         ConnectionFuture<StatefulRedisConnection<K, V>> future = connectStatefulAsync(connection, endpoint, redisURI,
                 () -> new CommandHandler(clientOptions, clientResources, endpoint));
 
@@ -287,8 +294,8 @@ private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandalone
     }
 
     @SuppressWarnings("unchecked")
-    private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnectionImpl<K, V> connection,
-            DefaultEndpoint endpoint, RedisURI redisURI, Supplier<CommandHandler> commandHandlerSupplier) {
+    private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnectionImpl<K, V> connection, Endpoint endpoint,
+            RedisURI redisURI, Supplier<CommandHandler> commandHandlerSupplier) {
 
         ConnectionBuilder connectionBuilder;
         if (redisURI.isSsl()) {
@@ -428,10 +435,14 @@ private <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubS
         assertNotNull(codec);
         checkValidRedisURI(redisURI);
 
-        PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<K, V>(clientOptions);
+        PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<>(clientOptions);
+        RedisChannelWriter writer = endpoint;
+
+        if (CommandExpiryWriter.isSupported(clientOptions)) {
+            writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
+        }
 
-        StatefulRedisPubSubConnectionImpl<K, V> connection = newStatefulRedisPubSubConnection(endpoint, endpoint, codec,
-                timeout);
+        StatefulRedisPubSubConnectionImpl<K, V> connection = newStatefulRedisPubSubConnection(endpoint, writer, codec, timeout);
 
         ConnectionFuture<StatefulRedisPubSubConnection<K, V>> future = connectStatefulAsync(connection, endpoint, redisURI,
                 () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec, endpoint));
@@ -506,8 +517,13 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
         connectionBuilder.clientResources(clientResources);
 
         DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
+        RedisChannelWriter writer = endpoint;
+
+        if (CommandExpiryWriter.isSupported(clientOptions)) {
+            writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
+        }
 
-        StatefulRedisSentinelConnectionImpl<K, V> connection = newStatefulRedisSentinelConnection(endpoint, codec, timeout);
+        StatefulRedisSentinelConnectionImpl<K, V> connection = newStatefulRedisSentinelConnection(writer, codec, timeout);
 
         logger.debug("Trying to get a Redis Sentinel connection for one of: " + redisURI.getSentinels());
 
diff --git a/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java b/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
index 864ca72b20..b5e579bd03 100644
--- a/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
@@ -38,4 +38,13 @@ public RedisCommandTimeoutException() {
     public RedisCommandTimeoutException(String msg) {
         super(msg);
     }
+
+    /**
+     * Create a {@code RedisException} with the specified nested exception.
+     *
+     * @param cause the nested exception.
+     */
+    public RedisCommandTimeoutException(Throwable cause) {
+        super(cause);
+    }
 }
diff --git a/src/main/java/io/lettuce/core/TimeoutOptions.java b/src/main/java/io/lettuce/core/TimeoutOptions.java
new file mode 100644
index 0000000000..f76a400769
--- /dev/null
+++ b/src/main/java/io/lettuce/core/TimeoutOptions.java
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import java.io.Serializable;
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
+
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.RedisCommand;
+
+/**
+ * Options for command timeouts. This options configure how and whether commands time out once they were dispatched. Command
+ * timeout begins:
+ * <ul>
+ * <li>When the command is sent successfully to the transport</li>
+ * <li>Queued while the connection was inactive</li>
+ * </ul>
+ *
+ * The timeout is canceled upon command completion/cancellation. Timeouts are not tied to a specific API and expire commands
+ * regardless of the synchronization method provided by the API that was used to enqueue the command.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+@SuppressWarnings("serial")
+public class TimeoutOptions implements Serializable {
+
+    public static final boolean DEFAULT_TIMEOUT_COMMANDS = false;
+
+    private final boolean timeoutCommands;
+    private final boolean applyConnectionTimeout;
+    private final TimeoutSource source;
+
+    private TimeoutOptions(boolean timeoutCommands, boolean applyConnectionTimeout, TimeoutSource source) {
+
+        this.timeoutCommands = timeoutCommands;
+        this.applyConnectionTimeout = applyConnectionTimeout;
+        this.source = source;
+    }
+
+    /**
+     * Returns a new {@link TimeoutOptions.Builder} to construct {@link TimeoutOptions}.
+     *
+     * @return a new {@link TimeoutOptions.Builder} to construct {@link TimeoutOptions}.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Create a new instance of {@link TimeoutOptions} with default settings.
+     *
+     * @return a new instance of {@link TimeoutOptions} with default settings.
+     */
+    public static TimeoutOptions create() {
+        return builder().build();
+    }
+
+    /**
+     * Create a new instance of {@link TimeoutOptions} with enabled timeout applying default connection timeouts.
+     *
+     * @return a new instance of {@link TimeoutOptions} with enabled timeout applying default connection timeouts.
+     */
+    public static TimeoutOptions enabled() {
+        return builder().timeoutCommands().connectionTimeout().build();
+    }
+
+    /**
+     * Create a new instance of {@link TimeoutOptions} with enabled timeout applying a fixed {@link Duration timeout}.
+     *
+     * @return a new instance of {@link TimeoutOptions} with enabled timeout applying a fixed {@link Duration timeout}.
+     */
+    public static TimeoutOptions enabled(Duration timeout) {
+        return builder().timeoutCommands().fixedTimeout(timeout).build();
+    }
+
+    /**
+     * Builder for {@link TimeoutOptions}.
+     */
+    public static class Builder {
+
+        private boolean timeoutCommands = DEFAULT_TIMEOUT_COMMANDS;
+        private boolean applyConnectionTimeout = false;
+        private TimeoutSource source;
+
+        /**
+         * Enable command timeouts. Disabled by default, see {@link #DEFAULT_TIMEOUT_COMMANDS}.
+         *
+         * @return {@code this}
+         */
+        public Builder timeoutCommands() {
+            return timeoutCommands(true);
+        }
+
+        /**
+         * Configure whether commands should timeout. Disabled by default, see {@link #DEFAULT_TIMEOUT_COMMANDS}.
+         *
+         * @param enabled {@literal true} to enable timeout; {@literal false} to disable timeouts.
+         * @return {@code this}
+         */
+        public Builder timeoutCommands(boolean enabled) {
+
+            this.timeoutCommands = enabled;
+            return this;
+        }
+
+        /**
+         * Set a fixed timeout for all commands.
+         *
+         * @param duration the timeout {@link Duration}, must not be {@literal null}.
+         * @return {@code this}
+         */
+        public Builder fixedTimeout(Duration duration) {
+
+            LettuceAssert.notNull(duration, "Duration must not be null");
+
+            return timeoutSource(new FixedTimeoutSource(duration.toNanos(), TimeUnit.NANOSECONDS));
+        }
+
+        /**
+         * Configure a {@link TimeoutSource} that applies timeouts configured on the connection/client instance.
+         *
+         * @return {@code this}
+         */
+        public Builder connectionTimeout() {
+            return timeoutSource(new DefaultTimeoutSource());
+        }
+
+        /**
+         * Set a {@link TimeoutSource} to obtain the timeout value per {@link RedisCommand}.
+         *
+         * @param source the timeout source.
+         * @return {@code this}
+         */
+        public Builder timeoutSource(TimeoutSource source) {
+
+            LettuceAssert.notNull(source, "TimeoutSource must not be null");
+
+            timeoutCommands(true);
+            this.applyConnectionTimeout = source instanceof DefaultTimeoutSource;
+            this.source = source;
+            return this;
+        }
+
+        /**
+         * Create a new instance of {@link TimeoutOptions}.
+         *
+         * @return new instance of {@link TimeoutOptions}
+         */
+        public TimeoutOptions build() {
+
+            if (timeoutCommands) {
+                if (source == null) {
+                    throw new IllegalStateException("TimeoutSource is required for enabled timeouts");
+                }
+            }
+
+            return new TimeoutOptions(timeoutCommands, applyConnectionTimeout, source);
+        }
+    }
+
+    /**
+     * @return {@literal true} if commands should time out.
+     */
+    public boolean isTimeoutCommands() {
+        return timeoutCommands;
+    }
+
+    /**
+     * @return {@literal true} to apply connection timeouts declared on connection level.
+     */
+    public boolean isApplyConnectionTimeout() {
+        return applyConnectionTimeout;
+    }
+
+    /**
+     * @return the timeout source to determine the timeout for a {@link RedisCommand}. Can be {@literal null} if
+     *         {@link #isTimeoutCommands()} is {@literal false}.
+     */
+    public TimeoutSource getSource() {
+        return source;
+    }
+
+    private static class DefaultTimeoutSource extends TimeoutSource {
+
+        private final long timeout = -1;
+
+        @Override
+        public long getTimeout(RedisCommand<?, ?, ?> command) {
+            return timeout;
+        }
+    }
+
+    private static class FixedTimeoutSource extends TimeoutSource {
+
+        private final long timeout;
+        private final TimeUnit timeUnit;
+
+        FixedTimeoutSource(long timeout, TimeUnit timeUnit) {
+
+            this.timeout = timeout;
+            this.timeUnit = timeUnit;
+        }
+
+        @Override
+        public long getTimeout(RedisCommand<?, ?, ?> command) {
+            return timeout;
+        }
+
+        @Override
+        public TimeUnit getTimeUnit() {
+            return timeUnit;
+        }
+    }
+
+    /**
+     * Source for the actual timeout to expire a particular {@link RedisCommand}.
+     */
+    public static abstract class TimeoutSource {
+
+        /**
+         * Obtains the timeout for a {@link RedisCommand}. All timeouts must be specified in {@link #getTimeUnit()}. Values
+         * greater zero will timeout the command. Values less or equal to zero do not timeout the command.
+         * <p>
+         * {@code command} may be null if a timeout is required but the command is not yet known, e.g. when the timeout is
+         * required but a connect did not finish yet.
+         *
+         * @param command can be {@literal null}.
+         * @return the timeout value. Values less or equal to zero do not timeout the command.
+         */
+        public abstract long getTimeout(RedisCommand<?, ?, ?> command);
+
+        /**
+         * @return the {@link TimeUnit} for the timeout.
+         */
+        public TimeUnit getTimeUnit() {
+            return TimeUnit.MILLISECONDS;
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index 10e2991203..7003265885 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -20,6 +20,7 @@
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.SocketOptions;
 import io.lettuce.core.SslOptions;
+import io.lettuce.core.TimeoutOptions;
 
 /**
  * Client Options to control the behavior of {@link RedisClusterClient}.
@@ -193,6 +194,12 @@ public Builder sslOptions(SslOptions sslOptions) {
             return this;
         }
 
+        @Override
+        public Builder timeoutOptions(TimeoutOptions timeoutOptions) {
+            super.timeoutOptions(timeoutOptions);
+            return this;
+        }
+
         /**
          * Create a new instance of {@link ClusterClientOptions}
          *
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
index 64e7b46c50..0f70fea955 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
@@ -35,6 +35,8 @@
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.internal.AbstractInvocationHandler;
 import io.lettuce.core.internal.DefaultMethods;
+import io.lettuce.core.internal.TimeoutProvider;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * Invocation-handler to synchronize API calls which use Futures as backend. This class leverages the need to implement a full
@@ -49,6 +51,7 @@
 class ClusterFutureSyncInvocationHandler<K, V> extends AbstractInvocationHandler {
 
     private final StatefulConnection<K, V> connection;
+    private final TimeoutProvider timeoutProvider;
     private final Class<?> asyncCommandsInterface;
     private final Class<?> nodeSelectionInterface;
     private final Class<?> nodeSelectionCommandsInterface;
@@ -62,6 +65,8 @@ class ClusterFutureSyncInvocationHandler<K, V> extends AbstractInvocationHandler
     ClusterFutureSyncInvocationHandler(StatefulConnection<K, V> connection, Class<?> asyncCommandsInterface,
             Class<?> nodeSelectionInterface, Class<?> nodeSelectionCommandsInterface, Object asyncApi) {
         this.connection = connection;
+        this.timeoutProvider = new TimeoutProvider(() -> connection.getOptions().getTimeoutOptions(), () -> connection
+                .getTimeout().toNanos());
         this.asyncCommandsInterface = asyncCommandsInterface;
         this.nodeSelectionInterface = nodeSelectionInterface;
         this.nodeSelectionCommandsInterface = nodeSelectionCommandsInterface;
@@ -115,7 +120,7 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
                         return null;
                     }
                 }
-                return LettuceFutures.awaitOrCancel(command, connection.getTimeout().toNanos(), TimeUnit.NANOSECONDS);
+                return LettuceFutures.awaitOrCancel(command, getTimeoutNs(command), TimeUnit.NANOSECONDS);
             }
 
             return result;
@@ -125,6 +130,15 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
         }
     }
 
+    private long getTimeoutNs(RedisFuture<?> command) {
+
+        if (command instanceof RedisCommand) {
+            return timeoutProvider.getTimeoutNs((RedisCommand) command);
+        }
+
+        return connection.getTimeout().toNanos();
+    }
+
     private Object getConnection(Method method, Object[] args) throws Exception {
 
         Method targetMethod = connectionMethodCache.computeIfAbsent(method, this::lookupMethod);
@@ -177,7 +191,7 @@ protected Object nodes(Predicate<RedisClusterNode> predicate, ClusterConnectionP
         }
 
         NodeSelectionInvocationHandler h = new NodeSelectionInvocationHandler((AbstractNodeSelection<?, ?, ?, ?>) selection,
-                asyncCommandsInterface, connection.getTimeout());
+                asyncCommandsInterface, timeoutProvider);
         return Proxy.newProxyInstance(NodeSelectionSupport.class.getClassLoader(), new Class<?>[] {
                 nodeSelectionCommandsInterface, nodeSelectionInterface }, h);
     }
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
index d5d62cb50c..5d7f759c36 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.cluster;
 
 import io.lettuce.core.ConnectionFuture;
+import io.lettuce.core.RedisChannelWriter;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
@@ -50,9 +51,8 @@ class ClusterPubSubConnectionProvider<K, V> extends PooledClusterConnectionProvi
      * @param redisCodec must not be {@literal null}.
      * @param notificationTarget must not be {@literal null}.
      */
-    public ClusterPubSubConnectionProvider(RedisClusterClient redisClusterClient,
-            ClusterDistributionChannelWriter clusterWriter, RedisCodec<K, V> redisCodec,
-            RedisClusterPubSubListener<K, V> notificationTarget) {
+    public ClusterPubSubConnectionProvider(RedisClusterClient redisClusterClient, RedisChannelWriter clusterWriter,
+            RedisCodec<K, V> redisCodec, RedisClusterPubSubListener<K, V> notificationTarget) {
 
         super(redisClusterClient, clusterWriter, redisCodec);
 
diff --git a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
index 3cb1b251bd..1ef757d568 100644
--- a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
@@ -20,6 +20,7 @@
 import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 
 import org.reactivestreams.Publisher;
@@ -33,6 +34,8 @@
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.internal.AbstractInvocationHandler;
 import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.TimeoutProvider;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * Invocation handler to trigger commands on multiple connections and return a holder for the values.
@@ -50,7 +53,7 @@ class NodeSelectionInvocationHandler extends AbstractInvocationHandler {
 
     private final AbstractNodeSelection<?, ?, ?, ?> selection;
     private final ExecutionModel executionModel;
-    private final Duration timeout;
+    private final TimeoutProvider timeoutProvider;
 
     static {
         try {
@@ -63,25 +66,26 @@ class NodeSelectionInvocationHandler extends AbstractInvocationHandler {
 
     NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selection, Class<?> commandsInterface,
             ExecutionModel executionModel) {
-        this(selection, commandsInterface, Duration.ZERO, executionModel);
+        this(selection, commandsInterface, null, executionModel);
     }
 
-    NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selection, Class<?> commandsInterface, Duration timeout) {
-        this(selection, commandsInterface, timeout, ExecutionModel.SYNC);
+    NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selection, Class<?> commandsInterface,
+            TimeoutProvider timeoutProvider) {
+        this(selection, commandsInterface, timeoutProvider, ExecutionModel.SYNC);
     }
 
     private NodeSelectionInvocationHandler(AbstractNodeSelection<?, ?, ?, ?> selection, Class<?> commandsInterface,
-            Duration timeout, ExecutionModel executionModel) {
+            TimeoutProvider timeoutProvider, ExecutionModel executionModel) {
 
         if (executionModel == ExecutionModel.SYNC) {
-            LettuceAssert.isTrue(timeout.toNanos() > 0, "Timeout must be greater 0 when using sync mode");
+            LettuceAssert.notNull(timeoutProvider, "TimeoutProvider must not be null");
         }
 
         LettuceAssert.notNull(executionModel, "ExecutionModel must not be null");
 
         this.selection = selection;
         this.commandsInterface = commandsInterface;
-        this.timeout = timeout;
+        this.timeoutProvider = timeoutProvider;
         this.executionModel = executionModel;
     }
 
@@ -108,6 +112,8 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
             connections.putAll(selection.statefulMap());
             Map<RedisClusterNode, Object> executions = new LinkedHashMap<>(selection.size(), 1);
 
+            AtomicLong timeout = new AtomicLong();
+
             for (Map.Entry<RedisClusterNode, CompletableFuture<? extends StatefulRedisConnection<?, ?>>> entry : connections
                     .entrySet()) {
 
@@ -120,6 +126,10 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
                         Object resultValue = targetMethod.invoke(
                                 executionModel == ExecutionModel.REACTIVE ? it.reactive() : it.async(), args);
 
+                        if (timeoutProvider != null && resultValue instanceof RedisCommand && timeout.get() == 0) {
+                            timeout.set(timeoutProvider.getTimeoutNs((RedisCommand) resultValue));
+                        }
+
                         if (resultValue instanceof CompletionStage<?>) {
                             return (CompletionStage<Object>) resultValue;
                         }
@@ -141,14 +151,15 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
                 executions.put(entry.getKey(), result);
             }
 
-            return getExecutions(executions);
+            return getExecutions(executions, timeout.get());
         } catch (InvocationTargetException e) {
             throw e.getTargetException();
         }
     }
 
     @SuppressWarnings("unchecked")
-    private Object getExecutions(Map<RedisClusterNode, Object> executions) throws ExecutionException, InterruptedException {
+    private Object getExecutions(Map<RedisClusterNode, Object> executions, long timeoutNs) throws ExecutionException,
+            InterruptedException {
 
         if (executionModel == ExecutionModel.REACTIVE) {
             Map<RedisClusterNode, CompletionStage<? extends Publisher<?>>> reactiveExecutions = (Map) executions;
@@ -159,8 +170,10 @@ private Object getExecutions(Map<RedisClusterNode, Object> executions) throws Ex
 
         if (executionModel == ExecutionModel.SYNC) {
 
-            if (!awaitAll(timeout.toNanos(), TimeUnit.NANOSECONDS, asyncExecutions.values())) {
-                throw createTimeoutException(asyncExecutions, timeout);
+            long timeoutToUse = timeoutNs > 0 ? timeoutNs : timeoutProvider.getTimeoutNs(null);
+
+            if (!awaitAll(timeoutToUse, TimeUnit.NANOSECONDS, asyncExecutions.values())) {
+                throw createTimeoutException(asyncExecutions, Duration.ofNanos(timeoutToUse));
             }
 
             if (atLeastOneFailed(asyncExecutions)) {
@@ -234,8 +247,7 @@ private RedisCommandExecutionException createExecutionException(Map<RedisCluster
         });
 
         RedisCommandExecutionException e = ExceptionFactory
-                .createExecutionException(
-                "Multi-node command execution failed on node(s): " + getNodeDescription(failed));
+                .createExecutionException("Multi-node command execution failed on node(s): " + getNodeDescription(failed));
 
         executions.forEach((redisClusterNode, completionStage) -> {
             CompletableFuture<?> completableFuture = completionStage.toCompletableFuture();
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 11d4229817..f5045bdd0f 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -45,6 +45,7 @@
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceLists;
 import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.protocol.CommandExpiryWriter;
 import io.lettuce.core.protocol.CommandHandler;
 import io.lettuce.core.protocol.DefaultEndpoint;
 import io.lettuce.core.pubsub.PubSubCommandHandler;
@@ -425,7 +426,14 @@ <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisC
         logger.debug(String.format("connectToNodeAsync(%s at %s)", nodeId, socketAddress));
 
         ClusterNodeEndpoint endpoint = new ClusterNodeEndpoint(clientOptions, getResources(), clusterWriter);
-        StatefulRedisConnectionImpl<K, V> connection = new StatefulRedisConnectionImpl<K, V>(endpoint, codec, timeout);
+
+        RedisChannelWriter writer = endpoint;
+
+        if (CommandExpiryWriter.isSupported(clientOptions)) {
+            writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
+        }
+
+        StatefulRedisConnectionImpl<K, V> connection = new StatefulRedisConnectionImpl<K, V>(writer, codec, timeout);
 
         ConnectionFuture<StatefulRedisConnection<K, V>> connectionFuture = connectStatefulAsync(connection, endpoint,
                 getFirstUri(), socketAddressSupplier, () -> new CommandHandler(clientOptions, clientResources, endpoint));
@@ -473,7 +481,14 @@ <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNode
         logger.debug("connectPubSubToNode(" + nodeId + ")");
 
         PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<>(clientOptions);
-        StatefulRedisPubSubConnectionImpl<K, V> connection = new StatefulRedisPubSubConnectionImpl<>(endpoint, endpoint, codec,
+
+        RedisChannelWriter writer = endpoint;
+
+        if (CommandExpiryWriter.isSupported(clientOptions)) {
+            writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
+        }
+
+        StatefulRedisPubSubConnectionImpl<K, V> connection = new StatefulRedisPubSubConnectionImpl<>(endpoint, writer, codec,
                 timeout);
 
         ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectionFuture = connectStatefulAsync(connection, endpoint,
@@ -507,8 +522,13 @@ <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K,
         Supplier<SocketAddress> socketAddressSupplier = getSocketAddressSupplier(TopologyComparators::sortByClientCount);
 
         DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
+        RedisChannelWriter writer = endpoint;
 
-        ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, endpoint,
+        if (CommandExpiryWriter.isSupported(clientOptions)) {
+            writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
+        }
+
+        ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, writer,
                 clusterTopologyRefreshScheduler);
         PooledClusterConnectionProvider<K, V> pooledClusterConnectionProvider = new PooledClusterConnectionProvider<K, V>(this,
                 clusterWriter, codec);
@@ -574,9 +594,14 @@ <K, V> StatefulRedisClusterPubSubConnection<K, V> connectClusterPubSubImpl(Redis
 
         ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, endpoint,
                 clusterTopologyRefreshScheduler);
+        RedisChannelWriter writer = clusterWriter;
+
+        if (CommandExpiryWriter.isSupported(clientOptions)) {
+            writer = new CommandExpiryWriter(clusterWriter, clientOptions, clientResources);
+        }
 
         StatefulRedisClusterPubSubConnectionImpl<K, V> connection = new StatefulRedisClusterPubSubConnectionImpl<>(endpoint,
-                clusterWriter, codec, timeout);
+                writer, codec, timeout);
 
         ClusterPubSubConnectionProvider<K, V> pooledClusterConnectionProvider = new ClusterPubSubConnectionProvider<>(this,
                 clusterWriter, codec, connection.getUpstreamListener());
@@ -591,8 +616,8 @@ <K, V> StatefulRedisClusterPubSubConnection<K, V> connectClusterPubSubImpl(Redis
 
         for (int i = 0; i < connectionAttempts; i++) {
             try {
-                connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier,
-                        () -> new PubSubCommandHandler<K, V>(clientOptions, clientResources, codec, endpoint));
+                connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier, () -> new PubSubCommandHandler<>(
+                        clientOptions, clientResources, codec, endpoint));
                 connection.inspectRedisState();
                 connected = true;
                 break;
diff --git a/src/main/java/io/lettuce/core/internal/TimeoutProvider.java b/src/main/java/io/lettuce/core/internal/TimeoutProvider.java
new file mode 100644
index 0000000000..69c8a53a73
--- /dev/null
+++ b/src/main/java/io/lettuce/core/internal/TimeoutProvider.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.internal;
+
+import java.util.concurrent.TimeUnit;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+
+import io.lettuce.core.TimeoutOptions;
+import io.lettuce.core.protocol.RedisCommand;
+
+/**
+ * Provider for command timeout durations. Determines an individual timeout for each command and falls back to a default
+ * timeout.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ * @see TimeoutOptions
+ */
+public class TimeoutProvider {
+
+    private final Supplier<TimeoutOptions> timeoutOptionsSupplier;
+    private final LongSupplier defaultTimeoutSupplier;
+
+    private State state;
+
+    /**
+     * Creates a new {@link TimeoutProvider} given {@link TimeoutOptions supplier} and {@link LongSupplier default timeout
+     * supplier}.
+     *
+     * @param timeoutOptionsSupplier must not be {@literal null}.
+     * @param defaultTimeoutSupplier must not be {@literal null}.
+     */
+    public TimeoutProvider(Supplier<TimeoutOptions> timeoutOptionsSupplier, LongSupplier defaultTimeoutSupplier) {
+
+        LettuceAssert.notNull(timeoutOptionsSupplier, "TimeoutOptionsSupplier must not be null");
+        LettuceAssert.notNull(defaultTimeoutSupplier, "Default TimeoutSupplier must not be null");
+
+        this.timeoutOptionsSupplier = timeoutOptionsSupplier;
+        this.defaultTimeoutSupplier = defaultTimeoutSupplier;
+    }
+
+    /**
+     * Returns the timeout in {@link TimeUnit#NANOSECONDS} for {@link RedisCommand}.
+     *
+     * @param command the command.
+     * @return timeout in {@link TimeUnit#NANOSECONDS}.
+     */
+    public long getTimeoutNs(RedisCommand<?, ?, ?> command) {
+
+        long timeoutNs = -1;
+
+        State state = this.state;
+        if (state == null) {
+            state = this.state = new State(timeoutOptionsSupplier.get());
+        }
+
+        if (!state.applyDefaultTimeout) {
+            timeoutNs = state.timeoutSource.getTimeUnit().toNanos(state.timeoutSource.getTimeout(command));
+        }
+
+        return timeoutNs > 0 ? timeoutNs : defaultTimeoutSupplier.getAsLong();
+    }
+
+    static class State {
+
+        final boolean applyDefaultTimeout;
+        final TimeoutOptions.TimeoutSource timeoutSource;
+
+        State(TimeoutOptions timeoutOptions) {
+
+            this.timeoutSource = timeoutOptions.getSource();
+
+            if (timeoutSource == null || !timeoutOptions.isTimeoutCommands() || timeoutOptions.isApplyConnectionTimeout()) {
+                this.applyDefaultTimeout = true;
+            } else {
+                this.applyDefaultTimeout = false;
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index c579c6bdba..f30a18ffbc 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -164,6 +164,7 @@ private static <K, V> StatefulRedisMasterSlaveConnection<K, V> connectSentinel(R
         MasterSlaveChannelWriter<K, V> channelWriter = new MasterSlaveChannelWriter<>(connectionProvider);
         StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(channelWriter,
                 codec, redisURI.getTimeout());
+        connection.setOptions(redisClient.getOptions());
 
         connection.setOptions(redisClient.getOptions());
 
@@ -263,6 +264,7 @@ private static <K, V> StatefulRedisMasterSlaveConnection<K, V> connectStaticMast
 
             StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(
                     channelWriter, codec, seedNode.getTimeout());
+            connection.setOptions(redisClient.getOptions());
 
             connection.setOptions(redisClient.getOptions());
 
diff --git a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
index 2c26f69437..00db6a0376 100644
--- a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
@@ -20,6 +20,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 import io.lettuce.core.ExceptionFactory;
@@ -191,6 +192,11 @@ public void onComplete(Consumer<? super T> action) {
         thenAccept(action);
     }
 
+    @Override
+    public void onComplete(BiConsumer<? super T, Throwable> action) {
+        whenComplete(action);
+    }
+
     @Override
     public RedisCommand<K, V, T> getDelegate() {
         return command;
diff --git a/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java b/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
new file mode 100644
index 0000000000..2b4aea36bd
--- /dev/null
+++ b/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.protocol;
+
+import static io.lettuce.core.TimeoutOptions.TimeoutSource;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.ExceptionFactory;
+import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.TimeoutOptions;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.resource.ClientResources;
+
+/**
+ * Extension to {@link RedisChannelWriter} that expires commands. Command timeout starts at the time the command is written
+ * regardless to {@link #setAutoFlushCommands(boolean) flushing mode} (user-controlled batching).
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ * @see io.lettuce.core.TimeoutOptions
+ */
+public class CommandExpiryWriter implements RedisChannelWriter {
+
+    private final RedisChannelWriter writer;
+    private final TimeoutSource source;
+    private final TimeUnit timeUnit;
+    private final ScheduledExecutorService executorService;
+    private final boolean applyConnectionTimeout;
+
+    private volatile long timeout = -1;
+
+    /**
+     * Create a new {@link CommandExpiryWriter}.
+     *
+     * @param writer must not be {@literal null}.
+     * @param clientOptions must not be {@literal null}.
+     * @param clientResources must not be {@literal null}.
+     */
+    public CommandExpiryWriter(RedisChannelWriter writer, ClientOptions clientOptions, ClientResources clientResources) {
+
+        LettuceAssert.notNull(writer, "RedisChannelWriter must not be null");
+        LettuceAssert.isTrue(isSupported(clientOptions), "Command timeout not enabled");
+        LettuceAssert.notNull(clientResources, "ClientResources must not be null");
+
+        TimeoutOptions timeoutOptions = clientOptions.getTimeoutOptions();
+        this.writer = writer;
+        this.source = timeoutOptions.getSource();
+        this.applyConnectionTimeout = timeoutOptions.isApplyConnectionTimeout();
+        this.timeUnit = source.getTimeUnit();
+        this.executorService = clientResources.eventExecutorGroup();
+    }
+
+    /**
+     * Check whether {@link ClientOptions} is configured to timeout commands.
+     *
+     * @param clientOptions must not be {@literal null}.
+     * @return {@literal true} if {@link ClientOptions} are configured to timeout commands.
+     */
+    public static boolean isSupported(ClientOptions clientOptions) {
+
+        LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
+
+        return isSupported(clientOptions.getTimeoutOptions());
+    }
+
+    private static boolean isSupported(TimeoutOptions timeoutOptions) {
+
+        LettuceAssert.notNull(timeoutOptions, "TimeoutOptions must not be null");
+
+        return timeoutOptions.isTimeoutCommands();
+    }
+
+    @Override
+    public void setConnectionFacade(ConnectionFacade connectionFacade) {
+        writer.setConnectionFacade(connectionFacade);
+    }
+
+    @Override
+    public void setAutoFlushCommands(boolean autoFlush) {
+        writer.setAutoFlushCommands(autoFlush);
+    }
+
+    @Override
+    public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
+
+        potentiallyExpire(command, getExecutorService());
+        return writer.write(command);
+    }
+
+    @Override
+    public <K, V> Collection<RedisCommand<K, V, ?>> write(Collection<? extends RedisCommand<K, V, ?>> redisCommands) {
+
+        ScheduledExecutorService executorService = getExecutorService();
+
+        for (RedisCommand<K, V, ?> command : redisCommands) {
+            potentiallyExpire(command, executorService);
+        }
+
+        return writer.write(redisCommands);
+    }
+
+    @Override
+    public void flushCommands() {
+        writer.flushCommands();
+    }
+
+    @Override
+    public void close() {
+        writer.close();
+    }
+
+    @Override
+    public void reset() {
+        writer.reset();
+    }
+
+    public void setTimeout(Duration timeout) {
+        this.timeout = timeUnit.convert(timeout.toNanos(), TimeUnit.NANOSECONDS);
+    }
+
+    private ScheduledExecutorService getExecutorService() {
+        return this.executorService;
+    }
+
+    @SuppressWarnings("unchecked")
+    private void potentiallyExpire(RedisCommand<?, ?, ?> command, ScheduledExecutorService executors) {
+
+        long timeout = applyConnectionTimeout ? this.timeout : source.getTimeout(command);
+
+        if (timeout <= 0) {
+            return;
+        }
+
+        ScheduledFuture<?> schedule = executors.schedule(() -> {
+
+            if (!command.isDone()) {
+                command.completeExceptionally(ExceptionFactory.createTimeoutException(Duration.ofNanos(timeUnit
+                        .toNanos(timeout))));
+            }
+
+        }, timeout, timeUnit);
+
+        if (command instanceof CompleteableCommand) {
+            ((CompleteableCommand) command).onComplete((o, o2) -> {
+
+                if (!schedule.isDone()) {
+                    schedule.cancel(false);
+                }
+            });
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
index 265329210c..5a34e0a7d1 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
@@ -15,7 +15,9 @@
  */
 package io.lettuce.core.protocol;
 
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 import io.lettuce.core.output.CommandOutput;
@@ -29,17 +31,17 @@
 public class CommandWrapper<K, V, T> implements RedisCommand<K, V, T>, CompleteableCommand<T>, DecoratedCommand<K, V, T> {
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    private final static AtomicReferenceFieldUpdater<CommandWrapper, Consumer[]> ONCOMPLETE = AtomicReferenceFieldUpdater
-            .newUpdater(CommandWrapper.class, Consumer[].class, "onComplete");
+    private final static AtomicReferenceFieldUpdater<CommandWrapper, Object[]> ONCOMPLETE = AtomicReferenceFieldUpdater
+            .newUpdater(CommandWrapper.class, Object[].class, "onComplete");
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    private final static Consumer<?>[] EMPTY = new Consumer[0];
+    private final static Object[] EMPTY = new Object[0];
 
     protected final RedisCommand<K, V, T> command;
 
     // accessed via AtomicReferenceFieldUpdater.
     @SuppressWarnings("unused")
-    private volatile Consumer<?>[] onComplete = EMPTY;
+    private volatile Object[] onComplete = EMPTY;
 
     public CommandWrapper(RedisCommand<K, V, T> command) {
         this.command = command;
@@ -56,32 +58,80 @@ public void complete() {
 
         command.complete();
 
-        Consumer[] consumers = ONCOMPLETE.get(this);
-        if (consumers != EMPTY && ONCOMPLETE.compareAndSet(this, consumers, EMPTY)) {
+        Object[] consumers = ONCOMPLETE.get(this);
+        if (!expireCallbacks(consumers)) {
+            return;
+        }
+
+        for (Object callback : consumers) {
 
-            for (Consumer<? super T> consumer : consumers) {
+            if (callback instanceof Consumer) {
+                Consumer consumer = (Consumer) callback;
                 if (getOutput() != null) {
                     consumer.accept(getOutput().get());
                 } else {
                     consumer.accept(null);
                 }
             }
+
+            if (callback instanceof BiConsumer) {
+                BiConsumer consumer = (BiConsumer) callback;
+                if (getOutput() != null) {
+                    consumer.accept(getOutput().get(), null);
+                } else {
+                    consumer.accept(null, null);
+                }
+            }
         }
     }
 
     @Override
     public void cancel() {
+
         command.cancel();
+        notifyBiConsumer(new CancellationException());
     }
 
     @Override
-    public CommandArgs<K, V> getArgs() {
-        return command.getArgs();
+    public boolean completeExceptionally(Throwable throwable) {
+
+        boolean result = command.completeExceptionally(throwable);
+        notifyBiConsumer(throwable);
+
+        return result;
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    private void notifyBiConsumer(Throwable exception) {
+
+        Object[] consumers = ONCOMPLETE.get(this);
+
+        if (!expireCallbacks(consumers)) {
+            return;
+        }
+
+        for (Object callback : consumers) {
+
+            if (!(callback instanceof BiConsumer)) {
+                continue;
+            }
+
+            BiConsumer consumer = (BiConsumer) callback;
+            if (getOutput() != null) {
+                consumer.accept(getOutput().get(), exception);
+            } else {
+                consumer.accept(null, exception);
+            }
+        }
+    }
+
+    private boolean expireCallbacks(Object[] consumers) {
+        return consumers != EMPTY && ONCOMPLETE.compareAndSet(this, consumers, EMPTY);
     }
 
     @Override
-    public boolean completeExceptionally(Throwable throwable) {
-        return command.completeExceptionally(throwable);
+    public CommandArgs<K, V> getArgs() {
+        return command.getArgs();
     }
 
     @Override
@@ -105,13 +155,22 @@ public void setOutput(CommandOutput<K, V, T> output) {
     }
 
     @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     public void onComplete(Consumer<? super T> action) {
+        addOnComplete(action);
+    }
+
+    @Override
+    public void onComplete(BiConsumer<? super T, Throwable> action) {
+        addOnComplete(action);
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    private void addOnComplete(Object action) {
 
         for (;;) {
 
-            Consumer[] existing = ONCOMPLETE.get(this);
-            Consumer[] updated = new Consumer[existing.length + 1];
+            Object[] existing = ONCOMPLETE.get(this);
+            Object[] updated = new Object[existing.length + 1];
             System.arraycopy(existing, 0, updated, 0, existing.length);
             updated[existing.length] = action;
 
diff --git a/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java b/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
index 0da1d46666..f537e06625 100644
--- a/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.protocol;
 
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 /**
@@ -27,11 +28,17 @@
 public interface CompleteableCommand<T> {
 
     /**
-     * Register a command callback for command completion that notifies the callback with the command result or the failure
-     * resulting from command completion.
+     * Register a command callback for successive command completion that notifies the callback with the command result.
      *
      * @param action must not be {@literal null}.
      */
     void onComplete(Consumer<? super T> action);
 
+    /**
+     * Register a command callback for command completion that notifies the callback with the command result or the failure
+     * resulting from command completion.
+     *
+     * @param action must not be {@literal null}.
+     */
+    void onComplete(BiConsumer<? super T, Throwable> action);
 }
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index e5d0cfeb06..993d61a9c5 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -251,14 +251,16 @@ private void writeToChannel(RedisCommand<?, ?, ?> command) {
 
         QUEUE_SIZE.incrementAndGet(this);
 
+        ChannelFuture channelFuture = writeAndFlush(command);
+
         if (reliability == Reliability.AT_MOST_ONCE) {
             // cancel on exceptions and remove from queue, because there is no housekeeping
-            writeAndFlush(command).addListener(new AtMostOnceWriteListener(command));
+            channelFuture.addListener(new AtMostOnceWriteListener(command));
         }
 
         if (reliability == Reliability.AT_LEAST_ONCE) {
             // commands are ok to stay within the queue, reconnect will retrigger them
-            writeAndFlush(command).addListener(new RetryListener(command));
+            channelFuture.addListener(new RetryListener(command));
         }
     }
 
@@ -266,14 +268,16 @@ private void writeToChannel(Collection<? extends RedisCommand<?, ?, ?>> commands
 
         QUEUE_SIZE.addAndGet(this, commands.size());
 
+        ChannelFuture channelFuture = writeAndFlush(commands);
+
         if (reliability == Reliability.AT_MOST_ONCE) {
             // cancel on exceptions and remove from queue, because there is no housekeeping
-            writeAndFlush(commands).addListener(new AtMostOnceWriteListener(commands));
+            channelFuture.addListener(new AtMostOnceWriteListener(commands));
         }
 
         if (reliability == Reliability.AT_LEAST_ONCE) {
             // commands are ok to stay within the queue, reconnect will retrigger them
-            writeAndFlush(commands).addListener(new RetryListener(commands));
+            channelFuture.addListener(new RetryListener(commands));
         }
     }
 
@@ -447,14 +451,16 @@ private void flushCommands(Queue<RedisCommand<?, ?, ?>> queue) {
 
                 QUEUE_SIZE.addAndGet(this, commands.size());
 
+                ChannelFuture channelFuture = writeAndFlush(commands);
+
                 if (reliability == Reliability.AT_MOST_ONCE) {
                     // cancel on exceptions and remove from queue, because there is no housekeeping
-                    writeAndFlush(commands).addListener(new AtMostOnceWriteListener(commands));
+                    channelFuture.addListener(new AtMostOnceWriteListener(commands));
                 }
 
                 if (reliability == Reliability.AT_LEAST_ONCE) {
                     // commands are ok to stay within the queue, reconnect will retrigger them
-                    writeAndFlush(commands).addListener(new RetryListener(commands));
+                    channelFuture.addListener(new RetryListener(commands));
                 }
             }
         }
@@ -591,7 +597,7 @@ protected <T> T doExclusive(Supplier<T> supplier) {
 
     protected List<RedisCommand<?, ?, ?>> drainCommands() {
 
-        List<RedisCommand<?, ?, ?>> target = new ArrayList<>();
+        List<RedisCommand<?, ?, ?>> target = new ArrayList<>(disconnectedBuffer.size() + commandBuffer.size());
 
         target.addAll(drainCommands(disconnectedBuffer));
         target.addAll(drainCommands(commandBuffer));
@@ -599,13 +605,22 @@ protected <T> T doExclusive(Supplier<T> supplier) {
         return target;
     }
 
+    /**
+     * Drain commands from a queue and return only active commands.
+     *
+     * @param source the source queue.
+     * @return List of commands.
+     */
     private static List<RedisCommand<?, ?, ?>> drainCommands(Queue<? extends RedisCommand<?, ?, ?>> source) {
 
         List<RedisCommand<?, ?, ?>> target = new ArrayList<>(source.size());
 
         RedisCommand<?, ?, ?> cmd;
         while ((cmd = source.poll()) != null) {
-            target.add(cmd);
+
+            if (!cmd.isDone()) {
+                target.add(cmd);
+            }
         }
 
         return target;
diff --git a/src/main/java/io/lettuce/core/protocol/Endpoint.java b/src/main/java/io/lettuce/core/protocol/Endpoint.java
index ab7a4a54b5..b043776edb 100644
--- a/src/main/java/io/lettuce/core/protocol/Endpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/Endpoint.java
@@ -25,6 +25,13 @@
  */
 public interface Endpoint {
 
+    /**
+     * Reset this endpoint to its initial state, clear all buffers and potentially close the bound channel.
+     *
+     * @since 5.1
+     */
+    void initialState();
+
     /**
      * Notify about channel activation.
      *
diff --git a/src/test/java/io/lettuce/core/ClientOptionsTest.java b/src/test/java/io/lettuce/core/ClientOptionsTest.java
index 88a154215c..52c5603129 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsTest.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsTest.java
@@ -27,16 +27,18 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Queue;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
 
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
 import io.lettuce.Wait;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
 import io.netty.channel.Channel;
@@ -381,6 +383,58 @@ protected void run(RedisClient client) {
         };
     }
 
+    @Test
+    public void appliesCommandTimeoutToAsyncCommands() {
+
+        client.setOptions(ClientOptions.builder().timeoutOptions(TimeoutOptions.enabled()).build());
+
+        try (StatefulRedisConnection<String, String> connection = client.connect()) {
+            connection.setTimeout(Duration.ofMillis(100));
+
+            connection.async().clientPause(300);
+
+            RedisFuture<String> future = connection.async().ping();
+
+            assertThatThrownBy(future::get).isInstanceOf(ExecutionException.class)
+                    .hasCauseInstanceOf(RedisCommandTimeoutException.class).hasMessageContaining("100 milli");
+        }
+    }
+
+    @Test
+    public void appliesCommandTimeoutToReactiveCommands() {
+
+        client.setOptions(ClientOptions.builder().timeoutOptions(TimeoutOptions.enabled()).build());
+
+        try (StatefulRedisConnection<String, String> connection = client.connect()) {
+            connection.setTimeout(Duration.ofMillis(100));
+
+            connection.async().clientPause(300);
+
+            Mono<String> mono = connection.reactive().ping();
+
+            StepVerifier.create(mono).expectError(RedisCommandTimeoutException.class).verify();
+        }
+    }
+
+    @Test
+    public void timeoutExpiresBatchedCommands() {
+
+        client.setOptions(ClientOptions.builder()
+                .timeoutOptions(TimeoutOptions.builder().fixedTimeout(Duration.ofMillis(1)).build()).build());
+
+        try (StatefulRedisConnection<String, String> connection = client.connect()) {
+
+            connection.setAutoFlushCommands(false);
+            RedisFuture<String> future = connection.async().ping();
+            Wait.untilTrue(future::isDone).waitOrTimeout();
+
+            assertThatThrownBy(future::get).isInstanceOf(ExecutionException.class)
+                    .hasCauseInstanceOf(RedisCommandTimeoutException.class).hasMessageContaining("1 milli");
+
+            connection.flushCommands();
+        }
+    }
+
     @Test(timeout = 10000)
     public void pingBeforeConnectWithQueuedCommandsAndReconnect() throws Exception {
 
@@ -388,14 +442,13 @@ public void pingBeforeConnectWithQueuedCommandsAndReconnect() throws Exception {
 
         client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
 
-        Utf8StringCodec codec = new Utf8StringCodec();
-
         StatefulRedisConnection<String, String> redisConnection = client.connect(RedisURI.create("redis://localhost:6479/5"));
         redisConnection.async().set("key1", "value1");
         redisConnection.async().set("key2", "value2");
 
         RedisFuture<String> sleep = (RedisFuture<String>) controlConnection.dispatch(new AsyncCommand<>(new Command<>(
-                CommandType.DEBUG, new StatusOutput<>(codec), new CommandArgs<>(codec).add("SLEEP").add(2))));
+                CommandType.DEBUG, new StatusOutput<>(StringCodec.UTF8), new CommandArgs<>(StringCodec.UTF8).add("SLEEP")
+                        .add(2))));
 
         sleep.await(100, TimeUnit.MILLISECONDS);
 
@@ -435,14 +488,13 @@ protected void run(RedisClient client) throws Exception {
 
                 client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
 
-                Utf8StringCodec codec = new Utf8StringCodec();
-
                 StatefulRedisConnection<String, String> redisConnection = client.connect(redisURI);
                 redisConnection.async().set("key1", "value1");
                 redisConnection.async().set("key2", "value2");
 
                 RedisFuture<String> sleep = (RedisFuture<String>) controlConnection.dispatch(new AsyncCommand<>(new Command<>(
-                        CommandType.DEBUG, new StatusOutput<>(codec), new CommandArgs<>(codec).add("SLEEP").add(2))));
+                        CommandType.DEBUG, new StatusOutput<>(StringCodec.UTF8), new CommandArgs<>(StringCodec.UTF8).add(
+                                "SLEEP").add(2))));
 
                 sleep.await(100, TimeUnit.MILLISECONDS);
 
diff --git a/src/test/java/io/lettuce/core/TimeoutOptionsTest.java b/src/test/java/io/lettuce/core/TimeoutOptionsTest.java
new file mode 100644
index 0000000000..9b5e6a46e3
--- /dev/null
+++ b/src/test/java/io/lettuce/core/TimeoutOptionsTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import static io.lettuce.core.TimeoutOptions.TimeoutSource;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+/**
+ * @author Mark Paluch
+ */
+public class TimeoutOptionsTest {
+
+    @Test
+    public void noTimeoutByDefault() {
+
+        TimeoutOptions timeoutOptions = TimeoutOptions.create();
+
+        assertThat(timeoutOptions.isTimeoutCommands()).isFalse();
+        assertThat(timeoutOptions.getSource()).isNull();
+    }
+
+    @Test
+    public void defaultConnectionTimeout() {
+
+        TimeoutOptions timeoutOptions = TimeoutOptions.enabled();
+
+        TimeoutSource source = timeoutOptions.getSource();
+        assertThat(timeoutOptions.isTimeoutCommands()).isTrue();
+        assertThat(timeoutOptions.isApplyConnectionTimeout()).isTrue();
+        assertThat(source.getTimeout(null)).isEqualTo(-1);
+    }
+
+    @Test
+    public void fixedConnectionTimeout() {
+
+        TimeoutOptions timeoutOptions = TimeoutOptions.enabled(Duration.ofMinutes(1));
+
+        TimeoutSource source = timeoutOptions.getSource();
+        assertThat(timeoutOptions.isTimeoutCommands()).isTrue();
+        assertThat(timeoutOptions.isApplyConnectionTimeout()).isFalse();
+        assertThat(source.getTimeout(null)).isEqualTo(TimeUnit.MINUTES.toNanos(1));
+    }
+}
diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java
index a45b7a761d..d9f548a933 100644
--- a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java
@@ -33,7 +33,6 @@
 import io.lettuce.core.cluster.api.async.AsyncNodeSelection;
 import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands;
 import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
-import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.internal.LettuceSets;
@@ -44,7 +43,6 @@
 public class NodeSelectionAsyncTest extends AbstractClusterTest {
 
     private RedisAdvancedClusterAsyncCommands<String, String> commands;
-    private RedisAdvancedClusterCommands<String, String> syncCommands;
     private StatefulRedisClusterConnection<String, String> clusterConnection;
 
     @Before
@@ -52,7 +50,6 @@ public void before() throws Exception {
         clusterClient.reloadPartitions();
         clusterConnection = clusterClient.connect();
         commands = clusterConnection.async();
-        syncCommands = clusterConnection.sync();
     }
 
     @After
@@ -114,18 +111,19 @@ public void testNodeSelection() throws Exception {
     public void testDynamicNodeSelection() throws Exception {
 
         Partitions partitions = commands.getStatefulConnection().getPartitions();
-        partitions.forEach(redisClusterNode -> redisClusterNode.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.MASTER)));
+        partitions.forEach(redisClusterNode -> redisClusterNode.setFlags(Collections
+                .singleton(RedisClusterNode.NodeFlag.MASTER)));
 
         AsyncNodeSelection<String, String> selection = commands.nodes(
                 redisClusterNode -> redisClusterNode.getFlags().contains(RedisClusterNode.NodeFlag.MYSELF), true);
 
         assertThat(selection.asMap()).hasSize(0);
-        partitions.getPartition(0)
-                .setFlags(LettuceSets.unmodifiableSet(RedisClusterNode.NodeFlag.MYSELF, RedisClusterNode.NodeFlag.MASTER));
+        partitions.getPartition(0).setFlags(
+                LettuceSets.unmodifiableSet(RedisClusterNode.NodeFlag.MYSELF, RedisClusterNode.NodeFlag.MASTER));
         assertThat(selection.asMap()).hasSize(1);
 
-        partitions.getPartition(1)
-                .setFlags(LettuceSets.unmodifiableSet(RedisClusterNode.NodeFlag.MYSELF, RedisClusterNode.NodeFlag.MASTER));
+        partitions.getPartition(1).setFlags(
+                LettuceSets.unmodifiableSet(RedisClusterNode.NodeFlag.MYSELF, RedisClusterNode.NodeFlag.MASTER));
         assertThat(selection.asMap()).hasSize(2);
 
     }
diff --git a/src/test/jmh/io/lettuce/core/JmhMain.java b/src/test/jmh/io/lettuce/core/JmhMain.java
index f18d8f6f88..fcf7d4652d 100644
--- a/src/test/jmh/io/lettuce/core/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/JmhMain.java
@@ -32,46 +32,15 @@
  */
 public class JmhMain {
 
-    public static void main(String... args) throws IOException, RunnerException {
+    public static void main(String... args) throws Exception {
 
-        runCommandHandlerBenchmark();
+        runRedisClientBenchmark();
     }
 
-    private static void runBenchmarks() throws RunnerException {
-        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).build()).run();
-    }
-
-    private static void runCommandBenchmark() throws RunnerException {
-
-        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).include(".*CommandBenchmark.*")
-                .build()).run();
-
-        new Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS).include(".*CommandBenchmark.*").build())
-                .run();
-    }
-
-    private static void runCommandHandlerBenchmark() throws RunnerException {
+    private static void runRedisClientBenchmark() throws RunnerException {
 
         new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).include(".*RedisClientBenchmark.*")
                 .build()).run();
-        // new
-        // Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS).include(".*CommandHandlerBenchmark.*").build()).run();
-    }
-
-    private static void runCommandEncoderBenchmark() throws RunnerException {
-
-        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS)
-                .include(".*CommandEncoderBenchmark.*").build()).run();
-        // new
-        // Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS).include(".*CommandHandlerBenchmark.*").build()).run();
-    }
-
-    private static void runRedisStateMachineBenchmark() throws RunnerException {
-
-        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS)
-                .include(".*RedisStateMachineBenchmark.*").build()).run();
-        // new
-        // Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS).include(".*CommandHandlerBenchmark.*").build()).run();
     }
 
     private static ChainedOptionsBuilder prepareOptions() {
diff --git a/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
index 5600abd7fa..1e7d742199 100644
--- a/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
@@ -15,13 +15,13 @@
  */
 package io.lettuce.core;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import org.openjdk.jmh.annotations.*;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.ByteArrayCodec;
 
@@ -57,6 +57,8 @@ public class RedisClientBenchmark {
     public void setup() {
 
         redisClient = RedisClient.create(RedisURI.create(TestSettings.host(), TestSettings.port()));
+        redisClient.setOptions(ClientOptions.builder()
+                .timeoutOptions(TimeoutOptions.builder().fixedTimeout(Duration.ofSeconds(10)).build()).build());
         connection = redisClient.connect(ByteArrayCodec.INSTANCE);
         commands = new RedisFuture[BATCH_SIZE];
         monos = new Mono[BATCH_SIZE];

From 302dfa1e8a5689d41ddd9e1ef23971c769922a4b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Oct 2017 11:44:22 +0200
Subject: [PATCH 333/808] Fix race in RedisPublisher while demand state #634.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit fixes a race condition between two concurrent threads that are calling DEMAND.request(…) and DEMAND.onDataAvailable(…) resulting in registered demand but no further emission. The publishing part now checks whether new demand was registered after the state transition and the requesting thread checks for a state transition after registering demand. If one of the newly introduced conditions yields true, the outstanding signals are processed.

There are three key components to create the race:

* the command is completed
* the requesting thread does not pull because of DEMAND state
* the emitting thread completes prematurely

The race is possible because the requesting thread calls request(…) in the DEMAND state after the publishing thread determined there was no further demand. The publishing did not check whether demand was registered after its state transition to NO_DEMAND, the requesting code did not check whether a state transition occurred meanwhile so the publisher never completed.
---
 .../java/io/lettuce/core/RedisPublisher.java  | 51 ++++++++++++-------
 .../cluster/AdvancedClusterReactiveTest.java  | 22 ++++++++
 2 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index a0d3c989c3..f631394d02 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -15,7 +15,6 @@
  */
 package io.lettuce.core;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Queue;
@@ -330,7 +329,7 @@ void checkOnDataAvailable() {
          *
          * @return {@literal true} if there is more demand, {@literal false} otherwise.
          */
-        private boolean readAndPublish() throws IOException {
+        private boolean readAndPublish() {
 
             while (hasDemand()) {
 
@@ -466,25 +465,12 @@ void request(RedisSubscription<?> subscription, long n) {
             @Override
             void onDataAvailable(RedisSubscription<?> subscription) {
 
-                if (subscription.changeState(this, READING)) {
-
-                    try {
-                        boolean demandAvailable = subscription.readAndPublish();
-                        if (demandAvailable) {
-                            subscription.changeState(READING, DEMAND);
-                            subscription.checkOnDataAvailable();
-                        } else {
+                do {
 
-                            if (subscription.data.isEmpty() && subscription.allDataRead) {
-                                subscription.onAllDataRead();
-                            } else {
-                                subscription.changeState(READING, NO_DEMAND);
-                            }
-                        }
-                    } catch (IOException ex) {
-                        onError(subscription, ex);
+                    if (!read(subscription)) {
+                        return;
                     }
-                }
+                } while (subscription.hasDemand() && subscription.changeState(NO_DEMAND, this));
             }
 
             @Override
@@ -492,9 +478,36 @@ void request(RedisSubscription<?> subscription, long n) {
 
                 if (Operators.validate(n)) {
                     Operators.addCap(RedisSubscription.DEMAND, subscription, n);
+
+                    if (subscription.changeState(NO_DEMAND, DEMAND)) {
+                        read(subscription);
+                    }
                 }
             }
 
+            private boolean read(RedisSubscription<?> subscription) {
+
+                if (subscription.changeState(this, READING)) {
+
+                    subscription.readAndPublish();
+
+                    if (subscription.data.isEmpty() && subscription.allDataRead) {
+                        subscription.onAllDataRead();
+                        return true;
+                    }
+
+                    if (subscription.readAndPublish()) {
+                        subscription.changeState(READING, DEMAND);
+                        subscription.checkOnDataAvailable();
+                    } else {
+                        subscription.changeState(READING, NO_DEMAND);
+                    }
+
+                    return true;
+                }
+
+                return false;
+            }
         },
 
         READING {
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
index c5f3d72214..ffa0115e03 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
@@ -19,6 +19,7 @@
 import static org.junit.Assume.assumeTrue;
 
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
@@ -31,8 +32,10 @@
 import reactor.test.StepVerifier;
 import io.lettuce.KeysAndValues;
 import io.lettuce.RedisConditions;
+import io.lettuce.Wait;
 import io.lettuce.core.*;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
 import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
 import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands;
 import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
@@ -230,6 +233,25 @@ public void keys() {
                 .consumeRecordedWith(actual -> assertThat(actual).contains(KEY_ON_NODE_1, KEY_ON_NODE_2)).verifyComplete();
     }
 
+    @Test
+    public void keysDoesNotRunIntoRaceConditions() {
+
+        List<RedisFuture> futures = new ArrayList<>();
+        RedisClusterAsyncCommands<String, String> async = commands.getStatefulConnection().async();
+
+        for (int i = 0; i < 10000; i++) {
+            futures.add(async.set("key-" + i, "value-" + i));
+        }
+
+        futures.forEach(f -> f.toCompletableFuture().join());
+
+        for (int i = 0; i < 20; i++) {
+
+            CompletableFuture<Long> future = commands.keys("*").count().toFuture();
+            Wait.untilTrue(future::isDone).waitOrTimeout();
+        }
+    }
+
     @Test
     public void keysStreaming() {
 

From 33f77ba7e2f5492433b0cda43de4358426b0ef9a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Oct 2017 11:50:18 +0200
Subject: [PATCH 334/808] =?UTF-8?q?Guard=20RedisPublisher.request(?=
 =?UTF-8?q?=E2=80=A6)=20against=20invalid=20request=20count=20#635?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/io/lettuce/core/Operators.java  | 27 ++++++++++++++++---
 .../java/io/lettuce/core/RedisPublisher.java  | 15 ++++++-----
 .../reactive/RedisPublisherVerification.java  |  4 +--
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/lettuce/core/Operators.java b/src/main/java/io/lettuce/core/Operators.java
index 6bc7b85e2b..1b26bee84e 100644
--- a/src/main/java/io/lettuce/core/Operators.java
+++ b/src/main/java/io/lettuce/core/Operators.java
@@ -41,7 +41,7 @@
  * Long.MAX_VALUE, which is generic to {@link Subscription#request(long)} handling.
  * <p/>
  * This class duplicates some methods from {@link reactor.core.publisher.Operators} to be independent from Reactor API changes.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0
  */
@@ -107,6 +107,27 @@ static long addCap(long a, long b) {
         return res;
     }
 
+    /**
+     * Concurrent addition bound to Long.MAX_VALUE. Any concurrent write will "happen before" this operation.
+     *
+     * @param <T> the parent instance type
+     * @param updater current field updater
+     * @param instance current instance to update
+     * @param toAdd delta to add
+     * @return {@literal true} if the operation succeeded.
+     * @since 5.0.1
+     */
+    public static <T> boolean request(AtomicLongFieldUpdater<T> updater, T instance, long toAdd) {
+
+        if (validate(toAdd)) {
+            addCap(updater, instance, toAdd);
+
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Concurrent addition bound to Long.MAX_VALUE. Any concurrent write will "happen before" this operation.
      *
@@ -133,7 +154,7 @@ static <T> long addCap(AtomicLongFieldUpdater<T> updater, T instance, long toAdd
 
     /**
      * Evaluate if a request is strictly positive otherwise {@link #reportBadRequest(long)}
-     * 
+     *
      * @param n the request value
      * @return true if valid
      */
@@ -212,7 +233,7 @@ static Throwable onOperatorError(@Nullable Subscription subscription, Throwable
 
     /**
      * Create a new {@link Queue}.
-     * 
+     *
      * @return the new queue.
      */
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index f631394d02..522de2dafb 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -440,9 +440,7 @@ void subscribe(RedisSubscription<?> subscription, Subscriber<?> subscriber) {
             @Override
             void request(RedisSubscription<?> subscription, long n) {
 
-                if (Operators.validate(n)) {
-
-                    Operators.addCap(RedisSubscription.DEMAND, subscription, n);
+                if (Operators.request(RedisSubscription.DEMAND, subscription, n)) {
 
                     if (subscription.changeState(this, DEMAND)) {
 
@@ -453,6 +451,8 @@ void request(RedisSubscription<?> subscription, long n) {
                         }
                         subscription.checkOnDataAvailable();
                     }
+                } else {
+                    onError(subscription, Exceptions.nullOrNegativeRequestException(n));
                 }
             }
         },
@@ -476,12 +476,13 @@ void onDataAvailable(RedisSubscription<?> subscription) {
             @Override
             void request(RedisSubscription<?> subscription, long n) {
 
-                if (Operators.validate(n)) {
-                    Operators.addCap(RedisSubscription.DEMAND, subscription, n);
+                if (Operators.request(RedisSubscription.DEMAND, subscription, n)) {
 
                     if (subscription.changeState(NO_DEMAND, DEMAND)) {
                         read(subscription);
                     }
+                } else {
+                    onError(subscription, Exceptions.nullOrNegativeRequestException(n));
                 }
             }
 
@@ -514,8 +515,8 @@ private boolean read(RedisSubscription<?> subscription) {
             @Override
             void request(RedisSubscription<?> subscription, long n) {
 
-                if (Operators.validate(n)) {
-                    Operators.addCap(RedisSubscription.DEMAND, subscription, n);
+                if (!Operators.request(RedisSubscription.DEMAND, subscription, n)) {
+                    onError(subscription, Exceptions.nullOrNegativeRequestException(n));
                 }
             }
         },
diff --git a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
index 8c2052adb5..301f432de3 100644
--- a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
+++ b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -90,7 +90,7 @@ public Publisher<String> createPublisher(long elements) {
 
     @Override
     public long maxElementsFromPublisher() {
-        return 1000;
+        return 100;
     }
 
     @Override

From e23235c4adbdd9d2038f4c04257ac3e6e6fd8f5b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Oct 2017 13:55:37 +0200
Subject: [PATCH 335/808] Fix race in RedisPublisher while reading state #634

---
 src/main/java/io/lettuce/core/RedisPublisher.java    |  9 +++------
 .../core/cluster/AdvancedClusterReactiveTest.java    | 12 ++++++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index 522de2dafb..186e7db765 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -490,14 +490,14 @@ private boolean read(RedisSubscription<?> subscription) {
 
                 if (subscription.changeState(this, READING)) {
 
-                    subscription.readAndPublish();
+                    boolean hasDemand = subscription.readAndPublish();
 
                     if (subscription.data.isEmpty() && subscription.allDataRead) {
                         subscription.onAllDataRead();
                         return true;
                     }
 
-                    if (subscription.readAndPublish()) {
+                    if (hasDemand) {
                         subscription.changeState(READING, DEMAND);
                         subscription.checkOnDataAvailable();
                     } else {
@@ -514,10 +514,7 @@ private boolean read(RedisSubscription<?> subscription) {
         READING {
             @Override
             void request(RedisSubscription<?> subscription, long n) {
-
-                if (!Operators.request(RedisSubscription.DEMAND, subscription, n)) {
-                    onError(subscription, Exceptions.nullOrNegativeRequestException(n));
-                }
+                DEMAND.request(subscription, n);
             }
         },
 
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
index ffa0115e03..134ed19e6e 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
@@ -20,6 +20,7 @@
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
@@ -32,7 +33,6 @@
 import reactor.test.StepVerifier;
 import io.lettuce.KeysAndValues;
 import io.lettuce.RedisConditions;
-import io.lettuce.Wait;
 import io.lettuce.core.*;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
@@ -234,21 +234,21 @@ public void keys() {
     }
 
     @Test
-    public void keysDoesNotRunIntoRaceConditions() {
+    public void keysDoesNotRunIntoRaceConditions() throws Exception {
 
         List<RedisFuture> futures = new ArrayList<>();
         RedisClusterAsyncCommands<String, String> async = commands.getStatefulConnection().async();
+        async.flushall().get();
 
-        for (int i = 0; i < 10000; i++) {
+        for (int i = 0; i < 1000; i++) {
             futures.add(async.set("key-" + i, "value-" + i));
         }
 
         futures.forEach(f -> f.toCompletableFuture().join());
 
-        for (int i = 0; i < 20; i++) {
-
+        for (int i = 0; i < 100; i++) {
             CompletableFuture<Long> future = commands.keys("*").count().toFuture();
-            Wait.untilTrue(future::isDone).waitOrTimeout();
+            future.get(5, TimeUnit.SECONDS);
         }
     }
 

From 0034430f1ac20e81994efda29dbc031f375f46e3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Oct 2017 14:34:36 +0200
Subject: [PATCH 336/808] Capture subscription state before logging in
 RedisPublisher #636

---
 .../java/io/lettuce/core/RedisPublisher.java  | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index 186e7db765..5bd8c825ef 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -180,11 +180,13 @@ void subscribe(Subscriber<? super T> subscriber) {
                 throw new NullPointerException("Subscriber must not be null");
             }
 
+            State state = state();
+
             if (traceEnabled) {
-                LOG.trace("{} subscribe: {}@{}", state(), subscriber.getClass().getName(), subscriber.hashCode());
+                LOG.trace("{} subscribe: {}@{}", state, subscriber.getClass().getName(), subscriber.hashCode());
             }
 
-            state().subscribe(this, subscriber);
+            state.subscribe(this, subscriber);
         }
 
         /**
@@ -195,11 +197,13 @@ void subscribe(Subscriber<? super T> subscriber) {
         @Override
         public final void request(long n) {
 
+            State state = state();
+
             if (traceEnabled) {
-                LOG.trace("{} request: {}", state(), n);
+                LOG.trace("{} request: {}", state, n);
             }
 
-            state().request(this, n);
+            state.request(this, n);
         }
 
         /**
@@ -208,11 +212,13 @@ public final void request(long n) {
         @Override
         public final void cancel() {
 
+            State state = state();
+
             if (traceEnabled) {
-                LOG.trace("{} cancel", state());
+                LOG.trace("{} cancel", state);
             }
 
-            state().cancel(this);
+            state.cancel(this);
         }
 
         /**
@@ -250,11 +256,13 @@ public void onNext(T t) {
          */
         final void onDataAvailable() {
 
+            State state = state();
+
             if (traceEnabled) {
-                LOG.trace("{} onDataAvailable()", state());
+                LOG.trace("{} onDataAvailable()", state);
             }
 
-            state().onDataAvailable(this);
+            state.onDataAvailable(this);
         }
 
         /**
@@ -263,11 +271,13 @@ final void onDataAvailable() {
          */
         final void onAllDataRead() {
 
+            State state = state();
+
             if (traceEnabled) {
-                LOG.trace("{} onAllDataRead()", state());
+                LOG.trace("{} onAllDataRead()", state);
             }
 
-            state().onAllDataRead(this);
+            state.onAllDataRead(this);
         }
 
         /**
@@ -277,11 +287,13 @@ final void onAllDataRead() {
          */
         final void onError(Throwable t) {
 
+            State state = state();
+
             if (LOG.isErrorEnabled()) {
-                LOG.trace("{} onError(): {}", state(), t.toString(), t);
+                LOG.trace("{} onError(): {}", state, t.toString(), t);
             }
 
-            state().onError(this, t);
+            state.onError(this, t);
         }
 
         /**

From c724e0ea43ef5a8f0976affcf8c5b0e7babfd2bc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Oct 2017 14:43:54 +0200
Subject: [PATCH 337/808] Introduce fast-path publishing in RedisPublisher #637

Directly emit received elements if there is sufficient demand and the queue is empty.
---
 .../java/io/lettuce/core/RedisPublisher.java  | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index 5bd8c825ef..c18638f1a8 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -231,10 +231,28 @@ public void onNext(T t) {
 
             LettuceAssert.notNull(t, "Data must not be null");
 
-            if (state() == State.COMPLETED) {
+            State state = state();
+
+            if (state == State.COMPLETED) {
                 return;
             }
 
+            // Fast-path publishing, preserve ordering
+            if (state == State.DEMAND && data.isEmpty()) {
+
+                long initial = DEMAND.get(this);
+
+                if (initial > 0 && DEMAND.compareAndSet(this, initial, initial - 1)) {
+
+                    try {
+                        this.subscriber.onNext(t);
+                    } catch (Exception e) {
+                        onError(e);
+                    }
+                    return;
+                }
+            }
+
             if (!data.offer(t)) {
 
                 Context context = Context.empty();
@@ -345,23 +363,32 @@ private boolean readAndPublish() {
 
             while (hasDemand()) {
 
+                long initial = DEMAND.get(this);
+
+                if (!hasDemand(initial)) {
+                    return false;
+                }
+
                 T data = read();
 
-                if (data != null) {
+                if (data == null) {
+                    return hasDemand(initial);
+                }
 
-                    this.subscriber.onNext(data);
+                boolean success = DEMAND.compareAndSet(this, initial, initial - 1);
 
-                    if (Operators.addCap(DEMAND, this, -1) == 0) {
-                        return false;
-                    }
-                } else {
-                    return true;
+                if (success) {
+                    this.subscriber.onNext(data);
                 }
             }
 
             return false;
         }
 
+        private static boolean hasDemand(long n) {
+            return n > 0;
+        }
+
         RedisPublisher.State state() {
             return this.state.get();
         }

From c17dcb268b8d8cb2640d6b736014b7339f7c4732 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Oct 2017 14:44:51 +0200
Subject: [PATCH 338/808] Polishing #637

Remove private modifiers from methods accessed from inner classes to prevent synthetic accessors.
---
 src/main/java/io/lettuce/core/RedisPublisher.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index c18638f1a8..1843468bc6 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -323,11 +323,11 @@ protected T read() {
             return data.poll();
         }
 
-        private boolean hasDemand() {
+        boolean hasDemand() {
             return DEMAND.get(this) > 0;
         }
 
-        private boolean changeState(State oldState, State newState) {
+        boolean changeState(State oldState, State newState) {
             return this.state.compareAndSet(oldState, newState);
         }
 
@@ -359,7 +359,7 @@ void checkOnDataAvailable() {
          *
          * @return {@literal true} if there is more demand, {@literal false} otherwise.
          */
-        private boolean readAndPublish() {
+        boolean readAndPublish() {
 
             while (hasDemand()) {
 

From 32f55ce47a8924120aecaf32f1553e85e096539f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Oct 2017 16:28:04 +0200
Subject: [PATCH 339/808] Fix concurrent completion in RedisPublisher #634

Fix completion where concurrently another thread signals demand setting the state from NO_DEMAND to DEMAND and a concurrent completion occurs. Because completion checks against the current state to perform state change only once, it checks with the old state hence completion never succeeds in that case.

Completion now executes in any state as long as the queue is empty.
---
 .../java/io/lettuce/core/RedisPublisher.java  | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index 1843468bc6..7ff67ec3c6 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -18,6 +18,7 @@
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Queue;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
@@ -125,10 +126,16 @@ static class RedisSubscription<T> extends StreamingOutput.Subscriber<T> implemen
 
         static final InternalLogger LOG = InternalLoggerFactory.getInstance(RedisPublisher.class);
 
+        static final int ST_PROGRESS = 0;
+        static final int ST_COMPLETED = 1;
+
         @SuppressWarnings({ "rawtypes", "unchecked" })
         static final AtomicLongFieldUpdater<RedisSubscription> DEMAND = AtomicLongFieldUpdater.newUpdater(
                 RedisSubscription.class, "demand");
 
+        static final AtomicIntegerFieldUpdater<RedisSubscription> COMPLETION = AtomicIntegerFieldUpdater.newUpdater(
+                RedisSubscription.class, "completion");
+
         private final SubscriptionCommand<?, ?, T> subscriptionCommand;
         private final boolean traceEnabled = LOG.isTraceEnabled();
 
@@ -142,6 +149,8 @@ static class RedisSubscription<T> extends StreamingOutput.Subscriber<T> implemen
         @SuppressWarnings("unused")
         // accessed via AtomicLongFieldUpdater
         volatile long demand;
+        @SuppressWarnings("unused")
+        volatile int completion = ST_PROGRESS;
         volatile boolean allDataRead = false;
 
         Subscriber<? super T> subscriber;
@@ -328,7 +337,18 @@ boolean hasDemand() {
         }
 
         boolean changeState(State oldState, State newState) {
-            return this.state.compareAndSet(oldState, newState);
+            return state.compareAndSet(oldState, newState);
+        }
+
+        public boolean complete() {
+
+            if (COMPLETION.compareAndSet(this, ST_PROGRESS, ST_COMPLETED)) {
+
+                state.set(State.COMPLETED);
+                return true;
+            }
+
+            return false;
         }
 
         void checkCommandDispatch() {
@@ -614,7 +634,8 @@ void onAllDataRead(RedisSubscription<?> subscription) {
 
             subscription.allDataRead = true;
 
-            if (subscription.data.isEmpty() && subscription.changeState(this, COMPLETED)) {
+            if (subscription.data.isEmpty() && subscription.complete()) {
+
                 readData(subscription);
                 if (subscription.subscriber != null) {
                     subscription.subscriber.onComplete();
@@ -698,7 +719,6 @@ public void complete() {
                             subscription.onNext((T) result);
                         }
                     }
-
                 }
 
                 subscription.onAllDataRead();

From b03cae884d021d9ec1636caaebb0421676b0ab91 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Oct 2017 16:29:59 +0200
Subject: [PATCH 340/808] Polishing #634

Replace AtomicReference with AtomicReferenceFieldUpdater.
---
 .../java/io/lettuce/core/RedisPublisher.java  | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index 7ff67ec3c6..af45710d79 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -21,6 +21,7 @@
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import java.util.function.Supplier;
 
 import org.reactivestreams.Publisher;
@@ -133,6 +134,12 @@ static class RedisSubscription<T> extends StreamingOutput.Subscriber<T> implemen
         static final AtomicLongFieldUpdater<RedisSubscription> DEMAND = AtomicLongFieldUpdater.newUpdater(
                 RedisSubscription.class, "demand");
 
+        static final AtomicReferenceFieldUpdater<RedisSubscription, State> STATE = AtomicReferenceFieldUpdater.newUpdater(
+                RedisSubscription.class, State.class, "state");
+
+        static final AtomicReferenceFieldUpdater<RedisSubscription, CommandDispatch> COMMAND_DISPATCH = AtomicReferenceFieldUpdater
+                .newUpdater(RedisSubscription.class, CommandDispatch.class, "commandDispatch");
+
         static final AtomicIntegerFieldUpdater<RedisSubscription> COMPLETION = AtomicIntegerFieldUpdater.newUpdater(
                 RedisSubscription.class, "completion");
 
@@ -143,14 +150,17 @@ static class RedisSubscription<T> extends StreamingOutput.Subscriber<T> implemen
         final StatefulConnection<?, ?> connection;
         final RedisCommand<?, ?, T> command;
         final boolean dissolve;
-        final AtomicReference<State> state = new AtomicReference<>(State.UNSUBSCRIBED);
-        final AtomicReference<CommandDispatch> commandDispatch = new AtomicReference<>(CommandDispatch.UNDISPATCHED);
 
-        @SuppressWarnings("unused")
         // accessed via AtomicLongFieldUpdater
+        @SuppressWarnings("unused")
         volatile long demand;
         @SuppressWarnings("unused")
+        volatile State state = State.UNSUBSCRIBED;
+        @SuppressWarnings("unused")
         volatile int completion = ST_PROGRESS;
+        @SuppressWarnings("unused")
+        volatile CommandDispatch commandDispatch = CommandDispatch.UNDISPATCHED;
+
         volatile boolean allDataRead = false;
 
         Subscriber<? super T> subscriber;
@@ -201,7 +211,7 @@ void subscribe(Subscriber<? super T> subscriber) {
         /**
          * Signal for data demand.
          *
-         * @param n number of requested elements
+         * @param n number of requested elements.
          */
         @Override
         public final void request(long n) {
@@ -279,7 +289,6 @@ public void onNext(T t) {
 
         /**
          * Called via a listener interface to indicate that reading is possible.
-         *
          */
         final void onDataAvailable() {
 
@@ -294,7 +303,6 @@ final void onDataAvailable() {
 
         /**
          * Called via a listener interface to indicate that all data has been read.
-         *
          */
         final void onAllDataRead() {
 
@@ -337,14 +345,14 @@ boolean hasDemand() {
         }
 
         boolean changeState(State oldState, State newState) {
-            return state.compareAndSet(oldState, newState);
+            return STATE.compareAndSet(this, oldState, newState);
         }
 
         public boolean complete() {
 
             if (COMPLETION.compareAndSet(this, ST_PROGRESS, ST_COMPLETED)) {
 
-                state.set(State.COMPLETED);
+                STATE.set(this, State.COMPLETED);
                 return true;
             }
 
@@ -352,7 +360,7 @@ public boolean complete() {
         }
 
         void checkCommandDispatch() {
-            commandDispatch.get().dispatch(this);
+            COMMAND_DISPATCH.get(this).dispatch(this);
         }
 
         @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -410,7 +418,7 @@ private static boolean hasDemand(long n) {
         }
 
         RedisPublisher.State state() {
-            return this.state.get();
+            return STATE.get(this);
         }
     }
 
@@ -438,7 +446,7 @@ private enum CommandDispatch {
             @Override
             void dispatch(RedisSubscription<?> redisSubscription) {
 
-                if (redisSubscription.commandDispatch.compareAndSet(this, DISPATCHED)) {
+                if (RedisSubscription.COMMAND_DISPATCH.compareAndSet(redisSubscription, this, DISPATCHED)) {
                     redisSubscription.dispatchCommand();
                 }
             }
@@ -482,6 +490,7 @@ void subscribe(RedisSubscription<?> subscription, Subscriber<?> subscriber) {
                 LettuceAssert.notNull(subscriber, "Subscriber must not be null");
 
                 if (subscription.changeState(this, NO_DEMAND)) {
+
                     subscription.subscriber = (Subscriber) subscriber;
                     subscriber.onSubscribe(subscription);
                 } else {
@@ -620,7 +629,9 @@ void cancel(RedisSubscription<?> subscription) {
         }
 
         void readData(RedisSubscription<?> subscription) {
+
             DemandAware.Source source = subscription.subscriptionCommand.source;
+
             if (source != null) {
                 source.requestMore();
             }
@@ -637,6 +648,7 @@ void onAllDataRead(RedisSubscription<?> subscription) {
             if (subscription.data.isEmpty() && subscription.complete()) {
 
                 readData(subscription);
+
                 if (subscription.subscriber != null) {
                     subscription.subscriber.onComplete();
                 }
@@ -646,7 +658,9 @@ void onAllDataRead(RedisSubscription<?> subscription) {
         void onError(RedisSubscription<?> subscription, Throwable t) {
 
             if (subscription.changeState(this, COMPLETED)) {
+
                 readData(subscription);
+
                 if (subscription.subscriber != null) {
                     subscription.subscriber.onError(t);
                 }

From 691061d27dc8c9eb0eaaf157c20772ebdc4660b5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Oct 2017 18:07:56 +0200
Subject: [PATCH 341/808] Consider empty subscription buffers to prefetch data
 #634

RedisPublisher now considers an empty subscription buffer as demand to continue reading from the transport. Reading will prefetch data and ensure the publisher has enough data buffered to satisfy demand from the buffer. Reading from the transport also ensures that command completion is read as the completion does not count into the actual demand.
---
 .../java/io/lettuce/core/RedisPublisher.java  | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index af45710d79..cd02fa249a 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -259,7 +259,7 @@ public void onNext(T t) {
             // Fast-path publishing, preserve ordering
             if (state == State.DEMAND && data.isEmpty()) {
 
-                long initial = DEMAND.get(this);
+                long initial = getDemand();
 
                 if (initial > 0 && DEMAND.compareAndSet(this, initial, initial - 1)) {
 
@@ -341,7 +341,11 @@ protected T read() {
         }
 
         boolean hasDemand() {
-            return DEMAND.get(this) > 0;
+            return getDemand() > 0;
+        }
+
+        private long getDemand() {
+            return DEMAND.get(this);
         }
 
         boolean changeState(State oldState, State newState) {
@@ -371,9 +375,7 @@ void dispatchCommand() {
         void checkOnDataAvailable() {
 
             if (data.isEmpty()) {
-                if (hasDemand()) {
-                    state().readData(this);
-                }
+                potentiallyReadMore();
             }
 
             if (!data.isEmpty()) {
@@ -381,6 +383,13 @@ void checkOnDataAvailable() {
             }
         }
 
+        void potentiallyReadMore() {
+
+            if ((getDemand() + 1) > data.size()) {
+                state().readData(this);
+            }
+        }
+
         /**
          * Reads and publishes data from the input. Continues until either there is no more demand, or until there is no more
          * data to be read.
@@ -391,7 +400,7 @@ boolean readAndPublish() {
 
             while (hasDemand()) {
 
-                long initial = DEMAND.get(this);
+                long initial = getDemand();
 
                 if (!hasDemand(initial)) {
                     return false;
@@ -519,6 +528,12 @@ void request(RedisSubscription<?> subscription, long n) {
                         }
                         subscription.checkOnDataAvailable();
                     }
+
+                    subscription.potentiallyReadMore();
+
+                    if (subscription.allDataRead) {
+                        onAllDataRead(subscription);
+                    }
                 } else {
                     onError(subscription, Exceptions.nullOrNegativeRequestException(n));
                 }
@@ -549,6 +564,8 @@ void request(RedisSubscription<?> subscription, long n) {
                     if (subscription.changeState(NO_DEMAND, DEMAND)) {
                         read(subscription);
                     }
+
+                    subscription.potentiallyReadMore();
                 } else {
                     onError(subscription, Exceptions.nullOrNegativeRequestException(n));
                 }
@@ -560,7 +577,7 @@ private boolean read(RedisSubscription<?> subscription) {
 
                     boolean hasDemand = subscription.readAndPublish();
 
-                    if (subscription.data.isEmpty() && subscription.allDataRead) {
+                    if (subscription.allDataRead && subscription.data.isEmpty()) {
                         subscription.onAllDataRead();
                         return true;
                     }
@@ -692,10 +709,7 @@ public SubscriptionCommand(RedisCommand<K, V, T> command, RedisSubscription<T> s
 
         @Override
         public boolean hasDemand() {
-
-            // signal demand as completed commands just no-op on incoming data.
-            return completed || subscription.state() == State.COMPLETED
-                    || RedisSubscription.DEMAND.get(subscription) > subscription.data.size();
+            return completed || subscription.state() == State.COMPLETED || subscription.data.isEmpty();
         }
 
         @Override

From ee84ba94ed54f0dc37d0991f94b0252fe098e00c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 29 Oct 2017 13:35:32 +0100
Subject: [PATCH 342/808] Add reactive scanning #638
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lettuce now supports reactive scanning for all connections (Standalone, Master/Slave, Cluster). Progressive scanning respects demand and executes subsequent scan commands if the subscriber has signalled enough demand.

RedisReactiveCommands<String, String> reactive = …;

Flux<String> keys = ScanStream.scan(reactive);

Flux<ScoredValue<String>> scoredValues = ScanStream.zscan(reactive, key, ScanArgs.Builder.limit(200)); // set batch size to 200
---
 src/main/java/io/lettuce/core/ScanStream.java | 242 ++++++++++++++++++
 .../java/io/lettuce/core/ScanStreamTest.java  |  88 +++++++
 .../lettuce/core/cluster/ScanStreamTest.java  |  63 +++++
 3 files changed, 393 insertions(+)
 create mode 100644 src/main/java/io/lettuce/core/ScanStream.java
 create mode 100644 src/test/java/io/lettuce/core/ScanStreamTest.java
 create mode 100644 src/test/java/io/lettuce/core/cluster/ScanStreamTest.java

diff --git a/src/main/java/io/lettuce/core/ScanStream.java b/src/main/java/io/lettuce/core/ScanStream.java
new file mode 100644
index 0000000000..3e617cb88a
--- /dev/null
+++ b/src/main/java/io/lettuce/core/ScanStream.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+import org.reactivestreams.Publisher;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import io.lettuce.core.api.reactive.RedisHashReactiveCommands;
+import io.lettuce.core.api.reactive.RedisKeyReactiveCommands;
+import io.lettuce.core.api.reactive.RedisSetReactiveCommands;
+import io.lettuce.core.api.reactive.RedisSortedSetReactiveCommands;
+import io.lettuce.core.internal.LettuceAssert;
+
+/**
+ * Scan command support exposed through {@link Flux}.
+ * <p>
+ * {@link ScanStream} uses reactive command interfaces to scan over keys ({@code SCAN}), sets ({@code SSCAN}), sorted sets (
+ * {@code ZSCAN}), and hashes ({@code HSCAN}).
+ * <p>
+ * Use {@link ScanArgs#limit(long)} to set the batch size.
+ * <p>
+ * Data structure scanning is progressive and stateful and demand-aware. It supports full iterations (until all received cursors
+ * are exhausted) and premature termination. Subsequent scan commands to fetch the cursor data get only issued if the subscriber
+ * signals demand.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+public abstract class ScanStream {
+
+    private ScanStream() {
+    }
+
+    /**
+     * Sequentially iterate over keys in the keyspace. This method uses {@code SCAN} to perform an iterative scan.
+     *
+     * @param commands the commands interface, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return a new {@link Flux}.
+     */
+    public static <K, V> Flux<K> scan(RedisKeyReactiveCommands<K, V> commands) {
+        return scan(commands, Optional.empty());
+    }
+
+    /**
+     * Sequentially iterate over keys in the keyspace. This method uses {@code SCAN} to perform an iterative scan.
+     *
+     * @param commands the commands interface, must not be {@literal null}.
+     * @param scanArgs the scan arguments, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return a new {@link Flux}.
+     */
+    public static <K, V> Flux<K> scan(RedisKeyReactiveCommands<K, V> commands, ScanArgs scanArgs) {
+
+        LettuceAssert.notNull(scanArgs, "ScanArgs must not be null");
+
+        return scan(commands, Optional.of(scanArgs));
+    }
+
+    private static <K, V> Flux<K> scan(RedisKeyReactiveCommands<K, V> commands, Optional<ScanArgs> scanArgs) {
+
+        LettuceAssert.notNull(commands, "RedisKeyCommands must not be null");
+
+        Mono<KeyScanCursor<K>> res = scanArgs.map(commands::scan).orElseGet(commands::scan);
+
+        return res.flatMapMany(cursor -> scan(scanArgs, cursor, commands::scan, commands::scan, KeyScanCursor::getKeys));
+    }
+
+    /**
+     * Sequentially iterate over entries in a hash identified by {@code key}. This method uses {@code HSCAN} to perform an
+     * iterative scan.
+     *
+     * @param commands the commands interface, must not be {@literal null}.
+     * @param key the hash to scan.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return a new {@link Flux}.
+     */
+    public static <K, V> Flux<KeyValue<K, V>> hscan(RedisHashReactiveCommands<K, V> commands, K key) {
+        return hscan(commands, key, Optional.empty());
+    }
+
+    /**
+     * Sequentially iterate over entries in a hash identified by {@code key}. This method uses {@code HSCAN} to perform an
+     * iterative scan.
+     *
+     * @param commands the commands interface, must not be {@literal null}.
+     * @param key the hash to scan.
+     * @param scanArgs the scan arguments, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return a new {@link Flux}.
+     */
+    public static <K, V> Flux<KeyValue<K, V>> hscan(RedisHashReactiveCommands<K, V> commands, K key, ScanArgs scanArgs) {
+
+        LettuceAssert.notNull(scanArgs, "ScanArgs must not be null");
+
+        return hscan(commands, key, Optional.of(scanArgs));
+    }
+
+    private static <K, V> Flux<KeyValue<K, V>> hscan(RedisHashReactiveCommands<K, V> commands, K key,
+            Optional<ScanArgs> scanArgs) {
+
+        LettuceAssert.notNull(commands, "RedisHashReactiveCommands must not be null");
+        LettuceAssert.notNull(key, "Key must not be null");
+
+        Mono<MapScanCursor<K, V>> res = scanArgs.map(it -> commands.hscan(key, it)).orElseGet(() -> commands.hscan(key));
+
+        return res.flatMapMany(cursor -> scan(scanArgs, cursor, //
+                c -> commands.hscan(key, c), //
+                (c, args) -> commands.hscan(key, c, args), //
+                c -> c.getMap().entrySet())).map(me -> KeyValue.fromNullable(me.getKey(), me.getValue()));
+    }
+
+    /**
+     * Sequentially iterate over elements in a set identified by {@code key}. This method uses {@code SSCAN} to perform an
+     * iterative scan.
+     *
+     * @param commands the commands interface, must not be {@literal null}.
+     * @param key the set to scan.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return a new {@link Flux}.
+     */
+    public static <K, V> Flux<V> sscan(RedisSetReactiveCommands<K, V> commands, K key) {
+        return sscan(commands, key, Optional.empty());
+    }
+
+    /**
+     * Sequentially iterate over elements in a set identified by {@code key}. This method uses {@code SSCAN} to perform an
+     * iterative scan.
+     *
+     * @param commands the commands interface, must not be {@literal null}.
+     * @param key the set to scan.
+     * @param scanArgs the scan arguments, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return a new {@link Flux}.
+     */
+    public static <K, V> Flux<V> sscan(RedisSetReactiveCommands<K, V> commands, K key, ScanArgs scanArgs) {
+
+        LettuceAssert.notNull(scanArgs, "ScanArgs must not be null");
+
+        return sscan(commands, key, Optional.of(scanArgs));
+    }
+
+    private static <K, V> Flux<V> sscan(RedisSetReactiveCommands<K, V> commands, K key, Optional<ScanArgs> scanArgs) {
+
+        LettuceAssert.notNull(commands, "RedisSetReactiveCommands must not be null");
+        LettuceAssert.notNull(key, "Key must not be null");
+
+        Mono<ValueScanCursor<V>> res = scanArgs.map(it -> commands.sscan(key, it)).orElseGet(() -> commands.sscan(key));
+
+        return res.flatMapMany(cursor -> scan(scanArgs, cursor, //
+                c -> commands.sscan(key, c), //
+                (c, args) -> commands.sscan(key, c, args), //
+                ValueScanCursor::getValues));
+    }
+
+    /**
+     * Sequentially iterate over elements in a set identified by {@code key}. This method uses {@code SSCAN} to perform an
+     * iterative scan.
+     *
+     * @param commands the commands interface, must not be {@literal null}.
+     * @param key the sorted set to scan.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return a new {@link Flux}.
+     */
+    public static <K, V> Flux<ScoredValue<V>> zscan(RedisSortedSetReactiveCommands<K, V> commands, K key) {
+        return zscan(commands, key, Optional.empty());
+    }
+
+    /**
+     * Sequentially iterate over elements in a set identified by {@code key}. This method uses {@code SSCAN} to perform an
+     * iterative scan.
+     *
+     * @param commands the commands interface, must not be {@literal null}.
+     * @param key the sorted set to scan.
+     * @param scanArgs the scan arguments, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return a new {@link Flux}.
+     */
+    public static <K, V> Flux<ScoredValue<V>> zscan(RedisSortedSetReactiveCommands<K, V> commands, K key, ScanArgs scanArgs) {
+
+        LettuceAssert.notNull(scanArgs, "ScanArgs must not be null");
+
+        return zscan(commands, key, Optional.of(scanArgs));
+    }
+
+    private static <K, V> Flux<ScoredValue<V>> zscan(RedisSortedSetReactiveCommands<K, V> commands, K key,
+            Optional<ScanArgs> scanArgs) {
+
+        LettuceAssert.notNull(commands, "RedisSortedSetReactiveCommands must not be null");
+        LettuceAssert.notNull(key, "Key must not be null");
+
+        Mono<ScoredValueScanCursor<V>> res = scanArgs.map(it -> commands.zscan(key, it)).orElseGet(() -> commands.zscan(key));
+
+        return res.flatMapMany(cursor -> scan(scanArgs, cursor, //
+                c -> commands.zscan(key, c), //
+                (c, args) -> commands.zscan(key, c, args), //
+                ScoredValueScanCursor::getValues));
+    }
+
+    private static <V, C extends ScanCursor> Publisher<V> scan(Optional<ScanArgs> scanArgs, C cursor,
+            Function<ScanCursor, Mono<C>> scanFunction, BiFunction<ScanCursor, ScanArgs, Mono<C>> scanWithArgsFunction,
+            Function<C, Iterable<V>> manyMapper) {
+
+        Flux<V> stream = Flux.fromIterable(manyMapper.apply(cursor));
+
+        if (!cursor.isFinished()) {
+
+            Mono<C> mono = scanArgs.map(args -> scanWithArgsFunction.apply(cursor, args)).orElseGet(
+                    () -> scanFunction.apply(cursor));
+            return stream.concatWith(mono.flatMapMany(nextCursor -> scan(scanArgs, nextCursor, scanFunction,
+                    scanWithArgsFunction, manyMapper)));
+        }
+
+        return stream;
+    }
+}
diff --git a/src/test/java/io/lettuce/core/ScanStreamTest.java b/src/test/java/io/lettuce/core/ScanStreamTest.java
new file mode 100644
index 0000000000..bc561097c4
--- /dev/null
+++ b/src/test/java/io/lettuce/core/ScanStreamTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import reactor.core.publisher.Flux;
+import reactor.test.StepVerifier;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
+
+/**
+ * @author Mark Paluch
+ */
+public class ScanStreamTest extends AbstractRedisClientTest {
+
+    @Test
+    public void shouldScanIteratively() {
+
+        for (int i = 0; i < 1000; i++) {
+            redis.set("key-" + i, value);
+        }
+        ScanIterator<String> scan = ScanIterator.scan(redis);
+        List<String> list = Flux.fromIterable(() -> scan).collectList().block();
+
+        RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
+
+        StepVerifier.create(ScanStream.scan(reactive, ScanArgs.Builder.limit(200)).take(250)).expectNextCount(250)
+                .verifyComplete();
+        StepVerifier.create(ScanStream.scan(reactive)).expectNextSequence(list).verifyComplete();
+    }
+
+    @Test
+    public void shouldHscanIteratively() {
+
+        for (int i = 0; i < 1000; i++) {
+            redis.hset(key, "field-" + i, "value-" + i);
+        }
+
+        RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
+
+        StepVerifier.create(ScanStream.hscan(reactive, key, ScanArgs.Builder.limit(200)).take(250)).expectNextCount(250)
+                .verifyComplete();
+        StepVerifier.create(ScanStream.hscan(reactive, key)).expectNextCount(1000).verifyComplete();
+    }
+
+    @Test
+    public void shouldSscanIteratively() {
+
+        for (int i = 0; i < 1000; i++) {
+            redis.sadd(key, "value-" + i);
+        }
+
+        RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
+
+        StepVerifier.create(ScanStream.sscan(reactive, key, ScanArgs.Builder.limit(200)).take(250)).expectNextCount(250)
+                .verifyComplete();
+        StepVerifier.create(ScanStream.sscan(reactive, key)).expectNextCount(1000).verifyComplete();
+    }
+
+    @Test
+    public void shouldZscanIteratively() {
+
+        for (int i = 0; i < 1000; i++) {
+            redis.zadd(key, (double) i, "value-" + i);
+        }
+
+        RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
+
+        StepVerifier.create(ScanStream.zscan(reactive, key, ScanArgs.Builder.limit(200)).take(250)).expectNextCount(250)
+                .verifyComplete();
+        StepVerifier.create(ScanStream.zscan(reactive, key)).expectNextCount(1000).verifyComplete();
+    }
+}
diff --git a/src/test/java/io/lettuce/core/cluster/ScanStreamTest.java b/src/test/java/io/lettuce/core/cluster/ScanStreamTest.java
new file mode 100644
index 0000000000..dba1f81aa2
--- /dev/null
+++ b/src/test/java/io/lettuce/core/cluster/ScanStreamTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import reactor.test.StepVerifier;
+import io.lettuce.core.ScanArgs;
+import io.lettuce.core.ScanStream;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
+import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+
+/**
+ * @author Mark Paluch
+ */
+public class ScanStreamTest extends AbstractClusterTest {
+
+    private StatefulRedisClusterConnection<String, String> connection;
+    private RedisAdvancedClusterCommands<String, String> redis;
+
+    @Before
+    public void before() throws Exception {
+
+        this.connection = clusterClient.connect();
+        this.redis = this.connection.sync();
+        this.redis.flushall();
+    }
+
+    @After
+    public void tearDown() {
+        this.connection.close();
+    }
+
+    @Test
+    public void shouldScanIteratively() {
+
+        for (int i = 0; i < 1000; i++) {
+            redis.set("key-" + i, value);
+        }
+
+        RedisAdvancedClusterReactiveCommands<String, String> reactive = connection.reactive();
+
+        StepVerifier.create(ScanStream.scan(reactive, ScanArgs.Builder.limit(200)).take(250)).expectNextCount(250)
+                .verifyComplete();
+        StepVerifier.create(ScanStream.scan(reactive)).expectNextCount(1000).verifyComplete();
+    }
+}

From fb9a2150b2eb5c382e02e474de98e141d8a83625 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 29 Oct 2017 13:35:49 +0100
Subject: [PATCH 343/808] Polishing #638

Improve javadoc.
---
 .../java/io/lettuce/core/ScanIterator.java    | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/lettuce/core/ScanIterator.java b/src/main/java/io/lettuce/core/ScanIterator.java
index 3dfd362f23..825625bd71 100644
--- a/src/main/java/io/lettuce/core/ScanIterator.java
+++ b/src/main/java/io/lettuce/core/ScanIterator.java
@@ -34,6 +34,12 @@
  * {@link ScanIterator} uses synchronous command interfaces to scan over keys ({@code SCAN}), sets ({@code SSCAN}), sorted sets
  * ({@code ZSCAN}), and hashes ({@code HSCAN}). A {@link ScanIterator} is stateful and not thread-safe. Instances can be used
  * only once to iterate over results.
+ * <p>
+ * Use {@link ScanArgs#limit(long)} to set the batch size.
+ * <p>
+ * Data structure scanning is progressive and stateful and demand-aware. It supports full iterations (until all received cursors
+ * are exhausted) and premature termination. Subsequent scan commands to fetch the cursor data get only issued if the caller
+ * signals demand by consuming the {@link ScanIterator}.
  *
  * @param <T> Element type
  * @author Mark Paluch
@@ -41,6 +47,9 @@
  */
 public abstract class ScanIterator<T> implements Iterator<T> {
 
+    private ScanIterator() {
+    }
+
     /**
      * Sequentially iterate over keys in the keyspace. This method uses {@code SCAN} to perform an iterative scan.
      *
@@ -89,8 +98,8 @@ private KeyScanCursor<K> getNextScanCursor(ScanCursor scanCursor) {
                     return scanArgs.map(commands::scan).orElseGet(commands::scan);
                 }
 
-                return scanArgs.map((scanArgs) -> commands.scan(scanCursor, scanArgs))
-                        .orElseGet(() -> commands.scan(scanCursor));
+                return scanArgs.map((scanArgs) -> commands.scan(scanCursor, scanArgs)).orElseGet(
+                        () -> commands.scan(scanCursor));
             }
         };
     }
@@ -100,6 +109,7 @@ private KeyScanCursor<K> getNextScanCursor(ScanCursor scanCursor) {
      * iterative scan.
      *
      * @param commands the commands interface, must not be {@literal null}.
+     * @param key the hash to scan.
      * @param <K> Key type.
      * @param <V> Value type.
      * @return a new {@link ScanIterator}.
@@ -113,6 +123,7 @@ public static <K, V> ScanIterator<KeyValue<K, V>> hscan(RedisHashCommands<K, V>
      * iterative scan.
      *
      * @param commands the commands interface, must not be {@literal null}.
+     * @param key the hash to scan.
      * @param scanArgs the scan arguments, must not be {@literal null}.
      * @param <K> Key type.
      * @param <V> Value type.
@@ -147,8 +158,8 @@ private MapScanCursor<K, V> getNextScanCursor(ScanCursor scanCursor) {
                     return scanArgs.map(scanArgs -> commands.hscan(key, scanArgs)).orElseGet(() -> commands.hscan(key));
                 }
 
-                return scanArgs.map((scanArgs) -> commands.hscan(key, scanCursor, scanArgs))
-                        .orElseGet(() -> commands.hscan(key, scanCursor));
+                return scanArgs.map((scanArgs) -> commands.hscan(key, scanCursor, scanArgs)).orElseGet(
+                        () -> commands.hscan(key, scanCursor));
             }
         };
     }
@@ -158,6 +169,7 @@ private MapScanCursor<K, V> getNextScanCursor(ScanCursor scanCursor) {
      * iterative scan.
      *
      * @param commands the commands interface, must not be {@literal null}.
+     * @param key the set to scan.
      * @param <K> Key type.
      * @param <V> Value type.
      * @return a new {@link ScanIterator}.
@@ -171,6 +183,7 @@ public static <K, V> ScanIterator<V> sscan(RedisSetCommands<K, V> commands, K ke
      * iterative scan.
      *
      * @param commands the commands interface, must not be {@literal null}.
+     * @param key the set to scan.
      * @param scanArgs the scan arguments, must not be {@literal null}.
      * @param <K> Key type.
      * @param <V> Value type.
@@ -204,8 +217,8 @@ private ValueScanCursor<V> getNextScanCursor(ScanCursor scanCursor) {
                     return scanArgs.map(scanArgs -> commands.sscan(key, scanArgs)).orElseGet(() -> commands.sscan(key));
                 }
 
-                return scanArgs.map((scanArgs) -> commands.sscan(key, scanCursor, scanArgs))
-                        .orElseGet(() -> commands.sscan(key, scanCursor));
+                return scanArgs.map((scanArgs) -> commands.sscan(key, scanCursor, scanArgs)).orElseGet(
+                        () -> commands.sscan(key, scanCursor));
             }
         };
     }
@@ -215,6 +228,7 @@ private ValueScanCursor<V> getNextScanCursor(ScanCursor scanCursor) {
      * perform an iterative scan.
      *
      * @param commands the commands interface, must not be {@literal null}.
+     * @param key the sorted set to scan.
      * @param <K> Key type.
      * @param <V> Value type.
      * @return a new {@link ScanIterator}.
@@ -228,6 +242,7 @@ public static <K, V> ScanIterator<ScoredValue<V>> zscan(RedisSortedSetCommands<K
      * perform an iterative scan.
      *
      * @param commands the commands interface, must not be {@literal null}.
+     * @param key the sorted set to scan.
      * @param scanArgs the scan arguments, must not be {@literal null}.
      * @param <K> Key type.
      * @param <V> Value type.
@@ -262,8 +277,8 @@ private ScoredValueScanCursor<V> getNextScanCursor(ScanCursor scanCursor) {
                     return scanArgs.map(scanArgs -> commands.zscan(key, scanArgs)).orElseGet(() -> commands.zscan(key));
                 }
 
-                return scanArgs.map((scanArgs) -> commands.zscan(key, scanCursor, scanArgs))
-                        .orElseGet(() -> commands.zscan(key, scanCursor));
+                return scanArgs.map((scanArgs) -> commands.zscan(key, scanCursor, scanArgs)).orElseGet(
+                        () -> commands.zscan(key, scanCursor));
             }
         };
     }

From ea4297a8463b7d31be59960f246e62df19c80790 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 31 Oct 2017 11:19:33 +0100
Subject: [PATCH 344/808] Send event to enable auto-read on demand #634

Lettuce now sends a netty event if auto-read is disabled to stay with config changes within the channel thread. Auto-read state is always set based on whether the demand-aware sink has demand.
---
 .../lettuce/core/protocol/CommandHandler.java | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 44e92b6442..289c2d2a57 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -183,16 +183,17 @@ public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
     @Override
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
 
-        if (evt instanceof Reset) {
+        if (evt == EnableAutoRead.INSTANCE) {
+            channel.config().setAutoRead(true);
+        } else if (evt instanceof Reset) {
             reset();
-        }
-
-        if (evt instanceof PingBeforeActivate) {
+        } else if (evt instanceof PingBeforeActivate) {
 
             PingBeforeActivate pba = (PingBeforeActivate) evt;
 
             stack.addFirst(pba.getCommand());
             ctx.writeAndFlush(pba.getCommand());
+            return;
         }
 
         super.userEventTriggered(ctx, evt);
@@ -601,9 +602,7 @@ private boolean decode0(ChannelHandlerContext ctx, ByteBuf buffer, RedisCommand<
                 DemandAware.Sink sink = (DemandAware.Sink) command;
                 sink.setSource(backpressureSource);
 
-                if (!sink.hasDemand()) {
-                    ctx.channel().config().setAutoRead(false);
-                }
+                ctx.channel().config().setAutoRead(sink.hasDemand());
             }
 
             return false;
@@ -766,12 +765,18 @@ class BackpressureSource implements DemandAware.Source {
         @Override
         public void requestMore() {
 
-            if (isConnected() && !isClosed() && !channel.config().isAutoRead()) {
-                channel.config().setAutoRead(true);
+            if (isConnected() && !isClosed()) {
+                if (!channel.config().isAutoRead()) {
+                    channel.pipeline().fireUserEventTriggered(EnableAutoRead.INSTANCE);
+                }
             }
         }
     }
 
+    enum EnableAutoRead {
+        INSTANCE
+    }
+
     static class AppendToStack implements GenericFutureListener<Future<Void>> {
 
         private final Recycler.Handle<AppendToStack> handle;

From 8cfb2e80e1f58fd0d387180bbfbe96db9c956bbf Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 7 Nov 2017 10:53:12 +0100
Subject: [PATCH 345/808] Refactor to asynchronous connect #640
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lettuce now uses fully asynchronous connects for initial connection, address resolution and Sentinel/Redis Cluster connect. This change eliminates all blocking bits in the connection initialization for:

* Redis Standalone
* Redis Pub/Pub
* Redis Sentinel (not Master/Slave)
* Redis Cluster
* Redis Cluster Pub/Sub

RedisClusterClient now also exposes connectAsync(…) and connect connectPubSubAsync(…). Connection disposal also exposes asynchronous methods via closeAsync() returning a CompletableFuture.
---
 .../io/lettuce/core/AbstractRedisClient.java  |  69 ++++-
 .../io/lettuce/core/ConnectionBuilder.java    |   9 +-
 .../io/lettuce/core/ConnectionFuture.java     |   2 +-
 .../lettuce/core/DefaultConnectionFuture.java |  15 +-
 .../io/lettuce/core/RedisChannelHandler.java  |  68 +++--
 .../io/lettuce/core/RedisChannelWriter.java   |   9 +
 .../java/io/lettuce/core/RedisClient.java     | 165 ++++++------
 .../core/RedisConnectionException.java        |  26 ++
 .../lettuce/core/api/StatefulConnection.java  |  11 +
 .../AbstractClusterNodeConnectionFactory.java |  12 +-
 .../cluster/ClusterConnectionProvider.java    |   8 +
 .../ClusterDistributionChannelWriter.java     |  18 +-
 .../PooledClusterConnectionProvider.java      |   7 +-
 .../core/cluster/RedisClusterClient.java      | 247 ++++++++++--------
 .../StatefulRedisClusterConnectionImpl.java   |   9 +-
 ...tefulRedisClusterPubSubConnectionImpl.java |  11 +-
 ...ynchronizingClusterConnectionProvider.java |  20 +-
 .../lettuce/core/internal/DefaultMethods.java |   4 +-
 .../io/lettuce/core/internal/Futures.java     |  91 +++++++
 .../lettuce/core/masterslave/MasterSlave.java |   2 -
 .../masterslave/MasterSlaveChannelWriter.java |  18 +-
 .../MasterSlaveConnectionProvider.java        |  46 ++--
 .../MasterSlaveTopologyRefresh.java           |   2 +-
 .../RedisClientNodeConnectionFactory.java     |  42 +++
 .../ReflectiveNodeConnectionFactory.java      |  67 -----
 .../core/protocol/CommandExpiryWriter.java    |   6 +
 .../core/protocol/ConnectionWatchdog.java     |  52 ++--
 .../core/protocol/DefaultEndpoint.java        |  56 +++-
 .../core/protocol/ReconnectionHandler.java    |  50 ++--
 .../lettuce/core/ReactiveConnectionTest.java  |  13 +-
 .../PooledClusterConnectionProviderTest.java  |  10 +-
 ...ronizingClusterConnectionProviderTest.java |   3 +-
 .../MasterSlaveConnectionProviderTest.java    |  12 +-
 .../core/protocol/DefaultEndpointTest.java    |  10 +
 .../core/sentinel/SentinelConnectionTest.java |  24 +-
 35 files changed, 792 insertions(+), 422 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/internal/Futures.java
 create mode 100644 src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java
 delete mode 100644 src/main/java/io/lettuce/core/masterslave/ReflectiveNodeConnectionFactory.java

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 96dc306aa0..bd5ca8d1d9 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -27,8 +27,8 @@
 import java.util.Set;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Supplier;
 
+import reactor.core.publisher.Mono;
 import io.lettuce.core.Transports.NativeTransports;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.ConnectionWatchdog;
@@ -139,7 +139,7 @@ public void setDefaultTimeout(long timeout, TimeUnit unit) {
      * @param connectionBuilder connection builder to configure the connection
      * @param redisURI URI of the redis instance
      */
-    protected void connectionBuilder(Supplier<SocketAddress> socketAddressSupplier, ConnectionBuilder connectionBuilder,
+    protected void connectionBuilder(Mono<SocketAddress> socketAddressSupplier, ConnectionBuilder connectionBuilder,
             RedisURI redisURI) {
 
         Bootstrap redisBootstrap = new Bootstrap();
@@ -237,6 +237,33 @@ protected <T> T getConnection(ConnectionFuture<T> connectionFuture) {
         }
     }
 
+    /**
+     * Retrieve the connection from {@link ConnectionFuture}. Performs a blocking {@link ConnectionFuture#get()} to synchronize
+     * the channel/connection initialization. Any exception is rethrown as {@link RedisConnectionException}.
+     *
+     * @param connectionFuture must not be null.
+     * @param <T> Connection type.
+     * @return the connection.
+     * @throws RedisConnectionException in case of connection failures.
+     * @since 5.0
+     */
+    protected <T> T getConnection(CompletableFuture<T> connectionFuture) {
+
+        try {
+            return connectionFuture.get();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw RedisConnectionException.create(e);
+        } catch (Exception e) {
+
+            if (e instanceof ExecutionException) {
+                throw RedisConnectionException.create(e.getCause());
+            }
+
+            throw RedisConnectionException.create(e);
+        }
+    }
+
     /**
      * Connect and initialize a channel from {@link ConnectionBuilder}.
      *
@@ -248,15 +275,33 @@ protected <T> T getConnection(ConnectionFuture<T> connectionFuture) {
     protected <K, V, T extends RedisChannelHandler<K, V>> ConnectionFuture<T> initializeChannelAsync(
             ConnectionBuilder connectionBuilder) {
 
-        SocketAddress redisAddress = connectionBuilder.socketAddress();
+        Mono<SocketAddress> socketAddressSupplier = connectionBuilder.socketAddress();
 
         if (clientResources.eventExecutorGroup().isShuttingDown()) {
             throw new IllegalStateException("Cannot connect, Event executor group is terminated.");
         }
 
+        CompletableFuture<SocketAddress> socketAddressFuture = new CompletableFuture<>();
+        CompletableFuture<Channel> channelReadyFuture = new CompletableFuture<>();
+
+        socketAddressSupplier.doOnError(socketAddressFuture::completeExceptionally).doOnNext(socketAddressFuture::complete)
+                .subscribe(redisAddress -> {
+
+                    if (channelReadyFuture.isCancelled()) {
+                        return;
+                    }
+                    initializeChannelAsync0(connectionBuilder, channelReadyFuture, redisAddress);
+                }, channelReadyFuture::completeExceptionally);
+
+        return new DefaultConnectionFuture<>(socketAddressFuture, channelReadyFuture.thenApply(channel -> (T) connectionBuilder
+                .connection()));
+    }
+
+    private void initializeChannelAsync0(ConnectionBuilder connectionBuilder, CompletableFuture<Channel> channelReadyFuture,
+            SocketAddress redisAddress) {
+
         logger.debug("Connecting to Redis at {}", redisAddress);
 
-        CompletableFuture<Channel> channelReadyFuture = new CompletableFuture<>();
         Bootstrap redisBootstrap = connectionBuilder.bootstrap();
 
         RedisChannelInitializer initializer = connectionBuilder.build();
@@ -266,6 +311,14 @@ protected <K, V, T extends RedisChannelHandler<K, V>> ConnectionFuture<T> initia
         CompletableFuture<Boolean> initFuture = initializer.channelInitialized();
         ChannelFuture connectFuture = redisBootstrap.connect(redisAddress);
 
+        channelReadyFuture.whenComplete((c, t) -> {
+
+            if (t instanceof CancellationException) {
+                connectFuture.cancel(true);
+                initFuture.cancel(true);
+            }
+        });
+
         connectFuture.addListener(future -> {
 
             if (!future.isSuccess()) {
@@ -279,6 +332,7 @@ protected <K, V, T extends RedisChannelHandler<K, V>> ConnectionFuture<T> initia
             initFuture.whenComplete((success, throwable) -> {
 
                 if (throwable == null) {
+
                     logger.debug("Connecting to Redis at {}: Success", redisAddress);
                     RedisChannelHandler<?, ?> connection = connectionBuilder.connection();
                     connection.registerCloseables(closeableResources, connection);
@@ -299,15 +353,8 @@ protected <K, V, T extends RedisChannelHandler<K, V>> ConnectionFuture<T> initia
                     failure = throwable;
                 }
                 channelReadyFuture.completeExceptionally(failure);
-
-                CompletableFuture<Boolean> response = new CompletableFuture<>();
-                response.completeExceptionally(failure);
-
             });
         });
-
-        return new DefaultConnectionFuture<T>(redisAddress, channelReadyFuture.thenApply(channel -> (T) connectionBuilder
-                .connection()));
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index 20248cbe48..d7ba434946 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.function.Supplier;
 
+import reactor.core.publisher.Mono;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.*;
@@ -42,7 +43,7 @@ public class ConnectionBuilder {
     private static final Supplier<AsyncCommand<?, ?, ?>> PING_COMMAND_SUPPLIER = () -> new AsyncCommand<>(
             INITIALIZING_CMD_BUILDER.ping());
 
-    private Supplier<SocketAddress> socketAddressSupplier;
+    private Mono<SocketAddress> socketAddressSupplier;
     private ConnectionEvents connectionEvents;
     private RedisChannelHandler<?, ?> connection;
     private Endpoint endpoint;
@@ -122,14 +123,14 @@ public RedisChannelInitializer build() {
         return new PlainChannelInitializer(pingCommandSupplier, this::buildHandlers, clientResources, timeout);
     }
 
-    public ConnectionBuilder socketAddressSupplier(Supplier<SocketAddress> socketAddressSupplier) {
+    public ConnectionBuilder socketAddressSupplier(Mono<SocketAddress> socketAddressSupplier) {
         this.socketAddressSupplier = socketAddressSupplier;
         return this;
     }
 
-    public SocketAddress socketAddress() {
+    public Mono<SocketAddress> socketAddress() {
         LettuceAssert.assertState(socketAddressSupplier != null, "SocketAddressSupplier must be set");
-        return socketAddressSupplier.get();
+        return socketAddressSupplier;
     }
 
     public ConnectionBuilder timeout(Duration timeout) {
diff --git a/src/main/java/io/lettuce/core/ConnectionFuture.java b/src/main/java/io/lettuce/core/ConnectionFuture.java
index 1cc1aecb6f..a0b824aa7c 100644
--- a/src/main/java/io/lettuce/core/ConnectionFuture.java
+++ b/src/main/java/io/lettuce/core/ConnectionFuture.java
@@ -58,7 +58,7 @@ static <T> ConnectionFuture<T> from(SocketAddress remoteAddress, CompletableFutu
     /**
      * Return the remote {@link SocketAddress}.
      *
-     * @return the remote {@link SocketAddress}.
+     * @return the remote {@link SocketAddress}. May be {@literal null} until the socket address is resolved.
      */
     SocketAddress getRemoteAddress();
 
diff --git a/src/main/java/io/lettuce/core/DefaultConnectionFuture.java b/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
index 943a14c23d..52c2fb9d92 100644
--- a/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
+++ b/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
@@ -30,17 +30,28 @@
  */
 class DefaultConnectionFuture<T> extends CompletableFuture<T> implements ConnectionFuture<T> {
 
-    private final SocketAddress remoteAddress;
+    private final CompletableFuture<SocketAddress> remoteAddress;
     private final CompletableFuture<T> delegate;
 
     public DefaultConnectionFuture(SocketAddress remoteAddress, CompletableFuture<T> delegate) {
 
+        this.remoteAddress = CompletableFuture.completedFuture(remoteAddress);
+        this.delegate = delegate;
+    }
+
+    public DefaultConnectionFuture(CompletableFuture<SocketAddress> remoteAddress, CompletableFuture<T> delegate) {
+
         this.remoteAddress = remoteAddress;
         this.delegate = delegate;
     }
 
     public SocketAddress getRemoteAddress() {
-        return remoteAddress;
+
+        if (remoteAddress.isDone() && !remoteAddress.isCompletedExceptionally()) {
+            return remoteAddress.join();
+        }
+
+        return null;
     }
 
     private <U> DefaultConnectionFuture<U> adopt(CompletableFuture<U> newFuture) {
diff --git a/src/main/java/io/lettuce/core/RedisChannelHandler.java b/src/main/java/io/lettuce/core/RedisChannelHandler.java
index 7bd6c74fd5..23f2c44bd5 100644
--- a/src/main/java/io/lettuce/core/RedisChannelHandler.java
+++ b/src/main/java/io/lettuce/core/RedisChannelHandler.java
@@ -21,7 +21,9 @@
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.internal.LettuceAssert;
@@ -42,14 +44,22 @@
 public abstract class RedisChannelHandler<K, V> implements Closeable, ConnectionFacade {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(RedisChannelHandler.class);
+    private static final AtomicIntegerFieldUpdater<RedisChannelHandler> CLOSED = AtomicIntegerFieldUpdater.newUpdater(
+            RedisChannelHandler.class, "closed");
+
+    private static final int ST_OPEN = 0;
+    private static final int ST_CLOSED = 1;
 
     private Duration timeout;
     private CloseEvents closeEvents = new CloseEvents();
 
     private final RedisChannelWriter channelWriter;
     private final boolean debugEnabled = logger.isDebugEnabled();
+    private final CompletableFuture<Void> closeFuture = new CompletableFuture<>();
 
-    private volatile boolean closed;
+    // accessed via CLOSED
+    @SuppressWarnings("unused")
+    private volatile int closed = ST_OPEN;
     private volatile boolean active = true;
     private volatile ClientOptions clientOptions;
 
@@ -96,27 +106,55 @@ public void setTimeout(long timeout, TimeUnit unit) {
     }
 
     /**
-     * Close the connection.
+     * Close the connection (synchronous).
      */
     @Override
-    public synchronized void close() {
+    public void close() {
 
         if (debugEnabled) {
             logger.debug("close()");
         }
 
-        if (closed) {
+        closeAsync().join();
+    }
+
+    /**
+     * Close the connection (asynchronous).
+     * 
+     * @since 5.1
+     */
+    public CompletableFuture<Void> closeAsync() {
+
+        if (debugEnabled) {
+            logger.debug("closeAsync()");
+        }
+
+        if (CLOSED.get(this) == ST_CLOSED) {
             logger.warn("Connection is already closed");
-            return;
+            return closeFuture;
         }
 
-        if (!closed) {
+        if (CLOSED.compareAndSet(this, ST_OPEN, ST_CLOSED)) {
+
             active = false;
-            closed = true;
-            channelWriter.close();
-            closeEvents.fireEventClosed(this);
-            closeEvents = new CloseEvents();
+            CompletableFuture<Void> future = channelWriter.closeAsync();
+
+            future.whenComplete((v, t) -> {
+
+                closeEvents.fireEventClosed(this);
+                closeEvents = new CloseEvents();
+
+                if (t != null) {
+                    closeFuture.completeExceptionally(t);
+                } else {
+                    closeFuture.complete(v);
+                }
+            });
+        } else {
+            logger.warn("Connection is already closed (concurrently)");
         }
+
+        return closeFuture;
     }
 
     protected <T> RedisCommand<K, V, T> dispatch(RedisCommand<K, V, T> cmd) {
@@ -143,7 +181,8 @@ protected <T> RedisCommand<K, V, T> dispatch(RedisCommand<K, V, T> cmd) {
      * @param registry registry of closeables
      * @param closeables closeables to register
      */
-    public void registerCloseables(final Collection<Closeable> registry, final Closeable... closeables) {
+    public void registerCloseables(final Collection<Closeable> registry, Closeable... closeables) {
+
         registry.addAll(Arrays.asList(closeables));
 
         addListener(resource -> {
@@ -170,11 +209,10 @@ protected void addListener(CloseEvents.CloseListener listener) {
     }
 
     /**
-     *
      * @return true if the connection is closed (final state in the connection lifecyle).
      */
     public boolean isClosed() {
-        return closed;
+        return CLOSED.get(this) == ST_CLOSED;
     }
 
     /**
@@ -182,7 +220,7 @@ public boolean isClosed() {
      */
     public void activated() {
         active = true;
-        closed = false;
+        CLOSED.set(this, ST_OPEN);
     }
 
     /**
@@ -193,7 +231,6 @@ public void deactivated() {
     }
 
     /**
-     *
      * @return the channel writer
      */
     public RedisChannelWriter getChannelWriter() {
@@ -201,7 +238,6 @@ public RedisChannelWriter getChannelWriter() {
     }
 
     /**
-     *
      * @return true if the connection is active and not closed.
      */
     public boolean isOpen() {
diff --git a/src/main/java/io/lettuce/core/RedisChannelWriter.java b/src/main/java/io/lettuce/core/RedisChannelWriter.java
index 5c04387011..b2bbfb0d7d 100644
--- a/src/main/java/io/lettuce/core/RedisChannelWriter.java
+++ b/src/main/java/io/lettuce/core/RedisChannelWriter.java
@@ -17,6 +17,7 @@
 
 import java.io.Closeable;
 import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
 
 import io.lettuce.core.protocol.ConnectionFacade;
 import io.lettuce.core.protocol.RedisCommand;
@@ -55,6 +56,14 @@ public interface RedisChannelWriter extends Closeable {
     @Override
     void close();
 
+    /**
+     * Asynchronously close the {@link RedisChannelWriter}.
+     * 
+     * @return future for result synchronization.
+     * @since 5.1
+     */
+    CompletableFuture<Void> closeAsync();
+
     /**
      * Reset the writer state. Queued commands will be canceled and the internal state will be reset. This is useful when the
      * internal state machine gets out of sync with the connection.
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 6df2e4e736..3826bcd10e 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -21,11 +21,12 @@
 import java.net.SocketAddress;
 import java.time.Duration;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 import java.util.function.Supplier;
 
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
@@ -250,9 +251,7 @@ public <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectAsync(Redis
     }
 
     private <K, V> StatefulRedisConnection<K, V> connectStandalone(RedisCodec<K, V> codec, RedisURI redisURI, Duration timeout) {
-
-        ConnectionFuture<StatefulRedisConnection<K, V>> future = connectStandaloneAsync(codec, redisURI, timeout);
-        return getConnection(future);
+        return getConnection(connectStandaloneAsync(codec, redisURI, timeout));
     }
 
     // Required by ReflectiveNodeConnectionFactory.
@@ -339,7 +338,6 @@ private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnecti
                 connection.setClientName(redisURI.getClientName());
                 return channelHandler;
             });
-
         }
 
         if (redisURI.getDatabase() != 0) {
@@ -355,7 +353,7 @@ private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnecti
         return future.thenApply(channelHandler -> (S) connection);
     }
 
-    private boolean hasPassword(RedisURI redisURI) {
+    private static boolean hasPassword(RedisURI redisURI) {
         return redisURI.getPassword() != null && redisURI.getPassword().length != 0;
     }
 
@@ -475,7 +473,7 @@ public StatefulRedisSentinelConnection<String, String> connectSentinel() {
      */
     public <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K, V> codec) {
         checkForRedisURI();
-        return connectSentinel(codec, redisURI, timeout);
+        return getConnection(connectSentinelAsync(codec, redisURI, timeout));
     }
 
     /**
@@ -488,7 +486,7 @@ public <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K
     public StatefulRedisSentinelConnection<String, String> connectSentinel(RedisURI redisURI) {
 
         assertNotNull(redisURI);
-        return connectSentinel(newStringStringCodec(), redisURI, redisURI.getTimeout());
+        return getConnection(connectSentinelAsync(newStringStringCodec(), redisURI, redisURI.getTimeout()));
     }
 
     /**
@@ -504,11 +502,12 @@ public StatefulRedisSentinelConnection<String, String> connectSentinel(RedisURI
     public <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K, V> codec, RedisURI redisURI) {
 
         assertNotNull(redisURI);
-        return connectSentinel(codec, redisURI, redisURI.getTimeout());
+        return getConnection(connectSentinelAsync(codec, redisURI, redisURI.getTimeout()));
     }
 
-    private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K, V> codec, RedisURI redisURI,
-            Duration timeout) {
+    private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectSentinelAsync(RedisCodec<K, V> codec,
+            RedisURI redisURI, Duration timeout) {
+
         assertNotNull(codec);
         checkValidRedisURI(redisURI);
 
@@ -535,54 +534,55 @@ private <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<
             connectionBuilder.enablePingBeforeConnect();
         }
 
+        Mono<StatefulRedisSentinelConnection<K, V>> connect;
         if (redisURI.getSentinels().isEmpty() && (isNotEmpty(redisURI.getHost()) || !isEmpty(redisURI.getSocket()))) {
+
             channelType(connectionBuilder, redisURI);
-            try {
-                getConnection(initializeChannelAsync(connectionBuilder));
-            } catch (RuntimeException e) {
-                connection.close();
-                throw e;
-            }
+            connect = Mono.fromCompletionStage(initializeChannelAsync(connectionBuilder));
         } else {
 
-            boolean connected = false;
-            boolean first = true;
-            Exception causingException = null;
-            validateUrisAreOfSameConnectionType(redisURI.getSentinels());
+            List<RedisURI> sentinels = redisURI.getSentinels();
+            validateUrisAreOfSameConnectionType(sentinels);
 
-            for (RedisURI uri : redisURI.getSentinels()) {
-                if (first) {
-                    channelType(connectionBuilder, uri);
-                    first = false;
-                }
-                connectionBuilder.socketAddressSupplier(getSocketAddressSupplier(uri));
+            Mono<StatefulRedisSentinelConnection<K, V>> connectionLoop = Mono.defer(() -> {
 
-                if (logger.isDebugEnabled()) {
-                    SocketAddress socketAddress = SocketAddressResolver.resolve(uri, clientResources.dnsResolver());
-                    logger.debug("Connecting to Redis Sentinel, address: " + socketAddress);
-                }
-                try {
-                    getConnection(initializeChannelAsync(connectionBuilder));
-                    connected = true;
-                    break;
-                } catch (Exception e) {
-                    logger.warn("Cannot connect Redis Sentinel at " + uri + ": " + e.toString());
-                    causingException = e;
-                }
-            }
+                RedisURI uri = sentinels.get(0);
+                channelType(connectionBuilder, uri);
+                return connectSentinel(connectionBuilder, uri);
+            });
 
-            if (!connected) {
-                connection.close();
-                throw new RedisConnectionException("Cannot connect to a Redis Sentinel: " + redisURI.getSentinels(),
-                        causingException);
+            for (int i = 1; i < sentinels.size(); i++) {
+
+                RedisURI uri = sentinels.get(i);
+                connectionLoop = connectionLoop.onErrorResume(t -> connectSentinel(connectionBuilder, uri));
             }
+
+            connect = connectionLoop;
         }
 
         if (LettuceStrings.isNotEmpty(redisURI.getClientName())) {
-            connection.setClientName(redisURI.getClientName());
+            connect = connect.doOnNext(c -> connection.setClientName(redisURI.getClientName()));
         }
 
-        return connection;
+        return connect.doOnError(e -> {
+
+            connection.close();
+            throw new RedisConnectionException("Cannot connect to a Redis Sentinel: " + redisURI.getSentinels(), e);
+        }).toFuture();
+    }
+
+    private <K, V> Mono<StatefulRedisSentinelConnection<K, V>> connectSentinel(ConnectionBuilder connectionBuilder, RedisURI uri) {
+
+        connectionBuilder.socketAddressSupplier(getSocketAddressSupplier(uri));
+        SocketAddress socketAddress = SocketAddressResolver.resolve(uri, clientResources.dnsResolver());
+        logger.debug("Connecting to Redis Sentinel, address: " + socketAddress);
+
+        Mono<StatefulRedisSentinelConnection<K, V>> connectionMono = Mono
+                .fromCompletionStage(initializeChannelAsync(connectionBuilder));
+
+        return connectionMono.onErrorMap(CompletionException.class, Throwable::getCause) //
+                .doOnError(t -> logger.warn("Cannot connect Redis Sentinel at " + uri + ": " + t.toString())) //
+                .onErrorMap(e -> new RedisConnectionException("Cannot connect Redis Sentinel at " + uri, e));
     }
 
     /**
@@ -662,38 +662,33 @@ protected <K, V> StatefulRedisConnectionImpl<K, V> newStatefulRedisConnection(Re
     }
 
     /**
-     * Resolve a {@link RedisURI} to a {@link SocketAddress}. Resolution is performed either using Redis Sentinel (if the
-     * {@link RedisURI} is configured with Sentinels) or via DNS resolution.
+     * Get a {@link Mono} that resolves {@link RedisURI} to a {@link SocketAddress}. Resolution is performed either using Redis
+     * Sentinel (if the {@link RedisURI} is configured with Sentinels) or via DNS resolution.
      * <p>
      * Subclasses of {@link RedisClient} may override that method.
      *
      * @param redisURI must not be {@literal null}.
      * @return the resolved {@link SocketAddress}.
-     * @throws InterruptedException
-     * @throws TimeoutException
-     * @throws ExecutionException
      * @see ClientResources#dnsResolver()
      * @see RedisURI#getSentinels()
      * @see RedisURI#getSentinelMasterId()
      */
-    protected SocketAddress getSocketAddress(RedisURI redisURI) throws InterruptedException, TimeoutException,
-            ExecutionException {
-        SocketAddress redisAddress;
-
-        if (redisURI.getSentinelMasterId() != null && !redisURI.getSentinels().isEmpty()) {
-            logger.debug("Connecting to Redis using Sentinels {}, MasterId {}", redisURI.getSentinels(),
-                    redisURI.getSentinelMasterId());
-            redisAddress = lookupRedis(redisURI);
-
-            if (redisAddress == null) {
-                throw new RedisConnectionException("Cannot provide redisAddress using sentinel for masterId "
-                        + redisURI.getSentinelMasterId());
-            }
+    protected Mono<SocketAddress> getSocketAddress(RedisURI redisURI) {
 
-        } else {
-            redisAddress = SocketAddressResolver.resolve(redisURI, clientResources.dnsResolver());
-        }
-        return redisAddress;
+        return Mono.defer(() -> {
+
+            if (redisURI.getSentinelMasterId() != null && !redisURI.getSentinels().isEmpty()) {
+                logger.debug("Connecting to Redis using Sentinels {}, MasterId {}", redisURI.getSentinels(),
+                        redisURI.getSentinelMasterId());
+                return lookupRedis(redisURI).switchIfEmpty(
+                        Mono.error(new RedisConnectionException("Cannot provide redisAddress using sentinel for masterId "
+                                + redisURI.getSentinelMasterId())));
+
+            } else {
+                return Mono.fromCallable(() -> SocketAddressResolver.resolve(redisURI, clientResources.dnsResolver()))
+                        .subscribeOn(Schedulers.fromExecutor(clientResources.eventExecutorGroup()));
+            }
+        });
     }
 
     /**
@@ -706,7 +701,8 @@ protected RedisCodec<String, String> newStringStringCodec() {
         return StringCodec.UTF8;
     }
 
-    private void validateUrisAreOfSameConnectionType(List<RedisURI> redisUris) {
+    private static void validateUrisAreOfSameConnectionType(List<RedisURI> redisUris) {
+
         boolean unixDomainSocket = false;
         boolean inetSocket = false;
         for (RedisURI sentinel : redisUris) {
@@ -723,29 +719,18 @@ private void validateUrisAreOfSameConnectionType(List<RedisURI> redisUris) {
         }
     }
 
-    private Supplier<SocketAddress> getSocketAddressSupplier(final RedisURI redisURI) {
-        return () -> {
-            try {
-                SocketAddress socketAddress = getSocketAddress(redisURI);
-                logger.debug("Resolved SocketAddress {} using {}", socketAddress, redisURI);
-                return socketAddress;
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                throw new RedisCommandInterruptedException(e);
-            } catch (TimeoutException | ExecutionException e) {
-                throw new RedisException(e);
-            }
-        };
+    private Mono<SocketAddress> getSocketAddressSupplier(RedisURI redisURI) {
+        return getSocketAddress(redisURI).doOnNext(addr -> logger.debug("Resolved SocketAddress {} using {}", addr, redisURI));
     }
 
-    private SocketAddress lookupRedis(RedisURI sentinelUri) throws InterruptedException, TimeoutException, ExecutionException {
-        try (StatefulRedisSentinelConnection<String, String> connection = connectSentinel(sentinelUri)) {
-            return connection.async().getMasterAddrByName(sentinelUri.getSentinelMasterId())
-                    .get(timeout.toNanos(), TimeUnit.NANOSECONDS);
-        }
+    private Mono<SocketAddress> lookupRedis(RedisURI sentinelUri) {
+
+        return Mono.fromCompletionStage(connectSentinelAsync(newStringStringCodec(), sentinelUri, timeout)).flatMap(
+                c -> c.reactive().getMasterAddrByName(sentinelUri.getSentinelMasterId()).timeout(timeout)
+                        .doFinally(s -> c.close()));
     }
 
-    private void checkValidRedisURI(RedisURI redisURI) {
+    private static void checkValidRedisURI(RedisURI redisURI) {
 
         LettuceAssert.notNull(redisURI, "A valid RedisURI is required");
 
diff --git a/src/main/java/io/lettuce/core/RedisConnectionException.java b/src/main/java/io/lettuce/core/RedisConnectionException.java
index 7984c52753..ace632480d 100644
--- a/src/main/java/io/lettuce/core/RedisConnectionException.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionException.java
@@ -53,9 +53,35 @@ public RedisConnectionException(String msg, Throwable cause) {
      * @since 4.4
      */
     public static RedisConnectionException create(SocketAddress remoteAddress, Throwable cause) {
+
+        if (remoteAddress == null) {
+
+            if (cause instanceof RedisConnectionException) {
+                return new RedisConnectionException(cause.getMessage(), cause.getCause());
+            }
+
+            return new RedisConnectionException(null, cause);
+        }
+
         return new RedisConnectionException(String.format("Unable to connect to %s", remoteAddress), cause);
     }
 
+    /**
+     * Create a new {@link RedisConnectionException} given {@link Throwable cause}.
+     *
+     * @param cause the exception.
+     * @return the {@link RedisConnectionException}.
+     * @since 5.1
+     */
+    public static RedisConnectionException create(Throwable cause) {
+
+        if (cause instanceof RedisConnectionException) {
+            return new RedisConnectionException(cause.getMessage(), cause.getCause());
+        }
+
+        return new RedisConnectionException("Unable to connect", cause);
+    }
+
     /**
      * @param error the error message.
      * @return {@literal true} if the {@code error} message indicates Redis protected mode.
diff --git a/src/main/java/io/lettuce/core/api/StatefulConnection.java b/src/main/java/io/lettuce/core/api/StatefulConnection.java
index 7dd09212b4..1e937ac229 100644
--- a/src/main/java/io/lettuce/core/api/StatefulConnection.java
+++ b/src/main/java/io/lettuce/core/api/StatefulConnection.java
@@ -17,6 +17,7 @@
 
 import java.time.Duration;
 import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
 import io.lettuce.core.ClientOptions;
@@ -82,6 +83,16 @@ public interface StatefulConnection<K, V> extends AutoCloseable {
      */
     void close();
 
+    /**
+     * Request to close the connection and return the {@link CompletableFuture} that is notified about its progress. The
+     * connection will become not usable anymore as soon as this method was called.
+     * 
+     * @return a {@link CompletableFuture} that is notified once the operation completes, either because the operation was
+     *         successful or because of an error.
+     * @since 5.1
+     */
+    CompletableFuture<Void> closeAsync();
+
     /**
      * @return true if the connection is open (connected and not closed).
      */
diff --git a/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
index 58910f83dd..b93e7dc7d6 100644
--- a/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
@@ -18,12 +18,12 @@
 import java.net.SocketAddress;
 import java.util.function.Supplier;
 
+import reactor.core.publisher.Mono;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.SocketAddressResolver;
-
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -62,7 +62,7 @@ public Partitions getPartitions() {
     }
 
     /**
-     * Get a {@link Supplier} of {@link SocketAddress} for a
+     * Get a {@link Mono} of {@link SocketAddress} for a
      * {@link io.lettuce.core.cluster.ClusterNodeConnectionFactory.ConnectionKey}.
      * <p>
      * This {@link Supplier} resolves the requested endpoint on each {@link Supplier#get()}.
@@ -70,9 +70,9 @@ public Partitions getPartitions() {
      * @param connectionKey must not be {@literal null}.
      * @return
      */
-    protected Supplier<SocketAddress> getSocketAddressSupplier(ConnectionKey connectionKey) {
+    Mono<SocketAddress> getSocketAddressSupplier(ConnectionKey connectionKey) {
 
-        return () -> {
+        return Mono.fromCallable(() -> {
 
             if (connectionKey.nodeId != null) {
 
@@ -85,7 +85,7 @@ protected Supplier<SocketAddress> getSocketAddressSupplier(ConnectionKey connect
             logger.debug("Resolved SocketAddress {} using for Cluster node at {}:{}", socketAddress, connectionKey.host,
                     connectionKey.port);
             return socketAddress;
-        };
+        });
     }
 
     /**
@@ -95,7 +95,7 @@ protected Supplier<SocketAddress> getSocketAddressSupplier(ConnectionKey connect
      * @return the {@link SocketAddress}.
      * @throws IllegalArgumentException if {@code nodeId} cannot be looked up.
      */
-    protected SocketAddress getSocketAddress(String nodeId) {
+    private SocketAddress getSocketAddress(String nodeId) {
 
         for (RedisClusterNode partition : partitions) {
             if (partition.getNodeId().equals(nodeId)) {
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
index f6285ca873..fc780ba853 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.cluster;
 
 import java.io.Closeable;
+import java.util.concurrent.CompletableFuture;
 
 import io.lettuce.core.ReadFrom;
 import io.lettuce.core.RedisException;
@@ -73,6 +74,13 @@ interface ClusterConnectionProvider extends Closeable {
     @Override
     void close();
 
+    /**
+     * Close the connections and free all resources asynchronously.
+     * 
+     * @since 5.1
+     */
+    CompletableFuture<Void> closeAsync();
+
     /**
      * Reset the writer state. Queued commands will be canceled and the internal state will be reset. This is useful when the
      * internal state machine gets out of sync with the connection.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index bbe18836b0..78d5f45dfc 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -324,16 +324,30 @@ public void close() {
             return;
         }
 
+        closeAsync().join();
+    }
+
+    @Override
+    public CompletableFuture<Void> closeAsync() {
+
+        if (closed) {
+            return CompletableFuture.completedFuture(null);
+        }
+
         closed = true;
 
+        List<CompletableFuture<Void>> futures = new ArrayList<>();
+
         if (defaultWriter != null) {
-            defaultWriter.close();
+            futures.add(defaultWriter.closeAsync());
         }
 
         if (clusterConnectionProvider != null) {
-            clusterConnectionProvider.close();
+            futures.add(clusterConnectionProvider.closeAsync());
             clusterConnectionProvider = null;
         }
+
+        return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
index 187eaacf98..792171c7a9 100644
--- a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
@@ -389,10 +389,15 @@ protected RedisClusterNode getPartition(String host, int port) {
 
     @Override
     public void close() {
+        closeAsync().join();
+    }
+
+    @Override
+    public CompletableFuture<Void> closeAsync() {
 
         resetFastConnectionCache();
 
-        connectionProvider.close();
+        return connectionProvider.closeAsync();
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index f5045bdd0f..3e6eb30f68 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -19,6 +19,7 @@
 import java.net.SocketAddress;
 import java.net.URI;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -27,6 +28,8 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.api.NodeSelectionSupport;
@@ -42,8 +45,10 @@
 import io.lettuce.core.cluster.topology.TopologyComparators;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceLists;
+import io.lettuce.core.models.command.CommandDetailParser;
 import io.lettuce.core.output.KeyValueStreamingChannel;
 import io.lettuce.core.protocol.CommandExpiryWriter;
 import io.lettuce.core.protocol.CommandHandler;
@@ -337,7 +342,38 @@ public StatefulRedisClusterConnection<String, String> connect() {
      */
     @SuppressWarnings("unchecked")
     public <K, V> StatefulRedisClusterConnection<K, V> connect(RedisCodec<K, V> codec) {
-        return connectClusterImpl(codec);
+
+        if (partitions == null) {
+            initializePartitions();
+        }
+
+        return getConnection(connectAsync(codec));
+    }
+
+    /**
+     * Connect asynchronously to a Redis Cluster. Use the supplied {@link RedisCodec codec} to encode/decode keys and values.
+     * Connecting asynchronously requires an initialized topology. Call {@link #getPartitions()} first, otherwise the connect
+     * will fail with a{@link IllegalStateException}.
+     * <p>
+     * What to expect from this connection:
+     * </p>
+     * <ul>
+     * <li>A <i>default</i> connection is created to the node with the lowest latency</li>
+     * <li>Keyless commands are send to the default connection</li>
+     * <li>Single-key keyspace commands are routed to the appropriate node</li>
+     * <li>Multi-key keyspace commands require the same slot-hash and are routed to the appropriate node</li>
+     * <li>Pub/sub commands are sent to the node that handles the slot derived from the pub/sub channel</li>
+     * </ul>
+     *
+     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
+     * @param <K> Key type
+     * @param <V> Value type
+     * @return a {@link CompletableFuture} that is notified with the connection progress.
+     * @since 5.1
+     */
+    @SuppressWarnings("unchecked")
+    public <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectAsync(RedisCodec<K, V> codec) {
+        return connectClusterAsync(codec);
     }
 
     /**
@@ -380,11 +416,42 @@ public StatefulRedisClusterPubSubConnection<String, String> connectPubSub() {
      */
     @SuppressWarnings("unchecked")
     public <K, V> StatefulRedisClusterPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec) {
-        return connectClusterPubSubImpl(codec);
+
+        if (partitions == null) {
+            initializePartitions();
+        }
+
+        return getConnection(connectPubSubAsync(codec));
     }
 
-    protected StatefulRedisConnection<String, String> connectToNode(final SocketAddress socketAddress) {
-        return connectToNode(newStringStringCodec(), socketAddress.toString(), null, () -> socketAddress);
+    /**
+     * Connect asynchronously to a Redis Cluster using pub/sub connections. Use the supplied {@link RedisCodec codec} to
+     * encode/decode keys and values. Connecting asynchronously requires an initialized topology. Call {@link #getPartitions()}
+     * first, otherwise the connect will fail with a{@link IllegalStateException}.
+     * <p>
+     * What to expect from this connection:
+     * </p>
+     * <ul>
+     * <li>A <i>default</i> connection is created to the node with the least number of clients</li>
+     * <li>Pub/sub commands are sent to the node with the least number of clients</li>
+     * <li>Keyless commands are send to the default connection</li>
+     * <li>Single-key keyspace commands are routed to the appropriate node</li>
+     * <li>Multi-key keyspace commands require the same slot-hash and are routed to the appropriate node</li>
+     * </ul>
+     *
+     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
+     * @param <K> Key type
+     * @param <V> Value type
+     * @return a {@link CompletableFuture} that is notified with the connection progress.
+     * @since 5.1
+     */
+    @SuppressWarnings("unchecked")
+    public <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> connectPubSubAsync(RedisCodec<K, V> codec) {
+        return connectClusterPubSubAsync(codec);
+    }
+
+    StatefulRedisConnection<String, String> connectToNode(SocketAddress socketAddress) {
+        return connectToNode(newStringStringCodec(), socketAddress.toString(), null, Mono.just(socketAddress));
     }
 
     /**
@@ -399,7 +466,7 @@ protected StatefulRedisConnection<String, String> connectToNode(final SocketAddr
      * @return A new connection
      */
     <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, String nodeId, RedisChannelWriter clusterWriter,
-            final Supplier<SocketAddress> socketAddressSupplier) {
+            Mono<SocketAddress> socketAddressSupplier) {
         return getConnection(connectToNodeAsync(codec, nodeId, clusterWriter, socketAddressSupplier));
     }
 
@@ -415,16 +482,12 @@ <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, Strin
      * @return A new connection
      */
     <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisCodec<K, V> codec, String nodeId,
-            RedisChannelWriter clusterWriter, final Supplier<SocketAddress> socketAddressSupplier) {
+            RedisChannelWriter clusterWriter, Mono<SocketAddress> socketAddressSupplier) {
 
         assertNotNull(codec);
         assertNotEmpty(initialUris);
         LettuceAssert.notNull(socketAddressSupplier, "SocketAddressSupplier must not be null");
 
-        SocketAddress socketAddress = socketAddressSupplier.get();
-
-        logger.debug(String.format("connectToNodeAsync(%s at %s)", nodeId, socketAddress));
-
         ClusterNodeEndpoint endpoint = new ClusterNodeEndpoint(clientOptions, getResources(), clusterWriter);
 
         RedisChannelWriter writer = endpoint;
@@ -445,21 +508,6 @@ <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisC
         });
     }
 
-    /**
-     * Create a pub/sub connection to a redis socket address.
-     *
-     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
-     * @param nodeId the nodeId
-     * @param socketAddressSupplier supplier for the socket address
-     * @param <K> Key type
-     * @param <V> Value type
-     * @return A new connection
-     */
-    <K, V> StatefulRedisPubSubConnection<K, V> connectPubSubToNode(RedisCodec<K, V> codec, String nodeId,
-            Supplier<SocketAddress> socketAddressSupplier) {
-        return getConnection(connectPubSubToNodeAsync(codec, nodeId, socketAddressSupplier));
-    }
-
     /**
      * Create a pub/sub connection to a redis socket address.
      *
@@ -471,7 +519,7 @@ <K, V> StatefulRedisPubSubConnection<K, V> connectPubSubToNode(RedisCodec<K, V>
      * @return A new connection
      */
     <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNodeAsync(RedisCodec<K, V> codec,
-            String nodeId, Supplier<SocketAddress> socketAddressSupplier) {
+            String nodeId, Mono<SocketAddress> socketAddressSupplier) {
 
         assertNotNull(codec);
         assertNotEmpty(initialUris);
@@ -509,17 +557,18 @@ <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNode
      * @param <V> Value type
      * @return a new connection
      */
-    <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K, V> codec) {
+    private <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectClusterAsync(RedisCodec<K, V> codec) {
 
         if (partitions == null) {
-            initializePartitions();
+            return Futures.failed(new IllegalStateException(
+                    "Partitions not initialized. Initialize via RedisClusterClient.getPartitions()."));
         }
 
         activateTopologyRefreshIfNeeded();
 
         logger.debug("connectCluster(" + initialUris + ")");
 
-        Supplier<SocketAddress> socketAddressSupplier = getSocketAddressSupplier(TopologyComparators::sortByClientCount);
+        Mono<SocketAddress> socketAddressSupplier = getSocketAddressSupplier(TopologyComparators::sortByClientCount);
 
         DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
         RedisChannelWriter writer = endpoint;
@@ -541,33 +590,33 @@ <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K,
         connection.setReadFrom(ReadFrom.MASTER);
         connection.setPartitions(partitions);
 
-        boolean connected = false;
-        RedisException causingException = null;
-        int connectionAttempts = Math.max(1, partitions.size());
+        Supplier<CommandHandler> commandHandlerSupplier = () -> new CommandHandler(clientOptions, clientResources, endpoint);
 
-        for (int i = 0; i < connectionAttempts; i++) {
-            try {
-                connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier, () -> new CommandHandler(
-                        clientOptions, clientResources, endpoint));
-                connection.inspectRedisState();
-                connected = true;
-                break;
-            } catch (RedisException e) {
-                logger.warn(e.getMessage());
-                causingException = e;
-            }
-        }
+        Mono<StatefulRedisClusterConnectionImpl<K, V>> connectionMono = Mono.defer(() -> connect(socketAddressSupplier,
+                endpoint, connection, commandHandlerSupplier));
 
-        if (!connected) {
-            connection.close();
-            if (causingException != null) {
-                throw causingException;
-            }
+        for (int i = 1; i < getConnectionAttempts(); i++) {
+            connectionMono = connectionMono.onErrorResume(t -> connect(socketAddressSupplier, endpoint, connection,
+                    commandHandlerSupplier));
         }
 
-        connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider);
+        return connectionMono
+                .flatMap(c -> c.reactive().command().collectList() //
+                        .map(CommandDetailParser::parse) //
+                        .doOnNext(detail -> c.setState(new RedisState(detail))) //
+                        .then(Mono.just(c)))
+                .doOnNext(
+                        c -> connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider))
+                .map(it -> (StatefulRedisClusterConnection<K, V>) it).toFuture();
+    }
+
+    private <T, K, V> Mono<T> connect(Mono<SocketAddress> socketAddressSupplier, DefaultEndpoint endpoint,
+            RedisChannelHandler<K, V> connection, Supplier<CommandHandler> commandHandlerSupplier) {
+
+        ConnectionFuture<T> future = connectStatefulAsync(connection, endpoint, getFirstUri(), socketAddressSupplier,
+                commandHandlerSupplier);
 
-        return connection;
+        return Mono.fromCompletionStage(future).doOnError(t -> logger.warn(t.getMessage()));
     }
 
     /**
@@ -578,17 +627,19 @@ <K, V> StatefulRedisClusterConnectionImpl<K, V> connectClusterImpl(RedisCodec<K,
      * @param <V> Value type
      * @return a new connection
      */
-    <K, V> StatefulRedisClusterPubSubConnection<K, V> connectClusterPubSubImpl(RedisCodec<K, V> codec) {
+    private <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> connectClusterPubSubAsync(
+            RedisCodec<K, V> codec) {
 
         if (partitions == null) {
-            initializePartitions();
+            return Futures.failed(new IllegalStateException(
+                    "Partitions not initialized. Initialize via RedisClusterClient.getPartitions()."));
         }
 
         activateTopologyRefreshIfNeeded();
 
         logger.debug("connectClusterPubSub(" + initialUris + ")");
 
-        Supplier<SocketAddress> socketAddressSupplier = getSocketAddressSupplier(TopologyComparators::sortByClientCount);
+        Mono<SocketAddress> socketAddressSupplier = getSocketAddressSupplier(TopologyComparators::sortByClientCount);
 
         PubSubClusterEndpoint<K, V> endpoint = new PubSubClusterEndpoint<K, V>(clientOptions);
 
@@ -607,58 +658,31 @@ <K, V> StatefulRedisClusterPubSubConnection<K, V> connectClusterPubSubImpl(Redis
                 clusterWriter, codec, connection.getUpstreamListener());
 
         clusterWriter.setClusterConnectionProvider(pooledClusterConnectionProvider);
-
         connection.setPartitions(partitions);
 
-        boolean connected = false;
-        RedisException causingException = null;
-        int connectionAttempts = Math.max(1, partitions.size());
+        Supplier<CommandHandler> commandHandlerSupplier = () -> new PubSubCommandHandler<>(clientOptions, clientResources,
+                codec, endpoint);
 
-        for (int i = 0; i < connectionAttempts; i++) {
-            try {
-                connectStateful(connection, endpoint, getFirstUri(), socketAddressSupplier, () -> new PubSubCommandHandler<>(
-                        clientOptions, clientResources, codec, endpoint));
-                connection.inspectRedisState();
-                connected = true;
-                break;
-            } catch (RedisException e) {
-                logger.warn(e.getMessage());
-                causingException = e;
-            }
-        }
+        Mono<StatefulRedisClusterPubSubConnectionImpl<K, V>> connectionMono = Mono.defer(() -> connect(socketAddressSupplier,
+                endpoint, connection, commandHandlerSupplier));
 
-        if (!connected) {
-            connection.close();
-            if (causingException != null) {
-                throw causingException;
-            }
+        for (int i = 1; i < getConnectionAttempts(); i++) {
+            connectionMono = connectionMono.onErrorResume(t -> connect(socketAddressSupplier, endpoint, connection,
+                    commandHandlerSupplier));
         }
 
-        connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider);
-
-        return connection;
-    }
-
-    /**
-     * Connect to a endpoint provided by {@code socketAddressSupplier} using connection settings (authentication, SSL) from
-     * {@code connectionSettings}.
-     */
-    private <K, V> void connectStateful(StatefulRedisConnectionImpl<K, V> connection, DefaultEndpoint endpoint,
-            RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier,
-            Supplier<CommandHandler> commandHandlerSupplier) {
-        getConnection(connectStatefulAsync(connection, endpoint, connectionSettings, socketAddressSupplier,
-                commandHandlerSupplier));
+        return connectionMono
+                .flatMap(c -> c.reactive().command().collectList() //
+                        .map(CommandDetailParser::parse) //
+                        .doOnNext(detail -> c.setState(new RedisState(detail))) //
+                        .then(Mono.just(c)))
+                .doOnNext(
+                        c -> connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider))
+                .map(it -> (StatefulRedisClusterPubSubConnection<K, V>) it).toFuture();
     }
 
-    /**
-     * Connect to a endpoint provided by {@code socketAddressSupplier} using connection settings (authentication, SSL) from
-     * {@code connectionSettings}.
-     */
-    private <K, V> void connectStateful(StatefulRedisClusterConnectionImpl<K, V> connection, DefaultEndpoint endpoint,
-            RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier,
-            Supplier<CommandHandler> commandHandlerSupplier) {
-        getConnection(connectStatefulAsync(connection, endpoint, connectionSettings, socketAddressSupplier,
-                commandHandlerSupplier));
+    private int getConnectionAttempts() {
+        return Math.max(1, partitions.size());
     }
 
     /**
@@ -666,7 +690,7 @@ private <K, V> void connectStateful(StatefulRedisClusterConnectionImpl<K, V> con
      * options.
      */
     private <K, V, T extends RedisChannelHandler<K, V>, S> ConnectionFuture<S> connectStatefulAsync(T connection,
-            DefaultEndpoint endpoint, RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier,
+            DefaultEndpoint endpoint, RedisURI connectionSettings, Mono<SocketAddress> socketAddressSupplier,
             Supplier<CommandHandler> commandHandlerSupplier) {
 
         ConnectionBuilder connectionBuilder = createConnectionBuilder(connection, endpoint, connectionSettings,
@@ -721,7 +745,7 @@ private boolean hasPassword(RedisURI connectionSettings) {
     }
 
     private <K, V> ConnectionBuilder createConnectionBuilder(RedisChannelHandler<K, V> connection, DefaultEndpoint endpoint,
-            RedisURI connectionSettings, Supplier<SocketAddress> socketAddressSupplier,
+            RedisURI connectionSettings, Mono<SocketAddress> socketAddressSupplier,
             Supplier<CommandHandler> commandHandlerSupplier) {
 
         ConnectionBuilder connectionBuilder;
@@ -943,21 +967,26 @@ protected RedisURI getFirstUri() {
      *        parameter but create a new collection with the desired order, must not be {@literal null}.
      * @return {@link Supplier} for {@link SocketAddress connection points}.
      */
-    protected Supplier<SocketAddress> getSocketAddressSupplier(Function<Partitions, Collection<RedisClusterNode>> sortFunction) {
+    protected Mono<SocketAddress> getSocketAddressSupplier(Function<Partitions, Collection<RedisClusterNode>> sortFunction) {
 
         LettuceAssert.notNull(sortFunction, "Sort function must not be null");
 
         final RoundRobinSocketAddressSupplier socketAddressSupplier = new RoundRobinSocketAddressSupplier(partitions,
                 sortFunction, clientResources);
-        return () -> {
+
+        return Mono.defer(() -> {
+
             if (partitions.isEmpty()) {
-                SocketAddress socketAddress = SocketAddressResolver.resolve(getFirstUri(), clientResources.dnsResolver());
-                logger.debug("Resolved SocketAddress {} using {}", socketAddress, getFirstUri());
-                return socketAddress;
+                return Mono.fromCallable(() -> {
+                    SocketAddress socketAddress = SocketAddressResolver.resolve(getFirstUri(), clientResources.dnsResolver());
+                    logger.debug("Resolved SocketAddress {} using {}", socketAddress, getFirstUri());
+                    return socketAddress;
+
+                }).subscribeOn(Schedulers.fromExecutor(clientResources.eventExecutorGroup()));
             }
 
-            return socketAddressSupplier.get();
-        };
+            return Mono.fromCallable(socketAddressSupplier::get);
+        });
     }
 
     /**
@@ -1089,13 +1118,13 @@ private class NodeConnectionFactoryImpl implements NodeConnectionFactory {
 
         @Override
         public <K, V> StatefulRedisConnection<K, V> connectToNode(RedisCodec<K, V> codec, SocketAddress socketAddress) {
-            return RedisClusterClient.this.connectToNode(codec, socketAddress.toString(), null, () -> socketAddress);
+            return RedisClusterClient.this.connectToNode(codec, socketAddress.toString(), null, Mono.just(socketAddress));
         }
 
         @Override
         public <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisCodec<K, V> codec,
                 SocketAddress socketAddress) {
-            return RedisClusterClient.this.connectToNodeAsync(codec, socketAddress.toString(), null, () -> socketAddress);
+            return RedisClusterClient.this.connectToNodeAsync(codec, socketAddress.toString(), null, Mono.just(socketAddress));
         }
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
index e45b449a85..6eb7a341c2 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
@@ -42,7 +42,6 @@
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.models.command.CommandDetailParser;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
 
@@ -109,14 +108,14 @@ public RedisAdvancedClusterReactiveCommands<K, V> reactive() {
         return reactive;
     }
 
-    void inspectRedisState() {
-        this.state = new RedisState(CommandDetailParser.parse(sync().command()));
-    }
-
     RedisState getState() {
         return state;
     }
 
+    void setState(RedisState state) {
+        this.state = state;
+    }
+
     private RedisURI lookup(String nodeId) {
 
         for (RedisClusterNode partition : partitions) {
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
index 903d079269..cc1dd0480b 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
@@ -34,7 +34,6 @@
 import io.lettuce.core.cluster.pubsub.api.sync.PubSubNodeSelection;
 import io.lettuce.core.cluster.pubsub.api.sync.RedisClusterPubSubCommands;
 import io.lettuce.core.codec.RedisCodec;
-import io.lettuce.core.models.command.CommandDetailParser;
 import io.lettuce.core.pubsub.RedisPubSubAsyncCommandsImpl;
 import io.lettuce.core.pubsub.RedisPubSubReactiveCommandsImpl;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
@@ -50,7 +49,7 @@ class StatefulRedisClusterPubSubConnectionImpl<K, V> extends StatefulRedisPubSub
 
     private final PubSubClusterEndpoint<K, V> endpoint;
     private volatile Partitions partitions;
-    private volatile RedisState redisState;
+    private volatile RedisState state;
 
     /**
      * Initialize a new connection.
@@ -105,12 +104,12 @@ protected RedisPubSubReactiveCommandsImpl<K, V> newRedisReactiveCommandsImpl() {
         return new RedisClusterPubSubReactiveCommandsImpl<K, V>(this, codec);
     }
 
-    void inspectRedisState() {
-        this.redisState = new RedisState(CommandDetailParser.parse(sync().command()));
+    RedisState getState() {
+        return state;
     }
 
-    RedisState getState() {
-        return redisState;
+    void setState(RedisState state) {
+        this.state = state;
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
index 4a3488985c..33c2830481 100644
--- a/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
@@ -16,6 +16,8 @@
 package io.lettuce.core.cluster;
 
 import java.net.SocketAddress;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
@@ -25,6 +27,7 @@
 import java.util.function.Consumer;
 
 import io.lettuce.core.ConnectionFuture;
+import io.lettuce.core.RedisChannelHandler;
 import io.lettuce.core.RedisConnectionException;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.api.StatefulConnection;
@@ -137,12 +140,27 @@ public int getConnectionCount() {
      * Close all connections. Pending connections are closed using future chaining.
      */
     public void close() {
+        closeAsync().join();
+    }
+
+    /**
+     * Close all connections. Pending connections are closed using future chaining.
+     */
+    @SuppressWarnings("unchecked")
+    public CompletableFuture<Void> closeAsync() {
 
         this.closed = true;
+
+        List<CompletableFuture<Void>> futures = new ArrayList<>();
+
         forEach((connectionKey, connection) -> {
-            connection.close();
+
+            RedisChannelHandler handler = (RedisChannelHandler) connection;
+            futures.add(handler.closeAsync());
             connections.remove(connectionKey);
         });
+
+        return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/internal/DefaultMethods.java b/src/main/java/io/lettuce/core/internal/DefaultMethods.java
index ac4a57f113..0b68841a64 100644
--- a/src/main/java/io/lettuce/core/internal/DefaultMethods.java
+++ b/src/main/java/io/lettuce/core/internal/DefaultMethods.java
@@ -25,8 +25,8 @@
 import java.util.Optional;
 
 /**
- * Collection of utility methods to lookup {@link MethodHandle}s for default interface {@link Method}s.This class is part of the
- * internal API and may change without further notice.
+ * Collection of utility methods to lookup {@link MethodHandle}s for default interface {@link Method}s. This class is part of
+ * the internal API and may change without further notice.
  *
  * @author Mark Paluch
  * @since 4.4
diff --git a/src/main/java/io/lettuce/core/internal/Futures.java b/src/main/java/io/lettuce/core/internal/Futures.java
new file mode 100644
index 0000000000..a8a58fa6f0
--- /dev/null
+++ b/src/main/java/io/lettuce/core/internal/Futures.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.internal;
+
+import java.util.concurrent.CompletableFuture;
+
+import io.netty.channel.ChannelFuture;
+
+/**
+ * Utility methods for {@link java.util.concurrent.Future} handling. This class is part of the internal API and may change
+ * without further notice.
+ * 
+ * @author Mark Paluch
+ * @since 5.1
+ */
+public abstract class Futures {
+
+    private Futures() {
+        // no instances allowed
+    }
+
+    /**
+     * Create a {@link CompletableFuture} that is completed exceptionally with {@code throwable}.
+     * 
+     * @param throwable must not be {@literal null}.
+     * @return the exceptionally completed {@link CompletableFuture}.
+     */
+    public static <T> CompletableFuture<T> failed(Throwable throwable) {
+
+        LettuceAssert.notNull(throwable, "Throwable must not be null");
+
+        CompletableFuture<T> future = new CompletableFuture<>();
+        future.completeExceptionally(throwable);
+
+        return future;
+    }
+
+    /**
+     * Adapt Netty's {@link ChannelFuture} emitting a {@link Void} result.
+     * 
+     * @param future the {@link ChannelFuture} to adapt.
+     * @return the {@link CompletableFuture}.
+     */
+    public static CompletableFuture<Void> from(ChannelFuture future) {
+
+        LettuceAssert.notNull(future, "ChannelFuture must not be null");
+
+        CompletableFuture<Void> result = new CompletableFuture<>();
+        adapt(future, result);
+
+        return result;
+    }
+
+    /**
+     * Adapt Netty's {@link ChannelFuture} emitting a {@link Void} result into a {@link CompletableFuture}.
+     * 
+     * @param future
+     * @return the {@link CompletableFuture}.
+     */
+    public static void adapt(ChannelFuture future, CompletableFuture<Void> target) {
+
+        future.addListener(f -> {
+            if (f.isSuccess()) {
+                target.complete(null);
+            } else {
+                target.completeExceptionally(f.cause());
+            }
+        });
+
+        if (future.isSuccess()) {
+            target.complete(null);
+        } else if (future.isCancelled()) {
+            target.cancel(false);
+        } else if (future.isDone() && !future.isSuccess()) {
+            target.completeExceptionally(future.cause());
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index f30a18ffbc..132cab9e0d 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -166,8 +166,6 @@ private static <K, V> StatefulRedisMasterSlaveConnection<K, V> connectSentinel(R
                 codec, redisURI.getTimeout());
         connection.setOptions(redisClient.getOptions());
 
-        connection.setOptions(redisClient.getOptions());
-
         Runnable runnable = () -> {
             try {
 
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
index d7a63d98d4..1dc787389f 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.masterslave;
 
 import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
 
 import io.lettuce.core.ReadFrom;
 import io.lettuce.core.RedisChannelWriter;
@@ -116,17 +117,30 @@ private static Intent getIntent(ProtocolKeyword type) {
 
     @Override
     public void close() {
+        closeAsync().join();
+    }
+
+    @Override
+    public CompletableFuture<Void> closeAsync() {
 
         if (closed) {
-            return;
+            return CompletableFuture.completedFuture(null);
         }
 
         closed = true;
 
+        CompletableFuture<Void> future = null;
+
         if (masterSlaveConnectionProvider != null) {
-            masterSlaveConnectionProvider.close();
+            future = masterSlaveConnectionProvider.closeAsync();
             masterSlaveConnectionProvider = null;
         }
+
+        if (future == null) {
+            future = CompletableFuture.completedFuture(null);
+        }
+
+        return future;
     }
 
     public MasterSlaveConnectionProvider<K, V> getMasterSlaveConnectionProvider() {
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
index e46245ca28..317a1de7b1 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
@@ -18,13 +18,11 @@
 import static io.lettuce.core.masterslave.MasterSlaveUtils.findNodeByHostAndPort;
 
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
-import io.lettuce.core.ReadFrom;
-import io.lettuce.core.RedisClient;
-import io.lettuce.core.RedisException;
-import io.lettuce.core.RedisURI;
+import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.models.partitions.Partitions;
@@ -70,9 +68,9 @@ public class MasterSlaveConnectionProvider<K, V> {
 
     /**
      * Retrieve a {@link StatefulRedisConnection} by the intent.
-     * {@link io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent#WRITE} intentions use the master
-     * connection, {@link io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent#READ} intentions lookup one or
-     * more read candidates using the {@link ReadFrom} setting.
+     * {@link io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent#WRITE} intentions use the master connection,
+     * {@link io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent#READ} intentions lookup one or more read
+     * candidates using the {@link ReadFrom} setting.
      *
      * @param intent command intent
      * @return the connection.
@@ -119,9 +117,8 @@ public Iterator<RedisNodeDescription> iterator() {
     }
 
     protected StatefulRedisConnection<K, V> getConnection(RedisNodeDescription redisNodeDescription) {
-        return connections.computeIfAbsent(
-                new ConnectionKey(redisNodeDescription.getUri().getHost(), redisNodeDescription.getUri().getPort()),
-                connectionFactory);
+        return connections.computeIfAbsent(new ConnectionKey(redisNodeDescription.getUri().getHost(), redisNodeDescription
+                .getUri().getPort()), connectionFactory);
     }
 
     /**
@@ -143,8 +140,7 @@ private Set<ConnectionKey> getStaleConnectionKeys() {
 
         for (ConnectionKey connectionKey : map.keySet()) {
 
-            if (connectionKey.host != null
-                    && findNodeByHostAndPort(knownNodes, connectionKey.host, connectionKey.port) != null) {
+            if (connectionKey.host != null && findNodeByHostAndPort(knownNodes, connectionKey.host, connectionKey.port) != null) {
                 continue;
             }
             stale.add(connectionKey);
@@ -179,10 +175,28 @@ public void reset() {
      * Close all connections.
      */
     public void close() {
+        closeAsync().join();
+    }
+
+    /**
+     * Close all connections asynchronously.
+     * 
+     * @since 5.1
+     */
+    @SuppressWarnings("unchecked")
+    public CompletableFuture<Void> closeAsync() {
 
         Collection<StatefulRedisConnection<K, V>> connections = allConnections();
         this.connections.clear();
-        connections.forEach(StatefulRedisConnection::close);
+
+        List<CompletableFuture<Void>> futures = new ArrayList<>();
+        connections.forEach(c -> {
+
+            RedisChannelHandler handler = (RedisChannelHandler) c;
+            futures.add(handler.closeAsync());
+        });
+
+        return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
     }
 
     public void flushCommands() {
@@ -191,14 +205,12 @@ public void flushCommands() {
 
     public void setAutoFlushCommands(boolean autoFlushCommands) {
         synchronized (stateLock) {
+            allConnections().forEach(connection -> connection.setAutoFlushCommands(autoFlushCommands));
         }
-        allConnections().forEach(connection -> connection.setAutoFlushCommands(autoFlushCommands));
     }
 
     protected Collection<StatefulRedisConnection<K, V>> allConnections() {
-
-        Set<StatefulRedisConnection<K, V>> connections = LettuceSets.newHashSet(this.connections.values());
-        return (Collection) connections;
+        return LettuceSets.newHashSet(this.connections.values());
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
index 3d6e39f9df..2c6c8d8cf8 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
@@ -50,7 +50,7 @@ class MasterSlaveTopologyRefresh {
 
     public MasterSlaveTopologyRefresh(RedisClient client, TopologyProvider topologyProvider) {
 
-        this.nodeConnectionFactory = new ReflectiveNodeConnectionFactory(client);
+        this.nodeConnectionFactory = new RedisClientNodeConnectionFactory(client);
         this.topologyProvider = topologyProvider;
     }
 
diff --git a/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java b/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java
new file mode 100644
index 0000000000..fb15432471
--- /dev/null
+++ b/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2016-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterslave;
+
+import java.util.concurrent.CompletableFuture;
+
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.RedisCodec;
+
+/**
+ * {@link NodeConnectionFactory} implementation that on {@link RedisClient}.
+ *
+ * @author Mark Paluch
+ */
+class RedisClientNodeConnectionFactory implements NodeConnectionFactory {
+
+    private final RedisClient client;
+
+    RedisClientNodeConnectionFactory(RedisClient client) {
+        this.client = client;
+    }
+
+    @Override
+    public <K, V> CompletableFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisCodec<K, V> codec, RedisURI redisURI) {
+        return client.connectAsync(codec, redisURI).toCompletableFuture();
+    }
+}
diff --git a/src/main/java/io/lettuce/core/masterslave/ReflectiveNodeConnectionFactory.java b/src/main/java/io/lettuce/core/masterslave/ReflectiveNodeConnectionFactory.java
deleted file mode 100644
index 570380e3ee..0000000000
--- a/src/main/java/io/lettuce/core/masterslave/ReflectiveNodeConnectionFactory.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.masterslave;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.concurrent.CompletableFuture;
-
-import io.lettuce.core.RedisClient;
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.StatefulRedisConnection;
-import io.lettuce.core.codec.RedisCodec;
-
-/**
- * {@link NodeConnectionFactory} implementation that operates via reflection on {@link RedisClient}. Using reflection does not
- * require utility methods to leak on the API.
- *
- * @author Mark Paluch
- */
-@SuppressWarnings("unchecked")
-class ReflectiveNodeConnectionFactory implements NodeConnectionFactory {
-
-    private final Method connectToNodeAsync;
-    private final RedisClient client;
-
-    protected ReflectiveNodeConnectionFactory(RedisClient client) {
-
-        this.client = client;
-
-        try {
-            connectToNodeAsync = RedisClient.class.getDeclaredMethod("connectStandaloneAsync", RedisCodec.class,
-                    RedisURI.class);
-            connectToNodeAsync.setAccessible(true);
-        } catch (NoSuchMethodException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    @Override
-    public <K, V> CompletableFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisCodec<K, V> codec,
-            RedisURI redisURI) {
-        try {
-            return (CompletableFuture<StatefulRedisConnection<K, V>>) connectToNodeAsync.invoke(client, codec, redisURI);
-        } catch (IllegalAccessException e) {
-            throw new IllegalStateException(e);
-        } catch (InvocationTargetException e) {
-
-            if (e.getCause() instanceof RuntimeException) {
-                throw (RuntimeException) e.getCause();
-            }
-            throw new IllegalStateException(e.getCause());
-        }
-    }
-}
diff --git a/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java b/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
index 2b4aea36bd..be68194baa 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
@@ -19,6 +19,7 @@
 
 import java.time.Duration;
 import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
@@ -128,6 +129,11 @@ public void close() {
         writer.close();
     }
 
+    @Override
+    public CompletableFuture<Void> closeAsync() {
+        return writer.closeAsync();
+    }
+
     @Override
     public void reset() {
         writer.reset();
diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
index e746e4b9ac..a6b44ad569 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
@@ -16,9 +16,10 @@
 package io.lettuce.core.protocol;
 
 import java.net.SocketAddress;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
 
+import reactor.core.publisher.Mono;
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.ConnectionEvents;
 import io.lettuce.core.internal.LettuceAssert;
@@ -77,7 +78,7 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
      * @param connectionFacade the connection facade, must not be {@literal null}
      */
     public ConnectionWatchdog(Delay reconnectDelay, ClientOptions clientOptions, Bootstrap bootstrap, Timer timer,
-            EventExecutorGroup reconnectWorkers, Supplier<SocketAddress> socketAddressSupplier,
+            EventExecutorGroup reconnectWorkers, Mono<SocketAddress> socketAddressSupplier,
             ReconnectionListener reconnectionListener, ConnectionFacade connectionFacade) {
 
         LettuceAssert.notNull(reconnectDelay, "Delay must not be null");
@@ -85,6 +86,7 @@ public ConnectionWatchdog(Delay reconnectDelay, ClientOptions clientOptions, Boo
         LettuceAssert.notNull(bootstrap, "Bootstrap must not be null");
         LettuceAssert.notNull(timer, "Timer must not be null");
         LettuceAssert.notNull(reconnectWorkers, "ReconnectWorkers must not be null");
+        LettuceAssert.notNull(socketAddressSupplier, "SocketAddressSupplier must not be null");
         LettuceAssert.notNull(reconnectionListener, "ReconnectionListener must not be null");
         LettuceAssert.notNull(connectionFacade, "ConnectionFacade must not be null");
 
@@ -94,22 +96,20 @@ public ConnectionWatchdog(Delay reconnectDelay, ClientOptions clientOptions, Boo
         this.reconnectWorkers = reconnectWorkers;
         this.reconnectionListener = reconnectionListener;
 
-        Supplier<SocketAddress> wrappedSocketAddressSupplier = new Supplier<SocketAddress>() {
-            @Override
-            public SocketAddress get() {
-
-                if (socketAddressSupplier != null) {
-                    try {
-                        remoteAddress = socketAddressSupplier.get();
-                    } catch (RuntimeException e) {
-                        logger.warn("Cannot retrieve the current address from socketAddressSupplier: " + e.toString()
-                                + ", reusing old address " + remoteAddress);
-                    }
-                }
+        Mono<SocketAddress> wrappedSocketAddressSupplier = socketAddressSupplier.doOnNext(addr -> remoteAddress = addr)
+                .onErrorResume(
+                        t -> {
+
+                            if (logger.isDebugEnabled()) {
+                                logger.warn("Cannot retrieve current address from socketAddressSupplier: " + t.toString()
+                                        + ", reusing cached address " + remoteAddress, t);
+                            } else {
+                                logger.warn("Cannot retrieve current address from socketAddressSupplier: " + t.toString()
+                                        + ", reusing cached address " + remoteAddress);
+                            }
 
-                return remoteAddress;
-            }
-        };
+                            return Mono.just(remoteAddress);
+                        });
 
         this.reconnectionHandler = new ReconnectionHandler(clientOptions, bootstrap, wrappedSocketAddressSupplier, timer,
                 reconnectWorkers, connectionFacade);
@@ -259,20 +259,18 @@ public void run(int attempt) throws Exception {
             reconnectionListener.onReconnect(new ConnectionEvents.Reconnect(attempt));
             logger.log(infoLevel, "Reconnecting, last destination was {}", remoteAddress);
 
-            ChannelFuture future = reconnectionHandler.reconnect();
+            CompletableFuture<Channel> future = reconnectionHandler.reconnect();
 
-            future.addListener(it -> {
+            future.whenComplete((c, t) -> {
 
-                if (it.isSuccess() || it.cause() == null) {
+                if (c != null && t == null) {
                     return;
                 }
 
-                Throwable throwable = it.cause();
-
-                if (ReconnectionHandler.isExecutionException(throwable)) {
-                    logger.log(warnLevelToUse, "Cannot reconnect: {}", throwable.toString());
+                if (ReconnectionHandler.isExecutionException(t)) {
+                    logger.log(warnLevelToUse, "Cannot reconnect: {}", t.toString());
                 } else {
-                    logger.log(warnLevelToUse, "Cannot reconnect: {}", throwable.toString(), throwable);
+                    logger.log(warnLevelToUse, "Cannot reconnect: {}", t.toString(), t);
                 }
 
                 if (!isReconnectSuspended()) {
@@ -346,8 +344,8 @@ private String logPrefix() {
         }
 
         StringBuilder buffer = new StringBuilder(64);
-        buffer.append('[')
-                .append(ChannelLogDescriptor.logDescriptor(channel)).append(", last known addr=").append(remoteAddress).append(']');
+        buffer.append('[').append(ChannelLogDescriptor.logDescriptor(channel)).append(", last known addr=")
+                .append(remoteAddress).append(']');
         return logPrefix = buffer.toString();
     }
 
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index 993d61a9c5..4989e5a9a6 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -20,12 +20,13 @@
 import java.io.IOException;
 import java.nio.channels.ClosedChannelException;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 
 import io.lettuce.core.*;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceFactories;
 import io.netty.channel.Channel;
@@ -49,6 +50,12 @@ public class DefaultEndpoint implements RedisChannelWriter, Endpoint {
     private static final AtomicIntegerFieldUpdater<DefaultEndpoint> QUEUE_SIZE = AtomicIntegerFieldUpdater.newUpdater(
             DefaultEndpoint.class, "queueSize");
 
+    private static final AtomicIntegerFieldUpdater<DefaultEndpoint> STATUS = AtomicIntegerFieldUpdater.newUpdater(
+            DefaultEndpoint.class, "status");
+
+    private static final int ST_OPEN = 0;
+    private static final int ST_CLOSED = 1;
+
     protected volatile Channel channel;
 
     private final Reliability reliability;
@@ -58,9 +65,9 @@ public class DefaultEndpoint implements RedisChannelWriter, Endpoint {
     private final boolean boundedQueues;
 
     private final long endpointId = ENDPOINT_COUNTER.incrementAndGet();
-    private final AtomicBoolean closed = new AtomicBoolean();
     private final SharedLock sharedLock = new SharedLock();
     private final boolean debugEnabled = logger.isDebugEnabled();
+    private final CompletableFuture<Void> closeFuture = new CompletableFuture<>();
 
     private String logPrefix;
     private boolean autoFlushCommands = true;
@@ -74,6 +81,10 @@ public class DefaultEndpoint implements RedisChannelWriter, Endpoint {
     @SuppressWarnings("unused")
     private volatile int queueSize = 0;
 
+    // access via STATUS
+    @SuppressWarnings("unused")
+    private volatile int status = ST_OPEN;
+
     /**
      * Create a new {@link DefaultEndpoint}.
      *
@@ -476,11 +487,21 @@ public void close() {
             logger.debug("{} close()", logPrefix());
         }
 
+        closeAsync().join();
+    }
+
+    @Override
+    public CompletableFuture<Void> closeAsync() {
+
+        if (debugEnabled) {
+            logger.debug("{} closeAsync()", logPrefix());
+        }
+
         if (isClosed()) {
-            return;
+            return closeFuture;
         }
 
-        if (closed.compareAndSet(false, true)) {
+        if (STATUS.compareAndSet(this, ST_OPEN, ST_CLOSED)) {
 
             if (connectionWatchdog != null) {
                 connectionWatchdog.prepareClose();
@@ -488,15 +509,28 @@ public void close() {
 
             cancelBufferedCommands("Close");
 
-            Channel currentChannel = this.channel;
-            if (currentChannel != null) {
+            Channel channel = getOpenChannel();
 
-                ChannelFuture close = currentChannel.close();
-                if (currentChannel.isOpen()) {
-                    close.syncUninterruptibly();
-                }
+            if (channel != null) {
+                Futures.adapt(channel.close(), closeFuture);
+            } else {
+                closeFuture.complete(null);
             }
         }
+
+        return closeFuture;
+
+    }
+
+    private Channel getOpenChannel() {
+
+        Channel currentChannel = this.channel;
+
+        if (currentChannel != null) {
+            return currentChannel;
+        }
+
+        return null;
     }
 
     /**
@@ -581,7 +615,7 @@ public void notifyDrainQueuedCommands(HasQueuedCommands queuedCommands) {
     }
 
     public boolean isClosed() {
-        return closed.get();
+        return STATUS.get(this) == ST_CLOSED;
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
index 1d9a798025..17cc0bfdc3 100644
--- a/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
@@ -18,12 +18,9 @@
 import java.net.ConnectException;
 import java.net.SocketAddress;
 import java.util.Set;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Supplier;
+import java.util.concurrent.*;
 
+import reactor.core.publisher.Mono;
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.RedisChannelInitializer;
 import io.lettuce.core.RedisCommandTimeoutException;
@@ -51,7 +48,7 @@ class ReconnectionHandler {
 
     private final ClientOptions clientOptions;
     private final Bootstrap bootstrap;
-    private final Supplier<SocketAddress> socketAddressSupplier;
+    private final Mono<SocketAddress> socketAddressSupplier;
     private final Timer timer;
     private final ExecutorService reconnectWorkers;
     private final ConnectionFacade connectionFacade;
@@ -59,10 +56,10 @@ class ReconnectionHandler {
     private TimeUnit timeoutUnit = TimeUnit.SECONDS;
     private long timeout = 60;
 
-    private volatile ChannelFuture currentFuture;
+    private volatile CompletableFuture<Channel> currentFuture;
     private volatile boolean reconnectSuspended;
 
-    ReconnectionHandler(ClientOptions clientOptions, Bootstrap bootstrap, Supplier<SocketAddress> socketAddressSupplier,
+    ReconnectionHandler(ClientOptions clientOptions, Bootstrap bootstrap, Mono<SocketAddress> socketAddressSupplier,
             Timer timer, ExecutorService reconnectWorkers, ConnectionFacade connectionFacade) {
 
         LettuceAssert.notNull(socketAddressSupplier, "SocketAddressSupplier must not be null");
@@ -86,21 +83,47 @@ class ReconnectionHandler {
      *
      * @return reconnect {@link ChannelFuture}.
      */
-    protected ChannelFuture reconnect() {
+    protected CompletableFuture<Channel> reconnect() {
 
-        SocketAddress remoteAddress = socketAddressSupplier.get();
+        CompletableFuture<Channel> future = new CompletableFuture<>();
 
-        logger.debug("Reconnecting to Redis at {}", remoteAddress);
+        socketAddressSupplier.subscribe(remoteAddress -> {
+
+            if (future.isCancelled()) {
+                return;
+            }
+
+            reconnect0(future, remoteAddress);
+
+        }, future::completeExceptionally);
+
+        return this.currentFuture = future;
+    }
+
+    private void reconnect0(CompletableFuture<Channel> result, SocketAddress remoteAddress) {
 
         ChannelFuture connectFuture = bootstrap.connect(remoteAddress);
         ChannelPromise initFuture = connectFuture.channel().newPromise();
 
+        logger.debug("Reconnecting to Redis at {}", remoteAddress);
+
+        result.whenComplete((c, t) -> {
+
+            if (t instanceof CancellationException) {
+                connectFuture.cancel(true);
+                initFuture.cancel(true);
+            }
+        });
+
         initFuture.addListener((ChannelFuture it) -> {
 
             if (it.cause() != null) {
 
                 connectFuture.cancel(true);
                 close(it.channel());
+                result.completeExceptionally(it.cause());
+            } else {
+                result.complete(connectFuture.channel());
             }
         });
 
@@ -113,7 +136,6 @@ protected ChannelFuture reconnect() {
             }
 
             ChannelPipeline pipeline = it.channel().pipeline();
-
             RedisChannelInitializer channelInitializer = pipeline.get(RedisChannelInitializer.class);
 
             if (channelInitializer == null) {
@@ -180,8 +202,6 @@ protected ChannelFuture reconnect() {
         }, this.timeout, timeoutUnit);
 
         initFuture.addListener(it -> timeoutHandle.cancel());
-
-        return this.currentFuture = initFuture;
     }
 
     private void close(Channel channel) {
@@ -208,7 +228,7 @@ void setTimeout(long timeout) {
 
     void prepareClose() {
 
-        ChannelFuture currentFuture = this.currentFuture;
+        CompletableFuture<?> currentFuture = this.currentFuture;
         if (currentFuture != null && !currentFuture.isDone()) {
             currentFuture.cancel(true);
         }
diff --git a/src/test/java/io/lettuce/core/ReactiveConnectionTest.java b/src/test/java/io/lettuce/core/ReactiveConnectionTest.java
index 6addd2b657..2ac3db2b80 100644
--- a/src/test/java/io/lettuce/core/ReactiveConnectionTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveConnectionTest.java
@@ -35,7 +35,6 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
-
 import io.lettuce.Delay;
 import io.lettuce.Wait;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -142,11 +141,15 @@ public void testFluxCancel() throws Exception {
 
     @Test
     public void multiSubscribe() throws Exception {
-        reactive.set(key, "1").subscribe();
+
+        CountDownLatch latch = new CountDownLatch(4);
+        reactive.set(key, "1").subscribe(s -> latch.countDown());
         Mono<Long> incr = reactive.incr(key);
-        incr.subscribe();
-        incr.subscribe();
-        incr.subscribe();
+        incr.subscribe(s -> latch.countDown());
+        incr.subscribe(s -> latch.countDown());
+        incr.subscribe(s -> latch.countDown());
+
+        latch.await();
 
         Wait.untilEquals("4", () -> redis.get(key)).waitOrTimeout();
 
diff --git a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
index f84e0a9a3a..243459bed1 100644
--- a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
@@ -70,7 +70,9 @@ public class PooledClusterConnectionProviderTest {
     @Mock
     RedisChannelWriter writerMock;
 
-    @Mock
+    @Mock(extraInterfaces = StatefulRedisConnection.class)
+    RedisChannelHandler<String, String> channelHandlerMock;
+
     StatefulRedisConnection<String, String> nodeConnectionMock;
 
     @Mock
@@ -87,6 +89,8 @@ public class PooledClusterConnectionProviderTest {
     @Before
     public void before() {
 
+        nodeConnectionMock = (StatefulRedisConnection) channelHandlerMock;
+
         sut = new PooledClusterConnectionProvider<>(clientMock, writerMock, CODEC);
 
         List<Integer> slots1 = IntStream.range(0, 8192).boxed().collect(Collectors.toList());
@@ -259,6 +263,7 @@ public void shouldFailIfAllReadCandidateNodesFail() {
     @Test
     public void shouldCloseConnections() {
 
+        when(channelHandlerMock.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
         when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
                 Futures.createConnectionFuture(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
@@ -267,7 +272,6 @@ public void shouldCloseConnections() {
 
         sut.close();
 
-        verify(nodeConnectionMock).close();
+        verify(channelHandlerMock).closeAsync();
     }
-
 }
diff --git a/src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java b/src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java
index a6baa709cf..062cd41c27 100644
--- a/src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java
@@ -32,6 +32,7 @@
 import org.springframework.util.SocketUtils;
 import org.springframework.util.StopWatch;
 
+import reactor.core.publisher.Mono;
 import io.lettuce.TestClientResources;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -74,7 +75,7 @@ public ConnectionFuture<StatefulRedisConnection<String, String>> apply(Connectio
 
                 ConnectionFuture<StatefulRedisConnection<String, String>> future = redisClient.connectToNodeAsync(
                         StringCodec.UTF8, "", null,
-                        () -> new InetSocketAddress(connectionKey.host, serverSocket.getLocalPort()));
+                        Mono.just(new InetSocketAddress(connectionKey.host, serverSocket.getLocalPort())));
 
                 connectInitiated.countDown();
 
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java
index 4e47dbd5cf..bff47f4520 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java
@@ -23,6 +23,7 @@
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.concurrent.CompletableFuture;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,6 +31,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import io.lettuce.core.RedisChannelHandler;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -50,7 +52,9 @@ public class MasterSlaveConnectionProviderTest {
     @Mock
     RedisClient clientMock;
 
-    @Mock
+    @Mock(extraInterfaces = StatefulRedisConnection.class)
+    RedisChannelHandler<String, String> channelHandlerMock;
+
     StatefulRedisConnection<String, String> nodeConnectionMock;
 
     @Mock
@@ -59,6 +63,7 @@ public class MasterSlaveConnectionProviderTest {
     @Before
     public void before() {
 
+        nodeConnectionMock = (StatefulRedisConnection) channelHandlerMock;
         sut = new MasterSlaveConnectionProvider<>(clientMock, CODEC, RedisURI.create("localhost", 1), Collections.emptyMap());
         sut.setKnownNodes(Arrays.asList(new RedisMasterSlaveNode("localhost", 1, RedisURI.create("localhost", 1),
                 RedisInstance.Role.MASTER)));
@@ -67,6 +72,8 @@ public void before() {
     @Test
     public void shouldCloseConnections() {
 
+        when(channelHandlerMock.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
+
         when(clientMock.connect(eq(CODEC), any())).thenReturn(nodeConnectionMock);
 
         StatefulRedisConnection<String, String> connection = sut.getConnection(MasterSlaveConnectionProvider.Intent.READ);
@@ -74,7 +81,6 @@ public void shouldCloseConnections() {
 
         sut.close();
 
-        verify(nodeConnectionMock).close();
+        verify(channelHandlerMock).closeAsync();
     }
-
 }
diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
index b888a411f9..a5041f758e 100644
--- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
@@ -19,6 +19,7 @@
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -52,6 +53,7 @@
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.resource.ClientResources;
 import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
 import io.netty.channel.DefaultChannelPromise;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -250,6 +252,10 @@ public void writeWithoutAutoReconnectShouldRejectCommandsInDisconnectedState() {
     @Test
     public void closeCleansUpResources() {
 
+        ChannelFuture future = mock(ChannelFuture.class);
+        when(future.isSuccess()).thenReturn(true);
+        when(channel.close()).thenReturn(future);
+
         sut.notifyChannelActive(channel);
         sut.registerConnectionWatchdog(connectionWatchdog);
 
@@ -262,6 +268,10 @@ public void closeCleansUpResources() {
     @Test
     public void closeAllowsOnlyOneCall() {
 
+        ChannelFuture future = mock(ChannelFuture.class);
+        when(future.isSuccess()).thenReturn(true);
+        when(channel.close()).thenReturn(future);
+
         sut.notifyChannelActive(channel);
         sut.registerConnectionWatchdog(connectionWatchdog);
 
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java
index 6b2b1dcefd..2b24ecea60 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,7 +50,7 @@ public static void setupClient() {
     }
 
     @Before
-    public void openConnection() throws Exception {
+    public void openConnection() {
         connection = sentinelClient.connectSentinel();
         sentinel = connection.sync();
         sentinelAsync = connection.async();
@@ -83,14 +83,14 @@ public void testFuture() throws Exception {
     }
 
     @Test
-    public void testStatefulConnection() throws Exception {
+    public void testStatefulConnection() {
 
         StatefulRedisSentinelConnection<String, String> statefulConnection = sentinel.getStatefulConnection();
         assertThat(statefulConnection).isSameAs(statefulConnection.async().getStatefulConnection());
     }
 
     @Test
-    public void testSyncConnection() throws Exception {
+    public void testSyncConnection() {
 
         StatefulRedisSentinelConnection<String, String> statefulConnection = sentinel.getStatefulConnection();
         RedisSentinelCommands<String, String> sync = statefulConnection.sync();
@@ -98,7 +98,7 @@ public void testSyncConnection() throws Exception {
     }
 
     @Test
-    public void testSyncAsyncConversion() throws Exception {
+    public void testSyncAsyncConversion() {
 
         StatefulRedisSentinelConnection<String, String> statefulConnection = sentinel.getStatefulConnection();
         assertThat(statefulConnection.sync().getStatefulConnection()).isSameAs(statefulConnection);
@@ -106,7 +106,7 @@ public void testSyncAsyncConversion() throws Exception {
     }
 
     @Test
-    public void testSyncClose() throws Exception {
+    public void testSyncClose() {
 
         StatefulRedisSentinelConnection<String, String> statefulConnection = sentinel.getStatefulConnection();
         statefulConnection.sync().getStatefulConnection().close();
@@ -118,7 +118,7 @@ public void testSyncClose() throws Exception {
     }
 
     @Test
-    public void testAsyncClose() throws Exception {
+    public void testAsyncClose() {
         StatefulRedisSentinelConnection<String, String> statefulConnection = sentinel.getStatefulConnection();
         statefulConnection.async().getStatefulConnection().close();
 
@@ -129,7 +129,7 @@ public void testAsyncClose() throws Exception {
     }
 
     @Test
-    public void connectToOneNode() throws Exception {
+    public void connectToOneNode() {
         RedisSentinelCommands<String, String> connection = sentinelClient.connectSentinel(
                 RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build()).sync();
         assertThat(connection.ping()).isEqualTo("PONG");
@@ -137,14 +137,14 @@ public void connectToOneNode() throws Exception {
     }
 
     @Test
-    public void connectWithByteCodec() throws Exception {
+    public void connectWithByteCodec() {
         RedisSentinelCommands<byte[], byte[]> connection = sentinelClient.connectSentinel(new ByteArrayCodec()).sync();
         assertThat(connection.master(MASTER_ID.getBytes())).isNotNull();
         connection.getStatefulConnection().close();
     }
 
     @Test
-    public void sentinelConnectionPingBeforeConnectShouldDiscardPassword() throws Exception {
+    public void sentinelConnectionPingBeforeConnectShouldDiscardPassword() {
 
         RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).withPassword("hello-world").build();
 
@@ -159,7 +159,7 @@ public void sentinelConnectionPingBeforeConnectShouldDiscardPassword() throws Ex
     }
 
     @Test
-    public void sentinelConnectionShouldSetClientName() throws Exception {
+    public void sentinelConnectionShouldSetClientName() {
 
         RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).withClientName("my-client").build();
 
@@ -171,7 +171,7 @@ public void sentinelConnectionShouldSetClientName() throws Exception {
     }
 
     @Test
-    public void sentinelManagedConnectionShouldSetClientName() throws Exception {
+    public void sentinelManagedConnectionShouldSetClientName() {
 
         RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).withClientName("my-client").build();
 

From a0f10e6a3fc95fd4a7164241ced3bd7b87a34d84 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 7 Nov 2017 12:07:28 +0100
Subject: [PATCH 346/808] Refactor SynchronizingClusterConnectionProvider to
 AsyncConnectionProvider #642

Extract AsyncConnectionProvider as generic reusable asynchronous connection provider from SynchronizingClusterConnectionProvider. Introduce AsyncCloseable interface declaring asynchronous close methods.
---
 .../io/lettuce/core/RedisChannelWriter.java   |   4 +-
 .../lettuce/core/api/StatefulConnection.java  |   4 +-
 .../ClusterPubSubConnectionProvider.java      |  16 +-
 .../PooledClusterConnectionProvider.java      |  39 ++-
 ...ynchronizingClusterConnectionProvider.java | 319 ------------------
 .../lettuce/core/internal/AsyncCloseable.java |  36 ++
 .../internal/AsyncConnectionProvider.java     | 266 +++++++++++++++
 ....java => AsyncConnectionProviderTest.java} |  32 +-
 8 files changed, 360 insertions(+), 356 deletions(-)
 delete mode 100644 src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
 create mode 100644 src/main/java/io/lettuce/core/internal/AsyncCloseable.java
 create mode 100644 src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
 rename src/test/java/io/lettuce/core/cluster/{SynchronizingClusterConnectionProviderTest.java => AsyncConnectionProviderTest.java} (86%)

diff --git a/src/main/java/io/lettuce/core/RedisChannelWriter.java b/src/main/java/io/lettuce/core/RedisChannelWriter.java
index b2bbfb0d7d..f42bc95953 100644
--- a/src/main/java/io/lettuce/core/RedisChannelWriter.java
+++ b/src/main/java/io/lettuce/core/RedisChannelWriter.java
@@ -19,6 +19,7 @@
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
 
+import io.lettuce.core.internal.AsyncCloseable;
 import io.lettuce.core.protocol.ConnectionFacade;
 import io.lettuce.core.protocol.RedisCommand;
 
@@ -28,7 +29,7 @@
  * @author Mark Paluch
  * @since 3.0
  */
-public interface RedisChannelWriter extends Closeable {
+public interface RedisChannelWriter extends Closeable, AsyncCloseable {
 
     /**
      * Write a command on the channel. The command may be changed/wrapped during write and the written instance is returned
@@ -62,6 +63,7 @@ public interface RedisChannelWriter extends Closeable {
      * @return future for result synchronization.
      * @since 5.1
      */
+    @Override
     CompletableFuture<Void> closeAsync();
 
     /**
diff --git a/src/main/java/io/lettuce/core/api/StatefulConnection.java b/src/main/java/io/lettuce/core/api/StatefulConnection.java
index 1e937ac229..60a47fdc6f 100644
--- a/src/main/java/io/lettuce/core/api/StatefulConnection.java
+++ b/src/main/java/io/lettuce/core/api/StatefulConnection.java
@@ -21,6 +21,7 @@
 import java.util.concurrent.TimeUnit;
 
 import io.lettuce.core.ClientOptions;
+import io.lettuce.core.internal.AsyncCloseable;
 import io.lettuce.core.protocol.RedisCommand;
 
 /**
@@ -31,7 +32,7 @@
  * @author Mark Paluch
  * @since 4.0
  */
-public interface StatefulConnection<K, V> extends AutoCloseable {
+public interface StatefulConnection<K, V> extends AutoCloseable, AsyncCloseable {
 
     /**
      * Set the default command timeout for this connection.
@@ -91,6 +92,7 @@ public interface StatefulConnection<K, V> extends AutoCloseable {
      *         successful or because of an error.
      * @since 5.1
      */
+    @Override
     CompletableFuture<Void> closeAsync();
 
     /**
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
index 5d7f759c36..929bf1fbe2 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
@@ -51,7 +51,7 @@ class ClusterPubSubConnectionProvider<K, V> extends PooledClusterConnectionProvi
      * @param redisCodec must not be {@literal null}.
      * @param notificationTarget must not be {@literal null}.
      */
-    public ClusterPubSubConnectionProvider(RedisClusterClient redisClusterClient, RedisChannelWriter clusterWriter,
+    ClusterPubSubConnectionProvider(RedisClusterClient redisClusterClient, RedisChannelWriter clusterWriter,
             RedisCodec<K, V> redisCodec, RedisClusterPubSubListener<K, V> notificationTarget) {
 
         super(redisClusterClient, clusterWriter, redisCodec);
@@ -67,9 +67,9 @@ protected ClusterNodeConnectionFactory<K, V> getConnectionFactory(RedisClusterCl
     }
 
     @SuppressWarnings("unchecked")
-    private class PubSubNodeConnectionFactory extends AbstractClusterNodeConnectionFactory<K, V> {
+    class PubSubNodeConnectionFactory extends AbstractClusterNodeConnectionFactory<K, V> {
 
-        public PubSubNodeConnectionFactory(ClientResources clientResources) {
+        PubSubNodeConnectionFactory(ClientResources clientResources) {
             super(clientResources);
         }
 
@@ -90,11 +90,11 @@ public ConnectionFuture<StatefulRedisConnection<K, V>> apply(ConnectionKey key)
     }
 
     @SuppressWarnings("unchecked")
-    private class DecoratingClusterNodeConnectionFactory implements ClusterNodeConnectionFactory<K, V> {
+    class DecoratingClusterNodeConnectionFactory implements ClusterNodeConnectionFactory<K, V> {
 
         private final ClusterNodeConnectionFactory<K, V> delegate;
 
-        public DecoratingClusterNodeConnectionFactory(ClusterNodeConnectionFactory<K, V> delegate) {
+        DecoratingClusterNodeConnectionFactory(ClusterNodeConnectionFactory<K, V> delegate) {
             this.delegate = delegate;
         }
 
@@ -124,20 +124,20 @@ public ConnectionFuture<StatefulRedisConnection<K, V>> apply(ConnectionKey key)
         }
     }
 
-    private class DelegatingRedisClusterPubSubListener extends RedisPubSubAdapter<K, V> {
+    class DelegatingRedisClusterPubSubListener extends RedisPubSubAdapter<K, V> {
 
         private final String nodeId;
         private final String host;
         private final int port;
 
-        public DelegatingRedisClusterPubSubListener(String nodeId) {
+        DelegatingRedisClusterPubSubListener(String nodeId) {
 
             this.nodeId = nodeId;
             this.host = null;
             this.port = 0;
         }
 
-        public DelegatingRedisClusterPubSubListener(String host, int port) {
+        DelegatingRedisClusterPubSubListener(String host, int port) {
 
             this.nodeId = null;
             this.host = host;
diff --git a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
index 792171c7a9..1da777a886 100644
--- a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
@@ -20,6 +20,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -31,6 +32,7 @@
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.AsyncConnectionProvider;
 import io.lettuce.core.internal.HostAndPort;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.models.role.RedisInstance;
@@ -60,7 +62,7 @@ class PooledClusterConnectionProvider<K, V> implements ClusterConnectionProvider
     private final ClusterNodeConnectionFactory<K, V> connectionFactory;
     private final RedisChannelWriter clusterWriter;
     private final RedisCodec<K, V> redisCodec;
-    private final SynchronizingClusterConnectionProvider<K, V> connectionProvider;
+    private final AsyncConnectionProvider<ConnectionKey, StatefulRedisConnection<K, V>, ConnectionFuture<StatefulRedisConnection<K, V>>> connectionProvider;
 
     private Partitions partitions;
     private boolean autoFlushCommands = true;
@@ -73,7 +75,7 @@ public PooledClusterConnectionProvider(RedisClusterClient redisClusterClient, Re
         this.redisClusterClient = redisClusterClient;
         this.clusterWriter = clusterWriter;
         this.connectionFactory = new NodeConnectionPostProcessor(getConnectionFactory(redisClusterClient));
-        this.connectionProvider = new SynchronizingClusterConnectionProvider<>(this.connectionFactory);
+        this.connectionProvider = new AsyncConnectionProvider<>(this.connectionFactory);
     }
 
     @Override
@@ -141,7 +143,7 @@ private CompletableFuture<StatefulRedisConnection<K, V>> getWriteConnection(int
         return writer;
     }
 
-    protected CompletableFuture<StatefulRedisConnection<K, V>> getReadConnection(int slot) {
+    private CompletableFuture<StatefulRedisConnection<K, V>> getReadConnection(int slot) {
 
         CompletableFuture<StatefulRedisConnection<K, V>> readerCandidates[];// avoid races when reconfiguring partitions.
 
@@ -297,7 +299,7 @@ public StatefulRedisConnection<K, V> getConnection(Intent intent, String nodeId)
             logger.debug("getConnection(" + intent + ", " + nodeId + ")");
         }
 
-        return connectionProvider.getConnection(new ConnectionKey(intent, nodeId));
+        return getConnection(new ConnectionKey(intent, nodeId));
     }
 
     @Override
@@ -312,7 +314,7 @@ public CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(Inten
 
     protected ConnectionFuture<StatefulRedisConnection<K, V>> getConnectionAsync(ConnectionKey key) {
 
-        ConnectionFuture<StatefulRedisConnection<K, V>> connectionFuture = connectionProvider.getConnectionAsync(key);
+        ConnectionFuture<StatefulRedisConnection<K, V>> connectionFuture = connectionProvider.getConnection(key);
         CompletableFuture<StatefulRedisConnection<K, V>> result = new CompletableFuture<>();
 
         connectionFuture.handle((connection, throwable) -> {
@@ -337,8 +339,7 @@ public StatefulRedisConnection<K, V> getConnection(Intent intent, String host, i
         try {
             beforeGetConnection(intent, host, port);
 
-            ConnectionKey key = new ConnectionKey(intent, host, port);
-            return connectionProvider.getConnection(key);
+            return getConnection(new ConnectionKey(intent, host, port));
         } catch (RedisException e) {
             throw e;
         } catch (RuntimeException e) {
@@ -346,13 +347,24 @@ public StatefulRedisConnection<K, V> getConnection(Intent intent, String host, i
         }
     }
 
+    private StatefulRedisConnection<K, V> getConnection(ConnectionKey key) {
+
+        ConnectionFuture<StatefulRedisConnection<K, V>> future = getConnectionAsync(key);
+
+        try {
+            return future.join();
+        } catch (CompletionException e) {
+            throw RedisConnectionException.create(future.getRemoteAddress(), e.getCause());
+        }
+    }
+
     @Override
     public CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(Intent intent, String host, int port) {
 
         try {
             beforeGetConnection(intent, host, port);
 
-            return connectionProvider.getConnectionAsync(new ConnectionKey(intent, host, port)).toCompletableFuture();
+            return connectionProvider.getConnection(new ConnectionKey(intent, host, port)).toCompletableFuture();
         } catch (RedisException e) {
             throw e;
         } catch (RuntimeException e) {
@@ -397,7 +409,7 @@ public CompletableFuture<Void> closeAsync() {
 
         resetFastConnectionCache();
 
-        return connectionProvider.closeAsync();
+        return connectionProvider.close();
     }
 
     @Override
@@ -533,7 +545,7 @@ private static RuntimeException invalidConnectionPoint(String message) {
                 + " not allowed. This connection point is not known in the cluster view");
     }
 
-    boolean validateClusterNodeMembership() {
+    private boolean validateClusterNodeMembership() {
         return redisClusterClient.getClusterClientOptions() == null
                 || redisClusterClient.getClusterClientOptions().isValidateClusterNodeMembership();
     }
@@ -545,11 +557,10 @@ protected ClusterNodeConnectionFactory<K, V> getConnectionFactory(RedisClusterCl
         return new DefaultClusterNodeConnectionFactory<>(redisClusterClient, redisCodec, clusterWriter);
     }
 
-    private class NodeConnectionPostProcessor implements ClusterNodeConnectionFactory<K, V> {
-
+    class NodeConnectionPostProcessor implements ClusterNodeConnectionFactory<K, V> {
         private final ClusterNodeConnectionFactory<K, V> delegate;
 
-        public NodeConnectionPostProcessor(ClusterNodeConnectionFactory<K, V> delegate) {
+        NodeConnectionPostProcessor(ClusterNodeConnectionFactory<K, V> delegate) {
             this.delegate = delegate;
         }
 
@@ -610,7 +621,7 @@ static class DefaultClusterNodeConnectionFactory<K, V> extends AbstractClusterNo
         private final RedisCodec<K, V> redisCodec;
         private final RedisChannelWriter clusterWriter;
 
-        public DefaultClusterNodeConnectionFactory(RedisClusterClient redisClusterClient, RedisCodec<K, V> redisCodec,
+        DefaultClusterNodeConnectionFactory(RedisClusterClient redisClusterClient, RedisCodec<K, V> redisCodec,
                 RedisChannelWriter clusterWriter) {
 
             super(redisClusterClient.getResources());
diff --git a/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
deleted file mode 100644
index 33c2830481..0000000000
--- a/src/main/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProvider.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright 2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.cluster;
-
-import java.net.SocketAddress;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-
-import io.lettuce.core.ConnectionFuture;
-import io.lettuce.core.RedisChannelHandler;
-import io.lettuce.core.RedisConnectionException;
-import io.lettuce.core.RedisException;
-import io.lettuce.core.api.StatefulConnection;
-import io.lettuce.core.api.StatefulRedisConnection;
-import io.lettuce.core.cluster.ClusterNodeConnectionFactory.ConnectionKey;
-import io.lettuce.core.internal.LettuceAssert;
-
-/**
- * Synchronizing provider for Redis Cluster node connections using {@link ClusterNodeConnectionFactory}.
- * <p>
- * {@link #getConnection(ConnectionKey) Connection requests} are synchronized with a shared {@link Sync synchronzer object} per
- * {@link ConnectionKey}. Multiple threads requesting a connection for the same {@link ConnectionKey} share the same
- * synchronizer and are not required to wait until a previous asynchronous connection is established but participate in existing
- * connection initializations. Shared synchronization leads to a fair synchronization amongst multiple threads waiting to obtain
- * a connection.
- *
- * @author Mark Paluch
- * @since 4.4
- */
-class SynchronizingClusterConnectionProvider<K, V> {
-
-    private final ClusterNodeConnectionFactory<K, V> connectionFactory;
-    private final Map<ConnectionKey, Sync<K, V>> connections = new ConcurrentHashMap<>();
-
-    private volatile boolean closed;
-
-    /**
-     * Create a new {@link SynchronizingClusterConnectionProvider}.
-     *
-     * @param connectionFactory must not be {@literal null}.
-     */
-    public SynchronizingClusterConnectionProvider(ClusterNodeConnectionFactory<K, V> connectionFactory) {
-
-        LettuceAssert.notNull(connectionFactory, "AsyncClusterConnectionFactory must not be null");
-        this.connectionFactory = connectionFactory;
-    }
-
-    /**
-     * Obtain a {@link StatefulRedisConnection} to a cluster node given {@link ConnectionKey}.
-     *
-     * @param key the {@link ConnectionKey}.
-     * @return
-     * @throws RedisException if a {@link RedisException} occured
-     * @throws CompletionException
-     */
-    public StatefulRedisConnection<K, V> getConnection(ConnectionKey key) {
-        return getConnectionSync(key).getConnection();
-    }
-
-    /**
-     * Obtain a {@link CompletableFuture}-wrapped connection to a cluster node given {@link ConnectionKey}.
-     *
-     * @param key the {@link ConnectionKey}.
-     * @return
-     * @throws RedisException if a {@link RedisException} occured
-     * @throws CompletionException
-     */
-    public ConnectionFuture<StatefulRedisConnection<K, V>> getConnectionAsync(ConnectionKey key) {
-        return getConnectionSync(key).getConnectionAsync();
-    }
-
-    /**
-     * Obtain a {@link StatefulRedisConnection} to a cluster node given {@link ConnectionKey}.
-     *
-     * @param key the {@link ConnectionKey}.
-     * @return
-     * @throws RedisException if a {@link RedisException} occured
-     * @throws CompletionException
-     */
-    private Sync<K, V> getConnectionSync(ConnectionKey key) {
-
-        if (closed) {
-            throw new IllegalStateException("AsyncClusterConnectionProvider is already closed");
-        }
-
-        Sync<K, V> sync = connections.computeIfAbsent(key, connectionKey -> {
-
-            InProgress<K, V> createdSync = new InProgress<>(key, connectionFactory.apply(key), connections);
-
-            if (closed) {
-                createdSync.remove = InProgress.ST_FINISHED;
-                createdSync.future.thenAcceptAsync(StatefulConnection::close);
-            }
-
-            return createdSync;
-        });
-
-        return sync;
-    }
-
-    /**
-     * @return number of established connections.
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public int getConnectionCount() {
-
-        Object[] syncs = connections.values().toArray(new Object[0]);
-        int count = 0;
-
-        for (Object sync : syncs) {
-            if (sync instanceof Finished) {
-                count++;
-            }
-        }
-
-        return count;
-    }
-
-    /**
-     * Close all connections. Pending connections are closed using future chaining.
-     */
-    public void close() {
-        closeAsync().join();
-    }
-
-    /**
-     * Close all connections. Pending connections are closed using future chaining.
-     */
-    @SuppressWarnings("unchecked")
-    public CompletableFuture<Void> closeAsync() {
-
-        this.closed = true;
-
-        List<CompletableFuture<Void>> futures = new ArrayList<>();
-
-        forEach((connectionKey, connection) -> {
-
-            RedisChannelHandler handler = (RedisChannelHandler) connection;
-            futures.add(handler.closeAsync());
-            connections.remove(connectionKey);
-        });
-
-        return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
-    }
-
-    /**
-     * Close a connection by its {@link ConnectionKey}. Pending connections are closed using future chaining.
-     *
-     * @param key must not be {@literal null}.
-     */
-    public void close(ConnectionKey key) {
-
-        LettuceAssert.notNull(key, "ConnectionKey must not be null!");
-
-        Sync<K, V> sync = connections.get(key);
-        if (sync != null) {
-            connections.remove(key);
-            sync.doWithSync(StatefulConnection::close);
-        }
-    }
-
-    /**
-     * Execute an action for all established and pending {@link StatefulRedisConnection}s.
-     *
-     * @param action the action.
-     */
-    public void forEach(Consumer<? super StatefulRedisConnection<K, V>> action) {
-        connections.values().forEach(sync -> sync.doWithSync(action));
-    }
-
-    /**
-     * Execute an action for all established and pending {@link StatefulRedisConnection}s.
-     *
-     * @param action the action.
-     */
-    public void forEach(BiConsumer<ConnectionKey, ? super StatefulRedisConnection<K, V>> action) {
-        connections.forEach((key, sync) -> sync.doWithSync(action));
-    }
-
-    interface Sync<K, V> {
-
-        /**
-         * Return the {@link StatefulRedisConnection}. May cause blocking if asynchronous connection is {@link InProgress}.
-         *
-         * @return
-         */
-        StatefulRedisConnection<K, V> getConnection();
-
-        ConnectionFuture<StatefulRedisConnection<K, V>> getConnectionAsync();
-
-        /**
-         * Apply a {@link Consumer} callback to the {@link StatefulConnection}.
-         *
-         * @param action
-         */
-        void doWithSync(Consumer<? super StatefulRedisConnection<K, V>> action);
-
-        /**
-         * Apply a {@link BiConsumer} callback to the {@link ConnectionKey} and {@link StatefulConnection}.
-         *
-         * @param action
-         */
-        void doWithSync(BiConsumer<ConnectionKey, ? super StatefulRedisConnection<K, V>> action);
-    }
-
-    static class Finished<K, V> implements Sync<K, V> {
-
-        private final ConnectionKey key;
-        private final StatefulRedisConnection<K, V> connection;
-        private final ConnectionFuture<StatefulRedisConnection<K, V>> future;
-
-        public Finished(ConnectionKey key, SocketAddress remoteAddress, StatefulRedisConnection<K, V> connection) {
-            this.key = key;
-            this.connection = connection;
-            this.future = ConnectionFuture.from(remoteAddress, CompletableFuture.completedFuture(connection));
-        }
-
-        @Override
-        public StatefulRedisConnection<K, V> getConnection() {
-            return connection;
-        }
-
-        @Override
-        public ConnectionFuture<StatefulRedisConnection<K, V>> getConnectionAsync() {
-            return future;
-        }
-
-        @Override
-        public void doWithSync(Consumer<? super StatefulRedisConnection<K, V>> action) {
-            action.accept(connection);
-        }
-
-        @Override
-        public void doWithSync(BiConsumer<ConnectionKey, ? super StatefulRedisConnection<K, V>> action) {
-            action.accept(key, connection);
-        }
-    }
-
-    static class InProgress<K, V> implements Sync<K, V> {
-
-        private static final int ST_IN_PROGRESS = 0;
-        private static final int ST_FINISHED = 1;
-
-        @SuppressWarnings({ "rawtypes", "unchecked" })
-        private final static AtomicIntegerFieldUpdater<InProgress> REMOVE = AtomicIntegerFieldUpdater.newUpdater(
-                InProgress.class, "remove");
-
-        // Updated with AtomicIntegerFieldUpdater
-        @SuppressWarnings("unused")
-        private volatile int remove = ST_IN_PROGRESS;
-
-        private final ConnectionKey key;
-        private final ConnectionFuture<StatefulRedisConnection<K, V>> future;
-        private final Map<ConnectionKey, Sync<K, V>> connections;
-
-        public InProgress(ConnectionKey key, ConnectionFuture<StatefulRedisConnection<K, V>> future,
-                Map<ConnectionKey, Sync<K, V>> connections) {
-
-            this.key = key;
-            this.future = future;
-            this.connections = connections;
-        }
-
-        @Override
-        public ConnectionFuture<StatefulRedisConnection<K, V>> getConnectionAsync() {
-
-            return future.whenComplete((connection, throwable) -> {
-
-                if (REMOVE.compareAndSet(this, 0, ST_FINISHED)) {
-
-                    if (throwable == null) {
-                        connections.replace(key, this, new Finished<>(key, future.getRemoteAddress(), connection));
-                    } else {
-                        connections.remove(key);
-                    }
-                }
-            });
-        }
-
-        public StatefulRedisConnection<K, V> getConnection() {
-
-            try {
-                return getConnectionAsync().toCompletableFuture().join();
-            } catch (CompletionException e) {
-                throw RedisConnectionException.create(future.getRemoteAddress(), e.getCause());
-            }
-        }
-
-        @Override
-        public void doWithSync(Consumer<? super StatefulRedisConnection<K, V>> action) {
-            future.thenAccept(action);
-        }
-
-        @Override
-        public void doWithSync(BiConsumer<ConnectionKey, ? super StatefulRedisConnection<K, V>> action) {
-            future.thenAccept(connection -> action.accept(key, connection));
-        }
-    }
-}
diff --git a/src/main/java/io/lettuce/core/internal/AsyncCloseable.java b/src/main/java/io/lettuce/core/internal/AsyncCloseable.java
new file mode 100644
index 0000000000..2debaf8053
--- /dev/null
+++ b/src/main/java/io/lettuce/core/internal/AsyncCloseable.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.internal;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * A {@link AsyncCloseable} is a resource that can be closed. The {@link #closeAsync()} method is invoked to request resources
+ * release that the object is holding (such as open files).
+ *
+ * @since 5.1
+ * @author Mark Paluch
+ */
+public interface AsyncCloseable {
+
+    /**
+     * Requests to close this object and releases any system resources associated with it. If the object is already closed then
+     * invoking this method has no effect.
+     * <p>
+     * Calls to this method return a {@link CompletableFuture} that is notified with the outcome of the close request.
+     */
+    CompletableFuture<Void> closeAsync();
+}
diff --git a/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java b/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
new file mode 100644
index 0000000000..ccc3cb4859
--- /dev/null
+++ b/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
@@ -0,0 +1,266 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * Non-blocking provider for connection objects. This connection provider is typed with a connection type and connection key
+ * type.
+ * <p>
+ * {@link #getConnection(Object)} Connection requests} are synchronized with a shared {@link Sync synchronzer object} per
+ * {@code ConnectionKey}. Multiple threads requesting a connection for the same {@code ConnectionKey} share the same
+ * synchronizer and are not required to wait until a previous asynchronous connection is established but participate in existing
+ * connection initializations. Shared synchronization leads to a fair synchronization amongst multiple threads waiting to obtain
+ * a connection.
+ *
+ * @author Mark Paluch
+ * @param <T> connection type.
+ * @param <K> connection key type.
+ * @param <F> type of the {@link CompletionStage} handle of the connection progress.
+ * @since 5.1
+ */
+public class AsyncConnectionProvider<K, T extends AsyncCloseable, F extends CompletionStage<T>> {
+
+    private final Function<K, F> connectionFactory;
+    private final Map<K, Sync<K, T, F>> connections = new ConcurrentHashMap<>();
+
+    private volatile boolean closed;
+
+    /**
+     * Create a new {@link AsyncConnectionProvider}.
+     *
+     * @param connectionFactory must not be {@literal null}.
+     */
+    @SuppressWarnings("unchecked")
+    public AsyncConnectionProvider(Function<? extends K, ? extends F> connectionFactory) {
+
+        LettuceAssert.notNull(connectionFactory, "AsyncConnectionProvider must not be null");
+        this.connectionFactory = (Function<K, F>) connectionFactory;
+    }
+
+    /**
+     * Request a connection for the given the connection {@code key} and return a {@link CompletionStage} that is notified about
+     * the connection outcome.
+     *
+     * @param key the connection {@code key}, must not be {@literal null}.
+     * @return
+     */
+    public F getConnection(K key) {
+        return getSynchronizer(key).getConnection();
+    }
+
+    /**
+     * Obtain a connection to a target given the connection {@code key}.
+     *
+     * @param key the connection {@code key}.
+     * @return
+     */
+    private Sync<K, T, F> getSynchronizer(K key) {
+
+        if (closed) {
+            throw new IllegalStateException("ConnectionProvider is already closed");
+        }
+
+        Sync<K, T, F> sync = connections.get(key);
+
+        if (sync != null) {
+            return sync;
+        }
+
+        AtomicBoolean atomicBoolean = new AtomicBoolean();
+
+        sync = connections.computeIfAbsent(key, connectionKey -> {
+
+            Sync<K, T, F> createdSync = new Sync<>(key, connectionFactory.apply(key));
+
+            if (closed) {
+                createdSync.cancel();
+            }
+
+            return createdSync;
+        });
+
+        if (atomicBoolean.compareAndSet(false, true)) {
+
+            sync.getConnection().whenComplete((c, t) -> {
+
+                if (t != null) {
+                    connections.remove(key);
+                }
+            });
+        }
+
+        return sync;
+    }
+
+    /**
+     * @return number of established connections.
+     */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public int getConnectionCount() {
+
+        Sync[] syncs = connections.values().toArray(new Sync[0]);
+        int count = 0;
+
+        for (Sync sync : syncs) {
+            if (sync.isComplete()) {
+                count++;
+            }
+        }
+
+        return count;
+    }
+
+    /**
+     * Close all connections. Pending connections are closed using future chaining.
+     */
+    @SuppressWarnings("unchecked")
+    public CompletableFuture<Void> close() {
+
+        this.closed = true;
+
+        List<CompletableFuture<Void>> futures = new ArrayList<>();
+
+        forEach((connectionKey, closeable) -> {
+
+            futures.add(closeable.closeAsync());
+            connections.remove(connectionKey);
+        });
+
+        return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
+    }
+
+    /**
+     * Close a connection by its connection {@code key}. Pending connections are closed using future chaining.
+     *
+     * @param key the connection {@code key}, must not be {@literal null}.
+     */
+    public void close(K key) {
+
+        LettuceAssert.notNull(key, "ConnectionKey must not be null!");
+
+        Sync<K, T, F> sync = connections.get(key);
+        if (sync != null) {
+            connections.remove(key);
+            sync.doWithConnection(AsyncCloseable::closeAsync);
+        }
+    }
+
+    /**
+     * Execute an action for all established and pending connections.
+     *
+     * @param action the action.
+     */
+    public void forEach(Consumer<? super T> action) {
+        connections.values().forEach(sync -> sync.doWithConnection(action));
+    }
+
+    /**
+     * Execute an action for all established and pending {@link AsyncCloseable}s.
+     *
+     * @param action the action.
+     */
+    public void forEach(BiConsumer<? super K, ? super T> action) {
+        connections.forEach((key, sync) -> sync.doWithConnection(action));
+    }
+
+    static class Sync<K, T extends AsyncCloseable, F extends CompletionStage<T>> {
+
+        private static final int PHASE_IN_PROGRESS = 0;
+        private static final int PHASE_COMPLETE = 1;
+        private static final int PHASE_FAILED = 2;
+        private static final int PHASE_CANCELED = 3;
+
+        @SuppressWarnings({ "rawtypes", "unchecked" })
+        private final static AtomicIntegerFieldUpdater<Sync> PHASE = AtomicIntegerFieldUpdater.newUpdater(Sync.class, "phase");
+
+        // Updated with AtomicIntegerFieldUpdater
+        @SuppressWarnings("unused")
+        private volatile int phase = PHASE_IN_PROGRESS;
+
+        private volatile T connection;
+
+        private final K key;
+        private final F future;
+
+        @SuppressWarnings("unchecked")
+        public Sync(K key, F future) {
+
+            this.key = key;
+            this.future = (F) future.whenComplete((connection, throwable) -> {
+
+                if (throwable != null) {
+
+                    if (throwable instanceof CancellationException) {
+                        PHASE.compareAndSet(this, PHASE_IN_PROGRESS, PHASE_CANCELED);
+                    }
+
+                    PHASE.compareAndSet(this, PHASE_IN_PROGRESS, PHASE_FAILED);
+                }
+
+                if (PHASE.compareAndSet(this, PHASE_IN_PROGRESS, PHASE_COMPLETE)) {
+
+                    if (connection != null) {
+                        Sync.this.connection = connection;
+                    }
+                }
+            });
+        }
+
+        public void cancel() {
+            future.toCompletableFuture().cancel(false);
+            doWithConnection(AsyncCloseable::closeAsync);
+        }
+
+        public F getConnection() {
+            return future;
+        }
+
+        void doWithConnection(Consumer<? super T> action) {
+
+            if (isComplete()) {
+                action.accept(connection);
+            } else {
+                future.thenAccept(action);
+            }
+        }
+
+        void doWithConnection(BiConsumer<? super K, ? super T> action) {
+
+            if (isComplete()) {
+                action.accept(key, connection);
+            } else {
+                future.thenAccept(c -> action.accept(key, c));
+            }
+        }
+
+        private boolean isComplete() {
+            return PHASE.get(this) == PHASE_COMPLETE;
+        }
+    }
+}
diff --git a/src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java
similarity index 86%
rename from src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java
rename to src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java
index 062cd41c27..dc1ea19a86 100644
--- a/src/test/java/io/lettuce/core/cluster/SynchronizingClusterConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java
@@ -34,21 +34,26 @@
 
 import reactor.core.publisher.Mono;
 import io.lettuce.TestClientResources;
-import io.lettuce.core.*;
+import io.lettuce.core.ConnectionFuture;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.SocketOptions;
+import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.ClusterNodeConnectionFactory.ConnectionKey;
 import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.AsyncConnectionProvider;
+import io.netty.channel.ConnectTimeoutException;
 
 /**
  * @author Mark Paluch
  */
-public class SynchronizingClusterConnectionProviderTest {
+public class AsyncConnectionProviderTest {
 
     private static RedisClusterClient redisClient;
     private ServerSocket serverSocket;
     private CountDownLatch connectInitiated = new CountDownLatch(1);
 
-    private SynchronizingClusterConnectionProvider<String, String> sut;
+    private AsyncConnectionProvider<ConnectionKey, StatefulRedisConnection<String, String>, ConnectionFuture<StatefulRedisConnection<String, String>>> sut;
 
     @BeforeClass
     public static void beforeClass() throws Exception {
@@ -65,8 +70,8 @@ public void before() throws Exception {
 
         serverSocket = new ServerSocket(SocketUtils.findAvailableTcpPort(), 1);
 
-        sut = new SynchronizingClusterConnectionProvider<>(new AbstractClusterNodeConnectionFactory<String, String>(
-                redisClient.getResources()) {
+        sut = new AsyncConnectionProvider<>(
+                new AbstractClusterNodeConnectionFactory<String, String>(redisClient.getResources()) {
             @Override
             public ConnectionFuture<StatefulRedisConnection<String, String>> apply(ConnectionKey connectionKey) {
 
@@ -99,9 +104,9 @@ public void shouldCreateConnection() throws IOException {
 
         ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, TestSettings.host(),
                 TestSettings.port());
-        StatefulRedisConnection<String, String> connection = sut.getConnection(connectionKey);
+        StatefulRedisConnection<String, String> connection = sut.getConnection(connectionKey).toCompletableFuture().join();
 
-        assertThat(sut.getConnection(connectionKey)).isSameAs(connection);
+        assertThat(sut.getConnection(connectionKey).toCompletableFuture().join()).isSameAs(connection);
         sut.close();
         serverSocket.accept();
     }
@@ -114,7 +119,7 @@ public void shouldMaintainConnectionCount() throws IOException {
 
         assertThat(sut.getConnectionCount()).isEqualTo(0);
 
-        sut.getConnection(connectionKey);
+        sut.getConnection(connectionKey).toCompletableFuture().join();
 
         assertThat(sut.getConnectionCount()).isEqualTo(1);
         sut.close();
@@ -167,18 +172,18 @@ public void connectShouldFail() throws Exception {
         StopWatch stopWatch = new StopWatch();
 
         try {
-            sut.getConnection(connectionKey);
+            sut.getConnection(connectionKey).toCompletableFuture().get();
             fail("Missing RedisConnectionException because of Timeout");
         } catch (Exception e) {
-            assertThat(e).isInstanceOf(RedisConnectionException.class);
+            assertThat(e).hasCauseInstanceOf(ConnectTimeoutException.class);
         }
         stopWatch.start();
 
         try {
-            sut.getConnection(connectionKey);
+            sut.getConnection(connectionKey).toCompletableFuture().join();
             fail("Missing RedisConnectionException because of Timeout");
         } catch (Exception e) {
-            assertThat(e).isInstanceOf(RedisConnectionException.class);
+            assertThat(e).hasCauseInstanceOf(ConnectTimeoutException.class);
         }
 
         stopWatch.stop();
@@ -253,7 +258,8 @@ public void shouldCloseAsync() throws Exception {
         CompletableFuture<StatefulRedisConnection<String, String>> createdConnection = new CompletableFuture<>();
         Thread t1 = new Thread(() -> {
             try {
-                StatefulRedisConnection<String, String> connection = sut.getConnection(connectionKey);
+                StatefulRedisConnection<String, String> connection = sut.getConnection(connectionKey).toCompletableFuture()
+                        .join();
                 createdConnection.complete(connection);
             } catch (Exception e) {
                 createdConnection.completeExceptionally(e);

From a9210103a7eb1a333e7441227fea9939663ddff7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 7 Nov 2017 14:13:06 +0100
Subject: [PATCH 347/808] Polishing

Implement missing interface method in EmptyRedisChannelWriter.
---
 src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java b/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
index b8095d51c4..5c01d2105d 100644
--- a/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
+++ b/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
@@ -16,6 +16,7 @@
 package io.lettuce.core;
 
 import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
 
 import io.lettuce.core.protocol.ConnectionFacade;
 import io.lettuce.core.protocol.RedisCommand;
@@ -42,6 +43,11 @@ public void close() {
 
     }
 
+    @Override
+    public CompletableFuture<Void> closeAsync() {
+        return null;
+    }
+
     @Override
     public void reset() {
 

From c7f4048991e781dc87c72c2a6ed27181c448fc4c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 7 Nov 2017 14:18:21 +0100
Subject: [PATCH 348/808] Add SocketAddressOutput #644

Add dedicated output to capture a socket address directly. Remove transformation code that collects the individual response segments and creates a InetSocketAddress.
---
 .../core/output/SocketAddressOutput.java      | 49 +++++++++++++
 .../RedisSentinelAsyncCommandsImpl.java       | 43 +----------
 .../RedisSentinelReactiveCommandsImpl.java    | 18 +----
 .../core/sentinel/SentinelCommandBuilder.java | 71 ++++++++++---------
 .../core/output/SocketAddressOutputTest.java  | 44 ++++++++++++
 .../core/sentinel/SentinelCommandTest.java    | 36 +++++-----
 6 files changed, 149 insertions(+), 112 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/output/SocketAddressOutput.java
 create mode 100644 src/test/java/io/lettuce/core/output/SocketAddressOutputTest.java

diff --git a/src/main/java/io/lettuce/core/output/SocketAddressOutput.java b/src/main/java/io/lettuce/core/output/SocketAddressOutput.java
new file mode 100644
index 0000000000..ea8f5aa4ca
--- /dev/null
+++ b/src/main/java/io/lettuce/core/output/SocketAddressOutput.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.output;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+
+import io.lettuce.core.codec.RedisCodec;
+
+/**
+ * Output capturing a hostname and port (both string elements) into a {@link SocketAddress}.
+ * 
+ * @author Mark Paluch
+ * @since 5.0.1
+ */
+public class SocketAddressOutput<K, V> extends CommandOutput<K, V, SocketAddress> {
+
+    private String hostname;
+
+    public SocketAddressOutput(RedisCodec<K, V> codec) {
+        super(codec, null);
+    }
+
+    @Override
+    public void set(ByteBuffer bytes) {
+
+        if (hostname == null) {
+            hostname = decodeAscii(bytes);
+            return;
+        }
+
+        int port = Integer.parseInt(decodeAscii(bytes));
+        output = InetSocketAddress.createUnresolved(hostname, port);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
index 31b6cba72c..01a913434f 100644
--- a/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
@@ -15,20 +15,15 @@
  */
 package io.lettuce.core.sentinel;
 
-import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.atomic.AtomicReference;
 
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.codec.RedisCodec;
-import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.AsyncCommand;
-import io.lettuce.core.protocol.Command;
 import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
@@ -53,77 +48,41 @@ public RedisSentinelAsyncCommandsImpl(StatefulConnection<K, V> connection, Redis
 
     @Override
     public RedisFuture<SocketAddress> getMasterAddrByName(K key) {
-
-        Command<K, V, List<V>> cmd = commandBuilder.getMasterAddrByKey(key);
-        CompletionStage<List<V>> future = dispatch(cmd);
-        AtomicReference<SocketAddress> ref = new AtomicReference<>();
-        AsyncCommand<K, V, SocketAddress> convert = new AsyncCommand<K, V, SocketAddress>((RedisCommand) cmd) {
-            @Override
-            protected void completeResult() {
-                complete(ref.get());
-            }
-        };
-
-        future.whenComplete((list, t) -> {
-
-            if (t != null) {
-                convert.completeExceptionally(t);
-                return;
-            }
-
-            if (!list.isEmpty()) {
-                LettuceAssert.isTrue(list.size() == 2, "List must contain exact 2 entries (Hostname, Port)");
-                String hostname = (String) list.get(0);
-                String port = (String) list.get(1);
-                ref.set(new InetSocketAddress(hostname, Integer.parseInt(port)));
-            }
-
-            convert.complete();
-
-        });
-
-        return convert;
+        return dispatch(commandBuilder.getMasterAddrByKey(key));
     }
 
     @Override
     public RedisFuture<List<Map<K, V>>> masters() {
-
         return dispatch(commandBuilder.masters());
     }
 
     @Override
     public RedisFuture<Map<K, V>> master(K key) {
-
         return dispatch(commandBuilder.master(key));
     }
 
     @Override
     public RedisFuture<List<Map<K, V>>> slaves(K key) {
-
         return dispatch(commandBuilder.slaves(key));
     }
 
     @Override
     public RedisFuture<Long> reset(K key) {
-
         return dispatch(commandBuilder.reset(key));
     }
 
     @Override
     public RedisFuture<String> failover(K key) {
-
         return dispatch(commandBuilder.failover(key));
     }
 
     @Override
     public RedisFuture<String> monitor(K key, String ip, int port, int quorum) {
-
         return dispatch(commandBuilder.monitor(key, ip, port, quorum));
     }
 
     @Override
     public RedisFuture<String> set(K key, String option, V value) {
-
         return dispatch(commandBuilder.set(key, option, value));
     }
 
diff --git a/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
index 789f89aef3..21b29ceea3 100644
--- a/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
@@ -15,18 +15,15 @@
  */
 package io.lettuce.core.sentinel;
 
-import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.Map;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-
 import io.lettuce.core.AbstractRedisReactiveCommands;
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.codec.RedisCodec;
-import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands;
 
@@ -50,20 +47,7 @@ public RedisSentinelReactiveCommandsImpl(StatefulConnection<K, V> connection, Re
 
     @Override
     public Mono<SocketAddress> getMasterAddrByName(K key) {
-
-        Flux<V> flux = createDissolvingFlux(() -> commandBuilder.getMasterAddrByKey(key));
-
-        return flux.collectList().flatMap(list -> {
-
-            if (list.isEmpty()) {
-                return Mono.empty();
-            }
-
-            LettuceAssert.isTrue(list.size() == 2, "List must contain exact 2 entries (Hostname, Port)");
-            String hostname = (String) list.get(0);
-            String port = (String) list.get(1);
-            return Mono.just(new InetSocketAddress(hostname, Integer.parseInt(port)));
-        }).cast(SocketAddress.class);
+        return createMono(() -> commandBuilder.getMasterAddrByKey(key));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java b/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java
index 0fabef1042..013c77c788 100644
--- a/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java
@@ -18,6 +18,7 @@
 import static io.lettuce.core.protocol.CommandKeyword.*;
 import static io.lettuce.core.protocol.CommandType.*;
 
+import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
 
@@ -40,102 +41,102 @@ public SentinelCommandBuilder(RedisCodec<K, V> codec) {
         super(codec);
     }
 
-    public Command<K, V, List<V>> getMasterAddrByKey(K key) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add("get-master-addr-by-name").addKey(key);
-        return createCommand(SENTINEL, new ValueListOutput<K, V>(codec), args);
+    public Command<K, V, SocketAddress> getMasterAddrByKey(K key) {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add("get-master-addr-by-name").addKey(key);
+        return createCommand(SENTINEL, new SocketAddressOutput<>(codec), args);
     }
 
     public Command<K, V, List<Map<K, V>>> masters() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add("masters");
-        return createCommand(SENTINEL, new ListOfMapsOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add("masters");
+        return createCommand(SENTINEL, new ListOfMapsOutput<>(codec), args);
     }
 
     public Command<K, V, Map<K, V>> master(K key) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add("master").addKey(key);
-        return createCommand(SENTINEL, new MapOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add("master").addKey(key);
+        return createCommand(SENTINEL, new MapOutput<>(codec), args);
     }
 
     public Command<K, V, List<Map<K, V>>> slaves(K key) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(SLAVES).addKey(key);
-        return createCommand(SENTINEL, new ListOfMapsOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(SLAVES).addKey(key);
+        return createCommand(SENTINEL, new ListOfMapsOutput<>(codec), args);
     }
 
     public Command<K, V, Long> reset(K key) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(RESET).addKey(key);
-        return createCommand(SENTINEL, new IntegerOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(RESET).addKey(key);
+        return createCommand(SENTINEL, new IntegerOutput<>(codec), args);
     }
 
     public Command<K, V, String> failover(K key) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(FAILOVER).addKey(key);
-        return createCommand(SENTINEL, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(FAILOVER).addKey(key);
+        return createCommand(SENTINEL, new StatusOutput<>(codec), args);
     }
 
     public Command<K, V, String> monitor(K key, String ip, int port, int quorum) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(MONITOR).addKey(key).add(ip).add(port).add(quorum);
-        return createCommand(SENTINEL, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(MONITOR).addKey(key).add(ip).add(port).add(quorum);
+        return createCommand(SENTINEL, new StatusOutput<>(codec), args);
     }
 
     public Command<K, V, String> set(K key, String option, V value) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(SET).addKey(key).add(option).addValue(value);
-        return createCommand(SENTINEL, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(SET).addKey(key).add(option).addValue(value);
+        return createCommand(SENTINEL, new StatusOutput<>(codec), args);
     }
 
     public Command<K, V, K> clientGetname() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(GETNAME);
-        return createCommand(CLIENT, new KeyOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(GETNAME);
+        return createCommand(CLIENT, new KeyOutput<>(codec), args);
     }
 
     public Command<K, V, String> clientSetname(K name) {
         LettuceAssert.notNull(name, "Name must not be null");
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(SETNAME).addKey(name);
-        return createCommand(CLIENT, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(SETNAME).addKey(name);
+        return createCommand(CLIENT, new StatusOutput<>(codec), args);
     }
 
     public Command<K, V, String> clientKill(String addr) {
         LettuceAssert.notNull(addr, "Addr must not be null");
         LettuceAssert.notEmpty(addr, "Addr must not be empty");
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(KILL).add(addr);
-        return createCommand(CLIENT, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(KILL).add(addr);
+        return createCommand(CLIENT, new StatusOutput<>(codec), args);
     }
 
     public Command<K, V, Long> clientKill(KillArgs killArgs) {
         LettuceAssert.notNull(killArgs, "KillArgs must not be null");
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(KILL);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(KILL);
         killArgs.build(args);
-        return createCommand(CLIENT, new IntegerOutput<K, V>(codec), args);
+        return createCommand(CLIENT, new IntegerOutput<>(codec), args);
     }
 
     public Command<K, V, String> clientPause(long timeout) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(PAUSE).add(timeout);
-        return createCommand(CLIENT, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(PAUSE).add(timeout);
+        return createCommand(CLIENT, new StatusOutput<>(codec), args);
     }
 
     public Command<K, V, String> clientList() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(LIST);
-        return createCommand(CLIENT, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(LIST);
+        return createCommand(CLIENT, new StatusOutput<>(codec), args);
     }
 
     public Command<K, V, String> info() {
-        return createCommand(INFO, new StatusOutput<K, V>(codec));
+        return createCommand(INFO, new StatusOutput<>(codec));
     }
 
     public Command<K, V, String> info(String section) {
         LettuceAssert.notNull(section, "Section must not be null");
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(section);
-        return createCommand(INFO, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(section);
+        return createCommand(INFO, new StatusOutput<>(codec), args);
     }
 
     public Command<K, V, String> ping() {
-        return createCommand(PING, new StatusOutput<K, V>(codec));
+        return createCommand(PING, new StatusOutput<>(codec));
     }
 
     public Command<K, V, String> remove(K key) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(CommandKeyword.REMOVE).addKey(key);
-        return createCommand(SENTINEL, new StatusOutput<K, V>(codec), args);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(CommandKeyword.REMOVE).addKey(key);
+        return createCommand(SENTINEL, new StatusOutput<>(codec), args);
     }
 
 }
diff --git a/src/test/java/io/lettuce/core/output/SocketAddressOutputTest.java b/src/test/java/io/lettuce/core/output/SocketAddressOutputTest.java
new file mode 100644
index 0000000000..acd2b3baf7
--- /dev/null
+++ b/src/test/java/io/lettuce/core/output/SocketAddressOutputTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.output;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+
+import org.junit.Test;
+
+import io.lettuce.core.codec.StringCodec;
+
+/**
+ * @author Mark Paluch
+ */
+public class SocketAddressOutputTest {
+
+    @Test
+    public void shouldReportSocketAddress() {
+
+        SocketAddressOutput<String, String> output = new SocketAddressOutput<>(StringCodec.ASCII);
+
+        output.set(ByteBuffer.wrap("localhost".getBytes()));
+        output.set(ByteBuffer.wrap("6379".getBytes()));
+
+        output.complete(0);
+
+        assertThat(output.get()).isNotNull().isInstanceOf(InetSocketAddress.class);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
index 9e24d74ca3..97ae13c5ce 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,26 +62,26 @@ public void openConnection() throws Exception {
     }
 
     @Test
-    public void getMasterAddr() throws Exception {
+    public void getMasterAddr() {
         SocketAddress result = sentinel.getMasterAddrByName(MASTER_ID);
         InetSocketAddress socketAddress = (InetSocketAddress) result;
-        assertThat(socketAddress.getHostName()).contains(TestSettings.host());
+        assertThat(socketAddress.getHostName()).contains(TestSettings.hostAddr());
     }
 
     @Test
-    public void getMasterAddrButNoMasterPresent() throws Exception {
+    public void getMasterAddrButNoMasterPresent() {
         InetSocketAddress socketAddress = (InetSocketAddress) sentinel.getMasterAddrByName("unknown");
         assertThat(socketAddress).isNull();
     }
 
     @Test
-    public void getMasterAddrByName() throws Exception {
+    public void getMasterAddrByName() {
         InetSocketAddress socketAddress = (InetSocketAddress) sentinel.getMasterAddrByName(MASTER_ID);
         assertThat(socketAddress.getPort()).isBetween(6479, 6485);
     }
 
     @Test
-    public void masters() throws Exception {
+    public void masters() {
 
         List<Map<String, String>> result = sentinel.masters();
 
@@ -94,7 +94,7 @@ public void masters() throws Exception {
     }
 
     @Test
-    public void sentinelConnectWith() throws Exception {
+    public void sentinelConnectWith() {
 
         RedisClient client = RedisClient.create(TestClientResources.get(),
                 RedisURI.Builder.sentinel(TestSettings.host(), 1234, MASTER_ID).withSentinel(TestSettings.host()).build());
@@ -116,7 +116,7 @@ public void sentinelConnectWith() throws Exception {
     }
 
     @Test
-    public void sentinelConnectWrongMaster() throws Exception {
+    public void sentinelConnectWrongMaster() {
 
         RedisClient client = RedisClient.create(TestClientResources.get(),
                 RedisURI.Builder.sentinel(TestSettings.host(), 1234, "nonexistent").withSentinel(TestSettings.host()).build());
@@ -130,7 +130,7 @@ public void sentinelConnectWrongMaster() throws Exception {
     }
 
     @Test
-    public void sentinelConnect() throws Exception {
+    public void sentinelConnect() {
 
         RedisClient client = DefaultRedisClient.get();
 
@@ -142,7 +142,7 @@ public void sentinelConnect() throws Exception {
     }
 
     @Test
-    public void getMaster() throws Exception {
+    public void getMaster() {
 
         Map<String, String> result = sentinel.master(MASTER_ID);
         assertThat(result.get("ip")).isEqualTo(hostAddr()); // !! IPv4/IPv6
@@ -169,7 +169,7 @@ public void role() throws Exception {
     }
 
     @Test
-    public void getSlaves() throws Exception {
+    public void getSlaves() {
 
         List<Map<String, String>> result = sentinel.slaves(MASTER_ID);
         assertThat(result).hasSize(1);
@@ -177,14 +177,14 @@ public void getSlaves() throws Exception {
     }
 
     @Test
-    public void reset() throws Exception {
+    public void reset() {
 
         Long result = sentinel.reset("other");
         assertThat(result.intValue()).isEqualTo(0);
     }
 
     @Test
-    public void failover() throws Exception {
+    public void failover() {
 
         try {
             sentinel.failover("other");
@@ -194,7 +194,7 @@ public void failover() throws Exception {
     }
 
     @Test
-    public void monitor() throws Exception {
+    public void monitor() {
 
         try {
             sentinel.remove("mymaster2");
@@ -206,28 +206,28 @@ public void monitor() throws Exception {
     }
 
     @Test
-    public void ping() throws Exception {
+    public void ping() {
 
         String result = sentinel.ping();
         assertThat(result).isEqualTo("PONG");
     }
 
     @Test
-    public void set() throws Exception {
+    public void set() {
 
         String result = sentinel.set(MASTER_ID, "down-after-milliseconds", "1000");
         assertThat(result).isEqualTo("OK");
     }
 
     @Test
-    public void connectToRedisUsingSentinel() throws Exception {
+    public void connectToRedisUsingSentinel() {
         RedisCommands<String, String> connect = sentinelClient.connect().sync();
         connect.ping();
         connect.getStatefulConnection().close();
     }
 
     @Test
-    public void connectToRedisUsingSentinelWithReconnect() throws Exception {
+    public void connectToRedisUsingSentinelWithReconnect() {
         RedisCommands<String, String> connect = sentinelClient.connect().sync();
         connect.ping();
         connect.quit();

From b427eeb008d7743dfa5beef7e6cd887c6f62147d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 7 Nov 2017 14:54:21 +0100
Subject: [PATCH 349/808] Add synchronization to flaky test

---
 .../core/reliability/AtMostOnceTest.java      | 43 +++++++++++--------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
index 528d422562..af543c05cc 100644
--- a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,20 +25,22 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import io.lettuce.Delay;
-import io.lettuce.core.api.StatefulRedisConnection;
 import org.junit.Before;
 import org.junit.Test;
 
 import io.lettuce.ConnectionTestUtil;
+import io.lettuce.Delay;
 import io.lettuce.Wait;
 import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.IntegerOutput;
 import io.lettuce.core.output.StatusOutput;
-import io.lettuce.core.protocol.*;
-
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandType;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.handler.codec.EncoderException;
@@ -54,7 +56,7 @@ public class AtMostOnceTest extends AbstractRedisClientTest {
     protected String key = "key";
 
     @Before
-    public void before() throws Exception {
+    public void before() {
         client.setOptions(ClientOptions.builder().autoReconnect(false).build());
 
         // needs to be increased on slow systems...perhaps...
@@ -67,7 +69,7 @@ public void before() throws Exception {
     }
 
     @Test
-    public void connectionIsConnectedAfterConnect() throws Exception {
+    public void connectionIsConnectedAfterConnect() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
 
@@ -77,7 +79,7 @@ public void connectionIsConnectedAfterConnect() throws Exception {
     }
 
     @Test
-    public void noReconnectHandler() throws Exception {
+    public void noReconnectHandler() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
 
@@ -87,7 +89,7 @@ public void noReconnectHandler() throws Exception {
     }
 
     @Test
-    public void basicOperations() throws Exception {
+    public void basicOperations() {
 
         RedisCommands<String, String> connection = client.connect().sync();
 
@@ -98,7 +100,7 @@ public void basicOperations() throws Exception {
     }
 
     @Test
-    public void noBufferedCommandsAfterExecute() throws Exception {
+    public void noBufferedCommandsAfterExecute() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> sync = connection.sync();
@@ -112,7 +114,7 @@ public void noBufferedCommandsAfterExecute() throws Exception {
     }
 
     @Test
-    public void commandIsExecutedOnce() throws Exception {
+    public void commandIsExecutedOnce() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> sync = connection.sync();
@@ -131,7 +133,7 @@ public void commandIsExecutedOnce() throws Exception {
     }
 
     @Test
-    public void commandNotExecutedFailsOnEncode() throws Exception {
+    public void commandNotExecutedFailsOnEncode() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> sync = client.connect().sync();
@@ -159,6 +161,9 @@ public void encode(ByteBuf buf) {
         assertThat(command.await(2, TimeUnit.SECONDS)).isTrue();
         assertThat(command.isCancelled()).isFalse();
         assertThat(getException(command)).isInstanceOf(EncoderException.class);
+
+        Wait.untilTrue(() -> !ConnectionTestUtil.getStack(connection).isEmpty()).waitOrTimeout();
+
         assertThat(ConnectionTestUtil.getStack(connection)).isNotEmpty();
         ConnectionTestUtil.getStack(connection).clear();
 
@@ -171,7 +176,7 @@ public void encode(ByteBuf buf) {
     }
 
     @Test
-    public void commandNotExecutedChannelClosesWhileFlush() throws Exception {
+    public void commandNotExecutedChannelClosesWhileFlush() {
 
         assumeTrue(Version.identify().get("netty-transport").artifactVersion().startsWith("4.0.2"));
 
@@ -185,8 +190,8 @@ public void commandNotExecutedChannelClosesWhileFlush() throws Exception {
 
         final CountDownLatch block = new CountDownLatch(1);
 
-        AsyncCommand<String, String, Object> command = new AsyncCommand<String, String, Object>(
-                new Command<>(CommandType.INCR, new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key))) {
+        AsyncCommand<String, String, Object> command = new AsyncCommand<String, String, Object>(new Command<>(CommandType.INCR,
+                new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key))) {
 
             @Override
             public void encode(ByteBuf buf) {
@@ -220,7 +225,7 @@ public void encode(ByteBuf buf) {
     }
 
     @Test
-    public void commandFailsDuringDecode() throws Exception {
+    public void commandFailsDuringDecode() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> sync = connection.sync();
@@ -229,8 +234,8 @@ public void commandFailsDuringDecode() throws Exception {
 
         sync.set(key, "1");
 
-        AsyncCommand<String, String, String> command = new AsyncCommand<>(
-                new Command<>(CommandType.INCR, new StatusOutput<>(CODEC), new CommandArgs<>(CODEC).addKey(key)));
+        AsyncCommand<String, String, String> command = new AsyncCommand<>(new Command<>(CommandType.INCR, new StatusOutput<>(
+                CODEC), new CommandArgs<>(CODEC).addKey(key)));
 
         channelWriter.write(command);
 
@@ -245,7 +250,7 @@ public void commandFailsDuringDecode() throws Exception {
     }
 
     @Test
-    public void noCommandsExecutedAfterConnectionIsDisconnected() throws Exception {
+    public void noCommandsExecutedAfterConnectionIsDisconnected() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         connection.sync().quit();

From 43cfb17fa94195eb19eaccae48d28eddaa75b064 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 7 Nov 2017 15:10:40 +0100
Subject: [PATCH 350/808] Polishing

Remove superfluous exception declarations
---
 .../cluster/ClusterPartiallyDownTest.java     |  13 +--
 .../commands/CustomClusterCommandTest.java    |  28 ++---
 .../commands/GeoClusterCommandTest.java       |  20 ++--
 .../commands/HashClusterCommandTest.java      |   6 +-
 .../commands/KeyClusterCommandTest.java       |  12 +-
 .../commands/ListClusterCommandTest.java      |  20 ++--
 .../commands/StringClusterCommandTest.java    |  15 ++-
 .../HashClusterReactiveCommandTest.java       |   4 +-
 .../KeyClusterReativeCommandTest.java         |   8 +-
 .../ListClusterReactiveCommandTest.java       |  14 +--
 .../StringClusterReactiveCommandTest.java     |   6 +-
 .../lettuce/core/commands/BitCommandTest.java |  42 +++----
 .../core/commands/CustomCommandTest.java      |  28 ++---
 .../lettuce/core/commands/GeoCommandTest.java |  58 +++++-----
 .../lettuce/core/commands/HLLCommandTest.java |  19 ++--
 .../core/commands/HashCommandTest.java        |  58 +++++-----
 .../lettuce/core/commands/KeyCommandTest.java |  76 ++++++-------
 .../core/commands/ListCommandTest.java        |  46 ++++----
 .../core/commands/NumericCommandTest.java     |  17 ++-
 .../RunOnlyOnceServerCommandTest.java         |  37 +++----
 .../core/commands/ScriptingCommandTest.java   |  29 ++---
 .../core/commands/ServerCommandTest.java      |  16 +--
 .../lettuce/core/commands/SetCommandTest.java |  66 +++++------
 .../core/commands/SortCommandTest.java        |  29 ++---
 .../core/commands/SortedSetCommandTest.java   | 104 +++++++++---------
 .../core/commands/StringCommandTest.java      |  40 +++----
 .../core/commands/TransactionCommandTest.java |  25 ++---
 .../reactive/BitReactiveCommandTest.java      |  13 +--
 .../reactive/CustomReactiveCommandTest.java   |   5 +-
 .../reactive/GeoReactiveCommandTest.java      |   5 +-
 .../reactive/ServerReactiveCommandTest.java   |   4 +-
 .../reactive/StringReactiveCommandTest.java   |   5 +-
 .../TransactionReactiveCommandTest.java       |  16 +--
 .../transactional/GeoTxCommandTest.java       |  16 +--
 .../transactional/KeyTxCommandTest.java       |   2 +-
 35 files changed, 441 insertions(+), 461 deletions(-)

diff --git a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
index 77504a19f2..1529986820 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
 
-import java.io.IOException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -62,17 +61,17 @@ public static void beforeClass() {
     }
 
     @Before
-    public void before() throws Exception {
+    public void before() {
 
     }
 
     @After
-    public void after() throws Exception {
+    public void after() {
         redisClusterClient.shutdown();
     }
 
     @Test
-    public void connectToPartiallyDownCluster() throws Exception {
+    public void connectToPartiallyDownCluster() throws IOException {
 
         List<RedisURI> seed = LettuceLists.unmodifiableList(URI_1, URI_2, URI_3, URI_4);
         redisClusterClient = RedisClusterClient.create(clientResources, seed);
@@ -84,7 +83,7 @@ public void connectToPartiallyDownCluster() throws Exception {
     }
 
     @Test
-    public void operateOnPartiallyDownCluster() throws Exception {
+    public void operateOnPartiallyDownCluster() {
 
         List<RedisURI> seed = LettuceLists.unmodifiableList(URI_1, URI_2, URI_3, URI_4);
         redisClusterClient = RedisClusterClient.create(clientResources, seed);
@@ -104,7 +103,7 @@ public void operateOnPartiallyDownCluster() throws Exception {
     }
 
     @Test
-    public void seedNodesAreOffline() throws Exception {
+    public void seedNodesAreOffline() {
 
         List<RedisURI> seed = LettuceLists.unmodifiableList(URI_1, URI_2, URI_3);
         redisClusterClient = RedisClusterClient.create(clientResources, seed);
@@ -119,7 +118,7 @@ public void seedNodesAreOffline() throws Exception {
     }
 
     @Test
-    public void partitionNodesAreOffline() throws Exception {
+    public void partitionNodesAreOffline() {
 
         List<RedisURI> seed = LettuceLists.unmodifiableList(URI_1, URI_2, URI_3);
         redisClusterClient = RedisClusterClient.create(clientResources, seed);
diff --git a/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java
index 44300baaa9..38ef141a8b 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java
@@ -61,14 +61,14 @@ public static void closeClient() {
     }
 
     @Before
-    public void openConnection() throws Exception {
+    public void openConnection() {
         redisClusterConnection = redisClusterClient.connect();
         redis = redisClusterConnection.sync();
         ClusterTestUtil.flushDatabaseOfAllNodes(redisClusterConnection);
     }
 
     @Test
-    public void dispatchSet() throws Exception {
+    public void dispatchSet() {
 
         String response = redis.dispatch(CustomCommandTest.MyCommands.SET, new StatusOutput<>(utf8StringCodec),
                 new CommandArgs<>(utf8StringCodec).addKey(key).addValue(value));
@@ -77,7 +77,7 @@ public void dispatchSet() throws Exception {
     }
 
     @Test
-    public void dispatchWithoutArgs() throws Exception {
+    public void dispatchWithoutArgs() {
 
         String response = redis.dispatch(CustomCommandTest.MyCommands.INFO, new StatusOutput<>(utf8StringCodec));
 
@@ -85,14 +85,14 @@ public void dispatchWithoutArgs() throws Exception {
     }
 
     @Test(expected = RedisCommandExecutionException.class)
-    public void dispatchShouldFailForWrongDataType() throws Exception {
+    public void dispatchShouldFailForWrongDataType() {
 
         redis.hset(key, key, value);
         redis.dispatch(CommandType.GET, new StatusOutput<>(utf8StringCodec), new CommandArgs<>(utf8StringCodec).addKey(key));
     }
 
     @Test
-    public void clusterAsyncPing() throws Exception {
+    public void clusterAsyncPing() {
 
         RedisCommand<String, String, String> command = new Command<>(CustomCommandTest.MyCommands.PING, new StatusOutput<>(
                 utf8StringCodec), null);
@@ -100,11 +100,11 @@ public void clusterAsyncPing() throws Exception {
         AsyncCommand<String, String, String> async = new AsyncCommand<>(command);
         redisClusterConnection.dispatch(async);
 
-        assertThat(async.get()).isEqualTo("PONG");
+        assertThat(async.join()).isEqualTo("PONG");
     }
 
     @Test
-    public void clusterAsyncBatchPing() throws Exception {
+    public void clusterAsyncBatchPing() {
 
         RedisCommand<String, String, String> command1 = new Command<>(CustomCommandTest.MyCommands.PING, new StatusOutput<>(
                 utf8StringCodec), null);
@@ -116,12 +116,12 @@ public void clusterAsyncBatchPing() throws Exception {
         AsyncCommand<String, String, String> async2 = new AsyncCommand<>(command2);
         redisClusterConnection.dispatch(Arrays.asList(async1, async2));
 
-        assertThat(async1.get()).isEqualTo("PONG");
-        assertThat(async2.get()).isEqualTo("PONG");
+        assertThat(async1.join()).isEqualTo("PONG");
+        assertThat(async2.join()).isEqualTo("PONG");
     }
 
     @Test
-    public void clusterAsyncBatchSet() throws Exception {
+    public void clusterAsyncBatchSet() {
 
         RedisCommand<String, String, String> command1 = new Command<>(CommandType.SET, new StatusOutput<>(utf8StringCodec),
                 new CommandArgs<>(utf8StringCodec).addKey("key1").addValue("value"));
@@ -137,13 +137,13 @@ public void clusterAsyncBatchSet() throws Exception {
         AsyncCommand<String, String, String> async3 = new AsyncCommand<>(command3);
         redisClusterConnection.dispatch(Arrays.asList(async1, async2, async3));
 
-        assertThat(async1.get()).isEqualTo("OK");
-        assertThat(async2.get()).isEqualTo("value");
-        assertThat(async3.get()).isEqualTo("OK");
+        assertThat(async1.join()).isEqualTo("OK");
+        assertThat(async2.join()).isEqualTo("value");
+        assertThat(async3.join()).isEqualTo("OK");
     }
 
     @Test
-    public void clusterFireAndForget() throws Exception {
+    public void clusterFireAndForget() {
 
         RedisCommand<String, String, String> command = new Command<>(CustomCommandTest.MyCommands.PING, new StatusOutput<>(
                 utf8StringCodec), null);
diff --git a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
index d9cac4013e..a0600afd9d 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ public static void closeClient() {
     }
 
     @Before
-    public void openConnection() throws Exception {
+    public void openConnection() {
         redis = connect();
         flushDatabaseOfAllNodes(clusterConnection);
     }
@@ -71,41 +71,41 @@ protected RedisCommands<String, String> connect() {
 
     @Ignore("MULTI not available on Redis Cluster")
     @Override
-    public void geoaddWithTransaction() throws Exception {
+    public void geoaddWithTransaction() {
     }
 
     @Ignore("MULTI not available on Redis Cluster")
     @Override
-    public void geoaddMultiWithTransaction() throws Exception {
+    public void geoaddMultiWithTransaction() {
     }
 
     @Ignore("MULTI not available on Redis Cluster")
     @Override
-    public void georadiusWithTransaction() throws Exception {
+    public void georadiusWithTransaction() {
     }
 
     @Ignore("MULTI not available on Redis Cluster")
     @Override
-    public void geodistWithTransaction() throws Exception {
+    public void geodistWithTransaction() {
     }
 
     @Ignore("MULTI not available on Redis Cluster")
     @Override
-    public void georadiusWithArgsAndTransaction() throws Exception {
+    public void georadiusWithArgsAndTransaction() {
     }
 
     @Ignore("MULTI not available on Redis Cluster")
     @Override
-    public void georadiusbymemberWithArgsAndTransaction() throws Exception {
+    public void georadiusbymemberWithArgsAndTransaction() {
     }
 
     @Ignore("MULTI not available on Redis Cluster")
     @Override
-    public void geoposWithTransaction() throws Exception {
+    public void geoposWithTransaction() {
     }
 
     @Ignore("MULTI not available on Redis Cluster")
     @Override
-    public void geohashWithTransaction() throws Exception {
+    public void geohashWithTransaction() {
     }
 }
diff --git a/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java
index da7a22cf28..d22c5351e0 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,11 @@
  */
 package io.lettuce.core.cluster.commands;
 
-import io.lettuce.TestClientResources;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 
+import io.lettuce.TestClientResources;
 import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.TestSettings;
@@ -49,7 +49,7 @@ public static void closeClient() {
     }
 
     @Before
-    public void openConnection() throws Exception {
+    public void openConnection() {
         redis = connect();
         ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
     }
diff --git a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
index 1a85e837bf..1a865a2369 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ public static void closeClient() {
     }
 
     @Before
-    public void openConnection() throws Exception {
+    public void openConnection() {
         redis = connect();
         ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
     }
@@ -67,7 +67,7 @@ protected RedisCommands<String, String> connect() {
     }
 
     @Test
-    public void del() throws Exception {
+    public void del() {
 
         redis.set(key, "value");
         redis.set("a", "value");
@@ -80,7 +80,7 @@ public void del() throws Exception {
     }
 
     @Test
-    public void exists() throws Exception {
+    public void exists() {
 
         assertThat(redis.exists(key, "a", "b")).isEqualTo(0);
 
@@ -92,7 +92,7 @@ public void exists() throws Exception {
     }
 
     @Test
-    public void touch() throws Exception {
+    public void touch() {
 
         assumeTrue(RedisConditions.of(redis).hasCommand("TOUCH"));
 
@@ -105,7 +105,7 @@ public void touch() throws Exception {
     }
 
     @Test
-    public void unlink() throws Exception {
+    public void unlink() {
 
         assumeTrue(RedisConditions.of(redis).hasCommand("UNLINK"));
 
diff --git a/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java
index 090569ad20..e595331775 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,14 @@
  */
 package io.lettuce.core.cluster.commands;
 
-import io.lettuce.TestClientResources;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import io.lettuce.TestClientResources;
 import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.TestSettings;
@@ -30,8 +32,6 @@
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.commands.ListCommandTest;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 /**
  * @author Mark Paluch
  */
@@ -51,7 +51,7 @@ public static void closeClient() {
     }
 
     @Before
-    public void openConnection() throws Exception {
+    public void openConnection() {
         redis = connect();
         ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
     }
@@ -65,7 +65,7 @@ protected RedisCommands<String, String> connect() {
 
     // re-implementation because keys have to be on the same slot
     @Test
-    public void brpoplpush() throws Exception {
+    public void brpoplpush() {
 
         redis.rpush("UKPDHs8Zlp", "1", "2");
         redis.rpush("br7EPz9bbj", "3", "4");
@@ -75,24 +75,24 @@ public void brpoplpush() throws Exception {
     }
 
     @Test
-    public void brpoplpushTimeout() throws Exception {
+    public void brpoplpushTimeout() {
         assertThat(redis.brpoplpush(1, "UKPDHs8Zlp", "br7EPz9bbj")).isNull();
     }
 
     @Test
-    public void blpop() throws Exception {
+    public void blpop() {
         redis.rpush("br7EPz9bbj", "2", "3");
         assertThat(redis.blpop(1, "UKPDHs8Zlp", "br7EPz9bbj")).isEqualTo(kv("br7EPz9bbj", "2"));
     }
 
     @Test
-    public void brpop() throws Exception {
+    public void brpop() {
         redis.rpush("br7EPz9bbj", "2", "3");
         assertThat(redis.brpop(1, "UKPDHs8Zlp", "br7EPz9bbj")).isEqualTo(kv("br7EPz9bbj", "3"));
     }
 
     @Test
-    public void rpoplpush() throws Exception {
+    public void rpoplpush() {
         assertThat(redis.rpoplpush("UKPDHs8Zlp", "br7EPz9bbj")).isNull();
         redis.rpush("UKPDHs8Zlp", "1", "2");
         redis.rpush("br7EPz9bbj", "3", "4");
diff --git a/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java
index 59976dfe6b..38337d2317 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +20,16 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.core.*;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import io.lettuce.TestClientResources;
+import io.lettuce.core.FastShutdown;
+import io.lettuce.core.KeyValueStreamingAdapter;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.ClusterTestUtil;
 import io.lettuce.core.cluster.RedisClusterClient;
@@ -52,7 +55,7 @@ public static void closeClient() {
     }
 
     @Before
-    public void openConnection() throws Exception {
+    public void openConnection() {
         redis = connect();
         ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
     }
@@ -65,7 +68,7 @@ protected RedisCommands<String, String> connect() {
     }
 
     @Test
-    public void msetnx() throws Exception {
+    public void msetnx() {
         redis.set("one", "1");
         Map<String, String> map = new LinkedHashMap<>();
         map.put("one", "1");
@@ -78,7 +81,7 @@ public void msetnx() throws Exception {
     }
 
     @Test
-    public void mgetStreaming() throws Exception {
+    public void mgetStreaming() {
         setupMget();
 
         KeyValueStreamingAdapter<String, String> streamingAdapter = new KeyValueStreamingAdapter<>();
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
index 432387c39f..d664371501 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,7 +50,7 @@ public static void closeClient() {
     }
 
     @Before
-    public void openConnection() throws Exception {
+    public void openConnection() {
         redis = connect();
         ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
     }
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java
index 9d30831e01..37f9cffce1 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,11 @@
  */
 package io.lettuce.core.cluster.commands.reactive;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 
+import io.lettuce.TestClientResources;
 import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.TestSettings;
@@ -29,6 +28,7 @@
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.commands.KeyClusterCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -49,7 +49,7 @@ public static void closeClient() {
     }
 
     @Before
-    public void openConnection() throws Exception {
+    public void openConnection() {
         redis = connect();
         ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
     }
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
index ef9aa91bc6..a794b27b13 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ public static void closeClient() {
     }
 
     @Before
-    public void openConnection() throws Exception {
+    public void openConnection() {
         redis = connect();
         ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
     }
@@ -65,7 +65,7 @@ protected RedisCommands<String, String> connect() {
 
     // re-implementation because keys have to be on the same slot
     @Test
-    public void brpoplpush() throws Exception {
+    public void brpoplpush() {
 
         redis.rpush("UKPDHs8Zlp", "1", "2");
         redis.rpush("br7EPz9bbj", "3", "4");
@@ -75,24 +75,24 @@ public void brpoplpush() throws Exception {
     }
 
     @Test
-    public void brpoplpushTimeout() throws Exception {
+    public void brpoplpushTimeout() {
         assertThat(redis.brpoplpush(1, "UKPDHs8Zlp", "br7EPz9bbj")).isNull();
     }
 
     @Test
-    public void blpop() throws Exception {
+    public void blpop() {
         redis.rpush("br7EPz9bbj", "2", "3");
         assertThat(redis.blpop(1, "UKPDHs8Zlp", "br7EPz9bbj")).isEqualTo(kv("br7EPz9bbj", "2"));
     }
 
     @Test
-    public void brpop() throws Exception {
+    public void brpop() {
         redis.rpush("br7EPz9bbj", "2", "3");
         assertThat(redis.brpop(1, "UKPDHs8Zlp", "br7EPz9bbj")).isEqualTo(kv("br7EPz9bbj", "3"));
     }
 
     @Test
-    public void rpoplpush() throws Exception {
+    public void rpoplpush() {
         assertThat(redis.rpoplpush("UKPDHs8Zlp", "br7EPz9bbj")).isNull();
         redis.rpush("UKPDHs8Zlp", "1", "2");
         redis.rpush("br7EPz9bbj", "3", "4");
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
index 0c070dcd87..84bb5ba892 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
@@ -59,7 +59,7 @@ public static void closeClient() {
     }
 
     @Before
-    public void openConnection() throws Exception {
+    public void openConnection() {
         redis = connect();
         ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
     }
@@ -71,7 +71,7 @@ protected RedisCommands<String, String> connect() {
     }
 
     @Test
-    public void msetnx() throws Exception {
+    public void msetnx() {
         redis.set("one", "1");
         Map<String, String> map = new LinkedHashMap<>();
         map.put("one", "1");
@@ -84,7 +84,7 @@ public void msetnx() throws Exception {
     }
 
     @Test
-    public void mget() throws Exception {
+    public void mget() {
 
         redis.set(key, value);
         redis.set("key1", value);
diff --git a/src/test/java/io/lettuce/core/commands/BitCommandTest.java b/src/test/java/io/lettuce/core/commands/BitCommandTest.java
index 23c0cbe40f..0f84316fae 100644
--- a/src/test/java/io/lettuce/core/commands/BitCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/BitCommandTest.java
@@ -59,7 +59,7 @@ public void closeConnection() throws Exception {
     }
 
     @Test
-    public void bitcount() throws Exception {
+    public void bitcount() {
         assertThat((long) redis.bitcount(key)).isEqualTo(0);
 
         redis.setbit(key, 0, 1);
@@ -71,7 +71,7 @@ public void bitcount() throws Exception {
     }
 
     @Test
-    public void bitfieldType() throws Exception {
+    public void bitfieldType() {
         assertThat(signed(64).getBits()).isEqualTo(64);
         assertThat(signed(64).isSigned()).isTrue();
         assertThat(unsigned(63).getBits()).isEqualTo(63);
@@ -79,22 +79,22 @@ public void bitfieldType() throws Exception {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void bitfieldTypeSigned65() throws Exception {
+    public void bitfieldTypeSigned65() {
         signed(65);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void bitfieldTypeUnsigned64() throws Exception {
+    public void bitfieldTypeUnsigned64() {
         unsigned(64);
     }
 
     @Test(expected = IllegalStateException.class)
-    public void bitfieldBuilderEmptyPreviousType() throws Exception {
+    public void bitfieldBuilderEmptyPreviousType() {
         new BitFieldArgs().overflow(WRAP).get();
     }
 
     @Test
-    public void bitfieldArgsTest() throws Exception {
+    public void bitfieldArgsTest() {
 
         assertThat(signed(5).toString()).isEqualTo("i5");
         assertThat(unsigned(5).toString()).isEqualTo("u5");
@@ -104,7 +104,7 @@ public void bitfieldArgsTest() throws Exception {
     }
 
     @Test
-    public void bitfield() throws Exception {
+    public void bitfield() {
 
         assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
 
@@ -117,7 +117,7 @@ public void bitfield() throws Exception {
     }
 
     @Test
-    public void bitfieldGetWithOffset() throws Exception {
+    public void bitfieldGetWithOffset() {
 
         assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
 
@@ -130,7 +130,7 @@ public void bitfieldGetWithOffset() throws Exception {
     }
 
     @Test
-    public void bitfieldSet() throws Exception {
+    public void bitfieldSet() {
 
         assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
 
@@ -143,7 +143,7 @@ public void bitfieldSet() throws Exception {
     }
 
     @Test
-    public void bitfieldWithOffsetSet() throws Exception {
+    public void bitfieldWithOffsetSet() {
 
         assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
 
@@ -156,7 +156,7 @@ public void bitfieldWithOffsetSet() throws Exception {
     }
 
     @Test
-    public void bitfieldIncrBy() throws Exception {
+    public void bitfieldIncrBy() {
 
         assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
 
@@ -169,7 +169,7 @@ public void bitfieldIncrBy() throws Exception {
     }
 
     @Test
-    public void bitfieldWithOffsetIncrBy() throws Exception {
+    public void bitfieldWithOffsetIncrBy() {
 
         assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
 
@@ -182,7 +182,7 @@ public void bitfieldWithOffsetIncrBy() throws Exception {
     }
 
     @Test
-    public void bitfieldOverflow() throws Exception {
+    public void bitfieldOverflow() {
 
         assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
 
@@ -194,7 +194,7 @@ public void bitfieldOverflow() throws Exception {
     }
 
     @Test
-    public void bitpos() throws Exception {
+    public void bitpos() {
         assertThat((long) redis.bitcount(key)).isEqualTo(0);
         redis.setbit(key, 0, 0);
         redis.setbit(key, 1, 1);
@@ -204,7 +204,7 @@ public void bitpos() throws Exception {
     }
 
     @Test
-    public void bitposOffset() throws Exception {
+    public void bitposOffset() {
         assertThat((long) redis.bitcount(key)).isEqualTo(0);
         redis.setbit(key, 0, 1);
         redis.setbit(key, 1, 1);
@@ -223,7 +223,7 @@ public void bitposOffset() throws Exception {
     }
 
     @Test
-    public void bitopAnd() throws Exception {
+    public void bitopAnd() {
         redis.setbit("foo", 0, 1);
         redis.setbit("bar", 1, 1);
         redis.setbit("baz", 2, 1);
@@ -233,7 +233,7 @@ public void bitopAnd() throws Exception {
     }
 
     @Test
-    public void bitopNot() throws Exception {
+    public void bitopNot() {
         redis.setbit("foo", 0, 1);
         redis.setbit("foo", 2, 1);
 
@@ -243,7 +243,7 @@ public void bitopNot() throws Exception {
     }
 
     @Test
-    public void bitopOr() throws Exception {
+    public void bitopOr() {
         redis.setbit("foo", 0, 1);
         redis.setbit("bar", 1, 1);
         redis.setbit("baz", 2, 1);
@@ -252,7 +252,7 @@ public void bitopOr() throws Exception {
     }
 
     @Test
-    public void bitopXor() throws Exception {
+    public void bitopXor() {
         redis.setbit("foo", 0, 1);
         redis.setbit("bar", 0, 1);
         redis.setbit("baz", 2, 1);
@@ -261,14 +261,14 @@ public void bitopXor() throws Exception {
     }
 
     @Test
-    public void getbit() throws Exception {
+    public void getbit() {
         assertThat(redis.getbit(key, 0)).isEqualTo(0);
         redis.setbit(key, 0, 1);
         assertThat(redis.getbit(key, 0)).isEqualTo(1);
     }
 
     @Test
-    public void setbit() throws Exception {
+    public void setbit() {
 
         assertThat(redis.setbit(key, 0, 1)).isEqualTo(0);
         assertThat(redis.setbit(key, 0, 0)).isEqualTo(1);
diff --git a/src/test/java/io/lettuce/core/commands/CustomCommandTest.java b/src/test/java/io/lettuce/core/commands/CustomCommandTest.java
index e80a852d48..c5ae3fa3fd 100644
--- a/src/test/java/io/lettuce/core/commands/CustomCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/CustomCommandTest.java
@@ -38,7 +38,7 @@ public class CustomCommandTest extends AbstractRedisClientTest {
     protected final Utf8StringCodec utf8StringCodec = new Utf8StringCodec();
 
     @Test
-    public void dispatchSet() throws Exception {
+    public void dispatchSet() {
 
         String response = redis.dispatch(MyCommands.SET, new StatusOutput<>(utf8StringCodec),
                 new CommandArgs<>(utf8StringCodec).addKey(key).addValue(value));
@@ -47,7 +47,7 @@ public void dispatchSet() throws Exception {
     }
 
     @Test
-    public void dispatchWithoutArgs() throws Exception {
+    public void dispatchWithoutArgs() {
 
         String response = redis.dispatch(MyCommands.INFO, new StatusOutput<>(utf8StringCodec));
 
@@ -55,14 +55,14 @@ public void dispatchWithoutArgs() throws Exception {
     }
 
     @Test(expected = RedisCommandExecutionException.class)
-    public void dispatchShouldFailForWrongDataType() throws Exception {
+    public void dispatchShouldFailForWrongDataType() {
 
         redis.hset(key, key, value);
         redis.dispatch(CommandType.GET, new StatusOutput<>(utf8StringCodec), new CommandArgs<>(utf8StringCodec).addKey(key));
     }
 
     @Test
-    public void dispatchTransactions() throws Exception {
+    public void dispatchTransactions() {
 
         redis.multi();
         String response = redis.dispatch(CommandType.SET, new StatusOutput<>(utf8StringCodec), new CommandArgs<>(
@@ -75,18 +75,18 @@ public void dispatchTransactions() throws Exception {
     }
 
     @Test
-    public void standaloneAsyncPing() throws Exception {
+    public void standaloneAsyncPing() {
 
         RedisCommand<String, String, String> command = new Command<>(MyCommands.PING, new StatusOutput<>(utf8StringCodec), null);
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(command);
         getStandaloneConnection().dispatch(async);
 
-        assertThat(async.get()).isEqualTo("PONG");
+        assertThat(async.join()).isEqualTo("PONG");
     }
 
     @Test
-    public void standaloneAsyncBatchPing() throws Exception {
+    public void standaloneAsyncBatchPing() {
 
         RedisCommand<String, String, String> command1 = new Command<>(MyCommands.PING, new StatusOutput<>(utf8StringCodec),
                 null);
@@ -98,12 +98,12 @@ public void standaloneAsyncBatchPing() throws Exception {
         AsyncCommand<String, String, String> async2 = new AsyncCommand<>(command2);
         getStandaloneConnection().dispatch(Arrays.asList(async1, async2));
 
-        assertThat(async1.get()).isEqualTo("PONG");
-        assertThat(async2.get()).isEqualTo("PONG");
+        assertThat(async1.join()).isEqualTo("PONG");
+        assertThat(async2.join()).isEqualTo("PONG");
     }
 
     @Test
-    public void standaloneAsyncBatchTransaction() throws Exception {
+    public void standaloneAsyncBatchTransaction() {
 
         RedisCommand<String, String, String> multi = new Command<>(CommandType.MULTI, new StatusOutput<>(utf8StringCodec));
 
@@ -117,16 +117,16 @@ public void standaloneAsyncBatchTransaction() throws Exception {
         AsyncCommand<String, String, TransactionResult> async3 = new AsyncCommand<>(exec);
         getStandaloneConnection().dispatch(Arrays.asList(async1, async2, async3));
 
-        assertThat(async1.get()).isEqualTo("OK");
-        assertThat(async2.get()).isEqualTo("OK");
+        assertThat(async1.join()).isEqualTo("OK");
+        assertThat(async2.join()).isEqualTo("OK");
 
-        TransactionResult transactionResult = async3.get();
+        TransactionResult transactionResult = async3.join();
         assertThat(transactionResult.wasRolledBack()).isFalse();
         assertThat(transactionResult.<String> get(0)).isEqualTo("OK");
     }
 
     @Test
-    public void standaloneFireAndForget() throws Exception {
+    public void standaloneFireAndForget() {
 
         RedisCommand<String, String, String> command = new Command<>(MyCommands.PING, new StatusOutput<>(utf8StringCodec), null);
         getStandaloneConnection().dispatch(command);
diff --git a/src/test/java/io/lettuce/core/commands/GeoCommandTest.java b/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
index 513438e98c..7569f6f61b 100644
--- a/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
@@ -47,7 +47,7 @@ public static void setupClient() {
     }
 
     @Test
-    public void geoadd() throws Exception {
+    public void geoadd() {
 
         Long result = redis.geoadd(key, -73.9454966, 40.747533, "lic market");
         assertThat(result).isEqualTo(1);
@@ -57,7 +57,7 @@ public void geoadd() throws Exception {
     }
 
     @Test
-    public void geoaddWithTransaction() throws Exception {
+    public void geoaddWithTransaction() {
 
         redis.multi();
         redis.geoadd(key, -73.9454966, 40.747533, "lic market");
@@ -67,7 +67,7 @@ public void geoaddWithTransaction() throws Exception {
     }
 
     @Test
-    public void geoaddMulti() throws Exception {
+    public void geoaddMulti() {
 
         Long result = redis.geoadd(key, 8.6638775, 49.5282537, "Weinheim", 8.3796281, 48.9978127, "EFS9", 8.665351, 49.553302,
                 "Bahn");
@@ -75,7 +75,7 @@ public void geoaddMulti() throws Exception {
     }
 
     @Test
-    public void geoaddMultiWithTransaction() throws Exception {
+    public void geoaddMultiWithTransaction() {
 
         redis.multi();
         redis.geoadd(key, 8.6638775, 49.5282537, "Weinheim", 8.3796281, 48.9978127, "EFS9", 8.665351, 49.553302, "Bahn");
@@ -84,7 +84,7 @@ public void geoaddMultiWithTransaction() throws Exception {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void geoaddMultiWrongArgument() throws Exception {
+    public void geoaddMultiWrongArgument() {
         redis.geoadd(key, 49.528253);
     }
 
@@ -94,7 +94,7 @@ protected void prepareGeo() {
     }
 
     @Test
-    public void georadius() throws Exception {
+    public void georadius() {
 
         prepareGeo();
 
@@ -106,7 +106,7 @@ public void georadius() throws Exception {
     }
 
     @Test
-    public void georadiusWithTransaction() throws Exception {
+    public void georadiusWithTransaction() {
 
         prepareGeo();
 
@@ -123,7 +123,7 @@ public void georadiusWithTransaction() throws Exception {
     }
 
     @Test
-    public void geodist() throws Exception {
+    public void geodist() {
 
         prepareGeo();
 
@@ -133,7 +133,7 @@ public void geodist() throws Exception {
     }
 
     @Test
-    public void geodistMissingElements() throws Exception {
+    public void geodistMissingElements() {
 
         assumeTrue(RedisConditions.of(redis).hasVersionGreaterOrEqualsTo("3.4"));
         prepareGeo();
@@ -144,7 +144,7 @@ public void geodistMissingElements() throws Exception {
     }
 
     @Test
-    public void geodistWithTransaction() throws Exception {
+    public void geodistWithTransaction() {
 
         prepareGeo();
 
@@ -157,7 +157,7 @@ public void geodistWithTransaction() throws Exception {
     }
 
     @Test
-    public void geopos() throws Exception {
+    public void geopos() {
 
         prepareGeo();
 
@@ -175,7 +175,7 @@ public void geopos() throws Exception {
     }
 
     @Test
-    public void geoposWithTransaction() throws Exception {
+    public void geoposWithTransaction() {
 
         prepareGeo();
 
@@ -191,7 +191,7 @@ public void geoposWithTransaction() throws Exception {
     }
 
     @Test
-    public void georadiusWithArgs() throws Exception {
+    public void georadiusWithArgs() {
 
         prepareGeo();
 
@@ -222,7 +222,7 @@ public void georadiusWithArgs() throws Exception {
     }
 
     @Test
-    public void georadiusWithArgsAndTransaction() throws Exception {
+    public void georadiusWithArgsAndTransaction() {
 
         prepareGeo();
 
@@ -259,7 +259,7 @@ public void georadiusWithArgsAndTransaction() throws Exception {
     }
 
     @Test
-    public void geohash() throws Exception {
+    public void geohash() {
 
         prepareGeo();
 
@@ -269,7 +269,7 @@ public void geohash() throws Exception {
     }
 
     @Test
-    public void geohashUnknownKey() throws Exception {
+    public void geohashUnknownKey() {
 
         assumeTrue(RedisConditions.of(redis).hasVersionGreaterOrEqualsTo("3.4"));
 
@@ -282,7 +282,7 @@ public void geohashUnknownKey() throws Exception {
     }
 
     @Test
-    public void geohashWithTransaction() throws Exception {
+    public void geohashWithTransaction() {
 
         prepareGeo();
 
@@ -297,7 +297,7 @@ public void geohashWithTransaction() throws Exception {
     }
 
     @Test
-    public void georadiusStore() throws Exception {
+    public void georadiusStore() {
 
         prepareGeo();
 
@@ -311,7 +311,7 @@ public void georadiusStore() throws Exception {
     }
 
     @Test
-    public void georadiusStoreWithCountAndSort() throws Exception {
+    public void georadiusStoreWithCountAndSort() {
 
         prepareGeo();
 
@@ -326,7 +326,7 @@ public void georadiusStoreWithCountAndSort() throws Exception {
     }
 
     @Test
-    public void georadiusStoreDist() throws Exception {
+    public void georadiusStoreDist() {
 
         prepareGeo();
 
@@ -340,7 +340,7 @@ public void georadiusStoreDist() throws Exception {
     }
 
     @Test
-    public void georadiusStoreDistWithCountAndSort() throws Exception {
+    public void georadiusStoreDistWithCountAndSort() {
 
         prepareGeo();
 
@@ -356,17 +356,17 @@ public void georadiusStoreDistWithCountAndSort() throws Exception {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void georadiusWithNullArgs() throws Exception {
+    public void georadiusWithNullArgs() {
         redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, (GeoArgs) null);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void georadiusStoreWithNullArgs() throws Exception {
+    public void georadiusStoreWithNullArgs() {
         redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, (GeoRadiusStoreArgs<String>) null);
     }
 
     @Test
-    public void georadiusbymember() throws Exception {
+    public void georadiusbymember() {
 
         prepareGeo();
 
@@ -378,7 +378,7 @@ public void georadiusbymember() throws Exception {
     }
 
     @Test
-    public void georadiusbymemberStoreDistWithCountAndSort() throws Exception {
+    public void georadiusbymemberStoreDistWithCountAndSort() {
 
         prepareGeo();
 
@@ -394,7 +394,7 @@ public void georadiusbymemberStoreDistWithCountAndSort() throws Exception {
     }
 
     @Test
-    public void georadiusbymemberWithArgs() throws Exception {
+    public void georadiusbymemberWithArgs() {
 
         prepareGeo();
 
@@ -434,7 +434,7 @@ public void georadiusbymemberWithArgs() throws Exception {
     }
 
     @Test
-    public void georadiusbymemberWithArgsAndTransaction() throws Exception {
+    public void georadiusbymemberWithArgsAndTransaction() {
 
         prepareGeo();
 
@@ -479,12 +479,12 @@ public void georadiusbymemberWithArgsAndTransaction() throws Exception {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void georadiusbymemberWithNullArgs() throws Exception {
+    public void georadiusbymemberWithNullArgs() {
         redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km, (GeoArgs) null);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void georadiusStorebymemberWithNullArgs() throws Exception {
+    public void georadiusStorebymemberWithNullArgs() {
         redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km, (GeoRadiusStoreArgs<String>) null);
     }
 
diff --git a/src/test/java/io/lettuce/core/commands/HLLCommandTest.java b/src/test/java/io/lettuce/core/commands/HLLCommandTest.java
index e2dd07792c..e725e1dcfc 100644
--- a/src/test/java/io/lettuce/core/commands/HLLCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/HLLCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
 
-import io.lettuce.core.cluster.SlotHash;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -35,7 +34,7 @@ private RedisHLLCommands<String, String> commands() {
     }
 
     @Test
-    public void pfadd() throws Exception {
+    public void pfadd() {
 
         assertThat(commands().pfadd(key, value, value)).isEqualTo(1);
         assertThat(commands().pfadd(key, value, value)).isEqualTo(0);
@@ -43,12 +42,12 @@ public void pfadd() throws Exception {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void pfaddNoValues() throws Exception {
+    public void pfaddNoValues() {
         commands().pfadd(key);
     }
 
     @Test
-    public void pfaddNullValues() throws Exception {
+    public void pfaddNullValues() {
         try {
             commands().pfadd(key, null);
             fail("Missing IllegalArgumentException");
@@ -62,7 +61,7 @@ public void pfaddNullValues() throws Exception {
     }
 
     @Test
-    public void pfmerge() throws Exception {
+    public void pfmerge() {
         commands().pfadd(key, value);
         commands().pfadd("key2", "value2");
         commands().pfadd("key3", "value3");
@@ -79,12 +78,12 @@ public void pfmerge() throws Exception {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void pfmergeNoKeys() throws Exception {
+    public void pfmergeNoKeys() {
         commands().pfmerge(key);
     }
 
     @Test
-    public void pfcount() throws Exception {
+    public void pfcount() {
         commands().pfadd(key, value);
         commands().pfadd("key2", "value2");
         assertThat(commands().pfcount(key)).isEqualTo(1);
@@ -92,12 +91,12 @@ public void pfcount() throws Exception {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void pfcountNoKeys() throws Exception {
+    public void pfcountNoKeys() {
         commands().pfcount();
     }
 
     @Test
-    public void pfaddPfmergePfCount() throws Exception {
+    public void pfaddPfmergePfCount() {
 
         commands().pfadd("key2660", "rand", "mat");
         commands().pfadd("key7112", "mat", "perrin");
diff --git a/src/test/java/io/lettuce/core/commands/HashCommandTest.java b/src/test/java/io/lettuce/core/commands/HashCommandTest.java
index 6e21f8a56a..3d404eb6ed 100644
--- a/src/test/java/io/lettuce/core/commands/HashCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/HashCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
 public class HashCommandTest extends AbstractRedisClientTest {
 
     @Test
-    public void hdel() throws Exception {
+    public void hdel() {
         assertThat(redis.hdel(key, "one")).isEqualTo(0);
         redis.hset(key, "two", "2");
         assertThat(redis.hdel(key, "one")).isEqualTo(0);
@@ -47,7 +47,7 @@ public void hdel() throws Exception {
     }
 
     @Test
-    public void hexists() throws Exception {
+    public void hexists() {
         assertThat(redis.hexists(key, "one")).isFalse();
         redis.hset(key, "two", "2");
         assertThat(redis.hexists(key, "one")).isFalse();
@@ -56,14 +56,14 @@ public void hexists() throws Exception {
     }
 
     @Test
-    public void hget() throws Exception {
+    public void hget() {
         assertThat(redis.hget(key, "one")).isNull();
         redis.hset(key, "one", "1");
         assertThat(redis.hget(key, "one")).isEqualTo("1");
     }
 
     @Test
-    public void hgetall() throws Exception {
+    public void hgetall() {
         assertThat(redis.hgetall(key).isEmpty()).isTrue();
 
         redis.hset(key, "zero", "0");
@@ -77,7 +77,7 @@ public void hgetall() throws Exception {
     }
 
     @Test
-    public void hgetallStreaming() throws Exception {
+    public void hgetallStreaming() {
 
         KeyValueStreamingAdapter<String, String> adapter = new KeyValueStreamingAdapter<String, String>();
 
@@ -93,20 +93,20 @@ public void hgetallStreaming() throws Exception {
     }
 
     @Test
-    public void hincrby() throws Exception {
+    public void hincrby() {
         assertThat(redis.hincrby(key, "one", 1)).isEqualTo(1);
         assertThat(redis.hincrby(key, "one", -2)).isEqualTo(-1);
     }
 
     @Test
-    public void hincrbyfloat() throws Exception {
+    public void hincrbyfloat() {
         assertThat(redis.hincrbyfloat(key, "one", 1.0)).isEqualTo(1.0);
         assertThat(redis.hincrbyfloat(key, "one", -2.0)).isEqualTo(-1.0);
         assertThat(redis.hincrbyfloat(key, "one", 1.23)).isEqualTo(0.23, offset(0.001));
     }
 
     @Test
-    public void hkeys() throws Exception {
+    public void hkeys() {
         setup();
         List<String> keys = redis.hkeys(key);
         assertThat(keys).hasSize(2);
@@ -114,7 +114,7 @@ public void hkeys() throws Exception {
     }
 
     @Test
-    public void hkeysStreaming() throws Exception {
+    public void hkeysStreaming() {
         setup();
         ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
 
@@ -133,14 +133,14 @@ private void setup() {
     }
 
     @Test
-    public void hlen() throws Exception {
+    public void hlen() {
         assertThat((long) redis.hlen(key)).isEqualTo(0);
         redis.hset(key, "one", "1");
         assertThat((long) redis.hlen(key)).isEqualTo(1);
     }
 
     @Test
-    public void hstrlen() throws Exception {
+    public void hstrlen() {
 
         assumeTrue(RedisConditions.of(redis).hasCommand("HSTRLEN"));
 
@@ -150,7 +150,7 @@ public void hstrlen() throws Exception {
     }
 
     @Test
-    public void hmget() throws Exception {
+    public void hmget() {
         setupHmget();
         List<KeyValue<String, String>> values = redis.hmget(key, "one", "two");
         assertThat(values).hasSize(2);
@@ -164,7 +164,7 @@ private void setupHmget() {
     }
 
     @Test
-    public void hmgetStreaming() throws Exception {
+    public void hmgetStreaming() {
         setupHmget();
 
         KeyValueStreamingAdapter<String, String> streamingAdapter = new KeyValueStreamingAdapter<>();
@@ -176,7 +176,7 @@ public void hmgetStreaming() throws Exception {
     }
 
     @Test
-    public void hmset() throws Exception {
+    public void hmset() {
         Map<String, String> hash = new LinkedHashMap<>();
         hash.put("one", "1");
         hash.put("two", "2");
@@ -185,7 +185,7 @@ public void hmset() throws Exception {
     }
 
     @Test
-    public void hmsetWithNulls() throws Exception {
+    public void hmsetWithNulls() {
         Map<String, String> hash = new LinkedHashMap<>();
         hash.put("one", null);
         assertThat(redis.hmset(key, hash)).isEqualTo("OK");
@@ -197,20 +197,20 @@ public void hmsetWithNulls() throws Exception {
     }
 
     @Test
-    public void hset() throws Exception {
+    public void hset() {
         assertThat(redis.hset(key, "one", "1")).isTrue();
         assertThat(redis.hset(key, "one", "1")).isFalse();
     }
 
     @Test
-    public void hsetnx() throws Exception {
+    public void hsetnx() {
         redis.hset(key, "one", "1");
         assertThat(redis.hsetnx(key, "one", "2")).isFalse();
         assertThat(redis.hget(key, "one")).isEqualTo("1");
     }
 
     @Test
-    public void hvals() throws Exception {
+    public void hvals() {
         assertThat(redis.hvals(key)).isEqualTo(list());
         redis.hset(key, "one", "1");
         redis.hset(key, "two", "2");
@@ -220,7 +220,7 @@ public void hvals() throws Exception {
     }
 
     @Test
-    public void hvalsStreaming() throws Exception {
+    public void hvalsStreaming() {
         assertThat(redis.hvals(key)).isEqualTo(list());
         redis.hset(key, "one", "1");
         redis.hset(key, "two", "2");
@@ -233,7 +233,7 @@ public void hvalsStreaming() throws Exception {
     }
 
     @Test
-    public void hscan() throws Exception {
+    public void hscan() {
         redis.hset(key, key, value);
         MapScanCursor<String, String> cursor = redis.hscan(key);
 
@@ -243,7 +243,7 @@ public void hscan() throws Exception {
     }
 
     @Test
-    public void hscanWithCursor() throws Exception {
+    public void hscanWithCursor() {
         redis.hset(key, key, value);
 
         MapScanCursor<String, String> cursor = redis.hscan(key, ScanCursor.INITIAL);
@@ -254,7 +254,7 @@ public void hscanWithCursor() throws Exception {
     }
 
     @Test
-    public void hscanWithCursorAndArgs() throws Exception {
+    public void hscanWithCursorAndArgs() {
         redis.hset(key, key, value);
 
         MapScanCursor<String, String> cursor = redis.hscan(key, ScanCursor.INITIAL, ScanArgs.Builder.limit(2));
@@ -265,7 +265,7 @@ public void hscanWithCursorAndArgs() throws Exception {
     }
 
     @Test
-    public void hscanStreaming() throws Exception {
+    public void hscanStreaming() {
         redis.hset(key, key, value);
         KeyValueStreamingAdapter<String, String> adapter = new KeyValueStreamingAdapter<String, String>();
 
@@ -278,7 +278,7 @@ public void hscanStreaming() throws Exception {
     }
 
     @Test
-    public void hscanStreamingWithCursor() throws Exception {
+    public void hscanStreamingWithCursor() {
         redis.hset(key, key, value);
         KeyValueStreamingAdapter<String, String> adapter = new KeyValueStreamingAdapter<String, String>();
 
@@ -290,7 +290,7 @@ public void hscanStreamingWithCursor() throws Exception {
     }
 
     @Test
-    public void hscanStreamingWithCursorAndArgs() throws Exception {
+    public void hscanStreamingWithCursorAndArgs() {
         redis.hset(key, key, value);
         KeyValueStreamingAdapter<String, String> adapter = new KeyValueStreamingAdapter<String, String>();
 
@@ -302,7 +302,7 @@ public void hscanStreamingWithCursorAndArgs() throws Exception {
     }
 
     @Test
-    public void hscanStreamingWithArgs() throws Exception {
+    public void hscanStreamingWithArgs() {
         redis.hset(key, key, value);
         KeyValueStreamingAdapter<String, String> adapter = new KeyValueStreamingAdapter<String, String>();
 
@@ -314,7 +314,7 @@ public void hscanStreamingWithArgs() throws Exception {
     }
 
     @Test
-    public void hscanMultiple() throws Exception {
+    public void hscanMultiple() {
 
         Map<String, String> expect = new LinkedHashMap<>();
         Map<String, String> check = new LinkedHashMap<>();
@@ -339,7 +339,7 @@ public void hscanMultiple() throws Exception {
     }
 
     @Test
-    public void hscanMatch() throws Exception {
+    public void hscanMatch() {
 
         Map<String, String> expect = new LinkedHashMap<>();
         setup100KeyValues(expect);
diff --git a/src/test/java/io/lettuce/core/commands/KeyCommandTest.java b/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
index 92f8ac4613..e26e11fdf8 100644
--- a/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public class KeyCommandTest extends AbstractRedisClientTest {
     public ExpectedException exception = ExpectedException.none();
 
     @Test
-    public void del() throws Exception {
+    public void del() {
         redis.set(key, value);
         assertThat((long) redis.del(key)).isEqualTo(1);
         redis.set(key + "1", value);
@@ -48,7 +48,7 @@ public void del() throws Exception {
     }
 
     @Test
-    public void unlink() throws Exception {
+    public void unlink() {
 
         assumeTrue(RedisConditions.of(redis).hasCommand("UNLINK"));
 
@@ -60,21 +60,21 @@ public void unlink() throws Exception {
     }
 
     @Test
-    public void dump() throws Exception {
+    public void dump() {
         assertThat(redis.dump("invalid")).isNull();
         redis.set(key, value);
         assertThat(redis.dump(key).length > 0).isTrue();
     }
 
     @Test
-    public void exists() throws Exception {
+    public void exists() {
         assertThat(redis.exists(key)).isEqualTo(0);
         redis.set(key, value);
         assertThat(redis.exists(key)).isEqualTo(1);
     }
 
     @Test
-    public void existsVariadic() throws Exception {
+    public void existsVariadic() {
         assertThat(redis.exists(key, "key2", "key3")).isEqualTo(0);
         redis.set(key, value);
         redis.set("key2", value);
@@ -82,7 +82,7 @@ public void existsVariadic() throws Exception {
     }
 
     @Test
-    public void expire() throws Exception {
+    public void expire() {
         assertThat(redis.expire(key, 10)).isFalse();
         redis.set(key, value);
         assertThat(redis.expire(key, 10)).isTrue();
@@ -90,7 +90,7 @@ public void expire() throws Exception {
     }
 
     @Test
-    public void expireat() throws Exception {
+    public void expireat() {
         Date expiration = new Date(System.currentTimeMillis() + 10000);
         assertThat(redis.expireat(key, expiration)).isFalse();
         redis.set(key, value);
@@ -100,7 +100,7 @@ public void expireat() throws Exception {
     }
 
     @Test
-    public void keys() throws Exception {
+    public void keys() {
         assertThat(redis.keys("*")).isEqualTo(list());
         Map<String, String> map = new LinkedHashMap<>();
         map.put("one", "1");
@@ -114,7 +114,7 @@ public void keys() throws Exception {
     }
 
     @Test
-    public void keysStreaming() throws Exception {
+    public void keysStreaming() {
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
 
         assertThat(redis.keys("*")).isEqualTo(list());
@@ -133,7 +133,7 @@ public void keysStreaming() throws Exception {
     }
 
     @Test
-    public void move() throws Exception {
+    public void move() {
         redis.set(key, value);
         redis.move(key, 1);
         assertThat(redis.get(key)).isNull();
@@ -142,7 +142,7 @@ public void move() throws Exception {
     }
 
     @Test
-    public void objectEncoding() throws Exception {
+    public void objectEncoding() {
         redis.set(key, value);
         assertThat(redis.objectEncoding(key)).isEqualTo("embstr");
         redis.set(key, String.valueOf(1));
@@ -150,19 +150,19 @@ public void objectEncoding() throws Exception {
     }
 
     @Test
-    public void objectIdletime() throws Exception {
+    public void objectIdletime() {
         redis.set(key, value);
         assertThat((long) redis.objectIdletime(key)).isLessThan(2);
     }
 
     @Test
-    public void objectRefcount() throws Exception {
+    public void objectRefcount() {
         redis.set(key, value);
         assertThat(redis.objectRefcount(key)).isGreaterThan(0);
     }
 
     @Test
-    public void persist() throws Exception {
+    public void persist() {
         assertThat(redis.persist(key)).isFalse();
         redis.set(key, value);
         assertThat(redis.persist(key)).isFalse();
@@ -171,7 +171,7 @@ public void persist() throws Exception {
     }
 
     @Test
-    public void pexpire() throws Exception {
+    public void pexpire() {
         assertThat(redis.pexpire(key, 5000)).isFalse();
         redis.set(key, value);
         assertThat(redis.pexpire(key, 5000)).isTrue();
@@ -179,7 +179,7 @@ public void pexpire() throws Exception {
     }
 
     @Test
-    public void pexpireat() throws Exception {
+    public void pexpireat() {
         Date expiration = new Date(System.currentTimeMillis() + 5000);
         assertThat(redis.pexpireat(key, expiration)).isFalse();
         redis.set(key, value);
@@ -188,7 +188,7 @@ public void pexpireat() throws Exception {
     }
 
     @Test
-    public void pttl() throws Exception {
+    public void pttl() {
         assertThat((long) redis.pttl(key)).isEqualTo(-2);
         redis.set(key, value);
         assertThat((long) redis.pttl(key)).isEqualTo(-1);
@@ -197,14 +197,14 @@ public void pttl() throws Exception {
     }
 
     @Test
-    public void randomkey() throws Exception {
+    public void randomkey() {
         assertThat(redis.randomkey()).isNull();
         redis.set(key, value);
         assertThat(redis.randomkey()).isEqualTo(key);
     }
 
     @Test
-    public void rename() throws Exception {
+    public void rename() {
         redis.set(key, value);
 
         assertThat(redis.rename(key, key + "X")).isEqualTo("OK");
@@ -216,12 +216,12 @@ public void rename() throws Exception {
     }
 
     @Test(expected = RedisException.class)
-    public void renameNonexistentKey() throws Exception {
+    public void renameNonexistentKey() {
         redis.rename(key, key + "X");
     }
 
     @Test
-    public void renamenx() throws Exception {
+    public void renamenx() {
         redis.set(key, value);
         assertThat(redis.renamenx(key, key + "X")).isTrue();
         assertThat(redis.get(key + "X")).isEqualTo(value);
@@ -230,12 +230,12 @@ public void renamenx() throws Exception {
     }
 
     @Test(expected = RedisException.class)
-    public void renamenxNonexistentKey() throws Exception {
+    public void renamenxNonexistentKey() {
         redis.renamenx(key, key + "X");
     }
 
     @Test
-    public void restore() throws Exception {
+    public void restore() {
         redis.set(key, value);
         byte[] bytes = redis.dump(key);
         redis.del(key);
@@ -252,7 +252,7 @@ public void restore() throws Exception {
     }
 
     @Test
-    public void touch() throws Exception {
+    public void touch() {
 
         assumeTrue(RedisConditions.of(redis).hasCommand("TOUCH"));
 
@@ -262,7 +262,7 @@ public void touch() throws Exception {
     }
 
     @Test
-    public void ttl() throws Exception {
+    public void ttl() {
         assertThat((long) redis.ttl(key)).isEqualTo(-2);
         redis.set(key, value);
         assertThat((long) redis.ttl(key)).isEqualTo(-1);
@@ -271,7 +271,7 @@ public void ttl() throws Exception {
     }
 
     @Test
-    public void type() throws Exception {
+    public void type() {
         assertThat(redis.type(key)).isEqualTo("none");
 
         redis.set(key, value);
@@ -291,7 +291,7 @@ public void type() throws Exception {
     }
 
     @Test
-    public void scan() throws Exception {
+    public void scan() {
         redis.set(key, value);
 
         KeyScanCursor<String> cursor = redis.scan();
@@ -301,7 +301,7 @@ public void scan() throws Exception {
     }
 
     @Test
-    public void scanWithArgs() throws Exception {
+    public void scanWithArgs() {
         redis.set(key, value);
 
         KeyScanCursor<String> cursor = redis.scan(ScanArgs.Builder.limit(10));
@@ -311,7 +311,7 @@ public void scanWithArgs() throws Exception {
     }
 
     @Test
-    public void scanInitialCursor() throws Exception {
+    public void scanInitialCursor() {
         redis.set(key, value);
 
         KeyScanCursor<String> cursor = redis.scan(ScanCursor.INITIAL);
@@ -321,19 +321,19 @@ public void scanInitialCursor() throws Exception {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void scanFinishedCursor() throws Exception {
+    public void scanFinishedCursor() {
         redis.set(key, value);
         redis.scan(ScanCursor.FINISHED);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void scanNullCursor() throws Exception {
+    public void scanNullCursor() {
         redis.set(key, value);
         redis.scan((ScanCursor) null);
     }
 
     @Test
-    public void scanStreaming() throws Exception {
+    public void scanStreaming() {
         redis.set(key, value);
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
 
@@ -346,7 +346,7 @@ public void scanStreaming() throws Exception {
     }
 
     @Test
-    public void scanStreamingWithCursor() throws Exception {
+    public void scanStreamingWithCursor() {
         redis.set(key, value);
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
 
@@ -358,7 +358,7 @@ public void scanStreamingWithCursor() throws Exception {
     }
 
     @Test
-    public void scanStreamingWithCursorAndArgs() throws Exception {
+    public void scanStreamingWithCursorAndArgs() {
         redis.set(key, value);
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
 
@@ -370,7 +370,7 @@ public void scanStreamingWithCursorAndArgs() throws Exception {
     }
 
     @Test
-    public void scanStreamingArgs() throws Exception {
+    public void scanStreamingArgs() {
         redis.set(key, value);
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
 
@@ -383,7 +383,7 @@ public void scanStreamingArgs() throws Exception {
     }
 
     @Test
-    public void scanMultiple() throws Exception {
+    public void scanMultiple() {
 
         Set<String> expect = new HashSet<>();
         Set<String> check = new HashSet<>();
@@ -407,7 +407,7 @@ public void scanMultiple() throws Exception {
     }
 
     @Test
-    public void scanMatch() throws Exception {
+    public void scanMatch() {
 
         Set<String> expect = new HashSet<>();
         setup100KeyValues(expect);
diff --git a/src/test/java/io/lettuce/core/commands/ListCommandTest.java b/src/test/java/io/lettuce/core/commands/ListCommandTest.java
index 74fa3cc34c..cd056a4fed 100644
--- a/src/test/java/io/lettuce/core/commands/ListCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ListCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,25 +34,25 @@
 public class ListCommandTest extends AbstractRedisClientTest {
 
     @Test
-    public void blpop() throws Exception {
+    public void blpop() {
         redis.rpush("two", "2", "3");
         assertThat(redis.blpop(1, "one", "two")).isEqualTo(kv("two", "2"));
     }
 
     @Test
-    public void blpopTimeout() throws Exception {
+    public void blpopTimeout() {
         redis.setTimeout(10, TimeUnit.SECONDS);
         assertThat(redis.blpop(1, key)).isNull();
     }
 
     @Test
-    public void brpop() throws Exception {
+    public void brpop() {
         redis.rpush("two", "2", "3");
         assertThat(redis.brpop(1, "one", "two")).isEqualTo(kv("two", "3"));
     }
 
     @Test
-    public void brpoplpush() throws Exception {
+    public void brpoplpush() {
         redis.rpush("one", "1", "2");
         redis.rpush("two", "3", "4");
         assertThat(redis.brpoplpush(1, "one", "two")).isEqualTo("2");
@@ -61,19 +61,19 @@ public void brpoplpush() throws Exception {
     }
 
     @Test
-    public void brpoplpushTimeout() throws Exception {
+    public void brpoplpushTimeout() {
         assertThat(redis.brpoplpush(1, "one", "two")).isNull();
     }
 
     @Test
-    public void lindex() throws Exception {
+    public void lindex() {
         assertThat(redis.lindex(key, 0)).isNull();
         redis.rpush(key, "one");
         assertThat(redis.lindex(key, 0)).isEqualTo("one");
     }
 
     @Test
-    public void linsert() throws Exception {
+    public void linsert() {
         assertThat(redis.linsert(key, false, "one", "two")).isEqualTo(0);
         redis.rpush(key, "one");
         redis.rpush(key, "three");
@@ -82,14 +82,14 @@ public void linsert() throws Exception {
     }
 
     @Test
-    public void llen() throws Exception {
+    public void llen() {
         assertThat((long) redis.llen(key)).isEqualTo(0);
         redis.lpush(key, "one");
         assertThat((long) redis.llen(key)).isEqualTo(1);
     }
 
     @Test
-    public void lpop() throws Exception {
+    public void lpop() {
         assertThat(redis.lpop(key)).isNull();
         redis.rpush(key, "one", "two");
         assertThat(redis.lpop(key)).isEqualTo("one");
@@ -97,7 +97,7 @@ public void lpop() throws Exception {
     }
 
     @Test
-    public void lpush() throws Exception {
+    public void lpush() {
         assertThat((long) redis.lpush(key, "two")).isEqualTo(1);
         assertThat((long) redis.lpush(key, "one")).isEqualTo(2);
         assertThat(redis.lrange(key, 0, -1)).isEqualTo(list("one", "two"));
@@ -106,7 +106,7 @@ public void lpush() throws Exception {
     }
 
     @Test
-    public void lpushx() throws Exception {
+    public void lpushx() {
         assertThat((long) redis.lpushx(key, "two")).isEqualTo(0);
         redis.lpush(key, "two");
         assertThat((long) redis.lpushx(key, "one")).isEqualTo(2);
@@ -114,7 +114,7 @@ public void lpushx() throws Exception {
     }
 
     @Test
-    public void lpushxVariadic() throws Exception {
+    public void lpushxVariadic() {
 
         assumeTrue(RedisConditions.of(redis).hasCommandArity("LPUSHX", -3));
 
@@ -125,7 +125,7 @@ public void lpushxVariadic() throws Exception {
     }
 
     @Test
-    public void lrange() throws Exception {
+    public void lrange() {
         assertThat(redis.lrange(key, 0, 10).isEmpty()).isTrue();
         redis.rpush(key, "one", "two", "three");
         List<String> range = redis.lrange(key, 0, 1);
@@ -136,7 +136,7 @@ public void lrange() throws Exception {
     }
 
     @Test
-    public void lrangeStreaming() throws Exception {
+    public void lrangeStreaming() {
         assertThat(redis.lrange(key, 0, 10).isEmpty()).isTrue();
         redis.rpush(key, "one", "two", "three");
 
@@ -154,7 +154,7 @@ public void lrangeStreaming() throws Exception {
     }
 
     @Test
-    public void lrem() throws Exception {
+    public void lrem() {
         assertThat(redis.lrem(key, 0, value)).isEqualTo(0);
 
         redis.rpush(key, "1", "2", "1", "2", "1");
@@ -171,14 +171,14 @@ public void lrem() throws Exception {
     }
 
     @Test
-    public void lset() throws Exception {
+    public void lset() {
         redis.rpush(key, "one", "two", "three");
         assertThat(redis.lset(key, 2, "san")).isEqualTo("OK");
         assertThat(redis.lrange(key, 0, -1)).isEqualTo(list("one", "two", "san"));
     }
 
     @Test
-    public void ltrim() throws Exception {
+    public void ltrim() {
         redis.rpush(key, "1", "2", "3", "4", "5", "6");
         assertThat(redis.ltrim(key, 0, 3)).isEqualTo("OK");
         assertThat(redis.lrange(key, 0, -1)).isEqualTo(list("1", "2", "3", "4"));
@@ -187,7 +187,7 @@ public void ltrim() throws Exception {
     }
 
     @Test
-    public void rpop() throws Exception {
+    public void rpop() {
         assertThat(redis.rpop(key)).isNull();
         redis.rpush(key, "one", "two");
         assertThat(redis.rpop(key)).isEqualTo("two");
@@ -195,7 +195,7 @@ public void rpop() throws Exception {
     }
 
     @Test
-    public void rpoplpush() throws Exception {
+    public void rpoplpush() {
         assertThat(redis.rpoplpush("one", "two")).isNull();
         redis.rpush("one", "1", "2");
         redis.rpush("two", "3", "4");
@@ -205,7 +205,7 @@ public void rpoplpush() throws Exception {
     }
 
     @Test
-    public void rpush() throws Exception {
+    public void rpush() {
         assertThat((long) redis.rpush(key, "one")).isEqualTo(1);
         assertThat((long) redis.rpush(key, "two")).isEqualTo(2);
         assertThat(redis.lrange(key, 0, -1)).isEqualTo(list("one", "two"));
@@ -214,7 +214,7 @@ public void rpush() throws Exception {
     }
 
     @Test
-    public void rpushx() throws Exception {
+    public void rpushx() {
         assertThat((long) redis.rpushx(key, "one")).isEqualTo(0);
         redis.rpush(key, "one");
         assertThat((long) redis.rpushx(key, "two")).isEqualTo(2);
@@ -222,7 +222,7 @@ public void rpushx() throws Exception {
     }
 
     @Test
-    public void rpushxVariadic() throws Exception {
+    public void rpushxVariadic() {
 
         assumeTrue(RedisConditions.of(redis).hasCommandArity("RPUSHX", -3));
 
diff --git a/src/test/java/io/lettuce/core/commands/NumericCommandTest.java b/src/test/java/io/lettuce/core/commands/NumericCommandTest.java
index edf32da9ea..6d99fe5a48 100644
--- a/src/test/java/io/lettuce/core/commands/NumericCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/NumericCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,45 +15,44 @@
  */
 package io.lettuce.core.commands;
 
-import static org.assertj.core.api.Assertions.*;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.offset;
 
-import io.lettuce.core.AbstractRedisClientTest;
-import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
+import io.lettuce.core.AbstractRedisClientTest;
+
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
 public class NumericCommandTest extends AbstractRedisClientTest {
     @Test
-    public void decr() throws Exception {
+    public void decr() {
         assertThat((long) redis.decr(key)).isEqualTo(-1);
         assertThat((long) redis.decr(key)).isEqualTo(-2);
     }
 
     @Test
-    public void decrby() throws Exception {
+    public void decrby() {
         assertThat(redis.decrby(key, 3)).isEqualTo(-3);
         assertThat(redis.decrby(key, 3)).isEqualTo(-6);
     }
 
     @Test
-    public void incr() throws Exception {
+    public void incr() {
         assertThat((long) redis.incr(key)).isEqualTo(1);
         assertThat((long) redis.incr(key)).isEqualTo(2);
     }
 
     @Test
-    public void incrby() throws Exception {
+    public void incrby() {
         assertThat(redis.incrby(key, 3)).isEqualTo(3);
         assertThat(redis.incrby(key, 3)).isEqualTo(6);
     }
 
     @Test
-    public void incrbyfloat() throws Exception {
+    public void incrbyfloat() {
 
         assertThat(redis.incrbyfloat(key, 3.0)).isEqualTo(3.0, offset(0.1));
         assertThat(redis.incrbyfloat(key, 0.2)).isEqualTo(3.2, offset(0.1));
diff --git a/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java b/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java
index 9c71dc5f5a..7374edfc67 100644
--- a/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package io.lettuce.core.commands;
 
-import static com.google.code.tempusfugit.temporal.Duration.seconds;
-import static com.google.code.tempusfugit.temporal.Timeout.timeout;
 import static io.lettuce.core.TestSettings.host;
 import static io.lettuce.core.TestSettings.port;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -28,8 +26,8 @@
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
-import com.google.code.tempusfugit.temporal.WaitFor;
 import io.lettuce.CanConnect;
+import io.lettuce.Wait;
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.MigrateArgs;
 import io.lettuce.core.RedisURI;
@@ -46,20 +44,18 @@ public class RunOnlyOnceServerCommandTest extends AbstractRedisClientTest {
     /**
      * Executed in order: 1 this test causes a stop of the redis. This means, you cannot repeat the test without restarting your
      * redis.
-     *
-     * @throws Exception
      */
     @Test
-    public void debugSegfault() throws Exception {
+    public void debugSegfault() {
 
         assumeTrue(CanConnect.to(host(), port(1)));
 
-        final RedisAsyncCommands<String, String> commands = client.connect(RedisURI.Builder.redis(host(), port(1))
-                .build()).async();
+        final RedisAsyncCommands<String, String> commands = client.connect(RedisURI.Builder.redis(host(), port(1)).build())
+                .async();
         try {
             commands.debugSegfault();
 
-            WaitFor.waitOrTimeout(() -> !commands.getStatefulConnection().isOpen(), timeout(seconds(5)));
+            Wait.untilTrue(() -> !commands.getStatefulConnection().isOpen()).waitOrTimeout();
             assertThat(commands.getStatefulConnection().isOpen()).isFalse();
         } finally {
             commands.getStatefulConnection().close();
@@ -68,11 +64,9 @@ public void debugSegfault() throws Exception {
 
     /**
      * Executed in order: 2
-     *
-     * @throws Exception
      */
     @Test
-    public void migrate() throws Exception {
+    public void migrate() {
 
         assumeTrue(CanConnect.to(host(), port(2)));
 
@@ -84,11 +78,9 @@ public void migrate() throws Exception {
 
     /**
      * Executed in order: 3
-     *
-     * @throws Exception
      */
     @Test
-    public void migrateCopyReplace() throws Exception {
+    public void migrateCopyReplace() {
 
         assumeTrue(CanConnect.to(host(), port(2)));
 
@@ -99,28 +91,27 @@ public void migrateCopyReplace() throws Exception {
         String result = redis.migrate("localhost", TestSettings.port(2), 0, 10, MigrateArgs.Builder.keys(key).copy().replace());
         assertThat(result).isEqualTo("OK");
 
-        result = redis.migrate("localhost", TestSettings.port(2), 0, 10, MigrateArgs.Builder.keys(Arrays.asList("key1", "key2")).replace());
+        result = redis.migrate("localhost", TestSettings.port(2), 0, 10, MigrateArgs.Builder
+                .keys(Arrays.asList("key1", "key2")).replace());
         assertThat(result).isEqualTo("OK");
     }
 
     /**
      * Executed in order: 4 this test causes a stop of the redis. This means, you cannot repeat the test without restarting your
      * redis.
-     *
-     * @throws Exception
      */
     @Test
-    public void shutdown() throws Exception {
+    public void shutdown() {
 
         assumeTrue(CanConnect.to(host(), port(2)));
 
-        final RedisAsyncCommands<String, String> commands = client.connect(RedisURI.Builder.redis(host(), port(2))
-                .build()).async();
+        final RedisAsyncCommands<String, String> commands = client.connect(RedisURI.Builder.redis(host(), port(2)).build())
+                .async();
         try {
 
             commands.shutdown(true);
             commands.shutdown(false);
-            WaitFor.waitOrTimeout(() -> !commands.getStatefulConnection().isOpen(), timeout(seconds(5)));
+            Wait.untilTrue(() -> !commands.getStatefulConnection().isOpen()).waitOrTimeout();
 
             assertThat(commands.getStatefulConnection().isOpen()).isFalse();
 
diff --git a/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java b/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
index 456f88b7de..a5875ea15b 100644
--- a/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
@@ -20,6 +20,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.After;
 import org.junit.FixMethodOrder;
@@ -31,8 +32,8 @@
 import io.lettuce.Wait;
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.RedisException;
-import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.RedisNoScriptException;
+import io.lettuce.core.api.StatefulRedisConnection;
 
 /**
  * @author Will Glozer
@@ -44,7 +45,7 @@ public class ScriptingCommandTest extends AbstractRedisClientTest {
     public ExpectedException exception = ExpectedException.none();
 
     @After
-    public void tearDown() throws Exception {
+    public void tearDown() {
 
         Wait.untilNoException(() -> {
             try {
@@ -58,7 +59,7 @@ public void tearDown() throws Exception {
     }
 
     @Test
-    public void eval() throws Exception {
+    public void eval() {
         assertThat((Boolean) redis.eval("return 1 + 1 == 4", BOOLEAN)).isEqualTo(false);
         assertThat((Number) redis.eval("return 1 + 1", INTEGER)).isEqualTo(2L);
         assertThat((String) redis.eval("return {ok='status'}", STATUS)).isEqualTo("status");
@@ -69,28 +70,28 @@ public void eval() throws Exception {
     }
 
     @Test
-    public void evalWithSingleKey() throws Exception {
+    public void evalWithSingleKey() {
         assertThat((List<?>) redis.eval("return KEYS[1]", MULTI, "one")).isEqualTo(list("one"));
     }
 
     @Test
-    public void evalReturningNullInMulti() throws Exception {
+    public void evalReturningNullInMulti() {
         assertThat((List<?>) redis.eval("return nil", MULTI, "one")).isEqualTo(Collections.singletonList(null));
     }
 
     @Test
-    public void evalWithKeys() throws Exception {
+    public void evalWithKeys() {
         assertThat((List<?>) redis.eval("return {KEYS[1], KEYS[2]}", MULTI, "one", "two")).isEqualTo(list("one", "two"));
     }
 
     @Test
-    public void evalWithArgs() throws Exception {
+    public void evalWithArgs() {
         String[] keys = new String[0];
         assertThat((List<?>) redis.eval("return {ARGV[1], ARGV[2]}", MULTI, keys, "a", "b")).isEqualTo(list("a", "b"));
     }
 
     @Test
-    public void evalsha() throws Exception {
+    public void evalsha() {
         redis.scriptFlush();
         String script = "return 1 + 1";
         String digest = redis.digest(script);
@@ -102,7 +103,7 @@ public void evalsha() throws Exception {
     }
 
     @Test
-    public void evalshaWithMulti() throws Exception {
+    public void evalshaWithMulti() {
         redis.scriptFlush();
         String digest = redis.digest("return {1234, 5678}");
         exception.expect(RedisNoScriptException.class);
@@ -111,14 +112,14 @@ public void evalshaWithMulti() throws Exception {
     }
 
     @Test
-    public void evalshaWithKeys() throws Exception {
+    public void evalshaWithKeys() {
         redis.scriptFlush();
         String digest = redis.scriptLoad("return {KEYS[1], KEYS[2]}");
         assertThat((Object) redis.evalsha(digest, MULTI, "one", "two")).isEqualTo(list("one", "two"));
     }
 
     @Test
-    public void evalshaWithArgs() throws Exception {
+    public void evalshaWithArgs() {
         redis.scriptFlush();
         String digest = redis.scriptLoad("return {ARGV[1], ARGV[2]}");
         String[] keys = new String[0];
@@ -126,7 +127,7 @@ public void evalshaWithArgs() throws Exception {
     }
 
     @Test
-    public void script() throws Exception {
+    public void script() throws InterruptedException {
         assertThat(redis.scriptFlush()).isEqualTo("OK");
 
         String script1 = "return 1 + 1";
@@ -145,8 +146,8 @@ public void script() throws Exception {
         redis.configSet("lua-time-limit", "10");
         StatefulRedisConnection<String, String> connection = client.connect();
         try {
-            connection.async().eval("while true do end", STATUS, new String[0]);
-            Thread.sleep(100);
+            connection.async().eval("while true do end", STATUS, new String[0]).await(100, TimeUnit.MILLISECONDS);
+
             assertThat(redis.scriptKill()).isEqualTo("OK");
         } finally {
             connection.close();
diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
index f9371d0866..d877d2ba58 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
@@ -31,6 +31,7 @@
 import org.junit.runners.MethodSorters;
 
 import io.lettuce.RedisConditions;
+import io.lettuce.Wait;
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.TestSettings;
@@ -55,10 +56,10 @@ public void bgrewriteaof() {
     }
 
     @Test
-    public void bgsave() throws Exception {
-        while (redis.info().contains("aof_rewrite_in_progress:1")) {
-            Thread.sleep(100);
-        }
+    public void bgsave() {
+
+        Wait.untilTrue(() -> !redis.info().contains("aof_rewrite_in_progress:1")).waitOrTimeout();
+
         String msg = "Background saving started";
         assertThat(redis.bgsave()).isEqualTo(msg);
     }
@@ -285,11 +286,10 @@ public void lastsave() {
     }
 
     @Test
-    public void save() throws Exception {
+    public void save() {
+
+        Wait.untilTrue(() -> !redis.info().contains("aof_rewrite_in_progress:1")).waitOrTimeout();
 
-        while (redis.info().contains("aof_rewrite_in_progress:1")) {
-            Thread.sleep(100);
-        }
         assertThat(redis.save()).isEqualTo("OK");
     }
 
diff --git a/src/test/java/io/lettuce/core/commands/SetCommandTest.java b/src/test/java/io/lettuce/core/commands/SetCommandTest.java
index 06ba04b109..a43f60538a 100644
--- a/src/test/java/io/lettuce/core/commands/SetCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SetCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
 public class SetCommandTest extends AbstractRedisClientTest {
 
     @Test
-    public void sadd() throws Exception {
+    public void sadd() {
         assertThat(redis.sadd(key, "a")).isEqualTo(1L);
         assertThat(redis.sadd(key, "a")).isEqualTo(0);
         assertThat(redis.smembers(key)).isEqualTo(set("a"));
@@ -44,20 +44,20 @@ public void sadd() throws Exception {
     }
 
     @Test
-    public void scard() throws Exception {
+    public void scard() {
         assertThat((long) redis.scard(key)).isEqualTo(0);
         redis.sadd(key, "a");
         assertThat((long) redis.scard(key)).isEqualTo(1);
     }
 
     @Test
-    public void sdiff() throws Exception {
+    public void sdiff() {
         setupSet();
         assertThat(redis.sdiff("key1", "key2", "key3")).isEqualTo(set("b", "d"));
     }
 
     @Test
-    public void sdiffStreaming() throws Exception {
+    public void sdiffStreaming() {
         setupSet();
 
         ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
@@ -68,20 +68,20 @@ public void sdiffStreaming() throws Exception {
     }
 
     @Test
-    public void sdiffstore() throws Exception {
+    public void sdiffstore() {
         setupSet();
         assertThat(redis.sdiffstore("newset", "key1", "key2", "key3")).isEqualTo(2);
         assertThat(redis.smembers("newset")).containsOnly("b", "d");
     }
 
     @Test
-    public void sinter() throws Exception {
+    public void sinter() {
         setupSet();
         assertThat(redis.sinter("key1", "key2", "key3")).isEqualTo(set("c"));
     }
 
     @Test
-    public void sinterStreaming() throws Exception {
+    public void sinterStreaming() {
         setupSet();
 
         ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
@@ -92,21 +92,21 @@ public void sinterStreaming() throws Exception {
     }
 
     @Test
-    public void sinterstore() throws Exception {
+    public void sinterstore() {
         setupSet();
         assertThat(redis.sinterstore("newset", "key1", "key2", "key3")).isEqualTo(1);
         assertThat(redis.smembers("newset")).containsExactly("c");
     }
 
     @Test
-    public void sismember() throws Exception {
+    public void sismember() {
         assertThat(redis.sismember(key, "a")).isFalse();
         redis.sadd(key, "a");
         assertThat(redis.sismember(key, "a")).isTrue();
     }
 
     @Test
-    public void smove() throws Exception {
+    public void smove() {
         redis.sadd(key, "a", "b", "c");
         assertThat(redis.smove(key, "key1", "d")).isFalse();
         assertThat(redis.smove(key, "key1", "a")).isTrue();
@@ -115,13 +115,13 @@ public void smove() throws Exception {
     }
 
     @Test
-    public void smembers() throws Exception {
+    public void smembers() {
         setupSet();
         assertThat(redis.smembers(key)).isEqualTo(set("a", "b", "c"));
     }
 
     @Test
-    public void smembersStreaming() throws Exception {
+    public void smembersStreaming() {
         setupSet();
         ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
         Long count = redis.smembers(streamingAdapter, key);
@@ -130,7 +130,7 @@ public void smembersStreaming() throws Exception {
     }
 
     @Test
-    public void spop() throws Exception {
+    public void spop() {
         assertThat(redis.spop(key)).isNull();
         redis.sadd(key, "a", "b", "c");
         String rand = redis.spop(key);
@@ -139,7 +139,7 @@ public void spop() throws Exception {
     }
 
     @Test
-    public void spopMultiple() throws Exception {
+    public void spopMultiple() {
 
         assumeTrue(RedisConditions.of(redis).hasCommandArity("SPOP", -2));
 
@@ -151,7 +151,7 @@ public void spopMultiple() throws Exception {
     }
 
     @Test
-    public void srandmember() throws Exception {
+    public void srandmember() {
         assertThat(redis.spop(key)).isNull();
         redis.sadd(key, "a", "b", "c", "d");
         assertThat(set("a", "b", "c", "d").contains(redis.srandmember(key))).isTrue();
@@ -164,7 +164,7 @@ public void srandmember() throws Exception {
     }
 
     @Test
-    public void srandmemberStreaming() throws Exception {
+    public void srandmemberStreaming() {
         assertThat(redis.spop(key)).isNull();
         redis.sadd(key, "a", "b", "c", "d");
 
@@ -179,7 +179,7 @@ public void srandmemberStreaming() throws Exception {
     }
 
     @Test
-    public void srem() throws Exception {
+    public void srem() {
         redis.sadd(key, "a", "b", "c");
         assertThat(redis.srem(key, "d")).isEqualTo(0);
         assertThat(redis.srem(key, "b")).isEqualTo(1);
@@ -189,28 +189,28 @@ public void srem() throws Exception {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void sremEmpty() throws Exception {
+    public void sremEmpty() {
         redis.srem(key);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void sremNulls() throws Exception {
+    public void sremNulls() {
         redis.srem(key, new String[0]);
     }
 
     @Test
-    public void sunion() throws Exception {
+    public void sunion() {
         setupSet();
         assertThat(redis.sunion("key1", "key2", "key3")).isEqualTo(set("a", "b", "c", "d", "e"));
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void sunionEmpty() throws Exception {
+    public void sunionEmpty() {
         redis.sunion();
     }
 
     @Test
-    public void sunionStreaming() throws Exception {
+    public void sunionStreaming() {
         setupSet();
 
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
@@ -223,14 +223,14 @@ public void sunionStreaming() throws Exception {
     }
 
     @Test
-    public void sunionstore() throws Exception {
+    public void sunionstore() {
         setupSet();
         assertThat(redis.sunionstore("newset", "key1", "key2", "key3")).isEqualTo(5);
         assertThat(redis.smembers("newset")).isEqualTo(set("a", "b", "c", "d", "e"));
     }
 
     @Test
-    public void sscan() throws Exception {
+    public void sscan() {
         redis.sadd(key, value);
         ValueScanCursor<String> cursor = redis.sscan(key);
 
@@ -240,7 +240,7 @@ public void sscan() throws Exception {
     }
 
     @Test
-    public void sscanWithCursor() throws Exception {
+    public void sscanWithCursor() {
         redis.sadd(key, value);
         ValueScanCursor<String> cursor = redis.sscan(key, ScanCursor.INITIAL);
 
@@ -250,7 +250,7 @@ public void sscanWithCursor() throws Exception {
     }
 
     @Test
-    public void sscanWithCursorAndArgs() throws Exception {
+    public void sscanWithCursorAndArgs() {
         redis.sadd(key, value);
 
         ValueScanCursor<String> cursor = redis.sscan(key, ScanCursor.INITIAL, ScanArgs.Builder.limit(5));
@@ -262,7 +262,7 @@ public void sscanWithCursorAndArgs() throws Exception {
     }
 
     @Test
-    public void sscanStreaming() throws Exception {
+    public void sscanStreaming() {
         redis.sadd(key, value);
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
 
@@ -275,7 +275,7 @@ public void sscanStreaming() throws Exception {
     }
 
     @Test
-    public void sscanStreamingWithCursor() throws Exception {
+    public void sscanStreamingWithCursor() {
         redis.sadd(key, value);
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
 
@@ -287,7 +287,7 @@ public void sscanStreamingWithCursor() throws Exception {
     }
 
     @Test
-    public void sscanStreamingWithCursorAndArgs() throws Exception {
+    public void sscanStreamingWithCursorAndArgs() {
         redis.sadd(key, value);
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
 
@@ -299,7 +299,7 @@ public void sscanStreamingWithCursorAndArgs() throws Exception {
     }
 
     @Test
-    public void sscanStreamingArgs() throws Exception {
+    public void sscanStreamingArgs() {
         redis.sadd(key, value);
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
 
@@ -312,7 +312,7 @@ public void sscanStreamingArgs() throws Exception {
     }
 
     @Test
-    public void sscanMultiple() throws Exception {
+    public void sscanMultiple() {
 
         Set<String> expect = new HashSet<>();
         Set<String> check = new HashSet<>();
@@ -334,7 +334,7 @@ public void sscanMultiple() throws Exception {
     }
 
     @Test
-    public void scanMatch() throws Exception {
+    public void scanMatch() {
 
         Set<String> expect = new HashSet<>();
         setup100KeyValues(expect);
diff --git a/src/test/java/io/lettuce/core/commands/SortCommandTest.java b/src/test/java/io/lettuce/core/commands/SortCommandTest.java
index 61f9c06481..93f7301f2f 100644
--- a/src/test/java/io/lettuce/core/commands/SortCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SortCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,18 +15,13 @@
  */
 package io.lettuce.core.commands;
 
-import static io.lettuce.core.SortArgs.Builder.alpha;
-import static io.lettuce.core.SortArgs.Builder.asc;
-import static io.lettuce.core.SortArgs.Builder.by;
-import static io.lettuce.core.SortArgs.Builder.desc;
-import static io.lettuce.core.SortArgs.Builder.get;
-import static io.lettuce.core.SortArgs.Builder.limit;
+import static io.lettuce.core.SortArgs.Builder.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.junit.Test;
+
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.ListStreamingAdapter;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
 
 /**
  * @author Will Glozer
@@ -34,14 +29,14 @@
  */
 public class SortCommandTest extends AbstractRedisClientTest {
     @Test
-    public void sort() throws Exception {
+    public void sort() {
         redis.rpush(key, "3", "2", "1");
         assertThat(redis.sort(key)).isEqualTo(list("1", "2", "3"));
         assertThat(redis.sort(key, asc())).isEqualTo(list("1", "2", "3"));
     }
 
     @Test
-    public void sortStreaming() throws Exception {
+    public void sortStreaming() {
         redis.rpush(key, "3", "2", "1");
 
         ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
@@ -57,13 +52,13 @@ public void sortStreaming() throws Exception {
     }
 
     @Test
-    public void sortAlpha() throws Exception {
+    public void sortAlpha() {
         redis.rpush(key, "A", "B", "C");
         assertThat(redis.sort(key, alpha().desc())).isEqualTo(list("C", "B", "A"));
     }
 
     @Test
-    public void sortBy() throws Exception {
+    public void sortBy() {
         redis.rpush(key, "foo", "bar", "baz");
         redis.set("weight_foo", "8");
         redis.set("weight_bar", "4");
@@ -72,13 +67,13 @@ public void sortBy() throws Exception {
     }
 
     @Test
-    public void sortDesc() throws Exception {
+    public void sortDesc() {
         redis.rpush(key, "1", "2", "3");
         assertThat(redis.sort(key, desc())).isEqualTo(list("3", "2", "1"));
     }
 
     @Test
-    public void sortGet() throws Exception {
+    public void sortGet() {
         redis.rpush(key, "1", "2");
         redis.set("obj_1", "foo");
         redis.set("obj_2", "bar");
@@ -86,13 +81,13 @@ public void sortGet() throws Exception {
     }
 
     @Test
-    public void sortLimit() throws Exception {
+    public void sortLimit() {
         redis.rpush(key, "3", "2", "1");
         assertThat(redis.sort(key, limit(1, 2))).isEqualTo(list("2", "3"));
     }
 
     @Test
-    public void sortStore() throws Exception {
+    public void sortStore() {
         redis.rpush("one", "1", "2", "3");
         assertThat(redis.sortStore("one", desc(), "two")).isEqualTo(3);
         assertThat(redis.lrange("two", 0, -1)).isEqualTo(list("3", "2", "1"));
diff --git a/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java b/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
index ceae0f08ca..0aadbf7b95 100644
--- a/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
@@ -40,7 +40,7 @@
 public class SortedSetCommandTest extends AbstractRedisClientTest {
 
     @Test
-    public void zadd() throws Exception {
+    public void zadd() {
         assertThat(redis.zadd(key, 1.0, "a")).isEqualTo(1);
         assertThat(redis.zadd(key, 1.0, "a")).isEqualTo(0);
 
@@ -50,7 +50,7 @@ public void zadd() throws Exception {
     }
 
     @Test
-    public void zaddScoredValue() throws Exception {
+    public void zaddScoredValue() {
         assertThat(redis.zadd(key, ScoredValue.fromNullable(1.0, "a"))).isEqualTo(1);
         assertThat(redis.zadd(key, ScoredValue.fromNullable(1.0, "a"))).isEqualTo(0);
 
@@ -60,7 +60,7 @@ public void zaddScoredValue() throws Exception {
     }
 
     @Test
-    public void zaddnx() throws Exception {
+    public void zaddnx() {
         assertThat(redis.zadd(key, 1.0, "a")).isEqualTo(1);
         assertThat(redis.zadd(key, ZAddArgs.Builder.nx(), ScoredValue.fromNullable(2.0, "a"))).isEqualTo(0);
 
@@ -72,17 +72,17 @@ public void zaddnx() throws Exception {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void zaddWrongArguments() throws Exception {
+    public void zaddWrongArguments() {
         assertThat(redis.zadd(key, 2.0, "b", 3.0)).isEqualTo(2);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void zaddnxWrongArguments() throws Exception {
+    public void zaddnxWrongArguments() {
         assertThat(redis.zadd(key, ZAddArgs.Builder.nx(), new Object[] { 2.0, "b", 3.0 })).isEqualTo(1);
     }
 
     @Test
-    public void zaddxx() throws Exception {
+    public void zaddxx() {
         assertThat(redis.zadd(key, 1.0, "a")).isEqualTo(1);
         assertThat(redis.zadd(key, ZAddArgs.Builder.xx(), 2.0, "a")).isEqualTo(0);
 
@@ -92,7 +92,7 @@ public void zaddxx() throws Exception {
     }
 
     @Test
-    public void zaddch() throws Exception {
+    public void zaddch() {
         assertThat(redis.zadd(key, 1.0, "a")).isEqualTo(1);
         assertThat(redis.zadd(key, ZAddArgs.Builder.ch().xx(), 2.0, "a")).isEqualTo(1);
         assertThat(redis.zadd(key, ZAddArgs.Builder.ch(), 2.0, "b")).isEqualTo(1);
@@ -101,7 +101,7 @@ public void zaddch() throws Exception {
     }
 
     @Test
-    public void zaddincr() throws Exception {
+    public void zaddincr() {
         assertThat(redis.zadd(key, 1.0, "a").longValue()).isEqualTo(1);
         assertThat(redis.zaddincr(key, 2.0, "a").longValue()).isEqualTo(3);
 
@@ -111,27 +111,27 @@ public void zaddincr() throws Exception {
     }
 
     @Test
-    public void zaddincrnx() throws Exception {
+    public void zaddincrnx() {
         assertThat(redis.zaddincr(key, ZAddArgs.Builder.nx(), 2.0, "a").longValue()).isEqualTo(2);
         assertThat(redis.zaddincr(key, ZAddArgs.Builder.nx(), 2.0, "a")).isNull();
     }
 
     @Test
-    public void zaddincrxx() throws Exception {
+    public void zaddincrxx() {
         assertThat(redis.zaddincr(key, ZAddArgs.Builder.xx(), 2.0, "a")).isNull();
         assertThat(redis.zaddincr(key, ZAddArgs.Builder.nx(), 2.0, "a").longValue()).isEqualTo(2);
         assertThat(redis.zaddincr(key, ZAddArgs.Builder.xx(), 2.0, "a").longValue()).isEqualTo(4);
     }
 
     @Test
-    public void zcard() throws Exception {
+    public void zcard() {
         assertThat(redis.zcard(key)).isEqualTo(0);
         redis.zadd(key, 1.0, "a");
         assertThat(redis.zcard(key)).isEqualTo(1);
     }
 
     @Test
-    public void zcount() throws Exception {
+    public void zcount() {
         assertThat(redis.zcount(key, 0, 0)).isEqualTo(0);
 
         redis.zadd(key, 1.0, "a", 2.0, "b", 2.1, "c");
@@ -152,7 +152,7 @@ public void zcount() throws Exception {
     }
 
     @Test
-    public void zincrby() throws Exception {
+    public void zincrby() {
         assertThat(redis.zincrby(key, 0.0, "a")).isEqualTo(0, offset(0.1));
         assertThat(redis.zincrby(key, 1.1, "a")).isEqualTo(1.1, offset(0.1));
         assertThat(redis.zscore(key, "a")).isEqualTo(1.1, offset(0.1));
@@ -161,7 +161,7 @@ public void zincrby() throws Exception {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zinterstore() throws Exception {
+    public void zinterstore() {
         redis.zadd("zset1", 1.0, "a", 2.0, "b");
         redis.zadd("zset2", 2.0, "a", 3.0, "b", 4.0, "c");
         assertThat(redis.zinterstore(key, "zset1", "zset2")).isEqualTo(2);
@@ -170,13 +170,13 @@ public void zinterstore() throws Exception {
     }
 
     @Test
-    public void zrange() throws Exception {
+    public void zrange() {
         setup();
         assertThat(redis.zrange(key, 0, -1)).isEqualTo(list("a", "b", "c"));
     }
 
     @Test
-    public void zrangeStreaming() throws Exception {
+    public void zrangeStreaming() {
         setup();
 
         ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
@@ -192,14 +192,14 @@ private void setup() {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zrangeWithScores() throws Exception {
+    public void zrangeWithScores() {
         setup();
         assertThat(redis.zrangeWithScores(key, 0, -1)).isEqualTo(svlist(sv(1.0, "a"), sv(2.0, "b"), sv(3.0, "c")));
     }
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zrangeWithScoresStreaming() throws Exception {
+    public void zrangeWithScoresStreaming() {
         setup();
         ScoredValueStreamingAdapter<String> streamingAdapter = new ScoredValueStreamingAdapter<>();
         Long count = redis.zrangeWithScores(streamingAdapter, key, 0, -1);
@@ -208,7 +208,7 @@ public void zrangeWithScoresStreaming() throws Exception {
     }
 
     @Test
-    public void zrangebyscore() throws Exception {
+    public void zrangebyscore() {
 
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
 
@@ -228,7 +228,7 @@ public void zrangebyscore() throws Exception {
     }
 
     @Test
-    public void zrangebyscoreStreaming() throws Exception {
+    public void zrangebyscoreStreaming() {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
         ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
 
@@ -250,7 +250,7 @@ public void zrangebyscoreStreaming() throws Exception {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zrangebyscoreWithScores() throws Exception {
+    public void zrangebyscoreWithScores() {
 
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
 
@@ -277,7 +277,7 @@ public void zrangebyscoreWithScores() throws Exception {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zrangebyscoreWithScoresInfinity() throws Exception {
+    public void zrangebyscoreWithScoresInfinity() {
 
         redis.zadd(key, Double.POSITIVE_INFINITY, "a", Double.NEGATIVE_INFINITY, "b");
 
@@ -292,7 +292,7 @@ public void zrangebyscoreWithScoresInfinity() throws Exception {
     }
 
     @Test
-    public void zrangebyscoreWithScoresStreaming() throws Exception {
+    public void zrangebyscoreWithScoresStreaming() {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
         ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
 
@@ -317,7 +317,7 @@ public void zrangebyscoreWithScoresStreaming() throws Exception {
     }
 
     @Test
-    public void zrank() throws Exception {
+    public void zrank() {
         assertThat(redis.zrank(key, "a")).isNull();
         setup();
         assertThat(redis.zrank(key, "a")).isEqualTo(0);
@@ -325,7 +325,7 @@ public void zrank() throws Exception {
     }
 
     @Test
-    public void zrem() throws Exception {
+    public void zrem() {
         assertThat(redis.zrem(key, "a")).isEqualTo(0);
         setup();
         assertThat(redis.zrem(key, "b")).isEqualTo(1);
@@ -335,7 +335,7 @@ public void zrem() throws Exception {
     }
 
     @Test
-    public void zremrangebyscore() throws Exception {
+    public void zremrangebyscore() {
 
         setup();
         assertThat(redis.zremrangebyscore(key, 1.0, 2.0)).isEqualTo(2);
@@ -355,7 +355,7 @@ public void zremrangebyscore() throws Exception {
     }
 
     @Test
-    public void zremrangebyrank() throws Exception {
+    public void zremrangebyrank() {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
         assertThat(redis.zremrangebyrank(key, 1, 2)).isEqualTo(2);
         assertThat(redis.zrange(key, 0, -1)).isEqualTo(list("a", "d"));
@@ -366,20 +366,20 @@ public void zremrangebyrank() throws Exception {
     }
 
     @Test
-    public void zrevrange() throws Exception {
+    public void zrevrange() {
         setup();
         assertThat(redis.zrevrange(key, 0, -1)).isEqualTo(list("c", "b", "a"));
     }
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zrevrangeWithScores() throws Exception {
+    public void zrevrangeWithScores() {
         setup();
         assertThat(redis.zrevrangeWithScores(key, 0, -1)).isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
     }
 
     @Test
-    public void zrevrangeStreaming() throws Exception {
+    public void zrevrangeStreaming() {
         setup();
         ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
         Long count = redis.zrevrange(streamingAdapter, key, 0, -1);
@@ -389,7 +389,7 @@ public void zrevrangeStreaming() throws Exception {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zrevrangeWithScoresStreaming() throws Exception {
+    public void zrevrangeWithScoresStreaming() {
         setup();
         ScoredValueStreamingAdapter<String> streamingAdapter = new ScoredValueStreamingAdapter<>();
         Long count = redis.zrevrangeWithScores(streamingAdapter, key, 0, -1);
@@ -398,7 +398,7 @@ public void zrevrangeWithScoresStreaming() throws Exception {
     }
 
     @Test
-    public void zrevrangebylex() throws Exception {
+    public void zrevrangebylex() {
 
         setup100KeyValues(new HashSet<>());
 
@@ -411,7 +411,7 @@ public void zrevrangebylex() throws Exception {
     }
 
     @Test
-    public void zrevrangebyscore() throws Exception {
+    public void zrevrangebyscore() {
 
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
 
@@ -432,7 +432,7 @@ public void zrevrangebyscore() throws Exception {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zrevrangebyscoreWithScores() throws Exception {
+    public void zrevrangebyscoreWithScores() {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
 
         assertThat(redis.zrevrangebyscoreWithScores(key, 3.0, 2.0)).isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b")));
@@ -457,7 +457,7 @@ public void zrevrangebyscoreWithScores() throws Exception {
     }
 
     @Test
-    public void zrevrangebyscoreStreaming() throws Exception {
+    public void zrevrangebyscoreStreaming() {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
         ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
 
@@ -482,7 +482,7 @@ public void zrevrangebyscoreStreaming() throws Exception {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zrevrangebyscoreWithScoresStreaming() throws Exception {
+    public void zrevrangebyscoreWithScoresStreaming() {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
 
         ScoredValueStreamingAdapter<String> streamingAdapter = new ScoredValueStreamingAdapter<>();
@@ -507,7 +507,7 @@ public void zrevrangebyscoreWithScoresStreaming() throws Exception {
     }
 
     @Test
-    public void zrevrank() throws Exception {
+    public void zrevrank() {
         assertThat(redis.zrevrank(key, "a")).isNull();
         setup();
         assertThat(redis.zrevrank(key, "c")).isEqualTo(0);
@@ -515,7 +515,7 @@ public void zrevrank() throws Exception {
     }
 
     @Test
-    public void zscore() throws Exception {
+    public void zscore() {
         assertThat(redis.zscore(key, "a")).isNull();
         redis.zadd(key, 1.0, "a");
         assertThat(redis.zscore(key, "a")).isEqualTo(1.0);
@@ -523,7 +523,7 @@ public void zscore() throws Exception {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zunionstore() throws Exception {
+    public void zunionstore() {
         redis.zadd("zset1", 1.0, "a", 2.0, "b");
         redis.zadd("zset2", 2.0, "a", 3.0, "b", 4.0, "c");
         assertThat(redis.zunionstore(key, "zset1", "zset2")).isEqualTo(3);
@@ -545,7 +545,7 @@ public void zunionstore() throws Exception {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zStoreArgs() throws Exception {
+    public void zStoreArgs() {
         redis.zadd("zset1", 1.0, "a", 2.0, "b");
         redis.zadd("zset2", 2.0, "a", 3.0, "b", 4.0, "c");
 
@@ -572,7 +572,7 @@ public void zStoreArgs() throws Exception {
     }
 
     @Test
-    public void zsscan() throws Exception {
+    public void zsscan() {
         redis.zadd(key, 1, value);
         ScoredValueScanCursor<String> cursor = redis.zscan(key);
 
@@ -582,7 +582,7 @@ public void zsscan() throws Exception {
     }
 
     @Test
-    public void zsscanWithCursor() throws Exception {
+    public void zsscanWithCursor() {
         redis.zadd(key, 1, value);
 
         ScoredValueScanCursor<String> cursor = redis.zscan(key, ScanCursor.INITIAL);
@@ -593,7 +593,7 @@ public void zsscanWithCursor() throws Exception {
     }
 
     @Test
-    public void zsscanWithCursorAndArgs() throws Exception {
+    public void zsscanWithCursorAndArgs() {
         redis.zadd(key, 1, value);
 
         ScoredValueScanCursor<String> cursor = redis.zscan(key, ScanCursor.INITIAL, ScanArgs.Builder.limit(5));
@@ -604,7 +604,7 @@ public void zsscanWithCursorAndArgs() throws Exception {
     }
 
     @Test
-    public void zscanStreaming() throws Exception {
+    public void zscanStreaming() {
         redis.zadd(key, 1, value);
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
@@ -617,7 +617,7 @@ public void zscanStreaming() throws Exception {
     }
 
     @Test
-    public void zscanStreamingWithCursor() throws Exception {
+    public void zscanStreamingWithCursor() {
         redis.zadd(key, 1, value);
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
@@ -629,7 +629,7 @@ public void zscanStreamingWithCursor() throws Exception {
     }
 
     @Test
-    public void zscanStreamingWithCursorAndArgs() throws Exception {
+    public void zscanStreamingWithCursorAndArgs() {
         redis.zadd(key, 1, value);
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
@@ -641,7 +641,7 @@ public void zscanStreamingWithCursorAndArgs() throws Exception {
     }
 
     @Test
-    public void zscanStreamingWithArgs() throws Exception {
+    public void zscanStreamingWithArgs() {
         redis.zadd(key, 1, value);
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
@@ -654,7 +654,7 @@ public void zscanStreamingWithArgs() throws Exception {
     }
 
     @Test
-    public void zscanMultiple() throws Exception {
+    public void zscanMultiple() {
 
         Set<String> expect = new HashSet<>();
         setup100KeyValues(expect);
@@ -670,7 +670,7 @@ public void zscanMultiple() throws Exception {
     }
 
     @Test
-    public void zscanMatch() throws Exception {
+    public void zscanMatch() {
 
         Set<String> expect = new HashSet<>();
         setup100KeyValues(expect);
@@ -684,7 +684,7 @@ public void zscanMatch() throws Exception {
     }
 
     @Test
-    public void zlexcount() throws Exception {
+    public void zlexcount() {
 
         setup100KeyValues(new HashSet<>());
 
@@ -698,7 +698,7 @@ public void zlexcount() throws Exception {
     }
 
     @Test
-    public void zrangebylex() throws Exception {
+    public void zrangebylex() {
         setup100KeyValues(new HashSet<>());
 
         assertThat(redis.zrangebylex(key, "-", "+")).hasSize(100);
@@ -713,7 +713,7 @@ public void zrangebylex() throws Exception {
     }
 
     @Test
-    public void zremrangebylex() throws Exception {
+    public void zremrangebylex() {
 
         setup100KeyValues(new HashSet<>());
         assertThat(redis.zremrangebylex(key, "(aaa", "[zzz")).isEqualTo(100);
diff --git a/src/test/java/io/lettuce/core/commands/StringCommandTest.java b/src/test/java/io/lettuce/core/commands/StringCommandTest.java
index c092d9e8c6..015c7fc3df 100644
--- a/src/test/java/io/lettuce/core/commands/StringCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/StringCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,27 +43,27 @@ public class StringCommandTest extends AbstractRedisClientTest {
     public ExpectedException exception = ExpectedException.none();
 
     @Test
-    public void append() throws Exception {
+    public void append() {
         assertThat(redis.append(key, value)).isEqualTo(value.length());
         assertThat(redis.append(key, "X")).isEqualTo(value.length() + 1);
     }
 
     @Test
-    public void get() throws Exception {
+    public void get() {
         assertThat(redis.get(key)).isNull();
         redis.set(key, value);
         assertThat(redis.get(key)).isEqualTo(value);
     }
 
     @Test
-    public void getbit() throws Exception {
+    public void getbit() {
         assertThat(redis.getbit(key, 0)).isEqualTo(0);
         redis.setbit(key, 0, 1);
         assertThat(redis.getbit(key, 0)).isEqualTo(1);
     }
 
     @Test
-    public void getrange() throws Exception {
+    public void getrange() {
         assertThat(redis.getrange(key, 0, -1)).isEqualTo("");
         redis.set(key, "foobar");
         assertThat(redis.getrange(key, 2, 4)).isEqualTo("oba");
@@ -71,14 +71,14 @@ public void getrange() throws Exception {
     }
 
     @Test
-    public void getset() throws Exception {
+    public void getset() {
         assertThat(redis.getset(key, value)).isNull();
         assertThat(redis.getset(key, "two")).isEqualTo(value);
         assertThat(redis.get(key)).isEqualTo("two");
     }
 
     @Test
-    public void mget() throws Exception {
+    public void mget() {
         setupMget();
         assertThat(redis.mget("one", "two")).isEqualTo(list(kv("one", "1"), kv("two", "2")));
     }
@@ -90,7 +90,7 @@ protected void setupMget() {
     }
 
     @Test
-    public void mgetStreaming() throws Exception {
+    public void mgetStreaming() {
         setupMget();
 
         KeyValueStreamingAdapter<String, String> streamingAdapter = new KeyValueStreamingAdapter<>();
@@ -101,7 +101,7 @@ public void mgetStreaming() throws Exception {
     }
 
     @Test
-    public void mset() throws Exception {
+    public void mset() {
         assertThat(redis.mget("one", "two")).isEqualTo(list(KeyValue.empty("one"), KeyValue.empty("two")));
         Map<String, String> map = new LinkedHashMap<>();
         map.put("one", "1");
@@ -111,7 +111,7 @@ public void mset() throws Exception {
     }
 
     @Test
-    public void msetnx() throws Exception {
+    public void msetnx() {
         redis.set("one", "1");
         Map<String, String> map = new LinkedHashMap<>();
         map.put("one", "1");
@@ -123,7 +123,7 @@ public void msetnx() throws Exception {
     }
 
     @Test
-    public void set() throws Exception {
+    public void set() {
         assertThat(redis.get(key)).isNull();
         assertThat(redis.set(key, value)).isEqualTo("OK");
         assertThat(redis.get(key)).isEqualTo(value);
@@ -153,57 +153,57 @@ public void set() throws Exception {
     }
 
     @Test(expected = RedisException.class)
-    public void setNegativeEX() throws Exception {
+    public void setNegativeEX() {
         redis.set(key, value, ex(-10));
     }
 
     @Test(expected = RedisException.class)
-    public void setNegativePX() throws Exception {
+    public void setNegativePX() {
         redis.set(key, value, px(-1000));
     }
 
     @Test
-    public void setbit() throws Exception {
+    public void setbit() {
         assertThat(redis.setbit(key, 0, 1)).isEqualTo(0);
         assertThat(redis.setbit(key, 0, 0)).isEqualTo(1);
     }
 
     @Test
-    public void setex() throws Exception {
+    public void setex() {
         assertThat(redis.setex(key, 10, value)).isEqualTo("OK");
         assertThat(redis.get(key)).isEqualTo(value);
         assertThat(redis.ttl(key) >= 9).isTrue();
     }
 
     @Test
-    public void psetex() throws Exception {
+    public void psetex() {
         assertThat(redis.psetex(key, 20000, value)).isEqualTo("OK");
         assertThat(redis.get(key)).isEqualTo(value);
         assertThat(redis.pttl(key) >= 19000).isTrue();
     }
 
     @Test
-    public void setnx() throws Exception {
+    public void setnx() {
         assertThat(redis.setnx(key, value)).isTrue();
         assertThat(redis.setnx(key, value)).isFalse();
     }
 
     @Test
-    public void setrange() throws Exception {
+    public void setrange() {
         assertThat(redis.setrange(key, 0, "foo")).isEqualTo("foo".length());
         assertThat(redis.setrange(key, 3, "bar")).isEqualTo(6);
         assertThat(redis.get(key)).isEqualTo("foobar");
     }
 
     @Test
-    public void strlen() throws Exception {
+    public void strlen() {
         assertThat((long) redis.strlen(key)).isEqualTo(0);
         redis.set(key, value);
         assertThat((long) redis.strlen(key)).isEqualTo(value.length());
     }
 
     @Test
-    public void time() throws Exception {
+    public void time() {
 
         List<String> time = redis.time();
         assertThat(time).hasSize(2);
diff --git a/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java b/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
index f5eafd085c..c3dcc115bc 100644
--- a/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
-
-import io.lettuce.core.TransactionResult;
-import org.assertj.core.api.Assertions;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -28,6 +24,7 @@
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.RedisCommandExecutionException;
 import io.lettuce.core.RedisException;
+import io.lettuce.core.TransactionResult;
 import io.lettuce.core.api.sync.RedisCommands;
 
 /**
@@ -39,7 +36,7 @@ public class TransactionCommandTest extends AbstractRedisClientTest {
     public ExpectedException exception = ExpectedException.none();
 
     @Test
-    public void discard() throws Exception {
+    public void discard() {
         assertThat(redis.multi()).isEqualTo("OK");
         redis.set(key, value);
         assertThat(redis.discard()).isEqualTo("OK");
@@ -47,7 +44,7 @@ public void discard() throws Exception {
     }
 
     @Test
-    public void exec() throws Exception {
+    public void exec() {
         assertThat(redis.multi()).isEqualTo("OK");
         redis.set(key, value);
         assertThat(redis.exec()).contains("OK");
@@ -55,7 +52,7 @@ public void exec() throws Exception {
     }
 
     @Test
-    public void watch() throws Exception {
+    public void watch() {
         assertThat(redis.watch(key)).isEqualTo("OK");
 
         RedisCommands<String, String> redis2 = client.connect().sync();
@@ -73,12 +70,12 @@ public void watch() throws Exception {
     }
 
     @Test
-    public void unwatch() throws Exception {
+    public void unwatch() {
         assertThat(redis.unwatch()).isEqualTo("OK");
     }
 
     @Test
-    public void commandsReturnNullInMulti() throws Exception {
+    public void commandsReturnNullInMulti() {
 
         assertThat(redis.multi()).isEqualTo("OK");
         assertThat(redis.set(key, value)).isNull();
@@ -92,7 +89,7 @@ public void commandsReturnNullInMulti() throws Exception {
     }
 
     @Test
-    public void execmulti() throws Exception {
+    public void execmulti() {
         redis.multi();
         redis.set("one", "1");
         redis.set("two", "2");
@@ -102,7 +99,7 @@ public void execmulti() throws Exception {
     }
 
     @Test
-    public void emptyMulti() throws Exception {
+    public void emptyMulti() {
         redis.multi();
         TransactionResult exec = redis.exec();
         assertThat(exec.wasRolledBack()).isFalse();
@@ -110,7 +107,7 @@ public void emptyMulti() throws Exception {
     }
 
     @Test
-    public void errorInMulti() throws Exception {
+    public void errorInMulti() {
         redis.multi();
         redis.set(key, value);
         redis.lpop(key);
@@ -123,7 +120,7 @@ public void errorInMulti() throws Exception {
     }
 
     @Test
-    public void execWithoutMulti() throws Exception {
+    public void execWithoutMulti() {
         exception.expect(RedisCommandExecutionException.class);
         exception.expectMessage("ERR EXEC without MULTI");
         redis.exec();
diff --git a/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java
index 80e3dd4f2f..16b366d1e6 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java
@@ -24,7 +24,6 @@
 import org.junit.Test;
 
 import reactor.test.StepVerifier;
-
 import io.lettuce.core.BitFieldArgs;
 import io.lettuce.core.Value;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -50,7 +49,7 @@ protected RedisCommands<String, String> connect() {
     }
 
     @Test
-    public void bitfield() throws Exception {
+    public void bitfield() {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 1).set(5, 1).incrBy(2, 3).get().get(2);
 
@@ -61,7 +60,7 @@ public void bitfield() throws Exception {
     }
 
     @Test
-    public void bitfieldGetWithOffset() throws Exception {
+    public void bitfieldGetWithOffset() {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 1).get(signed(2), typeWidthBasedOffset(1));
 
@@ -71,7 +70,7 @@ public void bitfieldGetWithOffset() throws Exception {
     }
 
     @Test
-    public void bitfieldSet() throws Exception {
+    public void bitfieldSet() {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 5).set(5);
 
@@ -81,7 +80,7 @@ public void bitfieldSet() throws Exception {
     }
 
     @Test
-    public void bitfieldWithOffsetSet() throws Exception {
+    public void bitfieldWithOffsetSet() {
 
         StepVerifier.create(reactive.bitfield(key, BitFieldArgs.Builder.set(signed(8), typeWidthBasedOffset(2), 5)))
                 .expectNextCount(1).verifyComplete();
@@ -95,7 +94,7 @@ public void bitfieldWithOffsetSet() throws Exception {
     }
 
     @Test
-    public void bitfieldIncrBy() throws Exception {
+    public void bitfieldIncrBy() {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 5).incrBy(1);
 
@@ -105,7 +104,7 @@ public void bitfieldIncrBy() throws Exception {
     }
 
     @Test
-    public void bitfieldOverflow() throws Exception {
+    public void bitfieldOverflow() {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.overflow(FAIL).set(signed(8), 9, 5)
                 .incrBy(signed(8), Integer.MAX_VALUE);
diff --git a/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java
index 1fd61026ca..fea7ab4825 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java
@@ -19,7 +19,6 @@
 
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
-
 import io.lettuce.core.api.reactive.RedisReactiveCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.CustomCommandTest;
@@ -40,7 +39,7 @@ protected RedisCommands<String, String> connect() {
     }
 
     @Test
-    public void dispatchGetAndSet() throws Exception {
+    public void dispatchGetAndSet() {
 
         redis.set(key, value);
         RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
@@ -52,7 +51,7 @@ public void dispatchGetAndSet() throws Exception {
     }
 
     @Test
-    public void dispatchList() throws Exception {
+    public void dispatchList() {
 
         redis.rpush(key, "a", "b", "c");
         RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
diff --git a/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
index 397b6baddd..06ba2868e2 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
@@ -22,7 +22,6 @@
 import org.junit.Test;
 
 import reactor.test.StepVerifier;
-
 import io.lettuce.core.api.reactive.RedisReactiveCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.GeoCommandTest;
@@ -40,7 +39,7 @@ protected RedisCommands<String, String> connect() {
 
     @Test
     @Override
-    public void geopos() throws Exception {
+    public void geopos() {
 
         RedisReactiveCommands<String, String> reactive = client.connect().reactive();
 
@@ -59,6 +58,6 @@ public void geopos() throws Exception {
     @Test
     @Ignore("API differences")
     @Override
-    public void geoposWithTransaction() throws Exception {
+    public void geoposWithTransaction() {
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
index 6b7319ba10..c7dbdc41a4 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ public void debugRestart() {
     }
 
     @Test
-    public void migrate() throws Exception {
+    public void migrate() {
         reactive.migrate("host", 1234, "key", 1, 10);
         assertThat(reactive.getStatefulConnection().isOpen()).isTrue();
     }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java
index f72ac03849..4ecba63343 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java
@@ -19,7 +19,6 @@
 
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
-
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -37,7 +36,7 @@ protected RedisCommands<String, String> connect() {
     }
 
     @Test
-    public void mget() throws Exception {
+    public void mget() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
 
@@ -52,7 +51,7 @@ public void mget() throws Exception {
     }
 
     @Test
-    public void mgetEmpty() throws Exception {
+    public void mgetEmpty() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
 
diff --git a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
index 82366cea33..d08424b961 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
@@ -44,7 +44,7 @@ protected RedisCommands<String, String> connect() {
     }
 
     @Before
-    public void openConnection() throws Exception {
+    public void openConnection() {
         client.setOptions(ClientOptions.builder().build());
         redis = connect();
         redis.flushall();
@@ -54,12 +54,12 @@ public void openConnection() throws Exception {
     }
 
     @After
-    public void closeConnection() throws Exception {
+    public void closeConnection() {
         redis.getStatefulConnection().close();
     }
 
     @Test
-    public void discard() throws Exception {
+    public void discard() {
 
         StepVerifier.create(commands.multi()).expectNext("OK").verifyComplete();
 
@@ -70,7 +70,7 @@ public void discard() throws Exception {
     }
 
     @Test
-    public void watchRollback() throws Exception {
+    public void watchRollback() {
 
         StatefulRedisConnection<String, String> otherConnection = client.connect();
 
@@ -90,7 +90,7 @@ public void watchRollback() throws Exception {
     }
 
     @Test
-    public void execSingular() throws Exception {
+    public void execSingular() {
 
         StepVerifier.create(commands.multi()).expectNext("OK").verifyComplete();
 
@@ -101,7 +101,7 @@ public void execSingular() throws Exception {
     }
 
     @Test
-    public void errorInMulti() throws Exception {
+    public void errorInMulti() {
 
         commands.multi().toProcessor();
         commands.set(key, value).toProcessor();
@@ -117,7 +117,7 @@ public void errorInMulti() throws Exception {
     }
 
     @Test
-    public void resultOfMultiIsContainedInCommandFlux() throws Exception {
+    public void resultOfMultiIsContainedInCommandFlux() {
 
         commands.multi().toProcessor();
 
@@ -138,7 +138,7 @@ public void resultOfMultiIsContainedInCommandFlux() throws Exception {
     }
 
     @Test
-    public void resultOfMultiIsContainedInExecObservable() throws Exception {
+    public void resultOfMultiIsContainedInExecObservable() {
 
         commands.multi().toProcessor();
         commands.set("key1", "value1").toProcessor();
diff --git a/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
index 039862a3f3..6e50531cf0 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
@@ -32,41 +32,41 @@ protected RedisCommands<String, String> connect() {
 
     @Ignore
     @Override
-    public void georadiusbymemberWithArgsAndTransaction() throws Exception {
+    public void georadiusbymemberWithArgsAndTransaction() {
     }
 
     @Ignore
     @Override
-    public void geoaddWithTransaction() throws Exception {
+    public void geoaddWithTransaction() {
     }
 
     @Ignore
     @Override
-    public void geoaddMultiWithTransaction() throws Exception {
+    public void geoaddMultiWithTransaction() {
     }
 
     @Ignore
     @Override
-    public void geoposWithTransaction() throws Exception {
+    public void geoposWithTransaction() {
     }
 
     @Ignore
     @Override
-    public void georadiusWithArgsAndTransaction() throws Exception {
+    public void georadiusWithArgsAndTransaction() {
     }
 
     @Ignore
     @Override
-    public void georadiusWithTransaction() throws Exception {
+    public void georadiusWithTransaction() {
     }
 
     @Ignore
     @Override
-    public void geodistWithTransaction() throws Exception {
+    public void geodistWithTransaction() {
     }
 
     @Ignore
     @Override
-    public void geohashWithTransaction() throws Exception {
+    public void geohashWithTransaction() {
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java
index 891fa91c0b..d804a959da 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java
@@ -32,6 +32,6 @@ protected RedisCommands<String, String> connect() {
 
     @Ignore
     @Override
-    public void move() throws Exception {
+    public void move() {
     }
 }

From fa735cb086c51051569f297bb6ddf8e5183ce6c5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 7 Nov 2017 15:28:22 +0100
Subject: [PATCH 351/808] Test cleanups

Reduce WaitFor (tempus fugit) with Wait class to reduce external dependency usage.
---
 src/test/java/io/lettuce/Delay.java           |  5 ++-
 src/test/java/io/lettuce/Wait.java            |  1 +
 .../lettuce/core/ReactiveConnectionTest.java  | 42 +++++++++----------
 .../lettuce/core/RedisClientListenerTest.java | 10 ++---
 .../core/cluster/ClusterCommandTest.java      | 37 +++++++---------
 .../core/cluster/RedisClusterSetupTest.java   | 32 +++++---------
 .../RedisClusterStressScenariosTest.java      | 33 ++++++---------
 .../cluster/pubsub/PubSubClusterTest.java     |  4 +-
 .../cluster/pubsub/PubSubConnectionTest.java  |  8 ++--
 .../core/pubsub/PubSubCommandTest.java        | 12 +++---
 .../core/pubsub/PubSubReactiveTest.java       | 30 ++++++-------
 .../core/reliability/AtMostOnceTest.java      |  4 +-
 .../io/lettuce/core/resource/FuturesTest.java | 38 +++++++----------
 13 files changed, 111 insertions(+), 145 deletions(-)

diff --git a/src/test/java/io/lettuce/Delay.java b/src/test/java/io/lettuce/Delay.java
index e03006baae..7f0a84523c 100644
--- a/src/test/java/io/lettuce/Delay.java
+++ b/src/test/java/io/lettuce/Delay.java
@@ -15,7 +15,7 @@
  */
 package io.lettuce;
 
-import com.google.code.tempusfugit.temporal.Duration;
+import java.time.Duration;
 
 /**
  * @author Mark Paluch
@@ -25,8 +25,9 @@ public class Delay {
     public static void delay(Duration duration) {
 
         try {
-            Thread.sleep(duration.inMillis());
+            Thread.sleep(duration.toMillis());
         } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw new IllegalStateException(e);
         }
     }
diff --git a/src/test/java/io/lettuce/Wait.java b/src/test/java/io/lettuce/Wait.java
index 6120b17dc8..2933c7d9bd 100644
--- a/src/test/java/io/lettuce/Wait.java
+++ b/src/test/java/io/lettuce/Wait.java
@@ -170,6 +170,7 @@ public interface VoidWaitCondition {
 
     @FunctionalInterface
     public interface Supplier<T> {
+
         T get() throws Exception;
     }
 
diff --git a/src/test/java/io/lettuce/core/ReactiveConnectionTest.java b/src/test/java/io/lettuce/core/ReactiveConnectionTest.java
index 2ac3db2b80..73d9ff9709 100644
--- a/src/test/java/io/lettuce/core/ReactiveConnectionTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveConnectionTest.java
@@ -15,10 +15,10 @@
  */
 package io.lettuce.core;
 
-import static com.google.code.tempusfugit.temporal.Duration.millis;
 import static io.lettuce.core.ClientOptions.DisconnectedBehavior.REJECT_COMMANDS;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
@@ -49,20 +49,20 @@ public class ReactiveConnectionTest extends AbstractRedisClientTest {
     private StatefulRedisConnection<String, String> stateful;
 
     @Before
-    public void openReactiveConnection() throws Exception {
+    public void openReactiveConnection() {
         stateful = client.connect();
         reactive = stateful.reactive();
     }
 
     @After
-    public void closeReactiveConnection() throws Exception {
+    public void closeReactiveConnection() {
         reactive.getStatefulConnection().close();
     }
 
     @Test
-    public void doNotFireCommandUntilObservation() throws Exception {
+    public void doNotFireCommandUntilObservation() {
         Mono<String> set = reactive.set(key, value);
-        Delay.delay(millis(200));
+        Delay.delay(Duration.ofMillis(200));
         assertThat(redis.get(key)).isNull();
         set.subscribe();
         Wait.untilEquals(value, () -> redis.get(key)).waitOrTimeout();
@@ -71,69 +71,69 @@ public void doNotFireCommandUntilObservation() throws Exception {
     }
 
     @Test
-    public void fireCommandAfterObserve() throws Exception {
+    public void fireCommandAfterObserve() {
         StepVerifier.create(reactive.set(key, value)).expectNext("OK").verifyComplete();
         assertThat(redis.get(key)).isEqualTo(value);
     }
 
     @Test
-    public void isOpen() throws Exception {
+    public void isOpen() {
         assertThat(reactive.isOpen()).isTrue();
     }
 
     @Test
-    public void getStatefulConnection() throws Exception {
+    public void getStatefulConnection() {
         assertThat(reactive.getStatefulConnection()).isSameAs(stateful);
     }
 
     @Test
-    public void testCancelCommand() throws Exception {
+    public void testCancelCommand() {
 
         List<Object> result = new ArrayList<>();
         reactive.clientPause(2000).subscribe();
-        Delay.delay(millis(100));
+        Delay.delay(Duration.ofMillis(100));
 
         reactive.set(key, value).subscribe(new CompletionSubscriber(result));
-        Delay.delay(millis(100));
+        Delay.delay(Duration.ofMillis(100));
 
         reactive.reset();
         assertThat(result).isEmpty();
     }
 
     @Test
-    public void testEcho() throws Exception {
+    public void testEcho() {
         StepVerifier.create(reactive.echo("echo")).expectNext("echo").verifyComplete();
     }
 
     @Test
-    public void testMonoMultiCancel() throws Exception {
+    public void testMonoMultiCancel() {
 
         List<Object> result = new ArrayList<>();
         reactive.clientPause(1000).subscribe();
-        Delay.delay(millis(100));
+        Delay.delay(Duration.ofMillis(100));
 
         Mono<String> set = reactive.set(key, value);
         set.subscribe(new CompletionSubscriber(result));
         set.subscribe(new CompletionSubscriber(result));
         set.subscribe(new CompletionSubscriber(result));
-        Delay.delay(millis(100));
+        Delay.delay(Duration.ofMillis(100));
 
         reactive.reset();
         assertThat(result).isEmpty();
     }
 
     @Test
-    public void testFluxCancel() throws Exception {
+    public void testFluxCancel() {
 
         List<Object> result = new ArrayList<>();
         reactive.clientPause(1000).subscribe();
-        Delay.delay(millis(100));
+        Delay.delay(Duration.ofMillis(100));
 
         Flux<KeyValue<String, String>> set = reactive.mget(key, value);
         set.subscribe(new CompletionSubscriber(result));
         set.subscribe(new CompletionSubscriber(result));
         set.subscribe(new CompletionSubscriber(result));
-        Delay.delay(millis(100));
+        Delay.delay(Duration.ofMillis(100));
 
         reactive.reset();
         assertThat(result).isEmpty();
@@ -178,12 +178,12 @@ public void transactional() throws Exception {
     }
 
     @Test
-    public void auth() throws Exception {
+    public void auth() {
         StepVerifier.create(reactive.auth("error")).expectError().verify();
     }
 
     @Test
-    public void subscriberCompletingWithExceptionShouldBeHandledSafely() throws Exception {
+    public void subscriberCompletingWithExceptionShouldBeHandledSafely() {
 
         StepVerifier.create(Flux.concat(reactive.set("keyA", "valueA"), reactive.set("keyB", "valueB"))).expectNextCount(2)
                 .verifyComplete();
@@ -195,7 +195,7 @@ public void subscriberCompletingWithExceptionShouldBeHandledSafely() throws Exce
     }
 
     @Test
-    public void subscribeWithDisconnectedClient() throws Exception {
+    public void subscribeWithDisconnectedClient() {
 
         client.setOptions(ClientOptions.builder().disconnectedBehavior(REJECT_COMMANDS).autoReconnect(false).build());
 
diff --git a/src/test/java/io/lettuce/core/RedisClientListenerTest.java b/src/test/java/io/lettuce/core/RedisClientListenerTest.java
index 6b76246cfe..73b4a450ce 100644
--- a/src/test/java/io/lettuce/core/RedisClientListenerTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientListenerTest.java
@@ -15,8 +15,6 @@
  */
 package io.lettuce.core;
 
-import static com.google.code.tempusfugit.temporal.Duration.seconds;
-import static com.google.code.tempusfugit.temporal.WaitFor.waitOrTimeout;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.net.SocketAddress;
@@ -24,8 +22,8 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.google.code.tempusfugit.temporal.Timeout;
 import io.lettuce.TestClientResources;
+import io.lettuce.Wait;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.resource.ClientResources;
 
@@ -58,7 +56,7 @@ public void shouldNotifyListener() throws Exception {
 
         StatefulRedisConnection<String, String> connection = client.connect();
 
-        waitOrTimeout(() -> listener.onConnected != null, Timeout.timeout(seconds(2)));
+        Wait.untilTrue(() -> listener.onConnected != null).waitOrTimeout();
         assertThat(listener.onConnectedSocketAddress).isNotNull();
 
         assertThat(listener.onConnected).isEqualTo(connection);
@@ -67,7 +65,7 @@ public void shouldNotifyListener() throws Exception {
         connection.sync().set(key, value);
         connection.close();
 
-        waitOrTimeout(() -> listener.onDisconnected != null, Timeout.timeout(seconds(2)));
+        Wait.untilTrue(() -> listener.onDisconnected != null).waitOrTimeout();
 
         assertThat(listener.onConnected).isEqualTo(connection);
         assertThat(listener.onDisconnected).isEqualTo(connection);
@@ -89,7 +87,7 @@ public void shouldNotNotifyListenerAfterRemoval() throws Exception {
         // that's the sut call
         client.connect().close();
 
-        waitOrTimeout(() -> retainedListener.onConnected != null, Timeout.timeout(seconds(2)));
+        Wait.untilTrue(() -> retainedListener.onConnected != null).waitOrTimeout();
 
         assertThat(retainedListener.onConnected).isNotNull();
 
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java
index fc60af2542..f8f6f6ca6d 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,19 +15,16 @@
  */
 package io.lettuce.core.cluster;
 
-import static com.google.code.tempusfugit.temporal.Duration.seconds;
-import static com.google.code.tempusfugit.temporal.Timeout.timeout;
 import static io.lettuce.core.cluster.ClusterTestUtil.getNodeId;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
-import java.util.concurrent.TimeoutException;
 
-import io.lettuce.TestClientResources;
 import org.junit.*;
 import org.junit.runners.MethodSorters;
 
-import com.google.code.tempusfugit.temporal.WaitFor;
+import io.lettuce.TestClientResources;
+import io.lettuce.Wait;
 import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisFuture;
@@ -53,9 +50,10 @@ public class ClusterCommandTest extends AbstractClusterTest {
     protected RedisClusterCommands<String, String> sync;
 
     @BeforeClass
-    public static void setupClient() throws Exception {
+    public static void setupClient() {
         client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port1).build());
-        clusterClient = RedisClusterClient.create(TestClientResources.get(), LettuceLists.newList(RedisURI.Builder.redis(host, port1).build()));
+        clusterClient = RedisClusterClient.create(TestClientResources.get(),
+                LettuceLists.newList(RedisURI.Builder.redis(host, port1).build()));
 
     }
 
@@ -77,7 +75,7 @@ public void before() throws Exception {
     }
 
     @After
-    public void after() throws Exception {
+    public void after() {
         connection.close();
     }
 
@@ -104,7 +102,7 @@ public void testClusterInfo() throws Exception {
     }
 
     @Test
-    public void testClusterNodes() throws Exception {
+    public void testClusterNodes() {
 
         String result = sync.clusterNodes();
 
@@ -114,7 +112,7 @@ public void testClusterNodes() throws Exception {
     }
 
     @Test
-    public void testClusterNodesSync() throws Exception {
+    public void testClusterNodesSync() {
 
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
 
@@ -135,7 +133,7 @@ public void testClusterSlaves() throws Exception {
     }
 
     @Test
-    public void testAsking() throws Exception {
+    public void testAsking() {
         assertThat(sync.asking()).isEqualTo("OK");
     }
 
@@ -144,8 +142,7 @@ public void testReset() throws Exception {
 
         clusterClient.reloadPartitions();
 
-        StatefulRedisClusterConnection<String, String> clusterConnection = clusterClient
-                .connect();
+        StatefulRedisClusterConnection<String, String> clusterConnection = clusterClient.connect();
 
         RedisFuture<String> setA = clusterConnection.async().set("a", "myValue1");
         setA.get();
@@ -162,7 +159,7 @@ public void testReset() throws Exception {
     }
 
     @Test
-    public void testClusterSlots() throws Exception {
+    public void testClusterSlots() {
 
         List<Object> reply = sync.clusterSlots();
         assertThat(reply.size()).isGreaterThan(1);
@@ -220,13 +217,11 @@ public void readOnlyWithReconnect() throws Exception {
 
     }
 
-    protected void waitUntilValueIsVisible(String key, RedisCommands<String, String> commands) throws InterruptedException,
-            TimeoutException {
-        WaitFor.waitOrTimeout(() -> commands.get(key) != null, timeout(seconds(5)));
+    protected void waitUntilValueIsVisible(String key, RedisCommands<String, String> commands) {
+        Wait.untilTrue(() -> commands.get(key) != null).waitOrTimeout();
     }
 
-    protected void prepareReadonlyTest(String key) throws InterruptedException, TimeoutException,
-            java.util.concurrent.ExecutionException {
+    protected void prepareReadonlyTest(String key) throws InterruptedException, java.util.concurrent.ExecutionException {
 
         async.set(key, value);
 
@@ -264,7 +259,7 @@ public void readOnlyReadWrite() throws Exception {
     }
 
     @Test
-    public void clusterSlaves() throws Exception {
+    public void clusterSlaves() {
 
         String nodeId = getNodeId(sync);
         List<String> result = sync.clusterSlaves(nodeId);
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
index 45994d1077..bcdee68aa5 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
@@ -15,8 +15,6 @@
  */
 package io.lettuce.core.cluster;
 
-import static com.google.code.tempusfugit.temporal.Duration.seconds;
-import static com.google.code.tempusfugit.temporal.Timeout.timeout;
 import static io.lettuce.core.cluster.AbstractClusterTest.createSlots;
 import static io.lettuce.core.cluster.ClusterTestUtil.getNodeId;
 import static io.lettuce.core.cluster.ClusterTestUtil.getOwnPartition;
@@ -33,8 +31,6 @@
 
 import org.junit.*;
 
-import com.google.code.tempusfugit.temporal.Condition;
-import com.google.code.tempusfugit.temporal.WaitFor;
 import io.lettuce.ConnectionTestUtil;
 import io.lettuce.Futures;
 import io.lettuce.TestClientResources;
@@ -190,8 +186,7 @@ public void clusterSlotMigrationImport() throws Exception {
     @Test
     public void clusterTopologyRefresh() throws Exception {
 
-        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED)
-                .build());
+        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED).build());
         clusterClient.reloadPartitions();
 
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
@@ -307,9 +302,7 @@ public void disconnectedConnectionRejectTest() throws Exception {
     @Test
     public void atLeastOnceForgetNodeFailover() throws Exception {
 
-
-        clusterClient.setOptions(
-                ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED).build());
+        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED).build());
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
         clusterClient.setOptions(ClusterClientOptions.create());
         ClusterSetup.setup2Masters(clusterRule);
@@ -358,8 +351,7 @@ public void atLeastOnceForgetNodeFailover() throws Exception {
     @Test
     public void expireStaleNodeIdConnections() throws Exception {
 
-        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED)
-                .build());
+        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED).build());
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
 
         ClusterSetup.setup2Masters(clusterRule);
@@ -533,16 +525,13 @@ private void assertExecuted(RedisFuture<String> set) throws Exception {
         assertThat(set.get()).isEqualTo("OK");
     }
 
-    private void waitUntilOnlyOnePartition() throws InterruptedException, TimeoutException {
-        Wait.untilEquals(1, () -> clusterClient.getPartitions().size()).waitOrTimeout();
-    }
+    private void suspendConnection(RedisClusterAsyncCommands<String, String> asyncCommands) {
 
-    private void suspendConnection(RedisClusterAsyncCommands<String, String> asyncCommands) throws InterruptedException,
-            TimeoutException {
         ConnectionTestUtil.getConnectionWatchdog(((RedisAsyncCommands<?, ?>) asyncCommands).getStatefulConnection())
                 .setReconnectSuspended(true);
         asyncCommands.quit();
-        WaitFor.waitOrTimeout(() -> !asyncCommands.isOpen(), timeout(seconds(6)));
+
+        Wait.untilTrue(() -> !asyncCommands.isOpen()).waitOrTimeout();
     }
 
     protected void shiftAllSlotsToNode1() throws InterruptedException, TimeoutException {
@@ -552,10 +541,11 @@ protected void shiftAllSlotsToNode1() throws InterruptedException, TimeoutExcept
 
         waitForSlots(redis2, 0);
 
-        final RedisClusterNode redis2Partition = getOwnPartition(redis2);
-        WaitFor.waitOrTimeout(new Condition() {
+        RedisClusterNode redis2Partition = getOwnPartition(redis2);
+
+        Wait.untilTrue(new Wait.Supplier<Boolean>() {
             @Override
-            public boolean isSatisfied() {
+            public Boolean get() {
                 Partitions partitions = ClusterPartitionParser.parse(redis1.clusterNodes());
                 RedisClusterNode partition = partitions.getPartitionByNodeId(redis2Partition.getNodeId());
 
@@ -573,7 +563,7 @@ private void removeRemaining(RedisClusterNode partition) {
                     // ignore
                 }
             }
-        }, timeout(seconds(10)));
+        }).waitOrTimeout();
 
         redis1.clusterAddSlots(createSlots(12000, 16384));
         waitForSlots(redis1, 16384);
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
index 41ed471fbf..c7f3f26f5c 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
@@ -15,8 +15,6 @@
  */
 package io.lettuce.core.cluster;
 
-import static com.google.code.tempusfugit.temporal.Duration.seconds;
-import static com.google.code.tempusfugit.temporal.Timeout.timeout;
 import static io.lettuce.core.cluster.ClusterTestUtil.getOwnPartition;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -24,19 +22,16 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import io.lettuce.TestClientResources;
 import org.junit.*;
-import io.lettuce.core.api.sync.RedisCommands;
 import org.junit.runners.MethodSorters;
 
-import com.google.code.tempusfugit.temporal.Duration;
-import com.google.code.tempusfugit.temporal.ThreadSleep;
-import com.google.code.tempusfugit.temporal.WaitFor;
+import io.lettuce.TestClientResources;
 import io.lettuce.Wait;
 import io.lettuce.category.SlowTests;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -64,11 +59,10 @@ public class RedisClusterStressScenariosTest extends AbstractTest {
     public ClusterRule clusterRule = new ClusterRule(clusterClient, AbstractClusterTest.port5, AbstractClusterTest.port6);
 
     @BeforeClass
-    public static void setupClient() throws Exception {
+    public static void setupClient() {
         client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, AbstractClusterTest.port5).build());
         clusterClient = RedisClusterClient.create(TestClientResources.get(),
-                Collections.singletonList(RedisURI.Builder.redis(host, AbstractClusterTest.port5)
-                .build()));
+                Collections.singletonList(RedisURI.Builder.redis(host, AbstractClusterTest.port5).build()));
     }
 
     @AfterClass
@@ -88,14 +82,12 @@ public void before() throws Exception {
         redissync6 = redis6.sync();
         clusterClient.reloadPartitions();
 
-        WaitFor.waitOrTimeout(() -> {
-            return clusterRule.isStable();
-        }, timeout(seconds(5)), new ThreadSleep(Duration.millis(500)));
+        Wait.untilTrue(clusterRule::isStable).waitOrTimeout();
 
     }
 
     @After
-    public void after() throws Exception {
+    public void after() {
         redis5.close();
 
         redissync5.getStatefulConnection().close();
@@ -103,11 +95,11 @@ public void after() throws Exception {
     }
 
     @Test
-    public void testClusterFailover() throws Exception {
+    public void testClusterFailover() {
 
         log.info("Cluster node 5 is master");
         log.info("Cluster nodes seen from node 5:\n" + redissync5.clusterNodes());
-        log.info("Cluster nodes seen from node 6:\n"  + redissync6.clusterNodes());
+        log.info("Cluster nodes seen from node 6:\n" + redissync6.clusterNodes());
 
         Wait.untilTrue(() -> getOwnPartition(redissync5).is(RedisClusterNode.NodeFlag.MASTER)).waitOrTimeout();
         Wait.untilTrue(() -> getOwnPartition(redissync6).is(RedisClusterNode.NodeFlag.SLAVE)).waitOrTimeout();
@@ -130,16 +122,15 @@ public void testClusterFailover() throws Exception {
     }
 
     @Test
-    public void testClusterConnectionStability() throws Exception {
+    public void testClusterConnectionStability() {
 
         RedisAdvancedClusterAsyncCommandsImpl<String, String> connection = (RedisAdvancedClusterAsyncCommandsImpl<String, String>) clusterClient
                 .connect().async();
 
-        RedisChannelHandler<String, String> statefulConnection = (RedisChannelHandler) connection.getStatefulConnection();
+        RedisChannelHandler<String, String> statefulConnection = connection.getStatefulConnection();
 
         connection.set("a", "b");
-        ClusterDistributionChannelWriter writer = (ClusterDistributionChannelWriter) statefulConnection
-                .getChannelWriter();
+        ClusterDistributionChannelWriter writer = (ClusterDistributionChannelWriter) statefulConnection.getChannelWriter();
 
         StatefulRedisConnectionImpl<Object, Object> statefulSlotConnection = (StatefulRedisConnectionImpl) writer
                 .getClusterConnectionProvider().getConnection(ClusterConnectionProvider.Intent.WRITE, 3300);
@@ -149,7 +140,7 @@ public void testClusterConnectionStability() throws Exception {
         slotConnection.set("a", "b");
         slotConnection.getStatefulConnection().close();
 
-        WaitFor.waitOrTimeout(() -> !slotConnection.isOpen(), timeout(seconds(5)));
+        Wait.untilTrue(() -> !slotConnection.isOpen()).waitOrTimeout();
 
         assertThat(statefulSlotConnection.isClosed()).isTrue();
         assertThat(statefulSlotConnection.isOpen()).isFalse();
diff --git a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
index 71f86542f9..7ff335a458 100644
--- a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
@@ -49,7 +49,7 @@ public class PubSubClusterTest extends AbstractClusterTest {
     private StatefulRedisPubSubConnection<String, String> pubSubConnection2;
 
     @Before
-    public void openPubSubConnection() throws Exception {
+    public void openPubSubConnection() {
 
         pubSubConnection = clusterClient.connectPubSub();
         pubSubConnection2 = clusterClient.connectPubSub();
@@ -58,7 +58,7 @@ public void openPubSubConnection() throws Exception {
     }
 
     @After
-    public void closePubSubConnection() throws Exception {
+    public void closePubSubConnection() {
         pubSubConnection.close();
         pubSubConnection2.close();
     }
diff --git a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java
index 6fe2b079e2..8ebcd79d74 100644
--- a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java
+++ b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java
@@ -43,7 +43,7 @@ public class PubSubConnectionTest extends AbstractClusterTest {
     private StatefulRedisClusterPubSubConnection<String, String> pubSubConnection2;
 
     @Before
-    public void openPubSubConnection() throws Exception {
+    public void openPubSubConnection() {
         connection = clusterClient.connect();
         pubSubConnection = clusterClient.connectPubSub();
         pubSubConnection2 = clusterClient.connectPubSub();
@@ -51,14 +51,14 @@ public void openPubSubConnection() throws Exception {
     }
 
     @After
-    public void closePubSubConnection() throws Exception {
+    public void closePubSubConnection() {
         connection.close();
         pubSubConnection.close();
         pubSubConnection2.close();
     }
 
     @Test
-    public void testRegularClientPubSubChannels() throws Exception {
+    public void testRegularClientPubSubChannels() {
 
         String nodeId = pubSubConnection.sync().clusterMyId();
         RedisClusterNode otherNode = getOtherThan(nodeId);
@@ -100,7 +100,7 @@ public void testPubSubClientPublish() throws Exception {
     }
 
     @Test
-    public void testConnectToLeastClientsNode() throws Exception {
+    public void testConnectToLeastClientsNode() {
 
         clusterClient.reloadPartitions();
         String nodeId = pubSubConnection.sync().clusterMyId();
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
index 6a320c5c0c..c5b39ad307 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
@@ -55,7 +55,7 @@ public class PubSubCommandTest extends AbstractRedisClientTest implements RedisP
     private String message = "msg!";
 
     @Before
-    public void openPubSubConnection() throws Exception {
+    public void openPubSubConnection() {
         pubsub = client.connectPubSub().async();
         pubsub.getStatefulConnection().addListener(this);
         channels = LettuceFactories.newBlockingQueue();
@@ -65,12 +65,12 @@ public void openPubSubConnection() throws Exception {
     }
 
     @After
-    public void closePubSubConnection() throws Exception {
+    public void closePubSubConnection() {
         pubsub.getStatefulConnection().close();
     }
 
     @Test
-    public void auth() throws Exception {
+    public void auth() {
         new WithPasswordRequired() {
             @Override
             protected void run(RedisClient client) throws Exception {
@@ -85,7 +85,7 @@ protected void run(RedisClient client) throws Exception {
     }
 
     @Test
-    public void authWithReconnect() throws Exception {
+    public void authWithReconnect() {
 
         new WithPasswordRequired() {
             @Override
@@ -194,7 +194,7 @@ public void psubscribeWithListener() throws Exception {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void pubsubEmptyChannels() throws Exception {
+    public void pubsubEmptyChannels() {
         pubsub.subscribe();
         fail("Missing IllegalArgumentException: channels must not be empty");
     }
@@ -276,7 +276,7 @@ public void unsubscribe() throws Exception {
     }
 
     @Test
-    public void pubsubCloseOnClientShutdown() throws Exception {
+    public void pubsubCloseOnClientShutdown() {
 
         RedisClient redisClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port).build());
 
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
index 058807f850..062e3d7b34 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
@@ -15,10 +15,10 @@
  */
 package io.lettuce.core.pubsub;
 
-import static com.google.code.tempusfugit.temporal.Duration.millis;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;
@@ -63,7 +63,7 @@ public class PubSubReactiveTest extends AbstractRedisClientTest implements Redis
     private String message = "msg!";
 
     @Before
-    public void openPubSubConnection() throws Exception {
+    public void openPubSubConnection() {
 
         pubsub = client.connectPubSub().reactive();
         pubsub2 = client.connectPubSub().reactive();
@@ -75,7 +75,7 @@ public void openPubSubConnection() throws Exception {
     }
 
     @After
-    public void closePubSubConnection() throws Exception {
+    public void closePubSubConnection() {
         pubsub.getStatefulConnection().close();
         pubsub2.getStatefulConnection().close();
     }
@@ -98,7 +98,7 @@ public void observeChannels() throws Exception {
 
         disposable.dispose();
         redis.publish(channel, message);
-        Delay.delay(millis(500));
+        Delay.delay(Duration.ofMillis(500));
         assertThat(channelMessages).hasSize(3);
 
         ChannelMessage<String, String> channelMessage = channelMessages.take();
@@ -107,7 +107,7 @@ public void observeChannels() throws Exception {
     }
 
     @Test
-    public void observeChannelsUnsubscribe() throws Exception {
+    public void observeChannelsUnsubscribe() {
 
         block(pubsub.subscribe(channel));
 
@@ -118,7 +118,7 @@ public void observeChannelsUnsubscribe() throws Exception {
         block(redis.getStatefulConnection().reactive().publish(channel, message));
         block(redis.getStatefulConnection().reactive().publish(channel, message));
 
-        Delay.delay(millis(500));
+        Delay.delay(Duration.ofMillis(500));
         assertThat(channelMessages).isEmpty();
     }
 
@@ -145,7 +145,7 @@ public void observePatterns() throws Exception {
     }
 
     @Test
-    public void observePatternsWithUnsubscribe() throws Exception {
+    public void observePatternsWithUnsubscribe() {
 
         block(pubsub.psubscribe(pattern));
 
@@ -165,7 +165,7 @@ public void observePatternsWithUnsubscribe() throws Exception {
         redis.publish(channel, message);
         redis.publish(channel, message);
 
-        Delay.delay(millis(500));
+        Delay.delay(Duration.ofMillis(500));
 
         assertThat(patternMessages).hasSize(3);
     }
@@ -208,14 +208,14 @@ public void psubscribe() throws Exception {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void pubsubEmptyChannels() throws Exception {
+    public void pubsubEmptyChannels() {
 
         pubsub.subscribe();
         fail("Missing IllegalArgumentException: channels must not be empty");
     }
 
     @Test
-    public void pubsubChannels() throws Exception {
+    public void pubsubChannels() {
 
         block(pubsub.subscribe(channel));
         List<String> result = block(pubsub2.pubsubChannels().collectList());
@@ -223,7 +223,7 @@ public void pubsubChannels() throws Exception {
     }
 
     @Test
-    public void pubsubMultipleChannels() throws Exception {
+    public void pubsubMultipleChannels() {
 
         pubsub.subscribe(channel, "channel1", "channel3").subscribe();
 
@@ -232,7 +232,7 @@ public void pubsubMultipleChannels() throws Exception {
     }
 
     @Test
-    public void pubsubChannelsWithArg() throws Exception {
+    public void pubsubChannelsWithArg() {
 
         pubsub.subscribe(channel).subscribe();
         Wait.untilTrue(() -> mono(pubsub2.pubsubChannels(pattern).filter(s -> channel.equals(s))) != null).waitOrTimeout();
@@ -242,7 +242,7 @@ public void pubsubChannelsWithArg() throws Exception {
     }
 
     @Test
-    public void pubsubNumsub() throws Exception {
+    public void pubsubNumsub() {
 
         pubsub.subscribe(channel).subscribe();
         Wait.untilEquals(1, () -> block(pubsub2.pubsubNumsub(channel)).size()).waitOrTimeout();
@@ -253,7 +253,7 @@ public void pubsubNumsub() throws Exception {
     }
 
     @Test
-    public void pubsubNumpat() throws Exception {
+    public void pubsubNumpat() {
 
         Wait.untilEquals(0L, () -> block(pubsub2.pubsubNumpat())).waitOrTimeout();
 
@@ -296,7 +296,7 @@ public void unsubscribe() throws Exception {
     }
 
     @Test
-    public void pubsubCloseOnClientShutdown() throws Exception {
+    public void pubsubCloseOnClientShutdown() {
 
         RedisClient redisClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port).build());
 
diff --git a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
index af543c05cc..72ee9570ef 100644
--- a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
@@ -15,12 +15,12 @@
  */
 package io.lettuce.core.reliability;
 
-import static com.google.code.tempusfugit.temporal.Duration.millis;
 import static io.lettuce.ConnectionTestUtil.getCommandBuffer;
 import static io.lettuce.ConnectionTestUtil.getStack;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
 
+import java.time.Duration;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -267,7 +267,7 @@ public void noCommandsExecutedAfterConnectionIsDisconnected() {
 
         StatefulRedisConnection<String, String> connection2 = client.connect();
         connection2.async().quit();
-        Delay.delay(millis(100));
+        Delay.delay(Duration.ofMillis(100));
 
         try {
 
diff --git a/src/test/java/io/lettuce/core/resource/FuturesTest.java b/src/test/java/io/lettuce/core/resource/FuturesTest.java
index c761e1dc19..fe04a5d75e 100644
--- a/src/test/java/io/lettuce/core/resource/FuturesTest.java
+++ b/src/test/java/io/lettuce/core/resource/FuturesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,11 @@
  */
 package io.lettuce.core.resource;
 
-import static com.google.code.tempusfugit.temporal.Duration.seconds;
-import static com.google.code.tempusfugit.temporal.Timeout.timeout;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 
-import com.google.code.tempusfugit.temporal.Condition;
-import com.google.code.tempusfugit.temporal.WaitFor;
-
+import io.lettuce.Wait;
 import io.netty.util.concurrent.DefaultPromise;
 import io.netty.util.concurrent.GlobalEventExecutor;
 import io.netty.util.concurrent.ImmediateEventExecutor;
@@ -35,39 +31,38 @@
 public class FuturesTest {
 
     @Test(expected = IllegalArgumentException.class)
-    public void testPromise() throws Exception {
+    public void testPromise() {
         new Futures.PromiseAggregator(null);
     }
 
     @Test(expected = IllegalStateException.class)
-    public void notArmed() throws Exception {
+    public void notArmed() {
         Futures.PromiseAggregator<Boolean, Promise<Boolean>> sut = new Futures.PromiseAggregator<Boolean, Promise<Boolean>>(
-                new DefaultPromise<Boolean>(ImmediateEventExecutor.INSTANCE));
-        sut.add(new DefaultPromise<Boolean>(ImmediateEventExecutor.INSTANCE));
+                new DefaultPromise<>(ImmediateEventExecutor.INSTANCE));
+        sut.add(new DefaultPromise<>(ImmediateEventExecutor.INSTANCE));
     }
 
     @Test(expected = IllegalStateException.class)
-    public void expectAfterArmed() throws Exception {
+    public void expectAfterArmed() {
         Futures.PromiseAggregator<Boolean, Promise<Boolean>> sut = new Futures.PromiseAggregator<Boolean, Promise<Boolean>>(
-                new DefaultPromise<Boolean>(ImmediateEventExecutor.INSTANCE));
+                new DefaultPromise<>(ImmediateEventExecutor.INSTANCE));
         sut.arm();
 
         sut.expectMore(1);
     }
 
     @Test(expected = IllegalStateException.class)
-    public void armTwice() throws Exception {
+    public void armTwice() {
         Futures.PromiseAggregator<Boolean, Promise<Boolean>> sut = new Futures.PromiseAggregator<Boolean, Promise<Boolean>>(
-                new DefaultPromise<Boolean>(ImmediateEventExecutor.INSTANCE));
+                new DefaultPromise<>(ImmediateEventExecutor.INSTANCE));
         sut.arm();
         sut.arm();
     }
 
     @Test
-    public void regularUse() throws Exception {
-        final DefaultPromise<Boolean> target = new DefaultPromise<Boolean>(GlobalEventExecutor.INSTANCE);
-        Futures.PromiseAggregator<Boolean, Promise<Boolean>> sut = new Futures.PromiseAggregator<Boolean, Promise<Boolean>>(
-                target);
+    public void regularUse() {
+        final DefaultPromise<Boolean> target = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
+        Futures.PromiseAggregator<Boolean, Promise<Boolean>> sut = new Futures.PromiseAggregator<>(target);
 
         sut.expectMore(1);
         sut.arm();
@@ -78,12 +73,7 @@ public void regularUse() throws Exception {
 
         part.setSuccess(true);
 
-        WaitFor.waitOrTimeout(new Condition() {
-            @Override
-            public boolean isSatisfied() {
-                return target.isDone();
-            }
-        }, timeout(seconds(5)));
+        Wait.untilTrue(target::isDone).waitOrTimeout();
 
         assertThat(target.isDone()).isTrue();
     }

From ec67b2a9372eb8c8438f70cdf10e47fefcc80393 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 7 Nov 2017 15:37:07 +0100
Subject: [PATCH 352/808] Fix cluster node config for partially-up cluster

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index de98bda5b9..73d4b5a4d2 100644
--- a/Makefile
+++ b/Makefile
@@ -40,10 +40,10 @@ vars currentEpoch 3 lastVoteEpoch 0
 endef
 
 define REDIS_CLUSTER_CONFIG8
-c2043458aa5646cee429fdd5e3c18220dddf2ce5 127.0.0.1:7580 master - 0 1434887920102 0 connected
-1c541b6daf98719769e6aacf338a7d81f108a180 127.0.0.1:7581 master - 0 1434887920102 3 connected 10001-16384
-2c07344ffa94ede5ea57a2367f190af6144c1adb 127.0.0.1:7582 myself,master - 0 0 2 connected 0-10000
-27f88788f03a86296b7d860152f4ae24ee59c8c9 127.0.0.1:7579 master - 0 1434887920102 1 connected
+c2043458aa5646cee429fdd5e3c18220dddf2ce5 127.0.0.1:7580 master - 1434887920102 1434887920002 0 connected 10001-16383
+27f88788f03a86296b7d860152f4ae24ee59c8c9 127.0.0.1:7579 myself,master - 0 0 1 connected 0-10000
+2c07344ffa94ede5ea57a2367f190af6144c1adb 127.0.0.1:7582 slave c2043458aa5646cee429fdd5e3c18220dddf2ce5 1434887920102 1434887920002 2 connected
+1c541b6daf98719769e6aacf338a7d81f108a180 127.0.0.1:7581 slave 27f88788f03a86296b7d860152f4ae24ee59c8c9 1434887920102 1434887920002 3 connected
 vars currentEpoch 3 lastVoteEpoch 0
 endef
 

From 7118b2fc798d0a87f574a0abf7961a450ee3dbe4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 11 Nov 2017 15:22:58 +0100
Subject: [PATCH 353/808] Close async closeables asynchronously #640

---
 .../io/lettuce/core/AbstractRedisClient.java  | 19 +++++++++++++------
 .../java/io/lettuce/core/RedisClient.java     | 11 ++++++++---
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index bd5ca8d1d9..3b36fa4736 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -30,6 +30,7 @@
 
 import reactor.core.publisher.Mono;
 import io.lettuce.core.Transports.NativeTransports;
+import io.lettuce.core.internal.AsyncCloseable;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.ConnectionWatchdog;
 import io.lettuce.core.resource.ClientResources;
@@ -432,18 +433,24 @@ public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, Tim
 
         if (shutdown.compareAndSet(false, true)) {
 
+            List<CompletableFuture<Void>> closeFutures = new ArrayList<>();
+
             while (!closeableResources.isEmpty()) {
                 Closeable closeableResource = closeableResources.iterator().next();
-                try {
-                    closeableResource.close();
-                } catch (Exception e) {
-                    logger.debug("Exception on Close: " + e.getMessage(), e);
+
+                if (closeableResource instanceof AsyncCloseable) {
+
+                    closeFutures.add(((AsyncCloseable) closeableResource).closeAsync());
+                } else {
+                    try {
+                        closeableResource.close();
+                    } catch (Exception e) {
+                        logger.debug("Exception on Close: " + e.getMessage(), e);
+                    }
                 }
                 closeableResources.remove(closeableResource);
             }
 
-            List<CompletableFuture<Void>> closeFutures = new ArrayList<>();
-
             for (Channel c : channels) {
 
                 ChannelPipeline pipeline = c.pipeline();
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 3826bcd10e..c6ee35d882 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -725,9 +725,14 @@ private Mono<SocketAddress> getSocketAddressSupplier(RedisURI redisURI) {
 
     private Mono<SocketAddress> lookupRedis(RedisURI sentinelUri) {
 
-        return Mono.fromCompletionStage(connectSentinelAsync(newStringStringCodec(), sentinelUri, timeout)).flatMap(
-                c -> c.reactive().getMasterAddrByName(sentinelUri.getSentinelMasterId()).timeout(timeout)
-                        .doFinally(s -> c.close()));
+        Mono<StatefulRedisSentinelConnection<String, String>> connection = Mono.fromCompletionStage(connectSentinelAsync(
+                newStringStringCodec(), sentinelUri, timeout));
+
+        return connection.flatMap(c -> c.reactive() //
+                .getMasterAddrByName(sentinelUri.getSentinelMasterId()) //
+                .timeout(this.timeout) //
+                .flatMap(it -> Mono.fromCompletionStage(c.closeAsync()) //
+                        .then(Mono.just(it))));
     }
 
     private static void checkValidRedisURI(RedisURI redisURI) {

From fc81fd50c1440f09f884b7555910afbde1db1959 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 12 Nov 2017 20:30:02 +0100
Subject: [PATCH 354/808] Reset ConnectionWatchdog log-prefix after connect
 #645

---
 .../java/io/lettuce/core/protocol/CommandHandler.java    | 7 +++----
 .../io/lettuce/core/protocol/ConnectionWatchdog.java     | 9 ++++-----
 .../java/io/lettuce/core/protocol/DefaultEndpoint.java   | 7 +++----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 289c2d2a57..fec2ab017b 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -743,10 +743,9 @@ private String logPrefix() {
             return logPrefix;
         }
 
-        StringBuilder buffer = new StringBuilder(64);
-        buffer.append('[').append(ChannelLogDescriptor.logDescriptor(channel)).append(", ").append("chid=0x")
-                .append(Long.toHexString(commandHandlerId)).append(']');
-        return logPrefix = buffer.toString();
+        String buffer = "[" + ChannelLogDescriptor.logDescriptor(channel) + ", " + "chid=0x"
+                + Long.toHexString(commandHandlerId) + ']';
+        return logPrefix = buffer;
     }
 
     private static long nanoTime() {
diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
index a6b44ad569..2f3f5734b2 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
@@ -143,6 +143,7 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
 
         channel = ctx.channel();
         reconnectScheduleTimeout = null;
+        logPrefix = null;
         remoteAddress = channel.remoteAddress();
         logPrefix = null;
         logger.debug("{} channelActive()", logPrefix());
@@ -343,10 +344,8 @@ private String logPrefix() {
             return logPrefix;
         }
 
-        StringBuilder buffer = new StringBuilder(64);
-        buffer.append('[').append(ChannelLogDescriptor.logDescriptor(channel)).append(", last known addr=")
-                .append(remoteAddress).append(']');
-        return logPrefix = buffer.toString();
+        String
+        buffer= "[" +ChannelLogDescriptor.logDescriptor(channel)+", last known addr="+remoteAddress+']';
+        return logPrefix = buffer;
     }
-
 }
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index 4989e5a9a6..c5513927fe 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -686,10 +686,9 @@ protected String logPrefix() {
             return logPrefix;
         }
 
-        StringBuffer buffer = new StringBuffer(64);
-        buffer.append('[').append(ChannelLogDescriptor.logDescriptor(channel)).append(", ").append("epid=0x")
-                .append(Long.toHexString(endpointId)).append(']');
-        return logPrefix = buffer.toString();
+        String buffer = "[" + ChannelLogDescriptor.logDescriptor(channel) + ", " + "epid=0x" + Long.toHexString(endpointId)
+                + ']';
+        return logPrefix = buffer;
     }
 
     private class ListenerSupport {

From 41b5e1adc11cf22c0af52f5dddbf66e10f928979 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 12 Nov 2017 21:03:06 +0100
Subject: [PATCH 355/808] Fix Javadoc path for RxJava and Project Reactor #641

---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 9b07e22a2c..8e08a1122e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -396,7 +396,9 @@
                                 <link>http://netty.io/4.1/api/</link>
                                 <link>http://commons.apache.org/proper/commons-pool/api-2.4.2/</link>
                                 <link>http://docs.guava-libraries.googlecode.com/git/javadoc/</link>
+                                <link>http://reactivex.io/RxJava/1.x/javadoc/</link>
                                 <link>http://reactivex.io/RxJava/javadoc/</link>
+                                <link>https://projectreactor.io/docs/core/release/api/</link>
                                 <link>https://docs.spring.io/spring/docs/current/javadoc-api/</link>
                             </links>
                             <additionalparam>-Xdoclint:none</additionalparam>

From c29ece1c6515c65041e5626274d6987184d52307 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 16 Nov 2017 09:53:29 +0100
Subject: [PATCH 356/808] Upgrade to netty 4.1.17.Final #646

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8e08a1122e..c31cd23d80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
-        <netty-version>4.1.15.Final</netty-version>
+        <netty-version>4.1.17.Final</netty-version>
         <spring-version>4.3.11.RELEASE</spring-version>
         <reactor-version>Bismuth-RELEASE</reactor-version>
     </properties>

From bf2945702c0faa8b26e40202ea9dc6415a896748 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 16 Nov 2017 09:55:20 +0100
Subject: [PATCH 357/808] Upgrade to Spring Framework 4.3.12 #648

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c31cd23d80..fbc4936308 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
         <netty-version>4.1.17.Final</netty-version>
-        <spring-version>4.3.11.RELEASE</spring-version>
+        <spring-version>4.3.12.RELEASE</spring-version>
         <reactor-version>Bismuth-RELEASE</reactor-version>
     </properties>
 

From 8df945812ceb029cc46157b20f06013211f2fd94 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 16 Nov 2017 09:57:38 +0100
Subject: [PATCH 358/808] Upgrade to Commons Pool 2.4.3 #650

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fbc4936308..408db760d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
-            <version>2.4.2</version>
+            <version>2.4.3</version>
             <optional>true</optional>
         </dependency>
 

From 1d4e52217289a4ee1f77478f6a7ab4d5308a296e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 16 Nov 2017 09:58:24 +0100
Subject: [PATCH 359/808] Upgrade to RxJava 1.3.3 #651

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 408db760d4..41a9ebb241 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,7 +172,7 @@
         <dependency>
             <groupId>io.reactivex</groupId>
             <artifactId>rxjava</artifactId>
-            <version>1.3.0</version>
+            <version>1.3.3</version>
             <optional>true</optional>
         </dependency>
 

From 22250f6362aec93a4d5cbe0dcac772895395905f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 16 Nov 2017 09:59:25 +0100
Subject: [PATCH 360/808] Upgrade to RxJava2 2.1.6 #652

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 41a9ebb241..017e3d66a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,7 +186,7 @@
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
-            <version>2.1.1</version>
+            <version>2.1.6</version>
             <optional>true</optional>
         </dependency>
 

From c7108067d195d5a91de41c5a22ef1de900eb40bc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 16 Nov 2017 10:00:52 +0100
Subject: [PATCH 361/808] Upgrade to HdrHistogram 2.1.10 #653

---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 017e3d66a4..318a730cd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,6 +165,13 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>org.hdrhistogram</groupId>
+            <artifactId>HdrHistogram</artifactId>
+            <version>2.1.10</version>
+            <optional>true</optional>
+        </dependency>
+
         <!-- End of Core Dependencies -->
 
         <!-- Reactive Dependencies -->

From 3d9a7adc8ec348170b967bffae9e3577fc5e751e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 16 Nov 2017 10:16:52 +0100
Subject: [PATCH 362/808] Upgrade Redis versions on TravisCI #655

---
 .travis.yml | 4 ++--
 Makefile    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 16a20e6321..a30815b014 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,8 @@ env:
   matrix:
     - REDIS=unstable
     - PROFILE=jmh
-    - REDIS=4.0.1
-    - REDIS=3.2.10
+    - REDIS=4.0.2
+    - REDIS=3.2.11
 
 sudo: false
 
diff --git a/Makefile b/Makefile
index 73d4b5a4d2..e7dd3b08aa 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ BREW_BIN := $(shell which brew)
 YUM_BIN := $(shell which yum)
 APT_BIN := $(shell which apt-get)
 PROFILE ?= netty-41
-REDIS ?= 4.0.1
+REDIS ?= 4.0.2
 
 define REDIS_CLUSTER_CONFIG1
 c2043458aa5646cee429fdd5e3c18220dddf2ce5 127.0.0.1:7380 master - 1434887920102 1434887920002 0 connected 12000-16383

From eb73af62b61eb37b8cda73911bbb5b53a92c2133 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 16 Nov 2017 16:09:48 +0100
Subject: [PATCH 363/808] Add conditional test retry

---
 src/test/java/io/lettuce/LoggingTestRule.java | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/test/java/io/lettuce/LoggingTestRule.java b/src/test/java/io/lettuce/LoggingTestRule.java
index 5b0ad04308..eabb0320ed 100644
--- a/src/test/java/io/lettuce/LoggingTestRule.java
+++ b/src/test/java/io/lettuce/LoggingTestRule.java
@@ -17,6 +17,8 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
@@ -52,8 +54,9 @@ public void evaluate() throws Throwable {
                     logger.info("---------------------------------------");
                 }
 
+
                 try {
-                    base.evaluate();
+                    runTest();
                 } catch (Throwable t) {
                     if (threadDumpOnFailure) {
                         printThreadDump(logger);
@@ -69,6 +72,23 @@ public void evaluate() throws Throwable {
                     }
                 }
             }
+
+            protected void runTest() throws Throwable {
+                try {
+                    base.evaluate();
+                } catch (Throwable throwable) {
+
+                    StringWriter writer = new StringWriter();
+
+                    throwable.printStackTrace(new PrintWriter(writer));
+
+                    if (writer.getBuffer().toString().contains("CLUSTERDOWN")) {
+                        base.evaluate();
+                    } else {
+                        throw throwable;
+                    }
+                }
+            }
         };
     }
 

From 8068bb6dd7407851198a691dda0d56409666565a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 16 Nov 2017 16:15:20 +0100
Subject: [PATCH 364/808] Create CI build profile to omit warnings because of
 an absent profile

---
 .travis.yml | 2 +-
 Makefile    | 2 +-
 pom.xml     | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a30815b014..64ff9b5b34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ before_install:
 
 install: make prepare ssl-keys
 
-script: make test-coverage PROFILE=${PROFILE:-netty41}
+script: make test-coverage PROFILE=${PROFILE:-ci}
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/Makefile b/Makefile
index e7dd3b08aa..be2f04eea2 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ STUNNEL_BIN := $(shell which stunnel)
 BREW_BIN := $(shell which brew)
 YUM_BIN := $(shell which yum)
 APT_BIN := $(shell which apt-get)
-PROFILE ?= netty-41
+PROFILE ?= ci
 REDIS ?= 4.0.2
 
 define REDIS_CLUSTER_CONFIG1
diff --git a/pom.xml b/pom.xml
index 318a730cd4..c205414965 100644
--- a/pom.xml
+++ b/pom.xml
@@ -375,6 +375,10 @@
 
     <profiles>
 
+        <profile>
+            <id>ci</id>
+        </profile>
+
         <profile>
 
             <id>sonatype-oss-release</id>

From ea98fb5f55ad866a5fd8361edba9d9f86bf2da4b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 16 Nov 2017 16:16:34 +0100
Subject: [PATCH 365/808] Upgrade to Reactor Bismuth SR4 #647

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c205414965..197e940edd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <skipTests>true</skipTests>
         <netty-version>4.1.17.Final</netty-version>
         <spring-version>4.3.12.RELEASE</spring-version>
-        <reactor-version>Bismuth-RELEASE</reactor-version>
+        <reactor-version>Bismuth-SR4</reactor-version>
     </properties>
 
     <scm>

From 2142f88438333b95c26baa461b748a044e336272 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 17 Nov 2017 14:30:47 +0100
Subject: [PATCH 366/808] Synchronize Connections.close() properly #656

Lettuce now closes connections using synchronization to prevent late connected connection from causing concurrent modifications. Also, closing and merging connections sets the close flag to prevent lingering connections.
---
 .../topology/ClusterTopologyRefresh.java      |  2 +-
 .../core/cluster/topology/Connections.java    | 61 +++++++++++++++++--
 .../topology/ClusterTopologyRefreshTest.java  | 20 +++---
 3 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
index 217df40aab..0604f7135e 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
@@ -73,6 +73,7 @@ public Map<RedisURI, Partitions> loadViews(Iterable<RedisURI> seed, boolean disc
             NodeTopologyViews nodeSpecificViews = getNodeSpecificViews(requestedTopology, requestedClients, commandTimeoutNs);
 
             if (discovery) {
+
                 Set<RedisURI> allKnownUris = nodeSpecificViews.getClusterNodes();
                 Set<RedisURI> discoveredNodes = difference(allKnownUris, toSet(seed));
 
@@ -91,7 +92,6 @@ public Map<RedisURI, Partitions> loadViews(Iterable<RedisURI> seed, boolean disc
             }
 
             return nodeSpecificViews.toMap();
-
         } catch (InterruptedException e) {
 
             Thread.currentThread().interrupt();
diff --git a/src/main/java/io/lettuce/core/cluster/topology/Connections.java b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
index 1fa0381294..49a612dfa8 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Connections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package io.lettuce.core.cluster.topology;
 
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -33,6 +35,7 @@
 class Connections {
 
     private final Map<RedisURI, StatefulRedisConnection<String, String>> connections;
+    private volatile boolean closed = false;
 
     public Connections() {
         connections = new TreeMap<>(TopologyComparators.RedisURIComparator.INSTANCE);
@@ -49,7 +52,14 @@ private Connections(Map<RedisURI, StatefulRedisConnection<String, String>> conne
      * @param connection
      */
     public void addConnection(RedisURI redisURI, StatefulRedisConnection<String, String> connection) {
+
         synchronized (connections) {
+
+            if (closed) {
+                connection.close();
+                return;
+            }
+
             connections.put(redisURI, connection);
         }
     }
@@ -113,17 +123,58 @@ public Requests requestClients() {
      * Close all connections.
      */
     public void close() {
-        for (StatefulRedisConnection<String, String> connection : connections.values()) {
-            connection.close();
+
+        this.closed = true;
+
+        while (hasConnections()) {
+
+            for (StatefulRedisConnection<String, String> connection : drainConnections()) {
+                connection.closeAsync();
+            }
         }
     }
 
+    private boolean hasConnections() {
+        synchronized (connections) {
+            return !this.connections.isEmpty();
+        }
+    }
+
+    private Collection<StatefulRedisConnection<String, String>> drainConnections() {
+
+        synchronized (this.connections) {
+
+            Map<RedisURI, StatefulRedisConnection<String, String>> connections = new HashMap<>(this.connections);
+            connections.forEach((k, v) -> {
+                this.connections.remove(k);
+            });
+        }
+
+        return connections.values();
+    }
+
+    /**
+     * Merges this and {@code discoveredConnections} into a new {@link Connections} instance. This instance is marked as closed
+     * to prevent lingering connections.
+     *
+     * @param discoveredConnections
+     * @return
+     */
     public Connections mergeWith(Connections discoveredConnections) {
 
         Map<RedisURI, StatefulRedisConnection<String, String>> result = new TreeMap<>(
                 TopologyComparators.RedisURIComparator.INSTANCE);
-        result.putAll(this.connections);
-        result.putAll(discoveredConnections.connections);
+
+        synchronized (this.connections) {
+            synchronized (discoveredConnections.connections) {
+
+                this.closed = true;
+                discoveredConnections.closed = true;
+
+                result.putAll(this.connections);
+                result.putAll(discoveredConnections.connections);
+            }
+        }
 
         return new Connections(result);
     }
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
index e6c2b7fb3b..a8092f4aa1 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
@@ -91,7 +91,7 @@ public class ClusterTopologyRefreshTest {
     private RedisAsyncCommands<String, String> asyncCommands2;
 
     @Before
-    public void before() throws Exception {
+    public void before() {
 
         when(clientResources.dnsResolver()).thenReturn(DnsResolvers.JVM_DEFAULT);
         when(connection1.async()).thenReturn(asyncCommands1);
@@ -209,7 +209,7 @@ public void getNodeSpecificViewsNode2IsFasterThanNode1() throws Exception {
     }
 
     @Test
-    public void shouldAttemptToConnectOnlyOnce() throws Exception {
+    public void shouldAttemptToConnectOnlyOnce() {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380), RedisURI.create("127.0.0.1", 7381));
 
@@ -225,7 +225,7 @@ public void shouldAttemptToConnectOnlyOnce() throws Exception {
     }
 
     @Test
-    public void shouldFailIfNoNodeConnects() throws Exception {
+    public void shouldFailIfNoNodeConnects() {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380), RedisURI.create("127.0.0.1", 7381));
 
@@ -247,7 +247,7 @@ public void shouldFailIfNoNodeConnects() throws Exception {
     }
 
     @Test
-    public void shouldShouldDiscoverNodes() throws Exception {
+    public void shouldShouldDiscoverNodes() {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
 
@@ -263,7 +263,7 @@ public void shouldShouldDiscoverNodes() throws Exception {
     }
 
     @Test
-    public void shouldShouldNotDiscoverNodes() throws Exception {
+    public void shouldShouldNotDiscoverNodes() {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
 
@@ -277,7 +277,7 @@ public void shouldShouldNotDiscoverNodes() throws Exception {
     }
 
     @Test
-    public void shouldNotFailOnDuplicateSeedNodes() throws Exception {
+    public void shouldNotFailOnDuplicateSeedNodes() {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380), RedisURI.create("127.0.0.1", 7381),
                 RedisURI.create("127.0.0.1", 7381));
@@ -295,7 +295,7 @@ public void shouldNotFailOnDuplicateSeedNodes() throws Exception {
     }
 
     @Test
-    public void undiscoveredAdditionalNodesShouldBeLastUsingClientCount() throws Exception {
+    public void undiscoveredAdditionalNodesShouldBeLastUsingClientCount() {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
 
@@ -313,7 +313,7 @@ public void undiscoveredAdditionalNodesShouldBeLastUsingClientCount() throws Exc
     }
 
     @Test
-    public void discoveredAdditionalNodesShouldBeOrderedUsingClientCount() throws Exception {
+    public void discoveredAdditionalNodesShouldBeOrderedUsingClientCount() {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
 
@@ -333,7 +333,7 @@ public void discoveredAdditionalNodesShouldBeOrderedUsingClientCount() throws Ex
     }
 
     @Test
-    public void undiscoveredAdditionalNodesShouldBeLastUsingLatency() throws Exception {
+    public void undiscoveredAdditionalNodesShouldBeLastUsingLatency() {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
 
@@ -351,7 +351,7 @@ public void undiscoveredAdditionalNodesShouldBeLastUsingLatency() throws Excepti
     }
 
     @Test
-    public void discoveredAdditionalNodesShouldBeOrderedUsingLatency() throws Exception {
+    public void discoveredAdditionalNodesShouldBeOrderedUsingLatency() {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
 

From 85753e40597de30af79744d63de75c66bf27231d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 17 Nov 2017 14:44:31 +0100
Subject: [PATCH 367/808] Polishing

Add synchronization to AsyncConnectionProviderTest.
---
 .../lettuce/core/cluster/AsyncConnectionProviderTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java
index dc1ea19a86..06beb21698 100644
--- a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java
@@ -56,7 +56,7 @@ public class AsyncConnectionProviderTest {
     private AsyncConnectionProvider<ConnectionKey, StatefulRedisConnection<String, String>, ConnectionFuture<StatefulRedisConnection<String, String>>> sut;
 
     @BeforeClass
-    public static void beforeClass() throws Exception {
+    public static void beforeClass() {
 
         RedisURI redisURI = RedisURI.create(TestSettings.host(), 1);
         redisURI.setTimeout(Duration.ofSeconds(5));
@@ -149,10 +149,10 @@ public void shouldCloseConnections() throws IOException {
                 TestSettings.port());
 
         sut.getConnection(connectionKey);
-        sut.close();
+        sut.close().join();
 
         assertThat(sut.getConnectionCount()).isEqualTo(0);
-        sut.close();
+        sut.close().join();
 
         serverSocket.accept();
     }

From a4991d462b4bb6c90c6fefe349d4ce34e36fc142 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 17 Nov 2017 15:12:34 +0100
Subject: [PATCH 368/808] Polishing

---
 .../io/lettuce/core/cluster/topology/Connections.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/topology/Connections.java b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
index 49a612dfa8..d77bed5566 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Connections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
@@ -53,6 +53,11 @@ private Connections(Map<RedisURI, StatefulRedisConnection<String, String>> conne
      */
     public void addConnection(RedisURI redisURI, StatefulRedisConnection<String, String> connection) {
 
+        if (closed) { // fastpath
+            connection.close();
+            return;
+        }
+
         synchronized (connections) {
 
             if (closed) {
@@ -165,12 +170,12 @@ public Connections mergeWith(Connections discoveredConnections) {
         Map<RedisURI, StatefulRedisConnection<String, String>> result = new TreeMap<>(
                 TopologyComparators.RedisURIComparator.INSTANCE);
 
+        this.closed = true;
+        discoveredConnections.closed = true;
+
         synchronized (this.connections) {
             synchronized (discoveredConnections.connections) {
 
-                this.closed = true;
-                discoveredConnections.closed = true;
-
                 result.putAll(this.connections);
                 result.putAll(discoveredConnections.connections);
             }

From 6c461945060b531b51edf324125e6633e52b8eb3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 17 Nov 2017 15:27:21 +0100
Subject: [PATCH 369/808] Add test rule to skip CLUSTERDOWN failures

---
 .../io/lettuce/LenientClusterDownRule.java    | 54 +++++++++++++++++++
 .../java/io/lettuce/core/AbstractTest.java    |  4 ++
 2 files changed, 58 insertions(+)
 create mode 100644 src/test/java/io/lettuce/LenientClusterDownRule.java

diff --git a/src/test/java/io/lettuce/LenientClusterDownRule.java b/src/test/java/io/lettuce/LenientClusterDownRule.java
new file mode 100644
index 0000000000..dd97b2125c
--- /dev/null
+++ b/src/test/java/io/lettuce/LenientClusterDownRule.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import org.junit.AssumptionViolatedException;
+import org.junit.rules.MethodRule;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.Statement;
+
+/**
+ * @author Mark Paluch
+ */
+public class LenientClusterDownRule implements MethodRule {
+
+    @Override
+    public Statement apply(Statement base, FrameworkMethod method, Object target) {
+
+        return new Statement() {
+            @Override
+            public void evaluate() throws Throwable {
+
+                try {
+                    base.evaluate();
+                } catch (Throwable throwable) {
+
+                    StringWriter writer = new StringWriter();
+
+                    throwable.printStackTrace(new PrintWriter(writer));
+
+                    if (writer.getBuffer().toString().contains("CLUSTERDOWN")) {
+                        throw new AssumptionViolatedException("Failed with CLUSTERDOWN", throwable);
+                    }
+                    throw throwable;
+                }
+            }
+        };
+    }
+}
diff --git a/src/test/java/io/lettuce/core/AbstractTest.java b/src/test/java/io/lettuce/core/AbstractTest.java
index 5cafe4fc3e..bc2055d929 100644
--- a/src/test/java/io/lettuce/core/AbstractTest.java
+++ b/src/test/java/io/lettuce/core/AbstractTest.java
@@ -23,6 +23,7 @@
 import org.apache.logging.log4j.Logger;
 import org.junit.Rule;
 
+import io.lettuce.LenientClusterDownRule;
 import io.lettuce.LoggingTestRule;
 import io.lettuce.core.internal.LettuceSets;
 
@@ -38,6 +39,9 @@ public class AbstractTest {
     @Rule
     public LoggingTestRule loggingTestRule = new LoggingTestRule(false);
 
+    @Rule
+    public LenientClusterDownRule clusterDownRule = new LenientClusterDownRule();
+
     protected Logger log = LogManager.getLogger(getClass());
     protected String key = "key";
     protected String value = "value";

From 449aed23c31934058e11e679f88584b1e93e2006 Mon Sep 17 00:00:00 2001
From: maxiyun <maxiyun@kkworld.com>
Date: Fri, 17 Nov 2017 16:19:03 +0800
Subject: [PATCH 370/808] Ignore ZStore empty weights #657

---
 src/main/java/io/lettuce/core/ZStoreArgs.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/ZStoreArgs.java b/src/main/java/io/lettuce/core/ZStoreArgs.java
index 474cc3ccb9..01879b17ee 100644
--- a/src/main/java/io/lettuce/core/ZStoreArgs.java
+++ b/src/main/java/io/lettuce/core/ZStoreArgs.java
@@ -111,7 +111,7 @@ private static double[] toDoubleArray(long[] weights) {
 
     public <K, V> void build(CommandArgs<K, V> args) {
 
-        if (weights != null) {
+        if (weights != null && !weights.isEmpty()) {
 
             args.add(WEIGHTS);
             for (double weight : weights) {

From d05883cfae78a666ff47c5bf9da817fb180b864e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 22 Nov 2017 15:00:49 +0100
Subject: [PATCH 371/808] Polishing #657

Add author tag. Add test.
---
 src/main/java/io/lettuce/core/ZStoreArgs.java |  9 ++--
 .../java/io/lettuce/core/ZStoreArgsTest.java  | 47 +++++++++++++++++++
 2 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/ZStoreArgsTest.java

diff --git a/src/main/java/io/lettuce/core/ZStoreArgs.java b/src/main/java/io/lettuce/core/ZStoreArgs.java
index 01879b17ee..6f67cdf441 100644
--- a/src/main/java/io/lettuce/core/ZStoreArgs.java
+++ b/src/main/java/io/lettuce/core/ZStoreArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,15 +23,16 @@
 import io.lettuce.core.protocol.CommandArgs;
 
 /**
- * Argument list builder for the redis <a href="http://redis.io/commands/zunionstore">ZUNIONSTORE</a> and
- * <a href="http://redis.io/commands/zinterstore">ZINTERSTORE</a> commands. Static import the methods from {@link Builder} and
+ * Argument list builder for the redis <a href="http://redis.io/commands/zunionstore">ZUNIONSTORE</a> and <a
+ * href="http://redis.io/commands/zinterstore">ZINTERSTORE</a> commands. Static import the methods from {@link Builder} and
  * chain the method calls: {@code weights(1, 2).max()}.
  *
  * @author Will Glozer
+ * @author Xy Ma
  */
 public class ZStoreArgs implements CompositeArgument {
 
-    private static enum Aggregate {
+    private enum Aggregate {
         SUM, MIN, MAX
     }
 
diff --git a/src/test/java/io/lettuce/core/ZStoreArgsTest.java b/src/test/java/io/lettuce/core/ZStoreArgsTest.java
new file mode 100644
index 0000000000..092d64e340
--- /dev/null
+++ b/src/test/java/io/lettuce/core/ZStoreArgsTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.protocol.CommandArgs;
+
+/**
+ * @author Mark Paluch
+ */
+public class ZStoreArgsTest {
+
+    @Test
+    public void shouldRenderWeights() {
+
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8);
+        ZStoreArgs.Builder.weights(1, 2, 3).build(args);
+
+        assertThat(args.toString()).contains("WEIGHTS");
+    }
+
+    @Test
+    public void shouldOmitWeights() {
+
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8);
+        ZStoreArgs.Builder.weights().build(args);
+
+        assertThat(args.toString()).doesNotContain("WEIGHTS");
+    }
+}

From 02e5660d4778cf059668398663fd0033289f78ef Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 2 Dec 2017 13:42:57 -0800
Subject: [PATCH 372/808] Do not fail Master/Slave topology refresh if a node
 is not available #659

Master/Slave topology refresh now no longer fails if a node was not available for a PING check but continues and skips the unavailable node from the returned topology.
---
 .../lettuce/core/masterslave/MasterSlave.java |   4 +
 .../MasterSlaveTopologyRefresh.java           |  10 +-
 .../MasterSlaveTopologyRefreshTest.java       | 113 ++++++++++++++++++
 3 files changed, 124 insertions(+), 3 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshTest.java

diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index 132cab9e0d..6a84fa4da9 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -172,6 +172,10 @@ private static <K, V> StatefulRedisMasterSlaveConnection<K, V> connectSentinel(R
                 LOG.debug("Refreshing topology");
                 List<RedisNodeDescription> nodes = refresh.getNodes(redisURI);
 
+                if (nodes.isEmpty()) {
+                    LOG.warn("Topology refresh returned no nodes from {}", redisURI);
+                }
+
                 LOG.debug("New topology: {}", nodes);
                 connectionProvider.setKnownNodes(nodes);
             } catch (Exception e) {
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
index 2c6c8d8cf8..7304ec6c0a 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
@@ -48,9 +48,13 @@ class MasterSlaveTopologyRefresh {
     private final NodeConnectionFactory nodeConnectionFactory;
     private final TopologyProvider topologyProvider;
 
-    public MasterSlaveTopologyRefresh(RedisClient client, TopologyProvider topologyProvider) {
+    MasterSlaveTopologyRefresh(RedisClient client, TopologyProvider topologyProvider) {
+        this(new RedisClientNodeConnectionFactory(client), topologyProvider);
+    }
+
+    MasterSlaveTopologyRefresh(NodeConnectionFactory nodeConnectionFactory, TopologyProvider topologyProvider) {
 
-        this.nodeConnectionFactory = new RedisClientNodeConnectionFactory(client);
+        this.nodeConnectionFactory = nodeConnectionFactory;
         this.topologyProvider = topologyProvider;
     }
 
@@ -108,7 +112,7 @@ private List<RedisNodeDescription> getNodeSpecificViews(Requests requestedPing,
 
             TimedAsyncCommand<String, String, String> future = requestedPing.getRequest(node.getUri());
 
-            if (!future.isDone()) {
+            if (future == null || !future.isDone()) {
                 continue;
             }
 
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshTest.java
new file mode 100644
index 0000000000..f52f78025f
--- /dev/null
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterslave;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.models.role.RedisInstance;
+import io.lettuce.core.models.role.RedisNodeDescription;
+import io.lettuce.core.protocol.RedisCommand;
+
+/**
+ * @author Mark Paluch
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class MasterSlaveTopologyRefreshTest {
+
+    private static final RedisMasterSlaveNode MASTER = new RedisMasterSlaveNode("localhost", 1, new RedisURI(),
+            RedisInstance.Role.MASTER);
+
+    private static final RedisMasterSlaveNode SLAVE = new RedisMasterSlaveNode("localhost", 2, new RedisURI(),
+            RedisInstance.Role.SLAVE);
+
+    @Mock
+    NodeConnectionFactory connectionFactory;
+
+    @Mock
+    StatefulRedisConnection<String, String> connection;
+
+    @Mock
+    RedisAsyncCommands<String, String> async;
+
+    TopologyProvider provider;
+
+    @Before
+    public void before() {
+
+        when(connection.async()).thenReturn(async);
+        when(connection.dispatch(any(RedisCommand.class))).then(invocation -> {
+
+            RedisCommand command = invocation.getArgument(0);
+            command.complete();
+
+            return null;
+        });
+
+        provider = () -> Arrays.asList(MASTER, SLAVE);
+    }
+
+    @Test
+    public void shouldRetrieveTopology() {
+
+        MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(connectionFactory, provider);
+
+        CompletableFuture<StatefulRedisConnection<String, String>> master = CompletableFuture.completedFuture(connection);
+        CompletableFuture<StatefulRedisConnection<String, String>> slave = CompletableFuture.completedFuture(connection);
+        when(connectionFactory.connectToNodeAsync(any(), any())).thenReturn((CompletableFuture) master,
+                (CompletableFuture) slave);
+
+        RedisURI redisURI = new RedisURI();
+        redisURI.setTimeout(Duration.ofMillis(1));
+
+        List<RedisNodeDescription> nodes = refresh.getNodes(redisURI);
+
+        assertThat(nodes).hasSize(2);
+    }
+
+    @Test
+    public void shouldRetrieveTopologyWithFailedNode() {
+
+        MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(connectionFactory, provider);
+
+        CompletableFuture<StatefulRedisConnection<String, String>> connected = CompletableFuture.completedFuture(connection);
+        CompletableFuture<StatefulRedisConnection<String, String>> pending = new CompletableFuture<>();
+        when(connectionFactory.connectToNodeAsync(any(), any())).thenReturn((CompletableFuture) connected,
+                (CompletableFuture) pending);
+
+        RedisURI redisURI = new RedisURI();
+        redisURI.setTimeout(Duration.ofMillis(1));
+
+        List<RedisNodeDescription> nodes = refresh.getNodes(redisURI);
+
+        assertThat(nodes).hasSize(1).containsOnly(MASTER);
+    }
+}

From 2d57b93bc8ae96e8ed136ca488330a0a1d7ece03 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 2 Dec 2017 13:43:01 -0800
Subject: [PATCH 373/808] Polishing #659

---
 .../lettuce/core/masterslave/MasterSlaveConnectionProvider.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
index 317a1de7b1..c02aa8ef1c 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
@@ -52,7 +52,7 @@ public class MasterSlaveConnectionProvider<K, V> {
     private List<RedisNodeDescription> knownNodes = new ArrayList<>();
 
     private boolean autoFlushCommands = true;
-    private Object stateLock = new Object();
+    private final Object stateLock = new Object();
     private ReadFrom readFrom;
 
     MasterSlaveConnectionProvider(RedisClient redisClient, RedisCodec<K, V> redisCodec, RedisURI initialRedisUri,

From 51e7a191f3e4068fbcd679aa4b561456c251b150 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 2 Dec 2017 14:35:44 -0800
Subject: [PATCH 374/808] Make sure to write at least two bytes in
 RandomServerHandler #660

Prevent hanging tests due to receiving no response.
---
 .../core/server/RandomServerHandler.java      | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/test/java/io/lettuce/core/server/RandomServerHandler.java b/src/test/java/io/lettuce/core/server/RandomServerHandler.java
index 7489346457..6ff473841e 100644
--- a/src/test/java/io/lettuce/core/server/RandomServerHandler.java
+++ b/src/test/java/io/lettuce/core/server/RandomServerHandler.java
@@ -15,8 +15,8 @@
  */
 package io.lettuce.core.server;
 
-import java.security.SecureRandom;
 import java.util.Arrays;
+import java.util.Random;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
@@ -27,21 +27,30 @@
  */
 public class RandomServerHandler extends ChannelInboundHandlerAdapter {
 
-    private SecureRandom random = new SecureRandom();
+    private final int count;
+
+    public RandomServerHandler() {
+
+        int count;
+        do {
+            count = new Random().nextInt(50);
+        } while (count < 1);
+
+        this.count = count;
+
+    }
 
     @Override
     public void channelRead(ChannelHandlerContext ctx, Object msg) {
-        byte initial[] = new byte[1];
-        random.nextBytes(initial);
 
-        byte[] response = new byte[Math.abs((int) initial[0])];
+        byte[] response = new byte[count];
 
         Arrays.fill(response, "A".getBytes()[0]);
 
         ByteBuf buf = ctx.alloc().heapBuffer(response.length);
 
         ByteBuf encoded = buf.writeBytes(response);
-        ctx.write(encoded);
+        ctx.writeAndFlush(encoded);
     }
 
     @Override

From 6ad70e185f2ce7301ba067a875e3490055179eb7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 3 Dec 2017 21:22:50 -0800
Subject: [PATCH 375/808] Polishing

Add synchronization to ConnectionPoolSupportTest to trigger assertions after resource cleanup.
---
 .../io/lettuce/core/support/ConnectionPoolSupportTest.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java
index 3827db6f1e..b06149b35a 100644
--- a/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java
+++ b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java
@@ -31,6 +31,7 @@
 import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.TestClientResources;
+import io.lettuce.Wait;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
@@ -87,6 +88,8 @@ public void genericPoolShouldWorkWithWrappedConnections() throws Exception {
 
         pool.close();
 
+        Wait.untilTrue(channels::isEmpty).waitOrTimeout();
+
         assertThat(channels).isEmpty();
     }
 
@@ -117,6 +120,8 @@ public void genericPoolShouldCloseConnectionsAboveMaxIdleSize() throws Exception
 
         pool.close();
 
+        Wait.untilTrue(channels::isEmpty).waitOrTimeout();
+
         assertThat(channels).isEmpty();
     }
 
@@ -290,6 +295,8 @@ public void softRefPoolShouldWorkWithWrappedConnections() throws Exception {
         connection.close();
         pool.close();
 
+        Wait.untilTrue(channels::isEmpty).waitOrTimeout();
+
         assertThat(channels).isEmpty();
     }
 

From d1b76ec512ab3cf78ae1626e12736bdf148eb321 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 11 Dec 2017 11:23:53 +0100
Subject: [PATCH 376/808] Switch RedisSubscription.subscriber to volatile #664

Avoid visibility issues with multiple concurrent threads.
---
 src/main/java/io/lettuce/core/RedisPublisher.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index cd02fa249a..a5a012f221 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -163,7 +163,7 @@ static class RedisSubscription<T> extends StreamingOutput.Subscriber<T> implemen
 
         volatile boolean allDataRead = false;
 
-        Subscriber<? super T> subscriber;
+        volatile Subscriber<? super T> subscriber;
 
         @SuppressWarnings("unchecked")
         RedisSubscription(StatefulConnection<?, ?> connection, RedisCommand<?, ?, T> command, boolean dissolve) {
@@ -274,6 +274,7 @@ public void onNext(T t) {
 
             if (!data.offer(t)) {
 
+                Subscriber<?> subscriber = this.subscriber;
                 Context context = Context.empty();
                 if (subscriber instanceof CoreSubscriber) {
                     context = ((CoreSubscriber) subscriber).currentContext();
@@ -666,8 +667,10 @@ void onAllDataRead(RedisSubscription<?> subscription) {
 
                 readData(subscription);
 
-                if (subscription.subscriber != null) {
-                    subscription.subscriber.onComplete();
+                Subscriber<?> subscriber = subscription.subscriber;
+
+                if (subscriber != null) {
+                    subscriber.onComplete();
                 }
             }
         }
@@ -678,8 +681,9 @@ void onError(RedisSubscription<?> subscription, Throwable t) {
 
                 readData(subscription);
 
-                if (subscription.subscriber != null) {
-                    subscription.subscriber.onError(t);
+                Subscriber<?> subscriber = subscription.subscriber;
+                if (subscriber != null) {
+                    subscriber.onError(t);
                 }
             }
         }

From 8d9932c3189ad0ae30244f2a28fe8e520383aa33 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 11 Dec 2017 11:56:12 +0100
Subject: [PATCH 377/808] Make RoundRobin and RoundRobinSocketAddressSupplier
 threadsafe #663

Replace round-robin collection instead of updating it on change.
---
 .../io/lettuce/core/cluster/RoundRobin.java   | 40 ++++++++++++++-----
 .../RoundRobinSocketAddressSupplier.java      | 14 ++-----
 .../RoundRobinSocketAddressSupplierTest.java  |  8 ++--
 3 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/RoundRobin.java b/src/main/java/io/lettuce/core/cluster/RoundRobin.java
index 1ff014a518..f43ef400db 100644
--- a/src/main/java/io/lettuce/core/cluster/RoundRobin.java
+++ b/src/main/java/io/lettuce/core/cluster/RoundRobin.java
@@ -15,7 +15,9 @@
  */
 package io.lettuce.core.cluster;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 
 /**
  * Circular element provider. This class allows infinite scrolling over a collection with the possibility to provide an initial
@@ -25,17 +27,33 @@
  */
 class RoundRobin<V> {
 
-    protected final Collection<? extends V> collection;
+    protected volatile Collection<? extends V> collection = Collections.emptyList();
 
-    protected V offset;
+    protected volatile V offset;
 
-    public RoundRobin(Collection<? extends V> collection) {
-        this(collection, null);
+    /**
+     * Return whether this {@link RoundRobin} is still consistent and contains all items from the master {@link Collection} and
+     * vice versa.
+     *
+     * @param master the master collection containing source elements for this {@link RoundRobin}.
+     * @return {@literal true} if this {@link RoundRobin} is consistent with the master {@link Collection}.
+     */
+    public boolean isConsistent(Collection<? extends V> master) {
+
+        Collection<? extends V> collection = this.collection;
+
+        return collection.containsAll(master) && master.containsAll(collection);
     }
 
-    public RoundRobin(Collection<? extends V> collection, V offset) {
-        this.collection = collection;
-        this.offset = offset;
+    /**
+     * Rebuild the {@link RoundRobin} from the master {@link Collection}.
+     *
+     * @param master the master collection containing source elements for this {@link RoundRobin}.
+     */
+    public void rebuild(Collection<? extends V> master) {
+
+        this.collection = new ArrayList<>(master);
+        this.offset = null;
     }
 
     /**
@@ -44,6 +62,10 @@ public RoundRobin(Collection<? extends V> collection, V offset) {
      * @return the next item
      */
     public V next() {
+
+        Collection<? extends V> collection = this.collection;
+        V offset = this.offset;
+
         if (offset != null) {
             boolean accept = false;
             for (V element : collection) {
@@ -53,11 +75,11 @@ public V next() {
                 }
 
                 if (accept) {
-                    return offset = element;
+                    return this.offset = element;
                 }
             }
         }
 
-        return offset = collection.iterator().next();
+        return this.offset = collection.iterator().next();
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java b/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
index 62e4b18dbd..039a148a3f 100644
--- a/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
+++ b/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
@@ -16,7 +16,6 @@
 package io.lettuce.core.cluster;
 
 import java.net.SocketAddress;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -39,11 +38,10 @@ class RoundRobinSocketAddressSupplier implements Supplier<SocketAddress> {
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(RoundRobinSocketAddressSupplier.class);
 
     private final Collection<RedisClusterNode> partitions;
-    private final Collection<RedisClusterNode> clusterNodes = new ArrayList<>();
     private final Function<Collection<RedisClusterNode>, Collection<RedisClusterNode>> sortFunction;
     private final ClientResources clientResources;
 
-    private RoundRobin<? extends RedisClusterNode> roundRobin;
+    private RoundRobin<RedisClusterNode> roundRobin;
 
     public RoundRobinSocketAddressSupplier(Collection<RedisClusterNode> partitions,
             Function<? extends Collection<RedisClusterNode>, Collection<RedisClusterNode>> sortFunction,
@@ -53,8 +51,7 @@ public RoundRobinSocketAddressSupplier(Collection<RedisClusterNode> partitions,
         LettuceAssert.notNull(sortFunction, "Sort-Function must not be null");
 
         this.partitions = partitions;
-        this.clusterNodes.addAll(partitions);
-        this.roundRobin = new RoundRobin<>(clusterNodes);
+        this.roundRobin = new RoundRobin<>();
         this.sortFunction = (Function) sortFunction;
         this.clientResources = clientResources;
         resetRoundRobin();
@@ -63,7 +60,7 @@ public RoundRobinSocketAddressSupplier(Collection<RedisClusterNode> partitions,
     @Override
     public SocketAddress get() {
 
-        if (!clusterNodes.containsAll(partitions) || !partitions.containsAll(clusterNodes)) {
+        if (!roundRobin.isConsistent(partitions)) {
             resetRoundRobin();
         }
 
@@ -72,10 +69,7 @@ public SocketAddress get() {
     }
 
     protected void resetRoundRobin() {
-
-        clusterNodes.clear();
-        clusterNodes.addAll(sortFunction.apply(partitions));
-        roundRobin.offset = null;
+        roundRobin.rebuild(sortFunction.apply(partitions));
     }
 
     protected SocketAddress getSocketAddress(RedisClusterNode redisClusterNode) {
diff --git a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
index 9eec76326c..4abb4b44e2 100644
--- a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
@@ -51,7 +51,7 @@ public class RoundRobinSocketAddressSupplierTest {
     private ClientResources clientResourcesMock;
 
     @BeforeClass
-    public static void beforeClass() throws Exception {
+    public static void beforeClass() {
 
         hap1.getResolvedAddress();
         hap2.getResolvedAddress();
@@ -72,7 +72,7 @@ public void before() throws Exception {
     }
 
     @Test
-    public void noOffset() throws Exception {
+    public void noOffset() {
 
         RoundRobinSocketAddressSupplier sut = new RoundRobinSocketAddressSupplier(partitions,
                 redisClusterNodes -> redisClusterNodes, clientResourcesMock);
@@ -86,7 +86,7 @@ public void noOffset() throws Exception {
     }
 
     @Test
-    public void partitionTableChangesNewNode() throws Exception {
+    public void partitionTableChangesNewNode() {
 
         RoundRobinSocketAddressSupplier sut = new RoundRobinSocketAddressSupplier(partitions,
                 redisClusterNodes -> redisClusterNodes, clientResourcesMock);
@@ -104,7 +104,7 @@ public void partitionTableChangesNewNode() throws Exception {
     }
 
     @Test
-    public void partitionTableChangesNodeRemoved() throws Exception {
+    public void partitionTableChangesNodeRemoved() {
 
         RoundRobinSocketAddressSupplier sut = new RoundRobinSocketAddressSupplier(partitions,
                 redisClusterNodes -> redisClusterNodes, clientResourcesMock);

From 8e79e04a5e90b8340be5301d4bd1c2ebf5176884 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 13 Dec 2017 12:09:07 +0100
Subject: [PATCH 378/808] Fix argument order for Sentinel-related Pub/Sub
 messages in Master/Slave #668

Lettuce now evaluates the correct message and channel arguments to determine whether it should refresh/reconnect sentinels.
---
 .../masterslave/SentinelTopologyRefresh.java  |  8 +--
 .../SentinelTopologyRefreshTest.java          | 52 +++++++++++--------
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
index f9f3557bcc..60698a8948 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@
 import io.lettuce.core.protocol.LettuceCharsets;
 import io.lettuce.core.pubsub.RedisPubSubAdapter;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
-
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -237,7 +236,7 @@ protected void onEvent(Consumer<Timeout> timeoutConsumer) {
         }
     }
 
-    static interface MessagePredicate extends BiPredicate<String, String> {
+    interface MessagePredicate extends BiPredicate<String, String> {
 
         @Override
         boolean test(String message, String channel);
@@ -294,7 +293,8 @@ public boolean test(String channel, String message) {
     private static class SentinelReconnectMessagePredicate implements MessagePredicate {
 
         @Override
-        public boolean test(String message, String channel) {
+        public boolean test(String channel, String message) {
+
             if (channel.equals("+sentinel")) {
                 return true;
             }
diff --git a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
index af8471bd8b..c0bfb270d1 100644
--- a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,6 @@
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
 import io.lettuce.core.resource.ClientResources;
-
 import io.netty.util.concurrent.EventExecutorGroup;
 
 /**
@@ -79,7 +78,7 @@ public class SentinelTopologyRefreshTest {
     private SentinelTopologyRefresh sut;
 
     @Before
-    public void before() throws Exception {
+    public void before() {
 
         when(redisClient.connectPubSub(any(StringCodec.class), eq(host1))).thenReturn(connection);
         when(clientResources.eventExecutorGroup()).thenReturn(eventExecutors);
@@ -90,7 +89,7 @@ public void before() throws Exception {
     }
 
     @Test
-    public void bind() throws Exception {
+    public void bind() {
 
         sut.bind(refreshRunnable);
 
@@ -99,7 +98,7 @@ public void bind() throws Exception {
     }
 
     @Test
-    public void bindWithSecondSentinelFails() throws Exception {
+    public void bindWithSecondSentinelFails() {
 
         sut = new SentinelTopologyRefresh(redisClient, "mymaster", Arrays.asList(host1, host2));
 
@@ -114,7 +113,7 @@ public void bindWithSecondSentinelFails() throws Exception {
     }
 
     @Test
-    public void bindWithSentinelRecovery() throws Exception {
+    public void bindWithSentinelRecovery() {
 
         StatefulRedisPubSubConnection<String, String> connection2 = mock(StatefulRedisPubSubConnection.class);
         RedisPubSubAsyncCommands<String, String> async2 = mock(RedisPubSubAsyncCommands.class);
@@ -138,13 +137,16 @@ public void bindWithSentinelRecovery() throws Exception {
         adapter.message("*", "+sentinel",
                 "sentinel c14cc895bb0479c91312cee0e0440b7d99ad367b 127.0.0.1 26380 @ mymaster 127.0.0.1 6483");
 
+        verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
+        captor.getValue().run();
+
         verify(redisClient, times(2)).connectPubSub(any(), eq(host2));
         assertThat(connections).containsKey(host1).containsKey(host2).hasSize(2);
         verify(refreshRunnable, never()).run();
     }
 
     @Test
-    public void bindDuringClose() throws Exception {
+    public void bindDuringClose() {
 
         sut = new SentinelTopologyRefresh(redisClient, "mymaster", Arrays.asList(host1, host2));
 
@@ -171,7 +173,7 @@ public void bindDuringClose() throws Exception {
     }
 
     @Test
-    public void close() throws Exception {
+    public void close() {
 
         sut.bind(refreshRunnable);
         sut.close();
@@ -181,7 +183,7 @@ public void close() throws Exception {
     }
 
     @Test
-    public void bindAfterClose() throws Exception {
+    public void bindAfterClose() {
 
         sut.close();
         sut.bind(refreshRunnable);
@@ -191,9 +193,10 @@ public void bindAfterClose() throws Exception {
     }
 
     @Test
-    public void shouldNotProcessOtherEvents() throws Exception {
+    public void shouldNotProcessOtherEvents() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
+        sut.bind(refreshRunnable);
 
         adapter.message("*", "*", "irreleval");
 
@@ -203,9 +206,10 @@ public void shouldNotProcessOtherEvents() throws Exception {
     }
 
     @Test
-    public void shouldProcessElectedLeader() throws Exception {
+    public void shouldProcessElectedLeader() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
+        sut.bind(refreshRunnable);
 
         adapter.message("*", "+elected-leader", "master mymaster 127.0.0.1");
 
@@ -215,9 +219,10 @@ public void shouldProcessElectedLeader() throws Exception {
     }
 
     @Test
-    public void shouldProcessSwitchMaster() throws Exception {
+    public void shouldProcessSwitchMaster() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
+        sut.bind(refreshRunnable);
 
         adapter.message("*", "+switch-master", "mymaster 127.0.0.1");
 
@@ -227,9 +232,10 @@ public void shouldProcessSwitchMaster() throws Exception {
     }
 
     @Test
-    public void shouldProcessFixSlaveConfig() throws Exception {
+    public void shouldProcessFixSlaveConfig() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
+        sut.bind(refreshRunnable);
 
         adapter.message("*", "fix-slave-config", "@ mymaster 127.0.0.1");
 
@@ -239,9 +245,10 @@ public void shouldProcessFixSlaveConfig() throws Exception {
     }
 
     @Test
-    public void shouldProcessConvertToSlave() throws Exception {
+    public void shouldProcessConvertToSlave() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
+        sut.bind(refreshRunnable);
 
         adapter.message("*", "+convert-to-slave", "@ mymaster 127.0.0.1");
 
@@ -251,9 +258,10 @@ public void shouldProcessConvertToSlave() throws Exception {
     }
 
     @Test
-    public void shouldProcessRoleChange() throws Exception {
+    public void shouldProcessRoleChange() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
+        sut.bind(refreshRunnable);
 
         adapter.message("*", "+role-change", "@ mymaster 127.0.0.1");
 
@@ -263,9 +271,10 @@ public void shouldProcessRoleChange() throws Exception {
     }
 
     @Test
-    public void shouldProcessFailoverEnd() throws Exception {
+    public void shouldProcessFailoverEnd() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
+        sut.bind(refreshRunnable);
 
         adapter.message("*", "failover-end", "");
 
@@ -275,9 +284,10 @@ public void shouldProcessFailoverEnd() throws Exception {
     }
 
     @Test
-    public void shouldProcessFailoverTimeout() throws Exception {
+    public void shouldProcessFailoverTimeout() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
+        sut.bind(refreshRunnable);
 
         adapter.message("*", "failover-end-for-timeout", "");
 
@@ -287,9 +297,10 @@ public void shouldProcessFailoverTimeout() throws Exception {
     }
 
     @Test
-    public void shouldExecuteOnceWithinATimeout() throws Exception {
+    public void shouldExecuteOnceWithinATimeout() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
+        sut.bind(refreshRunnable);
 
         adapter.message("*", "failover-end-for-timeout", "");
         adapter.message("*", "failover-end-for-timeout", "");
@@ -300,9 +311,10 @@ public void shouldExecuteOnceWithinATimeout() throws Exception {
     }
 
     @Test
-    public void shouldNotProcessIfExecutorIsShuttingDown() throws Exception {
+    public void shouldNotProcessIfExecutorIsShuttingDown() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
+        sut.bind(refreshRunnable);
         when(eventExecutors.isShuttingDown()).thenReturn(true);
 
         adapter.message("*", "failover-end-for-timeout", "");
@@ -312,8 +324,6 @@ public void shouldNotProcessIfExecutorIsShuttingDown() throws Exception {
     }
 
     private RedisPubSubAdapter<String, String> getAdapter() {
-
-        sut.bind(refreshRunnable);
         return (RedisPubSubAdapter<String, String>) ReflectionTestUtils.getField(sut, "adapter");
     }
 }

From caea247728957a39115f67afce0d2c1b6fac5b61 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Oct 2017 07:59:13 +0200
Subject: [PATCH 379/808] Provide asynchronous connection pool #631

Lettuce now provides a non-blocking, asynchronous connection pool to be used with RedisClient and RedisClusterClient's asynchronous connect methods.

AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
        () -> client.connectAsync(StringCodec.UTF8, uri), BoundedPoolConfig.create());

CompletableFuture<String> pingResponse = pool.acquire().thenCompose(c -> {
    return c.async().ping().whenComplete((s, throwable) -> pool.release(c));
});
---
 .../support/AsyncConnectionPoolSupport.java   | 189 ++++++++
 .../core/support/AsyncObjectFactory.java      |  60 +++
 .../io/lettuce/core/support/AsyncPool.java    |  67 +++
 .../io/lettuce/core/support/BasePool.java     |  87 ++++
 .../lettuce/core/support/BasePoolConfig.java  | 171 +++++++
 .../core/support/BoundedAsyncPool.java        | 452 ++++++++++++++++++
 .../core/support/BoundedPoolConfig.java       | 203 ++++++++
 .../support/CommonsPool2ConfigConverter.java  |  47 ++
 .../core/support/ConnectionPoolSupport.java   | 175 +------
 .../core/support/ConnectionWrapping.java      | 220 +++++++++
 .../AsyncConnectionPoolSupportTest.java       | 238 +++++++++
 .../support/AsyncPoolWithValidationTest.java  | 348 ++++++++++++++
 .../core/support/BoundedAsyncPoolTest.java    | 291 +++++++++++
 .../lettuce/core/EmptyRedisChannelWriter.java |   5 +-
 .../core/EmptyStatefulRedisConnection.java    |   2 +-
 .../io/lettuce/core/RedisClientBenchmark.java |   6 +-
 ...terDistributionChannelWriterBenchmark.java |  16 +-
 .../cluster/RedisClusterClientBenchmark.java  |   5 +-
 .../core/cluster/SlotHashBenchmark.java       |  12 +-
 .../core/dynamic/RedisCommandsBenchmark.java  |   2 +-
 .../core/protocol/CommandBenchmark.java       |  12 +-
 .../protocol/CommandHandlerBenchmark.java     |   8 +-
 .../lettuce/core/protocol/EmptyByteBuf.java   |   2 +-
 .../core/protocol/RedisEndpointBenchmark.java |  11 +-
 .../protocol/RedisStateMachineBenchmark.java  |   5 +-
 .../support/AsyncConnectionPoolBenchmark.java |  66 +++
 .../GenericConnectionPoolBenchmark.java       |  68 +++
 .../jmh/io/lettuce/core/support/JmhMain.java  |  64 +++
 28 files changed, 2637 insertions(+), 195 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java
 create mode 100644 src/main/java/io/lettuce/core/support/AsyncObjectFactory.java
 create mode 100644 src/main/java/io/lettuce/core/support/AsyncPool.java
 create mode 100644 src/main/java/io/lettuce/core/support/BasePool.java
 create mode 100644 src/main/java/io/lettuce/core/support/BasePoolConfig.java
 create mode 100644 src/main/java/io/lettuce/core/support/BoundedAsyncPool.java
 create mode 100644 src/main/java/io/lettuce/core/support/BoundedPoolConfig.java
 create mode 100644 src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
 create mode 100644 src/main/java/io/lettuce/core/support/ConnectionWrapping.java
 create mode 100644 src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportTest.java
 create mode 100644 src/test/java/io/lettuce/core/support/AsyncPoolWithValidationTest.java
 create mode 100644 src/test/java/io/lettuce/core/support/BoundedAsyncPoolTest.java
 create mode 100644 src/test/jmh/io/lettuce/core/support/AsyncConnectionPoolBenchmark.java
 create mode 100644 src/test/jmh/io/lettuce/core/support/GenericConnectionPoolBenchmark.java
 create mode 100644 src/test/jmh/io/lettuce/core/support/JmhMain.java

diff --git a/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java
new file mode 100644
index 0000000000..5a44ce523a
--- /dev/null
+++ b/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.support;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.support.ConnectionWrapping.HasTargetConnection;
+import io.lettuce.core.support.ConnectionWrapping.Origin;
+
+/**
+ * Asynchronous connection pool support for {@link BoundedAsyncPool}. Connection pool creation requires a {@link Supplier} that
+ * connects asynchronously to Redis. The pool can allocate either wrapped or direct connections.
+ * <ul>
+ * <li>Wrapped instances will return the connection back to the pool when called {@link StatefulConnection#close()}/
+ * {@link StatefulConnection#closeAsync()}.</li>
+ * <li>Regular connections need to be returned to the pool with {@link AsyncPool#release(Object)}</li>
+ * </ul>
+ * <p>
+ * Lettuce connections are designed to be thread-safe so one connection can be shared amongst multiple threads and Lettuce
+ * connections {@link ClientOptions#isAutoReconnect() auto-reconnect} by default. Connection pooling with Lettuce can be
+ * required when you're invoking Redis operations in multiple threads and you use
+ * <ul>
+ * <li>blocking commands such as {@code BLPOP}.</li>
+ * <li>transactions {@code BLPOP}.</li>
+ * <li>{@link StatefulConnection#setAutoFlushCommands(boolean) command batching}.</li>
+ * </ul>
+ *
+ * Transactions and command batching affect connection state. Blocking commands won't propagate queued commands to Redis until
+ * the blocking command is completed.
+ *
+ * <h3>Example</h3>
+ *
+ * <pre class="code">
+ * // application initialization
+ * RedisClusterClient clusterClient = RedisClusterClient.create(RedisURI.create(host, port));
+ * AsyncPool&lt;StatefulRedisConnection&lt;String, String&gt;&gt; pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
+ *         () -&gt; clusterClient.connectAsync(), BoundedPoolConfig.create());
+ *
+ * // executing work
+ * CompletableFuture&lt;String&gt; pingResponse = pool.acquire().thenCompose(c -&gt; {
+ *
+ *     return c.async().ping().whenComplete((s, throwable) -&gt; pool.release(c));
+ * });
+ *
+ * // terminating
+ * CompletableFuture&lt;Void&gt; poolClose = pool.closeAsync();
+ *
+ * // after poolClose completes:
+ * CompletableFuture&lt;Void&gt; closeFuture = clusterClient.shutdown();
+ * </pre>
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+public abstract class AsyncConnectionPoolSupport {
+
+    private AsyncConnectionPoolSupport() {
+    }
+
+    /**
+     * Creates a new {@link BoundedAsyncPool} using the {@link Supplier}. Allocated instances are wrapped and must not be
+     * returned with {@link AsyncPool#release(Object)}.
+     *
+     * @param connectionSupplier must not be {@literal null}.
+     * @param config must not be {@literal null}.
+     * @param <T> connection type.
+     * @return the connection pool.
+     */
+    public static <T extends StatefulConnection<?, ?>> BoundedAsyncPool<T> createBoundedObjectPool(
+            Supplier<CompletionStage<T>> connectionSupplier, BoundedPoolConfig config) {
+        return createBoundedObjectPool(connectionSupplier, config, true);
+    }
+
+    /**
+     * Creates a new {@link BoundedAsyncPool} using the {@link Supplier}.
+     *
+     * @param connectionSupplier must not be {@literal null}.
+     * @param config must not be {@literal null}.
+     * @param wrapConnections {@literal false} to return direct connections that need to be returned to the pool using
+     *        {@link AsyncPool#release(Object)}. {@literal true} to return wrapped connection that are returned to the pool when
+     *        invoking {@link StatefulConnection#close()}/{@link StatefulConnection#closeAsync()}.
+     * @param <T> connection type.
+     * @return the connection pool.
+     */
+    @SuppressWarnings("unchecked")
+    public static <T extends StatefulConnection<?, ?>> BoundedAsyncPool<T> createBoundedObjectPool(
+            Supplier<CompletionStage<T>> connectionSupplier, BoundedPoolConfig config, boolean wrapConnections) {
+
+        LettuceAssert.notNull(connectionSupplier, "Connection supplier must not be null");
+        LettuceAssert.notNull(config, "BoundedPoolConfig must not be null");
+
+        AtomicReference<Origin<T>> poolRef = new AtomicReference<>();
+
+        BoundedAsyncPool<T> pool = new BoundedAsyncPool<T>(new RedisPooledObjectFactory<T>(connectionSupplier), config) {
+
+            @Override
+            public CompletableFuture<T> acquire() {
+
+                CompletableFuture<T> acquire = super.acquire();
+
+                if (wrapConnections) {
+                    return acquire.thenApply(it -> ConnectionWrapping.wrapConnection(it, poolRef.get()));
+                }
+
+                return acquire;
+            }
+
+            @Override
+            public CompletableFuture<Void> release(T object) {
+
+                if (wrapConnections && object instanceof HasTargetConnection) {
+                    return super.release((T) ((HasTargetConnection) object).getTargetConnection());
+                }
+
+                return super.release(object);
+            }
+        };
+
+        poolRef.set(new AsyncPoolWrapper(pool));
+
+        return pool;
+    }
+
+    /**
+     * @author Mark Paluch
+     * @since 5.1
+     */
+    private static class RedisPooledObjectFactory<T extends StatefulConnection<?, ?>> implements AsyncObjectFactory<T> {
+
+        private final Supplier<CompletionStage<T>> connectionSupplier;
+
+        RedisPooledObjectFactory(Supplier<CompletionStage<T>> connectionSupplier) {
+            this.connectionSupplier = connectionSupplier;
+        }
+
+        @Override
+        public CompletableFuture<T> create() {
+            return connectionSupplier.get().toCompletableFuture();
+        }
+
+        @Override
+        public CompletableFuture<Void> destroy(T object) {
+            return object.closeAsync();
+        }
+
+        @Override
+        public CompletableFuture<Boolean> validate(T object) {
+            return CompletableFuture.completedFuture(object.isOpen());
+        }
+    }
+
+    private static class AsyncPoolWrapper<T> implements Origin<T> {
+
+        private final AsyncPool<T> pool;
+
+        AsyncPoolWrapper(AsyncPool<T> pool) {
+            this.pool = pool;
+        }
+
+        @Override
+        public void returnObject(T o) {
+            returnObjectAsync(o).join();
+        }
+
+        @Override
+        public CompletableFuture<Void> returnObjectAsync(T o) {
+            return pool.release(o);
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/support/AsyncObjectFactory.java b/src/main/java/io/lettuce/core/support/AsyncObjectFactory.java
new file mode 100644
index 0000000000..0535341af8
--- /dev/null
+++ b/src/main/java/io/lettuce/core/support/AsyncObjectFactory.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.support;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.apache.commons.pool2.PooledObject;
+
+/**
+ * An interface defining life-cycle methods for instances to be served by an pool.
+ *
+ * @param <T> Type of element managed in this factory.
+ * @author Mark Paluch
+ * @since 5.1
+ */
+public interface AsyncObjectFactory<T> {
+
+    /**
+     * Create an instance that can be served by the pool and wrap it in a {@link PooledObject} to be managed by the pool.
+     *
+     * @return a {@code PooledObject} wrapping an instance that can be served by the pool
+     */
+    CompletableFuture<T> create();
+
+    /**
+     * Destroys an instance no longer needed by the pool.
+     * <p>
+     * It is important for implementations of this method to be aware that there is no guarantee about what state {@code object}
+     * will be in and the implementation should be prepared to handle unexpected errors.
+     * <p>
+     * Also, an implementation must take in to consideration that instances lost to the garbage collector may never be
+     * destroyed.
+     *
+     * @param object a {@code PooledObject} wrapping the instance to be destroyed
+     * @see #validate
+     */
+    CompletableFuture<Void> destroy(T object);
+
+    /**
+     * Ensures that the instance is safe to be returned by the pool.
+     *
+     * @param object a {@code PooledObject} wrapping the instance to be validated
+     *
+     * @return {@literal false} if {@code object} is not valid and should be dropped from the pool, {@literal true} otherwise.
+     */
+    CompletableFuture<Boolean> validate(T object);
+}
diff --git a/src/main/java/io/lettuce/core/support/AsyncPool.java b/src/main/java/io/lettuce/core/support/AsyncPool.java
new file mode 100644
index 0000000000..b83c07fb0c
--- /dev/null
+++ b/src/main/java/io/lettuce/core/support/AsyncPool.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.support;
+
+import java.io.Closeable;
+import java.util.concurrent.CompletableFuture;
+
+import io.lettuce.core.internal.AsyncCloseable;
+
+/**
+ * Interface declaring non-blocking object pool methods allowing to {@link #acquire()} and {@link #release(Object)} objects. All
+ * activity of a pool task outcome is communicated through the returned {@link CompletableFuture}.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+public interface AsyncPool<T> extends Closeable, AsyncCloseable {
+
+    /**
+     * Acquire an object from this {@link AsyncPool}. The returned {@link CompletableFuture} is notified once the acquire is
+     * successful and failed otherwise. Behavior upon acquiring objects from an exhausted pool depends on the actual pool
+     * implementation whether requests are rejected immediately (exceptional completion with
+     * {@link java.util.NoSuchElementException}) or delayed after exceeding a particular timeout (
+     * {@link java.util.concurrent.TimeoutException}).
+     *
+     * <strong>It's required that an acquired object is always released to the pool again once the object is no longer in
+     * use.</strong>.
+     */
+    CompletableFuture<T> acquire();
+
+    /**
+     * Release an object back to this {@link AsyncPool}. The returned {@link CompletableFuture} is notified once the release is
+     * successful and failed otherwise. When failed the object will automatically disposed.
+     *
+     * @param object the object to be released. The object must have been acquired from this pool.
+     */
+    CompletableFuture<Void> release(T object);
+
+    /**
+     * Clear the pool.
+     */
+    void clear();
+
+    /**
+     * Clear the pool.
+     */
+    CompletableFuture<Void> clearAsync();
+
+    @Override
+    void close();
+
+    @Override
+    CompletableFuture<Void> closeAsync();
+}
diff --git a/src/main/java/io/lettuce/core/support/BasePool.java b/src/main/java/io/lettuce/core/support/BasePool.java
new file mode 100644
index 0000000000..38c4ce81c3
--- /dev/null
+++ b/src/main/java/io/lettuce/core/support/BasePool.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.support;
+
+import io.lettuce.core.internal.LettuceAssert;
+
+/**
+ * Basic implementation of a pool configured through {@link BasePoolConfig}.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+public abstract class BasePool {
+
+    private final boolean testOnCreate;
+    private final boolean testOnAcquire;
+    private final boolean testOnRelease;
+
+    /**
+     * Create a new pool given {@link BasePoolConfig}.
+     *
+     * @param poolConfig must not be {@literal null}.
+     */
+    protected BasePool(BasePoolConfig poolConfig) {
+
+        LettuceAssert.notNull(poolConfig, "PoolConfig must not be null");
+
+        this.testOnCreate = poolConfig.isTestOnCreate();
+        this.testOnAcquire = poolConfig.isTestOnAcquire();
+        this.testOnRelease = poolConfig.isTestOnRelease();
+    }
+
+    /**
+     * Returns whether objects created for the pool will be validated before being returned from the acquire method. Validation
+     * is performed by the {@link AsyncObjectFactory#validate(Object)} method of the factory associated with the pool. If the
+     * object fails to validate, then acquire will fail.
+     *
+     * @return {@literal true} if newly created objects are validated before being returned from the acquire method.
+     */
+    public boolean isTestOnCreate() {
+        return testOnCreate;
+    }
+
+    /**
+     * Returns whether objects acquired from the pool will be validated before being returned from the acquire method.
+     * Validation is performed by the {@link AsyncObjectFactory#validate(Object)} method of the factory associated with the
+     * pool. If the object fails to validate, it will be removed from the pool and destroyed, and a new attempt will be made to
+     * borrow an object from the pool.
+     *
+     * @return {@literal true} if objects are validated before being returned from the acquire method.
+     */
+    public boolean isTestOnAcquire() {
+        return testOnAcquire;
+    }
+
+    /**
+     * Returns whether objects borrowed from the pool will be validated when they are returned to the pool via the release
+     * method. Validation is performed by the {@link AsyncObjectFactory#validate(Object)} method of the factory associated with
+     * the pool. Returning objects that fail validation are destroyed rather then being returned the pool.
+     *
+     * @return {@literal true} if objects are validated on return to the pool via the release method.
+     */
+    public boolean isTestOnRelease() {
+        return testOnRelease;
+    }
+
+    /**
+     * Set the {@link StackTraceElement} for the given {@link Throwable}, using the {@link Class} and method name.
+     */
+    static <T extends Throwable> T unknownStackTrace(T cause, Class<?> clazz, String method) {
+        cause.setStackTrace(new StackTraceElement[] { new StackTraceElement(clazz.getName(), method, null, -1) });
+        return cause;
+    }
+}
diff --git a/src/main/java/io/lettuce/core/support/BasePoolConfig.java b/src/main/java/io/lettuce/core/support/BasePoolConfig.java
new file mode 100644
index 0000000000..3f945e4e5a
--- /dev/null
+++ b/src/main/java/io/lettuce/core/support/BasePoolConfig.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.support;
+
+/**
+ * Base configuration for an object pool declaring options for object validation. Typically used as base class for configuration
+ * objects for specific pool implementations.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+public abstract class BasePoolConfig {
+
+    /**
+     * The default value for the {@code testOnCreate} configuration attribute.
+     */
+    public static final boolean DEFAULT_TEST_ON_CREATE = false;
+
+    /**
+     * The default value for the {@code testOnAcquire} configuration attribute.
+     */
+    public static final boolean DEFAULT_TEST_ON_ACQUIRE = false;
+
+    /**
+     * The default value for the {@code testOnRelease} configuration attribute.
+     */
+    public static final boolean DEFAULT_TEST_ON_RELEASE = false;
+
+    private final boolean testOnCreate;
+    private final boolean testOnAcquire;
+    private final boolean testOnRelease;
+
+    protected BasePoolConfig(boolean testOnCreate, boolean testOnAcquire, boolean testOnRelease) {
+
+        this.testOnCreate = testOnCreate;
+        this.testOnAcquire = testOnAcquire;
+        this.testOnRelease = testOnRelease;
+    }
+
+    /**
+     * Get the value for the {@code testOnCreate} configuration attribute for pools created with this configuration instance.
+     *
+     * @return the current setting of {@code testOnCreate} for this configuration instance.
+     */
+    public boolean isTestOnCreate() {
+        return testOnCreate;
+    }
+
+    /**
+     * Get the value for the {@code testOnAcquire} configuration attribute for pools created with this configuration instance.
+     *
+     * @return the current setting of {@code testOnAcquire} for this configuration instance.
+     */
+    public boolean isTestOnAcquire() {
+        return testOnAcquire;
+    }
+
+    /**
+     * Get the value for the {@code testOnRelease} configuration attribute for pools created with this configuration instance.
+     *
+     * @return the current setting of {@code testOnRelease} for this configuration instance.
+     */
+    public boolean isTestOnRelease() {
+        return testOnRelease;
+    }
+
+    /**
+     * Builder for {@link BasePoolConfig}.
+     */
+    public abstract static class Builder {
+
+        protected boolean testOnCreate = DEFAULT_TEST_ON_CREATE;
+        protected boolean testOnAcquire = DEFAULT_TEST_ON_ACQUIRE;
+        protected boolean testOnRelease = DEFAULT_TEST_ON_RELEASE;
+
+        protected Builder() {
+        }
+
+        /**
+         * Enables validation of objects before being returned from the acquire method. Validation is performed by the
+         * {@link AsyncObjectFactory#validate(Object)} method of the factory associated with the pool. If the object fails to
+         * validate, then acquire will fail.
+         *
+         * @return {@code this} {@link Builder}.
+         */
+        public Builder testOnCreate() {
+            return testOnCreate(true);
+        }
+
+        /**
+         * Configures whether objects created for the pool will be validated before being returned from the acquire method.
+         * Validation is performed by the {@link AsyncObjectFactory#validate(Object)} method of the factory associated with the
+         * pool. If the object fails to validate, then acquire will fail.
+         *
+         * @param testOnCreate {@literal true} if newly created objects should be validated before being returned from the
+         *        acquire method. {@literal true} to enable test on creation.
+         *
+         * @return {@code this} {@link Builder}.
+         */
+        public Builder testOnCreate(boolean testOnCreate) {
+
+            this.testOnCreate = testOnCreate;
+            return this;
+        }
+
+        /**
+         * Enables validation of objects before being returned from the acquire method. Validation is performed by the
+         * {@link AsyncObjectFactory#validate(Object)} method of the factory associated with the pool. If the object fails to
+         * validate, it will be removed from the pool and destroyed, and a new attempt will be made to borrow an object from the
+         * pool.
+         *
+         * @return {@code this} {@link Builder}.
+         */
+        public Builder testOnAcquire() {
+            return testOnAcquire(true);
+        }
+
+        /**
+         * Configures whether objects acquired from the pool will be validated before being returned from the acquire method.
+         * Validation is performed by the {@link AsyncObjectFactory#validate(Object)} method of the factory associated with the
+         * pool. If the object fails to validate, it will be removed from the pool and destroyed, and a new attempt will be made
+         * to borrow an object from the pool.
+         *
+         * @param testOnAcquire {@literal true} if objects should be validated before being returned from the acquire method.
+         * @return {@code this} {@link Builder}.
+         */
+        public Builder testOnAcquire(boolean testOnAcquire) {
+
+            this.testOnAcquire = testOnAcquire;
+            return this;
+        }
+
+        /**
+         * Enables validation of objects when they are returned to the pool via the release method. Validation is performed by
+         * the {@link AsyncObjectFactory#validate(Object)} method of the factory associated with the pool. Returning objects
+         * that fail validation are destroyed rather then being returned the pool.
+         *
+         * @return {@code this} {@link Builder}.
+         */
+        public Builder testOnRelease() {
+            return testOnRelease(true);
+        }
+
+        /**
+         * Configures whether objects borrowed from the pool will be validated when they are returned to the pool via the
+         * release method. Validation is performed by the {@link AsyncObjectFactory#validate(Object)} method of the factory
+         * associated with the pool. Returning objects that fail validation are destroyed rather then being returned the pool.
+         *
+         * @param testOnRelease {@literal true} if objects should be validated on return to the pool via the release method.
+         * @return {@code this} {@link Builder}.
+         */
+        public Builder testOnRelease(boolean testOnRelease) {
+
+            this.testOnRelease = testOnRelease;
+            return this;
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java b/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java
new file mode 100644
index 0000000000..aeb0f51a42
--- /dev/null
+++ b/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java
@@ -0,0 +1,452 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.support;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import io.lettuce.core.internal.Futures;
+import io.lettuce.core.internal.LettuceAssert;
+
+/**
+ * Bounded asynchronous object pool. This object pool allows pre-warming with {@link BoundedPoolConfig#getMinIdle() idle}
+ * objects upon construction. The pool is stateful and requires {@link #closeAsync() cleanup} once it's no longer in use.
+ * <p>
+ * Object pool bounds are maintained on a best-effort basis as bounds are maintained upon object request whereas the actual
+ * object creation might finish at a later time. You might see temporarily slight differences in object usage vs. pool count due
+ * to asynchronous processing vs. protecting the pool from exceed its bounds.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ * @see BoundedPoolConfig
+ * @see AsyncObjectFactory
+ */
+public class BoundedAsyncPool<T> extends BasePool implements AsyncPool<T> {
+
+    private static final CompletableFuture<Void> COMPLETED = CompletableFuture.completedFuture(null);
+
+    private static final IllegalStateException POOL_SHUTDOWN = unknownStackTrace(new IllegalStateException(
+            "AsyncPool is closed"), BoundedAsyncPool.class, "acquire()");
+
+    private static final NoSuchElementException POOL_EXHAUSTED = unknownStackTrace(
+            new NoSuchElementException("Pool exhausted"), BoundedAsyncPool.class, "acquire()");
+
+    private static final IllegalStateException NOT_PART_OF_POOL = unknownStackTrace(new IllegalStateException(
+            "Returned object not currently part of this pool"), BoundedAsyncPool.class, "release()");
+
+    private final int maxTotal;
+    private final int maxIdle;
+    private final int minIdle;
+
+    private final AsyncObjectFactory<T> factory;
+
+    private final Queue<T> cache;
+    private final Queue<T> all;
+
+    private final AtomicInteger objectCount = new AtomicInteger();
+    private final AtomicInteger objectsInCreationCount = new AtomicInteger();
+    private final AtomicInteger idleCount = new AtomicInteger();
+
+    private final CompletableFuture<Void> closeFuture = new CompletableFuture<>();
+
+    private volatile State state = State.ACTIVE;
+
+    /**
+     * Create a new {@link BoundedAsyncPool} given {@link BasePoolConfig} and {@link AsyncObjectFactory}. The factory creates
+     * idle objects upon construction and requires {@link #closeAsync() termination} once it's no longer in use.
+     *
+     * @param factory must not be {@literal null}.
+     * @param poolConfig must not be {@literal null}.
+     */
+    public BoundedAsyncPool(AsyncObjectFactory<T> factory, BoundedPoolConfig poolConfig) {
+
+        super(poolConfig);
+
+        LettuceAssert.notNull(factory, "AsyncObjectFactory must not be null");
+
+        this.maxTotal = poolConfig.getMaxTotal();
+        this.maxIdle = poolConfig.getMaxIdle();
+        this.minIdle = poolConfig.getMinIdle();
+
+        this.factory = factory;
+
+        this.cache = new ConcurrentLinkedQueue<>();
+        this.all = new ConcurrentLinkedQueue<>();
+
+        createIdle();
+    }
+
+    private void createIdle() {
+
+        int potentialIdle = getMinIdle() - getIdle();
+        if (potentialIdle <= 0 || !isPoolActive()) {
+            return;
+        }
+
+        int totalLimit = getAvailableCapacity();
+        int toCreate = Math.min(Math.max(0, totalLimit), potentialIdle);
+
+        for (int i = 0; i < toCreate; i++) {
+
+            if (getAvailableCapacity() <= 0) {
+                break;
+            }
+
+            CompletableFuture<T> future = new CompletableFuture<>();
+            makeObject0(future);
+
+            future.thenAccept(it -> {
+
+                if (isPoolActive()) {
+                    idleCount.incrementAndGet();
+                    cache.add(it);
+                } else {
+                    factory.destroy(it);
+                }
+            });
+        }
+    }
+
+    private int getAvailableCapacity() {
+        return getMaxTotal() - (getCreationInProgress() + getObjectCount());
+    }
+
+    @Override
+    public CompletableFuture<T> acquire() {
+
+        T object = cache.poll();
+
+        CompletableFuture<T> res = new CompletableFuture<>();
+        acquire0(object, res);
+
+        return res;
+    }
+
+    private void acquire0(T object, CompletableFuture<T> res) {
+
+        if (object != null) {
+
+            idleCount.decrementAndGet();
+
+            if (isTestOnAcquire()) {
+
+                factory.validate(object).whenComplete((state, throwable) -> {
+
+                    if (!isPoolActive()) {
+                        res.completeExceptionally(POOL_SHUTDOWN);
+                        return;
+                    }
+
+                    if (state != null && state) {
+
+                        completeAcquire(res, object);
+
+                        return;
+                    }
+
+                    destroy0(object).whenComplete((aVoid, th) -> makeObject0(res));
+                });
+
+                return;
+            }
+
+            if (isPoolActive()) {
+                completeAcquire(res, object);
+            } else {
+                res.completeExceptionally(POOL_SHUTDOWN);
+            }
+
+            createIdle();
+            return;
+        }
+
+        long objects = (long) (getObjectCount() + getCreationInProgress());
+
+        if ((long) getMaxTotal() >= (objects + 1)) {
+            makeObject0(res);
+            return;
+        }
+
+        res.completeExceptionally(POOL_EXHAUSTED);
+    }
+
+    private void makeObject0(CompletableFuture<T> res) {
+
+        long total = getObjectCount();
+        long creations = objectsInCreationCount.incrementAndGet();
+
+        if (((long) getMaxTotal()) < total + creations) {
+
+            res.completeExceptionally(POOL_EXHAUSTED);
+            objectsInCreationCount.decrementAndGet();
+            return;
+        }
+
+        factory.create().whenComplete(
+                (o, t) -> {
+
+                    if (t != null) {
+                        objectsInCreationCount.decrementAndGet();
+                        res.completeExceptionally(new IllegalStateException("Cannot allocate object", t));
+                        return;
+                    }
+
+                    if (isTestOnCreate()) {
+
+                        factory.validate(o).whenComplete(
+                                (state, throwable) -> {
+
+                                    try {
+
+                                        if (isPoolActive() && state != null && state) {
+
+                                            objectCount.incrementAndGet();
+                                            all.add(o);
+
+                                            completeAcquire(res, o);
+                                            return;
+                                        }
+
+                                        if (!isPoolActive()) {
+                                            rejectPoolClosed(res, o);
+                                            return;
+                                        }
+
+                                        factory.destroy(o).whenComplete(
+                                                (v, th) -> res.completeExceptionally(new IllegalStateException(
+                                                        "Cannot allocate object: Validation failed", throwable)));
+                                    } catch (Exception e) {
+                                        factory.destroy(o).whenComplete(
+                                                (v, th) -> res.completeExceptionally(new IllegalStateException(
+                                                        "Cannot allocate object: Validation failed", throwable)));
+                                    } finally {
+                                        objectsInCreationCount.decrementAndGet();
+                                    }
+                                });
+
+                        return;
+                    }
+
+                    try {
+
+                        if (isPoolActive()) {
+                            objectCount.incrementAndGet();
+                            all.add(o);
+
+                            completeAcquire(res, o);
+                        } else {
+                            rejectPoolClosed(res, o);
+                        }
+
+                    } catch (Exception e) {
+
+                        objectCount.decrementAndGet();
+                        all.remove(o);
+
+                        factory.destroy(o).whenComplete((v, th) -> res.completeExceptionally(e));
+                    } finally {
+                        objectsInCreationCount.decrementAndGet();
+                    }
+                });
+    }
+
+    private void completeAcquire(CompletableFuture<T> res, T o) {
+
+        if (res.isCancelled()) {
+            return0(o);
+        } else {
+            res.complete(o);
+        }
+    }
+
+    private void rejectPoolClosed(CompletableFuture<T> res, T o) {
+
+        factory.destroy(o);
+        res.completeExceptionally(POOL_SHUTDOWN);
+    }
+
+    @Override
+    public CompletableFuture<Void> release(T object) {
+
+        if (!all.contains(object)) {
+            return Futures.failed(NOT_PART_OF_POOL);
+        }
+
+        if (idleCount.get() >= getMaxIdle()) {
+            return destroy0(object);
+        }
+
+        if (isTestOnRelease()) {
+
+            CompletableFuture<Boolean> valid = factory.validate(object);
+            CompletableFuture<Void> res = new CompletableFuture<>();
+
+            valid.whenComplete((state1, throwable) -> {
+
+                if (state1 != null && state1) {
+                    return0(object).whenComplete((x, y) -> res.complete(null));
+                } else {
+                    destroy0(object).whenComplete((x, y) -> res.complete(null));
+                }
+            });
+
+            return res;
+        }
+
+        return return0(object);
+    }
+
+    private CompletableFuture<Void> return0(T object) {
+
+        int idleCount = this.idleCount.incrementAndGet();
+
+        if (idleCount > getMaxIdle()) {
+
+            this.idleCount.decrementAndGet();
+            return destroy0(object);
+        }
+
+        cache.add(object);
+
+        return COMPLETED;
+    }
+
+    private CompletableFuture<Void> destroy0(T object) {
+
+        objectCount.decrementAndGet();
+        all.remove(object);
+        return factory.destroy(object);
+    }
+
+    @Override
+    public void clear() {
+        clearAsync().join();
+    }
+
+    @Override
+    public CompletableFuture<Void> clearAsync() {
+
+        List<CompletableFuture<Void>> futures = new ArrayList<>(all.size());
+
+        T cached;
+        while ((cached = cache.poll()) != null) {
+            idleCount.decrementAndGet();
+            objectCount.decrementAndGet();
+            all.remove(cached);
+            futures.add(factory.destroy(cached));
+        }
+
+        return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
+    }
+
+    @Override
+    public void close() {
+        closeAsync().join();
+    }
+
+    @Override
+    public CompletableFuture<Void> closeAsync() {
+
+        if (!isPoolActive()) {
+            return closeFuture;
+        }
+
+        state = State.TERMINATING;
+
+        CompletableFuture<Void> clear = clearAsync();
+
+        state = State.TERMINATED;
+
+        clear.whenComplete((aVoid, throwable) -> {
+
+            if (throwable != null) {
+                closeFuture.completeExceptionally(throwable);
+            } else {
+                closeFuture.complete(aVoid);
+            }
+        });
+
+        return closeFuture;
+    }
+
+    /**
+     * Returns the maximum number of objects that can be allocated by the pool (checked out to clients, or idle awaiting
+     * checkout) at a given time. When negative, there is no limit to the number of objects that can be managed by the pool at
+     * one time.
+     *
+     * @return the cap on the total number of object instances managed by the pool.
+     */
+    public int getMaxTotal() {
+        return maxTotal;
+    }
+
+    /**
+     * Returns the cap on the number of "idle" instances in the pool. If {@code maxIdle} is set too low on heavily loaded
+     * systems it is possible you will see objects being destroyed and almost immediately new objects being created. This is a
+     * result of the active threads momentarily returning objects faster than they are requesting them them, causing the number
+     * of idle objects to rise above maxIdle. The best value for maxIdle for heavily loaded system will vary but the default is
+     * a good starting point.
+     *
+     * @return the maximum number of "idle" instances that can be held in the pool.
+     */
+    public int getMaxIdle() {
+        return maxIdle;
+    }
+
+    /**
+     * Returns the target for the minimum number of idle objects to maintain in the pool. If this is the case, an attempt is
+     * made to ensure that the pool has the required minimum number of instances during idle object eviction runs.
+     * <p>
+     * If the configured value of minIdle is greater than the configured value for {@code maxIdle} then the value of
+     * {@code maxIdle} will be used instead.
+     *
+     * @return The minimum number of objects.
+     */
+    public int getMinIdle() {
+
+        int maxIdleSave = getMaxIdle();
+        if (this.minIdle > maxIdleSave) {
+            return maxIdleSave;
+        } else {
+            return minIdle;
+        }
+    }
+
+    public int getIdle() {
+        return idleCount.get();
+    }
+
+    public int getObjectCount() {
+        return objectCount.get();
+    }
+
+    public int getCreationInProgress() {
+        return objectsInCreationCount.get();
+    }
+
+    private boolean isPoolActive() {
+        return this.state == State.ACTIVE;
+    }
+
+    enum State {
+        ACTIVE, TERMINATING, TERMINATED;
+    }
+}
diff --git a/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java b/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java
new file mode 100644
index 0000000000..b5ba270c9a
--- /dev/null
+++ b/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.support;
+
+/**
+ * Configuration for asynchronous pooling using {@link BoundedAsyncPool}. Instances can be created through a {@link #builder()}.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ * @see BoundedAsyncPool
+ */
+public class BoundedPoolConfig extends BasePoolConfig {
+
+    /**
+     * The default value for the {@code maxTotal} configuration attribute.
+     */
+    public static final int DEFAULT_MAX_TOTAL = 8;
+
+    /**
+     * The default value for the {@code maxIdle} configuration attribute.
+     */
+    public static final int DEFAULT_MAX_IDLE = 8;
+
+    /**
+     * The default value for the {@code minIdle} configuration attribute.
+     */
+    public static final int DEFAULT_MIN_IDLE = 0;
+
+    private final int maxTotal;
+    private final int maxIdle;
+    private final int minIdle;
+
+    protected BoundedPoolConfig(boolean testOnCreate, boolean testOnAcquire, boolean testOnRelease, int maxTotal, int maxIdle,
+            int minIdle) {
+
+        super(testOnCreate, testOnAcquire, testOnRelease);
+
+        this.maxTotal = maxTotal;
+        this.maxIdle = maxIdle;
+        this.minIdle = minIdle;
+    }
+
+    /**
+     * Create a new {@link Builder} for {@link BoundedPoolConfig}.
+     *
+     * @return a new {@link Builder} for {@link BoundedPoolConfig}.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static BoundedPoolConfig create() {
+        return builder().build();
+    }
+
+    /**
+     * Get the value for the {@code maxTotal} configuration attribute for pools created with this configuration instance.
+     *
+     * @return the current setting of {@code maxTotal} for this configuration instance.
+     */
+    public int getMaxTotal() {
+        return maxTotal;
+    }
+
+    /**
+     * Get the value for the {@code maxIdle} configuration attribute for pools created with this configuration instance.
+     *
+     * @return the current setting of {@code maxIdle} for this configuration instance.
+     */
+    public int getMaxIdle() {
+        return maxIdle;
+    }
+
+    /**
+     * Get the value for the {@code minIdle} configuration attribute for pools created with this configuration instance.
+     *
+     * @return the current setting of {@code minIdle} for this configuration instance.
+     */
+    public int getMinIdle() {
+        return minIdle;
+    }
+
+    /**
+     * Builder for {@link BoundedPoolConfig}.
+     */
+    public static class Builder extends BasePoolConfig.Builder {
+
+        private int maxTotal = DEFAULT_MAX_TOTAL;
+        private int maxIdle = DEFAULT_MAX_IDLE;
+        private int minIdle = DEFAULT_MIN_IDLE;
+
+        protected Builder() {
+        }
+
+        @Override
+        public Builder testOnCreate() {
+
+            super.testOnCreate();
+            return this;
+        }
+
+        @Override
+        public Builder testOnCreate(boolean testOnCreate) {
+
+            super.testOnCreate(testOnCreate);
+            return this;
+        }
+
+        @Override
+        public Builder testOnAcquire() {
+
+            super.testOnAcquire();
+            return this;
+        }
+
+        @Override
+        public Builder testOnAcquire(boolean testOnAcquire) {
+
+            super.testOnAcquire(testOnAcquire);
+            return this;
+        }
+
+        @Override
+        public Builder testOnRelease() {
+
+            super.testOnRelease();
+            return this;
+        }
+
+        @Override
+        public Builder testOnRelease(boolean testOnRelease) {
+
+            super.testOnRelease(testOnRelease);
+            return this;
+        }
+
+        /**
+         * Configures the maximum number of objects that can be allocated by the pool (checked out to clients, or idle awaiting
+         * checkout) at a given time. When negative, there is no limit to the number of objects that can be managed by the pool
+         * at one time.
+         *
+         * @param maxTotal maximum number of objects that can be allocated by the pool.
+         * @return {@code this} {@link Builder}.
+         */
+        public Builder maxTotal(int maxTotal) {
+
+            this.maxTotal = maxTotal;
+            return this;
+        }
+
+        /**
+         * Returns the cap on the number of "idle" instances in the pool. If {@code maxIdle} is set too low on heavily loaded
+         * systems it is possible you will see objects being destroyed and almost immediately new objects being created. This is
+         * a result of the active threads momentarily returning objects faster than they are requesting them them, causing the
+         * number of idle objects to rise above maxIdle. The best value for maxIdle for heavily loaded system will vary but the
+         * default is a good starting point.
+         *
+         * @param maxIdle the cap on the number of "idle" instances in the pool.
+         * @return {@code this} {@link Builder}.
+         */
+        public Builder maxIdle(int maxIdle) {
+
+            this.maxIdle = maxIdle;
+            return this;
+        }
+
+        /**
+         * Configures the maximum number of objects that can be allocated by the pool (checked out to clients, or idle awaiting
+         * checkout) at a given time. When negative, there is no limit to the number of objects that can be managed by the pool
+         * at one time.
+         *
+         * @param minIdle maximum number of objects that can be allocated by the pool.
+         * @return {@code this} {@link Builder}.
+         */
+        public Builder minIdle(int minIdle) {
+
+            this.minIdle = minIdle;
+            return this;
+        }
+
+        /**
+         * Build a new {@link BasePoolConfig} object.
+         *
+         * @return a new {@link BasePoolConfig} object.
+         */
+        public BoundedPoolConfig build() {
+            return new BoundedPoolConfig(testOnCreate, testOnAcquire, testOnRelease, maxTotal, maxIdle, minIdle);
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java b/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
new file mode 100644
index 0000000000..93bfbc2823
--- /dev/null
+++ b/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.support;
+
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+
+import io.lettuce.core.internal.LettuceAssert;
+
+/**
+ * Utility class to adapt Commons Pool 2 configuration to {@link BoundedPoolConfig}.
+ *
+ * @author Mark Paluch
+ */
+public class CommonsPool2ConfigConverter {
+
+    private CommonsPool2ConfigConverter() {
+    }
+
+    /**
+     * Converts {@link GenericObjectPoolConfig} properties to an immutable {@link BoundedPoolConfig}. Applies max total, min/max
+     * idle and test on borrow/create/release configuration.
+     *
+     * @param config must not be {@literal null}.
+     * @return the converted {@link BoundedPoolConfig}.
+     */
+    public static BoundedPoolConfig bounded(GenericObjectPoolConfig config) {
+
+        LettuceAssert.notNull(config, "GenericObjectPoolConfig must not be null");
+
+        return BoundedPoolConfig.builder().maxTotal(config.getMaxTotal()).maxIdle(config.getMaxIdle())
+                .minIdle(config.getMinIdle()).testOnAcquire(config.getTestOnBorrow()).testOnCreate(config.getTestOnCreate())
+                .testOnRelease(config.getTestOnReturn()).build();
+    }
+}
diff --git a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
index 2b5f3d52dc..d6107e6fe6 100644
--- a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
+++ b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,9 @@
  */
 package io.lettuce.core.support;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import static io.lettuce.core.support.ConnectionWrapping.HasTargetConnection;
+
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
@@ -32,10 +30,9 @@
 import org.apache.commons.pool2.impl.SoftReferenceObjectPool;
 
 import io.lettuce.core.ClientOptions;
-import io.lettuce.core.RedisException;
 import io.lettuce.core.api.StatefulConnection;
-import io.lettuce.core.internal.AbstractInvocationHandler;
 import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.support.ConnectionWrapping.Origin;
 
 /**
  * Connection pool support for {@link GenericObjectPool} and {@link SoftReferenceObjectPool}. Connection pool creation requires
@@ -45,8 +42,8 @@
  * <li>Regular connections need to be returned to the pool with {@link GenericObjectPool#returnObject(Object)}</li>
  * </ul>
  * <p>
- * Lettuce connections are designed to be thread-safe so one connection can be shared amongst multiple threads and lettuce
- * connections {@link ClientOptions#isAutoReconnect() auto-reconnect} by default. Connection pooling with lettuce might be
+ * Lettuce connections are designed to be thread-safe so one connection can be shared amongst multiple threads and Lettuce
+ * connections {@link ClientOptions#isAutoReconnect() auto-reconnect} by default. Connection pooling with Lettuce can be
  * required when you're invoking Redis operations in multiple threads and you use
  * <ul>
  * <li>blocking commands such as {@code BLPOP}.</li>
@@ -55,7 +52,7 @@
  * </ul>
  *
  * Transactions and command batching affect connection state. Blocking commands won't propagate queued commands to Redis until
- * the blocking command is resolved.
+ * the blocking command is completed.
  *
  * <h3>Example</h3>
  *
@@ -115,13 +112,14 @@ private ConnectionPoolSupport() {
         LettuceAssert.notNull(connectionSupplier, "Connection supplier must not be null");
         LettuceAssert.notNull(config, "GenericObjectPoolConfig must not be null");
 
-        AtomicReference<ObjectPool<T>> poolRef = new AtomicReference<>();
+        AtomicReference<Origin<T>> poolRef = new AtomicReference<>();
 
         GenericObjectPool<T> pool = new GenericObjectPool<T>(new RedisPooledObjectFactory<T>(connectionSupplier), config) {
 
             @Override
             public T borrowObject() throws Exception {
-                return wrapConnections ? wrapConnection(super.borrowObject(), this) : super.borrowObject();
+                return wrapConnections ? ConnectionWrapping.wrapConnection(super.borrowObject(), poolRef.get()) : super
+                        .borrowObject();
             }
 
             @Override
@@ -135,7 +133,7 @@ public void returnObject(T obj) {
             }
         };
 
-        poolRef.set(pool);
+        poolRef.set(new ObjectPoolWrapper<>(pool));
 
         return pool;
     }
@@ -169,12 +167,13 @@ public void returnObject(T obj) {
 
         LettuceAssert.notNull(connectionSupplier, "Connection supplier must not be null");
 
-        AtomicReference<ObjectPool<T>> poolRef = new AtomicReference<>();
+        AtomicReference<Origin<T>> poolRef = new AtomicReference<>();
 
         SoftReferenceObjectPool<T> pool = new SoftReferenceObjectPool<T>(new RedisPooledObjectFactory<>(connectionSupplier)) {
             @Override
             public T borrowObject() throws Exception {
-                return wrapConnections ? wrapConnection(super.borrowObject(), this) : super.borrowObject();
+                return wrapConnections ? ConnectionWrapping.wrapConnection(super.borrowObject(), poolRef.get()) : super
+                        .borrowObject();
             }
 
             @Override
@@ -187,26 +186,11 @@ public void returnObject(T obj) throws Exception {
                 super.returnObject(obj);
             }
         };
-        poolRef.set(pool);
+        poolRef.set(new ObjectPoolWrapper<>(pool));
 
         return pool;
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    private static <T> T wrapConnection(T connection, ObjectPool<T> pool) {
-
-        ReturnObjectOnCloseInvocationHandler<T> handler = new ReturnObjectOnCloseInvocationHandler<T>(connection, pool);
-
-        Class<?>[] implementedInterfaces = connection.getClass().getInterfaces();
-        Class[] interfaces = new Class[implementedInterfaces.length + 1];
-        interfaces[0] = HasTargetConnection.class;
-        System.arraycopy(implementedInterfaces, 0, interfaces, 1, implementedInterfaces.length);
-
-        T proxiedConnection = (T) Proxy.newProxyInstance(connection.getClass().getClassLoader(), interfaces, handler);
-        handler.setProxiedConnection(proxiedConnection);
-
-        return proxiedConnection;
-    }
 
     /**
      * @author Mark Paluch
@@ -241,136 +225,25 @@ public boolean validateObject(PooledObject<T> p) {
         }
     }
 
-    /**
-     * Invocation handler that takes care of connection.close(). Connections are returned to the pool on a close()-call.
-     *
-     * @author Mark Paluch
-     * @param <T> Connection type.
-     * @since 4.3
-     */
-    private static class ReturnObjectOnCloseInvocationHandler<T> extends AbstractInvocationHandler {
+    private static class ObjectPoolWrapper<T> implements Origin<T> {
 
-        private T connection;
-        private T proxiedConnection;
-        private Map<Method, Object> connectionProxies = new ConcurrentHashMap<>(5, 1);
+        private static final CompletableFuture<Void> COMPLETED = CompletableFuture.completedFuture(null);
 
         private final ObjectPool<T> pool;
 
-        ReturnObjectOnCloseInvocationHandler(T connection, ObjectPool<T> pool) {
-            this.connection = connection;
+        ObjectPoolWrapper(ObjectPool<T> pool) {
             this.pool = pool;
         }
 
-        void setProxiedConnection(T proxiedConnection) {
-            this.proxiedConnection = proxiedConnection;
-        }
-
         @Override
-        protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
-
-            if (method.getName().equals("getStatefulConnection")) {
-                return proxiedConnection;
-            }
-
-            if (method.getName().equals("getTargetConnection")) {
-                return connection;
-            }
-
-            if (connection == null) {
-                throw new RedisException("Connection is deallocated and cannot be used anymore.");
-            }
-
-            if (method.getName().equals("close")) {
-                pool.returnObject(proxiedConnection);
-                connection = null;
-                proxiedConnection = null;
-                connectionProxies.clear();
-                return null;
-            }
-
-            try {
-
-                if (method.getName().equals("sync") || method.getName().equals("async") || method.getName().equals("reactive")) {
-                    return connectionProxies.computeIfAbsent(
-                            method,
- m -> getInnerProxy(method, args));
-                }
-
-                return method.invoke(connection, args);
-
-            } catch (InvocationTargetException e) {
-                throw e.getTargetException();
-            }
+        public void returnObject(T o) throws Exception {
+            pool.returnObject(o);
         }
 
-        @SuppressWarnings("unchecked")
-        private Object getInnerProxy(Method method, Object[] args) {
-
-            try {
-                Object result = method.invoke(connection, args);
-
-                result = Proxy.newProxyInstance(getClass().getClassLoader(), result.getClass().getInterfaces(),
-                        new DelegateCloseToConnectionInvocationHandler<>((AutoCloseable) proxiedConnection, result));
-
-                return result;
-            } catch (IllegalAccessException e) {
-                throw new RedisException(e);
-            } catch (InvocationTargetException e) {
-                throw new RedisException(e.getTargetException());
-
-            }
-        }
-
-        public T getConnection() {
-            return connection;
-        }
-    }
-
-    /**
-     * Invocation handler that takes care of connection.close(). Connections are returned to the pool on a close()-call.
-     *
-     * @author Mark Paluch
-     * @param <T> Connection type.
-     * @since 4.3
-     */
-    private static class DelegateCloseToConnectionInvocationHandler<T extends AutoCloseable> extends AbstractInvocationHandler {
-
-        private final T proxiedConnection;
-        private final Object api;
-
-        DelegateCloseToConnectionInvocationHandler(T proxiedConnection, Object api) {
-
-            this.proxiedConnection = proxiedConnection;
-            this.api = api;
-        }
-
-        @SuppressWarnings("unchecked")
         @Override
-        protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
-
-            if (method.getName().equals("getStatefulConnection")) {
-                return proxiedConnection;
-            }
-
-            try {
-
-                if (method.getName().equals("close")) {
-                    proxiedConnection.close();
-                    return null;
-                }
-
-                return method.invoke(api, args);
-
-            } catch (InvocationTargetException e) {
-                throw e.getTargetException();
-            }
+        public CompletableFuture<Void> returnObjectAsync(T o) throws Exception {
+            pool.returnObject(o);
+            return COMPLETED;
         }
     }
-
-    /**
-     * Interface to retrieve an underlying target connection from a proxy.
-     */
-    interface HasTargetConnection {
-        StatefulConnection<?, ?> getTargetConnection();
-    }
 }
diff --git a/src/main/java/io/lettuce/core/support/ConnectionWrapping.java b/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
new file mode 100644
index 0000000000..f5254050c5
--- /dev/null
+++ b/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.support;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+
+import io.lettuce.core.RedisException;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.internal.AbstractInvocationHandler;
+import io.lettuce.core.internal.AsyncCloseable;
+
+/**
+ * Utility to wrap pooled connections for return-on-close.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+class ConnectionWrapping {
+
+    /**
+     * Wrap a connection along its {@link Origin} reference.
+     *
+     * @param connection
+     * @param pool
+     * @param <T>
+     * @return
+     */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    static <T> T wrapConnection(T connection, Origin<T> pool) {
+
+        ReturnObjectOnCloseInvocationHandler<T> handler = new ReturnObjectOnCloseInvocationHandler<T>(connection, pool);
+
+        Class<?>[] implementedInterfaces = connection.getClass().getInterfaces();
+        Class[] interfaces = new Class[implementedInterfaces.length + 1];
+        interfaces[0] = HasTargetConnection.class;
+        System.arraycopy(implementedInterfaces, 0, interfaces, 1, implementedInterfaces.length);
+
+        T proxiedConnection = (T) Proxy.newProxyInstance(connection.getClass().getClassLoader(), interfaces, handler);
+        handler.setProxiedConnection(proxiedConnection);
+
+        return proxiedConnection;
+    }
+
+    /**
+     * Invocation handler that takes care of connection.close(). Connections are returned to the pool on a close()-call.
+     *
+     * @author Mark Paluch
+     * @param <T> Connection type.
+     * @since 4.3
+     */
+    static class ReturnObjectOnCloseInvocationHandler<T> extends AbstractInvocationHandler {
+
+        private T connection;
+        private T proxiedConnection;
+        private Map<Method, Object> connectionProxies = new ConcurrentHashMap<>(5, 1);
+
+        private final Origin<T> pool;
+
+        ReturnObjectOnCloseInvocationHandler(T connection, Origin<T> pool) {
+            this.connection = connection;
+            this.pool = pool;
+        }
+
+        void setProxiedConnection(T proxiedConnection) {
+            this.proxiedConnection = proxiedConnection;
+        }
+
+        @Override
+        protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
+
+            if (method.getName().equals("getStatefulConnection")) {
+                return proxiedConnection;
+            }
+
+            if (method.getName().equals("getTargetConnection")) {
+                return connection;
+            }
+
+            if (connection == null) {
+                throw new RedisException("Connection is deallocated and cannot be used anymore.");
+            }
+
+            if (method.getName().equals("close")) {
+                pool.returnObject(proxiedConnection);
+                connection = null;
+                proxiedConnection = null;
+                connectionProxies.clear();
+                return null;
+            }
+
+            if (method.getName().equals("closeAsync")) {
+                CompletableFuture<Void> future = pool.returnObjectAsync(proxiedConnection);
+                connection = null;
+                proxiedConnection = null;
+                connectionProxies.clear();
+                return future;
+            }
+
+            try {
+
+                if (method.getName().equals("sync") || method.getName().equals("async") || method.getName().equals("reactive")) {
+                    return connectionProxies.computeIfAbsent(method, m -> getInnerProxy(method, args));
+                }
+
+                return method.invoke(connection, args);
+
+            } catch (InvocationTargetException e) {
+                throw e.getTargetException();
+            }
+        }
+
+        @SuppressWarnings("unchecked")
+        private Object getInnerProxy(Method method, Object[] args) {
+
+            try {
+                Object result = method.invoke(connection, args);
+
+                result = Proxy.newProxyInstance(getClass().getClassLoader(), result.getClass().getInterfaces(),
+                        new DelegateCloseToConnectionInvocationHandler((AsyncCloseable) proxiedConnection, result));
+
+                return result;
+            } catch (IllegalAccessException e) {
+                throw new RedisException(e);
+            } catch (InvocationTargetException e) {
+                throw new RedisException(e.getTargetException());
+            }
+        }
+
+        public T getConnection() {
+            return connection;
+        }
+    }
+
+    /**
+     * Invocation handler that takes care of connection.close(). Connections are returned to the pool on a close()-call.
+     *
+     * @author Mark Paluch
+     * @param <T> Connection type.
+     * @since 4.3
+     */
+    static class DelegateCloseToConnectionInvocationHandler<T extends AsyncCloseable & AutoCloseable> extends
+            AbstractInvocationHandler {
+
+        private final T proxiedConnection;
+        private final Object api;
+
+        DelegateCloseToConnectionInvocationHandler(T proxiedConnection, Object api) {
+
+            this.proxiedConnection = proxiedConnection;
+            this.api = api;
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
+
+            if (method.getName().equals("getStatefulConnection")) {
+                return proxiedConnection;
+            }
+
+            try {
+
+                if (method.getName().equals("close")) {
+                    proxiedConnection.close();
+                    return null;
+                }
+
+                if (method.getName().equals("close")) {
+                    return proxiedConnection.closeAsync();
+                }
+
+                return method.invoke(api, args);
+
+            } catch (InvocationTargetException e) {
+                throw e.getTargetException();
+            }
+        }
+    }
+
+    /**
+     * Interface to retrieve an underlying target connection from a proxy.
+     */
+    interface HasTargetConnection {
+        StatefulConnection<?, ?> getTargetConnection();
+    }
+
+    /**
+     * Interface to return objects to their origin.
+     */
+    interface Origin<T> {
+
+        /**
+         * Synchronously return the object.
+         */
+        void returnObject(T o) throws Exception;
+
+        /**
+         * Return the object asynchronously.
+         */
+        CompletableFuture<Void> returnObjectAsync(T o) throws Exception;
+    }
+}
diff --git a/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportTest.java b/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportTest.java
new file mode 100644
index 0000000000..b5bd3eccc4
--- /dev/null
+++ b/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportTest.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.support;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+
+import java.lang.reflect.Proxy;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import io.lettuce.TestClientResources;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.StatefulRedisClusterConnectionImpl;
+import io.lettuce.core.codec.StringCodec;
+import io.netty.channel.group.ChannelGroup;
+
+/**
+ * @author Mark Paluch
+ */
+public class AsyncConnectionPoolSupportTest extends AbstractTest {
+
+    private static RedisClient client;
+    private static Set<?> channels;
+    private static RedisURI uri = RedisURI.Builder.redis(host, port).build();
+
+    @BeforeClass
+    public static void setupClient() {
+
+        client = RedisClient.create(TestClientResources.create(), uri);
+        client.setOptions(ClientOptions.create());
+        channels = (ChannelGroup) ReflectionTestUtils.getField(client, "channels");
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        FastShutdown.shutdown(client);
+        FastShutdown.shutdown(client.getResources());
+    }
+
+    @Test
+    public void asyncPoolShouldWorkWithWrappedConnections() {
+
+        BoundedAsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
+                () -> client.connectAsync(StringCodec.ASCII, uri), BoundedPoolConfig.create());
+
+        borrowAndReturn(pool);
+        borrowAndClose(pool);
+        borrowAndCloseAsync(pool);
+
+        pool.release(pool.acquire().join().sync().getStatefulConnection()).join();
+        pool.release(pool.acquire().join().async().getStatefulConnection()).join();
+
+        assertThat(channels).hasSize(1);
+
+        pool.close();
+
+        assertThat(channels).isEmpty();
+    }
+
+    @Test
+    public void asyncPoolShouldCloseConnectionsAboveMaxIdleSize() {
+
+        GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
+        poolConfig.setMaxIdle(2);
+
+        BoundedAsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
+                () -> client.connectAsync(StringCodec.ASCII, uri), CommonsPool2ConfigConverter.bounded(poolConfig));
+
+        borrowAndReturn(pool);
+        borrowAndClose(pool);
+
+        StatefulRedisConnection<String, String> c1 = pool.acquire().join();
+        StatefulRedisConnection<String, String> c2 = pool.acquire().join();
+        StatefulRedisConnection<String, String> c3 = pool.acquire().join();
+
+        assertThat(channels).hasSize(3);
+
+        CompletableFuture.allOf(pool.release(c1), pool.release(c2), pool.release(c3)).join();
+
+        assertThat(channels).hasSize(2);
+
+        pool.close();
+
+        assertThat(channels).isEmpty();
+    }
+
+    @Test
+    public void asyncPoolShouldWorkWithPlainConnections() {
+
+        AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
+                () -> client.connectAsync(StringCodec.ASCII, uri), BoundedPoolConfig.create(), false);
+
+        borrowAndReturn(pool);
+
+        StatefulRedisConnection<String, String> connection = pool.acquire().join();
+        assertThat(Proxy.isProxyClass(connection.getClass())).isFalse();
+        pool.release(connection);
+
+        pool.close();
+    }
+
+    @Test
+    public void asyncPoolUsingWrappingShouldPropagateExceptionsCorrectly() {
+
+        AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
+                () -> client.connectAsync(StringCodec.ASCII, uri), BoundedPoolConfig.create());
+
+        StatefulRedisConnection<String, String> connection = pool.acquire().join();
+        RedisCommands<String, String> sync = connection.sync();
+        sync.set(key, value);
+
+        try {
+            sync.hgetall(key);
+            fail("Missing RedisCommandExecutionException");
+        } catch (RedisCommandExecutionException e) {
+            assertThat(e).hasMessageContaining("WRONGTYPE");
+        }
+
+        connection.close();
+        pool.close();
+    }
+
+    @Test
+    public void wrappedConnectionShouldUseWrappers() {
+
+        AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
+                () -> client.connectAsync(StringCodec.ASCII, uri), BoundedPoolConfig.create());
+
+        StatefulRedisConnection<String, String> connection = pool.acquire().join();
+        RedisCommands<String, String> sync = connection.sync();
+
+        assertThat(connection).isInstanceOf(StatefulRedisConnection.class).isNotInstanceOf(
+                StatefulRedisClusterConnectionImpl.class);
+        assertThat(Proxy.isProxyClass(connection.getClass())).isTrue();
+
+        assertThat(sync).isInstanceOf(RedisCommands.class);
+        assertThat(connection.async()).isInstanceOf(RedisAsyncCommands.class).isNotInstanceOf(RedisAsyncCommandsImpl.class);
+        assertThat(connection.reactive()).isInstanceOf(RedisReactiveCommands.class).isNotInstanceOf(
+                RedisReactiveCommandsImpl.class);
+        assertThat(sync.getStatefulConnection()).isInstanceOf(StatefulRedisConnection.class)
+                .isNotInstanceOf(StatefulRedisConnectionImpl.class).isSameAs(connection);
+
+        connection.close();
+        pool.close();
+    }
+
+    @Test
+    public void wrappedObjectClosedAfterReturn() {
+
+        AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
+                () -> client.connectAsync(StringCodec.ASCII, uri), BoundedPoolConfig.create(), true);
+
+        StatefulRedisConnection<String, String> connection = pool.acquire().join();
+        RedisCommands<String, String> sync = connection.sync();
+        sync.ping();
+
+        connection.close();
+
+        try {
+            connection.isMulti();
+            fail("Missing RedisException");
+        } catch (RedisException e) {
+            assertThat(e).hasMessageContaining("deallocated");
+        }
+
+        pool.close();
+    }
+
+    @Test
+    public void shouldPropagateAsyncFlow() {
+
+        AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
+                () -> client.connectAsync(StringCodec.ASCII, uri), BoundedPoolConfig.create());
+
+        CompletableFuture<String> pingResponse = pool.acquire().thenCompose(c -> {
+            return c.async().ping().whenComplete((s, throwable) -> pool.release(c));
+        });
+
+        pingResponse.join();
+        assertThat(pingResponse).isCompletedWithValue("PONG");
+
+        pool.close();
+    }
+
+    private void borrowAndReturn(AsyncPool<StatefulRedisConnection<String, String>> pool) {
+
+        for (int i = 0; i < 10; i++) {
+            StatefulRedisConnection<String, String> connection = pool.acquire().join();
+            RedisCommands<String, String> sync = connection.sync();
+            sync.ping();
+            pool.release(connection).join();
+        }
+    }
+
+    private void borrowAndClose(AsyncPool<StatefulRedisConnection<String, String>> pool) {
+
+        for (int i = 0; i < 10; i++) {
+            StatefulRedisConnection<String, String> connection = pool.acquire().join();
+            RedisCommands<String, String> sync = connection.sync();
+            sync.ping();
+            connection.close();
+        }
+    }
+
+    private void borrowAndCloseAsync(AsyncPool<StatefulRedisConnection<String, String>> pool) {
+
+        for (int i = 0; i < 10; i++) {
+            StatefulRedisConnection<String, String> connection = pool.acquire().join();
+            RedisCommands<String, String> sync = connection.sync();
+            sync.ping();
+            connection.closeAsync().join();
+        }
+    }
+}
diff --git a/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationTest.java b/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationTest.java
new file mode 100644
index 0000000000..76cac0e212
--- /dev/null
+++ b/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationTest.java
@@ -0,0 +1,348 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.support;
+
+import static io.lettuce.core.internal.Futures.failed;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import io.lettuce.core.RedisException;
+
+/**
+ * @author Mark Paluch
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class AsyncPoolWithValidationTest {
+
+    @Mock
+    AsyncObjectFactory<String> factory;
+
+    @Before
+    public void before() throws Exception {
+        when(factory.destroy(any())).thenReturn(CompletableFuture.completedFuture(null));
+    }
+
+    private void mockCreation() {
+
+        AtomicInteger counter = new AtomicInteger();
+        when(factory.create()).then(invocation -> CompletableFuture.completedFuture("" + counter.incrementAndGet()));
+    }
+
+    @Test
+    public void objectCreationShouldFail() {
+
+        when(factory.create()).thenReturn(failed(new RedisException("foo")));
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.create());
+
+        CompletableFuture<String> acquire = pool.acquire();
+
+        assertThat(pool.getIdle()).isZero();
+        assertThat(pool.getObjectCount()).isZero();
+        assertThat(pool.getCreationInProgress()).isZero();
+
+        assertThat(acquire).isCompletedExceptionally();
+    }
+
+    @Test
+    public void objectCreationFinishesAfterShutdown() {
+
+        CompletableFuture<String> progress = new CompletableFuture<>();
+
+        when(factory.create()).thenReturn(progress);
+        when(factory.destroy(any())).thenReturn(CompletableFuture.completedFuture(null));
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.create());
+
+        CompletableFuture<String> acquire = pool.acquire();
+
+        assertThat(pool.getIdle()).isZero();
+        assertThat(pool.getObjectCount()).isZero();
+        assertThat(pool.getCreationInProgress()).isEqualTo(1);
+
+        pool.close();
+
+        assertThat(acquire.isDone()).isFalse();
+        assertThat(pool.getIdle()).isZero();
+        assertThat(pool.getObjectCount()).isZero();
+        assertThat(pool.getCreationInProgress()).isEqualTo(1);
+        verify(factory, never()).destroy("foo");
+
+        progress.complete("foo");
+
+        assertThat(pool.getIdle()).isZero();
+        assertThat(pool.getObjectCount()).isZero();
+        assertThat(pool.getCreationInProgress()).isZero();
+
+        verify(factory).destroy("foo");
+    }
+
+    @Test
+    public void objectCreationCanceled() {
+
+        CompletableFuture<String> progress = new CompletableFuture<>();
+
+        when(factory.create()).thenReturn(progress);
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.create());
+
+        CompletableFuture<String> acquire = pool.acquire();
+
+        acquire.cancel(true);
+        progress.complete("foo");
+
+        assertThat(pool.getIdle()).isEqualTo(1);
+        assertThat(pool.getObjectCount()).isEqualTo(1);
+        assertThat(pool.getCreationInProgress()).isZero();
+
+        verify(factory, never()).destroy(anyString());
+    }
+
+    @Test
+    public void shouldCreateObjectWithTestOnBorrowFailExceptionally() {
+
+        mockCreation();
+        when(factory.validate(any())).thenReturn(failed(new RedisException("foo")));
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnCreate().build());
+
+        CompletableFuture<String> acquire = pool.acquire();
+
+        assertThat(pool.getIdle()).isZero();
+        assertThat(pool.getObjectCount()).isZero();
+        assertThat(pool.getCreationInProgress()).isZero();
+
+        assertThat(acquire).isCompletedExceptionally();
+    }
+
+    @Test
+    public void shouldCreateObjectWithTestOnBorrowSuccess() {
+
+        mockCreation();
+        when(factory.validate(any())).thenReturn(CompletableFuture.completedFuture(true));
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnCreate().build());
+
+        CompletableFuture<String> acquire = pool.acquire();
+
+        assertThat(pool.getIdle()).isZero();
+        assertThat(pool.getObjectCount()).isEqualTo(1);
+        assertThat(pool.getCreationInProgress()).isZero();
+
+        assertThat(acquire).isCompletedWithValue("1");
+    }
+
+    @Test
+    public void shouldCreateObjectWithTestOnBorrowFailState() {
+
+        mockCreation();
+        when(factory.validate(any())).thenReturn(CompletableFuture.completedFuture(false));
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnCreate().build());
+
+        CompletableFuture<String> acquire = pool.acquire();
+
+        assertThat(pool.getIdle()).isZero();
+        assertThat(pool.getObjectCount()).isZero();
+        assertThat(pool.getCreationInProgress()).isZero();
+
+        assertThat(acquire).isCompletedExceptionally();
+    }
+
+    @Test
+    public void shouldCreateFailedObjectWithTestOnBorrowFail() {
+
+        when(factory.create()).thenReturn(failed(new RedisException("foo")));
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnCreate().build());
+
+        CompletableFuture<String> acquire = pool.acquire();
+
+        assertThat(pool.getIdle()).isZero();
+        assertThat(pool.getObjectCount()).isZero();
+        assertThat(pool.getCreationInProgress()).isZero();
+
+        assertThat(acquire).isCompletedExceptionally();
+    }
+
+    @Test
+    public void shouldTestObjectOnBorrowSuccessfully() {
+
+        mockCreation();
+        when(factory.validate(any())).thenReturn(CompletableFuture.completedFuture(true));
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnAcquire().build());
+
+        pool.release(pool.acquire().join());
+
+        assertThat(pool.getIdle()).isEqualTo(1);
+        assertThat(pool.getObjectCount()).isEqualTo(1);
+        assertThat(pool.getCreationInProgress()).isZero();
+
+        CompletableFuture<String> acquire = pool.acquire();
+
+        assertThat(acquire).isCompletedWithValue("1");
+    }
+
+    @Test
+    public void shouldTestObjectOnBorrowFailState() {
+
+        mockCreation();
+        when(factory.validate(any())).thenReturn(failed(new RedisException("foo")));
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnAcquire().build());
+
+        pool.release(pool.acquire().join());
+
+        assertThat(pool.getIdle()).isEqualTo(1);
+        assertThat(pool.getObjectCount()).isEqualTo(1);
+        assertThat(pool.getCreationInProgress()).isZero();
+
+        CompletableFuture<String> acquire = pool.acquire();
+
+        assertThat(acquire).isCompletedWithValue("2");
+
+        assertThat(pool.getIdle()).isEqualTo(0);
+        assertThat(pool.getObjectCount()).isEqualTo(1);
+        assertThat(pool.getCreationInProgress()).isZero();
+    }
+
+    @Test
+    public void shouldTestObjectOnBorrowFailExceptionally() {
+
+        mockCreation();
+        when(factory.validate(any())).thenReturn(failed(new RedisException("foo")));
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnAcquire().build());
+
+        pool.release(pool.acquire().join());
+
+        assertThat(pool.getIdle()).isEqualTo(1);
+        assertThat(pool.getObjectCount()).isEqualTo(1);
+        assertThat(pool.getCreationInProgress()).isZero();
+
+        CompletableFuture<String> acquire = pool.acquire();
+
+        assertThat(acquire).isCompletedWithValue("2");
+
+        assertThat(pool.getIdle()).isEqualTo(0);
+        assertThat(pool.getObjectCount()).isEqualTo(1);
+        assertThat(pool.getCreationInProgress()).isZero();
+    }
+
+    @Test
+    public void shouldTestObjectOnReturnSuccessfully() {
+
+        mockCreation();
+        when(factory.validate(any())).thenReturn(CompletableFuture.completedFuture(true));
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnRelease().build());
+
+        CompletableFuture<Void> release = pool.release(pool.acquire().join());
+
+        assertThat(pool.getIdle()).isEqualTo(1);
+        assertThat(pool.getObjectCount()).isEqualTo(1);
+        assertThat(pool.getCreationInProgress()).isZero();
+
+        CompletableFuture<String> acquire = pool.acquire();
+
+        assertThat(acquire).isCompletedWithValue("1");
+    }
+
+    @Test
+    public void shouldTestObjectOnReturnFailState() {
+
+        mockCreation();
+        when(factory.validate(any())).thenReturn(failed(new RedisException("foo")));
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnRelease().build());
+
+        CompletableFuture<Void> release = pool.release(pool.acquire().join());
+
+        assertThat(pool.getIdle()).isZero();
+        assertThat(pool.getObjectCount()).isZero();
+        assertThat(pool.getCreationInProgress()).isZero();
+
+        assertThat(release).isCompletedWithValue(null);
+    }
+
+    @Test
+    public void shouldTestObjectOnReturnFailExceptionally() {
+
+        mockCreation();
+        when(factory.validate(any())).thenReturn(failed(new RedisException("foo")));
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnRelease().build());
+
+        CompletableFuture<Void> release = pool.release(pool.acquire().join());
+
+        assertThat(pool.getIdle()).isZero();
+        assertThat(pool.getObjectCount()).isZero();
+        assertThat(pool.getCreationInProgress()).isZero();
+
+        assertThat(release).isCompletedWithValue(null);
+    }
+
+    @Test
+    public void shouldRefillIdleObjects() {
+
+        mockCreation();
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().maxTotal(20).minIdle(5)
+                .build());
+
+        assertThat(pool.getIdle()).isEqualTo(5);
+
+        pool.acquire();
+
+        assertThat(pool.getIdle()).isEqualTo(5);
+        assertThat(pool.getObjectCount()).isEqualTo(6);
+
+        verify(factory, times(6)).create();
+    }
+
+    @Test
+    public void shouldDisposeIdleObjects() {
+
+        mockCreation();
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().maxTotal(20).maxIdle(5)
+                .minIdle(5).build());
+
+        assertThat(pool.getIdle()).isEqualTo(5);
+
+        String object = pool.acquire().join();
+        pool.release(object);
+
+        assertThat(pool.getIdle()).isEqualTo(5);
+
+        verify(factory).destroy(object);
+    }
+}
diff --git a/src/test/java/io/lettuce/core/support/BoundedAsyncPoolTest.java b/src/test/java/io/lettuce/core/support/BoundedAsyncPoolTest.java
new file mode 100644
index 0000000000..f2c7bfb63c
--- /dev/null
+++ b/src/test/java/io/lettuce/core/support/BoundedAsyncPoolTest.java
@@ -0,0 +1,291 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.support;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Test;
+
+/**
+ * @author Mark Paluch
+ */
+public class BoundedAsyncPoolTest {
+
+    AtomicInteger counter = new AtomicInteger();
+    List<String> destroyed = new ArrayList<>();
+
+    private AsyncObjectFactory<String> STRING_OBJECT_FACTORY = new AsyncObjectFactory<String>() {
+        @Override
+        public CompletableFuture<String> create() {
+            return CompletableFuture.completedFuture(counter.incrementAndGet() + "");
+        }
+
+        @Override
+        public CompletableFuture<Void> destroy(String object) {
+            destroyed.add(object);
+            return CompletableFuture.completedFuture(null);
+        }
+
+        @Override
+        public CompletableFuture<Boolean> validate(String object) {
+            return CompletableFuture.completedFuture(true);
+        }
+    };
+
+    @Test
+    public void shouldCreateObject() {
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.create());
+
+        String object = pool.acquire().join();
+
+        assertThat(pool.getIdle()).isEqualTo(0);
+        assertThat(object).isEqualTo("1");
+    }
+
+    @Test
+    public void shouldCreateMinIdleObject() {
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.builder().minIdle(2)
+                .build());
+
+        assertThat(pool.getIdle()).isEqualTo(2);
+        assertThat(pool.getObjectCount()).isEqualTo(2);
+    }
+
+    @Test
+    public void shouldCreateMaintainMinIdleObject() {
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.builder().minIdle(2)
+                .build());
+
+        pool.acquire().join();
+
+        assertThat(pool.getIdle()).isEqualTo(2);
+        assertThat(pool.getObjectCount()).isEqualTo(3);
+    }
+
+    @Test
+    public void shouldCreateMaintainMinMaxIdleObject() {
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.builder().minIdle(2)
+                .maxTotal(2).build());
+
+        pool.acquire().join();
+
+        assertThat(pool.getIdle()).isEqualTo(1);
+        assertThat(pool.getObjectCount()).isEqualTo(2);
+    }
+
+    @Test
+    public void shouldReturnObject() {
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.create());
+
+        String object = pool.acquire().join();
+        assertThat(pool.getObjectCount()).isEqualTo(1);
+        pool.release(object);
+
+        assertThat(pool.getIdle()).isEqualTo(1);
+    }
+
+    @Test
+    public void shouldReuseObjects() {
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.create());
+
+        pool.release(pool.acquire().join());
+
+        assertThat(pool.acquire().join()).isEqualTo("1");
+        assertThat(pool.getIdle()).isEqualTo(0);
+    }
+
+    @Test
+    public void shouldDestroyIdle() {
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.builder().maxIdle(2)
+                .maxTotal(5).build());
+
+        List<String> objects = new ArrayList<>();
+        for (int i = 0; i < 3; i++) {
+            objects.add(pool.acquire().join());
+        }
+
+        for (int i = 0; i < 2; i++) {
+            pool.release(objects.get(i));
+        }
+
+        assertThat(pool.getIdle()).isEqualTo(2);
+
+        pool.release(objects.get(2));
+
+        assertThat(pool.getIdle()).isEqualTo(2);
+        assertThat(pool.getObjectCount()).isEqualTo(2);
+        assertThat(destroyed).containsOnly("3");
+    }
+
+    @Test
+    public void shouldExhaustPool() {
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.builder().maxTotal(4)
+                .build());
+
+        String object1 = pool.acquire().join();
+        String object2 = pool.acquire().join();
+        String object3 = pool.acquire().join();
+        String object4 = pool.acquire().join();
+
+        assertThat(pool.getIdle()).isZero();
+        assertThat(pool.getObjectCount()).isEqualTo(4);
+
+        assertThat(pool.acquire()).isCompletedExceptionally();
+
+        assertThat(pool.getIdle()).isZero();
+        assertThat(pool.getObjectCount()).isEqualTo(4);
+
+        pool.release(object1);
+        pool.release(object2);
+        pool.release(object3);
+        pool.release(object4);
+
+        assertThat(pool.getIdle()).isEqualTo(4);
+        assertThat(pool.getObjectCount()).isEqualTo(4);
+    }
+
+    @Test
+    public void shouldClearPool() {
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.builder().maxTotal(4)
+                .build());
+
+        for (int i = 0; i < 20; i++) {
+
+            String object1 = pool.acquire().join();
+            String object2 = pool.acquire().join();
+            String object3 = pool.acquire().join();
+            String object4 = pool.acquire().join();
+
+            assertThat(pool.acquire()).isCompletedExceptionally();
+
+            pool.release(object1);
+            pool.release(object2);
+            pool.release(object3);
+            pool.release(object4);
+
+            pool.clear();
+
+            assertThat(pool.getObjectCount()).isZero();
+            assertThat(pool.getIdle()).isZero();
+        }
+    }
+
+    @Test
+    public void shouldExhaustPoolConcurrent() {
+
+        List<CompletableFuture<String>> progress = new ArrayList<>();
+        AsyncObjectFactory<String> IN_PROGRESS = new AsyncObjectFactory<String>() {
+            @Override
+            public CompletableFuture<String> create() {
+
+                CompletableFuture<String> future = new CompletableFuture<>();
+                progress.add(future);
+
+                return future;
+            }
+
+            @Override
+            public CompletableFuture<Void> destroy(String object) {
+                destroyed.add(object);
+                return CompletableFuture.completedFuture(null);
+            }
+
+            @Override
+            public CompletableFuture<Boolean> validate(String object) {
+                return CompletableFuture.completedFuture(true);
+            }
+        };
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(IN_PROGRESS, BoundedPoolConfig.builder().maxTotal(4).build());
+
+        CompletableFuture<String> object1 = pool.acquire();
+        CompletableFuture<String> object2 = pool.acquire();
+        CompletableFuture<String> object3 = pool.acquire();
+        CompletableFuture<String> object4 = pool.acquire();
+        CompletableFuture<String> object5 = pool.acquire();
+
+        assertThat(pool.getIdle()).isZero();
+        assertThat(pool.getObjectCount()).isZero();
+        assertThat(pool.getCreationInProgress()).isEqualTo(4);
+
+        assertThat(object5).isCompletedExceptionally();
+
+        progress.forEach(it -> it.complete("foo"));
+
+        assertThat(pool.getIdle()).isZero();
+        assertThat(pool.getObjectCount()).isEqualTo(4);
+        assertThat(pool.getCreationInProgress()).isZero();
+    }
+
+    @Test
+    public void shouldConcurrentlyFail() {
+
+        List<CompletableFuture<String>> progress = new ArrayList<>();
+        AsyncObjectFactory<String> IN_PROGRESS = new AsyncObjectFactory<String>() {
+            @Override
+            public CompletableFuture<String> create() {
+
+                CompletableFuture<String> future = new CompletableFuture<>();
+                progress.add(future);
+
+                return future;
+            }
+
+            @Override
+            public CompletableFuture<Void> destroy(String object) {
+                destroyed.add(object);
+                return CompletableFuture.completedFuture(null);
+            }
+
+            @Override
+            public CompletableFuture<Boolean> validate(String object) {
+                return CompletableFuture.completedFuture(true);
+            }
+        };
+
+        BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(IN_PROGRESS, BoundedPoolConfig.builder().maxTotal(4).build());
+
+        CompletableFuture<String> object1 = pool.acquire();
+        CompletableFuture<String> object2 = pool.acquire();
+        CompletableFuture<String> object3 = pool.acquire();
+        CompletableFuture<String> object4 = pool.acquire();
+
+        progress.forEach(it -> it.completeExceptionally(new IllegalStateException()));
+
+        assertThat(object1).isCompletedExceptionally();
+        assertThat(object2).isCompletedExceptionally();
+        assertThat(object3).isCompletedExceptionally();
+        assertThat(object4).isCompletedExceptionally();
+
+        assertThat(pool.getIdle()).isZero();
+        assertThat(pool.getObjectCount()).isZero();
+        assertThat(pool.getCreationInProgress()).isZero();
+    }
+}
diff --git a/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java b/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
index 5c01d2105d..030e208c9a 100644
--- a/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
+++ b/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
@@ -26,7 +26,8 @@
  */
 public class EmptyRedisChannelWriter implements RedisChannelWriter {
 
-    public final static EmptyRedisChannelWriter INSTANCE = new EmptyRedisChannelWriter();
+    public static final EmptyRedisChannelWriter INSTANCE = new EmptyRedisChannelWriter();
+    private static final CompletableFuture CLOSE_FUTURE = CompletableFuture.completedFuture(null);
 
     @Override
     public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
@@ -45,7 +46,7 @@ public void close() {
 
     @Override
     public CompletableFuture<Void> closeAsync() {
-        return null;
+        return CLOSE_FUTURE;
     }
 
     @Override
diff --git a/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java b/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
index 717f2ac817..bc54a90411 100644
--- a/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
+++ b/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
@@ -31,7 +31,7 @@
  */
 public class EmptyStatefulRedisConnection extends RedisChannelHandler implements StatefulRedisConnection, ConnectionFacade {
 
-    public final static EmptyStatefulRedisConnection INSTANCE = new EmptyStatefulRedisConnection(
+    public static final EmptyStatefulRedisConnection INSTANCE = new EmptyStatefulRedisConnection(
             EmptyRedisChannelWriter.INSTANCE);
 
     public EmptyStatefulRedisConnection(RedisChannelWriter writer) {
diff --git a/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
index 1e7d742199..c96fddbd18 100644
--- a/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
@@ -44,9 +44,9 @@
 @State(Scope.Benchmark)
 public class RedisClientBenchmark {
 
-    private final static int BATCH_SIZE = 20;
-    private final static byte[] KEY = "benchmark".getBytes();
-    private final static byte[] FOO = "foo".getBytes();
+    private static final int BATCH_SIZE = 20;
+    private static final byte[] KEY = "benchmark".getBytes();
+    private static final byte[] FOO = "foo".getBytes();
 
     private RedisClient redisClient;
     private StatefulRedisConnection<byte[], byte[]> connection;
diff --git a/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
index 7b4a9d0608..d1757ede72 100644
--- a/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
@@ -44,24 +44,24 @@
 @State(Scope.Benchmark)
 public class ClusterDistributionChannelWriterBenchmark {
 
-    private final static ClientOptions CLIENT_OPTIONS = ClientOptions.create();
-    private final static RedisChannelWriter EMPTY_WRITER = EmptyRedisChannelWriter.INSTANCE;
-    private final static EmptyStatefulRedisConnection CONNECTION = EmptyStatefulRedisConnection.INSTANCE;
+    private static final ClientOptions CLIENT_OPTIONS = ClientOptions.create();
+    private static final RedisChannelWriter EMPTY_WRITER = EmptyRedisChannelWriter.INSTANCE;
+    private static final EmptyStatefulRedisConnection CONNECTION = EmptyStatefulRedisConnection.INSTANCE;
     private static final ValueOutput<byte[], byte[]> VALUE_OUTPUT = new ValueOutput<>(ByteArrayCodec.INSTANCE);
 
-    private final static Command<byte[], byte[], byte[]> KEYED_COMMAND1 = new Command<>(CommandType.GET, VALUE_OUTPUT,
+    private static final Command<byte[], byte[], byte[]> KEYED_COMMAND1 = new Command<>(CommandType.GET, VALUE_OUTPUT,
             new CommandArgs<>(ByteArrayCodec.INSTANCE).addKey("benchmark1".getBytes()));
 
-    private final static Command<byte[], byte[], byte[]> KEYED_COMMAND2 = new Command<>(CommandType.GET, VALUE_OUTPUT,
+    private static final Command<byte[], byte[], byte[]> KEYED_COMMAND2 = new Command<>(CommandType.GET, VALUE_OUTPUT,
             new CommandArgs<>(ByteArrayCodec.INSTANCE).addKey("benchmark2".getBytes()));
 
-    private final static Command<byte[], byte[], byte[]> KEYED_COMMAND3 = new Command<>(CommandType.GET, VALUE_OUTPUT,
+    private static final Command<byte[], byte[], byte[]> KEYED_COMMAND3 = new Command<>(CommandType.GET, VALUE_OUTPUT,
             new CommandArgs<>(ByteArrayCodec.INSTANCE).addKey("benchmark3".getBytes()));
 
-    private final static Command<byte[], byte[], byte[]> PLAIN_COMMAND = new Command<>(CommandType.GET, VALUE_OUTPUT,
+    private static final Command<byte[], byte[], byte[]> PLAIN_COMMAND = new Command<>(CommandType.GET, VALUE_OUTPUT,
             new CommandArgs<>(ByteArrayCodec.INSTANCE));
 
-    private final static List<Command<byte[], byte[], byte[]>> COMMANDS = Arrays.asList(KEYED_COMMAND1, KEYED_COMMAND2,
+    private static final List<Command<byte[], byte[], byte[]>> COMMANDS = Arrays.asList(KEYED_COMMAND1, KEYED_COMMAND2,
             KEYED_COMMAND3);
 
     private ClusterDistributionChannelWriter writer;
diff --git a/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
index 5553d103fa..7631e8f6e1 100644
--- a/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
@@ -19,7 +19,6 @@
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.TestSettings;
@@ -43,8 +42,8 @@
 @State(Scope.Benchmark)
 public class RedisClusterClientBenchmark {
 
-    private final static int BATCH_SIZE = 20;
-    private final static byte[] KEY = "benchmark".getBytes();
+    private static final int BATCH_SIZE = 20;
+    private static final byte[] KEY = "benchmark".getBytes();
 
     private RedisClusterClient redisClusterClient;
     private StatefulRedisClusterConnection<byte[], byte[]> connection;
diff --git a/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java
index fc85107a2a..49aabc0144 100644
--- a/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java
@@ -28,13 +28,13 @@
 @State(Scope.Benchmark)
 public class SlotHashBenchmark {
 
-    private final static byte[] data = "this is my buffer".getBytes();
-    private final static byte[] tagged = "this is{my buffer}".getBytes();
-    private final static ByteBuffer heap = (ByteBuffer) ByteBuffer.allocate(data.length).put(data).flip();
-    private final static ByteBuffer direct = (ByteBuffer) ByteBuffer.allocateDirect(data.length).put(data).flip();
+    private static final byte[] data = "this is my buffer".getBytes();
+    private static final byte[] tagged = "this is{my buffer}".getBytes();
+    private static final ByteBuffer heap = (ByteBuffer) ByteBuffer.allocate(data.length).put(data).flip();
+    private static final ByteBuffer direct = (ByteBuffer) ByteBuffer.allocateDirect(data.length).put(data).flip();
 
-    private final static ByteBuffer heapTagged = (ByteBuffer) ByteBuffer.allocate(tagged.length).put(tagged).flip();
-    private final static ByteBuffer directTagged = (ByteBuffer) ByteBuffer.allocateDirect(tagged.length).put(tagged).flip();
+    private static final ByteBuffer heapTagged = (ByteBuffer) ByteBuffer.allocate(tagged.length).put(tagged).flip();
+    private static final ByteBuffer directTagged = (ByteBuffer) ByteBuffer.allocateDirect(tagged.length).put(tagged).flip();
 
     @Benchmark
     public void measureSlotHashHeap(Blackhole blackhole) {
diff --git a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
index 0aaedbcbd1..c653152693 100644
--- a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
@@ -35,7 +35,7 @@
 @State(Scope.Benchmark)
 public class RedisCommandsBenchmark {
 
-    private final static int BATCH_SIZE = 20;
+    private static final int BATCH_SIZE = 20;
 
     private RedisClient redisClient;
     private StatefulRedisConnection<byte[], byte[]> connection;
diff --git a/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
index 605b186765..643c58251f 100644
--- a/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
@@ -40,13 +40,13 @@
 @State(Scope.Benchmark)
 public class CommandBenchmark {
 
-    private final static ByteArrayCodec BYTE_ARRAY_CODEC = new ByteArrayCodec();
-    private final static Utf8StringCodec OLD_STRING_CODEC = new Utf8StringCodec();
-    private final static StringCodec NEW_STRING_CODEC = new StringCodec(StandardCharsets.UTF_8);
-    private final static EmptyByteBuf DUMMY_BYTE_BUF = new EmptyByteBuf();
+    private static final ByteArrayCodec BYTE_ARRAY_CODEC = new ByteArrayCodec();
+    private static final Utf8StringCodec OLD_STRING_CODEC = new Utf8StringCodec();
+    private static final StringCodec NEW_STRING_CODEC = new StringCodec(StandardCharsets.UTF_8);
+    private static final EmptyByteBuf DUMMY_BYTE_BUF = new EmptyByteBuf();
 
-    private final static String KEY = "key";
-    private final static byte[] BYTE_KEY = "key".getBytes();
+    private static final String KEY = "key";
+    private static final byte[] BYTE_KEY = "key".getBytes();
 
     @Benchmark
     public void createCommandUsingByteArrayCodec(Blackhole blackhole) {
diff --git a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
index 64022e02be..f386dd91d8 100644
--- a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
@@ -35,10 +35,10 @@
 @State(Scope.Benchmark)
 public class CommandHandlerBenchmark {
 
-    private final static ByteArrayCodec CODEC = new ByteArrayCodec();
-    private final static ClientOptions CLIENT_OPTIONS = ClientOptions.create();
-    private final static EmptyContext CHANNEL_HANDLER_CONTEXT = new EmptyContext();
-    private final static byte[] KEY = "key".getBytes();
+    private static final ByteArrayCodec CODEC = new ByteArrayCodec();
+    private static final ClientOptions CLIENT_OPTIONS = ClientOptions.create();
+    private static final EmptyContext CHANNEL_HANDLER_CONTEXT = new EmptyContext();
+    private static final byte[] KEY = "key".getBytes();
     private final EmptyPromise PROMISE = new EmptyPromise();
 
     private CommandHandler commandHandler;
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java b/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
index c3b7194012..0669b5fe4d 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
@@ -35,7 +35,7 @@
  */
 class EmptyByteBuf extends ByteBuf {
 
-    private final static EmptyByteBuf INSTANCE = new EmptyByteBuf();
+    private static final EmptyByteBuf INSTANCE = new EmptyByteBuf();
 
     @Override
     public int capacity() {
diff --git a/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
index 00e8170ebf..fa32f4e3fd 100644
--- a/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
@@ -21,7 +21,6 @@
 import io.lettuce.core.EmptyStatefulRedisConnection;
 import io.lettuce.core.codec.ByteArrayCodec;
 import io.lettuce.core.output.ValueOutput;
-
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelPromise;
 import io.netty.channel.embedded.EmbeddedChannel;
@@ -39,10 +38,10 @@
 @State(Scope.Benchmark)
 public class RedisEndpointBenchmark {
 
-    private final static ByteArrayCodec CODEC = new ByteArrayCodec();
-    private final static ClientOptions CLIENT_OPTIONS = ClientOptions.create();
-    private final static byte[] KEY = "key".getBytes();
-    private final static ChannelFuture EMPTY = new EmptyFuture();
+    private static final ByteArrayCodec CODEC = new ByteArrayCodec();
+    private static final ClientOptions CLIENT_OPTIONS = ClientOptions.create();
+    private static final byte[] KEY = "key".getBytes();
+    private static final ChannelFuture EMPTY = new EmptyFuture();
 
     private DefaultEndpoint defaultEndpoint;
     private Command command;
@@ -67,7 +66,7 @@ public void measureUserWrite() {
         defaultEndpoint.write(command);
     }
 
-    private final static class MyLocalChannel extends EmbeddedChannel {
+    private static final class MyLocalChannel extends EmbeddedChannel {
         @Override
         public boolean isActive() {
             return true;
diff --git a/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
index a4d1456053..fd39c73985 100644
--- a/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
@@ -22,7 +22,6 @@
 
 import io.lettuce.core.codec.ByteArrayCodec;
 import io.lettuce.core.output.ArrayOutput;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
 
@@ -34,9 +33,9 @@
 @State(Scope.Benchmark)
 public class RedisStateMachineBenchmark {
 
-    private final static ByteArrayCodec BYTE_ARRAY_CODEC = new ByteArrayCodec();
+    private static final ByteArrayCodec BYTE_ARRAY_CODEC = new ByteArrayCodec();
 
-    private final static Command<byte[], byte[], List<Object>> byteArrayCommand = new Command<>(CommandType.GET,
+    private static final Command<byte[], byte[], List<Object>> byteArrayCommand = new Command<>(CommandType.GET,
             new ArrayOutput(BYTE_ARRAY_CODEC) {
 
                 @Override
diff --git a/src/test/jmh/io/lettuce/core/support/AsyncConnectionPoolBenchmark.java b/src/test/jmh/io/lettuce/core/support/AsyncConnectionPoolBenchmark.java
new file mode 100644
index 0000000000..d675590d3c
--- /dev/null
+++ b/src/test/jmh/io/lettuce/core/support/AsyncConnectionPoolBenchmark.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.support;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.openjdk.jmh.annotations.*;
+
+import io.lettuce.core.EmptyRedisChannelWriter;
+import io.lettuce.core.EmptyStatefulRedisConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+
+/**
+ * @author Mark Paluch
+ */
+@State(Scope.Benchmark)
+public class AsyncConnectionPoolBenchmark {
+
+    private AsyncPool<StatefulRedisConnection<String, String>> pool;
+    private StatefulRedisConnection[] holder = new StatefulRedisConnection[20];
+
+    @Setup
+    public void setup() {
+
+        BoundedPoolConfig config = BoundedPoolConfig.builder().minIdle(0).maxIdle(20).maxTotal(20).build();
+
+        pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
+                () -> CompletableFuture.completedFuture(new EmptyStatefulRedisConnection(EmptyRedisChannelWriter.INSTANCE)),
+                config);
+    }
+
+    @TearDown(Level.Iteration)
+    public void tearDown() {
+        pool.clear();
+    }
+
+    @Benchmark
+    public void singleConnection() {
+        pool.release(pool.acquire().join()).join();
+    }
+
+    @Benchmark
+    public void twentyConnections() {
+
+        for (int i = 0; i < holder.length; i++) {
+            holder[i] = pool.acquire().join();
+        }
+
+        for (int i = 0; i < holder.length; i++) {
+            pool.release(holder[i]).join();
+        }
+    }
+}
diff --git a/src/test/jmh/io/lettuce/core/support/GenericConnectionPoolBenchmark.java b/src/test/jmh/io/lettuce/core/support/GenericConnectionPoolBenchmark.java
new file mode 100644
index 0000000000..c6291130a0
--- /dev/null
+++ b/src/test/jmh/io/lettuce/core/support/GenericConnectionPoolBenchmark.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.support;
+
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+import org.openjdk.jmh.annotations.*;
+
+import io.lettuce.core.EmptyRedisChannelWriter;
+import io.lettuce.core.EmptyStatefulRedisConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+
+/**
+ * @author Mark Paluch
+ */
+@State(Scope.Benchmark)
+public class GenericConnectionPoolBenchmark {
+
+    private GenericObjectPool<StatefulRedisConnection<String, String>> pool;
+    private StatefulRedisConnection[] holder = new StatefulRedisConnection[20];
+
+    @Setup
+    public void setup() {
+
+        GenericObjectPoolConfig config = new GenericObjectPoolConfig();
+        config.setMinIdle(0);
+        config.setMaxIdle(20);
+        config.setMaxTotal(20);
+
+        pool = ConnectionPoolSupport.createGenericObjectPool(() -> new EmptyStatefulRedisConnection(
+                EmptyRedisChannelWriter.INSTANCE), config);
+    }
+
+    @TearDown(Level.Iteration)
+    public void tearDown() {
+        pool.clear();
+    }
+
+    @Benchmark
+    public void singleConnection() throws Exception {
+        pool.returnObject(pool.borrowObject());
+    }
+
+    @Benchmark
+    public void twentyConnections() throws Exception {
+
+        for (int i = 0; i < holder.length; i++) {
+            holder[i] = pool.borrowObject();
+        }
+
+        for (int i = 0; i < holder.length; i++) {
+            pool.returnObject(holder[i]);
+        }
+    }
+}
diff --git a/src/test/jmh/io/lettuce/core/support/JmhMain.java b/src/test/jmh/io/lettuce/core/support/JmhMain.java
new file mode 100644
index 0000000000..aadd78b301
--- /dev/null
+++ b/src/test/jmh/io/lettuce/core/support/JmhMain.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.support;
+
+import java.util.concurrent.TimeUnit;
+
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.ChainedOptionsBuilder;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+import org.openjdk.jmh.runner.options.TimeValue;
+
+/**
+ * Manual JMH Test Launcher.
+ *
+ * @author Mark Paluch
+ */
+public class JmhMain {
+
+    public static void main(String... args) throws RunnerException {
+
+        // run selectively
+        // runCommandBenchmark();
+        // runGenericConnectionPoolBenchmark();
+        runAsyncConnectionPoolBenchmark();
+    }
+
+    private static void runGenericConnectionPoolBenchmark() throws RunnerException {
+
+        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS)
+                .include(".*GenericConnectionPoolBenchmark.*").build()).run();
+
+        new Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS)
+                .include(".*GenericConnectionPoolBenchmark.*").build()).run();
+    }
+
+    private static void runAsyncConnectionPoolBenchmark() throws RunnerException {
+
+        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS)
+                .include(".*AsyncConnectionPoolBenchmark.*").build()).run();
+
+        new Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS)
+                .include(".*AsyncConnectionPoolBenchmark.*").build()).run();
+    }
+
+    private static ChainedOptionsBuilder prepareOptions() {
+        return new OptionsBuilder().forks(1).warmupIterations(5).threads(1).measurementIterations(5)
+                .timeout(TimeValue.seconds(2));
+    }
+}

From bbf83aca86b2a1f8df5cad92410d6960c8b92730 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 12 Dec 2017 15:15:01 +0100
Subject: [PATCH 380/808] Refactor MasterSlave to asynchronous connect #643

MasterSlave now exposes asynchronous connect methods to establish connection and fetch topology without blocking.

RedisClient redisClient = RedisClient.create();

List<RedisURI> nodes = Arrays.asList(RedisURI.create("redis://host1"),
        RedisURI.create("redis://host2"),
        RedisURI.create("redis://host3"));

CompletableFuture<StatefulRedisMasterSlaveConnection<String, String>> connectFuture = MasterSlave
        .connectAsync(redisClient, StringCodec.UTF8, nodes);
---
 .../io/lettuce/core/ConnectionFuture.java     |  12 +
 .../io/lettuce/core/RedisChannelHandler.java  |   9 +-
 .../java/io/lettuce/core/RedisClient.java     |  56 ++--
 .../core/cluster/RedisClusterClient.java      |  44 +--
 .../internal/AsyncConnectionProvider.java     |  19 ++
 .../core/masterslave/AsyncConnections.java    |  54 ++--
 .../masterslave/AutodiscoveryConnector.java   | 158 +++++++++++
 .../CompletableEventLatchSupport.java         | 189 +++++++++++++
 .../lettuce/core/masterslave/Connections.java |  97 +++++--
 .../lettuce/core/masterslave/Exceptions.java  |  60 ++++
 .../lettuce/core/masterslave/MasterSlave.java | 256 ++++++------------
 .../masterslave/MasterSlaveChannelWriter.java |  69 ++++-
 .../MasterSlaveConnectionProvider.java        | 170 ++++++++----
 .../masterslave/MasterSlaveConnector.java     |  36 +++
 .../MasterSlaveTopologyProvider.java          |  24 +-
 .../MasterSlaveTopologyRefresh.java           | 102 +++----
 .../core/masterslave/RefreshFutures.java      |  64 -----
 .../io/lettuce/core/masterslave/Requests.java |  57 +++-
 .../lettuce/core/masterslave/ResumeAfter.java |  85 ++++++
 .../core/masterslave/SentinelConnector.java   | 123 +++++++++
 .../masterslave/SentinelTopologyProvider.java |  53 ++--
 .../masterslave/SentinelTopologyRefresh.java  | 183 ++++++++++---
 .../SentinelTopologyRefreshConnections.java   |  65 +++++
 ...tatefulRedisMasterSlaveConnectionImpl.java |   6 +-
 .../StaticMasterSlaveConnector.java           |  87 ++++++
 .../StaticMasterSlaveTopologyProvider.java    |  90 +++---
 .../core/masterslave/TopologyProvider.java    |  16 +-
 .../MasterSlaveConnectionProviderTest.java    |   3 +-
 .../core/masterslave/MasterSlaveTest.java     |   4 +-
 .../MasterSlaveTopologyRefreshTest.java       |  20 +-
 .../SentinelTopologyRefreshTest.java          |  69 +++--
 .../masterslave/StaticMasterSlaveTest.java    |   4 +-
 32 files changed, 1684 insertions(+), 600 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
 create mode 100644 src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
 create mode 100644 src/main/java/io/lettuce/core/masterslave/Exceptions.java
 create mode 100644 src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java
 delete mode 100644 src/main/java/io/lettuce/core/masterslave/RefreshFutures.java
 create mode 100644 src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
 create mode 100644 src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
 create mode 100644 src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java
 create mode 100644 src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java

diff --git a/src/main/java/io/lettuce/core/ConnectionFuture.java b/src/main/java/io/lettuce/core/ConnectionFuture.java
index a0b824aa7c..99292b8a20 100644
--- a/src/main/java/io/lettuce/core/ConnectionFuture.java
+++ b/src/main/java/io/lettuce/core/ConnectionFuture.java
@@ -45,6 +45,18 @@ static <T> ConnectionFuture<T> from(SocketAddress remoteAddress, CompletableFutu
         return new DefaultConnectionFuture<>(remoteAddress, delegate);
     }
 
+    /**
+     * Create a completed {@link ConnectionFuture} given {@link SocketAddress} and {@code value} holding the value.
+     *
+     * @param remoteAddress initial connection endpoint, must not be {@literal null}.
+     * @param value must not be {@literal null}.
+     * @return the {@link ConnectionFuture} for {@link SocketAddress} and {@code value}.
+     * @since 5.1
+     */
+    static <T> ConnectionFuture<T> completed(SocketAddress remoteAddress, T value) {
+        return new DefaultConnectionFuture<>(remoteAddress, CompletableFuture.completedFuture(value));
+    }
+
     /**
      * Waits if necessary for the computation to complete, and then retrieves its result.
      *
diff --git a/src/main/java/io/lettuce/core/RedisChannelHandler.java b/src/main/java/io/lettuce/core/RedisChannelHandler.java
index 23f2c44bd5..6523085c83 100644
--- a/src/main/java/io/lettuce/core/RedisChannelHandler.java
+++ b/src/main/java/io/lettuce/core/RedisChannelHandler.java
@@ -26,6 +26,7 @@
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
 import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.internal.AsyncCloseable;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.CommandExpiryWriter;
 import io.lettuce.core.protocol.ConnectionFacade;
@@ -120,7 +121,7 @@ public void close() {
 
     /**
      * Close the connection (asynchronous).
-     * 
+     *
      * @since 5.1
      */
     public CompletableFuture<Void> closeAsync() {
@@ -192,7 +193,11 @@ public void registerCloseables(final Collection<Closeable> registry, Closeable..
                 }
 
                 try {
-                    closeable.close();
+                    if (closeable instanceof AsyncCloseable) {
+                        ((AsyncCloseable) closeable).closeAsync();
+                    } else {
+                        closeable.close();
+                    }
                 } catch (IOException e) {
                     if (debugEnabled) {
                         logger.debug(e.toString(), e);
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index c6ee35d882..c6d82d0ce8 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -31,10 +31,8 @@
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.protocol.CommandExpiryWriter;
-import io.lettuce.core.protocol.CommandHandler;
-import io.lettuce.core.protocol.DefaultEndpoint;
-import io.lettuce.core.protocol.Endpoint;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.*;
 import io.lettuce.core.pubsub.PubSubCommandHandler;
 import io.lettuce.core.pubsub.PubSubEndpoint;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
@@ -279,7 +277,7 @@ private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandalone
         }
 
         StatefulRedisConnectionImpl<K, V> connection = newStatefulRedisConnection(writer, codec, timeout);
-        ConnectionFuture<StatefulRedisConnection<K, V>> future = connectStatefulAsync(connection, endpoint, redisURI,
+        ConnectionFuture<StatefulRedisConnection<K, V>> future = connectStatefulAsync(connection, codec, endpoint, redisURI,
                 () -> new CommandHandler(clientOptions, clientResources, endpoint));
 
         future.whenComplete((channelHandler, throwable) -> {
@@ -293,7 +291,8 @@ private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandalone
     }
 
     @SuppressWarnings("unchecked")
-    private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnectionImpl<K, V> connection, Endpoint endpoint,
+    private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnectionImpl<K, V> connection,
+            RedisCodec<K, V> codec, Endpoint endpoint,
             RedisURI redisURI, Supplier<CommandHandler> commandHandlerSupplier) {
 
         ConnectionBuilder connectionBuilder;
@@ -322,19 +321,19 @@ private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnecti
         }
 
         ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
+        ConnectionFuture<?> sync = future;
 
         if (!clientOptions.isPingBeforeActivateConnection() && hasPassword(redisURI)) {
 
-            future = future.thenApplyAsync(channelHandler -> {
+            sync = sync.thenCompose(channelHandler -> {
 
-                connection.async().auth(new String(redisURI.getPassword()));
-
-                return channelHandler;
-            }, clientResources.eventExecutorGroup());
+                CommandArgs<K, V> args = new CommandArgs<>(codec).add(redisURI.getPassword());
+                return connection.async().dispatch(CommandType.AUTH, new StatusOutput<>(codec), args);
+            });
         }
 
         if (LettuceStrings.isNotEmpty(redisURI.getClientName())) {
-            future.thenApply(channelHandler -> {
+            sync = sync.thenApply(channelHandler -> {
                 connection.setClientName(redisURI.getClientName());
                 return channelHandler;
             });
@@ -342,15 +341,14 @@ private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnecti
 
         if (redisURI.getDatabase() != 0) {
 
-            future = future.thenApplyAsync(channelHandler -> {
+            sync = sync.thenCompose(channelHandler -> {
 
-                connection.async().select(redisURI.getDatabase());
-
-                return channelHandler;
-            }, clientResources.eventExecutorGroup());
+                CommandArgs<K, V> args = new CommandArgs<>(codec).add(redisURI.getDatabase());
+                return connection.async().dispatch(CommandType.SELECT, new StatusOutput<>(codec), args);
+            });
         }
 
-        return future.thenApply(channelHandler -> (S) connection);
+        return sync.thenApply(channelHandler -> (S) connection);
     }
 
     private static boolean hasPassword(RedisURI redisURI) {
@@ -442,7 +440,8 @@ private <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubS
 
         StatefulRedisPubSubConnectionImpl<K, V> connection = newStatefulRedisPubSubConnection(endpoint, writer, codec, timeout);
 
-        ConnectionFuture<StatefulRedisPubSubConnection<K, V>> future = connectStatefulAsync(connection, endpoint, redisURI,
+        ConnectionFuture<StatefulRedisPubSubConnection<K, V>> future = connectStatefulAsync(connection, codec, endpoint,
+                redisURI,
                 () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec, endpoint));
 
         return future.whenComplete((conn, throwable) -> {
@@ -505,6 +504,25 @@ public <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K
         return getConnection(connectSentinelAsync(codec, redisURI, redisURI.getTimeout()));
     }
 
+    /**
+     * Open asynchronously a connection to a Redis Sentinel using the supplied {@link RedisURI} and use the supplied
+     * {@link RedisCodec codec} to encode/decode keys and values. The client {@link RedisURI} must contain one or more
+     * sentinels.
+     *
+     * @param codec the Redis server to connect to, must not be {@literal null}
+     * @param redisURI the Redis server to connect to, must not be {@literal null}
+     * @param <K> Key type
+     * @param <V> Value type
+     * @return A new connection
+     * @since 5.1
+     */
+    public <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectSentinelAsync(RedisCodec<K, V> codec,
+            RedisURI redisURI) {
+
+        assertNotNull(redisURI);
+        return connectSentinelAsync(codec, redisURI, redisURI.getTimeout());
+    }
+
     private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectSentinelAsync(RedisCodec<K, V> codec,
             RedisURI redisURI, Duration timeout) {
 
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 3e6eb30f68..5223e9b688 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -50,9 +50,8 @@
 import io.lettuce.core.internal.LettuceLists;
 import io.lettuce.core.models.command.CommandDetailParser;
 import io.lettuce.core.output.KeyValueStreamingChannel;
-import io.lettuce.core.protocol.CommandExpiryWriter;
-import io.lettuce.core.protocol.CommandHandler;
-import io.lettuce.core.protocol.DefaultEndpoint;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.*;
 import io.lettuce.core.pubsub.PubSubCommandHandler;
 import io.lettuce.core.pubsub.PubSubEndpoint;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
@@ -498,7 +497,7 @@ <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisC
 
         StatefulRedisConnectionImpl<K, V> connection = new StatefulRedisConnectionImpl<K, V>(writer, codec, timeout);
 
-        ConnectionFuture<StatefulRedisConnection<K, V>> connectionFuture = connectStatefulAsync(connection, endpoint,
+        ConnectionFuture<StatefulRedisConnection<K, V>> connectionFuture = connectStatefulAsync(connection, codec, endpoint,
                 getFirstUri(), socketAddressSupplier, () -> new CommandHandler(clientOptions, clientResources, endpoint));
 
         return connectionFuture.whenComplete((conn, throwable) -> {
@@ -539,7 +538,8 @@ <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNode
         StatefulRedisPubSubConnectionImpl<K, V> connection = new StatefulRedisPubSubConnectionImpl<>(endpoint, writer, codec,
                 timeout);
 
-        ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectionFuture = connectStatefulAsync(connection, endpoint,
+        ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectionFuture = connectStatefulAsync(connection, codec,
+                endpoint,
                 getFirstUri(), socketAddressSupplier, () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec,
                         endpoint));
         return connectionFuture.whenComplete((conn, throwable) -> {
@@ -593,10 +593,11 @@ private <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectCl
         Supplier<CommandHandler> commandHandlerSupplier = () -> new CommandHandler(clientOptions, clientResources, endpoint);
 
         Mono<StatefulRedisClusterConnectionImpl<K, V>> connectionMono = Mono.defer(() -> connect(socketAddressSupplier,
+ codec,
                 endpoint, connection, commandHandlerSupplier));
 
         for (int i = 1; i < getConnectionAttempts(); i++) {
-            connectionMono = connectionMono.onErrorResume(t -> connect(socketAddressSupplier, endpoint, connection,
+            connectionMono = connectionMono.onErrorResume(t -> connect(socketAddressSupplier, codec, endpoint, connection,
                     commandHandlerSupplier));
         }
 
@@ -610,10 +611,11 @@ private <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectCl
                 .map(it -> (StatefulRedisClusterConnection<K, V>) it).toFuture();
     }
 
-    private <T, K, V> Mono<T> connect(Mono<SocketAddress> socketAddressSupplier, DefaultEndpoint endpoint,
+    private <T, K, V> Mono<T> connect(Mono<SocketAddress> socketAddressSupplier, RedisCodec<K, V> codec,
+            DefaultEndpoint endpoint,
             RedisChannelHandler<K, V> connection, Supplier<CommandHandler> commandHandlerSupplier) {
 
-        ConnectionFuture<T> future = connectStatefulAsync(connection, endpoint, getFirstUri(), socketAddressSupplier,
+        ConnectionFuture<T> future = connectStatefulAsync(connection, codec, endpoint, getFirstUri(), socketAddressSupplier,
                 commandHandlerSupplier);
 
         return Mono.fromCompletionStage(future).doOnError(t -> logger.warn(t.getMessage()));
@@ -664,10 +666,10 @@ private <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> con
                 codec, endpoint);
 
         Mono<StatefulRedisClusterPubSubConnectionImpl<K, V>> connectionMono = Mono.defer(() -> connect(socketAddressSupplier,
-                endpoint, connection, commandHandlerSupplier));
+                codec, endpoint, connection, commandHandlerSupplier));
 
         for (int i = 1; i < getConnectionAttempts(); i++) {
-            connectionMono = connectionMono.onErrorResume(t -> connect(socketAddressSupplier, endpoint, connection,
+            connectionMono = connectionMono.onErrorResume(t -> connect(socketAddressSupplier, codec, endpoint, connection,
                     commandHandlerSupplier));
         }
 
@@ -690,6 +692,7 @@ private int getConnectionAttempts() {
      * options.
      */
     private <K, V, T extends RedisChannelHandler<K, V>, S> ConnectionFuture<S> connectStatefulAsync(T connection,
+            RedisCodec<K, V> codec,
             DefaultEndpoint endpoint, RedisURI connectionSettings, Mono<SocketAddress> socketAddressSupplier,
             Supplier<CommandHandler> commandHandlerSupplier) {
 
@@ -705,26 +708,31 @@ private <K, V, T extends RedisChannelHandler<K, V>, S> ConnectionFuture<S> conne
         }
 
         ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
+        ConnectionFuture<?> sync = future;
 
         if (!clientOptions.isPingBeforeActivateConnection() && hasPassword(connectionSettings)) {
-            future = future.thenApplyAsync(channelHandler -> {
+
+            sync = sync.thenCompose(channelHandler -> {
+
+                CommandArgs<K, V> args = new CommandArgs<>(codec).add(connectionSettings.getPassword());
+                AsyncCommand<K, V, String> command = new AsyncCommand<>(new Command<>(CommandType.AUTH, new StatusOutput<>(
+                        codec), args));
 
                 if (connection instanceof StatefulRedisClusterConnectionImpl) {
-                    ((StatefulRedisClusterConnectionImpl) connection).async()
-                            .auth(new String(connectionSettings.getPassword()));
+                    ((StatefulRedisClusterConnectionImpl) connection).dispatch(command);
                 }
 
                 if (connection instanceof StatefulRedisConnectionImpl) {
-                    ((StatefulRedisConnectionImpl) connection).async().auth(new String(connectionSettings.getPassword()));
+                    ((StatefulRedisConnectionImpl) connection).dispatch(command);
                 }
 
-                return channelHandler;
-            }, clientResources.eventExecutorGroup());
+                return command;
+            });
 
         }
 
         if (LettuceStrings.isNotEmpty(connectionSettings.getClientName())) {
-            future = future.thenApply(channelHandler -> {
+            sync = sync.thenApply(channelHandler -> {
 
                 if (connection instanceof StatefulRedisClusterConnectionImpl) {
                     ((StatefulRedisClusterConnectionImpl) connection).setClientName(connectionSettings.getClientName());
@@ -737,7 +745,7 @@ private <K, V, T extends RedisChannelHandler<K, V>, S> ConnectionFuture<S> conne
             });
         }
 
-        return future.thenApply(channelHandler -> (S) connection);
+        return sync.thenApply(channelHandler -> (S) connection);
     }
 
     private boolean hasPassword(RedisURI connectionSettings) {
diff --git a/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java b/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
index ccc3cb4859..94d6eae0db 100644
--- a/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
@@ -118,6 +118,16 @@ private Sync<K, T, F> getSynchronizer(K key) {
         return sync;
     }
 
+    /**
+     * Register a connection identified by {@code key}. Overwrites existing entries.
+     *
+     * @param key the connection {@code key}.
+     * @param connection the connection object.
+     */
+    public void register(K key, T connection) {
+        connections.put(key, new Sync<>(key, connection));
+    }
+
     /**
      * @return number of established connections.
      */
@@ -232,6 +242,15 @@ public Sync(K key, F future) {
             });
         }
 
+        @SuppressWarnings("unchecked")
+        public Sync(K key, T value) {
+
+            this.key = key;
+            this.connection = value;
+            this.future = (F) CompletableFuture.completedFuture(value);
+            PHASE.set(this, PHASE_COMPLETE);
+        }
+
         public void cancel() {
             future.toCompletableFuture().cancel(false);
             doWithConnection(AsyncCloseable::closeAsync);
diff --git a/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java b/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
index bcd156719f..a63ccdbf29 100644
--- a/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
+++ b/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,28 +15,30 @@
  */
 package io.lettuce.core.masterslave;
 
-import java.util.ArrayList;
+import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.ScheduledExecutorService;
 
-import io.lettuce.core.RedisConnectionException;
+import reactor.core.publisher.Mono;
+import reactor.util.function.Tuples;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
  * @author Mark Paluch
  */
 class AsyncConnections {
 
-    private final Map<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> futures = new TreeMap<>(
+    private final Map<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> connections = new TreeMap<>(
             MasterSlaveUtils.RedisURIComparator.INSTANCE);
+    private final List<RedisNodeDescription> nodeList;
 
-    public AsyncConnections() {
+    AsyncConnections(List<RedisNodeDescription> nodeList) {
+        this.nodeList = nodeList;
     }
 
     /**
@@ -46,44 +48,28 @@ public AsyncConnections() {
      * @param connection
      */
     public void addConnection(RedisURI redisURI, CompletableFuture<StatefulRedisConnection<String, String>> connection) {
-        futures.put(redisURI, connection);
+        connections.put(redisURI, connection);
     }
 
-    /**
-     * @return the {@link Connections}.
-     * @throws RedisConnectionException if no connection could be established.
-     */
-    public Connections get(long timeout, TimeUnit timeUnit) throws InterruptedException {
+    public Mono<Connections> asMono(Duration timeout, ScheduledExecutorService timeoutExecutor) {
 
-        Connections connections = new Connections();
-        List<Throwable> exceptions = new CopyOnWriteArrayList<>();
-        List<Future<?>> sync = new ArrayList<>(this.futures.size());
+        Connections connections = new Connections(this.connections.size(), nodeList);
 
-        for (Map.Entry<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> entry : this.futures.entrySet()) {
+        for (Map.Entry<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> entry : this.connections
+                .entrySet()) {
 
             CompletableFuture<StatefulRedisConnection<String, String>> future = entry.getValue();
 
-            sync.add(future.whenComplete((connection, throwable) -> {
+            future.whenComplete((connection, throwable) -> {
 
                 if (throwable != null) {
-                    exceptions.add(throwable);
+                    connections.accept(throwable);
                 } else {
-                    connections.addConnection(entry.getKey(), connection);
+                    connections.accept(Tuples.of(entry.getKey(), connection));
                 }
-            }));
-        }
-
-        RefreshFutures.awaitAll(timeout, timeUnit, sync);
-
-        if (connections.isEmpty() && !sync.isEmpty() && !exceptions.isEmpty()) {
-
-            RedisConnectionException collector = new RedisConnectionException(
-                    "Unable to establish a connection to Redis Cluster");
-            exceptions.forEach(collector::addSuppressed);
-
-            throw collector;
+            });
         }
 
-        return connections;
+        return Mono.fromCompletionStage(connections.getOrTimeout(timeout, timeoutExecutor));
     }
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java b/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
new file mode 100644
index 0000000000..0d417bf34e
--- /dev/null
+++ b/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterslave;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Predicate;
+
+import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
+import reactor.util.function.Tuples;
+import io.lettuce.core.ConnectionFuture;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.models.role.RedisInstance;
+import io.lettuce.core.models.role.RedisNodeDescription;
+
+/**
+ * {@link MasterSlaveConnector} to connect unmanaged Redis Master/Slave with auto-discovering master and slave nodes from a
+ * single {@link RedisURI}.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+class AutodiscoveryConnector<K, V> implements MasterSlaveConnector<K, V> {
+
+    private final RedisClient redisClient;
+    private final RedisCodec<K, V> codec;
+    private final RedisURI redisURI;
+
+    private final Map<RedisURI, StatefulRedisConnection<?, ?>> initialConnections = new ConcurrentHashMap<>();
+
+    AutodiscoveryConnector(RedisClient redisClient, RedisCodec<K, V> codec, RedisURI redisURI) {
+        this.redisClient = redisClient;
+        this.codec = codec;
+        this.redisURI = redisURI;
+    }
+
+    @Override
+    public CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsync() {
+
+        ConnectionFuture<StatefulRedisConnection<K, V>> initialConnection = redisClient.connectAsync(codec, redisURI);
+        Mono<StatefulRedisMasterSlaveConnection<K, V>> connect = Mono
+                .fromCompletionStage(initialConnection)
+                .flatMap(
+                        nodeConnection -> {
+
+                            initialConnections.put(redisURI, nodeConnection);
+
+                            TopologyProvider topologyProvider = new MasterSlaveTopologyProvider(nodeConnection, redisURI);
+
+                            return Mono.fromCompletionStage(topologyProvider.getNodesAsync()).flatMap(
+                                    nodes -> getMasterConnectionAndUri(nodes, Tuples.of(redisURI, nodeConnection), codec));
+                        }).flatMap(connectionAndUri -> {
+                    return initializeConnection(codec, connectionAndUri);
+                });
+
+        return connect.onErrorResume(t -> {
+
+            Mono<Void> close = Mono.empty();
+
+            for (StatefulRedisConnection<?, ?> connection : initialConnections.values()) {
+                close = close.then(Mono.fromFuture(connection.closeAsync()));
+            }
+
+            return close.then(Mono.error(t));
+        }).onErrorMap(ExecutionException.class, Throwable::getCause).toFuture();
+
+    }
+
+    private Mono<Tuple2<RedisURI, StatefulRedisConnection<K, V>>> getMasterConnectionAndUri(List<RedisNodeDescription> nodes,
+            Tuple2<RedisURI, StatefulRedisConnection<K, V>> connectionTuple, RedisCodec<K, V> codec) {
+
+        RedisNodeDescription node = getConnectedNode(redisURI, nodes);
+
+        if (node.getRole() != RedisInstance.Role.MASTER) {
+
+            RedisNodeDescription master = lookupMaster(nodes);
+            ConnectionFuture<StatefulRedisConnection<K, V>> masterConnection = redisClient.connectAsync(codec, master.getUri());
+
+            return Mono.just(master.getUri()).zipWith(Mono.fromCompletionStage(masterConnection)) //
+                    .doOnNext(it -> {
+                        initialConnections.put(it.getT1(), it.getT2());
+                    });
+        }
+
+        return Mono.just(connectionTuple);
+    }
+
+    @SuppressWarnings("unchecked")
+    private Mono<StatefulRedisMasterSlaveConnection<K, V>> initializeConnection(RedisCodec<K, V> codec,
+            Tuple2<RedisURI, StatefulRedisConnection<K, V>> connectionAndUri) {
+
+        MasterSlaveTopologyProvider topologyProvider = new MasterSlaveTopologyProvider(connectionAndUri.getT2(),
+                connectionAndUri.getT1());
+
+        MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(redisClient, topologyProvider);
+        MasterSlaveConnectionProvider<K, V> connectionProvider = new MasterSlaveConnectionProvider<>(redisClient, codec,
+                redisURI, (Map) initialConnections);
+
+        Mono<List<RedisNodeDescription>> refreshFuture = refresh.getNodes(redisURI);
+
+        return refreshFuture.map(nodes -> {
+
+            connectionProvider.setKnownNodes(nodes);
+
+            MasterSlaveChannelWriter channelWriter = new MasterSlaveChannelWriter(connectionProvider);
+
+            StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(
+                    channelWriter, codec, redisURI.getTimeout());
+
+            connection.setOptions(redisClient.getOptions());
+
+            return connection;
+        });
+    }
+
+    private static RedisNodeDescription lookupMaster(List<RedisNodeDescription> nodes) {
+
+        Optional<RedisNodeDescription> first = findFirst(nodes, n -> n.getRole() == RedisInstance.Role.MASTER);
+        return first.orElseThrow(() -> new IllegalStateException("Cannot lookup master from " + nodes));
+    }
+
+    private static RedisNodeDescription getConnectedNode(RedisURI redisURI, List<RedisNodeDescription> nodes) {
+
+        Optional<RedisNodeDescription> first = findFirst(nodes, n -> equals(redisURI, n));
+        return first.orElseThrow(() -> new IllegalStateException("Cannot lookup node descriptor for connected node at "
+                + redisURI));
+    }
+
+    private static Optional<RedisNodeDescription> findFirst(List<RedisNodeDescription> nodes,
+            Predicate<? super RedisNodeDescription> predicate) {
+        return nodes.stream().filter(predicate).findFirst();
+    }
+
+    private static boolean equals(RedisURI redisURI, RedisNodeDescription node) {
+        return node.getUri().getHost().equals(redisURI.getHost()) && node.getUri().getPort() == redisURI.getPort();
+    }
+}
diff --git a/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java b/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
new file mode 100644
index 0000000000..1f8814c6aa
--- /dev/null
+++ b/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterslave;
+
+import java.time.Duration;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
+/**
+ * Completable latch support expecting an number of inbound events to trigger an outbound event signalled though a
+ * {@link CompletionStage}. This latch is created by specifying a number of expected events of type {@code T} or exceptions and
+ * synchronized through either a timeout or receiving the matching number of events.
+ * <p/>
+ * Inbound events can be consumed through callback hook methods. Events arriving after synchronization are dropped.
+ *
+ * @author Mark Paluch
+ */
+abstract class CompletableEventLatchSupport<T, V> {
+
+    private final AtomicIntegerFieldUpdater<CompletableEventLatchSupport> NOTIFICATIONS_UPDATER = AtomicIntegerFieldUpdater
+            .newUpdater(CompletableEventLatchSupport.class, "notifications");
+
+    private final AtomicIntegerFieldUpdater<CompletableEventLatchSupport> GATE_UPDATER = AtomicIntegerFieldUpdater.newUpdater(
+            CompletableEventLatchSupport.class, "gate");
+
+    private static final int GATE_OPEN = 0;
+    private static final int GATE_CLOSED = 1;
+
+    private final int expectedCount;
+    private final CompletableFuture<V> selfFuture = new CompletableFuture<>();
+
+    private volatile ScheduledFuture<?> timeoutScheduleFuture;
+
+    // accessed via UPDATER
+    @SuppressWarnings("unused")
+    private volatile int notifications = 0;
+
+    @SuppressWarnings("unused")
+    private volatile int gate = GATE_OPEN;
+
+    /**
+     * Construct a new {@link CompletableEventLatchSupport} class expecting {@code expectedCount} notifications.
+     *
+     * @param expectedCount
+     */
+    public CompletableEventLatchSupport(int expectedCount) {
+        this.expectedCount = expectedCount;
+    }
+
+    public final int getExpectedCount() {
+        return expectedCount;
+    }
+
+    /**
+     * Notification callback method accepting a connection for a value. Triggers emission if the gate is open and the current
+     * call to this method is the last expected notification.
+     */
+    public final void accept(T value) {
+
+        if (GATE_UPDATER.get(this) == GATE_CLOSED) {
+            onDrop(value);
+            return;
+        }
+
+        onAccept(value);
+        onNotification();
+    }
+
+    /**
+     * Notification callback method accepting a connection error. Triggers emission if the gate is open and the current call to
+     * this method is the last expected notification.
+     */
+    public final void accept(Throwable throwable) {
+
+        if (GATE_UPDATER.get(this) == GATE_CLOSED) {
+            onDrop(throwable);
+            return;
+        }
+
+        onError(throwable);
+        onNotification();
+    }
+
+    private void onNotification() {
+
+        if (NOTIFICATIONS_UPDATER.incrementAndGet(this) == expectedCount) {
+
+            ScheduledFuture<?> timeoutScheduleFuture = this.timeoutScheduleFuture;
+            this.timeoutScheduleFuture = null;
+
+            if (timeoutScheduleFuture != null) {
+                timeoutScheduleFuture.cancel(false);
+            }
+
+            emit();
+        }
+    }
+
+    private void emit() {
+
+        if (GATE_UPDATER.compareAndSet(this, GATE_OPEN, GATE_CLOSED)) {
+
+            onEmit(new Emission<V>() {
+                @Override
+                public void success(V value) {
+                    selfFuture.complete(value);
+                }
+
+                @Override
+                public void error(Throwable exception) {
+                    selfFuture.completeExceptionally(exception);
+                }
+            });
+        }
+    }
+
+    // Callback hooks
+
+    protected void onAccept(T value) {
+
+    }
+
+    protected void onError(Throwable value) {
+
+    }
+
+    protected void onDrop(T value) {
+
+    }
+
+    protected void onDrop(Throwable value) {
+
+    }
+
+    protected void onEmit(Emission<V> emission) {
+
+    }
+
+    /**
+     * Retrieve a {@link CompletionStage} that is notified upon completion or timeout.
+     *
+     * @param timeout
+     * @param timeoutExecutor
+     * @return
+     */
+    public final CompletionStage<V> getOrTimeout(Duration timeout, ScheduledExecutorService timeoutExecutor) {
+
+        if (GATE_UPDATER.get(this) == GATE_OPEN && timeoutScheduleFuture == null) {
+            this.timeoutScheduleFuture = timeoutExecutor.schedule(this::emit, timeout.toNanos(), TimeUnit.NANOSECONDS);
+        }
+
+        return selfFuture;
+    }
+
+    /**
+     * Interface to signal emission of a value or an {@link Exception}.
+     *
+     * @param <T>
+     */
+    public interface Emission<T> {
+
+        /**
+         * Complete emission successfully.
+         *
+         * @param value the actual value to emit.
+         */
+        void success(T value);
+
+        /**
+         * Complete emission with an {@link Throwable exception}.
+         *
+         * @param exception the error to emit.
+         */
+        void error(Throwable exception);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/masterslave/Connections.java b/src/main/java/io/lettuce/core/masterslave/Connections.java
index e85c6f8f36..b7fa3296cd 100644
--- a/src/main/java/io/lettuce/core/masterslave/Connections.java
+++ b/src/main/java/io/lettuce/core/masterslave/Connections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,20 @@
  */
 package io.lettuce.core.masterslave;
 
-import java.util.Map;
-import java.util.TreeMap;
+import java.time.Duration;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledExecutorService;
 
+import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
+import io.lettuce.core.RedisConnectionException;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.AsyncCloseable;
+import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.Command;
 import io.lettuce.core.protocol.CommandArgs;
@@ -28,25 +36,65 @@
 import io.lettuce.core.protocol.CommandType;
 
 /**
+ * Connection collector with non-blocking synchronization. This synchronizer emits itself through a {@link Mono} as soon as it
+ * gets synchronized via either receiving connects/exceptions from all connections or timing out.
+ * <p/>
+ * It can be used only once via {@link #getOrTimeout(Duration, ScheduledExecutorService)}.
+ * <p/>
+ * Synchronizer uses a gate to determine whether it was already emitted or awaiting incoming events (exceptions, successful
+ * connects). Connections arriving after closing the gate are discarded.
+ *
  * @author Mark Paluch
  */
-class Connections {
+class Connections extends CompletableEventLatchSupport<Tuple2<RedisURI, StatefulRedisConnection<String, String>>, Connections>
+        implements AsyncCloseable {
 
     private final Map<RedisURI, StatefulRedisConnection<String, String>> connections = new TreeMap<>(
             MasterSlaveUtils.RedisURIComparator.INSTANCE);
 
-    public Connections() {
+    private final List<Throwable> exceptions = new CopyOnWriteArrayList<>();
+    private final List<RedisNodeDescription> nodes;
+
+    public Connections(int expectedConnectionCount, List<RedisNodeDescription> nodes) {
+        super(expectedConnectionCount);
+        this.nodes = nodes;
     }
 
-    /**
-     * Add a connection for a {@link RedisURI}
-     *
-     * @param redisURI
-     * @param connection
-     */
-    public void addConnection(RedisURI redisURI, StatefulRedisConnection<String, String> connection) {
+    @Override
+    protected void onAccept(Tuple2<RedisURI, StatefulRedisConnection<String, String>> value) {
+
         synchronized (connections) {
-            connections.put(redisURI, connection);
+            connections.put(value.getT1(), value.getT2());
+        }
+    }
+
+    @Override
+    protected void onError(Throwable value) {
+        exceptions.add(value);
+    }
+
+    @Override
+    protected void onDrop(Tuple2<RedisURI, StatefulRedisConnection<String, String>> value) {
+        value.getT2().closeAsync();
+    }
+
+    @Override
+    protected void onDrop(Throwable value) {
+
+    }
+
+    @Override
+    protected void onEmit(Emission<Connections> emission) {
+
+        if (getExpectedCount() != 0 && connections.isEmpty() && !exceptions.isEmpty()) {
+
+            RedisConnectionException collector = new RedisConnectionException(
+                    "Unable to establish a connection to Redis Cluster");
+            exceptions.forEach(collector::addSuppressed);
+
+            emission.error(collector);
+        } else {
+            emission.success(this);
         }
     }
 
@@ -66,9 +114,10 @@ public boolean isEmpty() {
      */
     public Requests requestPing() {
 
-        Requests requests = new Requests();
+        Set<Map.Entry<RedisURI, StatefulRedisConnection<String, String>>> entries = new LinkedHashSet<>(connections.entrySet());
+        Requests requests = new Requests(entries.size(), nodes);
 
-        for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : connections.entrySet()) {
+        for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : entries) {
 
             CommandArgs<String, String> args = new CommandArgs<>(StringCodec.ASCII).add(CommandKeyword.NODES);
             Command<String, String, String> command = new Command<>(CommandType.PING, new StatusOutput<>(StringCodec.ASCII),
@@ -85,9 +134,21 @@ public Requests requestPing() {
     /**
      * Close all connections.
      */
-    public void close() {
-        for (StatefulRedisConnection<String, String> connection : connections.values()) {
-            connection.close();
+    public CompletableFuture<Void> closeAsync() {
+
+        List<CompletableFuture> close = new ArrayList<>(connections.size());
+        List<RedisURI> toRemove = new ArrayList<>(connections.size());
+
+        for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : connections.entrySet()) {
+
+            toRemove.add(entry.getKey());
+            close.add(entry.getValue().closeAsync());
         }
+
+        for (RedisURI redisURI : toRemove) {
+            connections.remove(redisURI);
+        }
+
+        return CompletableFuture.allOf(close.toArray(new CompletableFuture[0]));
     }
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/Exceptions.java b/src/main/java/io/lettuce/core/masterslave/Exceptions.java
new file mode 100644
index 0000000000..07b79471d6
--- /dev/null
+++ b/src/main/java/io/lettuce/core/masterslave/Exceptions.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterslave;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
+
+import io.lettuce.core.RedisCommandInterruptedException;
+import io.lettuce.core.RedisCommandTimeoutException;
+import io.lettuce.core.RedisException;
+
+/**
+ * Exception handling and utils to operate on.
+ *
+ * @author Mark Paluch
+ */
+class Exceptions {
+
+    /**
+     * Prepare an unchecked {@link RuntimeException} that will bubble upstream if thrown by an operator.
+     *
+     * @param t the root cause
+     * @return an unchecked exception that should choose bubbling up over error callback path.
+     */
+    public static RuntimeException bubble(Throwable t) {
+
+        if (t instanceof ExecutionException) {
+            return bubble(t.getCause());
+        }
+
+        if (t instanceof TimeoutException) {
+            return new RedisCommandTimeoutException(t);
+        }
+
+        if (t instanceof InterruptedException) {
+
+            Thread.currentThread().interrupt();
+            return new RedisCommandInterruptedException(t);
+        }
+
+        if (t instanceof RedisException) {
+            return (RedisException) t;
+        }
+
+        return new RedisException(t);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index 6a84fa4da9..054a1ed7b8 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -15,19 +15,17 @@
  */
 package io.lettuce.core.masterslave;
 
-import java.util.*;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 
+import io.lettuce.core.ConnectionFuture;
 import io.lettuce.core.RedisClient;
-import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisConnectionException;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceLists;
-import io.lettuce.core.models.role.RedisInstance;
-import io.lettuce.core.models.role.RedisNodeDescription;
-import io.netty.util.internal.logging.InternalLogger;
-import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
  * Master-Slave connection API.
@@ -84,8 +82,6 @@
  */
 public class MasterSlave {
 
-    private static final InternalLogger LOG = InternalLoggerFactory.getInstance(MasterSlave.class);
-
     /**
      * Open a new connection to a Redis Master-Slave server/servers using the supplied {@link RedisURI} and the supplied
      * {@link RedisCodec codec} to encode/decode keys.
@@ -94,25 +90,46 @@ public class MasterSlave {
      * can point to either a master or a slave host.
      * </p>
      *
-     * @param redisClient the Redis client
-     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
-     * @param redisURI the Redis server to connect to, must not be {@literal null}
-     * @param <K> Key type
-     * @param <V> Value type
-     * @return A new connection
+     * @param redisClient the Redis client.
+     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}.
+     * @param redisURI the Redis server to connect to, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return a new connection.
      */
     public static <K, V> StatefulRedisMasterSlaveConnection<K, V> connect(RedisClient redisClient, RedisCodec<K, V> codec,
             RedisURI redisURI) {
+        return getConnection(connectAsync(redisClient, codec, redisURI));
+    }
+
+    /**
+     * Open asynchronously a new connection to a Redis Master-Slave server/servers using the supplied {@link RedisURI} and the
+     * supplied {@link RedisCodec codec} to encode/decode keys.
+     * <p>
+     * This {@link MasterSlave} performs auto-discovery of nodes using either Redis Sentinel or Master/Slave. A {@link RedisURI}
+     * can point to either a master or a slave host.
+     * </p>
+     *
+     * @param redisClient the Redis client.
+     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}.
+     * @param redisURI the Redis server to connect to, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return {@link CompletableFuture} that is notified once the connect is finished.
+     * @since
+     */
+    public static <K, V> CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsync(RedisClient redisClient,
+            RedisCodec<K, V> codec, RedisURI redisURI) {
 
         LettuceAssert.notNull(redisClient, "RedisClient must not be null");
         LettuceAssert.notNull(codec, "RedisCodec must not be null");
         LettuceAssert.notNull(redisURI, "RedisURI must not be null");
 
         if (isSentinel(redisURI)) {
-            return connectSentinel(redisClient, codec, redisURI);
-        } else {
-            return connectMasterSlave(redisClient, codec, redisURI);
+            return new SentinelConnector<>(redisClient, codec, redisURI).connectAsync();
         }
+
+        return new AutodiscoveryConnector<>(redisClient, codec, redisURI).connectAsync();
     }
 
     /**
@@ -124,15 +141,36 @@ public static <K, V> StatefulRedisMasterSlaveConnection<K, V> connect(RedisClien
      * discover the roles of the supplied {@link RedisURI URIs} and issue commands to the appropriate node.
      * </p>
      *
-     * @param redisClient the Redis client
-     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
-     * @param redisURIs the Redis server to connect to, must not be {@literal null}
-     * @param <K> Key type
-     * @param <V> Value type
-     * @return A new connection
+     * @param redisClient the Redis client.
+     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}.
+     * @param redisURIs the Redis server to connect to, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return a new connection.
      */
     public static <K, V> StatefulRedisMasterSlaveConnection<K, V> connect(RedisClient redisClient, RedisCodec<K, V> codec,
             Iterable<RedisURI> redisURIs) {
+        return getConnection(connectAsync(redisClient, codec, redisURIs));
+    }
+
+    /**
+     * Open asynchronously a new connection to a Redis Master-Slave server/servers using the supplied {@link RedisURI} and the
+     * supplied {@link RedisCodec codec} to encode/decode keys.
+     * <p>
+     * This {@link MasterSlave} performs auto-discovery of nodes if the URI is a Redis Sentinel URI. Master/Slave URIs will be
+     * treated as static topology and no additional hosts are discovered in such case. Redis Standalone Master/Slave will
+     * discover the roles of the supplied {@link RedisURI URIs} and issue commands to the appropriate node.
+     * </p>
+     *
+     * @param redisClient the Redis client.
+     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}.
+     * @param redisURIs the Redis server to connect to, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return {@link CompletableFuture} that is notified once the connect is finished.
+     */
+    public static <K, V> CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsync(RedisClient redisClient,
+            RedisCodec<K, V> codec, Iterable<RedisURI> redisURIs) {
 
         LettuceAssert.notNull(redisClient, "RedisClient must not be null");
         LettuceAssert.notNull(codec, "RedisCodec must not be null");
@@ -142,163 +180,39 @@ public static <K, V> StatefulRedisMasterSlaveConnection<K, V> connect(RedisClien
         LettuceAssert.isTrue(!uriList.isEmpty(), "RedisURIs must not be empty");
 
         if (isSentinel(uriList.get(0))) {
-            return connectSentinel(redisClient, codec, uriList.get(0));
-        } else {
-            return connectStaticMasterSlave(redisClient, codec, uriList);
-        }
-    }
-
-    private static <K, V> StatefulRedisMasterSlaveConnection<K, V> connectSentinel(RedisClient redisClient,
-            RedisCodec<K, V> codec, RedisURI redisURI) {
-
-        TopologyProvider topologyProvider = new SentinelTopologyProvider(redisURI.getSentinelMasterId(), redisClient, redisURI);
-        SentinelTopologyRefresh sentinelTopologyRefresh = new SentinelTopologyRefresh(redisClient,
-                redisURI.getSentinelMasterId(), redisURI.getSentinels());
-
-        MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(redisClient, topologyProvider);
-        MasterSlaveConnectionProvider<K, V> connectionProvider = new MasterSlaveConnectionProvider<>(redisClient, codec,
-                redisURI, Collections.emptyMap());
-
-        connectionProvider.setKnownNodes(refresh.getNodes(redisURI));
-
-        MasterSlaveChannelWriter<K, V> channelWriter = new MasterSlaveChannelWriter<>(connectionProvider);
-        StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(channelWriter,
-                codec, redisURI.getTimeout());
-        connection.setOptions(redisClient.getOptions());
-
-        Runnable runnable = () -> {
-            try {
-
-                LOG.debug("Refreshing topology");
-                List<RedisNodeDescription> nodes = refresh.getNodes(redisURI);
-
-                if (nodes.isEmpty()) {
-                    LOG.warn("Topology refresh returned no nodes from {}", redisURI);
-                }
-
-                LOG.debug("New topology: {}", nodes);
-                connectionProvider.setKnownNodes(nodes);
-            } catch (Exception e) {
-                LOG.error("Error during background refresh", e);
-            }
-        };
-
-        try {
-            connection.registerCloseables(new ArrayList<>(), sentinelTopologyRefresh);
-            sentinelTopologyRefresh.bind(runnable);
-        } catch (RuntimeException e) {
-
-            connection.close();
-            throw e;
+            return new SentinelConnector<>(redisClient, codec, uriList.get(0)).connectAsync();
         }
 
-        return connection;
+        return new StaticMasterSlaveConnector<>(redisClient, codec, uriList).connectAsync();
     }
 
-    private static <K, V> StatefulRedisMasterSlaveConnection<K, V> connectMasterSlave(RedisClient redisClient,
-            RedisCodec<K, V> codec, RedisURI redisURI) {
-
-        Map<RedisURI, StatefulRedisConnection<K, V>> initialConnections = new HashMap<>();
-
-        try {
-
-            StatefulRedisConnection<K, V> nodeConnection = redisClient.connect(codec, redisURI);
-            initialConnections.put(redisURI, nodeConnection);
-
-            TopologyProvider topologyProvider = new MasterSlaveTopologyProvider(nodeConnection, redisURI);
-
-            List<RedisNodeDescription> nodes = topologyProvider.getNodes();
-            RedisNodeDescription node = getConnectedNode(redisURI, nodes);
-
-            if (node.getRole() != RedisInstance.Role.MASTER) {
-
-                RedisNodeDescription master = lookupMaster(nodes);
-                nodeConnection = redisClient.connect(codec, master.getUri());
-                initialConnections.put(master.getUri(), nodeConnection);
-                topologyProvider = new MasterSlaveTopologyProvider(nodeConnection, master.getUri());
-            }
-
-            MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(redisClient, topologyProvider);
-            MasterSlaveConnectionProvider<K, V> connectionProvider = new MasterSlaveConnectionProvider<>(redisClient, codec,
-                    redisURI, initialConnections);
-
-            connectionProvider.setKnownNodes(refresh.getNodes(redisURI));
-
-            MasterSlaveChannelWriter<K, V> channelWriter = new MasterSlaveChannelWriter<>(connectionProvider);
-
-            StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(
-                    channelWriter, codec, redisURI.getTimeout());
-
-            connection.setOptions(redisClient.getOptions());
-
-            return connection;
-
-        } catch (RuntimeException e) {
-            for (StatefulRedisConnection<K, V> connection : initialConnections.values()) {
-                connection.close();
-            }
-            throw e;
-        }
+    private static boolean isSentinel(RedisURI redisURI) {
+        return !redisURI.getSentinels().isEmpty();
     }
 
-    private static <K, V> StatefulRedisMasterSlaveConnection<K, V> connectStaticMasterSlave(RedisClient redisClient,
-            RedisCodec<K, V> codec, Iterable<RedisURI> redisURIs) {
-
-        Map<RedisURI, StatefulRedisConnection<K, V>> initialConnections = new HashMap<>();
+    /**
+     * Retrieve the connection from {@link ConnectionFuture}. Performs a blocking {@link ConnectionFuture#get()} to synchronize
+     * the channel/connection initialization. Any exception is rethrown as {@link RedisConnectionException}.
+     *
+     * @param connectionFuture must not be null.
+     * @param <T> Connection type.
+     * @return the connection.
+     * @throws RedisConnectionException in case of connection failures.
+     */
+    private static <T> T getConnection(CompletableFuture<T> connectionFuture) {
 
         try {
-            TopologyProvider topologyProvider = new StaticMasterSlaveTopologyProvider(redisClient, redisURIs);
-
-            RedisURI seedNode = redisURIs.iterator().next();
-
-            MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(redisClient, topologyProvider);
-            MasterSlaveConnectionProvider<K, V> connectionProvider = new MasterSlaveConnectionProvider<>(redisClient, codec,
-                    seedNode, initialConnections);
-
-            List<RedisNodeDescription> nodes = refresh.getNodes(seedNode);
-            if (nodes.isEmpty()) {
-                throw new RedisException(String.format("Cannot determine topology from %s", redisURIs));
+            return connectionFuture.get();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw RedisConnectionException.create(null, e);
+        } catch (Exception e) {
+
+            if (e instanceof ExecutionException) {
+                throw RedisConnectionException.create(null, e.getCause());
             }
 
-            connectionProvider.setKnownNodes(nodes);
-
-            MasterSlaveChannelWriter<K, V> channelWriter = new MasterSlaveChannelWriter<>(connectionProvider);
-
-            StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(
-                    channelWriter, codec, seedNode.getTimeout());
-            connection.setOptions(redisClient.getOptions());
-
-            connection.setOptions(redisClient.getOptions());
-
-            return connection;
-
-        } catch (RuntimeException e) {
-            for (StatefulRedisConnection<K, V> connection : initialConnections.values()) {
-                connection.close();
-            }
-            throw e;
+            throw RedisConnectionException.create(null, e);
         }
     }
-
-    private static RedisNodeDescription lookupMaster(List<RedisNodeDescription> nodes) {
-
-        Optional<RedisNodeDescription> first = nodes.stream().filter(n -> n.getRole() == RedisInstance.Role.MASTER).findFirst();
-        return first.orElseThrow(() -> new IllegalStateException("Cannot lookup master from " + nodes));
-    }
-
-    private static RedisNodeDescription getConnectedNode(RedisURI redisURI, List<RedisNodeDescription> nodes) {
-
-        Optional<RedisNodeDescription> first = nodes.stream().filter(n -> equals(redisURI, n)).findFirst();
-        return first.orElseThrow(() -> new IllegalStateException("Cannot lookup node descriptor for connected node at "
-                + redisURI));
-    }
-
-    private static boolean equals(RedisURI redisURI, RedisNodeDescription node) {
-        return node.getUri().getHost().equals(redisURI.getHost()) && node.getUri().getPort() == redisURI.getPort();
-    }
-
-    private static boolean isSentinel(RedisURI redisURI) {
-        return !redisURI.getSentinels().isEmpty();
-    }
-
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
index 1dc787389f..3dec85120c 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
@@ -33,16 +33,17 @@
  *
  * @author Mark Paluch
  */
-class MasterSlaveChannelWriter<K, V> implements RedisChannelWriter {
+class MasterSlaveChannelWriter implements RedisChannelWriter {
 
-    private MasterSlaveConnectionProvider<K, V> masterSlaveConnectionProvider;
+    private MasterSlaveConnectionProvider<?, ?> masterSlaveConnectionProvider;
     private boolean closed = false;
 
-    public MasterSlaveChannelWriter(MasterSlaveConnectionProvider<K, V> masterSlaveConnectionProvider) {
+    MasterSlaveChannelWriter(MasterSlaveConnectionProvider<?, ?> masterSlaveConnectionProvider) {
         this.masterSlaveConnectionProvider = masterSlaveConnectionProvider;
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
 
         LettuceAssert.notNull(command, "Command must not be null");
@@ -52,13 +53,36 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         }
 
         Intent intent = getIntent(command.getType());
-        StatefulRedisConnection<K, V> connection = (StatefulRedisConnection) masterSlaveConnectionProvider
-                .getConnection(intent);
+        CompletableFuture<StatefulRedisConnection<K, V>> future = (CompletableFuture) masterSlaveConnectionProvider
+                .getConnectionAsync(intent);
 
-        return connection.dispatch(command);
+        if (isSuccessfullyCompleted(future)) {
+            writeCommand(command, future.join(), null);
+        } else {
+            future.whenComplete((c, t) -> writeCommand(command, c, t));
+        }
+
+        return command;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <K, V> void writeCommand(RedisCommand<K, V, ?> command, StatefulRedisConnection<K, V> connection,
+            Throwable throwable) {
+
+        if (throwable != null) {
+            command.completeExceptionally(throwable);
+            return;
+        }
+
+        try {
+            connection.dispatch(command);
+        } catch (Exception e) {
+            command.completeExceptionally(e);
+        }
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public <K, V> Collection<RedisCommand<K, V, ?>> write(Collection<? extends RedisCommand<K, V, ?>> commands) {
 
         LettuceAssert.notNull(commands, "Commands must not be null");
@@ -71,10 +95,32 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         // Currently: Retain order
         Intent intent = getIntent(commands);
 
-        StatefulRedisConnection<K, V> connection = (StatefulRedisConnection) masterSlaveConnectionProvider
-                .getConnection(intent);
+        CompletableFuture<StatefulRedisConnection<K, V>> future = (CompletableFuture) masterSlaveConnectionProvider
+                .getConnectionAsync(intent);
 
-        return connection.dispatch(commands);
+        if (isSuccessfullyCompleted(future)) {
+            writeCommands(commands, future.join(), null);
+        } else {
+            future.whenComplete((c, t) -> writeCommands(commands, c, t));
+        }
+
+        return (Collection) commands;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <K, V> void writeCommands(Collection<? extends RedisCommand<K, V, ?>> commands,
+            StatefulRedisConnection<K, V> connection, Throwable throwable) {
+
+        if (throwable != null) {
+            commands.forEach(c -> c.completeExceptionally(throwable));
+            return;
+        }
+
+        try {
+            connection.dispatch(commands);
+        } catch (Exception e) {
+            commands.forEach(c -> c.completeExceptionally(e));
+        }
     }
 
     /**
@@ -143,7 +189,7 @@ public CompletableFuture<Void> closeAsync() {
         return future;
     }
 
-    public MasterSlaveConnectionProvider<K, V> getMasterSlaveConnectionProvider() {
+    MasterSlaveConnectionProvider<?, ?> getMasterSlaveConnectionProvider() {
         return masterSlaveConnectionProvider;
     }
 
@@ -185,4 +231,7 @@ public ReadFrom getReadFrom() {
         return masterSlaveConnectionProvider.getReadFrom();
     }
 
+    private static boolean isSuccessfullyCompleted(CompletableFuture<?> connectFuture) {
+        return connectFuture.isDone() && !connectFuture.isCompletedExceptionally();
+    }
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
index c02aa8ef1c..c78ce47348 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
@@ -19,17 +19,22 @@
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.codec.RedisCodec;
-import io.lettuce.core.internal.LettuceSets;
+import io.lettuce.core.internal.AsyncConnectionProvider;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
+import io.netty.util.internal.ConcurrentSet;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -44,10 +49,8 @@ public class MasterSlaveConnectionProvider<K, V> {
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(MasterSlaveConnectionProvider.class);
     private final boolean debugEnabled = logger.isDebugEnabled();
 
-    // Contains HostAndPort-identified connections.
-    private final Map<ConnectionKey, StatefulRedisConnection<K, V>> connections = new ConcurrentHashMap<>();
-    private final ConnectionFactory<K, V> connectionFactory;
     private final RedisURI initialRedisUri;
+    private final AsyncConnectionProvider<ConnectionKey, StatefulRedisConnection<K, V>, CompletionStage<StatefulRedisConnection<K, V>>> connectionProvider;
 
     private List<RedisNodeDescription> knownNodes = new ArrayList<>();
 
@@ -59,10 +62,14 @@ public class MasterSlaveConnectionProvider<K, V> {
             Map<RedisURI, StatefulRedisConnection<K, V>> initialConnections) {
 
         this.initialRedisUri = initialRedisUri;
-        this.connectionFactory = new ConnectionFactory<>(redisClient, redisCodec);
+
+        Function<ConnectionKey, CompletionStage<StatefulRedisConnection<K, V>>> connectionFactory = new DefaultMasterSlaveNodeConnectionFactory(
+                redisClient, redisCodec);
+
+        this.connectionProvider = new AsyncConnectionProvider<>(connectionFactory);
 
         for (Map.Entry<RedisURI, StatefulRedisConnection<K, V>> entry : initialConnections.entrySet()) {
-            connections.put(toConnectionKey(entry.getKey()), entry.getValue());
+            connectionProvider.register(toConnectionKey(entry.getKey()), entry.getValue());
         }
     }
 
@@ -81,6 +88,36 @@ public StatefulRedisConnection<K, V> getConnection(Intent intent) {
             logger.debug("getConnection(" + intent + ")");
         }
 
+        try {
+            return getConnectionAsync(intent).get();
+        } catch (RedisException e) {
+            throw e;
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RedisCommandInterruptedException(e);
+        } catch (ExecutionException e) {
+            throw new RedisException(e.getCause());
+        } catch (RuntimeException e) {
+            throw new RedisException(e);
+        }
+    }
+
+    /**
+     * Retrieve a {@link StatefulRedisConnection} by the intent.
+     * {@link io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent#WRITE} intentions use the master connection,
+     * {@link io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent#READ} intentions lookup one or more read
+     * candidates using the {@link ReadFrom} setting.
+     *
+     * @param intent command intent
+     * @return the connection.
+     * @throws RedisException if the host is not part of the cluster
+     */
+    public CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(Intent intent) {
+
+        if (debugEnabled) {
+            logger.debug("getConnectionAsync(" + intent + ")");
+        }
+
         if (readFrom != null && intent == Intent.READ) {
             List<RedisNodeDescription> selection = readFrom.select(new ReadFrom.Nodes() {
                 @Override
@@ -98,35 +135,36 @@ public Iterator<RedisNodeDescription> iterator() {
                 throw new RedisException(String.format("Cannot determine a node to read (Known nodes: %s) with setting %s",
                         knownNodes, readFrom));
             }
+
             try {
-                for (RedisNodeDescription redisNodeDescription : selection) {
-                    StatefulRedisConnection<K, V> readerCandidate = getConnection(redisNodeDescription);
-                    if (!readerCandidate.isOpen()) {
-                        continue;
-                    }
-                    return readerCandidate;
+
+                Flux<StatefulRedisConnection<K, V>> connections = Flux.empty();
+
+                for (RedisNodeDescription node : selection) {
+                    connections = connections.concatWith(Mono.fromFuture(getConnection(node)));
                 }
 
-                return getConnection(selection.get(0));
+                return connections.filter(StatefulConnection::isOpen).next().switchIfEmpty(connections.next()).toFuture();
             } catch (RuntimeException e) {
-                throw new RedisException(e);
+                throw Exceptions.bubble(e);
             }
         }
 
         return getConnection(getMaster());
     }
 
-    protected StatefulRedisConnection<K, V> getConnection(RedisNodeDescription redisNodeDescription) {
-        return connections.computeIfAbsent(new ConnectionKey(redisNodeDescription.getUri().getHost(), redisNodeDescription
-                .getUri().getPort()), connectionFactory);
+    protected CompletableFuture<StatefulRedisConnection<K, V>> getConnection(RedisNodeDescription redisNodeDescription) {
+
+        RedisURI uri = redisNodeDescription.getUri();
+
+        return connectionProvider.getConnection(toConnectionKey(uri)).toCompletableFuture();
     }
 
     /**
-     *
      * @return number of connections.
      */
     protected long getConnectionCount() {
-        return connections.size();
+        return connectionProvider.getConnectionCount();
     }
 
     /**
@@ -135,7 +173,10 @@ protected long getConnectionCount() {
      * @return Set of {@link ConnectionKey}s
      */
     private Set<ConnectionKey> getStaleConnectionKeys() {
-        Map<ConnectionKey, StatefulRedisConnection<K, V>> map = new HashMap<>(connections);
+
+        Map<ConnectionKey, StatefulRedisConnection<K, V>> map = new ConcurrentHashMap<>();
+        connectionProvider.forEach(map::put);
+
         Set<ConnectionKey> stale = new HashSet<>();
 
         for (ConnectionKey connectionKey : map.keySet()) {
@@ -152,23 +193,25 @@ private Set<ConnectionKey> getStaleConnectionKeys() {
      * Close stale connections.
      */
     public void closeStaleConnections() {
+
         logger.debug("closeStaleConnections() count before expiring: {}", getConnectionCount());
 
         Set<ConnectionKey> stale = getStaleConnectionKeys();
 
         for (ConnectionKey connectionKey : stale) {
-            StatefulRedisConnection<K, V> connection = connections.get(connectionKey);
-            if (connection != null) {
-                connections.remove(connectionKey);
-                connection.close();
-            }
+            connectionProvider.close(connectionKey);
         }
 
         logger.debug("closeStaleConnections() count after expiring: {}", getConnectionCount());
     }
 
+    /**
+     * Reset the command state of all connections.
+     *
+     * @see StatefulRedisConnection#reset()
+     */
     public void reset() {
-        allConnections().forEach(StatefulRedisConnection::reset);
+        connectionProvider.forEach(StatefulRedisConnection::reset);
     }
 
     /**
@@ -180,41 +223,49 @@ public void close() {
 
     /**
      * Close all connections asynchronously.
-     * 
+     *
      * @since 5.1
      */
     @SuppressWarnings("unchecked")
     public CompletableFuture<Void> closeAsync() {
-
-        Collection<StatefulRedisConnection<K, V>> connections = allConnections();
-        this.connections.clear();
-
-        List<CompletableFuture<Void>> futures = new ArrayList<>();
-        connections.forEach(c -> {
-
-            RedisChannelHandler handler = (RedisChannelHandler) c;
-            futures.add(handler.closeAsync());
-        });
-
-        return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
+        return connectionProvider.close();
     }
 
+    /**
+     * Flush pending commands on all connections.
+     *
+     * @see StatefulConnection#flushCommands()
+     */
     public void flushCommands() {
-        allConnections().forEach(StatefulConnection::flushCommands);
+        connectionProvider.forEach(StatefulConnection::flushCommands);
     }
 
-    public void setAutoFlushCommands(boolean autoFlushCommands) {
+    /**
+     * Disable or enable auto-flush behavior for all connections.
+     *
+     * @param autoFlush state of autoFlush.
+     * @see StatefulConnection#setAutoFlushCommands(boolean)
+     */
+    public void setAutoFlushCommands(boolean autoFlush) {
+
         synchronized (stateLock) {
-            allConnections().forEach(connection -> connection.setAutoFlushCommands(autoFlushCommands));
+            this.autoFlushCommands = autoFlush;
+            connectionProvider.forEach(connection -> connection.setAutoFlushCommands(autoFlush));
         }
     }
 
+    /**
+     * @return all connections that are connected.
+     */
+    @Deprecated
     protected Collection<StatefulRedisConnection<K, V>> allConnections() {
-        return LettuceSets.newHashSet(this.connections.values());
+
+        Set<StatefulRedisConnection<K, V>> set = new ConcurrentSet<>();
+        connectionProvider.forEach(set::add);
+        return set;
     }
 
     /**
-     *
      * @param knownNodes
      */
     public void setKnownNodes(Collection<RedisNodeDescription> knownNodes) {
@@ -227,8 +278,13 @@ public void setKnownNodes(Collection<RedisNodeDescription> knownNodes) {
         }
     }
 
+    /**
+     * @return the current read-from setting.
+     */
     public ReadFrom getReadFrom() {
-        return readFrom;
+        synchronized (stateLock) {
+            return readFrom;
+        }
     }
 
     public void setReadFrom(ReadFrom readFrom) {
@@ -238,6 +294,7 @@ public void setReadFrom(ReadFrom readFrom) {
     }
 
     public RedisNodeDescription getMaster() {
+
         for (RedisNodeDescription knownNode : knownNodes) {
             if (knownNode.getRole() == RedisInstance.Role.MASTER) {
                 return knownNode;
@@ -247,18 +304,19 @@ public RedisNodeDescription getMaster() {
         throw new RedisException(String.format("Master is currently unknown: %s", knownNodes));
     }
 
-    private class ConnectionFactory<K, V> implements Function<ConnectionKey, StatefulRedisConnection<K, V>> {
+    class DefaultMasterSlaveNodeConnectionFactory implements
+            Function<ConnectionKey, CompletionStage<StatefulRedisConnection<K, V>>> {
 
         private final RedisClient redisClient;
         private final RedisCodec<K, V> redisCodec;
 
-        public ConnectionFactory(RedisClient redisClient, RedisCodec<K, V> redisCodec) {
+        DefaultMasterSlaveNodeConnectionFactory(RedisClient redisClient, RedisCodec<K, V> redisCodec) {
             this.redisClient = redisClient;
             this.redisCodec = redisCodec;
         }
 
         @Override
-        public StatefulRedisConnection<K, V> apply(ConnectionKey key) {
+        public ConnectionFuture<StatefulRedisConnection<K, V>> apply(ConnectionKey key) {
 
             RedisURI.Builder builder = RedisURI.Builder.redis(key.host, key.port);
 
@@ -271,28 +329,32 @@ public StatefulRedisConnection<K, V> apply(ConnectionKey key) {
             }
             builder.withDatabase(initialRedisUri.getDatabase());
 
-            StatefulRedisConnection<K, V> connection = redisClient.connect(redisCodec, builder.build());
+            ConnectionFuture<StatefulRedisConnection<K, V>> connectionFuture = redisClient.connectAsync(redisCodec,
+                    builder.build());
 
-            synchronized (stateLock) {
+            connectionFuture.thenAccept(connection -> {
+                synchronized (stateLock) {
                 connection.setAutoFlushCommands(autoFlushCommands);
             }
+            });
 
-            return connection;
+            return connectionFuture;
         }
     }
 
-    private ConnectionKey toConnectionKey(RedisURI redisURI) {
+    private static ConnectionKey toConnectionKey(RedisURI redisURI) {
         return new ConnectionKey(redisURI.getHost(), redisURI.getPort());
     }
 
     /**
      * Connection to identify a connection by host/port.
      */
-    private static class ConnectionKey {
+    static class ConnectionKey {
+
         private final String host;
         private final int port;
 
-        public ConnectionKey(String host, int port) {
+        ConnectionKey(String host, int port) {
             this.host = host;
             this.port = port;
         }
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java
new file mode 100644
index 0000000000..985dc4e5f3
--- /dev/null
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterslave;
+
+import java.util.concurrent.CompletableFuture;
+
+import io.lettuce.core.codec.RedisCodec;
+
+/**
+ * Interface declaring an asynchronous connect method to connect a Master/Slave setup.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+interface MasterSlaveConnector<K, V> {
+
+    /**
+     * Asynchronously connect to a Master/Slave setup given {@link RedisCodec}.
+     *
+     * @return Future that is notified about the connection progress.
+     */
+    CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsync();
+}
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
index 54f34cd5fc..571d926954 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,16 +17,17 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import io.lettuce.core.RedisException;
+import reactor.core.publisher.Mono;
+import io.lettuce.core.RedisFuture;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
-
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -76,11 +77,26 @@ public List<RedisNodeDescription> getNodes() {
         try {
             return getNodesFromInfo(info);
         } catch (RuntimeException e) {
-            throw new RedisException(e);
+            throw Exceptions.bubble(e);
+        }
+    }
+
+    @Override
+    public CompletableFuture<List<RedisNodeDescription>> getNodesAsync() {
+
+        logger.debug("Performing topology lookup");
+
+        RedisFuture<String> info = connection.async().info("replication");
+
+        try {
+            return Mono.fromCompletionStage(info).timeout(redisURI.getTimeout()).map(this::getNodesFromInfo).toFuture();
+        } catch (RuntimeException e) {
+            throw Exceptions.bubble(e);
         }
     }
 
     protected List<RedisNodeDescription> getNodesFromInfo(String info) {
+
         List<RedisNodeDescription> result = new ArrayList<>();
 
         RedisNodeDescription currentNodeDescription = getCurrentNodeDescription(info);
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
index 7304ec6c0a..880e101ee9 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
@@ -15,22 +15,19 @@
  */
 package io.lettuce.core.masterslave;
 
-import static io.lettuce.core.masterslave.MasterSlaveUtils.findNodeByUri;
-
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ScheduledExecutorService;
 
+import reactor.core.publisher.Mono;
 import io.lettuce.core.RedisClient;
-import io.lettuce.core.RedisCommandInterruptedException;
 import io.lettuce.core.RedisConnectionException;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.LettuceLists;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -47,14 +44,17 @@ class MasterSlaveTopologyRefresh {
 
     private final NodeConnectionFactory nodeConnectionFactory;
     private final TopologyProvider topologyProvider;
+    private ScheduledExecutorService eventExecutors;
 
     MasterSlaveTopologyRefresh(RedisClient client, TopologyProvider topologyProvider) {
-        this(new RedisClientNodeConnectionFactory(client), topologyProvider);
+        this(new RedisClientNodeConnectionFactory(client), client.getResources().eventExecutorGroup(), topologyProvider);
     }
 
-    MasterSlaveTopologyRefresh(NodeConnectionFactory nodeConnectionFactory, TopologyProvider topologyProvider) {
+    MasterSlaveTopologyRefresh(NodeConnectionFactory nodeConnectionFactory, ScheduledExecutorService eventExecutors,
+            TopologyProvider topologyProvider) {
 
         this.nodeConnectionFactory = nodeConnectionFactory;
+        this.eventExecutors = eventExecutors;
         this.topologyProvider = topologyProvider;
     }
 
@@ -65,67 +65,27 @@ class MasterSlaveTopologyRefresh {
      * @param seed collection of {@link RedisURI}s
      * @return mapping between {@link RedisURI} and {@link Partitions}
      */
-    public List<RedisNodeDescription> getNodes(RedisURI seed) {
-
-        List<RedisNodeDescription> nodes = topologyProvider.getNodes();
-
-        addPasswordIfNeeded(nodes, seed);
-
-        AsyncConnections asyncConnections = getConnections(nodes);
-        Connections connections = null;
-
-        try {
-            connections = asyncConnections.get(seed.getTimeout().toNanos(), TimeUnit.NANOSECONDS);
-            Requests requestedPing = connections.requestPing();
-
-            return getNodeSpecificViews(requestedPing, nodes, seed);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new RedisCommandInterruptedException(e);
-        } finally {
-            if (connections != null) {
-                connections.close();
-            }
-        }
-    }
-
-    private void addPasswordIfNeeded(List<RedisNodeDescription> nodes, RedisURI seed) {
-
-        if (seed.getPassword() != null && seed.getPassword().length != 0) {
-            for (RedisNodeDescription node : nodes) {
-                node.getUri().setPassword(new String(seed.getPassword()));
-            }
-        }
-    }
-
-    private List<RedisNodeDescription> getNodeSpecificViews(Requests requestedPing, List<RedisNodeDescription> nodes,
-            RedisURI seed) throws InterruptedException {
-
-        List<RedisNodeDescription> result = new ArrayList<>();
-
-        long timeout = seed.getTimeout().toNanos();
-        Map<RedisNodeDescription, Long> latencies = new HashMap<>();
+    public Mono<List<RedisNodeDescription>> getNodes(RedisURI seed) {
 
-        requestedPing.await(timeout, TimeUnit.NANOSECONDS);
+        CompletableFuture<List<RedisNodeDescription>> future = topologyProvider.getNodesAsync();
 
-        for (RedisNodeDescription node : nodes) {
+        Mono<List<RedisNodeDescription>> initialNodes = Mono.fromFuture(future).doOnNext(nodes -> {
+            addPasswordIfNeeded(nodes, seed);
+        });
 
-            TimedAsyncCommand<String, String, String> future = requestedPing.getRequest(node.getUri());
-
-            if (future == null || !future.isDone()) {
-                continue;
-            }
-
-            RedisNodeDescription redisNodeDescription = findNodeByUri(nodes, node.getUri());
-            latencies.put(redisNodeDescription, future.duration());
-            result.add(redisNodeDescription);
-        }
+        return initialNodes
+                .map(this::getConnections)
+                .flatMap(asyncConnections -> asyncConnections.asMono(seed.getTimeout(), eventExecutors))
+                .flatMap(
+                        connections -> {
 
-        TopologyComparators.LatencyComparator comparator = new TopologyComparators.LatencyComparator(latencies);
+                            Requests requests = connections.requestPing();
 
-        result.sort(comparator);
+                            CompletionStage<List<RedisNodeDescription>> nodes = requests.getOrTimeout(seed.getTimeout(),
+                                    eventExecutors);
 
-        return result;
+                            return Mono.fromCompletionStage(nodes).flatMap(it -> ResumeAfter.close(connections).thenEmit(it));
+                        });
     }
 
     /*
@@ -133,9 +93,10 @@ private List<RedisNodeDescription> getNodeSpecificViews(Requests requestedPing,
      */
     private AsyncConnections getConnections(Iterable<RedisNodeDescription> nodes) {
 
-        AsyncConnections connections = new AsyncConnections();
+        List<RedisNodeDescription> nodeList = LettuceLists.newList(nodes);
+        AsyncConnections connections = new AsyncConnections(nodeList);
 
-        for (RedisNodeDescription node : nodes) {
+        for (RedisNodeDescription node : nodeList) {
 
             RedisURI redisURI = node.getUri();
             String message = String.format("Unable to connect to %s", redisURI);
@@ -174,4 +135,13 @@ private AsyncConnections getConnections(Iterable<RedisNodeDescription> nodes) {
 
         return connections;
     }
+
+    private static void addPasswordIfNeeded(List<RedisNodeDescription> nodes, RedisURI seed) {
+
+        if (seed.getPassword() != null && seed.getPassword().length != 0) {
+            for (RedisNodeDescription node : nodes) {
+                node.getUri().setPassword(new String(seed.getPassword()));
+            }
+        }
+    }
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/RefreshFutures.java b/src/main/java/io/lettuce/core/masterslave/RefreshFutures.java
deleted file mode 100644
index f80543500b..0000000000
--- a/src/main/java/io/lettuce/core/masterslave/RefreshFutures.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.masterslave;
-
-import java.util.Collection;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author Mark Paluch
- */
-class RefreshFutures {
-
-    /**
-     * Await for either future completion or to reach the timeout. Successful/exceptional future completion is not substantial.
-     *
-     * @param timeout the timeout value.
-     * @param timeUnit timeout unit.
-     * @param futures {@link Collection} of {@literal Future}s.
-     * @return time awaited in {@link TimeUnit#NANOSECONDS}.
-     * @throws InterruptedException
-     */
-    static long awaitAll(long timeout, TimeUnit timeUnit, Collection<? extends Future<?>> futures) throws InterruptedException {
-
-        long waitTime = 0;
-
-        for (Future<?> future : futures) {
-
-            long timeoutLeft = timeUnit.toNanos(timeout) - waitTime;
-
-            if (timeoutLeft <= 0) {
-                break;
-            }
-
-            long startWait = System.nanoTime();
-
-            try {
-                future.get(timeoutLeft, TimeUnit.NANOSECONDS);
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                throw e;
-            } catch (Exception e) {
-                continue;
-            } finally {
-                waitTime += System.nanoTime() - startWait;
-            }
-
-        }
-        return waitTime;
-    }
-}
diff --git a/src/main/java/io/lettuce/core/masterslave/Requests.java b/src/main/java/io/lettuce/core/masterslave/Requests.java
index f3c4a64f60..78734f7bc9 100644
--- a/src/main/java/io/lettuce/core/masterslave/Requests.java
+++ b/src/main/java/io/lettuce/core/masterslave/Requests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,32 +15,71 @@
  */
 package io.lettuce.core.masterslave;
 
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.concurrent.TimeUnit;
+import static io.lettuce.core.masterslave.MasterSlaveUtils.findNodeByUri;
 
+import java.util.*;
+
+import reactor.util.function.Tuple2;
+import reactor.util.function.Tuples;
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
  * Encapsulates asynchronously executed commands to multiple {@link RedisURI nodes}.
  *
  * @author Mark Paluch
  */
-class Requests {
+class Requests extends
+        CompletableEventLatchSupport<Tuple2<RedisURI, TimedAsyncCommand<String, String, String>>, List<RedisNodeDescription>> {
 
     private final Map<RedisURI, TimedAsyncCommand<String, String, String>> rawViews = new TreeMap<>(
             MasterSlaveUtils.RedisURIComparator.INSTANCE);
+    private final List<RedisNodeDescription> nodes;
 
-    public Requests() {
+    public Requests(int expectedCount, List<RedisNodeDescription> nodes) {
+        super(expectedCount);
+        this.nodes = nodes;
     }
 
     protected void addRequest(RedisURI redisURI, TimedAsyncCommand<String, String, String> command) {
+
         rawViews.put(redisURI, command);
+        command.onComplete((s, throwable) -> {
+
+            if (throwable != null) {
+                accept(throwable);
+            } else {
+                accept(Tuples.of(redisURI, command));
+            }
+        });
     }
 
-    protected long await(long timeout, TimeUnit timeUnit) throws InterruptedException {
-        return RefreshFutures.awaitAll(timeout, timeUnit, rawViews.values());
+    @Override
+    protected void onEmit(Emission<List<RedisNodeDescription>> emission) {
+
+        List<RedisNodeDescription> result = new ArrayList<>();
+
+        Map<RedisNodeDescription, Long> latencies = new HashMap<>();
+
+        for (RedisNodeDescription node : nodes) {
+
+            TimedAsyncCommand<String, String, String> future = getRequest(node.getUri());
+
+            if (future == null || !future.isDone()) {
+                continue;
+            }
+
+            RedisNodeDescription redisNodeDescription = findNodeByUri(nodes, node.getUri());
+            latencies.put(redisNodeDescription, future.duration());
+            result.add(redisNodeDescription);
+        }
+
+        TopologyComparators.LatencyComparator comparator = new TopologyComparators.LatencyComparator(latencies);
+
+        result.sort(comparator);
+
+        emission.success(result);
+
     }
 
     protected Set<RedisURI> nodes() {
diff --git a/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java b/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
new file mode 100644
index 0000000000..1abfa87b9b
--- /dev/null
+++ b/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterslave;
+
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
+import reactor.core.publisher.Mono;
+import io.lettuce.core.internal.AsyncCloseable;
+
+/**
+ * @author Mark Paluch
+ */
+public class ResumeAfter {
+
+    private static final AtomicIntegerFieldUpdater UPDATER = AtomicIntegerFieldUpdater.newUpdater(ResumeAfter.class, "closed");
+
+    private final AsyncCloseable closeable;
+
+    private static final int ST_OPEN = 0;
+    private static final int ST_CLOSED = 1;
+
+    @SuppressWarnings("unused")
+    private volatile int closed = ST_OPEN;
+
+    private ResumeAfter(AsyncCloseable closeable) {
+        this.closeable = closeable;
+    }
+
+    public static ResumeAfter close(AsyncCloseable closeable) {
+        return new ResumeAfter(closeable);
+    }
+
+    public <T> Mono<T> thenEmit(T value) {
+
+        return Mono.defer(() -> {
+
+            if (firstCloseLatch()) {
+                return Mono.fromCompletionStage(closeable.closeAsync());
+            }
+
+            return Mono.empty();
+
+        }).then(Mono.just(value)).doFinally(s -> {
+
+            if (firstCloseLatch()) {
+                closeable.closeAsync();
+            }
+        });
+    }
+
+    public <T> Mono<T> thenError(Throwable t) {
+
+        return Mono.defer(() -> {
+
+            if (firstCloseLatch()) {
+                return Mono.fromCompletionStage(closeable.closeAsync());
+            }
+
+            return Mono.empty();
+
+        }).then(Mono.<T> error(t)).doFinally(s -> {
+
+            if (firstCloseLatch()) {
+                closeable.closeAsync();
+            }
+        });
+    }
+
+    boolean firstCloseLatch() {
+        return UPDATER.compareAndSet(ResumeAfter.this, ST_OPEN, ST_OPEN);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java b/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
new file mode 100644
index 0000000000..77b88b2a2f
--- /dev/null
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterslave;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
+
+import reactor.core.publisher.Mono;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.models.role.RedisNodeDescription;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+/**
+ * {@link MasterSlaveConnector} to connect a Sentinel-managed Master/Slave setup using a Sentinel {@link RedisURI}.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+class SentinelConnector<K, V> implements MasterSlaveConnector<K, V> {
+
+    private static final InternalLogger LOG = InternalLoggerFactory.getInstance(SentinelConnector.class);
+
+    private final RedisClient redisClient;
+    private final RedisCodec<K, V> codec;
+    private final RedisURI redisURI;
+
+    SentinelConnector(RedisClient redisClient, RedisCodec<K, V> codec, RedisURI redisURI) {
+        this.redisClient = redisClient;
+        this.codec = codec;
+        this.redisURI = redisURI;
+    }
+
+    @Override
+    public CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsync() {
+
+        TopologyProvider topologyProvider = new SentinelTopologyProvider(redisURI.getSentinelMasterId(), redisClient, redisURI);
+        SentinelTopologyRefresh sentinelTopologyRefresh = new SentinelTopologyRefresh(redisClient,
+                redisURI.getSentinelMasterId(), redisURI.getSentinels());
+
+        MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(redisClient, topologyProvider);
+        MasterSlaveConnectionProvider<K, V> connectionProvider = new MasterSlaveConnectionProvider<>(redisClient, codec,
+                redisURI, Collections.emptyMap());
+
+        Runnable runnable = getTopologyRefreshRunnable(refresh, connectionProvider);
+
+        return refresh.getNodes(redisURI).flatMap(nodes -> {
+
+            if (nodes.isEmpty()) {
+                return Mono.error(new RedisException(String.format("Cannot determine topology from %s", redisURI)));
+            }
+
+            return initializeConnection(codec, sentinelTopologyRefresh, connectionProvider, runnable, nodes);
+        }).onErrorMap(ExecutionException.class, Throwable::getCause).toFuture();
+    }
+
+    private Mono<StatefulRedisMasterSlaveConnection<K, V>> initializeConnection(RedisCodec<K, V> codec,
+            SentinelTopologyRefresh sentinelTopologyRefresh, MasterSlaveConnectionProvider<K, V> connectionProvider,
+            Runnable runnable, List<RedisNodeDescription> nodes) {
+
+        connectionProvider.setKnownNodes(nodes);
+
+        MasterSlaveChannelWriter channelWriter = new MasterSlaveChannelWriter(connectionProvider) {
+
+            @Override
+            public CompletableFuture<Void> closeAsync() {
+                return CompletableFuture.allOf(super.closeAsync(), sentinelTopologyRefresh.closeAsync());
+            }
+        };
+
+        StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(channelWriter,
+                codec, redisURI.getTimeout());
+        connection.setOptions(redisClient.getOptions());
+
+        CompletionStage<Void> bind = sentinelTopologyRefresh.bind(runnable);
+
+        return Mono.fromCompletionStage(bind).onErrorResume(t -> {
+            return ResumeAfter.close(connection).thenError(t);
+        }).then(Mono.just(connection));
+    }
+
+    private Runnable getTopologyRefreshRunnable(MasterSlaveTopologyRefresh refresh,
+            MasterSlaveConnectionProvider<K, V> connectionProvider) {
+
+        return () -> {
+            try {
+
+                LOG.debug("Refreshing topology");
+                refresh.getNodes(redisURI).subscribe(nodes -> {
+                    if (nodes.isEmpty()) {
+                        LOG.warn("Topology refresh returned no nodes from {}", redisURI);
+                    }
+
+                    LOG.debug("New topology: {}", nodes);
+                    connectionProvider.setKnownNodes(nodes);
+
+                }, t -> LOG.error("Error during background refresh", t));
+
+            } catch (Exception e) {
+                LOG.error("Error during background refresh", e);
+            }
+        };
+    }
+}
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
index cfac2886d8..d3ba124b45 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
@@ -21,19 +21,19 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
+import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
 import io.lettuce.core.RedisClient;
-import io.lettuce.core.RedisException;
-import io.lettuce.core.RedisFuture;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -76,26 +76,43 @@ public List<RedisNodeDescription> getNodes() {
 
         logger.debug("lookup topology for masterId {}", masterId);
 
-        try (StatefulRedisSentinelConnection<String, String> connection = redisClient.connectSentinel(CODEC, sentinelUri)) {
+        try {
+            return getNodesAsync().get(timeout.toMillis(), TimeUnit.MILLISECONDS);
+        } catch (Exception e) {
+            throw Exceptions.bubble(e);
+        }
+    }
 
-            RedisFuture<Map<String, String>> masterFuture = connection.async().master(masterId);
-            RedisFuture<List<Map<String, String>>> slavesFuture = connection.async().slaves(masterId);
+    @Override
+    public CompletableFuture<List<RedisNodeDescription>> getNodesAsync() {
 
-            List<RedisNodeDescription> result = new ArrayList<>();
-            try {
-                Map<String, String> master = masterFuture.get(timeout.toNanos(), TimeUnit.NANOSECONDS);
-                List<Map<String, String>> slaves = slavesFuture.get(timeout.toNanos(), TimeUnit.NANOSECONDS);
+        logger.debug("lookup topology for masterId {}", masterId);
 
-                result.add(toNode(master, RedisInstance.Role.MASTER));
-                result.addAll(slaves.stream().filter(SentinelTopologyProvider::isAvailable)
-                        .map(map -> toNode(map, RedisInstance.Role.SLAVE)).collect(Collectors.toList()));
+        Mono<StatefulRedisSentinelConnection<String, String>> connect = Mono.fromFuture(redisClient.connectSentinelAsync(CODEC,
+                sentinelUri));
 
-            } catch (ExecutionException | InterruptedException | TimeoutException e) {
-                throw new RedisException(e);
-            }
+        return connect.flatMap(this::getNodes).toFuture();
+    }
+
+    protected Mono<List<RedisNodeDescription>> getNodes(StatefulRedisSentinelConnection<String, String> connection) {
+
+        RedisSentinelReactiveCommands<String, String> reactive = connection.reactive();
+
+        Mono<Tuple2<Map<String, String>, List<Map<String, String>>>> masterAndSlaves = reactive.master(masterId)
+                .zipWith(reactive.slaves(masterId).collectList()).timeout(this.timeout).flatMap(tuple -> {
+                    return ResumeAfter.close(connection).thenEmit(tuple);
+                }).doOnError(e -> connection.closeAsync());
+
+        return masterAndSlaves.map(tuple -> {
+
+            List<RedisNodeDescription> result = new ArrayList<>();
+
+            result.add(toNode(tuple.getT1(), RedisInstance.Role.MASTER));
+            result.addAll(tuple.getT2().stream().filter(SentinelTopologyProvider::isAvailable)
+                    .map(map -> toNode(map, RedisInstance.Role.SLAVE)).collect(Collectors.toList()));
 
             return result;
-        }
+        });
     }
 
     private static boolean isAvailable(Map<String, String> map) {
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
index 60698a8948..ed2eeb3e5f 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
@@ -16,19 +16,19 @@
 package io.lettuce.core.masterslave;
 
 import java.io.Closeable;
+import java.time.Duration;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import io.lettuce.core.ConnectionFuture;
 import io.lettuce.core.RedisClient;
-import io.lettuce.core.RedisConnectionException;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.AsyncCloseable;
 import io.lettuce.core.internal.LettuceLists;
 import io.lettuce.core.protocol.LettuceCharsets;
 import io.lettuce.core.pubsub.RedisPubSubAdapter;
@@ -44,14 +44,14 @@
  * @author Mark Paluch
  * @since 4.2
  */
-class SentinelTopologyRefresh implements Closeable {
+class SentinelTopologyRefresh implements AsyncCloseable, Closeable {
 
     private static final InternalLogger LOG = InternalLoggerFactory.getInstance(SentinelTopologyRefresh.class);
     private static final StringCodec CODEC = new StringCodec(LettuceCharsets.ASCII);
     private static final Set<String> PROCESSING_CHANNELS = new HashSet<>(
             Arrays.asList("failover-end", "failover-end-for-timeout"));
 
-    private final Map<RedisURI, StatefulRedisPubSubConnection<String, String>> pubSubConnections = new ConcurrentHashMap<>();
+    private final Map<RedisURI, ConnectionFuture<StatefulRedisPubSubConnection<String, String>>> pubSubConnections = new ConcurrentHashMap<>();
     private final RedisClient redisClient;
     private final List<RedisURI> sentinels;
     private final List<Runnable> refreshRunnables = new CopyOnWriteArrayList<>();
@@ -65,6 +65,7 @@ public void message(String pattern, String channel, String message) {
 
     private final PubSubMessageActionScheduler topologyRefresh;
     private final PubSubMessageActionScheduler sentinelReconnect;
+    private final CompletableFuture<Void> closeFuture = new CompletableFuture<>();
 
     private volatile boolean closed = false;
 
@@ -76,69 +77,177 @@ public void message(String pattern, String channel, String message) {
                 new TopologyRefreshMessagePredicate(masterId));
         this.sentinelReconnect = new PubSubMessageActionScheduler(redisClient.getResources().eventExecutorGroup(),
                 new SentinelReconnectMessagePredicate());
-
     }
 
     @Override
     public void close() {
+        closeAsync().join();
+    }
+
+    @Override
+    public CompletableFuture<Void> closeAsync() {
+
+        if (closed) {
+            return closeFuture;
+        }
 
         closed = true;
 
-        HashMap<RedisURI, StatefulRedisPubSubConnection<String, String>> connections = new HashMap<>(pubSubConnections);
-        connections.forEach((k, c) -> {
-            c.removeListener(adapter);
-            c.close();
+        HashMap<RedisURI, ConnectionFuture<StatefulRedisPubSubConnection<String, String>>> connections = new HashMap<>(
+                pubSubConnections);
+        List<CompletableFuture<Void>> futures = new ArrayList<>();
+        connections.forEach((k, f) -> {
+
+            futures.add(f.exceptionally(t -> null).thenCompose(c -> {
+
+                if (c == null) {
+                    return CompletableFuture.completedFuture(null);
+                }
+                c.removeListener(adapter);
+                return c.closeAsync();
+            }).toCompletableFuture());
+
             pubSubConnections.remove(k);
         });
+
+        CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).whenComplete((aVoid, throwable) -> {
+
+            if (throwable != null) {
+                closeFuture.completeExceptionally(throwable);
+            } else {
+                closeFuture.complete(null);
+            }
+        });
+
+        return closeFuture;
     }
 
-    void bind(Runnable runnable) {
+    CompletionStage<Void> bind(Runnable runnable) {
 
         refreshRunnables.add(runnable);
 
-        initializeSentinels();
+        return initializeSentinels();
     }
 
-    private void initializeSentinels() {
+    /**
+     * Initialize/extend connections to Sentinel servers.
+     *
+     * @return
+     */
+    private CompletionStage<Void> initializeSentinels() {
 
         if (closed) {
-            return;
+            return closeFuture;
         }
 
-        AtomicReference<RedisConnectionException> ref = new AtomicReference<>();
+        Duration timeout = getTimeout();
 
-        sentinels.forEach(redisURI -> {
+        List<ConnectionFuture<StatefulRedisPubSubConnection<String, String>>> connectionFutures = potentiallyConnectSentinels();
 
-            if (closed) {
-                return;
+        if (connectionFutures.isEmpty()) {
+            return CompletableFuture.completedFuture(null);
+        }
+
+        if (closed) {
+            return closeAsync();
+        }
+
+        SentinelTopologyRefreshConnections collector = collectConnections(connectionFutures);
+
+        CompletionStage<SentinelTopologyRefreshConnections> completionStage = collector.getOrTimeout(timeout, redisClient
+                .getResources().eventExecutorGroup());
+
+        return completionStage.whenComplete((aVoid, throwable) -> {
+
+            if (throwable != null) {
+                closeAsync();
             }
+        }).thenApply(noop -> (Void) null);
+    }
 
-            StatefulRedisPubSubConnection<String, String> pubSubConnection = null;
-            try {
-                if (!pubSubConnections.containsKey(redisURI)) {
+    /**
+     * Inspect whether additional Sentinel connections are required based on the which Sentinels are currently connected.
+     *
+     * @return list of futures that are notified with the connection progress.
+     */
+    private List<ConnectionFuture<StatefulRedisPubSubConnection<String, String>>> potentiallyConnectSentinels() {
 
-                    pubSubConnection = redisClient.connectPubSub(CODEC, redisURI);
-                    pubSubConnections.put(redisURI, pubSubConnection);
+        List<ConnectionFuture<StatefulRedisPubSubConnection<String, String>>> connectionFutures = new ArrayList<>();
+        for (RedisURI sentinel : sentinels) {
 
-                    pubSubConnection.addListener(adapter);
-                    pubSubConnection.async().psubscribe("*");
+            if (pubSubConnections.containsKey(sentinel)) {
+                continue;
+            }
+
+            ConnectionFuture<StatefulRedisPubSubConnection<String, String>> future = redisClient.connectPubSubAsync(CODEC,
+                    sentinel);
+            pubSubConnections.put(sentinel, future);
+
+            future.whenComplete((connection, throwable) -> {
+
+                if (throwable != null || closed) {
+                    pubSubConnections.remove(sentinel);
+                }
+
+                if (closed) {
+                    connection.closeAsync();
                 }
-            } catch (RedisConnectionException e) {
-                if (ref.get() == null) {
-                    ref.set(e);
+            });
+
+            connectionFutures.add(future);
+        }
+
+        return connectionFutures;
+    }
+
+    private SentinelTopologyRefreshConnections collectConnections(
+            List<ConnectionFuture<StatefulRedisPubSubConnection<String, String>>> connectionFutures) {
+
+        SentinelTopologyRefreshConnections collector = new SentinelTopologyRefreshConnections(connectionFutures.size());
+
+        for (ConnectionFuture<StatefulRedisPubSubConnection<String, String>> connectionFuture : connectionFutures) {
+
+            connectionFuture.thenCompose(connection -> {
+
+                connection.addListener(adapter);
+                return connection.async().psubscribe("*").thenApply(v -> connection).whenComplete((c, t) -> {
+
+                    if (t != null) {
+                        connection.closeAsync();
+                    }
+                });
+            }).whenComplete((connection, throwable) -> {
+
+                if (throwable != null) {
+                    collector.accept(throwable);
                 } else {
-                    ref.get().addSuppressed(e);
+                    collector.accept(connection);
                 }
-            }
-        });
+            });
+        }
+
+        return collector;
+    }
 
-        if (sentinels.isEmpty() && ref.get() != null) {
-            throw ref.get();
+    /**
+     * @return operation timeout from the first sentinel to connect/first URI. Fallback to default timeout if no other timeout
+     *         found.
+     * @see RedisURI#DEFAULT_TIMEOUT_DURATION
+     */
+    private Duration getTimeout() {
+
+        for (RedisURI sentinel : sentinels) {
+
+            if (!pubSubConnections.containsKey(sentinel)) {
+                return sentinel.getTimeout();
+            }
         }
 
-        if (closed) {
-            close();
+        for (RedisURI sentinel : sentinels) {
+            return sentinel.getTimeout();
         }
+
+        return RedisURI.DEFAULT_TIMEOUT_DURATION;
     }
 
     private void processMessage(String pattern, String channel, String message) {
@@ -205,7 +314,7 @@ private boolean processingAllowed(String channel, String message) {
      * {@link #onEvent(Consumer)} may be called by multiple threads concurrently. It's guaranteed the first caller for an
      * expired {@link Timeout} will be called.
      */
-    private static class TimedSemaphore {
+    static class TimedSemaphore {
 
         private final AtomicReference<Timeout> timeoutRef = new AtomicReference<>();
 
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java
new file mode 100644
index 0000000000..f55cbfc55e
--- /dev/null
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterslave;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import io.lettuce.core.RedisException;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+
+/**
+ * @author Mark Paluch
+ */
+class SentinelTopologyRefreshConnections extends
+        CompletableEventLatchSupport<StatefulRedisPubSubConnection<String, String>, SentinelTopologyRefreshConnections> {
+
+    private final List<Throwable> exceptions = new CopyOnWriteArrayList<>();
+    private final AtomicInteger success = new AtomicInteger();
+
+    /**
+     * Construct a new {@link CompletableEventLatchSupport} class expecting {@code expectedCount} notifications.
+     *
+     * @param expectedCount
+     */
+    public SentinelTopologyRefreshConnections(int expectedCount) {
+        super(expectedCount);
+    }
+
+    @Override
+    protected void onAccept(StatefulRedisPubSubConnection<String, String> value) {
+        success.incrementAndGet();
+    }
+
+    @Override
+    protected void onError(Throwable value) {
+        exceptions.add(value);
+    }
+
+    @Override
+    protected void onEmit(Emission<SentinelTopologyRefreshConnections> emission) {
+
+        if (success.get() == 0) {
+
+            RedisException exception = new RedisException("Cannot attach to Redis Sentinel for topology refresh");
+            exceptions.forEach(exception::addSuppressed);
+            emission.error(exception);
+        } else {
+            emission.success(this);
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
index f1202e3974..1cec2e7703 100644
--- a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
@@ -34,7 +34,7 @@ class StatefulRedisMasterSlaveConnectionImpl<K, V> extends StatefulRedisConnecti
      * @param codec Codec used to encode/decode keys and values.
      * @param timeout Maximum time to wait for a response.
      */
-    public StatefulRedisMasterSlaveConnectionImpl(MasterSlaveChannelWriter<K, V> writer, RedisCodec<K, V> codec,
+    StatefulRedisMasterSlaveConnectionImpl(MasterSlaveChannelWriter writer, RedisCodec<K, V> codec,
             Duration timeout) {
         super(writer, codec, timeout);
     }
@@ -50,7 +50,7 @@ public ReadFrom getReadFrom() {
     }
 
     @Override
-    public MasterSlaveChannelWriter<K, V> getChannelWriter() {
-        return (MasterSlaveChannelWriter<K, V>) super.getChannelWriter();
+    public MasterSlaveChannelWriter getChannelWriter() {
+        return (MasterSlaveChannelWriter) super.getChannelWriter();
     }
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java
new file mode 100644
index 0000000000..ea281e9f8b
--- /dev/null
+++ b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterslave;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import reactor.core.publisher.Mono;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.models.role.RedisNodeDescription;
+
+/**
+ * {@link MasterSlaveConnector} to connect to a static declared Master/Slave setup providing a fixed array of {@link RedisURI}.
+ * This connector determines roles and remains using only the provided endpoints.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+class StaticMasterSlaveConnector<K, V> implements MasterSlaveConnector<K, V> {
+
+    private final RedisClient redisClient;
+    private final RedisCodec<K, V> codec;
+    private final Iterable<RedisURI> redisURIs;
+
+    StaticMasterSlaveConnector(RedisClient redisClient, RedisCodec<K, V> codec, Iterable<RedisURI> redisURIs) {
+        this.redisClient = redisClient;
+        this.codec = codec;
+        this.redisURIs = redisURIs;
+    }
+
+    @Override
+    public CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsync() {
+
+        Map<RedisURI, StatefulRedisConnection<K, V>> initialConnections = new HashMap<>();
+
+        TopologyProvider topologyProvider = new StaticMasterSlaveTopologyProvider(redisClient, redisURIs);
+
+        RedisURI seedNode = redisURIs.iterator().next();
+
+        MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(redisClient, topologyProvider);
+        MasterSlaveConnectionProvider<K, V> connectionProvider = new MasterSlaveConnectionProvider<>(redisClient, codec,
+                seedNode, initialConnections);
+
+        return refresh.getNodes(seedNode).flatMap(nodes -> {
+
+            if (nodes.isEmpty()) {
+                return Mono.error(new RedisException(String.format("Cannot determine topology from %s", redisURIs)));
+            }
+
+            return initializeConnection(codec, seedNode, connectionProvider, nodes);
+        }).onErrorMap(ExecutionException.class, Throwable::getCause).toFuture();
+    }
+
+    private Mono<StatefulRedisMasterSlaveConnection<K, V>> initializeConnection(RedisCodec<K, V> codec, RedisURI seedNode,
+            MasterSlaveConnectionProvider<K, V> connectionProvider, List<RedisNodeDescription> nodes) {
+
+        connectionProvider.setKnownNodes(nodes);
+
+        MasterSlaveChannelWriter channelWriter = new MasterSlaveChannelWriter(connectionProvider);
+
+        StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(channelWriter,
+                codec, seedNode.getTimeout());
+        connection.setOptions(redisClient.getOptions());
+
+        return Mono.just(connection);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
index c60fbac7d2..13afedc353 100644
--- a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
@@ -15,14 +15,18 @@
  */
 package io.lettuce.core.masterslave;
 
-import java.util.*;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-import io.lettuce.core.*;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.TimeUnit;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.core.models.role.RoleParser;
 import io.netty.util.internal.logging.InternalLogger;
@@ -56,55 +60,57 @@ public StaticMasterSlaveTopologyProvider(RedisClient redisClient, Iterable<Redis
     @SuppressWarnings("rawtypes")
     public List<RedisNodeDescription> getNodes() {
 
-        List<StatefulRedisConnection<String, String>> connections = new ArrayList<>();
-        Map<RedisURI, RedisFuture<List<Object>>> roles = new HashMap<>();
+        RedisURI next = redisURIs.iterator().next();
 
         try {
-            for (RedisURI redisURI : redisURIs) {
-                try {
-                    StatefulRedisConnection<String, String> connection = redisClient.connect(redisURI);
-                    connections.add(connection);
-
-                    roles.put(redisURI, connection.async().role());
-                } catch (RuntimeException e) {
-                    logger.warn("Cannot connect to {}", redisURI, e);
-                }
-            }
+            return getNodesAsync().get(next.getTimeout().toMillis(), TimeUnit.MILLISECONDS);
+        } catch (Exception e) {
+            throw Exceptions.bubble(e);
+        }
+    }
 
-            RedisURI next = redisURIs.iterator().next();
-            boolean success = LettuceFutures.awaitAll(next.getTimeout(), roles.values().toArray(new Future[roles.size()]));
+    @Override
+    public CompletableFuture<List<RedisNodeDescription>> getNodesAsync() {
 
-            if (success) {
+        List<StatefulRedisConnection<String, String>> connections = new CopyOnWriteArrayList<>();
 
-                List<RedisNodeDescription> result = new ArrayList<>();
-                for (Map.Entry<RedisURI, RedisFuture<List<Object>>> entry : roles.entrySet()) {
+        Flux<RedisURI> uris = Flux.fromIterable(redisURIs);
+        Mono<List<RedisNodeDescription>> nodes = uris.flatMap(uri -> getNodeDescription(connections, uri)) //
+                .collectList() //
+                .doFinally(it -> {
 
-                    if (!entry.getValue().isDone()) {
-                        continue;
+                    for (StatefulRedisConnection<String, String> connection : connections) {
+                        connection.closeAsync();
                     }
+                });
 
-                    RedisURI key = entry.getKey();
+        return nodes.toFuture();
+    }
 
-                    RedisInstance redisInstance = RoleParser.parse(entry.getValue().get());
-                    result.add(new RedisMasterSlaveNode(key.getHost(), key.getPort(), key, redisInstance.getRole()));
-                }
+    private Mono<RedisNodeDescription> getNodeDescription(List<StatefulRedisConnection<String, String>> connections,
+            RedisURI uri) {
 
-                return result;
-            }
-        } catch (ExecutionException e) {
-            throw new IllegalStateException(e);
-        } catch (InterruptedException e) {
+        return Mono.fromCompletionStage(redisClient.connectAsync(StringCodec.UTF8, uri)) //
+                .onErrorResume(t -> {
 
-            Thread.currentThread().interrupt();
-            throw new RedisCommandInterruptedException(e);
+                    logger.warn("Cannot connect to {}", uri, t);
+                    return Mono.empty();
+                }) //
+                .doOnNext(connections::add) //
+                .flatMap(connection -> {
 
-        } finally {
+                    Mono<RedisNodeDescription> instance = getNodeDescription(uri, connection);
 
-            for (StatefulRedisConnection<String, String> connection : connections) {
-                connection.close();
-            }
-        }
+                    return instance.flatMap(it -> ResumeAfter.close(connection).thenEmit(it)).doFinally(s -> {
+                        connections.remove(connection);
+                    });
+                });
+    }
+
+    private static Mono<RedisNodeDescription> getNodeDescription(RedisURI uri,
+            StatefulRedisConnection<String, String> connection) {
 
-        return Collections.emptyList();
+        return connection.reactive().role().collectList().map(RoleParser::parse)
+                .map(it -> new RedisMasterSlaveNode(uri.getHost(), uri.getPort(), uri, it.getRole()));
     }
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
index 7a7d2b0ff9..bf97bb9c65 100644
--- a/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package io.lettuce.core.masterslave;
 
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 import io.lettuce.core.RedisException;
 import io.lettuce.core.models.role.RedisNodeDescription;
@@ -34,7 +35,18 @@ public interface TopologyProvider {
      * Lookup nodes within the topology.
      *
      * @return list of {@link RedisNodeDescription} instances
-     * @throws RedisException on errors that occured during the lookup
+     * @throws RedisException on errors that occurred during the lookup
      */
     List<RedisNodeDescription> getNodes();
+
+    /**
+     * Lookup nodes asynchronously within the topology.
+     *
+     * @return list of {@link RedisNodeDescription} instances
+     * @throws RedisException on errors that occurred during the lookup
+     * @since 5.1
+     */
+    default CompletableFuture<List<RedisNodeDescription>> getNodesAsync() {
+        return CompletableFuture.completedFuture(getNodes());
+    }
 }
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java
index bff47f4520..0ef98d3e01 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java
@@ -31,6 +31,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import io.lettuce.core.ConnectionFuture;
 import io.lettuce.core.RedisChannelHandler;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
@@ -74,7 +75,7 @@ public void shouldCloseConnections() {
 
         when(channelHandlerMock.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
 
-        when(clientMock.connect(eq(CODEC), any())).thenReturn(nodeConnectionMock);
+        when(clientMock.connectAsync(eq(CODEC), any())).thenReturn(ConnectionFuture.completed(null, nodeConnectionMock));
 
         StatefulRedisConnection<String, String> connection = sut.getConnection(MasterSlaveConnectionProvider.Intent.READ);
         assertThat(connection).isNotNull();
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
index 88a6836a49..d0434cf651 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -205,7 +205,7 @@ protected static String slaveCall(StatefulRedisMasterSlaveConnection<String, Str
     }
 
     protected MasterSlaveConnectionProvider getConnectionProvider() {
-        MasterSlaveChannelWriter<String, String> writer = connection.getChannelWriter();
+        MasterSlaveChannelWriter writer = connection.getChannelWriter();
         return writer.getMasterSlaveConnectionProvider();
     }
 }
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshTest.java
index f52f78025f..df7cea8b7c 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshTest.java
@@ -23,7 +23,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,6 +38,7 @@
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.core.protocol.RedisCommand;
+import io.netty.util.concurrent.DefaultThreadFactory;
 
 /**
  * @author Mark Paluch
@@ -58,11 +61,15 @@ public class MasterSlaveTopologyRefreshTest {
     @Mock
     RedisAsyncCommands<String, String> async;
 
+    ScheduledThreadPoolExecutor executorService;
+
     TopologyProvider provider;
 
     @Before
     public void before() {
 
+        executorService = new ScheduledThreadPoolExecutor(1, new DefaultThreadFactory(getClass().getSimpleName(), true));
+        when(connection.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
         when(connection.async()).thenReturn(async);
         when(connection.dispatch(any(RedisCommand.class))).then(invocation -> {
 
@@ -75,10 +82,15 @@ public void before() {
         provider = () -> Arrays.asList(MASTER, SLAVE);
     }
 
+    @After
+    public void tearDown() {
+        executorService.shutdown();
+    }
+
     @Test
     public void shouldRetrieveTopology() {
 
-        MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(connectionFactory, provider);
+        MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(connectionFactory, executorService, provider);
 
         CompletableFuture<StatefulRedisConnection<String, String>> master = CompletableFuture.completedFuture(connection);
         CompletableFuture<StatefulRedisConnection<String, String>> slave = CompletableFuture.completedFuture(connection);
@@ -88,7 +100,7 @@ public void shouldRetrieveTopology() {
         RedisURI redisURI = new RedisURI();
         redisURI.setTimeout(Duration.ofMillis(1));
 
-        List<RedisNodeDescription> nodes = refresh.getNodes(redisURI);
+        List<RedisNodeDescription> nodes = refresh.getNodes(redisURI).block();
 
         assertThat(nodes).hasSize(2);
     }
@@ -96,7 +108,7 @@ public void shouldRetrieveTopology() {
     @Test
     public void shouldRetrieveTopologyWithFailedNode() {
 
-        MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(connectionFactory, provider);
+        MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(connectionFactory, executorService, provider);
 
         CompletableFuture<StatefulRedisConnection<String, String>> connected = CompletableFuture.completedFuture(connection);
         CompletableFuture<StatefulRedisConnection<String, String>> pending = new CompletableFuture<>();
@@ -106,7 +118,7 @@ public void shouldRetrieveTopologyWithFailedNode() {
         RedisURI redisURI = new RedisURI();
         redisURI.setTimeout(Duration.ofMillis(1));
 
-        List<RedisNodeDescription> nodes = refresh.getNodes(redisURI);
+        List<RedisNodeDescription> nodes = refresh.getNodes(redisURI).block();
 
         assertThat(nodes).hasSize(1).containsOnly(MASTER);
     }
diff --git a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
index c0bfb270d1..4c1fa88216 100644
--- a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
@@ -24,7 +24,9 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -34,10 +36,15 @@
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import io.lettuce.core.ConnectionFuture;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisConnectionException;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.Futures;
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.pubsub.RedisPubSubAdapter;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
@@ -80,20 +87,33 @@ public class SentinelTopologyRefreshTest {
     @Before
     public void before() {
 
-        when(redisClient.connectPubSub(any(StringCodec.class), eq(host1))).thenReturn(connection);
+        when(redisClient.connectPubSubAsync(any(StringCodec.class), eq(host1))).thenReturn(
+                ConnectionFuture.completed(null, connection));
         when(clientResources.eventExecutorGroup()).thenReturn(eventExecutors);
         when(redisClient.getResources()).thenReturn(clientResources);
         when(connection.async()).thenReturn(pubSubAsyncCommands);
 
+        AsyncCommand<String, String, Void> command = new AsyncCommand<>(new Command<>(CommandType.PSUBSCRIBE, null));
+        command.complete();
+
+        when(connection.async().psubscribe(anyString())).thenReturn(command);
+
         sut = new SentinelTopologyRefresh(redisClient, "mymaster", Collections.singletonList(host1));
     }
 
+    @After
+    public void tearDown() {
+
+        verify(redisClient, never()).connect(any(), any());
+        verify(redisClient, never()).connectPubSub(any(), any());
+    }
+
     @Test
     public void bind() {
 
         sut.bind(refreshRunnable);
 
-        verify(redisClient).connectPubSub(any(), any());
+        verify(redisClient).connectPubSubAsync(any(), any());
         verify(pubSubAsyncCommands).psubscribe("*");
     }
 
@@ -102,7 +122,8 @@ public void bindWithSecondSentinelFails() {
 
         sut = new SentinelTopologyRefresh(redisClient, "mymaster", Arrays.asList(host1, host2));
 
-        when(redisClient.connectPubSub(any(StringCodec.class), eq(host2))).thenThrow(new RedisConnectionException("err"));
+        when(redisClient.connectPubSubAsync(any(StringCodec.class), eq(host2))).thenReturn(
+                ConnectionFuture.from(null, Futures.failed(new RedisConnectionException("err"))));
 
         sut.bind(refreshRunnable);
 
@@ -119,15 +140,21 @@ public void bindWithSentinelRecovery() {
         RedisPubSubAsyncCommands<String, String> async2 = mock(RedisPubSubAsyncCommands.class);
         when(connection2.async()).thenReturn(async2);
 
+        AsyncCommand<String, String, Void> command = new AsyncCommand<>(new Command<>(CommandType.PSUBSCRIBE, null));
+        command.complete();
+
+        when(async2.psubscribe(anyString())).thenReturn(command);
+
         sut = new SentinelTopologyRefresh(redisClient, "mymaster", Arrays.asList(host1, host2));
 
-        when(redisClient.connectPubSub(any(StringCodec.class), eq(host2))).thenThrow(new RedisConnectionException("err"))
-                .thenReturn(connection2);
+        when(redisClient.connectPubSubAsync(any(StringCodec.class), eq(host2))).thenReturn(
+                ConnectionFuture.from(null, Futures.failed(new RedisConnectionException("err")))).thenReturn(
+                ConnectionFuture.completed(null, connection2));
 
         sut.bind(refreshRunnable);
 
-        verify(redisClient).connectPubSub(any(), eq(host1));
-        verify(redisClient).connectPubSub(any(), eq(host2));
+        verify(redisClient).connectPubSubAsync(any(), eq(host1));
+        verify(redisClient).connectPubSubAsync(any(), eq(host2));
 
         Map<RedisURI, StatefulRedisPubSubConnection<String, String>> connections = (Map) ReflectionTestUtils.getField(sut,
                 "pubSubConnections");
@@ -140,7 +167,7 @@ public void bindWithSentinelRecovery() {
         verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
         captor.getValue().run();
 
-        verify(redisClient, times(2)).connectPubSub(any(), eq(host2));
+        verify(redisClient, times(2)).connectPubSubAsync(any(), eq(host2));
         assertThat(connections).containsKey(host1).containsKey(host2).hasSize(2);
         verify(refreshRunnable, never()).run();
     }
@@ -151,20 +178,20 @@ public void bindDuringClose() {
         sut = new SentinelTopologyRefresh(redisClient, "mymaster", Arrays.asList(host1, host2));
 
         StatefulRedisPubSubConnection<String, String> connection2 = mock(StatefulRedisPubSubConnection.class);
-        RedisPubSubAsyncCommands<String, String> async2 = mock(RedisPubSubAsyncCommands.class);
-        when(connection2.async()).thenReturn(async2);
+        when(connection.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
+        when(connection2.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
 
-        when(redisClient.connectPubSub(any(StringCodec.class), eq(host2))).thenAnswer(invocation -> {
+        when(redisClient.connectPubSubAsync(any(StringCodec.class), eq(host2))).thenAnswer(invocation -> {
 
-            sut.close();
-            return connection2;
+            sut.closeAsync();
+            return ConnectionFuture.completed(null, connection2);
         });
 
         sut.bind(refreshRunnable);
 
-        verify(redisClient).connectPubSub(any(), eq(host2));
-        verify(connection).close();
-        verify(connection2).close();
+        verify(redisClient).connectPubSubAsync(any(), eq(host2));
+        verify(connection).closeAsync();
+        verify(connection2).closeAsync();
 
         Map<RedisURI, StatefulRedisPubSubConnection<String, String>> connections = (Map) ReflectionTestUtils.getField(sut,
                 "pubSubConnections");
@@ -175,11 +202,13 @@ public void bindDuringClose() {
     @Test
     public void close() {
 
+        when(connection.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
+
         sut.bind(refreshRunnable);
         sut.close();
 
         verify(connection).removeListener(any());
-        verify(connection).close();
+        verify(connection).closeAsync();
     }
 
     @Test
@@ -200,8 +229,8 @@ public void shouldNotProcessOtherEvents() {
 
         adapter.message("*", "*", "irreleval");
 
-        verify(redisClient, times(2)).getResources();
-        verify(redisClient).connectPubSub(any(), any());
+        verify(redisClient, times(3)).getResources();
+        verify(redisClient).connectPubSubAsync(any(), any());
         verifyNoMoreInteractions(redisClient);
     }
 
@@ -319,7 +348,7 @@ public void shouldNotProcessIfExecutorIsShuttingDown() {
 
         adapter.message("*", "failover-end-for-timeout", "");
 
-        verify(redisClient).connectPubSub(any(), any());
+        verify(redisClient).connectPubSubAsync(any(), any());
         verify(eventExecutors, never()).schedule(any(Runnable.class), anyLong(), any());
     }
 
diff --git a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
index 0e12554654..6c6da43f02 100644
--- a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -218,7 +218,7 @@ protected static String slaveCall(StatefulRedisMasterSlaveConnection<String, Str
     }
 
     protected MasterSlaveConnectionProvider getConnectionProvider() {
-        MasterSlaveChannelWriter<String, String> writer = connection.getChannelWriter();
+        MasterSlaveChannelWriter writer = connection.getChannelWriter();
         return writer.getMasterSlaveConnectionProvider();
     }
 }

From 6dfabce19b2cb5e3c2274313137f21f7f92a4f98 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 14 Dec 2017 11:43:56 +0100
Subject: [PATCH 381/808] Move SocketAddressResolver resolution back to calling
 thread #670

Previously, switching threads could prevent the event executor from progressing as the enqueued task might never complete because the execution could be enqueued for the calling thread. Rolling back to do the blocking call on the invoking thread.

This shouldn't impact too much as we use Netty's AddressResolver by default.
---
 src/main/java/io/lettuce/core/RedisClient.java                | 4 +---
 src/main/java/io/lettuce/core/cluster/RedisClusterClient.java | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index c6d82d0ce8..3f3da31428 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -26,7 +26,6 @@
 import java.util.function.Supplier;
 
 import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
@@ -703,8 +702,7 @@ protected Mono<SocketAddress> getSocketAddress(RedisURI redisURI) {
                                 + redisURI.getSentinelMasterId())));
 
             } else {
-                return Mono.fromCallable(() -> SocketAddressResolver.resolve(redisURI, clientResources.dnsResolver()))
-                        .subscribeOn(Schedulers.fromExecutor(clientResources.eventExecutorGroup()));
+                return Mono.fromCallable(() -> SocketAddressResolver.resolve(redisURI, clientResources.dnsResolver()));
             }
         });
     }
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 5223e9b688..ddf58adc15 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -29,7 +29,6 @@
 import java.util.function.Supplier;
 
 import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.api.NodeSelectionSupport;
@@ -989,8 +988,7 @@ protected Mono<SocketAddress> getSocketAddressSupplier(Function<Partitions, Coll
                     SocketAddress socketAddress = SocketAddressResolver.resolve(getFirstUri(), clientResources.dnsResolver());
                     logger.debug("Resolved SocketAddress {} using {}", socketAddress, getFirstUri());
                     return socketAddress;
-
-                }).subscribeOn(Schedulers.fromExecutor(clientResources.eventExecutorGroup()));
+                });
             }
 
             return Mono.fromCallable(socketAddressSupplier::get);

From 5b846ee73fd9eb1362e5ed6079d139388199f339 Mon Sep 17 00:00:00 2001
From: ryosuke-hasebe <ryosuke.hasebe@linecorp.com>
Date: Mon, 18 Dec 2017 21:41:07 +0900
Subject: [PATCH 382/808] =?UTF-8?q?Resolve=20ReadFrom.SLAVE=5FPREFERRED=20?=
 =?UTF-8?q?via=20ReadFrom.valueOf(=E2=80=A6)=20#671?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/io/lettuce/core/ReadFrom.java             | 4 ++++
 src/test/java/io/lettuce/core/cluster/ReadFromTest.java | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/main/java/io/lettuce/core/ReadFrom.java b/src/main/java/io/lettuce/core/ReadFrom.java
index 5438c47126..f5549d81bd 100644
--- a/src/main/java/io/lettuce/core/ReadFrom.java
+++ b/src/main/java/io/lettuce/core/ReadFrom.java
@@ -86,6 +86,10 @@ public static ReadFrom valueOf(String name) {
             return SLAVE;
         }
 
+        if (name.equalsIgnoreCase("slavePreferred")) {
+            return SLAVE_PREFERRED;
+        }
+
         if (name.equalsIgnoreCase("nearest")) {
             return NEAREST;
         }
diff --git a/src/test/java/io/lettuce/core/cluster/ReadFromTest.java b/src/test/java/io/lettuce/core/cluster/ReadFromTest.java
index 2d3f64f041..b552018eff 100644
--- a/src/test/java/io/lettuce/core/cluster/ReadFromTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadFromTest.java
@@ -111,6 +111,11 @@ public void valueOfSlave() throws Exception {
         assertThat(ReadFrom.valueOf("slave")).isEqualTo(ReadFrom.SLAVE);
     }
 
+    @Test
+    public void valueOfSlavePreferred() throws Exception {
+        assertThat(ReadFrom.valueOf("slavePreferred")).isEqualTo(ReadFrom.SLAVE_PREFERRED);
+    }
+
     private ReadFrom.Nodes getNodes() {
         return new ReadFrom.Nodes() {
             @Override

From cc0ac33f5866900b86b8f4a88174b8becb13459b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 18 Dec 2017 15:40:53 +0100
Subject: [PATCH 383/808] Polishing #671

---
 src/main/java/io/lettuce/core/ReadFrom.java   |  3 ++-
 .../io/lettuce/core/cluster/ReadFromTest.java | 27 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/lettuce/core/ReadFrom.java b/src/main/java/io/lettuce/core/ReadFrom.java
index f5549d81bd..0875ad3d34 100644
--- a/src/main/java/io/lettuce/core/ReadFrom.java
+++ b/src/main/java/io/lettuce/core/ReadFrom.java
@@ -23,6 +23,7 @@
  * Defines from which Redis nodes data is read.
  *
  * @author Mark Paluch
+ * @author Ryosuke Hasebe
  * @since 4.0
  */
 public abstract class ReadFrom {
@@ -70,6 +71,7 @@ public abstract class ReadFrom {
      * @throws IllegalArgumentException if {@code name} is empty, {@literal null} or the {@link ReadFrom} preset is unknown.
      */
     public static ReadFrom valueOf(String name) {
+
         if (LettuceStrings.isEmpty(name)) {
             throw new IllegalArgumentException("Name must not be empty");
         }
@@ -110,5 +112,4 @@ public interface Nodes extends Iterable<RedisNodeDescription> {
          */
         List<RedisNodeDescription> getNodes();
     }
-
 }
diff --git a/src/test/java/io/lettuce/core/cluster/ReadFromTest.java b/src/test/java/io/lettuce/core/cluster/ReadFromTest.java
index b552018eff..d2d31dd172 100644
--- a/src/test/java/io/lettuce/core/cluster/ReadFromTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadFromTest.java
@@ -31,6 +31,7 @@
 
 /**
  * @author Mark Paluch
+ * @author Ryosuke Hasebe
  */
 public class ReadFromTest {
 
@@ -40,7 +41,7 @@ public class ReadFromTest {
     private RedisClusterNode slave = new RedisClusterNode();
 
     @Before
-    public void before() throws Exception {
+    public void before() {
 
         master.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.MASTER));
         nearest.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.SLAVE));
@@ -52,67 +53,67 @@ public void before() throws Exception {
     }
 
     @Test
-    public void master() throws Exception {
+    public void master() {
         List<RedisNodeDescription> result = ReadFrom.MASTER.select(getNodes());
         assertThat(result).hasSize(1).containsOnly(master);
     }
 
     @Test
-    public void masterPreferred() throws Exception {
+    public void masterPreferred() {
         List<RedisNodeDescription> result = ReadFrom.MASTER_PREFERRED.select(getNodes());
         assertThat(result).hasSize(3).containsExactly(master, nearest, slave);
     }
 
     @Test
-    public void slave() throws Exception {
+    public void slave() {
         List<RedisNodeDescription> result = ReadFrom.SLAVE.select(getNodes());
         assertThat(result).hasSize(2).contains(nearest, slave);
     }
 
     @Test
-    public void slavePreferred() throws Exception {
+    public void slavePreferred() {
         List<RedisNodeDescription> result = ReadFrom.SLAVE_PREFERRED.select(getNodes());
         assertThat(result).hasSize(3).containsExactly(nearest, slave, master);
     }
 
     @Test
-    public void nearest() throws Exception {
+    public void nearest() {
         List<RedisNodeDescription> result = ReadFrom.NEAREST.select(getNodes());
         assertThat(result).hasSize(3).containsExactly(nearest, master, slave);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void valueOfNull() throws Exception {
+    public void valueOfNull() {
         ReadFrom.valueOf(null);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void valueOfUnknown() throws Exception {
+    public void valueOfUnknown() {
         ReadFrom.valueOf("unknown");
     }
 
     @Test
-    public void valueOfNearest() throws Exception {
+    public void valueOfNearest() {
         assertThat(ReadFrom.valueOf("nearest")).isEqualTo(ReadFrom.NEAREST);
     }
 
     @Test
-    public void valueOfMaster() throws Exception {
+    public void valueOfMaster() {
         assertThat(ReadFrom.valueOf("master")).isEqualTo(ReadFrom.MASTER);
     }
 
     @Test
-    public void valueOfMasterPreferred() throws Exception {
+    public void valueOfMasterPreferred() {
         assertThat(ReadFrom.valueOf("masterPreferred")).isEqualTo(ReadFrom.MASTER_PREFERRED);
     }
 
     @Test
-    public void valueOfSlave() throws Exception {
+    public void valueOfSlave() {
         assertThat(ReadFrom.valueOf("slave")).isEqualTo(ReadFrom.SLAVE);
     }
 
     @Test
-    public void valueOfSlavePreferred() throws Exception {
+    public void valueOfSlavePreferred() {
         assertThat(ReadFrom.valueOf("slavePreferred")).isEqualTo(ReadFrom.SLAVE_PREFERRED);
     }
 

From d2cf5ccbac7e0b6da8f717ec81c1bbaa0474e426 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 19 Dec 2017 12:11:23 +0100
Subject: [PATCH 384/808] Introduce TransactionResult.wasDiscarded() #662

Add wasDiscarded() method to resolve naming ambiguities with wasRolledBack(). Redis has no notion of transaction rollbacks, Redis is only able to conditionally execute a transaction batch.
---
 .../io/lettuce/core/TransactionResult.java    | 16 +++++++++++----
 .../core/output/DefaultTransactionResult.java | 20 ++++++++-----------
 .../io/lettuce/core/output/MultiOutput.java   |  8 ++++----
 .../core/commands/CustomCommandTest.java      |  2 +-
 .../core/commands/TransactionCommandTest.java |  8 ++++----
 .../TransactionReactiveCommandTest.java       |  2 +-
 6 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/main/java/io/lettuce/core/TransactionResult.java b/src/main/java/io/lettuce/core/TransactionResult.java
index dc402cf10a..645d93bddb 100644
--- a/src/main/java/io/lettuce/core/TransactionResult.java
+++ b/src/main/java/io/lettuce/core/TransactionResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,10 +28,18 @@
 public interface TransactionResult extends Iterable<Object> {
 
     /**
-     *
-     * @return {@literal true} if the transaction was rolled back
+     * @return {@literal true} if the transaction batch was discarded.
+     * @since 5.1
+     */
+    boolean wasDiscarded();
+
+    /**
+     * @return {@literal true} if the transaction batch was discarded.
+     * @deprecated use renamed method {@link #wasDiscarded()} as Redis has no notion of rollback.
      */
-    boolean wasRolledBack();
+    default boolean wasRolledBack() {
+        return wasDiscarded();
+    }
 
     /**
      * Returns the number of elements in this collection. If this {@link TransactionResult} contains more than
diff --git a/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java b/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java
index 1e1070281d..4f087c8f0d 100644
--- a/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java
+++ b/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,30 +30,26 @@
  */
 class DefaultTransactionResult implements Iterable<Object>, TransactionResult {
 
-    private final boolean wasRolledBack;
+    private final boolean discarded;
     private final List<Object> result;
 
     /**
      * Creates a new {@link DefaultTransactionResult}.
      *
-     * @param wasRolledBack {@literal true} if the transaction was rolled back.
+     * @param discarded {@literal true} if the transaction is discarded.
      * @param result the transaction result, must not be {@literal null}.
      */
-    public DefaultTransactionResult(boolean wasRolledBack, List<Object> result) {
+    public DefaultTransactionResult(boolean discarded, List<Object> result) {
 
         LettuceAssert.notNull(result, "Result must not be null");
 
-        this.wasRolledBack = wasRolledBack;
+        this.discarded = discarded;
         this.result = result;
     }
 
-    /**
-     *
-     * @return {@literal true} if the transaction was rolled back
-     */
     @Override
-    public boolean wasRolledBack() {
-        return wasRolledBack;
+    public boolean wasDiscarded() {
+        return discarded;
     }
 
     @Override
@@ -86,7 +82,7 @@ public String toString() {
 
         StringBuilder sb = new StringBuilder();
         sb.append(getClass().getSimpleName());
-        sb.append(" [wasRolledBack=").append(wasRolledBack);
+        sb.append(" [wasRolledBack=").append(discarded);
         sb.append(", responses=").append(size());
         sb.append(']');
         return sb.toString();
diff --git a/src/main/java/io/lettuce/core/output/MultiOutput.java b/src/main/java/io/lettuce/core/output/MultiOutput.java
index fe16faa400..2ef7404596 100644
--- a/src/main/java/io/lettuce/core/output/MultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/MultiOutput.java
@@ -38,7 +38,7 @@ public class MultiOutput<K, V> extends CommandOutput<K, V, TransactionResult> {
 
     private final Queue<RedisCommand<K, V, ?>> queue;
     private List<Object> responses = new ArrayList<>();
-    private Boolean rolledBack;
+    private Boolean discarded;
 
     public MultiOutput(RedisCodec<K, V> codec) {
         super(codec, null);
@@ -74,8 +74,8 @@ public void set(ByteBuffer bytes) {
     @Override
     public void multi(int count) {
 
-        if (rolledBack == null) {
-            rolledBack = count == -1;
+        if (discarded == null) {
+            discarded = count == -1;
         } else {
             if (!queue.isEmpty()) {
                 queue.peek().getOutput().multi(count);
@@ -115,6 +115,6 @@ public void complete(int depth) {
 
     @Override
     public TransactionResult get() {
-        return new DefaultTransactionResult(rolledBack == null ? false : rolledBack, responses);
+        return new DefaultTransactionResult(discarded == null ? false : discarded, responses);
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/CustomCommandTest.java b/src/test/java/io/lettuce/core/commands/CustomCommandTest.java
index c5ae3fa3fd..6fc46c6328 100644
--- a/src/test/java/io/lettuce/core/commands/CustomCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/CustomCommandTest.java
@@ -121,7 +121,7 @@ public void standaloneAsyncBatchTransaction() {
         assertThat(async2.join()).isEqualTo("OK");
 
         TransactionResult transactionResult = async3.join();
-        assertThat(transactionResult.wasRolledBack()).isFalse();
+        assertThat(transactionResult.wasDiscarded()).isFalse();
         assertThat(transactionResult.<String> get(0)).isEqualTo("OK");
     }
 
diff --git a/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java b/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
index c3dcc115bc..1a95ca2f96 100644
--- a/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
@@ -64,7 +64,7 @@ public void watch() {
 
         TransactionResult transactionResult = redis.exec();
 
-        assertThat(transactionResult.wasRolledBack()).isTrue();
+        assertThat(transactionResult.wasDiscarded()).isTrue();
         assertThat(transactionResult).isEmpty();
 
     }
@@ -82,7 +82,7 @@ public void commandsReturnNullInMulti() {
         assertThat(redis.get(key)).isNull();
 
         TransactionResult exec = redis.exec();
-        assertThat(exec.wasRolledBack()).isFalse();
+        assertThat(exec.wasDiscarded()).isFalse();
         assertThat(exec).contains("OK", value);
 
         assertThat(redis.get(key)).isEqualTo(value);
@@ -102,7 +102,7 @@ public void execmulti() {
     public void emptyMulti() {
         redis.multi();
         TransactionResult exec = redis.exec();
-        assertThat(exec.wasRolledBack()).isFalse();
+        assertThat(exec.wasDiscarded()).isFalse();
         assertThat(exec).isEmpty();
     }
 
@@ -113,7 +113,7 @@ public void errorInMulti() {
         redis.lpop(key);
         redis.get(key);
         TransactionResult values = redis.exec();
-        assertThat(values.wasRolledBack()).isFalse();
+        assertThat(values.wasDiscarded()).isFalse();
         assertThat((String) values.get(0)).isEqualTo("OK");
         assertThat(values.get(1) instanceof RedisException).isTrue();
         assertThat((String) values.get(2)).isEqualTo(value);
diff --git a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
index d08424b961..5adc098e4e 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
@@ -85,7 +85,7 @@ public void watchRollback() {
 
         StepVerifier.create(commands.exec()).consumeNextWith(actual -> {
             assertThat(actual).isNotNull();
-            assertThat(actual.wasRolledBack()).isTrue();
+            assertThat(actual.wasDiscarded()).isTrue();
         });
     }
 

From dc1ac2ccd37822dd42830b5c569da873c3048a7f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 19 Dec 2017 12:14:53 +0100
Subject: [PATCH 385/808] Polishing

Improve SLOWLOG test resiliency, add assumption in case the build is slower to not impact our test.

Improve test synchronization to reduce test failures.
---
 src/test/java/io/lettuce/SslTest.java         | 28 ++++----
 .../core/cluster/AbstractClusterTest.java     |  4 +-
 .../core/cluster/RedisClusterClientTest.java  | 68 ++++++++++---------
 .../core/commands/ServerCommandTest.java      | 23 ++++---
 .../core/protocol/CommandArgsTest.java        | 48 ++++++++-----
 5 files changed, 98 insertions(+), 73 deletions(-)

diff --git a/src/test/java/io/lettuce/SslTest.java b/src/test/java/io/lettuce/SslTest.java
index 132ccf6dea..258d037fb9 100644
--- a/src/test/java/io/lettuce/SslTest.java
+++ b/src/test/java/io/lettuce/SslTest.java
@@ -23,6 +23,7 @@
 
 import java.io.File;
 import java.security.cert.CertificateException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
@@ -30,6 +31,7 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -244,22 +246,24 @@ public void pubSubSslAndBreakConnection() throws Exception {
         redisClient.setOptions(ClientOptions.builder().suspendReconnectOnProtocolFailure(true).build());
 
         RedisPubSubAsyncCommands<String, String> connection = redisClient.connectPubSub(redisURI).async();
-        connection.subscribe("c1").get();
-        connection.subscribe("c2").get();
-        Thread.sleep(200);
-
         RedisPubSubAsyncCommands<String, String> connection2 = redisClient.connectPubSub(redisURI).async();
 
-        assertThat(connection2.pubsubChannels().get()).contains("c1", "c2");
-
         redisURI.setVerifyPeer(true);
+        connection.subscribe("c1");
+        connection.subscribe("c2");
 
-        connection.quit();
-        Thread.sleep(500);
+        Wait.untilTrue(() -> connection2.pubsubChannels().get().containsAll(Arrays.asList("c1", "c2"))).waitOrTimeout();
+
+        try {
+            connection.quit().get();
+        } catch (Exception e) {
+        }
+
+        List<String> future = connection2.pubsubChannels().get();
+        assertThat(future).doesNotContain("c1", "c2");
 
-        RedisFuture<List<String>> future = connection2.pubsubChannels();
-        assertThat(future.get()).doesNotContain("c1", "c2");
-        assertThat(future.isDone()).isEqualTo(true);
+        RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection.getStatefulConnection());
+        Wait.untilNotEquals(null, () -> ReflectionTestUtils.getField(channelWriter, "connectionError")).waitOrTimeout();
 
         RedisFuture<Void> defectFuture = connection.subscribe("foo");
 
@@ -273,7 +277,7 @@ public void pubSubSslAndBreakConnection() throws Exception {
             assertThat(e).hasRootCauseInstanceOf(CertificateException.class);
         }
 
-        assertThat(defectFuture.isDone()).isEqualTo(true);
+        assertThat(defectFuture).isDone();
 
         connection.getStatefulConnection().close();
         connection2.getStatefulConnection().close();
diff --git a/src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java b/src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java
index 6bc200e5df..8fbffab13e 100644
--- a/src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java
@@ -15,11 +15,11 @@
  */
 package io.lettuce.core.cluster;
 
-import io.lettuce.TestClientResources;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 
+import io.lettuce.TestClientResources;
 import io.lettuce.core.AbstractTest;
 import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
@@ -59,7 +59,7 @@ public class AbstractClusterTest extends AbstractTest {
     public ClusterRule clusterRule = new ClusterRule(clusterClient, port1, port2, port3, port4);
 
     @BeforeClass
-    public static void setupClusterClient() throws Exception {
+    public static void setupClusterClient() {
         clusterClient = RedisClusterClient.create(
                 TestClientResources.get(), LettuceLists.unmodifiableList(RedisURI.Builder.redis(host, port1).build()));
     }
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
index 51f39b4f11..76ceb05548 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
@@ -30,6 +30,7 @@
 import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.TestClientResources;
+import io.lettuce.Wait;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -64,8 +65,10 @@ public class RedisClusterClientTest extends AbstractClusterTest {
     protected StatefulRedisClusterConnection<String, String> connection;
 
     @BeforeClass
-    public static void setupClient() throws Exception {
+    public static void setupClient() {
+
         setupClusterClient();
+
         client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port1).build());
         clusterClient = RedisClusterClient.create(TestClientResources.get(),
                 Collections.singletonList(RedisURI.Builder.redis(host, port1).withClientName("my-client").build()));
@@ -79,7 +82,7 @@ public static void shutdownClient() {
     }
 
     @Before
-    public void before() throws Exception {
+    public void before() {
 
         clusterClient.setOptions(ClusterClientOptions.create());
         clusterRule.getClusterClient().reloadPartitions();
@@ -100,7 +103,7 @@ public void before() throws Exception {
     }
 
     @After
-    public void after() throws Exception {
+    public void after() {
         connection.close();
         redis1.close();
 
@@ -111,21 +114,21 @@ public void after() throws Exception {
     }
 
     @Test
-    public void statefulConnectionFromSync() throws Exception {
+    public void statefulConnectionFromSync() {
         RedisAdvancedClusterCommands<String, String> sync = clusterClient.connect().sync();
         assertThat(sync.getStatefulConnection().sync()).isSameAs(sync);
         connection.close();
     }
 
     @Test
-    public void statefulConnectionFromAsync() throws Exception {
+    public void statefulConnectionFromAsync() {
         RedisAdvancedClusterAsyncCommands<String, String> async = clusterClient.connect().async();
         assertThat(async.getStatefulConnection().async()).isSameAs(async);
         connection.close();
     }
 
     @Test
-    public void shouldApplyTimeoutOnRegularConnection() throws Exception {
+    public void shouldApplyTimeoutOnRegularConnection() {
 
         clusterClient.setDefaultTimeout(1, TimeUnit.MINUTES);
 
@@ -138,7 +141,7 @@ public void shouldApplyTimeoutOnRegularConnection() throws Exception {
     }
 
     @Test
-    public void shouldApplyTimeoutOnRegularConnectionUsingCodec() throws Exception {
+    public void shouldApplyTimeoutOnRegularConnectionUsingCodec() {
 
         clusterClient.setDefaultTimeout(1, TimeUnit.MINUTES);
 
@@ -151,7 +154,7 @@ public void shouldApplyTimeoutOnRegularConnectionUsingCodec() throws Exception {
     }
 
     @Test
-    public void shouldApplyTimeoutOnPubSubConnection() throws Exception {
+    public void shouldApplyTimeoutOnPubSubConnection() {
 
         clusterClient.setDefaultTimeout(1, TimeUnit.MINUTES);
 
@@ -162,7 +165,7 @@ public void shouldApplyTimeoutOnPubSubConnection() throws Exception {
     }
 
     @Test
-    public void shouldApplyTimeoutOnPubSubConnectionUsingCodec() throws Exception {
+    public void shouldApplyTimeoutOnPubSubConnectionUsingCodec() {
 
         clusterClient.setDefaultTimeout(1, TimeUnit.MINUTES);
 
@@ -178,38 +181,39 @@ public void clusterConnectionShouldSetClientName() throws Exception {
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
 
         assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
+        Thread.sleep(10);
         connection.sync().quit();
+        Wait.untilTrue(connection::isOpen).waitOrTimeout();
         assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
 
         StatefulRedisConnection<String, String> nodeConnection = connection.getConnection(connection.getPartitions()
                 .getPartition(0).getNodeId());
         assertThat(nodeConnection.sync().clientGetname()).isEqualTo("my-client");
-        nodeConnection.sync().quit();
-        assertThat(nodeConnection.sync().clientGetname()).isEqualTo("my-client");
 
         connection.close();
     }
 
     @Test
-    public void pubSubclusterConnectionShouldSetClientName() throws Exception {
+    public void pubSubclusterConnectionShouldSetClientName() throws InterruptedException {
 
         StatefulRedisClusterPubSubConnection<String, String> connection = clusterClient.connectPubSub();
 
         assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
+        Thread.sleep(10);
         connection.sync().quit();
+        Wait.untilTrue(connection::isOpen).waitOrTimeout();
+
         assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
 
         StatefulRedisConnection<String, String> nodeConnection = connection.getConnection(connection.getPartitions()
                 .getPartition(0).getNodeId());
         assertThat(nodeConnection.sync().clientGetname()).isEqualTo("my-client");
-        nodeConnection.sync().quit();
-        assertThat(nodeConnection.sync().clientGetname()).isEqualTo("my-client");
 
         connection.close();
     }
 
     @Test
-    public void reloadPartitions() throws Exception {
+    public void reloadPartitions() {
         assertThat(clusterClient.getPartitions()).hasSize(4);
 
         assertThat(clusterClient.getPartitions().getPartition(0).getUri());
@@ -226,7 +230,7 @@ public void reloadPartitions() throws Exception {
     }
 
     @Test
-    public void testClusteredOperations() throws Exception {
+    public void testClusteredOperations() {
 
         SlotHash.getSlot(KEY_B.getBytes()); // 3300 -> Node 1 and Slave (Node 3)
         SlotHash.getSlot(KEY_A.getBytes()); // 15495 -> Node 2
@@ -254,7 +258,7 @@ public void testClusteredOperations() throws Exception {
     }
 
     @Test
-    public void testReset() throws Exception {
+    public void testReset() {
 
         clusterClient.reloadPartitions();
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
@@ -355,7 +359,7 @@ public void testClusterRedirectionLimit() throws Exception {
     }
 
     @Test(expected = RedisException.class)
-    public void closeConnection() throws Exception {
+    public void closeConnection() {
 
         RedisAdvancedClusterCommands<String, String> connection = clusterClient.connect().sync();
 
@@ -414,7 +418,7 @@ public void clusterAuthPingBeforeConnect() throws Exception {
     }
 
     @Test(expected = RedisException.class)
-    public void clusterNeedsAuthButNotSupplied() throws Exception {
+    public void clusterNeedsAuthButNotSupplied() {
 
         RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.Builder.redis(TestSettings.host(), port7).build());
@@ -431,7 +435,7 @@ public void clusterNeedsAuthButNotSupplied() throws Exception {
     }
 
     @Test
-    public void noClusterNodeAvailable() throws Exception {
+    public void noClusterNodeAvailable() {
 
         RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.Builder.redis(host, 40400).build());
@@ -446,7 +450,7 @@ public void noClusterNodeAvailable() throws Exception {
     }
 
     @Test
-    public void getClusterNodeConnection() throws Exception {
+    public void getClusterNodeConnection() {
 
         RedisClusterNode redis1Node = getOwnPartition(redissync2);
 
@@ -458,7 +462,7 @@ public void getClusterNodeConnection() throws Exception {
     }
 
     @Test
-    public void operateOnNodeConnection() throws Exception {
+    public void operateOnNodeConnection() {
 
         sync.set(KEY_A, value);
         sync.set(KEY_B, "d");
@@ -506,7 +510,7 @@ public void testStatefulConnection() throws Exception {
     }
 
     @Test(expected = RedisException.class)
-    public void getButNoPartitionForSlothash() throws Exception {
+    public void getButNoPartitionForSlothash() {
 
         for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
             redisClusterNode.setSlots(new ArrayList<>());
@@ -546,7 +550,7 @@ public void readOnlyOnCluster() throws Exception {
     }
 
     @Test
-    public void getKeysInSlot() throws Exception {
+    public void getKeysInSlot() {
 
         sync.set(KEY_A, value);
         sync.set(KEY_B, value);
@@ -560,7 +564,7 @@ public void getKeysInSlot() throws Exception {
     }
 
     @Test
-    public void countKeysInSlot() throws Exception {
+    public void countKeysInSlot() {
 
         sync.set(KEY_A, value);
         sync.set(KEY_B, value);
@@ -578,24 +582,24 @@ public void countKeysInSlot() throws Exception {
     }
 
     @Test
-    public void testClusterCountFailureReports() throws Exception {
+    public void testClusterCountFailureReports() {
         RedisClusterNode ownPartition = getOwnPartition(redissync1);
         assertThat(redissync1.clusterCountFailureReports(ownPartition.getNodeId())).isGreaterThanOrEqualTo(0);
     }
 
     @Test
-    public void testClusterKeyslot() throws Exception {
+    public void testClusterKeyslot() {
         assertThat(redissync1.clusterKeyslot(KEY_A)).isEqualTo(SLOT_A);
         assertThat(SlotHash.getSlot(KEY_A)).isEqualTo(SLOT_A);
     }
 
     @Test
-    public void testClusterSaveconfig() throws Exception {
+    public void testClusterSaveconfig() {
         assertThat(redissync1.clusterSaveconfig()).isEqualTo("OK");
     }
 
     @Test
-    public void testClusterSetConfigEpoch() throws Exception {
+    public void testClusterSetConfigEpoch() {
         try {
             redissync1.clusterSetConfigEpoch(1L);
         } catch (RedisException e) {
@@ -604,7 +608,7 @@ public void testClusterSetConfigEpoch() throws Exception {
     }
 
     @Test
-    public void testReadFrom() throws Exception {
+    public void testReadFrom() {
         StatefulRedisClusterConnection<String, String> statefulConnection = connection;
 
         assertThat(statefulConnection.getReadFrom()).isEqualTo(ReadFrom.MASTER);
@@ -614,12 +618,12 @@ public void testReadFrom() throws Exception {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void testReadFromNull() throws Exception {
+    public void testReadFromNull() {
         connection.setReadFrom(null);
     }
 
     @Test
-    public void testPfmerge() throws Exception {
+    public void testPfmerge() {
 
         RedisAdvancedClusterCommands<String, String> connection = clusterClient.connect().sync();
 
diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
index d877d2ba58..18e449d724 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
@@ -58,7 +58,7 @@ public void bgrewriteaof() {
     @Test
     public void bgsave() {
 
-        Wait.untilTrue(() -> !redis.info().contains("aof_rewrite_in_progress:1")).waitOrTimeout();
+        Wait.untilTrue(this::noSaveInProgress).waitOrTimeout();
 
         String msg = "Background saving started";
         assertThat(redis.bgsave()).isEqualTo(msg);
@@ -288,7 +288,7 @@ public void lastsave() {
     @Test
     public void save() {
 
-        Wait.untilTrue(() -> !redis.info().contains("aof_rewrite_in_progress:1")).waitOrTimeout();
+        Wait.untilTrue(this::noSaveInProgress).waitOrTimeout();
 
         assertThat(redis.save()).isEqualTo("OK");
     }
@@ -325,6 +325,7 @@ public void slaveofNoOne() {
     @Test
     @SuppressWarnings("unchecked")
     public void slowlog() {
+
         long start = System.currentTimeMillis() / 1000;
 
         assertThat(redis.configSet("slowlog-log-slower-than", "0")).isEqualTo("OK");
@@ -332,7 +333,7 @@ public void slowlog() {
         redis.set(key, value);
 
         List<Object> log = redis.slowlogGet();
-        assertThat(log).hasSize(2);
+        assumeTrue(!log.isEmpty());
 
         List<Object> entry = (List<Object>) log.get(0);
         assertThat(entry.size()).isGreaterThanOrEqualTo(4);
@@ -341,15 +342,8 @@ public void slowlog() {
         assertThat(entry.get(2) instanceof Long).isTrue();
         assertThat(entry.get(3)).isEqualTo(list("SET", key, value));
 
-        entry = (List<Object>) log.get(1);
-        assertThat(entry.size()).isGreaterThanOrEqualTo(4);
-        assertThat(entry.get(0) instanceof Long).isTrue();
-        assertThat((Long) entry.get(1) >= start).isTrue();
-        assertThat(entry.get(2) instanceof Long).isTrue();
-        assertThat(entry.get(3)).isEqualTo(list("SLOWLOG", "RESET"));
-
         assertThat(redis.slowlogGet(1)).hasSize(1);
-        assertThat((long) redis.slowlogLen()).isGreaterThanOrEqualTo(4);
+        assertThat((long) redis.slowlogLen()).isGreaterThanOrEqualTo(1);
 
         redis.configSet("slowlog-log-slower-than", "10000");
     }
@@ -373,4 +367,11 @@ public void swapdb() {
         redis.select(2);
         assertThat(redis.get(key)).isEqualTo("value1");
     }
+
+    private boolean noSaveInProgress() {
+
+        String info = redis.info();
+
+        return !info.contains("aof_rewrite_in_progress:1") && !info.contains("rdb_bgsave_in_progress:1");
+    }
 }
diff --git a/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java b/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
index d8bba0ce23..89af01531a 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,15 +35,15 @@ public class CommandArgsTest {
     private Utf8StringCodec codec = new Utf8StringCodec();
 
     @Test
-    public void getFirstIntegerShouldReturnNull() throws Exception {
+    public void getFirstIntegerShouldReturnNull()  {
 
-        CommandArgs<String, String> args = new CommandArgs<>(codec);
+        CommandArgs<String, String> args = new CommandArgs<>(codec).add("foo");
 
         assertThat(CommandArgsAccessor.getFirstInteger(args)).isNull();
     }
 
     @Test
-    public void getFirstIntegerShouldReturnFirstInteger() throws Exception {
+    public void getFirstIntegerShouldReturnFirstInteger()  {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).add(1L).add(127).add(128).add(129).add(0).add(-1);
 
@@ -51,7 +51,7 @@ public void getFirstIntegerShouldReturnFirstInteger() throws Exception {
     }
 
     @Test
-    public void getFirstIntegerShouldReturnFirstNegativeInteger() throws Exception {
+    public void getFirstIntegerShouldReturnFirstNegativeInteger()  {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).add(-1L).add(-127).add(-128).add(-129);
 
@@ -59,15 +59,15 @@ public void getFirstIntegerShouldReturnFirstNegativeInteger() throws Exception {
     }
 
     @Test
-    public void getFirstStringShouldReturnNull() throws Exception {
+    public void getFirstStringShouldReturnNull()  {
 
-        CommandArgs<String, String> args = new CommandArgs<>(codec);
+        CommandArgs<String, String> args = new CommandArgs<>(codec).add(1);
 
         assertThat(CommandArgsAccessor.getFirstString(args)).isNull();
     }
 
     @Test
-    public void getFirstStringShouldReturnFirstString() throws Exception {
+    public void getFirstStringShouldReturnFirstString()  {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).add("one").add("two");
 
@@ -75,15 +75,31 @@ public void getFirstStringShouldReturnFirstString() throws Exception {
     }
 
     @Test
-    public void getFirstEncodedKeyShouldReturnNull() throws Exception {
+    public void getFirstCharArrayShouldReturnCharArray()  {
 
-        CommandArgs<String, String> args = new CommandArgs<>(codec);
+        CommandArgs<String, String> args = new CommandArgs<>(codec).add(1L).add("two".toCharArray());
+
+        assertThat(CommandArgsAccessor.getFirstCharArray(args)).isEqualTo("two".toCharArray());
+    }
+
+    @Test
+    public void getFirstCharArrayShouldReturnNull()  {
+
+        CommandArgs<String, String> args = new CommandArgs<>(codec).add(1L);
+
+        assertThat(CommandArgsAccessor.getFirstCharArray(args)).isNull();
+    }
+
+    @Test
+    public void getFirstEncodedKeyShouldReturnNull()  {
+
+        CommandArgs<String, String> args = new CommandArgs<>(codec).add(1L);
 
         assertThat(CommandArgsAccessor.getFirstString(args)).isNull();
     }
 
     @Test
-    public void getFirstEncodedKeyShouldReturnFirstKey() throws Exception {
+    public void getFirstEncodedKeyShouldReturnFirstKey()  {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).addKey("one").addKey("two");
 
@@ -91,7 +107,7 @@ public void getFirstEncodedKeyShouldReturnFirstKey() throws Exception {
     }
 
     @Test
-    public void addValues() throws Exception {
+    public void addValues()  {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).addValues(Arrays.asList("1", "2"));
 
@@ -105,7 +121,7 @@ public void addValues() throws Exception {
     }
 
     @Test
-    public void addByte() throws Exception {
+    public void addByte()  {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).add("one".getBytes());
 
@@ -119,7 +135,7 @@ public void addByte() throws Exception {
     }
 
     @Test
-    public void addByteUsingByteCodec() throws Exception {
+    public void addByteUsingByteCodec()  {
 
         CommandArgs<byte[], byte[]> args = new CommandArgs<>(ByteArrayCodec.INSTANCE).add("one".getBytes());
 
@@ -133,7 +149,7 @@ public void addByteUsingByteCodec() throws Exception {
     }
 
     @Test
-    public void addValueUsingByteCodec() throws Exception {
+    public void addValueUsingByteCodec()  {
 
         CommandArgs<byte[], byte[]> args = new CommandArgs<>(ByteArrayCodec.INSTANCE).addValue("one".getBytes());
 
@@ -147,7 +163,7 @@ public void addValueUsingByteCodec() throws Exception {
     }
 
     @Test
-    public void addKeyUsingByteCodec() throws Exception {
+    public void addKeyUsingByteCodec()  {
 
         CommandArgs<byte[], byte[]> args = new CommandArgs<>(ByteArrayCodec.INSTANCE).addValue("one".getBytes());
 

From c3b777b563ccb147cd0cce4d6a2dc13c346fa8a5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 19 Dec 2017 14:58:31 +0100
Subject: [PATCH 386/808] Upgrade to Redis 4.0.6

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 64ff9b5b34..38b4684add 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ env:
   matrix:
     - REDIS=unstable
     - PROFILE=jmh
-    - REDIS=4.0.2
+    - REDIS=4.0.6
     - REDIS=3.2.11
 
 sudo: false

From 883b3e4f61b4607c86ad399aa5520de6cee2f340 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 19 Dec 2017 15:30:53 +0100
Subject: [PATCH 387/808] Consider Sentinel slave changes to refresh topology
 #669

Lettuce now considers Sentinel messages on channels +sdown, -sdown and +slave as signals to refresh topology. This change allows to add new nodes during runtime and close connections to nodes that are not available (connectable). Temporary failures to connect a slave result in closing the client connection until the node is reachable again.
---
 .../masterslave/SentinelTopologyRefresh.java  | 16 +++-----
 .../SentinelTopologyRefreshTest.java          | 41 ++++++++++++++++++-
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
index ed2eeb3e5f..c4fdcb915f 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
@@ -358,6 +358,8 @@ interface MessagePredicate extends BiPredicate<String, String> {
     private static class TopologyRefreshMessagePredicate implements MessagePredicate {
 
         private final String masterId;
+        private Set<String> TOPOLOGY_CHANGE_CHANNELS = new HashSet<>(Arrays.asList("+slave", "+sdown", "-sdown",
+                "fix-slave-config", "+convert-to-slave", "+role-change"));
 
         TopologyRefreshMessagePredicate(String masterId) {
             this.masterId = masterId;
@@ -367,26 +369,20 @@ private static class TopologyRefreshMessagePredicate implements MessagePredicate
         public boolean test(String channel, String message) {
 
             // trailing spaces after the master name are not bugs
-            if (channel.equals("+elected-leader")) {
+            if (channel.equals("+elected-leader") || channel.equals("+reset-master")) {
                 if (message.startsWith(String.format("master %s ", masterId))) {
                     return true;
                 }
             }
 
-            if (channel.equals("+switch-master")) {
-                if (message.startsWith(String.format("%s ", masterId))) {
-                    return true;
-                }
-            }
-
-            if (channel.equals("fix-slave-config")) {
+            if (TOPOLOGY_CHANGE_CHANNELS.contains(channel)) {
                 if (message.contains(String.format("@ %s ", masterId))) {
                     return true;
                 }
             }
 
-            if (channel.equals("+convert-to-slave") || channel.equals("+role-change")) {
-                if (message.contains(String.format("@ %s ", masterId))) {
+            if (channel.equals("+switch-master")) {
+                if (message.startsWith(String.format("%s ", masterId))) {
                     return true;
                 }
             }
diff --git a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
index 4c1fa88216..793844d8e4 100644
--- a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
@@ -227,13 +227,52 @@ public void shouldNotProcessOtherEvents() {
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
 
-        adapter.message("*", "*", "irreleval");
+        adapter.message("*", "*", "irrelevant");
 
         verify(redisClient, times(3)).getResources();
         verify(redisClient).connectPubSubAsync(any(), any());
         verifyNoMoreInteractions(redisClient);
     }
 
+    @Test
+    public void shouldProcessSlaveDown() {
+
+        RedisPubSubAdapter<String, String> adapter = getAdapter();
+        sut.bind(refreshRunnable);
+
+        adapter.message("*", "+sdown", "slave 127.0.0.1:6483 127.0.0.1 6483 @ mymaster 127.0.0.1 6482");
+
+        verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
+        captor.getValue().run();
+        verify(refreshRunnable, times(1)).run();
+    }
+
+    @Test
+    public void shouldProcessSlaveAdded() {
+
+        RedisPubSubAdapter<String, String> adapter = getAdapter();
+        sut.bind(refreshRunnable);
+
+        adapter.message("*", "+slave", "slave 127.0.0.1:8483 127.0.0.1 8483 @ mymaster 127.0.0.1 6482");
+
+        verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
+        captor.getValue().run();
+        verify(refreshRunnable, times(1)).run();
+    }
+
+    @Test
+    public void shouldProcessSlaveBackUp() {
+
+        RedisPubSubAdapter<String, String> adapter = getAdapter();
+        sut.bind(refreshRunnable);
+
+        adapter.message("*", "-sdown", "slave 127.0.0.1:6483 127.0.0.1 6483 @ mymaster 127.0.0.1 6482");
+
+        verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
+        captor.getValue().run();
+        verify(refreshRunnable, times(1)).run();
+    }
+
     @Test
     public void shouldProcessElectedLeader() {
 

From 77f2c2c56c34896a7bbf75ee61cb2d1c8360a636 Mon Sep 17 00:00:00 2001
From: koji lin <koji.lin@gmail.com>
Date: Mon, 15 Jan 2018 16:04:45 +0900
Subject: [PATCH 388/808] Improve ConnectionWatchdog synchronization #679

ConnectionWatchdog now uses AtomicBoolean to synchronize the scheduling state.
---
 .../core/protocol/ConnectionWatchdog.java     | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
index 2f3f5734b2..1214afbd5e 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
@@ -18,6 +18,8 @@
 import java.net.SocketAddress;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Supplier;
 
 import reactor.core.publisher.Mono;
 import io.lettuce.core.ClientOptions;
@@ -59,6 +61,7 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
     private long lastReconnectionLogging = -1;
     private String logPrefix;
 
+    private final AtomicBoolean isWaitingReconnection;
     private volatile int attempts;
     private volatile boolean armed;
     private volatile boolean listenOnChannelInactive;
@@ -95,6 +98,7 @@ public ConnectionWatchdog(Delay reconnectDelay, ClientOptions clientOptions, Boo
         this.timer = timer;
         this.reconnectWorkers = reconnectWorkers;
         this.reconnectionListener = reconnectionListener;
+        this.isWaitingReconnection = new AtomicBoolean(false);
 
         Mono<SocketAddress> wrappedSocketAddressSupplier = socketAddressSupplier.doOnNext(addr -> remoteAddress = addr)
                 .onErrorResume(
@@ -141,6 +145,7 @@ void prepareClose() {
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
 
+        isWaitingReconnection.set(false);
         channel = ctx.channel();
         reconnectScheduleTimeout = null;
         logPrefix = null;
@@ -182,7 +187,7 @@ void arm() {
     /**
      * Schedule reconnect if channel is not available/not active.
      */
-    public synchronized void scheduleReconnect() {
+    public void scheduleReconnect() {
 
         logger.debug("{} scheduleReconnect()", logPrefix());
 
@@ -196,9 +201,11 @@ public synchronized void scheduleReconnect() {
             return;
         }
 
-        if ((channel == null || !channel.isActive()) && reconnectScheduleTimeout == null) {
+        if ((channel == null || !channel.isActive()) && !isWaitingReconnection.get()) {
+            if (!isWaitingReconnection.compareAndSet(false, true)) {
+                return;
+            }
             attempts++;
-
             final int attempt = attempts;
             int timeout = (int) reconnectDelay.createDelay(attempt).toMillis();
             logger.debug("{} Reconnect attempt {}, delay {}ms", logPrefix(), attempt, timeout);
@@ -215,6 +222,11 @@ public synchronized void scheduleReconnect() {
                     return null;
                 });
             }, timeout, TimeUnit.MILLISECONDS);
+
+            // Set back to null when ConnectionWatchdog#run runs earlier than reconnectScheduleTimeout's assignment.
+            if (!isWaitingReconnection.get()) {
+                reconnectScheduleTimeout = null;
+            }
         } else {
             logger.debug("{} Skipping scheduleReconnect() because I have an active channel", logPrefix());
         }
@@ -230,6 +242,7 @@ public synchronized void scheduleReconnect() {
      */
     public void run(int attempt) throws Exception {
 
+        isWaitingReconnection.set(false);
         reconnectScheduleTimeout = null;
 
         if (!isEventLoopGroupActive()) {

From f3efb1d54f477e0cc19bb63e063739b3c2a1c9ec Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 22 Jan 2018 16:14:23 +0100
Subject: [PATCH 389/808] Polishing #679
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Slightly rename fields. Cancel reconnect schedule on prepareClose(…). Edit log messages to express the actual state. Skip reconnect if suspended.
---
 .../core/protocol/ConnectionWatchdog.java     | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
index 1214afbd5e..b722199583 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Supplier;
 
 import reactor.core.publisher.Mono;
 import io.lettuce.core.ClientOptions;
@@ -42,6 +41,7 @@
  *
  * @author Will Glozer
  * @author Mark Paluch
+ * @author Koji Lin
  */
 @ChannelHandler.Sharable
 public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
@@ -61,7 +61,7 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
     private long lastReconnectionLogging = -1;
     private String logPrefix;
 
-    private final AtomicBoolean isWaitingReconnection;
+    private final AtomicBoolean reconnectSchedulerSync;
     private volatile int attempts;
     private volatile boolean armed;
     private volatile boolean listenOnChannelInactive;
@@ -98,7 +98,7 @@ public ConnectionWatchdog(Delay reconnectDelay, ClientOptions clientOptions, Boo
         this.timer = timer;
         this.reconnectWorkers = reconnectWorkers;
         this.reconnectionListener = reconnectionListener;
-        this.isWaitingReconnection = new AtomicBoolean(false);
+        this.reconnectSchedulerSync = new AtomicBoolean(false);
 
         Mono<SocketAddress> wrappedSocketAddressSupplier = socketAddressSupplier.doOnNext(addr -> remoteAddress = addr)
                 .onErrorResume(
@@ -139,13 +139,18 @@ void prepareClose() {
         setListenOnChannelInactive(false);
         setReconnectSuspended(true);
 
+        Timeout reconnectScheduleTimeout = this.reconnectScheduleTimeout;
+        if (reconnectScheduleTimeout != null && !reconnectScheduleTimeout.isCancelled()) {
+            reconnectScheduleTimeout.cancel();
+        }
+
         reconnectionHandler.prepareClose();
     }
 
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
 
-        isWaitingReconnection.set(false);
+        reconnectSchedulerSync.set(false);
         channel = ctx.channel();
         reconnectScheduleTimeout = null;
         logPrefix = null;
@@ -201,10 +206,8 @@ public void scheduleReconnect() {
             return;
         }
 
-        if ((channel == null || !channel.isActive()) && !isWaitingReconnection.get()) {
-            if (!isWaitingReconnection.compareAndSet(false, true)) {
-                return;
-            }
+        if ((channel == null || !channel.isActive()) && reconnectSchedulerSync.compareAndSet(false, true)) {
+
             attempts++;
             final int attempt = attempts;
             int timeout = (int) reconnectDelay.createDelay(attempt).toMillis();
@@ -212,8 +215,10 @@ public void scheduleReconnect() {
 
             this.reconnectScheduleTimeout = timer.newTimeout(it -> {
 
+                reconnectScheduleTimeout = null;
+
                 if (!isEventLoopGroupActive()) {
-                    logger.debug("isEventLoopGroupActive() == false");
+                    logger.warn("Cannot execute scheduled reconnect timer, reconnect workers are terminated");
                     return;
                 }
 
@@ -224,7 +229,7 @@ public void scheduleReconnect() {
             }, timeout, TimeUnit.MILLISECONDS);
 
             // Set back to null when ConnectionWatchdog#run runs earlier than reconnectScheduleTimeout's assignment.
-            if (!isWaitingReconnection.get()) {
+            if (!reconnectSchedulerSync.get()) {
                 reconnectScheduleTimeout = null;
             }
         } else {
@@ -242,7 +247,7 @@ public void scheduleReconnect() {
      */
     public void run(int attempt) throws Exception {
 
-        isWaitingReconnection.set(false);
+        reconnectSchedulerSync.set(false);
         reconnectScheduleTimeout = null;
 
         if (!isEventLoopGroupActive()) {
@@ -255,6 +260,11 @@ public void run(int attempt) throws Exception {
             return;
         }
 
+        if (isReconnectSuspended()) {
+            logger.debug("Skip reconnect scheduling, reconnect is suspended");
+            return;
+        }
+
         boolean shouldLog = shouldLog();
 
         InternalLogLevel infoLevel = InternalLogLevel.INFO;

From 6355b25611881fd11a87291d0a8abe1a39d5fb1d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 23 Jan 2018 14:23:52 +0100
Subject: [PATCH 390/808] Allow completion of multiple subsequent MULTI calls
 #673

---
 .../io/lettuce/core/FutureSyncInvocationHandler.java |  4 ++--
 .../io/lettuce/core/StatefulRedisConnectionImpl.java |  4 ++--
 .../core/commands/TransactionCommandTest.java        | 12 +++++++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
index dfdde39d9d..826fcab28f 100644
--- a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -90,6 +90,6 @@ private static boolean isTransactionActive(StatefulConnection<?, ?> connection)
     }
 
     private static boolean isNonTxControlMethod(String methodName) {
-        return !methodName.equals("exec") && !methodName.equals("multi");
+        return !methodName.equals("exec") && !methodName.equals("multi") && !methodName.equals("discard");
     }
 }
diff --git a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
index c25ce4c79a..ca6b27e43a 100644
--- a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -240,7 +240,7 @@ protected <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> comm
             local.setOutput((MultiOutput) multiOutput);
         }
 
-        if (multi != null) {
+        if (multi != null && !local.getType().name().equals(MULTI.name())) {
             local = new TransactionalCommand<>(local);
             multi.add(local);
         }
diff --git a/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java b/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
index 1a95ca2f96..9376ea3414 100644
--- a/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
  * @author Mark Paluch
  */
 public class TransactionCommandTest extends AbstractRedisClientTest {
+
     @Rule
     public ExpectedException exception = ExpectedException.none();
 
@@ -125,4 +126,13 @@ public void execWithoutMulti() {
         exception.expectMessage("ERR EXEC without MULTI");
         redis.exec();
     }
+
+    @Test
+    public void multiCalledTwiceShouldFail() {
+        exception.expect(RedisCommandExecutionException.class);
+        exception.expectMessage("ERR MULTI calls can not be nested");
+
+        redis.multi();
+        redis.multi();
+    }
 }

From e2c624b3b8d823573f7ec200385879712cb5226f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 23 Jan 2018 14:34:30 +0100
Subject: [PATCH 391/808] Introduce RedisLoadingException to represent Redis
 LOADING response #682

---
 .../io/lettuce/core/ExceptionFactory.java     | 14 +++---
 .../lettuce/core/RedisLoadingException.java   | 45 +++++++++++++++++++
 .../io/lettuce/core/ExceptionFactoryTest.java | 14 +++++-
 3 files changed, 66 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/RedisLoadingException.java

diff --git a/src/main/java/io/lettuce/core/ExceptionFactory.java b/src/main/java/io/lettuce/core/ExceptionFactory.java
index 3f8e265a8f..aa18f1e7e1 100644
--- a/src/main/java/io/lettuce/core/ExceptionFactory.java
+++ b/src/main/java/io/lettuce/core/ExceptionFactory.java
@@ -23,7 +23,7 @@
 
 /**
  * Factory for Redis exceptions.
- * 
+ *
  * @author Mark Paluch
  * @since 4.5
  */
@@ -43,7 +43,7 @@ private ExceptionFactory() {
 
     /**
      * Create a {@link RedisCommandTimeoutException} with a detail message given the timeout.
-     * 
+     *
      * @param timeout the timeout value.
      * @return the {@link RedisCommandTimeoutException}.
      */
@@ -53,7 +53,7 @@ public static RedisCommandTimeoutException createTimeoutException(Duration timeo
 
     /**
      * Create a {@link RedisCommandTimeoutException} with a detail message given the message and timeout.
-     * 
+     *
      * @param message the detail message.
      * @param timeout the timeout value.
      * @return the {@link RedisCommandTimeoutException}.
@@ -100,7 +100,7 @@ private static boolean isExactMillis(Duration duration) {
     /**
      * Create a {@link RedisCommandExecutionException} with a detail message. Specific Redis error messages may create subtypes
      * of {@link RedisCommandExecutionException}.
-     * 
+     *
      * @param message the detail message.
      * @return the {@link RedisCommandExecutionException}.
      */
@@ -111,7 +111,7 @@ public static RedisCommandExecutionException createExecutionException(String mes
     /**
      * Create a {@link RedisCommandExecutionException} with a detail message and optionally a {@link Throwable cause}. Specific
      * Redis error messages may create subtypes of {@link RedisCommandExecutionException}.
-     * 
+     *
      * @param message the detail message.
      * @param cause the nested exception, may be {@literal null}.
      * @return the {@link RedisCommandExecutionException}.
@@ -128,6 +128,10 @@ public static RedisCommandExecutionException createExecutionException(String mes
                 return cause != null ? new RedisNoScriptException(message, cause) : new RedisNoScriptException(message);
             }
 
+            if (message.startsWith("LOADING")) {
+                return cause != null ? new RedisLoadingException(message, cause) : new RedisLoadingException(message);
+            }
+
             return cause != null ? new RedisCommandExecutionException(message, cause) : new RedisCommandExecutionException(
                     message);
         }
diff --git a/src/main/java/io/lettuce/core/RedisLoadingException.java b/src/main/java/io/lettuce/core/RedisLoadingException.java
new file mode 100644
index 0000000000..b18a362c28
--- /dev/null
+++ b/src/main/java/io/lettuce/core/RedisLoadingException.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+/**
+ * Exception that gets thrown when Redis is loading a dataset into memory and replying with a {@code LOADING} error response.
+ *
+ * @author Mark Paluch
+ * @since 4.5
+ */
+@SuppressWarnings("serial")
+public class RedisLoadingException extends RedisCommandExecutionException {
+
+    /**
+     * Create a {@code RedisLoadingException} with the specified detail message.
+     *
+     * @param msg the detail message.
+     */
+    public RedisLoadingException(String msg) {
+        super(msg);
+    }
+
+    /**
+     * Create a {@code RedisLoadingException} with the specified detail message and nested exception.
+     *
+     * @param msg the detail message.
+     * @param cause the nested exception.
+     */
+    public RedisLoadingException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+}
diff --git a/src/test/java/io/lettuce/core/ExceptionFactoryTest.java b/src/test/java/io/lettuce/core/ExceptionFactoryTest.java
index 7d1584d405..3002a78924 100644
--- a/src/test/java/io/lettuce/core/ExceptionFactoryTest.java
+++ b/src/test/java/io/lettuce/core/ExceptionFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,6 +58,16 @@ public void shouldCreateExecutionException() {
                 RedisCommandExecutionException.class).hasRootCauseInstanceOf(IllegalStateException.class);
     }
 
+    @Test
+    public void shouldCreateLoadingException() {
+
+        assertThat(ExceptionFactory.createExecutionException("LOADING foo bar")).isInstanceOf(RedisLoadingException.class)
+                .hasMessage("LOADING foo bar").hasNoCause();
+        assertThat(ExceptionFactory.createExecutionException("LOADING foo bar", new IllegalStateException()))
+                .isInstanceOf(RedisLoadingException.class).hasMessage("LOADING foo bar")
+                .hasRootCauseInstanceOf(IllegalStateException.class);
+    }
+
     @Test
     public void shouldFormatExactUnits() {
 
@@ -83,4 +93,4 @@ public void shouldFormatToMinmalApplicableTimeunit() {
                 "2005 millisecond(s)");
         assertThat(ExceptionFactory.formatTimeout(Duration.ofNanos(2))).isEqualTo("2 ns");
     }
-}
\ No newline at end of file
+}

From adaf4169b3021e4b95604751b8fc7e1a367c63f8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 23 Jan 2018 14:37:48 +0100
Subject: [PATCH 392/808] Polishing

---
 src/test/resources/log4j2-test.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/resources/log4j2-test.xml b/src/test/resources/log4j2-test.xml
index 5fd40668a3..34425b8f28 100644
--- a/src/test/resources/log4j2-test.xml
+++ b/src/test/resources/log4j2-test.xml
@@ -17,7 +17,6 @@
         <Logger name="io.lettuce.core" level="INFO"/>
         <Logger name="io.lettuce.core.cluster" level="INFO"/>
         <Logger name="io.lettuce.core.protocol" level="INFO"/>
-        <Logger name="io.netty" level="INFO"/>
         <Root level="INFO">
             <AppenderRef ref="Console"/>
             <AppenderRef ref="File"/>

From f72468dd641ed5b7e39f6723b3f07bfebd36f484 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 23 Jan 2018 14:42:42 +0100
Subject: [PATCH 393/808] Polishing

---
 .../lettuce/core/cluster/AsyncConnectionProviderTest.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java
index 06beb21698..e213bd3a04 100644
--- a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java
@@ -246,6 +246,7 @@ public void shouldCloseAsync() throws Exception {
         assumeTrue(System.getProperty("os.name").toLowerCase().contains("mac"));
 
         Socket socket = new Socket("localhost", serverSocket.getLocalPort());
+        CountDownLatch connectInitiated = new CountDownLatch(1);
 
         ClusterClientOptions clientOptions = ClusterClientOptions.builder()
                 .socketOptions(SocketOptions.builder().connectTimeout(1, TimeUnit.SECONDS).build()).build();
@@ -258,8 +259,11 @@ public void shouldCloseAsync() throws Exception {
         CompletableFuture<StatefulRedisConnection<String, String>> createdConnection = new CompletableFuture<>();
         Thread t1 = new Thread(() -> {
             try {
-                StatefulRedisConnection<String, String> connection = sut.getConnection(connectionKey).toCompletableFuture()
-                        .join();
+                CompletableFuture<StatefulRedisConnection<String, String>> future = sut.getConnection(connectionKey)
+                        .toCompletableFuture();
+
+                connectInitiated.countDown();
+                StatefulRedisConnection<String, String> connection = future.join();
                 createdConnection.complete(connection);
             } catch (Exception e) {
                 createdConnection.completeExceptionally(e);

From 90103db999d6134908b78215bea9350dbe2590ca Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 30 Jan 2018 10:58:28 +0100
Subject: [PATCH 394/808] Add options to randomize Redis Cluster and
 Master/Slave node list #676

Lettuce now allows to adjust how Redis Cluster and Master/Slave implementations sort their node list. The node list is sorted by default by latency to allow ReadFrom.NEAREST mode. By setting a system property, this behavior can be adjusted:

-Dio.lettuce.core.topology.sort=BY_LATENCY (default)
-Dio.lettuce.core.topology.sort=NONE (leave nodes as they were reported by Redis)
-Dio.lettuce.core.topology.sort=RANDOMIZE (shuffle nodes)
---
 .../topology/ClusterTopologyRefresh.java      |  7 +-
 .../cluster/topology/TopologyComparators.java | 60 ++++++++++++++++-
 .../MasterSlaveTopologyRefresh.java           |  2 +-
 .../io/lettuce/core/masterslave/Requests.java |  7 +-
 .../core/masterslave/TopologyComparators.java | 64 +++++++++++++++----
 src/test/java/io/lettuce/core/ClientTest.java |  7 +-
 .../topology/ClusterTopologyRefreshTest.java  | 32 +++++++++-
 7 files changed, 154 insertions(+), 25 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
index 0604f7135e..3c64b88490 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.topology.TopologyComparators.SortAction;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.SocketAddressResolver;
@@ -166,8 +167,10 @@ NodeTopologyViews getNodeSpecificViews(Requests requestedTopology, Requests requ
             node.setLatencyNs(latencies.get(node.getNodeId()));
         }
 
+        SortAction sortAction = SortAction.getSortAction();
         for (NodeTopologyView view : views) {
-            view.getPartitions().getPartitions().sort(TopologyComparators.LatencyComparator.INSTANCE);
+
+            sortAction.sort(view.getPartitions());
             view.getPartitions().updateCache();
         }
 
diff --git a/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
index 54e1b5c2fc..6cb6ccdffc 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -279,4 +279,62 @@ public int compare(RedisURI o1, RedisURI o2) {
             return h1.compareToIgnoreCase(h2);
         }
     }
+
+    /**
+     * Sort action for topology. Defaults to sort by latency. Can be set via {@code io.lettuce.core.topology.sort} system
+     * property.
+     *
+     * @since 4.5
+     */
+    enum SortAction {
+
+        /**
+         * Sort by latency.
+         */
+        BY_LATENCY {
+            @Override
+            void sort(Partitions partitions) {
+                partitions.getPartitions().sort(TopologyComparators.LatencyComparator.INSTANCE);
+            }
+        },
+
+        /**
+         * Do not sort.
+         */
+        NONE {
+            @Override
+            void sort(Partitions partitions) {
+
+            }
+        },
+
+        /**
+         * Randomize nodes.
+         */
+        RANDOMIZE {
+            @Override
+            void sort(Partitions partitions) {
+                Collections.shuffle(partitions.getPartitions());
+            }
+        };
+
+        abstract void sort(Partitions partitions);
+
+        /**
+         * @return determine {@link SortAction} and fall back to {@link SortAction#BY_LATENCY} if sort action cannot be
+         *         resolved.
+         */
+        static SortAction getSortAction() {
+
+            String sortAction = System.getProperty("io.lettuce.core.topology.sort", BY_LATENCY.name());
+
+            for (SortAction action : values()) {
+                if (sortAction.equalsIgnoreCase(action.name())) {
+                    return action;
+                }
+            }
+
+            return BY_LATENCY;
+        }
+    }
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
index 880e101ee9..09f28069a0 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/Requests.java b/src/main/java/io/lettuce/core/masterslave/Requests.java
index 78734f7bc9..4d07cbb11c 100644
--- a/src/main/java/io/lettuce/core/masterslave/Requests.java
+++ b/src/main/java/io/lettuce/core/masterslave/Requests.java
@@ -16,12 +16,14 @@
 package io.lettuce.core.masterslave;
 
 import static io.lettuce.core.masterslave.MasterSlaveUtils.findNodeByUri;
+import static io.lettuce.core.masterslave.TopologyComparators.LatencyComparator;
 
 import java.util.*;
 
 import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.masterslave.TopologyComparators.SortAction;
 import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
@@ -74,12 +76,11 @@ protected void onEmit(Emission<List<RedisNodeDescription>> emission) {
             result.add(redisNodeDescription);
         }
 
-        TopologyComparators.LatencyComparator comparator = new TopologyComparators.LatencyComparator(latencies);
 
-        result.sort(comparator);
+        SortAction sortAction = SortAction.getSortAction();
+        sortAction.sort(result, new LatencyComparator(latencies));
 
         emission.success(result);
-
     }
 
     protected Set<RedisURI> nodes() {
diff --git a/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java b/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java
index 1c3376029b..24aeab0a97 100644
--- a/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java
+++ b/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,9 @@
  */
 package io.lettuce.core.masterslave;
 
+import java.util.Collections;
 import java.util.Comparator;
+import java.util.List;
 import java.util.Map;
 
 import io.lettuce.core.RedisURI;
@@ -62,26 +64,60 @@ public int compare(RedisNodeDescription o1, RedisNodeDescription o2) {
     }
 
     /**
-     * Compare {@link RedisURI} based on their host and port representation.
+     * Sort action for topology. Defaults to sort by latency. Can be set via {@code io.lettuce.core.topology.sort} system
+     * property.
+     *
+     * @since 4.5
      */
-    enum RedisURIComparator implements Comparator<RedisURI> {
-
-        INSTANCE;
+    enum SortAction {
+
+        /**
+         * Sort by latency.
+         */
+        BY_LATENCY {
+            @Override
+            void sort(List<RedisNodeDescription> nodes, Comparator<? super RedisNodeDescription> latencyComparator) {
+                nodes.sort(latencyComparator);
+            }
+        },
 
-        @Override
-        public int compare(RedisURI o1, RedisURI o2) {
-            String h1 = "";
-            String h2 = "";
+        /**
+         * Do not sort.
+         */
+        NONE {
+            @Override
+            void sort(List<RedisNodeDescription> nodes, Comparator<? super RedisNodeDescription> latencyComparator) {
 
-            if (o1 != null) {
-                h1 = o1.getHost() + ":" + o1.getPort();
             }
+        },
+
+        /**
+         * Randomize nodes.
+         */
+        RANDOMIZE {
+            @Override
+            void sort(List<RedisNodeDescription> nodes, Comparator<? super RedisNodeDescription> latencyComparator) {
+                Collections.shuffle(nodes);
+            }
+        };
+
+        abstract void sort(List<RedisNodeDescription> nodes, Comparator<? super RedisNodeDescription> latencyComparator);
+
+        /**
+         * @return determine {@link SortAction} and fall back to {@link SortAction#BY_LATENCY} if sort action cannot be
+         *         resolved.
+         */
+        static SortAction getSortAction() {
+
+            String sortAction = System.getProperty("io.lettuce.core.topology.sort", BY_LATENCY.name());
 
-            if (o2 != null) {
-                h2 = o2.getHost() + ":" + o2.getPort();
+            for (SortAction action : values()) {
+                if (sortAction.equalsIgnoreCase(action.name())) {
+                    return action;
+                }
             }
 
-            return h1.compareToIgnoreCase(h2);
+            return BY_LATENCY;
         }
     }
 }
diff --git a/src/test/java/io/lettuce/core/ClientTest.java b/src/test/java/io/lettuce/core/ClientTest.java
index 2d7fa727a4..18721b5912 100644
--- a/src/test/java/io/lettuce/core/ClientTest.java
+++ b/src/test/java/io/lettuce/core/ClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -189,6 +189,8 @@ public void standaloneConnectionShouldSetClientName() throws Exception {
         assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
 
         connection.sync().quit();
+        Thread.sleep(100);
+
         assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
 
         connection.close();
@@ -205,9 +207,10 @@ public void pubSubConnectionShouldSetClientName() throws Exception {
         assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
 
         connection.sync().quit();
+        Thread.sleep(100);
+
         assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
 
         connection.close();
     }
-
 }
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
index a8092f4aa1..8242cff5f0 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -153,10 +153,38 @@ public void getNodeSpecificViewsNode1IsFasterThanNode2() throws Exception {
         assertThat(values).hasSize(2);
 
         for (Partitions value : values) {
-            assertThat(value).extracting("nodeId").containsExactly("1", "2");
+            assertThat(value).extracting("nodeId").containsSequence("1", "2");
         }
     }
 
+    @Test
+    public void partitionsReturnedAsReported() throws Exception {
+
+        System.setProperty("io.lettuce.core.topology.sort", "none");
+
+        String NODE_1_VIEW = "2 127.0.0.1:7381 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n"
+                + "1 127.0.0.1:7380 master,myself - 0 1401258245007 2 disconnected 8000-11999\n";
+        String NODE_2_VIEW = "2 127.0.0.1:7381 master,myself - 111 1401258245007 222 connected 7000 12000 12002-16383\n"
+                + "1 127.0.0.1:7380 master - 0 1401258245007 2 disconnected 8000-11999\n";
+
+        Requests requests = createClusterNodesRequests(1, NODE_1_VIEW);
+        requests = createClusterNodesRequests(2, NODE_2_VIEW).mergeWith(requests);
+
+        Requests clientRequests = createClientListRequests(1, "c1\nc2\n").mergeWith(createClientListRequests(2, "c1\nc2\n"));
+
+        NodeTopologyViews nodeSpecificViews = sut.getNodeSpecificViews(requests, clientRequests, COMMAND_TIMEOUT_NS);
+
+        Collection<Partitions> values = nodeSpecificViews.toMap().values();
+
+        assertThat(values).hasSize(2);
+
+        for (Partitions value : values) {
+            assertThat(value).extracting("nodeId").containsSequence("2", "1");
+        }
+
+        System.getProperties().remove("io.lettuce.core.topology.sort");
+    }
+
     @Test
     public void getNodeSpecificViewTestingNoAddrFilter() throws Exception {
 

From 9141ce8d526e45a41f83c83f829649721b7a077a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 30 Jan 2018 11:12:41 +0100
Subject: [PATCH 395/808] Extend copyright years to 2018

---
 .../io/lettuce/core/AbstractRedisAsyncCommands.java    |  2 +-
 src/main/java/io/lettuce/core/AbstractRedisClient.java |  2 +-
 .../io/lettuce/core/AbstractRedisReactiveCommands.java |  2 +-
 src/main/java/io/lettuce/core/BitFieldArgs.java        |  2 +-
 .../java/io/lettuce/core/ChannelGroupListener.java     |  2 +-
 src/main/java/io/lettuce/core/ClientOptions.java       |  2 +-
 src/main/java/io/lettuce/core/CloseEvents.java         |  2 +-
 src/main/java/io/lettuce/core/CompositeArgument.java   |  2 +-
 src/main/java/io/lettuce/core/ConnectionBuilder.java   |  2 +-
 .../java/io/lettuce/core/ConnectionEventTrigger.java   |  4 +---
 src/main/java/io/lettuce/core/ConnectionEvents.java    |  2 +-
 src/main/java/io/lettuce/core/ConnectionFuture.java    |  2 +-
 src/main/java/io/lettuce/core/ConnectionId.java        |  2 +-
 src/main/java/io/lettuce/core/ConnectionPoint.java     |  2 +-
 .../java/io/lettuce/core/DefaultConnectionFuture.java  |  2 +-
 src/main/java/io/lettuce/core/EpollProvider.java       |  2 +-
 src/main/java/io/lettuce/core/ExceptionFactory.java    |  2 +-
 src/main/java/io/lettuce/core/GeoArgs.java             |  2 +-
 src/main/java/io/lettuce/core/GeoCoordinates.java      |  2 +-
 src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java  |  2 +-
 src/main/java/io/lettuce/core/GeoWithin.java           |  2 +-
 src/main/java/io/lettuce/core/JavaRuntime.java         |  2 +-
 src/main/java/io/lettuce/core/KeyScanCursor.java       |  2 +-
 src/main/java/io/lettuce/core/KeyValue.java            |  2 +-
 src/main/java/io/lettuce/core/KillArgs.java            |  8 +++++---
 src/main/java/io/lettuce/core/KqueueProvider.java      |  2 +-
 src/main/java/io/lettuce/core/LettuceFutures.java      |  7 +------
 src/main/java/io/lettuce/core/LettuceStrings.java      |  2 +-
 src/main/java/io/lettuce/core/Limit.java               |  2 +-
 src/main/java/io/lettuce/core/MapScanCursor.java       |  2 +-
 src/main/java/io/lettuce/core/MigrateArgs.java         |  2 +-
 src/main/java/io/lettuce/core/Operators.java           |  2 +-
 .../java/io/lettuce/core/PlainChannelInitializer.java  |  2 +-
 src/main/java/io/lettuce/core/Range.java               |  2 +-
 src/main/java/io/lettuce/core/ReadFrom.java            |  2 +-
 src/main/java/io/lettuce/core/ReadFromImpl.java        |  2 +-
 .../java/io/lettuce/core/RedisAsyncCommandsImpl.java   |  2 +-
 src/main/java/io/lettuce/core/RedisBusyException.java  |  8 ++++----
 src/main/java/io/lettuce/core/RedisChannelHandler.java |  2 +-
 .../java/io/lettuce/core/RedisChannelInitializer.java  |  2 +-
 .../io/lettuce/core/RedisChannelInitializerImpl.java   |  2 +-
 src/main/java/io/lettuce/core/RedisChannelWriter.java  |  4 ++--
 src/main/java/io/lettuce/core/RedisClient.java         |  2 +-
 src/main/java/io/lettuce/core/RedisCommandBuilder.java |  2 +-
 .../lettuce/core/RedisCommandExecutionException.java   |  4 ++--
 .../lettuce/core/RedisCommandInterruptedException.java |  2 +-
 .../io/lettuce/core/RedisCommandTimeoutException.java  |  2 +-
 .../java/io/lettuce/core/RedisConnectionException.java |  4 ++--
 .../io/lettuce/core/RedisConnectionStateAdapter.java   |  2 +-
 .../io/lettuce/core/RedisConnectionStateListener.java  |  2 +-
 src/main/java/io/lettuce/core/RedisException.java      |  2 +-
 src/main/java/io/lettuce/core/RedisFuture.java         |  2 +-
 .../java/io/lettuce/core/RedisLoadingException.java    |  2 +-
 .../java/io/lettuce/core/RedisNoScriptException.java   |  8 ++++----
 src/main/java/io/lettuce/core/RedisPublisher.java      |  2 +-
 .../io/lettuce/core/RedisReactiveCommandsImpl.java     |  2 +-
 src/main/java/io/lettuce/core/RedisURI.java            |  2 +-
 src/main/java/io/lettuce/core/ScanArgs.java            |  2 +-
 src/main/java/io/lettuce/core/ScanCursor.java          |  2 +-
 src/main/java/io/lettuce/core/ScanIterator.java        |  2 +-
 src/main/java/io/lettuce/core/ScanStream.java          |  2 +-
 src/main/java/io/lettuce/core/ScoredValue.java         |  2 +-
 .../java/io/lettuce/core/ScoredValueScanCursor.java    |  2 +-
 src/main/java/io/lettuce/core/ScriptOutputType.java    |  2 +-
 src/main/java/io/lettuce/core/SetArgs.java             |  2 +-
 src/main/java/io/lettuce/core/SocketOptions.java       |  2 +-
 src/main/java/io/lettuce/core/SortArgs.java            |  2 +-
 .../java/io/lettuce/core/SslConnectionBuilder.java     |  2 +-
 src/main/java/io/lettuce/core/SslOptions.java          |  3 +--
 src/main/java/io/lettuce/core/StreamScanCursor.java    |  2 +-
 src/main/java/io/lettuce/core/TimeoutOptions.java      |  2 +-
 src/main/java/io/lettuce/core/TransactionResult.java   |  2 +-
 src/main/java/io/lettuce/core/Transports.java          |  2 +-
 src/main/java/io/lettuce/core/Value.java               |  2 +-
 src/main/java/io/lettuce/core/ValueScanCursor.java     |  2 +-
 src/main/java/io/lettuce/core/ZAddArgs.java            |  2 +-
 src/main/java/io/lettuce/core/ZStoreArgs.java          |  2 +-
 .../java/io/lettuce/core/api/StatefulConnection.java   |  4 ++--
 .../io/lettuce/core/api/StatefulRedisConnection.java   |  2 +-
 .../lettuce/core/api/async/BaseRedisAsyncCommands.java |  2 +-
 .../io/lettuce/core/api/async/RedisAsyncCommands.java  |  2 +-
 .../lettuce/core/api/async/RedisGeoAsyncCommands.java  |  2 +-
 .../lettuce/core/api/async/RedisHLLAsyncCommands.java  |  2 +-
 .../lettuce/core/api/async/RedisHashAsyncCommands.java |  2 +-
 .../lettuce/core/api/async/RedisKeyAsyncCommands.java  |  2 +-
 .../lettuce/core/api/async/RedisListAsyncCommands.java |  2 +-
 .../core/api/async/RedisScriptingAsyncCommands.java    |  2 +-
 .../core/api/async/RedisServerAsyncCommands.java       |  2 +-
 .../lettuce/core/api/async/RedisSetAsyncCommands.java  |  2 +-
 .../core/api/async/RedisSortedSetAsyncCommands.java    |  2 +-
 .../core/api/async/RedisStringAsyncCommands.java       | 10 ++++------
 .../api/async/RedisTransactionalAsyncCommands.java     |  2 +-
 .../core/api/reactive/BaseRedisReactiveCommands.java   |  7 +++----
 .../core/api/reactive/RedisGeoReactiveCommands.java    |  5 ++---
 .../core/api/reactive/RedisHLLReactiveCommands.java    |  2 +-
 .../core/api/reactive/RedisHashReactiveCommands.java   |  7 +++----
 .../core/api/reactive/RedisKeyReactiveCommands.java    |  7 +++----
 .../core/api/reactive/RedisListReactiveCommands.java   |  7 +++----
 .../core/api/reactive/RedisReactiveCommands.java       |  2 +-
 .../api/reactive/RedisScriptingReactiveCommands.java   |  5 ++---
 .../core/api/reactive/RedisServerReactiveCommands.java |  2 +-
 .../core/api/reactive/RedisSetReactiveCommands.java    |  7 +++----
 .../api/reactive/RedisSortedSetReactiveCommands.java   |  7 +++----
 .../core/api/reactive/RedisStringReactiveCommands.java |  9 +++++----
 .../reactive/RedisTransactionalReactiveCommands.java   |  5 ++---
 .../io/lettuce/core/api/sync/BaseRedisCommands.java    |  2 +-
 .../java/io/lettuce/core/api/sync/RedisCommands.java   |  2 +-
 .../io/lettuce/core/api/sync/RedisGeoCommands.java     |  2 +-
 .../io/lettuce/core/api/sync/RedisHLLCommands.java     |  2 +-
 .../io/lettuce/core/api/sync/RedisHashCommands.java    |  2 +-
 .../io/lettuce/core/api/sync/RedisKeyCommands.java     |  2 +-
 .../io/lettuce/core/api/sync/RedisListCommands.java    |  2 +-
 .../lettuce/core/api/sync/RedisScriptingCommands.java  |  2 +-
 .../io/lettuce/core/api/sync/RedisServerCommands.java  |  2 +-
 .../io/lettuce/core/api/sync/RedisSetCommands.java     |  2 +-
 .../lettuce/core/api/sync/RedisSortedSetCommands.java  |  2 +-
 .../io/lettuce/core/api/sync/RedisStringCommands.java  |  8 +++-----
 .../core/api/sync/RedisTransactionalCommands.java      |  2 +-
 .../cluster/AbstractClusterNodeConnectionFactory.java  |  2 +-
 .../io/lettuce/core/cluster/AbstractNodeSelection.java |  2 +-
 .../core/cluster/AsyncClusterConnectionProvider.java   |  2 +-
 .../io/lettuce/core/cluster/AsyncExecutionsImpl.java   |  2 +-
 .../io/lettuce/core/cluster/ClusterClientOptions.java  |  2 +-
 .../java/io/lettuce/core/cluster/ClusterCommand.java   |  8 ++------
 .../core/cluster/ClusterConnectionProvider.java        |  4 ++--
 .../core/cluster/ClusterDistributionChannelWriter.java |  2 +-
 .../io/lettuce/core/cluster/ClusterEventListener.java  |  2 +-
 .../cluster/ClusterFutureSyncInvocationHandler.java    |  2 +-
 .../core/cluster/ClusterNodeConnectionFactory.java     |  2 +-
 .../io/lettuce/core/cluster/ClusterNodeEndpoint.java   |  2 +-
 .../core/cluster/ClusterPubSubConnectionProvider.java  |  2 +-
 .../io/lettuce/core/cluster/ClusterScanSupport.java    |  5 ++---
 .../core/cluster/ClusterTopologyRefreshOptions.java    |  2 +-
 .../core/cluster/ClusterTopologyRefreshScheduler.java  |  2 +-
 .../io/lettuce/core/cluster/DynamicNodeSelection.java  |  2 +-
 .../io/lettuce/core/cluster/MultiNodeExecution.java    |  2 +-
 .../core/cluster/NodeSelectionInvocationHandler.java   |  2 +-
 .../io/lettuce/core/cluster/PartitionAccessor.java     |  2 +-
 .../io/lettuce/core/cluster/PartitionsConsensus.java   |  2 +-
 .../lettuce/core/cluster/PartitionsConsensusImpl.java  |  2 +-
 .../io/lettuce/core/cluster/PipelinedRedisFuture.java  |  2 +-
 .../core/cluster/PooledClusterConnectionProvider.java  |  2 +-
 .../io/lettuce/core/cluster/PubSubClusterEndpoint.java |  2 +-
 .../lettuce/core/cluster/ReactiveExecutionsImpl.java   |  2 +-
 .../java/io/lettuce/core/cluster/ReadOnlyCommands.java |  2 +-
 .../lettuce/core/cluster/ReconnectEventListener.java   |  2 +-
 .../cluster/RedisAdvancedClusterAsyncCommandsImpl.java |  2 +-
 .../RedisAdvancedClusterReactiveCommandsImpl.java      |  2 +-
 .../io/lettuce/core/cluster/RedisClusterClient.java    |  2 +-
 .../cluster/RedisClusterPubSubAsyncCommandsImpl.java   |  2 +-
 .../RedisClusterPubSubReactiveCommandsImpl.java        |  2 +-
 .../io/lettuce/core/cluster/RedisClusterURIUtil.java   |  2 +-
 src/main/java/io/lettuce/core/cluster/RedisState.java  |  2 +-
 src/main/java/io/lettuce/core/cluster/RoundRobin.java  |  2 +-
 .../core/cluster/RoundRobinSocketAddressSupplier.java  |  3 +--
 src/main/java/io/lettuce/core/cluster/SlotHash.java    |  2 +-
 .../cluster/StatefulRedisClusterConnectionImpl.java    |  2 +-
 .../StatefulRedisClusterPubSubConnectionImpl.java      |  2 +-
 .../io/lettuce/core/cluster/StaticNodeSelection.java   |  2 +-
 .../io/lettuce/core/cluster/SyncExecutionsImpl.java    |  2 +-
 .../lettuce/core/cluster/api/NodeSelectionSupport.java |  2 +-
 .../cluster/api/StatefulRedisClusterConnection.java    |  2 +-
 .../core/cluster/api/async/AsyncExecutions.java        |  2 +-
 .../core/cluster/api/async/AsyncNodeSelection.java     |  2 +-
 .../api/async/BaseNodeSelectionAsyncCommands.java      |  2 +-
 .../cluster/api/async/NodeSelectionAsyncCommands.java  |  2 +-
 .../api/async/NodeSelectionGeoAsyncCommands.java       |  2 +-
 .../api/async/NodeSelectionHLLAsyncCommands.java       |  2 +-
 .../api/async/NodeSelectionHashAsyncCommands.java      |  2 +-
 .../api/async/NodeSelectionKeyAsyncCommands.java       |  2 +-
 .../api/async/NodeSelectionListAsyncCommands.java      |  2 +-
 .../api/async/NodeSelectionScriptingAsyncCommands.java |  2 +-
 .../api/async/NodeSelectionServerAsyncCommands.java    |  2 +-
 .../api/async/NodeSelectionSetAsyncCommands.java       |  2 +-
 .../api/async/NodeSelectionSortedSetAsyncCommands.java |  2 +-
 .../api/async/NodeSelectionStringAsyncCommands.java    |  9 +++------
 .../api/async/RedisAdvancedClusterAsyncCommands.java   |  2 +-
 .../cluster/api/async/RedisClusterAsyncCommands.java   |  2 +-
 .../core/cluster/api/reactive/ReactiveExecutions.java  |  5 ++---
 .../reactive/RedisAdvancedClusterReactiveCommands.java |  2 +-
 .../api/reactive/RedisClusterReactiveCommands.java     |  2 +-
 .../cluster/api/sync/BaseNodeSelectionCommands.java    |  2 +-
 .../io/lettuce/core/cluster/api/sync/Executions.java   |  2 +-
 .../lettuce/core/cluster/api/sync/NodeSelection.java   |  2 +-
 .../core/cluster/api/sync/NodeSelectionCommands.java   |  2 +-
 .../cluster/api/sync/NodeSelectionGeoCommands.java     |  2 +-
 .../cluster/api/sync/NodeSelectionHLLCommands.java     |  2 +-
 .../cluster/api/sync/NodeSelectionHashCommands.java    |  2 +-
 .../cluster/api/sync/NodeSelectionKeyCommands.java     |  2 +-
 .../cluster/api/sync/NodeSelectionListCommands.java    |  2 +-
 .../api/sync/NodeSelectionScriptingCommands.java       |  2 +-
 .../cluster/api/sync/NodeSelectionServerCommands.java  |  2 +-
 .../cluster/api/sync/NodeSelectionSetCommands.java     |  2 +-
 .../api/sync/NodeSelectionSortedSetCommands.java       |  2 +-
 .../cluster/api/sync/NodeSelectionStringCommands.java  |  8 +++-----
 .../cluster/api/sync/RedisAdvancedClusterCommands.java |  2 +-
 .../core/cluster/api/sync/RedisClusterCommands.java    |  2 +-
 .../cluster/event/ClusterTopologyChangedEvent.java     |  2 +-
 .../models/partitions/ClusterPartitionParser.java      |  2 +-
 .../core/cluster/models/partitions/Partitions.java     |  2 +-
 .../cluster/models/partitions/RedisClusterNode.java    |  2 +-
 .../core/cluster/models/slots/ClusterSlotRange.java    |  2 +-
 .../core/cluster/models/slots/ClusterSlotsParser.java  |  2 +-
 .../core/cluster/pubsub/RedisClusterPubSubAdapter.java |  2 +-
 .../cluster/pubsub/RedisClusterPubSubListener.java     |  2 +-
 .../pubsub/StatefulRedisClusterPubSubConnection.java   |  2 +-
 .../api/async/NodeSelectionPubSubAsyncCommands.java    |  2 +-
 .../pubsub/api/async/PubSubAsyncNodeSelection.java     |  2 +-
 .../api/async/RedisClusterPubSubAsyncCommands.java     |  2 +-
 .../reactive/NodeSelectionPubSubReactiveCommands.java  |  2 +-
 .../api/reactive/PubSubReactiveNodeSelection.java      |  2 +-
 .../reactive/RedisClusterPubSubReactiveCommands.java   |  2 +-
 .../pubsub/api/sync/NodeSelectionPubSubCommands.java   |  2 +-
 .../cluster/pubsub/api/sync/PubSubNodeSelection.java   |  2 +-
 .../pubsub/api/sync/RedisClusterPubSubCommands.java    |  2 +-
 .../core/cluster/topology/AsyncConnections.java        |  2 +-
 .../io/lettuce/core/cluster/topology/Connections.java  |  2 +-
 .../core/cluster/topology/NodeConnectionFactory.java   |  2 +-
 .../core/cluster/topology/NodeTopologyView.java        |  2 +-
 .../core/cluster/topology/NodeTopologyViews.java       |  6 +++---
 .../cluster/topology/RedisClusterNodeSnapshot.java     |  2 +-
 .../lettuce/core/cluster/topology/RefreshFutures.java  |  2 +-
 .../io/lettuce/core/cluster/topology/Requests.java     |  2 +-
 .../core/cluster/topology/TimedAsyncCommand.java       |  3 +--
 src/main/java/io/lettuce/core/codec/Base16.java        |  2 +-
 .../java/io/lettuce/core/codec/ByteArrayCodec.java     |  2 +-
 .../io/lettuce/core/codec/ByteBufferInputStream.java   |  2 +-
 src/main/java/io/lettuce/core/codec/CRC16.java         |  2 +-
 .../java/io/lettuce/core/codec/CompressionCodec.java   |  2 +-
 src/main/java/io/lettuce/core/codec/RedisCodec.java    |  2 +-
 src/main/java/io/lettuce/core/codec/StringCodec.java   |  3 +--
 .../java/io/lettuce/core/codec/ToByteBufEncoder.java   |  2 +-
 .../java/io/lettuce/core/codec/Utf8StringCodec.java    |  2 +-
 .../lettuce/core/dynamic/AsyncExecutableCommand.java   |  2 +-
 .../dynamic/AsyncExecutableCommandLookupStrategy.java  |  2 +-
 .../lettuce/core/dynamic/BatchExecutableCommand.java   |  2 +-
 .../dynamic/BatchExecutableCommandLookupStrategy.java  |  2 +-
 src/main/java/io/lettuce/core/dynamic/BatchTasks.java  |  2 +-
 src/main/java/io/lettuce/core/dynamic/Batcher.java     |  2 +-
 .../dynamic/CodecAwareMethodParametersAccessor.java    |  2 +-
 .../lettuce/core/dynamic/CommandCreationException.java |  2 +-
 .../java/io/lettuce/core/dynamic/CommandFactory.java   |  2 +-
 .../lettuce/core/dynamic/CommandFactoryResolver.java   |  2 +-
 .../java/io/lettuce/core/dynamic/CommandMethod.java    |  2 +-
 .../core/dynamic/CommandMethodSyntaxException.java     |  2 +-
 .../io/lettuce/core/dynamic/CommandMethodVerifier.java |  2 +-
 .../core/dynamic/CommandSegmentCommandFactory.java     |  2 +-
 src/main/java/io/lettuce/core/dynamic/Commands.java    |  2 +-
 .../io/lettuce/core/dynamic/ConversionService.java     |  2 +-
 .../io/lettuce/core/dynamic/ConvertingCommand.java     |  2 +-
 .../io/lettuce/core/dynamic/DeclaredCommandMethod.java |  2 +-
 .../core/dynamic/DefaultCommandMethodVerifier.java     |  2 +-
 .../core/dynamic/DefaultMethodParametersAccessor.java  |  2 +-
 .../core/dynamic/DefaultRedisCommandsMetadata.java     |  2 +-
 .../io/lettuce/core/dynamic/ExecutableCommand.java     |  2 +-
 .../core/dynamic/ExecutableCommandLookupStrategy.java  |  2 +-
 .../ExecutableCommandLookupStrategySupport.java        |  2 +-
 .../java/io/lettuce/core/dynamic/ParameterBinder.java  |  2 +-
 .../dynamic/ReactiveCommandSegmentCommandFactory.java  |  2 +-
 .../core/dynamic/ReactiveExecutableCommand.java        |  2 +-
 .../ReactiveExecutableCommandLookupStrategy.java       |  2 +-
 .../io/lettuce/core/dynamic/ReactiveTypeAdapters.java  |  4 +---
 .../java/io/lettuce/core/dynamic/ReactiveTypes.java    |  7 +++----
 .../io/lettuce/core/dynamic/RedisCommandFactory.java   |  2 +-
 .../io/lettuce/core/dynamic/RedisCommandsMetadata.java |  2 +-
 .../java/io/lettuce/core/dynamic/SimpleBatcher.java    |  2 +-
 .../io/lettuce/core/dynamic/annotation/Command.java    |  2 +-
 .../lettuce/core/dynamic/annotation/CommandNaming.java |  2 +-
 .../java/io/lettuce/core/dynamic/annotation/Key.java   |  2 +-
 .../java/io/lettuce/core/dynamic/annotation/Param.java |  2 +-
 .../java/io/lettuce/core/dynamic/annotation/Value.java |  2 +-
 .../io/lettuce/core/dynamic/batch/BatchException.java  |  2 +-
 .../io/lettuce/core/dynamic/batch/BatchExecutor.java   |  2 +-
 .../java/io/lettuce/core/dynamic/batch/BatchSize.java  |  2 +-
 .../io/lettuce/core/dynamic/batch/CommandBatching.java |  2 +-
 .../dynamic/codec/AnnotationRedisCodecResolver.java    |  2 +-
 .../lettuce/core/dynamic/codec/RedisCodecResolver.java |  2 +-
 .../java/io/lettuce/core/dynamic/domain/Timeout.java   |  2 +-
 .../intercept/DefaultMethodInvokingInterceptor.java    |  2 +-
 .../core/dynamic/intercept/InvocationProxyFactory.java |  2 +-
 .../dynamic/intercept/InvocationTargetProvider.java    |  2 +-
 .../core/dynamic/intercept/MethodInterceptor.java      |  2 +-
 .../core/dynamic/intercept/MethodInterceptorChain.java |  2 +-
 .../core/dynamic/intercept/MethodInvocation.java       |  2 +-
 .../output/CodecAwareOutputFactoryResolver.java        |  2 +-
 .../core/dynamic/output/CommandOutputFactory.java      |  2 +-
 .../dynamic/output/CommandOutputFactoryResolver.java   |  2 +-
 .../dynamic/output/CommandOutputResolverSupport.java   |  2 +-
 .../io/lettuce/core/dynamic/output/OutputRegistry.java |  2 +-
 .../OutputRegistryCommandOutputFactoryResolver.java    |  2 +-
 .../io/lettuce/core/dynamic/output/OutputSelector.java |  2 +-
 .../io/lettuce/core/dynamic/output/OutputType.java     |  2 +-
 .../io/lettuce/core/dynamic/output/VoidOutput.java     |  2 +-
 .../dynamic/parameter/ExecutionSpecificParameters.java |  2 +-
 .../dynamic/parameter/MethodParametersAccessor.java    |  2 +-
 .../io/lettuce/core/dynamic/parameter/Parameter.java   |  3 +--
 .../io/lettuce/core/dynamic/parameter/Parameters.java  |  2 +-
 .../segment/AnnotationCommandSegmentFactory.java       |  4 ++--
 .../lettuce/core/dynamic/segment/CommandSegment.java   |  2 +-
 .../core/dynamic/segment/CommandSegmentFactory.java    |  2 +-
 .../lettuce/core/dynamic/segment/CommandSegments.java  |  2 +-
 .../support/AnnotationParameterNameDiscoverer.java     |  2 +-
 .../core/dynamic/support/ClassTypeInformation.java     |  2 +-
 .../support/CompositeParameterNameDiscoverer.java      |  2 +-
 .../dynamic/support/GenericArrayTypeInformation.java   |  2 +-
 .../core/dynamic/support/GenericTypeResolver.java      |  2 +-
 .../lettuce/core/dynamic/support/MethodParameter.java  |  2 +-
 .../core/dynamic/support/ParameterNameDiscoverer.java  |  2 +-
 .../dynamic/support/ParametrizedTypeInformation.java   |  2 +-
 .../support/ParentTypeAwareTypeInformation.java        |  2 +-
 .../lettuce/core/dynamic/support/ReflectionUtils.java  |  2 +-
 .../lettuce/core/dynamic/support/ResolvableType.java   |  2 +-
 .../StandardReflectionParameterNameDiscoverer.java     |  2 +-
 .../lettuce/core/dynamic/support/TypeDiscoverer.java   |  2 +-
 .../lettuce/core/dynamic/support/TypeInformation.java  |  2 +-
 .../dynamic/support/TypeVariableTypeInformation.java   |  2 +-
 .../io/lettuce/core/dynamic/support/TypeWrapper.java   |  2 +-
 .../core/dynamic/support/WildcardTypeInformation.java  |  2 +-
 .../java/io/lettuce/core/event/DefaultEventBus.java    |  2 +-
 .../core/event/DefaultEventPublisherOptions.java       |  2 +-
 src/main/java/io/lettuce/core/event/Event.java         |  2 +-
 src/main/java/io/lettuce/core/event/EventBus.java      |  2 +-
 .../io/lettuce/core/event/EventPublisherOptions.java   |  2 +-
 .../lettuce/core/event/connection/ConnectedEvent.java  |  2 +-
 .../event/connection/ConnectionActivatedEvent.java     |  2 +-
 .../event/connection/ConnectionDeactivatedEvent.java   |  2 +-
 .../lettuce/core/event/connection/ConnectionEvent.java |  2 +-
 .../core/event/connection/ConnectionEventSupport.java  |  2 +-
 .../core/event/connection/DisconnectedEvent.java       |  2 +-
 .../core/event/metrics/CommandLatencyEvent.java        |  2 +-
 .../metrics/DefaultCommandLatencyEventPublisher.java   |  2 +-
 .../core/event/metrics/MetricEventPublisher.java       |  2 +-
 .../core/internal/AbstractInvocationHandler.java       |  2 +-
 .../java/io/lettuce/core/internal/AsyncCloseable.java  |  2 +-
 .../lettuce/core/internal/AsyncConnectionProvider.java |  2 +-
 .../java/io/lettuce/core/internal/DefaultMethods.java  |  2 +-
 src/main/java/io/lettuce/core/internal/Futures.java    | 10 +++++-----
 .../java/io/lettuce/core/internal/HostAndPort.java     |  2 +-
 .../java/io/lettuce/core/internal/LettuceAssert.java   |  6 +++---
 .../io/lettuce/core/internal/LettuceClassUtils.java    |  2 +-
 .../io/lettuce/core/internal/LettuceFactories.java     |  2 +-
 .../java/io/lettuce/core/internal/LettuceLists.java    |  2 +-
 .../java/io/lettuce/core/internal/LettuceSets.java     |  2 +-
 .../java/io/lettuce/core/internal/TimeoutProvider.java |  2 +-
 .../io/lettuce/core/masterslave/AsyncConnections.java  |  2 +-
 .../core/masterslave/AutodiscoveryConnector.java       |  2 +-
 .../core/masterslave/CompletableEventLatchSupport.java |  2 +-
 .../java/io/lettuce/core/masterslave/Connections.java  |  2 +-
 .../java/io/lettuce/core/masterslave/Exceptions.java   |  2 +-
 .../java/io/lettuce/core/masterslave/MasterSlave.java  |  2 +-
 .../core/masterslave/MasterSlaveChannelWriter.java     |  2 +-
 .../masterslave/MasterSlaveConnectionProvider.java     |  2 +-
 .../lettuce/core/masterslave/MasterSlaveConnector.java |  2 +-
 .../core/masterslave/MasterSlaveTopologyProvider.java  |  2 +-
 .../io/lettuce/core/masterslave/MasterSlaveUtils.java  |  2 +-
 .../core/masterslave/NodeConnectionFactory.java        |  2 +-
 .../io/lettuce/core/masterslave/ReadOnlyCommands.java  |  2 +-
 .../masterslave/RedisClientNodeConnectionFactory.java  |  2 +-
 .../lettuce/core/masterslave/RedisMasterSlaveNode.java |  2 +-
 .../java/io/lettuce/core/masterslave/Requests.java     |  2 +-
 .../java/io/lettuce/core/masterslave/ResumeAfter.java  |  2 +-
 .../io/lettuce/core/masterslave/SentinelConnector.java |  2 +-
 .../core/masterslave/SentinelTopologyProvider.java     |  2 +-
 .../core/masterslave/SentinelTopologyRefresh.java      |  2 +-
 .../SentinelTopologyRefreshConnections.java            |  2 +-
 .../StatefulRedisMasterSlaveConnection.java            |  2 +-
 .../StatefulRedisMasterSlaveConnectionImpl.java        |  2 +-
 .../core/masterslave/StaticMasterSlaveConnector.java   |  2 +-
 .../masterslave/StaticMasterSlaveTopologyProvider.java |  2 +-
 .../io/lettuce/core/masterslave/TimedAsyncCommand.java |  3 +--
 src/main/java/io/lettuce/core/masterslave/Timeout.java |  2 +-
 .../io/lettuce/core/masterslave/TopologyProvider.java  |  2 +-
 .../lettuce/core/metrics/CommandLatencyCollector.java  |  2 +-
 .../core/metrics/CommandLatencyCollectorOptions.java   |  2 +-
 .../java/io/lettuce/core/metrics/CommandLatencyId.java |  2 +-
 .../java/io/lettuce/core/metrics/CommandMetrics.java   |  2 +-
 .../core/metrics/DefaultCommandLatencyCollector.java   |  2 +-
 .../metrics/DefaultCommandLatencyCollectorOptions.java |  2 +-
 .../java/io/lettuce/core/metrics/MetricCollector.java  |  2 +-
 .../io/lettuce/core/models/command/CommandDetail.java  |  2 +-
 .../core/models/command/CommandDetailParser.java       |  2 +-
 .../io/lettuce/core/models/role/RedisInstance.java     |  2 +-
 .../lettuce/core/models/role/RedisMasterInstance.java  |  2 +-
 .../lettuce/core/models/role/RedisNodeDescription.java |  2 +-
 .../core/models/role/RedisSentinelInstance.java        |  2 +-
 .../lettuce/core/models/role/RedisSlaveInstance.java   |  2 +-
 .../lettuce/core/models/role/ReplicationPartner.java   |  2 +-
 .../java/io/lettuce/core/models/role/RoleParser.java   |  2 +-
 src/main/java/io/lettuce/core/output/ArrayOutput.java  |  2 +-
 .../java/io/lettuce/core/output/BooleanListOutput.java |  2 +-
 .../java/io/lettuce/core/output/BooleanOutput.java     |  2 +-
 .../java/io/lettuce/core/output/ByteArrayOutput.java   |  2 +-
 .../java/io/lettuce/core/output/CommandOutput.java     |  2 +-
 src/main/java/io/lettuce/core/output/DateOutput.java   |  2 +-
 .../lettuce/core/output/DefaultTransactionResult.java  |  2 +-
 src/main/java/io/lettuce/core/output/DoubleOutput.java |  2 +-
 .../lettuce/core/output/GeoCoordinatesListOutput.java  |  2 +-
 .../core/output/GeoCoordinatesValueListOutput.java     |  2 +-
 .../io/lettuce/core/output/GeoWithinListOutput.java    |  2 +-
 .../java/io/lettuce/core/output/IntegerOutput.java     |  2 +-
 .../java/io/lettuce/core/output/KeyListOutput.java     |  2 +-
 src/main/java/io/lettuce/core/output/KeyOutput.java    |  2 +-
 .../java/io/lettuce/core/output/KeyScanOutput.java     |  2 +-
 .../io/lettuce/core/output/KeyScanStreamingOutput.java |  2 +-
 .../io/lettuce/core/output/KeyStreamingChannel.java    |  2 +-
 .../io/lettuce/core/output/KeyStreamingOutput.java     |  2 +-
 .../io/lettuce/core/output/KeyValueListOutput.java     |  2 +-
 .../java/io/lettuce/core/output/KeyValueOutput.java    |  6 +++---
 .../core/output/KeyValueScanStreamingOutput.java       |  2 +-
 .../lettuce/core/output/KeyValueStreamingChannel.java  |  2 +-
 .../lettuce/core/output/KeyValueStreamingOutput.java   |  2 +-
 .../java/io/lettuce/core/output/ListOfMapsOutput.java  |  2 +-
 .../java/io/lettuce/core/output/ListSubscriber.java    |  2 +-
 src/main/java/io/lettuce/core/output/MapOutput.java    |  2 +-
 .../java/io/lettuce/core/output/MapScanOutput.java     |  2 +-
 src/main/java/io/lettuce/core/output/MultiOutput.java  |  2 +-
 .../java/io/lettuce/core/output/NestedMultiOutput.java |  2 +-
 .../java/io/lettuce/core/output/OutputFactory.java     |  2 +-
 src/main/java/io/lettuce/core/output/ScanOutput.java   |  2 +-
 .../io/lettuce/core/output/ScoredValueListOutput.java  |  2 +-
 .../io/lettuce/core/output/ScoredValueScanOutput.java  |  2 +-
 .../core/output/ScoredValueScanStreamingOutput.java    |  2 +-
 .../core/output/ScoredValueStreamingChannel.java       |  2 +-
 .../core/output/ScoredValueStreamingOutput.java        |  2 +-
 .../io/lettuce/core/output/SocketAddressOutput.java    |  4 ++--
 src/main/java/io/lettuce/core/output/StatusOutput.java |  2 +-
 .../java/io/lettuce/core/output/StreamingChannel.java  |  2 +-
 .../java/io/lettuce/core/output/StreamingOutput.java   |  2 +-
 .../java/io/lettuce/core/output/StringListOutput.java  |  2 +-
 .../io/lettuce/core/output/StringValueListOutput.java  |  2 +-
 .../java/io/lettuce/core/output/ValueListOutput.java   |  2 +-
 src/main/java/io/lettuce/core/output/ValueOutput.java  |  2 +-
 .../java/io/lettuce/core/output/ValueScanOutput.java   |  2 +-
 .../lettuce/core/output/ValueScanStreamingOutput.java  |  2 +-
 .../java/io/lettuce/core/output/ValueSetOutput.java    |  2 +-
 .../io/lettuce/core/output/ValueStreamingChannel.java  |  2 +-
 .../io/lettuce/core/output/ValueStreamingOutput.java   |  2 +-
 .../io/lettuce/core/output/ValueValueListOutput.java   |  2 +-
 .../java/io/lettuce/core/protocol/AsyncCommand.java    |  2 +-
 .../lettuce/core/protocol/BaseRedisCommandBuilder.java |  2 +-
 .../io/lettuce/core/protocol/ChannelLogDescriptor.java |  2 +-
 src/main/java/io/lettuce/core/protocol/Command.java    |  2 +-
 .../java/io/lettuce/core/protocol/CommandArgs.java     |  2 +-
 .../io/lettuce/core/protocol/CommandArgsAccessor.java  |  2 +-
 .../java/io/lettuce/core/protocol/CommandEncoder.java  |  2 +-
 .../io/lettuce/core/protocol/CommandExpiryWriter.java  |  2 +-
 .../java/io/lettuce/core/protocol/CommandHandler.java  |  2 +-
 .../java/io/lettuce/core/protocol/CommandKeyword.java  |  2 +-
 .../java/io/lettuce/core/protocol/CommandType.java     |  2 +-
 .../java/io/lettuce/core/protocol/CommandWrapper.java  |  2 +-
 .../io/lettuce/core/protocol/CompleteableCommand.java  |  2 +-
 .../io/lettuce/core/protocol/ConnectionFacade.java     |  2 +-
 .../io/lettuce/core/protocol/DecoratedCommand.java     |  2 +-
 .../java/io/lettuce/core/protocol/DefaultEndpoint.java |  2 +-
 .../java/io/lettuce/core/protocol/DemandAware.java     |  2 +-
 src/main/java/io/lettuce/core/protocol/Endpoint.java   |  2 +-
 .../io/lettuce/core/protocol/HasQueuedCommands.java    |  3 +--
 .../lettuce/core/protocol/LatencyMeteredCommand.java   |  2 +-
 .../java/io/lettuce/core/protocol/LettuceCharsets.java |  2 +-
 .../lettuce/core/protocol/PristineFallbackCommand.java |  4 ++--
 .../java/io/lettuce/core/protocol/ProtocolKeyword.java |  2 +-
 .../io/lettuce/core/protocol/ReconnectionHandler.java  |  2 +-
 .../io/lettuce/core/protocol/ReconnectionListener.java |  2 +-
 .../java/io/lettuce/core/protocol/RedisCommand.java    |  2 +-
 .../io/lettuce/core/protocol/RedisStateMachine.java    |  2 +-
 src/main/java/io/lettuce/core/protocol/SharedLock.java |  2 +-
 .../io/lettuce/core/protocol/TransactionalCommand.java |  2 +-
 .../java/io/lettuce/core/protocol/WithLatency.java     |  2 +-
 .../java/io/lettuce/core/pubsub/PubSubCommandArgs.java |  2 +-
 .../io/lettuce/core/pubsub/PubSubCommandBuilder.java   |  2 +-
 .../io/lettuce/core/pubsub/PubSubCommandHandler.java   |  2 +-
 .../java/io/lettuce/core/pubsub/PubSubEndpoint.java    |  2 +-
 src/main/java/io/lettuce/core/pubsub/PubSubOutput.java |  2 +-
 .../io/lettuce/core/pubsub/RedisPubSubAdapter.java     |  2 +-
 .../core/pubsub/RedisPubSubAsyncCommandsImpl.java      |  2 +-
 .../io/lettuce/core/pubsub/RedisPubSubListener.java    |  2 +-
 .../core/pubsub/RedisPubSubReactiveCommandsImpl.java   |  3 +--
 .../core/pubsub/StatefulRedisPubSubConnection.java     |  2 +-
 .../core/pubsub/StatefulRedisPubSubConnectionImpl.java |  2 +-
 .../pubsub/api/async/RedisPubSubAsyncCommands.java     |  3 +--
 .../core/pubsub/api/reactive/ChannelMessage.java       |  2 +-
 .../core/pubsub/api/reactive/PatternMessage.java       |  2 +-
 .../api/reactive/RedisPubSubReactiveCommands.java      |  7 +++----
 .../core/pubsub/api/sync/RedisPubSubCommands.java      |  2 +-
 .../java/io/lettuce/core/resource/ClientResources.java |  3 +--
 .../java/io/lettuce/core/resource/ConstantDelay.java   |  2 +-
 .../lettuce/core/resource/DecorrelatedJitterDelay.java |  2 +-
 .../lettuce/core/resource/DefaultClientResources.java  |  2 +-
 .../core/resource/DefaultEventLoopGroupProvider.java   |  3 +--
 .../lettuce/core/resource/DefaultNettyCustomizer.java  |  2 +-
 src/main/java/io/lettuce/core/resource/Delay.java      |  2 +-
 .../lettuce/core/resource/DirContextDnsResolver.java   |  2 +-
 .../java/io/lettuce/core/resource/DnsResolver.java     |  2 +-
 .../java/io/lettuce/core/resource/DnsResolvers.java    |  2 +-
 .../io/lettuce/core/resource/EqualJitterDelay.java     |  2 +-
 .../lettuce/core/resource/EventLoopGroupProvider.java  |  2 +-
 .../io/lettuce/core/resource/ExponentialDelay.java     |  2 +-
 .../java/io/lettuce/core/resource/FullJitterDelay.java |  2 +-
 src/main/java/io/lettuce/core/resource/Futures.java    |  2 +-
 .../java/io/lettuce/core/resource/NettyCustomizer.java |  2 +-
 .../lettuce/core/resource/SocketAddressResolver.java   |  2 +-
 .../core/sentinel/RedisSentinelAsyncCommandsImpl.java  |  2 +-
 .../sentinel/RedisSentinelReactiveCommandsImpl.java    |  2 +-
 .../lettuce/core/sentinel/SentinelCommandBuilder.java  |  2 +-
 .../sentinel/StatefulRedisSentinelConnectionImpl.java  |  2 +-
 .../sentinel/api/StatefulRedisSentinelConnection.java  |  2 +-
 .../sentinel/api/async/RedisSentinelAsyncCommands.java |  5 +++--
 .../api/reactive/RedisSentinelReactiveCommands.java    |  8 ++++----
 .../core/sentinel/api/sync/RedisSentinelCommands.java  |  3 ++-
 .../java/io/lettuce/core/support/AbstractCdiBean.java  |  2 +-
 .../core/support/AsyncConnectionPoolSupport.java       |  2 +-
 .../io/lettuce/core/support/AsyncObjectFactory.java    |  2 +-
 src/main/java/io/lettuce/core/support/AsyncPool.java   |  2 +-
 src/main/java/io/lettuce/core/support/BasePool.java    |  2 +-
 .../java/io/lettuce/core/support/BasePoolConfig.java   |  2 +-
 .../java/io/lettuce/core/support/BoundedAsyncPool.java |  2 +-
 .../io/lettuce/core/support/BoundedPoolConfig.java     |  2 +-
 .../core/support/ClientResourcesFactoryBean.java       |  2 +-
 .../core/support/CommonsPool2ConfigConverter.java      |  2 +-
 .../io/lettuce/core/support/ConnectionPoolSupport.java |  2 +-
 .../io/lettuce/core/support/ConnectionWrapping.java    |  2 +-
 .../io/lettuce/core/support/LettuceCdiExtension.java   |  2 +-
 .../core/support/LettuceFactoryBeanSupport.java        |  2 +-
 .../io/lettuce/core/support/RedisClientCdiBean.java    |  2 +-
 .../lettuce/core/support/RedisClientFactoryBean.java   |  2 +-
 .../core/support/RedisClusterClientCdiBean.java        |  2 +-
 .../core/support/RedisClusterClientFactoryBean.java    |  2 +-
 .../io/lettuce/core/api/BaseRedisCommands.java         |  2 +-
 .../io/lettuce/core/api/RedisGeoCommands.java          |  2 +-
 .../io/lettuce/core/api/RedisHLLCommands.java          |  2 +-
 .../io/lettuce/core/api/RedisHashCommands.java         |  2 +-
 .../io/lettuce/core/api/RedisKeyCommands.java          |  2 +-
 .../io/lettuce/core/api/RedisListCommands.java         |  2 +-
 .../io/lettuce/core/api/RedisScriptingCommands.java    |  2 +-
 .../io/lettuce/core/api/RedisSentinelCommands.java     |  2 +-
 .../io/lettuce/core/api/RedisServerCommands.java       |  2 +-
 .../io/lettuce/core/api/RedisSetCommands.java          |  2 +-
 .../io/lettuce/core/api/RedisSortedSetCommands.java    |  2 +-
 .../io/lettuce/core/api/RedisStringCommands.java       |  2 +-
 .../lettuce/core/api/RedisTransactionalCommands.java   |  2 +-
 .../biz/paluch/redis/extensibility/LettuceGeoDemo.java |  2 +-
 .../redis/extensibility/MyExtendedRedisClient.java     |  2 +-
 .../redis/extensibility/MyExtendedRedisClientTest.java |  2 +-
 .../paluch/redis/extensibility/MyPubSubConnection.java |  2 +-
 src/test/java/io/lettuce/CanConnect.java               |  2 +-
 src/test/java/io/lettuce/ConnectionTestUtil.java       |  2 +-
 src/test/java/io/lettuce/Delay.java                    |  2 +-
 src/test/java/io/lettuce/Futures.java                  |  2 +-
 src/test/java/io/lettuce/KeysAndValues.java            |  2 +-
 src/test/java/io/lettuce/LenientClusterDownRule.java   |  2 +-
 src/test/java/io/lettuce/LoggingTestRule.java          |  2 +-
 src/test/java/io/lettuce/Sockets.java                  |  2 +-
 src/test/java/io/lettuce/SslTest.java                  |  2 +-
 src/test/java/io/lettuce/TestClientResources.java      |  2 +-
 src/test/java/io/lettuce/Wait.java                     |  2 +-
 .../lettuce/apigenerator/CompilationUnitFactory.java   |  2 +-
 src/test/java/io/lettuce/apigenerator/Constants.java   |  2 +-
 .../java/io/lettuce/apigenerator/CreateAsyncApi.java   |  2 +-
 .../CreateAsyncNodeSelectionClusterApi.java            |  2 +-
 .../io/lettuce/apigenerator/CreateReactiveApi.java     |  2 +-
 .../java/io/lettuce/apigenerator/CreateSyncApi.java    |  2 +-
 .../CreateSyncNodeSelectionClusterApi.java             |  2 +-
 .../apigenerator/GenerateCommandInterfaces.java        |  2 +-
 src/test/java/io/lettuce/category/SlowTests.java       |  2 +-
 src/test/java/io/lettuce/codec/CRC16Test.java          |  2 +-
 .../java/io/lettuce/core/AbstractRedisClientTest.java  |  4 ++--
 src/test/java/io/lettuce/core/AbstractTest.java        |  2 +-
 src/test/java/io/lettuce/core/AllTheAPIsTest.java      |  4 ++--
 src/test/java/io/lettuce/core/AsyncConnectionTest.java |  2 +-
 src/test/java/io/lettuce/core/ClientMetricsTest.java   |  2 +-
 src/test/java/io/lettuce/core/ClientOptionsTest.java   |  2 +-
 .../java/io/lettuce/core/ConnectionCommandTest.java    |  4 +---
 src/test/java/io/lettuce/core/CustomCodecTest.java     |  3 +--
 src/test/java/io/lettuce/core/DefaultRedisClient.java  |  2 +-
 src/test/java/io/lettuce/core/FastShutdown.java        |  2 +-
 src/test/java/io/lettuce/core/GeoModelTest.java        |  4 ++--
 src/test/java/io/lettuce/core/JavaRuntimeTest.java     |  5 ++---
 .../java/io/lettuce/core/KeyValueStreamingAdapter.java |  2 +-
 src/test/java/io/lettuce/core/KeyValueTest.java        |  2 +-
 src/test/java/io/lettuce/core/LettuceFuturesTest.java  |  8 ++++----
 src/test/java/io/lettuce/core/LimitTest.java           |  2 +-
 .../java/io/lettuce/core/ListStreamingAdapter.java     |  3 +--
 src/test/java/io/lettuce/core/PipeliningTest.java      |  2 +-
 src/test/java/io/lettuce/core/PrivateAccessorTest.java |  6 +++---
 src/test/java/io/lettuce/core/ProtectedModeTests.java  |  2 +-
 src/test/java/io/lettuce/core/RangeTest.java           |  2 +-
 .../core/ReactiveBackpressurePropagationTest.java      |  2 +-
 .../java/io/lettuce/core/ReactiveConnectionTest.java   |  2 +-
 .../io/lettuce/core/ReactiveStreamingOutputTest.java   |  2 +-
 .../io/lettuce/core/RedisClientConnectionTest.java     |  2 +-
 .../io/lettuce/core/RedisClientFactoryBeanTest.java    |  3 +--
 .../java/io/lettuce/core/RedisClientFactoryTest.java   |  4 ++--
 .../java/io/lettuce/core/RedisClientListenerTest.java  |  2 +-
 src/test/java/io/lettuce/core/RedisClientTest.java     |  2 +-
 src/test/java/io/lettuce/core/RedisURIBuilderTest.java |  2 +-
 src/test/java/io/lettuce/core/RedisURITest.java        |  2 +-
 src/test/java/io/lettuce/core/ScanCursorTest.java      |  2 +-
 src/test/java/io/lettuce/core/ScanIteratorTest.java    |  2 +-
 src/test/java/io/lettuce/core/ScanStreamTest.java      |  2 +-
 .../io/lettuce/core/ScoredValueStreamingAdapter.java   |  2 +-
 src/test/java/io/lettuce/core/ScoredValueTest.java     |  2 +-
 src/test/java/io/lettuce/core/SocketOptionsTest.java   |  2 +-
 .../io/lettuce/core/SyncAsyncApiConvergenceTest.java   |  2 +-
 .../io/lettuce/core/TestEventLoopGroupProvider.java    |  3 +--
 src/test/java/io/lettuce/core/TestRedisPublisher.java  |  2 +-
 src/test/java/io/lettuce/core/TestSettings.java        |  2 +-
 src/test/java/io/lettuce/core/TimeoutOptionsTest.java  |  2 +-
 .../java/io/lettuce/core/UnixDomainSocketTest.java     |  2 +-
 src/test/java/io/lettuce/core/Utf8StringCodecTest.java |  2 +-
 src/test/java/io/lettuce/core/ValueTest.java           |  2 +-
 src/test/java/io/lettuce/core/ZStoreArgsTest.java      |  2 +-
 .../io/lettuce/core/cluster/AbstractClusterTest.java   |  2 +-
 .../core/cluster/AdvancedClusterClientTest.java        |  2 +-
 .../core/cluster/AdvancedClusterReactiveTest.java      |  2 +-
 .../core/cluster/AsyncConnectionProviderTest.java      |  2 +-
 .../io/lettuce/core/cluster/ByteCodecClusterTest.java  |  2 +-
 .../lettuce/core/cluster/ClusterClientOptionsTest.java |  2 +-
 .../core/cluster/ClusterCommandInternalsTest.java      |  2 +-
 .../io/lettuce/core/cluster/ClusterCommandTest.java    |  2 +-
 .../cluster/ClusterDistributionChannelWriterTest.java  |  2 +-
 .../lettuce/core/cluster/ClusterNodeEndpointTest.java  |  2 +-
 .../lettuce/core/cluster/ClusterPartiallyDownTest.java |  2 +-
 .../core/cluster/ClusterPartitionParserTest.java       |  2 +-
 .../core/cluster/ClusterReactiveCommandTest.java       |  3 +--
 src/test/java/io/lettuce/core/cluster/ClusterRule.java |  2 +-
 .../java/io/lettuce/core/cluster/ClusterSetup.java     |  2 +-
 .../java/io/lettuce/core/cluster/ClusterTestUtil.java  |  2 +-
 .../cluster/ClusterTopologyRefreshOptionsTest.java     |  2 +-
 .../cluster/ClusterTopologyRefreshSchedulerTest.java   |  3 +--
 .../HealthyMajorityPartitionsConsensusTest.java        |  2 +-
 .../cluster/KnownMajorityPartitionsConsensusTest.java  |  2 +-
 .../lettuce/core/cluster/NodeSelectionAsyncTest.java   |  2 +-
 .../io/lettuce/core/cluster/NodeSelectionSyncTest.java |  4 ++--
 .../core/cluster/PartitionsConsensusTestSupport.java   |  2 +-
 .../lettuce/core/cluster/PipelinedRedisFutureTest.java |  6 +++---
 .../cluster/PooledClusterConnectionProviderTest.java   |  2 +-
 .../java/io/lettuce/core/cluster/ReadFromTest.java     |  2 +-
 .../io/lettuce/core/cluster/ReadOnlyCommandsTest.java  |  2 +-
 .../core/cluster/RedisClusterClientFactoryTest.java    |  2 +-
 .../lettuce/core/cluster/RedisClusterClientTest.java   |  2 +-
 .../cluster/RedisClusterPasswordSecuredSslTest.java    |  2 +-
 .../lettuce/core/cluster/RedisClusterReadFromTest.java |  2 +-
 .../io/lettuce/core/cluster/RedisClusterSetupTest.java |  2 +-
 .../core/cluster/RedisClusterStressScenariosTest.java  |  2 +-
 .../lettuce/core/cluster/RedisClusterURIUtilTest.java  |  2 +-
 .../core/cluster/RedisReactiveClusterClientTest.java   |  3 +--
 .../cluster/RoundRobinSocketAddressSupplierTest.java   |  2 +-
 .../java/io/lettuce/core/cluster/ScanIteratorTest.java |  2 +-
 .../java/io/lettuce/core/cluster/ScanStreamTest.java   |  2 +-
 .../SingleThreadedReactiveClusterClientTest.java       |  3 +--
 .../java/io/lettuce/core/cluster/SlotHashTest.java     |  2 +-
 .../cluster/commands/CustomClusterCommandTest.java     |  2 +-
 .../core/cluster/commands/GeoClusterCommandTest.java   |  2 +-
 .../core/cluster/commands/HashClusterCommandTest.java  |  2 +-
 .../core/cluster/commands/KeyClusterCommandTest.java   |  2 +-
 .../core/cluster/commands/ListClusterCommandTest.java  |  2 +-
 .../cluster/commands/StringClusterCommandTest.java     |  2 +-
 .../reactive/HashClusterReactiveCommandTest.java       |  2 +-
 .../reactive/KeyClusterReativeCommandTest.java         |  2 +-
 .../reactive/ListClusterReactiveCommandTest.java       |  2 +-
 .../reactive/StringClusterReactiveCommandTest.java     |  2 +-
 .../core/cluster/models/partitions/PartitionsTest.java |  2 +-
 .../models/partitions/RedisClusterNodeTest.java        |  4 ++--
 .../cluster/models/slots/ClusterSlotsParserTest.java   |  2 +-
 .../lettuce/core/cluster/pubsub/PubSubClusterTest.java |  2 +-
 .../core/cluster/pubsub/PubSubConnectionTest.java      |  2 +-
 .../core/cluster/topology/NodeTopologyViewsTest.java   |  2 +-
 .../io/lettuce/core/cluster/topology/RequestsTest.java |  2 +-
 .../core/cluster/topology/TopologyComparatorsTest.java |  9 ++++++---
 .../core/cluster/topology/TopologyRefreshTest.java     |  2 +-
 .../io/lettuce/core/codec/CompressionCodecTest.java    |  2 +-
 .../java/io/lettuce/core/codec/StringCodecTest.java    |  3 +--
 .../java/io/lettuce/core/commands/BitCommandTest.java  |  2 +-
 .../io/lettuce/core/commands/CustomCommandTest.java    |  2 +-
 .../java/io/lettuce/core/commands/GeoCommandTest.java  |  2 +-
 .../java/io/lettuce/core/commands/HLLCommandTest.java  |  2 +-
 .../java/io/lettuce/core/commands/HashCommandTest.java |  2 +-
 .../java/io/lettuce/core/commands/KeyCommandTest.java  |  2 +-
 .../java/io/lettuce/core/commands/ListCommandTest.java |  2 +-
 .../io/lettuce/core/commands/NumericCommandTest.java   |  2 +-
 .../core/commands/RunOnlyOnceServerCommandTest.java    |  2 +-
 .../io/lettuce/core/commands/ScriptingCommandTest.java |  2 +-
 .../io/lettuce/core/commands/ServerCommandTest.java    |  2 +-
 .../java/io/lettuce/core/commands/SetCommandTest.java  |  2 +-
 .../java/io/lettuce/core/commands/SortCommandTest.java |  2 +-
 .../io/lettuce/core/commands/SortedSetCommandTest.java |  2 +-
 .../io/lettuce/core/commands/StringCommandTest.java    |  2 +-
 .../core/commands/reactive/BitReactiveCommandTest.java |  2 +-
 .../commands/reactive/CustomReactiveCommandTest.java   |  2 +-
 .../core/commands/reactive/GeoReactiveCommandTest.java |  2 +-
 .../core/commands/reactive/HLLReactiveCommandTest.java |  2 +-
 .../commands/reactive/HashReactiveCommandTest.java     |  2 +-
 .../core/commands/reactive/KeyReactiveCommandTest.java |  2 +-
 .../commands/reactive/ListReactiveCommandTest.java     |  2 +-
 .../commands/reactive/NumericReactiveCommandTest.java  |  2 +-
 .../reactive/ScriptingReactiveCommandTest.java         |  2 +-
 .../commands/reactive/ServerReactiveCommandTest.java   |  2 +-
 .../core/commands/reactive/SetReactiveCommandTest.java |  2 +-
 .../commands/reactive/SortReactiveCommandTest.java     |  2 +-
 .../reactive/SortedSetReactiveCommandTest.java         |  2 +-
 .../commands/reactive/StringReactiveCommandTest.java   |  2 +-
 .../reactive/TransactionReactiveCommandTest.java       |  2 +-
 .../core/commands/transactional/BitTxCommandTest.java  |  2 +-
 .../core/commands/transactional/GeoTxCommandTest.java  |  2 +-
 .../core/commands/transactional/HLLTxCommandTest.java  |  2 +-
 .../core/commands/transactional/HashTxCommandTest.java |  2 +-
 .../core/commands/transactional/KeyTxCommandTest.java  |  2 +-
 .../core/commands/transactional/ListTxCommandTest.java |  2 +-
 .../core/commands/transactional/SetTxCommandTest.java  |  2 +-
 .../core/commands/transactional/SortTxCommandTest.java |  2 +-
 .../commands/transactional/SortedSetTxCommandTest.java |  2 +-
 .../commands/transactional/StringTxCommandTest.java    |  2 +-
 .../transactional/TxSyncInvocationHandler.java         |  3 +--
 .../BatchExecutableCommandLookupStrategyTest.java      |  2 +-
 .../core/dynamic/CommandSegmentCommandFactoryTest.java |  2 +-
 .../io/lettuce/core/dynamic/ConversionServiceTest.java |  2 +-
 .../core/dynamic/DeclaredCommandMethodTest.java        |  2 +-
 .../core/dynamic/DefaultCommandMethodVerifierTest.java |  2 +-
 .../io/lettuce/core/dynamic/ParameterBinderTest.java   |  2 +-
 .../ReactiveCommandSegmentCommandFactoryTest.java      |  2 +-
 .../lettuce/core/dynamic/ReactiveTypeAdaptersTest.java |  5 ++---
 .../lettuce/core/dynamic/ReactiveTypeAdaptionTest.java |  3 +--
 .../lettuce/core/dynamic/RedisCommandsAsyncTest.java   |  2 +-
 .../core/dynamic/RedisCommandsBatchingTest.java        |  2 +-
 .../core/dynamic/RedisCommandsClusterSyncTest.java     |  2 +-
 .../core/dynamic/RedisCommandsReactiveTest.java        |  3 +--
 .../io/lettuce/core/dynamic/RedisCommandsSyncTest.java |  2 +-
 .../io/lettuce/core/dynamic/RedisCommandsTest.java     |  2 +-
 .../io/lettuce/core/dynamic/SimpleBatcherTest.java     |  2 +-
 .../codec/AnnotationRedisCodecResolverTest.java        |  2 +-
 .../core/dynamic/codec/ParameterWrappersTest.java      |  2 +-
 .../dynamic/intercept/InvocationProxyFactoryTest.java  |  2 +-
 .../dynamic/output/CodecAwareOutputResolverTest.java   |  2 +-
 ...OutputRegistryCommandOutputFactoryResolverTest.java |  2 +-
 .../core/dynamic/output/OutputRegistryTest.java        |  2 +-
 .../segment/AnnotationCommandSegmentFactoryTest.java   |  2 +-
 .../support/ParametrizedTypeInformationTest.java       |  2 +-
 .../dynamic/support/WildcardTypeInformationTest.java   |  2 +-
 .../core/event/ConnectionEventsTriggeredTest.java      |  3 +--
 .../io/lettuce/core/event/DefaultEventBusTest.java     |  2 +-
 .../core/event/DefaultEventPublisherOptionsTest.java   |  2 +-
 .../core/internal/AbstractInvocationHandlerTest.java   |  2 +-
 .../java/io/lettuce/core/internal/HostAndPortTest.java |  2 +-
 .../io/lettuce/core/masterslave/CustomCommandTest.java |  2 +-
 .../core/masterslave/MasterSlaveChannelWriterTest.java |  2 +-
 .../masterslave/MasterSlaveConnectionProviderTest.java |  2 +-
 .../core/masterslave/MasterSlaveSentinelTest.java      |  2 +-
 .../io/lettuce/core/masterslave/MasterSlaveTest.java   |  2 +-
 .../masterslave/MasterSlaveTopologyProviderTest.java   |  2 +-
 .../masterslave/MasterSlaveTopologyRefreshTest.java    |  2 +-
 .../lettuce/core/masterslave/MasterSlaveUtilsTest.java |  2 +-
 .../core/masterslave/SentinelTopologyRefreshTest.java  |  2 +-
 .../core/masterslave/StaticMasterSlaveTest.java        |  2 +-
 .../io/lettuce/core/metrics/CommandLatencyIdTest.java  |  5 +++--
 .../metrics/DefaultCommandLatencyCollectorTest.java    |  2 +-
 ...faultDefaultCommandLatencyCollectorOptionsTest.java |  2 +-
 .../core/models/command/CommandDetailParserTest.java   |  2 +-
 .../io/lettuce/core/models/role/RoleParserTest.java    |  4 ++--
 .../io/lettuce/core/output/BooleanListOutputTest.java  |  2 +-
 .../core/output/GeoCoordinatesListOutputTest.java      |  2 +-
 .../core/output/GeoCoordinatesValueListOutputTest.java |  2 +-
 .../lettuce/core/output/GeoWithinListOutputTest.java   |  2 +-
 .../java/io/lettuce/core/output/ListOutputTest.java    |  2 +-
 .../io/lettuce/core/output/NestedMultiOutputTest.java  |  2 +-
 .../lettuce/core/output/ScoredValueListOutputTest.java |  2 +-
 .../lettuce/core/output/SocketAddressOutputTest.java   |  4 ++--
 .../core/protocol/AsyncCommandInternalsTest.java       |  2 +-
 .../java/io/lettuce/core/protocol/CommandArgsTest.java |  2 +-
 .../io/lettuce/core/protocol/CommandHandlerTest.java   |  2 +-
 .../io/lettuce/core/protocol/CommandInternalsTest.java |  2 +-
 .../io/lettuce/core/protocol/CommandWrapperTest.java   |  2 +-
 .../lettuce/core/protocol/ConnectionFailureTest.java   |  2 +-
 .../io/lettuce/core/protocol/DefaultEndpointTest.java  |  2 +-
 .../io/lettuce/core/protocol/StateMachineTest.java     |  3 +--
 .../lettuce/core/pubsub/PubSubCommandHandlerTest.java  |  2 +-
 .../java/io/lettuce/core/pubsub/PubSubCommandTest.java |  2 +-
 .../io/lettuce/core/pubsub/PubSubReactiveTest.java     |  2 +-
 .../core/reactive/RedisPublisherVerification.java      |  2 +-
 .../io/lettuce/core/reliability/AtLeastOnceTest.java   |  2 +-
 .../io/lettuce/core/reliability/AtMostOnceTest.java    |  2 +-
 .../io/lettuce/core/resource/ConstantDelayTest.java    |  2 +-
 .../core/resource/DecorrelatedJitterDelayTest.java     |  2 +-
 .../core/resource/DefaultClientResourcesTest.java      |  4 +---
 .../resource/DefaultEventLoopGroupProviderTest.java    |  2 +-
 .../core/resource/DirContextDnsResolverTest.java       |  2 +-
 .../io/lettuce/core/resource/EqualJitterDelayTest.java |  2 +-
 .../io/lettuce/core/resource/ExponentialDelayTest.java |  2 +-
 .../io/lettuce/core/resource/FullJitterDelayTest.java  |  2 +-
 .../java/io/lettuce/core/resource/FuturesTest.java     |  2 +-
 .../io/lettuce/core/sentinel/AbstractSentinelTest.java |  2 +-
 .../io/lettuce/core/sentinel/SentinelCommandTest.java  |  2 +-
 .../lettuce/core/sentinel/SentinelConnectionTest.java  |  2 +-
 .../java/io/lettuce/core/sentinel/SentinelRule.java    |  2 +-
 .../core/sentinel/SentinelServerCommandTest.java       |  2 +-
 .../sentinel/reactive/SentinelReactiveCommandTest.java |  4 ++--
 .../reactive/SentinelServerReactiveCommandTest.java    |  2 +-
 .../java/io/lettuce/core/server/MockTcpServer.java     |  2 +-
 .../io/lettuce/core/server/RandomResponseServer.java   |  2 +-
 .../io/lettuce/core/server/RandomServerHandler.java    |  2 +-
 .../core/support/AsyncConnectionPoolSupportTest.java   |  2 +-
 .../core/support/AsyncPoolWithValidationTest.java      |  2 +-
 .../io/lettuce/core/support/BoundedAsyncPoolTest.java  |  2 +-
 src/test/java/io/lettuce/core/support/CdiTest.java     |  2 +-
 .../core/support/ConnectionPoolSupportTest.java        |  2 +-
 .../java/io/lettuce/core/support/InjectedClient.java   |  2 +-
 src/test/java/io/lettuce/core/support/PersonDB.java    |  2 +-
 .../io/lettuce/core/support/PubSubTestListener.java    |  2 +-
 .../support/RedisClusterClientFactoryBeanTest.java     |  2 +-
 src/test/java/io/lettuce/core/support/SpringTest.java  |  4 ++--
 .../lettuce/examples/ConnectToElastiCacheMaster.java   |  2 +-
 .../ConnectToMasterSlaveUsingElastiCacheCluster.java   |  2 +-
 .../ConnectToMasterSlaveUsingRedisSentinel.java        |  2 +-
 src/test/java/io/lettuce/examples/ConnectToRedis.java  |  2 +-
 .../io/lettuce/examples/ConnectToRedisCluster.java     |  2 +-
 .../io/lettuce/examples/ConnectToRedisClusterSSL.java  |  2 +-
 .../ConnectToRedisClusterWithTopologyRefreshing.java   |  2 +-
 .../java/io/lettuce/examples/ConnectToRedisSSL.java    |  2 +-
 .../examples/ConnectToRedisUsingRedisSentinel.java     |  2 +-
 src/test/java/io/lettuce/examples/MySpringBean.java    |  2 +-
 .../java/io/lettuce/examples/ReadWriteExample.java     |  2 +-
 src/test/java/io/lettuce/examples/SpringExample.java   |  2 +-
 .../util/ConnectionDecoratingInvocationHandler.java    |  2 +-
 .../io/lettuce/util/ReactiveSyncInvocationHandler.java |  2 +-
 .../java/io/lettuce/util/RoutingInvocationHandler.java |  2 +-
 .../jmh/io/lettuce/core/EmptyRedisChannelWriter.java   |  2 +-
 .../io/lettuce/core/EmptyStatefulRedisConnection.java  |  2 +-
 src/test/jmh/io/lettuce/core/JmhMain.java              |  3 +--
 src/test/jmh/io/lettuce/core/RedisClientBenchmark.java |  2 +-
 .../ClusterDistributionChannelWriterBenchmark.java     |  2 +-
 .../lettuce/core/cluster/EmptyRedisClusterClient.java  |  2 +-
 src/test/jmh/io/lettuce/core/cluster/JmhMain.java      |  2 +-
 .../core/cluster/RedisClusterClientBenchmark.java      |  2 +-
 .../jmh/io/lettuce/core/cluster/SlotHashBenchmark.java |  2 +-
 src/test/jmh/io/lettuce/core/codec/JmhMain.java        |  2 +-
 .../io/lettuce/core/codec/StringCodecBenchmark.java    |  3 +--
 .../lettuce/core/codec/Utf8StringCodecBenchmark.java   |  2 +-
 .../core/dynamic/RedisCommandFactoryBenchmark.java     |  2 +-
 .../lettuce/core/dynamic/RedisCommandsBenchmark.java   |  2 +-
 .../intercept/InvocationProxyFactoryBenchmark.java     |  2 +-
 src/test/jmh/io/lettuce/core/output/JmhMain.java       |  2 +-
 .../lettuce/core/output/ValueListOutputBenchmark.java  |  2 +-
 .../jmh/io/lettuce/core/protocol/CommandBenchmark.java |  2 +-
 .../lettuce/core/protocol/CommandHandlerBenchmark.java |  2 +-
 .../jmh/io/lettuce/core/protocol/EmptyByteBuf.java     |  2 +-
 .../io/lettuce/core/protocol/EmptyClientResources.java |  2 +-
 .../jmh/io/lettuce/core/protocol/EmptyContext.java     |  6 +++---
 src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java | 10 +++++-----
 .../jmh/io/lettuce/core/protocol/EmptyPromise.java     |  2 +-
 src/test/jmh/io/lettuce/core/protocol/JmhMain.java     |  2 +-
 .../lettuce/core/protocol/RedisEndpointBenchmark.java  |  2 +-
 .../core/protocol/RedisStateMachineBenchmark.java      |  2 +-
 .../core/support/AsyncConnectionPoolBenchmark.java     |  2 +-
 .../core/support/GenericConnectionPoolBenchmark.java   |  2 +-
 src/test/jmh/io/lettuce/core/support/JmhMain.java      |  2 +-
 854 files changed, 955 insertions(+), 1014 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 8dd3aa3b2d..7c28a59310 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 3b36fa4736..9622a2333b 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 6937754974..ce690ea601 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/BitFieldArgs.java b/src/main/java/io/lettuce/core/BitFieldArgs.java
index d867ded05f..f9bb35f7fd 100644
--- a/src/main/java/io/lettuce/core/BitFieldArgs.java
+++ b/src/main/java/io/lettuce/core/BitFieldArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ChannelGroupListener.java b/src/main/java/io/lettuce/core/ChannelGroupListener.java
index 49671d9bd0..bf09c6788b 100644
--- a/src/main/java/io/lettuce/core/ChannelGroupListener.java
+++ b/src/main/java/io/lettuce/core/ChannelGroupListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index 2507f14ce7..0594e7d3b5 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/CloseEvents.java b/src/main/java/io/lettuce/core/CloseEvents.java
index 4da7672b4c..6f4f58419a 100644
--- a/src/main/java/io/lettuce/core/CloseEvents.java
+++ b/src/main/java/io/lettuce/core/CloseEvents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/CompositeArgument.java b/src/main/java/io/lettuce/core/CompositeArgument.java
index 7e44693eb3..124f12a75e 100644
--- a/src/main/java/io/lettuce/core/CompositeArgument.java
+++ b/src/main/java/io/lettuce/core/CompositeArgument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index d7ba434946..35ec0513e7 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ConnectionEventTrigger.java b/src/main/java/io/lettuce/core/ConnectionEventTrigger.java
index dd2b8bf25e..a78f6eb561 100644
--- a/src/main/java/io/lettuce/core/ConnectionEventTrigger.java
+++ b/src/main/java/io/lettuce/core/ConnectionEventTrigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,7 @@
 
 import io.lettuce.core.event.EventBus;
 import io.lettuce.core.event.connection.ConnectionDeactivatedEvent;
-
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.channel.local.LocalAddress;
diff --git a/src/main/java/io/lettuce/core/ConnectionEvents.java b/src/main/java/io/lettuce/core/ConnectionEvents.java
index 15782e784f..1d6191545f 100644
--- a/src/main/java/io/lettuce/core/ConnectionEvents.java
+++ b/src/main/java/io/lettuce/core/ConnectionEvents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ConnectionFuture.java b/src/main/java/io/lettuce/core/ConnectionFuture.java
index 99292b8a20..0c7d60c45d 100644
--- a/src/main/java/io/lettuce/core/ConnectionFuture.java
+++ b/src/main/java/io/lettuce/core/ConnectionFuture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ConnectionId.java b/src/main/java/io/lettuce/core/ConnectionId.java
index acda361018..694e4c17ec 100644
--- a/src/main/java/io/lettuce/core/ConnectionId.java
+++ b/src/main/java/io/lettuce/core/ConnectionId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ConnectionPoint.java b/src/main/java/io/lettuce/core/ConnectionPoint.java
index ec437dd1db..a7c1934563 100644
--- a/src/main/java/io/lettuce/core/ConnectionPoint.java
+++ b/src/main/java/io/lettuce/core/ConnectionPoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/DefaultConnectionFuture.java b/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
index 52c2fb9d92..cb1b56f841 100644
--- a/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
+++ b/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/EpollProvider.java b/src/main/java/io/lettuce/core/EpollProvider.java
index 882b1c8139..0f6c2b7419 100644
--- a/src/main/java/io/lettuce/core/EpollProvider.java
+++ b/src/main/java/io/lettuce/core/EpollProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ExceptionFactory.java b/src/main/java/io/lettuce/core/ExceptionFactory.java
index aa18f1e7e1..9b9326c03c 100644
--- a/src/main/java/io/lettuce/core/ExceptionFactory.java
+++ b/src/main/java/io/lettuce/core/ExceptionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/GeoArgs.java b/src/main/java/io/lettuce/core/GeoArgs.java
index 63e65d563f..ca6641ad6a 100644
--- a/src/main/java/io/lettuce/core/GeoArgs.java
+++ b/src/main/java/io/lettuce/core/GeoArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/GeoCoordinates.java b/src/main/java/io/lettuce/core/GeoCoordinates.java
index afd9dec360..a094871664 100644
--- a/src/main/java/io/lettuce/core/GeoCoordinates.java
+++ b/src/main/java/io/lettuce/core/GeoCoordinates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java b/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
index 65773f9016..9353d355a1 100644
--- a/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
+++ b/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/GeoWithin.java b/src/main/java/io/lettuce/core/GeoWithin.java
index 8983e0f4b7..9540002c30 100644
--- a/src/main/java/io/lettuce/core/GeoWithin.java
+++ b/src/main/java/io/lettuce/core/GeoWithin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/JavaRuntime.java b/src/main/java/io/lettuce/core/JavaRuntime.java
index dbd8455de2..9136f4ea64 100644
--- a/src/main/java/io/lettuce/core/JavaRuntime.java
+++ b/src/main/java/io/lettuce/core/JavaRuntime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/KeyScanCursor.java b/src/main/java/io/lettuce/core/KeyScanCursor.java
index 7c8e69ac29..d6cba4df83 100644
--- a/src/main/java/io/lettuce/core/KeyScanCursor.java
+++ b/src/main/java/io/lettuce/core/KeyScanCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/KeyValue.java b/src/main/java/io/lettuce/core/KeyValue.java
index 5783de4d76..8cb6e3f3b4 100644
--- a/src/main/java/io/lettuce/core/KeyValue.java
+++ b/src/main/java/io/lettuce/core/KeyValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/KillArgs.java b/src/main/java/io/lettuce/core/KillArgs.java
index d4c29d9329..be34dcc8de 100644
--- a/src/main/java/io/lettuce/core/KillArgs.java
+++ b/src/main/java/io/lettuce/core/KillArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,10 @@
  */
 package io.lettuce.core;
 
-import static io.lettuce.core.protocol.CommandKeyword.*;
-import static io.lettuce.core.protocol.CommandType.*;
+import static io.lettuce.core.protocol.CommandKeyword.ADDR;
+import static io.lettuce.core.protocol.CommandKeyword.ID;
+import static io.lettuce.core.protocol.CommandKeyword.SKIPME;
+import static io.lettuce.core.protocol.CommandType.TYPE;
 
 import io.lettuce.core.protocol.CommandArgs;
 
diff --git a/src/main/java/io/lettuce/core/KqueueProvider.java b/src/main/java/io/lettuce/core/KqueueProvider.java
index 9377b1be7d..85ce5c959c 100644
--- a/src/main/java/io/lettuce/core/KqueueProvider.java
+++ b/src/main/java/io/lettuce/core/KqueueProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/LettuceFutures.java b/src/main/java/io/lettuce/core/LettuceFutures.java
index bb2cd8098b..a09f15e6a6 100644
--- a/src/main/java/io/lettuce/core/LettuceFutures.java
+++ b/src/main/java/io/lettuce/core/LettuceFutures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,11 +20,6 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import java.util.function.LongSupplier;
-
-import io.lettuce.core.TimeoutOptions.TimeoutSource;
-import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * Utility to {@link #awaitAll(long, TimeUnit, Future[])} futures until they are done and to synchronize future execution using
diff --git a/src/main/java/io/lettuce/core/LettuceStrings.java b/src/main/java/io/lettuce/core/LettuceStrings.java
index a31a1fbfc5..ab36629564 100644
--- a/src/main/java/io/lettuce/core/LettuceStrings.java
+++ b/src/main/java/io/lettuce/core/LettuceStrings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/Limit.java b/src/main/java/io/lettuce/core/Limit.java
index 6ea3cfaceb..18d0d58033 100644
--- a/src/main/java/io/lettuce/core/Limit.java
+++ b/src/main/java/io/lettuce/core/Limit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/MapScanCursor.java b/src/main/java/io/lettuce/core/MapScanCursor.java
index ddaa8d096b..17e41b30fd 100644
--- a/src/main/java/io/lettuce/core/MapScanCursor.java
+++ b/src/main/java/io/lettuce/core/MapScanCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/MigrateArgs.java b/src/main/java/io/lettuce/core/MigrateArgs.java
index 1d943034c2..084272d1b5 100644
--- a/src/main/java/io/lettuce/core/MigrateArgs.java
+++ b/src/main/java/io/lettuce/core/MigrateArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/Operators.java b/src/main/java/io/lettuce/core/Operators.java
index 1b26bee84e..43aee50d8d 100644
--- a/src/main/java/io/lettuce/core/Operators.java
+++ b/src/main/java/io/lettuce/core/Operators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/PlainChannelInitializer.java b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
index 108d691574..f27786b0f9 100644
--- a/src/main/java/io/lettuce/core/PlainChannelInitializer.java
+++ b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/Range.java b/src/main/java/io/lettuce/core/Range.java
index a6f21aac5e..efdd33895f 100644
--- a/src/main/java/io/lettuce/core/Range.java
+++ b/src/main/java/io/lettuce/core/Range.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ReadFrom.java b/src/main/java/io/lettuce/core/ReadFrom.java
index 0875ad3d34..45c1c00690 100644
--- a/src/main/java/io/lettuce/core/ReadFrom.java
+++ b/src/main/java/io/lettuce/core/ReadFrom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ReadFromImpl.java b/src/main/java/io/lettuce/core/ReadFromImpl.java
index 80fb5448b6..7f42331280 100644
--- a/src/main/java/io/lettuce/core/ReadFromImpl.java
+++ b/src/main/java/io/lettuce/core/ReadFromImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java
index 840f1c603d..9a9591fd8a 100644
--- a/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisBusyException.java b/src/main/java/io/lettuce/core/RedisBusyException.java
index 8da4462f7a..907d3148a0 100644
--- a/src/main/java/io/lettuce/core/RedisBusyException.java
+++ b/src/main/java/io/lettuce/core/RedisBusyException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 /**
  * Exception that gets thrown when Redis is busy executing a Lua script with a {@code BUSY} error response.
- * 
+ *
  * @author Mark Paluch
  * @since 4.5
  */
@@ -26,7 +26,7 @@ public class RedisBusyException extends RedisCommandExecutionException {
 
     /**
      * Create a {@code RedisBusyException} with the specified detail message.
-     * 
+     *
      * @param msg the detail message.
      */
     public RedisBusyException(String msg) {
@@ -35,7 +35,7 @@ public RedisBusyException(String msg) {
 
     /**
      * Create a {@code RedisNoScriptException} with the specified detail message and nested exception.
-     * 
+     *
      * @param msg the detail message.
      * @param cause the nested exception.
      */
diff --git a/src/main/java/io/lettuce/core/RedisChannelHandler.java b/src/main/java/io/lettuce/core/RedisChannelHandler.java
index 6523085c83..aec3f39e3b 100644
--- a/src/main/java/io/lettuce/core/RedisChannelHandler.java
+++ b/src/main/java/io/lettuce/core/RedisChannelHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisChannelInitializer.java b/src/main/java/io/lettuce/core/RedisChannelInitializer.java
index d8c3c9294a..14b80aeac9 100644
--- a/src/main/java/io/lettuce/core/RedisChannelInitializer.java
+++ b/src/main/java/io/lettuce/core/RedisChannelInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java b/src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java
index 231989bf4a..0ca14e7f20 100644
--- a/src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java
+++ b/src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisChannelWriter.java b/src/main/java/io/lettuce/core/RedisChannelWriter.java
index f42bc95953..6e593b226c 100644
--- a/src/main/java/io/lettuce/core/RedisChannelWriter.java
+++ b/src/main/java/io/lettuce/core/RedisChannelWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ public interface RedisChannelWriter extends Closeable, AsyncCloseable {
 
     /**
      * Asynchronously close the {@link RedisChannelWriter}.
-     * 
+     *
      * @return future for result synchronization.
      * @since 5.1
      */
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 3f3da31428..4168dfed96 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 5f1aded5d2..41fc670fb0 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisCommandExecutionException.java b/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
index cccd744443..702e4ad353 100644
--- a/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ public RedisCommandExecutionException(String msg) {
 
     /**
      * Create a {@code RedisCommandExecutionException} with the specified detail message and nested exception.
-     * 
+     *
      * @param msg the detail message.
      * @param cause the nested exception.
      */
diff --git a/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java b/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java
index 35feed641e..02491e4d55 100644
--- a/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java b/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
index b5e579bd03..8ba5483a15 100644
--- a/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisConnectionException.java b/src/main/java/io/lettuce/core/RedisConnectionException.java
index ace632480d..c4bffaeec8 100644
--- a/src/main/java/io/lettuce/core/RedisConnectionException.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ public RedisConnectionException(String msg) {
 
     /**
      * Create a {@code RedisConnectionException} with the specified detail message and nested exception.
-     * 
+     *
      * @param msg the detail message.
      * @param cause the nested exception.
      */
diff --git a/src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java b/src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java
index 3e86275fb2..fff7c64fcc 100644
--- a/src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisConnectionStateListener.java b/src/main/java/io/lettuce/core/RedisConnectionStateListener.java
index a43499e93d..326a28c109 100644
--- a/src/main/java/io/lettuce/core/RedisConnectionStateListener.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionStateListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisException.java b/src/main/java/io/lettuce/core/RedisException.java
index 4890b079be..a66932df8d 100644
--- a/src/main/java/io/lettuce/core/RedisException.java
+++ b/src/main/java/io/lettuce/core/RedisException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisFuture.java b/src/main/java/io/lettuce/core/RedisFuture.java
index 36a91c32ed..7b0c960a00 100644
--- a/src/main/java/io/lettuce/core/RedisFuture.java
+++ b/src/main/java/io/lettuce/core/RedisFuture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisLoadingException.java b/src/main/java/io/lettuce/core/RedisLoadingException.java
index b18a362c28..702c230c12 100644
--- a/src/main/java/io/lettuce/core/RedisLoadingException.java
+++ b/src/main/java/io/lettuce/core/RedisLoadingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisNoScriptException.java b/src/main/java/io/lettuce/core/RedisNoScriptException.java
index 10a1deffd8..3009360160 100644
--- a/src/main/java/io/lettuce/core/RedisNoScriptException.java
+++ b/src/main/java/io/lettuce/core/RedisNoScriptException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 /**
  * Exception that gets thrown when Redis indicates absence of a Lua script referenced by its SHA1 digest with a {@code NOSCRIPT}
  * error response.
- * 
+ *
  * @author Mark Paluch
  * @since 4.5
  */
@@ -27,7 +27,7 @@ public class RedisNoScriptException extends RedisCommandExecutionException {
 
     /**
      * Create a {@code RedisNoScriptException} with the specified detail message.
-     * 
+     *
      * @param msg the detail message.
      */
     public RedisNoScriptException(String msg) {
@@ -36,7 +36,7 @@ public RedisNoScriptException(String msg) {
 
     /**
      * Create a {@code RedisNoScriptException} with the specified detail message and nested exception.
-     * 
+     *
      * @param msg the detail message.
      * @param cause the nested exception.
      */
diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index a5a012f221..7a5008dcf0 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
index e0e90384b8..3ab9d52505 100644
--- a/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 3557a574c5..7349446e8f 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ScanArgs.java b/src/main/java/io/lettuce/core/ScanArgs.java
index bfa5b1405b..1810658785 100644
--- a/src/main/java/io/lettuce/core/ScanArgs.java
+++ b/src/main/java/io/lettuce/core/ScanArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ScanCursor.java b/src/main/java/io/lettuce/core/ScanCursor.java
index 031fc92b1f..8d88a72513 100644
--- a/src/main/java/io/lettuce/core/ScanCursor.java
+++ b/src/main/java/io/lettuce/core/ScanCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ScanIterator.java b/src/main/java/io/lettuce/core/ScanIterator.java
index 825625bd71..40b1ad2d5e 100644
--- a/src/main/java/io/lettuce/core/ScanIterator.java
+++ b/src/main/java/io/lettuce/core/ScanIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ScanStream.java b/src/main/java/io/lettuce/core/ScanStream.java
index 3e617cb88a..c11bbcbfba 100644
--- a/src/main/java/io/lettuce/core/ScanStream.java
+++ b/src/main/java/io/lettuce/core/ScanStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ScoredValue.java b/src/main/java/io/lettuce/core/ScoredValue.java
index 0dd867f19b..98e0621e5e 100644
--- a/src/main/java/io/lettuce/core/ScoredValue.java
+++ b/src/main/java/io/lettuce/core/ScoredValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ScoredValueScanCursor.java b/src/main/java/io/lettuce/core/ScoredValueScanCursor.java
index ee543c1c6d..c0cab45302 100644
--- a/src/main/java/io/lettuce/core/ScoredValueScanCursor.java
+++ b/src/main/java/io/lettuce/core/ScoredValueScanCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ScriptOutputType.java b/src/main/java/io/lettuce/core/ScriptOutputType.java
index 07089a5b08..5a280c43ad 100644
--- a/src/main/java/io/lettuce/core/ScriptOutputType.java
+++ b/src/main/java/io/lettuce/core/ScriptOutputType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/SetArgs.java b/src/main/java/io/lettuce/core/SetArgs.java
index 4343d3fbe4..6a413e6304 100644
--- a/src/main/java/io/lettuce/core/SetArgs.java
+++ b/src/main/java/io/lettuce/core/SetArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/SocketOptions.java b/src/main/java/io/lettuce/core/SocketOptions.java
index 53424e7bb1..62121c22a1 100644
--- a/src/main/java/io/lettuce/core/SocketOptions.java
+++ b/src/main/java/io/lettuce/core/SocketOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/SortArgs.java b/src/main/java/io/lettuce/core/SortArgs.java
index e66da934be..b55a206335 100644
--- a/src/main/java/io/lettuce/core/SortArgs.java
+++ b/src/main/java/io/lettuce/core/SortArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/SslConnectionBuilder.java b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
index c3f1ea8a93..3923363e50 100644
--- a/src/main/java/io/lettuce/core/SslConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/SslOptions.java b/src/main/java/io/lettuce/core/SslOptions.java
index c32efd0f51..5c76cec316 100644
--- a/src/main/java/io/lettuce/core/SslOptions.java
+++ b/src/main/java/io/lettuce/core/SslOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import java.util.Arrays;
 
 import io.lettuce.core.internal.LettuceAssert;
-
 import io.netty.handler.ssl.OpenSsl;
 import io.netty.handler.ssl.SslProvider;
 
diff --git a/src/main/java/io/lettuce/core/StreamScanCursor.java b/src/main/java/io/lettuce/core/StreamScanCursor.java
index 9685b0770e..cce32f04cd 100644
--- a/src/main/java/io/lettuce/core/StreamScanCursor.java
+++ b/src/main/java/io/lettuce/core/StreamScanCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/TimeoutOptions.java b/src/main/java/io/lettuce/core/TimeoutOptions.java
index f76a400769..7a93943d18 100644
--- a/src/main/java/io/lettuce/core/TimeoutOptions.java
+++ b/src/main/java/io/lettuce/core/TimeoutOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/TransactionResult.java b/src/main/java/io/lettuce/core/TransactionResult.java
index 645d93bddb..ea1a36cd9d 100644
--- a/src/main/java/io/lettuce/core/TransactionResult.java
+++ b/src/main/java/io/lettuce/core/TransactionResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/Transports.java b/src/main/java/io/lettuce/core/Transports.java
index 29ab94b595..bda26a196c 100644
--- a/src/main/java/io/lettuce/core/Transports.java
+++ b/src/main/java/io/lettuce/core/Transports.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/Value.java b/src/main/java/io/lettuce/core/Value.java
index 6b3828eab7..4af59fd84e 100644
--- a/src/main/java/io/lettuce/core/Value.java
+++ b/src/main/java/io/lettuce/core/Value.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ValueScanCursor.java b/src/main/java/io/lettuce/core/ValueScanCursor.java
index 571603c107..19330b27fb 100644
--- a/src/main/java/io/lettuce/core/ValueScanCursor.java
+++ b/src/main/java/io/lettuce/core/ValueScanCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ZAddArgs.java b/src/main/java/io/lettuce/core/ZAddArgs.java
index ea620809a0..4a5c3d17fb 100644
--- a/src/main/java/io/lettuce/core/ZAddArgs.java
+++ b/src/main/java/io/lettuce/core/ZAddArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ZStoreArgs.java b/src/main/java/io/lettuce/core/ZStoreArgs.java
index 6f67cdf441..086af1f3ef 100644
--- a/src/main/java/io/lettuce/core/ZStoreArgs.java
+++ b/src/main/java/io/lettuce/core/ZStoreArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/StatefulConnection.java b/src/main/java/io/lettuce/core/api/StatefulConnection.java
index 60a47fdc6f..c9365e4ec0 100644
--- a/src/main/java/io/lettuce/core/api/StatefulConnection.java
+++ b/src/main/java/io/lettuce/core/api/StatefulConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -87,7 +87,7 @@ public interface StatefulConnection<K, V> extends AutoCloseable, AsyncCloseable
     /**
      * Request to close the connection and return the {@link CompletableFuture} that is notified about its progress. The
      * connection will become not usable anymore as soon as this method was called.
-     * 
+     *
      * @return a {@link CompletableFuture} that is notified once the operation completes, either because the operation was
      *         successful or because of an error.
      * @since 5.1
diff --git a/src/main/java/io/lettuce/core/api/StatefulRedisConnection.java b/src/main/java/io/lettuce/core/api/StatefulRedisConnection.java
index a4ad508501..7f88474578 100644
--- a/src/main/java/io/lettuce/core/api/StatefulRedisConnection.java
+++ b/src/main/java/io/lettuce/core/api/StatefulRedisConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
index 10fc53a113..8ca24fd7fc 100644
--- a/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
index c7c5fd9928..21b231c32f 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java
index 28f806657f..38b4a549f9 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java
index e1dbfa0b83..ce169a70d8 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
index c972bb6249..9bfeb1b9a8 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
index d3ce167eb0..48f9039837 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java
index 6cebfd1bf1..5076875ed8 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
index ede1379ee1..104df08bb5 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
index 46f783db2f..ac3d652c53 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java
index a09eae409d..420dd243f3 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
index 219ed0c723..a78de9e07c 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java
index 98c2cf7c5b..b0a3333966 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,14 +17,12 @@
 
 import java.util.List;
 import java.util.Map;
-import io.lettuce.core.output.KeyValueStreamingChannel;
-import io.lettuce.core.output.ValueStreamingChannel;
+
 import io.lettuce.core.BitFieldArgs;
 import io.lettuce.core.KeyValue;
-import io.lettuce.core.SetArgs;
-import io.lettuce.core.Value;
 import io.lettuce.core.RedisFuture;
-import reactor.core.publisher.Mono;
+import io.lettuce.core.SetArgs;
+import io.lettuce.core.output.KeyValueStreamingChannel;
 
 /**
  * Asynchronous executed commands for Strings.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
index 3791ea3f77..7ee83cafe5 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
index c04300c715..87f5f5a1ff 100644
--- a/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,12 @@
 
 import java.util.Map;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import io.lettuce.core.output.CommandOutput;
 import io.lettuce.core.protocol.CommandArgs;
 import io.lettuce.core.protocol.ProtocolKeyword;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 /**
  *
  * Reactive executed commands for basic commands.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java
index 73409827f2..c9715731dc 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,9 @@
  */
 package io.lettuce.core.api.reactive;
 
-import io.lettuce.core.*;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import io.lettuce.core.*;
 
 /**
  * Reactive executed commands for the Geo-API.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java
index 7b9bb653b9..f36fd22fe0 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
index 3b8098567a..40818b147f 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,14 +17,13 @@
 
 import java.util.Map;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import io.lettuce.core.*;
 import io.lettuce.core.output.KeyStreamingChannel;
 import io.lettuce.core.output.KeyValueStreamingChannel;
 import io.lettuce.core.output.ValueStreamingChannel;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 /**
  * Reactive executed commands for Hashes (Key-Value pairs).
  *
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
index d4c8cc318a..01c3f4cd34 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,12 @@
 
 import java.util.Date;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import io.lettuce.core.*;
 import io.lettuce.core.output.KeyStreamingChannel;
 import io.lettuce.core.output.ValueStreamingChannel;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 /**
  * Reactive executed commands for Keys (Key manipulation/querying).
  *
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java
index 393005297d..c0fbe60118 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,10 @@
  */
 package io.lettuce.core.api.reactive;
 
-import io.lettuce.core.KeyValue;
-import io.lettuce.core.output.ValueStreamingChannel;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.output.ValueStreamingChannel;
 
 /**
  * Reactive executed commands for Lists.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
index 6878b9860a..78a1c4486e 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
index 5b5eee1260..22b4b2b537 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,9 @@
  */
 package io.lettuce.core.api.reactive;
 
-import io.lettuce.core.ScriptOutputType;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import io.lettuce.core.ScriptOutputType;
 
 /**
  * Reactive executed commands for Scripting.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
index 7ee15f130c..a25c3725d4 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java
index 3dc60c1d7a..83a15f2af8 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,14 @@
  */
 package io.lettuce.core.api.reactive;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import io.lettuce.core.ScanArgs;
 import io.lettuce.core.ScanCursor;
 import io.lettuce.core.StreamScanCursor;
 import io.lettuce.core.ValueScanCursor;
 import io.lettuce.core.output.ValueStreamingChannel;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 /**
  * Reactive executed commands for Sets.
  *
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
index 3c337e945b..70fbb284d4 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,12 @@
  */
 package io.lettuce.core.api.reactive;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import io.lettuce.core.*;
 import io.lettuce.core.output.ScoredValueStreamingChannel;
 import io.lettuce.core.output.ValueStreamingChannel;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 /**
  * Reactive executed commands for Sorted Sets.
  *
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java
index 584a657f36..de443ca3cf 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,14 @@
 package io.lettuce.core.api.reactive;
 
 import java.util.Map;
-import io.lettuce.core.output.KeyValueStreamingChannel;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import io.lettuce.core.BitFieldArgs;
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.SetArgs;
 import io.lettuce.core.Value;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
+import io.lettuce.core.output.KeyValueStreamingChannel;
 
 /**
  * Reactive executed commands for Strings.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
index 30f5d866fd..0e593433a8 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,8 @@
  */
 package io.lettuce.core.api.reactive;
 
-import io.lettuce.core.TransactionResult;
-
 import reactor.core.publisher.Mono;
+import io.lettuce.core.TransactionResult;
 
 /**
  * Reactive executed commands for Transactions.
diff --git a/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java b/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
index 993b0fe3ae..a4eb6a9825 100644
--- a/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
index ff2452ff3d..035c3d61c1 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java
index b6734b49c7..b0fb253809 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java
index 04ea308c87..89d68d58c2 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
index 199f9d60a4..f686c855cb 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
index 9d0c9f107a..f8935a155a 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java
index c35ef70288..2d39ae8bc4 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
index f1a7601cbc..c208a391c6 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
index 1af64d3094..65fd1e21a2 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java
index 3d7ec1ef35..a51dfb34a6 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
index 46a874b3e7..87085508c8 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java
index 8ceea6670a..c32cbadd92 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,11 @@
 
 import java.util.List;
 import java.util.Map;
-import io.lettuce.core.output.KeyValueStreamingChannel;
-import io.lettuce.core.output.ValueStreamingChannel;
+
 import io.lettuce.core.BitFieldArgs;
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.SetArgs;
-import io.lettuce.core.Value;
-import reactor.core.publisher.Mono;
+import io.lettuce.core.output.KeyValueStreamingChannel;
 
 /**
  * Synchronous executed commands for Strings.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
index 453a6f89a1..2bbec9653a 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
index b93e7dc7d6..b1497735b3 100644
--- a/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java b/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java
index 870d531834..7a2d5ff52e 100644
--- a/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/AsyncClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/AsyncClusterConnectionProvider.java
index 6af43b02e0..a580974f42 100644
--- a/src/main/java/io/lettuce/core/cluster/AsyncClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/AsyncClusterConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
index 07b3b84e84..109b49009a 100644
--- a/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index 7003265885..4020f5f307 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterCommand.java b/src/main/java/io/lettuce/core/cluster/ClusterCommand.java
index 7d300b2cca..156fcc28f9 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterCommand.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,7 @@
 package io.lettuce.core.cluster;
 
 import io.lettuce.core.RedisChannelWriter;
-import io.lettuce.core.protocol.CommandArgs;
-import io.lettuce.core.protocol.CommandKeyword;
-import io.lettuce.core.protocol.CommandWrapper;
-import io.lettuce.core.protocol.ProtocolKeyword;
-import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.protocol.*;
 import io.netty.buffer.ByteBuf;
 
 /**
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
index fc780ba853..0b9d553ebd 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,7 +76,7 @@ interface ClusterConnectionProvider extends Closeable {
 
     /**
      * Close the connections and free all resources asynchronously.
-     * 
+     *
      * @since 5.1
      */
     CompletableFuture<Void> closeAsync();
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index 78d5f45dfc..2f568c53b2 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java b/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
index ec1e9d0bd6..8540abaf9c 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
index 0f70fea955..0a823aa08a 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java
index 5059df1a89..ab3fa570af 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java b/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
index 551de33695..8dfa4d0b0f 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
index 929bf1fbe2..58e6a02449 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2017 the original author or authors.
+ * Copyright 2015-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java b/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java
index c0b0ab6309..ec030b17cd 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +20,12 @@
 import java.util.List;
 import java.util.function.Function;
 
+import reactor.core.publisher.Mono;
 import io.lettuce.core.*;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.models.role.RedisNodeDescription;
 
-import reactor.core.publisher.Mono;
-
 /**
  * Methods to support a Cluster-wide SCAN operation over multiple hosts.
  *
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
index 402d993380..b58c7e70a5 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
index 03fa04c6dc..437006a0ce 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java b/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
index de113199b0..41caf2cb23 100644
--- a/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java b/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
index 28a85664c6..bb1de36033 100644
--- a/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
+++ b/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
index 1ef757d568..10c39b3747 100644
--- a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java b/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java
index b6bd6bc212..2f2876373a 100644
--- a/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java b/src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java
index 150f2c7535..9e9f588c72 100644
--- a/src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java b/src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java
index 31f6dcf396..581a220657 100644
--- a/src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java b/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
index 589fd177dc..96c6310510 100644
--- a/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
+++ b/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
index 1da777a886..942b007afa 100644
--- a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java b/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java
index 719756d32f..32a8197925 100644
--- a/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java
+++ b/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
index 0ababfad34..01e5275e71 100644
--- a/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
index e46e0a440f..75b93d933f 100644
--- a/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java b/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java
index 9332218638..a6e1ba3a16 100644
--- a/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java
+++ b/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index bd3232c217..b11c74276e 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index bf98284e48..429b8c94d9 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index ddf58adc15..7eade4cb5c 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
index e55268de5b..c593763d8d 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
index 74041d08cd..76c93cba1d 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java b/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java
index 656e435417..80911457fe 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RedisState.java b/src/main/java/io/lettuce/core/cluster/RedisState.java
index 2a2ec5a84a..aa9cd70302 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisState.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RoundRobin.java b/src/main/java/io/lettuce/core/cluster/RoundRobin.java
index f43ef400db..333687a249 100644
--- a/src/main/java/io/lettuce/core/cluster/RoundRobin.java
+++ b/src/main/java/io/lettuce/core/cluster/RoundRobin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java b/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
index 039a148a3f..bcf624224c 100644
--- a/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
+++ b/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.SocketAddressResolver;
-
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
diff --git a/src/main/java/io/lettuce/core/cluster/SlotHash.java b/src/main/java/io/lettuce/core/cluster/SlotHash.java
index 8d80b1c26f..5350c2dd02 100644
--- a/src/main/java/io/lettuce/core/cluster/SlotHash.java
+++ b/src/main/java/io/lettuce/core/cluster/SlotHash.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
index 6eb7a341c2..c1b7196369 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
index cc1dd0480b..2def1ef8f9 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java b/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
index f773da4d3d..9339997ebc 100644
--- a/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java
index 3aafab5316..969fc7e73e 100644
--- a/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java b/src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java
index c556edb749..8278efa9c7 100644
--- a/src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java
+++ b/src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java b/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
index 8a760f5d3e..94834aef05 100644
--- a/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
+++ b/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java b/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
index 942f8804dd..b61b4275d4 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java b/src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java
index f65f5a4714..1f7f6cb188 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
index 60ce7836d0..5f0e2002cd 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java
index 1fc4d2e815..a24cda3419 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java
index 4893ffdeed..8dc6dea3f8 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java
index 4b08735426..d38e75673a 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
index 452655df90..59d49c80a0 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
index 2085ca4342..d72687626d 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java
index 4f0e04a710..388649bcdd 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
index 6d1abf2fd7..4d82060d17 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
index a89650822e..334c0d48ba 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java
index 5aa225e87f..b55d997f25 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
index 9170a8cb66..9ae7d08b46 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java
index f592160533..08524cf5c0 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,14 +17,11 @@
 
 import java.util.List;
 import java.util.Map;
-import io.lettuce.core.output.KeyValueStreamingChannel;
-import io.lettuce.core.output.ValueStreamingChannel;
+
 import io.lettuce.core.BitFieldArgs;
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.SetArgs;
-import io.lettuce.core.Value;
-import io.lettuce.core.RedisFuture;
-import reactor.core.publisher.Mono;
+import io.lettuce.core.output.KeyValueStreamingChannel;
 
 /**
  * Asynchronous executed commands on a node selection for Strings.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
index 5730fcbfa7..76cec87532 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
index 22a37ad034..b2cb494487 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java b/src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java
index e4c4080b3c..5cab71a9b1 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,8 @@
 
 import java.util.Collection;
 
-import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
-
 import reactor.core.publisher.Flux;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
  * Execution holder for a reactive command to be executed on multiple nodes.
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
index 1c760eba7c..196f17a8ed 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
index 4cdcd66826..6a8052c085 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
index bf4bf606e8..cce156cea5 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/Executions.java b/src/main/java/io/lettuce/core/cluster/api/sync/Executions.java
index d13a85dd73..b83595513e 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/Executions.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/Executions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java
index d78c1b767d..7962b7da21 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java
index 3c3e95f193..8926614f56 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java
index b4f45c4fa9..ca6e494cb0 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java
index b7ff92766d..088b164d55 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
index 67f9e8c3bb..ca19f8e014 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
index 07e44f5c46..4367fcb0e1 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java
index 40587e53b5..9b1ab466ca 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
index fc6455d6e7..ee724985d3 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
index 6627248182..7f3cc699d6 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java
index f903ce13ef..353c55c87b 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
index 84d305d927..14f0ee8f4d 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java
index d1611df66e..9901308131 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,11 @@
 
 import java.util.List;
 import java.util.Map;
-import io.lettuce.core.output.KeyValueStreamingChannel;
-import io.lettuce.core.output.ValueStreamingChannel;
+
 import io.lettuce.core.BitFieldArgs;
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.SetArgs;
-import io.lettuce.core.Value;
-import reactor.core.publisher.Mono;
+import io.lettuce.core.output.KeyValueStreamingChannel;
 
 /**
  * Synchronous executed commands on a node selection for Strings.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
index c3caf6d765..39d5b9c64d 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
index 66433feb2b..9e127ba55d 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java b/src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java
index 7b9eabd145..dd4ae78fb4 100644
--- a/src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java
+++ b/src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java b/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
index cbe853b9f2..4af2934a97 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
index 41e5a03720..62a28d661c 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
index 6c670b0fa4..dc78f2eda7 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java
index d55070aad4..a58471ef8a 100644
--- a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java
+++ b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
index 6bb63b2276..ff13ffce31 100644
--- a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
+++ b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java
index d7918989bd..65f412cd65 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java
index e46f13a161..1279230e6d 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
index c2c1ae5dcc..632aaaf107 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
index 7da4b188cc..f91b7ade31 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
index f183b4b98d..1a1cf2808b 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
index 898635bf5a..d9268922c6 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
index 196272241f..9585c8ae81 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
index 4d9323f7bb..a691d6db58 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
index e09ed28101..31889d8099 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
index 73e6c2bcf4..2c4d3e39e9 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java
index f7d00ede1d..fcce658b86 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
index e3145f62e0..1096e02cf5 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java b/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
index df058f429d..fe3fb96412 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/Connections.java b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
index d77bed5566..eb58ed6385 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Connections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java
index 6720a65e11..2261e8053e 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
index bbaf6a8855..48a7d69ca3 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
index af686b0d0d..1d42675c46 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  */
 package io.lettuce.core.cluster.topology;
 
+import java.util.*;
+
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
-import java.util.*;
-
 /**
  * @author Mark Paluch
  */
diff --git a/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java b/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java
index f43f4a60cd..8debf6a75f 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java b/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
index 8a6070d530..103240ec40 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/Requests.java b/src/main/java/io/lettuce/core/cluster/topology/Requests.java
index 2104402d4f..0adcdb1768 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Requests.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Requests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java b/src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java
index 206af6ecae..3705dab24f 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.protocol.RedisCommand;
-
 import io.netty.buffer.ByteBuf;
 
 /**
diff --git a/src/main/java/io/lettuce/core/codec/Base16.java b/src/main/java/io/lettuce/core/codec/Base16.java
index 2647ae11ee..0d4c2adbab 100644
--- a/src/main/java/io/lettuce/core/codec/Base16.java
+++ b/src/main/java/io/lettuce/core/codec/Base16.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java b/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
index aa0caf64b0..cb9cd96e2f 100644
--- a/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
+++ b/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java b/src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java
index 610a03ca8f..148dda4263 100644
--- a/src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java
+++ b/src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/codec/CRC16.java b/src/main/java/io/lettuce/core/codec/CRC16.java
index cff4ca4869..af1fddbf72 100644
--- a/src/main/java/io/lettuce/core/codec/CRC16.java
+++ b/src/main/java/io/lettuce/core/codec/CRC16.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/codec/CompressionCodec.java b/src/main/java/io/lettuce/core/codec/CompressionCodec.java
index 70e5ce6f18..f1fafbe515 100644
--- a/src/main/java/io/lettuce/core/codec/CompressionCodec.java
+++ b/src/main/java/io/lettuce/core/codec/CompressionCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/codec/RedisCodec.java b/src/main/java/io/lettuce/core/codec/RedisCodec.java
index 6e0a53849c..63075c3d06 100644
--- a/src/main/java/io/lettuce/core/codec/RedisCodec.java
+++ b/src/main/java/io/lettuce/core/codec/RedisCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/codec/StringCodec.java b/src/main/java/io/lettuce/core/codec/StringCodec.java
index 36d415159a..6047465989 100644
--- a/src/main/java/io/lettuce/core/codec/StringCodec.java
+++ b/src/main/java/io/lettuce/core/codec/StringCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.LettuceCharsets;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
diff --git a/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java b/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java
index dc83de065f..66c9cecbc3 100644
--- a/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java
+++ b/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java b/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
index 5c128c005c..0dc719a418 100644
--- a/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
+++ b/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
index 396716091b..9ee557bdf7 100644
--- a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java
index b28f0d7a5f..2694ccbeea 100644
--- a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
index 67532673b6..dcef5b0c88 100644
--- a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java
index 3f931a35a5..239643b3b2 100644
--- a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/BatchTasks.java b/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
index cb555f4f58..d1ef6cc91e 100644
--- a/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/Batcher.java b/src/main/java/io/lettuce/core/dynamic/Batcher.java
index 1c162c46f3..f39bd27cd9 100644
--- a/src/main/java/io/lettuce/core/dynamic/Batcher.java
+++ b/src/main/java/io/lettuce/core/dynamic/Batcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java
index 9370d8ad4c..3ee7566e85 100644
--- a/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java
+++ b/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java b/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java
index b3bf56a221..e0620e7180 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandFactory.java b/src/main/java/io/lettuce/core/dynamic/CommandFactory.java
index 1b71f8c176..9cd92bf00a 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java
index 52c2380055..942a2d71ec 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandMethod.java b/src/main/java/io/lettuce/core/dynamic/CommandMethod.java
index c16c0b2092..970d09c32e 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandMethod.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java b/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java
index 7c8eccbfb6..9e5e0ab4bc 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java b/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java
index f7ae87870a..55adbd4ea7 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java
index 49831a5807..8de65ead23 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/Commands.java b/src/main/java/io/lettuce/core/dynamic/Commands.java
index ae4cc0f6e0..66d8ace9e5 100644
--- a/src/main/java/io/lettuce/core/dynamic/Commands.java
+++ b/src/main/java/io/lettuce/core/dynamic/Commands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ConversionService.java b/src/main/java/io/lettuce/core/dynamic/ConversionService.java
index a168d830a9..6c3aa5e6b3 100644
--- a/src/main/java/io/lettuce/core/dynamic/ConversionService.java
+++ b/src/main/java/io/lettuce/core/dynamic/ConversionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java b/src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java
index 68e770243d..6fb7598a14 100644
--- a/src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java b/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java
index 9ca880f50a..7540f73f3c 100644
--- a/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java
+++ b/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java b/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java
index 87f85317ba..dbce90457c 100644
--- a/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java
+++ b/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
index e1ac4de759..1dec92f915 100644
--- a/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
+++ b/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java b/src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java
index 1c7dbd6eb0..6ede38549a 100644
--- a/src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java
+++ b/src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java
index 113053941e..12cfd2e2e9 100644
--- a/src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java
index 2c01704907..f0a65a269f 100644
--- a/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java
index 9f1236801b..8e0cb67420 100644
--- a/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java
+++ b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java b/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
index e3c867155f..817720228a 100644
--- a/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
+++ b/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java
index 74551ae5f5..1def7e6a4a 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java
index c537447512..cceaad9870 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java
index adfed751db..3e4d57897f 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java b/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java
index 4901dda767..a9222de3d4 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,10 +26,8 @@
 import rx.RxReactiveStreams;
 import rx.Single;
 import rx.internal.reactivestreams.PublisherAdapter;
-
 import io.lettuce.core.dynamic.ReactiveTypes.ReactiveLibrary;
 import io.lettuce.core.internal.LettuceAssert;
-
 import io.reactivex.BackpressureStrategy;
 import io.reactivex.Flowable;
 import io.reactivex.Maybe;
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java b/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java
index ac7d86727e..6313c2b723 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,14 +21,13 @@
 
 import org.reactivestreams.Publisher;
 
-import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.internal.LettuceClassUtils;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import rx.Completable;
 import rx.Observable;
 import rx.Single;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceClassUtils;
 
 /**
  * Utility class to expose details about reactive wrapper types. This class exposes whether a reactive wrapper is supported in
diff --git a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
index 55e681e9ef..acf351717b 100644
--- a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java
index 930ec4c524..b70deb82c2 100644
--- a/src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java
+++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java b/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java
index 4ba97b21f9..0537ae442e 100644
--- a/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java
+++ b/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/annotation/Command.java b/src/main/java/io/lettuce/core/dynamic/annotation/Command.java
index 40fbe85fad..95ce825acb 100644
--- a/src/main/java/io/lettuce/core/dynamic/annotation/Command.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/Command.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java b/src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java
index d8dd220ef0..3a3663d5ba 100644
--- a/src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/annotation/Key.java b/src/main/java/io/lettuce/core/dynamic/annotation/Key.java
index a3a4de69ab..a7fbe074fc 100644
--- a/src/main/java/io/lettuce/core/dynamic/annotation/Key.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/Key.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/annotation/Param.java b/src/main/java/io/lettuce/core/dynamic/annotation/Param.java
index 62f01958ca..f58692e9bf 100644
--- a/src/main/java/io/lettuce/core/dynamic/annotation/Param.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/Param.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/annotation/Value.java b/src/main/java/io/lettuce/core/dynamic/annotation/Value.java
index 6842b3e920..10d47f59e3 100644
--- a/src/main/java/io/lettuce/core/dynamic/annotation/Value.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/Value.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java b/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java
index 5564d55eb3..a35862ff87 100644
--- a/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java b/src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java
index 85ccf988bb..deb8a55def 100644
--- a/src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java b/src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java
index 0139051983..1929565a04 100644
--- a/src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java b/src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java
index 60a02d39ef..0d9c2731b4 100644
--- a/src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
index 0167445962..6c841d8356 100644
--- a/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java b/src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java
index a54e698112..36952183bc 100644
--- a/src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java b/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java
index 88bf60af08..e15363dce6 100644
--- a/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java
+++ b/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvokingInterceptor.java b/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvokingInterceptor.java
index 6f86273aea..d90b2aa3fd 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvokingInterceptor.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvokingInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
index 64e740c452..485d50e633 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/InvocationTargetProvider.java b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationTargetProvider.java
index dd64d6ec31..6887f5f642 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/InvocationTargetProvider.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationTargetProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java
index 858142c628..36c4b0e62e 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java
index b5c6faf7af..47cbd511f7 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java
index 0cbf2d1cea..7c007a9b0c 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java
index 19900f0c10..ac6818dc5f 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java
index e53bc85103..159d199b2e 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java
index 704dc159cc..002427b1e3 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java
index 9d092403cb..04df1d7838 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
index 37d8bd179f..ebd08751cc 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
index 772f3a65ca..60e5f23b70 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java b/src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java
index cc7bd550f4..86abf4bdec 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/OutputType.java b/src/main/java/io/lettuce/core/dynamic/output/OutputType.java
index 445d59acf7..d18e95a823 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/OutputType.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java b/src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java
index 2112a42120..71d740dbb5 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java b/src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java
index fcccd62b94..3d5e5bd5f2 100644
--- a/src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/parameter/MethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/parameter/MethodParametersAccessor.java
index fc9514321b..edbb4f5e31 100644
--- a/src/main/java/io/lettuce/core/dynamic/parameter/MethodParametersAccessor.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/MethodParametersAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java b/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java
index ab7945b4ea..b886368cb1 100644
--- a/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 import io.lettuce.core.dynamic.support.*;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceClassUtils;
-
 import io.netty.util.internal.ConcurrentSet;
 
 /**
diff --git a/src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java b/src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java
index a849e8c008..4ffc99dcc8 100644
--- a/src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java b/src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java
index 912f61de6e..6fef7d3ac1 100644
--- a/src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@
 import java.util.regex.Pattern;
 
 import io.lettuce.core.LettuceStrings;
+import io.lettuce.core.dynamic.CommandMethod;
 import io.lettuce.core.dynamic.annotation.Command;
 import io.lettuce.core.dynamic.annotation.CommandNaming;
 import io.lettuce.core.dynamic.annotation.CommandNaming.LetterCase;
 import io.lettuce.core.dynamic.annotation.CommandNaming.Strategy;
-import io.lettuce.core.dynamic.CommandMethod;
 import io.lettuce.core.internal.LettuceAssert;
 
 /**
diff --git a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java
index 44f73d2143..a4ad85e9df 100644
--- a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java
index 8058adcf3b..a2a45dcf12 100644
--- a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
index 2dad3198c5..cd00e9b30d 100644
--- a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java
index 589584792c..1bad9dbb89 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java
index 95cf3cbde7..d6490f1485 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java
index 34e27a37ff..815be28a80 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java
index b6ceca5856..876ad42b57 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java b/src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java
index 4e95a9dc0e..19cf256166 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java b/src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java
index c634bca384..505bda0686 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java
index 41f6721c41..eeecab99d2 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java
index a59f3ecd4f..18c71b0caf 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java
index 75d1a42911..817475e450 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java b/src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java
index a06e718387..b2aa73aed5 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java b/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java
index 83e57ed727..ed0efe93b7 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java
index f72e4c9027..fa1e4d9ce5 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java
index 1815c9b8d0..575859e520 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java
index 9345daef7f..eeb9d84fd6 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java
index a3b1e4cf68..8ae64109f0 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java b/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java
index 29ea0ba463..06e7a41abf 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java
index a641f42f25..397bde3288 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/DefaultEventBus.java b/src/main/java/io/lettuce/core/event/DefaultEventBus.java
index 09d7e39315..7fdb900be9 100644
--- a/src/main/java/io/lettuce/core/event/DefaultEventBus.java
+++ b/src/main/java/io/lettuce/core/event/DefaultEventBus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java b/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java
index 2354196468..9fb799c5f3 100644
--- a/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java
+++ b/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/Event.java b/src/main/java/io/lettuce/core/event/Event.java
index 1a79a478a9..3e6af319ad 100644
--- a/src/main/java/io/lettuce/core/event/Event.java
+++ b/src/main/java/io/lettuce/core/event/Event.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/EventBus.java b/src/main/java/io/lettuce/core/event/EventBus.java
index 309dbd8710..f43c33fb67 100644
--- a/src/main/java/io/lettuce/core/event/EventBus.java
+++ b/src/main/java/io/lettuce/core/event/EventBus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/EventPublisherOptions.java b/src/main/java/io/lettuce/core/event/EventPublisherOptions.java
index 858957f260..5c29979508 100644
--- a/src/main/java/io/lettuce/core/event/EventPublisherOptions.java
+++ b/src/main/java/io/lettuce/core/event/EventPublisherOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java
index d127c2b83b..a489bb4305 100644
--- a/src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java
index 6a45e2dbb9..413f97198e 100644
--- a/src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java
index 51620f4b53..19c463be5c 100644
--- a/src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java
index a32e3d280b..c863b0358b 100644
--- a/src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java b/src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java
index a3a8e528c2..99cfd1410c 100644
--- a/src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java b/src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java
index cf14b0d196..60b144cac7 100644
--- a/src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java b/src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java
index fdc4c169de..092df5733b 100644
--- a/src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java
+++ b/src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java b/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
index c068a178fd..20b083398e 100644
--- a/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
+++ b/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java b/src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java
index 5d017f855f..44eb49bfd2 100644
--- a/src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java
+++ b/src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java b/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
index 90132dc58f..bebad6844e 100644
--- a/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/AsyncCloseable.java b/src/main/java/io/lettuce/core/internal/AsyncCloseable.java
index 2debaf8053..746d404511 100644
--- a/src/main/java/io/lettuce/core/internal/AsyncCloseable.java
+++ b/src/main/java/io/lettuce/core/internal/AsyncCloseable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java b/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
index 94d6eae0db..ebf2256c29 100644
--- a/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/DefaultMethods.java b/src/main/java/io/lettuce/core/internal/DefaultMethods.java
index 0b68841a64..1b4b3ed694 100644
--- a/src/main/java/io/lettuce/core/internal/DefaultMethods.java
+++ b/src/main/java/io/lettuce/core/internal/DefaultMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/Futures.java b/src/main/java/io/lettuce/core/internal/Futures.java
index a8a58fa6f0..7154d1830a 100644
--- a/src/main/java/io/lettuce/core/internal/Futures.java
+++ b/src/main/java/io/lettuce/core/internal/Futures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 /**
  * Utility methods for {@link java.util.concurrent.Future} handling. This class is part of the internal API and may change
  * without further notice.
- * 
+ *
  * @author Mark Paluch
  * @since 5.1
  */
@@ -34,7 +34,7 @@ private Futures() {
 
     /**
      * Create a {@link CompletableFuture} that is completed exceptionally with {@code throwable}.
-     * 
+     *
      * @param throwable must not be {@literal null}.
      * @return the exceptionally completed {@link CompletableFuture}.
      */
@@ -50,7 +50,7 @@ public static <T> CompletableFuture<T> failed(Throwable throwable) {
 
     /**
      * Adapt Netty's {@link ChannelFuture} emitting a {@link Void} result.
-     * 
+     *
      * @param future the {@link ChannelFuture} to adapt.
      * @return the {@link CompletableFuture}.
      */
@@ -66,7 +66,7 @@ public static CompletableFuture<Void> from(ChannelFuture future) {
 
     /**
      * Adapt Netty's {@link ChannelFuture} emitting a {@link Void} result into a {@link CompletableFuture}.
-     * 
+     *
      * @param future
      * @return the {@link CompletableFuture}.
      */
diff --git a/src/main/java/io/lettuce/core/internal/HostAndPort.java b/src/main/java/io/lettuce/core/internal/HostAndPort.java
index da2af0fe30..0b3519ba74 100644
--- a/src/main/java/io/lettuce/core/internal/HostAndPort.java
+++ b/src/main/java/io/lettuce/core/internal/HostAndPort.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/LettuceAssert.java b/src/main/java/io/lettuce/core/internal/LettuceAssert.java
index ab1a770d49..0519ee8832 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceAssert.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceAssert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  */
 package io.lettuce.core.internal;
 
-import io.lettuce.core.LettuceStrings;
-
 import java.util.Collection;
 
+import io.lettuce.core.LettuceStrings;
+
 /**
  * Assertion utility class that assists in validating arguments. This class is part of the internal API and may change without
  * further notice.
diff --git a/src/main/java/io/lettuce/core/internal/LettuceClassUtils.java b/src/main/java/io/lettuce/core/internal/LettuceClassUtils.java
index 6535aecbfe..7e725a7c85 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceClassUtils.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceClassUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/LettuceFactories.java b/src/main/java/io/lettuce/core/internal/LettuceFactories.java
index e537294f6d..8824bc6c27 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceFactories.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceFactories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/LettuceLists.java b/src/main/java/io/lettuce/core/internal/LettuceLists.java
index d4c519897d..5be065ba17 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceLists.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceLists.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/LettuceSets.java b/src/main/java/io/lettuce/core/internal/LettuceSets.java
index 4e0a5c6a8e..879c70693e 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceSets.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceSets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/TimeoutProvider.java b/src/main/java/io/lettuce/core/internal/TimeoutProvider.java
index 69c8a53a73..480d46c868 100644
--- a/src/main/java/io/lettuce/core/internal/TimeoutProvider.java
+++ b/src/main/java/io/lettuce/core/internal/TimeoutProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java b/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
index a63ccdbf29..228facf33d 100644
--- a/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
+++ b/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java b/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
index 0d417bf34e..01e0b2ab87 100644
--- a/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
+++ b/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java b/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
index 1f8814c6aa..5613de9b56 100644
--- a/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
+++ b/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/Connections.java b/src/main/java/io/lettuce/core/masterslave/Connections.java
index b7fa3296cd..6a5b68843c 100644
--- a/src/main/java/io/lettuce/core/masterslave/Connections.java
+++ b/src/main/java/io/lettuce/core/masterslave/Connections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/Exceptions.java b/src/main/java/io/lettuce/core/masterslave/Exceptions.java
index 07b79471d6..0646920ee6 100644
--- a/src/main/java/io/lettuce/core/masterslave/Exceptions.java
+++ b/src/main/java/io/lettuce/core/masterslave/Exceptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index 054a1ed7b8..888c7d93fd 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
index 3dec85120c..3058f76fbd 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
index c78ce47348..ec08954ab5 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java
index 985dc4e5f3..6c3c9d83f3 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
index 571d926954..3b082be691 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
index a67804a3e5..dc6181c1ca 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java b/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
index 5fc71bf2b7..65ca7762ce 100644
--- a/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
index 0684e163d2..e97a7314bd 100644
--- a/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
+++ b/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java b/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java
index fb15432471..95ff362da3 100644
--- a/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java b/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
index a1fbb329f5..1a95f2964f 100644
--- a/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
+++ b/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/Requests.java b/src/main/java/io/lettuce/core/masterslave/Requests.java
index 4d07cbb11c..63e48f2af3 100644
--- a/src/main/java/io/lettuce/core/masterslave/Requests.java
+++ b/src/main/java/io/lettuce/core/masterslave/Requests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java b/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
index 1abfa87b9b..d66823a52d 100644
--- a/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
+++ b/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java b/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
index 77b88b2a2f..9001a55de6 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
index d3ba124b45..0a50bd8d67 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
index c4fdcb915f..f08aacc36a 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java
index f55cbfc55e..e64b0cd771 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
index d24210f115..ebde88eef6 100644
--- a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
+++ b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
index 1cec2e7703..762f52d1bb 100644
--- a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java
index ea281e9f8b..d26abd1e4c 100644
--- a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java
+++ b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
index 13afedc353..e0478af006 100644
--- a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java b/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java
index 7b638cf087..669ae7cd05 100644
--- a/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java
+++ b/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.protocol.RedisCommand;
-
 import io.netty.buffer.ByteBuf;
 
 /**
diff --git a/src/main/java/io/lettuce/core/masterslave/Timeout.java b/src/main/java/io/lettuce/core/masterslave/Timeout.java
index 7c990c3173..082cabe901 100644
--- a/src/main/java/io/lettuce/core/masterslave/Timeout.java
+++ b/src/main/java/io/lettuce/core/masterslave/Timeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
index bf97bb9c65..7cc7b27e7b 100644
--- a/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java
index 0a67e0b3ba..d601e8340e 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
index 415f73ce0c..908e19a4f6 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
index 06fe5edfcb..5ab03ade39 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/metrics/CommandMetrics.java b/src/main/java/io/lettuce/core/metrics/CommandMetrics.java
index 48979be2a7..9ee2b3f661 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandMetrics.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
index fd58450f1a..5f1774431d 100644
--- a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java
index c565f03207..c73fbf9c58 100644
--- a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java
+++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/metrics/MetricCollector.java b/src/main/java/io/lettuce/core/metrics/MetricCollector.java
index b5617cbd03..eb9cb50c9e 100644
--- a/src/main/java/io/lettuce/core/metrics/MetricCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/MetricCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/command/CommandDetail.java b/src/main/java/io/lettuce/core/models/command/CommandDetail.java
index 147882da0c..ad1bae21f2 100644
--- a/src/main/java/io/lettuce/core/models/command/CommandDetail.java
+++ b/src/main/java/io/lettuce/core/models/command/CommandDetail.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java b/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
index f403ce616a..39b8d41211 100644
--- a/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
+++ b/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/role/RedisInstance.java b/src/main/java/io/lettuce/core/models/role/RedisInstance.java
index 5e4fdbf698..ac03cd573f 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java b/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java
index 5bdf8934a1..6ecde30baf 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java b/src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java
index fcf1e7b2ac..e2452d7f36 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java b/src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java
index 872b7a16f1..e191618480 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java b/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java
index 030d7dc7e4..ef26b6db37 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/role/ReplicationPartner.java b/src/main/java/io/lettuce/core/models/role/ReplicationPartner.java
index 764a867668..0d32ad826f 100644
--- a/src/main/java/io/lettuce/core/models/role/ReplicationPartner.java
+++ b/src/main/java/io/lettuce/core/models/role/ReplicationPartner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/role/RoleParser.java b/src/main/java/io/lettuce/core/models/role/RoleParser.java
index 1d51f6d75a..7a8a8cc7c2 100644
--- a/src/main/java/io/lettuce/core/models/role/RoleParser.java
+++ b/src/main/java/io/lettuce/core/models/role/RoleParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ArrayOutput.java b/src/main/java/io/lettuce/core/output/ArrayOutput.java
index 88fa1faa01..6d9c3e8459 100644
--- a/src/main/java/io/lettuce/core/output/ArrayOutput.java
+++ b/src/main/java/io/lettuce/core/output/ArrayOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/BooleanListOutput.java b/src/main/java/io/lettuce/core/output/BooleanListOutput.java
index 7938b1059f..0eb422961e 100644
--- a/src/main/java/io/lettuce/core/output/BooleanListOutput.java
+++ b/src/main/java/io/lettuce/core/output/BooleanListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/BooleanOutput.java b/src/main/java/io/lettuce/core/output/BooleanOutput.java
index 91a8695a76..61b62de696 100644
--- a/src/main/java/io/lettuce/core/output/BooleanOutput.java
+++ b/src/main/java/io/lettuce/core/output/BooleanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ByteArrayOutput.java b/src/main/java/io/lettuce/core/output/ByteArrayOutput.java
index ab30226d0a..0f3a4f5c30 100644
--- a/src/main/java/io/lettuce/core/output/ByteArrayOutput.java
+++ b/src/main/java/io/lettuce/core/output/ByteArrayOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/CommandOutput.java b/src/main/java/io/lettuce/core/output/CommandOutput.java
index e16bb35674..3265a04565 100644
--- a/src/main/java/io/lettuce/core/output/CommandOutput.java
+++ b/src/main/java/io/lettuce/core/output/CommandOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/DateOutput.java b/src/main/java/io/lettuce/core/output/DateOutput.java
index b279fc4074..1a2ca218ae 100644
--- a/src/main/java/io/lettuce/core/output/DateOutput.java
+++ b/src/main/java/io/lettuce/core/output/DateOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java b/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java
index 4f087c8f0d..f9d6e52a50 100644
--- a/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java
+++ b/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/DoubleOutput.java b/src/main/java/io/lettuce/core/output/DoubleOutput.java
index 4f48c5ee91..f022b2efe4 100644
--- a/src/main/java/io/lettuce/core/output/DoubleOutput.java
+++ b/src/main/java/io/lettuce/core/output/DoubleOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
index d575ea1cf8..8ed8ad3985 100644
--- a/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
index 07dbc68007..dab9293e4c 100644
--- a/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java b/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
index 7c5b23e6eb..1d469fd69f 100644
--- a/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/IntegerOutput.java b/src/main/java/io/lettuce/core/output/IntegerOutput.java
index e584232651..4892a7dc99 100644
--- a/src/main/java/io/lettuce/core/output/IntegerOutput.java
+++ b/src/main/java/io/lettuce/core/output/IntegerOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyListOutput.java b/src/main/java/io/lettuce/core/output/KeyListOutput.java
index f10ca8d4f3..9bd05ffda2 100644
--- a/src/main/java/io/lettuce/core/output/KeyListOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyOutput.java b/src/main/java/io/lettuce/core/output/KeyOutput.java
index d5848642e4..cb45114f31 100644
--- a/src/main/java/io/lettuce/core/output/KeyOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyScanOutput.java b/src/main/java/io/lettuce/core/output/KeyScanOutput.java
index 288528d048..59b37c1bbc 100644
--- a/src/main/java/io/lettuce/core/output/KeyScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyScanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java
index 072203a7f8..bcae5611bf 100644
--- a/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyStreamingChannel.java b/src/main/java/io/lettuce/core/output/KeyStreamingChannel.java
index 893d709622..a3e9bc07f4 100644
--- a/src/main/java/io/lettuce/core/output/KeyStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/KeyStreamingChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java
index 6c1b281265..b6fbf05206 100644
--- a/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyValueListOutput.java b/src/main/java/io/lettuce/core/output/KeyValueListOutput.java
index 68649a593e..4207520da4 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyValueOutput.java b/src/main/java/io/lettuce/core/output/KeyValueOutput.java
index 79b626794e..72f3965079 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,11 @@
  */
 package io.lettuce.core.output;
 
+import java.nio.ByteBuffer;
+
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.codec.RedisCodec;
 
-import java.nio.ByteBuffer;
-
 /**
  * Key-value pair output.
  *
diff --git a/src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java
index bef7f75bc5..946c2dc1d2 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java
index 10ebcc9888..e293446be7 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java
index d292835aad..a261f40dac 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java b/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java
index a9bd27cedc..58c46cab65 100644
--- a/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java
+++ b/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ListSubscriber.java b/src/main/java/io/lettuce/core/output/ListSubscriber.java
index 5a128a5ff0..dd9ba689a5 100644
--- a/src/main/java/io/lettuce/core/output/ListSubscriber.java
+++ b/src/main/java/io/lettuce/core/output/ListSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/MapOutput.java b/src/main/java/io/lettuce/core/output/MapOutput.java
index a171b3cead..230c90a592 100644
--- a/src/main/java/io/lettuce/core/output/MapOutput.java
+++ b/src/main/java/io/lettuce/core/output/MapOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/MapScanOutput.java b/src/main/java/io/lettuce/core/output/MapScanOutput.java
index ea68847efa..263cfb1219 100644
--- a/src/main/java/io/lettuce/core/output/MapScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/MapScanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/MultiOutput.java b/src/main/java/io/lettuce/core/output/MultiOutput.java
index 2ef7404596..e6f38bf64e 100644
--- a/src/main/java/io/lettuce/core/output/MultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/MultiOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/NestedMultiOutput.java b/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
index 630e52f5f4..cc77640882 100644
--- a/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/OutputFactory.java b/src/main/java/io/lettuce/core/output/OutputFactory.java
index b135e4d739..70fe2ad017 100644
--- a/src/main/java/io/lettuce/core/output/OutputFactory.java
+++ b/src/main/java/io/lettuce/core/output/OutputFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ScanOutput.java b/src/main/java/io/lettuce/core/output/ScanOutput.java
index d1a6c05f8f..eaf5d8d1a7 100644
--- a/src/main/java/io/lettuce/core/output/ScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
index 45de974260..4e79bf4140 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
index 2ee0d9ae5f..d512f22ad0 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
index 020acfb862..8dff0801b9 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java
index 5b71a8b0e9..be7e4ee825 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
index 6ddbc74bc8..eb80b241c9 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/SocketAddressOutput.java b/src/main/java/io/lettuce/core/output/SocketAddressOutput.java
index ea8f5aa4ca..b6be26166f 100644
--- a/src/main/java/io/lettuce/core/output/SocketAddressOutput.java
+++ b/src/main/java/io/lettuce/core/output/SocketAddressOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 
 /**
  * Output capturing a hostname and port (both string elements) into a {@link SocketAddress}.
- * 
+ *
  * @author Mark Paluch
  * @since 5.0.1
  */
diff --git a/src/main/java/io/lettuce/core/output/StatusOutput.java b/src/main/java/io/lettuce/core/output/StatusOutput.java
index 593e476678..cac81dbdd0 100644
--- a/src/main/java/io/lettuce/core/output/StatusOutput.java
+++ b/src/main/java/io/lettuce/core/output/StatusOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/StreamingChannel.java b/src/main/java/io/lettuce/core/output/StreamingChannel.java
index 7b5e19fc29..17f8f02338 100644
--- a/src/main/java/io/lettuce/core/output/StreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/StreamingChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/StreamingOutput.java b/src/main/java/io/lettuce/core/output/StreamingOutput.java
index 880463fa3b..ad15c83b59 100644
--- a/src/main/java/io/lettuce/core/output/StreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/StreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/StringListOutput.java b/src/main/java/io/lettuce/core/output/StringListOutput.java
index 40c47fcfa0..d0073924e7 100644
--- a/src/main/java/io/lettuce/core/output/StringListOutput.java
+++ b/src/main/java/io/lettuce/core/output/StringListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/StringValueListOutput.java b/src/main/java/io/lettuce/core/output/StringValueListOutput.java
index 0a355bbf1e..015f112c5c 100644
--- a/src/main/java/io/lettuce/core/output/StringValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/StringValueListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ValueListOutput.java b/src/main/java/io/lettuce/core/output/ValueListOutput.java
index dee1d6d615..9d511ba75a 100644
--- a/src/main/java/io/lettuce/core/output/ValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ValueOutput.java b/src/main/java/io/lettuce/core/output/ValueOutput.java
index a2eb069bc1..ed38a3a551 100644
--- a/src/main/java/io/lettuce/core/output/ValueOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ValueScanOutput.java b/src/main/java/io/lettuce/core/output/ValueScanOutput.java
index ee397e6794..b1bf2783e3 100644
--- a/src/main/java/io/lettuce/core/output/ValueScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueScanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java
index 9a068258e5..4388c91393 100644
--- a/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ValueSetOutput.java b/src/main/java/io/lettuce/core/output/ValueSetOutput.java
index 035272323d..327b04186b 100644
--- a/src/main/java/io/lettuce/core/output/ValueSetOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueSetOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java
index 53e5b363a2..629126719a 100644
--- a/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java
index 91d48d35e0..a149e2892b 100644
--- a/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ValueValueListOutput.java b/src/main/java/io/lettuce/core/output/ValueValueListOutput.java
index 1d667f6f59..1863ada71f 100644
--- a/src/main/java/io/lettuce/core/output/ValueValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueValueListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
index 00db6a0376..0721577c53 100644
--- a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java b/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java
index 025fcae28b..2e9d420f95 100644
--- a/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java b/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java
index 26e03c7155..bdcdd81bdd 100644
--- a/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java
+++ b/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/Command.java b/src/main/java/io/lettuce/core/protocol/Command.java
index 56f8a3dfcf..37de0909f5 100644
--- a/src/main/java/io/lettuce/core/protocol/Command.java
+++ b/src/main/java/io/lettuce/core/protocol/Command.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgs.java b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
index b98e006867..f2bf1c6748 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandArgs.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java b/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
index 5c6fc4c3c1..b23ca995fc 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandEncoder.java b/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
index 402571748f..2dbbc6dc2e 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java b/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
index be68194baa..e4b3db5941 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index fec2ab017b..592d2b69b2 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
index 54ac8ff952..0dd4eabe89 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandType.java b/src/main/java/io/lettuce/core/protocol/CommandType.java
index c164f16e94..e7f9c3500d 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandType.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
index 5a34e0a7d1..3bd2e67f14 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java b/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
index f537e06625..3f1a660fe6 100644
--- a/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionFacade.java b/src/main/java/io/lettuce/core/protocol/ConnectionFacade.java
index bcead7d168..3b81763a5f 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionFacade.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/DecoratedCommand.java b/src/main/java/io/lettuce/core/protocol/DecoratedCommand.java
index 18235f3b0b..3597588050 100644
--- a/src/main/java/io/lettuce/core/protocol/DecoratedCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/DecoratedCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index c5513927fe..b6eb426be2 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/DemandAware.java b/src/main/java/io/lettuce/core/protocol/DemandAware.java
index d2e617b65c..280e1d8e7c 100644
--- a/src/main/java/io/lettuce/core/protocol/DemandAware.java
+++ b/src/main/java/io/lettuce/core/protocol/DemandAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/Endpoint.java b/src/main/java/io/lettuce/core/protocol/Endpoint.java
index b043776edb..1afc3f5ece 100644
--- a/src/main/java/io/lettuce/core/protocol/Endpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/Endpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java b/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java
index 2c3a537455..328b108ef4 100644
--- a/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java
+++ b/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package io.lettuce.core.protocol;
 
 import java.util.Collection;
-import java.util.Queue;
 
 /**
  * Interface to be implemented by classes that queue commands. Implementors of this class need to expose their queue to control
diff --git a/src/main/java/io/lettuce/core/protocol/LatencyMeteredCommand.java b/src/main/java/io/lettuce/core/protocol/LatencyMeteredCommand.java
index 35c8b390ba..6241e78b7b 100644
--- a/src/main/java/io/lettuce/core/protocol/LatencyMeteredCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/LatencyMeteredCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java b/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java
index 18ac4ea616..4a5d78eb34 100644
--- a/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java
+++ b/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/PristineFallbackCommand.java b/src/main/java/io/lettuce/core/protocol/PristineFallbackCommand.java
index bc14398484..3ac08d4e50 100644
--- a/src/main/java/io/lettuce/core/protocol/PristineFallbackCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/PristineFallbackCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 /**
  * Generic fallback command to collect arbitrary Redis responses in a {@link List} represented as String. Used as buffer when
  * received a Redis response without a command to correlate.
- * 
+ *
  * @author Mark Paluch
  * @since 4.5
  */
diff --git a/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java b/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java
index b2bd9d1700..0c5daf31e8 100644
--- a/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java
+++ b/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
index 17cc0bfdc3..23cbda59c6 100644
--- a/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java b/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java
index b8a9fec58a..9bc367a320 100644
--- a/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java
+++ b/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/RedisCommand.java b/src/main/java/io/lettuce/core/protocol/RedisCommand.java
index 780022724a..a9c6d5bb00 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index 5cd68362db..280f868151 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/SharedLock.java b/src/main/java/io/lettuce/core/protocol/SharedLock.java
index 522806724c..d1d75abcf1 100644
--- a/src/main/java/io/lettuce/core/protocol/SharedLock.java
+++ b/src/main/java/io/lettuce/core/protocol/SharedLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java b/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java
index b54d687eff..685214eeeb 100644
--- a/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/WithLatency.java b/src/main/java/io/lettuce/core/protocol/WithLatency.java
index f3c2f086d8..018fcd903b 100644
--- a/src/main/java/io/lettuce/core/protocol/WithLatency.java
+++ b/src/main/java/io/lettuce/core/protocol/WithLatency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java
index 243cfdf931..35ef3eb520 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java
index 3a98d5b5e0..030ff02b22 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
index b9f315db0d..0b2197a467 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
index e93fed80c2..3c041e114b 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java b/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
index 5679b8c98b..9baeb3e44f 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java
index 8c5f618e93..85d35e3a4b 100644
--- a/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java
index e38e9ab601..380c5be1f9 100644
--- a/src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java
index fdb829ef9e..1b77634bdb 100644
--- a/src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
index 1fcd6f38a8..d63fbbf4e1 100644
--- a/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.FluxSink;
 import reactor.core.publisher.Mono;
-
 import io.lettuce.core.RedisReactiveCommandsImpl;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.pubsub.api.reactive.ChannelMessage;
diff --git a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java
index b559a00a8f..7ce86e9739 100644
--- a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java
+++ b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
index 8b0c57598d..fd9d0d1b12 100644
--- a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java
index c2b9dcb32e..52a68fad9e 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.api.async.RedisAsyncCommands;
-import io.lettuce.core.pubsub.RedisPubSubListener;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 
 /**
diff --git a/src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java
index 6213fc3e6b..b4f3b82957 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java
index a8b21bca17..a1155f7bbf 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java
index 88bdf60836..b1262b97d1 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,11 @@
  */
 package io.lettuce.core.pubsub.api.reactive;
 
-import io.lettuce.core.api.reactive.RedisReactiveCommands;
-import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.FluxSink;
 import reactor.core.publisher.Mono;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 
 /**
  * Asynchronous and thread-safe Redis PubSub API.
diff --git a/src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java b/src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java
index bfe016db6b..5519e5bd2c 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/ClientResources.java b/src/main/java/io/lettuce/core/resource/ClientResources.java
index e13eac1034..d781e61c9e 100644
--- a/src/main/java/io/lettuce/core/resource/ClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/ClientResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import io.lettuce.core.event.EventBus;
 import io.lettuce.core.event.EventPublisherOptions;
 import io.lettuce.core.metrics.CommandLatencyCollector;
-
 import io.netty.util.Timer;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.Future;
diff --git a/src/main/java/io/lettuce/core/resource/ConstantDelay.java b/src/main/java/io/lettuce/core/resource/ConstantDelay.java
index cf0bd1124f..f9142ccb28 100644
--- a/src/main/java/io/lettuce/core/resource/ConstantDelay.java
+++ b/src/main/java/io/lettuce/core/resource/ConstantDelay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java b/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java
index 53492c729e..46bc88b4a3 100644
--- a/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java
+++ b/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index 7e9616f22c..f8eb73d62c 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
index 13c0ea17e5..12f3d416a8 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 
 import io.lettuce.core.EpollProvider;
 import io.lettuce.core.KqueueProvider;
-
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.concurrent.*;
diff --git a/src/main/java/io/lettuce/core/resource/DefaultNettyCustomizer.java b/src/main/java/io/lettuce/core/resource/DefaultNettyCustomizer.java
index fa965e92d8..2bcce0b9fb 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultNettyCustomizer.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultNettyCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/Delay.java b/src/main/java/io/lettuce/core/resource/Delay.java
index d93bc7af06..239310c4a6 100644
--- a/src/main/java/io/lettuce/core/resource/Delay.java
+++ b/src/main/java/io/lettuce/core/resource/Delay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java b/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java
index 1a56dddc94..c20007fbd7 100644
--- a/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java
+++ b/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/DnsResolver.java b/src/main/java/io/lettuce/core/resource/DnsResolver.java
index 790779131e..83dbcde453 100644
--- a/src/main/java/io/lettuce/core/resource/DnsResolver.java
+++ b/src/main/java/io/lettuce/core/resource/DnsResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/DnsResolvers.java b/src/main/java/io/lettuce/core/resource/DnsResolvers.java
index 53ecde04b8..da8f37c498 100644
--- a/src/main/java/io/lettuce/core/resource/DnsResolvers.java
+++ b/src/main/java/io/lettuce/core/resource/DnsResolvers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java b/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java
index e7e3fc63a8..c62c6e5ab2 100644
--- a/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java
+++ b/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java
index 14109b3d15..772bc17f88 100644
--- a/src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java
+++ b/src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/ExponentialDelay.java b/src/main/java/io/lettuce/core/resource/ExponentialDelay.java
index 8a45b1e7eb..ecfa995384 100644
--- a/src/main/java/io/lettuce/core/resource/ExponentialDelay.java
+++ b/src/main/java/io/lettuce/core/resource/ExponentialDelay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/FullJitterDelay.java b/src/main/java/io/lettuce/core/resource/FullJitterDelay.java
index 4acc00b1d6..2e40c988b6 100644
--- a/src/main/java/io/lettuce/core/resource/FullJitterDelay.java
+++ b/src/main/java/io/lettuce/core/resource/FullJitterDelay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/Futures.java b/src/main/java/io/lettuce/core/resource/Futures.java
index 653d3f1990..c123fd69ce 100644
--- a/src/main/java/io/lettuce/core/resource/Futures.java
+++ b/src/main/java/io/lettuce/core/resource/Futures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/NettyCustomizer.java b/src/main/java/io/lettuce/core/resource/NettyCustomizer.java
index 2bdf77e91d..efc8ec7876 100644
--- a/src/main/java/io/lettuce/core/resource/NettyCustomizer.java
+++ b/src/main/java/io/lettuce/core/resource/NettyCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java b/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
index 9afc4a0020..83ee07b861 100644
--- a/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
+++ b/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
index 01a913434f..a59b02bebe 100644
--- a/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
index 21b29ceea3..687fa0130c 100644
--- a/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java b/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java
index 013c77c788..ad3d44f7f5 100644
--- a/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
index 1629023fba..991504f316 100644
--- a/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java b/src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java
index e5640bb473..f7adc71dfe 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java b/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
index f05767df25..022274be77 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,10 @@
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
+
 import io.lettuce.core.KillArgs;
-import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 import io.lettuce.core.RedisFuture;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 
 /**
  * Asynchronous executed commands for Redis Sentinel.
diff --git a/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java b/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
index 1b0c55df10..671d3a7b5e 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
 package io.lettuce.core.sentinel.api.reactive;
 
 import java.net.SocketAddress;
-import java.util.List;
 import java.util.Map;
-import io.lettuce.core.KillArgs;
-import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import io.lettuce.core.KillArgs;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 
 /**
  * Reactive executed commands for Redis Sentinel.
diff --git a/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java b/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
index 5d392a7239..8b124e8e87 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
+
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 
diff --git a/src/main/java/io/lettuce/core/support/AbstractCdiBean.java b/src/main/java/io/lettuce/core/support/AbstractCdiBean.java
index a54e406bdd..be8cbf14da 100644
--- a/src/main/java/io/lettuce/core/support/AbstractCdiBean.java
+++ b/src/main/java/io/lettuce/core/support/AbstractCdiBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java
index 5a44ce523a..38001f09af 100644
--- a/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java
+++ b/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/AsyncObjectFactory.java b/src/main/java/io/lettuce/core/support/AsyncObjectFactory.java
index 0535341af8..92ea5ca979 100644
--- a/src/main/java/io/lettuce/core/support/AsyncObjectFactory.java
+++ b/src/main/java/io/lettuce/core/support/AsyncObjectFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/AsyncPool.java b/src/main/java/io/lettuce/core/support/AsyncPool.java
index b83c07fb0c..53f88e3ce6 100644
--- a/src/main/java/io/lettuce/core/support/AsyncPool.java
+++ b/src/main/java/io/lettuce/core/support/AsyncPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/BasePool.java b/src/main/java/io/lettuce/core/support/BasePool.java
index 38c4ce81c3..4caf0f7be8 100644
--- a/src/main/java/io/lettuce/core/support/BasePool.java
+++ b/src/main/java/io/lettuce/core/support/BasePool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/BasePoolConfig.java b/src/main/java/io/lettuce/core/support/BasePoolConfig.java
index 3f945e4e5a..8cb4b09c32 100644
--- a/src/main/java/io/lettuce/core/support/BasePoolConfig.java
+++ b/src/main/java/io/lettuce/core/support/BasePoolConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java b/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java
index aeb0f51a42..4de5a4101a 100644
--- a/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java
+++ b/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java b/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java
index b5ba270c9a..3d6380e0b8 100644
--- a/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java
+++ b/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java b/src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java
index 1e6d27ec1f..7ee47e7eb8 100644
--- a/src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java
+++ b/src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java b/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
index 93bfbc2823..5c8fe97c68 100644
--- a/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
+++ b/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
index d6107e6fe6..5a1d6fc7c2 100644
--- a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
+++ b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/ConnectionWrapping.java b/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
index f5254050c5..25a924598c 100644
--- a/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
+++ b/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java b/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
index 1a9f43d338..641037df65 100644
--- a/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
+++ b/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java b/src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java
index 755cfd9fc6..33f8027172 100644
--- a/src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java
+++ b/src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/RedisClientCdiBean.java b/src/main/java/io/lettuce/core/support/RedisClientCdiBean.java
index 922e7c2def..6a527e3efb 100644
--- a/src/main/java/io/lettuce/core/support/RedisClientCdiBean.java
+++ b/src/main/java/io/lettuce/core/support/RedisClientCdiBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java b/src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java
index 46cf7c7787..3ec66d0933 100644
--- a/src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java
+++ b/src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java b/src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java
index 3b1f53e613..561616d1a0 100644
--- a/src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java
+++ b/src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java b/src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java
index bbb198086d..6094ef1f89 100644
--- a/src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java
+++ b/src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java b/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java
index 6a9930bd35..54fb464766 100644
--- a/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java
+++ b/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisGeoCommands.java b/src/main/templates/io/lettuce/core/api/RedisGeoCommands.java
index 3d19bc918e..9bb9a3c01e 100644
--- a/src/main/templates/io/lettuce/core/api/RedisGeoCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisGeoCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisHLLCommands.java b/src/main/templates/io/lettuce/core/api/RedisHLLCommands.java
index 826075116a..524445667c 100644
--- a/src/main/templates/io/lettuce/core/api/RedisHLLCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisHLLCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisHashCommands.java b/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
index a01241eb98..cf07708dc2 100644
--- a/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java b/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
index b7a4803d7a..0283f32f83 100644
--- a/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisListCommands.java b/src/main/templates/io/lettuce/core/api/RedisListCommands.java
index 8c0cd58d6c..bc5ef97e0b 100644
--- a/src/main/templates/io/lettuce/core/api/RedisListCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisListCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java b/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java
index afd4cd9658..5ce81231ed 100644
--- a/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java b/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java
index da845eaeb1..e1d467d679 100644
--- a/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
index f4520d3fce..d530b5603f 100644
--- a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisSetCommands.java b/src/main/templates/io/lettuce/core/api/RedisSetCommands.java
index 193d5f2142..2d2fd1c1af 100644
--- a/src/main/templates/io/lettuce/core/api/RedisSetCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java b/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
index 0256d83d48..f35a5c82d7 100644
--- a/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisStringCommands.java b/src/main/templates/io/lettuce/core/api/RedisStringCommands.java
index 76c04da110..ff4c833e47 100644
--- a/src/main/templates/io/lettuce/core/api/RedisStringCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisStringCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java b/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java
index c7fc8acf59..9f9c3b4e3f 100644
--- a/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
index cc2ed18b63..abe3238f3a 100644
--- a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
+++ b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
index 0f66827ec5..68825efc5f 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
index 1207a049cc..97ea3ae9a9 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
index 7289d174a0..e0d90b9928 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/CanConnect.java b/src/test/java/io/lettuce/CanConnect.java
index cbc2d8addd..ded1a28093 100644
--- a/src/test/java/io/lettuce/CanConnect.java
+++ b/src/test/java/io/lettuce/CanConnect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/ConnectionTestUtil.java b/src/test/java/io/lettuce/ConnectionTestUtil.java
index 4b9e465b60..1e593e1b70 100644
--- a/src/test/java/io/lettuce/ConnectionTestUtil.java
+++ b/src/test/java/io/lettuce/ConnectionTestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/Delay.java b/src/test/java/io/lettuce/Delay.java
index 7f0a84523c..ab7c445608 100644
--- a/src/test/java/io/lettuce/Delay.java
+++ b/src/test/java/io/lettuce/Delay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/Futures.java b/src/test/java/io/lettuce/Futures.java
index f60a9aa329..d38428fe14 100644
--- a/src/test/java/io/lettuce/Futures.java
+++ b/src/test/java/io/lettuce/Futures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/KeysAndValues.java b/src/test/java/io/lettuce/KeysAndValues.java
index 4dadc9598b..e9f80aac6d 100644
--- a/src/test/java/io/lettuce/KeysAndValues.java
+++ b/src/test/java/io/lettuce/KeysAndValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/LenientClusterDownRule.java b/src/test/java/io/lettuce/LenientClusterDownRule.java
index dd97b2125c..cb8aed3dfa 100644
--- a/src/test/java/io/lettuce/LenientClusterDownRule.java
+++ b/src/test/java/io/lettuce/LenientClusterDownRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/LoggingTestRule.java b/src/test/java/io/lettuce/LoggingTestRule.java
index eabb0320ed..910c67c760 100644
--- a/src/test/java/io/lettuce/LoggingTestRule.java
+++ b/src/test/java/io/lettuce/LoggingTestRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/Sockets.java b/src/test/java/io/lettuce/Sockets.java
index 5d538f7606..fb04851d7d 100644
--- a/src/test/java/io/lettuce/Sockets.java
+++ b/src/test/java/io/lettuce/Sockets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/SslTest.java b/src/test/java/io/lettuce/SslTest.java
index 258d037fb9..2f2e3ba5db 100644
--- a/src/test/java/io/lettuce/SslTest.java
+++ b/src/test/java/io/lettuce/SslTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/TestClientResources.java b/src/test/java/io/lettuce/TestClientResources.java
index 7f37f8c3ae..bab1c71807 100644
--- a/src/test/java/io/lettuce/TestClientResources.java
+++ b/src/test/java/io/lettuce/TestClientResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/Wait.java b/src/test/java/io/lettuce/Wait.java
index 2933c7d9bd..de8aa8ff9f 100644
--- a/src/test/java/io/lettuce/Wait.java
+++ b/src/test/java/io/lettuce/Wait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java b/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
index 8c7460bcc5..0838251ac1 100644
--- a/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
+++ b/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/apigenerator/Constants.java b/src/test/java/io/lettuce/apigenerator/Constants.java
index 9c01e624ad..d12648b03f 100644
--- a/src/test/java/io/lettuce/apigenerator/Constants.java
+++ b/src/test/java/io/lettuce/apigenerator/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
index 24cbf927b9..87c24ab132 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
index e55ce7b2df..f0af967b67 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
index 269e1820f7..3bc6dcfa4b 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
index 3b84a1bde0..0795f9b4a5 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
index 041a947be5..40b4b36f4d 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java b/src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java
index 158bd79ba1..1e8ccdf731 100644
--- a/src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java
+++ b/src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/category/SlowTests.java b/src/test/java/io/lettuce/category/SlowTests.java
index 7b173ad8f5..5bed2ef88d 100644
--- a/src/test/java/io/lettuce/category/SlowTests.java
+++ b/src/test/java/io/lettuce/category/SlowTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/codec/CRC16Test.java b/src/test/java/io/lettuce/codec/CRC16Test.java
index e0338dec1b..6f2d5067bb 100644
--- a/src/test/java/io/lettuce/codec/CRC16Test.java
+++ b/src/test/java/io/lettuce/codec/CRC16Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/AbstractRedisClientTest.java b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
index 58ed1ad910..f658ab8645 100644
--- a/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
+++ b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,11 @@
  */
 package io.lettuce.core;
 
-import io.lettuce.TestClientResources;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 
+import io.lettuce.TestClientResources;
 import io.lettuce.core.api.sync.RedisCommands;
 
 /**
diff --git a/src/test/java/io/lettuce/core/AbstractTest.java b/src/test/java/io/lettuce/core/AbstractTest.java
index bc2055d929..7de8eeea05 100644
--- a/src/test/java/io/lettuce/core/AbstractTest.java
+++ b/src/test/java/io/lettuce/core/AbstractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/AllTheAPIsTest.java b/src/test/java/io/lettuce/core/AllTheAPIsTest.java
index 1c103c7431..6453a832c5 100644
--- a/src/test/java/io/lettuce/core/AllTheAPIsTest.java
+++ b/src/test/java/io/lettuce/core/AllTheAPIsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  */
 package io.lettuce.core;
 
-import io.lettuce.TestClientResources;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import io.lettuce.TestClientResources;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.async.AsyncNodeSelection;
diff --git a/src/test/java/io/lettuce/core/AsyncConnectionTest.java b/src/test/java/io/lettuce/core/AsyncConnectionTest.java
index 3ce0bdbfc1..da9e5f7bcb 100644
--- a/src/test/java/io/lettuce/core/AsyncConnectionTest.java
+++ b/src/test/java/io/lettuce/core/AsyncConnectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ClientMetricsTest.java b/src/test/java/io/lettuce/core/ClientMetricsTest.java
index 93774e2d98..f8b92aa700 100644
--- a/src/test/java/io/lettuce/core/ClientMetricsTest.java
+++ b/src/test/java/io/lettuce/core/ClientMetricsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ClientOptionsTest.java b/src/test/java/io/lettuce/core/ClientOptionsTest.java
index 52c5603129..6548d4a8b3 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsTest.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandTest.java b/src/test/java/io/lettuce/core/ConnectionCommandTest.java
index 6825bcd175..f1169baf0e 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandTest.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
 
 import org.junit.FixMethodOrder;
 import org.junit.Test;
diff --git a/src/test/java/io/lettuce/core/CustomCodecTest.java b/src/test/java/io/lettuce/core/CustomCodecTest.java
index 674b9a9626..50e19b6d90 100644
--- a/src/test/java/io/lettuce/core/CustomCodecTest.java
+++ b/src/test/java/io/lettuce/core/CustomCodecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 import org.junit.Test;
 
 import reactor.test.StepVerifier;
-
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.ByteArrayCodec;
diff --git a/src/test/java/io/lettuce/core/DefaultRedisClient.java b/src/test/java/io/lettuce/core/DefaultRedisClient.java
index e2ad0a3b0e..3102426051 100644
--- a/src/test/java/io/lettuce/core/DefaultRedisClient.java
+++ b/src/test/java/io/lettuce/core/DefaultRedisClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/FastShutdown.java b/src/test/java/io/lettuce/core/FastShutdown.java
index 67e6a9cab2..5215f0ad01 100644
--- a/src/test/java/io/lettuce/core/FastShutdown.java
+++ b/src/test/java/io/lettuce/core/FastShutdown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/GeoModelTest.java b/src/test/java/io/lettuce/core/GeoModelTest.java
index 89e3d0a11c..8862ca4b54 100644
--- a/src/test/java/io/lettuce/core/GeoModelTest.java
+++ b/src/test/java/io/lettuce/core/GeoModelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/src/test/java/io/lettuce/core/JavaRuntimeTest.java b/src/test/java/io/lettuce/core/JavaRuntimeTest.java
index 8a6bed4596..0643f4b5c1 100644
--- a/src/test/java/io/lettuce/core/JavaRuntimeTest.java
+++ b/src/test/java/io/lettuce/core/JavaRuntimeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,9 @@
 import static org.hamcrest.CoreMatchers.startsWith;
 import static org.junit.Assume.assumeThat;
 
-import io.lettuce.core.internal.LettuceClassUtils;
 import org.junit.Test;
 
-import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceClassUtils;
 
 public class JavaRuntimeTest {
 
diff --git a/src/test/java/io/lettuce/core/KeyValueStreamingAdapter.java b/src/test/java/io/lettuce/core/KeyValueStreamingAdapter.java
index d9ae72d1f3..f0f73eb011 100644
--- a/src/test/java/io/lettuce/core/KeyValueStreamingAdapter.java
+++ b/src/test/java/io/lettuce/core/KeyValueStreamingAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/KeyValueTest.java b/src/test/java/io/lettuce/core/KeyValueTest.java
index 4e4a3bb978..a0ea08cf91 100644
--- a/src/test/java/io/lettuce/core/KeyValueTest.java
+++ b/src/test/java/io/lettuce/core/KeyValueTest.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/LettuceFuturesTest.java b/src/test/java/io/lettuce/core/LettuceFuturesTest.java
index cb7bd91051..a4d5e8dbe3 100644
--- a/src/test/java/io/lettuce/core/LettuceFuturesTest.java
+++ b/src/test/java/io/lettuce/core/LettuceFuturesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  */
 package io.lettuce.core;
 
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/io/lettuce/core/LimitTest.java b/src/test/java/io/lettuce/core/LimitTest.java
index cbcbf1fc16..8fd0805c1b 100644
--- a/src/test/java/io/lettuce/core/LimitTest.java
+++ b/src/test/java/io/lettuce/core/LimitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ListStreamingAdapter.java b/src/test/java/io/lettuce/core/ListStreamingAdapter.java
index 271dade297..388cb3606c 100644
--- a/src/test/java/io/lettuce/core/ListStreamingAdapter.java
+++ b/src/test/java/io/lettuce/core/ListStreamingAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package io.lettuce.core;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
diff --git a/src/test/java/io/lettuce/core/PipeliningTest.java b/src/test/java/io/lettuce/core/PipeliningTest.java
index 2353ea4139..b2268eea21 100644
--- a/src/test/java/io/lettuce/core/PipeliningTest.java
+++ b/src/test/java/io/lettuce/core/PipeliningTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/PrivateAccessorTest.java b/src/test/java/io/lettuce/core/PrivateAccessorTest.java
index c4ae7f168e..53cb795ea9 100644
--- a/src/test/java/io/lettuce/core/PrivateAccessorTest.java
+++ b/src/test/java/io/lettuce/core/PrivateAccessorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,11 +26,11 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import io.lettuce.core.codec.Base16;
-import io.lettuce.core.codec.CRC16;
 import io.lettuce.core.cluster.SlotHash;
 import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser;
 import io.lettuce.core.cluster.models.slots.ClusterSlotsParser;
+import io.lettuce.core.codec.Base16;
+import io.lettuce.core.codec.CRC16;
 import io.lettuce.core.internal.LettuceLists;
 import io.lettuce.core.models.command.CommandDetailParser;
 import io.lettuce.core.models.role.RoleParser;
diff --git a/src/test/java/io/lettuce/core/ProtectedModeTests.java b/src/test/java/io/lettuce/core/ProtectedModeTests.java
index 416daf7108..a40617a52d 100644
--- a/src/test/java/io/lettuce/core/ProtectedModeTests.java
+++ b/src/test/java/io/lettuce/core/ProtectedModeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/RangeTest.java b/src/test/java/io/lettuce/core/RangeTest.java
index 6b5a2b04e6..dc46f17b5b 100644
--- a/src/test/java/io/lettuce/core/RangeTest.java
+++ b/src/test/java/io/lettuce/core/RangeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
index 7222f8a082..d860ee7a77 100644
--- a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ReactiveConnectionTest.java b/src/test/java/io/lettuce/core/ReactiveConnectionTest.java
index 73d9ff9709..a3d57598d6 100644
--- a/src/test/java/io/lettuce/core/ReactiveConnectionTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveConnectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java b/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java
index c11fc2ac7e..8687f93c5b 100644
--- a/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/RedisClientConnectionTest.java b/src/test/java/io/lettuce/core/RedisClientConnectionTest.java
index 72d2be9415..3a72862add 100644
--- a/src/test/java/io/lettuce/core/RedisClientConnectionTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientConnectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/RedisClientFactoryBeanTest.java b/src/test/java/io/lettuce/core/RedisClientFactoryBeanTest.java
index 9798137eda..a97aa131d6 100644
--- a/src/test/java/io/lettuce/core/RedisClientFactoryBeanTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientFactoryBeanTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.net.URI;
 
 import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 import io.lettuce.core.support.RedisClientFactoryBean;
diff --git a/src/test/java/io/lettuce/core/RedisClientFactoryTest.java b/src/test/java/io/lettuce/core/RedisClientFactoryTest.java
index cfe975988d..375f89933b 100644
--- a/src/test/java/io/lettuce/core/RedisClientFactoryTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
  */
 package io.lettuce.core;
 
-import io.lettuce.TestClientResources;
 import org.junit.Test;
 
+import io.lettuce.TestClientResources;
 import io.lettuce.core.resource.ClientResources;
 
 /**
diff --git a/src/test/java/io/lettuce/core/RedisClientListenerTest.java b/src/test/java/io/lettuce/core/RedisClientListenerTest.java
index 73b4a450ce..f0f6b901bd 100644
--- a/src/test/java/io/lettuce/core/RedisClientListenerTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientListenerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/RedisClientTest.java b/src/test/java/io/lettuce/core/RedisClientTest.java
index 87b6bc5777..0ef5d5b089 100644
--- a/src/test/java/io/lettuce/core/RedisClientTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/RedisURIBuilderTest.java b/src/test/java/io/lettuce/core/RedisURIBuilderTest.java
index 4d421a8d8f..a5da5d5c68 100644
--- a/src/test/java/io/lettuce/core/RedisURIBuilderTest.java
+++ b/src/test/java/io/lettuce/core/RedisURIBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/RedisURITest.java b/src/test/java/io/lettuce/core/RedisURITest.java
index 8f8acb2f39..9a97a14a5e 100644
--- a/src/test/java/io/lettuce/core/RedisURITest.java
+++ b/src/test/java/io/lettuce/core/RedisURITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ScanCursorTest.java b/src/test/java/io/lettuce/core/ScanCursorTest.java
index 9d26918c95..ab021cc08b 100644
--- a/src/test/java/io/lettuce/core/ScanCursorTest.java
+++ b/src/test/java/io/lettuce/core/ScanCursorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ScanIteratorTest.java b/src/test/java/io/lettuce/core/ScanIteratorTest.java
index 7e72610360..e61829907f 100644
--- a/src/test/java/io/lettuce/core/ScanIteratorTest.java
+++ b/src/test/java/io/lettuce/core/ScanIteratorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ScanStreamTest.java b/src/test/java/io/lettuce/core/ScanStreamTest.java
index bc561097c4..14dc54a1d1 100644
--- a/src/test/java/io/lettuce/core/ScanStreamTest.java
+++ b/src/test/java/io/lettuce/core/ScanStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java b/src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java
index 9a5ec567e8..9c03382779 100644
--- a/src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java
+++ b/src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ScoredValueTest.java b/src/test/java/io/lettuce/core/ScoredValueTest.java
index f2d8e5d580..00a2c7a587 100644
--- a/src/test/java/io/lettuce/core/ScoredValueTest.java
+++ b/src/test/java/io/lettuce/core/ScoredValueTest.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/SocketOptionsTest.java b/src/test/java/io/lettuce/core/SocketOptionsTest.java
index c6e2ba8db3..826f384488 100644
--- a/src/test/java/io/lettuce/core/SocketOptionsTest.java
+++ b/src/test/java/io/lettuce/core/SocketOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java b/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java
index 4817a257bf..918b86eb34 100644
--- a/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java
+++ b/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/TestEventLoopGroupProvider.java b/src/test/java/io/lettuce/core/TestEventLoopGroupProvider.java
index 07d1e7becf..8a51245839 100644
--- a/src/test/java/io/lettuce/core/TestEventLoopGroupProvider.java
+++ b/src/test/java/io/lettuce/core/TestEventLoopGroupProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 import java.util.concurrent.TimeUnit;
 
 import io.lettuce.core.resource.DefaultEventLoopGroupProvider;
-
 import io.netty.util.concurrent.DefaultPromise;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.ImmediateEventExecutor;
diff --git a/src/test/java/io/lettuce/core/TestRedisPublisher.java b/src/test/java/io/lettuce/core/TestRedisPublisher.java
index fc7cd67caa..209c16bedb 100644
--- a/src/test/java/io/lettuce/core/TestRedisPublisher.java
+++ b/src/test/java/io/lettuce/core/TestRedisPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/TestSettings.java b/src/test/java/io/lettuce/core/TestSettings.java
index 15359418c7..c55cb30230 100644
--- a/src/test/java/io/lettuce/core/TestSettings.java
+++ b/src/test/java/io/lettuce/core/TestSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/TimeoutOptionsTest.java b/src/test/java/io/lettuce/core/TimeoutOptionsTest.java
index 9b5e6a46e3..a4f1eebe27 100644
--- a/src/test/java/io/lettuce/core/TimeoutOptionsTest.java
+++ b/src/test/java/io/lettuce/core/TimeoutOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/UnixDomainSocketTest.java b/src/test/java/io/lettuce/core/UnixDomainSocketTest.java
index 7e7016642c..f43c0cf89c 100644
--- a/src/test/java/io/lettuce/core/UnixDomainSocketTest.java
+++ b/src/test/java/io/lettuce/core/UnixDomainSocketTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/Utf8StringCodecTest.java b/src/test/java/io/lettuce/core/Utf8StringCodecTest.java
index 896d4d85f3..fe37b0e949 100644
--- a/src/test/java/io/lettuce/core/Utf8StringCodecTest.java
+++ b/src/test/java/io/lettuce/core/Utf8StringCodecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ValueTest.java b/src/test/java/io/lettuce/core/ValueTest.java
index 3a3de5c5a4..e79993ef0d 100644
--- a/src/test/java/io/lettuce/core/ValueTest.java
+++ b/src/test/java/io/lettuce/core/ValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ZStoreArgsTest.java b/src/test/java/io/lettuce/core/ZStoreArgsTest.java
index 092d64e340..0f23fe8c82 100644
--- a/src/test/java/io/lettuce/core/ZStoreArgsTest.java
+++ b/src/test/java/io/lettuce/core/ZStoreArgsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java b/src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java
index 8fbffab13e..8f33c13cf4 100644
--- a/src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
index 9865757a5c..f861b3035f 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
index 134ed19e6e..7d39d8a343 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java
index e213bd3a04..5052ae23e8 100644
--- a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java b/src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java
index 8ec8c53cc9..b4a054ba0f 100644
--- a/src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java
index 4377e6b2de..3e9d94d773 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandInternalsTest.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandInternalsTest.java
index c7251cdbb6..6f8a5e0fa8 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterCommandInternalsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandInternalsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java
index f8f6f6ca6d..a8d1634fa8 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterTest.java b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterTest.java
index 9456b012ce..6c16b5a209 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
index 0cc367b8ff..aea5a922e6 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
index 1529986820..12eb204b53 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java b/src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java
index 9921edf450..f8ffe6c4bc 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandTest.java
index 1753f5d94a..7ab3013125 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 import org.junit.runners.MethodSorters;
 
 import reactor.test.StepVerifier;
-
 import io.lettuce.TestClientResources;
 import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisClient;
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterRule.java b/src/test/java/io/lettuce/core/cluster/ClusterRule.java
index 31be102c4c..051de56e17 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterRule.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterSetup.java b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
index 0ec9c549fb..82b170dd7c 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java b/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java
index b0066b294c..54088f4350 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java
index 3303667660..c98a28a569 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java
index 1729852909..0a1dc18904 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@
 import org.mockito.junit.MockitoJUnitRunner;
 
 import io.lettuce.core.resource.ClientResources;
-
 import io.netty.util.concurrent.EventExecutorGroup;
 
 /**
diff --git a/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusTest.java b/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusTest.java
index a4619fdfdb..2ad68f16b2 100644
--- a/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusTest.java
+++ b/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusTest.java b/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusTest.java
index 626683421c..abaf7f14c8 100644
--- a/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusTest.java
+++ b/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java
index d9f548a933..a2f04e7032 100644
--- a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncTest.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncTest.java
index a8c5118796..44850c09e0 100644
--- a/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncTest.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import io.lettuce.core.internal.LettuceSets;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -37,6 +36,7 @@
 import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.internal.LettuceSets;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java b/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java
index 73455e622d..899ebe5e94 100644
--- a/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java
+++ b/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureTest.java b/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureTest.java
index 5e662ded02..fb980341f2 100644
--- a/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureTest.java
+++ b/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
-
 import java.util.HashMap;
 
+import org.junit.Test;
+
 /**
  * @author Mark Paluch
  */
diff --git a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
index 243459bed1..4044b8819d 100644
--- a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ReadFromTest.java b/src/test/java/io/lettuce/core/cluster/ReadFromTest.java
index d2d31dd172..ff5a0ed8d2 100644
--- a/src/test/java/io/lettuce/core/cluster/ReadFromTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadFromTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java
index 839da9754d..d0fde0f127 100644
--- a/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTest.java
index f604fb693b..9adc089d1d 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
index 76ceb05548..1d3cd2c342 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
index e40497db0d..455f036f57 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromTest.java
index 2bfa8a6f31..ce46e1fbfa 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
index bcdee68aa5..fae68df0ad 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
index c7f3f26f5c..caf16308b6 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilTest.java
index ed500ace79..e0c174acef 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java
index 87f6bf9881..a9b6d51a48 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 import org.junit.runners.MethodSorters;
 
 import reactor.test.StepVerifier;
-
 import io.lettuce.TestClientResources;
 import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisClient;
diff --git a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
index 4abb4b44e2..6dbc272bf0 100644
--- a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ScanIteratorTest.java b/src/test/java/io/lettuce/core/cluster/ScanIteratorTest.java
index b49c806a19..8d078ca123 100644
--- a/src/test/java/io/lettuce/core/cluster/ScanIteratorTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ScanIteratorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ScanStreamTest.java b/src/test/java/io/lettuce/core/cluster/ScanStreamTest.java
index dba1f81aa2..fb12f03b3d 100644
--- a/src/test/java/io/lettuce/core/cluster/ScanStreamTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ScanStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java
index b11c7f3eb2..3f320fecb2 100644
--- a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@
 import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
 import io.lettuce.core.resource.DefaultClientResources;
 import io.lettuce.core.resource.DefaultEventLoopGroupProvider;
-
 import io.netty.util.concurrent.ImmediateEventExecutor;
 
 /**
diff --git a/src/test/java/io/lettuce/core/cluster/SlotHashTest.java b/src/test/java/io/lettuce/core/cluster/SlotHashTest.java
index 275a24122e..4fdd218007 100644
--- a/src/test/java/io/lettuce/core/cluster/SlotHashTest.java
+++ b/src/test/java/io/lettuce/core/cluster/SlotHashTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java
index 38ef141a8b..068fbfa91b 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
index a0600afd9d..7b24f4f46d 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java
index d22c5351e0..f0cd2cc571 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
index 1a865a2369..33936c87e2 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java
index e595331775..56e0564f86 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java
index 38337d2317..b46af1f772 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
index d664371501..ea6ef751bd 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java
index 37f9cffce1..82e8d3a96d 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
index a794b27b13..65a4e5b139 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
index 84bb5ba892..6df9809aa7 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java b/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java
index 74e6ddc204..8deeb3128d 100644
--- a/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java
index 1483f8d20c..e395072cd8 100644
--- a/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java
+++ b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core.cluster.models.partitions;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 
diff --git a/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java
index b9c682b768..43ab839c5d 100644
--- a/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java
+++ b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
index 7ff335a458..d6e1065049 100644
--- a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java
index 8ebcd79d74..4356a1f19d 100644
--- a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java
+++ b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java b/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java
index daf6843093..c4fa57bac4 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/topology/RequestsTest.java b/src/test/java/io/lettuce/core/cluster/topology/RequestsTest.java
index d31bd32f37..50343e7a52 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/RequestsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/RequestsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsTest.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsTest.java
index 4366baafdf..799c35e147 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.util.Lists.newArrayList;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-import io.lettuce.core.RedisURI;
 import org.junit.Test;
 
+import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java
index e137fb079f..04be54e1f9 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/codec/CompressionCodecTest.java b/src/test/java/io/lettuce/core/codec/CompressionCodecTest.java
index 5671ffb9fd..710b8e795d 100644
--- a/src/test/java/io/lettuce/core/codec/CompressionCodecTest.java
+++ b/src/test/java/io/lettuce/core/codec/CompressionCodecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/codec/StringCodecTest.java b/src/test/java/io/lettuce/core/codec/StringCodecTest.java
index 2eafa1180a..d3cbd3228a 100644
--- a/src/test/java/io/lettuce/core/codec/StringCodecTest.java
+++ b/src/test/java/io/lettuce/core/codec/StringCodecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 import org.junit.Test;
 
 import io.lettuce.core.protocol.LettuceCharsets;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
diff --git a/src/test/java/io/lettuce/core/commands/BitCommandTest.java b/src/test/java/io/lettuce/core/commands/BitCommandTest.java
index 0f84316fae..d1779c95df 100644
--- a/src/test/java/io/lettuce/core/commands/BitCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/BitCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/CustomCommandTest.java b/src/test/java/io/lettuce/core/commands/CustomCommandTest.java
index 6fc46c6328..66abc71e51 100644
--- a/src/test/java/io/lettuce/core/commands/CustomCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/CustomCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/GeoCommandTest.java b/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
index 7569f6f61b..7b681e627d 100644
--- a/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/HLLCommandTest.java b/src/test/java/io/lettuce/core/commands/HLLCommandTest.java
index e725e1dcfc..86860d7fea 100644
--- a/src/test/java/io/lettuce/core/commands/HLLCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/HLLCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/HashCommandTest.java b/src/test/java/io/lettuce/core/commands/HashCommandTest.java
index 3d404eb6ed..82e9235531 100644
--- a/src/test/java/io/lettuce/core/commands/HashCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/HashCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/KeyCommandTest.java b/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
index e26e11fdf8..614181c9c7 100644
--- a/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/ListCommandTest.java b/src/test/java/io/lettuce/core/commands/ListCommandTest.java
index cd056a4fed..7257c4a1e1 100644
--- a/src/test/java/io/lettuce/core/commands/ListCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ListCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/NumericCommandTest.java b/src/test/java/io/lettuce/core/commands/NumericCommandTest.java
index 6d99fe5a48..815ebf8048 100644
--- a/src/test/java/io/lettuce/core/commands/NumericCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/NumericCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java b/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java
index 7374edfc67..086d347202 100644
--- a/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java b/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
index a5875ea15b..c7f321c8fa 100644
--- a/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
index 18e449d724..b23a0565fe 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/SetCommandTest.java b/src/test/java/io/lettuce/core/commands/SetCommandTest.java
index a43f60538a..af671ef8ed 100644
--- a/src/test/java/io/lettuce/core/commands/SetCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SetCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/SortCommandTest.java b/src/test/java/io/lettuce/core/commands/SortCommandTest.java
index 93f7301f2f..8b1def2d7b 100644
--- a/src/test/java/io/lettuce/core/commands/SortCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SortCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java b/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
index 0aadbf7b95..6592dbd5e3 100644
--- a/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/StringCommandTest.java b/src/test/java/io/lettuce/core/commands/StringCommandTest.java
index 015c7fc3df..54961adfe3 100644
--- a/src/test/java/io/lettuce/core/commands/StringCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/StringCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java
index 16b366d1e6..f9ce32ae6e 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java
index fea7ab4825..3c67574694 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
index 06ba2868e2..99be92014c 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java
index 582ba6cd5c..1f6008438b 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java
index a9cc514648..a2af5b8cc5 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java
index 7d420062d9..1a463325ac 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java
index 3e342b6d72..c7cdf83a5f 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java
index 363a19bfcc..c2fe7b1b22 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java
index 2e253144f4..1512409b68 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
index c7dbdc41a4..e171182982 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java
index 5097e4051f..033708488a 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java
index 15e2b66b28..9e68b27e3d 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java
index cb391868e6..261272556e 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java
index 4ecba63343..8f081fd169 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
index 5adc098e4e..44fb96533e 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java
index cae3ca7598..1b76bc1040 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
index 6e50531cf0..4f308a4801 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java
index 5294963d7c..fa2436075f 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java
index 77acc48899..f89a5d5e34 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java
index d804a959da..2646366b1f 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java
index 42280ac5dd..4139c1aeb4 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java
index 4ee98ecabe..0fe7e43200 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java
index e491f21282..9ffcb5710b 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java
index e7b596bc62..66cfd39ee1 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java
index fc1c037497..682ad5346b 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java b/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java
index e055d7cdd0..226a420e20 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.util.List;
 
 import io.lettuce.core.TransactionResult;
 import io.lettuce.core.api.StatefulRedisConnection;
diff --git a/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyTest.java b/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyTest.java
index 771628e4c2..effed7a622 100644
--- a/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java
index 08d953fcdb..e8ca790cd7 100644
--- a/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/ConversionServiceTest.java b/src/test/java/io/lettuce/core/dynamic/ConversionServiceTest.java
index ecae52ad96..20be9a3cf6 100644
--- a/src/test/java/io/lettuce/core/dynamic/ConversionServiceTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/ConversionServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodTest.java b/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodTest.java
index 6d639de56c..1906f06f65 100644
--- a/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierTest.java b/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierTest.java
index fc40e07077..2d3b92957c 100644
--- a/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/ParameterBinderTest.java b/src/test/java/io/lettuce/core/dynamic/ParameterBinderTest.java
index bd972776fb..25a3f1d6ff 100644
--- a/src/test/java/io/lettuce/core/dynamic/ParameterBinderTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/ParameterBinderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
index e6303fdf5b..a41bd16827 100644
--- a/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersTest.java b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersTest.java
index c37447113e..0aeabfd5ea 100644
--- a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,15 +17,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.reactivex.Flowable;
 import org.junit.Before;
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.Maybe;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import rx.Single;
+import io.reactivex.Maybe;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionTest.java b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionTest.java
index 2958a43199..f088fa7073 100644
--- a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 
 import rx.Observable;
 import rx.Single;
-
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.dynamic.annotation.Command;
 
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncTest.java
index 6bf30ecbf5..362fc59b6f 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingTest.java
index 92403093c3..0800995500 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
index 61ed3787e2..ae6fdfc60e 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveTest.java
index e245ba9296..80e3ee201f 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
-
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.dynamic.annotation.Command;
 
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java
index 3be4ebd7ea..8f3e5cbd84 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java
index 976aec1693..7e909e7c98 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/SimpleBatcherTest.java b/src/test/java/io/lettuce/core/dynamic/SimpleBatcherTest.java
index 4456773fe8..cf4b8ff5c1 100644
--- a/src/test/java/io/lettuce/core/dynamic/SimpleBatcherTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/SimpleBatcherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverTest.java b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverTest.java
index f744093f39..f782d4bdef 100644
--- a/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersTest.java b/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersTest.java
index d743c7d0a4..143da6053f 100644
--- a/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryTest.java
index b3a3dd249e..871fc77e5d 100644
--- a/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverTest.java b/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverTest.java
index 59628695d3..d555caa29a 100644
--- a/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
index 5e166ba531..59b10852fa 100644
--- a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java
index 0429c490f7..34550543cf 100644
--- a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
index 52a86b0f4a..49a7ad52d5 100644
--- a/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationTest.java b/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationTest.java
index bc921daae8..e1a5d41c34 100644
--- a/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationTest.java b/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationTest.java
index e9eba26346..902c9209e4 100644
--- a/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java
index 333fbe7295..8853cf707d 100644
--- a/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java
+++ b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
-
 import io.lettuce.TestClientResources;
 import io.lettuce.core.AbstractTest;
 import io.lettuce.core.RedisClient;
diff --git a/src/test/java/io/lettuce/core/event/DefaultEventBusTest.java b/src/test/java/io/lettuce/core/event/DefaultEventBusTest.java
index b6e1c133ca..691679afbb 100644
--- a/src/test/java/io/lettuce/core/event/DefaultEventBusTest.java
+++ b/src/test/java/io/lettuce/core/event/DefaultEventBusTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java b/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java
index a5479bee85..e0b2232ee2 100644
--- a/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java
+++ b/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerTest.java b/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerTest.java
index 1a9336f51b..ef81b0b8e7 100644
--- a/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerTest.java
+++ b/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/internal/HostAndPortTest.java b/src/test/java/io/lettuce/core/internal/HostAndPortTest.java
index fa1feb78e3..59f66bb859 100644
--- a/src/test/java/io/lettuce/core/internal/HostAndPortTest.java
+++ b/src/test/java/io/lettuce/core/internal/HostAndPortTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java b/src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java
index eefb893a52..f81e2322ff 100644
--- a/src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java
index 0c463d1db4..21ff082479 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java
index 0ef98d3e01..e9d31756ce 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
index 71ab5eb04f..803ed15bde 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
index d0434cf651..1111c7b23d 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderTest.java
index 239dbf91ed..4455ff4a0c 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshTest.java
index df7cea8b7c..ea8842b543 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsTest.java
index 446174f7eb..5168bd1110 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
index 793844d8e4..d2f7d8a50d 100644
--- a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
index 6c6da43f02..9163575827 100644
--- a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/metrics/CommandLatencyIdTest.java b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdTest.java
index 1864df21ed..4b4e1ab46a 100644
--- a/src/test/java/io/lettuce/core/metrics/CommandLatencyIdTest.java
+++ b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.junit.Test;
+
 import io.lettuce.core.protocol.CommandKeyword;
 import io.netty.channel.local.LocalAddress;
-import org.junit.Test;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java
index 262c79b297..497ff3a4f7 100644
--- a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java
+++ b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java b/src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java
index 1f8675316d..d3ef00a9a9 100644
--- a/src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java
+++ b/src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/models/command/CommandDetailParserTest.java b/src/test/java/io/lettuce/core/models/command/CommandDetailParserTest.java
index 3fab834a02..3aa9d3a0ca 100644
--- a/src/test/java/io/lettuce/core/models/command/CommandDetailParserTest.java
+++ b/src/test/java/io/lettuce/core/models/command/CommandDetailParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/models/role/RoleParserTest.java b/src/test/java/io/lettuce/core/models/role/RoleParserTest.java
index 9e829430b5..5b3655a701 100644
--- a/src/test/java/io/lettuce/core/models/role/RoleParserTest.java
+++ b/src/test/java/io/lettuce/core/models/role/RoleParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import io.lettuce.core.internal.HostAndPort;
 import org.junit.Test;
 
+import io.lettuce.core.internal.HostAndPort;
 import io.lettuce.core.internal.LettuceLists;
 
 public class RoleParserTest {
diff --git a/src/test/java/io/lettuce/core/output/BooleanListOutputTest.java b/src/test/java/io/lettuce/core/output/BooleanListOutputTest.java
index e3f758a705..2aa51258c8 100644
--- a/src/test/java/io/lettuce/core/output/BooleanListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/BooleanListOutputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java
index 2a67d05b8c..0bb23b4dda 100644
--- a/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java
index eda6fec011..37ae8a7669 100644
--- a/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java b/src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java
index 671fb526a0..c49f64a6bb 100644
--- a/src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/ListOutputTest.java b/src/test/java/io/lettuce/core/output/ListOutputTest.java
index ddef92069e..96e2f49ec9 100644
--- a/src/test/java/io/lettuce/core/output/ListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/ListOutputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/NestedMultiOutputTest.java b/src/test/java/io/lettuce/core/output/NestedMultiOutputTest.java
index 6d8e3a7e53..97d79b1308 100644
--- a/src/test/java/io/lettuce/core/output/NestedMultiOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/NestedMultiOutputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java b/src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java
index b1ffe255bb..1391e89468 100644
--- a/src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/SocketAddressOutputTest.java b/src/test/java/io/lettuce/core/output/SocketAddressOutputTest.java
index acd2b3baf7..11a4963701 100644
--- a/src/test/java/io/lettuce/core/output/SocketAddressOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/SocketAddressOutputTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,4 +41,4 @@ public void shouldReportSocketAddress() {
 
         assertThat(output.get()).isNotNull().isInstanceOf(InetSocketAddress.class);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/io/lettuce/core/protocol/AsyncCommandInternalsTest.java b/src/test/java/io/lettuce/core/protocol/AsyncCommandInternalsTest.java
index f2716222e7..e8ada0e7f7 100644
--- a/src/test/java/io/lettuce/core/protocol/AsyncCommandInternalsTest.java
+++ b/src/test/java/io/lettuce/core/protocol/AsyncCommandInternalsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java b/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
index 89af01531a..729b290b07 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
index 7127e22fb0..1d8da5a8e6 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java b/src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java
index 9a3ffb2d1e..24d29ca7b6 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/protocol/CommandWrapperTest.java b/src/test/java/io/lettuce/core/protocol/CommandWrapperTest.java
index 36cde7066b..8d6dd4e9b3 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandWrapperTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandWrapperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
index 3765306ab7..3688e65347 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
index a5041f758e..49946615ec 100644
--- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/protocol/StateMachineTest.java b/src/test/java/io/lettuce/core/protocol/StateMachineTest.java
index 5317601253..7cdae60c82 100644
--- a/src/test/java/io/lettuce/core/protocol/StateMachineTest.java
+++ b/src/test/java/io/lettuce/core/protocol/StateMachineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,6 @@
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.*;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java
index 9c7ad20390..468d2b3b6d 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
index c5b39ad307..856522170f 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
index 062e3d7b34..27a9a3e767 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
index 301f432de3..6f24130073 100644
--- a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
+++ b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
index 6f3e78d940..1235034e40 100644
--- a/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
index 72ee9570ef..19f58d5760 100644
--- a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/ConstantDelayTest.java b/src/test/java/io/lettuce/core/resource/ConstantDelayTest.java
index 14a6205da4..65aca26700 100644
--- a/src/test/java/io/lettuce/core/resource/ConstantDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/ConstantDelayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java b/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java
index 19892884b8..8ce89e21b9 100644
--- a/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java
index 73fec266ff..3e180a78c7 100644
--- a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,13 +26,11 @@
 import org.junit.Test;
 
 import reactor.test.StepVerifier;
-
 import io.lettuce.core.FastShutdown;
 import io.lettuce.core.event.Event;
 import io.lettuce.core.event.EventBus;
 import io.lettuce.core.metrics.CommandLatencyCollector;
 import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
-
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.Timer;
 import io.netty.util.concurrent.EventExecutorGroup;
diff --git a/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderTest.java b/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderTest.java
index 3174119d0c..fd25e81656 100644
--- a/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderTest.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTest.java b/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTest.java
index e79dea6275..33eb52bf21 100644
--- a/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTest.java
+++ b/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java b/src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java
index 67150caed3..e8c6aa6098 100644
--- a/src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java b/src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java
index 215214d2c4..b25b7b5b62 100644
--- a/src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java b/src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java
index 88897adbf3..c6d3105c46 100644
--- a/src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/FuturesTest.java b/src/test/java/io/lettuce/core/resource/FuturesTest.java
index fe04a5d75e..2485b971f7 100644
--- a/src/test/java/io/lettuce/core/resource/FuturesTest.java
+++ b/src/test/java/io/lettuce/core/resource/FuturesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java b/src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java
index 8ed0cc0acd..1c8c781848 100644
--- a/src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
index 97ae13c5ce..d6b8fb0732 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java
index 2b24ecea60..3e7ddbe0cc 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelRule.java b/src/test/java/io/lettuce/core/sentinel/SentinelRule.java
index 1bc56a4a0a..565719deff 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelRule.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java
index b85d4cc7ec..ec5cb3aa53 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
index 0bfe7d12f1..06994835f2 100644
--- a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.lettuce.core.TestSettings;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
 import io.lettuce.core.sentinel.SentinelCommandTest;
 import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
 import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
index f875d7fdca..b5676c583c 100644
--- a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/server/MockTcpServer.java b/src/test/java/io/lettuce/core/server/MockTcpServer.java
index 01c278d7f6..00c918aa4b 100644
--- a/src/test/java/io/lettuce/core/server/MockTcpServer.java
+++ b/src/test/java/io/lettuce/core/server/MockTcpServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/server/RandomResponseServer.java b/src/test/java/io/lettuce/core/server/RandomResponseServer.java
index 4c940f015a..db143b7406 100644
--- a/src/test/java/io/lettuce/core/server/RandomResponseServer.java
+++ b/src/test/java/io/lettuce/core/server/RandomResponseServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/server/RandomServerHandler.java b/src/test/java/io/lettuce/core/server/RandomServerHandler.java
index 6ff473841e..2d44b81ec7 100644
--- a/src/test/java/io/lettuce/core/server/RandomServerHandler.java
+++ b/src/test/java/io/lettuce/core/server/RandomServerHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportTest.java b/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportTest.java
index b5bd3eccc4..318e0e4b08 100644
--- a/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportTest.java
+++ b/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationTest.java b/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationTest.java
index 76cac0e212..f58b592d94 100644
--- a/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationTest.java
+++ b/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/BoundedAsyncPoolTest.java b/src/test/java/io/lettuce/core/support/BoundedAsyncPoolTest.java
index f2c7bfb63c..bc356e3cd6 100644
--- a/src/test/java/io/lettuce/core/support/BoundedAsyncPoolTest.java
+++ b/src/test/java/io/lettuce/core/support/BoundedAsyncPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/CdiTest.java b/src/test/java/io/lettuce/core/support/CdiTest.java
index 5f7501d7ed..d04a71e2b8 100644
--- a/src/test/java/io/lettuce/core/support/CdiTest.java
+++ b/src/test/java/io/lettuce/core/support/CdiTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java
index b06149b35a..d2151bd17b 100644
--- a/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java
+++ b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/InjectedClient.java b/src/test/java/io/lettuce/core/support/InjectedClient.java
index 82102f03e1..e228756a32 100644
--- a/src/test/java/io/lettuce/core/support/InjectedClient.java
+++ b/src/test/java/io/lettuce/core/support/InjectedClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/PersonDB.java b/src/test/java/io/lettuce/core/support/PersonDB.java
index 8b9eb167c8..83da5fb39e 100644
--- a/src/test/java/io/lettuce/core/support/PersonDB.java
+++ b/src/test/java/io/lettuce/core/support/PersonDB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/PubSubTestListener.java b/src/test/java/io/lettuce/core/support/PubSubTestListener.java
index 4fdf75f4e0..2149e7a407 100644
--- a/src/test/java/io/lettuce/core/support/PubSubTestListener.java
+++ b/src/test/java/io/lettuce/core/support/PubSubTestListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java b/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java
index 35e0f4a62f..164435da9a 100644
--- a/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java
+++ b/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/SpringTest.java b/src/test/java/io/lettuce/core/support/SpringTest.java
index 379ddd7373..3c27bdc545 100644
--- a/src/test/java/io/lettuce/core/support/SpringTest.java
+++ b/src/test/java/io/lettuce/core/support/SpringTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core.support;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java b/src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java
index ba7d3936fc..e908209730 100644
--- a/src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java
+++ b/src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
index 645dd5d9f8..cfd0e5eb39 100644
--- a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
+++ b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
index cb78276380..eaaecaeba4 100644
--- a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
+++ b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedis.java b/src/test/java/io/lettuce/examples/ConnectToRedis.java
index 8549f58795..21dd429d0a 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedis.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedis.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java b/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
index 733c75f5c4..26e07e8e34 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java b/src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java
index 84fa931ae7..fd8683944a 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java b/src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java
index 46cee0c6e0..5c0f405eac 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisSSL.java b/src/test/java/io/lettuce/examples/ConnectToRedisSSL.java
index 650cd11168..d346df5701 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisSSL.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisSSL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java b/src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java
index daf6ce6e6c..adef65f194 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/MySpringBean.java b/src/test/java/io/lettuce/examples/MySpringBean.java
index b034c9029e..6924cdc2ef 100644
--- a/src/test/java/io/lettuce/examples/MySpringBean.java
+++ b/src/test/java/io/lettuce/examples/MySpringBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ReadWriteExample.java b/src/test/java/io/lettuce/examples/ReadWriteExample.java
index 6d6b9235b2..a0a3073bdf 100644
--- a/src/test/java/io/lettuce/examples/ReadWriteExample.java
+++ b/src/test/java/io/lettuce/examples/ReadWriteExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/SpringExample.java b/src/test/java/io/lettuce/examples/SpringExample.java
index 283ab59060..63009fa9e1 100644
--- a/src/test/java/io/lettuce/examples/SpringExample.java
+++ b/src/test/java/io/lettuce/examples/SpringExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/util/ConnectionDecoratingInvocationHandler.java b/src/test/java/io/lettuce/util/ConnectionDecoratingInvocationHandler.java
index d9b9dc636a..7dcc6271ee 100644
--- a/src/test/java/io/lettuce/util/ConnectionDecoratingInvocationHandler.java
+++ b/src/test/java/io/lettuce/util/ConnectionDecoratingInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/util/ReactiveSyncInvocationHandler.java b/src/test/java/io/lettuce/util/ReactiveSyncInvocationHandler.java
index 604958706b..abe1d07287 100644
--- a/src/test/java/io/lettuce/util/ReactiveSyncInvocationHandler.java
+++ b/src/test/java/io/lettuce/util/ReactiveSyncInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/util/RoutingInvocationHandler.java b/src/test/java/io/lettuce/util/RoutingInvocationHandler.java
index b0b5a9bd93..e787f6998d 100644
--- a/src/test/java/io/lettuce/util/RoutingInvocationHandler.java
+++ b/src/test/java/io/lettuce/util/RoutingInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java b/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
index 030e208c9a..119d11201d 100644
--- a/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
+++ b/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java b/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
index bc54a90411..3f239108c9 100644
--- a/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
+++ b/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/JmhMain.java b/src/test/jmh/io/lettuce/core/JmhMain.java
index fcf7d4652d..5403638bc6 100644
--- a/src/test/jmh/io/lettuce/core/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/JmhMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package io.lettuce.core;
 
-import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 import org.openjdk.jmh.annotations.Mode;
diff --git a/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
index c96fddbd18..89ba87a1bf 100644
--- a/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
index d1757ede72..dc75d68f7c 100644
--- a/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java b/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java
index f29935888d..d24029d981 100644
--- a/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java
+++ b/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/cluster/JmhMain.java b/src/test/jmh/io/lettuce/core/cluster/JmhMain.java
index 6354e7666d..d2e40f6226 100644
--- a/src/test/jmh/io/lettuce/core/cluster/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/cluster/JmhMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
index 7631e8f6e1..ae192daede 100644
--- a/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java
index 49aabc0144..e8663b2819 100644
--- a/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/codec/JmhMain.java b/src/test/jmh/io/lettuce/core/codec/JmhMain.java
index 9abc0dec8e..05c165d854 100644
--- a/src/test/jmh/io/lettuce/core/codec/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/codec/JmhMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java b/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java
index a4510700bc..d2df982ebe 100644
--- a/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 import org.openjdk.jmh.infra.Blackhole;
 
 import io.lettuce.core.protocol.LettuceCharsets;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
diff --git a/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java b/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java
index 6f98a5b82d..7e6acc2766 100644
--- a/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java
index 94feb9fcc6..2febeaa85c 100644
--- a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
index c653152693..5cc3e458a2 100644
--- a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java
index b6db4a5231..d23dfb9667 100644
--- a/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/output/JmhMain.java b/src/test/jmh/io/lettuce/core/output/JmhMain.java
index 78bcda6b6e..06a09160a6 100644
--- a/src/test/jmh/io/lettuce/core/output/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/output/JmhMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/output/ValueListOutputBenchmark.java b/src/test/jmh/io/lettuce/core/output/ValueListOutputBenchmark.java
index d782dec057..42b430edfa 100644
--- a/src/test/jmh/io/lettuce/core/output/ValueListOutputBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/output/ValueListOutputBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
index 643c58251f..9747616661 100644
--- a/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
index f386dd91d8..337f4d36c5 100644
--- a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java b/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
index 0669b5fe4d..a54baa8f7b 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
index e38c7fd9a2..f03083c2bb 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java b/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
index 4cf66c7ddb..8500feca29 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package io.lettuce.core.protocol;
 
+import java.net.SocketAddress;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.*;
@@ -22,8 +24,6 @@
 import io.netty.util.AttributeKey;
 import io.netty.util.concurrent.EventExecutor;
 
-import java.net.SocketAddress;
-
 /**
  * @author Mark Paluch
  */
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java b/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java
index 7ff2cf1ea3..275a069478 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,15 @@
  */
 package io.lettuce.core.protocol;
 
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
 
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
 /**
  * @author Mark Paluch
  */
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java b/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
index a35fdcd8c2..1e20a06108 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/JmhMain.java b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
index e5cc192d96..4ea86e8342 100644
--- a/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
index fa32f4e3fd..fe6849d722 100644
--- a/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
index fd39c73985..81bed5103c 100644
--- a/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/support/AsyncConnectionPoolBenchmark.java b/src/test/jmh/io/lettuce/core/support/AsyncConnectionPoolBenchmark.java
index d675590d3c..298e2175dc 100644
--- a/src/test/jmh/io/lettuce/core/support/AsyncConnectionPoolBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/support/AsyncConnectionPoolBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/support/GenericConnectionPoolBenchmark.java b/src/test/jmh/io/lettuce/core/support/GenericConnectionPoolBenchmark.java
index c6291130a0..a5c2ed9152 100644
--- a/src/test/jmh/io/lettuce/core/support/GenericConnectionPoolBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/support/GenericConnectionPoolBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/support/JmhMain.java b/src/test/jmh/io/lettuce/core/support/JmhMain.java
index aadd78b301..ef210d6e96 100644
--- a/src/test/jmh/io/lettuce/core/support/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/support/JmhMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 1ac365d25b6b460393bcd885db5e897e9718f3c8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 30 Jan 2018 11:54:24 +0100
Subject: [PATCH 396/808] Recover gracefully on unknown COMMAND command #685

Lettuce now no longer fails if COMMAND is unknown. This can happen if the connected server is not a Redis server but Disque or Tile38. Dynamic command interfaces will disable command spelling verification if COMMAND is unknown.
---
 .../core/RedisCommandExecutionException.java  |  1 -
 .../core/cluster/RedisClusterClient.java      |  8 ++--
 .../core/dynamic/RedisCommandFactory.java     | 23 +++++++----
 .../core/dynamic/RedisCommandsTest.java       | 38 ++++++++++++++++---
 4 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisCommandExecutionException.java b/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
index 702e4ad353..4af14f70cb 100644
--- a/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
@@ -45,7 +45,6 @@ public RedisCommandExecutionException(String msg, Throwable cause) {
     /**
      * Create a {@code RedisCommandExecutionException} with the specified nested exception.
      *
-     * @param msg the detail message.
      * @param cause the nested exception.
      */
     public RedisCommandExecutionException(Throwable cause) {
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 7eade4cb5c..ce2b2c8338 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -604,7 +604,8 @@ private <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectCl
                 .flatMap(c -> c.reactive().command().collectList() //
                         .map(CommandDetailParser::parse) //
                         .doOnNext(detail -> c.setState(new RedisState(detail))) //
-                        .then(Mono.just(c)))
+                                .doOnError(e -> c.setState(new RedisState(Collections.emptyList()))).then(Mono.just(c))
+                                .onErrorResume(RedisCommandExecutionException.class, e -> Mono.just(c)))
                 .doOnNext(
                         c -> connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider))
                 .map(it -> (StatefulRedisClusterConnection<K, V>) it).toFuture();
@@ -675,8 +676,9 @@ private <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> con
         return connectionMono
                 .flatMap(c -> c.reactive().command().collectList() //
                         .map(CommandDetailParser::parse) //
-                        .doOnNext(detail -> c.setState(new RedisState(detail))) //
-                        .then(Mono.just(c)))
+                                .doOnNext(detail -> c.setState(new RedisState(detail)))
+                                .doOnError(e -> c.setState(new RedisState(Collections.emptyList()))).then(Mono.just(c))
+                                .onErrorResume(RedisCommandExecutionException.class, e -> Mono.just(c)))
                 .doOnNext(
                         c -> connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider))
                 .map(it -> (StatefulRedisClusterPubSubConnection<K, V>) it).toFuture();
diff --git a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
index acf351717b..f8da86fa1c 100644
--- a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
@@ -19,6 +19,7 @@
 import java.util.*;
 
 import io.lettuce.core.AbstractRedisReactiveCommands;
+import io.lettuce.core.RedisCommandExecutionException;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
@@ -39,6 +40,8 @@
 import io.lettuce.core.models.command.CommandDetailParser;
 import io.lettuce.core.protocol.LettuceCharsets;
 import io.lettuce.core.protocol.RedisCommand;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
  * Factory to create Redis Command interface instances.
@@ -86,6 +89,7 @@
  */
 public class RedisCommandFactory {
 
+    private final InternalLogger log = InternalLoggerFactory.getInstance(getClass());
     private final StatefulConnection<?, ?> connection;
     private final DefaultCommandMethodVerifier commandMethodVerifier;
     private final List<RedisCodec<?, ?>> redisCodecs = new ArrayList<>();
@@ -117,24 +121,27 @@ public RedisCommandFactory(StatefulConnection<?, ?> connection, Iterable<? exten
 
         this.connection = connection;
         this.redisCodecs.addAll(LettuceLists.newList(redisCodecs));
-
-        commandMethodVerifier = new DefaultCommandMethodVerifier(getCommands(connection));
+        this.commandMethodVerifier = new DefaultCommandMethodVerifier(getCommands(connection));
     }
 
     @SuppressWarnings("unchecked")
     private List<CommandDetail> getCommands(StatefulConnection<?, ?> connection) {
 
         List<Object> commands = Collections.emptyList();
-        if (connection instanceof StatefulRedisConnection) {
-            commands = ((StatefulRedisConnection) connection).sync().command();
-        }
+        try {
+            if (connection instanceof StatefulRedisConnection) {
+                commands = ((StatefulRedisConnection) connection).sync().command();
+            }
 
-        if (connection instanceof StatefulRedisClusterConnection) {
-            commands = ((StatefulRedisClusterConnection) connection).sync().command();
+            if (connection instanceof StatefulRedisClusterConnection) {
+                commands = ((StatefulRedisClusterConnection) connection).sync().command();
+            }
+        } catch (RedisCommandExecutionException e) {
+            log.debug("Cannot obtain command metadata", e);
         }
 
         if (commands.isEmpty()) {
-            verifyCommandMethods = false;
+            setVerifyCommandMethods(false);
         }
 
         return CommandDetailParser.parse(commands);
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java
index 7e909e7c98..943c79c0fa 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java
@@ -17,10 +17,16 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.when;
 
 import org.junit.Test;
+import org.mockito.Mockito;
 
 import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
 
 /**
  * @author Mark Paluch
@@ -28,21 +34,44 @@
 public class RedisCommandsTest extends AbstractRedisClientTest {
 
     @Test
-    public void verifierShouldCatchMisspelledDeclarations() throws Exception {
+    public void verifierShouldCatchMisspelledDeclarations() {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
+        assertThat(factory).hasFieldOrPropertyWithValue("verifyCommandMethods", true);
         try {
             factory.getCommands(WithTypo.class);
             fail("Missing CommandCreationException");
         } catch (CommandCreationException e) {
             assertThat(e).hasMessageContaining("Command GAT does not exist.");
         }
+    }
+
+    @Test
+    public void disabledVerifierDoesNotReportTypo() {
 
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+        factory.setVerifyCommandMethods(false);
+
+        assertThat(factory.getCommands(WithTypo.class)).isNotNull();
     }
 
     @Test
-    public void verifierShouldCatchTooFewParametersDeclarations() throws Exception {
+    public void doesNotFailIfCommandRetrievalFails() {
+
+        StatefulRedisConnection connectionMock = Mockito.mock(StatefulRedisConnection.class);
+        RedisCommands commandsMock = Mockito.mock(RedisCommands.class);
+
+        when(connectionMock.sync()).thenReturn(commandsMock);
+        doThrow(new RedisCommandExecutionException("ERR unknown command 'COMMAND'")).when(commandsMock).command();
+
+        RedisCommandFactory factory = new RedisCommandFactory(connectionMock);
+
+        assertThat(factory).hasFieldOrPropertyWithValue("verifyCommandMethods", false);
+    }
+
+    @Test
+    public void verifierShouldCatchTooFewParametersDeclarations() {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
@@ -52,16 +81,15 @@ public void verifierShouldCatchTooFewParametersDeclarations() throws Exception {
         } catch (CommandCreationException e) {
             assertThat(e).hasMessageContaining("Command GET accepts 1 parameters but method declares 0 parameter");
         }
-
     }
 
-    static interface TooFewParameters extends Commands {
+    interface TooFewParameters extends Commands {
 
         String get();
 
     }
 
-    static interface WithTypo extends Commands {
+    interface WithTypo extends Commands {
 
         String gat(String key);
 

From 7f97ceb43799c64f5b5e0b1f3e64e7357fcde3f5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 30 Jan 2018 12:29:34 +0100
Subject: [PATCH 397/808] Do not requeue commands on unrecoverable errors #680

Commands are canceled now when the attempted write fails with an recoverable error (EncoderException, Errors).
---
 .../core/protocol/DefaultEndpoint.java        |  7 ++++
 .../core/protocol/DefaultEndpointTest.java    | 32 ++++++++++++++++---
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index b6eb426be2..8aa7a6c332 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -32,6 +32,7 @@
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
+import io.netty.handler.codec.EncoderException;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
 import io.netty.util.internal.logging.InternalLogLevel;
@@ -775,6 +776,12 @@ public void operationComplete(Future<Void> future) throws Exception {
             dequeue();
 
             if (!success) {
+
+                if (cause instanceof EncoderException || cause instanceof Error || cause.getCause() instanceof Error) {
+                    complete(cause);
+                    return;
+                }
+
                 Channel channel = DefaultEndpoint.this.channel;
                 if (channel != null) {
                     channel.eventLoop().submit(this::requeueCommands);
diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
index 49946615ec..611ff6852a 100644
--- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
@@ -51,10 +51,11 @@
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.internal.LettuceFactories;
 import io.lettuce.core.output.StatusOutput;
-import io.lettuce.core.resource.ClientResources;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.DefaultChannelPromise;
+import io.netty.handler.codec.EncoderException;
+import io.netty.util.concurrent.ImmediateEventExecutor;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DefaultEndpointTest {
@@ -72,9 +73,6 @@ public class DefaultEndpointTest {
     @Mock
     private ConnectionFacade connectionFacade;
 
-    @Mock
-    private ClientResources clientResources;
-
     @Mock
     private ConnectionWatchdog connectionWatchdog;
 
@@ -205,6 +203,32 @@ public void notifyDrainQueuedCommandsShouldWriteCommands() {
         verify(channel).writeAndFlush(eq(Arrays.asList(command)));
     }
 
+    @Test
+    public void shouldCancelCommandsOnEncoderException() {
+
+        when(channel.isActive()).thenReturn(true);
+        sut.notifyChannelActive(channel);
+
+        DefaultChannelPromise promise = new DefaultChannelPromise(channel, ImmediateEventExecutor.INSTANCE);
+
+        when(channel.writeAndFlush(any())).thenAnswer(invocation -> {
+            if (invocation.getArguments()[0] instanceof RedisCommand) {
+                queue.add((RedisCommand) invocation.getArguments()[0]);
+            }
+
+            if (invocation.getArguments()[0] instanceof Collection) {
+                queue.addAll((Collection) invocation.getArguments()[0]);
+            }
+            return promise;
+        });
+
+        promise.setFailure(new EncoderException("foo"));
+
+        sut.write(command);
+
+        assertThat(command.exception).isInstanceOf(EncoderException.class);
+    }
+
     @Test
     public void writeShouldRejectCommandsInDisconnectedState() {
 

From dca1d48bae5fd11f34ca5be50c4c3a35180bb393 Mon Sep 17 00:00:00 2001
From: Adam McElwee <adam@mcelwee.me>
Date: Wed, 24 Jan 2018 13:51:39 -0600
Subject: [PATCH 398/808] Retain SSL configuration from seed URIs for static
 Master/Slave #684

---
 Makefile                                      |  15 ++
 .../MasterSlaveConnectionProvider.java        |   6 +-
 .../masterslave/RedisMasterSlaveNode.java     |   6 +-
 .../StaticMasterSlaveTopologyProvider.java    |   8 +
 src/test/java/io/lettuce/SslTest.java         | 193 ++++++++++++++++--
 5 files changed, 212 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index be2f04eea2..c7cc41aa3d 100644
--- a/Makefile
+++ b/Makefile
@@ -269,6 +269,21 @@ work/stunnel.conf:
 	@echo cafile=$(ROOT_DIR)/work/ca/certs/ca.cert.pem >> $@
 	@echo verify=2 >> $@
 
+	@echo [stunnel-master-slave-node-1] >> $@
+	@echo accept = 127.0.0.1:8443 >> $@
+	@echo connect = 127.0.0.1:6482 >> $@
+	@echo cert=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
+	@echo key=$(ROOT_DIR)/work/ca/private/localhost.decrypted.key.pem >> $@
+	@echo capath=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
+	@echo cafile=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
+
+	@echo [stunnel-master-slave-node-2] >> $@
+	@echo accept = 127.0.0.1:8444 >> $@
+	@echo connect = 127.0.0.1:6483 >> $@
+	@echo cert=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
+	@echo key=$(ROOT_DIR)/work/ca/private/localhost.decrypted.key.pem >> $@
+	@echo capath=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
+	@echo cafile=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
 
 work/stunnel.pid: work/stunnel.conf ssl-keys
 	which stunnel4 >/dev/null 2>&1 && stunnel4 $(ROOT_DIR)/work/stunnel.conf || stunnel $(ROOT_DIR)/work/stunnel.conf
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
index ec08954ab5..4b8bd72e1f 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
@@ -318,7 +318,11 @@ class DefaultMasterSlaveNodeConnectionFactory implements
         @Override
         public ConnectionFuture<StatefulRedisConnection<K, V>> apply(ConnectionKey key) {
 
-            RedisURI.Builder builder = RedisURI.Builder.redis(key.host, key.port);
+            RedisURI.Builder builder = RedisURI.Builder
+                    .redis(key.host, key.port)
+                    .withSsl(initialRedisUri.isSsl())
+                    .withVerifyPeer(initialRedisUri.isVerifyPeer())
+                    .withStartTls(initialRedisUri.isStartTls());
 
             if (initialRedisUri.getPassword() != null && initialRedisUri.getPassword().length != 0) {
                 builder.withPassword(initialRedisUri.getPassword());
diff --git a/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java b/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
index 1a95f2964f..805827c5a7 100644
--- a/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
+++ b/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
@@ -30,7 +30,11 @@ class RedisMasterSlaveNode implements RedisNodeDescription {
 
     public RedisMasterSlaveNode(String host, int port, RedisURI seed, Role role) {
 
-        RedisURI.Builder builder = RedisURI.Builder.redis(host, port);
+        RedisURI.Builder builder = RedisURI.Builder
+                .redis(host, port)
+                .withSsl(seed.isSsl())
+                .withVerifyPeer(seed.isVerifyPeer())
+                .withStartTls(seed.isStartTls());
         if (seed.getPassword() != null && seed.getPassword().length != 0) {
             builder.withPassword(new String(seed.getPassword()));
         }
diff --git a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
index e0478af006..a7bd4ee69f 100644
--- a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
@@ -20,6 +20,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 
+import io.lettuce.core.RedisConnectionException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import io.lettuce.core.RedisClient;
@@ -77,6 +78,13 @@ public CompletableFuture<List<RedisNodeDescription>> getNodesAsync() {
         Flux<RedisURI> uris = Flux.fromIterable(redisURIs);
         Mono<List<RedisNodeDescription>> nodes = uris.flatMap(uri -> getNodeDescription(connections, uri)) //
                 .collectList() //
+                .flatMap((nodeDescriptions) -> {
+                    if (nodeDescriptions.isEmpty()) {
+                        return Mono.error(new RedisConnectionException(String.format("Failed to connect to any nodes in %s", redisURIs)));
+                    } else {
+                        return Mono.just(nodeDescriptions);
+                    }
+                }) //
                 .doFinally(it -> {
 
                     for (StatefulRedisConnection<String, String> connection : connections) {
diff --git a/src/test/java/io/lettuce/SslTest.java b/src/test/java/io/lettuce/SslTest.java
index 2f2e3ba5db..9dd47fa414 100644
--- a/src/test/java/io/lettuce/SslTest.java
+++ b/src/test/java/io/lettuce/SslTest.java
@@ -22,7 +22,11 @@
 import static org.junit.Assume.assumeTrue;
 
 import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.security.cert.CertificateException;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -36,11 +40,14 @@
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.masterslave.MasterSlave;
 import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
 import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands;
 import io.netty.handler.codec.DecoderException;
 import io.netty.handler.ssl.OpenSsl;
 
+
 /**
  * @author Mark Paluch
  */
@@ -48,28 +55,65 @@ public class SslTest extends AbstractTest {
 
     private static final String KEYSTORE = "work/keystore.jks";
     private static final String TRUSTSTORE = "work/truststore.jks";
-    private static RedisClient redisClient;
+    private static final File TRUSTSTORE_FILE = new File(TRUSTSTORE);
+    private static final int MASTER_SLAVE_BASE_PORT_OFFSET = 2000;
 
-    private static final RedisURI URI_NO_VERIFY = RedisURI.Builder.redis(host(), sslPort()) //
-            .withSsl(true) //
+    private static final RedisURI URI_NO_VERIFY = sslURIBuilder(0) //
             .withVerifyPeer(false) //
             .build();
 
-    private static final RedisURI URI_VERIFY = RedisURI.Builder.redis(host(), sslPort(1)) //
-            .withSsl(true) //
+    private static final RedisURI URI_VERIFY = sslURIBuilder(1) //
             .withVerifyPeer(true) //
             .build();
 
-    private static final RedisURI URI_CLIENT_CERT_AUTH = RedisURI.Builder.redis(host(), sslPort(2)) //
-            .withSsl(true) //
+
+    private static final RedisURI URI_CLIENT_CERT_AUTH = sslURIBuilder(2) //
             .withVerifyPeer(true) //
             .build();
 
+    private static final List<RedisURI> MASTER_SLAVE_URIS_NO_VERIFY = Arrays.asList(
+            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET)
+                    .withVerifyPeer(false)
+                    .build(),
+            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET + 1)
+                    .withVerifyPeer(false)
+                    .build());
+
+
+    private static final List<RedisURI> MASTER_SLAVE_URIS_VERIFY = Arrays.asList(
+            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET)
+                    .withVerifyPeer(true)
+                    .build(),
+            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET + 1)
+                    .withVerifyPeer(true)
+                    .build());
+
+    private static final List<RedisURI> MASTER_SLAVE_URIS_WITH_ONE_INVALID = Arrays.asList(
+            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET)
+                    .withVerifyPeer(true)
+                    .build(),
+            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET + 1)
+                    .withVerifyPeer(true)
+                    .build(),
+            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET + 2)
+                    .withVerifyPeer(true)
+                    .build());
+
+    private static final List<RedisURI> MASTER_SLAVE_URIS_WITH_ALL_INVALID = Arrays.asList(
+            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET + 2)
+                    .withVerifyPeer(true)
+                    .build(),
+            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET + 3)
+                    .withVerifyPeer(true)
+                    .build());
+
+    private static RedisClient redisClient;
+
     @BeforeClass
     public static void beforeClass() {
 
         assumeTrue("Assume that stunnel runs on port 6443", Sockets.isOpen(host(), sslPort()));
-        assertThat(new File(TRUSTSTORE)).exists();
+        assertThat(TRUSTSTORE_FILE).exists();
 
         redisClient = RedisClient.create(TestClientResources.get());
     }
@@ -98,7 +142,7 @@ public void standaloneWithJdkSsl() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(new File(TRUSTSTORE)) //
+                .truststore(TRUSTSTORE_FILE) //
                 .build();
         setOptions(sslOptions);
 
@@ -110,7 +154,7 @@ public void standaloneWithJdkSslUsingTruststoreUrl() throws Exception {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(new File(TRUSTSTORE)) //
+                .truststore(truststoreURL()) //
                 .build();
         setOptions(sslOptions);
 
@@ -123,7 +167,7 @@ public void standaloneWithClientCertificates() throws Exception {
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
                 .keystore(new File(KEYSTORE), "changeit".toCharArray()) //
-                .truststore(new File(TRUSTSTORE)) //
+                .truststore(TRUSTSTORE_FILE) //
                 .build();
         setOptions(sslOptions);
 
@@ -135,7 +179,7 @@ public void standaloneWithClientCertificatesWithoutKeystore() throws Exception {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(new File(TRUSTSTORE)) //
+                .truststore(TRUSTSTORE_FILE) //
                 .build();
         setOptions(sslOptions);
 
@@ -147,7 +191,7 @@ public void standaloneWithJdkSslUsingTruststoreUrlWithWrongPassword() throws Exc
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
-                .truststore(new File(TRUSTSTORE), "knödel") //
+                .truststore(truststoreURL(), "knödel") //
                 .build();
         setOptions(sslOptions);
 
@@ -172,7 +216,7 @@ public void standaloneWithOpenSsl() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .openSslProvider() //
-                .truststore(new File(TRUSTSTORE)) //
+                .truststore(TRUSTSTORE_FILE) //
                 .build();
         setOptions(sslOptions);
 
@@ -217,6 +261,110 @@ public void sslWithVerificationWillFail() {
         redisClient.connect(redisUri).sync();
     }
 
+    @Test
+    public void masterSlaveWithSsl() {
+
+        RedisCommands<String, String> connection =
+                MasterSlave.connect(redisClient, StringCodec.UTF8, MASTER_SLAVE_URIS_NO_VERIFY).sync();
+        connection.set("key", "value");
+        assertThat(connection.get("key")).isEqualTo("value");
+        connection.getStatefulConnection().close();
+    }
+
+    @Test
+    public void masterSlaveWithJdkSsl() {
+
+        SslOptions sslOptions = SslOptions.builder() //
+                .jdkSslProvider() //
+                .truststore(TRUSTSTORE_FILE) //
+                .build();
+        setOptions(sslOptions);
+
+        verifyMasterSlaveConnection(MASTER_SLAVE_URIS_VERIFY);
+    }
+
+    @Test
+    public void masterSlaveWithJdkSslUsingTruststoreUrl() throws Exception {
+
+        SslOptions sslOptions = SslOptions.builder() //
+                .jdkSslProvider() //
+                .truststore(truststoreURL()) //
+                .build();
+        setOptions(sslOptions);
+
+        verifyMasterSlaveConnection(MASTER_SLAVE_URIS_VERIFY);
+    }
+
+    @Test(expected = RedisConnectionException.class)
+    public void masterSlaveWithJdkSslUsingTruststoreUrlWithWrongPassword() throws Exception {
+
+        SslOptions sslOptions = SslOptions.builder() //
+                .jdkSslProvider() //
+                .truststore(truststoreURL(), "knödel") //
+                .build();
+        setOptions(sslOptions);
+
+        verifyMasterSlaveConnection(MASTER_SLAVE_URIS_VERIFY);
+    }
+
+    @Test(expected = RedisConnectionException.class)
+    public void masterSlaveWithJdkSslFailsWithWrongTruststore() {
+
+        SslOptions sslOptions = SslOptions.builder() //
+                .jdkSslProvider() //
+                .build();
+        setOptions(sslOptions);
+
+        verifyMasterSlaveConnection(MASTER_SLAVE_URIS_VERIFY);
+    }
+
+    @Test
+    public void masterSlavePingBeforeActivate() {
+
+        redisClient.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+
+        verifyMasterSlaveConnection(MASTER_SLAVE_URIS_NO_VERIFY);
+    }
+
+    @Test
+    public void masterSlaveSslWithReconnect() throws Exception {
+        RedisCommands<String, String> connection =
+                MasterSlave.connect(redisClient, StringCodec.UTF8, MASTER_SLAVE_URIS_NO_VERIFY).sync();
+        connection.quit();
+        Thread.sleep(200);
+        assertThat(connection.ping()).isEqualTo("PONG");
+        connection.getStatefulConnection().close();
+    }
+
+    @Test(expected = RedisConnectionException.class)
+    public void masterSlaveSslWithVerificationWillFail() {
+        MasterSlave.connect(redisClient, StringCodec.UTF8, MASTER_SLAVE_URIS_VERIFY);
+    }
+
+    @Test
+    public void masterSlaveSslWithOneInvalidHostWillSucceed() {
+
+        SslOptions sslOptions = SslOptions.builder() //
+                .jdkSslProvider() //
+                .truststore(TRUSTSTORE_FILE) //
+                .build();
+        setOptions(sslOptions);
+
+        verifyMasterSlaveConnection(MASTER_SLAVE_URIS_WITH_ONE_INVALID);
+    }
+
+    @Test(expected = RedisConnectionException.class)
+    public void masterSlaveSslWithAllInvalidHostsWillFail() {
+
+        SslOptions sslOptions = SslOptions.builder() //
+                .jdkSslProvider() //
+                .truststore(TRUSTSTORE_FILE) //
+                .build();
+        setOptions(sslOptions);
+
+        verifyMasterSlaveConnection(MASTER_SLAVE_URIS_WITH_ALL_INVALID);
+    }
+
     @Test
     public void pubSubSsl() throws Exception {
 
@@ -283,6 +431,16 @@ public void pubSubSslAndBreakConnection() throws Exception {
         connection2.getStatefulConnection().close();
     }
 
+
+    private static RedisURI.Builder sslURIBuilder(int portOffset) {
+        return RedisURI.Builder.redis(host(), sslPort(portOffset))
+                .withSsl(true);
+    }
+
+    private URL truststoreURL() throws MalformedURLException {
+        return TRUSTSTORE_FILE.toURI().toURL();
+    }
+
     private void setOptions(SslOptions sslOptions) {
         ClientOptions clientOptions = ClientOptions.builder().sslOptions(sslOptions).build();
         redisClient.setOptions(clientOptions);
@@ -293,4 +451,11 @@ private void verifyConnection(RedisURI redisUri) {
         connection.sync().ping();
         connection.close();
     }
+
+    private void verifyMasterSlaveConnection(List<RedisURI> redisUris) {
+        StatefulRedisConnection<String, String> connection =
+                MasterSlave.connect(redisClient, StringCodec.UTF8, redisUris);
+        connection.sync().ping();
+        connection.close();
+    }
 }

From e4a81b47995c870f4ea1284aad8df3e1ca48a2d2 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 3 Feb 2018 17:02:21 +0100
Subject: [PATCH 399/808] Polishing #684

Reformat code. Simplify URI fixture in SslTest. Add author tags.

Fix close latch/duplicate calls to StatefulRedisConnection.close().
---
 .../masterslave/RedisMasterSlaveNode.java     |   3 +-
 .../lettuce/core/masterslave/ResumeAfter.java |  11 +-
 .../StaticMasterSlaveTopologyProvider.java    |  31 +++---
 src/test/java/io/lettuce/SslTest.java         | 105 ++++++++----------
 4 files changed, 72 insertions(+), 78 deletions(-)

diff --git a/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java b/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
index 805827c5a7..3313d8dc6b 100644
--- a/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
+++ b/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
@@ -22,13 +22,14 @@
  * A node within a Redis Master-Slave setup.
  *
  * @author Mark Paluch
+ * @author Adam McElwee
  */
 class RedisMasterSlaveNode implements RedisNodeDescription {
 
     private final RedisURI redisURI;
     private final Role role;
 
-    public RedisMasterSlaveNode(String host, int port, RedisURI seed, Role role) {
+    RedisMasterSlaveNode(String host, int port, RedisURI seed, Role role) {
 
         RedisURI.Builder builder = RedisURI.Builder
                 .redis(host, port)
diff --git a/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java b/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
index d66823a52d..c137f96454 100644
--- a/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
+++ b/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
@@ -21,11 +21,14 @@
 import io.lettuce.core.internal.AsyncCloseable;
 
 /**
+ * Utility to resume a {@link org.reactivestreams.Publisher} after termination.
+ *
  * @author Mark Paluch
  */
-public class ResumeAfter {
+class ResumeAfter {
 
-    private static final AtomicIntegerFieldUpdater UPDATER = AtomicIntegerFieldUpdater.newUpdater(ResumeAfter.class, "closed");
+    private static final AtomicIntegerFieldUpdater<ResumeAfter> UPDATER = AtomicIntegerFieldUpdater.newUpdater(
+            ResumeAfter.class, "closed");
 
     private final AsyncCloseable closeable;
 
@@ -79,7 +82,7 @@ public <T> Mono<T> thenError(Throwable t) {
         });
     }
 
-    boolean firstCloseLatch() {
-        return UPDATER.compareAndSet(ResumeAfter.this, ST_OPEN, ST_OPEN);
+    private boolean firstCloseLatch() {
+        return UPDATER.compareAndSet(ResumeAfter.this, ST_OPEN, ST_CLOSED);
     }
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
index a7bd4ee69f..618d60a74c 100644
--- a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
@@ -20,10 +20,10 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 
-import io.lettuce.core.RedisConnectionException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisConnectionException;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.StringCodec;
@@ -39,6 +39,7 @@
  * {@link TopologyProvider} does not auto-discover nodes.
  *
  * @author Mark Paluch
+ * @author Adam McElwee
  */
 public class StaticMasterSlaveTopologyProvider implements TopologyProvider {
 
@@ -76,21 +77,19 @@ public CompletableFuture<List<RedisNodeDescription>> getNodesAsync() {
         List<StatefulRedisConnection<String, String>> connections = new CopyOnWriteArrayList<>();
 
         Flux<RedisURI> uris = Flux.fromIterable(redisURIs);
-        Mono<List<RedisNodeDescription>> nodes = uris.flatMap(uri -> getNodeDescription(connections, uri)) //
-                .collectList() //
-                .flatMap((nodeDescriptions) -> {
-                    if (nodeDescriptions.isEmpty()) {
-                        return Mono.error(new RedisConnectionException(String.format("Failed to connect to any nodes in %s", redisURIs)));
-                    } else {
-                        return Mono.just(nodeDescriptions);
-                    }
-                }) //
-                .doFinally(it -> {
-
-                    for (StatefulRedisConnection<String, String> connection : connections) {
-                        connection.closeAsync();
-                    }
-                });
+        Mono<List<RedisNodeDescription>> nodes = uris
+                .flatMap(uri -> getNodeDescription(connections, uri))
+                .collectList()
+                .flatMap(
+                        (nodeDescriptions) -> {
+
+                            if (nodeDescriptions.isEmpty()) {
+                                return Mono.error(new RedisConnectionException(String.format(
+                                        "Failed to connect to at leas one node in %s", redisURIs)));
+                            }
+
+                            return Mono.just(nodeDescriptions);
+                        });
 
         return nodes.toFuture();
     }
diff --git a/src/test/java/io/lettuce/SslTest.java b/src/test/java/io/lettuce/SslTest.java
index 9dd47fa414..e4e847c843 100644
--- a/src/test/java/io/lettuce/SslTest.java
+++ b/src/test/java/io/lettuce/SslTest.java
@@ -25,16 +25,14 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.cert.CertificateException;
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.*;
@@ -44,12 +42,15 @@
 import io.lettuce.core.masterslave.MasterSlave;
 import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
 import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands;
+import io.netty.channel.group.ChannelGroup;
 import io.netty.handler.codec.DecoderException;
 import io.netty.handler.ssl.OpenSsl;
 
-
 /**
+ * Tests using SSL via {@link RedisClient}.
+ *
  * @author Mark Paluch
+ * @author Adam McElwee
  */
 public class SslTest extends AbstractTest {
 
@@ -66,46 +67,21 @@ public class SslTest extends AbstractTest {
             .withVerifyPeer(true) //
             .build();
 
-
     private static final RedisURI URI_CLIENT_CERT_AUTH = sslURIBuilder(2) //
             .withVerifyPeer(true) //
             .build();
 
-    private static final List<RedisURI> MASTER_SLAVE_URIS_NO_VERIFY = Arrays.asList(
-            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET)
-                    .withVerifyPeer(false)
-                    .build(),
-            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET + 1)
-                    .withVerifyPeer(false)
-                    .build());
-
-
-    private static final List<RedisURI> MASTER_SLAVE_URIS_VERIFY = Arrays.asList(
-            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET)
-                    .withVerifyPeer(true)
-                    .build(),
-            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET + 1)
-                    .withVerifyPeer(true)
-                    .build());
-
-    private static final List<RedisURI> MASTER_SLAVE_URIS_WITH_ONE_INVALID = Arrays.asList(
-            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET)
-                    .withVerifyPeer(true)
-                    .build(),
-            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET + 1)
-                    .withVerifyPeer(true)
-                    .build(),
-            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET + 2)
-                    .withVerifyPeer(true)
-                    .build());
-
-    private static final List<RedisURI> MASTER_SLAVE_URIS_WITH_ALL_INVALID = Arrays.asList(
-            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET + 2)
-                    .withVerifyPeer(true)
-                    .build(),
-            sslURIBuilder(MASTER_SLAVE_BASE_PORT_OFFSET + 3)
-                    .withVerifyPeer(true)
-                    .build());
+    private static final List<RedisURI> MASTER_SLAVE_URIS_NO_VERIFY = sslUris(IntStream.of(0, 1),
+            builder -> builder.withVerifyPeer(false));
+
+    private static final List<RedisURI> MASTER_SLAVE_URIS_VERIFY = sslUris(IntStream.of(0, 1),
+            builder -> builder.withVerifyPeer(true));
+
+    private static final List<RedisURI> MASTER_SLAVE_URIS_WITH_ONE_INVALID = sslUris(IntStream.of(0, 1, 2),
+            builder -> builder.withVerifyPeer(true));
+
+    private static final List<RedisURI> MASTER_SLAVE_URIS_WITH_ALL_INVALID = sslUris(IntStream.of(2, 3),
+            builder -> builder.withVerifyPeer(true));
 
     private static RedisClient redisClient;
 
@@ -123,6 +99,14 @@ public void before() {
         redisClient.setOptions(ClientOptions.create());
     }
 
+    @After
+    public void tearDown() {
+
+        ChannelGroup group = (ChannelGroup) ReflectionTestUtils.getField(redisClient, "channels");
+
+        assertThat((Iterable) group).as("Test completed without connection cleanup").isEmpty();
+    }
+
     @AfterClass
     public static void afterClass() {
         FastShutdown.shutdown(redisClient);
@@ -264,8 +248,8 @@ public void sslWithVerificationWillFail() {
     @Test
     public void masterSlaveWithSsl() {
 
-        RedisCommands<String, String> connection =
-                MasterSlave.connect(redisClient, StringCodec.UTF8, MASTER_SLAVE_URIS_NO_VERIFY).sync();
+        RedisCommands<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8,
+                MASTER_SLAVE_URIS_NO_VERIFY).sync();
         connection.set("key", "value");
         assertThat(connection.get("key")).isEqualTo("value");
         connection.getStatefulConnection().close();
@@ -328,8 +312,8 @@ public void masterSlavePingBeforeActivate() {
 
     @Test
     public void masterSlaveSslWithReconnect() throws Exception {
-        RedisCommands<String, String> connection =
-                MasterSlave.connect(redisClient, StringCodec.UTF8, MASTER_SLAVE_URIS_NO_VERIFY).sync();
+        RedisCommands<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8,
+                MASTER_SLAVE_URIS_NO_VERIFY).sync();
         connection.quit();
         Thread.sleep(200);
         assertThat(connection.ping()).isEqualTo("PONG");
@@ -431,10 +415,16 @@ public void pubSubSslAndBreakConnection() throws Exception {
         connection2.getStatefulConnection().close();
     }
 
-
     private static RedisURI.Builder sslURIBuilder(int portOffset) {
-        return RedisURI.Builder.redis(host(), sslPort(portOffset))
-                .withSsl(true);
+        return RedisURI.Builder.redis(host(), sslPort(portOffset)).withSsl(true);
+    }
+
+    private static List<RedisURI> sslUris(IntStream masterSlaveOffsets,
+            Function<RedisURI.Builder, RedisURI.Builder> builderCustomizer) {
+
+        return masterSlaveOffsets.map(it -> it + MASTER_SLAVE_BASE_PORT_OFFSET)
+                .mapToObj(offset -> RedisURI.Builder.redis(host(), sslPort(offset)).withSsl(true)).map(builderCustomizer)
+                .map(RedisURI.Builder::build).collect(Collectors.toList());
     }
 
     private URL truststoreURL() throws MalformedURLException {
@@ -447,15 +437,16 @@ private void setOptions(SslOptions sslOptions) {
     }
 
     private void verifyConnection(RedisURI redisUri) {
-        StatefulRedisConnection<String, String> connection = redisClient.connect(redisUri);
-        connection.sync().ping();
-        connection.close();
+
+        try (StatefulRedisConnection<String, String> connection = redisClient.connect(redisUri)) {
+            connection.sync().ping();
+        }
     }
 
     private void verifyMasterSlaveConnection(List<RedisURI> redisUris) {
-        StatefulRedisConnection<String, String> connection =
-                MasterSlave.connect(redisClient, StringCodec.UTF8, redisUris);
-        connection.sync().ping();
-        connection.close();
+
+        try (StatefulRedisConnection<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8, redisUris)) {
+            connection.sync().ping();
+        }
     }
 }

From 014fca101f3bf5c2816564e2f2c1d4f550b25bf8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 16 Feb 2018 12:18:38 +0100
Subject: [PATCH 400/808] Guard RedisURI creation against URI without scheme
 #694

---
 src/main/java/io/lettuce/core/RedisURI.java     | 4 ++++
 src/test/java/io/lettuce/core/RedisURITest.java | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 7349446e8f..d974ef2b94 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -512,6 +512,10 @@ public URI toURI() {
     }
 
     private static RedisURI buildRedisUriFromUri(URI uri) {
+
+        LettuceAssert.notNull(uri, "URI must not be null");
+        LettuceAssert.notNull(uri.getScheme(), "URI scheme must not be null");
+
         Builder builder;
         if (uri.getScheme().equals(URI_SCHEME_REDIS_SENTINEL)) {
             builder = configureSentinel(uri);
diff --git a/src/test/java/io/lettuce/core/RedisURITest.java b/src/test/java/io/lettuce/core/RedisURITest.java
index 9a97a14a5e..760ee5e941 100644
--- a/src/test/java/io/lettuce/core/RedisURITest.java
+++ b/src/test/java/io/lettuce/core/RedisURITest.java
@@ -77,6 +77,11 @@ public void simpleUriTest() {
         assertThat(redisURI.toURI().toString()).isEqualTo("redis://localhost");
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowIllegalArgumentExceptionOnMalformedUri() {
+        RedisURI.create("localhost");
+    }
+
     @Test
     public void sslUriTest() {
         RedisURI redisURI = RedisURI.create("redis+ssl://localhost:6379");

From dbfa192b79a51f27263e7212a782557c2d9bad6c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 16 Feb 2018 13:11:48 +0100
Subject: [PATCH 401/808] Extend request command limits to accept connection
 activation commands #691

Request queue size checks now consider an additional number of connection activation commands.
---
 .../lettuce/core/protocol/CommandHandler.java |  7 ++-
 .../core/protocol/DefaultEndpoint.java        |  6 +-
 .../io/lettuce/core/ClientOptionsTest.java    | 60 +++++++++++++++++++
 3 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 592d2b69b2..8aab0505b9 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -436,7 +436,12 @@ private void validateWrite(int commands) {
 
         if (usesBoundedQueues()) {
 
-            if (stack.size() + commands > clientOptions.getRequestQueueSize())
+            // number of maintenance commands (AUTH, CLIENT SETNAME, SELECT, READONLY) should be allowed on top
+            // of number of user commands to ensure the driver recovers properly from a disconnect
+            int maxMaintenanceCommands = 5;
+            int allowedRequestQueueSize = clientOptions.getRequestQueueSize() + maxMaintenanceCommands;
+            if (stack.size() + commands > allowedRequestQueueSize)
+
                 throw new RedisException("Internal stack size exceeded: " + clientOptions.getRequestQueueSize()
                         + ". Commands are not accepted until the stack size drops.");
         }
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index 8aa7a6c332..25c8a6fd26 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -183,17 +183,19 @@ private void validateWrite(int commands) {
 
         if (usesBoundedQueues()) {
 
+            boolean connected = isConnected();
+
             if (QUEUE_SIZE.get(this) + commands > clientOptions.getRequestQueueSize()) {
                 throw new RedisException("Request queue size exceeded: " + clientOptions.getRequestQueueSize()
                         + ". Commands are not accepted until the queue size drops.");
             }
 
-            if (disconnectedBuffer.size() + commands > clientOptions.getRequestQueueSize()) {
+            if (!connected && disconnectedBuffer.size() + commands > clientOptions.getRequestQueueSize()) {
                 throw new RedisException("Request queue size exceeded: " + clientOptions.getRequestQueueSize()
                         + ". Commands are not accepted until the queue size drops.");
             }
 
-            if (commandBuffer.size() + commands > clientOptions.getRequestQueueSize()) {
+            if (connected && commandBuffer.size() + commands > clientOptions.getRequestQueueSize()) {
                 throw new RedisException("Command buffer size exceeded: " + clientOptions.getRequestQueueSize()
                         + ". Commands are not accepted until the queue size drops.");
             }
diff --git a/src/test/java/io/lettuce/core/ClientOptionsTest.java b/src/test/java/io/lettuce/core/ClientOptionsTest.java
index 6548d4a8b3..73097cb273 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsTest.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsTest.java
@@ -122,6 +122,66 @@ public void requestQueueSizeAppliedForReconnect() {
         client.setOptions(ClientOptions.builder().requestQueueSize(10).build());
 
         RedisAsyncCommands<String, String> connection = client.connect().async();
+        testHitRequestQueueLimit(connection);
+    }
+
+    @Test
+    public void testHitRequestQueueLimitReconnectWithAuthCommand() {
+
+        new WithPasswordRequired() {
+
+            @Override
+            protected void run(RedisClient client) {
+
+                client.setOptions(ClientOptions.builder().requestQueueSize(10).build());
+
+                RedisAsyncCommands<String, String> connection = client.connect().async();
+                connection.auth(passwd);
+                testHitRequestQueueLimit(connection);
+            }
+        };
+    }
+
+    @Test
+    public void testHitRequestQueueLimitReconnectWithUriAuth() {
+
+        new WithPasswordRequired() {
+
+            @Override
+            protected void run(RedisClient client) {
+
+                client.setOptions(ClientOptions.builder().requestQueueSize(10).build());
+
+                RedisURI redisURI = RedisURI.create(host, port);
+                redisURI.setPassword(passwd);
+
+                RedisAsyncCommands<String, String> connection = client.connect(redisURI).async();
+                testHitRequestQueueLimit(connection);
+            }
+        };
+    }
+
+    @Test
+    public void testHitRequestQueueLimitReconnectWithUriAuthPingCommand() {
+
+        new WithPasswordRequired() {
+
+            @Override
+            protected void run(RedisClient client) {
+
+                client.setOptions(ClientOptions.builder().requestQueueSize(10).pingBeforeActivateConnection(true).build());
+
+                RedisURI redisURI = RedisURI.create(host, port);
+                redisURI.setPassword(passwd);
+
+                RedisAsyncCommands<String, String> connection = client.connect(redisURI).async();
+                testHitRequestQueueLimit(connection);
+            }
+        };
+    }
+
+    private void testHitRequestQueueLimit(RedisAsyncCommands<String, String> connection) {
+
         ConnectionWatchdog watchdog = getConnectionWatchdog(connection.getStatefulConnection());
 
         watchdog.setListenOnChannelInactive(false);

From 7b69cd1cd73f0737db90d628b3e03c68c9c0f5fe Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 16 Feb 2018 14:28:51 +0100
Subject: [PATCH 402/808] Upgrade to Reactor Bismuth SR5 #698

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 197e940edd..ae27bdd29e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <skipTests>true</skipTests>
         <netty-version>4.1.17.Final</netty-version>
         <spring-version>4.3.12.RELEASE</spring-version>
-        <reactor-version>Bismuth-SR4</reactor-version>
+        <reactor-version>Bismuth-SR5</reactor-version>
     </properties>
 
     <scm>

From 6b08c64da110125bfa8de4423ca8644f91585e0e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 16 Feb 2018 14:31:11 +0100
Subject: [PATCH 403/808] Upgrade to RxJava 1.3.6 #700

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ae27bdd29e..35a02ec41c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,7 +179,7 @@
         <dependency>
             <groupId>io.reactivex</groupId>
             <artifactId>rxjava</artifactId>
-            <version>1.3.3</version>
+            <version>1.3.6</version>
             <optional>true</optional>
         </dependency>
 

From ffbd3fb4d060741eee61034512cc68c8be5314ce Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 16 Feb 2018 14:31:43 +0100
Subject: [PATCH 404/808] Upgrade to RxJava 2.1.9 #701

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 35a02ec41c..fd4296edca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,7 +193,7 @@
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
-            <version>2.1.6</version>
+            <version>2.1.9</version>
             <optional>true</optional>
         </dependency>
 

From 0b5b11b7fe403195765fdb36d503548fc28271e0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 16 Feb 2018 14:34:06 +0100
Subject: [PATCH 405/808] Upgrade to netty 4.1.21.Final #699

---
 pom.xml                                                       | 2 +-
 .../java/io/lettuce/core/protocol/CommandHandlerTest.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index fd4296edca..4d650ae5a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
-        <netty-version>4.1.17.Final</netty-version>
+        <netty-version>4.1.21.Final</netty-version>
         <spring-version>4.3.12.RELEASE</spring-version>
         <reactor-version>Bismuth-SR5</reactor-version>
     </properties>
diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
index 1d8da5a8e6..41419fa08e 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
@@ -261,7 +261,7 @@ public void shouldCancelCommandOnQueueSingleFailure() throws Exception {
         RuntimeException exception = new RuntimeException();
         when(commandMock.getOutput()).thenThrow(exception);
 
-        ChannelPromise channelPromise = new DefaultChannelPromise(null, ImmediateEventExecutor.INSTANCE);
+        ChannelPromise channelPromise = new DefaultChannelPromise(channel, ImmediateEventExecutor.INSTANCE);
         try {
             sut.write(context, commandMock, channelPromise);
             fail("Missing RuntimeException");
@@ -281,7 +281,7 @@ public void shouldCancelCommandOnQueueBatchFailure() throws Exception {
         RuntimeException exception = new RuntimeException();
         when(commandMock.getOutput()).thenThrow(exception);
 
-        ChannelPromise channelPromise = new DefaultChannelPromise(null, ImmediateEventExecutor.INSTANCE);
+        ChannelPromise channelPromise = new DefaultChannelPromise(channel, ImmediateEventExecutor.INSTANCE);
         try {
             sut.write(context, Arrays.asList(commandMock), channelPromise);
             fail("Missing RuntimeException");

From 5a1150b11bc9c009cef103266eb2990cf41fb9ee Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 16 Feb 2018 14:58:26 +0100
Subject: [PATCH 406/808] Polishing

---
 prepare-apidocs-upload.sh | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100755 prepare-apidocs-upload.sh

diff --git a/prepare-apidocs-upload.sh b/prepare-apidocs-upload.sh
deleted file mode 100755
index 90e5448c8c..0000000000
--- a/prepare-apidocs-upload.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-VERSION=$(xpath -e "/project/version" pom.xml 2>/dev/null | sed 's/<version>//g;s/<\/version>//g')
-
-if [[ "" == "${VERSION}" ]]
-then
-    echo "Cannot determine version"
-    exit 1
-fi
-
-BASE=target/redis.paluch.biz
-TARGET_BASE=/docs/api/releases/
-
-git clone https://github.com/mp911de/redis.paluch.biz.git ${BASE}
-cd ${BASE} && git checkout gh-pages && cd ../..
-
-if [[ ${VERSION} == *"SNAPSHOT"* ]]
-then
-    TARGET_BASE=/docs/api/snapshots/
-fi
-
-TARGET_DIR=${BASE}${TARGET_BASE}${VERSION}
-
-mkdir -p ${TARGET_DIR}
-
-cp -R target/site/apidocs/* ${TARGET_DIR}
-
-cd ${BASE}
-git add .
-git commit -m "Generated API docs"
-

From 5d783ef006be22d26b587118f5f8a756e003eedb Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 17 Feb 2018 09:52:03 +0100
Subject: [PATCH 407/808] Upgrade to Reactor Bismuth SR6 #704

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4d650ae5a9..4a4e170b26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <skipTests>true</skipTests>
         <netty-version>4.1.21.Final</netty-version>
         <spring-version>4.3.12.RELEASE</spring-version>
-        <reactor-version>Bismuth-SR5</reactor-version>
+        <reactor-version>Bismuth-SR6</reactor-version>
     </properties>
 
     <scm>

From 08faf456e37a76645de728ef2a27eddbcaab2466 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 21 Feb 2018 17:08:34 +0100
Subject: [PATCH 408/808] Map async connection exception to
 RedisConnectionException #708

Lettuce now maps connection exceptions to RedisConnectionException retaining connection context to align with synchronous connect methods.
---
 .../io/lettuce/core/ConnectionFuture.java     |   2 +
 .../lettuce/core/DefaultConnectionFuture.java |  30 +++++
 .../java/io/lettuce/core/RedisClient.java     |  56 +++++---
 .../core/RedisConnectionException.java        |  12 ++
 .../core/cluster/RedisClusterClient.java      |  22 ++-
 .../lettuce/core/masterslave/MasterSlave.java |  57 +++++++-
 .../io/lettuce/core/ConnectionFutureTest.java | 126 ++++++++++++++++++
 .../masterslave/MasterSlaveSentinelTest.java  |   2 +-
 8 files changed, 278 insertions(+), 29 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/ConnectionFutureTest.java

diff --git a/src/main/java/io/lettuce/core/ConnectionFuture.java b/src/main/java/io/lettuce/core/ConnectionFuture.java
index 0c7d60c45d..37f8a3a791 100644
--- a/src/main/java/io/lettuce/core/ConnectionFuture.java
+++ b/src/main/java/io/lettuce/core/ConnectionFuture.java
@@ -172,6 +172,8 @@ <U> ConnectionFuture<Void> thenAcceptBothAsync(CompletionStage<? extends U> othe
     @Override
     <U> ConnectionFuture<U> thenCompose(Function<? super T, ? extends CompletionStage<U>> fn);
 
+    <U> ConnectionFuture<U> thenCompose(BiFunction<? super T, ? super Throwable, ? extends CompletionStage<U>> fn);
+
     @Override
     <U> ConnectionFuture<U> thenComposeAsync(Function<? super T, ? extends CompletionStage<U>> fn);
 
diff --git a/src/main/java/io/lettuce/core/DefaultConnectionFuture.java b/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
index cb1b56f841..fd9cab4a90 100644
--- a/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
+++ b/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
@@ -241,6 +241,36 @@ public <U> DefaultConnectionFuture<U> thenCompose(Function<? super T, ? extends
         return adopt(delegate.thenCompose(fn));
     }
 
+    @Override
+    public <U> ConnectionFuture<U> thenCompose(BiFunction<? super T, ? super Throwable, ? extends CompletionStage<U>> fn) {
+
+        CompletableFuture<U> future = new CompletableFuture<>();
+
+        delegate.whenComplete((v, e) -> {
+
+            try {
+                CompletionStage<U> apply = fn.apply(v, e);
+                apply.whenComplete((u, t) -> {
+
+                    if (t != null) {
+                        future.completeExceptionally(t);
+                    } else {
+                        future.complete(u);
+                    }
+                });
+            } catch (Exception ex) {
+                ExecutionException result = new ExecutionException("Exception while applying thenCompose", ex);
+
+                if (e != null) {
+                    result.addSuppressed(e);
+                }
+                future.completeExceptionally(result);
+            }
+        });
+
+        return adopt(future);
+    }
+
     @Override
     public <U> DefaultConnectionFuture<U> thenComposeAsync(Function<? super T, ? extends CompletionStage<U>> fn) {
         return adopt(delegate.thenComposeAsync(fn));
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 4168dfed96..2890981d18 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -23,12 +23,14 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletionStage;
 import java.util.function.Supplier;
 
 import reactor.core.publisher.Mono;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
@@ -199,7 +201,8 @@ public StatefulRedisConnection<String, String> connect() {
     public <K, V> StatefulRedisConnection<K, V> connect(RedisCodec<K, V> codec) {
 
         checkForRedisURI();
-        return connectStandalone(codec, this.redisURI, timeout);
+
+        return getConnection(connectStandaloneAsync(codec, this.redisURI, timeout));
     }
 
     /**
@@ -211,7 +214,8 @@ public <K, V> StatefulRedisConnection<K, V> connect(RedisCodec<K, V> codec) {
     public StatefulRedisConnection<String, String> connect(RedisURI redisURI) {
 
         assertNotNull(redisURI);
-        return connectStandalone(newStringStringCodec(), redisURI, redisURI.getTimeout());
+
+        return getConnection(connectStandaloneAsync(newStringStringCodec(), redisURI, redisURI.getTimeout()));
     }
 
     /**
@@ -227,7 +231,8 @@ public StatefulRedisConnection<String, String> connect(RedisURI redisURI) {
     public <K, V> StatefulRedisConnection<K, V> connect(RedisCodec<K, V> codec, RedisURI redisURI) {
 
         assertNotNull(redisURI);
-        return connectStandalone(codec, redisURI, redisURI.getTimeout());
+
+        return getConnection(connectStandaloneAsync(codec, redisURI, redisURI.getTimeout()));
     }
 
     /**
@@ -244,20 +249,8 @@ public <K, V> StatefulRedisConnection<K, V> connect(RedisCodec<K, V> codec, Redi
     public <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectAsync(RedisCodec<K, V> codec, RedisURI redisURI) {
 
         assertNotNull(redisURI);
-        return connectStandaloneAsync(codec, redisURI, redisURI.getTimeout());
-    }
 
-    private <K, V> StatefulRedisConnection<K, V> connectStandalone(RedisCodec<K, V> codec, RedisURI redisURI, Duration timeout) {
-        return getConnection(connectStandaloneAsync(codec, redisURI, timeout));
-    }
-
-    // Required by ReflectiveNodeConnectionFactory.
-    @SuppressWarnings("unused")
-    private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandaloneAsync(RedisCodec<K, V> codec,
-            RedisURI redisURI) {
-
-        assertNotNull(redisURI);
-        return connectStandaloneAsync(codec, redisURI, redisURI.getTimeout());
+        return transformAsyncConnectionException(connectStandaloneAsync(codec, redisURI, redisURI.getTimeout()));
     }
 
     private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandaloneAsync(RedisCodec<K, V> codec,
@@ -421,7 +414,7 @@ public <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSu
             RedisURI redisURI) {
 
         assertNotNull(redisURI);
-        return connectPubSubAsync(codec, redisURI, redisURI.getTimeout());
+        return transformAsyncConnectionException(connectPubSubAsync(codec, redisURI, redisURI.getTimeout()));
     }
 
     private <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubAsync(RedisCodec<K, V> codec,
@@ -484,6 +477,7 @@ public <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K
     public StatefulRedisSentinelConnection<String, String> connectSentinel(RedisURI redisURI) {
 
         assertNotNull(redisURI);
+
         return getConnection(connectSentinelAsync(newStringStringCodec(), redisURI, redisURI.getTimeout()));
     }
 
@@ -500,6 +494,7 @@ public StatefulRedisSentinelConnection<String, String> connectSentinel(RedisURI
     public <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K, V> codec, RedisURI redisURI) {
 
         assertNotNull(redisURI);
+
         return getConnection(connectSentinelAsync(codec, redisURI, redisURI.getTimeout()));
     }
 
@@ -519,7 +514,8 @@ public <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectSe
             RedisURI redisURI) {
 
         assertNotNull(redisURI);
-        return connectSentinelAsync(codec, redisURI, redisURI.getTimeout());
+
+        return transformAsyncConnectionException(connectSentinelAsync(codec, redisURI, redisURI.getTimeout()), redisURI);
     }
 
     private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectSentinelAsync(RedisCodec<K, V> codec,
@@ -751,6 +747,30 @@ private Mono<SocketAddress> lookupRedis(RedisURI sentinelUri) {
                         .then(Mono.just(it))));
     }
 
+    private static <T> ConnectionFuture<T> transformAsyncConnectionException(ConnectionFuture<T> future) {
+
+        return future.thenCompose((v, e) -> {
+
+            if (e != null) {
+                return Futures.failed(RedisConnectionException.create(future.getRemoteAddress(), e));
+            }
+
+            return CompletableFuture.completedFuture(v);
+        });
+    }
+
+    private static <T> CompletableFuture<T> transformAsyncConnectionException(CompletionStage<T> future, RedisURI target) {
+
+        return ConnectionFuture.from(null, future.toCompletableFuture()).thenCompose((v, e) -> {
+
+            if (e != null) {
+                return Futures.failed(RedisConnectionException.create(target.toString(), e));
+            }
+
+            return CompletableFuture.completedFuture(v);
+        }).toCompletableFuture();
+    }
+
     private static void checkValidRedisURI(RedisURI redisURI) {
 
         LettuceAssert.notNull(redisURI, "A valid RedisURI is required");
diff --git a/src/main/java/io/lettuce/core/RedisConnectionException.java b/src/main/java/io/lettuce/core/RedisConnectionException.java
index c4bffaeec8..75e6eb161f 100644
--- a/src/main/java/io/lettuce/core/RedisConnectionException.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionException.java
@@ -53,6 +53,18 @@ public RedisConnectionException(String msg, Throwable cause) {
      * @since 4.4
      */
     public static RedisConnectionException create(SocketAddress remoteAddress, Throwable cause) {
+        return create(remoteAddress == null ? null : remoteAddress.toString(), cause);
+    }
+
+    /**
+     * Create a new {@link RedisConnectionException} given {@code remoteAddress} and the {@link Throwable cause}.
+     *
+     * @param remoteAddress remote address.
+     * @param cause the nested exception.
+     * @return the {@link RedisConnectionException}.
+     * @since 5.1
+     */
+    public static RedisConnectionException create(String remoteAddress, Throwable cause) {
 
         if (remoteAddress == null) {
 
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index ce2b2c8338..d51dd8314c 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -20,6 +20,7 @@
 import java.net.URI;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -345,7 +346,7 @@ public <K, V> StatefulRedisClusterConnection<K, V> connect(RedisCodec<K, V> code
             initializePartitions();
         }
 
-        return getConnection(connectAsync(codec));
+        return getConnection(connectClusterAsync(codec));
     }
 
     /**
@@ -371,7 +372,7 @@ public <K, V> StatefulRedisClusterConnection<K, V> connect(RedisCodec<K, V> code
      */
     @SuppressWarnings("unchecked")
     public <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectAsync(RedisCodec<K, V> codec) {
-        return connectClusterAsync(codec);
+        return transformAsyncConnectionException(connectClusterAsync(codec), getInitialUris());
     }
 
     /**
@@ -419,7 +420,7 @@ public <K, V> StatefulRedisClusterPubSubConnection<K, V> connectPubSub(RedisCode
             initializePartitions();
         }
 
-        return getConnection(connectPubSubAsync(codec));
+        return getConnection(connectClusterPubSubAsync(codec));
     }
 
     /**
@@ -445,7 +446,7 @@ public <K, V> StatefulRedisClusterPubSubConnection<K, V> connectPubSub(RedisCode
      */
     @SuppressWarnings("unchecked")
     public <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> connectPubSubAsync(RedisCodec<K, V> codec) {
-        return connectClusterPubSubAsync(codec);
+        return transformAsyncConnectionException(connectClusterPubSubAsync(codec), getInitialUris());
     }
 
     StatefulRedisConnection<String, String> connectToNode(SocketAddress socketAddress) {
@@ -1104,6 +1105,19 @@ boolean expireStaleConnections() {
         return getClusterClientOptions() == null || getClusterClientOptions().isCloseStaleConnections();
     }
 
+    protected static <T> CompletableFuture<T> transformAsyncConnectionException(CompletionStage<T> future,
+            Iterable<RedisURI> target) {
+
+        return ConnectionFuture.from(null, future.toCompletableFuture()).thenCompose((v, e) -> {
+
+            if (e != null) {
+                return Futures.failed(RedisConnectionException.create(target.toString(), e));
+            }
+
+            return CompletableFuture.completedFuture(v);
+        }).toCompletableFuture();
+    }
+
     private static <K, V> void assertNotNull(RedisCodec<K, V> codec) {
         LettuceAssert.notNull(codec, "RedisCodec must not be null");
     }
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index 888c7d93fd..38323e730d 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -17,6 +17,7 @@
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 
 import io.lettuce.core.ConnectionFuture;
@@ -24,6 +25,7 @@
 import io.lettuce.core.RedisConnectionException;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceLists;
 
@@ -99,7 +101,12 @@ public class MasterSlave {
      */
     public static <K, V> StatefulRedisMasterSlaveConnection<K, V> connect(RedisClient redisClient, RedisCodec<K, V> codec,
             RedisURI redisURI) {
-        return getConnection(connectAsync(redisClient, codec, redisURI));
+
+        LettuceAssert.notNull(redisClient, "RedisClient must not be null");
+        LettuceAssert.notNull(codec, "RedisCodec must not be null");
+        LettuceAssert.notNull(redisURI, "RedisURI must not be null");
+
+        return getConnection(connectAsyncSentinelOrAutodiscovery(redisClient, codec, redisURI), redisURI);
     }
 
     /**
@@ -120,6 +127,11 @@ public static <K, V> StatefulRedisMasterSlaveConnection<K, V> connect(RedisClien
      */
     public static <K, V> CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsync(RedisClient redisClient,
             RedisCodec<K, V> codec, RedisURI redisURI) {
+        return transformAsyncConnectionException(connectAsyncSentinelOrAutodiscovery(redisClient, codec, redisURI), redisURI);
+    }
+
+    private static <K, V> CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsyncSentinelOrAutodiscovery(
+            RedisClient redisClient, RedisCodec<K, V> codec, RedisURI redisURI) {
 
         LettuceAssert.notNull(redisClient, "RedisClient must not be null");
         LettuceAssert.notNull(codec, "RedisCodec must not be null");
@@ -150,7 +162,7 @@ public static <K, V> CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>>
      */
     public static <K, V> StatefulRedisMasterSlaveConnection<K, V> connect(RedisClient redisClient, RedisCodec<K, V> codec,
             Iterable<RedisURI> redisURIs) {
-        return getConnection(connectAsync(redisClient, codec, redisURIs));
+        return getConnection(connectAsyncSentinelOrStaticSetup(redisClient, codec, redisURIs), redisURIs);
     }
 
     /**
@@ -171,6 +183,11 @@ public static <K, V> StatefulRedisMasterSlaveConnection<K, V> connect(RedisClien
      */
     public static <K, V> CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsync(RedisClient redisClient,
             RedisCodec<K, V> codec, Iterable<RedisURI> redisURIs) {
+        return transformAsyncConnectionException(connectAsyncSentinelOrStaticSetup(redisClient, codec, redisURIs), redisURIs);
+    }
+
+    private static <K, V> CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsyncSentinelOrStaticSetup(
+            RedisClient redisClient, RedisCodec<K, V> codec, Iterable<RedisURI> redisURIs) {
 
         LettuceAssert.notNull(redisClient, "RedisClient must not be null");
         LettuceAssert.notNull(codec, "RedisCodec must not be null");
@@ -195,24 +212,52 @@ private static boolean isSentinel(RedisURI redisURI) {
      * the channel/connection initialization. Any exception is rethrown as {@link RedisConnectionException}.
      *
      * @param connectionFuture must not be null.
+     * @param context context information (single RedisURI, multiple URIs), used as connection target in the reported exception.
      * @param <T> Connection type.
      * @return the connection.
      * @throws RedisConnectionException in case of connection failures.
      */
-    private static <T> T getConnection(CompletableFuture<T> connectionFuture) {
+    private static <T> T getConnection(CompletableFuture<T> connectionFuture, Object context) {
 
         try {
             return connectionFuture.get();
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
-            throw RedisConnectionException.create(null, e);
+            throw RedisConnectionException.create(context.toString(), e);
         } catch (Exception e) {
 
             if (e instanceof ExecutionException) {
-                throw RedisConnectionException.create(null, e.getCause());
+
+                // filter intermediate RedisConnectionException exceptions that bloat the stack trace
+                if (e.getCause() instanceof RedisConnectionException
+                        && e.getCause().getCause() instanceof RedisConnectionException) {
+                    throw RedisConnectionException.create(context.toString(), e.getCause().getCause());
+                }
+
+                throw RedisConnectionException.create(context.toString(), e.getCause());
             }
 
-            throw RedisConnectionException.create(null, e);
+            throw RedisConnectionException.create(context.toString(), e);
         }
     }
+
+    private static <T> CompletableFuture<T> transformAsyncConnectionException(CompletionStage<T> future, Object context) {
+
+        return ConnectionFuture
+                .from(null, future.toCompletableFuture())
+                .thenCompose((v, e) -> {
+
+                    if (e != null) {
+
+                        // filter intermediate RedisConnectionException exceptions that bloat the stack trace
+                        if (e.getCause() instanceof RedisConnectionException
+                                && e.getCause().getCause() instanceof RedisConnectionException) {
+                            return Futures.failed(RedisConnectionException.create(context.toString(), e.getCause()));
+                        }
+                        return Futures.failed(RedisConnectionException.create(context.toString(), e));
+                    }
+
+                    return CompletableFuture.completedFuture(v);
+                }).toCompletableFuture();
+    }
 }
diff --git a/src/test/java/io/lettuce/core/ConnectionFutureTest.java b/src/test/java/io/lettuce/core/ConnectionFutureTest.java
new file mode 100644
index 0000000000..63c86e186c
--- /dev/null
+++ b/src/test/java/io/lettuce/core/ConnectionFutureTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+
+import org.junit.Test;
+
+import io.lettuce.core.internal.Futures;
+
+/**
+ * @author Mark Paluch
+ */
+public class ConnectionFutureTest {
+
+    @Test
+    public void shouldComposeTransformToError() {
+
+        CompletableFuture<String> foo = new CompletableFuture<>();
+
+        ConnectionFuture<Object> transformed = ConnectionFuture.from(null, foo).thenCompose((s, t) -> {
+
+            if (t != null) {
+                return Futures.failed(new IllegalStateException(t));
+            }
+            return Futures.failed(new IllegalStateException());
+        });
+
+        foo.complete("foo");
+
+        assertThat(transformed).isDone();
+        assertThat(transformed.toCompletableFuture()).isCompletedExceptionally();
+        assertThatThrownBy(transformed::join).hasRootCauseInstanceOf(IllegalStateException.class);
+    }
+
+    @Test
+    public void composeTransformShouldFailWhileTransformation() {
+
+        CompletableFuture<String> foo = new CompletableFuture<>();
+
+        ConnectionFuture<Object> transformed = ConnectionFuture.from(null, foo).thenCompose((s, t) -> {
+            throw new IllegalStateException();
+        });
+
+        foo.complete("foo");
+
+        assertThat(transformed).isDone();
+        assertThat(transformed.toCompletableFuture()).isCompletedExceptionally();
+        assertThatThrownBy(transformed::join).hasRootCauseInstanceOf(IllegalStateException.class);
+    }
+
+    @Test
+    public void composeTransformShouldFailWhileTransformationRetainOriginalException() {
+
+        CompletableFuture<String> foo = new CompletableFuture<>();
+
+        ConnectionFuture<Object> transformed = ConnectionFuture.from(null, foo).thenCompose((s, t) -> {
+            throw new IllegalStateException();
+        });
+
+        Throwable t = new Throwable();
+        foo.completeExceptionally(t);
+
+        assertThat(transformed).isDone();
+        assertThat(transformed.toCompletableFuture()).isCompletedExceptionally();
+
+        try {
+            transformed.join();
+        } catch (CompletionException e) {
+
+            assertThat(e).hasRootCauseInstanceOf(IllegalStateException.class);
+            assertThat(e.getCause()).hasSuppressedException(t);
+        }
+    }
+
+    @Test
+    public void shouldComposeWithErrorFlow() {
+
+        CompletableFuture<String> foo = new CompletableFuture<>();
+        CompletableFuture<String> exceptional = new CompletableFuture<>();
+
+        ConnectionFuture<Object> transformed1 = ConnectionFuture.from(null, foo).thenCompose((s, t) -> {
+
+            if (t != null) {
+                return Futures.failed(new IllegalStateException(t));
+            }
+            return CompletableFuture.completedFuture(s);
+        });
+
+        ConnectionFuture<Object> transformed2 = ConnectionFuture.from(null, exceptional).thenCompose((s, t) -> {
+
+            if (t != null) {
+                return Futures.failed(new IllegalStateException(t));
+            }
+            return CompletableFuture.completedFuture(s);
+        });
+
+        foo.complete("foo");
+        exceptional.completeExceptionally(new IllegalArgumentException("foo"));
+
+        assertThat(transformed1).isDone();
+        assertThat(transformed1.toCompletableFuture()).isCompletedWithValue("foo");
+
+        assertThat(transformed2).isDone();
+        assertThat(transformed2.toCompletableFuture()).isCompletedExceptionally();
+        assertThatThrownBy(transformed2::join).hasCauseInstanceOf(IllegalStateException.class).hasRootCauseInstanceOf(
+                IllegalArgumentException.class);
+    }
+}
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
index 803ed15bde..edd5eb1902 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
@@ -111,7 +111,7 @@ public void testMasterSlaveSentinelWithUnavailableSentinels() throws Exception {
             MasterSlave.connect(sentinelClient, new Utf8StringCodec(), uri);
             fail("Missing RedisConnectionException");
         } catch (RedisConnectionException e) {
-            assertThat(e.getCause()).hasCauseInstanceOf(IOException.class);
+            assertThat(e.getCause()).hasRootCauseInstanceOf(IOException.class);
         }
     }
 

From 93547271581f909cb77ac0d5c3eff0d2cfbbef71 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 25 Feb 2018 17:24:35 +0100
Subject: [PATCH 409/808] Move command write deduplication to batch write #709
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lettuce now checks for command stack duplicates in CommandHandler.writeBatch(…) by using LinkedHashSet. Duplicates occur usually in batch submissions and the check in the single command path causes additional cost that isn't necessary in the majority of cases.

Using LinkedHashSet as intermediate collection reduces contains cost from O(N^2) to constant time.
---
 .../lettuce/core/protocol/CommandHandler.java | 61 +++++++++---------
 .../core/protocol/CommandHandlerTest.java     | 45 ++++++++++----
 .../protocol/CommandHandlerBenchmark.java     | 62 +++++++++++++++++++
 .../jmh/io/lettuce/core/protocol/JmhMain.java |  4 +-
 4 files changed, 126 insertions(+), 46 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 8aab0505b9..7a400047ea 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -334,8 +334,25 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
             return;
         }
 
+        if (msg instanceof List) {
+
+            List<RedisCommand<?, ?, ?>> batch = (List<RedisCommand<?, ?, ?>>) msg;
+
+            if (batch.size() == 1) {
+
+                writeSingleCommand(ctx, batch.get(0), promise);
+                return;
+            }
+
+            writeBatch(ctx, batch, promise);
+            return;
+        }
+
         if (msg instanceof Collection) {
-            writeBatch(ctx, (Collection<RedisCommand<?, ?, ?>>) msg, promise);
+
+            Collection<RedisCommand<?, ?, ?>> batch = (Collection<RedisCommand<?, ?, ?>>) msg;
+
+            writeBatch(ctx, batch, promise);
         }
     }
 
@@ -353,25 +370,22 @@ private void writeSingleCommand(ChannelHandlerContext ctx, RedisCommand<?, ?, ?>
     private void writeBatch(ChannelHandlerContext ctx, Collection<RedisCommand<?, ?, ?>> batch, ChannelPromise promise)
             throws Exception {
 
-        Collection<RedisCommand<?, ?, ?>> toWrite = batch;
-        int commandsToWrite = 0;
+        Collection<RedisCommand<?, ?, ?>> deduplicated = new LinkedHashSet<>(batch.size(), 1);
 
-        boolean cancelledCommands = false;
         for (RedisCommand<?, ?, ?> command : batch) {
 
-            if (!isWriteable(command)) {
-                cancelledCommands = true;
-                break;
+            if (isWriteable(command) && !deduplicated.add(command)) {
+                deduplicated.remove(command);
+                command.completeExceptionally(new RedisException(
+                        "Attempting to write duplicate command that is already enqueued: " + command));
             }
-
-            commandsToWrite++;
         }
 
         try {
-            validateWrite(commandsToWrite);
+            validateWrite(deduplicated.size());
         } catch (Exception e) {
 
-            for (RedisCommand<?, ?, ?> redisCommand : toWrite) {
+            for (RedisCommand<?, ?, ?> redisCommand : deduplicated) {
                 redisCommand.completeExceptionally(e);
             }
 
@@ -379,26 +393,12 @@ private void writeBatch(ChannelHandlerContext ctx, Collection<RedisCommand<?, ?,
             return;
         }
 
-        if (cancelledCommands) {
-
-            toWrite = new ArrayList<>(batch.size());
-
-            for (RedisCommand<?, ?, ?> command : batch) {
-
-                if (!isWriteable(command)) {
-                    continue;
-                }
-
-                toWrite.add(command);
-            }
-        }
-
-        for (RedisCommand<?, ?, ?> command : toWrite) {
+        for (RedisCommand<?, ?, ?> command : deduplicated) {
             addToStack(command, promise);
         }
 
-        if (!toWrite.isEmpty()) {
-            ctx.write(toWrite, promise);
+        if (!deduplicated.isEmpty()) {
+            ctx.write(deduplicated, promise);
         }
     }
 
@@ -411,11 +411,6 @@ private void addToStack(RedisCommand<?, ?, ?> command, ChannelPromise promise) t
             if (command.getOutput() == null) {
                 // fire&forget commands are excluded from metrics
                 command.complete();
-            } else {
-
-                if (stack.contains(command)) {
-                    throw new RedisException("Attempting to write duplicate command that is already enqueued: " + command);
-                }
             }
 
             RedisCommand<?, ?, ?> redisCommand = potentiallyWrapLatencyCommand(command);
diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
index 41419fa08e..8f857e4b58 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
@@ -21,10 +21,7 @@
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Queue;
+import java.util.*;
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
@@ -43,7 +40,8 @@
 
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.ConnectionEvents;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.metrics.DefaultCommandLatencyCollector;
 import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
 import io.lettuce.core.output.StatusOutput;
@@ -61,7 +59,7 @@ public class CommandHandlerTest {
     private CommandHandler sut;
 
     private final Command<String, String, String> command = new Command<>(CommandType.APPEND, new StatusOutput<>(
-            new Utf8StringCodec()), null);
+            StringCodec.UTF8), null);
 
     @Mock
     private ChannelHandlerContext context;
@@ -293,6 +291,18 @@ public void shouldCancelCommandOnQueueBatchFailure() throws Exception {
         verify(commandMock).completeExceptionally(exception);
     }
 
+    @Test
+    public void shouldFailOnDuplicateCommands() throws Exception {
+
+        Command<String, String, String> commandMock = mock(Command.class);
+
+        ChannelPromise channelPromise = new DefaultChannelPromise(channel, ImmediateEventExecutor.INSTANCE);
+        sut.write(context, Arrays.asList(commandMock, commandMock), channelPromise);
+
+        assertThat(stack).isEmpty();
+        verify(commandMock).completeExceptionally(any(RedisException.class));
+    }
+
     @Test
     public void shouldWriteActiveCommands() throws Exception {
 
@@ -315,28 +325,41 @@ public void shouldNotWriteCancelledCommandBatch() throws Exception {
     }
 
     @Test
-    public void shouldWriteActiveCommandsInBatch() throws Exception {
+    public void shouldWriteSingleActiveCommandsInBatch() throws Exception {
 
         List<Command<String, String, String>> commands = Arrays.asList(command);
         when(promise.isVoid()).thenReturn(true);
         sut.write(context, commands, promise);
 
-        verify(context).write(commands, promise);
+        verify(context).write(command, promise);
         assertThat(stack).hasSize(1);
     }
 
+    @Test
+    public void shouldWriteActiveCommandsInBatch() throws Exception {
+
+        Command<String, String, String> anotherCommand = new Command<>(CommandType.APPEND,
+                new StatusOutput<>(StringCodec.UTF8), null);
+
+        List<Command<String, String, String>> commands = Arrays.asList(command, anotherCommand);
+        when(promise.isVoid()).thenReturn(true);
+        sut.write(context, commands, promise);
+
+        verify(context).write(any(Set.class), eq(promise));
+        assertThat(stack).hasSize(2);
+    }
+
     @Test
     @SuppressWarnings("unchecked")
     public void shouldWriteActiveCommandsInMixedBatch() throws Exception {
 
-        Command<String, String, String> command2 = new Command<>(CommandType.APPEND, new StatusOutput<>(new Utf8StringCodec()),
-                null);
+        Command<String, String, String> command2 = new Command<>(CommandType.APPEND, new StatusOutput<>(StringCodec.UTF8), null);
         command.cancel();
         when(promise.isVoid()).thenReturn(true);
 
         sut.write(context, Arrays.asList(command, command2), promise);
 
-        ArgumentCaptor<List> captor = ArgumentCaptor.forClass(List.class);
+        ArgumentCaptor<Collection> captor = ArgumentCaptor.forClass(Collection.class);
         verify(context).write(captor.capture(), any());
 
         assertThat(captor.getValue()).containsOnly(command2);
diff --git a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
index 337f4d36c5..e6f883262e 100644
--- a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
@@ -15,6 +15,12 @@
  */
 package io.lettuce.core.protocol;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
@@ -28,6 +34,7 @@
  * Benchmark for {@link CommandHandler}. Test cases:
  * <ul>
  * <li>netty (in-eventloop) writes</li>
+ * <li>netty (in-eventloop) batch writes</li>
  * </ul>
  *
  * @author Mark Paluch
@@ -43,6 +50,11 @@ public class CommandHandlerBenchmark {
 
     private CommandHandler commandHandler;
     private Command command;
+    private Command batchCommand;
+    private Collection<Command> commands1;
+    private List<Command> commands10;
+    private List<Command> commands100;
+    private List<Command> commands1000;
 
     @Setup
     public void setup() {
@@ -50,7 +62,21 @@ public void setup() {
         commandHandler = new CommandHandler(CLIENT_OPTIONS, EmptyClientResources.INSTANCE, new DefaultEndpoint(CLIENT_OPTIONS));
         command = new Command(CommandType.GET, new ValueOutput<>(CODEC), new CommandArgs(CODEC).addKey(KEY));
 
+
         commandHandler.setState(CommandHandler.LifecycleState.CONNECTED);
+
+        commands1 = Arrays.asList(command);
+        commands10 = IntStream.range(0, 10)
+                .mapToObj(i -> new Command(CommandType.GET, new ValueOutput<>(CODEC), new CommandArgs(CODEC).addKey(KEY)))
+                .collect(Collectors.toList());
+
+        commands100 = IntStream.range(0, 100)
+                .mapToObj(i -> new Command(CommandType.GET, new ValueOutput<>(CODEC), new CommandArgs(CODEC).addKey(KEY)))
+                .collect(Collectors.toList());
+
+        commands1000 = IntStream.range(0, 1000)
+                .mapToObj(i -> new Command(CommandType.GET, new ValueOutput<>(CODEC), new CommandArgs(CODEC).addKey(KEY)))
+                .collect(Collectors.toList());
     }
 
     @Benchmark
@@ -61,4 +87,40 @@ public void measureNettyWrite() throws Exception {
         // Prevent OOME
         commandHandler.getStack().clear();
     }
+
+    @Benchmark
+    public void measureNettyWriteBatch1() throws Exception {
+
+        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commands1, PROMISE);
+
+        // Prevent OOME
+        commandHandler.getStack().clear();
+    }
+
+    @Benchmark
+    public void measureNettyWriteBatch10() throws Exception {
+
+        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commands10, PROMISE);
+
+        // Prevent OOME
+        commandHandler.getStack().clear();
+    }
+
+    @Benchmark
+    public void measureNettyWriteBatch100() throws Exception {
+
+        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commands100, PROMISE);
+
+        // Prevent OOME
+        commandHandler.getStack().clear();
+    }
+
+    @Benchmark
+    public void measureNettyWriteBatch1000() throws Exception {
+
+        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commands1000, PROMISE);
+
+        // Prevent OOME
+        commandHandler.getStack().clear();
+    }
 }
diff --git a/src/test/jmh/io/lettuce/core/protocol/JmhMain.java b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
index 4ea86e8342..978e655676 100644
--- a/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
@@ -37,12 +37,12 @@ public static void main(String... args) throws IOException, RunnerException {
         // run selectively
         // runCommandBenchmark();
         runCommandHandlerBenchmark();
-        runRedisEndpointBenchmark();
+        // runRedisEndpointBenchmark();
         // runRedisStateMachineBenchmark();
         // runCommandEncoderBenchmark();
 
         // or all
-        //runBenchmarks();
+        // runBenchmarks();
     }
 
     private static void runBenchmarks() throws RunnerException {

From cf7f643e39f9788250a6720a6227f306303ca3a5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 1 Mar 2018 15:49:07 +0100
Subject: [PATCH 410/808] =?UTF-8?q?Fix=20documentation=20for=20RedisPubSub?=
 =?UTF-8?q?ReactiveCommands[p][un]subscribe(=E2=80=A6)=20#717?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reactive/RedisPubSubReactiveCommands.java | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java
index b1262b97d1..1f78d96cb2 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java
@@ -77,34 +77,38 @@ public interface RedisPubSubReactiveCommands<K, V> extends RedisReactiveCommands
     Flux<ChannelMessage<K, V>> observeChannels(FluxSink.OverflowStrategy overflowStrategy);
 
     /**
-     * Listen for messages published to channels matching the given patterns.
+     * Listen for messages published to channels matching the given patterns. The {@link Mono} completes without a result as
+     * soon as the pattern subscription is registered.
      *
-     * @param patterns the patterns
-     * @return Flux&lt;Success&gt; Flux for {@code psubscribe} command
+     * @param patterns the patterns.
+     * @return Mono&lt;Void&gt; Mono for {@code psubscribe} command.
      */
     Mono<Void> psubscribe(K... patterns);
 
     /**
-     * Stop listening for messages posted to channels matching the given patterns.
+     * Stop listening for messages posted to channels matching the given patterns. The {@link Mono} completes without a result
+     * as soon as the pattern subscription is unregistered.
      *
-     * @param patterns the patterns
-     * @return Flux&lt;Success&gt; Flux for {@code punsubscribe} command
+     * @param patterns the patterns.
+     * @return Mono&lt;Void&gt; Mono for {@code punsubscribe} command.
      */
     Mono<Void> punsubscribe(K... patterns);
 
     /**
-     * Listen for messages published to the given channels.
+     * Listen for messages published to the given channels. The {@link Mono} completes without a result as soon as the *
+     * subscription is registered.
      *
-     * @param channels the channels
-     * @return Flux&lt;Success&gt; Flux for {@code subscribe} command
+     * @param channels the channels.
+     * @return Mono&lt;Void&gt; Mono for {@code subscribe} command.
      */
     Mono<Void> subscribe(K... channels);
 
     /**
-     * Stop listening for messages posted to the given channels.
+     * Stop listening for messages posted to the given channels. The {@link Mono} completes without a result as soon as the
+     * subscription is unregistered.
      *
-     * @param channels the channels
-     * @return Flux&lt;Success&gt; Flux for {@code unsubscribe} command.
+     * @param channels the channels.
+     * @return Mono&lt;Void&gt; Mono for {@code unsubscribe} command.
      */
     Mono<Void> unsubscribe(K... channels);
 

From 49c83a5f7e9febc3289fa75052a4bf82c19c62c2 Mon Sep 17 00:00:00 2001
From: Christian Weitendorf <weitendo@adobe.com>
Date: Mon, 5 Mar 2018 13:11:04 +0100
Subject: [PATCH 411/808] Fix connection leak in cluster topology refresh
 implementation #721

Make sure topology/Connections class closes all referenced connections when close() is called.

Original pull request: #722.
---
 .../core/cluster/topology/Connections.java    |  7 ++--
 .../topology/ClusterTopologyRefreshTest.java  | 16 ++++++++++
 .../cluster/topology/ConnectionsTest.java     | 32 +++++++++++++++++++
 3 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/cluster/topology/ConnectionsTest.java

diff --git a/src/main/java/io/lettuce/core/cluster/topology/Connections.java b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
index eb58ed6385..35d4e4ac1b 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Connections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
@@ -147,15 +147,16 @@ private boolean hasConnections() {
 
     private Collection<StatefulRedisConnection<String, String>> drainConnections() {
 
+        Map<RedisURI, StatefulRedisConnection<String, String>> drainedConnections;
         synchronized (this.connections) {
 
-            Map<RedisURI, StatefulRedisConnection<String, String>> connections = new HashMap<>(this.connections);
-            connections.forEach((k, v) -> {
+            drainedConnections = new HashMap<>(this.connections);
+            drainedConnections.forEach((k, v) -> {
                 this.connections.remove(k);
             });
         }
 
-        return connections.values();
+        return drainedConnections.values();
     }
 
     /**
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
index 8242cff5f0..7b2207d79b 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
@@ -322,6 +322,22 @@ public void shouldNotFailOnDuplicateSeedNodes() {
         verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381)));
     }
 
+    @Test
+    public void shouldCloseConnections() {
+
+        List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380), RedisURI.create("127.0.0.1", 7381));
+
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
+            .thenReturn(completedFuture((StatefulRedisConnection) connection1));
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
+            .thenReturn(completedFuture((StatefulRedisConnection) connection2));
+
+        sut.loadViews(seed, true);
+
+        verify(connection1).close();
+        verify(connection2).close();
+    }
+
     @Test
     public void undiscoveredAdditionalNodesShouldBeLastUsingClientCount() {
 
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ConnectionsTest.java b/src/test/java/io/lettuce/core/cluster/topology/ConnectionsTest.java
new file mode 100644
index 0000000000..1e63e38c58
--- /dev/null
+++ b/src/test/java/io/lettuce/core/cluster/topology/ConnectionsTest.java
@@ -0,0 +1,32 @@
+package io.lettuce.core.cluster.topology;
+
+import static org.mockito.Mockito.verify;
+
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ConnectionsTest {
+
+    @Mock
+    private StatefulRedisConnection<String, String> connection1;
+
+    @Mock
+    private StatefulRedisConnection<String, String> connection2;
+
+    @Test
+    public void shouldCloseAllConnections() {
+        final Connections iut = new Connections();
+        iut.addConnection(RedisURI.create("127.0.0.1", 7380), connection1);
+        iut.addConnection(RedisURI.create("127.0.0.1", 7381), connection2);
+
+        iut.close();
+
+        verify(connection1).close();
+        verify(connection2).close();
+    }
+}
\ No newline at end of file

From 3b7261474cf1784f78d7183ec74fe4fc3943e40e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 6 Mar 2018 10:23:51 +0100
Subject: [PATCH 412/808] Polishing #721

Adapt to async connection handling. Add author tags. Add test.

Original pull request: #722
---
 .../core/cluster/topology/Connections.java    | 37 ++++++-----
 .../topology/ClusterTopologyRefreshTest.java  | 20 +++---
 .../cluster/topology/ConnectionsTest.java     | 62 ++++++++++++++++---
 3 files changed, 85 insertions(+), 34 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/topology/Connections.java b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
index 35d4e4ac1b..4dddcce32c 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Connections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
@@ -15,10 +15,8 @@
  */
 package io.lettuce.core.cluster.topology;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -31,6 +29,7 @@
 
 /**
  * @author Mark Paluch
+ * @author Christian Weitendorf
  */
 class Connections {
 
@@ -53,19 +52,19 @@ private Connections(Map<RedisURI, StatefulRedisConnection<String, String>> conne
      */
     public void addConnection(RedisURI redisURI, StatefulRedisConnection<String, String> connection) {
 
-        if (closed) { // fastpath
-            connection.close();
+        if (this.closed) { // fastpath
+            connection.closeAsync();
             return;
         }
 
-        synchronized (connections) {
+        synchronized (this.connections) {
 
-            if (closed) {
-                connection.close();
+            if (this.closed) {
+                connection.closeAsync();
                 return;
             }
 
-            connections.put(redisURI, connection);
+            this.connections.put(redisURI, connection);
         }
     }
 
@@ -73,8 +72,8 @@ public void addConnection(RedisURI redisURI, StatefulRedisConnection<String, Str
      * @return {@literal true} if no connections present.
      */
     public boolean isEmpty() {
-        synchronized (connections) {
-            return connections.isEmpty();
+        synchronized (this.connections) {
+            return this.connections.isEmpty();
         }
     }
 
@@ -87,7 +86,7 @@ public Requests requestTopology() {
 
         Requests requests = new Requests();
 
-        for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : connections.entrySet()) {
+        for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : this.connections.entrySet()) {
 
             CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.NODES);
             Command<String, String, String> command = new Command<>(CommandType.CLUSTER, new StatusOutput<>(StringCodec.UTF8),
@@ -110,7 +109,7 @@ public Requests requestClients() {
 
         Requests requests = new Requests();
 
-        for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : connections.entrySet()) {
+        for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : this.connections.entrySet()) {
 
             CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.LIST);
             Command<String, String, String> command = new Command<>(CommandType.CLIENT, new StatusOutput<>(StringCodec.UTF8),
@@ -131,16 +130,19 @@ public void close() {
 
         this.closed = true;
 
+        List<CompletableFuture<?>> closeFutures = new ArrayList<>();
         while (hasConnections()) {
-
             for (StatefulRedisConnection<String, String> connection : drainConnections()) {
-                connection.closeAsync();
+                closeFutures.add(connection.closeAsync());
             }
         }
+
+        CompletableFuture.allOf(closeFutures.toArray(new CompletableFuture[0])).join();
     }
 
     private boolean hasConnections() {
-        synchronized (connections) {
+
+        synchronized (this.connections) {
             return !this.connections.isEmpty();
         }
     }
@@ -148,6 +150,7 @@ private boolean hasConnections() {
     private Collection<StatefulRedisConnection<String, String>> drainConnections() {
 
         Map<RedisURI, StatefulRedisConnection<String, String>> drainedConnections;
+
         synchronized (this.connections) {
 
             drainedConnections = new HashMap<>(this.connections);
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
index 7b2207d79b..e082575aba 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
@@ -53,7 +53,9 @@
 
 /**
  * @author Mark Paluch
+ * @author Christian Weitendorf
  */
+@SuppressWarnings("unchecked")
 @RunWith(MockitoJUnitRunner.class)
 public class ClusterTopologyRefreshTest {
 
@@ -96,6 +98,8 @@ public void before() {
         when(clientResources.dnsResolver()).thenReturn(DnsResolvers.JVM_DEFAULT);
         when(connection1.async()).thenReturn(asyncCommands1);
         when(connection2.async()).thenReturn(asyncCommands2);
+        when(connection1.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
+        when(connection2.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
 
         when(connection1.dispatch(any(RedisCommand.class))).thenAnswer(invocation -> {
 
@@ -277,7 +281,7 @@ public void shouldFailIfNoNodeConnects() {
     @Test
     public void shouldShouldDiscoverNodes() {
 
-        List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
+        List<RedisURI> seed = Collections.singletonList(RedisURI.create("127.0.0.1", 7380));
 
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection1));
@@ -293,7 +297,7 @@ public void shouldShouldDiscoverNodes() {
     @Test
     public void shouldShouldNotDiscoverNodes() {
 
-        List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
+        List<RedisURI> seed = Collections.singletonList(RedisURI.create("127.0.0.1", 7380));
 
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection1));
@@ -334,14 +338,14 @@ public void shouldCloseConnections() {
 
         sut.loadViews(seed, true);
 
-        verify(connection1).close();
-        verify(connection2).close();
+        verify(connection1).closeAsync();
+        verify(connection2).closeAsync();
     }
 
     @Test
     public void undiscoveredAdditionalNodesShouldBeLastUsingClientCount() {
 
-        List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
+        List<RedisURI> seed = Collections.singletonList(RedisURI.create("127.0.0.1", 7380));
 
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection1));
@@ -359,7 +363,7 @@ public void undiscoveredAdditionalNodesShouldBeLastUsingClientCount() {
     @Test
     public void discoveredAdditionalNodesShouldBeOrderedUsingClientCount() {
 
-        List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
+        List<RedisURI> seed = Collections.singletonList(RedisURI.create("127.0.0.1", 7380));
 
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection1));
@@ -379,7 +383,7 @@ public void discoveredAdditionalNodesShouldBeOrderedUsingClientCount() {
     @Test
     public void undiscoveredAdditionalNodesShouldBeLastUsingLatency() {
 
-        List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
+        List<RedisURI> seed = Collections.singletonList(RedisURI.create("127.0.0.1", 7380));
 
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection1));
@@ -397,7 +401,7 @@ public void undiscoveredAdditionalNodesShouldBeLastUsingLatency() {
     @Test
     public void discoveredAdditionalNodesShouldBeOrderedUsingLatency() {
 
-        List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380));
+        List<RedisURI> seed = Collections.singletonList(RedisURI.create("127.0.0.1", 7380));
 
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection1));
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ConnectionsTest.java b/src/test/java/io/lettuce/core/cluster/topology/ConnectionsTest.java
index 1e63e38c58..6be149a1f7 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ConnectionsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ConnectionsTest.java
@@ -1,14 +1,39 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.lettuce.core.cluster.topology;
 
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.StatefulRedisConnection;
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+
+/**
+ * @author Christian Weitendorf
+ * @author Mark Paluch
+ */
 @RunWith(MockitoJUnitRunner.class)
 public class ConnectionsTest {
 
@@ -18,15 +43,34 @@ public class ConnectionsTest {
     @Mock
     private StatefulRedisConnection<String, String> connection2;
 
+    @Before
+    public void before() throws Exception {
+
+        when(connection1.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
+        when(connection2.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
+    }
+
     @Test
     public void shouldCloseAllConnections() {
-        final Connections iut = new Connections();
-        iut.addConnection(RedisURI.create("127.0.0.1", 7380), connection1);
-        iut.addConnection(RedisURI.create("127.0.0.1", 7381), connection2);
 
-        iut.close();
+        Connections sut = new Connections();
+        sut.addConnection(RedisURI.create("127.0.0.1", 7380), connection1);
+        sut.addConnection(RedisURI.create("127.0.0.1", 7381), connection2);
+
+        sut.close();
+
+        verify(connection1).closeAsync();
+        verify(connection2).closeAsync();
+    }
+
+    @Test
+    public void shouldCloseAllConnectionsAfterCloseSignal() {
+
+        Connections sut = new Connections();
+        sut.close();
+        verifyZeroInteractions(connection1);
 
-        verify(connection1).close();
-        verify(connection2).close();
+        sut.addConnection(RedisURI.create("127.0.0.1", 7381), connection1);
+        verify(connection1).closeAsync();
     }
-}
\ No newline at end of file
+}

From 0ae34d4f5ec0f9944f275c2f1e4eb4baa996c4f1 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 6 Mar 2018 10:45:05 +0100
Subject: [PATCH 413/808] Ensure Master/Slave topology refresh connections are
 closed after timeout #723

Lettuce now closes Master/Slave topology refresh connections if connections complete the connect progress after the actual refresh finishes. This could happen if a connection finished its connect (slow connect) after the synchronization timeout and after all topology views were obtained so the process already ran its cleanup.
---
 .../lettuce/core/masterslave/Connections.java | 36 +++++++----
 .../core/masterslave/ConnectionsTest.java     | 61 +++++++++++++++++++
 2 files changed, 84 insertions(+), 13 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/masterslave/ConnectionsTest.java

diff --git a/src/main/java/io/lettuce/core/masterslave/Connections.java b/src/main/java/io/lettuce/core/masterslave/Connections.java
index 6a5b68843c..317941a89f 100644
--- a/src/main/java/io/lettuce/core/masterslave/Connections.java
+++ b/src/main/java/io/lettuce/core/masterslave/Connections.java
@@ -55,6 +55,8 @@ class Connections extends CompletableEventLatchSupport<Tuple2<RedisURI, Stateful
     private final List<Throwable> exceptions = new CopyOnWriteArrayList<>();
     private final List<RedisNodeDescription> nodes;
 
+    private volatile boolean closed = false;
+
     public Connections(int expectedConnectionCount, List<RedisNodeDescription> nodes) {
         super(expectedConnectionCount);
         this.nodes = nodes;
@@ -63,14 +65,19 @@ public Connections(int expectedConnectionCount, List<RedisNodeDescription> nodes
     @Override
     protected void onAccept(Tuple2<RedisURI, StatefulRedisConnection<String, String>> value) {
 
-        synchronized (connections) {
-            connections.put(value.getT1(), value.getT2());
+        if (this.closed) {
+            value.getT2().closeAsync();
+            return;
+        }
+
+        synchronized (this.connections) {
+            this.connections.put(value.getT1(), value.getT2());
         }
     }
 
     @Override
     protected void onError(Throwable value) {
-        exceptions.add(value);
+        this.exceptions.add(value);
     }
 
     @Override
@@ -86,11 +93,11 @@ protected void onDrop(Throwable value) {
     @Override
     protected void onEmit(Emission<Connections> emission) {
 
-        if (getExpectedCount() != 0 && connections.isEmpty() && !exceptions.isEmpty()) {
+        if (getExpectedCount() != 0 && this.connections.isEmpty() && !this.exceptions.isEmpty()) {
 
             RedisConnectionException collector = new RedisConnectionException(
                     "Unable to establish a connection to Redis Cluster");
-            exceptions.forEach(collector::addSuppressed);
+            this.exceptions.forEach(collector::addSuppressed);
 
             emission.error(collector);
         } else {
@@ -102,8 +109,8 @@ protected void onEmit(Emission<Connections> emission) {
      * @return {@literal true} if no connections present.
      */
     public boolean isEmpty() {
-        synchronized (connections) {
-            return connections.isEmpty();
+        synchronized (this.connections) {
+            return this.connections.isEmpty();
         }
     }
 
@@ -114,8 +121,9 @@ public boolean isEmpty() {
      */
     public Requests requestPing() {
 
-        Set<Map.Entry<RedisURI, StatefulRedisConnection<String, String>>> entries = new LinkedHashSet<>(connections.entrySet());
-        Requests requests = new Requests(entries.size(), nodes);
+        Set<Map.Entry<RedisURI, StatefulRedisConnection<String, String>>> entries = new LinkedHashSet<>(
+                this.connections.entrySet());
+        Requests requests = new Requests(entries.size(), this.nodes);
 
         for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : entries) {
 
@@ -136,17 +144,19 @@ public Requests requestPing() {
      */
     public CompletableFuture<Void> closeAsync() {
 
-        List<CompletableFuture> close = new ArrayList<>(connections.size());
-        List<RedisURI> toRemove = new ArrayList<>(connections.size());
+        List<CompletableFuture> close = new ArrayList<>(this.connections.size());
+        List<RedisURI> toRemove = new ArrayList<>(this.connections.size());
+
+        this.closed = true;
 
-        for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : connections.entrySet()) {
+        for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : this.connections.entrySet()) {
 
             toRemove.add(entry.getKey());
             close.add(entry.getValue().closeAsync());
         }
 
         for (RedisURI redisURI : toRemove) {
-            connections.remove(redisURI);
+            this.connections.remove(redisURI);
         }
 
         return CompletableFuture.allOf(close.toArray(new CompletableFuture[0]));
diff --git a/src/test/java/io/lettuce/core/masterslave/ConnectionsTest.java b/src/test/java/io/lettuce/core/masterslave/ConnectionsTest.java
new file mode 100644
index 0000000000..c27642b24f
--- /dev/null
+++ b/src/test/java/io/lettuce/core/masterslave/ConnectionsTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterslave;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import reactor.util.function.Tuples;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+
+/**
+ * @author Mark Paluch
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class ConnectionsTest {
+
+    @Mock
+    private StatefulRedisConnection<String, String> connection1;
+
+    @Before
+    public void before() {
+        when(connection1.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
+    }
+
+    @Test
+    public void shouldCloseConnectionCompletingAfterCloseSignal() {
+
+        Connections connections = new Connections(5, Collections.emptyList());
+        connections.closeAsync();
+
+        verifyZeroInteractions(connection1);
+
+        connections.onAccept(Tuples.of(RedisURI.create("localhost", 6379), connection1));
+
+        verify(connection1).closeAsync();
+    }
+}

From 472f2961d2fa30d2cd8ec1f4f82da4454b03b736 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 6 Mar 2018 11:07:21 +0100
Subject: [PATCH 414/808] Polishing

Improve reactive Pub/Sub test synchronization.
---
 .../core/pubsub/PubSubReactiveTest.java       | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
index 27a9a3e767..1267084d94 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
@@ -225,7 +225,7 @@ public void pubsubChannels() {
     @Test
     public void pubsubMultipleChannels() {
 
-        pubsub.subscribe(channel, "channel1", "channel3").subscribe();
+        StepVerifier.create(pubsub.subscribe(channel, "channel1", "channel3")).verifyComplete();
 
         StepVerifier.create(pubsub2.pubsubChannels().collectList())
                 .consumeNextWith(actual -> assertThat(actual).contains(channel, "channel1", "channel3")).verifyComplete();
@@ -234,7 +234,7 @@ public void pubsubMultipleChannels() {
     @Test
     public void pubsubChannelsWithArg() {
 
-        pubsub.subscribe(channel).subscribe();
+        StepVerifier.create(pubsub.subscribe(channel)).verifyComplete();
         Wait.untilTrue(() -> mono(pubsub2.pubsubChannels(pattern).filter(s -> channel.equals(s))) != null).waitOrTimeout();
 
         String result = mono(pubsub2.pubsubChannels(pattern).filter(s -> channel.equals(s)));
@@ -244,7 +244,8 @@ public void pubsubChannelsWithArg() {
     @Test
     public void pubsubNumsub() {
 
-        pubsub.subscribe(channel).subscribe();
+        StepVerifier.create(pubsub.subscribe(channel)).verifyComplete();
+
         Wait.untilEquals(1, () -> block(pubsub2.pubsubNumsub(channel)).size()).waitOrTimeout();
 
         Map<String, Long> result = block(pubsub2.pubsubNumsub(channel));
@@ -257,7 +258,7 @@ public void pubsubNumpat() {
 
         Wait.untilEquals(0L, () -> block(pubsub2.pubsubNumpat())).waitOrTimeout();
 
-        pubsub.psubscribe(pattern).subscribe();
+        StepVerifier.create(pubsub.psubscribe(pattern)).verifyComplete();
         Wait.untilEquals(1L, () -> redis.pubsubNumpat()).waitOrTimeout();
 
         Long result = block(pubsub2.pubsubNumpat());
@@ -267,7 +268,7 @@ public void pubsubNumpat() {
     @Test(timeout = 2000)
     public void punsubscribe() throws Exception {
 
-        pubsub.punsubscribe(pattern).subscribe();
+        StepVerifier.create(pubsub.punsubscribe(pattern)).verifyComplete();
         assertThat(patterns.take()).isEqualTo(pattern);
         assertThat((long) counts.take()).isEqualTo(0);
 
@@ -276,7 +277,7 @@ public void punsubscribe() throws Exception {
     @Test(timeout = 2000)
     public void subscribe() throws Exception {
 
-        pubsub.subscribe(channel).subscribe();
+        StepVerifier.create(pubsub.subscribe(channel)).verifyComplete();
         assertThat(channels.take()).isEqualTo(channel);
         assertThat((long) counts.take()).isGreaterThan(0);
     }
@@ -284,7 +285,7 @@ public void subscribe() throws Exception {
     @Test(timeout = 2000)
     public void unsubscribe() throws Exception {
 
-        pubsub.unsubscribe(channel).subscribe();
+        StepVerifier.create(pubsub.unsubscribe(channel)).verifyComplete();
         assertThat(channels.take()).isEqualTo(channel);
         assertThat((long) counts.take()).isEqualTo(0);
 
@@ -315,7 +316,7 @@ public void utf8Channel() throws Exception {
         block(pubsub.subscribe(channel));
         assertThat(channels.take()).isEqualTo(channel);
 
-        pubsub2.publish(channel, message).subscribe();
+        StepVerifier.create(pubsub2.publish(channel, message)).expectNextCount(1).verifyComplete();
         assertThat(channels.take()).isEqualTo(channel);
         assertThat(messages.take()).isEqualTo(message);
     }
@@ -323,7 +324,7 @@ public void utf8Channel() throws Exception {
     @Test(timeout = 2000)
     public void resubscribeChannelsOnReconnect() throws Exception {
 
-        pubsub.subscribe(channel).subscribe();
+        StepVerifier.create(pubsub.subscribe(channel)).verifyComplete();
         assertThat(channels.take()).isEqualTo(channel);
         assertThat((long) counts.take()).isEqualTo(1);
 
@@ -341,7 +342,7 @@ public void resubscribeChannelsOnReconnect() throws Exception {
     @Test(timeout = 2000)
     public void resubscribePatternsOnReconnect() throws Exception {
 
-        pubsub.psubscribe(pattern).subscribe();
+        StepVerifier.create(pubsub.psubscribe(pattern)).verifyComplete();
         assertThat(patterns.take()).isEqualTo(pattern);
         assertThat((long) counts.take()).isEqualTo(1);
 
@@ -352,7 +353,7 @@ public void resubscribePatternsOnReconnect() throws Exception {
 
         Wait.untilTrue(pubsub::isOpen).waitOrTimeout();
 
-        pubsub2.publish(channel, message).subscribe();
+        StepVerifier.create(pubsub2.publish(channel, message)).expectNextCount(1).verifyComplete();
         assertThat(channels.take()).isEqualTo(channel);
         assertThat(messages.take()).isEqualTo(message);
     }
@@ -377,14 +378,14 @@ public void unsubscribed(String channel, long count) {
         };
 
         pubsub.getStatefulConnection().addListener(adapter);
-        pubsub.subscribe(channel).subscribe();
-        pubsub.psubscribe(pattern).subscribe();
+        StepVerifier.create(pubsub.subscribe(channel)).verifyComplete();
+        StepVerifier.create(pubsub.psubscribe(pattern)).verifyComplete();
 
         assertThat((long) localCounts.take()).isEqualTo(1L);
 
-        pubsub2.publish(channel, message).subscribe();
-        pubsub.punsubscribe(pattern).subscribe();
-        pubsub.unsubscribe(channel).subscribe();
+        StepVerifier.create(pubsub2.publish(channel, message)).expectNextCount(1).verifyComplete();
+        StepVerifier.create(pubsub.punsubscribe(pattern)).verifyComplete();
+        StepVerifier.create(pubsub.unsubscribe(channel)).verifyComplete();
 
         assertThat((long) localCounts.take()).isEqualTo(0L);
     }
@@ -392,16 +393,16 @@ public void unsubscribed(String channel, long count) {
     @Test(timeout = 2000)
     public void removeListener() throws Exception {
 
-        pubsub.subscribe(channel).subscribe();
+        StepVerifier.create(pubsub.subscribe(channel)).verifyComplete();
         assertThat(channels.take()).isEqualTo(channel);
 
-        pubsub2.publish(channel, message).subscribe();
+        StepVerifier.create(pubsub2.publish(channel, message)).expectNextCount(1).verifyComplete();
         assertThat(channels.take()).isEqualTo(channel);
         assertThat(messages.take()).isEqualTo(message);
 
         pubsub.getStatefulConnection().removeListener(this);
 
-        pubsub2.publish(channel, message).subscribe();
+        StepVerifier.create(pubsub2.publish(channel, message)).expectNextCount(1).verifyComplete();
         assertThat(channels.poll(10, TimeUnit.MILLISECONDS)).isNull();
         assertThat(messages.poll(10, TimeUnit.MILLISECONDS)).isNull();
     }

From d740e34362ee1579318f66ec01ab807fc868410f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 9 Mar 2018 14:44:04 +0100
Subject: [PATCH 415/808] Complete transactional commands on first Exception
 #719

Transactional commands now complete exceptionally on the first exception they get completed with. This change allows eager completion without requiring an additional Redis response.

Transactional commands expect two responses: QUEUED and the actual response from the EXEC call hence completion is guarded to expect two completions. Previously, exception responses also expected two completions although a command could already fail upon encoding.
---
 .../lettuce/core/protocol/AsyncCommand.java   |  4 +-
 .../protocol/TransactionalCommandTest.java    | 42 +++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/io/lettuce/core/protocol/TransactionalCommandTest.java

diff --git a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
index 0721577c53..542cc6f9c2 100644
--- a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
@@ -125,7 +125,9 @@ protected void completeResult() {
     @Override
     public boolean completeExceptionally(Throwable ex) {
         boolean result = false;
-        if (COUNT_UPDATER.decrementAndGet(this) == 0) {
+
+        int ref = COUNT_UPDATER.get(this);
+        if (ref > 0 && COUNT_UPDATER.compareAndSet(this, ref, 0)) {
             result = doCompleteExceptionally(ex);
         }
         return result;
diff --git a/src/test/java/io/lettuce/core/protocol/TransactionalCommandTest.java b/src/test/java/io/lettuce/core/protocol/TransactionalCommandTest.java
new file mode 100644
index 0000000000..7d8cb3d707
--- /dev/null
+++ b/src/test/java/io/lettuce/core/protocol/TransactionalCommandTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.protocol;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+
+import io.lettuce.core.RedisException;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.output.StatusOutput;
+
+/**
+ * @author Mark Paluch
+ */
+public class TransactionalCommandTest {
+
+    @Test
+    public void shouldCompleteOnException() {
+
+        RedisCommand<String, String, String> inner = new Command<>(CommandType.SET, new StatusOutput<>(StringCodec.UTF8));
+
+        TransactionalCommand<String, String, String> command = new TransactionalCommand<>(new AsyncCommand<>(inner));
+
+        command.completeExceptionally(new RedisException("foo"));
+
+        assertThat(command).isCompletedExceptionally();
+    }
+}

From 87babad2930a20001ec094309d7440007c4c65ff Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 9 Mar 2018 16:12:39 +0100
Subject: [PATCH 416/808] Create write promise per command #729
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lettuce now writes each command with its own write call to create individual write promises. This allows early decoding of commands and track individual status of the write as the write future completes after writing the individual, encoded command

Previously, all commands were added as part of a single write which can execute already commands on Redis while the command buffer wasn't written entirely (local buffer full, write spin exceeded).

Splitting commands introduces an additional overhead of 0.8µs (800ns) per command.
---
 .../core/protocol/DefaultEndpoint.java        | 62 ++++++++++---------
 .../core/protocol/DefaultEndpointTest.java    | 20 ++++--
 src/test/jmh/io/lettuce/core/JmhMain.java     | 16 ++++-
 3 files changed, 64 insertions(+), 34 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index 25c8a6fd26..fd0d2d2f71 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -125,7 +125,7 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
             if (autoFlushCommands) {
 
                 if (isConnected()) {
-                    writeToChannel(command);
+                    writeToChannelAndFlush(command);
                 } else {
                     writeToDisconnectedBuffer(command);
                 }
@@ -157,7 +157,7 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
             if (autoFlushCommands) {
 
                 if (isConnected()) {
-                    writeToChannel(commands);
+                    writeToChannelAndFlush(commands);
                 } else {
                     writeToDisconnectedBuffer(commands);
                 }
@@ -261,11 +261,11 @@ private void writeToDisconnectedBuffer(RedisCommand<?, ?, ?> command) {
         commandBuffer.add(command);
     }
 
-    private void writeToChannel(RedisCommand<?, ?, ?> command) {
+    private void writeToChannelAndFlush(RedisCommand<?, ?, ?> command) {
 
         QUEUE_SIZE.incrementAndGet(this);
 
-        ChannelFuture channelFuture = writeAndFlush(command);
+        ChannelFuture channelFuture = channelWriteAndFlush(command);
 
         if (reliability == Reliability.AT_MOST_ONCE) {
             // cancel on exceptions and remove from queue, because there is no housekeeping
@@ -278,39 +278,54 @@ private void writeToChannel(RedisCommand<?, ?, ?> command) {
         }
     }
 
-    private void writeToChannel(Collection<? extends RedisCommand<?, ?, ?>> commands) {
+    private void writeToChannelAndFlush(Collection<? extends RedisCommand<?, ?, ?>> commands) {
 
         QUEUE_SIZE.addAndGet(this, commands.size());
 
-        ChannelFuture channelFuture = writeAndFlush(commands);
-
         if (reliability == Reliability.AT_MOST_ONCE) {
+
             // cancel on exceptions and remove from queue, because there is no housekeeping
-            channelFuture.addListener(new AtMostOnceWriteListener(commands));
+            for (RedisCommand<?, ?, ?> command : commands) {
+                channelWrite(command).addListener(new AtMostOnceWriteListener(command));
+            }
         }
 
         if (reliability == Reliability.AT_LEAST_ONCE) {
+
             // commands are ok to stay within the queue, reconnect will retrigger them
-            channelFuture.addListener(new RetryListener(commands));
+            for (RedisCommand<?, ?, ?> command : commands) {
+                channelWrite(command).addListener(new AtMostOnceWriteListener(command));
+            }
         }
+
+        channelFlush();
     }
 
-    private ChannelFuture writeAndFlush(RedisCommand<?, ?, ?> command) {
+    private void channelFlush() {
 
         if (debugEnabled) {
-            logger.debug("{} write() writeAndFlush command {}", logPrefix(), command);
+            logger.debug("{} write() channelFlush", logPrefix());
         }
 
-        return channel.writeAndFlush(command);
+        channel.flush();
     }
 
-    private ChannelFuture writeAndFlush(Collection<? extends RedisCommand<?, ?, ?>> commands) {
+    private ChannelFuture channelWrite(RedisCommand<?, ?, ?> command) {
 
         if (debugEnabled) {
-            logger.debug("{} write() writeAndFlush commands {}", logPrefix(), commands);
+            logger.debug("{} write() channelWrite command {}", logPrefix(), command);
         }
 
-        return channel.writeAndFlush(commands);
+        return channel.write(command);
+    }
+
+    private ChannelFuture channelWriteAndFlush(RedisCommand<?, ?, ?> command) {
+
+        if (debugEnabled) {
+            logger.debug("{} write() writeAndFlush command {}", logPrefix(), command);
+        }
+
+        return channel.writeAndFlush(command);
     }
 
     private boolean isRejectCommand() {
@@ -462,20 +477,7 @@ private void flushCommands(Queue<RedisCommand<?, ?, ?>> queue) {
             }
 
             if (!commands.isEmpty()) {
-
-                QUEUE_SIZE.addAndGet(this, commands.size());
-
-                ChannelFuture channelFuture = writeAndFlush(commands);
-
-                if (reliability == Reliability.AT_MOST_ONCE) {
-                    // cancel on exceptions and remove from queue, because there is no housekeeping
-                    channelFuture.addListener(new AtMostOnceWriteListener(commands));
-                }
-
-                if (reliability == Reliability.AT_LEAST_ONCE) {
-                    // commands are ok to stay within the queue, reconnect will retrigger them
-                    channelFuture.addListener(new RetryListener(commands));
-                }
+                writeToChannelAndFlush(commands);
             }
         }
     }
@@ -772,6 +774,8 @@ private class RetryListener extends ListenerSupport implements GenericFutureList
         @Override
         public void operationComplete(Future<Void> future) throws Exception {
 
+            logger.debug("operationComplete");
+
             Throwable cause = future.cause();
 
             boolean success = future.isSuccess();
diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
index 611ff6852a..ec9030bcaf 100644
--- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
@@ -24,7 +24,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Queue;
 import java.util.concurrent.atomic.AtomicLong;
@@ -64,7 +63,7 @@ public class DefaultEndpointTest {
 
     private DefaultEndpoint sut;
 
-    private final Command<String, String, String> command = new Command<>(CommandType.APPEND, new StatusOutput<String, String>(
+    private final Command<String, String, String> command = new Command<>(CommandType.APPEND, new StatusOutput<>(
             new Utf8StringCodec()), null);
 
     @Mock
@@ -106,6 +105,17 @@ public void before() {
             return new DefaultChannelPromise(channel);
         });
 
+        when(channel.write(any())).thenAnswer(invocation -> {
+            if (invocation.getArguments()[0] instanceof RedisCommand) {
+                queue.add((RedisCommand) invocation.getArguments()[0]);
+            }
+
+            if (invocation.getArguments()[0] instanceof Collection) {
+                queue.addAll((Collection) invocation.getArguments()[0]);
+            }
+            return new DefaultChannelPromise(channel);
+        });
+
         sut = new DefaultEndpoint(ClientOptions.create());
         sut.setConnectionFacade(connectionFacade);
     }
@@ -186,7 +196,7 @@ public void notifyDrainQueuedCommandsShouldBufferCommands() {
         sut.notifyDrainQueuedCommands(() -> q);
 
         assertThat(ConnectionTestUtil.getDisconnectedBuffer(sut)).contains(command);
-        verify(channel, never()).writeAndFlush(any());
+        verify(channel, never()).write(any());
     }
 
     @Test
@@ -200,7 +210,9 @@ public void notifyDrainQueuedCommandsShouldWriteCommands() {
         sut.notifyChannelActive(channel);
         sut.notifyDrainQueuedCommands(() -> q);
 
-        verify(channel).writeAndFlush(eq(Arrays.asList(command)));
+        verify(channel).write(command);
+        verify(channel).flush();
+
     }
 
     @Test
diff --git a/src/test/jmh/io/lettuce/core/JmhMain.java b/src/test/jmh/io/lettuce/core/JmhMain.java
index 5403638bc6..8e3a0ed529 100644
--- a/src/test/jmh/io/lettuce/core/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/JmhMain.java
@@ -31,11 +31,25 @@
  */
 public class JmhMain {
 
-    public static void main(String... args) throws Exception {
+    public static void main(String... args) throws RunnerException {
 
+        // runCommandHandlerBenchmark();
         runRedisClientBenchmark();
     }
 
+    private static void runBenchmarks() throws RunnerException {
+        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).build()).run();
+    }
+
+    private static void runCommandBenchmark() throws RunnerException {
+
+        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).include(".*CommandBenchmark.*")
+                .build()).run();
+
+        new Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS).include(".*CommandBenchmark.*").build())
+                .run();
+    }
+
     private static void runRedisClientBenchmark() throws RunnerException {
 
         new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).include(".*RedisClientBenchmark.*")

From b311bbb62cf72b0f82d12993170935bae511a5ee Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 9 Mar 2018 17:42:18 +0100
Subject: [PATCH 417/808] Add pooling for future listener objects #459

Pooled objects via the recycle reduce GC pressure for RetryListener, AtMostOnceListener, and AddToStack listener.
---
 .../lettuce/core/protocol/CommandHandler.java |  70 +++---
 .../core/protocol/DefaultEndpoint.java        | 200 ++++++++++++------
 2 files changed, 180 insertions(+), 90 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 7a400047ea..dcb493d5f0 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -66,7 +66,7 @@ public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCom
     private final ClientResources clientResources;
     private final Endpoint endpoint;
 
-    private final Deque<RedisCommand<?, ?, ?>> stack = new ArrayDeque<>();
+    private final ArrayDeque<RedisCommand<?, ?, ?>> stack = new ArrayDeque<>();
     private final long commandHandlerId = COMMAND_HANDLER_COUNTER.incrementAndGet();
 
     private final RedisStateMachine rsm = new RedisStateMachine();
@@ -402,7 +402,7 @@ private void writeBatch(ChannelHandlerContext ctx, Collection<RedisCommand<?, ?,
         }
     }
 
-    private void addToStack(RedisCommand<?, ?, ?> command, ChannelPromise promise) throws Exception {
+    private void addToStack(RedisCommand<?, ?, ?> command, ChannelPromise promise) {
 
         try {
 
@@ -418,7 +418,7 @@ private void addToStack(RedisCommand<?, ?, ?> command, ChannelPromise promise) t
             if (promise.isVoid()) {
                 stack.add(redisCommand);
             } else {
-                promise.addListener(AppendToStack.newInstance(stack, command));
+                promise.addListener(AddToStack.newInstance(stack, command));
             }
         } catch (Exception e) {
             command.completeExceptionally(e);
@@ -776,50 +776,62 @@ enum EnableAutoRead {
         INSTANCE
     }
 
-    static class AppendToStack implements GenericFutureListener<Future<Void>> {
-
-        private final Recycler.Handle<AppendToStack> handle;
-        private Collection<RedisCommand<?, ?, ?>> stack;
-        private RedisCommand<?, ?, ?> command;
+    /**
+     * Add to stack listener. This listener is pooled and must be {@link #recycle() recycled after usage}.
+     */
+    static class AddToStack implements GenericFutureListener<Future<Void>> {
 
-        private static final Recycler<AppendToStack> RECYCLER = new Recycler<AppendToStack>() {
+        private static final Recycler<AddToStack> RECYCLER = new Recycler<AddToStack>() {
             @Override
-            protected AppendToStack newObject(Handle<AppendToStack> handle) {
-                return new AppendToStack(handle);
+            protected AddToStack newObject(Handle<AddToStack> handle) {
+                return new AddToStack(handle);
             }
         };
 
-        private AppendToStack(Recycler.Handle<AppendToStack> handle) {
+        private final Recycler.Handle<AddToStack> handle;
+        private ArrayDeque stack;
+        private RedisCommand<?, ?, ?> command;
+
+        AddToStack(Recycler.Handle<AddToStack> handle) {
             this.handle = handle;
         }
 
-        static AppendToStack newInstance(Collection<RedisCommand<?, ?, ?>> stack, RedisCommand<?, ?, ?> command) {
-            return RECYCLER.get().init(stack, command);
-        }
+        /**
+         * Allocate a new instance.
+         *
+         * @param stack
+         * @param command
+         * @return
+         */
+        static AddToStack newInstance(ArrayDeque stack, RedisCommand<?, ?, ?> command) {
 
-        private AppendToStack init(Collection<RedisCommand<?, ?, ?>> stack, RedisCommand<?, ?, ?> command) {
+            AddToStack entry = RECYCLER.get();
 
-            this.stack = stack;
-            this.command = command;
-            return this;
-        }
+            entry.stack = stack;
+            entry.command = command;
 
-        public void recycle() {
-            handle.recycle(this);
+            return entry;
         }
 
+        @SuppressWarnings("unchecked")
         @Override
-        public void operationComplete(Future<Void> future) throws Exception {
+        public void operationComplete(Future<Void> future) {
 
-            if (future.isSuccess()) {
+            try {
+                if (future.isSuccess()) {
+                    stack.add(command);
+                }
+            } finally {
+                recycle();
+            }
+        }
 
-                stack.add(command);
+        private void recycle() {
 
-                stack = null;
-                command = null;
-            }
+            this.stack = null;
+            this.command = null;
 
-            recycle();
+            handle.recycle(this);
         }
     }
 }
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index fd0d2d2f71..1a02dfb35e 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -33,6 +33,7 @@
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.handler.codec.EncoderException;
+import io.netty.util.Recycler;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
 import io.netty.util.internal.logging.InternalLogLevel;
@@ -269,12 +270,12 @@ private void writeToChannelAndFlush(RedisCommand<?, ?, ?> command) {
 
         if (reliability == Reliability.AT_MOST_ONCE) {
             // cancel on exceptions and remove from queue, because there is no housekeeping
-            channelFuture.addListener(new AtMostOnceWriteListener(command));
+            channelFuture.addListener(AtMostOnceWriteListener.newInstance(this, command));
         }
 
         if (reliability == Reliability.AT_LEAST_ONCE) {
             // commands are ok to stay within the queue, reconnect will retrigger them
-            channelFuture.addListener(new RetryListener(command));
+            channelFuture.addListener(RetryListener.newInstance(this, command));
         }
     }
 
@@ -286,7 +287,7 @@ private void writeToChannelAndFlush(Collection<? extends RedisCommand<?, ?, ?>>
 
             // cancel on exceptions and remove from queue, because there is no housekeeping
             for (RedisCommand<?, ?, ?> command : commands) {
-                channelWrite(command).addListener(new AtMostOnceWriteListener(command));
+                channelWrite(command).addListener(AtMostOnceWriteListener.newInstance(this, command));
             }
         }
 
@@ -294,7 +295,7 @@ private void writeToChannelAndFlush(Collection<? extends RedisCommand<?, ?, ?>>
 
             // commands are ok to stay within the queue, reconnect will retrigger them
             for (RedisCommand<?, ?, ?> command : commands) {
-                channelWrite(command).addListener(new AtMostOnceWriteListener(command));
+                channelWrite(command).addListener(RetryListener.newInstance(this, command));
             }
         }
 
@@ -696,28 +697,18 @@ protected String logPrefix() {
         return logPrefix = buffer;
     }
 
-    private class ListenerSupport {
+    static class ListenerSupport {
 
-        final Collection<? extends RedisCommand<?, ?, ?>> sentCommands;
-        final RedisCommand<?, ?, ?> sentCommand;
-
-        ListenerSupport(RedisCommand<?, ?, ?> sentCommand) {
-            this.sentCommand = sentCommand;
-            this.sentCommands = null;
-        }
-
-        ListenerSupport(Collection<? extends RedisCommand<?, ?, ?>> sentCommands) {
-            this.sentCommand = null;
-            this.sentCommands = sentCommands;
-        }
+        Collection<? extends RedisCommand<?, ?, ?>> sentCommands;
+        RedisCommand<?, ?, ?> sentCommand;
+        DefaultEndpoint endpoint;
 
         void dequeue() {
-            if (sentCommand != null) {
-                QUEUE_SIZE.decrementAndGet(DefaultEndpoint.this);
-            }
 
-            if (sentCommands != null) {
-                QUEUE_SIZE.addAndGet(DefaultEndpoint.this, -sentCommands.size());
+            if (sentCommand != null) {
+                QUEUE_SIZE.decrementAndGet(endpoint);
+            } else {
+                QUEUE_SIZE.addAndGet(endpoint, -sentCommands.size());
             }
         }
 
@@ -725,10 +716,7 @@ protected void complete(Throwable t) {
 
             if (sentCommand != null) {
                 sentCommand.completeExceptionally(t);
-            }
-
-            if (sentCommands != null) {
-
+            } else {
                 for (RedisCommand<?, ?, ?> sentCommand : sentCommands) {
                     sentCommand.completeExceptionally(t);
                 }
@@ -736,67 +724,151 @@ protected void complete(Throwable t) {
         }
     }
 
-    private class AtMostOnceWriteListener extends ListenerSupport implements ChannelFutureListener {
+    static class AtMostOnceWriteListener extends ListenerSupport implements ChannelFutureListener {
 
-        AtMostOnceWriteListener(RedisCommand<?, ?, ?> sentCommand) {
-            super(sentCommand);
+        private static final Recycler<AtMostOnceWriteListener> RECYCLER = new Recycler<AtMostOnceWriteListener>() {
+            @Override
+            protected AtMostOnceWriteListener newObject(Handle<AtMostOnceWriteListener> handle) {
+                return new AtMostOnceWriteListener(handle);
+            }
+        };
+
+        private final Recycler.Handle<AtMostOnceWriteListener> handle;
+
+        AtMostOnceWriteListener(Recycler.Handle<AtMostOnceWriteListener> handle) {
+            this.handle = handle;
         }
 
-        AtMostOnceWriteListener(Collection<? extends RedisCommand<?, ?, ?>> sentCommands) {
-            super(sentCommands);
+        static AtMostOnceWriteListener newInstance(DefaultEndpoint endpoint, RedisCommand<?, ?, ?> command) {
+
+            AtMostOnceWriteListener entry = RECYCLER.get();
+
+            entry.endpoint = endpoint;
+            entry.sentCommand = command;
+
+            return entry;
+        }
+
+        static AtMostOnceWriteListener newInstance(DefaultEndpoint endpoint,
+                Collection<? extends RedisCommand<?, ?, ?>> commands) {
+
+            AtMostOnceWriteListener entry = RECYCLER.get();
+
+            entry.endpoint = endpoint;
+            entry.sentCommands = commands;
+
+            return entry;
         }
 
         @Override
-        public void operationComplete(ChannelFuture future) throws Exception {
+        public void operationComplete(ChannelFuture future) {
 
-            dequeue();
+            try {
 
-            if (future.cause() != null) {
-                complete(future.cause());
+                dequeue();
+
+                if (future.cause() != null) {
+                    complete(future.cause());
+                }
+            } finally {
+                recycle();
             }
         }
+
+        private void recycle() {
+
+            this.endpoint = null;
+            this.sentCommand = null;
+            this.sentCommands = null;
+
+            handle.recycle(this);
+        }
     }
 
     /**
      * A generic future listener which retries unsuccessful writes.
      */
-    private class RetryListener extends ListenerSupport implements GenericFutureListener<Future<Void>> {
+    static class RetryListener extends ListenerSupport implements GenericFutureListener<Future<Void>> {
 
-        RetryListener(RedisCommand<?, ?, ?> sentCommand) {
-            super(sentCommand);
+        private static final Recycler<RetryListener> RECYCLER = new Recycler<RetryListener>() {
+            @Override
+            protected RetryListener newObject(Handle<RetryListener> handle) {
+                return new RetryListener(handle);
+            }
+        };
+
+        private final Recycler.Handle<RetryListener> handle;
+
+        RetryListener(Recycler.Handle<RetryListener> handle) {
+            this.handle = handle;
+        }
+
+        static RetryListener newInstance(DefaultEndpoint endpoint, RedisCommand<?, ?, ?> command) {
+
+            RetryListener entry = RECYCLER.get();
+
+            if (command == null) {
+                System.out.println();
+            }
+            entry.endpoint = endpoint;
+            entry.sentCommand = command;
+
+            return entry;
         }
 
-        RetryListener(Collection<? extends RedisCommand<?, ?, ?>> sentCommands) {
-            super(sentCommands);
+        static RetryListener newInstance(DefaultEndpoint endpoint, Collection<? extends RedisCommand<?, ?, ?>> commands) {
+
+            RetryListener entry = RECYCLER.get();
+
+            entry.endpoint = endpoint;
+            entry.sentCommands = commands;
+
+            return entry;
         }
 
         @SuppressWarnings("unchecked")
         @Override
-        public void operationComplete(Future<Void> future) throws Exception {
+        public void operationComplete(Future<Void> future) {
 
-            logger.debug("operationComplete");
+            try {
+                doComplete(future);
+            } finally {
+                recycle();
+            }
+        }
+
+        private void doComplete(Future<Void> future) {
 
             Throwable cause = future.cause();
 
             boolean success = future.isSuccess();
             dequeue();
 
-            if (!success) {
+            if (success) {
+                return;
+            }
 
-                if (cause instanceof EncoderException || cause instanceof Error || cause.getCause() instanceof Error) {
-                    complete(cause);
-                    return;
-                }
+            if (cause instanceof EncoderException || cause instanceof Error || cause.getCause() instanceof Error) {
+                complete(cause);
+                return;
+            }
 
-                Channel channel = DefaultEndpoint.this.channel;
-                if (channel != null) {
-                    channel.eventLoop().submit(this::requeueCommands);
-                } else {
-                    requeueCommands();
-                }
+            Channel channel = endpoint.channel;
+            if (channel != null) {
+
+                // Capture values before recycler clears these.
+                RedisCommand<?, ?, ?> sentCommand = this.sentCommand;
+                Collection<? extends RedisCommand<?, ?, ?>> sentCommands = this.sentCommands;
+                DefaultEndpoint endpoint = this.endpoint;
+
+                channel.eventLoop().submit(() -> {
+                    requeueCommands(sentCommand, sentCommands, endpoint);
+                });
+            } else {
+                requeueCommands(sentCommand, sentCommands, endpoint);
             }
 
-            if (!success && !(cause instanceof ClosedChannelException)) {
+            if (!(cause instanceof ClosedChannelException)) {
 
                 String message = "Unexpected exception during request: {}";
                 InternalLogLevel logLevel = InternalLogLevel.WARN;
@@ -809,24 +881,30 @@ public void operationComplete(Future<Void> future) throws Exception {
             }
         }
 
-        private void requeueCommands() {
-
+        private void requeueCommands(RedisCommand<?, ?, ?> sentCommand, Collection sentCommands, DefaultEndpoint endpoint) {
             if (sentCommand != null) {
                 try {
-                    write(sentCommand);
+                    endpoint.write(sentCommand);
                 } catch (Exception e) {
                     complete(e);
                 }
-            }
-
-            if (sentCommands != null) {
+            } else {
                 try {
-                    write((Collection) sentCommands);
+                    endpoint.write(sentCommands);
                 } catch (Exception e) {
                     complete(e);
                 }
             }
         }
+
+        private void recycle() {
+
+            this.endpoint = null;
+            this.sentCommand = null;
+            this.sentCommands = null;
+
+            handle.recycle(this);
+        }
     }
 
     private enum Reliability {

From ed91964e9fde4a6e723368c409be56f9ff16d679 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 12 Mar 2018 10:14:14 +0100
Subject: [PATCH 418/808] Use BitSet for slot storage #715

Lettuce now uses BitSet to represent internally cluster slots assigned to a cluster node. The slot storage is allocated lazily and nodes without a slot (non-slot masters, slave nodes) won't allocate any memory for the slot storage.

This change reduces the memory usage from the previously used ArrayList with initially 16 elements backed by an Object[]. A node with all slots assigned required about 325.000 bytes of memory.

Using a BitSet stores only bitwise whether a slot is assigned or not. The storage requires a fixed amount of memory (about 2184 bytes) for each node independent of how many slots are occupied. A cluster of 150 nodes reached the break-even between the previous and current pattern if at least a single slot is used on a particular node. Clusters with more nodes will have always a higher memory consumption if at least a single slot is occupied.
---
 .../models/partitions/RedisClusterNode.java   | 153 +++++++++++-------
 .../core/cluster/RedisClusterClientTest.java  |  18 +--
 .../partitions/RedisClusterNodeTest.java      |  27 +++-
 .../models/slots/ClusterSlotsParserTest.java  |  18 +--
 .../cluster/topology/TopologyRefreshTest.java |  41 ++---
 .../cluster/models/partitions/JmhMain.java    |  54 +++++++
 .../partitions/RedisClusterNodeBenchmark.java |  60 +++++++
 7 files changed, 274 insertions(+), 97 deletions(-)
 create mode 100644 src/test/jmh/io/lettuce/core/cluster/models/partitions/JmhMain.java
 create mode 100644 src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java

diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
index dc78f2eda7..e6e05d331b 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
@@ -16,26 +16,28 @@
 package io.lettuce.core.cluster.models.partitions;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.SlotHash;
 import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.internal.LettuceSets;
 import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
- * Representation of a Redis Cluster node. A {@link RedisClusterNode} is identified by its {@code nodeId}. A
- * {@link RedisClusterNode} can be a {@link #getRole() responsible master} for zero to
- * {@link io.lettuce.core.cluster.SlotHash#SLOT_COUNT 16384} slots, a slave of one {@link #getSlaveOf() master} of carry
- * different {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag flags}.
+ * Representation of a Redis Cluster node. A {@link RedisClusterNode} is identified by its {@code nodeId}.
+ * <p/>
+ * A {@link RedisClusterNode} can be a {@link #getRole() responsible master} or slave. Masters can be responsible for zero to
+ * {@link io.lettuce.core.cluster.SlotHash#SLOT_COUNT 16384} slots. Each slave refers to exactly one {@link #getSlaveOf()
+ * master}. Nodes can have different {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag flags} assigned.
+ * <p/>
+ * This class is mutable and not thread-safe if mutated by multiple threads concurrently.
  *
  * @author Mark Paluch
  * @since 3.0
  */
 @SuppressWarnings("serial")
 public class RedisClusterNode implements Serializable, RedisNodeDescription {
+
     private RedisURI uri;
     private String nodeId;
 
@@ -45,15 +47,15 @@ public class RedisClusterNode implements Serializable, RedisNodeDescription {
     private long pongReceivedTimestamp;
     private long configEpoch;
 
-    private List<Integer> slots;
-    private Set<NodeFlag> flags;
+    private BitSet slots;
+    private final Set<NodeFlag> flags = EnumSet.noneOf(NodeFlag.class);
 
     public RedisClusterNode() {
-
     }
 
     public RedisClusterNode(RedisURI uri, String nodeId, boolean connected, String slaveOf, long pingSentTimestamp,
             long pongReceivedTimestamp, long configEpoch, List<Integer> slots, Set<NodeFlag> flags) {
+
         this.uri = uri;
         this.nodeId = nodeId;
         this.connected = connected;
@@ -61,11 +63,15 @@ public RedisClusterNode(RedisURI uri, String nodeId, boolean connected, String s
         this.pingSentTimestamp = pingSentTimestamp;
         this.pongReceivedTimestamp = pongReceivedTimestamp;
         this.configEpoch = configEpoch;
-        this.slots = slots;
-        this.flags = flags;
+
+        setSlotBits(slots);
+        setFlags(flags);
     }
 
     public RedisClusterNode(RedisClusterNode redisClusterNode) {
+
+        LettuceAssert.notNull(redisClusterNode, "RedisClusterNode must not be null");
+
         this.uri = redisClusterNode.uri;
         this.nodeId = redisClusterNode.nodeId;
         this.connected = redisClusterNode.connected;
@@ -73,8 +79,13 @@ public RedisClusterNode(RedisClusterNode redisClusterNode) {
         this.pingSentTimestamp = redisClusterNode.pingSentTimestamp;
         this.pongReceivedTimestamp = redisClusterNode.pongReceivedTimestamp;
         this.configEpoch = redisClusterNode.configEpoch;
-        this.slots = new ArrayList<>(redisClusterNode.slots);
-        this.flags = LettuceSets.newHashSet(redisClusterNode.flags);
+
+        if (redisClusterNode.slots != null && !redisClusterNode.slots.isEmpty()) {
+            this.slots = new BitSet(SlotHash.SLOT_COUNT);
+            this.slots.or(redisClusterNode.slots);
+        }
+
+        setFlags(redisClusterNode.flags);
     }
 
     /**
@@ -84,8 +95,12 @@ public RedisClusterNode(RedisClusterNode redisClusterNode) {
      * @return a new instance of {@link RedisClusterNode}
      */
     public static RedisClusterNode of(String nodeId) {
+
+        LettuceAssert.notNull(nodeId, "NodeId must not be null");
+
         RedisClusterNode redisClusterNode = new RedisClusterNode();
         redisClusterNode.setNodeId(nodeId);
+
         return redisClusterNode;
     }
 
@@ -94,11 +109,12 @@ public RedisURI getUri() {
     }
 
     /**
-     * Sets thhe connection point details. Usually the host/ip/port where a particular Redis Cluster node server is running.
+     * Sets the connection point details. Usually the host/ip/port where a particular Redis Cluster node server is running.
      *
      * @param uri the {@link RedisURI}, must not be {@literal null}
      */
     public void setUri(RedisURI uri) {
+
         LettuceAssert.notNull(uri, "RedisURI must not be null");
         this.uri = uri;
     }
@@ -184,20 +200,52 @@ public void setConfigEpoch(long configEpoch) {
     }
 
     public List<Integer> getSlots() {
+
+        if (slots == null || slots.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        List<Integer> slots = new ArrayList<>();
+
+        for (int i = 0; i < SlotHash.SLOT_COUNT; i++) {
+
+            if (this.slots.get(i)) {
+                slots.add(i);
+            }
+        }
+
         return slots;
     }
 
     /**
      * Sets the list of slots for which this {@link RedisClusterNode} is the
-     * {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag#MASTER}. The list is empty if this node
-     * is not a master or the node is not responsible for any slots at all.
+     * {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag#MASTER}. The list is empty if this node is not
+     * a master or the node is not responsible for any slots at all.
      *
      * @param slots list of slots, must not be {@literal null} but may be empty
      */
     public void setSlots(List<Integer> slots) {
+
         LettuceAssert.notNull(slots, "Slots must not be null");
 
-        this.slots = slots;
+        setSlotBits(slots);
+    }
+
+    private void setSlotBits(List<Integer> slots) {
+
+        if (slots.isEmpty() && this.slots == null) {
+            return;
+        }
+
+        if (this.slots == null) {
+            this.slots = new BitSet(SlotHash.SLOT_COUNT);
+        }
+
+        this.slots.clear();
+
+        for (Integer slot : slots) {
+            this.slots.set(slot);
+        }
     }
 
     public Set<NodeFlag> getFlags() {
@@ -210,7 +258,35 @@ public Set<NodeFlag> getFlags() {
      * @param flags the set of node flags.
      */
     public void setFlags(Set<NodeFlag> flags) {
-        this.flags = flags;
+
+        this.flags.clear();
+        this.flags.addAll(flags);
+    }
+
+    /**
+     * @param nodeFlag the node flag
+     * @return true if the {@linkplain NodeFlag} is contained within the flags.
+     */
+    public boolean is(NodeFlag nodeFlag) {
+        return getFlags().contains(nodeFlag);
+    }
+
+    /**
+     * @param slot the slot hash
+     * @return true if the slot is contained within the handled slots.
+     */
+    public boolean hasSlot(int slot) {
+        return slot <= SlotHash.SLOT_COUNT && this.slots != null && this.slots.get(slot);
+    }
+
+    /**
+     * Returns the {@link Role} of the Redis Cluster node based on the {@link #getFlags() flags}.
+     *
+     * @return the Redis Cluster node role
+     */
+    @Override
+    public Role getRole() {
+        return is(NodeFlag.MASTER) ? Role.MASTER : Role.SLAVE;
     }
 
     @Override
@@ -233,13 +309,12 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        int result = 31 * (nodeId != null ? nodeId.hashCode() : 0);
-        return result;
+        return 31 * (nodeId != null ? nodeId.hashCode() : 0);
     }
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
         sb.append(getClass().getSimpleName());
         sb.append(" [uri=").append(uri);
         sb.append(", nodeId='").append(nodeId).append('\'');
@@ -250,46 +325,16 @@ public String toString() {
         sb.append(", configEpoch=").append(configEpoch);
         sb.append(", flags=").append(flags);
         if (slots != null) {
-            sb.append(", slot count=").append(slots.size());
+            sb.append(", slot count=").append(slots.cardinality());
         }
         sb.append(']');
         return sb.toString();
     }
 
-    /**
-     *
-     * @param nodeFlag the node flag
-     * @return true if the {@linkplain NodeFlag} is contained within the flags.
-     */
-    public boolean is(NodeFlag nodeFlag) {
-        return getFlags().contains(nodeFlag);
-    }
-
-    /**
-     *
-     * @param slot the slot hash
-     * @return true if the slot is contained within the handled slots.
-     */
-    public boolean hasSlot(int slot) {
-        return getSlots().contains(slot);
-    }
-
-    /**
-     * Returns the {@link io.lettuce.core.models.role.RedisInstance.Role} of the Redis Cluster node based on the
-     * {@link #getFlags() flags}.
-     *
-     * @return the Redis Cluster node role
-     */
-    @Override
-    public Role getRole() {
-        return is(NodeFlag.MASTER) ? Role.MASTER : Role.SLAVE;
-    }
-
     /**
      * Redis Cluster node flags.
      */
     public enum NodeFlag {
         NOFLAGS, MYSELF, SLAVE, MASTER, EVENTUAL_FAIL, FAIL, HANDSHAKE, NOADDR;
     }
-
 }
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
index 1d3cd2c342..f78e41d799 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
@@ -24,6 +24,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import org.junit.*;
 import org.junit.runners.MethodSorters;
@@ -292,13 +294,9 @@ public void testClusterRedirection() throws Exception {
         Partitions partitions = clusterClient.getPartitions();
 
         for (RedisClusterNode partition : partitions) {
-            partition.setSlots(new ArrayList<>());
+            partition.setSlots(Collections.emptyList());
             if (partition.getFlags().contains(RedisClusterNode.NodeFlag.MYSELF)) {
-
-                int[] slots = createSlots(0, 16384);
-                for (int i = 0; i < slots.length; i++) {
-                    partition.getSlots().add(i);
-                }
+                partition.setSlots(IntStream.range(0, SlotHash.SLOT_COUNT).boxed().collect(Collectors.toList()));
             }
         }
         partitions.updateCache();
@@ -335,13 +333,9 @@ public void testClusterRedirectionLimit() throws Exception {
         for (RedisClusterNode partition : partitions) {
 
             if (partition.getSlots().contains(15495)) {
-                partition.setSlots(new ArrayList<>());
+                partition.setSlots(Collections.emptyList());
             } else {
-                partition.setSlots(new ArrayList<>());
-                int[] slots = createSlots(0, 16384);
-                for (int i = 0; i < slots.length; i++) {
-                    partition.getSlots().add(i);
-                }
+                partition.setSlots(IntStream.range(0, SlotHash.SLOT_COUNT).boxed().collect(Collectors.toList()));
             }
 
         }
diff --git a/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java
index e395072cd8..05f121b589 100644
--- a/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java
+++ b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java
@@ -17,13 +17,34 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.Arrays;
+
 import org.junit.Test;
 
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.SlotHash;
 
+/**
+ * @author Mark Paluch
+ */
 public class RedisClusterNodeTest {
+
     @Test
-    public void testEquality() throws Exception {
+    public void shouldCopyNode() {
+
+        RedisClusterNode node = new RedisClusterNode();
+        node.setSlots(Arrays.asList(1, 2, 3, SlotHash.SLOT_COUNT - 1));
+
+        RedisClusterNode copy = new RedisClusterNode(node);
+
+        assertThat(copy.getSlots()).containsExactly(1, 2, 3, SlotHash.SLOT_COUNT - 1);
+        assertThat(copy.hasSlot(1)).isTrue();
+        assertThat(copy.hasSlot(SlotHash.SLOT_COUNT - 1)).isTrue();
+    }
+
+    @Test
+    public void testEquality() {
+
         RedisClusterNode node = new RedisClusterNode();
 
         assertThat(node).isEqualTo(new RedisClusterNode());
@@ -31,11 +52,11 @@ public void testEquality() throws Exception {
 
         node.setUri(new RedisURI());
         assertThat(node.hashCode()).isNotEqualTo(new RedisClusterNode());
-
     }
 
     @Test
-    public void testToString() throws Exception {
+    public void testToString() {
+
         RedisClusterNode node = new RedisClusterNode();
 
         assertThat(node.toString()).contains(RedisClusterNode.class.getSimpleName());
diff --git a/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java
index 43ab839c5d..cdb949ed8e 100644
--- a/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java
+++ b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java
@@ -30,26 +30,26 @@
 public class ClusterSlotsParserTest {
 
     @Test
-    public void testEmpty() throws Exception {
+    public void testEmpty() {
         List<ClusterSlotRange> result = ClusterSlotsParser.parse(new ArrayList<>());
         assertThat(result).isNotNull().isEmpty();
     }
 
     @Test
-    public void testOneString() throws Exception {
+    public void testOneString() {
         List<ClusterSlotRange> result = ClusterSlotsParser.parse(LettuceLists.newList(""));
         assertThat(result).isNotNull().isEmpty();
     }
 
     @Test
-    public void testOneStringInList() throws Exception {
+    public void testOneStringInList() {
         List<?> list = Arrays.asList(LettuceLists.newList("0"));
         List<ClusterSlotRange> result = ClusterSlotsParser.parse(list);
         assertThat(result).isNotNull().isEmpty();
     }
 
     @Test
-    public void testParse() throws Exception {
+    public void testParse() {
         List<?> list = Arrays.asList(LettuceLists.newList("0", "1", LettuceLists.newList("1", "2")));
         List<ClusterSlotRange> result = ClusterSlotsParser.parse(list);
         assertThat(result).hasSize(1);
@@ -58,7 +58,7 @@ public void testParse() throws Exception {
     }
 
     @Test
-    public void testParseWithSlave() throws Exception {
+    public void testParseWithSlave() {
         List<?> list = Arrays.asList(LettuceLists.newList("100", "200", LettuceLists.newList("1", "2", "nodeId1"),
                 LettuceLists.newList("1", 2, "nodeId2")));
         List<ClusterSlotRange> result = ClusterSlotsParser.parse(list);
@@ -85,7 +85,7 @@ public void testParseWithSlave() throws Exception {
     }
 
     @Test
-    public void testSameNode() throws Exception {
+    public void testSameNode() {
         List<?> list = Arrays.asList(
                 LettuceLists.newList("100", "200", LettuceLists.newList("1", "2", "nodeId1"),
                         LettuceLists.newList("1", 2, "nodeId2")),
@@ -109,19 +109,19 @@ public void testSameNode() throws Exception {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void testParseInvalidMaster() throws Exception {
+    public void testParseInvalidMaster() {
         List<?> list = Arrays.asList(LettuceLists.newList("0", "1", LettuceLists.newList("1")));
         ClusterSlotsParser.parse(list);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void testParseInvalidMaster2() throws Exception {
+    public void testParseInvalidMaster2() {
         List<?> list = Arrays.asList(LettuceLists.newList("0", "1", ""));
         ClusterSlotsParser.parse(list);
     }
 
     @Test
-    public void testModel() throws Exception {
+    public void testModel() {
 
         ClusterSlotRange range = new ClusterSlotRange();
         range.setFrom(1);
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java
index 04be54e1f9..e26c11583a 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java
@@ -17,6 +17,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.Collections;
+import java.util.List;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -62,22 +64,22 @@ public class TopologyRefreshTest extends AbstractTest {
     private RedisCommands<String, String> redis2;
 
     @Before
-    public void openConnection() throws Exception {
-        clusterClient = RedisClusterClient.create(client.getResources(),
-                RedisURI.Builder.redis(host, AbstractClusterTest.port1).build());
+    public void openConnection() {
+        clusterClient = RedisClusterClient.create(client.getResources(), RedisURI.Builder
+                .redis(host, AbstractClusterTest.port1).build());
         redis1 = client.connect(RedisURI.Builder.redis(AbstractClusterTest.host, AbstractClusterTest.port1).build()).sync();
         redis2 = client.connect(RedisURI.Builder.redis(AbstractClusterTest.host, AbstractClusterTest.port2).build()).sync();
     }
 
     @After
-    public void closeConnection() throws Exception {
+    public void closeConnection() {
         redis1.getStatefulConnection().close();
         redis2.getStatefulConnection().close();
         FastShutdown.shutdown(clusterClient);
     }
 
     @Test
-    public void shouldUnsubscribeTopologyRefresh() throws Exception {
+    public void shouldUnsubscribeTopologyRefresh() {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.builder()
                 .enablePeriodicRefresh(true) //
@@ -89,8 +91,8 @@ public void shouldUnsubscribeTopologyRefresh() throws Exception {
         AtomicBoolean clusterTopologyRefreshActivated = (AtomicBoolean) ReflectionTestUtils.getField(clusterClient,
                 "clusterTopologyRefreshActivated");
 
-        AtomicReference<ScheduledFuture<?>> clusterTopologyRefreshFuture = (AtomicReference) ReflectionTestUtils
-                .getField(clusterClient, "clusterTopologyRefreshFuture");
+        AtomicReference<ScheduledFuture<?>> clusterTopologyRefreshFuture = (AtomicReference) ReflectionTestUtils.getField(
+                clusterClient, "clusterTopologyRefreshFuture");
 
         assertThat(clusterTopologyRefreshActivated.get()).isTrue();
         assertThat((Future) clusterTopologyRefreshFuture.get()).isNotNull();
@@ -107,7 +109,7 @@ public void shouldUnsubscribeTopologyRefresh() throws Exception {
     }
 
     @Test
-    public void changeTopologyWhileOperations() throws Exception {
+    public void changeTopologyWhileOperations() {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.builder()
                 .enablePeriodicRefresh(true)//
@@ -126,7 +128,7 @@ public void changeTopologyWhileOperations() throws Exception {
     }
 
     @Test
-    public void dynamicSourcesProvidesClientCountForAllNodes() throws Exception {
+    public void dynamicSourcesProvidesClientCountForAllNodes() {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.create();
         clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(topologyRefreshOptions).build());
@@ -143,7 +145,7 @@ public void dynamicSourcesProvidesClientCountForAllNodes() throws Exception {
     }
 
     @Test
-    public void staticSourcesProvidesClientCountForSeedNodes() throws Exception {
+    public void staticSourcesProvidesClientCountForSeedNodes() {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.builder()
                 .dynamicRefreshSources(false).build();
@@ -161,7 +163,7 @@ public void staticSourcesProvidesClientCountForSeedNodes() throws Exception {
     }
 
     @Test
-    public void adaptiveTopologyUpdateOnDisconnectNodeIdConnection() throws Exception {
+    public void adaptiveTopologyUpdateOnDisconnectNodeIdConnection() {
 
         runReconnectTest((clusterConnection, node) -> {
             RedisClusterAsyncCommands<String, String> connection = clusterConnection.getConnection(node.getUri().getHost(),
@@ -172,7 +174,7 @@ public void adaptiveTopologyUpdateOnDisconnectNodeIdConnection() throws Exceptio
     }
 
     @Test
-    public void adaptiveTopologyUpdateOnDisconnectHostAndPortConnection() throws Exception {
+    public void adaptiveTopologyUpdateOnDisconnectHostAndPortConnection() {
 
         runReconnectTest((clusterConnection, node) -> {
             RedisClusterAsyncCommands<String, String> connection = clusterConnection.getConnection(node.getUri().getHost(),
@@ -183,7 +185,7 @@ public void adaptiveTopologyUpdateOnDisconnectHostAndPortConnection() throws Exc
     }
 
     @Test
-    public void adaptiveTopologyUpdateOnDisconnectDefaultConnection() throws Exception {
+    public void adaptiveTopologyUpdateOnDisconnectDefaultConnection() {
 
         runReconnectTest((clusterConnection, node) -> {
             return clusterConnection;
@@ -265,7 +267,7 @@ public void adaptiveTriggerDoesNotFireOnSingleReconnect() throws Exception {
     }
 
     @Test
-    public void adaptiveTriggerOnMoveRedirection() throws Exception {
+    public void adaptiveTriggerOnMoveRedirection() {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.builder()//
                 .enableAdaptiveRefreshTrigger(ClusterTopologyRefreshOptions.RefreshTrigger.MOVED_REDIRECT)//
@@ -279,8 +281,10 @@ public void adaptiveTriggerOnMoveRedirection() throws Exception {
         RedisClusterNode node1 = partitions.getPartitionBySlot(0);
         RedisClusterNode node2 = partitions.getPartitionBySlot(12000);
 
-        node2.getSlots().addAll(node1.getSlots());
-        node1.getSlots().clear();
+        List<Integer> slots = node2.getSlots();
+        slots.addAll(node1.getSlots());
+        node2.setSlots(slots);
+        node1.setSlots(Collections.emptyList());
         partitions.updateCache();
 
         assertThat(clusterClient.getPartitions().getPartitionByNodeId(node1.getNodeId()).getSlots()).hasSize(0);
@@ -290,7 +294,7 @@ public void adaptiveTriggerOnMoveRedirection() throws Exception {
 
         Wait.untilEquals(12000, new Wait.Supplier<Integer>() {
             @Override
-            public Integer get() throws Exception {
+            public Integer get() {
                 return clusterClient.getPartitions().getPartitionByNodeId(node1.getNodeId()).getSlots().size();
             }
         }).waitOrTimeout();
@@ -301,8 +305,7 @@ public Integer get() throws Exception {
     }
 
     private void runReconnectTest(
-            BiFunction<RedisAdvancedClusterAsyncCommands<String, String>, RedisClusterNode, BaseRedisAsyncCommands> function)
-            throws Exception {
+            BiFunction<RedisAdvancedClusterAsyncCommands<String, String>, RedisClusterNode, BaseRedisAsyncCommands> function) {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.builder()//
                 .refreshTriggersReconnectAttempts(0)//
diff --git a/src/test/jmh/io/lettuce/core/cluster/models/partitions/JmhMain.java b/src/test/jmh/io/lettuce/core/cluster/models/partitions/JmhMain.java
new file mode 100644
index 0000000000..336a82b78e
--- /dev/null
+++ b/src/test/jmh/io/lettuce/core/cluster/models/partitions/JmhMain.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster.models.partitions;
+
+import java.util.concurrent.TimeUnit;
+
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.ChainedOptionsBuilder;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+import org.openjdk.jmh.runner.options.TimeValue;
+
+/**
+ * Manual JMH Test Launcher.
+ *
+ * @author Mark Paluch
+ */
+public class JmhMain {
+
+    public static void main(String... args) throws Exception {
+        runClusterNodeBenchmark();
+    }
+
+    private static void runClusterNodeBenchmark() throws RunnerException {
+
+        new Runner(prepareOptions().mode(Mode.AverageTime) //
+                .timeUnit(TimeUnit.NANOSECONDS) //
+                .include(".*RedisClusterNodeBenchmark.*") //
+                .build()).run();
+    }
+
+    private static ChainedOptionsBuilder prepareOptions() {
+        return new OptionsBuilder()//
+                .forks(1) //
+                .warmupIterations(5)//
+                .threads(1) //
+                .measurementIterations(5) //
+                .timeout(TimeValue.seconds(2));
+    }
+}
diff --git a/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java
new file mode 100644
index 0000000000..67c94f6dad
--- /dev/null
+++ b/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster.models.partitions;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+
+import io.lettuce.core.cluster.SlotHash;
+
+/**
+ * @author Mark Paluch
+ */
+@State(Scope.Benchmark)
+public class RedisClusterNodeBenchmark {
+
+    final static List<Integer> ALL_SLOTS = IntStream.range(0, SlotHash.SLOT_COUNT).boxed().collect(Collectors.toList());
+    final static List<Integer> LOWER_SLOTS = IntStream.range(0, 8192).boxed().collect(Collectors.toList());
+
+    final static RedisClusterNode NODE = new RedisClusterNode(null, null, true, null, 0, 0, 0, ALL_SLOTS,
+            Collections.emptySet());
+
+    @Benchmark
+    public RedisClusterNode createClusterNodeAllSlots() {
+        return new RedisClusterNode(null, null, true, null, 0, 0, 0, ALL_SLOTS, Collections.emptySet());
+    }
+
+    @Benchmark
+    public RedisClusterNode createClusterNodeLowerSlots() {
+        return new RedisClusterNode(null, null, true, null, 0, 0, 0, LOWER_SLOTS, Collections.emptySet());
+    }
+
+    @Benchmark
+    public void querySlotStatusPresent() {
+        NODE.hasSlot(1234);
+    }
+
+    @Benchmark
+    public void querySlotStatusAbsent() {
+        NODE.hasSlot(8193);
+    }
+}

From 230d1a2c86abf81cbf11aa095e5ce125b7b754b9 Mon Sep 17 00:00:00 2001
From: Grzegorz Szpak <gszpak01@gmail.com>
Date: Tue, 6 Mar 2018 18:11:54 -0800
Subject: [PATCH 419/808] Using discardSomeReadBytes instead of
 discardReadBytes for CommandHandler's buffer #725

Add benchmarks for channelRead added to CommandHandler JMH test suite.

CommandHandlerBenchmark tests the whole flow now - both writes and reads.
Also, creation of commands was moved to benchmark methods -
after one usage they become not writable which causes the benchmark
to give incorrect results.

Original pull request: #726
---
 .../lettuce/core/protocol/CommandHandler.java |   2 +-
 .../protocol/CommandHandlerBenchmark.java     | 112 ++++++---
 .../lettuce/core/protocol/EmptyChannel.java   | 237 ++++++++++++++++++
 .../io/lettuce/core/protocol/EmptyConfig.java | 142 +++++++++++
 .../lettuce/core/protocol/EmptyContext.java   |   7 +-
 5 files changed, 457 insertions(+), 43 deletions(-)
 create mode 100644 src/test/jmh/io/lettuce/core/protocol/EmptyChannel.java
 create mode 100644 src/test/jmh/io/lettuce/core/protocol/EmptyConfig.java

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index dcb493d5f0..8a368610d1 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -561,7 +561,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
             }
 
             if (buffer.refCnt() != 0) {
-                buffer.discardReadBytes();
+                buffer.discardSomeReadBytes();
             }
 
             afterComplete(ctx, command);
diff --git a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
index e6f883262e..858a892552 100644
--- a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
@@ -16,7 +16,7 @@
 package io.lettuce.core.protocol;
 
 import java.util.Arrays;
-import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -25,10 +25,12 @@
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
 
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.codec.ByteArrayCodec;
 import io.lettuce.core.output.ValueOutput;
+import io.netty.buffer.ByteBuf;
 
 /**
  * Benchmark for {@link CommandHandler}. Test cases:
@@ -46,81 +48,111 @@ public class CommandHandlerBenchmark {
     private static final ClientOptions CLIENT_OPTIONS = ClientOptions.create();
     private static final EmptyContext CHANNEL_HANDLER_CONTEXT = new EmptyContext();
     private static final byte[] KEY = "key".getBytes();
+    private static final String VALUE = "value\r\n";
     private final EmptyPromise PROMISE = new EmptyPromise();
 
     private CommandHandler commandHandler;
-    private Command command;
-    private Command batchCommand;
-    private Collection<Command> commands1;
-    private List<Command> commands10;
-    private List<Command> commands100;
-    private List<Command> commands1000;
+    private ByteBuf reply1;
+    private ByteBuf reply10;
+    private ByteBuf reply100;
+    private ByteBuf reply1000;
 
     @Setup
-    public void setup() {
-
+    public void setup() throws Exception {
         commandHandler = new CommandHandler(CLIENT_OPTIONS, EmptyClientResources.INSTANCE, new DefaultEndpoint(CLIENT_OPTIONS));
-        command = new Command(CommandType.GET, new ValueOutput<>(CODEC), new CommandArgs(CODEC).addKey(KEY));
+        commandHandler.channelRegistered(CHANNEL_HANDLER_CONTEXT);
+        commandHandler.setState(CommandHandler.LifecycleState.CONNECTED);
 
+        reply1 = strToByteBuf(String.format("+%s", VALUE));
+        reply10 = strToByteBuf(makeBulkReply(10));
+        reply100 = strToByteBuf(makeBulkReply(100));
+        reply1000 = strToByteBuf(makeBulkReply(1000));
+        for (ByteBuf buf: Arrays.asList(reply1, reply10, reply100, reply1000)) {
+            buf.retain();
+        }
+    }
 
-        commandHandler.setState(CommandHandler.LifecycleState.CONNECTED);
+    @TearDown
+    public void tearDown() throws Exception {
+        commandHandler.channelUnregistered(CHANNEL_HANDLER_CONTEXT);
+        for (ByteBuf buf: Arrays.asList(reply1, reply10, reply100, reply1000)) {
+            buf.release(2);
+        }
+    }
 
-        commands1 = Arrays.asList(command);
-        commands10 = IntStream.range(0, 10)
-                .mapToObj(i -> new Command(CommandType.GET, new ValueOutput<>(CODEC), new CommandArgs(CODEC).addKey(KEY)))
-                .collect(Collectors.toList());
+    private ByteBuf strToByteBuf(String str) {
+        ByteBuf buf = CHANNEL_HANDLER_CONTEXT.alloc().directBuffer();
+        buf.writeBytes(str.getBytes());
+        return buf;
+    }
 
-        commands100 = IntStream.range(0, 100)
-                .mapToObj(i -> new Command(CommandType.GET, new ValueOutput<>(CODEC), new CommandArgs(CODEC).addKey(KEY)))
-                .collect(Collectors.toList());
+    private String makeBulkReply(int numOfReplies) {
+        String baseReply = String.format("$%d\r\n%s\r\n", VALUE.length(), VALUE);
+        return String.join("", Collections.nCopies(numOfReplies, baseReply));
+    }
 
-        commands1000 = IntStream.range(0, 1000)
-                .mapToObj(i -> new Command(CommandType.GET, new ValueOutput<>(CODEC), new CommandArgs(CODEC).addKey(KEY)))
-                .collect(Collectors.toList());
+    private Command makeCommand() {
+        return new Command(CommandType.GET, new ValueOutput<>(CODEC), new CommandArgs(CODEC).addKey(KEY));
     }
 
     @Benchmark
-    public void measureNettyWrite() throws Exception {
+    public void measureNettyWriteAndRead() throws Exception {
+        Command command = makeCommand();
 
         commandHandler.write(CHANNEL_HANDLER_CONTEXT, command, PROMISE);
 
-        // Prevent OOME
-        commandHandler.getStack().clear();
+        commandHandler.channelRead(CHANNEL_HANDLER_CONTEXT, reply1);
+        reply1.resetReaderIndex();
+        reply1.retain();
     }
 
     @Benchmark
-    public void measureNettyWriteBatch1() throws Exception {
+    public void measureNettyWriteAndReadBatch1() throws Exception {
+        List<Command> commands = Collections.singletonList(makeCommand());
 
-        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commands1, PROMISE);
+        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commands, PROMISE);
 
-        // Prevent OOME
-        commandHandler.getStack().clear();
+        commandHandler.channelRead(CHANNEL_HANDLER_CONTEXT, reply1);
+        reply1.resetReaderIndex();
+        reply1.retain();
     }
 
     @Benchmark
-    public void measureNettyWriteBatch10() throws Exception {
+    public void measureNettyWriteAndReadBatch10() throws Exception {
+        List<Command> commands = IntStream.range(0, 10)
+                .mapToObj(i -> makeCommand())
+                .collect(Collectors.toList());
 
-        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commands10, PROMISE);
+        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commands, PROMISE);
 
-        // Prevent OOME
-        commandHandler.getStack().clear();
+        commandHandler.channelRead(CHANNEL_HANDLER_CONTEXT, reply10);
+        reply10.resetReaderIndex();
+        reply10.retain();
     }
 
     @Benchmark
-    public void measureNettyWriteBatch100() throws Exception {
+    public void measureNettyWriteAndReadBatch100() throws Exception {
+        List<Command> commands = IntStream.range(0, 100)
+                .mapToObj(i -> makeCommand())
+                .collect(Collectors.toList());
 
-        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commands100, PROMISE);
+        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commands, PROMISE);
 
-        // Prevent OOME
-        commandHandler.getStack().clear();
+        commandHandler.channelRead(CHANNEL_HANDLER_CONTEXT, reply100);
+        reply100.resetReaderIndex();
+        reply100.retain();
     }
 
     @Benchmark
-    public void measureNettyWriteBatch1000() throws Exception {
+    public void measureNettyWriteAndReadBatch1000() throws Exception {
+        List<Command> commands = IntStream.range(0, 1000)
+                .mapToObj(i -> makeCommand())
+                .collect(Collectors.toList());
 
-        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commands1000, PROMISE);
+        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commands, PROMISE);
 
-        // Prevent OOME
-        commandHandler.getStack().clear();
+        commandHandler.channelRead(CHANNEL_HANDLER_CONTEXT, reply1000);
+        reply1000.resetReaderIndex();
+        reply1000.retain();
     }
 }
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyChannel.java b/src/test/jmh/io/lettuce/core/protocol/EmptyChannel.java
new file mode 100644
index 0000000000..1e88550f5e
--- /dev/null
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyChannel.java
@@ -0,0 +1,237 @@
+package io.lettuce.core.protocol;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelId;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelProgressivePromise;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.EventLoop;
+import io.netty.util.Attribute;
+import io.netty.util.AttributeKey;
+
+import java.net.SocketAddress;
+
+public class EmptyChannel implements Channel {
+
+    private final static ChannelConfig CONFIG = new EmptyConfig();
+
+    @Override
+    public ChannelId id() {
+        return null;
+    }
+
+    @Override
+    public EventLoop eventLoop() {
+        return null;
+    }
+
+    @Override
+    public Channel parent() {
+        return null;
+    }
+
+    @Override
+    public ChannelConfig config() {
+        return CONFIG;
+    }
+
+    @Override
+    public boolean isOpen() {
+        return false;
+    }
+
+    @Override
+    public boolean isRegistered() {
+        return false;
+    }
+
+    @Override
+    public boolean isActive() {
+        return false;
+    }
+
+    @Override
+    public ChannelMetadata metadata() {
+        return null;
+    }
+
+    @Override
+    public SocketAddress localAddress() {
+        return null;
+    }
+
+    @Override
+    public SocketAddress remoteAddress() {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture closeFuture() {
+        return null;
+    }
+
+    @Override
+    public boolean isWritable() {
+        return false;
+    }
+
+    @Override
+    public long bytesBeforeUnwritable() {
+        return 0;
+    }
+
+    @Override
+    public long bytesBeforeWritable() {
+        return 0;
+    }
+
+    @Override
+    public Unsafe unsafe() {
+        return null;
+    }
+
+    @Override
+    public ChannelPipeline pipeline() {
+        return null;
+    }
+
+    @Override
+    public ByteBufAllocator alloc() {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture bind(SocketAddress socketAddress) {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture connect(SocketAddress socketAddress) {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture connect(SocketAddress socketAddress, SocketAddress socketAddress1) {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture disconnect() {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture close() {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture deregister() {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture bind(SocketAddress socketAddress, ChannelPromise channelPromise) {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture connect(SocketAddress socketAddress, ChannelPromise channelPromise) {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture connect(SocketAddress socketAddress, SocketAddress socketAddress1,
+            ChannelPromise channelPromise) {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture disconnect(ChannelPromise channelPromise) {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture close(ChannelPromise channelPromise) {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture deregister(ChannelPromise channelPromise) {
+        return null;
+    }
+
+    @Override
+    public Channel read() {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture write(Object o) {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture write(Object o, ChannelPromise channelPromise) {
+        return null;
+    }
+
+    @Override
+    public Channel flush() {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture writeAndFlush(Object o, ChannelPromise channelPromise) {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture writeAndFlush(Object o) {
+        return null;
+    }
+
+    @Override
+    public ChannelPromise newPromise() {
+        return null;
+    }
+
+    @Override
+    public ChannelProgressivePromise newProgressivePromise() {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture newSucceededFuture() {
+        return null;
+    }
+
+    @Override
+    public ChannelFuture newFailedFuture(Throwable throwable) {
+        return null;
+    }
+
+    @Override
+    public ChannelPromise voidPromise() {
+        return null;
+    }
+
+    @Override
+    public <T> Attribute<T> attr(AttributeKey<T> attributeKey) {
+        return null;
+    }
+
+    @Override
+    public <T> boolean hasAttr(AttributeKey<T> attributeKey) {
+        return false;
+    }
+
+    @Override
+    public int compareTo(Channel o) {
+        return 0;
+    }
+}
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyConfig.java b/src/test/jmh/io/lettuce/core/protocol/EmptyConfig.java
new file mode 100644
index 0000000000..07c52d7317
--- /dev/null
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyConfig.java
@@ -0,0 +1,142 @@
+package io.lettuce.core.protocol;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.WriteBufferWaterMark;
+
+import java.util.Map;
+
+public class EmptyConfig implements ChannelConfig {
+    @Override
+    public Map<ChannelOption<?>, Object> getOptions() {
+        return null;
+    }
+
+    @Override
+    public boolean setOptions(Map<ChannelOption<?>, ?> map) {
+        return false;
+    }
+
+    @Override
+    public <T> T getOption(ChannelOption<T> channelOption) {
+        return null;
+    }
+
+    @Override
+    public <T> boolean setOption(ChannelOption<T> channelOption, T t) {
+        return false;
+    }
+
+    @Override
+    public int getConnectTimeoutMillis() {
+        return 0;
+    }
+
+    @Override
+    public ChannelConfig setConnectTimeoutMillis(int i) {
+        return null;
+    }
+
+    @Override
+    public int getMaxMessagesPerRead() {
+        return 0;
+    }
+
+    @Override
+    public ChannelConfig setMaxMessagesPerRead(int i) {
+        return null;
+    }
+
+    @Override
+    public int getWriteSpinCount() {
+        return 0;
+    }
+
+    @Override
+    public ChannelConfig setWriteSpinCount(int i) {
+        return null;
+    }
+
+    @Override
+    public ByteBufAllocator getAllocator() {
+        return null;
+    }
+
+    @Override
+    public ChannelConfig setAllocator(ByteBufAllocator byteBufAllocator) {
+        return null;
+    }
+
+    @Override
+    public <T extends RecvByteBufAllocator> T getRecvByteBufAllocator() {
+        return null;
+    }
+
+    @Override
+    public ChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator recvByteBufAllocator) {
+        return null;
+    }
+
+    @Override
+    public boolean isAutoRead() {
+        return false;
+    }
+
+    @Override
+    public ChannelConfig setAutoRead(boolean b) {
+        return null;
+    }
+
+    @Override
+    public boolean isAutoClose() {
+        return false;
+    }
+
+    @Override
+    public ChannelConfig setAutoClose(boolean b) {
+        return null;
+    }
+
+    @Override
+    public int getWriteBufferHighWaterMark() {
+        return 0;
+    }
+
+    @Override
+    public ChannelConfig setWriteBufferHighWaterMark(int i) {
+        return null;
+    }
+
+    @Override
+    public int getWriteBufferLowWaterMark() {
+        return 0;
+    }
+
+    @Override
+    public ChannelConfig setWriteBufferLowWaterMark(int i) {
+        return null;
+    }
+
+    @Override
+    public MessageSizeEstimator getMessageSizeEstimator() {
+        return null;
+    }
+
+    @Override
+    public ChannelConfig setMessageSizeEstimator(MessageSizeEstimator messageSizeEstimator) {
+        return null;
+    }
+
+    @Override
+    public WriteBufferWaterMark getWriteBufferWaterMark() {
+        return null;
+    }
+
+    @Override
+    public ChannelConfig setWriteBufferWaterMark(WriteBufferWaterMark writeBufferWaterMark) {
+        return null;
+    }
+}
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java b/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
index 8500feca29..e715171e0f 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
@@ -19,6 +19,7 @@
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.channel.*;
 import io.netty.util.Attribute;
 import io.netty.util.AttributeKey;
@@ -29,9 +30,11 @@
  */
 class EmptyContext implements ChannelHandlerContext {
 
+    private final static Channel CHANNEL = new EmptyChannel();
+
     @Override
     public Channel channel() {
-        return null;
+        return CHANNEL;
     }
 
     @Override
@@ -208,7 +211,7 @@ public ChannelPipeline pipeline() {
 
     @Override
     public ByteBufAllocator alloc() {
-        return null;
+        return PooledByteBufAllocator.DEFAULT;
     }
 
     @Override

From bcb2783a5afdc781b9418a39e423e4c004172cbe Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 15 Mar 2018 08:55:58 +0100
Subject: [PATCH 420/808] Polishing #725

Move back to discardReadBytes() but discard bytes outside the decoding loop to not enforce cleanup upon each decoded command. Tweak JMH benchmarks to not include command creation overhead caused by IntStream and element collection. Tweak commands in test to never return done state so commands can be reused for all benchmark runs.

Original pull request: #726
---
 .../lettuce/core/protocol/CommandHandler.java |   9 +-
 src/test/jmh/io/lettuce/core/JmhMain.java     |  13 +-
 .../protocol/CommandHandlerBenchmark.java     | 119 +++++++++---------
 .../lettuce/core/protocol/EmptyChannel.java   |  17 +--
 .../io/lettuce/core/protocol/EmptyConfig.java |  14 +--
 .../jmh/io/lettuce/core/protocol/JmhMain.java |   3 +-
 6 files changed, 83 insertions(+), 92 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 8a368610d1..cc321825e1 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -48,6 +48,7 @@
  * @author Will Glozer
  * @author Mark Paluch
  * @author Jongyeol Choi
+ * @author Grzegorz Szpak
  */
 public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCommands {
 
@@ -560,12 +561,12 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
                 }
             }
 
-            if (buffer.refCnt() != 0) {
-                buffer.discardSomeReadBytes();
-            }
-
             afterComplete(ctx, command);
         }
+
+        if (buffer.refCnt() != 0) {
+            buffer.discardReadBytes();
+        }
     }
 
     protected boolean canDecode(ByteBuf buffer) {
diff --git a/src/test/jmh/io/lettuce/core/JmhMain.java b/src/test/jmh/io/lettuce/core/JmhMain.java
index 8e3a0ed529..6e212b00a6 100644
--- a/src/test/jmh/io/lettuce/core/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/JmhMain.java
@@ -32,8 +32,6 @@
 public class JmhMain {
 
     public static void main(String... args) throws RunnerException {
-
-        // runCommandHandlerBenchmark();
         runRedisClientBenchmark();
     }
 
@@ -41,18 +39,9 @@ private static void runBenchmarks() throws RunnerException {
         new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).build()).run();
     }
 
-    private static void runCommandBenchmark() throws RunnerException {
-
-        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).include(".*CommandBenchmark.*")
-                .build()).run();
-
-        new Runner(prepareOptions().mode(Mode.Throughput).timeUnit(TimeUnit.SECONDS).include(".*CommandBenchmark.*").build())
-                .run();
-    }
-
     private static void runRedisClientBenchmark() throws RunnerException {
 
-        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).include(".*RedisClientBenchmark.*")
+        new Runner(prepareOptions().mode(Mode.AverageTime).timeUnit(TimeUnit.NANOSECONDS).include(".RedisClientBenchmark.*")
                 .build()).run();
     }
 
diff --git a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
index 858a892552..fcec09904f 100644
--- a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
@@ -21,11 +21,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.TearDown;
+import org.openjdk.jmh.annotations.*;
 
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.codec.ByteArrayCodec;
@@ -33,13 +29,17 @@
 import io.netty.buffer.ByteBuf;
 
 /**
- * Benchmark for {@link CommandHandler}. Test cases:
+ * Benchmark for {@link CommandHandler}.
+ * <p/>
+ * Test cases:
  * <ul>
+ * <li>user command writes</li>
  * <li>netty (in-eventloop) writes</li>
- * <li>netty (in-eventloop) batch writes</li>
+ * <li>netty (in-eventloop) reads</li>
  * </ul>
  *
  * @author Mark Paluch
+ * @author Grzegorz Szpak
  */
 @State(Scope.Benchmark)
 public class CommandHandlerBenchmark {
@@ -56,103 +56,110 @@ public class CommandHandlerBenchmark {
     private ByteBuf reply10;
     private ByteBuf reply100;
     private ByteBuf reply1000;
+    private List<Command> commands1;
+    private List<Command> commands10;
+    private List<Command> commands100;
+    private List<Command> commands1000;
 
     @Setup
     public void setup() throws Exception {
+
         commandHandler = new CommandHandler(CLIENT_OPTIONS, EmptyClientResources.INSTANCE, new DefaultEndpoint(CLIENT_OPTIONS));
         commandHandler.channelRegistered(CHANNEL_HANDLER_CONTEXT);
         commandHandler.setState(CommandHandler.LifecycleState.CONNECTED);
 
-        reply1 = strToByteBuf(String.format("+%s", VALUE));
-        reply10 = strToByteBuf(makeBulkReply(10));
-        reply100 = strToByteBuf(makeBulkReply(100));
-        reply1000 = strToByteBuf(makeBulkReply(1000));
-        for (ByteBuf buf: Arrays.asList(reply1, reply10, reply100, reply1000)) {
-            buf.retain();
-        }
+        reply1 = createByteBuf(String.format("+%s", VALUE));
+        reply10 = createByteBuf(createBulkReply(10));
+        reply100 = createByteBuf(createBulkReply(100));
+        reply1000 = createByteBuf(createBulkReply(1000));
+
+        commands1 = createCommands(1);
+        commands10 = createCommands(10);
+        commands100 = createCommands(100);
+        commands1000 = createCommands(1000);
     }
 
     @TearDown
     public void tearDown() throws Exception {
+
         commandHandler.channelUnregistered(CHANNEL_HANDLER_CONTEXT);
-        for (ByteBuf buf: Arrays.asList(reply1, reply10, reply100, reply1000)) {
-            buf.release(2);
-        }
+
+        Arrays.asList(reply1, reply10, reply100, reply1000).forEach(ByteBuf::release);
     }
 
-    private ByteBuf strToByteBuf(String str) {
+    private static List<Command> createCommands(int count) {
+        return IntStream.range(0, count).mapToObj(i -> createCommand()).collect(Collectors.toList());
+    }
+
+    private static ByteBuf createByteBuf(String str) {
+
         ByteBuf buf = CHANNEL_HANDLER_CONTEXT.alloc().directBuffer();
         buf.writeBytes(str.getBytes());
         return buf;
     }
 
-    private String makeBulkReply(int numOfReplies) {
+    private static String createBulkReply(int numOfReplies) {
+
         String baseReply = String.format("$%d\r\n%s\r\n", VALUE.length(), VALUE);
+
         return String.join("", Collections.nCopies(numOfReplies, baseReply));
     }
 
-    private Command makeCommand() {
-        return new Command(CommandType.GET, new ValueOutput<>(CODEC), new CommandArgs(CODEC).addKey(KEY));
+    @SuppressWarnings("unchecked")
+    private static Command createCommand() {
+        return new Command(CommandType.GET, new ValueOutput<>(CODEC), new CommandArgs(CODEC).addKey(KEY)) {
+            @Override
+            public boolean isDone() {
+                return false;
+            }
+        };
     }
 
     @Benchmark
     public void measureNettyWriteAndRead() throws Exception {
-        Command command = makeCommand();
+
+        Command command = createCommand();
 
         commandHandler.write(CHANNEL_HANDLER_CONTEXT, command, PROMISE);
+        int index = reply1.readerIndex();
+        reply1.retain();
 
         commandHandler.channelRead(CHANNEL_HANDLER_CONTEXT, reply1);
-        reply1.resetReaderIndex();
-        reply1.retain();
+
+        // cleanup
+        reply1.readerIndex(index);
     }
 
     @Benchmark
     public void measureNettyWriteAndReadBatch1() throws Exception {
-        List<Command> commands = Collections.singletonList(makeCommand());
-
-        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commands, PROMISE);
-
-        commandHandler.channelRead(CHANNEL_HANDLER_CONTEXT, reply1);
-        reply1.resetReaderIndex();
-        reply1.retain();
+        doBenchmark(commands1, reply1);
     }
 
     @Benchmark
     public void measureNettyWriteAndReadBatch10() throws Exception {
-        List<Command> commands = IntStream.range(0, 10)
-                .mapToObj(i -> makeCommand())
-                .collect(Collectors.toList());
-
-        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commands, PROMISE);
-
-        commandHandler.channelRead(CHANNEL_HANDLER_CONTEXT, reply10);
-        reply10.resetReaderIndex();
-        reply10.retain();
+        doBenchmark(commands10, reply10);
     }
 
     @Benchmark
     public void measureNettyWriteAndReadBatch100() throws Exception {
-        List<Command> commands = IntStream.range(0, 100)
-                .mapToObj(i -> makeCommand())
-                .collect(Collectors.toList());
-
-        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commands, PROMISE);
-
-        commandHandler.channelRead(CHANNEL_HANDLER_CONTEXT, reply100);
-        reply100.resetReaderIndex();
-        reply100.retain();
+        doBenchmark(commands100, reply100);
     }
 
     @Benchmark
     public void measureNettyWriteAndReadBatch1000() throws Exception {
-        List<Command> commands = IntStream.range(0, 1000)
-                .mapToObj(i -> makeCommand())
-                .collect(Collectors.toList());
+        doBenchmark(commands1000, reply1000);
+    }
+
+    private void doBenchmark(List<Command> commandStack, ByteBuf response) throws Exception {
+
+        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commandStack, PROMISE);
+
+        int index = response.readerIndex();
+        response.retain();
 
-        commandHandler.write(CHANNEL_HANDLER_CONTEXT, commands, PROMISE);
+        commandHandler.channelRead(CHANNEL_HANDLER_CONTEXT, response);
 
-        commandHandler.channelRead(CHANNEL_HANDLER_CONTEXT, reply1000);
-        reply1000.resetReaderIndex();
-        reply1000.retain();
+        // cleanup
+        response.readerIndex(index);
     }
 }
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyChannel.java b/src/test/jmh/io/lettuce/core/protocol/EmptyChannel.java
index 1e88550f5e..84ba64fdbb 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyChannel.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyChannel.java
@@ -1,20 +1,15 @@
 package io.lettuce.core.protocol;
 
+import java.net.SocketAddress;
+
 import io.netty.buffer.ByteBufAllocator;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelConfig;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelId;
-import io.netty.channel.ChannelMetadata;
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.ChannelProgressivePromise;
-import io.netty.channel.ChannelPromise;
-import io.netty.channel.EventLoop;
+import io.netty.channel.*;
 import io.netty.util.Attribute;
 import io.netty.util.AttributeKey;
 
-import java.net.SocketAddress;
-
+/**
+ * @author Grzegorz Szpak
+ */
 public class EmptyChannel implements Channel {
 
     private final static ChannelConfig CONFIG = new EmptyConfig();
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyConfig.java b/src/test/jmh/io/lettuce/core/protocol/EmptyConfig.java
index 07c52d7317..66f09fa0f7 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyConfig.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyConfig.java
@@ -1,15 +1,15 @@
 package io.lettuce.core.protocol;
 
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.channel.ChannelConfig;
-import io.netty.channel.ChannelOption;
-import io.netty.channel.MessageSizeEstimator;
-import io.netty.channel.RecvByteBufAllocator;
-import io.netty.channel.WriteBufferWaterMark;
-
 import java.util.Map;
 
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.*;
+
+/**
+ * @author Grzegorz Szpak
+ */
 public class EmptyConfig implements ChannelConfig {
+
     @Override
     public Map<ChannelOption<?>, Object> getOptions() {
         return null;
diff --git a/src/test/jmh/io/lettuce/core/protocol/JmhMain.java b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
index 978e655676..d30706119e 100644
--- a/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
@@ -15,7 +15,6 @@
  */
 package io.lettuce.core.protocol;
 
-import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 import org.openjdk.jmh.annotations.Mode;
@@ -32,7 +31,7 @@
  */
 public class JmhMain {
 
-    public static void main(String... args) throws IOException, RunnerException {
+    public static void main(String... args) throws RunnerException {
 
         // run selectively
         // runCommandBenchmark();

From abc6ff5c3b6e44234c5d063530f5f5a59b37ac1b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 17 Mar 2018 16:59:04 +0100
Subject: [PATCH 421/808] Retain sent commands on requeue failure completion
 #734

Lettuce now retains the actual sent commands during exceptional completion. Failures on requeue can occur if the connection is closed or queue bounds are exceeded. Previously, we lost command context because the listener was recycled hence command completion ran into NullPointerExceptions.
---
 .../core/protocol/DefaultEndpoint.java        | 11 ++++---
 .../core/protocol/DefaultEndpointTest.java    | 30 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index 1a02dfb35e..e2c5eed81c 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -767,7 +767,7 @@ public void operationComplete(ChannelFuture future) {
 
                 dequeue();
 
-                if (future.cause() != null) {
+                if (!future.isSuccess() && future.cause() != null) {
                     complete(future.cause());
                 }
             } finally {
@@ -860,7 +860,6 @@ private void doComplete(Future<Void> future) {
                 RedisCommand<?, ?, ?> sentCommand = this.sentCommand;
                 Collection<? extends RedisCommand<?, ?, ?>> sentCommands = this.sentCommands;
                 DefaultEndpoint endpoint = this.endpoint;
-
                 channel.eventLoop().submit(() -> {
                     requeueCommands(sentCommand, sentCommands, endpoint);
                 });
@@ -881,18 +880,22 @@ private void doComplete(Future<Void> future) {
             }
         }
 
+        @SuppressWarnings("unchecked")
         private void requeueCommands(RedisCommand<?, ?, ?> sentCommand, Collection sentCommands, DefaultEndpoint endpoint) {
+
             if (sentCommand != null) {
                 try {
                     endpoint.write(sentCommand);
                 } catch (Exception e) {
-                    complete(e);
+                    sentCommand.completeExceptionally(e);
                 }
             } else {
                 try {
                     endpoint.write(sentCommands);
                 } catch (Exception e) {
-                    complete(e);
+                    for (RedisCommand<?, ?, ?> command : (Collection<RedisCommand>) sentCommands) {
+                        command.completeExceptionally(e);
+                    }
                 }
             }
         }
diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
index ec9030bcaf..90af5cf644 100644
--- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
@@ -18,12 +18,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.nio.channels.ClosedChannelException;
 import java.util.Collection;
 import java.util.Queue;
 import java.util.concurrent.atomic.AtomicLong;
@@ -38,6 +38,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -53,6 +54,7 @@
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.DefaultChannelPromise;
+import io.netty.channel.EventLoop;
 import io.netty.handler.codec.EncoderException;
 import io.netty.util.concurrent.ImmediateEventExecutor;
 
@@ -318,6 +320,32 @@ public void closeAllowsOnlyOneCall() {
         verify(connectionWatchdog).prepareClose();
     }
 
+    @Test
+    public void retryListenerCompletesSuccessfullyAfterDeferredRequeue() {
+
+        DefaultEndpoint.RetryListener listener = DefaultEndpoint.RetryListener.newInstance(sut, command);
+
+        ChannelFuture future = mock(ChannelFuture.class);
+        EventLoop eventLoopGroup = mock(EventLoop.class);
+
+        when(future.isSuccess()).thenReturn(false);
+        when(future.cause()).thenReturn(new ClosedChannelException());
+        when(channel.eventLoop()).thenReturn(eventLoopGroup);
+        when(channel.close()).thenReturn(mock(ChannelFuture.class));
+
+        sut.notifyChannelActive(channel);
+        sut.closeAsync();
+
+        listener.operationComplete(future);
+
+        ArgumentCaptor<Runnable> runnableCaptor = ArgumentCaptor.forClass(Runnable.class);
+        verify(eventLoopGroup).submit(runnableCaptor.capture());
+
+        runnableCaptor.getValue().run();
+
+        assertThat(command.exception).isInstanceOf(RedisException.class);
+    }
+
     @Test
     public void testMTCConcurrentConcurrentWrite() throws Throwable {
         TestFramework.runOnce(new MTCConcurrentConcurrentWrite(command));

From 62adb56e903634dfcccfdb8748b193e3168cf59e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 19 Mar 2018 15:20:12 +0100
Subject: [PATCH 422/808] Inspect Pub/Sub responses for interleaved messages
 #724

Lettuce now inspects Redis responses via PubSubCommandHandler and ReplayOutput whether a received response is a Pub/Sub message or whether the response belongs to a command on the protocol stack. Introspection is required as Redis responses may contain interleaved messages that do not belong to a command or may arrive before the command response.

Previously, interleaved messages could get used to complete commands on the protocol stack which causes a defunct protocol state.
---
 .../io/lettuce/core/output/ReplayOutput.java  | 197 ++++++++++++++++++
 .../lettuce/core/protocol/CommandHandler.java |  57 ++++-
 .../core/pubsub/PubSubCommandHandler.java     | 154 +++++++++++++-
 .../lettuce/core/output/ReplayOutputTest.java |  82 ++++++++
 .../core/pubsub/PubSubCommandHandlerTest.java |  77 +++++++
 5 files changed, 551 insertions(+), 16 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/output/ReplayOutput.java
 create mode 100644 src/test/java/io/lettuce/core/output/ReplayOutputTest.java

diff --git a/src/main/java/io/lettuce/core/output/ReplayOutput.java b/src/main/java/io/lettuce/core/output/ReplayOutput.java
new file mode 100644
index 0000000000..15b5ab1baa
--- /dev/null
+++ b/src/main/java/io/lettuce/core/output/ReplayOutput.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.output;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
+
+/**
+ * Replayable {@link CommandOutput} capturing output signals to replay these on a target {@link CommandOutput}. Replay is useful
+ * when the response requires inspection prior to dispatching the actual output to a command target.
+ *
+ * @author Mark Paluch
+ * @since 5.0.3
+ */
+public class ReplayOutput<K, V> extends CommandOutput<K, V, List<ReplayOutput.Signal>> {
+
+    /**
+     * Initialize a new instance that encodes and decodes keys and values using the supplied codec.
+     */
+    public ReplayOutput() {
+        super((RedisCodec) StringCodec.ASCII, new ArrayList<>());
+    }
+
+    @Override
+    public void set(ByteBuffer bytes) {
+        output.add(new BulkString(bytes));
+    }
+
+    @Override
+    public void set(long integer) {
+        output.add(new Integer(integer));
+    }
+
+    @Override
+    public void setError(ByteBuffer error) {
+        error.mark();
+        output.add(new ErrorBytes(error));
+        error.reset();
+        super.setError(error);
+    }
+
+    @Override
+    public void setError(String error) {
+        output.add(new ErrorString(error));
+        super.setError(error);
+    }
+
+    @Override
+    public void complete(int depth) {
+        output.add(new Complete(depth));
+    }
+
+    @Override
+    public void multi(int count) {
+        output.add(new Multi(count));
+    }
+
+    /**
+     * Replay all captured signals on a {@link CommandOutput}.
+     *
+     * @param target the target {@link CommandOutput}.
+     */
+    public void replay(CommandOutput<?, ?, ?> target) {
+
+        for (Signal signal : output) {
+            signal.replay(target);
+        }
+    }
+
+    /**
+     * Encapsulates a replayable decoding signal.
+     */
+    public static abstract class Signal {
+
+        /**
+         * Replay the signal on a {@link CommandOutput}.
+         *
+         * @param target
+         */
+        protected abstract void replay(CommandOutput<?, ?, ?> target);
+    }
+
+    abstract static class BulkStringSupport extends Signal {
+
+        final ByteBuffer message;
+
+        BulkStringSupport(ByteBuffer message) {
+
+            if (message != null) {
+
+                // need to copy the buffer to prevent buffer lifecycle mismatch
+                this.message = ByteBuffer.allocate(message.remaining());
+                this.message.put(message);
+                this.message.rewind();
+            } else {
+                this.message = null;
+            }
+        }
+    }
+
+    public static class BulkString extends BulkStringSupport {
+
+        BulkString(ByteBuffer message) {
+            super(message);
+        }
+
+        @Override
+        protected void replay(CommandOutput<?, ?, ?> target) {
+            target.set(message);
+        }
+    }
+
+    static class Integer extends Signal {
+
+        final long message;
+
+        Integer(long message) {
+            this.message = message;
+        }
+
+        @Override
+        protected void replay(CommandOutput<?, ?, ?> target) {
+            target.set(message);
+        }
+    }
+
+    public static class ErrorBytes extends BulkStringSupport {
+
+        ErrorBytes(ByteBuffer message) {
+            super(message);
+        }
+
+        @Override
+        protected void replay(CommandOutput<?, ?, ?> target) {
+            target.setError(message);
+        }
+    }
+
+    static class ErrorString extends Signal {
+
+        final String message;
+
+        ErrorString(String message) {
+            this.message = message;
+        }
+
+        @Override
+        protected void replay(CommandOutput<?, ?, ?> target) {
+            target.setError(message);
+        }
+    }
+
+    static class Multi extends Signal {
+
+        final int count;
+
+        Multi(int count) {
+            this.count = count;
+        }
+
+        @Override
+        protected void replay(CommandOutput<?, ?, ?> target) {
+            target.multi(count);
+        }
+    }
+
+    static class Complete extends Signal {
+
+        final int depth;
+
+        public Complete(int depth) {
+            this.depth = depth;
+        }
+
+        @Override
+        protected void replay(CommandOutput<?, ?, ?> target) {
+            target.complete(depth);
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index cc321825e1..34775ff807 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -411,7 +411,7 @@ private void addToStack(RedisCommand<?, ?, ?> command, ChannelPromise promise) {
 
             if (command.getOutput() == null) {
                 // fire&forget commands are excluded from metrics
-                command.complete();
+                complete(command);
             }
 
             RedisCommand<?, ?, ?> redisCommand = potentiallyWrapLatencyCommand(command);
@@ -552,16 +552,18 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
                 onProtectedMode(command.getOutput().getError());
             } else {
 
-                stack.poll();
+                if (canComplete(command)) {
+                    stack.poll();
 
-                try {
-                    command.complete();
-                } catch (Exception e) {
-                    logger.warn("{} Unexpected exception during request: {}", logPrefix, e.toString(), e);
+                    try {
+                        complete(command);
+                    } catch (Exception e) {
+                        logger.warn("{} Unexpected exception during request: {}", logPrefix, e.toString(), e);
+                    }
                 }
             }
 
-            afterComplete(ctx, command);
+            afterDecode(ctx, command);
         }
 
         if (buffer.refCnt() != 0) {
@@ -569,10 +571,36 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
         }
     }
 
+    /**
+     * Decoding hook: Can the buffer be decoded to a command.
+     *
+     * @param buffer
+     * @return
+     */
     protected boolean canDecode(ByteBuf buffer) {
         return !stack.isEmpty() && buffer.isReadable();
     }
 
+    /**
+     * Decoding hook: Can the command be completed.
+     *
+     * @param command
+     * @return
+     */
+    protected boolean canComplete(RedisCommand<?, ?, ?> command) {
+        return true;
+    }
+
+    /**
+     * Decoding hook: Complete a command.
+     *
+     * @param command
+     * @see RedisCommand#complete()
+     */
+    protected void complete(RedisCommand<?, ?, ?> command) {
+        command.complete();
+    }
+
     private boolean decode(ChannelHandlerContext ctx, ByteBuf buffer, RedisCommand<?, ?, ?> command) {
 
         if (latencyMetricsEnabled && command instanceof WithLatency) {
@@ -596,7 +624,7 @@ private boolean decode(ChannelHandlerContext ctx, ByteBuf buffer, RedisCommand<?
 
     private boolean decode0(ChannelHandlerContext ctx, ByteBuf buffer, RedisCommand<?, ?, ?> command) {
 
-        if (!decode(buffer, command, command.getOutput())) {
+        if (!decode(buffer, command, getCommandOutput(command))) {
 
             if (command instanceof DemandAware.Sink) {
 
@@ -616,6 +644,17 @@ private boolean decode0(ChannelHandlerContext ctx, ByteBuf buffer, RedisCommand<
         return true;
     }
 
+    /**
+     * Decoding hook: Retrieve {@link CommandOutput} for {@link RedisCommand} decoding.
+     *
+     * @param command
+     * @return
+     * @see RedisCommand#getOutput()
+     */
+    protected CommandOutput<?, ?, ?> getCommandOutput(RedisCommand<?, ?, ?> command) {
+        return command.getOutput();
+    }
+
     protected boolean decode(ByteBuf buffer, CommandOutput<?, ?, ?> output) {
         return rsm.decode(buffer, output);
     }
@@ -682,7 +721,7 @@ private void onProtectedMode(String message) {
      * @param ctx
      * @param command
      */
-    protected void afterComplete(ChannelHandlerContext ctx, RedisCommand<?, ?, ?> command) {
+    protected void afterDecode(ChannelHandlerContext ctx, RedisCommand<?, ?, ?> command) {
     }
 
     private void recordLatency(WithLatency withLatency, ProtocolKeyword commandType) {
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
index 0b2197a467..d816f6d5da 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
@@ -15,8 +15,15 @@
  */
 package io.lettuce.core.pubsub;
 
+import java.nio.ByteBuffer;
+import java.util.ArrayDeque;
+import java.util.Deque;
+
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.output.ReplayOutput;
 import io.lettuce.core.protocol.CommandHandler;
 import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.resource.ClientResources;
@@ -25,8 +32,11 @@
 import io.netty.channel.ChannelHandlerContext;
 
 /**
- * A netty {@link ChannelHandler} responsible for writing redis pub/sub commands and reading the response stream from the
- * server.
+ * A netty {@link ChannelHandler} responsible for writing Redis Pub/Sub commands and reading the response stream from the
+ * server. {@link PubSubCommandHandler} accounts for Pub/Sub message notification calling back
+ * {@link PubSubEndpoint#notifyMessage(PubSubOutput)}. Redis responses can be interleaved in the sense that a response contains
+ * a Pub/Sub message first, then a command response. Possible interleave is introspected via {@link ResponseHeaderReplayOutput}
+ * and decoding hooks.
  *
  * @param <K> Key type.
  * @param <V> Value type.
@@ -37,6 +47,9 @@ public class PubSubCommandHandler<K, V> extends CommandHandler {
 
     private final PubSubEndpoint<K, V> endpoint;
     private final RedisCodec<K, V> codec;
+    private final Deque<ReplayOutput<K, V>> queue = new ArrayDeque<>();
+
+    private ResponseHeaderReplayOutput<K, V> replay;
     private PubSubOutput<K, V, V> output;
 
     /**
@@ -49,6 +62,7 @@ public class PubSubCommandHandler<K, V> extends CommandHandler {
      */
     public PubSubCommandHandler(ClientOptions clientOptions, ClientResources clientResources, RedisCodec<K, V> codec,
             PubSubEndpoint<K, V> endpoint) {
+
         super(clientOptions, clientResources, endpoint);
 
         this.endpoint = endpoint;
@@ -56,13 +70,32 @@ public PubSubCommandHandler(ClientOptions clientOptions, ClientResources clientR
         this.output = new PubSubOutput<>(codec);
     }
 
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+
+        replay = null;
+        queue.clear();
+
+        super.channelInactive(ctx);
+    }
+
     @SuppressWarnings("unchecked")
     @Override
     protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws InterruptedException {
 
-        super.decode(ctx, buffer);
+        if (!getStack().isEmpty()) {
+            super.decode(ctx, buffer);
+        }
+
+        ReplayOutput<K, V> replay;
+        while ((replay = queue.poll()) != null) {
+
+            replay.replay(output);
+            endpoint.notifyMessage(output);
+            output = new PubSubOutput<>(codec);
+        }
 
-        while (buffer.isReadable()) {
+        while (super.getStack().isEmpty() && buffer.isReadable()) {
 
             if (!super.decode(buffer, output)) {
                 return;
@@ -70,9 +103,10 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
 
             endpoint.notifyMessage(output);
             output = new PubSubOutput<>(codec);
-
-            buffer.discardReadBytes();
         }
+
+        buffer.discardReadBytes();
+
     }
 
     @Override
@@ -80,11 +114,117 @@ protected boolean canDecode(ByteBuf buffer) {
         return super.canDecode(buffer) && output.type() == null;
     }
 
+    @Override
+    protected boolean canComplete(RedisCommand<?, ?, ?> command) {
+
+        if (isPubSubMessage(replay)) {
+
+            queue.add(replay);
+            replay = null;
+            return false;
+        }
+
+        return super.canComplete(command);
+    }
+
+    @Override
+    protected void complete(RedisCommand<?, ?, ?> command) {
+
+        if (replay != null && command.getOutput() != null) {
+            try {
+                replay.replay(command.getOutput());
+            } catch (Exception e) {
+                command.completeExceptionally(e);
+            }
+            replay = null;
+        }
+
+        super.complete(command);
+    }
+
+    /**
+     * Check whether {@link ResponseHeaderReplayOutput} contains a Pub/Sub message that requires Pub/Sub dispatch instead of to
+     * be used as Command output.
+     *
+     * @param replay
+     * @return
+     */
+    private static boolean isPubSubMessage(ResponseHeaderReplayOutput replay) {
+
+        if (replay == null) {
+            return false;
+        }
+
+        String firstElement = replay.firstElement;
+        if (replay.multiCount != null && firstElement != null) {
+
+            if (replay.multiCount == 3 && firstElement.equalsIgnoreCase(PubSubOutput.Type.message.name())) {
+                return true;
+            }
+
+            if (replay.multiCount == 4 && firstElement.equalsIgnoreCase(PubSubOutput.Type.pmessage.name())) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    protected CommandOutput<?, ?, ?> getCommandOutput(RedisCommand<?, ?, ?> command) {
+
+        if (getStack().isEmpty() || command.getOutput() == null) {
+            return super.getCommandOutput(command);
+        }
+
+        if (replay == null) {
+            replay = new ResponseHeaderReplayOutput<>();
+        }
+
+        return replay;
+    }
+
     @Override
     @SuppressWarnings("unchecked")
-    protected void afterComplete(ChannelHandlerContext ctx, RedisCommand<?, ?, ?> command) {
+    protected void afterDecode(ChannelHandlerContext ctx, RedisCommand<?, ?, ?> command) {
+
         if (command.getOutput() instanceof PubSubOutput) {
             endpoint.notifyMessage((PubSubOutput) command.getOutput());
         }
     }
+
+    /**
+     * Inspectable {@link ReplayOutput} to investigate the first multi and string response elements.
+     *
+     * @param <K>
+     * @param <V>
+     */
+    static class ResponseHeaderReplayOutput<K, V> extends ReplayOutput<K, V> {
+
+        Integer multiCount;
+        String firstElement;
+
+        @Override
+        public void set(ByteBuffer bytes) {
+
+            if (firstElement == null && bytes != null && bytes.remaining() > 0) {
+
+                bytes.mark();
+                firstElement = StringCodec.ASCII.decodeKey(bytes);
+                bytes.reset();
+            }
+
+            super.set(bytes);
+        }
+
+        @Override
+        public void multi(int count) {
+
+            if (multiCount == null) {
+                multiCount = count;
+            }
+
+            super.multi(count);
+        }
+    }
 }
diff --git a/src/test/java/io/lettuce/core/output/ReplayOutputTest.java b/src/test/java/io/lettuce/core/output/ReplayOutputTest.java
new file mode 100644
index 0000000000..9686d38348
--- /dev/null
+++ b/src/test/java/io/lettuce/core/output/ReplayOutputTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.output;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.nio.ByteBuffer;
+import java.util.Collections;
+
+import org.junit.Test;
+
+import io.lettuce.core.codec.StringCodec;
+
+/**
+ * @author Mark Paluch
+ */
+public class ReplayOutputTest {
+
+    @Test
+    public void shouldReplaySimpleCompletion() {
+
+        ReplayOutput<String, String> replay = new ReplayOutput<>();
+        ValueOutput<String, String> target = new ValueOutput<>(StringCodec.ASCII);
+
+        replay.multi(1);
+        replay.set(ByteBuffer.wrap("foo".getBytes()));
+        replay.complete(1);
+
+        replay.replay(target);
+
+        assertThat(target.get()).isEqualTo("foo");
+    }
+
+    @Test
+    public void shouldReplayNestedCompletion() {
+
+        ReplayOutput<String, String> replay = new ReplayOutput<>();
+        ArrayOutput<String, String> target = new ArrayOutput<>(StringCodec.ASCII);
+
+        replay.multi(1);
+        replay.multi(1);
+        replay.set(ByteBuffer.wrap("foo".getBytes()));
+        replay.complete(2);
+
+        replay.multi(1);
+        replay.set(ByteBuffer.wrap("bar".getBytes()));
+        replay.complete(2);
+        replay.complete(1);
+
+        replay.replay(target);
+
+        assertThat(target.get().get(0)).isEqualTo(Collections.singletonList("foo"));
+        assertThat(target.get().get(1)).isEqualTo(Collections.singletonList("bar"));
+    }
+
+    @Test
+    public void shouldDecodeErrorResponse() {
+
+        ReplayOutput<String, String> replay = new ReplayOutput<>();
+        ValueOutput<String, String> target = new ValueOutput<>(StringCodec.ASCII);
+
+        replay.setError(ByteBuffer.wrap("foo".getBytes()));
+
+        replay.replay(target);
+
+        assertThat(replay.getError()).isEqualTo("foo");
+        assertThat(target.getError()).isEqualTo("foo");
+    }
+}
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java
index 468d2b3b6d..cac28b762f 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java
@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.Queue;
@@ -24,6 +25,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -109,4 +111,79 @@ public void shouldCompleteCommandExceptionallyOnOutputFailure() throws Exception
 
         assertThat(ReflectionTestUtils.getField(command, "exception")).isInstanceOf(IllegalStateException.class);
     }
+
+    @Test
+    public void shouldDecodeRegularCommand() throws Exception {
+
+        sut.channelRegistered(context);
+        sut.channelActive(context);
+        stack.add(command);
+
+        sut.channelRead(context, Unpooled.wrappedBuffer("+OK\r\n".getBytes()));
+
+        assertThat(command.get()).isEqualTo("OK");
+    }
+
+    @Test
+    public void shouldDecodeTwoCommands() throws Exception {
+
+        Command<String, String, String> command1 = new Command<>(CommandType.APPEND, new StatusOutput<>(new Utf8StringCodec()),
+                null);
+        Command<String, String, String> command2 = new Command<>(CommandType.APPEND, new StatusOutput<>(new Utf8StringCodec()),
+                null);
+
+        sut.channelRegistered(context);
+        sut.channelActive(context);
+        stack.add(command1);
+        stack.add(command2);
+
+        sut.channelRead(context, Unpooled.wrappedBuffer("+OK\r\n+YEAH\r\n".getBytes()));
+
+        assertThat(command1.get()).isEqualTo("OK");
+        assertThat(command2.get()).isEqualTo("YEAH");
+    }
+
+    @Test
+    public void shouldPropagatePubSubResponseToOutput() throws Exception {
+
+        Command<String, String, String> command1 = new Command<>(CommandType.APPEND, new StatusOutput<>(new Utf8StringCodec()),
+                null);
+
+        sut.channelRegistered(context);
+        sut.channelActive(context);
+        stack.add(command1);
+
+        sut.channelRead(context, Unpooled.wrappedBuffer("*3\r\n$7\r\nmessage\r\n$3\r\nfoo\r\n$3\r\nbar\r\n".getBytes()));
+
+        assertThat(command1.isDone()).isFalse();
+
+        verify(endpoint).notifyMessage(any());
+    }
+
+    @Test
+    public void shouldPropagateInterleavedPubSubResponseToOutput() throws Exception {
+
+        Command<String, String, String> command1 = new Command<>(CommandType.APPEND, new StatusOutput<>(new Utf8StringCodec()),
+                null);
+        Command<String, String, String> command2 = new Command<>(CommandType.APPEND, new StatusOutput<>(new Utf8StringCodec()),
+                null);
+
+        sut.channelRegistered(context);
+        sut.channelActive(context);
+        stack.add(command1);
+        stack.add(command2);
+
+        sut.channelRead(context, Unpooled
+                .wrappedBuffer("+OK\r\n*4\r\n$8\r\npmessage\r\n$1\r\n*\r\n$3\r\nfoo\r\n$3\r\nbar\r\n+YEAH\r\n".getBytes()));
+
+        assertThat(command1.get()).isEqualTo("OK");
+        assertThat(command2.get()).isEqualTo("YEAH");
+
+        ArgumentCaptor<PubSubOutput> captor = ArgumentCaptor.forClass(PubSubOutput.class);
+        verify(endpoint).notifyMessage(captor.capture());
+
+        assertThat(captor.getValue().pattern()).isEqualTo("*");
+        assertThat(captor.getValue().channel()).isEqualTo("foo");
+        assertThat(captor.getValue().get()).isEqualTo("bar");
+    }
 }

From d3b707070acfd9df17e3c58e87538ad4f4795fdb Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 19 Mar 2018 17:10:04 +0100
Subject: [PATCH 423/808] Add alias to RedisClusterNode #712

Lettuce now provides a cluster node alias to better cope with load balancers or alternate cluster names. We are using the Redis reported hostname as URI (was previously the seed node URI) and add the seed node URI as alias. This way we make sure to connect the appropriate host directly without connecting the balancer and receiving redirects.

Redirects can happen in an environment where the load balancer forwards connections to random cluster master nodes.
---
 .../ClusterPubSubConnectionProvider.java      |  2 +-
 .../PooledClusterConnectionProvider.java      | 17 +----
 .../cluster/models/partitions/Partitions.java | 42 ++++++++++--
 .../models/partitions/RedisClusterNode.java   | 18 +++++
 .../topology/ClusterTopologyRefresh.java      | 17 +++--
 .../cluster/topology/NodeTopologyView.java    | 10 +--
 .../cluster/topology/NodeTopologyViews.java   |  2 +-
 .../models/partitions/PartitionsTest.java     | 66 +++++++++++--------
 .../partitions/RedisClusterNodeTest.java      |  2 +
 .../topology/NodeTopologyViewsTest.java       | 12 ++--
 10 files changed, 124 insertions(+), 64 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
index 58e6a02449..7176f6de85 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
@@ -175,7 +175,7 @@ public void punsubscribed(K pattern, long count) {
         }
 
         private RedisClusterNode getNode() {
-            return nodeId != null ? getPartitions().getPartitionByNodeId(nodeId) : getPartition(host, port);
+            return nodeId != null ? getPartitions().getPartitionByNodeId(nodeId) : getPartitions().getPartition(host, port);
         }
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
index 942b007afa..c67f293fcc 100644
--- a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
@@ -379,7 +379,7 @@ private void beforeGetConnection(Intent intent, String host, int port) {
         }
 
         if (validateClusterNodeMembership()) {
-            RedisClusterNode redisClusterNode = getPartition(host, port);
+            RedisClusterNode redisClusterNode = partitions.getPartition(host, port);
 
             if (redisClusterNode == null) {
                 HostAndPort hostAndPort = HostAndPort.of(host, port);
@@ -388,17 +388,6 @@ private void beforeGetConnection(Intent intent, String host, int port) {
         }
     }
 
-    protected RedisClusterNode getPartition(String host, int port) {
-
-        for (RedisClusterNode partition : partitions) {
-            RedisURI uri = partition.getUri();
-            if (port == uri.getPort() && host.equals(uri.getHost())) {
-                return partition;
-            }
-        }
-        return null;
-    }
-
     @Override
     public void close() {
         closeAsync().join();
@@ -476,7 +465,7 @@ private boolean isStale(ConnectionKey connectionKey) {
             return false;
         }
 
-        if (connectionKey.host != null && getPartition(connectionKey.host, connectionKey.port) != null) {
+        if (connectionKey.host != null && partitions.getPartition(connectionKey.host, connectionKey.port) != null) {
             return false;
         }
 
@@ -581,7 +570,7 @@ public ConnectionFuture<StatefulRedisConnection<K, V>> apply(ConnectionKey key)
             if (key.host != null) {
 
                 if (validateClusterNodeMembership()) {
-                    if (getPartition(key.host, key.port) == null) {
+                    if (partitions.getPartition(key.host, key.port) == null) {
                         throw invalidConnectionPoint(key.host + ":" + key.port);
                     }
                 }
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
index 62a28d661c..842800297f 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
@@ -17,6 +17,7 @@
 
 import java.util.*;
 
+import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.SlotHash;
 import io.lettuce.core.internal.LettuceAssert;
 
@@ -61,8 +62,8 @@ public class Partitions implements Collection<RedisClusterNode> {
     /**
      * Retrieve a {@link RedisClusterNode} by its slot number. This method does not distinguish between masters and slaves.
      *
-     * @param slot the slot
-     * @return RedisClusterNode or {@literal null}
+     * @param slot the slot hash.
+     * @return the {@link RedisClusterNode} or {@literal null} if not found.
      */
     public RedisClusterNode getPartitionBySlot(int slot) {
         return slotCache[slot];
@@ -71,8 +72,8 @@ public RedisClusterNode getPartitionBySlot(int slot) {
     /**
      * Retrieve a {@link RedisClusterNode} by its node id.
      *
-     * @param nodeId the nodeId
-     * @return RedisClusterNode or {@literal null}
+     * @param nodeId the nodeId.
+     * @return the {@link RedisClusterNode} or {@literal null} if not found.
      */
     public RedisClusterNode getPartitionByNodeId(String nodeId) {
 
@@ -81,9 +82,42 @@ public RedisClusterNode getPartitionByNodeId(String nodeId) {
                 return partition;
             }
         }
+
         return null;
     }
 
+    /**
+     * Retrieve a {@link RedisClusterNode} by its hostname/port considering node aliases.
+     *
+     * @param host hostname.
+     * @param port port number.
+     * @return the {@link RedisClusterNode} or {@literal null} if not found.
+     */
+    public RedisClusterNode getPartition(String host, int port) {
+
+        for (RedisClusterNode partition : nodeReadView) {
+
+            RedisURI uri = partition.getUri();
+
+            if (matches(uri, host, port)) {
+                return partition;
+            }
+
+            for (RedisURI redisURI : partition.getAliases()) {
+
+                if (matches(redisURI, host, port)) {
+                    return partition;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private static boolean matches(RedisURI uri, String host, int port) {
+        return uri.getPort() == port && host.equals(uri.getHost());
+    }
+
     /**
      * Update the partition cache. Updates are necessary after the partition details have changed.
      */
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
index e6e05d331b..a3c719bf87 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
@@ -49,6 +49,7 @@ public class RedisClusterNode implements Serializable, RedisNodeDescription {
 
     private BitSet slots;
     private final Set<NodeFlag> flags = EnumSet.noneOf(NodeFlag.class);
+    private final List<RedisURI> aliases = new ArrayList<>();
 
     public RedisClusterNode() {
     }
@@ -79,6 +80,7 @@ public RedisClusterNode(RedisClusterNode redisClusterNode) {
         this.pingSentTimestamp = redisClusterNode.pingSentTimestamp;
         this.pongReceivedTimestamp = redisClusterNode.pongReceivedTimestamp;
         this.configEpoch = redisClusterNode.configEpoch;
+        this.aliases.addAll(redisClusterNode.aliases);
 
         if (redisClusterNode.slots != null && !redisClusterNode.slots.isEmpty()) {
             this.slots = new BitSet(SlotHash.SLOT_COUNT);
@@ -271,6 +273,21 @@ public boolean is(NodeFlag nodeFlag) {
         return getFlags().contains(nodeFlag);
     }
 
+    /**
+     * Add an alias to {@link RedisClusterNode}.
+     *
+     * @param alias must not be {@literal null}.
+     */
+    public void addAlias(RedisURI alias) {
+
+        LettuceAssert.notNull(alias, "Alias URI must not be null");
+        this.aliases.add(alias);
+    }
+
+    public List<RedisURI> getAliases() {
+        return aliases;
+    }
+
     /**
      * @param slot the slot hash
      * @return true if the slot is contained within the handled slots.
@@ -324,6 +341,7 @@ public String toString() {
         sb.append(", pongReceivedTimestamp=").append(pongReceivedTimestamp);
         sb.append(", configEpoch=").append(configEpoch);
         sb.append(", flags=").append(flags);
+        sb.append(", aliases=").append(aliases);
         if (slots != null) {
             sb.append(", slot count=").append(slots.cardinality());
         }
diff --git a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
index 3c64b88490..79fd7d8029 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
@@ -122,15 +122,22 @@ NodeTopologyViews getNodeSpecificViews(Requests requestedTopology, Requests requ
         Set<RedisURI> nodes = requestedTopology.nodes();
 
         List<NodeTopologyView> views = new ArrayList<>();
-        for (RedisURI node : nodes) {
+        for (RedisURI nodeUri : nodes) {
 
             try {
-                NodeTopologyView nodeTopologyView = NodeTopologyView.from(node, requestedTopology, requestedClients);
+                NodeTopologyView nodeTopologyView = NodeTopologyView.from(nodeUri, requestedTopology, requestedClients);
 
                 if (!nodeTopologyView.isAvailable()) {
                     continue;
                 }
 
+                RedisClusterNode node = nodeTopologyView.getOwnPartition();
+                if (node.getUri() == null) {
+                    node.setUri(nodeUri);
+                } else {
+                    node.addAlias(nodeUri);
+                }
+
                 List<RedisClusterNodeSnapshot> nodeWithStats = nodeTopologyView.getPartitions() //
                         .stream() //
                         .filter(ClusterTopologyRefresh::validNode) //
@@ -140,10 +147,6 @@ NodeTopologyViews getNodeSpecificViews(Requests requestedTopology, Requests requ
                         .filter(partition -> partition.is(RedisClusterNode.NodeFlag.MYSELF)) //
                         .forEach(partition -> {
 
-                            if (partition.getUri() == null) {
-                                partition.setUri(node);
-                            }
-
                             // record latency for later partition ordering
                                 latencies.put(partition.getNodeId(), nodeTopologyView.getLatency());
                                 clientCountByNodeId.put(partition.getNodeId(), nodeTopologyView.getConnectedClients());
@@ -158,7 +161,7 @@ NodeTopologyViews getNodeSpecificViews(Requests requestedTopology, Requests requ
 
                 views.add(nodeTopologyView);
             } catch (ExecutionException e) {
-                logger.warn(String.format("Cannot retrieve partition view from %s, error: %s", node, e));
+                logger.warn(String.format("Cannot retrieve partition view from %s, error: %s", nodeUri, e));
             }
         }
 
diff --git a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
index 48a7d69ca3..b59096de74 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
@@ -57,12 +57,9 @@ class NodeTopologyView {
 
         this.partitions = ClusterPartitionParser.parse(clusterNodes);
         this.connectedClients = getClients(clientList);
-
         this.clusterNodes = clusterNodes;
         this.clientList = clientList;
         this.latency = latency;
-
-        getOwnPartition().setUri(redisURI);
     }
 
     static NodeTopologyView from(RedisURI redisURI, Requests clusterNodesRequests, Requests clientListRequests)
@@ -111,10 +108,15 @@ String getNodeId() {
     }
 
     RedisURI getRedisURI() {
+
+        if (partitions.isEmpty()) {
+            return redisURI;
+        }
+
         return getOwnPartition().getUri();
     }
 
-    private RedisClusterNode getOwnPartition() {
+    RedisClusterNode getOwnPartition() {
         for (RedisClusterNode partition : partitions) {
             if (partition.is(RedisClusterNode.NodeFlag.MYSELF)) {
                 return partition;
diff --git a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
index 1d42675c46..c65004fa3d 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
@@ -26,7 +26,7 @@
  */
 class NodeTopologyViews {
 
-    private List<NodeTopologyView> views = new ArrayList<>();
+    private List<NodeTopologyView> views;
 
     public NodeTopologyViews(List<NodeTopologyView> views) {
         this.views = views;
diff --git a/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java b/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java
index 8deeb3128d..af07a6b42a 100644
--- a/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java
@@ -36,7 +36,7 @@ public class PartitionsTest {
             Arrays.asList(4, 5, 6), new HashSet<>());
 
     @Test
-    public void contains() throws Exception {
+    public void contains() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -46,7 +46,7 @@ public void contains() throws Exception {
     }
 
     @Test
-    public void containsUsesReadView() throws Exception {
+    public void containsUsesReadView() {
 
         Partitions partitions = new Partitions();
         partitions.getPartitions().add(node1);
@@ -57,7 +57,7 @@ public void containsUsesReadView() throws Exception {
     }
 
     @Test
-    public void containsAll() throws Exception {
+    public void containsAll() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -67,7 +67,7 @@ public void containsAll() throws Exception {
     }
 
     @Test
-    public void containsAllUsesReadView() throws Exception {
+    public void containsAllUsesReadView() {
 
         Partitions partitions = new Partitions();
         partitions.getPartitions().add(node1);
@@ -78,7 +78,7 @@ public void containsAllUsesReadView() throws Exception {
     }
 
     @Test
-    public void add() throws Exception {
+    public void add() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -89,7 +89,7 @@ public void add() throws Exception {
     }
 
     @Test
-    public void addPartitionClearsCache() throws Exception {
+    public void addPartitionClearsCache() {
 
         Partitions partitions = new Partitions();
         partitions.addPartition(node1);
@@ -98,7 +98,7 @@ public void addPartitionClearsCache() throws Exception {
     }
 
     @Test
-    public void addAll() throws Exception {
+    public void addAll() {
 
         Partitions partitions = new Partitions();
         partitions.addAll(Arrays.asList(node1, node2));
@@ -108,7 +108,7 @@ public void addAll() throws Exception {
     }
 
     @Test
-    public void getPartitionBySlot() throws Exception {
+    public void getPartitionBySlot() {
 
         Partitions partitions = new Partitions();
 
@@ -119,7 +119,19 @@ public void getPartitionBySlot() throws Exception {
     }
 
     @Test
-    public void remove() throws Exception {
+    public void getPartitionByAlias() {
+
+        Partitions partitions = new Partitions();
+        node1.addAlias(RedisURI.create("foobar", 1234));
+        partitions.add(node1);
+
+        assertThat(partitions.getPartition(node1.getUri().getHost(), node1.getUri().getPort())).isEqualTo(node1);
+        assertThat(partitions.getPartition("foobar", 1234)).isEqualTo(node1);
+        assertThat(partitions.getPartition("unknown", 1234)).isNull();
+    }
+
+    @Test
+    public void remove() {
 
         Partitions partitions = new Partitions();
         partitions.addAll(Arrays.asList(node1, node2));
@@ -130,7 +142,7 @@ public void remove() throws Exception {
     }
 
     @Test
-    public void removeAll() throws Exception {
+    public void removeAll() {
 
         Partitions partitions = new Partitions();
         partitions.addAll(Arrays.asList(node1, node2));
@@ -141,7 +153,7 @@ public void removeAll() throws Exception {
     }
 
     @Test
-    public void clear() throws Exception {
+    public void clear() {
 
         Partitions partitions = new Partitions();
         partitions.addAll(Arrays.asList(node1, node2));
@@ -152,7 +164,7 @@ public void clear() throws Exception {
     }
 
     @Test
-    public void retainAll() throws Exception {
+    public void retainAll() {
 
         Partitions partitions = new Partitions();
         partitions.addAll(Arrays.asList(node1, node2));
@@ -163,7 +175,7 @@ public void retainAll() throws Exception {
     }
 
     @Test
-    public void toArray() throws Exception {
+    public void toArray() {
 
         Partitions partitions = new Partitions();
         partitions.addAll(Arrays.asList(node1, node2));
@@ -172,7 +184,7 @@ public void toArray() throws Exception {
     }
 
     @Test
-    public void toArrayUsesReadView() throws Exception {
+    public void toArrayUsesReadView() {
 
         Partitions partitions = new Partitions();
         partitions.getPartitions().addAll(Arrays.asList(node1, node2));
@@ -183,7 +195,7 @@ public void toArrayUsesReadView() throws Exception {
     }
 
     @Test
-    public void toArray2() throws Exception {
+    public void toArray2() {
 
         Partitions partitions = new Partitions();
         partitions.addAll(Arrays.asList(node1, node2));
@@ -192,7 +204,7 @@ public void toArray2() throws Exception {
     }
 
     @Test
-    public void toArray2UsesReadView() throws Exception {
+    public void toArray2UsesReadView() {
 
         Partitions partitions = new Partitions();
         partitions.getPartitions().addAll(Arrays.asList(node1, node2));
@@ -205,7 +217,7 @@ public void toArray2UsesReadView() throws Exception {
     }
 
     @Test
-    public void getPartitionByNodeId() throws Exception {
+    public void getPartitionByNodeId() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -216,7 +228,7 @@ public void getPartitionByNodeId() throws Exception {
     }
 
     @Test
-    public void reload() throws Exception {
+    public void reload() {
 
         RedisClusterNode other = new RedisClusterNode(RedisURI.create("localhost", 6666), "c", true, "", 0, 0, 0,
                 Arrays.asList(1, 2, 3, 4, 5, 6), new HashSet<>());
@@ -231,7 +243,7 @@ public void reload() throws Exception {
     }
 
     @Test
-    public void reloadEmpty() throws Exception {
+    public void reloadEmpty() {
 
         Partitions partitions = new Partitions();
         partitions.reload(Arrays.asList());
@@ -240,7 +252,7 @@ public void reloadEmpty() throws Exception {
     }
 
     @Test
-    public void isEmpty() throws Exception {
+    public void isEmpty() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -249,7 +261,7 @@ public void isEmpty() throws Exception {
     }
 
     @Test
-    public void size() throws Exception {
+    public void size() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -258,7 +270,7 @@ public void size() throws Exception {
     }
 
     @Test
-    public void sizeUsesReadView() throws Exception {
+    public void sizeUsesReadView() {
 
         Partitions partitions = new Partitions();
         partitions.getPartitions().add(node1);
@@ -271,7 +283,7 @@ public void sizeUsesReadView() throws Exception {
     }
 
     @Test
-    public void getPartition() throws Exception {
+    public void getPartition() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -280,7 +292,7 @@ public void getPartition() throws Exception {
     }
 
     @Test
-    public void iterator() throws Exception {
+    public void iterator() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -289,7 +301,7 @@ public void iterator() throws Exception {
     }
 
     @Test
-    public void iteratorUsesReadView() throws Exception {
+    public void iteratorUsesReadView() {
 
         Partitions partitions = new Partitions();
         partitions.getPartitions().add(node1);
@@ -301,7 +313,7 @@ public void iteratorUsesReadView() throws Exception {
     }
 
     @Test
-    public void iteratorIsSafeDuringUpdate() throws Exception {
+    public void iteratorIsSafeDuringUpdate() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -325,7 +337,7 @@ public void iteratorIsSafeDuringUpdate() throws Exception {
     }
 
     @Test
-    public void testToString() throws Exception {
+    public void testToString() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
diff --git a/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java
index 05f121b589..19f0c8bcdb 100644
--- a/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java
+++ b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java
@@ -34,12 +34,14 @@ public void shouldCopyNode() {
 
         RedisClusterNode node = new RedisClusterNode();
         node.setSlots(Arrays.asList(1, 2, 3, SlotHash.SLOT_COUNT - 1));
+        node.addAlias(RedisURI.create("foo", 6379));
 
         RedisClusterNode copy = new RedisClusterNode(node);
 
         assertThat(copy.getSlots()).containsExactly(1, 2, 3, SlotHash.SLOT_COUNT - 1);
         assertThat(copy.hasSlot(1)).isTrue();
         assertThat(copy.hasSlot(SlotHash.SLOT_COUNT - 1)).isTrue();
+        assertThat(copy.getAliases()).contains(RedisURI.create("foo", 6379));
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java b/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java
index c4fa57bac4..bf7b8bcf48 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java
@@ -30,9 +30,9 @@
 public class NodeTopologyViewsTest {
 
     @Test
-    public void shouldReuseKnownUris() throws Exception {
+    public void shouldReuseKnownUris() {
 
-        RedisURI localhost = RedisURI.create("localhost", 6479);
+        RedisURI localhost = RedisURI.create("127.0.0.1", 6479);
         RedisURI otherhost = RedisURI.create("127.0.0.2", 7000);
 
         RedisURI host3 = RedisURI.create("127.0.0.3", 7000);
@@ -41,7 +41,7 @@ public void shouldReuseKnownUris() throws Exception {
                 + "2 127.0.0.2:7000 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n"
                 + "3 127.0.0.3:7000 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n";
 
-        String viewByOtherhost = "1 127.0.0.1:6479 master - 0 1401258245007 2 connected 8000-11999\n"
+        String viewByOtherhost = "1 127.0.0.2:6479 master - 0 1401258245007 2 connected 8000-11999\n"
                 + "2 127.0.0.2:7000 master,myself - 111 1401258245007 222 connected 7000 12000 12002-16383\n"
                 + "3 127.0.0.3:7000 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n";
 
@@ -55,12 +55,12 @@ public void shouldReuseKnownUris() throws Exception {
     }
 
     @Test(expected = IllegalStateException.class)
-    public void shouldFailWithoutOwnPartition() throws Exception {
+    public void shouldFailWithoutOwnPartition() {
 
-        RedisURI localhost = RedisURI.create("localhost", 6479);
+        RedisURI localhost = RedisURI.create("127.0.0.1", 6479);
 
         String viewByLocalhost = "1 127.0.0.1:6479 master - 0 1401258245007 2 connected 8000-11999\n";
 
-        new NodeTopologyView(localhost, viewByLocalhost, "", 0);
+        new NodeTopologyView(localhost, viewByLocalhost, "", 0).getOwnPartition();
     }
 }

From d38b9319b12fa3ace24ecaaf74c1548316020da1 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 23 Mar 2018 11:31:03 +0100
Subject: [PATCH 424/808] Fix external wiki documentation path

---
 pom.xml                          | 2 +-
 src/main/asciidoc/index.asciidoc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4a4e170b26..34d6e8a9f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -720,7 +720,7 @@
                                 <allow-uri-read>true</allow-uri-read>
                                 <toclevels>3</toclevels>
                                 <numbered>true</numbered>
-                                <ext-doc>https://raw.githubusercontent.com/wiki/mp911de/lettuce/</ext-doc>
+                                <ext-doc>https://raw.githubusercontent.com/wiki/lettuce-io/lettuce-core/</ext-doc>
                                 <allow-uri-read />
                                 <docinfo />
                                 <toc2 />
diff --git a/src/main/asciidoc/index.asciidoc b/src/main/asciidoc/index.asciidoc
index 91f3a34d2d..21b5dae156 100644
--- a/src/main/asciidoc/index.asciidoc
+++ b/src/main/asciidoc/index.asciidoc
@@ -1,6 +1,6 @@
 = Lettuce Reference Guide
 Mark Paluch <https://twitter.com/mp911de[@mp911de]>;
-:ext-doc: https://raw.githubusercontent.com/wiki/lettuce-core/lettuce-io
+:ext-doc: https://raw.githubusercontent.com/wiki/lettuce-io/lettuce-core
 {version}
 :doctype: book
 :icons: font

From b95a9f599db786f9bd2466fac3c7e28d634c320d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 23 Mar 2018 11:32:36 +0100
Subject: [PATCH 425/808] Include asynchronous connection pooling docs only for
 version 5.1 #739

---
 src/main/asciidoc/advanced-usage.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/asciidoc/advanced-usage.asciidoc b/src/main/asciidoc/advanced-usage.asciidoc
index 2c81355cf2..35529297bd 100644
--- a/src/main/asciidoc/advanced-usage.asciidoc
+++ b/src/main/asciidoc/advanced-usage.asciidoc
@@ -40,7 +40,7 @@ include::{ext-doc}/Connection-Events.asciidoc[leveloffset=+2]
 include::{ext-doc}/Pipelining-and-command-flushing.asciidoc[leveloffset=+2]
 
 === Connection Pooling
-include::{ext-doc}/Connection-Pooling.asciidoc[leveloffset=+2]
+include::{ext-doc}/Connection-Pooling-5.1.asciidoc[leveloffset=+2]
 
 === Custom commands
 include::{ext-doc}/Custom-commands%2C-outputs-and-command-mechanics.asciidoc[leveloffset=+2]

From a66f5be0adb77d57b6f5f0a8254bae977e355285 Mon Sep 17 00:00:00 2001
From: Nick Vollmar <nick.vollmar@gmail.com>
Date: Fri, 23 Mar 2018 13:18:16 -0500
Subject: [PATCH 426/808] Fix firstResponseLatency metric #740

Swapped calculation to subtract sent time from first response (response is usually later than sent).

Original pull request: #741.
---
 src/main/java/io/lettuce/core/protocol/CommandHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 34775ff807..459cc4ec36 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -728,7 +728,7 @@ private void recordLatency(WithLatency withLatency, ProtocolKeyword commandType)
 
         if (withLatency != null && clientResources.commandLatencyCollector().isEnabled() && channel != null && remote() != null) {
 
-            long firstResponseLatency = withLatency.getSent() - withLatency.getFirstResponse();
+            long firstResponseLatency = withLatency.getFirstResponse() - withLatency.getSent();
             long completionLatency = nanoTime() - withLatency.getSent();
 
             clientResources.commandLatencyCollector().recordCommandLatency(local(), remote(), commandType,

From dc9f3206546a4de29fda9e4c9c5a37e63ec9b03a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 24 Mar 2018 10:34:50 +0100
Subject: [PATCH 427/808] Polishing #740

Add test. Add author tag.

Original pull request: #741.
---
 .../core/protocol/CommandHandlerTest.java     | 42 ++++++++++++++++---
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
index 8f857e4b58..2b9f4538c3 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
@@ -17,10 +17,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
+import static org.mockito.AdditionalMatchers.gt;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
+import java.net.Inet4Address;
+import java.net.InetSocketAddress;
 import java.util.*;
 
 import org.apache.logging.log4j.Level;
@@ -42,12 +45,12 @@
 import io.lettuce.core.ConnectionEvents;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.metrics.DefaultCommandLatencyCollector;
-import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
+import io.lettuce.core.metrics.CommandLatencyCollector;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.resource.ClientResources;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
 import io.netty.channel.*;
 import io.netty.util.concurrent.ImmediateEventExecutor;
 
@@ -68,7 +71,7 @@ public class CommandHandlerTest {
     private Channel channel;
 
     @Mock
-    private ByteBufAllocator byteBufAllocator;
+    private ChannelConfig config;
 
     @Mock
     private ChannelPipeline pipeline;
@@ -85,6 +88,9 @@ public class CommandHandlerTest {
     @Mock
     private ChannelPromise promise;
 
+    @Mock
+    private CommandLatencyCollector latencyCollector;
+
     @BeforeClass
     public static void beforeClass() {
         LoggerContext ctx = (LoggerContext) LogManager.getContext();
@@ -105,17 +111,20 @@ public static void afterClass() {
     public void before() throws Exception {
 
         when(context.channel()).thenReturn(channel);
-        when(context.alloc()).thenReturn(byteBufAllocator);
+        when(context.alloc()).thenReturn(ByteBufAllocator.DEFAULT);
         when(channel.pipeline()).thenReturn(pipeline);
         when(channel.eventLoop()).thenReturn(eventLoop);
+        when(channel.remoteAddress()).thenReturn(new InetSocketAddress(Inet4Address.getLocalHost(), 1234));
+        when(channel.localAddress()).thenReturn(new InetSocketAddress(Inet4Address.getLocalHost(), 1234));
+        when(channel.config()).thenReturn(config);
         when(eventLoop.submit(any(Runnable.class))).thenAnswer(invocation -> {
             Runnable r = (Runnable) invocation.getArguments()[0];
             r.run();
             return null;
         });
 
-        when(clientResources.commandLatencyCollector()).thenReturn(
-                new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create()));
+        when(latencyCollector.isEnabled()).thenReturn(true);
+        when(clientResources.commandLatencyCollector()).thenReturn(latencyCollector);
 
         sut = new CommandHandler(ClientOptions.create(), clientResources, endpoint);
         stack = (Queue) ReflectionTestUtils.getField(sut, "stack");
@@ -367,6 +376,27 @@ public void shouldWriteActiveCommandsInMixedBatch() throws Exception {
                 .allMatch(o -> CommandWrapper.unwrap((RedisCommand) o) == command2);
     }
 
+    @Test
+    public void shouldRecordCorrectFirstResponseLatency() throws Exception {
+
+        ChannelPromise channelPromise = new DefaultChannelPromise(channel, ImmediateEventExecutor.INSTANCE);
+        channelPromise.setSuccess();
+
+        sut.channelRegistered(context);
+        sut.channelActive(context);
+
+        LatencyMeteredCommand<String, String, String> wrapped = new LatencyMeteredCommand<>(command);
+
+        sut.write(context, wrapped, channelPromise);
+        Thread.sleep(10);
+
+        sut.channelRead(context, Unpooled.wrappedBuffer("*1\r\n+OK\r\n".getBytes()));
+
+        verify(latencyCollector).recordCommandLatency(any(), any(), eq(CommandType.APPEND), gt(0L), gt(0L));
+
+        sut.channelUnregistered(context);
+    }
+
     @Test
     public void shouldIgnoreNonReadableBuffers() throws Exception {
 

From 660045e70c77866f724310b0d2e687b41029e8bf Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 27 Mar 2018 09:25:58 +0200
Subject: [PATCH 428/808] Propagate transaction discard errors #743

Lettuce now correctly fails EXEC commands if the transaction was discarded with an error. An example for discard by error is EXECABORT.
---
 .../io/lettuce/core/output/MultiOutput.java   |  6 ++
 .../core/cluster/RedisClusterClientTest.java  | 23 ++++++
 .../lettuce/core/output/MultiOutputTest.java  | 78 +++++++++++++++++++
 3 files changed, 107 insertions(+)
 create mode 100644 src/test/java/io/lettuce/core/output/MultiOutputTest.java

diff --git a/src/main/java/io/lettuce/core/output/MultiOutput.java b/src/main/java/io/lettuce/core/output/MultiOutput.java
index e6f38bf64e..44d5ebb2e2 100644
--- a/src/main/java/io/lettuce/core/output/MultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/MultiOutput.java
@@ -85,6 +85,12 @@ public void multi(int count) {
 
     @Override
     public void setError(ByteBuffer error) {
+
+        if (discarded == null) {
+            super.setError(error);
+            return;
+        }
+
         CommandOutput<K, V, ?> output = queue.isEmpty() ? this : queue.peek().getOutput();
         output.setError(decodeAscii(error));
     }
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
index f78e41d799..35707155e0 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
@@ -632,4 +632,27 @@ public void testPfmerge() {
 
         connection.getStatefulConnection().close();
     }
+
+    @Test
+    public void execAbortShouldFailTransaction() throws Exception {
+
+        StatefulRedisConnection<String, String> connection = client.connect();
+
+        connection.sync().multi();
+        RedisFuture<String> success = connection.async().set("b", value);
+        RedisFuture<String> failed = connection.async().set(key, value);
+
+        RedisFuture<TransactionResult> exec = connection.async().exec();
+
+        exec.await(5, TimeUnit.SECONDS);
+
+        assertThat(success).isDone();
+        assertThat(failed).isDone();
+        assertThat(failed.getError()).startsWith("MOVED");
+
+        assertThat(exec).isDone();
+        assertThat(exec.getError()).startsWith("EXECABORT");
+
+        connection.close();
+    }
 }
diff --git a/src/test/java/io/lettuce/core/output/MultiOutputTest.java b/src/test/java/io/lettuce/core/output/MultiOutputTest.java
new file mode 100644
index 0000000000..c04269f5b1
--- /dev/null
+++ b/src/test/java/io/lettuce/core/output/MultiOutputTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.output;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.nio.ByteBuffer;
+
+import org.junit.Test;
+
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandType;
+
+/**
+ * @author Mark Paluch
+ */
+public class MultiOutputTest {
+
+    @Test
+    public void shouldCompleteCommand() {
+
+        MultiOutput<String, String> output = new MultiOutput<>(StringCodec.UTF8);
+        Command<String, String, String> command = new Command<>(CommandType.APPEND, new StatusOutput<>(StringCodec.UTF8));
+
+        output.add(command);
+
+        output.multi(1);
+        output.set(ByteBuffer.wrap("OK".getBytes()));
+        output.complete(1);
+
+        assertThat(command.getOutput().get()).isEqualTo("OK");
+    }
+
+    @Test
+    public void shouldReportErrorForCommand() {
+
+        MultiOutput<String, String> output = new MultiOutput<>(StringCodec.UTF8);
+        Command<String, String, String> command = new Command<>(CommandType.APPEND, new StatusOutput<>(StringCodec.UTF8));
+
+        output.add(command);
+
+        output.multi(1);
+        output.setError(ByteBuffer.wrap("Fail".getBytes()));
+        output.complete(1);
+
+        assertThat(command.getOutput().getError()).isEqualTo("Fail");
+        assertThat(output.getError()).isNull();
+    }
+
+    @Test
+    public void shouldFailMulti() {
+
+        MultiOutput<String, String> output = new MultiOutput<>(StringCodec.UTF8);
+        Command<String, String, String> command = new Command<>(CommandType.APPEND, new StatusOutput<>(StringCodec.UTF8));
+
+        output.add(command);
+
+        output.setError(ByteBuffer.wrap("Fail".getBytes()));
+        output.complete(0);
+
+        assertThat(command.getOutput().getError()).isNull();
+        assertThat(output.getError()).isEqualTo("Fail");
+    }
+}

From fee277932aa26d4a026537400047a96d9c955fb4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 27 Mar 2018 11:45:59 +0200
Subject: [PATCH 429/808] Upgrade to Netty 4.1.22 #744

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 34d6e8a9f8..ef3321d6a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
-        <netty-version>4.1.21.Final</netty-version>
+        <netty-version>4.1.22.Final</netty-version>
         <spring-version>4.3.12.RELEASE</spring-version>
         <reactor-version>Bismuth-SR6</reactor-version>
     </properties>

From f143ef8af00117940f23a38853029d781e088605 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 27 Mar 2018 11:46:40 +0200
Subject: [PATCH 430/808] Upgrade to RxJava 1.3.7 #745

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ef3321d6a9..f36c5b9248 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,7 +179,7 @@
         <dependency>
             <groupId>io.reactivex</groupId>
             <artifactId>rxjava</artifactId>
-            <version>1.3.6</version>
+            <version>1.3.7</version>
             <optional>true</optional>
         </dependency>
 

From 9ea5553a0db01089a6040b6b325e18c190eb4906 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 27 Mar 2018 11:47:10 +0200
Subject: [PATCH 431/808] Upgrade to Spring Framework 4.3.14 #746

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f36c5b9248..013dc14414 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
         <netty-version>4.1.22.Final</netty-version>
-        <spring-version>4.3.12.RELEASE</spring-version>
+        <spring-version>4.3.14.RELEASE</spring-version>
         <reactor-version>Bismuth-SR6</reactor-version>
     </properties>
 

From 8e322240cd7c87066d36b779cb3040819c19f8e7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 27 Mar 2018 11:48:54 +0200
Subject: [PATCH 432/808] Upgrade to Mockito 2.17 #747

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 013dc14414..b6204fc7d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,7 +277,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.8.47</version>
+            <version>2.17.0</version>
             <scope>test</scope>
         </dependency>
 

From 26a458d3a97dd124692c0407c84b4028360fa9c4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 27 Mar 2018 11:49:21 +0200
Subject: [PATCH 433/808] Upgrade to AssertJ 3.9.1 #748

---
 pom.xml                                                |  2 +-
 src/test/java/io/lettuce/SslTest.java                  |  3 ++-
 .../java/io/lettuce/core/ConnectionFutureTest.java     | 10 +++++-----
 .../lettuce/core/cluster/RedisClusterClientTest.java   |  8 ++++----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index b6204fc7d1..f94b4181f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -305,7 +305,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.8.0</version>
+            <version>3.9.1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/test/java/io/lettuce/SslTest.java b/src/test/java/io/lettuce/SslTest.java
index e4e847c843..83b15f0dc1 100644
--- a/src/test/java/io/lettuce/SslTest.java
+++ b/src/test/java/io/lettuce/SslTest.java
@@ -28,6 +28,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -409,7 +410,7 @@ public void pubSubSslAndBreakConnection() throws Exception {
             assertThat(e).hasRootCauseInstanceOf(CertificateException.class);
         }
 
-        assertThat(defectFuture).isDone();
+        assertThat(defectFuture.toCompletableFuture()).isDone();
 
         connection.getStatefulConnection().close();
         connection2.getStatefulConnection().close();
diff --git a/src/test/java/io/lettuce/core/ConnectionFutureTest.java b/src/test/java/io/lettuce/core/ConnectionFutureTest.java
index 63c86e186c..c7605d6854 100644
--- a/src/test/java/io/lettuce/core/ConnectionFutureTest.java
+++ b/src/test/java/io/lettuce/core/ConnectionFutureTest.java
@@ -45,7 +45,7 @@ public void shouldComposeTransformToError() {
 
         foo.complete("foo");
 
-        assertThat(transformed).isDone();
+        assertThat(transformed.toCompletableFuture()).isDone();
         assertThat(transformed.toCompletableFuture()).isCompletedExceptionally();
         assertThatThrownBy(transformed::join).hasRootCauseInstanceOf(IllegalStateException.class);
     }
@@ -61,7 +61,7 @@ public void composeTransformShouldFailWhileTransformation() {
 
         foo.complete("foo");
 
-        assertThat(transformed).isDone();
+        assertThat(transformed.toCompletableFuture()).isDone();
         assertThat(transformed.toCompletableFuture()).isCompletedExceptionally();
         assertThatThrownBy(transformed::join).hasRootCauseInstanceOf(IllegalStateException.class);
     }
@@ -78,7 +78,7 @@ public void composeTransformShouldFailWhileTransformationRetainOriginalException
         Throwable t = new Throwable();
         foo.completeExceptionally(t);
 
-        assertThat(transformed).isDone();
+        assertThat(transformed.toCompletableFuture()).isDone();
         assertThat(transformed.toCompletableFuture()).isCompletedExceptionally();
 
         try {
@@ -115,10 +115,10 @@ public void shouldComposeWithErrorFlow() {
         foo.complete("foo");
         exceptional.completeExceptionally(new IllegalArgumentException("foo"));
 
-        assertThat(transformed1).isDone();
+        assertThat(transformed1.toCompletableFuture()).isDone();
         assertThat(transformed1.toCompletableFuture()).isCompletedWithValue("foo");
 
-        assertThat(transformed2).isDone();
+        assertThat(transformed2.toCompletableFuture()).isDone();
         assertThat(transformed2.toCompletableFuture()).isCompletedExceptionally();
         assertThatThrownBy(transformed2::join).hasCauseInstanceOf(IllegalStateException.class).hasRootCauseInstanceOf(
                 IllegalArgumentException.class);
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
index 35707155e0..b8ba230197 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
@@ -304,7 +304,7 @@ public void testClusterRedirection() throws Exception {
         // appropriate cluster node
         RedisFuture<String> setB = connection.set(KEY_B, value);
 
-        assertThat(setB).isInstanceOf(AsyncCommand.class);
+        assertThat(setB.toCompletableFuture()).isInstanceOf(AsyncCommand.class);
 
         setB.get(10, TimeUnit.SECONDS);
         assertThat(setB.getError()).isNull();
@@ -646,11 +646,11 @@ public void execAbortShouldFailTransaction() throws Exception {
 
         exec.await(5, TimeUnit.SECONDS);
 
-        assertThat(success).isDone();
-        assertThat(failed).isDone();
+        assertThat(success.toCompletableFuture()).isDone();
+        assertThat(failed.toCompletableFuture()).isDone();
         assertThat(failed.getError()).startsWith("MOVED");
 
-        assertThat(exec).isDone();
+        assertThat(exec.toCompletableFuture()).isDone();
         assertThat(exec.getError()).startsWith("EXECABORT");
 
         connection.close();

From 178b4ff38ffb30c02a7f652dffd0c25aaa0b2131 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 27 Mar 2018 11:50:00 +0200
Subject: [PATCH 434/808] Upgrade to Log4j 2.11.0 #749

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f94b4181f8..40ebdcc5a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,14 +312,14 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.8.2</version>
+            <version>2.11.0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.8.2</version>
+            <version>2.11.0</version>
             <scope>test</scope>
         </dependency>
 

From b764970b15335b807b254af870347414e2541505 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 27 Mar 2018 11:51:03 +0200
Subject: [PATCH 435/808] Upgrade to commons-lang3 3.7 #750

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 40ebdcc5a8..e308605451 100644
--- a/pom.xml
+++ b/pom.xml
@@ -367,7 +367,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.6</version>
+            <version>3.7</version>
             <scope>test</scope>
         </dependency>
 

From be06631f6be2028108153544f053c84f92a614de Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 5 Apr 2018 11:51:06 +0200
Subject: [PATCH 436/808] Fix ConcurrentModificationException during cluster
 topology refresh #756

Add synchronization to connection access on client/topology requests to ensure connection map is modified/read by a single thread at a time. Concurrent access may happen if connects succeed after awaiting the synchronization timeout.
---
 .../core/cluster/topology/Connections.java    | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/topology/Connections.java b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
index 4dddcce32c..ba6e4b205f 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Connections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
@@ -86,15 +86,17 @@ public Requests requestTopology() {
 
         Requests requests = new Requests();
 
-        for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : this.connections.entrySet()) {
+        synchronized (this.connections) {
+            for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : this.connections.entrySet()) {
 
-            CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.NODES);
-            Command<String, String, String> command = new Command<>(CommandType.CLUSTER, new StatusOutput<>(StringCodec.UTF8),
-                    args);
-            TimedAsyncCommand<String, String, String> timedCommand = new TimedAsyncCommand<>(command);
+                CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.NODES);
+                Command<String, String, String> command = new Command<>(CommandType.CLUSTER, new StatusOutput<>(
+                        StringCodec.UTF8), args);
+                TimedAsyncCommand<String, String, String> timedCommand = new TimedAsyncCommand<>(command);
 
-            entry.getValue().dispatch(timedCommand);
-            requests.addRequest(entry.getKey(), timedCommand);
+                entry.getValue().dispatch(timedCommand);
+                requests.addRequest(entry.getKey(), timedCommand);
+            }
         }
 
         return requests;
@@ -109,15 +111,17 @@ public Requests requestClients() {
 
         Requests requests = new Requests();
 
-        for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : this.connections.entrySet()) {
+        synchronized (this.connections) {
+            for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : this.connections.entrySet()) {
 
-            CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.LIST);
-            Command<String, String, String> command = new Command<>(CommandType.CLIENT, new StatusOutput<>(StringCodec.UTF8),
-                    args);
-            TimedAsyncCommand<String, String, String> timedCommand = new TimedAsyncCommand<>(command);
+                CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.LIST);
+                Command<String, String, String> command = new Command<>(CommandType.CLIENT,
+                        new StatusOutput<>(StringCodec.UTF8), args);
+                TimedAsyncCommand<String, String, String> timedCommand = new TimedAsyncCommand<>(command);
 
-            entry.getValue().dispatch(timedCommand);
-            requests.addRequest(entry.getKey(), timedCommand);
+                entry.getValue().dispatch(timedCommand);
+                requests.addRequest(entry.getKey(), timedCommand);
+            }
         }
 
         return requests;

From 21cffffde99a0374b7c27704e66e6045219e4c50 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 17 Apr 2018 10:24:53 +0200
Subject: [PATCH 437/808] Upgrade to netty 4.1.23.Final #755

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e308605451..a2568b8310 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
-        <netty-version>4.1.22.Final</netty-version>
+        <netty-version>4.1.23.Final</netty-version>
         <spring-version>4.3.14.RELEASE</spring-version>
         <reactor-version>Bismuth-SR6</reactor-version>
     </properties>

From b876de1e1974037ed330c4b21e9dc373847febb8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 17 Apr 2018 10:26:06 +0200
Subject: [PATCH 438/808] Upgrade to Reactor Bismuth SR8 #758

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a2568b8310..adb2202d55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <skipTests>true</skipTests>
         <netty-version>4.1.23.Final</netty-version>
         <spring-version>4.3.14.RELEASE</spring-version>
-        <reactor-version>Bismuth-SR6</reactor-version>
+        <reactor-version>Bismuth-SR8</reactor-version>
     </properties>
 
     <scm>

From 91ec0042358c810091a85ffdaeb4eb196c30a91c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 17 Apr 2018 10:30:42 +0200
Subject: [PATCH 439/808] Upgrade to RxJava 1.3.8 #759

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index adb2202d55..783e4d97d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,7 +179,7 @@
         <dependency>
             <groupId>io.reactivex</groupId>
             <artifactId>rxjava</artifactId>
-            <version>1.3.7</version>
+            <version>1.3.8</version>
             <optional>true</optional>
         </dependency>
 

From 08e9b0891579f6012ad17b079331449c709dc507 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 17 Apr 2018 10:40:05 +0200
Subject: [PATCH 440/808] Add AUTH option to MIGRATE command #733

---
 .../java/io/lettuce/core/MigrateArgs.java     | 58 +++++++++++++++++--
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/lettuce/core/MigrateArgs.java b/src/main/java/io/lettuce/core/MigrateArgs.java
index 084272d1b5..cbff9f8f6e 100644
--- a/src/main/java/io/lettuce/core/MigrateArgs.java
+++ b/src/main/java/io/lettuce/core/MigrateArgs.java
@@ -16,6 +16,7 @@
 package io.lettuce.core;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import io.lettuce.core.internal.LettuceAssert;
@@ -25,7 +26,7 @@
 
 /**
  * Argument list builder for the new redis <a href="http://redis.io/commands/migrate">MIGRATE</a> command. Static import the
- * methods from {@link Builder} and chain the method calls: {@code ex(10).nx()}.
+ * methods from {@link Builder} and chain the method calls: {@code copy().auth("foobar")}.
  *
  * @author Mark Paluch
  */
@@ -34,6 +35,7 @@ public class MigrateArgs<K> implements CompositeArgument {
     private boolean copy = false;
     private boolean replace = false;
     List<K> keys = new ArrayList<>();
+    private char[] password;
 
     public static class Builder {
 
@@ -41,7 +43,6 @@ public static class Builder {
          * Utility constructor.
          */
         private Builder() {
-
         }
 
         public static <K> MigrateArgs<K> copy() {
@@ -56,6 +57,14 @@ public static <K> MigrateArgs<K> key(K key) {
             return new MigrateArgs<K>().key(key);
         }
 
+        public static <K> MigrateArgs<K> auth(CharSequence password) {
+            return new MigrateArgs<K>().auth(password);
+        }
+
+        public static <K> MigrateArgs<K> auth(char[] password) {
+            return new MigrateArgs<K>().auth(password);
+        }
+
         @SafeVarargs
         public static <K> MigrateArgs<K> keys(K... keys) {
             return new MigrateArgs<K>().keys(keys);
@@ -64,6 +73,7 @@ public static <K> MigrateArgs<K> keys(K... keys) {
         public static <K> MigrateArgs<K> keys(Iterable<K> keys) {
             return new MigrateArgs<K>().keys(keys);
         }
+
     }
 
     public MigrateArgs<K> copy() {
@@ -85,9 +95,7 @@ public MigrateArgs<K> key(K key) {
     @SafeVarargs
     public final MigrateArgs<K> keys(K... keys) {
         LettuceAssert.notEmpty(keys, "Keys must not be empty");
-        for (K key : keys) {
-            this.keys.add(key);
-        }
+        this.keys.addAll(Arrays.asList(keys));
         return this;
     }
 
@@ -99,6 +107,42 @@ public MigrateArgs<K> keys(Iterable<K> keys) {
         return this;
     }
 
+    /**
+     * Set {@literal AUTH} {@code password} option.
+     *
+     * @param password must not be {@literal null}.
+     * @return {@code this} {@link MigrateArgs}.
+     * @since 4.4.5
+     */
+    public MigrateArgs<K> auth(CharSequence password) {
+
+        LettuceAssert.notNull(password, "Password must not be null");
+
+        char[] chars = new char[password.length()];
+
+        for (int i = 0; i < password.length(); i++) {
+            chars[i] = password.charAt(i);
+        }
+
+        this.password = chars;
+        return this;
+    }
+
+    /**
+     * Set {@literal AUTH} {@code password} option.
+     *
+     * @param password must not be {@literal null}.
+     * @return {@code this} {@link MigrateArgs}.
+     * @since 4.4.5
+     */
+    public MigrateArgs<K> auth(char[] password) {
+
+        LettuceAssert.notNull(password, "Password must not be null");
+
+        this.password = Arrays.copyOf(password, password.length);
+        return this;
+    }
+
     @SuppressWarnings("unchecked")
     public <K, V> void build(CommandArgs<K, V> args) {
 
@@ -110,6 +154,10 @@ public <K, V> void build(CommandArgs<K, V> args) {
             args.add(CommandKeyword.REPLACE);
         }
 
+        if (password != null) {
+            args.add(CommandType.AUTH).add(password);
+        }
+
         if (keys.size() > 1) {
             args.add(CommandType.KEYS);
             args.addKeys((List<K>) keys);

From 401d0888d32eaf5da0b309e3c00bae6698814640 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 17 Apr 2018 10:45:19 +0200
Subject: [PATCH 441/808] Polishing #733

Extend documentation for MigrateArgs.
---
 .../java/io/lettuce/core/MigrateArgs.java     | 103 ++++++++++++++++--
 1 file changed, 93 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/lettuce/core/MigrateArgs.java b/src/main/java/io/lettuce/core/MigrateArgs.java
index cbff9f8f6e..6a32984929 100644
--- a/src/main/java/io/lettuce/core/MigrateArgs.java
+++ b/src/main/java/io/lettuce/core/MigrateArgs.java
@@ -25,8 +25,10 @@
 import io.lettuce.core.protocol.CommandType;
 
 /**
- * Argument list builder for the new redis <a href="http://redis.io/commands/migrate">MIGRATE</a> command. Static import the
- * methods from {@link Builder} and chain the method calls: {@code copy().auth("foobar")}.
+ * Argument list builder for the Redis <a href="http://redis.io/commands/migrate">MIGRATE</a> command. Static import the methods
+ * from {@link Builder} and chain the method calls: {@code copy().auth("foobar")}.
+ * <p/>
+ * {@link MigrateArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
  */
@@ -37,6 +39,9 @@ public class MigrateArgs<K> implements CompositeArgument {
     List<K> keys = new ArrayList<>();
     private char[] password;
 
+    /**
+     * Builder entry points for {@link MigrateArgs}.
+     */
     public static class Builder {
 
         /**
@@ -45,60 +50,138 @@ public static class Builder {
         private Builder() {
         }
 
+        /**
+         * Creates new {@link MigrateArgs} and enabling {@literal COPY}.
+         *
+         * @return new {@link MigrateArgs} with {@literal COPY} enabled.
+         * @see MigrateArgs#copy()
+         */
         public static <K> MigrateArgs<K> copy() {
             return new MigrateArgs<K>().copy();
         }
 
+        /**
+         * Creates new {@link MigrateArgs} and enabling {@literal REPLACE}.
+         *
+         * @return new {@link MigrateArgs} with {@literal REPLACE} enabled.
+         * @see MigrateArgs#replace()
+         */
         public static <K> MigrateArgs<K> replace() {
             return new MigrateArgs<K>().replace();
         }
 
+        /**
+         * Creates new {@link MigrateArgs} setting a {@code key} to migrate.
+         *
+         * @param key must not be {@literal null}.
+         * @return new {@link MigrateArgs} for {@code key} to migrate.
+         * @see MigrateArgs#key(Object)
+         */
         public static <K> MigrateArgs<K> key(K key) {
             return new MigrateArgs<K>().key(key);
         }
 
-        public static <K> MigrateArgs<K> auth(CharSequence password) {
-            return new MigrateArgs<K>().auth(password);
-        }
-
-        public static <K> MigrateArgs<K> auth(char[] password) {
-            return new MigrateArgs<K>().auth(password);
-        }
-
+        /**
+         * Creates new {@link MigrateArgs} setting {@code keys} to migrate.
+         *
+         * @param keys must not be {@literal null}.
+         * @return new {@link MigrateArgs} for {@code keys} to migrate.
+         * @see MigrateArgs#keys(Object[])
+         */
         @SafeVarargs
         public static <K> MigrateArgs<K> keys(K... keys) {
             return new MigrateArgs<K>().keys(keys);
         }
 
+        /**
+         * Creates new {@link MigrateArgs} setting {@code keys} to migrate.
+         *
+         * @param keys must not be {@literal null}.
+         * @return new {@link MigrateArgs} for {@code keys} to migrate.
+         * @see MigrateArgs#keys(Iterable)
+         */
         public static <K> MigrateArgs<K> keys(Iterable<K> keys) {
             return new MigrateArgs<K>().keys(keys);
         }
 
+        /**
+         * Creates new {@link MigrateArgs} with {@code AUTH} (target authentication) enabled.
+         *
+         * @return new {@link MigrateArgs} with {@code AUTH} (target authentication) enabled.
+         * @since 4.4.5
+         * @see MigrateArgs#auth(CharSequence)
+         */
+        public static <K> MigrateArgs<K> auth(CharSequence password) {
+            return new MigrateArgs<K>().auth(password);
+        }
+
+        /**
+         * Creates new {@link MigrateArgs} with {@code AUTH} (target authentication) enabled.
+         *
+         * @return new {@link MigrateArgs} with {@code AUTH} (target authentication) enabled.
+         * @since 4.4.5
+         * @see MigrateArgs#auth(char[])
+         */
+        public static <K> MigrateArgs<K> auth(char[] password) {
+            return new MigrateArgs<K>().auth(password);
+        }
     }
 
+    /**
+     * Do not remove the key from the local instance by setting {@code COPY}.
+     *
+     * @return {@code this} {@link MigrateArgs}.
+     */
     public MigrateArgs<K> copy() {
         this.copy = true;
         return this;
     }
 
+    /**
+     * Replace existing key on the remote instance by setting {@code REPLACE}.
+     *
+     * @return {@code this} {@link MigrateArgs}.
+     */
     public MigrateArgs<K> replace() {
         this.replace = true;
         return this;
     }
 
+    /**
+     * Migrate a single {@code key}.
+     *
+     * @param key must not be {@literal null}.
+     * @return {@code this} {@link MigrateArgs}.
+     */
     public MigrateArgs<K> key(K key) {
+
         LettuceAssert.notNull(key, "Key must not be null");
+
         this.keys.add(key);
         return this;
     }
 
+    /**
+     * Migrate one or more {@code keys}.
+     *
+     * @param keys must not be {@literal null}.
+     * @return {@code this} {@link MigrateArgs}.
+     */
     @SafeVarargs
     public final MigrateArgs<K> keys(K... keys) {
+
         LettuceAssert.notEmpty(keys, "Keys must not be empty");
+
         this.keys.addAll(Arrays.asList(keys));
         return this;
     }
 
+    /**
+     * Migrate one or more {@code keys}.
+     *
+     * @param keys must not be {@literal null}.
+     * @return {@code this} {@link MigrateArgs}.
+     */
     public MigrateArgs<K> keys(Iterable<K> keys) {
         LettuceAssert.notNull(keys, "Keys must not be null");
         for (K key : keys) {

From 93443d00a586d619d79dfc1e6cfdece62b0323cb Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 17 Apr 2018 11:56:09 +0200
Subject: [PATCH 442/808] Improve/add Javadoc for argument objects #761

---
 .../io/lettuce/core/AbstractRedisClient.java  |  2 +-
 .../java/io/lettuce/core/BitFieldArgs.java    |  7 +-
 src/main/java/io/lettuce/core/GeoArgs.java    | 99 +++++++++++++++++--
 .../io/lettuce/core/GeoRadiusStoreArgs.java   | 72 ++++++++++++--
 src/main/java/io/lettuce/core/KillArgs.java   | 92 +++++++++++++++--
 .../io/lettuce/core/RedisChannelWriter.java   |  4 +-
 .../java/io/lettuce/core/RedisClient.java     |  2 +-
 src/main/java/io/lettuce/core/ScanArgs.java   | 34 ++++---
 src/main/java/io/lettuce/core/SetArgs.java    | 81 ++++++++++++---
 src/main/java/io/lettuce/core/SortArgs.java   | 97 +++++++++++++++++-
 src/main/java/io/lettuce/core/ZAddArgs.java   | 53 ++++++++--
 src/main/java/io/lettuce/core/ZStoreArgs.java | 85 ++++++++++++++--
 .../models/slots/ClusterSlotsParser.java      |  4 +-
 .../models/command/CommandDetailParser.java   |  6 +-
 .../lettuce/core/models/role/RoleParser.java  |  6 +-
 .../lettuce/core/protocol/RedisCommand.java   |  2 +-
 .../io/lettuce/core/pubsub/PubSubOutput.java  |  2 +-
 17 files changed, 564 insertions(+), 84 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 9622a2333b..0d11e598be 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -138,7 +138,7 @@ public void setDefaultTimeout(long timeout, TimeUnit unit) {
      *
      * @param socketAddressSupplier address supplier for initial connect and re-connect
      * @param connectionBuilder connection builder to configure the connection
-     * @param redisURI URI of the redis instance
+     * @param redisURI URI of the Redis instance
      */
     protected void connectionBuilder(Mono<SocketAddress> socketAddressSupplier, ConnectionBuilder connectionBuilder,
             RedisURI redisURI) {
diff --git a/src/main/java/io/lettuce/core/BitFieldArgs.java b/src/main/java/io/lettuce/core/BitFieldArgs.java
index f9bb35f7fd..8e8bde4325 100644
--- a/src/main/java/io/lettuce/core/BitFieldArgs.java
+++ b/src/main/java/io/lettuce/core/BitFieldArgs.java
@@ -26,7 +26,9 @@
 import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
- * Arguments and types for the {@code BITFIELD} command.
+ * Argument list builder for the Redis <a href="http://redis.io/commands/bitfield">BITFIELD</a> command.
+ * <p/>
+ * {@link BitFieldArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
  * @since 4.2
@@ -47,6 +49,9 @@ private BitFieldArgs(List<SubCommand> commands) {
         this.commands = commands;
     }
 
+    /**
+     * Builder entry points for {@link BitFieldArgs}.
+     */
     public static class Builder {
 
         /**
diff --git a/src/main/java/io/lettuce/core/GeoArgs.java b/src/main/java/io/lettuce/core/GeoArgs.java
index ca6641ad6a..a834d490cb 100644
--- a/src/main/java/io/lettuce/core/GeoArgs.java
+++ b/src/main/java/io/lettuce/core/GeoArgs.java
@@ -20,7 +20,11 @@
 import io.lettuce.core.protocol.CommandKeyword;
 
 /**
- * Args for {@literal GEORADIUS} and {@literal GEORADIUSBYMEMBER} commands.
+ *
+ * Argument list builder for the Redis <a href="http://redis.io/commands/georadius">GEORADIUS</a> and <a
+ * href="http://redis.io/commands/georadiusbymember">GEORADIUSBYMEMBER</a> commands.
+ * <p/>
+ * {@link GeoArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
  */
@@ -32,12 +36,78 @@ public class GeoArgs implements CompositeArgument {
     private Long count;
     private Sort sort = Sort.none;
 
+    /**
+     * Builder entry points for {@link GeoArgs}.
+     */
+    public static class Builder {
+
+        /**
+         * Utility constructor.
+         */
+        private Builder() {
+        }
+
+        /**
+         * Creates new {@link GeoArgs} with {@literal WITHDIST} enabled.
+         *
+         * @return new {@link GeoArgs} with {@literal WITHDIST} enabled.
+         * @see GeoArgs#withDistance()
+         */
+        public static GeoArgs distance() {
+            return new GeoArgs().withDistance();
+        }
+
+        /**
+         * Creates new {@link GeoArgs} with {@literal WITHCOORD} enabled.
+         *
+         * @return new {@link GeoArgs} with {@literal WITHCOORD} enabled.
+         * @see GeoArgs#withCoordinates()
+         */
+        public static GeoArgs coordinates() {
+            return new GeoArgs().withCoordinates();
+        }
+
+        /**
+         * Creates new {@link GeoArgs} with {@literal WITHHASH} enabled.
+         *
+         * @return new {@link GeoArgs} with {@literal WITHHASH} enabled.
+         * @see GeoArgs#withHash()
+         */
+        public static GeoArgs hash() {
+            return new GeoArgs().withHash();
+        }
+
+        /**
+         * Creates new {@link GeoArgs} with distance, coordinates and hash enabled.
+         *
+         * @return new {@link GeoArgs} with {@literal WITHDIST}, {@literal WITHCOORD}, {@literal WITHHASH} enabled.
+         * @see GeoArgs#withDistance()
+         * @see GeoArgs#withCoordinates()
+         * @see GeoArgs#withHash()
+         */
+        public static GeoArgs full() {
+            return new GeoArgs().withDistance().withCoordinates().withHash();
+        }
+
+        /**
+         * Creates new {@link GeoArgs} with {@literal COUNT} set.
+         *
+         * @param count number greater 0.
+         * @return new {@link GeoArgs} with {@literal COUNT} set.
+         * @see GeoArgs#withCount(long)
+         */
+        public static GeoArgs count(long count) {
+            return new GeoArgs().withCount(count);
+        }
+    }
+
     /**
      * Request distance for results.
      *
-     * @return {@code this}
+     * @return {@code this} {@link GeoArgs}.
      */
     public GeoArgs withDistance() {
+
         withdistance = true;
         return this;
     }
@@ -45,9 +115,10 @@ public GeoArgs withDistance() {
     /**
      * Request coordinates for results.
      *
-     * @return {@code this}
+     * @return {@code this} {@link GeoArgs}.
      */
     public GeoArgs withCoordinates() {
+
         withcoordinates = true;
         return this;
     }
@@ -55,7 +126,7 @@ public GeoArgs withCoordinates() {
     /**
      * Request geohash for results.
      *
-     * @return {@code this}
+     * @return {@code this} {@link GeoArgs}.
      */
     public GeoArgs withHash() {
         withhash = true;
@@ -65,11 +136,13 @@ public GeoArgs withHash() {
     /**
      * Limit results to {@code count} entries.
      *
-     * @param count number greater 0
-     * @return {@code this}
+     * @param count number greater 0.
+     * @return {@code this} {@link GeoArgs}.
      */
     public GeoArgs withCount(long count) {
+
         LettuceAssert.isTrue(count > 0, "Count must be greater 0");
+
         this.count = count;
         return this;
     }
@@ -123,6 +196,7 @@ public GeoArgs desc() {
      * @return {@code this}
      */
     public GeoArgs sort(Sort sort) {
+
         LettuceAssert.notNull(sort, "Sort must not be null");
 
         this.sort = sort;
@@ -133,6 +207,7 @@ public GeoArgs sort(Sort sort) {
      * Sort order.
      */
     public enum Sort {
+
         /**
          * ascending.
          */
@@ -153,18 +228,22 @@ public enum Sort {
      * Supported geo unit.
      */
     public enum Unit {
+
         /**
          * meter.
          */
         m,
+
         /**
          * kilometer.
          */
         km,
+
         /**
          * feet.
          */
         ft,
+
         /**
          * mile.
          */
@@ -172,16 +251,17 @@ public enum Unit {
     }
 
     public <K, V> void build(CommandArgs<K, V> args) {
+
         if (withdistance) {
-            args.add("withdist");
+            args.add("WITHDIST");
         }
 
         if (withhash) {
-            args.add("withhash");
+            args.add("WITHHASH");
         }
 
         if (withcoordinates) {
-            args.add("withcoord");
+            args.add("WITHCOORD");
         }
 
         if (sort != null && sort != Sort.none) {
@@ -191,6 +271,5 @@ public <K, V> void build(CommandArgs<K, V> args) {
         if (count != null) {
             args.add(CommandKeyword.COUNT).add(count);
         }
-
     }
 }
diff --git a/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java b/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
index 9353d355a1..d6ad5a8520 100644
--- a/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
+++ b/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
@@ -21,7 +21,10 @@
 import io.lettuce.core.protocol.CommandKeyword;
 
 /**
- * Store Args for {@literal GEORADIUS} to store {@literal GEORADIUS} results or {@literal GEORADIUS} distances in a sorted set.
+ * Argument list builder for the Redis <a href="http://redis.io/commands/georadius">GEORADIUS</a> command to store
+ * {@literal GEORADIUS} results or {@literal GEORADIUS} distances in a sorted set.
+ * <p/>
+ * {@link GeoRadiusStoreArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
  */
@@ -32,15 +35,62 @@ public class GeoRadiusStoreArgs<K> implements CompositeArgument {
     private Long count;
     private Sort sort = Sort.none;
 
+    /**
+     * Builder entry points for {@link GeoRadiusStoreArgs}.
+     */
+    public static class Builder {
+
+        /**
+         * Utility constructor.
+         */
+        private Builder() {
+        }
+
+        /**
+         * Creates new {@link GeoRadiusStoreArgs} with {@literal STORE} enabled.
+         *
+         * @param key must not be {@literal null}.
+         * @return new {@link GeoRadiusStoreArgs} with {@literal STORE} enabled.
+         * @see GeoRadiusStoreArgs#withStore(Object)
+         */
+        public static <K> GeoRadiusStoreArgs store(K key) {
+            return new GeoRadiusStoreArgs<>().withStore(key);
+        }
+
+        /**
+         * Creates new {@link GeoRadiusStoreArgs} with {@literal STOREDIST} enabled.
+         *
+         * @param key must not be {@literal null}.
+         * @return new {@link GeoRadiusStoreArgs} with {@literal STOREDIST} enabled.
+         * @see GeoRadiusStoreArgs#withStoreDist(Object)
+         */
+        public static <K> GeoRadiusStoreArgs withStoreDist(K key) {
+            return new GeoRadiusStoreArgs<>().withStoreDist(key);
+        }
+
+        /**
+         * Creates new {@link GeoRadiusStoreArgs} with {@literal COUNT} set.
+         *
+         * @param count number greater 0.
+         * @return new {@link GeoRadiusStoreArgs} with {@literal COUNT} set.
+         * @see GeoRadiusStoreArgs#withStoreDist(Object)
+         */
+        public static <K> GeoRadiusStoreArgs count(long count) {
+            return new GeoRadiusStoreArgs<>().withCount(count);
+        }
+    }
+
     /**
      * Store the resulting members with their location in the new Geo set {@code storeKey}. Cannot be used together with
      * {@link #withStoreDist(Object)}.
      *
      * @param storeKey the destination key.
-     * @return {@code this}
+     * @return {@code this} {@link GeoRadiusStoreArgs}.
      */
     public GeoRadiusStoreArgs withStore(K storeKey) {
+
         LettuceAssert.notNull(storeKey, "StoreKey must not be null");
+
         this.storeKey = storeKey;
         return this;
     }
@@ -50,10 +100,12 @@ public GeoRadiusStoreArgs withStore(K storeKey) {
      * {@link #withStore(Object)}.
      *
      * @param storeKey the destination key.
-     * @return {@code this}
+     * @return {@code this} {@link GeoRadiusStoreArgs}.
      */
     public GeoRadiusStoreArgs withStoreDist(K storeKey) {
+
         LettuceAssert.notNull(storeKey, "StoreKey must not be null");
+
         this.storeDistKey = storeKey;
         return this;
     }
@@ -61,11 +113,13 @@ public GeoRadiusStoreArgs withStoreDist(K storeKey) {
     /**
      * Limit results to {@code count} entries.
      *
-     * @param count number greater 0
-     * @return {@code this}
+     * @param count number greater 0.
+     * @return {@code this} {@link GeoRadiusStoreArgs}.
      */
     public GeoRadiusStoreArgs withCount(long count) {
+
         LettuceAssert.isTrue(count > 0, "Count must be greater 0");
+
         this.count = count;
         return this;
     }
@@ -73,7 +127,7 @@ public GeoRadiusStoreArgs withCount(long count) {
     /**
      * Sort results ascending.
      *
-     * @return {@code this}
+     * @return {@code this} {@link GeoRadiusStoreArgs}.
      */
     public GeoRadiusStoreArgs asc() {
         return sort(Sort.asc);
@@ -82,14 +136,13 @@ public GeoRadiusStoreArgs asc() {
     /**
      * Sort results descending.
      *
-     * @return {@code this}
+     * @return {@code this} {@link GeoRadiusStoreArgs}.
      */
     public GeoRadiusStoreArgs desc() {
         return sort(Sort.desc);
     }
 
     /**
-     *
      * @return the key for storing results
      */
     public K getStoreKey() {
@@ -97,7 +150,6 @@ public K getStoreKey() {
     }
 
     /**
-     *
      * @return the key for storing distance results
      */
     public K getStoreDistKey() {
@@ -108,7 +160,7 @@ public K getStoreDistKey() {
      * Sort results.
      *
      * @param sort sort order, must not be {@literal null}
-     * @return {@code this}
+     * @return {@code this} {@link GeoRadiusStoreArgs}.
      */
     public GeoRadiusStoreArgs sort(Sort sort) {
         LettuceAssert.notNull(sort, "Sort must not be null");
diff --git a/src/main/java/io/lettuce/core/KillArgs.java b/src/main/java/io/lettuce/core/KillArgs.java
index be34dcc8de..8faf1d85fb 100644
--- a/src/main/java/io/lettuce/core/KillArgs.java
+++ b/src/main/java/io/lettuce/core/KillArgs.java
@@ -20,19 +20,22 @@
 import static io.lettuce.core.protocol.CommandKeyword.SKIPME;
 import static io.lettuce.core.protocol.CommandType.TYPE;
 
+import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.CommandArgs;
 
 /**
  *
- * Argument list builder for the redis <a href="http://redis.io/commands/client-kill">CLIENT KILL</a> command. Static import the
+ * Argument list builder for the Redis <a href="http://redis.io/commands/client-kill">CLIENT KILL</a> command. Static import the
  * methods from {@link Builder} and chain the method calls: {@code id(1).skipme()}.
+ * <p/>
+ * {@link KillArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
  * @since 3.0
  */
 public class KillArgs implements CompositeArgument {
 
-    private static enum Type {
+    private enum Type {
         NORMAL, SLAVE, PUBSUB
     }
 
@@ -42,7 +45,7 @@ private static enum Type {
     private Type type;
 
     /**
-     * Static builder methods.
+     * Builder entry points for {@link KillArgs}.
      */
     public static class Builder {
 
@@ -50,55 +53,131 @@ public static class Builder {
          * Utility constructor.
          */
         private Builder() {
-
         }
 
+        /**
+         * Creates new {@link KillArgs} and enabling {@literal SKIPME YES}.
+         *
+         * @return new {@link KillArgs} with {@literal SKIPME YES} enabled.
+         * @see KillArgs#skipme()
+         */
         public static KillArgs skipme() {
             return new KillArgs().skipme();
         }
 
+        /**
+         * Creates new {@link KillArgs} setting {@literal ADDR}.
+         *
+         * @param addr must not be {@literal null}.
+         * @return new {@link KillArgs} with {@literal ADDR} set.
+         * @see KillArgs#addr(String)
+         */
         public static KillArgs addr(String addr) {
             return new KillArgs().addr(addr);
         }
 
+        /**
+         * Creates new {@link KillArgs} setting {@literal ID}.
+         *
+         * @param id client id.
+         * @return new {@link KillArgs} with {@literal ID} set.
+         * @see KillArgs#id(long)
+         */
         public static KillArgs id(long id) {
             return new KillArgs().id(id);
         }
 
+        /**
+         * Creates new {@link KillArgs} setting {@literal TYPE PUBSUB}.
+         *
+         * @return new {@link KillArgs} with {@literal TYPE PUBSUB} set.
+         * @see KillArgs#type(Type)
+         */
         public static KillArgs typePubsub() {
             return new KillArgs().type(Type.PUBSUB);
         }
 
+        /**
+         * Creates new {@link KillArgs} setting {@literal TYPE NORMAL}.
+         *
+         * @return new {@link KillArgs} with {@literal TYPE NORMAL} set.
+         * @see KillArgs#type(Type)
+         */
         public static KillArgs typeNormal() {
             return new KillArgs().type(Type.NORMAL);
         }
 
+        /**
+         * Creates new {@link KillArgs} setting {@literal TYPE SLAVE}.
+         *
+         * @return new {@link KillArgs} with {@literal TYPE SLAVE} set.
+         * @see KillArgs#type(Type)
+         */
         public static KillArgs typeSlave() {
             return new KillArgs().type(Type.SLAVE);
         }
-
     }
 
+    /**
+     * By default this option is enabled, that is, the client calling the command will not get killed, however setting this
+     * option to no will have the effect of also killing the client calling the command.
+     *
+     * @return {@code this} {@link MigrateArgs}.
+     */
     public KillArgs skipme() {
         return this.skipme(true);
     }
 
+    /**
+     * By default this option is enabled, that is, the client calling the command will not get killed, however setting this
+     * option to no will have the effect of also killing the client calling the command.
+     *
+     * @param state
+     * @return {@code this} {@link KillArgs}.
+     */
     public KillArgs skipme(boolean state) {
+
         this.skipme = state;
         return this;
     }
 
+    /**
+     * Kill the client at {@code addr}.
+     *
+     * @param addr must not be {@literal null}.
+     * @return {@code this} {@link KillArgs}.
+     */
     public KillArgs addr(String addr) {
+
+        LettuceAssert.notNull(addr, "Client address must not be null");
+
         this.addr = addr;
         return this;
     }
 
+    /**
+     * Kill the client with its client {@code id}.
+     *
+     * @param id
+     * @return {@code this} {@link KillArgs}.
+     */
     public KillArgs id(long id) {
+
         this.id = id;
         return this;
     }
 
+    /**
+     * This closes the connections of all the clients in the specified {@link Type class}. Note that clients blocked into the
+     * {@literal MONITOR} command are considered to belong to the normal class.
+     *
+     * @param type must not be {@literal null}.
+     * @return {@code this} {@link KillArgs}.
+     */
     public KillArgs type(Type type) {
+
+        LettuceAssert.notNull(type, "Type must not be null");
+
         this.type = type;
         return this;
     }
@@ -106,7 +185,7 @@ public KillArgs type(Type type) {
     public <K, V> void build(CommandArgs<K, V> args) {
 
         if (skipme != null) {
-            args.add(SKIPME).add(skipme.booleanValue() ? "yes" : "no");
+            args.add(SKIPME).add(skipme ? "YES" : "NO");
         }
 
         if (id != null) {
@@ -120,6 +199,5 @@ public <K, V> void build(CommandArgs<K, V> args) {
         if (type != null) {
             args.add(TYPE).add(type.name().toLowerCase());
         }
-
     }
 }
diff --git a/src/main/java/io/lettuce/core/RedisChannelWriter.java b/src/main/java/io/lettuce/core/RedisChannelWriter.java
index 6e593b226c..c10d25812e 100644
--- a/src/main/java/io/lettuce/core/RedisChannelWriter.java
+++ b/src/main/java/io/lettuce/core/RedisChannelWriter.java
@@ -36,10 +36,8 @@ public interface RedisChannelWriter extends Closeable, AsyncCloseable {
      * after the call.
      *
      * @param command the Redis command.
-     * @param <K> key type
-     * @param <V> value type
      * @param <T> result type
-     * @return the written redis command
+     * @return the written Redis command.
      */
     <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command);
 
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 2890981d18..8a32e343b9 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -388,7 +388,7 @@ public <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V>
      * {@link RedisCodec codec} to encode/decode keys and values.
      *
      * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}
-     * @param redisURI the redis server to connect to, must not be {@literal null}
+     * @param redisURI the Redis server to connect to, must not be {@literal null}
      * @param <K> Key type
      * @param <V> Value type
      * @return A new connection
diff --git a/src/main/java/io/lettuce/core/ScanArgs.java b/src/main/java/io/lettuce/core/ScanArgs.java
index 1810658785..d0628808f2 100644
--- a/src/main/java/io/lettuce/core/ScanArgs.java
+++ b/src/main/java/io/lettuce/core/ScanArgs.java
@@ -22,8 +22,11 @@
 import io.lettuce.core.protocol.CommandArgs;
 
 /**
- * Argument list builder for the redis scan commans (scan, hscan, sscan, zscan) . Static import the methods from {@link Builder}
- * and chain the method calls: {@code matches("weight_*").limit(0, 2)}.
+ * Argument list builder for the Redis scan commands ({@literal SCAN, HSCAN, SSCAN, ZSCAN}). Static import the methods from
+ *
+ * {@link Builder} and chain the method calls: {@code matches("weight_*").limit(0, 2)}.
+ * <p/>
+ * {@link ScanArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
  * @since 3.0
@@ -34,7 +37,7 @@ public class ScanArgs implements CompositeArgument {
     private String match;
 
     /**
-     * Static builder methods.
+     * Builder entry points for {@link ScanArgs}.
      */
     public static class Builder {
 
@@ -42,24 +45,25 @@ public static class Builder {
          * Utility constructor.
          */
         private Builder() {
-
         }
 
         /**
-         * Create a new instance of {@link ScanArgs} with limit.
+         * Creates new {@link ScanArgs} with {@literal LIMIT} set.
          *
          * @param count number of elements to scan
-         * @return a new instance of {@link ScanArgs}
+         * @return new {@link ScanArgs} with {@literal LIMIT} set.
+         * @see ScanArgs#limit(long)
          */
         public static ScanArgs limit(long count) {
             return new ScanArgs().limit(count);
         }
 
         /**
-         * Create a new instance of {@link ScanArgs} with match filter.
+         * Creates new {@link ScanArgs} with {@literal MATCH} set.
          *
-         * @param matches the filter
-         * @return a new instance of {@link ScanArgs}
+         * @param matches the filter.
+         * @return new {@link ScanArgs} with {@literal MATCH} set.
+         * @see ScanArgs#match(String)
          */
         public static ScanArgs matches(String matches) {
             return new ScanArgs().match(matches);
@@ -67,13 +71,15 @@ public static ScanArgs matches(String matches) {
     }
 
     /**
-     * Match filter
+     * Set the match filter.
      *
-     * @param match the filter
-     * @return the current instance of {@link ScanArgs}
+     * @param match the filter, must not be {@literal null}.
+     * @return {@literal this} {@link ScanArgs}.
      */
     public ScanArgs match(String match) {
+
         LettuceAssert.notNull(match, "Match must not be null");
+
         this.match = match;
         return this;
     }
@@ -82,9 +88,10 @@ public ScanArgs match(String match) {
      * Limit the scan by count
      *
      * @param count number of elements to scan
-     * @return the current instance of {@link ScanArgs}
+     * @return {@literal this} {@link ScanArgs}.
      */
     public ScanArgs limit(long count) {
+
         this.count = count;
         return this;
     }
@@ -98,6 +105,5 @@ public <K, V> void build(CommandArgs<K, V> args) {
         if (count != null) {
             args.add(COUNT).add(count);
         }
-
     }
 }
diff --git a/src/main/java/io/lettuce/core/SetArgs.java b/src/main/java/io/lettuce/core/SetArgs.java
index 6a413e6304..62aa180a9d 100644
--- a/src/main/java/io/lettuce/core/SetArgs.java
+++ b/src/main/java/io/lettuce/core/SetArgs.java
@@ -18,11 +18,14 @@
 import io.lettuce.core.protocol.CommandArgs;
 
 /**
- * Argument list builder for the new redis <a href="http://redis.io/commands/set">SET</a> command starting from Redis 2.6.12.
- * Static import the methods from {@link Builder} and chain the method calls: {@code ex(10).nx()}.
+ * Argument list builder for the Redis <a href="http://redis.io/commands/set">SET</a> command starting from Redis 2.6.12. Static
+ * import the methods from {@link Builder} and chain the method calls: {@code ex(10).nx()}.
+ * <p/>
+ * {@link SetArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Will Glozer
  * @author Vincent Rischmann
+ * @author Mark Paluch
  */
 public class SetArgs implements CompositeArgument {
 
@@ -31,52 +34,108 @@ public class SetArgs implements CompositeArgument {
     private boolean nx = false;
     private boolean xx = false;
 
+    /**
+     * Builder entry points for {@link SetArgs}.
+     */
     public static class Builder {
+
         /**
          * Utility constructor.
          */
         private Builder() {
-
         }
 
-        public static SetArgs ex(long ex) {
-            return new SetArgs().ex(ex);
+        /**
+         * Creates new {@link SetArgs} and enabling {@literal EX}.
+         *
+         * @param timeout expire time in seconds.
+         * @return new {@link SetArgs} with {@literal EX} enabled.
+         * @see SetArgs#ex(long)
+         */
+        public static SetArgs ex(long timeout) {
+            return new SetArgs().ex(timeout);
         }
 
-        public static SetArgs px(long px) {
-            return new SetArgs().px(px);
+        /**
+         * Creates new {@link SetArgs} and enabling {@literal PX}.
+         *
+         * @param timeout expire time in milliseconds.
+         * @return new {@link SetArgs} with {@literal PX} enabled.
+         * @see SetArgs#px(long)
+         */
+        public static SetArgs px(long timeout) {
+            return new SetArgs().px(timeout);
         }
 
+        /**
+         * Creates new {@link SetArgs} and enabling {@literal NX}.
+         *
+         * @return new {@link SetArgs} with {@literal NX} enabled.
+         * @see SetArgs#nx()
+         */
         public static SetArgs nx() {
             return new SetArgs().nx();
         }
 
+        /**
+         * Creates new {@link SetArgs} and enabling {@literal XX}.
+         *
+         * @return new {@link SetArgs} with {@literal XX} enabled.
+         * @see SetArgs#xx()
+         */
         public static SetArgs xx() {
             return new SetArgs().xx();
         }
     }
 
-    public SetArgs ex(long ex) {
-        this.ex = ex;
+    /**
+     * Set the specified expire time, in seconds.
+     *
+     * @param timeout expire time in seconds.
+     * @return {@code this} {@link SetArgs}.
+     */
+    public SetArgs ex(long timeout) {
+
+        this.ex = timeout;
         return this;
     }
 
-    public SetArgs px(long px) {
-        this.px = px;
+    /**
+     * Set the specified expire time, in milliseconds.
+     *
+     * @param timeout expire time in milliseconds.
+     * @return {@code this} {@link SetArgs}.
+     */
+    public SetArgs px(long timeout) {
+
+        this.px = timeout;
         return this;
     }
 
+    /**
+     * Only set the key if it does not already exist.
+     *
+     * @return {@code this} {@link SetArgs}.
+     */
     public SetArgs nx() {
+
         this.nx = true;
         return this;
     }
 
+    /**
+     * Only set the key if it already exists.
+     *
+     * @return {@code this} {@link SetArgs}.
+     */
     public SetArgs xx() {
+
         this.xx = true;
         return this;
     }
 
     public <K, V> void build(CommandArgs<K, V> args) {
+
         if (ex != null) {
             args.add("EX").add(ex);
         }
diff --git a/src/main/java/io/lettuce/core/SortArgs.java b/src/main/java/io/lettuce/core/SortArgs.java
index b55a206335..6432c3ac2f 100644
--- a/src/main/java/io/lettuce/core/SortArgs.java
+++ b/src/main/java/io/lettuce/core/SortArgs.java
@@ -26,10 +26,13 @@
 import io.lettuce.core.protocol.CommandKeyword;
 
 /**
- * Argument list builder for the redis <a href="http://redis.io/commands/sort">SORT</a> command. Static import the methods from
+ * Argument list builder for the Redis <a href="http://redis.io/commands/sort">SORT</a> command. Static import the methods from
  * {@link Builder} and chain the method calls: {@code by("weight_*").desc().limit(0, 2)}.
+ * <p/>
+ * {@link ScanArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public class SortArgs implements CompositeArgument {
 
@@ -40,50 +43,112 @@ public class SortArgs implements CompositeArgument {
     private boolean alpha;
 
     /**
-     * Static builder methods.
+     * Builder entry points for {@link SortArgs}.
      */
     public static class Builder {
         /**
          * Utility constructor.
          */
         private Builder() {
-
         }
 
+        /**
+         * Creates new {@link SortArgs} setting {@literal PATTERN}.
+         *
+         * @param pattern must not be {@literal null}.
+         * @return new {@link SortArgs} with {@literal PATTERN} set.
+         * @see SortArgs#by(String)
+         */
         public static SortArgs by(String pattern) {
             return new SortArgs().by(pattern);
         }
 
+        /**
+         * Creates new {@link SortArgs} setting {@literal LIMIT}.
+         *
+         * @param offset
+         * @param count
+         * @return new {@link SortArgs} with {@literal LIMIT} set.
+         * @see SortArgs#limit(long, long)
+         */
         public static SortArgs limit(long offset, long count) {
             return new SortArgs().limit(offset, count);
         }
 
+        /**
+         * Creates new {@link SortArgs} setting {@literal GET}.
+         *
+         * @param pattern must not be {@literal null}.
+         * @return new {@link SortArgs} with {@literal GET} set.
+         * @see SortArgs#by(String)
+         */
         public static SortArgs get(String pattern) {
             return new SortArgs().get(pattern);
         }
 
+        /**
+         * Creates new {@link SortArgs} setting {@literal ASC}.
+         *
+         * @return new {@link SortArgs} with {@literal ASC} set.
+         * @see SortArgs#asc()
+         */
         public static SortArgs asc() {
             return new SortArgs().asc();
         }
 
+        /**
+         * Creates new {@link SortArgs} setting {@literal DESC}.
+         *
+         * @return new {@link SortArgs} with {@literal DESC} set.
+         * @see SortArgs#desc()
+         */
         public static SortArgs desc() {
             return new SortArgs().desc();
         }
 
+        /**
+         * Creates new {@link SortArgs} setting {@literal ALPHA}.
+         *
+         * @return new {@link SortArgs} with {@literal ALPHA} set.
+         * @see SortArgs#alpha()
+         */
         public static SortArgs alpha() {
             return new SortArgs().alpha();
         }
     }
 
+    /**
+     * Sort keys by an external list. Key names are obtained substituting the first occurrence of {@code *} with the actual
+     * value of the element in the list.
+     *
+     * @param pattern key name pattern.
+     * @return {@code this} {@link SortArgs}.
+     */
     public SortArgs by(String pattern) {
-        by = pattern;
+
+        LettuceAssert.notNull(pattern, "Pattern must not be null");
+
+        this.by = pattern;
         return this;
     }
 
+    /**
+     * Limit the number of returned elements.
+     *
+     * @param offset
+     * @param count
+     * @return {@code this} {@link SortArgs}.
+     */
     public SortArgs limit(long offset, long count) {
         return limit(Limit.create(offset, count));
     }
 
+    /**
+     * Limit the number of returned elements.
+     *
+     * @param limit must not be {@literal null}.
+     * @return {@code this} {@link SortArgs}.
+     */
     public SortArgs limit(Limit limit) {
 
         LettuceAssert.notNull(limit, "Limit must not be null");
@@ -92,7 +157,16 @@ public SortArgs limit(Limit limit) {
         return this;
     }
 
+    /**
+     * Retrieve external keys during sort. {@literal GET} supports {@code #} and {@code *} wildcards.
+     *
+     * @param pattern must not be {@literal null}.
+     * @return {@code this} {@link SortArgs}.
+     */
     public SortArgs get(String pattern) {
+
+        LettuceAssert.notNull(pattern, "Pattern must not be null");
+
         if (get == null) {
             get = new ArrayList<>();
         }
@@ -100,16 +174,31 @@ public SortArgs get(String pattern) {
         return this;
     }
 
+    /**
+     * Apply numeric sort in ascending order.
+     *
+     * @return {@code this} {@link SortArgs}.
+     */
     public SortArgs asc() {
         order = ASC;
         return this;
     }
 
+    /**
+     * Apply numeric sort in descending order.
+     *
+     * @return {@code this} {@link SortArgs}.
+     */
     public SortArgs desc() {
         order = DESC;
         return this;
     }
 
+    /**
+     * Apply lexicographically sort.
+     *
+     * @return {@code this} {@link SortArgs}.
+     */
     public SortArgs alpha() {
         alpha = true;
         return this;
diff --git a/src/main/java/io/lettuce/core/ZAddArgs.java b/src/main/java/io/lettuce/core/ZAddArgs.java
index 4a5c3d17fb..a0069e3741 100644
--- a/src/main/java/io/lettuce/core/ZAddArgs.java
+++ b/src/main/java/io/lettuce/core/ZAddArgs.java
@@ -18,8 +18,10 @@
 import io.lettuce.core.protocol.CommandArgs;
 
 /**
- * Argument list builder for the improved redis <a href="http://redis.io/commands/zadd">ZADD</a> command starting from Redis
+ * Argument list builder for the improved Redis <a href="http://redis.io/commands/zadd">ZADD</a> command starting from Redis
  * 3.0.2. Static import the methods from {@link Builder} and call the methods: {@code xx()} or {@code nx()} .
+ * <p/>
+ * {@link ZAddArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
  */
@@ -29,44 +31,83 @@ public class ZAddArgs implements CompositeArgument {
     private boolean xx = false;
     private boolean ch = false;
 
+    /**
+     * Builder entry points for {@link ScanArgs}.
+     */
     public static class Builder {
 
         /**
          * Utility constructor.
          */
         private Builder() {
-
         }
 
+        /**
+         * Creates new {@link ZAddArgs} and enabling {@literal NX}.
+         *
+         * @return new {@link ZAddArgs} with {@literal NX} enabled.
+         * @see ZAddArgs#nx()
+         */
         public static ZAddArgs nx() {
             return new ZAddArgs().nx();
         }
 
+        /**
+         * Creates new {@link ZAddArgs} and enabling {@literal XX}.
+         *
+         * @return new {@link ZAddArgs} with {@literal XX} enabled.
+         * @see ZAddArgs#xx()
+         */
         public static ZAddArgs xx() {
             return new ZAddArgs().xx();
         }
 
+        /**
+         * Creates new {@link ZAddArgs} and enabling {@literal CH}.
+         *
+         * @return new {@link ZAddArgs} with {@literal CH} enabled.
+         * @see ZAddArgs#ch()
+         */
         public static ZAddArgs ch() {
             return new ZAddArgs().ch();
         }
     }
 
+    /**
+     * Don't update already existing elements. Always add new elements.
+     *
+     * @return {@code this} {@link ZAddArgs}.
+     */
     public ZAddArgs nx() {
+
         this.nx = true;
         return this;
     }
 
-    public ZAddArgs ch() {
-        this.ch = true;
+    /**
+     * Only update elements that already exist. Never add elements.
+     *
+     * @return {@code this} {@link ZAddArgs}.
+     */
+    public ZAddArgs xx() {
+
+        this.xx = true;
         return this;
     }
 
-    public ZAddArgs xx() {
-        this.xx = true;
+    /**
+     * Modify the return value from the number of new elements added, to the total number of elements changed.
+     *
+     * @return {@code this} {@link ZAddArgs}.
+     */
+    public ZAddArgs ch() {
+
+        this.ch = true;
         return this;
     }
 
     public <K, V> void build(CommandArgs<K, V> args) {
+
         if (nx) {
             args.add("NX");
         }
diff --git a/src/main/java/io/lettuce/core/ZStoreArgs.java b/src/main/java/io/lettuce/core/ZStoreArgs.java
index 086af1f3ef..4adeb7308c 100644
--- a/src/main/java/io/lettuce/core/ZStoreArgs.java
+++ b/src/main/java/io/lettuce/core/ZStoreArgs.java
@@ -20,15 +20,20 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.CommandArgs;
 
 /**
- * Argument list builder for the redis <a href="http://redis.io/commands/zunionstore">ZUNIONSTORE</a> and <a
+ * Argument list builder for the Redis <a href="http://redis.io/commands/zunionstore">ZUNIONSTORE</a> and <a
  * href="http://redis.io/commands/zinterstore">ZINTERSTORE</a> commands. Static import the methods from {@link Builder} and
  * chain the method calls: {@code weights(1, 2).max()}.
  *
+ * <p/>
+ * {@link ZAddArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
+ *
  * @author Will Glozer
  * @author Xy Ma
+ * @author Mark Paluch
  */
 public class ZStoreArgs implements CompositeArgument {
 
@@ -40,7 +45,7 @@ private enum Aggregate {
     private Aggregate aggregate;
 
     /**
-     * Static builder methods.
+     * Builder entry points for {@link ScanArgs}.
      */
     public static class Builder {
 
@@ -48,37 +53,86 @@ public static class Builder {
          * Utility constructor.
          */
         private Builder() {
-
         }
 
+        /**
+         * Creates new {@link ZStoreArgs} setting {@literal WEIGHTS} using long.
+         *
+         * @return new {@link ZAddArgs} with {@literal WEIGHTS} set.
+         * @see ZStoreArgs#weights(long[])
+         * @deprecated use {@link #weights(double...)}.
+         */
         @Deprecated
         public static ZStoreArgs weights(long[] weights) {
             return new ZStoreArgs().weights(toDoubleArray(weights));
         }
 
+        /**
+         * Creates new {@link ZStoreArgs} setting {@literal WEIGHTS}.
+         *
+         * @return new {@link ZAddArgs} with {@literal WEIGHTS} set.
+         * @see ZStoreArgs#weights(double...)
+         */
         public static ZStoreArgs weights(double... weights) {
             return new ZStoreArgs().weights(weights);
         }
 
+        /**
+         * Creates new {@link ZStoreArgs} setting {@literal AGGREGATE SUM}.
+         *
+         * @return new {@link ZAddArgs} with {@literal AGGREGATE SUM} set.
+         * @see ZStoreArgs#sum()
+         */
         public static ZStoreArgs sum() {
             return new ZStoreArgs().sum();
         }
 
+        /**
+         * Creates new {@link ZStoreArgs} setting {@literal AGGREGATE MIN}.
+         *
+         * @return new {@link ZAddArgs} with {@literal AGGREGATE MIN} set.
+         * @see ZStoreArgs#sum()
+         */
         public static ZStoreArgs min() {
             return new ZStoreArgs().min();
         }
 
+        /**
+         * Creates new {@link ZStoreArgs} setting {@literal AGGREGATE MAX}.
+         *
+         * @return new {@link ZAddArgs} with {@literal AGGREGATE MAX} set.
+         * @see ZStoreArgs#sum()
+         */
         public static ZStoreArgs max() {
             return new ZStoreArgs().max();
         }
     }
 
+    /**
+     * Specify a multiplication factor for each input sorted set.
+     *
+     * @param weights must not be {@literal null}.
+     * @return {@code this} {@link ZStoreArgs}.
+     * @deprecated use {@link #weights(double...)}
+     */
     @Deprecated
     public static ZStoreArgs weights(long[] weights) {
+
+        LettuceAssert.notNull(weights, "Weights must not be null");
+
         return new ZStoreArgs().weights(toDoubleArray(weights));
     }
 
+    /**
+     * Specify a multiplication factor for each input sorted set.
+     *
+     * @param weights must not be {@literal null}.
+     * @return {@code this} {@link ZStoreArgs}.
+     */
     public ZStoreArgs weights(double... weights) {
+
+        LettuceAssert.notNull(weights, "Weights must not be null");
+
         this.weights = new ArrayList<>(weights.length);
 
         for (double weight : weights) {
@@ -87,22 +141,41 @@ public ZStoreArgs weights(double... weights) {
         return this;
     }
 
+    /**
+     * Aggregate scores of elements existing across multiple sets by summing up.
+     *
+     * @return {@code this} {@link ZStoreArgs}.
+     */
     public ZStoreArgs sum() {
-        aggregate = Aggregate.SUM;
+
+        this.aggregate = Aggregate.SUM;
         return this;
     }
 
+    /**
+     * Aggregate scores of elements existing across multiple sets by using the lowest score.
+     *
+     * @return {@code this} {@link ZStoreArgs}.
+     */
     public ZStoreArgs min() {
-        aggregate = Aggregate.MIN;
+
+        this.aggregate = Aggregate.MIN;
         return this;
     }
 
+    /**
+     * Aggregate scores of elements existing across multiple sets by using the highest score.
+     *
+     * @return {@code this} {@link ZStoreArgs}.
+     */
     public ZStoreArgs max() {
-        aggregate = Aggregate.MAX;
+
+        this.aggregate = Aggregate.MAX;
         return this;
     }
 
     private static double[] toDoubleArray(long[] weights) {
+
         double result[] = new double[weights.length];
         for (int i = 0; i < weights.length; i++) {
             result[i] = weights[i];
diff --git a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
index ff13ffce31..b7629c630e 100644
--- a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
+++ b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
@@ -21,7 +21,7 @@
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 
 /**
- * Parser for redis <a href="http://redis.io/commands/cluster-slots">CLUSTER SLOTS</a> command output.
+ * Parser for Redis <a href="http://redis.io/commands/cluster-slots">CLUSTER SLOTS</a> command output.
  *
  * @author Mark Paluch
  * @since 3.0
@@ -36,7 +36,7 @@ private ClusterSlotsParser() {
     }
 
     /**
-     * Parse the output of the redis CLUSTER SLOTS command and convert it to a list of
+     * Parse the output of the Redis CLUSTER SLOTS command and convert it to a list of
      * {@link io.lettuce.core.cluster.models.slots.ClusterSlotRange}
      *
      * @param clusterSlotsOutput output of CLUSTER SLOTS command
diff --git a/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java b/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
index 39b8d41211..f1d6fd0835 100644
--- a/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
+++ b/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
@@ -20,8 +20,8 @@
 import io.lettuce.core.internal.LettuceAssert;
 
 /**
- * Parser for redis <a href="http://redis.io/commands/command">COMMAND</a>/<a
- * href="http://redis.io/commands/command-info">COMMAND INFO</a>command output.
+ * Parser for Redis <a href="http://redis.io/commands/command">COMMAND</a>/<a
+ * href="http://redis.io/commands/command-info">COMMAND INFO</a> output.
  *
  * @author Mark Paluch
  * @since 3.0
@@ -60,7 +60,7 @@ private CommandDetailParser() {
     }
 
     /**
-     * Parse the output of the redis COMMAND/COMMAND INFO command and convert to a list of {@link CommandDetail}.
+     * Parse the output of the Redis COMMAND/COMMAND INFO command and convert to a list of {@link CommandDetail}.
      *
      * @param commandOutput the command output, must not be {@literal null}
      * @return RedisInstance
diff --git a/src/main/java/io/lettuce/core/models/role/RoleParser.java b/src/main/java/io/lettuce/core/models/role/RoleParser.java
index 7a8a8cc7c2..21d31457ba 100644
--- a/src/main/java/io/lettuce/core/models/role/RoleParser.java
+++ b/src/main/java/io/lettuce/core/models/role/RoleParser.java
@@ -21,7 +21,7 @@
 import io.lettuce.core.internal.LettuceAssert;
 
 /**
- * Parser for redis <a href="http://redis.io/commands/role">ROLE</a> command output.
+ * Parser for Redis <a href="http://redis.io/commands/role">ROLE</a> command output.
  *
  * @author Mark Paluch
  * @since 3.0
@@ -57,9 +57,9 @@ private RoleParser() {
     }
 
     /**
-     * Parse the output of the redis ROLE command and convert to a RedisInstance.
+     * Parse the output of the Redis ROLE command and convert to a RedisInstance.
      *
-     * @param roleOutput output of the redis ROLE command
+     * @param roleOutput output of the Redis ROLE command.
      * @return RedisInstance
      */
     public static RedisInstance parse(List<?> roleOutput) {
diff --git a/src/main/java/io/lettuce/core/protocol/RedisCommand.java b/src/main/java/io/lettuce/core/protocol/RedisCommand.java
index a9c6d5bb00..7aed9628fe 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisCommand.java
@@ -65,7 +65,7 @@ public interface RedisCommand<K, V, T> {
 
     /**
      *
-     * @return the redis command type like {@literal SADD}, {@literal HMSET}, {@literal QUIT}.
+     * @return the Redis command type like {@literal SADD}, {@literal HMSET}, {@literal QUIT}.
      */
     ProtocolKeyword getType();
 
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java b/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
index 9baeb3e44f..d7e5c0159f 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
@@ -21,7 +21,7 @@
 import io.lettuce.core.output.CommandOutput;
 
 /**
- * One element of the redis pub/sub stream. May be a message or notification of subscription details.
+ * One element of the Redis pub/sub stream. May be a message or notification of subscription details.
  *
  * @param <K> Key type.
  * @param <V> Value type.

From d54970723e56522f9caf48c82b2decfb2e9414bb Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 17 Apr 2018 12:09:38 +0200
Subject: [PATCH 443/808] Add MASTER type to KillArgs #760

---
 src/main/java/io/lettuce/core/KillArgs.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/KillArgs.java b/src/main/java/io/lettuce/core/KillArgs.java
index 8faf1d85fb..350f90a2f2 100644
--- a/src/main/java/io/lettuce/core/KillArgs.java
+++ b/src/main/java/io/lettuce/core/KillArgs.java
@@ -36,7 +36,7 @@
 public class KillArgs implements CompositeArgument {
 
     private enum Type {
-        NORMAL, SLAVE, PUBSUB
+        NORMAL, MASTER, SLAVE, PUBSUB
     }
 
     private Boolean skipme;
@@ -107,6 +107,17 @@ public static KillArgs typeNormal() {
             return new KillArgs().type(Type.NORMAL);
         }
 
+        /**
+         * Creates new {@link KillArgs} setting {@literal TYPE MASTER}.
+         *
+         * @return new {@link KillArgs} with {@literal TYPE MASTER} set.
+         * @see KillArgs#type(Type)
+         * @since 5.0.4
+         */
+        public static KillArgs typeMaster() {
+            return new KillArgs().type(Type.MASTER);
+        }
+
         /**
          * Creates new {@link KillArgs} setting {@literal TYPE SLAVE}.
          *

From 953ac8a30998dbc05f6e64641dd4249a86ed65e0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 17 Apr 2018 15:29:55 +0200
Subject: [PATCH 444/808] Add unknown node as trigger for adaptive refresh #732

Lettuce now considers attempts to connect unknown nodes (from MOVED redirections, external connection signals, unknown nodeId references) as dynamic source for a topology refresh signal.
A common case is when a new node is added to a Redis Cluster but the topology view is not yet refreshed.
---
 .../ClusterDistributionChannelWriter.java     | 10 +++-
 .../core/cluster/ClusterEventListener.java    | 48 +++++++++-------
 .../ClusterPubSubConnectionProvider.java      |  6 +-
 .../ClusterTopologyRefreshOptions.java        |  7 +++
 .../ClusterTopologyRefreshScheduler.java      |  9 ++-
 .../core/cluster/PartitionException.java      | 55 +++++++++++++++++++
 .../cluster/PartitionSelectorException.java   | 45 +++++++++++++++
 .../PooledClusterConnectionProvider.java      | 47 ++++++++--------
 .../core/cluster/ReconnectEventListener.java  |  4 +-
 .../core/cluster/RedisClusterClient.java      |  4 +-
 .../cluster/UnknownPartitionException.java    | 34 ++++++++++++
 .../cluster/models/partitions/Partitions.java | 21 +++++++
 .../models/partitions/RedisClusterNode.java   |  5 ++
 .../core/protocol/ConnectionWatchdog.java     |  2 +-
 .../core/protocol/ReconnectionListener.java   |  4 +-
 .../ClusterTopologyRefreshSchedulerTest.java  | 40 +++++++++-----
 .../PooledClusterConnectionProviderTest.java  | 23 +++++++-
 .../core/protocol/ConnectionFailureTest.java  |  7 +--
 ...terDistributionChannelWriterBenchmark.java |  2 +-
 19 files changed, 295 insertions(+), 78 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/cluster/PartitionException.java
 create mode 100644 src/main/java/io/lettuce/core/cluster/PartitionSelectorException.java
 create mode 100644 src/main/java/io/lettuce/core/cluster/UnknownPartitionException.java

diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index 2f568c53b2..1330c756cc 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -60,7 +60,6 @@ class ClusterDistributionChannelWriter implements RedisChannelWriter {
         this.clusterEventListener = clusterEventListener;
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
 
@@ -70,6 +69,11 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
             throw new RedisException("Connection is closed");
         }
 
+        return doWrite(command);
+    }
+
+    private <K, V, T> RedisCommand<K, V, T> doWrite(RedisCommand<K, V, T> command) {
+
         if (command instanceof ClusterCommand && !command.isDone()) {
 
             ClusterCommand<K, V, T> clusterCommand = (ClusterCommand<K, V, T>) command;
@@ -90,7 +94,7 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
                 command.getOutput().setError((String) null);
 
                 CompletableFuture<StatefulRedisConnection<K, V>> connectFuture = asyncClusterConnectionProvider
-                        .getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, target.getHostText(), target.getPort());
+                        .getConnectionAsync(Intent.WRITE, target.getHostText(), target.getPort());
 
                 if (isSuccessfullyCompleted(connectFuture)) {
                     writeCommand(command, asking, connectFuture.join(), null);
@@ -112,7 +116,7 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
             if (encodedKey != null) {
 
                 int hash = getSlot(encodedKey);
-                ClusterConnectionProvider.Intent intent = getIntent(command.getType());
+                Intent intent = getIntent(command.getType());
 
                 CompletableFuture<StatefulRedisConnection<K, V>> connectFuture = ((AsyncClusterConnectionProvider) clusterConnectionProvider)
                         .getConnectionAsync(intent, hash);
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java b/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
index 8540abaf9c..1499afb922 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
@@ -16,30 +16,36 @@
 package io.lettuce.core.cluster;
 
 /**
+ * Event listener for cluster state/cluster node events.
+ *
  * @author Mark Paluch
  */
 interface ClusterEventListener {
 
-    void onAskRedirection();
-
-    void onMovedRedirection();
-
-    void onReconnection(int attempt);
-
-    static ClusterEventListener NO_OP = new ClusterEventListener() {
-        @Override
-        public void onAskRedirection() {
-
-        }
-
-        @Override
-        public void onMovedRedirection() {
-
-        }
-
-        @Override
-        public void onReconnection(int attempt) {
-
-        }
+    /**
+     * Event callback if a command receives a {@literal ASK} redirection.
+     */
+    default void onAskRedirection() {
+    }
+
+    /**
+     * Event callback if a command receives a {@literal MOVED} redirection.
+     */
+    default void onMovedRedirection() {
+    }
+
+    /**
+     * Event callback if a connection tries to reconnect.
+     */
+    default void onReconnectAttempt(int attempt) {
+    }
+
+    /**
+     * Event callback if a connection is attempted to an unknown node.
+     */
+    default void onUnknownNode() {
+    }
+
+    ClusterEventListener NO_OP = new ClusterEventListener() {
     };
 }
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
index 7176f6de85..691b2a6ebf 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
@@ -50,11 +50,13 @@ class ClusterPubSubConnectionProvider<K, V> extends PooledClusterConnectionProvi
      * @param clusterWriter must not be {@literal null}.
      * @param redisCodec must not be {@literal null}.
      * @param notificationTarget must not be {@literal null}.
+     * @param clusterEventListener must not be {@literal null}.
      */
     ClusterPubSubConnectionProvider(RedisClusterClient redisClusterClient, RedisChannelWriter clusterWriter,
-            RedisCodec<K, V> redisCodec, RedisClusterPubSubListener<K, V> notificationTarget) {
+            RedisCodec<K, V> redisCodec, RedisClusterPubSubListener<K, V> notificationTarget,
+            ClusterEventListener clusterEventListener) {
 
-        super(redisClusterClient, clusterWriter, redisCodec);
+        super(redisClusterClient, clusterWriter, redisCodec, clusterEventListener);
 
         this.redisClusterClient = redisClusterClient;
         this.redisCodec = redisCodec;
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
index b58c7e70a5..da85599d70 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
@@ -425,5 +425,12 @@ public enum RefreshTrigger {
          * Connections to a particular host run into persistent reconnects (more than one attempt).
          */
         PERSISTENT_RECONNECTS,
+
+        /**
+         * Connection attempts to unknown nodes.
+         *
+         * @since 5.1
+         */
+        UNKNOWN_NODE
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
index 437006a0ce..e036f57e45 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
@@ -128,7 +128,7 @@ public void onMovedRedirection() {
     }
 
     @Override
-    public void onReconnection(int attempt) {
+    public void onReconnectAttempt(int attempt) {
 
         if (isEnabled(ClusterTopologyRefreshOptions.RefreshTrigger.PERSISTENT_RECONNECTS)
                 && attempt >= getClusterTopologyRefreshOptions().getRefreshTriggersReconnectAttempts()) {
@@ -136,6 +136,13 @@ public void onReconnection(int attempt) {
         }
     }
 
+    @Override
+    public void onUnknownNode() {
+        if (isEnabled(ClusterTopologyRefreshOptions.RefreshTrigger.UNKNOWN_NODE)) {
+            indicateTopologyRefreshSignal();
+        }
+    }
+
     private ClusterTopologyRefreshOptions getClusterTopologyRefreshOptions() {
 
         ClusterClientOptions clusterClientOptions = redisClusterClient.getClusterClientOptions();
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionException.java b/src/main/java/io/lettuce/core/cluster/PartitionException.java
new file mode 100644
index 0000000000..b22d8dd0bb
--- /dev/null
+++ b/src/main/java/io/lettuce/core/cluster/PartitionException.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster;
+
+import io.lettuce.core.RedisException;
+
+/**
+ * Partition access exception thrown when a partition-specific operations fails.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+public class PartitionException extends RedisException {
+
+    /**
+     * Create a {@code PartitionException} with the specified detail message.
+     *
+     * @param msg the detail message.
+     */
+    public PartitionException(String msg) {
+        super(msg);
+    }
+
+    /**
+     * Create a {@code PartitionException} with the specified detail message and nested exception.
+     *
+     * @param msg the detail message.
+     * @param cause the nested exception.
+     */
+    public PartitionException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+
+    /**
+     * Create a {@code PartitionException} with the specified nested exception.
+     *
+     * @param cause the nested exception.
+     */
+    public PartitionException(Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionSelectorException.java b/src/main/java/io/lettuce/core/cluster/PartitionSelectorException.java
new file mode 100644
index 0000000000..4383d1553d
--- /dev/null
+++ b/src/main/java/io/lettuce/core/cluster/PartitionSelectorException.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster;
+
+import io.lettuce.core.cluster.models.partitions.Partitions;
+
+/**
+ * Exception thrown when a partition selection fails (slot not covered, no read candidates available).
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+public class PartitionSelectorException extends PartitionException {
+
+    private final Partitions partitions;
+
+    /**
+     * Create a {@code UnknownPartitionException} with the specified detail message.
+     *
+     * @param msg the detail message.
+     * @param partitions read-only view of the current topology view.
+     */
+    public PartitionSelectorException(String msg, Partitions partitions) {
+
+        super(msg);
+        this.partitions = partitions;
+    }
+
+    public Partitions getPartitions() {
+        return partitions;
+    }
+}
diff --git a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
index c67f293fcc..96356f4643 100644
--- a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
@@ -61,6 +61,7 @@ class PooledClusterConnectionProvider<K, V> implements ClusterConnectionProvider
     private final RedisClusterClient redisClusterClient;
     private final ClusterNodeConnectionFactory<K, V> connectionFactory;
     private final RedisChannelWriter clusterWriter;
+    private final ClusterEventListener clusterEventListener;
     private final RedisCodec<K, V> redisCodec;
     private final AsyncConnectionProvider<ConnectionKey, StatefulRedisConnection<K, V>, ConnectionFuture<StatefulRedisConnection<K, V>>> connectionProvider;
 
@@ -69,11 +70,12 @@ class PooledClusterConnectionProvider<K, V> implements ClusterConnectionProvider
     private ReadFrom readFrom;
 
     public PooledClusterConnectionProvider(RedisClusterClient redisClusterClient, RedisChannelWriter clusterWriter,
-            RedisCodec<K, V> redisCodec) {
+            RedisCodec<K, V> redisCodec, ClusterEventListener clusterEventListener) {
 
         this.redisCodec = redisCodec;
         this.redisClusterClient = redisClusterClient;
         this.clusterWriter = clusterWriter;
+        this.clusterEventListener = clusterEventListener;
         this.connectionFactory = new NodeConnectionPostProcessor(getConnectionFactory(redisClusterClient));
         this.connectionProvider = new AsyncConnectionProvider<>(this.connectionFactory);
     }
@@ -118,7 +120,7 @@ private CompletableFuture<StatefulRedisConnection<K, V>> getWriteConnection(int
         if (writer == null) {
             RedisClusterNode partition = partitions.getPartitionBySlot(slot);
             if (partition == null) {
-                throw new RedisException("Cannot determine a partition for slot " + slot + " (Partitions: " + partitions + ")");
+                throw new PartitionSelectorException("Cannot determine a partition for slot " + slot + ".", partitions.clone());
             }
 
             // Use always host and port for slot-oriented operations. We don't want to get reconnected on a different
@@ -157,8 +159,8 @@ private CompletableFuture<StatefulRedisConnection<K, V>> getReadConnection(int s
 
             RedisClusterNode master = partitions.getPartitionBySlot(slot);
             if (master == null) {
-                throw new RedisException("Cannot determine a partition to read for slot " + slot + " (Partitions: "
-                        + partitions + ")");
+                throw new PartitionSelectorException(String.format("Cannot determine a partition to read for slot %d.", slot),
+                        partitions.clone());
             }
 
             List<RedisNodeDescription> candidates = getReadCandidates(master);
@@ -175,8 +177,9 @@ public Iterator<RedisNodeDescription> iterator() {
             });
 
             if (selection.isEmpty()) {
-                throw new RedisException("Cannot determine a partition to read for slot " + slot + " (Partitions: "
-                        + partitions + ") with setting " + readFrom);
+                throw new PartitionSelectorException(String.format(
+                        "Cannot determine a partition to read for slot %d with setting %s.", slot, readFrom),
+                        partitions.clone());
             }
 
             readerCandidates = getReadFromConnections(selection);
@@ -378,12 +381,14 @@ private void beforeGetConnection(Intent intent, String host, int port) {
             logger.debug("getConnection(" + intent + ", " + host + ", " + port + ")");
         }
 
-        if (validateClusterNodeMembership()) {
-            RedisClusterNode redisClusterNode = partitions.getPartition(host, port);
+        RedisClusterNode redisClusterNode = partitions.getPartition(host, port);
 
-            if (redisClusterNode == null) {
+        if (redisClusterNode == null) {
+            clusterEventListener.onUnknownNode();
+
+            if (validateClusterNodeMembership()) {
                 HostAndPort hostAndPort = HostAndPort.of(host, port);
-                throw invalidConnectionPoint(hostAndPort.toString());
+                throw connectionAttemptRejected(hostAndPort.toString());
             }
         }
     }
@@ -529,9 +534,10 @@ private void resetFastConnectionCache() {
         }
     }
 
-    private static RuntimeException invalidConnectionPoint(String message) {
-        return new IllegalArgumentException("Connection to " + message
-                + " not allowed. This connection point is not known in the cluster view");
+    private static RuntimeException connectionAttemptRejected(String message) {
+
+        return new UnknownPartitionException("Connection to " + message
+                + " not allowed. This partition is not known in the cluster view.");
     }
 
     private boolean validateClusterNodeMembership() {
@@ -561,18 +567,15 @@ public void setPartitions(Partitions partitions) {
         @Override
         public ConnectionFuture<StatefulRedisConnection<K, V>> apply(ConnectionKey key) {
 
-            if (key.nodeId != null) {
-                if (getPartitions().getPartitionByNodeId(key.nodeId) == null) {
-                    throw invalidConnectionPoint("node id " + key.nodeId);
-                }
+            if (key.nodeId != null && getPartitions().getPartitionByNodeId(key.nodeId) == null) {
+                clusterEventListener.onUnknownNode();
+                throw connectionAttemptRejected("node id " + key.nodeId);
             }
 
-            if (key.host != null) {
-
+            if (key.host != null && partitions.getPartition(key.host, key.port) == null) {
+                clusterEventListener.onUnknownNode();
                 if (validateClusterNodeMembership()) {
-                    if (partitions.getPartition(key.host, key.port) == null) {
-                        throw invalidConnectionPoint(key.host + ":" + key.port);
-                    }
+                    throw connectionAttemptRejected(key.host + ":" + key.port);
                 }
             }
 
diff --git a/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java b/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java
index a6e1ba3a16..4c138cec71 100644
--- a/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java
+++ b/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java
@@ -30,7 +30,7 @@ public ReconnectEventListener(ClusterEventListener clusterEventListener) {
     }
 
     @Override
-    public void onReconnect(Reconnect reconnect) {
-        clusterEventListener.onReconnection(reconnect.getAttempt());
+    public void onReconnectAttempt(Reconnect reconnect) {
+        clusterEventListener.onReconnectAttempt(reconnect.getAttempt());
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index d51dd8314c..a5a24c75f1 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -580,7 +580,7 @@ private <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectCl
         ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, writer,
                 clusterTopologyRefreshScheduler);
         PooledClusterConnectionProvider<K, V> pooledClusterConnectionProvider = new PooledClusterConnectionProvider<K, V>(this,
-                clusterWriter, codec);
+                clusterWriter, codec, clusterTopologyRefreshScheduler);
 
         clusterWriter.setClusterConnectionProvider(pooledClusterConnectionProvider);
 
@@ -658,7 +658,7 @@ private <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> con
                 writer, codec, timeout);
 
         ClusterPubSubConnectionProvider<K, V> pooledClusterConnectionProvider = new ClusterPubSubConnectionProvider<>(this,
-                clusterWriter, codec, connection.getUpstreamListener());
+                clusterWriter, codec, connection.getUpstreamListener(), clusterTopologyRefreshScheduler);
 
         clusterWriter.setClusterConnectionProvider(pooledClusterConnectionProvider);
         connection.setPartitions(partitions);
diff --git a/src/main/java/io/lettuce/core/cluster/UnknownPartitionException.java b/src/main/java/io/lettuce/core/cluster/UnknownPartitionException.java
new file mode 100644
index 0000000000..4822a2a885
--- /dev/null
+++ b/src/main/java/io/lettuce/core/cluster/UnknownPartitionException.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster;
+
+/**
+ * Exception thrown when an unknown partition is requested.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+public class UnknownPartitionException extends PartitionException {
+
+    /**
+     * Create a {@code UnknownPartitionException} with the specified detail message.
+     *
+     * @param msg the detail message.
+     */
+    public UnknownPartitionException(String msg) {
+        super(msg);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
index 842800297f..a3cfb9e3aa 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
@@ -59,6 +59,27 @@ public class Partitions implements Collection<RedisClusterNode> {
     private volatile RedisClusterNode slotCache[] = EMPTY;
     private volatile Collection<RedisClusterNode> nodeReadView = Collections.emptyList();
 
+    /**
+     * Create a deep copy of this {@link Partitions} object.
+     *
+     * @return a deep copy of this {@link Partitions} object.
+     */
+    @Override
+    public Partitions clone() {
+
+        Collection<RedisClusterNode> readView = new ArrayList<>(nodeReadView);
+
+        Partitions copy = new Partitions();
+
+        for (RedisClusterNode node : readView) {
+            copy.addPartition(node.clone());
+        }
+
+        copy.updateCache();
+
+        return copy;
+    }
+
     /**
      * Retrieve a {@link RedisClusterNode} by its slot number. This method does not distinguish between masters and slaves.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
index a3c719bf87..ebee0b16b7 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
@@ -106,6 +106,11 @@ public static RedisClusterNode of(String nodeId) {
         return redisClusterNode;
     }
 
+    @Override
+    public RedisClusterNode clone() {
+        return new RedisClusterNode(this);
+    }
+
     public RedisURI getUri() {
         return uri;
     }
diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
index b722199583..07e1ecae60 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
@@ -280,7 +280,7 @@ public void run(int attempt) throws Exception {
         InternalLogLevel warnLevelToUse = warnLevel;
 
         try {
-            reconnectionListener.onReconnect(new ConnectionEvents.Reconnect(attempt));
+            reconnectionListener.onReconnectAttempt(new ConnectionEvents.Reconnect(attempt));
             logger.log(infoLevel, "Reconnecting, last destination was {}", remoteAddress);
 
             CompletableFuture<Channel> future = reconnectionHandler.reconnect();
diff --git a/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java b/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java
index 9bc367a320..d13ead4043 100644
--- a/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java
+++ b/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java
@@ -27,7 +27,7 @@ public interface ReconnectionListener {
 
     ReconnectionListener NO_OP = new ReconnectionListener() {
         @Override
-        public void onReconnect(ConnectionEvents.Reconnect reconnect) {
+        public void onReconnectAttempt(ConnectionEvents.Reconnect reconnect) {
 
         }
     };
@@ -37,6 +37,6 @@ public void onReconnect(ConnectionEvents.Reconnect reconnect) {
      *
      * @param reconnect the event payload.
      */
-    void onReconnect(ConnectionEvents.Reconnect reconnect);
+    void onReconnectAttempt(ConnectionEvents.Reconnect reconnect);
 
 }
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java
index 0a1dc18904..fcfccbd407 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java
@@ -56,7 +56,7 @@ public class ClusterTopologyRefreshSchedulerTest {
     private EventExecutorGroup eventExecutors;
 
     @Before
-    public void before() throws Exception {
+    public void before() {
 
         when(clientResources.eventExecutorGroup()).thenReturn(eventExecutors);
 
@@ -64,7 +64,7 @@ public void before() throws Exception {
     }
 
     @Test
-    public void runShouldSubmitRefreshShouldTrigger() throws Exception {
+    public void runShouldSubmitRefreshShouldTrigger() {
 
         when(clusterClient.getClusterClientOptions()).thenReturn(clusterClientOptions);
 
@@ -73,7 +73,7 @@ public void runShouldSubmitRefreshShouldTrigger() throws Exception {
     }
 
     @Test
-    public void runnableShouldCallPartitionRefresh() throws Exception {
+    public void runnableShouldCallPartitionRefresh() {
 
         when(clusterClient.getClusterClientOptions()).thenReturn(clusterClientOptions);
 
@@ -88,14 +88,14 @@ public void runnableShouldCallPartitionRefresh() throws Exception {
     }
 
     @Test
-    public void shouldNotSubmitIfOptionsNotSet() throws Exception {
+    public void shouldNotSubmitIfOptionsNotSet() {
 
         sut.run();
         verify(eventExecutors, never()).submit(any(Runnable.class));
     }
 
     @Test
-    public void shouldNotSubmitIfExecutorIsShuttingDown() throws Exception {
+    public void shouldNotSubmitIfExecutorIsShuttingDown() {
 
         when(eventExecutors.isShuttingDown()).thenReturn(true);
 
@@ -104,7 +104,7 @@ public void shouldNotSubmitIfExecutorIsShuttingDown() throws Exception {
     }
 
     @Test
-    public void shouldNotSubmitIfExecutorIsShutdown() throws Exception {
+    public void shouldNotSubmitIfExecutorIsShutdown() {
 
         when(eventExecutors.isShutdown()).thenReturn(true);
 
@@ -113,7 +113,7 @@ public void shouldNotSubmitIfExecutorIsShutdown() throws Exception {
     }
 
     @Test
-    public void shouldNotSubmitIfExecutorIsTerminated() throws Exception {
+    public void shouldNotSubmitIfExecutorIsTerminated() {
 
         when(eventExecutors.isTerminated()).thenReturn(true);
 
@@ -122,7 +122,7 @@ public void shouldNotSubmitIfExecutorIsTerminated() throws Exception {
     }
 
     @Test
-    public void shouldTriggerRefreshOnAskRedirection() throws Exception {
+    public void shouldTriggerRefreshOnAskRedirection() {
 
         ClusterTopologyRefreshOptions clusterTopologyRefreshOptions = ClusterTopologyRefreshOptions.builder()
                 .enableAllAdaptiveRefreshTriggers().build();
@@ -137,7 +137,7 @@ public void shouldTriggerRefreshOnAskRedirection() throws Exception {
     }
 
     @Test
-    public void shouldNotTriggerAdaptiveRefreshUsingDefaults() throws Exception {
+    public void shouldNotTriggerAdaptiveRefreshUsingDefaults() {
 
         ClusterTopologyRefreshOptions clusterTopologyRefreshOptions = ClusterTopologyRefreshOptions.create();
 
@@ -151,7 +151,7 @@ public void shouldNotTriggerAdaptiveRefreshUsingDefaults() throws Exception {
     }
 
     @Test
-    public void shouldTriggerRefreshOnMovedRedirection() throws Exception {
+    public void shouldTriggerRefreshOnMovedRedirection() {
 
         ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder().topologyRefreshOptions(immediateRefresh)
                 .build();
@@ -163,26 +163,38 @@ public void shouldTriggerRefreshOnMovedRedirection() throws Exception {
     }
 
     @Test
-    public void shouldTriggerRefreshOnReconnect() throws Exception {
+    public void shouldTriggerRefreshOnReconnect() {
 
         ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder().topologyRefreshOptions(immediateRefresh)
                 .build();
 
         when(clusterClient.getClusterClientOptions()).thenReturn(clusterClientOptions);
 
-        sut.onReconnection(10);
+        sut.onReconnectAttempt(10);
         verify(eventExecutors).submit(any(Runnable.class));
     }
 
     @Test
-    public void shouldNotTriggerRefreshOnFirstReconnect() throws Exception {
+    public void shouldTriggerRefreshOnUnknownNode() {
 
         ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder().topologyRefreshOptions(immediateRefresh)
                 .build();
 
         when(clusterClient.getClusterClientOptions()).thenReturn(clusterClientOptions);
 
-        sut.onReconnection(1);
+        sut.onUnknownNode();
+        verify(eventExecutors).submit(any(Runnable.class));
+    }
+
+    @Test
+    public void shouldNotTriggerRefreshOnFirstReconnect() {
+
+        ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder().topologyRefreshOptions(immediateRefresh)
+                .build();
+
+        when(clusterClient.getClusterClientOptions()).thenReturn(clusterClientOptions);
+
+        sut.onReconnectAttempt(1);
         verify(eventExecutors, never()).submit(any(Runnable.class));
     }
 
diff --git a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
index 4044b8819d..2a4b21ad47 100644
--- a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
@@ -84,6 +85,9 @@ public class PooledClusterConnectionProviderTest {
     @Mock
     ClientResources clientResourcesMock;
 
+    @Mock
+    ClusterEventListener clusterEventListener;
+
     Partitions partitions = new Partitions();
 
     @Before
@@ -91,7 +95,7 @@ public void before() {
 
         nodeConnectionMock = (StatefulRedisConnection) channelHandlerMock;
 
-        sut = new PooledClusterConnectionProvider<>(clientMock, writerMock, CODEC);
+        sut = new PooledClusterConnectionProvider<>(clientMock, writerMock, CODEC, clusterEventListener);
 
         List<Integer> slots1 = IntStream.range(0, 8192).boxed().collect(Collectors.toList());
         List<Integer> slots2 = IntStream.range(8192, SlotHash.SLOT_COUNT).boxed().collect(Collectors.toList());
@@ -274,4 +278,21 @@ public void shouldCloseConnections() {
 
         verify(channelHandlerMock).closeAsync();
     }
+
+    @Test
+    public void shouldRejectConnectionsToUnknownNodeId() {
+
+        assertThatThrownBy(() -> sut.getConnection(Intent.READ, "foobar")).isInstanceOf(UnknownPartitionException.class);
+
+        verify(clusterEventListener).onUnknownNode();
+    }
+
+    @Test
+    public void shouldRejectConnectionsToUnknownNodeHostAndPort() {
+
+        assertThatThrownBy(() -> sut.getConnection(Intent.READ, "localhost", 1234)).isInstanceOf(
+                UnknownPartitionException.class);
+
+        verify(clusterEventListener).onUnknownNode();
+    }
 }
diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
index 3688e65347..d407d3a858 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
@@ -138,12 +138,7 @@ public void pingBeforeConnectFailOnReconnectShouldSendEvents() throws Exception
             ConnectionWatchdog connectionWatchdog = ConnectionTestUtil
                     .getConnectionWatchdog(connection.getStatefulConnection());
 
-            ReconnectionListener reconnectionListener = new ReconnectionListener() {
-                @Override
-                public void onReconnect(ConnectionEvents.Reconnect reconnect) {
-                    events.offer(reconnect);
-                }
-            };
+            ReconnectionListener reconnectionListener = events::offer;
 
             ReflectionTestUtils.setField(connectionWatchdog, "reconnectionListener", reconnectionListener);
 
diff --git a/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
index dc75d68f7c..65e79bea3b 100644
--- a/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
@@ -85,7 +85,7 @@ public void setup() {
 
         writer.setPartitions(partitions);
         writer.setClusterConnectionProvider(new PooledClusterConnectionProvider(new EmptyRedisClusterClient(RedisURI.create(
-                "localhost", 7379)), EMPTY_WRITER, ByteArrayCodec.INSTANCE) {
+                "localhost", 7379)), EMPTY_WRITER, ByteArrayCodec.INSTANCE, ClusterEventListener.NO_OP) {
             public CompletableFuture getConnectionAsync(Intent intent, int slot) {
                 return connectionFuture;
             }

From 7c9fdb87c6bd2c0d6dfe258f21040299e97c7570 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 20 Apr 2018 20:46:20 +0200
Subject: [PATCH 445/808] Remove System.out.println() from DefaultEndpoint #765

---
 src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index e2c5eed81c..4705a8e440 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -807,9 +807,6 @@ static RetryListener newInstance(DefaultEndpoint endpoint, RedisCommand<?, ?, ?>
 
             RetryListener entry = RECYCLER.get();
 
-            if (command == null) {
-                System.out.println();
-            }
             entry.endpoint = endpoint;
             entry.sentCommand = command;
 

From 63e9bf48223f3e271d13f602775d1ae1716975c2 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 23 Apr 2018 14:07:34 +0200
Subject: [PATCH 446/808] Do not retry completed commands through RetryListener
 #767

---
 .../core/protocol/DefaultEndpoint.java        | 55 +++++++++++++++----
 .../core/protocol/DefaultEndpointTest.java    | 27 +++++++--
 2 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index 4705a8e440..9d5f654c1d 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -851,18 +851,11 @@ private void doComplete(Future<Void> future) {
             }
 
             Channel channel = endpoint.channel;
-            if (channel != null) {
 
-                // Capture values before recycler clears these.
-                RedisCommand<?, ?, ?> sentCommand = this.sentCommand;
-                Collection<? extends RedisCommand<?, ?, ?>> sentCommands = this.sentCommands;
-                DefaultEndpoint endpoint = this.endpoint;
-                channel.eventLoop().submit(() -> {
-                    requeueCommands(sentCommand, sentCommands, endpoint);
-                });
-            } else {
-                requeueCommands(sentCommand, sentCommands, endpoint);
-            }
+            // Capture values before recycler clears these.
+            RedisCommand<?, ?, ?> sentCommand = this.sentCommand;
+            Collection<? extends RedisCommand<?, ?, ?>> sentCommands = this.sentCommands;
+            potentiallyRequeueCommands(channel, sentCommand, sentCommands);
 
             if (!(cause instanceof ClosedChannelException)) {
 
@@ -877,6 +870,46 @@ private void doComplete(Future<Void> future) {
             }
         }
 
+        /**
+         * Requeue command/commands
+         *
+         * @param channel
+         * @param sentCommand
+         * @param sentCommands
+         */
+        private void potentiallyRequeueCommands(Channel channel, RedisCommand<?, ?, ?> sentCommand,
+                Collection<? extends RedisCommand<?, ?, ?>> sentCommands) {
+
+            if (sentCommand != null && sentCommand.isDone()) {
+                return;
+            }
+
+            if (sentCommands != null) {
+
+                boolean foundToSend = false;
+
+                for (RedisCommand<?, ?, ?> command : sentCommands) {
+                    if (!command.isDone()) {
+                        foundToSend = true;
+                        break;
+                    }
+                }
+
+                if (!foundToSend) {
+                    return;
+                }
+            }
+
+            if (channel != null) {
+                DefaultEndpoint endpoint = this.endpoint;
+                channel.eventLoop().submit(() -> {
+                    requeueCommands(sentCommand, sentCommands, endpoint);
+                });
+            } else {
+                requeueCommands(sentCommand, sentCommands, endpoint);
+            }
+        }
+
         @SuppressWarnings("unchecked")
         private void requeueCommands(RedisCommand<?, ?, ?> sentCommand, Collection sentCommands, DefaultEndpoint endpoint) {
 
diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
index 90af5cf644..a9a5fb12b2 100644
--- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
@@ -51,10 +51,7 @@
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.internal.LettuceFactories;
 import io.lettuce.core.output.StatusOutput;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.DefaultChannelPromise;
-import io.netty.channel.EventLoop;
+import io.netty.channel.*;
 import io.netty.handler.codec.EncoderException;
 import io.netty.util.concurrent.ImmediateEventExecutor;
 
@@ -77,6 +74,8 @@ public class DefaultEndpointTest {
     @Mock
     private ConnectionWatchdog connectionWatchdog;
 
+    private ChannelPromise promise;
+
     @BeforeClass
     public static void beforeClass() {
         LoggerContext ctx = (LoggerContext) LogManager.getContext();
@@ -96,6 +95,7 @@ public static void afterClass() {
     @Before
     public void before() {
 
+        promise = new DefaultChannelPromise(channel);
         when(channel.writeAndFlush(any())).thenAnswer(invocation -> {
             if (invocation.getArguments()[0] instanceof RedisCommand) {
                 queue.add((RedisCommand) invocation.getArguments()[0]);
@@ -104,7 +104,7 @@ public void before() {
             if (invocation.getArguments()[0] instanceof Collection) {
                 queue.addAll((Collection) invocation.getArguments()[0]);
             }
-            return new DefaultChannelPromise(channel);
+            return promise;
         });
 
         when(channel.write(any())).thenAnswer(invocation -> {
@@ -115,7 +115,7 @@ public void before() {
             if (invocation.getArguments()[0] instanceof Collection) {
                 queue.addAll((Collection) invocation.getArguments()[0]);
             }
-            return new DefaultChannelPromise(channel);
+            return promise;
         });
 
         sut = new DefaultEndpoint(ClientOptions.create());
@@ -346,6 +346,21 @@ public void retryListenerCompletesSuccessfullyAfterDeferredRequeue() {
         assertThat(command.exception).isInstanceOf(RedisException.class);
     }
 
+    @Test
+    public void retryListenerDoesNotRetryCompletedCommands() {
+
+        DefaultEndpoint.RetryListener listener = DefaultEndpoint.RetryListener.newInstance(sut, command);
+
+        when(channel.eventLoop()).thenReturn(mock(EventLoop.class));
+
+        command.complete();
+        promise.tryFailure(new Exception());
+
+        listener.operationComplete(promise);
+
+        verify(channel, never()).writeAndFlush(command);
+    }
+
     @Test
     public void testMTCConcurrentConcurrentWrite() throws Throwable {
         TestFramework.runOnce(new MTCConcurrentConcurrentWrite(command));

From c4359abedb2ca0efd9eba7dc7d9db5ddc896aba0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 23 Apr 2018 14:09:50 +0200
Subject: [PATCH 447/808] Complete write promise successfully on no-op writes
 #764

CommandHandler now completes a write promise if the write completes without actually writing a message. Previously, no-op writes did not complete and rendered an invalid state (e.g. queue size was not decremented).
---
 .../lettuce/core/protocol/CommandHandler.java   | 17 +++++++----------
 .../io/lettuce/core/ConnectionCommandTest.java  |  5 ++++-
 .../core/protocol/CommandHandlerTest.java       | 16 +++++++++++++++-
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 459cc4ec36..2de811988a 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -350,17 +350,15 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
         }
 
         if (msg instanceof Collection) {
-
-            Collection<RedisCommand<?, ?, ?>> batch = (Collection<RedisCommand<?, ?, ?>>) msg;
-
-            writeBatch(ctx, batch, promise);
+            writeBatch(ctx, (Collection<RedisCommand<?, ?, ?>>) msg, promise);
         }
     }
 
     private void writeSingleCommand(ChannelHandlerContext ctx, RedisCommand<?, ?, ?> command, ChannelPromise promise)
-            throws Exception {
+ {
 
         if (!isWriteable(command)) {
+            promise.trySuccess();
             return;
         }
 
@@ -368,8 +366,7 @@ private void writeSingleCommand(ChannelHandlerContext ctx, RedisCommand<?, ?, ?>
         ctx.write(command, promise);
     }
 
-    private void writeBatch(ChannelHandlerContext ctx, Collection<RedisCommand<?, ?, ?>> batch, ChannelPromise promise)
-            throws Exception {
+    private void writeBatch(ChannelHandlerContext ctx, Collection<RedisCommand<?, ?, ?>> batch, ChannelPromise promise) {
 
         Collection<RedisCommand<?, ?, ?>> deduplicated = new LinkedHashSet<>(batch.size(), 1);
 
@@ -390,8 +387,7 @@ private void writeBatch(ChannelHandlerContext ctx, Collection<RedisCommand<?, ?,
                 redisCommand.completeExceptionally(e);
             }
 
-            promise.setFailure(e);
-            return;
+            throw e;
         }
 
         for (RedisCommand<?, ?, ?> command : deduplicated) {
@@ -400,6 +396,8 @@ private void writeBatch(ChannelHandlerContext ctx, Collection<RedisCommand<?, ?,
 
         if (!deduplicated.isEmpty()) {
             ctx.write(deduplicated, promise);
+        } else {
+            promise.trySuccess();
         }
     }
 
@@ -423,7 +421,6 @@ private void addToStack(RedisCommand<?, ?, ?> command, ChannelPromise promise) {
             }
         } catch (Exception e) {
             command.completeExceptionally(e);
-            promise.setFailure(e);
             throw e;
         }
     }
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandTest.java b/src/test/java/io/lettuce/core/ConnectionCommandTest.java
index f1169baf0e..5be2157a39 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandTest.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandTest.java
@@ -88,11 +88,14 @@ public void authEmpty() throws Exception {
     public void authReconnect() throws Exception {
         new WithPasswordRequired() {
             @Override
-            public void run(RedisClient client) {
+            public void run(RedisClient client) throws InterruptedException {
+
                 RedisCommands<String, String> connection = client.connect().sync();
                 assertThat(connection.auth(passwd)).isEqualTo("OK");
                 assertThat(connection.set(key, value)).isEqualTo("OK");
                 connection.quit();
+
+                Thread.sleep(100);
                 assertThat(connection.get(key)).isEqualTo(value);
             }
         };
diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
index 2b9f4538c3..dba8272b2b 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
@@ -250,14 +250,28 @@ public void isConnectedShouldReportFalseForCLOSED() throws Exception {
         assertThat(sut.isConnected()).isFalse();
     }
 
+    @Test
+    public void shouldNotWriteCancelledCommand() throws Exception {
+
+        command.cancel();
+        sut.write(context, command, promise);
+
+        verifyZeroInteractions(context);
+        assertThat(stack).isEmpty();
+
+        verify(promise).trySuccess();
+    }
+
     @Test
     public void shouldNotWriteCancelledCommands() throws Exception {
 
         command.cancel();
-        sut.write(context, command, null);
+        sut.write(context, Collections.singleton(command), promise);
 
         verifyZeroInteractions(context);
         assertThat(stack).isEmpty();
+
+        verify(promise).trySuccess();
     }
 
     @Test

From 2e6c233e890e51a5e76efed1d9225b3b60f244a7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 30 Apr 2018 12:08:47 +0200
Subject: [PATCH 448/808] Upgrade to JavaParser 3.6.3 #769

---
 pom.xml                                       |   2 +-
 .../lettuce/core/api/RedisServerCommands.java |   1 +
 .../apigenerator/CompilationUnitFactory.java  | 123 ++++++++++++------
 .../lettuce/apigenerator/CreateAsyncApi.java  |  25 +---
 .../CreateAsyncNodeSelectionClusterApi.java   |  27 +---
 .../apigenerator/CreateReactiveApi.java       |  51 ++++----
 .../lettuce/apigenerator/CreateSyncApi.java   |  15 +--
 .../CreateSyncNodeSelectionClusterApi.java    |  31 ++---
 8 files changed, 132 insertions(+), 143 deletions(-)

diff --git a/pom.xml b/pom.xml
index 783e4d97d9..5b9dc63187 100644
--- a/pom.xml
+++ b/pom.xml
@@ -360,7 +360,7 @@
         <dependency>
             <groupId>com.github.javaparser</groupId>
             <artifactId>javaparser-core</artifactId>
-            <version>2.3.0</version>
+            <version>3.6.3</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
index d530b5603f..6198403110 100644
--- a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
@@ -17,6 +17,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.protocol.CommandType;
diff --git a/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java b/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
index 0838251ac1..22bb6b5eef 100644
--- a/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
+++ b/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
@@ -18,27 +18,25 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
-import com.github.javaparser.ASTHelper;
+import org.springframework.util.StringUtils;
+
 import com.github.javaparser.JavaParser;
-import com.github.javaparser.ast.CompilationUnit;
-import com.github.javaparser.ast.ImportDeclaration;
-import com.github.javaparser.ast.PackageDeclaration;
-import com.github.javaparser.ast.TypeParameter;
+import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.body.MethodDeclaration;
-import com.github.javaparser.ast.body.ModifierSet;
-import com.github.javaparser.ast.body.Parameter;
 import com.github.javaparser.ast.comments.Comment;
 import com.github.javaparser.ast.comments.JavadocComment;
-import com.github.javaparser.ast.expr.NameExpr;
+import com.github.javaparser.ast.expr.Name;
+import com.github.javaparser.ast.expr.SimpleName;
+import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.ast.type.Type;
+import com.github.javaparser.ast.type.TypeParameter;
 import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
 
 /**
@@ -53,7 +51,7 @@ public class CompilationUnitFactory {
     private String targetName;
 
     private Function<String, String> typeDocFunction;
-    private Function<MethodDeclaration, Type> methodReturnTypeFunction;
+    private Map<Predicate<MethodDeclaration>, Function<MethodDeclaration, Type>> methodReturnTypeMutation;
     private Predicate<MethodDeclaration> methodFilter;
     private Supplier<List<String>> importSupplier;
     private Consumer<ClassOrInterfaceDeclaration> typeMutator;
@@ -73,39 +71,44 @@ public CompilationUnitFactory(File templateFile, File sources, String targetPack
         this.targetPackage = targetPackage;
         this.targetName = targetName;
         this.typeDocFunction = typeDocFunction;
-        this.methodReturnTypeFunction = methodReturnTypeFunction;
         this.methodFilter = methodFilter;
         this.importSupplier = importSupplier;
         this.typeMutator = typeMutator;
         this.methodCommentMutator = methodCommentMutator;
+        this.methodReturnTypeMutation = new LinkedHashMap<>();
+
+        this.methodReturnTypeMutation.put(it -> true, methodReturnTypeFunction);
 
         this.target = new File(sources, targetPackage.replace('.', '/') + "/" + targetName + ".java");
     }
 
     public void createInterface() throws Exception {
 
-        result.setPackage(new PackageDeclaration(ASTHelper.createNameExpr(targetPackage)));
+        result.setPackageDeclaration(new PackageDeclaration(new Name(targetPackage)));
 
         template = JavaParser.parse(templateFile);
 
         ClassOrInterfaceDeclaration templateTypeDeclaration = (ClassOrInterfaceDeclaration) template.getTypes().get(0);
-        resultType = new ClassOrInterfaceDeclaration(ModifierSet.PUBLIC, true, targetName);
-        if (templateTypeDeclaration.getExtends() != null) {
-            resultType.setExtends(templateTypeDeclaration.getExtends());
+        resultType = new ClassOrInterfaceDeclaration(EnumSet.of(Modifier.PUBLIC), true, targetName);
+        if (templateTypeDeclaration.getExtendedTypes() != null) {
+            resultType.setExtendedTypes(templateTypeDeclaration.getExtendedTypes());
         }
 
         if (!templateTypeDeclaration.getTypeParameters().isEmpty()) {
-            resultType.setTypeParameters(new ArrayList<>());
+            resultType.setTypeParameters(new NodeList<>());
             for (TypeParameter typeParameter : templateTypeDeclaration.getTypeParameters()) {
-                resultType.getTypeParameters().add(new TypeParameter(typeParameter.getName(), typeParameter.getTypeBound()));
+                resultType.getTypeParameters().add(
+                        new TypeParameter(typeParameter.getName().getIdentifier(), typeParameter.getTypeBound()));
             }
         }
 
-        resultType.setComment(new JavadocComment(typeDocFunction.apply(templateTypeDeclaration.getComment().getContent())));
-        result.setComment(template.getComment());
+        resultType.setComment(new JavadocComment(typeDocFunction.apply(templateTypeDeclaration.getComment().orElse(null)
+                .getContent())));
+        result.setComment(template.getComment().orElse(null));
 
-        result.setImports(new ArrayList<>());
-        ASTHelper.addTypeDeclaration(result, resultType);
+        result.setImports(new NodeList<>());
+
+        result.addType(resultType);
         resultType.setParentNode(result);
 
         if (template.getImports() != null) {
@@ -113,7 +116,7 @@ public void createInterface() throws Exception {
         }
         List<String> importLines = importSupplier.get();
         for (String importLine : importLines) {
-            result.getImports().add(new ImportDeclaration(new NameExpr(importLine), false, false));
+            result.getImports().add(new ImportDeclaration(importLine, false, false));
         }
 
         new MethodVisitor().visit(template, null);
@@ -126,49 +129,89 @@ public void createInterface() throws Exception {
 
     }
 
+    public void keepMethodSignaturesFor(Set<String> methodSignaturesToKeep) {
+
+        this.methodReturnTypeMutation.put(methodDeclaration -> contains(methodSignaturesToKeep, methodDeclaration),
+                MethodDeclaration::getType);
+    }
+
     protected void writeResult() throws IOException {
+
         FileOutputStream fos = new FileOutputStream(target);
         fos.write(result.toString().getBytes());
         fos.close();
     }
 
+    public static Type createParametrizedType(String baseType, String... typeArguments) {
+
+        NodeList<Type> args = new NodeList<>();
+
+        Arrays.stream(typeArguments).map(it -> {
+
+            if (it.contains("[]")) {
+                return it;
+            }
+
+            return StringUtils.capitalize(it);
+        }).map(it -> new ClassOrInterfaceType(null, it)).forEach(args::add);
+
+        return new ClassOrInterfaceType(null, new SimpleName(baseType), args);
+    }
+
+    public static boolean contains(Collection<String> haystack, MethodDeclaration needle) {
+
+        ClassOrInterfaceDeclaration declaringClass = (ClassOrInterfaceDeclaration) needle.getParentNode().get();
+
+        return haystack.contains(needle.getNameAsString())
+                || haystack.contains(declaringClass.getNameAsString() + "." + needle.getNameAsString());
+    }
+
     /**
      * Simple visitor implementation for visiting MethodDeclaration nodes.
      */
     private class MethodVisitor extends VoidVisitorAdapter<Object> {
 
         @Override
-        public void visit(MethodDeclaration n, Object arg) {
+        public void visit(MethodDeclaration parsedDeclaration, Object arg) {
 
-            if (!methodFilter.test(n)) {
+            if (!methodFilter.test(parsedDeclaration)) {
                 return;
             }
 
-            MethodDeclaration method = new MethodDeclaration(n.getModifiers(), methodReturnTypeFunction.apply(n), n.getName());
+            if (parsedDeclaration.getNameAsString().equals("close")) {
+                System.out.println();
+            }
+            Type returnType = getMethodReturnType(parsedDeclaration);
+
+            MethodDeclaration method = new MethodDeclaration(parsedDeclaration.getModifiers(),
+                    parsedDeclaration.getAnnotations(), parsedDeclaration.getTypeParameters(), returnType,
+                    parsedDeclaration.getName(), parsedDeclaration.getParameters(), parsedDeclaration.getThrownExceptions(),
+                    null);
 
             if (methodCommentMutator != null) {
-                method.setComment(methodCommentMutator.apply(n.getComment()));
+                method.setComment(methodCommentMutator.apply(parsedDeclaration.getComment().orElse(null)));
             } else {
-                method.setComment(n.getComment());
+                method.setComment(parsedDeclaration.getComment().orElse(null));
             }
 
-            for (Parameter parameter : n.getParameters()) {
-                Parameter param = ASTHelper.createParameter(parameter.getType(), parameter.getId().getName());
-                param.setVarArgs(parameter.isVarArgs());
+            resultType.addMember(method);
+        }
 
-                ASTHelper.addParameter(method, param);
-            }
+        private Type getMethodReturnType(MethodDeclaration parsedDeclaration) {
 
-            if (n.getTypeParameters() != null) {
-                method.setTypeParameters(new ArrayList<>());
-                method.getTypeParameters().addAll(n.getTypeParameters());
-            }
+            List<Map.Entry<Predicate<MethodDeclaration>, Function<MethodDeclaration, Type>>> entries = new ArrayList<>(
+                    methodReturnTypeMutation.entrySet());
+
+            Collections.reverse(entries);
+
+            for (Map.Entry<Predicate<MethodDeclaration>, Function<MethodDeclaration, Type>> entry : entries) {
 
-            if (n.getAnnotations() != null) {
-                method.setAnnotations(n.getAnnotations());
+                if (entry.getKey().test(parsedDeclaration)) {
+                    return entry.getValue().apply(parsedDeclaration);
+                }
             }
 
-            ASTHelper.addMember(resultType, method);
+            return null;
         }
     }
 }
diff --git a/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
index 87c24ab132..4dbe7ea4b0 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
@@ -27,10 +27,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.body.MethodDeclaration;
-import com.github.javaparser.ast.type.ClassOrInterfaceType;
-import com.github.javaparser.ast.type.ReferenceType;
 import com.github.javaparser.ast.type.Type;
 
 import io.lettuce.core.internal.LettuceSets;
@@ -43,8 +40,9 @@
 @RunWith(Parameterized.class)
 public class CreateAsyncApi {
 
-    private Set<String> KEEP_METHOD_RESULT_TYPE = LettuceSets.unmodifiableSet("shutdown", "debugOom", "debugSegfault", "digest",
-            "close", "isOpen", "BaseRedisCommands.reset", "getStatefulConnection", "setAutoFlushCommands", "flushCommands");
+    private Set<String> KEEP_METHOD_RESULT_TYPE = LettuceSets.unmodifiableSet("shutdown", "debugOom", "debugSegfault",
+            "digest", "close", "isOpen", "BaseRedisCommands.reset", "getStatefulConnection", "setAutoFlushCommands",
+            "flushCommands");
 
     private CompilationUnitFactory factory;
 
@@ -77,6 +75,8 @@ public CreateAsyncApi(String templateName) {
 
         factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(),
                 methodTypeMutator(), methodDeclaration -> true, importSupplier(), null, null);
+
+        factory.keepMethodSignaturesFor(KEEP_METHOD_RESULT_TYPE);
     }
 
     /**
@@ -95,20 +95,7 @@ protected Function<String, String> commentMutator() {
      * @return
      */
     protected Function<MethodDeclaration, Type> methodTypeMutator() {
-        return method -> {
-            ClassOrInterfaceDeclaration classOfMethod = (ClassOrInterfaceDeclaration) method.getParentNode();
-            if (KEEP_METHOD_RESULT_TYPE.contains(method.getName())
-                    || KEEP_METHOD_RESULT_TYPE.contains(classOfMethod.getName() + "." + method.getName())) {
-                return method.getType();
-            }
-
-            String typeAsString = method.getType().toStringWithoutComments().trim();
-            if (typeAsString.equals("void")) {
-                typeAsString = "Void";
-            }
-
-            return new ReferenceType(new ClassOrInterfaceType("RedisFuture<" + typeAsString + ">"));
-        };
+        return method -> CompilationUnitFactory.createParametrizedType("RedisFuture", method.getType().toString());
     }
 
     /**
diff --git a/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
index f0af967b67..f1b4f4d0a1 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
@@ -28,10 +28,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.body.MethodDeclaration;
-import com.github.javaparser.ast.type.ClassOrInterfaceType;
-import com.github.javaparser.ast.type.ReferenceType;
 import com.github.javaparser.ast.type.Type;
 
 import io.lettuce.core.internal.LettuceSets;
@@ -74,6 +71,7 @@ public CreateAsyncNodeSelectionClusterApi(String templateName) {
 
         factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(),
                 methodTypeMutator(), methodFilter(), importSupplier(), null, null);
+        factory.keepMethodSignaturesFor(FILTER_METHODS);
     }
 
     /**
@@ -92,15 +90,7 @@ protected Function<String, String> commentMutator() {
      * @return
      */
     protected Predicate<MethodDeclaration> methodFilter() {
-        return method -> {
-            ClassOrInterfaceDeclaration classOfMethod = (ClassOrInterfaceDeclaration) method.getParentNode();
-            if (FILTER_METHODS.contains(method.getName())
-                    || FILTER_METHODS.contains(classOfMethod.getName() + "." + method.getName())) {
-                return false;
-            }
-
-            return true;
-        };
+        return method -> !CompilationUnitFactory.contains(FILTER_METHODS, method);
     }
 
     /**
@@ -110,18 +100,7 @@ protected Predicate<MethodDeclaration> methodFilter() {
      */
     protected Function<MethodDeclaration, Type> methodTypeMutator() {
         return method -> {
-            ClassOrInterfaceDeclaration classOfMethod = (ClassOrInterfaceDeclaration) method.getParentNode();
-            if (FILTER_METHODS.contains(method.getName())
-                    || FILTER_METHODS.contains(classOfMethod.getName() + "." + method.getName())) {
-                return method.getType();
-            }
-
-            String typeAsString = method.getType().toStringWithoutComments().trim();
-            if (typeAsString.equals("void")) {
-                typeAsString = "Void";
-            }
-
-            return new ReferenceType(new ClassOrInterfaceType("AsyncExecutions<" + typeAsString + ">"));
+            return CompilationUnitFactory.createParametrizedType("AsyncExecutions", method.getType().toString());
         };
     }
 
diff --git a/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
index 3bc6dcfa4b..68e701a12c 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
@@ -27,8 +27,6 @@
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.body.MethodDeclaration;
 import com.github.javaparser.ast.comments.Comment;
-import com.github.javaparser.ast.type.ClassOrInterfaceType;
-import com.github.javaparser.ast.type.ReferenceType;
 import com.github.javaparser.ast.type.Type;
 
 import io.lettuce.core.internal.LettuceSets;
@@ -45,6 +43,9 @@ public class CreateReactiveApi {
             "BaseRedisCommands.reset", "getStatefulConnection", "setAutoFlushCommands", "flushCommands");
 
     private static Set<String> FORCE_FLUX_RESULT = LettuceSets.unmodifiableSet("eval", "evalsha", "dispatch");
+
+    private static Set<String> VALUE_WRAP = LettuceSets.unmodifiableSet("geopos", "bitfield");
+
     private static final Map<String, String> RESULT_SPEC;
 
     static {
@@ -87,6 +88,7 @@ public CreateReactiveApi(String templateName) {
 
         factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(),
                 methodTypeMutator(), methodDeclaration -> true, importSupplier(), null, methodCommentMutator());
+        factory.keepMethodSignaturesFor(KEEP_METHOD_RESULT_TYPE);
     }
 
     /**
@@ -117,38 +119,33 @@ protected Function<Comment, Comment> methodCommentMutator() {
     protected Function<MethodDeclaration, Type> methodTypeMutator() {
         return method -> {
 
-            ClassOrInterfaceDeclaration classOfMethod = (ClassOrInterfaceDeclaration) method.getParentNode();
-            if (methodMatch(KEEP_METHOD_RESULT_TYPE, method, classOfMethod)) {
-                return method.getType();
-            }
-
-            if (method.getName().equals("sort")) {
-                System.out.println();
+            ClassOrInterfaceDeclaration declaringClass = (ClassOrInterfaceDeclaration) method.getParentNode().get();
+
+            String baseType = "Mono";
+            String typeArgument = method.getType().toString().trim();
+
+            if (getResultType(method, declaringClass) != null) {
+                typeArgument = getResultType(method, declaringClass);
+            } else if (CompilationUnitFactory.contains(FORCE_FLUX_RESULT, method)) {
+                baseType = "Flux";
+            } else if (typeArgument.startsWith("List<")) {
+                baseType = "Flux";
+                typeArgument = typeArgument.substring(5, typeArgument.length() - 1);
+            } else if (typeArgument.startsWith("Set<")) {
+                baseType = "Flux";
+                typeArgument = typeArgument.substring(4, typeArgument.length() - 1);
+            } else {
+                baseType = "Mono";
             }
 
-            String typeAsString = method.getType().toStringWithoutComments().trim();
-            if(getResultType(method, classOfMethod) != null){
-                typeAsString = getResultType(method, classOfMethod);
-            }else if (methodMatch(FORCE_FLUX_RESULT, method, classOfMethod)) {
-                typeAsString = "Flux<" + typeAsString + ">";
-            } else if (typeAsString.equals("void")) {
-                typeAsString = "Mono<Void>";
-            } else if (typeAsString.startsWith("List<")) {
-                typeAsString = "Flux<" + typeAsString.substring(5, typeAsString.length() - 1) + ">";
-            } else if (typeAsString.startsWith("Set<")) {
-                typeAsString = "Flux<" + typeAsString.substring(4, typeAsString.length() - 1) + ">";
-            } else {
-                typeAsString = "Mono<" + typeAsString + ">";
+            if (CompilationUnitFactory.contains(VALUE_WRAP, method)) {
+                typeArgument = String.format("Value<%s>", typeArgument);
             }
 
-            return new ReferenceType(new ClassOrInterfaceType(typeAsString));
+            return CompilationUnitFactory.createParametrizedType(baseType, typeArgument);
         };
     }
 
-    private boolean methodMatch(Collection<String> methodNames, MethodDeclaration method,
-            ClassOrInterfaceDeclaration classOfMethod) {
-        return methodNames.contains(method.getName()) || methodNames.contains(classOfMethod.getName() + "." + method.getName());
-    }
 
 
     private String getResultType(MethodDeclaration method,
diff --git a/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
index 0795f9b4a5..a17ed73075 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
@@ -28,7 +28,6 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.body.MethodDeclaration;
 import com.github.javaparser.ast.type.Type;
 
@@ -93,15 +92,7 @@ protected Function<String, String> commentMutator() {
      * @return
      */
     protected Predicate<MethodDeclaration> methodFilter() {
-        return method -> {
-            ClassOrInterfaceDeclaration classOfMethod = (ClassOrInterfaceDeclaration) method.getParentNode();
-            if (FILTER_METHODS.contains(method.getName())
-                    || FILTER_METHODS.contains(classOfMethod.getName() + "." + method.getName())) {
-                return false;
-            }
-
-            return true;
-        };
+        return method -> !CompilationUnitFactory.contains(FILTER_METHODS, method);
     }
 
     /**
@@ -110,7 +101,7 @@ protected Predicate<MethodDeclaration> methodFilter() {
      * @return
      */
     protected Function<MethodDeclaration, Type> methodTypeMutator() {
-        return methodDeclaration -> methodDeclaration.getType();
+        return MethodDeclaration::getType;
     }
 
     /**
@@ -119,7 +110,7 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
      * @return
      */
     protected Supplier<List<String>> importSupplier() {
-        return () -> Collections.emptyList();
+        return Collections::emptyList;
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
index 40b4b36f4d..59e05ed1fc 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
@@ -30,8 +30,6 @@
 
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.body.MethodDeclaration;
-import com.github.javaparser.ast.type.ClassOrInterfaceType;
-import com.github.javaparser.ast.type.ReferenceType;
 import com.github.javaparser.ast.type.Type;
 
 import io.lettuce.core.internal.LettuceSets;
@@ -44,8 +42,8 @@
 @RunWith(Parameterized.class)
 public class CreateSyncNodeSelectionClusterApi {
 
-    private Set<String> FILTER_METHODS = LettuceSets.unmodifiableSet("shutdown", "debugOom", "debugSegfault", "digest", "close",
-            "isOpen", "BaseRedisCommands.reset", "readOnly", "readWrite", "dispatch", "setAutoFlushCommands", "flushCommands");
+    private Set<String> FILTER_METHODS = LettuceSets.unmodifiableSet("shutdown", "debugOom", "debugSegfault", "digest",
+            "close", "isOpen", "BaseRedisCommands.reset", "readOnly", "readWrite", "dispatch", "setAutoFlushCommands", "flushCommands");
 
     private CompilationUnitFactory factory;
 
@@ -75,6 +73,7 @@ public CreateSyncNodeSelectionClusterApi(String templateName) {
         // todo: remove AutoCloseable from BaseNodeSelectionAsyncCommands
         factory = new CompilationUnitFactory(templateFile, Constants.SOURCES, targetPackage, targetName, commentMutator(),
                 methodTypeMutator(), methodFilter(), importSupplier(), null, null);
+        factory.keepMethodSignaturesFor(FILTER_METHODS);
     }
 
     /**
@@ -93,10 +92,12 @@ protected Function<String, String> commentMutator() {
      * @return
      */
     protected Predicate<MethodDeclaration> methodFilter() {
+
         return method -> {
-            ClassOrInterfaceDeclaration classOfMethod = (ClassOrInterfaceDeclaration) method.getParentNode();
-            if (FILTER_METHODS.contains(method.getName())
-                    || FILTER_METHODS.contains(classOfMethod.getName() + "." + method.getName())) {
+
+            ClassOrInterfaceDeclaration classOfMethod = (ClassOrInterfaceDeclaration) method.getParentNode().orElse(null);
+            if (FILTER_METHODS.contains(method.getName().getIdentifier())
+                    || FILTER_METHODS.contains(classOfMethod.getName().getIdentifier() + "." + method.getName())) {
                 return false;
             }
 
@@ -110,19 +111,9 @@ protected Predicate<MethodDeclaration> methodFilter() {
      * @return
      */
     protected Function<MethodDeclaration, Type> methodTypeMutator() {
-        return method -> {
-            ClassOrInterfaceDeclaration classOfMethod = (ClassOrInterfaceDeclaration) method.getParentNode();
-            if (FILTER_METHODS.contains(method.getName())
-                    || FILTER_METHODS.contains(classOfMethod.getName() + "." + method.getName())) {
-                return method.getType();
-            }
 
-            String typeAsString = method.getType().toStringWithoutComments().trim();
-            if (typeAsString.equals("void")) {
-                typeAsString = "Void";
-            }
-
-            return new ReferenceType(new ClassOrInterfaceType("Executions<" + typeAsString + ">"));
+        return method -> {
+            return CompilationUnitFactory.createParametrizedType("Executions", method.getType().toString());
         };
     }
 
@@ -132,7 +123,7 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
      * @return
      */
     protected Supplier<List<String>> importSupplier() {
-        return () -> Collections.emptyList();
+        return Collections::emptyList;
     }
 
     @Test

From e742c33af67a14c084c9fadd51d2d76579f5f226 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 30 Apr 2018 14:53:58 +0200
Subject: [PATCH 449/808] Polishing #769

Re-generate API with updated JavaParser.
---
 .../io/lettuce/core/api/async/BaseRedisAsyncCommands.java     | 4 +---
 .../java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java | 4 +---
 .../java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java | 2 +-
 .../io/lettuce/core/api/async/RedisHashAsyncCommands.java     | 2 +-
 .../java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java | 2 +-
 .../io/lettuce/core/api/async/RedisListAsyncCommands.java     | 2 +-
 .../lettuce/core/api/async/RedisScriptingAsyncCommands.java   | 2 +-
 .../io/lettuce/core/api/async/RedisServerAsyncCommands.java   | 2 +-
 .../java/io/lettuce/core/api/async/RedisSetAsyncCommands.java | 2 +-
 .../lettuce/core/api/async/RedisSortedSetAsyncCommands.java   | 2 +-
 .../core/api/async/RedisTransactionalAsyncCommands.java       | 2 +-
 .../lettuce/core/api/reactive/BaseRedisReactiveCommands.java  | 4 +---
 .../lettuce/core/api/reactive/RedisGeoReactiveCommands.java   | 4 +---
 .../lettuce/core/api/reactive/RedisHLLReactiveCommands.java   | 2 +-
 .../lettuce/core/api/reactive/RedisHashReactiveCommands.java  | 2 +-
 .../lettuce/core/api/reactive/RedisKeyReactiveCommands.java   | 2 +-
 .../lettuce/core/api/reactive/RedisListReactiveCommands.java  | 2 +-
 .../core/api/reactive/RedisScriptingReactiveCommands.java     | 2 +-
 .../core/api/reactive/RedisServerReactiveCommands.java        | 4 ++--
 .../lettuce/core/api/reactive/RedisSetReactiveCommands.java   | 2 +-
 .../core/api/reactive/RedisSortedSetReactiveCommands.java     | 2 +-
 .../core/api/reactive/RedisTransactionalReactiveCommands.java | 2 +-
 src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java | 4 +---
 src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java  | 4 +---
 src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java  | 2 +-
 src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java | 2 +-
 src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java  | 2 +-
 src/main/java/io/lettuce/core/api/sync/RedisListCommands.java | 2 +-
 .../java/io/lettuce/core/api/sync/RedisScriptingCommands.java | 2 +-
 .../java/io/lettuce/core/api/sync/RedisServerCommands.java    | 4 ++--
 src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java  | 2 +-
 .../java/io/lettuce/core/api/sync/RedisSortedSetCommands.java | 2 +-
 .../io/lettuce/core/api/sync/RedisTransactionalCommands.java  | 2 +-
 .../cluster/api/async/BaseNodeSelectionAsyncCommands.java     | 3 +--
 .../core/cluster/api/async/NodeSelectionGeoAsyncCommands.java | 4 +---
 .../core/cluster/api/async/NodeSelectionHLLAsyncCommands.java | 2 +-
 .../cluster/api/async/NodeSelectionHashAsyncCommands.java     | 2 +-
 .../core/cluster/api/async/NodeSelectionKeyAsyncCommands.java | 2 +-
 .../cluster/api/async/NodeSelectionListAsyncCommands.java     | 2 +-
 .../api/async/NodeSelectionScriptingAsyncCommands.java        | 2 +-
 .../cluster/api/async/NodeSelectionServerAsyncCommands.java   | 4 ++--
 .../core/cluster/api/async/NodeSelectionSetAsyncCommands.java | 2 +-
 .../api/async/NodeSelectionSortedSetAsyncCommands.java        | 2 +-
 .../core/cluster/api/sync/BaseNodeSelectionCommands.java      | 3 +--
 .../core/cluster/api/sync/NodeSelectionGeoCommands.java       | 4 +---
 .../core/cluster/api/sync/NodeSelectionHLLCommands.java       | 2 +-
 .../core/cluster/api/sync/NodeSelectionHashCommands.java      | 2 +-
 .../core/cluster/api/sync/NodeSelectionKeyCommands.java       | 2 +-
 .../core/cluster/api/sync/NodeSelectionListCommands.java      | 2 +-
 .../core/cluster/api/sync/NodeSelectionScriptingCommands.java | 2 +-
 .../core/cluster/api/sync/NodeSelectionServerCommands.java    | 4 ++--
 .../core/cluster/api/sync/NodeSelectionSetCommands.java       | 2 +-
 .../core/cluster/api/sync/NodeSelectionSortedSetCommands.java | 2 +-
 .../core/sentinel/api/async/RedisSentinelAsyncCommands.java   | 4 +---
 .../sentinel/api/reactive/RedisSentinelReactiveCommands.java  | 4 +---
 .../lettuce/core/sentinel/api/sync/RedisSentinelCommands.java | 4 +---
 56 files changed, 60 insertions(+), 84 deletions(-)

diff --git a/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
index 8ca24fd7fc..bd98c5184b 100644
--- a/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
- *
  * Asynchronous executed commands for basic commands.
  *
  * @param <K> Key type.
@@ -149,7 +148,6 @@ public interface BaseRedisAsyncCommands<K, V> {
     <T> RedisFuture<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args);
 
     /**
-     *
      * @return true if the connection is open (connected and not closed).
      */
     boolean isOpen();
diff --git a/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java
index 38b4a549f9..5e7f2d1967 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,7 +110,6 @@ public interface RedisGeoAsyncCommands<K, V> {
     RedisFuture<Set<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit);
 
     /**
-     *
      * Retrieve members selected by distance with the center of {@code member}. The member itself is always contained in the
      * results.
      *
@@ -148,7 +147,6 @@ public interface RedisGeoAsyncCommands<K, V> {
     RedisFuture<List<GeoCoordinates>> geopos(K key, V... members);
 
     /**
-     *
      * Retrieve distance between points {@code from} and {@code to}. If one or more elements are missing {@literal null} is
      * returned. Default in meters by, otherwise according to {@code unit}
      *
diff --git a/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java
index ce169a70d8..a03270d62d 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
index 9bfeb1b9a8..485cb714d5 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
index 48f9039837..901c760a85 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java
index 5076875ed8..895cb5009f 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
index 104df08bb5..f6919105ce 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
index ac3d652c53..8afd84c525 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java
index 420dd243f3..f4c617d74e 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
index a78de9e07c..1226c1def8 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
index 7ee83cafe5..d174f360f9 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
index 87f5f5a1ff..95b3378d1a 100644
--- a/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
- *
  * Reactive executed commands for basic commands.
  *
  * @param <K> Key type.
@@ -149,7 +148,6 @@ public interface BaseRedisReactiveCommands<K, V> {
     <T> Flux<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output, CommandArgs<K, V> args);
 
     /**
-     *
      * @return true if the connection is open (connected and not closed).
      */
     boolean isOpen();
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java
index c9715731dc..8a2ba5ba26 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -109,7 +109,6 @@ public interface RedisGeoReactiveCommands<K, V> {
     Flux<V> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit);
 
     /**
-     *
      * Retrieve members selected by distance with the center of {@code member}. The member itself is always contained in the
      * results.
      *
@@ -147,7 +146,6 @@ public interface RedisGeoReactiveCommands<K, V> {
     Flux<Value<GeoCoordinates>> geopos(K key, V... members);
 
     /**
-     *
      * Retrieve distance between points {@code from} and {@code to}. If one or more elements are missing {@literal null} is
      * returned. Default in meters by, otherwise according to {@code unit}
      *
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java
index f36fd22fe0..1315e62da7 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
index 40818b147f..47a287eefd 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
index 01c3f4cd34..2279845f04 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java
index c0fbe60118..5264c1b5b2 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
index 22b4b2b537..dbd6b61f62 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
index a25c3725d4..14a3cfefd9 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -129,7 +129,7 @@ public interface RedisServerReactiveCommands<K, V> {
      * Get the value of a configuration parameter.
      *
      * @param parameter name of the parameter
-     * @return Map bulk-string-reply
+     * @return Map&lt;String, String&gt; bulk-string-reply
      */
     Mono<Map<String, String>> configGet(String parameter);
 
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java
index 83a15f2af8..397cbeaa40 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
index 70fbb284d4..38acbc1bc7 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
index 0e593433a8..12ab08c1e6 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java b/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
index a4eb6a9825..a1880abc07 100644
--- a/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
- *
  * Synchronous executed commands for basic commands.
  *
  * @param <K> Key type.
@@ -148,7 +147,6 @@ public interface BaseRedisCommands<K, V> {
     <T> T dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args);
 
     /**
-     *
      * @return true if the connection is open (connected and not closed).
      */
     boolean isOpen();
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java
index b0fb253809..a257b4d33a 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,7 +110,6 @@ public interface RedisGeoCommands<K, V> {
     Set<V> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit);
 
     /**
-     *
      * Retrieve members selected by distance with the center of {@code member}. The member itself is always contained in the
      * results.
      *
@@ -148,7 +147,6 @@ public interface RedisGeoCommands<K, V> {
     List<GeoCoordinates> geopos(K key, V... members);
 
     /**
-     *
      * Retrieve distance between points {@code from} and {@code to}. If one or more elements are missing {@literal null} is
      * returned. Default in meters by, otherwise according to {@code unit}
      *
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java
index 89d68d58c2..54b5176d99 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
index f686c855cb..61e696ca5c 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
index f8935a155a..e84b06f1f0 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java
index 2d39ae8bc4..f0008a8cb4 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
index c208a391c6..ca67950999 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
index 65fd1e21a2..fc06339a97 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -128,7 +128,7 @@ public interface RedisServerCommands<K, V> {
      * Get the value of a configuration parameter.
      *
      * @param parameter name of the parameter
-     * @return Map&lt;String,String&gt; bulk-string-reply
+     * @return Map&lt;String, String&gt; bulk-string-reply
      */
     Map<String, String> configGet(String parameter);
 
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java
index a51dfb34a6..bf570ebf0a 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
index 87085508c8..c35fd49fa5 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
index 2bbec9653a..6afc54ea4a 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
index 5f0e2002cd..486bc7999d 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
- *
  * Asynchronous executed commands on a node selection for basic commands.
  *
  * @param <K> Key type.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java
index 8dc6dea3f8..3d90816637 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,7 +110,6 @@ public interface NodeSelectionGeoAsyncCommands<K, V> {
     AsyncExecutions<Set<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit);
 
     /**
-     *
      * Retrieve members selected by distance with the center of {@code member}. The member itself is always contained in the
      * results.
      *
@@ -148,7 +147,6 @@ public interface NodeSelectionGeoAsyncCommands<K, V> {
     AsyncExecutions<List<GeoCoordinates>> geopos(K key, V... members);
 
     /**
-     *
      * Retrieve distance between points {@code from} and {@code to}. If one or more elements are missing {@literal null} is
      * returned. Default in meters by, otherwise according to {@code unit}
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java
index d38e75673a..a2e80654eb 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
index 59d49c80a0..2d7f903c3c 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
index d72687626d..b8492a1209 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java
index 388649bcdd..53b7bd38b8 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
index 4d82060d17..5a389c548b 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
index 334c0d48ba..8128eda553 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -128,7 +128,7 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
      * Get the value of a configuration parameter.
      *
      * @param parameter name of the parameter
-     * @return Map&lt;String,String&gt; bulk-string-reply
+     * @return Map&lt;String, String&gt; bulk-string-reply
      */
     AsyncExecutions<Map<String, String>> configGet(String parameter);
 
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java
index b55d997f25..4ef84eb88a 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
index 9ae7d08b46..00c9e0ea37 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
index cce156cea5..ad9a20cd77 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.util.Map;
 
 /**
- *
  * Synchronous executed commands on a node selection for basic commands.
  *
  * @param <K> Key type.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java
index ca6e494cb0..bf9aba8af9 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,7 +110,6 @@ public interface NodeSelectionGeoCommands<K, V> {
     Executions<Set<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit);
 
     /**
-     *
      * Retrieve members selected by distance with the center of {@code member}. The member itself is always contained in the
      * results.
      *
@@ -148,7 +147,6 @@ public interface NodeSelectionGeoCommands<K, V> {
     Executions<List<GeoCoordinates>> geopos(K key, V... members);
 
     /**
-     *
      * Retrieve distance between points {@code from} and {@code to}. If one or more elements are missing {@literal null} is
      * returned. Default in meters by, otherwise according to {@code unit}
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java
index 088b164d55..ee5f9783b1 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
index ca19f8e014..6283b302b0 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
index 4367fcb0e1..37fbbbe7ea 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java
index 9b1ab466ca..4ac50532f0 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
index ee724985d3..d8bd4134b1 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
index 7f3cc699d6..3f92738af0 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -128,7 +128,7 @@ public interface NodeSelectionServerCommands<K, V> {
      * Get the value of a configuration parameter.
      *
      * @param parameter name of the parameter
-     * @return Map&lt;String,String&gt; bulk-string-reply
+     * @return Map&lt;String, String&gt; bulk-string-reply
      */
     Executions<Map<String, String>> configGet(String parameter);
 
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java
index 353c55c87b..10be1f3ee5 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
index 14f0ee8f4d..961fad7e70 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java b/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
index 022274be77..33471efde5 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -181,13 +181,11 @@ public interface RedisSentinelAsyncCommands<K, V> {
     RedisFuture<String> ping();
 
     /**
-     *
      * @return true if the connection is open (connected and not closed).
      */
     boolean isOpen();
 
     /**
-     *
      * @return the underlying connection.
      */
     StatefulRedisSentinelConnection<K, V> getStatefulConnection();
diff --git a/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java b/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
index 671d3a7b5e..7466653e44 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -181,13 +181,11 @@ public interface RedisSentinelReactiveCommands<K, V> {
     Mono<String> ping();
 
     /**
-     *
      * @return true if the connection is open (connected and not closed).
      */
     boolean isOpen();
 
     /**
-     *
      * @return the underlying connection.
      */
     StatefulRedisSentinelConnection<K, V> getStatefulConnection();
diff --git a/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java b/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
index 8b124e8e87..e477c507fa 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -180,13 +180,11 @@ public interface RedisSentinelCommands<K, V> {
     String ping();
 
     /**
-     *
      * @return true if the connection is open (connected and not closed).
      */
     boolean isOpen();
 
     /**
-     *
      * @return the underlying connection.
      */
     StatefulRedisSentinelConnection<K, V> getStatefulConnection();

From 89cebc20616642fcc23b7a2378d81bb01fd6c57d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 8 May 2018 08:12:09 +0200
Subject: [PATCH 450/808] Upgrade to netty 4.1.24.Final #770

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5b9dc63187..a29525bba1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
-        <netty-version>4.1.23.Final</netty-version>
+        <netty-version>4.1.24.Final</netty-version>
         <spring-version>4.3.14.RELEASE</spring-version>
         <reactor-version>Bismuth-SR8</reactor-version>
     </properties>

From 0f9830aaf130f0af88744d00cfd3a376eb5ca31b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 8 May 2018 08:13:24 +0200
Subject: [PATCH 451/808] Upgrade to RxJava 2.1.13 #771

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a29525bba1..8989847c7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,7 +193,7 @@
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
-            <version>2.1.9</version>
+            <version>2.1.13</version>
             <optional>true</optional>
         </dependency>
 

From 9596ec24d7800f4c83b91e0e5ca21bab6635c4e2 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 19 Apr 2018 13:38:41 +0200
Subject: [PATCH 452/808] Build against Redis unstable #606

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c7cc41aa3d..27a11d4061 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ BREW_BIN := $(shell which brew)
 YUM_BIN := $(shell which yum)
 APT_BIN := $(shell which apt-get)
 PROFILE ?= ci
-REDIS ?= 4.0.2
+REDIS ?= unstable
 
 define REDIS_CLUSTER_CONFIG1
 c2043458aa5646cee429fdd5e3c18220dddf2ce5 127.0.0.1:7380 master - 1434887920102 1434887920002 0 connected 12000-16383

From 079eefd9acce4dae5968e7217dd8d7605e883406 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 30 Oct 2017 23:38:57 +0100
Subject: [PATCH 453/808] Add XADD, XLEN, XREAD, XRANGE, and XREVRANGE support
 #606

---
 .../java/com/lambdaworks/redis/Consumer.java  |  47 ++++
 .../com/lambdaworks/redis/PendingEntry.java   |  57 ++++
 .../lambdaworks/redis/PendingMessages.java    |  30 +++
 .../com/lambdaworks/redis/XClaimArgs.java     | 130 ++++++++++
 .../api/async/RedisStreamAsyncCommands.java   | 244 +++++++++++++++++
 .../api/rx/RedisStreamReactiveCommands.java   | 244 +++++++++++++++++
 .../redis/api/sync/RedisStreamCommands.java   | 244 +++++++++++++++++
 .../NodeSelectionStreamAsyncCommands.java     | 245 ++++++++++++++++++
 .../api/sync/NodeSelectionStreamCommands.java | 244 +++++++++++++++++
 .../redis/output/PendingEntryListOutput.java  |  98 +++++++
 .../core/AbstractRedisAsyncCommands.java      | 106 ++++++++
 src/main/java/io/lettuce/core/Limit.java      |  15 +-
 .../io/lettuce/core/RedisCommandBuilder.java  | 210 +++++++++++++--
 .../java/io/lettuce/core/StreamMessage.java   |  62 +++++
 src/main/java/io/lettuce/core/XAddArgs.java   |  81 ++++++
 src/main/java/io/lettuce/core/XReadArgs.java  | 158 +++++++++++
 .../RedisClusterReactiveCommands.java         |   3 +-
 .../core/output/StreamRangeOutput.java        | 102 ++++++++
 .../lettuce/core/output/StreamReadOutput.java | 108 ++++++++
 .../lettuce/core/protocol/CommandKeyword.java |  16 +-
 .../io/lettuce/core/protocol/CommandType.java |  10 +-
 .../redis/api/RedisStreamCommands.java        | 244 +++++++++++++++++
 .../redis/commands/StreamCommandTest.java     | 239 +++++++++++++++++
 23 files changed, 2912 insertions(+), 25 deletions(-)
 create mode 100644 src/main/java/com/lambdaworks/redis/Consumer.java
 create mode 100644 src/main/java/com/lambdaworks/redis/PendingEntry.java
 create mode 100644 src/main/java/com/lambdaworks/redis/PendingMessages.java
 create mode 100644 src/main/java/com/lambdaworks/redis/XClaimArgs.java
 create mode 100644 src/main/java/com/lambdaworks/redis/api/async/RedisStreamAsyncCommands.java
 create mode 100644 src/main/java/com/lambdaworks/redis/api/rx/RedisStreamReactiveCommands.java
 create mode 100644 src/main/java/com/lambdaworks/redis/api/sync/RedisStreamCommands.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStreamAsyncCommands.java
 create mode 100644 src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStreamCommands.java
 create mode 100644 src/main/java/com/lambdaworks/redis/output/PendingEntryListOutput.java
 create mode 100644 src/main/java/io/lettuce/core/StreamMessage.java
 create mode 100644 src/main/java/io/lettuce/core/XAddArgs.java
 create mode 100644 src/main/java/io/lettuce/core/XReadArgs.java
 create mode 100644 src/main/java/io/lettuce/core/output/StreamRangeOutput.java
 create mode 100644 src/main/java/io/lettuce/core/output/StreamReadOutput.java
 create mode 100644 src/main/templates/com/lambdaworks/redis/api/RedisStreamCommands.java
 create mode 100644 src/test/java/com/lambdaworks/redis/commands/StreamCommandTest.java

diff --git a/src/main/java/com/lambdaworks/redis/Consumer.java b/src/main/java/com/lambdaworks/redis/Consumer.java
new file mode 100644
index 0000000000..af5575fab2
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/Consumer.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Value object representing a Stream consumer within a group.
+ */
+public class Consumer {
+
+    final String group;
+    final String name;
+
+    public Consumer(String group, String name) {
+        this.group = group;
+        this.name = name;
+    }
+
+    /**
+     * Create a new consumer.
+     *
+     * @param group name of the consumer group, must not be {@literal null} or empty.
+     * @param name name of the consumer, must not be {@literal null} or empty.
+     * @return the consumer {@link Consumer} object.
+     */
+    public static Consumer from(String group, String name) {
+
+        LettuceAssert.notEmpty(group, "Group must not be empty");
+        LettuceAssert.notEmpty(name, "Name must not be empty");
+
+        return new Consumer(group, name);
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/PendingEntry.java b/src/main/java/com/lambdaworks/redis/PendingEntry.java
new file mode 100644
index 0000000000..597684c4ba
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/PendingEntry.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis;
+
+/**
+ * @author Mark Paluch
+ */
+public class PendingEntry {
+
+    private String messageId;
+    private String consumer;
+    private long millisSinceDelivery;
+    private long deliveryCount;
+
+    public PendingEntry(String messageId, String consumer, long millisSinceDelivery, long deliveryCount) {
+        this.messageId = messageId;
+        this.consumer = consumer;
+        this.millisSinceDelivery = millisSinceDelivery;
+        this.deliveryCount = deliveryCount;
+    }
+
+    public String getMessageId() {
+        return messageId;
+    }
+
+    public String getConsumer() {
+        return consumer;
+    }
+
+    public long getMillisSinceDelivery() {
+        return millisSinceDelivery;
+    }
+
+    public long getDeliveryCount() {
+        return deliveryCount;
+    }
+
+    @Override
+    public String toString() {
+
+        return String.format("%s [messageId='%s', consumer='%s', millisSinceDelivery=%d, deliveryCount=%d]", getClass()
+                .getSimpleName(), messageId, consumer, millisSinceDelivery, deliveryCount);
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/PendingMessages.java b/src/main/java/com/lambdaworks/redis/PendingMessages.java
new file mode 100644
index 0000000000..368a4def3d
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/PendingMessages.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis;
+
+/**
+ * @author Mark Paluch
+ */
+public class PendingMessages {
+
+    private String consumer;
+    private long count;
+
+    public PendingMessages(String consumer, long count) {
+        this.consumer = consumer;
+        this.count = count;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/XClaimArgs.java b/src/main/java/com/lambdaworks/redis/XClaimArgs.java
new file mode 100644
index 0000000000..d57035b58d
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/XClaimArgs.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis;
+
+import com.lambdaworks.redis.protocol.CommandArgs;
+import com.lambdaworks.redis.protocol.CommandKeyword;
+import com.lambdaworks.redis.protocol.CommandType;
+
+/**
+ * Args for the {@literal XCLAIM} command.
+ *
+ * @author Mark Paluch
+ * @since 4.5
+ */
+public class XClaimArgs {
+
+    long minIdleTime;
+    private Long idle;
+    private Long time;
+    private Long retrycount;
+    private boolean force;
+
+    public static class Builder {
+
+        /**
+         * Utility constructor.
+         */
+        private Builder() {
+
+        }
+
+        public static XClaimArgs minIdleTime(long milliseconds) {
+            return new XClaimArgs().minIdleTime(milliseconds);
+        }
+    }
+
+    /**
+     * Return only messages that are idle for at least {@code milliseconds}.
+     *
+     * @param milliseconds min idle time.
+     * @return {@code this}.
+     */
+    public XClaimArgs minIdleTime(long milliseconds) {
+        this.minIdleTime = milliseconds;
+        return this;
+    }
+
+    /**
+     * Set the idle time (last time it was delivered) of the message. If IDLE is not specified, an IDLE of 0 is assumed, that
+     * is, the time count is reset because the message has now a new owner trying to process it
+     *
+     * @param milliseconds idle time.
+     * @return {@code this}.
+     */
+    public XClaimArgs idle(long milliseconds) {
+        this.idle = milliseconds;
+        return this;
+    }
+
+    /**
+     * This is the same as IDLE but instead of a relative amount of milliseconds, it sets the idle time to a specific unix time
+     * (in milliseconds). This is useful in order to rewrite the AOF file generating XCLAIM commands.
+     *
+     * @param millisecondsUnixTime idle time.
+     * @return {@code this}.
+     */
+    public XClaimArgs time(long millisecondsUnixTime) {
+        this.time = millisecondsUnixTime;
+        return this;
+    }
+
+    /**
+     * Set the retry counter to the specified value. This counter is incremented every time a message is delivered again.
+     * Normally XCLAIM does not alter this counter, which is just served to clients when the XPENDING command is called: this
+     * way clients can detect anomalies, like messages that are never processed for some reason after a big number of delivery
+     * attempts.
+     *
+     * @param retrycount number of retries.
+     * @return {@code this}.
+     */
+    public XClaimArgs retryCount(long retrycount) {
+        this.retrycount = retrycount;
+        return this;
+    }
+
+    /**
+     * Creates the pending message entry in the PEL even if certain specified IDs are not already in the PEL assigned to a
+     * different client. However the message must be exist in the stream, otherwise the IDs of non existing messages are
+     * ignored.
+     *
+     * @param force {@literal true} to enforce PEL creation.
+     * @return {@code this}.
+     */
+    public XClaimArgs force(boolean force) {
+        this.force = force;
+        return this;
+    }
+
+    public <K, V> void build(CommandArgs<K, V> args) {
+
+        if (idle != null) {
+            args.add(CommandKeyword.IDLE).add(idle);
+        }
+
+        if (time != null) {
+            args.add(CommandType.TIME).add(time);
+        }
+
+        if (retrycount != null) {
+            args.add(CommandKeyword.RETRYCOUNT).add(retrycount);
+        }
+
+        if (force) {
+            args.add(CommandKeyword.FORCE);
+        }
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisStreamAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisStreamAsyncCommands.java
new file mode 100644
index 0000000000..d3ad7b3c53
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisStreamAsyncCommands.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.api.async;
+
+import java.util.List;
+import java.util.Map;
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.Consumer;
+import com.lambdaworks.redis.RedisFuture;
+
+/**
+ * Asynchronous executed commands for Streams.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 4.5
+ * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
+ */
+public interface RedisStreamAsyncCommands<K, V> {
+
+    /**
+     * Acknowledge one or more messages as processed.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param messageIds message Ids to acknowledge.
+     * @return simple-reply the lenght of acknowledged messages.
+     */
+    RedisFuture<Long> xack(K key, String group, String... messageIds);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param body message body.
+     * @return simple-reply the message Id.
+     */
+    RedisFuture<String> xadd(K key, Map<K, V> body);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param args
+     * @param body message body.
+     * @return simple-reply the message Id.
+     */
+    RedisFuture<String> xadd(K key, XAddArgs args, Map<K, V> body);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param keysAndValues message body.
+     * @return simple-reply the message Id.
+     */
+    RedisFuture<String> xadd(K key, Object... keysAndValues);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param args
+     * @param keysAndValues message body.
+     * @return simple-reply the message Id.
+     */
+    RedisFuture<String> xadd(K key, XAddArgs args, Object... keysAndValues);
+
+    /**
+     * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @param messageIds message Ids to claim.
+     * @param args
+     * @return simple-reply the {@link StreamMessage}
+     */
+    RedisFuture<StreamMessage<K, V>> xclaim(K key, Consumer consumer, XClaimArgs args, String... messageIds);
+
+    /**
+     * Create a consumer group.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param offset read offset or {@literal $}.
+     * @return simple-reply {@literal true} if successful.
+     */
+    RedisFuture<String> xgroupCreate(K key, String group, String offset);
+
+    /**
+     * Delete a consumer from a consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @return simple-reply the number of pending messages
+     */
+    RedisFuture<String> xgroupDelconsumer(K key, Consumer consumer);
+
+    /**
+     * Set the current {@code group} id.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param offset read offset or {@literal $}.
+     * @return simple-reply the lenght of the stream.
+     */
+    RedisFuture<String> xgroupSetid(K key, String group, String offset);
+
+    /**
+     * Get the length of a steam.
+     *
+     * @param key the stream key.
+     * @return simple-reply the lenght of the stream.
+     */
+    RedisFuture<Long> xlen(K key);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    RedisFuture<List<StreamMessage<K, V>>> xpending(K key, String group);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    RedisFuture<List<StreamMessage<K, V>>> xpending(K key, Consumer consumer);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    RedisFuture<List<PendingEntry>> xpending(K key, String group, Range<String> range, Limit limit);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    RedisFuture<List<StreamMessage<K, V>>> xpending(K key, Consumer consumer, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    RedisFuture<List<StreamMessage<K, V>>> xrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    RedisFuture<List<StreamMessage<K, V>>> xrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    RedisFuture<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    RedisFuture<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from one or more {@link XReadArgs.StreamOffset}s.
+     *
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    RedisFuture<List<StreamMessage<K, V>>> xread(XReadArgs.StreamOffset<K>... streams);
+
+    /**
+     * Read messages from one or more {@link XReadArgs.StreamOffset}s.
+     *
+     * @param args read arguments.
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    RedisFuture<List<StreamMessage<K, V>>> xread(XReadArgs args, XReadArgs.StreamOffset<K>... streams);
+
+    /**
+     * Read messages from one or more {@link XReadArgs.StreamOffset}s using a consumer group.
+     *
+     * @param consumer consumer/group.
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XReadArgs.StreamOffset<K>... streams);
+
+    /**
+     * Read messages from one or more {@link XReadArgs.StreamOffset}s using a consumer group.
+     *
+     * @param consumer consumer/group.
+     * @param args read arguments.
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XReadArgs args, XReadArgs.StreamOffset<K>... streams);
+}
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisStreamReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisStreamReactiveCommands.java
new file mode 100644
index 0000000000..608a83fa3a
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisStreamReactiveCommands.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.api.rx;
+
+import java.util.Map;
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.Consumer;
+import com.lambdaworks.redis.XReadArgs.StreamOffset;
+import rx.Observable;
+
+/**
+ * Observable commands for Streams.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 4.5
+ * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
+ */
+public interface RedisStreamReactiveCommands<K, V> {
+
+    /**
+     * Acknowledge one or more messages as processed.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param messageIds message Ids to acknowledge.
+     * @return simple-reply the lenght of acknowledged messages.
+     */
+    Observable<Long> xack(K key, String group, String... messageIds);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param body message body.
+     * @return simple-reply the message Id.
+     */
+    Observable<String> xadd(K key, Map<K, V> body);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param args
+     * @param body message body.
+     * @return simple-reply the message Id.
+     */
+    Observable<String> xadd(K key, XAddArgs args, Map<K, V> body);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param keysAndValues message body.
+     * @return simple-reply the message Id.
+     */
+    Observable<String> xadd(K key, Object... keysAndValues);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param args
+     * @param keysAndValues message body.
+     * @return simple-reply the message Id.
+     */
+    Observable<String> xadd(K key, XAddArgs args, Object... keysAndValues);
+
+    /**
+     * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @param messageIds message Ids to claim.
+     * @param args
+     * @return simple-reply the {@link StreamMessage}
+     */
+    Observable<StreamMessage<K, V>> xclaim(K key, Consumer consumer, XClaimArgs args, String... messageIds);
+
+    /**
+     * Create a consumer group.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param offset read offset or {@literal $}.
+     * @return simple-reply {@literal true} if successful.
+     */
+    Observable<Boolean> xgroupCreate(K key, String group, String offset);
+
+    /**
+     * Delete a consumer from a consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @return simple-reply the number of pending messages
+     */
+    Observable<Boolean> xgroupDelconsumer(K key, Consumer consumer);
+
+    /**
+     * Set the current {@code group} id.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param offset read offset or {@literal $}.
+     * @return simple-reply the lenght of the stream.
+     */
+    Observable<Boolean> xgroupSetid(K key, String group, String offset);
+
+    /**
+     * Get the length of a steam.
+     *
+     * @param key the stream key.
+     * @return simple-reply the lenght of the stream.
+     */
+    Observable<Long> xlen(K key);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @return StreamMessage array-reply list with members of the resulting stream.
+     */
+    Observable<StreamMessage<K, V>> xpending(K key, String group);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @return StreamMessage array-reply list with members of the resulting stream.
+     */
+    Observable<StreamMessage<K, V>> xpending(K key, Consumer consumer);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return StreamMessage array-reply list with members of the resulting stream.
+     */
+    Observable<StreamMessage<K, V>> xpending(K key, String group, Range<String> range, Limit limit);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return StreamMessage array-reply list with members of the resulting stream.
+     */
+    Observable<StreamMessage<K, V>> xpending(K key, Consumer consumer, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return StreamMessage array-reply list with members of the resulting stream.
+     */
+    Observable<StreamMessage<K, V>> xrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return StreamMessage array-reply list with members of the resulting stream.
+     */
+    Observable<StreamMessage<K, V>> xrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return StreamMessage array-reply list with members of the resulting stream.
+     */
+    Observable<StreamMessage<K, V>> xrevrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return StreamMessage array-reply list with members of the resulting stream.
+     */
+    Observable<StreamMessage<K, V>> xrevrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from one or more {@link StreamOffset}s.
+     *
+     * @param streams the streams to read from.
+     * @return StreamMessage array-reply list with members of the resulting stream.
+     */
+    Observable<StreamMessage<K, V>> xread(StreamOffset<K>... streams);
+
+    /**
+     * Read messages from one or more {@link XReadArgs.StreamOffset}s.
+     *
+     * @param args read arguments.
+     * @param streams the streams to read from.
+     * @return StreamMessage array-reply list with members of the resulting stream.
+     */
+    Observable<StreamMessage<K, V>> xread(XReadArgs args, StreamOffset<K>... streams);
+
+    /**
+     * Read messages from one or more {@link XReadArgs.StreamOffset}s using a consumer group.
+     *
+     * @param consumer consumer/group.
+     * @param streams the streams to read from.
+     * @return StreamMessage array-reply list with members of the resulting stream.
+     */
+    Observable<StreamMessage<K, V>> xreadgroup(Consumer consumer, StreamOffset<K>... streams);
+
+    /**
+     * Read messages from one or more {@link StreamOffset}s using a consumer group.
+     *
+     * @param consumer consumer/group.
+     * @param args read arguments.
+     * @param streams the streams to read from.
+     * @return StreamMessage array-reply list with members of the resulting stream.
+     */
+    Observable<StreamMessage<K, V>> xreadgroup(Consumer consumer, XReadArgs args, XReadArgs.StreamOffset<K>... streams);
+}
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisStreamCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisStreamCommands.java
new file mode 100644
index 0000000000..e6d8a0adc3
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisStreamCommands.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.api.sync;
+
+import java.util.List;
+import java.util.Map;
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.Consumer;
+import com.lambdaworks.redis.XReadArgs.StreamOffset;
+
+/**
+ * Synchronous executed commands for Streams.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 4.5
+ * @generated by com.lambdaworks.apigenerator.CreateSyncApi
+ */
+public interface RedisStreamCommands<K, V> {
+
+    /**
+     * Acknowledge one or more messages as processed.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param messageIds message Ids to acknowledge.
+     * @return simple-reply the lenght of acknowledged messages.
+     */
+    Long xack(K key, String group, String... messageIds);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param body message body.
+     * @return simple-reply the message Id.
+     */
+    String xadd(K key, Map<K, V> body);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param args
+     * @param body message body.
+     * @return simple-reply the message Id.
+     */
+    String xadd(K key, XAddArgs args, Map<K, V> body);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param keysAndValues message body.
+     * @return simple-reply the message Id.
+     */
+    String xadd(K key, Object... keysAndValues);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param args
+     * @param keysAndValues message body.
+     * @return simple-reply the message Id.
+     */
+    String xadd(K key, XAddArgs args, Object... keysAndValues);
+
+    /**
+     * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @param messageIds message Ids to claim.
+     * @param args
+     * @return simple-reply the {@link StreamMessage}
+     */
+    StreamMessage<K, V> xclaim(K key, Consumer consumer, XClaimArgs args, String... messageIds);
+
+    /**
+     * Create a consumer group.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param offset read offset or {@literal $}.
+     * @return simple-reply {@literal true} if successful.
+     */
+    String xgroupCreate(K key, String group, String offset);
+
+    /**
+     * Delete a consumer from a consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @return simple-reply the number of pending messages
+     */
+    String xgroupDelconsumer(K key, Consumer consumer);
+
+    /**
+     * Set the current {@code group} id.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param offset read offset or {@literal $}.
+     * @return simple-reply the lenght of the stream.
+     */
+    String xgroupSetid(K key, String group, String offset);
+
+    /**
+     * Get the length of a steam.
+     *
+     * @param key the stream key.
+     * @return simple-reply the lenght of the stream.
+     */
+    Long xlen(K key);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xpending(K key, String group);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xpending(K key, Consumer consumer);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<PendingEntry> xpending(K key, String group, Range<String> range, Limit limit);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<PendingEntry> xpending(K key, Consumer consumer, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xrevrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xrevrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from one or more {@link StreamOffset}s.
+     *
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xread(XReadArgs.StreamOffset<K>... streams);
+
+    /**
+     * Read messages from one or more {@link StreamOffset}s.
+     *
+     * @param args read arguments.
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xread(XReadArgs args, StreamOffset<K>... streams);
+
+    /**
+     * Read messages from one or more {@link StreamOffset}s using a consumer group.
+     *
+     * @param consumer consumer/group.
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xreadgroup(Consumer consumer, XReadArgs.StreamOffset<K>... streams);
+
+    /**
+     * Read messages from one or more {@link StreamOffset}s using a consumer group.
+     *
+     * @param consumer consumer/group.
+     * @param args read arguments.
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xreadgroup(Consumer consumer, XReadArgs args, StreamOffset<K>... streams);
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStreamAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStreamAsyncCommands.java
new file mode 100644
index 0000000000..1a92ce7fbf
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStreamAsyncCommands.java
@@ -0,0 +1,245 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.api.async;
+
+import java.util.List;
+import java.util.Map;
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.Consumer;
+import com.lambdaworks.redis.XReadArgs.StreamOffset;
+
+/**
+ * Asynchronous executed commands on a node selection for Streams.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 4.5
+ * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi
+ */
+public interface NodeSelectionStreamAsyncCommands<K, V> {
+
+    /**
+     * Acknowledge one or more messages as processed.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param messageIds message Ids to acknowledge.
+     * @return simple-reply the lenght of acknowledged messages.
+     */
+    AsyncExecutions<Long> xack(K key, String group, String... messageIds);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param body message body.
+     * @return simple-reply the message Id.
+     */
+    AsyncExecutions<String> xadd(K key, Map<K, V> body);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param args
+     * @param body message body.
+     * @return simple-reply the message Id.
+     */
+    AsyncExecutions<String> xadd(K key, XAddArgs args, Map<K, V> body);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param keysAndValues message body.
+     * @return simple-reply the message Id.
+     */
+    AsyncExecutions<String> xadd(K key, Object... keysAndValues);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param args
+     * @param keysAndValues message body.
+     * @return simple-reply the message Id.
+     */
+    AsyncExecutions<String> xadd(K key, XAddArgs args, Object... keysAndValues);
+
+    /**
+     * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @param messageIds message Ids to claim.
+     * @param args
+     * @return simple-reply the {@link StreamMessage}
+     */
+    AsyncExecutions<StreamMessage<K, V>> xclaim(K key, Consumer consumer, XClaimArgs args, String... messageIds);
+
+    /**
+     * Create a consumer group.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param offset read offset or {@literal $}.
+     * @return simple-reply {@literal true} if successful.
+     */
+    AsyncExecutions<Boolean> xgroupCreate(K key, String group, String offset);
+
+    /**
+     * Delete a consumer from a consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @return simple-reply the number of pending messages
+     */
+    AsyncExecutions<Boolean> xgroupDelconsumer(K key, Consumer consumer);
+
+    /**
+     * Set the current {@code group} id.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param offset read offset or {@literal $}.
+     * @return simple-reply the lenght of the stream.
+     */
+    AsyncExecutions<Boolean> xgroupSetid(K key, String group, String offset);
+
+    /**
+     * Get the length of a steam.
+     *
+     * @param key the stream key.
+     * @return simple-reply the lenght of the stream.
+     */
+    AsyncExecutions<Long> xlen(K key);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    AsyncExecutions<List<StreamMessage<K, V>>> xpending(K key, String group);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    AsyncExecutions<List<StreamMessage<K, V>>> xpending(K key, Consumer consumer);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    AsyncExecutions<List<StreamMessage<K, V>>> xpending(K key, String group, Range<String> range, Limit limit);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    AsyncExecutions<List<StreamMessage<K, V>>> xpending(K key, Consumer consumer, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    AsyncExecutions<List<StreamMessage<K, V>>> xrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    AsyncExecutions<List<StreamMessage<K, V>>> xrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    AsyncExecutions<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    AsyncExecutions<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from one or more {@link XReadArgs.StreamOffset}s.
+     *
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    AsyncExecutions<List<StreamMessage<K, V>>> xread(XReadArgs.StreamOffset<K>... streams);
+
+    /**
+     * Read messages from one or more {@link XReadArgs.StreamOffset}s.
+     *
+     * @param args read arguments.
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    AsyncExecutions<List<StreamMessage<K, V>>> xread(XReadArgs args, XReadArgs.StreamOffset<K>... streams);
+
+    /**
+     * Read messages from one or more {@link StreamOffset}s using a consumer group.
+     *
+     * @param consumer consumer/group.
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    AsyncExecutions<List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, StreamOffset<K>... streams);
+
+    /**
+     * Read messages from one or more {@link StreamOffset}s using a consumer group.
+     *
+     * @param consumer consumer/group.
+     * @param args read arguments.
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    AsyncExecutions<List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XReadArgs args,
+            XReadArgs.StreamOffset<K>... streams);
+}
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStreamCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStreamCommands.java
new file mode 100644
index 0000000000..b2f33a046d
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStreamCommands.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.cluster.api.sync;
+
+import java.util.List;
+import java.util.Map;
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.Consumer;
+import com.lambdaworks.redis.XReadArgs.StreamOffset;
+
+/**
+ * Synchronous executed commands on a node selection for Streams.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 4.5
+ * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi
+ */
+public interface NodeSelectionStreamCommands<K, V> {
+
+    /**
+     * Acknowledge one or more messages as processed.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param messageIds message Ids to acknowledge.
+     * @return simple-reply the lenght of acknowledged messages.
+     */
+    Executions<Long> xack(K key, String group, String... messageIds);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param body message body.
+     * @return simple-reply the message Id.
+     */
+    Executions<String> xadd(K key, Map<K, V> body);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param args
+     * @param body message body.
+     * @return simple-reply the message Id.
+     */
+    Executions<String> xadd(K key, XAddArgs args, Map<K, V> body);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param keysAndValues message body.
+     * @return simple-reply the message Id.
+     */
+    Executions<String> xadd(K key, Object... keysAndValues);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param args
+     * @param keysAndValues message body.
+     * @return simple-reply the message Id.
+     */
+    Executions<String> xadd(K key, XAddArgs args, Object... keysAndValues);
+
+    /**
+     * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @param messageIds message Ids to claim.
+     * @param args
+     * @return simple-reply the {@link StreamMessage}
+     */
+    Executions<StreamMessage<K, V>> xclaim(K key, Consumer consumer, XClaimArgs args, String... messageIds);
+
+    /**
+     * Create a consumer group.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param offset read offset or {@literal $}.
+     * @return simple-reply {@literal true} if successful.
+     */
+    Executions<Boolean> xgroupCreate(K key, String group, String offset);
+
+    /**
+     * Delete a consumer from a consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @return simple-reply the number of pending messages
+     */
+    Executions<Boolean> xgroupDelconsumer(K key, Consumer consumer);
+
+    /**
+     * Set the current {@code group} id.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param offset read offset or {@literal $}.
+     * @return simple-reply the lenght of the stream.
+     */
+    Executions<Boolean> xgroupSetid(K key, String group, String offset);
+
+    /**
+     * Get the length of a steam.
+     *
+     * @param key the stream key.
+     * @return simple-reply the lenght of the stream.
+     */
+    Executions<Long> xlen(K key);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    Executions<List<StreamMessage<K, V>>> xpending(K key, String group);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    Executions<List<StreamMessage<K, V>>> xpending(K key, Consumer consumer);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    Executions<List<StreamMessage<K, V>>> xpending(K key, String group, Range<String> range, Limit limit);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    Executions<List<StreamMessage<K, V>>> xpending(K key, Consumer consumer, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    Executions<List<StreamMessage<K, V>>> xrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    Executions<List<StreamMessage<K, V>>> xrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    Executions<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    Executions<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from one or more {@link StreamOffset}s.
+     *
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    Executions<List<StreamMessage<K, V>>> xread(StreamOffset<K>... streams);
+
+    /**
+     * Read messages from one or more {@link XReadArgs.StreamOffset}s.
+     *
+     * @param args read arguments.
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    Executions<List<StreamMessage<K, V>>> xread(XReadArgs args, XReadArgs.StreamOffset<K>... streams);
+
+    /**
+     * Read messages from one or more {@link StreamOffset}s using a consumer group.
+     *
+     * @param consumer consumer/group.
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    Executions<List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XReadArgs.StreamOffset<K>... streams);
+
+    /**
+     * Read messages from one or more {@link XReadArgs.StreamOffset}s using a consumer group.
+     *
+     * @param consumer consumer/group.
+     * @param args read arguments.
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    Executions<List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XReadArgs args, StreamOffset<K>... streams);
+}
diff --git a/src/main/java/com/lambdaworks/redis/output/PendingEntryListOutput.java b/src/main/java/com/lambdaworks/redis/output/PendingEntryListOutput.java
new file mode 100644
index 0000000000..d288cfceb1
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/output/PendingEntryListOutput.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.output;
+
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.List;
+
+import com.lambdaworks.redis.PendingEntry;
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * {@link List} of {@link PendingEntry} output to be used with XPENDING with key and group.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 4.5
+ */
+public class PendingEntryListOutput<K, V> extends CommandOutput<K, V, List<PendingEntry>> implements
+        StreamingOutput<PendingEntry> {
+
+    private boolean initialized;
+    private Subscriber<PendingEntry> subscriber;
+
+    private String messageId;
+    private String consumer;
+    private Long millisSinceDelivery;
+
+    public PendingEntryListOutput(RedisCodec<K, V> codec) {
+        super(codec, Collections.emptyList());
+        setSubscriber(ListSubscriber.instance());
+    }
+
+    @Override
+    public void set(ByteBuffer bytes) {
+
+        if (messageId == null) {
+            messageId = StringCodec.UTF8.decodeKey(bytes);
+            return;
+        }
+
+        if (consumer == null) {
+            consumer = StringCodec.UTF8.decodeKey(bytes);
+            return;
+        }
+
+    }
+
+    @Override
+    public void set(long integer) {
+
+        if (millisSinceDelivery == null) {
+            millisSinceDelivery = integer;
+            return;
+        }
+
+        subscriber.onNext(output, new PendingEntry(messageId, consumer, millisSinceDelivery, integer));
+        messageId = null;
+        consumer = null;
+        millisSinceDelivery = null;
+    }
+
+    @Override
+    public void multi(int count) {
+
+        if (!initialized) {
+            output = OutputFactory.newList(count);
+            initialized = true;
+        }
+    }
+
+    @Override
+    public void setSubscriber(Subscriber<PendingEntry> subscriber) {
+        LettuceAssert.notNull(subscriber, "Subscriber must not be null");
+        this.subscriber = subscriber;
+    }
+
+    @Override
+    public Subscriber<PendingEntry> getSubscriber() {
+        return subscriber;
+    }
+}
diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 7c28a59310..8fc6d2d510 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1469,6 +1469,112 @@ public RedisFuture<String> watch(K... keys) {
         return dispatch(commandBuilder.watch(keys));
     }
 
+    @Override
+    public RedisFuture<String> xadd(K key, Map<K, V> body) {
+        return dispatch(commandBuilder.xadd(key, null, body));
+    }
+
+    @Override
+    public RedisFuture<String> xadd(K key, XAddArgs args, Map<K, V> body) {
+        return dispatch(commandBuilder.xadd(key, args, body));
+    }
+
+    @Override
+    public RedisFuture<String> xadd(K key, Object... keysAndValues) {
+        return dispatch(commandBuilder.xadd(key, null, keysAndValues));
+    }
+
+    @Override
+    public RedisFuture<String> xadd(K key, XAddArgs args, Object... keysAndValues) {
+        return dispatch(commandBuilder.xadd(key, args, keysAndValues));
+    }
+
+    @Override
+    public RedisFuture<List<StreamMessage<K, V>>> xrange(K key, Range<String> range) {
+        return dispatch(commandBuilder.xrange(key, range, Limit.unlimited()));
+    }
+
+    @Override
+    public RedisFuture<List<StreamMessage<K, V>>> xrange(K key, Range<String> range, Limit limit) {
+        return dispatch(commandBuilder.xrange(key, range, limit));
+    }
+
+    @Override
+    public RedisFuture<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range) {
+        return dispatch(commandBuilder.xrevrange(key, range, Limit.unlimited()));
+    }
+
+    @Override
+    public RedisFuture<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range, Limit limit) {
+        return dispatch(commandBuilder.xrevrange(key, range, limit));
+    }
+
+    @Override
+    public RedisFuture<List<StreamMessage<K, V>>> xread(XReadArgs.StreamOffset<K>... streams) {
+        return dispatch(commandBuilder.xread(streams, null));
+    }
+
+    @Override
+    public RedisFuture<List<StreamMessage<K, V>>> xread(XReadArgs args, XReadArgs.StreamOffset<K>... streams) {
+        return dispatch(commandBuilder.xread(streams, args));
+    }
+
+    @Override
+    public RedisFuture<Long> xack(K key, String group, String... messageIds) {
+        return null;
+    }
+
+    @Override
+    public RedisFuture<StreamMessage<K, V>> xclaim(K key, Consumer consumer, XClaimArgs args, String... messageIds) {
+        return null;
+    }
+
+    @Override
+    public RedisFuture<String> xgroupCreate(K key, String group, String offset) {
+        return dispatch(commandBuilder.xgroupCreate(key, group, offset));
+    }
+
+    @Override
+    public RedisFuture<String> xgroupDelconsumer(K key, Consumer consumer) {
+        return null;
+    }
+
+    @Override
+    public RedisFuture<String> xgroupSetid(K key, String group, String offset) {
+        return null;
+    }
+
+    @Override
+    public RedisFuture<List<StreamMessage<K, V>>> xpending(K key, String group) {
+        return null;
+    }
+
+    @Override
+    public RedisFuture<List<StreamMessage<K, V>>> xpending(K key, Consumer consumer) {
+        return null;
+    }
+
+    @Override
+    public RedisFuture<List<PendingEntry>> xpending(K key, String group, Range<String> range, Limit limit) {
+        return dispatch(commandBuilder.xpending(key, group, range, limit));
+    }
+
+    @Override
+    public RedisFuture<List<StreamMessage<K, V>>> xpending(K key, Consumer consumer, Range<String> range, Limit limit) {
+        return null;
+    }
+
+    @Override
+    public RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XReadArgs.StreamOffset<K>... streams) {
+        return dispatch(commandBuilder.xreadgroup(consumer, streams, null));
+    }
+
+    @Override
+    public RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XReadArgs args,
+            XReadArgs.StreamOffset<K>... streams) {
+        return dispatch(commandBuilder.xreadgroup(consumer, streams, args));
+    }
+
     @Override
     public RedisFuture<Long> zadd(K key, double score, V member) {
         return dispatch(commandBuilder.zadd(key, null, score, member));
diff --git a/src/main/java/io/lettuce/core/Limit.java b/src/main/java/io/lettuce/core/Limit.java
index 18d0d58033..a2fac3fa6b 100644
--- a/src/main/java/io/lettuce/core/Limit.java
+++ b/src/main/java/io/lettuce/core/Limit.java
@@ -44,14 +44,25 @@ public static Limit unlimited() {
     /**
      * Creates a {@link Limit} given {@code offset} and {@code count}.
      *
-     * @param offset
-     * @param count
+     * @param offset the offset.
+     * @param count the limit count.
      * @return the {@link Limit}
      */
     public static Limit create(long offset, long count) {
         return new Limit(offset, count);
     }
 
+    /**
+     * Creates a {@link Limit} given {@code count}.
+     *
+     * @param count the limit count.
+     * @return the {@link Limit}.
+     * @since 4.5
+     */
+    public static Limit from(long count) {
+        return new Limit(0L, count);
+    }
+
     /**
      * @return the offset or {@literal -1} if unlimited.
      */
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 41fc670fb0..4d7d515479 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -22,6 +22,9 @@
 import java.nio.ByteBuffer;
 import java.util.*;
 
+import com.lambdaworks.redis.Range.Boundary;
+
+import io.lettuce.core.XReadArgs.StreamOffset;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
@@ -2034,6 +2037,182 @@ Command<K, V, String> watch(K... keys) {
         return createCommand(WATCH, new StatusOutput<>(codec), args);
     }
 
+    public Command<K, V, String> xadd(K key, XAddArgs xAddArgs, Map<K, V> map) {
+        notNullKey(key);
+        LettuceAssert.notNull(map, "Message body " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
+
+        if (xAddArgs != null) {
+            xAddArgs.build(args);
+        } else {
+            args.add("*");
+        }
+
+        args.add(map);
+
+        return createCommand(XADD, new StatusOutput<>(codec), args);
+    }
+
+    public Command<K, V, String> xadd(K key, XAddArgs xAddArgs, Object[] body) {
+        notNullKey(key);
+        LettuceAssert.notNull(body, "Message body " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(body, "Message body " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.noNullElements(body, "Message body " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
+        LettuceAssert.isTrue(body.length % 2 == 0, "Message body.length must be a multiple of 2 and contain a "
+                + "sequence of field1, value1, field2, value2, fieldN, valueN");
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
+
+        if (xAddArgs != null) {
+            xAddArgs.build(args);
+        } else {
+            args.add("*");
+        }
+
+        for (int i = 0; i < body.length; i += 2) {
+            args.addKey((K) body[i]);
+            args.addValue((V) body[i + 1]);
+        }
+
+        return createCommand(XADD, new StatusOutput<>(codec), args);
+    }
+
+    public Command<K, V, String> xgroupCreate(K key, String group, String id) {
+        notNullKey(key);
+        LettuceAssert.notEmpty(group, "Group " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.notEmpty(id, "Id " + MUST_NOT_BE_EMPTY);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(CREATE).addKey(key).add(group).add(id);
+
+        return createCommand(XGROUP, new StatusOutput<>(codec), args);
+    }
+
+    public Command<K, V, Long> xlen(K key) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
+
+        return createCommand(XLEN, new IntegerOutput<>(codec), args);
+    }
+
+    public Command<K, V, List<PendingEntry>> xpending(K key, String group, Range<String> range, Limit limit) {
+        notNullKey(key);
+        LettuceAssert.notNull(range, "Range " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(limit, "Limit " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(group, "Group " + MUST_NOT_BE_EMPTY);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(group);
+
+        args.add(getLowerValue(range)).add(getUpperValue(range));
+
+        if (limit.isLimited()) {
+            args.add(limit.getCount());
+        }
+
+        return createCommand(XPENDING, new PendingEntryListOutput<>(codec), args);
+    }
+
+    public Command<K, V, List<StreamMessage<K, V>>> xrange(K key, Range<String> range, Limit limit) {
+        notNullKey(key);
+        LettuceAssert.notNull(range, "Range " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(limit, "Limit " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
+
+        args.add(getLowerValue(range)).add(getUpperValue(range));
+
+        if (limit.isLimited()) {
+            args.add(COUNT).add(limit.getCount());
+        }
+
+        return createCommand(XRANGE, new StreamRangeOutput<>(codec, key), args);
+    }
+
+    public Command<K, V, List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range, Limit limit) {
+        notNullKey(key);
+        LettuceAssert.notNull(range, "Range " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(limit, "Limit " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
+
+        args.add(getUpperValue(range)).add(getLowerValue(range));
+
+        if (limit.isLimited()) {
+            args.add(COUNT).add(limit.getCount());
+        }
+
+        return createCommand(XREVRANGE, new StreamRangeOutput<>(codec, key), args);
+    }
+
+    private static String getLowerValue(Range<String> range) {
+
+        if (range.getLower().equals(Boundary.unbounded())) {
+            return "-";
+        }
+
+        return range.getLower().getValue();
+    }
+
+    private static String getUpperValue(Range<String> range) {
+
+        if (range.getUpper().equals(Boundary.unbounded())) {
+            return "+";
+        }
+
+        return range.getUpper().getValue();
+    }
+
+    public Command<K, V, List<StreamMessage<K, V>>> xread(StreamOffset<K>[] streams, XReadArgs xReadArgs) {
+        LettuceAssert.notNull(streams, "Streams " + MUST_NOT_BE_NULL);
+        LettuceAssert.isTrue(streams.length > 0, "Streams " + MUST_NOT_BE_EMPTY);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+
+        if (xReadArgs != null) {
+            xReadArgs.build(args);
+        }
+
+        args.add("STREAMS");
+
+        for (StreamOffset<K> stream : streams) {
+            args.addKey(stream.name);
+        }
+
+        for (StreamOffset<K> stream : streams) {
+            args.add(stream.offset);
+        }
+
+        return createCommand(XREAD, new StreamReadOutput<>(codec), args);
+    }
+
+    public Command<K, V, List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XReadArgs.StreamOffset<K>[] streams,
+            XReadArgs xReadArgs) {
+        LettuceAssert.notNull(streams, "Streams " + MUST_NOT_BE_NULL);
+        LettuceAssert.isTrue(streams.length > 0, "Streams " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.notNull(consumer, "Consumer " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec);
+
+        args.add("GROUP").add(consumer.group).add(consumer.name);
+
+        if (xReadArgs != null) {
+            xReadArgs.build(args);
+        }
+
+        args.add("STREAMS");
+
+        for (StreamOffset<K> stream : streams) {
+            args.addKey(stream.name);
+        }
+
+        for (XReadArgs.StreamOffset<K> stream : streams) {
+            args.add(stream.offset);
+        }
+
+        return createCommand(XREADGROUP, new StreamReadOutput<>(codec), args);
+    }
+
     Command<K, V, Long> zadd(K key, ZAddArgs zAddArgs, double score, V member) {
         notNullKey(key);
 
@@ -2072,7 +2251,7 @@ Command<K, V, Long> zadd(K key, ZAddArgs zAddArgs, Object... scoresAndValues) {
         } else {
             LettuceAssert.isTrue(scoresAndValues.length % 2 == 0,
                     "ScoresAndValues.length must be a multiple of 2 and contain a "
-                            + "sequence of score1, value1, score2, value2, scoreN,valueN");
+                            + "sequence of score1, value1, score2, value2, scoreN, valueN");
 
             for (int i = 0; i < scoresAndValues.length; i += 2) {
                 args.add((Double) scoresAndValues[i]);
@@ -2273,13 +2452,11 @@ Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Strin
         return createCommand(ZRANGEBYSCORE, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset,
-            long count) {
+    Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count) {
         return zrangebyscore(channel, key, string(min), string(max), offset, count);
     }
 
-    Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset,
-            long count) {
+    Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count) {
         notNullKey(key);
         notNullMinMax(min, max);
         LettuceAssert.notNull(channel, "ScoredValueStreamingChannel " + MUST_NOT_BE_NULL);
@@ -2366,8 +2543,8 @@ Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> chann
         return createCommand(ZRANGEBYSCORE, new ScoredValueStreamingOutput<>(codec, channel), args);
     }
 
-    Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key,
-            Range<? extends Number> range, Limit limit) {
+    Command<K, V, Long> zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
+            Limit limit) {
         notNullKey(key);
         notNullRange(range);
         notNullLimit(limit);
@@ -2543,8 +2720,7 @@ Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, St
         return createCommand(ZREVRANGEBYSCORE, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
-            Limit limit) {
+    Command<K, V, Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
         notNullKey(key);
         notNullRange(range);
         notNullLimit(limit);
@@ -2605,8 +2781,8 @@ Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> ch
         return createCommand(ZREVRANGEBYSCORE, new ScoredValueStreamingOutput<>(codec, channel), args);
     }
 
-    Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max,
-            double min, long offset, long count) {
+    Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double max, double min,
+            long offset, long count) {
         notNullKey(key);
         LettuceAssert.notNull(min, "Min " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(max, "Max " + MUST_NOT_BE_NULL);
@@ -2614,8 +2790,8 @@ Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> ch
         return zrevrangebyscoreWithScores(channel, key, string(max), string(min), offset, count);
     }
 
-    Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max,
-            String min, long offset, long count) {
+    Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String max, String min,
+            long offset, long count) {
         notNullKey(key);
         notNullMinMax(min, max);
         notNull(channel);
@@ -2743,7 +2919,7 @@ private boolean allElementsInstanceOf(Object[] objects, Class<?> expectedAssigna
 
     private byte[] maxValue(Range<? extends V> range) {
 
-        Range.Boundary<? extends V> upper = range.getUpper();
+        Boundary<? extends V> upper = range.getUpper();
 
         if (upper.getValue() == null) {
             return PLUS_BYTES;
@@ -2758,7 +2934,7 @@ private byte[] maxValue(Range<? extends V> range) {
 
     private byte[] minValue(Range<? extends V> range) {
 
-        Range.Boundary<? extends V> lower = range.getLower();
+        Boundary<? extends V> lower = range.getLower();
 
         if (lower.getValue() == null) {
             return MINUS_BYTES;
@@ -2806,7 +2982,7 @@ private static void assertNodeId(String nodeId) {
 
     private static String max(Range<? extends Number> range) {
 
-        Range.Boundary<? extends Number> upper = range.getUpper();
+        Boundary<? extends Number> upper = range.getUpper();
 
         if (upper.getValue() == null || upper.getValue() instanceof Double
                 && upper.getValue().doubleValue() == Double.POSITIVE_INFINITY) {
@@ -2822,7 +2998,7 @@ private static String max(Range<? extends Number> range) {
 
     private static String min(Range<? extends Number> range) {
 
-        Range.Boundary<? extends Number> lower = range.getLower();
+        Boundary<? extends Number> lower = range.getLower();
 
         if (lower.getValue() == null || lower.getValue() instanceof Double
                 && lower.getValue().doubleValue() == Double.NEGATIVE_INFINITY) {
diff --git a/src/main/java/io/lettuce/core/StreamMessage.java b/src/main/java/io/lettuce/core/StreamMessage.java
new file mode 100644
index 0000000000..390b56152f
--- /dev/null
+++ b/src/main/java/io/lettuce/core/StreamMessage.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import java.util.Map;
+
+/**
+ * A stream message and its id.
+ *
+ * @author Mark Paluch
+ * @since 4.5
+ */
+public class StreamMessage<K, V> {
+
+    private final K stream;
+    private final String id;
+    private final Map<K, V> body;
+
+    /**
+     * Create a new {@link StreamMessage}.
+     *
+     * @param stream the stream.
+     * @param id the message id.
+     * @param body map containing the message body.
+     */
+    public StreamMessage(K stream, String id, Map<K, V> body) {
+
+        this.stream = stream;
+        this.id = id;
+        this.body = body;
+    }
+
+    public K getStream() {
+        return stream;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public Map<K, V> getBody() {
+        return body;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("StreamMessage[%s:%s]%s", stream, id, body);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/XAddArgs.java b/src/main/java/io/lettuce/core/XAddArgs.java
new file mode 100644
index 0000000000..3b0ce91a3d
--- /dev/null
+++ b/src/main/java/io/lettuce/core/XAddArgs.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.protocol.CommandArgs;
+import com.lambdaworks.redis.protocol.CommandKeyword;
+
+/**
+ * Args for the {@literal XADD} command.
+ *
+ * @author Mark Paluch
+ */
+public class XAddArgs {
+
+    private String id;
+    private Long maxlen;
+
+    public static class Builder {
+
+        /**
+         * Utility constructor.
+         */
+        private Builder() {
+
+        }
+
+        public static XAddArgs maxlen(long count) {
+            return new XAddArgs().maxlen(count);
+        }
+    }
+
+    /**
+     * Limit results to {@code maxlen} entries.
+     *
+     * @param id must not be {@literal null}.
+     * @return {@code this}
+     */
+    public XAddArgs id(String id) {
+        LettuceAssert.notNull(id, "Id must not be null");
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * Limit stream to {@code maxlen} entries.
+     *
+     * @param maxlen number greater 0.
+     * @return {@code this}
+     */
+    public XAddArgs maxlen(long maxlen) {
+        LettuceAssert.isTrue(maxlen > 0, "Maxlen must be greater 0");
+        this.maxlen = maxlen;
+        return this;
+    }
+
+    public <K, V> void build(CommandArgs<K, V> args) {
+        if (maxlen != null) {
+            args.add(CommandKeyword.MAXLEN).add(maxlen);
+        }
+
+        if (id != null) {
+            args.add(id);
+        } else {
+            args.add("*");
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/XReadArgs.java b/src/main/java/io/lettuce/core/XReadArgs.java
new file mode 100644
index 0000000000..42c660a9d0
--- /dev/null
+++ b/src/main/java/io/lettuce/core/XReadArgs.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
+import com.lambdaworks.redis.protocol.CommandArgs;
+import com.lambdaworks.redis.protocol.CommandKeyword;
+
+/**
+ * Args for the {@literal XREAD} command.
+ *
+ * @author Mark Paluch
+ */
+public class XReadArgs {
+
+    private Long block;
+    private Long count;
+    private boolean noack;
+
+    public static class Builder {
+
+        /**
+         * Utility constructor.
+         */
+        private Builder() {
+
+        }
+
+        public static XReadArgs block(long milliseconds) {
+            return new XReadArgs().block(milliseconds);
+        }
+
+        public static XReadArgs count(long count) {
+            return new XReadArgs().count(count);
+        }
+
+        public static XReadArgs noack(boolean noack) {
+            return new XReadArgs().noack(noack);
+        }
+    }
+
+    /**
+     * Wait up to {@code milliseconds} for a new stream message.
+     *
+     * @param milliseconds max time to wait.
+     * @return {@code this}.
+     */
+    public XReadArgs block(long milliseconds) {
+        this.block = milliseconds;
+        return this;
+    }
+
+    /**
+     * Limit read to {@code count} messages.
+     *
+     * @param count number of messages.
+     * @return {@code this}.
+     */
+    public XReadArgs count(long count) {
+        this.count = count;
+        return this;
+    }
+
+    /**
+     * Use NOACK option to disable auto-acknowledgement.
+     *
+     * @param noack {@literal true} to disable auto-ack.
+     * @return {@code this}.
+     */
+    public XReadArgs noack(boolean noack) {
+        this.noack = noack;
+        return this;
+    }
+
+    public <K, V> void build(CommandArgs<K, V> args) {
+
+        if (block != null) {
+            args.add(CommandKeyword.BLOCK).add(block);
+        }
+
+        if (count != null) {
+            args.add(CommandKeyword.COUNT).add(count);
+        }
+
+        if (noack) {
+            args.add(CommandKeyword.NOACK);
+        }
+    }
+
+    /**
+     * Value object representing a Stream consumer group.
+     */
+    public static class StreamOffset<K> {
+
+        final K name;
+        final String offset;
+
+        private StreamOffset(K name, String offset) {
+            this.name = name;
+            this.offset = offset;
+        }
+
+        /**
+         * Read all new arriving elements from the stream identified by {@code name}.
+         *
+         * @param name must not be {@literal null}.
+         * @return the {@link StreamOffset} object without a specific offset.
+         */
+        public static <K> StreamOffset<K> latest(K name) {
+
+            LettuceAssert.notNull(name, "Stream must not be null");
+
+            return new StreamOffset<>(name, "$");
+        }
+
+        /**
+         * Read all new arriving elements from the stream identified by {@code name}.
+         *
+         * @param name must not be {@literal null}.
+         * @return the {@link StreamOffset} object without a specific offset.
+         */
+        public static <K> StreamOffset<K> latestConsumer(K name) {
+
+            LettuceAssert.notNull(name, "Stream must not be null");
+
+            return new StreamOffset<>(name, ">");
+        }
+
+        /**
+         * Read all arriving elements from the stream identified by {@code name} starting at {@code offset}.
+         *
+         * @param name must not be {@literal null}.
+         * @param offset the stream offset.
+         * @return the {@link StreamOffset} object without a specific offset.
+         */
+        public static <K> StreamOffset<K> from(K name, String offset) {
+
+            LettuceAssert.notNull(name, "Stream must not be null");
+            LettuceAssert.notEmpty(offset, "Offset must not be empty");
+
+            return new StreamOffset<>(name, offset);
+        }
+    }
+
+}
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
index 6a8052c085..ef193026bd 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
@@ -35,7 +35,8 @@
 public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>,
         RedisStringReactiveCommands<K, V>, RedisListReactiveCommands<K, V>, RedisSetReactiveCommands<K, V>,
         RedisSortedSetReactiveCommands<K, V>, RedisScriptingReactiveCommands<K, V>, RedisServerReactiveCommands<K, V>,
-        RedisHLLReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>, BaseRedisReactiveCommands<K, V> {
+        RedisHLLReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>, RedisStreamReactiveCommands<K, V>,
+        BaseRedisReactiveCommands<K, V> {
 
     /**
      * Set the default timeout for operations.
diff --git a/src/main/java/io/lettuce/core/output/StreamRangeOutput.java b/src/main/java/io/lettuce/core/output/StreamRangeOutput.java
new file mode 100644
index 0000000000..a5c0e45245
--- /dev/null
+++ b/src/main/java/io/lettuce/core/output/StreamRangeOutput.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.output;
+
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+import io.lettuce.core.StreamMessage;
+
+/**
+ * @author Mark Paluch
+ * @since 4.5
+ */
+public class StreamRangeOutput<K, V> extends CommandOutput<K, V, List<StreamMessage<K, V>>> implements
+        StreamingOutput<StreamMessage<K, V>> {
+
+    private final K stream;
+
+    private boolean initialized;
+    private Subscriber<StreamMessage<K, V>> subscriber;
+
+    private K key;
+    private String id;
+    private Map<K, V> body;
+
+    public StreamRangeOutput(RedisCodec<K, V> codec, K stream) {
+        super(codec, Collections.emptyList());
+        setSubscriber(ListSubscriber.instance());
+        this.stream = stream;
+    }
+
+    @Override
+    public void set(ByteBuffer bytes) {
+
+        if (id == null) {
+            id = decodeAscii(bytes);
+            return;
+        }
+
+        if (key == null) {
+            key = codec.decodeKey(bytes);
+            return;
+        }
+
+        if (body == null) {
+            body = new LinkedHashMap<>();
+        }
+
+        body.put(key, bytes == null ? null : codec.decodeValue(bytes));
+        key = null;
+    }
+
+    @Override
+    public void multi(int count) {
+
+        if (!initialized) {
+            output = OutputFactory.newList(count);
+            initialized = true;
+        }
+    }
+
+    @Override
+    public void complete(int depth) {
+
+        if (depth == 1) {
+            subscriber.onNext(output, new StreamMessage<>(stream, id, body));
+            key = null;
+            id = null;
+            body = null;
+        }
+    }
+
+    @Override
+    public void setSubscriber(Subscriber<StreamMessage<K, V>> subscriber) {
+        LettuceAssert.notNull(subscriber, "Subscriber must not be null");
+        this.subscriber = subscriber;
+    }
+
+    @Override
+    public Subscriber<StreamMessage<K, V>> getSubscriber() {
+        return subscriber;
+    }
+}
diff --git a/src/main/java/io/lettuce/core/output/StreamReadOutput.java b/src/main/java/io/lettuce/core/output/StreamReadOutput.java
new file mode 100644
index 0000000000..832687d76d
--- /dev/null
+++ b/src/main/java/io/lettuce/core/output/StreamReadOutput.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.output;
+
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.lambdaworks.redis.codec.RedisCodec;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+import io.lettuce.core.StreamMessage;
+
+/**
+ * @author Mark Paluch
+ * @since 4.5
+ */
+public class StreamReadOutput<K, V> extends CommandOutput<K, V, List<StreamMessage<K, V>>> implements
+        StreamingOutput<StreamMessage<K, V>> {
+
+    private boolean initialized;
+    private Subscriber<StreamMessage<K, V>> subscriber;
+    private K stream;
+    private K key;
+    private String id;
+    private Map<K, V> body;
+
+    public StreamReadOutput(RedisCodec<K, V> codec) {
+        super(codec, Collections.emptyList());
+        setSubscriber(ListSubscriber.instance());
+    }
+
+    @Override
+    public void set(ByteBuffer bytes) {
+
+        if (stream == null) {
+            stream = codec.decodeKey(bytes);
+            return;
+        }
+
+        if (id == null) {
+            id = decodeAscii(bytes);
+            return;
+        }
+
+        if (key == null) {
+            key = codec.decodeKey(bytes);
+            return;
+        }
+
+        if (body == null) {
+            body = new LinkedHashMap<>();
+        }
+
+        body.put(key, bytes == null ? null : codec.decodeValue(bytes));
+        key = null;
+    }
+
+    @Override
+    public void multi(int count) {
+
+        if (!initialized) {
+            output = OutputFactory.newList(count);
+            initialized = true;
+        }
+    }
+
+    @Override
+    public void complete(int depth) {
+
+        if (depth == 1) {
+            stream = null;
+        }
+
+        if (depth == 3) {
+            subscriber.onNext(output, new StreamMessage<>(stream, id, body));
+            key = null;
+            id = null;
+            body = null;
+        }
+    }
+
+    @Override
+    public void setSubscriber(Subscriber<StreamMessage<K, V>> subscriber) {
+        LettuceAssert.notNull(subscriber, "Subscriber must not be null");
+        this.subscriber = subscriber;
+    }
+
+    @Override
+    public Subscriber<StreamMessage<K, V>> getSubscriber() {
+        return subscriber;
+    }
+}
diff --git a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
index 0dd4eabe89..42cd961328 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
@@ -22,13 +22,21 @@
  */
 public enum CommandKeyword implements ProtocolKeyword {
 
-    ADDR, ADDSLOTS, AFTER, AGGREGATE, ALPHA, AND, ASK, ASC, ASYNC, BEFORE, BUMPEPOCH, BY, CHANNELS, COPY, COUNT, COUNTKEYSINSLOT, DELSLOTS, DESC, SOFT, HARD, ENCODING,
+    ADDR, ADDSLOTS, AFTER, AGGREGATE, ALPHA, AND, ASK, ASC, ASYNC, BEFORE, BLOCK, BUMPEPOCH,
 
-    FAILOVER, FORGET, FLUSH, FORCE, FLUSHSLOTS, GETNAME, GETKEYSINSLOT, HTSTATS, ID, IDLETIME, KILL, KEYSLOT, LEN, LIMIT, LIST, LOAD, MATCH,
+    BY, CHANNELS, COPY, COUNT, COUNTKEYSINSLOT, CREATE, DELSLOTS, DESC, SOFT, HARD, ENCODING,
 
-    MAX, MEET, MIN, MOVED, NO, NODE, NODES, NOSAVE, NOT, NUMSUB, NUMPAT, ONE, OR, PAUSE, REFCOUNT, REMOVE, RELOAD, REPLACE, REPLICATE, RESET,
+    FAILOVER, FORGET, FLUSH, FORCE, FLUSHSLOTS, GETNAME, GETKEYSINSLOT, GROUP, HTSTATS, ID, IDLE,
 
-    RESETSTAT, RESTART, REWRITE, SAVECONFIG, SDSLEN, SETNAME, SETSLOT, SLOTS, STABLE, MIGRATING, IMPORTING, SKIPME, SLAVES, STORE, SUM, SEGFAULT, WEIGHTS,
+    IDLETIME, JUSTID, KILL, KEYSLOT, LEN, LIMIT, LIST, LOAD, MATCH,
+
+    MAX, MAXLEN, MEET, MIN, MOVED, NO, NOACK, NODE, NODES, NOSAVE, NOT, NUMSUB, NUMPAT, ONE, OR, PAUSE,
+
+    REFCOUNT, REMOVE, RELOAD, REPLACE, REPLICATE, RESET,
+
+    RESETSTAT, RESTART, RETRYCOUNT, REWRITE, SAVECONFIG, SDSLEN, SETNAME, SETSLOT, SLOTS, STABLE,
+
+    MIGRATING, IMPORTING, SKIPME, SLAVES, STORE, SUM, SEGFAULT, WEIGHTS,
 
     WITHSCORES, XOR;
 
diff --git a/src/main/java/io/lettuce/core/protocol/CommandType.java b/src/main/java/io/lettuce/core/protocol/CommandType.java
index e7f9c3500d..dd1f9afb6c 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandType.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandType.java
@@ -79,20 +79,28 @@ public enum CommandType implements ProtocolKeyword {
     BITCOUNT, BITFIELD, BITOP, GETBIT, SETBIT, BITPOS,
 
     // Geo
+
     GEOADD, GEORADIUS, GEORADIUS_RO, GEORADIUSBYMEMBER, GEORADIUSBYMEMBER_RO, GEOENCODE, GEODECODE, GEOPOS, GEODIST, GEOHASH,
 
+    // Stream
+
+    XADD, XGROUP, XINFO, XLEN, XPENDING, XRANGE, XREVRANGE, XREAD, XREADGROUP,
+
     // Others
+
     TIME, WAIT,
 
     // SENTINEL
+
     SENTINEL,
 
     // CLUSTER
+
     ASKING, CLUSTER;
 
     public final byte[] bytes;
 
-    private CommandType() {
+    CommandType() {
         bytes = name().getBytes(LettuceCharsets.ASCII);
     }
 
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisStreamCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisStreamCommands.java
new file mode 100644
index 0000000000..8d6456981e
--- /dev/null
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisStreamCommands.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.api;
+
+import java.util.List;
+import java.util.Map;
+
+import com.lambdaworks.redis.*;
+import com.lambdaworks.redis.XReadArgs.Consumer;
+import com.lambdaworks.redis.XReadArgs.Stream;
+
+/**
+ * ${intent} for Streams.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 4.5
+ */
+public interface RedisStreamCommands<K, V> {
+
+    /**
+     * Acknowledge one or more messages as processed.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param messageIds message Ids to acknowledge.
+     * @return simple-reply the lenght of acknowledged messages.
+     */
+    Long xack(K key, String group, String... messageIds);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param body message body.
+     * @return simple-reply the message Id.
+     */
+    String xadd(K key, Map<K, V> body);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param args
+     * @param body message body.
+     * @return simple-reply the message Id.
+     */
+    String xadd(K key, XAddArgs args, Map<K, V> body);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param keysAndValues message body.
+     * @return simple-reply the message Id.
+     */
+    String xadd(K key, Object... keysAndValues);
+
+    /**
+     * Append a message to the stream {@code key}.
+     *
+     * @param key the stream key.
+     * @param args
+     * @param keysAndValues message body.
+     * @return simple-reply the message Id.
+     */
+    String xadd(K key, XAddArgs args, Object... keysAndValues);
+
+    /**
+     * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @param messageIds message Ids to claim.
+     * @param args
+     * @return simple-reply the {@link StreamMessage}
+     */
+    StreamMessage<K, V> xclaim(K key, Consumer consumer, XClaimArgs args, String... messageIds);
+
+    /**
+     * Create a consumer group.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param offset read offset or {@literal $}.
+     * @return simple-reply {@literal true} if successful.
+     */
+    Boolean xgroupCreate(K key, String group, String offset);
+
+    /**
+     * Delete a consumer from a consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @return simple-reply the number of pending messages
+     */
+    Boolean xgroupDelconsumer(K key, Consumer consumer);
+
+    /**
+     * Set the current {@code group} id.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param offset read offset or {@literal $}.
+     * @return simple-reply the lenght of the stream.
+     */
+    Boolean xgroupSetid(K key, String group, String offset);
+
+    /**
+     * Get the length of a steam.
+     *
+     * @param key the stream key.
+     * @return simple-reply the lenght of the stream.
+     */
+    Long xlen(K key);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @return List&lt;PendingEntry&gt; array-reply list pending entries.
+     */
+    List<PendingEntry> xpending(K key, String group);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @return List&lt;PendingEntry&gt; array-reply list pending entries.
+     */
+    List<PendingEntry> xpending(K key, Consumer consumer);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xpending(K key, String group, Range<String> range, Limit limit);
+
+    /**
+     * Read pending messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xpending(K key, Consumer consumer, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from a stream within a specific {@link Range}.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xrevrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xrevrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Read messages from one or more {@link Stream}s.
+     *
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xread(Stream<K>... streams);
+
+    /**
+     * Read messages from one or more {@link Stream}s.
+     *
+     * @param args read arguments.
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xread(XReadArgs args, Stream<K>... streams);
+
+    /**
+     * Read messages from one or more {@link Stream}s using a consumer group.
+     *
+     * @param consumer consumer/group.
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xreadgroup(Consumer consumer, Stream<K>... streams);
+
+    /**
+     * Read messages from one or more {@link Stream}s using a consumer group.
+     *
+     * @param consumer consumer/group.
+     * @param args read arguments.
+     * @param streams the streams to read from.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xreadgroup(Consumer consumer, XReadArgs args, Stream<K>... streams);
+}
diff --git a/src/test/java/com/lambdaworks/redis/commands/StreamCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/StreamCommandTest.java
new file mode 100644
index 0000000000..7259ae2671
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/commands/StreamCommandTest.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.commands;
+
+import static com.lambdaworks.redis.protocol.CommandType.XINFO;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+
+import java.util.*;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import io.lettuce.core.StreamMessage;
+import io.lettuce.core.XAddArgs;
+import io.lettuce.core.XReadArgs.StreamOffset;
+import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.output.NestedMultiOutput;
+import com.lambdaworks.redis.protocol.CommandArgs;
+
+/**
+ * @author Mark Paluch
+ */
+public class StreamCommandTest extends AbstractRedisClientTest {
+
+    @Test
+    public void xadd() {
+
+        assertThat(redis.xadd(key, Collections.singletonMap("key", "value"))).endsWith("-0");
+        assertThat(redis.xadd(key, "foo", "bar")).isNotEmpty();
+    }
+
+    @Test
+    public void xaddMaxLen() {
+
+        String id = redis.xadd(key, XAddArgs.Builder.maxlen(5), "foo", "bar");
+
+        for (int i = 0; i < 5; i++) {
+            redis.xadd(key, XAddArgs.Builder.maxlen(5), "foo", "bar");
+        }
+
+        List<StreamMessage<String, String>> messages = redis.xrange(key,
+                Range.from(Range.Boundary.including(id), Range.Boundary.unbounded()));
+
+        assertThat(messages).hasSize(5);
+    }
+
+    @Test
+    public void xrange() {
+
+        List<String> ids = new ArrayList<>();
+        for (int i = 0; i < 5; i++) {
+
+            Map<String, String> body = new HashMap<>();
+            body.put("key-1", "value-1-" + i);
+            body.put("key-2", "value-2-" + i);
+
+            ids.add(redis.xadd(key, body));
+        }
+
+        List<StreamMessage<String, String>> messages = redis.xrange(key, Range.unbounded());
+        assertThat(messages).hasSize(5);
+
+        StreamMessage<String, String> message = messages.get(0);
+
+        Map<String, String> expectedBody = new HashMap<>();
+        expectedBody.put("key-1", "value-1-0");
+        expectedBody.put("key-2", "value-2-0");
+
+        assertThat(message.getId()).contains("-");
+        assertThat(message.getStream()).isEqualTo(key);
+        assertThat(message.getBody()).isEqualTo(expectedBody);
+
+        assertThat(redis.xrange(key, Range.unbounded(), Limit.from(2))).hasSize(2);
+
+        List<StreamMessage<String, String>> range = redis.xrange(key, Range.create(ids.get(0), ids.get(1)));
+
+        assertThat(range).hasSize(2);
+        assertThat(range.get(0).getBody()).isEqualTo(expectedBody);
+    }
+
+    @Test
+    public void xrevrange() {
+
+        for (int i = 0; i < 5; i++) {
+
+            Map<String, String> body = new HashMap<>();
+            body.put("key-1", "value-1-" + i);
+            body.put("key-2", "value-2-" + i);
+
+            redis.xadd(key, body);
+        }
+
+        List<StreamMessage<String, String>> messages = redis.xrevrange(key, Range.unbounded());
+        assertThat(messages).hasSize(5);
+
+        StreamMessage<String, String> message = messages.get(0);
+
+        Map<String, String> expectedBody = new HashMap<>();
+        expectedBody.put("key-1", "value-1-4");
+        expectedBody.put("key-2", "value-2-4");
+
+        assertThat(message.getId()).contains("-");
+        assertThat(message.getStream()).isEqualTo(key);
+        assertThat(message.getBody()).isEqualTo(expectedBody);
+    }
+
+    @Test
+    public void xread() {
+
+        String initial1 = redis.xadd("stream-1", Collections.singletonMap("key1", "value1"));
+        String initial2 = redis.xadd("stream-2", Collections.singletonMap("key2", "value2"));
+        String message1 = redis.xadd("stream-1", Collections.singletonMap("key3", "value3"));
+        String message2 = redis.xadd("stream-2", Collections.singletonMap("key4", "value4"));
+
+        List<StreamMessage<String, String>> messages = redis.xread(StreamOffset.from("stream-1", initial1),
+                StreamOffset.from("stream-2", initial2));
+
+        StreamMessage<String, String> firstMessage = messages.get(0);
+
+        assertThat(firstMessage.getId().equals(message1));
+        assertThat(firstMessage.getStream().equals("stream-1"));
+        assertThat(firstMessage.getBody()).containsEntry("key3", "value3");
+
+        StreamMessage<String, String> secondMessage = messages.get(1);
+
+        assertThat(secondMessage.getId().equals(message2));
+        assertThat(secondMessage.getStream().equals("stream-2"));
+        assertThat(secondMessage.getBody()).containsEntry("key4", "value4");
+    }
+
+    @Test
+    public void xreadTransactional() {
+
+        String initial1 = redis.xadd("stream-1", Collections.singletonMap("key1", "value1"));
+        String initial2 = redis.xadd("stream-2", Collections.singletonMap("key2", "value2"));
+
+        redis.multi();
+        redis.xadd("stream-1", Collections.singletonMap("key3", "value3"));
+        redis.xadd("stream-2", Collections.singletonMap("key4", "value4"));
+        redis.xread(StreamOffset.from("stream-1", initial1), XReadArgs.StreamOffset.from("stream-2", initial2));
+
+        List<Object> exec = redis.exec();
+
+        String message1 = (String) exec.get(0);
+        String message2 = (String) exec.get(1);
+        List<StreamMessage<String, String>> messages = (List) exec.get(2);
+
+        StreamMessage<String, String> firstMessage = messages.get(0);
+
+        assertThat(firstMessage.getId().equals(message1));
+        assertThat(firstMessage.getStream().equals("stream-1"));
+        assertThat(firstMessage.getBody()).containsEntry("key3", "value3");
+
+        StreamMessage<String, String> secondMessage = messages.get(1);
+
+        assertThat(secondMessage.getId().equals(message2));
+        assertThat(secondMessage.getStream().equals("stream-2"));
+        assertThat(secondMessage.getBody()).containsEntry("key4", "value4");
+    }
+
+    @Test
+    public void xgroupCreate() {
+
+        redis.xadd(key, Collections.singletonMap("key", "value"));
+
+        assertThat(redis.xgroupCreate(key, "group", "$")).isEqualTo("OK");
+
+        List<Object> groups = redis.dispatch(XINFO, new NestedMultiOutput<>(StringCodec.UTF8), new CommandArgs<>(
+                StringCodec.UTF8).add("GROUPS").add(key));
+
+        assertThat(groups).isNotEmpty();
+    }
+
+    @Test
+    public void xgroupread() {
+
+        redis.xadd(key, Collections.singletonMap("key", "value"));
+        redis.xgroupCreate(key, "group", "$");
+        redis.xadd(key, Collections.singletonMap("key", "value"));
+
+        List<StreamMessage<String, String>> read1 = redis.xreadgroup(Consumer.from("group", "consumer1"),
+                StreamOffset.latestConsumer(key));
+
+        assertThat(read1).hasSize(1);
+    }
+
+    @Test
+    public void xpending() {
+
+        redis.xadd(key, Collections.singletonMap("key", "value"));
+        redis.xgroupCreate(key, "group", "$");
+        String id = redis.xadd(key, Collections.singletonMap("key", "value"));
+
+        List<StreamMessage<String, String>> read = redis.xreadgroup(Consumer.from("group", "consumer1"),
+                StreamOffset.latestConsumer(key));
+
+        List<PendingEntry> pendingEntries = redis.xpending(key, "group", Range.unbounded(), Limit.from(10));
+
+        assertThat(pendingEntries).hasSize(1);
+
+        PendingEntry pendingEntry = pendingEntries.get(0);
+        assertThat(pendingEntry.getConsumer()).isEqualTo("consumer1");
+        assertThat(pendingEntry.getDeliveryCount()).isEqualTo(1);
+        assertThat(pendingEntry.getMessageId()).isEqualTo(id);
+        assertThat(pendingEntry.getMillisSinceDelivery()).isGreaterThan(0);
+    }
+
+    @Test
+    @Ignore("Not yet implemented in Redis")
+    public void xgroupDelgroup() {
+
+        redis.xadd(key, Collections.singletonMap("key", "value"));
+
+        fail("Not yet implemented in Redis");
+    }
+
+    @Test
+    @Ignore("Not yet implemented in Redis")
+    public void xgroupSetid() {
+
+        redis.xadd(key, Collections.singletonMap("key", "value"));
+
+        fail("Not yet implemented in Redis");
+    }
+}

From 64f2e6bebc59917d60221597b6994f42fd74ad29 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 19 Apr 2018 13:39:46 +0200
Subject: [PATCH 454/808] Add support for XACK and XPENDING. Add command output
 parsers for XPENDING #606

---
 .../java/com/lambdaworks/redis/Consumer.java  | 59 +++++++++--
 .../api/async/RedisStreamAsyncCommands.java   | 60 ++++-------
 .../api/rx/RedisStreamReactiveCommands.java   | 53 ++++------
 .../redis/api/sync/RedisStreamCommands.java   | 48 +++------
 .../NodeSelectionStreamAsyncCommands.java     | 55 ++++-------
 .../api/sync/NodeSelectionStreamCommands.java | 52 +++-------
 .../{ => models/stream}/PendingEntry.java     |  5 +-
 .../redis/models/stream/PendingMessage.java   | 60 +++++++++++
 .../redis/models/stream/PendingMessages.java  | 48 +++++++++
 .../redis/models/stream/PendingParser.java    | 99 +++++++++++++++++++
 .../redis/models/stream/package-info.java     |  5 +
 .../redis/output/PendingEntryListOutput.java  | 98 ------------------
 .../core/AbstractRedisAsyncCommands.java      | 32 +++---
 src/main/java/io/lettuce/core/Range.java      | 32 ++++++
 .../io/lettuce/core/RedisCommandBuilder.java  | 41 +++++---
 .../core/api/sync/RedisServerCommands.java    |  4 +
 .../io/lettuce/core/output/CommandOutput.java | 10 ++
 .../core/output/NestedMultiOutput.java        | 14 ++-
 .../io/lettuce/core/protocol/CommandType.java |  2 +-
 .../core/protocol/RedisStateMachine.java      | 18 +++-
 .../redis/api/RedisStreamCommands.java        | 59 ++++-------
 .../redis/commands/StreamCommandTest.java     | 64 +++++++++---
 .../commands/rx/StreamRxCommandTest.java}     | 16 +--
 .../models/stream/PendingParserTest.java      | 61 ++++++++++++
 24 files changed, 604 insertions(+), 391 deletions(-)
 rename src/main/java/com/lambdaworks/redis/{ => models/stream}/PendingEntry.java (91%)
 create mode 100644 src/main/java/com/lambdaworks/redis/models/stream/PendingMessage.java
 create mode 100644 src/main/java/com/lambdaworks/redis/models/stream/PendingMessages.java
 create mode 100644 src/main/java/com/lambdaworks/redis/models/stream/PendingParser.java
 create mode 100644 src/main/java/com/lambdaworks/redis/models/stream/package-info.java
 delete mode 100644 src/main/java/com/lambdaworks/redis/output/PendingEntryListOutput.java
 rename src/{main/java/com/lambdaworks/redis/PendingMessages.java => test/java/com/lambdaworks/redis/commands/rx/StreamRxCommandTest.java} (63%)
 create mode 100644 src/test/java/com/lambdaworks/redis/models/stream/PendingParserTest.java

diff --git a/src/main/java/com/lambdaworks/redis/Consumer.java b/src/main/java/com/lambdaworks/redis/Consumer.java
index af5575fab2..6550f60607 100644
--- a/src/main/java/com/lambdaworks/redis/Consumer.java
+++ b/src/main/java/com/lambdaworks/redis/Consumer.java
@@ -15,17 +15,24 @@
  */
 package com.lambdaworks.redis;
 
+import java.util.Objects;
+
 import com.lambdaworks.redis.internal.LettuceAssert;
 
 /**
- * Value object representing a Stream consumer within a group.
+ * Value object representing a Stream consumer within a consumer group. Group name and consumer name are encoded as keys.
+ *
+ * @author Mark Paluch
+ * @since 4.5
+ * @see com.lambdaworks.redis.codec.RedisCodec
  */
-public class Consumer {
+public class Consumer<K> {
+
+    final K group;
+    final K name;
 
-    final String group;
-    final String name;
+    private Consumer(K group, K name) {
 
-    public Consumer(String group, String name) {
         this.group = group;
         this.name = name;
     }
@@ -37,11 +44,45 @@ public Consumer(String group, String name) {
      * @param name name of the consumer, must not be {@literal null} or empty.
      * @return the consumer {@link Consumer} object.
      */
-    public static Consumer from(String group, String name) {
+    public static <K> Consumer<K> from(K group, K name) {
 
-        LettuceAssert.notEmpty(group, "Group must not be empty");
-        LettuceAssert.notEmpty(name, "Name must not be empty");
+        LettuceAssert.notNull(group, "Group must not be null");
+        LettuceAssert.notNull(name, "Name must not be null");
+
+        return new Consumer<>(group, name);
+    }
+
+    /**
+     * @return name of the group.
+     */
+    public K getGroup() {
+        return group;
+    }
+
+    /**
+     * @return name of the consumer.
+     */
+    public K getName() {
+        return name;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof Consumer))
+            return false;
+        Consumer<?> consumer = (Consumer<?>) o;
+        return Objects.equals(group, consumer.group) && Objects.equals(name, consumer.name);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(group, name);
+    }
 
-        return new Consumer(group, name);
+    @Override
+    public String toString() {
+        return String.format("%s:%s", group, name);
     }
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisStreamAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisStreamAsyncCommands.java
index d3ad7b3c53..8bd381f4de 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisStreamAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisStreamAsyncCommands.java
@@ -17,9 +17,9 @@
 
 import java.util.List;
 import java.util.Map;
+
 import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.Consumer;
-import com.lambdaworks.redis.RedisFuture;
+import com.lambdaworks.redis.XReadArgs.StreamOffset;
 
 /**
  * Asynchronous executed commands for Streams.
@@ -40,7 +40,7 @@ public interface RedisStreamAsyncCommands<K, V> {
      * @param messageIds message Ids to acknowledge.
      * @return simple-reply the lenght of acknowledged messages.
      */
-    RedisFuture<Long> xack(K key, String group, String... messageIds);
+    RedisFuture<Long> xack(K key, K group, String... messageIds);
 
     /**
      * Append a message to the stream {@code key}.
@@ -89,7 +89,7 @@ public interface RedisStreamAsyncCommands<K, V> {
      * @param args
      * @return simple-reply the {@link StreamMessage}
      */
-    RedisFuture<StreamMessage<K, V>> xclaim(K key, Consumer consumer, XClaimArgs args, String... messageIds);
+    RedisFuture<List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds);
 
     /**
      * Create a consumer group.
@@ -99,7 +99,7 @@ public interface RedisStreamAsyncCommands<K, V> {
      * @param offset read offset or {@literal $}.
      * @return simple-reply {@literal true} if successful.
      */
-    RedisFuture<String> xgroupCreate(K key, String group, String offset);
+    RedisFuture<String> xgroupCreate(K key, K group, String offset);
 
     /**
      * Delete a consumer from a consumer group.
@@ -108,7 +108,7 @@ public interface RedisStreamAsyncCommands<K, V> {
      * @param consumer consumer identified by group name and consumer key.
      * @return simple-reply the number of pending messages
      */
-    RedisFuture<String> xgroupDelconsumer(K key, Consumer consumer);
+    RedisFuture<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer);
 
     /**
      * Set the current {@code group} id.
@@ -118,7 +118,7 @@ public interface RedisStreamAsyncCommands<K, V> {
      * @param offset read offset or {@literal $}.
      * @return simple-reply the lenght of the stream.
      */
-    RedisFuture<String> xgroupSetid(K key, String group, String offset);
+    RedisFuture<Boolean> xgroupSetid(K key, K group, String offset);
 
     /**
      * Get the length of a steam.
@@ -129,22 +129,13 @@ public interface RedisStreamAsyncCommands<K, V> {
     RedisFuture<Long> xlen(K key);
 
     /**
-     * Read pending messages from a stream within a specific {@link Range}.
+     * Read pending messages from a stream for a {@code group}.
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
-     */
-    RedisFuture<List<StreamMessage<K, V>>> xpending(K key, String group);
-
-    /**
-     * Read pending messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param consumer consumer identified by group name and consumer key.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     * @return List&lt;Object&gt; array-reply list pending entries.
      */
-    RedisFuture<List<StreamMessage<K, V>>> xpending(K key, Consumer consumer);
+    RedisFuture<List<Object>> xpending(K key, K group);
 
     /**
      * Read pending messages from a stream within a specific {@link Range}.
@@ -153,20 +144,9 @@ public interface RedisStreamAsyncCommands<K, V> {
      * @param group name of the consumer group.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
-     */
-    RedisFuture<List<PendingEntry>> xpending(K key, String group, Range<String> range, Limit limit);
-
-    /**
-     * Read pending messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param consumer consumer identified by group name and consumer key.
-     * @param range must not be {@literal null}.
-     * @param limit must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     * @return List&lt;Object&gt; array-reply list with members of the resulting stream.
      */
-    RedisFuture<List<StreamMessage<K, V>>> xpending(K key, Consumer consumer, Range<String> range, Limit limit);
+    RedisFuture<List<Object>> xpending(K key, K group, Range<String> range, Limit limit);
 
     /**
      * Read messages from a stream within a specific {@link Range}.
@@ -207,38 +187,38 @@ public interface RedisStreamAsyncCommands<K, V> {
     RedisFuture<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range, Limit limit);
 
     /**
-     * Read messages from one or more {@link XReadArgs.StreamOffset}s.
+     * Read messages from one or more {@link StreamOffset}s.
      *
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    RedisFuture<List<StreamMessage<K, V>>> xread(XReadArgs.StreamOffset<K>... streams);
+    RedisFuture<List<StreamMessage<K, V>>> xread(StreamOffset<K>... streams);
 
     /**
-     * Read messages from one or more {@link XReadArgs.StreamOffset}s.
+     * Read messages from one or more {@link StreamOffset}s.
      *
      * @param args read arguments.
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    RedisFuture<List<StreamMessage<K, V>>> xread(XReadArgs args, XReadArgs.StreamOffset<K>... streams);
+    RedisFuture<List<StreamMessage<K, V>>> xread(XReadArgs args, StreamOffset<K>... streams);
 
     /**
-     * Read messages from one or more {@link XReadArgs.StreamOffset}s using a consumer group.
+     * Read messages from one or more {@link StreamOffset}s using a consumer group.
      *
      * @param consumer consumer/group.
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XReadArgs.StreamOffset<K>... streams);
+    RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, StreamOffset<K>... streams);
 
     /**
-     * Read messages from one or more {@link XReadArgs.StreamOffset}s using a consumer group.
+     * Read messages from one or more {@link StreamOffset}s using a consumer group.
      *
      * @param consumer consumer/group.
      * @param args read arguments.
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XReadArgs args, XReadArgs.StreamOffset<K>... streams);
+    RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, XReadArgs args, StreamOffset<K>... streams);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisStreamReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisStreamReactiveCommands.java
index 608a83fa3a..53ac5fa943 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisStreamReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisStreamReactiveCommands.java
@@ -16,10 +16,11 @@
 package com.lambdaworks.redis.api.rx;
 
 import java.util.Map;
+
+import rx.Observable;
+
 import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.Consumer;
 import com.lambdaworks.redis.XReadArgs.StreamOffset;
-import rx.Observable;
 
 /**
  * Observable commands for Streams.
@@ -40,7 +41,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param messageIds message Ids to acknowledge.
      * @return simple-reply the lenght of acknowledged messages.
      */
-    Observable<Long> xack(K key, String group, String... messageIds);
+    Observable<Long> xack(K key, K group, String... messageIds);
 
     /**
      * Append a message to the stream {@code key}.
@@ -89,7 +90,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param args
      * @return simple-reply the {@link StreamMessage}
      */
-    Observable<StreamMessage<K, V>> xclaim(K key, Consumer consumer, XClaimArgs args, String... messageIds);
+    Observable<StreamMessage<K, V>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds);
 
     /**
      * Create a consumer group.
@@ -99,7 +100,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param offset read offset or {@literal $}.
      * @return simple-reply {@literal true} if successful.
      */
-    Observable<Boolean> xgroupCreate(K key, String group, String offset);
+    Observable<String> xgroupCreate(K key, K group, String offset);
 
     /**
      * Delete a consumer from a consumer group.
@@ -108,7 +109,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param consumer consumer identified by group name and consumer key.
      * @return simple-reply the number of pending messages
      */
-    Observable<Boolean> xgroupDelconsumer(K key, Consumer consumer);
+    Observable<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer);
 
     /**
      * Set the current {@code group} id.
@@ -118,7 +119,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param offset read offset or {@literal $}.
      * @return simple-reply the lenght of the stream.
      */
-    Observable<Boolean> xgroupSetid(K key, String group, String offset);
+    Observable<Boolean> xgroupSetid(K key, K group, String offset);
 
     /**
      * Get the length of a steam.
@@ -129,22 +130,13 @@ public interface RedisStreamReactiveCommands<K, V> {
     Observable<Long> xlen(K key);
 
     /**
-     * Read pending messages from a stream within a specific {@link Range}.
+     * Read pending messages from a stream for a {@code group}.
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @return StreamMessage array-reply list with members of the resulting stream.
-     */
-    Observable<StreamMessage<K, V>> xpending(K key, String group);
-
-    /**
-     * Read pending messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param consumer consumer identified by group name and consumer key.
-     * @return StreamMessage array-reply list with members of the resulting stream.
+     * @return Object array-reply list pending entries.
      */
-    Observable<StreamMessage<K, V>> xpending(K key, Consumer consumer);
+    Observable<Object> xpending(K key, K group);
 
     /**
      * Read pending messages from a stream within a specific {@link Range}.
@@ -153,20 +145,9 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param group name of the consumer group.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
-     * @return StreamMessage array-reply list with members of the resulting stream.
+     * @return Object array-reply list with members of the resulting stream.
      */
-    Observable<StreamMessage<K, V>> xpending(K key, String group, Range<String> range, Limit limit);
-
-    /**
-     * Read pending messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param consumer consumer identified by group name and consumer key.
-     * @param range must not be {@literal null}.
-     * @param limit must not be {@literal null}.
-     * @return StreamMessage array-reply list with members of the resulting stream.
-     */
-    Observable<StreamMessage<K, V>> xpending(K key, Consumer consumer, Range<String> range, Limit limit);
+    Observable<Object> xpending(K key, K group, Range<String> range, Limit limit);
 
     /**
      * Read messages from a stream within a specific {@link Range}.
@@ -215,7 +196,7 @@ public interface RedisStreamReactiveCommands<K, V> {
     Observable<StreamMessage<K, V>> xread(StreamOffset<K>... streams);
 
     /**
-     * Read messages from one or more {@link XReadArgs.StreamOffset}s.
+     * Read messages from one or more {@link StreamOffset}s.
      *
      * @param args read arguments.
      * @param streams the streams to read from.
@@ -224,13 +205,13 @@ public interface RedisStreamReactiveCommands<K, V> {
     Observable<StreamMessage<K, V>> xread(XReadArgs args, StreamOffset<K>... streams);
 
     /**
-     * Read messages from one or more {@link XReadArgs.StreamOffset}s using a consumer group.
+     * Read messages from one or more {@link StreamOffset}s using a consumer group.
      *
      * @param consumer consumer/group.
      * @param streams the streams to read from.
      * @return StreamMessage array-reply list with members of the resulting stream.
      */
-    Observable<StreamMessage<K, V>> xreadgroup(Consumer consumer, StreamOffset<K>... streams);
+    Observable<StreamMessage<K, V>> xreadgroup(Consumer<K> consumer, StreamOffset<K>... streams);
 
     /**
      * Read messages from one or more {@link StreamOffset}s using a consumer group.
@@ -240,5 +221,5 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param streams the streams to read from.
      * @return StreamMessage array-reply list with members of the resulting stream.
      */
-    Observable<StreamMessage<K, V>> xreadgroup(Consumer consumer, XReadArgs args, XReadArgs.StreamOffset<K>... streams);
+    Observable<StreamMessage<K, V>> xreadgroup(Consumer<K> consumer, XReadArgs args, StreamOffset<K>... streams);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisStreamCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisStreamCommands.java
index e6d8a0adc3..3a1e99a531 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisStreamCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisStreamCommands.java
@@ -17,8 +17,8 @@
 
 import java.util.List;
 import java.util.Map;
+
 import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.Consumer;
 import com.lambdaworks.redis.XReadArgs.StreamOffset;
 
 /**
@@ -40,7 +40,7 @@ public interface RedisStreamCommands<K, V> {
      * @param messageIds message Ids to acknowledge.
      * @return simple-reply the lenght of acknowledged messages.
      */
-    Long xack(K key, String group, String... messageIds);
+    Long xack(K key, K group, String... messageIds);
 
     /**
      * Append a message to the stream {@code key}.
@@ -89,7 +89,7 @@ public interface RedisStreamCommands<K, V> {
      * @param args
      * @return simple-reply the {@link StreamMessage}
      */
-    StreamMessage<K, V> xclaim(K key, Consumer consumer, XClaimArgs args, String... messageIds);
+    List<StreamMessage<K, V>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds);
 
     /**
      * Create a consumer group.
@@ -99,7 +99,7 @@ public interface RedisStreamCommands<K, V> {
      * @param offset read offset or {@literal $}.
      * @return simple-reply {@literal true} if successful.
      */
-    String xgroupCreate(K key, String group, String offset);
+    String xgroupCreate(K key, K group, String offset);
 
     /**
      * Delete a consumer from a consumer group.
@@ -108,7 +108,7 @@ public interface RedisStreamCommands<K, V> {
      * @param consumer consumer identified by group name and consumer key.
      * @return simple-reply the number of pending messages
      */
-    String xgroupDelconsumer(K key, Consumer consumer);
+    Boolean xgroupDelconsumer(K key, Consumer<K> consumer);
 
     /**
      * Set the current {@code group} id.
@@ -118,7 +118,7 @@ public interface RedisStreamCommands<K, V> {
      * @param offset read offset or {@literal $}.
      * @return simple-reply the lenght of the stream.
      */
-    String xgroupSetid(K key, String group, String offset);
+    Boolean xgroupSetid(K key, K group, String offset);
 
     /**
      * Get the length of a steam.
@@ -129,22 +129,13 @@ public interface RedisStreamCommands<K, V> {
     Long xlen(K key);
 
     /**
-     * Read pending messages from a stream within a specific {@link Range}.
+     * Read pending messages from a stream for a {@code group}.
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
-     */
-    List<StreamMessage<K, V>> xpending(K key, String group);
-
-    /**
-     * Read pending messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param consumer consumer identified by group name and consumer key.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     * @return List&lt;Object&gt; array-reply list pending entries.
      */
-    List<StreamMessage<K, V>> xpending(K key, Consumer consumer);
+    List<Object> xpending(K key, K group);
 
     /**
      * Read pending messages from a stream within a specific {@link Range}.
@@ -153,20 +144,9 @@ public interface RedisStreamCommands<K, V> {
      * @param group name of the consumer group.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
-     */
-    List<PendingEntry> xpending(K key, String group, Range<String> range, Limit limit);
-
-    /**
-     * Read pending messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param consumer consumer identified by group name and consumer key.
-     * @param range must not be {@literal null}.
-     * @param limit must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     * @return List&lt;Object&gt; array-reply list with members of the resulting stream.
      */
-    List<PendingEntry> xpending(K key, Consumer consumer, Range<String> range, Limit limit);
+    List<Object> xpending(K key, K group, Range<String> range, Limit limit);
 
     /**
      * Read messages from a stream within a specific {@link Range}.
@@ -212,7 +192,7 @@ public interface RedisStreamCommands<K, V> {
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    List<StreamMessage<K, V>> xread(XReadArgs.StreamOffset<K>... streams);
+    List<StreamMessage<K, V>> xread(StreamOffset<K>... streams);
 
     /**
      * Read messages from one or more {@link StreamOffset}s.
@@ -230,7 +210,7 @@ public interface RedisStreamCommands<K, V> {
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    List<StreamMessage<K, V>> xreadgroup(Consumer consumer, XReadArgs.StreamOffset<K>... streams);
+    List<StreamMessage<K, V>> xreadgroup(Consumer<K> consumer, StreamOffset<K>... streams);
 
     /**
      * Read messages from one or more {@link StreamOffset}s using a consumer group.
@@ -240,5 +220,5 @@ public interface RedisStreamCommands<K, V> {
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    List<StreamMessage<K, V>> xreadgroup(Consumer consumer, XReadArgs args, StreamOffset<K>... streams);
+    List<StreamMessage<K, V>> xreadgroup(Consumer<K> consumer, XReadArgs args, StreamOffset<K>... streams);
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStreamAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStreamAsyncCommands.java
index 1a92ce7fbf..a061f40785 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStreamAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStreamAsyncCommands.java
@@ -17,8 +17,8 @@
 
 import java.util.List;
 import java.util.Map;
+
 import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.Consumer;
 import com.lambdaworks.redis.XReadArgs.StreamOffset;
 
 /**
@@ -40,7 +40,7 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      * @param messageIds message Ids to acknowledge.
      * @return simple-reply the lenght of acknowledged messages.
      */
-    AsyncExecutions<Long> xack(K key, String group, String... messageIds);
+    AsyncExecutions<Long> xack(K key, K group, String... messageIds);
 
     /**
      * Append a message to the stream {@code key}.
@@ -89,7 +89,7 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      * @param args
      * @return simple-reply the {@link StreamMessage}
      */
-    AsyncExecutions<StreamMessage<K, V>> xclaim(K key, Consumer consumer, XClaimArgs args, String... messageIds);
+    AsyncExecutions<List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds);
 
     /**
      * Create a consumer group.
@@ -99,7 +99,7 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      * @param offset read offset or {@literal $}.
      * @return simple-reply {@literal true} if successful.
      */
-    AsyncExecutions<Boolean> xgroupCreate(K key, String group, String offset);
+    AsyncExecutions<String> xgroupCreate(K key, K group, String offset);
 
     /**
      * Delete a consumer from a consumer group.
@@ -108,7 +108,7 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      * @param consumer consumer identified by group name and consumer key.
      * @return simple-reply the number of pending messages
      */
-    AsyncExecutions<Boolean> xgroupDelconsumer(K key, Consumer consumer);
+    AsyncExecutions<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer);
 
     /**
      * Set the current {@code group} id.
@@ -118,7 +118,7 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      * @param offset read offset or {@literal $}.
      * @return simple-reply the lenght of the stream.
      */
-    AsyncExecutions<Boolean> xgroupSetid(K key, String group, String offset);
+    AsyncExecutions<Boolean> xgroupSetid(K key, K group, String offset);
 
     /**
      * Get the length of a steam.
@@ -129,22 +129,13 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
     AsyncExecutions<Long> xlen(K key);
 
     /**
-     * Read pending messages from a stream within a specific {@link Range}.
+     * Read pending messages from a stream for a {@code group}.
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
-     */
-    AsyncExecutions<List<StreamMessage<K, V>>> xpending(K key, String group);
-
-    /**
-     * Read pending messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param consumer consumer identified by group name and consumer key.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     * @return List&lt;Object&gt; array-reply list pending entries.
      */
-    AsyncExecutions<List<StreamMessage<K, V>>> xpending(K key, Consumer consumer);
+    AsyncExecutions<List<Object>> xpending(K key, K group);
 
     /**
      * Read pending messages from a stream within a specific {@link Range}.
@@ -153,20 +144,9 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      * @param group name of the consumer group.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
-     */
-    AsyncExecutions<List<StreamMessage<K, V>>> xpending(K key, String group, Range<String> range, Limit limit);
-
-    /**
-     * Read pending messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param consumer consumer identified by group name and consumer key.
-     * @param range must not be {@literal null}.
-     * @param limit must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     * @return List&lt;Object&gt; array-reply list with members of the resulting stream.
      */
-    AsyncExecutions<List<StreamMessage<K, V>>> xpending(K key, Consumer consumer, Range<String> range, Limit limit);
+    AsyncExecutions<List<Object>> xpending(K key, K group, Range<String> range, Limit limit);
 
     /**
      * Read messages from a stream within a specific {@link Range}.
@@ -207,21 +187,21 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
     AsyncExecutions<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range, Limit limit);
 
     /**
-     * Read messages from one or more {@link XReadArgs.StreamOffset}s.
+     * Read messages from one or more {@link StreamOffset}s.
      *
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    AsyncExecutions<List<StreamMessage<K, V>>> xread(XReadArgs.StreamOffset<K>... streams);
+    AsyncExecutions<List<StreamMessage<K, V>>> xread(StreamOffset<K>... streams);
 
     /**
-     * Read messages from one or more {@link XReadArgs.StreamOffset}s.
+     * Read messages from one or more {@link StreamOffset}s.
      *
      * @param args read arguments.
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    AsyncExecutions<List<StreamMessage<K, V>>> xread(XReadArgs args, XReadArgs.StreamOffset<K>... streams);
+    AsyncExecutions<List<StreamMessage<K, V>>> xread(XReadArgs args, StreamOffset<K>... streams);
 
     /**
      * Read messages from one or more {@link StreamOffset}s using a consumer group.
@@ -230,7 +210,7 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    AsyncExecutions<List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, StreamOffset<K>... streams);
+    AsyncExecutions<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, StreamOffset<K>... streams);
 
     /**
      * Read messages from one or more {@link StreamOffset}s using a consumer group.
@@ -240,6 +220,5 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    AsyncExecutions<List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XReadArgs args,
-            XReadArgs.StreamOffset<K>... streams);
+    AsyncExecutions<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, XReadArgs args, StreamOffset<K>... streams);
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStreamCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStreamCommands.java
index b2f33a046d..7f4ba1c030 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStreamCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStreamCommands.java
@@ -17,8 +17,8 @@
 
 import java.util.List;
 import java.util.Map;
+
 import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.Consumer;
 import com.lambdaworks.redis.XReadArgs.StreamOffset;
 
 /**
@@ -40,7 +40,7 @@ public interface NodeSelectionStreamCommands<K, V> {
      * @param messageIds message Ids to acknowledge.
      * @return simple-reply the lenght of acknowledged messages.
      */
-    Executions<Long> xack(K key, String group, String... messageIds);
+    Executions<Long> xack(K key, K group, String... messageIds);
 
     /**
      * Append a message to the stream {@code key}.
@@ -89,7 +89,7 @@ public interface NodeSelectionStreamCommands<K, V> {
      * @param args
      * @return simple-reply the {@link StreamMessage}
      */
-    Executions<StreamMessage<K, V>> xclaim(K key, Consumer consumer, XClaimArgs args, String... messageIds);
+    Executions<List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds);
 
     /**
      * Create a consumer group.
@@ -99,7 +99,7 @@ public interface NodeSelectionStreamCommands<K, V> {
      * @param offset read offset or {@literal $}.
      * @return simple-reply {@literal true} if successful.
      */
-    Executions<Boolean> xgroupCreate(K key, String group, String offset);
+    Executions<String> xgroupCreate(K key, K group, String offset);
 
     /**
      * Delete a consumer from a consumer group.
@@ -108,7 +108,7 @@ public interface NodeSelectionStreamCommands<K, V> {
      * @param consumer consumer identified by group name and consumer key.
      * @return simple-reply the number of pending messages
      */
-    Executions<Boolean> xgroupDelconsumer(K key, Consumer consumer);
+    Executions<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer);
 
     /**
      * Set the current {@code group} id.
@@ -118,7 +118,7 @@ public interface NodeSelectionStreamCommands<K, V> {
      * @param offset read offset or {@literal $}.
      * @return simple-reply the lenght of the stream.
      */
-    Executions<Boolean> xgroupSetid(K key, String group, String offset);
+    Executions<Boolean> xgroupSetid(K key, K group, String offset);
 
     /**
      * Get the length of a steam.
@@ -129,22 +129,13 @@ public interface NodeSelectionStreamCommands<K, V> {
     Executions<Long> xlen(K key);
 
     /**
-     * Read pending messages from a stream within a specific {@link Range}.
+     * Read pending messages from a stream for a {@code group}.
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
-     */
-    Executions<List<StreamMessage<K, V>>> xpending(K key, String group);
-
-    /**
-     * Read pending messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param consumer consumer identified by group name and consumer key.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     * @return List&lt;Object&gt; array-reply list pending entries.
      */
-    Executions<List<StreamMessage<K, V>>> xpending(K key, Consumer consumer);
+    Executions<List<Object>> xpending(K key, K group);
 
     /**
      * Read pending messages from a stream within a specific {@link Range}.
@@ -153,20 +144,9 @@ public interface NodeSelectionStreamCommands<K, V> {
      * @param group name of the consumer group.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
-     */
-    Executions<List<StreamMessage<K, V>>> xpending(K key, String group, Range<String> range, Limit limit);
-
-    /**
-     * Read pending messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param consumer consumer identified by group name and consumer key.
-     * @param range must not be {@literal null}.
-     * @param limit must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     * @return List&lt;Object&gt; array-reply list with members of the resulting stream.
      */
-    Executions<List<StreamMessage<K, V>>> xpending(K key, Consumer consumer, Range<String> range, Limit limit);
+    Executions<List<Object>> xpending(K key, K group, Range<String> range, Limit limit);
 
     /**
      * Read messages from a stream within a specific {@link Range}.
@@ -215,13 +195,13 @@ public interface NodeSelectionStreamCommands<K, V> {
     Executions<List<StreamMessage<K, V>>> xread(StreamOffset<K>... streams);
 
     /**
-     * Read messages from one or more {@link XReadArgs.StreamOffset}s.
+     * Read messages from one or more {@link StreamOffset}s.
      *
      * @param args read arguments.
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    Executions<List<StreamMessage<K, V>>> xread(XReadArgs args, XReadArgs.StreamOffset<K>... streams);
+    Executions<List<StreamMessage<K, V>>> xread(XReadArgs args, StreamOffset<K>... streams);
 
     /**
      * Read messages from one or more {@link StreamOffset}s using a consumer group.
@@ -230,15 +210,15 @@ public interface NodeSelectionStreamCommands<K, V> {
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    Executions<List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XReadArgs.StreamOffset<K>... streams);
+    Executions<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, StreamOffset<K>... streams);
 
     /**
-     * Read messages from one or more {@link XReadArgs.StreamOffset}s using a consumer group.
+     * Read messages from one or more {@link StreamOffset}s using a consumer group.
      *
      * @param consumer consumer/group.
      * @param args read arguments.
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    Executions<List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XReadArgs args, StreamOffset<K>... streams);
+    Executions<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, XReadArgs args, StreamOffset<K>... streams);
 }
diff --git a/src/main/java/com/lambdaworks/redis/PendingEntry.java b/src/main/java/com/lambdaworks/redis/models/stream/PendingEntry.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/PendingEntry.java
rename to src/main/java/com/lambdaworks/redis/models/stream/PendingEntry.java
index 597684c4ba..6067c5af0d 100644
--- a/src/main/java/com/lambdaworks/redis/PendingEntry.java
+++ b/src/main/java/com/lambdaworks/redis/models/stream/PendingEntry.java
@@ -13,10 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package com.lambdaworks.redis.models.stream;
 
 /**
+ * Value object representing an entry of the Pending Entry List retrieved via {@literal XPENDING}.
+ *
  * @author Mark Paluch
+ * @since 4.5
  */
 public class PendingEntry {
 
diff --git a/src/main/java/com/lambdaworks/redis/models/stream/PendingMessage.java b/src/main/java/com/lambdaworks/redis/models/stream/PendingMessage.java
new file mode 100644
index 0000000000..56bd88009e
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/models/stream/PendingMessage.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.models.stream;
+
+import java.time.Duration;
+
+/**
+ * Value object representing a pending message reported through XPENDING with range/limit.
+ *
+ * @author Mark Paluch
+ * @since 4.5
+ */
+public class PendingMessage {
+
+    private final String id;
+    private final String consumer;
+    private final long msSinceLastDelivery;
+    private final long redeliveryCount;
+
+    public PendingMessage(String id, String consumer, long msSinceLastDelivery, long redeliveryCount) {
+
+        this.id = id;
+        this.consumer = consumer;
+        this.msSinceLastDelivery = msSinceLastDelivery;
+        this.redeliveryCount = redeliveryCount;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getConsumer() {
+        return consumer;
+    }
+
+    public long getMsSinceLastDelivery() {
+        return msSinceLastDelivery;
+    }
+
+    public Duration getSinceLastDelivery() {
+        return Duration.ofMillis(getMsSinceLastDelivery());
+    }
+
+    public long getRedeliveryCount() {
+        return redeliveryCount;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/models/stream/PendingMessages.java b/src/main/java/com/lambdaworks/redis/models/stream/PendingMessages.java
new file mode 100644
index 0000000000..361415e713
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/models/stream/PendingMessages.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.models.stream;
+
+import java.util.Map;
+
+import com.lambdaworks.redis.Range;
+
+/**
+ * @author Mark Paluch
+ */
+public class PendingMessages {
+
+    private final long count;
+    private final Range<String> messageIds;
+    private final Map<String, Long> consumerMessageCount;
+
+    public PendingMessages(long count, Range<String> messageIds, Map<String, Long> consumerMessageCount) {
+        this.count = count;
+        this.messageIds = messageIds;
+        this.consumerMessageCount = consumerMessageCount;
+    }
+
+    public long getCount() {
+        return count;
+    }
+
+    public Range<String> getMessageIds() {
+        return messageIds;
+    }
+
+    public Map<String, Long> getConsumerMessageCount() {
+        return consumerMessageCount;
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/models/stream/PendingParser.java b/src/main/java/com/lambdaworks/redis/models/stream/PendingParser.java
new file mode 100644
index 0000000000..d253bee5a4
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/models/stream/PendingParser.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.models.stream;
+
+import java.util.*;
+
+import com.lambdaworks.redis.Range;
+import com.lambdaworks.redis.internal.LettuceAssert;
+
+/**
+ * Parser for redis <a href="http://redis.io/commands/xpending">XPENDING</a> command output.
+ *
+ * @author Mark Paluch
+ * @since 4.5
+ */
+public class PendingParser {
+
+    /**
+     * Utility constructor.
+     */
+    private PendingParser() {
+    }
+
+    /**
+     * Parse the output of the Redis {@literal XPENDING} command with {@link com.lambdaworks.redis.Range}.
+     *
+     * @param xpendingOutput output of the Redis {@literal XPENDING}.
+     * @return list of {@link PendingMessage}s.
+     */
+    @SuppressWarnings("unchecked")
+    public static List<PendingMessage> parseRange(List<?> xpendingOutput) {
+
+        LettuceAssert.notNull(xpendingOutput, "XPENDING output must not be null");
+
+        List<PendingMessage> result = new ArrayList<>();
+
+        for (Object element : xpendingOutput) {
+
+            LettuceAssert.isTrue(element instanceof List, "Output elements must be a List");
+
+            List<Object> message = (List) element;
+
+            String messageId = (String) message.get(0);
+            String consumer = (String) message.get(1);
+            Long msSinceLastDelivery = (Long) message.get(2);
+            Long deliveryCount = (Long) message.get(3);
+
+            result.add(new PendingMessage(messageId, consumer, msSinceLastDelivery, deliveryCount));
+        }
+
+        return result;
+    }
+
+    /**
+     * Parse the output of the Redis {@literal XPENDING} reporting a summary on pending messages.
+     *
+     * @param xpendingOutput output of the Redis {@literal XPENDING}.
+     * @return {@link PendingMessages}.
+     */
+    @SuppressWarnings("unchecked")
+    public static PendingMessages parse(List<?> xpendingOutput) {
+
+        LettuceAssert.notNull(xpendingOutput, "XPENDING output must not be null");
+        LettuceAssert.isTrue(xpendingOutput.size() == 4, "XPENDING output must have exactly four output elements");
+
+        Long count = (Long) xpendingOutput.get(0);
+        String from = (String) xpendingOutput.get(1);
+        String to = (String) xpendingOutput.get(2);
+
+        Range<String> messageIdRange = Range.create(from, to);
+
+        Collection<Object> consumerMessageCounts = (Collection) xpendingOutput.get(3);
+
+        Map<String, Long> counts = new LinkedHashMap<>();
+
+        for (Object element : consumerMessageCounts) {
+
+            LettuceAssert.isTrue(element instanceof List, "Consumer message counts must be a List");
+            List<Object> messageCount = (List) element;
+
+            counts.put((String) messageCount.get(0), (Long) messageCount.get(1));
+        }
+
+        return new PendingMessages(count, messageIdRange, Collections.unmodifiableMap(counts));
+    }
+}
diff --git a/src/main/java/com/lambdaworks/redis/models/stream/package-info.java b/src/main/java/com/lambdaworks/redis/models/stream/package-info.java
new file mode 100644
index 0000000000..190ac27af3
--- /dev/null
+++ b/src/main/java/com/lambdaworks/redis/models/stream/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Model and parser for the Stream-related command output such as {@literal XPENDING}.
+ */
+package com.lambdaworks.redis.models.stream;
+
diff --git a/src/main/java/com/lambdaworks/redis/output/PendingEntryListOutput.java b/src/main/java/com/lambdaworks/redis/output/PendingEntryListOutput.java
deleted file mode 100644
index d288cfceb1..0000000000
--- a/src/main/java/com/lambdaworks/redis/output/PendingEntryListOutput.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.lambdaworks.redis.output;
-
-import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.List;
-
-import com.lambdaworks.redis.PendingEntry;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
-
-/**
- * {@link List} of {@link PendingEntry} output to be used with XPENDING with key and group.
- *
- * @param <K> Key type.
- * @param <V> Value type.
- * @author Mark Paluch
- * @since 4.5
- */
-public class PendingEntryListOutput<K, V> extends CommandOutput<K, V, List<PendingEntry>> implements
-        StreamingOutput<PendingEntry> {
-
-    private boolean initialized;
-    private Subscriber<PendingEntry> subscriber;
-
-    private String messageId;
-    private String consumer;
-    private Long millisSinceDelivery;
-
-    public PendingEntryListOutput(RedisCodec<K, V> codec) {
-        super(codec, Collections.emptyList());
-        setSubscriber(ListSubscriber.instance());
-    }
-
-    @Override
-    public void set(ByteBuffer bytes) {
-
-        if (messageId == null) {
-            messageId = StringCodec.UTF8.decodeKey(bytes);
-            return;
-        }
-
-        if (consumer == null) {
-            consumer = StringCodec.UTF8.decodeKey(bytes);
-            return;
-        }
-
-    }
-
-    @Override
-    public void set(long integer) {
-
-        if (millisSinceDelivery == null) {
-            millisSinceDelivery = integer;
-            return;
-        }
-
-        subscriber.onNext(output, new PendingEntry(messageId, consumer, millisSinceDelivery, integer));
-        messageId = null;
-        consumer = null;
-        millisSinceDelivery = null;
-    }
-
-    @Override
-    public void multi(int count) {
-
-        if (!initialized) {
-            output = OutputFactory.newList(count);
-            initialized = true;
-        }
-    }
-
-    @Override
-    public void setSubscriber(Subscriber<PendingEntry> subscriber) {
-        LettuceAssert.notNull(subscriber, "Subscriber must not be null");
-        this.subscriber = subscriber;
-    }
-
-    @Override
-    public Subscriber<PendingEntry> getSubscriber() {
-        return subscriber;
-    }
-}
diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 8fc6d2d510..2c69e20f61 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1520,57 +1520,47 @@ public RedisFuture<List<StreamMessage<K, V>>> xread(XReadArgs args, XReadArgs.St
     }
 
     @Override
-    public RedisFuture<Long> xack(K key, String group, String... messageIds) {
-        return null;
+    public RedisFuture<Long> xack(K key, K group, String... messageIds) {
+        return dispatch(commandBuilder.xack(key, group, messageIds));
     }
 
     @Override
-    public RedisFuture<StreamMessage<K, V>> xclaim(K key, Consumer consumer, XClaimArgs args, String... messageIds) {
+    public RedisFuture<List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds) {
         return null;
     }
 
     @Override
-    public RedisFuture<String> xgroupCreate(K key, String group, String offset) {
+    public RedisFuture<String> xgroupCreate(K key, K group, String offset) {
         return dispatch(commandBuilder.xgroupCreate(key, group, offset));
     }
 
     @Override
-    public RedisFuture<String> xgroupDelconsumer(K key, Consumer consumer) {
-        return null;
-    }
-
-    @Override
-    public RedisFuture<String> xgroupSetid(K key, String group, String offset) {
+    public RedisFuture<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer) {
         return null;
     }
 
     @Override
-    public RedisFuture<List<StreamMessage<K, V>>> xpending(K key, String group) {
+    public RedisFuture<Boolean> xgroupSetid(K key, K group, String offset) {
         return null;
     }
 
     @Override
-    public RedisFuture<List<StreamMessage<K, V>>> xpending(K key, Consumer consumer) {
-        return null;
+    public RedisFuture<List<Object>> xpending(K key, K group) {
+        return dispatch(commandBuilder.xpending(key, group, Range.unbounded(), Limit.unlimited()));
     }
 
     @Override
-    public RedisFuture<List<PendingEntry>> xpending(K key, String group, Range<String> range, Limit limit) {
+    public RedisFuture<List<Object>> xpending(K key, K group, Range<String> range, Limit limit) {
         return dispatch(commandBuilder.xpending(key, group, range, limit));
     }
 
     @Override
-    public RedisFuture<List<StreamMessage<K, V>>> xpending(K key, Consumer consumer, Range<String> range, Limit limit) {
-        return null;
-    }
-
-    @Override
-    public RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XReadArgs.StreamOffset<K>... streams) {
+    public RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, XReadArgs.StreamOffset<K>... streams) {
         return dispatch(commandBuilder.xreadgroup(consumer, streams, null));
     }
 
     @Override
-    public RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XReadArgs args,
+    public RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, XReadArgs args,
             XReadArgs.StreamOffset<K>... streams) {
         return dispatch(commandBuilder.xreadgroup(consumer, streams, args));
     }
diff --git a/src/main/java/io/lettuce/core/Range.java b/src/main/java/io/lettuce/core/Range.java
index efdd33895f..991545f522 100644
--- a/src/main/java/io/lettuce/core/Range.java
+++ b/src/main/java/io/lettuce/core/Range.java
@@ -15,6 +15,8 @@
  */
 package io.lettuce.core;
 
+import java.util.Objects;
+
 import io.lettuce.core.internal.LettuceAssert;
 
 /**
@@ -138,6 +140,21 @@ public Boundary<T> getUpper() {
         return upper;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof Range))
+            return false;
+        Range<?> range = (Range<?>) o;
+        return Objects.equals(lower, range.lower) && Objects.equals(upper, range.upper);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(lower, upper);
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -216,6 +233,21 @@ public boolean isIncluding() {
             return including;
         }
 
+        @Override
+        public boolean equals(Object o) {
+            if (this == o)
+                return true;
+            if (!(o instanceof Boundary))
+                return false;
+            Boundary<?> boundary = (Boundary<?>) o;
+            return including == boundary.including && Objects.equals(value, boundary.value);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(value, including);
+        }
+
         @Override
         public String toString() {
 
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 4d7d515479..6a264748f9 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -2037,6 +2037,21 @@ Command<K, V, String> watch(K... keys) {
         return createCommand(WATCH, new StatusOutput<>(codec), args);
     }
 
+    public Command<K, V, Long> xack(K key, K group, String[] messageIds) {
+        notNullKey(key);
+        LettuceAssert.notNull(group, "Group " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(messageIds, "MessageIds " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.noNullElements(messageIds, "MessageIds " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKey(group);
+
+        for (String messageId : messageIds) {
+            args.add(messageId);
+        }
+
+        return createCommand(XACK, new IntegerOutput<>(codec), args);
+    }
+
     public Command<K, V, String> xadd(K key, XAddArgs xAddArgs, Map<K, V> map) {
         notNullKey(key);
         LettuceAssert.notNull(map, "Message body " + MUST_NOT_BE_NULL);
@@ -2078,12 +2093,12 @@ public Command<K, V, String> xadd(K key, XAddArgs xAddArgs, Object[] body) {
         return createCommand(XADD, new StatusOutput<>(codec), args);
     }
 
-    public Command<K, V, String> xgroupCreate(K key, String group, String id) {
+    public Command<K, V, String> xgroupCreate(K key, K group, String id) {
         notNullKey(key);
-        LettuceAssert.notEmpty(group, "Group " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.notNull(group, "Group " + MUST_NOT_BE_EMPTY);
         LettuceAssert.notEmpty(id, "Id " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<>(codec).add(CREATE).addKey(key).add(group).add(id);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(CREATE).addKey(key).addKey(group).add(id);
 
         return createCommand(XGROUP, new StatusOutput<>(codec), args);
     }
@@ -2096,21 +2111,25 @@ public Command<K, V, Long> xlen(K key) {
         return createCommand(XLEN, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, List<PendingEntry>> xpending(K key, String group, Range<String> range, Limit limit) {
+    public Command<K, V, List<Object>> xpending(K key, K group, Range<String> range, Limit limit) {
         notNullKey(key);
+        LettuceAssert.notNull(group, "Group " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(range, "Range " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(limit, "Limit " + MUST_NOT_BE_NULL);
-        LettuceAssert.notNull(group, "Group " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(group);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKey(group);
 
-        args.add(getLowerValue(range)).add(getUpperValue(range));
+        if (limit.isLimited() || !range.getLower().equals(Boundary.unbounded())
+                || !range.getUpper().equals(Boundary.unbounded())) {
+            args.add(getLowerValue(range)).add(getUpperValue(range));
 
-        if (limit.isLimited()) {
+            if (!limit.isLimited()) {
+                throw new IllegalArgumentException("Limit must be set using Range queries with XPENDING");
+            }
             args.add(limit.getCount());
         }
 
-        return createCommand(XPENDING, new PendingEntryListOutput<>(codec), args);
+        return createCommand(XPENDING, new NestedMultiOutput(codec), args);
     }
 
     public Command<K, V, List<StreamMessage<K, V>>> xrange(K key, Range<String> range, Limit limit) {
@@ -2186,7 +2205,7 @@ public Command<K, V, List<StreamMessage<K, V>>> xread(StreamOffset<K>[] streams,
         return createCommand(XREAD, new StreamReadOutput<>(codec), args);
     }
 
-    public Command<K, V, List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XReadArgs.StreamOffset<K>[] streams,
+    public Command<K, V, List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, XReadArgs.StreamOffset<K>[] streams,
             XReadArgs xReadArgs) {
         LettuceAssert.notNull(streams, "Streams " + MUST_NOT_BE_NULL);
         LettuceAssert.isTrue(streams.length > 0, "Streams " + MUST_NOT_BE_EMPTY);
@@ -2194,7 +2213,7 @@ public Command<K, V, List<StreamMessage<K, V>>> xreadgroup(Consumer consumer, XR
 
         CommandArgs<K, V> args = new CommandArgs<>(codec);
 
-        args.add("GROUP").add(consumer.group).add(consumer.name);
+        args.add("GROUP").addKeys(consumer.group).addKeys(consumer.name);
 
         if (xReadArgs != null) {
             xReadArgs.build(args);
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
index fc06339a97..91d0a5a300 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
@@ -188,11 +188,15 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Make the server crash: Out of memory.
+     *
+     * @return nothing, because the server crashes before returning.
      */
     void debugOom();
 
     /**
      * Make the server crash: Invalid pointer access.
+     *
+     * @return nothing, because the server crashes before returning.
      */
     void debugSegfault();
 
diff --git a/src/main/java/io/lettuce/core/output/CommandOutput.java b/src/main/java/io/lettuce/core/output/CommandOutput.java
index 3265a04565..f8092c16fb 100644
--- a/src/main/java/io/lettuce/core/output/CommandOutput.java
+++ b/src/main/java/io/lettuce/core/output/CommandOutput.java
@@ -65,6 +65,16 @@ public void set(ByteBuffer bytes) {
         throw new IllegalStateException();
     }
 
+    /**
+     * Set the command output to a sequence of bytes, or null representing a simple string. Concrete {@link CommandOutput}
+     * implementations can override this method unless they only receive an integer value which cannot be null.
+     *
+     * @param bytes The command output, or null.
+     */
+    public void setSingle(ByteBuffer bytes) {
+        set(bytes);
+    }
+
     /**
      * Set the command output to a 64-bit signed integer. Concrete {@link CommandOutput} implementations must override this
      * method unless they only receive a byte array value.
diff --git a/src/main/java/io/lettuce/core/output/NestedMultiOutput.java b/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
index cc77640882..638cdb1a50 100644
--- a/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
@@ -22,14 +22,16 @@
 import java.util.List;
 
 import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.LettuceFactories;
 
 /**
- * {@link List} of command outputs, possibly deeply nested.
+ * {@link List} of command outputs, possibly deeply nested. Decodes simple strings through {@link StringCodec#UTF8}.
  *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public class NestedMultiOutput<K, V> extends CommandOutput<K, V, List<Object>> {
 
@@ -63,6 +65,16 @@ public void set(ByteBuffer bytes) {
         output.add(bytes == null ? null : codec.decodeValue(bytes));
     }
 
+    @Override
+    public void setSingle(ByteBuffer bytes) {
+
+        if (!initialized) {
+            output = new ArrayList<>();
+        }
+
+        output.add(bytes == null ? null : StringCodec.UTF8.decodeValue(bytes));
+    }
+
     @Override
     public void complete(int depth) {
         if (depth > 0 && depth < this.depth) {
diff --git a/src/main/java/io/lettuce/core/protocol/CommandType.java b/src/main/java/io/lettuce/core/protocol/CommandType.java
index dd1f9afb6c..42283edc94 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandType.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandType.java
@@ -84,7 +84,7 @@ public enum CommandType implements ProtocolKeyword {
 
     // Stream
 
-    XADD, XGROUP, XINFO, XLEN, XPENDING, XRANGE, XREVRANGE, XREAD, XREADGROUP,
+    XACK, XADD, XGROUP, XINFO, XLEN, XPENDING, XRANGE, XREVRANGE, XREAD, XREADGROUP,
 
     // Others
 
diff --git a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index 280f868151..04fa1b27ee 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -121,7 +121,7 @@ public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutp
                     }
 
                     if (!QUEUED.equals(bytes)) {
-                        safeSet(output, bytes, command);
+                        safeSetSingle(output, bytes, command);
                     }
                     break;
                 case ERROR:
@@ -376,6 +376,22 @@ protected void safeSet(CommandOutput<?, ?, ?> output, ByteBuffer bytes, RedisCom
         }
     }
 
+    /**
+     * Safely sets {@link CommandOutput#set(ByteBuffer)}. Completes a command exceptionally in case an exception occurs.
+     *
+     * @param output
+     * @param bytes
+     * @param command
+     */
+    protected void safeSetSingle(CommandOutput<K, V, ?> output, ByteBuffer bytes, RedisCommand<K, V, ?> command) {
+
+        try {
+            output.set(bytes);
+        } catch (Exception e) {
+            command.completeExceptionally(e);
+        }
+    }
+
     /**
      * Safely sets {@link CommandOutput#multi(int)}. Completes a command exceptionally in case an exception occurs.
      *
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisStreamCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisStreamCommands.java
index 8d6456981e..bca40c6283 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisStreamCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisStreamCommands.java
@@ -19,8 +19,7 @@
 import java.util.Map;
 
 import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.XReadArgs.Consumer;
-import com.lambdaworks.redis.XReadArgs.Stream;
+import com.lambdaworks.redis.XReadArgs.StreamOffset;
 
 /**
  * ${intent} for Streams.
@@ -40,7 +39,7 @@ public interface RedisStreamCommands<K, V> {
      * @param messageIds message Ids to acknowledge.
      * @return simple-reply the lenght of acknowledged messages.
      */
-    Long xack(K key, String group, String... messageIds);
+    Long xack(K key, K group, String... messageIds);
 
     /**
      * Append a message to the stream {@code key}.
@@ -89,7 +88,7 @@ public interface RedisStreamCommands<K, V> {
      * @param args
      * @return simple-reply the {@link StreamMessage}
      */
-    StreamMessage<K, V> xclaim(K key, Consumer consumer, XClaimArgs args, String... messageIds);
+    List<StreamMessage<K, V>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds);
 
     /**
      * Create a consumer group.
@@ -99,7 +98,7 @@ public interface RedisStreamCommands<K, V> {
      * @param offset read offset or {@literal $}.
      * @return simple-reply {@literal true} if successful.
      */
-    Boolean xgroupCreate(K key, String group, String offset);
+    String xgroupCreate(K key, K group, String offset);
 
     /**
      * Delete a consumer from a consumer group.
@@ -108,7 +107,7 @@ public interface RedisStreamCommands<K, V> {
      * @param consumer consumer identified by group name and consumer key.
      * @return simple-reply the number of pending messages
      */
-    Boolean xgroupDelconsumer(K key, Consumer consumer);
+    Boolean xgroupDelconsumer(K key, Consumer<K> consumer);
 
     /**
      * Set the current {@code group} id.
@@ -118,7 +117,7 @@ public interface RedisStreamCommands<K, V> {
      * @param offset read offset or {@literal $}.
      * @return simple-reply the lenght of the stream.
      */
-    Boolean xgroupSetid(K key, String group, String offset);
+    Boolean xgroupSetid(K key, K group, String offset);
 
     /**
      * Get the length of a steam.
@@ -129,22 +128,13 @@ public interface RedisStreamCommands<K, V> {
     Long xlen(K key);
 
     /**
-     * Read pending messages from a stream within a specific {@link Range}.
+     * Read pending messages from a stream for a {@code group}.
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @return List&lt;PendingEntry&gt; array-reply list pending entries.
-     */
-    List<PendingEntry> xpending(K key, String group);
-
-    /**
-     * Read pending messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param consumer consumer identified by group name and consumer key.
-     * @return List&lt;PendingEntry&gt; array-reply list pending entries.
+     * @return List&lt;Object&gt; array-reply list pending entries.
      */
-    List<PendingEntry> xpending(K key, Consumer consumer);
+    List<Object> xpending(K key, K group);
 
     /**
      * Read pending messages from a stream within a specific {@link Range}.
@@ -153,20 +143,9 @@ public interface RedisStreamCommands<K, V> {
      * @param group name of the consumer group.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
-     */
-    List<StreamMessage<K, V>> xpending(K key, String group, Range<String> range, Limit limit);
-
-    /**
-     * Read pending messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param consumer consumer identified by group name and consumer key.
-     * @param range must not be {@literal null}.
-     * @param limit must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     * @return List&lt;Object&gt; array-reply list with members of the resulting stream.
      */
-    List<StreamMessage<K, V>> xpending(K key, Consumer consumer, Range<String> range, Limit limit);
+    List<Object> xpending(K key, K group, Range<String> range, Limit limit);
 
     /**
      * Read messages from a stream within a specific {@link Range}.
@@ -207,38 +186,38 @@ public interface RedisStreamCommands<K, V> {
     List<StreamMessage<K, V>> xrevrange(K key, Range<String> range, Limit limit);
 
     /**
-     * Read messages from one or more {@link Stream}s.
+     * Read messages from one or more {@link StreamOffset}s.
      *
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    List<StreamMessage<K, V>> xread(Stream<K>... streams);
+    List<StreamMessage<K, V>> xread(StreamOffset<K>... streams);
 
     /**
-     * Read messages from one or more {@link Stream}s.
+     * Read messages from one or more {@link StreamOffset}s.
      *
      * @param args read arguments.
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    List<StreamMessage<K, V>> xread(XReadArgs args, Stream<K>... streams);
+    List<StreamMessage<K, V>> xread(XReadArgs args, StreamOffset<K>... streams);
 
     /**
-     * Read messages from one or more {@link Stream}s using a consumer group.
+     * Read messages from one or more {@link StreamOffset}s using a consumer group.
      *
      * @param consumer consumer/group.
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    List<StreamMessage<K, V>> xreadgroup(Consumer consumer, Stream<K>... streams);
+    List<StreamMessage<K, V>> xreadgroup(Consumer<K> consumer, StreamOffset<K>... streams);
 
     /**
-     * Read messages from one or more {@link Stream}s using a consumer group.
+     * Read messages from one or more {@link StreamOffset}s using a consumer group.
      *
      * @param consumer consumer/group.
      * @param args read arguments.
      * @param streams the streams to read from.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    List<StreamMessage<K, V>> xreadgroup(Consumer consumer, XReadArgs args, Stream<K>... streams);
+    List<StreamMessage<K, V>> xreadgroup(Consumer<K> consumer, XReadArgs args, StreamOffset<K>... streams);
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/StreamCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/StreamCommandTest.java
index 7259ae2671..aca3095b79 100644
--- a/src/test/java/com/lambdaworks/redis/commands/StreamCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/StreamCommandTest.java
@@ -28,6 +28,8 @@
 import io.lettuce.core.XAddArgs;
 import io.lettuce.core.XReadArgs.StreamOffset;
 import com.lambdaworks.redis.codec.StringCodec;
+import com.lambdaworks.redis.models.stream.PendingMessage;
+import com.lambdaworks.redis.models.stream.PendingParser;
 import com.lambdaworks.redis.output.NestedMultiOutput;
 import com.lambdaworks.redis.protocol.CommandArgs;
 
@@ -131,14 +133,14 @@ public void xread() {
 
         StreamMessage<String, String> firstMessage = messages.get(0);
 
-        assertThat(firstMessage.getId().equals(message1));
-        assertThat(firstMessage.getStream().equals("stream-1"));
+        assertThat(firstMessage.getId()).isEqualTo(message1);
+        assertThat(firstMessage.getStream()).isEqualTo("stream-1");
         assertThat(firstMessage.getBody()).containsEntry("key3", "value3");
 
         StreamMessage<String, String> secondMessage = messages.get(1);
 
-        assertThat(secondMessage.getId().equals(message2));
-        assertThat(secondMessage.getStream().equals("stream-2"));
+        assertThat(secondMessage.getId()).isEqualTo(message2);
+        assertThat(secondMessage.getStream()).isEqualTo("stream-2");
         assertThat(secondMessage.getBody()).containsEntry("key4", "value4");
     }
 
@@ -161,14 +163,14 @@ public void xreadTransactional() {
 
         StreamMessage<String, String> firstMessage = messages.get(0);
 
-        assertThat(firstMessage.getId().equals(message1));
-        assertThat(firstMessage.getStream().equals("stream-1"));
+        assertThat(firstMessage.getId()).isEqualTo(message1);
+        assertThat(firstMessage.getStream()).isEqualTo("stream-1");
         assertThat(firstMessage.getBody()).containsEntry("key3", "value3");
 
         StreamMessage<String, String> secondMessage = messages.get(1);
 
-        assertThat(secondMessage.getId().equals(message2));
-        assertThat(secondMessage.getStream().equals("stream-2"));
+        assertThat(secondMessage.getId()).isEqualTo(message2);
+        assertThat(secondMessage.getStream()).isEqualTo("stream-2");
         assertThat(secondMessage.getBody()).containsEntry("key4", "value4");
     }
 
@@ -198,6 +200,19 @@ public void xgroupread() {
         assertThat(read1).hasSize(1);
     }
 
+    @Test
+    public void xpendingWithGroup() {
+
+        redis.xadd(key, Collections.singletonMap("key", "value"));
+        redis.xgroupCreate(key, "group", "$");
+        String id = redis.xadd(key, Collections.singletonMap("key", "value"));
+
+        redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.latestConsumer(key));
+
+        List<Object> pendingEntries = redis.xpending(key, "group");
+        assertThat(pendingEntries).hasSize(4).containsSequence(1L, id, id);
+    }
+
     @Test
     public void xpending() {
 
@@ -205,18 +220,35 @@ public void xpending() {
         redis.xgroupCreate(key, "group", "$");
         String id = redis.xadd(key, Collections.singletonMap("key", "value"));
 
-        List<StreamMessage<String, String>> read = redis.xreadgroup(Consumer.from("group", "consumer1"),
+        redis.xreadgroup(Consumer.from("group", "consumer1"),
                 StreamOffset.latestConsumer(key));
 
-        List<PendingEntry> pendingEntries = redis.xpending(key, "group", Range.unbounded(), Limit.from(10));
+        List<Object> pendingEntries = redis.xpending(key, "group", Range.unbounded(), Limit.from(10));
+
+        List<PendingMessage> pendingMessages = PendingParser.parseRange(pendingEntries);
+        assertThat(pendingMessages).hasSize(1);
+
+        PendingMessage message = pendingMessages.get(0);
+        assertThat(message.getId()).isEqualTo(id);
+        assertThat(message.getConsumer()).isEqualTo("consumer1");
+        assertThat(message.getRedeliveryCount()).isEqualTo(1);
+    }
+
+    @Test
+    public void xack() {
+
+        redis.xadd(key, Collections.singletonMap("key", "value"));
+        redis.xgroupCreate(key, "group", "$");
+        redis.xadd(key, Collections.singletonMap("key", "value"));
+
+        List<StreamMessage<String, String>> messages = redis.xreadgroup(Consumer.from("group", "consumer1"),
+                StreamOffset.latestConsumer(key));
 
-        assertThat(pendingEntries).hasSize(1);
+        Long ackd = redis.xack(key, "group", messages.get(0).getId());
+        assertThat(ackd).isEqualTo(1);
 
-        PendingEntry pendingEntry = pendingEntries.get(0);
-        assertThat(pendingEntry.getConsumer()).isEqualTo("consumer1");
-        assertThat(pendingEntry.getDeliveryCount()).isEqualTo(1);
-        assertThat(pendingEntry.getMessageId()).isEqualTo(id);
-        assertThat(pendingEntry.getMillisSinceDelivery()).isGreaterThan(0);
+        List<Object> pendingEntries = redis.xpending(key, "group", Range.unbounded(), Limit.from(10));
+        assertThat(pendingEntries).isEmpty();
     }
 
     @Test
diff --git a/src/main/java/com/lambdaworks/redis/PendingMessages.java b/src/test/java/com/lambdaworks/redis/commands/rx/StreamRxCommandTest.java
similarity index 63%
rename from src/main/java/com/lambdaworks/redis/PendingMessages.java
rename to src/test/java/com/lambdaworks/redis/commands/rx/StreamRxCommandTest.java
index 368a4def3d..ca43ea2802 100644
--- a/src/main/java/com/lambdaworks/redis/PendingMessages.java
+++ b/src/test/java/com/lambdaworks/redis/commands/rx/StreamRxCommandTest.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package com.lambdaworks.redis.commands.rx;
+
+import com.lambdaworks.redis.api.sync.RedisCommands;
+import com.lambdaworks.redis.commands.StreamCommandTest;
 
 /**
  * @author Mark Paluch
  */
-public class PendingMessages {
-
-    private String consumer;
-    private long count;
+public class StreamRxCommandTest extends StreamCommandTest {
 
-    public PendingMessages(String consumer, long count) {
-        this.consumer = consumer;
-        this.count = count;
+    @Override
+    protected RedisCommands<String, String> connect() {
+        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/models/stream/PendingParserTest.java b/src/test/java/com/lambdaworks/redis/models/stream/PendingParserTest.java
new file mode 100644
index 0000000000..ff9eecf348
--- /dev/null
+++ b/src/test/java/com/lambdaworks/redis/models/stream/PendingParserTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.lambdaworks.redis.models.stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.lambdaworks.redis.Range;
+
+/**
+ * @author Mark Paluch
+ */
+public class PendingParserTest {
+
+    @Test
+    public void shouldParseXpendingWithRangeOutput() {
+
+        List<PendingMessage> result = PendingParser.parseRange(Collections.singletonList(Arrays.asList("foo", "consumer", 1L,
+                2L)));
+
+        assertThat(result).hasSize(1);
+
+        PendingMessage message = result.get(0);
+
+        assertThat(message.getId()).isEqualTo("foo");
+        assertThat(message.getConsumer()).isEqualTo("consumer");
+        assertThat(message.getMsSinceLastDelivery()).isEqualTo(1);
+        assertThat(message.getSinceLastDelivery()).isEqualTo(Duration.ofMillis(1));
+        assertThat(message.getRedeliveryCount()).isEqualTo(2);
+    }
+
+    @Test
+    public void shouldParseXpendingOutput() {
+
+        PendingMessages result = PendingParser.parse(Arrays.asList(16L, "from", "to",
+                Collections.singletonList(Arrays.asList("consumer", 17L))));
+
+        assertThat(result.getCount()).isEqualTo(16);
+        assertThat(result.getMessageIds()).isEqualTo(Range.create("from", "to"));
+        assertThat(result.getConsumerMessageCount()).containsEntry("consumer", 17L);
+    }
+}

From c4076879bf3c464939bcb75e70a134f0e77f02eb Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 20 Apr 2018 11:41:51 +0200
Subject: [PATCH 455/808] Add XCLAIM, XDEL and XTRIM support #606

---
 .../com/lambdaworks/redis/XClaimArgs.java     | 90 +++++++++++++++++--
 .../api/async/RedisStreamAsyncCommands.java   | 77 ++++++++++++----
 .../api/rx/RedisStreamReactiveCommands.java   | 77 ++++++++++++----
 .../redis/api/sync/RedisStreamCommands.java   | 77 ++++++++++++----
 .../NodeSelectionStreamAsyncCommands.java     | 77 ++++++++++++----
 .../api/sync/NodeSelectionStreamCommands.java | 77 ++++++++++++----
 .../output/StreamMessageListOutput.java}      | 13 +--
 .../core/AbstractRedisAsyncCommands.java      | 22 ++++-
 .../io/lettuce/core/RedisCommandBuilder.java  | 70 ++++++++++++++-
 .../java/io/lettuce/core/StreamMessage.java   | 16 ++++
 .../io/lettuce/core/protocol/CommandType.java |  2 +-
 .../redis/api/RedisStreamCommands.java        | 77 ++++++++++++----
 .../redis/commands/StreamCommandTest.java     | 79 +++++++++++++++-
 13 files changed, 629 insertions(+), 125 deletions(-)
 rename src/main/java/{io/lettuce/core/output/StreamRangeOutput.java => com/lambdaworks/redis/output/StreamMessageListOutput.java} (86%)

diff --git a/src/main/java/com/lambdaworks/redis/XClaimArgs.java b/src/main/java/com/lambdaworks/redis/XClaimArgs.java
index d57035b58d..9e41d1774a 100644
--- a/src/main/java/com/lambdaworks/redis/XClaimArgs.java
+++ b/src/main/java/com/lambdaworks/redis/XClaimArgs.java
@@ -15,12 +15,20 @@
  */
 package com.lambdaworks.redis;
 
+import java.time.Duration;
+import java.time.Instant;
+import java.time.temporal.TemporalAccessor;
+
+import com.lambdaworks.redis.internal.LettuceAssert;
 import com.lambdaworks.redis.protocol.CommandArgs;
 import com.lambdaworks.redis.protocol.CommandKeyword;
 import com.lambdaworks.redis.protocol.CommandType;
 
 /**
- * Args for the {@literal XCLAIM} command.
+ * Argument list builder for the Redis <a href="http://redis.io/commands/xclaim">XCLAIM</a> command. Static import the methods
+ * from {@link XClaimArgs.Builder} and call the methods: {@code minIdleTime(…)} .
+ * <p/>
+ * {@link XClaimArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
  * @since 4.5
@@ -33,18 +41,33 @@ public class XClaimArgs {
     private Long retrycount;
     private boolean force;
 
+    /**
+     * Builder entry points for {@link XAddArgs}.
+     */
     public static class Builder {
 
         /**
          * Utility constructor.
          */
         private Builder() {
-
         }
 
         public static XClaimArgs minIdleTime(long milliseconds) {
             return new XClaimArgs().minIdleTime(milliseconds);
         }
+
+        /**
+         * Creates new {@link XClaimArgs} and set the minimum idle time.
+         *
+         * @return new {@link XClaimArgs} with min idle time set.
+         * @see XClaimArgs#minIdleTime(long)
+         */
+        public static XClaimArgs minIdleTime(Duration minIdleTime) {
+
+            LettuceAssert.notNull(minIdleTime, "Min idle time must not be null");
+
+            return minIdleTime(minIdleTime.toMillis());
+        }
     }
 
     /**
@@ -54,10 +77,24 @@ public static XClaimArgs minIdleTime(long milliseconds) {
      * @return {@code this}.
      */
     public XClaimArgs minIdleTime(long milliseconds) {
+
         this.minIdleTime = milliseconds;
         return this;
     }
 
+    /**
+     * Return only messages that are idle for at least {@code minIdleTime}.
+     *
+     * @param minIdleTime min idle time.
+     * @return {@code this}.
+     */
+    public XClaimArgs minIdleTime(Duration minIdleTime) {
+
+        LettuceAssert.notNull(minIdleTime, "Min idle time must not be null");
+
+        return minIdleTime(minIdleTime.toMillis());
+    }
+
     /**
      * Set the idle time (last time it was delivered) of the message. If IDLE is not specified, an IDLE of 0 is assumed, that
      * is, the time count is reset because the message has now a new owner trying to process it
@@ -66,10 +103,25 @@ public XClaimArgs minIdleTime(long milliseconds) {
      * @return {@code this}.
      */
     public XClaimArgs idle(long milliseconds) {
+
         this.idle = milliseconds;
         return this;
     }
 
+    /**
+     * Set the idle time (last time it was delivered) of the message. If IDLE is not specified, an IDLE of 0 is assumed, that
+     * is, the time count is reset because the message has now a new owner trying to process it
+     *
+     * @param idleTime idle time.
+     * @return {@code this}.
+     */
+    public XClaimArgs idle(Duration idleTime) {
+
+        LettuceAssert.notNull(idleTime, "Idle time must not be null");
+
+        return idle(idleTime.toMillis());
+    }
+
     /**
      * This is the same as IDLE but instead of a relative amount of milliseconds, it sets the idle time to a specific unix time
      * (in milliseconds). This is useful in order to rewrite the AOF file generating XCLAIM commands.
@@ -78,24 +130,51 @@ public XClaimArgs idle(long milliseconds) {
      * @return {@code this}.
      */
     public XClaimArgs time(long millisecondsUnixTime) {
+
         this.time = millisecondsUnixTime;
         return this;
     }
 
+    /**
+     * This is the same as IDLE but instead of a relative amount of milliseconds, it sets the idle time to a specific unix time
+     * (in milliseconds). This is useful in order to rewrite the AOF file generating XCLAIM commands.
+     *
+     * @param timestamp idle time.
+     * @return {@code this}.
+     */
+    public XClaimArgs time(TemporalAccessor timestamp) {
+
+        LettuceAssert.notNull(timestamp, "Timestamp must not be null");
+
+        return time(Instant.from(timestamp).toEpochMilli());
+    }
+
     /**
      * Set the retry counter to the specified value. This counter is incremented every time a message is delivered again.
-     * Normally XCLAIM does not alter this counter, which is just served to clients when the XPENDING command is called: this
-     * way clients can detect anomalies, like messages that are never processed for some reason after a big number of delivery
-     * attempts.
+     * Normally {@code XCLAIM} does not alter this counter, which is just served to clients when the XPENDING command is called:
+     * this way clients can detect anomalies, like messages that are never processed for some reason after a big number of
+     * delivery attempts.
      *
      * @param retrycount number of retries.
      * @return {@code this}.
      */
     public XClaimArgs retryCount(long retrycount) {
+
         this.retrycount = retrycount;
         return this;
     }
 
+    /**
+     * Creates the pending message entry in the PEL even if certain specified IDs are not already in the PEL assigned to a
+     * different client. However the message must be exist in the stream, otherwise the IDs of non existing messages are
+     * ignored.
+     *
+     * @return {@code this}.
+     */
+    public XClaimArgs force() {
+        return force(true);
+    }
+
     /**
      * Creates the pending message entry in the PEL even if certain specified IDs are not already in the PEL assigned to a
      * different client. However the message must be exist in the stream, otherwise the IDs of non existing messages are
@@ -105,6 +184,7 @@ public XClaimArgs retryCount(long retrycount) {
      * @return {@code this}.
      */
     public XClaimArgs force(boolean force) {
+
         this.force = force;
         return this;
     }
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisStreamAsyncCommands.java b/src/main/java/com/lambdaworks/redis/api/async/RedisStreamAsyncCommands.java
index 8bd381f4de..e6296385f2 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisStreamAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/async/RedisStreamAsyncCommands.java
@@ -37,7 +37,7 @@ public interface RedisStreamAsyncCommands<K, V> {
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @param messageIds message Ids to acknowledge.
+     * @param messageIds message Id's to acknowledge.
      * @return simple-reply the lenght of acknowledged messages.
      */
     RedisFuture<Long> xack(K key, K group, String... messageIds);
@@ -85,12 +85,33 @@ public interface RedisStreamAsyncCommands<K, V> {
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
-     * @param messageIds message Ids to claim.
+     * @param minIdleTime
+     * @param messageIds message Id's to claim.
+     * @return simple-reply the {@link StreamMessage}
+     */
+    RedisFuture<List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, long minIdleTime, String... messageIds);
+
+    /**
+     * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
      * @param args
+     * @param messageIds message Id's to claim.
      * @return simple-reply the {@link StreamMessage}
      */
     RedisFuture<List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds);
 
+    /**
+     * Removes the specified entries from the stream. Returns the number of items deleted, that may be different from the number
+     * of IDs passed in case certain IDs do not exist.
+     *
+     * @param key the stream key.
+     * @param messageIds stream message Id's.
+     * @return simple-reply number of removed entries.
+     */
+    RedisFuture<Long> xdel(K key, String... messageIds);
+
     /**
      * Create a consumer group.
      *
@@ -149,42 +170,34 @@ public interface RedisStreamAsyncCommands<K, V> {
     RedisFuture<List<Object>> xpending(K key, K group, Range<String> range, Limit limit);
 
     /**
-     * Read messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param range must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
-     */
-    RedisFuture<List<StreamMessage<K, V>>> xrange(K key, Range<String> range);
-
-    /**
-     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
+     * Read pending messages from a stream within a specific {@link Range}.
      *
      * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     * @return List&lt;Object&gt; array-reply list with members of the resulting stream.
      */
-    RedisFuture<List<StreamMessage<K, V>>> xrange(K key, Range<String> range, Limit limit);
+    RedisFuture<List<Object>> xpending(K key, Consumer<K> consumer, Range<String> range, Limit limit);
 
     /**
-     * Read messages from a stream within a specific {@link Range} in reverse order.
+     * Read messages from a stream within a specific {@link Range}.
      *
      * @param key the stream key.
      * @param range must not be {@literal null}.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    RedisFuture<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range);
+    RedisFuture<List<StreamMessage<K, V>>> xrange(K key, Range<String> range);
 
     /**
-     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
      *
      * @param key the stream key.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    RedisFuture<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range, Limit limit);
+    RedisFuture<List<StreamMessage<K, V>>> xrange(K key, Range<String> range, Limit limit);
 
     /**
      * Read messages from one or more {@link StreamOffset}s.
@@ -221,4 +234,32 @@ public interface RedisStreamAsyncCommands<K, V> {
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
     RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, XReadArgs args, StreamOffset<K>... streams);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    RedisFuture<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    RedisFuture<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Trims the stream to {@code count} elements.
+     *
+     * @param key the stream key.
+     * @param count length of the stream.
+     * @return simple-reply number of removed entries.
+     */
+    RedisFuture<Long> xtrim(K key, long count);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisStreamReactiveCommands.java b/src/main/java/com/lambdaworks/redis/api/rx/RedisStreamReactiveCommands.java
index 53ac5fa943..41fa85fabc 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisStreamReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/rx/RedisStreamReactiveCommands.java
@@ -38,7 +38,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @param messageIds message Ids to acknowledge.
+     * @param messageIds message Id's to acknowledge.
      * @return simple-reply the lenght of acknowledged messages.
      */
     Observable<Long> xack(K key, K group, String... messageIds);
@@ -86,12 +86,33 @@ public interface RedisStreamReactiveCommands<K, V> {
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
-     * @param messageIds message Ids to claim.
+     * @param minIdleTime
+     * @param messageIds message Id's to claim.
+     * @return simple-reply the {@link StreamMessage}
+     */
+    Observable<StreamMessage<K, V>> xclaim(K key, Consumer<K> consumer, long minIdleTime, String... messageIds);
+
+    /**
+     * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
      * @param args
+     * @param messageIds message Id's to claim.
      * @return simple-reply the {@link StreamMessage}
      */
     Observable<StreamMessage<K, V>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds);
 
+    /**
+     * Removes the specified entries from the stream. Returns the number of items deleted, that may be different from the number
+     * of IDs passed in case certain IDs do not exist.
+     *
+     * @param key the stream key.
+     * @param messageIds stream message Id's.
+     * @return simple-reply number of removed entries.
+     */
+    Observable<Long> xdel(K key, String... messageIds);
+
     /**
      * Create a consumer group.
      *
@@ -150,42 +171,34 @@ public interface RedisStreamReactiveCommands<K, V> {
     Observable<Object> xpending(K key, K group, Range<String> range, Limit limit);
 
     /**
-     * Read messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param range must not be {@literal null}.
-     * @return StreamMessage array-reply list with members of the resulting stream.
-     */
-    Observable<StreamMessage<K, V>> xrange(K key, Range<String> range);
-
-    /**
-     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
+     * Read pending messages from a stream within a specific {@link Range}.
      *
      * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
-     * @return StreamMessage array-reply list with members of the resulting stream.
+     * @return Object array-reply list with members of the resulting stream.
      */
-    Observable<StreamMessage<K, V>> xrange(K key, Range<String> range, Limit limit);
+    Observable<Object> xpending(K key, Consumer<K> consumer, Range<String> range, Limit limit);
 
     /**
-     * Read messages from a stream within a specific {@link Range} in reverse order.
+     * Read messages from a stream within a specific {@link Range}.
      *
      * @param key the stream key.
      * @param range must not be {@literal null}.
      * @return StreamMessage array-reply list with members of the resulting stream.
      */
-    Observable<StreamMessage<K, V>> xrevrange(K key, Range<String> range);
+    Observable<StreamMessage<K, V>> xrange(K key, Range<String> range);
 
     /**
-     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
      *
      * @param key the stream key.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
      * @return StreamMessage array-reply list with members of the resulting stream.
      */
-    Observable<StreamMessage<K, V>> xrevrange(K key, Range<String> range, Limit limit);
+    Observable<StreamMessage<K, V>> xrange(K key, Range<String> range, Limit limit);
 
     /**
      * Read messages from one or more {@link StreamOffset}s.
@@ -222,4 +235,32 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @return StreamMessage array-reply list with members of the resulting stream.
      */
     Observable<StreamMessage<K, V>> xreadgroup(Consumer<K> consumer, XReadArgs args, StreamOffset<K>... streams);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return StreamMessage array-reply list with members of the resulting stream.
+     */
+    Observable<StreamMessage<K, V>> xrevrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return StreamMessage array-reply list with members of the resulting stream.
+     */
+    Observable<StreamMessage<K, V>> xrevrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Trims the stream to {@code count} elements.
+     *
+     * @param key the stream key.
+     * @param count length of the stream.
+     * @return simple-reply number of removed entries.
+     */
+    Observable<Long> xtrim(K key, long count);
 }
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisStreamCommands.java b/src/main/java/com/lambdaworks/redis/api/sync/RedisStreamCommands.java
index 3a1e99a531..c48fdf2cae 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisStreamCommands.java
+++ b/src/main/java/com/lambdaworks/redis/api/sync/RedisStreamCommands.java
@@ -37,7 +37,7 @@ public interface RedisStreamCommands<K, V> {
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @param messageIds message Ids to acknowledge.
+     * @param messageIds message Id's to acknowledge.
      * @return simple-reply the lenght of acknowledged messages.
      */
     Long xack(K key, K group, String... messageIds);
@@ -85,12 +85,33 @@ public interface RedisStreamCommands<K, V> {
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
-     * @param messageIds message Ids to claim.
+     * @param minIdleTime
+     * @param messageIds message Id's to claim.
+     * @return simple-reply the {@link StreamMessage}
+     */
+    List<StreamMessage<K, V>> xclaim(K key, Consumer<K> consumer, long minIdleTime, String... messageIds);
+
+    /**
+     * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
      * @param args
+     * @param messageIds message Id's to claim.
      * @return simple-reply the {@link StreamMessage}
      */
     List<StreamMessage<K, V>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds);
 
+    /**
+     * Removes the specified entries from the stream. Returns the number of items deleted, that may be different from the number
+     * of IDs passed in case certain IDs do not exist.
+     *
+     * @param key the stream key.
+     * @param messageIds stream message Id's.
+     * @return simple-reply number of removed entries.
+     */
+    Long xdel(K key, String... messageIds);
+
     /**
      * Create a consumer group.
      *
@@ -149,42 +170,34 @@ public interface RedisStreamCommands<K, V> {
     List<Object> xpending(K key, K group, Range<String> range, Limit limit);
 
     /**
-     * Read messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param range must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
-     */
-    List<StreamMessage<K, V>> xrange(K key, Range<String> range);
-
-    /**
-     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
+     * Read pending messages from a stream within a specific {@link Range}.
      *
      * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     * @return List&lt;Object&gt; array-reply list with members of the resulting stream.
      */
-    List<StreamMessage<K, V>> xrange(K key, Range<String> range, Limit limit);
+    List<Object> xpending(K key, Consumer<K> consumer, Range<String> range, Limit limit);
 
     /**
-     * Read messages from a stream within a specific {@link Range} in reverse order.
+     * Read messages from a stream within a specific {@link Range}.
      *
      * @param key the stream key.
      * @param range must not be {@literal null}.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    List<StreamMessage<K, V>> xrevrange(K key, Range<String> range);
+    List<StreamMessage<K, V>> xrange(K key, Range<String> range);
 
     /**
-     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
      *
      * @param key the stream key.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    List<StreamMessage<K, V>> xrevrange(K key, Range<String> range, Limit limit);
+    List<StreamMessage<K, V>> xrange(K key, Range<String> range, Limit limit);
 
     /**
      * Read messages from one or more {@link StreamOffset}s.
@@ -221,4 +234,32 @@ public interface RedisStreamCommands<K, V> {
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
     List<StreamMessage<K, V>> xreadgroup(Consumer<K> consumer, XReadArgs args, StreamOffset<K>... streams);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xrevrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xrevrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Trims the stream to {@code count} elements.
+     *
+     * @param key the stream key.
+     * @param count length of the stream.
+     * @return simple-reply number of removed entries.
+     */
+    Long xtrim(K key, long count);
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStreamAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStreamAsyncCommands.java
index a061f40785..3d20685574 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStreamAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStreamAsyncCommands.java
@@ -37,7 +37,7 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @param messageIds message Ids to acknowledge.
+     * @param messageIds message Id's to acknowledge.
      * @return simple-reply the lenght of acknowledged messages.
      */
     AsyncExecutions<Long> xack(K key, K group, String... messageIds);
@@ -85,12 +85,33 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
-     * @param messageIds message Ids to claim.
+     * @param minIdleTime
+     * @param messageIds message Id's to claim.
+     * @return simple-reply the {@link StreamMessage}
+     */
+    AsyncExecutions<List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, long minIdleTime, String... messageIds);
+
+    /**
+     * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
      * @param args
+     * @param messageIds message Id's to claim.
      * @return simple-reply the {@link StreamMessage}
      */
     AsyncExecutions<List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds);
 
+    /**
+     * Removes the specified entries from the stream. Returns the number of items deleted, that may be different from the number
+     * of IDs passed in case certain IDs do not exist.
+     *
+     * @param key the stream key.
+     * @param messageIds stream message Id's.
+     * @return simple-reply number of removed entries.
+     */
+    AsyncExecutions<Long> xdel(K key, String... messageIds);
+
     /**
      * Create a consumer group.
      *
@@ -149,42 +170,34 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
     AsyncExecutions<List<Object>> xpending(K key, K group, Range<String> range, Limit limit);
 
     /**
-     * Read messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param range must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
-     */
-    AsyncExecutions<List<StreamMessage<K, V>>> xrange(K key, Range<String> range);
-
-    /**
-     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
+     * Read pending messages from a stream within a specific {@link Range}.
      *
      * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     * @return List&lt;Object&gt; array-reply list with members of the resulting stream.
      */
-    AsyncExecutions<List<StreamMessage<K, V>>> xrange(K key, Range<String> range, Limit limit);
+    AsyncExecutions<List<Object>> xpending(K key, Consumer<K> consumer, Range<String> range, Limit limit);
 
     /**
-     * Read messages from a stream within a specific {@link Range} in reverse order.
+     * Read messages from a stream within a specific {@link Range}.
      *
      * @param key the stream key.
      * @param range must not be {@literal null}.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    AsyncExecutions<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range);
+    AsyncExecutions<List<StreamMessage<K, V>>> xrange(K key, Range<String> range);
 
     /**
-     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
      *
      * @param key the stream key.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    AsyncExecutions<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range, Limit limit);
+    AsyncExecutions<List<StreamMessage<K, V>>> xrange(K key, Range<String> range, Limit limit);
 
     /**
      * Read messages from one or more {@link StreamOffset}s.
@@ -221,4 +234,32 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
     AsyncExecutions<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, XReadArgs args, StreamOffset<K>... streams);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    AsyncExecutions<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    AsyncExecutions<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Trims the stream to {@code count} elements.
+     *
+     * @param key the stream key.
+     * @param count length of the stream.
+     * @return simple-reply number of removed entries.
+     */
+    AsyncExecutions<Long> xtrim(K key, long count);
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStreamCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStreamCommands.java
index 7f4ba1c030..47dfe97957 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStreamCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStreamCommands.java
@@ -37,7 +37,7 @@ public interface NodeSelectionStreamCommands<K, V> {
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @param messageIds message Ids to acknowledge.
+     * @param messageIds message Id's to acknowledge.
      * @return simple-reply the lenght of acknowledged messages.
      */
     Executions<Long> xack(K key, K group, String... messageIds);
@@ -85,12 +85,33 @@ public interface NodeSelectionStreamCommands<K, V> {
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
-     * @param messageIds message Ids to claim.
+     * @param minIdleTime
+     * @param messageIds message Id's to claim.
+     * @return simple-reply the {@link StreamMessage}
+     */
+    Executions<List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, long minIdleTime, String... messageIds);
+
+    /**
+     * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
      * @param args
+     * @param messageIds message Id's to claim.
      * @return simple-reply the {@link StreamMessage}
      */
     Executions<List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds);
 
+    /**
+     * Removes the specified entries from the stream. Returns the number of items deleted, that may be different from the number
+     * of IDs passed in case certain IDs do not exist.
+     *
+     * @param key the stream key.
+     * @param messageIds stream message Id's.
+     * @return simple-reply number of removed entries.
+     */
+    Executions<Long> xdel(K key, String... messageIds);
+
     /**
      * Create a consumer group.
      *
@@ -149,42 +170,34 @@ public interface NodeSelectionStreamCommands<K, V> {
     Executions<List<Object>> xpending(K key, K group, Range<String> range, Limit limit);
 
     /**
-     * Read messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param range must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
-     */
-    Executions<List<StreamMessage<K, V>>> xrange(K key, Range<String> range);
-
-    /**
-     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
+     * Read pending messages from a stream within a specific {@link Range}.
      *
      * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     * @return List&lt;Object&gt; array-reply list with members of the resulting stream.
      */
-    Executions<List<StreamMessage<K, V>>> xrange(K key, Range<String> range, Limit limit);
+    Executions<List<Object>> xpending(K key, Consumer<K> consumer, Range<String> range, Limit limit);
 
     /**
-     * Read messages from a stream within a specific {@link Range} in reverse order.
+     * Read messages from a stream within a specific {@link Range}.
      *
      * @param key the stream key.
      * @param range must not be {@literal null}.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    Executions<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range);
+    Executions<List<StreamMessage<K, V>>> xrange(K key, Range<String> range);
 
     /**
-     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
      *
      * @param key the stream key.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    Executions<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range, Limit limit);
+    Executions<List<StreamMessage<K, V>>> xrange(K key, Range<String> range, Limit limit);
 
     /**
      * Read messages from one or more {@link StreamOffset}s.
@@ -221,4 +234,32 @@ public interface NodeSelectionStreamCommands<K, V> {
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
     Executions<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, XReadArgs args, StreamOffset<K>... streams);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    Executions<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    Executions<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Trims the stream to {@code count} elements.
+     *
+     * @param key the stream key.
+     * @param count length of the stream.
+     * @return simple-reply number of removed entries.
+     */
+    Executions<Long> xtrim(K key, long count);
 }
diff --git a/src/main/java/io/lettuce/core/output/StreamRangeOutput.java b/src/main/java/com/lambdaworks/redis/output/StreamMessageListOutput.java
similarity index 86%
rename from src/main/java/io/lettuce/core/output/StreamRangeOutput.java
rename to src/main/java/com/lambdaworks/redis/output/StreamMessageListOutput.java
index a5c0e45245..8f5aa63d54 100644
--- a/src/main/java/io/lettuce/core/output/StreamRangeOutput.java
+++ b/src/main/java/com/lambdaworks/redis/output/StreamMessageListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.output;
+package com.lambdaworks.redis.output;
 
 import java.nio.ByteBuffer;
 import java.util.Collections;
@@ -21,16 +21,17 @@
 import java.util.List;
 import java.util.Map;
 
+import com.lambdaworks.redis.StreamMessage;
 import com.lambdaworks.redis.codec.RedisCodec;
 import com.lambdaworks.redis.internal.LettuceAssert;
 
-import io.lettuce.core.StreamMessage;
-
 /**
+ * {@link List} of {@link StreamMessage}s.
+ *
  * @author Mark Paluch
  * @since 4.5
  */
-public class StreamRangeOutput<K, V> extends CommandOutput<K, V, List<StreamMessage<K, V>>> implements
+public class StreamMessageListOutput<K, V> extends CommandOutput<K, V, List<StreamMessage<K, V>>> implements
         StreamingOutput<StreamMessage<K, V>> {
 
     private final K stream;
@@ -42,7 +43,7 @@ public class StreamRangeOutput<K, V> extends CommandOutput<K, V, List<StreamMess
     private String id;
     private Map<K, V> body;
 
-    public StreamRangeOutput(RedisCodec<K, V> codec, K stream) {
+    public StreamMessageListOutput(RedisCodec<K, V> codec, K stream) {
         super(codec, Collections.emptyList());
         setSubscriber(ListSubscriber.instance());
         this.stream = stream;
diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 2c69e20f61..f36def365d 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1524,9 +1524,19 @@ public RedisFuture<Long> xack(K key, K group, String... messageIds) {
         return dispatch(commandBuilder.xack(key, group, messageIds));
     }
 
+    @Override
+    public RedisFuture<List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, long minIdleTime, String... messageIds) {
+        return dispatch(commandBuilder.xclaim(key, consumer, messageIds, XClaimArgs.Builder.minIdleTime(minIdleTime)));
+    }
+
     @Override
     public RedisFuture<List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds) {
-        return null;
+        return dispatch(commandBuilder.xclaim(key, consumer, messageIds, args));
+    }
+
+    @Override
+    public RedisFuture<Long> xdel(K key, String... messageIds) {
+        return dispatch(commandBuilder.xdel(key, messageIds));
     }
 
     @Override
@@ -1554,6 +1564,11 @@ public RedisFuture<List<Object>> xpending(K key, K group, Range<String> range, L
         return dispatch(commandBuilder.xpending(key, group, range, limit));
     }
 
+    @Override
+    public RedisFuture<List<Object>> xpending(K key, Consumer<K> consumer, Range<String> range, Limit limit) {
+        return dispatch(commandBuilder.xpending(key, consumer, range, limit));
+    }
+
     @Override
     public RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, XReadArgs.StreamOffset<K>... streams) {
         return dispatch(commandBuilder.xreadgroup(consumer, streams, null));
@@ -1565,6 +1580,11 @@ public RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, X
         return dispatch(commandBuilder.xreadgroup(consumer, streams, args));
     }
 
+    @Override
+    public RedisFuture<Long> xtrim(K key, long count) {
+        return dispatch(commandBuilder.xtrim(key, count));
+    }
+
     @Override
     public RedisFuture<Long> zadd(K key, double score, V member) {
         return dispatch(commandBuilder.zadd(key, null, score, member));
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 6a264748f9..2eddb97c90 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -2052,6 +2052,27 @@ public Command<K, V, Long> xack(K key, K group, String[] messageIds) {
         return createCommand(XACK, new IntegerOutput<>(codec), args);
     }
 
+    public Command<K, V, List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, String[] messageIds,
+            XClaimArgs xClaimArgs) {
+
+        notNullKey(key);
+        LettuceAssert.notNull(consumer, "Consumer " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(messageIds, "MessageIds " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.noNullElements(messageIds, "MessageIds " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
+        LettuceAssert.notNull(xClaimArgs, "XClaimArgs " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKey(consumer.group).addKey(consumer.name)
+                .add(xClaimArgs.minIdleTime);
+
+        for (String messageId : messageIds) {
+            args.add(messageId);
+        }
+
+        xClaimArgs.build(args);
+
+        return createCommand(XCLAIM, new StreamMessageListOutput<>(codec, key), args);
+    }
+
     public Command<K, V, String> xadd(K key, XAddArgs xAddArgs, Map<K, V> map) {
         notNullKey(key);
         LettuceAssert.notNull(map, "Message body " + MUST_NOT_BE_NULL);
@@ -2093,6 +2114,20 @@ public Command<K, V, String> xadd(K key, XAddArgs xAddArgs, Object[] body) {
         return createCommand(XADD, new StatusOutput<>(codec), args);
     }
 
+    public Command<K, V, Long> xdel(K key, String[] messageIds) {
+        notNullKey(key);
+        LettuceAssert.notEmpty(messageIds, "MessageIds " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.noNullElements(messageIds, "MessageIds " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
+
+        for (String messageId : messageIds) {
+            args.add(messageId);
+        }
+
+        return createCommand(XDEL, new IntegerOutput<>(codec), args);
+    }
+
     public Command<K, V, String> xgroupCreate(K key, K group, String id) {
         notNullKey(key);
         LettuceAssert.notNull(group, "Group " + MUST_NOT_BE_EMPTY);
@@ -2132,6 +2167,29 @@ public Command<K, V, List<Object>> xpending(K key, K group, Range<String> range,
         return createCommand(XPENDING, new NestedMultiOutput(codec), args);
     }
 
+    public Command<K, V, List<Object>> xpending(K key, Consumer<K> consumer, Range<String> range, Limit limit) {
+        notNullKey(key);
+        LettuceAssert.notNull(consumer, "Consumer " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(range, "Range " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(limit, "Limit " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKey(consumer.group);
+
+        if (limit.isLimited() || !range.getLower().equals(Boundary.unbounded())
+                || !range.getUpper().equals(Boundary.unbounded())) {
+            args.add(getLowerValue(range)).add(getUpperValue(range));
+
+            if (!limit.isLimited()) {
+                throw new IllegalArgumentException("Limit must be set using Range queries with XPENDING");
+            }
+            args.add(limit.getCount());
+        }
+
+        args.addKey(consumer.name);
+
+        return createCommand(XPENDING, new NestedMultiOutput(codec), args);
+    }
+
     public Command<K, V, List<StreamMessage<K, V>>> xrange(K key, Range<String> range, Limit limit) {
         notNullKey(key);
         LettuceAssert.notNull(range, "Range " + MUST_NOT_BE_NULL);
@@ -2145,7 +2203,7 @@ public Command<K, V, List<StreamMessage<K, V>>> xrange(K key, Range<String> rang
             args.add(COUNT).add(limit.getCount());
         }
 
-        return createCommand(XRANGE, new StreamRangeOutput<>(codec, key), args);
+        return createCommand(XRANGE, new StreamMessageListOutput<>(codec, key), args);
     }
 
     public Command<K, V, List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range, Limit limit) {
@@ -2161,7 +2219,15 @@ public Command<K, V, List<StreamMessage<K, V>>> xrevrange(K key, Range<String> r
             args.add(COUNT).add(limit.getCount());
         }
 
-        return createCommand(XREVRANGE, new StreamRangeOutput<>(codec, key), args);
+        return createCommand(XREVRANGE, new StreamMessageListOutput<>(codec, key), args);
+    }
+
+    public Command<K, V, Long> xtrim(K key, long count) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(MAXLEN).add(count);
+
+        return createCommand(XTRIM, new IntegerOutput<>(codec), args);
     }
 
     private static String getLowerValue(Range<String> range) {
diff --git a/src/main/java/io/lettuce/core/StreamMessage.java b/src/main/java/io/lettuce/core/StreamMessage.java
index 390b56152f..42cfe14065 100644
--- a/src/main/java/io/lettuce/core/StreamMessage.java
+++ b/src/main/java/io/lettuce/core/StreamMessage.java
@@ -16,6 +16,7 @@
 package io.lettuce.core;
 
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * A stream message and its id.
@@ -55,6 +56,21 @@ public Map<K, V> getBody() {
         return body;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof StreamMessage))
+            return false;
+        StreamMessage<?, ?> that = (StreamMessage<?, ?>) o;
+        return Objects.equals(stream, that.stream) && Objects.equals(id, that.id) && Objects.equals(body, that.body);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(stream, id, body);
+    }
+
     @Override
     public String toString() {
         return String.format("StreamMessage[%s:%s]%s", stream, id, body);
diff --git a/src/main/java/io/lettuce/core/protocol/CommandType.java b/src/main/java/io/lettuce/core/protocol/CommandType.java
index 42283edc94..ddaebda7de 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandType.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandType.java
@@ -84,7 +84,7 @@ public enum CommandType implements ProtocolKeyword {
 
     // Stream
 
-    XACK, XADD, XGROUP, XINFO, XLEN, XPENDING, XRANGE, XREVRANGE, XREAD, XREADGROUP,
+    XACK, XADD, XCLAIM, XDEL, XGROUP, XINFO, XLEN, XPENDING, XRANGE, XREVRANGE, XREAD, XREADGROUP, XTRIM,
 
     // Others
 
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisStreamCommands.java b/src/main/templates/com/lambdaworks/redis/api/RedisStreamCommands.java
index bca40c6283..914a252405 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisStreamCommands.java
+++ b/src/main/templates/com/lambdaworks/redis/api/RedisStreamCommands.java
@@ -36,7 +36,7 @@ public interface RedisStreamCommands<K, V> {
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @param messageIds message Ids to acknowledge.
+     * @param messageIds message Id's to acknowledge.
      * @return simple-reply the lenght of acknowledged messages.
      */
     Long xack(K key, K group, String... messageIds);
@@ -84,12 +84,33 @@ public interface RedisStreamCommands<K, V> {
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
-     * @param messageIds message Ids to claim.
+     * @param minIdleTime
+     * @param messageIds message Id's to claim.
+     * @return simple-reply the {@link StreamMessage}
+     */
+    List<StreamMessage<K, V>> xclaim(K key, Consumer<K> consumer, long minIdleTime, String... messageIds);
+
+    /**
+     * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     *
+     * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
      * @param args
+     * @param messageIds message Id's to claim.
      * @return simple-reply the {@link StreamMessage}
      */
     List<StreamMessage<K, V>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds);
 
+    /**
+     * Removes the specified entries from the stream. Returns the number of items deleted, that may be different from the number
+     * of IDs passed in case certain IDs do not exist.
+     *
+     * @param key the stream key.
+     * @param messageIds stream message Id's.
+     * @return simple-reply number of removed entries.
+     */
+    Long xdel(K key, String... messageIds);
+
     /**
      * Create a consumer group.
      *
@@ -148,42 +169,34 @@ public interface RedisStreamCommands<K, V> {
     List<Object> xpending(K key, K group, Range<String> range, Limit limit);
 
     /**
-     * Read messages from a stream within a specific {@link Range}.
-     *
-     * @param key the stream key.
-     * @param range must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
-     */
-    List<StreamMessage<K, V>> xrange(K key, Range<String> range);
-
-    /**
-     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
+     * Read pending messages from a stream within a specific {@link Range}.
      *
      * @param key the stream key.
+     * @param consumer consumer identified by group name and consumer key.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
-     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     * @return List&lt;Object&gt; array-reply list with members of the resulting stream.
      */
-    List<StreamMessage<K, V>> xrange(K key, Range<String> range, Limit limit);
+    List<Object> xpending(K key, Consumer<K> consumer, Range<String> range, Limit limit);
 
     /**
-     * Read messages from a stream within a specific {@link Range} in reverse order.
+     * Read messages from a stream within a specific {@link Range}.
      *
      * @param key the stream key.
      * @param range must not be {@literal null}.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    List<StreamMessage<K, V>> xrevrange(K key, Range<String> range);
+    List<StreamMessage<K, V>> xrange(K key, Range<String> range);
 
     /**
-     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
      *
      * @param key the stream key.
      * @param range must not be {@literal null}.
      * @param limit must not be {@literal null}.
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
-    List<StreamMessage<K, V>> xrevrange(K key, Range<String> range, Limit limit);
+    List<StreamMessage<K, V>> xrange(K key, Range<String> range, Limit limit);
 
     /**
      * Read messages from one or more {@link StreamOffset}s.
@@ -220,4 +233,32 @@ public interface RedisStreamCommands<K, V> {
      * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
      */
     List<StreamMessage<K, V>> xreadgroup(Consumer<K> consumer, XReadArgs args, StreamOffset<K>... streams);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xrevrange(K key, Range<String> range);
+
+    /**
+     * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
+     *
+     * @param key the stream key.
+     * @param range must not be {@literal null}.
+     * @param limit must not be {@literal null}.
+     * @return List&lt;StreamMessage&gt; array-reply list with members of the resulting stream.
+     */
+    List<StreamMessage<K, V>> xrevrange(K key, Range<String> range, Limit limit);
+
+    /**
+     * Trims the stream to {@code count} elements.
+     *
+     * @param key the stream key.
+     * @param count length of the stream.
+     * @return simple-reply number of removed entries.
+     */
+    Long xtrim(K key, long count);
 }
diff --git a/src/test/java/com/lambdaworks/redis/commands/StreamCommandTest.java b/src/test/java/com/lambdaworks/redis/commands/StreamCommandTest.java
index aca3095b79..45d2057b24 100644
--- a/src/test/java/com/lambdaworks/redis/commands/StreamCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/commands/StreamCommandTest.java
@@ -19,6 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 
+import java.time.Instant;
 import java.util.*;
 
 import org.junit.Ignore;
@@ -60,6 +61,39 @@ public void xaddMaxLen() {
         assertThat(messages).hasSize(5);
     }
 
+    @Test
+    public void xdel() {
+
+        List<String> ids = new ArrayList<>();
+        for (int i = 0; i < 2; i++) {
+            ids.add(redis.xadd(key, Collections.singletonMap("key", "value")));
+        }
+
+        Long deleted = redis.xdel(key, ids.get(0), "123456-0");
+
+        assertThat(deleted).isEqualTo(1);
+
+        List<StreamMessage<String, String>> messages = redis.xrange(key, Range.unbounded());
+        assertThat(messages).hasSize(1);
+    }
+
+    @Test
+    public void xtrim() {
+
+        List<String> ids = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            ids.add(redis.xadd(key, Collections.singletonMap("key", "value")));
+        }
+        redis.xdel(key, ids.get(0), ids.get(2));
+        assertThat(redis.xlen(key)).isEqualTo(10);
+
+        Long xtrim = redis.xtrim(key, 8);
+
+        assertThat(xtrim).isEqualTo(2);
+
+        assertThat(redis.xlen(key)).isEqualTo(8);
+    }
+
     @Test
     public void xrange() {
 
@@ -220,8 +254,7 @@ public void xpending() {
         redis.xgroupCreate(key, "group", "$");
         String id = redis.xadd(key, Collections.singletonMap("key", "value"));
 
-        redis.xreadgroup(Consumer.from("group", "consumer1"),
-                StreamOffset.latestConsumer(key));
+        redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.latestConsumer(key));
 
         List<Object> pendingEntries = redis.xpending(key, "group", Range.unbounded(), Limit.from(10));
 
@@ -251,6 +284,48 @@ public void xack() {
         assertThat(pendingEntries).isEmpty();
     }
 
+    @Test
+    public void xclaim() {
+
+        redis.xadd(key, Collections.singletonMap("key", "value"));
+        redis.xgroupCreate(key, "group", "$");
+        redis.xadd(key, Collections.singletonMap("key", "value"));
+
+        List<StreamMessage<String, String>> messages = redis.xreadgroup(Consumer.from("group", "consumer1"),
+                StreamOffset.latestConsumer(key));
+
+        List<StreamMessage<String, String>> claimedMessages = redis.xclaim(key, Consumer.from("group", "consumer2"), 0,
+                messages.get(0).getId());
+
+        assertThat(claimedMessages).hasSize(1).contains(messages.get(0));
+
+        assertThat(redis.xpending(key, Consumer.from("group", "consumer1"), Range.unbounded(), Limit.from(10))).isEmpty();
+        assertThat(redis.xpending(key, Consumer.from("group", "consumer2"), Range.unbounded(), Limit.from(10))).hasSize(1);
+    }
+
+    @Test
+    public void xclaimWithArgs() {
+
+        String id1 = redis.xadd(key, Collections.singletonMap("key", "value"));
+        redis.xgroupCreate(key, "group", "$");
+        String id2 = redis.xadd(key, Collections.singletonMap("key", "value"));
+
+        List<StreamMessage<String, String>> messages = redis.xreadgroup(Consumer.from("group", "consumer1"),
+                StreamOffset.latestConsumer(key));
+
+        List<StreamMessage<String, String>> claimedMessages = redis.xclaim(key, Consumer.from("group", "consumer2"),
+                XClaimArgs.Builder.minIdleTime(0).time(Instant.now().minusSeconds(60)), id1, id2);
+
+        assertThat(claimedMessages).hasSize(1).contains(messages.get(0));
+
+        List<Object> xpending = redis.xpending(key, Consumer.from("group", "consumer2"), Range.unbounded(), Limit.from(10));
+
+        List<PendingMessage> pendingMessages = PendingParser.parseRange(xpending);
+        PendingMessage message = pendingMessages.get(0);
+
+        assertThat(message.getMsSinceLastDelivery()).isGreaterThan(60000);
+    }
+
     @Test
     @Ignore("Not yet implemented in Redis")
     public void xgroupDelgroup() {

From cc11f92d94b7975854d57ba0a52ed13756c31267 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 14 May 2018 13:44:47 +0200
Subject: [PATCH 456/808] Polishing #606

Post-cherrypick polishing. Sort inherited commands interfaces.
---
 .../redis/models/stream/package-info.java     |   5 -
 .../core/AbstractRedisAsyncCommands.java      |  79 ++++++------
 .../core/AbstractRedisReactiveCommands.java   | 121 ++++++++++++++++++
 .../redis => io/lettuce/core}/Consumer.java   |   8 +-
 .../io/lettuce/core/RedisCommandBuilder.java  |  13 +-
 .../java/io/lettuce/core/StreamMessage.java   |   2 +-
 src/main/java/io/lettuce/core/XAddArgs.java   |  27 +++-
 .../redis => io/lettuce/core}/XClaimArgs.java |  12 +-
 src/main/java/io/lettuce/core/XReadArgs.java  | 103 +++++++++++++--
 .../core/api/async/RedisAsyncCommands.java    |  10 +-
 .../api/async/RedisStreamAsyncCommands.java   |  12 +-
 .../api/reactive/RedisReactiveCommands.java   |  10 +-
 .../RedisStreamReactiveCommands.java          |  66 +++++-----
 .../lettuce/core/api/sync/RedisCommands.java  |   8 +-
 .../core}/api/sync/RedisStreamCommands.java   |  12 +-
 .../api/async/NodeSelectionAsyncCommands.java |   8 +-
 .../NodeSelectionStreamAsyncCommands.java     |  12 +-
 .../api/async/RedisClusterAsyncCommands.java  |   9 +-
 .../api/sync/NodeSelectionCommands.java       |  10 +-
 .../api/sync/NodeSelectionStreamCommands.java |  12 +-
 .../core}/models/stream/PendingEntry.java     |  13 +-
 .../core}/models/stream/PendingMessage.java   |   4 +-
 .../core}/models/stream/PendingMessages.java  |   8 +-
 .../core}/models/stream/PendingParser.java    |  10 +-
 .../core/models/stream/package-info.java      |  21 +++
 .../core}/output/StreamMessageListOutput.java |  12 +-
 .../lettuce/core/output/StreamReadOutput.java |   7 +-
 .../core/protocol/RedisStateMachine.java      |   2 +-
 .../core}/api/RedisStreamCommands.java        |  10 +-
 .../io/lettuce/apigenerator/Constants.java    |   8 +-
 .../core}/commands/StreamCommandTest.java     |  51 +++++---
 .../reactive/StreamReactiveCommandTest.java}  |  11 +-
 .../models/stream/PendingParserTest.java      |   7 +-
 33 files changed, 478 insertions(+), 225 deletions(-)
 delete mode 100644 src/main/java/com/lambdaworks/redis/models/stream/package-info.java
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/Consumer.java (93%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/XClaimArgs.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/async/RedisStreamAsyncCommands.java (97%)
 rename src/main/java/{com/lambdaworks/redis/api/rx => io/lettuce/core/api/reactive}/RedisStreamReactiveCommands.java (77%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/api/sync/RedisStreamCommands.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/async/NodeSelectionStreamAsyncCommands.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/cluster/api/sync/NodeSelectionStreamCommands.java (97%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/stream/PendingEntry.java (88%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/stream/PendingMessage.java (96%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/stream/PendingMessages.java (86%)
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/models/stream/PendingParser.java (94%)
 create mode 100644 src/main/java/io/lettuce/core/models/stream/package-info.java
 rename src/main/java/{com/lambdaworks/redis => io/lettuce/core}/output/StreamMessageListOutput.java (91%)
 rename src/main/templates/{com/lambdaworks/redis => io/lettuce/core}/api/RedisStreamCommands.java (97%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/commands/StreamCommandTest.java (90%)
 rename src/test/java/{com/lambdaworks/redis/commands/rx/StreamRxCommandTest.java => io/lettuce/core/commands/reactive/StreamReactiveCommandTest.java} (68%)
 rename src/test/java/{com/lambdaworks/redis => io/lettuce/core}/models/stream/PendingParserTest.java (89%)

diff --git a/src/main/java/com/lambdaworks/redis/models/stream/package-info.java b/src/main/java/com/lambdaworks/redis/models/stream/package-info.java
deleted file mode 100644
index 190ac27af3..0000000000
--- a/src/main/java/com/lambdaworks/redis/models/stream/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Model and parser for the Stream-related command output such as {@literal XPENDING}.
- */
-package com.lambdaworks.redis.models.stream;
-
diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index f36def365d..7e5d4215a3 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1469,6 +1469,11 @@ public RedisFuture<String> watch(K... keys) {
         return dispatch(commandBuilder.watch(keys));
     }
 
+    @Override
+    public RedisFuture<Long> xack(K key, K group, String... messageIds) {
+        return dispatch(commandBuilder.xack(key, group, messageIds));
+    }
+
     @Override
     public RedisFuture<String> xadd(K key, Map<K, V> body) {
         return dispatch(commandBuilder.xadd(key, null, body));
@@ -1490,94 +1495,94 @@ public RedisFuture<String> xadd(K key, XAddArgs args, Object... keysAndValues) {
     }
 
     @Override
-    public RedisFuture<List<StreamMessage<K, V>>> xrange(K key, Range<String> range) {
-        return dispatch(commandBuilder.xrange(key, range, Limit.unlimited()));
+    public RedisFuture<List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, long minIdleTime, String... messageIds) {
+        return dispatch(commandBuilder.xclaim(key, consumer, XClaimArgs.Builder.minIdleTime(minIdleTime), messageIds));
     }
 
     @Override
-    public RedisFuture<List<StreamMessage<K, V>>> xrange(K key, Range<String> range, Limit limit) {
-        return dispatch(commandBuilder.xrange(key, range, limit));
+    public RedisFuture<List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds) {
+        return dispatch(commandBuilder.xclaim(key, consumer, args, messageIds));
     }
 
     @Override
-    public RedisFuture<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range) {
-        return dispatch(commandBuilder.xrevrange(key, range, Limit.unlimited()));
+    public RedisFuture<Long> xdel(K key, String... messageIds) {
+        return dispatch(commandBuilder.xdel(key, messageIds));
     }
 
     @Override
-    public RedisFuture<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range, Limit limit) {
-        return dispatch(commandBuilder.xrevrange(key, range, limit));
+    public RedisFuture<String> xgroupCreate(K key, K group, String offset) {
+        return dispatch(commandBuilder.xgroupCreate(key, group, offset));
     }
 
     @Override
-    public RedisFuture<List<StreamMessage<K, V>>> xread(XReadArgs.StreamOffset<K>... streams) {
-        return dispatch(commandBuilder.xread(streams, null));
+    public RedisFuture<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer) {
+        return null;
     }
 
     @Override
-    public RedisFuture<List<StreamMessage<K, V>>> xread(XReadArgs args, XReadArgs.StreamOffset<K>... streams) {
-        return dispatch(commandBuilder.xread(streams, args));
+    public RedisFuture<Boolean> xgroupSetid(K key, K group, String offset) {
+        return null;
     }
 
     @Override
-    public RedisFuture<Long> xack(K key, K group, String... messageIds) {
-        return dispatch(commandBuilder.xack(key, group, messageIds));
+    public RedisFuture<Long> xlen(K key) {
+        return dispatch(commandBuilder.xlen(key));
     }
 
     @Override
-    public RedisFuture<List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, long minIdleTime, String... messageIds) {
-        return dispatch(commandBuilder.xclaim(key, consumer, messageIds, XClaimArgs.Builder.minIdleTime(minIdleTime)));
+    public RedisFuture<List<Object>> xpending(K key, K group) {
+        return dispatch(commandBuilder.xpending(key, group, Range.unbounded(), Limit.unlimited()));
     }
 
     @Override
-    public RedisFuture<List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds) {
-        return dispatch(commandBuilder.xclaim(key, consumer, messageIds, args));
+    public RedisFuture<List<Object>> xpending(K key, K group, Range<String> range, Limit limit) {
+        return dispatch(commandBuilder.xpending(key, group, range, limit));
     }
 
     @Override
-    public RedisFuture<Long> xdel(K key, String... messageIds) {
-        return dispatch(commandBuilder.xdel(key, messageIds));
+    public RedisFuture<List<Object>> xpending(K key, Consumer<K> consumer, Range<String> range, Limit limit) {
+        return dispatch(commandBuilder.xpending(key, consumer, range, limit));
     }
 
     @Override
-    public RedisFuture<String> xgroupCreate(K key, K group, String offset) {
-        return dispatch(commandBuilder.xgroupCreate(key, group, offset));
+    public RedisFuture<List<StreamMessage<K, V>>> xrange(K key, Range<String> range) {
+        return dispatch(commandBuilder.xrange(key, range, Limit.unlimited()));
     }
 
     @Override
-    public RedisFuture<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer) {
-        return null;
+    public RedisFuture<List<StreamMessage<K, V>>> xrange(K key, Range<String> range, Limit limit) {
+        return dispatch(commandBuilder.xrange(key, range, limit));
     }
 
     @Override
-    public RedisFuture<Boolean> xgroupSetid(K key, K group, String offset) {
-        return null;
+    public RedisFuture<List<StreamMessage<K, V>>> xread(XReadArgs.StreamOffset<K>... streams) {
+        return dispatch(commandBuilder.xread(null, streams));
     }
 
     @Override
-    public RedisFuture<List<Object>> xpending(K key, K group) {
-        return dispatch(commandBuilder.xpending(key, group, Range.unbounded(), Limit.unlimited()));
+    public RedisFuture<List<StreamMessage<K, V>>> xread(XReadArgs args, XReadArgs.StreamOffset<K>... streams) {
+        return dispatch(commandBuilder.xread(args, streams));
     }
 
     @Override
-    public RedisFuture<List<Object>> xpending(K key, K group, Range<String> range, Limit limit) {
-        return dispatch(commandBuilder.xpending(key, group, range, limit));
+    public RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, XReadArgs.StreamOffset<K>... streams) {
+        return dispatch(commandBuilder.xreadgroup(consumer, null, streams));
     }
 
     @Override
-    public RedisFuture<List<Object>> xpending(K key, Consumer<K> consumer, Range<String> range, Limit limit) {
-        return dispatch(commandBuilder.xpending(key, consumer, range, limit));
+    public RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, XReadArgs args,
+            XReadArgs.StreamOffset<K>... streams) {
+        return dispatch(commandBuilder.xreadgroup(consumer, args, streams));
     }
 
     @Override
-    public RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, XReadArgs.StreamOffset<K>... streams) {
-        return dispatch(commandBuilder.xreadgroup(consumer, streams, null));
+    public RedisFuture<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range) {
+        return dispatch(commandBuilder.xrevrange(key, range, Limit.unlimited()));
     }
 
     @Override
-    public RedisFuture<List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, XReadArgs args,
-            XReadArgs.StreamOffset<K>... streams) {
-        return dispatch(commandBuilder.xreadgroup(consumer, streams, args));
+    public RedisFuture<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> range, Limit limit) {
+        return dispatch(commandBuilder.xrevrange(key, range, limit));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index ce690ea601..28c2f8c441 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -1482,6 +1482,127 @@ public Mono<String> watch(K... keys) {
         return createMono(() -> commandBuilder.watch(keys));
     }
 
+    @Override
+    public Mono<Long> xack(K key, K group, String... messageIds) {
+        return createMono(() -> commandBuilder.xack(key, group, messageIds));
+    }
+
+    @Override
+    public Mono<String> xadd(K key, Map<K, V> body) {
+        return createMono(() -> commandBuilder.xadd(key, null, body));
+    }
+
+    @Override
+    public Mono<String> xadd(K key, XAddArgs args, Map<K, V> body) {
+        return createMono(() -> commandBuilder.xadd(key, args, body));
+    }
+
+    @Override
+    public Mono<String> xadd(K key, Object... keysAndValues) {
+        return createMono(() -> commandBuilder.xadd(key, null, keysAndValues));
+    }
+
+    @Override
+    public Mono<String> xadd(K key, XAddArgs args, Object... keysAndValues) {
+        return createMono(() -> commandBuilder.xadd(key, args, keysAndValues));
+    }
+
+    @Override
+    public Flux<StreamMessage<K, V>> xclaim(K key, Consumer<K> consumer, long minIdleTime, String... messageIds) {
+        return createDissolvingFlux(() -> commandBuilder.xclaim(key, consumer, XClaimArgs.Builder.minIdleTime(minIdleTime),
+                messageIds));
+    }
+
+    @Override
+    public Flux<StreamMessage<K, V>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds) {
+        return createDissolvingFlux(() -> commandBuilder.xclaim(key, consumer, args, messageIds));
+    }
+
+    @Override
+    public Mono<Long> xdel(K key, String... messageIds) {
+        return createMono(() -> commandBuilder.xdel(key, messageIds));
+    }
+
+    @Override
+    public Mono<String> xgroupCreate(K key, K group, String offset) {
+        return createMono(() -> commandBuilder.xgroupCreate(key, group, offset));
+    }
+
+    @Override
+    public Mono<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer) {
+        throw new UnsupportedOperationException("Not supported yet");
+    }
+
+    @Override
+    public Mono<Boolean> xgroupSetid(K key, K group, String offset) {
+        throw new UnsupportedOperationException("Not supported yet");
+    }
+
+    @Override
+    public Mono<Long> xlen(K key) {
+        return createMono(() -> commandBuilder.xlen(key));
+    }
+
+    @Override
+    public Flux<Object> xpending(K key, K group) {
+        return xpending(key, group, Range.unbounded(), Limit.unlimited());
+    }
+
+    @Override
+    public Flux<Object> xpending(K key, K group, Range<String> range, Limit limit) {
+        return createDissolvingFlux(() -> commandBuilder.xpending(key, group, range, limit));
+    }
+
+    @Override
+    public Flux<Object> xpending(K key, Consumer<K> consumer, Range<String> range, Limit limit) {
+        return createDissolvingFlux(() -> commandBuilder.xpending(key, consumer, range, limit));
+    }
+
+    @Override
+    public Flux<StreamMessage<K, V>> xrange(K key, Range<String> range) {
+        return createDissolvingFlux(() -> commandBuilder.xrange(key, range, Limit.unlimited()));
+    }
+
+    @Override
+    public Flux<StreamMessage<K, V>> xrange(K key, Range<String> range, Limit limit) {
+        return createDissolvingFlux(() -> commandBuilder.xrange(key, range, limit));
+    }
+
+    @Override
+    public Flux<StreamMessage<K, V>> xread(XReadArgs.StreamOffset<K>... streams) {
+        return createDissolvingFlux(() -> commandBuilder.xread(null, streams));
+    }
+
+    @Override
+    public Flux<StreamMessage<K, V>> xread(XReadArgs args, XReadArgs.StreamOffset<K>... streams) {
+        return createDissolvingFlux(() -> commandBuilder.xread(args, streams));
+    }
+
+    @Override
+    public Flux<StreamMessage<K, V>> xreadgroup(Consumer<K> consumer, XReadArgs.StreamOffset<K>... streams) {
+        return createDissolvingFlux(() -> commandBuilder.xreadgroup(consumer, null, streams));
+    }
+
+    @Override
+    public Flux<StreamMessage<K, V>> xreadgroup(Consumer<K> consumer, XReadArgs args, XReadArgs.StreamOffset<K>... streams) {
+        return createDissolvingFlux(() -> commandBuilder.xreadgroup(consumer, args, streams));
+    }
+
+    @Override
+    public Flux<StreamMessage<K, V>> xrevrange(K key, Range<String> range) {
+        return xrevrange(key, range, Limit.unlimited());
+    }
+
+    @Override
+    public Flux<StreamMessage<K, V>> xrevrange(K key, Range<String> range, Limit limit) {
+        return createDissolvingFlux(() -> commandBuilder.xrevrange(key, range, limit));
+    }
+
+    @Override
+    public Mono<Long> xtrim(K key, long count) {
+        return createMono(() -> commandBuilder.xtrim(key, count));
+    }
+
     @Override
     public Mono<Long> zadd(K key, double score, V member) {
         return createMono(() -> commandBuilder.zadd(key, null, score, member));
diff --git a/src/main/java/com/lambdaworks/redis/Consumer.java b/src/main/java/io/lettuce/core/Consumer.java
similarity index 93%
rename from src/main/java/com/lambdaworks/redis/Consumer.java
rename to src/main/java/io/lettuce/core/Consumer.java
index 6550f60607..2a80616d2f 100644
--- a/src/main/java/com/lambdaworks/redis/Consumer.java
+++ b/src/main/java/io/lettuce/core/Consumer.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.util.Objects;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Value object representing a Stream consumer within a consumer group. Group name and consumer name are encoded as keys.
  *
  * @author Mark Paluch
- * @since 4.5
- * @see com.lambdaworks.redis.codec.RedisCodec
+ * @since 5.1
+ * @see io.lettuce.core.codec.RedisCodec
  */
 public class Consumer<K> {
 
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 2eddb97c90..5959c02afc 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -22,8 +22,7 @@
 import java.nio.ByteBuffer;
 import java.util.*;
 
-import com.lambdaworks.redis.Range.Boundary;
-
+import io.lettuce.core.Range.Boundary;
 import io.lettuce.core.XReadArgs.StreamOffset;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
@@ -2052,8 +2051,8 @@ public Command<K, V, Long> xack(K key, K group, String[] messageIds) {
         return createCommand(XACK, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, String[] messageIds,
-            XClaimArgs xClaimArgs) {
+    public Command<K, V, List<StreamMessage<K, V>>> xclaim(K key, Consumer<K> consumer, XClaimArgs xClaimArgs,
+            String[] messageIds) {
 
         notNullKey(key);
         LettuceAssert.notNull(consumer, "Consumer " + MUST_NOT_BE_NULL);
@@ -2248,7 +2247,7 @@ private static String getUpperValue(Range<String> range) {
         return range.getUpper().getValue();
     }
 
-    public Command<K, V, List<StreamMessage<K, V>>> xread(StreamOffset<K>[] streams, XReadArgs xReadArgs) {
+    public Command<K, V, List<StreamMessage<K, V>>> xread(XReadArgs xReadArgs, StreamOffset<K>[] streams) {
         LettuceAssert.notNull(streams, "Streams " + MUST_NOT_BE_NULL);
         LettuceAssert.isTrue(streams.length > 0, "Streams " + MUST_NOT_BE_EMPTY);
 
@@ -2271,8 +2270,8 @@ public Command<K, V, List<StreamMessage<K, V>>> xread(StreamOffset<K>[] streams,
         return createCommand(XREAD, new StreamReadOutput<>(codec), args);
     }
 
-    public Command<K, V, List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, XReadArgs.StreamOffset<K>[] streams,
-            XReadArgs xReadArgs) {
+    public Command<K, V, List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer, XReadArgs xReadArgs,
+            StreamOffset<K>[] streams) {
         LettuceAssert.notNull(streams, "Streams " + MUST_NOT_BE_NULL);
         LettuceAssert.isTrue(streams.length > 0, "Streams " + MUST_NOT_BE_EMPTY);
         LettuceAssert.notNull(consumer, "Consumer " + MUST_NOT_BE_NULL);
diff --git a/src/main/java/io/lettuce/core/StreamMessage.java b/src/main/java/io/lettuce/core/StreamMessage.java
index 42cfe14065..2509410353 100644
--- a/src/main/java/io/lettuce/core/StreamMessage.java
+++ b/src/main/java/io/lettuce/core/StreamMessage.java
@@ -22,7 +22,7 @@
  * A stream message and its id.
  *
  * @author Mark Paluch
- * @since 4.5
+ * @since 5.1
  */
 public class StreamMessage<K, V> {
 
diff --git a/src/main/java/io/lettuce/core/XAddArgs.java b/src/main/java/io/lettuce/core/XAddArgs.java
index 3b0ce91a3d..74700b0997 100644
--- a/src/main/java/io/lettuce/core/XAddArgs.java
+++ b/src/main/java/io/lettuce/core/XAddArgs.java
@@ -15,29 +15,41 @@
  */
 package io.lettuce.core;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandKeyword;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandKeyword;
 
 /**
- * Args for the {@literal XADD} command.
+ * Argument list builder for the Redis <a href="http://redis.io/commands/xadd">XADD</a> command. Static import the methods from
+ * {@link Builder} and call the methods: {@code maxlen(…)} .
+ * <p/>
+ * {@link XAddArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
+ * @since 5.1
  */
 public class XAddArgs {
 
     private String id;
     private Long maxlen;
 
+    /**
+     * Builder entry points for {@link XAddArgs}.
+     */
     public static class Builder {
 
         /**
          * Utility constructor.
          */
         private Builder() {
-
         }
 
+        /**
+         * Creates new {@link XAddArgs} and setting {@literal MAXLEN}.
+         *
+         * @return new {@link XAddArgs} with {@literal MAXLEN} set.
+         * @see XAddArgs#maxlen(long)
+         */
         public static XAddArgs maxlen(long count) {
             return new XAddArgs().maxlen(count);
         }
@@ -50,7 +62,9 @@ public static XAddArgs maxlen(long count) {
      * @return {@code this}
      */
     public XAddArgs id(String id) {
+
         LettuceAssert.notNull(id, "Id must not be null");
+
         this.id = id;
         return this;
     }
@@ -62,12 +76,15 @@ public XAddArgs id(String id) {
      * @return {@code this}
      */
     public XAddArgs maxlen(long maxlen) {
+
         LettuceAssert.isTrue(maxlen > 0, "Maxlen must be greater 0");
+
         this.maxlen = maxlen;
         return this;
     }
 
     public <K, V> void build(CommandArgs<K, V> args) {
+
         if (maxlen != null) {
             args.add(CommandKeyword.MAXLEN).add(maxlen);
         }
diff --git a/src/main/java/com/lambdaworks/redis/XClaimArgs.java b/src/main/java/io/lettuce/core/XClaimArgs.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/XClaimArgs.java
rename to src/main/java/io/lettuce/core/XClaimArgs.java
index 9e41d1774a..f69a11d4de 100644
--- a/src/main/java/com/lambdaworks/redis/XClaimArgs.java
+++ b/src/main/java/io/lettuce/core/XClaimArgs.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis;
+package io.lettuce.core;
 
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.TemporalAccessor;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandKeyword;
-import com.lambdaworks.redis.protocol.CommandType;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandKeyword;
+import io.lettuce.core.protocol.CommandType;
 
 /**
  * Argument list builder for the Redis <a href="http://redis.io/commands/xclaim">XCLAIM</a> command. Static import the methods
@@ -31,7 +31,7 @@
  * {@link XClaimArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
- * @since 4.5
+ * @since 5.1
  */
 public class XClaimArgs {
 
diff --git a/src/main/java/io/lettuce/core/XReadArgs.java b/src/main/java/io/lettuce/core/XReadArgs.java
index 42c660a9d0..a30e1a8d64 100644
--- a/src/main/java/io/lettuce/core/XReadArgs.java
+++ b/src/main/java/io/lettuce/core/XReadArgs.java
@@ -15,14 +15,20 @@
  */
 package io.lettuce.core;
 
-import com.lambdaworks.redis.internal.LettuceAssert;
-import com.lambdaworks.redis.protocol.CommandArgs;
-import com.lambdaworks.redis.protocol.CommandKeyword;
+import java.time.Duration;
+
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandKeyword;
 
 /**
- * Args for the {@literal XREAD} command.
+ * Argument list builder for the Redis <a href="http://redis.io/commands/xread">XREAD</a> and {@literal XREADGROUP} commands.
+ * Static import the methods from {@link XReadArgs.Builder} and call the methods: {@code block(…)} .
+ * <p/>
+ * {@link XReadArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
+ * @since 5.1
  */
 public class XReadArgs {
 
@@ -30,39 +36,99 @@ public class XReadArgs {
     private Long count;
     private boolean noack;
 
+    /**
+     * Builder entry points for {@link XReadArgs}.
+     */
     public static class Builder {
 
         /**
          * Utility constructor.
          */
         private Builder() {
-
         }
 
+        /**
+         * Create a new {@link XReadArgs} and set {@literal BLOCK}.
+         *
+         * @param milliseconds time to block.
+         * @return new {@link XReadArgs} with {@literal BLOCK} set.
+         * @see XReadArgs#block(long)
+         */
         public static XReadArgs block(long milliseconds) {
             return new XReadArgs().block(milliseconds);
         }
 
+        /**
+         * Create a new {@link XReadArgs} and set {@literal BLOCK}.
+         *
+         * @param timeout time to block.
+         * @return new {@link XReadArgs} with {@literal BLOCK} set.
+         * @see XReadArgs#block(Duration)
+         */
+        public static XReadArgs block(Duration timeout) {
+
+            LettuceAssert.notNull(timeout, "Block timeout must not be null");
+
+            return block(timeout.toMillis());
+        }
+
+        /**
+         * Create a new {@link XReadArgs} and set {@literal COUNT}.
+         *
+         * @param count
+         * @return new {@link XReadArgs} with {@literal COUNT} set.
+         */
         public static XReadArgs count(long count) {
             return new XReadArgs().count(count);
         }
 
+        /**
+         * Create a new {@link XReadArgs} and set {@literal NOACK}.
+         *
+         * @return new {@link XReadArgs} with {@literal NOACK} set.
+         * @see XReadArgs#noack(boolean)
+         */
+        public static XReadArgs noack() {
+            return noack(true);
+        }
+
+        /**
+         * Create a new {@link XReadArgs} and set {@literal NOACK}.
+         *
+         * @param noack
+         * @return new {@link XReadArgs} with {@literal NOACK} set.
+         * @see XReadArgs#noack(boolean)
+         */
         public static XReadArgs noack(boolean noack) {
             return new XReadArgs().noack(noack);
         }
     }
 
     /**
-     * Wait up to {@code milliseconds} for a new stream message.
+     * Perform a blocking read and wait up to {@code milliseconds} for a new stream message.
      *
      * @param milliseconds max time to wait.
      * @return {@code this}.
      */
     public XReadArgs block(long milliseconds) {
+
         this.block = milliseconds;
         return this;
     }
 
+    /**
+     * Perform a blocking read and wait up to a {@link Duration timeout} for a new stream message.
+     *
+     * @param timeout max time to wait.
+     * @return {@code this}.
+     */
+    public XReadArgs block(Duration timeout) {
+
+        LettuceAssert.notNull(timeout, "Block timeout must not be null");
+
+        return block(timeout.toMillis());
+    }
+
     /**
      * Limit read to {@code count} messages.
      *
@@ -70,17 +136,19 @@ public XReadArgs block(long milliseconds) {
      * @return {@code this}.
      */
     public XReadArgs count(long count) {
+
         this.count = count;
         return this;
     }
 
     /**
-     * Use NOACK option to disable auto-acknowledgement.
+     * Use NOACK option to disable auto-acknowledgement. Only valid for {@literal XREADGROUP}.
      *
      * @param noack {@literal true} to disable auto-ack.
      * @return {@code this}.
      */
     public XReadArgs noack(boolean noack) {
+
         this.noack = noack;
         return this;
     }
@@ -101,7 +169,7 @@ public <K, V> void build(CommandArgs<K, V> args) {
     }
 
     /**
-     * Value object representing a Stream consumer group.
+     * Value object representing a Stream with its offset.
      */
     public static class StreamOffset<K> {
 
@@ -127,12 +195,13 @@ public static <K> StreamOffset<K> latest(K name) {
         }
 
         /**
-         * Read all new arriving elements from the stream identified by {@code name}.
+         * Read all new arriving elements from the stream identified by {@code name} with ids greater than the last one consumed
+         * by the consumer group.
          *
          * @param name must not be {@literal null}.
          * @return the {@link StreamOffset} object without a specific offset.
          */
-        public static <K> StreamOffset<K> latestConsumer(K name) {
+        public static <K> StreamOffset<K> lastConsumed(K name) {
 
             LettuceAssert.notNull(name, "Stream must not be null");
 
@@ -153,6 +222,18 @@ public static <K> StreamOffset<K> from(K name, String offset) {
 
             return new StreamOffset<>(name, offset);
         }
-    }
 
+        public K getName() {
+            return name;
+        }
+
+        public String getOffset() {
+            return offset;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("%s:%s", name, offset);
+        }
+    }
 }
diff --git a/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
index 21b231c32f..bb8b27c10f 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
@@ -27,11 +27,11 @@
  * @author Mark Paluch
  * @since 3.0
  */
-public interface RedisAsyncCommands<K, V> extends RedisHashAsyncCommands<K, V>, RedisKeyAsyncCommands<K, V>,
-        RedisStringAsyncCommands<K, V>, RedisListAsyncCommands<K, V>, RedisSetAsyncCommands<K, V>,
-        RedisSortedSetAsyncCommands<K, V>, RedisScriptingAsyncCommands<K, V>, RedisServerAsyncCommands<K, V>,
-        RedisHLLAsyncCommands<K, V>, BaseRedisAsyncCommands<K, V>, RedisClusterAsyncCommands<K, V>,
-        RedisTransactionalAsyncCommands<K, V>, RedisGeoAsyncCommands<K, V> {
+public interface RedisAsyncCommands<K, V> extends BaseRedisAsyncCommands<K, V>, RedisClusterAsyncCommands<K, V>,
+        RedisGeoAsyncCommands<K, V>, RedisHashAsyncCommands<K, V>, RedisHLLAsyncCommands<K, V>, RedisKeyAsyncCommands<K, V>,
+        RedisListAsyncCommands<K, V>, RedisScriptingAsyncCommands<K, V>, RedisServerAsyncCommands<K, V>,
+        RedisSetAsyncCommands<K, V>, RedisSortedSetAsyncCommands<K, V>, RedisStreamAsyncCommands<K, V>,
+        RedisStringAsyncCommands<K, V>, RedisTransactionalAsyncCommands<K, V> {
 
     /**
      * Authenticate to the server.
diff --git a/src/main/java/com/lambdaworks/redis/api/async/RedisStreamAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/api/async/RedisStreamAsyncCommands.java
rename to src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
index e6296385f2..6e80b8cc27 100644
--- a/src/main/java/com/lambdaworks/redis/api/async/RedisStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.async;
+package io.lettuce.core.api.async;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.XReadArgs.StreamOffset;
+import io.lettuce.core.*;
+import io.lettuce.core.XReadArgs.StreamOffset;
 
 /**
  * Asynchronous executed commands for Streams.
@@ -27,8 +27,8 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
- * @since 4.5
- * @generated by com.lambdaworks.apigenerator.CreateAsyncApi
+ * @since 5.1
+ * @generated by io.lettuce.apigenerator.CreateAsyncApi
  */
 public interface RedisStreamAsyncCommands<K, V> {
 
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
index 78a1c4486e..70c5c8aee1 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
@@ -27,11 +27,11 @@
  * @author Mark Paluch
  * @since 5.0
  */
-public interface RedisReactiveCommands<K, V> extends RedisHashReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>,
-        RedisStringReactiveCommands<K, V>, RedisListReactiveCommands<K, V>, RedisSetReactiveCommands<K, V>,
-        RedisSortedSetReactiveCommands<K, V>, RedisScriptingReactiveCommands<K, V>, RedisServerReactiveCommands<K, V>,
-        RedisHLLReactiveCommands<K, V>, BaseRedisReactiveCommands<K, V>, RedisClusterReactiveCommands<K, V>,
-        RedisTransactionalReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V> {
+public interface RedisReactiveCommands<K, V> extends BaseRedisReactiveCommands<K, V>, RedisClusterReactiveCommands<K, V>,
+        RedisGeoReactiveCommands<K, V>, RedisHashReactiveCommands<K, V>, RedisHLLReactiveCommands<K, V>,
+        RedisKeyReactiveCommands<K, V>, RedisListReactiveCommands<K, V>, RedisScriptingReactiveCommands<K, V>,
+        RedisServerReactiveCommands<K, V>, RedisSetReactiveCommands<K, V>, RedisSortedSetReactiveCommands<K, V>,
+        RedisStreamReactiveCommands<K, V>, RedisStringReactiveCommands<K, V>, RedisTransactionalReactiveCommands<K, V> {
 
     /**
      * Authenticate to the server.
diff --git a/src/main/java/com/lambdaworks/redis/api/rx/RedisStreamReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
similarity index 77%
rename from src/main/java/com/lambdaworks/redis/api/rx/RedisStreamReactiveCommands.java
rename to src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
index 41fa85fabc..50e9e1d2aa 100644
--- a/src/main/java/com/lambdaworks/redis/api/rx/RedisStreamReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.rx;
+package io.lettuce.core.api.reactive;
 
 import java.util.Map;
 
-import rx.Observable;
-
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.XReadArgs.StreamOffset;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import io.lettuce.core.*;
+import io.lettuce.core.XReadArgs.StreamOffset;
 
 /**
- * Observable commands for Streams.
+ * Reactive executed commands for Streams.
  *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
- * @since 4.5
- * @generated by com.lambdaworks.apigenerator.CreateReactiveApi
+ * @since 5.1
+ * @generated by io.lettuce.apigenerator.CreateReactiveApi
  */
 public interface RedisStreamReactiveCommands<K, V> {
 
@@ -41,7 +41,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param messageIds message Id's to acknowledge.
      * @return simple-reply the lenght of acknowledged messages.
      */
-    Observable<Long> xack(K key, K group, String... messageIds);
+    Mono<Long> xack(K key, K group, String... messageIds);
 
     /**
      * Append a message to the stream {@code key}.
@@ -50,7 +50,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param body message body.
      * @return simple-reply the message Id.
      */
-    Observable<String> xadd(K key, Map<K, V> body);
+    Mono<String> xadd(K key, Map<K, V> body);
 
     /**
      * Append a message to the stream {@code key}.
@@ -60,7 +60,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param body message body.
      * @return simple-reply the message Id.
      */
-    Observable<String> xadd(K key, XAddArgs args, Map<K, V> body);
+    Mono<String> xadd(K key, XAddArgs args, Map<K, V> body);
 
     /**
      * Append a message to the stream {@code key}.
@@ -69,7 +69,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param keysAndValues message body.
      * @return simple-reply the message Id.
      */
-    Observable<String> xadd(K key, Object... keysAndValues);
+    Mono<String> xadd(K key, Object... keysAndValues);
 
     /**
      * Append a message to the stream {@code key}.
@@ -79,7 +79,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param keysAndValues message body.
      * @return simple-reply the message Id.
      */
-    Observable<String> xadd(K key, XAddArgs args, Object... keysAndValues);
+    Mono<String> xadd(K key, XAddArgs args, Object... keysAndValues);
 
     /**
      * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
@@ -90,7 +90,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param messageIds message Id's to claim.
      * @return simple-reply the {@link StreamMessage}
      */
-    Observable<StreamMessage<K, V>> xclaim(K key, Consumer<K> consumer, long minIdleTime, String... messageIds);
+    Flux<StreamMessage<K, V>> xclaim(K key, Consumer<K> consumer, long minIdleTime, String... messageIds);
 
     /**
      * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
@@ -101,7 +101,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param messageIds message Id's to claim.
      * @return simple-reply the {@link StreamMessage}
      */
-    Observable<StreamMessage<K, V>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds);
+    Flux<StreamMessage<K, V>> xclaim(K key, Consumer<K> consumer, XClaimArgs args, String... messageIds);
 
     /**
      * Removes the specified entries from the stream. Returns the number of items deleted, that may be different from the number
@@ -111,7 +111,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param messageIds stream message Id's.
      * @return simple-reply number of removed entries.
      */
-    Observable<Long> xdel(K key, String... messageIds);
+    Mono<Long> xdel(K key, String... messageIds);
 
     /**
      * Create a consumer group.
@@ -121,7 +121,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param offset read offset or {@literal $}.
      * @return simple-reply {@literal true} if successful.
      */
-    Observable<String> xgroupCreate(K key, K group, String offset);
+    Mono<String> xgroupCreate(K key, K group, String offset);
 
     /**
      * Delete a consumer from a consumer group.
@@ -130,7 +130,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param consumer consumer identified by group name and consumer key.
      * @return simple-reply the number of pending messages
      */
-    Observable<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer);
+    Mono<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer);
 
     /**
      * Set the current {@code group} id.
@@ -140,7 +140,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param offset read offset or {@literal $}.
      * @return simple-reply the lenght of the stream.
      */
-    Observable<Boolean> xgroupSetid(K key, K group, String offset);
+    Mono<Boolean> xgroupSetid(K key, K group, String offset);
 
     /**
      * Get the length of a steam.
@@ -148,7 +148,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param key the stream key.
      * @return simple-reply the lenght of the stream.
      */
-    Observable<Long> xlen(K key);
+    Mono<Long> xlen(K key);
 
     /**
      * Read pending messages from a stream for a {@code group}.
@@ -157,7 +157,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param group name of the consumer group.
      * @return Object array-reply list pending entries.
      */
-    Observable<Object> xpending(K key, K group);
+    Flux<Object> xpending(K key, K group);
 
     /**
      * Read pending messages from a stream within a specific {@link Range}.
@@ -168,7 +168,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param limit must not be {@literal null}.
      * @return Object array-reply list with members of the resulting stream.
      */
-    Observable<Object> xpending(K key, K group, Range<String> range, Limit limit);
+    Flux<Object> xpending(K key, K group, Range<String> range, Limit limit);
 
     /**
      * Read pending messages from a stream within a specific {@link Range}.
@@ -179,7 +179,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param limit must not be {@literal null}.
      * @return Object array-reply list with members of the resulting stream.
      */
-    Observable<Object> xpending(K key, Consumer<K> consumer, Range<String> range, Limit limit);
+    Flux<Object> xpending(K key, Consumer<K> consumer, Range<String> range, Limit limit);
 
     /**
      * Read messages from a stream within a specific {@link Range}.
@@ -188,7 +188,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param range must not be {@literal null}.
      * @return StreamMessage array-reply list with members of the resulting stream.
      */
-    Observable<StreamMessage<K, V>> xrange(K key, Range<String> range);
+    Flux<StreamMessage<K, V>> xrange(K key, Range<String> range);
 
     /**
      * Read messages from a stream within a specific {@link Range} applying a {@link Limit}.
@@ -198,7 +198,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param limit must not be {@literal null}.
      * @return StreamMessage array-reply list with members of the resulting stream.
      */
-    Observable<StreamMessage<K, V>> xrange(K key, Range<String> range, Limit limit);
+    Flux<StreamMessage<K, V>> xrange(K key, Range<String> range, Limit limit);
 
     /**
      * Read messages from one or more {@link StreamOffset}s.
@@ -206,7 +206,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param streams the streams to read from.
      * @return StreamMessage array-reply list with members of the resulting stream.
      */
-    Observable<StreamMessage<K, V>> xread(StreamOffset<K>... streams);
+    Flux<StreamMessage<K, V>> xread(StreamOffset<K>... streams);
 
     /**
      * Read messages from one or more {@link StreamOffset}s.
@@ -215,7 +215,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param streams the streams to read from.
      * @return StreamMessage array-reply list with members of the resulting stream.
      */
-    Observable<StreamMessage<K, V>> xread(XReadArgs args, StreamOffset<K>... streams);
+    Flux<StreamMessage<K, V>> xread(XReadArgs args, StreamOffset<K>... streams);
 
     /**
      * Read messages from one or more {@link StreamOffset}s using a consumer group.
@@ -224,7 +224,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param streams the streams to read from.
      * @return StreamMessage array-reply list with members of the resulting stream.
      */
-    Observable<StreamMessage<K, V>> xreadgroup(Consumer<K> consumer, StreamOffset<K>... streams);
+    Flux<StreamMessage<K, V>> xreadgroup(Consumer<K> consumer, StreamOffset<K>... streams);
 
     /**
      * Read messages from one or more {@link StreamOffset}s using a consumer group.
@@ -234,7 +234,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param streams the streams to read from.
      * @return StreamMessage array-reply list with members of the resulting stream.
      */
-    Observable<StreamMessage<K, V>> xreadgroup(Consumer<K> consumer, XReadArgs args, StreamOffset<K>... streams);
+    Flux<StreamMessage<K, V>> xreadgroup(Consumer<K> consumer, XReadArgs args, StreamOffset<K>... streams);
 
     /**
      * Read messages from a stream within a specific {@link Range} in reverse order.
@@ -243,7 +243,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param range must not be {@literal null}.
      * @return StreamMessage array-reply list with members of the resulting stream.
      */
-    Observable<StreamMessage<K, V>> xrevrange(K key, Range<String> range);
+    Flux<StreamMessage<K, V>> xrevrange(K key, Range<String> range);
 
     /**
      * Read messages from a stream within a specific {@link Range} applying a {@link Limit} in reverse order.
@@ -253,7 +253,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param limit must not be {@literal null}.
      * @return StreamMessage array-reply list with members of the resulting stream.
      */
-    Observable<StreamMessage<K, V>> xrevrange(K key, Range<String> range, Limit limit);
+    Flux<StreamMessage<K, V>> xrevrange(K key, Range<String> range, Limit limit);
 
     /**
      * Trims the stream to {@code count} elements.
@@ -262,5 +262,5 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @param count length of the stream.
      * @return simple-reply number of removed entries.
      */
-    Observable<Long> xtrim(K key, long count);
+    Mono<Long> xtrim(K key, long count);
 }
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
index 035c3d61c1..f93a46b29c 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
@@ -27,10 +27,10 @@
  * @author Mark Paluch
  * @since 3.0
  */
-public interface RedisCommands<K, V> extends RedisHashCommands<K, V>, RedisKeyCommands<K, V>, RedisStringCommands<K, V>,
-        RedisListCommands<K, V>, RedisSetCommands<K, V>, RedisSortedSetCommands<K, V>, RedisScriptingCommands<K, V>,
-        RedisServerCommands<K, V>, RedisHLLCommands<K, V>, BaseRedisCommands<K, V>, RedisClusterCommands<K, V>,
-        RedisTransactionalCommands<K, V>, RedisGeoCommands<K, V> {
+public interface RedisCommands<K, V> extends BaseRedisCommands<K, V>, RedisClusterCommands<K, V>, RedisGeoCommands<K, V>,
+        RedisHashCommands<K, V>, RedisHLLCommands<K, V>, RedisKeyCommands<K, V>, RedisListCommands<K, V>,
+        RedisScriptingCommands<K, V>, RedisServerCommands<K, V>, RedisSetCommands<K, V>, RedisSortedSetCommands<K, V>,
+        RedisStreamCommands<K, V>, RedisStringCommands<K, V>, RedisTransactionalCommands<K, V> {
 
     /**
      * Authenticate to the server.
diff --git a/src/main/java/com/lambdaworks/redis/api/sync/RedisStreamCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/api/sync/RedisStreamCommands.java
rename to src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
index c48fdf2cae..984c57e639 100644
--- a/src/main/java/com/lambdaworks/redis/api/sync/RedisStreamCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api.sync;
+package io.lettuce.core.api.sync;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.XReadArgs.StreamOffset;
+import io.lettuce.core.*;
+import io.lettuce.core.XReadArgs.StreamOffset;
 
 /**
  * Synchronous executed commands for Streams.
@@ -27,8 +27,8 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
- * @since 4.5
- * @generated by com.lambdaworks.apigenerator.CreateSyncApi
+ * @since 5.1
+ * @generated by io.lettuce.apigenerator.CreateSyncApi
  */
 public interface RedisStreamCommands<K, V> {
 
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java
index a24cda3419..905e2fb0a1 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.cluster.api.async;
 
 import io.lettuce.core.cluster.api.NodeSelectionSupport;
+import io.lettuce.core.cluster.api.sync.NodeSelectionStreamCommands;
 
 /**
  * Asynchronous and thread-safe Redis API to execute commands on a {@link NodeSelectionSupport}.
@@ -23,9 +24,8 @@
  * @author Mark Paluch
  */
 public interface NodeSelectionAsyncCommands<K, V> extends BaseNodeSelectionAsyncCommands<K, V>,
-        NodeSelectionHashAsyncCommands<K, V>, NodeSelectionHLLAsyncCommands<K, V>, NodeSelectionKeyAsyncCommands<K, V>,
-        NodeSelectionListAsyncCommands<K, V>, NodeSelectionScriptingAsyncCommands<K, V>,
+        NodeSelectionGeoAsyncCommands<K, V>, NodeSelectionHashAsyncCommands<K, V>, NodeSelectionHLLAsyncCommands<K, V>,
+        NodeSelectionKeyAsyncCommands<K, V>, NodeSelectionListAsyncCommands<K, V>, NodeSelectionScriptingAsyncCommands<K, V>,
         NodeSelectionServerAsyncCommands<K, V>, NodeSelectionSetAsyncCommands<K, V>, NodeSelectionSortedSetAsyncCommands<K, V>,
-        NodeSelectionStringAsyncCommands<K, V>, NodeSelectionGeoAsyncCommands<K, V> {
-
+        NodeSelectionStreamCommands<K, V>, NodeSelectionStringAsyncCommands<K, V> {
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStreamAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStreamAsyncCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
index 3d20685574..393a684fcd 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.async;
+package io.lettuce.core.cluster.api.async;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.XReadArgs.StreamOffset;
+import io.lettuce.core.*;
+import io.lettuce.core.XReadArgs.StreamOffset;
 
 /**
  * Asynchronous executed commands on a node selection for Streams.
@@ -27,8 +27,8 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
- * @since 4.5
- * @generated by com.lambdaworks.apigenerator.CreateAsyncNodeSelectionClusterApi
+ * @since 5.1
+ * @generated by io.lettuce.apigenerator.CreateAsyncNodeSelectionClusterApi
  */
 public interface NodeSelectionStreamAsyncCommands<K, V> {
 
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
index b2cb494487..cfd2eb2d5c 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
@@ -32,11 +32,10 @@
  * @author Mark Paluch
  * @since 4.0
  */
-public interface RedisClusterAsyncCommands<K, V>
-        extends RedisHashAsyncCommands<K, V>, RedisKeyAsyncCommands<K, V>, RedisStringAsyncCommands<K, V>,
-        RedisListAsyncCommands<K, V>, RedisSetAsyncCommands<K, V>, RedisSortedSetAsyncCommands<K, V>,
-        RedisScriptingAsyncCommands<K, V>, RedisServerAsyncCommands<K, V>, RedisHLLAsyncCommands<K, V>,
-        RedisGeoAsyncCommands<K, V>, BaseRedisAsyncCommands<K, V> {
+public interface RedisClusterAsyncCommands<K, V> extends RedisHashAsyncCommands<K, V>, RedisKeyAsyncCommands<K, V>,
+        RedisStringAsyncCommands<K, V>, RedisListAsyncCommands<K, V>, RedisSetAsyncCommands<K, V>,
+        RedisSortedSetAsyncCommands<K, V>, RedisScriptingAsyncCommands<K, V>, RedisServerAsyncCommands<K, V>,
+        RedisHLLAsyncCommands<K, V>, RedisGeoAsyncCommands<K, V>, RedisStreamAsyncCommands<K, V>, BaseRedisAsyncCommands<K, V> {
 
     /**
      * Set the default timeout for operations.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java
index 8926614f56..0a2026c180 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java
@@ -22,9 +22,9 @@
  *
  * @author Mark Paluch
  */
-public interface NodeSelectionCommands<K, V> extends BaseNodeSelectionCommands<K, V>, NodeSelectionHashCommands<K, V>,
-        NodeSelectionHLLCommands<K, V>, NodeSelectionKeyCommands<K, V>, NodeSelectionListCommands<K, V>,
-        NodeSelectionScriptingCommands<K, V>, NodeSelectionServerCommands<K, V>, NodeSelectionSetCommands<K, V>,
-        NodeSelectionSortedSetCommands<K, V>, NodeSelectionStringCommands<K, V>, NodeSelectionGeoCommands<K, V> {
-
+public interface NodeSelectionCommands<K, V> extends BaseNodeSelectionCommands<K, V>, NodeSelectionGeoCommands<K, V>,
+        NodeSelectionHashCommands<K, V>, NodeSelectionHLLCommands<K, V>, NodeSelectionKeyCommands<K, V>,
+        NodeSelectionListCommands<K, V>, NodeSelectionScriptingCommands<K, V>, NodeSelectionServerCommands<K, V>,
+        NodeSelectionSetCommands<K, V>, NodeSelectionSortedSetCommands<K, V>, NodeSelectionStreamCommands<K, V>,
+        NodeSelectionStringCommands<K, V> {
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStreamCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
similarity index 97%
rename from src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStreamCommands.java
rename to src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
index 47dfe97957..825b6ad592 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionStreamCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.cluster.api.sync;
+package io.lettuce.core.cluster.api.sync;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.XReadArgs.StreamOffset;
+import io.lettuce.core.*;
+import io.lettuce.core.XReadArgs.StreamOffset;
 
 /**
  * Synchronous executed commands on a node selection for Streams.
@@ -27,8 +27,8 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
- * @since 4.5
- * @generated by com.lambdaworks.apigenerator.CreateSyncNodeSelectionClusterApi
+ * @since 5.1
+ * @generated by io.lettuce.apigenerator.CreateSyncNodeSelectionClusterApi
  */
 public interface NodeSelectionStreamCommands<K, V> {
 
diff --git a/src/main/java/com/lambdaworks/redis/models/stream/PendingEntry.java b/src/main/java/io/lettuce/core/models/stream/PendingEntry.java
similarity index 88%
rename from src/main/java/com/lambdaworks/redis/models/stream/PendingEntry.java
rename to src/main/java/io/lettuce/core/models/stream/PendingEntry.java
index 6067c5af0d..78c3446031 100644
--- a/src/main/java/com/lambdaworks/redis/models/stream/PendingEntry.java
+++ b/src/main/java/io/lettuce/core/models/stream/PendingEntry.java
@@ -13,22 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.models.stream;
+package io.lettuce.core.models.stream;
 
 /**
  * Value object representing an entry of the Pending Entry List retrieved via {@literal XPENDING}.
  *
  * @author Mark Paluch
- * @since 4.5
+ * @since 5.1
  */
 public class PendingEntry {
 
-    private String messageId;
-    private String consumer;
-    private long millisSinceDelivery;
-    private long deliveryCount;
+    private final String messageId;
+    private final String consumer;
+    private final long millisSinceDelivery;
+    private final long deliveryCount;
 
     public PendingEntry(String messageId, String consumer, long millisSinceDelivery, long deliveryCount) {
+
         this.messageId = messageId;
         this.consumer = consumer;
         this.millisSinceDelivery = millisSinceDelivery;
diff --git a/src/main/java/com/lambdaworks/redis/models/stream/PendingMessage.java b/src/main/java/io/lettuce/core/models/stream/PendingMessage.java
similarity index 96%
rename from src/main/java/com/lambdaworks/redis/models/stream/PendingMessage.java
rename to src/main/java/io/lettuce/core/models/stream/PendingMessage.java
index 56bd88009e..304204f7e7 100644
--- a/src/main/java/com/lambdaworks/redis/models/stream/PendingMessage.java
+++ b/src/main/java/io/lettuce/core/models/stream/PendingMessage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.models.stream;
+package io.lettuce.core.models.stream;
 
 import java.time.Duration;
 
@@ -21,7 +21,7 @@
  * Value object representing a pending message reported through XPENDING with range/limit.
  *
  * @author Mark Paluch
- * @since 4.5
+ * @since 5.1
  */
 public class PendingMessage {
 
diff --git a/src/main/java/com/lambdaworks/redis/models/stream/PendingMessages.java b/src/main/java/io/lettuce/core/models/stream/PendingMessages.java
similarity index 86%
rename from src/main/java/com/lambdaworks/redis/models/stream/PendingMessages.java
rename to src/main/java/io/lettuce/core/models/stream/PendingMessages.java
index 361415e713..ee02875321 100644
--- a/src/main/java/com/lambdaworks/redis/models/stream/PendingMessages.java
+++ b/src/main/java/io/lettuce/core/models/stream/PendingMessages.java
@@ -13,14 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.models.stream;
+package io.lettuce.core.models.stream;
 
 import java.util.Map;
 
-import com.lambdaworks.redis.Range;
+import io.lettuce.core.Range;
 
 /**
+ * Value object representing the output of the Redis {@literal XPENDING} reporting a summary on pending messages.
+ *
  * @author Mark Paluch
+ * @since 5.1
  */
 public class PendingMessages {
 
@@ -29,6 +32,7 @@ public class PendingMessages {
     private final Map<String, Long> consumerMessageCount;
 
     public PendingMessages(long count, Range<String> messageIds, Map<String, Long> consumerMessageCount) {
+
         this.count = count;
         this.messageIds = messageIds;
         this.consumerMessageCount = consumerMessageCount;
diff --git a/src/main/java/com/lambdaworks/redis/models/stream/PendingParser.java b/src/main/java/io/lettuce/core/models/stream/PendingParser.java
similarity index 94%
rename from src/main/java/com/lambdaworks/redis/models/stream/PendingParser.java
rename to src/main/java/io/lettuce/core/models/stream/PendingParser.java
index d253bee5a4..d862acad79 100644
--- a/src/main/java/com/lambdaworks/redis/models/stream/PendingParser.java
+++ b/src/main/java/io/lettuce/core/models/stream/PendingParser.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.models.stream;
+package io.lettuce.core.models.stream;
 
 import java.util.*;
 
-import com.lambdaworks.redis.Range;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.Range;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Parser for redis <a href="http://redis.io/commands/xpending">XPENDING</a> command output.
  *
  * @author Mark Paluch
- * @since 4.5
+ * @since 5.1
  */
 public class PendingParser {
 
@@ -35,7 +35,7 @@ private PendingParser() {
     }
 
     /**
-     * Parse the output of the Redis {@literal XPENDING} command with {@link com.lambdaworks.redis.Range}.
+     * Parse the output of the Redis {@literal XPENDING} command with {@link Range}.
      *
      * @param xpendingOutput output of the Redis {@literal XPENDING}.
      * @return list of {@link PendingMessage}s.
diff --git a/src/main/java/io/lettuce/core/models/stream/package-info.java b/src/main/java/io/lettuce/core/models/stream/package-info.java
new file mode 100644
index 0000000000..587dad7151
--- /dev/null
+++ b/src/main/java/io/lettuce/core/models/stream/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Model and parser for the Stream-related command output such as {@literal XPENDING}.
+ */
+package io.lettuce.core.models.stream;
+
diff --git a/src/main/java/com/lambdaworks/redis/output/StreamMessageListOutput.java b/src/main/java/io/lettuce/core/output/StreamMessageListOutput.java
similarity index 91%
rename from src/main/java/com/lambdaworks/redis/output/StreamMessageListOutput.java
rename to src/main/java/io/lettuce/core/output/StreamMessageListOutput.java
index 8f5aa63d54..9da9c8ebab 100644
--- a/src/main/java/com/lambdaworks/redis/output/StreamMessageListOutput.java
+++ b/src/main/java/io/lettuce/core/output/StreamMessageListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.output;
+package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
 import java.util.Collections;
@@ -21,15 +21,15 @@
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.StreamMessage;
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
+import io.lettuce.core.StreamMessage;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * {@link List} of {@link StreamMessage}s.
  *
  * @author Mark Paluch
- * @since 4.5
+ * @since 5.1
  */
 public class StreamMessageListOutput<K, V> extends CommandOutput<K, V, List<StreamMessage<K, V>>> implements
         StreamingOutput<StreamMessage<K, V>> {
diff --git a/src/main/java/io/lettuce/core/output/StreamReadOutput.java b/src/main/java/io/lettuce/core/output/StreamReadOutput.java
index 832687d76d..4c1c5456af 100644
--- a/src/main/java/io/lettuce/core/output/StreamReadOutput.java
+++ b/src/main/java/io/lettuce/core/output/StreamReadOutput.java
@@ -21,14 +21,13 @@
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.codec.RedisCodec;
-import com.lambdaworks.redis.internal.LettuceAssert;
-
 import io.lettuce.core.StreamMessage;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * @author Mark Paluch
- * @since 4.5
+ * @since 5.1
  */
 public class StreamReadOutput<K, V> extends CommandOutput<K, V, List<StreamMessage<K, V>>> implements
         StreamingOutput<StreamMessage<K, V>> {
diff --git a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index 04fa1b27ee..6e6c2cf681 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -383,7 +383,7 @@ protected void safeSet(CommandOutput<?, ?, ?> output, ByteBuffer bytes, RedisCom
      * @param bytes
      * @param command
      */
-    protected void safeSetSingle(CommandOutput<K, V, ?> output, ByteBuffer bytes, RedisCommand<K, V, ?> command) {
+    protected void safeSetSingle(CommandOutput<?, ?, ?> output, ByteBuffer bytes, RedisCommand<?, ?, ?> command) {
 
         try {
             output.set(bytes);
diff --git a/src/main/templates/com/lambdaworks/redis/api/RedisStreamCommands.java b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
similarity index 97%
rename from src/main/templates/com/lambdaworks/redis/api/RedisStreamCommands.java
rename to src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
index 914a252405..8f49ec1c9a 100644
--- a/src/main/templates/com/lambdaworks/redis/api/RedisStreamCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.api;
+package io.lettuce.core.api;
 
 import java.util.List;
 import java.util.Map;
 
-import com.lambdaworks.redis.*;
-import com.lambdaworks.redis.XReadArgs.StreamOffset;
+import io.lettuce.core.*;
+import io.lettuce.core.XReadArgs.StreamOffset;
 
 /**
  * ${intent} for Streams.
@@ -27,7 +27,7 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
- * @since 4.5
+ * @since 5.1
  */
 public interface RedisStreamCommands<K, V> {
 
diff --git a/src/test/java/io/lettuce/apigenerator/Constants.java b/src/test/java/io/lettuce/apigenerator/Constants.java
index d12648b03f..9dbe29d9fb 100644
--- a/src/test/java/io/lettuce/apigenerator/Constants.java
+++ b/src/test/java/io/lettuce/apigenerator/Constants.java
@@ -22,10 +22,10 @@
  */
 class Constants {
 
-    public final static String[] TEMPLATE_NAMES = { "RedisHashCommands", "RedisHLLCommands", "RedisKeyCommands",
-            "RedisListCommands", "RedisScriptingCommands", "RedisServerCommands", "RedisSetCommands", "RedisSortedSetCommands",
-            "RedisStringCommands", "RedisTransactionalCommands", "RedisSentinelCommands", "BaseRedisCommands",
-            "RedisGeoCommands" };
+    public final static String[] TEMPLATE_NAMES = { "BaseRedisCommands", "RedisGeoCommands", "RedisHashCommands",
+            "RedisHLLCommands", "RedisKeyCommands", "RedisListCommands", "RedisScriptingCommands", "RedisSentinelCommands",
+            "RedisServerCommands", "RedisSetCommands", "RedisSortedSetCommands", "RedisStreamCommands", "RedisStringCommands",
+            "RedisTransactionalCommands" };
 
     public final static File TEMPLATES = new File("src/main/templates");
     public final static File SOURCES = new File("src/main/java");
diff --git a/src/test/java/com/lambdaworks/redis/commands/StreamCommandTest.java b/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
similarity index 90%
rename from src/test/java/com/lambdaworks/redis/commands/StreamCommandTest.java
rename to src/test/java/io/lettuce/core/commands/StreamCommandTest.java
index 45d2057b24..ab98179def 100644
--- a/src/test/java/com/lambdaworks/redis/commands/StreamCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,32 +13,41 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands;
+package io.lettuce.core.commands;
 
-import static com.lambdaworks.redis.protocol.CommandType.XINFO;
+import static io.lettuce.core.protocol.CommandType.XINFO;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 import java.time.Instant;
 import java.util.*;
 
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import io.lettuce.core.StreamMessage;
-import io.lettuce.core.XAddArgs;
+import io.lettuce.RedisConditions;
+import io.lettuce.core.*;
 import io.lettuce.core.XReadArgs.StreamOffset;
-import com.lambdaworks.redis.codec.StringCodec;
-import com.lambdaworks.redis.models.stream.PendingMessage;
-import com.lambdaworks.redis.models.stream.PendingParser;
-import com.lambdaworks.redis.output.NestedMultiOutput;
-import com.lambdaworks.redis.protocol.CommandArgs;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.models.stream.PendingMessage;
+import io.lettuce.core.models.stream.PendingParser;
+import io.lettuce.core.output.NestedMultiOutput;
+import io.lettuce.core.protocol.CommandArgs;
 
 /**
  * @author Mark Paluch
  */
 public class StreamCommandTest extends AbstractRedisClientTest {
 
+    @Before
+    public void openConnection() throws Exception {
+
+        super.openConnection();
+        assumeTrue(RedisConditions.of(redis).hasCommand("XADD"));
+    }
+
     @Test
     public void xadd() {
 
@@ -189,11 +198,11 @@ public void xreadTransactional() {
         redis.xadd("stream-2", Collections.singletonMap("key4", "value4"));
         redis.xread(StreamOffset.from("stream-1", initial1), XReadArgs.StreamOffset.from("stream-2", initial2));
 
-        List<Object> exec = redis.exec();
+        TransactionResult exec = redis.exec();
 
-        String message1 = (String) exec.get(0);
-        String message2 = (String) exec.get(1);
-        List<StreamMessage<String, String>> messages = (List) exec.get(2);
+        String message1 = exec.get(0);
+        String message2 = exec.get(1);
+        List<StreamMessage<String, String>> messages = exec.get(2);
 
         StreamMessage<String, String> firstMessage = messages.get(0);
 
@@ -229,7 +238,7 @@ public void xgroupread() {
         redis.xadd(key, Collections.singletonMap("key", "value"));
 
         List<StreamMessage<String, String>> read1 = redis.xreadgroup(Consumer.from("group", "consumer1"),
-                StreamOffset.latestConsumer(key));
+                StreamOffset.lastConsumed(key));
 
         assertThat(read1).hasSize(1);
     }
@@ -241,7 +250,7 @@ public void xpendingWithGroup() {
         redis.xgroupCreate(key, "group", "$");
         String id = redis.xadd(key, Collections.singletonMap("key", "value"));
 
-        redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.latestConsumer(key));
+        redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.lastConsumed(key));
 
         List<Object> pendingEntries = redis.xpending(key, "group");
         assertThat(pendingEntries).hasSize(4).containsSequence(1L, id, id);
@@ -254,7 +263,7 @@ public void xpending() {
         redis.xgroupCreate(key, "group", "$");
         String id = redis.xadd(key, Collections.singletonMap("key", "value"));
 
-        redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.latestConsumer(key));
+        redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.lastConsumed(key));
 
         List<Object> pendingEntries = redis.xpending(key, "group", Range.unbounded(), Limit.from(10));
 
@@ -275,7 +284,7 @@ public void xack() {
         redis.xadd(key, Collections.singletonMap("key", "value"));
 
         List<StreamMessage<String, String>> messages = redis.xreadgroup(Consumer.from("group", "consumer1"),
-                StreamOffset.latestConsumer(key));
+                StreamOffset.lastConsumed(key));
 
         Long ackd = redis.xack(key, "group", messages.get(0).getId());
         assertThat(ackd).isEqualTo(1);
@@ -292,7 +301,7 @@ public void xclaim() {
         redis.xadd(key, Collections.singletonMap("key", "value"));
 
         List<StreamMessage<String, String>> messages = redis.xreadgroup(Consumer.from("group", "consumer1"),
-                StreamOffset.latestConsumer(key));
+                StreamOffset.lastConsumed(key));
 
         List<StreamMessage<String, String>> claimedMessages = redis.xclaim(key, Consumer.from("group", "consumer2"), 0,
                 messages.get(0).getId());
@@ -311,7 +320,7 @@ public void xclaimWithArgs() {
         String id2 = redis.xadd(key, Collections.singletonMap("key", "value"));
 
         List<StreamMessage<String, String>> messages = redis.xreadgroup(Consumer.from("group", "consumer1"),
-                StreamOffset.latestConsumer(key));
+                StreamOffset.lastConsumed(key));
 
         List<StreamMessage<String, String>> claimedMessages = redis.xclaim(key, Consumer.from("group", "consumer2"),
                 XClaimArgs.Builder.minIdleTime(0).time(Instant.now().minusSeconds(60)), id1, id2);
@@ -323,7 +332,7 @@ public void xclaimWithArgs() {
         List<PendingMessage> pendingMessages = PendingParser.parseRange(xpending);
         PendingMessage message = pendingMessages.get(0);
 
-        assertThat(message.getMsSinceLastDelivery()).isGreaterThan(60000);
+        assertThat(message.getMsSinceLastDelivery()).isBetween(50000L, 80000L);
     }
 
     @Test
diff --git a/src/test/java/com/lambdaworks/redis/commands/rx/StreamRxCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandTest.java
similarity index 68%
rename from src/test/java/com/lambdaworks/redis/commands/rx/StreamRxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandTest.java
index ca43ea2802..b5db1da585 100644
--- a/src/test/java/com/lambdaworks/redis/commands/rx/StreamRxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandTest.java
@@ -13,18 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.commands.rx;
+package io.lettuce.core.commands.reactive;
 
-import com.lambdaworks.redis.api.sync.RedisCommands;
-import com.lambdaworks.redis.commands.StreamCommandTest;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.commands.StreamCommandTest;
+import io.lettuce.util.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
  */
-public class StreamRxCommandTest extends StreamCommandTest {
+public class StreamReactiveCommandTest extends StreamCommandTest {
 
     @Override
     protected RedisCommands<String, String> connect() {
-        return RxSyncInvocationHandler.sync(client.connectAsync().getStatefulConnection());
+        return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/com/lambdaworks/redis/models/stream/PendingParserTest.java b/src/test/java/io/lettuce/core/models/stream/PendingParserTest.java
similarity index 89%
rename from src/test/java/com/lambdaworks/redis/models/stream/PendingParserTest.java
rename to src/test/java/io/lettuce/core/models/stream/PendingParserTest.java
index ff9eecf348..1eeebdf183 100644
--- a/src/test/java/com/lambdaworks/redis/models/stream/PendingParserTest.java
+++ b/src/test/java/io/lettuce/core/models/stream/PendingParserTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lambdaworks.redis.models.stream;
+package io.lettuce.core.models.stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -24,7 +24,7 @@
 
 import org.junit.Test;
 
-import com.lambdaworks.redis.Range;
+import io.lettuce.core.Range;
 
 /**
  * @author Mark Paluch
@@ -34,7 +34,8 @@ public class PendingParserTest {
     @Test
     public void shouldParseXpendingWithRangeOutput() {
 
-        List<PendingMessage> result = PendingParser.parseRange(Collections.singletonList(Arrays.asList("foo", "consumer", 1L,
+        List<PendingMessage> result = PendingParser
+                .parseRange(Collections.singletonList(Arrays.asList("foo", "consumer", 1L,
                 2L)));
 
         assertThat(result).hasSize(1);

From 46f8218c2e131b6cc6cd15b6815c7b9823ecdc73 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 14 May 2018 16:02:27 +0200
Subject: [PATCH 457/808] Update release notes #776

---
 RELEASE-NOTES.md | 851 ++++++++++++-----------------------------------
 1 file changed, 220 insertions(+), 631 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index ec5b75ebcf..3f6ed302af 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,485 +1,193 @@
-Lettuce 5.0.0 RELEASE NOTES
+Lettuce 5.1.0 M1 RELEASE NOTES
 ===========================
 
-After a 13 months development phase and 208 solved tickets, 
-it is my pleasure to announce general availability of Lettuce 5.0.
-
-This is a major release coming with several breaking changes and new interesting
-features Java 9 compatibility. 
-
-Lettuce 5 introduces the dynamic Redis Commands API. This programming
-model enables you to declare command methods and invoke commands to your needs and
-support Redis Modules without waiting for Lettuce to support new commands.
-
-Lettuce defaults to native transport (epoll, kqueue) on Linux respective macOS systems 
-if the native dependency is available. You can disable this behavior by setting the 
-system property `io.lettuce.core.epoll` and `io.lettuce.core.kqueue` to `false`.
-
-Lettuce 5 comes with breaking changes; it removes deprecated interfaces 
-RedisConnection and RedisAsyncConnection and their segregated interfaces in 
-favor of StatefulRedisConnection and RedisCommands et al.
-
-Major breaking changes:
-
- 1. We moved the artifact coordinates from biz.paluch.redis:lettuce to io.lettuce:lettuce-core
- 2. We relocated packages from biz.paluch.redis to io.lettuce.core. The migration path is
-    straight-forward by replacing the old package name in your imports with the new package name.
- 3. The documentation has moved from http://redis.paluch.biz to https://lettuce.io.
- 4. Removed Guava.
- 5. We removed some deprecated methods, see below for full details.
-
-Lettuce requires only Netty and Project Reactor which brings us to the next change. 
-The reactive API is based on Reactive Streams by using 
-Project Reactor types `Mono` and `Flux` instead of RxJava 1 and `Observable`.
-If you require RxJava's `Single` and `Observable` in your code, 
-then use publisher adapters in `rxjava-reactive-streams` to adapt `Mono` and `Flux`.
-
-
-This release introduces a new reference guide that is shipped along the regular artifacts. 
-The reference guide is bound to a particular version and does not change over time, 
-such as the Wiki.
-
-Reference documentation: https://lettuce.io/core/release/reference/.
-JavaDoc documentation: https://lettuce.io/core/release/api/.
-
-```xml
-<dependency>
-  <groupId>io.lettuce</groupId>
-  <artifactId>lettuce-core</artifactId>
-  <version>5.0.0.RELEASE</version>
-</dependency>
-```
-
-You can find the full change log, containing all changes since the first 5.0 milestone release,
-at the end of this document. Watch out for BREAKING changes.
-
-Thanks to all contributors that made Lettuce 5 possible.
-
-
-Dynamic Redis Commands API
---------------------------
-
-The Redis Command Interface abstraction provides a dynamic way for typesafe Redis 
-command invocation. It allows you to declare an interface with command methods to 
-significantly reduce boilerplate code required to invoke a Redis command.
-
-Redis is a data store supporting over 190 documented commands and over 450 
-command permutations.  Command growth and keeping track with upcoming 
-modules are challenging for client developers and Redis user as there is no 
-full command coverage for each module in a single Redis client.
-
-Invoking a custom command with Lettuce requires several lines of code to 
-define command structures pass in arguments and specify the return type.
-
-```java
-RedisCodec<String, String> codec = new StringCodec();
-RedisCommands<String, String> commands = ...
-
-String response = redis.dispatch(CommandType.SET, new StatusOutput<>(codec),
-                new CommandArgs<>(codec)
-                       .addKey(key)
-                       .addValue(value));
-```
-
-The central interface in Lettuce Command Interface abstraction is `Commands`. 
-This interface acts primarily as a marker interface to help you to discover 
-interfaces that extend this one. You can declare your own command interfaces 
-and argument sequences where the command name is derived from the method name or 
-provided with `@Command`. Introduction of new commands does not require you 
-to wait for a new Lettuce release but they can invoke commands through own declaration. 
-That interface could be also supporting different key and value types, depending on the use-case.
-
-Commands are executed synchronously, asynchronous or with a reactive execution model, 
-depending on the method declaration.
-
-```java
-public interface MyRedisCommands extends Commands {
-
-    String get(String key); // Synchronous Execution of GET
-
-    @Command("GET")
-    byte[] getAsBytes(String key); // Synchronous Execution of GET returning data as byte array
+This is the first preview release of Lettuce 5.1 shipping with improvements and 
+bugfixes.
+ 
+Most notable changes are:
 
-    @Command("SET") // synchronous execution applying a Timeout
-    String setSync(String key, String value, Timeout timeout);
+* API Preview for Redis Streams
+* Asynchronous pool implementation
+* `SCAN` streams, and initial 
+* Global command timeouts (disabled by default)
+* Asynchronous connect methods for Master/Slave and Sentinel
 
-    Future<String> set(String key, String value); // asynchronous SET execution
+Find the full change log at the end of this document that lists all 93 tickets.
 
-    @Command("SET")
-    Mono<String> setReactive(String key, String value); // reactive SET execution using SetArgs
+Thanks to all contributors who made Lettuce 5.1.0.M1 possible.
+Lettuce 5.1.0.M1 requires Java 8, Java 9, or Java 10.
 
-    @CommandNaming(split = DOT) // support for Redis Module command notation -> NR.RUN
-    double nrRun(String key, int... indexes);
-}
+Reference documentation: https://lettuce.io/core/5.1.0.M1/reference/.
+JavaDoc documentation: https://lettuce.io/core/5.1.0.M1/api/.
 
-RedisCommandFactory factory = new RedisCommandFactory(connection);
+New Exceptions for Redis Responses
+----------------------------------
 
-MyRedisCommands commands = factory.getCommands(MyRedisCommands.class);
+This release introduces new Exception types for the following Redis responses:
 
-String value = commands.get("key");
-```
+* `LOADING`: `RedisLoadingException`
+* `NOSCRIPT`: `RedisNoScriptException`
+* `BUSY`: `RedisBusyException`
 
-You get a whole lot new possibilities with Redis Command Interfaces. 
-One of them is transparent reactive type adoption. Lettuce's reactive API is based on Reactive Streams, 
-however with command interfaces you can declare a RxJava 1 or RxJava 2 return 
-type and Lettuce will handle the adoption for you. 
-RxJava 1 users have a migration path that allows using native types without
-further conversion.
+All exception types derive from `RedisCommandExecutionException` and do not 
+require changes in application code.
 
-See also: https://lettuce.io/core/5.0.0.RELEASE/reference/#redis-command-interfaces
 
-Command Interface Batching
---------------------------
+Redis Streams (Preview)
+-----------------------
+Redis 5.0 is going to ship with support for a Stream data structure. 
+A stream is a log of events that can be consumed sequentially. A Stream 
+message consists of an id and a body represented as hash (or `Map<K, V>`).
 
-Command interfaces support command batching to collect multiple commands in a 
-batch queue and flush the batch in a single write to the transport. 
-Command batching executes commands in a deferred nature. This means that 
-at the time of invocation no result is available. Batching can be only used 
-with synchronous methods without a return value (void) or asynchronous 
-methods returning a RedisFuture.
+Lettuce provides access to Stream commands through `RedisStreamCommands` supporting
+synchronous, asynchronous, and reactive execution models. All Stream commands
+are prefixed with `X` (`XADD`, `XREAD`, `XRANGE`).
 
-Command batching can be enabled on two levels:
+Stream messages are required to be polled. Polling can return either in a non-blocking
+way without a message if no message is available, or, in a blocking way.
+`XREAD` allows to specify a blocking duration in which the connection is blocked
+until either the timeout is exceeded or a Stream message arrives.
 
-* On class level by annotating the command interface with @BatchSize. 
-  All methods participate in command batching.
-* On method level by adding CommandBatching to the arguments. 
-  Method participates selectively in command batching.
+The following example shows how to append and read messages from a Redis Stream:
 
 ```java
-@BatchSize(50)
-interface StringCommands extends Commands {
-
-    void set(String key, String value);
+// Append a message to the stream
+String messageId = redis.xadd("my-stream", Collections.singletonMap("key", "value"));
 
-    RedisFuture<String> get(String key);
+// Read a message
+List<StreamMessage<String, String>> messages = redis.xread(StreamOffset.from("my-stream", messageId));
 
-    RedisFuture<String> get(String key, CommandBatching batching);
-}
 
-StringCommands commands = …
+redis.xadd("my-stream", Collections.singletonMap("key", "value"));
 
-commands.set("key", "value"); // queued until 50 command invocations reached.
-                              // The 50th invocation flushes the queue.
-
-commands.get("key", CommandBatching.queue()); // invocation-level queueing control
-commands.get("key", CommandBatching.flush()); // invocation-level queueing control,
-                                              // flushes all queued commands
+// Blocking read
+List<StreamMessage<String, String>> messages = redis.xread(XReadArgs.Builder.block(Duration.ofSeconds(2)), 
+                                                           StreamOffset.latest("my-stream"));
 ```
 
-Read more: https://lettuce.io/core/5.0.0.RELEASE//reference/#command-interfaces.batch
-
-
-Migration to Reactive Streams (Project Reactor)
------------------------------------------------
-
-Lettuce 4.0 introduced a reactive API based on RxJava 1 and `Observable`.
-This was the beginning of reactive Redis support. Lettuce used `Observable`
-all over the place as other reactive types like `Single` and `Completable` were
-still beta or in development.
-
-Since that time, a lot changed in the reactive space. RxJava 2 is the successor
-of RxJava 1 which has now reached end of life. RxJava 2 is not entirely 
-based on Reactive Streams and baselines to Java 6 while other composition
-libraries can benefit from a Java 8. 
-
-This also means, no `null` values and usage of dedicated value types to express
-value multiplicity (`0|1` and `0|1|N`) on the API.
-
-With Lettuce 5.0, the reactive API uses Project Reactor with
-its `Mono` and `Flux` types.
-
-**4.3 and earlier**
+Redis Streams support the notion of consumer groups. A consumer group is a group of 
+one or more consumers that tracks the last consumed Stream message and allows 
+explicit acknowledgment of consumed messages. 
 
 ```java
-Observable<Long> del(K... keys);
+// Setup stream, see https://github.com/antirez/redis/issues/4824
+redis.xadd("my-stream", Collections.singletonMap("key", "value"));
 
-Observable<K> keys(K pattern);
+// Create consumer group
+redis.xgroupCreate("my-stream", "my-group", "$");
+redis.xadd("my-stream", Collections.singletonMap("key", "value"));
 
-Observable<V> mget(K... keys);
-```
+// Read stream messages in the context of a consumer
+List<StreamMessage<String, String>> messages = redis.xreadgroup(Consumer.from("my-stream", "consumer1"),
+                XReadArgs.Builder.noack(),
+                StreamOffset.lastConsumed(key));
 
-**5.0**
+// process message
 
-```java
-Mono<Long> del(K... keys);
+…
 
-Flux<K> keys(K pattern);
-
-Flux<KeyValue<K, V>> mget(K... keys);
+// Acknowledge message
+redis.xack(key, "group", messages.get(0).getId());
 ```
 
-Switching from RxJava 1 to Project Reactor use requires switching the library. Most
-operators use similar or even same names. If you're required to stick to RxJava 1,
-the use `rxjava-reactive-streams` to adopt reactive types (RxJava 1 <-> Reactive Streams).
-
-Migrating to Reactive Streams requires value wrapping to indicate absence of values.
-You will find differences in comparison to the previous API and to the sync/async API
-in cases where commands can return `null` values. Lettuce 5.0 comes with
-new `Value` types that are monads encapsulating a value (or their absence).
-
-See also: https://lettuce.io/core/5.0.0.RELEASE/reference/#reactive-api
-
+Please note that the Redis Stream implementation is not final yet and the API is subject to change if
+the Redis API changes.
 
-Value, KeyValue, and other value types
---------------------------------------
+Scan Stream
+-----------
 
-The reactive story facilitates immutable types so this release enhances existing value 
-types and introduces new types to reduce `null` usage and facilitate functional programming. 
-
-Value types are based on `Value` and `KeyValue`/`ScoredValue` extend from there.
-Value is a wrapper type encapsulating a value or its absence. A `Value` can
-be created in different ways:
-
-```java
-Value<String> value = Value.from(Optional.of("hello"));
+Lettuce 5.1 ships with a reactive `SCAN` stream API that allows reactive and
+demand-aware usage of Redis' `SCAN` commands. `SCAN` is an interator-based command
+that requires multiple round-trips to Redis to scan the keyspace or 
+a particular data structure. Instead of calling `SCAN` from your application code, 
+you can use `ScanStream` as entrypoint to `SCAN`, `HSCAN`, `SSCAN`, and `ZSCAN` operations.
+`ScanStream` returns a `Flux` that can be consumed as a single stream without
+the need of continuing the actual iteration. That's covered by Lettuce for you.
 
-Value<String> value = Value.fromNullable(null);
-
-Value<String> value = Value.just("hello");
-
-KeyValue<Long, String> value = KeyValue.from(1L, Optional.of("hello"));
+The `LIMIT` argument controls the batchsize. Demand (backpressure) is translated
+into cursor call. If you stop consuming the stream, no further `SCAN` calls are issued.
  
-KeyValue<String, String> value = KeyValue.just("key", "hello");
-```
-
-It transforms to `Optional` and `Stream` to integrate with other 
-functional uses and allows value mapping.
-
-```java
-Value.just("hello").stream().filter(…).count();
-
-KeyValue.just("hello").optional().isPresent();
-
-Value.from(Optional.of("hello")).map(s -> s + "-world").getValue();
-
-ScoredValue.just(42, "hello").mapScore(number -> number.doubleValue() * 3.14d).getScore();
-```
-
-You will also find that all public fields of value types are encapsulated with
-getters and these fields are no longer accessible.
-
-
-Backoff/Delay strategies
-------------------------
-
-_Thanks to @jongyeol_
-
-When running cloud-based services with a multitude of services that use Redis,
-then network partitions impact Redis server connection heavily once 
-the partition ends. A network partition impacts all disconnected applications 
-at the same time and all nodes start reconnecting more or less at the same time.
-
-As soon as the partition ends, the majority of applications reconnect at the same time.
-Jitter backoff strategies leverage the impact as the time of reconnecting is randomized.
-
-Lettuce comes with various backoff implementations:
-
-* Equal Jitter
-* Full Jitter
-* Decorrelated Jitter
-
-These are configured in `ClientResources`:
-
 ```java
-DefaultClientResources.builder()
-        .reconnectDelay(Delay.decorrelatedJitter())
-        .build();
+RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
 
-DefaultClientResources.builder()
-        .reconnectDelay(Delay.equalJitter())
-        .build();
+Flux<String> keys = ScanStream.scan(reactive, ScanArgs.Builder.limit(200));
 ```
 
-See also: https://www.awsarchitectureblog.com/2015/03/backoff.html and
-https://lettuce.io/core/5.0.0.RELEASE/reference/#clientresources.advanced-settings
+Asynchronous non-blocking Connection Pooling
+--------------------------------------------
 
+Right now, applications that utilize connection pooling in combination with a 
+non-blocking API (asynchronous or reactive API users) are limited to Apache Commons Pool
+which is a blocking object pool implementation.
 
-New API for Z...RANGE commands
--------------------------------
+This release ships with non-blocking pooling support through `AsyncPool` that
+is obtained from `AsyncConnectionPoolSupport`. The pooling API allows for various
+implementations. As of Lettuce 5.1, a bounded pool is provided that allows 
+limiting and that signals pool exhaustion by emitting `NoSuchElementException`.
 
-Sorted Sets range commands come with a streamlined API regarding method overloads.
-Commands like `ZRANGEBYSCORE`, `ZRANGEBYLEX`, `ZREMRANGEBYLEX` and several others
-now declare methods accepting `Range` and `Limit` objects instead of an growing
-parameter list. The new `Range` allows score and value types applying the proper
-binary encoding.
+The pooling API returns `CompletableFuture` instances to synchronize acquire and 
+release operations. `AsyncPool` does not require external dependencies and features
+an improved performance profile in comparison to Apache Commons Pool 2. 
+This non-blocking pooling API is not a replacement for the blocking pool 
+although it's possible that may provide a blocking layer that exports 
+the pooling functionality through `org.apache.commons.pool2.ObjectPool`. 
 
-**4.2 and earlier**
+The following example show how to use `AsyncPool`. 
 
 ```java
-commands.zcount(key, 1.0, 3.0)
-
-commands.zrangebyscore(key, "-inf", "+inf")
+AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
+        () -> client.connectAsync(StringCodec.UTF8, uri),
+        BoundedPoolConfig.builder()
+                    .minIdle(4)
+                    .maxIdle(8)
+                    .maxTotal(16)
+                    .testOnAcquire()
+                    .build());
 
-commands.zrangebyscoreWithScores(key, "[1.0", "(4.0")
+// Acquire connection and do some work
+CompletableFuture<StatefulRedisConnection<String, String>> acquire = pool.acquire();
 
-commands.zrangebyscoreWithScores(key, "-inf", "+inf", 2, 2)
-```
+acquire.thenAccept(connection -> {
 
-**Since 5.0**
+    connection.async().set("key", "value").whenComplete((v, e) -> {
+        pool.release(connection);
+    });
+});
 
-```java
-commands.zcount(key, Range.create(1.0, 3.0));
 
-commands.zrangebyscore(key, Range.unbounded());
-
-commands.zrangebyscoreWithScores(key, Range.from(Boundary.including(1.0), Boundary.excluding(4.0));
-
-commands.zrangebyscoreWithScores(key, Range.unbounded(), Limit.create(2, 2));
+// later
+CompletableFuture<Void> closeFuture = pool.closeAsync();
 ```
 
-Good bye, Guava
----------------
-
-Lettuce 5.0 no longer uses Google's Guava library. Guava was a good friend
-back in the Java 6-compatible days where `Future` synchronization and callbacks
-were no fun to use. That changed with Java 8 and `CompletableFuture`.
 
-Other uses like `HostAndPort` or `LoadingCache` could be either inlined or
-replaced by Java 8's Collection framework.
+Global Command Timeouts
+-----------------------
 
+Lettuce can be used through various APIs. The most common one is the
+synchronous API which emulates blocking behavior on top of a reactive 
+and non-blocking driver. A natural aspect of blocking APIs are timeouts
+when it comes to I/O. Using the asynchronous or reactive API do not have
+timeouts as there was no active component that tracked command runtime durations.
 
-Removal of deprecated interfaces and methods
---------------------------------------------
+With Lettuce 5.1, you get the possibility to configure a global command timeout
+through `ClientOptions` and `TimeoutOptions` that can determine timeouts
+on a `RedisCommand` basis. This timeout applies on a command basis
+and completes commands with `RedisCommandTimeoutException`.  
 
-This release removes deprecated interfaces `RedisConnection` and `RedisAsyncConnection`
-and their segregated interfaces in favor of `StatefulRedisConnection` and `RedisCommands`.
- 
-You will notice slight differences when using that API. Transactional commands and 
-database selection are no longer available through the Redis Cluster API as the 
-old API was derived from the standalone API. `RedisCommands` and `RedisAsyncCommands`
-are no longer `Closeable`. Please use `commands.getStatefulConnection().close()` to 
-close a connection. This change removes ambiguity over closing the commands interface
-over closing the connection.
-
-Connection pooling replacement
-------------------------------
-
-It took quite a while but 4.3 deprecated Lettuce's existing connection pooling
-support. That are in particular `RedisClient.pool(…)` and `RedisClient.asyncPool(…)`. 
-These methods are removed with Lettuce 5.0.
-
-Connection pooling had very limited support and would require additional overloads
-that clutter the API to expose pooling for all supported connections.
-This release brings a replacement, that is customizable
-and does not pollute the API. `ConnectionPoolSupport` provides methods to
-create a connection pool accepting a factory method and pool configuration.
-
-Returned connection objects are proxies that return the connection to its pool
-when calling `close()`. `StatefulConnection` implement `Closeable` to
-allow usage of try-with-resources.
+You can change the timeout on running connections through `RedisURI.setTimeout(…)`, 
+`RedisClient.setDefaultTimeout(…)`, and `StatefulConnection.setTimeout(…)` if
+`TimeoutOptions` are enabled - global command timeouts are disabled by default. 
 
 ```java
-GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
-        .createGenericObjectPool(() -> client.connect(), new GenericObjectPoolConfig());
-
-
-try(StatefulRedisConnection<String, String> connection = pool.borrowObject()) {
-    // Work
-}
+TimeoutOptions timeoutOptions = TimeoutOptions.enabled(Duration.ofMinutes(1));
 
-pool.close();
+ClientOptions.builder().timeoutOptions(timeoutOptions).build();
 ```
 
 
-Redis Cluster topology refresh consensus
-----------------------------------------
+Thanks to all contributors that made Lettuce 5.1.0.M1 possible.
 
-Cluster topology refreshing can lead in some cases (dynamic topology sources)
-to orphaning. This can happen if a cluster node is removed from the cluster and
-lettuce decides to accept the topology view of that removed node. Lettuce 
-gets stuck with that node and is not able to use the remaining cluster.
-
-This release introduces `PartitionsConsensus` strategies to determine the most
-appropriate topology view if multiple views are acquired. The strategy can be
-customized by overriding 
-`RedisClusterClient.determinePartitions(Partitions, Map<RedisURI, Partitions>)`.
-
-Lettuce defaults choosing the topology view with the majority of previously known
-cluster nodes. This helps Lettuce to stick with the cluster that consists of the
-most nodes.
- 
-See also: https://github.com/lettuce-io/lettuce-core/issues/355
-
-
-Asynchronous Connections in Redis Cluster
------------------------------------------
-
-RedisClusterClient now connects asynchronously without intermediate 
-blocking to cluster nodes. The connection progress is shared between
-multiple threads that request a cluster node connection for the first time.
-Previously, connection was sequential-synchronous. Each connection attempt
-blocked subsequent attempts from other threads. If a cluster node connection
-ran into a timeout, threads were penalized with a growing wait time. If, say, 10 
-threads waited for a connection, the last thread had to wait up to 10 times 
-the connection timeout.
-
-Asynchronous connection initiates the connection once using internally a 
-`Future` so multiple concurrent connection attempts share the resulting
-`Future`. Errors fail now faster and cluster node usage is fully asynchronous
-without synchronization and without the danger to run into a threading deadlock.
-
-
-Redis Cluster Pub/Sub on Node-Selections
-----------------------------------------
-`RedisClusterClient.connectPubSub()` now returns a 
-`StatefulRedisClusterPubSubConnection` that allows registration of 
-`RedisClusterPubSubListener`s and subscription on particular cluster nodes.
-
-Cluster node-specific subscriptions allow usage of keyspace notifications. 
-Keyspace notifications are different from userspace Pub/Sub since keyspace 
-notifications don't broadcast to the entire cluster but are published only 
-on the node the notification happens. A common usecase is when a key expires 
-in the cluster.
-
-```
-StatefulRedisClusterPubSubConnection connection = client.connectPubSub();
-
-connection.addListener(…);
-
-connection.setNodeMessagePropagation(true);
-
-RedisClusterPubSubCommands<String, String> sync = connection.sync();
-sync.slaves().commands().psubscribe("__key*__:expire");
-```
-
-
-Native Transports
------------------
-Lettuce now uses native transports by default, if the operating system is 
-qualified and dependencies are available. Lettuce supports epoll (on 
-Linux-based systems) since 4.0 and since this version kqueue (BSD-based
-systems, like macOS).
-
-Epoll usage can be disabled with system properties by setting 
-`io.lettuce.core.epoll=false`. In a similar way, kqueue can be disabled 
-with `io.lettuce.core.kqueue=false`.
-
-Epoll dependency:
-
-```xml
-<dependency>
-    <groupId>io.netty</groupId>
-    <artifactId>netty-transport-native-epoll</artifactId>
-    <version>${netty-version}</version>
-    <classifier>linux-x86_64</classifier>
-</dependency>
-```
-
-Kqueue dependency:
-
-```xml
-<dependency>
-    <groupId>io.netty</groupId>
-    <artifactId>netty-transport-native-kqueue</artifactId>
-    <version>${netty-version}</version>
-    <classifier>osx-x86_64</classifier>
-</dependency>
-```
-
-
-Thanks to all contributors that made Lettuce 5.0.0.RELEASE possible.
-
-Lettuce 5.0.0.RELEASE requires Java 8 and cannot be used with Java 6 or 7.
+Lettuce 5.1.0.M1 requires Java 8 and cannot be used with Java 6 or 7.
 
 If you need any support, meet Lettuce at:
 
@@ -488,229 +196,110 @@ If you need any support, meet Lettuce at:
 * GitHub Issues: https://github.com/lettuce-io/lettuce-core/issues
 * Documentation: https://lettuce.io/docs/
 
-
 Commands
 --------
-* Add support for TOUCH command #270
-* Add support for variadic LPUSHX and RPUSHX #267
-* Adopt fixed GEODIST/GEOHASH behavior in tests #362
-* Provide a more conceise API for Sorted Set query operations using Range/Limit #363
-* Add EVAL and EVALSHA to ReadOnlyCommands #366 (Thanks to @amilnarski)
-* Add support for ZADD INCR with ZAddArgs #367 (Thanks to @christophstrobl)
-* Add support for ZREVRANGEBYLEX command #369 (Thanks to @christophstrobl)
-* Add support for SWAPDB #375
-* Support CLIENT and INFO commands for Redis Sentinel #415
-* Disable WAIT as Read-Only command #418
+* Add AUTH option to MIGRATE command #733
+* Add MASTER type to KillArgs #760
 
 Enhancements
 ------------
-* [BREAKING] Remove deprecated interfaces and methods #156
-* [BREAKING] Remove Google Guava usage #217
-* Add support for OpenSSL as SSL provider #249
-* Add SocketOptions to ClientOptions #269
-* [BREAKING] Replacement support for connection pooling #264
-* Add ToByteBufEncoder and improved StringCodec #275
-* Allow configuration of a trust store password #292
-* Replace Guava Cache by ConcurrentHashMap #300
-* Eager initialization of API wrappers in stateful connections #302 (Thanks to @jongyeol)
-* Change MethodTranslator's loadfactor to 1.0 for sync APIs performance #305 (Thanks to @jongyeol)
-* Reattempt initially failed Sentinel connections in Master/Slave API #306
-* Use MethodHandle.Lookup.findSpecial(…) for default method lookup #310
-* Decouple CommandHandler #317
-* [BREAKING] Use TransactionResult for transaction results #320
-* Replace synchronized setters with volatile fields #326 (Thanks to @guperrot)
-* Add workaround for IPv6 parsing #332
-* Add ConnectionWatchdog as last handler #335
-* Provide multi-key-routing for exists and unlink commands using Redis Cluster #334
-* [BREAKING] Migrate lettuce reactive API to Reactive Streams #349
-* Provide Value types #350
-* Provide Timer as part of ClientResources #354 (Thanks to @plokhotnyuk)
-* Add support for topology consensus #355
-* Use Limit in SortArgs #364
-* Add jitter backoff strategies for spreading reconnection timing #365 (Thanks to @jongyeol)
-* Accept double in ZStoreArgs.weights #368 (Thanks to @christophstrobl)
-* Consider role changes as trigger for update using MasterSlave connections #370
-* Provide a dynamic Redis Command API #371
-* Support lettuce parameter types #381
-* Add reactive wrapper converters for RxJava1 and 2 #383
-* Support value ranges #384
-* Allow Pub/Sub subscriptions on a node selection within Redis Cluster #385
-* Expose Value.map methods #386
-* [BREAKING] Remove deprecated LettuceFutures.await method #388
-* [BREAKING] Remove ExperimentalByteArrayCodec and enhance ByteArrayCodec #389
-* Use StringCodec from Utf8StringCodec #393
-* Provide synchronous ScanIterator API #397
-* Propagate backpressure to the transport channel #394
-* Default to epoll transport if available #402
-* Simplify NodeSelection implementation #408
-* [BREAKING] Remove addListener/removeListener methods from execution-specific Pub/Sub interfaces #412
-* [BREAKING] Remove close method from Redis Sentinel command interfaces #415
-* Allow setting client name with RedisURI #416
-* Extend RedisConnectionStateListener.onRedisConnected by adding SocketAddress #419
-* Decompose array parameters into single command arguments #421
-* Consider key/value type of parameter wrappers in codec resolution #423
-* Connect asynchronously in cluster topology refresh #424
-* Perform resilient Master/Slave topology refresh ping #424
-* Return ClusterClientOptions.Builder in socketOptions and sslOptions methods #425
-* Use ResolvableType for type resolution #426
-* Propagate cause if cluster topology refresh can't connect to any node #427
-* Propagate asynchronous connection initialization #429
-* Dynamic API: Support command batching #432
-* Reuse stale connections collection when closing stale connections #443
-* Add ReadFrom.SLAVE_PREFERRED #452
-* Share cluster node connection progress with request threads #453
-* Send collection of commands as batch through StatefulConnection and ChannelWriter #456
-* Use EnumSet to determine Read-Only commands #457
-* Encapsulate fields in Commands implementations and command builder #458
-* Refactor command creation and execution to ExecutableCommand creation #463
-* [BREAKING] Use String-Codec for COMMAND #467
-* Create a static call chain in InvocationProxyFactory #468
-* Initialize RedisStateMachine.LongProcessor in static initializer #481 (Thanks to @hellyguo)
-* Add shutdownAsync to AbstractRedisClient #485 (Thanks to @jongyeol)
-* Propagate asynchronous connections to ClusterConnectionProvider #486 (@Thanks to @jeniok)
-* Resolve hostnames using netty's DNS resolver #498
-* Introduce NettyCustomizer API #499 (Thanks to @jongyeol)
-* Use asynchronous node connect in NodeSelection #500
-* Gracefully degrade to successfully connected Cluster read candidates #503 (Thanks to @eliotw)
-* Implement counting Deque #507 (Thanks to @CodingFabian)
-* Use ThreadLocalRandom instead of Random #510
-* Replace consumer completion List in CommandWrapper with Array #511
-* Consider ConnectionFuture state in ClusterDistributionChannelWriter #511
-* Replace first arg fields in CommandArgs with CommandArgsAccessor #511
-* Merge Command completion state fields to a single status field #511
-* Move command latency metrics to LatencyMeteredCommand #511
-* Close the connection when Redis protocol is corrupted #512 (Thanks to @jongyeol)
-* Allow setting the Redis password as char-array #513
-* Replace synchronized reconnect in ConnectionWatchdog with asynchronous connect #514
-* Improve cleanup of PauseDetector #516
-* [BREAKING] Drop netty 4.0 compatibility #518
-* Upgrade AsyncExecutions to use CompletableFuture #522
-* Support default methods on Command Interfaces #527
-* Improve Epoll availability detection #535
-* Align log prefix for CommandHandler and ConnectionWatchdog #538
-* Add support for kqueue transport #539
-* Add support for client certificate authentication #540
-* Adopt to changed SLOWLOG output #551
-* Use pre-instantiated ByteBufProcessor in RedisStateMachine to find EOL #557
-* SlotHash.getSlot(…) duplicates bytes while slot calculation #558
-* Replace CountDownLatch in AsyncCommand with AtomicFieldUpdater #559
-* Expose asynchronous connection creation API #561
-* [BREAKING] Refactor CONFIG GET output from List<String> to Map<String, String> #562
-* clientSetname does not set client name on default connection #563 
-* Adopt to read-only variant GEORADIUS(BYMEMBER)_RO #564
-* [BREAKING] Switch to Duration for timeouts #570
-* Optimization for ValueListOutput #573 (Thanks to @CodingFabian)
-* Enhance argument caching #575
-* Introduce MethodTranslator caching #580
-* Execute RedisAdvancedClusterCommands.scriptLoad(…) on all nodes #590
-* Reduce default shutdown timeout #613
+* Support for command timeouts (async, reactive) #435
+* Use object pooling for collections inside a single method and Command/CommandArgs with a small scope #459
+* Add support for Redis streams #606
+* Introduce dedicated exceptions for NOSCRIPT and BUSY responses #620 (Thanks to @DaichiUeura)
+* Non-blocking connection pooling #631
+* Introduce fast-path publishing in RedisPublisher #637
+* Add reactive scanning #638
+* Asynchronous connection initialization #640
+* Create reusable abstraction for non-blocking and keyed connection provider #642
+* Expose asynchronous connect method for Master/Slave connections #643
+* Add SocketAddressOutput to directly parse SENTINEL get-master-addr-by-name output #644
+* Misleading wasRolledBack method #662 (Thanks to @graineri)
+* Read from random slave preferred #676 (Thanks to @petetanton)
+* Introduce exception to represent Redis LOADING response #682
+* Do not fail if COMMAND command fails on startup #685 (Thanks to @pujian1984)
+* CommandHandler.write() is O(N^2) #709 (Thanks to @gszpak)
+* Cluster topology lookup should not replaces self-node details with host and port from RedisURI when RedisURI is load balancer #712 (Thanks to @warrenzhu25)
+* Optimize Partitions/RedisClusterNode representation #715
+* Unnecessary copying of byteBuf in CommandHandler.decode() #725 (Thanks to @gszpak)
+* Add unknown node as trigger for adaptive refresh #732
 
 Fixes
 -----
-* Fix JavaDoc for blocking list commands #272
-* Guard key parameters against null values #287
-* CommandArgs.ExperimentalByteArrayCodec fails to encode bulk string #288
-* Guard value parameters against null values #291 (Thanks to @christophstrobl)
-* Allow coordinated cross-slot execution using Iterable #303 (Thanks to @agodet)
-* Allow MasterSlave connection using Sentinel if some Sentinels are not available #304 (Thanks to @RahulBabbar)
-* Use at least 3 Threads when configuring default thread count #309
-* Replace own partition host and port only if the reported connection point is empty #312
-* Lettuce RedisClusterClient calls AUTH twice #313
-* Record sent-time on command queueing #314 (Thanks to @HaloFour)
-* CommandHandler notifications called out of order #315
-* [BREAKING] Disable SYNC command #319
-* ASK bit not set on ASK redirection #321 (Thanks to @kaibaemon)
-* Check for isUnsubscribed() before calling subscriber methods #323 (Thanks to @vleushin)
-* Avoid timeouts for cancelling command #325 (Thanks to @jongyeol)
-* Guard command completion against exceptions #331
-* Store error at output-level when using NestedMultiOutput #328 (Thanks to @jongyeol)
-* Fix master and slave address parsing for IPv6 addresses #329 (Thanks to @maksimlikharev)
-* Fix srandmember return type from Set to List #330 (Thanks to @jongyeol)
-* Add synchronization to Partitions/Use read-view for consistent Partition usage during Partitions updates #333 (Thanks to @OutOfBrain)
-* Run cluster command redirects on event executor threads #340 (Thanks to @oklahomer)
-* Close connections in PooledClusterConnectionProvider on connection failures #343
-* Consider number of redirections instead of executions for cluster commands #344 (Thanks to @Spikhalskiy)
-* Ensure unique reconnect scheduling #346
-* Guard ConnectionWatchdog against NPE from missing CommandHandler #358
-* Fix RedisAdvancedClusterAsyncCommandsImpl.msetnx return value #376 (Thanks to @mjaow)
-* Allow hostnames in MasterSlaveTopologyProvider when parsing in master_host #377 (Thanks to @szabowexler)
-* Allow empty values in BITFIELD using the reactive API #378
-* Support integer width multiplied offsets in BITFIELD #379 (Thanks to @christophstrobl)
-* Propagate array sizes in MultiOutput #380 (Thanks to @christophstrobl)
-* Update code samples in readme to Lettuce 4.0 #410
-* Apply proxy wrapper to obtained pooled connections #411
-* Allow databases greater than 15 in RedisURI #420
-* Consider Wildcard types in type information and assignability #431
-* Expose a protected default constructor for RedisClusterClient #438
-* Ensure RoundRobinSocketAddressSupplier consistency before returning a SocketAddress #440
-* Fix Partitions.addPartition(…) and Partitions.reload(…) synchronization #442
-* Fix authenticated PING before connect with Redis Sentinel #448
-* Close connections in PooledClusterConnectionProvider.close() #460
-* Read connect future in ReconnectHandler to local variable #465
-* Apply command timeout to PING before connection activation #470
-* Synchronize ClientResources shutdown in client shutdown #475
-* Skip SO_KEEPALIVE and TCP_NODELAY options for Unix Domain Socket connections #476 (Thanks to @magdkudama)
-* Fix cummulative metrics collection #487 (Thanks to @ameenhere)
-* Stop LatencyStats on removal #517
-* Guard PauseDetectorWrapper initialization against absence of LatencyUtils #520
-* Connection pool deadlock #531 (Thanks to @DarkSeraphim)
-* NumberFormatException on `inf` zscore #528 (Thanks to @DarkSeraphim)
-* Fix FastCountingDeque not recording correct size. #544 (Thanks to @kojilin)
-* Lettuce doesn't call QUIT when a pooled connection is destroyed. #545 (Thanks to @robbiemc)
-* NPE in RedisStateMachine #576 (Thanks to @nikolayspb)
-* Prevent dead listener callbacks in shutdown sequence #581
-* Javadoc in BitFieldArgs contains invalid links #583
-* Fix IllegalArgumentException in RedisClient.connectSentinel #588 (Thanks to @andrewsensus)
-* UnsupportedOperationException (List#add) in NestedMultiOutput #589 (Thanks to @zapl)
-* GEOPOS fails with a single member in the var args #591 (Thanks to @FerhatSavci)
+* PING responses are not decoded properly if Pub/Sub connection is subscribed #579
+* Lettuce doesn't fail early & cleanly with a host in protected mode #608 (Thanks to @exercitussolus)
+* CommandHandler.rebuildQueue() causes long locks #615 (Thanks to @nikolayspb)
+* Request queue size is not cleared on reconnect #616 (Thanks to @nikolayspb)
+* BITPOS should allow to just specify start. #623 (Thanks to @christophstrobl)
+* HMGET proxy not working as expected #627 (Thanks to @moores-expedia)
+* Consider binary arguments using command interfaces as keys using binary codecs #628
+* Command.isDone() not consistent with CompletableFuture.isDone() #629
+* Race condition in RedisPublisher DEMAND.request() and DEMAND.onDataAvailable() #634 (Thanks to @mayamoon)
+* RedisPublisher.request(-1) does not fail #635
+* Capture subscription state before logging in RedisPublisher #636
+* Provide Javadoc path for Project Reactor #641
+* Debug logging of ConnectionWatchdog has wrong prefix after reconnect. #645 (Thanks to @mlex)
+* Cannot close connection when refreshing topology #656 (Thanks to @dangtranhoang)
+* Weights param should be ignored if it is empty #657 (Thanks to @garfeildma)
+* MasterSlave getNodeSpecificViews NPE with sync API #659 (Thanks to @boughtonp)
+* RandomServerHandler can respond zero bytes #660
+* ConcurrentModificationException when connecting a RedisClusterClient #663 (Thanks to @blahblahasdf)
+* Switch RedisSubscription.subscriber to volatile #664
+* Recovered Sentinels in Master/Slave not reconnected #668
+* Handling dead Sentinel slaves #669 (Thanks to @vleushin)
+* Move SocketAddressResolver resolution back to calling thread #670
+* Support SLAVE_PREFERRED at valueOf method #671 (Thanks to @be-hase)
+* RedisCommandTimeoutException after two subsequent MULTI calls without executing the transaction #673 (Thanks to @destitutus)
+* Fix ConnectionWatchDog won't reconnect problem in edge case #679 (Thanks to @kojilin)
+* At least once mode keeps requeueing commands on non-recoverable errors #680 (Thanks to @mrvisser)
+* Retain ssl/tls config from seed uris in Master/Slave context #684 (Thanks to @acmcelwee)
+* NOAUTH after full queue and reconnect #691
+* RedisURI.create("localhost") causes NPE #694
+* Async connect methods report original cause #708
+* Mono returned by RedisPubSubReactiveCommands#subscribe does not return result #717 (Thanks to @ywtsang)
+* RuntimeExceptions thrown by implementations of RedisCodec do not fail TransactionCommands #719 (Thanks to @blahblahasdf)
+* Connection Leak in Cluster Topology Refresh #721 (Thanks to @cweitend)
+* Ensure Master/Slave topology refresh connections are closed #723
+* RedisPubSubAdapter.message() being called with wrong channel #724 (Thanks to @adimarco)
+* Batched commands may time out although data was received #729
+* DefaultEndpoint future listener recycle lose command context on requeue failures #734 (Thanks to @gszpak)
+* AsyncPool, AsyncConnectionPoolSupport are nowhere to be found #739 (Thanks to @fabienrenaud)
+* firstResponseLatency is always negative #740 (Thanks to @nickvollmar)
+* EXEC does not fail on EXECABORT #743 (Thanks to @dmandalidis)
+* Warning when refreshing topology #756 (Thanks to @theliro)
+* DefaultEndpoint.QUEUE_SIZE becomes out of sync, preventing command queueing #764 (Thanks to @nivekastoreth)
+* DefaultEndpoint contains System.out.println(…) #765
+* Do not retry completed commands through RetryListener #767
 
 Other
-------
-* Upgrade to stunnel 5.33 #290
-* Upgrade to Java 9-compatible build #310
-* Upgrade logging to log4j2 for tests #316
-* Upgrade to AssertJ 3.5.2 #352
-* Add test to verify behavior of GEODIST if a geoset is unknown #362
-* Update license/author headers #387
-* Upgrade to netty 4.0.42.Final/4.1.6.Final 390
-* Mark NodeSelection API as stable #389
-* Document RedisClient and RedisClusterClient implementation hooks #392
-* Upgrade to Project Reactor 3.0.3 #395
-* Disable shaded jar #396
-* Upgrade to netty 4.1.7 #436
-* Fix ClientResources usage in tests #445
-* Create benchmarks for RedisClient, RedisClusterClient and ClusterDistributionChannelWriter #454
-* Use Reactor's StepVerifier in tests #455
-* Upgrade to TravisCI trusty #461
-* Upgrade to Mockito 2.7.5 #469
-* Improve JavaDoc #472
-* Upgrade dependencies #474
-* Switch optional dependencies from provided to optional #482
-* Use appropriate EventLoopGroup in SingleThreadedReactiveClusterClientTest #486
-* Update Netty version to 4.1.9 #489 (Thanks to @odiszapc)
-* Calculate first response metrics from sent time #491
-* [BREAKING] Move to lettuce.io #493
-* Create reference documentation #494
-* Switch to codecov #504
-* Upgrade to Reactor 3.1.0 SNAPSHOT #505
-* Upgrade integrations from lettuce-io/lettuce-core to lettuce-io/lettuce-core #506
-* Upgrade to Project Reactor 3.1.0.M1 #523
-* Upgrade to RxJava 1.2.10 #524
-* Upgrade to RxJava2 2.0.9 #525
-* Switch jcl-over-slf4j dependency to test scope #526
-* Upgrade to netty 4.1.10 #532
-* Upgrade to netty 4.0.11 #537
-* Upgrade to netty 4.1.12 (4.0.48) #548
-* Upgrade to Reactor 3.1 M2 #549
-* Allow Redis version pinning for build #552
-* Upgrade to netty 4.1.13/4.0.49 #565
-* Upgrade to Reactor 3.1.0 M3 (Bismuth M3) #567
-* Use BOM to manage netty and Spring dependencies #568
-* Upgrade dependencies #569
-* Upgrade to Reactor Core 3.1.0 RC1 #602
-* Upgrade to netty 4.1.15 #600
-* Release Lettuce 5.0 GA #607
-* Extend documentation #610
+-----
+* Upgrade to netty 4.0.53.Final/4.1.17.Final #646
+* Upgrade to Reactor Bismuth SR4 #647
+* Upgrade to Spring Framework 4.3.12 #648
+* Upgrade to Commons Pool 2.4.3 #650
+* Upgrade to RxJava 1.3.3 #651
+* Upgrade to RxJava2 2.1.6 #652
+* Upgrade to HdrHistogram 2.1.10 #653
+* Upgrade Redis versions on TravisCI #655
+* Upgrade to Reactor Bismuth SR5 #698
+* Upgrade to netty 4.1.21.Final #699
+* Upgrade to RxJava 1.3.6 #700
+* Upgrade to RxJava 2.1.9 #701
+* Upgrade to Reactor Bismuth SR6 #704
+* Upgrade to Netty 4.1.22 #744
+* Upgrade to RxJava 1.3.7 #745
+* Upgrade to Spring Framework 4.3.14 #746
+* Upgrade to Mockito 2.17 #747
+* Upgrade to AssertJ 3.9.1 #748
+* Upgrade to Log4j 2.11.0 #749
+* Upgrade to commons-lang3 3.7 #750
+* Upgrade to netty 4.1.23.Final #755
+* Upgrade to Reactor Bismuth SR8 #758
+* Upgrade to RxJava 1.3.8 #759
+* Extend documentation for argument objects #761
+* Upgrade to JavaParser 3.6.3 #769
+* Upgrade to netty 4.1.24.Final #770
+* Upgrade to RxJava 2.1.13 #771
 
 Lettuce requires a minimum of Java 8 to build and run. It is tested continuously
 against the latest Redis source-build.

From 0eac364e34d6d73aaf91b3a3069c68345edf13da Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 14 May 2018 17:11:15 +0200
Subject: [PATCH 458/808] [maven-release-plugin] prepare release 5.1.0.M1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8989847c7e..36f6e53349 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.1.0.BUILD-SNAPSHOT</version>
+    <version>5.1.0.M1</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -68,7 +68,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-        <tag>HEAD</tag>
+        <tag>5.1.0.M1</tag>
     </scm>
 
     <dependencyManagement>

From 5971bf859d2e4d5ceb123d6cd95c5c50e6ba4451 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 14 May 2018 17:11:23 +0200
Subject: [PATCH 459/808] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 36f6e53349..8989847c7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.1.0.M1</version>
+    <version>5.1.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -68,7 +68,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-        <tag>5.1.0.M1</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <dependencyManagement>

From 27d7a541e8b38bf415722998a8a78da3340f9a9f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 25 May 2018 15:31:14 +0200
Subject: [PATCH 460/808] Add REPLACE option to RESTORE #783
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We now provide restore(…) methods accepting RestoreArgs along with support for the REPLACE option.
---
 .../core/AbstractRedisAsyncCommands.java      |   7 +-
 .../core/AbstractRedisReactiveCommands.java   |   7 +-
 .../io/lettuce/core/RedisCommandBuilder.java  |  10 +-
 .../java/io/lettuce/core/RestoreArgs.java     | 116 ++++++++++++++++++
 .../core/api/async/RedisKeyAsyncCommands.java |  11 ++
 .../reactive/RedisKeyReactiveCommands.java    |  11 ++
 .../core/api/sync/RedisKeyCommands.java       |  11 ++
 .../async/NodeSelectionKeyAsyncCommands.java  |  11 ++
 .../api/sync/NodeSelectionKeyCommands.java    |  11 ++
 .../io/lettuce/core/api/RedisKeyCommands.java |  11 ++
 .../lettuce/core/commands/KeyCommandTest.java |  15 +++
 11 files changed, 217 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/RestoreArgs.java

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 7e5d4215a3..cfdbc067a4 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1062,7 +1062,12 @@ public void reset() {
 
     @Override
     public RedisFuture<String> restore(K key, long ttl, byte[] value) {
-        return dispatch(commandBuilder.restore(key, ttl, value));
+        return dispatch(commandBuilder.restore(key, value, RestoreArgs.Builder.ttl(ttl)));
+    }
+
+    @Override
+    public RedisFuture<String> restore(K key, byte[] value, RestoreArgs args) {
+        return dispatch(commandBuilder.restore(key, value, args));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 28c2f8c441..f7d5d33f41 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -1080,7 +1080,12 @@ public void reset() {
 
     @Override
     public Mono<String> restore(K key, long ttl, byte[] value) {
-        return createMono(() -> commandBuilder.restore(key, ttl, value));
+        return createMono(() -> commandBuilder.restore(key, value, RestoreArgs.Builder.ttl(ttl)));
+    }
+
+    @Override
+    public Mono<String> restore(K key, byte[] value, RestoreArgs args) {
+        return createMono(() -> commandBuilder.restore(key, value, args));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 5959c02afc..ba4c9ce380 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -1481,11 +1481,17 @@ Command<K, V, Boolean> renamenx(K key, K newKey) {
         return createCommand(RENAMENX, new BooleanOutput<>(codec), args);
     }
 
-    Command<K, V, String> restore(K key, long ttl, byte[] value) {
+    Command<K, V, String> restore(K key, byte[] value, RestoreArgs restoreArgs) {
         notNullKey(key);
         LettuceAssert.notNull(value, "Value " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(restoreArgs, "RestoreArgs " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(restoreArgs.ttl).add(value);
+
+        if (restoreArgs.replace) {
+            args.add(REPLACE);
+        }
 
-        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(ttl).add(value);
         return createCommand(RESTORE, new StatusOutput<>(codec), args);
     }
 
diff --git a/src/main/java/io/lettuce/core/RestoreArgs.java b/src/main/java/io/lettuce/core/RestoreArgs.java
new file mode 100644
index 0000000000..a1a9a46a07
--- /dev/null
+++ b/src/main/java/io/lettuce/core/RestoreArgs.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import java.time.Duration;
+
+import io.lettuce.core.internal.LettuceAssert;
+
+/**
+ * Argument list builder for the Redis <a href="http://redis.io/commands/restore">RESTORE</a> command. Static import the methods
+ * from {@link RestoreArgs.Builder} and call the methods: {@code ttl(…)} .
+ * <p/>
+ * {@link RestoreArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+public class RestoreArgs {
+
+    long ttl;
+    boolean replace;
+
+    /**
+     * Builder entry points for {@link XAddArgs}.
+     */
+    public static class Builder {
+
+        /**
+         * Utility constructor.
+         */
+        private Builder() {
+        }
+
+        /**
+         * Creates new {@link RestoreArgs} and set the TTL.
+         *
+         * @return new {@link RestoreArgs} with min idle time set.
+         * @see RestoreArgs#ttl(long)
+         */
+        public static RestoreArgs ttl(long milliseconds) {
+            return new RestoreArgs().ttl(milliseconds);
+        }
+
+        /**
+         * Creates new {@link RestoreArgs} and set the minimum idle time.
+         *
+         * @return new {@link RestoreArgs} with min idle time set.
+         * @see RestoreArgs#ttl(Duration)
+         */
+        public static RestoreArgs ttl(Duration ttl) {
+
+            LettuceAssert.notNull(ttl, "Time to live must not be null");
+
+            return ttl(ttl.toMillis());
+        }
+    }
+
+    /**
+     * Set TTL in {@code milliseconds} after restoring the key.
+     *
+     * @param milliseconds time to live.
+     * @return {@code this}.
+     */
+    public RestoreArgs ttl(long milliseconds) {
+
+        this.ttl = milliseconds;
+        return this;
+    }
+
+    /**
+     * Set TTL in {@code milliseconds} after restoring the key.
+     *
+     * @param ttl time to live.
+     * @return {@code this}.
+     */
+    public RestoreArgs ttl(Duration ttl) {
+
+        LettuceAssert.notNull(ttl, "Time to live must not be null");
+
+        return ttl(ttl.toMillis());
+    }
+
+    /**
+     * Replaces existing keys if the target key already exists.
+     *
+     * @return {@code this}.
+     */
+    public RestoreArgs replace() {
+        return replace(true);
+    }
+
+    /**
+     * Replaces existing keys if the target key already exists.
+     *
+     * @param replace {@literal true} to enable replacing of existing keys.
+     * @return {@code this}.
+     */
+    public RestoreArgs replace(boolean replace) {
+
+        this.replace = replace;
+        return this;
+    }
+}
diff --git a/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
index 901c760a85..9338647860 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
@@ -269,6 +269,17 @@ public interface RedisKeyAsyncCommands<K, V> {
      */
     RedisFuture<String> restore(K key, long ttl, byte[] value);
 
+    /**
+     * Create a key using the provided serialized value, previously obtained using DUMP.
+     *
+     * @param key the key
+     * @param value the serialized-value type: string
+     * @param args the {@link RestoreArgs}, must not be {@literal null}.
+     * @return String simple-string-reply The command returns OK on success.
+     * @since 5.1
+     */
+    RedisFuture<String> restore(K key, byte[] value, RestoreArgs args);
+
     /**
      * Sort the elements in a list, set or sorted set.
      *
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
index 2279845f04..856e994c0b 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
@@ -270,6 +270,17 @@ public interface RedisKeyReactiveCommands<K, V> {
      */
     Mono<String> restore(K key, long ttl, byte[] value);
 
+    /**
+     * Create a key using the provided serialized value, previously obtained using DUMP.
+     *
+     * @param key the key
+     * @param value the serialized-value type: string
+     * @param args the {@link RestoreArgs}, must not be {@literal null}.
+     * @return String simple-string-reply The command returns OK on success.
+     * @since 5.1
+     */
+    Mono<String> restore(K key, byte[] value, RestoreArgs args);
+
     /**
      * Sort the elements in a list, set or sorted set.
      *
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
index e84b06f1f0..70420701ff 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
@@ -269,6 +269,17 @@ public interface RedisKeyCommands<K, V> {
      */
     String restore(K key, long ttl, byte[] value);
 
+    /**
+     * Create a key using the provided serialized value, previously obtained using DUMP.
+     *
+     * @param key the key
+     * @param value the serialized-value type: string
+     * @param args the {@link RestoreArgs}, must not be {@literal null}.
+     * @return String simple-string-reply The command returns OK on success.
+     * @since 5.1
+     */
+    String restore(K key, byte[] value, RestoreArgs args);
+
     /**
      * Sort the elements in a list, set or sorted set.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
index b8492a1209..87671e76b5 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
@@ -269,6 +269,17 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
      */
     AsyncExecutions<String> restore(K key, long ttl, byte[] value);
 
+    /**
+     * Create a key using the provided serialized value, previously obtained using DUMP.
+     *
+     * @param key the key
+     * @param value the serialized-value type: string
+     * @param args the {@link RestoreArgs}, must not be {@literal null}.
+     * @return String simple-string-reply The command returns OK on success.
+     * @since 5.1
+     */
+    AsyncExecutions<String> restore(K key, byte[] value, RestoreArgs args);
+
     /**
      * Sort the elements in a list, set or sorted set.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
index 37fbbbe7ea..0ce11bf22d 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
@@ -269,6 +269,17 @@ public interface NodeSelectionKeyCommands<K, V> {
      */
     Executions<String> restore(K key, long ttl, byte[] value);
 
+    /**
+     * Create a key using the provided serialized value, previously obtained using DUMP.
+     *
+     * @param key the key
+     * @param value the serialized-value type: string
+     * @param args the {@link RestoreArgs}, must not be {@literal null}.
+     * @return String simple-string-reply The command returns OK on success.
+     * @since 5.1
+     */
+    Executions<String> restore(K key, byte[] value, RestoreArgs args);
+
     /**
      * Sort the elements in a list, set or sorted set.
      *
diff --git a/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java b/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
index 0283f32f83..641a5d8d50 100644
--- a/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
@@ -268,6 +268,17 @@ public interface RedisKeyCommands<K, V> {
      */
     String restore(K key, long ttl, byte[] value);
 
+    /**
+     * Create a key using the provided serialized value, previously obtained using DUMP.
+     *
+     * @param key the key
+     * @param value the serialized-value type: string
+     * @param args the {@link RestoreArgs}, must not be {@literal null}.
+     * @return String simple-string-reply The command returns OK on success.
+     * @since 5.1
+     */
+    String restore(K key,  byte[] value, RestoreArgs args);
+
     /**
      * Sort the elements in a list, set or sorted set.
      *
diff --git a/src/test/java/io/lettuce/core/commands/KeyCommandTest.java b/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
index 614181c9c7..dbbf5a83af 100644
--- a/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
@@ -16,9 +16,11 @@
 package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assume.assumeTrue;
 
+import java.time.Duration;
 import java.util.*;
 
 import org.junit.Rule;
@@ -247,7 +249,20 @@ public void restore() {
         redis.del(key);
         assertThat(redis.restore(key, 1000, bytes)).isEqualTo("OK");
         assertThat(redis.get(key)).isEqualTo(value);
+        assertThat(redis.pttl(key)).isGreaterThan(0).isLessThanOrEqualTo(1000);
+
+        assertThatThrownBy(() -> redis.restore(key, 0, bytes)).isInstanceOf(RedisException.class);
+    }
+
+    @Test
+    public void restoreReplace() {
 
+        redis.set(key, value);
+        byte[] bytes = redis.dump(key);
+        redis.set(key, "foo");
+
+        assertThat(redis.restore(key, bytes, RestoreArgs.Builder.ttl(Duration.ofSeconds(1)).replace())).isEqualTo("OK");
+        assertThat(redis.get(key)).isEqualTo(value);
         assertThat(redis.pttl(key)).isGreaterThan(0).isLessThanOrEqualTo(1000);
     }
 

From c93e5191b7f2ca9451ab477b5b8fa2a2a25c3e9d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 5 Jun 2018 08:42:07 +0200
Subject: [PATCH 461/808] Improve Javadoc of QUIT method #781

---
 .../io/lettuce/core/api/async/BaseRedisAsyncCommands.java     | 4 +++-
 .../lettuce/core/api/reactive/BaseRedisReactiveCommands.java  | 4 +++-
 src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java | 4 +++-
 .../cluster/api/async/BaseNodeSelectionAsyncCommands.java     | 4 +++-
 .../core/cluster/api/sync/BaseNodeSelectionCommands.java      | 4 +++-
 src/main/templates/io/lettuce/core/api/BaseRedisCommands.java | 3 ++-
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
index bd98c5184b..cce1bb5e93 100644
--- a/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
@@ -111,7 +111,9 @@ public interface BaseRedisAsyncCommands<K, V> {
     RedisFuture<String> readWrite();
 
     /**
-     * Close the connection.
+     * Instructs Redis to disconnect the connection. Note that if auto-reconnect is enabled then Lettuce will auto-reconnect if
+     * the connection was disconnected. Use {@link io.lettuce.core.api.StatefulConnection#close} to close connections and
+     * release resources.
      *
      * @return String simple-string-reply always OK.
      */
diff --git a/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
index 95b3378d1a..ac037ad270 100644
--- a/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
@@ -111,7 +111,9 @@ public interface BaseRedisReactiveCommands<K, V> {
     Mono<String> readWrite();
 
     /**
-     * Close the connection.
+     * Instructs Redis to disconnect the connection. Note that if auto-reconnect is enabled then Lettuce will auto-reconnect if
+     * the connection was disconnected. Use {@link io.lettuce.core.api.StatefulConnection#close} to close connections and
+     * release resources.
      *
      * @return String simple-string-reply always OK.
      */
diff --git a/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java b/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
index a1880abc07..0dd29073a1 100644
--- a/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
@@ -110,7 +110,9 @@ public interface BaseRedisCommands<K, V> {
     String readWrite();
 
     /**
-     * Close the connection.
+     * Instructs Redis to disconnect the connection. Note that if auto-reconnect is enabled then Lettuce will auto-reconnect if
+     * the connection was disconnected. Use {@link io.lettuce.core.api.StatefulConnection#close} to close connections and
+     * release resources.
      *
      * @return String simple-string-reply always OK.
      */
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
index 486bc7999d..651bc0434b 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
@@ -96,7 +96,9 @@ public interface BaseNodeSelectionAsyncCommands<K, V> {
     AsyncExecutions<String> ping();
 
     /**
-     * Close the connection.
+     * Instructs Redis to disconnect the connection. Note that if auto-reconnect is enabled then Lettuce will auto-reconnect if
+     * the connection was disconnected. Use {@link io.lettuce.core.api.StatefulConnection#close} to close connections and
+     * release resources.
      *
      * @return String simple-string-reply always OK.
      */
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
index ad9a20cd77..f9d5015007 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
@@ -92,7 +92,9 @@ public interface BaseNodeSelectionCommands<K, V> {
     Executions<String> ping();
 
     /**
-     * Close the connection.
+     * Instructs Redis to disconnect the connection. Note that if auto-reconnect is enabled then Lettuce will auto-reconnect if
+     * the connection was disconnected. Use {@link io.lettuce.core.api.StatefulConnection#close} to close connection and release
+     * resources.
      *
      * @return String simple-string-reply always OK.
      */
diff --git a/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java b/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java
index 54fb464766..d345fa2560 100644
--- a/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java
+++ b/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java
@@ -110,7 +110,8 @@ public interface BaseRedisCommands<K, V>  {
     String readWrite();
 
     /**
-     * Close the connection.
+     * Instructs Redis to disconnect the connection. Note that if auto-reconnect is enabled then Lettuce will auto-reconnect if
+     * the connection was disconnected. Use {@link io.lettuce.core.api.StatefulConnection#close} to close connections and release resources.
      *
      * @return String simple-string-reply always OK.
      */

From dde37483a31215ebf17f7141fea6454971ea9a08 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 5 Jun 2018 15:51:27 +0200
Subject: [PATCH 462/808] Cancel commands after disconnect in at-most-once mode
 #547

Commands are cancelled (completed exceptionally) if a connection encounters a disconnect and auto-reconnect is disabled.
Previously, commands were cancelled when the connection was closed only.
---
 .../core/protocol/DefaultEndpoint.java        | 69 +++++++++++--------
 .../core/cluster/ClusterNodeEndpointTest.java | 15 +++-
 .../core/reliability/AtMostOnceTest.java      | 25 +++++++
 3 files changed, 76 insertions(+), 33 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index 9d5f654c1d..3e558152e0 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -23,6 +23,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import io.lettuce.core.*;
@@ -65,6 +66,7 @@ public class DefaultEndpoint implements RedisChannelWriter, Endpoint {
     private final Queue<RedisCommand<?, ?, ?>> disconnectedBuffer;
     private final Queue<RedisCommand<?, ?, ?>> commandBuffer;
     private final boolean boundedQueues;
+    private final boolean rejectCommandsWhileDisconnected;
 
     private final long endpointId = ENDPOINT_COUNTER.incrementAndGet();
     private final SharedLock sharedLock = new SharedLock();
@@ -101,6 +103,7 @@ public DefaultEndpoint(ClientOptions clientOptions) {
         this.disconnectedBuffer = LettuceFactories.newConcurrentQueue(clientOptions.getRequestQueueSize());
         this.commandBuffer = LettuceFactories.newConcurrentQueue(clientOptions.getRequestQueueSize());
         this.boundedQueues = clientOptions.getRequestQueueSize() != Integer.MAX_VALUE;
+        this.rejectCommandsWhileDisconnected = isRejectCommand(clientOptions);
     }
 
     @Override
@@ -202,7 +205,7 @@ private void validateWrite(int commands) {
             }
         }
 
-        if (!isConnected() && isRejectCommand()) {
+        if (!isConnected() && rejectCommandsWhileDisconnected) {
             throw new RedisException("Currently not connected. Commands are rejected.");
         }
     }
@@ -329,29 +332,6 @@ private ChannelFuture channelWriteAndFlush(RedisCommand<?, ?, ?> command) {
         return channel.writeAndFlush(command);
     }
 
-    private boolean isRejectCommand() {
-
-        if (clientOptions == null) {
-            return false;
-        }
-
-        switch (clientOptions.getDisconnectedBehavior()) {
-            case REJECT_COMMANDS:
-                return true;
-
-            case ACCEPT_COMMANDS:
-                return false;
-
-            default:
-            case DEFAULT:
-                if (!clientOptions.isAutoReconnect()) {
-                    return true;
-                }
-
-                return false;
-        }
-    }
-
     @Override
     public void notifyChannelActive(Channel channel) {
 
@@ -408,7 +388,8 @@ public void notifyChannelActive(Channel channel) {
     public void notifyChannelInactive(Channel channel) {
 
         if (isClosed()) {
-            cancelBufferedCommands("Connection closed");
+            RedisException closed = new RedisException("Connection closed");
+            cancelCommands("Connection closed", drainCommands(), it -> it.completeExceptionally(closed));
         }
 
         sharedLock.doExclusive(() -> {
@@ -577,8 +558,16 @@ public void initialState() {
     public void notifyDrainQueuedCommands(HasQueuedCommands queuedCommands) {
 
         if (isClosed()) {
-            cancelCommands("Connection closed", queuedCommands.drainQueue());
-            cancelCommands("Connection closed", drainCommands());
+
+            RedisException closed = new RedisException("Connection closed");
+            cancelCommands(closed.getMessage(), queuedCommands.drainQueue(), it -> it.completeExceptionally(closed));
+            cancelCommands(closed.getMessage(), drainCommands(), it -> it.completeExceptionally(closed));
+            return;
+        } else if (reliability == Reliability.AT_MOST_ONCE && rejectCommandsWhileDisconnected) {
+
+            RedisException disconnected = new RedisException("Connection disconnected");
+            cancelCommands(disconnected.getMessage(), queuedCommands.drainQueue(), it -> it.completeExceptionally(disconnected));
+            cancelCommands(disconnected.getMessage(), drainCommands(), it -> it.completeExceptionally(disconnected));
             return;
         }
 
@@ -667,16 +656,17 @@ protected <T> T doExclusive(Supplier<T> supplier) {
     }
 
     private void cancelBufferedCommands(String message) {
-        cancelCommands(message, doExclusive(this::drainCommands));
+        cancelCommands(message, doExclusive(this::drainCommands), RedisCommand::cancel);
     }
 
-    private void cancelCommands(String message, Iterable<? extends RedisCommand<?, ?, ?>> toCancel) {
+    private void cancelCommands(String message, Iterable<? extends RedisCommand<?, ?, ?>> toCancel,
+            Consumer<RedisCommand<?, ?, ?>> commandConsumer) {
 
         for (RedisCommand<?, ?, ?> cmd : toCancel) {
             if (cmd.getOutput() != null) {
                 cmd.getOutput().setError(message);
             }
-            cmd.cancel();
+            commandConsumer.accept(cmd);
         }
     }
 
@@ -697,6 +687,25 @@ protected String logPrefix() {
         return logPrefix = buffer;
     }
 
+    private static boolean isRejectCommand(ClientOptions clientOptions) {
+
+        switch (clientOptions.getDisconnectedBehavior()) {
+            case REJECT_COMMANDS:
+                return true;
+
+            case ACCEPT_COMMANDS:
+                return false;
+
+            default:
+            case DEFAULT:
+                if (!clientOptions.isAutoReconnect()) {
+                    return true;
+                }
+
+                return false;
+        }
+    }
+
     static class ListenerSupport {
 
         Collection<? extends RedisCommand<?, ?, ?>> sentCommands;
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
index aea5a922e6..da55359bc9 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
@@ -11,7 +11,6 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 package io.lettuce.core.cluster;
 
@@ -69,9 +68,9 @@ public class ClusterNodeEndpointTest {
     public void before() {
 
         when(clientOptions.getRequestQueueSize()).thenReturn(1000);
+        when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.DEFAULT);
 
-        sut = new ClusterNodeEndpoint(clientOptions, clientResources, clusterChannelWriter);
-        disconnectedBuffer = (Queue) ReflectionTestUtils.getField(sut, "disconnectedBuffer");
+        prepareNewEndpoint();
     }
 
     @Test
@@ -125,6 +124,7 @@ public void closeWithQueuedCommandsFails() throws Exception {
     public void closeWithBufferedCommands() {
 
         when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS);
+        prepareNewEndpoint();
 
         sut.write(command);
 
@@ -137,6 +137,8 @@ public void closeWithBufferedCommands() {
     public void closeWithCancelledBufferedCommands() {
 
         when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS);
+        prepareNewEndpoint();
+
         sut.write(command);
         command.cancel();
 
@@ -149,6 +151,8 @@ public void closeWithCancelledBufferedCommands() {
     public void closeWithBufferedCommandsFails() throws Exception {
 
         when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS);
+        prepareNewEndpoint();
+
         sut.write(command);
         when(clusterChannelWriter.write(any(RedisCommand.class))).thenThrow(new RedisException(""));
 
@@ -162,4 +166,9 @@ public void closeWithBufferedCommandsFails() throws Exception {
             assertThat(e).hasCauseExactlyInstanceOf(RedisException.class);
         }
     }
+
+    private void prepareNewEndpoint() {
+        sut = new ClusterNodeEndpoint(clientOptions, clientResources, clusterChannelWriter);
+        disconnectedBuffer = (Queue) ReflectionTestUtils.getField(sut, "disconnectedBuffer");
+    }
 }
diff --git a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
index 19f58d5760..213cff302b 100644
--- a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
@@ -25,6 +25,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
+import io.lettuce.core.api.async.RedisAsyncCommands;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -281,6 +282,30 @@ public void noCommandsExecutedAfterConnectionIsDisconnected() {
         connection2.close();
     }
 
+    @Test
+    public void commandsCancelledOnDisconnect() {
+
+        StatefulRedisConnection<String, String> connection = client.connect();
+
+        try {
+
+            RedisAsyncCommands<String, String> async = connection.async();
+            async.setAutoFlushCommands(false);
+            async.quit();
+
+            RedisFuture<Long> incr = async.incr(key);
+
+            connection.flushCommands();
+
+            incr.get(5, TimeUnit.SECONDS);
+
+        } catch (Exception e) {
+            assertThat(e).hasRootCauseInstanceOf(RedisException.class).hasMessageContaining("Connection disconnected");
+        }
+
+        connection.close();
+    }
+
     private Throwable getException(RedisFuture<?> command) {
         try {
             command.get();

From b89a6eaed008d7b8d77400e4f7fcb2c08e723253 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 6 Jun 2018 09:19:07 +0200
Subject: [PATCH 463/808] Add support for ZPOPMIN, ZPOPMAX, BZPOPMIN, BZPOPMAX
 commands #778

---
 .../core/AbstractRedisAsyncCommands.java      | 30 +++++++++
 .../core/AbstractRedisReactiveCommands.java   | 30 +++++++++
 .../io/lettuce/core/RedisCommandBuilder.java  | 48 ++++++++++++++
 .../async/RedisSortedSetAsyncCommands.java    | 58 +++++++++++++++++
 .../RedisSortedSetReactiveCommands.java       | 58 +++++++++++++++++
 .../core/api/sync/RedisSortedSetCommands.java | 58 +++++++++++++++++
 .../NodeSelectionSortedSetAsyncCommands.java  | 58 +++++++++++++++++
 .../sync/NodeSelectionSortedSetCommands.java  | 58 +++++++++++++++++
 .../output/KeyValueScoredValueOutput.java     | 62 ++++++++++++++++++
 .../core/output/ScoredValueOutput.java        | 52 +++++++++++++++
 .../io/lettuce/core/protocol/CommandType.java |  2 +-
 .../core/api/RedisSortedSetCommands.java      | 64 +++++++++++++++++--
 .../core/commands/SortedSetCommandTest.java   | 34 ++++++++++
 13 files changed, 607 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/output/KeyValueScoredValueOutput.java
 create mode 100644 src/main/java/io/lettuce/core/output/ScoredValueOutput.java

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index cfdbc067a4..6d6a418ae2 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1595,6 +1595,16 @@ public RedisFuture<Long> xtrim(K key, long count) {
         return dispatch(commandBuilder.xtrim(key, count));
     }
 
+    @Override
+    public RedisFuture<KeyValue<K, ScoredValue<V>>> bzpopmin(long timeout, K... keys) {
+        return dispatch(commandBuilder.bzpopmin(timeout, keys));
+    }
+
+    @Override
+    public RedisFuture<KeyValue<K, ScoredValue<V>>> bzpopmax(long timeout, K... keys) {
+        return dispatch(commandBuilder.bzpopmax(timeout, keys));
+    }
+
     @Override
     public RedisFuture<Long> zadd(K key, double score, V member) {
         return dispatch(commandBuilder.zadd(key, null, score, member));
@@ -1680,6 +1690,26 @@ public RedisFuture<Long> zlexcount(K key, Range<? extends V> range) {
         return dispatch(commandBuilder.zlexcount(key, range));
     }
 
+    @Override
+    public RedisFuture<ScoredValue<V>> zpopmin(K key) {
+        return dispatch(commandBuilder.zpopmin(key));
+    }
+
+    @Override
+    public RedisFuture<List<ScoredValue<V>>> zpopmin(K key, long count) {
+        return dispatch(commandBuilder.zpopmin(key, count));
+    }
+
+    @Override
+    public RedisFuture<ScoredValue<V>> zpopmax(K key) {
+        return dispatch(commandBuilder.zpopmax(key));
+    }
+
+    @Override
+    public RedisFuture<List<ScoredValue<V>>> zpopmax(K key, long count) {
+        return dispatch(commandBuilder.zpopmax(key, count));
+    }
+
     @Override
     public RedisFuture<List<V>> zrange(K key, long start, long stop) {
         return dispatch(commandBuilder.zrange(key, start, stop));
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index f7d5d33f41..09c4bc113b 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -1608,6 +1608,16 @@ public Mono<Long> xtrim(K key, long count) {
         return createMono(() -> commandBuilder.xtrim(key, count));
     }
 
+    @Override
+    public Mono<KeyValue<K, ScoredValue<V>>> bzpopmin(long timeout, K... keys) {
+        return createMono(() -> commandBuilder.bzpopmin(timeout, keys));
+    }
+
+    @Override
+    public Mono<KeyValue<K, ScoredValue<V>>> bzpopmax(long timeout, K... keys) {
+        return createMono(() -> commandBuilder.bzpopmax(timeout, keys));
+    }
+
     @Override
     public Mono<Long> zadd(K key, double score, V member) {
         return createMono(() -> commandBuilder.zadd(key, null, score, member));
@@ -1692,6 +1702,26 @@ public Mono<Long> zlexcount(K key, Range<? extends V> range) {
         return createMono(() -> commandBuilder.zlexcount(key, range));
     }
 
+    @Override
+    public Mono<ScoredValue<V>> zpopmin(K key) {
+        return createMono(() -> commandBuilder.zpopmin(key));
+    }
+
+    @Override
+    public Flux<ScoredValue<V>> zpopmin(K key, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zpopmin(key, count));
+    }
+
+    @Override
+    public Mono<ScoredValue<V>> zpopmax(K key) {
+        return createMono(() -> commandBuilder.zpopmax(key));
+    }
+
+    @Override
+    public Flux<ScoredValue<V>> zpopmax(K key, long count) {
+        return createDissolvingFlux(() -> commandBuilder.zpopmax(key, count));
+    }
+
     @Override
     public Flux<V> zrange(K key, long start, long stop) {
         return createDissolvingFlux(() -> commandBuilder.zrange(key, start, stop));
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index ba4c9ce380..d678e9098a 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -2303,6 +2303,22 @@ public Command<K, V, List<StreamMessage<K, V>>> xreadgroup(Consumer<K> consumer,
         return createCommand(XREADGROUP, new StreamReadOutput<>(codec), args);
     }
 
+    Command<K, V, KeyValue<K, ScoredValue<V>>> bzpopmin(long timeout, K... keys) {
+        notEmpty(keys);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys).add(timeout);
+
+        return createCommand(BZPOPMIN, new KeyValueScoredValueOutput<>(codec), args);
+    }
+
+    Command<K, V, KeyValue<K, ScoredValue<V>>> bzpopmax(long timeout, K... keys) {
+        notEmpty(keys);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys).add(timeout);
+
+        return createCommand(BZPOPMAX, new KeyValueScoredValueOutput<>(codec), args);
+    }
+
     Command<K, V, Long> zadd(K key, ZAddArgs zAddArgs, double score, V member) {
         notNullKey(key);
 
@@ -2434,6 +2450,38 @@ RedisCommand<K, V, Long> zlexcount(K key, Range<? extends V> range) {
         return createCommand(ZLEXCOUNT, new IntegerOutput<>(codec), args);
     }
 
+    Command<K, V, ScoredValue<V>> zpopmin(K key) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(key);
+
+        return createCommand(ZPOPMIN, new ScoredValueOutput<>(codec), args);
+    }
+
+    Command<K, V, List<ScoredValue<V>>> zpopmin(K key, long count) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(key).add(count);
+
+        return createCommand(ZPOPMIN, new ScoredValueListOutput<>(codec), args);
+    }
+
+    Command<K, V, ScoredValue<V>> zpopmax(K key) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(key);
+
+        return createCommand(ZPOPMAX, new ScoredValueOutput<>(codec), args);
+    }
+
+    Command<K, V, List<ScoredValue<V>>> zpopmax(K key, long count) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(key).add(count);
+
+        return createCommand(ZPOPMAX, new ScoredValueListOutput<>(codec), args);
+    }
+
     Command<K, V, List<V>> zrange(K key, long start, long stop) {
         notNullKey(key);
 
diff --git a/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
index 1226c1def8..fc0073a444 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
@@ -32,6 +32,26 @@
  */
 public interface RedisSortedSetAsyncCommands<K, V> {
 
+    /**
+     * Removes and returns a member with the lowest scores in the sorted set stored at one of the keys.
+     *
+     * @param timeout the timeout in seconds.
+     * @param keys the keys.
+     * @return KeyValue&lt;K, ScoredValue&lt;V&gt;&gt; multi-bulk containing the name of the key, the score and the popped member.
+     * @since 5.1
+     */
+    RedisFuture<KeyValue<K, ScoredValue<V>>> bzpopmin(long timeout, K... keys);
+
+    /**
+     * Removes and returns a member with the highest scores in the sorted set stored at one of the keys.
+     *
+     * @param timeout the timeout in seconds.
+     * @param keys the keys.
+     * @return KeyValue&lt;K, ScoredValue&lt;V&gt;&gt; multi-bulk containing the name of the key, the score and the popped member.
+     * @since 5.1
+     */
+    RedisFuture<KeyValue<K, ScoredValue<V>>> bzpopmax(long timeout, K... keys);
+
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
      *
@@ -230,6 +250,44 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      */
     RedisFuture<Long> zlexcount(K key, Range<? extends V> range);
 
+    /**
+     * Removes and returns up to count members with the lowest scores in the sorted set stored at key.
+     *
+     * @param key the key
+     * @return ScoredValue&lt;V&gt; the removed element.
+     * @since 5.1
+     */
+    RedisFuture<ScoredValue<V>> zpopmin(K key);
+
+    /**
+     * Removes and returns up to count members with the lowest scores in the sorted set stored at key.
+     *
+     * @param key the key.
+     * @param count the number of elements to return.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of popped scores and elements.
+     * @since 5.1
+     */
+    RedisFuture<List<ScoredValue<V>>> zpopmin(K key, long count);
+
+    /**
+     * Removes and returns up to count members with the highest scores in the sorted set stored at key.
+     *
+     * @param key the key
+     * @return ScoredValue&lt;V&gt; the removed element.
+     * @since 5.1
+     */
+    RedisFuture<ScoredValue<V>> zpopmax(K key);
+
+    /**
+     * Removes and returns up to count members with the highest scores in the sorted set stored at key.
+     *
+     * @param key the key.
+     * @param count the number of elements to return.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of popped scores and elements.
+     * @since 5.1
+     */
+    RedisFuture<List<ScoredValue<V>>> zpopmax(K key, long count);
+
     /**
      * Return a range of members in a sorted set, by index.
      *
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
index 38acbc1bc7..d227bb3ab4 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
@@ -32,6 +32,26 @@
  */
 public interface RedisSortedSetReactiveCommands<K, V> {
 
+    /**
+     * Removes and returns a member with the lowest scores in the sorted set stored at one of the keys.
+     *
+     * @param timeout the timeout in seconds.
+     * @param keys the keys.
+     * @return KeyValue&lt;K, ScoredValue&lt;V&gt;&gt; multi-bulk containing the name of the key, the score and the popped member.
+     * @since 5.1
+     */
+    Mono<KeyValue<K, ScoredValue<V>>> bzpopmin(long timeout, K... keys);
+
+    /**
+     * Removes and returns a member with the highest scores in the sorted set stored at one of the keys.
+     *
+     * @param timeout the timeout in seconds.
+     * @param keys the keys.
+     * @return KeyValue&lt;K, ScoredValue&lt;V&gt;&gt; multi-bulk containing the name of the key, the score and the popped member.
+     * @since 5.1
+     */
+    Mono<KeyValue<K, ScoredValue<V>>> bzpopmax(long timeout, K... keys);
+
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
      *
@@ -230,6 +250,44 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      */
     Mono<Long> zlexcount(K key, Range<? extends V> range);
 
+    /**
+     * Removes and returns up to count members with the lowest scores in the sorted set stored at key.
+     *
+     * @param key the key
+     * @return ScoredValue&lt;V&gt; the removed element.
+     * @since 5.1
+     */
+    Mono<ScoredValue<V>> zpopmin(K key);
+
+    /**
+     * Removes and returns up to count members with the lowest scores in the sorted set stored at key.
+     *
+     * @param key the key.
+     * @param count the number of elements to return.
+     * @return ScoredValue&lt;V&gt; array-reply list of popped scores and elements.
+     * @since 5.1
+     */
+    Flux<ScoredValue<V>> zpopmin(K key, long count);
+
+    /**
+     * Removes and returns up to count members with the highest scores in the sorted set stored at key.
+     *
+     * @param key the key
+     * @return ScoredValue&lt;V&gt; the removed element.
+     * @since 5.1
+     */
+    Mono<ScoredValue<V>> zpopmax(K key);
+
+    /**
+     * Removes and returns up to count members with the highest scores in the sorted set stored at key.
+     *
+     * @param key the key.
+     * @param count the number of elements to return.
+     * @return ScoredValue&lt;V&gt; array-reply list of popped scores and elements.
+     * @since 5.1
+     */
+    Flux<ScoredValue<V>> zpopmax(K key, long count);
+
     /**
      * Return a range of members in a sorted set, by index.
      *
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
index c35fd49fa5..d3f17a09cd 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
@@ -32,6 +32,26 @@
  */
 public interface RedisSortedSetCommands<K, V> {
 
+    /**
+     * Removes and returns a member with the lowest scores in the sorted set stored at one of the keys.
+     *
+     * @param timeout the timeout in seconds.
+     * @param keys the keys.
+     * @return KeyValue&lt;K, ScoredValue&lt;V&gt;&gt; multi-bulk containing the name of the key, the score and the popped member.
+     * @since 5.1
+     */
+    KeyValue<K, ScoredValue<V>> bzpopmin(long timeout, K... keys);
+
+    /**
+     * Removes and returns a member with the highest scores in the sorted set stored at one of the keys.
+     *
+     * @param timeout the timeout in seconds.
+     * @param keys the keys.
+     * @return KeyValue&lt;K, ScoredValue&lt;V&gt;&gt; multi-bulk containing the name of the key, the score and the popped member.
+     * @since 5.1
+     */
+    KeyValue<K, ScoredValue<V>> bzpopmax(long timeout, K... keys);
+
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
      *
@@ -230,6 +250,44 @@ public interface RedisSortedSetCommands<K, V> {
      */
     Long zlexcount(K key, Range<? extends V> range);
 
+    /**
+     * Removes and returns up to count members with the lowest scores in the sorted set stored at key.
+     *
+     * @param key the key
+     * @return ScoredValue&lt;V&gt; the removed element.
+     * @since 5.1
+     */
+    ScoredValue<V> zpopmin(K key);
+
+    /**
+     * Removes and returns up to count members with the lowest scores in the sorted set stored at key.
+     *
+     * @param key the key.
+     * @param count the number of elements to return.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of popped scores and elements.
+     * @since 5.1
+     */
+    List<ScoredValue<V>> zpopmin(K key, long count);
+
+    /**
+     * Removes and returns up to count members with the highest scores in the sorted set stored at key.
+     *
+     * @param key the key
+     * @return ScoredValue&lt;V&gt; the removed element.
+     * @since 5.1
+     */
+    ScoredValue<V> zpopmax(K key);
+
+    /**
+     * Removes and returns up to count members with the highest scores in the sorted set stored at key.
+     *
+     * @param key the key.
+     * @param count the number of elements to return.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of popped scores and elements.
+     * @since 5.1
+     */
+    List<ScoredValue<V>> zpopmax(K key, long count);
+
     /**
      * Return a range of members in a sorted set, by index.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
index 00c9e0ea37..05d9b82cde 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
@@ -32,6 +32,26 @@
  */
 public interface NodeSelectionSortedSetAsyncCommands<K, V> {
 
+    /**
+     * Removes and returns a member with the lowest scores in the sorted set stored at one of the keys.
+     *
+     * @param timeout the timeout in seconds.
+     * @param keys the keys.
+     * @return KeyValue&lt;K, ScoredValue&lt;V&gt;&gt; multi-bulk containing the name of the key, the score and the popped member.
+     * @since 5.1
+     */
+    AsyncExecutions<KeyValue<K, ScoredValue<V>>> bzpopmin(long timeout, K... keys);
+
+    /**
+     * Removes and returns a member with the highest scores in the sorted set stored at one of the keys.
+     *
+     * @param timeout the timeout in seconds.
+     * @param keys the keys.
+     * @return KeyValue&lt;K, ScoredValue&lt;V&gt;&gt; multi-bulk containing the name of the key, the score and the popped member.
+     * @since 5.1
+     */
+    AsyncExecutions<KeyValue<K, ScoredValue<V>>> bzpopmax(long timeout, K... keys);
+
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
      *
@@ -230,6 +250,44 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      */
     AsyncExecutions<Long> zlexcount(K key, Range<? extends V> range);
 
+    /**
+     * Removes and returns up to count members with the lowest scores in the sorted set stored at key.
+     *
+     * @param key the key
+     * @return ScoredValue&lt;V&gt; the removed element.
+     * @since 5.1
+     */
+    AsyncExecutions<ScoredValue<V>> zpopmin(K key);
+
+    /**
+     * Removes and returns up to count members with the lowest scores in the sorted set stored at key.
+     *
+     * @param key the key.
+     * @param count the number of elements to return.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of popped scores and elements.
+     * @since 5.1
+     */
+    AsyncExecutions<List<ScoredValue<V>>> zpopmin(K key, long count);
+
+    /**
+     * Removes and returns up to count members with the highest scores in the sorted set stored at key.
+     *
+     * @param key the key
+     * @return ScoredValue&lt;V&gt; the removed element.
+     * @since 5.1
+     */
+    AsyncExecutions<ScoredValue<V>> zpopmax(K key);
+
+    /**
+     * Removes and returns up to count members with the highest scores in the sorted set stored at key.
+     *
+     * @param key the key.
+     * @param count the number of elements to return.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of popped scores and elements.
+     * @since 5.1
+     */
+    AsyncExecutions<List<ScoredValue<V>>> zpopmax(K key, long count);
+
     /**
      * Return a range of members in a sorted set, by index.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
index 961fad7e70..08e51e0045 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
@@ -32,6 +32,26 @@
  */
 public interface NodeSelectionSortedSetCommands<K, V> {
 
+    /**
+     * Removes and returns a member with the lowest scores in the sorted set stored at one of the keys.
+     *
+     * @param timeout the timeout in seconds.
+     * @param keys the keys.
+     * @return KeyValue&lt;K, ScoredValue&lt;V&gt;&gt; multi-bulk containing the name of the key, the score and the popped member.
+     * @since 5.1
+     */
+    Executions<KeyValue<K, ScoredValue<V>>> bzpopmin(long timeout, K... keys);
+
+    /**
+     * Removes and returns a member with the highest scores in the sorted set stored at one of the keys.
+     *
+     * @param timeout the timeout in seconds.
+     * @param keys the keys.
+     * @return KeyValue&lt;K, ScoredValue&lt;V&gt;&gt; multi-bulk containing the name of the key, the score and the popped member.
+     * @since 5.1
+     */
+    Executions<KeyValue<K, ScoredValue<V>>> bzpopmax(long timeout, K... keys);
+
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
      *
@@ -230,6 +250,44 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      */
     Executions<Long> zlexcount(K key, Range<? extends V> range);
 
+    /**
+     * Removes and returns up to count members with the lowest scores in the sorted set stored at key.
+     *
+     * @param key the key
+     * @return ScoredValue&lt;V&gt; the removed element.
+     * @since 5.1
+     */
+    Executions<ScoredValue<V>> zpopmin(K key);
+
+    /**
+     * Removes and returns up to count members with the lowest scores in the sorted set stored at key.
+     *
+     * @param key the key.
+     * @param count the number of elements to return.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of popped scores and elements.
+     * @since 5.1
+     */
+    Executions<List<ScoredValue<V>>> zpopmin(K key, long count);
+
+    /**
+     * Removes and returns up to count members with the highest scores in the sorted set stored at key.
+     *
+     * @param key the key
+     * @return ScoredValue&lt;V&gt; the removed element.
+     * @since 5.1
+     */
+    Executions<ScoredValue<V>> zpopmax(K key);
+
+    /**
+     * Removes and returns up to count members with the highest scores in the sorted set stored at key.
+     *
+     * @param key the key.
+     * @param count the number of elements to return.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of popped scores and elements.
+     * @since 5.1
+     */
+    Executions<List<ScoredValue<V>>> zpopmax(K key, long count);
+
     /**
      * Return a range of members in a sorted set, by index.
      *
diff --git a/src/main/java/io/lettuce/core/output/KeyValueScoredValueOutput.java b/src/main/java/io/lettuce/core/output/KeyValueScoredValueOutput.java
new file mode 100644
index 0000000000..d3ce478104
--- /dev/null
+++ b/src/main/java/io/lettuce/core/output/KeyValueScoredValueOutput.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.output;
+
+import java.nio.ByteBuffer;
+
+import io.lettuce.core.KeyValue;
+import io.lettuce.core.LettuceStrings;
+import io.lettuce.core.ScoredValue;
+import io.lettuce.core.codec.RedisCodec;
+
+/**
+ * {@link KeyValue} encapsulating {@link ScoredValue}. See {@code BZPOPMIN}/{@code BZPOPMAX} commands.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 5.1
+ */
+public class KeyValueScoredValueOutput<K, V> extends CommandOutput<K, V, KeyValue<K, ScoredValue<V>>> {
+
+    private K key;
+    private V value;
+
+    public KeyValueScoredValueOutput(RedisCodec<K, V> codec) {
+        super(codec, null);
+    }
+
+    @Override
+    public void set(ByteBuffer bytes) {
+
+        if (key == null) {
+            key = codec.decodeKey(bytes);
+            return;
+        }
+
+        if (value == null) {
+            value = codec.decodeValue(bytes);
+            return;
+        }
+
+        double score = LettuceStrings.toDouble(decodeAscii(bytes));
+
+        output = KeyValue.just(key, ScoredValue.just(score, value));
+        key = null;
+        value = null;
+    }
+
+}
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueOutput.java
new file mode 100644
index 0000000000..5651b79f16
--- /dev/null
+++ b/src/main/java/io/lettuce/core/output/ScoredValueOutput.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.output;
+
+import java.nio.ByteBuffer;
+
+import io.lettuce.core.LettuceStrings;
+import io.lettuce.core.ScoredValue;
+import io.lettuce.core.codec.RedisCodec;
+
+/**
+ * A single {@link ScoredValue}.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 5.1
+ */
+public class ScoredValueOutput<K, V> extends CommandOutput<K, V, ScoredValue<V>> {
+
+    private V value;
+
+    public ScoredValueOutput(RedisCodec<K, V> codec) {
+        super(codec, ScoredValue.empty());
+    }
+
+    @Override
+    public void set(ByteBuffer bytes) {
+
+        if (value == null) {
+            value = codec.decodeValue(bytes);
+            return;
+        }
+
+        double score = LettuceStrings.toDouble(decodeAscii(bytes));
+        output = ScoredValue.just(score, value);
+        value = null;
+    }
+}
diff --git a/src/main/java/io/lettuce/core/protocol/CommandType.java b/src/main/java/io/lettuce/core/protocol/CommandType.java
index ddaebda7de..bde0e85d76 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandType.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandType.java
@@ -68,7 +68,7 @@ public enum CommandType implements ProtocolKeyword {
 
     // Sorted Set
 
-    ZADD, ZCARD, ZCOUNT, ZINCRBY, ZINTERSTORE, ZRANGE, ZRANGEBYSCORE, ZRANK, ZREM, ZREMRANGEBYRANK, ZREMRANGEBYSCORE, ZREVRANGE, ZREVRANGEBYLEX, ZREVRANGEBYSCORE, ZREVRANK, ZSCORE, ZUNIONSTORE, ZSCAN, ZLEXCOUNT, ZREMRANGEBYLEX, ZRANGEBYLEX,
+    BZPOPMIN, BZPOPMAX, ZADD, ZCARD, ZCOUNT, ZINCRBY, ZINTERSTORE, ZPOPMIN, ZPOPMAX, ZRANGE, ZRANGEBYSCORE, ZRANK, ZREM, ZREMRANGEBYRANK, ZREMRANGEBYSCORE, ZREVRANGE, ZREVRANGEBYLEX, ZREVRANGEBYSCORE, ZREVRANK, ZSCORE, ZUNIONSTORE, ZSCAN, ZLEXCOUNT, ZREMRANGEBYLEX, ZRANGEBYLEX,
 
     // Scripting
 
diff --git a/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java b/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
index f35a5c82d7..2063c2e27d 100644
--- a/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
@@ -31,6 +31,26 @@
  */
 public interface RedisSortedSetCommands<K, V> {
 
+    /**
+     * Removes and returns a member with the lowest scores in the sorted set stored at one of the keys.
+     *
+     * @param timeout the timeout in seconds.
+     * @param keys the keys.
+     * @return KeyValue&lt;K, ScoredValue&lt;V&gt;&gt; multi-bulk containing the name of the key, the score and the popped member.
+     * @since 5.1
+     */
+    KeyValue<K, ScoredValue<V>> bzpopmin(long timeout, K... keys);
+
+    /**
+     * Removes and returns a member with the highest scores in the sorted set stored at one of the keys.
+     *
+     * @param timeout the timeout in seconds.
+     * @param keys the keys.
+     * @return KeyValue&lt;K, ScoredValue&lt;V&gt;&gt; multi-bulk containing the name of the key, the score and the popped member.
+     * @since 5.1
+     */
+    KeyValue<K, ScoredValue<V>> bzpopmax(long timeout, K... keys);
+
     /**
      * Add one or more members to a sorted set, or update its score if it already exists.
      *
@@ -229,6 +249,44 @@ public interface RedisSortedSetCommands<K, V> {
      */
     Long zlexcount(K key, Range<? extends V> range);
 
+    /**
+     * Removes and returns up to count members with the lowest scores in the sorted set stored at key.
+     *
+     * @param key the key
+     * @return ScoredValue&lt;V&gt; the removed element.
+     * @since 5.1
+     */
+    ScoredValue<V> zpopmin(K key);
+
+    /**
+     * Removes and returns up to count members with the lowest scores in the sorted set stored at key.
+     *
+     * @param key the key.
+     * @param count the number of elements to return.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of popped scores and elements.
+     * @since 5.1
+     */
+    List<ScoredValue<V>> zpopmin(K key, long count);
+
+    /**
+     * Removes and returns up to count members with the highest scores in the sorted set stored at key.
+     *
+     * @param key the key
+     * @return ScoredValue&lt;V&gt; the removed element.
+     * @since 5.1
+     */
+    ScoredValue<V> zpopmax(K key);
+
+    /**
+     * Removes and returns up to count members with the highest scores in the sorted set stored at key.
+     *
+     * @param key the key.
+     * @param count the number of elements to return.
+     * @return List&lt;ScoredValue&lt;V&gt;&gt; array-reply list of popped scores and elements.
+     * @since 5.1
+     */
+    List<ScoredValue<V>> zpopmax(K key, long count);
+
     /**
      * Return a range of members in a sorted set, by index.
      *
@@ -593,8 +651,7 @@ public interface RedisSortedSetCommands<K, V> {
      * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
     @Deprecated
-    Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max, long offset,
-            long count);
+    Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
@@ -609,8 +666,7 @@ Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, doub
      * @deprecated Use {@link #zrangebyscoreWithScores(ScoredValueStreamingChannel, java.lang.Object, Range, Limit limit)}
      */
     @Deprecated
-    Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max, long offset,
-            long count);
+    Long zrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count);
 
     /**
      * Stream over a range of members with scores in a sorted set, by score.
diff --git a/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java b/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
index 6592dbd5e3..c8bfdee683 100644
--- a/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
@@ -169,6 +169,40 @@ public void zinterstore() {
         assertThat(redis.zrangeWithScores(key, 0, -1)).isEqualTo(svlist(sv(3.0, "a"), sv(5.0, "b")));
     }
 
+    @Test
+    public void bzpopmin() {
+        redis.zadd("zset", 2.0, "a", 3.0, "b", 4.0, "c");
+
+        assertThat(redis.bzpopmin(1, "zset")).isEqualTo(KeyValue.just("zset", ScoredValue.just(2.0, "a")));
+        assertThat(redis.bzpopmin(1, "zset2")).isNull();
+    }
+
+    @Test
+    public void bzpopmax() {
+        redis.zadd("zset", 2.0, "a", 3.0, "b", 4.0, "c");
+
+        assertThat(redis.bzpopmax(1, "zset")).isEqualTo(KeyValue.just("zset", ScoredValue.just(4.0, "c")));
+        assertThat(redis.bzpopmax(1, "zset2")).isNull();
+    }
+
+    @Test
+    public void zpopmin() {
+        redis.zadd("zset", 2.0, "a", 3.0, "b", 4.0, "c");
+
+        assertThat(redis.zpopmin("zset")).isEqualTo(ScoredValue.just(2.0, "a"));
+        assertThat(redis.zpopmin("zset", 2)).contains(ScoredValue.just(3.0, "b"), ScoredValue.just(4.0, "c"));
+        assertThat(redis.zpopmin("foo")).isEqualTo(ScoredValue.empty());
+    }
+
+    @Test
+    public void zpopmax() {
+        redis.zadd("zset", 2.0, "a", 3.0, "b", 4.0, "c");
+
+        assertThat(redis.zpopmax("zset")).isEqualTo(ScoredValue.just(4.0, "c"));
+        assertThat(redis.zpopmax("zset", 2)).contains(ScoredValue.just(2.0, "a"), ScoredValue.just(3.0, "b"));
+        assertThat(redis.zpopmax("foo")).isEqualTo(ScoredValue.empty());
+    }
+
     @Test
     public void zrange() {
         setup();

From 106b1bb396d8a10e0205292959828bcb7887a721 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 7 Jun 2018 08:54:42 +0200
Subject: [PATCH 464/808] Polishing #778

Add test guards.
---
 .../core/commands/SortedSetCommandTest.java        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java b/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
index c8bfdee683..54ad6f3770 100644
--- a/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
@@ -24,10 +24,12 @@
 import static java.lang.Double.POSITIVE_INFINITY;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.data.Offset.offset;
+import static org.junit.Assume.assumeTrue;
 
 import java.util.HashSet;
 import java.util.Set;
 
+import io.lettuce.RedisConditions;
 import org.junit.Test;
 
 import io.lettuce.core.*;
@@ -171,6 +173,9 @@ public void zinterstore() {
 
     @Test
     public void bzpopmin() {
+
+        assumeTrue(RedisConditions.of(redis).hasCommand("BZPOPMIN"));
+
         redis.zadd("zset", 2.0, "a", 3.0, "b", 4.0, "c");
 
         assertThat(redis.bzpopmin(1, "zset")).isEqualTo(KeyValue.just("zset", ScoredValue.just(2.0, "a")));
@@ -179,6 +184,9 @@ public void bzpopmin() {
 
     @Test
     public void bzpopmax() {
+
+        assumeTrue(RedisConditions.of(redis).hasCommand("BZPOPMAX"));
+
         redis.zadd("zset", 2.0, "a", 3.0, "b", 4.0, "c");
 
         assertThat(redis.bzpopmax(1, "zset")).isEqualTo(KeyValue.just("zset", ScoredValue.just(4.0, "c")));
@@ -187,6 +195,9 @@ public void bzpopmax() {
 
     @Test
     public void zpopmin() {
+
+        assumeTrue(RedisConditions.of(redis).hasCommand("ZPOPMIN"));
+
         redis.zadd("zset", 2.0, "a", 3.0, "b", 4.0, "c");
 
         assertThat(redis.zpopmin("zset")).isEqualTo(ScoredValue.just(2.0, "a"));
@@ -196,6 +207,9 @@ public void zpopmin() {
 
     @Test
     public void zpopmax() {
+
+        assumeTrue(RedisConditions.of(redis).hasCommand("ZPOPMAX"));
+
         redis.zadd("zset", 2.0, "a", 3.0, "b", 4.0, "c");
 
         assertThat(redis.zpopmax("zset")).isEqualTo(ScoredValue.just(4.0, "c"));

From 60e5af74de92afdae9879d32b3463c3af5980acb Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 8 Jun 2018 12:28:20 +0200
Subject: [PATCH 465/808] Add implementations for XGROUP
 [DESTROY|DELCONSUMER|SETID] #789

---
 .../core/AbstractRedisAsyncCommands.java      | 11 +++++--
 .../core/AbstractRedisReactiveCommands.java   | 11 +++++--
 .../io/lettuce/core/RedisCommandBuilder.java  | 31 ++++++++++++++++++-
 .../api/async/RedisStreamAsyncCommands.java   | 16 +++++++---
 .../reactive/RedisStreamReactiveCommands.java | 16 +++++++---
 .../core/api/sync/RedisStreamCommands.java    | 16 +++++++---
 .../NodeSelectionStreamAsyncCommands.java     | 16 +++++++---
 .../api/sync/NodeSelectionStreamCommands.java | 16 +++++++---
 .../lettuce/core/api/RedisStreamCommands.java | 16 +++++++---
 .../core/commands/StreamCommandTest.java      | 25 ++++++++++-----
 10 files changed, 136 insertions(+), 38 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 6d6a418ae2..b16df7544d 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1521,12 +1521,17 @@ public RedisFuture<String> xgroupCreate(K key, K group, String offset) {
 
     @Override
     public RedisFuture<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer) {
-        return null;
+        return dispatch(commandBuilder.xgroupDelconsumer(key, consumer));
     }
 
     @Override
-    public RedisFuture<Boolean> xgroupSetid(K key, K group, String offset) {
-        return null;
+    public RedisFuture<Boolean> xgroupDestroy(K key, K group) {
+        return dispatch(commandBuilder.xgroupDestroy(key, group));
+    }
+
+    @Override
+    public RedisFuture<String> xgroupSetid(XReadArgs.StreamOffset<K> offset, K group) {
+        return dispatch(commandBuilder.xgroupSetid(offset, group));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 09c4bc113b..f5176c3ca7 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -1535,12 +1535,17 @@ public Mono<String> xgroupCreate(K key, K group, String offset) {
 
     @Override
     public Mono<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer) {
-        throw new UnsupportedOperationException("Not supported yet");
+        return createMono(() -> commandBuilder.xgroupDelconsumer(key, consumer));
     }
 
     @Override
-    public Mono<Boolean> xgroupSetid(K key, K group, String offset) {
-        throw new UnsupportedOperationException("Not supported yet");
+    public Mono<Boolean> xgroupDestroy(K key, K group) {
+        return createMono(() -> commandBuilder.xgroupDestroy(key, group));
+    }
+
+    @Override
+    public Mono<String> xgroupSetid(XReadArgs.StreamOffset<K> streamOffset, K group) {
+        return createMono(() -> commandBuilder.xgroupSetid(streamOffset, group));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index d678e9098a..07fcc3e63d 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -2135,7 +2135,7 @@ public Command<K, V, Long> xdel(K key, String[] messageIds) {
 
     public Command<K, V, String> xgroupCreate(K key, K group, String id) {
         notNullKey(key);
-        LettuceAssert.notNull(group, "Group " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.notNull(group, "Group " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(id, "Id " + MUST_NOT_BE_EMPTY);
 
         CommandArgs<K, V> args = new CommandArgs<>(codec).add(CREATE).addKey(key).addKey(group).add(id);
@@ -2143,6 +2143,35 @@ public Command<K, V, String> xgroupCreate(K key, K group, String id) {
         return createCommand(XGROUP, new StatusOutput<>(codec), args);
     }
 
+    public Command<K, V, Boolean> xgroupDelconsumer(K key, Consumer<K> consumer) {
+        notNullKey(key);
+        LettuceAssert.notNull(consumer, "Consumer " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add("DELCONSUMER").addKey(key).addKey(consumer.getGroup())
+                .addKey(consumer.getName());
+
+        return createCommand(XGROUP, new BooleanOutput<>(codec), args);
+    }
+
+    public Command<K, V, Boolean> xgroupDestroy(K key, K group) {
+        notNullKey(key);
+        LettuceAssert.notNull(group, "Group " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add("DESTROY").addKey(key).addKey(group);
+
+        return createCommand(XGROUP, new BooleanOutput<>(codec), args);
+    }
+
+    public Command<K, V, String> xgroupSetid(StreamOffset<K> offset, K group) {
+        LettuceAssert.notNull(offset, "StreamOffset " + MUST_NOT_BE_NULL);
+        LettuceAssert.notNull(group, "Group " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add("SETID").addKey(offset.getName()).addKey(group)
+                .add(offset.getOffset());
+
+        return createCommand(XGROUP, new StatusOutput<>(codec), args);
+    }
+
     public Command<K, V, Long> xlen(K key) {
         notNullKey(key);
 
diff --git a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
index 6e80b8cc27..204644028c 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
@@ -132,14 +132,22 @@ public interface RedisStreamAsyncCommands<K, V> {
     RedisFuture<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer);
 
     /**
-     * Set the current {@code group} id.
+     * Destroy a consumer group.
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @param offset read offset or {@literal $}.
-     * @return simple-reply the lenght of the stream.
+     * @return simple-reply the number of pending messages
+     */
+    RedisFuture<Boolean> xgroupDestroy(K key, K group);
+
+    /**
+     * Set the current {@code group} id.
+     *
+     * @param streamOffset name of the stream containing the offset to set.
+     * @param group name of the consumer group.
+     * @return simple-reply OK
      */
-    RedisFuture<Boolean> xgroupSetid(K key, K group, String offset);
+    RedisFuture<String> xgroupSetid(StreamOffset<K> streamOffset, K group);
 
     /**
      * Get the length of a steam.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
index 50e9e1d2aa..d2e71c65f9 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
@@ -133,14 +133,22 @@ public interface RedisStreamReactiveCommands<K, V> {
     Mono<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer);
 
     /**
-     * Set the current {@code group} id.
+     * Destroy a consumer group.
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @param offset read offset or {@literal $}.
-     * @return simple-reply the lenght of the stream.
+     * @return simple-reply the number of pending messages
+     */
+    Mono<Boolean> xgroupDestroy(K key, K group);
+
+    /**
+     * Set the current {@code group} id.
+     *
+     * @param streamOffset name of the stream containing the offset to set.
+     * @param group name of the consumer group.
+     * @return simple-reply OK
      */
-    Mono<Boolean> xgroupSetid(K key, K group, String offset);
+    Mono<String> xgroupSetid(StreamOffset<K> streamOffset, K group);
 
     /**
      * Get the length of a steam.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
index 984c57e639..ec250df11f 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
@@ -132,14 +132,22 @@ public interface RedisStreamCommands<K, V> {
     Boolean xgroupDelconsumer(K key, Consumer<K> consumer);
 
     /**
-     * Set the current {@code group} id.
+     * Destroy a consumer group.
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @param offset read offset or {@literal $}.
-     * @return simple-reply the lenght of the stream.
+     * @return simple-reply the number of pending messages
+     */
+    Boolean xgroupDestroy(K key, K group);
+
+    /**
+     * Set the current {@code group} id.
+     *
+     * @param streamOffset name of the stream containing the offset to set.
+     * @param group name of the consumer group.
+     * @return simple-reply OK
      */
-    Boolean xgroupSetid(K key, K group, String offset);
+    String xgroupSetid(StreamOffset<K> streamOffset, K group);
 
     /**
      * Get the length of a steam.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
index 393a684fcd..b9cc5ba708 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
@@ -132,14 +132,22 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
     AsyncExecutions<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer);
 
     /**
-     * Set the current {@code group} id.
+     * Destroy a consumer group.
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @param offset read offset or {@literal $}.
-     * @return simple-reply the lenght of the stream.
+     * @return simple-reply the number of pending messages
+     */
+    AsyncExecutions<Boolean> xgroupDestroy(K key, K group);
+
+    /**
+     * Set the current {@code group} id.
+     *
+     * @param streamOffset name of the stream containing the offset to set.
+     * @param group name of the consumer group.
+     * @return simple-reply OK
      */
-    AsyncExecutions<Boolean> xgroupSetid(K key, K group, String offset);
+    AsyncExecutions<String> xgroupSetid(StreamOffset<K> streamOffset, K group);
 
     /**
      * Get the length of a steam.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
index 825b6ad592..da84c67229 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
@@ -132,14 +132,22 @@ public interface NodeSelectionStreamCommands<K, V> {
     Executions<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer);
 
     /**
-     * Set the current {@code group} id.
+     * Destroy a consumer group.
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @param offset read offset or {@literal $}.
-     * @return simple-reply the lenght of the stream.
+     * @return simple-reply the number of pending messages
+     */
+    Executions<Boolean> xgroupDestroy(K key, K group);
+
+    /**
+     * Set the current {@code group} id.
+     *
+     * @param streamOffset name of the stream containing the offset to set.
+     * @param group name of the consumer group.
+     * @return simple-reply OK
      */
-    Executions<Boolean> xgroupSetid(K key, K group, String offset);
+    Executions<String> xgroupSetid(StreamOffset<K> streamOffset, K group);
 
     /**
      * Get the length of a steam.
diff --git a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
index 8f49ec1c9a..4c0efe377e 100644
--- a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
@@ -131,14 +131,22 @@ public interface RedisStreamCommands<K, V> {
     Boolean xgroupDelconsumer(K key, Consumer<K> consumer);
 
     /**
-     * Set the current {@code group} id.
+     * Destroy a consumer group.
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @param offset read offset or {@literal $}.
-     * @return simple-reply the lenght of the stream.
+     * @return simple-reply the number of pending messages
+     */
+    Boolean xgroupDestroy(K key, K group);
+
+    /**
+     * Set the current {@code group} id.
+     *
+     * @param streamOffset name of the stream containing the offset to set.
+     * @param group name of the consumer group.
+     * @return simple-reply OK
      */
-    Boolean xgroupSetid(K key, K group, String offset);
+    String xgroupSetid(StreamOffset<K> streamOffset, K group);
 
     /**
      * Get the length of a steam.
diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandTest.java b/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
index ab98179def..0d79714ceb 100644
--- a/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
@@ -17,14 +17,12 @@
 
 import static io.lettuce.core.protocol.CommandType.XINFO;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
 import java.time.Instant;
 import java.util.*;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import io.lettuce.RedisConditions;
@@ -336,20 +334,33 @@ public void xclaimWithArgs() {
     }
 
     @Test
-    @Ignore("Not yet implemented in Redis")
-    public void xgroupDelgroup() {
+    public void xgroupDestroy() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
+        redis.xgroupCreate(key, "group", "$");
 
-        fail("Not yet implemented in Redis");
+        assertThat(redis.xgroupDestroy(key, "group")).isTrue();
+        assertThat(redis.xgroupDestroy(key, "group")).isFalse();
+    }
+
+    @Test
+    public void xgroupDelconsumer() {
+
+        redis.xadd(key, Collections.singletonMap("key", "value"));
+        redis.xgroupCreate(key, "group", "$");
+        redis.xadd(key, Collections.singletonMap("key", "value"));
+        redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.lastConsumed(key));
+
+        assertThat(redis.xgroupDelconsumer(key, Consumer.from("group", "consumer1"))).isTrue();
+        assertThat(redis.xgroupDelconsumer(key, Consumer.from("group", "consumer1"))).isFalse();
     }
 
     @Test
-    @Ignore("Not yet implemented in Redis")
     public void xgroupSetid() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
+        redis.xgroupCreate(key, "group", "$");
 
-        fail("Not yet implemented in Redis");
+        assertThat(redis.xgroupSetid(StreamOffset.latest(key), "group")).isEqualTo("OK");
     }
 }

From bbdb726bd99df0d264ea0ca3565f58f1053f1342 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 8 Jun 2018 12:44:08 +0200
Subject: [PATCH 466/808] Use StreamOffset in XGROUP CREATE #789

Align with XGROUP SETID to encapsulate the stream key and stream offset.
---
 .../core/AbstractRedisAsyncCommands.java      |  4 ++--
 .../core/AbstractRedisReactiveCommands.java   |  4 ++--
 .../io/lettuce/core/RedisCommandBuilder.java  |  8 ++++----
 .../api/async/RedisStreamAsyncCommands.java   |  7 +++----
 .../reactive/RedisStreamReactiveCommands.java | 11 +++++-----
 .../core/api/sync/RedisStreamCommands.java    |  6 ++----
 .../NodeSelectionStreamAsyncCommands.java     |  7 +++----
 .../api/sync/NodeSelectionStreamCommands.java |  6 ++----
 .../lettuce/core/api/RedisStreamCommands.java |  5 ++---
 .../core/commands/StreamCommandTest.java      | 20 +++++++++----------
 10 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index b16df7544d..52c676a287 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1515,8 +1515,8 @@ public RedisFuture<Long> xdel(K key, String... messageIds) {
     }
 
     @Override
-    public RedisFuture<String> xgroupCreate(K key, K group, String offset) {
-        return dispatch(commandBuilder.xgroupCreate(key, group, offset));
+    public RedisFuture<String> xgroupCreate(XReadArgs.StreamOffset<K> offset, K group) {
+        return dispatch(commandBuilder.xgroupCreate(offset, group));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index f5176c3ca7..0f49aeb5df 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -1529,8 +1529,8 @@ public Mono<Long> xdel(K key, String... messageIds) {
     }
 
     @Override
-    public Mono<String> xgroupCreate(K key, K group, String offset) {
-        return createMono(() -> commandBuilder.xgroupCreate(key, group, offset));
+    public Mono<String> xgroupCreate(XReadArgs.StreamOffset<K> streamOffset, K group) {
+        return createMono(() -> commandBuilder.xgroupCreate(streamOffset, group));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 07fcc3e63d..2b04aab31e 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -2133,12 +2133,12 @@ public Command<K, V, Long> xdel(K key, String[] messageIds) {
         return createCommand(XDEL, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, String> xgroupCreate(K key, K group, String id) {
-        notNullKey(key);
+    public Command<K, V, String> xgroupCreate(StreamOffset<K> offset, K group) {
+        LettuceAssert.notNull(offset, "StreamOffset " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(group, "Group " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(id, "Id " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<>(codec).add(CREATE).addKey(key).addKey(group).add(id);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(CREATE).addKey(offset.getName()).addKey(group)
+                .add(offset.getOffset());
 
         return createCommand(XGROUP, new StatusOutput<>(codec), args);
     }
diff --git a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
index 204644028c..3c11bac66f 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
@@ -17,9 +17,9 @@
 
 import java.util.List;
 import java.util.Map;
-
 import io.lettuce.core.*;
 import io.lettuce.core.XReadArgs.StreamOffset;
+import io.lettuce.core.RedisFuture;
 
 /**
  * Asynchronous executed commands for Streams.
@@ -115,12 +115,11 @@ public interface RedisStreamAsyncCommands<K, V> {
     /**
      * Create a consumer group.
      *
-     * @param key the stream key.
+     * @param streamOffset name of the stream containing the offset to set.
      * @param group name of the consumer group.
-     * @param offset read offset or {@literal $}.
      * @return simple-reply {@literal true} if successful.
      */
-    RedisFuture<String> xgroupCreate(K key, K group, String offset);
+    RedisFuture<String> xgroupCreate(StreamOffset<K> streamOffset, K group);
 
     /**
      * Delete a consumer from a consumer group.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
index d2e71c65f9..831f22f6f2 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
@@ -15,12 +15,12 @@
  */
 package io.lettuce.core.api.reactive;
 
+import java.util.List;
 import java.util.Map;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
 import io.lettuce.core.*;
 import io.lettuce.core.XReadArgs.StreamOffset;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
  * Reactive executed commands for Streams.
@@ -116,12 +116,11 @@ public interface RedisStreamReactiveCommands<K, V> {
     /**
      * Create a consumer group.
      *
-     * @param key the stream key.
+     * @param streamOffset name of the stream containing the offset to set.
      * @param group name of the consumer group.
-     * @param offset read offset or {@literal $}.
      * @return simple-reply {@literal true} if successful.
      */
-    Mono<String> xgroupCreate(K key, K group, String offset);
+    Mono<String> xgroupCreate(StreamOffset<K> streamOffset, K group);
 
     /**
      * Delete a consumer from a consumer group.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
index ec250df11f..4819f3739e 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
@@ -17,7 +17,6 @@
 
 import java.util.List;
 import java.util.Map;
-
 import io.lettuce.core.*;
 import io.lettuce.core.XReadArgs.StreamOffset;
 
@@ -115,12 +114,11 @@ public interface RedisStreamCommands<K, V> {
     /**
      * Create a consumer group.
      *
-     * @param key the stream key.
+     * @param streamOffset name of the stream containing the offset to set.
      * @param group name of the consumer group.
-     * @param offset read offset or {@literal $}.
      * @return simple-reply {@literal true} if successful.
      */
-    String xgroupCreate(K key, K group, String offset);
+    String xgroupCreate(StreamOffset<K> streamOffset, K group);
 
     /**
      * Delete a consumer from a consumer group.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
index b9cc5ba708..5d9d7c3502 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
@@ -17,9 +17,9 @@
 
 import java.util.List;
 import java.util.Map;
-
 import io.lettuce.core.*;
 import io.lettuce.core.XReadArgs.StreamOffset;
+import io.lettuce.core.RedisFuture;
 
 /**
  * Asynchronous executed commands on a node selection for Streams.
@@ -115,12 +115,11 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
     /**
      * Create a consumer group.
      *
-     * @param key the stream key.
+     * @param streamOffset name of the stream containing the offset to set.
      * @param group name of the consumer group.
-     * @param offset read offset or {@literal $}.
      * @return simple-reply {@literal true} if successful.
      */
-    AsyncExecutions<String> xgroupCreate(K key, K group, String offset);
+    AsyncExecutions<String> xgroupCreate(StreamOffset<K> streamOffset, K group);
 
     /**
      * Delete a consumer from a consumer group.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
index da84c67229..6ab40c5544 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
@@ -17,7 +17,6 @@
 
 import java.util.List;
 import java.util.Map;
-
 import io.lettuce.core.*;
 import io.lettuce.core.XReadArgs.StreamOffset;
 
@@ -115,12 +114,11 @@ public interface NodeSelectionStreamCommands<K, V> {
     /**
      * Create a consumer group.
      *
-     * @param key the stream key.
+     * @param streamOffset name of the stream containing the offset to set.
      * @param group name of the consumer group.
-     * @param offset read offset or {@literal $}.
      * @return simple-reply {@literal true} if successful.
      */
-    Executions<String> xgroupCreate(K key, K group, String offset);
+    Executions<String> xgroupCreate(StreamOffset<K> streamOffset, K group);
 
     /**
      * Delete a consumer from a consumer group.
diff --git a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
index 4c0efe377e..0bfbca85cc 100644
--- a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
@@ -114,12 +114,11 @@ public interface RedisStreamCommands<K, V> {
     /**
      * Create a consumer group.
      *
-     * @param key the stream key.
+     * @param streamOffset name of the stream containing the offset to set.
      * @param group name of the consumer group.
-     * @param offset read offset or {@literal $}.
      * @return simple-reply {@literal true} if successful.
      */
-    String xgroupCreate(K key, K group, String offset);
+    String xgroupCreate(StreamOffset<K> streamOffset, K group);
 
     /**
      * Delete a consumer from a consumer group.
diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandTest.java b/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
index 0d79714ceb..6581783f10 100644
--- a/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
@@ -220,7 +220,7 @@ public void xgroupCreate() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
 
-        assertThat(redis.xgroupCreate(key, "group", "$")).isEqualTo("OK");
+        assertThat(redis.xgroupCreate(StreamOffset.latest(key), "group")).isEqualTo("OK");
 
         List<Object> groups = redis.dispatch(XINFO, new NestedMultiOutput<>(StringCodec.UTF8), new CommandArgs<>(
                 StringCodec.UTF8).add("GROUPS").add(key));
@@ -232,7 +232,7 @@ public void xgroupCreate() {
     public void xgroupread() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
-        redis.xgroupCreate(key, "group", "$");
+        redis.xgroupCreate(StreamOffset.latest(key), "group");
         redis.xadd(key, Collections.singletonMap("key", "value"));
 
         List<StreamMessage<String, String>> read1 = redis.xreadgroup(Consumer.from("group", "consumer1"),
@@ -245,7 +245,7 @@ public void xgroupread() {
     public void xpendingWithGroup() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
-        redis.xgroupCreate(key, "group", "$");
+        redis.xgroupCreate(StreamOffset.latest(key), "group");
         String id = redis.xadd(key, Collections.singletonMap("key", "value"));
 
         redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.lastConsumed(key));
@@ -258,7 +258,7 @@ public void xpendingWithGroup() {
     public void xpending() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
-        redis.xgroupCreate(key, "group", "$");
+        redis.xgroupCreate(StreamOffset.latest(key), "group");
         String id = redis.xadd(key, Collections.singletonMap("key", "value"));
 
         redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.lastConsumed(key));
@@ -278,7 +278,7 @@ public void xpending() {
     public void xack() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
-        redis.xgroupCreate(key, "group", "$");
+        redis.xgroupCreate(StreamOffset.latest(key), "group");
         redis.xadd(key, Collections.singletonMap("key", "value"));
 
         List<StreamMessage<String, String>> messages = redis.xreadgroup(Consumer.from("group", "consumer1"),
@@ -295,7 +295,7 @@ public void xack() {
     public void xclaim() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
-        redis.xgroupCreate(key, "group", "$");
+        redis.xgroupCreate(StreamOffset.latest(key), "group");
         redis.xadd(key, Collections.singletonMap("key", "value"));
 
         List<StreamMessage<String, String>> messages = redis.xreadgroup(Consumer.from("group", "consumer1"),
@@ -314,7 +314,7 @@ public void xclaim() {
     public void xclaimWithArgs() {
 
         String id1 = redis.xadd(key, Collections.singletonMap("key", "value"));
-        redis.xgroupCreate(key, "group", "$");
+        redis.xgroupCreate(StreamOffset.latest(key), "group");
         String id2 = redis.xadd(key, Collections.singletonMap("key", "value"));
 
         List<StreamMessage<String, String>> messages = redis.xreadgroup(Consumer.from("group", "consumer1"),
@@ -337,7 +337,7 @@ public void xclaimWithArgs() {
     public void xgroupDestroy() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
-        redis.xgroupCreate(key, "group", "$");
+        redis.xgroupCreate(StreamOffset.latest(key), "group");
 
         assertThat(redis.xgroupDestroy(key, "group")).isTrue();
         assertThat(redis.xgroupDestroy(key, "group")).isFalse();
@@ -347,7 +347,7 @@ public void xgroupDestroy() {
     public void xgroupDelconsumer() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
-        redis.xgroupCreate(key, "group", "$");
+        redis.xgroupCreate(StreamOffset.latest(key), "group");
         redis.xadd(key, Collections.singletonMap("key", "value"));
         redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.lastConsumed(key));
 
@@ -359,7 +359,7 @@ public void xgroupDelconsumer() {
     public void xgroupSetid() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
-        redis.xgroupCreate(key, "group", "$");
+        redis.xgroupCreate(StreamOffset.latest(key), "group");
 
         assertThat(redis.xgroupSetid(StreamOffset.latest(key), "group")).isEqualTo("OK");
     }

From b53dc5543ccb3034563a0cd4447c00f00fb220e7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 9 Jun 2018 17:52:19 +0200
Subject: [PATCH 467/808] Add tracing support using Brave (OpenZipkin) #782
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lettuce now supports command tracing using Brave. Tracing can be configured through ClientResources. The parent span is propagated either through Tracing.currentTracer() (synchronous/asynchronous usage) or by registering a Brave Span in the Reactor context when using Reactive execution.

Lettuce wraps Brave data models to support tracing in a vendor-agnostic way if Brave is on the class path. Tracing must be configured through ClientResources:

Tracing tracing = …;
ClientResources clientResources = ClientResources.builder().tracing(BraveTracing.create(tracing.tracer())).build();

RedisClient client = RedisClient.create(clientResources, redisUri);
---
 pom.xml                                       |  19 +-
 .../core/AbstractRedisReactiveCommands.java   |  46 ++-
 .../io/lettuce/core/RedisChannelHandler.java  |  48 ++-
 .../io/lettuce/core/RedisChannelWriter.java   |   7 +
 .../java/io/lettuce/core/RedisClient.java     |   6 +-
 .../java/io/lettuce/core/RedisPublisher.java  |  12 +-
 .../core/RedisReactiveCommandsImpl.java       |   4 +-
 .../lettuce/core/api/StatefulConnection.java  |   7 +-
 .../ClusterDistributionChannelWriter.java     |   6 +
 .../core/cluster/ClusterNodeEndpoint.java     |   4 +-
 .../core/cluster/PubSubClusterEndpoint.java   |   6 +-
 ...isAdvancedClusterReactiveCommandsImpl.java |   2 +-
 .../core/cluster/RedisClusterClient.java      |   6 +-
 .../masterslave/AutodiscoveryConnector.java   |   3 +-
 .../masterslave/MasterSlaveChannelWriter.java |  11 +-
 .../core/masterslave/SentinelConnector.java   |   2 +-
 .../StaticMasterSlaveConnector.java           |   2 +-
 .../core/protocol/CommandExpiryWriter.java    |   5 +
 .../lettuce/core/protocol/CommandHandler.java |  49 +++
 .../lettuce/core/protocol/CommandWrapper.java |  35 +++
 .../core/protocol/DefaultEndpoint.java        |  14 +-
 .../lettuce/core/protocol/TracedCommand.java  |  64 ++++
 .../lettuce/core/pubsub/PubSubEndpoint.java   |   7 +-
 .../core/resource/ClientResources.java        |  10 +
 .../core/resource/DefaultClientResources.java |  26 ++
 .../io/lettuce/core/tracing/BraveTracing.java | 280 ++++++++++++++++++
 .../io/lettuce/core/tracing/NoOpTracing.java  | 116 ++++++++
 .../io/lettuce/core/tracing/TraceContext.java |  25 ++
 .../core/tracing/TraceContextProvider.java    |  37 +++
 .../java/io/lettuce/core/tracing/Tracer.java  | 100 +++++++
 .../lettuce/core/tracing/TracerProvider.java  |  28 ++
 .../java/io/lettuce/core/tracing/Tracing.java | 104 +++++++
 .../io/lettuce/core/BraveTracingTest.java     | 208 +++++++++++++
 .../ReactiveBackpressurePropagationTest.java  |   2 +
 .../core/protocol/CommandHandlerTest.java     |   2 +
 .../core/protocol/DefaultEndpointTest.java    |  23 +-
 .../core/pubsub/PubSubCommandHandlerTest.java |   2 +
 .../lettuce/core/EmptyRedisChannelWriter.java |   8 +-
 .../protocol/CommandHandlerBenchmark.java     |   3 +-
 .../core/protocol/EmptyClientResources.java   |   6 +
 .../core/protocol/RedisEndpointBenchmark.java |   2 +-
 41 files changed, 1299 insertions(+), 48 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/protocol/TracedCommand.java
 create mode 100644 src/main/java/io/lettuce/core/tracing/BraveTracing.java
 create mode 100644 src/main/java/io/lettuce/core/tracing/NoOpTracing.java
 create mode 100644 src/main/java/io/lettuce/core/tracing/TraceContext.java
 create mode 100644 src/main/java/io/lettuce/core/tracing/TraceContextProvider.java
 create mode 100644 src/main/java/io/lettuce/core/tracing/Tracer.java
 create mode 100644 src/main/java/io/lettuce/core/tracing/TracerProvider.java
 create mode 100644 src/main/java/io/lettuce/core/tracing/Tracing.java
 create mode 100644 src/test/java/io/lettuce/core/BraveTracingTest.java

diff --git a/pom.xml b/pom.xml
index 8989847c7e..4e16966fa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,7 @@
         <netty-version>4.1.24.Final</netty-version>
         <spring-version>4.3.14.RELEASE</spring-version>
         <reactor-version>Bismuth-SR8</reactor-version>
+        <brave-version>5.0.0</brave-version>
     </properties>
 
     <scm>
@@ -98,6 +99,14 @@
                 <scope>import</scope>
             </dependency>
 
+            <dependency>
+                <groupId>io.zipkin.brave</groupId>
+                <artifactId>brave-bom</artifactId>
+                <version>${brave-version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -127,6 +136,8 @@
             <artifactId>netty-handler</artifactId>
         </dependency>
 
+        <!-- End of Core Dependencies -->
+
         <!-- OS-native transports -->
 
         <dependency>
@@ -158,6 +169,8 @@
             <optional>true</optional>
         </dependency>
 
+        <!-- Metrics/Tracing -->
+
         <dependency>
             <groupId>org.latencyutils</groupId>
             <artifactId>LatencyUtils</artifactId>
@@ -172,7 +185,11 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- End of Core Dependencies -->
+        <dependency>
+            <groupId>io.zipkin.brave</groupId>
+            <artifactId>brave</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!-- Reactive Dependencies -->
 
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 0f49aeb5df..51a4440f11 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -23,6 +23,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
+import io.lettuce.core.tracing.TraceContext;
+import io.lettuce.core.tracing.TraceContextProvider;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import io.lettuce.core.GeoArgs.Unit;
@@ -33,6 +35,8 @@
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.output.*;
 import io.lettuce.core.protocol.*;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.tracing.Tracing;
 
 /**
  * A reactive and thread-safe API for a Redis connection.
@@ -51,17 +55,21 @@ public abstract class AbstractRedisReactiveCommands<K, V> implements RedisHashRe
     private final StatefulConnection<K, V> connection;
     private final RedisCodec<K, V> codec;
     private final RedisCommandBuilder<K, V> commandBuilder;
+    private final ClientResources clientResources;
+    private final boolean tracingEnabled;
 
     /**
      * Initialize a new instance.
      *
-     * @param connection the connection to operate on
-     * @param codec the codec for command encoding
+     * @param connection the connection to operate on.
+     * @param codec the codec for command encoding.
      */
     public AbstractRedisReactiveCommands(StatefulConnection<K, V> connection, RedisCodec<K, V> codec) {
         this.connection = connection;
         this.codec = codec;
         this.commandBuilder = new RedisCommandBuilder<>(codec);
+        this.clientResources = connection.getResources();
+        this.tracingEnabled = clientResources.tracing().isEnabled();
     }
 
     @Override
@@ -355,11 +363,29 @@ public Mono<String> configSet(String parameter, String value) {
 
     @SuppressWarnings("unchecked")
     public <T, R> Flux<R> createDissolvingFlux(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return (Flux<R>) Flux.from(new RedisPublisher<>(commandSupplier, connection, true));
+        return (Flux<R>) createFlux(commandSupplier, true);
     }
 
     public <T> Flux<T> createFlux(Supplier<RedisCommand<K, V, T>> commandSupplier) {
-        return Flux.from(new RedisPublisher<>(commandSupplier, connection, false));
+        return createFlux(commandSupplier, false);
+    }
+
+    private <T> Flux<T> createFlux(Supplier<RedisCommand<K, V, T>> commandSupplier, boolean dissolve) {
+
+        if (tracingEnabled) {
+
+            return withTraceContext().flatMapMany(
+                    it -> Flux.from(new RedisPublisher<>(decorate(commandSupplier, it), connection, dissolve)));
+        }
+
+        return Flux.from(new RedisPublisher<>(commandSupplier, connection, dissolve));
+    }
+
+    private Mono<TraceContext> withTraceContext() {
+
+        return Tracing.getContext()
+                .switchIfEmpty(Mono.fromSupplier(() -> clientResources.tracing().initialTraceContextProvider()))
+                .flatMap(TraceContextProvider::getTraceContextLater).defaultIfEmpty(TraceContext.EMPTY);
     }
 
     protected <T> Mono<T> createMono(CommandType type, CommandOutput<K, V, T> output, CommandArgs<K, V> args) {
@@ -367,9 +393,21 @@ protected <T> Mono<T> createMono(CommandType type, CommandOutput<K, V, T> output
     }
 
     public <T> Mono<T> createMono(Supplier<RedisCommand<K, V, T>> commandSupplier) {
+
+        if (tracingEnabled) {
+
+            return withTraceContext().flatMap(
+                    it -> Mono.from(new RedisPublisher<>(decorate(commandSupplier, it), connection, false)));
+        }
+
         return Mono.from(new RedisPublisher<>(commandSupplier, connection, false));
     }
 
+    private <T> Supplier<RedisCommand<K, V, T>> decorate(Supplier<RedisCommand<K, V, T>> commandSupplier,
+            TraceContext traceContext) {
+        return () -> new TracedCommand<>(commandSupplier.get(), traceContext);
+    }
+
     @Override
     public Mono<Long> dbsize() {
         return createMono(commandBuilder::dbsize);
diff --git a/src/main/java/io/lettuce/core/RedisChannelHandler.java b/src/main/java/io/lettuce/core/RedisChannelHandler.java
index aec3f39e3b..dab47b5a2b 100644
--- a/src/main/java/io/lettuce/core/RedisChannelHandler.java
+++ b/src/main/java/io/lettuce/core/RedisChannelHandler.java
@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.lang.reflect.Proxy;
 import java.time.Duration;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
@@ -28,9 +29,9 @@
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.internal.AsyncCloseable;
 import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.protocol.CommandExpiryWriter;
-import io.lettuce.core.protocol.ConnectionFacade;
-import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.protocol.*;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.tracing.TraceContextProvider;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -55,6 +56,8 @@ public abstract class RedisChannelHandler<K, V> implements Closeable, Connection
     private CloseEvents closeEvents = new CloseEvents();
 
     private final RedisChannelWriter channelWriter;
+    private final ClientResources clientResources;
+    private final boolean tracingEnabled;
     private final boolean debugEnabled = logger.isDebugEnabled();
     private final CompletableFuture<Void> closeFuture = new CompletableFuture<>();
 
@@ -71,6 +74,8 @@ public abstract class RedisChannelHandler<K, V> implements Closeable, Connection
     public RedisChannelHandler(RedisChannelWriter writer, Duration timeout) {
 
         this.channelWriter = writer;
+        this.clientResources = writer.getClientResources();
+        this.tracingEnabled = clientResources.tracing().isEnabled();
 
         writer.setConnectionFacade(this);
         setTimeout(timeout);
@@ -164,6 +169,19 @@ protected <T> RedisCommand<K, V, T> dispatch(RedisCommand<K, V, T> cmd) {
             logger.debug("dispatching command {}", cmd);
         }
 
+        if (tracingEnabled) {
+
+            RedisCommand<K, V, T> commandToSend = cmd;
+            TraceContextProvider provider = CommandWrapper.unwrap(cmd, TraceContextProvider.class);
+
+            if (provider == null) {
+                commandToSend = new TracedCommand<>(cmd, clientResources.tracing()
+                        .initialTraceContextProvider().getTraceContext());
+            }
+
+            return channelWriter.write(commandToSend);
+        }
+
         return channelWriter.write(cmd);
     }
 
@@ -173,6 +191,26 @@ protected <T> RedisCommand<K, V, T> dispatch(RedisCommand<K, V, T> cmd) {
             logger.debug("dispatching commands {}", commands);
         }
 
+        if (tracingEnabled) {
+
+            Collection<RedisCommand<K, V, ?>> withTracer = new ArrayList<>(commands.size());
+
+            for (RedisCommand<K, V, ?> command : commands) {
+
+                RedisCommand<K, V, ?> commandToUse = command;
+                TraceContextProvider provider = CommandWrapper.unwrap(command, TraceContextProvider.class);
+                if (provider == null) {
+                    commandToUse = new TracedCommand<>(command, clientResources.tracing()
+                            .initialTraceContextProvider().getTraceContext());
+                }
+
+                withTracer.add(commandToUse);
+            }
+
+            return channelWriter.write(withTracer);
+
+        }
+
         return channelWriter.write(commands);
     }
 
@@ -257,6 +295,10 @@ public ClientOptions getOptions() {
         return clientOptions;
     }
 
+    public ClientResources getResources() {
+        return clientResources;
+    }
+
     public void setOptions(ClientOptions clientOptions) {
         LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
         this.clientOptions = clientOptions;
diff --git a/src/main/java/io/lettuce/core/RedisChannelWriter.java b/src/main/java/io/lettuce/core/RedisChannelWriter.java
index c10d25812e..0c0636462c 100644
--- a/src/main/java/io/lettuce/core/RedisChannelWriter.java
+++ b/src/main/java/io/lettuce/core/RedisChannelWriter.java
@@ -22,6 +22,7 @@
 import io.lettuce.core.internal.AsyncCloseable;
 import io.lettuce.core.protocol.ConnectionFacade;
 import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * Writer for a channel. Writers push commands on to the communication channel and maintain a state for the commands.
@@ -91,4 +92,10 @@ public interface RedisChannelWriter extends Closeable, AsyncCloseable {
      * achieve batching. No-op if channel is not connected.
      */
     void flushCommands();
+
+    /**
+     * @return the {@link ClientResources}.
+     * @since 5.1
+     */
+    ClientResources getClientResources();
 }
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 8a32e343b9..570c726b8b 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -261,7 +261,7 @@ private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandalone
 
         logger.debug("Trying to get a Redis connection for: " + redisURI);
 
-        DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
+        DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions, clientResources);
         RedisChannelWriter writer = endpoint;
 
         if (CommandExpiryWriter.isSupported(clientOptions)) {
@@ -423,7 +423,7 @@ private <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubS
         assertNotNull(codec);
         checkValidRedisURI(redisURI);
 
-        PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<>(clientOptions);
+        PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<>(clientOptions, clientResources);
         RedisChannelWriter writer = endpoint;
 
         if (CommandExpiryWriter.isSupported(clientOptions)) {
@@ -528,7 +528,7 @@ private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectS
         connectionBuilder.clientOptions(ClientOptions.copyOf(getOptions()));
         connectionBuilder.clientResources(clientResources);
 
-        DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
+        DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions, clientResources);
         RedisChannelWriter writer = endpoint;
 
         if (CommandExpiryWriter.isSupported(clientOptions)) {
diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index 7a5008dcf0..da67ba390c 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -68,9 +68,9 @@ class RedisPublisher<K, V, T> implements Publisher<T> {
     /**
      * Creates a new {@link RedisPublisher} for a static command.
      *
-     * @param staticCommand static command, must not be {@literal null}
-     * @param connection the connection, must not be {@literal null}
-     * @param dissolve dissolve collections into particular elements
+     * @param staticCommand static command, must not be {@literal null}.
+     * @param connection the connection, must not be {@literal null}.
+     * @param dissolve dissolve collections into particular elements.
      */
     public RedisPublisher(RedisCommand<K, V, T> staticCommand, StatefulConnection<K, V> connection, boolean dissolve) {
         this(() -> staticCommand, connection, dissolve);
@@ -79,9 +79,9 @@ public RedisPublisher(RedisCommand<K, V, T> staticCommand, StatefulConnection<K,
     /**
      * Creates a new {@link RedisPublisher} for a command supplier.
      *
-     * @param commandSupplier command supplier, must not be {@literal null}
-     * @param connection the connection, must not be {@literal null}
-     * @param dissolve dissolve collections into particular elements
+     * @param commandSupplier command supplier, must not be {@literal null}.
+     * @param connection the connection, must not be {@literal null}.
+     * @param dissolve dissolve collections into particular elements.
      */
     public RedisPublisher(Supplier<RedisCommand<K, V, T>> commandSupplier, StatefulConnection<K, V> connection, boolean dissolve) {
 
diff --git a/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
index 3ab9d52505..64b6544d1d 100644
--- a/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
@@ -33,8 +33,8 @@ public class RedisReactiveCommandsImpl<K, V> extends AbstractRedisReactiveComman
     /**
      * Initialize a new instance.
      *
-     * @param connection the connection to operate on
-     * @param codec the codec for command encoding
+     * @param connection the connection to operate on.
+     * @param codec the codec for command encoding.
      *
      */
     public RedisReactiveCommandsImpl(StatefulRedisConnection<K, V> connection, RedisCodec<K, V> codec) {
diff --git a/src/main/java/io/lettuce/core/api/StatefulConnection.java b/src/main/java/io/lettuce/core/api/StatefulConnection.java
index c9365e4ec0..75aab220ba 100644
--- a/src/main/java/io/lettuce/core/api/StatefulConnection.java
+++ b/src/main/java/io/lettuce/core/api/StatefulConnection.java
@@ -23,6 +23,7 @@
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.internal.AsyncCloseable;
 import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * A stateful connection providing command dispatching, timeouts and open/close methods.
@@ -101,11 +102,15 @@ public interface StatefulConnection<K, V> extends AutoCloseable, AsyncCloseable
     boolean isOpen();
 
     /**
-     *
      * @return the client options valid for this connection.
      */
     ClientOptions getOptions();
 
+    /**
+     * @return the client resources used for this connection.
+     */
+    ClientResources getResources();
+
     /**
      * Reset the command state. Queued commands will be canceled and the internal state will be reset. This is useful when the
      * internal state machine gets out of sync with the connection.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index 1330c756cc..6a3a9328af 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -29,6 +29,7 @@
 import io.lettuce.core.internal.HostAndPort;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.*;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * Channel writer for cluster operation. This writer looks up the right partition by hash/slot for the operation.
@@ -359,6 +360,11 @@ public void setConnectionFacade(ConnectionFacade redisChannelHandler) {
         defaultWriter.setConnectionFacade(redisChannelHandler);
     }
 
+    @Override
+    public ClientResources getClientResources() {
+        return defaultWriter.getClientResources();
+    }
+
     @Override
     public void setAutoFlushCommands(boolean autoFlush) {
         getClusterConnectionProvider().setAutoFlushCommands(autoFlush);
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java b/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
index 8dfa4d0b0f..a11eedbc2e 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
@@ -48,7 +48,9 @@ class ClusterNodeEndpoint extends DefaultEndpoint {
      */
     public ClusterNodeEndpoint(ClientOptions clientOptions, ClientResources clientResources,
             RedisChannelWriter clusterChannelWriter) {
-        super(clientOptions);
+
+        super(clientOptions, clientResources);
+
         this.clusterChannelWriter = clusterChannelWriter;
     }
 
diff --git a/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java b/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java
index 32a8197925..87dd0d7f12 100644
--- a/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java
+++ b/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java
@@ -24,6 +24,7 @@
 import io.lettuce.core.cluster.pubsub.RedisClusterPubSubListener;
 import io.lettuce.core.pubsub.PubSubEndpoint;
 import io.lettuce.core.pubsub.PubSubOutput;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * @author Mark Paluch
@@ -41,9 +42,10 @@ public class PubSubClusterEndpoint<K, V> extends PubSubEndpoint<K, V> {
      * Initialize a new instance that handles commands from the supplied queue.
      *
      * @param clientOptions client options for this connection, must not be {@literal null}
+     * @param clientResources client resources for this connection, must not be {@literal null}.
      */
-    public PubSubClusterEndpoint(ClientOptions clientOptions) {
-        super(clientOptions);
+    public PubSubClusterEndpoint(ClientOptions clientOptions, ClientResources clientResources) {
+        super(clientOptions, clientResources);
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index 429b8c94d9..f8cd0987f3 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -64,7 +64,7 @@ public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedi
     /**
      * Initialize a new connection.
      *
-     * @param connection the stateful connection
+     * @param connection the stateful connection.
      * @param codec Codec used to encode/decode keys and values.
      */
     public RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnectionImpl<K, V> connection, RedisCodec<K, V> codec) {
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index a5a24c75f1..60d5344d46 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -527,7 +527,7 @@ <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNode
 
         logger.debug("connectPubSubToNode(" + nodeId + ")");
 
-        PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<>(clientOptions);
+        PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<>(clientOptions, clientResources);
 
         RedisChannelWriter writer = endpoint;
 
@@ -570,7 +570,7 @@ private <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectCl
 
         Mono<SocketAddress> socketAddressSupplier = getSocketAddressSupplier(TopologyComparators::sortByClientCount);
 
-        DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions);
+        DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions, clientResources);
         RedisChannelWriter writer = endpoint;
 
         if (CommandExpiryWriter.isSupported(clientOptions)) {
@@ -644,7 +644,7 @@ private <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> con
 
         Mono<SocketAddress> socketAddressSupplier = getSocketAddressSupplier(TopologyComparators::sortByClientCount);
 
-        PubSubClusterEndpoint<K, V> endpoint = new PubSubClusterEndpoint<K, V>(clientOptions);
+        PubSubClusterEndpoint<K, V> endpoint = new PubSubClusterEndpoint<K, V>(clientOptions, clientResources);
 
         ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, endpoint,
                 clusterTopologyRefreshScheduler);
diff --git a/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java b/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
index 01e0b2ab87..76e746a23e 100644
--- a/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
+++ b/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
@@ -123,7 +123,8 @@ private Mono<StatefulRedisMasterSlaveConnection<K, V>> initializeConnection(Redi
 
             connectionProvider.setKnownNodes(nodes);
 
-            MasterSlaveChannelWriter channelWriter = new MasterSlaveChannelWriter(connectionProvider);
+            MasterSlaveChannelWriter channelWriter = new MasterSlaveChannelWriter(connectionProvider, redisClient
+                    .getResources());
 
             StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(
                     channelWriter, codec, redisURI.getTimeout());
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
index 3058f76fbd..999d378d61 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
@@ -27,6 +27,7 @@
 import io.lettuce.core.protocol.ConnectionFacade;
 import io.lettuce.core.protocol.ProtocolKeyword;
 import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * Channel writer/dispatcher that dispatches commands based on the intent to different connections.
@@ -36,10 +37,13 @@
 class MasterSlaveChannelWriter implements RedisChannelWriter {
 
     private MasterSlaveConnectionProvider<?, ?> masterSlaveConnectionProvider;
+    private final ClientResources clientResources;
+
     private boolean closed = false;
 
-    MasterSlaveChannelWriter(MasterSlaveConnectionProvider<?, ?> masterSlaveConnectionProvider) {
+    MasterSlaveChannelWriter(MasterSlaveConnectionProvider<?, ?> masterSlaveConnectionProvider, ClientResources clientResources) {
         this.masterSlaveConnectionProvider = masterSlaveConnectionProvider;
+        this.clientResources = clientResources;
     }
 
     @Override
@@ -197,6 +201,11 @@ public CompletableFuture<Void> closeAsync() {
     public void setConnectionFacade(ConnectionFacade connection) {
     }
 
+    @Override
+    public ClientResources getClientResources() {
+        return clientResources;
+    }
+
     @Override
     public void setAutoFlushCommands(boolean autoFlush) {
         masterSlaveConnectionProvider.setAutoFlushCommands(autoFlush);
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java b/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
index 9001a55de6..cadf4208da 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
@@ -79,7 +79,7 @@ private Mono<StatefulRedisMasterSlaveConnection<K, V>> initializeConnection(Redi
 
         connectionProvider.setKnownNodes(nodes);
 
-        MasterSlaveChannelWriter channelWriter = new MasterSlaveChannelWriter(connectionProvider) {
+        MasterSlaveChannelWriter channelWriter = new MasterSlaveChannelWriter(connectionProvider, redisClient.getResources()) {
 
             @Override
             public CompletableFuture<Void> closeAsync() {
diff --git a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java
index d26abd1e4c..8f2676c920 100644
--- a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java
+++ b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java
@@ -76,7 +76,7 @@ private Mono<StatefulRedisMasterSlaveConnection<K, V>> initializeConnection(Redi
 
         connectionProvider.setKnownNodes(nodes);
 
-        MasterSlaveChannelWriter channelWriter = new MasterSlaveChannelWriter(connectionProvider);
+        MasterSlaveChannelWriter channelWriter = new MasterSlaveChannelWriter(connectionProvider, redisClient.getResources());
 
         StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(channelWriter,
                 codec, seedNode.getTimeout());
diff --git a/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java b/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
index e4b3db5941..754e771a9c 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
@@ -95,6 +95,11 @@ public void setConnectionFacade(ConnectionFacade connectionFacade) {
         writer.setConnectionFacade(connectionFacade);
     }
 
+    @Override
+    public ClientResources getClientResources() {
+        return writer.getClientResources();
+    }
+
     @Override
     public void setAutoFlushCommands(boolean autoFlush) {
         writer.setAutoFlushCommands(autoFlush);
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 2de811988a..23aca12d85 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -32,6 +32,10 @@
 import io.lettuce.core.internal.LettuceSets;
 import io.lettuce.core.output.CommandOutput;
 import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.tracing.Tracer;
+import io.lettuce.core.tracing.Tracing;
+import io.lettuce.core.tracing.TraceContext;
+import io.lettuce.core.tracing.TraceContextProvider;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.*;
 import io.netty.channel.local.LocalAddress;
@@ -74,6 +78,7 @@ public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCom
     private final boolean traceEnabled = logger.isTraceEnabled();
     private final boolean debugEnabled = logger.isDebugEnabled();
     private final boolean latencyMetricsEnabled;
+    private final boolean tracingEnabled;
     private final boolean boundedQueues;
     private final BackpressureSource backpressureSource = new BackpressureSource();
 
@@ -83,6 +88,7 @@ public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCom
     private String logPrefix;
     private PristineFallbackCommand fallbackCommand;
     private boolean pristine;
+    private Tracing.Endpoint tracedEndpoint;
 
     /**
      * Initialize a new instance that handles commands from the supplied queue.
@@ -102,6 +108,10 @@ public CommandHandler(ClientOptions clientOptions, ClientResources clientResourc
         this.endpoint = endpoint;
         this.latencyMetricsEnabled = clientResources.commandLatencyCollector().isEnabled();
         this.boundedQueues = clientOptions.getRequestQueueSize() != Integer.MAX_VALUE;
+
+        Tracing tracing = clientResources.tracing();
+
+        this.tracingEnabled = tracing.isEnabled();
     }
 
     public Queue<RedisCommand<?, ?, ?>> getStack() {
@@ -245,6 +255,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
 
+        tracedEndpoint = clientResources.tracing().createEndpoint(ctx.channel().remoteAddress());
         logPrefix = null;
         pristine = true;
         fallbackCommand = null;
@@ -296,6 +307,7 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
             return;
         }
 
+        tracedEndpoint = null;
         setState(LifecycleState.DISCONNECTED);
         setState(LifecycleState.DEACTIVATING);
 
@@ -363,6 +375,43 @@ private void writeSingleCommand(ChannelHandlerContext ctx, RedisCommand<?, ?, ?>
         }
 
         addToStack(command, promise);
+
+        if (tracingEnabled && command instanceof CompleteableCommand) {
+
+            TracedCommand provider = CommandWrapper.unwrap(command, TracedCommand.class);
+            Tracer tracer = clientResources.tracing().getTracerProvider().getTracer();
+            TraceContext context = (provider == null ? clientResources.tracing().initialTraceContextProvider() : provider)
+                    .getTraceContext();
+
+            Tracer.Span span = tracer.nextSpan(context);
+            span.name(command.getType().name());
+
+            if (command.getArgs() != null) {
+                span.tag("redis.args", command.getArgs().toCommandString());
+            }
+
+            span.remoteEndpoint(tracedEndpoint);
+            span.start();
+            provider.setSpan(span);
+
+            CompleteableCommand<?> completeableCommand = (CompleteableCommand<?>) command;
+            completeableCommand.onComplete((o, throwable) -> {
+
+                if (command.getOutput() != null) {
+
+                    String error = command.getOutput().getError();
+                    if (error != null) {
+                        span.tag("error", error);
+                    } else if (throwable != null) {
+                        span.tag("exception", throwable.toString());
+                        span.error(throwable);
+                    }
+                }
+
+                span.finish();
+            });
+        }
+
         ctx.write(command, promise);
     }
 
diff --git a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
index 3bd2e67f14..c821b69e79 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
@@ -218,6 +218,41 @@ public static <K, V, T> RedisCommand<K, V, T> unwrap(RedisCommand<K, V, T> wrapp
         return result;
     }
 
+    /**
+     * Returns an object that implements the given interface to allow access to non-standard methods, or standard methods not
+     * exposed by the proxy.
+     *
+     * If the receiver implements the interface then the result is the receiver or a proxy for the receiver. If the receiver is
+     * a wrapper and the wrapped object implements the interface then the result is the wrapped object or a proxy for the
+     * wrapped object. Otherwise return the the result of calling <code>unwrap</code> recursively on the wrapped object or a
+     * proxy for that result. If the receiver is not a wrapper and does not implement the interface, then an {@literal null} is
+     * returned.
+     *
+     * @param wrapped
+     * @param iface A Class defining an interface that the result must implement.
+     * @return the unwrapped instance or {@literal null}.
+     * @since 5.1
+     */
+    @SuppressWarnings("unchecked")
+    public static <R, K, V, T> R unwrap(RedisCommand<K, V, T> wrapped, Class<R> iface) {
+
+        RedisCommand<K, V, T> result = wrapped;
+
+        if (iface.isInstance(wrapped)) {
+            return iface.cast(wrapped);
+        }
+
+        while (result instanceof DecoratedCommand<?, ?, ?>) {
+            result = ((DecoratedCommand<K, V, T>) result).getDelegate();
+
+            if (iface.isInstance(result)) {
+                return iface.cast(result);
+            }
+        }
+
+        return null;
+    }
+
     @Override
     public boolean equals(Object o) {
 
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index 3e558152e0..ba14f841d5 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -30,6 +30,7 @@
 import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceFactories;
+import io.lettuce.core.resource.ClientResources;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
@@ -63,6 +64,7 @@ public class DefaultEndpoint implements RedisChannelWriter, Endpoint {
 
     private final Reliability reliability;
     private final ClientOptions clientOptions;
+    private final ClientResources clientResources;
     private final Queue<RedisCommand<?, ?, ?>> disconnectedBuffer;
     private final Queue<RedisCommand<?, ?, ?>> commandBuffer;
     private final boolean boundedQueues;
@@ -92,13 +94,16 @@ public class DefaultEndpoint implements RedisChannelWriter, Endpoint {
     /**
      * Create a new {@link DefaultEndpoint}.
      *
-     * @param clientOptions client options for this connection, must not be {@literal null}
+     * @param clientOptions client options for this connection, must not be {@literal null}.
+     * @param clientResources client resources for this connection, must not be {@literal null}.
      */
-    public DefaultEndpoint(ClientOptions clientOptions) {
+    public DefaultEndpoint(ClientOptions clientOptions, ClientResources clientResources) {
 
         LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
+        LettuceAssert.notNull(clientOptions, "ClientResources must not be null");
 
         this.clientOptions = clientOptions;
+        this.clientResources = clientResources;
         this.reliability = clientOptions.isAutoReconnect() ? Reliability.AT_LEAST_ONCE : Reliability.AT_MOST_ONCE;
         this.disconnectedBuffer = LettuceFactories.newConcurrentQueue(clientOptions.getRequestQueueSize());
         this.commandBuffer = LettuceFactories.newConcurrentQueue(clientOptions.getRequestQueueSize());
@@ -111,6 +116,11 @@ public void setConnectionFacade(ConnectionFacade connectionFacade) {
         this.connectionFacade = connectionFacade;
     }
 
+    @Override
+    public ClientResources getClientResources() {
+        return clientResources;
+    }
+
     @Override
     public void setAutoFlushCommands(boolean autoFlush) {
         this.autoFlushCommands = autoFlush;
diff --git a/src/main/java/io/lettuce/core/protocol/TracedCommand.java b/src/main/java/io/lettuce/core/protocol/TracedCommand.java
new file mode 100644
index 0000000000..e3ecc8e5de
--- /dev/null
+++ b/src/main/java/io/lettuce/core/protocol/TracedCommand.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.protocol;
+
+import io.lettuce.core.tracing.TraceContext;
+import io.lettuce.core.tracing.TraceContextProvider;
+import io.lettuce.core.tracing.Tracer;
+import io.netty.buffer.ByteBuf;
+
+/**
+ * Redis command that is aware of an associated {@link TraceContext}.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+public class TracedCommand<K, V, T> extends CommandWrapper<K, V, T> implements TraceContextProvider {
+
+    private final TraceContext traceContext;
+    private Tracer.Span span;
+
+    public TracedCommand(RedisCommand<K, V, T> command, TraceContext traceContext) {
+        super(command);
+        this.traceContext = traceContext;
+    }
+
+    @Override
+    public TraceContext getTraceContext() {
+        return traceContext;
+    }
+
+    public Tracer.Span getSpan() {
+        return span;
+    }
+
+    public void setSpan(Tracer.Span span) {
+        this.span = span;
+    }
+
+    @Override
+    public void encode(ByteBuf buf) {
+
+        if (span != null) {
+            span.annotate("redis.encode.start");
+        }
+        super.encode(buf);
+
+        if (span != null) {
+            span.annotate("redis.encode.end");
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
index 3c041e114b..77f0d45972 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
@@ -25,6 +25,7 @@
 import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.protocol.DefaultEndpoint;
 import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.resource.ClientResources;
 import io.netty.util.internal.ConcurrentSet;
 
 /**
@@ -52,9 +53,11 @@ public class PubSubEndpoint<K, V> extends DefaultEndpoint {
      * Initialize a new instance that handles commands from the supplied queue.
      *
      * @param clientOptions client options for this connection, must not be {@literal null}
+     * @param clientResources client resources for this connection, must not be {@literal null}.
      */
-    public PubSubEndpoint(ClientOptions clientOptions) {
-        super(clientOptions);
+    public PubSubEndpoint(ClientOptions clientOptions, ClientResources clientResources) {
+
+        super(clientOptions, clientResources);
 
         this.channels = new ConcurrentSet<>();
         this.patterns = new ConcurrentSet<>();
diff --git a/src/main/java/io/lettuce/core/resource/ClientResources.java b/src/main/java/io/lettuce/core/resource/ClientResources.java
index d781e61c9e..7d6cddbe5d 100644
--- a/src/main/java/io/lettuce/core/resource/ClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/ClientResources.java
@@ -20,6 +20,7 @@
 import io.lettuce.core.event.EventBus;
 import io.lettuce.core.event.EventPublisherOptions;
 import io.lettuce.core.metrics.CommandLatencyCollector;
+import io.lettuce.core.tracing.Tracing;
 import io.netty.util.Timer;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.Future;
@@ -40,6 +41,7 @@
  * <li>{@link CommandLatencyCollector} to collect latency details. Requires the {@literal HdrHistogram} library.</li>
  * <li>{@link DnsResolver} to collect latency details. Requires the {@literal LatencyUtils} library.</li>
  * <li>Reconnect {@link Delay}.</li>
+ * <li>{@link Tracing} to trace Redis commands.</li>
  * </ul>
  *
  * @author Mark Paluch
@@ -156,4 +158,12 @@ public interface ClientResources {
      * @since 4.4
      */
     NettyCustomizer nettyCustomizer();
+
+    /**
+     * Returns the {@link Tracing} instance to support tracing of Redis commands.
+     *
+     * @return the configured {@link Tracing}.
+     * @since 5.1
+     */
+    Tracing tracing();
 }
diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index f8eb73d62c..f0f38cf1b0 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -20,6 +20,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
+import io.lettuce.core.tracing.TracerProvider;
+import io.lettuce.core.tracing.Tracing;
 import reactor.core.scheduler.Schedulers;
 import io.lettuce.core.event.DefaultEventBus;
 import io.lettuce.core.event.DefaultEventPublisherOptions;
@@ -60,6 +62,7 @@
  * <li>a {@code dnsResolver} which is a provided instance of {@link DnsResolver}.</li>
  * <li>a {@code timer} that is a provided instance of {@link io.netty.util.HashedWheelTimer}.</li>
  * <li>a {@code nettyCustomizer} that is a provided instance of {@link NettyCustomizer}.</li>
+ * <li>a {@code tracerProvider} that is a provided instance of {@link TracerProvider}.</li>
  * </ul>
  *
  * @author Mark Paluch
@@ -120,6 +123,7 @@ public class DefaultClientResources implements ClientResources {
     private final DnsResolver dnsResolver;
     private final Supplier<Delay> reconnectDelay;
     private final NettyCustomizer nettyCustomizer;
+    private final Tracing tracing;
 
     private volatile boolean shutdownCalled = false;
 
@@ -209,6 +213,7 @@ protected DefaultClientResources(Builder builder) {
 
         reconnectDelay = builder.reconnectDelay;
         nettyCustomizer = builder.nettyCustomizer;
+        tracing = builder.tracing;
     }
 
     /**
@@ -246,6 +251,7 @@ public static class Builder {
         private DnsResolver dnsResolver = DnsResolvers.UNRESOLVED;
         private Supplier<Delay> reconnectDelay = DEFAULT_RECONNECT_DELAY;
         private NettyCustomizer nettyCustomizer = DEFAULT_NETTY_CUSTOMIZER;
+        private Tracing tracing = Tracing.disabled();
 
         private Builder() {
         }
@@ -453,6 +459,21 @@ public Builder nettyCustomizer(NettyCustomizer nettyCustomizer) {
             return this;
         }
 
+        /**
+         * Sets the {@link Tracing} instance to trace Redis calls.
+         *
+         * @param tracing the tracer infrastructure instance, must not be {@literal null}.
+         * @return this
+         * @since 5.1
+         */
+        public Builder tracing(Tracing tracing) {
+
+            LettuceAssert.notNull(tracing, "Tracing must not be null");
+
+            this.tracing = tracing;
+            return this;
+        }
+
         /**
          *
          * @return a new instance of {@link DefaultClientResources}.
@@ -597,4 +618,9 @@ public Delay reconnectDelay() {
     public NettyCustomizer nettyCustomizer() {
         return nettyCustomizer;
     }
+
+    @Override
+    public Tracing tracing() {
+        return tracing;
+    }
 }
diff --git a/src/main/java/io/lettuce/core/tracing/BraveTracing.java b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
new file mode 100644
index 0000000000..fc4c3539d9
--- /dev/null
+++ b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
@@ -0,0 +1,280 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.tracing;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+import reactor.core.publisher.Mono;
+import brave.Span;
+import brave.propagation.TraceContextOrSamplingFlags;
+import io.lettuce.core.internal.LettuceAssert;
+
+/**
+ * {@link Tracing} integration with OpenZipkin's Brave {@link brave.Tracer}. This implementation creates Brave
+ * {@link brave.Span}s that are optionally associated with a {@link TraceContext}.
+ *
+ * <h3>{@link TraceContext} Propagation</h3> Redis commands can use a parent trace context to create a
+ * {@link io.lettuce.core.tracing.Tracer.Span} to trace the actual command. A parent {@link brave.Span} is picked up for
+ * imperative (synchronous/asynchronous) API usage from {@link brave.Tracing#currentTracer()}. The context is not propagated
+ * across asynchronous call chains resulting from {@link java.util.concurrent.CompletionStage} chaining.
+ * <p/>
+ * Reactive API usage leverages Reactor's {@link reactor.util.context.Context} so that subscribers can register one of the
+ * following objects (using their {@link Class} as context key):
+ *
+ * <ol>
+ * <li>A {@link TraceContextProvider}</li>
+ * <li>A Brave {@link Span}: Commands extract the {@link brave.propagation.TraceContext}</li>
+ * <li>A Brave {@link brave.propagation.TraceContext}</li>
+ * </ol>
+ *
+ * If one of the context objects above is found, it's used to determine the parent context for the command {@link Span}.
+ *
+ * @author Mark Paluch
+ * @see brave.Tracer
+ * @see brave.Tracing#currentTracer()
+ * @see BraveTraceContextProvider
+ * @since 5.1
+ */
+public class BraveTracing implements Tracing {
+
+    private final BraveTracer tracer;
+
+    /**
+     * Create a new {@link BraveTracing} instance.
+     *
+     * @param tracer
+     */
+    private BraveTracing(BraveTracer tracer) {
+
+        LettuceAssert.notNull(tracer, "Tracer must not be null");
+
+        this.tracer = tracer;
+    }
+
+    /**
+     * Create a new {@link BraveTracing} instance.
+     *
+     * @param tracer must not be {@literal null}.
+     * @return the {@link BraveTracer}.
+     */
+    public static BraveTracing create(brave.Tracer tracer) {
+        return new BraveTracing(new BraveTracer(tracer));
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    @Override
+    public TracerProvider getTracerProvider() {
+        return () -> tracer;
+    }
+
+    @Override
+    public TraceContextProvider initialTraceContextProvider() {
+        return BraveTraceContextProvider.INSTANCE;
+    }
+
+    @Override
+    public Endpoint createEndpoint(SocketAddress socketAddress) {
+
+        zipkin2.Endpoint.Builder builder = zipkin2.Endpoint.newBuilder();
+
+        if (socketAddress instanceof InetSocketAddress) {
+
+            InetSocketAddress inetSocketAddress = (InetSocketAddress) socketAddress;
+            return new BraveEndpoint(builder.serviceName("Redis").ip(inetSocketAddress.getAddress())
+                    .port(inetSocketAddress.getPort()).build());
+        }
+
+        return new BraveEndpoint(builder.serviceName("Redis at " + socketAddress.toString()).build());
+    }
+
+    /**
+     * Brave-specific implementation of {@link Tracer}.
+     */
+    static class BraveTracer extends Tracer {
+
+        private final brave.Tracer tracer;
+
+        public BraveTracer(brave.Tracer tracer) {
+            this.tracer = tracer;
+        }
+
+        @Override
+        public Span nextSpan() {
+            return postProcessSpan(tracer.nextSpan());
+        }
+
+        @Override
+        public Span nextSpan(TraceContext traceContext) {
+
+            if (!(traceContext instanceof BraveTraceContext)) {
+                return nextSpan();
+            }
+
+            BraveTraceContext braveTraceContext = BraveTraceContext.class.cast(traceContext);
+
+            if (braveTraceContext.traceContext == null) {
+                return nextSpan();
+            }
+
+            return postProcessSpan(tracer.nextSpan(TraceContextOrSamplingFlags.create(braveTraceContext.traceContext)));
+        }
+
+        private Span postProcessSpan(brave.Span span) {
+
+            if (span == null || span.isNoop()) {
+                return NoOpTracing.NoOpSpan.INSTANCE;
+            }
+
+            return new BraveSpan(span.kind(brave.Span.Kind.CLIENT));
+        }
+    }
+
+    /**
+     * Brave-specific {@link io.lettuce.core.tracing.Tracer.Span}.
+     */
+    static class BraveSpan extends Tracer.Span {
+
+        private final brave.Span span;
+
+        BraveSpan(brave.Span span) {
+            this.span = span;
+        }
+
+        @Override
+        public BraveSpan start() {
+
+            span.start();
+
+            return this;
+        }
+
+        @Override
+        public BraveSpan name(String name) {
+
+            span.name(name);
+
+            return this;
+        }
+
+        @Override
+        public BraveSpan annotate(String value) {
+
+            span.annotate(value);
+
+            return this;
+        }
+
+        @Override
+        public BraveSpan tag(String key, String value) {
+
+            span.tag(key, value);
+
+            return this;
+        }
+
+        @Override
+        public BraveSpan error(Throwable throwable) {
+
+            span.error(throwable);
+
+            return this;
+        }
+
+        @Override
+        public BraveSpan remoteEndpoint(Endpoint endpoint) {
+
+            span.remoteEndpoint(BraveEndpoint.class.cast(endpoint).endpoint);
+
+            return this;
+        }
+
+        @Override
+        public void finish() {
+            span.finish();
+        }
+
+        public brave.Span getSpan() {
+            return span;
+        }
+    }
+
+    /**
+     * {@link Endpoint} implementation for Zipkin's {@link zipkin2.Endpoint}.
+     */
+    public static class BraveEndpoint extends Endpoint {
+
+        private final zipkin2.Endpoint endpoint;
+
+        public BraveEndpoint(zipkin2.Endpoint endpoint) {
+            this.endpoint = endpoint;
+        }
+    }
+
+    /**
+     * {@link TraceContext} implementation for Brave's {@link brave.propagation.TraceContext}.
+     */
+    public static class BraveTraceContext extends TraceContext {
+
+        brave.propagation.TraceContext traceContext;
+
+        private BraveTraceContext(brave.propagation.TraceContext traceContext) {
+            this.traceContext = traceContext;
+        }
+
+        public static BraveTraceContext create(brave.propagation.TraceContext traceContext) {
+            return new BraveTraceContext(traceContext);
+        }
+    }
+
+    enum BraveTraceContextProvider implements TraceContextProvider {
+        INSTANCE;
+
+        @Override
+        public TraceContext getTraceContext() {
+
+            brave.Tracer tracer = brave.Tracing.currentTracer();
+
+            if (tracer != null) {
+
+                Span span = tracer.currentSpan();
+
+                if (span != null) {
+                    return new BraveTraceContext(span.context());
+                }
+            }
+            return null;
+        }
+
+        @Override
+        public Mono<TraceContext> getTraceContextLater() {
+
+            return Mono.subscriberContext()
+                    .filter(it -> it.hasKey(Span.class) || it.hasKey(brave.propagation.TraceContext.class)).map(it -> {
+
+                        if (it.hasKey(Span.class)) {
+                            return new BraveTraceContext(it.get(Span.class).context());
+                        }
+
+                        return new BraveTraceContext(it.get(brave.propagation.TraceContext.class));
+                    });
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/tracing/NoOpTracing.java b/src/main/java/io/lettuce/core/tracing/NoOpTracing.java
new file mode 100644
index 0000000000..dc671b1bb2
--- /dev/null
+++ b/src/main/java/io/lettuce/core/tracing/NoOpTracing.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.tracing;
+
+import java.net.SocketAddress;
+
+/**
+ * No-Op {@link Tracing} support that does not trace at all.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+enum NoOpTracing implements Tracing, TraceContextProvider, TracerProvider {
+
+    INSTANCE;
+
+    private final Endpoint NOOP_ENDPOINT = new Endpoint() {
+    };
+
+    @Override
+    public TraceContext getTraceContext() {
+        return TraceContext.EMPTY;
+    }
+
+    @Override
+    public Tracer getTracer() {
+        return NoOpTracer.INSTANCE;
+    }
+
+    @Override
+    public TracerProvider getTracerProvider() {
+        return this;
+    }
+
+    @Override
+    public TraceContextProvider initialTraceContextProvider() {
+        return this;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return false;
+    }
+
+    @Override
+    public Endpoint createEndpoint(SocketAddress socketAddress) {
+        return NOOP_ENDPOINT;
+    }
+
+    static class NoOpTracer extends Tracer {
+
+        static final Tracer INSTANCE = new NoOpTracer();
+
+        @Override
+        public Span nextSpan(TraceContext traceContext) {
+            return NoOpSpan.INSTANCE;
+        }
+
+        @Override
+        public Span nextSpan() {
+            return NoOpSpan.INSTANCE;
+        }
+    }
+
+    public static class NoOpSpan extends Tracer.Span {
+
+        static final NoOpSpan INSTANCE = new NoOpSpan();
+
+        @Override
+        public Tracer.Span start() {
+            return this;
+        }
+
+        @Override
+        public Tracer.Span name(String name) {
+            return this;
+        }
+
+        @Override
+        public Tracer.Span annotate(String value) {
+            return this;
+        }
+
+        @Override
+        public Tracer.Span tag(String key, String value) {
+            return this;
+        }
+
+        @Override
+        public Tracer.Span error(Throwable throwable) {
+            return this;
+        }
+
+        @Override
+        public Tracer.Span remoteEndpoint(Tracing.Endpoint endpoint) {
+            return this;
+        }
+
+        @Override
+        public void finish() {
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/tracing/TraceContext.java b/src/main/java/io/lettuce/core/tracing/TraceContext.java
new file mode 100644
index 0000000000..dc39e5cb5e
--- /dev/null
+++ b/src/main/java/io/lettuce/core/tracing/TraceContext.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.tracing;
+
+/**
+ * Context for propagation of parent and child spans. Subclasses may add their propagation metadata.
+ */
+public abstract class TraceContext {
+
+    public final static TraceContext EMPTY = new TraceContext() {
+    };
+}
diff --git a/src/main/java/io/lettuce/core/tracing/TraceContextProvider.java b/src/main/java/io/lettuce/core/tracing/TraceContextProvider.java
new file mode 100644
index 0000000000..9cb53b84cf
--- /dev/null
+++ b/src/main/java/io/lettuce/core/tracing/TraceContextProvider.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.tracing;
+
+import reactor.core.publisher.Mono;
+
+/**
+ * Interface to obtain a {@link TraceContext} allowing propagation of {@link Tracer.Span} {@link TraceContext}s across threads.
+ */
+@FunctionalInterface
+public interface TraceContextProvider {
+
+    /**
+     * @return the {@link TraceContext}.
+     */
+    TraceContext getTraceContext();
+
+    /**
+     * @return the {@link TraceContext}.
+     */
+    default Mono<TraceContext> getTraceContextLater() {
+        return Mono.justOrEmpty(getTraceContext());
+    }
+}
diff --git a/src/main/java/io/lettuce/core/tracing/Tracer.java b/src/main/java/io/lettuce/core/tracing/Tracer.java
new file mode 100644
index 0000000000..a53f6e3397
--- /dev/null
+++ b/src/main/java/io/lettuce/core/tracing/Tracer.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.tracing;
+
+/**
+ * Tracing abstraction to create {@link Span}s to capture latency and behavior of Redis commands.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ * @see Span
+ */
+public abstract class Tracer {
+
+    /**
+     * Returns a new trace {@link Tracer.Span}.
+     *
+     * @return a new {@link Span}.
+     */
+    public abstract Span nextSpan();
+
+    /**
+     * Returns a new trace {@link Tracer.Span} associated with {@link TraceContext} or a new one if {@link TraceContext} is
+     * {@literal null}.
+     *
+     * @param traceContext the trace context.
+     * @return a new {@link Span}.
+     */
+    public abstract Span nextSpan(TraceContext traceContext);
+
+    /**
+     * Used to model the latency of an operation along with tags such as name or the {@link Tracing.Endpoint}.
+     */
+    public abstract static class Span {
+
+        /**
+         * Starts the span with.
+         *
+         * @return {@literal this} {@link Span}.
+         */
+        public abstract Span start();
+
+        /**
+         * Sets the name for this {@link Span}.
+         *
+         * @param name must not be {@literal null}.
+         * @return {@literal this} {@link Span}.
+         */
+        public abstract Span name(String name);
+
+        /**
+         * Associates an event that explains latency with the current system time.
+         *
+         * @param value A short tag indicating the event, like "finagle.retry"
+         */
+        public abstract Span annotate(String value);
+
+        /**
+         * Associates a tag with this {@link Span}.
+         *
+         * @param key must not be {@literal null}.
+         * @param value must not be {@literal null}.
+         * @return {@literal this} {@link Span}.
+         */
+        public abstract Span tag(String key, String value);
+
+        /**
+         * Associate an {@link Throwable error} with this {@link Span}.
+         *
+         * @param throwable must not be {@literal null}.
+         * @return
+         */
+        public abstract Span error(Throwable throwable);
+
+        /**
+         * Associates an {@link Tracing.Endpoint} with this {@link Span}.
+         *
+         * @param endpoint must not be {@literal null}.
+         * @return
+         */
+        public abstract Span remoteEndpoint(Tracing.Endpoint endpoint);
+
+        /**
+         * Reports the span complete.
+         */
+        public abstract void finish();
+    }
+}
diff --git a/src/main/java/io/lettuce/core/tracing/TracerProvider.java b/src/main/java/io/lettuce/core/tracing/TracerProvider.java
new file mode 100644
index 0000000000..b0dad31e3a
--- /dev/null
+++ b/src/main/java/io/lettuce/core/tracing/TracerProvider.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.tracing;
+
+/**
+ * Interface to obtain a {@link Tracer}.
+ */
+@FunctionalInterface
+public interface TracerProvider {
+
+    /**
+     * @return the {@link Tracer}.
+     */
+    Tracer getTracer();
+}
diff --git a/src/main/java/io/lettuce/core/tracing/Tracing.java b/src/main/java/io/lettuce/core/tracing/Tracing.java
new file mode 100644
index 0000000000..9380cfa92d
--- /dev/null
+++ b/src/main/java/io/lettuce/core/tracing/Tracing.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.tracing;
+
+import java.net.SocketAddress;
+import java.util.function.Function;
+
+import reactor.core.publisher.Mono;
+import reactor.util.context.Context;
+
+/**
+ * Interface declaring methods to trace Redis commands. This interface contains declarations of basic required interfaces and
+ * value objects to represent traces, spans and metadata in an dependency-agnostic manner.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ * @see TracerProvider
+ * @see TraceContextProvider
+ */
+public interface Tracing {
+
+    /**
+     * @return the {@link TracerProvider}.
+     */
+    TracerProvider getTracerProvider();
+
+    /**
+     * @return the {@link TraceContextProvider} supplying the initial {@link TraceContext} (i.e. if there is no active span).
+     */
+    TraceContextProvider initialTraceContextProvider();
+
+    /**
+     * Returns {@literal true} if tracing is enabled.
+     *
+     * @return {@literal true} if tracing DefaultClientResourcesTestis enabled.
+     */
+    boolean isEnabled();
+
+    /**
+     * Create an {@link Endpoint} given {@link SocketAddress}.
+     *
+     * @param socketAddress the remote address.
+     * @return the {@link Endpoint} for {@link SocketAddress}.
+     */
+    Endpoint createEndpoint(SocketAddress socketAddress);
+
+    /**
+     * Returns a {@link TracerProvider} that is disabled.
+     *
+     * @return a disabled {@link TracerProvider}.
+     */
+    static Tracing disabled() {
+        return NoOpTracing.INSTANCE;
+    }
+
+    /**
+     * Gets the {@link TraceContextProvider} from Reactor {@link Context}.
+     *
+     * @return the {@link TraceContextProvider}.
+     */
+    static Mono<TraceContextProvider> getContext() {
+        return Mono.subscriberContext().filter(c -> c.hasKey(TraceContextProvider.class))
+                .map(c -> c.get(TraceContextProvider.class));
+    }
+
+    /**
+     * Clears the {@code Mono<TracerProvider>} from Reactor {@link Context}.
+     *
+     * @return Return a {@link Function} that clears the {@link TraceContextProvider} context.
+     */
+    static Function<Context, Context> clearContext() {
+        return context -> context.delete(TraceContextProvider.class);
+    }
+
+    /**
+     * Creates a Reactor {@link Context} that contains the {@code Mono<TraceContextProvider>}. that can be merged into another
+     * {@link Context}.
+     *
+     * @param supplier the {@link TraceContextProvider} to set in the returned Reactor {@link Context}.
+     * @return a Reactor {@link Context} that contains the {@code Mono<TraceContextProvider>}.
+     */
+    static Context withTraceContextProvider(TraceContextProvider supplier) {
+        return Context.of(TraceContextProvider.class, supplier);
+    }
+
+    /**
+     * Value object to represent an endpoint. Used by {@link Tracer.Span}.
+     */
+    abstract class Endpoint {
+    }
+}
diff --git a/src/test/java/io/lettuce/core/BraveTracingTest.java b/src/test/java/io/lettuce/core/BraveTracingTest.java
new file mode 100644
index 0000000000..5edec575db
--- /dev/null
+++ b/src/test/java/io/lettuce/core/BraveTracingTest.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import static io.lettuce.core.AbstractRedisClientTest.client;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import reactor.test.StepVerifier;
+import zipkin2.Span;
+import zipkin2.storage.InMemoryStorage;
+import brave.ScopedSpan;
+import brave.Tracer;
+import brave.Tracing;
+import brave.propagation.CurrentTraceContext;
+import brave.propagation.TraceContext;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.DefaultClientResources;
+import io.lettuce.core.tracing.BraveTracing;
+
+/**
+ * @author Mark Paluch
+ */
+public class BraveTracingTest extends AbstractTest {
+
+    private static ClientResources clientResources;
+    private static Tracing clientTracing;
+    private static InMemoryStorage storage = InMemoryStorage.newBuilder().build();
+    private static Queue<Span> spans = new LinkedBlockingQueue<>();
+
+    @BeforeClass
+    public static void beforeClass() {
+
+        clientTracing = Tracing.newBuilder().localServiceName("client")
+                .currentTraceContext(CurrentTraceContext.Default.create()).spanReporter(s -> {
+                    storage.spanConsumer().accept(Collections.singletonList(s));
+                    spans.add(s);
+                }).build();
+
+        clientResources = DefaultClientResources.builder().tracing(BraveTracing.create(clientTracing.tracer())).build();
+
+        client = RedisClient.create(clientResources, RedisURI.Builder.redis(host, port).build());
+    }
+
+    @Before
+    public void before() {
+
+        Tracer tracer = clientTracing.tracer();
+        if (tracer.currentSpan() != null) {
+            clientTracing.tracer().currentSpan().abandon();
+        }
+
+        spans.clear();
+        storage.clear();
+    }
+
+    @AfterClass
+    public static void afterClass() {
+
+        clientTracing.close();
+        clientResources.shutdown(0, 0, TimeUnit.MILLISECONDS);
+    }
+
+    @Test
+    public void pingWithTrace() {
+
+        ScopedSpan foo = clientTracing.tracer().startScopedSpan("foo");
+
+        StatefulRedisConnection<String, String> connect = client.connect();
+        connect.sync().ping();
+
+        foo.finish();
+
+        assertThat(storage.getTraces()).isNotEmpty();
+
+        List<Span> spans = storage.getTraces().get(0);
+
+        assertThat(spans.get(0).name()).isEqualTo("ping");
+        assertThat(spans.get(1).name()).isEqualTo("foo");
+    }
+
+    @Test
+    public void pingWithTraceShouldCatchErrors() {
+
+        ScopedSpan foo = clientTracing.tracer().startScopedSpan("foo");
+
+        StatefulRedisConnection<String, String> connect = client.connect();
+        connect.sync().set("foo", "bar");
+        try {
+            connect.sync().hgetall("foo");
+        } catch (Exception e) {
+        }
+
+        foo.finish();
+
+        assertThat(storage.getTraces()).isNotEmpty();
+
+        List<Span> spans = storage.getTraces().get(0);
+
+        assertThat(spans.get(0).name()).isEqualTo("set");
+        assertThat(spans.get(1).name()).isEqualTo("hgetall");
+        assertThat(spans.get(1).tags()).containsEntry("error",
+                "WRONGTYPE Operation against a key holding the wrong kind of value");
+        assertThat(spans.get(2).name()).isEqualTo("foo");
+    }
+
+    @Test
+    public void reactivePing() {
+
+        StatefulRedisConnection<String, String> connect = client.connect();
+        connect.reactive().ping().as(StepVerifier::create).expectNext("PONG").verifyComplete();
+
+        assertThat(spans).isNotEmpty();
+    }
+
+    @Test
+    public void reactivePingWithTrace() {
+
+        ScopedSpan trace = clientTracing.tracer().startScopedSpan("foo");
+
+        StatefulRedisConnection<String, String> connect = client.connect();
+        connect.reactive().ping() //
+                .subscriberContext(it -> it.put(TraceContext.class, trace.context())) //
+                .as(StepVerifier::create) //
+                .expectNext("PONG").verifyComplete();
+
+        trace.finish();
+
+        assertThat(storage.getTraces()).isNotEmpty();
+
+        List<Span> spans = storage.getTraces().get(0);
+
+        assertThat(spans.get(0).name()).isEqualTo("ping");
+        assertThat(spans.get(1).name()).isEqualTo("foo");
+    }
+
+    @Test
+    public void reactiveGetAndSetWithTrace() {
+
+        ScopedSpan trace = clientTracing.tracer().startScopedSpan("foo");
+
+        StatefulRedisConnection<String, String> connect = client.connect();
+        connect.reactive().set("foo", "bar") //
+                .then(connect.reactive().get("foo")) //
+                .subscriberContext(it -> it.put(TraceContext.class, trace.context())) //
+                .as(StepVerifier::create) //
+                .expectNext("bar").verifyComplete();
+
+        trace.finish();
+
+        assertThat(storage.getTraces()).isNotEmpty();
+
+        List<Span> spans = storage.getTraces().get(0);
+
+        assertThat(spans.get(0).name()).isEqualTo("set");
+        assertThat(spans.get(1).name()).isEqualTo("get");
+        assertThat(spans.get(2).name()).isEqualTo("foo");
+    }
+
+    @Test
+    public void reactiveGetAndSetWithTraceProvider() {
+
+        brave.Span trace = clientTracing.tracer().newTrace();
+
+        StatefulRedisConnection<String, String> connect = client.connect();
+        connect.reactive()
+                .set("foo", "bar")
+                .then(connect.reactive().get("foo"))
+                .subscriberContext(
+                        io.lettuce.core.tracing.Tracing.withTraceContextProvider(() -> BraveTracing.BraveTraceContext
+                                .create(trace.context()))) //
+                .as(StepVerifier::create) //
+                .expectNext("bar").verifyComplete();
+
+        trace.finish();
+
+        assertThat(storage.getTraces()).isNotEmpty();
+
+        List<Span> spans = storage.getTraces().get(0);
+
+        assertThat(spans.get(0).name()).isEqualTo("set");
+        assertThat(spans.get(1).name()).isEqualTo("get");
+    }
+}
diff --git a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
index d860ee7a77..bc9a650e9d 100644
--- a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
+import io.lettuce.core.tracing.Tracing;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -66,6 +67,7 @@ public class ReactiveBackpressurePropagationTest {
     public void before() throws Exception {
 
         when(clientResources.commandLatencyCollector()).thenReturn(latencyCollector);
+        when(clientResources.tracing()).thenReturn(Tracing.disabled());
         when(statefulConnection.dispatch(any(RedisCommand.class))).thenAnswer(invocation -> {
 
             RedisCommand command = (RedisCommand) invocation.getArguments()[0];
diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
index dba8272b2b..c34bedd74f 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
@@ -26,6 +26,7 @@
 import java.net.InetSocketAddress;
 import java.util.*;
 
+import io.lettuce.core.tracing.Tracing;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
@@ -125,6 +126,7 @@ public void before() throws Exception {
 
         when(latencyCollector.isEnabled()).thenReturn(true);
         when(clientResources.commandLatencyCollector()).thenReturn(latencyCollector);
+        when(clientResources.tracing()).thenReturn(Tracing.disabled());
 
         sut = new CommandHandler(ClientOptions.create(), clientResources, endpoint);
         stack = (Queue) ReflectionTestUtils.getField(sut, "stack");
diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
index a9a5fb12b2..fcf26d4aef 100644
--- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
@@ -51,6 +51,7 @@
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.internal.LettuceFactories;
 import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.resource.ClientResources;
 import io.netty.channel.*;
 import io.netty.handler.codec.EncoderException;
 import io.netty.util.concurrent.ImmediateEventExecutor;
@@ -74,6 +75,9 @@ public class DefaultEndpointTest {
     @Mock
     private ConnectionWatchdog connectionWatchdog;
 
+    @Mock
+    private ClientResources clientResources;
+
     private ChannelPromise promise;
 
     @BeforeClass
@@ -118,7 +122,7 @@ public void before() {
             return promise;
         });
 
-        sut = new DefaultEndpoint(ClientOptions.create());
+        sut = new DefaultEndpoint(ClientOptions.create(), clientResources);
         sut.setConnectionFacade(connectionFacade);
     }
 
@@ -248,7 +252,7 @@ public void writeShouldRejectCommandsInDisconnectedState() {
 
         sut = new DefaultEndpoint(ClientOptions.builder() //
                 .disconnectedBehavior(ClientOptions.DisconnectedBehavior.REJECT_COMMANDS) //
-                .build());
+                .build(), clientResources);
 
         try {
             sut.write(command);
@@ -277,7 +281,7 @@ public void writeWithoutAutoReconnectShouldRejectCommandsInDisconnectedState() {
         sut = new DefaultEndpoint(ClientOptions.builder() //
                 .autoReconnect(false) //
                 .disconnectedBehavior(ClientOptions.DisconnectedBehavior.DEFAULT) //
-                .build());
+                .build(), clientResources);
 
         try {
             sut.write(command);
@@ -363,7 +367,7 @@ public void retryListenerDoesNotRetryCompletedCommands() {
 
     @Test
     public void testMTCConcurrentConcurrentWrite() throws Throwable {
-        TestFramework.runOnce(new MTCConcurrentConcurrentWrite(command));
+        TestFramework.runOnce(new MTCConcurrentConcurrentWrite(command, clientResources));
     }
 
     /**
@@ -374,11 +378,11 @@ static class MTCConcurrentConcurrentWrite extends MultithreadedTestCase {
         private final Command<String, String, String> command;
         private TestableEndpoint handler;
 
-        public MTCConcurrentConcurrentWrite(Command<String, String, String> command) {
+        public MTCConcurrentConcurrentWrite(Command<String, String, String> command, ClientResources clientResources) {
 
             this.command = command;
 
-            handler = new TestableEndpoint(ClientOptions.create()) {
+            handler = new TestableEndpoint(ClientOptions.create(), clientResources) {
 
                 @Override
                 protected <C extends RedisCommand<?, ?, T>, T> void writeToBuffer(C command) {
@@ -412,10 +416,11 @@ static class TestableEndpoint extends DefaultEndpoint {
         /**
          * Create a new {@link DefaultEndpoint}.
          *
-         * @param clientOptions client options for this connection, must not be {@literal null}
+         * @param clientOptions client options for this connection, must not be {@literal null}.
+         * @param clientResources client resources for this connection, must not be {@literal null}.
          */
-        public TestableEndpoint(ClientOptions clientOptions) {
-            super(clientOptions);
+        public TestableEndpoint(ClientOptions clientOptions, ClientResources clientResources) {
+            super(clientOptions, clientResources);
         }
     }
 }
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java
index cac28b762f..e02ff6b050 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java
@@ -40,6 +40,7 @@
 import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.tracing.Tracing;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.*;
@@ -95,6 +96,7 @@ public void before() throws Exception {
 
         when(clientResources.commandLatencyCollector()).thenReturn(
                 new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create()));
+        when(clientResources.tracing()).thenReturn(Tracing.disabled());
 
         sut = new PubSubCommandHandler<>(ClientOptions.create(), clientResources, StringCodec.UTF8, endpoint);
         stack = (Queue) ReflectionTestUtils.getField(sut, "stack");
diff --git a/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java b/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
index 119d11201d..82b3b763d8 100644
--- a/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
+++ b/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
@@ -19,7 +19,9 @@
 import java.util.concurrent.CompletableFuture;
 
 import io.lettuce.core.protocol.ConnectionFacade;
+import io.lettuce.core.protocol.EmptyClientResources;
 import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * @author Mark Paluch
@@ -56,16 +58,18 @@ public void reset() {
 
     @Override
     public void setConnectionFacade(ConnectionFacade connection) {
+    }
 
+    @Override
+    public ClientResources getClientResources() {
+        return EmptyClientResources.INSTANCE;
     }
 
     @Override
     public void setAutoFlushCommands(boolean autoFlush) {
-
     }
 
     @Override
     public void flushCommands() {
-
     }
 }
diff --git a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
index fcec09904f..ba0cc57302 100644
--- a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
@@ -64,7 +64,8 @@ public class CommandHandlerBenchmark {
     @Setup
     public void setup() throws Exception {
 
-        commandHandler = new CommandHandler(CLIENT_OPTIONS, EmptyClientResources.INSTANCE, new DefaultEndpoint(CLIENT_OPTIONS));
+        commandHandler = new CommandHandler(CLIENT_OPTIONS, EmptyClientResources.INSTANCE, new DefaultEndpoint(CLIENT_OPTIONS,
+                EmptyClientResources.INSTANCE));
         commandHandler.channelRegistered(CHANNEL_HANDLER_CONTEXT);
         commandHandler.setState(CommandHandler.LifecycleState.CONNECTED);
 
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
index f03083c2bb..bfea25732b 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
@@ -26,6 +26,7 @@
 import io.lettuce.core.metrics.CommandLatencyId;
 import io.lettuce.core.metrics.CommandMetrics;
 import io.lettuce.core.resource.*;
+import io.lettuce.core.tracing.Tracing;
 import io.netty.util.Timer;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.Future;
@@ -106,6 +107,11 @@ public NettyCustomizer nettyCustomizer() {
         return null;
     }
 
+    @Override
+    public Tracing tracing() {
+        return Tracing.disabled();
+    }
+
     public static class EmptyCommandLatencyCollector implements CommandLatencyCollector {
 
         @Override
diff --git a/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
index fe6849d722..59d80cf67c 100644
--- a/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
@@ -49,7 +49,7 @@ public class RedisEndpointBenchmark {
     @Setup
     public void setup() {
 
-        defaultEndpoint = new DefaultEndpoint(CLIENT_OPTIONS);
+        defaultEndpoint = new DefaultEndpoint(CLIENT_OPTIONS, EmptyClientResources.INSTANCE);
         command = new Command(CommandType.GET, new ValueOutput<>(CODEC), new CommandArgs(CODEC).addKey(KEY));
 
         defaultEndpoint.setConnectionFacade(EmptyStatefulRedisConnection.INSTANCE);

From 10638a2de9d8b5463725df7572fd0023ba1697a6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 9 Jun 2018 19:55:06 +0200
Subject: [PATCH 468/808] Improve builders and resources with Java 8
 default/static interface methods #791

---
 .../java/io/lettuce/core/ClientOptions.java   |  34 +++-
 .../core/cluster/ClusterClientOptions.java    |  16 ++
 .../DefaultCommandLatencyEventPublisher.java  |   1 -
 .../core/metrics/CommandLatencyCollector.java |  41 ++++
 .../CommandLatencyCollectorOptions.java       | 111 +++++++++++
 .../lettuce/core/metrics/CommandMetrics.java  |   1 +
 .../DefaultCommandLatencyCollector.java       |   1 -
 ...DefaultCommandLatencyCollectorOptions.java |  72 ++++---
 .../core/resource/ClientResources.java        | 178 ++++++++++++++++++
 .../core/resource/DefaultClientResources.java |  63 +++++--
 .../io/lettuce/core/resource/DnsResolver.java |  19 ++
 .../core/resource/NettyCustomizer.java        |   6 +-
 .../resource/DefaultClientResourcesTest.java  |  35 +++-
 .../core/protocol/EmptyClientResources.java   |   5 +
 14 files changed, 530 insertions(+), 53 deletions(-)

diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index 0594e7d3b5..59761499f7 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -46,17 +46,19 @@ public class ClientOptions implements Serializable {
     private final SocketOptions socketOptions;
     private final SslOptions sslOptions;
     private final TimeoutOptions timeoutOptions;
+    private final Builder builder;
 
     protected ClientOptions(Builder builder) {
-        pingBeforeActivateConnection = builder.pingBeforeActivateConnection;
-        cancelCommandsOnReconnectFailure = builder.cancelCommandsOnReconnectFailure;
-        autoReconnect = builder.autoReconnect;
-        suspendReconnectOnProtocolFailure = builder.suspendReconnectOnProtocolFailure;
-        requestQueueSize = builder.requestQueueSize;
-        disconnectedBehavior = builder.disconnectedBehavior;
-        socketOptions = builder.socketOptions;
-        sslOptions = builder.sslOptions;
-        timeoutOptions = builder.timeoutOptions;
+        this.pingBeforeActivateConnection = builder.pingBeforeActivateConnection;
+        this.cancelCommandsOnReconnectFailure = builder.cancelCommandsOnReconnectFailure;
+        this.autoReconnect = builder.autoReconnect;
+        this.suspendReconnectOnProtocolFailure = builder.suspendReconnectOnProtocolFailure;
+        this.requestQueueSize = builder.requestQueueSize;
+        this.disconnectedBehavior = builder.disconnectedBehavior;
+        this.socketOptions = builder.socketOptions;
+        this.sslOptions = builder.sslOptions;
+        this.timeoutOptions = builder.timeoutOptions;
+        this.builder = builder;
     }
 
     protected ClientOptions(ClientOptions original) {
@@ -69,6 +71,7 @@ protected ClientOptions(ClientOptions original) {
         this.socketOptions = original.getSocketOptions();
         this.sslOptions = original.getSslOptions();
         this.timeoutOptions = original.getTimeoutOptions();
+        this.builder = original.builder;
     }
 
     /**
@@ -245,6 +248,19 @@ public ClientOptions build() {
         }
     }
 
+    /**
+     * Returns a builder to create new {@link ClientOptions} whose settings are replicated from the current
+     * {@link ClientOptions}.
+     *
+     * @return a {@link ClientOptions.Builder} to create new {@link ClientOptions} whose settings are replicated from the
+     *         current {@link ClientOptions}.
+     *
+     * @since 5.1
+     */
+    public ClientOptions.Builder mutate() {
+        return this.builder;
+    }
+
     /**
      * Enables initial {@literal PING} barrier before any connection is usable. If {@literal true} (default is {@literal false}
      * ), every connection and reconnect will issue a {@literal PING} command and awaits its response before the connection is
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index 4020f5f307..b295d8d246 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -40,6 +40,7 @@ public class ClusterClientOptions extends ClientOptions {
     private final boolean validateClusterNodeMembership;
     private final int maxRedirects;
     private final ClusterTopologyRefreshOptions topologyRefreshOptions;
+    private final ClusterClientOptions.Builder builder;
 
     protected ClusterClientOptions(Builder builder) {
 
@@ -59,6 +60,7 @@ protected ClusterClientOptions(Builder builder) {
         }
 
         this.topologyRefreshOptions = refreshOptions;
+        this.builder = builder;
     }
 
     protected ClusterClientOptions(ClusterClientOptions original) {
@@ -68,6 +70,7 @@ protected ClusterClientOptions(ClusterClientOptions original) {
         this.validateClusterNodeMembership = original.validateClusterNodeMembership;
         this.maxRedirects = original.maxRedirects;
         this.topologyRefreshOptions = original.topologyRefreshOptions;
+        this.builder = original.builder;
     }
 
     /**
@@ -210,6 +213,19 @@ public ClusterClientOptions build() {
         }
     }
 
+    /**
+     * Returns a builder to create new {@link ClusterClientOptions} whose settings are replicated from the current
+     * {@link ClusterClientOptions}.
+     *
+     * @return a {@link ClusterClientOptions.Builder} to create new {@link ClusterClientOptions} whose settings are replicated
+     *         from the current {@link ClusterClientOptions}.
+     *
+     * @since 5.1
+     */
+    public ClusterClientOptions.Builder mutate() {
+        return this.builder;
+    }
+
     /**
      * Flag, whether regular cluster topology updates are updated. The client starts updating the cluster topology in the
      * intervals of {@link #getRefreshPeriod()}. Defaults to {@literal false}. Returns the value from
diff --git a/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java b/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
index 20b083398e..b6021c8905 100644
--- a/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
+++ b/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
@@ -76,5 +76,4 @@ public void emitMetricsEvent() {
 
         eventBus.publish(new CommandLatencyEvent(commandLatencyCollector.retrieveMetrics()));
     }
-
 }
diff --git a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java
index d601e8340e..cb70725258 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.metrics;
 
 import java.net.SocketAddress;
+import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -34,6 +35,46 @@
  */
 public interface CommandLatencyCollector extends MetricCollector<Map<CommandLatencyId, CommandMetrics>> {
 
+    /**
+     * Creates a new {@link CommandLatencyCollector} using {@link CommandLatencyCollectorOptions}.
+     *
+     * @param options must not be {@literal null}.
+     * @return the {@link CommandLatencyCollector} using {@link CommandLatencyCollectorOptions}.
+     */
+    static CommandLatencyCollector create(CommandLatencyCollectorOptions options) {
+        return new DefaultCommandLatencyCollector(options);
+    }
+
+    /**
+     * Returns a disabled no-op {@link CommandLatencyCollector}.
+     *
+     * @return
+     * @since 5.1
+     */
+    static CommandLatencyCollector disabled() {
+
+        return new CommandLatencyCollector() {
+            @Override
+            public void recordCommandLatency(SocketAddress local, SocketAddress remote, ProtocolKeyword commandType,
+                    long firstResponseLatency, long completionLatency) {
+            }
+
+            @Override
+            public void shutdown() {
+            }
+
+            @Override
+            public Map<CommandLatencyId, CommandMetrics> retrieveMetrics() {
+                return Collections.emptyMap();
+            }
+
+            @Override
+            public boolean isEnabled() {
+                return false;
+            }
+        };
+    }
+
     /**
      * Record the command latency per {@code connectionPoint} and {@code commandType}.
      *
diff --git a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
index 908e19a4f6..ad81c81c2d 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
@@ -24,6 +24,47 @@
  */
 public interface CommandLatencyCollectorOptions {
 
+    /**
+     * Create a new {@link CommandLatencyCollectorOptions} instance using default settings.
+     *
+     * @return a new instance of {@link CommandLatencyCollectorOptions} instance using default settings
+     * @since 5.1
+     */
+    static CommandLatencyCollectorOptions create() {
+        return builder().build();
+    }
+
+    /**
+     * Create a {@link CommandLatencyCollectorOptions} instance with disabled event emission.
+     *
+     * @return a new instance of {@link CommandLatencyCollectorOptions} with disabled event emission
+     * @since 5.1
+     */
+    static CommandLatencyCollectorOptions disabled() {
+        return DefaultCommandLatencyCollectorOptions.disabled();
+    }
+
+    /**
+     * Returns a new {@link CommandLatencyCollectorOptions.Builder} to construct {@link CommandLatencyCollectorOptions}.
+     *
+     * @return a new {@link CommandLatencyCollectorOptions.Builder} to construct {@link CommandLatencyCollectorOptions}.
+     * @since 5.1
+     */
+    static CommandLatencyCollectorOptions.Builder builder() {
+        return CommandLatencyCollectorOptions.builder();
+    }
+
+    /**
+     * Returns a builder to create new {@link CommandLatencyCollectorOptions} whose settings are replicated from the current
+     * {@link CommandLatencyCollectorOptions}.
+     *
+     * @return a a {@link CommandLatencyCollectorOptions.Builder} to create new {@link CommandLatencyCollectorOptions} whose
+     *         settings are replicated from the current {@link CommandLatencyCollectorOptions}
+     *
+     * @since 5.1
+     */
+    CommandLatencyCollectorOptions.Builder mutate();
+
     /**
      * Returns the target {@link TimeUnit} for the emitted latencies.
      *
@@ -61,4 +102,74 @@ public interface CommandLatencyCollectorOptions {
      * @return {@literal true} if the latency collector is enabled
      */
     boolean isEnabled();
+
+    /**
+     * Builder for {@link CommandLatencyCollectorOptions}.
+     *
+     * @since 5.1
+     */
+    interface Builder {
+
+        /**
+         * Disable the latency collector.
+         *
+         * @return this
+         */
+        Builder disable();
+
+        /**
+         * Enable the latency collector.
+         *
+         * @return this {@link DefaultCommandLatencyCollectorOptions.Builder}.
+         */
+        Builder enable();
+
+        /**
+         * Enables per connection metrics tracking insead of per host/port. If {@literal true}, multiple connections to the same
+         * host/connection point will be recorded separately which allows to inspect every connection individually. If
+         * {@literal false}, multiple connections to the same host/connection point will be recorded together. This allows a
+         * consolidated view on one particular service. Defaults to {@literal false}. See
+         * {@link DefaultCommandLatencyCollectorOptions#DEFAULT_LOCAL_DISTINCTION}.
+         *
+         * @param localDistinction {@literal true} if latencies are recorded distinct on local level (per connection).
+         * @return this {@link Builder}.
+         */
+        Builder localDistinction(boolean localDistinction);
+
+        /**
+         * Sets whether the recorded latencies should be reset once the metrics event was emitted. Defaults to {@literal true}.
+         * See {@link DefaultCommandLatencyCollectorOptions#DEFAULT_RESET_LATENCIES_AFTER_EVENT}.
+         *
+         * @param resetLatenciesAfterEvent {@literal true} if the recorded latencies should be reset once the metrics event was
+         *        emitted.
+         *
+         * @return this {@link Builder}.
+         */
+        Builder resetLatenciesAfterEvent(boolean resetLatenciesAfterEvent);
+
+        /**
+         * Sets the emitted percentiles. Defaults to 50.0, 90.0, 95.0, 99.0, 99.9}. See
+         * {@link DefaultCommandLatencyCollectorOptions#DEFAULT_TARGET_PERCENTILES}.
+         *
+         * @param targetPercentiles the percentiles which should be emitted, must not be {@literal null}.
+         *
+         * @return this {@link Builder}.
+         */
+        Builder targetPercentiles(double[] targetPercentiles);
+
+        /**
+         * Set the target unit for the latencies. Defaults to {@link TimeUnit#MILLISECONDS}. See
+         * {@link DefaultCommandLatencyCollectorOptions#DEFAULT_TARGET_UNIT}.
+         *
+         * @param targetUnit the target unit, must not be {@literal null}.
+         * @return this {@link Builder}.
+         *
+         */
+        Builder targetUnit(TimeUnit targetUnit);
+
+        /**
+         * @return a new instance of {@link CommandLatencyCollectorOptions}.
+         */
+        CommandLatencyCollectorOptions build();
+    }
 }
diff --git a/src/main/java/io/lettuce/core/metrics/CommandMetrics.java b/src/main/java/io/lettuce/core/metrics/CommandMetrics.java
index 9ee2b3f661..2d836f1216 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandMetrics.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandMetrics.java
@@ -24,6 +24,7 @@
  * @author Mark Paluch
  */
 public class CommandMetrics {
+
     private final long count;
     private final TimeUnit timeUnit;
 
diff --git a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
index 5f1774431d..d3ca677155 100644
--- a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
@@ -396,7 +396,6 @@ public void release() {
                 instanceCounter.decrementAndGet();
                 pauseDetector.shutdown();
                 pauseDetector = null;
-
             }
         }
     }
diff --git a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java
index c73fbf9c58..7500686902 100644
--- a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java
+++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java
@@ -39,6 +39,7 @@ public class DefaultCommandLatencyCollectorOptions implements CommandLatencyColl
     private final boolean resetLatenciesAfterEvent;
     private final boolean localDistinction;
     private final boolean enabled;
+    private final Builder builder;
 
     protected DefaultCommandLatencyCollectorOptions(Builder builder) {
         this.targetUnit = builder.targetUnit;
@@ -46,17 +47,7 @@ protected DefaultCommandLatencyCollectorOptions(Builder builder) {
         this.resetLatenciesAfterEvent = builder.resetLatenciesAfterEvent;
         this.localDistinction = builder.localDistinction;
         this.enabled = builder.enabled;
-    }
-
-    /**
-     * Returns a new {@link DefaultCommandLatencyCollectorOptions.Builder} to construct
-     * {@link DefaultCommandLatencyCollectorOptions}.
-     *
-     * @return a new {@link DefaultCommandLatencyCollectorOptions.Builder} to construct
-     *         {@link DefaultCommandLatencyCollectorOptions}.
-     */
-    public static DefaultCommandLatencyCollectorOptions.Builder builder() {
-        return new DefaultCommandLatencyCollectorOptions.Builder();
+        this.builder = builder;
     }
 
     /**
@@ -77,10 +68,35 @@ public static DefaultCommandLatencyCollectorOptions disabled() {
         return DISABLED;
     }
 
+    /**
+     * Returns a new {@link DefaultCommandLatencyCollectorOptions.Builder} to construct
+     * {@link DefaultCommandLatencyCollectorOptions}.
+     *
+     * @return a new {@link DefaultCommandLatencyCollectorOptions.Builder} to construct
+     *         {@link DefaultCommandLatencyCollectorOptions}.
+     */
+    public static DefaultCommandLatencyCollectorOptions.Builder builder() {
+        return new DefaultCommandLatencyCollectorOptions.Builder();
+    }
+
+    /**
+     * Returns a builder to create new {@link DefaultCommandLatencyCollectorOptions} whose settings are replicated from the
+     * current {@link DefaultCommandLatencyCollectorOptions}.
+     *
+     * @return a a {@link CommandLatencyCollectorOptions.Builder} to create new {@link DefaultCommandLatencyCollectorOptions}
+     *         whose settings are replicated from the current {@link DefaultCommandLatencyCollectorOptions}
+     *
+     * @since 5.1
+     */
+    @Override
+    public DefaultCommandLatencyCollectorOptions.Builder mutate() {
+        return this.builder;
+    }
+
     /**
      * Builder for {@link DefaultCommandLatencyCollectorOptions}.
      */
-    public static class Builder {
+    public static class Builder implements CommandLatencyCollectorOptions.Builder {
 
         private TimeUnit targetUnit = DEFAULT_TARGET_UNIT;
         private double[] targetPercentiles = DEFAULT_TARGET_PERCENTILES;
@@ -94,21 +110,34 @@ private Builder() {
         /**
          * Disable the latency collector.
          *
-         * @return this
+         * @return this {@link Builder}.
          */
+        @Override
         public Builder disable() {
             this.enabled = false;
             return this;
         }
 
+        /**
+         * Enable the latency collector.
+         *
+         * @return this {@link Builder}.
+         * @since 5.1
+         */
+        @Override
+        public Builder enable() {
+            this.enabled = true;
+            return this;
+        }
+
         /**
          * Set the target unit for the latencies. Defaults to {@link TimeUnit#MILLISECONDS}. See
          * {@link DefaultCommandLatencyCollectorOptions#DEFAULT_TARGET_UNIT}.
          *
          * @param targetUnit the target unit, must not be {@literal null}
-         * @return this
-         *
+         * @return this {@link Builder}.
          */
+        @Override
         public Builder targetUnit(TimeUnit targetUnit) {
             LettuceAssert.notNull(targetUnit, "TargetUnit must not be null");
             this.targetUnit = targetUnit;
@@ -120,9 +149,9 @@ public Builder targetUnit(TimeUnit targetUnit) {
          * {@link DefaultCommandLatencyCollectorOptions#DEFAULT_TARGET_PERCENTILES}.
          *
          * @param targetPercentiles the percentiles which should be emitted, must not be {@literal null}
-         *
-         * @return this
+         * @return this {@link Builder}.
          */
+        @Override
         public Builder targetPercentiles(double[] targetPercentiles) {
             LettuceAssert.notNull(targetPercentiles, "TargetPercentiles must not be null");
             this.targetPercentiles = targetPercentiles;
@@ -135,9 +164,9 @@ public Builder targetPercentiles(double[] targetPercentiles) {
          *
          * @param resetLatenciesAfterEvent {@literal true} if the recorded latencies should be reset once the metrics event was
          *        emitted
-         *
-         * @return this
+         * @return this {@link Builder}.
          */
+        @Override
         public Builder resetLatenciesAfterEvent(boolean resetLatenciesAfterEvent) {
             this.resetLatenciesAfterEvent = resetLatenciesAfterEvent;
             return this;
@@ -151,17 +180,18 @@ public Builder resetLatenciesAfterEvent(boolean resetLatenciesAfterEvent) {
          * {@link DefaultCommandLatencyCollectorOptions#DEFAULT_LOCAL_DISTINCTION}.
          *
          * @param localDistinction {@literal true} if latencies are recorded distinct on local level (per connection)
-         * @return this
+         * @return this {@link Builder}.
          */
+        @Override
         public Builder localDistinction(boolean localDistinction) {
             this.localDistinction = localDistinction;
             return this;
         }
 
         /**
-         *
          * @return a new instance of {@link DefaultCommandLatencyCollectorOptions}.
          */
+        @Override
         public DefaultCommandLatencyCollectorOptions build() {
             return new DefaultCommandLatencyCollectorOptions(this);
         }
diff --git a/src/main/java/io/lettuce/core/resource/ClientResources.java b/src/main/java/io/lettuce/core/resource/ClientResources.java
index 7d6cddbe5d..688f9f4f0a 100644
--- a/src/main/java/io/lettuce/core/resource/ClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/ClientResources.java
@@ -16,10 +16,12 @@
 package io.lettuce.core.resource;
 
 import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 
 import io.lettuce.core.event.EventBus;
 import io.lettuce.core.event.EventPublisherOptions;
 import io.lettuce.core.metrics.CommandLatencyCollector;
+import io.lettuce.core.metrics.CommandLatencyCollectorOptions;
 import io.lettuce.core.tracing.Tracing;
 import io.netty.util.Timer;
 import io.netty.util.concurrent.EventExecutorGroup;
@@ -50,6 +52,182 @@
  */
 public interface ClientResources {
 
+    /**
+     * Create a new {@link ClientResources} using default settings.
+     *
+     * @return a new instance of a default client resources.
+     */
+    static ClientResources create() {
+        return DefaultClientResources.create();
+    }
+
+    /**
+     * Create a new {@link ClientResources} using default settings.
+     *
+     * @return a new instance of a default client resources.
+     */
+    static Builder builder() {
+        return DefaultClientResources.builder();
+    }
+
+    /**
+     * Builder for {@link ClientResources}.
+     *
+     * @since 5.1
+     */
+    interface Builder {
+
+        /**
+         * Sets the {@link CommandLatencyCollector} that can that can be used across different instances of the RedisClient.
+         *
+         * @param commandLatencyCollector the command latency collector, must not be {@literal null}.
+         * @return {@code this} {@link Builder}.
+         */
+        Builder commandLatencyCollector(CommandLatencyCollector commandLatencyCollector);
+
+        /**
+         * Sets the {@link CommandLatencyCollectorOptions} that can that can be used across different instances of the
+         * RedisClient. The options are only effective if no {@code commandLatencyCollector} is provided.
+         *
+         * @param commandLatencyCollectorOptions the command latency collector options, must not be {@link null}.
+         * @return {@code this} {@link Builder}.
+         */
+        Builder commandLatencyCollectorOptions(CommandLatencyCollectorOptions commandLatencyCollectorOptions);
+
+        /**
+         * Sets the {@link EventPublisherOptions} to publish command latency metrics using the {@link EventBus}.
+         *
+         * @param commandLatencyPublisherOptions the {@link EventPublisherOptions} to publish command latency metrics using the
+         *        {@link EventBus}, must not be {@literal null}.
+         * @return {@code this} {@link Builder}.
+         */
+        Builder commandLatencyPublisherOptions(EventPublisherOptions commandLatencyPublisherOptions);
+
+        /**
+         * Sets the thread pool size (number of threads to use) for computation operations (default value is the number of
+         * CPUs). The thread pool size is only effective if no {@code eventExecutorGroup} is provided.
+         *
+         * @param computationThreadPoolSize the thread pool size, must be greater {@code 0}.
+         * @return {@code this} {@link Builder}.
+         */
+        Builder computationThreadPoolSize(int computationThreadPoolSize);
+
+        /**
+         * Sets the {@link DnsResolver} that can that is used to resolve hostnames to {@link java.net.InetAddress}. Defaults to
+         * {@link DnsResolvers#JVM_DEFAULT}
+         *
+         * @param dnsResolver the DNS resolver, must not be {@link null}.
+         * @return {@code this} {@link Builder}.
+         * @since 4.3
+         */
+        Builder dnsResolver(DnsResolver dnsResolver);
+
+        /**
+         * Sets the {@link EventBus} that can that can be used across different instances of the RedisClient.
+         *
+         * @param eventBus the event bus, must not be {@literal null}.
+         * @return {@code this} {@link Builder}.
+         */
+        Builder eventBus(EventBus eventBus);
+
+        /**
+         * Sets a shared {@link EventExecutorGroup event executor group} that can be used across different instances of
+         * {@link io.lettuce.core.RedisClient} and {@link io.lettuce.core.cluster.RedisClusterClient}. The provided
+         * {@link EventExecutorGroup} instance will not be shut down when shutting down the client resources. You have to take
+         * care of that. This is an advanced configuration that should only be used if you know what you are doing.
+         *
+         * @param eventExecutorGroup the shared eventExecutorGroup, must not be {@literal null}.
+         * @return {@code this} {@link Builder}.
+         */
+        Builder eventExecutorGroup(EventExecutorGroup eventExecutorGroup);
+
+        /**
+         * Sets a shared {@link EventLoopGroupProvider event executor provider} that can be used across different instances of
+         * {@link io.lettuce.core.RedisClient} and {@link io.lettuce.core.cluster.RedisClusterClient}. The provided
+         * {@link EventLoopGroupProvider} instance will not be shut down when shutting down the client resources. You have to
+         * take care of that. This is an advanced configuration that should only be used if you know what you are doing.
+         *
+         * @param eventLoopGroupProvider the shared eventLoopGroupProvider, must not be {@literal null}.
+         * @return {@code this} {@link Builder}.
+         */
+        Builder eventLoopGroupProvider(EventLoopGroupProvider eventLoopGroupProvider);
+
+        /**
+         * Sets the thread pool size (number of threads to use) for I/O operations (default value is the number of CPUs). The
+         * thread pool size is only effective if no {@code eventLoopGroupProvider} is provided.
+         *
+         * @param ioThreadPoolSize the thread pool size, must be greater {@code 0}.
+         * @return {@code this} {@link Builder}.
+         */
+        Builder ioThreadPoolSize(int ioThreadPoolSize);
+
+        /**
+         * Sets the {@link NettyCustomizer} instance to customize netty components during connection.
+         *
+         * @param nettyCustomizer the netty customizer instance, must not be {@literal null}.
+         * @return this
+         * @since 4.4
+         */
+        Builder nettyCustomizer(NettyCustomizer nettyCustomizer);
+
+        /**
+         * Sets the stateless reconnect {@link Delay} to delay reconnect attempts. Defaults to binary exponential delay capped
+         * at {@literal 30 SECONDS}. {@code reconnectDelay} must be a stateless {@link Delay}.
+         *
+         * @param reconnectDelay the reconnect delay, must not be {@literal null}.
+         * @return this
+         * @since 4.3
+         */
+        Builder reconnectDelay(Delay reconnectDelay);
+
+        /**
+         * Sets the stateful reconnect {@link Supplier} to delay reconnect attempts. Defaults to binary exponential delay capped
+         * at {@literal 30 SECONDS}.
+         *
+         * @param reconnectDelay the reconnect delay, must not be {@literal null}.
+         * @return this
+         * @since 4.3
+         */
+        Builder reconnectDelay(Supplier<Delay> reconnectDelay);
+
+        /**
+         * Sets a shared {@link Timer} that can be used across different instances of {@link io.lettuce.core.RedisClient} and
+         * {@link io.lettuce.core.cluster.RedisClusterClient} The provided {@link Timer} instance will not be shut down when
+         * shutting down the client resources. You have to take care of that. This is an advanced configuration that should only
+         * be used if you know what you are doing.
+         *
+         * @param timer the shared {@link Timer}, must not be {@literal null}.
+         * @return {@code this} {@link Builder}.
+         * @since 4.3
+         */
+        Builder timer(Timer timer);
+
+        /**
+         * Sets the {@link Tracing} instance to trace Redis calls.
+         *
+         * @param tracing the tracer infrastructure instance, must not be {@literal null}.
+         * @return this
+         * @since 5.1
+         */
+        Builder tracing(Tracing tracing);
+
+        /**
+         * @return a new instance of {@link DefaultClientResources}.
+         */
+        ClientResources build();
+    }
+
+    /**
+     * Returns a builder to create new {@link ClientResources} whose settings are replicated from the current
+     * {@link ClientResources}.
+     *
+     * @return a a {@link ClientResources.Builder} to create new {@link ClientResources} whose settings are replicated from the
+     *         current {@link ClientResources}
+     *
+     * @since 5.1
+     */
+    Builder mutate();
+
     /**
      * Shutdown the {@link ClientResources}.
      *
diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index f0f38cf1b0..adafbb68c7 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -20,8 +20,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import io.lettuce.core.tracing.TracerProvider;
-import io.lettuce.core.tracing.Tracing;
 import reactor.core.scheduler.Schedulers;
 import io.lettuce.core.event.DefaultEventBus;
 import io.lettuce.core.event.DefaultEventPublisherOptions;
@@ -36,6 +34,8 @@
 import io.lettuce.core.metrics.DefaultCommandLatencyCollector;
 import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
 import io.lettuce.core.resource.Delay.StatefulDelay;
+import io.lettuce.core.tracing.TracerProvider;
+import io.lettuce.core.tracing.Tracing;
 import io.netty.util.HashedWheelTimer;
 import io.netty.util.Timer;
 import io.netty.util.concurrent.*;
@@ -125,10 +125,14 @@ public class DefaultClientResources implements ClientResources {
     private final NettyCustomizer nettyCustomizer;
     private final Tracing tracing;
 
+    private final Builder builder;
+
     private volatile boolean shutdownCalled = false;
 
     protected DefaultClientResources(Builder builder) {
 
+        this.builder = builder;
+
         if (builder.eventLoopGroupProvider == null) {
             int ioThreadPoolSize = builder.ioThreadPoolSize;
 
@@ -180,14 +184,14 @@ protected DefaultClientResources(Builder builder) {
         if (builder.commandLatencyCollector == null) {
             if (DefaultCommandLatencyCollector.isAvailable()) {
                 if (builder.commandLatencyCollectorOptions != null) {
-                    commandLatencyCollector = new DefaultCommandLatencyCollector(builder.commandLatencyCollectorOptions);
+                    commandLatencyCollector = CommandLatencyCollector.create(builder.commandLatencyCollectorOptions);
                 } else {
-                    commandLatencyCollector = new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create());
+                    commandLatencyCollector = CommandLatencyCollector.create(CommandLatencyCollectorOptions.create());
                 }
             } else {
                 logger.debug("LatencyUtils/HdrUtils are not available, metrics are disabled");
-                builder.commandLatencyCollectorOptions = DefaultCommandLatencyCollectorOptions.disabled();
-                commandLatencyCollector = DefaultCommandLatencyCollector.disabled();
+                builder.commandLatencyCollectorOptions = CommandLatencyCollectorOptions.disabled();
+                commandLatencyCollector = CommandLatencyCollector.disabled();
             }
 
             sharedCommandLatencyCollector = false;
@@ -217,27 +221,27 @@ protected DefaultClientResources(Builder builder) {
     }
 
     /**
-     * Returns a new {@link DefaultClientResources.Builder} to construct {@link DefaultClientResources}.
+     * Create a new {@link DefaultClientResources} using default settings.
      *
-     * @return a new {@link DefaultClientResources.Builder} to construct {@link DefaultClientResources}.
+     * @return a new instance of a default client resources.
      */
-    public static DefaultClientResources.Builder builder() {
-        return new DefaultClientResources.Builder();
+    public static DefaultClientResources create() {
+        return builder().build();
     }
 
     /**
-     * Create a new {@link DefaultClientResources} using default settings.
+     * Returns a new {@link DefaultClientResources.Builder} to construct {@link DefaultClientResources}.
      *
-     * @return a new instance of a default client resources.
+     * @return a new {@link DefaultClientResources.Builder} to construct {@link DefaultClientResources}.
      */
-    public static DefaultClientResources create() {
-        return builder().build();
+    public static DefaultClientResources.Builder builder() {
+        return new DefaultClientResources.Builder();
     }
 
     /**
      * Builder for {@link DefaultClientResources}.
      */
-    public static class Builder {
+    public static class Builder implements ClientResources.Builder {
 
         private int ioThreadPoolSize = DEFAULT_IO_THREADS;
         private int computationThreadPoolSize = DEFAULT_COMPUTATION_THREADS;
@@ -263,6 +267,7 @@ private Builder() {
          * @param ioThreadPoolSize the thread pool size, must be greater {@code 0}.
          * @return {@code this} {@link Builder}.
          */
+        @Override
         public Builder ioThreadPoolSize(int ioThreadPoolSize) {
 
             LettuceAssert.isTrue(ioThreadPoolSize > 0, "I/O thread pool size must be greater zero");
@@ -280,6 +285,7 @@ public Builder ioThreadPoolSize(int ioThreadPoolSize) {
          * @param eventLoopGroupProvider the shared eventLoopGroupProvider, must not be {@literal null}.
          * @return {@code this} {@link Builder}.
          */
+        @Override
         public Builder eventLoopGroupProvider(EventLoopGroupProvider eventLoopGroupProvider) {
 
             LettuceAssert.notNull(eventLoopGroupProvider, "EventLoopGroupProvider must not be null");
@@ -295,6 +301,7 @@ public Builder eventLoopGroupProvider(EventLoopGroupProvider eventLoopGroupProvi
          * @param computationThreadPoolSize the thread pool size, must be greater {@code 0}.
          * @return {@code this} {@link Builder}.
          */
+        @Override
         public Builder computationThreadPoolSize(int computationThreadPoolSize) {
 
             LettuceAssert.isTrue(computationThreadPoolSize > 0, "Computation thread pool size must be greater zero");
@@ -312,6 +319,7 @@ public Builder computationThreadPoolSize(int computationThreadPoolSize) {
          * @param eventExecutorGroup the shared eventExecutorGroup, must not be {@literal null}.
          * @return {@code this} {@link Builder}.
          */
+        @Override
         public Builder eventExecutorGroup(EventExecutorGroup eventExecutorGroup) {
 
             LettuceAssert.notNull(eventExecutorGroup, "EventExecutorGroup must not be null");
@@ -330,6 +338,7 @@ public Builder eventExecutorGroup(EventExecutorGroup eventExecutorGroup) {
          * @return {@code this} {@link Builder}.
          * @since 4.3
          */
+        @Override
         public Builder timer(Timer timer) {
 
             LettuceAssert.notNull(timer, "Timer must not be null");
@@ -344,6 +353,7 @@ public Builder timer(Timer timer) {
          * @param eventBus the event bus, must not be {@literal null}.
          * @return {@code this} {@link Builder}.
          */
+        @Override
         public Builder eventBus(EventBus eventBus) {
 
             LettuceAssert.notNull(eventBus, "EventBus must not be null");
@@ -359,6 +369,7 @@ public Builder eventBus(EventBus eventBus) {
          *        {@link EventBus}, must not be {@literal null}.
          * @return {@code this} {@link Builder}.
          */
+        @Override
         public Builder commandLatencyPublisherOptions(EventPublisherOptions commandLatencyPublisherOptions) {
 
             LettuceAssert.notNull(commandLatencyPublisherOptions, "EventPublisherOptions must not be null");
@@ -374,6 +385,7 @@ public Builder commandLatencyPublisherOptions(EventPublisherOptions commandLaten
          * @param commandLatencyCollectorOptions the command latency collector options, must not be {@link null}.
          * @return {@code this} {@link Builder}.
          */
+        @Override
         public Builder commandLatencyCollectorOptions(CommandLatencyCollectorOptions commandLatencyCollectorOptions) {
 
             LettuceAssert.notNull(commandLatencyCollectorOptions, "CommandLatencyCollectorOptions must not be null");
@@ -388,6 +400,7 @@ public Builder commandLatencyCollectorOptions(CommandLatencyCollectorOptions com
          * @param commandLatencyCollector the command latency collector, must not be {@literal null}.
          * @return {@code this} {@link Builder}.
          */
+        @Override
         public Builder commandLatencyCollector(CommandLatencyCollector commandLatencyCollector) {
 
             LettuceAssert.notNull(commandLatencyCollector, "CommandLatencyCollector must not be null");
@@ -404,6 +417,7 @@ public Builder commandLatencyCollector(CommandLatencyCollector commandLatencyCol
          * @return {@code this} {@link Builder}.
          * @since 4.3
          */
+        @Override
         public Builder dnsResolver(DnsResolver dnsResolver) {
 
             LettuceAssert.notNull(dnsResolver, "DnsResolver must not be null");
@@ -420,6 +434,7 @@ public Builder dnsResolver(DnsResolver dnsResolver) {
          * @return this
          * @since 4.3
          */
+        @Override
         public Builder reconnectDelay(Delay reconnectDelay) {
 
             LettuceAssert.notNull(reconnectDelay, "Delay must not be null");
@@ -436,6 +451,7 @@ public Builder reconnectDelay(Delay reconnectDelay) {
          * @return this
          * @since 4.3
          */
+        @Override
         public Builder reconnectDelay(Supplier<Delay> reconnectDelay) {
 
             LettuceAssert.notNull(reconnectDelay, "Delay must not be null");
@@ -451,6 +467,7 @@ public Builder reconnectDelay(Supplier<Delay> reconnectDelay) {
          * @return this
          * @since 4.4
          */
+        @Override
         public Builder nettyCustomizer(NettyCustomizer nettyCustomizer) {
 
             LettuceAssert.notNull(nettyCustomizer, "NettyCustomizer must not be null");
@@ -466,6 +483,7 @@ public Builder nettyCustomizer(NettyCustomizer nettyCustomizer) {
          * @return this
          * @since 5.1
          */
+        @Override
         public Builder tracing(Tracing tracing) {
 
             LettuceAssert.notNull(tracing, "Tracing must not be null");
@@ -478,11 +496,26 @@ public Builder tracing(Tracing tracing) {
          *
          * @return a new instance of {@link DefaultClientResources}.
          */
+        @Override
         public DefaultClientResources build() {
             return new DefaultClientResources(this);
         }
     }
 
+    /**
+     * Returns a builder to create new {@link DefaultClientResources} whose settings are replicated from the current
+     * {@link DefaultClientResources}.
+     *
+     * @return a {@link DefaultClientResources.Builder} to create new {@link DefaultClientResources} whose settings are
+     *         replicated from the current {@link DefaultClientResources}.
+     *
+     * @since 5.1
+     */
+    @Override
+    public DefaultClientResources.Builder mutate() {
+        return this.builder;
+    }
+
     @Override
     protected void finalize() throws Throwable {
         if (!shutdownCalled) {
diff --git a/src/main/java/io/lettuce/core/resource/DnsResolver.java b/src/main/java/io/lettuce/core/resource/DnsResolver.java
index 83dbcde453..c7f168eb58 100644
--- a/src/main/java/io/lettuce/core/resource/DnsResolver.java
+++ b/src/main/java/io/lettuce/core/resource/DnsResolver.java
@@ -26,6 +26,25 @@
  */
 public interface DnsResolver {
 
+    /**
+     * Java VM default resolver.
+     *
+     * @since 5.1
+     */
+    static DnsResolver jvmDefault() {
+        return DnsResolvers.JVM_DEFAULT;
+    }
+
+    /**
+     * Non-resolving {@link DnsResolver}. Returns an empty {@link InetAddress} to indicate an unresolved address.
+     *
+     * @since 5.1
+     * @see java.net.InetSocketAddress#createUnresolved(String, int)
+     */
+    static DnsResolver unresolved() {
+        return DnsResolvers.UNRESOLVED;
+    }
+
     /**
      * Returns the IP address for the specified host name.
      *
diff --git a/src/main/java/io/lettuce/core/resource/NettyCustomizer.java b/src/main/java/io/lettuce/core/resource/NettyCustomizer.java
index efc8ec7876..c79385f179 100644
--- a/src/main/java/io/lettuce/core/resource/NettyCustomizer.java
+++ b/src/main/java/io/lettuce/core/resource/NettyCustomizer.java
@@ -39,7 +39,8 @@ public interface NettyCustomizer {
      *
      * @param bootstrap must not be {@literal null}.
      */
-    void afterBootstrapInitialized(Bootstrap bootstrap);
+    default void afterBootstrapInitialized(Bootstrap bootstrap) {
+    }
 
     /**
      * Hook invoked each time the driver initializes the channel. This hook is called after the driver has registered all its
@@ -47,5 +48,6 @@ public interface NettyCustomizer {
      *
      * @param channel must not be {@literal null}.
      */
-    void afterChannelInitialized(Channel channel);
+    default void afterChannelInitialized(Channel channel) {
+    }
 }
diff --git a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java
index 3e180a78c7..6967fa41fb 100644
--- a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java
@@ -85,7 +85,7 @@ public void testBuilder() throws Exception {
     }
 
     @Test
-    public void testDnsResolver() throws Exception {
+    public void testDnsResolver() {
 
         DirContextDnsResolver dirContextDnsResolver = new DirContextDnsResolver("8.8.8.8");
 
@@ -106,9 +106,7 @@ public void testProvidedResources() throws Exception {
 
         DefaultClientResources sut = DefaultClientResources.builder().eventExecutorGroup(executorMock)
                 .eventLoopGroupProvider(groupProviderMock).timer(timerMock).eventBus(eventBusMock)
-                .commandLatencyCollector(latencyCollectorMock)
-                .nettyCustomizer(nettyCustomizer)
-                .build();
+                .commandLatencyCollector(latencyCollectorMock).nettyCustomizer(nettyCustomizer).build();
 
         assertThat(sut.eventExecutorGroup()).isSameAs(executorMock);
         assertThat(sut.eventLoopGroupProvider()).isSameAs(groupProviderMock);
@@ -125,6 +123,35 @@ public void testProvidedResources() throws Exception {
         verifyNoMoreInteractions(latencyCollectorMock);
     }
 
+    @Test
+    public void mutateResources() throws Exception {
+
+        EventExecutorGroup executorMock = mock(EventExecutorGroup.class);
+        EventLoopGroupProvider groupProviderMock = mock(EventLoopGroupProvider.class);
+        Timer timerMock = mock(Timer.class);
+        Timer timerMock2 = mock(Timer.class);
+        EventBus eventBusMock = mock(EventBus.class);
+        CommandLatencyCollector latencyCollectorMock = mock(CommandLatencyCollector.class);
+
+        ClientResources sut = ClientResources.builder().eventExecutorGroup(executorMock)
+                .eventLoopGroupProvider(groupProviderMock).timer(timerMock).eventBus(eventBusMock)
+                .commandLatencyCollector(latencyCollectorMock).build();
+
+        ClientResources copy = sut.mutate().timer(timerMock2).build();
+
+        assertThat(sut.eventExecutorGroup()).isSameAs(executorMock);
+        assertThat(sut.eventLoopGroupProvider()).isSameAs(groupProviderMock);
+        assertThat(sut.timer()).isSameAs(timerMock);
+        assertThat(copy.timer()).isSameAs(timerMock2).isNotSameAs(timerMock);
+        assertThat(sut.eventBus()).isSameAs(eventBusMock);
+
+        assertThat(sut.shutdown().get()).isTrue();
+
+        verifyZeroInteractions(executorMock);
+        verifyZeroInteractions(groupProviderMock);
+        verifyZeroInteractions(timerMock);
+    }
+
     @Test
     public void testSmallPoolSize() throws Exception {
 
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
index bfea25732b..56863b8245 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
@@ -52,6 +52,11 @@ public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUni
         return new SucceededFuture<>(GlobalEventExecutor.INSTANCE, true);
     }
 
+    @Override
+    public Builder mutate() {
+        return null;
+    }
+
     @Override
     public EventLoopGroupProvider eventLoopGroupProvider() {
         return null;

From 2fc8d833bbd04f720c102578b29425c84cd2f68c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 11 Jun 2018 11:14:50 +0200
Subject: [PATCH 469/808] Polishing

Improve test stability
---
 .../io/lettuce/core/BraveTracingTest.java     | 30 +++++--------------
 .../core/commands/StreamCommandTest.java      |  4 +--
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/test/java/io/lettuce/core/BraveTracingTest.java b/src/test/java/io/lettuce/core/BraveTracingTest.java
index 5edec575db..33cc21a3b2 100644
--- a/src/test/java/io/lettuce/core/BraveTracingTest.java
+++ b/src/test/java/io/lettuce/core/BraveTracingTest.java
@@ -18,7 +18,7 @@
 import static io.lettuce.core.AbstractRedisClientTest.client;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -31,7 +31,6 @@
 
 import reactor.test.StepVerifier;
 import zipkin2.Span;
-import zipkin2.storage.InMemoryStorage;
 import brave.ScopedSpan;
 import brave.Tracer;
 import brave.Tracing;
@@ -49,17 +48,13 @@ public class BraveTracingTest extends AbstractTest {
 
     private static ClientResources clientResources;
     private static Tracing clientTracing;
-    private static InMemoryStorage storage = InMemoryStorage.newBuilder().build();
     private static Queue<Span> spans = new LinkedBlockingQueue<>();
 
     @BeforeClass
     public static void beforeClass() {
 
         clientTracing = Tracing.newBuilder().localServiceName("client")
-                .currentTraceContext(CurrentTraceContext.Default.create()).spanReporter(s -> {
-                    storage.spanConsumer().accept(Collections.singletonList(s));
-                    spans.add(s);
-                }).build();
+                .currentTraceContext(CurrentTraceContext.Default.create()).spanReporter(spans::add).build();
 
         clientResources = DefaultClientResources.builder().tracing(BraveTracing.create(clientTracing.tracer())).build();
 
@@ -75,7 +70,6 @@ public void before() {
         }
 
         spans.clear();
-        storage.clear();
     }
 
     @AfterClass
@@ -95,9 +89,7 @@ public void pingWithTrace() {
 
         foo.finish();
 
-        assertThat(storage.getTraces()).isNotEmpty();
-
-        List<Span> spans = storage.getTraces().get(0);
+        List<Span> spans = new ArrayList<>(BraveTracingTest.spans);
 
         assertThat(spans.get(0).name()).isEqualTo("ping");
         assertThat(spans.get(1).name()).isEqualTo("foo");
@@ -117,9 +109,7 @@ public void pingWithTraceShouldCatchErrors() {
 
         foo.finish();
 
-        assertThat(storage.getTraces()).isNotEmpty();
-
-        List<Span> spans = storage.getTraces().get(0);
+        List<Span> spans = new ArrayList<>(BraveTracingTest.spans);
 
         assertThat(spans.get(0).name()).isEqualTo("set");
         assertThat(spans.get(1).name()).isEqualTo("hgetall");
@@ -150,9 +140,7 @@ public void reactivePingWithTrace() {
 
         trace.finish();
 
-        assertThat(storage.getTraces()).isNotEmpty();
-
-        List<Span> spans = storage.getTraces().get(0);
+        List<Span> spans = new ArrayList<>(BraveTracingTest.spans);
 
         assertThat(spans.get(0).name()).isEqualTo("ping");
         assertThat(spans.get(1).name()).isEqualTo("foo");
@@ -172,9 +160,7 @@ public void reactiveGetAndSetWithTrace() {
 
         trace.finish();
 
-        assertThat(storage.getTraces()).isNotEmpty();
-
-        List<Span> spans = storage.getTraces().get(0);
+        List<Span> spans = new ArrayList<>(BraveTracingTest.spans);
 
         assertThat(spans.get(0).name()).isEqualTo("set");
         assertThat(spans.get(1).name()).isEqualTo("get");
@@ -198,9 +184,7 @@ public void reactiveGetAndSetWithTraceProvider() {
 
         trace.finish();
 
-        assertThat(storage.getTraces()).isNotEmpty();
-
-        List<Span> spans = storage.getTraces().get(0);
+        List<Span> spans = new ArrayList<>(BraveTracingTest.spans);
 
         assertThat(spans.get(0).name()).isEqualTo("set");
         assertThat(spans.get(1).name()).isEqualTo("get");
diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandTest.java b/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
index 6581783f10..a562e1f3b2 100644
--- a/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
@@ -92,13 +92,13 @@ public void xtrim() {
             ids.add(redis.xadd(key, Collections.singletonMap("key", "value")));
         }
         redis.xdel(key, ids.get(0), ids.get(2));
-        assertThat(redis.xlen(key)).isEqualTo(10);
+        assertThat(redis.xlen(key)).isBetween(8L, 10L);
 
         Long xtrim = redis.xtrim(key, 8);
 
         assertThat(xtrim).isEqualTo(2);
 
-        assertThat(redis.xlen(key)).isEqualTo(8);
+        assertThat(redis.xlen(key)).isLessThanOrEqualTo(10);
     }
 
     @Test

From 2c3d4aa55818200b218b9ffdc30c19edce310e6b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 11 Jun 2018 11:31:46 +0200
Subject: [PATCH 470/808] Encode ScanArgs.matches using UTF-8 #792

Lettuce now uses UTF-8 encoding to encode the matches string to bytes. Previously, we used ASCII which is more limiting when using non-ascii chars.
---
 src/main/java/io/lettuce/core/ScanArgs.java   |  6 ++-
 .../java/io/lettuce/core/ScanArgsTest.java    | 40 +++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/io/lettuce/core/ScanArgsTest.java

diff --git a/src/main/java/io/lettuce/core/ScanArgs.java b/src/main/java/io/lettuce/core/ScanArgs.java
index d0628808f2..0e60551043 100644
--- a/src/main/java/io/lettuce/core/ScanArgs.java
+++ b/src/main/java/io/lettuce/core/ScanArgs.java
@@ -18,6 +18,10 @@
 import static io.lettuce.core.protocol.CommandKeyword.COUNT;
 import static io.lettuce.core.protocol.CommandKeyword.MATCH;
 
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.CommandArgs;
 
@@ -99,7 +103,7 @@ public ScanArgs limit(long count) {
     public <K, V> void build(CommandArgs<K, V> args) {
 
         if (match != null) {
-            args.add(MATCH).add(match);
+            args.add(MATCH).add(match.getBytes(StandardCharsets.UTF_8));
         }
 
         if (count != null) {
diff --git a/src/test/java/io/lettuce/core/ScanArgsTest.java b/src/test/java/io/lettuce/core/ScanArgsTest.java
new file mode 100644
index 0000000000..d398542813
--- /dev/null
+++ b/src/test/java/io/lettuce/core/ScanArgsTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.protocol.CommandArgs;
+
+/**
+ * @author Mark Paluch
+ */
+public class ScanArgsTest {
+
+    @Test
+    public void shouldEncodeMatchUsingUtf8() {
+
+        ScanArgs args = ScanArgs.Builder.matches("ö");
+
+        CommandArgs<String, String> commandArgs = new CommandArgs<>(StringCodec.UTF8);
+        args.build(commandArgs);
+
+        assertThat(commandArgs.toCommandString()).isEqualTo("MATCH w7Y=");
+    }
+}

From e6e3bab0350eb02dca834eb34bde17759355de8c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 11 Jun 2018 13:33:18 +0200
Subject: [PATCH 471/808] Polishing

Improve test stability
---
 .../io/lettuce/core/BraveTracingTest.java     | 11 ++++++++
 src/test/java/io/lettuce/core/ClientTest.java |  2 ++
 .../lettuce/core/ConnectionCommandTest.java   | 27 ++++++++++---------
 .../core/commands/StreamCommandTest.java      |  2 +-
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/test/java/io/lettuce/core/BraveTracingTest.java b/src/test/java/io/lettuce/core/BraveTracingTest.java
index 33cc21a3b2..d899956a9c 100644
--- a/src/test/java/io/lettuce/core/BraveTracingTest.java
+++ b/src/test/java/io/lettuce/core/BraveTracingTest.java
@@ -36,6 +36,7 @@
 import brave.Tracing;
 import brave.propagation.CurrentTraceContext;
 import brave.propagation.TraceContext;
+import io.lettuce.Wait;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
@@ -86,6 +87,7 @@ public void pingWithTrace() {
 
         StatefulRedisConnection<String, String> connect = client.connect();
         connect.sync().ping();
+        Wait.untilNotEquals(true, spans::isEmpty).waitOrTimeout();
 
         foo.finish();
 
@@ -107,6 +109,8 @@ public void pingWithTraceShouldCatchErrors() {
         } catch (Exception e) {
         }
 
+        Wait.untilEquals(2, spans::size).waitOrTimeout();
+
         foo.finish();
 
         List<Span> spans = new ArrayList<>(BraveTracingTest.spans);
@@ -124,6 +128,7 @@ public void reactivePing() {
         StatefulRedisConnection<String, String> connect = client.connect();
         connect.reactive().ping().as(StepVerifier::create).expectNext("PONG").verifyComplete();
 
+        Wait.untilNotEquals(true, spans::isEmpty).waitOrTimeout();
         assertThat(spans).isNotEmpty();
     }
 
@@ -138,6 +143,8 @@ public void reactivePingWithTrace() {
                 .as(StepVerifier::create) //
                 .expectNext("PONG").verifyComplete();
 
+        Wait.untilNotEquals(true, spans::isEmpty).waitOrTimeout();
+
         trace.finish();
 
         List<Span> spans = new ArrayList<>(BraveTracingTest.spans);
@@ -158,6 +165,8 @@ public void reactiveGetAndSetWithTrace() {
                 .as(StepVerifier::create) //
                 .expectNext("bar").verifyComplete();
 
+        Wait.untilEquals(2, spans::size).waitOrTimeout();
+
         trace.finish();
 
         List<Span> spans = new ArrayList<>(BraveTracingTest.spans);
@@ -182,6 +191,8 @@ public void reactiveGetAndSetWithTraceProvider() {
                 .as(StepVerifier::create) //
                 .expectNext("bar").verifyComplete();
 
+        Wait.untilEquals(2, spans::size).waitOrTimeout();
+
         trace.finish();
 
         List<Span> spans = new ArrayList<>(BraveTracingTest.spans);
diff --git a/src/test/java/io/lettuce/core/ClientTest.java b/src/test/java/io/lettuce/core/ClientTest.java
index 18721b5912..84cb8b6758 100644
--- a/src/test/java/io/lettuce/core/ClientTest.java
+++ b/src/test/java/io/lettuce/core/ClientTest.java
@@ -190,6 +190,7 @@ public void standaloneConnectionShouldSetClientName() throws Exception {
 
         connection.sync().quit();
         Thread.sleep(100);
+        Wait.untilTrue(connection::isOpen).waitOrTimeout();
 
         assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
 
@@ -208,6 +209,7 @@ public void pubSubConnectionShouldSetClientName() throws Exception {
 
         connection.sync().quit();
         Thread.sleep(100);
+        Wait.untilTrue(connection::isOpen).waitOrTimeout();
 
         assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
 
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandTest.java b/src/test/java/io/lettuce/core/ConnectionCommandTest.java
index 5be2157a39..0c0442c041 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandTest.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandTest.java
@@ -18,6 +18,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
+import com.google.code.tempusfugit.temporal.WaitFor;
+import io.lettuce.Wait;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
@@ -34,7 +36,7 @@
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ConnectionCommandTest extends AbstractRedisClientTest {
     @Test
-    public void auth() throws Exception {
+    public void auth()  {
         new WithPasswordRequired() {
             @Override
             public void run(RedisClient client) {
@@ -58,34 +60,34 @@ public void run(RedisClient client) {
     }
 
     @Test
-    public void echo() throws Exception {
+    public void echo()  {
         assertThat(redis.echo("hello")).isEqualTo("hello");
     }
 
     @Test
-    public void ping() throws Exception {
+    public void ping()  {
         assertThat(redis.ping()).isEqualTo("PONG");
     }
 
     @Test
-    public void select() throws Exception {
+    public void select()  {
         redis.set(key, value);
         assertThat(redis.select(1)).isEqualTo("OK");
         assertThat(redis.get(key)).isNull();
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void authNull() throws Exception {
+    public void authNull()  {
         redis.auth(null);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void authEmpty() throws Exception {
+    public void authEmpty()  {
         redis.auth("");
     }
 
     @Test
-    public void authReconnect() throws Exception {
+    public void authReconnect()  {
         new WithPasswordRequired() {
             @Override
             public void run(RedisClient client) throws InterruptedException {
@@ -102,7 +104,7 @@ public void run(RedisClient client) throws InterruptedException {
     }
 
     @Test
-    public void selectReconnect() throws Exception {
+    public void selectReconnect()  {
         redis.select(1);
         redis.set(key, value);
         redis.quit();
@@ -110,15 +112,16 @@ public void selectReconnect() throws Exception {
     }
 
     @Test
-    public void getSetReconnect() throws Exception {
+    public void getSetReconnect(){
         redis.set(key, value);
         redis.quit();
+        Wait.untilTrue(redis::isOpen).waitOrTimeout();
         assertThat(redis.get(key)).isEqualTo(value);
     }
 
     @Test
     @SuppressWarnings("unchecked")
-    public void authInvalidPassword() throws Exception {
+    public void authInvalidPassword()  {
         RedisAsyncCommands<String, String> async = client.connect().async();
         try {
             async.auth("invalid");
@@ -134,7 +137,7 @@ public void authInvalidPassword() throws Exception {
 
     @Test
     @SuppressWarnings("unchecked")
-    public void selectInvalid() throws Exception {
+    public void selectInvalid()  {
         RedisAsyncCommands<String, String> async = client.connect().async();
         try {
             async.select(1024);
@@ -149,7 +152,7 @@ public void selectInvalid() throws Exception {
     }
 
     @Test
-    public void testDoubleToString() throws Exception {
+    public void testDoubleToString()  {
 
         assertThat(LettuceStrings.string(1.1)).isEqualTo("1.1");
         assertThat(LettuceStrings.string(Double.POSITIVE_INFINITY)).isEqualTo("+inf");
diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandTest.java b/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
index a562e1f3b2..26491272f2 100644
--- a/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
@@ -96,7 +96,7 @@ public void xtrim() {
 
         Long xtrim = redis.xtrim(key, 8);
 
-        assertThat(xtrim).isEqualTo(2);
+        assertThat(xtrim).isNotZero();
 
         assertThat(redis.xlen(key)).isLessThanOrEqualTo(10);
     }

From 6e55e863ebc5dbd6b0468d5e5cc145fda7c867bd Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 11 Jun 2018 13:38:17 +0200
Subject: [PATCH 472/808] Upgrade to AssertJ 3.10.0 #794

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4e16966fa2..128e746e58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -322,7 +322,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.9.1</version>
+            <version>3.10.0</version>
             <scope>test</scope>
         </dependency>
 

From 2bf0042b230efb2fd3ba0d240eb4c4ed7c544da3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 14 Jun 2018 14:11:49 +0200
Subject: [PATCH 473/808] Fix Delay.exponential() Javadoc #799

---
 src/main/java/io/lettuce/core/resource/Delay.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/resource/Delay.java b/src/main/java/io/lettuce/core/resource/Delay.java
index 239310c4a6..7217d6585d 100644
--- a/src/main/java/io/lettuce/core/resource/Delay.java
+++ b/src/main/java/io/lettuce/core/resource/Delay.java
@@ -107,7 +107,7 @@ public static Delay constant(int delay, TimeUnit timeUnit) {
 
     /**
      * Creates a new {@link ExponentialDelay} with default boundaries and factor (1, 2, 4, 8, 16, 32...). The delay begins with
-     * 1 and is capped at 30 milliseconds after reaching the 16th attempt.
+     * 1 and is capped at 30 {@link TimeUnit#SECONDS} after reaching the 16th attempt.
      *
      * @return a created {@link ExponentialDelay}.
      */

From 86f80da6536359dae2bf097defe401cb5d1903b7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 15 Jun 2018 08:53:23 +0200
Subject: [PATCH 474/808] Improve readme and contribution guidelines.

Add issue templates and improve contribution guidance.
---
 .github/CONTRIBUTING.md                    | 45 +++++++++++++++++++---
 .github/ISSUE_TEMPLATE.md                  | 16 --------
 .github/ISSUE_TEMPLATE/Bug_report.md       | 37 ++++++++++++++++++
 .github/ISSUE_TEMPLATE/Feature_request.md  | 25 ++++++++++++
 .github/ISSUE_TEMPLATE/Help_us.md          | 15 ++++++++
 .github/ISSUE_TEMPLATE/Support_question.md | 18 +++++++++
 .github/PULL_REQUEST_TEMPLATE.md           |  6 +--
 README.md                                  |  6 +--
 8 files changed, 140 insertions(+), 28 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/ISSUE_TEMPLATE/Bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/Feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/Help_us.md
 create mode 100644 .github/ISSUE_TEMPLATE/Support_question.md

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index e1b11de6e6..1d3a5ec364 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,21 +1,54 @@
-# Contributing to lettuce
+# Contributing to Lettuce
 
-If you would like to contribute code you can do so through GitHub by forking the repository and sending a pull request.
+## Quickstart
+ 
+ For the impatient, if you want to submit a quick pull request:
+
+* Make sure there is a ticket in GitHub issues.
+* Make sure you use the code formatters provided here and have them applied to your changes. Don’t submit any formatting related changes.
+* Make sure you submit test cases (unit or integration tests) that back your changes.
+* Try to reuse existing test sample code (domain classes). Try not to amend existing test cases but create new ones dedicated to the changes you’re making to the codebase. Try to test as locally as possible but potentially also add integration tests.
 
 When submitting code, please make every effort to follow existing conventions and style in order to keep the code as readable as possible.
-Formatting settings are provided for Eclipse in https://github.com/mp911de/lettuce/blob/master/formatting.xml
+Formatting settings are provided for Eclipse in https://github.com/lettuce-io/lettuce-core/blob/master/formatting.xml
 
 ## Bugreports
 
 If you report a bug, please ensure to specify the following:
 
-* lettuce version (e.g. 3.2.Final)
-* Contextual information (what were you trying to do using lettuce)
+* Check GitHub issues whether someone else already filed a ticket. If not, then feel free to create another one.
+* Comments on closed tickets are typically a bad idea as there's little attention on closed tickets. Please create a new one.
+* Lettuce version (e.g. 3.2.Final)
+* Contextual information (what were you trying to do using Lettuce)
 * Simplest possible steps to reproduce
    * JUnit tests to reproduce are great but not obligatory
 
+## Features
+
+If you want to request a feature, please ensure to specify the following:
+
+* What do you want to achieve?
+* Contextual information (what were you trying to do using Lettuce).
+* Ideally, but not required: Describe your idea how you would implement it.
+
+## Questions
+
+If you have a question, then check one of the following places first. Typically, forums, chats, and mailing lists are the best place to ask your question as you can expect to get an answer faster there:
+
+**Checkout the docs**
+
+* [Reference documentation](https://lettuce.io/docs/)
+* [Wiki](https://github.com/lettuce-io/lettuce-core/wiki)
+* [Javadoc](https://lettuce.io/core/release/api/)
+
+**Communication**
+
+* Google Group: [lettuce-redis-client-users](https://groups.google.com/d/forum/lettuce-redis-client-users) or [lettuce-redis-client-users@googlegroups.com](mailto:lettuce-redis-client-users@googlegroups.com)
+* StackOverflow: [Questions about Lettuce](https://stackoverflow.com/questions/tagged/lettuce)
+* [![Join the chat at https://gitter.im/lettuce-io/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lettuce-io/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 ## License
 
 By contributing your code, you agree to license your contribution under the terms of [Apache License 2.0] (http://www.apache.org/licenses/LICENSE-2.0).
 
-All files are released with the Apache 2.0 license.
\ No newline at end of file
+All files are released with the Apache 2.0 license.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 3ad4440d1a..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-Thank you for creating an issue. This template will guide you through the essential steps necessary to create an amazing issue.
-
-## Logs
-Please use Gist (https://gist.github.com/) or a similar code paster for longer
-logs.
--->
-Make sure that:
-
-- [ ] You have read the [contribution guidelines](https://github.com/mp911de/lettuce/blob/master/.github/CONTRIBUTING.md).
-- [ ] You specify the lettuce version and environment so it's obvious which version is affected
-- [ ] You provide a reproducible test case (either descriptive of as JUnit test) if it's a bug or the expected behavior differs from the actual behavior.
-
- <!--
-Great! Live long and prosper.
--->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
new file mode 100644
index 0000000000..01d3e66ce9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -0,0 +1,37 @@
+---
+name: 🐛 Bug Report
+about: If something isn't working as expected 🤔.
+---
+
+## Bug Report
+
+<!-- First of all: Have you checked the docs https://github.com/lettuce-io/lettuce-core/wiki, GitHub issues, or StackOverflow whether someone else has already reported your issue? -->
+
+#### Current Behavior
+
+A clear and concise description of the behavior.
+
+#### Input Code
+
+- Java/Kotlin/Scala/Groovy/… or Repo link if applicable:
+
+```java
+// your code here;
+```
+
+#### Expected behavior/code
+
+A clear and concise description of what you expected to happen (or code).
+
+#### Environment
+
+- Lettuce version(s): [e.g. 5.0.0.RELEASE, 4.2.2.Final]
+- Redis version: [e.g. 4.0.9]
+
+#### Possible Solution
+
+<!--- Only if you have suggestions on a fix for the bug -->
+
+#### Additional context
+
+Add any other context about the problem here. Do not add code as screenshots.
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 0000000000..35044fec5e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,25 @@
+---
+name: 🚀 Feature Request
+about: I have a suggestion (and may want to implement it 🙂)!
+---
+
+## Feature Request
+
+<!-- First of all: Have you checked the docs https://github.com/lettuce-io/lettuce-core/wiki, GitHub issues, or StackOverflow whether someone else has already reported your issue? Maybe the feature already exists?-->
+
+#### Is your feature request related to a problem? Please describe
+
+A clear and concise description of what the problem is. Ex. I have an issue when [...]
+
+#### Describe the solution you'd like
+
+A clear and concise description of what you want to happen. Add any considered drawbacks.
+
+#### Describe alternatives you've considered
+
+A clear and concise description of any alternative solutions or features you've considered.
+
+#### Teachability, Documentation, Adoption, Migration Strategy
+
+If you can, explain how users will be able to use this and possibly write out a version the docs.
+Maybe a screenshot or design?
diff --git a/.github/ISSUE_TEMPLATE/Help_us.md b/.github/ISSUE_TEMPLATE/Help_us.md
new file mode 100644
index 0000000000..ec438fda1b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Help_us.md
@@ -0,0 +1,15 @@
+---
+name: 🤝 Support us on Lettuce
+about: If you would like to support our efforts in maintaining this community-driven project 🙌!
+
+---
+
+Help support Lettuce!
+
+Lettuce has always been a community project, not really backed or owned by any single (or group) of companies. While some maintainers used to work at companies supporting open source no one was working on it full time and there certainly isn't a huge company or team anywhere doing all this work.
+
+---
+
+As a group of volunteers you can help us in a few ways
+
+- Giving developer time on the project. (Message us on [Twitter](https://twitter.com/LettuceDriver) or [Gitter](https://gitter.im/lettuce-io/Lobby) for guidance). Companies should be paying their employees to contribute back to the open source projects they use everyday.
diff --git a/.github/ISSUE_TEMPLATE/Support_question.md b/.github/ISSUE_TEMPLATE/Support_question.md
new file mode 100644
index 0000000000..cf43c06d07
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Support_question.md
@@ -0,0 +1,18 @@
+---
+name: 🤗 Support Question
+about: If you have a question 💬, please check out Gitter or StackOverflow!
+---
+
+We primarily use GitHub as an issue tracker; for usage and support questions, please check out these resources below. Thanks! 😁.
+
+---
+
+* Reference documentation: https://lettuce.io/docs/
+* Wiki: https://github.com/lettuce-io/lettuce-core/wiki
+* Javadoc: https://lettuce.io/core/release/api/
+* Gitter Chat: https://gitter.im/lettuce-io/Lobby
+* Mailing list https://groups.google.com/d/forum/lettuce-redis-client-users or [lettuce-redis-client-users@googlegroups.com](mailto:lettuce-redis-client-users@googlegroups.com)
+* StackOverflow: https://stackoverflow.com/questions/tagged/lettuce
+* Twitter: If it's just a quick question you can ping our Twitter: https://twitter.com/LettuceDriver
+* Also have a look at the readme for more information on how to get support:
+  https://github.com/lettuce-io/lettuce-core/blob/master/README.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 1d1ad1830a..bad9b46841 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,10 +3,10 @@ Thank you for proposing a pull request. This template will guide you through the
 -->
 Make sure that:
 
-- [ ] You have read the [contribution guidelines](https://github.com/mp911de/lettuce/blob/master/.github/CONTRIBUTING.md).
-- [ ] You use the code formatters provided [here](https://github.com/mp911de/lettuce/blob/master/formatting.xml) and have them applied to your changes. Don’t submit any formatting related changes.
+- [ ] You have read the [contribution guidelines](https://github.com/lettuce-io/lettuce-core/blob/master/.github/CONTRIBUTING.md).
+- [ ] You use the code formatters provided [here](https://github.com/lettuce-io/lettuce-core/blob/master/formatting.xml) and have them applied to your changes. Don’t submit any formatting related changes.
 - [ ] You submit test cases (unit or integration tests) that back your changes.
 
  <!--
 Great! Live long and prosper.
--->
\ No newline at end of file
+-->
diff --git a/README.md b/README.md
index 2574142744..19d49c15e4 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,8 @@ Communication
 
 * Google Group: [lettuce-redis-client-users](https://groups.google.com/d/forum/lettuce-redis-client-users) or lettuce-redis-client-users@googlegroups.com
 * [![Join the chat at https://gitter.im/lettuce-io/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lettuce-io/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-* [Github Issues](https://github.com/lettuce-io/lettuce-core/issues)
+* Twitter: [@LettuceDriver](https://twitter.com/LettuceDriver)
+* [GitHub Issues](https://github.com/lettuce-io/lettuce-core/issues)
 
 
 Documentation
@@ -192,7 +193,7 @@ $ make test
 Bugs and Feedback
 -----------
 
-For bugs, questions and discussions please use the [Github Issues](https://github.com/lettuce-io/lettuce-core/issues).
+For bugs, questions and discussions please use the [GitHub Issues](https://github.com/lettuce-io/lettuce-core/issues).
 
 License
 -------
@@ -205,4 +206,3 @@ Contributing
 
 Github is for social coding: if you want to write code, I encourage contributions through pull requests from forks of this repository. 
 Create Github tickets for bugs and new features and comment on the ones that you are interested in and take a look into [CONTRIBUTING.md](https://github.com/lettuce-io/lettuce-core/blob/master/.github/CONTRIBUTING.md)
-                  
\ No newline at end of file

From 38da5d75cb3bd1f1f03c9b6450664e1ddb1ab804 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 15 Jun 2018 11:48:52 +0200
Subject: [PATCH 475/808] Fix XTRIM test

---
 src/test/java/io/lettuce/core/commands/StreamCommandTest.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandTest.java b/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
index 26491272f2..9c7ef85304 100644
--- a/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
@@ -94,9 +94,7 @@ public void xtrim() {
         redis.xdel(key, ids.get(0), ids.get(2));
         assertThat(redis.xlen(key)).isBetween(8L, 10L);
 
-        Long xtrim = redis.xtrim(key, 8);
-
-        assertThat(xtrim).isNotZero();
+        redis.xtrim(key, 8);
 
         assertThat(redis.xlen(key)).isLessThanOrEqualTo(10);
     }

From 5e6e641c798b64e642a5462a413e39ae6a82e937 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 15 Jun 2018 11:54:33 +0200
Subject: [PATCH 476/808] Polishing #782

Convert empty abstract classes to marker interfaces.
---
 .../java/io/lettuce/core/tracing/BraveTracing.java     |  4 ++--
 .../java/io/lettuce/core/tracing/TraceContext.java     | 10 +++++++---
 .../io/lettuce/core/tracing/TraceContextProvider.java  |  3 +++
 .../java/io/lettuce/core/tracing/TracerProvider.java   |  3 +++
 src/main/java/io/lettuce/core/tracing/Tracing.java     |  6 ++++--
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/lettuce/core/tracing/BraveTracing.java b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
index fc4c3539d9..0746577cdd 100644
--- a/src/main/java/io/lettuce/core/tracing/BraveTracing.java
+++ b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
@@ -219,7 +219,7 @@ public brave.Span getSpan() {
     /**
      * {@link Endpoint} implementation for Zipkin's {@link zipkin2.Endpoint}.
      */
-    public static class BraveEndpoint extends Endpoint {
+    public static class BraveEndpoint implements Endpoint {
 
         private final zipkin2.Endpoint endpoint;
 
@@ -231,7 +231,7 @@ public BraveEndpoint(zipkin2.Endpoint endpoint) {
     /**
      * {@link TraceContext} implementation for Brave's {@link brave.propagation.TraceContext}.
      */
-    public static class BraveTraceContext extends TraceContext {
+    public static class BraveTraceContext implements TraceContext {
 
         brave.propagation.TraceContext traceContext;
 
diff --git a/src/main/java/io/lettuce/core/tracing/TraceContext.java b/src/main/java/io/lettuce/core/tracing/TraceContext.java
index dc39e5cb5e..1ace8eb83c 100644
--- a/src/main/java/io/lettuce/core/tracing/TraceContext.java
+++ b/src/main/java/io/lettuce/core/tracing/TraceContext.java
@@ -16,10 +16,14 @@
 package io.lettuce.core.tracing;
 
 /**
- * Context for propagation of parent and child spans. Subclasses may add their propagation metadata.
+ * Marker interface for a context propagation of parent and child spans. Subclasses may add their propagation metadata.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ *
  */
-public abstract class TraceContext {
+public interface TraceContext {
 
-    public final static TraceContext EMPTY = new TraceContext() {
+    TraceContext EMPTY = new TraceContext() {
     };
 }
diff --git a/src/main/java/io/lettuce/core/tracing/TraceContextProvider.java b/src/main/java/io/lettuce/core/tracing/TraceContextProvider.java
index 9cb53b84cf..5143f5fe46 100644
--- a/src/main/java/io/lettuce/core/tracing/TraceContextProvider.java
+++ b/src/main/java/io/lettuce/core/tracing/TraceContextProvider.java
@@ -19,6 +19,9 @@
 
 /**
  * Interface to obtain a {@link TraceContext} allowing propagation of {@link Tracer.Span} {@link TraceContext}s across threads.
+ *
+ * @author Mark Paluch
+ * @since 5.1
  */
 @FunctionalInterface
 public interface TraceContextProvider {
diff --git a/src/main/java/io/lettuce/core/tracing/TracerProvider.java b/src/main/java/io/lettuce/core/tracing/TracerProvider.java
index b0dad31e3a..a4c1681186 100644
--- a/src/main/java/io/lettuce/core/tracing/TracerProvider.java
+++ b/src/main/java/io/lettuce/core/tracing/TracerProvider.java
@@ -17,6 +17,9 @@
 
 /**
  * Interface to obtain a {@link Tracer}.
+ *
+ * @author Mark Paluch
+ * @since 5.1
  */
 @FunctionalInterface
 public interface TracerProvider {
diff --git a/src/main/java/io/lettuce/core/tracing/Tracing.java b/src/main/java/io/lettuce/core/tracing/Tracing.java
index 9380cfa92d..5ba662ea99 100644
--- a/src/main/java/io/lettuce/core/tracing/Tracing.java
+++ b/src/main/java/io/lettuce/core/tracing/Tracing.java
@@ -97,8 +97,10 @@ static Context withTraceContextProvider(TraceContextProvider supplier) {
     }
 
     /**
-     * Value object to represent an endpoint. Used by {@link Tracer.Span}.
+     * Value object interface to represent an endpoint. Used by {@link Tracer.Span}.
+     *
+     * @since 5.1
      */
-    abstract class Endpoint {
+    interface Endpoint {
     }
 }

From 66da2d0b303f92bafe5a64dc899d0029d7848764 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 15 Jun 2018 11:59:26 +0200
Subject: [PATCH 477/808] Accept brave.Tracing instead of brave.Tracer #798

---
 .../io/lettuce/core/tracing/BraveTracing.java | 19 ++++++++++---------
 .../io/lettuce/core/BraveTracingTest.java     |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/lettuce/core/tracing/BraveTracing.java b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
index 0746577cdd..9d5a5d5ed5 100644
--- a/src/main/java/io/lettuce/core/tracing/BraveTracing.java
+++ b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
@@ -68,11 +68,11 @@ private BraveTracing(BraveTracer tracer) {
     /**
      * Create a new {@link BraveTracing} instance.
      *
-     * @param tracer must not be {@literal null}.
-     * @return the {@link BraveTracer}.
+     * @param tracing must not be {@literal null}.
+     * @return the {@link BraveTracing}.
      */
-    public static BraveTracing create(brave.Tracer tracer) {
-        return new BraveTracing(new BraveTracer(tracer));
+    public static BraveTracing create(brave.Tracing tracing) {
+        return new BraveTracing(new BraveTracer(tracing));
     }
 
     @Override
@@ -110,15 +110,15 @@ public Endpoint createEndpoint(SocketAddress socketAddress) {
      */
     static class BraveTracer extends Tracer {
 
-        private final brave.Tracer tracer;
+        private final brave.Tracing tracing;
 
-        public BraveTracer(brave.Tracer tracer) {
-            this.tracer = tracer;
+        public BraveTracer(brave.Tracing tracing) {
+            this.tracing = tracing;
         }
 
         @Override
         public Span nextSpan() {
-            return postProcessSpan(tracer.nextSpan());
+            return postProcessSpan(tracing.tracer().nextSpan());
         }
 
         @Override
@@ -134,7 +134,8 @@ public Span nextSpan(TraceContext traceContext) {
                 return nextSpan();
             }
 
-            return postProcessSpan(tracer.nextSpan(TraceContextOrSamplingFlags.create(braveTraceContext.traceContext)));
+            return postProcessSpan(tracing.tracer()
+                    .nextSpan(TraceContextOrSamplingFlags.create(braveTraceContext.traceContext)));
         }
 
         private Span postProcessSpan(brave.Span span) {
diff --git a/src/test/java/io/lettuce/core/BraveTracingTest.java b/src/test/java/io/lettuce/core/BraveTracingTest.java
index d899956a9c..aec2ca27f1 100644
--- a/src/test/java/io/lettuce/core/BraveTracingTest.java
+++ b/src/test/java/io/lettuce/core/BraveTracingTest.java
@@ -57,7 +57,7 @@ public static void beforeClass() {
         clientTracing = Tracing.newBuilder().localServiceName("client")
                 .currentTraceContext(CurrentTraceContext.Default.create()).spanReporter(spans::add).build();
 
-        clientResources = DefaultClientResources.builder().tracing(BraveTracing.create(clientTracing.tracer())).build();
+        clientResources = DefaultClientResources.builder().tracing(BraveTracing.create(clientTracing)).build();
 
         client = RedisClient.create(clientResources, RedisURI.Builder.redis(host, port).build());
     }

From ac7f25adaed6a0f4c8a1859dcda89e8ff549b534 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 15 Jun 2018 11:59:34 +0200
Subject: [PATCH 478/808] Polishing

---
 src/test/java/io/lettuce/core/ConnectionCommandTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/java/io/lettuce/core/ConnectionCommandTest.java b/src/test/java/io/lettuce/core/ConnectionCommandTest.java
index 0c0442c041..b14a4e9190 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandTest.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandTest.java
@@ -18,13 +18,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-import com.google.code.tempusfugit.temporal.WaitFor;
-import io.lettuce.Wait;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import io.lettuce.Wait;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -108,6 +107,8 @@ public void selectReconnect()  {
         redis.select(1);
         redis.set(key, value);
         redis.quit();
+
+        Wait.untilTrue(redis::isOpen).waitOrTimeout();
         assertThat(redis.get(key)).isEqualTo(value);
     }
 

From c55577640de9900abca14e5410e52dd872deea60 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 15 Jun 2018 12:04:44 +0200
Subject: [PATCH 479/808] Reduce service name in BraveTracing to just Redis
 #797

---
 .../io/lettuce/core/tracing/BraveTracing.java |  8 +++----
 .../core/{ => tracing}/BraveTracingTest.java  | 22 +++++++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)
 rename src/test/java/io/lettuce/core/{ => tracing}/BraveTracingTest.java (90%)

diff --git a/src/main/java/io/lettuce/core/tracing/BraveTracing.java b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
index 9d5a5d5ed5..9911baf374 100644
--- a/src/main/java/io/lettuce/core/tracing/BraveTracing.java
+++ b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
@@ -98,11 +98,11 @@ public Endpoint createEndpoint(SocketAddress socketAddress) {
         if (socketAddress instanceof InetSocketAddress) {
 
             InetSocketAddress inetSocketAddress = (InetSocketAddress) socketAddress;
-            return new BraveEndpoint(builder.serviceName("Redis").ip(inetSocketAddress.getAddress())
+            return new BraveEndpoint(builder.serviceName("redis").ip(inetSocketAddress.getAddress())
                     .port(inetSocketAddress.getPort()).build());
         }
 
-        return new BraveEndpoint(builder.serviceName("Redis at " + socketAddress.toString()).build());
+        return new BraveEndpoint(builder.serviceName("redis").build());
     }
 
     /**
@@ -222,7 +222,7 @@ public brave.Span getSpan() {
      */
     public static class BraveEndpoint implements Endpoint {
 
-        private final zipkin2.Endpoint endpoint;
+        final zipkin2.Endpoint endpoint;
 
         public BraveEndpoint(zipkin2.Endpoint endpoint) {
             this.endpoint = endpoint;
@@ -234,7 +234,7 @@ public BraveEndpoint(zipkin2.Endpoint endpoint) {
      */
     public static class BraveTraceContext implements TraceContext {
 
-        brave.propagation.TraceContext traceContext;
+        final brave.propagation.TraceContext traceContext;
 
         private BraveTraceContext(brave.propagation.TraceContext traceContext) {
             this.traceContext = traceContext;
diff --git a/src/test/java/io/lettuce/core/BraveTracingTest.java b/src/test/java/io/lettuce/core/tracing/BraveTracingTest.java
similarity index 90%
rename from src/test/java/io/lettuce/core/BraveTracingTest.java
rename to src/test/java/io/lettuce/core/tracing/BraveTracingTest.java
index aec2ca27f1..6319015fbe 100644
--- a/src/test/java/io/lettuce/core/BraveTracingTest.java
+++ b/src/test/java/io/lettuce/core/tracing/BraveTracingTest.java
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core;
+package io.lettuce.core.tracing;
 
-import static io.lettuce.core.AbstractRedisClientTest.client;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
@@ -37,10 +36,13 @@
 import brave.propagation.CurrentTraceContext;
 import brave.propagation.TraceContext;
 import io.lettuce.Wait;
+import io.lettuce.core.AbstractTest;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
-import io.lettuce.core.tracing.BraveTracing;
+import io.netty.channel.unix.DomainSocketAddress;
 
 /**
  * @author Mark Paluch
@@ -48,6 +50,7 @@
 public class BraveTracingTest extends AbstractTest {
 
     private static ClientResources clientResources;
+    private static RedisClient client;
     private static Tracing clientTracing;
     private static Queue<Span> spans = new LinkedBlockingQueue<>();
 
@@ -58,7 +61,6 @@ public static void beforeClass() {
                 .currentTraceContext(CurrentTraceContext.Default.create()).spanReporter(spans::add).build();
 
         clientResources = DefaultClientResources.builder().tracing(BraveTracing.create(clientTracing)).build();
-
         client = RedisClient.create(clientResources, RedisURI.Builder.redis(host, port).build());
     }
 
@@ -200,4 +202,16 @@ public void reactiveGetAndSetWithTraceProvider() {
         assertThat(spans.get(0).name()).isEqualTo("set");
         assertThat(spans.get(1).name()).isEqualTo("get");
     }
+
+    @Test
+    public void shouldReportSimpleServiceName() {
+
+        BraveTracing.BraveEndpoint endpoint = (BraveTracing.BraveEndpoint) clientResources.tracing().createEndpoint(
+                new DomainSocketAddress("foo"));
+
+        assertThat(endpoint.endpoint.serviceName()).isEqualTo("redis");
+        assertThat(endpoint.endpoint.port()).isNull();
+        assertThat(endpoint.endpoint.ipv4()).isNull();
+        assertThat(endpoint.endpoint.ipv6()).isNull();
+    }
 }

From ae3da60130b8e3947d74b94ad7da6cc7342caac4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 15 Jun 2018 12:44:54 +0200
Subject: [PATCH 480/808] Provide configurable SocketAddressResolver for
 host/port mapping #689

Lettuce now provides a configurable SocketAddressResolver to customize RedisURI to SocketAddress resolution. MappingSocketAddressResolver is a bundled API that accepts a mapping function to map HostAndPort objects allowing to transform the host name/port number. This is useful when using topology information supplied by Redis (e.g. Sentinel, Redis Cluster, Master/Slave) that needs to be mapped onto different endpoint coordinates when using SSL tunneling or other types of proxies.

MappingSocketAddressResolver resolver = MappingSocketAddressResolver.create(DnsResolver.jvmDefault(),
it -> HostAndPort.of(it.getHostText() + "-internal", it.getPort() + 100));

ClientResources.builder().socketAddressResolver(resolver).build();
---
 .../java/io/lettuce/core/RedisClient.java     |  5 +-
 .../AbstractClusterNodeConnectionFactory.java |  3 +-
 .../core/cluster/RedisClusterClient.java      |  3 +-
 .../RoundRobinSocketAddressSupplier.java      |  3 +-
 .../topology/ClusterTopologyRefresh.java      |  3 +-
 .../core/resource/ClientResources.java        | 24 ++++-
 .../core/resource/DefaultClientResources.java | 33 ++++++-
 .../MappingSocketAddressResolver.java         | 98 +++++++++++++++++++
 .../core/resource/SocketAddressResolver.java  | 48 ++++++++-
 .../RoundRobinSocketAddressSupplierTest.java  |  3 +-
 .../topology/ClusterTopologyRefreshTest.java  |  3 +-
 .../MappingSocketAddressResolverTest.java     | 74 ++++++++++++++
 .../core/protocol/EmptyClientResources.java   |  5 +
 13 files changed, 285 insertions(+), 20 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/resource/MappingSocketAddressResolver.java
 create mode 100644 src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverTest.java

diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 570c726b8b..2a46406770 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -39,7 +39,6 @@
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnectionImpl;
 import io.lettuce.core.resource.ClientResources;
-import io.lettuce.core.resource.SocketAddressResolver;
 import io.lettuce.core.sentinel.StatefulRedisSentinelConnectionImpl;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 
@@ -587,7 +586,7 @@ private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectS
     private <K, V> Mono<StatefulRedisSentinelConnection<K, V>> connectSentinel(ConnectionBuilder connectionBuilder, RedisURI uri) {
 
         connectionBuilder.socketAddressSupplier(getSocketAddressSupplier(uri));
-        SocketAddress socketAddress = SocketAddressResolver.resolve(uri, clientResources.dnsResolver());
+        SocketAddress socketAddress = clientResources.socketAddressResolver().resolve(uri);
         logger.debug("Connecting to Redis Sentinel, address: " + socketAddress);
 
         Mono<StatefulRedisSentinelConnection<K, V>> connectionMono = Mono
@@ -698,7 +697,7 @@ protected Mono<SocketAddress> getSocketAddress(RedisURI redisURI) {
                                 + redisURI.getSentinelMasterId())));
 
             } else {
-                return Mono.fromCallable(() -> SocketAddressResolver.resolve(redisURI, clientResources.dnsResolver()));
+                return Mono.fromCallable(() -> clientResources.socketAddressResolver().resolve((redisURI)));
             }
         });
     }
diff --git a/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
index b1497735b3..70b29ba888 100644
--- a/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
@@ -23,7 +23,6 @@
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.resource.ClientResources;
-import io.lettuce.core.resource.SocketAddressResolver;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -107,6 +106,6 @@ private SocketAddress getSocketAddress(String nodeId) {
     }
 
     private SocketAddress resolve(RedisURI redisURI) {
-        return SocketAddressResolver.resolve(redisURI, clientResources.dnsResolver());
+        return clientResources.socketAddressResolver().resolve(redisURI);
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 60d5344d46..dabce7c3f6 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -57,7 +57,6 @@
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnectionImpl;
 import io.lettuce.core.resource.ClientResources;
-import io.lettuce.core.resource.SocketAddressResolver;
 import io.netty.util.concurrent.ScheduledFuture;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -988,7 +987,7 @@ protected Mono<SocketAddress> getSocketAddressSupplier(Function<Partitions, Coll
 
             if (partitions.isEmpty()) {
                 return Mono.fromCallable(() -> {
-                    SocketAddress socketAddress = SocketAddressResolver.resolve(getFirstUri(), clientResources.dnsResolver());
+                    SocketAddress socketAddress = clientResources.socketAddressResolver().resolve(getFirstUri());
                     logger.debug("Resolved SocketAddress {} using {}", socketAddress, getFirstUri());
                     return socketAddress;
                 });
diff --git a/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java b/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
index bcf624224c..fdc5cd1dee 100644
--- a/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
+++ b/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
@@ -23,7 +23,6 @@
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.resource.ClientResources;
-import io.lettuce.core.resource.SocketAddressResolver;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -73,7 +72,7 @@ protected void resetRoundRobin() {
 
     protected SocketAddress getSocketAddress(RedisClusterNode redisClusterNode) {
 
-        SocketAddress resolvedAddress = SocketAddressResolver.resolve(redisClusterNode.getUri(), clientResources.dnsResolver());
+        SocketAddress resolvedAddress = clientResources.socketAddressResolver().resolve(redisClusterNode.getUri());
         logger.debug("Resolved SocketAddress {} using for Cluster node {}", resolvedAddress, redisClusterNode.getNodeId());
         return resolvedAddress;
     }
diff --git a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
index 79fd7d8029..b63d7fb617 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
@@ -30,7 +30,6 @@
 import io.lettuce.core.cluster.topology.TopologyComparators.SortAction;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.resource.ClientResources;
-import io.lettuce.core.resource.SocketAddressResolver;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -207,7 +206,7 @@ private AsyncConnections getConnections(Iterable<RedisURI> redisURIs) throws Int
             }
 
             try {
-                SocketAddress socketAddress = SocketAddressResolver.resolve(redisURI, clientResources.dnsResolver());
+                SocketAddress socketAddress = clientResources.socketAddressResolver().resolve(redisURI);
 
                 ConnectionFuture<StatefulRedisConnection<String, String>> connectionFuture = nodeConnectionFactory
                         .connectToNodeAsync(CODEC, socketAddress);
diff --git a/src/main/java/io/lettuce/core/resource/ClientResources.java b/src/main/java/io/lettuce/core/resource/ClientResources.java
index 688f9f4f0a..38dbadea83 100644
--- a/src/main/java/io/lettuce/core/resource/ClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/ClientResources.java
@@ -113,7 +113,17 @@ interface Builder {
         Builder computationThreadPoolSize(int computationThreadPoolSize);
 
         /**
-         * Sets the {@link DnsResolver} that can that is used to resolve hostnames to {@link java.net.InetAddress}. Defaults to
+         * Sets the {@link SocketAddressResolver} that is used to resolve {@link io.lettuce.core.RedisURI} to
+         * {@link java.net.SocketAddress}. Defaults to {@link SocketAddressResolver} using the configured {@link DnsResolver}.
+         *
+         * @param socketAddressResolver the socket address resolver, must not be {@link null}.
+         * @return {@code this} {@link Builder}.
+         * @since 5.1
+         */
+        Builder socketAddressResolver(SocketAddressResolver socketAddressResolver);
+
+        /**
+         * Sets the {@link DnsResolver} that is used to resolve hostnames to {@link java.net.InetAddress}. Defaults to
          * {@link DnsResolvers#JVM_DEFAULT}
          *
          * @param dnsResolver the DNS resolver, must not be {@link null}.
@@ -302,7 +312,7 @@ interface Builder {
     /**
      * Returns the {@link EventPublisherOptions} for latency event publishing.
      *
-     * @return the {@link EventPublisherOptions} for latency event publishing
+     * @return the {@link EventPublisherOptions} for latency event publishing.
      */
     EventPublisherOptions commandLatencyPublisherOptions();
 
@@ -316,11 +326,19 @@ interface Builder {
     /**
      * Returns the {@link DnsResolver}.
      *
-     * @return the DNS resolver
+     * @return the DNS resolver.
      * @since 4.3
      */
     DnsResolver dnsResolver();
 
+    /**
+     * Returns the {@link SocketAddressResolver}.
+     *
+     * @return the socket address resolver.
+     * @since 5.1
+     */
+    SocketAddressResolver socketAddressResolver();
+
     /**
      * Returns the {@link Delay} for reconnect attempts. May return a different instance on each call.
      *
diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index adafbb68c7..f7f487d086 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -60,6 +60,7 @@
  * <li>a {@code commandLatencyCollector} which is a provided instance of {@link io.lettuce.core.metrics.CommandLatencyCollector}
  * .</li>
  * <li>a {@code dnsResolver} which is a provided instance of {@link DnsResolver}.</li>
+ * <li>a {@code socketAddressResolver} which is a provided instance of {@link SocketAddressResolver}.</li>
  * <li>a {@code timer} that is a provided instance of {@link io.netty.util.HashedWheelTimer}.</li>
  * <li>a {@code nettyCustomizer} that is a provided instance of {@link NettyCustomizer}.</li>
  * <li>a {@code tracerProvider} that is a provided instance of {@link TracerProvider}.</li>
@@ -121,6 +122,7 @@ public class DefaultClientResources implements ClientResources {
     private final EventPublisherOptions commandLatencyPublisherOptions;
     private final MetricEventPublisher metricEventPublisher;
     private final DnsResolver dnsResolver;
+    private final SocketAddressResolver socketAddressResolver;
     private final Supplier<Delay> reconnectDelay;
     private final NettyCustomizer nettyCustomizer;
     private final Tracing tracing;
@@ -215,6 +217,12 @@ protected DefaultClientResources(Builder builder) {
             dnsResolver = builder.dnsResolver;
         }
 
+        if (builder.socketAddressResolver == null) {
+            socketAddressResolver = SocketAddressResolver.create(dnsResolver);
+        } else {
+            socketAddressResolver = builder.socketAddressResolver;
+        }
+
         reconnectDelay = builder.reconnectDelay;
         nettyCustomizer = builder.nettyCustomizer;
         tracing = builder.tracing;
@@ -253,6 +261,7 @@ public static class Builder implements ClientResources.Builder {
         private CommandLatencyCollector commandLatencyCollector;
         private EventPublisherOptions commandLatencyPublisherOptions = DefaultEventPublisherOptions.create();
         private DnsResolver dnsResolver = DnsResolvers.UNRESOLVED;
+        private SocketAddressResolver socketAddressResolver;
         private Supplier<Delay> reconnectDelay = DEFAULT_RECONNECT_DELAY;
         private NettyCustomizer nettyCustomizer = DEFAULT_NETTY_CUSTOMIZER;
         private Tracing tracing = Tracing.disabled();
@@ -410,7 +419,24 @@ public Builder commandLatencyCollector(CommandLatencyCollector commandLatencyCol
         }
 
         /**
-         * Sets the {@link DnsResolver} that can that is used to resolve hostnames to {@link java.net.InetAddress}. Defaults to
+         * Sets the {@link SocketAddressResolver} that is used to resolve {@link io.lettuce.core.RedisURI} to
+         * {@link java.net.SocketAddress}. Defaults to {@link SocketAddressResolver} using the configured {@link DnsResolver}.
+         *
+         * @param socketAddressResolver the socket address resolver, must not be {@link null}.
+         * @return {@code this} {@link ClientResources.Builder}.
+         * @since 5.1
+         */
+        @Override
+        public ClientResources.Builder socketAddressResolver(SocketAddressResolver socketAddressResolver) {
+
+            LettuceAssert.notNull(socketAddressResolver, "SocketAddressResolver must not be null");
+
+            this.socketAddressResolver = socketAddressResolver;
+            return this;
+        }
+
+        /**
+         * Sets the {@link DnsResolver} that is used to resolve hostnames to {@link java.net.InetAddress}. Defaults to
          * {@link DnsResolvers#JVM_DEFAULT}
          *
          * @param dnsResolver the DNS resolver, must not be {@link null}.
@@ -642,6 +668,11 @@ public DnsResolver dnsResolver() {
         return dnsResolver;
     }
 
+    @Override
+    public SocketAddressResolver socketAddressResolver() {
+        return socketAddressResolver;
+    }
+
     @Override
     public Delay reconnectDelay() {
         return reconnectDelay.get();
diff --git a/src/main/java/io/lettuce/core/resource/MappingSocketAddressResolver.java b/src/main/java/io/lettuce/core/resource/MappingSocketAddressResolver.java
new file mode 100644
index 0000000000..23855449be
--- /dev/null
+++ b/src/main/java/io/lettuce/core/resource/MappingSocketAddressResolver.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.resource;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.net.UnknownHostException;
+import java.util.function.Function;
+
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.internal.HostAndPort;
+import io.lettuce.core.internal.LettuceAssert;
+
+/**
+ * Mapping {@link SocketAddressResolver} that allows mapping of {@link io.lettuce.core.RedisURI} host and port components to
+ * redirect connection endpoint coordinates using a {@link Function mapping function}.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+public class MappingSocketAddressResolver extends SocketAddressResolver {
+
+    private final Function<HostAndPort, HostAndPort> mappingFunction;
+    private final DnsResolver dnsResolver;
+
+    /**
+     * Create a new {@link SocketAddressResolver} given {@link DnsResolver} and {@link Function mapping function}.
+     *
+     * @param dnsResolver must not be {@literal null}.
+     * @param mappingFunction must not be {@literal null}.
+     */
+    private MappingSocketAddressResolver(DnsResolver dnsResolver, Function<HostAndPort, HostAndPort> mappingFunction) {
+
+        super(dnsResolver);
+
+        LettuceAssert.notNull(mappingFunction, "Mapping function must not be null!");
+        this.dnsResolver = dnsResolver;
+        this.mappingFunction = mappingFunction;
+    }
+
+    /**
+     * Create a new {@link SocketAddressResolver} given {@link DnsResolver} and {@link Function mapping function}.
+     *
+     * @param dnsResolver must not be {@literal null}.
+     * @param mappingFunction must not be {@literal null}.
+     * @return the {@link MappingSocketAddressResolver}.
+     */
+    public static MappingSocketAddressResolver create(DnsResolver dnsResolver,
+            Function<HostAndPort, HostAndPort> mappingFunction) {
+        return new MappingSocketAddressResolver(dnsResolver, mappingFunction);
+    }
+
+    @Override
+    public SocketAddress resolve(RedisURI redisURI) {
+
+        if (redisURI.getSocket() != null) {
+            return redisURI.getResolvedAddress();
+        }
+
+        HostAndPort hostAndPort = HostAndPort.of(redisURI.getHost(), redisURI.getPort());
+
+        HostAndPort mapped = mappingFunction.apply(hostAndPort);
+        if (mapped == null) {
+            throw new IllegalStateException("Mapping function must not return null for HostAndPort");
+        }
+
+        try {
+            return doResolve(mapped);
+        } catch (UnknownHostException e) {
+            return redisURI.getResolvedAddress();
+        }
+    }
+
+    private SocketAddress doResolve(HostAndPort mapped) throws UnknownHostException {
+
+        InetAddress[] inetAddress = dnsResolver.resolve(mapped.getHostText());
+
+        if (inetAddress.length == 0) {
+            return InetSocketAddress.createUnresolved(mapped.getHostText(), mapped.getPort());
+        }
+
+        return new InetSocketAddress(inetAddress[0], mapped.getPort());
+    }
+}
diff --git a/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java b/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
index 83ee07b861..a4f1db187b 100644
--- a/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
+++ b/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
@@ -21,20 +21,62 @@
 import java.net.UnknownHostException;
 
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Resolves a {@link io.lettuce.core.RedisURI} to a {@link java.net.SocketAddress}.
  *
  * @author Mark Paluch
+ * @see MappingSocketAddressResolver
  */
 public class SocketAddressResolver {
 
+    private final DnsResolver dnsResolver;
+
+    /**
+     * Create a new {@link SocketAddressResolver} given {@link DnsResolver}.
+     *
+     * @param dnsResolver must not be {@literal null}.
+     * @since 5.1
+     */
+    protected SocketAddressResolver(DnsResolver dnsResolver) {
+
+        LettuceAssert.notNull(dnsResolver, "DnsResolver must not be null");
+
+        this.dnsResolver = dnsResolver;
+    }
+
+    /**
+     * Create a new {@link SocketAddressResolver} given {@link DnsResolver}.
+     *
+     * @param dnsResolver must not be {@literal null}.
+     * @return the {@link SocketAddressResolver}.
+     * @since 5.1
+     */
+    public static SocketAddressResolver create(DnsResolver dnsResolver) {
+        return new SocketAddressResolver(dnsResolver);
+    }
+
+    /**
+     * Resolve a {@link RedisURI} to a {@link SocketAddress}.
+     *
+     * @param redisURI must not be {@literal null}.
+     * @return the resolved {@link SocketAddress}.
+     * @since 5.1
+     */
+    public SocketAddress resolve(RedisURI redisURI) {
+
+        LettuceAssert.notNull(redisURI, "RedisURI must not be null");
+
+        return resolve(redisURI, dnsResolver);
+    }
+
     /**
      * Resolves a {@link io.lettuce.core.RedisURI} to a {@link java.net.SocketAddress}.
      *
-     * @param redisURI must not be {@literal null}
-     * @param dnsResolver must not be {@literal null}
-     * @return the resolved {@link SocketAddress}
+     * @param redisURI must not be {@literal null}.
+     * @param dnsResolver must not be {@literal null}.
+     * @return the resolved {@link SocketAddress}.
      */
     public static SocketAddress resolve(RedisURI redisURI, DnsResolver dnsResolver) {
 
diff --git a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
index 6dbc272bf0..da662989e3 100644
--- a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
@@ -34,6 +34,7 @@
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DnsResolvers;
+import io.lettuce.core.resource.SocketAddressResolver;
 
 /**
  * @author Mark Paluch
@@ -61,7 +62,7 @@ public static void beforeClass() {
     @Before
     public void before() throws Exception {
 
-        when(clientResourcesMock.dnsResolver()).thenReturn(DnsResolvers.JVM_DEFAULT);
+        when(clientResourcesMock.socketAddressResolver()).thenReturn(SocketAddressResolver.create(DnsResolvers.JVM_DEFAULT));
 
         partitions = new Partitions();
         partitions.addPartition(new RedisClusterNode(hap1, "1", true, "", 0, 0, 0, new ArrayList<>(), new HashSet<>()));
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
index e082575aba..580654c022 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
@@ -50,6 +50,7 @@
 import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DnsResolvers;
+import io.lettuce.core.resource.SocketAddressResolver;
 
 /**
  * @author Mark Paluch
@@ -95,7 +96,7 @@ public class ClusterTopologyRefreshTest {
     @Before
     public void before() {
 
-        when(clientResources.dnsResolver()).thenReturn(DnsResolvers.JVM_DEFAULT);
+        when(clientResources.socketAddressResolver()).thenReturn(SocketAddressResolver.create(DnsResolvers.JVM_DEFAULT));
         when(connection1.async()).thenReturn(asyncCommands1);
         when(connection2.async()).thenReturn(asyncCommands2);
         when(connection1.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
diff --git a/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverTest.java b/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverTest.java
new file mode 100644
index 0000000000..6fed88ad88
--- /dev/null
+++ b/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.resource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.function.Function;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.internal.HostAndPort;
+
+/**
+ * @author Mark Paluch
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class MappingSocketAddressResolverTest {
+
+    @Mock
+    DnsResolver dnsResolver;
+
+    @Before
+    public void before() throws UnknownHostException {
+        when(dnsResolver.resolve(anyString())).thenReturn(new InetAddress[0]);
+    }
+
+    @Test
+    public void shouldPassThruHostAndPort() {
+
+        RedisURI localhost = RedisURI.create("localhost", RedisURI.DEFAULT_REDIS_PORT);
+        MappingSocketAddressResolver resolver = MappingSocketAddressResolver.create(dnsResolver, Function.identity());
+
+        InetSocketAddress resolve = (InetSocketAddress) resolver.resolve(localhost);
+
+        assertThat(resolve.getPort()).isEqualTo(RedisURI.DEFAULT_REDIS_PORT);
+        assertThat(resolve.getHostString()).isEqualTo("localhost");
+    }
+
+    @Test
+    public void shouldMapHostAndPort() {
+
+        RedisURI localhost = RedisURI.create("localhost", RedisURI.DEFAULT_REDIS_PORT);
+        MappingSocketAddressResolver resolver = MappingSocketAddressResolver.create(dnsResolver,
+                it -> HostAndPort.of(it.getHostText() + "-foo", it.getPort() + 100));
+
+        InetSocketAddress resolve = (InetSocketAddress) resolver.resolve(localhost);
+
+        assertThat(resolve.getPort()).isEqualTo(RedisURI.DEFAULT_REDIS_PORT + 100);
+        assertThat(resolve.getHostString()).isEqualTo("localhost-foo");
+    }
+}
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
index 56863b8245..beb4d7d719 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
@@ -102,6 +102,11 @@ public DnsResolver dnsResolver() {
         return null;
     }
 
+    @Override
+    public SocketAddressResolver socketAddressResolver() {
+        return null;
+    }
+
     @Override
     public Delay reconnectDelay() {
         return null;

From bda301839f37de936b7a980ededa85991567f855 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 21 Jun 2018 10:02:22 +0200
Subject: [PATCH 481/808] Resolve command interface commands to known
 CommandTypes where possible #804

Lettuce now attempts to resolve command names derived from the command interface method name or the command annotation to a known command type which is listed in CommandType. Previously, all command types were instances of StringCommandType. This rendered options set on CommandType items unusable as the object instance was not the same. In a consequence, all commands resolved to a write intent as only CommandType instances (some of them) are configured as read-only commands.

Commands are resolved case-sensitive and unknown commands are resolved to StringCommandType. Using a lowercase command name in the query annotation can be used to force a read-only command to be considered a write one and to be executed on a master node when using a master/slave setup.
---
 .../core/dynamic/segment/CommandSegments.java | 22 ++++++++++--
 .../CommandSegmentCommandFactoryTest.java     | 35 ++++++++++++++++++-
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
index cd00e9b30d..5ca8d53fb8 100644
--- a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
@@ -20,6 +20,7 @@
 import java.util.List;
 
 import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
@@ -30,7 +31,7 @@
  */
 public class CommandSegments implements Iterable<CommandSegment> {
 
-    private final StringCommandType commandType;
+    private final ProtocolKeyword commandType;
     private final List<CommandSegment> segments;
 
     /**
@@ -44,7 +45,24 @@ public CommandSegments(List<CommandSegment> segments) {
 
         this.segments = segments.size() > 1 ? Collections.unmodifiableList(segments.subList(1, segments.size())) : Collections
                 .emptyList();
-        this.commandType = new StringCommandType(segments.get(0).asString());
+        this.commandType = potentiallyResolveCommand(segments.get(0).asString());
+    }
+
+    /**
+     * Attempt to resolve the {@code commandType} against {@link CommandType}. This allows reuse of settings associated with the
+     * actual command type such as read-write routing. Subclasses may override this method.
+     *
+     * @param commandType must not be {@literal null}.
+     * @return the resolved {@link ProtocolKeyword}.
+     * @since 5.0.5
+     */
+    protected ProtocolKeyword potentiallyResolveCommand(String commandType) {
+
+        try {
+            return CommandType.valueOf(commandType);
+        } catch (IllegalArgumentException e) {
+            return new StringCommandType(commandType);
+        }
     }
 
     @Override
diff --git a/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java
index e8ca790cd7..21f10791f5 100644
--- a/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java
@@ -37,6 +37,7 @@
 import io.lettuce.core.dynamic.segment.AnnotationCommandSegmentFactory;
 import io.lettuce.core.dynamic.segment.CommandSegmentFactory;
 import io.lettuce.core.dynamic.support.ReflectionUtils;
+import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.protocol.RedisCommand;
 
 /**
@@ -51,6 +52,7 @@ public void setKeyValue() {
                 new StringCodec(), "key", "value");
 
         assertThat(toString(command)).isEqualTo("SET key<key> key<value>");
+        assertThat(command.getType()).isSameAs(CommandType.SET);
     }
 
     @Test
@@ -69,6 +71,17 @@ public void setKeyValueWithHintedValue() {
                 new StringCodec(), "key", "value");
 
         assertThat(toString(command)).isEqualTo("SET key<key> value<value>");
+        assertThat(command.getType()).isSameAs(CommandType.SET);
+    }
+
+    @Test
+    public void lowercaseCommandResolvesToStringCommand() {
+
+        RedisCommand<?, ?, ?> command = createCommand(methodOf(Commands.class, "set3", String.class, String.class),
+                new StringCodec(), "key", "value");
+
+        assertThat(toString(command)).isEqualTo("set key<key> value<value>");
+        assertThat(command.getType()).isNotInstanceOf(CommandType.class);
     }
 
     @Test
@@ -127,6 +140,15 @@ public void syncWithTimeout() {
                 null);
     }
 
+    @Test
+    public void resolvesUnknownCommandToStringBackedCommandType() {
+
+        RedisCommand<?, ?, ?> command = createCommand(methodOf(Commands.class, "unknownCommand"), new StringCodec());
+
+        assertThat(toString(command)).isEqualTo("XYZ");
+        assertThat(command.getType()).isNotInstanceOf(CommandType.class);
+    }
+
     private CommandMethod methodOf(Class<?> commandInterface, String methodName, Class... args) {
         return DeclaredCommandMethod.create(ReflectionUtils.findMethod(commandInterface, methodName, args));
     }
@@ -149,7 +171,12 @@ private String toString(RedisCommand<?, ?, ?> command) {
         StringBuilder builder = new StringBuilder();
 
         builder.append(command.getType().name());
-        builder.append(' ').append(command.getArgs().toCommandString());
+
+        String commandString = command.getArgs().toCommandString();
+
+        if (!commandString.isEmpty()) {
+            builder.append(' ').append(commandString);
+        }
 
         return builder.toString();
     }
@@ -161,6 +188,9 @@ interface Commands {
         @Command("SET")
         boolean set2(String key, @Value String value);
 
+        @Command("set")
+        boolean set3(String key, @Value String value);
+
         boolean set(String key, String value, SetArgs setArgs);
 
         boolean clientSetname(String connectionName);
@@ -170,6 +200,9 @@ interface Commands {
 
         @Command("MGET ?1 ?0")
         String varargsWithParamIndexes(ScanArgs scanArgs, String... keys);
+
+        @Command("XYZ")
+        boolean unknownCommand();
     }
 
     static interface MethodsWithTimeout {

From 84c3fdbcadabde434dcf8411e54e1fccdb7b884e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 21 Jun 2018 10:48:51 +0200
Subject: [PATCH 482/808] Reset coordinate state of GeoWithinListOutput after
 completing an item #805

GeoWithinListOutput now resets its longitude (x) coordinate state after completing a GeoWithin item. Previously, the longitude coordinate was never reset and subsequent items used the first reported longitude coordinate which rendered an incorrect result.
---
 .../core/output/GeoWithinListOutput.java      |  1 +
 .../commands/GeoClusterCommandTest.java       | 14 ++---
 .../lettuce/core/commands/GeoCommandTest.java | 51 ++++++++++++++-----
 .../reactive/GeoReactiveCommandTest.java      |  2 +-
 .../transactional/GeoTxCommandTest.java       | 14 ++---
 5 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java b/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
index 1d469fd69f..2226e6b846 100644
--- a/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
@@ -101,6 +101,7 @@ public void complete(int depth) {
             distance = null;
             geohash = null;
             coordinates = null;
+            x = null;
         }
     }
 
diff --git a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
index 7b24f4f46d..4d69760cd2 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
@@ -71,22 +71,22 @@ protected RedisCommands<String, String> connect() {
 
     @Ignore("MULTI not available on Redis Cluster")
     @Override
-    public void geoaddWithTransaction() {
+    public void geoaddInTransaction() {
     }
 
     @Ignore("MULTI not available on Redis Cluster")
     @Override
-    public void geoaddMultiWithTransaction() {
+    public void geoaddMultiInTransaction() {
     }
 
     @Ignore("MULTI not available on Redis Cluster")
     @Override
-    public void georadiusWithTransaction() {
+    public void georadiusInTransaction() {
     }
 
     @Ignore("MULTI not available on Redis Cluster")
     @Override
-    public void geodistWithTransaction() {
+    public void geodistInTransaction() {
     }
 
     @Ignore("MULTI not available on Redis Cluster")
@@ -96,16 +96,16 @@ public void georadiusWithArgsAndTransaction() {
 
     @Ignore("MULTI not available on Redis Cluster")
     @Override
-    public void georadiusbymemberWithArgsAndTransaction() {
+    public void georadiusbymemberWithArgsInTransaction() {
     }
 
     @Ignore("MULTI not available on Redis Cluster")
     @Override
-    public void geoposWithTransaction() {
+    public void geoposInTransaction() {
     }
 
     @Ignore("MULTI not available on Redis Cluster")
     @Override
-    public void geohashWithTransaction() {
+    public void geohashInTransaction() {
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/GeoCommandTest.java b/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
index 7b681e627d..0153f0f793 100644
--- a/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
@@ -31,6 +31,9 @@
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 
+/**
+ * @author Mark Paluch
+ */
 public class GeoCommandTest extends AbstractRedisClientTest {
 
     @Rule
@@ -57,7 +60,7 @@ public void geoadd() {
     }
 
     @Test
-    public void geoaddWithTransaction() {
+    public void geoaddInTransaction() {
 
         redis.multi();
         redis.geoadd(key, -73.9454966, 40.747533, "lic market");
@@ -75,7 +78,7 @@ public void geoaddMulti() {
     }
 
     @Test
-    public void geoaddMultiWithTransaction() {
+    public void geoaddMultiInTransaction() {
 
         redis.multi();
         redis.geoadd(key, 8.6638775, 49.5282537, "Weinheim", 8.3796281, 48.9978127, "EFS9", 8.665351, 49.553302, "Bahn");
@@ -88,11 +91,6 @@ public void geoaddMultiWrongArgument() {
         redis.geoadd(key, 49.528253);
     }
 
-    protected void prepareGeo() {
-        redis.geoadd(key, 8.6638775, 49.5282537, "Weinheim");
-        redis.geoadd(key, 8.3796281, 48.9978127, "EFS9", 8.665351, 49.553302, "Bahn");
-    }
-
     @Test
     public void georadius() {
 
@@ -106,7 +104,7 @@ public void georadius() {
     }
 
     @Test
-    public void georadiusWithTransaction() {
+    public void georadiusInTransaction() {
 
         prepareGeo();
 
@@ -122,6 +120,22 @@ public void georadiusWithTransaction() {
         assertThat(largerGeoradius).hasSize(2).contains("Weinheim").contains("Bahn");
     }
 
+    @Test
+    public void georadiusWithCoords() {
+
+        prepareGeo();
+
+        List<GeoWithin<String>> georadius = redis.georadius(key, 8.6582861, 49.5285695, 100, GeoArgs.Unit.km,
+                GeoArgs.Builder.coordinates());
+
+        assertThat(georadius).hasSize(3);
+        assertThat(getX(georadius, 0)).isBetween(8.66, 8.67);
+        assertThat(getY(georadius, 0)).isBetween(49.52, 49.53);
+
+        assertThat(getX(georadius, 2)).isBetween(8.37, 8.38);
+        assertThat(getY(georadius, 2)).isBetween(48.99, 49.00);
+    }
+
     @Test
     public void geodist() {
 
@@ -144,7 +158,7 @@ public void geodistMissingElements() {
     }
 
     @Test
-    public void geodistWithTransaction() {
+    public void geodistInTransaction() {
 
         prepareGeo();
 
@@ -175,7 +189,7 @@ public void geopos() {
     }
 
     @Test
-    public void geoposWithTransaction() {
+    public void geoposInTransaction() {
 
         prepareGeo();
 
@@ -282,7 +296,7 @@ public void geohashUnknownKey() {
     }
 
     @Test
-    public void geohashWithTransaction() {
+    public void geohashInTransaction() {
 
         prepareGeo();
 
@@ -434,7 +448,7 @@ public void georadiusbymemberWithArgs() {
     }
 
     @Test
-    public void georadiusbymemberWithArgsAndTransaction() {
+    public void georadiusbymemberWithArgsInTransaction() {
 
         prepareGeo();
 
@@ -488,4 +502,17 @@ public void georadiusStorebymemberWithNullArgs() {
         redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km, (GeoRadiusStoreArgs<String>) null);
     }
 
+    protected void prepareGeo() {
+        redis.geoadd(key, 8.6638775, 49.5282537, "Weinheim");
+        redis.geoadd(key, 8.3796281, 48.9978127, "EFS9", 8.665351, 49.553302, "Bahn");
+    }
+
+    private static double getY(List<GeoWithin<String>> georadius, int i) {
+        return georadius.get(i).getCoordinates().getY().doubleValue();
+    }
+
+    private static double getX(List<GeoWithin<String>> georadius, int i) {
+        return georadius.get(i).getCoordinates().getX().doubleValue();
+    }
+
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
index 99be92014c..b978affb25 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
@@ -58,6 +58,6 @@ public void geopos() {
     @Test
     @Ignore("API differences")
     @Override
-    public void geoposWithTransaction() {
+    public void geoposInTransaction() {
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
index 4f308a4801..9e8bc264a4 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
@@ -32,22 +32,22 @@ protected RedisCommands<String, String> connect() {
 
     @Ignore
     @Override
-    public void georadiusbymemberWithArgsAndTransaction() {
+    public void georadiusbymemberWithArgsInTransaction() {
     }
 
     @Ignore
     @Override
-    public void geoaddWithTransaction() {
+    public void geoaddInTransaction() {
     }
 
     @Ignore
     @Override
-    public void geoaddMultiWithTransaction() {
+    public void geoaddMultiInTransaction() {
     }
 
     @Ignore
     @Override
-    public void geoposWithTransaction() {
+    public void geoposInTransaction() {
     }
 
     @Ignore
@@ -57,16 +57,16 @@ public void georadiusWithArgsAndTransaction() {
 
     @Ignore
     @Override
-    public void georadiusWithTransaction() {
+    public void georadiusInTransaction() {
     }
 
     @Ignore
     @Override
-    public void geodistWithTransaction() {
+    public void geodistInTransaction() {
     }
 
     @Ignore
     @Override
-    public void geohashWithTransaction() {
+    public void geohashInTransaction() {
     }
 }

From d079617a31d9c24fe9330bdab0c06d6a8969b418 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 21 Jun 2018 11:24:03 +0200
Subject: [PATCH 483/808] Remove MULTI from read-only commands #779

MULTI is no longer considered a read-only command to prevent accidental dispatch to slave nodes.
---
 .../java/io/lettuce/core/cluster/ReadOnlyCommands.java     | 2 +-
 .../java/io/lettuce/core/masterslave/ReadOnlyCommands.java | 2 +-
 .../java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
index 75b93d933f..2df5f65f1f 100644
--- a/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
@@ -56,7 +56,7 @@ enum CommandName {
         ASKING, BITCOUNT, BITPOS, CLIENT, COMMAND, DUMP, ECHO, EVAL, EVALSHA, EXISTS, //
         GEODIST, GEOPOS, GEORADIUS, GEORADIUSBYMEMBER, GEOHASH, GET, GETBIT, //
         GETRANGE, HEXISTS, HGET, HGETALL, HKEYS, HLEN, HMGET, HSCAN, HSTRLEN, //
-        HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, MULTI, PFCOUNT, PTTL, //
+        HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, PFCOUNT, PTTL, //
         RANDOMKEY, READWRITE, SCAN, SCARD, SCRIPT, //
         SDIFF, SINTER, SISMEMBER, SMEMBERS, SRANDMEMBER, SSCAN, STRLEN, //
         SUNION, TIME, TTL, TYPE, ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE, //
diff --git a/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
index e97a7314bd..584650a812 100644
--- a/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
+++ b/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
@@ -56,7 +56,7 @@ enum CommandName {
         ASKING, BITCOUNT, BITPOS, CLIENT, COMMAND, DUMP, ECHO, EVAL, EVALSHA, EXISTS, //
         GEODIST, GEOPOS, GEORADIUS, GEORADIUSBYMEMBER, GEOHASH, GET, GETBIT, //
         GETRANGE, HEXISTS, HGET, HGETALL, HKEYS, HLEN, HMGET, HSCAN, HSTRLEN, //
-        HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, MULTI, PFCOUNT, PTTL, //
+        HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, PFCOUNT, PTTL, //
         RANDOMKEY, READWRITE, SCAN, SCARD, SCRIPT, //
         SDIFF, SINTER, SISMEMBER, SMEMBERS, SRANDMEMBER, SSCAN, STRLEN, //
         SUNION, TIME, TTL, TYPE, ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE, //
diff --git a/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java
index d0fde0f127..0531322b03 100644
--- a/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java
@@ -28,12 +28,13 @@
 public class ReadOnlyCommandsTest {
 
     @Test
-    public void testCount() throws Exception {
-        assertThat(ReadOnlyCommands.getReadOnlyCommands()).hasSize(71);
+    public void testCount() {
+        assertThat(ReadOnlyCommands.getReadOnlyCommands()).hasSize(70);
     }
 
     @Test
-    public void testResolvableCommandNames() throws Exception {
+    public void testResolvableCommandNames() {
+
         for (ProtocolKeyword readOnlyCommand : ReadOnlyCommands.getReadOnlyCommands()) {
             assertThat(readOnlyCommand.name()).isEqualTo(CommandType.valueOf(readOnlyCommand.name()).name());
         }

From 7f5665e16dda44981fad7e0c72917246287ea765 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 21 Jun 2018 14:31:02 +0200
Subject: [PATCH 484/808] Bind Master/Slave transactional commands to Master
 during an ongoing transaction #800

Transactions that are started on Master/Slave connections are bound to the master node (i.e. using Intent.WRITE) so all subsequent commands are routed to the master as well. This ensures that transactions are entirely executed on master nodes without partial routing of read-only commands to slave nodes.
---
 .../masterslave/MasterSlaveChannelWriter.java |  35 +++++-
 .../MasterSlaveChannelWriterTest.java         | 107 ++++++++++++++++++
 2 files changed, 140 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
index 999d378d61..fc0186b0b0 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
@@ -40,6 +40,7 @@ class MasterSlaveChannelWriter implements RedisChannelWriter {
     private final ClientResources clientResources;
 
     private boolean closed = false;
+    private boolean inTransaction;
 
     MasterSlaveChannelWriter(MasterSlaveConnectionProvider<?, ?> masterSlaveConnectionProvider, ClientResources clientResources) {
         this.masterSlaveConnectionProvider = masterSlaveConnectionProvider;
@@ -56,10 +57,18 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
             throw new RedisException("Connection is closed");
         }
 
-        Intent intent = getIntent(command.getType());
+        if (isStartTransaction(command.getType())) {
+            inTransaction = true;
+        }
+
+        Intent intent = inTransaction ? Intent.WRITE : getIntent(command.getType());
         CompletableFuture<StatefulRedisConnection<K, V>> future = (CompletableFuture) masterSlaveConnectionProvider
                 .getConnectionAsync(intent);
 
+        if (isEndTransaction(command.getType())) {
+            inTransaction = false;
+        }
+
         if (isSuccessfullyCompleted(future)) {
             writeCommand(command, future.join(), null);
         } else {
@@ -95,13 +104,27 @@ private static <K, V> void writeCommand(RedisCommand<K, V, ?> command, StatefulR
             throw new RedisException("Connection is closed");
         }
 
+        for (RedisCommand<K, V, ?> command : commands) {
+            if (isStartTransaction(command.getType())) {
+                inTransaction = true;
+                break;
+            }
+        }
+
         // TODO: Retain order or retain Intent preference?
         // Currently: Retain order
-        Intent intent = getIntent(commands);
+        Intent intent = inTransaction ? Intent.WRITE : getIntent(commands);
 
         CompletableFuture<StatefulRedisConnection<K, V>> future = (CompletableFuture) masterSlaveConnectionProvider
                 .getConnectionAsync(intent);
 
+        for (RedisCommand<K, V, ?> command : commands) {
+            if (isEndTransaction(command.getType())) {
+                inTransaction = false;
+                break;
+            }
+        }
+
         if (isSuccessfullyCompleted(future)) {
             writeCommands(commands, future.join(), null);
         } else {
@@ -243,4 +266,12 @@ public ReadFrom getReadFrom() {
     private static boolean isSuccessfullyCompleted(CompletableFuture<?> connectFuture) {
         return connectFuture.isDone() && !connectFuture.isCompletedExceptionally();
     }
+
+    private static boolean isStartTransaction(ProtocolKeyword command) {
+        return command.name().equals("MULTI");
+    }
+
+    private boolean isEndTransaction(ProtocolKeyword command) {
+        return command.name().equals("EXEC") || command.name().equals("DISCARD");
+    }
 }
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java
index 21ff082479..ba0f380b2f 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java
@@ -16,21 +16,44 @@
 package io.lettuce.core.masterslave;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.Command;
 import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * @author Mark Paluch
  */
+@RunWith(MockitoJUnitRunner.class)
 public class MasterSlaveChannelWriterTest {
 
+    @Mock
+    private MasterSlaveConnectionProvider<String, String> connectionProvider;
+
+    @Mock
+    private ClientResources clientResources;
+
+    @Mock
+    private StatefulRedisConnection<String, String> connection;
+
     @Test
     public void shouldReturnIntentForWriteCommand() {
 
@@ -77,4 +100,88 @@ public void shouldReturnIntentForMixedCommands() {
                 MasterSlaveConnectionProvider.Intent.WRITE);
     }
 
+    @Test
+    public void shouldBindTransactionsToMaster() {
+
+        MasterSlaveChannelWriter writer = new MasterSlaveChannelWriter(connectionProvider, clientResources);
+
+        when(connectionProvider.getConnectionAsync(any(MasterSlaveConnectionProvider.Intent.class))).thenReturn(
+                CompletableFuture.completedFuture(connection));
+
+        writer.write(mockCommand(CommandType.MULTI));
+        writer.write(mockCommand(CommandType.GET));
+        writer.write(mockCommand(CommandType.EXEC));
+
+        verify(connectionProvider, times(3)).getConnectionAsync(MasterSlaveConnectionProvider.Intent.WRITE);
+    }
+
+    @Test
+    public void shouldBindTransactionsToMasterInBatch() {
+
+        MasterSlaveChannelWriter writer = new MasterSlaveChannelWriter(connectionProvider, clientResources);
+
+        when(connectionProvider.getConnectionAsync(any(MasterSlaveConnectionProvider.Intent.class))).thenReturn(
+                CompletableFuture.completedFuture(connection));
+
+        List<Command<String, String, String>> commands = Arrays.asList(mockCommand(CommandType.MULTI),
+                mockCommand(CommandType.GET), mockCommand(CommandType.EXEC));
+
+        writer.write(commands);
+
+        verify(connectionProvider).getConnectionAsync(MasterSlaveConnectionProvider.Intent.WRITE);
+    }
+
+    @Test
+    public void shouldDeriveIntentFromCommandTypeAfterTransaction() {
+
+        MasterSlaveChannelWriter writer = new MasterSlaveChannelWriter(connectionProvider, clientResources);
+
+        when(connectionProvider.getConnectionAsync(any(MasterSlaveConnectionProvider.Intent.class))).thenReturn(
+                CompletableFuture.completedFuture(connection));
+
+        writer.write(mockCommand(CommandType.MULTI));
+        writer.write(mockCommand(CommandType.EXEC));
+        writer.write(mockCommand(CommandType.GET));
+
+        verify(connectionProvider, times(2)).getConnectionAsync(MasterSlaveConnectionProvider.Intent.WRITE);
+        verify(connectionProvider).getConnectionAsync(MasterSlaveConnectionProvider.Intent.READ);
+    }
+
+    @Test
+    public void shouldDeriveIntentFromCommandTypeAfterDiscardedTransaction() {
+
+        MasterSlaveChannelWriter writer = new MasterSlaveChannelWriter(connectionProvider, clientResources);
+
+        when(connectionProvider.getConnectionAsync(any(MasterSlaveConnectionProvider.Intent.class))).thenReturn(
+                CompletableFuture.completedFuture(connection));
+
+        writer.write(mockCommand(CommandType.MULTI));
+        writer.write(mockCommand(CommandType.DISCARD));
+        writer.write(mockCommand(CommandType.GET));
+
+        verify(connectionProvider, times(2)).getConnectionAsync(MasterSlaveConnectionProvider.Intent.WRITE);
+        verify(connectionProvider).getConnectionAsync(MasterSlaveConnectionProvider.Intent.READ);
+    }
+
+    @Test
+    public void shouldDeriveIntentFromCommandBatchTypeAfterDiscardedTransaction() {
+
+        MasterSlaveChannelWriter writer = new MasterSlaveChannelWriter(connectionProvider, clientResources);
+
+        when(connectionProvider.getConnectionAsync(any(MasterSlaveConnectionProvider.Intent.class))).thenReturn(
+                CompletableFuture.completedFuture(connection));
+
+        List<Command<String, String, String>> commands = Arrays.asList(mockCommand(CommandType.MULTI),
+                mockCommand(CommandType.EXEC));
+
+        writer.write(commands);
+        writer.write(Collections.singletonList(mockCommand(CommandType.GET)));
+
+        verify(connectionProvider).getConnectionAsync(MasterSlaveConnectionProvider.Intent.WRITE);
+        verify(connectionProvider).getConnectionAsync(MasterSlaveConnectionProvider.Intent.READ);
+    }
+
+    private static Command<String, String, String> mockCommand(CommandType multi) {
+        return new Command<>(multi, new StatusOutput<>(StringCodec.UTF8));
+    }
 }

From b8f8ec371e855fbafacc24019acb288b0480232b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 21 Jun 2018 14:50:17 +0200
Subject: [PATCH 485/808] Update What's new for Lettuce 5.1 in reference docs
 #777

---
 src/main/asciidoc/new-features.adoc | 15 +++++++++++++++
 src/main/asciidoc/overview.asciidoc |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/asciidoc/new-features.adoc b/src/main/asciidoc/new-features.adoc
index bb2cf6380e..972fcd2cf3 100644
--- a/src/main/asciidoc/new-features.adoc
+++ b/src/main/asciidoc/new-features.adoc
@@ -1,6 +1,21 @@
 [[new-features]]
 = New & Noteworthy
 
+[[new-features.5-1-0]]
+== What's new in Lettuce 5.1
+* Add support for `ZPOPMIN`, `ZPOPMAX`, `BZPOPMIN`, `BZPOPMAX` commands.
+* Add support for Redis Command Tracing through Brave, see <<client-resources>>.
+* Add support for https://redis.io/topics/streams-intro[Redis Streams].
+* Asynchronous `connect()` for Master/Slave connections.
+* <<connection-pooling.asynchronous.usage>> through `AsyncConnectionPoolSupport` and `AsyncPool`.
+* Dedicated exceptions for Redis `LOADING`, `BUSY`, and `NOSCRIPT` responses.
+* Commands in at-most-once mode (auto-reconnect disabled) are now canceled already on disconnect.
+* Global command timeouts (also for reactive and asynchronous API usage) configurable through <<client-options>>.
+* Host and port mappers for Lettuce usage behind connection tunnels/proxies through `SocketAddressResolver`, see <<client-resources>>.
+* `SCRIPT LOAD` dispatch to all cluster nodes when issued through `RedisAdvancedClusterCommands`.
+* Reactive `ScanStream` to iterate over the keyspace using `SCAN` commands.
+* Transactions using Master/Slave connections are bound to the master node.
+
 [[new-features.5-0-0]]
 == What's new in Lettuce 5.0
 * New artifact coordinates: `io.lettuce:lettuce-core` and packages moved from `com.lambdaworks.redis` to `io.lettuce.core`.
diff --git a/src/main/asciidoc/overview.asciidoc b/src/main/asciidoc/overview.asciidoc
index 6426f263ac..46646b2f02 100644
--- a/src/main/asciidoc/overview.asciidoc
+++ b/src/main/asciidoc/overview.asciidoc
@@ -34,7 +34,7 @@ Lettuce is a scalable thread-safe Redis client based on http://netty.io[netty] a
 [[overview.requirements]]
 === Requirements
 
-Lettuce 4.x and 5.x binaries requires JDK level 8.0 and above.
+Lettuce 4.x and 5.x binaries require JDK level 8.0 and above.
 
 In terms of http://redis.io/[Redis], at least 2.6.
 

From cf42638bcb1c4ba06ae68414bff0e484907475b1 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 6 Jul 2018 15:12:35 +0200
Subject: [PATCH 486/808] Add support for CLIENT UNBLOCK #812

---
 .../core/AbstractRedisAsyncCommands.java      |  5 +++
 .../core/AbstractRedisReactiveCommands.java   |  9 +++-
 .../io/lettuce/core/RedisCommandBuilder.java  |  7 ++++
 .../java/io/lettuce/core/UnblockType.java     | 41 +++++++++++++++++++
 .../api/async/RedisServerAsyncCommands.java   | 15 +++++++
 .../reactive/RedisServerReactiveCommands.java | 12 +++++-
 .../core/api/sync/RedisServerCommands.java    | 11 +++++
 .../NodeSelectionServerAsyncCommands.java     | 11 +++++
 .../api/sync/NodeSelectionServerCommands.java | 11 +++++
 .../lettuce/core/protocol/CommandKeyword.java |  3 +-
 .../lettuce/core/api/RedisServerCommands.java | 11 +++++
 .../core/commands/ServerCommandTest.java      | 35 ++++++++++++++--
 12 files changed, 164 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/UnblockType.java

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 52c676a287..61569e83dd 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -190,6 +190,11 @@ public RedisFuture<String> clientSetname(K name) {
         return dispatch(commandBuilder.clientSetname(name));
     }
 
+    @Override
+    public RedisFuture<Long> clientUnblock(long id, UnblockType type) {
+        return dispatch(commandBuilder.clientUnblock(id, type));
+    }
+
     @Override
     public RedisFuture<String> clusterAddSlots(int... slots) {
         return dispatch(commandBuilder.clusterAddslots(slots));
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 51a4440f11..c97a3c44eb 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -23,8 +23,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import io.lettuce.core.tracing.TraceContext;
-import io.lettuce.core.tracing.TraceContextProvider;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import io.lettuce.core.GeoArgs.Unit;
@@ -36,6 +34,8 @@
 import io.lettuce.core.output.*;
 import io.lettuce.core.protocol.*;
 import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.tracing.TraceContext;
+import io.lettuce.core.tracing.TraceContextProvider;
 import io.lettuce.core.tracing.Tracing;
 
 /**
@@ -192,6 +192,11 @@ public Mono<String> clientSetname(K name) {
         return createMono(() -> commandBuilder.clientSetname(name));
     }
 
+    @Override
+    public Mono<Long> clientUnblock(long id, UnblockType type) {
+        return createMono(() -> commandBuilder.clientUnblock(id, type));
+    }
+
     public void close() {
         connection.close();
     }
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 2b04aab31e..d27bfa87b7 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -246,6 +246,13 @@ Command<K, V, String> clientSetname(K name) {
         return createCommand(CLIENT, new StatusOutput<>(codec), args);
     }
 
+    Command<K, V, Long> clientUnblock(long id, UnblockType type) {
+        LettuceAssert.notNull(type, "UnblockType " + MUST_NOT_BE_NULL);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(UNBLOCK).add(id).add(type);
+        return createCommand(CLIENT, new IntegerOutput<>(codec), args);
+    }
+
     Command<K, V, String> clusterAddslots(int[] slots) {
         notEmptySlots(slots);
 
diff --git a/src/main/java/io/lettuce/core/UnblockType.java b/src/main/java/io/lettuce/core/UnblockType.java
new file mode 100644
index 0000000000..d96a256828
--- /dev/null
+++ b/src/main/java/io/lettuce/core/UnblockType.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import io.lettuce.core.protocol.LettuceCharsets;
+import io.lettuce.core.protocol.ProtocolKeyword;
+
+/**
+ * Unblock type for {@code CLIENT UNBLOCK} command.
+ *
+ * @author Mark Paluch
+ * @since 5.1
+ */
+public enum UnblockType implements ProtocolKeyword {
+
+    TIMEOUT, ERROR;
+
+    private final byte[] bytes;
+
+    UnblockType() {
+        bytes = name().getBytes(LettuceCharsets.ASCII);
+    }
+
+    @Override
+    public byte[] getBytes() {
+        return bytes;
+    }
+}
diff --git a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
index 8afd84c525..1b82ad46cd 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
@@ -21,6 +21,7 @@
 
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.RedisFuture;
+import io.lettuce.core.UnblockType;
 import io.lettuce.core.protocol.CommandType;
 
 /**
@@ -79,6 +80,16 @@ public interface RedisServerAsyncCommands<K, V> {
      */
     RedisFuture<Long> clientKill(KillArgs killArgs);
 
+    /**
+     * Unblock the specified blocked client.
+     *
+     * @param id the client id.
+     * @param type unblock type.
+     * @return Long integer-reply number of unblocked connections.
+     * @since 5.1
+     */
+    RedisFuture<Long> clientUnblock(long id, UnblockType type);
+
     /**
      * Stop processing commands from clients for some time.
      *
@@ -189,11 +200,15 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Make the server crash: Out of memory.
+     *
+     * @return nothing, because the server crashes before returning.
      */
     void debugOom();
 
     /**
      * Make the server crash: Invalid pointer access.
+     *
+     * @return nothing, because the server crashes before returning.
      */
     void debugSegfault();
 
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
index 14a3cfefd9..0b1cda9e80 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
@@ -21,6 +21,7 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import io.lettuce.core.KillArgs;
+import io.lettuce.core.UnblockType;
 import io.lettuce.core.protocol.CommandType;
 
 /**
@@ -79,6 +80,16 @@ public interface RedisServerReactiveCommands<K, V> {
      */
     Mono<Long> clientKill(KillArgs killArgs);
 
+    /**
+     * Unblock the specified blocked client.
+     *
+     * @param id the client id.
+     * @param type unblock type.
+     * @return Long integer-reply number of unblocked connections.
+     * @since 5.1
+     */
+    Mono<Long> clientUnblock(long id, UnblockType type);
+
     /**
      * Stop processing commands from clients for some time.
      *
@@ -284,7 +295,6 @@ public interface RedisServerReactiveCommands<K, V> {
      * Synchronously save the dataset to disk and then shut down the server.
      *
      * @param save {@literal true} force save operation
-     * @return String simple-string-reply The commands returns OK on success.
      */
     Mono<Void> shutdown(boolean save);
 
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
index 91d0a5a300..4130b6663b 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
@@ -20,6 +20,7 @@
 import java.util.Map;
 
 import io.lettuce.core.KillArgs;
+import io.lettuce.core.UnblockType;
 import io.lettuce.core.protocol.CommandType;
 
 /**
@@ -78,6 +79,16 @@ public interface RedisServerCommands<K, V> {
      */
     Long clientKill(KillArgs killArgs);
 
+    /**
+     * Unblock the specified blocked client.
+     *
+     * @param id the client id.
+     * @param type unblock type.
+     * @return Long integer-reply number of unblocked connections.
+     * @since 5.1
+     */
+    Long clientUnblock(long id, UnblockType type);
+
     /**
      * Stop processing commands from clients for some time.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
index 8128eda553..a7070de1b7 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
@@ -20,6 +20,7 @@
 import java.util.Map;
 
 import io.lettuce.core.KillArgs;
+import io.lettuce.core.UnblockType;
 import io.lettuce.core.protocol.CommandType;
 
 /**
@@ -78,6 +79,16 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
      */
     AsyncExecutions<Long> clientKill(KillArgs killArgs);
 
+    /**
+     * Unblock the specified blocked client.
+     *
+     * @param id the client id.
+     * @param type unblock type.
+     * @return Long integer-reply number of unblocked connections.
+     * @since 5.1
+     */
+    AsyncExecutions<Long> clientUnblock(long id, UnblockType type);
+
     /**
      * Stop processing commands from clients for some time.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
index 3f92738af0..38fefd0f61 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
@@ -20,6 +20,7 @@
 import java.util.Map;
 
 import io.lettuce.core.KillArgs;
+import io.lettuce.core.UnblockType;
 import io.lettuce.core.protocol.CommandType;
 
 /**
@@ -78,6 +79,16 @@ public interface NodeSelectionServerCommands<K, V> {
      */
     Executions<Long> clientKill(KillArgs killArgs);
 
+    /**
+     * Unblock the specified blocked client.
+     *
+     * @param id the client id.
+     * @param type unblock type.
+     * @return Long integer-reply number of unblocked connections.
+     * @since 5.1
+     */
+    Executions<Long> clientUnblock(long id, UnblockType type);
+
     /**
      * Stop processing commands from clients for some time.
      *
diff --git a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
index 42cd961328..bf05073ac7 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
@@ -19,6 +19,7 @@
  * Keyword modifiers for redis commands.
  *
  * @author Will Glozer
+ * @author Mark Paluch
  */
 public enum CommandKeyword implements ProtocolKeyword {
 
@@ -36,7 +37,7 @@ public enum CommandKeyword implements ProtocolKeyword {
 
     RESETSTAT, RESTART, RETRYCOUNT, REWRITE, SAVECONFIG, SDSLEN, SETNAME, SETSLOT, SLOTS, STABLE,
 
-    MIGRATING, IMPORTING, SKIPME, SLAVES, STORE, SUM, SEGFAULT, WEIGHTS,
+    MIGRATING, IMPORTING, SKIPME, SLAVES, STORE, SUM, SEGFAULT, UNBLOCK, WEIGHTS,
 
     WITHSCORES, XOR;
 
diff --git a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
index 6198403110..38e907f848 100644
--- a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
@@ -20,6 +20,7 @@
 import java.util.Map;
 
 import io.lettuce.core.KillArgs;
+import io.lettuce.core.UnblockType;
 import io.lettuce.core.protocol.CommandType;
 
 /**
@@ -77,6 +78,16 @@ public interface RedisServerCommands<K, V> {
      */
     Long clientKill(KillArgs killArgs);
 
+    /**
+     * Unblock the specified blocked client.
+     *
+     * @param id the client id.
+     * @param type unblock type.
+     * @return Long integer-reply number of unblocked connections.
+     * @since 5.1
+     */
+    Long clientUnblock(long id, UnblockType type);
+
     /**
      * Stop processing commands from clients for some time.
      *
diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
index b23a0565fe..692431abe0 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
@@ -18,10 +18,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -32,9 +34,8 @@
 
 import io.lettuce.RedisConditions;
 import io.lettuce.Wait;
-import io.lettuce.core.AbstractRedisClientTest;
-import io.lettuce.core.KillArgs;
-import io.lettuce.core.TestSettings;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.models.command.CommandDetail;
 import io.lettuce.core.models.command.CommandDetailParser;
@@ -115,6 +116,34 @@ public void clientList() {
         assertThat(redis.clientList().contains("addr=")).isTrue();
     }
 
+    @Test
+    public void clientUnblock() throws InterruptedException {
+
+        try {
+            redis.clientUnblock(0, UnblockType.ERROR);
+        } catch (Exception e) {
+            assumeFalse(e.getMessage(), true);
+        }
+
+        StatefulRedisConnection<String, String> connection2 = client.connect();
+        connection2.sync().clientSetname("blocked");
+
+        RedisFuture<KeyValue<String, String>> blocked = connection2.async().brpop(100000, "foo");
+
+        Pattern p = Pattern.compile("^.*id=([^ ]+).*name=blocked.*$", Pattern.MULTILINE | Pattern.DOTALL);
+        String clients = redis.clientList();
+        Matcher m = p.matcher(clients);
+
+        assertThat(m.matches()).isTrue();
+        String id = m.group(1);
+
+        Long unblocked = redis.clientUnblock(Long.parseLong(id), UnblockType.ERROR);
+        assertThat(unblocked).isEqualTo(1);
+
+        blocked.await(1, TimeUnit.SECONDS);
+        assertThat(blocked.getError()).contains("UNBLOCKED client unblocked");
+    }
+
     @Test
     public void commandCount() {
         assertThat(redis.commandCount()).isGreaterThan(100);

From d7197c5d1497c7ae8b5f3916791f598f3758ed00 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 25 Jul 2018 16:54:47 +0200
Subject: [PATCH 487/808] Add RedisStream commands to RedisClusterCommands #821

Also, add Stream API to Async/Reactive interfaces.
---
 .../cluster/api/async/RedisClusterAsyncCommands.java   |  8 ++++----
 .../api/reactive/RedisClusterReactiveCommands.java     | 10 +++++-----
 .../core/cluster/api/sync/RedisClusterCommands.java    |  7 ++++---
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
index cfd2eb2d5c..73f5762995 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
@@ -32,10 +32,10 @@
  * @author Mark Paluch
  * @since 4.0
  */
-public interface RedisClusterAsyncCommands<K, V> extends RedisHashAsyncCommands<K, V>, RedisKeyAsyncCommands<K, V>,
-        RedisStringAsyncCommands<K, V>, RedisListAsyncCommands<K, V>, RedisSetAsyncCommands<K, V>,
-        RedisSortedSetAsyncCommands<K, V>, RedisScriptingAsyncCommands<K, V>, RedisServerAsyncCommands<K, V>,
-        RedisHLLAsyncCommands<K, V>, RedisGeoAsyncCommands<K, V>, RedisStreamAsyncCommands<K, V>, BaseRedisAsyncCommands<K, V> {
+public interface RedisClusterAsyncCommands<K, V> extends BaseRedisAsyncCommands<K, V>, RedisGeoAsyncCommands<K, V>,
+        RedisHashAsyncCommands<K, V>, RedisHLLAsyncCommands<K, V>, RedisKeyAsyncCommands<K, V>, RedisListAsyncCommands<K, V>,
+        RedisScriptingAsyncCommands<K, V>, RedisServerAsyncCommands<K, V>, RedisSetAsyncCommands<K, V>,
+        RedisSortedSetAsyncCommands<K, V>, RedisStreamAsyncCommands<K, V>, RedisStringAsyncCommands<K, V> {
 
     /**
      * Set the default timeout for operations.
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
index ef193026bd..eab623dffd 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
@@ -32,11 +32,11 @@
  * @author Mark Paluch
  * @since 5.0
  */
-public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>,
-        RedisStringReactiveCommands<K, V>, RedisListReactiveCommands<K, V>, RedisSetReactiveCommands<K, V>,
-        RedisSortedSetReactiveCommands<K, V>, RedisScriptingReactiveCommands<K, V>, RedisServerReactiveCommands<K, V>,
-        RedisHLLReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>, RedisStreamReactiveCommands<K, V>,
-        BaseRedisReactiveCommands<K, V> {
+public interface RedisClusterReactiveCommands<K, V> extends BaseRedisReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>,
+        RedisHashReactiveCommands<K, V>, RedisHLLReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>,
+        RedisListReactiveCommands<K, V>, RedisScriptingReactiveCommands<K, V>, RedisServerReactiveCommands<K, V>,
+        RedisSetReactiveCommands<K, V>, RedisSortedSetReactiveCommands<K, V>, RedisStreamReactiveCommands<K, V>,
+        RedisStringReactiveCommands<K, V> {
 
     /**
      * Set the default timeout for operations.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
index 9e127ba55d..6bb7b4e019 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
@@ -29,9 +29,10 @@
  * @author Mark Paluch
  * @since 4.0
  */
-public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, RedisKeyCommands<K, V>, RedisStringCommands<K, V>,
-        RedisListCommands<K, V>, RedisSetCommands<K, V>, RedisSortedSetCommands<K, V>, RedisScriptingCommands<K, V>,
-        RedisServerCommands<K, V>, RedisHLLCommands<K, V>, RedisGeoCommands<K, V>, BaseRedisCommands<K, V> {
+public interface RedisClusterCommands<K, V> extends BaseRedisCommands<K, V>, RedisGeoCommands<K, V>, RedisHashCommands<K, V>,
+        RedisHLLCommands<K, V>, RedisKeyCommands<K, V>, RedisListCommands<K, V>, RedisScriptingCommands<K, V>,
+        RedisServerCommands<K, V>, RedisSetCommands<K, V>, RedisSortedSetCommands<K, V>, RedisStreamCommands<K, V>,
+        RedisStringCommands<K, V> {
 
     /**
      * Set the default timeout for operations.

From 2b31fef0d06723f31c4b83df0a2db3606ddb57f1 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 25 Jul 2018 16:55:09 +0200
Subject: [PATCH 488/808] Polishing #821

Improve Javadoc.
---
 .../core/api/async/RedisStreamAsyncCommands.java       |  6 +++---
 .../core/api/reactive/RedisStreamReactiveCommands.java | 10 +++++-----
 .../io/lettuce/core/api/sync/RedisStreamCommands.java  |  5 +++--
 .../api/async/NodeSelectionStreamAsyncCommands.java    |  6 +++---
 .../cluster/api/sync/NodeSelectionStreamCommands.java  |  5 +++--
 .../io/lettuce/core/api/RedisStreamCommands.java       |  4 ++--
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
index 3c11bac66f..366f4f1c41 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
@@ -17,9 +17,9 @@
 
 import java.util.List;
 import java.util.Map;
+
 import io.lettuce.core.*;
 import io.lettuce.core.XReadArgs.StreamOffset;
-import io.lettuce.core.RedisFuture;
 
 /**
  * Asynchronous executed commands for Streams.
@@ -126,7 +126,7 @@ public interface RedisStreamAsyncCommands<K, V> {
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
-     * @return simple-reply the number of pending messages
+     * @return simple-reply {@literal true} if successful.
      */
     RedisFuture<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer);
 
@@ -135,7 +135,7 @@ public interface RedisStreamAsyncCommands<K, V> {
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @return simple-reply the number of pending messages
+     * @return simple-reply {@literal true} if successful.
      */
     RedisFuture<Boolean> xgroupDestroy(K key, K group);
 
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
index 831f22f6f2..f5e27770a5 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
@@ -15,12 +15,12 @@
  */
 package io.lettuce.core.api.reactive;
 
-import java.util.List;
 import java.util.Map;
-import io.lettuce.core.*;
-import io.lettuce.core.XReadArgs.StreamOffset;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import io.lettuce.core.*;
+import io.lettuce.core.XReadArgs.StreamOffset;
 
 /**
  * Reactive executed commands for Streams.
@@ -127,7 +127,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
-     * @return simple-reply the number of pending messages
+     * @return simple-reply {@literal true} if successful.
      */
     Mono<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer);
 
@@ -136,7 +136,7 @@ public interface RedisStreamReactiveCommands<K, V> {
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @return simple-reply the number of pending messages
+     * @return simple-reply {@literal true} if successful.
      */
     Mono<Boolean> xgroupDestroy(K key, K group);
 
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
index 4819f3739e..e0df53b251 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
@@ -17,6 +17,7 @@
 
 import java.util.List;
 import java.util.Map;
+
 import io.lettuce.core.*;
 import io.lettuce.core.XReadArgs.StreamOffset;
 
@@ -125,7 +126,7 @@ public interface RedisStreamCommands<K, V> {
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
-     * @return simple-reply the number of pending messages
+     * @return simple-reply {@literal true} if successful.
      */
     Boolean xgroupDelconsumer(K key, Consumer<K> consumer);
 
@@ -134,7 +135,7 @@ public interface RedisStreamCommands<K, V> {
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @return simple-reply the number of pending messages
+     * @return simple-reply {@literal true} if successful.
      */
     Boolean xgroupDestroy(K key, K group);
 
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
index 5d9d7c3502..0d7dd9ea09 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
@@ -17,9 +17,9 @@
 
 import java.util.List;
 import java.util.Map;
+
 import io.lettuce.core.*;
 import io.lettuce.core.XReadArgs.StreamOffset;
-import io.lettuce.core.RedisFuture;
 
 /**
  * Asynchronous executed commands on a node selection for Streams.
@@ -126,7 +126,7 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
-     * @return simple-reply the number of pending messages
+     * @return simple-reply {@literal true} if successful.
      */
     AsyncExecutions<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer);
 
@@ -135,7 +135,7 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @return simple-reply the number of pending messages
+     * @return simple-reply {@literal true} if successful.
      */
     AsyncExecutions<Boolean> xgroupDestroy(K key, K group);
 
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
index 6ab40c5544..71cad5267a 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
@@ -17,6 +17,7 @@
 
 import java.util.List;
 import java.util.Map;
+
 import io.lettuce.core.*;
 import io.lettuce.core.XReadArgs.StreamOffset;
 
@@ -125,7 +126,7 @@ public interface NodeSelectionStreamCommands<K, V> {
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
-     * @return simple-reply the number of pending messages
+     * @return simple-reply {@literal true} if successful.
      */
     Executions<Boolean> xgroupDelconsumer(K key, Consumer<K> consumer);
 
@@ -134,7 +135,7 @@ public interface NodeSelectionStreamCommands<K, V> {
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @return simple-reply the number of pending messages
+     * @return simple-reply {@literal true} if successful.
      */
     Executions<Boolean> xgroupDestroy(K key, K group);
 
diff --git a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
index 0bfbca85cc..e8218011eb 100644
--- a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
@@ -125,7 +125,7 @@ public interface RedisStreamCommands<K, V> {
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
-     * @return simple-reply the number of pending messages
+     * @return simple-reply {@literal true} if successful.
      */
     Boolean xgroupDelconsumer(K key, Consumer<K> consumer);
 
@@ -134,7 +134,7 @@ public interface RedisStreamCommands<K, V> {
      *
      * @param key the stream key.
      * @param group name of the consumer group.
-     * @return simple-reply the number of pending messages
+     * @return simple-reply {@literal true} if successful.
      */
     Boolean xgroupDestroy(K key, K group);
 

From 7eb8bb5aa14c950c4338dc5373b9beb8c94ae7a3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 27 Jul 2018 16:44:26 +0200
Subject: [PATCH 489/808] Retain response order for Set responses #823

Lettuce now retains the response order for set results such as smembers. Previously, we used a plain HashSet that did not honor insertion order. Now we're using LinkedHashSet that retains the insertion order for unique elements.
---
 src/main/java/io/lettuce/core/output/OutputFactory.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/output/OutputFactory.java b/src/main/java/io/lettuce/core/output/OutputFactory.java
index 70fe2ad017..90f4c57a63 100644
--- a/src/main/java/io/lettuce/core/output/OutputFactory.java
+++ b/src/main/java/io/lettuce/core/output/OutputFactory.java
@@ -37,6 +37,6 @@ static <V> Set<V> newSet(int capacity) {
             return Collections.emptySet();
         }
 
-        return new HashSet<>(capacity, 1);
+        return new LinkedHashSet<>(capacity, 1);
     }
 }

From 7ab643808939169c8b3512667c6e470554b646fc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 28 Jul 2018 20:54:37 +0200
Subject: [PATCH 490/808] Change ZINCRBY member to value type #826

The member of ZINCRBY is typed to value now as it references a sort member. Previously it was typed to key.
---
 src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java | 2 +-
 .../java/io/lettuce/core/AbstractRedisReactiveCommands.java   | 2 +-
 src/main/java/io/lettuce/core/RedisCommandBuilder.java        | 4 ++--
 .../lettuce/core/api/async/RedisSortedSetAsyncCommands.java   | 4 ++--
 .../core/api/reactive/RedisSortedSetReactiveCommands.java     | 4 ++--
 .../java/io/lettuce/core/api/sync/RedisSortedSetCommands.java | 4 ++--
 .../api/async/NodeSelectionSortedSetAsyncCommands.java        | 4 ++--
 .../core/cluster/api/sync/NodeSelectionSortedSetCommands.java | 4 ++--
 .../templates/io/lettuce/core/api/RedisSortedSetCommands.java | 4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 61569e83dd..0f98a9d010 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1676,7 +1676,7 @@ public RedisFuture<Long> zcount(K key, Range<? extends Number> range) {
     }
 
     @Override
-    public RedisFuture<Double> zincrby(K key, double amount, K member) {
+    public RedisFuture<Double> zincrby(K key, double amount, V member) {
         return dispatch(commandBuilder.zincrby(key, amount, member));
     }
 
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index c97a3c44eb..b97325fc0f 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -1726,7 +1726,7 @@ public Mono<Long> zcount(K key, Range<? extends Number> range) {
     }
 
     @Override
-    public Mono<Double> zincrby(K key, double amount, K member) {
+    public Mono<Double> zincrby(K key, double amount, V member) {
         return createMono(() -> commandBuilder.zincrby(key, amount, member));
     }
 
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index d27bfa87b7..778721eac0 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -2445,10 +2445,10 @@ Command<K, V, Long> zcount(K key, Range<? extends Number> range) {
         return createCommand(ZCOUNT, new IntegerOutput<>(codec), args);
     }
 
-    Command<K, V, Double> zincrby(K key, double amount, K member) {
+    Command<K, V, Double> zincrby(K key, double amount, V member) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(amount).addKey(member);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(amount).addValue(member);
         return createCommand(ZINCRBY, new DoubleOutput<>(codec), args);
     }
 
diff --git a/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
index fc0073a444..2fd46ff808 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
@@ -203,11 +203,11 @@ public interface RedisSortedSetAsyncCommands<K, V> {
      *
      * @param key the key
      * @param amount the increment type: long
-     * @param member the member type: key
+     * @param member the member type: value
      * @return Double bulk-string-reply the new score of {@code member} (a double precision floating point number), represented
      *         as string.
      */
-    RedisFuture<Double> zincrby(K key, double amount, K member);
+    RedisFuture<Double> zincrby(K key, double amount, V member);
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
index d227bb3ab4..bd695f2986 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
@@ -203,11 +203,11 @@ public interface RedisSortedSetReactiveCommands<K, V> {
      *
      * @param key the key
      * @param amount the increment type: long
-     * @param member the member type: key
+     * @param member the member type: value
      * @return Double bulk-string-reply the new score of {@code member} (a double precision floating point number), represented
      *         as string.
      */
-    Mono<Double> zincrby(K key, double amount, K member);
+    Mono<Double> zincrby(K key, double amount, V member);
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
index d3f17a09cd..d92c0afb41 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
@@ -203,11 +203,11 @@ public interface RedisSortedSetCommands<K, V> {
      *
      * @param key the key
      * @param amount the increment type: long
-     * @param member the member type: key
+     * @param member the member type: value
      * @return Double bulk-string-reply the new score of {@code member} (a double precision floating point number), represented
      *         as string.
      */
-    Double zincrby(K key, double amount, K member);
+    Double zincrby(K key, double amount, V member);
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
index 05d9b82cde..f81f793586 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
@@ -203,11 +203,11 @@ public interface NodeSelectionSortedSetAsyncCommands<K, V> {
      *
      * @param key the key
      * @param amount the increment type: long
-     * @param member the member type: key
+     * @param member the member type: value
      * @return Double bulk-string-reply the new score of {@code member} (a double precision floating point number), represented
      *         as string.
      */
-    AsyncExecutions<Double> zincrby(K key, double amount, K member);
+    AsyncExecutions<Double> zincrby(K key, double amount, V member);
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
index 08e51e0045..bc082a0891 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
@@ -203,11 +203,11 @@ public interface NodeSelectionSortedSetCommands<K, V> {
      *
      * @param key the key
      * @param amount the increment type: long
-     * @param member the member type: key
+     * @param member the member type: value
      * @return Double bulk-string-reply the new score of {@code member} (a double precision floating point number), represented
      *         as string.
      */
-    Executions<Double> zincrby(K key, double amount, K member);
+    Executions<Double> zincrby(K key, double amount, V member);
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.
diff --git a/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java b/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
index 2063c2e27d..62fd89ebc1 100644
--- a/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
@@ -202,11 +202,11 @@ public interface RedisSortedSetCommands<K, V> {
      *
      * @param key the key
      * @param amount the increment type: long
-     * @param member the member type: key
+     * @param member the member type: value
      * @return Double bulk-string-reply the new score of {@code member} (a double precision floating point number), represented
      *         as string.
      */
-    Double zincrby(K key, double amount, K member);
+    Double zincrby(K key, double amount, V member);
 
     /**
      * Intersect multiple sorted sets and store the resulting sorted set in a new key.

From 7742f8f3b2dabef1f67ba1cff66461d2f704f8d8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 30 Jul 2018 13:18:23 +0200
Subject: [PATCH 491/808] Replace stream concatenation in ScanStream with
 FluxSink/Subscriber bridge #824
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ScanStream now uses Flux.create(…) and FluxSink to emit cursor results from SCAN operations. SubscriptionAdapter and ScanSubscriber retrieve SCAN cursor results considering the demand of downstream subscribers. SCAN results are either directly emitted (given sufficient demand) or buffered (if the demand is satisfied).

The previously used stream concatenation coupled the reactive sequence length to the amount of cursor calls. With a sufficient cursor fetches, the reactive sequence failed with a StackOverflowError on completion as all operators of the sequence received the completion signal.

The resulting ScanStream publisher is tested with the RS TCK through ScanStreamVerification.
---
 src/main/java/io/lettuce/core/ScanStream.java | 359 ++++++++++++++++--
 .../java/io/lettuce/core/ScanStreamTest.java  |   9 +-
 .../core/reactive/ScanStreamVerification.java | 102 +++++
 3 files changed, 437 insertions(+), 33 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java

diff --git a/src/main/java/io/lettuce/core/ScanStream.java b/src/main/java/io/lettuce/core/ScanStream.java
index c11bbcbfba..680b4a4e89 100644
--- a/src/main/java/io/lettuce/core/ScanStream.java
+++ b/src/main/java/io/lettuce/core/ScanStream.java
@@ -15,14 +15,17 @@
  */
 package io.lettuce.core;
 
+import java.util.Iterator;
 import java.util.Optional;
-import java.util.function.BiFunction;
+import java.util.Queue;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import java.util.function.Function;
 
-import org.reactivestreams.Publisher;
-
+import reactor.core.publisher.BaseSubscriber;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.FluxSink;
 import reactor.core.publisher.Mono;
+import reactor.util.context.Context;
 import io.lettuce.core.api.reactive.RedisHashReactiveCommands;
 import io.lettuce.core.api.reactive.RedisKeyReactiveCommands;
 import io.lettuce.core.api.reactive.RedisSetReactiveCommands;
@@ -81,9 +84,13 @@ private static <K, V> Flux<K> scan(RedisKeyReactiveCommands<K, V> commands, Opti
 
         LettuceAssert.notNull(commands, "RedisKeyCommands must not be null");
 
-        Mono<KeyScanCursor<K>> res = scanArgs.map(commands::scan).orElseGet(commands::scan);
+        return Flux.create(sink -> {
+
+            Mono<KeyScanCursor<K>> res = scanArgs.map(commands::scan).orElseGet(commands::scan);
 
-        return res.flatMapMany(cursor -> scan(scanArgs, cursor, commands::scan, commands::scan, KeyScanCursor::getKeys));
+            scan(sink, res, c -> scanArgs.map(it -> commands.scan(c, it)).orElseGet(() -> commands.scan(c)), //
+                    KeyScanCursor::getKeys);
+        });
     }
 
     /**
@@ -124,12 +131,20 @@ private static <K, V> Flux<KeyValue<K, V>> hscan(RedisHashReactiveCommands<K, V>
         LettuceAssert.notNull(commands, "RedisHashReactiveCommands must not be null");
         LettuceAssert.notNull(key, "Key must not be null");
 
-        Mono<MapScanCursor<K, V>> res = scanArgs.map(it -> commands.hscan(key, it)).orElseGet(() -> commands.hscan(key));
+        return Flux.create(sink -> {
+
+            Mono<MapScanCursor<K, V>> res = scanArgs.map(it -> commands.hscan(key, it)).orElseGet(() -> commands.hscan(key));
+
+            scan(sink,
+                    res,
+                    c -> scanArgs.map(it -> commands.hscan(key, c, it)).orElseGet(() -> commands.hscan(key, c)), //
+                    c -> {
+                        Iterator<KeyValue<K, V>> iterator = c.getMap().entrySet().stream()
+                                .map(me -> KeyValue.fromNullable(me.getKey(), me.getValue())).iterator();
+                        return () -> iterator;
+                    });
+        });
 
-        return res.flatMapMany(cursor -> scan(scanArgs, cursor, //
-                c -> commands.hscan(key, c), //
-                (c, args) -> commands.hscan(key, c, args), //
-                c -> c.getMap().entrySet())).map(me -> KeyValue.fromNullable(me.getKey(), me.getValue()));
     }
 
     /**
@@ -169,12 +184,13 @@ private static <K, V> Flux<V> sscan(RedisSetReactiveCommands<K, V> commands, K k
         LettuceAssert.notNull(commands, "RedisSetReactiveCommands must not be null");
         LettuceAssert.notNull(key, "Key must not be null");
 
-        Mono<ValueScanCursor<V>> res = scanArgs.map(it -> commands.sscan(key, it)).orElseGet(() -> commands.sscan(key));
+        return Flux.create(sink -> {
+
+            Mono<ValueScanCursor<V>> res = scanArgs.map(it -> commands.sscan(key, it)).orElseGet(() -> commands.sscan(key));
 
-        return res.flatMapMany(cursor -> scan(scanArgs, cursor, //
-                c -> commands.sscan(key, c), //
-                (c, args) -> commands.sscan(key, c, args), //
-                ValueScanCursor::getValues));
+            scan(sink, res, c -> scanArgs.map(it -> commands.sscan(key, c, it)).orElseGet(() -> commands.sscan(key, c)), //
+                    ValueScanCursor::getValues);
+        });
     }
 
     /**
@@ -215,28 +231,311 @@ private static <K, V> Flux<ScoredValue<V>> zscan(RedisSortedSetReactiveCommands<
         LettuceAssert.notNull(commands, "RedisSortedSetReactiveCommands must not be null");
         LettuceAssert.notNull(key, "Key must not be null");
 
-        Mono<ScoredValueScanCursor<V>> res = scanArgs.map(it -> commands.zscan(key, it)).orElseGet(() -> commands.zscan(key));
+        return Flux.create(sink -> {
+
+            Mono<ScoredValueScanCursor<V>> res = scanArgs.map(it -> commands.zscan(key, it)).orElseGet(
+                    () -> commands.zscan(key));
+
+            scan(sink, res, c -> scanArgs.map(it -> commands.zscan(key, c, it)).orElseGet(() -> commands.zscan(key, c)), //
+                    ScoredValueScanCursor::getValues);
+        });
+    }
+
+    private static <V, C extends ScanCursor> void scan(FluxSink<V> sink, Mono<C> initialCursor,
+            Function<ScanCursor, Mono<C>> scanFunction, Function<C, Iterable<V>> manyMapper) {
+
+        new SubscriptionAdapter<>(sink, initialCursor, scanFunction, manyMapper).register();
+    }
+
+    /**
+     * Adapter for {@link FluxSink} to dispatch multiple {@link reactor.core.CoreSubscriber} considering subscription demand.
+     *
+     * @param <T> item type.
+     * @param <C> cursor type.
+     */
+    static class SubscriptionAdapter<T, C extends ScanCursor> implements Completable {
+
+        private static final AtomicReferenceFieldUpdater<SubscriptionAdapter, ScanSubscriber> SUBSCRIBER_ACCESSOR = AtomicReferenceFieldUpdater
+                .newUpdater(SubscriptionAdapter.class, ScanSubscriber.class, "currentSubscription");
+
+        // Access via SUBSCRIBER_UPDATER.
+        @SuppressWarnings("unused")
+        private volatile ScanSubscriber<T, C> currentSubscription;
+        private volatile boolean canceled;
+        private volatile boolean terminated = false;
+
+        private final FluxSink<T> sink;
+        private final Context context;
+        private final Mono<C> initial;
+        private final Function<ScanCursor, Mono<C>> scanFunction;
+        private final Function<C, Iterable<T>> manyMapper;
+
+        SubscriptionAdapter(FluxSink<T> sink, Mono<C> initial, Function<ScanCursor, Mono<C>> scanFunction,
+                Function<C, Iterable<T>> manyMapper) {
+
+            this.sink = sink;
+            this.context = sink.currentContext();
+            this.initial = initial;
+            this.scanFunction = scanFunction;
+            this.manyMapper = manyMapper;
+
+        }
+
+        /**
+         * Register cancel and onDemand callbacks.
+         */
+        public void register() {
+            this.sink.onRequest(this::onDemand);
+            this.sink.onCancel(this::canceled);
+        }
+
+        void onDemand(long n) {
+
+            if (this.canceled) {
+                return;
+            }
+
+            long demand = sink.requestedFromDownstream();
+
+            ScanSubscriber<T, C> current = getCurrentSubscriber();
+
+            if (current == null) {
+                current = new ScanSubscriber<>(this, sink, context, manyMapper);
+                if (SUBSCRIBER_ACCESSOR.compareAndSet(this, null, current)) {
+                    initial.subscribe(current);
+                }
+
+                return;
+            }
+
+            ScanCursor cursor = current.getCursor();
+
+            if (cursor == null) {
+                return;
+            }
+
+            current.emitFromBuffer();
+
+            if (!current.exhausted || current.canceled || demand == 0) {
+                return;
+            }
+
+            if (cursor.isFinished()) {
+                chunkCompleted();
+                return;
+            }
+
+            Mono<C> next = scanFunction.apply(cursor);
+
+            ScanSubscriber<T, C> nextSubscriber = new ScanSubscriber<>(this, sink, context, manyMapper);
+            if (SUBSCRIBER_ACCESSOR.compareAndSet(this, current, nextSubscriber)) {
+                next.subscribe(nextSubscriber);
+            }
+        }
+
+        private void canceled() {
+
+            this.canceled = true;
+
+            ScanSubscriber<T, C> current = getCurrentSubscriber();
+            if (current != null) {
+                current.cancel();
+            }
+        }
+
+        @Override
+        public void chunkCompleted() {
+
+            if (!canceled) {
+
+                ScanSubscriber<T, C> current = getCurrentSubscriber();
+                if (current != null) {
+
+                    ScanCursor cursor = current.getCursor();
+
+                    if (cursor != null) {
+                        if (!cursor.isFinished() || !current.exhausted) {
+                            onDemand(0);
+                            return;
+                        }
+                    }
+                }
+
+                if (!this.terminated) {
+                    this.terminated = true;
+                    sink.complete();
+                } else {
+                    this.terminated = true;
+                }
+            }
+        }
+
+        ScanSubscriber<T, C> getCurrentSubscriber() {
+            return SUBSCRIBER_ACCESSOR.get(this);
+        }
 
-        return res.flatMapMany(cursor -> scan(scanArgs, cursor, //
-                c -> commands.zscan(key, c), //
-                (c, args) -> commands.zscan(key, c, args), //
-                ScoredValueScanCursor::getValues));
+        @Override
+        public void onError(Throwable throwable) {
+
+            if (!this.canceled && !this.terminated) {
+                this.terminated = true;
+                sink.error(throwable);
+            } else {
+                this.terminated = true;
+            }
+        }
     }
 
-    private static <V, C extends ScanCursor> Publisher<V> scan(Optional<ScanArgs> scanArgs, C cursor,
-            Function<ScanCursor, Mono<C>> scanFunction, BiFunction<ScanCursor, ScanArgs, Mono<C>> scanWithArgsFunction,
-            Function<C, Iterable<V>> manyMapper) {
+    /**
+     * {@link reactor.core.CoreSubscriber} for a {@code SCAN} cursor.
+     *
+     * @param <T> item type.
+     * @param <C> cursor type.
+     */
+    static class ScanSubscriber<T, C extends ScanCursor> extends BaseSubscriber<C> {
+
+        private static final AtomicReferenceFieldUpdater<ScanSubscriber, ScanCursor> CURSOR_ACCESSOR = AtomicReferenceFieldUpdater
+                .newUpdater(ScanSubscriber.class, ScanCursor.class, "cursor");
+
+        private final Completable completable;
+        private final FluxSink<T> sink;
+        private final Queue<T> buffer = Operators.newQueue();
+        private final Context context;
+        private final Function<C, Iterable<T>> manyMapper;
+
+        volatile boolean exhausted = false;
+        volatile boolean canceled;
+
+        // see CURSOR_UPDATER
+        @SuppressWarnings("unused")
+        private volatile C cursor;
+
+        ScanSubscriber(Completable completable, FluxSink<T> sink, Context context, Function<C, Iterable<T>> manyMapper) {
+            this.completable = completable;
+            this.sink = sink;
+            this.context = context;
+            this.manyMapper = manyMapper;
+        }
+
+        @Override
+        public Context currentContext() {
+            return context;
+        }
+
+        @Override
+        protected void hookOnNext(C cursor) {
+
+            if (!CURSOR_ACCESSOR.compareAndSet(this, null, cursor)) {
+                Operators.onOperatorError(this, new IllegalStateException("Cannot propagate Cursor"), cursor, context);
+                return;
+            }
+
+            Iterable<T> iterable = manyMapper.apply(cursor);
+
+            emitDirect(iterable);
+        }
+
+        /**
+         * Fast-path emission that emits items directly without using an intermediate buffer. Only overflow (more items
+         * available than requested) is stored in the buffer.
+         *
+         * @param iterable
+         */
+        void emitDirect(Iterable<T> iterable) {
+
+            long demand = sink.requestedFromDownstream();
+            long sent = 0;
+
+            if (demand > 0) {
+                for (T value : iterable) {
 
-        Flux<V> stream = Flux.fromIterable(manyMapper.apply(cursor));
+                    if (canceled) {
+                        break;
+                    }
 
-        if (!cursor.isFinished()) {
+                    if (demand <= sent) {
+                        buffer.add(value);
+                        continue;
+                    }
 
-            Mono<C> mono = scanArgs.map(args -> scanWithArgsFunction.apply(cursor, args)).orElseGet(
-                    () -> scanFunction.apply(cursor));
-            return stream.concatWith(mono.flatMapMany(nextCursor -> scan(scanArgs, nextCursor, scanFunction,
-                    scanWithArgsFunction, manyMapper)));
+                    sent++;
+
+                    next(value);
+                }
+            }
+
+            exhausted = buffer.isEmpty();
+        }
+
+        /**
+         * Buffer-based emission polling items from the buffer and emitting until the demand is satisified or the buffer is
+         * exhausted.
+         */
+        void emitFromBuffer() {
+
+            long demand = sink.requestedFromDownstream();
+            long sent = 0;
+
+            if (demand > 0) {
+                T value;
+                while ((value = buffer.poll()) != null) {
+
+                    if (canceled) {
+                        break;
+                    }
+
+                    sent++;
+
+                    next(value);
+
+                    if (demand <= sent) {
+                        break;
+                    }
+                }
+            }
+
+            exhausted = buffer.isEmpty();
+        }
+
+        private void next(T value) {
+            sink.next(value);
+        }
+
+        @Override
+        protected void hookOnComplete() {
+            completable.chunkCompleted();
+        }
+
+        @Override
+        protected void hookOnError(Throwable throwable) {
+            completable.onError(throwable);
+        }
+
+        @Override
+        protected void hookOnCancel() {
+            this.canceled = true;
+        }
+
+        public ScanCursor getCursor() {
+            return CURSOR_ACCESSOR.get(this);
         }
+    }
 
-        return stream;
+    /**
+     * Completion callback interface.
+     */
+    interface Completable {
+
+        /**
+         * Callback if a cursor chunk is completed.
+         */
+        void chunkCompleted();
+
+        /**
+         * Error callback.
+         *
+         * @param throwable
+         */
+        void onError(Throwable throwable);
     }
 }
diff --git a/src/test/java/io/lettuce/core/ScanStreamTest.java b/src/test/java/io/lettuce/core/ScanStreamTest.java
index 14dc54a1d1..0ba7c6dc05 100644
--- a/src/test/java/io/lettuce/core/ScanStreamTest.java
+++ b/src/test/java/io/lettuce/core/ScanStreamTest.java
@@ -16,6 +16,7 @@
 package io.lettuce.core;
 
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Test;
 
@@ -67,9 +68,11 @@ public void shouldSscanIteratively() {
 
         RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
 
-        StepVerifier.create(ScanStream.sscan(reactive, key, ScanArgs.Builder.limit(200)).take(250)).expectNextCount(250)
-                .verifyComplete();
-        StepVerifier.create(ScanStream.sscan(reactive, key)).expectNextCount(1000).verifyComplete();
+        AtomicInteger ai = new AtomicInteger();
+        StepVerifier.create(ScanStream.sscan(reactive, key, ScanArgs.Builder.limit(200)).doOnNext(n -> {
+            System.out.println(ai.incrementAndGet());
+        }), 0).thenRequest(250).expectNextCount(250).thenCancel().verify();
+        StepVerifier.create(ScanStream.sscan(reactive, key).count()).expectNext(1000L).verifyComplete();
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java b/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java
new file mode 100644
index 0000000000..fe59c69b23
--- /dev/null
+++ b/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.reactive;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.reactivestreams.Publisher;
+import org.reactivestreams.tck.PublisherVerification;
+import org.reactivestreams.tck.TestEnvironment;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+
+import io.lettuce.TestClientResources;
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+
+/**
+ * Reactive Streams TCK for {@link ScanStream}.
+ *
+ * @author Mark Paluch
+ */
+public class ScanStreamVerification extends PublisherVerification<String> {
+
+    private static final int ELEMENT_COUNT = 10000;
+
+    private static RedisClient client;
+    private static StatefulRedisConnection<String, String> connection;
+
+    public ScanStreamVerification() {
+        super(new TestEnvironment(1000));
+    }
+
+    @BeforeClass
+    private static void beforeClass() {
+        client = RedisClient.create(TestClientResources.get(), RedisURI.create(TestSettings.host(), TestSettings.port()));
+        connection = client.connect();
+        connection.sync().flushall();
+    }
+
+    @AfterClass
+    private static void afterClass() {
+        connection.close();
+        FastShutdown.shutdown(client);
+    }
+
+    @Override
+    public Publisher<String> createPublisher(long elements) {
+
+        RedisCommands<String, String> sync = connection.sync();
+        sync.flushall();
+
+        if (elements == Long.MAX_VALUE) {
+            return null;
+        }
+
+        Map<String, String> map = new HashMap<>();
+
+        for (int i = 0; i < elements; i++) {
+
+            String element = "ScanStreamVerification-" + i;
+            map.put(element, element);
+
+            if (i % 1000 == 0 && !map.isEmpty()) {
+                sync.mset(map);
+                map.clear();
+            }
+        }
+
+        if (!map.isEmpty()) {
+            sync.mset(map);
+            map.clear();
+        }
+
+        return ScanStream.scan(connection.reactive());
+    }
+
+    @Override
+    public long maxElementsFromPublisher() {
+        return ELEMENT_COUNT;
+    }
+
+    @Override
+    public Publisher<String> createFailedPublisher() {
+        return null;
+    }
+
+}

From 232301f562e156edf61c1d985adf9000dad66255 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 30 Jul 2018 13:18:51 +0200
Subject: [PATCH 492/808] Polishing #824

---
 .../lettuce/core/reactive/RedisPublisherVerification.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
index 6f24130073..359d85051a 100644
--- a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
+++ b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
@@ -37,6 +37,8 @@
 import io.lettuce.core.protocol.CommandArgs;
 
 /**
+ * Reactive Streams TCK for {@link RedisPublisher}.
+ *
  * @author Mark Paluch
  */
 public class RedisPublisherVerification extends PublisherVerification<String> {
@@ -83,9 +85,7 @@ public Publisher<String> createPublisher(long elements) {
             return new Command<>(LRANGE, new ValueListOutput<>(CODEC), args);
         };
 
-        TestRedisPublisher<String, String, String> publisher = new TestRedisPublisher(supplier, connection, true);
-
-        return publisher;
+        return new TestRedisPublisher(supplier, connection, true);
     }
 
     @Override

From dea99cbf692f166ad025a960f4bda84aa0d80a40 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 30 Jul 2018 13:26:40 +0200
Subject: [PATCH 493/808] Remove superfluous call to command.get() in
 FutureSyncInvocationHandler #809

---
 src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
index 826fcab28f..d8393378fe 100644
--- a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
@@ -66,8 +66,7 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
 
                 long timeout = getTimeoutNs(command);
 
-                LettuceFutures.awaitOrCancel(command, timeout, TimeUnit.NANOSECONDS);
-                return command.get();
+                return LettuceFutures.awaitOrCancel(command, timeout, TimeUnit.NANOSECONDS);
             }
 
             return result;

From 08d283616bc4730a1e11ee25c7ef49e7b0ecd5b3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 31 Jul 2018 09:25:05 +0200
Subject: [PATCH 494/808] Polishing #824

Add synchronization to subscription termination to guarantee only a single signal (error/completion) is sent and to avoid duplicate signals.
---
 src/main/java/io/lettuce/core/ScanStream.java | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/main/java/io/lettuce/core/ScanStream.java b/src/main/java/io/lettuce/core/ScanStream.java
index 680b4a4e89..087d48c929 100644
--- a/src/main/java/io/lettuce/core/ScanStream.java
+++ b/src/main/java/io/lettuce/core/ScanStream.java
@@ -18,6 +18,7 @@
 import java.util.Iterator;
 import java.util.Optional;
 import java.util.Queue;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import java.util.function.Function;
 
@@ -255,14 +256,23 @@ private static <V, C extends ScanCursor> void scan(FluxSink<V> sink, Mono<C> ini
      */
     static class SubscriptionAdapter<T, C extends ScanCursor> implements Completable {
 
-        private static final AtomicReferenceFieldUpdater<SubscriptionAdapter, ScanSubscriber> SUBSCRIBER_ACCESSOR = AtomicReferenceFieldUpdater
+        private static final AtomicReferenceFieldUpdater<SubscriptionAdapter, ScanSubscriber> SUBSCRIBER = AtomicReferenceFieldUpdater
                 .newUpdater(SubscriptionAdapter.class, ScanSubscriber.class, "currentSubscription");
 
-        // Access via SUBSCRIBER_UPDATER.
+        private static final AtomicIntegerFieldUpdater<SubscriptionAdapter> STATUS = AtomicIntegerFieldUpdater.newUpdater(
+                SubscriptionAdapter.class, "status");
+
+        private static final int STATUS_ACTIVE = 0;
+        private static final int STATUS_TERMINATED = 0;
+
+        // Access via SUBSCRIBER.
         @SuppressWarnings("unused")
         private volatile ScanSubscriber<T, C> currentSubscription;
         private volatile boolean canceled;
-        private volatile boolean terminated = false;
+
+        // Access via STATUS.
+        @SuppressWarnings("unused")
+        private volatile int status = STATUS_ACTIVE;
 
         private final FluxSink<T> sink;
         private final Context context;
@@ -301,7 +311,7 @@ void onDemand(long n) {
 
             if (current == null) {
                 current = new ScanSubscriber<>(this, sink, context, manyMapper);
-                if (SUBSCRIBER_ACCESSOR.compareAndSet(this, null, current)) {
+                if (SUBSCRIBER.compareAndSet(this, null, current)) {
                     initial.subscribe(current);
                 }
 
@@ -328,7 +338,7 @@ void onDemand(long n) {
             Mono<C> next = scanFunction.apply(cursor);
 
             ScanSubscriber<T, C> nextSubscriber = new ScanSubscriber<>(this, sink, context, manyMapper);
-            if (SUBSCRIBER_ACCESSOR.compareAndSet(this, current, nextSubscriber)) {
+            if (SUBSCRIBER.compareAndSet(this, current, nextSubscriber)) {
                 next.subscribe(nextSubscriber);
             }
         }
@@ -361,29 +371,27 @@ public void chunkCompleted() {
                     }
                 }
 
-                if (!this.terminated) {
-                    this.terminated = true;
+                if (terminate()) {
                     sink.complete();
-                } else {
-                    this.terminated = true;
                 }
             }
         }
 
         ScanSubscriber<T, C> getCurrentSubscriber() {
-            return SUBSCRIBER_ACCESSOR.get(this);
+            return SUBSCRIBER.get(this);
         }
 
         @Override
         public void onError(Throwable throwable) {
 
-            if (!this.canceled && !this.terminated) {
-                this.terminated = true;
+            if (!this.canceled && terminate()) {
                 sink.error(throwable);
-            } else {
-                this.terminated = true;
             }
         }
+
+        protected boolean terminate() {
+            return STATUS.compareAndSet(this, STATUS_ACTIVE, STATUS_TERMINATED);
+        }
     }
 
     /**
@@ -394,7 +402,7 @@ public void onError(Throwable throwable) {
      */
     static class ScanSubscriber<T, C extends ScanCursor> extends BaseSubscriber<C> {
 
-        private static final AtomicReferenceFieldUpdater<ScanSubscriber, ScanCursor> CURSOR_ACCESSOR = AtomicReferenceFieldUpdater
+        private static final AtomicReferenceFieldUpdater<ScanSubscriber, ScanCursor> CURSOR = AtomicReferenceFieldUpdater
                 .newUpdater(ScanSubscriber.class, ScanCursor.class, "cursor");
 
         private final Completable completable;
@@ -406,7 +414,7 @@ static class ScanSubscriber<T, C extends ScanCursor> extends BaseSubscriber<C> {
         volatile boolean exhausted = false;
         volatile boolean canceled;
 
-        // see CURSOR_UPDATER
+        // see CURSOR
         @SuppressWarnings("unused")
         private volatile C cursor;
 
@@ -425,7 +433,7 @@ public Context currentContext() {
         @Override
         protected void hookOnNext(C cursor) {
 
-            if (!CURSOR_ACCESSOR.compareAndSet(this, null, cursor)) {
+            if (!CURSOR.compareAndSet(this, null, cursor)) {
                 Operators.onOperatorError(this, new IllegalStateException("Cannot propagate Cursor"), cursor, context);
                 return;
             }
@@ -517,7 +525,7 @@ protected void hookOnCancel() {
         }
 
         public ScanCursor getCursor() {
-            return CURSOR_ACCESSOR.get(this);
+            return CURSOR.get(this);
         }
     }
 

From ba98d4ab1c203683f05efeb1fe1246ef3d16c0d5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 27 Aug 2018 10:29:29 +0200
Subject: [PATCH 495/808] Fall back to initial seed nodes on topology refresh
 when dynamicRefreshSources is enabled #822

---
 .../core/cluster/RedisClusterClient.java      | 58 ++++++++++++++-----
 .../core/cluster/RedisClusterClientTest.java  | 24 +++++---
 2 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index dabce7c3f6..3fd51fb4c6 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -840,31 +840,57 @@ protected Partitions loadPartitions() {
 
         Iterable<RedisURI> topologyRefreshSource = getTopologyRefreshSource();
 
-        String message = "Cannot retrieve initial cluster partitions from initial URIs " + topologyRefreshSource;
         try {
-            Map<RedisURI, Partitions> partitions = refresh.loadViews(topologyRefreshSource, useDynamicRefreshSources());
+            return doLoadPartitions(topologyRefreshSource);
+        } catch (RedisException e) {
 
-            if (partitions.isEmpty()) {
-                throw new RedisException(message);
-            }
+            // Attempt recovery using initial seed nodes
+            if (useDynamicRefreshSources() && topologyRefreshSource != initialUris) {
+
+                try {
+                    return doLoadPartitions(initialUris);
+                } catch (RedisConnectionException e2) {
 
-            Partitions loadedPartitions = determinePartitions(this.partitions, partitions);
-            RedisURI viewedBy = refresh.getViewedBy(partitions, loadedPartitions);
+                    RedisException exception = new RedisException(getTopologyRefreshErrorMessage(initialUris), e2);
+                    exception.addSuppressed(e);
 
-            for (RedisClusterNode partition : loadedPartitions) {
-                if (viewedBy != null) {
-                    RedisURI uri = partition.getUri();
-                    RedisClusterURIUtil.applyUriConnectionSettings(viewedBy, uri);
+                    throw exception;
                 }
             }
 
-            activateTopologyRefreshIfNeeded();
+            if (e.getClass().equals(RedisException.class)) {
+                throw e;
+            }
 
-            return loadedPartitions;
+            throw new RedisException(getTopologyRefreshErrorMessage(topologyRefreshSource), e);
+        }
+    }
+
+    private Partitions doLoadPartitions(Iterable<RedisURI> topologyRefreshSource) {
 
-        } catch (RedisConnectionException e) {
-            throw new RedisException(message, e);
+        Map<RedisURI, Partitions> partitions = refresh.loadViews(topologyRefreshSource, useDynamicRefreshSources());
+
+        if (partitions.isEmpty()) {
+            throw new RedisException(getTopologyRefreshErrorMessage(topologyRefreshSource));
         }
+
+        Partitions loadedPartitions = determinePartitions(this.partitions, partitions);
+        RedisURI viewedBy = refresh.getViewedBy(partitions, loadedPartitions);
+
+        for (RedisClusterNode partition : loadedPartitions) {
+            if (viewedBy != null) {
+                RedisURI uri = partition.getUri();
+                RedisClusterURIUtil.applyUriConnectionSettings(viewedBy, uri);
+            }
+        }
+
+        activateTopologyRefreshIfNeeded();
+
+        return loadedPartitions;
+    }
+
+    private static String getTopologyRefreshErrorMessage(Iterable<RedisURI> topologyRefreshSource) {
+        return "Cannot retrieve initial cluster partitions from initial URIs " + topologyRefreshSource;
     }
 
     /**
@@ -1053,7 +1079,7 @@ protected Iterable<RedisURI> getTopologyRefreshSource() {
 
         Iterable<RedisURI> seed;
         if (initialSeedNodes || partitions == null || partitions.isEmpty()) {
-            seed = RedisClusterClient.this.initialUris;
+            seed = this.initialUris;
         } else {
             List<RedisURI> uris = new ArrayList<>();
             for (RedisClusterNode partition : TopologyComparators.sortByUri(partitions)) {
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
index b8ba230197..80996d556a 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
@@ -216,19 +216,25 @@ public void pubSubclusterConnectionShouldSetClientName() throws InterruptedExcep
 
     @Test
     public void reloadPartitions() {
+
+        clusterClient.reloadPartitions();
         assertThat(clusterClient.getPartitions()).hasSize(4);
+    }
+
+    @Test
+    public void reloadPartitionsWithDynamicSourcesFallsBackToInitialSeedNodes() {
 
-        assertThat(clusterClient.getPartitions().getPartition(0).getUri());
-        assertThat(clusterClient.getPartitions().getPartition(1).getUri());
-        assertThat(clusterClient.getPartitions().getPartition(2).getUri());
-        assertThat(clusterClient.getPartitions().getPartition(3).getUri());
+        client.setOptions(ClusterClientOptions.builder()
+                .topologyRefreshOptions(ClusterTopologyRefreshOptions.builder().dynamicRefreshSources(true).build()).build());
 
-        clusterClient.reloadPartitions();
+        Partitions partitions = clusterClient.getPartitions();
+        partitions.clear();
+        partitions.add(new RedisClusterNode(RedisURI.create("localhost", 1), "foo", false, null, 0, 0, 0, Collections
+                .emptyList(), Collections.emptySet()));
+
+        Partitions reloaded = clusterClient.loadPartitions();
 
-        assertThat(clusterClient.getPartitions().getPartition(0).getUri());
-        assertThat(clusterClient.getPartitions().getPartition(1).getUri());
-        assertThat(clusterClient.getPartitions().getPartition(2).getUri());
-        assertThat(clusterClient.getPartitions().getPartition(3).getUri());
+        assertThat(reloaded).hasSize(4);
     }
 
     @Test

From ecfa5afca71ba410ebff088eb3449a08e23d505a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 27 Aug 2018 10:42:07 +0200
Subject: [PATCH 496/808] Add build profiles for Redis 4.0.11 and 5.0-rc4

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 38b4684add..243c94b2b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,8 @@ env:
   matrix:
     - REDIS=unstable
     - PROFILE=jmh
-    - REDIS=4.0.6
+    - REDIS=5.0-rc4
+    - REDIS=4.0.11
     - REDIS=3.2.11
 
 sudo: false

From 01f75edbc697177adb0d2c546119e3ca4ffaf93f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 6 Sep 2018 16:10:08 +0200
Subject: [PATCH 497/808] Upgrade to netty 4.1.29.Final #836

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 128e746e58..e42672b130 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
-        <netty-version>4.1.24.Final</netty-version>
+        <netty-version>4.1.29.Final</netty-version>
         <spring-version>4.3.14.RELEASE</spring-version>
         <reactor-version>Bismuth-SR8</reactor-version>
         <brave-version>5.0.0</brave-version>

From aaccdb25d7e2fcdadda1806b963d06ddfbed5609 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 6 Sep 2018 16:11:52 +0200
Subject: [PATCH 498/808] Upgrade to Spring Framework 4.3.18.RELEASE #837

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e42672b130..afb9bbe870 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
         <netty-version>4.1.29.Final</netty-version>
-        <spring-version>4.3.14.RELEASE</spring-version>
+        <spring-version>4.3.18.RELEASE</spring-version>
         <reactor-version>Bismuth-SR8</reactor-version>
         <brave-version>5.0.0</brave-version>
     </properties>

From efe7d0cea342c48d7d6b9311d7530ff827988a9e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 6 Sep 2018 16:13:07 +0200
Subject: [PATCH 499/808] Upgrade to Reactor Bismuth SR11 #838

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index afb9bbe870..9b0356225a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <skipTests>true</skipTests>
         <netty-version>4.1.29.Final</netty-version>
         <spring-version>4.3.18.RELEASE</spring-version>
-        <reactor-version>Bismuth-SR8</reactor-version>
+        <reactor-version>Bismuth-SR11</reactor-version>
         <brave-version>5.0.0</brave-version>
     </properties>
 

From b57bb82ce96a4eff911754e62bd0a15444078b34 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 6 Sep 2018 16:16:51 +0200
Subject: [PATCH 500/808] Upgrade to Brave 5.2.0 #839

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9b0356225a..f4660e0fd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
         <netty-version>4.1.29.Final</netty-version>
         <spring-version>4.3.18.RELEASE</spring-version>
         <reactor-version>Bismuth-SR11</reactor-version>
-        <brave-version>5.0.0</brave-version>
+        <brave-version>5.2.0</brave-version>
     </properties>
 
     <scm>

From 90a8601acd5213c8a30cd18975aa7bd0a1406e62 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 6 Sep 2018 16:17:46 +0200
Subject: [PATCH 501/808] Upgrade to RxJava 2.2.2 #840

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f4660e0fd5..701f7de3b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,7 +210,7 @@
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
-            <version>2.1.13</version>
+            <version>2.2.2</version>
             <optional>true</optional>
         </dependency>
 

From b1df0e4acee1a6953a79cdcff7907313fad04788 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 6 Sep 2018 16:21:39 +0200
Subject: [PATCH 502/808] Assert Java 11 build compatibility #841

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 701f7de3b9..e3ac913b07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -294,7 +294,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.17.0</version>
+            <version>2.21.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -855,7 +855,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.9</version>
+                <version>0.8.2</version>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>

From 0e09439f2702df3557d79cd4234140a1ef19453b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 6 Sep 2018 16:32:44 +0200
Subject: [PATCH 503/808] Prepare release notes #842

---
 RELEASE-NOTES.md | 302 ++++-------------------------------------------
 1 file changed, 24 insertions(+), 278 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 3f6ed302af..95ba8a8a3f 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,305 +1,51 @@
-Lettuce 5.1.0 M1 RELEASE NOTES
+Lettuce 5.1.0 RC1 RELEASE NOTES
 ===========================
 
-This is the first preview release of Lettuce 5.1 shipping with improvements and 
+This is the release candidate of Lettuce 5.1 shipping with improvements and 
 bugfixes.
  
 Most notable changes are:
 
-* API Preview for Redis Streams
-* Asynchronous pool implementation
-* `SCAN` streams, and initial 
-* Global command timeouts (disabled by default)
-* Asynchronous connect methods for Master/Slave and Sentinel
+* Brave (OpenZipkin) tracing support
+* Lettuce build is now Java 11 compatible
 
 Find the full change log at the end of this document that lists all 93 tickets.
 
-Thanks to all contributors who made Lettuce 5.1.0.M1 possible.
-Lettuce 5.1.0.M1 requires Java 8, Java 9, or Java 10.
+Thanks to all contributors who made Lettuce 5.1.0.RC1 possible.
+Lettuce 5.1.0.RC1 requires Java 8 to 11.
 
-Reference documentation: https://lettuce.io/core/5.1.0.M1/reference/.
-JavaDoc documentation: https://lettuce.io/core/5.1.0.M1/api/.
+Reference documentation: https://lettuce.io/core/5.1.0.RC1/reference/.
+JavaDoc documentation: https://lettuce.io/core/5.1.0.RC1/api/.
 
-New Exceptions for Redis Responses
-----------------------------------
-
-This release introduces new Exception types for the following Redis responses:
-
-* `LOADING`: `RedisLoadingException`
-* `NOSCRIPT`: `RedisNoScriptException`
-* `BUSY`: `RedisBusyException`
-
-All exception types derive from `RedisCommandExecutionException` and do not 
-require changes in application code.
-
-
-Redis Streams (Preview)
------------------------
-Redis 5.0 is going to ship with support for a Stream data structure. 
-A stream is a log of events that can be consumed sequentially. A Stream 
-message consists of an id and a body represented as hash (or `Map<K, V>`).
-
-Lettuce provides access to Stream commands through `RedisStreamCommands` supporting
-synchronous, asynchronous, and reactive execution models. All Stream commands
-are prefixed with `X` (`XADD`, `XREAD`, `XRANGE`).
-
-Stream messages are required to be polled. Polling can return either in a non-blocking
-way without a message if no message is available, or, in a blocking way.
-`XREAD` allows to specify a blocking duration in which the connection is blocked
-until either the timeout is exceeded or a Stream message arrives.
-
-The following example shows how to append and read messages from a Redis Stream:
-
-```java
-// Append a message to the stream
-String messageId = redis.xadd("my-stream", Collections.singletonMap("key", "value"));
-
-// Read a message
-List<StreamMessage<String, String>> messages = redis.xread(StreamOffset.from("my-stream", messageId));
-
-
-redis.xadd("my-stream", Collections.singletonMap("key", "value"));
-
-// Blocking read
-List<StreamMessage<String, String>> messages = redis.xread(XReadArgs.Builder.block(Duration.ofSeconds(2)), 
-                                                           StreamOffset.latest("my-stream"));
-```
-
-Redis Streams support the notion of consumer groups. A consumer group is a group of 
-one or more consumers that tracks the last consumed Stream message and allows 
-explicit acknowledgment of consumed messages. 
-
-```java
-// Setup stream, see https://github.com/antirez/redis/issues/4824
-redis.xadd("my-stream", Collections.singletonMap("key", "value"));
-
-// Create consumer group
-redis.xgroupCreate("my-stream", "my-group", "$");
-redis.xadd("my-stream", Collections.singletonMap("key", "value"));
-
-// Read stream messages in the context of a consumer
-List<StreamMessage<String, String>> messages = redis.xreadgroup(Consumer.from("my-stream", "consumer1"),
-                XReadArgs.Builder.noack(),
-                StreamOffset.lastConsumed(key));
-
-// process message
-
-…
-
-// Acknowledge message
-redis.xack(key, "group", messages.get(0).getId());
-```
-
-Please note that the Redis Stream implementation is not final yet and the API is subject to change if
-the Redis API changes.
-
-Scan Stream
------------
-
-Lettuce 5.1 ships with a reactive `SCAN` stream API that allows reactive and
-demand-aware usage of Redis' `SCAN` commands. `SCAN` is an interator-based command
-that requires multiple round-trips to Redis to scan the keyspace or 
-a particular data structure. Instead of calling `SCAN` from your application code, 
-you can use `ScanStream` as entrypoint to `SCAN`, `HSCAN`, `SSCAN`, and `ZSCAN` operations.
-`ScanStream` returns a `Flux` that can be consumed as a single stream without
-the need of continuing the actual iteration. That's covered by Lettuce for you.
-
-The `LIMIT` argument controls the batchsize. Demand (backpressure) is translated
-into cursor call. If you stop consuming the stream, no further `SCAN` calls are issued.
- 
-```java
-RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
-
-Flux<String> keys = ScanStream.scan(reactive, ScanArgs.Builder.limit(200));
-```
-
-Asynchronous non-blocking Connection Pooling
+Add tracing support using Brave (OpenZipkin)
 --------------------------------------------
 
-Right now, applications that utilize connection pooling in combination with a 
-non-blocking API (asynchronous or reactive API users) are limited to Apache Commons Pool
-which is a blocking object pool implementation.
-
-This release ships with non-blocking pooling support through `AsyncPool` that
-is obtained from `AsyncConnectionPoolSupport`. The pooling API allows for various
-implementations. As of Lettuce 5.1, a bounded pool is provided that allows 
-limiting and that signals pool exhaustion by emitting `NoSuchElementException`.
+Lettuce now supports command tracing using Brave. 
+Tracing can be configured through `ClientResources`. The parent span is propagated either 
+through `Tracing.currentTracer()` (synchronous/asynchronous usage) or 
+by registering a Brave Span in the Reactor context when using Reactive execution.
 
-The pooling API returns `CompletableFuture` instances to synchronize acquire and 
-release operations. `AsyncPool` does not require external dependencies and features
-an improved performance profile in comparison to Apache Commons Pool 2. 
-This non-blocking pooling API is not a replacement for the blocking pool 
-although it's possible that may provide a blocking layer that exports 
-the pooling functionality through `org.apache.commons.pool2.ObjectPool`. 
+Lettuce wraps Brave data models to support tracing in a vendor-agnostic way if 
+Brave is on the class path.
 
-The following example show how to use `AsyncPool`. 
+Usage example:
 
 ```java
-AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
-        () -> client.connectAsync(StringCodec.UTF8, uri),
-        BoundedPoolConfig.builder()
-                    .minIdle(4)
-                    .maxIdle(8)
-                    .maxTotal(16)
-                    .testOnAcquire()
-                    .build());
+Tracing tracing = …;
 
-// Acquire connection and do some work
-CompletableFuture<StatefulRedisConnection<String, String>> acquire = pool.acquire();
+ClientResources clientResources = ClientResources.builder().tracing(BraveTracing.create(tracing)).build();
 
-acquire.thenAccept(connection -> {
+RedisClient client = RedisClient.create(clientResources, redisUri);
 
-    connection.async().set("key", "value").whenComplete((v, e) -> {
-        pool.release(connection);
-    });
-});
+StatefulRedisConnection<String, String> connection = client.connect();
 
+connection.sync().get(…) // Tracing tries to obtain the current tracer from Tracing.currentTracer()
 
-// later
-CompletableFuture<Void> closeFuture = pool.closeAsync();
+connection.reactive().get(…) // Trace tries to obtain the current tracer from Reactor's Context
 ```
 
-
-Global Command Timeouts
------------------------
-
-Lettuce can be used through various APIs. The most common one is the
-synchronous API which emulates blocking behavior on top of a reactive 
-and non-blocking driver. A natural aspect of blocking APIs are timeouts
-when it comes to I/O. Using the asynchronous or reactive API do not have
-timeouts as there was no active component that tracked command runtime durations.
-
-With Lettuce 5.1, you get the possibility to configure a global command timeout
-through `ClientOptions` and `TimeoutOptions` that can determine timeouts
-on a `RedisCommand` basis. This timeout applies on a command basis
-and completes commands with `RedisCommandTimeoutException`.  
-
-You can change the timeout on running connections through `RedisURI.setTimeout(…)`, 
-`RedisClient.setDefaultTimeout(…)`, and `StatefulConnection.setTimeout(…)` if
-`TimeoutOptions` are enabled - global command timeouts are disabled by default. 
-
-```java
-TimeoutOptions timeoutOptions = TimeoutOptions.enabled(Duration.ofMinutes(1));
-
-ClientOptions.builder().timeoutOptions(timeoutOptions).build();
-```
-
-
-Thanks to all contributors that made Lettuce 5.1.0.M1 possible.
-
-Lettuce 5.1.0.M1 requires Java 8 and cannot be used with Java 6 or 7.
-
-If you need any support, meet Lettuce at:
-
-* Google Group: https://groups.google.com/d/forum/lettuce-redis-client-users
-* Gitter: https://gitter.im/lettuce-io/Lobby
-* GitHub Issues: https://github.com/lettuce-io/lettuce-core/issues
-* Documentation: https://lettuce.io/docs/
-
-Commands
---------
-* Add AUTH option to MIGRATE command #733
-* Add MASTER type to KillArgs #760
-
-Enhancements
-------------
-* Support for command timeouts (async, reactive) #435
-* Use object pooling for collections inside a single method and Command/CommandArgs with a small scope #459
-* Add support for Redis streams #606
-* Introduce dedicated exceptions for NOSCRIPT and BUSY responses #620 (Thanks to @DaichiUeura)
-* Non-blocking connection pooling #631
-* Introduce fast-path publishing in RedisPublisher #637
-* Add reactive scanning #638
-* Asynchronous connection initialization #640
-* Create reusable abstraction for non-blocking and keyed connection provider #642
-* Expose asynchronous connect method for Master/Slave connections #643
-* Add SocketAddressOutput to directly parse SENTINEL get-master-addr-by-name output #644
-* Misleading wasRolledBack method #662 (Thanks to @graineri)
-* Read from random slave preferred #676 (Thanks to @petetanton)
-* Introduce exception to represent Redis LOADING response #682
-* Do not fail if COMMAND command fails on startup #685 (Thanks to @pujian1984)
-* CommandHandler.write() is O(N^2) #709 (Thanks to @gszpak)
-* Cluster topology lookup should not replaces self-node details with host and port from RedisURI when RedisURI is load balancer #712 (Thanks to @warrenzhu25)
-* Optimize Partitions/RedisClusterNode representation #715
-* Unnecessary copying of byteBuf in CommandHandler.decode() #725 (Thanks to @gszpak)
-* Add unknown node as trigger for adaptive refresh #732
-
-Fixes
------
-* PING responses are not decoded properly if Pub/Sub connection is subscribed #579
-* Lettuce doesn't fail early & cleanly with a host in protected mode #608 (Thanks to @exercitussolus)
-* CommandHandler.rebuildQueue() causes long locks #615 (Thanks to @nikolayspb)
-* Request queue size is not cleared on reconnect #616 (Thanks to @nikolayspb)
-* BITPOS should allow to just specify start. #623 (Thanks to @christophstrobl)
-* HMGET proxy not working as expected #627 (Thanks to @moores-expedia)
-* Consider binary arguments using command interfaces as keys using binary codecs #628
-* Command.isDone() not consistent with CompletableFuture.isDone() #629
-* Race condition in RedisPublisher DEMAND.request() and DEMAND.onDataAvailable() #634 (Thanks to @mayamoon)
-* RedisPublisher.request(-1) does not fail #635
-* Capture subscription state before logging in RedisPublisher #636
-* Provide Javadoc path for Project Reactor #641
-* Debug logging of ConnectionWatchdog has wrong prefix after reconnect. #645 (Thanks to @mlex)
-* Cannot close connection when refreshing topology #656 (Thanks to @dangtranhoang)
-* Weights param should be ignored if it is empty #657 (Thanks to @garfeildma)
-* MasterSlave getNodeSpecificViews NPE with sync API #659 (Thanks to @boughtonp)
-* RandomServerHandler can respond zero bytes #660
-* ConcurrentModificationException when connecting a RedisClusterClient #663 (Thanks to @blahblahasdf)
-* Switch RedisSubscription.subscriber to volatile #664
-* Recovered Sentinels in Master/Slave not reconnected #668
-* Handling dead Sentinel slaves #669 (Thanks to @vleushin)
-* Move SocketAddressResolver resolution back to calling thread #670
-* Support SLAVE_PREFERRED at valueOf method #671 (Thanks to @be-hase)
-* RedisCommandTimeoutException after two subsequent MULTI calls without executing the transaction #673 (Thanks to @destitutus)
-* Fix ConnectionWatchDog won't reconnect problem in edge case #679 (Thanks to @kojilin)
-* At least once mode keeps requeueing commands on non-recoverable errors #680 (Thanks to @mrvisser)
-* Retain ssl/tls config from seed uris in Master/Slave context #684 (Thanks to @acmcelwee)
-* NOAUTH after full queue and reconnect #691
-* RedisURI.create("localhost") causes NPE #694
-* Async connect methods report original cause #708
-* Mono returned by RedisPubSubReactiveCommands#subscribe does not return result #717 (Thanks to @ywtsang)
-* RuntimeExceptions thrown by implementations of RedisCodec do not fail TransactionCommands #719 (Thanks to @blahblahasdf)
-* Connection Leak in Cluster Topology Refresh #721 (Thanks to @cweitend)
-* Ensure Master/Slave topology refresh connections are closed #723
-* RedisPubSubAdapter.message() being called with wrong channel #724 (Thanks to @adimarco)
-* Batched commands may time out although data was received #729
-* DefaultEndpoint future listener recycle lose command context on requeue failures #734 (Thanks to @gszpak)
-* AsyncPool, AsyncConnectionPoolSupport are nowhere to be found #739 (Thanks to @fabienrenaud)
-* firstResponseLatency is always negative #740 (Thanks to @nickvollmar)
-* EXEC does not fail on EXECABORT #743 (Thanks to @dmandalidis)
-* Warning when refreshing topology #756 (Thanks to @theliro)
-* DefaultEndpoint.QUEUE_SIZE becomes out of sync, preventing command queueing #764 (Thanks to @nivekastoreth)
-* DefaultEndpoint contains System.out.println(…) #765
-* Do not retry completed commands through RetryListener #767
-
-Other
------
-* Upgrade to netty 4.0.53.Final/4.1.17.Final #646
-* Upgrade to Reactor Bismuth SR4 #647
-* Upgrade to Spring Framework 4.3.12 #648
-* Upgrade to Commons Pool 2.4.3 #650
-* Upgrade to RxJava 1.3.3 #651
-* Upgrade to RxJava2 2.1.6 #652
-* Upgrade to HdrHistogram 2.1.10 #653
-* Upgrade Redis versions on TravisCI #655
-* Upgrade to Reactor Bismuth SR5 #698
-* Upgrade to netty 4.1.21.Final #699
-* Upgrade to RxJava 1.3.6 #700
-* Upgrade to RxJava 2.1.9 #701
-* Upgrade to Reactor Bismuth SR6 #704
-* Upgrade to Netty 4.1.22 #744
-* Upgrade to RxJava 1.3.7 #745
-* Upgrade to Spring Framework 4.3.14 #746
-* Upgrade to Mockito 2.17 #747
-* Upgrade to AssertJ 3.9.1 #748
-* Upgrade to Log4j 2.11.0 #749
-* Upgrade to commons-lang3 3.7 #750
-* Upgrade to netty 4.1.23.Final #755
-* Upgrade to Reactor Bismuth SR8 #758
-* Upgrade to RxJava 1.3.8 #759
-* Extend documentation for argument objects #761
-* Upgrade to JavaParser 3.6.3 #769
-* Upgrade to netty 4.1.24.Final #770
-* Upgrade to RxJava 2.1.13 #771
+A note on reactive Tracing: Reactive Tracing with Brave requires either a Span or a 
+TraceContext object to be available in Reactor's Context.
 
 Lettuce requires a minimum of Java 8 to build and run. It is tested continuously
 against the latest Redis source-build.

From 09fd3cc1ee2f5112ea2d1956011b971c000030ae Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 7 Sep 2018 08:27:56 +0200
Subject: [PATCH 504/808] Update release notes #842

---
 RELEASE-NOTES.md | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 95ba8a8a3f..d22025b303 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -41,12 +41,56 @@ StatefulRedisConnection<String, String> connection = client.connect();
 
 connection.sync().get(…) // Tracing tries to obtain the current tracer from Tracing.currentTracer()
 
-connection.reactive().get(…) // Trace tries to obtain the current tracer from Reactor's Context
+connection.reactive().get(…) // Tracing tries to obtain the current tracer from Reactor's Context
 ```
 
 A note on reactive Tracing: Reactive Tracing with Brave requires either a Span or a 
 TraceContext object to be available in Reactor's Context.
 
+Commands
+--------
+* Add support for ZPOPMIN, ZPOPMAX, BZPOPMIN, BZPOPMAX commands #778
+* Add REPLACE option to RESTORE. #783 (Thanks to @christophstrobl)
+* Add XGROUP DESTROY #789
+* Add support for CLIENT UNBLOCK #812
+
+Enhancements
+------------
+* Cancel commands after disconnect in at-most-once mode. #547
+* Consider adding host/port mapper #689
+* Add tracing support using Brave (OpenZipkin) #782
+* Improve builders and resources with Java 8 default/static interface methods #791
+* ZSCAN match pattern encoding issue #792 (Thanks to @silvertype)
+* Accept brave.Tracing instead of brave.Tracer #798
+* Bind Master/Slave transactional commands to Master during an ongoing transaction #800
+* FutureSyncInvocationHandler the statement "command.get ()" in the handlerInvocation method is unnecessary #809 (Thanks to @zhangweidavid)
+* Fall back to initial seed nodes on topology refresh when dynamicRefreshSources is enabled #822 (Thanks to @stuartharper)
+* Assert Java 11 build compatibility #841
+
+Fixes
+-----
+* MULTI is dispatched to slave nodes using SLAVE readFrom #779 (Thanks to @Yipei)
+* Reduce service name in BraveTracing to just Redis #797
+* Javadoc mentions Delay.exponential() is capped at 30 milliseconds #799 (Thanks to @phxql)
+* Read From Slaves is not working #804 (Thanks to @EXPEbdodla)
+* GEORADIUS WITHCOORD returns wrong coordinate on multiple results #805 (Thanks to @dittos)
+* RedisClusterCommands does not extend RedisStreamCommands #821
+* smembers returns elements in non-deterministic order #823 (Thanks to @alezandr)
+* StackOverflowError on ScanStream.scan(…).subscribe() #824
+* ZINCRBY member should be value-typed #826 (Thanks to @fuyuanpai)
+
+Other
+-----
+* Update What's new for Lettuce 5.1 in reference docs #777
+* Improve Javadoc of QUIT method #781
+* Upgrade to AssertJ 3.10.0 #794
+* Upgrade to netty 4.1.29.Final #836
+* Upgrade to Spring Framework 4.3.18 #837
+* Upgrade to Reactor Bismuth-SR11 #838
+* Upgrade to Brave 5.2.0 #839
+* Upgrade to RxJava 2.2.2 #840
+* Release Lettuce 5.1.0.RC1 #842
+
 Lettuce requires a minimum of Java 8 to build and run. It is tested continuously
 against the latest Redis source-build.
 

From e03bf016a519bc1e5d609ffc238d41d1899cd88b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 7 Sep 2018 08:29:50 +0200
Subject: [PATCH 505/808] Upgrade build profile to Redis 5.0-rc5

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 243c94b2b1..25161c4a6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ env:
   matrix:
     - REDIS=unstable
     - PROFILE=jmh
-    - REDIS=5.0-rc4
+    - REDIS=5.0-rc5
     - REDIS=4.0.11
     - REDIS=3.2.11
 

From 1a738277476feefb6488664a3fdb72d292c7a20a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 7 Sep 2018 08:35:59 +0200
Subject: [PATCH 506/808] Polishing

Remove console output in test.
---
 src/test/java/io/lettuce/core/ScanStreamTest.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/test/java/io/lettuce/core/ScanStreamTest.java b/src/test/java/io/lettuce/core/ScanStreamTest.java
index 0ba7c6dc05..0c509bb79f 100644
--- a/src/test/java/io/lettuce/core/ScanStreamTest.java
+++ b/src/test/java/io/lettuce/core/ScanStreamTest.java
@@ -69,9 +69,8 @@ public void shouldSscanIteratively() {
         RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
 
         AtomicInteger ai = new AtomicInteger();
-        StepVerifier.create(ScanStream.sscan(reactive, key, ScanArgs.Builder.limit(200)).doOnNext(n -> {
-            System.out.println(ai.incrementAndGet());
-        }), 0).thenRequest(250).expectNextCount(250).thenCancel().verify();
+        StepVerifier.create(ScanStream.sscan(reactive, key, ScanArgs.Builder.limit(200)), 0).thenRequest(250)
+                .expectNextCount(250).thenCancel().verify();
         StepVerifier.create(ScanStream.sscan(reactive, key).count()).expectNext(1000L).verifyComplete();
     }
 

From b8591ab8cb6f5845f8150b6ff502610f2f2fcaf9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 7 Sep 2018 08:54:24 +0200
Subject: [PATCH 507/808] [maven-release-plugin] prepare release 5.1.0.RC1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e3ac913b07..2837deb337 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.1.0.BUILD-SNAPSHOT</version>
+    <version>5.1.0.RC1</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -69,7 +69,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-        <tag>HEAD</tag>
+        <tag>5.1.0.RC1</tag>
     </scm>
 
     <dependencyManagement>

From dbeeeadd3a949e4c7544fa50eb9d6eec42709c4e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 7 Sep 2018 08:54:31 +0200
Subject: [PATCH 508/808] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2837deb337..e3ac913b07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.1.0.RC1</version>
+    <version>5.1.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -69,7 +69,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-        <tag>5.1.0.RC1</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <dependencyManagement>

From 2f7b5a4b6285512577d9f25b6acea8244506894b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 17 Sep 2018 10:52:28 +0200
Subject: [PATCH 509/808] Add support for approximate Stream trimming #846

Lettuce now exposes methods to apply approximate trimming using the ~ (tilde) flag for XADD MAXLEN and XTRIM MAXLEN commands.
---
 .../core/AbstractRedisAsyncCommands.java      |  7 ++++-
 .../core/AbstractRedisReactiveCommands.java   |  7 ++++-
 .../io/lettuce/core/RedisCommandBuilder.java  | 10 ++++--
 src/main/java/io/lettuce/core/XAddArgs.java   | 31 ++++++++++++++++++-
 .../api/async/RedisStreamAsyncCommands.java   | 10 ++++++
 .../reactive/RedisStreamReactiveCommands.java | 10 ++++++
 .../core/api/sync/RedisStreamCommands.java    | 10 ++++++
 .../NodeSelectionStreamAsyncCommands.java     | 10 ++++++
 .../api/sync/NodeSelectionStreamCommands.java | 10 ++++++
 .../lettuce/core/api/RedisStreamCommands.java | 10 ++++++
 .../core/commands/StreamCommandTest.java      | 10 +++++-
 11 files changed, 119 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 0f98a9d010..ff21202bea 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1602,7 +1602,12 @@ public RedisFuture<List<StreamMessage<K, V>>> xrevrange(K key, Range<String> ran
 
     @Override
     public RedisFuture<Long> xtrim(K key, long count) {
-        return dispatch(commandBuilder.xtrim(key, count));
+        return xtrim(key, false, count);
+    }
+
+    @Override
+    public RedisFuture<Long> xtrim(K key, boolean approximateTrimming, long count) {
+        return dispatch(commandBuilder.xtrim(key, approximateTrimming, count));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index b97325fc0f..bd918bd0b8 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -1653,7 +1653,12 @@ public Flux<StreamMessage<K, V>> xrevrange(K key, Range<String> range, Limit lim
 
     @Override
     public Mono<Long> xtrim(K key, long count) {
-        return createMono(() -> commandBuilder.xtrim(key, count));
+        return xtrim(key, false, count);
+    }
+
+    @Override
+    public Mono<Long> xtrim(K key, boolean approximateTrimming, long count) {
+        return createMono(() -> commandBuilder.xtrim(key, approximateTrimming, count));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 778721eac0..51cb824952 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -2263,10 +2263,16 @@ public Command<K, V, List<StreamMessage<K, V>>> xrevrange(K key, Range<String> r
         return createCommand(XREVRANGE, new StreamMessageListOutput<>(codec, key), args);
     }
 
-    public Command<K, V, Long> xtrim(K key, long count) {
+    public Command<K, V, Long> xtrim(K key, boolean approximateTrimming, long count) {
         notNullKey(key);
 
-        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(MAXLEN).add(count);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(MAXLEN);
+
+        if (approximateTrimming) {
+            args.add("~");
+        }
+
+        args.add(count);
 
         return createCommand(XTRIM, new IntegerOutput<>(codec), args);
     }
diff --git a/src/main/java/io/lettuce/core/XAddArgs.java b/src/main/java/io/lettuce/core/XAddArgs.java
index 74700b0997..8ea3a03c0d 100644
--- a/src/main/java/io/lettuce/core/XAddArgs.java
+++ b/src/main/java/io/lettuce/core/XAddArgs.java
@@ -32,6 +32,7 @@ public class XAddArgs {
 
     private String id;
     private Long maxlen;
+    private boolean approximateTrimming;
 
     /**
      * Builder entry points for {@link XAddArgs}.
@@ -83,10 +84,38 @@ public XAddArgs maxlen(long maxlen) {
         return this;
     }
 
+    /**
+     * Apply efficient trimming for capped streams using the {@code ~} flag.
+     *
+     * @return {@code this}
+     */
+    public XAddArgs approximateTrimming() {
+        return approximateTrimming(true);
+    }
+
+    /**
+     * Apply efficient trimming for capped streams using the {@code ~} flag.
+     *
+     * @param approximateTrimming {@literal true} to apply efficient radix node trimming.
+     * @return {@code this}
+     */
+    public XAddArgs approximateTrimming(boolean approximateTrimming) {
+
+        this.approximateTrimming = approximateTrimming;
+        return this;
+    }
+
     public <K, V> void build(CommandArgs<K, V> args) {
 
         if (maxlen != null) {
-            args.add(CommandKeyword.MAXLEN).add(maxlen);
+
+            args.add(CommandKeyword.MAXLEN);
+
+            if (approximateTrimming) {
+                args.add("~");
+            }
+
+            args.add(maxlen);
         }
 
         if (id != null) {
diff --git a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
index 366f4f1c41..b9df1b2493 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
@@ -269,4 +269,14 @@ public interface RedisStreamAsyncCommands<K, V> {
      * @return simple-reply number of removed entries.
      */
     RedisFuture<Long> xtrim(K key, long count);
+
+    /**
+     * Trims the stream to {@code count} elements.
+     *
+     * @param key the stream key.
+     * @param approximateTrimming {@literal true} to trim approximately using the {@code ~} flag.
+     * @param count length of the stream.
+     * @return simple-reply number of removed entries.
+     */
+    RedisFuture<Long> xtrim(K key, boolean approximateTrimming, long count);
 }
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
index f5e27770a5..c3da1431a9 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
@@ -270,4 +270,14 @@ public interface RedisStreamReactiveCommands<K, V> {
      * @return simple-reply number of removed entries.
      */
     Mono<Long> xtrim(K key, long count);
+
+    /**
+     * Trims the stream to {@code count} elements.
+     *
+     * @param key the stream key.
+     * @param approximateTrimming {@literal true} to trim approximately using the {@code ~} flag.
+     * @param count length of the stream.
+     * @return simple-reply number of removed entries.
+     */
+    Mono<Long> xtrim(K key, boolean approximateTrimming, long count);
 }
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
index e0df53b251..d215bacac8 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
@@ -269,4 +269,14 @@ public interface RedisStreamCommands<K, V> {
      * @return simple-reply number of removed entries.
      */
     Long xtrim(K key, long count);
+
+    /**
+     * Trims the stream to {@code count} elements.
+     *
+     * @param key the stream key.
+     * @param approximateTrimming {@literal true} to trim approximately using the {@code ~} flag.
+     * @param count length of the stream.
+     * @return simple-reply number of removed entries.
+     */
+    Long xtrim(K key, boolean approximateTrimming, long count);
 }
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
index 0d7dd9ea09..e03de55fb7 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
@@ -269,4 +269,14 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      * @return simple-reply number of removed entries.
      */
     AsyncExecutions<Long> xtrim(K key, long count);
+
+    /**
+     * Trims the stream to {@code count} elements.
+     *
+     * @param key the stream key.
+     * @param approximateTrimming {@literal true} to trim approximately using the {@code ~} flag.
+     * @param count length of the stream.
+     * @return simple-reply number of removed entries.
+     */
+    AsyncExecutions<Long> xtrim(K key, boolean approximateTrimming, long count);
 }
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
index 71cad5267a..9316a6be0a 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
@@ -269,4 +269,14 @@ public interface NodeSelectionStreamCommands<K, V> {
      * @return simple-reply number of removed entries.
      */
     Executions<Long> xtrim(K key, long count);
+
+    /**
+     * Trims the stream to {@code count} elements.
+     *
+     * @param key the stream key.
+     * @param approximateTrimming {@literal true} to trim approximately using the {@code ~} flag.
+     * @param count length of the stream.
+     * @return simple-reply number of removed entries.
+     */
+    Executions<Long> xtrim(K key, boolean approximateTrimming, long count);
 }
diff --git a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
index e8218011eb..cd3eafe1f6 100644
--- a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
@@ -268,4 +268,14 @@ public interface RedisStreamCommands<K, V> {
      * @return simple-reply number of removed entries.
      */
     Long xtrim(K key, long count);
+
+    /**
+     * Trims the stream to {@code count} elements.
+     *
+     * @param key the stream key.
+     * @param approximateTrimming {@literal true} to trim approximately using the {@code ~} flag.
+     * @param count length of the stream.
+     * @return simple-reply number of removed entries.
+     */
+    Long xtrim(K key, boolean approximateTrimming, long count);
 }
diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandTest.java b/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
index 9c7ef85304..37f60b61e9 100644
--- a/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
@@ -68,6 +68,14 @@ public void xaddMaxLen() {
         assertThat(messages).hasSize(5);
     }
 
+    @Test
+    public void xaddMaxLenEfficientTrimming() {
+
+        String id = redis.xadd(key, XAddArgs.Builder.maxlen(5).approximateTrimming(), "foo", "bar");
+
+        assertThat(id).isNotNull();
+    }
+
     @Test
     public void xdel() {
 
@@ -94,7 +102,7 @@ public void xtrim() {
         redis.xdel(key, ids.get(0), ids.get(2));
         assertThat(redis.xlen(key)).isBetween(8L, 10L);
 
-        redis.xtrim(key, 8);
+        redis.xtrim(key, true, 8);
 
         assertThat(redis.xlen(key)).isLessThanOrEqualTo(10);
     }

From 36169e3307ad606e02626b912a4b734097e66d03 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 17 Sep 2018 11:35:54 +0200
Subject: [PATCH 510/808] Fix Lua script body encoding for scripts containing
 non-ASCII chars #844

Lettuce now obtains the script bytes from the passed script content using String.getBytes() instead of encoding the script String using ASCII.
---
 src/main/java/io/lettuce/core/RedisCommandBuilder.java       | 4 ++--
 .../java/io/lettuce/core/commands/ScriptingCommandTest.java  | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 51cb824952..5fa8e2feb8 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -572,7 +572,7 @@ <T> Command<K, V, T> eval(String script, ScriptOutputType type, K... keys) {
         LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
 
         CommandArgs<K, V> args = new CommandArgs<>(codec);
-        args.add(script).add(keys.length).addKeys(keys);
+        args.add(script.getBytes()).add(keys.length).addKeys(keys);
         CommandOutput<K, V, T> output = newScriptOutput(codec, type);
         return createCommand(EVAL, output, args);
     }
@@ -585,7 +585,7 @@ <T> Command<K, V, T> eval(String script, ScriptOutputType type, K[] keys, V... v
         LettuceAssert.notNull(values, "Values " + MUST_NOT_BE_NULL);
 
         CommandArgs<K, V> args = new CommandArgs<>(codec);
-        args.add(script).add(keys.length).addKeys(keys).addValues(values);
+        args.add(script.getBytes()).add(keys.length).addKeys(keys).addValues(values);
         CommandOutput<K, V, T> output = newScriptOutput(codec, type);
         return createCommand(EVAL, output, args);
     }
diff --git a/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java b/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
index c7f321c8fa..c1b653ed7a 100644
--- a/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
@@ -74,6 +74,11 @@ public void evalWithSingleKey() {
         assertThat((List<?>) redis.eval("return KEYS[1]", MULTI, "one")).isEqualTo(list("one"));
     }
 
+    @Test
+    public void evalWithNonAsciiChar() {
+        assertThat((Object) redis.eval("return 'füö'", VALUE, "one")).isEqualTo("füö");
+    }
+
     @Test
     public void evalReturningNullInMulti() {
         assertThat((List<?>) redis.eval("return nil", MULTI, "one")).isEqualTo(Collections.singletonList(null));

From db10c9c69cab9dcebc0e0e37aa5d08a8abdd6fa1 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 17 Sep 2018 11:29:59 +0200
Subject: [PATCH 511/808] Update changelog #849

---
 RELEASE-NOTES.md                       | 266 ++++++++++++++++++++++++-
 src/main/asciidoc/ha-sharding.asciidoc |   7 +-
 src/main/asciidoc/new-features.adoc    |   4 +-
 src/main/asciidoc/overview.asciidoc    |   2 +-
 4 files changed, 264 insertions(+), 15 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index d22025b303..463aa67599 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,21 +1,194 @@
-Lettuce 5.1.0 RC1 RELEASE NOTES
+Lettuce 5.1.0 RELEASE NOTES
 ===========================
 
-This is the release candidate of Lettuce 5.1 shipping with improvements and 
-bugfixes.
+The Lettuce team is pleased to announce the Lettuce 5.1.0 release! 
+This release contains new features, bugfixes, and enhancements.
  
 Most notable changes are:
 
+* Support for Redis Streams
+* Asynchronous pool implementation
+* `SCAN` streams, and initial 
+* Global command timeouts (disabled by default)
+* Asynchronous connect methods for Master/Replica and Sentinel
 * Brave (OpenZipkin) tracing support
 * Lettuce build is now Java 11 compatible
 
-Find the full change log at the end of this document that lists all 93 tickets.
+We started efforts to adapt improvements in Redis terminology about Master/Replica 
+with this release. This release ships documentation changes referring to the 
+existing API as Master/Replica where possible.
 
-Thanks to all contributors who made Lettuce 5.1.0.RC1 possible.
-Lettuce 5.1.0.RC1 requires Java 8 to 11.
+We will introduce with the upcoming releases support for the new API methods 
+(`REPLICAOF`) without breaking the public API. Expect breaking changes in a much 
+later release which gives plenty of time to upgrade. 
 
-Reference documentation: https://lettuce.io/core/5.1.0.RC1/reference/.
-JavaDoc documentation: https://lettuce.io/core/5.1.0.RC1/api/.
+Find the full change log at the end of this document that lists all 105 tickets.
+
+Thanks to all contributors who made Lettuce 5.1.0.RELEASE possible.
+Lettuce 5.1.0.RELEASE requires Java 8 to 11.
+
+Reference documentation: https://lettuce.io/core/5.1.0.RELEASE/reference/.
+JavaDoc documentation: https://lettuce.io/core/5.1.0.RELEASE/api/.
+
+New Exceptions for Redis Responses
+----------------------------------
+
+This release introduces new Exception types for the following Redis responses:
+
+* `LOADING`: `RedisLoadingException`
+* `NOSCRIPT`: `RedisNoScriptException`
+* `BUSY`: `RedisBusyException`
+
+All exception types derive from `RedisCommandExecutionException` and do not 
+require changes in application code.
+
+
+Redis Streams
+-----------------------
+Redis 5.0 is going to ship with support for a Stream data structure. 
+A stream is a log of events that can be consumed sequentially. A Stream 
+message consists of an id and a body represented as hash (or `Map<K, V>`).
+
+Lettuce provides access to Stream commands through `RedisStreamCommands` supporting
+synchronous, asynchronous, and reactive execution models. All Stream commands
+are prefixed with `X` (`XADD`, `XREAD`, `XRANGE`).
+
+Stream messages are required to be polled. Polling can return either in a non-blocking
+way without a message if no message is available, or, in a blocking way.
+`XREAD` allows to specify a blocking duration in which the connection is blocked
+until either the timeout is exceeded or a Stream message arrives.
+
+The following example shows how to append and read messages from a Redis Stream:
+
+```java
+// Append a message to the stream
+String messageId = redis.xadd("my-stream", Collections.singletonMap("key", "value"));
+
+// Read a message
+List<StreamMessage<String, String>> messages = redis.xread(StreamOffset.from("my-stream", messageId));
+
+
+redis.xadd("my-stream", Collections.singletonMap("key", "value"));
+
+// Blocking read
+List<StreamMessage<String, String>> messages = redis.xread(XReadArgs.Builder.block(Duration.ofSeconds(2)), 
+                                                           StreamOffset.latest("my-stream"));
+```
+
+Redis Streams support the notion of consumer groups. A consumer group is a group of 
+one or more consumers that tracks the last consumed Stream message and allows 
+explicit acknowledgment of consumed messages. 
+
+```java
+// Setup stream, see https://github.com/antirez/redis/issues/4824
+redis.xadd("my-stream", Collections.singletonMap("key", "value"));
+
+// Create consumer group
+redis.xgroupCreate("my-stream", "my-group", "$");
+redis.xadd("my-stream", Collections.singletonMap("key", "value"));
+
+// Read stream messages in the context of a consumer
+List<StreamMessage<String, String>> messages = redis.xreadgroup(Consumer.from("my-stream", "consumer1"),
+                XReadArgs.Builder.noack(),
+                StreamOffset.lastConsumed(key));
+
+// process message
+
+…
+
+// Acknowledge message
+redis.xack(key, "group", messages.get(0).getId());
+```
+
+Scan Stream
+-----------
+
+Lettuce 5.1 ships with a reactive `SCAN` stream API that allows reactive and
+demand-aware usage of Redis' `SCAN` commands. `SCAN` is an interator-based command
+that requires multiple round-trips to Redis to scan the keyspace or 
+a particular data structure. Instead of calling `SCAN` from your application code, 
+you can use `ScanStream` as entrypoint to `SCAN`, `HSCAN`, `SSCAN`, and `ZSCAN` operations.
+`ScanStream` returns a `Flux` that can be consumed as a single stream without
+the need of continuing the actual iteration. That's covered by Lettuce for you.
+
+The `LIMIT` argument controls the batchsize. Demand (backpressure) is translated
+into cursor call. If you stop consuming the stream, no further `SCAN` calls are issued.
+ 
+```java
+RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
+
+Flux<String> keys = ScanStream.scan(reactive, ScanArgs.Builder.limit(200));
+```
+
+Asynchronous non-blocking Connection Pooling
+--------------------------------------------
+
+Right now, applications that utilize connection pooling in combination with a 
+non-blocking API (asynchronous or reactive API users) are limited to Apache Commons Pool
+which is a blocking object pool implementation.
+
+This release ships with non-blocking pooling support through `AsyncPool` that
+is obtained from `AsyncConnectionPoolSupport`. The pooling API allows for various
+implementations. As of Lettuce 5.1, a bounded pool is provided that allows 
+limiting and that signals pool exhaustion by emitting `NoSuchElementException`.
+
+The pooling API returns `CompletableFuture` instances to synchronize acquire and 
+release operations. `AsyncPool` does not require external dependencies and features
+an improved performance profile in comparison to Apache Commons Pool 2. 
+This non-blocking pooling API is not a replacement for the blocking pool 
+although it's possible that may provide a blocking layer that exports 
+the pooling functionality through `org.apache.commons.pool2.ObjectPool`. 
+
+The following example show how to use `AsyncPool`. 
+
+```java
+AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
+        () -> client.connectAsync(StringCodec.UTF8, uri),
+        BoundedPoolConfig.builder()
+                    .minIdle(4)
+                    .maxIdle(8)
+                    .maxTotal(16)
+                    .testOnAcquire()
+                    .build());
+
+// Acquire connection and do some work
+CompletableFuture<StatefulRedisConnection<String, String>> acquire = pool.acquire();
+
+acquire.thenAccept(connection -> {
+
+    connection.async().set("key", "value").whenComplete((v, e) -> {
+        pool.release(connection);
+    });
+});
+
+
+// later
+CompletableFuture<Void> closeFuture = pool.closeAsync();
+```
+
+Global Command Timeouts
+-----------------------
+
+Lettuce can be used through various APIs. The most common one is the
+synchronous API which emulates blocking behavior on top of a reactive 
+and non-blocking driver. A natural aspect of blocking APIs are timeouts
+when it comes to I/O. Using the asynchronous or reactive API do not have
+timeouts as there was no active component that tracked command runtime durations.
+
+With Lettuce 5.1, you get the possibility to configure a global command timeout
+through `ClientOptions` and `TimeoutOptions` that can determine timeouts
+on a `RedisCommand` basis. This timeout applies on a command basis
+and completes commands with `RedisCommandTimeoutException`.  
+
+You can change the timeout on running connections through `RedisURI.setTimeout(…)`, 
+`RedisClient.setDefaultTimeout(…)`, and `StatefulConnection.setTimeout(…)` if
+`TimeoutOptions` are enabled - global command timeouts are disabled by default. 
+
+```java
+TimeoutOptions timeoutOptions = TimeoutOptions.enabled(Duration.ofMinutes(1));
+
+ClientOptions.builder().timeoutOptions(timeoutOptions).build();
+```
 
 Add tracing support using Brave (OpenZipkin)
 --------------------------------------------
@@ -49,15 +222,38 @@ TraceContext object to be available in Reactor's Context.
 
 Commands
 --------
+* Add AUTH option to MIGRATE command #733
+* Add MASTER type to KillArgs #760
 * Add support for ZPOPMIN, ZPOPMAX, BZPOPMIN, BZPOPMAX commands #778
 * Add REPLACE option to RESTORE. #783 (Thanks to @christophstrobl)
 * Add XGROUP DESTROY #789
 * Add support for CLIENT UNBLOCK #812
+* Support for approximate trimming in XAddArgs #846
 
 Enhancements
 ------------
+* Support for command timeouts (async, reactive) #435
+* Use object pooling for collections inside a single method and Command/CommandArgs with a small scope #459
 * Cancel commands after disconnect in at-most-once mode. #547
+* Add support for Redis streams #606
+* Introduce dedicated exceptions for NOSCRIPT and BUSY responses #620 (Thanks to @DaichiUeura)
+* Non-blocking connection pooling #631
+* Introduce fast-path publishing in RedisPublisher #637
+* Add reactive scanning #638
+* Asynchronous connection initialization #640
+* Create reusable abstraction for non-blocking and keyed connection provider #642
+* Expose asynchronous connect method for Master/Slave connections #643
+* Add SocketAddressOutput to directly parse SENTINEL get-master-addr-by-name output #644
+* Misleading wasRolledBack method #662 (Thanks to @graineri)
+* Read from random slave preferred #676 (Thanks to @petetanton)
+* Introduce exception to represent Redis LOADING response #682
+* Do not fail if COMMAND command fails on startup #685 (Thanks to @pujian1984)
 * Consider adding host/port mapper #689
+* CommandHandler.write() is O(N^2) #709 (Thanks to @gszpak)
+* Cluster topology lookup should not replaces self-node details with host and port from RedisURI when RedisURI is load balancer #712 (Thanks to @warrenzhu25)
+* Optimize Partitions/RedisClusterNode representation #715
+* Unnecessary copying of byteBuf in CommandHandler.decode() #725 (Thanks to @gszpak)
+* Add unknown node as trigger for adaptive refresh #732
 * Add tracing support using Brave (OpenZipkin) #782
 * Improve builders and resources with Java 8 default/static interface methods #791
 * ZSCAN match pattern encoding issue #792 (Thanks to @silvertype)
@@ -69,6 +265,50 @@ Enhancements
 
 Fixes
 -----
+* PING responses are not decoded properly if Pub/Sub connection is subscribed #579
+* Lettuce doesn't fail early & cleanly with a host in protected mode #608 (Thanks to @exercitussolus)
+* CommandHandler.rebuildQueue() causes long locks #615 (Thanks to @nikolayspb)
+* Request queue size is not cleared on reconnect #616 (Thanks to @nikolayspb)
+* BITPOS should allow to just specify start. #623 (Thanks to @christophstrobl)
+* HMGET proxy not working as expected #627 (Thanks to @moores-expedia)
+* Consider binary arguments using command interfaces as keys using binary codecs #628
+* Command.isDone() not consistent with CompletableFuture.isDone() #629
+* Race condition in RedisPublisher DEMAND.request() and DEMAND.onDataAvailable() #634 (Thanks to @mayamoon)
+* RedisPublisher.request(-1) does not fail #635
+* Capture subscription state before logging in RedisPublisher #636
+* Provide Javadoc path for Project Reactor #641
+* Debug logging of ConnectionWatchdog has wrong prefix after reconnect. #645 (Thanks to @mlex)
+* Cannot close connection when refreshing topology #656 (Thanks to @dangtranhoang)
+* Weights param should be ignored if it is empty #657 (Thanks to @garfeildma)
+* MasterSlave getNodeSpecificViews NPE with sync API #659 (Thanks to @boughtonp)
+* RandomServerHandler can respond zero bytes #660
+* ConcurrentModificationException when connecting a RedisClusterClient #663 (Thanks to @blahblahasdf)
+* Switch RedisSubscription.subscriber to volatile #664
+* Recovered Sentinels in Master/Slave not reconnected #668
+* Handling dead Sentinel slaves #669 (Thanks to @vleushin)
+* Move SocketAddressResolver resolution back to calling thread #670
+* Support SLAVE_PREFERRED at valueOf method #671 (Thanks to @be-hase)
+* RedisCommandTimeoutException after two subsequent MULTI calls without executing the transaction #673 (Thanks to @destitutus)
+* Fix ConnectionWatchDog won't reconnect problem in edge case #679 (Thanks to @kojilin)
+* At least once mode keeps requeueing commands on non-recoverable errors #680 (Thanks to @mrvisser)
+* Retain ssl/tls config from seed uris in Master/Slave context #684 (Thanks to @acmcelwee)
+* NOAUTH after full queue and reconnect #691
+* RedisURI.create("localhost") causes NPE #694
+* Async connect methods report original cause #708
+* Mono returned by RedisPubSubReactiveCommands#subscribe does not return result #717 (Thanks to @ywtsang)
+* RuntimeExceptions thrown by implementations of RedisCodec do not fail TransactionCommands #719 (Thanks to @blahblahasdf)
+* Connection Leak in Cluster Topology Refresh #721 (Thanks to @cweitend)
+* Ensure Master/Slave topology refresh connections are closed #723
+* RedisPubSubAdapter.message() being called with wrong channel #724 (Thanks to @adimarco)
+* Batched commands may time out although data was received #729
+* DefaultEndpoint future listener recycle lose command context on requeue failures #734 (Thanks to @gszpak)
+* AsyncPool, AsyncConnectionPoolSupport are nowhere to be found #739 (Thanks to @fabienrenaud)
+* firstResponseLatency is always negative #740 (Thanks to @nickvollmar)
+* EXEC does not fail on EXECABORT #743 (Thanks to @dmandalidis)
+* Warning when refreshing topology #756 (Thanks to @theliro)
+* DefaultEndpoint.QUEUE_SIZE becomes out of sync, preventing command queueing #764 (Thanks to @nivekastoreth)
+* DefaultEndpoint contains System.out.println(…) #765
+* Do not retry completed commands through RetryListener #767
 * MULTI is dispatched to slave nodes using SLAVE readFrom #779 (Thanks to @Yipei)
 * Reduce service name in BraveTracing to just Redis #797
 * Javadoc mentions Delay.exponential() is capped at 30 milliseconds #799 (Thanks to @phxql)
@@ -78,9 +318,18 @@ Fixes
 * smembers returns elements in non-deterministic order #823 (Thanks to @alezandr)
 * StackOverflowError on ScanStream.scan(…).subscribe() #824
 * ZINCRBY member should be value-typed #826 (Thanks to @fuyuanpai)
+* Lua script execution containing non-ascii characters fails #844 (Thanks to @wenzuowei110)
 
 Other
 -----
+* Upgrade to HdrHistogram 2.1.10 #653
+* Upgrade Redis versions on TravisCI #655
+* Upgrade to Mockito 2.17 #747
+* Upgrade to AssertJ 3.9.1 #748
+* Upgrade to Log4j 2.11.0 #749
+* Upgrade to commons-lang3 3.7 #750
+* Extend documentation for argument objects #761
+* Upgrade to JavaParser 3.6.3 #769
 * Update What's new for Lettuce 5.1 in reference docs #777
 * Improve Javadoc of QUIT method #781
 * Upgrade to AssertJ 3.10.0 #794
@@ -89,7 +338,6 @@ Other
 * Upgrade to Reactor Bismuth-SR11 #838
 * Upgrade to Brave 5.2.0 #839
 * Upgrade to RxJava 2.2.2 #840
-* Release Lettuce 5.1.0.RC1 #842
 
 Lettuce requires a minimum of Java 8 to build and run. It is tested continuously
 against the latest Redis source-build.
diff --git a/src/main/asciidoc/ha-sharding.asciidoc b/src/main/asciidoc/ha-sharding.asciidoc
index 9ba0776c67..2036343b95 100644
--- a/src/main/asciidoc/ha-sharding.asciidoc
+++ b/src/main/asciidoc/ha-sharding.asciidoc
@@ -1,5 +1,5 @@
 :redis-sentinel-link: <<redis-sentinel>>
-:master-slave-api-link: <<master-slave>>
+:master-replica-api-link: <<master-slave>>
 :cco-up-to-5-times: <<clientoptions.cluster-specific-options,up to 5 times>>
 :cco-link: <<clientoptions.cluster-specific-options,Cluster-specific Client options>>
 :cco-periodic-link: <<clientoptions.cluster-specific-options,Periodic updates>>
@@ -9,8 +9,9 @@
 == High-Availability and Sharding
 
 [[master-slave]]
-=== Master/Slave
-include::{ext-doc}/Master-Slave.asciidoc[leveloffset=+2]
+[[master-replica]]
+=== Master/Replica
+include::{ext-doc}/Master-Replica.asciidoc[leveloffset=+2]
 
 [[redis-sentinel]]
 === Redis Sentinel
diff --git a/src/main/asciidoc/new-features.adoc b/src/main/asciidoc/new-features.adoc
index 972fcd2cf3..81599743a1 100644
--- a/src/main/asciidoc/new-features.adoc
+++ b/src/main/asciidoc/new-features.adoc
@@ -6,7 +6,7 @@
 * Add support for `ZPOPMIN`, `ZPOPMAX`, `BZPOPMIN`, `BZPOPMAX` commands.
 * Add support for Redis Command Tracing through Brave, see <<client-resources>>.
 * Add support for https://redis.io/topics/streams-intro[Redis Streams].
-* Asynchronous `connect()` for Master/Slave connections.
+* Asynchronous `connect()` for Master/Replica connections.
 * <<connection-pooling.asynchronous.usage>> through `AsyncConnectionPoolSupport` and `AsyncPool`.
 * Dedicated exceptions for Redis `LOADING`, `BUSY`, and `NOSCRIPT` responses.
 * Commands in at-most-once mode (auto-reconnect disabled) are now canceled already on disconnect.
@@ -14,7 +14,7 @@
 * Host and port mappers for Lettuce usage behind connection tunnels/proxies through `SocketAddressResolver`, see <<client-resources>>.
 * `SCRIPT LOAD` dispatch to all cluster nodes when issued through `RedisAdvancedClusterCommands`.
 * Reactive `ScanStream` to iterate over the keyspace using `SCAN` commands.
-* Transactions using Master/Slave connections are bound to the master node.
+* Transactions using Master/Replica connections are bound to the master node.
 
 [[new-features.5-0-0]]
 == What's new in Lettuce 5.0
diff --git a/src/main/asciidoc/overview.asciidoc b/src/main/asciidoc/overview.asciidoc
index 46646b2f02..a585986a5a 100644
--- a/src/main/asciidoc/overview.asciidoc
+++ b/src/main/asciidoc/overview.asciidoc
@@ -67,7 +67,7 @@ For information on the Lettuce source code repository, nightly builds and snapsh
 
 === Where to go from here
  * Head to <<getting-started>> if you feel like jumping straight into the code.
- * Go to <<ha-sharding>> for Master/Slave, Redis Sentinel and Redis Cluster topics.
+ * Go to <<ha-sharding>> for Master/Replica, Redis Sentinel and Redis Cluster topics.
  * In order to dig deeper into the core features of Reactor:
  ** If you’re looking for client configuration options, performance related behavior and how to use various transports, go to <<advanced-usage>>.
  ** See <<integration-extension>> for extending Lettuce with codecs or integrate it in your CDI/Spring application.

From 08888cd2b98340be1016004b0813446661bf45b2 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 18 Sep 2018 14:56:22 +0200
Subject: [PATCH 512/808] Fix RedisState command resolution #851

RedisState now resolves correctly command names against CommandType.
---
 .../io/lettuce/core/cluster/RedisState.java   |  7 +--
 .../lettuce/core/cluster/RedisStateTest.java  | 58 +++++++++++++++++++
 2 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/cluster/RedisStateTest.java

diff --git a/src/main/java/io/lettuce/core/cluster/RedisState.java b/src/main/java/io/lettuce/core/cluster/RedisState.java
index aa9cd70302..85702b9816 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisState.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisState.java
@@ -15,10 +15,7 @@
  */
 package io.lettuce.core.cluster;
 
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 import io.lettuce.core.models.command.CommandDetail;
 import io.lettuce.core.protocol.CommandType;
@@ -57,7 +54,7 @@ public RedisState(Collection<CommandDetail> commands) {
     private static CommandType getCommandType(CommandDetail command) {
 
         try {
-            return CommandType.valueOf(command.getName().toLowerCase());
+            return CommandType.valueOf(command.getName().toUpperCase(Locale.US));
         } catch (IllegalArgumentException e) {
             return null;
         }
diff --git a/src/test/java/io/lettuce/core/cluster/RedisStateTest.java b/src/test/java/io/lettuce/core/cluster/RedisStateTest.java
new file mode 100644
index 0000000000..47c9b38a78
--- /dev/null
+++ b/src/test/java/io/lettuce/core/cluster/RedisStateTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.junit.Test;
+
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.models.command.CommandDetail;
+import io.lettuce.core.models.command.CommandDetailParser;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.ProtocolKeyword;
+
+/**
+ * @author Mark Paluch
+ */
+public class RedisStateTest extends AbstractRedisClientTest {
+
+    @Test
+    public void shouldDiscoverCommands() {
+
+        List<CommandDetail> commandDetails = CommandDetailParser.parse(redis.command());
+        RedisState state = new RedisState(commandDetails);
+
+        assertThat(state).extracting("availableCommands").flatExtracting(it -> (Collection<Object>) it)
+                .contains(CommandType.GEOADD).doesNotContain(UnknownCommand.FOO);
+
+        assertThat(state.hasCommand(CommandType.GEOADD)).isTrue();
+        assertThat(state.hasCommand(UnknownCommand.FOO)).isFalse();
+    }
+
+    enum UnknownCommand implements ProtocolKeyword {
+
+        FOO;
+
+        @Override
+        public byte[] getBytes() {
+            return name().getBytes();
+        }
+    }
+}

From e9fcd8b1a115e5b646669fd0d47e7d91b657694d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 18 Sep 2018 15:07:51 +0200
Subject: [PATCH 513/808] Update changelog #849

---
 RELEASE-NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 463aa67599..3f8a8538c1 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -319,6 +319,7 @@ Fixes
 * StackOverflowError on ScanStream.scan(…).subscribe() #824
 * ZINCRBY member should be value-typed #826 (Thanks to @fuyuanpai)
 * Lua script execution containing non-ascii characters fails #844 (Thanks to @wenzuowei110)
+* RedisState fails to resolve CommandType for known commands #851
 
 Other
 -----

From aa828ddc262f6e11fc1cc6e7b5012fc3e08606f6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 19 Sep 2018 13:35:07 +0200
Subject: [PATCH 514/808] Upgrade to Mockito 2.22 #855

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e3ac913b07..732bfdbef4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -294,7 +294,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.21.0</version>
+            <version>2.22.0</version>
             <scope>test</scope>
         </dependency>
 

From fbdd19fed0a20704e11fad3ba3e7e9d1021a3149 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 19 Sep 2018 13:35:59 +0200
Subject: [PATCH 515/808] Upgrade to AssertJ 3.11.1 #856

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 732bfdbef4..7c0bb9d3d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -322,7 +322,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.10.0</version>
+            <version>3.11.1</version>
             <scope>test</scope>
         </dependency>
 

From 291aadd89d068b3dd07ca2851c4ab595f738417a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 19 Sep 2018 13:37:07 +0200
Subject: [PATCH 516/808] Upgrade to commons-lang3 3.8 #857

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7c0bb9d3d5..68bf375131 100644
--- a/pom.xml
+++ b/pom.xml
@@ -384,7 +384,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.7</version>
+            <version>3.8</version>
             <scope>test</scope>
         </dependency>
 

From dd39dd38a08374cf544373346fa865c900c4aa8f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 19 Sep 2018 13:38:47 +0200
Subject: [PATCH 517/808] Upgrade to Spring Framework 4.3.19 #858

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 68bf375131..657bea370a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipTests>true</skipTests>
         <netty-version>4.1.29.Final</netty-version>
-        <spring-version>4.3.18.RELEASE</spring-version>
+        <spring-version>4.3.19.RELEASE</spring-version>
         <reactor-version>Bismuth-SR11</reactor-version>
         <brave-version>5.2.0</brave-version>
     </properties>

From 81de3a47e9673769f5e25aee95f4e18957dbbe7b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 19 Sep 2018 13:43:15 +0200
Subject: [PATCH 518/808] Update changelog #849

---
 RELEASE-NOTES.md | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 3f8a8538c1..797a57d252 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -22,13 +22,22 @@ We will introduce with the upcoming releases support for the new API methods
 (`REPLICAOF`) without breaking the public API. Expect breaking changes in a much 
 later release which gives plenty of time to upgrade. 
 
-Find the full change log at the end of this document that lists all 105 tickets.
+Find the full change log at the end of this document that lists all 108 tickets.
 
 Thanks to all contributors who made Lettuce 5.1.0.RELEASE possible.
-Lettuce 5.1.0.RELEASE requires Java 8 to 11.
 
-Reference documentation: https://lettuce.io/core/5.1.0.RELEASE/reference/.
-JavaDoc documentation: https://lettuce.io/core/5.1.0.RELEASE/api/.
+Lettuce requires a minimum of Java 8 to build and run. It is tested continuously
+against the latest Redis source-build.
+
+If you need any support, meet Lettuce at
+
+* Google Group: https://groups.google.com/d/forum/lettuce-redis-client-users
+or lettuce-redis-client-users@googlegroups.com
+* Join the chat at https://gitter.im/lettuce-io/Lobby
+* GitHub Issues: https://github.com/lettuce-io/lettuce-core/issues
+* Documentation: https://lettuce.io/core/5.1.0.RELEASE/reference/
+* Javadoc: https://lettuce.io/core/5.1.0.RELEASE/api/
+
 
 New Exceptions for Redis Responses
 ----------------------------------
@@ -325,28 +334,17 @@ Other
 -----
 * Upgrade to HdrHistogram 2.1.10 #653
 * Upgrade Redis versions on TravisCI #655
-* Upgrade to Mockito 2.17 #747
-* Upgrade to AssertJ 3.9.1 #748
 * Upgrade to Log4j 2.11.0 #749
-* Upgrade to commons-lang3 3.7 #750
 * Extend documentation for argument objects #761
 * Upgrade to JavaParser 3.6.3 #769
 * Update What's new for Lettuce 5.1 in reference docs #777
 * Improve Javadoc of QUIT method #781
-* Upgrade to AssertJ 3.10.0 #794
 * Upgrade to netty 4.1.29.Final #836
-* Upgrade to Spring Framework 4.3.18 #837
 * Upgrade to Reactor Bismuth-SR11 #838
 * Upgrade to Brave 5.2.0 #839
 * Upgrade to RxJava 2.2.2 #840
-
-Lettuce requires a minimum of Java 8 to build and run. It is tested continuously
-against the latest Redis source-build.
-
-If you need any support, meet Lettuce at
-
-* Google Group: https://groups.google.com/d/forum/lettuce-redis-client-users
-or lettuce-redis-client-users@googlegroups.com
-* Join the chat at https://gitter.im/lettuce-io/Lobby
-* GitHub Issues: https://github.com/lettuce-io/lettuce-core/issues
-* Documentation: https://lettuce.io/docs/
+* Upgrade to Commons Pool 2.6 #854
+* Upgrade to Mockito 2.22 #855
+* Upgrade to commons-lang3 3.8 #857
+* Upgrade to Spring Framework 4.3.19 #858
+* Upgrade to Reactor Californium #859

From 2bf7c2317dff9326adfa8ade3a262bb671f695f5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 19 Sep 2018 13:34:32 +0200
Subject: [PATCH 519/808] Upgrade to Commons Pool 2.6 #854

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 657bea370a..74f8f59209 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,7 +165,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
-            <version>2.4.3</version>
+            <version>2.6.0</version>
             <optional>true</optional>
         </dependency>
 

From ee8f1070eff116316e4ed775437523d399531cc4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 19 Sep 2018 21:53:43 +0200
Subject: [PATCH 520/808] Upgrade to Reactor Californium #859

---
 pom.xml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 74f8f59209..abc524939d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <skipTests>true</skipTests>
         <netty-version>4.1.29.Final</netty-version>
         <spring-version>4.3.19.RELEASE</spring-version>
-        <reactor-version>Bismuth-SR11</reactor-version>
+        <reactor-version>3.2.0.RELEASE</reactor-version>
         <brave-version>5.2.0</brave-version>
     </properties>
 
@@ -83,14 +83,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <dependency>
-                <groupId>io.projectreactor</groupId>
-                <artifactId>reactor-bom</artifactId>
-                <version>${reactor-version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-framework-bom</artifactId>
@@ -117,6 +109,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
+            <version>${reactor-version}</version>
         </dependency>
 
         <!-- Netty -->
@@ -281,6 +274,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
+            <version>${reactor-version}</version>
             <scope>test</scope>
         </dependency>
 

From 5a9c5ec5b96b6276c6734c2f46db609d034a949c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 19 Sep 2018 21:56:01 +0200
Subject: [PATCH 521/808] [maven-release-plugin] prepare release 5.1.0.RELEASE

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index abc524939d..b87da1ab42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.1.0.BUILD-SNAPSHOT</version>
+    <version>5.1.0.RELEASE</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -69,7 +69,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-        <tag>HEAD</tag>
+        <tag>5.1.0.RELEASE</tag>
     </scm>
 
     <dependencyManagement>

From bab894620bde8ffbbc0d834a919e049ef85e76c3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 19 Sep 2018 21:56:11 +0200
Subject: [PATCH 522/808] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b87da1ab42..78f4f0419b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.1.0.RELEASE</version>
+    <version>5.2.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -69,7 +69,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-        <tag>5.1.0.RELEASE</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <dependencyManagement>

From 3ed182d818b56217052e3ae2a6ce104daefa73ab Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 20 Sep 2018 15:00:19 +0200
Subject: [PATCH 523/808] Convert to JUnit 5 tests #430

---
 Makefile                                      |   4 +-
 pom.xml                                       | 125 +++++-
 .../MyExtendedRedisClientTest.java            |  30 +-
 .../extensibility/MyPubSubConnection.java     |   2 +-
 src/test/java/io/lettuce/Futures.java         |  71 ----
 .../io/lettuce/LenientClusterDownRule.java    |  54 ---
 src/test/java/io/lettuce/LoggingTestRule.java | 143 -------
 .../apigenerator/CompilationUnitFactory.java  |  10 +-
 .../lettuce/apigenerator/CreateAsyncApi.java  |  12 +-
 .../CreateAsyncNodeSelectionClusterApi.java   |  14 +-
 .../apigenerator/CreateReactiveApi.java       |  14 +-
 .../lettuce/apigenerator/CreateSyncApi.java   |  14 +-
 .../CreateSyncNodeSelectionClusterApi.java    |  14 +-
 src/test/java/io/lettuce/codec/CRC16Test.java |  66 ----
 .../java/io/lettuce/codec/CRC16UnitTests.java |  70 ++++
 .../lettuce/core/AbstractRedisClientTest.java |  22 +-
 ...a => AsyncConnectionIntegrationTests.java} | 119 +++---
 ...tTest.java => ClientIntegrationTests.java} | 115 +++---
 ...ava => ClientMetricsIntegrationTests.java} |  41 +-
 ...ava => ClientOptionsIntegrationTests.java} | 366 ++++++++----------
 .../lettuce/core/ClientOptionsUnitTests.java  |  49 +++
 ...va => ConnectMethodsIntegrationTests.java} |  82 ++--
 .../lettuce/core/ConnectionCommandTest.java   |  86 ++--
 ...st.java => ConnectionFutureUnitTests.java} |  13 +-
 ....java => CustomCodecIntegrationTests.java} |  32 +-
 ...st.java => ExceptionFactoryUnitTests.java} |  16 +-
 ...oModelTest.java => GeoModelUnitTests.java} |  29 +-
 ...imeTest.java => JavaRuntimeUnitTests.java} |  21 +-
 ...yValueTest.java => KeyValueUnitTests.java} |  34 +-
 ...Test.java => LettuceFuturesUnitTests.java} |  30 +-
 .../{LimitTest.java => LimitUnitTests.java}   |   8 +-
 ...t.java => PipeliningIntegrationTests.java} |  36 +-
 .../io/lettuce/core/PrivateAccessorTest.java  |  76 ----
 .../io/lettuce/core/ProtectedModeTests.java   |  36 +-
 .../{RangeTest.java => RangeUnitTests.java}   |  18 +-
 ...tiveBackpressurePropagationUnitTests.java} |  22 +-
 ...> ReactiveConnectionIntegrationTests.java} | 102 ++---
 ...ctiveStreamingOutputIntegrationTests.java} |  57 ++-
 ...> RedisClientConnectIntegrationTests.java} | 166 ++++----
 ...a => RedisClientFactoryBeanUnitTests.java} |  31 +-
 .../lettuce/core/RedisClientFactoryTest.java  |  95 -----
 .../core/RedisClientFactoryUnitTests.java     | 101 +++++
 ....java => RedisClientIntegrationTests.java} | 105 ++++-
 .../RedisClientListenerIntegrationTests.java  |  31 ++
 .../lettuce/core/RedisClientListenerTest.java | 125 ------
 ...est.java => RedisURIBuilderUnitTests.java} |  92 ++---
 ...disURITest.java => RedisURIUnitTests.java} |  47 +--
 ...anArgsTest.java => ScanArgsUnitTests.java} |   6 +-
 ...rsorTest.java => ScanCursorUnitTests.java} |  22 +-
 ...java => ScanIteratorIntegrationTests.java} |  46 ++-
 .../java/io/lettuce/core/ScanStreamTest.java  |  28 +-
 ...lueTest.java => ScoredValueUnitTests.java} |  31 +-
 ...ava => SocketOptionsIntegrationTests.java} |  40 +-
 .../lettuce/core/SocketOptionsUnitTests.java  |  56 +++
 .../SslIntegrationTests.java}                 | 170 ++++----
 .../core/SyncAsyncApiConvergenceTest.java     |  53 ++-
 .../io/lettuce/core/TestRedisPublisher.java   |   2 +-
 .../{AbstractTest.java => TestSupport.java}   |  32 +-
 ...Test.java => TimeoutOptionsUnitTests.java} |  10 +-
 .../io/lettuce/core/UnixDomainSocketTest.java |  10 +-
 ...a => Utf8StringCodecIntegrationTests.java} |  19 +-
 .../{ValueTest.java => ValueUnitTests.java}   |  72 ++--
 ...ArgsTest.java => ZStoreArgsUnitTests.java} |   8 +-
 ...dvancedClusterClientIntegrationTests.java} | 313 +++++++--------
 ...ancedClusterReactiveIntegrationTests.java} | 137 +++----
 ...ncConnectionProviderIntegrationTests.java} |  89 ++---
 .../core/cluster/ByteCodecClusterTest.java    |  13 +-
 ...ava => ClusterClientOptionsUnitTests.java} |   6 +-
 ...va => ClusterCommandIntegrationTests.java} | 141 +++----
 ...Test.java => ClusterCommandUnitTests.java} |  37 +-
 ...erDistributionChannelWriterUnitTests.java} |  20 +-
 ...java => ClusterNodeEndpointUnitTests.java} |  50 +--
 ...ClusterPartiallyDownIntegrationTests.java} |  40 +-
 ...usterReactiveCommandIntegrationTests.java} |  88 ++---
 .../io/lettuce/core/cluster/ClusterRule.java  |   4 +-
 .../io/lettuce/core/cluster/ClusterSetup.java |  55 ++-
 ...sterTest.java => ClusterTestSettings.java} |  33 +-
 .../lettuce/core/cluster/ClusterTestUtil.java |   2 +-
 ...usterTopologyRefreshOptionsUnitTests.java} |  12 +-
 ...terTopologyRefreshSchedulerUnitTests.java} |  45 ++-
 ...MajorityPartitionsConsensusUnitTests.java} |  12 +-
 ...MajorityPartitionsConsensusUnitTests.java} |  16 +-
 ...> NodeSelectionAsyncIntegrationTests.java} | 108 +++---
 ...=> NodeSelectionSyncIntegrationTests.java} |  68 ++--
 ...ava => PipelinedRedisFutureUnitTests.java} |  16 +-
 ...edClusterConnectionProviderUnitTests.java} |  75 ++--
 ...adFromTest.java => ReadFromUnitTests.java} |  43 +-
 ...st.java => ReadOnlyCommandsUnitTests.java} |   8 +-
 .../RedisClusterClientFactoryTest.java        | 130 -------
 .../RedisClusterClientFactoryTests.java       | 141 +++++++
 ...> RedisClusterClientIntegrationTests.java} | 297 +++++++-------
 .../RedisClusterPasswordSecuredSslTest.java   |  76 ++--
 ...RedisClusterReadFromIntegrationTests.java} |  69 ++--
 .../core/cluster/RedisClusterSetupTest.java   |  62 ++-
 .../RedisClusterStressScenariosTest.java      |  34 +-
 ...java => RedisClusterURIUtilUnitTests.java} |  14 +-
 .../RedisReactiveClusterClientTest.java       | 100 ++---
 ...t.java => RedisStateIntegrationTests.java} |  21 +-
 ...dRobinSocketAddressSupplierUnitTests.java} |  28 +-
 ...java => ScanIteratorIntegrationTests.java} |  65 ++--
 ...t.java => ScanStreamIntegrationTests.java} |  34 +-
 ...ngleThreadedReactiveClusterClientTest.java |  20 +-
 ...otHashTest.java => SlotHashUnitTests.java} |  16 +-
 .../commands/CustomClusterCommandTest.java    | 133 +++----
 .../commands/GeoClusterCommandTest.java       |  42 +-
 .../commands/HashClusterCommandTest.java      |  20 +-
 .../commands/KeyClusterCommandTest.java       |  39 +-
 .../commands/ListClusterCommandTest.java      |  32 +-
 .../commands/StringClusterCommandTest.java    |  28 +-
 .../HashClusterReactiveCommandTest.java       |  22 +-
 .../KeyClusterReativeCommandTest.java         |  22 +-
 .../ListClusterReactiveCommandTest.java       |  34 +-
 .../StringClusterReactiveCommandTest.java     |  28 +-
 .../ClusterPartitionParserUnitTests.java}     |  25 +-
 ...ionsTest.java => PartitionsUnitTests.java} |  60 +--
 ...st.java => RedisClusterNodeUnitTests.java} |  10 +-
 ....java => ClusterSlotsParserUnitTests.java} |  32 +-
 .../cluster/pubsub/PubSubConnectionTest.java  | 164 --------
 ...sterPubSubConnectionIntegrationTests.java} | 174 +++++++--
 ...a => ClusterTopologyRefreshUnitTests.java} |  68 ++--
 ...onsTest.java => ConnectionsUnitTests.java} |  23 +-
 ...t.java => NodeTopologyViewsUnitTests.java} |  14 +-
 ...questsTest.java => RequestsUnitTests.java} |  18 +-
 ...java => TopologyComparatorsUnitTests.java} |  55 +--
 ...a => TopologyRefreshIntegrationTests.java} |  68 ++--
 ...st.java => CompressionCodecUnitTests.java} |  24 +-
 ...decTest.java => StringCodecUnitTests.java} |  24 +-
 .../lettuce/core/commands/BitCommandTest.java | 100 ++---
 .../lettuce/core/commands/BitStringCodec.java |  38 ++
 .../core/commands/CustomCommandTest.java      |  85 ++--
 .../lettuce/core/commands/GeoCommandTest.java |  84 ++--
 .../lettuce/core/commands/HLLCommandTest.java |  35 +-
 .../core/commands/HashCommandTest.java        |  82 ++--
 .../lettuce/core/commands/KeyCommandTest.java | 119 +++---
 .../core/commands/ListCommandTest.java        |  54 +--
 .../core/commands/NumericCommandTest.java     |  12 +-
 ...nlyOnceServerCommandIntegrationTests.java} |  49 ++-
 .../core/commands/ScriptingCommandTest.java   |  56 ++-
 .../core/commands/ServerCommandTest.java      | 101 +++--
 .../lettuce/core/commands/SetCommandTest.java | 108 +++---
 .../core/commands/SortCommandTest.java        |  22 +-
 .../core/commands/SortedSetCommandTest.java   | 142 ++++---
 .../core/commands/StreamCommandTest.java      |  52 ++-
 .../core/commands/StringCommandTest.java      |  55 ++-
 .../core/commands/TransactionCommandTest.java |  38 +-
 .../reactive/BitReactiveCommandTest.java      |  19 +-
 ...ustomReactiveCommandIntegrationTests.java} |  34 +-
 .../reactive/GeoReactiveCommandTest.java      |  10 +-
 .../reactive/HLLReactiveCommandTest.java      |   4 +-
 .../reactive/HashReactiveCommandTest.java     |   4 +-
 .../reactive/KeyReactiveCommandTest.java      |   4 +-
 .../reactive/ListReactiveCommandTest.java     |   4 +-
 .../reactive/NumericReactiveCommandTest.java  |   4 +-
 .../ScriptingReactiveCommandTest.java         |   4 +-
 .../reactive/ServerReactiveCommandTest.java   |  20 +-
 .../reactive/SetReactiveCommandTest.java      |   4 +-
 .../reactive/SortReactiveCommandTest.java     |   4 +-
 .../SortedSetReactiveCommandTest.java         |   4 +-
 .../reactive/StreamReactiveCommandTest.java   |   4 +-
 .../reactive/StringReactiveCommandTest.java   |  10 +-
 .../TransactionReactiveCommandTest.java       |  24 +-
 .../transactional/BitTxCommandTest.java       |   3 +-
 .../transactional/GeoTxCommandTest.java       |  20 +-
 .../transactional/HLLTxCommandTest.java       |   2 +-
 .../transactional/HashTxCommandTest.java      |   2 +-
 .../transactional/KeyTxCommandTest.java       |   6 +-
 .../transactional/ListTxCommandTest.java      |   2 +-
 .../transactional/SetTxCommandTest.java       |   2 +-
 .../transactional/SortTxCommandTest.java      |   2 +-
 .../transactional/SortedSetTxCommandTest.java |   2 +-
 .../transactional/StringTxCommandTest.java    |   2 +-
 .../TxSyncInvocationHandler.java              |   4 +-
 ...utableCommandLookupStrategyUnitTests.java} |  40 +-
 ...ommandSegmentCommandFactoryUnitTests.java} |  30 +-
 ...t.java => ConversionServiceUnitTests.java} |  10 +-
 ...va => DeclaredCommandMethodUnitTests.java} |  12 +-
 ...efaultCommandMethodVerifierUnitTests.java} |  22 +-
 ...est.java => ParameterBinderUnitTests.java} |  88 +++--
 ...ommandSegmentCommandFactoryUnitTests.java} |  22 +-
 ...ava => ReactiveTypeAdaptersUnitTests.java} |  46 +--
 ...ReactiveTypeAdaptionIntegrationTests.java} |  44 ++-
 ...> RedisCommandsAsyncIntegrationTests.java} |  23 +-
 ...edisCommandsBatchingIntegrationTests.java} |  35 +-
 .../dynamic/RedisCommandsClusterSyncTest.java |  18 +-
 ...ava => RedisCommandsIntegrationTests.java} |  30 +-
 ...edisCommandsReactiveIntegrationTests.java} |  22 +-
 ...=> RedisCommandsSyncIntegrationTests.java} |  30 +-
 ...rTest.java => SimpleBatcherUnitTests.java} |  20 +-
 ...nnotationRedisCodecResolverUnitTests.java} |  25 +-
 ...t.java => ParameterWrappersUnitTests.java} |  18 +-
 ...a => InvocationProxyFactoryUnitTests.java} |  14 +-
 ...=> CodecAwareOutputResolverUnitTests.java} |  18 +-
 ...ommandOutputFactoryResolverUnitTests.java} |  30 +-
 ...Test.java => OutputRegistryUnitTests.java} |  22 +-
 ...tationCommandSegmentFactoryUnitTests.java} |  18 +-
 ...ParametrizedTypeInformationUnitTests.java} |  32 +-
 ... => WildcardTypeInformationUnitTests.java} |  22 +-
 .../event/ConnectionEventsTriggeredTest.java  |  10 +-
 ...est.java => DefaultEventBusUnitTests.java} |  14 +-
 ...efaultEventPublisherOptionsUnitTests.java} |  10 +-
 ...> AbstractInvocationHandlerUnitTests.java} |  12 +-
 ...ortTest.java => HostAndPortUnitTests.java} |  22 +-
 ...onsTest.java => ConnectionsUnitTests.java} |  21 +-
 .../core/masterslave/CustomCommandTest.java   |  95 ++---
 ...=> MasterSlaveChannelWriterUnitTests.java} |  31 +-
 ...sterSlaveConnectionProviderUnitTests.java} |  25 +-
 .../masterslave/MasterSlaveSentinelTest.java  |  26 +-
 .../core/masterslave/MasterSlaveTest.java     |  59 +--
 ...MasterSlaveTopologyProviderUnitTests.java} |  31 +-
 ... MasterSlaveTopologyRefreshUnitTests.java} |  33 +-
 ...st.java => MasterSlaveUtilsUnitTests.java} |  12 +-
 ... => SentinelTopologyRefreshUnitTests.java} |  63 +--
 .../masterslave/StaticMasterSlaveTest.java    |  60 +--
 ...st.java => CommandLatencyIdUnitTests.java} |   8 +-
 ...aultCommandLatencyCollectorUnitTests.java} |  22 +-
 ...mandLatencyCollectorOptionsUnitTests.java} |  10 +-
 ...java => CommandDetailParserUnitTests.java} |  17 +-
 ...rserTest.java => RoleParserUnitTests.java} |  51 +--
 ...rTest.java => PendingParserUnitTests.java} |   8 +-
 ...t.java => BooleanListOutputUnitTests.java} |  15 +-
 ...=> GeoCoordinatesListOutputUnitTests.java} |  13 +-
 ...oCoordinatesValueListOutputUnitTests.java} |  15 +-
 ...java => GeoWithinListOutputUnitTests.java} |  16 +-
 .../lettuce/core/output/ListOutputTest.java   |  93 -----
 .../core/output/ListOutputUnitTests.java      | 101 +++++
 ...putTest.java => MultiOutputUnitTests.java} |  10 +-
 ...t.java => NestedMultiOutputUnitTests.java} |  14 +-
 ...utTest.java => ReplayOutputUnitTests.java} |  10 +-
 ...va => ScoredValueListOutputUnitTests.java} |  15 +-
 ...java => SocketAddressOutputUnitTests.java} |   6 +-
 ...lsTest.java => AsyncCommandUnitTests.java} | 131 ++++---
 ...rgsTest.java => CommandArgsUnitTests.java} |  32 +-
 ...Test.java => CommandHandlerUnitTests.java} |  87 +++--
 ...ternalsTest.java => CommandUnitTests.java} |  59 +--
 ...Test.java => CommandWrapperUnitTests.java} |  16 +-
 .../core/protocol/ConnectionFailureTest.java  |  70 ++--
 ...est.java => DefaultEndpointUnitTests.java} |  80 ++--
 ...neTest.java => StateMachineUnitTests.java} |  75 ++--
 ...ava => TransactionalCommandUnitTests.java} |   6 +-
 ...ava => PubSubCommandHandlerUnitTests.java} |  26 +-
 .../core/pubsub/PubSubCommandTest.java        | 130 +++----
 .../core/pubsub/PubSubReactiveTest.java       | 104 +++--
 .../reactive/RedisPublisherVerification.java  |  13 +-
 .../core/reactive/ScanStreamVerification.java |  12 +-
 .../core/reliability/AtLeastOnceTest.java     |  44 +--
 .../core/reliability/AtMostOnceTest.java      |  55 +--
 ...yTest.java => ConstantDelayUnitTests.java} |  15 +-
 ... => DecorrelatedJitterDelayUnitTests.java} |  26 +-
 ...a => DefaultClientResourcesUnitTests.java} |  41 +-
 ...faultEventLoopGroupProviderUnitTests.java} |  22 +-
 ...t.java => DirContextDnsResolverTests.java} |  54 +--
 ...st.java => EqualJitterDelayUnitTests.java} |  25 +-
 ...st.java => ExponentialDelayUnitTests.java} |  34 +-
 ...est.java => FullJitterDelayUnitTests.java} |  25 +-
 ...FuturesTest.java => FuturesUnitTests.java} |  48 ++-
 ...appingSocketAddressResolverUnitTests.java} |  23 +-
 .../core/sentinel/AbstractSentinelTest.java   |  15 +-
 .../core/sentinel/SentinelCommandTest.java    |  29 +-
 .../core/sentinel/SentinelConnectionTest.java |  51 +--
 .../lettuce/core/sentinel/SentinelRule.java   |  22 +-
 .../sentinel/SentinelServerCommandTest.java   |  18 +-
 .../reactive/SentinelReactiveCommandTest.java |   8 +-
 .../SentinelServerReactiveCommandTest.java    |   8 +-
 .../io/lettuce/core/server/MockTcpServer.java |   2 +-
 .../core/server/RandomServerHandler.java      |   2 +-
 ...onnectionPoolSupportIntegrationTests.java} |  64 +--
 ... => AsyncPoolWithValidationUnitTests.java} |  64 +--
 ...st.java => BoundedAsyncPoolUnitTests.java} |  62 +--
 ...{CdiTest.java => CdiIntegrationTests.java} |  47 ++-
 ...onnectionPoolSupportIntegrationTests.java} |  48 +--
 .../io/lettuce/core/support/PersonDB.java     |   2 +-
 ...disClusterClientFactoryBeanUnitTests.java} |  27 +-
 ...gTest.java => SpringIntegrationTests.java} |   8 +-
 .../core/tracing/BraveTracingTest.java        |  40 +-
 .../io/lettuce/examples/SpringExample.java    |   1 -
 .../io/lettuce/{ => test}/CanConnect.java     |   6 +-
 ...ConnectionDecoratingInvocationHandler.java |   8 +-
 .../{ => test}/ConnectionTestUtil.java        |   9 +-
 .../java/io/lettuce/{ => test}/Delay.java     |   4 +-
 src/test/java/io/lettuce/test/Futures.java    | 139 +++++++
 .../KeyValueStreamingAdapter.java             |   4 +-
 .../io/lettuce/{ => test}/KeysAndValues.java  |   4 +-
 .../io/lettuce/test/LettuceExtension.java     | 325 ++++++++++++++++
 .../{core => test}/ListStreamingAdapter.java  |   5 +-
 .../ReactiveSyncInvocationHandler.java        |   6 +-
 .../RoutingInvocationHandler.java             |   4 +-
 .../java/io/lettuce/{ => test}/Sockets.java   |   4 +-
 src/test/java/io/lettuce/{ => test}/Wait.java |   8 +-
 .../java/io/lettuce/test/WithPassword.java    |  63 +++
 .../test/condition/EnabledOnCommand.java      |  41 ++
 .../condition/EnabledOnCommandCondition.java  |  59 +++
 .../{ => test/condition}/RedisConditions.java |  32 +-
 .../resource}/DefaultRedisClient.java         |  12 +-
 .../resource/DefaultRedisClusterClient.java   |  52 +++
 .../{core => test/resource}/FastShutdown.java |   5 +-
 .../resource}/TestClientResources.java        |   7 +-
 .../resource}/TestEventLoopGroupProvider.java |   8 +-
 .../{core => test/settings}/TestSettings.java |   4 +-
 .../io/lettuce/core/RedisClientBenchmark.java |   5 +-
 .../core/cluster/EmptyRedisClusterClient.java |   2 +-
 .../cluster/RedisClusterClientBenchmark.java  |   6 +-
 .../partitions/RedisClusterNodeBenchmark.java |   6 +-
 .../jmh/io/lettuce/core/codec/JmhMain.java    |   3 +-
 .../dynamic/RedisCommandFactoryBenchmark.java |   3 +-
 .../core/dynamic/RedisCommandsBenchmark.java  |   2 +-
 .../InvocationProxyFactoryBenchmark.java      |   4 +-
 .../jmh/io/lettuce/core/output/JmhMain.java   |   3 +-
 .../lettuce/core/protocol/EmptyByteBuf.java   |  25 +-
 .../lettuce/core/protocol/EmptyChannel.java   |   2 +-
 .../core/protocol/EmptyClientResources.java   |   4 +-
 .../io/lettuce/core/protocol/EmptyConfig.java |   2 +-
 .../io/lettuce/core/protocol/EmptyFuture.java |  14 +-
 .../lettuce/core/protocol/EmptyPromise.java   |  14 +-
 ...xml => SpringIntegrationTests-context.xml} |   2 +-
 314 files changed, 6812 insertions(+), 6088 deletions(-)
 delete mode 100644 src/test/java/io/lettuce/Futures.java
 delete mode 100644 src/test/java/io/lettuce/LenientClusterDownRule.java
 delete mode 100644 src/test/java/io/lettuce/LoggingTestRule.java
 delete mode 100644 src/test/java/io/lettuce/codec/CRC16Test.java
 create mode 100644 src/test/java/io/lettuce/codec/CRC16UnitTests.java
 rename src/test/java/io/lettuce/core/{AsyncConnectionTest.java => AsyncConnectionIntegrationTests.java} (56%)
 rename src/test/java/io/lettuce/core/{ClientTest.java => ClientIntegrationTests.java} (63%)
 rename src/test/java/io/lettuce/core/{ClientMetricsTest.java => ClientMetricsIntegrationTests.java} (72%)
 rename src/test/java/io/lettuce/core/{ClientOptionsTest.java => ClientOptionsIntegrationTests.java} (54%)
 create mode 100644 src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
 rename src/test/java/io/lettuce/core/{AllTheAPIsTest.java => ConnectMethodsIntegrationTests.java} (64%)
 rename src/test/java/io/lettuce/core/{ConnectionFutureTest.java => ConnectionFutureUnitTests.java} (93%)
 rename src/test/java/io/lettuce/core/{CustomCodecTest.java => CustomCodecIntegrationTests.java} (88%)
 rename src/test/java/io/lettuce/core/{ExceptionFactoryTest.java => ExceptionFactoryUnitTests.java} (92%)
 rename src/test/java/io/lettuce/core/{GeoModelTest.java => GeoModelUnitTests.java} (72%)
 rename src/test/java/io/lettuce/core/{JavaRuntimeTest.java => JavaRuntimeUnitTests.java} (71%)
 rename src/test/java/io/lettuce/core/{KeyValueTest.java => KeyValueUnitTests.java} (78%)
 rename src/test/java/io/lettuce/core/{LettuceFuturesTest.java => LettuceFuturesUnitTests.java} (63%)
 rename src/test/java/io/lettuce/core/{LimitTest.java => LimitUnitTests.java} (91%)
 rename src/test/java/io/lettuce/core/{PipeliningTest.java => PipeliningIntegrationTests.java} (69%)
 delete mode 100644 src/test/java/io/lettuce/core/PrivateAccessorTest.java
 rename src/test/java/io/lettuce/core/{RangeTest.java => RangeUnitTests.java} (92%)
 rename src/test/java/io/lettuce/core/{ReactiveBackpressurePropagationTest.java => ReactiveBackpressurePropagationUnitTests.java} (94%)
 rename src/test/java/io/lettuce/core/{ReactiveConnectionTest.java => ReactiveConnectionIntegrationTests.java} (74%)
 rename src/test/java/io/lettuce/core/{ReactiveStreamingOutputTest.java => ReactiveStreamingOutputIntegrationTests.java} (68%)
 rename src/test/java/io/lettuce/core/{RedisClientConnectionTest.java => RedisClientConnectIntegrationTests.java} (56%)
 rename src/test/java/io/lettuce/core/{RedisClientFactoryBeanTest.java => RedisClientFactoryBeanUnitTests.java} (88%)
 delete mode 100644 src/test/java/io/lettuce/core/RedisClientFactoryTest.java
 create mode 100644 src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java
 rename src/test/java/io/lettuce/core/{RedisClientTest.java => RedisClientIntegrationTests.java} (53%)
 create mode 100644 src/test/java/io/lettuce/core/RedisClientListenerIntegrationTests.java
 delete mode 100644 src/test/java/io/lettuce/core/RedisClientListenerTest.java
 rename src/test/java/io/lettuce/core/{RedisURIBuilderTest.java => RedisURIBuilderUnitTests.java} (72%)
 rename src/test/java/io/lettuce/core/{RedisURITest.java => RedisURIUnitTests.java} (90%)
 rename src/test/java/io/lettuce/core/{ScanArgsTest.java => ScanArgsUnitTests.java} (91%)
 rename src/test/java/io/lettuce/core/{ScanCursorTest.java => ScanCursorUnitTests.java} (63%)
 rename src/test/java/io/lettuce/core/{ScanIteratorTest.java => ScanIteratorIntegrationTests.java} (84%)
 rename src/test/java/io/lettuce/core/{ScoredValueTest.java => ScoredValueUnitTests.java} (81%)
 rename src/test/java/io/lettuce/core/{SocketOptionsTest.java => SocketOptionsIntegrationTests.java} (62%)
 create mode 100644 src/test/java/io/lettuce/core/SocketOptionsUnitTests.java
 rename src/test/java/io/lettuce/{SslTest.java => core/SslIntegrationTests.java} (71%)
 rename src/test/java/io/lettuce/core/{AbstractTest.java => TestSupport.java} (59%)
 rename src/test/java/io/lettuce/core/{TimeoutOptionsTest.java => TimeoutOptionsUnitTests.java} (90%)
 rename src/test/java/io/lettuce/core/{Utf8StringCodecTest.java => Utf8StringCodecIntegrationTests.java} (66%)
 rename src/test/java/io/lettuce/core/{ValueTest.java => ValueUnitTests.java} (74%)
 rename src/test/java/io/lettuce/core/{ZStoreArgsTest.java => ZStoreArgsUnitTests.java} (90%)
 rename src/test/java/io/lettuce/core/cluster/{AdvancedClusterClientTest.java => AdvancedClusterClientIntegrationTests.java} (59%)
 rename src/test/java/io/lettuce/core/cluster/{AdvancedClusterReactiveTest.java => AdvancedClusterReactiveIntegrationTests.java} (79%)
 rename src/test/java/io/lettuce/core/cluster/{AsyncConnectionProviderTest.java => AsyncConnectionProviderIntegrationTests.java} (77%)
 rename src/test/java/io/lettuce/core/cluster/{ClusterClientOptionsTest.java => ClusterClientOptionsUnitTests.java} (94%)
 rename src/test/java/io/lettuce/core/cluster/{ClusterCommandTest.java => ClusterCommandIntegrationTests.java} (66%)
 rename src/test/java/io/lettuce/core/cluster/{ClusterCommandInternalsTest.java => ClusterCommandUnitTests.java} (77%)
 rename src/test/java/io/lettuce/core/cluster/{ClusterDistributionChannelWriterTest.java => ClusterDistributionChannelWriterUnitTests.java} (87%)
 rename src/test/java/io/lettuce/core/cluster/{ClusterNodeEndpointTest.java => ClusterNodeEndpointUnitTests.java} (76%)
 rename src/test/java/io/lettuce/core/cluster/{ClusterPartiallyDownTest.java => ClusterPartiallyDownIntegrationTests.java} (86%)
 rename src/test/java/io/lettuce/core/cluster/{ClusterReactiveCommandTest.java => ClusterReactiveCommandIntegrationTests.java} (52%)
 rename src/test/java/io/lettuce/core/cluster/{AbstractClusterTest.java => ClusterTestSettings.java} (64%)
 rename src/test/java/io/lettuce/core/cluster/{ClusterTopologyRefreshOptionsTest.java => ClusterTopologyRefreshOptionsUnitTests.java} (94%)
 rename src/test/java/io/lettuce/core/cluster/{ClusterTopologyRefreshSchedulerTest.java => ClusterTopologyRefreshSchedulerUnitTests.java} (84%)
 rename src/test/java/io/lettuce/core/cluster/{HealthyMajorityPartitionsConsensusTest.java => HealthyMajorityPartitionsConsensusUnitTests.java} (91%)
 rename src/test/java/io/lettuce/core/cluster/{KnownMajorityPartitionsConsensusTest.java => KnownMajorityPartitionsConsensusUnitTests.java} (90%)
 rename src/test/java/io/lettuce/core/cluster/{NodeSelectionAsyncTest.java => NodeSelectionAsyncIntegrationTests.java} (72%)
 rename src/test/java/io/lettuce/core/cluster/{NodeSelectionSyncTest.java => NodeSelectionSyncIntegrationTests.java} (81%)
 rename src/test/java/io/lettuce/core/cluster/{PipelinedRedisFutureTest.java => PipelinedRedisFutureUnitTests.java} (79%)
 rename src/test/java/io/lettuce/core/cluster/{PooledClusterConnectionProviderTest.java => PooledClusterConnectionProviderUnitTests.java} (80%)
 rename src/test/java/io/lettuce/core/cluster/{ReadFromTest.java => ReadFromUnitTests.java} (81%)
 rename src/test/java/io/lettuce/core/cluster/{ReadOnlyCommandsTest.java => ReadOnlyCommandsUnitTests.java} (89%)
 delete mode 100644 src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTest.java
 create mode 100644 src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java
 rename src/test/java/io/lettuce/core/cluster/{RedisClusterClientTest.java => RedisClusterClientIntegrationTests.java} (66%)
 rename src/test/java/io/lettuce/core/cluster/{RedisClusterReadFromTest.java => RedisClusterReadFromIntegrationTests.java} (56%)
 rename src/test/java/io/lettuce/core/cluster/{RedisClusterURIUtilTest.java => RedisClusterURIUtilUnitTests.java} (92%)
 rename src/test/java/io/lettuce/core/cluster/{RedisStateTest.java => RedisStateIntegrationTests.java} (74%)
 rename src/test/java/io/lettuce/core/cluster/{RoundRobinSocketAddressSupplierTest.java => RoundRobinSocketAddressSupplierUnitTests.java} (89%)
 rename src/test/java/io/lettuce/core/cluster/{ScanIteratorTest.java => ScanIteratorIntegrationTests.java} (81%)
 rename src/test/java/io/lettuce/core/cluster/{ScanStreamTest.java => ScanStreamIntegrationTests.java} (67%)
 rename src/test/java/io/lettuce/core/cluster/{SlotHashTest.java => SlotHashUnitTests.java} (80%)
 rename src/test/java/io/lettuce/core/cluster/{ClusterPartitionParserTest.java => models/partitions/ClusterPartitionParserUnitTests.java} (89%)
 rename src/test/java/io/lettuce/core/cluster/models/partitions/{PartitionsTest.java => PartitionsUnitTests.java} (89%)
 rename src/test/java/io/lettuce/core/cluster/models/partitions/{RedisClusterNodeTest.java => RedisClusterNodeUnitTests.java} (92%)
 rename src/test/java/io/lettuce/core/cluster/models/slots/{ClusterSlotsParserTest.java => ClusterSlotsParserUnitTests.java} (87%)
 delete mode 100644 src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java
 rename src/test/java/io/lettuce/core/cluster/pubsub/{PubSubClusterTest.java => RedisClusterPubSubConnectionIntegrationTests.java} (50%)
 rename src/test/java/io/lettuce/core/cluster/topology/{ClusterTopologyRefreshTest.java => ClusterTopologyRefreshUnitTests.java} (90%)
 rename src/test/java/io/lettuce/core/cluster/topology/{ConnectionsTest.java => ConnectionsUnitTests.java} (79%)
 rename src/test/java/io/lettuce/core/cluster/topology/{NodeTopologyViewsTest.java => NodeTopologyViewsUnitTests.java} (85%)
 rename src/test/java/io/lettuce/core/cluster/topology/{RequestsTest.java => RequestsUnitTests.java} (86%)
 rename src/test/java/io/lettuce/core/cluster/topology/{TopologyComparatorsTest.java => TopologyComparatorsUnitTests.java} (88%)
 rename src/test/java/io/lettuce/core/cluster/topology/{TopologyRefreshTest.java => TopologyRefreshIntegrationTests.java} (86%)
 rename src/test/java/io/lettuce/core/codec/{CompressionCodecTest.java => CompressionCodecUnitTests.java} (82%)
 rename src/test/java/io/lettuce/core/codec/{StringCodecTest.java => StringCodecUnitTests.java} (83%)
 create mode 100644 src/test/java/io/lettuce/core/commands/BitStringCodec.java
 rename src/test/java/io/lettuce/core/commands/{RunOnlyOnceServerCommandTest.java => RunOnlyOnceServerCommandIntegrationTests.java} (72%)
 rename src/test/java/io/lettuce/core/commands/reactive/{CustomReactiveCommandTest.java => CustomReactiveCommandIntegrationTests.java} (65%)
 rename src/test/java/io/lettuce/core/dynamic/{BatchExecutableCommandLookupStrategyTest.java => BatchExecutableCommandLookupStrategyUnitTests.java} (69%)
 rename src/test/java/io/lettuce/core/dynamic/{CommandSegmentCommandFactoryTest.java => CommandSegmentCommandFactoryUnitTests.java} (91%)
 rename src/test/java/io/lettuce/core/dynamic/{ConversionServiceTest.java => ConversionServiceUnitTests.java} (94%)
 rename src/test/java/io/lettuce/core/dynamic/{DeclaredCommandMethodTest.java => DeclaredCommandMethodUnitTests.java} (86%)
 rename src/test/java/io/lettuce/core/dynamic/{DefaultCommandMethodVerifierTest.java => DefaultCommandMethodVerifierUnitTests.java} (91%)
 rename src/test/java/io/lettuce/core/dynamic/{ParameterBinderTest.java => ParameterBinderUnitTests.java} (68%)
 rename src/test/java/io/lettuce/core/dynamic/{ReactiveCommandSegmentCommandFactoryTest.java => ReactiveCommandSegmentCommandFactoryUnitTests.java} (83%)
 rename src/test/java/io/lettuce/core/dynamic/{ReactiveTypeAdaptersTest.java => ReactiveTypeAdaptersUnitTests.java} (76%)
 rename src/test/java/io/lettuce/core/dynamic/{ReactiveTypeAdaptionTest.java => ReactiveTypeAdaptionIntegrationTests.java} (72%)
 rename src/test/java/io/lettuce/core/dynamic/{RedisCommandsAsyncTest.java => RedisCommandsAsyncIntegrationTests.java} (67%)
 rename src/test/java/io/lettuce/core/dynamic/{RedisCommandsBatchingTest.java => RedisCommandsBatchingIntegrationTests.java} (84%)
 rename src/test/java/io/lettuce/core/dynamic/{RedisCommandsTest.java => RedisCommandsIntegrationTests.java} (77%)
 rename src/test/java/io/lettuce/core/dynamic/{RedisCommandsReactiveTest.java => RedisCommandsReactiveIntegrationTests.java} (66%)
 rename src/test/java/io/lettuce/core/dynamic/{RedisCommandsSyncTest.java => RedisCommandsSyncIntegrationTests.java} (81%)
 rename src/test/java/io/lettuce/core/dynamic/{SimpleBatcherTest.java => SimpleBatcherUnitTests.java} (91%)
 rename src/test/java/io/lettuce/core/dynamic/codec/{AnnotationRedisCodecResolverTest.java => AnnotationRedisCodecResolverUnitTests.java} (87%)
 rename src/test/java/io/lettuce/core/dynamic/codec/{ParameterWrappersTest.java => ParameterWrappersUnitTests.java} (92%)
 rename src/test/java/io/lettuce/core/dynamic/intercept/{InvocationProxyFactoryTest.java => InvocationProxyFactoryUnitTests.java} (88%)
 rename src/test/java/io/lettuce/core/dynamic/output/{CodecAwareOutputResolverTest.java => CodecAwareOutputResolverUnitTests.java} (89%)
 rename src/test/java/io/lettuce/core/dynamic/output/{OutputRegistryCommandOutputFactoryResolverTest.java => OutputRegistryCommandOutputFactoryResolverUnitTests.java} (85%)
 rename src/test/java/io/lettuce/core/dynamic/output/{OutputRegistryTest.java => OutputRegistryUnitTests.java} (82%)
 rename src/test/java/io/lettuce/core/dynamic/segment/{AnnotationCommandSegmentFactoryTest.java => AnnotationCommandSegmentFactoryUnitTests.java} (91%)
 rename src/test/java/io/lettuce/core/dynamic/support/{ParametrizedTypeInformationTest.java => ParametrizedTypeInformationUnitTests.java} (80%)
 rename src/test/java/io/lettuce/core/dynamic/support/{WildcardTypeInformationTest.java => WildcardTypeInformationUnitTests.java} (86%)
 rename src/test/java/io/lettuce/core/event/{DefaultEventBusTest.java => DefaultEventBusUnitTests.java} (85%)
 rename src/test/java/io/lettuce/core/event/{DefaultEventPublisherOptionsTest.java => DefaultEventPublisherOptionsUnitTests.java} (89%)
 rename src/test/java/io/lettuce/core/internal/{AbstractInvocationHandlerTest.java => AbstractInvocationHandlerUnitTests.java} (86%)
 rename src/test/java/io/lettuce/core/internal/{HostAndPortTest.java => HostAndPortUnitTests.java} (93%)
 rename src/test/java/io/lettuce/core/masterslave/{ConnectionsTest.java => ConnectionsUnitTests.java} (76%)
 rename src/test/java/io/lettuce/core/masterslave/{MasterSlaveChannelWriterTest.java => MasterSlaveChannelWriterUnitTests.java} (88%)
 rename src/test/java/io/lettuce/core/masterslave/{MasterSlaveConnectionProviderTest.java => MasterSlaveConnectionProviderUnitTests.java} (80%)
 rename src/test/java/io/lettuce/core/masterslave/{MasterSlaveTopologyProviderTest.java => MasterSlaveTopologyProviderUnitTests.java} (88%)
 rename src/test/java/io/lettuce/core/masterslave/{MasterSlaveTopologyRefreshTest.java => MasterSlaveTopologyRefreshUnitTests.java} (85%)
 rename src/test/java/io/lettuce/core/masterslave/{MasterSlaveUtilsTest.java => MasterSlaveUtilsUnitTests.java} (92%)
 rename src/test/java/io/lettuce/core/masterslave/{SentinelTopologyRefreshTest.java => SentinelTopologyRefreshUnitTests.java} (91%)
 rename src/test/java/io/lettuce/core/metrics/{CommandLatencyIdTest.java => CommandLatencyIdUnitTests.java} (88%)
 rename src/test/java/io/lettuce/core/metrics/{DefaultCommandLatencyCollectorTest.java => DefaultCommandLatencyCollectorUnitTests.java} (90%)
 rename src/test/java/io/lettuce/core/metrics/{DefaultDefaultCommandLatencyCollectorOptionsTest.java => DefaultDefaultCommandLatencyCollectorOptionsUnitTests.java} (86%)
 rename src/test/java/io/lettuce/core/models/command/{CommandDetailParserTest.java => CommandDetailParserUnitTests.java} (88%)
 rename src/test/java/io/lettuce/core/models/role/{RoleParserTest.java => RoleParserUnitTests.java} (82%)
 rename src/test/java/io/lettuce/core/models/stream/{PendingParserTest.java => PendingParserUnitTests.java} (92%)
 rename src/test/java/io/lettuce/core/output/{BooleanListOutputTest.java => BooleanListOutputUnitTests.java} (75%)
 rename src/test/java/io/lettuce/core/output/{GeoCoordinatesListOutputTest.java => GeoCoordinatesListOutputUnitTests.java} (79%)
 rename src/test/java/io/lettuce/core/output/{GeoCoordinatesValueListOutputTest.java => GeoCoordinatesValueListOutputUnitTests.java} (79%)
 rename src/test/java/io/lettuce/core/output/{GeoWithinListOutputTest.java => GeoWithinListOutputUnitTests.java} (88%)
 delete mode 100644 src/test/java/io/lettuce/core/output/ListOutputTest.java
 create mode 100644 src/test/java/io/lettuce/core/output/ListOutputUnitTests.java
 rename src/test/java/io/lettuce/core/output/{MultiOutputTest.java => MultiOutputUnitTests.java} (92%)
 rename src/test/java/io/lettuce/core/output/{NestedMultiOutputTest.java => NestedMultiOutputUnitTests.java} (76%)
 rename src/test/java/io/lettuce/core/output/{ReplayOutputTest.java => ReplayOutputUnitTests.java} (91%)
 rename src/test/java/io/lettuce/core/output/{ScoredValueListOutputTest.java => ScoredValueListOutputUnitTests.java} (79%)
 rename src/test/java/io/lettuce/core/output/{SocketAddressOutputTest.java => SocketAddressOutputUnitTests.java} (91%)
 rename src/test/java/io/lettuce/core/protocol/{AsyncCommandInternalsTest.java => AsyncCommandUnitTests.java} (55%)
 rename src/test/java/io/lettuce/core/protocol/{CommandArgsTest.java => CommandArgsUnitTests.java} (86%)
 rename src/test/java/io/lettuce/core/protocol/{CommandHandlerTest.java => CommandHandlerUnitTests.java} (83%)
 rename src/test/java/io/lettuce/core/protocol/{CommandInternalsTest.java => CommandUnitTests.java} (73%)
 rename src/test/java/io/lettuce/core/protocol/{CommandWrapperTest.java => CommandWrapperUnitTests.java} (83%)
 rename src/test/java/io/lettuce/core/protocol/{DefaultEndpointTest.java => DefaultEndpointUnitTests.java} (85%)
 rename src/test/java/io/lettuce/core/protocol/{StateMachineTest.java => StateMachineUnitTests.java} (75%)
 rename src/test/java/io/lettuce/core/protocol/{TransactionalCommandTest.java => TransactionalCommandUnitTests.java} (91%)
 rename src/test/java/io/lettuce/core/pubsub/{PubSubCommandHandlerTest.java => PubSubCommandHandlerUnitTests.java} (90%)
 rename src/test/java/io/lettuce/core/resource/{ConstantDelayTest.java => ConstantDelayUnitTests.java} (76%)
 rename src/test/java/io/lettuce/core/resource/{DecorrelatedJitterDelayTest.java => DecorrelatedJitterDelayUnitTests.java} (75%)
 rename src/test/java/io/lettuce/core/resource/{DefaultClientResourcesTest.java => DefaultClientResourcesUnitTests.java} (87%)
 rename src/test/java/io/lettuce/core/resource/{DefaultEventLoopGroupProviderTest.java => DefaultEventLoopGroupProviderUnitTests.java} (71%)
 rename src/test/java/io/lettuce/core/resource/{DirContextDnsResolverTest.java => DirContextDnsResolverTests.java} (78%)
 rename src/test/java/io/lettuce/core/resource/{EqualJitterDelayTest.java => EqualJitterDelayUnitTests.java} (78%)
 rename src/test/java/io/lettuce/core/resource/{ExponentialDelayTest.java => ExponentialDelayUnitTests.java} (76%)
 rename src/test/java/io/lettuce/core/resource/{FullJitterDelayTest.java => FullJitterDelayUnitTests.java} (79%)
 rename src/test/java/io/lettuce/core/resource/{FuturesTest.java => FuturesUnitTests.java} (62%)
 rename src/test/java/io/lettuce/core/resource/{MappingSocketAddressResolverTest.java => MappingSocketAddressResolverUnitTests.java} (80%)
 rename src/test/java/io/lettuce/core/support/{AsyncConnectionPoolSupportTest.java => AsyncConnectionPoolSupportIntegrationTests.java} (79%)
 rename src/test/java/io/lettuce/core/support/{AsyncPoolWithValidationTest.java => AsyncPoolWithValidationUnitTests.java} (85%)
 rename src/test/java/io/lettuce/core/support/{BoundedAsyncPoolTest.java => BoundedAsyncPoolUnitTests.java} (85%)
 rename src/test/java/io/lettuce/core/support/{CdiTest.java => CdiIntegrationTests.java} (70%)
 rename src/test/java/io/lettuce/core/support/{ConnectionPoolSupportTest.java => ConnectionPoolSupportIntegrationTests.java} (91%)
 rename src/test/java/io/lettuce/core/support/{RedisClusterClientFactoryBeanTest.java => RedisClusterClientFactoryBeanUnitTests.java} (84%)
 rename src/test/java/io/lettuce/core/support/{SpringTest.java => SpringIntegrationTests.java} (90%)
 rename src/test/java/io/lettuce/{ => test}/CanConnect.java (92%)
 rename src/test/java/io/lettuce/{util => test}/ConnectionDecoratingInvocationHandler.java (91%)
 rename src/test/java/io/lettuce/{ => test}/ConnectionTestUtil.java (94%)
 rename src/test/java/io/lettuce/{ => test}/Delay.java (92%)
 create mode 100644 src/test/java/io/lettuce/test/Futures.java
 rename src/test/java/io/lettuce/{core => test}/KeyValueStreamingAdapter.java (93%)
 rename src/test/java/io/lettuce/{ => test}/KeysAndValues.java (95%)
 create mode 100644 src/test/java/io/lettuce/test/LettuceExtension.java
 rename src/test/java/io/lettuce/{core => test}/ListStreamingAdapter.java (93%)
 rename src/test/java/io/lettuce/{util => test}/ReactiveSyncInvocationHandler.java (96%)
 rename src/test/java/io/lettuce/{util => test}/RoutingInvocationHandler.java (94%)
 rename src/test/java/io/lettuce/{ => test}/Sockets.java (93%)
 rename src/test/java/io/lettuce/{ => test}/Wait.java (98%)
 create mode 100644 src/test/java/io/lettuce/test/WithPassword.java
 create mode 100644 src/test/java/io/lettuce/test/condition/EnabledOnCommand.java
 create mode 100644 src/test/java/io/lettuce/test/condition/EnabledOnCommandCondition.java
 rename src/test/java/io/lettuce/{ => test/condition}/RedisConditions.java (90%)
 rename src/test/java/io/lettuce/{core => test/resource}/DefaultRedisClient.java (80%)
 create mode 100644 src/test/java/io/lettuce/test/resource/DefaultRedisClusterClient.java
 rename src/test/java/io/lettuce/{core => test/resource}/FastShutdown.java (90%)
 rename src/test/java/io/lettuce/{ => test/resource}/TestClientResources.java (89%)
 rename src/test/java/io/lettuce/{core => test/resource}/TestEventLoopGroupProvider.java (87%)
 rename src/test/java/io/lettuce/{core => test/settings}/TestSettings.java (97%)
 rename src/test/resources/io/lettuce/core/support/{SpringTest-context.xml => SpringIntegrationTests-context.xml} (95%)

diff --git a/Makefile b/Makefile
index 27a11d4061..bd240ba60b 100644
--- a/Makefile
+++ b/Makefile
@@ -340,11 +340,11 @@ stop:
 	pkill redis-sentinel && sleep 1 || true
 
 test-coverage: start
-	mvn -B -DskipTests=false clean compile test jacoco:report -P$(PROFILE)
+	mvn -B -DskipITs=false clean compile verify jacoco:report -P$(PROFILE)
 	$(MAKE) stop
 
 test: start
-	mvn -B -DskipTests=false clean compile test -P$(PROFILE)
+	mvn -B -DskipITs=false clean compile verify -P$(PROFILE)
 	$(MAKE) stop
 
 prepare: stop
diff --git a/pom.xml b/pom.xml
index 78f4f0419b..2e6f08b09f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,11 +58,11 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
-        <skipTests>true</skipTests>
         <netty-version>4.1.29.Final</netty-version>
         <spring-version>4.3.19.RELEASE</spring-version>
         <reactor-version>3.2.0.RELEASE</reactor-version>
         <brave-version>5.2.0</brave-version>
+        <skipITs>true</skipITs>
     </properties>
 
     <scm>
@@ -251,7 +251,7 @@
         <dependency>
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
-            <version>1.0</version>
+            <version>2.0</version>
             <optional>true</optional>
         </dependency>
 
@@ -271,6 +271,20 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.3.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>5.3.1</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
@@ -292,6 +306,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>2.22.0</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.google.code.tempus-fugit</groupId>
             <artifactId>tempus-fugit</artifactId>
@@ -300,9 +321,16 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openwebbeans.test</groupId>
-            <artifactId>cditest-owb</artifactId>
-            <version>1.2.8</version>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-se</artifactId>
+            <version>2.0.6</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
             <scope>test</scope>
         </dependency>
 
@@ -382,6 +410,20 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.3.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.3.1</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <profiles>
@@ -400,7 +442,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.10.4</version>
+                        <version>3.0.1</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -423,7 +465,7 @@
                                 <link>https://projectreactor.io/docs/core/release/api/</link>
                                 <link>https://docs.spring.io/spring/docs/current/javadoc-api/</link>
                             </links>
-                            <additionalparam>-Xdoclint:none</additionalparam>
+                            <doclint>none</doclint>
                             <quiet>true</quiet>
                             <tags>
                                 <tag>
@@ -538,13 +580,13 @@
                 <dependency>
                     <groupId>org.openjdk.jmh</groupId>
                     <artifactId>jmh-core</artifactId>
-                    <version>1.11.3</version>
+                    <version>1.21</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.openjdk.jmh</groupId>
                     <artifactId>jmh-generator-annprocess</artifactId>
-                    <version>1.11.3</version>
+                    <version>1.21</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -557,6 +599,12 @@
                             <skip>true</skip>
                         </configuration>
                     </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
@@ -678,12 +726,12 @@
                     <plugin>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctor-maven-plugin</artifactId>
-                        <version>1.5.5</version>
+                        <version>1.5.6</version>
                         <dependencies>
                             <dependency>
                                 <groupId>org.asciidoctor</groupId>
                                 <artifactId>asciidoctorj-pdf</artifactId>
-                                <version>1.5.0-alpha.14</version>
+                                <version>1.5.0-alpha.16</version>
                             </dependency>
                         </dependencies>
                         <executions>
@@ -698,7 +746,6 @@
                                     <backend>html5</backend>
                                     <outputDirectory>${project.build.directory}/site/reference/html
                                     </outputDirectory>
-                                    <sectids>false</sectids>
                                     <doctype>book</doctype>
                                     <attributes>
                                         <linkcss>true</linkcss>
@@ -744,7 +791,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>3.0.0</version>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>docs</id>
@@ -782,7 +829,7 @@
             <extension>
                 <groupId>kr.motd.maven</groupId>
                 <artifactId>os-maven-plugin</artifactId>
-                <version>1.5.0.Final</version>
+                <version>1.6.0</version>
             </extension>
         </extensions>
 
@@ -791,7 +838,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.8.0</version>
                 <configuration>
                     <compilerArgument>-Xlint:all,-deprecation,-unchecked</compilerArgument>
                     <testCompilerArgument>-Xlint:none</testCompilerArgument>
@@ -805,19 +852,61 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.20</version>
+                <version>2.22.0</version>
+                <configuration>
+                    <systemProperties>
+                        <io.netty.eventLoopThreads>4</io.netty.eventLoopThreads>
+                    </systemProperties>
+                    <includes>
+                        <include>**/*UnitTests</include>
+                        <include>**/*Tests</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/*Test</exclude>
+                        <exclude>**/*IntegrationTests</exclude>
+                    </excludes>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>2.22.0</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.22.0</version>
                 <configuration>
                     <systemProperties>
                         <io.netty.eventLoopThreads>4</io.netty.eventLoopThreads>
                     </systemProperties>
+                    <includes>
+                        <include>**/*IntegrationTests</include>
+                        <include>**/*Test</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/*UnitTests</exclude>
+                    </excludes>
                 </configuration>
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit47</artifactId>
-                        <version>2.20</version>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>2.22.0</version>
                     </dependency>
                 </dependencies>
+
+                <executions>
+                    <execution>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>integration-test</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
 
             <plugin>
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
index 97ea3ae9a9..aa5ae46b08 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
@@ -17,46 +17,46 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.pubsub.RedisPubSubAsyncCommandsImpl;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * Test for override/extensability of RedisClient
  */
-public class MyExtendedRedisClientTest {
-    public static final String host = TestSettings.host();
-    public static final int port = TestSettings.port();
+class MyExtendedRedisClientTest {
+    private static final String host = TestSettings.host();
+    private static final int port = TestSettings.port();
 
-    protected static MyExtendedRedisClient client;
+    private static MyExtendedRedisClient client;
     protected RedisCommands<String, String> redis;
     protected String key = "key";
     protected String value = "value";
 
-    @BeforeClass
-    public static void setupClient() {
+    @BeforeAll
+    static void setupClient() {
         client = getRedisClient();
     }
 
-    protected static MyExtendedRedisClient getRedisClient() {
+    static MyExtendedRedisClient getRedisClient() {
         return new MyExtendedRedisClient(null, RedisURI.create(host, port));
     }
 
-    @AfterClass
-    public static void shutdownClient() {
+    @AfterAll
+    static void shutdownClient() {
         FastShutdown.shutdown(client);
     }
 
     @Test
-    public void testPubsub() throws Exception {
+    void testPubsub() throws Exception {
         StatefulRedisPubSubConnection<String, String> connection = client
                 .connectPubSub();
         RedisPubSubAsyncCommands<String, String> commands = connection.async();
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
index e0d90b9928..acb3abd3a8 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
@@ -31,7 +31,7 @@
  * @author Mark Paluch
  */
 @SuppressWarnings("unchecked")
-public class MyPubSubConnection<K, V> extends StatefulRedisPubSubConnectionImpl<K, V> {
+class MyPubSubConnection<K, V> extends StatefulRedisPubSubConnectionImpl<K, V> {
 
     private AtomicInteger subscriptions = new AtomicInteger();
 
diff --git a/src/test/java/io/lettuce/Futures.java b/src/test/java/io/lettuce/Futures.java
deleted file mode 100644
index d38428fe14..0000000000
--- a/src/test/java/io/lettuce/Futures.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2017-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce;
-
-import java.lang.reflect.Constructor;
-import java.net.SocketAddress;
-import java.util.Collection;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Future;
-
-import io.lettuce.core.ConnectionFuture;
-
-/**
- * Utility methods to synchronize and create futures.
- *
- * @author Mark Paluch
- */
-public class Futures {
-
-    /**
-     * Check if all {@code futures} are {@link Future#isDone() completed}.
-     *
-     * @param futures
-     * @return {@literal true} if all {@code futures} are {@link Future#isDone() completed}
-     */
-    public static boolean areAllCompleted(Collection<? extends Future<?>> futures) {
-
-        for (Future<?> future : futures) {
-            if (!future.isDone()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Create a {@link ConnectionFuture}.
-     *
-     * @param socketAddress the socket address.
-     * @param decorated future to decorate.
-     * @param <T>
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> ConnectionFuture<T> createConnectionFuture(SocketAddress socketAddress, CompletableFuture<T> decorated) {
-
-        try {
-            Class<ConnectionFuture> futureClass = (Class) Class.forName("io.lettuce.core.DefaultConnectionFuture");
-            Constructor<ConnectionFuture> constructor = futureClass.getDeclaredConstructor(SocketAddress.class,
-                    CompletableFuture.class);
-            constructor.setAccessible(true);
-
-            return constructor.newInstance(socketAddress, decorated);
-        } catch (ReflectiveOperationException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-}
diff --git a/src/test/java/io/lettuce/LenientClusterDownRule.java b/src/test/java/io/lettuce/LenientClusterDownRule.java
deleted file mode 100644
index cb8aed3dfa..0000000000
--- a/src/test/java/io/lettuce/LenientClusterDownRule.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2017-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.junit.AssumptionViolatedException;
-import org.junit.rules.MethodRule;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.Statement;
-
-/**
- * @author Mark Paluch
- */
-public class LenientClusterDownRule implements MethodRule {
-
-    @Override
-    public Statement apply(Statement base, FrameworkMethod method, Object target) {
-
-        return new Statement() {
-            @Override
-            public void evaluate() throws Throwable {
-
-                try {
-                    base.evaluate();
-                } catch (Throwable throwable) {
-
-                    StringWriter writer = new StringWriter();
-
-                    throwable.printStackTrace(new PrintWriter(writer));
-
-                    if (writer.getBuffer().toString().contains("CLUSTERDOWN")) {
-                        throw new AssumptionViolatedException("Failed with CLUSTERDOWN", throwable);
-                    }
-                    throw throwable;
-                }
-            }
-        };
-    }
-}
diff --git a/src/test/java/io/lettuce/LoggingTestRule.java b/src/test/java/io/lettuce/LoggingTestRule.java
deleted file mode 100644
index 910c67c760..0000000000
--- a/src/test/java/io/lettuce/LoggingTestRule.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright 2017-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.management.ManagementFactory;
-import java.lang.management.ThreadInfo;
-import java.lang.management.ThreadMXBean;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.junit.rules.MethodRule;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.Statement;
-
-/**
- * @author Mark Paluch
- */
-public class LoggingTestRule implements MethodRule {
-
-    private boolean threadDumpOnFailure = false;
-
-    public LoggingTestRule(boolean threadDumpOnFailure) {
-        this.threadDumpOnFailure = threadDumpOnFailure;
-    }
-
-    @Override
-    public Statement apply(Statement base, FrameworkMethod method, Object target) {
-
-        return new Statement() {
-            @Override
-            public void evaluate() throws Throwable {
-                Logger logger = LogManager.getLogger(method.getMethod().getDeclaringClass());
-                if (logger.isInfoEnabled()) {
-                    logger.info("---------------------------------------");
-                    logger.info("-- Invoke method " + method.getMethod().getDeclaringClass().getSimpleName() + "."
-                            + method.getName());
-                    logger.info("---------------------------------------");
-                }
-
-
-                try {
-                    runTest();
-                } catch (Throwable t) {
-                    if (threadDumpOnFailure) {
-                        printThreadDump(logger);
-                    }
-
-                    throw t;
-                } finally {
-                    if (logger.isInfoEnabled()) {
-                        logger.info("---------------------------------------");
-                        logger.info("-- Finished method " + method.getMethod().getDeclaringClass().getSimpleName() + "."
-                                + method.getName());
-                        logger.info("---------------------------------------");
-                    }
-                }
-            }
-
-            protected void runTest() throws Throwable {
-                try {
-                    base.evaluate();
-                } catch (Throwable throwable) {
-
-                    StringWriter writer = new StringWriter();
-
-                    throwable.printStackTrace(new PrintWriter(writer));
-
-                    if (writer.getBuffer().toString().contains("CLUSTERDOWN")) {
-                        base.evaluate();
-                    } else {
-                        throw throwable;
-                    }
-                }
-            }
-        };
-    }
-
-    private void printThreadDump(Logger logger) {
-        logger.info("---------------------------------------");
-
-        ByteArrayOutputStream buffer = getThreadDump();
-        logger.info("-- Thread dump: " + buffer.toString());
-
-        logger.info("---------------------------------------");
-    }
-
-    private ByteArrayOutputStream getThreadDump() {
-        ThreadMXBean threadBean = ManagementFactory.getThreadMXBean();
-        long[] threadIds = threadBean.getAllThreadIds();
-        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        PrintStream stream = new PrintStream(buffer);
-
-        for (long tid : threadIds) {
-            ThreadInfo info = threadBean.getThreadInfo(tid, 50);
-            if (info == null) {
-                stream.println("  Inactive");
-                continue;
-            }
-            stream.println("Thread " + getTaskName(info.getThreadId(), info.getThreadName()) + ":");
-            Thread.State state = info.getThreadState();
-            stream.println("  State: " + state);
-            stream.println("  Blocked count: " + info.getBlockedCount());
-            stream.println("  Waited count: " + info.getWaitedCount());
-
-            if (state == Thread.State.WAITING) {
-                stream.println("  Waiting on " + info.getLockName());
-            } else if (state == Thread.State.BLOCKED) {
-                stream.println("  Blocked on " + info.getLockName());
-                stream.println("  Blocked by " + getTaskName(info.getLockOwnerId(), info.getLockOwnerName()));
-            }
-            stream.println("  Stack:");
-            for (StackTraceElement frame : info.getStackTrace()) {
-                stream.println("    " + frame.toString());
-            }
-        }
-        stream.flush();
-        return buffer;
-    }
-
-    private static String getTaskName(long id, String name) {
-        if (name == null) {
-            return Long.toString(id);
-        }
-        return id + " (" + name + ")";
-    }
-}
diff --git a/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java b/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
index 22bb6b5eef..6c0ee1269d 100644
--- a/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
+++ b/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
@@ -42,7 +42,7 @@
 /**
  * @author Mark Paluch
  */
-public class CompilationUnitFactory {
+class CompilationUnitFactory {
 
     private File templateFile;
     private File sources;
@@ -57,9 +57,9 @@ public class CompilationUnitFactory {
     private Consumer<ClassOrInterfaceDeclaration> typeMutator;
     private Function<Comment, Comment> methodCommentMutator;
 
-    CompilationUnit template;
-    CompilationUnit result = new CompilationUnit();
-    ClassOrInterfaceDeclaration resultType;
+    private CompilationUnit template;
+    private CompilationUnit result = new CompilationUnit();
+    private ClassOrInterfaceDeclaration resultType;
 
     public CompilationUnitFactory(File templateFile, File sources, String targetPackage, String targetName,
             Function<String, String> typeDocFunction, Function<MethodDeclaration, Type> methodReturnTypeFunction,
@@ -135,7 +135,7 @@ public void keepMethodSignaturesFor(Set<String> methodSignaturesToKeep) {
                 MethodDeclaration::getType);
     }
 
-    protected void writeResult() throws IOException {
+    private void writeResult() throws IOException {
 
         FileOutputStream fos = new FileOutputStream(target);
         fos.write(result.toString().getBytes());
diff --git a/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
index 4dbe7ea4b0..008d57c987 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
@@ -38,7 +38,7 @@
  * @author Mark Paluch
  */
 @RunWith(Parameterized.class)
-public class CreateAsyncApi {
+class CreateAsyncApi {
 
     private Set<String> KEEP_METHOD_RESULT_TYPE = LettuceSets.unmodifiableSet("shutdown", "debugOom", "debugSegfault",
             "digest", "close", "isOpen", "BaseRedisCommands.reset", "getStatefulConnection", "setAutoFlushCommands",
@@ -47,7 +47,7 @@ public class CreateAsyncApi {
     private CompilationUnitFactory factory;
 
     @Parameterized.Parameters(name = "Create {0}")
-    public static List<Object[]> arguments() {
+    static List<Object[]> arguments() {
         List<Object[]> result = new ArrayList<>();
 
         for (String templateName : Constants.TEMPLATE_NAMES) {
@@ -84,7 +84,7 @@ public CreateAsyncApi(String templateName) {
      *
      * @return
      */
-    protected Function<String, String> commentMutator() {
+    Function<String, String> commentMutator() {
         return s -> s.replaceAll("\\$\\{intent\\}", "Asynchronous executed commands") + "* @generated by "
                 + getClass().getName() + "\r\n ";
     }
@@ -94,7 +94,7 @@ protected Function<String, String> commentMutator() {
      *
      * @return
      */
-    protected Function<MethodDeclaration, Type> methodTypeMutator() {
+    Function<MethodDeclaration, Type> methodTypeMutator() {
         return method -> CompilationUnitFactory.createParametrizedType("RedisFuture", method.getType().toString());
     }
 
@@ -103,12 +103,12 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
      *
      * @return
      */
-    protected Supplier<List<String>> importSupplier() {
+    Supplier<List<String>> importSupplier() {
         return () -> Collections.singletonList("io.lettuce.core.RedisFuture");
     }
 
     @Test
-    public void createInterface() throws Exception {
+    void createInterface() throws Exception {
         factory.createInterface();
     }
 }
diff --git a/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
index f1b4f4d0a1..1e2fd23efd 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
@@ -39,7 +39,7 @@
  * @author Mark Paluch
  */
 @RunWith(Parameterized.class)
-public class CreateAsyncNodeSelectionClusterApi {
+class CreateAsyncNodeSelectionClusterApi {
 
     private Set<String> FILTER_METHODS = LettuceSets.unmodifiableSet("shutdown", "debugOom", "debugSegfault", "digest", "close",
             "isOpen", "BaseRedisCommands.reset", "readOnly", "readWrite", "setAutoFlushCommands", "flushCommands");
@@ -47,7 +47,7 @@ public class CreateAsyncNodeSelectionClusterApi {
     private CompilationUnitFactory factory;
 
     @Parameterized.Parameters(name = "Create {0}")
-    public static List<Object[]> arguments() {
+    static List<Object[]> arguments() {
         List<Object[]> result = new ArrayList<>();
 
         for (String templateName : Constants.TEMPLATE_NAMES) {
@@ -79,7 +79,7 @@ public CreateAsyncNodeSelectionClusterApi(String templateName) {
      *
      * @return
      */
-    protected Function<String, String> commentMutator() {
+    Function<String, String> commentMutator() {
         return s -> s.replaceAll("\\$\\{intent\\}", "Asynchronous executed commands on a node selection") + "* @generated by "
                 + getClass().getName() + "\r\n ";
     }
@@ -89,7 +89,7 @@ protected Function<String, String> commentMutator() {
      *
      * @return
      */
-    protected Predicate<MethodDeclaration> methodFilter() {
+    Predicate<MethodDeclaration> methodFilter() {
         return method -> !CompilationUnitFactory.contains(FILTER_METHODS, method);
     }
 
@@ -98,7 +98,7 @@ protected Predicate<MethodDeclaration> methodFilter() {
      *
      * @return
      */
-    protected Function<MethodDeclaration, Type> methodTypeMutator() {
+    Function<MethodDeclaration, Type> methodTypeMutator() {
         return method -> {
             return CompilationUnitFactory.createParametrizedType("AsyncExecutions", method.getType().toString());
         };
@@ -109,12 +109,12 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
      *
      * @return
      */
-    protected Supplier<List<String>> importSupplier() {
+    Supplier<List<String>> importSupplier() {
         return () -> Collections.singletonList("io.lettuce.core.RedisFuture");
     }
 
     @Test
-    public void createInterface() throws Exception {
+    void createInterface() throws Exception {
         factory.createInterface();
     }
 }
diff --git a/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
index 68e701a12c..42eaa65229 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
@@ -37,7 +37,7 @@
  * @author Mark Paluch
  */
 @RunWith(Parameterized.class)
-public class CreateReactiveApi {
+class CreateReactiveApi {
 
     private static Set<String> KEEP_METHOD_RESULT_TYPE = LettuceSets.unmodifiableSet("digest", "close", "isOpen",
             "BaseRedisCommands.reset", "getStatefulConnection", "setAutoFlushCommands", "flushCommands");
@@ -60,7 +60,7 @@ public class CreateReactiveApi {
     private CompilationUnitFactory factory;
 
     @Parameterized.Parameters(name = "Create {0}")
-    public static List<Object[]> arguments() {
+    static List<Object[]> arguments() {
         List<Object[]> result = new ArrayList<>();
 
         for (String templateName : Constants.TEMPLATE_NAMES) {
@@ -96,12 +96,12 @@ public CreateReactiveApi(String templateName) {
      *
      * @return
      */
-    protected Function<String, String> commentMutator() {
+    Function<String, String> commentMutator() {
         return s -> s.replaceAll("\\$\\{intent\\}", "Reactive executed commands").replaceAll("@since 3.0", "@since 4.0")
                 + "* @generated by " + getClass().getName() + "\r\n ";
     }
 
-    protected Function<Comment, Comment> methodCommentMutator() {
+    Function<Comment, Comment> methodCommentMutator() {
         return comment -> {
             if (comment != null && comment.getContent() != null) {
                 comment.setContent(
@@ -116,7 +116,7 @@ protected Function<Comment, Comment> methodCommentMutator() {
      *
      * @return
      */
-    protected Function<MethodDeclaration, Type> methodTypeMutator() {
+    Function<MethodDeclaration, Type> methodTypeMutator() {
         return method -> {
 
             ClassOrInterfaceDeclaration declaringClass = (ClassOrInterfaceDeclaration) method.getParentNode().get();
@@ -170,12 +170,12 @@ private String getResultType(MethodDeclaration method,
      *
      * @return
      */
-    protected Supplier<List<String>> importSupplier() {
+    Supplier<List<String>> importSupplier() {
         return () -> Arrays.asList("reactor.core.publisher.Flux", "reactor.core.publisher.Mono");
     }
 
     @Test
-    public void createInterface() throws Exception {
+    void createInterface() throws Exception {
         factory.createInterface();
     }
 }
diff --git a/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
index a17ed73075..9a0f738780 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
@@ -39,14 +39,14 @@
  * @author Mark Paluch
  */
 @RunWith(Parameterized.class)
-public class CreateSyncApi {
+class CreateSyncApi {
 
     private Set<String> FILTER_METHODS = LettuceSets.unmodifiableSet("setAutoFlushCommands", "flushCommands");
 
     private CompilationUnitFactory factory;
 
     @Parameterized.Parameters(name = "Create {0}")
-    public static List<Object[]> arguments() {
+    static List<Object[]> arguments() {
         List<Object[]> result = new ArrayList<>();
 
         for (String templateName : Constants.TEMPLATE_NAMES) {
@@ -81,7 +81,7 @@ public CreateSyncApi(String templateName) {
      *
      * @return
      */
-    protected Function<String, String> commentMutator() {
+    Function<String, String> commentMutator() {
         return s -> s.replaceAll("\\$\\{intent\\}", "Synchronous executed commands") + "* @generated by "
                 + getClass().getName() + "\r\n ";
     }
@@ -91,7 +91,7 @@ protected Function<String, String> commentMutator() {
      *
      * @return
      */
-    protected Predicate<MethodDeclaration> methodFilter() {
+    Predicate<MethodDeclaration> methodFilter() {
         return method -> !CompilationUnitFactory.contains(FILTER_METHODS, method);
     }
 
@@ -100,7 +100,7 @@ protected Predicate<MethodDeclaration> methodFilter() {
      *
      * @return
      */
-    protected Function<MethodDeclaration, Type> methodTypeMutator() {
+    Function<MethodDeclaration, Type> methodTypeMutator() {
         return MethodDeclaration::getType;
     }
 
@@ -109,12 +109,12 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
      *
      * @return
      */
-    protected Supplier<List<String>> importSupplier() {
+    Supplier<List<String>> importSupplier() {
         return Collections::emptyList;
     }
 
     @Test
-    public void createInterface() throws Exception {
+    void createInterface() throws Exception {
         factory.createInterface();
     }
 }
diff --git a/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
index 59e05ed1fc..cfa31c6f08 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
@@ -40,7 +40,7 @@
  * @author Mark Paluch
  */
 @RunWith(Parameterized.class)
-public class CreateSyncNodeSelectionClusterApi {
+class CreateSyncNodeSelectionClusterApi {
 
     private Set<String> FILTER_METHODS = LettuceSets.unmodifiableSet("shutdown", "debugOom", "debugSegfault", "digest",
             "close", "isOpen", "BaseRedisCommands.reset", "readOnly", "readWrite", "dispatch", "setAutoFlushCommands", "flushCommands");
@@ -48,7 +48,7 @@ public class CreateSyncNodeSelectionClusterApi {
     private CompilationUnitFactory factory;
 
     @Parameterized.Parameters(name = "Create {0}")
-    public static List<Object[]> arguments() {
+    static List<Object[]> arguments() {
         List<Object[]> result = new ArrayList<>();
 
         for (String templateName : Constants.TEMPLATE_NAMES) {
@@ -81,7 +81,7 @@ public CreateSyncNodeSelectionClusterApi(String templateName) {
      *
      * @return
      */
-    protected Function<String, String> commentMutator() {
+    Function<String, String> commentMutator() {
         return s -> s.replaceAll("\\$\\{intent\\}", "Synchronous executed commands on a node selection") + "* @generated by "
                 + getClass().getName() + "\r\n ";
     }
@@ -91,7 +91,7 @@ protected Function<String, String> commentMutator() {
      *
      * @return
      */
-    protected Predicate<MethodDeclaration> methodFilter() {
+    Predicate<MethodDeclaration> methodFilter() {
 
         return method -> {
 
@@ -110,7 +110,7 @@ protected Predicate<MethodDeclaration> methodFilter() {
      *
      * @return
      */
-    protected Function<MethodDeclaration, Type> methodTypeMutator() {
+    Function<MethodDeclaration, Type> methodTypeMutator() {
 
         return method -> {
             return CompilationUnitFactory.createParametrizedType("Executions", method.getType().toString());
@@ -122,12 +122,12 @@ protected Function<MethodDeclaration, Type> methodTypeMutator() {
      *
      * @return
      */
-    protected Supplier<List<String>> importSupplier() {
+    Supplier<List<String>> importSupplier() {
         return Collections::emptyList;
     }
 
     @Test
-    public void createInterface() throws Exception {
+    void createInterface() throws Exception {
         factory.createInterface();
     }
 }
diff --git a/src/test/java/io/lettuce/codec/CRC16Test.java b/src/test/java/io/lettuce/codec/CRC16Test.java
deleted file mode 100644
index 6f2d5067bb..0000000000
--- a/src/test/java/io/lettuce/codec/CRC16Test.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.codec;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import io.lettuce.core.codec.CRC16;
-
-@RunWith(Parameterized.class)
-public class CRC16Test {
-
-    private byte[] bytes;
-    private int expected;
-
-    public CRC16Test(byte[] bytes, int expected, String hex) {
-        this.bytes = bytes;
-        this.expected = expected;
-    }
-
-    @Parameterized.Parameters(name = "{2}")
-    public static List<Object[]> parameters() {
-
-        List<Object[]> parameters = new ArrayList<>();
-
-        params(parameters, "".getBytes(), 0x0);
-        params(parameters, "123456789".getBytes(), 0x31C3);
-        params(parameters, "sfger132515".getBytes(), 0xA45C);
-        params(parameters, "hae9Napahngaikeethievubaibogiech".getBytes(), 0x58CE);
-        params(parameters, "AAAAAAAAAAAAAAAAAAAAAA".getBytes(), 0x92cd);
-        params(parameters, "Hello, World!".getBytes(), 0x4FD6);
-
-        return parameters;
-    }
-
-    private static void params(List<Object[]> parameters, byte[] bytes, int expectation) {
-        parameters.add(new Object[] { bytes, expectation, "0x" + Integer.toHexString(expectation).toUpperCase() });
-    }
-
-    @Test
-    public void testCRC16() throws Exception {
-
-        int result = CRC16.crc16(bytes);
-        assertThat(result).describedAs("Expects " + Integer.toHexString(expected)).isEqualTo(expected);
-
-    }
-}
diff --git a/src/test/java/io/lettuce/codec/CRC16UnitTests.java b/src/test/java/io/lettuce/codec/CRC16UnitTests.java
new file mode 100644
index 0000000000..ab2c8c5b11
--- /dev/null
+++ b/src/test/java/io/lettuce/codec/CRC16UnitTests.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.codec;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import io.lettuce.core.codec.CRC16;
+
+/**
+ * @author Mark Paluch
+ */
+class CRC16UnitTests {
+
+    static List<Fixture> parameters() {
+
+        List<Fixture> parameters = new ArrayList<>();
+
+        parameters.add(new Fixture("".getBytes(), 0x0));
+        parameters.add(new Fixture("123456789".getBytes(), 0x31C3));
+        parameters.add(new Fixture("sfger132515".getBytes(), 0xA45C));
+        parameters.add(new Fixture("hae9Napahngaikeethievubaibogiech".getBytes(), 0x58CE));
+        parameters.add(new Fixture("AAAAAAAAAAAAAAAAAAAAAA".getBytes(), 0x92cd));
+        parameters.add(new Fixture("Hello, World!".getBytes(), 0x4FD6));
+
+        return parameters;
+    }
+
+    @ParameterizedTest
+    @MethodSource("parameters")
+    void testCRC16(Fixture fixture) {
+
+        int result = CRC16.crc16(fixture.bytes);
+        assertThat(result).describedAs("Expects " + Integer.toHexString(fixture.expected)).isEqualTo(fixture.expected);
+    }
+
+    static class Fixture {
+
+        final byte[] bytes;
+        final int expected;
+
+        Fixture(byte[] bytes, int expected) {
+            this.bytes = bytes;
+            this.expected = expected;
+        }
+
+        @Override
+        public String toString() {
+            return "Expects 0x" + Integer.toHexString(expected).toUpperCase();
+        }
+    }
+}
diff --git a/src/test/java/io/lettuce/core/AbstractRedisClientTest.java b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
index f658ab8645..491c9b8c82 100644
--- a/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
+++ b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
@@ -15,29 +15,31 @@
  */
 package io.lettuce.core;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 
-import io.lettuce.TestClientResources;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.resource.DefaultRedisClient;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-public abstract class AbstractRedisClientTest extends AbstractTest {
+public abstract class AbstractRedisClientTest extends TestSupport {
 
     protected static RedisClient client;
     protected RedisCommands<String, String> redis;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupClient() {
         client = DefaultRedisClient.get();
         client.setOptions(ClientOptions.create());
     }
 
-    protected static RedisClient newRedisClient() {
+    private static RedisClient newRedisClient() {
         return RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port).build());
     }
 
@@ -46,7 +48,7 @@ protected RedisCommands<String, String> connect() {
         return connect;
     }
 
-    @Before
+    @BeforeEach
     public void openConnection() throws Exception {
         client.setOptions(ClientOptions.builder().build());
         redis = connect();
@@ -70,7 +72,7 @@ public void openConnection() throws Exception {
         } while (scriptRunning);
     }
 
-    @After
+    @AfterEach
     public void closeConnection() throws Exception {
         if (redis != null) {
             redis.getStatefulConnection().close();
@@ -80,7 +82,7 @@ public void closeConnection() throws Exception {
     public abstract class WithPasswordRequired {
         protected abstract void run(RedisClient client) throws Exception;
 
-        public WithPasswordRequired() {
+        protected WithPasswordRequired() {
             try {
                 redis.configSet("requirepass", passwd);
                 redis.auth(passwd);
diff --git a/src/test/java/io/lettuce/core/AsyncConnectionTest.java b/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java
similarity index 56%
rename from src/test/java/io/lettuce/core/AsyncConnectionTest.java
rename to src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java
index da9e5f7bcb..dd75e985d0 100644
--- a/src/test/java/io/lettuce/core/AsyncConnectionTest.java
+++ b/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java
@@ -22,82 +22,82 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import javax.inject.Inject;
 
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.test.Futures;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class AsyncConnectionTest extends AbstractRedisClientTest {
-    private RedisAsyncCommands<String, String> async;
-
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-
-    @Before
-    public void openAsyncConnection() throws Exception {
-        async = client.connect().async();
-    }
-
-    @After
-    public void closeAsyncConnection() throws Exception {
-        async.getStatefulConnection().close();
+@ExtendWith(LettuceExtension.class)
+class AsyncConnectionIntegrationTests extends TestSupport {
+
+    private final RedisClient client;
+    private final StatefulRedisConnection<String, String> connection;
+    private final RedisAsyncCommands<String, String> async;
+
+    @Inject
+    AsyncConnectionIntegrationTests(RedisClient client, StatefulRedisConnection<String, String> connection) {
+        this.client = client;
+        this.connection = connection;
+        this.async = connection.async();
+        this.connection.sync().flushall();
     }
 
-    @Test(timeout = 10000)
-    public void multi() throws Exception {
-        assertThat(async.multi().get()).isEqualTo("OK");
+    @Test
+    void multi() {
+        assertThat(Futures.get(async.multi())).isEqualTo("OK");
         Future<String> set = async.set(key, value);
         Future<Long> rpush = async.rpush("list", "1", "2");
         Future<List<String>> lrange = async.lrange("list", 0, -1);
 
         assertThat(!set.isDone() && !rpush.isDone() && !rpush.isDone()).isTrue();
-        assertThat(async.exec().get()).contains("OK", 2L, list("1", "2"));
+        assertThat(Futures.get(async.exec())).contains("OK", 2L, list("1", "2"));
 
-        assertThat(set.get()).isEqualTo("OK");
-        assertThat((long) rpush.get()).isEqualTo(2L);
-        assertThat(lrange.get()).isEqualTo(list("1", "2"));
+        assertThat(Futures.get(set)).isEqualTo("OK");
+        assertThat(Futures.get(rpush)).isEqualTo(2L);
+        assertThat(Futures.get(lrange)).isEqualTo(list("1", "2"));
     }
 
-    @Test(timeout = 10000)
-    public void watch() throws Exception {
-        assertThat(async.watch(key).get()).isEqualTo("OK");
+    @Test
+    void watch() {
+        assertThat(Futures.get(async.watch(key))).isEqualTo("OK");
 
-        redis.set(key, value + "X");
+        async.set(key, value + "X");
 
         async.multi();
         Future<String> set = async.set(key, value);
         Future<Long> append = async.append(key, "foo");
-        assertThat(async.exec().get()).isEmpty();
-        assertThat(set.get()).isNull();
-        assertThat(append.get()).isNull();
+        assertThat(Futures.get(async.exec())).isEmpty();
+        assertThat(Futures.get(set)).isNull();
+        assertThat(Futures.get(append)).isNull();
     }
 
-    @Test(timeout = 10000)
-    public void futureListener() throws Exception {
+    @Test
+    void futureListener() throws Exception {
 
         final List<Object> run = new ArrayList<>();
 
-        Runnable listener = new Runnable() {
-            @Override
-            public void run() {
-                run.add(new Object());
-            }
-        };
+        Runnable listener = () -> run.add(new Object());
+
+        List<RedisFuture<?>> futures = new ArrayList<>();
 
         for (int i = 0; i < 1000; i++) {
-            redis.lpush(key, "" + i);
+            futures.add(async.lpush(key, "" + i));
         }
 
+        Futures.awaitAll(futures);
+
         RedisAsyncCommands<String, String> connection = client.connect().async();
 
-        Long len = connection.llen(key).get();
+        Long len = Futures.get(connection.llen(key));
         assertThat(len.intValue()).isEqualTo(1000);
 
         RedisFuture<List<String>> sort = connection.sort(key);
@@ -105,17 +105,16 @@ public void run() {
 
         sort.thenRun(listener);
 
-        sort.get();
+        Futures.await(sort);
         Thread.sleep(100);
 
         assertThat(run).hasSize(1);
 
         connection.getStatefulConnection().close();
-
     }
 
-    @Test(timeout = 1000)
-    public void futureListenerCompleted() throws Exception {
+    @Test
+    void futureListenerCompleted() {
 
         final List<Object> run = new ArrayList<>();
 
@@ -129,7 +128,7 @@ public void run() {
         RedisAsyncCommands<String, String> connection = client.connect().async();
 
         RedisFuture<String> set = connection.set(key, value);
-        set.get();
+        Futures.await(set);
 
         set.thenRun(listener);
 
@@ -138,16 +137,17 @@ public void run() {
         connection.getStatefulConnection().close();
     }
 
-    @Test(timeout = 500)
-    public void discardCompletesFutures() throws Exception {
+    @Test
+    void discardCompletesFutures() {
         async.multi();
         Future<String> set = async.set(key, value);
         async.discard();
-        assertThat(set.get()).isNull();
+        assertThat(Futures.get(set)).isNull();
     }
 
-    @Test(timeout = 10000)
-    public void awaitAll() throws Exception {
+    @Test
+    void awaitAll() {
+
         Future<String> get1 = async.get(key);
         Future<String> set = async.set(key, value);
         Future<String> get2 = async.get(key);
@@ -155,16 +155,15 @@ public void awaitAll() throws Exception {
 
         assertThat(LettuceFutures.awaitAll(1, TimeUnit.SECONDS, get1, set, get2, append)).isTrue();
 
-        assertThat(get1.get()).isNull();
-        assertThat(set.get()).isEqualTo("OK");
-        assertThat(get2.get()).isEqualTo(value);
-        assertThat((long) append.get()).isEqualTo(value.length() * 2);
+        assertThat(Futures.get(get1)).isNull();
+        assertThat(Futures.get(set)).isEqualTo("OK");
+        assertThat(Futures.get(get2)).isEqualTo(value);
+        assertThat(Futures.get(append).longValue()).isEqualTo(value.length() * 2);
     }
 
-    @Test(timeout = 500)
-    public void awaitAllTimeout() throws Exception {
+    @Test
+    void awaitAllTimeout() {
         Future<KeyValue<String, String>> blpop = async.blpop(1, key);
         assertThat(LettuceFutures.awaitAll(1, TimeUnit.NANOSECONDS, blpop)).isFalse();
     }
-
 }
diff --git a/src/test/java/io/lettuce/core/ClientTest.java b/src/test/java/io/lettuce/core/ClientIntegrationTests.java
similarity index 63%
rename from src/test/java/io/lettuce/core/ClientTest.java
rename to src/test/java/io/lettuce/core/ClientIntegrationTests.java
index 84cb8b6758..0a11e73055 100644
--- a/src/test/java/io/lettuce/core/ClientTest.java
+++ b/src/test/java/io/lettuce/core/ClientIntegrationTests.java
@@ -16,73 +16,81 @@
 package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.FixMethodOrder;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runners.MethodSorters;
+import javax.enterprise.inject.New;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.Wait;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.Wait;
+import io.lettuce.test.resource.FastShutdown;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class ClientTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+class ClientIntegrationTests extends TestSupport {
 
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
+    private final RedisClient client;
+    private final RedisCommands<String, String> redis;
 
-    @Override
-    public void openConnection() throws Exception {
-        super.openConnection();
+    @Inject
+    ClientIntegrationTests(RedisClient client, StatefulRedisConnection<String, String> connection) {
+        this.client = client;
+        this.redis = connection.sync();
+        this.redis.flushall();
     }
 
-    @Override
-    public void closeConnection() throws Exception {
-        super.closeConnection();
-    }
+    @Test
+    @Inject
+    void close(@New StatefulRedisConnection<String, String> connection) {
 
-    @Test(expected = RedisException.class)
-    public void close() throws Exception {
-        redis.getStatefulConnection().close();
-        redis.get(key);
+        connection.close();
+        assertThatThrownBy(() -> connection.sync().get(key)).isInstanceOf(RedisException.class);
     }
 
     @Test
-    public void statefulConnectionFromSync() throws Exception {
+    void statefulConnectionFromSync() {
         assertThat(redis.getStatefulConnection().sync()).isSameAs(redis);
     }
 
     @Test
-    public void statefulConnectionFromAsync() throws Exception {
+    void statefulConnectionFromAsync() {
         RedisAsyncCommands<String, String> async = client.connect().async();
         assertThat(async.getStatefulConnection().async()).isSameAs(async);
         async.getStatefulConnection().close();
     }
 
     @Test
-    public void statefulConnectionFromReactive() throws Exception {
+    void statefulConnectionFromReactive() {
         RedisAsyncCommands<String, String> async = client.connect().async();
         assertThat(async.getStatefulConnection().reactive().getStatefulConnection()).isSameAs(async.getStatefulConnection());
         async.getStatefulConnection().close();
     }
 
-    @Test(expected = RedisException.class)
-    public void timeout() throws Exception {
+    @Test
+    void timeout() {
+
         redis.setTimeout(0, TimeUnit.MICROSECONDS);
-        redis.eval(" os.execute(\"sleep \" .. tonumber(1))", ScriptOutputType.STATUS);
+        assertThatThrownBy(() -> redis.eval(" os.execute(\"sleep \" .. tonumber(1))", ScriptOutputType.STATUS)).isInstanceOf(
+                RedisCommandTimeoutException.class);
+
+        redis.setTimeout(Duration.ofSeconds(60));
     }
 
     @Test
-    public void reconnect() throws Exception {
+    void reconnect() throws InterruptedException {
 
         redis.set(key, value);
 
@@ -97,34 +105,43 @@ public void reconnect() throws Exception {
         assertThat(redis.get(key)).isEqualTo(value);
     }
 
-    @Test(expected = RedisCommandInterruptedException.class, timeout = 50)
-    public void interrupt() throws Exception {
+    @Test
+    void interrupt() {
+
+        StatefulRedisConnection<String, String> connection = client.connect();
         Thread.currentThread().interrupt();
-        redis.blpop(0, key);
+        assertThatThrownBy(() -> connection.sync().blpop(0, key)).isInstanceOf(RedisCommandInterruptedException.class);
+        Thread.interrupted();
+
+        connection.closeAsync();
     }
 
     @Test
-    public void connectFailure() throws Exception {
-        RedisClient client = RedisClient.create(TestClientResources.get(), "redis://invalid");
-        exception.expect(RedisException.class);
-        exception.expectMessage("Unable to connect");
-        client.connect();
+    @Inject
+    void connectFailure(ClientResources clientResources) {
+
+        RedisClient client = RedisClient.create(clientResources, "redis://invalid");
+
+        assertThatThrownBy(client::connect).isInstanceOf(RedisConnectionException.class).hasMessageContaining(
+                "Unable to connect");
+
         FastShutdown.shutdown(client);
     }
 
     @Test
-    public void connectPubSubFailure() throws Exception {
-        RedisClient client = RedisClient.create(TestClientResources.get(), "redis://invalid");
-        exception.expect(RedisException.class);
-        exception.expectMessage("Unable to connect");
-        client.connectPubSub();
+    @Inject
+    void connectPubSubFailure(ClientResources clientResources) {
+
+        RedisClient client = RedisClient.create(clientResources, "redis://invalid");
+
+        assertThatThrownBy(client::connectPubSub).isInstanceOf(RedisConnectionException.class).hasMessageContaining(
+                "Unable to connect");
         FastShutdown.shutdown(client);
     }
 
     @Test
-    public void emptyClient() throws Exception {
+    void emptyClient() {
 
-        RedisClient client = DefaultRedisClient.get();
         try {
             client.connect();
         } catch (IllegalStateException e) {
@@ -145,13 +162,13 @@ public void emptyClient() throws Exception {
     }
 
     @Test
-    public void testExceptionWithCause() throws Exception {
+    void testExceptionWithCause() {
         RedisException e = new RedisException(new RuntimeException());
         assertThat(e).hasCauseExactlyInstanceOf(RuntimeException.class);
     }
 
-    @Test(timeout = 20000)
-    public void reset() throws Exception {
+    @Test
+    void reset() throws Exception {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisAsyncCommands<String, String> async = connection.async();
@@ -179,7 +196,7 @@ public void reset() throws Exception {
     }
 
     @Test
-    public void standaloneConnectionShouldSetClientName() throws Exception {
+    void standaloneConnectionShouldSetClientName() throws Exception {
 
         RedisURI redisURI = RedisURI.create(host, port);
         redisURI.setClientName("my-client");
@@ -198,7 +215,7 @@ public void standaloneConnectionShouldSetClientName() throws Exception {
     }
 
     @Test
-    public void pubSubConnectionShouldSetClientName() throws Exception {
+    void pubSubConnectionShouldSetClientName() throws Exception {
 
         RedisURI redisURI = RedisURI.create(host, port);
         redisURI.setClientName("my-client");
diff --git a/src/test/java/io/lettuce/core/ClientMetricsTest.java b/src/test/java/io/lettuce/core/ClientMetricsIntegrationTests.java
similarity index 72%
rename from src/test/java/io/lettuce/core/ClientMetricsTest.java
rename to src/test/java/io/lettuce/core/ClientMetricsIntegrationTests.java
index f8b92aa700..4d25ba238d 100644
--- a/src/test/java/io/lettuce/core/ClientMetricsTest.java
+++ b/src/test/java/io/lettuce/core/ClientMetricsIntegrationTests.java
@@ -15,50 +15,35 @@
  */
 package io.lettuce.core;
 
-import static io.lettuce.core.AbstractRedisClientTest.client;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Collection;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import reactor.core.Disposable;
-import io.lettuce.TestClientResources;
-import io.lettuce.Wait;
+import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.event.EventBus;
 import io.lettuce.core.event.metrics.CommandLatencyEvent;
 import io.lettuce.core.event.metrics.MetricEventPublisher;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.Wait;
 
 /**
  * @author Mark Paluch
  */
-public class ClientMetricsTest extends AbstractTest {
-
-    private RedisCommands<String, String> redis;
-
-    @BeforeClass
-    public static void setupClient() {
-        client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port).build());
-    }
-
-    @Before
-    public void before() throws Exception {
-        redis = client.connect().sync();
-    }
-
-    @AfterClass
-    public static void afterClass() {
-        FastShutdown.shutdown(client);
-    }
+@ExtendWith(LettuceExtension.class)
+class ClientMetricsIntegrationTests extends TestSupport {
 
     @Test
-    public void testMetricsEvent() throws Exception {
+    @Inject
+    void testMetricsEvent(RedisClient client, StatefulRedisConnection<String, String> connection) {
 
         Collection<CommandLatencyEvent> events = new LinkedBlockingQueue<>();
         EventBus eventBus = client.getResources().eventBus();
@@ -69,7 +54,7 @@ public void testMetricsEvent() throws Exception {
         Disposable disposable = eventBus.get().filter(redisEvent -> redisEvent instanceof CommandLatencyEvent)
                 .cast(CommandLatencyEvent.class).doOnNext(events::add).subscribe();
 
-        generateTestData();
+        generateTestData(connection.sync());
         publisher.emitMetricsEvent();
 
         Wait.untilTrue(() -> !events.isEmpty()).waitOrTimeout();
@@ -79,7 +64,7 @@ public void testMetricsEvent() throws Exception {
         disposable.dispose();
     }
 
-    private void generateTestData() {
+    private void generateTestData(RedisCommands<String, String> redis) {
         redis.set(key, value);
         redis.set(key, value);
         redis.set(key, value);
diff --git a/src/test/java/io/lettuce/core/ClientOptionsTest.java b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
similarity index 54%
rename from src/test/java/io/lettuce/core/ClientOptionsTest.java
rename to src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
index 73097cb273..a61e0b56d7 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsTest.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
@@ -15,9 +15,9 @@
  */
 package io.lettuce.core;
 
-import static io.lettuce.ConnectionTestUtil.getChannel;
-import static io.lettuce.ConnectionTestUtil.getConnectionWatchdog;
-import static io.lettuce.ConnectionTestUtil.getStack;
+import static io.lettuce.test.ConnectionTestUtil.getChannel;
+import static io.lettuce.test.ConnectionTestUtil.getConnectionWatchdog;
+import static io.lettuce.test.ConnectionTestUtil.getStack;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.fail;
@@ -30,49 +30,41 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
-import io.lettuce.Wait;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
+import io.lettuce.test.Futures;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.Wait;
+import io.lettuce.test.WithPassword;
+import io.lettuce.test.settings.TestSettings;
 import io.netty.channel.Channel;
 
 /**
  * @author Mark Paluch
  */
-public class ClientOptionsTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+class ClientOptionsIntegrationTests extends TestSupport {
 
-    @Test
-    public void testNew() {
-        checkAssertions(ClientOptions.create());
-    }
+    private final RedisClient client;
 
-    @Test
-    public void testBuilder() {
-        checkAssertions(ClientOptions.builder().build());
+    @Inject
+    ClientOptionsIntegrationTests(RedisClient client) {
+        this.client = client;
     }
 
     @Test
-    public void testCopy() {
-        checkAssertions(ClientOptions.copyOf(ClientOptions.builder().build()));
-    }
-
-    protected void checkAssertions(ClientOptions sut) {
-        assertThat(sut.isAutoReconnect()).isEqualTo(true);
-        assertThat(sut.isCancelCommandsOnReconnectFailure()).isEqualTo(false);
-        assertThat(sut.isPingBeforeActivateConnection()).isEqualTo(false);
-        assertThat(sut.isSuspendReconnectOnProtocolFailure()).isEqualTo(false);
-        assertThat(sut.getDisconnectedBehavior()).isEqualTo(ClientOptions.DisconnectedBehavior.DEFAULT);
-    }
-
-    @Test
-    public void variousClientOptions() {
+    void variousClientOptions() {
 
         StatefulRedisConnection<String, String> connection1 = client.connect();
 
@@ -91,7 +83,7 @@ public void variousClientOptions() {
     }
 
     @Test
-    public void requestQueueSize() {
+    void requestQueueSize() {
 
         client.setOptions(ClientOptions.builder().requestQueueSize(10).build());
 
@@ -117,7 +109,7 @@ public void requestQueueSize() {
     }
 
     @Test
-    public void requestQueueSizeAppliedForReconnect() {
+    void requestQueueSizeAppliedForReconnect() {
 
         client.setOptions(ClientOptions.builder().requestQueueSize(10).build());
 
@@ -126,58 +118,45 @@ public void requestQueueSizeAppliedForReconnect() {
     }
 
     @Test
-    public void testHitRequestQueueLimitReconnectWithAuthCommand() {
-
-        new WithPasswordRequired() {
+    void testHitRequestQueueLimitReconnectWithAuthCommand() {
 
-            @Override
-            protected void run(RedisClient client) {
+        WithPassword.run(client, () -> {
 
-                client.setOptions(ClientOptions.builder().requestQueueSize(10).build());
+            client.setOptions(ClientOptions.builder().requestQueueSize(10).build());
 
-                RedisAsyncCommands<String, String> connection = client.connect().async();
-                connection.auth(passwd);
-                testHitRequestQueueLimit(connection);
-            }
-        };
+            RedisAsyncCommands<String, String> connection = client.connect().async();
+            connection.auth(passwd);
+            testHitRequestQueueLimit(connection);
+        });
     }
 
     @Test
-    public void testHitRequestQueueLimitReconnectWithUriAuth() {
-
-        new WithPasswordRequired() {
-
-            @Override
-            protected void run(RedisClient client) {
+    void testHitRequestQueueLimitReconnectWithUriAuth() {
 
-                client.setOptions(ClientOptions.builder().requestQueueSize(10).build());
+        WithPassword.run(client, () -> {
+            client.setOptions(ClientOptions.builder().requestQueueSize(10).build());
 
-                RedisURI redisURI = RedisURI.create(host, port);
-                redisURI.setPassword(passwd);
+            RedisURI redisURI = RedisURI.create(host, port);
+            redisURI.setPassword(passwd);
 
-                RedisAsyncCommands<String, String> connection = client.connect(redisURI).async();
-                testHitRequestQueueLimit(connection);
-            }
-        };
+            RedisAsyncCommands<String, String> connection = client.connect(redisURI).async();
+            testHitRequestQueueLimit(connection);
+        });
     }
 
     @Test
-    public void testHitRequestQueueLimitReconnectWithUriAuthPingCommand() {
-
-        new WithPasswordRequired() {
+    void testHitRequestQueueLimitReconnectWithUriAuthPingCommand() {
 
-            @Override
-            protected void run(RedisClient client) {
+        WithPassword.run(client, () -> {
 
-                client.setOptions(ClientOptions.builder().requestQueueSize(10).pingBeforeActivateConnection(true).build());
+            client.setOptions(ClientOptions.builder().requestQueueSize(10).pingBeforeActivateConnection(true).build());
 
-                RedisURI redisURI = RedisURI.create(host, port);
-                redisURI.setPassword(passwd);
+            RedisURI redisURI = RedisURI.create(host, port);
+            redisURI.setPassword(passwd);
 
-                RedisAsyncCommands<String, String> connection = client.connect(redisURI).async();
-                testHitRequestQueueLimit(connection);
-            }
-        };
+            RedisAsyncCommands<String, String> connection = client.connect(redisURI).async();
+            testHitRequestQueueLimit(connection);
+        });
     }
 
     private void testHitRequestQueueLimit(RedisAsyncCommands<String, String> connection) {
@@ -199,14 +178,14 @@ private void testHitRequestQueueLimit(RedisAsyncCommands<String, String> connect
         watchdog.scheduleReconnect();
 
         for (RedisFuture<String> ping : pings) {
-            assertThat(ping.toCompletableFuture().join()).isEqualTo("PONG");
+            assertThat(Futures.get(ping)).isEqualTo("PONG");
         }
 
         connection.getStatefulConnection().close();
     }
 
     @Test
-    public void requestQueueSizeOvercommittedReconnect() throws Exception {
+    void requestQueueSizeOvercommittedReconnect() {
 
         client.setOptions(ClientOptions.builder().requestQueueSize(10).build());
 
@@ -233,17 +212,17 @@ public void requestQueueSizeOvercommittedReconnect() throws Exception {
         watchdog.scheduleReconnect();
 
         for (int i = 0; i < 10; i++) {
-            assertThat(pings.get(i).get()).isEqualTo("PONG");
+            assertThat(Futures.get(pings.get(i))).isEqualTo("PONG");
         }
 
-        assertThatThrownBy(() -> pings.get(10).toCompletableFuture().join()).hasCauseInstanceOf(IllegalStateException.class)
+        assertThatThrownBy(() -> Futures.await(pings.get(10))).hasCauseInstanceOf(IllegalStateException.class)
                 .hasMessage("java.lang.IllegalStateException: Queue full");
 
         connection.close();
     }
 
     @Test
-    public void disconnectedWithoutReconnect() {
+    void disconnectedWithoutReconnect() {
 
         client.setOptions(ClientOptions.builder().autoReconnect(false).build());
 
@@ -261,7 +240,7 @@ public void disconnectedWithoutReconnect() {
     }
 
     @Test
-    public void disconnectedRejectCommands() {
+    void disconnectedRejectCommands() {
 
         client.setOptions(ClientOptions.builder().disconnectedBehavior(ClientOptions.DisconnectedBehavior.REJECT_COMMANDS)
                 .build());
@@ -281,7 +260,7 @@ public void disconnectedRejectCommands() {
     }
 
     @Test
-    public void disconnectedAcceptCommands() {
+    void disconnectedAcceptCommands() {
 
         client.setOptions(ClientOptions.builder().autoReconnect(false)
                 .disconnectedBehavior(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS).build());
@@ -294,10 +273,11 @@ public void disconnectedAcceptCommands() {
         connection.getStatefulConnection().close();
     }
 
-    @Test(timeout = 10000)
-    public void pingBeforeConnect() {
+    @Test
+    @Inject
+    void pingBeforeConnect(StatefulRedisConnection<String, String> sharedConnection) {
 
-        redis.set(key, value);
+        sharedConnection.sync().set(key, value);
         client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
         RedisCommands<String, String> connection = client.connect().sync();
 
@@ -309,8 +289,8 @@ public void pingBeforeConnect() {
         }
     }
 
-    @Test(timeout = 2000)
-    public void pingBeforeConnectTimeout() throws Exception {
+    @Test
+    void pingBeforeConnectTimeout() throws Exception {
 
         client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
 
@@ -330,121 +310,108 @@ public void pingBeforeConnectTimeout() throws Exception {
     }
 
     @Test
-    public void pingBeforeConnectWithAuthentication() {
-
-        new WithPasswordRequired() {
-            @Override
-            protected void run(RedisClient client) {
+    void pingBeforeConnectWithAuthentication() {
 
-                client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
-                RedisURI redisURI = RedisURI.Builder.redis(host, port).withPassword(passwd).build();
+        WithPassword.run(client, () -> {
+            client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+            RedisURI redisURI = RedisURI.Builder.redis(host, port).withPassword(passwd).build();
 
-                RedisCommands<String, String> connection = client.connect(redisURI).sync();
-
-                try {
-                    String result = connection.info();
-                    assertThat(result).contains("memory");
-                } finally {
-                    connection.getStatefulConnection().close();
-                }
+            RedisCommands<String, String> connection = client.connect(redisURI).sync();
 
+            try {
+                String result = connection.info();
+                assertThat(result).contains("memory");
+            } finally {
+                connection.getStatefulConnection().close();
             }
-        };
+        });
     }
 
-    @Test(timeout = 2000)
-    public void pingBeforeConnectWithAuthenticationTimeout() {
+    @Test
+    void pingBeforeConnectWithAuthenticationTimeout() {
 
-        new WithPasswordRequired() {
-            @Override
-            protected void run(RedisClient client) throws Exception {
+        WithPassword.run(
+                client,
+                () -> {
 
-                client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+                    client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
 
-                try (ServerSocket serverSocket = new ServerSocket(0)) {
+                    try (ServerSocket serverSocket = new ServerSocket(0)) {
 
-                    RedisURI redisURI = RedisURI.builder().redis(TestSettings.host(), serverSocket.getLocalPort())
-                            .withPassword(passwd).withTimeout(Duration.ofMillis(500)).build();
+                        RedisURI redisURI = RedisURI.builder().redis(TestSettings.host(), serverSocket.getLocalPort())
+                                .withPassword(passwd).withTimeout(Duration.ofMillis(500)).build();
 
-                    try {
-                        client.connect(redisURI);
-                        fail("Missing RedisConnectionException");
-                    } catch (RedisException e) {
-                        assertThat(e).isInstanceOf(RedisConnectionException.class).hasRootCauseInstanceOf(
-                                RedisCommandTimeoutException.class);
+                        try {
+                            client.connect(redisURI);
+                            fail("Missing RedisConnectionException");
+                        } catch (RedisException e) {
+                            assertThat(e).isInstanceOf(RedisConnectionException.class).hasRootCauseInstanceOf(
+                                    RedisCommandTimeoutException.class);
+                        }
                     }
-                }
-            }
-        };
+                });
     }
 
     @Test
-    public void pingBeforeConnectWithSslAndAuthentication() {
-
-        new WithPasswordRequired() {
-            @Override
-            protected void run(RedisClient client) {
+    void pingBeforeConnectWithSslAndAuthentication() {
 
-                client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
-                RedisURI redisURI = RedisURI.Builder.redis(host, 6443).withPassword(passwd).withVerifyPeer(false).withSsl(true)
-                        .build();
+        WithPassword.run(client, () -> {
 
-                RedisCommands<String, String> connection = client.connect(redisURI).sync();
+            client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+            RedisURI redisURI = RedisURI.Builder.redis(host, 6443).withPassword(passwd).withVerifyPeer(false).withSsl(true)
+                    .build();
 
-                try {
-                    String result = connection.info();
-                    assertThat(result).contains("memory");
-                } finally {
-                    connection.getStatefulConnection().close();
-                }
+            RedisCommands<String, String> connection = client.connect(redisURI).sync();
 
+            try {
+                String result = connection.info();
+                assertThat(result).contains("memory");
+            } finally {
+                connection.getStatefulConnection().close();
             }
-        };
+
+        });
     }
 
     @Test
-    public void pingBeforeConnectWithAuthenticationFails() {
+    void pingBeforeConnectWithAuthenticationFails() {
 
-        new WithPasswordRequired() {
-            @Override
-            protected void run(RedisClient client) {
+        WithPassword.run(client, () -> {
 
-                client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
-                RedisURI redisURI = RedisURI.builder().redis(host, port).build();
+            client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+            RedisURI redisURI = RedisURI.builder().redis(host, port).build();
 
-                try {
-                    client.connect(redisURI);
-                    fail("Missing RedisConnectionException");
-                } catch (RedisException e) {
-                    assertThat(e).isInstanceOf(RedisConnectionException.class);
-                }
+            try {
+                client.connect(redisURI);
+                fail("Missing RedisConnectionException");
+            } catch (RedisException e) {
+                assertThat(e).isInstanceOf(RedisConnectionException.class);
             }
-        };
+        });
     }
 
     @Test
-    public void pingBeforeConnectWithSslAndAuthenticationFails() {
-
-        new WithPasswordRequired() {
-            @Override
-            protected void run(RedisClient client) {
-
-                client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
-                RedisURI redisURI = RedisURI.builder().redis(host, 6443).withVerifyPeer(false).withSsl(true).build();
-
-                try {
-                    client.connect(redisURI);
-                    fail("Missing RedisConnectionException");
-                } catch (RedisException e) {
-                    assertThat(e).isInstanceOf(RedisConnectionException.class).hasRootCauseInstanceOf(
-                            RedisCommandExecutionException.class);
-                }
-            }
-        };
+    void pingBeforeConnectWithSslAndAuthenticationFails() {
+
+        WithPassword.run(
+                client,
+                () -> {
+
+                    client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+                    RedisURI redisURI = RedisURI.builder().redis(host, 6443).withVerifyPeer(false).withSsl(true).build();
+
+                    try {
+                        client.connect(redisURI);
+                        fail("Missing RedisConnectionException");
+                    } catch (RedisException e) {
+                        assertThat(e).isInstanceOf(RedisConnectionException.class).hasRootCauseInstanceOf(
+                                RedisCommandExecutionException.class);
+                    }
+                });
     }
 
     @Test
-    public void appliesCommandTimeoutToAsyncCommands() {
+    void appliesCommandTimeoutToAsyncCommands() {
 
         client.setOptions(ClientOptions.builder().timeoutOptions(TimeoutOptions.enabled()).build());
 
@@ -461,7 +428,7 @@ public void appliesCommandTimeoutToAsyncCommands() {
     }
 
     @Test
-    public void appliesCommandTimeoutToReactiveCommands() {
+    void appliesCommandTimeoutToReactiveCommands() {
 
         client.setOptions(ClientOptions.builder().timeoutOptions(TimeoutOptions.enabled()).build());
 
@@ -477,7 +444,7 @@ public void appliesCommandTimeoutToReactiveCommands() {
     }
 
     @Test
-    public void timeoutExpiresBatchedCommands() {
+    void timeoutExpiresBatchedCommands() {
 
         client.setOptions(ClientOptions.builder()
                 .timeoutOptions(TimeoutOptions.builder().fixedTimeout(Duration.ofMillis(1)).build()).build());
@@ -495,8 +462,8 @@ public void timeoutExpiresBatchedCommands() {
         }
     }
 
-    @Test(timeout = 10000)
-    public void pingBeforeConnectWithQueuedCommandsAndReconnect() throws Exception {
+    @Test
+    void pingBeforeConnectWithQueuedCommandsAndReconnect() throws Exception {
 
         StatefulRedisConnection<String, String> controlConnection = client.connect();
 
@@ -516,8 +483,8 @@ public void pingBeforeConnectWithQueuedCommandsAndReconnect() throws Exception {
         ConnectionWatchdog connectionWatchdog = getConnectionWatchdog(redisConnection);
         connectionWatchdog.setReconnectSuspended(true);
 
-        channel.close().get();
-        sleep.get();
+        Futures.await(channel.close());
+        Futures.await(sleep);
 
         redisConnection.async().get(key).cancel(true);
 
@@ -528,59 +495,56 @@ public void pingBeforeConnectWithQueuedCommandsAndReconnect() throws Exception {
         connectionWatchdog.setReconnectSuspended(false);
         connectionWatchdog.scheduleReconnect();
 
-        assertThat(getFuture1.get()).isEqualTo("value1");
-        assertThat(getFuture2.get()).isEqualTo("value2");
+        assertThat(Futures.get(getFuture1)).isEqualTo("value1");
+        assertThat(Futures.get(getFuture2)).isEqualTo("value2");
 
         controlConnection.close();
         redisConnection.close();
     }
 
-    @Test(timeout = 10000)
-    public void authenticatedPingBeforeConnectWithQueuedCommandsAndReconnect() {
-
-        new WithPasswordRequired() {
-
-            @Override
-            protected void run(RedisClient client) throws Exception {
+    @Test
+    void authenticatedPingBeforeConnectWithQueuedCommandsAndReconnect() {
 
-                RedisURI redisURI = RedisURI.Builder.redis(host, port).withPassword(passwd).withDatabase(5).build();
-                StatefulRedisConnection<String, String> controlConnection = client.connect(redisURI);
+        WithPassword.run(
+                client,
+                () -> {
 
-                client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+                    RedisURI redisURI = RedisURI.Builder.redis(host, port).withPassword(passwd).withDatabase(5).build();
+                    StatefulRedisConnection<String, String> controlConnection = client.connect(redisURI);
 
-                StatefulRedisConnection<String, String> redisConnection = client.connect(redisURI);
-                redisConnection.async().set("key1", "value1");
-                redisConnection.async().set("key2", "value2");
+                    client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
 
-                RedisFuture<String> sleep = (RedisFuture<String>) controlConnection.dispatch(new AsyncCommand<>(new Command<>(
-                        CommandType.DEBUG, new StatusOutput<>(StringCodec.UTF8), new CommandArgs<>(StringCodec.UTF8).add(
-                                "SLEEP").add(2))));
+                    StatefulRedisConnection<String, String> redisConnection = client.connect(redisURI);
+                    redisConnection.async().set("key1", "value1");
+                    redisConnection.async().set("key2", "value2");
 
-                sleep.await(100, TimeUnit.MILLISECONDS);
+                    RedisFuture<String> sleep = (RedisFuture<String>) controlConnection.dispatch(new AsyncCommand<>(
+                            new Command<>(CommandType.DEBUG, new StatusOutput<>(StringCodec.UTF8), new CommandArgs<>(
+                                    StringCodec.UTF8).add("SLEEP").add(2))));
 
-                Channel channel = getChannel(redisConnection);
-                ConnectionWatchdog connectionWatchdog = getConnectionWatchdog(redisConnection);
-                connectionWatchdog.setReconnectSuspended(true);
+                    sleep.await(100, TimeUnit.MILLISECONDS);
 
-                channel.close().get();
-                sleep.get();
+                    Channel channel = getChannel(redisConnection);
+                    ConnectionWatchdog connectionWatchdog = getConnectionWatchdog(redisConnection);
+                    connectionWatchdog.setReconnectSuspended(true);
 
-                redisConnection.async().get(key).cancel(true);
+                    Futures.await(channel.close());
+                    Futures.await(sleep);
 
-                RedisFuture<String> getFuture1 = redisConnection.async().get("key1");
-                RedisFuture<String> getFuture2 = redisConnection.async().get("key2");
-                getFuture1.await(100, TimeUnit.MILLISECONDS);
+                    redisConnection.async().get(key).cancel(true);
 
-                connectionWatchdog.setReconnectSuspended(false);
-                connectionWatchdog.scheduleReconnect();
+                    RedisFuture<String> getFuture1 = redisConnection.async().get("key1");
+                    RedisFuture<String> getFuture2 = redisConnection.async().get("key2");
+                    getFuture1.await(100, TimeUnit.MILLISECONDS);
 
-                assertThat(getFuture1.get()).isEqualTo("value1");
-                assertThat(getFuture2.get()).isEqualTo("value2");
+                    connectionWatchdog.setReconnectSuspended(false);
+                    connectionWatchdog.scheduleReconnect();
 
-                controlConnection.close();
-                redisConnection.close();
-            }
-        };
+                    assertThat(Futures.get(getFuture1)).isEqualTo("value1");
+                    assertThat(Futures.get(getFuture2)).isEqualTo("value2");
 
+                    controlConnection.close();
+                    redisConnection.close();
+                });
     }
 }
diff --git a/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java b/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
new file mode 100644
index 0000000000..e10a50ab83
--- /dev/null
+++ b/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author Mark Paluch
+ */
+class ClientOptionsUnitTests {
+
+    @Test
+    void testNew() {
+        checkAssertions(ClientOptions.create());
+    }
+
+    @Test
+    void testBuilder() {
+        checkAssertions(ClientOptions.builder().build());
+    }
+
+    @Test
+    void testCopy() {
+        checkAssertions(ClientOptions.copyOf(ClientOptions.builder().build()));
+    }
+
+    void checkAssertions(ClientOptions sut) {
+        assertThat(sut.isAutoReconnect()).isEqualTo(true);
+        assertThat(sut.isCancelCommandsOnReconnectFailure()).isEqualTo(false);
+        assertThat(sut.isPingBeforeActivateConnection()).isEqualTo(false);
+        assertThat(sut.isSuspendReconnectOnProtocolFailure()).isEqualTo(false);
+        assertThat(sut.getDisconnectedBehavior()).isEqualTo(ClientOptions.DisconnectedBehavior.DEFAULT);
+    }
+}
diff --git a/src/test/java/io/lettuce/core/AllTheAPIsTest.java b/src/test/java/io/lettuce/core/ConnectMethodsIntegrationTests.java
similarity index 64%
rename from src/test/java/io/lettuce/core/AllTheAPIsTest.java
rename to src/test/java/io/lettuce/core/ConnectMethodsIntegrationTests.java
index 6453a832c5..d9275969d9 100644
--- a/src/test/java/io/lettuce/core/AllTheAPIsTest.java
+++ b/src/test/java/io/lettuce/core/ConnectMethodsIntegrationTests.java
@@ -15,144 +15,138 @@
  */
 package io.lettuce.core;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.TestClientResources;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.async.AsyncNodeSelection;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class AllTheAPIsTest {
-
-    private static RedisClient redisClient = DefaultRedisClient.get();
-    private static RedisClusterClient clusterClient;
-    private static int clusterPort;
+@ExtendWith(LettuceExtension.class)
+class ConnectMethodsIntegrationTests {
 
-    @BeforeClass
-    public static void beforeClass() throws Exception {
-        clusterPort = TestSettings.port(900);
-        clusterClient = RedisClusterClient.create(
-                TestClientResources.get(), RedisURI.Builder.redis(TestSettings.host(), clusterPort).build());
-    }
+    private final RedisClient redisClient;
+    private final RedisClusterClient clusterClient;
 
-    @BeforeClass
-    public static void afterClass() throws Exception {
-        if (clusterClient != null) {
-            FastShutdown.shutdown(clusterClient);
-        }
+    @Inject
+    ConnectMethodsIntegrationTests(RedisClient redisClient, RedisClusterClient clusterClient) {
+        this.redisClient = redisClient;
+        this.clusterClient = clusterClient;
     }
 
     // Standalone
     @Test
-    public void standaloneSync() throws Exception {
+    void standaloneSync() {
         redisClient.connect().close();
     }
 
     @Test
-    public void standaloneAsync() throws Exception {
+    void standaloneAsync() {
         redisClient.connect().async().getStatefulConnection().close();
     }
 
     @Test
-    public void standaloneReactive() throws Exception {
+    void standaloneReactive() {
         redisClient.connect().reactive().getStatefulConnection().close();
     }
 
     @Test
-    public void standaloneStateful() throws Exception {
+    void standaloneStateful() {
         redisClient.connect().close();
     }
 
     // PubSub
     @Test
-    public void pubsubSync() throws Exception {
+    void pubsubSync() {
         redisClient.connectPubSub().close();
     }
 
     @Test
-    public void pubsubAsync() throws Exception {
+    void pubsubAsync() {
         redisClient.connectPubSub().close();
     }
 
     @Test
-    public void pubsubReactive() throws Exception {
+    void pubsubReactive() {
         redisClient.connectPubSub().close();
     }
 
     @Test
-    public void pubsubStateful() throws Exception {
+    void pubsubStateful() {
         redisClient.connectPubSub().close();
     }
 
     // Sentinel
     @Test
-    public void sentinelSync() throws Exception {
+    void sentinelSync() {
         redisClient.connectSentinel().sync().getStatefulConnection().close();
     }
 
     @Test
-    public void sentinelAsync() throws Exception {
+    void sentinelAsync() {
         redisClient.connectSentinel().async().getStatefulConnection().close();
     }
 
     @Test
-    public void sentinelReactive() throws Exception {
+    void sentinelReactive() {
         redisClient.connectSentinel().reactive().getStatefulConnection().close();
     }
 
     @Test
-    public void sentinelStateful() throws Exception {
+    void sentinelStateful() {
         redisClient.connectSentinel().close();
     }
 
     // Cluster
     @Test
-    public void clusterSync() throws Exception {
+    void clusterSync() {
         clusterClient.connect().sync().getStatefulConnection().close();
     }
 
     @Test
-    public void clusterAsync() throws Exception {
+    void clusterAsync() {
         clusterClient.connect().async().getStatefulConnection().close();
     }
 
     @Test
-    public void clusterReactive() throws Exception {
+    void clusterReactive() {
         clusterClient.connect().reactive().getStatefulConnection().close();
     }
 
     @Test
-    public void clusterStateful() throws Exception {
+    void clusterStateful() {
         clusterClient.connect().close();
     }
 
     @Test
-    public void clusterPubSubSync() throws Exception {
+    void clusterPubSubSync() {
         clusterClient.connectPubSub().sync().getStatefulConnection().close();
     }
 
     @Test
-    public void clusterPubSubAsync() throws Exception {
+    void clusterPubSubAsync() {
         clusterClient.connectPubSub().async().getStatefulConnection().close();
     }
 
     @Test
-    public void clusterPubSubReactive() throws Exception {
+    void clusterPubSubReactive() {
         clusterClient.connectPubSub().reactive().getStatefulConnection().close();
     }
 
     @Test
-    public void clusterPubSubStateful() throws Exception {
+    void clusterPubSubStateful() {
         clusterClient.connectPubSub().close();
     }
 
     // Advanced Cluster
     @Test
-    public void advancedClusterSync() throws Exception {
+    void advancedClusterSync() {
         StatefulRedisClusterConnection<String, String> statefulConnection = clusterClient.connect();
         RedisURI uri = clusterClient.getPartitions().getPartition(0).getUri();
         statefulConnection.getConnection(uri.getHost(), uri.getPort()).sync();
@@ -160,7 +154,7 @@ public void advancedClusterSync() throws Exception {
     }
 
     @Test
-    public void advancedClusterAsync() throws Exception {
+    void advancedClusterAsync() {
         StatefulRedisClusterConnection<String, String> statefulConnection = clusterClient.connect();
         RedisURI uri = clusterClient.getPartitions().getPartition(0).getUri();
         statefulConnection.getConnection(uri.getHost(), uri.getPort()).sync();
@@ -168,7 +162,7 @@ public void advancedClusterAsync() throws Exception {
     }
 
     @Test
-    public void advancedClusterReactive() throws Exception {
+    void advancedClusterReactive() {
         StatefulRedisClusterConnection<String, String> statefulConnection = clusterClient.connect();
         RedisURI uri = clusterClient.getPartitions().getPartition(0).getUri();
         statefulConnection.getConnection(uri.getHost(), uri.getPort()).reactive();
@@ -176,13 +170,13 @@ public void advancedClusterReactive() throws Exception {
     }
 
     @Test
-    public void advancedClusterStateful() throws Exception {
+    void advancedClusterStateful() {
         clusterClient.connect().close();
     }
 
     // Cluster node selection
     @Test
-    public void nodeSelectionClusterAsync() throws Exception {
+    void nodeSelectionClusterAsync() {
         StatefulRedisClusterConnection<String, String> statefulConnection = clusterClient.connect();
         AsyncNodeSelection<String, String> masters = statefulConnection.async().masters();
         statefulConnection.close();
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandTest.java b/src/test/java/io/lettuce/core/ConnectionCommandTest.java
index b14a4e9190..e520173573 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandTest.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandTest.java
@@ -16,30 +16,45 @@
 package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.fail;
 
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runners.MethodSorters;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import io.lettuce.Wait;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.Wait;
+import io.lettuce.test.WithPassword;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class ConnectionCommandTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+class ConnectionCommandTest extends TestSupport {
+
+    private final RedisClient client;
+    private final StatefulRedisConnection<String, String> connection;
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    ConnectionCommandTest(RedisClient client, StatefulRedisConnection<String, String> connection) {
+        this.client = client;
+        this.connection = connection;
+        this.redis = connection.sync();
+    }
+
     @Test
-    public void auth()  {
-        new WithPasswordRequired() {
-            @Override
-            public void run(RedisClient client) {
-                RedisCommands<String, String> connection = client.connect().sync();
+    void auth() {
+
+        WithPassword.run(client, () -> {
+            RedisCommands<String, String> connection = client.connect().sync();
                 try {
                     connection.ping();
                     fail("Server doesn't require authentication");
@@ -50,60 +65,58 @@ public void run(RedisClient client) {
                 }
 
                 RedisURI redisURI = RedisURI.Builder.redis(host, port).withDatabase(2).withPassword(passwd).build();
-                RedisClient redisClient = DefaultRedisClient.get();
-                RedisCommands<String, String> authConnection = redisClient.connect(redisURI).sync();
+                RedisCommands<String, String> authConnection = client.connect(redisURI).sync();
                 authConnection.ping();
                 authConnection.getStatefulConnection().close();
-            }
-        };
+        });
+
     }
 
     @Test
-    public void echo()  {
+    void echo() {
         assertThat(redis.echo("hello")).isEqualTo("hello");
     }
 
     @Test
-    public void ping()  {
+    void ping() {
         assertThat(redis.ping()).isEqualTo("PONG");
     }
 
     @Test
-    public void select()  {
+    void select() {
         redis.set(key, value);
         assertThat(redis.select(1)).isEqualTo("OK");
         assertThat(redis.get(key)).isNull();
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void authNull()  {
-        redis.auth(null);
+    @Test
+    void authNull() {
+        assertThatThrownBy(() -> redis.auth(null)).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void authEmpty()  {
-        redis.auth("");
+    @Test
+    void authEmpty() {
+        assertThatThrownBy(() -> redis.auth("")).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void authReconnect()  {
-        new WithPasswordRequired() {
-            @Override
-            public void run(RedisClient client) throws InterruptedException {
+    void authReconnect() {
+        WithPassword.run(client, () -> {
 
-                RedisCommands<String, String> connection = client.connect().sync();
+            RedisCommands<String, String> connection = client.connect().sync();
                 assertThat(connection.auth(passwd)).isEqualTo("OK");
                 assertThat(connection.set(key, value)).isEqualTo("OK");
                 connection.quit();
 
                 Thread.sleep(100);
                 assertThat(connection.get(key)).isEqualTo(value);
-            }
-        };
+
+            connection.getStatefulConnection().close();
+        });
     }
 
     @Test
-    public void selectReconnect()  {
+    void selectReconnect() {
         redis.select(1);
         redis.set(key, value);
         redis.quit();
@@ -113,7 +126,7 @@ public void selectReconnect()  {
     }
 
     @Test
-    public void getSetReconnect(){
+    void getSetReconnect() {
         redis.set(key, value);
         redis.quit();
         Wait.untilTrue(redis::isOpen).waitOrTimeout();
@@ -122,7 +135,7 @@ public void getSetReconnect(){
 
     @Test
     @SuppressWarnings("unchecked")
-    public void authInvalidPassword()  {
+    void authInvalidPassword() {
         RedisAsyncCommands<String, String> async = client.connect().async();
         try {
             async.auth("invalid");
@@ -138,7 +151,7 @@ public void authInvalidPassword()  {
 
     @Test
     @SuppressWarnings("unchecked")
-    public void selectInvalid()  {
+    void selectInvalid() {
         RedisAsyncCommands<String, String> async = client.connect().async();
         try {
             async.select(1024);
@@ -153,11 +166,10 @@ public void selectInvalid()  {
     }
 
     @Test
-    public void testDoubleToString()  {
+    void testDoubleToString() {
 
         assertThat(LettuceStrings.string(1.1)).isEqualTo("1.1");
         assertThat(LettuceStrings.string(Double.POSITIVE_INFINITY)).isEqualTo("+inf");
         assertThat(LettuceStrings.string(Double.NEGATIVE_INFINITY)).isEqualTo("-inf");
-
     }
 }
diff --git a/src/test/java/io/lettuce/core/ConnectionFutureTest.java b/src/test/java/io/lettuce/core/ConnectionFutureUnitTests.java
similarity index 93%
rename from src/test/java/io/lettuce/core/ConnectionFutureTest.java
rename to src/test/java/io/lettuce/core/ConnectionFutureUnitTests.java
index c7605d6854..0a886f552c 100644
--- a/src/test/java/io/lettuce/core/ConnectionFutureTest.java
+++ b/src/test/java/io/lettuce/core/ConnectionFutureUnitTests.java
@@ -21,17 +21,17 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.internal.Futures;
 
 /**
  * @author Mark Paluch
  */
-public class ConnectionFutureTest {
+class ConnectionFutureUnitTests {
 
     @Test
-    public void shouldComposeTransformToError() {
+    void shouldComposeTransformToError() {
 
         CompletableFuture<String> foo = new CompletableFuture<>();
 
@@ -51,7 +51,7 @@ public void shouldComposeTransformToError() {
     }
 
     @Test
-    public void composeTransformShouldFailWhileTransformation() {
+    void composeTransformShouldFailWhileTransformation() {
 
         CompletableFuture<String> foo = new CompletableFuture<>();
 
@@ -67,7 +67,7 @@ public void composeTransformShouldFailWhileTransformation() {
     }
 
     @Test
-    public void composeTransformShouldFailWhileTransformationRetainOriginalException() {
+    void composeTransformShouldFailWhileTransformationRetainOriginalException() {
 
         CompletableFuture<String> foo = new CompletableFuture<>();
 
@@ -78,6 +78,7 @@ public void composeTransformShouldFailWhileTransformationRetainOriginalException
         Throwable t = new Throwable();
         foo.completeExceptionally(t);
 
+
         assertThat(transformed.toCompletableFuture()).isDone();
         assertThat(transformed.toCompletableFuture()).isCompletedExceptionally();
 
@@ -91,7 +92,7 @@ public void composeTransformShouldFailWhileTransformationRetainOriginalException
     }
 
     @Test
-    public void shouldComposeWithErrorFlow() {
+    void shouldComposeWithErrorFlow() {
 
         CompletableFuture<String> foo = new CompletableFuture<>();
         CompletableFuture<String> exceptional = new CompletableFuture<>();
diff --git a/src/test/java/io/lettuce/core/CustomCodecTest.java b/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
similarity index 88%
rename from src/test/java/io/lettuce/core/CustomCodecTest.java
rename to src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
index 50e19b6d90..8a620b39cc 100644
--- a/src/test/java/io/lettuce/core/CustomCodecTest.java
+++ b/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
@@ -22,7 +22,10 @@
 import java.nio.charset.Charset;
 import java.util.List;
 
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import reactor.test.StepVerifier;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -30,15 +33,24 @@
 import io.lettuce.core.codec.ByteArrayCodec;
 import io.lettuce.core.codec.CompressionCodec;
 import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class CustomCodecTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+class CustomCodecIntegrationTests extends TestSupport {
+
+    private final RedisClient client;
+
+    @Inject
+    CustomCodecIntegrationTests(RedisClient client) {
+        this.client = client;
+    }
 
     @Test
-    public void testJavaSerializer() throws Exception {
+    void testJavaSerializer() {
         StatefulRedisConnection<String, Object> redisConnection = client.connect(new SerializedObjectCodec());
         RedisCommands<String, Object> sync = redisConnection.sync();
         List<String> list = list("one", "two");
@@ -52,7 +64,7 @@ public void testJavaSerializer() throws Exception {
     }
 
     @Test
-    public void testJavaSerializerReactive() throws Exception {
+    void testJavaSerializerReactive() {
 
         StatefulRedisConnection<String, Object> redisConnection = client.connect(new SerializedObjectCodec());
         List<String> list = list("one", "two");
@@ -62,7 +74,7 @@ public void testJavaSerializerReactive() throws Exception {
     }
 
     @Test
-    public void testDeflateCompressedJavaSerializer() throws Exception {
+    void testDeflateCompressedJavaSerializer() {
         RedisCommands<String, Object> connection = client.connect(
                 CompressionCodec.valueCompressor(new SerializedObjectCodec(), CompressionCodec.CompressionType.DEFLATE)).sync();
         List<String> list = list("one", "two");
@@ -73,7 +85,7 @@ public void testDeflateCompressedJavaSerializer() throws Exception {
     }
 
     @Test
-    public void testGzipompressedJavaSerializer() throws Exception {
+    void testGzipompressedJavaSerializer() {
         RedisCommands<String, Object> connection = client.connect(
                 CompressionCodec.valueCompressor(new SerializedObjectCodec(), CompressionCodec.CompressionType.GZIP)).sync();
         List<String> list = list("one", "two");
@@ -84,7 +96,7 @@ public void testGzipompressedJavaSerializer() throws Exception {
     }
 
     @Test
-    public void testByteCodec() throws Exception {
+    void testByteCodec() {
         RedisCommands<byte[], byte[]> connection = client.connect(new ByteArrayCodec()).sync();
         String value = "üöäü+#";
         connection.set(key.getBytes(), value.getBytes());
@@ -99,7 +111,7 @@ public void testByteCodec() throws Exception {
     }
 
     @Test
-    public void testByteBufferCodec() throws Exception {
+    void testByteBufferCodec() {
 
         RedisCommands<ByteBuffer, ByteBuffer> connection = client.connect(new ByteBufferCodec()).sync();
         String value = "üöäü+#";
@@ -119,7 +131,7 @@ public void testByteBufferCodec() throws Exception {
         connection.getStatefulConnection().close();
     }
 
-    public class SerializedObjectCodec implements RedisCodec<String, Object> {
+    class SerializedObjectCodec implements RedisCodec<String, Object> {
 
         private Charset charset = Charset.forName("UTF-8");
 
@@ -158,7 +170,7 @@ public ByteBuffer encodeValue(Object value) {
         }
     }
 
-    public class ByteBufferCodec implements RedisCodec<ByteBuffer, ByteBuffer> {
+    class ByteBufferCodec implements RedisCodec<ByteBuffer, ByteBuffer> {
 
         @Override
         public ByteBuffer decodeKey(ByteBuffer bytes) {
diff --git a/src/test/java/io/lettuce/core/ExceptionFactoryTest.java b/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java
similarity index 92%
rename from src/test/java/io/lettuce/core/ExceptionFactoryTest.java
rename to src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java
index 3002a78924..111da6db0c 100644
--- a/src/test/java/io/lettuce/core/ExceptionFactoryTest.java
+++ b/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java
@@ -19,15 +19,15 @@
 
 import java.time.Duration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class ExceptionFactoryTest {
+class ExceptionFactoryUnitTests {
 
     @Test
-    public void shouldCreateBusyException() {
+    void shouldCreateBusyException() {
 
         assertThat(ExceptionFactory.createExecutionException("BUSY foo bar")).isInstanceOf(RedisBusyException.class)
                 .hasMessage("BUSY foo bar").hasNoCause();
@@ -37,7 +37,7 @@ public void shouldCreateBusyException() {
     }
 
     @Test
-    public void shouldCreateNoscriptException() {
+    void shouldCreateNoscriptException() {
 
         assertThat(ExceptionFactory.createExecutionException("NOSCRIPT foo bar")).isInstanceOf(RedisNoScriptException.class)
                 .hasMessage("NOSCRIPT foo bar").hasNoCause();
@@ -47,7 +47,7 @@ public void shouldCreateNoscriptException() {
     }
 
     @Test
-    public void shouldCreateExecutionException() {
+    void shouldCreateExecutionException() {
 
         assertThat(ExceptionFactory.createExecutionException("ERR foo bar")).isInstanceOf(RedisCommandExecutionException.class)
                 .hasMessage("ERR foo bar").hasNoCause();
@@ -59,7 +59,7 @@ public void shouldCreateExecutionException() {
     }
 
     @Test
-    public void shouldCreateLoadingException() {
+    void shouldCreateLoadingException() {
 
         assertThat(ExceptionFactory.createExecutionException("LOADING foo bar")).isInstanceOf(RedisLoadingException.class)
                 .hasMessage("LOADING foo bar").hasNoCause();
@@ -69,7 +69,7 @@ public void shouldCreateLoadingException() {
     }
 
     @Test
-    public void shouldFormatExactUnits() {
+    void shouldFormatExactUnits() {
 
         assertThat(ExceptionFactory.formatTimeout(Duration.ofMinutes(2))).isEqualTo("2 minute(s)");
         assertThat(ExceptionFactory.formatTimeout(Duration.ofMinutes(1))).isEqualTo("1 minute(s)");
@@ -85,7 +85,7 @@ public void shouldFormatExactUnits() {
     }
 
     @Test
-    public void shouldFormatToMinmalApplicableTimeunit() {
+    void shouldFormatToMinmalApplicableTimeunit() {
 
         assertThat(ExceptionFactory.formatTimeout(Duration.ofMinutes(2).plus(Duration.ofSeconds(10)))).isEqualTo(
                 "130 second(s)");
diff --git a/src/test/java/io/lettuce/core/GeoModelTest.java b/src/test/java/io/lettuce/core/GeoModelUnitTests.java
similarity index 72%
rename from src/test/java/io/lettuce/core/GeoModelTest.java
rename to src/test/java/io/lettuce/core/GeoModelUnitTests.java
index 8862ca4b54..363f458eb5 100644
--- a/src/test/java/io/lettuce/core/GeoModelTest.java
+++ b/src/test/java/io/lettuce/core/GeoModelUnitTests.java
@@ -20,18 +20,18 @@
 import java.util.Collections;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class GeoModelTest {
+class GeoModelUnitTests {
 
     @Test
-    public void geoWithin() throws Exception {
+    void geoWithin() {
 
-        GeoWithin<String> sut = new GeoWithin<String>("me", 1.0, 1234L, new GeoCoordinates(1, 2));
-        GeoWithin<String> equalsToSut = new GeoWithin<String>("me", 1.0, 1234L, new GeoCoordinates(1, 2));
+        GeoWithin<String> sut = new GeoWithin<>("me", 1.0, 1234L, new GeoCoordinates(1, 2));
+        GeoWithin<String> equalsToSut = new GeoWithin<>("me", 1.0, 1234L, new GeoCoordinates(1, 2));
 
         Map<GeoWithin<String>, String> map = Collections.singletonMap(sut, "value");
 
@@ -39,14 +39,13 @@ public void geoWithin() throws Exception {
         assertThat(sut).isEqualTo(equalsToSut);
         assertThat(sut.hashCode()).isEqualTo(equalsToSut.hashCode());
         assertThat(sut.toString()).isEqualTo(equalsToSut.toString());
-
     }
 
     @Test
-    public void geoWithinSlightlyDifferent() throws Exception {
+    void geoWithinSlightlyDifferent() {
 
-        GeoWithin<String> sut = new GeoWithin<String>("me", 1.0, 1234L, new GeoCoordinates(1, 2));
-        GeoWithin<String> slightlyDifferent = new GeoWithin<String>("me", 1.0, 1234L, new GeoCoordinates(1.1, 2));
+        GeoWithin<String> sut = new GeoWithin<>("me", 1.0, 1234L, new GeoCoordinates(1, 2));
+        GeoWithin<String> slightlyDifferent = new GeoWithin<>("me", 1.0, 1234L, new GeoCoordinates(1.1, 2));
 
         Map<GeoWithin<String>, String> map = Collections.singletonMap(sut, "value");
 
@@ -55,22 +54,22 @@ public void geoWithinSlightlyDifferent() throws Exception {
         assertThat(sut.hashCode()).isNotEqualTo(slightlyDifferent.hashCode());
         assertThat(sut.toString()).isNotEqualTo(slightlyDifferent.toString());
 
-        slightlyDifferent = new GeoWithin<String>("me1", 1.0, 1234L, new GeoCoordinates(1, 2));
+        slightlyDifferent = new GeoWithin<>("me1", 1.0, 1234L, new GeoCoordinates(1, 2));
         assertThat(sut).isNotEqualTo(slightlyDifferent);
     }
 
     @Test
-    public void geoWithinEmpty() throws Exception {
+    void geoWithinEmpty() {
 
-        GeoWithin<String> sut = new GeoWithin<String>(null, null, null, null);
-        GeoWithin<String> equalsToSut = new GeoWithin<String>(null, null, null, null);
+        GeoWithin<String> sut = new GeoWithin<>(null, null, null, null);
+        GeoWithin<String> equalsToSut = new GeoWithin<>(null, null, null, null);
 
         assertThat(sut).isEqualTo(equalsToSut);
         assertThat(sut.hashCode()).isEqualTo(equalsToSut.hashCode());
     }
 
     @Test
-    public void geoCoordinates() throws Exception {
+    void geoCoordinates() {
 
         GeoCoordinates sut = new GeoCoordinates(1, 2);
         GeoCoordinates equalsToSut = new GeoCoordinates(1, 2);
@@ -85,7 +84,7 @@ public void geoCoordinates() throws Exception {
     }
 
     @Test
-    public void geoCoordinatesSlightlyDifferent() throws Exception {
+    void geoCoordinatesSlightlyDifferent() {
 
         GeoCoordinates sut = new GeoCoordinates(1, 2);
         GeoCoordinates slightlyDifferent = new GeoCoordinates(1.1, 2);
diff --git a/src/test/java/io/lettuce/core/JavaRuntimeTest.java b/src/test/java/io/lettuce/core/JavaRuntimeUnitTests.java
similarity index 71%
rename from src/test/java/io/lettuce/core/JavaRuntimeTest.java
rename to src/test/java/io/lettuce/core/JavaRuntimeUnitTests.java
index 0643f4b5c1..1cc3b976dd 100644
--- a/src/test/java/io/lettuce/core/JavaRuntimeTest.java
+++ b/src/test/java/io/lettuce/core/JavaRuntimeUnitTests.java
@@ -16,29 +16,32 @@
 package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assume.assumeThat;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.internal.LettuceClassUtils;
 
-public class JavaRuntimeTest {
+class JavaRuntimeUnitTests {
 
     @Test
-    public void testJava8() {
-        assumeThat(System.getProperty("java.version"), startsWith("1.8"));
+    void testJava8() {
+
+        assumeTrue(System.getProperty("java.version").startsWith("1.8"));
+
         assertThat(JavaRuntime.AT_LEAST_JDK_8).isTrue();
     }
 
     @Test
-    public void testJava9() {
-        assumeThat(System.getProperty("java.version"), startsWith("1.9"));
+    void testJava9() {
+
+        assumeTrue(System.getProperty("java.version").startsWith("9"));
+
         assertThat(JavaRuntime.AT_LEAST_JDK_8).isTrue();
     }
 
     @Test
-    public void testNotPresentClass() {
+    void testNotPresentClass() {
         assertThat(LettuceClassUtils.isPresent("total.fancy.class.name")).isFalse();
     }
 }
diff --git a/src/test/java/io/lettuce/core/KeyValueTest.java b/src/test/java/io/lettuce/core/KeyValueUnitTests.java
similarity index 78%
rename from src/test/java/io/lettuce/core/KeyValueTest.java
rename to src/test/java/io/lettuce/core/KeyValueUnitTests.java
index a0ea08cf91..e73142f81d 100644
--- a/src/test/java/io/lettuce/core/KeyValueTest.java
+++ b/src/test/java/io/lettuce/core/KeyValueUnitTests.java
@@ -16,20 +16,22 @@
  */
 package io.lettuce.core;
 
+import static io.lettuce.core.Value.just;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.Optional;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class KeyValueTest {
+class KeyValueUnitTests {
 
     @Test
-    public void shouldCreateEmptyKeyValueFromOptional() {
+    void shouldCreateEmptyKeyValueFromOptional() {
 
         KeyValue<String, String> value = KeyValue.from("key", Optional.<String> empty());
 
@@ -37,7 +39,7 @@ public void shouldCreateEmptyKeyValueFromOptional() {
     }
 
     @Test
-    public void shouldCreateEmptyValue() {
+    void shouldCreateEmptyValue() {
 
         KeyValue<String, String> value = KeyValue.empty("key");
 
@@ -45,7 +47,7 @@ public void shouldCreateEmptyValue() {
     }
 
     @Test
-    public void shouldCreateNonEmptyValueFromOptional() {
+    void shouldCreateNonEmptyValueFromOptional() {
 
         KeyValue<Long, String> value = KeyValue.from(1L, Optional.of("hello"));
 
@@ -54,7 +56,7 @@ public void shouldCreateNonEmptyValueFromOptional() {
     }
 
     @Test
-    public void shouldCreateEmptyValueFromValue() {
+    void shouldCreateEmptyValueFromValue() {
 
         KeyValue<String, String> value = KeyValue.fromNullable("key", null);
 
@@ -62,7 +64,7 @@ public void shouldCreateEmptyValueFromValue() {
     }
 
     @Test
-    public void shouldCreateNonEmptyValueFromValue() {
+    void shouldCreateNonEmptyValueFromValue() {
 
         KeyValue<String, String> value = KeyValue.fromNullable("key", "hello");
 
@@ -71,7 +73,7 @@ public void shouldCreateNonEmptyValueFromValue() {
     }
 
     @Test
-    public void justShouldCreateValueFromValue() {
+    void justShouldCreateValueFromValue() {
 
         KeyValue<String, String> value = KeyValue.just("key", "hello");
 
@@ -79,13 +81,13 @@ public void justShouldCreateValueFromValue() {
         assertThat(value.getKey()).isEqualTo("key");
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void justShouldRejectEmptyValueFromValue() {
-        Value.just(null);
+    @Test
+    void justShouldRejectEmptyValueFromValue() {
+        assertThatThrownBy(() -> just(null)).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void shouldCreateNonEmptyValue() {
+    void shouldCreateNonEmptyValue() {
 
         KeyValue<String, String> value = KeyValue.from("key", Optional.of("hello"));
 
@@ -94,7 +96,7 @@ public void shouldCreateNonEmptyValue() {
     }
 
     @Test
-    public void equals() throws Exception {
+    void equals() {
         KeyValue<String, String> kv = kv("key", "value");
         assertThat(kv.equals(kv("key", "value"))).isTrue();
         assertThat(kv.equals(null)).isFalse();
@@ -103,12 +105,12 @@ public void equals() throws Exception {
     }
 
     @Test
-    public void testHashCode() throws Exception {
+    void testHashCode() {
         assertThat(kv("key", "value").hashCode() != 0).isTrue();
     }
 
     @Test
-    public void toStringShouldRenderCorrectly() {
+    void toStringShouldRenderCorrectly() {
 
         KeyValue<String, String> value = KeyValue.from("key", Optional.of("hello"));
         KeyValue<String, String> empty = KeyValue.fromNullable("key", null);
@@ -117,7 +119,7 @@ public void toStringShouldRenderCorrectly() {
         assertThat(empty.toString()).isEqualTo("KeyValue[key].empty");
     }
 
-    protected KeyValue<String, String> kv(String key, String value) {
+    KeyValue<String, String> kv(String key, String value) {
         return KeyValue.just(key, value);
     }
 }
diff --git a/src/test/java/io/lettuce/core/LettuceFuturesTest.java b/src/test/java/io/lettuce/core/LettuceFuturesUnitTests.java
similarity index 63%
rename from src/test/java/io/lettuce/core/LettuceFuturesTest.java
rename to src/test/java/io/lettuce/core/LettuceFuturesUnitTests.java
index a4d5e8dbe3..c67a35a4e1 100644
--- a/src/test/java/io/lettuce/core/LettuceFuturesTest.java
+++ b/src/test/java/io/lettuce/core/LettuceFuturesUnitTests.java
@@ -15,50 +15,52 @@
  */
 package io.lettuce.core;
 
+import static io.lettuce.core.LettuceFutures.awaitAll;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class LettuceFuturesTest {
+class LettuceFuturesUnitTests {
 
-    @Before
-    public void setUp() throws Exception {
+    @BeforeEach
+    void setUp() {
         Thread.interrupted();
     }
 
-    @Test(expected = RedisCommandExecutionException.class)
-    public void awaitAllShouldThrowRedisCommandExecutionException() throws Exception {
+    @Test
+    void awaitAllShouldThrowRedisCommandExecutionException() {
 
         CompletableFuture<String> f = new CompletableFuture<>();
         f.completeExceptionally(new RedisCommandExecutionException("error"));
 
-        LettuceFutures.awaitAll(1, TimeUnit.SECONDS, f);
+        assertThatThrownBy(() -> awaitAll(1, SECONDS, f)).isInstanceOf(RedisCommandExecutionException.class);
     }
 
-    @Test(expected = RedisCommandInterruptedException.class)
-    public void awaitAllShouldThrowRedisCommandInterruptedException() throws Exception {
+    @Test
+    void awaitAllShouldThrowRedisCommandInterruptedException() {
 
         CompletableFuture<String> f = new CompletableFuture<>();
         Thread.currentThread().interrupt();
 
-        LettuceFutures.awaitAll(1, TimeUnit.SECONDS, f);
+        assertThatThrownBy(() -> awaitAll(1, SECONDS, f)).isInstanceOf(RedisCommandInterruptedException.class);
     }
 
     @Test
-    public void awaitAllShouldSetInterruptedBit() throws Exception {
+    void awaitAllShouldSetInterruptedBit() {
 
         CompletableFuture<String> f = new CompletableFuture<>();
         Thread.currentThread().interrupt();
 
         try {
-            LettuceFutures.awaitAll(1, TimeUnit.SECONDS, f);
+            awaitAll(1, SECONDS, f);
         } catch (Exception e) {
         }
 
diff --git a/src/test/java/io/lettuce/core/LimitTest.java b/src/test/java/io/lettuce/core/LimitUnitTests.java
similarity index 91%
rename from src/test/java/io/lettuce/core/LimitTest.java
rename to src/test/java/io/lettuce/core/LimitUnitTests.java
index 8fd0805c1b..07c25df068 100644
--- a/src/test/java/io/lettuce/core/LimitTest.java
+++ b/src/test/java/io/lettuce/core/LimitUnitTests.java
@@ -17,15 +17,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class LimitTest {
+class LimitUnitTests {
 
     @Test
-    public void create() {
+    void create() {
 
         Limit limit = Limit.create(1, 2);
 
@@ -35,7 +35,7 @@ public void create() {
     }
 
     @Test
-    public void unlimited() {
+    void unlimited() {
 
         Limit limit = Limit.unlimited();
 
diff --git a/src/test/java/io/lettuce/core/PipeliningTest.java b/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java
similarity index 69%
rename from src/test/java/io/lettuce/core/PipeliningTest.java
rename to src/test/java/io/lettuce/core/PipeliningIntegrationTests.java
index b2268eea21..8977bb4ce4 100644
--- a/src/test/java/io/lettuce/core/PipeliningTest.java
+++ b/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java
@@ -21,19 +21,33 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
 @SuppressWarnings("rawtypes")
-public class PipeliningTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+class PipeliningIntegrationTests extends TestSupport {
+
+    private final RedisClient client;
+    private final StatefulRedisConnection<String, String> connection;
+
+    @Inject
+    PipeliningIntegrationTests(RedisClient client, StatefulRedisConnection<String, String> connection) {
+        this.client = client;
+        this.connection = connection;
+    }
 
     @Test
-    public void basic() throws Exception {
+    void basic() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         connection.setAutoFlushCommands(false);
@@ -52,14 +66,14 @@ public void basic() throws Exception {
         connection.close();
     }
 
-    protected void verifyExecuted(int iterations) {
+    void verifyExecuted(int iterations) {
         for (int i = 0; i < iterations; i++) {
-            assertThat(redis.get(key(i))).as("Key " + key(i) + " must be " + value(i)).isEqualTo(value(i));
+            assertThat(connection.sync().get(key(i))).as("Key " + key(i) + " must be " + value(i)).isEqualTo(value(i));
         }
     }
 
     @Test
-    public void setAutoFlushTrueDoesNotFlush() throws Exception {
+    void setAutoFlushTrueDoesNotFlush() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         connection.setAutoFlushCommands(false);
@@ -80,13 +94,13 @@ public void setAutoFlushTrueDoesNotFlush() throws Exception {
         connection.close();
     }
 
-    protected void verifyNotExecuted(int iterations) {
+    void verifyNotExecuted(int iterations) {
         for (int i = 0; i < iterations; i++) {
-            assertThat(redis.get(key(i))).as("Key " + key(i) + " must be null").isNull();
+            assertThat(connection.sync().get(key(i))).as("Key " + key(i) + " must be null").isNull();
         }
     }
 
-    protected List<RedisFuture<?>> triggerSet(RedisAsyncCommands<String, String> connection, int iterations) {
+    List<RedisFuture<?>> triggerSet(RedisAsyncCommands<String, String> connection, int iterations) {
         List<RedisFuture<?>> futures = new ArrayList<>();
         for (int i = 0; i < iterations; i++) {
             futures.add(connection.set(key(i), value(i)));
@@ -94,11 +108,11 @@ protected List<RedisFuture<?>> triggerSet(RedisAsyncCommands<String, String> con
         return futures;
     }
 
-    protected String value(int i) {
+    String value(int i) {
         return value + "-" + i;
     }
 
-    protected String key(int i) {
+    String key(int i) {
         return key + "-" + i;
     }
 }
diff --git a/src/test/java/io/lettuce/core/PrivateAccessorTest.java b/src/test/java/io/lettuce/core/PrivateAccessorTest.java
deleted file mode 100644
index 53cb795ea9..0000000000
--- a/src/test/java/io/lettuce/core/PrivateAccessorTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import io.lettuce.core.cluster.SlotHash;
-import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser;
-import io.lettuce.core.cluster.models.slots.ClusterSlotsParser;
-import io.lettuce.core.codec.Base16;
-import io.lettuce.core.codec.CRC16;
-import io.lettuce.core.internal.LettuceLists;
-import io.lettuce.core.models.command.CommandDetailParser;
-import io.lettuce.core.models.role.RoleParser;
-import io.lettuce.core.protocol.LettuceCharsets;
-
-/**
- * @author Mark Paluch
- */
-@RunWith(Parameterized.class)
-@SuppressWarnings("unchecked")
-public class PrivateAccessorTest {
-
-    private Class<?> theClass;
-
-    @Parameterized.Parameters
-    public static List<Object[]> parameters() {
-
-        List<Class<?>> classes = LettuceLists.unmodifiableList(LettuceStrings.class, LettuceFutures.class, LettuceCharsets.class,
-                                                  CRC16.class, SlotHash.class, Base16.class, KillArgs.Builder.class,
-                                                  SortArgs.Builder.class, ZStoreArgs.Builder.class,
-                                                  ClusterSlotsParser.class, CommandDetailParser.class, RoleParser.class,
-                                                  ClusterPartitionParser.class);
-
-        List<Object[]> result = new ArrayList<>();
-        for (Class<?> aClass : classes) {
-            result.add(new Object[] { aClass });
-        }
-
-        return result;
-    }
-
-    public PrivateAccessorTest(Class<?> theClass) {
-        this.theClass = theClass;
-    }
-
-    @Test
-    public void testLettuceStrings() throws Exception {
-        Constructor<?> constructor = theClass.getDeclaredConstructor();
-        assertThat(Modifier.isPrivate(constructor.getModifiers())).isTrue();
-        constructor.setAccessible(true);
-        constructor.newInstance();
-    }
-}
diff --git a/src/test/java/io/lettuce/core/ProtectedModeTests.java b/src/test/java/io/lettuce/core/ProtectedModeTests.java
index a40617a52d..ea0fdedf28 100644
--- a/src/test/java/io/lettuce/core/ProtectedModeTests.java
+++ b/src/test/java/io/lettuce/core/ProtectedModeTests.java
@@ -21,15 +21,17 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.Wait;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.server.MockTcpServer;
+import io.lettuce.test.Wait;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
@@ -37,20 +39,20 @@
 /**
  * @author Mark Paluch
  */
-public class ProtectedModeTests {
+class ProtectedModeTests {
 
     private static MockTcpServer server;
     private static RedisClient client;
 
-    @BeforeClass
-    public static void beforeClass() throws Exception {
+    @BeforeAll
+    static void beforeClass() throws Exception {
 
         server = new MockTcpServer();
 
         server.addHandler(() -> {
             return new ChannelInboundHandlerAdapter() {
                 @Override
-                public void channelActive(ChannelHandlerContext ctx) throws Exception {
+                public void channelActive(ChannelHandlerContext ctx) {
 
                     String message = getMessage();
                     ByteBuf buffer = ctx.alloc().buffer(message.length() + 3);
@@ -71,20 +73,20 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
                 RedisURI.create(TestSettings.host(), TestSettings.nonexistentPort()));
     }
 
-    @AfterClass
-    public static void afterClass() {
+    @AfterAll
+    static void afterClass() {
 
         server.shutdown();
         FastShutdown.shutdown(client);
     }
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
         client.setOptions(ClientOptions.create());
     }
 
     @Test
-    public void regularClientFailsOnFirstCommand() {
+    void regularClientFailsOnFirstCommand() {
 
         try (StatefulRedisConnection<String, String> connect = client.connect()) {
 
@@ -99,7 +101,7 @@ public void regularClientFailsOnFirstCommand() {
     }
 
     @Test
-    public void regularClientFailsOnFirstCommandWithDelay() {
+    void regularClientFailsOnFirstCommandWithDelay() {
 
         try (StatefulRedisConnection<String, String> connect = client.connect()) {
 
@@ -116,7 +118,7 @@ public void regularClientFailsOnFirstCommandWithDelay() {
     }
 
     @Test
-    public void pingBeforeConnectFailsOnPing() {
+    void pingBeforeConnectFailsOnPing() {
 
         client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
         assertThatThrownBy(() -> client.connect()).isInstanceOf(RedisConnectionException.class).hasCauseInstanceOf(
diff --git a/src/test/java/io/lettuce/core/RangeTest.java b/src/test/java/io/lettuce/core/RangeUnitTests.java
similarity index 92%
rename from src/test/java/io/lettuce/core/RangeTest.java
rename to src/test/java/io/lettuce/core/RangeUnitTests.java
index dc46f17b5b..e3aaaef5df 100644
--- a/src/test/java/io/lettuce/core/RangeTest.java
+++ b/src/test/java/io/lettuce/core/RangeUnitTests.java
@@ -19,15 +19,15 @@
 import static io.lettuce.core.Range.Boundary.including;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class RangeTest {
+class RangeUnitTests {
 
     @Test
-    public void unbounded() {
+    void unbounded() {
 
         Range<Object> unbounded = Range.unbounded();
 
@@ -38,7 +38,7 @@ public void unbounded() {
     }
 
     @Test
-    public void createIncluded() {
+    void createIncluded() {
 
         Range<Object> range = Range.create("ze", "ro");
 
@@ -49,7 +49,7 @@ public void createIncluded() {
     }
 
     @Test
-    public void fromBoundaries() {
+    void fromBoundaries() {
 
         Range<Object> range = Range.from(including("ze"), excluding("ro"));
 
@@ -60,7 +60,7 @@ public void fromBoundaries() {
     }
 
     @Test
-    public void greater() {
+    void greater() {
 
         Range<Object> gt = Range.unbounded().gt("zero");
 
@@ -71,7 +71,7 @@ public void greater() {
     }
 
     @Test
-    public void greaterOrEquals() {
+    void greaterOrEquals() {
 
         Range<Object> gte = Range.unbounded().gte("zero");
 
@@ -82,7 +82,7 @@ public void greaterOrEquals() {
     }
 
     @Test
-    public void less() {
+    void less() {
 
         Range<Object> lt = Range.unbounded().lt("zero");
 
@@ -94,7 +94,7 @@ public void less() {
     }
 
     @Test
-    public void lessOrEquals() {
+    void lessOrEquals() {
 
         Range<Object> lte = Range.unbounded().lte("zero");
 
diff --git a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java
similarity index 94%
rename from src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
rename to src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java
index bc9a650e9d..8b86cc6f91 100644
--- a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java
@@ -22,12 +22,11 @@
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
-import io.lettuce.core.tracing.Tracing;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
@@ -38,6 +37,7 @@
 import io.lettuce.core.output.ValueListOutput;
 import io.lettuce.core.protocol.*;
 import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.tracing.Tracing;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.channel.local.LocalAddress;
@@ -45,8 +45,8 @@
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class ReactiveBackpressurePropagationTest {
+@ExtendWith(MockitoExtension.class)
+class ReactiveBackpressurePropagationUnitTests {
 
     private CommandHandler commandHandler;
     private EmbeddedChannel embeddedChannel;
@@ -63,8 +63,8 @@ public class ReactiveBackpressurePropagationTest {
     @Mock
     private StatefulConnection statefulConnection;
 
-    @Before
-    public void before() throws Exception {
+    @BeforeEach
+    void before() {
 
         when(clientResources.commandLatencyCollector()).thenReturn(latencyCollector);
         when(clientResources.tracing()).thenReturn(Tracing.disabled());
@@ -82,7 +82,7 @@ public void before() throws Exception {
     }
 
     @Test
-    public void writeCommand() throws Exception {
+    void writeCommand() throws Exception {
 
         Command<String, String, List<String>> lrange = new Command<>(CommandType.LRANGE,
                 new ValueListOutput<>(StringCodec.UTF8));
@@ -134,7 +134,7 @@ public void writeCommand() throws Exception {
     }
 
     @Test
-    public void writeCommandAndCancelInTheMiddle() throws Exception {
+    void writeCommandAndCancelInTheMiddle() throws Exception {
 
         Command<String, String, List<String>> lrange = new Command<>(CommandType.LRANGE,
                 new ValueListOutput<>(StringCodec.UTF8));
diff --git a/src/test/java/io/lettuce/core/ReactiveConnectionTest.java b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
similarity index 74%
rename from src/test/java/io/lettuce/core/ReactiveConnectionTest.java
rename to src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
index a3d57598d6..e360112bd0 100644
--- a/src/test/java/io/lettuce/core/ReactiveConnectionTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
@@ -24,45 +24,45 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import javax.enterprise.inject.New;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
-import io.lettuce.Delay;
-import io.lettuce.Wait;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.reactive.RedisReactiveCommands;
-
-public class ReactiveConnectionTest extends AbstractRedisClientTest {
-
-    private RedisReactiveCommands<String, String> reactive;
-
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-    private StatefulRedisConnection<String, String> stateful;
-
-    @Before
-    public void openReactiveConnection() {
-        stateful = client.connect();
-        reactive = stateful.reactive();
-    }
-
-    @After
-    public void closeReactiveConnection() {
-        reactive.getStatefulConnection().close();
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.Delay;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.Wait;
+
+@ExtendWith(LettuceExtension.class)
+class ReactiveConnectionIntegrationTests extends TestSupport {
+
+    private final StatefulRedisConnection<String, String> connection;
+    private final RedisCommands<String, String> redis;
+    private final RedisReactiveCommands<String, String> reactive;
+
+    @Inject
+    ReactiveConnectionIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        this.connection = connection;
+        this.redis = connection.sync();
+        this.reactive = connection.reactive();
+        this.redis.flushall();
     }
 
     @Test
-    public void doNotFireCommandUntilObservation() {
+    void doNotFireCommandUntilObservation() {
+
+        RedisReactiveCommands<String, String> reactive = connection.reactive();
         Mono<String> set = reactive.set(key, value);
-        Delay.delay(Duration.ofMillis(200));
+        Delay.delay(Duration.ofMillis(50));
         assertThat(redis.get(key)).isNull();
         set.subscribe();
         Wait.untilEquals(value, () -> redis.get(key)).waitOrTimeout();
@@ -71,59 +71,67 @@ public void doNotFireCommandUntilObservation() {
     }
 
     @Test
-    public void fireCommandAfterObserve() {
+    void fireCommandAfterObserve() {
         StepVerifier.create(reactive.set(key, value)).expectNext("OK").verifyComplete();
         assertThat(redis.get(key)).isEqualTo(value);
     }
 
     @Test
-    public void isOpen() {
+    void isOpen() {
         assertThat(reactive.isOpen()).isTrue();
     }
 
     @Test
-    public void getStatefulConnection() {
-        assertThat(reactive.getStatefulConnection()).isSameAs(stateful);
+    void getStatefulConnection() {
+        assertThat(reactive.getStatefulConnection()).isSameAs(connection);
     }
 
     @Test
-    public void testCancelCommand() {
+    @Inject
+    void testCancelCommand(@New StatefulRedisConnection<String, String> connection) {
 
+        RedisReactiveCommands<String, String> reactive = connection.reactive();
         List<Object> result = new ArrayList<>();
         reactive.clientPause(2000).subscribe();
-        Delay.delay(Duration.ofMillis(100));
+        Delay.delay(Duration.ofMillis(50));
 
         reactive.set(key, value).subscribe(new CompletionSubscriber(result));
-        Delay.delay(Duration.ofMillis(100));
+        Delay.delay(Duration.ofMillis(50));
 
         reactive.reset();
         assertThat(result).isEmpty();
     }
 
     @Test
-    public void testEcho() {
+    void testEcho() {
         StepVerifier.create(reactive.echo("echo")).expectNext("echo").verifyComplete();
     }
 
     @Test
-    public void testMonoMultiCancel() {
+    @Inject
+    void testMonoMultiCancel(@New StatefulRedisConnection<String, String> connection) {
+
+        RedisReactiveCommands<String, String> reactive = connection.reactive();
 
         List<Object> result = new ArrayList<>();
         reactive.clientPause(1000).subscribe();
-        Delay.delay(Duration.ofMillis(100));
+        Delay.delay(Duration.ofMillis(50));
 
         Mono<String> set = reactive.set(key, value);
         set.subscribe(new CompletionSubscriber(result));
         set.subscribe(new CompletionSubscriber(result));
         set.subscribe(new CompletionSubscriber(result));
-        Delay.delay(Duration.ofMillis(100));
+        Delay.delay(Duration.ofMillis(50));
 
         reactive.reset();
         assertThat(result).isEmpty();
     }
 
     @Test
-    public void testFluxCancel() {
+    @Inject
+    void testFluxCancel(@New StatefulRedisConnection<String, String> connection) {
+
+        RedisReactiveCommands<String, String> reactive = connection.reactive();
 
         List<Object> result = new ArrayList<>();
         reactive.clientPause(1000).subscribe();
@@ -140,7 +148,7 @@ public void testFluxCancel() {
     }
 
     @Test
-    public void multiSubscribe() throws Exception {
+    void multiSubscribe() throws Exception {
 
         CountDownLatch latch = new CountDownLatch(4);
         reactive.set(key, "1").subscribe(s -> latch.countDown());
@@ -157,7 +165,8 @@ public void multiSubscribe() throws Exception {
     }
 
     @Test
-    public void transactional() throws Exception {
+    @Inject
+    void transactional(RedisClient client) throws Exception {
 
         final CountDownLatch sync = new CountDownLatch(1);
 
@@ -175,15 +184,17 @@ public void transactional() throws Exception {
 
         String result = redis.get(key);
         assertThat(result).isEqualTo("2");
+
+        reactive.getStatefulConnection().close();
     }
 
     @Test
-    public void auth() {
+    void auth() {
         StepVerifier.create(reactive.auth("error")).expectError().verify();
     }
 
     @Test
-    public void subscriberCompletingWithExceptionShouldBeHandledSafely() {
+    void subscriberCompletingWithExceptionShouldBeHandledSafely() {
 
         StepVerifier.create(Flux.concat(reactive.set("keyA", "valueA"), reactive.set("keyB", "valueB"))).expectNextCount(2)
                 .verifyComplete();
@@ -195,7 +206,8 @@ public void subscriberCompletingWithExceptionShouldBeHandledSafely() {
     }
 
     @Test
-    public void subscribeWithDisconnectedClient() {
+    @Inject
+    void subscribeWithDisconnectedClient(RedisClient client) {
 
         client.setOptions(ClientOptions.builder().disconnectedBehavior(REJECT_COMMANDS).autoReconnect(false).build());
 
@@ -243,7 +255,7 @@ private static class CompletionSubscriber implements Subscriber<Object> {
 
         private final List<Object> result;
 
-        public CompletionSubscriber(List<Object> result) {
+        CompletionSubscriber(List<Object> result) {
             this.result = result;
         }
 
diff --git a/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java b/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java
similarity index 68%
rename from src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java
rename to src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java
index 8687f93c5b..18d5abd2cb 100644
--- a/src/test/java/io/lettuce/core/ReactiveStreamingOutputTest.java
+++ b/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java
@@ -16,48 +16,41 @@
 package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import reactor.test.StepVerifier;
-import io.lettuce.KeysAndValues;
-import io.lettuce.RedisConditions;
 import io.lettuce.core.GeoArgs.Unit;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.reactive.RedisReactiveCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.KeysAndValues;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.condition.EnabledOnCommand;
 
 /**
  * @author Mark Paluch
  */
-public class ReactiveStreamingOutputTest extends AbstractRedisClientTest {
-
-    private RedisReactiveCommands<String, String> reactive;
-
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-    private StatefulRedisConnection<String, String> stateful;
+@ExtendWith(LettuceExtension.class)
+class ReactiveStreamingOutputIntegrationTests extends TestSupport {
 
-    @Before
-    public void openReactiveConnection() {
-        stateful = client.connect();
-        reactive = stateful.reactive();
-    }
+    private final RedisCommands<String, String> redis;
+    private final RedisReactiveCommands<String, String> reactive;
 
-    @After
-    public void closeReactiveConnection() {
-        reactive.getStatefulConnection().close();
+    @Inject
+    ReactiveStreamingOutputIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        this.redis = connection.sync();
+        this.reactive = connection.reactive();
     }
 
     @Test
-    public void keyListCommandShouldReturnAllElements() {
+    void keyListCommandShouldReturnAllElements() {
 
         redis.mset(KeysAndValues.MAP);
 
@@ -66,7 +59,7 @@ public void keyListCommandShouldReturnAllElements() {
     }
 
     @Test
-    public void valueListCommandShouldReturnAllElements() {
+    void valueListCommandShouldReturnAllElements() {
 
         redis.mset(KeysAndValues.MAP);
 
@@ -75,12 +68,12 @@ public void valueListCommandShouldReturnAllElements() {
     }
 
     @Test
-    public void booleanListCommandShouldReturnAllElements() {
+    void booleanListCommandShouldReturnAllElements() {
         StepVerifier.create(reactive.scriptExists("a", "b", "c")).expectNextCount(3).verifyComplete();
     }
 
     @Test
-    public void scoredValueListCommandShouldReturnAllElements() {
+    void scoredValueListCommandShouldReturnAllElements() {
 
         redis.zadd(key, 1d, "v1", 2d, "v2", 3d, "v3");
 
@@ -90,9 +83,8 @@ public void scoredValueListCommandShouldReturnAllElements() {
     }
 
     @Test
-    public void geoWithinListCommandShouldReturnAllElements() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("GEORADIUS"));
+    @EnabledOnCommand("GEORADIUS")
+    void geoWithinListCommandShouldReturnAllElements() {
 
         redis.geoadd(key, 50, 20, "value1");
         redis.geoadd(key, 50, 21, "value2");
@@ -110,9 +102,8 @@ public void geoWithinListCommandShouldReturnAllElements() {
     }
 
     @Test
-    public void geoCoordinatesListCommandShouldReturnAllElements() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("GEOPOS"));
+    @EnabledOnCommand("GEOPOS")
+    void geoCoordinatesListCommandShouldReturnAllElements() {
 
         redis.geoadd(key, 50, 20, "value1");
         redis.geoadd(key, 50, 21, "value2");
diff --git a/src/test/java/io/lettuce/core/RedisClientConnectionTest.java b/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java
similarity index 56%
rename from src/test/java/io/lettuce/core/RedisClientConnectionTest.java
rename to src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java
index 3a72862add..949f8cb589 100644
--- a/src/test/java/io/lettuce/core/RedisClientConnectionTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java
@@ -16,32 +16,46 @@
 package io.lettuce.core;
 
 import static io.lettuce.core.RedisURI.Builder.redis;
+import static io.lettuce.core.codec.StringCodec.UTF8;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.api.StatefulRedisConnection;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.test.Futures;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  * @author Jongyeol Choi
  */
-public class RedisClientConnectionTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+class RedisClientConnectIntegrationTests extends TestSupport {
+
+    private static final Duration EXPECTED_TIMEOUT = Duration.ofMillis(500);
 
-    public static final Duration EXPECTED_TIMEOUT = Duration.ofMillis(500);
+    private final RedisClient client;
 
-    @Before
-    public void before() {
+    @Inject
+    RedisClientConnectIntegrationTests(RedisClient client) {
+        this.client = client;
+    }
+
+    @BeforeEach
+    void before() {
         client.setDefaultTimeout(EXPECTED_TIMEOUT);
     }
 
@@ -49,7 +63,7 @@ public void before() {
      * Standalone/Stateful
      */
     @Test
-    public void connectClientUri() {
+    void connectClientUri() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
@@ -57,177 +71,177 @@ public void connectClientUri() {
     }
 
     @Test
-    public void connectCodecClientUri() {
-        StatefulRedisConnection<String, String> connection = client.connect(Utf8StringCodec.UTF8);
+    void connectCodecClientUri() {
+        StatefulRedisConnection<String, String> connection = client.connect(UTF8);
         assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
         connection.close();
     }
 
     @Test
-    public void connectOwnUri() {
+    void connectOwnUri() {
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisConnection<String, String> connection = client.connect(redisURI);
         assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
         connection.close();
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void connectMissingHostAndSocketUri() {
-        client.connect(new RedisURI());
+    @Test
+    void connectMissingHostAndSocketUri() {
+        assertThatThrownBy(() -> client.connect(new RedisURI())).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void connectSentinelMissingHostAndSocketUri() {
-        client.connect(invalidSentinel());
+    @Test
+    void connectSentinelMissingHostAndSocketUri() {
+        assertThatThrownBy(() -> client.connect(invalidSentinel())).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void connectCodecOwnUri() {
+    void connectCodecOwnUri() {
         RedisURI redisURI = redis(host, port).build();
-        StatefulRedisConnection<String, String> connection = client.connect(Utf8StringCodec.UTF8, redisURI);
+        StatefulRedisConnection<String, String> connection = client.connect(UTF8, redisURI);
         assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
         connection.close();
     }
 
     @Test
-    public void connectAsyncCodecOwnUri() {
+    void connectAsyncCodecOwnUri() {
         RedisURI redisURI = redis(host, port).build();
-        ConnectionFuture<StatefulRedisConnection<String, String>> future = client.connectAsync(Utf8StringCodec.UTF8, redisURI);
-        StatefulRedisConnection<String, String> connection = future.join();
+        ConnectionFuture<StatefulRedisConnection<String, String>> future = client.connectAsync(UTF8, redisURI);
+        StatefulRedisConnection<String, String> connection = Futures.get(future.toCompletableFuture());
         assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
         connection.close();
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void connectCodecMissingHostAndSocketUri() {
-        client.connect(Utf8StringCodec.UTF8, new RedisURI());
+    @Test
+    void connectCodecMissingHostAndSocketUri() {
+        assertThatThrownBy(() -> client.connect(UTF8, new RedisURI())).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void connectcodecSentinelMissingHostAndSocketUri() {
-        client.connect(Utf8StringCodec.UTF8, invalidSentinel());
+    @Test
+    void connectcodecSentinelMissingHostAndSocketUri() {
+        assertThatThrownBy(() -> client.connect(UTF8, invalidSentinel())).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = TimeoutException.class)
-    @Ignore("Non-deterministic behavior. Can cause a deadlock")
-    public void shutdownSyncInRedisFutureTest() throws Exception {
+    @Test
+    @Disabled("Non-deterministic behavior. Can cause a deadlock")
+    void shutdownSyncInRedisFutureTest() {
 
         RedisClient redisClient = RedisClient.create();
         StatefulRedisConnection<String, String> connection = redisClient.connect(redis(host, port).build());
 
         CompletableFuture<String> f = connection.async().get("key1").whenComplete((result, e) -> {
             connection.close();
-            redisClient.shutdown(0, 0, TimeUnit.SECONDS); // deadlock expected.
+            redisClient.shutdown(0, 0, SECONDS); // deadlock expected.
             }).toCompletableFuture();
 
-        f.get(1, TimeUnit.SECONDS);
+        assertThatThrownBy(() -> Futures.await(f)).isInstanceOf(TimeoutException.class);
     }
 
     @Test
-    public void shutdownAsyncInRedisFutureTest() throws Exception {
+    void shutdownAsyncInRedisFutureTest() {
 
         RedisClient redisClient = RedisClient.create();
         StatefulRedisConnection<String, String> connection = redisClient.connect(redis(host, port).build());
         CompletableFuture<Void> f = connection.async().get("key1").thenCompose(result -> {
             connection.close();
-            return redisClient.shutdownAsync(0, 0, TimeUnit.SECONDS);
+            return redisClient.shutdownAsync(0, 0, SECONDS);
         }).toCompletableFuture();
 
-        f.get(5, TimeUnit.SECONDS);
+        Futures.await(f);
     }
 
     /*
      * Standalone/PubSub Stateful
      */
     @Test
-    public void connectPubSubClientUri() {
+    void connectPubSubClientUri() {
         StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub();
         assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
         connection.close();
     }
 
     @Test
-    public void connectPubSubCodecClientUri() {
-        StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub(Utf8StringCodec.UTF8);
+    void connectPubSubCodecClientUri() {
+        StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub(UTF8);
         assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
         connection.close();
     }
 
     @Test
-    public void connectPubSubOwnUri() {
+    void connectPubSubOwnUri() {
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub(redisURI);
         assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
         connection.close();
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void connectPubSubMissingHostAndSocketUri() {
-        client.connectPubSub(new RedisURI());
+    @Test
+    void connectPubSubMissingHostAndSocketUri() {
+        assertThatThrownBy(() -> client.connectPubSub(new RedisURI())).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void connectPubSubSentinelMissingHostAndSocketUri() {
-        client.connectPubSub(invalidSentinel());
+    @Test
+    void connectPubSubSentinelMissingHostAndSocketUri() {
+        assertThatThrownBy(() -> client.connectPubSub(invalidSentinel())).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void connectPubSubCodecOwnUri() {
+    void connectPubSubCodecOwnUri() {
         RedisURI redisURI = redis(host, port).build();
-        StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub(Utf8StringCodec.UTF8, redisURI);
+        StatefulRedisPubSubConnection<String, String> connection = client.connectPubSub(UTF8, redisURI);
         assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
         connection.close();
     }
 
     @Test
-    public void connectPubSubAsync() {
+    void connectPubSubAsync() {
         RedisURI redisURI = redis(host, port).build();
         ConnectionFuture<StatefulRedisPubSubConnection<String, String>> future = client.connectPubSubAsync(
-                Utf8StringCodec.UTF8, redisURI);
+UTF8, redisURI);
         StatefulRedisPubSubConnection<String, String> connection = future.join();
         assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
         connection.close();
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void connectPubSubCodecMissingHostAndSocketUri() {
-        client.connectPubSub(Utf8StringCodec.UTF8, new RedisURI());
+    @Test
+    void connectPubSubCodecMissingHostAndSocketUri() {
+        assertThatThrownBy(() -> client.connectPubSub(UTF8, new RedisURI())).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void connectPubSubCodecSentinelMissingHostAndSocketUri() {
-        client.connectPubSub(Utf8StringCodec.UTF8, invalidSentinel());
+    @Test
+    void connectPubSubCodecSentinelMissingHostAndSocketUri() {
+        assertThatThrownBy(() -> client.connectPubSub(UTF8, invalidSentinel())).isInstanceOf(IllegalArgumentException.class);
     }
 
     /*
      * Sentinel Stateful
      */
     @Test
-    public void connectSentinelClientUri() {
+    void connectSentinelClientUri() {
         StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel();
         assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
         connection.close();
     }
 
     @Test
-    public void connectSentinelCodecClientUri() {
-        StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel(Utf8StringCodec.UTF8);
+    void connectSentinelCodecClientUri() {
+        StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel(UTF8);
         assertThat(connection.getTimeout()).isEqualTo(EXPECTED_TIMEOUT);
         connection.close();
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void connectSentinelAndMissingHostAndSocketUri() {
-        client.connectSentinel(new RedisURI());
+    @Test
+    void connectSentinelAndMissingHostAndSocketUri() {
+        assertThatThrownBy(() -> client.connectSentinel(new RedisURI())).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void connectSentinelSentinelMissingHostAndSocketUri() {
-        client.connectSentinel(invalidSentinel());
+    @Test
+    void connectSentinelSentinelMissingHostAndSocketUri() {
+        assertThatThrownBy(() -> client.connectSentinel(invalidSentinel())).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void connectSentinelOwnUri() {
+    void connectSentinelOwnUri() {
         RedisURI redisURI = redis(host, port).build();
         StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel(redisURI);
         assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(1));
@@ -235,22 +249,22 @@ public void connectSentinelOwnUri() {
     }
 
     @Test
-    public void connectSentinelCodecOwnUri() {
+    void connectSentinelCodecOwnUri() {
 
         RedisURI redisURI = redis(host, port).build();
-        StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel(Utf8StringCodec.UTF8, redisURI);
+        StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel(UTF8, redisURI);
         assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
         connection.close();
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void connectSentinelCodecMissingHostAndSocketUri() {
-        client.connectSentinel(Utf8StringCodec.UTF8, new RedisURI());
+    @Test
+    void connectSentinelCodecMissingHostAndSocketUri() {
+        assertThatThrownBy(() -> client.connectSentinel(UTF8, new RedisURI())).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void connectSentinelCodecSentinelMissingHostAndSocketUri() {
-        client.connectSentinel(Utf8StringCodec.UTF8, invalidSentinel());
+    @Test
+    void connectSentinelCodecSentinelMissingHostAndSocketUri() {
+        assertThatThrownBy(() -> client.connectSentinel(UTF8, invalidSentinel())).isInstanceOf(IllegalArgumentException.class);
     }
 
     private static RedisURI invalidSentinel() {
diff --git a/src/test/java/io/lettuce/core/RedisClientFactoryBeanTest.java b/src/test/java/io/lettuce/core/RedisClientFactoryBeanUnitTests.java
similarity index 88%
rename from src/test/java/io/lettuce/core/RedisClientFactoryBeanTest.java
rename to src/test/java/io/lettuce/core/RedisClientFactoryBeanUnitTests.java
index a97aa131d6..45d97c7b72 100644
--- a/src/test/java/io/lettuce/core/RedisClientFactoryBeanTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientFactoryBeanUnitTests.java
@@ -19,22 +19,27 @@
 
 import java.net.URI;
 
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.support.RedisClientFactoryBean;
+import io.lettuce.test.resource.FastShutdown;
+
+/**
+ * @author Mark Paluch
+ */
+class RedisClientFactoryBeanUnitTests {
 
-public class RedisClientFactoryBeanTest {
     private RedisClientFactoryBean sut = new RedisClientFactoryBean();
 
-    @After
-    public void tearDown() throws Exception {
+    @AfterEach
+    void tearDown() throws Exception {
         FastShutdown.shutdown(sut.getObject());
         sut.destroy();
     }
 
     @Test
-    public void testSimpleUri() throws Exception {
+    void testSimpleUri() throws Exception {
         String uri = "redis://localhost/2";
 
         sut.setUri(URI.create(uri));
@@ -50,7 +55,7 @@ public void testSimpleUri() throws Exception {
     }
 
     @Test
-    public void testSimpleUriWithoutDB() throws Exception {
+    void testSimpleUriWithoutDB() throws Exception {
         String uri = "redis://localhost/";
 
         sut.setUri(URI.create(uri));
@@ -62,7 +67,7 @@ public void testSimpleUriWithoutDB() throws Exception {
     }
 
     @Test
-    public void testSimpleUriWithoutDB2() throws Exception {
+    void testSimpleUriWithoutDB2() throws Exception {
         String uri = "redis://localhost/";
 
         sut.setUri(URI.create(uri));
@@ -74,7 +79,7 @@ public void testSimpleUriWithoutDB2() throws Exception {
     }
 
     @Test
-    public void testSimpleUriWithPort() throws Exception {
+    void testSimpleUriWithPort() throws Exception {
         String uri = "redis://localhost:1234/0";
 
         sut.setUri(URI.create(uri));
@@ -90,7 +95,7 @@ public void testSimpleUriWithPort() throws Exception {
     }
 
     @Test
-    public void testSentinelUri() throws Exception {
+    void testSentinelUri() throws Exception {
         String uri = "redis-sentinel://localhost/1#myMaster";
 
         sut.setUri(URI.create(uri));
@@ -109,7 +114,7 @@ public void testSentinelUri() throws Exception {
     }
 
     @Test
-    public void testSentinelUriWithPort() throws Exception {
+    void testSentinelUriWithPort() throws Exception {
         String uri = "redis-sentinel://localhost:1234/1#myMaster";
 
         sut.setUri(URI.create(uri));
@@ -128,7 +133,7 @@ public void testSentinelUriWithPort() throws Exception {
     }
 
     @Test
-    public void testMultipleSentinelUri() throws Exception {
+    void testMultipleSentinelUri() throws Exception {
         String uri = "redis-sentinel://localhost,localhost2,localhost3/1#myMaster";
 
         sut.setUri(URI.create(uri));
@@ -147,7 +152,7 @@ public void testMultipleSentinelUri() throws Exception {
     }
 
     @Test
-    public void testMultipleSentinelUriWithPorts() throws Exception {
+    void testMultipleSentinelUriWithPorts() throws Exception {
         String uri = "redis-sentinel://localhost,localhost2:1234,localhost3/1#myMaster";
 
         sut.setUri(URI.create(uri));
diff --git a/src/test/java/io/lettuce/core/RedisClientFactoryTest.java b/src/test/java/io/lettuce/core/RedisClientFactoryTest.java
deleted file mode 100644
index 375f89933b..0000000000
--- a/src/test/java/io/lettuce/core/RedisClientFactoryTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core;
-
-import org.junit.Test;
-
-import io.lettuce.TestClientResources;
-import io.lettuce.core.resource.ClientResources;
-
-/**
- * @author Mark Paluch
- */
-public class RedisClientFactoryTest {
-
-    private final static String URI = "redis://" + TestSettings.host() + ":" + TestSettings.port();
-    private final static RedisURI REDIS_URI = RedisURI.create(URI);
-
-    @Test
-    public void plain() throws Exception {
-        FastShutdown.shutdown(RedisClient.create());
-    }
-
-    @Test
-    public void withStringUri() throws Exception {
-        FastShutdown.shutdown(RedisClient.create(URI));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withStringUriNull() throws Exception {
-        RedisClient.create((String) null);
-    }
-
-    @Test
-    public void withUri() throws Exception {
-        FastShutdown.shutdown(RedisClient.create(REDIS_URI));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withUriNull() throws Exception {
-        RedisClient.create((RedisURI) null);
-    }
-
-    @Test
-    public void clientResources() throws Exception {
-        FastShutdown.shutdown(RedisClient.create(TestClientResources.get()));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void clientResourcesNull() throws Exception {
-        RedisClient.create((ClientResources) null);
-    }
-
-    @Test
-    public void clientResourcesWithStringUri() throws Exception {
-        FastShutdown.shutdown(RedisClient.create(TestClientResources.get(), URI));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void clientResourcesWithStringUriNull() throws Exception {
-        RedisClient.create(TestClientResources.get(), (String) null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void clientResourcesNullWithStringUri() throws Exception {
-        RedisClient.create(null, URI);
-    }
-
-    @Test
-    public void clientResourcesWithUri() throws Exception {
-        FastShutdown.shutdown(RedisClient.create(TestClientResources.get(),  REDIS_URI));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void clientResourcesWithUriNull() throws Exception {
-        RedisClient.create(TestClientResources.get(), (RedisURI) null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void clientResourcesNullWithUri() throws Exception {
-        RedisClient.create(null, REDIS_URI);
-    }
-}
diff --git a/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java b/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java
new file mode 100644
index 0000000000..b0d5a8ddc1
--- /dev/null
+++ b/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.junit.jupiter.api.Test;
+
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
+
+/**
+ * @author Mark Paluch
+ */
+class RedisClientFactoryUnitTests {
+
+    private final static String URI = "redis://" + TestSettings.host() + ":" + TestSettings.port();
+    private final static RedisURI REDIS_URI = RedisURI.create(URI);
+
+    @Test
+    void plain() {
+        FastShutdown.shutdown(RedisClient.create());
+    }
+
+    @Test
+    void withStringUri() {
+        FastShutdown.shutdown(RedisClient.create(URI));
+    }
+
+    @Test
+    void withStringUriNull() {
+        assertThatThrownBy(() -> RedisClient.create((String) null)).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    void withUri() {
+        FastShutdown.shutdown(RedisClient.create(REDIS_URI));
+    }
+
+    @Test
+    void withUriNull() {
+        assertThatThrownBy(() -> RedisClient.create((RedisURI) null)).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    void clientResources() {
+        FastShutdown.shutdown(RedisClient.create(TestClientResources.get()));
+    }
+
+    @Test
+    void clientResourcesNull() {
+        assertThatThrownBy(() -> RedisClient.create((ClientResources) null)).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    void clientResourcesWithStringUri() {
+        FastShutdown.shutdown(RedisClient.create(TestClientResources.get(), URI));
+    }
+
+    @Test
+    void clientResourcesWithStringUriNull() {
+        assertThatThrownBy(() -> RedisClient.create(TestClientResources.get(), (String) null)).isInstanceOf(
+                IllegalArgumentException.class);
+    }
+
+    @Test
+    void clientResourcesNullWithStringUri() {
+        assertThatThrownBy(() -> RedisClient.create(null, URI)).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    void clientResourcesWithUri() {
+        FastShutdown.shutdown(RedisClient.create(TestClientResources.get(),  REDIS_URI));
+    }
+
+    @Test
+    void clientResourcesWithUriNull() {
+        assertThatThrownBy(() -> RedisClient.create(TestClientResources.get(), (RedisURI) null)).isInstanceOf(
+                IllegalArgumentException.class);
+    }
+
+    @Test
+    void clientResourcesNullWithUri() {
+        assertThatThrownBy(() -> RedisClient.create(null, REDIS_URI)).isInstanceOf(IllegalArgumentException.class);
+    }
+}
diff --git a/src/test/java/io/lettuce/core/RedisClientTest.java b/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java
similarity index 53%
rename from src/test/java/io/lettuce/core/RedisClientTest.java
rename to src/test/java/io/lettuce/core/RedisClientIntegrationTests.java
index 0ef5d5b089..29b1f34d4d 100644
--- a/src/test/java/io/lettuce/core/RedisClientTest.java
+++ b/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java
@@ -18,23 +18,90 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.lang.reflect.Field;
+import java.net.SocketAddress;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
+import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
 import io.lettuce.core.resource.DefaultEventLoopGroupProvider;
+import io.lettuce.test.Futures;
+import io.lettuce.test.Wait;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 import io.netty.util.concurrent.EventExecutorGroup;
 
 /**
  * @author Mark Paluch
  */
-public class RedisClientTest {
+class RedisClientIntegrationTests extends TestSupport {
+
+    private final ClientResources clientResources = TestClientResources.get();
+
+    @Test
+    void shouldNotifyListener() {
+
+        final TestConnectionListener listener = new TestConnectionListener();
+
+        RedisClient client = RedisClient.create(clientResources, RedisURI.Builder.redis(host, port).build());
+
+        client.addListener(listener);
+
+        assertThat(listener.onConnected).isNull();
+        assertThat(listener.onDisconnected).isNull();
+        assertThat(listener.onException).isNull();
+
+        StatefulRedisConnection<String, String> connection = client.connect();
+
+        Wait.untilTrue(() -> listener.onConnected != null).waitOrTimeout();
+        assertThat(listener.onConnectedSocketAddress).isNotNull();
+
+        assertThat(listener.onConnected).isEqualTo(connection);
+        assertThat(listener.onDisconnected).isNull();
+
+        connection.sync().set(key, value);
+        connection.close();
+
+        Wait.untilTrue(() -> listener.onDisconnected != null).waitOrTimeout();
+
+        assertThat(listener.onConnected).isEqualTo(connection);
+        assertThat(listener.onDisconnected).isEqualTo(connection);
+
+        FastShutdown.shutdown(client);
+    }
+
+    @Test
+    void shouldNotNotifyListenerAfterRemoval() {
+
+        final TestConnectionListener removedListener = new TestConnectionListener();
+        final TestConnectionListener retainedListener = new TestConnectionListener();
+
+        RedisClient client = RedisClient.create(clientResources, RedisURI.Builder.redis(host, port).build());
+        client.addListener(removedListener);
+        client.addListener(retainedListener);
+        client.removeListener(removedListener);
+
+        // that's the sut call
+        client.connect().close();
+
+        Wait.untilTrue(() -> retainedListener.onConnected != null).waitOrTimeout();
+
+        assertThat(retainedListener.onConnected).isNotNull();
+
+        assertThat(removedListener.onConnected).isNull();
+        assertThat(removedListener.onConnectedSocketAddress).isNull();
+        assertThat(removedListener.onDisconnected).isNull();
+        assertThat(removedListener.onException).isNull();
+
+        FastShutdown.shutdown(client);
+    }
 
     @Test
-    public void reuseClientConnections() throws Exception {
+    void reuseClientConnections() throws Exception {
 
         // given
         DefaultClientResources clientResources = DefaultClientResources.create();
@@ -52,7 +119,7 @@ public void reuseClientConnections() throws Exception {
         // then
         connectAndClose(redisClient2);
 
-        clientResources.shutdown(0, 0, TimeUnit.MILLISECONDS).get();
+        Futures.await(clientResources.shutdown(0, 0, TimeUnit.MILLISECONDS));
 
         assertThat(eventLoopGroups).isEmpty();
         assertThat(executor.isShuttingDown()).isTrue();
@@ -60,7 +127,7 @@ public void reuseClientConnections() throws Exception {
     }
 
     @Test
-    public void reuseClientConnectionsShutdownTwoClients() throws Exception {
+    void reuseClientConnectionsShutdownTwoClients() throws Exception {
 
         // given
         DefaultClientResources clientResources = DefaultClientResources.create();
@@ -85,12 +152,12 @@ public void reuseClientConnectionsShutdownTwoClients() throws Exception {
         assertThat(clientResources.eventExecutorGroup().isShuttingDown()).isFalse();
 
         // cleanup
-        clientResources.shutdown(0, 0, TimeUnit.MILLISECONDS).get();
+        Futures.await(clientResources.shutdown(0, 0, TimeUnit.MILLISECONDS));
         assertThat(clientResources.eventExecutorGroup().isShuttingDown()).isTrue();
     }
 
     @Test
-    public void managedClientResources() throws Exception {
+    void managedClientResources() throws Exception {
 
         // given
         RedisClient redisClient1 = RedisClient.create(RedisURI.create(TestSettings.host(), TestSettings.port()));
@@ -123,4 +190,28 @@ private Map<Class<? extends EventExecutorGroup>, EventExecutorGroup> getExecutor
         eventLoopGroupsField.setAccessible(true);
         return (Map) eventLoopGroupsField.get(clientResources.eventLoopGroupProvider());
     }
+
+    private class TestConnectionListener implements RedisConnectionStateListener {
+
+        volatile SocketAddress onConnectedSocketAddress;
+        volatile RedisChannelHandler<?, ?> onConnected;
+        volatile RedisChannelHandler<?, ?> onDisconnected;
+        volatile RedisChannelHandler<?, ?> onException;
+
+        @Override
+        public void onRedisConnected(RedisChannelHandler<?, ?> connection, SocketAddress socketAddress) {
+            onConnected = connection;
+            onConnectedSocketAddress = socketAddress;
+        }
+
+        @Override
+        public void onRedisDisconnected(RedisChannelHandler<?, ?> connection) {
+            onDisconnected = connection;
+        }
+
+        @Override
+        public void onRedisExceptionCaught(RedisChannelHandler<?, ?> connection, Throwable cause) {
+            onException = connection;
+        }
+    }
 }
diff --git a/src/test/java/io/lettuce/core/RedisClientListenerIntegrationTests.java b/src/test/java/io/lettuce/core/RedisClientListenerIntegrationTests.java
new file mode 100644
index 0000000000..046c3b57e3
--- /dev/null
+++ b/src/test/java/io/lettuce/core/RedisClientListenerIntegrationTests.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.lettuce.test.LettuceExtension;
+
+/**
+ * Integration tests for {@link RedisConnectionStateListener} via {@link RedisClient}.
+ *
+ * @author Mark Paluch
+ */
+@ExtendWith(LettuceExtension.class)
+class RedisClientListenerIntegrationTests extends TestSupport {
+
+
+}
diff --git a/src/test/java/io/lettuce/core/RedisClientListenerTest.java b/src/test/java/io/lettuce/core/RedisClientListenerTest.java
deleted file mode 100644
index f0f6b901bd..0000000000
--- a/src/test/java/io/lettuce/core/RedisClientListenerTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2016-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.net.SocketAddress;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import io.lettuce.TestClientResources;
-import io.lettuce.Wait;
-import io.lettuce.core.api.StatefulRedisConnection;
-import io.lettuce.core.resource.ClientResources;
-
-/**
- * Integration tests for {@link RedisConnectionStateListener} via {@link RedisClient}.
- *
- * @author Mark Paluch
- */
-public class RedisClientListenerTest extends AbstractTest {
-
-    private static ClientResources DEFAULT_RESOURCES;
-
-    @BeforeClass
-    public static void beforeClass() throws Exception {
-        DEFAULT_RESOURCES = TestClientResources.get();
-    }
-
-    @Test
-    public void shouldNotifyListener() throws Exception {
-
-        final TestConnectionListener listener = new TestConnectionListener();
-
-        RedisClient client = RedisClient.create(DEFAULT_RESOURCES, RedisURI.Builder.redis(host, port).build());
-
-        client.addListener(listener);
-
-        assertThat(listener.onConnected).isNull();
-        assertThat(listener.onDisconnected).isNull();
-        assertThat(listener.onException).isNull();
-
-        StatefulRedisConnection<String, String> connection = client.connect();
-
-        Wait.untilTrue(() -> listener.onConnected != null).waitOrTimeout();
-        assertThat(listener.onConnectedSocketAddress).isNotNull();
-
-        assertThat(listener.onConnected).isEqualTo(connection);
-        assertThat(listener.onDisconnected).isNull();
-
-        connection.sync().set(key, value);
-        connection.close();
-
-        Wait.untilTrue(() -> listener.onDisconnected != null).waitOrTimeout();
-
-        assertThat(listener.onConnected).isEqualTo(connection);
-        assertThat(listener.onDisconnected).isEqualTo(connection);
-
-        FastShutdown.shutdown(client);
-    }
-
-    @Test
-    public void shouldNotNotifyListenerAfterRemoval() throws Exception {
-
-        final TestConnectionListener removedListener = new TestConnectionListener();
-        final TestConnectionListener retainedListener = new TestConnectionListener();
-
-        RedisClient client = RedisClient.create(DEFAULT_RESOURCES, RedisURI.Builder.redis(host, port).build());
-        client.addListener(removedListener);
-        client.addListener(retainedListener);
-        client.removeListener(removedListener);
-
-        // that's the sut call
-        client.connect().close();
-
-        Wait.untilTrue(() -> retainedListener.onConnected != null).waitOrTimeout();
-
-        assertThat(retainedListener.onConnected).isNotNull();
-
-        assertThat(removedListener.onConnected).isNull();
-        assertThat(removedListener.onConnectedSocketAddress).isNull();
-        assertThat(removedListener.onDisconnected).isNull();
-        assertThat(removedListener.onException).isNull();
-
-        FastShutdown.shutdown(client);
-    }
-
-    private class TestConnectionListener implements RedisConnectionStateListener {
-
-        volatile SocketAddress onConnectedSocketAddress;
-        volatile RedisChannelHandler<?, ?> onConnected;
-        volatile RedisChannelHandler<?, ?> onDisconnected;
-        volatile RedisChannelHandler<?, ?> onException;
-
-        @Override
-        public void onRedisConnected(RedisChannelHandler<?, ?> connection, SocketAddress socketAddress) {
-            onConnected = connection;
-            onConnectedSocketAddress = socketAddress;
-        }
-
-        @Override
-        public void onRedisDisconnected(RedisChannelHandler<?, ?> connection) {
-            onDisconnected = connection;
-        }
-
-        @Override
-        public void onRedisExceptionCaught(RedisChannelHandler<?, ?> connection, Throwable cause) {
-            onException = connection;
-        }
-    }
-}
diff --git a/src/test/java/io/lettuce/core/RedisURIBuilderTest.java b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
similarity index 72%
rename from src/test/java/io/lettuce/core/RedisURIBuilderTest.java
rename to src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
index a5da5d5c68..54fd95cd59 100644
--- a/src/test/java/io/lettuce/core/RedisURIBuilderTest.java
+++ b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
@@ -16,43 +16,45 @@
 package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.io.File;
+import java.io.IOException;
 import java.time.Duration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class RedisURIBuilderTest {
+class RedisURIBuilderUnitTests {
 
     @Test
-    public void sentinel() throws Exception {
+    void sentinel() {
         RedisURI result = RedisURI.Builder.sentinel("localhost").withTimeout(Duration.ofHours(2)).build();
         assertThat(result.getSentinels()).hasSize(1);
         assertThat(result.getTimeout()).isEqualTo(Duration.ofHours(2));
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void sentinelWithHostShouldFail() throws Exception {
-        RedisURI.builder().sentinel("localhost").withHost("localhost");
+    @Test
+    void sentinelWithHostShouldFail() {
+        assertThatThrownBy(() -> RedisURI.builder().sentinel("localhost").withHost("localhost")).isInstanceOf(IllegalStateException. class);
     }
 
     @Test
-    public void sentinelWithPort() throws Exception {
+    void sentinelWithPort() {
         RedisURI result = RedisURI.Builder.sentinel("localhost", 1).withTimeout(Duration.ofHours(2)).build();
         assertThat(result.getSentinels()).hasSize(1);
         assertThat(result.getTimeout()).isEqualTo(Duration.ofHours(2));
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void shouldFailIfBuilderIsEmpty() throws Exception {
-        RedisURI.builder().build();
+    @Test
+    void shouldFailIfBuilderIsEmpty() {
+        assertThatThrownBy(() -> RedisURI.builder().build()).isInstanceOf(IllegalStateException. class);
     }
 
     @Test
-    public void redisWithHostAndPort() throws Exception {
+    void redisWithHostAndPort() {
         RedisURI result = RedisURI.builder().withHost("localhost").withPort(1234).build();
 
         assertThat(result.getSentinels()).isEmpty();
@@ -61,7 +63,7 @@ public void redisWithHostAndPort() throws Exception {
     }
 
     @Test
-    public void redisWithPort() throws Exception {
+    void redisWithPort() {
         RedisURI result = RedisURI.Builder.redis("localhost").withPort(1234).build();
 
         assertThat(result.getSentinels()).isEmpty();
@@ -70,25 +72,25 @@ public void redisWithPort() throws Exception {
     }
 
     @Test
-    public void redisWithClientName() throws Exception {
+    void redisWithClientName() {
         RedisURI result = RedisURI.Builder.redis("localhost").withClientName("hello").build();
 
         assertThat(result.getHost()).isEqualTo("localhost");
         assertThat(result.getClientName()).isEqualTo("hello");
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void redisHostAndPortWithInvalidPort() throws Exception {
-        RedisURI.Builder.redis("localhost", -1);
+    @Test
+    void redisHostAndPortWithInvalidPort() {
+        assertThatThrownBy(() -> RedisURI.Builder.redis("localhost", -1)).isInstanceOf(IllegalArgumentException. class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void redisWithInvalidPort() throws Exception {
-        RedisURI.Builder.redis("localhost").withPort(65536);
+    @Test
+    void redisWithInvalidPort() {
+        assertThatThrownBy(() -> RedisURI.Builder.redis("localhost").withPort(65536)).isInstanceOf(IllegalArgumentException. class);
     }
 
     @Test
-    public void redisFromUrl() throws Exception {
+    void redisFromUrl() {
         RedisURI result = RedisURI.create(RedisURI.URI_SCHEME_REDIS + "://password@localhost/21");
 
         assertThat(result.getSentinels()).isEmpty();
@@ -100,7 +102,7 @@ public void redisFromUrl() throws Exception {
     }
 
     @Test
-    public void redisFromUrlNoPassword() throws Exception {
+    void redisFromUrlNoPassword() {
         RedisURI redisURI = RedisURI.create("redis://localhost:1234/5");
         assertThat(redisURI.getPassword()).isNull();
 
@@ -109,13 +111,13 @@ public void redisFromUrlNoPassword() throws Exception {
     }
 
     @Test
-    public void redisFromUrlPassword() throws Exception {
+    void redisFromUrlPassword() {
         RedisURI redisURI = RedisURI.create("redis://h:password@localhost.com:14589");
         assertThat(redisURI.getPassword()).isEqualTo("password".toCharArray());
     }
 
     @Test
-    public void redisWithSSL() throws Exception {
+    void redisWithSSL() {
         RedisURI result = RedisURI.Builder.redis("localhost").withSsl(true).withStartTls(true).build();
 
         assertThat(result.getSentinels()).isEmpty();
@@ -125,7 +127,7 @@ public void redisWithSSL() throws Exception {
     }
 
     @Test
-    public void redisSslFromUrl() throws Exception {
+    void redisSslFromUrl() {
         RedisURI result = RedisURI.create(RedisURI.URI_SCHEME_REDIS_SECURE + "://:password@localhost/1");
 
         assertThat(result.getSentinels()).isEmpty();
@@ -136,7 +138,7 @@ public void redisSslFromUrl() throws Exception {
     }
 
     @Test
-    public void redisSentinelFromUrl() throws Exception {
+    void redisSentinelFromUrl() {
         RedisURI result = RedisURI.create(RedisURI.URI_SCHEME_REDIS_SENTINEL + "://password@localhost/1#master");
 
         assertThat(result.getSentinels()).hasSize(1);
@@ -168,38 +170,38 @@ public void redisSentinelFromUrl() throws Exception {
 
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void redisSentinelWithInvalidPort() throws Exception {
-        RedisURI.Builder.sentinel("a", 65536);
+    @Test
+    void redisSentinelWithInvalidPort() {
+        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 65536)).isInstanceOf(IllegalArgumentException. class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void redisSentinelWithMasterIdAndInvalidPort() throws Exception {
-        RedisURI.Builder.sentinel("a", 65536, "");
+    @Test
+    void redisSentinelWithMasterIdAndInvalidPort() {
+        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 65536, "")).isInstanceOf(IllegalArgumentException. class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void redisSentinelWithNullMasterId() throws Exception {
-        RedisURI.Builder.sentinel("a", 1, null);
+    @Test
+    void redisSentinelWithNullMasterId() {
+        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 1, null)).isInstanceOf(IllegalArgumentException. class);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void redisSentinelWithSSLNotPossible() throws Exception {
-        RedisURI.Builder.sentinel("a", 1, "master").withSsl(true);
+    @Test
+    void redisSentinelWithSSLNotPossible() {
+        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 1, "master").withSsl(true)).isInstanceOf(IllegalStateException. class);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void redisSentinelWithTLSNotPossible() throws Exception {
-        RedisURI.Builder.sentinel("a", 1, "master").withStartTls(true);
+    @Test
+    void redisSentinelWithTLSNotPossible() {
+        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 1, "master").withStartTls(true)).isInstanceOf(IllegalStateException. class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void invalidScheme() throws Exception {
-        RedisURI.create("http://www.web.de");
+    @Test
+    void invalidScheme() {
+        assertThatThrownBy(() -> RedisURI.create("http://www.web.de")).isInstanceOf(IllegalArgumentException. class);
     }
 
     @Test
-    public void redisSocket() throws Exception {
+    void redisSocket() throws IOException {
         File file = new File("work/socket-6479").getCanonicalFile();
         RedisURI result = RedisURI.create(RedisURI.URI_SCHEME_REDIS_SOCKET + "://" + file.getCanonicalPath());
 
@@ -212,7 +214,7 @@ public void redisSocket() throws Exception {
     }
 
     @Test
-    public void redisSocketWithPassword() throws Exception {
+    void redisSocketWithPassword() throws IOException {
         File file = new File("work/socket-6479").getCanonicalFile();
         RedisURI result = RedisURI.create(RedisURI.URI_SCHEME_REDIS_SOCKET + "://password@" + file.getCanonicalPath());
 
diff --git a/src/test/java/io/lettuce/core/RedisURITest.java b/src/test/java/io/lettuce/core/RedisURIUnitTests.java
similarity index 90%
rename from src/test/java/io/lettuce/core/RedisURITest.java
rename to src/test/java/io/lettuce/core/RedisURIUnitTests.java
index 760ee5e941..e9708962c0 100644
--- a/src/test/java/io/lettuce/core/RedisURITest.java
+++ b/src/test/java/io/lettuce/core/RedisURIUnitTests.java
@@ -16,6 +16,7 @@
 package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.time.Duration;
 import java.util.LinkedHashMap;
@@ -23,17 +24,17 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.internal.LettuceSets;
 
 /**
  * @author Mark Paluch
  */
-public class RedisURITest {
+class RedisURIUnitTests {
 
     @Test
-    public void equalsTest() {
+    void equalsTest() {
 
         RedisURI redisURI1 = RedisURI.create("redis://auth@localhost:1234/5");
         RedisURI redisURI2 = RedisURI.create("redis://auth@localhost:1234/5");
@@ -48,7 +49,7 @@ public void equalsTest() {
     }
 
     @Test
-    public void setUsage() {
+    void setUsage() {
 
         RedisURI redisURI1 = RedisURI.create("redis://auth@localhost:1234/5");
         RedisURI redisURI2 = RedisURI.create("redis://auth@localhost:1234/5");
@@ -60,7 +61,7 @@ public void setUsage() {
     }
 
     @Test
-    public void mapUsage() {
+    void mapUsage() {
 
         RedisURI redisURI1 = RedisURI.create("redis://auth@localhost:1234/5");
         RedisURI redisURI2 = RedisURI.create("redis://auth@localhost:1234/5");
@@ -72,36 +73,36 @@ public void mapUsage() {
     }
 
     @Test
-    public void simpleUriTest() {
+    void simpleUriTest() {
         RedisURI redisURI = RedisURI.create("redis://localhost:6379");
         assertThat(redisURI.toURI().toString()).isEqualTo("redis://localhost");
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldThrowIllegalArgumentExceptionOnMalformedUri() {
-        RedisURI.create("localhost");
+    @Test
+    void shouldThrowIllegalArgumentExceptionOnMalformedUri() {
+        assertThatThrownBy(() -> RedisURI.create("localhost")).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void sslUriTest() {
+    void sslUriTest() {
         RedisURI redisURI = RedisURI.create("redis+ssl://localhost:6379");
         assertThat(redisURI.toURI().toString()).isEqualTo("rediss://localhost:6379");
     }
 
     @Test
-    public void tlsUriTest() {
+    void tlsUriTest() {
         RedisURI redisURI = RedisURI.create("redis+tls://localhost:6379");
         assertThat(redisURI.toURI().toString()).isEqualTo("redis+tls://localhost:6379");
     }
 
     @Test
-    public void multipleClusterNodesTest() {
+    void multipleClusterNodesTest() {
         RedisURI redisURI = RedisURI.create("redis+ssl://password@host1:6379,host2:6380");
         assertThat(redisURI.toURI().toString()).isEqualTo("rediss://password@host1:6379,host2:6380");
     }
 
     @Test
-    public void sentinelEqualsTest() {
+    void sentinelEqualsTest() {
 
         RedisURI redisURI1 = RedisURI.create("redis-sentinel://auth@h1:222,h2,h3:1234/5?sentinelMasterId=masterId");
         RedisURI redisURI2 = RedisURI.create("redis-sentinel://auth@h1:222,h2,h3:1234/5#masterId");
@@ -116,7 +117,7 @@ public void sentinelEqualsTest() {
     }
 
     @Test
-    public void sentinelUriTest() {
+    void sentinelUriTest() {
 
         RedisURI redisURI = RedisURI.create("redis-sentinel://auth@h1:222,h2,h3:1234/5?sentinelMasterId=masterId");
         assertThat(redisURI.getSentinelMasterId()).isEqualTo("masterId");
@@ -130,7 +131,7 @@ public void sentinelUriTest() {
     }
 
     @Test
-    public void socketEqualsTest() {
+    void socketEqualsTest() {
 
         RedisURI redisURI1 = RedisURI.create("redis-socket:///var/tmp/socket");
         RedisURI redisURI2 = RedisURI.create("redis-socket:///var/tmp/socket");
@@ -145,7 +146,7 @@ public void socketEqualsTest() {
     }
 
     @Test
-    public void socketUriTest() {
+    void socketUriTest() {
 
         RedisURI redisURI = RedisURI.create("redis-socket:///var/tmp/other-socket?db=2");
 
@@ -155,7 +156,7 @@ public void socketUriTest() {
     }
 
     @Test
-    public void socketAltUriTest() {
+    void socketAltUriTest() {
 
         RedisURI redisURI = RedisURI.create("redis+socket:///var/tmp/other-socket?db=2");
 
@@ -165,7 +166,7 @@ public void socketAltUriTest() {
     }
 
     @Test
-    public void timeoutParsingTest() {
+    void timeoutParsingTest() {
 
         checkUriTimeout("redis://auth@localhost:1234/5?timeout=5000", 5000, TimeUnit.MILLISECONDS);
         checkUriTimeout("redis://auth@localhost:1234/5?timeout=5000ms", 5000, TimeUnit.MILLISECONDS);
@@ -187,7 +188,7 @@ public void timeoutParsingTest() {
     }
 
     @Test
-    public void queryStringDecodingTest() {
+    void queryStringDecodingTest() {
         String timeout = "%74%69%6D%65%6F%75%74";
         String eq = "%3d";
         String s = "%73";
@@ -195,7 +196,7 @@ public void queryStringDecodingTest() {
     }
 
     @Test
-    public void timeoutParsingWithJunkParamTest() {
+    void timeoutParsingWithJunkParamTest() {
         RedisURI redisURI1 = RedisURI.create("redis-sentinel://auth@localhost:1234/5?timeout=5s;junkparam=#master-instance");
         assertThat(redisURI1.getTimeout()).isEqualTo(Duration.ofSeconds(5));
         assertThat(redisURI1.getSentinelMasterId()).isEqualTo("master-instance");
@@ -208,7 +209,7 @@ private RedisURI checkUriTimeout(String uri, long expectedTimeout, TimeUnit expe
     }
 
     @Test
-    public void databaseParsingTest() {
+    void databaseParsingTest() {
         RedisURI redisURI = RedisURI.create("redis://auth@localhost:1234/?database=21");
         assertThat(redisURI.getDatabase()).isEqualTo(21);
 
@@ -216,7 +217,7 @@ public void databaseParsingTest() {
     }
 
     @Test
-    public void clientNameParsingTest() {
+    void clientNameParsingTest() {
         RedisURI redisURI = RedisURI.create("redis://auth@localhost:1234/?clientName=hello");
         assertThat(redisURI.getClientName()).isEqualTo("hello");
 
@@ -224,7 +225,7 @@ public void clientNameParsingTest() {
     }
 
     @Test
-    public void parsingWithInvalidValuesTest() {
+    void parsingWithInvalidValuesTest() {
         RedisURI redisURI = RedisURI
                 .create("redis://@host:1234/?database=AAA&database=&timeout=&timeout=XYZ&sentinelMasterId=");
         assertThat(redisURI.getDatabase()).isEqualTo(0);
diff --git a/src/test/java/io/lettuce/core/ScanArgsTest.java b/src/test/java/io/lettuce/core/ScanArgsUnitTests.java
similarity index 91%
rename from src/test/java/io/lettuce/core/ScanArgsTest.java
rename to src/test/java/io/lettuce/core/ScanArgsUnitTests.java
index d398542813..69d87d65ee 100644
--- a/src/test/java/io/lettuce/core/ScanArgsTest.java
+++ b/src/test/java/io/lettuce/core/ScanArgsUnitTests.java
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.protocol.CommandArgs;
@@ -25,10 +25,10 @@
 /**
  * @author Mark Paluch
  */
-public class ScanArgsTest {
+class ScanArgsUnitTests {
 
     @Test
-    public void shouldEncodeMatchUsingUtf8() {
+    void shouldEncodeMatchUsingUtf8() {
 
         ScanArgs args = ScanArgs.Builder.matches("ö");
 
diff --git a/src/test/java/io/lettuce/core/ScanCursorTest.java b/src/test/java/io/lettuce/core/ScanCursorUnitTests.java
similarity index 63%
rename from src/test/java/io/lettuce/core/ScanCursorTest.java
rename to src/test/java/io/lettuce/core/ScanCursorUnitTests.java
index ab021cc08b..4c1e43ab2d 100644
--- a/src/test/java/io/lettuce/core/ScanCursorTest.java
+++ b/src/test/java/io/lettuce/core/ScanCursorUnitTests.java
@@ -16,25 +16,29 @@
 package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ScanCursorTest {
+/**
+ * @author Mark Paluch
+ */
+class ScanCursorUnitTests {
 
     @Test
-    public void testFactory() throws Exception {
+    void testFactory() {
         ScanCursor scanCursor = ScanCursor.of("dummy");
         assertThat(scanCursor.getCursor()).isEqualTo("dummy");
         assertThat(scanCursor.isFinished()).isFalse();
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void setCursorOnImmutableInstance() throws Exception {
-        ScanCursor.INITIAL.setCursor("");
+    @Test
+    void setCursorOnImmutableInstance() {
+        assertThatThrownBy(() -> ScanCursor.INITIAL.setCursor("")).isInstanceOf(UnsupportedOperationException.class);
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void setFinishedOnImmutableInstance() throws Exception {
-        ScanCursor.INITIAL.setFinished(false);
+    @Test
+    void setFinishedOnImmutableInstance() {
+        assertThatThrownBy(() -> ScanCursor.INITIAL.setFinished(false)).isInstanceOf(UnsupportedOperationException.class);
     }
 }
diff --git a/src/test/java/io/lettuce/core/ScanIteratorTest.java b/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java
similarity index 84%
rename from src/test/java/io/lettuce/core/ScanIteratorTest.java
rename to src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java
index e61829907f..1e0834c03e 100644
--- a/src/test/java/io/lettuce/core/ScanIteratorTest.java
+++ b/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java
@@ -23,17 +23,33 @@
 import java.util.NoSuchElementException;
 import java.util.stream.Collectors;
 
-import org.junit.Test;
+import javax.inject.Inject;
 
-import io.lettuce.KeysAndValues;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.KeysAndValues;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class ScanIteratorTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+class ScanIteratorIntegrationTests extends TestSupport {
+
+    private final StatefulRedisConnection<String, String> connection;
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    ScanIteratorIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        this.connection = connection;
+        this.redis = connection.sync();
+    }
 
     @Test
-    public void scanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
+    void scanShouldThrowNoSuchElementExceptionOnEmpty() {
 
         redis.mset(KeysAndValues.MAP);
 
@@ -49,7 +65,7 @@ public void scanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
     }
 
     @Test
-    public void keysSinglePass() throws Exception {
+    void keysSinglePass() {
 
         redis.mset(KeysAndValues.MAP);
 
@@ -67,7 +83,7 @@ public void keysSinglePass() throws Exception {
     }
 
     @Test
-    public void keysMultiPass() throws Exception {
+    void keysMultiPass() {
 
         redis.mset(KeysAndValues.MAP);
 
@@ -79,7 +95,7 @@ public void keysMultiPass() throws Exception {
     }
 
     @Test
-    public void hscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
+    void hscanShouldThrowNoSuchElementExceptionOnEmpty() {
 
         redis.mset(KeysAndValues.MAP);
 
@@ -96,7 +112,7 @@ public void hscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
     }
 
     @Test
-    public void hashSinglePass() throws Exception {
+    void hashSinglePass() {
 
         redis.hmset(key, KeysAndValues.MAP);
 
@@ -115,7 +131,7 @@ public void hashSinglePass() throws Exception {
     }
 
     @Test
-    public void hashMultiPass() throws Exception {
+    void hashMultiPass() {
 
         redis.hmset(key, KeysAndValues.MAP);
 
@@ -128,7 +144,7 @@ public void hashMultiPass() throws Exception {
     }
 
     @Test
-    public void sscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
+    void sscanShouldThrowNoSuchElementExceptionOnEmpty() {
 
         redis.sadd(key, KeysAndValues.VALUES.toArray(new String[0]));
 
@@ -145,7 +161,7 @@ public void sscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
     }
 
     @Test
-    public void setSinglePass() throws Exception {
+    void setSinglePass() {
 
         redis.sadd(key, KeysAndValues.KEYS.toArray(new String[0]));
 
@@ -164,7 +180,7 @@ public void setSinglePass() throws Exception {
     }
 
     @Test
-    public void setMultiPass() throws Exception {
+    void setMultiPass() {
 
         redis.sadd(key, KeysAndValues.KEYS.toArray(new String[0]));
 
@@ -176,7 +192,7 @@ public void setMultiPass() throws Exception {
     }
 
     @Test
-    public void zscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
+    void zscanShouldThrowNoSuchElementExceptionOnEmpty() {
 
         for (int i = 0; i < KeysAndValues.COUNT; i++) {
             redis.zadd(key, ScoredValue.just(i, KeysAndValues.KEYS.get(i)));
@@ -196,7 +212,7 @@ public void zscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
     }
 
     @Test
-    public void zsetSinglePass() throws Exception {
+    void zsetSinglePass() {
 
         for (int i = 0; i < KeysAndValues.COUNT; i++) {
             redis.zadd(key, ScoredValue.just(i, KeysAndValues.KEYS.get(i)));
@@ -217,7 +233,7 @@ public void zsetSinglePass() throws Exception {
     }
 
     @Test
-    public void zsetMultiPass() throws Exception {
+    void zsetMultiPass() {
 
         List<ScoredValue<String>> expected = new ArrayList<>();
         for (int i = 0; i < KeysAndValues.COUNT; i++) {
diff --git a/src/test/java/io/lettuce/core/ScanStreamTest.java b/src/test/java/io/lettuce/core/ScanStreamTest.java
index 0c509bb79f..cdf9ac5053 100644
--- a/src/test/java/io/lettuce/core/ScanStreamTest.java
+++ b/src/test/java/io/lettuce/core/ScanStreamTest.java
@@ -18,19 +18,35 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
+import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.reactive.RedisReactiveCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class ScanStreamTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+class ScanStreamTest extends TestSupport {
+
+    private final StatefulRedisConnection<String, String> connection;
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    ScanStreamTest(StatefulRedisConnection<String, String> connection) {
+        this.connection = connection;
+        this.redis = connection.sync();
+    }
 
     @Test
-    public void shouldScanIteratively() {
+    void shouldScanIteratively() {
 
         for (int i = 0; i < 1000; i++) {
             redis.set("key-" + i, value);
@@ -46,7 +62,7 @@ public void shouldScanIteratively() {
     }
 
     @Test
-    public void shouldHscanIteratively() {
+    void shouldHscanIteratively() {
 
         for (int i = 0; i < 1000; i++) {
             redis.hset(key, "field-" + i, "value-" + i);
@@ -60,7 +76,7 @@ public void shouldHscanIteratively() {
     }
 
     @Test
-    public void shouldSscanIteratively() {
+    void shouldSscanIteratively() {
 
         for (int i = 0; i < 1000; i++) {
             redis.sadd(key, "value-" + i);
@@ -75,7 +91,7 @@ public void shouldSscanIteratively() {
     }
 
     @Test
-    public void shouldZscanIteratively() {
+    void shouldZscanIteratively() {
 
         for (int i = 0; i < 1000; i++) {
             redis.zadd(key, (double) i, "value-" + i);
diff --git a/src/test/java/io/lettuce/core/ScoredValueTest.java b/src/test/java/io/lettuce/core/ScoredValueUnitTests.java
similarity index 81%
rename from src/test/java/io/lettuce/core/ScoredValueTest.java
rename to src/test/java/io/lettuce/core/ScoredValueUnitTests.java
index 00a2c7a587..8fe56d7b1c 100644
--- a/src/test/java/io/lettuce/core/ScoredValueTest.java
+++ b/src/test/java/io/lettuce/core/ScoredValueUnitTests.java
@@ -17,20 +17,21 @@
 package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.offset;
 
 import java.util.Optional;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class ScoredValueTest {
+class ScoredValueUnitTests {
 
     @Test
-    public void shouldCreateEmptyScoredValueFromOptional() {
+    void shouldCreateEmptyScoredValueFromOptional() {
 
         ScoredValue<String> value = ScoredValue.from(42, Optional.<String> empty());
 
@@ -38,7 +39,7 @@ public void shouldCreateEmptyScoredValueFromOptional() {
     }
 
     @Test
-    public void shouldCreateEmptyValue() {
+    void shouldCreateEmptyValue() {
 
         ScoredValue<String> value = ScoredValue.empty();
 
@@ -46,7 +47,7 @@ public void shouldCreateEmptyValue() {
     }
 
     @Test
-    public void shouldCreateNonEmptyValueFromOptional() {
+    void shouldCreateNonEmptyValueFromOptional() {
 
         ScoredValue<String> value = ScoredValue.from(4.2, Optional.of("hello"));
 
@@ -56,7 +57,7 @@ public void shouldCreateNonEmptyValueFromOptional() {
     }
 
     @Test
-    public void shouldCreateEmptyValueFromValue() {
+    void shouldCreateEmptyValueFromValue() {
 
         ScoredValue<String> value = ScoredValue.fromNullable(42, null);
 
@@ -64,7 +65,7 @@ public void shouldCreateEmptyValueFromValue() {
     }
 
     @Test
-    public void shouldCreateNonEmptyValueFromValue() {
+    void shouldCreateNonEmptyValueFromValue() {
 
         ScoredValue<String> value = ScoredValue.fromNullable(42, "hello");
 
@@ -73,7 +74,7 @@ public void shouldCreateNonEmptyValueFromValue() {
     }
 
     @Test
-    public void justShouldCreateValueFromValue() {
+    void justShouldCreateValueFromValue() {
 
         ScoredValue<String> value = ScoredValue.just(42, "hello");
 
@@ -81,13 +82,13 @@ public void justShouldCreateValueFromValue() {
         assertThat(value.getValue()).isEqualTo("hello");
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void justShouldRejectEmptyValueFromValue() {
-        Value.just(null);
+    @Test
+    void justShouldRejectEmptyValueFromValue() {
+        assertThatThrownBy(() -> ScoredValue.just(null)).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void shouldCreateNonEmptyValue() {
+    void shouldCreateNonEmptyValue() {
 
         ScoredValue<String> value = ScoredValue.from(12, Optional.of("hello"));
 
@@ -96,7 +97,7 @@ public void shouldCreateNonEmptyValue() {
     }
 
     @Test
-    public void equals() throws Exception {
+    void equals() {
         ScoredValue<String> sv1 = ScoredValue.fromNullable(1.0, "a");
         assertThat(sv1.equals(ScoredValue.fromNullable(1.0, "a"))).isTrue();
         assertThat(sv1.equals(null)).isFalse();
@@ -105,14 +106,14 @@ public void equals() throws Exception {
     }
 
     @Test
-    public void testHashCode() throws Exception {
+    void testHashCode() {
         assertThat(ScoredValue.fromNullable(1.0, "a").hashCode() != 0).isTrue();
         assertThat(ScoredValue.fromNullable(0.0, "a").hashCode() != 0).isTrue();
         assertThat(ScoredValue.fromNullable(0.0, null).hashCode() == 0).isTrue();
     }
 
     @Test
-    public void toStringShouldRenderCorrectly() {
+    void toStringShouldRenderCorrectly() {
 
         ScoredValue<String> value = ScoredValue.from(12.34, Optional.of("hello"));
         ScoredValue<String> empty = ScoredValue.fromNullable(34, null);
diff --git a/src/test/java/io/lettuce/core/SocketOptionsTest.java b/src/test/java/io/lettuce/core/SocketOptionsIntegrationTests.java
similarity index 62%
rename from src/test/java/io/lettuce/core/SocketOptionsTest.java
rename to src/test/java/io/lettuce/core/SocketOptionsIntegrationTests.java
index 826f384488..0daa07e6df 100644
--- a/src/test/java/io/lettuce/core/SocketOptionsTest.java
+++ b/src/test/java/io/lettuce/core/SocketOptionsIntegrationTests.java
@@ -19,47 +19,31 @@
 import static org.assertj.core.api.Assertions.fail;
 
 import java.net.SocketException;
-import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import javax.inject.Inject;
 
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.lettuce.test.LettuceExtension;
 import io.netty.channel.ConnectTimeoutException;
 
 /**
  * @author Mark Paluch
  */
-public class SocketOptionsTest extends AbstractRedisClientTest {
-
-    @Test
-    public void testNew() throws Exception {
-        checkAssertions(SocketOptions.create());
-    }
-
-    @Test
-    public void testBuilder() throws Exception {
+@ExtendWith(LettuceExtension.class)
+class SocketOptionsIntegrationTests extends TestSupport {
 
-        SocketOptions sut = SocketOptions.builder().connectTimeout(1, TimeUnit.MINUTES).keepAlive(true).tcpNoDelay(true)
-                .build();
+    private final RedisClient client;
 
-        assertThat(sut.isKeepAlive()).isEqualTo(true);
-        assertThat(sut.isTcpNoDelay()).isEqualTo(true);
-        assertThat(sut.getConnectTimeout()).isEqualTo(Duration.ofMinutes(1));
+    @Inject
+    SocketOptionsIntegrationTests(RedisClient client) {
+        this.client = client;
     }
 
     @Test
-    public void testCopy() throws Exception {
-        checkAssertions(SocketOptions.copyOf(SocketOptions.builder().build()));
-    }
-
-    protected void checkAssertions(SocketOptions sut) {
-        assertThat(sut.isKeepAlive()).isEqualTo(false);
-        assertThat(sut.isTcpNoDelay()).isEqualTo(false);
-        assertThat(sut.getConnectTimeout()).isEqualTo(Duration.ofSeconds(10));
-    }
-
-    @Test(timeout = 1000)
-    public void testConnectTimeout() {
+    void testConnectTimeout() {
 
         SocketOptions socketOptions = SocketOptions.builder().connectTimeout(100, TimeUnit.MILLISECONDS).build();
         client.setOptions(ClientOptions.builder().socketOptions(socketOptions).build());
diff --git a/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java b/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java
new file mode 100644
index 0000000000..5da60a5d6c
--- /dev/null
+++ b/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author Mark Paluch
+ */
+class SocketOptionsUnitTests {
+
+    @Test
+    void testNew() {
+        checkAssertions(SocketOptions.create());
+    }
+
+    @Test
+    void testBuilder() {
+
+        SocketOptions sut = SocketOptions.builder().connectTimeout(1, TimeUnit.MINUTES).keepAlive(true).tcpNoDelay(true)
+                .build();
+
+        assertThat(sut.isKeepAlive()).isEqualTo(true);
+        assertThat(sut.isTcpNoDelay()).isEqualTo(true);
+        assertThat(sut.getConnectTimeout()).isEqualTo(Duration.ofMinutes(1));
+    }
+
+    @Test
+    void testCopy() {
+        checkAssertions(SocketOptions.copyOf(SocketOptions.builder().build()));
+    }
+
+    void checkAssertions(SocketOptions sut) {
+        assertThat(sut.isKeepAlive()).isEqualTo(false);
+        assertThat(sut.isTcpNoDelay()).isEqualTo(false);
+        assertThat(sut.getConnectTimeout()).isEqualTo(Duration.ofSeconds(10));
+    }
+}
diff --git a/src/test/java/io/lettuce/SslTest.java b/src/test/java/io/lettuce/core/SslIntegrationTests.java
similarity index 71%
rename from src/test/java/io/lettuce/SslTest.java
rename to src/test/java/io/lettuce/core/SslIntegrationTests.java
index 83b15f0dc1..f251357c8d 100644
--- a/src/test/java/io/lettuce/SslTest.java
+++ b/src/test/java/io/lettuce/core/SslIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce;
+package io.lettuce.core;
 
-import static io.lettuce.core.TestSettings.host;
-import static io.lettuce.core.TestSettings.sslPort;
+import static io.lettuce.test.settings.TestSettings.host;
+import static io.lettuce.test.settings.TestSettings.sslPort;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.io.File;
 import java.net.MalformedURLException;
@@ -27,23 +27,24 @@
 import java.security.cert.CertificateException;
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import org.junit.*;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.masterslave.MasterSlave;
 import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
 import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands;
-import io.netty.channel.group.ChannelGroup;
+import io.lettuce.test.*;
 import io.netty.handler.codec.DecoderException;
 import io.netty.handler.ssl.OpenSsl;
 
@@ -53,7 +54,8 @@
  * @author Mark Paluch
  * @author Adam McElwee
  */
-public class SslTest extends AbstractTest {
+@ExtendWith(LettuceExtension.class)
+class SslIntegrationTests extends TestSupport {
 
     private static final String KEYSTORE = "work/keystore.jks";
     private static final String TRUSTSTORE = "work/truststore.jks";
@@ -84,37 +86,22 @@ public class SslTest extends AbstractTest {
     private static final List<RedisURI> MASTER_SLAVE_URIS_WITH_ALL_INVALID = sslUris(IntStream.of(2, 3),
             builder -> builder.withVerifyPeer(true));
 
-    private static RedisClient redisClient;
-
-    @BeforeClass
-    public static void beforeClass() {
-
-        assumeTrue("Assume that stunnel runs on port 6443", Sockets.isOpen(host(), sslPort()));
-        assertThat(TRUSTSTORE_FILE).exists();
-
-        redisClient = RedisClient.create(TestClientResources.get());
-    }
+    private final RedisClient redisClient;
 
-    @Before
-    public void before() {
-        redisClient.setOptions(ClientOptions.create());
+    @Inject
+    SslIntegrationTests(RedisClient redisClient) {
+        this.redisClient = redisClient;
     }
 
-    @After
-    public void tearDown() {
+    @BeforeAll
+    static void beforeClass() {
 
-        ChannelGroup group = (ChannelGroup) ReflectionTestUtils.getField(redisClient, "channels");
-
-        assertThat((Iterable) group).as("Test completed without connection cleanup").isEmpty();
-    }
-
-    @AfterClass
-    public static void afterClass() {
-        FastShutdown.shutdown(redisClient);
+        assumeTrue(Sockets.isOpen(host(), sslPort()), "Assume that stunnel runs on port 6443");
+        assertThat(TRUSTSTORE_FILE).exists();
     }
 
     @Test
-    public void standaloneWithSsl() {
+    void standaloneWithSsl() {
 
         RedisCommands<String, String> connection = redisClient.connect(URI_NO_VERIFY).sync();
         connection.set("key", "value");
@@ -123,7 +110,7 @@ public void standaloneWithSsl() {
     }
 
     @Test
-    public void standaloneWithJdkSsl() {
+    void standaloneWithJdkSsl() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
@@ -135,7 +122,7 @@ public void standaloneWithJdkSsl() {
     }
 
     @Test
-    public void standaloneWithJdkSslUsingTruststoreUrl() throws Exception {
+    void standaloneWithJdkSslUsingTruststoreUrl() throws Exception {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
@@ -147,7 +134,7 @@ public void standaloneWithJdkSslUsingTruststoreUrl() throws Exception {
     }
 
     @Test
-    public void standaloneWithClientCertificates() throws Exception {
+    void standaloneWithClientCertificates() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
@@ -159,8 +146,8 @@ public void standaloneWithClientCertificates() throws Exception {
         verifyConnection(URI_CLIENT_CERT_AUTH);
     }
 
-    @Test(expected = RedisConnectionException.class)
-    public void standaloneWithClientCertificatesWithoutKeystore() throws Exception {
+    @Test
+    void standaloneWithClientCertificatesWithoutKeystore() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
@@ -168,11 +155,11 @@ public void standaloneWithClientCertificatesWithoutKeystore() throws Exception {
                 .build();
         setOptions(sslOptions);
 
-        verifyConnection(URI_CLIENT_CERT_AUTH);
+        assertThatThrownBy(() -> verifyConnection(URI_CLIENT_CERT_AUTH)).isInstanceOf(RedisConnectionException.class);
     }
 
-    @Test(expected = RedisConnectionException.class)
-    public void standaloneWithJdkSslUsingTruststoreUrlWithWrongPassword() throws Exception {
+    @Test
+    void standaloneWithJdkSslUsingTruststoreUrlWithWrongPassword() throws Exception {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
@@ -180,22 +167,22 @@ public void standaloneWithJdkSslUsingTruststoreUrlWithWrongPassword() throws Exc
                 .build();
         setOptions(sslOptions);
 
-        verifyConnection(URI_VERIFY);
+        assertThatThrownBy(() -> verifyConnection(URI_VERIFY)).isInstanceOf(RedisConnectionException.class);
     }
 
-    @Test(expected = RedisConnectionException.class)
-    public void standaloneWithJdkSslFailsWithWrongTruststore() {
+    @Test
+    void standaloneWithJdkSslFailsWithWrongTruststore() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
                 .build();
         setOptions(sslOptions);
 
-        verifyConnection(URI_VERIFY);
+        assertThatThrownBy(() -> verifyConnection(URI_VERIFY)).isInstanceOf(RedisConnectionException.class);
     }
 
     @Test
-    public void standaloneWithOpenSsl() {
+    void standaloneWithOpenSsl() {
 
         assumeTrue(OpenSsl.isAvailable());
 
@@ -208,8 +195,8 @@ public void standaloneWithOpenSsl() {
         verifyConnection(URI_VERIFY);
     }
 
-    @Test(expected = RedisConnectionException.class)
-    public void standaloneWithOpenSslFailsWithWrongTruststore() {
+    @Test
+    void standaloneWithOpenSslFailsWithWrongTruststore() {
 
         assumeTrue(OpenSsl.isAvailable());
 
@@ -218,11 +205,11 @@ public void standaloneWithOpenSslFailsWithWrongTruststore() {
                 .build();
         setOptions(sslOptions);
 
-        verifyConnection(URI_VERIFY);
+        assertThatThrownBy(() -> verifyConnection(URI_VERIFY)).isInstanceOf(RedisConnectionException.class);
     }
 
     @Test
-    public void pingBeforeActivate() {
+    void pingBeforeActivate() {
 
         redisClient.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
 
@@ -230,7 +217,7 @@ public void pingBeforeActivate() {
     }
 
     @Test
-    public void regularSslWithReconnect() throws Exception {
+    void regularSslWithReconnect() throws Exception {
 
         RedisCommands<String, String> connection = redisClient.connect(URI_NO_VERIFY).sync();
         connection.quit();
@@ -239,15 +226,16 @@ public void regularSslWithReconnect() throws Exception {
         connection.getStatefulConnection().close();
     }
 
-    @Test(expected = RedisConnectionException.class)
-    public void sslWithVerificationWillFail() {
+    @Test
+    void sslWithVerificationWillFail() {
 
         RedisURI redisUri = RedisURI.create("rediss://" + host() + ":" + sslPort());
-        redisClient.connect(redisUri).sync();
+
+        assertThatThrownBy(() -> redisClient.connect(redisUri).sync()).isInstanceOf(RedisConnectionException.class);
     }
 
     @Test
-    public void masterSlaveWithSsl() {
+    void masterSlaveWithSsl() {
 
         RedisCommands<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8,
                 MASTER_SLAVE_URIS_NO_VERIFY).sync();
@@ -257,7 +245,7 @@ public void masterSlaveWithSsl() {
     }
 
     @Test
-    public void masterSlaveWithJdkSsl() {
+    void masterSlaveWithJdkSsl() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
@@ -269,7 +257,7 @@ public void masterSlaveWithJdkSsl() {
     }
 
     @Test
-    public void masterSlaveWithJdkSslUsingTruststoreUrl() throws Exception {
+    void masterSlaveWithJdkSslUsingTruststoreUrl() throws Exception {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
@@ -280,8 +268,8 @@ public void masterSlaveWithJdkSslUsingTruststoreUrl() throws Exception {
         verifyMasterSlaveConnection(MASTER_SLAVE_URIS_VERIFY);
     }
 
-    @Test(expected = RedisConnectionException.class)
-    public void masterSlaveWithJdkSslUsingTruststoreUrlWithWrongPassword() throws Exception {
+    @Test
+    void masterSlaveWithJdkSslUsingTruststoreUrlWithWrongPassword() throws Exception {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
@@ -289,22 +277,24 @@ public void masterSlaveWithJdkSslUsingTruststoreUrlWithWrongPassword() throws Ex
                 .build();
         setOptions(sslOptions);
 
-        verifyMasterSlaveConnection(MASTER_SLAVE_URIS_VERIFY);
+        assertThatThrownBy(() -> verifyMasterSlaveConnection(MASTER_SLAVE_URIS_VERIFY)).isInstanceOf(
+                RedisConnectionException.class);
     }
 
-    @Test(expected = RedisConnectionException.class)
-    public void masterSlaveWithJdkSslFailsWithWrongTruststore() {
+    @Test
+    void masterSlaveWithJdkSslFailsWithWrongTruststore() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
                 .build();
         setOptions(sslOptions);
 
-        verifyMasterSlaveConnection(MASTER_SLAVE_URIS_VERIFY);
+        assertThatThrownBy(() -> verifyMasterSlaveConnection(MASTER_SLAVE_URIS_VERIFY)).isInstanceOf(
+                RedisConnectionException.class);
     }
 
     @Test
-    public void masterSlavePingBeforeActivate() {
+    void masterSlavePingBeforeActivate() {
 
         redisClient.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
 
@@ -312,7 +302,7 @@ public void masterSlavePingBeforeActivate() {
     }
 
     @Test
-    public void masterSlaveSslWithReconnect() throws Exception {
+    void masterSlaveSslWithReconnect() throws Exception {
         RedisCommands<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8,
                 MASTER_SLAVE_URIS_NO_VERIFY).sync();
         connection.quit();
@@ -321,13 +311,14 @@ public void masterSlaveSslWithReconnect() throws Exception {
         connection.getStatefulConnection().close();
     }
 
-    @Test(expected = RedisConnectionException.class)
-    public void masterSlaveSslWithVerificationWillFail() {
-        MasterSlave.connect(redisClient, StringCodec.UTF8, MASTER_SLAVE_URIS_VERIFY);
+    @Test
+    void masterSlaveSslWithVerificationWillFail() {
+        assertThatThrownBy(() -> MasterSlave.connect(redisClient, StringCodec.UTF8, MASTER_SLAVE_URIS_VERIFY)).isInstanceOf(
+                RedisConnectionException.class);
     }
 
     @Test
-    public void masterSlaveSslWithOneInvalidHostWillSucceed() {
+    void masterSlaveSslWithOneInvalidHostWillSucceed() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
@@ -338,8 +329,8 @@ public void masterSlaveSslWithOneInvalidHostWillSucceed() {
         verifyMasterSlaveConnection(MASTER_SLAVE_URIS_WITH_ONE_INVALID);
     }
 
-    @Test(expected = RedisConnectionException.class)
-    public void masterSlaveSslWithAllInvalidHostsWillFail() {
+    @Test
+    void masterSlaveSslWithAllInvalidHostsWillFail() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .jdkSslProvider() //
@@ -347,11 +338,12 @@ public void masterSlaveSslWithAllInvalidHostsWillFail() {
                 .build();
         setOptions(sslOptions);
 
-        verifyMasterSlaveConnection(MASTER_SLAVE_URIS_WITH_ALL_INVALID);
+        assertThatThrownBy(() -> verifyMasterSlaveConnection(MASTER_SLAVE_URIS_WITH_ALL_INVALID)).isInstanceOf(
+                RedisConnectionException.class);
     }
 
     @Test
-    public void pubSubSsl() throws Exception {
+    void pubSubSsl() throws Exception {
 
         RedisPubSubCommands<String, String> connection = redisClient.connectPubSub(URI_NO_VERIFY).sync();
         connection.subscribe("c1");
@@ -372,27 +364,24 @@ public void pubSubSsl() throws Exception {
         connection2.getStatefulConnection().close();
     }
 
-    @Test(timeout = 10000)
-    public void pubSubSslAndBreakConnection() throws Exception {
+    @Test
+    void pubSubSslAndBreakConnection() {
 
         RedisURI redisURI = RedisURI.Builder.redis(host(), sslPort()).withSsl(true).withVerifyPeer(false).build();
         redisClient.setOptions(ClientOptions.builder().suspendReconnectOnProtocolFailure(true).build());
 
         RedisPubSubAsyncCommands<String, String> connection = redisClient.connectPubSub(redisURI).async();
-        RedisPubSubAsyncCommands<String, String> connection2 = redisClient.connectPubSub(redisURI).async();
+        RedisPubSubCommands<String, String> connection2 = redisClient.connectPubSub(redisURI).sync();
 
         redisURI.setVerifyPeer(true);
         connection.subscribe("c1");
         connection.subscribe("c2");
 
-        Wait.untilTrue(() -> connection2.pubsubChannels().get().containsAll(Arrays.asList("c1", "c2"))).waitOrTimeout();
+        Wait.untilTrue(() -> connection2.pubsubChannels().containsAll(Arrays.asList("c1", "c2"))).waitOrTimeout();
 
-        try {
-            connection.quit().get();
-        } catch (Exception e) {
-        }
+        Futures.await(connection.quit());
 
-        List<String> future = connection2.pubsubChannels().get();
+        List<String> future = connection2.pubsubChannels();
         assertThat(future).doesNotContain("c1", "c2");
 
         RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection.getStatefulConnection());
@@ -400,15 +389,8 @@ public void pubSubSslAndBreakConnection() throws Exception {
 
         RedisFuture<Void> defectFuture = connection.subscribe("foo");
 
-        try {
-            defectFuture.get();
-            fail("Missing ExecutionException with nested SSLHandshakeException");
-        } catch (InterruptedException e) {
-            fail("Missing ExecutionException with nested SSLHandshakeException");
-        } catch (ExecutionException e) {
-            assertThat(e).hasCauseInstanceOf(DecoderException.class);
-            assertThat(e).hasRootCauseInstanceOf(CertificateException.class);
-        }
+        assertThatThrownBy(() -> Futures.await(defectFuture)).hasCauseInstanceOf(DecoderException.class)
+                .hasRootCauseInstanceOf(CertificateException.class);
 
         assertThat(defectFuture.toCompletableFuture()).isDone();
 
diff --git a/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java b/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java
index 918b86eb34..ace8a313be 100644
--- a/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java
+++ b/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java
@@ -18,53 +18,50 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.lang.reflect.*;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Arrays;
+import java.util.stream.Stream;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 
 /**
  * @author Mark Paluch
  * @since 3.0
  */
-@RunWith(Parameterized.class)
-public class SyncAsyncApiConvergenceTest {
-
-    private Method method;
+class SyncAsyncApiConvergenceTest {
 
     @SuppressWarnings("rawtypes")
     private Class<RedisAsyncCommands> asyncClass = RedisAsyncCommands.class;
 
-    @Parameterized.Parameters(name = "Method {0}/{1}")
-    public static List<Object[]> parameters() {
+    static Stream<Method> parameters() {
+        return Arrays.stream(RedisCommands.class.getMethods());
+    }
 
-        List<Object[]> result = new ArrayList<>();
-        Method[] methods = RedisCommands.class.getMethods();
-        for (Method method : methods) {
-            result.add(new Object[] { method.getName(), method });
-        }
+    @ParameterizedTest
+    @MethodSource("parameters")
+    void testMethodPresentOnAsyncApi(Method syncMethod) throws Exception {
 
-        return result;
+        Method method = RedisAsyncCommands.class.getMethod(syncMethod.getName(), syncMethod.getParameterTypes());
+        assertThat(method).isNotNull();
     }
 
-    public SyncAsyncApiConvergenceTest(String methodName, Method method) {
-        this.method = method;
-    }
+    @ParameterizedTest
+    @MethodSource("parameters")
+    void testMethodPresentOnReactiveApi(Method syncMethod) throws Exception {
 
-    @Test
-    public void testMethodPresentOnAsyncApi() throws Exception {
-        Method method = asyncClass.getMethod(this.method.getName(), this.method.getParameterTypes());
+        Method method = RedisReactiveCommands.class.getMethod(syncMethod.getName(), syncMethod.getParameterTypes());
         assertThat(method).isNotNull();
     }
 
-    @Test
-    public void testSameResultType() throws Exception {
-        Method method = asyncClass.getMethod(this.method.getName(), this.method.getParameterTypes());
+    @ParameterizedTest
+    @MethodSource("parameters")
+    void testSameResultType(Method syncMethod) throws Exception {
+
+        Method method = asyncClass.getMethod(syncMethod.getName(), syncMethod.getParameterTypes());
         Type returnType = method.getGenericReturnType();
 
         if (method.getReturnType().equals(RedisFuture.class)) {
@@ -79,7 +76,7 @@ public void testSameResultType() throws Exception {
             }
         }
 
-        assertThat(returnType.toString()).describedAs(this.method.toString()).isEqualTo(
-                this.method.getGenericReturnType().toString());
+        assertThat(returnType.toString()).describedAs(syncMethod.toString()).isEqualTo(
+                syncMethod.getGenericReturnType().toString());
     }
 }
diff --git a/src/test/java/io/lettuce/core/TestRedisPublisher.java b/src/test/java/io/lettuce/core/TestRedisPublisher.java
index 209c16bedb..ee11412066 100644
--- a/src/test/java/io/lettuce/core/TestRedisPublisher.java
+++ b/src/test/java/io/lettuce/core/TestRedisPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/AbstractTest.java b/src/test/java/io/lettuce/core/TestSupport.java
similarity index 59%
rename from src/test/java/io/lettuce/core/AbstractTest.java
rename to src/test/java/io/lettuce/core/TestSupport.java
index 7de8eeea05..26eed86e77 100644
--- a/src/test/java/io/lettuce/core/AbstractTest.java
+++ b/src/test/java/io/lettuce/core/TestSupport.java
@@ -21,52 +21,44 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.junit.Rule;
 
-import io.lettuce.LenientClusterDownRule;
-import io.lettuce.LoggingTestRule;
 import io.lettuce.core.internal.LettuceSets;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class AbstractTest {
+public abstract class TestSupport {
 
-    public static final String host = TestSettings.host();
+    public static final String host = TestSettings.hostAddr();
     public static final int port = TestSettings.port();
-    public static final String passwd = TestSettings.password();
-
-    @Rule
-    public LoggingTestRule loggingTestRule = new LoggingTestRule(false);
-
-    @Rule
-    public LenientClusterDownRule clusterDownRule = new LenientClusterDownRule();
+    protected static final String passwd = TestSettings.password();
 
     protected Logger log = LogManager.getLogger(getClass());
-    protected String key = "key";
-    protected String value = "value";
+    public static final String key = "key";
+    protected static final String value = "value";
 
-    public static List<String> list(String... args) {
+    protected static List<String> list(String... args) {
         return Arrays.asList(args);
     }
 
-    public static List<Object> list(Object... args) {
+    protected static List<Object> list(Object... args) {
         return Arrays.asList(args);
     }
 
-    public static List<ScoredValue<String>> svlist(ScoredValue<String>... args) {
+    protected static List<ScoredValue<String>> svlist(ScoredValue<String>... args) {
         return Arrays.asList(args);
     }
 
-    public static KeyValue<String, String> kv(String key, String value) {
+    protected static KeyValue<String, String> kv(String key, String value) {
         return KeyValue.fromNullable(key, value);
     }
 
-    public static ScoredValue<String> sv(double score, String value) {
+    protected static ScoredValue<String> sv(double score, String value) {
         return ScoredValue.fromNullable(score, value);
     }
 
-    public static Set<String> set(String... args) {
+    protected static Set<String> set(String... args) {
         return LettuceSets.newHashSet(args);
     }
 }
diff --git a/src/test/java/io/lettuce/core/TimeoutOptionsTest.java b/src/test/java/io/lettuce/core/TimeoutOptionsUnitTests.java
similarity index 90%
rename from src/test/java/io/lettuce/core/TimeoutOptionsTest.java
rename to src/test/java/io/lettuce/core/TimeoutOptionsUnitTests.java
index a4f1eebe27..3c9e56d056 100644
--- a/src/test/java/io/lettuce/core/TimeoutOptionsTest.java
+++ b/src/test/java/io/lettuce/core/TimeoutOptionsUnitTests.java
@@ -21,15 +21,15 @@
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class TimeoutOptionsTest {
+class TimeoutOptionsUnitTests {
 
     @Test
-    public void noTimeoutByDefault() {
+    void noTimeoutByDefault() {
 
         TimeoutOptions timeoutOptions = TimeoutOptions.create();
 
@@ -38,7 +38,7 @@ public void noTimeoutByDefault() {
     }
 
     @Test
-    public void defaultConnectionTimeout() {
+    void defaultConnectionTimeout() {
 
         TimeoutOptions timeoutOptions = TimeoutOptions.enabled();
 
@@ -49,7 +49,7 @@ public void defaultConnectionTimeout() {
     }
 
     @Test
-    public void fixedConnectionTimeout() {
+    void fixedConnectionTimeout() {
 
         TimeoutOptions timeoutOptions = TimeoutOptions.enabled(Duration.ofMinutes(1));
 
diff --git a/src/test/java/io/lettuce/core/UnixDomainSocketTest.java b/src/test/java/io/lettuce/core/UnixDomainSocketTest.java
index f43c0cf89c..61aea833e1 100644
--- a/src/test/java/io/lettuce/core/UnixDomainSocketTest.java
+++ b/src/test/java/io/lettuce/core/UnixDomainSocketTest.java
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,11 +30,13 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import io.lettuce.TestClientResources;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.sentinel.SentinelRule;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 import io.netty.util.internal.SystemPropertyUtil;
 
 /**
@@ -187,8 +189,8 @@ private static RedisClient getRedisSentinelClient() {
 
     private void assumeTestSupported() {
         String osName = SystemPropertyUtil.get("os.name").toLowerCase(Locale.UK).trim();
-        assumeTrue("Only supported on Linux/OSX, your os is " + osName + " with epoll/kqueue support.",
-                Transports.NativeTransports.isSocketSupported());
+        assumeTrue(Transports.NativeTransports.isSocketSupported(), "Only supported on Linux/OSX, your os is " + osName
+                + " with epoll/kqueue support.");
     }
 
     private static RedisURI getSocketRedisUri() throws IOException {
diff --git a/src/test/java/io/lettuce/core/Utf8StringCodecTest.java b/src/test/java/io/lettuce/core/Utf8StringCodecIntegrationTests.java
similarity index 66%
rename from src/test/java/io/lettuce/core/Utf8StringCodecTest.java
rename to src/test/java/io/lettuce/core/Utf8StringCodecIntegrationTests.java
index fe37b0e949..ab4261f4db 100644
--- a/src/test/java/io/lettuce/core/Utf8StringCodecTest.java
+++ b/src/test/java/io/lettuce/core/Utf8StringCodecIntegrationTests.java
@@ -19,15 +19,28 @@
 
 import java.util.Arrays;
 
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class Utf8StringCodecTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+class Utf8StringCodecIntegrationTests extends TestSupport {
+
     @Test
-    public void decodeHugeBuffer() throws Exception {
+    @Inject
+    void decodeHugeBuffer(StatefulRedisConnection<String, String> connection) {
+
+        RedisCommands<String, String> redis = connection.sync();
+
         char[] huge = new char[8192];
         Arrays.fill(huge, 'A');
         String value = new String(huge);
diff --git a/src/test/java/io/lettuce/core/ValueTest.java b/src/test/java/io/lettuce/core/ValueUnitTests.java
similarity index 74%
rename from src/test/java/io/lettuce/core/ValueTest.java
rename to src/test/java/io/lettuce/core/ValueUnitTests.java
index e79993ef0d..fa26899191 100644
--- a/src/test/java/io/lettuce/core/ValueTest.java
+++ b/src/test/java/io/lettuce/core/ValueUnitTests.java
@@ -16,20 +16,21 @@
 package io.lettuce.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class ValueTest {
+class ValueUnitTests {
 
     @Test
-    public void shouldCreateEmptyValueFromOptional() {
+    void shouldCreateEmptyValueFromOptional() {
 
         Value<String> value = Value.from(Optional.<String> empty());
 
@@ -37,7 +38,7 @@ public void shouldCreateEmptyValueFromOptional() {
     }
 
     @Test
-    public void shouldCreateEmptyValue() {
+    void shouldCreateEmptyValue() {
 
         Value<String> value = Value.empty();
 
@@ -45,7 +46,7 @@ public void shouldCreateEmptyValue() {
     }
 
     @Test
-    public void shouldCreateNonEmptyValueFromOptional() {
+    void shouldCreateNonEmptyValueFromOptional() {
 
         Value<String> value = Value.from(Optional.of("hello"));
 
@@ -54,7 +55,7 @@ public void shouldCreateNonEmptyValueFromOptional() {
     }
 
     @Test
-    public void shouldCreateEmptyValueFromValue() {
+    void shouldCreateEmptyValueFromValue() {
 
         Value<String> value = Value.fromNullable(null);
 
@@ -62,7 +63,7 @@ public void shouldCreateEmptyValueFromValue() {
     }
 
     @Test
-    public void shouldCreateNonEmptyValueFromValue() {
+    void shouldCreateNonEmptyValueFromValue() {
 
         Value<String> value = Value.fromNullable("hello");
 
@@ -71,20 +72,20 @@ public void shouldCreateNonEmptyValueFromValue() {
     }
 
     @Test
-    public void justShouldCreateValueFromValue() {
+    void justShouldCreateValueFromValue() {
 
         Value<String> value = Value.just("hello");
 
         assertThat(value.hasValue()).isTrue();
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void justShouldRejectEmptyValueFromValue() {
-        Value.just(null);
+    @Test
+    void justShouldRejectEmptyValueFromValue() {
+        assertThatThrownBy(() -> Value.just(null)).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void shouldCreateNonEmptyValue() {
+    void shouldCreateNonEmptyValue() {
 
         Value<String> value = Value.from(Optional.of("hello"));
 
@@ -93,7 +94,7 @@ public void shouldCreateNonEmptyValue() {
     }
 
     @Test
-    public void optionalShouldReturnOptional() {
+    void optionalShouldReturnOptional() {
 
         Value<String> value = Value.from(Optional.of("hello"));
 
@@ -101,7 +102,7 @@ public void optionalShouldReturnOptional() {
     }
 
     @Test
-    public void emptyValueOptionalShouldReturnOptional() {
+    void emptyValueOptionalShouldReturnOptional() {
 
         Value<String> value = Value.from(Optional.empty());
 
@@ -109,7 +110,7 @@ public void emptyValueOptionalShouldReturnOptional() {
     }
 
     @Test
-    public void getValueOrElseShouldReturnValue() {
+    void getValueOrElseShouldReturnValue() {
 
         Value<String> value = Value.from(Optional.of("hello"));
 
@@ -117,7 +118,7 @@ public void getValueOrElseShouldReturnValue() {
     }
 
     @Test
-    public void getValueOrElseShouldReturnOtherValue() {
+    void getValueOrElseShouldReturnOtherValue() {
 
         Value<String> value = Value.from(Optional.empty());
 
@@ -125,23 +126,24 @@ public void getValueOrElseShouldReturnOtherValue() {
     }
 
     @Test
-    public void orElseThrowShouldReturnValue() {
+    void orElseThrowShouldReturnValue() {
 
         Value<String> value = Value.from(Optional.of("hello"));
 
         assertThat(value.getValueOrElseThrow(IllegalArgumentException::new)).isEqualTo("hello");
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void emptyValueGetValueOrElseShouldThrowException() {
+    @Test
+    void emptyValueGetValueOrElseShouldThrowException() {
 
         Value<String> value = Value.from(Optional.empty());
 
-        value.getValueOrElseThrow(IllegalArgumentException::new);
+        assertThatThrownBy(() -> value.getValueOrElseThrow(IllegalArgumentException::new)).isInstanceOf(
+                IllegalArgumentException.class);
     }
 
     @Test
-    public void getValueOrElseGetShouldReturnValue() {
+    void getValueOrElseGetShouldReturnValue() {
 
         Value<String> value = Value.from(Optional.of("hello"));
 
@@ -149,7 +151,7 @@ public void getValueOrElseGetShouldReturnValue() {
     }
 
     @Test
-    public void emptyValueGetValueOrElseGetShouldReturnOtherValue() {
+    void emptyValueGetValueOrElseGetShouldReturnOtherValue() {
 
         Value<String> value = Value.from(Optional.empty());
 
@@ -157,7 +159,7 @@ public void emptyValueGetValueOrElseGetShouldReturnOtherValue() {
     }
 
     @Test
-    public void mapShouldMapValue() {
+    void mapShouldMapValue() {
 
         Value<String> value = Value.from(Optional.of("hello"));
 
@@ -165,7 +167,7 @@ public void mapShouldMapValue() {
     }
 
     @Test
-    public void ifHasValueShouldExecuteCallback() {
+    void ifHasValueShouldExecuteCallback() {
 
         Value<String> value = Value.just("hello");
         AtomicBoolean atomicBoolean = new AtomicBoolean();
@@ -175,7 +177,7 @@ public void ifHasValueShouldExecuteCallback() {
     }
 
     @Test
-    public void emptyValueShouldNotExecuteIfHasValueCallback() {
+    void emptyValueShouldNotExecuteIfHasValueCallback() {
 
         Value<String> value = Value.empty();
         AtomicBoolean atomicBoolean = new AtomicBoolean();
@@ -185,7 +187,7 @@ public void emptyValueShouldNotExecuteIfHasValueCallback() {
     }
 
     @Test
-    public void ifEmptyShouldExecuteCallback() {
+    void ifEmptyShouldExecuteCallback() {
 
         Value<String> value = Value.empty();
         AtomicBoolean atomicBoolean = new AtomicBoolean();
@@ -195,7 +197,7 @@ public void ifEmptyShouldExecuteCallback() {
     }
 
     @Test
-    public void valueShouldNotExecuteIfEmptyCallback() {
+    void valueShouldNotExecuteIfEmptyCallback() {
 
         Value<String> value = Value.just("hello");
         AtomicBoolean atomicBoolean = new AtomicBoolean();
@@ -205,20 +207,20 @@ public void valueShouldNotExecuteIfEmptyCallback() {
     }
 
     @Test
-    public void emptyValueMapShouldNotMapEmptyValue() {
+    void emptyValueMapShouldNotMapEmptyValue() {
 
         Value<String> value = Value.from(Optional.empty());
 
         assertThat(value.map(s -> s + "-world")).isSameAs(value);
     }
 
-    @Test(expected = NoSuchElementException.class)
-    public void emptyValueGetEmptyValueShouldThrowException() {
-        Value.from(Optional.<String> empty()).getValue();
+    @Test
+    void emptyValueGetEmptyValueShouldThrowException() {
+        assertThatThrownBy(() -> Value.from(Optional.<String> empty()).getValue()).isInstanceOf(NoSuchElementException.class);
     }
 
     @Test
-    public void shouldBeEquals() {
+    void shouldBeEquals() {
 
         Value<String> value = Value.from(Optional.of("hello"));
         Value<String> other = Value.fromNullable("hello");
@@ -232,7 +234,7 @@ public void shouldBeEquals() {
     }
 
     @Test
-    public void toStringShouldRenderCorrectly() {
+    void toStringShouldRenderCorrectly() {
 
         Value<String> value = Value.from(Optional.of("hello"));
         Value<String> empty = Value.fromNullable(null);
@@ -242,7 +244,7 @@ public void toStringShouldRenderCorrectly() {
     }
 
     @Test
-    public void emptyValueStreamShouldCreateEmptyStream() {
+    void emptyValueStreamShouldCreateEmptyStream() {
 
         Value<String> empty = Value.fromNullable(null);
 
@@ -250,7 +252,7 @@ public void emptyValueStreamShouldCreateEmptyStream() {
     }
 
     @Test
-    public void streamShouldCreateAStream() {
+    void streamShouldCreateAStream() {
 
         Value<String> empty = Value.fromNullable("hello");
 
diff --git a/src/test/java/io/lettuce/core/ZStoreArgsTest.java b/src/test/java/io/lettuce/core/ZStoreArgsUnitTests.java
similarity index 90%
rename from src/test/java/io/lettuce/core/ZStoreArgsTest.java
rename to src/test/java/io/lettuce/core/ZStoreArgsUnitTests.java
index 0f23fe8c82..4c228d4a3a 100644
--- a/src/test/java/io/lettuce/core/ZStoreArgsTest.java
+++ b/src/test/java/io/lettuce/core/ZStoreArgsUnitTests.java
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.protocol.CommandArgs;
@@ -25,10 +25,10 @@
 /**
  * @author Mark Paluch
  */
-public class ZStoreArgsTest {
+class ZStoreArgsUnitTests {
 
     @Test
-    public void shouldRenderWeights() {
+    void shouldRenderWeights() {
 
         CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8);
         ZStoreArgs.Builder.weights(1, 2, 3).build(args);
@@ -37,7 +37,7 @@ public void shouldRenderWeights() {
     }
 
     @Test
-    public void shouldOmitWeights() {
+    void shouldOmitWeights() {
 
         CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8);
         ZStoreArgs.Builder.weights().build(args);
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java
similarity index 59%
rename from src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
rename to src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java
index f861b3035f..6cc9e588e4 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java
@@ -15,20 +15,21 @@
  */
 package io.lettuce.core.cluster;
 
+import static io.lettuce.test.LettuceExtension.Connection;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import javax.enterprise.inject.New;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.KeysAndValues;
-import io.lettuce.RedisConditions;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
@@ -40,76 +41,85 @@
 import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.test.Futures;
+import io.lettuce.test.KeysAndValues;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.ListStreamingAdapter;
+import io.lettuce.test.condition.EnabledOnCommand;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
 @SuppressWarnings("rawtypes")
-public class AdvancedClusterClientTest extends AbstractClusterTest {
+@ExtendWith(LettuceExtension.class)
+class AdvancedClusterClientIntegrationTests extends TestSupport {
+
+    private static final String KEY_ON_NODE_1 = "a";
+    private static final String KEY_ON_NODE_2 = "b";
 
-    public static final String KEY_ON_NODE_1 = "a";
-    public static final String KEY_ON_NODE_2 = "b";
+    private final RedisClusterClient clusterClient;
+    private final StatefulRedisClusterConnection<String, String> clusterConnection;
+    private final RedisAdvancedClusterAsyncCommands<String, String> async;
+    private final RedisAdvancedClusterCommands<String, String> sync;
 
-    private RedisAdvancedClusterAsyncCommands<String, String> commands;
-    private RedisAdvancedClusterCommands<String, String> syncCommands;
-    private StatefulRedisClusterConnection<String, String> clusterConnection;
+    @Inject
+    AdvancedClusterClientIntegrationTests(RedisClusterClient clusterClient,
+            StatefulRedisClusterConnection<String, String> clusterConnection) {
+        this.clusterClient = clusterClient;
 
-    @Before
-    public void before() throws Exception {
-        clusterClient.reloadPartitions();
-        clusterConnection = clusterClient.connect();
-        commands = clusterConnection.async();
-        syncCommands = clusterConnection.sync();
+        this.clusterConnection = clusterConnection;
+        this.async = clusterConnection.async();
+        this.sync = clusterConnection.sync();
     }
 
-    @After
-    public void after() throws Exception {
-        commands.getStatefulConnection().close();
+    @BeforeEach
+    void setUp() {
+        this.sync.flushall();
     }
 
     @Test
-    public void nodeConnections() throws Exception {
+    void nodeConnections() {
 
         assertThat(clusterClient.getPartitions()).hasSize(4);
 
         for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
-            RedisClusterAsyncCommands<String, String> nodeConnection = commands.getConnection(redisClusterNode.getNodeId());
+            RedisClusterAsyncCommands<String, String> nodeConnection = async.getConnection(redisClusterNode.getNodeId());
 
-            String myid = nodeConnection.clusterMyId().get();
+            String myid = Futures.get(nodeConnection.clusterMyId());
             assertThat(myid).isEqualTo(redisClusterNode.getNodeId());
         }
     }
 
-    @Test(expected = RedisException.class)
-    public void unknownNodeId() throws Exception {
-
-        commands.getConnection("unknown");
+    @Test
+    void unknownNodeId() {
+        assertThatThrownBy(() -> async.getConnection("unknown")).isInstanceOf(RedisException.class);
     }
 
-    @Test(expected = RedisException.class)
-    public void invalidHost() throws Exception {
-        commands.getConnection("invalid-host", -1);
+    @Test
+    void invalidHost() {
+        assertThatThrownBy(() -> async.getConnection("invalid-host", -1)).isInstanceOf(RedisException.class);
     }
 
     @Test
-    public void partitions() throws Exception {
+    void partitions() {
 
-        Partitions partitions = commands.getStatefulConnection().getPartitions();
+        Partitions partitions = async.getStatefulConnection().getPartitions();
         assertThat(partitions).hasSize(4);
     }
 
     @Test
-    public void differentConnections() throws Exception {
+    void differentConnections() {
 
         for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
-            RedisClusterAsyncCommands<String, String> nodeId = commands.getConnection(redisClusterNode.getNodeId());
-            RedisClusterAsyncCommands<String, String> hostAndPort = commands.getConnection(redisClusterNode.getUri().getHost(),
+            RedisClusterAsyncCommands<String, String> nodeId = async.getConnection(redisClusterNode.getNodeId());
+            RedisClusterAsyncCommands<String, String> hostAndPort = async.getConnection(redisClusterNode.getUri().getHost(),
                     redisClusterNode.getUri().getPort());
 
             assertThat(nodeId).isNotSameAs(hostAndPort);
         }
 
-        StatefulRedisClusterConnection<String, String> statefulConnection = commands.getStatefulConnection();
+        StatefulRedisClusterConnection<String, String> statefulConnection = async.getStatefulConnection();
         for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
 
             StatefulRedisConnection<String, String> nodeId = statefulConnection.getConnection(redisClusterNode.getNodeId());
@@ -141,59 +151,59 @@ public void differentConnections() throws Exception {
     }
 
     @Test
-    public void msetRegular() throws Exception {
+    void msetRegular() {
 
         Map<String, String> mset = Collections.singletonMap(key, value);
 
-        String result = syncCommands.mset(mset);
+        String result = sync.mset(mset);
 
         assertThat(result).isEqualTo("OK");
-        assertThat(syncCommands.get(key)).isEqualTo(value);
+        assertThat(sync.get(key)).isEqualTo(value);
     }
 
     @Test
-    public void msetCrossSlot() throws Exception {
+    void msetCrossSlot() {
 
         Map<String, String> mset = prepareMset();
 
-        String result = syncCommands.mset(mset);
+        String result = sync.mset(mset);
 
         assertThat(result).isEqualTo("OK");
 
         for (String mykey : mset.keySet()) {
-            String s1 = syncCommands.get(mykey);
+            String s1 = sync.get(mykey);
             assertThat(s1).isEqualTo("value-" + mykey);
         }
     }
 
     @Test
-    public void msetnxCrossSlot() throws Exception {
+    void msetnxCrossSlot() {
 
         Map<String, String> mset = prepareMset();
 
         String key = mset.keySet().iterator().next();
         Map<String, String> submap = Collections.singletonMap(key, mset.get(key));
 
-        assertThat(commands.msetnx(submap).get()).isTrue();
-        assertThat(commands.msetnx(mset).get()).isFalse();
+        assertThat(sync.msetnx(submap)).isTrue();
+        assertThat(sync.msetnx(mset)).isFalse();
 
         for (String mykey : mset.keySet()) {
-            String s1 = commands.get(mykey).get();
+            String s1 = sync.get(mykey);
             assertThat(s1).isEqualTo("value-" + mykey);
         }
     }
 
     @Test
-    public void mgetRegular() throws Exception {
+    void mgetRegular() {
 
         msetRegular();
-        List<KeyValue<String, String>> result = syncCommands.mget(key);
+        List<KeyValue<String, String>> result = sync.mget(key);
 
         assertThat(result).hasSize(1);
     }
 
     @Test
-    public void mgetCrossSlot() throws Exception {
+    void mgetCrossSlot() {
 
         msetCrossSlot();
         List<String> keys = new ArrayList<>();
@@ -204,69 +214,67 @@ public void mgetCrossSlot() throws Exception {
             expectation.add(kv(key, "value-" + key));
         }
 
-        List<KeyValue<String, String>> result = syncCommands.mget(keys.toArray(new String[keys.size()]));
+        List<KeyValue<String, String>> result = sync.mget(keys.toArray(new String[keys.size()]));
 
         assertThat(result).hasSize(keys.size());
         assertThat(result).isEqualTo(expectation);
     }
 
     @Test
-    public void delRegular() throws Exception {
-
-        assumeTrue(RedisConditions.of(syncCommands.getStatefulConnection()).hasCommand("UNLINK"));
+    @EnabledOnCommand("UNLINK")
+    void delRegular() {
 
         msetRegular();
-        Long result = syncCommands.unlink(key);
+        Long result = sync.unlink(key);
 
         assertThat(result).isEqualTo(1);
-        assertThat(commands.get(key).get()).isNull();
+        assertThat(Futures.get(async.get(key))).isNull();
     }
 
     @Test
-    public void delCrossSlot() throws Exception {
+    void delCrossSlot() {
 
         List<String> keys = prepareKeys();
 
-        Long result = syncCommands.del(keys.toArray(new String[keys.size()]));
+        Long result = sync.del(keys.toArray(new String[keys.size()]));
 
         assertThat(result).isEqualTo(25);
 
         for (String mykey : keys) {
-            String s1 = syncCommands.get(mykey);
+            String s1 = sync.get(mykey);
             assertThat(s1).isNull();
         }
     }
 
     @Test
-    public void unlinkRegular() throws Exception {
-
-        assumeTrue(RedisConditions.of(syncCommands.getStatefulConnection()).hasCommand("UNLINK"));
+    @EnabledOnCommand("UNLINK")
+    void unlinkRegular() {
 
         msetRegular();
-        Long result = syncCommands.unlink(key);
+        Long result = sync.unlink(key);
 
         assertThat(result).isEqualTo(1);
-        assertThat(syncCommands.get(key)).isNull();
+        assertThat(sync.get(key)).isNull();
     }
 
     @Test
-    public void unlinkCrossSlot() throws Exception {
-
-        assumeTrue(RedisConditions.of(syncCommands.getStatefulConnection()).hasCommand("UNLINK"));
+    @EnabledOnCommand("UNLINK")
+    void unlinkCrossSlot() {
 
         List<String> keys = prepareKeys();
 
-        Long result = syncCommands.unlink(keys.toArray(new String[keys.size()]));
+        Long result = sync.unlink(keys.toArray(new String[keys.size()]));
 
         assertThat(result).isEqualTo(25);
 
         for (String mykey : keys) {
-            String s1 = syncCommands.get(mykey);
+            String s1 = sync.get(mykey);
             assertThat(s1).isNull();
         }
     }
 
-    protected List<String> prepareKeys() throws Exception {
+    private List<String> prepareKeys() {
+
         msetCrossSlot();
         List<String> keys = new ArrayList<>();
         for (char c = 'a'; c < 'z'; c++) {
@@ -277,140 +285,144 @@ protected List<String> prepareKeys() throws Exception {
     }
 
     @Test
-    public void clientSetname() throws Exception {
+    void clientSetname() {
 
         String name = "test-cluster-client";
 
         assertThat(clusterClient.getPartitions().size()).isGreaterThan(0);
 
-        syncCommands.clientSetname(name);
+        sync.clientSetname(name);
 
         for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
-            RedisClusterCommands<String, String> nodeConnection = commands.getStatefulConnection().sync()
+            RedisClusterCommands<String, String> nodeConnection = async.getStatefulConnection().sync()
                     .getConnection(redisClusterNode.getNodeId());
             assertThat(nodeConnection.clientList()).contains(name);
         }
 
-        assertThat(syncCommands.clientGetname()).isEqualTo(name);
+        assertThat(sync.clientGetname()).isEqualTo(name);
     }
 
-    @Test(expected = RedisCommandExecutionException.class)
-    public void clientSetnameRunOnError() throws Exception {
-        syncCommands.clientSetname("not allowed");
+    @Test
+    void clientSetnameRunOnError() {
+        assertThatThrownBy(() -> sync.clientSetname("not allowed")).isInstanceOf(RedisCommandExecutionException.class);
     }
 
     @Test
-    public void dbSize() throws Exception {
+    void dbSize() {
 
         writeKeysToTwoNodes();
 
-        RedisClusterCommands<String, String> nodeConnection1 = clusterConnection.getConnection(host, port1).sync();
-        RedisClusterCommands<String, String> nodeConnection2 = clusterConnection.getConnection(host, port2).sync();
+        RedisClusterCommands<String, String> nodeConnection1 = clusterConnection.getConnection(ClusterTestSettings.host,
+                ClusterTestSettings.port1).sync();
+        RedisClusterCommands<String, String> nodeConnection2 = clusterConnection.getConnection(ClusterTestSettings.host,
+                ClusterTestSettings.port1).sync();
 
         assertThat(nodeConnection1.dbsize()).isEqualTo(1);
         assertThat(nodeConnection2.dbsize()).isEqualTo(1);
 
-        Long dbsize = syncCommands.dbsize();
+        Long dbsize = sync.dbsize();
         assertThat(dbsize).isEqualTo(2);
     }
 
     @Test
-    public void flushall() throws Exception {
+    void flushall() {
 
         writeKeysToTwoNodes();
 
-        assertThat(syncCommands.flushall()).isEqualTo("OK");
+        assertThat(sync.flushall()).isEqualTo("OK");
 
-        Long dbsize = syncCommands.dbsize();
+        Long dbsize = sync.dbsize();
         assertThat(dbsize).isEqualTo(0);
     }
 
     @Test
-    public void flushdb() throws Exception {
+    void flushdb() {
 
         writeKeysToTwoNodes();
 
-        assertThat(syncCommands.flushdb()).isEqualTo("OK");
+        assertThat(sync.flushdb()).isEqualTo("OK");
 
-        Long dbsize = syncCommands.dbsize();
+        Long dbsize = sync.dbsize();
         assertThat(dbsize).isEqualTo(0);
     }
 
     @Test
-    public void keys() throws Exception {
+    void keys() {
 
         writeKeysToTwoNodes();
 
-        assertThat(syncCommands.keys("*")).contains(KEY_ON_NODE_1, KEY_ON_NODE_2);
+        assertThat(sync.keys("*")).contains(KEY_ON_NODE_1, KEY_ON_NODE_2);
     }
 
     @Test
-    public void keysStreaming() throws Exception {
+    void keysStreaming() {
 
         writeKeysToTwoNodes();
         ListStreamingAdapter<String> result = new ListStreamingAdapter<>();
 
-        assertThat(syncCommands.keys(result, "*")).isEqualTo(2);
+        assertThat(sync.keys(result, "*")).isEqualTo(2);
         assertThat(result.getList()).contains(KEY_ON_NODE_1, KEY_ON_NODE_2);
     }
 
     @Test
-    public void randomKey() throws Exception {
+    void randomKey() {
 
         writeKeysToTwoNodes();
 
-        assertThat(syncCommands.randomkey()).isIn(KEY_ON_NODE_1, KEY_ON_NODE_2);
+        assertThat(sync.randomkey()).isIn(KEY_ON_NODE_1, KEY_ON_NODE_2);
     }
 
     @Test
-    public void scriptFlush() throws Exception {
-        assertThat(syncCommands.scriptFlush()).isEqualTo("OK");
+    void scriptFlush() {
+        assertThat(sync.scriptFlush()).isEqualTo("OK");
     }
 
     @Test
-    public void scriptKill() throws Exception {
-        assertThat(syncCommands.scriptKill()).isEqualTo("OK");
+    void scriptKill() {
+        assertThat(sync.scriptKill()).isEqualTo("OK");
     }
 
     @Test
-    public void scriptLoad() throws Exception {
+    void scriptLoad() {
 
-        assertThat(syncCommands.scriptFlush()).isEqualTo("OK");
+        assertThat(sync.scriptFlush()).isEqualTo("OK");
 
         String script = "return true";
 
         String sha = LettuceStrings.digest(script.getBytes());
-        assertThat(syncCommands.scriptExists(sha)).contains(false);
+        assertThat(sync.scriptExists(sha)).contains(false);
 
-        String returnedSha = syncCommands.scriptLoad(script);
+        String returnedSha = sync.scriptLoad(script);
 
         assertThat(returnedSha).isEqualTo(sha);
-        assertThat(syncCommands.scriptExists(sha)).contains(true);
+        assertThat(sync.scriptExists(sha)).contains(true);
     }
 
     @Test
-    @Ignore("Run me manually, I will shutdown all your cluster nodes so you need to restart the Redis Cluster after this test")
-    public void shutdown() throws Exception {
-        syncCommands.shutdown(true);
+    @Disabled("Run me manually, I will shutdown all your cluster nodes so you need to restart the Redis Cluster after this test")
+    void shutdown() {
+        sync.shutdown(true);
     }
 
     @Test
-    public void testSync() throws Exception {
+    void testSync() {
 
-        RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
+        RedisAdvancedClusterCommands<String, String> sync = async.getStatefulConnection().sync();
         sync.set(key, value);
         assertThat(sync.get(key)).isEqualTo(value);
 
-        RedisClusterCommands<String, String> node2Connection = sync.getConnection(host, port2);
+        RedisClusterCommands<String, String> node2Connection = sync.getConnection(ClusterTestSettings.host,
+                ClusterTestSettings.port2);
         assertThat(node2Connection.get(key)).isEqualTo(value);
 
-        assertThat(sync.getStatefulConnection()).isSameAs(commands.getStatefulConnection());
+        assertThat(sync.getStatefulConnection()).isSameAs(async.getStatefulConnection());
     }
 
     @Test
-    public void routeCommandTonoAddrPartition() throws Exception {
+    @Inject
+    void routeCommandToNoAddrPartition(@New StatefulRedisClusterConnection<String, String> connectionUnderTest) {
 
-        RedisAdvancedClusterCommands<String, String> sync = clusterClient.connect().sync();
+        RedisAdvancedClusterCommands<String, String> sync = connectionUnderTest.sync();
         try {
 
             Partitions partitions = clusterClient.getPartitions();
@@ -425,13 +437,14 @@ public void routeCommandTonoAddrPartition() throws Exception {
             clusterClient.getPartitions().clear();
             clusterClient.reloadPartitions();
         }
-        sync.getStatefulConnection().close();
     }
 
     @Test
-    public void routeCommandToForbiddenHostOnRedirect() throws Exception {
+    @Inject
+    void routeCommandToForbiddenHostOnRedirect(
+            @Connection(requiresNew = true) StatefulRedisClusterConnection<String, String> connectionUnderTest) {
 
-        RedisAdvancedClusterCommands<String, String> sync = clusterClient.connect().sync();
+        RedisAdvancedClusterCommands<String, String> sync = connectionUnderTest.sync();
         try {
 
             Partitions partitions = clusterClient.getPartitions();
@@ -453,11 +466,10 @@ public void routeCommandToForbiddenHostOnRedirect() throws Exception {
             clusterClient.getPartitions().clear();
             clusterClient.reloadPartitions();
         }
-        sync.getStatefulConnection().close();
     }
 
     @Test
-    public void getConnectionToNotAClusterMemberForbidden() throws Exception {
+    void getConnectionToNotAClusterMemberForbidden() {
 
         StatefulRedisClusterConnection<String, String> sync = clusterClient.connect();
         try {
@@ -469,7 +481,7 @@ public void getConnectionToNotAClusterMemberForbidden() throws Exception {
     }
 
     @Test
-    public void getConnectionToNotAClusterMemberAllowed() throws Exception {
+    void getConnectionToNotAClusterMemberAllowed() {
 
         clusterClient.setOptions(ClusterClientOptions.builder().validateClusterNodeMembership(false).build());
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
@@ -478,39 +490,38 @@ public void getConnectionToNotAClusterMemberAllowed() throws Exception {
     }
 
     @Test
-    public void pipelining() throws Exception {
-
-        RedisAdvancedClusterCommands<String, String> verificationConnection = clusterClient.connect().sync();
+    @Inject
+    void pipelining(@New StatefulRedisClusterConnection<String, String> connectionUnderTest) {
 
+        RedisAdvancedClusterAsyncCommands<String, String> async = connectionUnderTest.async();
         // preheat the first connection
-        commands.get(key(0)).get();
+        Futures.await(async.get(key(0)));
 
         int iterations = 1000;
-        commands.setAutoFlushCommands(false);
+        async.setAutoFlushCommands(false);
         List<RedisFuture<?>> futures = new ArrayList<>();
         for (int i = 0; i < iterations; i++) {
-            futures.add(commands.set(key(i), value(i)));
+            futures.add(async.set(key(i), value(i)));
         }
 
         for (int i = 0; i < iterations; i++) {
-            assertThat(verificationConnection.get(key(i))).as("Key " + key(i) + " must be null").isNull();
+            assertThat(this.sync.get(key(i))).as("Key " + key(i) + " must be null").isNull();
         }
 
-        commands.flushCommands();
-        boolean result = LettuceFutures.awaitAll(5, TimeUnit.SECONDS, futures.toArray(new RedisFuture[futures.size()]));
+        async.flushCommands();
+
+        boolean result = Futures.awaitAll(futures);
         assertThat(result).isTrue();
 
         for (int i = 0; i < iterations; i++) {
-            assertThat(verificationConnection.get(key(i))).as("Key " + key(i) + " must be " + value(i)).isEqualTo(value(i));
+            assertThat(this.sync.get(key(i))).as("Key " + key(i) + " must be " + value(i)).isEqualTo(value(i));
         }
-
-        verificationConnection.getStatefulConnection().close();
     }
 
     @Test
-    public void clusterScan() throws Exception {
+    void clusterScan() {
 
-        RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
+        RedisAdvancedClusterCommands<String, String> sync = async.getStatefulConnection().sync();
         sync.mset(KeysAndValues.MAP);
 
         Set<String> allKeys = new HashSet<>();
@@ -527,13 +538,12 @@ public void clusterScan() throws Exception {
         } while (!scanCursor.isFinished());
 
         assertThat(allKeys).containsAll(KeysAndValues.KEYS);
-
     }
 
     @Test
-    public void clusterScanWithArgs() throws Exception {
+    void clusterScanWithArgs() {
 
-        RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
+        RedisAdvancedClusterCommands<String, String> sync = async.getStatefulConnection().sync();
         sync.mset(KeysAndValues.MAP);
 
         Set<String> allKeys = new HashSet<>();
@@ -551,13 +561,12 @@ public void clusterScanWithArgs() throws Exception {
 
         assertThat(allKeys)
                 .containsAll(KeysAndValues.KEYS.stream().filter(k -> k.startsWith("a")).collect(Collectors.toList()));
-
     }
 
     @Test
-    public void clusterScanStreaming() throws Exception {
+    void clusterScanStreaming() {
 
-        RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
+        RedisAdvancedClusterCommands<String, String> sync = async.getStatefulConnection().sync();
         sync.mset(KeysAndValues.MAP);
 
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
@@ -577,9 +586,9 @@ public void clusterScanStreaming() throws Exception {
     }
 
     @Test
-    public void clusterScanStreamingWithArgs() throws Exception {
+    void clusterScanStreamingWithArgs() {
 
-        RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
+        RedisAdvancedClusterCommands<String, String> sync = async.getStatefulConnection().sync();
         sync.mset(KeysAndValues.MAP);
 
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
@@ -598,30 +607,30 @@ public void clusterScanStreamingWithArgs() throws Exception {
 
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void clusterScanCursorFinished() throws Exception {
-        syncCommands.scan(ScanCursor.FINISHED);
+    @Test
+    void clusterScanCursorFinished() {
+        assertThatThrownBy(() -> sync.scan(ScanCursor.FINISHED)).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void clusterScanCursorNotReused() throws Exception {
-        syncCommands.scan(ScanCursor.of("dummy"));
+    @Test
+    void clusterScanCursorNotReused() {
+        assertThatThrownBy(() -> sync.scan(ScanCursor.of("dummy"))).isInstanceOf(IllegalArgumentException.class);
     }
 
-    protected String value(int i) {
+    String value(int i) {
         return value + "-" + i;
     }
 
-    protected String key(int i) {
+    String key(int i) {
         return key + "-" + i;
     }
 
     private void writeKeysToTwoNodes() {
-        syncCommands.set(KEY_ON_NODE_1, value);
-        syncCommands.set(KEY_ON_NODE_2, value);
+        sync.set(KEY_ON_NODE_1, value);
+        sync.set(KEY_ON_NODE_2, value);
     }
 
-    protected Map<String, String> prepareMset() {
+    Map<String, String> prepareMset() {
         Map<String, String> mset = new HashMap<>();
         for (char c = 'a'; c < 'z'; c++) {
             String key = new String(new char[] { c, c, c });
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
similarity index 79%
rename from src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
rename to src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
index 7d39d8a343..2c36d0d12b 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
@@ -16,25 +16,24 @@
 package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
-import io.lettuce.KeysAndValues;
-import io.lettuce.RedisConditions;
 import io.lettuce.core.*;
-import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
 import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
 import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands;
@@ -42,44 +41,48 @@
 import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.codec.Utf8StringCodec;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.*;
+import io.lettuce.test.condition.EnabledOnCommand;
 import io.netty.util.internal.ConcurrentSet;
 
 /**
  * @author Mark Paluch
  */
-public class AdvancedClusterReactiveTest extends AbstractClusterTest {
-
-    public static final String KEY_ON_NODE_1 = "a";
-    public static final String KEY_ON_NODE_2 = "b";
-
-    private RedisAdvancedClusterReactiveCommands<String, String> commands;
-    private RedisCommands<String, String> syncCommands;
-
-    @Before
-    public void before() {
-        commands = clusterClient.connect().reactive();
-        syncCommands = ReactiveSyncInvocationHandler.sync(commands.getStatefulConnection());
+@ExtendWith(LettuceExtension.class)
+class AdvancedClusterReactiveIntegrationTests extends TestSupport {
+
+    private static final String KEY_ON_NODE_1 = "a";
+    private static final String KEY_ON_NODE_2 = "b";
+
+    private final RedisClusterClient clusterClient;
+    private final RedisAdvancedClusterReactiveCommands<String, String> commands;
+    private final RedisAdvancedClusterCommands<String, String> syncCommands;
+
+    @Inject
+    AdvancedClusterReactiveIntegrationTests(RedisClusterClient clusterClient,
+            StatefulRedisClusterConnection<String, String> connection) {
+        this.clusterClient = clusterClient;
+        this.commands = connection.reactive();
+        this.syncCommands = connection.sync();
     }
 
-    @After
-    public void after() {
-        commands.getStatefulConnection().close();
+    @BeforeEach
+    void setUp() {
+        syncCommands.flushall();
     }
 
-    @Test(expected = RedisException.class)
-    public void unknownNodeId() {
-
-        commands.getConnection("unknown");
+    @Test
+    void unknownNodeId() {
+        assertThatThrownBy(() -> commands.getConnection("unknown")).isInstanceOf(RedisException.class);
     }
 
-    @Test(expected = RedisException.class)
-    public void invalidHost() {
-        commands.getConnection("invalid-host", -1);
+    @Test
+    void invalidHost() {
+        assertThatThrownBy(() -> commands.getConnection("invalid-host", -1)).isInstanceOf(RedisException.class);
     }
 
     @Test
-    public void msetCrossSlot() {
+    void msetCrossSlot() {
 
         StepVerifier.create(commands.mset(KeysAndValues.MAP)).expectNext("OK").verifyComplete();
 
@@ -90,7 +93,7 @@ public void msetCrossSlot() {
     }
 
     @Test
-    public void msetnxCrossSlot() {
+    void msetnxCrossSlot() {
 
         Map<String, String> mset = prepareMset();
 
@@ -107,7 +110,7 @@ public void msetnxCrossSlot() {
     }
 
     @Test
-    public void mgetCrossSlot() {
+    void mgetCrossSlot() {
 
         msetCrossSlot();
 
@@ -122,7 +125,7 @@ public void mgetCrossSlot() {
     }
 
     @Test
-    public void mgetCrossSlotStreaming() {
+    void mgetCrossSlotStreaming() {
 
         msetCrossSlot();
 
@@ -133,7 +136,7 @@ public void mgetCrossSlotStreaming() {
     }
 
     @Test
-    public void delCrossSlot() {
+    void delCrossSlot() {
 
         msetCrossSlot();
 
@@ -147,9 +150,8 @@ public void delCrossSlot() {
     }
 
     @Test
-    public void unlinkCrossSlot() {
-
-        assumeTrue(RedisConditions.of(syncCommands).hasCommand("UNLINK"));
+    @EnabledOnCommand("UNLINK")
+    void unlinkCrossSlot() {
 
         msetCrossSlot();
 
@@ -163,7 +165,7 @@ public void unlinkCrossSlot() {
     }
 
     @Test
-    public void clientSetname() {
+    void clientSetname() {
 
         String name = "test-cluster-client";
 
@@ -181,7 +183,7 @@ public void clientSetname() {
     }
 
     @Test
-    public void clientSetnameRunOnError() {
+    void clientSetnameRunOnError() {
 
         try {
             StepVerifier.create(commands.clientSetname("not allowed")).expectError().verify();
@@ -195,7 +197,7 @@ public void clientSetnameRunOnError() {
     }
 
     @Test
-    public void dbSize() {
+    void dbSize() {
 
         writeKeysToTwoNodes();
 
@@ -203,7 +205,7 @@ public void dbSize() {
     }
 
     @Test
-    public void flushall() {
+    void flushall() {
 
         writeKeysToTwoNodes();
 
@@ -214,7 +216,7 @@ public void flushall() {
     }
 
     @Test
-    public void flushdb() {
+    void flushdb() {
 
         writeKeysToTwoNodes();
 
@@ -225,7 +227,7 @@ public void flushdb() {
     }
 
     @Test
-    public void keys() {
+    void keys() {
 
         writeKeysToTwoNodes();
 
@@ -234,26 +236,26 @@ public void keys() {
     }
 
     @Test
-    public void keysDoesNotRunIntoRaceConditions() throws Exception {
+    void keysDoesNotRunIntoRaceConditions() {
 
-        List<RedisFuture> futures = new ArrayList<>();
+        List<RedisFuture<?>> futures = new ArrayList<>();
         RedisClusterAsyncCommands<String, String> async = commands.getStatefulConnection().async();
-        async.flushall().get();
+        Futures.await(async.flushall());
 
         for (int i = 0; i < 1000; i++) {
             futures.add(async.set("key-" + i, "value-" + i));
         }
 
-        futures.forEach(f -> f.toCompletableFuture().join());
+        Futures.awaitAll(futures);
 
         for (int i = 0; i < 100; i++) {
             CompletableFuture<Long> future = commands.keys("*").count().toFuture();
-            future.get(5, TimeUnit.SECONDS);
+            Futures.await(future);
         }
     }
 
     @Test
-    public void keysStreaming() {
+    void keysStreaming() {
 
         writeKeysToTwoNodes();
         ListStreamingAdapter<String> result = new ListStreamingAdapter<>();
@@ -263,7 +265,7 @@ public void keysStreaming() {
     }
 
     @Test
-    public void randomKey() {
+    void randomKey() {
 
         writeKeysToTwoNodes();
 
@@ -272,17 +274,17 @@ public void randomKey() {
     }
 
     @Test
-    public void scriptFlush() {
+    void scriptFlush() {
         StepVerifier.create(commands.scriptFlush()).expectNext("OK").verifyComplete();
     }
 
     @Test
-    public void scriptKill() {
+    void scriptKill() {
         StepVerifier.create(commands.scriptKill()).expectNext("OK").verifyComplete();
     }
 
     @Test
-    public void scriptLoad() throws Exception {
+    void scriptLoad() {
 
         scriptFlush();
 
@@ -298,19 +300,22 @@ public void scriptLoad() throws Exception {
     }
 
     @Test
-    @Ignore("Run me manually, I will shutdown all your cluster nodes so you need to restart the Redis Cluster after this test")
-    public void shutdown() {
+    @Disabled("Run me manually, I will shutdown all your cluster nodes so you need to restart the Redis Cluster after this test")
+    void shutdown() {
         commands.shutdown(true).subscribe();
     }
 
     @Test
-    public void readFromSlaves() throws Exception {
+    void readFromSlaves() {
 
-        RedisClusterReactiveCommands<String, String> connection = commands.getConnection(host, port4);
+        RedisClusterReactiveCommands<String, String> connection = commands.getConnection(ClusterTestSettings.host,
+                ClusterTestSettings.port4);
         connection.readOnly().subscribe();
         commands.set(key, value).subscribe();
 
-        NodeSelectionAsyncTest.waitForReplication(commands.getStatefulConnection().async(), key, port4);
+        NodeSelectionAsyncIntegrationTests
+                .waitForReplication(commands.getStatefulConnection().async(), ClusterTestSettings.key,
+                ClusterTestSettings.port4);
 
         AtomicBoolean error = new AtomicBoolean();
         connection.get(key).doOnError(throwable -> error.set(true)).block();
@@ -323,7 +328,7 @@ public void readFromSlaves() throws Exception {
     }
 
     @Test
-    public void clusterScan() {
+    void clusterScan() {
 
         RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
         sync.mset(KeysAndValues.MAP);
@@ -346,7 +351,7 @@ public void clusterScan() {
     }
 
     @Test
-    public void clusterScanWithArgs() {
+    void clusterScanWithArgs() {
 
         RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
         sync.mset(KeysAndValues.MAP);
@@ -370,7 +375,7 @@ public void clusterScanWithArgs() {
     }
 
     @Test
-    public void clusterScanStreaming() {
+    void clusterScanStreaming() {
 
         RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
         sync.mset(KeysAndValues.MAP);
@@ -392,7 +397,7 @@ public void clusterScanStreaming() {
     }
 
     @Test
-    public void clusterScanStreamingWithArgs() {
+    void clusterScanStreamingWithArgs() {
 
         RedisAdvancedClusterCommands<String, String> sync = commands.getStatefulConnection().sync();
         sync.mset(KeysAndValues.MAP);
@@ -418,7 +423,7 @@ private void writeKeysToTwoNodes() {
         syncCommands.set(KEY_ON_NODE_2, value);
     }
 
-    protected Map<String, String> prepareMset() {
+    Map<String, String> prepareMset() {
         Map<String, String> mset = new HashMap<>();
         for (char c = 'a'; c < 'z'; c++) {
             String key = new String(new char[] { c, c, c });
diff --git a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
similarity index 77%
rename from src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java
rename to src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
index 5052ae23e8..44873856cd 100644
--- a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
@@ -16,8 +16,8 @@
 package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -28,45 +28,47 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.*;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.util.SocketUtils;
 import org.springframework.util.StopWatch;
 
 import reactor.core.publisher.Mono;
-import io.lettuce.TestClientResources;
 import io.lettuce.core.ConnectionFuture;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.SocketOptions;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.ClusterNodeConnectionFactory.ConnectionKey;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.AsyncConnectionProvider;
+import io.lettuce.test.Futures;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.settings.TestSettings;
 import io.netty.channel.ConnectTimeoutException;
 
 /**
  * @author Mark Paluch
  */
-public class AsyncConnectionProviderTest {
+@ExtendWith(LettuceExtension.class)
+class AsyncConnectionProviderIntegrationTests {
 
-    private static RedisClusterClient redisClient;
+    private final RedisClusterClient redisClient;
     private ServerSocket serverSocket;
     private CountDownLatch connectInitiated = new CountDownLatch(1);
 
     private AsyncConnectionProvider<ConnectionKey, StatefulRedisConnection<String, String>, ConnectionFuture<StatefulRedisConnection<String, String>>> sut;
 
-    @BeforeClass
-    public static void beforeClass() {
-
-        RedisURI redisURI = RedisURI.create(TestSettings.host(), 1);
-        redisURI.setTimeout(Duration.ofSeconds(5));
-
-        redisClient = RedisClusterClient.create(TestClientResources.create(), redisURI);
-        redisClient.setOptions(ClusterClientOptions.create());
+    @Inject
+    AsyncConnectionProviderIntegrationTests(RedisClusterClient redisClient) {
+        this.redisClient = redisClient;
     }
 
-    @Before
-    public void before() throws Exception {
+    @BeforeEach
+    void before() throws Exception {
 
         serverSocket = new ServerSocket(SocketUtils.findAvailableTcpPort(), 1);
 
@@ -89,37 +91,33 @@ public ConnectionFuture<StatefulRedisConnection<String, String>> apply(Connectio
         });
     }
 
-    @After
-    public void after() throws Exception {
+    @AfterEach
+    void after() throws Exception {
         serverSocket.close();
     }
 
-    @AfterClass
-    public static void afterClass() {
-        redisClient.shutdown();
-    }
-
     @Test
-    public void shouldCreateConnection() throws IOException {
+    void shouldCreateConnection() throws IOException {
 
         ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, TestSettings.host(),
                 TestSettings.port());
-        StatefulRedisConnection<String, String> connection = sut.getConnection(connectionKey).toCompletableFuture().join();
+        StatefulRedisConnection<String, String> connection = Futures
+                .get(sut.getConnection(connectionKey).toCompletableFuture());
 
-        assertThat(sut.getConnection(connectionKey).toCompletableFuture().join()).isSameAs(connection);
+        assertThat(Futures.get(sut.getConnection(connectionKey).toCompletableFuture())).isSameAs(connection);
         sut.close();
         serverSocket.accept();
     }
 
     @Test
-    public void shouldMaintainConnectionCount() throws IOException {
+    void shouldMaintainConnectionCount() throws IOException {
 
         ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, TestSettings.host(),
                 TestSettings.port());
 
         assertThat(sut.getConnectionCount()).isEqualTo(0);
 
-        sut.getConnection(connectionKey).toCompletableFuture().join();
+        Futures.await(sut.getConnection(connectionKey).toCompletableFuture());
 
         assertThat(sut.getConnectionCount()).isEqualTo(1);
         sut.close();
@@ -128,7 +126,7 @@ public void shouldMaintainConnectionCount() throws IOException {
     }
 
     @Test
-    public void shouldCloseConnectionByKey() throws IOException {
+    void shouldCloseConnectionByKey() throws IOException {
 
         ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, TestSettings.host(),
                 TestSettings.port());
@@ -143,22 +141,22 @@ public void shouldCloseConnectionByKey() throws IOException {
     }
 
     @Test
-    public void shouldCloseConnections() throws IOException {
+    void shouldCloseConnections() throws IOException {
 
         ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, TestSettings.host(),
                 TestSettings.port());
 
         sut.getConnection(connectionKey);
-        sut.close().join();
+        Futures.await(sut.close());
 
         assertThat(sut.getConnectionCount()).isEqualTo(0);
-        sut.close().join();
+        Futures.await(sut.close());
 
         serverSocket.accept();
     }
 
     @Test
-    public void connectShouldFail() throws Exception {
+    void connectShouldFail() throws Exception {
 
         Socket socket = new Socket(TestSettings.host(), serverSocket.getLocalPort());
 
@@ -171,20 +169,13 @@ public void connectShouldFail() throws Exception {
 
         StopWatch stopWatch = new StopWatch();
 
-        try {
-            sut.getConnection(connectionKey).toCompletableFuture().get();
-            fail("Missing RedisConnectionException because of Timeout");
-        } catch (Exception e) {
-            assertThat(e).hasCauseInstanceOf(ConnectTimeoutException.class);
-        }
+        assertThatThrownBy(() -> Futures.await(sut.getConnection(connectionKey))).hasCauseInstanceOf(
+                ConnectTimeoutException.class);
+
         stopWatch.start();
 
-        try {
-            sut.getConnection(connectionKey).toCompletableFuture().join();
-            fail("Missing RedisConnectionException because of Timeout");
-        } catch (Exception e) {
-            assertThat(e).hasCauseInstanceOf(ConnectTimeoutException.class);
-        }
+        assertThatThrownBy(() -> Futures.await(sut.getConnection(connectionKey))).hasCauseInstanceOf(
+                ConnectTimeoutException.class);
 
         stopWatch.stop();
 
@@ -196,7 +187,7 @@ public void connectShouldFail() throws Exception {
     }
 
     @Test
-    public void connectShouldFailConcurrently() throws Exception {
+    void connectShouldFailConcurrently() throws Exception {
 
         Socket socket = new Socket(TestSettings.host(), serverSocket.getLocalPort());
 
@@ -241,7 +232,7 @@ public void connectShouldFailConcurrently() throws Exception {
     }
 
     @Test
-    public void shouldCloseAsync() throws Exception {
+    void shouldCloseAsync() throws Exception {
 
         assumeTrue(System.getProperty("os.name").toLowerCase().contains("mac"));
 
@@ -263,7 +254,7 @@ public void shouldCloseAsync() throws Exception {
                         .toCompletableFuture();
 
                 connectInitiated.countDown();
-                StatefulRedisConnection<String, String> connection = future.join();
+                StatefulRedisConnection<String, String> connection = Futures.get(future);
                 createdConnection.complete(connection);
             } catch (Exception e) {
                 createdConnection.completeExceptionally(e);
diff --git a/src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java b/src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java
index b4a054ba0f..4f5f26033b 100644
--- a/src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java
@@ -17,18 +17,25 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import javax.inject.Inject;
 
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class ByteCodecClusterTest extends AbstractClusterTest {
+@ExtendWith(LettuceExtension.class)
+class ByteCodecClusterTest extends TestSupport {
 
     @Test
-    public void testByteCodec() throws Exception {
+    @Inject
+    void testByteCodec(RedisClusterClient clusterClient) {
 
         StatefulRedisClusterConnection<byte[], byte[]> connection = clusterClient.connect(new ByteArrayCodec());
 
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
similarity index 94%
rename from src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
index 3e9d94d773..5cf621d920 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
@@ -17,15 +17,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class ClusterClientOptionsTest {
+class ClusterClientOptionsUnitTests {
 
     @Test
-    public void testCopy() throws Exception {
+    void testCopy() {
 
         ClusterClientOptions options = ClusterClientOptions.builder()
                 .autoReconnect(false).requestQueueSize(100).suspendReconnectOnProtocolFailure(true).maxRedirects(1234)
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
similarity index 66%
rename from src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
index a8d1634fa8..43e08017cb 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
@@ -20,15 +20,16 @@
 
 import java.util.List;
 
-import org.junit.*;
-import org.junit.runners.MethodSorters;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.Wait;
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
@@ -36,65 +37,52 @@
 import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
 import io.lettuce.core.cluster.models.slots.ClusterSlotRange;
 import io.lettuce.core.cluster.models.slots.ClusterSlotsParser;
-import io.lettuce.core.internal.LettuceLists;
-
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class ClusterCommandTest extends AbstractClusterTest {
-
-    protected static RedisClient client;
-
-    protected StatefulRedisConnection<String, String> connection;
-
-    protected RedisClusterAsyncCommands<String, String> async;
-
-    protected RedisClusterCommands<String, String> sync;
-
-    @BeforeClass
-    public static void setupClient() {
-        client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port1).build());
-        clusterClient = RedisClusterClient.create(TestClientResources.get(),
-                LettuceLists.newList(RedisURI.Builder.redis(host, port1).build()));
-
-    }
+import io.lettuce.test.Futures;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.Wait;
 
-    @AfterClass
-    public static void shutdownClient() {
-        FastShutdown.shutdown(client);
-        FastShutdown.shutdown(clusterClient);
-    }
+/**
+ * @author Mark Paluch
+ */
+@ExtendWith(LettuceExtension.class)
+class ClusterCommandIntegrationTests extends TestSupport {
 
-    @Before
-    public void before() throws Exception {
+    private final RedisClient client;
+    private final RedisClusterClient clusterClient;
+    private final StatefulRedisConnection<String, String> connection;
+    private final RedisClusterAsyncCommands<String, String> async;
+    private final RedisClusterCommands<String, String> sync;
 
-        clusterRule.getClusterClient().reloadPartitions();
+    @Inject
+    ClusterCommandIntegrationTests(RedisClient client, RedisClusterClient clusterClient) {
 
-        connection = client.connect(RedisURI.Builder.redis(host, port1).build());
-        sync = connection.sync();
-        async = connection.async();
+        this.client = client;
+        this.clusterClient = clusterClient;
 
+        this.connection = client.connect(RedisURI.Builder.redis(host, ClusterTestSettings.port1).build());
+        this.sync = connection.sync();
+        this.async = connection.async();
     }
 
-    @After
-    public void after() {
+    @AfterEach
+    void after() {
         connection.close();
     }
 
     @Test
-    public void testClusterBumpEpoch() throws Exception {
+    void testClusterBumpEpoch() {
 
         RedisFuture<String> future = async.clusterBumpepoch();
 
-        String result = future.get();
+        String result = Futures.get(future);
 
         assertThat(result).matches("(BUMPED|STILL).*");
     }
 
     @Test
-    public void testClusterInfo() throws Exception {
-
-        RedisFuture<String> future = async.clusterInfo();
+    void testClusterInfo() {
 
-        String result = future.get();
+        String result = sync.clusterInfo();
 
         assertThat(result).contains("cluster_known_nodes:");
         assertThat(result).contains("cluster_slots_fail:0");
@@ -102,7 +90,7 @@ public void testClusterInfo() throws Exception {
     }
 
     @Test
-    public void testClusterNodes() {
+    void testClusterNodes() {
 
         String result = sync.clusterNodes();
 
@@ -112,7 +100,7 @@ public void testClusterNodes() {
     }
 
     @Test
-    public void testClusterNodesSync() {
+    void testClusterNodesSync() {
 
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
 
@@ -125,41 +113,40 @@ public void testClusterNodesSync() {
     }
 
     @Test
-    public void testClusterSlaves() throws Exception {
+    void testClusterSlaves() {
 
         sync.set("b", value);
         RedisFuture<Long> replication = async.waitForReplication(1, 5);
-        assertThat(replication.get()).isGreaterThan(0L);
+        assertThat(Futures.get(replication)).isGreaterThan(0L);
     }
 
     @Test
-    public void testAsking() {
+    void testAsking() {
         assertThat(sync.asking()).isEqualTo("OK");
     }
 
     @Test
-    public void testReset() throws Exception {
+    void testReset() {
 
         clusterClient.reloadPartitions();
 
         StatefulRedisClusterConnection<String, String> clusterConnection = clusterClient.connect();
 
-        RedisFuture<String> setA = clusterConnection.async().set("a", "myValue1");
-        setA.get();
+        Futures.await(clusterConnection.async().set("a", "myValue1"));
 
         clusterConnection.reset();
 
-        setA = clusterConnection.async().set("a", "myValue1");
+        RedisFuture<String> setA = clusterConnection.async().set("a", "myValue1");
 
+        assertThat(Futures.get(setA)).isEqualTo("OK");
         assertThat(setA.getError()).isNull();
-        assertThat(setA.get()).isEqualTo("OK");
 
         connection.close();
 
     }
 
     @Test
-    public void testClusterSlots() {
+    void testClusterSlots() {
 
         List<Object> reply = sync.clusterSlots();
         assertThat(reply.size()).isGreaterThan(1);
@@ -175,7 +162,7 @@ public void testClusterSlots() {
     }
 
     @Test
-    public void readOnly() throws Exception {
+    void readOnly() throws Exception {
 
         // cluster node 3 is a slave for key "b"
         String key = "b";
@@ -183,7 +170,8 @@ public void readOnly() throws Exception {
         prepareReadonlyTest(key);
 
         // assume cluster node 3 is a slave for the master 1
-        RedisCommands<String, String> connect3 = client.connect(RedisURI.Builder.redis(host, port3).build()).sync();
+        RedisCommands<String, String> connect3 = client
+                .connect(RedisURI.Builder.redis(host, ClusterTestSettings.port3).build()).sync();
 
         assertThat(connect3.readOnly()).isEqualTo("OK");
         waitUntilValueIsVisible(key, connect3);
@@ -194,11 +182,10 @@ public void readOnly() throws Exception {
 
         resultBViewedBySlave = connect3.get("b");
         assertThat(resultBViewedBySlave).isEqualTo(value);
-
     }
 
     @Test
-    public void readOnlyWithReconnect() throws Exception {
+    void readOnlyWithReconnect() throws Exception {
 
         // cluster node 3 is a slave for key "b"
         String key = "b";
@@ -206,7 +193,8 @@ public void readOnlyWithReconnect() throws Exception {
         prepareReadonlyTest(key);
 
         // assume cluster node 3 is a slave for the master 1
-        RedisCommands<String, String> connect3 = client.connect(RedisURI.Builder.redis(host, port3).build()).sync();
+        RedisCommands<String, String> connect3 = client
+                .connect(RedisURI.Builder.redis(host, ClusterTestSettings.port3).build()).sync();
 
         assertThat(connect3.readOnly()).isEqualTo("OK");
         connect3.quit();
@@ -214,24 +202,10 @@ public void readOnlyWithReconnect() throws Exception {
 
         String resultViewedBySlave = connect3.get("b");
         assertThat(resultViewedBySlave).isEqualTo(value);
-
-    }
-
-    protected void waitUntilValueIsVisible(String key, RedisCommands<String, String> commands) {
-        Wait.untilTrue(() -> commands.get(key) != null).waitOrTimeout();
-    }
-
-    protected void prepareReadonlyTest(String key) throws InterruptedException, java.util.concurrent.ExecutionException {
-
-        async.set(key, value);
-
-        String resultB = async.get(key).get();
-        assertThat(resultB).isEqualTo(value);
-        Thread.sleep(500); // give some time to replicate
     }
 
     @Test
-    public void readOnlyReadWrite() throws Exception {
+    void readOnlyReadWrite() throws Exception {
 
         // cluster node 3 is a slave for key "b"
         String key = "b";
@@ -239,7 +213,8 @@ public void readOnlyReadWrite() throws Exception {
         prepareReadonlyTest(key);
 
         // assume cluster node 3 is a slave for the master 1
-        final RedisCommands<String, String> connect3 = client.connect(RedisURI.Builder.redis(host, port3).build()).sync();
+        final RedisCommands<String, String> connect3 = client.connect(
+                RedisURI.Builder.redis(host, ClusterTestSettings.port3).build()).sync();
 
         try {
             connect3.get("b");
@@ -259,7 +234,7 @@ public void readOnlyReadWrite() throws Exception {
     }
 
     @Test
-    public void clusterSlaves() {
+    void clusterSlaves() {
 
         String nodeId = getNodeId(sync);
         List<String> result = sync.clusterSlaves(nodeId);
@@ -267,4 +242,16 @@ public void clusterSlaves() {
         assertThat(result.size()).isGreaterThan(0);
     }
 
+    private void prepareReadonlyTest(String key) throws InterruptedException {
+
+        async.set(key, value);
+
+        String resultB = Futures.get(async.get(key));
+        assertThat(resultB).isEqualTo(value);
+        Thread.sleep(500); // give some time to replicate
+    }
+
+    private static void waitUntilValueIsVisible(String key, RedisCommands<String, String> commands) {
+        Wait.untilTrue(() -> commands.get(key) != null).waitOrTimeout();
+    }
 }
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandInternalsTest.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java
similarity index 77%
rename from src/test/java/io/lettuce/core/cluster/ClusterCommandInternalsTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java
index 6f8a5e0fa8..746d4d1a5e 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterCommandInternalsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java
@@ -22,11 +22,11 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import io.lettuce.core.RedisChannelWriter;
 import io.lettuce.core.codec.Utf8StringCodec;
@@ -35,30 +35,33 @@
 import io.lettuce.core.protocol.Command;
 import io.lettuce.core.protocol.CommandType;
 
-@RunWith(MockitoJUnitRunner.class)
-public class ClusterCommandInternalsTest {
+/**
+ * @author Mark Paluch
+ */
+@ExtendWith(MockitoExtension.class)
+class ClusterCommandUnitTests {
 
     @Mock
     private RedisChannelWriter writerMock;
 
     private ClusterCommand<String, String, String> sut;
-    private Command<String, String, String> command = new Command<String, String, String>(CommandType.TYPE,
-            new StatusOutput<String, String>(new Utf8StringCodec()), null);
+    private Command<String, String, String> command = new Command<>(CommandType.TYPE,
+            new StatusOutput<>(new Utf8StringCodec()), null);
 
-    @Before
-    public void before() throws Exception {
-        sut = new ClusterCommand<String, String, String>(command, writerMock, 1);
+    @BeforeEach
+    void before() {
+        sut = new ClusterCommand<>(command, writerMock, 1);
     }
 
     @Test
-    public void testException() throws Exception {
+    void testException() {
 
         sut.completeExceptionally(new Exception());
         assertThat(sut.isCompleted());
     }
 
     @Test
-    public void testCancel() throws Exception {
+    void testCancel() {
 
         assertThat(command.isCancelled()).isFalse();
         sut.cancel();
@@ -66,7 +69,7 @@ public void testCancel() throws Exception {
     }
 
     @Test
-    public void testComplete() throws Exception {
+    void testComplete() {
 
         sut.complete();
         assertThat(sut.isCompleted()).isTrue();
@@ -74,7 +77,7 @@ public void testComplete() throws Exception {
     }
 
     @Test
-    public void testRedirect() throws Exception {
+    void testRedirect() {
 
         sut.getOutput().setError("MOVED 1234 127.0.0.1:1000");
         sut.complete();
@@ -85,7 +88,7 @@ public void testRedirect() throws Exception {
     }
 
     @Test
-    public void testRedirectLimit() throws Exception {
+    void testRedirectLimit() {
 
         sut.getOutput().setError("MOVED 1234 127.0.0.1:1000");
         sut.complete();
@@ -99,7 +102,7 @@ public void testRedirectLimit() throws Exception {
     }
 
     @Test
-    public void testCompleteListener() throws Exception {
+    void testCompleteListener() {
 
         final List<String> someList = new ArrayList<>();
 
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterTest.java b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java
similarity index 87%
rename from src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java
index 6c16b5a209..e6cbea89b4 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java
@@ -20,7 +20,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.cluster.ClusterConnectionProvider.Intent;
 import io.lettuce.core.internal.HostAndPort;
@@ -31,10 +31,10 @@
 /**
  * @author Mark Paluch
  */
-public class ClusterDistributionChannelWriterTest {
+class ClusterDistributionChannelWriterUnitTests {
 
     @Test
-    public void shouldParseAskTargetCorrectly() {
+    void shouldParseAskTargetCorrectly() {
 
         HostAndPort askTarget = ClusterDistributionChannelWriter.getAskTarget("ASK 1234 127.0.0.1:6381");
 
@@ -43,7 +43,7 @@ public void shouldParseAskTargetCorrectly() {
     }
 
     @Test
-    public void shouldParseIPv6AskTargetCorrectly() {
+    void shouldParseIPv6AskTargetCorrectly() {
 
         HostAndPort askTarget = ClusterDistributionChannelWriter.getAskTarget("ASK 1234 1:2:3:4::6:6381");
 
@@ -52,7 +52,7 @@ public void shouldParseIPv6AskTargetCorrectly() {
     }
 
     @Test
-    public void shouldParseMovedTargetCorrectly() {
+    void shouldParseMovedTargetCorrectly() {
 
         HostAndPort moveTarget = ClusterDistributionChannelWriter.getMoveTarget("MOVED 1234 127.0.0.1:6381");
 
@@ -61,7 +61,7 @@ public void shouldParseMovedTargetCorrectly() {
     }
 
     @Test
-    public void shouldParseIPv6MovedTargetCorrectly() {
+    void shouldParseIPv6MovedTargetCorrectly() {
 
         HostAndPort moveTarget = ClusterDistributionChannelWriter.getMoveTarget("MOVED 1234 1:2:3:4::6:6381");
 
@@ -70,7 +70,7 @@ public void shouldParseIPv6MovedTargetCorrectly() {
     }
 
     @Test
-    public void shouldReturnIntentForWriteCommand() {
+    void shouldReturnIntentForWriteCommand() {
 
         RedisCommand<String, String, String> set = new Command<>(CommandType.SET, null);
         RedisCommand<String, String, String> mset = new Command<>(CommandType.MSET, null);
@@ -81,13 +81,13 @@ public void shouldReturnIntentForWriteCommand() {
     }
 
     @Test
-    public void shouldReturnDefaultIntentForNoCommands() {
+    void shouldReturnDefaultIntentForNoCommands() {
 
         assertThat(ClusterDistributionChannelWriter.getIntent(Collections.emptyList())).isEqualTo(Intent.WRITE);
     }
 
     @Test
-    public void shouldReturnIntentForReadCommand() {
+    void shouldReturnIntentForReadCommand() {
 
         RedisCommand<String, String, String> get = new Command<>(CommandType.GET, null);
         RedisCommand<String, String, String> mget = new Command<>(CommandType.MGET, null);
@@ -98,7 +98,7 @@ public void shouldReturnIntentForReadCommand() {
     }
 
     @Test
-    public void shouldReturnIntentForMixedCommands() {
+    void shouldReturnIntentForMixedCommands() {
 
         RedisCommand<String, String, String> set = new Command<>(CommandType.SET, null);
         RedisCommand<String, String, String> mget = new Command<>(CommandType.MGET, null);
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
similarity index 76%
rename from src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
index da55359bc9..61a353f2ab 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
@@ -14,21 +14,20 @@
  */
 package io.lettuce.core.cluster;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.assertj.core.api.AssertionsForClassTypes.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import java.util.Queue;
-import java.util.concurrent.ExecutionException;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.ClientOptions;
@@ -41,12 +40,13 @@
 import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.resource.ClientResources;
+import io.lettuce.test.Futures;
 
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class ClusterNodeEndpointTest {
+@ExtendWith(MockitoExtension.class)
+class ClusterNodeEndpointUnitTests {
 
     private AsyncCommand<String, String, String> command = new AsyncCommand<>(new Command<>(CommandType.APPEND,
             new StatusOutput<>(new Utf8StringCodec()), null));
@@ -64,8 +64,8 @@ public class ClusterNodeEndpointTest {
 
     private ClusterNodeEndpoint sut;
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
 
         when(clientOptions.getRequestQueueSize()).thenReturn(1000);
         when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.DEFAULT);
@@ -74,14 +74,14 @@ public void before() {
     }
 
     @Test
-    public void closeWithoutCommands() {
+    void closeWithoutCommands() {
 
         sut.close();
         verifyZeroInteractions(clusterChannelWriter);
     }
 
     @Test
-    public void closeWithQueuedCommands() {
+    void closeWithQueuedCommands() {
 
         disconnectedBuffer.add(command);
 
@@ -91,7 +91,7 @@ public void closeWithQueuedCommands() {
     }
 
     @Test
-    public void closeWithCancelledQueuedCommands() {
+    void closeWithCancelledQueuedCommands() {
 
         disconnectedBuffer.add(command);
         command.cancel();
@@ -102,7 +102,7 @@ public void closeWithCancelledQueuedCommands() {
     }
 
     @Test
-    public void closeWithQueuedCommandsFails() throws Exception {
+    void closeWithQueuedCommandsFails() {
 
         disconnectedBuffer.add(command);
         when(clusterChannelWriter.write(any(RedisCommand.class))).thenThrow(new RedisException("meh"));
@@ -111,17 +111,11 @@ public void closeWithQueuedCommandsFails() throws Exception {
 
         assertThat(command.isDone()).isTrue();
 
-        try {
-
-            command.get();
-            fail("Expected ExecutionException");
-        } catch (ExecutionException e) {
-            assertThat(e).hasCauseExactlyInstanceOf(RedisException.class);
-        }
+        assertThatThrownBy(() -> Futures.await(command)).isInstanceOf(RedisException.class);
     }
 
     @Test
-    public void closeWithBufferedCommands() {
+    void closeWithBufferedCommands() {
 
         when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS);
         prepareNewEndpoint();
@@ -134,7 +128,7 @@ public void closeWithBufferedCommands() {
     }
 
     @Test
-    public void closeWithCancelledBufferedCommands() {
+    void closeWithCancelledBufferedCommands() {
 
         when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS);
         prepareNewEndpoint();
@@ -148,7 +142,7 @@ public void closeWithCancelledBufferedCommands() {
     }
 
     @Test
-    public void closeWithBufferedCommandsFails() throws Exception {
+    void closeWithBufferedCommandsFails() {
 
         when(clientOptions.getDisconnectedBehavior()).thenReturn(ClientOptions.DisconnectedBehavior.ACCEPT_COMMANDS);
         prepareNewEndpoint();
@@ -158,13 +152,7 @@ public void closeWithBufferedCommandsFails() throws Exception {
 
         sut.close();
 
-        try {
-
-            command.get();
-            fail("Expected ExecutionException");
-        } catch (ExecutionException e) {
-            assertThat(e).hasCauseExactlyInstanceOf(RedisException.class);
-        }
+        assertThatThrownBy(() -> Futures.await(command)).isInstanceOf(RedisException.class);
     }
 
     private void prepareNewEndpoint() {
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java
similarity index 86%
rename from src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java
index 12eb204b53..79c29fd532 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java
@@ -23,23 +23,26 @@
 import java.util.HashSet;
 import java.util.List;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import io.lettuce.TestClientResources;
-import io.lettuce.core.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import io.lettuce.core.RedisConnectionException;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.internal.LettuceLists;
 import io.lettuce.core.resource.ClientResources;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class ClusterPartiallyDownTest extends AbstractTest {
+class ClusterPartiallyDownIntegrationTests extends TestSupport {
 
     private static ClientResources clientResources;
 
@@ -55,23 +58,18 @@ public class ClusterPartiallyDownTest extends AbstractTest {
 
     private RedisClusterClient redisClusterClient;
 
-    @BeforeClass
-    public static void beforeClass() {
+    @BeforeAll
+    static void beforeClass() {
         clientResources = TestClientResources.get();
     }
 
-    @Before
-    public void before() {
-
-    }
-
-    @After
-    public void after() {
+    @AfterEach
+    void after() {
         redisClusterClient.shutdown();
     }
 
     @Test
-    public void connectToPartiallyDownCluster() throws IOException {
+    void connectToPartiallyDownCluster() {
 
         List<RedisURI> seed = LettuceLists.unmodifiableList(URI_1, URI_2, URI_3, URI_4);
         redisClusterClient = RedisClusterClient.create(clientResources, seed);
@@ -83,7 +81,7 @@ public void connectToPartiallyDownCluster() throws IOException {
     }
 
     @Test
-    public void operateOnPartiallyDownCluster() {
+    void operateOnPartiallyDownCluster() {
 
         List<RedisURI> seed = LettuceLists.unmodifiableList(URI_1, URI_2, URI_3, URI_4);
         redisClusterClient = RedisClusterClient.create(clientResources, seed);
@@ -103,7 +101,7 @@ public void operateOnPartiallyDownCluster() {
     }
 
     @Test
-    public void seedNodesAreOffline() {
+    void seedNodesAreOffline() {
 
         List<RedisURI> seed = LettuceLists.unmodifiableList(URI_1, URI_2, URI_3);
         redisClusterClient = RedisClusterClient.create(clientResources, seed);
@@ -118,7 +116,7 @@ public void seedNodesAreOffline() {
     }
 
     @Test
-    public void partitionNodesAreOffline() {
+    void partitionNodesAreOffline() {
 
         List<RedisURI> seed = LettuceLists.unmodifiableList(URI_1, URI_2, URI_3);
         redisClusterClient = RedisClusterClient.create(clientResources, seed);
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandIntegrationTests.java
similarity index 52%
rename from src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandIntegrationTests.java
index 7ab3013125..1cb45bbb26 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandIntegrationTests.java
@@ -15,72 +15,51 @@
  */
 package io.lettuce.core.cluster;
 
-import static io.lettuce.core.cluster.ClusterTestUtil.getNodeId;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
 
-import org.junit.*;
-import org.junit.runners.MethodSorters;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import reactor.test.StepVerifier;
-import io.lettuce.TestClientResources;
-import io.lettuce.core.FastShutdown;
-import io.lettuce.core.RedisClient;
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.cluster.models.slots.ClusterSlotRange;
 import io.lettuce.core.cluster.models.slots.ClusterSlotsParser;
-import io.lettuce.core.internal.LettuceLists;
-
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@SuppressWarnings("unchecked")
-public class ClusterReactiveCommandTest extends AbstractClusterTest {
-
-    protected static RedisClient client;
-
-    protected RedisClusterReactiveCommands<String, String> reactive;
-    protected RedisAsyncCommands<String, String> async;
+import io.lettuce.test.LettuceExtension;
 
-    @BeforeClass
-    public static void setupClient() throws Exception {
-        setupClusterClient();
-        client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port1).build());
-        clusterClient = RedisClusterClient.create(TestClientResources.get(),
-                LettuceLists.unmodifiableList(RedisURI.Builder.redis(host, port1).build()));
-
-    }
-
-    @AfterClass
-    public static void shutdownClient() {
-        shutdownClusterClient();
-        FastShutdown.shutdown(client);
-        FastShutdown.shutdown(clusterClient);
-    }
-
-    @Before
-    public void before() throws Exception {
+/**
+ * @author Mark Paluch
+ */
+@ExtendWith(LettuceExtension.class)
+class ClusterReactiveCommandIntegrationTests {
 
-        clusterRule.getClusterClient().reloadPartitions();
+    private final RedisClusterClient clusterClient;
+    private final RedisClusterReactiveCommands<String, String> reactive;
+    private final RedisClusterCommands<String, String> sync;
 
-        async = client.connect(RedisURI.Builder.redis(host, port1).build()).async();
-        reactive = async.getStatefulConnection().reactive();
-    }
+    @Inject
+    ClusterReactiveCommandIntegrationTests(RedisClusterClient clusterClient,
+            StatefulRedisClusterConnection<String, String> connection) {
+        this.clusterClient = clusterClient;
 
-    @After
-    public void after() throws Exception {
-        async.getStatefulConnection().close();
+        this.reactive = connection.reactive();
+        this.sync = connection.sync();
     }
 
     @Test
-    public void testClusterBumpEpoch() throws Exception {
+    void testClusterBumpEpoch() {
         StepVerifier.create(reactive.clusterBumpepoch())
                 .consumeNextWith(actual -> assertThat(actual).matches("(BUMPED|STILL).*")).verifyComplete();
     }
 
     @Test
-    public void testClusterInfo() throws Exception {
+    void testClusterInfo() {
 
         StepVerifier.create(reactive.clusterInfo()).consumeNextWith(actual -> {
             assertThat(actual).contains("cluster_known_nodes:");
@@ -90,7 +69,7 @@ public void testClusterInfo() throws Exception {
     }
 
     @Test
-    public void testClusterNodes() throws Exception {
+    void testClusterNodes() {
 
         StepVerifier.create(reactive.clusterNodes()).consumeNextWith(actual -> {
             assertThat(actual).contains("connected");
@@ -100,17 +79,12 @@ public void testClusterNodes() throws Exception {
     }
 
     @Test
-    public void testClusterSlaves() throws Exception {
-        StepVerifier.create(reactive.waitForReplication(1, 5)).expectNextCount(1).verifyComplete();
-    }
-
-    @Test
-    public void testAsking() throws Exception {
+    void testAsking() {
         StepVerifier.create(reactive.asking()).expectNext("OK").verifyComplete();
     }
 
     @Test
-    public void testClusterSlots() throws Exception {
+    void testClusterSlots() {
 
         List<Object> reply = reactive.clusterSlots().collectList().block();
         assertThat(reply.size()).isGreaterThan(1);
@@ -126,10 +100,12 @@ public void testClusterSlots() throws Exception {
     }
 
     @Test
-    public void clusterSlaves() throws Exception {
+    void clusterSlaves() {
+
+        RedisClusterNode master = clusterClient.getPartitions().stream().filter(it -> it.is(RedisClusterNode.NodeFlag.MASTER))
+                .findFirst().get();
 
-        String nodeId = getNodeId(async.getStatefulConnection().sync());
-        List<String> result = reactive.clusterSlaves(nodeId).collectList().block();
+        List<String> result = reactive.clusterSlaves(master.getNodeId()).collectList().block();
 
         assertThat(result.size()).isGreaterThan(0);
     }
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterRule.java b/src/test/java/io/lettuce/core/cluster/ClusterRule.java
index 051de56e17..3aab49a9af 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterRule.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterRule.java
@@ -63,7 +63,7 @@ public Statement apply(final Statement base, Description description) {
 
         final Statement beforeCluster = new Statement() {
             @Override
-            public void evaluate() throws Throwable {
+            public void evaluate() {
                 flushdb();
             }
         };
@@ -116,7 +116,7 @@ public boolean isStable() {
     /**
      * Flush data on all nodes, ignore failures.
      */
-    public void flushdb() {
+    private void flushdb() {
         onAllConnections(c -> c.flushdb(), true);
     }
 
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterSetup.java b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
index 82b170dd7c..5edcf115fc 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
@@ -15,39 +15,34 @@
  */
 package io.lettuce.core.cluster;
 
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
 import java.util.stream.Stream;
 
-import io.lettuce.Wait;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands;
 import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
 import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.test.Futures;
+import io.lettuce.test.Wait;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class ClusterSetup {
+class ClusterSetup {
 
     /**
-     * Setup a cluster consisting of two members (see {@link AbstractClusterTest#port5} to {@link AbstractClusterTest#port6}).
+     * Setup a cluster consisting of two members (see {@link ClusterTestSettings#port5} to {@link ClusterTestSettings#port6}).
      * Two masters (0-11999 and 12000-16383)
      *
      * @param clusterRule
-     * @throws InterruptedException
-     * @throws ExecutionException
-     * @throws TimeoutException
      */
-    public static void setup2Masters(ClusterRule clusterRule)
-            throws InterruptedException, ExecutionException, TimeoutException {
+    public static void setup2Masters(ClusterRule clusterRule) {
 
         clusterRule.clusterReset();
-        clusterRule.meet(AbstractClusterTest.host, AbstractClusterTest.port5);
-        clusterRule.meet(AbstractClusterTest.host, AbstractClusterTest.port6);
+        clusterRule.meet(ClusterTestSettings.host, ClusterTestSettings.port5);
+        clusterRule.meet(ClusterTestSettings.host, ClusterTestSettings.port6);
 
         RedisAdvancedClusterAsyncCommands<String, String> connection = clusterRule.getClusterClient().connect().async();
         Wait.untilTrue(() -> {
@@ -69,13 +64,13 @@ public static void setup2Masters(ClusterRule clusterRule)
             }
         }
 
-        RedisClusterAsyncCommands<String, String> node1 = connection.getConnection(AbstractClusterTest.host,
-                AbstractClusterTest.port5);
-        node1.clusterAddSlots(AbstractClusterTest.createSlots(0, 12000));
+        RedisClusterAsyncCommands<String, String> node1 = connection.getConnection(ClusterTestSettings.host,
+                ClusterTestSettings.port5);
+        node1.clusterAddSlots(ClusterTestSettings.createSlots(0, 12000));
 
-        RedisClusterAsyncCommands<String, String> node2 = connection.getConnection(AbstractClusterTest.host,
-                AbstractClusterTest.port6);
-        node2.clusterAddSlots(AbstractClusterTest.createSlots(12000, 16384));
+        RedisClusterAsyncCommands<String, String> node2 = connection.getConnection(ClusterTestSettings.host,
+                ClusterTestSettings.port6);
+        node2.clusterAddSlots(ClusterTestSettings.createSlots(12000, 16384));
 
         Wait.untilTrue(clusterRule::isStable).waitOrTimeout();
 
@@ -90,20 +85,16 @@ public static void setup2Masters(ClusterRule clusterRule)
     }
 
     /**
-     * Setup a cluster consisting of two members (see {@link AbstractClusterTest#port5} to {@link AbstractClusterTest#port6}).
+     * Setup a cluster consisting of two members (see {@link ClusterTestSettings#port5} to {@link ClusterTestSettings#port6}).
      * One master (0-16383) and one slave.
      *
      * @param clusterRule
-     * @throws InterruptedException
-     * @throws ExecutionException
-     * @throws TimeoutException
      */
-    public static void setupMasterWithSlave(ClusterRule clusterRule)
-            throws InterruptedException, ExecutionException, TimeoutException {
+    public static void setupMasterWithSlave(ClusterRule clusterRule) {
 
         clusterRule.clusterReset();
-        clusterRule.meet(AbstractClusterTest.host, AbstractClusterTest.port5);
-        clusterRule.meet(AbstractClusterTest.host, AbstractClusterTest.port6);
+        clusterRule.meet(ClusterTestSettings.host, ClusterTestSettings.port5);
+        clusterRule.meet(ClusterTestSettings.host, ClusterTestSettings.port6);
 
         RedisAdvancedClusterAsyncCommands<String, String> connection = clusterRule.getClusterClient().connect().async();
         StatefulRedisClusterConnection<String, String> statefulConnection = connection.getStatefulConnection();
@@ -114,13 +105,13 @@ public static void setupMasterWithSlave(ClusterRule clusterRule)
         }).waitOrTimeout();
 
         RedisClusterCommands<String, String> node1 = statefulConnection
-                .getConnection(TestSettings.hostAddr(), AbstractClusterTest.port5).sync();
-        node1.clusterAddSlots(AbstractClusterTest.createSlots(0, 16384));
+                .getConnection(TestSettings.hostAddr(), ClusterTestSettings.port5).sync();
+        node1.clusterAddSlots(ClusterTestSettings.createSlots(0, 16384));
 
         Wait.untilTrue(clusterRule::isStable).waitOrTimeout();
 
-        connection.getConnection(AbstractClusterTest.host, AbstractClusterTest.port6).clusterReplicate(node1.clusterMyId())
-                .get();
+        Futures.await(connection.getConnection(ClusterTestSettings.host, ClusterTestSettings.port6).clusterReplicate(
+                node1.clusterMyId()));
 
         clusterRule.getClusterClient().reloadPartitions();
 
@@ -139,7 +130,7 @@ public static void setupMasterWithSlave(ClusterRule clusterRule)
         connection.getStatefulConnection().close();
     }
 
-    protected static Stream<RedisClusterNode> partitionStream(ClusterRule clusterRule) {
+    private static Stream<RedisClusterNode> partitionStream(ClusterRule clusterRule) {
         return clusterRule.getClusterClient().getPartitions().getPartitions().stream();
     }
 
diff --git a/src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java b/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java
similarity index 64%
rename from src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java
index 8f33c13cf4..7c27ff417f 100644
--- a/src/test/java/io/lettuce/core/cluster/AbstractClusterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java
@@ -15,30 +15,21 @@
  */
 package io.lettuce.core.cluster;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-
-import io.lettuce.TestClientResources;
-import io.lettuce.core.AbstractTest;
-import io.lettuce.core.FastShutdown;
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
-import io.lettuce.core.internal.LettuceLists;
+import io.lettuce.core.TestSupport;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class AbstractClusterTest extends AbstractTest {
+public abstract class ClusterTestSettings extends TestSupport {
 
     public static final String host = TestSettings.hostAddr();
 
     public static final int SLOT_A = SlotHash.getSlot("a".getBytes());
     public static final int SLOT_B = SlotHash.getSlot("b".getBytes());
 
-
     // default test cluster 2 masters + 2 slaves
-    public static final int port1 = 7379;
+    public static final int port1 = TestSettings.port(900);
     public static final int port2 = port1 + 1;
     public static final int port3 = port1 + 2;
     public static final int port4 = port1 + 3;
@@ -53,22 +44,6 @@ public class AbstractClusterTest extends AbstractTest {
     public static final String KEY_B = "b";
     public static final String KEY_D = "d";
 
-    protected static RedisClusterClient clusterClient;
-
-    @Rule
-    public ClusterRule clusterRule = new ClusterRule(clusterClient, port1, port2, port3, port4);
-
-    @BeforeClass
-    public static void setupClusterClient() {
-        clusterClient = RedisClusterClient.create(
-                TestClientResources.get(), LettuceLists.unmodifiableList(RedisURI.Builder.redis(host, port1).build()));
-    }
-
-    @AfterClass
-    public static void shutdownClusterClient() {
-        FastShutdown.shutdown(clusterClient);
-    }
-
     public static int[] createSlots(int from, int to) {
         int[] result = new int[to - from];
         int counter = 0;
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java b/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java
index 54088f4350..6bfd7833ca 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java
@@ -24,7 +24,7 @@
 import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
-import io.lettuce.util.RoutingInvocationHandler;
+import io.lettuce.test.RoutingInvocationHandler;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsUnitTests.java
similarity index 94%
rename from src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsUnitTests.java
index c98a28a569..027fbf0580 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsUnitTests.java
@@ -20,17 +20,17 @@
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.cluster.ClusterTopologyRefreshOptions.RefreshTrigger;
 
 /**
  * @author Mark Paluch
  */
-public class ClusterTopologyRefreshOptionsTest {
+class ClusterTopologyRefreshOptionsUnitTests {
 
     @Test
-    public void testBuilder() throws Exception {
+    void testBuilder() {
 
         ClusterTopologyRefreshOptions options = ClusterTopologyRefreshOptions.builder()//
                 .enablePeriodicRefresh(true).refreshPeriod(10, TimeUnit.MINUTES)//
@@ -51,7 +51,7 @@ public void testBuilder() throws Exception {
     }
 
     @Test
-    public void testCopy() throws Exception {
+    void testCopy() {
 
         ClusterTopologyRefreshOptions master = ClusterTopologyRefreshOptions.builder()//
                 .enablePeriodicRefresh(true).refreshPeriod(10, TimeUnit.MINUTES)//
@@ -74,7 +74,7 @@ public void testCopy() throws Exception {
     }
 
     @Test
-    public void testDefault() throws Exception {
+    void testDefault() {
 
         ClusterTopologyRefreshOptions options = ClusterTopologyRefreshOptions.create();
 
@@ -93,7 +93,7 @@ public void testDefault() throws Exception {
     }
 
     @Test
-    public void testEnabled() throws Exception {
+    void testEnabled() {
 
         ClusterTopologyRefreshOptions options = ClusterTopologyRefreshOptions.enabled();
 
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
similarity index 84%
rename from src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java
rename to src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
index fcfccbd407..1bff6c702e 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
@@ -23,11 +23,13 @@
 
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 import io.lettuce.core.resource.ClientResources;
 import io.netty.util.concurrent.EventExecutorGroup;
@@ -35,8 +37,9 @@
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class ClusterTopologyRefreshSchedulerTest {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class ClusterTopologyRefreshSchedulerUnitTests {
 
     private ClusterTopologyRefreshScheduler sut;
 
@@ -55,8 +58,8 @@ public class ClusterTopologyRefreshSchedulerTest {
     @Mock
     private EventExecutorGroup eventExecutors;
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
 
         when(clientResources.eventExecutorGroup()).thenReturn(eventExecutors);
 
@@ -64,7 +67,7 @@ public void before() {
     }
 
     @Test
-    public void runShouldSubmitRefreshShouldTrigger() {
+    void runShouldSubmitRefreshShouldTrigger() {
 
         when(clusterClient.getClusterClientOptions()).thenReturn(clusterClientOptions);
 
@@ -73,7 +76,7 @@ public void runShouldSubmitRefreshShouldTrigger() {
     }
 
     @Test
-    public void runnableShouldCallPartitionRefresh() {
+    void runnableShouldCallPartitionRefresh() {
 
         when(clusterClient.getClusterClientOptions()).thenReturn(clusterClientOptions);
 
@@ -88,14 +91,14 @@ public void runnableShouldCallPartitionRefresh() {
     }
 
     @Test
-    public void shouldNotSubmitIfOptionsNotSet() {
+    void shouldNotSubmitIfOptionsNotSet() {
 
         sut.run();
         verify(eventExecutors, never()).submit(any(Runnable.class));
     }
 
     @Test
-    public void shouldNotSubmitIfExecutorIsShuttingDown() {
+    void shouldNotSubmitIfExecutorIsShuttingDown() {
 
         when(eventExecutors.isShuttingDown()).thenReturn(true);
 
@@ -104,7 +107,7 @@ public void shouldNotSubmitIfExecutorIsShuttingDown() {
     }
 
     @Test
-    public void shouldNotSubmitIfExecutorIsShutdown() {
+    void shouldNotSubmitIfExecutorIsShutdown() {
 
         when(eventExecutors.isShutdown()).thenReturn(true);
 
@@ -113,7 +116,7 @@ public void shouldNotSubmitIfExecutorIsShutdown() {
     }
 
     @Test
-    public void shouldNotSubmitIfExecutorIsTerminated() {
+    void shouldNotSubmitIfExecutorIsTerminated() {
 
         when(eventExecutors.isTerminated()).thenReturn(true);
 
@@ -122,7 +125,7 @@ public void shouldNotSubmitIfExecutorIsTerminated() {
     }
 
     @Test
-    public void shouldTriggerRefreshOnAskRedirection() {
+    void shouldTriggerRefreshOnAskRedirection() {
 
         ClusterTopologyRefreshOptions clusterTopologyRefreshOptions = ClusterTopologyRefreshOptions.builder()
                 .enableAllAdaptiveRefreshTriggers().build();
@@ -137,7 +140,7 @@ public void shouldTriggerRefreshOnAskRedirection() {
     }
 
     @Test
-    public void shouldNotTriggerAdaptiveRefreshUsingDefaults() {
+    void shouldNotTriggerAdaptiveRefreshUsingDefaults() {
 
         ClusterTopologyRefreshOptions clusterTopologyRefreshOptions = ClusterTopologyRefreshOptions.create();
 
@@ -151,7 +154,7 @@ public void shouldNotTriggerAdaptiveRefreshUsingDefaults() {
     }
 
     @Test
-    public void shouldTriggerRefreshOnMovedRedirection() {
+    void shouldTriggerRefreshOnMovedRedirection() {
 
         ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder().topologyRefreshOptions(immediateRefresh)
                 .build();
@@ -163,7 +166,7 @@ public void shouldTriggerRefreshOnMovedRedirection() {
     }
 
     @Test
-    public void shouldTriggerRefreshOnReconnect() {
+    void shouldTriggerRefreshOnReconnect() {
 
         ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder().topologyRefreshOptions(immediateRefresh)
                 .build();
@@ -175,7 +178,7 @@ public void shouldTriggerRefreshOnReconnect() {
     }
 
     @Test
-    public void shouldTriggerRefreshOnUnknownNode() {
+    void shouldTriggerRefreshOnUnknownNode() {
 
         ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder().topologyRefreshOptions(immediateRefresh)
                 .build();
@@ -187,7 +190,7 @@ public void shouldTriggerRefreshOnUnknownNode() {
     }
 
     @Test
-    public void shouldNotTriggerRefreshOnFirstReconnect() {
+    void shouldNotTriggerRefreshOnFirstReconnect() {
 
         ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder().topologyRefreshOptions(immediateRefresh)
                 .build();
@@ -199,7 +202,7 @@ public void shouldNotTriggerRefreshOnFirstReconnect() {
     }
 
     @Test
-    public void shouldRateLimitAdaptiveRequests() throws Exception {
+    void shouldRateLimitAdaptiveRequests() throws Exception {
 
         ClusterTopologyRefreshOptions adaptiveTimeout = ClusterTopologyRefreshOptions.builder().enablePeriodicRefresh(false)
                 .enableAllAdaptiveRefreshTriggers().adaptiveRefreshTriggersTimeout(50, TimeUnit.MILLISECONDS).build();
diff --git a/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusTest.java b/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusUnitTests.java
similarity index 91%
rename from src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusTest.java
rename to src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusUnitTests.java
index 2ad68f16b2..87cc2f7353 100644
--- a/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusTest.java
+++ b/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusUnitTests.java
@@ -24,7 +24,7 @@
 import java.util.Collections;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.models.partitions.Partitions;
@@ -33,7 +33,7 @@
 /**
  * @author Mark Paluch
  */
-public class HealthyMajorityPartitionsConsensusTest {
+class HealthyMajorityPartitionsConsensusUnitTests {
 
     private RedisClusterNode node1 = createNode(1);
     private RedisClusterNode node2 = createNode(2);
@@ -42,7 +42,7 @@ public class HealthyMajorityPartitionsConsensusTest {
     private RedisClusterNode node5 = createNode(5);
 
     @Test
-    public void sameSharedViewShouldDecideForHealthyNodes() throws Exception {
+    void sameSharedViewShouldDecideForHealthyNodes() {
 
         Partitions partitions1 = createPartitions(node1, node2, node3, node4, node5);
         Partitions partitions2 = createPartitions(node1, node2, node3, node4, node5);
@@ -56,7 +56,7 @@ public void sameSharedViewShouldDecideForHealthyNodes() throws Exception {
     }
 
     @Test
-    public void unhealthyNodeViewShouldDecideForHealthyNodes() throws Exception {
+    void unhealthyNodeViewShouldDecideForHealthyNodes() {
 
         Partitions partitions1 = createPartitions(node1, node2);
         Partitions partitions2 = createPartitions(node2, node3, node4, node5);
@@ -75,7 +75,7 @@ public void unhealthyNodeViewShouldDecideForHealthyNodes() throws Exception {
     }
 
     @Test
-    public void splitNodeViewShouldDecideForHealthyNodes() throws Exception {
+    void splitNodeViewShouldDecideForHealthyNodes() {
 
         Partitions partitions1 = createPartitions(node1, node2, node3);
         Partitions partitions2 = createPartitions();
@@ -93,7 +93,7 @@ public void splitNodeViewShouldDecideForHealthyNodes() throws Exception {
     }
 
     @Test
-    public void splitUnhealthyNodeViewShouldDecideForHealthyNodes() throws Exception {
+    void splitUnhealthyNodeViewShouldDecideForHealthyNodes() {
 
         Partitions partitions1 = createPartitions(node1, node2);
         Partitions partitions2 = createPartitions(node2, node3);
diff --git a/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusTest.java b/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusUnitTests.java
similarity index 90%
rename from src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusTest.java
rename to src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusUnitTests.java
index abaf7f14c8..2b4bbaacde 100644
--- a/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusTest.java
+++ b/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusUnitTests.java
@@ -23,7 +23,7 @@
 import java.util.Arrays;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.models.partitions.Partitions;
@@ -32,7 +32,7 @@
 /**
  * @author Mark Paluch
  */
-public class KnownMajorityPartitionsConsensusTest {
+class KnownMajorityPartitionsConsensusUnitTests {
 
     private RedisClusterNode node1 = createNode(1);
     private RedisClusterNode node2 = createNode(2);
@@ -41,7 +41,7 @@ public class KnownMajorityPartitionsConsensusTest {
     private RedisClusterNode node5 = createNode(5);
 
     @Test
-    public void sameSharedViewShouldDecideForKnownMajority() throws Exception {
+    void sameSharedViewShouldDecideForKnownMajority() {
 
         Partitions current = createPartitions(node1, node2, node3, node4, node5);
 
@@ -57,7 +57,7 @@ public void sameSharedViewShouldDecideForKnownMajority() throws Exception {
     }
 
     @Test
-    public void addedNodeViewShouldDecideForKnownMajority() throws Exception {
+    void addedNodeViewShouldDecideForKnownMajority() {
 
         Partitions current = createPartitions(node1, node2, node3, node4);
 
@@ -73,7 +73,7 @@ public void addedNodeViewShouldDecideForKnownMajority() throws Exception {
     }
 
     @Test
-    public void removedNodeViewShouldDecideForKnownMajority() throws Exception {
+    void removedNodeViewShouldDecideForKnownMajority() {
 
         Partitions current = createPartitions(node1, node2, node3, node4, node5);
 
@@ -89,7 +89,7 @@ public void removedNodeViewShouldDecideForKnownMajority() throws Exception {
     }
 
     @Test
-    public void mixedViewShouldDecideForKnownMajority() throws Exception {
+    void mixedViewShouldDecideForKnownMajority() {
 
         Partitions current = createPartitions(node1, node2, node3, node4, node5);
 
@@ -105,7 +105,7 @@ public void mixedViewShouldDecideForKnownMajority() throws Exception {
     }
 
     @Test
-    public void clusterSplitViewShouldDecideForKnownMajority() throws Exception {
+    void clusterSplitViewShouldDecideForKnownMajority() {
 
         Partitions current = createPartitions(node1, node2, node3, node4, node5);
 
@@ -121,7 +121,7 @@ public void clusterSplitViewShouldDecideForKnownMajority() throws Exception {
     }
 
     @Test
-    public void strangeClusterSplitViewShouldDecideForKnownMajority() throws Exception {
+    void strangeClusterSplitViewShouldDecideForKnownMajority() {
 
         Partitions current = createPartitions(node1, node2, node3, node4, node5);
 
diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
similarity index 72%
rename from src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java
rename to src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
index a2f04e7032..e2a0f9f863 100644
--- a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncTest.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
@@ -21,12 +21,14 @@
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.Future;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import javax.inject.Inject;
 
-import io.lettuce.Wait;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.async.AsyncExecutions;
@@ -36,40 +38,41 @@
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.internal.LettuceSets;
+import io.lettuce.test.Futures;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.Wait;
 
 /**
  * @author Mark Paluch
  */
-public class NodeSelectionAsyncTest extends AbstractClusterTest {
+@ExtendWith(LettuceExtension.class)
+class NodeSelectionAsyncIntegrationTests extends TestSupport {
 
-    private RedisAdvancedClusterAsyncCommands<String, String> commands;
-    private StatefulRedisClusterConnection<String, String> clusterConnection;
+    private final RedisClusterClient clusterClient;
+    private final RedisAdvancedClusterAsyncCommands<String, String> commands;
 
-    @Before
-    public void before() throws Exception {
-        clusterClient.reloadPartitions();
-        clusterConnection = clusterClient.connect();
-        commands = clusterConnection.async();
-    }
+    @Inject
+    NodeSelectionAsyncIntegrationTests(RedisClusterClient clusterClient,
+            StatefulRedisClusterConnection<String, String> connection) {
 
-    @After
-    public void after() throws Exception {
-        commands.getStatefulConnection().close();
+        this.clusterClient = clusterClient;
+        this.commands = connection.async();
+        connection.sync().flushall();
     }
 
     @Test
-    public void testMultiNodeOperations() throws Exception {
+    void testMultiNodeOperations() {
 
         List<String> expectation = new ArrayList<>();
         for (char c = 'a'; c < 'z'; c++) {
             String key = new String(new char[] { c, c, c });
             expectation.add(key);
-            commands.set(key, value).get();
+            Futures.await(commands.set(key, value));
         }
 
         List<String> result = new Vector<>();
 
-        CompletableFuture.allOf(commands.masters().commands().keys(result::add, "*").futures()).get();
+        Futures.await(commands.masters().commands().keys(result::add, "*"));
 
         assertThat(result).hasSize(expectation.size());
 
@@ -80,7 +83,7 @@ public void testMultiNodeOperations() throws Exception {
     }
 
     @Test
-    public void testNodeSelectionCount() throws Exception {
+    void testNodeSelectionCount() {
         assertThat(commands.all().size()).isEqualTo(4);
         assertThat(commands.slaves().size()).isEqualTo(2);
         assertThat(commands.masters().size()).isEqualTo(2);
@@ -90,7 +93,7 @@ public void testNodeSelectionCount() throws Exception {
     }
 
     @Test
-    public void testNodeSelection() throws Exception {
+    void testNodeSelection() {
 
         AsyncNodeSelection<String, String> onlyMe = commands.nodes(redisClusterNode -> redisClusterNode.getFlags().contains(
                 RedisClusterNode.NodeFlag.MYSELF));
@@ -108,7 +111,7 @@ public void testNodeSelection() throws Exception {
     }
 
     @Test
-    public void testDynamicNodeSelection() throws Exception {
+    void testDynamicNodeSelection() {
 
         Partitions partitions = commands.getStatefulConnection().getPartitions();
         partitions.forEach(redisClusterNode -> redisClusterNode.setFlags(Collections
@@ -126,10 +129,11 @@ public void testDynamicNodeSelection() throws Exception {
                 LettuceSets.unmodifiableSet(RedisClusterNode.NodeFlag.MYSELF, RedisClusterNode.NodeFlag.MASTER));
         assertThat(selection.asMap()).hasSize(2);
 
+        clusterClient.reloadPartitions();
     }
 
     @Test
-    public void testNodeSelectionAsyncPing() throws Exception {
+    void testNodeSelectionAsyncPing() {
 
         AsyncNodeSelection<String, String> onlyMe = commands.nodes(redisClusterNode -> redisClusterNode.getFlags().contains(
                 RedisClusterNode.NodeFlag.MYSELF));
@@ -140,11 +144,11 @@ public void testNodeSelectionAsyncPing() throws Exception {
         AsyncExecutions<String> ping = onlyMe.commands().ping();
         CompletionStage<String> completionStage = ping.get(onlyMe.node(0));
 
-        assertThat(completionStage.toCompletableFuture().get()).isEqualTo("PONG");
+        assertThat(Futures.get(completionStage)).isEqualTo("PONG");
     }
 
     @Test
-    public void testStaticNodeSelection() throws Exception {
+    void testStaticNodeSelection() {
 
         AsyncNodeSelection<String, String> selection = commands.nodes(
                 redisClusterNode -> redisClusterNode.getFlags().contains(RedisClusterNode.NodeFlag.MYSELF), false);
@@ -155,15 +159,19 @@ public void testStaticNodeSelection() throws Exception {
                 .setFlags(Collections.singleton(RedisClusterNode.NodeFlag.MYSELF));
 
         assertThat(selection.asMap()).hasSize(1);
+
+        clusterClient.reloadPartitions();
     }
 
     @Test
-    public void testAsynchronicityOfMultiNodeExecution() throws Exception {
+    void testAsynchronicityOfMultiNodeExecution() throws InterruptedException {
 
-        RedisAdvancedClusterAsyncCommands<String, String> connection2 = clusterClient.connect().async();
+        StatefulRedisClusterConnection<String, String> connection2 = clusterClient.connect();
+        RedisAdvancedClusterAsyncCommands<String, String> async2 = connection2.async();
+
+        AsyncNodeSelection<String, String> masters = async2.masters();
+        Futures.await(masters.commands().configSet("lua-time-limit", "10"));
 
-        AsyncNodeSelection<String, String> masters = connection2.masters();
-        CompletableFuture.allOf(masters.commands().configSet("lua-time-limit", "10").futures()).get();
         AsyncExecutions<Object> eval = masters.commands().eval("while true do end", STATUS, new String[0]);
 
         for (CompletableFuture<Object> future : eval.futures()) {
@@ -173,28 +181,31 @@ public void testAsynchronicityOfMultiNodeExecution() throws Exception {
         Thread.sleep(200);
 
         AsyncExecutions<String> kill = commands.masters().commands().scriptKill();
-        CompletableFuture.allOf(kill.futures()).get();
+        Futures.await(kill);
 
         for (CompletionStage<String> execution : kill) {
-            assertThat(execution.toCompletableFuture().get()).isEqualTo("OK");
+            assertThat(Futures.get(execution)).isEqualTo("OK");
         }
 
-        CompletableFuture.allOf(eval.futures()).exceptionally(throwable -> null).get();
+        Futures.await(CompletableFuture.allOf(eval.futures()).exceptionally(throwable -> null));
         for (CompletableFuture<Object> future : eval.futures()) {
             assertThat(future.isDone()).isTrue();
         }
+
+        connection2.close();
     }
 
     @Test
-    public void testSlavesReadWrite() throws Exception {
+    void testSlavesReadWrite() {
 
         AsyncNodeSelection<String, String> nodes = commands.nodes(redisClusterNode -> redisClusterNode.getFlags().contains(
                 RedisClusterNode.NodeFlag.SLAVE));
 
         assertThat(nodes.size()).isEqualTo(2);
 
-        commands.set(key, value).get();
-        waitForReplication(key, port4);
+        Futures.await(commands.set(key, value));
+
+        waitForReplication(key, ClusterTestSettings.port4);
 
         List<Throwable> t = new ArrayList<>();
         AsyncExecutions<String> keys = nodes.commands().get(key);
@@ -205,21 +216,21 @@ public void testSlavesReadWrite() throws Exception {
             });
         });
 
-        CompletableFuture.allOf(keys.futures()).exceptionally(throwable -> null).get();
+        Futures.await(CompletableFuture.allOf(keys.futures()).exceptionally(throwable -> null));
 
         assertThat(t.size()).isGreaterThan(0);
     }
 
     @Test
-    public void testSlavesWithReadOnly() throws Exception {
+    void testSlavesWithReadOnly() {
 
         AsyncNodeSelection<String, String> nodes = commands.slaves(redisClusterNode -> redisClusterNode
                 .is(RedisClusterNode.NodeFlag.SLAVE));
 
         assertThat(nodes.size()).isEqualTo(2);
 
-        commands.set(key, value).get();
-        waitForReplication(key, port4);
+        Futures.await(commands.set(key, value));
+        waitForReplication(key, ClusterTestSettings.port4);
 
         List<Throwable> t = new ArrayList<>();
         List<String> strings = new ArrayList<>();
@@ -232,30 +243,33 @@ public void testSlavesWithReadOnly() throws Exception {
             lcs.thenAccept(strings::add);
         });
 
-        CompletableFuture.allOf(keys.futures()).exceptionally(throwable -> null).get();
-        Wait.untilEquals(1, () -> t.size()).waitOrTimeout();
+        Futures.await(CompletableFuture.allOf(keys.futures()).exceptionally(throwable -> null));
+        Wait.untilEquals(1, t::size).waitOrTimeout();
 
         assertThat(t).hasSize(1);
         assertThat(strings).hasSize(1).contains(value);
     }
 
-    protected void waitForReplication(String key, int port) throws Exception {
+    void waitForReplication(String key, int port) {
         waitForReplication(commands, key, port);
     }
 
-    protected static void waitForReplication(RedisAdvancedClusterAsyncCommands<String, String> commands, String key, int port)
-            throws Exception {
+    static void waitForReplication(RedisAdvancedClusterAsyncCommands<String, String> commands, String key, int port)
+ {
 
         AsyncNodeSelection<String, String> selection = commands
                 .slaves(redisClusterNode -> redisClusterNode.getUri().getPort() == port);
         Wait.untilNotEquals(null, () -> {
             for (CompletableFuture<String> future : selection.commands().get(key).futures()) {
-                if (future.get() != null) {
-                    return future.get();
+
+                Futures.await(future);
+
+                String result = Futures.get((Future<String>) future);
+                if (result != null) {
+                    return result;
                 }
             }
             return null;
         }).waitOrTimeout();
     }
-
 }
diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncTest.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
similarity index 81%
rename from src/test/java/io/lettuce/core/cluster/NodeSelectionSyncTest.java
rename to src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
index 44850c09e0..be714e9f8b 100644
--- a/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncTest.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
@@ -22,13 +22,14 @@
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.Wait;
 import io.lettuce.core.RedisCommandExecutionException;
 import io.lettuce.core.RedisCommandTimeoutException;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.sync.Executions;
@@ -37,29 +38,29 @@
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.internal.LettuceSets;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.Wait;
 
 /**
  * @author Mark Paluch
  */
-public class NodeSelectionSyncTest extends AbstractClusterTest {
+@ExtendWith(LettuceExtension.class)
+class NodeSelectionSyncIntegrationTests extends TestSupport {
 
-    private RedisAdvancedClusterCommands<String, String> commands;
-    private StatefulRedisClusterConnection<String, String> clusterConnection;
+    private final RedisClusterClient clusterClient;
+    private final RedisAdvancedClusterCommands<String, String> commands;
 
-    @Before
-    public void before() throws Exception {
-        clusterClient.reloadPartitions();
-        clusterConnection = clusterClient.connect();
-        commands = clusterConnection.sync();
-    }
+    @Inject
+    NodeSelectionSyncIntegrationTests(RedisClusterClient clusterClient,
+            StatefulRedisClusterConnection<String, String> connection) {
 
-    @After
-    public void after() throws Exception {
-        commands.getStatefulConnection().close();
+        this.clusterClient = clusterClient;
+        this.commands = connection.sync();
+        connection.sync().flushall();
     }
 
     @Test
-    public void testMultiNodeOperations() throws Exception {
+    void testMultiNodeOperations() {
 
         List<String> expectation = new ArrayList<>();
         for (char c = 'a'; c < 'z'; c++) {
@@ -81,7 +82,7 @@ public void testMultiNodeOperations() throws Exception {
     }
 
     @Test
-    public void testNodeSelectionCount() throws Exception {
+    void testNodeSelectionCount() {
         assertThat(commands.all().size()).isEqualTo(4);
         assertThat(commands.slaves().size()).isEqualTo(2);
         assertThat(commands.masters().size()).isEqualTo(2);
@@ -91,7 +92,7 @@ public void testNodeSelectionCount() throws Exception {
     }
 
     @Test
-    public void testNodeSelection() throws Exception {
+    void testNodeSelection() {
 
         NodeSelection<String, String> onlyMe = commands.nodes(redisClusterNode -> redisClusterNode.getFlags().contains(
                 RedisClusterNode.NodeFlag.MYSELF));
@@ -109,7 +110,7 @@ public void testNodeSelection() throws Exception {
     }
 
     @Test
-    public void testDynamicNodeSelection() throws Exception {
+    void testDynamicNodeSelection() {
 
         Partitions partitions = commands.getStatefulConnection().getPartitions();
         partitions.forEach(redisClusterNode -> redisClusterNode.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.MASTER)));
@@ -126,10 +127,11 @@ public void testDynamicNodeSelection() throws Exception {
                 .setFlags(LettuceSets.unmodifiableSet(RedisClusterNode.NodeFlag.MYSELF, RedisClusterNode.NodeFlag.MASTER));
         assertThat(selection.asMap()).hasSize(2);
 
+        clusterClient.reloadPartitions();
     }
 
     @Test
-    public void testNodeSelectionPing() throws Exception {
+    void testNodeSelectionPing() {
 
         NodeSelection<String, String> onlyMe = commands.nodes(redisClusterNode -> redisClusterNode.getFlags().contains(
                 RedisClusterNode.NodeFlag.MYSELF));
@@ -143,7 +145,7 @@ public void testNodeSelectionPing() throws Exception {
     }
 
     @Test
-    public void testStaticNodeSelection() throws Exception {
+    void testStaticNodeSelection() {
 
         NodeSelection<String, String> selection = commands.nodes(
                 redisClusterNode -> redisClusterNode.getFlags().contains(RedisClusterNode.NodeFlag.MYSELF), false);
@@ -154,10 +156,12 @@ public void testStaticNodeSelection() throws Exception {
                 .setFlags(Collections.singleton(RedisClusterNode.NodeFlag.MYSELF));
 
         assertThat(selection.asMap()).hasSize(1);
+
+        clusterClient.reloadPartitions();
     }
 
     @Test
-    public void testAsynchronicityOfMultiNodeExecution() throws Exception {
+    void testAsynchronicityOfMultiNodeExecution() {
 
         RedisAdvancedClusterCommands<String, String> connection2 = clusterClient.connect().sync();
 
@@ -173,11 +177,11 @@ public void testAsynchronicityOfMultiNodeExecution() throws Exception {
             assertThat(e).hasMessageContaining("Command timed out for node(s)");
         }
 
-        Executions<String> kill = commands.masters().commands().scriptKill();
+        commands.masters().commands().scriptKill();
     }
 
     @Test
-    public void testSlavesReadWrite() throws Exception {
+    void testSlavesReadWrite() {
 
         NodeSelection<String, String> nodes = commands.nodes(redisClusterNode -> redisClusterNode.getFlags().contains(
                 RedisClusterNode.NodeFlag.SLAVE));
@@ -185,7 +189,7 @@ public void testSlavesReadWrite() throws Exception {
         assertThat(nodes.size()).isEqualTo(2);
 
         commands.set(key, value);
-        waitForReplication(key, port4);
+        waitForReplication(key, ClusterTestSettings.port4);
 
         try {
 
@@ -197,10 +201,10 @@ public void testSlavesReadWrite() throws Exception {
     }
 
     @Test
-    public void testSlavesWithReadOnly() throws Exception {
+    void testSlavesWithReadOnly() {
 
         int slot = SlotHash.getSlot(key);
-        Optional<RedisClusterNode> master = clusterConnection.getPartitions().getPartitions().stream()
+        Optional<RedisClusterNode> master = clusterClient.getPartitions().getPartitions().stream()
                 .filter(redisClusterNode -> redisClusterNode.hasSlot(slot)).findFirst();
 
         NodeSelection<String, String> nodes = commands.slaves(redisClusterNode -> redisClusterNode
@@ -209,18 +213,18 @@ public void testSlavesWithReadOnly() throws Exception {
         assertThat(nodes.size()).isEqualTo(1);
 
         commands.set(key, value);
-        waitForReplication(key, port4);
+        waitForReplication(key, ClusterTestSettings.port4);
 
         Executions<String> keys = nodes.commands().get(key);
         assertThat(keys).hasSize(1).contains(value);
     }
 
-    protected void waitForReplication(String key, int port) throws Exception {
+    void waitForReplication(String key, int port) {
         waitForReplication(commands, key, port);
     }
 
-    protected static void waitForReplication(RedisAdvancedClusterCommands<String, String> commands, String key, int port)
-            throws Exception {
+    static void waitForReplication(RedisAdvancedClusterCommands<String, String> commands, String key, int port)
+ {
 
         NodeSelection<String, String> selection = commands
                 .slaves(redisClusterNode -> redisClusterNode.getUri().getPort() == port);
diff --git a/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureTest.java b/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java
similarity index 79%
rename from src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureTest.java
rename to src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java
index fb980341f2..74beac4db4 100644
--- a/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureTest.java
+++ b/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java
@@ -19,38 +19,38 @@
 
 import java.util.HashMap;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import io.lettuce.test.Futures;
 
 /**
  * @author Mark Paluch
  */
-public class PipelinedRedisFutureTest {
+class PipelinedRedisFutureUnitTests {
 
     private PipelinedRedisFuture<String> sut;
 
     @Test
-    public void testComplete() throws Exception {
+    void testComplete() {
 
         String other = "other";
 
         sut = new PipelinedRedisFuture<>(new HashMap<>(), o -> other);
 
         sut.complete("");
-        assertThat(sut.get()).isEqualTo(other);
+        assertThat(Futures.get(sut.toCompletableFuture())).isEqualTo(other);
         assertThat(sut.getError()).isNull();
-
     }
 
     @Test
-    public void testCompleteExceptionally() throws Exception {
+    void testCompleteExceptionally() {
 
         String other = "other";
 
         sut = new PipelinedRedisFuture<>(new HashMap<>(), o -> other);
 
         sut.completeExceptionally(new Exception());
-        assertThat(sut.get()).isEqualTo(other);
+        assertThat(Futures.get(sut.toCompletableFuture())).isEqualTo(other);
         assertThat(sut.getError()).isNull();
-
     }
 }
diff --git a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
similarity index 80%
rename from src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
rename to src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
index 2a4b21ad47..d3167bd331 100644
--- a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
@@ -32,13 +32,14 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
-import io.lettuce.Futures;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
@@ -55,10 +56,11 @@
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class PooledClusterConnectionProviderTest {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class PooledClusterConnectionProviderUnitTests {
 
-    public static final Utf8StringCodec CODEC = new Utf8StringCodec();
+    private static final Utf8StringCodec CODEC = new Utf8StringCodec();
 
     private PooledClusterConnectionProvider<String, String> sut;
 
@@ -74,7 +76,7 @@ public class PooledClusterConnectionProviderTest {
     @Mock(extraInterfaces = StatefulRedisConnection.class)
     RedisChannelHandler<String, String> channelHandlerMock;
 
-    StatefulRedisConnection<String, String> nodeConnectionMock;
+    private StatefulRedisConnection<String, String> nodeConnectionMock;
 
     @Mock
     RedisCommands<String, String> commandsMock;
@@ -88,10 +90,10 @@ public class PooledClusterConnectionProviderTest {
     @Mock
     ClusterEventListener clusterEventListener;
 
-    Partitions partitions = new Partitions();
+    private Partitions partitions = new Partitions();
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
 
         nodeConnectionMock = (StatefulRedisConnection) channelHandlerMock;
 
@@ -111,10 +113,10 @@ public void before() {
     }
 
     @Test
-    public void shouldObtainConnection() {
+    void shouldObtainConnection() {
 
         when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
-                Futures.createConnectionFuture(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         StatefulRedisConnection<String, String> connection = sut.getConnection(Intent.READ, 1);
 
@@ -124,12 +126,12 @@ public void shouldObtainConnection() {
     }
 
     @Test
-    public void shouldObtainConnectionReadFromSlave() {
+    void shouldObtainConnectionReadFromSlave() {
 
         when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
-                Futures.createConnectionFuture(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
-        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<String, String, String>(
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(
                 CommandType.READONLY, null, null));
         async.complete();
 
@@ -146,12 +148,12 @@ public void shouldObtainConnectionReadFromSlave() {
     }
 
     @Test
-    public void shouldCloseConnectionOnConnectFailure() {
+    void shouldCloseConnectionOnConnectFailure() {
 
         when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
-                Futures.createConnectionFuture(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
-        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<String, String, String>(
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(
                 CommandType.READONLY, null, null));
         async.completeExceptionally(new RuntimeException());
 
@@ -171,12 +173,12 @@ public void shouldCloseConnectionOnConnectFailure() {
     }
 
     @Test
-    public void shouldRetryConnectionAttemptAfterConnectionAttemptWasBroken() {
+    void shouldRetryConnectionAttemptAfterConnectionAttemptWasBroken() {
 
         when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
-                Futures.createConnectionFuture(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
-        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<String, String, String>(
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(
                 CommandType.READONLY, null, null));
         async.completeExceptionally(new RuntimeException());
 
@@ -192,7 +194,7 @@ public void shouldRetryConnectionAttemptAfterConnectionAttemptWasBroken() {
         }
         verify(nodeConnectionMock).close();
 
-        async = new AsyncCommand<>(new Command<String, String, String>(CommandType.READONLY, null, null));
+        async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
         async.complete();
 
         when(asyncCommandsMock.readOnly()).thenReturn(async);
@@ -203,18 +205,18 @@ public void shouldRetryConnectionAttemptAfterConnectionAttemptWasBroken() {
     }
 
     @Test
-    public void shouldSelectSuccessfulConnectionIfOtherNodesFailed() {
+    void shouldSelectSuccessfulConnectionIfOtherNodesFailed() {
 
         CompletableFuture<StatefulRedisConnection<String, String>> failed = new CompletableFuture<>();
         failed.completeExceptionally(new IllegalStateException());
 
         when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
-                Futures.createConnectionFuture(socketAddressMock, failed));
+                ConnectionFuture.from(socketAddressMock, failed));
 
         when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
-                Futures.createConnectionFuture(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
-        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<String, String, String>(
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(
                 CommandType.READONLY, null, null));
         async.complete("OK");
 
@@ -232,7 +234,7 @@ public void shouldSelectSuccessfulConnectionIfOtherNodesFailed() {
     }
 
     @Test
-    public void shouldFailIfAllReadCandidateNodesFail() {
+    void shouldFailIfAllReadCandidateNodesFail() {
 
         CompletableFuture<StatefulRedisConnection<String, String>> failed1 = new CompletableFuture<>();
         failed1.completeExceptionally(new IllegalStateException());
@@ -241,12 +243,12 @@ public void shouldFailIfAllReadCandidateNodesFail() {
         failed2.completeExceptionally(new IllegalStateException());
 
         when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
-                Futures.createConnectionFuture(socketAddressMock, failed2));
+                ConnectionFuture.from(socketAddressMock, failed2));
 
         when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
-                Futures.createConnectionFuture(socketAddressMock, failed2));
+                ConnectionFuture.from(socketAddressMock, failed2));
 
-        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<String, String, String>(
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(
                 CommandType.READONLY, null, null));
         async.complete("OK");
 
@@ -265,11 +267,12 @@ public void shouldFailIfAllReadCandidateNodesFail() {
     }
 
     @Test
-    public void shouldCloseConnections() {
+    void shouldCloseConnections() {
 
         when(channelHandlerMock.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
+
         when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
-                Futures.createConnectionFuture(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         StatefulRedisConnection<String, String> connection = sut.getConnection(Intent.READ, 1);
         assertThat(connection).isNotNull();
@@ -280,7 +283,7 @@ public void shouldCloseConnections() {
     }
 
     @Test
-    public void shouldRejectConnectionsToUnknownNodeId() {
+    void shouldRejectConnectionsToUnknownNodeId() {
 
         assertThatThrownBy(() -> sut.getConnection(Intent.READ, "foobar")).isInstanceOf(UnknownPartitionException.class);
 
@@ -288,7 +291,7 @@ public void shouldRejectConnectionsToUnknownNodeId() {
     }
 
     @Test
-    public void shouldRejectConnectionsToUnknownNodeHostAndPort() {
+    void shouldRejectConnectionsToUnknownNodeHostAndPort() {
 
         assertThatThrownBy(() -> sut.getConnection(Intent.READ, "localhost", 1234)).isInstanceOf(
                 UnknownPartitionException.class);
diff --git a/src/test/java/io/lettuce/core/cluster/ReadFromTest.java b/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
similarity index 81%
rename from src/test/java/io/lettuce/core/cluster/ReadFromTest.java
rename to src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
index ff5a0ed8d2..3b037ed383 100644
--- a/src/test/java/io/lettuce/core/cluster/ReadFromTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
@@ -16,13 +16,14 @@
 package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.ReadFrom;
 import io.lettuce.core.cluster.models.partitions.Partitions;
@@ -33,15 +34,15 @@
  * @author Mark Paluch
  * @author Ryosuke Hasebe
  */
-public class ReadFromTest {
+class ReadFromUnitTests {
 
     private Partitions sut = new Partitions();
     private RedisClusterNode nearest = new RedisClusterNode();
     private RedisClusterNode master = new RedisClusterNode();
     private RedisClusterNode slave = new RedisClusterNode();
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
 
         master.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.MASTER));
         nearest.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.SLAVE));
@@ -53,67 +54,67 @@ public void before() {
     }
 
     @Test
-    public void master() {
+    void master() {
         List<RedisNodeDescription> result = ReadFrom.MASTER.select(getNodes());
         assertThat(result).hasSize(1).containsOnly(master);
     }
 
     @Test
-    public void masterPreferred() {
+    void masterPreferred() {
         List<RedisNodeDescription> result = ReadFrom.MASTER_PREFERRED.select(getNodes());
         assertThat(result).hasSize(3).containsExactly(master, nearest, slave);
     }
 
     @Test
-    public void slave() {
+    void slave() {
         List<RedisNodeDescription> result = ReadFrom.SLAVE.select(getNodes());
         assertThat(result).hasSize(2).contains(nearest, slave);
     }
 
     @Test
-    public void slavePreferred() {
+    void slavePreferred() {
         List<RedisNodeDescription> result = ReadFrom.SLAVE_PREFERRED.select(getNodes());
         assertThat(result).hasSize(3).containsExactly(nearest, slave, master);
     }
 
     @Test
-    public void nearest() {
+    void nearest() {
         List<RedisNodeDescription> result = ReadFrom.NEAREST.select(getNodes());
         assertThat(result).hasSize(3).containsExactly(nearest, master, slave);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void valueOfNull() {
-        ReadFrom.valueOf(null);
+    @Test
+    void valueOfNull() {
+        assertThatThrownBy(() -> ReadFrom.valueOf(null)).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void valueOfUnknown() {
-        ReadFrom.valueOf("unknown");
+    @Test
+    void valueOfUnknown() {
+        assertThatThrownBy(() -> ReadFrom.valueOf("unknown")).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void valueOfNearest() {
+    void valueOfNearest() {
         assertThat(ReadFrom.valueOf("nearest")).isEqualTo(ReadFrom.NEAREST);
     }
 
     @Test
-    public void valueOfMaster() {
+    void valueOfMaster() {
         assertThat(ReadFrom.valueOf("master")).isEqualTo(ReadFrom.MASTER);
     }
 
     @Test
-    public void valueOfMasterPreferred() {
+    void valueOfMasterPreferred() {
         assertThat(ReadFrom.valueOf("masterPreferred")).isEqualTo(ReadFrom.MASTER_PREFERRED);
     }
 
     @Test
-    public void valueOfSlave() {
+    void valueOfSlave() {
         assertThat(ReadFrom.valueOf("slave")).isEqualTo(ReadFrom.SLAVE);
     }
 
     @Test
-    public void valueOfSlavePreferred() {
+    void valueOfSlavePreferred() {
         assertThat(ReadFrom.valueOf("slavePreferred")).isEqualTo(ReadFrom.SLAVE_PREFERRED);
     }
 
diff --git a/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java
similarity index 89%
rename from src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java
rename to src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java
index 0531322b03..ce7b998ee7 100644
--- a/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.protocol.ProtocolKeyword;
@@ -25,15 +25,15 @@
 /**
  * @author Mark Paluch
  */
-public class ReadOnlyCommandsTest {
+class ReadOnlyCommandsUnitTests {
 
     @Test
-    public void testCount() {
+    void testCount() {
         assertThat(ReadOnlyCommands.getReadOnlyCommands()).hasSize(70);
     }
 
     @Test
-    public void testResolvableCommandNames() {
+    void testResolvableCommandNames() {
 
         for (ProtocolKeyword readOnlyCommand : ReadOnlyCommands.getReadOnlyCommands()) {
             assertThat(readOnlyCommand.name()).isEqualTo(CommandType.valueOf(readOnlyCommand.name()).name());
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTest.java
deleted file mode 100644
index 9adc089d1d..0000000000
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.cluster;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-import io.lettuce.TestClientResources;
-import io.lettuce.core.FastShutdown;
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
-import io.lettuce.core.internal.LettuceLists;
-
-/**
- * @author Mark Paluch
- */
-public class RedisClusterClientFactoryTest {
-
-    private final static String URI = "redis://" + TestSettings.host() + ":" + TestSettings.port();
-    private final static RedisURI REDIS_URI = RedisURI.create(URI);
-    private static final List<RedisURI> REDIS_URIS = LettuceLists.newList(REDIS_URI);
-
-    @Test
-    public void withStringUri() throws Exception {
-        FastShutdown.shutdown(RedisClusterClient.create(TestClientResources.get(), URI));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withStringUriNull() throws Exception {
-        RedisClusterClient.create((String) null);
-    }
-
-    @Test
-    public void withUri() throws Exception {
-        FastShutdown.shutdown(RedisClusterClient.create(REDIS_URI));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withUriUri() throws Exception {
-        RedisClusterClient.create((RedisURI) null);
-    }
-
-    @Test
-    public void withUriIterable() throws Exception {
-        FastShutdown.shutdown(RedisClusterClient.create(LettuceLists.newList(REDIS_URI)));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withUriIterableNull() throws Exception {
-        RedisClusterClient.create((Iterable<RedisURI>) null);
-    }
-
-    @Test
-    public void clientResourcesWithStringUri() throws Exception {
-        FastShutdown.shutdown(RedisClusterClient.create(TestClientResources.get(), URI));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void clientResourcesWithStringUriNull() throws Exception {
-        RedisClusterClient.create(TestClientResources.get(), (String) null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void clientResourcesNullWithStringUri() throws Exception {
-        RedisClusterClient.create(null, URI);
-    }
-
-    @Test
-    public void clientResourcesWithUri() throws Exception {
-        FastShutdown.shutdown(RedisClusterClient.create(TestClientResources.get(), REDIS_URI));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void clientResourcesWithUriNull() throws Exception {
-        RedisClusterClient.create(TestClientResources.get(), (RedisURI) null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void clientResourcesWithUriUri() throws Exception {
-        RedisClusterClient.create(null, REDIS_URI);
-    }
-
-    @Test
-    public void clientResourcesWithUriIterable() throws Exception {
-        FastShutdown.shutdown(RedisClusterClient.create(TestClientResources.get(), LettuceLists.newList(REDIS_URI)));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void clientResourcesWithUriIterableNull() throws Exception {
-        RedisClusterClient.create(TestClientResources.get(), (Iterable<RedisURI>) null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void clientResourcesNullWithUriIterable() throws Exception {
-        RedisClusterClient.create(null, REDIS_URIS);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void clientWithDifferentSslSettings() throws Exception {
-        RedisClusterClient.create(Arrays.asList(RedisURI.create("redis://host1"), RedisURI.create("redis+ssl://host1")));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void clientWithDifferentTlsSettings() throws Exception {
-        RedisClusterClient.create(Arrays.asList(RedisURI.create("rediss://host1"), RedisURI.create("redis+tls://host1")));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void clientWithDifferentVerifyPeerSettings() throws Exception {
-        RedisURI redisURI = RedisURI.create("rediss://host1");
-        redisURI.setVerifyPeer(false);
-
-        RedisClusterClient.create(Arrays.asList(redisURI, RedisURI.create("rediss://host1")));
-    }
-}
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java
new file mode 100644
index 0000000000..dfe68e2cab
--- /dev/null
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.internal.LettuceLists;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
+
+/**
+ * @author Mark Paluch
+ */
+class RedisClusterClientFactoryTests {
+
+    private final static String URI = "redis://" + TestSettings.host() + ":" + TestSettings.port();
+    private final static RedisURI REDIS_URI = RedisURI.create(URI);
+    private static final List<RedisURI> REDIS_URIS = LettuceLists.newList(REDIS_URI);
+
+    @Test
+    void withStringUri() {
+        FastShutdown.shutdown(RedisClusterClient.create(TestClientResources.get(), URI));
+    }
+
+    @Test
+    void withStringUriNull() {
+        assertThatThrownBy(() -> RedisClusterClient.create((String) null)).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    void withUri() {
+        FastShutdown.shutdown(RedisClusterClient.create(REDIS_URI));
+    }
+
+    @Test
+    void withUriUri() {
+        assertThatThrownBy(() -> RedisClusterClient.create((RedisURI) null)).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    void withUriIterable() {
+        FastShutdown.shutdown(RedisClusterClient.create(LettuceLists.newList(REDIS_URI)));
+    }
+
+    @Test
+    void withUriIterableNull() {
+        assertThatThrownBy(() -> RedisClusterClient.create((Iterable<RedisURI>) null)).isInstanceOf(
+                IllegalArgumentException.class);
+    }
+
+    @Test
+    void clientResourcesWithStringUri() {
+        FastShutdown.shutdown(RedisClusterClient.create(TestClientResources.get(), URI));
+    }
+
+    @Test
+    void clientResourcesWithStringUriNull() {
+        assertThatThrownBy(() -> RedisClusterClient.create(TestClientResources.get(), (String) null)).isInstanceOf(
+                IllegalArgumentException.class);
+    }
+
+    @Test
+    void clientResourcesNullWithStringUri() {
+        assertThatThrownBy(() -> RedisClusterClient.create(null, URI)).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    void clientResourcesWithUri() {
+        FastShutdown.shutdown(RedisClusterClient.create(TestClientResources.get(), REDIS_URI));
+    }
+
+    @Test
+    void clientResourcesWithUriNull() {
+        assertThatThrownBy(() -> RedisClusterClient.create(TestClientResources.get(), (RedisURI) null)).isInstanceOf(
+                IllegalArgumentException.class);
+    }
+
+    @Test
+    void clientResourcesWithUriUri() {
+        assertThatThrownBy(() -> RedisClusterClient.create(null, REDIS_URI)).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    void clientResourcesWithUriIterable() {
+        FastShutdown.shutdown(RedisClusterClient.create(TestClientResources.get(), LettuceLists.newList(REDIS_URI)));
+    }
+
+    @Test
+    void clientResourcesWithUriIterableNull() {
+        assertThatThrownBy(() -> RedisClusterClient.create(TestClientResources.get(), (Iterable<RedisURI>) null)).isInstanceOf(
+                IllegalArgumentException.class);
+    }
+
+    @Test
+    void clientResourcesNullWithUriIterable() {
+        assertThatThrownBy(() -> RedisClusterClient.create(null, REDIS_URIS)).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    void clientWithDifferentSslSettings() {
+        assertThatThrownBy(
+                () -> RedisClusterClient.create(Arrays.asList(RedisURI.create("redis://host1"),
+                        RedisURI.create("redis+ssl://host1")))).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    void clientWithDifferentTlsSettings() {
+        assertThatThrownBy(
+                () -> RedisClusterClient.create(Arrays.asList(RedisURI.create("rediss://host1"),
+                        RedisURI.create("redis+tls://host1")))).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    void clientWithDifferentVerifyPeerSettings() {
+        RedisURI redisURI = RedisURI.create("rediss://host1");
+        redisURI.setVerifyPeer(false);
+
+        assertThatThrownBy(() -> RedisClusterClient.create(Arrays.asList(redisURI, RedisURI.create("rediss://host1"))))
+                .isInstanceOf(IllegalArgumentException.class);
+    }
+}
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
similarity index 66%
rename from src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
rename to src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
index 80996d556a..2e389e49c0 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
@@ -17,22 +17,26 @@
 
 import static io.lettuce.core.cluster.ClusterTestUtil.getOwnPartition;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.fail;
 
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import org.junit.*;
-import org.junit.runners.MethodSorters;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.Wait;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -46,12 +50,22 @@
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
-
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+import io.lettuce.test.Futures;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.Wait;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
+
+/**
+ * @author Mark Paluch
+ */
 @SuppressWarnings("unchecked")
-public class RedisClusterClientTest extends AbstractClusterTest {
+@ExtendWith(LettuceExtension.class)
+class RedisClusterClientIntegrationTests extends TestSupport {
 
-    protected static RedisClient client;
+    private final RedisClient client;
+    private final RedisClusterClient clusterClient;
 
     private StatefulRedisConnection<String, String> redis1;
     private StatefulRedisConnection<String, String> redis2;
@@ -63,36 +77,24 @@ public class RedisClusterClientTest extends AbstractClusterTest {
     private RedisCommands<String, String> redissync3;
     private RedisCommands<String, String> redissync4;
 
-    protected RedisAdvancedClusterCommands<String, String> sync;
-    protected StatefulRedisClusterConnection<String, String> connection;
-
-    @BeforeClass
-    public static void setupClient() {
-
-        setupClusterClient();
+    private RedisAdvancedClusterCommands<String, String> sync;
+    private StatefulRedisClusterConnection<String, String> connection;
 
-        client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port1).build());
-        clusterClient = RedisClusterClient.create(TestClientResources.get(),
-                Collections.singletonList(RedisURI.Builder.redis(host, port1).withClientName("my-client").build()));
+    @Inject
+    RedisClusterClientIntegrationTests(RedisClient client, RedisClusterClient clusterClient) {
+        this.client = client;
+        this.clusterClient = clusterClient;
     }
 
-    @AfterClass
-    public static void shutdownClient() {
-        shutdownClusterClient();
-        FastShutdown.shutdown(client);
-        FastShutdown.shutdown(clusterClient);
-    }
-
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
 
         clusterClient.setOptions(ClusterClientOptions.create());
-        clusterRule.getClusterClient().reloadPartitions();
 
-        redis1 = client.connect(RedisURI.Builder.redis(host, port1).build());
-        redis2 = client.connect(RedisURI.Builder.redis(host, port2).build());
-        redis3 = client.connect(RedisURI.Builder.redis(host, port3).build());
-        redis4 = client.connect(RedisURI.Builder.redis(host, port4).build());
+        redis1 = client.connect(RedisURI.Builder.redis(host, ClusterTestSettings.port1).build());
+        redis2 = client.connect(RedisURI.Builder.redis(host, ClusterTestSettings.port2).build());
+        redis3 = client.connect(RedisURI.Builder.redis(host, ClusterTestSettings.port3).build());
+        redis4 = client.connect(RedisURI.Builder.redis(host, ClusterTestSettings.port4).build());
 
         redissync1 = redis1.sync();
         redissync2 = redis2.sync();
@@ -104,8 +106,8 @@ public void before() {
         sync = connection.sync();
     }
 
-    @After
-    public void after() {
+    @AfterEach
+    void after() {
         connection.close();
         redis1.close();
 
@@ -116,47 +118,47 @@ public void after() {
     }
 
     @Test
-    public void statefulConnectionFromSync() {
+    void statefulConnectionFromSync() {
         RedisAdvancedClusterCommands<String, String> sync = clusterClient.connect().sync();
         assertThat(sync.getStatefulConnection().sync()).isSameAs(sync);
         connection.close();
     }
 
     @Test
-    public void statefulConnectionFromAsync() {
+    void statefulConnectionFromAsync() {
         RedisAdvancedClusterAsyncCommands<String, String> async = clusterClient.connect().async();
         assertThat(async.getStatefulConnection().async()).isSameAs(async);
         connection.close();
     }
 
     @Test
-    public void shouldApplyTimeoutOnRegularConnection() {
+    void shouldApplyTimeoutOnRegularConnection() {
 
         clusterClient.setDefaultTimeout(1, TimeUnit.MINUTES);
 
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
 
         assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(1));
-        assertThat(connection.getConnection(host, port1).getTimeout()).isEqualTo(Duration.ofMinutes(1));
+        assertThat(connection.getConnection(host, ClusterTestSettings.port1).getTimeout()).isEqualTo(Duration.ofMinutes(1));
 
         connection.close();
     }
 
     @Test
-    public void shouldApplyTimeoutOnRegularConnectionUsingCodec() {
+    void shouldApplyTimeoutOnRegularConnectionUsingCodec() {
 
         clusterClient.setDefaultTimeout(1, TimeUnit.MINUTES);
 
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect(Utf8StringCodec.UTF8);
 
         assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(1));
-        assertThat(connection.getConnection(host, port1).getTimeout()).isEqualTo(Duration.ofMinutes(1));
+        assertThat(connection.getConnection(host, ClusterTestSettings.port1).getTimeout()).isEqualTo(Duration.ofMinutes(1));
 
         connection.close();
     }
 
     @Test
-    public void shouldApplyTimeoutOnPubSubConnection() {
+    void shouldApplyTimeoutOnPubSubConnection() {
 
         clusterClient.setDefaultTimeout(1, TimeUnit.MINUTES);
 
@@ -167,7 +169,7 @@ public void shouldApplyTimeoutOnPubSubConnection() {
     }
 
     @Test
-    public void shouldApplyTimeoutOnPubSubConnectionUsingCodec() {
+    void shouldApplyTimeoutOnPubSubConnectionUsingCodec() {
 
         clusterClient.setDefaultTimeout(1, TimeUnit.MINUTES);
 
@@ -178,7 +180,7 @@ public void shouldApplyTimeoutOnPubSubConnectionUsingCodec() {
     }
 
     @Test
-    public void clusterConnectionShouldSetClientName() throws Exception {
+    void clusterConnectionShouldSetClientName() throws Exception {
 
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
 
@@ -196,7 +198,7 @@ public void clusterConnectionShouldSetClientName() throws Exception {
     }
 
     @Test
-    public void pubSubclusterConnectionShouldSetClientName() throws InterruptedException {
+    void pubSubclusterConnectionShouldSetClientName() throws InterruptedException {
 
         StatefulRedisClusterPubSubConnection<String, String> connection = clusterClient.connectPubSub();
 
@@ -215,14 +217,14 @@ public void pubSubclusterConnectionShouldSetClientName() throws InterruptedExcep
     }
 
     @Test
-    public void reloadPartitions() {
+    void reloadPartitions() {
 
         clusterClient.reloadPartitions();
         assertThat(clusterClient.getPartitions()).hasSize(4);
     }
 
     @Test
-    public void reloadPartitionsWithDynamicSourcesFallsBackToInitialSeedNodes() {
+    void reloadPartitionsWithDynamicSourcesFallsBackToInitialSeedNodes() {
 
         client.setOptions(ClusterClientOptions.builder()
                 .topologyRefreshOptions(ClusterTopologyRefreshOptions.builder().dynamicRefreshSources(true).build()).build());
@@ -238,63 +240,60 @@ public void reloadPartitionsWithDynamicSourcesFallsBackToInitialSeedNodes() {
     }
 
     @Test
-    public void testClusteredOperations() {
+    void testClusteredOperations() {
 
-        SlotHash.getSlot(KEY_B.getBytes()); // 3300 -> Node 1 and Slave (Node 3)
-        SlotHash.getSlot(KEY_A.getBytes()); // 15495 -> Node 2
+        SlotHash.getSlot(ClusterTestSettings.KEY_B.getBytes()); // 3300 -> Node 1 and Slave (Node 3)
+        SlotHash.getSlot(ClusterTestSettings.KEY_A.getBytes()); // 15495 -> Node 2
 
-        RedisFuture<String> result = redis1.async().set(KEY_B, value);
+        RedisFuture<String> result = redis1.async().set(ClusterTestSettings.KEY_B, value);
         assertThat(result.getError()).isEqualTo(null);
-        assertThat(redissync1.set(KEY_B, "value")).isEqualTo("OK");
+        assertThat(redissync1.set(ClusterTestSettings.KEY_B, "value")).isEqualTo("OK");
 
-        RedisFuture<String> resultMoved = redis1.async().set(KEY_A, value);
-        try {
-            resultMoved.get();
-        } catch (Exception e) {
-            assertThat(e.getMessage()).contains("MOVED 15495");
-        }
+        RedisFuture<String> resultMoved = redis1.async().set(ClusterTestSettings.KEY_A, value);
+
+        assertThatThrownBy(() -> Futures.await(resultMoved)).hasMessageContaining("MOVED 15495");
 
         clusterClient.reloadPartitions();
         RedisAdvancedClusterCommands<String, String> connection = clusterClient.connect().sync();
 
-        assertThat(connection.set(KEY_A, value)).isEqualTo("OK");
-        assertThat(connection.set(KEY_B, "myValue2")).isEqualTo("OK");
-        assertThat(connection.set(KEY_D, "myValue2")).isEqualTo("OK");
+        assertThat(connection.set(ClusterTestSettings.KEY_A, value)).isEqualTo("OK");
+        assertThat(connection.set(ClusterTestSettings.KEY_B, "myValue2")).isEqualTo("OK");
+        assertThat(connection.set(ClusterTestSettings.KEY_D, "myValue2")).isEqualTo("OK");
 
         connection.getStatefulConnection().close();
 
     }
 
     @Test
-    public void testReset() {
+    void testReset() {
 
         clusterClient.reloadPartitions();
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
 
-        connection.sync().set(KEY_A, value);
+        connection.sync().set(ClusterTestSettings.KEY_A, value);
         connection.reset();
 
-        assertThat(connection.sync().set(KEY_A, value)).isEqualTo("OK");
+        assertThat(connection.sync().set(ClusterTestSettings.KEY_A, value)).isEqualTo("OK");
         connection.close();
     }
 
     @Test
     @SuppressWarnings({ "rawtypes" })
-    public void testClusterCommandRedirection() throws Exception {
+    void testClusterCommandRedirection() {
 
-        RedisAdvancedClusterAsyncCommands<String, String> connection = clusterClient.connect().async();
+        RedisAdvancedClusterCommands<String, String> connection = clusterClient.connect().sync();
 
         // Command on node within the default connection
-        assertThat(connection.set(KEY_B, value).get()).isEqualTo("OK");
+        assertThat(connection.set(ClusterTestSettings.KEY_B, value)).isEqualTo("OK");
 
         // gets redirection to node 3
-        assertThat(connection.set(KEY_A, value).get()).isEqualTo("OK");
+        assertThat(connection.set(ClusterTestSettings.KEY_A, value)).isEqualTo("OK");
         connection.getStatefulConnection().close();
     }
 
     @Test
     @SuppressWarnings({ "rawtypes" })
-    public void testClusterRedirection() throws Exception {
+    void testClusterRedirection() {
 
         RedisAdvancedClusterAsyncCommands<String, String> connection = clusterClient.connect().async();
         Partitions partitions = clusterClient.getPartitions();
@@ -308,29 +307,29 @@ public void testClusterRedirection() throws Exception {
         partitions.updateCache();
 
         // appropriate cluster node
-        RedisFuture<String> setB = connection.set(KEY_B, value);
+        RedisFuture<String> setB = connection.set(ClusterTestSettings.KEY_B, value);
 
         assertThat(setB.toCompletableFuture()).isInstanceOf(AsyncCommand.class);
 
-        setB.get(10, TimeUnit.SECONDS);
+        Futures.await(setB);
         assertThat(setB.getError()).isNull();
-        assertThat(setB.get()).isEqualTo("OK");
+        assertThat(Futures.get(setB)).isEqualTo("OK");
 
         // gets redirection to node 3
-        RedisFuture<String> setA = connection.set(KEY_A, value);
+        RedisFuture<String> setA = connection.set(ClusterTestSettings.KEY_A, value);
 
-        assertThat(setA instanceof AsyncCommand).isTrue();
+        assertThat((CompletionStage) setA).isInstanceOf(AsyncCommand.class);
 
-        setA.get(10, TimeUnit.SECONDS);
+        Futures.await(setA);
         assertThat(setA.getError()).isNull();
-        assertThat(setA.get()).isEqualTo("OK");
+        assertThat(Futures.get(setA)).isEqualTo("OK");
 
         connection.getStatefulConnection().close();
     }
 
     @Test
     @SuppressWarnings({ "rawtypes" })
-    public void testClusterRedirectionLimit() throws Exception {
+    void testClusterRedirectionLimit() throws Exception {
 
         clusterClient.setOptions(ClusterClientOptions.builder().maxRedirects(0).build());
         RedisAdvancedClusterAsyncCommands<String, String> connection = clusterClient.connect().async();
@@ -348,7 +347,7 @@ public void testClusterRedirectionLimit() throws Exception {
         partitions.updateCache();
 
         // gets redirection to node 3
-        RedisFuture<String> setA = connection.set(KEY_A, value);
+        RedisFuture<String> setA = connection.set(ClusterTestSettings.KEY_A, value);
 
         assertThat(setA instanceof AsyncCommand).isTrue();
 
@@ -358,8 +357,8 @@ public void testClusterRedirectionLimit() throws Exception {
         connection.getStatefulConnection().close();
     }
 
-    @Test(expected = RedisException.class)
-    public void closeConnection() {
+    @Test
+    void closeConnection() {
 
         RedisAdvancedClusterCommands<String, String> connection = clusterClient.connect().sync();
 
@@ -368,14 +367,14 @@ public void closeConnection() {
 
         connection.getStatefulConnection().close();
 
-        connection.time();
+        assertThatThrownBy(connection::time).isInstanceOf(RedisException.class);
     }
 
     @Test
-    public void clusterAuth() throws Exception {
+    void clusterAuth() {
 
         RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(),
-                RedisURI.Builder.redis(TestSettings.host(), port7).withPassword("foobared").build());
+                RedisURI.Builder.redis(TestSettings.host(), ClusterTestSettings.port7).withPassword("foobared").build());
 
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
         RedisAdvancedClusterCommands<String, String> sync = connection.sync();
@@ -383,7 +382,9 @@ public void clusterAuth() throws Exception {
         List<String> time = sync.time();
         assertThat(time).hasSize(2);
 
-        connection.async().quit().get();
+        Futures.await(connection.async().quit());
+
+        Wait.untilTrue(connection::isOpen).waitOrTimeout();
 
         time = sync.time();
         assertThat(time).hasSize(2);
@@ -396,10 +397,10 @@ public void clusterAuth() throws Exception {
     }
 
     @Test
-    public void clusterAuthPingBeforeConnect() throws Exception {
+    void clusterAuthPingBeforeConnect() {
 
         RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(),
-                RedisURI.Builder.redis(TestSettings.host(), port7).withPassword("foobared").build());
+                RedisURI.Builder.redis(TestSettings.host(), ClusterTestSettings.port7).withPassword("foobared").build());
         clusterClient.setOptions(ClusterClientOptions.builder().pingBeforeActivateConnection(true).build());
 
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
@@ -408,7 +409,9 @@ public void clusterAuthPingBeforeConnect() throws Exception {
         List<String> time = sync.time();
         assertThat(time).hasSize(2);
 
-        connection.async().quit().get();
+        Futures.await(connection.async().quit());
+
+        Wait.untilTrue(connection::isOpen).waitOrTimeout();
 
         time = sync.time();
         assertThat(time).hasSize(2);
@@ -417,17 +420,14 @@ public void clusterAuthPingBeforeConnect() throws Exception {
         FastShutdown.shutdown(clusterClient);
     }
 
-    @Test(expected = RedisException.class)
-    public void clusterNeedsAuthButNotSupplied() {
+    @Test
+    void clusterNeedsAuthButNotSupplied() {
 
         RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(),
-                RedisURI.Builder.redis(TestSettings.host(), port7).build());
-
-        StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
+                RedisURI.Builder.redis(TestSettings.host(), ClusterTestSettings.port7).build());
 
         try {
-            List<String> time = connection.sync().time();
-            assertThat(time).hasSize(2);
+            assertThatThrownBy(clusterClient::connect).isInstanceOf(RedisException.class);
         } finally {
             connection.close();
             FastShutdown.shutdown(clusterClient);
@@ -435,7 +435,7 @@ public void clusterNeedsAuthButNotSupplied() {
     }
 
     @Test
-    public void noClusterNodeAvailable() {
+    void noClusterNodeAvailable() {
 
         RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.Builder.redis(host, 40400).build());
@@ -450,11 +450,12 @@ public void noClusterNodeAvailable() {
     }
 
     @Test
-    public void getClusterNodeConnection() {
+    void getClusterNodeConnection() {
 
         RedisClusterNode redis1Node = getOwnPartition(redissync2);
 
-        RedisClusterCommands<String, String> connection = sync.getConnection(TestSettings.hostAddr(), port2);
+        RedisClusterCommands<String, String> connection = sync
+                .getConnection(TestSettings.hostAddr(), ClusterTestSettings.port2);
 
         String result = connection.clusterMyId();
         assertThat(result).isEqualTo(redis1Node.getNodeId());
@@ -462,19 +463,19 @@ public void getClusterNodeConnection() {
     }
 
     @Test
-    public void operateOnNodeConnection() {
+    void operateOnNodeConnection() {
 
-        sync.set(KEY_A, value);
-        sync.set(KEY_B, "d");
+        sync.set(ClusterTestSettings.KEY_A, value);
+        sync.set(ClusterTestSettings.KEY_B, "d");
 
         StatefulRedisConnection<String, String> statefulRedisConnection = connection.getConnection(TestSettings.hostAddr(),
-                port2);
+                ClusterTestSettings.port2);
 
         RedisClusterCommands<String, String> connection = statefulRedisConnection.sync();
 
-        assertThat(connection.get(KEY_A)).isEqualTo(value);
+        assertThat(connection.get(ClusterTestSettings.KEY_A)).isEqualTo(value);
         try {
-            connection.get(KEY_B);
+            connection.get(ClusterTestSettings.KEY_B);
             fail("missing RedisCommandExecutionException: MOVED");
         } catch (RedisException e) {
             assertThat(e).hasMessageContaining("MOVED");
@@ -482,17 +483,17 @@ public void operateOnNodeConnection() {
     }
 
     @Test
-    public void testGetConnectionAsyncByNodeId() {
+    void testGetConnectionAsyncByNodeId() {
 
         RedisClusterNode partition = connection.getPartitions().getPartition(0);
 
-        StatefulRedisConnection<String, String> node = connection.getConnectionAsync(partition.getNodeId()).join();
+        StatefulRedisConnection<String, String> node = Futures.get(connection.getConnectionAsync(partition.getNodeId()));
 
         assertThat(node.sync().ping()).isEqualTo("PONG");
     }
 
     @Test
-    public void testGetConnectionAsyncByHostAndPort() {
+    void testGetConnectionAsyncByHostAndPort() {
 
         RedisClusterNode partition = connection.getPartitions().getPartition(0);
 
@@ -503,34 +504,35 @@ public void testGetConnectionAsyncByHostAndPort() {
     }
 
     @Test
-    public void testStatefulConnection() throws Exception {
+    void testStatefulConnection() {
         RedisAdvancedClusterAsyncCommands<String, String> async = connection.async();
 
-        assertThat(async.ping().get()).isEqualTo("PONG");
+        assertThat(Futures.get(async.ping())).isEqualTo("PONG");
     }
 
-    @Test(expected = RedisException.class)
-    public void getButNoPartitionForSlothash() {
+    @Test
+    void getButNoPartitionForSlothash() {
 
         for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
             redisClusterNode.setSlots(new ArrayList<>());
+
         }
         RedisChannelHandler rch = (RedisChannelHandler) connection;
         ClusterDistributionChannelWriter writer = (ClusterDistributionChannelWriter) rch.getChannelWriter();
         writer.setPartitions(clusterClient.getPartitions());
         clusterClient.getPartitions().reload(clusterClient.getPartitions().getPartitions());
 
-        sync.get(key);
+        assertThatThrownBy(() -> sync.get(key)).isInstanceOf(RedisException.class);
     }
 
     @Test
-    public void readOnlyOnCluster() throws Exception {
+    void readOnlyOnCluster() {
 
         sync.readOnly();
         // commands are dispatched to a different connection, therefore it works for us.
-        sync.set(KEY_B, value);
+        sync.set(ClusterTestSettings.KEY_B, value);
 
-        connection.async().quit().get();
+        Futures.await(connection.async().quit());
 
         assertThat(ReflectionTestUtils.getField(connection, "readOnly")).isEqualTo(Boolean.TRUE);
 
@@ -550,29 +552,29 @@ public void readOnlyOnCluster() throws Exception {
     }
 
     @Test
-    public void getKeysInSlot() {
+    void getKeysInSlot() {
 
-        sync.set(KEY_A, value);
-        sync.set(KEY_B, value);
+        sync.set(ClusterTestSettings.KEY_A, value);
+        sync.set(ClusterTestSettings.KEY_B, value);
 
-        List<String> keysA = sync.clusterGetKeysInSlot(SLOT_A, 10);
-        assertThat(keysA).isEqualTo(Collections.singletonList(KEY_A));
+        List<String> keysA = sync.clusterGetKeysInSlot(ClusterTestSettings.SLOT_A, 10);
+        assertThat(keysA).isEqualTo(Collections.singletonList(ClusterTestSettings.KEY_A));
 
-        List<String> keysB = sync.clusterGetKeysInSlot(SLOT_B, 10);
-        assertThat(keysB).isEqualTo(Collections.singletonList(KEY_B));
+        List<String> keysB = sync.clusterGetKeysInSlot(ClusterTestSettings.SLOT_B, 10);
+        assertThat(keysB).isEqualTo(Collections.singletonList(ClusterTestSettings.KEY_B));
 
     }
 
     @Test
-    public void countKeysInSlot() {
+    void countKeysInSlot() {
 
-        sync.set(KEY_A, value);
-        sync.set(KEY_B, value);
+        sync.set(ClusterTestSettings.KEY_A, value);
+        sync.set(ClusterTestSettings.KEY_B, value);
 
-        Long result = sync.clusterCountKeysInSlot(SLOT_A);
+        Long result = sync.clusterCountKeysInSlot(ClusterTestSettings.SLOT_A);
         assertThat(result).isEqualTo(1L);
 
-        result = sync.clusterCountKeysInSlot(SLOT_B);
+        result = sync.clusterCountKeysInSlot(ClusterTestSettings.SLOT_B);
         assertThat(result).isEqualTo(1L);
 
         int slotZZZ = SlotHash.getSlot("ZZZ".getBytes());
@@ -582,24 +584,24 @@ public void countKeysInSlot() {
     }
 
     @Test
-    public void testClusterCountFailureReports() {
+    void testClusterCountFailureReports() {
         RedisClusterNode ownPartition = getOwnPartition(redissync1);
         assertThat(redissync1.clusterCountFailureReports(ownPartition.getNodeId())).isGreaterThanOrEqualTo(0);
     }
 
     @Test
-    public void testClusterKeyslot() {
-        assertThat(redissync1.clusterKeyslot(KEY_A)).isEqualTo(SLOT_A);
-        assertThat(SlotHash.getSlot(KEY_A)).isEqualTo(SLOT_A);
+    void testClusterKeyslot() {
+        assertThat(redissync1.clusterKeyslot(ClusterTestSettings.KEY_A)).isEqualTo(ClusterTestSettings.SLOT_A);
+        assertThat(SlotHash.getSlot(ClusterTestSettings.KEY_A)).isEqualTo(ClusterTestSettings.SLOT_A);
     }
 
     @Test
-    public void testClusterSaveconfig() {
+    void testClusterSaveconfig() {
         assertThat(redissync1.clusterSaveconfig()).isEqualTo("OK");
     }
 
     @Test
-    public void testClusterSetConfigEpoch() {
+    void testClusterSetConfigEpoch() {
         try {
             redissync1.clusterSetConfigEpoch(1L);
         } catch (RedisException e) {
@@ -608,7 +610,7 @@ public void testClusterSetConfigEpoch() {
     }
 
     @Test
-    public void testReadFrom() {
+    void testReadFrom() {
         StatefulRedisClusterConnection<String, String> statefulConnection = connection;
 
         assertThat(statefulConnection.getReadFrom()).isEqualTo(ReadFrom.MASTER);
@@ -617,13 +619,13 @@ public void testReadFrom() {
         assertThat(statefulConnection.getReadFrom()).isEqualTo(ReadFrom.NEAREST);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testReadFromNull() {
-        connection.setReadFrom(null);
+    @Test
+    void testReadFromNull() {
+        assertThatThrownBy(() -> connection.setReadFrom(null)).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void testPfmerge() {
+    void testPfmerge() {
 
         RedisAdvancedClusterCommands<String, String> connection = clusterClient.connect().sync();
 
@@ -638,27 +640,4 @@ public void testPfmerge() {
 
         connection.getStatefulConnection().close();
     }
-
-    @Test
-    public void execAbortShouldFailTransaction() throws Exception {
-
-        StatefulRedisConnection<String, String> connection = client.connect();
-
-        connection.sync().multi();
-        RedisFuture<String> success = connection.async().set("b", value);
-        RedisFuture<String> failed = connection.async().set(key, value);
-
-        RedisFuture<TransactionResult> exec = connection.async().exec();
-
-        exec.await(5, TimeUnit.SECONDS);
-
-        assertThat(success.toCompletableFuture()).isDone();
-        assertThat(failed.toCompletableFuture()).isDone();
-        assertThat(failed.getError()).startsWith("MOVED");
-
-        assertThat(exec.toCompletableFuture()).isDone();
-        assertThat(exec.getError()).startsWith("EXECABORT");
-
-        connection.close();
-    }
 }
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
index 455f036f57..4aeafced13 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
@@ -15,59 +15,63 @@
  */
 package io.lettuce.core.cluster;
 
-import static io.lettuce.core.TestSettings.host;
-import static io.lettuce.core.TestSettings.hostAddr;
+import static io.lettuce.test.settings.TestSettings.host;
+import static io.lettuce.test.settings.TestSettings.hostAddr;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.Sockets;
-import io.lettuce.TestClientResources;
-import io.lettuce.core.*;
+import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.sync.Executions;
 import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.test.Sockets;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
 
 /**
  * @author Mark Paluch
  */
-public class RedisClusterPasswordSecuredSslTest extends AbstractTest {
+class RedisClusterPasswordSecuredSslTest extends TestSupport {
 
-    public static final int CLUSTER_PORT_SSL_1 = 7443;
-    public static final int CLUSTER_PORT_SSL_2 = 7444;
-    public static final int CLUSTER_PORT_SSL_3 = 7445;
+    private static final int CLUSTER_PORT_SSL_1 = 7443;
+    private static final int CLUSTER_PORT_SSL_2 = 7444;
+    private static final int CLUSTER_PORT_SSL_3 = 7445;
 
-    public static final String SLOT_1_KEY = "8HMdi";
-    public static final String SLOT_16352_KEY = "UyAa4KqoWgPGKa";
+    private static final String SLOT_1_KEY = "8HMdi";
+    private static final String SLOT_16352_KEY = "UyAa4KqoWgPGKa";
 
-    public static RedisURI redisURI = RedisURI.builder().redis(host(), CLUSTER_PORT_SSL_1).withPassword("foobared")
+    private static RedisURI redisURI = RedisURI.builder().redis(host(), CLUSTER_PORT_SSL_1).withPassword("foobared")
             .withSsl(true).withVerifyPeer(false).build();
-    public static RedisClusterClient redisClient = RedisClusterClient.create(TestClientResources.get(), redisURI);
-
-    @Before
-    public void before() throws Exception {
-        assumeTrue("Assume that stunnel runs on port 7443", Sockets.isOpen(host(), CLUSTER_PORT_SSL_1));
-        assumeTrue("Assume that stunnel runs on port 7444", Sockets.isOpen(host(), CLUSTER_PORT_SSL_2));
-        assumeTrue("Assume that stunnel runs on port 7445", Sockets.isOpen(host(), CLUSTER_PORT_SSL_3));
-        assumeTrue("Assume that Redis runs on port 7479", Sockets.isOpen(host(), 7479));
-        assumeTrue("Assume that Redis runs on port 7480", Sockets.isOpen(host(), 7480));
-        assumeTrue("Assume that Redis runs on port 7481", Sockets.isOpen(host(), 7481));
+    private static RedisClusterClient redisClient = RedisClusterClient.create(TestClientResources.get(), redisURI);
+
+    @BeforeEach
+    void before() {
+        assumeTrue(Sockets.isOpen(host(), CLUSTER_PORT_SSL_1), "Assume that stunnel runs on port 7443");
+        assumeTrue(Sockets.isOpen(host(), CLUSTER_PORT_SSL_2), "Assume that stunnel runs on port 7444");
+        assumeTrue(Sockets.isOpen(host(), CLUSTER_PORT_SSL_3), "Assume that stunnel runs on port 7445");
+        assumeTrue(Sockets.isOpen(host(), 7479), "Assume that Redis runs on port 7479");
+        assumeTrue(Sockets.isOpen(host(), 7480), "Assume that Redis runs on port 7480");
+        assumeTrue(Sockets.isOpen(host(), 7481), "Assume that Redis runs on port 7481");
     }
 
-    @AfterClass
-    public static void afterClass() {
+    @AfterAll
+    static void afterClass() {
         FastShutdown.shutdown(redisClient);
     }
 
     @Test
-    public void defaultClusterConnectionShouldWork() throws Exception {
+    void defaultClusterConnectionShouldWork() {
 
         StatefulRedisClusterConnection<String, String> connection = redisClient.connect();
         assertThat(connection.sync().ping()).isEqualTo("PONG");
@@ -76,7 +80,7 @@ public void defaultClusterConnectionShouldWork() throws Exception {
     }
 
     @Test
-    public void partitionViewShouldContainClusterPorts() throws Exception {
+    void partitionViewShouldContainClusterPorts() {
 
         StatefulRedisClusterConnection<String, String> connection = redisClient.connect();
         List<Integer> ports = connection.getPartitions().stream().map(redisClusterNode -> redisClusterNode.getUri().getPort())
@@ -87,7 +91,7 @@ public void partitionViewShouldContainClusterPorts() throws Exception {
     }
 
     @Test
-    public void routedOperationsAreWorking() throws Exception {
+    void routedOperationsAreWorking() {
 
         StatefulRedisClusterConnection<String, String> connection = redisClient.connect();
         RedisAdvancedClusterCommands<String, String> sync = connection.sync();
@@ -102,7 +106,7 @@ public void routedOperationsAreWorking() throws Exception {
     }
 
     @Test
-    public void nodeConnectionsShouldWork() throws Exception {
+    void nodeConnectionsShouldWork() {
 
         StatefulRedisClusterConnection<String, String> connection = redisClient.connect();
 
@@ -119,7 +123,7 @@ public void nodeConnectionsShouldWork() throws Exception {
     }
 
     @Test
-    public void nodeSelectionApiShouldWork() throws Exception {
+    void nodeSelectionApiShouldWork() {
 
         StatefulRedisClusterConnection<String, String> connection = redisClient.connect();
 
@@ -130,7 +134,7 @@ public void nodeSelectionApiShouldWork() throws Exception {
     }
 
     @Test
-    public void connectionWithoutPasswordShouldFail() throws Exception {
+    void connectionWithoutPasswordShouldFail() {
 
         RedisURI redisURI = RedisURI.builder().redis(host(), CLUSTER_PORT_SSL_1).withSsl(true).withVerifyPeer(false).build();
         RedisClusterClient redisClusterClient = RedisClusterClient.create(TestClientResources.get(), redisURI);
@@ -145,7 +149,7 @@ public void connectionWithoutPasswordShouldFail() throws Exception {
     }
 
     @Test
-    public void connectionWithoutPasswordShouldFail2() throws Exception {
+    void connectionWithoutPasswordShouldFail2() {
 
         RedisURI redisURI = RedisURI.builder().redis(host(), CLUSTER_PORT_SSL_1).withSsl(true).withVerifyPeer(false).build();
         RedisClusterClient redisClusterClient = RedisClusterClient.create(TestClientResources.get(), redisURI);
@@ -160,7 +164,7 @@ public void connectionWithoutPasswordShouldFail2() throws Exception {
     }
 
     @Test
-    public void clusterNodeRefreshWorksForMultipleIterations() throws Exception {
+    void clusterNodeRefreshWorksForMultipleIterations() {
 
         redisClient.reloadPartitions();
         redisClient.reloadPartitions();
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java
similarity index 56%
rename from src/test/java/io/lettuce/core/cluster/RedisClusterReadFromTest.java
rename to src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java
index ce46e1fbfa..3c27388a22 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java
@@ -17,58 +17,53 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.Collections;
+import javax.inject.Inject;
 
-import org.junit.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.ReadFrom;
-import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.test.LettuceExtension;
 
+/**
+ * @author Mark Paluch
+ */
 @SuppressWarnings("unchecked")
-public class RedisClusterReadFromTest extends AbstractClusterTest {
-
-    protected RedisAdvancedClusterCommands<String, String> sync;
-    protected StatefulRedisClusterConnection<String, String> connection;
-
-    @BeforeClass
-    public static void setupClient() throws Exception {
+@ExtendWith(LettuceExtension.class)
+class RedisClusterReadFromIntegrationTests extends TestSupport {
 
-        setupClusterClient();
-        clusterClient = RedisClusterClient.create(TestClientResources.get(),
-                Collections.singletonList(RedisURI.Builder.redis(host, port1).build()));
-    }
-
-    @AfterClass
-    public static void shutdownClient() {
+    private final RedisClusterClient clusterClient;
+    private StatefulRedisClusterConnection<String, String> connection;
+    private RedisAdvancedClusterCommands<String, String> sync;
 
-        shutdownClusterClient();
-        FastShutdown.shutdown(clusterClient);
+    @Inject
+    RedisClusterReadFromIntegrationTests(RedisClusterClient clusterClient) {
+        this.clusterClient = clusterClient;
     }
 
-    @Before
-    public void before() {
-
-        clusterRule.getClusterClient().reloadPartitions();
+    @BeforeEach
+    void before() {
         connection = clusterClient.connect();
         sync = connection.sync();
     }
 
-    @After
-    public void after() {
-        sync.getStatefulConnection().close();
+    @AfterEach
+    void after() {
+        connection.close();
     }
 
     @Test
-    public void defaultTest() {
+    void defaultTest() {
         assertThat(connection.getReadFrom()).isEqualTo(ReadFrom.MASTER);
     }
 
     @Test
-    public void readWriteMaster() {
+    void readWriteMaster() {
 
         connection.setReadFrom(ReadFrom.MASTER);
 
@@ -77,7 +72,7 @@ public void readWriteMaster() {
     }
 
     @Test
-    public void readWriteMasterPreferred() {
+    void readWriteMasterPreferred() {
 
         connection.setReadFrom(ReadFrom.MASTER_PREFERRED);
 
@@ -86,35 +81,35 @@ public void readWriteMasterPreferred() {
     }
 
     @Test
-    public void readWriteSlave() {
+    void readWriteSlave() {
 
         connection.setReadFrom(ReadFrom.SLAVE);
 
         sync.set(key, "value1");
 
-        connection.getConnection(host, port2).sync().waitForReplication(1, 1000);
+        connection.getConnection(ClusterTestSettings.host, ClusterTestSettings.port2).sync().waitForReplication(1, 1000);
         assertThat(sync.get(key)).isEqualTo("value1");
     }
 
     @Test
-    public void readWriteSlavePreferred() {
+    void readWriteSlavePreferred() {
 
         connection.setReadFrom(ReadFrom.SLAVE_PREFERRED);
 
         sync.set(key, "value1");
 
-        connection.getConnection(host, port2).sync().waitForReplication(1, 1000);
+        connection.getConnection(ClusterTestSettings.host, ClusterTestSettings.port2).sync().waitForReplication(1, 1000);
         assertThat(sync.get(key)).isEqualTo("value1");
     }
 
     @Test
-    public void readWriteNearest() {
+    void readWriteNearest() {
 
         connection.setReadFrom(ReadFrom.NEAREST);
 
         sync.set(key, "value1");
 
-        connection.getConnection(host, port2).sync().waitForReplication(1, 1000);
+        connection.getConnection(ClusterTestSettings.host, ClusterTestSettings.port2).sync().waitForReplication(1, 1000);
         assertThat(sync.get(key)).isEqualTo("value1");
     }
 }
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
index fae68df0ad..da72285a95 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
@@ -15,26 +15,21 @@
  */
 package io.lettuce.core.cluster;
 
-import static io.lettuce.core.cluster.AbstractClusterTest.createSlots;
+import static io.lettuce.core.cluster.ClusterTestSettings.createSlots;
 import static io.lettuce.core.cluster.ClusterTestUtil.getNodeId;
 import static io.lettuce.core.cluster.ClusterTestUtil.getOwnPartition;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Fail.fail;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
 import org.junit.*;
 
-import io.lettuce.ConnectionTestUtil;
-import io.lettuce.Futures;
-import io.lettuce.TestClientResources;
-import io.lettuce.Wait;
 import io.lettuce.category.SlowTests;
 import io.lettuce.core.*;
 import io.lettuce.core.api.async.RedisAsyncCommands;
@@ -47,6 +42,13 @@
 import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.test.ConnectionTestUtil;
+import io.lettuce.test.Futures;
+import io.lettuce.test.Wait;
+import io.lettuce.test.resource.DefaultRedisClient;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * Test for mutable cluster setup scenarios.
@@ -56,7 +58,7 @@
  */
 @SuppressWarnings({ "unchecked" })
 @SlowTests
-public class RedisClusterSetupTest extends AbstractTest {
+public class RedisClusterSetupTest extends TestSupport {
 
     private static final String host = TestSettings.hostAddr();
 
@@ -70,12 +72,12 @@ public class RedisClusterSetupTest extends AbstractTest {
     private RedisCommands<String, String> redis2;
 
     @Rule
-    public ClusterRule clusterRule = new ClusterRule(clusterClient, AbstractClusterTest.port5, AbstractClusterTest.port6);
+    public ClusterRule clusterRule = new ClusterRule(clusterClient, ClusterTestSettings.port5, ClusterTestSettings.port6);
 
     @BeforeClass
     public static void setupClient() {
         clusterClient = RedisClusterClient.create(TestClientResources.get(),
-                RedisURI.Builder.redis(host, AbstractClusterTest.port5).build());
+                RedisURI.Builder.redis(host, ClusterTestSettings.port5).build());
     }
 
     @AfterClass
@@ -84,27 +86,27 @@ public static void shutdownClient() {
     }
 
     @Before
-    public void openConnection() throws Exception {
-        redis1 = client.connect(RedisURI.Builder.redis(AbstractClusterTest.host, AbstractClusterTest.port5).build()).sync();
-        redis2 = client.connect(RedisURI.Builder.redis(AbstractClusterTest.host, AbstractClusterTest.port6).build()).sync();
+    public void openConnection() {
+        redis1 = client.connect(RedisURI.Builder.redis(ClusterTestSettings.host, ClusterTestSettings.port5).build()).sync();
+        redis2 = client.connect(RedisURI.Builder.redis(ClusterTestSettings.host, ClusterTestSettings.port6).build()).sync();
         clusterRule.clusterReset();
     }
 
     @After
-    public void closeConnection() throws Exception {
+    public void closeConnection() {
         redis1.getStatefulConnection().close();
         redis2.getStatefulConnection().close();
     }
 
     @Test
-    public void clusterMeet() throws Exception {
+    public void clusterMeet() {
 
         clusterRule.clusterReset();
 
         Partitions partitionsBeforeMeet = ClusterPartitionParser.parse(redis1.clusterNodes());
         assertThat(partitionsBeforeMeet.getPartitions()).hasSize(1);
 
-        String result = redis1.clusterMeet(host, AbstractClusterTest.port6);
+        String result = redis1.clusterMeet(host, ClusterTestSettings.port6);
         assertThat(result).isEqualTo("OK");
 
         Wait.untilEquals(2, () -> ClusterPartitionParser.parse(redis1.clusterNodes()).size()).waitOrTimeout();
@@ -114,11 +116,11 @@ public void clusterMeet() throws Exception {
     }
 
     @Test
-    public void clusterForget() throws Exception {
+    public void clusterForget() {
 
         clusterRule.clusterReset();
 
-        String result = redis1.clusterMeet(host, AbstractClusterTest.port6);
+        String result = redis1.clusterMeet(host, ClusterTestSettings.port6);
         assertThat(result).isEqualTo("OK");
         Wait.untilTrue(() -> redis1.clusterNodes().contains(redis2.clusterMyId())).waitOrTimeout();
         Wait.untilTrue(() -> redis2.clusterNodes().contains(redis1.clusterMyId())).waitOrTimeout();
@@ -289,14 +291,9 @@ public void disconnectedConnectionRejectTest() throws Exception {
         RedisFuture<String> set = clusterConnection.set("t", "value"); // 15891
 
         set.await(5, TimeUnit.SECONDS);
-        try {
-            set.get();
-            fail("Missing RedisException");
-        } catch (ExecutionException e) {
-            assertThat(e).hasRootCauseInstanceOf(RedisException.class).hasMessageContaining("not connected");
-        } finally {
+
+        assertThatThrownBy(() -> Futures.await(set)).hasRootCauseInstanceOf(RedisException.class);
             clusterConnection.getStatefulConnection().close();
-        }
     }
 
     @Test
@@ -481,7 +478,7 @@ public void readFromSlaveTest() throws Exception {
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
         clusterConnection.getStatefulConnection().setReadFrom(ReadFrom.SLAVE);
 
-        clusterConnection.set(key, value).get();
+        Futures.await(clusterConnection.set(key, value));
 
         try {
             clusterConnection.get(key);
@@ -506,7 +503,7 @@ public void readFromNearestTest() throws Exception {
         clusterConnection.getStatefulConnection().close();
     }
 
-    protected PooledClusterConnectionProvider<String, String> getPooledClusterConnectionProvider(
+    private PooledClusterConnectionProvider<String, String> getPooledClusterConnectionProvider(
             RedisAdvancedClusterAsyncCommands<String, String> clusterAsyncConnection) {
 
         RedisChannelHandler<String, String> channelHandler = getChannelHandler(clusterAsyncConnection);
@@ -519,10 +516,10 @@ private RedisChannelHandler<String, String> getChannelHandler(
         return (RedisChannelHandler<String, String>) clusterAsyncConnection.getStatefulConnection();
     }
 
-    private void assertExecuted(RedisFuture<String> set) throws Exception {
-        set.get(5, TimeUnit.SECONDS);
+    private void assertExecuted(RedisFuture<String> set) {
+        Futures.await(set);
         assertThat(set.getError()).isNull();
-        assertThat(set.get()).isEqualTo("OK");
+        assertThat(Futures.get(set)).isEqualTo("OK");
     }
 
     private void suspendConnection(RedisClusterAsyncCommands<String, String> asyncCommands) {
@@ -534,7 +531,7 @@ private void suspendConnection(RedisClusterAsyncCommands<String, String> asyncCo
         Wait.untilTrue(() -> !asyncCommands.isOpen()).waitOrTimeout();
     }
 
-    protected void shiftAllSlotsToNode1() throws InterruptedException, TimeoutException {
+    private void shiftAllSlotsToNode1() throws InterruptedException, TimeoutException {
 
         redis1.clusterDelSlots(createSlots(12000, 16384));
         redis2.clusterDelSlots(createSlots(12000, 16384));
@@ -575,8 +572,7 @@ private int[] toIntArray(List<Integer> list) {
         return list.parallelStream().mapToInt(Integer::intValue).toArray();
     }
 
-    private void waitForSlots(RedisClusterCommands<String, String> connection, int slotCount) throws InterruptedException,
-            TimeoutException {
+    private void waitForSlots(RedisClusterCommands<String, String> connection, int slotCount) {
         Wait.untilEquals(slotCount, () -> getOwnPartition(connection).getSlots().size()).waitOrTimeout();
     }
 }
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
index caf16308b6..bef557acf3 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
@@ -25,44 +25,46 @@
 import org.junit.*;
 import org.junit.runners.MethodSorters;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.Wait;
 import io.lettuce.category.SlowTests;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.test.Wait;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SuppressWarnings("unchecked")
 @SlowTests
-public class RedisClusterStressScenariosTest extends AbstractTest {
+public class RedisClusterStressScenariosTest extends TestSupport {
 
-    public static final String host = TestSettings.hostAddr();
+    private static final String host = TestSettings.hostAddr();
 
-    protected static RedisClient client;
-    protected static RedisClusterClient clusterClient;
+    private static RedisClient client;
+    private static RedisClusterClient clusterClient;
 
-    protected Logger log = LogManager.getLogger(getClass());
+    private Logger log = LogManager.getLogger(getClass());
 
-    protected StatefulRedisConnection<String, String> redis5;
-    protected StatefulRedisConnection<String, String> redis6;
+    private StatefulRedisConnection<String, String> redis5;
+    private StatefulRedisConnection<String, String> redis6;
 
-    protected RedisCommands<String, String> redissync5;
-    protected RedisCommands<String, String> redissync6;
+    private RedisCommands<String, String> redissync5;
+    private RedisCommands<String, String> redissync6;
 
     protected String key = "key";
     protected String value = "value";
 
     @Rule
-    public ClusterRule clusterRule = new ClusterRule(clusterClient, AbstractClusterTest.port5, AbstractClusterTest.port6);
+    public ClusterRule clusterRule = new ClusterRule(clusterClient, ClusterTestSettings.port5, ClusterTestSettings.port6);
 
     @BeforeClass
     public static void setupClient() {
-        client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, AbstractClusterTest.port5).build());
+        client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, ClusterTestSettings.port5).build());
         clusterClient = RedisClusterClient.create(TestClientResources.get(),
-                Collections.singletonList(RedisURI.Builder.redis(host, AbstractClusterTest.port5).build()));
+                Collections.singletonList(RedisURI.Builder.redis(host, ClusterTestSettings.port5).build()));
     }
 
     @AfterClass
@@ -75,8 +77,8 @@ public void before() throws Exception {
 
         ClusterSetup.setupMasterWithSlave(clusterRule);
 
-        redis5 = client.connect(RedisURI.Builder.redis(host, AbstractClusterTest.port5).build());
-        redis6 = client.connect(RedisURI.Builder.redis(host, AbstractClusterTest.port6).build());
+        redis5 = client.connect(RedisURI.Builder.redis(host, ClusterTestSettings.port5).build());
+        redis6 = client.connect(RedisURI.Builder.redis(host, ClusterTestSettings.port6).build());
 
         redissync5 = redis5.sync();
         redissync6 = redis6.sync();
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilUnitTests.java
similarity index 92%
rename from src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilTest.java
rename to src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilUnitTests.java
index e0c174acef..a924ac5fdc 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilUnitTests.java
@@ -20,17 +20,17 @@
 import java.net.URI;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisURI;
 
 /**
  * @author Mark Paluch
  */
-public class RedisClusterURIUtilTest {
+class RedisClusterURIUtilUnitTests {
 
     @Test
-    public void testSimpleUri() {
+    void testSimpleUri() {
 
         List<RedisURI> redisURIs = RedisClusterURIUtil.toRedisURIs(URI.create("redis://host:7479"));
 
@@ -42,7 +42,7 @@ public void testSimpleUri() {
     }
 
     @Test
-    public void testMultipleHosts() {
+    void testMultipleHosts() {
 
         List<RedisURI> redisURIs = RedisClusterURIUtil.toRedisURIs(URI.create("redis://host1,host2"));
 
@@ -58,7 +58,7 @@ public void testMultipleHosts() {
     }
 
     @Test
-    public void testMultipleHostsWithPorts() {
+    void testMultipleHostsWithPorts() {
 
         List<RedisURI> redisURIs = RedisClusterURIUtil.toRedisURIs(URI.create("redis://host1:6379,host2:6380"));
 
@@ -74,7 +74,7 @@ public void testMultipleHostsWithPorts() {
     }
 
     @Test
-    public void testSslWithPasswordSingleHost() {
+    void testSslWithPasswordSingleHost() {
 
         List<RedisURI> redisURIs = RedisClusterURIUtil.toRedisURIs(URI.create("redis+tls://password@host1"));
 
@@ -89,7 +89,7 @@ public void testSslWithPasswordSingleHost() {
     }
 
     @Test
-    public void testSslWithPasswordMultipleHosts() {
+    void testSslWithPasswordMultipleHosts() {
 
         List<RedisURI> redisURIs = RedisClusterURIUtil.toRedisURIs(URI.create("redis+tls://password@host1:6379,host2:6380"));
 
diff --git a/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java
index a9b6d51a48..b3d3efcfcf 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java
@@ -18,97 +18,72 @@
 import static io.lettuce.core.cluster.ClusterTestUtil.getOwnPartition;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.Collections;
+import javax.inject.Inject;
 
-import org.junit.*;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import reactor.test.StepVerifier;
-import io.lettuce.TestClientResources;
-import io.lettuce.core.FastShutdown;
-import io.lettuce.core.RedisClient;
-import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
 import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.test.LettuceExtension;
 
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+/**
+ * @author Mark Paluch
+ */
 @SuppressWarnings("unchecked")
-public class RedisReactiveClusterClientTest extends AbstractClusterTest {
-
-    protected static RedisClient client;
-
-    protected StatefulRedisClusterConnection<String, String> connection;
-    protected RedisAdvancedClusterCommands<String, String> sync;
-    protected RedisAdvancedClusterReactiveCommands<String, String> reactive;
-
-    @BeforeClass
-    public static void setupClient() throws Exception {
-        setupClusterClient();
-        client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port1).build());
-        clusterClient = RedisClusterClient.create(TestClientResources.get(),
-                Collections.singletonList(RedisURI.Builder.redis(host, port1).build()));
-    }
+@ExtendWith(LettuceExtension.class)
+class RedisReactiveClusterClientTest extends TestSupport {
 
-    @AfterClass
-    public static void shutdownClient() {
-        shutdownClusterClient();
-        FastShutdown.shutdown(client);
-        FastShutdown.shutdown(clusterClient);
-    }
-
-    @Before
-    public void before() throws Exception {
-
-        clusterRule.getClusterClient().reloadPartitions();
-
-        clusterClient.reloadPartitions();
-        connection = clusterClient.connect();
-        sync = connection.sync();
-        reactive = connection.reactive();
-    }
+    private final RedisAdvancedClusterCommands<String, String> sync;
+    private final RedisAdvancedClusterReactiveCommands<String, String> reactive;
 
-    @After
-    public void after() throws Exception {
-        connection.close();
+    @Inject
+    RedisReactiveClusterClientTest(StatefulRedisClusterConnection<String, String> connection) {
+        this.sync = connection.sync();
+        this.reactive = connection.reactive();
     }
 
     @Test
-    public void testClusterCommandRedirection() throws Exception {
+    void testClusterCommandRedirection() {
 
         // Command on node within the default connection
-        StepVerifier.create(reactive.set(KEY_B, "myValue1")).expectNext("OK").verifyComplete();
+        StepVerifier.create(reactive.set(ClusterTestSettings.KEY_B, "myValue1")).expectNext("OK").verifyComplete();
 
         // gets redirection to node 3
-        StepVerifier.create(reactive.set(KEY_A, "myValue1")).expectNext("OK").verifyComplete();
+        StepVerifier.create(reactive.set(ClusterTestSettings.KEY_A, "myValue1")).expectNext("OK").verifyComplete();
     }
 
     @Test
-    public void getKeysInSlot() throws Exception {
+    void getKeysInSlot() {
 
-        sync.set(KEY_A, value);
-        sync.set(KEY_B, value);
+        sync.set(ClusterTestSettings.KEY_A, value);
+        sync.set(ClusterTestSettings.KEY_B, value);
 
-        StepVerifier.create(reactive.clusterGetKeysInSlot(SLOT_A, 10)).expectNext(KEY_A).verifyComplete();
-        StepVerifier.create(reactive.clusterGetKeysInSlot(SLOT_B, 10)).expectNext(KEY_B).verifyComplete();
+        StepVerifier.create(reactive.clusterGetKeysInSlot(ClusterTestSettings.SLOT_A, 10))
+                .expectNext(ClusterTestSettings.KEY_A).verifyComplete();
+        StepVerifier.create(reactive.clusterGetKeysInSlot(ClusterTestSettings.SLOT_B, 10))
+                .expectNext(ClusterTestSettings.KEY_B).verifyComplete();
     }
 
     @Test
-    public void countKeysInSlot() throws Exception {
+    void countKeysInSlot() {
 
-        sync.set(KEY_A, value);
-        sync.set(KEY_B, value);
+        sync.set(ClusterTestSettings.KEY_A, value);
+        sync.set(ClusterTestSettings.KEY_B, value);
 
-        StepVerifier.create(reactive.clusterCountKeysInSlot(SLOT_A)).expectNext(1L).verifyComplete();
-        StepVerifier.create(reactive.clusterCountKeysInSlot(SLOT_B)).expectNext(1L).verifyComplete();
+        StepVerifier.create(reactive.clusterCountKeysInSlot(ClusterTestSettings.SLOT_A)).expectNext(1L).verifyComplete();
+        StepVerifier.create(reactive.clusterCountKeysInSlot(ClusterTestSettings.SLOT_B)).expectNext(1L).verifyComplete();
 
         int slotZZZ = SlotHash.getSlot("ZZZ".getBytes());
         StepVerifier.create(reactive.clusterCountKeysInSlot(slotZZZ)).expectNext(0L).verifyComplete();
     }
 
     @Test
-    public void testClusterCountFailureReports() throws Exception {
+    void testClusterCountFailureReports() {
         RedisClusterNode ownPartition = getOwnPartition(sync);
         StepVerifier.create(reactive.clusterCountFailureReports(ownPartition.getNodeId())).consumeNextWith(actual -> {
             assertThat(actual).isGreaterThanOrEqualTo(0);
@@ -116,18 +91,19 @@ public void testClusterCountFailureReports() throws Exception {
     }
 
     @Test
-    public void testClusterKeyslot() throws Exception {
-        StepVerifier.create(reactive.clusterKeyslot(KEY_A)).expectNext((long) SLOT_A).verifyComplete();
-        assertThat(SlotHash.getSlot(KEY_A)).isEqualTo(SLOT_A);
+    void testClusterKeyslot() {
+        StepVerifier.create(reactive.clusterKeyslot(ClusterTestSettings.KEY_A)).expectNext((long) ClusterTestSettings.SLOT_A)
+                .verifyComplete();
+        assertThat(SlotHash.getSlot(ClusterTestSettings.KEY_A)).isEqualTo(ClusterTestSettings.SLOT_A);
     }
 
     @Test
-    public void testClusterSaveconfig() throws Exception {
+    void testClusterSaveconfig() {
         StepVerifier.create(reactive.clusterSaveconfig()).expectNext("OK").verifyComplete();
     }
 
     @Test
-    public void testClusterSetConfigEpoch() throws Exception {
+    void testClusterSetConfigEpoch() {
         StepVerifier.create(reactive.clusterSetConfigEpoch(1L)).consumeErrorWith(e -> {
             assertThat(e).hasMessageContaining("ERR The user can assign a config epoch only");
         }).verify();
diff --git a/src/test/java/io/lettuce/core/cluster/RedisStateTest.java b/src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java
similarity index 74%
rename from src/test/java/io/lettuce/core/cluster/RedisStateTest.java
rename to src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java
index 47c9b38a78..f4300433fd 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisStateTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java
@@ -20,21 +20,34 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.junit.Test;
+import javax.inject.Inject;
 
-import io.lettuce.core.AbstractRedisClientTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.models.command.CommandDetail;
 import io.lettuce.core.models.command.CommandDetailParser;
 import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.protocol.ProtocolKeyword;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class RedisStateTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+public class RedisStateIntegrationTests {
+
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    RedisStateIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        this.redis = connection.sync();
+    }
 
     @Test
-    public void shouldDiscoverCommands() {
+    void shouldDiscoverCommands() {
 
         List<CommandDetail> commandDetails = CommandDetailParser.parse(redis.command());
         RedisState state = new RedisState(commandDetails);
diff --git a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java
similarity index 89%
rename from src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
rename to src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java
index da662989e3..d10cba5f70 100644
--- a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java
@@ -22,12 +22,12 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.models.partitions.Partitions;
@@ -39,8 +39,8 @@
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class RoundRobinSocketAddressSupplierTest {
+@ExtendWith(MockitoExtension.class)
+class RoundRobinSocketAddressSupplierUnitTests {
 
     private static RedisURI hap1 = new RedisURI("127.0.0.1", 1, Duration.ofSeconds(1));
     private static RedisURI hap2 = new RedisURI("127.0.0.1", 2, Duration.ofSeconds(1));
@@ -51,16 +51,16 @@ public class RoundRobinSocketAddressSupplierTest {
     @Mock
     private ClientResources clientResourcesMock;
 
-    @BeforeClass
-    public static void beforeClass() {
+    @BeforeAll
+    static void beforeClass() {
 
         hap1.getResolvedAddress();
         hap2.getResolvedAddress();
         hap3.getResolvedAddress();
     }
 
-    @Before
-    public void before() throws Exception {
+    @BeforeEach
+    void before() {
 
         when(clientResourcesMock.socketAddressResolver()).thenReturn(SocketAddressResolver.create(DnsResolvers.JVM_DEFAULT));
 
@@ -73,7 +73,7 @@ public void before() throws Exception {
     }
 
     @Test
-    public void noOffset() {
+    void noOffset() {
 
         RoundRobinSocketAddressSupplier sut = new RoundRobinSocketAddressSupplier(partitions,
                 redisClusterNodes -> redisClusterNodes, clientResourcesMock);
@@ -87,7 +87,7 @@ public void noOffset() {
     }
 
     @Test
-    public void partitionTableChangesNewNode() {
+    void partitionTableChangesNewNode() {
 
         RoundRobinSocketAddressSupplier sut = new RoundRobinSocketAddressSupplier(partitions,
                 redisClusterNodes -> redisClusterNodes, clientResourcesMock);
@@ -105,7 +105,7 @@ public void partitionTableChangesNewNode() {
     }
 
     @Test
-    public void partitionTableChangesNodeRemoved() {
+    void partitionTableChangesNodeRemoved() {
 
         RoundRobinSocketAddressSupplier sut = new RoundRobinSocketAddressSupplier(partitions,
                 redisClusterNodes -> redisClusterNodes, clientResourcesMock);
diff --git a/src/test/java/io/lettuce/core/cluster/ScanIteratorTest.java b/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
similarity index 81%
rename from src/test/java/io/lettuce/core/cluster/ScanIteratorTest.java
rename to src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
index 8d078ca123..ff29bfca64 100644
--- a/src/test/java/io/lettuce/core/cluster/ScanIteratorTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
@@ -23,40 +23,35 @@
 import java.util.NoSuchElementException;
 import java.util.stream.Collectors;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import io.lettuce.KeysAndValues;
-import io.lettuce.core.KeyValue;
-import io.lettuce.core.ScanArgs;
-import io.lettuce.core.ScanIterator;
-import io.lettuce.core.ScoredValue;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.lettuce.core.*;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
-import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.test.KeysAndValues;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class ScanIteratorTest extends AbstractClusterTest {
-
-    private StatefulRedisClusterConnection<String, String> connection;
-    private RedisAdvancedClusterCommands<String, String> redis;
+@ExtendWith(LettuceExtension.class)
+class ScanIteratorIntegrationTests extends TestSupport {
 
-    @Before
-    public void before() throws Exception {
-
-        this.connection = clusterClient.connect();
-        this.redis = this.connection.sync();
-    }
+    private final StatefulRedisClusterConnection<String, String> connection;
+    private final RedisClusterCommands<String, String> redis;
 
-    @After
-    public void tearDown() throws Exception {
-        this.connection.close();
+    @Inject
+    ScanIteratorIntegrationTests(StatefulRedisClusterConnection<String, String> connection) {
+        this.connection = connection;
+        this.redis = connection.sync();
+        this.redis.flushall();
     }
 
     @Test
-    public void scanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
+    void scanShouldThrowNoSuchElementExceptionOnEmpty() {
 
         redis.mset(KeysAndValues.MAP);
 
@@ -72,7 +67,7 @@ public void scanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
     }
 
     @Test
-    public void keysSinglePass() throws Exception {
+    void keysSinglePass() {
 
         redis.mset(KeysAndValues.MAP);
 
@@ -90,7 +85,7 @@ public void keysSinglePass() throws Exception {
     }
 
     @Test
-    public void keysMultiPass() throws Exception {
+    void keysMultiPass() {
 
         redis.mset(KeysAndValues.MAP);
 
@@ -102,7 +97,7 @@ public void keysMultiPass() throws Exception {
     }
 
     @Test
-    public void hscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
+    void hscanShouldThrowNoSuchElementExceptionOnEmpty() {
 
         redis.mset(KeysAndValues.MAP);
 
@@ -119,7 +114,7 @@ public void hscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
     }
 
     @Test
-    public void hashSinglePass() throws Exception {
+    void hashSinglePass() {
 
         redis.hmset(key, KeysAndValues.MAP);
 
@@ -138,7 +133,7 @@ public void hashSinglePass() throws Exception {
     }
 
     @Test
-    public void hashMultiPass() throws Exception {
+    void hashMultiPass() {
 
         redis.hmset(key, KeysAndValues.MAP);
 
@@ -151,7 +146,7 @@ public void hashMultiPass() throws Exception {
     }
 
     @Test
-    public void sscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
+    void sscanShouldThrowNoSuchElementExceptionOnEmpty() {
 
         redis.sadd(key, KeysAndValues.VALUES.toArray(new String[0]));
 
@@ -167,7 +162,7 @@ public void sscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
     }
 
     @Test
-    public void setSinglePass() throws Exception {
+    void setSinglePass() {
 
         redis.sadd(key, KeysAndValues.KEYS.toArray(new String[0]));
 
@@ -185,7 +180,7 @@ public void setSinglePass() throws Exception {
     }
 
     @Test
-    public void setMultiPass() throws Exception {
+    void setMultiPass() {
 
         redis.sadd(key, KeysAndValues.KEYS.toArray(new String[0]));
 
@@ -197,7 +192,7 @@ public void setMultiPass() throws Exception {
     }
 
     @Test
-    public void zscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
+    void zscanShouldThrowNoSuchElementExceptionOnEmpty() {
 
         for (int i = 0; i < KeysAndValues.COUNT; i++) {
             redis.zadd(key, ScoredValue.just(i, KeysAndValues.KEYS.get(i)));
@@ -215,7 +210,7 @@ public void zscanShouldThrowNoSuchElementExceptionOnEmpty() throws Exception {
     }
 
     @Test
-    public void zsetSinglePass() throws Exception {
+    void zsetSinglePass() {
 
         for (int i = 0; i < KeysAndValues.COUNT; i++) {
             redis.zadd(key, ScoredValue.just(i, KeysAndValues.KEYS.get(i)));
@@ -235,7 +230,7 @@ public void zsetSinglePass() throws Exception {
     }
 
     @Test
-    public void zsetMultiPass() throws Exception {
+    void zsetMultiPass() {
 
         List<ScoredValue<String>> expected = new ArrayList<>();
         for (int i = 0; i < KeysAndValues.COUNT; i++) {
diff --git a/src/test/java/io/lettuce/core/cluster/ScanStreamTest.java b/src/test/java/io/lettuce/core/cluster/ScanStreamIntegrationTests.java
similarity index 67%
rename from src/test/java/io/lettuce/core/cluster/ScanStreamTest.java
rename to src/test/java/io/lettuce/core/cluster/ScanStreamIntegrationTests.java
index fb12f03b3d..5867b3826f 100644
--- a/src/test/java/io/lettuce/core/cluster/ScanStreamTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ScanStreamIntegrationTests.java
@@ -15,40 +15,38 @@
  */
 package io.lettuce.core.cluster;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import reactor.test.StepVerifier;
 import io.lettuce.core.ScanArgs;
 import io.lettuce.core.ScanStream;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
-import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class ScanStreamTest extends AbstractClusterTest {
-
-    private StatefulRedisClusterConnection<String, String> connection;
-    private RedisAdvancedClusterCommands<String, String> redis;
+@ExtendWith(LettuceExtension.class)
+class ScanStreamIntegrationTests extends TestSupport {
 
-    @Before
-    public void before() throws Exception {
+    private final StatefulRedisClusterConnection<String, String> connection;
+    private final RedisClusterCommands<String, String> redis;
 
-        this.connection = clusterClient.connect();
-        this.redis = this.connection.sync();
+    @Inject
+    ScanStreamIntegrationTests(StatefulRedisClusterConnection<String, String> connection) {
+        this.connection = connection;
+        this.redis = connection.sync();
         this.redis.flushall();
     }
 
-    @After
-    public void tearDown() {
-        this.connection.close();
-    }
-
     @Test
-    public void shouldScanIteratively() {
+    void shouldScanIteratively() {
 
         for (int i = 0; i < 1000; i++) {
             redis.set("key-" + i, value);
diff --git a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java
index 3f320fecb2..e51006695e 100644
--- a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java
@@ -19,9 +19,9 @@
 
 import java.util.List;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
@@ -33,12 +33,12 @@
 /**
  * @author Mark Paluch
  */
-public class SingleThreadedReactiveClusterClientTest {
+class SingleThreadedReactiveClusterClientTest {
 
-    RedisClusterClient client;
+    private RedisClusterClient client;
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
 
         DefaultClientResources clientResources = DefaultClientResources.builder()
                 .eventExecutorGroup(ImmediateEventExecutor.INSTANCE)
@@ -48,15 +48,15 @@ public void before() {
         client = RedisClusterClient.create(clientResources, RedisURI.create("localhost", 7379));
     }
 
-    @After
-    public void tearDown() {
+    @AfterEach
+    void tearDown() {
 
         client.shutdown();
         client.getResources().shutdown();
     }
 
     @Test
-    public void shouldPropagateAsynchronousConnections() {
+    void shouldPropagateAsynchronousConnections() {
 
         StatefulRedisClusterConnection<String, String> connect = client.connect();
         connect.sync().flushall();
diff --git a/src/test/java/io/lettuce/core/cluster/SlotHashTest.java b/src/test/java/io/lettuce/core/cluster/SlotHashUnitTests.java
similarity index 80%
rename from src/test/java/io/lettuce/core/cluster/SlotHashTest.java
rename to src/test/java/io/lettuce/core/cluster/SlotHashUnitTests.java
index 4fdd218007..b88938eb44 100644
--- a/src/test/java/io/lettuce/core/cluster/SlotHashTest.java
+++ b/src/test/java/io/lettuce/core/cluster/SlotHashUnitTests.java
@@ -19,40 +19,40 @@
 
 import java.nio.ByteBuffer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  * @since 3.0
  */
-public class SlotHashTest {
+class SlotHashUnitTests {
 
-    static final byte[] BYTES = "123456789".getBytes();
-    static final byte[] TAGGED = "key{123456789}a".getBytes();
+    private static final byte[] BYTES = "123456789".getBytes();
+    private static final byte[] TAGGED = "key{123456789}a".getBytes();
 
     @Test
-    public void shouldGetSlotHeap() {
+    void shouldGetSlotHeap() {
 
         int result = SlotHash.getSlot(BYTES);
         assertThat(result).isEqualTo(0x31C3);
     }
 
     @Test
-    public void shouldGetTaggedSlotHeap() {
+    void shouldGetTaggedSlotHeap() {
 
         int result = SlotHash.getSlot(TAGGED);
         assertThat(result).isEqualTo(0x31C3);
     }
 
     @Test
-    public void shouldGetSlotDirect() {
+    void shouldGetSlotDirect() {
 
         int result = SlotHash.getSlot((ByteBuffer) ByteBuffer.allocateDirect(BYTES.length).put(BYTES).flip());
         assertThat(result).isEqualTo(0x31C3);
     }
 
     @Test
-    public void testHashWithHash() {
+    void testHashWithHash() {
 
         int result = SlotHash.getSlot((ByteBuffer) ByteBuffer.allocateDirect(TAGGED.length).put(TAGGED).flip());
         assertThat(result).isEqualTo(0x31C3);
diff --git a/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java
index 068fbfa91b..49cf7fff56 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java
@@ -16,156 +16,127 @@
 package io.lettuce.core.cluster.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.Arrays;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisCommandExecutionException;
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
-import io.lettuce.core.cluster.AbstractClusterTest;
-import io.lettuce.core.cluster.ClusterTestUtil;
-import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.commands.CustomCommandTest;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
+import io.lettuce.test.Futures;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class CustomClusterCommandTest extends AbstractClusterTest {
+@ExtendWith(LettuceExtension.class)
+class CustomClusterCommandTest extends TestSupport {
 
-    private static final Utf8StringCodec utf8StringCodec = new Utf8StringCodec();
-    private static RedisClusterClient redisClusterClient;
-    private StatefulRedisClusterConnection<String, String> redisClusterConnection;
+    private final StatefulRedisClusterConnection<String, String> connection;
     private RedisAdvancedClusterCommands<String, String> redis;
 
-    @BeforeClass
-    public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
-                RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
-    }
-
-    @AfterClass
-    public static void closeClient() {
-        FastShutdown.shutdown(redisClusterClient);
-    }
-
-    @Before
-    public void openConnection() {
-        redisClusterConnection = redisClusterClient.connect();
-        redis = redisClusterConnection.sync();
-        ClusterTestUtil.flushDatabaseOfAllNodes(redisClusterConnection);
+    @Inject
+    CustomClusterCommandTest(StatefulRedisClusterConnection<String, String> connection) {
+        this.connection = connection;
+        this.redis = connection.sync();
+        this.redis.flushall();
     }
 
     @Test
-    public void dispatchSet() {
+    void dispatchSet() {
 
-        String response = redis.dispatch(CustomCommandTest.MyCommands.SET, new StatusOutput<>(utf8StringCodec),
-                new CommandArgs<>(utf8StringCodec).addKey(key).addValue(value));
+        String response = redis.dispatch(CustomCommandTest.MyCommands.SET, new StatusOutput<>(StringCodec.UTF8),
+                new CommandArgs<>(StringCodec.UTF8).addKey(key).addValue(value));
 
         assertThat(response).isEqualTo("OK");
     }
 
     @Test
-    public void dispatchWithoutArgs() {
+    void dispatchWithoutArgs() {
 
-        String response = redis.dispatch(CustomCommandTest.MyCommands.INFO, new StatusOutput<>(utf8StringCodec));
+        String response = redis.dispatch(CustomCommandTest.MyCommands.INFO, new StatusOutput<>(StringCodec.UTF8));
 
         assertThat(response).contains("connected_clients");
     }
 
-    @Test(expected = RedisCommandExecutionException.class)
-    public void dispatchShouldFailForWrongDataType() {
+    @Test
+    void dispatchShouldFailForWrongDataType() {
 
         redis.hset(key, key, value);
-        redis.dispatch(CommandType.GET, new StatusOutput<>(utf8StringCodec), new CommandArgs<>(utf8StringCodec).addKey(key));
+        assertThatThrownBy(
+                () -> redis.dispatch(CommandType.GET, new StatusOutput<>(StringCodec.UTF8),
+                        new CommandArgs<>(StringCodec.UTF8).addKey(key))).isInstanceOf(RedisCommandExecutionException.class);
     }
 
     @Test
-    public void clusterAsyncPing() {
+    void clusterAsyncPing() {
 
         RedisCommand<String, String, String> command = new Command<>(CustomCommandTest.MyCommands.PING, new StatusOutput<>(
-                utf8StringCodec), null);
+                StringCodec.UTF8), null);
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(command);
-        redisClusterConnection.dispatch(async);
+        connection.dispatch(async);
 
-        assertThat(async.join()).isEqualTo("PONG");
+        assertThat(Futures.get((RedisFuture) async)).isEqualTo("PONG");
     }
 
     @Test
-    public void clusterAsyncBatchPing() {
+    void clusterAsyncBatchPing() {
 
         RedisCommand<String, String, String> command1 = new Command<>(CustomCommandTest.MyCommands.PING, new StatusOutput<>(
-                utf8StringCodec), null);
+                StringCodec.UTF8), null);
 
         RedisCommand<String, String, String> command2 = new Command<>(CustomCommandTest.MyCommands.PING, new StatusOutput<>(
-                utf8StringCodec), null);
+                StringCodec.UTF8), null);
 
         AsyncCommand<String, String, String> async1 = new AsyncCommand<>(command1);
         AsyncCommand<String, String, String> async2 = new AsyncCommand<>(command2);
-        redisClusterConnection.dispatch(Arrays.asList(async1, async2));
+        connection.dispatch(Arrays.asList(async1, async2));
 
-        assertThat(async1.join()).isEqualTo("PONG");
-        assertThat(async2.join()).isEqualTo("PONG");
+        assertThat(Futures.get(async1.toCompletableFuture())).isEqualTo("PONG");
+        assertThat(Futures.get(async2.toCompletableFuture())).isEqualTo("PONG");
     }
 
     @Test
-    public void clusterAsyncBatchSet() {
+    void clusterAsyncBatchSet() {
 
-        RedisCommand<String, String, String> command1 = new Command<>(CommandType.SET, new StatusOutput<>(utf8StringCodec),
-                new CommandArgs<>(utf8StringCodec).addKey("key1").addValue("value"));
+        RedisCommand<String, String, String> command1 = new Command<>(CommandType.SET, new StatusOutput<>(StringCodec.UTF8),
+                new CommandArgs<>(StringCodec.UTF8).addKey("key1").addValue("value"));
 
-        RedisCommand<String, String, String> command2 = new Command<>(CommandType.GET, new StatusOutput<>(utf8StringCodec),
-                new CommandArgs<>(utf8StringCodec).addKey("key1"));
+        RedisCommand<String, String, String> command2 = new Command<>(CommandType.GET, new StatusOutput<>(StringCodec.UTF8),
+                new CommandArgs<>(StringCodec.UTF8).addKey("key1"));
 
-        RedisCommand<String, String, String> command3 = new Command<>(CommandType.SET, new StatusOutput<>(utf8StringCodec),
-                new CommandArgs<>(utf8StringCodec).addKey("other-key1").addValue("value"));
+        RedisCommand<String, String, String> command3 = new Command<>(CommandType.SET, new StatusOutput<>(StringCodec.UTF8),
+                new CommandArgs<>(StringCodec.UTF8).addKey("other-key1").addValue("value"));
 
         AsyncCommand<String, String, String> async1 = new AsyncCommand<>(command1);
         AsyncCommand<String, String, String> async2 = new AsyncCommand<>(command2);
         AsyncCommand<String, String, String> async3 = new AsyncCommand<>(command3);
-        redisClusterConnection.dispatch(Arrays.asList(async1, async2, async3));
+        connection.dispatch(Arrays.asList(async1, async2, async3));
 
-        assertThat(async1.join()).isEqualTo("OK");
-        assertThat(async2.join()).isEqualTo("value");
-        assertThat(async3.join()).isEqualTo("OK");
+        assertThat(Futures.get(async1.toCompletableFuture())).isEqualTo("OK");
+        assertThat(Futures.get(async2.toCompletableFuture())).isEqualTo("value");
+        assertThat(Futures.get(async3.toCompletableFuture())).isEqualTo("OK");
     }
 
     @Test
-    public void clusterFireAndForget() {
+    void clusterFireAndForget() {
 
         RedisCommand<String, String, String> command = new Command<>(CustomCommandTest.MyCommands.PING, new StatusOutput<>(
-                utf8StringCodec), null);
-        redisClusterConnection.dispatch(command);
+                StringCodec.UTF8), null);
+        connection.dispatch(command);
         assertThat(command.isCancelled()).isFalse();
 
     }
-
-    public enum MyCommands implements ProtocolKeyword {
-        PING, SET, INFO;
-
-        private final byte name[];
-
-        MyCommands() {
-            // cache the bytes for the command name. Reduces memory and cpu pressure when using commands.
-            name = name().getBytes();
-        }
-
-        @Override
-        public byte[] getBytes() {
-            return name;
-        }
-    }
-
 }
diff --git a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
index 4d69760cd2..e15094fbe0 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
@@ -16,23 +16,23 @@
 package io.lettuce.core.cluster.commands;
 
 import static io.lettuce.core.cluster.ClusterTestUtil.flushDatabaseOfAllNodes;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 
-import io.lettuce.RedisConditions;
-import io.lettuce.TestClientResources;
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.ClusterTestUtil;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.commands.GeoCommandTest;
+import io.lettuce.test.condition.RedisConditions;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
@@ -41,7 +41,7 @@ public class GeoClusterCommandTest extends GeoCommandTest {
     private static RedisClusterClient redisClusterClient;
     private StatefulRedisClusterConnection<String, String> clusterConnection;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupClient() {
         redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
@@ -51,12 +51,12 @@ public static void setupClient() {
         }
     }
 
-    @AfterClass
-    public static void closeClient() {
+    @AfterAll
+    static void closeClient() {
         FastShutdown.shutdown(redisClusterClient);
     }
 
-    @Before
+    @BeforeEach
     public void openConnection() {
         redis = connect();
         flushDatabaseOfAllNodes(clusterConnection);
@@ -69,42 +69,42 @@ protected RedisCommands<String, String> connect() {
         return ClusterTestUtil.redisCommandsOverCluster(clusterConnection);
     }
 
-    @Ignore("MULTI not available on Redis Cluster")
+    @Disabled("MULTI not available on Redis Cluster")
     @Override
     public void geoaddInTransaction() {
     }
 
-    @Ignore("MULTI not available on Redis Cluster")
+    @Disabled("MULTI not available on Redis Cluster")
     @Override
     public void geoaddMultiInTransaction() {
     }
 
-    @Ignore("MULTI not available on Redis Cluster")
+    @Disabled("MULTI not available on Redis Cluster")
     @Override
     public void georadiusInTransaction() {
     }
 
-    @Ignore("MULTI not available on Redis Cluster")
+    @Disabled("MULTI not available on Redis Cluster")
     @Override
     public void geodistInTransaction() {
     }
 
-    @Ignore("MULTI not available on Redis Cluster")
+    @Disabled("MULTI not available on Redis Cluster")
     @Override
     public void georadiusWithArgsAndTransaction() {
     }
 
-    @Ignore("MULTI not available on Redis Cluster")
+    @Disabled("MULTI not available on Redis Cluster")
     @Override
     public void georadiusbymemberWithArgsInTransaction() {
     }
 
-    @Ignore("MULTI not available on Redis Cluster")
+    @Disabled("MULTI not available on Redis Cluster")
     @Override
     public void geoposInTransaction() {
     }
 
-    @Ignore("MULTI not available on Redis Cluster")
+    @Disabled("MULTI not available on Redis Cluster")
     @Override
     public void geohashInTransaction() {
     }
diff --git a/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java
index f0cd2cc571..6bde123a33 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java
@@ -15,19 +15,19 @@
  */
 package io.lettuce.core.cluster.commands;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.ClusterTestUtil;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.commands.HashCommandTest;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
@@ -37,18 +37,18 @@ public class HashClusterCommandTest extends HashCommandTest {
     private static RedisClusterClient redisClusterClient;
     private StatefulRedisClusterConnection<String, String> clusterConnection;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupClient() {
         redisClusterClient = RedisClusterClient.create(
                 TestClientResources.get(), RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
-    @AfterClass
-    public static void closeClient() {
+    @AfterAll
+    static void closeClient() {
         FastShutdown.shutdown(redisClusterClient);
     }
 
-    @Before
+    @BeforeEach
     public void openConnection() {
         redis = connect();
         ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
diff --git a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
index 33936c87e2..f5c2db7044 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
@@ -16,23 +16,22 @@
 package io.lettuce.core.cluster.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.RedisConditions;
-import io.lettuce.TestClientResources;
 import io.lettuce.core.AbstractRedisClientTest;
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.ClusterTestUtil;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.test.condition.EnabledOnCommand;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
@@ -42,18 +41,18 @@ public class KeyClusterCommandTest extends AbstractRedisClientTest {
     private static RedisClusterClient redisClusterClient;
     private StatefulRedisClusterConnection<String, String> clusterConnection;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupClient() {
         redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
-    @AfterClass
-    public static void closeClient() {
+    @AfterAll
+    static void closeClient() {
         FastShutdown.shutdown(redisClusterClient);
     }
 
-    @Before
+    @BeforeEach
     public void openConnection() {
         redis = connect();
         ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
@@ -67,7 +66,7 @@ protected RedisCommands<String, String> connect() {
     }
 
     @Test
-    public void del() {
+    void del() {
 
         redis.set(key, "value");
         redis.set("a", "value");
@@ -80,7 +79,7 @@ public void del() {
     }
 
     @Test
-    public void exists() {
+    void exists() {
 
         assertThat(redis.exists(key, "a", "b")).isEqualTo(0);
 
@@ -92,9 +91,8 @@ public void exists() {
     }
 
     @Test
-    public void touch() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("TOUCH"));
+    @EnabledOnCommand("TOUCH")
+    void touch() {
 
         redis.set(key, "value");
         redis.set("a", "value");
@@ -105,9 +103,8 @@ public void touch() {
     }
 
     @Test
-    public void unlink() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("UNLINK"));
+    @EnabledOnCommand("UNLINK")
+    void unlink() {
 
         redis.set(key, "value");
         redis.set("a", "value");
diff --git a/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java
index 56e0564f86..f7c84838ae 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java
@@ -17,20 +17,20 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.ClusterTestUtil;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.commands.ListCommandTest;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
@@ -39,18 +39,18 @@ public class ListClusterCommandTest extends ListCommandTest {
     private static RedisClusterClient redisClusterClient;
     private StatefulRedisClusterConnection<String, String> clusterConnection;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupClient() {
         redisClusterClient = RedisClusterClient.create(
                 TestClientResources.get(), RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
-    @AfterClass
-    public static void closeClient() {
+    @AfterAll
+    static void closeClient() {
         FastShutdown.shutdown(redisClusterClient);
     }
 
-    @Before
+    @BeforeEach
     public void openConnection() {
         redis = connect();
         ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
@@ -65,7 +65,7 @@ protected RedisCommands<String, String> connect() {
 
     // re-implementation because keys have to be on the same slot
     @Test
-    public void brpoplpush() {
+    void brpoplpush() {
 
         redis.rpush("UKPDHs8Zlp", "1", "2");
         redis.rpush("br7EPz9bbj", "3", "4");
@@ -75,24 +75,24 @@ public void brpoplpush() {
     }
 
     @Test
-    public void brpoplpushTimeout() {
+    void brpoplpushTimeout() {
         assertThat(redis.brpoplpush(1, "UKPDHs8Zlp", "br7EPz9bbj")).isNull();
     }
 
     @Test
-    public void blpop() {
+    void blpop() {
         redis.rpush("br7EPz9bbj", "2", "3");
         assertThat(redis.blpop(1, "UKPDHs8Zlp", "br7EPz9bbj")).isEqualTo(kv("br7EPz9bbj", "2"));
     }
 
     @Test
-    public void brpop() {
+    void brpop() {
         redis.rpush("br7EPz9bbj", "2", "3");
         assertThat(redis.brpop(1, "UKPDHs8Zlp", "br7EPz9bbj")).isEqualTo(kv("br7EPz9bbj", "3"));
     }
 
     @Test
-    public void rpoplpush() {
+    void rpoplpush() {
         assertThat(redis.rpoplpush("UKPDHs8Zlp", "br7EPz9bbj")).isNull();
         redis.rpush("UKPDHs8Zlp", "1", "2");
         redis.rpush("br7EPz9bbj", "3", "4");
diff --git a/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java
index b46af1f772..dbcbd74917 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java
@@ -20,21 +20,21 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.core.FastShutdown;
-import io.lettuce.core.KeyValueStreamingAdapter;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.ClusterTestUtil;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.commands.StringCommandTest;
+import io.lettuce.test.KeyValueStreamingAdapter;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
@@ -43,18 +43,18 @@ public class StringClusterCommandTest extends StringCommandTest {
     private static RedisClusterClient redisClusterClient;
     private StatefulRedisClusterConnection<String, String> clusterConnection;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupClient() {
         redisClusterClient = RedisClusterClient.create(
                 TestClientResources.get(), RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
-    @AfterClass
-    public static void closeClient() {
+    @AfterAll
+    static void closeClient() {
         FastShutdown.shutdown(redisClusterClient);
     }
 
-    @Before
+    @BeforeEach
     public void openConnection() {
         redis = connect();
         ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
@@ -68,7 +68,7 @@ protected RedisCommands<String, String> connect() {
     }
 
     @Test
-    public void msetnx() {
+    void msetnx() {
         redis.set("one", "1");
         Map<String, String> map = new LinkedHashMap<>();
         map.put("one", "1");
@@ -81,7 +81,7 @@ public void msetnx() {
     }
 
     @Test
-    public void mgetStreaming() {
+    void mgetStreaming() {
         setupMget();
 
         KeyValueStreamingAdapter<String, String> streamingAdapter = new KeyValueStreamingAdapter<>();
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
index ea6ef751bd..2ac1bc07c7 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
@@ -15,20 +15,20 @@
  */
 package io.lettuce.core.cluster.commands.reactive;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.ClusterTestUtil;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.commands.HashCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
@@ -38,18 +38,18 @@ public class HashClusterReactiveCommandTest extends HashCommandTest {
     private static RedisClusterClient redisClusterClient;
     private StatefulRedisClusterConnection<String, String> clusterConnection;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupClient() {
         redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
-    @AfterClass
-    public static void closeClient() {
+    @AfterAll
+    static void closeClient() {
         FastShutdown.shutdown(redisClusterClient);
     }
 
-    @Before
+    @BeforeEach
     public void openConnection() {
         redis = connect();
         ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java
index 82e8d3a96d..d2be833cc1 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java
@@ -15,20 +15,20 @@
  */
 package io.lettuce.core.cluster.commands.reactive;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.ClusterTestUtil;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.commands.KeyClusterCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
@@ -37,18 +37,18 @@ public class KeyClusterReativeCommandTest extends KeyClusterCommandTest {
     private static RedisClusterClient redisClusterClient;
     private StatefulRedisClusterConnection<String, String> clusterConnection;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupClient() {
         redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
-    @AfterClass
-    public static void closeClient() {
+    @AfterAll
+    static void closeClient() {
         FastShutdown.shutdown(redisClusterClient);
     }
 
-    @Before
+    @BeforeEach
     public void openConnection() {
         redis = connect();
         ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
index 65a4e5b139..8b0e2cae5e 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
@@ -17,21 +17,21 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.ClusterTestUtil;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.commands.ListCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
@@ -40,18 +40,18 @@ public class ListClusterReactiveCommandTest extends ListCommandTest {
     private static RedisClusterClient redisClusterClient;
     private StatefulRedisClusterConnection<String, String> clusterConnection;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupClient() {
         redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
-    @AfterClass
-    public static void closeClient() {
+    @AfterAll
+    static void closeClient() {
         FastShutdown.shutdown(redisClusterClient);
     }
 
-    @Before
+    @BeforeEach
     public void openConnection() {
         redis = connect();
         ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
@@ -65,7 +65,7 @@ protected RedisCommands<String, String> connect() {
 
     // re-implementation because keys have to be on the same slot
     @Test
-    public void brpoplpush() {
+    void brpoplpush() {
 
         redis.rpush("UKPDHs8Zlp", "1", "2");
         redis.rpush("br7EPz9bbj", "3", "4");
@@ -75,24 +75,24 @@ public void brpoplpush() {
     }
 
     @Test
-    public void brpoplpushTimeout() {
+    void brpoplpushTimeout() {
         assertThat(redis.brpoplpush(1, "UKPDHs8Zlp", "br7EPz9bbj")).isNull();
     }
 
     @Test
-    public void blpop() {
+    void blpop() {
         redis.rpush("br7EPz9bbj", "2", "3");
         assertThat(redis.blpop(1, "UKPDHs8Zlp", "br7EPz9bbj")).isEqualTo(kv("br7EPz9bbj", "2"));
     }
 
     @Test
-    public void brpop() {
+    void brpop() {
         redis.rpush("br7EPz9bbj", "2", "3");
         assertThat(redis.brpop(1, "UKPDHs8Zlp", "br7EPz9bbj")).isEqualTo(kv("br7EPz9bbj", "3"));
     }
 
     @Test
-    public void rpoplpush() {
+    void rpoplpush() {
         assertThat(redis.rpoplpush("UKPDHs8Zlp", "br7EPz9bbj")).isNull();
         redis.rpush("UKPDHs8Zlp", "1", "2");
         redis.rpush("br7EPz9bbj", "3", "4");
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
index 6df9809aa7..c0860a9fc2 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
@@ -20,25 +20,25 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
-import io.lettuce.TestClientResources;
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.ClusterTestUtil;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
 import io.lettuce.core.commands.StringCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
@@ -47,18 +47,18 @@ public class StringClusterReactiveCommandTest extends StringCommandTest {
     private static RedisClusterClient redisClusterClient;
     private StatefulRedisClusterConnection<String, String> clusterConnection;
 
-    @BeforeClass
+    @BeforeAll
     public static void setupClient() {
         redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
     }
 
-    @AfterClass
-    public static void closeClient() {
+    @AfterAll
+    static void closeClient() {
         FastShutdown.shutdown(redisClusterClient);
     }
 
-    @Before
+    @BeforeEach
     public void openConnection() {
         redis = connect();
         ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
@@ -71,7 +71,7 @@ protected RedisCommands<String, String> connect() {
     }
 
     @Test
-    public void msetnx() {
+    void msetnx() {
         redis.set("one", "1");
         Map<String, String> map = new LinkedHashMap<>();
         map.put("one", "1");
@@ -84,7 +84,7 @@ public void msetnx() {
     }
 
     @Test
-    public void mget() {
+    void mget() {
 
         redis.set(key, value);
         redis.set("key1", value);
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java b/src/test/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParserUnitTests.java
similarity index 89%
rename from src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java
rename to src/test/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParserUnitTests.java
index f8ffe6c4bc..922e60d2cb 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterPartitionParserTest.java
+++ b/src/test/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParserUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.cluster;
+package io.lettuce.core.cluster.models.partitions;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.hasItem;
@@ -23,15 +23,12 @@
 import java.util.Collections;
 import java.util.HashSet;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser;
-import io.lettuce.core.cluster.models.partitions.Partitions;
-import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.internal.LettuceLists;
 
-public class ClusterPartitionParserTest {
+class ClusterPartitionParserUnitTests {
 
     private static String nodes = "c37ab8396be428403d4e55c0d317348be27ed973 127.0.0.1:7381 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n"
             + "3d005a179da7d8dc1adae6409d47b39c369e992b 127.0.0.1:7380 master - 0 1401258245007 2 disconnected 8000-11999 [8000->-4213a8dabb94f92eb6a860f4d0729e6a25d43e0c] [5461-<-c37ab8396be428403d4e55c0d317348be27ed973]\n"
@@ -49,7 +46,7 @@ public class ClusterPartitionParserTest {
             + "5f4a2236d00008fba7ac0dd24b95762b446767bd 127.0.0.1:7382@17382 slave 3d005a179da7d8dc1adae6409d47b39c369e992b 0 1454482721690 2 connected";
 
     @Test
-    public void shouldParseNodesCorrectly() throws Exception {
+    void shouldParseNodesCorrectly() {
 
         Partitions result = ClusterPartitionParser.parse(nodes);
 
@@ -81,7 +78,7 @@ public void shouldParseNodesCorrectly() throws Exception {
     }
 
     @Test
-    public void shouldParseNodesWithBusPort() throws Exception {
+    void shouldParseNodesWithBusPort() {
 
         Partitions result = ClusterPartitionParser.parse(nodesWithBusPort);
 
@@ -95,7 +92,7 @@ public void shouldParseNodesWithBusPort() throws Exception {
     }
 
     @Test
-    public void shouldParseNodesIPv6Address() throws Exception {
+    void shouldParseNodesIPv6Address() {
 
         Partitions result = ClusterPartitionParser.parse(nodesWithIPv6Addresses);
 
@@ -113,7 +110,7 @@ public void shouldParseNodesIPv6Address() throws Exception {
     }
 
     @Test
-    public void getNodeByHashShouldReturnCorrectNode() throws Exception {
+    void getNodeByHashShouldReturnCorrectNode() {
 
         Partitions partitions = ClusterPartitionParser.parse(nodes);
         assertThat(partitions.getPartitionBySlot(7000).getNodeId()).isEqualTo("c37ab8396be428403d4e55c0d317348be27ed973");
@@ -121,7 +118,7 @@ public void getNodeByHashShouldReturnCorrectNode() throws Exception {
     }
 
     @Test
-    public void testModel() throws Exception {
+    void testModel() {
         RedisClusterNode node = mockRedisClusterNode();
 
         assertThat(node.toString()).contains(RedisClusterNode.class.getSimpleName());
@@ -129,7 +126,7 @@ public void testModel() throws Exception {
         assertThat(node.hasSlot(9)).isFalse();
     }
 
-    protected RedisClusterNode mockRedisClusterNode() {
+    RedisClusterNode mockRedisClusterNode() {
         RedisClusterNode node = new RedisClusterNode();
         node.setConfigEpoch(1);
         node.setConnected(true);
@@ -144,7 +141,7 @@ protected RedisClusterNode mockRedisClusterNode() {
     }
 
     @Test
-    public void createNode() throws Exception {
+    void createNode() {
         RedisClusterNode original = mockRedisClusterNode();
         RedisClusterNode created = RedisClusterNode.of(original.getNodeId());
 
diff --git a/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java b/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsUnitTests.java
similarity index 89%
rename from src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java
rename to src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsUnitTests.java
index af07a6b42a..6346b45aed 100644
--- a/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsUnitTests.java
@@ -21,14 +21,14 @@
 import java.util.HashSet;
 import java.util.Iterator;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisURI;
 
 /**
  * @author Mark Paluch
  */
-public class PartitionsTest {
+class PartitionsUnitTests {
 
     private RedisClusterNode node1 = new RedisClusterNode(RedisURI.create("localhost", 6379), "a", true, "", 0, 0, 0,
             Arrays.asList(1, 2, 3), new HashSet<>());
@@ -36,7 +36,7 @@ public class PartitionsTest {
             Arrays.asList(4, 5, 6), new HashSet<>());
 
     @Test
-    public void contains() {
+    void contains() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -46,7 +46,7 @@ public void contains() {
     }
 
     @Test
-    public void containsUsesReadView() {
+    void containsUsesReadView() {
 
         Partitions partitions = new Partitions();
         partitions.getPartitions().add(node1);
@@ -57,7 +57,7 @@ public void containsUsesReadView() {
     }
 
     @Test
-    public void containsAll() {
+    void containsAll() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -67,7 +67,7 @@ public void containsAll() {
     }
 
     @Test
-    public void containsAllUsesReadView() {
+    void containsAllUsesReadView() {
 
         Partitions partitions = new Partitions();
         partitions.getPartitions().add(node1);
@@ -78,7 +78,7 @@ public void containsAllUsesReadView() {
     }
 
     @Test
-    public void add() {
+    void add() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -89,7 +89,7 @@ public void add() {
     }
 
     @Test
-    public void addPartitionClearsCache() {
+    void addPartitionClearsCache() {
 
         Partitions partitions = new Partitions();
         partitions.addPartition(node1);
@@ -98,7 +98,7 @@ public void addPartitionClearsCache() {
     }
 
     @Test
-    public void addAll() {
+    void addAll() {
 
         Partitions partitions = new Partitions();
         partitions.addAll(Arrays.asList(node1, node2));
@@ -108,7 +108,7 @@ public void addAll() {
     }
 
     @Test
-    public void getPartitionBySlot() {
+    void getPartitionBySlot() {
 
         Partitions partitions = new Partitions();
 
@@ -119,7 +119,7 @@ public void getPartitionBySlot() {
     }
 
     @Test
-    public void getPartitionByAlias() {
+    void getPartitionByAlias() {
 
         Partitions partitions = new Partitions();
         node1.addAlias(RedisURI.create("foobar", 1234));
@@ -131,7 +131,7 @@ public void getPartitionByAlias() {
     }
 
     @Test
-    public void remove() {
+    void remove() {
 
         Partitions partitions = new Partitions();
         partitions.addAll(Arrays.asList(node1, node2));
@@ -142,7 +142,7 @@ public void remove() {
     }
 
     @Test
-    public void removeAll() {
+    void removeAll() {
 
         Partitions partitions = new Partitions();
         partitions.addAll(Arrays.asList(node1, node2));
@@ -153,7 +153,7 @@ public void removeAll() {
     }
 
     @Test
-    public void clear() {
+    void clear() {
 
         Partitions partitions = new Partitions();
         partitions.addAll(Arrays.asList(node1, node2));
@@ -164,7 +164,7 @@ public void clear() {
     }
 
     @Test
-    public void retainAll() {
+    void retainAll() {
 
         Partitions partitions = new Partitions();
         partitions.addAll(Arrays.asList(node1, node2));
@@ -175,7 +175,7 @@ public void retainAll() {
     }
 
     @Test
-    public void toArray() {
+    void toArray() {
 
         Partitions partitions = new Partitions();
         partitions.addAll(Arrays.asList(node1, node2));
@@ -184,7 +184,7 @@ public void toArray() {
     }
 
     @Test
-    public void toArrayUsesReadView() {
+    void toArrayUsesReadView() {
 
         Partitions partitions = new Partitions();
         partitions.getPartitions().addAll(Arrays.asList(node1, node2));
@@ -195,7 +195,7 @@ public void toArrayUsesReadView() {
     }
 
     @Test
-    public void toArray2() {
+    void toArray2() {
 
         Partitions partitions = new Partitions();
         partitions.addAll(Arrays.asList(node1, node2));
@@ -204,7 +204,7 @@ public void toArray2() {
     }
 
     @Test
-    public void toArray2UsesReadView() {
+    void toArray2UsesReadView() {
 
         Partitions partitions = new Partitions();
         partitions.getPartitions().addAll(Arrays.asList(node1, node2));
@@ -217,7 +217,7 @@ public void toArray2UsesReadView() {
     }
 
     @Test
-    public void getPartitionByNodeId() {
+    void getPartitionByNodeId() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -228,7 +228,7 @@ public void getPartitionByNodeId() {
     }
 
     @Test
-    public void reload() {
+    void reload() {
 
         RedisClusterNode other = new RedisClusterNode(RedisURI.create("localhost", 6666), "c", true, "", 0, 0, 0,
                 Arrays.asList(1, 2, 3, 4, 5, 6), new HashSet<>());
@@ -243,7 +243,7 @@ public void reload() {
     }
 
     @Test
-    public void reloadEmpty() {
+    void reloadEmpty() {
 
         Partitions partitions = new Partitions();
         partitions.reload(Arrays.asList());
@@ -252,7 +252,7 @@ public void reloadEmpty() {
     }
 
     @Test
-    public void isEmpty() {
+    void isEmpty() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -261,7 +261,7 @@ public void isEmpty() {
     }
 
     @Test
-    public void size() {
+    void size() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -270,7 +270,7 @@ public void size() {
     }
 
     @Test
-    public void sizeUsesReadView() {
+    void sizeUsesReadView() {
 
         Partitions partitions = new Partitions();
         partitions.getPartitions().add(node1);
@@ -283,7 +283,7 @@ public void sizeUsesReadView() {
     }
 
     @Test
-    public void getPartition() {
+    void getPartition() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -292,7 +292,7 @@ public void getPartition() {
     }
 
     @Test
-    public void iterator() {
+    void iterator() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -301,7 +301,7 @@ public void iterator() {
     }
 
     @Test
-    public void iteratorUsesReadView() {
+    void iteratorUsesReadView() {
 
         Partitions partitions = new Partitions();
         partitions.getPartitions().add(node1);
@@ -313,7 +313,7 @@ public void iteratorUsesReadView() {
     }
 
     @Test
-    public void iteratorIsSafeDuringUpdate() {
+    void iteratorIsSafeDuringUpdate() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
@@ -337,7 +337,7 @@ public void iteratorIsSafeDuringUpdate() {
     }
 
     @Test
-    public void testToString() {
+    void testToString() {
 
         Partitions partitions = new Partitions();
         partitions.add(node1);
diff --git a/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeUnitTests.java
similarity index 92%
rename from src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java
rename to src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeUnitTests.java
index 19f0c8bcdb..fb3d1fde9a 100644
--- a/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeTest.java
+++ b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeUnitTests.java
@@ -19,7 +19,7 @@
 
 import java.util.Arrays;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.SlotHash;
@@ -27,10 +27,10 @@
 /**
  * @author Mark Paluch
  */
-public class RedisClusterNodeTest {
+class RedisClusterNodeUnitTests {
 
     @Test
-    public void shouldCopyNode() {
+    void shouldCopyNode() {
 
         RedisClusterNode node = new RedisClusterNode();
         node.setSlots(Arrays.asList(1, 2, 3, SlotHash.SLOT_COUNT - 1));
@@ -45,7 +45,7 @@ public void shouldCopyNode() {
     }
 
     @Test
-    public void testEquality() {
+    void testEquality() {
 
         RedisClusterNode node = new RedisClusterNode();
 
@@ -57,7 +57,7 @@ public void testEquality() {
     }
 
     @Test
-    public void testToString() {
+    void testToString() {
 
         RedisClusterNode node = new RedisClusterNode();
 
diff --git a/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java
similarity index 87%
rename from src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java
rename to src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java
index cdb949ed8e..1fd127982f 100644
--- a/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserTest.java
+++ b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java
@@ -16,40 +16,41 @@
 package io.lettuce.core.cluster.models.slots;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.internal.LettuceLists;
 
 @SuppressWarnings("unchecked")
-public class ClusterSlotsParserTest {
+class ClusterSlotsParserUnitTests {
 
     @Test
-    public void testEmpty() {
+    void testEmpty() {
         List<ClusterSlotRange> result = ClusterSlotsParser.parse(new ArrayList<>());
         assertThat(result).isNotNull().isEmpty();
     }
 
     @Test
-    public void testOneString() {
+    void testOneString() {
         List<ClusterSlotRange> result = ClusterSlotsParser.parse(LettuceLists.newList(""));
         assertThat(result).isNotNull().isEmpty();
     }
 
     @Test
-    public void testOneStringInList() {
+    void testOneStringInList() {
         List<?> list = Arrays.asList(LettuceLists.newList("0"));
         List<ClusterSlotRange> result = ClusterSlotsParser.parse(list);
         assertThat(result).isNotNull().isEmpty();
     }
 
     @Test
-    public void testParse() {
+    void testParse() {
         List<?> list = Arrays.asList(LettuceLists.newList("0", "1", LettuceLists.newList("1", "2")));
         List<ClusterSlotRange> result = ClusterSlotsParser.parse(list);
         assertThat(result).hasSize(1);
@@ -58,7 +59,7 @@ public void testParse() {
     }
 
     @Test
-    public void testParseWithSlave() {
+    void testParseWithSlave() {
         List<?> list = Arrays.asList(LettuceLists.newList("100", "200", LettuceLists.newList("1", "2", "nodeId1"),
                 LettuceLists.newList("1", 2, "nodeId2")));
         List<ClusterSlotRange> result = ClusterSlotsParser.parse(list);
@@ -85,7 +86,7 @@ public void testParseWithSlave() {
     }
 
     @Test
-    public void testSameNode() {
+    void testSameNode() {
         List<?> list = Arrays.asList(
                 LettuceLists.newList("100", "200", LettuceLists.newList("1", "2", "nodeId1"),
                         LettuceLists.newList("1", 2, "nodeId2")),
@@ -108,20 +109,21 @@ public void testSameNode() {
         assertThat(masterNode.getSlots()).hasSize(201);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testParseInvalidMaster() {
+    @Test
+    void testParseInvalidMaster() {
+
         List<?> list = Arrays.asList(LettuceLists.newList("0", "1", LettuceLists.newList("1")));
-        ClusterSlotsParser.parse(list);
+        assertThatThrownBy(() -> ClusterSlotsParser.parse(list)).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testParseInvalidMaster2() {
+    @Test
+    void testParseInvalidMaster2() {
         List<?> list = Arrays.asList(LettuceLists.newList("0", "1", ""));
-        ClusterSlotsParser.parse(list);
+        assertThatThrownBy(() -> ClusterSlotsParser.parse(list)).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void testModel() {
+    void testModel() {
 
         ClusterSlotRange range = new ClusterSlotRange();
         range.setFrom(1);
diff --git a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java b/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java
deleted file mode 100644
index 4356a1f19d..0000000000
--- a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubConnectionTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright 2016-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.cluster.pubsub;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.cluster.AbstractClusterTest;
-import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
-import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
-import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
-import io.lettuce.core.support.PubSubTestListener;
-
-/**
- * @author Mark Paluch
- */
-public class PubSubConnectionTest extends AbstractClusterTest {
-
-    private PubSubTestListener listener = new PubSubTestListener();
-
-    private StatefulRedisClusterConnection<String, String> connection;
-    private StatefulRedisClusterPubSubConnection<String, String> pubSubConnection;
-    private StatefulRedisClusterPubSubConnection<String, String> pubSubConnection2;
-
-    @Before
-    public void openPubSubConnection() {
-        connection = clusterClient.connect();
-        pubSubConnection = clusterClient.connectPubSub();
-        pubSubConnection2 = clusterClient.connectPubSub();
-
-    }
-
-    @After
-    public void closePubSubConnection() {
-        connection.close();
-        pubSubConnection.close();
-        pubSubConnection2.close();
-    }
-
-    @Test
-    public void testRegularClientPubSubChannels() {
-
-        String nodeId = pubSubConnection.sync().clusterMyId();
-        RedisClusterNode otherNode = getOtherThan(nodeId);
-        pubSubConnection.sync().subscribe(key);
-
-        List<String> channelsOnSubscribedNode = connection.getConnection(nodeId).sync().pubsubChannels();
-        assertThat(channelsOnSubscribedNode).hasSize(1);
-
-        List<String> channelsOnOtherNode = connection.getConnection(otherNode.getNodeId()).sync().pubsubChannels();
-        assertThat(channelsOnOtherNode).isEmpty();
-    }
-
-    @Test
-    public void testRegularClientPublish() throws Exception {
-
-        String nodeId = pubSubConnection.sync().clusterMyId();
-        RedisClusterNode otherNode = getOtherThan(nodeId);
-        pubSubConnection.sync().subscribe(key);
-        pubSubConnection.addListener(listener);
-
-        connection.getConnection(nodeId).sync().publish(key, value);
-        assertThat(listener.getMessages().take()).isEqualTo(value);
-
-        connection.getConnection(otherNode.getNodeId()).sync().publish(key, value);
-        assertThat(listener.getMessages().take()).isEqualTo(value);
-    }
-
-    @Test
-    public void testPubSubClientPublish() throws Exception {
-
-        String nodeId = pubSubConnection.sync().clusterMyId();
-        pubSubConnection.sync().subscribe(key);
-        pubSubConnection.addListener(listener);
-
-        assertThat(pubSubConnection2.sync().clusterMyId()).isEqualTo(nodeId);
-
-        pubSubConnection2.sync().publish(key, value);
-        assertThat(listener.getMessages().take()).isEqualTo(value);
-    }
-
-    @Test
-    public void testConnectToLeastClientsNode() {
-
-        clusterClient.reloadPartitions();
-        String nodeId = pubSubConnection.sync().clusterMyId();
-
-        StatefulRedisPubSubConnection<String, String> connectionAfterPartitionReload = clusterClient.connectPubSub();
-        String newConnectionNodeId = connectionAfterPartitionReload.sync().clusterMyId();
-        connectionAfterPartitionReload.close();
-
-        assertThat(nodeId).isNotEqualTo(newConnectionNodeId);
-    }
-
-    @Test
-    public void testRegularClientPubSubPublish() throws Exception {
-
-        String nodeId = pubSubConnection.sync().clusterMyId();
-        RedisClusterNode otherNode = getOtherThan(nodeId);
-        pubSubConnection.sync().subscribe(key);
-        pubSubConnection.addListener(listener);
-
-        List<String> channelsOnSubscribedNode = connection.getConnection(nodeId).sync().pubsubChannels();
-        assertThat(channelsOnSubscribedNode).hasSize(1);
-
-        RedisCommands<String, String> otherNodeConnection = connection.getConnection(otherNode.getNodeId()).sync();
-        otherNodeConnection.publish(key, value);
-        assertThat(listener.getChannels().take()).isEqualTo(key);
-    }
-
-    @Test
-    public void testGetConnectionAsyncByNodeId() {
-
-        RedisClusterNode partition = pubSubConnection.getPartitions().getPartition(0);
-
-        StatefulRedisPubSubConnection<String, String> node = pubSubConnection.getConnectionAsync(partition.getNodeId()).join();
-
-        assertThat(node.sync().ping()).isEqualTo("PONG");
-    }
-
-    @Test
-    public void testGetConnectionAsyncByHostAndPort() {
-
-        RedisClusterNode partition = pubSubConnection.getPartitions().getPartition(0);
-
-        RedisURI uri = partition.getUri();
-        StatefulRedisPubSubConnection<String, String> node = pubSubConnection.getConnectionAsync(uri.getHost(), uri.getPort())
-                .join();
-
-        assertThat(node.sync().ping()).isEqualTo("PONG");
-    }
-
-    private RedisClusterNode getOtherThan(String nodeId) {
-        for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
-            if (redisClusterNode.getNodeId().equals(nodeId)) {
-                continue;
-            }
-            return redisClusterNode;
-        }
-
-        throw new IllegalStateException("No other nodes than " + nodeId + " available");
-    }
-
-}
diff --git a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java b/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java
similarity index 50%
rename from src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
rename to src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java
index d6e1065049..5640f829cb 100644
--- a/src/test/java/io/lettuce/core/cluster/pubsub/PubSubClusterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,16 +17,22 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.List;
 import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.cluster.AbstractClusterTest;
+import io.lettuce.core.TestSupport;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.cluster.pubsub.api.async.NodeSelectionPubSubAsyncCommands;
 import io.lettuce.core.cluster.pubsub.api.async.PubSubAsyncNodeSelection;
@@ -36,35 +42,140 @@
 import io.lettuce.core.cluster.pubsub.api.sync.PubSubNodeSelection;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.core.support.PubSubTestListener;
+import io.lettuce.test.Futures;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class PubSubClusterTest extends AbstractClusterTest {
+@ExtendWith(LettuceExtension.class)
+class RedisClusterPubSubConnectionIntegrationTests extends TestSupport {
+
+    private final RedisClusterClient clusterClient;
 
-    private PubSubTestListener connectionListener = new PubSubTestListener();
-    private PubSubTestListener nodeListener = new PubSubTestListener();
+    private final PubSubTestListener connectionListener = new PubSubTestListener();
+    private final PubSubTestListener nodeListener = new PubSubTestListener();
 
+    private StatefulRedisClusterConnection<String, String> connection;
     private StatefulRedisClusterPubSubConnection<String, String> pubSubConnection;
-    private StatefulRedisPubSubConnection<String, String> pubSubConnection2;
+    private StatefulRedisClusterPubSubConnection<String, String> pubSubConnection2;
 
-    @Before
-    public void openPubSubConnection() {
+    @Inject
+    RedisClusterPubSubConnectionIntegrationTests(RedisClusterClient clusterClient) {
+        this.clusterClient = clusterClient;
+    }
 
+    @BeforeEach
+    void openPubSubConnection() {
+        connection = clusterClient.connect();
         pubSubConnection = clusterClient.connectPubSub();
         pubSubConnection2 = clusterClient.connectPubSub();
 
-        pubSubConnection.addListener(connectionListener);
     }
 
-    @After
-    public void closePubSubConnection() {
+    @AfterEach
+    void closePubSubConnection() {
+        connection.close();
         pubSubConnection.close();
         pubSubConnection2.close();
     }
 
     @Test
-    public void testNodeIdSubscription() throws Exception {
+    void testRegularClientPubSubChannels() {
+
+        String nodeId = pubSubConnection.sync().clusterMyId();
+        RedisClusterNode otherNode = getOtherThan(nodeId);
+        pubSubConnection.sync().subscribe(key);
+
+        List<String> channelsOnSubscribedNode = connection.getConnection(nodeId).sync().pubsubChannels();
+        assertThat(channelsOnSubscribedNode).hasSize(1);
+
+        List<String> channelsOnOtherNode = connection.getConnection(otherNode.getNodeId()).sync().pubsubChannels();
+        assertThat(channelsOnOtherNode).isEmpty();
+    }
+
+    @Test
+    void testRegularClientPublish() throws Exception {
+
+        String nodeId = pubSubConnection.sync().clusterMyId();
+        RedisClusterNode otherNode = getOtherThan(nodeId);
+        pubSubConnection.sync().subscribe(key);
+        pubSubConnection.addListener(connectionListener);
+
+        connection.getConnection(nodeId).sync().publish(key, value);
+        assertThat(connectionListener.getMessages().take()).isEqualTo(value);
+
+        connection.getConnection(otherNode.getNodeId()).sync().publish(key, value);
+        assertThat(connectionListener.getMessages().take()).isEqualTo(value);
+    }
+
+    @Test
+    void testPubSubClientPublish() throws Exception {
+
+        String nodeId = pubSubConnection.sync().clusterMyId();
+        pubSubConnection.sync().subscribe(key);
+        pubSubConnection.addListener(connectionListener);
+
+        assertThat(pubSubConnection2.sync().clusterMyId()).isEqualTo(nodeId);
+
+        pubSubConnection2.sync().publish(key, value);
+        assertThat(connectionListener.getMessages().take()).isEqualTo(value);
+    }
+
+    @Test
+    void testConnectToLeastClientsNode() {
+
+        clusterClient.reloadPartitions();
+        String nodeId = pubSubConnection.sync().clusterMyId();
+
+        StatefulRedisPubSubConnection<String, String> connectionAfterPartitionReload = clusterClient.connectPubSub();
+        String newConnectionNodeId = connectionAfterPartitionReload.sync().clusterMyId();
+        connectionAfterPartitionReload.close();
+
+        assertThat(nodeId).isNotEqualTo(newConnectionNodeId);
+    }
+
+    @Test
+    void testRegularClientPubSubPublish() throws Exception {
+
+        String nodeId = pubSubConnection.sync().clusterMyId();
+        RedisClusterNode otherNode = getOtherThan(nodeId);
+        pubSubConnection.sync().subscribe(key);
+        pubSubConnection.addListener(connectionListener);
+
+        List<String> channelsOnSubscribedNode = connection.getConnection(nodeId).sync().pubsubChannels();
+        assertThat(channelsOnSubscribedNode).hasSize(1);
+
+        RedisCommands<String, String> otherNodeConnection = connection.getConnection(otherNode.getNodeId()).sync();
+        otherNodeConnection.publish(key, value);
+        assertThat(connectionListener.getChannels().take()).isEqualTo(key);
+    }
+
+    @Test
+    void testGetConnectionAsyncByNodeId() {
+
+        RedisClusterNode partition = pubSubConnection.getPartitions().getPartition(0);
+
+        StatefulRedisPubSubConnection<String, String> node = Futures.get(pubSubConnection.getConnectionAsync(partition
+                .getNodeId()));
+
+        assertThat(node.sync().ping()).isEqualTo("PONG");
+    }
+
+    @Test
+    void testGetConnectionAsyncByHostAndPort() {
+
+        RedisClusterNode partition = pubSubConnection.getPartitions().getPartition(0);
+
+        RedisURI uri = partition.getUri();
+        StatefulRedisPubSubConnection<String, String> node = Futures.get(pubSubConnection.getConnectionAsync(uri.getHost(),
+                uri.getPort()));
+
+        assertThat(node.sync().ping()).isEqualTo("PONG");
+    }
+
+    @Test
+    void testNodeIdSubscription() throws Exception {
 
         RedisClusterNode partition = pubSubConnection.getPartitions().getPartition(0);
 
@@ -80,10 +191,11 @@ public void testNodeIdSubscription() throws Exception {
     }
 
     @Test
-    public void testNodeMessagePropagationSubscription() throws Exception {
+    void testNodeMessagePropagationSubscription() throws Exception {
 
         RedisClusterNode partition = pubSubConnection.getPartitions().getPartition(0);
         pubSubConnection.setNodeMessagePropagation(true);
+        pubSubConnection.addListener(connectionListener);
 
         StatefulRedisPubSubConnection<String, String> node = pubSubConnection.getConnection(partition.getNodeId());
         node.sync().subscribe("channel");
@@ -94,10 +206,11 @@ public void testNodeMessagePropagationSubscription() throws Exception {
     }
 
     @Test
-    public void testNodeHostAndPortMessagePropagationSubscription() throws Exception {
+    void testNodeHostAndPortMessagePropagationSubscription() throws Exception {
 
         RedisClusterNode partition = pubSubConnection.getPartitions().getPartition(0);
         pubSubConnection.setNodeMessagePropagation(true);
+        pubSubConnection.addListener(connectionListener);
 
         RedisURI uri = partition.getUri();
         StatefulRedisPubSubConnection<String, String> node = pubSubConnection.getConnection(uri.getHost(), uri.getPort());
@@ -109,14 +222,15 @@ public void testNodeHostAndPortMessagePropagationSubscription() throws Exception
     }
 
     @Test
-    public void testAsyncSubscription() throws Exception {
+    void testAsyncSubscription() throws Exception {
 
         pubSubConnection.setNodeMessagePropagation(true);
+        pubSubConnection.addListener(connectionListener);
 
         PubSubAsyncNodeSelection<String, String> masters = pubSubConnection.async().masters();
         NodeSelectionPubSubAsyncCommands<String, String> commands = masters.commands();
 
-        CompletableFuture.allOf(commands.psubscribe("chann*").futures()).get();
+        Futures.await(commands.psubscribe("chann*"));
 
         pubSubConnection2.sync().publish("channel", "message");
 
@@ -126,9 +240,10 @@ public void testAsyncSubscription() throws Exception {
     }
 
     @Test
-    public void testSyncSubscription() throws Exception {
+    void testSyncSubscription() throws Exception {
 
         pubSubConnection.setNodeMessagePropagation(true);
+        pubSubConnection.addListener(connectionListener);
 
         PubSubNodeSelection<String, String> masters = pubSubConnection.sync().masters();
         NodeSelectionPubSubCommands<String, String> commands = masters.commands();
@@ -143,9 +258,10 @@ public void testSyncSubscription() throws Exception {
     }
 
     @Test
-    public void testReactiveSubscription() throws Exception {
+    void testReactiveSubscription() throws Exception {
 
         pubSubConnection.setNodeMessagePropagation(true);
+        pubSubConnection.addListener(connectionListener);
 
         PubSubReactiveNodeSelection<String, String> masters = pubSubConnection.reactive().masters();
         NodeSelectionPubSubReactiveCommands<String, String> commands = masters.commands();
@@ -161,10 +277,11 @@ public void testReactiveSubscription() throws Exception {
     }
 
     @Test
-    public void testClusterListener() throws Exception {
+    void testClusterListener() throws Exception {
 
         BlockingQueue<RedisClusterNode> nodes = new LinkedBlockingQueue<>();
         pubSubConnection.setNodeMessagePropagation(true);
+        pubSubConnection.addListener(connectionListener);
         pubSubConnection.addListener(new RedisClusterPubSubAdapter<String, String>() {
 
             @Override
@@ -189,4 +306,15 @@ public void message(RedisClusterNode node, String pattern, String channel, Strin
         assertThat(nodes.take()).isNotNull();
         assertThat(nodes.poll()).isNull();
     }
+
+    private RedisClusterNode getOtherThan(String nodeId) {
+        for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
+            if (redisClusterNode.getNodeId().equals(nodeId)) {
+                continue;
+            }
+            return redisClusterNode;
+        }
+
+        throw new IllegalStateException("No other nodes than " + nodeId + " available");
+    }
 }
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
similarity index 90%
rename from src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
rename to src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
index 580654c022..96af83ba75 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
@@ -29,17 +29,17 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
-import io.lettuce.Futures;
 import io.lettuce.core.ConnectionFuture;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.cluster.RedisClusterClient;
@@ -51,20 +51,22 @@
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DnsResolvers;
 import io.lettuce.core.resource.SocketAddressResolver;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  * @author Christian Weitendorf
  */
 @SuppressWarnings("unchecked")
-@RunWith(MockitoJUnitRunner.class)
-public class ClusterTopologyRefreshTest {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class ClusterTopologyRefreshUnitTests {
 
-    public final static long COMMAND_TIMEOUT_NS = TimeUnit.MILLISECONDS.toNanos(10);
+    private final static long COMMAND_TIMEOUT_NS = TimeUnit.MILLISECONDS.toNanos(10);
 
-    public static final String NODE_1_VIEW = "1 127.0.0.1:7380 master,myself - 0 1401258245007 2 disconnected 8000-11999\n"
+    private static final String NODE_1_VIEW = "1 127.0.0.1:7380 master,myself - 0 1401258245007 2 disconnected 8000-11999\n"
             + "2 127.0.0.1:7381 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n";
-    public static final String NODE_2_VIEW = "1 127.0.0.1:7380 master - 0 1401258245007 2 disconnected 8000-11999\n"
+    private static final String NODE_2_VIEW = "1 127.0.0.1:7380 master - 0 1401258245007 2 disconnected 8000-11999\n"
             + "2 127.0.0.1:7381 master,myself - 111 1401258245007 222 connected 7000 12000 12002-16383\n";
 
     private ClusterTopologyRefresh sut;
@@ -93,8 +95,8 @@ public class ClusterTopologyRefreshTest {
     @Mock
     private RedisAsyncCommands<String, String> asyncCommands2;
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
 
         when(clientResources.socketAddressResolver()).thenReturn(SocketAddressResolver.create(DnsResolvers.JVM_DEFAULT));
         when(connection1.async()).thenReturn(asyncCommands1);
@@ -144,7 +146,7 @@ public void before() {
     }
 
     @Test
-    public void getNodeSpecificViewsNode1IsFasterThanNode2() throws Exception {
+    void getNodeSpecificViewsNode1IsFasterThanNode2() throws Exception {
 
         Requests requests = createClusterNodesRequests(1, NODE_1_VIEW);
         requests = createClusterNodesRequests(2, NODE_2_VIEW).mergeWith(requests);
@@ -163,7 +165,7 @@ public void getNodeSpecificViewsNode1IsFasterThanNode2() throws Exception {
     }
 
     @Test
-    public void partitionsReturnedAsReported() throws Exception {
+    void partitionsReturnedAsReported() throws Exception {
 
         System.setProperty("io.lettuce.core.topology.sort", "none");
 
@@ -191,7 +193,7 @@ public void partitionsReturnedAsReported() throws Exception {
     }
 
     @Test
-    public void getNodeSpecificViewTestingNoAddrFilter() throws Exception {
+    void getNodeSpecificViewTestingNoAddrFilter() throws Exception {
 
         String nodes1 = "n1 10.37.110.63:7000 slave n3 0 1452553664848 43 connected\n"
                 + "n2 10.37.110.68:7000 slave n6 0 1452553664346 45 connected\n"
@@ -223,7 +225,7 @@ public void getNodeSpecificViewTestingNoAddrFilter() throws Exception {
     }
 
     @Test
-    public void getNodeSpecificViewsNode2IsFasterThanNode1() throws Exception {
+    void getNodeSpecificViewsNode2IsFasterThanNode1() throws Exception {
 
         Requests clusterNodesRequests = createClusterNodesRequests(5, NODE_1_VIEW);
         clusterNodesRequests = createClusterNodesRequests(1, NODE_2_VIEW).mergeWith(clusterNodesRequests);
@@ -242,7 +244,7 @@ public void getNodeSpecificViewsNode2IsFasterThanNode1() throws Exception {
     }
 
     @Test
-    public void shouldAttemptToConnectOnlyOnce() {
+    void shouldAttemptToConnectOnlyOnce() {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380), RedisURI.create("127.0.0.1", 7381));
 
@@ -258,7 +260,7 @@ public void shouldAttemptToConnectOnlyOnce() {
     }
 
     @Test
-    public void shouldFailIfNoNodeConnects() {
+    void shouldFailIfNoNodeConnects() {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380), RedisURI.create("127.0.0.1", 7381));
 
@@ -280,7 +282,7 @@ public void shouldFailIfNoNodeConnects() {
     }
 
     @Test
-    public void shouldShouldDiscoverNodes() {
+    void shouldShouldDiscoverNodes() {
 
         List<RedisURI> seed = Collections.singletonList(RedisURI.create("127.0.0.1", 7380));
 
@@ -296,7 +298,7 @@ public void shouldShouldDiscoverNodes() {
     }
 
     @Test
-    public void shouldShouldNotDiscoverNodes() {
+    void shouldShouldNotDiscoverNodes() {
 
         List<RedisURI> seed = Collections.singletonList(RedisURI.create("127.0.0.1", 7380));
 
@@ -310,7 +312,7 @@ public void shouldShouldNotDiscoverNodes() {
     }
 
     @Test
-    public void shouldNotFailOnDuplicateSeedNodes() {
+    void shouldNotFailOnDuplicateSeedNodes() {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380), RedisURI.create("127.0.0.1", 7381),
                 RedisURI.create("127.0.0.1", 7381));
@@ -328,7 +330,7 @@ public void shouldNotFailOnDuplicateSeedNodes() {
     }
 
     @Test
-    public void shouldCloseConnections() {
+    void shouldCloseConnections() {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380), RedisURI.create("127.0.0.1", 7381));
 
@@ -344,7 +346,7 @@ public void shouldCloseConnections() {
     }
 
     @Test
-    public void undiscoveredAdditionalNodesShouldBeLastUsingClientCount() {
+    void undiscoveredAdditionalNodesShouldBeLastUsingClientCount() {
 
         List<RedisURI> seed = Collections.singletonList(RedisURI.create("127.0.0.1", 7380));
 
@@ -362,7 +364,7 @@ public void undiscoveredAdditionalNodesShouldBeLastUsingClientCount() {
     }
 
     @Test
-    public void discoveredAdditionalNodesShouldBeOrderedUsingClientCount() {
+    void discoveredAdditionalNodesShouldBeOrderedUsingClientCount() {
 
         List<RedisURI> seed = Collections.singletonList(RedisURI.create("127.0.0.1", 7380));
 
@@ -382,7 +384,7 @@ public void discoveredAdditionalNodesShouldBeOrderedUsingClientCount() {
     }
 
     @Test
-    public void undiscoveredAdditionalNodesShouldBeLastUsingLatency() {
+    void undiscoveredAdditionalNodesShouldBeLastUsingLatency() {
 
         List<RedisURI> seed = Collections.singletonList(RedisURI.create("127.0.0.1", 7380));
 
@@ -400,7 +402,7 @@ public void undiscoveredAdditionalNodesShouldBeLastUsingLatency() {
     }
 
     @Test
-    public void discoveredAdditionalNodesShouldBeOrderedUsingLatency() {
+    void discoveredAdditionalNodesShouldBeOrderedUsingLatency() {
 
         List<RedisURI> seed = Collections.singletonList(RedisURI.create("127.0.0.1", 7380));
 
@@ -419,7 +421,7 @@ public void discoveredAdditionalNodesShouldBeOrderedUsingLatency() {
                 .containsSequence(RedisURI.create("127.0.0.1", 7381), seed.get(0));
     }
 
-    protected Requests createClusterNodesRequests(int duration, String nodes) {
+    Requests createClusterNodesRequests(int duration, String nodes) {
 
         RedisURI redisURI = RedisURI.create("redis://localhost:" + duration);
         Connections connections = new Connections();
@@ -436,7 +438,7 @@ protected Requests createClusterNodesRequests(int duration, String nodes) {
         return requests;
     }
 
-    protected Requests createClientListRequests(int duration, String response) {
+    Requests createClientListRequests(int duration, String response) {
 
         RedisURI redisURI = RedisURI.create("redis://localhost:" + duration);
         Connections connections = new Connections();
@@ -452,15 +454,17 @@ protected Requests createClientListRequests(int duration, String response) {
     }
 
     private static <T> ConnectionFuture<T> completedFuture(T value) {
-        return Futures.createConnectionFuture(InetSocketAddress.createUnresolved(TestSettings.host(), TestSettings.port()),
+
+        return ConnectionFuture.from(InetSocketAddress.createUnresolved(TestSettings.host(), TestSettings.port()),
                 CompletableFuture.completedFuture(value));
     }
 
     private static <T> ConnectionFuture<T> completedWithException(Exception e) {
 
-        CompletableFuture<T> future = new CompletableFuture<T>();
+        CompletableFuture<T> future = new CompletableFuture<>();
         future.completeExceptionally(e);
-        return Futures.createConnectionFuture(InetSocketAddress.createUnresolved(TestSettings.host(), TestSettings.port()),
+
+        return ConnectionFuture.from(InetSocketAddress.createUnresolved(TestSettings.host(), TestSettings.port()),
                 future);
     }
 }
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ConnectionsTest.java b/src/test/java/io/lettuce/core/cluster/topology/ConnectionsUnitTests.java
similarity index 79%
rename from src/test/java/io/lettuce/core/cluster/topology/ConnectionsTest.java
rename to src/test/java/io/lettuce/core/cluster/topology/ConnectionsUnitTests.java
index 6be149a1f7..9c605b6ee6 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ConnectionsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ConnectionsUnitTests.java
@@ -21,11 +21,13 @@
 
 import java.util.concurrent.CompletableFuture;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -34,8 +36,9 @@
  * @author Christian Weitendorf
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class ConnectionsTest {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class ConnectionsUnitTests {
 
     @Mock
     private StatefulRedisConnection<String, String> connection1;
@@ -43,15 +46,15 @@ public class ConnectionsTest {
     @Mock
     private StatefulRedisConnection<String, String> connection2;
 
-    @Before
-    public void before() throws Exception {
+    @BeforeEach
+    void before() {
 
         when(connection1.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
         when(connection2.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
     }
 
     @Test
-    public void shouldCloseAllConnections() {
+    void shouldCloseAllConnections() {
 
         Connections sut = new Connections();
         sut.addConnection(RedisURI.create("127.0.0.1", 7380), connection1);
@@ -64,7 +67,7 @@ public void shouldCloseAllConnections() {
     }
 
     @Test
-    public void shouldCloseAllConnectionsAfterCloseSignal() {
+    void shouldCloseAllConnectionsAfterCloseSignal() {
 
         Connections sut = new Connections();
         sut.close();
diff --git a/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java b/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsUnitTests.java
similarity index 85%
rename from src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java
rename to src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsUnitTests.java
index bf7b8bcf48..244344181f 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsUnitTests.java
@@ -16,21 +16,22 @@
 package io.lettuce.core.cluster.topology;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.Arrays;
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisURI;
 
 /**
  * @author Mark Paluch
  */
-public class NodeTopologyViewsTest {
+class NodeTopologyViewsUnitTests {
 
     @Test
-    public void shouldReuseKnownUris() {
+    void shouldReuseKnownUris() {
 
         RedisURI localhost = RedisURI.create("127.0.0.1", 6479);
         RedisURI otherhost = RedisURI.create("127.0.0.2", 7000);
@@ -54,13 +55,14 @@ public void shouldReuseKnownUris() {
         assertThat(clusterNodes).contains(localhost, otherhost, host3);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void shouldFailWithoutOwnPartition() {
+    @Test
+    void shouldFailWithoutOwnPartition() {
 
         RedisURI localhost = RedisURI.create("127.0.0.1", 6479);
 
         String viewByLocalhost = "1 127.0.0.1:6479 master - 0 1401258245007 2 connected 8000-11999\n";
 
-        new NodeTopologyView(localhost, viewByLocalhost, "", 0).getOwnPartition();
+        assertThatThrownBy(() -> new NodeTopologyView(localhost, viewByLocalhost, "", 0).getOwnPartition()).isInstanceOf(
+                IllegalStateException.class);
     }
 }
diff --git a/src/test/java/io/lettuce/core/cluster/topology/RequestsTest.java b/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
similarity index 86%
rename from src/test/java/io/lettuce/core/cluster/topology/RequestsTest.java
rename to src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
index 50343e7a52..a5c7bb6111 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/RequestsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
@@ -20,7 +20,7 @@
 import java.nio.ByteBuffer;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.codec.Utf8StringCodec;
@@ -31,10 +31,10 @@
 /**
  * @author Mark Paluch
  */
-public class RequestsTest {
+class RequestsUnitTests {
 
     @Test
-    public void shouldCreateTopologyView() throws Exception {
+    void shouldCreateTopologyView() throws Exception {
 
         RedisURI redisURI = RedisURI.create("localhost", 6379);
 
@@ -56,7 +56,7 @@ public void shouldCreateTopologyView() throws Exception {
     }
 
     @Test
-    public void shouldCreateTopologyViewWithoutClientCount() throws Exception {
+    void shouldCreateTopologyViewWithoutClientCount() throws Exception {
 
         RedisURI redisURI = RedisURI.create("localhost", 6379);
 
@@ -75,11 +75,11 @@ public void shouldCreateTopologyViewWithoutClientCount() throws Exception {
     }
 
     @Test
-    public void awaitShouldReturnAwaitedTime() throws Exception {
+    void awaitShouldReturnAwaitedTime() throws Exception {
 
         RedisURI redisURI = RedisURI.create("localhost", 6379);
         Requests requests = new Requests();
-        Command<String, String, String> command = new Command<String, String, String>(CommandType.TYPE,
+        Command<String, String, String> command = new Command<>(CommandType.TYPE,
                 new StatusOutput<>(new Utf8StringCodec()));
         TimedAsyncCommand timedAsyncCommand = new TimedAsyncCommand(command);
 
@@ -89,11 +89,11 @@ public void awaitShouldReturnAwaitedTime() throws Exception {
     }
 
     @Test
-    public void awaitShouldReturnAwaitedTimeIfNegative() throws Exception {
+    void awaitShouldReturnAwaitedTimeIfNegative() throws Exception {
 
         RedisURI redisURI = RedisURI.create("localhost", 6379);
         Requests requests = new Requests();
-        Command<String, String, String> command = new Command<String, String, String>(CommandType.TYPE,
+        Command<String, String, String> command = new Command<>(CommandType.TYPE,
                 new StatusOutput<>(new Utf8StringCodec()));
         TimedAsyncCommand timedAsyncCommand = new TimedAsyncCommand(command);
 
@@ -104,7 +104,7 @@ public void awaitShouldReturnAwaitedTimeIfNegative() throws Exception {
     }
 
     private TimedAsyncCommand getCommand(String response) {
-        Command<String, String, String> command = new Command<String, String, String>(CommandType.TYPE,
+        Command<String, String, String> command = new Command<>(CommandType.TYPE,
                 new StatusOutput<>(new Utf8StringCodec()));
         TimedAsyncCommand timedAsyncCommand = new TimedAsyncCommand(command);
 
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsTest.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
similarity index 88%
rename from src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsTest.java
rename to src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
index 799c35e147..6338e986a2 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
@@ -17,6 +17,7 @@
 
 import static io.lettuce.core.cluster.topology.TopologyComparators.isChanged;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.util.Lists.newArrayList;
 
 import java.util.Collections;
@@ -24,7 +25,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.models.partitions.ClusterPartitionParser;
@@ -35,7 +36,7 @@
 /**
  * @author Mark Paluch
  */
-public class TopologyComparatorsTest {
+class TopologyComparatorsUnitTests {
 
     private RedisClusterNodeSnapshot node1 = createNode("1");
     private RedisClusterNodeSnapshot node2 = createNode("2");
@@ -49,7 +50,7 @@ private static RedisClusterNodeSnapshot createNode(String nodeId) {
     }
 
     @Test
-    public void latenciesForAllNodes() throws Exception {
+    void latenciesForAllNodes() {
 
         Map<String, Long> map = new HashMap<>();
         map.put(node1.getNodeId(), 1L);
@@ -62,7 +63,7 @@ public void latenciesForAllNodes() throws Exception {
     }
 
     @Test
-    public void latenciesForTwoNodes_N1_N2() throws Exception {
+    void latenciesForTwoNodes_N1_N2() {
 
         Map<String, Long> map = new HashMap<>();
         map.put(node1.getNodeId(), 1L);
@@ -74,7 +75,7 @@ public void latenciesForTwoNodes_N1_N2() throws Exception {
     }
 
     @Test
-    public void latenciesForTwoNodes_N2_N3() throws Exception {
+    void latenciesForTwoNodes_N2_N3() {
 
         Map<String, Long> map = new HashMap<>();
         map.put(node3.getNodeId(), 1L);
@@ -86,7 +87,7 @@ public void latenciesForTwoNodes_N2_N3() throws Exception {
     }
 
     @Test
-    public void latenciesForOneNode() throws Exception {
+    void latenciesForOneNode() {
 
         Map<String, Long> map = Collections.singletonMap(node2.getNodeId(), 2L);
 
@@ -95,16 +96,17 @@ public void latenciesForOneNode() throws Exception {
         runTest(map, newArrayList(node2, node3, node1), newArrayList(node3, node2, node1));
     }
 
-    @Test(expected = AssertionError.class)
-    public void shouldFail() throws Exception {
+    @Test
+    void shouldFail() {
 
         Map<String, Long> map = Collections.singletonMap(node2.getNodeId(), 2L);
 
-        runTest(map, newArrayList(node2, node1, node3), newArrayList(node3, node1, node2));
+        assertThatThrownBy(() -> runTest(map, newArrayList(node2, node1, node3), newArrayList(node3, node1, node2)))
+                .isInstanceOf(AssertionError.class);
     }
 
     @Test
-    public void testLatencyComparator() throws Exception {
+    void testLatencyComparator() {
 
         RedisClusterNodeSnapshot node1 = new RedisClusterNodeSnapshot();
         node1.setLatencyNs(1L);
@@ -122,7 +124,7 @@ public void testLatencyComparator() throws Exception {
     }
 
     @Test
-    public void testLatencyComparatorWithSomeNodesWithoutStats() throws Exception {
+    void testLatencyComparatorWithSomeNodesWithoutStats() {
 
         RedisClusterNodeSnapshot node1 = new RedisClusterNodeSnapshot();
         node1.setLatencyNs(1L);
@@ -140,7 +142,7 @@ public void testLatencyComparatorWithSomeNodesWithoutStats() throws Exception {
     }
 
     @Test
-    public void testClientComparator() throws Exception {
+    void testClientComparator() {
 
         RedisClusterNodeSnapshot node1 = new RedisClusterNodeSnapshot();
         node1.setConnectedClients(1);
@@ -158,7 +160,7 @@ public void testClientComparator() throws Exception {
     }
 
     @Test
-    public void testClientComparatorWithSomeNodesWithoutStats() throws Exception {
+    void testClientComparatorWithSomeNodesWithoutStats() {
 
         RedisClusterNodeSnapshot node1 = new RedisClusterNodeSnapshot();
         node1.setConnectedClients(1);
@@ -176,7 +178,7 @@ public void testClientComparatorWithSomeNodesWithoutStats() throws Exception {
     }
 
     @Test
-    public void testLatencyComparatorWithoutClients() throws Exception {
+    void testLatencyComparatorWithoutClients() {
 
         RedisClusterNodeSnapshot node1 = new RedisClusterNodeSnapshot();
         node1.setConnectedClients(1);
@@ -194,7 +196,7 @@ public void testLatencyComparatorWithoutClients() throws Exception {
     }
 
     @Test
-    public void testFixedOrdering1() throws Exception {
+    void testFixedOrdering1() {
 
         List<RedisClusterNode> list = LettuceLists.newList(node2, node3, node1);
         List<RedisURI> fixedOrder = LettuceLists.newList(node1.getUri(), node2.getUri(), node3.getUri());
@@ -203,7 +205,7 @@ public void testFixedOrdering1() throws Exception {
     }
 
     @Test
-    public void testFixedOrdering2() throws Exception {
+    void testFixedOrdering2() {
 
         List<RedisClusterNode> list = LettuceLists.newList(node2, node3, node1);
         List<RedisURI> fixedOrder = LettuceLists.newList(node3.getUri(), node2.getUri(), node1.getUri());
@@ -212,7 +214,7 @@ public void testFixedOrdering2() throws Exception {
     }
 
     @Test
-    public void testFixedOrderingNoFixedPart() throws Exception {
+    void testFixedOrderingNoFixedPart() {
 
         List<RedisClusterNode> list = LettuceLists.newList(node2, node3, node1);
         List<RedisURI> fixedOrder = LettuceLists.newList();
@@ -221,7 +223,7 @@ public void testFixedOrderingNoFixedPart() throws Exception {
     }
 
     @Test
-    public void testFixedOrderingPartiallySpecifiedOrder() throws Exception {
+    void testFixedOrderingPartiallySpecifiedOrder() {
 
         List<RedisClusterNode> list = LettuceLists.newList(node2, node3, node1);
         List<RedisURI> fixedOrder = LettuceLists.newList(node3.getUri(), node1.getUri());
@@ -230,7 +232,7 @@ public void testFixedOrderingPartiallySpecifiedOrder() throws Exception {
     }
 
     @Test
-    public void isChangedSamePartitions() throws Exception {
+    void isChangedSamePartitions() {
 
         String nodes = "c37ab8396be428403d4e55c0d317348be27ed973 127.0.0.1:7381 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n"
                 + "3d005a179da7d8dc1adae6409d47b39c369e992b 127.0.0.1:7380 master - 0 1401258245007 2 disconnected 8000-11999\n";
@@ -241,7 +243,7 @@ public void isChangedSamePartitions() throws Exception {
     }
 
     @Test
-    public void isChangedDifferentOrder() throws Exception {
+    void isChangedDifferentOrder() {
         String nodes1 = "3d005a179da7d8dc1adae6409d47b39c369e992b 127.0.0.1:7380 master,myself - 0 1401258245007 2 disconnected 8000-11999\n"
                 + "c37ab8396be428403d4e55c0d317348be27ed973 127.0.0.1:7381 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n";
 
@@ -255,7 +257,7 @@ public void isChangedDifferentOrder() throws Exception {
     }
 
     @Test
-    public void isChangedPortChanged() throws Exception {
+    void isChangedPortChanged() {
         String nodes1 = "3d005a179da7d8dc1adae6409d47b39c369e992b 127.0.0.1:7382 master - 0 1401258245007 2 disconnected 8000-11999\n"
                 + "c37ab8396be428403d4e55c0d317348be27ed973 127.0.0.1:7381 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n";
 
@@ -268,7 +270,7 @@ public void isChangedPortChanged() throws Exception {
     }
 
     @Test
-    public void isChangedSlotsChanged() throws Exception {
+    void isChangedSlotsChanged() {
         String nodes1 = "3d005a179da7d8dc1adae6409d47b39c369e992b 127.0.0.1:7380 master - 0 1401258245007 2 disconnected 8000-11999\n"
                 + "c37ab8396be428403d4e55c0d317348be27ed973 127.0.0.1:7381 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n";
 
@@ -281,7 +283,7 @@ public void isChangedSlotsChanged() throws Exception {
     }
 
     @Test
-    public void isChangedNodeIdChanged() throws Exception {
+    void isChangedNodeIdChanged() {
         String nodes1 = "3d005a179da7d8dc1adae6409d47b39c369e992b 127.0.0.1:7380 master - 0 1401258245007 2 disconnected 8000-11999\n"
                 + "c37ab8396be428403d4e55c0d317348be27ed973 127.0.0.1:7381 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n";
 
@@ -294,7 +296,7 @@ public void isChangedNodeIdChanged() throws Exception {
     }
 
     @Test
-    public void isChangedFlagsChangedSlaveToMaster() throws Exception {
+    void isChangedFlagsChangedSlaveToMaster() {
         String nodes1 = "3d005a179da7d8dc1adae6409d47b39c369e992b 127.0.0.1:7380 slave - 0 1401258245007 2 disconnected 8000-11999\n"
                 + "c37ab8396be428403d4e55c0d317348be27ed973 127.0.0.1:7381 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n";
 
@@ -307,7 +309,7 @@ public void isChangedFlagsChangedSlaveToMaster() throws Exception {
     }
 
     @Test
-    public void isChangedFlagsChangedMasterToSlave() throws Exception {
+    void isChangedFlagsChangedMasterToSlave() {
         String nodes1 = "3d005a179da7d8dc1adae6409d47b39c369e992b 127.0.0.1:7380 master - 0 1401258245007 2 disconnected 8000-11999\n"
                 + "c37ab8396be428403d4e55c0d317348be27ed973 127.0.0.1:7381 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n";
 
@@ -319,8 +321,7 @@ public void isChangedFlagsChangedMasterToSlave() throws Exception {
         assertThat(isChanged(partitions1, partitions2)).isTrue();
     }
 
-    protected void runTest(Map<String, Long> map, List<RedisClusterNodeSnapshot> expectation,
-            List<RedisClusterNodeSnapshot> nodes) {
+    void runTest(Map<String, Long> map, List<RedisClusterNodeSnapshot> expectation, List<RedisClusterNodeSnapshot> nodes) {
 
         for (RedisClusterNodeSnapshot node : nodes) {
             node.setLatencyNs(map.get(node.getNodeId()));
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
similarity index 86%
rename from src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java
rename to src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
index e26c11583a..b5debc0964 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
@@ -25,18 +25,22 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiFunction;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import io.lettuce.Wait;
 import io.lettuce.category.SlowTests;
-import io.lettuce.core.*;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.api.async.BaseRedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.cluster.AbstractClusterTest;
 import io.lettuce.core.cluster.ClusterClientOptions;
+import io.lettuce.core.cluster.ClusterTestSettings;
 import io.lettuce.core.cluster.ClusterTopologyRefreshOptions;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
@@ -45,6 +49,10 @@
 import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.Wait;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.settings.TestSettings;
 import io.netty.util.concurrent.ScheduledFuture;
 
 /**
@@ -54,32 +62,38 @@
  */
 @SuppressWarnings({ "unchecked" })
 @SlowTests
-public class TopologyRefreshTest extends AbstractTest {
+@ExtendWith(LettuceExtension.class)
+class TopologyRefreshIntegrationTests extends TestSupport {
 
-    public static final String host = TestSettings.hostAddr();
-    private static RedisClient client = DefaultRedisClient.get();
+    private static final String host = TestSettings.hostAddr();
+    private final RedisClient client;
 
     private RedisClusterClient clusterClient;
     private RedisCommands<String, String> redis1;
     private RedisCommands<String, String> redis2;
 
-    @Before
-    public void openConnection() {
+    @Inject
+    TopologyRefreshIntegrationTests(RedisClient client) {
+        this.client = client;
+    }
+
+    @BeforeEach
+    void openConnection() {
         clusterClient = RedisClusterClient.create(client.getResources(), RedisURI.Builder
-                .redis(host, AbstractClusterTest.port1).build());
-        redis1 = client.connect(RedisURI.Builder.redis(AbstractClusterTest.host, AbstractClusterTest.port1).build()).sync();
-        redis2 = client.connect(RedisURI.Builder.redis(AbstractClusterTest.host, AbstractClusterTest.port2).build()).sync();
+                .redis(host, ClusterTestSettings.port1).build());
+        redis1 = client.connect(RedisURI.Builder.redis(ClusterTestSettings.host, ClusterTestSettings.port1).build()).sync();
+        redis2 = client.connect(RedisURI.Builder.redis(ClusterTestSettings.host, ClusterTestSettings.port2).build()).sync();
     }
 
-    @After
-    public void closeConnection() {
+    @AfterEach
+    void closeConnection() {
         redis1.getStatefulConnection().close();
         redis2.getStatefulConnection().close();
         FastShutdown.shutdown(clusterClient);
     }
 
     @Test
-    public void shouldUnsubscribeTopologyRefresh() {
+    void shouldUnsubscribeTopologyRefresh() {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.builder()
                 .enablePeriodicRefresh(true) //
@@ -109,7 +123,7 @@ public void shouldUnsubscribeTopologyRefresh() {
     }
 
     @Test
-    public void changeTopologyWhileOperations() {
+    void changeTopologyWhileOperations() {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.builder()
                 .enablePeriodicRefresh(true)//
@@ -128,7 +142,7 @@ public void changeTopologyWhileOperations() {
     }
 
     @Test
-    public void dynamicSourcesProvidesClientCountForAllNodes() {
+    void dynamicSourcesProvidesClientCountForAllNodes() {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.create();
         clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(topologyRefreshOptions).build());
@@ -145,7 +159,7 @@ public void dynamicSourcesProvidesClientCountForAllNodes() {
     }
 
     @Test
-    public void staticSourcesProvidesClientCountForSeedNodes() {
+    void staticSourcesProvidesClientCountForSeedNodes() {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.builder()
                 .dynamicRefreshSources(false).build();
@@ -163,7 +177,7 @@ public void staticSourcesProvidesClientCountForSeedNodes() {
     }
 
     @Test
-    public void adaptiveTopologyUpdateOnDisconnectNodeIdConnection() {
+    void adaptiveTopologyUpdateOnDisconnectNodeIdConnection() {
 
         runReconnectTest((clusterConnection, node) -> {
             RedisClusterAsyncCommands<String, String> connection = clusterConnection.getConnection(node.getUri().getHost(),
@@ -174,7 +188,7 @@ public void adaptiveTopologyUpdateOnDisconnectNodeIdConnection() {
     }
 
     @Test
-    public void adaptiveTopologyUpdateOnDisconnectHostAndPortConnection() {
+    void adaptiveTopologyUpdateOnDisconnectHostAndPortConnection() {
 
         runReconnectTest((clusterConnection, node) -> {
             RedisClusterAsyncCommands<String, String> connection = clusterConnection.getConnection(node.getUri().getHost(),
@@ -185,7 +199,7 @@ public void adaptiveTopologyUpdateOnDisconnectHostAndPortConnection() {
     }
 
     @Test
-    public void adaptiveTopologyUpdateOnDisconnectDefaultConnection() {
+    void adaptiveTopologyUpdateOnDisconnectDefaultConnection() {
 
         runReconnectTest((clusterConnection, node) -> {
             return clusterConnection;
@@ -193,7 +207,7 @@ public void adaptiveTopologyUpdateOnDisconnectDefaultConnection() {
     }
 
     @Test
-    public void adaptiveTopologyUpdateIsRateLimited() throws Exception {
+    void adaptiveTopologyUpdateIsRateLimited() throws Exception {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.builder()//
                 .adaptiveRefreshTriggersTimeout(1, TimeUnit.HOURS)//
@@ -221,7 +235,7 @@ public void adaptiveTopologyUpdateIsRateLimited() throws Exception {
     }
 
     @Test
-    public void adaptiveTopologyUpdatetUsesTimeout() throws Exception {
+    void adaptiveTopologyUpdatetUsesTimeout() throws Exception {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.builder()//
                 .adaptiveRefreshTriggersTimeout(500, TimeUnit.MILLISECONDS)//
@@ -249,7 +263,7 @@ public void adaptiveTopologyUpdatetUsesTimeout() throws Exception {
     }
 
     @Test
-    public void adaptiveTriggerDoesNotFireOnSingleReconnect() throws Exception {
+    void adaptiveTriggerDoesNotFireOnSingleReconnect() throws Exception {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.builder()//
                 .enableAllAdaptiveRefreshTriggers()//
@@ -267,7 +281,7 @@ public void adaptiveTriggerDoesNotFireOnSingleReconnect() throws Exception {
     }
 
     @Test
-    public void adaptiveTriggerOnMoveRedirection() {
+    void adaptiveTriggerOnMoveRedirection() {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.builder()//
                 .enableAdaptiveRefreshTrigger(ClusterTopologyRefreshOptions.RefreshTrigger.MOVED_REDIRECT)//
diff --git a/src/test/java/io/lettuce/core/codec/CompressionCodecTest.java b/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java
similarity index 82%
rename from src/test/java/io/lettuce/core/codec/CompressionCodecTest.java
rename to src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java
index 710b8e795d..19adc9c57e 100644
--- a/src/test/java/io/lettuce/core/codec/CompressionCodecTest.java
+++ b/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java
@@ -16,16 +16,17 @@
 package io.lettuce.core.codec;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class CompressionCodecTest {
+class CompressionCodecUnitTests {
 
     private String key = "key";
     private byte[] keyGzipBytes = new byte[] { 31, -117, 8, 0, 0, 0, 0, 0, 0, 0, -53, 78, -83, 4, 0, -87, -85, -112, -118, 3, 0,
@@ -34,7 +35,7 @@ public class CompressionCodecTest {
     private String value = "value";
 
     @Test
-    public void keyPassthroughTest() throws Exception {
+    void keyPassthroughTest() throws Exception {
         RedisCodec<String, String> sut = CompressionCodec.valueCompressor(new Utf8StringCodec(),
                 CompressionCodec.CompressionType.GZIP);
         ByteBuffer byteBuffer = sut.encodeKey(value);
@@ -45,7 +46,7 @@ public void keyPassthroughTest() throws Exception {
     }
 
     @Test
-    public void gzipValueTest() throws Exception {
+    void gzipValueTest() {
         RedisCodec<String, String> sut = CompressionCodec.valueCompressor(new Utf8StringCodec(),
                 CompressionCodec.CompressionType.GZIP);
         ByteBuffer byteBuffer = sut.encodeValue(key);
@@ -56,7 +57,7 @@ public void gzipValueTest() throws Exception {
     }
 
     @Test
-    public void deflateValueTest() throws Exception {
+    void deflateValueTest() {
         RedisCodec<String, String> sut = CompressionCodec.valueCompressor(new Utf8StringCodec(),
                 CompressionCodec.CompressionType.DEFLATE);
         ByteBuffer byteBuffer = sut.encodeValue(key);
@@ -66,17 +67,18 @@ public void deflateValueTest() throws Exception {
         assertThat(s).isEqualTo(key);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void wrongCompressionTypeOnDecode() throws Exception {
+    @Test
+    void wrongCompressionTypeOnDecode() {
         RedisCodec<String, String> sut = CompressionCodec.valueCompressor(new Utf8StringCodec(),
                 CompressionCodec.CompressionType.DEFLATE);
 
-        sut.decodeValue(ByteBuffer.wrap(keyGzipBytes));
+        assertThatThrownBy(() -> sut.decodeValue(ByteBuffer.wrap(keyGzipBytes)))
+                .isInstanceOf(IllegalStateException.class);
     }
 
-    private String toString(ByteBuffer buffer) throws IOException {
+    private String toString(ByteBuffer buffer) {
         byte[] bytes = toBytes(buffer);
-        return new String(bytes, "UTF-8");
+        return new String(bytes, StandardCharsets.UTF_8);
     }
 
     private byte[] toBytes(ByteBuffer buffer) {
diff --git a/src/test/java/io/lettuce/core/codec/StringCodecTest.java b/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java
similarity index 83%
rename from src/test/java/io/lettuce/core/codec/StringCodecTest.java
rename to src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java
index d3cbd3228a..356e005a8e 100644
--- a/src/test/java/io/lettuce/core/codec/StringCodecTest.java
+++ b/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java
@@ -20,7 +20,7 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.protocol.LettuceCharsets;
 import io.netty.buffer.ByteBuf;
@@ -29,13 +29,13 @@
 /**
  * @author Mark Paluch
  */
-public class StringCodecTest {
+class StringCodecUnitTests {
 
-    String teststring = "hello üäü~∑†®†ª€∂‚¶¢ Wørld";
-    String teststringPlain = "hello uufadsfasdfadssdfadfs";
+    private String teststring = "hello üäü~∑†®†ª€∂‚¶¢ Wørld";
+    private String teststringPlain = "hello uufadsfasdfadssdfadfs";
 
     @Test
-    public void encodeUtf8Buf() throws Exception {
+    void encodeUtf8Buf() {
 
         StringCodec codec = new StringCodec(LettuceCharsets.UTF8);
 
@@ -46,7 +46,7 @@ public void encodeUtf8Buf() throws Exception {
     }
 
     @Test
-    public void encodeAsciiBuf() throws Exception {
+    void encodeAsciiBuf() {
 
         StringCodec codec = new StringCodec(LettuceCharsets.ASCII);
 
@@ -57,7 +57,7 @@ public void encodeAsciiBuf() throws Exception {
     }
 
     @Test
-    public void encodeIso88591Buf() throws Exception {
+    void encodeIso88591Buf() {
 
         StringCodec codec = new StringCodec(StandardCharsets.ISO_8859_1);
 
@@ -68,7 +68,7 @@ public void encodeIso88591Buf() throws Exception {
     }
 
     @Test
-    public void encodeAndDecodeUtf8Buf() throws Exception {
+    void encodeAndDecodeUtf8Buf() {
 
         StringCodec codec = new StringCodec(LettuceCharsets.UTF8);
 
@@ -79,7 +79,7 @@ public void encodeAndDecodeUtf8Buf() throws Exception {
     }
 
     @Test
-    public void encodeAndDecodeUtf8() throws Exception {
+    void encodeAndDecodeUtf8() {
 
         StringCodec codec = new StringCodec(LettuceCharsets.UTF8);
         ByteBuffer byteBuffer = codec.encodeKey(teststring);
@@ -88,7 +88,7 @@ public void encodeAndDecodeUtf8() throws Exception {
     }
 
     @Test
-    public void encodeAndDecodeAsciiBuf() throws Exception {
+    void encodeAndDecodeAsciiBuf() {
 
         StringCodec codec = new StringCodec(LettuceCharsets.ASCII);
 
@@ -99,7 +99,7 @@ public void encodeAndDecodeAsciiBuf() throws Exception {
     }
 
     @Test
-    public void encodeAndDecodeIso88591Buf() throws Exception {
+    void encodeAndDecodeIso88591Buf() {
 
         StringCodec codec = new StringCodec(StandardCharsets.ISO_8859_1);
 
@@ -110,7 +110,7 @@ public void encodeAndDecodeIso88591Buf() throws Exception {
     }
 
     @Test
-    public void estimateSize() throws Exception {
+    void estimateSize() {
 
         assertThat(new StringCodec(LettuceCharsets.UTF8).estimateSize(teststring)).isEqualTo((int) (teststring.length() * 1.1));
         assertThat(new StringCodec(LettuceCharsets.ASCII).estimateSize(teststring)).isEqualTo(teststring.length());
diff --git a/src/test/java/io/lettuce/core/commands/BitCommandTest.java b/src/test/java/io/lettuce/core/commands/BitCommandTest.java
index d1779c95df..03583056eb 100644
--- a/src/test/java/io/lettuce/core/commands/BitCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/BitCommandTest.java
@@ -21,18 +21,16 @@
 import static io.lettuce.core.BitFieldArgs.unsigned;
 import static io.lettuce.core.BitFieldArgs.OverflowType.WRAP;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.nio.ByteBuffer;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.RedisConditions;
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.BitFieldArgs;
 import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.test.condition.EnabledOnCommand;
 
 /**
  * @author Will Glozer
@@ -43,12 +41,12 @@ public class BitCommandTest extends AbstractRedisClientTest {
     protected RedisCommands<String, String> bitstring;
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         connectBitString();
         return super.connect();
     }
 
-    protected void connectBitString() {
+    void connectBitString() {
         bitstring = client.connect(new BitStringCodec()).sync();
     }
 
@@ -59,7 +57,7 @@ public void closeConnection() throws Exception {
     }
 
     @Test
-    public void bitcount() {
+    void bitcount() {
         assertThat((long) redis.bitcount(key)).isEqualTo(0);
 
         redis.setbit(key, 0, 1);
@@ -71,30 +69,30 @@ public void bitcount() {
     }
 
     @Test
-    public void bitfieldType() {
+    void bitfieldType() {
         assertThat(signed(64).getBits()).isEqualTo(64);
         assertThat(signed(64).isSigned()).isTrue();
         assertThat(unsigned(63).getBits()).isEqualTo(63);
         assertThat(unsigned(63).isSigned()).isFalse();
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void bitfieldTypeSigned65() {
-        signed(65);
+    @Test
+    void bitfieldTypeSigned65() {
+        assertThatThrownBy(() -> signed(65)).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void bitfieldTypeUnsigned64() {
-        unsigned(64);
+    @Test
+    void bitfieldTypeUnsigned64() {
+        assertThatThrownBy(() -> unsigned(64)).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void bitfieldBuilderEmptyPreviousType() {
-        new BitFieldArgs().overflow(WRAP).get();
+    @Test
+    void bitfieldBuilderEmptyPreviousType() {
+        assertThatThrownBy(() -> new BitFieldArgs().overflow(WRAP).get()).isInstanceOf(IllegalStateException.class);
     }
 
     @Test
-    public void bitfieldArgsTest() {
+    void bitfieldArgsTest() {
 
         assertThat(signed(5).toString()).isEqualTo("i5");
         assertThat(unsigned(5).toString()).isEqualTo("u5");
@@ -104,9 +102,8 @@ public void bitfieldArgsTest() {
     }
 
     @Test
-    public void bitfield() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
+    @EnabledOnCommand("BITFIELD")
+    void bitfield() {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 1).set(5, 1).incrBy(2, 3).get().get(2);
 
@@ -117,9 +114,8 @@ public void bitfield() {
     }
 
     @Test
-    public void bitfieldGetWithOffset() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
+    @EnabledOnCommand("BITFIELD")
+    void bitfieldGetWithOffset() {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 1).get(signed(2), typeWidthBasedOffset(1));
 
@@ -130,9 +126,8 @@ public void bitfieldGetWithOffset() {
     }
 
     @Test
-    public void bitfieldSet() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
+    @EnabledOnCommand("BITFIELD")
+    void bitfieldSet() {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 5).set(5);
 
@@ -143,9 +138,8 @@ public void bitfieldSet() {
     }
 
     @Test
-    public void bitfieldWithOffsetSet() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
+    @EnabledOnCommand("BITFIELD")
+    void bitfieldWithOffsetSet() {
 
         redis.bitfield(key, BitFieldArgs.Builder.set(signed(8), typeWidthBasedOffset(2), 5));
         assertThat(bitstring.get(key)).isEqualTo("000000000000000010100000");
@@ -156,9 +150,8 @@ public void bitfieldWithOffsetSet() {
     }
 
     @Test
-    public void bitfieldIncrBy() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
+    @EnabledOnCommand("BITFIELD")
+    void bitfieldIncrBy() {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 5).incrBy(1);
 
@@ -169,9 +162,8 @@ public void bitfieldIncrBy() {
     }
 
     @Test
-    public void bitfieldWithOffsetIncrBy() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
+    @EnabledOnCommand("BITFIELD")
+    void bitfieldWithOffsetIncrBy() {
 
         redis.bitfield(key, BitFieldArgs.Builder.incrBy(signed(8), typeWidthBasedOffset(2), 1));
         assertThat(bitstring.get(key)).isEqualTo("000000000000000010000000");
@@ -182,9 +174,8 @@ public void bitfieldWithOffsetIncrBy() {
     }
 
     @Test
-    public void bitfieldOverflow() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("BITFIELD"));
+    @EnabledOnCommand("BITFIELD")
+    void bitfieldOverflow() {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.overflow(WRAP).set(signed(8), 9, Integer.MAX_VALUE).get(signed(8));
 
@@ -194,7 +185,7 @@ public void bitfieldOverflow() {
     }
 
     @Test
-    public void bitpos() {
+    void bitpos() {
         assertThat((long) redis.bitcount(key)).isEqualTo(0);
         redis.setbit(key, 0, 0);
         redis.setbit(key, 1, 1);
@@ -204,7 +195,7 @@ public void bitpos() {
     }
 
     @Test
-    public void bitposOffset() {
+    void bitposOffset() {
         assertThat((long) redis.bitcount(key)).isEqualTo(0);
         redis.setbit(key, 0, 1);
         redis.setbit(key, 1, 1);
@@ -223,7 +214,7 @@ public void bitposOffset() {
     }
 
     @Test
-    public void bitopAnd() {
+    void bitopAnd() {
         redis.setbit("foo", 0, 1);
         redis.setbit("bar", 1, 1);
         redis.setbit("baz", 2, 1);
@@ -233,7 +224,7 @@ public void bitopAnd() {
     }
 
     @Test
-    public void bitopNot() {
+    void bitopNot() {
         redis.setbit("foo", 0, 1);
         redis.setbit("foo", 2, 1);
 
@@ -243,7 +234,7 @@ public void bitopNot() {
     }
 
     @Test
-    public void bitopOr() {
+    void bitopOr() {
         redis.setbit("foo", 0, 1);
         redis.setbit("bar", 1, 1);
         redis.setbit("baz", 2, 1);
@@ -252,7 +243,7 @@ public void bitopOr() {
     }
 
     @Test
-    public void bitopXor() {
+    void bitopXor() {
         redis.setbit("foo", 0, 1);
         redis.setbit("bar", 0, 1);
         redis.setbit("baz", 2, 1);
@@ -261,30 +252,17 @@ public void bitopXor() {
     }
 
     @Test
-    public void getbit() {
+    void getbit() {
         assertThat(redis.getbit(key, 0)).isEqualTo(0);
         redis.setbit(key, 0, 1);
         assertThat(redis.getbit(key, 0)).isEqualTo(1);
     }
 
     @Test
-    public void setbit() {
+    void setbit() {
 
         assertThat(redis.setbit(key, 0, 1)).isEqualTo(0);
         assertThat(redis.setbit(key, 0, 0)).isEqualTo(1);
     }
 
-    public static class BitStringCodec extends Utf8StringCodec {
-        @Override
-        public String decodeValue(ByteBuffer bytes) {
-            StringBuilder bits = new StringBuilder(bytes.remaining() * 8);
-            while (bytes.remaining() > 0) {
-                byte b = bytes.get();
-                for (int i = 0; i < 8; i++) {
-                    bits.append(Integer.valueOf(b >>> i & 1));
-                }
-            }
-            return bits.toString();
-        }
-    }
 }
diff --git a/src/test/java/io/lettuce/core/commands/BitStringCodec.java b/src/test/java/io/lettuce/core/commands/BitStringCodec.java
new file mode 100644
index 0000000000..817d90fc4c
--- /dev/null
+++ b/src/test/java/io/lettuce/core/commands/BitStringCodec.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.commands;
+
+import java.nio.ByteBuffer;
+
+import io.lettuce.core.codec.Utf8StringCodec;
+
+/**
+ * @author Mark Paluch
+ */
+public class BitStringCodec extends Utf8StringCodec {
+
+    @Override
+    public String decodeValue(ByteBuffer bytes) {
+        StringBuilder bits = new StringBuilder(bytes.remaining() * 8);
+        while (bytes.remaining() > 0) {
+            byte b = bytes.get();
+            for (int i = 0; i < 8; i++) {
+                bits.append(Integer.valueOf(b >>> i & 1));
+            }
+        }
+        return bits.toString();
+    }
+}
diff --git a/src/test/java/io/lettuce/core/commands/CustomCommandTest.java b/src/test/java/io/lettuce/core/commands/CustomCommandTest.java
index 66abc71e51..f22fd2f7b1 100644
--- a/src/test/java/io/lettuce/core/commands/CustomCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/CustomCommandTest.java
@@ -16,57 +16,72 @@
 package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.Arrays;
 
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.TransactionResult;
 import io.lettuce.core.api.StatefulRedisConnection;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
+import io.lettuce.test.Futures;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class CustomCommandTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+public class CustomCommandTest extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
 
-    protected final Utf8StringCodec utf8StringCodec = new Utf8StringCodec();
+    @Inject
+    CustomCommandTest(StatefulRedisConnection<String, String> connection) {
+        this.redis = connection.sync();
+    }
 
     @Test
-    public void dispatchSet() {
+    void dispatchSet() {
 
-        String response = redis.dispatch(MyCommands.SET, new StatusOutput<>(utf8StringCodec),
-                new CommandArgs<>(utf8StringCodec).addKey(key).addValue(value));
+        String response = redis.dispatch(MyCommands.SET, new StatusOutput<>(StringCodec.UTF8), new CommandArgs<>(
+                StringCodec.UTF8).addKey(key).addValue(value));
 
         assertThat(response).isEqualTo("OK");
     }
 
     @Test
-    public void dispatchWithoutArgs() {
+    void dispatchWithoutArgs() {
 
-        String response = redis.dispatch(MyCommands.INFO, new StatusOutput<>(utf8StringCodec));
+        String response = redis.dispatch(MyCommands.INFO, new StatusOutput<>(StringCodec.UTF8));
 
         assertThat(response).contains("connected_clients");
     }
 
-    @Test(expected = RedisCommandExecutionException.class)
-    public void dispatchShouldFailForWrongDataType() {
+    @Test
+    void dispatchShouldFailForWrongDataType() {
 
         redis.hset(key, key, value);
-        redis.dispatch(CommandType.GET, new StatusOutput<>(utf8StringCodec), new CommandArgs<>(utf8StringCodec).addKey(key));
+        assertThatThrownBy(
+                () -> redis.dispatch(CommandType.GET, new StatusOutput<>(StringCodec.UTF8),
+                        new CommandArgs<>(StringCodec.UTF8).addKey(key))).isInstanceOf(RedisCommandExecutionException.class);
     }
 
     @Test
-    public void dispatchTransactions() {
+    void dispatchTransactions() {
 
         redis.multi();
-        String response = redis.dispatch(CommandType.SET, new StatusOutput<>(utf8StringCodec), new CommandArgs<>(
-                utf8StringCodec).addKey(key).addValue(value));
+        String response = redis.dispatch(CommandType.SET, new StatusOutput<>(StringCodec.UTF8), new CommandArgs<>(
+                StringCodec.UTF8).addKey(key).addValue(value));
 
         TransactionResult exec = redis.exec();
 
@@ -75,40 +90,41 @@ public void dispatchTransactions() {
     }
 
     @Test
-    public void standaloneAsyncPing() {
+    void standaloneAsyncPing() {
 
-        RedisCommand<String, String, String> command = new Command<>(MyCommands.PING, new StatusOutput<>(utf8StringCodec), null);
+        RedisCommand<String, String, String> command = new Command<>(MyCommands.PING, new StatusOutput<>(StringCodec.UTF8),
+                null);
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(command);
         getStandaloneConnection().dispatch(async);
 
-        assertThat(async.join()).isEqualTo("PONG");
+        assertThat(Futures.get(async.toCompletableFuture())).isEqualTo("PONG");
     }
 
     @Test
-    public void standaloneAsyncBatchPing() {
+    void standaloneAsyncBatchPing() {
 
-        RedisCommand<String, String, String> command1 = new Command<>(MyCommands.PING, new StatusOutput<>(utf8StringCodec),
+        RedisCommand<String, String, String> command1 = new Command<>(MyCommands.PING, new StatusOutput<>(StringCodec.UTF8),
                 null);
 
-        RedisCommand<String, String, String> command2 = new Command<>(MyCommands.PING, new StatusOutput<>(utf8StringCodec),
+        RedisCommand<String, String, String> command2 = new Command<>(MyCommands.PING, new StatusOutput<>(StringCodec.UTF8),
                 null);
 
         AsyncCommand<String, String, String> async1 = new AsyncCommand<>(command1);
         AsyncCommand<String, String, String> async2 = new AsyncCommand<>(command2);
         getStandaloneConnection().dispatch(Arrays.asList(async1, async2));
 
-        assertThat(async1.join()).isEqualTo("PONG");
-        assertThat(async2.join()).isEqualTo("PONG");
+        assertThat(Futures.get(async1.toCompletableFuture())).isEqualTo("PONG");
+        assertThat(Futures.get(async2.toCompletableFuture())).isEqualTo("PONG");
     }
 
     @Test
-    public void standaloneAsyncBatchTransaction() {
+    void standaloneAsyncBatchTransaction() {
 
-        RedisCommand<String, String, String> multi = new Command<>(CommandType.MULTI, new StatusOutput<>(utf8StringCodec));
+        RedisCommand<String, String, String> multi = new Command<>(CommandType.MULTI, new StatusOutput<>(StringCodec.UTF8));
 
-        RedisCommand<String, String, String> set = new Command<>(CommandType.SET, new StatusOutput<>(utf8StringCodec),
-                new CommandArgs<>(utf8StringCodec).addKey("key").add("value"));
+        RedisCommand<String, String, String> set = new Command<>(CommandType.SET, new StatusOutput<>(StringCodec.UTF8),
+                new CommandArgs<>(StringCodec.UTF8).addKey("key").add("value"));
 
         RedisCommand<String, String, TransactionResult> exec = new Command<>(CommandType.EXEC, null);
 
@@ -117,18 +133,19 @@ public void standaloneAsyncBatchTransaction() {
         AsyncCommand<String, String, TransactionResult> async3 = new AsyncCommand<>(exec);
         getStandaloneConnection().dispatch(Arrays.asList(async1, async2, async3));
 
-        assertThat(async1.join()).isEqualTo("OK");
-        assertThat(async2.join()).isEqualTo("OK");
+        assertThat(Futures.get(async1.toCompletableFuture())).isEqualTo("OK");
+        assertThat(Futures.get(async2.toCompletableFuture())).isEqualTo("OK");
 
-        TransactionResult transactionResult = async3.join();
+        TransactionResult transactionResult = Futures.get(async3.toCompletableFuture());
         assertThat(transactionResult.wasDiscarded()).isFalse();
         assertThat(transactionResult.<String> get(0)).isEqualTo("OK");
     }
 
     @Test
-    public void standaloneFireAndForget() {
+    void standaloneFireAndForget() {
 
-        RedisCommand<String, String, String> command = new Command<>(MyCommands.PING, new StatusOutput<>(utf8StringCodec), null);
+        RedisCommand<String, String, String> command = new Command<>(MyCommands.PING, new StatusOutput<>(StringCodec.UTF8),
+                null);
         getStandaloneConnection().dispatch(command);
         assertThat(command.isCancelled()).isFalse();
 
diff --git a/src/test/java/io/lettuce/core/commands/GeoCommandTest.java b/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
index 0153f0f793..68a3765317 100644
--- a/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
@@ -16,30 +16,27 @@
 package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.offset;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.List;
 import java.util.Set;
 
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.RedisConditions;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.test.condition.RedisConditions;
+import io.lettuce.test.resource.DefaultRedisClient;
 
 /**
  * @author Mark Paluch
  */
 public class GeoCommandTest extends AbstractRedisClientTest {
 
-    @Rule
-    public ExpectedException expectedException = ExpectedException.none();
-
-    @BeforeClass
+    @BeforeAll
     public static void setupClient() {
         client = DefaultRedisClient.get();
         client.setOptions(ClientOptions.create());
@@ -50,7 +47,7 @@ public static void setupClient() {
     }
 
     @Test
-    public void geoadd() {
+    void geoadd() {
 
         Long result = redis.geoadd(key, -73.9454966, 40.747533, "lic market");
         assertThat(result).isEqualTo(1);
@@ -70,7 +67,7 @@ public void geoaddInTransaction() {
     }
 
     @Test
-    public void geoaddMulti() {
+    void geoaddMulti() {
 
         Long result = redis.geoadd(key, 8.6638775, 49.5282537, "Weinheim", 8.3796281, 48.9978127, "EFS9", 8.665351, 49.553302,
                 "Bahn");
@@ -86,13 +83,13 @@ public void geoaddMultiInTransaction() {
         assertThat(redis.exec()).contains(3L);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void geoaddMultiWrongArgument() {
-        redis.geoadd(key, 49.528253);
+    @Test
+    void geoaddMultiWrongArgument() {
+        assertThatThrownBy(() -> redis.geoadd(key, 49.528253)).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void georadius() {
+    void georadius() {
 
         prepareGeo();
 
@@ -121,7 +118,7 @@ public void georadiusInTransaction() {
     }
 
     @Test
-    public void georadiusWithCoords() {
+    void georadiusWithCoords() {
 
         prepareGeo();
 
@@ -137,7 +134,7 @@ public void georadiusWithCoords() {
     }
 
     @Test
-    public void geodist() {
+    void geodist() {
 
         prepareGeo();
 
@@ -147,7 +144,7 @@ public void geodist() {
     }
 
     @Test
-    public void geodistMissingElements() {
+    void geodistMissingElements() {
 
         assumeTrue(RedisConditions.of(redis).hasVersionGreaterOrEqualsTo("3.4"));
         prepareGeo();
@@ -205,7 +202,7 @@ public void geoposInTransaction() {
     }
 
     @Test
-    public void georadiusWithArgs() {
+    void georadiusWithArgs() {
 
         prepareGeo();
 
@@ -273,7 +270,7 @@ public void georadiusWithArgsAndTransaction() {
     }
 
     @Test
-    public void geohash() {
+    void geohash() {
 
         prepareGeo();
 
@@ -283,7 +280,7 @@ public void geohash() {
     }
 
     @Test
-    public void geohashUnknownKey() {
+    void geohashUnknownKey() {
 
         assumeTrue(RedisConditions.of(redis).hasVersionGreaterOrEqualsTo("3.4"));
 
@@ -311,7 +308,7 @@ public void geohashInTransaction() {
     }
 
     @Test
-    public void georadiusStore() {
+    void georadiusStore() {
 
         prepareGeo();
 
@@ -325,7 +322,7 @@ public void georadiusStore() {
     }
 
     @Test
-    public void georadiusStoreWithCountAndSort() {
+    void georadiusStoreWithCountAndSort() {
 
         prepareGeo();
 
@@ -340,7 +337,7 @@ public void georadiusStoreWithCountAndSort() {
     }
 
     @Test
-    public void georadiusStoreDist() {
+    void georadiusStoreDist() {
 
         prepareGeo();
 
@@ -354,7 +351,7 @@ public void georadiusStoreDist() {
     }
 
     @Test
-    public void georadiusStoreDistWithCountAndSort() {
+    void georadiusStoreDistWithCountAndSort() {
 
         prepareGeo();
 
@@ -369,18 +366,21 @@ public void georadiusStoreDistWithCountAndSort() {
         assertThat(dist.get(0).getScore()).isBetween(2d, 3d);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void georadiusWithNullArgs() {
-        redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, (GeoArgs) null);
+    @Test
+    void georadiusWithNullArgs() {
+        assertThatThrownBy(() -> redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, (GeoArgs) null)).isInstanceOf(
+                IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void georadiusStoreWithNullArgs() {
-        redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, (GeoRadiusStoreArgs<String>) null);
+    @Test
+    void georadiusStoreWithNullArgs() {
+        assertThatThrownBy(
+                () -> redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, (GeoRadiusStoreArgs<String>) null))
+                .isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void georadiusbymember() {
+    void georadiusbymember() {
 
         prepareGeo();
 
@@ -392,7 +392,7 @@ public void georadiusbymember() {
     }
 
     @Test
-    public void georadiusbymemberStoreDistWithCountAndSort() {
+    void georadiusbymemberStoreDistWithCountAndSort() {
 
         prepareGeo();
 
@@ -408,7 +408,7 @@ public void georadiusbymemberStoreDistWithCountAndSort() {
     }
 
     @Test
-    public void georadiusbymemberWithArgs() {
+    void georadiusbymemberWithArgs() {
 
         prepareGeo();
 
@@ -492,14 +492,16 @@ public void georadiusbymemberWithArgsInTransaction() {
         assertThat(weinheimCoordinates.getCoordinates()).isNotNull();
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void georadiusbymemberWithNullArgs() {
-        redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km, (GeoArgs) null);
+    @Test
+    void georadiusbymemberWithNullArgs() {
+        assertThatThrownBy(() -> redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km, (GeoArgs) null)).isInstanceOf(
+                IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void georadiusStorebymemberWithNullArgs() {
-        redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km, (GeoRadiusStoreArgs<String>) null);
+    @Test
+    void georadiusStorebymemberWithNullArgs() {
+        assertThatThrownBy(() -> redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km, (GeoRadiusStoreArgs<String>) null))
+                .isInstanceOf(IllegalArgumentException.class);
     }
 
     protected void prepareGeo() {
diff --git a/src/test/java/io/lettuce/core/commands/HLLCommandTest.java b/src/test/java/io/lettuce/core/commands/HLLCommandTest.java
index 86860d7fea..1ca6da85a5 100644
--- a/src/test/java/io/lettuce/core/commands/HLLCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/HLLCommandTest.java
@@ -16,38 +16,35 @@
 package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Fail.fail;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.api.sync.RedisHLLCommands;
 
 public class HLLCommandTest extends AbstractRedisClientTest {
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
 
     private RedisHLLCommands<String, String> commands() {
         return redis;
     }
 
     @Test
-    public void pfadd() {
+    void pfadd() {
 
         assertThat(commands().pfadd(key, value, value)).isEqualTo(1);
         assertThat(commands().pfadd(key, value, value)).isEqualTo(0);
         assertThat(commands().pfadd(key, value)).isEqualTo(0);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void pfaddNoValues() {
-        commands().pfadd(key);
+    @Test
+    void pfaddNoValues() {
+        assertThatThrownBy(() -> commands().pfadd(key)).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void pfaddNullValues() {
+    void pfaddNullValues() {
         try {
             commands().pfadd(key, null);
             fail("Missing IllegalArgumentException");
@@ -61,7 +58,7 @@ public void pfaddNullValues() {
     }
 
     @Test
-    public void pfmerge() {
+    void pfmerge() {
         commands().pfadd(key, value);
         commands().pfadd("key2", "value2");
         commands().pfadd("key3", "value3");
@@ -77,26 +74,26 @@ public void pfmerge() {
         assertThat(commands().pfcount("key8885")).isEqualTo(3);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void pfmergeNoKeys() {
-        commands().pfmerge(key);
+    @Test
+    void pfmergeNoKeys() {
+        assertThatThrownBy(() -> commands().pfmerge(key)).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void pfcount() {
+    void pfcount() {
         commands().pfadd(key, value);
         commands().pfadd("key2", "value2");
         assertThat(commands().pfcount(key)).isEqualTo(1);
         assertThat(commands().pfcount(key, "key2")).isEqualTo(2);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void pfcountNoKeys() {
-        commands().pfcount();
+    @Test
+    void pfcountNoKeys() {
+        assertThatThrownBy(() -> commands().pfcount()).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void pfaddPfmergePfCount() {
+    void pfaddPfmergePfCount() {
 
         commands().pfadd("key2660", "rand", "mat");
         commands().pfadd("key7112", "mat", "perrin");
diff --git a/src/test/java/io/lettuce/core/commands/HashCommandTest.java b/src/test/java/io/lettuce/core/commands/HashCommandTest.java
index 82e9235531..b60515d241 100644
--- a/src/test/java/io/lettuce/core/commands/HashCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/HashCommandTest.java
@@ -17,17 +17,18 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.offset;
-import static org.junit.Assume.assumeTrue;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.RedisConditions;
 import io.lettuce.core.*;
+import io.lettuce.test.KeyValueStreamingAdapter;
+import io.lettuce.test.ListStreamingAdapter;
+import io.lettuce.test.condition.EnabledOnCommand;
 
 /**
  * @author Will Glozer
@@ -36,7 +37,7 @@
 public class HashCommandTest extends AbstractRedisClientTest {
 
     @Test
-    public void hdel() {
+    void hdel() {
         assertThat(redis.hdel(key, "one")).isEqualTo(0);
         redis.hset(key, "two", "2");
         assertThat(redis.hdel(key, "one")).isEqualTo(0);
@@ -47,7 +48,7 @@ public void hdel() {
     }
 
     @Test
-    public void hexists() {
+    void hexists() {
         assertThat(redis.hexists(key, "one")).isFalse();
         redis.hset(key, "two", "2");
         assertThat(redis.hexists(key, "one")).isFalse();
@@ -56,14 +57,14 @@ public void hexists() {
     }
 
     @Test
-    public void hget() {
+    void hget() {
         assertThat(redis.hget(key, "one")).isNull();
         redis.hset(key, "one", "1");
         assertThat(redis.hget(key, "one")).isEqualTo("1");
     }
 
     @Test
-    public void hgetall() {
+    void hgetall() {
         assertThat(redis.hgetall(key).isEmpty()).isTrue();
 
         redis.hset(key, "zero", "0");
@@ -77,9 +78,9 @@ public void hgetall() {
     }
 
     @Test
-    public void hgetallStreaming() {
+    void hgetallStreaming() {
 
-        KeyValueStreamingAdapter<String, String> adapter = new KeyValueStreamingAdapter<String, String>();
+        KeyValueStreamingAdapter<String, String> adapter = new KeyValueStreamingAdapter<>();
 
         assertThat(redis.hgetall(key).isEmpty()).isTrue();
         redis.hset(key, "one", "1");
@@ -93,20 +94,20 @@ public void hgetallStreaming() {
     }
 
     @Test
-    public void hincrby() {
+    void hincrby() {
         assertThat(redis.hincrby(key, "one", 1)).isEqualTo(1);
         assertThat(redis.hincrby(key, "one", -2)).isEqualTo(-1);
     }
 
     @Test
-    public void hincrbyfloat() {
+    void hincrbyfloat() {
         assertThat(redis.hincrbyfloat(key, "one", 1.0)).isEqualTo(1.0);
         assertThat(redis.hincrbyfloat(key, "one", -2.0)).isEqualTo(-1.0);
         assertThat(redis.hincrbyfloat(key, "one", 1.23)).isEqualTo(0.23, offset(0.001));
     }
 
     @Test
-    public void hkeys() {
+    void hkeys() {
         setup();
         List<String> keys = redis.hkeys(key);
         assertThat(keys).hasSize(2);
@@ -114,9 +115,9 @@ public void hkeys() {
     }
 
     @Test
-    public void hkeysStreaming() {
+    void hkeysStreaming() {
         setup();
-        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
 
         Long count = redis.hkeys(streamingAdapter, key);
         assertThat(count.longValue()).isEqualTo(2);
@@ -133,16 +134,15 @@ private void setup() {
     }
 
     @Test
-    public void hlen() {
+    void hlen() {
         assertThat((long) redis.hlen(key)).isEqualTo(0);
         redis.hset(key, "one", "1");
         assertThat((long) redis.hlen(key)).isEqualTo(1);
     }
 
     @Test
-    public void hstrlen() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("HSTRLEN"));
+    @EnabledOnCommand("HSTRLEN")
+    void hstrlen() {
 
         assertThat((long) redis.hstrlen(key, "one")).isEqualTo(0);
         redis.hset(key, "one", value);
@@ -150,7 +150,7 @@ public void hstrlen() {
     }
 
     @Test
-    public void hmget() {
+    void hmget() {
         setupHmget();
         List<KeyValue<String, String>> values = redis.hmget(key, "one", "two");
         assertThat(values).hasSize(2);
@@ -164,7 +164,7 @@ private void setupHmget() {
     }
 
     @Test
-    public void hmgetStreaming() {
+    void hmgetStreaming() {
         setupHmget();
 
         KeyValueStreamingAdapter<String, String> streamingAdapter = new KeyValueStreamingAdapter<>();
@@ -176,7 +176,7 @@ public void hmgetStreaming() {
     }
 
     @Test
-    public void hmset() {
+    void hmset() {
         Map<String, String> hash = new LinkedHashMap<>();
         hash.put("one", "1");
         hash.put("two", "2");
@@ -185,7 +185,7 @@ public void hmset() {
     }
 
     @Test
-    public void hmsetWithNulls() {
+    void hmsetWithNulls() {
         Map<String, String> hash = new LinkedHashMap<>();
         hash.put("one", null);
         assertThat(redis.hmset(key, hash)).isEqualTo("OK");
@@ -197,20 +197,20 @@ public void hmsetWithNulls() {
     }
 
     @Test
-    public void hset() {
+    void hset() {
         assertThat(redis.hset(key, "one", "1")).isTrue();
         assertThat(redis.hset(key, "one", "1")).isFalse();
     }
 
     @Test
-    public void hsetnx() {
+    void hsetnx() {
         redis.hset(key, "one", "1");
         assertThat(redis.hsetnx(key, "one", "2")).isFalse();
         assertThat(redis.hget(key, "one")).isEqualTo("1");
     }
 
     @Test
-    public void hvals() {
+    void hvals() {
         assertThat(redis.hvals(key)).isEqualTo(list());
         redis.hset(key, "one", "1");
         redis.hset(key, "two", "2");
@@ -220,12 +220,12 @@ public void hvals() {
     }
 
     @Test
-    public void hvalsStreaming() {
+    void hvalsStreaming() {
         assertThat(redis.hvals(key)).isEqualTo(list());
         redis.hset(key, "one", "1");
         redis.hset(key, "two", "2");
 
-        ListStreamingAdapter<String> channel = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> channel = new ListStreamingAdapter<>();
         Long count = redis.hvals(channel, key);
         assertThat(count.intValue()).isEqualTo(2);
         assertThat(channel.getList()).hasSize(2);
@@ -233,7 +233,7 @@ public void hvalsStreaming() {
     }
 
     @Test
-    public void hscan() {
+    void hscan() {
         redis.hset(key, key, value);
         MapScanCursor<String, String> cursor = redis.hscan(key);
 
@@ -243,7 +243,7 @@ public void hscan() {
     }
 
     @Test
-    public void hscanWithCursor() {
+    void hscanWithCursor() {
         redis.hset(key, key, value);
 
         MapScanCursor<String, String> cursor = redis.hscan(key, ScanCursor.INITIAL);
@@ -254,7 +254,7 @@ public void hscanWithCursor() {
     }
 
     @Test
-    public void hscanWithCursorAndArgs() {
+    void hscanWithCursorAndArgs() {
         redis.hset(key, key, value);
 
         MapScanCursor<String, String> cursor = redis.hscan(key, ScanCursor.INITIAL, ScanArgs.Builder.limit(2));
@@ -265,9 +265,9 @@ public void hscanWithCursorAndArgs() {
     }
 
     @Test
-    public void hscanStreaming() {
+    void hscanStreaming() {
         redis.hset(key, key, value);
-        KeyValueStreamingAdapter<String, String> adapter = new KeyValueStreamingAdapter<String, String>();
+        KeyValueStreamingAdapter<String, String> adapter = new KeyValueStreamingAdapter<>();
 
         StreamScanCursor cursor = redis.hscan(adapter, key, ScanArgs.Builder.limit(100).match("*"));
 
@@ -278,9 +278,9 @@ public void hscanStreaming() {
     }
 
     @Test
-    public void hscanStreamingWithCursor() {
+    void hscanStreamingWithCursor() {
         redis.hset(key, key, value);
-        KeyValueStreamingAdapter<String, String> adapter = new KeyValueStreamingAdapter<String, String>();
+        KeyValueStreamingAdapter<String, String> adapter = new KeyValueStreamingAdapter<>();
 
         StreamScanCursor cursor = redis.hscan(adapter, key, ScanCursor.INITIAL);
 
@@ -290,9 +290,9 @@ public void hscanStreamingWithCursor() {
     }
 
     @Test
-    public void hscanStreamingWithCursorAndArgs() {
+    void hscanStreamingWithCursorAndArgs() {
         redis.hset(key, key, value);
-        KeyValueStreamingAdapter<String, String> adapter = new KeyValueStreamingAdapter<String, String>();
+        KeyValueStreamingAdapter<String, String> adapter = new KeyValueStreamingAdapter<>();
 
         StreamScanCursor cursor3 = redis.hscan(adapter, key, ScanCursor.INITIAL, ScanArgs.Builder.limit(100).match("*"));
 
@@ -302,9 +302,9 @@ public void hscanStreamingWithCursorAndArgs() {
     }
 
     @Test
-    public void hscanStreamingWithArgs() {
+    void hscanStreamingWithArgs() {
         redis.hset(key, key, value);
-        KeyValueStreamingAdapter<String, String> adapter = new KeyValueStreamingAdapter<String, String>();
+        KeyValueStreamingAdapter<String, String> adapter = new KeyValueStreamingAdapter<>();
 
         StreamScanCursor cursor = redis.hscan(adapter, key);
 
@@ -314,7 +314,7 @@ public void hscanStreamingWithArgs() {
     }
 
     @Test
-    public void hscanMultiple() {
+    void hscanMultiple() {
 
         Map<String, String> expect = new LinkedHashMap<>();
         Map<String, String> check = new LinkedHashMap<>();
@@ -339,7 +339,7 @@ public void hscanMultiple() {
     }
 
     @Test
-    public void hscanMatch() {
+    void hscanMatch() {
 
         Map<String, String> expect = new LinkedHashMap<>();
         setup100KeyValues(expect);
@@ -352,7 +352,7 @@ public void hscanMatch() {
         assertThat(cursor.getMap()).hasSize(11);
     }
 
-    protected void setup100KeyValues(Map<String, String> expect) {
+    void setup100KeyValues(Map<String, String> expect) {
         for (int i = 0; i < 100; i++) {
             expect.put(key + i, value + 1);
         }
diff --git a/src/test/java/io/lettuce/core/commands/KeyCommandTest.java b/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
index dbbf5a83af..6e40de3375 100644
--- a/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
@@ -18,17 +18,15 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assume.assumeTrue;
 
 import java.time.Duration;
 import java.util.*;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.RedisConditions;
 import io.lettuce.core.*;
+import io.lettuce.test.ListStreamingAdapter;
+import io.lettuce.test.condition.EnabledOnCommand;
 
 /**
  * @author Will Glozer
@@ -36,11 +34,8 @@
  */
 public class KeyCommandTest extends AbstractRedisClientTest {
 
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-
     @Test
-    public void del() {
+    void del() {
         redis.set(key, value);
         assertThat((long) redis.del(key)).isEqualTo(1);
         redis.set(key + "1", value);
@@ -50,9 +45,8 @@ public void del() {
     }
 
     @Test
-    public void unlink() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("UNLINK"));
+    @EnabledOnCommand("UNLINK")
+    void unlink() {
 
         redis.set(key, value);
         assertThat((long) redis.unlink(key)).isEqualTo(1);
@@ -62,21 +56,21 @@ public void unlink() {
     }
 
     @Test
-    public void dump() {
+    void dump() {
         assertThat(redis.dump("invalid")).isNull();
         redis.set(key, value);
         assertThat(redis.dump(key).length > 0).isTrue();
     }
 
     @Test
-    public void exists() {
+    void exists() {
         assertThat(redis.exists(key)).isEqualTo(0);
         redis.set(key, value);
         assertThat(redis.exists(key)).isEqualTo(1);
     }
 
     @Test
-    public void existsVariadic() {
+    void existsVariadic() {
         assertThat(redis.exists(key, "key2", "key3")).isEqualTo(0);
         redis.set(key, value);
         redis.set("key2", value);
@@ -84,7 +78,7 @@ public void existsVariadic() {
     }
 
     @Test
-    public void expire() {
+    void expire() {
         assertThat(redis.expire(key, 10)).isFalse();
         redis.set(key, value);
         assertThat(redis.expire(key, 10)).isTrue();
@@ -92,7 +86,7 @@ public void expire() {
     }
 
     @Test
-    public void expireat() {
+    void expireat() {
         Date expiration = new Date(System.currentTimeMillis() + 10000);
         assertThat(redis.expireat(key, expiration)).isFalse();
         redis.set(key, value);
@@ -102,7 +96,7 @@ public void expireat() {
     }
 
     @Test
-    public void keys() {
+    void keys() {
         assertThat(redis.keys("*")).isEqualTo(list());
         Map<String, String> map = new LinkedHashMap<>();
         map.put("one", "1");
@@ -116,8 +110,8 @@ public void keys() {
     }
 
     @Test
-    public void keysStreaming() {
-        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
+    void keysStreaming() {
+        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
         assertThat(redis.keys("*")).isEqualTo(list());
         Map<String, String> map = new LinkedHashMap<>();
@@ -144,7 +138,7 @@ public void move() {
     }
 
     @Test
-    public void objectEncoding() {
+    void objectEncoding() {
         redis.set(key, value);
         assertThat(redis.objectEncoding(key)).isEqualTo("embstr");
         redis.set(key, String.valueOf(1));
@@ -152,19 +146,19 @@ public void objectEncoding() {
     }
 
     @Test
-    public void objectIdletime() {
+    void objectIdletime() {
         redis.set(key, value);
         assertThat((long) redis.objectIdletime(key)).isLessThan(2);
     }
 
     @Test
-    public void objectRefcount() {
+    void objectRefcount() {
         redis.set(key, value);
         assertThat(redis.objectRefcount(key)).isGreaterThan(0);
     }
 
     @Test
-    public void persist() {
+    void persist() {
         assertThat(redis.persist(key)).isFalse();
         redis.set(key, value);
         assertThat(redis.persist(key)).isFalse();
@@ -173,7 +167,7 @@ public void persist() {
     }
 
     @Test
-    public void pexpire() {
+    void pexpire() {
         assertThat(redis.pexpire(key, 5000)).isFalse();
         redis.set(key, value);
         assertThat(redis.pexpire(key, 5000)).isTrue();
@@ -181,7 +175,7 @@ public void pexpire() {
     }
 
     @Test
-    public void pexpireat() {
+    void pexpireat() {
         Date expiration = new Date(System.currentTimeMillis() + 5000);
         assertThat(redis.pexpireat(key, expiration)).isFalse();
         redis.set(key, value);
@@ -190,7 +184,7 @@ public void pexpireat() {
     }
 
     @Test
-    public void pttl() {
+    void pttl() {
         assertThat((long) redis.pttl(key)).isEqualTo(-2);
         redis.set(key, value);
         assertThat((long) redis.pttl(key)).isEqualTo(-1);
@@ -199,14 +193,14 @@ public void pttl() {
     }
 
     @Test
-    public void randomkey() {
+    void randomkey() {
         assertThat(redis.randomkey()).isNull();
         redis.set(key, value);
         assertThat(redis.randomkey()).isEqualTo(key);
     }
 
     @Test
-    public void rename() {
+    void rename() {
         redis.set(key, value);
 
         assertThat(redis.rename(key, key + "X")).isEqualTo("OK");
@@ -217,13 +211,13 @@ public void rename() {
         assertThat(redis.get(key)).isEqualTo(value);
     }
 
-    @Test(expected = RedisException.class)
-    public void renameNonexistentKey() {
-        redis.rename(key, key + "X");
+    @Test
+    void renameNonexistentKey() {
+        assertThatThrownBy(() -> redis.rename(key, key + "X")).isInstanceOf(RedisException.class);
     }
 
     @Test
-    public void renamenx() {
+    void renamenx() {
         redis.set(key, value);
         assertThat(redis.renamenx(key, key + "X")).isTrue();
         assertThat(redis.get(key + "X")).isEqualTo(value);
@@ -231,13 +225,13 @@ public void renamenx() {
         assertThat(redis.renamenx(key + "X", key)).isFalse();
     }
 
-    @Test(expected = RedisException.class)
-    public void renamenxNonexistentKey() {
-        redis.renamenx(key, key + "X");
+    @Test
+    void renamenxNonexistentKey() {
+        assertThatThrownBy(() -> redis.renamenx(key, key + "X")).isInstanceOf(RedisException.class);
     }
 
     @Test
-    public void restore() {
+    void restore() {
         redis.set(key, value);
         byte[] bytes = redis.dump(key);
         redis.del(key);
@@ -255,7 +249,7 @@ public void restore() {
     }
 
     @Test
-    public void restoreReplace() {
+    void restoreReplace() {
 
         redis.set(key, value);
         byte[] bytes = redis.dump(key);
@@ -267,9 +261,8 @@ public void restoreReplace() {
     }
 
     @Test
-    public void touch() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("TOUCH"));
+    @EnabledOnCommand("TOUCH")
+    void touch() {
 
         assertThat((long) redis.touch(key)).isEqualTo(0);
         redis.set(key, value);
@@ -277,7 +270,7 @@ public void touch() {
     }
 
     @Test
-    public void ttl() {
+    void ttl() {
         assertThat((long) redis.ttl(key)).isEqualTo(-2);
         redis.set(key, value);
         assertThat((long) redis.ttl(key)).isEqualTo(-1);
@@ -286,7 +279,7 @@ public void ttl() {
     }
 
     @Test
-    public void type() {
+    void type() {
         assertThat(redis.type(key)).isEqualTo("none");
 
         redis.set(key, value);
@@ -306,7 +299,7 @@ public void type() {
     }
 
     @Test
-    public void scan() {
+    void scan() {
         redis.set(key, value);
 
         KeyScanCursor<String> cursor = redis.scan();
@@ -316,7 +309,7 @@ public void scan() {
     }
 
     @Test
-    public void scanWithArgs() {
+    void scanWithArgs() {
         redis.set(key, value);
 
         KeyScanCursor<String> cursor = redis.scan(ScanArgs.Builder.limit(10));
@@ -326,7 +319,7 @@ public void scanWithArgs() {
     }
 
     @Test
-    public void scanInitialCursor() {
+    void scanInitialCursor() {
         redis.set(key, value);
 
         KeyScanCursor<String> cursor = redis.scan(ScanCursor.INITIAL);
@@ -335,22 +328,22 @@ public void scanInitialCursor() {
         assertThat(cursor.getKeys()).isEqualTo(list(key));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void scanFinishedCursor() {
+    @Test
+    void scanFinishedCursor() {
         redis.set(key, value);
-        redis.scan(ScanCursor.FINISHED);
+        assertThatThrownBy(() -> redis.scan(ScanCursor.FINISHED)).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void scanNullCursor() {
+    @Test
+    void scanNullCursor() {
         redis.set(key, value);
-        redis.scan((ScanCursor) null);
+        assertThatThrownBy(() -> redis.scan((ScanCursor) null)).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void scanStreaming() {
+    void scanStreaming() {
         redis.set(key, value);
-        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
         StreamScanCursor cursor = redis.scan(adapter);
 
@@ -361,9 +354,9 @@ public void scanStreaming() {
     }
 
     @Test
-    public void scanStreamingWithCursor() {
+    void scanStreamingWithCursor() {
         redis.set(key, value);
-        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
         StreamScanCursor cursor = redis.scan(adapter, ScanCursor.INITIAL);
 
@@ -373,9 +366,9 @@ public void scanStreamingWithCursor() {
     }
 
     @Test
-    public void scanStreamingWithCursorAndArgs() {
+    void scanStreamingWithCursorAndArgs() {
         redis.set(key, value);
-        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
         StreamScanCursor cursor = redis.scan(adapter, ScanCursor.INITIAL, ScanArgs.Builder.limit(5));
 
@@ -385,9 +378,9 @@ public void scanStreamingWithCursorAndArgs() {
     }
 
     @Test
-    public void scanStreamingArgs() {
+    void scanStreamingArgs() {
         redis.set(key, value);
-        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
         StreamScanCursor cursor = redis.scan(adapter, ScanArgs.Builder.limit(100).match("*"));
 
@@ -398,7 +391,7 @@ public void scanStreamingArgs() {
     }
 
     @Test
-    public void scanMultiple() {
+    void scanMultiple() {
 
         Set<String> expect = new HashSet<>();
         Set<String> check = new HashSet<>();
@@ -422,7 +415,7 @@ public void scanMultiple() {
     }
 
     @Test
-    public void scanMatch() {
+    void scanMatch() {
 
         Set<String> expect = new HashSet<>();
         setup100KeyValues(expect);
@@ -435,7 +428,7 @@ public void scanMatch() {
         assertThat(cursor.getKeys()).hasSize(11);
     }
 
-    protected void setup100KeyValues(Set<String> expect) {
+    void setup100KeyValues(Set<String> expect) {
         for (int i = 0; i < 100; i++) {
             redis.set(key + i, value + i);
             expect.add(key + i);
diff --git a/src/test/java/io/lettuce/core/commands/ListCommandTest.java b/src/test/java/io/lettuce/core/commands/ListCommandTest.java
index 7257c4a1e1..75d5eb82e2 100644
--- a/src/test/java/io/lettuce/core/commands/ListCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ListCommandTest.java
@@ -16,16 +16,16 @@
 package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.RedisConditions;
 import io.lettuce.core.AbstractRedisClientTest;
-import io.lettuce.core.ListStreamingAdapter;
+import io.lettuce.test.ListStreamingAdapter;
+import io.lettuce.test.condition.RedisConditions;
 
 /**
  * @author Will Glozer
@@ -34,25 +34,25 @@
 public class ListCommandTest extends AbstractRedisClientTest {
 
     @Test
-    public void blpop() {
+    void blpop() {
         redis.rpush("two", "2", "3");
         assertThat(redis.blpop(1, "one", "two")).isEqualTo(kv("two", "2"));
     }
 
     @Test
-    public void blpopTimeout() {
+    void blpopTimeout() {
         redis.setTimeout(10, TimeUnit.SECONDS);
         assertThat(redis.blpop(1, key)).isNull();
     }
 
     @Test
-    public void brpop() {
+    void brpop() {
         redis.rpush("two", "2", "3");
         assertThat(redis.brpop(1, "one", "two")).isEqualTo(kv("two", "3"));
     }
 
     @Test
-    public void brpoplpush() {
+    void brpoplpush() {
         redis.rpush("one", "1", "2");
         redis.rpush("two", "3", "4");
         assertThat(redis.brpoplpush(1, "one", "two")).isEqualTo("2");
@@ -61,19 +61,19 @@ public void brpoplpush() {
     }
 
     @Test
-    public void brpoplpushTimeout() {
+    void brpoplpushTimeout() {
         assertThat(redis.brpoplpush(1, "one", "two")).isNull();
     }
 
     @Test
-    public void lindex() {
+    void lindex() {
         assertThat(redis.lindex(key, 0)).isNull();
         redis.rpush(key, "one");
         assertThat(redis.lindex(key, 0)).isEqualTo("one");
     }
 
     @Test
-    public void linsert() {
+    void linsert() {
         assertThat(redis.linsert(key, false, "one", "two")).isEqualTo(0);
         redis.rpush(key, "one");
         redis.rpush(key, "three");
@@ -82,14 +82,14 @@ public void linsert() {
     }
 
     @Test
-    public void llen() {
+    void llen() {
         assertThat((long) redis.llen(key)).isEqualTo(0);
         redis.lpush(key, "one");
         assertThat((long) redis.llen(key)).isEqualTo(1);
     }
 
     @Test
-    public void lpop() {
+    void lpop() {
         assertThat(redis.lpop(key)).isNull();
         redis.rpush(key, "one", "two");
         assertThat(redis.lpop(key)).isEqualTo("one");
@@ -97,7 +97,7 @@ public void lpop() {
     }
 
     @Test
-    public void lpush() {
+    void lpush() {
         assertThat((long) redis.lpush(key, "two")).isEqualTo(1);
         assertThat((long) redis.lpush(key, "one")).isEqualTo(2);
         assertThat(redis.lrange(key, 0, -1)).isEqualTo(list("one", "two"));
@@ -106,7 +106,7 @@ public void lpush() {
     }
 
     @Test
-    public void lpushx() {
+    void lpushx() {
         assertThat((long) redis.lpushx(key, "two")).isEqualTo(0);
         redis.lpush(key, "two");
         assertThat((long) redis.lpushx(key, "one")).isEqualTo(2);
@@ -114,7 +114,7 @@ public void lpushx() {
     }
 
     @Test
-    public void lpushxVariadic() {
+    void lpushxVariadic() {
 
         assumeTrue(RedisConditions.of(redis).hasCommandArity("LPUSHX", -3));
 
@@ -125,7 +125,7 @@ public void lpushxVariadic() {
     }
 
     @Test
-    public void lrange() {
+    void lrange() {
         assertThat(redis.lrange(key, 0, 10).isEmpty()).isTrue();
         redis.rpush(key, "one", "two", "three");
         List<String> range = redis.lrange(key, 0, 1);
@@ -136,11 +136,11 @@ public void lrange() {
     }
 
     @Test
-    public void lrangeStreaming() {
+    void lrangeStreaming() {
         assertThat(redis.lrange(key, 0, 10).isEmpty()).isTrue();
         redis.rpush(key, "one", "two", "three");
 
-        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
         Long count = redis.lrange(adapter, key, 0, 1);
         assertThat(count.longValue()).isEqualTo(2);
@@ -154,7 +154,7 @@ public void lrangeStreaming() {
     }
 
     @Test
-    public void lrem() {
+    void lrem() {
         assertThat(redis.lrem(key, 0, value)).isEqualTo(0);
 
         redis.rpush(key, "1", "2", "1", "2", "1");
@@ -171,14 +171,14 @@ public void lrem() {
     }
 
     @Test
-    public void lset() {
+    void lset() {
         redis.rpush(key, "one", "two", "three");
         assertThat(redis.lset(key, 2, "san")).isEqualTo("OK");
         assertThat(redis.lrange(key, 0, -1)).isEqualTo(list("one", "two", "san"));
     }
 
     @Test
-    public void ltrim() {
+    void ltrim() {
         redis.rpush(key, "1", "2", "3", "4", "5", "6");
         assertThat(redis.ltrim(key, 0, 3)).isEqualTo("OK");
         assertThat(redis.lrange(key, 0, -1)).isEqualTo(list("1", "2", "3", "4"));
@@ -187,7 +187,7 @@ public void ltrim() {
     }
 
     @Test
-    public void rpop() {
+    void rpop() {
         assertThat(redis.rpop(key)).isNull();
         redis.rpush(key, "one", "two");
         assertThat(redis.rpop(key)).isEqualTo("two");
@@ -195,7 +195,7 @@ public void rpop() {
     }
 
     @Test
-    public void rpoplpush() {
+    void rpoplpush() {
         assertThat(redis.rpoplpush("one", "two")).isNull();
         redis.rpush("one", "1", "2");
         redis.rpush("two", "3", "4");
@@ -205,7 +205,7 @@ public void rpoplpush() {
     }
 
     @Test
-    public void rpush() {
+    void rpush() {
         assertThat((long) redis.rpush(key, "one")).isEqualTo(1);
         assertThat((long) redis.rpush(key, "two")).isEqualTo(2);
         assertThat(redis.lrange(key, 0, -1)).isEqualTo(list("one", "two"));
@@ -214,7 +214,7 @@ public void rpush() {
     }
 
     @Test
-    public void rpushx() {
+    void rpushx() {
         assertThat((long) redis.rpushx(key, "one")).isEqualTo(0);
         redis.rpush(key, "one");
         assertThat((long) redis.rpushx(key, "two")).isEqualTo(2);
@@ -222,7 +222,7 @@ public void rpushx() {
     }
 
     @Test
-    public void rpushxVariadic() {
+    void rpushxVariadic() {
 
         assumeTrue(RedisConditions.of(redis).hasCommandArity("RPUSHX", -3));
 
diff --git a/src/test/java/io/lettuce/core/commands/NumericCommandTest.java b/src/test/java/io/lettuce/core/commands/NumericCommandTest.java
index 815ebf8048..7cfbc0f038 100644
--- a/src/test/java/io/lettuce/core/commands/NumericCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/NumericCommandTest.java
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.offset;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.AbstractRedisClientTest;
 
@@ -28,31 +28,31 @@
  */
 public class NumericCommandTest extends AbstractRedisClientTest {
     @Test
-    public void decr() {
+    void decr() {
         assertThat((long) redis.decr(key)).isEqualTo(-1);
         assertThat((long) redis.decr(key)).isEqualTo(-2);
     }
 
     @Test
-    public void decrby() {
+    void decrby() {
         assertThat(redis.decrby(key, 3)).isEqualTo(-3);
         assertThat(redis.decrby(key, 3)).isEqualTo(-6);
     }
 
     @Test
-    public void incr() {
+    void incr() {
         assertThat((long) redis.incr(key)).isEqualTo(1);
         assertThat((long) redis.incr(key)).isEqualTo(2);
     }
 
     @Test
-    public void incrby() {
+    void incrby() {
         assertThat(redis.incrby(key, 3)).isEqualTo(3);
         assertThat(redis.incrby(key, 3)).isEqualTo(6);
     }
 
     @Test
-    public void incrbyfloat() {
+    void incrbyfloat() {
 
         assertThat(redis.incrbyfloat(key, 3.0)).isEqualTo(3.0, offset(0.1));
         assertThat(redis.incrbyfloat(key, 0.2)).isEqualTo(3.2, offset(0.1));
diff --git a/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java b/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandIntegrationTests.java
similarity index 72%
rename from src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java
rename to src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandIntegrationTests.java
index 086d347202..e39061c571 100644
--- a/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandIntegrationTests.java
@@ -15,38 +15,55 @@
  */
 package io.lettuce.core.commands;
 
-import static io.lettuce.core.TestSettings.host;
-import static io.lettuce.core.TestSettings.port;
+import static io.lettuce.test.settings.TestSettings.host;
+import static io.lettuce.test.settings.TestSettings.port;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.Arrays;
 
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runners.MethodSorters;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.CanConnect;
-import io.lettuce.Wait;
-import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.MigrateArgs;
+import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
+import io.lettuce.core.TestSupport;
+import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.CanConnect;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.Wait;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class RunOnlyOnceServerCommandTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+class RunOnlyOnceServerCommandIntegrationTests extends TestSupport {
+
+    private final RedisClient client;
+    private final StatefulRedisConnection<String, String> connection;
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    RunOnlyOnceServerCommandIntegrationTests(RedisClient client, StatefulRedisConnection<String, String> connection) {
+
+        this.client = client;
+        this.connection = connection;
+        this.redis = connection.sync();
+    }
 
     /**
      * Executed in order: 1 this test causes a stop of the redis. This means, you cannot repeat the test without restarting your
      * redis.
      */
     @Test
-    public void debugSegfault() {
+    void debugSegfault() {
 
         assumeTrue(CanConnect.to(host(), port(1)));
 
@@ -66,7 +83,7 @@ public void debugSegfault() {
      * Executed in order: 2
      */
     @Test
-    public void migrate() {
+    void migrate() {
 
         assumeTrue(CanConnect.to(host(), port(2)));
 
@@ -80,7 +97,7 @@ public void migrate() {
      * Executed in order: 3
      */
     @Test
-    public void migrateCopyReplace() {
+    void migrateCopyReplace() {
 
         assumeTrue(CanConnect.to(host(), port(2)));
 
@@ -101,7 +118,7 @@ public void migrateCopyReplace() {
      * redis.
      */
     @Test
-    public void shutdown() {
+    void shutdown() {
 
         assumeTrue(CanConnect.to(host(), port(2)));
 
diff --git a/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java b/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
index c1b653ed7a..f69623a97f 100644
--- a/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
@@ -17,35 +17,29 @@
 
 import static io.lettuce.core.ScriptOutputType.*;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.After;
-import org.junit.FixMethodOrder;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.Wait;
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.RedisNoScriptException;
 import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.test.Wait;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ScriptingCommandTest extends AbstractRedisClientTest {
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
 
-    @After
-    public void tearDown() {
+    @AfterEach
+    void tearDown() {
 
         Wait.untilNoException(() -> {
             try {
@@ -59,72 +53,72 @@ public void tearDown() {
     }
 
     @Test
-    public void eval() {
+    void eval() {
         assertThat((Boolean) redis.eval("return 1 + 1 == 4", BOOLEAN)).isEqualTo(false);
         assertThat((Number) redis.eval("return 1 + 1", INTEGER)).isEqualTo(2L);
         assertThat((String) redis.eval("return {ok='status'}", STATUS)).isEqualTo("status");
         assertThat((String) redis.eval("return 'one'", VALUE)).isEqualTo("one");
         assertThat((List<?>) redis.eval("return {1, 'one', {2}}", MULTI)).isEqualTo(list(1L, "one", list(2L)));
-        exception.expectMessage("Oops!");
-        redis.eval("return {err='Oops!'}", STATUS);
+
+        assertThatThrownBy(() -> redis.eval("return {err='Oops!'}", STATUS)).hasMessageContaining("Oops!");
     }
 
     @Test
-    public void evalWithSingleKey() {
+    void evalWithSingleKey() {
         assertThat((List<?>) redis.eval("return KEYS[1]", MULTI, "one")).isEqualTo(list("one"));
     }
 
     @Test
-    public void evalWithNonAsciiChar() {
+    void evalWithNonAsciiChar() {
         assertThat((Object) redis.eval("return 'füö'", VALUE, "one")).isEqualTo("füö");
     }
 
     @Test
-    public void evalReturningNullInMulti() {
+    void evalReturningNullInMulti() {
         assertThat((List<?>) redis.eval("return nil", MULTI, "one")).isEqualTo(Collections.singletonList(null));
     }
 
     @Test
-    public void evalWithKeys() {
+    void evalWithKeys() {
         assertThat((List<?>) redis.eval("return {KEYS[1], KEYS[2]}", MULTI, "one", "two")).isEqualTo(list("one", "two"));
     }
 
     @Test
-    public void evalWithArgs() {
+    void evalWithArgs() {
         String[] keys = new String[0];
         assertThat((List<?>) redis.eval("return {ARGV[1], ARGV[2]}", MULTI, keys, "a", "b")).isEqualTo(list("a", "b"));
     }
 
     @Test
-    public void evalsha() {
+    void evalsha() {
         redis.scriptFlush();
         String script = "return 1 + 1";
         String digest = redis.digest(script);
         assertThat((Number) redis.eval(script, INTEGER)).isEqualTo(2L);
         assertThat((Number) redis.evalsha(digest, INTEGER)).isEqualTo(2L);
-        exception.expect(RedisNoScriptException.class);
-        exception.expectMessage("NOSCRIPT No matching script. Please use EVAL.");
-        redis.evalsha(redis.digest("return 1 + 1 == 4"), INTEGER);
+
+        assertThatThrownBy(() -> redis.evalsha(redis.digest("return 1 + 1 == 4"), INTEGER)).isInstanceOf(
+                RedisNoScriptException.class).hasMessageContaining("NOSCRIPT No matching script. Please use EVAL.");
     }
 
     @Test
-    public void evalshaWithMulti() {
+    void evalshaWithMulti() {
         redis.scriptFlush();
         String digest = redis.digest("return {1234, 5678}");
-        exception.expect(RedisNoScriptException.class);
-        exception.expectMessage("NOSCRIPT No matching script. Please use EVAL.");
-        redis.evalsha(digest, MULTI);
+
+        assertThatThrownBy(() -> redis.evalsha(digest, MULTI)).isInstanceOf(RedisNoScriptException.class).hasMessageContaining(
+                "NOSCRIPT No matching script. Please use EVAL.");
     }
 
     @Test
-    public void evalshaWithKeys() {
+    void evalshaWithKeys() {
         redis.scriptFlush();
         String digest = redis.scriptLoad("return {KEYS[1], KEYS[2]}");
         assertThat((Object) redis.evalsha(digest, MULTI, "one", "two")).isEqualTo(list("one", "two"));
     }
 
     @Test
-    public void evalshaWithArgs() {
+    void evalshaWithArgs() {
         redis.scriptFlush();
         String digest = redis.scriptLoad("return {ARGV[1], ARGV[2]}");
         String[] keys = new String[0];
@@ -132,7 +126,7 @@ public void evalshaWithArgs() {
     }
 
     @Test
-    public void script() throws InterruptedException {
+    void script() throws InterruptedException {
         assertThat(redis.scriptFlush()).isEqualTo("OK");
 
         String script1 = "return 1 + 1";
diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
index 692431abe0..8cffc6ef99 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
@@ -16,10 +16,11 @@
 package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.Date;
 import java.util.List;
@@ -27,13 +28,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.junit.FixMethodOrder;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.RedisConditions;
-import io.lettuce.Wait;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -42,22 +39,25 @@
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RoleParser;
 import io.lettuce.core.protocol.CommandType;
+import io.lettuce.test.Wait;
+import io.lettuce.test.condition.EnabledOnCommand;
+import io.lettuce.test.condition.RedisConditions;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ServerCommandTest extends AbstractRedisClientTest {
 
     @Test
-    public void bgrewriteaof() {
+    void bgrewriteaof() {
         String msg = "Background append only file rewriting";
         assertThat(redis.bgrewriteaof(), containsString(msg));
     }
 
     @Test
-    public void bgsave() {
+    void bgsave() {
 
         Wait.untilTrue(this::noSaveInProgress).waitOrTimeout();
 
@@ -66,7 +66,7 @@ public void bgsave() {
     }
 
     @Test
-    public void clientGetSetname() {
+    void clientGetSetname() {
         assertThat(redis.clientGetname()).isNull();
         assertThat(redis.clientSetname("test")).isEqualTo("OK");
         assertThat(redis.clientGetname()).isEqualTo("test");
@@ -75,12 +75,12 @@ public void clientGetSetname() {
     }
 
     @Test
-    public void clientPause() {
+    void clientPause() {
         assertThat(redis.clientPause(10)).isEqualTo("OK");
     }
 
     @Test
-    public void clientKill() {
+    void clientKill() {
         Pattern p = Pattern.compile(".*addr=([^ ]+).*");
         String clients = redis.clientList();
         Matcher m = p.matcher(clients);
@@ -90,7 +90,7 @@ public void clientKill() {
     }
 
     @Test
-    public void clientKillExtended() {
+    void clientKillExtended() {
 
         RedisCommands<String, String> connection2 = client.connect().sync();
         connection2.clientSetname("killme");
@@ -112,17 +112,17 @@ public void clientKillExtended() {
     }
 
     @Test
-    public void clientList() {
+    void clientList() {
         assertThat(redis.clientList().contains("addr=")).isTrue();
     }
 
     @Test
-    public void clientUnblock() throws InterruptedException {
+    void clientUnblock() throws InterruptedException {
 
         try {
             redis.clientUnblock(0, UnblockType.ERROR);
         } catch (Exception e) {
-            assumeFalse(e.getMessage(), true);
+            assumeFalse(true, e.getMessage());
         }
 
         StatefulRedisConnection<String, String> connection2 = client.connect();
@@ -145,12 +145,12 @@ public void clientUnblock() throws InterruptedException {
     }
 
     @Test
-    public void commandCount() {
+    void commandCount() {
         assertThat(redis.commandCount()).isGreaterThan(100);
     }
 
     @Test
-    public void command() {
+    void command() {
 
         List<Object> result = redis.command();
 
@@ -161,7 +161,7 @@ public void command() {
     }
 
     @Test
-    public void commandInfo() {
+    void commandInfo() {
 
         List<Object> result = redis.commandInfo(CommandType.GETRANGE, CommandType.SET);
 
@@ -176,12 +176,12 @@ public void commandInfo() {
     }
 
     @Test
-    public void configGet() {
+    void configGet() {
         assertThat(redis.configGet("maxmemory")).containsEntry("maxmemory", "0");
     }
 
     @Test
-    public void configResetstat() {
+    void configResetstat() {
         redis.get(key);
         redis.get(key);
         assertThat(redis.configResetstat()).isEqualTo("OK");
@@ -189,7 +189,7 @@ public void configResetstat() {
     }
 
     @Test
-    public void configSet() {
+    void configSet() {
         String maxmemory = redis.configGet("maxmemory").get("maxmemory");
         assertThat(redis.configSet("maxmemory", "1024")).isEqualTo("OK");
         assertThat(redis.configGet("maxmemory")).containsEntry("maxmemory", "1024");
@@ -197,22 +197,22 @@ public void configSet() {
     }
 
     @Test
-    public void configRewrite() {
+    void configRewrite() {
 
         String result = redis.configRewrite();
         assertThat(result).isEqualTo("OK");
     }
 
     @Test
-    public void dbsize() {
+    void dbsize() {
         assertThat(redis.dbsize()).isEqualTo(0);
         redis.set(key, value);
         assertThat(redis.dbsize()).isEqualTo(1);
     }
 
     @Test
-    @Ignore("Causes instabilities")
-    public void debugCrashAndRecover() {
+    @Disabled("Causes instabilities")
+    void debugCrashAndRecover() {
         try {
             assertThat(redis.debugCrashAndRecover(1L)).isNotNull();
         } catch (Exception e) {
@@ -221,26 +221,26 @@ public void debugCrashAndRecover() {
     }
 
     @Test
-    public void debugHtstats() {
+    void debugHtstats() {
         redis.set(key, value);
         String result = redis.debugHtstats(0);
         assertThat(result).contains("table size");
     }
 
     @Test
-    public void debugObject() {
+    void debugObject() {
         redis.set(key, value);
         redis.debugObject(key);
     }
 
     @Test
-    public void debugReload() {
+    void debugReload() {
         assertThat(redis.debugReload()).isEqualTo("OK");
     }
 
     @Test
-    @Ignore("Causes instabilities")
-    public void debugRestart() {
+    @Disabled("Causes instabilities")
+    void debugRestart() {
         try {
             assertThat(redis.debugRestart(1L)).isNotNull();
         } catch (Exception e) {
@@ -249,7 +249,7 @@ public void debugRestart() {
     }
 
     @Test
-    public void debugSdslen() {
+    void debugSdslen() {
         redis.set(key, value);
         String result = redis.debugSdslen(key);
         assertThat(result).contains("key_sds_len");
@@ -261,14 +261,14 @@ public void debugSdslen() {
      * @
      */
     @Test
-    public void flushall() {
+    void flushall() {
         redis.set(key, value);
         assertThat(redis.flushall()).isEqualTo("OK");
         assertThat(redis.get(key)).isNull();
     }
 
     @Test
-    public void flushallAsync() {
+    void flushallAsync() {
 
         assumeTrue(RedisConditions.of(redis).hasVersionGreaterOrEqualsTo("3.4"));
 
@@ -278,7 +278,7 @@ public void flushallAsync() {
     }
 
     @Test
-    public void flushdb() {
+    void flushdb() {
         redis.set(key, value);
         redis.select(1);
         redis.set(key, value + "X");
@@ -289,7 +289,7 @@ public void flushdb() {
     }
 
     @Test
-    public void flushdbAsync() {
+    void flushdbAsync() {
 
         assumeTrue(RedisConditions.of(redis).hasVersionGreaterOrEqualsTo("3.4"));
 
@@ -303,19 +303,19 @@ public void flushdbAsync() {
     }
 
     @Test
-    public void info() {
+    void info() {
         assertThat(redis.info().contains("redis_version")).isTrue();
         assertThat(redis.info("server").contains("redis_version")).isTrue();
     }
 
     @Test
-    public void lastsave() {
+    void lastsave() {
         Date start = new Date(System.currentTimeMillis() / 1000);
         assertThat(start.compareTo(redis.lastsave()) <= 0).isTrue();
     }
 
     @Test
-    public void save() {
+    void save() {
 
         Wait.untilTrue(this::noSaveInProgress).waitOrTimeout();
 
@@ -323,19 +323,19 @@ public void save() {
     }
 
     @Test
-    public void slaveof() {
+    void slaveof() {
 
         assertThat(redis.slaveof(TestSettings.host(), 0)).isEqualTo("OK");
         redis.slaveofNoOne();
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void slaveofEmptyHost() {
-        redis.slaveof("", 0);
+    @Test
+    void slaveofEmptyHost() {
+        assertThatThrownBy(() -> redis.slaveof("", 0)).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void role() {
+    void role() {
 
         List<Object> objects = redis.role();
 
@@ -347,13 +347,13 @@ public void role() {
     }
 
     @Test
-    public void slaveofNoOne() {
+    void slaveofNoOne() {
         assertThat(redis.slaveofNoOne()).isEqualTo("OK");
     }
 
     @Test
     @SuppressWarnings("unchecked")
-    public void slowlog() {
+    void slowlog() {
 
         long start = System.currentTimeMillis() / 1000;
 
@@ -378,9 +378,8 @@ public void slowlog() {
     }
 
     @Test
-    public void swapdb() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("SWAPDB"));
+    @EnabledOnCommand("SWAPDB")
+    void swapdb() {
 
         redis.select(1);
         redis.set(key, "value1");
diff --git a/src/test/java/io/lettuce/core/commands/SetCommandTest.java b/src/test/java/io/lettuce/core/commands/SetCommandTest.java
index af671ef8ed..78d3741ba4 100644
--- a/src/test/java/io/lettuce/core/commands/SetCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SetCommandTest.java
@@ -16,17 +16,19 @@
 package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.RedisConditions;
 import io.lettuce.core.*;
+import io.lettuce.test.ListStreamingAdapter;
+import io.lettuce.test.condition.RedisConditions;
 
 /**
  * @author Will Glozer
@@ -35,7 +37,7 @@
 public class SetCommandTest extends AbstractRedisClientTest {
 
     @Test
-    public void sadd() {
+    void sadd() {
         assertThat(redis.sadd(key, "a")).isEqualTo(1L);
         assertThat(redis.sadd(key, "a")).isEqualTo(0);
         assertThat(redis.smembers(key)).isEqualTo(set("a"));
@@ -44,23 +46,23 @@ public void sadd() {
     }
 
     @Test
-    public void scard() {
+    void scard() {
         assertThat((long) redis.scard(key)).isEqualTo(0);
         redis.sadd(key, "a");
         assertThat((long) redis.scard(key)).isEqualTo(1);
     }
 
     @Test
-    public void sdiff() {
+    void sdiff() {
         setupSet();
         assertThat(redis.sdiff("key1", "key2", "key3")).isEqualTo(set("b", "d"));
     }
 
     @Test
-    public void sdiffStreaming() {
+    void sdiffStreaming() {
         setupSet();
 
-        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
 
         Long count = redis.sdiff(streamingAdapter, "key1", "key2", "key3");
         assertThat(count.intValue()).isEqualTo(2);
@@ -68,23 +70,23 @@ public void sdiffStreaming() {
     }
 
     @Test
-    public void sdiffstore() {
+    void sdiffstore() {
         setupSet();
         assertThat(redis.sdiffstore("newset", "key1", "key2", "key3")).isEqualTo(2);
         assertThat(redis.smembers("newset")).containsOnly("b", "d");
     }
 
     @Test
-    public void sinter() {
+    void sinter() {
         setupSet();
         assertThat(redis.sinter("key1", "key2", "key3")).isEqualTo(set("c"));
     }
 
     @Test
-    public void sinterStreaming() {
+    void sinterStreaming() {
         setupSet();
 
-        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
         Long count = redis.sinter(streamingAdapter, "key1", "key2", "key3");
 
         assertThat(count.intValue()).isEqualTo(1);
@@ -92,21 +94,21 @@ public void sinterStreaming() {
     }
 
     @Test
-    public void sinterstore() {
+    void sinterstore() {
         setupSet();
         assertThat(redis.sinterstore("newset", "key1", "key2", "key3")).isEqualTo(1);
         assertThat(redis.smembers("newset")).containsExactly("c");
     }
 
     @Test
-    public void sismember() {
+    void sismember() {
         assertThat(redis.sismember(key, "a")).isFalse();
         redis.sadd(key, "a");
         assertThat(redis.sismember(key, "a")).isTrue();
     }
 
     @Test
-    public void smove() {
+    void smove() {
         redis.sadd(key, "a", "b", "c");
         assertThat(redis.smove(key, "key1", "d")).isFalse();
         assertThat(redis.smove(key, "key1", "a")).isTrue();
@@ -115,22 +117,22 @@ public void smove() {
     }
 
     @Test
-    public void smembers() {
+    void smembers() {
         setupSet();
         assertThat(redis.smembers(key)).isEqualTo(set("a", "b", "c"));
     }
 
     @Test
-    public void smembersStreaming() {
+    void smembersStreaming() {
         setupSet();
-        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
         Long count = redis.smembers(streamingAdapter, key);
         assertThat(count.longValue()).isEqualTo(3);
         assertThat(streamingAdapter.getList()).containsOnly("a", "b", "c");
     }
 
     @Test
-    public void spop() {
+    void spop() {
         assertThat(redis.spop(key)).isNull();
         redis.sadd(key, "a", "b", "c");
         String rand = redis.spop(key);
@@ -139,7 +141,7 @@ public void spop() {
     }
 
     @Test
-    public void spopMultiple() {
+    void spopMultiple() {
 
         assumeTrue(RedisConditions.of(redis).hasCommandArity("SPOP", -2));
 
@@ -151,7 +153,7 @@ public void spopMultiple() {
     }
 
     @Test
-    public void srandmember() {
+    void srandmember() {
         assertThat(redis.spop(key)).isNull();
         redis.sadd(key, "a", "b", "c", "d");
         assertThat(set("a", "b", "c", "d").contains(redis.srandmember(key))).isTrue();
@@ -164,11 +166,11 @@ public void srandmember() {
     }
 
     @Test
-    public void srandmemberStreaming() {
+    void srandmemberStreaming() {
         assertThat(redis.spop(key)).isNull();
         redis.sadd(key, "a", "b", "c", "d");
 
-        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
 
         Long count = redis.srandmember(streamingAdapter, key, 2);
 
@@ -179,7 +181,7 @@ public void srandmemberStreaming() {
     }
 
     @Test
-    public void srem() {
+    void srem() {
         redis.sadd(key, "a", "b", "c");
         assertThat(redis.srem(key, "d")).isEqualTo(0);
         assertThat(redis.srem(key, "b")).isEqualTo(1);
@@ -188,49 +190,49 @@ public void srem() {
         assertThat(redis.smembers(key)).isEqualTo(set());
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void sremEmpty() {
-        redis.srem(key);
+    @Test
+    void sremEmpty() {
+        assertThatThrownBy(() -> redis.srem(key)).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void sremNulls() {
-        redis.srem(key, new String[0]);
+    @Test
+    void sremNulls() {
+        assertThatThrownBy(() -> redis.srem(key, new String[0])).isInstanceOf(IllegalArgumentException. class);
     }
 
     @Test
-    public void sunion() {
+    void sunion() {
         setupSet();
         assertThat(redis.sunion("key1", "key2", "key3")).isEqualTo(set("a", "b", "c", "d", "e"));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void sunionEmpty() {
-        redis.sunion();
+    @Test
+    void sunionEmpty() {
+        assertThatThrownBy(() -> redis.sunion()).isInstanceOf(IllegalArgumentException. class);
     }
 
     @Test
-    public void sunionStreaming() {
+    void sunionStreaming() {
         setupSet();
 
-        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
         Long count = redis.sunion(adapter, "key1", "key2", "key3");
 
         assertThat(count.longValue()).isEqualTo(5);
 
-        assertThat(new TreeSet<String>(adapter.getList())).isEqualTo(new TreeSet<String>(list("c", "a", "b", "e", "d")));
+        assertThat(new TreeSet<>(adapter.getList())).isEqualTo(new TreeSet<>(list("c", "a", "b", "e", "d")));
     }
 
     @Test
-    public void sunionstore() {
+    void sunionstore() {
         setupSet();
         assertThat(redis.sunionstore("newset", "key1", "key2", "key3")).isEqualTo(5);
         assertThat(redis.smembers("newset")).isEqualTo(set("a", "b", "c", "d", "e"));
     }
 
     @Test
-    public void sscan() {
+    void sscan() {
         redis.sadd(key, value);
         ValueScanCursor<String> cursor = redis.sscan(key);
 
@@ -240,7 +242,7 @@ public void sscan() {
     }
 
     @Test
-    public void sscanWithCursor() {
+    void sscanWithCursor() {
         redis.sadd(key, value);
         ValueScanCursor<String> cursor = redis.sscan(key, ScanCursor.INITIAL);
 
@@ -250,7 +252,7 @@ public void sscanWithCursor() {
     }
 
     @Test
-    public void sscanWithCursorAndArgs() {
+    void sscanWithCursorAndArgs() {
         redis.sadd(key, value);
 
         ValueScanCursor<String> cursor = redis.sscan(key, ScanCursor.INITIAL, ScanArgs.Builder.limit(5));
@@ -262,9 +264,9 @@ public void sscanWithCursorAndArgs() {
     }
 
     @Test
-    public void sscanStreaming() {
+    void sscanStreaming() {
         redis.sadd(key, value);
-        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
         StreamScanCursor cursor = redis.sscan(adapter, key);
 
@@ -275,9 +277,9 @@ public void sscanStreaming() {
     }
 
     @Test
-    public void sscanStreamingWithCursor() {
+    void sscanStreamingWithCursor() {
         redis.sadd(key, value);
-        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
         StreamScanCursor cursor = redis.sscan(adapter, key, ScanCursor.INITIAL);
 
@@ -287,9 +289,9 @@ public void sscanStreamingWithCursor() {
     }
 
     @Test
-    public void sscanStreamingWithCursorAndArgs() {
+    void sscanStreamingWithCursorAndArgs() {
         redis.sadd(key, value);
-        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
         StreamScanCursor cursor = redis.sscan(adapter, key, ScanCursor.INITIAL, ScanArgs.Builder.limit(5));
 
@@ -299,9 +301,9 @@ public void sscanStreamingWithCursorAndArgs() {
     }
 
     @Test
-    public void sscanStreamingArgs() {
+    void sscanStreamingArgs() {
         redis.sadd(key, value);
-        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
         StreamScanCursor cursor = redis.sscan(adapter, key, ScanArgs.Builder.limit(100).match("*"));
 
@@ -312,7 +314,7 @@ public void sscanStreamingArgs() {
     }
 
     @Test
-    public void sscanMultiple() {
+    void sscanMultiple() {
 
         Set<String> expect = new HashSet<>();
         Set<String> check = new HashSet<>();
@@ -330,11 +332,11 @@ public void sscanMultiple() {
             check.addAll(cursor.getValues());
         }
 
-        assertThat(new TreeSet<String>(check)).isEqualTo(new TreeSet<String>(expect));
+        assertThat(new TreeSet<>(check)).isEqualTo(new TreeSet<>(expect));
     }
 
     @Test
-    public void scanMatch() {
+    void scanMatch() {
 
         Set<String> expect = new HashSet<>();
         setup100KeyValues(expect);
@@ -347,7 +349,7 @@ public void scanMatch() {
         assertThat(cursor.getValues()).hasSize(11);
     }
 
-    protected void setup100KeyValues(Set<String> expect) {
+    void setup100KeyValues(Set<String> expect) {
         for (int i = 0; i < 100; i++) {
             redis.sadd(key, value + i);
             expect.add(value + i);
diff --git a/src/test/java/io/lettuce/core/commands/SortCommandTest.java b/src/test/java/io/lettuce/core/commands/SortCommandTest.java
index 8b1def2d7b..ca285baf96 100644
--- a/src/test/java/io/lettuce/core/commands/SortCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SortCommandTest.java
@@ -18,10 +18,10 @@
 import static io.lettuce.core.SortArgs.Builder.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.AbstractRedisClientTest;
-import io.lettuce.core.ListStreamingAdapter;
+import io.lettuce.test.ListStreamingAdapter;
 
 /**
  * @author Will Glozer
@@ -29,17 +29,17 @@
  */
 public class SortCommandTest extends AbstractRedisClientTest {
     @Test
-    public void sort() {
+    void sort() {
         redis.rpush(key, "3", "2", "1");
         assertThat(redis.sort(key)).isEqualTo(list("1", "2", "3"));
         assertThat(redis.sort(key, asc())).isEqualTo(list("1", "2", "3"));
     }
 
     @Test
-    public void sortStreaming() {
+    void sortStreaming() {
         redis.rpush(key, "3", "2", "1");
 
-        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<String>();
+        ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
         Long count = redis.sort(streamingAdapter, key);
 
         assertThat(count.longValue()).isEqualTo(3);
@@ -52,13 +52,13 @@ public void sortStreaming() {
     }
 
     @Test
-    public void sortAlpha() {
+    void sortAlpha() {
         redis.rpush(key, "A", "B", "C");
         assertThat(redis.sort(key, alpha().desc())).isEqualTo(list("C", "B", "A"));
     }
 
     @Test
-    public void sortBy() {
+    void sortBy() {
         redis.rpush(key, "foo", "bar", "baz");
         redis.set("weight_foo", "8");
         redis.set("weight_bar", "4");
@@ -67,13 +67,13 @@ public void sortBy() {
     }
 
     @Test
-    public void sortDesc() {
+    void sortDesc() {
         redis.rpush(key, "1", "2", "3");
         assertThat(redis.sort(key, desc())).isEqualTo(list("3", "2", "1"));
     }
 
     @Test
-    public void sortGet() {
+    void sortGet() {
         redis.rpush(key, "1", "2");
         redis.set("obj_1", "foo");
         redis.set("obj_2", "bar");
@@ -81,13 +81,13 @@ public void sortGet() {
     }
 
     @Test
-    public void sortLimit() {
+    void sortLimit() {
         redis.rpush(key, "3", "2", "1");
         assertThat(redis.sort(key, limit(1, 2))).isEqualTo(list("2", "3"));
     }
 
     @Test
-    public void sortStore() {
+    void sortStore() {
         redis.rpush("one", "1", "2", "3");
         assertThat(redis.sortStore("one", desc(), "two")).isEqualTo(3);
         assertThat(redis.lrange("two", 0, -1)).isEqualTo(list("3", "2", "1"));
diff --git a/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java b/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
index 54ad6f3770..b5fa9e9d28 100644
--- a/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
@@ -23,17 +23,18 @@
 import static java.lang.Double.NEGATIVE_INFINITY;
 import static java.lang.Double.POSITIVE_INFINITY;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.data.Offset.offset;
-import static org.junit.Assume.assumeTrue;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import io.lettuce.RedisConditions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.*;
 import io.lettuce.core.Range.Boundary;
+import io.lettuce.test.ListStreamingAdapter;
+import io.lettuce.test.condition.EnabledOnCommand;
 
 /**
  * @author Will Glozer
@@ -42,7 +43,7 @@
 public class SortedSetCommandTest extends AbstractRedisClientTest {
 
     @Test
-    public void zadd() {
+    void zadd() {
         assertThat(redis.zadd(key, 1.0, "a")).isEqualTo(1);
         assertThat(redis.zadd(key, 1.0, "a")).isEqualTo(0);
 
@@ -52,7 +53,7 @@ public void zadd() {
     }
 
     @Test
-    public void zaddScoredValue() {
+    void zaddScoredValue() {
         assertThat(redis.zadd(key, ScoredValue.fromNullable(1.0, "a"))).isEqualTo(1);
         assertThat(redis.zadd(key, ScoredValue.fromNullable(1.0, "a"))).isEqualTo(0);
 
@@ -62,7 +63,7 @@ public void zaddScoredValue() {
     }
 
     @Test
-    public void zaddnx() {
+    void zaddnx() {
         assertThat(redis.zadd(key, 1.0, "a")).isEqualTo(1);
         assertThat(redis.zadd(key, ZAddArgs.Builder.nx(), ScoredValue.fromNullable(2.0, "a"))).isEqualTo(0);
 
@@ -73,18 +74,19 @@ public void zaddnx() {
         assertThat(redis.zrangeWithScores(key, 0, -1)).isEqualTo(svlist(sv(1.0, "a"), sv(2.0, "b"), sv(3.0, "c")));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void zaddWrongArguments() {
-        assertThat(redis.zadd(key, 2.0, "b", 3.0)).isEqualTo(2);
+    @Test
+    void zaddWrongArguments() {
+        assertThatThrownBy(() -> redis.zadd(key, 2.0, "b", 3.0)).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void zaddnxWrongArguments() {
-        assertThat(redis.zadd(key, ZAddArgs.Builder.nx(), new Object[] { 2.0, "b", 3.0 })).isEqualTo(1);
+    @Test
+    void zaddnxWrongArguments() {
+        assertThatThrownBy(() -> redis.zadd(key, ZAddArgs.Builder.nx(), new Object[] { 2.0, "b", 3.0 })).isInstanceOf(
+                IllegalArgumentException.class);
     }
 
     @Test
-    public void zaddxx() {
+    void zaddxx() {
         assertThat(redis.zadd(key, 1.0, "a")).isEqualTo(1);
         assertThat(redis.zadd(key, ZAddArgs.Builder.xx(), 2.0, "a")).isEqualTo(0);
 
@@ -94,7 +96,7 @@ public void zaddxx() {
     }
 
     @Test
-    public void zaddch() {
+    void zaddch() {
         assertThat(redis.zadd(key, 1.0, "a")).isEqualTo(1);
         assertThat(redis.zadd(key, ZAddArgs.Builder.ch().xx(), 2.0, "a")).isEqualTo(1);
         assertThat(redis.zadd(key, ZAddArgs.Builder.ch(), 2.0, "b")).isEqualTo(1);
@@ -103,7 +105,7 @@ public void zaddch() {
     }
 
     @Test
-    public void zaddincr() {
+    void zaddincr() {
         assertThat(redis.zadd(key, 1.0, "a").longValue()).isEqualTo(1);
         assertThat(redis.zaddincr(key, 2.0, "a").longValue()).isEqualTo(3);
 
@@ -113,27 +115,27 @@ public void zaddincr() {
     }
 
     @Test
-    public void zaddincrnx() {
+    void zaddincrnx() {
         assertThat(redis.zaddincr(key, ZAddArgs.Builder.nx(), 2.0, "a").longValue()).isEqualTo(2);
         assertThat(redis.zaddincr(key, ZAddArgs.Builder.nx(), 2.0, "a")).isNull();
     }
 
     @Test
-    public void zaddincrxx() {
+    void zaddincrxx() {
         assertThat(redis.zaddincr(key, ZAddArgs.Builder.xx(), 2.0, "a")).isNull();
         assertThat(redis.zaddincr(key, ZAddArgs.Builder.nx(), 2.0, "a").longValue()).isEqualTo(2);
         assertThat(redis.zaddincr(key, ZAddArgs.Builder.xx(), 2.0, "a").longValue()).isEqualTo(4);
     }
 
     @Test
-    public void zcard() {
+    void zcard() {
         assertThat(redis.zcard(key)).isEqualTo(0);
         redis.zadd(key, 1.0, "a");
         assertThat(redis.zcard(key)).isEqualTo(1);
     }
 
     @Test
-    public void zcount() {
+    void zcount() {
         assertThat(redis.zcount(key, 0, 0)).isEqualTo(0);
 
         redis.zadd(key, 1.0, "a", 2.0, "b", 2.1, "c");
@@ -154,7 +156,7 @@ public void zcount() {
     }
 
     @Test
-    public void zincrby() {
+    void zincrby() {
         assertThat(redis.zincrby(key, 0.0, "a")).isEqualTo(0, offset(0.1));
         assertThat(redis.zincrby(key, 1.1, "a")).isEqualTo(1.1, offset(0.1));
         assertThat(redis.zscore(key, "a")).isEqualTo(1.1, offset(0.1));
@@ -163,7 +165,7 @@ public void zincrby() {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zinterstore() {
+    void zinterstore() {
         redis.zadd("zset1", 1.0, "a", 2.0, "b");
         redis.zadd("zset2", 2.0, "a", 3.0, "b", 4.0, "c");
         assertThat(redis.zinterstore(key, "zset1", "zset2")).isEqualTo(2);
@@ -172,9 +174,8 @@ public void zinterstore() {
     }
 
     @Test
-    public void bzpopmin() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("BZPOPMIN"));
+    @EnabledOnCommand("BZPOPMIN")
+    void bzpopmin() {
 
         redis.zadd("zset", 2.0, "a", 3.0, "b", 4.0, "c");
 
@@ -183,9 +184,8 @@ public void bzpopmin() {
     }
 
     @Test
-    public void bzpopmax() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("BZPOPMAX"));
+    @EnabledOnCommand("BZPOPMAX")
+    void bzpopmax() {
 
         redis.zadd("zset", 2.0, "a", 3.0, "b", 4.0, "c");
 
@@ -194,9 +194,8 @@ public void bzpopmax() {
     }
 
     @Test
-    public void zpopmin() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("ZPOPMIN"));
+    @EnabledOnCommand("ZPOPMIN")
+    void zpopmin() {
 
         redis.zadd("zset", 2.0, "a", 3.0, "b", 4.0, "c");
 
@@ -206,9 +205,8 @@ public void zpopmin() {
     }
 
     @Test
-    public void zpopmax() {
-
-        assumeTrue(RedisConditions.of(redis).hasCommand("ZPOPMAX"));
+    @EnabledOnCommand("ZPOPMAX")
+    void zpopmax() {
 
         redis.zadd("zset", 2.0, "a", 3.0, "b", 4.0, "c");
 
@@ -218,13 +216,13 @@ public void zpopmax() {
     }
 
     @Test
-    public void zrange() {
+    void zrange() {
         setup();
         assertThat(redis.zrange(key, 0, -1)).isEqualTo(list("a", "b", "c"));
     }
 
     @Test
-    public void zrangeStreaming() {
+    void zrangeStreaming() {
         setup();
 
         ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
@@ -240,14 +238,14 @@ private void setup() {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zrangeWithScores() {
+    void zrangeWithScores() {
         setup();
         assertThat(redis.zrangeWithScores(key, 0, -1)).isEqualTo(svlist(sv(1.0, "a"), sv(2.0, "b"), sv(3.0, "c")));
     }
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zrangeWithScoresStreaming() {
+    void zrangeWithScoresStreaming() {
         setup();
         ScoredValueStreamingAdapter<String> streamingAdapter = new ScoredValueStreamingAdapter<>();
         Long count = redis.zrangeWithScores(streamingAdapter, key, 0, -1);
@@ -256,7 +254,7 @@ public void zrangeWithScoresStreaming() {
     }
 
     @Test
-    public void zrangebyscore() {
+    void zrangebyscore() {
 
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
 
@@ -276,7 +274,7 @@ public void zrangebyscore() {
     }
 
     @Test
-    public void zrangebyscoreStreaming() {
+    void zrangebyscoreStreaming() {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
         ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
 
@@ -298,7 +296,7 @@ public void zrangebyscoreStreaming() {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zrangebyscoreWithScores() {
+    void zrangebyscoreWithScores() {
 
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
 
@@ -325,7 +323,7 @@ public void zrangebyscoreWithScores() {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zrangebyscoreWithScoresInfinity() {
+    void zrangebyscoreWithScoresInfinity() {
 
         redis.zadd(key, Double.POSITIVE_INFINITY, "a", Double.NEGATIVE_INFINITY, "b");
 
@@ -340,7 +338,7 @@ public void zrangebyscoreWithScoresInfinity() {
     }
 
     @Test
-    public void zrangebyscoreWithScoresStreaming() {
+    void zrangebyscoreWithScoresStreaming() {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
         ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
 
@@ -365,7 +363,7 @@ public void zrangebyscoreWithScoresStreaming() {
     }
 
     @Test
-    public void zrank() {
+    void zrank() {
         assertThat(redis.zrank(key, "a")).isNull();
         setup();
         assertThat(redis.zrank(key, "a")).isEqualTo(0);
@@ -373,7 +371,7 @@ public void zrank() {
     }
 
     @Test
-    public void zrem() {
+    void zrem() {
         assertThat(redis.zrem(key, "a")).isEqualTo(0);
         setup();
         assertThat(redis.zrem(key, "b")).isEqualTo(1);
@@ -383,7 +381,7 @@ public void zrem() {
     }
 
     @Test
-    public void zremrangebyscore() {
+    void zremrangebyscore() {
 
         setup();
         assertThat(redis.zremrangebyscore(key, 1.0, 2.0)).isEqualTo(2);
@@ -403,7 +401,7 @@ public void zremrangebyscore() {
     }
 
     @Test
-    public void zremrangebyrank() {
+    void zremrangebyrank() {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
         assertThat(redis.zremrangebyrank(key, 1, 2)).isEqualTo(2);
         assertThat(redis.zrange(key, 0, -1)).isEqualTo(list("a", "d"));
@@ -414,20 +412,20 @@ public void zremrangebyrank() {
     }
 
     @Test
-    public void zrevrange() {
+    void zrevrange() {
         setup();
         assertThat(redis.zrevrange(key, 0, -1)).isEqualTo(list("c", "b", "a"));
     }
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zrevrangeWithScores() {
+    void zrevrangeWithScores() {
         setup();
         assertThat(redis.zrevrangeWithScores(key, 0, -1)).isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
     }
 
     @Test
-    public void zrevrangeStreaming() {
+    void zrevrangeStreaming() {
         setup();
         ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
         Long count = redis.zrevrange(streamingAdapter, key, 0, -1);
@@ -437,7 +435,7 @@ public void zrevrangeStreaming() {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zrevrangeWithScoresStreaming() {
+    void zrevrangeWithScoresStreaming() {
         setup();
         ScoredValueStreamingAdapter<String> streamingAdapter = new ScoredValueStreamingAdapter<>();
         Long count = redis.zrevrangeWithScores(streamingAdapter, key, 0, -1);
@@ -446,7 +444,7 @@ public void zrevrangeWithScoresStreaming() {
     }
 
     @Test
-    public void zrevrangebylex() {
+    void zrevrangebylex() {
 
         setup100KeyValues(new HashSet<>());
 
@@ -459,7 +457,7 @@ public void zrevrangebylex() {
     }
 
     @Test
-    public void zrevrangebyscore() {
+    void zrevrangebyscore() {
 
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
 
@@ -480,7 +478,7 @@ public void zrevrangebyscore() {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zrevrangebyscoreWithScores() {
+    void zrevrangebyscoreWithScores() {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
 
         assertThat(redis.zrevrangebyscoreWithScores(key, 3.0, 2.0)).isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b")));
@@ -505,7 +503,7 @@ public void zrevrangebyscoreWithScores() {
     }
 
     @Test
-    public void zrevrangebyscoreStreaming() {
+    void zrevrangebyscoreStreaming() {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
         ListStreamingAdapter<String> streamingAdapter = new ListStreamingAdapter<>();
 
@@ -530,7 +528,7 @@ public void zrevrangebyscoreStreaming() {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zrevrangebyscoreWithScoresStreaming() {
+    void zrevrangebyscoreWithScoresStreaming() {
         redis.zadd(key, 1.0, "a", 2.0, "b", 3.0, "c", 4.0, "d");
 
         ScoredValueStreamingAdapter<String> streamingAdapter = new ScoredValueStreamingAdapter<>();
@@ -555,7 +553,7 @@ public void zrevrangebyscoreWithScoresStreaming() {
     }
 
     @Test
-    public void zrevrank() {
+    void zrevrank() {
         assertThat(redis.zrevrank(key, "a")).isNull();
         setup();
         assertThat(redis.zrevrank(key, "c")).isEqualTo(0);
@@ -563,7 +561,7 @@ public void zrevrank() {
     }
 
     @Test
-    public void zscore() {
+    void zscore() {
         assertThat(redis.zscore(key, "a")).isNull();
         redis.zadd(key, 1.0, "a");
         assertThat(redis.zscore(key, "a")).isEqualTo(1.0);
@@ -571,7 +569,7 @@ public void zscore() {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zunionstore() {
+    void zunionstore() {
         redis.zadd("zset1", 1.0, "a", 2.0, "b");
         redis.zadd("zset2", 2.0, "a", 3.0, "b", 4.0, "c");
         assertThat(redis.zunionstore(key, "zset1", "zset2")).isEqualTo(3);
@@ -593,7 +591,7 @@ public void zunionstore() {
 
     @Test
     @SuppressWarnings({ "unchecked" })
-    public void zStoreArgs() {
+    void zStoreArgs() {
         redis.zadd("zset1", 1.0, "a", 2.0, "b");
         redis.zadd("zset2", 2.0, "a", 3.0, "b", 4.0, "c");
 
@@ -620,7 +618,7 @@ public void zStoreArgs() {
     }
 
     @Test
-    public void zsscan() {
+    void zsscan() {
         redis.zadd(key, 1, value);
         ScoredValueScanCursor<String> cursor = redis.zscan(key);
 
@@ -630,7 +628,7 @@ public void zsscan() {
     }
 
     @Test
-    public void zsscanWithCursor() {
+    void zsscanWithCursor() {
         redis.zadd(key, 1, value);
 
         ScoredValueScanCursor<String> cursor = redis.zscan(key, ScanCursor.INITIAL);
@@ -641,7 +639,7 @@ public void zsscanWithCursor() {
     }
 
     @Test
-    public void zsscanWithCursorAndArgs() {
+    void zsscanWithCursorAndArgs() {
         redis.zadd(key, 1, value);
 
         ScoredValueScanCursor<String> cursor = redis.zscan(key, ScanCursor.INITIAL, ScanArgs.Builder.limit(5));
@@ -652,7 +650,7 @@ public void zsscanWithCursorAndArgs() {
     }
 
     @Test
-    public void zscanStreaming() {
+    void zscanStreaming() {
         redis.zadd(key, 1, value);
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
@@ -665,7 +663,7 @@ public void zscanStreaming() {
     }
 
     @Test
-    public void zscanStreamingWithCursor() {
+    void zscanStreamingWithCursor() {
         redis.zadd(key, 1, value);
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
@@ -677,7 +675,7 @@ public void zscanStreamingWithCursor() {
     }
 
     @Test
-    public void zscanStreamingWithCursorAndArgs() {
+    void zscanStreamingWithCursorAndArgs() {
         redis.zadd(key, 1, value);
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
@@ -689,7 +687,7 @@ public void zscanStreamingWithCursorAndArgs() {
     }
 
     @Test
-    public void zscanStreamingWithArgs() {
+    void zscanStreamingWithArgs() {
         redis.zadd(key, 1, value);
         ListStreamingAdapter<String> adapter = new ListStreamingAdapter<>();
 
@@ -702,7 +700,7 @@ public void zscanStreamingWithArgs() {
     }
 
     @Test
-    public void zscanMultiple() {
+    void zscanMultiple() {
 
         Set<String> expect = new HashSet<>();
         setup100KeyValues(expect);
@@ -718,7 +716,7 @@ public void zscanMultiple() {
     }
 
     @Test
-    public void zscanMatch() {
+    void zscanMatch() {
 
         Set<String> expect = new HashSet<>();
         setup100KeyValues(expect);
@@ -732,7 +730,7 @@ public void zscanMatch() {
     }
 
     @Test
-    public void zlexcount() {
+    void zlexcount() {
 
         setup100KeyValues(new HashSet<>());
 
@@ -746,7 +744,7 @@ public void zlexcount() {
     }
 
     @Test
-    public void zrangebylex() {
+    void zrangebylex() {
         setup100KeyValues(new HashSet<>());
 
         assertThat(redis.zrangebylex(key, "-", "+")).hasSize(100);
@@ -761,7 +759,7 @@ public void zrangebylex() {
     }
 
     @Test
-    public void zremrangebylex() {
+    void zremrangebylex() {
 
         setup100KeyValues(new HashSet<>());
         assertThat(redis.zremrangebylex(key, "(aaa", "[zzz")).isEqualTo(100);
@@ -771,7 +769,7 @@ public void zremrangebylex() {
 
     }
 
-    protected void setup100KeyValues(Set<String> expect) {
+    void setup100KeyValues(Set<String> expect) {
         for (int i = 0; i < 100; i++) {
             redis.zadd(key + 1, i, value + i);
             redis.zadd(key, i, value + i);
diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandTest.java b/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
index 37f60b61e9..6122a7e833 100644
--- a/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
@@ -17,15 +17,12 @@
 
 import static io.lettuce.core.protocol.CommandType.XINFO;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
 
 import java.time.Instant;
 import java.util.*;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.RedisConditions;
 import io.lettuce.core.*;
 import io.lettuce.core.XReadArgs.StreamOffset;
 import io.lettuce.core.codec.StringCodec;
@@ -33,28 +30,23 @@
 import io.lettuce.core.models.stream.PendingParser;
 import io.lettuce.core.output.NestedMultiOutput;
 import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.test.condition.EnabledOnCommand;
 
 /**
  * @author Mark Paluch
  */
+@EnabledOnCommand("XADD")
 public class StreamCommandTest extends AbstractRedisClientTest {
 
-    @Before
-    public void openConnection() throws Exception {
-
-        super.openConnection();
-        assumeTrue(RedisConditions.of(redis).hasCommand("XADD"));
-    }
-
     @Test
-    public void xadd() {
+    void xadd() {
 
         assertThat(redis.xadd(key, Collections.singletonMap("key", "value"))).endsWith("-0");
         assertThat(redis.xadd(key, "foo", "bar")).isNotEmpty();
     }
 
     @Test
-    public void xaddMaxLen() {
+    void xaddMaxLen() {
 
         String id = redis.xadd(key, XAddArgs.Builder.maxlen(5), "foo", "bar");
 
@@ -69,7 +61,7 @@ public void xaddMaxLen() {
     }
 
     @Test
-    public void xaddMaxLenEfficientTrimming() {
+    void xaddMaxLenEfficientTrimming() {
 
         String id = redis.xadd(key, XAddArgs.Builder.maxlen(5).approximateTrimming(), "foo", "bar");
 
@@ -77,7 +69,7 @@ public void xaddMaxLenEfficientTrimming() {
     }
 
     @Test
-    public void xdel() {
+    void xdel() {
 
         List<String> ids = new ArrayList<>();
         for (int i = 0; i < 2; i++) {
@@ -93,7 +85,7 @@ public void xdel() {
     }
 
     @Test
-    public void xtrim() {
+    void xtrim() {
 
         List<String> ids = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
@@ -108,7 +100,7 @@ public void xtrim() {
     }
 
     @Test
-    public void xrange() {
+    void xrange() {
 
         List<String> ids = new ArrayList<>();
         for (int i = 0; i < 5; i++) {
@@ -142,7 +134,7 @@ public void xrange() {
     }
 
     @Test
-    public void xrevrange() {
+    void xrevrange() {
 
         for (int i = 0; i < 5; i++) {
 
@@ -168,7 +160,7 @@ public void xrevrange() {
     }
 
     @Test
-    public void xread() {
+    void xread() {
 
         String initial1 = redis.xadd("stream-1", Collections.singletonMap("key1", "value1"));
         String initial2 = redis.xadd("stream-2", Collections.singletonMap("key2", "value2"));
@@ -192,7 +184,7 @@ public void xread() {
     }
 
     @Test
-    public void xreadTransactional() {
+    void xreadTransactional() {
 
         String initial1 = redis.xadd("stream-1", Collections.singletonMap("key1", "value1"));
         String initial2 = redis.xadd("stream-2", Collections.singletonMap("key2", "value2"));
@@ -222,7 +214,7 @@ public void xreadTransactional() {
     }
 
     @Test
-    public void xgroupCreate() {
+    void xgroupCreate() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
 
@@ -235,7 +227,7 @@ public void xgroupCreate() {
     }
 
     @Test
-    public void xgroupread() {
+    void xgroupread() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
         redis.xgroupCreate(StreamOffset.latest(key), "group");
@@ -248,7 +240,7 @@ public void xgroupread() {
     }
 
     @Test
-    public void xpendingWithGroup() {
+    void xpendingWithGroup() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
         redis.xgroupCreate(StreamOffset.latest(key), "group");
@@ -261,7 +253,7 @@ public void xpendingWithGroup() {
     }
 
     @Test
-    public void xpending() {
+    void xpending() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
         redis.xgroupCreate(StreamOffset.latest(key), "group");
@@ -281,7 +273,7 @@ public void xpending() {
     }
 
     @Test
-    public void xack() {
+    void xack() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
         redis.xgroupCreate(StreamOffset.latest(key), "group");
@@ -298,7 +290,7 @@ public void xack() {
     }
 
     @Test
-    public void xclaim() {
+    void xclaim() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
         redis.xgroupCreate(StreamOffset.latest(key), "group");
@@ -317,7 +309,7 @@ public void xclaim() {
     }
 
     @Test
-    public void xclaimWithArgs() {
+    void xclaimWithArgs() {
 
         String id1 = redis.xadd(key, Collections.singletonMap("key", "value"));
         redis.xgroupCreate(StreamOffset.latest(key), "group");
@@ -340,7 +332,7 @@ public void xclaimWithArgs() {
     }
 
     @Test
-    public void xgroupDestroy() {
+    void xgroupDestroy() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
         redis.xgroupCreate(StreamOffset.latest(key), "group");
@@ -350,7 +342,7 @@ public void xgroupDestroy() {
     }
 
     @Test
-    public void xgroupDelconsumer() {
+    void xgroupDelconsumer() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
         redis.xgroupCreate(StreamOffset.latest(key), "group");
@@ -362,7 +354,7 @@ public void xgroupDelconsumer() {
     }
 
     @Test
-    public void xgroupSetid() {
+    void xgroupSetid() {
 
         redis.xadd(key, Collections.singletonMap("key", "value"));
         redis.xgroupCreate(StreamOffset.latest(key), "group");
diff --git a/src/test/java/io/lettuce/core/commands/StringCommandTest.java b/src/test/java/io/lettuce/core/commands/StringCommandTest.java
index 54961adfe3..65e9c5f7d8 100644
--- a/src/test/java/io/lettuce/core/commands/StringCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/StringCommandTest.java
@@ -20,50 +20,47 @@
 import static io.lettuce.core.SetArgs.Builder.px;
 import static io.lettuce.core.SetArgs.Builder.xx;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.KeyValue;
-import io.lettuce.core.KeyValueStreamingAdapter;
 import io.lettuce.core.RedisException;
+import io.lettuce.test.KeyValueStreamingAdapter;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
 public class StringCommandTest extends AbstractRedisClientTest {
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
 
     @Test
-    public void append() {
+    void append() {
         assertThat(redis.append(key, value)).isEqualTo(value.length());
         assertThat(redis.append(key, "X")).isEqualTo(value.length() + 1);
     }
 
     @Test
-    public void get() {
+    void get() {
         assertThat(redis.get(key)).isNull();
         redis.set(key, value);
         assertThat(redis.get(key)).isEqualTo(value);
     }
 
     @Test
-    public void getbit() {
+    void getbit() {
         assertThat(redis.getbit(key, 0)).isEqualTo(0);
         redis.setbit(key, 0, 1);
         assertThat(redis.getbit(key, 0)).isEqualTo(1);
     }
 
     @Test
-    public void getrange() {
+    void getrange() {
         assertThat(redis.getrange(key, 0, -1)).isEqualTo("");
         redis.set(key, "foobar");
         assertThat(redis.getrange(key, 2, 4)).isEqualTo("oba");
@@ -71,14 +68,14 @@ public void getrange() {
     }
 
     @Test
-    public void getset() {
+    void getset() {
         assertThat(redis.getset(key, value)).isNull();
         assertThat(redis.getset(key, "two")).isEqualTo(value);
         assertThat(redis.get(key)).isEqualTo("two");
     }
 
     @Test
-    public void mget() {
+    void mget() {
         setupMget();
         assertThat(redis.mget("one", "two")).isEqualTo(list(kv("one", "1"), kv("two", "2")));
     }
@@ -90,7 +87,7 @@ protected void setupMget() {
     }
 
     @Test
-    public void mgetStreaming() {
+    void mgetStreaming() {
         setupMget();
 
         KeyValueStreamingAdapter<String, String> streamingAdapter = new KeyValueStreamingAdapter<>();
@@ -101,7 +98,7 @@ public void mgetStreaming() {
     }
 
     @Test
-    public void mset() {
+    void mset() {
         assertThat(redis.mget("one", "two")).isEqualTo(list(KeyValue.empty("one"), KeyValue.empty("two")));
         Map<String, String> map = new LinkedHashMap<>();
         map.put("one", "1");
@@ -111,7 +108,7 @@ public void mset() {
     }
 
     @Test
-    public void msetnx() {
+    void msetnx() {
         redis.set("one", "1");
         Map<String, String> map = new LinkedHashMap<>();
         map.put("one", "1");
@@ -123,7 +120,7 @@ public void msetnx() {
     }
 
     @Test
-    public void set() {
+    void set() {
         assertThat(redis.get(key)).isNull();
         assertThat(redis.set(key, value)).isEqualTo("OK");
         assertThat(redis.get(key)).isEqualTo(value);
@@ -152,58 +149,58 @@ public void set() {
         assertThat(redis.ttl(key) >= 19).isTrue();
     }
 
-    @Test(expected = RedisException.class)
-    public void setNegativeEX() {
-        redis.set(key, value, ex(-10));
+    @Test
+    void setNegativeEX() {
+        assertThatThrownBy(() -> redis.set(key, value, ex(-10))).isInstanceOf(RedisException. class);
     }
 
-    @Test(expected = RedisException.class)
-    public void setNegativePX() {
-        redis.set(key, value, px(-1000));
+    @Test
+    void setNegativePX() {
+        assertThatThrownBy(() -> redis.set(key, value, px(-1000))).isInstanceOf(RedisException. class);
     }
 
     @Test
-    public void setbit() {
+    void setbit() {
         assertThat(redis.setbit(key, 0, 1)).isEqualTo(0);
         assertThat(redis.setbit(key, 0, 0)).isEqualTo(1);
     }
 
     @Test
-    public void setex() {
+    void setex() {
         assertThat(redis.setex(key, 10, value)).isEqualTo("OK");
         assertThat(redis.get(key)).isEqualTo(value);
         assertThat(redis.ttl(key) >= 9).isTrue();
     }
 
     @Test
-    public void psetex() {
+    void psetex() {
         assertThat(redis.psetex(key, 20000, value)).isEqualTo("OK");
         assertThat(redis.get(key)).isEqualTo(value);
         assertThat(redis.pttl(key) >= 19000).isTrue();
     }
 
     @Test
-    public void setnx() {
+    void setnx() {
         assertThat(redis.setnx(key, value)).isTrue();
         assertThat(redis.setnx(key, value)).isFalse();
     }
 
     @Test
-    public void setrange() {
+    void setrange() {
         assertThat(redis.setrange(key, 0, "foo")).isEqualTo("foo".length());
         assertThat(redis.setrange(key, 3, "bar")).isEqualTo(6);
         assertThat(redis.get(key)).isEqualTo("foobar");
     }
 
     @Test
-    public void strlen() {
+    void strlen() {
         assertThat((long) redis.strlen(key)).isEqualTo(0);
         redis.set(key, value);
         assertThat((long) redis.strlen(key)).isEqualTo(value.length());
     }
 
     @Test
-    public void time() {
+    void time() {
 
         List<String> time = redis.time();
         assertThat(time).hasSize(2);
diff --git a/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java b/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
index 9376ea3414..de1e89ed12 100644
--- a/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
@@ -16,10 +16,9 @@
 package io.lettuce.core.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.RedisCommandExecutionException;
@@ -33,11 +32,8 @@
  */
 public class TransactionCommandTest extends AbstractRedisClientTest {
 
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-
     @Test
-    public void discard() {
+    void discard() {
         assertThat(redis.multi()).isEqualTo("OK");
         redis.set(key, value);
         assertThat(redis.discard()).isEqualTo("OK");
@@ -45,7 +41,7 @@ public void discard() {
     }
 
     @Test
-    public void exec() {
+    void exec() {
         assertThat(redis.multi()).isEqualTo("OK");
         redis.set(key, value);
         assertThat(redis.exec()).contains("OK");
@@ -53,7 +49,7 @@ public void exec() {
     }
 
     @Test
-    public void watch() {
+    void watch() {
         assertThat(redis.watch(key)).isEqualTo("OK");
 
         RedisCommands<String, String> redis2 = client.connect().sync();
@@ -71,12 +67,12 @@ public void watch() {
     }
 
     @Test
-    public void unwatch() {
+    void unwatch() {
         assertThat(redis.unwatch()).isEqualTo("OK");
     }
 
     @Test
-    public void commandsReturnNullInMulti() {
+    void commandsReturnNullInMulti() {
 
         assertThat(redis.multi()).isEqualTo("OK");
         assertThat(redis.set(key, value)).isNull();
@@ -90,7 +86,7 @@ public void commandsReturnNullInMulti() {
     }
 
     @Test
-    public void execmulti() {
+    void execmulti() {
         redis.multi();
         redis.set("one", "1");
         redis.set("two", "2");
@@ -100,7 +96,7 @@ public void execmulti() {
     }
 
     @Test
-    public void emptyMulti() {
+    void emptyMulti() {
         redis.multi();
         TransactionResult exec = redis.exec();
         assertThat(exec.wasDiscarded()).isFalse();
@@ -108,7 +104,7 @@ public void emptyMulti() {
     }
 
     @Test
-    public void errorInMulti() {
+    void errorInMulti() {
         redis.multi();
         redis.set(key, value);
         redis.lpop(key);
@@ -121,18 +117,16 @@ public void errorInMulti() {
     }
 
     @Test
-    public void execWithoutMulti() {
-        exception.expect(RedisCommandExecutionException.class);
-        exception.expectMessage("ERR EXEC without MULTI");
-        redis.exec();
+    void execWithoutMulti() {
+        assertThatThrownBy(() -> redis.exec()).isInstanceOf(RedisCommandExecutionException.class).hasMessageContaining(
+                "ERR EXEC without MULTI");
     }
 
     @Test
-    public void multiCalledTwiceShouldFail() {
-        exception.expect(RedisCommandExecutionException.class);
-        exception.expectMessage("ERR MULTI calls can not be nested");
+    void multiCalledTwiceShouldFail() {
 
         redis.multi();
-        redis.multi();
+        assertThatThrownBy(() -> redis.multi()).isInstanceOf(RedisCommandExecutionException.class).hasMessageContaining(
+                "ERR MULTI calls can not be nested");
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java
index f9ce32ae6e..abb22b8975 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java
@@ -21,7 +21,7 @@
 import static io.lettuce.core.BitFieldArgs.OverflowType.FAIL;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import reactor.test.StepVerifier;
 import io.lettuce.core.BitFieldArgs;
@@ -30,7 +30,8 @@
 import io.lettuce.core.api.reactive.RedisStringReactiveCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.BitCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.core.commands.BitStringCodec;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -40,7 +41,7 @@ public class BitReactiveCommandTest extends BitCommandTest {
     private RedisStringReactiveCommands<String, String> reactive;
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         bitstring = ReactiveSyncInvocationHandler.sync(client.connect(new BitStringCodec()));
 
         StatefulRedisConnection<String, String> connection = client.connect();
@@ -49,7 +50,7 @@ protected RedisCommands<String, String> connect() {
     }
 
     @Test
-    public void bitfield() {
+    void bitfield() {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 1).set(5, 1).incrBy(2, 3).get().get(2);
 
@@ -60,7 +61,7 @@ public void bitfield() {
     }
 
     @Test
-    public void bitfieldGetWithOffset() {
+    void bitfieldGetWithOffset() {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 1).get(signed(2), typeWidthBasedOffset(1));
 
@@ -70,7 +71,7 @@ public void bitfieldGetWithOffset() {
     }
 
     @Test
-    public void bitfieldSet() {
+    void bitfieldSet() {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 5).set(5);
 
@@ -80,7 +81,7 @@ public void bitfieldSet() {
     }
 
     @Test
-    public void bitfieldWithOffsetSet() {
+    void bitfieldWithOffsetSet() {
 
         StepVerifier.create(reactive.bitfield(key, BitFieldArgs.Builder.set(signed(8), typeWidthBasedOffset(2), 5)))
                 .expectNextCount(1).verifyComplete();
@@ -94,7 +95,7 @@ public void bitfieldWithOffsetSet() {
     }
 
     @Test
-    public void bitfieldIncrBy() {
+    void bitfieldIncrBy() {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.set(signed(8), 0, 5).incrBy(1);
 
@@ -104,7 +105,7 @@ public void bitfieldIncrBy() {
     }
 
     @Test
-    public void bitfieldOverflow() {
+    void bitfieldOverflow() {
 
         BitFieldArgs bitFieldArgs = BitFieldArgs.Builder.overflow(FAIL).set(signed(8), 9, 5)
                 .incrBy(signed(8), Integer.MAX_VALUE);
diff --git a/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java
similarity index 65%
rename from src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java
index 3c67574694..2809efdfa9 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java
@@ -15,49 +15,57 @@
  */
 package io.lettuce.core.commands.reactive;
 
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
+import io.lettuce.core.TestSupport;
+import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.reactive.RedisReactiveCommands;
 import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.CustomCommandTest;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.ValueListOutput;
 import io.lettuce.core.output.ValueOutput;
 import io.lettuce.core.protocol.CommandArgs;
 import io.lettuce.core.protocol.CommandType;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class CustomReactiveCommandTest extends CustomCommandTest {
+@ExtendWith(LettuceExtension.class)
+class CustomReactiveCommandIntegrationTests extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
 
-    @Override
-    protected RedisCommands<String, String> connect() {
-        return ReactiveSyncInvocationHandler.sync(client.connect());
+    @Inject
+    CustomReactiveCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        this.redis = connection.sync();
     }
 
     @Test
-    public void dispatchGetAndSet() {
+    void dispatchGetAndSet() {
 
         redis.set(key, value);
         RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
 
-        Flux<String> flux = reactive.dispatch(CommandType.GET, new ValueOutput<>(utf8StringCodec), new CommandArgs<>(
-                utf8StringCodec).addKey(key));
+        Flux<String> flux = reactive.dispatch(CommandType.GET, new ValueOutput<>(StringCodec.UTF8), new CommandArgs<>(
+                StringCodec.UTF8).addKey(key));
 
         StepVerifier.create(flux).expectNext(value).verifyComplete();
     }
 
     @Test
-    public void dispatchList() {
+    void dispatchList() {
 
         redis.rpush(key, "a", "b", "c");
         RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
 
-        Flux<String> flux = reactive.dispatch(CommandType.LRANGE, new ValueListOutput<>(utf8StringCodec), new CommandArgs<>(
-                utf8StringCodec).addKey(key).add(0).add(-1));
+        Flux<String> flux = reactive.dispatch(CommandType.LRANGE, new ValueListOutput<>(StringCodec.UTF8), new CommandArgs<>(
+                StringCodec.UTF8).addKey(key).add(0).add(-1));
 
         StepVerifier.create(flux).expectNext("a", "b", "c").verifyComplete();
     }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
index b978affb25..127cc19771 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
@@ -18,14 +18,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.offset;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import reactor.test.StepVerifier;
 import io.lettuce.core.api.reactive.RedisReactiveCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.GeoCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -33,7 +33,7 @@
 public class GeoReactiveCommandTest extends GeoCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 
@@ -56,7 +56,7 @@ public void geopos() {
     }
 
     @Test
-    @Ignore("API differences")
+    @Disabled("API differences")
     @Override
     public void geoposInTransaction() {
     }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java
index 1f6008438b..9097deb5b4 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java
@@ -17,7 +17,7 @@
 
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.HLLCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -25,7 +25,7 @@
 public class HLLReactiveCommandTest extends HLLCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java
index a2af5b8cc5..4e936bd14b 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java
@@ -17,7 +17,7 @@
 
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.HashCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -25,7 +25,7 @@
 public class HashReactiveCommandTest extends HashCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java
index 1a463325ac..88f5dfebb3 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java
@@ -17,7 +17,7 @@
 
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.KeyCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -25,7 +25,7 @@
 public class KeyReactiveCommandTest extends KeyCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java
index c7cdf83a5f..57760d4015 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java
@@ -17,7 +17,7 @@
 
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.ListCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -25,7 +25,7 @@
 public class ListReactiveCommandTest extends ListCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java
index c2fe7b1b22..b58593cc58 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java
@@ -17,7 +17,7 @@
 
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.NumericCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -25,7 +25,7 @@
 public class NumericReactiveCommandTest extends NumericCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java
index 1512409b68..5f813a0fbe 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java
@@ -17,7 +17,7 @@
 
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.ScriptingCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -25,7 +25,7 @@
 public class ScriptingReactiveCommandTest extends ScriptingCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
index e171182982..3795577ce0 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
@@ -17,13 +17,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.api.reactive.RedisReactiveCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.ServerCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -32,14 +32,14 @@ public class ServerReactiveCommandTest extends ServerCommandTest {
 
     private RedisReactiveCommands<String, String> reactive;
 
-    @Before
+    @BeforeEach
     public void openConnection() throws Exception {
         super.openConnection();
         reactive = redis.getStatefulConnection().reactive();
     }
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 
@@ -47,31 +47,31 @@ protected RedisCommands<String, String> connect() {
      * Luckily these commands do not destroy anything in contrast to sync/async.
      */
     @Test
-    public void shutdown() {
+    void shutdown() {
         reactive.shutdown(true);
         assertThat(reactive.getStatefulConnection().isOpen()).isTrue();
     }
 
     @Test
-    public void debugOom() {
+    void debugOom() {
         reactive.debugOom();
         assertThat(reactive.getStatefulConnection().isOpen()).isTrue();
     }
 
     @Test
-    public void debugSegfault() {
+    void debugSegfault() {
         reactive.debugSegfault();
         assertThat(reactive.getStatefulConnection().isOpen()).isTrue();
     }
 
     @Test
-    public void debugRestart() {
+    void debugRestart() {
         reactive.debugRestart(1L);
         assertThat(reactive.getStatefulConnection().isOpen()).isTrue();
     }
 
     @Test
-    public void migrate() {
+    void migrate() {
         reactive.migrate("host", 1234, "key", 1, 10);
         assertThat(reactive.getStatefulConnection().isOpen()).isTrue();
     }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java
index 033708488a..f72b4fc85e 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java
@@ -17,7 +17,7 @@
 
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.SetCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -25,7 +25,7 @@
 public class SetReactiveCommandTest extends SetCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java
index 9e68b27e3d..ec8ed19cc0 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java
@@ -17,7 +17,7 @@
 
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.SortCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -25,7 +25,7 @@
 public class SortReactiveCommandTest extends SortCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java
index 261272556e..338091d814 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java
@@ -17,7 +17,7 @@
 
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.SortedSetCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -25,7 +25,7 @@
 public class SortedSetReactiveCommandTest extends SortedSetCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandTest.java
index b5db1da585..1b28fce9bf 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandTest.java
@@ -17,7 +17,7 @@
 
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.StreamCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -25,7 +25,7 @@
 public class StreamReactiveCommandTest extends StreamCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java
index 8f081fd169..59eb6b49be 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core.commands.reactive;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
@@ -23,7 +23,7 @@
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.StringCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -31,12 +31,12 @@
 public class StringReactiveCommandTest extends StringCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 
     @Test
-    public void mget() {
+    void mget() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
 
@@ -51,7 +51,7 @@ public void mget() {
     }
 
     @Test
-    public void mgetEmpty() {
+    void mgetEmpty() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
 
diff --git a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
index 44fb96533e..321f27e411 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
@@ -17,9 +17,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import reactor.test.StepVerifier;
 import io.lettuce.core.ClientOptions;
@@ -29,7 +29,7 @@
 import io.lettuce.core.api.reactive.RedisReactiveCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.TransactionCommandTest;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
@@ -43,7 +43,7 @@ protected RedisCommands<String, String> connect() {
         return ReactiveSyncInvocationHandler.sync(client.connect());
     }
 
-    @Before
+    @BeforeEach
     public void openConnection() {
         client.setOptions(ClientOptions.builder().build());
         redis = connect();
@@ -53,13 +53,13 @@ public void openConnection() {
         commands = redis.getStatefulConnection().reactive();
     }
 
-    @After
+    @AfterEach
     public void closeConnection() {
         redis.getStatefulConnection().close();
     }
 
     @Test
-    public void discard() {
+    void discard() {
 
         StepVerifier.create(commands.multi()).expectNext("OK").verifyComplete();
 
@@ -70,7 +70,7 @@ public void discard() {
     }
 
     @Test
-    public void watchRollback() {
+    void watchRollback() {
 
         StatefulRedisConnection<String, String> otherConnection = client.connect();
 
@@ -90,7 +90,7 @@ public void watchRollback() {
     }
 
     @Test
-    public void execSingular() {
+    void execSingular() {
 
         StepVerifier.create(commands.multi()).expectNext("OK").verifyComplete();
 
@@ -101,7 +101,7 @@ public void execSingular() {
     }
 
     @Test
-    public void errorInMulti() {
+    void errorInMulti() {
 
         commands.multi().toProcessor();
         commands.set(key, value).toProcessor();
@@ -117,7 +117,7 @@ public void errorInMulti() {
     }
 
     @Test
-    public void resultOfMultiIsContainedInCommandFlux() {
+    void resultOfMultiIsContainedInCommandFlux() {
 
         commands.multi().toProcessor();
 
@@ -138,7 +138,7 @@ public void resultOfMultiIsContainedInCommandFlux() {
     }
 
     @Test
-    public void resultOfMultiIsContainedInExecObservable() {
+    void resultOfMultiIsContainedInExecObservable() {
 
         commands.multi().toProcessor();
         commands.set("key1", "value1").toProcessor();
diff --git a/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java
index 1b76bc1040..0052294565 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java
@@ -17,6 +17,7 @@
 
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.BitCommandTest;
+import io.lettuce.core.commands.BitStringCodec;
 
 /**
  * @author Mark Paluch
@@ -24,7 +25,7 @@
 public class BitTxCommandTest extends BitCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         bitstring = TxSyncInvocationHandler.sync(client.connect(new BitStringCodec()));
         return TxSyncInvocationHandler.sync(client.connect());
     }
diff --git a/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
index 9e8bc264a4..1bc26d9b52 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core.commands.transactional;
 
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.GeoCommandTest;
@@ -26,46 +26,46 @@
 public class GeoTxCommandTest extends GeoCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return TxSyncInvocationHandler.sync(client.connect());
     }
 
-    @Ignore
+    @Disabled
     @Override
     public void georadiusbymemberWithArgsInTransaction() {
     }
 
-    @Ignore
+    @Disabled
     @Override
     public void geoaddInTransaction() {
     }
 
-    @Ignore
+    @Disabled
     @Override
     public void geoaddMultiInTransaction() {
     }
 
-    @Ignore
+    @Disabled
     @Override
     public void geoposInTransaction() {
     }
 
-    @Ignore
+    @Disabled
     @Override
     public void georadiusWithArgsAndTransaction() {
     }
 
-    @Ignore
+    @Disabled
     @Override
     public void georadiusInTransaction() {
     }
 
-    @Ignore
+    @Disabled
     @Override
     public void geodistInTransaction() {
     }
 
-    @Ignore
+    @Disabled
     @Override
     public void geohashInTransaction() {
     }
diff --git a/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java
index fa2436075f..d3c51a6ef6 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java
@@ -24,7 +24,7 @@
 public class HLLTxCommandTest extends HLLCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return TxSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java
index f89a5d5e34..568968bc2f 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java
@@ -24,7 +24,7 @@
 public class HashTxCommandTest extends HashCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return TxSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java
index 2646366b1f..1c6824af70 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core.commands.transactional;
 
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.commands.KeyCommandTest;
@@ -26,11 +26,11 @@
 public class KeyTxCommandTest extends KeyCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return TxSyncInvocationHandler.sync(client.connect());
     }
 
-    @Ignore
+    @Disabled
     @Override
     public void move() {
     }
diff --git a/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java
index 4139c1aeb4..dc99b1f90d 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java
@@ -24,7 +24,7 @@
 public class ListTxCommandTest extends ListCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return TxSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java
index 0fe7e43200..e55ffc2571 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java
@@ -24,7 +24,7 @@
 public class SetTxCommandTest extends SetCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return TxSyncInvocationHandler.sync(client.connect());
     }
 
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java
index 9ffcb5710b..9ea67e5631 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java
@@ -24,7 +24,7 @@
 public class SortTxCommandTest extends SortCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return TxSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java
index 66cfd39ee1..caa7f54044 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java
@@ -24,7 +24,7 @@
 public class SortedSetTxCommandTest extends SortedSetCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return TxSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java
index 682ad5346b..f60c2fac0d 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java
@@ -24,7 +24,7 @@
 public class StringTxCommandTest extends StringCommandTest {
 
     @Override
-    protected RedisCommands<String, String> connect() {
+    public RedisCommands<String, String> connect() {
         return TxSyncInvocationHandler.sync(client.connect());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java b/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java
index 226a420e20..ab89795692 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java
@@ -30,7 +30,7 @@
  * @param <K>
  * @param <V>
  */
-public class TxSyncInvocationHandler<K, V> extends AbstractInvocationHandler {
+class TxSyncInvocationHandler<K, V> extends AbstractInvocationHandler {
 
     private final Object api;
     private final Method multi;
@@ -38,7 +38,7 @@ public class TxSyncInvocationHandler<K, V> extends AbstractInvocationHandler {
     private final Method exec;
     private final Method ping;
 
-    public TxSyncInvocationHandler(Object api) throws Exception {
+    private TxSyncInvocationHandler(Object api) throws Exception {
 
         this.api = api;
         this.multi = api.getClass().getMethod("multi");
diff --git a/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyTest.java b/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyUnitTests.java
similarity index 69%
rename from src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyTest.java
rename to src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyUnitTests.java
index effed7a622..7675c9a3f2 100644
--- a/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyUnitTests.java
@@ -16,17 +16,20 @@
 package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.when;
 
 import java.util.Collections;
 import java.util.concurrent.Future;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.StringCodec;
@@ -37,8 +40,9 @@
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class BatchExecutableCommandLookupStrategyTest {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class BatchExecutableCommandLookupStrategyUnitTests {
 
     @Mock
     private RedisCommandsMetadata metadata;
@@ -53,8 +57,8 @@ public class BatchExecutableCommandLookupStrategyTest {
 
     private BatchExecutableCommandLookupStrategy sut;
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
         sut = new BatchExecutableCommandLookupStrategy(Collections.singletonList(StringCodec.UTF8), outputFactoryResolver,
                 CommandMethodVerifier.NONE, Batcher.NONE, connection);
 
@@ -62,7 +66,7 @@ public void before() {
     }
 
     @Test
-    public void shouldCreateAsyncBatchCommand() throws Exception {
+    void shouldCreateAsyncBatchCommand() throws Exception {
 
         ExecutableCommand result = sut.resolveCommandMethod(getMethod("async"), metadata);
 
@@ -70,28 +74,30 @@ public void shouldCreateAsyncBatchCommand() throws Exception {
     }
 
     @Test
-    public void shouldCreateSyncBatchCommand() throws Exception {
+    void shouldCreateSyncBatchCommand() throws Exception {
 
         ExecutableCommand result = sut.resolveCommandMethod(getMethod("justVoid"), metadata);
 
         assertThat(result).isInstanceOf(BatchExecutableCommand.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldNotAllowTimeoutParameter() throws Exception {
-        sut.resolveCommandMethod(getMethod("withTimeout", String.class, Timeout.class), metadata);
+    @Test
+    void shouldNotAllowTimeoutParameter() {
+        assertThatThrownBy(() -> sut.resolveCommandMethod(getMethod("withTimeout", String.class, Timeout.class), metadata))
+                .isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldNotAllowSynchronousReturnTypes() throws Exception {
-        sut.resolveCommandMethod(getMethod("withReturnType"), metadata);
+    @Test
+    void shouldNotAllowSynchronousReturnTypes() {
+        assertThatThrownBy(() -> sut.resolveCommandMethod(getMethod("withReturnType"), metadata)).isInstanceOf(
+                IllegalArgumentException.class);
     }
 
     private CommandMethod getMethod(String name, Class<?>... parameterTypes) throws NoSuchMethodException {
         return DeclaredCommandMethod.create(BatchingCommands.class.getDeclaredMethod(name, parameterTypes));
     }
 
-    static interface BatchingCommands {
+    private static interface BatchingCommands {
 
         Future<String> async();
 
diff --git a/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryUnitTests.java
similarity index 91%
rename from src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java
rename to src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryUnitTests.java
index 21f10791f5..2c66042ee3 100644
--- a/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryUnitTests.java
@@ -20,7 +20,7 @@
 
 import java.util.concurrent.Future;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.ScanArgs;
 import io.lettuce.core.SetArgs;
@@ -43,10 +43,10 @@
 /**
  * @author Mark Paluch
  */
-public class CommandSegmentCommandFactoryTest {
+class CommandSegmentCommandFactoryUnitTests {
 
     @Test
-    public void setKeyValue() {
+    void setKeyValue() {
 
         RedisCommand<?, ?, ?> command = createCommand(methodOf(Commands.class, "set", String.class, String.class),
                 new StringCodec(), "key", "value");
@@ -56,7 +56,7 @@ public void setKeyValue() {
     }
 
     @Test
-    public void setKeyValueWithByteArrayCodec() {
+    void setKeyValueWithByteArrayCodec() {
 
         RedisCommand<?, ?, ?> command = createCommand(methodOf(Commands.class, "set", String.class, String.class),
                 new ByteArrayCodec(), "key", "value");
@@ -65,7 +65,7 @@ public void setKeyValueWithByteArrayCodec() {
     }
 
     @Test
-    public void setKeyValueWithHintedValue() {
+    void setKeyValueWithHintedValue() {
 
         RedisCommand<?, ?, ?> command = createCommand(methodOf(Commands.class, "set2", String.class, String.class),
                 new StringCodec(), "key", "value");
@@ -75,7 +75,7 @@ public void setKeyValueWithHintedValue() {
     }
 
     @Test
-    public void lowercaseCommandResolvesToStringCommand() {
+    void lowercaseCommandResolvesToStringCommand() {
 
         RedisCommand<?, ?, ?> command = createCommand(methodOf(Commands.class, "set3", String.class, String.class),
                 new StringCodec(), "key", "value");
@@ -85,7 +85,7 @@ public void lowercaseCommandResolvesToStringCommand() {
     }
 
     @Test
-    public void setWithArgs() {
+    void setWithArgs() {
 
         RedisCommand<?, ?, ?> command = createCommand(
                 methodOf(Commands.class, "set", String.class, String.class, SetArgs.class), new StringCodec(), "key", "value",
@@ -95,7 +95,7 @@ public void setWithArgs() {
     }
 
     @Test
-    public void varargsMethodWithParameterIndexAccess() {
+    void varargsMethodWithParameterIndexAccess() {
 
         RedisCommand<?, ?, ?> command = createCommand(
                 methodOf(Commands.class, "varargsWithParamIndexes", ScanArgs.class, String[].class), new StringCodec(),
@@ -105,7 +105,7 @@ public void varargsMethodWithParameterIndexAccess() {
     }
 
     @Test
-    public void clientSetname() {
+    void clientSetname() {
 
         RedisCommand<?, ?, ?> command = createCommand(methodOf(Commands.class, "clientSetname", String.class),
                 new ByteArrayCodec(), "name");
@@ -114,7 +114,7 @@ public void clientSetname() {
     }
 
     @Test
-    public void annotatedClientSetname() {
+    void annotatedClientSetname() {
 
         RedisCommand<?, ?, ?> command = createCommand(methodOf(Commands.class, "methodWithNamedParameters", String.class),
                 new StringCodec(), "name");
@@ -123,7 +123,7 @@ public void annotatedClientSetname() {
     }
 
     @Test
-    public void asyncWithTimeout() {
+    void asyncWithTimeout() {
 
         try {
             createCommand(methodOf(MethodsWithTimeout.class, "async", String.class, Timeout.class), new StringCodec());
@@ -134,14 +134,14 @@ public void asyncWithTimeout() {
     }
 
     @Test
-    public void syncWithTimeout() {
+    void syncWithTimeout() {
 
         createCommand(methodOf(MethodsWithTimeout.class, "sync", String.class, Timeout.class), new StringCodec(), "hello",
                 null);
     }
 
     @Test
-    public void resolvesUnknownCommandToStringBackedCommandType() {
+    void resolvesUnknownCommandToStringBackedCommandType() {
 
         RedisCommand<?, ?, ?> command = createCommand(methodOf(Commands.class, "unknownCommand"), new StringCodec());
 
@@ -181,7 +181,7 @@ private String toString(RedisCommand<?, ?, ?> command) {
         return builder.toString();
     }
 
-    interface Commands {
+    private interface Commands {
 
         boolean set(String key, String value);
 
@@ -205,7 +205,7 @@ interface Commands {
         boolean unknownCommand();
     }
 
-    static interface MethodsWithTimeout {
+    private static interface MethodsWithTimeout {
 
         Future<String> async(String key, Timeout timeout);
 
diff --git a/src/test/java/io/lettuce/core/dynamic/ConversionServiceTest.java b/src/test/java/io/lettuce/core/dynamic/ConversionServiceUnitTests.java
similarity index 94%
rename from src/test/java/io/lettuce/core/dynamic/ConversionServiceTest.java
rename to src/test/java/io/lettuce/core/dynamic/ConversionServiceUnitTests.java
index 20be9a3cf6..565356f74e 100644
--- a/src/test/java/io/lettuce/core/dynamic/ConversionServiceTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/ConversionServiceUnitTests.java
@@ -20,7 +20,7 @@
 
 import java.util.function.Function;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -29,12 +29,12 @@
 /**
  * @author Mark Paluch
  */
-public class ConversionServiceTest {
+class ConversionServiceUnitTests {
 
     private ConversionService sut = new ConversionService();
 
     @Test
-    public void getConverter() {
+    void getConverter() {
 
         sut.addConverter(new FluxToObservableConverter());
         sut.addConverter(new MonoToObservableConverter());
@@ -51,7 +51,7 @@ public void getConverter() {
     }
 
     @Test
-    public void canConvert() {
+    void canConvert() {
 
         sut.addConverter(new FluxToObservableConverter());
         sut.addConverter(new MonoToObservableConverter());
@@ -61,7 +61,7 @@ public void canConvert() {
     }
 
     @Test
-    public void convert() {
+    void convert() {
 
         sut.addConverter(new FluxToObservableConverter());
         sut.addConverter(new MonoToObservableConverter());
diff --git a/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodTest.java b/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java
similarity index 86%
rename from src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodTest.java
rename to src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java
index 1906f06f65..62bd8c97f8 100644
--- a/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java
@@ -20,17 +20,17 @@
 import java.lang.reflect.Method;
 import java.util.concurrent.Future;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import reactor.core.publisher.Flux;
 
 /**
  * @author Mark Paluch
  */
-public class DeclaredCommandMethodTest {
+class DeclaredCommandMethodUnitTests {
 
     @Test
-    public void shouldResolveConcreteType() throws Exception {
+    void shouldResolveConcreteType() throws Exception {
 
         CommandMethod commandMethod = DeclaredCommandMethod.create(getMethod("getString"));
 
@@ -39,7 +39,7 @@ public void shouldResolveConcreteType() throws Exception {
     }
 
     @Test
-    public void shouldResolveFutureComponentType() throws Exception {
+    void shouldResolveFutureComponentType() throws Exception {
 
         CommandMethod commandMethod = DeclaredCommandMethod.create(getMethod("getFuture"));
 
@@ -48,7 +48,7 @@ public void shouldResolveFutureComponentType() throws Exception {
     }
 
     @Test
-    public void shouldResolveFluxComponentType() throws Exception {
+    void shouldResolveFluxComponentType() throws Exception {
 
         CommandMethod commandMethod = DeclaredCommandMethod.create(getMethod("getFlux"));
 
@@ -60,7 +60,7 @@ private Method getMethod(String name) throws NoSuchMethodException {
         return MyInterface.class.getDeclaredMethod(name);
     }
 
-    static interface MyInterface {
+    private static interface MyInterface {
 
         String getString();
 
diff --git a/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierTest.java b/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java
similarity index 91%
rename from src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierTest.java
rename to src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java
index 2d3b92957c..28ae3a8023 100644
--- a/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java
@@ -21,8 +21,8 @@
 import java.lang.reflect.Method;
 import java.util.Collections;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.GeoCoordinates;
 import io.lettuce.core.KeyValue;
@@ -35,12 +35,12 @@
 /**
  * @author Mark Paluch
  */
-public class DefaultCommandMethodVerifierTest {
+class DefaultCommandMethodVerifierUnitTests {
 
     private DefaultCommandMethodVerifier sut;
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
 
         CommandDetail mget = new CommandDetail("mget", -2, null, 0, 0, 0);
         CommandDetail randomkey = new CommandDetail("randomkey", 1, null, 0, 0, 0);
@@ -52,7 +52,7 @@ public void before() {
     }
 
     @Test
-    public void misspelledName() {
+    void misspelledName() {
 
         try {
             validateMethod("megt");
@@ -63,7 +63,7 @@ public void misspelledName() {
     }
 
     @Test
-    public void tooFewAtLeastParameters() {
+    void tooFewAtLeastParameters() {
 
         try {
             validateMethod("mget");
@@ -75,7 +75,7 @@ public void tooFewAtLeastParameters() {
     }
 
     @Test
-    public void shouldPassWithCorrectParameterCount() {
+    void shouldPassWithCorrectParameterCount() {
 
         validateMethod("mget", String.class);
         validateMethod("randomkey");
@@ -85,7 +85,7 @@ public void shouldPassWithCorrectParameterCount() {
     }
 
     @Test
-    public void tooManyParameters() {
+    void tooManyParameters() {
 
         try {
             validateMethod("rpop", String.class, String.class);
@@ -96,7 +96,7 @@ public void tooManyParameters() {
     }
 
     @Test
-    public void methodDoesNotAcceptParameters() {
+    void methodDoesNotAcceptParameters() {
 
         try {
             validateMethod("randomkey", String.class);
@@ -114,7 +114,7 @@ private void validateMethod(String methodName, Class<?>... parameterTypes) {
         sut.validate(new CommandSegments(Collections.singletonList(CommandSegment.constant(methodName))), commandMethod);
     }
 
-    static interface MyInterface {
+    private static interface MyInterface {
 
         void megt();
 
diff --git a/src/test/java/io/lettuce/core/dynamic/ParameterBinderTest.java b/src/test/java/io/lettuce/core/dynamic/ParameterBinderUnitTests.java
similarity index 68%
rename from src/test/java/io/lettuce/core/dynamic/ParameterBinderTest.java
rename to src/test/java/io/lettuce/core/dynamic/ParameterBinderUnitTests.java
index 25a3f1d6ff..d048ce8c94 100644
--- a/src/test/java/io/lettuce/core/dynamic/ParameterBinderTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/ParameterBinderUnitTests.java
@@ -16,12 +16,13 @@
 package io.lettuce.core.dynamic;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.Collections;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.util.Base64Utils;
 import org.springframework.util.ReflectionUtils;
 
@@ -35,14 +36,14 @@
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class ParameterBinderTest {
+@ExtendWith(MockitoExtension.class)
+class ParameterBinderUnitTests {
 
     private ParameterBinder binder = new ParameterBinder();
     private CommandSegments segments = new CommandSegments(Collections.singletonList(CommandSegment.constant("set")));
 
     @Test
-    public void bindsNullValueAsEmptyByteArray() {
+    void bindsNullValueAsEmptyByteArray() {
 
         CommandArgs<String, String> args = bind(null);
 
@@ -50,7 +51,7 @@ public void bindsNullValueAsEmptyByteArray() {
     }
 
     @Test
-    public void bindsStringCorrectly() {
+    void bindsStringCorrectly() {
 
         CommandArgs<String, String> args = bind("string");
 
@@ -58,7 +59,7 @@ public void bindsStringCorrectly() {
     }
 
     @Test
-    public void bindsStringArrayCorrectly() {
+    void bindsStringArrayCorrectly() {
 
         CommandArgs<String, String> args = bind(new String[] { "arg1", "arg2" });
 
@@ -66,7 +67,7 @@ public void bindsStringArrayCorrectly() {
     }
 
     @Test
-    public void bindsIntArrayCorrectly() {
+    void bindsIntArrayCorrectly() {
 
         CommandArgs<String, String> args = bind(new int[] { 1, 2, 3 });
 
@@ -74,46 +75,46 @@ public void bindsIntArrayCorrectly() {
     }
 
     @Test
-    public void bindsValueCorrectly() {
+    void bindsValueCorrectly() {
 
         CommandArgs<String, String> args = bind(Value.just("string"));
 
         assertThat(args.toCommandString()).isEqualTo("value<string>");
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void rejectsEmptyValue() {
-        bind(Value.empty());
+    @Test
+    void rejectsEmptyValue() {
+        assertThatThrownBy(() -> bind(Value.empty())).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void bindsKeyValueCorrectly() {
+    void bindsKeyValueCorrectly() {
 
         CommandArgs<String, String> args = bind(KeyValue.just("mykey", "string"));
 
         assertThat(args.toCommandString()).isEqualTo("key<mykey> value<string>");
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void rejectsEmptyKeyValue() {
-        bind(KeyValue.empty());
+    @Test
+    void rejectsEmptyKeyValue() {
+        assertThatThrownBy(() -> bind(KeyValue.empty())).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void bindsScoredValueCorrectly() {
+    void bindsScoredValueCorrectly() {
 
         CommandArgs<String, String> args = bind(ScoredValue.just(20, "string"));
 
         assertThat(args.toCommandString()).isEqualTo("20.0 value<string>");
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void rejectsEmptyScoredValue() {
-        bind(ScoredValue.empty());
+    @Test
+    void rejectsEmptyScoredValue() {
+        assertThatThrownBy(() -> bind(ScoredValue.empty())).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void bindsLimitCorrectly() {
+    void bindsLimitCorrectly() {
 
         CommandArgs<String, String> args = bind(Limit.create(10, 100));
 
@@ -121,7 +122,7 @@ public void bindsLimitCorrectly() {
     }
 
     @Test
-    public void bindsRangeCorrectly() {
+    void bindsRangeCorrectly() {
 
         CommandArgs<String, String> args = bind(Range.from(Range.Boundary.including(10), Range.Boundary.excluding(15)));
 
@@ -129,41 +130,44 @@ public void bindsRangeCorrectly() {
     }
 
     @Test
-    public void bindsUnboundedRangeCorrectly() {
+    void bindsUnboundedRangeCorrectly() {
 
         CommandArgs<String, String> args = bind(Range.unbounded());
 
         assertThat(args.toCommandString()).isEqualTo("-inf +inf");
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void rejectsStringLowerValue() {
-        bind(Range.from(Range.Boundary.including("hello"), Range.Boundary.excluding(15)));
+    @Test
+    void rejectsStringLowerValue() {
+        assertThatThrownBy(() -> bind(Range.from(Range.Boundary.including("hello"), Range.Boundary.excluding(15))))
+                .isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void rejectsStringUpperValue() {
-        bind(Range.from(Range.Boundary.including(11), Range.Boundary.excluding("hello")));
+    @Test
+    void rejectsStringUpperValue() {
+        assertThatThrownBy(() -> bind(Range.from(Range.Boundary.including(11), Range.Boundary.excluding("hello"))))
+                .isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void bindsValueRangeCorrectly() {
+    void bindsValueRangeCorrectly() {
 
-        CommandMethod commandMethod = DeclaredCommandMethod.create(
-                ReflectionUtils.findMethod(MyCommands.class, "valueRange", Range.class));
+        CommandMethod commandMethod = DeclaredCommandMethod.create(ReflectionUtils.findMethod(MyCommands.class, "valueRange",
+                Range.class));
 
         CommandArgs<String, String> args = bind(commandMethod,
                 Range.from(Range.Boundary.including("lower"), Range.Boundary.excluding("upper")));
 
-        assertThat(args.toCommandString()).isEqualTo(String.format("%s %s", Base64Utils.encodeToString("[lower".getBytes()),
-                Base64Utils.encodeToString("(upper".getBytes())));
+        assertThat(args.toCommandString()).isEqualTo(
+                String.format("%s %s", Base64Utils.encodeToString("[lower".getBytes()),
+                        Base64Utils.encodeToString("(upper".getBytes())));
     }
 
     @Test
-    public void bindsUnboundedValueRangeCorrectly() {
+    void bindsUnboundedValueRangeCorrectly() {
 
-        CommandMethod commandMethod = DeclaredCommandMethod.create(
-                ReflectionUtils.findMethod(MyCommands.class, "valueRange", Range.class));
+        CommandMethod commandMethod = DeclaredCommandMethod.create(ReflectionUtils.findMethod(MyCommands.class, "valueRange",
+                Range.class));
 
         CommandArgs<String, String> args = bind(commandMethod, Range.unbounded());
 
@@ -172,7 +176,7 @@ public void bindsUnboundedValueRangeCorrectly() {
     }
 
     @Test
-    public void bindsGeoCoordinatesCorrectly() {
+    void bindsGeoCoordinatesCorrectly() {
 
         CommandArgs<String, String> args = bind(new GeoCoordinates(100, 200));
 
@@ -180,7 +184,7 @@ public void bindsGeoCoordinatesCorrectly() {
     }
 
     @Test
-    public void bindsProtocolKeywordCorrectly() {
+    void bindsProtocolKeywordCorrectly() {
 
         CommandArgs<String, String> args = bind(CommandType.LINDEX);
 
@@ -188,8 +192,8 @@ public void bindsProtocolKeywordCorrectly() {
     }
 
     private CommandArgs<String, String> bind(Object object) {
-        CommandMethod commandMethod = DeclaredCommandMethod.create(
-                ReflectionUtils.findMethod(MyCommands.class, "justObject", Object.class));
+        CommandMethod commandMethod = DeclaredCommandMethod.create(ReflectionUtils.findMethod(MyCommands.class, "justObject",
+                Object.class));
         return bind(commandMethod, object);
     }
 
diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java
similarity index 83%
rename from src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
rename to src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java
index a41bd16827..fffc1d2b2d 100644
--- a/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java
@@ -22,11 +22,11 @@
 
 import java.lang.reflect.Method;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.reactivestreams.Publisher;
 
 import io.lettuce.core.codec.StringCodec;
@@ -41,8 +41,8 @@
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class ReactiveCommandSegmentCommandFactoryTest {
+@ExtendWith(MockitoExtension.class)
+class ReactiveCommandSegmentCommandFactoryUnitTests {
 
     @Mock
     private CommandOutputFactoryResolver outputFactoryResolver;
@@ -50,13 +50,13 @@ public class ReactiveCommandSegmentCommandFactoryTest {
     @Mock
     private CommandOutputFactory commandOutputFactory;
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
         when(outputFactoryResolver.resolveCommandOutput(any())).thenReturn(commandOutputFactory);
     }
 
     @Test
-    public void commandCreationWithTimeoutShouldFail() {
+    void commandCreationWithTimeoutShouldFail() {
 
         try {
             createCommand("get", ReactiveWithTimeout.class, String.class, Timeout.class);
@@ -66,7 +66,7 @@ public void commandCreationWithTimeoutShouldFail() {
         }
     }
 
-    protected RedisCommand<?, ?, ?> createCommand(String methodName, Class<?> interfaceClass, Class<?>... parameterTypes) {
+    RedisCommand<?, ?, ?> createCommand(String methodName, Class<?> interfaceClass, Class<?>... parameterTypes) {
 
         Method method = ReflectionUtils.findMethod(interfaceClass, methodName, parameterTypes);
 
@@ -81,7 +81,7 @@ public void commandCreationWithTimeoutShouldFail() {
         return factory.createCommand(null);
     }
 
-    static interface ReactiveWithTimeout {
+    private static interface ReactiveWithTimeout {
 
         Publisher<String> get(String key, Timeout timeout);
     }
diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersTest.java b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java
similarity index 76%
rename from src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersTest.java
rename to src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java
index 0aeabfd5ea..de60ef8f1a 100644
--- a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java
@@ -17,8 +17,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.reactivestreams.Publisher;
 
 import reactor.core.publisher.Flux;
@@ -29,129 +29,129 @@
 /**
  * @author Mark Paluch
  */
-public class ReactiveTypeAdaptersTest {
+class ReactiveTypeAdaptersUnitTests {
 
-    ConversionService conversionService = new ConversionService();
+    private ConversionService conversionService = new ConversionService();
 
-    @Before
-    public void before() throws Exception {
+    @BeforeEach
+    void before() {
         ReactiveTypeAdapters.registerIn(conversionService);
     }
 
     @Test
-    public void toWrapperShouldCastMonoToMono() {
+    void toWrapperShouldCastMonoToMono() {
 
         Mono<String> foo = Mono.just("foo");
         assertThat(conversionService.convert(foo, Mono.class)).isSameAs(foo);
     }
 
     @Test
-    public void toWrapperShouldConvertMonoToRxJava1Single() {
+    void toWrapperShouldConvertMonoToRxJava1Single() {
 
         Mono<String> foo = Mono.just("foo");
         assertThat(conversionService.convert(foo, Single.class)).isInstanceOf(Single.class);
     }
 
     @Test
-    public void toWrapperShouldConvertMonoToRxJava2Single() {
+    void toWrapperShouldConvertMonoToRxJava2Single() {
 
         Mono<String> foo = Mono.just("foo");
         assertThat(conversionService.convert(foo, io.reactivex.Single.class)).isInstanceOf(io.reactivex.Single.class);
     }
 
     @Test
-    public void toWrapperShouldConvertRxJava2SingleToMono() {
+    void toWrapperShouldConvertRxJava2SingleToMono() {
 
         io.reactivex.Single<String> foo = io.reactivex.Single.just("foo");
         assertThat(conversionService.convert(foo, Mono.class)).isInstanceOf(Mono.class);
     }
 
     @Test
-    public void toWrapperShouldConvertRxJava2SingleToPublisher() {
+    void toWrapperShouldConvertRxJava2SingleToPublisher() {
 
         io.reactivex.Single<String> foo = io.reactivex.Single.just("foo");
         assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Publisher.class);
     }
 
     @Test
-    public void toWrapperShouldConvertRxJava2MaybeToMono() {
+    void toWrapperShouldConvertRxJava2MaybeToMono() {
 
         io.reactivex.Maybe<String> foo = io.reactivex.Maybe.just("foo");
         assertThat(conversionService.convert(foo, Mono.class)).isInstanceOf(Mono.class);
     }
 
     @Test
-    public void toWrapperShouldConvertRxJava2MaybeToFlux() {
+    void toWrapperShouldConvertRxJava2MaybeToFlux() {
 
         io.reactivex.Maybe<String> foo = io.reactivex.Maybe.just("foo");
         assertThat(conversionService.convert(foo, Flux.class)).isInstanceOf(Flux.class);
     }
 
     @Test
-    public void toWrapperShouldConvertRxJava2MaybeToPublisher() {
+    void toWrapperShouldConvertRxJava2MaybeToPublisher() {
 
         io.reactivex.Maybe<String> foo = io.reactivex.Maybe.just("foo");
         assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Publisher.class);
     }
 
     @Test
-    public void toWrapperShouldConvertRxJava2FlowableToMono() {
+    void toWrapperShouldConvertRxJava2FlowableToMono() {
 
         io.reactivex.Flowable<String> foo = io.reactivex.Flowable.just("foo");
         assertThat(conversionService.convert(foo, Mono.class)).isInstanceOf(Mono.class);
     }
 
     @Test
-    public void toWrapperShouldConvertRxJava2FlowableToFlux() {
+    void toWrapperShouldConvertRxJava2FlowableToFlux() {
 
         io.reactivex.Flowable<String> foo = io.reactivex.Flowable.just("foo");
         assertThat(conversionService.convert(foo, Flux.class)).isInstanceOf(Flux.class);
     }
 
     @Test
-    public void toWrapperShouldCastRxJava2FlowableToPublisher() {
+    void toWrapperShouldCastRxJava2FlowableToPublisher() {
 
         io.reactivex.Flowable<String> foo = io.reactivex.Flowable.just("foo");
         assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Publisher.class);
     }
 
     @Test
-    public void toWrapperShouldConvertRxJava2ObservableToMono() {
+    void toWrapperShouldConvertRxJava2ObservableToMono() {
 
         io.reactivex.Observable<String> foo = io.reactivex.Observable.just("foo");
         assertThat(conversionService.convert(foo, Mono.class)).isInstanceOf(Mono.class);
     }
 
     @Test
-    public void toWrapperShouldConvertRxJava2ObservableToFlux() {
+    void toWrapperShouldConvertRxJava2ObservableToFlux() {
 
         io.reactivex.Observable<String> foo = io.reactivex.Observable.just("foo");
         assertThat(conversionService.convert(foo, Flux.class)).isInstanceOf(Flux.class);
     }
 
     @Test
-    public void toWrapperShouldConvertRxJava2ObservableToSingle() {
+    void toWrapperShouldConvertRxJava2ObservableToSingle() {
 
         io.reactivex.Observable<String> foo = io.reactivex.Observable.just("foo");
         assertThat(conversionService.convert(foo, io.reactivex.Single.class)).isInstanceOf(io.reactivex.Single.class);
     }
 
     @Test
-    public void toWrapperShouldConvertRxJava2ObservableToMaybe() {
+    void toWrapperShouldConvertRxJava2ObservableToMaybe() {
 
         io.reactivex.Observable<String> foo = io.reactivex.Observable.empty();
         assertThat(conversionService.convert(foo, Maybe.class)).isInstanceOf(Maybe.class);
     }
 
     @Test
-    public void toWrapperShouldConvertRxJava2ObservableToPublisher() {
+    void toWrapperShouldConvertRxJava2ObservableToPublisher() {
 
         io.reactivex.Observable<String> foo = io.reactivex.Observable.just("foo");
         assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Publisher.class);
     }
 
     @Test
-    public void toWrapperShouldConvertMonoToFlux() {
+    void toWrapperShouldConvertMonoToFlux() {
 
         Mono<String> foo = Mono.just("foo");
         assertThat(conversionService.convert(foo, Flux.class)).isInstanceOf(Flux.class);
diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionTest.java b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java
similarity index 72%
rename from src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionTest.java
rename to src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java
index f088fa7073..051b1feb36 100644
--- a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java
@@ -17,69 +17,83 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Before;
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import rx.Observable;
 import rx.Single;
-import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.TestSupport;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.dynamic.annotation.Command;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class ReactiveTypeAdaptionTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+class ReactiveTypeAdaptionIntegrationTests extends TestSupport {
 
-    private RxJava1Types rxjava1;
-    private RxJava2Types rxjava2;
+    private final RedisCommands<String, String> redis;
 
-    @Before
-    public void before() throws Exception {
+    private final RxJava1Types rxjava1;
+    private final RxJava2Types rxjava2;
 
-        redis.set(key, value);
+    @Inject
+    ReactiveTypeAdaptionIntegrationTests(StatefulRedisConnection<String, String> connection) {
+
+        this.redis = connection.sync();
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
         this.rxjava1 = factory.getCommands(RxJava1Types.class);
         this.rxjava2 = factory.getCommands(RxJava2Types.class);
     }
 
+    @BeforeEach
+    void setUp() {
+        redis.set(key, value);
+    }
+
     @Test
-    public void rxJava1Single() throws Exception {
+    void rxJava1Single() {
 
         Single<String> single = rxjava1.getRxJava1Single(key);
         assertThat(single.toBlocking().value()).isEqualTo(value);
     }
 
     @Test
-    public void rxJava1Observable() throws Exception {
+    void rxJava1Observable() {
 
         Observable<String> observable = rxjava1.getRxJava1Observable(key);
         assertThat(observable.toBlocking().last()).isEqualTo(value);
     }
 
     @Test
-    public void rxJava2Single() throws Exception {
+    void rxJava2Single() throws InterruptedException {
 
         io.reactivex.Single<String> single = rxjava2.getRxJava2Single(key);
         single.test().await().assertResult(value).assertComplete();
     }
 
     @Test
-    public void rxJava2Maybe() throws Exception {
+    void rxJava2Maybe() throws InterruptedException {
 
         io.reactivex.Maybe<String> maybe = rxjava2.getRxJava2Maybe(key);
         maybe.test().await().assertResult(value).assertComplete();
     }
 
     @Test
-    public void rxJava2Observable() throws Exception {
+    void rxJava2Observable() throws InterruptedException {
 
         io.reactivex.Observable<String> observable = rxjava2.getRxJava2Observable(key);
         observable.test().await().assertResult(value).assertComplete();
     }
 
     @Test
-    public void rxJava2Flowable() throws Exception {
+    void rxJava2Flowable() throws InterruptedException {
 
         io.reactivex.Flowable<String> flowable = rxjava2.getRxJava2Flowable(key);
         flowable.test().await().assertResult(value).assertComplete();
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncIntegrationTests.java
similarity index 67%
rename from src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncTest.java
rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncIntegrationTests.java
index 362fc59b6f..5ba7258403 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncIntegrationTests.java
@@ -20,17 +20,31 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 
-import org.junit.Test;
+import javax.inject.Inject;
 
-import io.lettuce.core.AbstractRedisClientTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.lettuce.core.TestSupport;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class RedisCommandsAsyncTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+class RedisCommandsAsyncIntegrationTests extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    RedisCommandsAsyncIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        this.redis = connection.sync();
+    }
 
     @Test
-    public void async() throws Exception {
+    void async() {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
@@ -38,7 +52,6 @@ public void async() throws Exception {
 
         Future<String> set = api.set(key, value);
         assertThat(set).isInstanceOf(CompletableFuture.class);
-        set.get();
     }
 
     static interface MultipleExecutionModels extends Commands {
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java
similarity index 84%
rename from src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingTest.java
rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java
index 0800995500..e268149370 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java
@@ -20,25 +20,40 @@
 
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.LettuceFutures;
 import io.lettuce.core.RedisCommandExecutionException;
 import io.lettuce.core.RedisFuture;
+import io.lettuce.core.TestSupport;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.dynamic.annotation.Command;
 import io.lettuce.core.dynamic.batch.BatchException;
 import io.lettuce.core.dynamic.batch.BatchExecutor;
 import io.lettuce.core.dynamic.batch.BatchSize;
 import io.lettuce.core.dynamic.batch.CommandBatching;
+import io.lettuce.test.Futures;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class RedisCommandsBatchingTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+class RedisCommandsBatchingIntegrationTests extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    RedisCommandsBatchingIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        this.redis = connection.sync();
+    }
 
     @Test
-    public void selectiveBatching() {
+    void selectiveBatching() {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
@@ -60,7 +75,7 @@ public void selectiveBatching() {
     }
 
     @Test
-    public void selectiveBatchingShouldHandleErrors() {
+    void selectiveBatchingShouldHandleErrors() {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
@@ -79,7 +94,7 @@ public void selectiveBatchingShouldHandleErrors() {
     }
 
     @Test
-    public void shouldExecuteBatchingSynchronously() {
+    void shouldExecuteBatchingSynchronously() {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
@@ -97,7 +112,7 @@ public void shouldExecuteBatchingSynchronously() {
     }
 
     @Test
-    public void shouldHandleSynchronousBatchErrors() {
+    void shouldHandleSynchronousBatchErrors() {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
@@ -125,7 +140,7 @@ public void shouldHandleSynchronousBatchErrors() {
     }
 
     @Test
-    public void shouldExecuteBatchingAynchronously() throws Exception {
+    void shouldExecuteBatchingAynchronously() {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
@@ -137,13 +152,13 @@ public void shouldExecuteBatchingAynchronously() throws Exception {
         api.setAsync("k4", value);
 
         assertThat(redis.get("k1")).isNull();
-        assertThat(api.setAsync("k5", value).get()).isEqualTo("OK");
+        assertThat(Futures.get(api.setAsync("k5", value))).isEqualTo("OK");
 
         assertThat(redis.get("k1")).isEqualTo(value);
     }
 
     @Test
-    public void shouldHandleAsynchronousBatchErrors() throws Exception {
+    void shouldHandleAsynchronousBatchErrors() throws Exception {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
index ae6fdfc60e..734e0db466 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
@@ -22,10 +22,8 @@
 
 import org.junit.*;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.core.AbstractTest;
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.Value;
 import io.lettuce.core.cluster.ClusterRule;
 import io.lettuce.core.cluster.RedisClusterClient;
@@ -33,18 +31,20 @@
 import io.lettuce.core.dynamic.annotation.Command;
 import io.lettuce.core.dynamic.domain.Timeout;
 import io.lettuce.core.internal.LettuceLists;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
 
 /**
  * @author Mark Paluch
  */
-public class RedisCommandsClusterSyncTest extends AbstractTest {
+public class RedisCommandsClusterSyncTest extends TestSupport {
 
-    public static final int port1 = 7379;
-    public static final int port2 = port1 + 1;
-    public static final int port3 = port1 + 2;
-    public static final int port4 = port1 + 3;
+    private static final int port1 = 7379;
+    private static final int port2 = port1 + 1;
+    private static final int port3 = port1 + 2;
+    private static final int port4 = port1 + 3;
 
-    protected static RedisClusterClient clusterClient;
+    private static RedisClusterClient clusterClient;
 
     @Rule
     public ClusterRule clusterRule = new ClusterRule(clusterClient, port1, port2, port3, port4);
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java
similarity index 77%
rename from src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java
rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java
index 943c79c0fa..e5693b95eb 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java
@@ -20,21 +20,33 @@
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.when;
 
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
-import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class RedisCommandsTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+class RedisCommandsIntegrationTests extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    RedisCommandsIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        this.redis = connection.sync();
+    }
 
     @Test
-    public void verifierShouldCatchMisspelledDeclarations() {
+    void verifierShouldCatchMisspelledDeclarations() {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
@@ -48,7 +60,7 @@ public void verifierShouldCatchMisspelledDeclarations() {
     }
 
     @Test
-    public void disabledVerifierDoesNotReportTypo() {
+    void disabledVerifierDoesNotReportTypo() {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
         factory.setVerifyCommandMethods(false);
@@ -57,7 +69,7 @@ public void disabledVerifierDoesNotReportTypo() {
     }
 
     @Test
-    public void doesNotFailIfCommandRetrievalFails() {
+    void doesNotFailIfCommandRetrievalFails() {
 
         StatefulRedisConnection connectionMock = Mockito.mock(StatefulRedisConnection.class);
         RedisCommands commandsMock = Mockito.mock(RedisCommands.class);
@@ -71,7 +83,7 @@ public void doesNotFailIfCommandRetrievalFails() {
     }
 
     @Test
-    public void verifierShouldCatchTooFewParametersDeclarations() {
+    void verifierShouldCatchTooFewParametersDeclarations() {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
@@ -83,13 +95,13 @@ public void verifierShouldCatchTooFewParametersDeclarations() {
         }
     }
 
-    interface TooFewParameters extends Commands {
+    private interface TooFewParameters extends Commands {
 
         String get();
 
     }
 
-    interface WithTypo extends Commands {
+    private interface WithTypo extends Commands {
 
         String gat(String key);
 
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java
similarity index 66%
rename from src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveTest.java
rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java
index 80e3ee201f..72ef977eee 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java
@@ -15,20 +15,34 @@
  */
 package io.lettuce.core.dynamic;
 
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
-import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.TestSupport;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.dynamic.annotation.Command;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class RedisCommandsReactiveTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+class RedisCommandsReactiveIntegrationTests extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    RedisCommandsReactiveIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        this.redis = connection.sync();
+    }
 
     @Test
-    public void reactive() throws Exception {
+    void reactive() {
 
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
 
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java
similarity index 81%
rename from src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java
rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java
index 8f3e5cbd84..22d68650c0 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java
@@ -21,22 +21,38 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import javax.inject.Inject;
 
-import io.lettuce.core.AbstractRedisClientTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.Value;
 import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.ByteArrayCodec;
 import io.lettuce.core.dynamic.annotation.Command;
 import io.lettuce.core.dynamic.domain.Timeout;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class RedisCommandsSyncTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+class RedisCommandsSyncIntegrationTests extends TestSupport {
+
+    private final RedisClient client;
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    RedisCommandsSyncIntegrationTests(RedisClient client, StatefulRedisConnection<String, String> connection) {
+        this.client = client;
+        this.redis = connection.sync();
+    }
 
     @Test
-    public void sync() {
+    void sync() {
 
         StatefulRedisConnection<byte[], byte[]> connection = client.connect(ByteArrayCodec.INSTANCE);
         RedisCommandFactory factory = new RedisCommandFactory(connection);
@@ -51,7 +67,7 @@ public void sync() {
     }
 
     @Test
-    public void defaultMethod() {
+    void defaultMethod() {
 
         StatefulRedisConnection<byte[], byte[]> connection = client.connect(ByteArrayCodec.INSTANCE);
         RedisCommandFactory factory = new RedisCommandFactory(connection);
@@ -66,7 +82,7 @@ public void defaultMethod() {
     }
 
     @Test
-    public void mgetAsValues() {
+    void mgetAsValues() {
 
         redis.set(key, value);
 
@@ -81,7 +97,7 @@ public void mgetAsValues() {
     }
 
     @Test
-    public void mgetByteArray() {
+    void mgetByteArray() {
 
         redis.set(key, value);
 
diff --git a/src/test/java/io/lettuce/core/dynamic/SimpleBatcherTest.java b/src/test/java/io/lettuce/core/dynamic/SimpleBatcherUnitTests.java
similarity index 91%
rename from src/test/java/io/lettuce/core/dynamic/SimpleBatcherTest.java
rename to src/test/java/io/lettuce/core/dynamic/SimpleBatcherUnitTests.java
index cf4b8ff5c1..44efddd02d 100644
--- a/src/test/java/io/lettuce/core/dynamic/SimpleBatcherTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/SimpleBatcherUnitTests.java
@@ -21,10 +21,10 @@
 
 import java.util.Arrays;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.dynamic.batch.CommandBatching;
@@ -36,14 +36,14 @@
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class SimpleBatcherTest {
+@ExtendWith(MockitoExtension.class)
+class SimpleBatcherUnitTests {
 
     @Mock
     private StatefulConnection<Object, Object> connection;
 
     @Test
-    public void shouldBatchWithDefaultSize() {
+    void shouldBatchWithDefaultSize() {
 
         RedisCommand<Object, Object, Object> c1 = createCommand();
         RedisCommand<Object, Object, Object> c2 = createCommand();
@@ -67,7 +67,7 @@ public void shouldBatchWithDefaultSize() {
     }
 
     @Test
-    public void shouldBatchWithoutSize() {
+    void shouldBatchWithoutSize() {
 
         RedisCommand<Object, Object, Object> c1 = createCommand();
         RedisCommand<Object, Object, Object> c2 = createCommand();
@@ -84,7 +84,7 @@ public void shouldBatchWithoutSize() {
     }
 
     @Test
-    public void shouldBatchWithBatchControlQueue() {
+    void shouldBatchWithBatchControlQueue() {
 
         RedisCommand<Object, Object, Object> c1 = createCommand();
         RedisCommand<Object, Object, Object> c2 = createCommand();
@@ -103,7 +103,7 @@ public void shouldBatchWithBatchControlQueue() {
     }
 
     @Test
-    public void shouldBatchWithBatchControlQueueOverqueue() {
+    void shouldBatchWithBatchControlQueueOverqueue() {
 
         RedisCommand<Object, Object, Object> c1 = createCommand();
         RedisCommand<Object, Object, Object> c2 = createCommand();
@@ -126,7 +126,7 @@ public void shouldBatchWithBatchControlQueueOverqueue() {
     }
 
     @Test
-    public void shouldBatchWithBatchControlFlush() {
+    void shouldBatchWithBatchControlFlush() {
 
         RedisCommand<Object, Object, Object> c1 = createCommand();
         RedisCommand<Object, Object, Object> c2 = createCommand();
diff --git a/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverTest.java b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java
similarity index 87%
rename from src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverTest.java
rename to src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java
index f782d4bdef..3eeb2cdcbc 100644
--- a/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.dynamic.codec;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -23,7 +24,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.Range;
 import io.lettuce.core.codec.ByteArrayCodec;
@@ -38,12 +39,12 @@
 /**
  * @author Mark Paluch
  */
-public class AnnotationRedisCodecResolverTest {
+class AnnotationRedisCodecResolverUnitTests {
 
     private List<RedisCodec<?, ?>> codecs = Arrays.asList(new StringCodec(), new ByteArrayCodec());
 
     @Test
-    public void shouldResolveFullyHinted() {
+    void shouldResolveFullyHinted() {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "stringOnly", String.class, String.class);
         RedisCodec<?, ?> codec = resolve(method);
@@ -52,7 +53,7 @@ public void shouldResolveFullyHinted() {
     }
 
     @Test
-    public void shouldResolveHintedKey() {
+    void shouldResolveHintedKey() {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "annotatedKey", String.class, String.class);
         RedisCodec<?, ?> codec = resolve(method);
@@ -61,7 +62,7 @@ public void shouldResolveHintedKey() {
     }
 
     @Test
-    public void shouldResolveHintedValue() {
+    void shouldResolveHintedValue() {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "annotatedValue", String.class, String.class);
         RedisCodec<?, ?> codec = resolve(method);
@@ -70,7 +71,7 @@ public void shouldResolveHintedValue() {
     }
 
     @Test
-    public void shouldResolveWithoutHints() {
+    void shouldResolveWithoutHints() {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "nothingAnnotated", String.class, String.class);
         RedisCodec<?, ?> codec = resolve(method);
@@ -79,7 +80,7 @@ public void shouldResolveWithoutHints() {
     }
 
     @Test
-    public void shouldResolveHintedByteArrayValue() {
+    void shouldResolveHintedByteArrayValue() {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "annotatedByteArrayValue", String.class, byte[].class);
         RedisCodec<?, ?> codec = resolve(method);
@@ -87,15 +88,15 @@ public void shouldResolveHintedByteArrayValue() {
         assertThat(codec).isInstanceOf(ByteArrayCodec.class);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void resolutionShouldFail() {
+    @Test
+    void resolutionShouldFail() {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "mixedTypes", String.class, byte[].class);
-        resolve(method);
+        assertThatThrownBy(() -> resolve(method)).isInstanceOf(IllegalStateException. class);
     }
 
     @Test
-    public void shouldDiscoverCodecTypesFromWrappers() {
+    void shouldDiscoverCodecTypesFromWrappers() {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "withWrappers", Range.class,
                 io.lettuce.core.Value.class);
@@ -106,7 +107,7 @@ public void shouldDiscoverCodecTypesFromWrappers() {
         assertThat(types).contains(String.class, Number.class);
     }
 
-    protected RedisCodec<?, ?> resolve(Method method) {
+    RedisCodec<?, ?> resolve(Method method) {
 
         CommandMethod commandMethod = DeclaredCommandMethod.create(method);
         AnnotationRedisCodecResolver resolver = new AnnotationRedisCodecResolver(codecs);
diff --git a/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersTest.java b/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersUnitTests.java
similarity index 92%
rename from src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersTest.java
rename to src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersUnitTests.java
index 143da6053f..d5a98b9153 100644
--- a/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersUnitTests.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.Range;
@@ -34,10 +34,10 @@
 /**
  * @author Mark Paluch
  */
-public class ParameterWrappersTest {
+class ParameterWrappersUnitTests {
 
     @Test
-    public void shouldReturnValueTypeForRange() {
+    void shouldReturnValueTypeForRange() {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "range", Range.class);
 
@@ -50,7 +50,7 @@ public void shouldReturnValueTypeForRange() {
     }
 
     @Test
-    public void shouldReturnValueTypeForValue() {
+    void shouldReturnValueTypeForValue() {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "value", Value.class);
 
@@ -62,7 +62,7 @@ public void shouldReturnValueTypeForValue() {
     }
 
     @Test
-    public void shouldReturnValueTypeForKeyValue() {
+    void shouldReturnValueTypeForKeyValue() {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "keyValue", KeyValue.class);
 
@@ -76,7 +76,7 @@ public void shouldReturnValueTypeForKeyValue() {
     }
 
     @Test
-    public void shouldReturnValueTypeForArray() {
+    void shouldReturnValueTypeForArray() {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "array", String[].class);
 
@@ -88,7 +88,7 @@ public void shouldReturnValueTypeForArray() {
     }
 
     @Test
-    public void shouldNotSupportByteArray() {
+    void shouldNotSupportByteArray() {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "byteArray", byte[].class);
 
@@ -98,7 +98,7 @@ public void shouldNotSupportByteArray() {
     }
 
     @Test
-    public void shouldReturnValueTypeForList() {
+    void shouldReturnValueTypeForList() {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "withList", List.class);
 
@@ -111,7 +111,7 @@ public void shouldReturnValueTypeForList() {
     }
 
     @Test
-    public void shouldReturnValueTypeForMap() {
+    void shouldReturnValueTypeForMap() {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "withMap", Map.class);
 
diff --git a/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryUnitTests.java
similarity index 88%
rename from src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryTest.java
rename to src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryUnitTests.java
index 871fc77e5d..0b8da9a834 100644
--- a/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryUnitTests.java
@@ -17,15 +17,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class InvocationProxyFactoryTest {
+class InvocationProxyFactoryUnitTests {
 
     @Test
-    public void shouldDelegateCallsToInterceptor() {
+    void shouldDelegateCallsToInterceptor() {
 
         InvocationProxyFactory factory = new InvocationProxyFactory();
         factory.addInterface(TargetWithBooleanMethod.class);
@@ -37,7 +37,7 @@ public void shouldDelegateCallsToInterceptor() {
     }
 
     @Test
-    public void shouldNotFailWithoutFurtherInterceptors() {
+    void shouldNotFailWithoutFurtherInterceptors() {
 
         InvocationProxyFactory factory = new InvocationProxyFactory();
         factory.addInterface(TargetWithBooleanMethod.class);
@@ -48,7 +48,7 @@ public void shouldNotFailWithoutFurtherInterceptors() {
     }
 
     @Test
-    public void shouldCallInterceptorsInOrder() throws InterruptedException {
+    void shouldCallInterceptorsInOrder() {
 
         InvocationProxyFactory factory = new InvocationProxyFactory();
         factory.addInterface(TargetWithStringMethod.class);
@@ -70,7 +70,7 @@ private static class ReturnValue implements MethodInterceptor {
 
         private final Object value;
 
-        public ReturnValue(Object value) {
+        ReturnValue(Object value) {
             this.value = value;
         }
 
@@ -89,7 +89,7 @@ private static class StringAppendingMethodInterceptor implements MethodIntercept
 
         private final String toAppend;
 
-        public StringAppendingMethodInterceptor(String toAppend) {
+        StringAppendingMethodInterceptor(String toAppend) {
             this.toAppend = toAppend;
         }
 
diff --git a/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverTest.java b/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverUnitTests.java
similarity index 89%
rename from src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverTest.java
rename to src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverUnitTests.java
index d555caa29a..16dc8361c5 100644
--- a/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverUnitTests.java
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.dynamic.CommandMethod;
@@ -33,13 +33,13 @@
 /**
  * @author Mark Paluch
  */
-public class CodecAwareOutputResolverTest {
+class CodecAwareOutputResolverUnitTests {
 
     private CodecAwareOutputFactoryResolver resolver = new CodecAwareOutputFactoryResolver(
             new OutputRegistryCommandOutputFactoryResolver(new OutputRegistry()), new ByteBufferAndStringCodec());
 
     @Test
-    public void shouldResolveValueOutput() {
+    void shouldResolveValueOutput() {
 
         CommandOutput<?, ?, ?> commandOutput = getCommandOutput("string");
 
@@ -47,14 +47,14 @@ public void shouldResolveValueOutput() {
     }
 
     @Test
-    public void shouldResolveValueListOutput() {
+    void shouldResolveValueListOutput() {
 
         assertThat(getCommandOutput("stringList")).isOfAnyClassIn(ValueListOutput.class, StringListOutput.class);
         assertThat(getCommandOutput("charSequenceList")).isOfAnyClassIn(ValueListOutput.class, StringListOutput.class);
     }
 
     @Test
-    public void shouldResolveKeyOutput() {
+    void shouldResolveKeyOutput() {
 
         CommandOutput<?, ?, ?> commandOutput = getCommandOutput("byteBuffer");
 
@@ -62,7 +62,7 @@ public void shouldResolveKeyOutput() {
     }
 
     @Test
-    public void shouldResolveKeyListOutput() {
+    void shouldResolveKeyListOutput() {
 
         CommandOutput<?, ?, ?> commandOutput = getCommandOutput("byteBufferList");
 
@@ -70,7 +70,7 @@ public void shouldResolveKeyListOutput() {
     }
 
     @Test
-    public void shouldResolveListOfMapsOutput() {
+    void shouldResolveListOfMapsOutput() {
 
         CommandOutput<?, ?, ?> commandOutput = getCommandOutput("listOfMapsOutput");
 
@@ -78,14 +78,14 @@ public void shouldResolveListOfMapsOutput() {
     }
 
     @Test
-    public void shouldResolveMapsOutput() {
+    void shouldResolveMapsOutput() {
 
         CommandOutput<?, ?, ?> commandOutput = getCommandOutput("mapOutput");
 
         assertThat(commandOutput).isInstanceOf(MapOutput.class);
     }
 
-    protected CommandOutput<?, ?, ?> getCommandOutput(String methodName) {
+    CommandOutput<?, ?, ?> getCommandOutput(String methodName) {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, methodName);
         CommandMethod commandMethod = DeclaredCommandMethod.create(method);
diff --git a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java
similarity index 85%
rename from src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
rename to src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java
index 59b10852fa..9a2b41418a 100644
--- a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java
@@ -21,7 +21,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.GeoCoordinates;
 import io.lettuce.core.ScoredValue;
@@ -34,27 +34,27 @@
 /**
  * @author Mark Paluch
  */
-public class OutputRegistryCommandOutputFactoryResolverTest {
+class OutputRegistryCommandOutputFactoryResolverUnitTests {
 
     private OutputRegistryCommandOutputFactoryResolver resolver = new OutputRegistryCommandOutputFactoryResolver(
             new OutputRegistry());
 
     @Test
-    public void shouldResolveStringListOutput() {
+    void shouldResolveStringListOutput() {
 
         assertThat(getCommandOutput("stringList")).isInstanceOf(KeyListOutput.class);
         assertThat(getCommandOutput("stringIterable")).isInstanceOf(KeyListOutput.class);
     }
 
     @Test
-    public void shouldResolveVoidOutput() {
+    void shouldResolveVoidOutput() {
 
         assertThat(getCommandOutput("voidMethod")).isInstanceOf(VoidOutput.class);
         assertThat(getCommandOutput("voidWrapper")).isInstanceOf(VoidOutput.class);
     }
 
     @Test
-    public void shouldResolveStringValueListOutput() {
+    void shouldResolveStringValueListOutput() {
 
         CommandOutput<?, ?, ?> commandOutput = getCommandOutput("stringValueCollection");
 
@@ -62,7 +62,7 @@ public void shouldResolveStringValueListOutput() {
     }
 
     @Test
-    public void shouldResolveStringScoredValueListOutput() {
+    void shouldResolveStringScoredValueListOutput() {
 
         CommandOutput<?, ?, ?> commandOutput = getCommandOutput("stringScoredValueList");
 
@@ -70,7 +70,7 @@ public void shouldResolveStringScoredValueListOutput() {
     }
 
     @Test
-    public void shouldResolveGeoCoordinatesValueOutput() {
+    void shouldResolveGeoCoordinatesValueOutput() {
 
         CommandOutput<?, ?, ?> commandOutput = getCommandOutput("geoCoordinatesValueList");
 
@@ -78,7 +78,7 @@ public void shouldResolveGeoCoordinatesValueOutput() {
     }
 
     @Test
-    public void shouldResolveByteArrayOutput() {
+    void shouldResolveByteArrayOutput() {
 
         CommandOutput<?, ?, ?> commandOutput = getCommandOutput("bytes");
 
@@ -86,7 +86,7 @@ public void shouldResolveByteArrayOutput() {
     }
 
     @Test
-    public void shouldResolveBooleanOutput() {
+    void shouldResolveBooleanOutput() {
 
         CommandOutput<?, ?, ?> commandOutput = getCommandOutput("bool");
 
@@ -94,7 +94,7 @@ public void shouldResolveBooleanOutput() {
     }
 
     @Test
-    public void shouldResolveBooleanWrappedOutput() {
+    void shouldResolveBooleanWrappedOutput() {
 
         CommandOutput<?, ?, ?> commandOutput = getCommandOutput("boolWrapper");
 
@@ -102,7 +102,7 @@ public void shouldResolveBooleanWrappedOutput() {
     }
 
     @Test
-    public void shouldResolveBooleanListOutput() {
+    void shouldResolveBooleanListOutput() {
 
         CommandOutput<?, ?, ?> commandOutput = getCommandOutput("boolList");
 
@@ -110,7 +110,7 @@ public void shouldResolveBooleanListOutput() {
     }
 
     @Test
-    public void shouldResolveListOfMapsOutput() {
+    void shouldResolveListOfMapsOutput() {
 
         CommandOutput<?, ?, ?> commandOutput = getCommandOutput("listOfMapsOutput");
 
@@ -118,7 +118,7 @@ public void shouldResolveListOfMapsOutput() {
     }
 
     @Test
-    public void stringValueCollectionIsAssignableFromStringValueListOutput() {
+    void stringValueCollectionIsAssignableFromStringValueListOutput() {
 
         OutputSelector selector = getOutputSelector("stringValueCollection");
 
@@ -128,7 +128,7 @@ public void stringValueCollectionIsAssignableFromStringValueListOutput() {
     }
 
     @Test
-    public void stringWildcardValueCollectionIsAssignableFromOutputs() {
+    void stringWildcardValueCollectionIsAssignableFromOutputs() {
 
         OutputSelector selector = getOutputSelector("stringValueCollection");
 
@@ -140,7 +140,7 @@ public void stringWildcardValueCollectionIsAssignableFromOutputs() {
 
     }
 
-    protected CommandOutput<?, ?, ?> getCommandOutput(String methodName) {
+    CommandOutput<?, ?, ?> getCommandOutput(String methodName) {
 
         OutputSelector outputSelector = getOutputSelector(methodName);
         CommandOutputFactory factory = resolver.resolveCommandOutput(outputSelector);
diff --git a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryUnitTests.java
similarity index 82%
rename from src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java
rename to src/test/java/io/lettuce/core/dynamic/output/OutputRegistryUnitTests.java
index 34550543cf..f8148b8384 100644
--- a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryUnitTests.java
@@ -20,7 +20,7 @@
 import java.nio.ByteBuffer;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.ScoredValue;
 import io.lettuce.core.codec.ByteArrayCodec;
@@ -33,10 +33,10 @@
 /**
  * @author Mark Paluch
  */
-public class OutputRegistryTest {
+class OutputRegistryUnitTests {
 
     @Test
-    public void getKeyOutputType() throws Exception {
+    void getKeyOutputType() {
 
         OutputType outputComponentType = OutputRegistry.getOutputComponentType(KeyListOutput.class);
 
@@ -44,7 +44,7 @@ public void getKeyOutputType() throws Exception {
     }
 
     @Test
-    public void getStringListOutputType() throws Exception {
+    void getStringListOutputType() {
 
         OutputType outputComponentType = OutputRegistry.getOutputComponentType(StringListOutput.class);
 
@@ -53,7 +53,7 @@ public void getStringListOutputType() throws Exception {
     }
 
     @Test
-    public void componentTypeOfKeyOuputWithCodecIsAssignableFromString() throws Exception {
+    void componentTypeOfKeyOuputWithCodecIsAssignableFromString() {
 
         OutputType outputComponentType = OutputRegistry.getOutputComponentType(KeyOutput.class);
 
@@ -63,7 +63,7 @@ public void componentTypeOfKeyOuputWithCodecIsAssignableFromString() throws Exce
     }
 
     @Test
-    public void componentTypeOfKeyListOuputWithCodecIsAssignableFromListOfString() throws Exception {
+    void componentTypeOfKeyListOuputWithCodecIsAssignableFromListOfString() {
 
         OutputType outputComponentType = OutputRegistry.getOutputComponentType(KeyListOutput.class);
 
@@ -73,7 +73,7 @@ public void componentTypeOfKeyListOuputWithCodecIsAssignableFromListOfString() t
     }
 
     @Test
-    public void streamingTypeOfKeyOuputWithCodecIsAssignableFromString() throws Exception {
+    void streamingTypeOfKeyOuputWithCodecIsAssignableFromString() {
 
         OutputType outputComponentType = OutputRegistry.getStreamingType(KeyListOutput.class);
 
@@ -83,7 +83,7 @@ public void streamingTypeOfKeyOuputWithCodecIsAssignableFromString() throws Exce
     }
 
     @Test
-    public void streamingTypeOfKeyListOuputWithCodecIsAssignableFromListOfString() throws Exception {
+    void streamingTypeOfKeyListOuputWithCodecIsAssignableFromListOfString() {
 
         OutputType outputComponentType = OutputRegistry.getStreamingType(ScoredValueListOutput.class);
 
@@ -94,7 +94,7 @@ public void streamingTypeOfKeyListOuputWithCodecIsAssignableFromListOfString() t
     }
 
     @Test
-    public void customizedValueOutput() throws Exception {
+    void customizedValueOutput() {
 
         OutputType outputComponentType = OutputRegistry.getOutputComponentType(KeyTypedOutput.class);
 
@@ -105,14 +105,14 @@ public void customizedValueOutput() throws Exception {
 
     private static abstract class IntermediateOutput<K1, V1> extends CommandOutput<K1, V1, V1> {
 
-        public IntermediateOutput(RedisCodec<K1, V1> codec, V1 output) {
+        IntermediateOutput(RedisCodec<K1, V1> codec, V1 output) {
             super(codec, null);
         }
     }
 
     private static class KeyTypedOutput extends IntermediateOutput<ByteBuffer, byte[]> {
 
-        public KeyTypedOutput(RedisCodec<ByteBuffer, byte[]> codec) {
+        KeyTypedOutput(RedisCodec<ByteBuffer, byte[]> codec) {
             super(codec, null);
         }
     }
diff --git a/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryTest.java b/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryUnitTests.java
similarity index 91%
rename from src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
rename to src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryUnitTests.java
index 49a7ad52d5..f9ae4151ed 100644
--- a/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryUnitTests.java
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.dynamic.CommandMethod;
 import io.lettuce.core.dynamic.DeclaredCommandMethod;
@@ -30,12 +30,12 @@
 /**
  * @author Mark Paluch
  */
-public class AnnotationCommandSegmentFactoryTest {
+class AnnotationCommandSegmentFactoryUnitTests {
 
-    AnnotationCommandSegmentFactory factory = new AnnotationCommandSegmentFactory();
+    private AnnotationCommandSegmentFactory factory = new AnnotationCommandSegmentFactory();
 
     @Test
-    public void notAnnotatedDotAsIs() {
+    void notAnnotatedDotAsIs() {
 
         CommandMethod commandMethod = DeclaredCommandMethod.create(ReflectionUtils.findMethod(CommandMethods.class,
                 "notAnnotated"));
@@ -47,7 +47,7 @@ public void notAnnotatedDotAsIs() {
     }
 
     @Test
-    public void uppercaseDot() {
+    void uppercaseDot() {
 
         CommandMethod commandMethod = DeclaredCommandMethod.create(ReflectionUtils
                 .findMethod(CommandMethods.class, "upperCase"));
@@ -59,7 +59,7 @@ public void uppercaseDot() {
     }
 
     @Test
-    public void methodNameAsIs() {
+    void methodNameAsIs() {
 
         CommandMethod commandMethod = DeclaredCommandMethod.create(ReflectionUtils.findMethod(CommandMethods.class,
                 "methodName"));
@@ -71,7 +71,7 @@ public void methodNameAsIs() {
     }
 
     @Test
-    public void splitAsIs() {
+    void splitAsIs() {
 
         CommandMethod commandMethod = DeclaredCommandMethod.create(ReflectionUtils.findMethod(CommandMethods.class,
                 "clientSetname"));
@@ -83,7 +83,7 @@ public void splitAsIs() {
     }
 
     @Test
-    public void commandAnnotation() {
+    void commandAnnotation() {
 
         CommandMethod commandMethod = DeclaredCommandMethod.create(ReflectionUtils
                 .findMethod(CommandMethods.class, "atCommand"));
@@ -95,7 +95,7 @@ public void commandAnnotation() {
     }
 
     @Test
-    public void splitDefault() {
+    void splitDefault() {
 
         CommandMethod commandMethod = DeclaredCommandMethod
                 .create(ReflectionUtils.findMethod(Defaulted.class, "clientSetname"));
diff --git a/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationTest.java b/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationUnitTests.java
similarity index 80%
rename from src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationTest.java
rename to src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationUnitTests.java
index e1a5d41c34..e3dcd841cb 100644
--- a/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationUnitTests.java
@@ -21,15 +21,15 @@
 import java.util.List;
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class ParametrizedTypeInformationTest {
+class ParametrizedTypeInformationUnitTests {
 
     @Test
-    public void isAssignableShouldConsiderExactType() throws Exception {
+    void isAssignableShouldConsiderExactType() {
 
         TypeInformation<Object> target = ClassTypeInformation
                 .fromReturnTypeOf(ReflectionUtils.findMethod(TestType.class, "exactNumber"));
@@ -40,7 +40,7 @@ public void isAssignableShouldConsiderExactType() throws Exception {
     }
 
     @Test
-    public void isAssignableShouldConsiderCompatibleType() throws Exception {
+    void isAssignableShouldConsiderCompatibleType() {
 
         TypeInformation<Object> target = ClassTypeInformation
                 .fromReturnTypeOf(ReflectionUtils.findMethod(TestType.class, "collectionOfNumber"));
@@ -51,7 +51,7 @@ public void isAssignableShouldConsiderCompatibleType() throws Exception {
     }
 
     @Test
-    public void isAssignableShouldConsiderWildcardOfNumberType() throws Exception {
+    void isAssignableShouldConsiderWildcardOfNumberType() {
 
         TypeInformation<Object> target = ClassTypeInformation
                 .fromReturnTypeOf(ReflectionUtils.findMethod(TestType.class, "numberOrSubtype"));
@@ -62,7 +62,7 @@ public void isAssignableShouldConsiderWildcardOfNumberType() throws Exception {
     }
 
     @Test
-    public void isAssignableShouldConsiderWildcard() throws Exception {
+    void isAssignableShouldConsiderWildcard() {
 
         TypeInformation<Object> target = ClassTypeInformation
                 .fromReturnTypeOf(ReflectionUtils.findMethod(TestType.class, "anything"));
@@ -73,7 +73,7 @@ public void isAssignableShouldConsiderWildcard() throws Exception {
     }
 
     @Test
-    public void returnsNullMapValueTypeForNonMapProperties() {
+    void returnsNullMapValueTypeForNonMapProperties() {
 
         TypeInformation<?> valueType = ClassTypeInformation.from(Bar.class).getSuperTypeInformation(List.class);
         TypeInformation<?> mapValueType = valueType.getMapValueType();
@@ -83,7 +83,7 @@ public void returnsNullMapValueTypeForNonMapProperties() {
     }
 
     @Test
-    public void isAssignableShouldConsiderNestedParameterTypes() throws Exception {
+    void isAssignableShouldConsiderNestedParameterTypes() {
 
         TypeInformation<Object> target = ClassTypeInformation
                 .fromReturnTypeOf(ReflectionUtils.findMethod(TestType.class, "collectionOfIterableOfNumber"));
@@ -93,11 +93,11 @@ public void isAssignableShouldConsiderNestedParameterTypes() throws Exception {
         assertThat(target.isAssignableFrom(ClassTypeInformation.from(ListOfSetOfNumber.class))).isFalse();
     }
 
-    interface Bar extends List<String> {
+    private interface Bar extends List<String> {
 
     }
 
-    static interface TestType {
+    private static interface TestType {
 
         Collection<Number> collectionOfNumber();
 
@@ -110,7 +110,7 @@ static interface TestType {
         List<? extends Number> numberOrSubtype();
     }
 
-    static interface ListOfNumber extends List<Number> {
+    private static interface ListOfNumber extends List<Number> {
 
     }
 
@@ -118,23 +118,23 @@ static interface ListOfIterableOfNumber extends List<Iterable<Number>> {
 
     }
 
-    static interface ListOfSetOfNumber extends List<Set<Number>> {
+    private static interface ListOfSetOfNumber extends List<Set<Number>> {
 
     }
 
-    static interface ListOfIterableOfInteger extends List<Iterable<Integer>> {
+    private static interface ListOfIterableOfInteger extends List<Iterable<Integer>> {
 
     }
 
-    static interface ListOfListOfNumber extends List<List<Number>> {
+    private static interface ListOfListOfNumber extends List<List<Number>> {
 
     }
 
-    static interface ListOfString extends List<String> {
+    private static interface ListOfString extends List<String> {
 
     }
 
-    static interface ListOfInteger extends List<Integer> {
+    private static interface ListOfInteger extends List<Integer> {
 
     }
 }
diff --git a/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationTest.java b/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationUnitTests.java
similarity index 86%
rename from src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationTest.java
rename to src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationUnitTests.java
index 902c9209e4..5c0235bdf4 100644
--- a/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationUnitTests.java
@@ -22,15 +22,15 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class WildcardTypeInformationTest {
+class WildcardTypeInformationUnitTests {
 
     @Test
-    public void shouldResolveWildcardType() {
+    void shouldResolveWildcardType() {
 
         TypeInformation<Object> information = ClassTypeInformation.fromReturnTypeOf(methodOf("listOfAnything"));
 
@@ -38,7 +38,7 @@ public void shouldResolveWildcardType() {
     }
 
     @Test
-    public void isAssignableFromExactType() {
+    void isAssignableFromExactType() {
 
         TypeInformation<Object> information = ClassTypeInformation.fromReturnTypeOf(methodOf("listOfAnything"));
         TypeInformation<Object> compatible = ClassTypeInformation.fromReturnTypeOf(methodOf("anotherListOfAnything"));
@@ -47,7 +47,7 @@ public void isAssignableFromExactType() {
     }
 
     @Test
-    public void isAssignableFromCompatibleFirstLevelType() {
+    void isAssignableFromCompatibleFirstLevelType() {
 
         TypeInformation<Object> target = ClassTypeInformation.fromReturnTypeOf(methodOf("collectionOfAnything"));
         TypeInformation<Object> source = ClassTypeInformation.fromReturnTypeOf(methodOf("anotherListOfAnything"));
@@ -56,7 +56,7 @@ public void isAssignableFromCompatibleFirstLevelType() {
     }
 
     @Test
-    public void isAssignableFromCompatibleComponentType() {
+    void isAssignableFromCompatibleComponentType() {
 
         TypeInformation<Object> target = ClassTypeInformation.fromReturnTypeOf(methodOf("listOfAnything"));
         TypeInformation<Object> source = ClassTypeInformation.fromReturnTypeOf(methodOf("exactNumber"));
@@ -66,7 +66,7 @@ public void isAssignableFromCompatibleComponentType() {
     }
 
     @Test
-    public void isAssignableFromUpperBoundComponentType() {
+    void isAssignableFromUpperBoundComponentType() {
 
         TypeInformation<?> target = componentTypeOf("atMostInteger");
 
@@ -76,7 +76,7 @@ public void isAssignableFromUpperBoundComponentType() {
     }
 
     @Test
-    public void isAssignableFromLowerBoundComponentType() {
+    void isAssignableFromLowerBoundComponentType() {
 
         TypeInformation<?> target = componentTypeOf("atLeastNumber");
 
@@ -87,15 +87,15 @@ public void isAssignableFromLowerBoundComponentType() {
         assertThat(target.isAssignableFrom(from(Object.class))).isFalse();
     }
 
-    protected TypeInformation<?> componentTypeOf(String name) {
+    TypeInformation<?> componentTypeOf(String name) {
         return ClassTypeInformation.fromReturnTypeOf(methodOf(name)).getComponentType();
     }
 
-    protected Method methodOf(String name) {
+    Method methodOf(String name) {
         return ReflectionUtils.findMethod(GenericReturnTypes.class, name);
     }
 
-    static interface GenericReturnTypes {
+    private static interface GenericReturnTypes {
 
         List<Number> exactNumber();
 
diff --git a/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java
index 8853cf707d..fed5cacb26 100644
--- a/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java
+++ b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java
@@ -20,23 +20,23 @@
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
-import io.lettuce.TestClientResources;
-import io.lettuce.core.AbstractTest;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.event.connection.ConnectionEvent;
+import io.lettuce.test.resource.TestClientResources;
 
 /**
  * @author Mark Paluch
  */
-public class ConnectionEventsTriggeredTest extends AbstractTest {
+class ConnectionEventsTriggeredTest extends TestSupport {
 
     @Test
-    public void testConnectionEvents() throws Exception {
+    void testConnectionEvents() {
 
         RedisClient client = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port).build());
 
diff --git a/src/test/java/io/lettuce/core/event/DefaultEventBusTest.java b/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java
similarity index 85%
rename from src/test/java/io/lettuce/core/event/DefaultEventBusTest.java
rename to src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java
index 691679afbb..5580ad588d 100644
--- a/src/test/java/io/lettuce/core/event/DefaultEventBusTest.java
+++ b/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java
@@ -19,10 +19,10 @@
 
 import java.util.concurrent.ArrayBlockingQueue;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import reactor.core.Disposable;
 import reactor.core.scheduler.Schedulers;
@@ -31,14 +31,14 @@
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class DefaultEventBusTest {
+@ExtendWith(MockitoExtension.class)
+class DefaultEventBusUnitTests {
 
     @Mock
     private Event event;
 
     @Test
-    public void publishToSubscriber() throws Exception {
+    void publishToSubscriber() {
 
         EventBus sut = new DefaultEventBus(Schedulers.immediate());
 
@@ -46,7 +46,7 @@ public void publishToSubscriber() throws Exception {
     }
 
     @Test
-    public void publishToMultipleSubscribers() throws Exception {
+    void publishToMultipleSubscribers() throws Exception {
 
         EventBus sut = new DefaultEventBus(Schedulers.immediate());
 
diff --git a/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java b/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsUnitTests.java
similarity index 89%
rename from src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java
rename to src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsUnitTests.java
index e0b2232ee2..8e1811e4ec 100644
--- a/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsTest.java
+++ b/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsUnitTests.java
@@ -20,15 +20,15 @@
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class DefaultEventPublisherOptionsTest {
+class DefaultEventPublisherOptionsUnitTests {
 
     @Test
-    public void testDefault() {
+    void testDefault() {
 
         DefaultEventPublisherOptions sut = DefaultEventPublisherOptions.create();
 
@@ -36,7 +36,7 @@ public void testDefault() {
     }
 
     @Test
-    public void testDisabled() {
+    void testDisabled() {
 
         DefaultEventPublisherOptions sut = DefaultEventPublisherOptions.disabled();
 
@@ -44,7 +44,7 @@ public void testDisabled() {
     }
 
     @Test
-    public void testBuilder() {
+    void testBuilder() {
 
         DefaultEventPublisherOptions sut = DefaultEventPublisherOptions.builder().eventEmitInterval(1, TimeUnit.SECONDS)
                 .build();
diff --git a/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerTest.java b/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerUnitTests.java
similarity index 86%
rename from src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerTest.java
rename to src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerUnitTests.java
index ef81b0b8e7..3c436ecf60 100644
--- a/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerTest.java
+++ b/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerUnitTests.java
@@ -21,22 +21,22 @@
 import java.lang.reflect.Proxy;
 import java.util.Collection;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class AbstractInvocationHandlerTest {
+class AbstractInvocationHandlerUnitTests {
 
     @Test
-    public void shouldHandleInterfaceMethod() throws Exception {
+    void shouldHandleInterfaceMethod() {
 
         ReturnOne proxy = createProxy();
         assertThat(proxy.returnOne()).isEqualTo(1);
     }
 
     @Test
-    public void shouldBeEqualToSelf() throws Exception {
+    void shouldBeEqualToSelf() {
 
         ReturnOne proxy1 = createProxy();
         ReturnOne proxy2 = createProxy();
@@ -49,7 +49,7 @@ public void shouldBeEqualToSelf() throws Exception {
     }
 
     @Test
-    public void shouldBeNotEqualToProxiesWithDifferentInterfaces() throws Exception {
+    void shouldBeNotEqualToProxiesWithDifferentInterfaces() {
 
         ReturnOne proxy1 = createProxy();
         Object proxy2 = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] { ReturnOne.class, Collection.class },
@@ -69,7 +69,7 @@ private ReturnOne createProxy() {
     static class InvocationHandler extends AbstractInvocationHandler {
 
         @Override
-        protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
+        protected Object handleInvocation(Object proxy, Method method, Object[] args) {
             return 1;
         }
     }
diff --git a/src/test/java/io/lettuce/core/internal/HostAndPortTest.java b/src/test/java/io/lettuce/core/internal/HostAndPortUnitTests.java
similarity index 93%
rename from src/test/java/io/lettuce/core/internal/HostAndPortTest.java
rename to src/test/java/io/lettuce/core/internal/HostAndPortUnitTests.java
index 59f66bb859..47a39d8ec5 100644
--- a/src/test/java/io/lettuce/core/internal/HostAndPortTest.java
+++ b/src/test/java/io/lettuce/core/internal/HostAndPortUnitTests.java
@@ -18,15 +18,15 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class HostAndPortTest {
+class HostAndPortUnitTests {
 
     @Test
-    public void testFromStringWellFormed() {
+    void testFromStringWellFormed() {
         // Well-formed inputs.
         checkFromStringCase("google.com", 80, "google.com", 80, false);
         checkFromStringCase("google.com", 80, "google.com", 80, false);
@@ -37,7 +37,7 @@ public void testFromStringWellFormed() {
     }
 
     @Test
-    public void testFromStringBadDefaultPort() {
+    void testFromStringBadDefaultPort() {
         // Well-formed strings with bad default ports.
         checkFromStringCase("gmail.com:81", -1, "gmail.com", 81, true);
         checkFromStringCase("192.0.2.2:83", -1, "192.0.2.2", 83, true);
@@ -51,7 +51,7 @@ public void testFromStringBadDefaultPort() {
     }
 
     @Test
-    public void testFromStringUnusedDefaultPort() {
+    void testFromStringUnusedDefaultPort() {
         // Default port, but unused.
         checkFromStringCase("gmail.com:81", 77, "gmail.com", 81, true);
         checkFromStringCase("192.0.2.2:83", 77, "192.0.2.2", 83, true);
@@ -59,7 +59,7 @@ public void testFromStringUnusedDefaultPort() {
     }
 
     @Test
-    public void testFromStringBadPort() {
+    void testFromStringBadPort() {
         // Out-of-range ports.
         checkFromStringCase("google.com:65536", 1, null, 99, false);
         checkFromStringCase("google.com:9999999999", 1, null, 99, false);
@@ -73,7 +73,7 @@ public void testFromStringBadPort() {
     }
 
     @Test
-    public void testFromStringUnparseableNonsense() {
+    void testFromStringUnparseableNonsense() {
         // Some nonsense that causes parse failures.
         checkFromStringCase("[goo.gl]", 1, null, 99, false);
         checkFromStringCase("[goo.gl]:80", 1, null, 99, false);
@@ -84,7 +84,7 @@ public void testFromStringUnparseableNonsense() {
     }
 
     @Test
-    public void testFromStringParseableNonsense() {
+    void testFromStringParseableNonsense() {
         // Examples of nonsense that gets through.
         checkFromStringCase("[[:]]", 86, "[:]", 86, false);
         checkFromStringCase("x:y:z", 87, "x:y:z", 87, false);
@@ -95,7 +95,7 @@ public void testFromStringParseableNonsense() {
     }
 
     @Test
-    public void shouldCreateHostAndPortFromParts() {
+    void shouldCreateHostAndPortFromParts() {
         HostAndPort hp = HostAndPort.of("gmail.com", 81);
         assertThat(hp.getHostText()).isEqualTo("gmail.com");
         assertThat(hp.hasPort()).isTrue();
@@ -115,7 +115,7 @@ public void shouldCreateHostAndPortFromParts() {
     }
 
     @Test
-    public void shouldCompare() {
+    void shouldCompare() {
         HostAndPort hp1 = HostAndPort.parse("foo::123");
         HostAndPort hp2 = HostAndPort.parse("foo::123");
         HostAndPort hp3 = HostAndPort.parse("[foo::124]");
@@ -138,7 +138,7 @@ public void shouldCompare() {
     }
 
     @Test
-    public void shouldApplyCompatibilityParsing() throws Exception {
+    void shouldApplyCompatibilityParsing() {
 
         checkFromCompatCase("affe::123:6379", "affe::123", 6379);
         checkFromCompatCase("1:2:3:4:5:6:7:8:6379", "1:2:3:4:5:6:7:8", 6379);
diff --git a/src/test/java/io/lettuce/core/masterslave/ConnectionsTest.java b/src/test/java/io/lettuce/core/masterslave/ConnectionsUnitTests.java
similarity index 76%
rename from src/test/java/io/lettuce/core/masterslave/ConnectionsTest.java
rename to src/test/java/io/lettuce/core/masterslave/ConnectionsUnitTests.java
index c27642b24f..2aba025856 100644
--- a/src/test/java/io/lettuce/core/masterslave/ConnectionsTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/ConnectionsUnitTests.java
@@ -22,11 +22,13 @@
 import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 import reactor.util.function.Tuples;
 import io.lettuce.core.RedisURI;
@@ -35,19 +37,20 @@
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class ConnectionsTest {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class ConnectionsUnitTests {
 
     @Mock
     private StatefulRedisConnection<String, String> connection1;
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
         when(connection1.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
     }
 
     @Test
-    public void shouldCloseConnectionCompletingAfterCloseSignal() {
+    void shouldCloseConnectionCompletingAfterCloseSignal() {
 
         Connections connections = new Connections(5, Collections.emptyList());
         connections.closeAsync();
diff --git a/src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java b/src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java
index f81e2322ff..843c3077d8 100644
--- a/src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java
@@ -16,85 +16,90 @@
 package io.lettuce.core.masterslave;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.Arrays;
 
-import org.junit.*;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.TestClientResources;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
+import io.lettuce.test.Futures;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class CustomCommandTest extends AbstractTest {
+@ExtendWith(LettuceExtension.class)
+public class CustomCommandTest extends TestSupport {
 
-    private static final Utf8StringCodec utf8StringCodec = new Utf8StringCodec();
-    private static RedisClient redisClient;
+    private final RedisClient redisClient;
 
-    private RedisCommands<String, String> redis;
     private StatefulRedisConnection<String, String> connection;
+    private RedisCommands<String, String> redis;
 
-    @BeforeClass
-    public static void beforeClass() {
-        redisClient = RedisClient.create(TestClientResources.get());
-    }
-
-    @AfterClass
-    public static void afterClass() {
-        FastShutdown.shutdown(redisClient);
+    @Inject
+    CustomCommandTest(RedisClient redisClient) {
+        this.redisClient = redisClient;
     }
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
 
         RedisURI uri = RedisURI.create("redis-sentinel://127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
-        connection = MasterSlave.connect(redisClient, utf8StringCodec, uri);
-
+        connection = MasterSlave.connect(redisClient, StringCodec.UTF8, uri);
         redis = connection.sync();
+        redis.flushall();
     }
 
-    @After
-    public void after() {
+    @AfterEach
+    void after() {
         connection.close();
     }
 
     @Test
-    public void dispatchSet() throws Exception {
+    void dispatchSet() {
 
-        String response = redis.dispatch(MyCommands.SET, new StatusOutput<>(utf8StringCodec),
-                new CommandArgs<>(utf8StringCodec).addKey(key).addValue(value));
+        String response = redis.dispatch(MyCommands.SET, new StatusOutput<>(StringCodec.UTF8), new CommandArgs<>(
+                StringCodec.UTF8).addKey(key).addValue(value));
 
         assertThat(response).isEqualTo("OK");
     }
 
     @Test
-    public void dispatchWithoutArgs() throws Exception {
+    void dispatchWithoutArgs() {
 
-        String response = redis.dispatch(MyCommands.INFO, new StatusOutput<>(utf8StringCodec));
+        String response = redis.dispatch(MyCommands.INFO, new StatusOutput<>(StringCodec.UTF8));
 
         assertThat(response).contains("connected_clients");
     }
 
-    @Test(expected = RedisCommandExecutionException.class)
-    public void dispatchShouldFailForWrongDataType() throws Exception {
+    @Test
+    void dispatchShouldFailForWrongDataType() {
 
         redis.hset(key, key, value);
-        redis.dispatch(CommandType.GET, new StatusOutput<>(utf8StringCodec), new CommandArgs<>(utf8StringCodec).addKey(key));
+        assertThatThrownBy(
+                () -> redis.dispatch(CommandType.GET, new StatusOutput<>(StringCodec.UTF8),
+                        new CommandArgs<>(StringCodec.UTF8).addKey(key))).isInstanceOf(RedisCommandExecutionException.class);
     }
 
     @Test
-    public void dispatchTransactions() throws Exception {
+    void dispatchTransactions() {
 
         redis.multi();
-        String response = redis.dispatch(CommandType.SET, new StatusOutput<>(utf8StringCodec), new CommandArgs<>(
-                utf8StringCodec).addKey(key).addValue(value));
+        String response = redis.dispatch(CommandType.SET, new StatusOutput<>(StringCodec.UTF8), new CommandArgs<>(
+                StringCodec.UTF8).addKey(key).addValue(value));
 
         TransactionResult exec = redis.exec();
 
@@ -103,7 +108,7 @@ public void dispatchTransactions() throws Exception {
     }
 
     @Test
-    public void masterSlaveAsyncPing() throws Exception {
+    void masterSlaveAsyncPing() {
 
         RedisCommand<String, String, String> command = new Command<>(MyCommands.PING,
                 new StatusOutput<>(new Utf8StringCodec()), null);
@@ -111,33 +116,33 @@ public void masterSlaveAsyncPing() throws Exception {
         AsyncCommand<String, String, String> async = new AsyncCommand<>(command);
         getStandaloneConnection().dispatch(async);
 
-        assertThat(async.get()).isEqualTo("PONG");
+        assertThat(Futures.get(async.toCompletableFuture())).isEqualTo("PONG");
     }
 
     @Test
-    public void masterSlaveAsyncBatchPing() throws Exception {
+    void masterSlaveAsyncBatchPing() {
 
-        RedisCommand<String, String, String> command1 = new Command<>(CommandType.SET, new StatusOutput<>(utf8StringCodec),
-                new CommandArgs<>(utf8StringCodec).addKey("key1").addValue("value"));
+        RedisCommand<String, String, String> command1 = new Command<>(CommandType.SET, new StatusOutput<>(StringCodec.UTF8),
+                new CommandArgs<>(StringCodec.UTF8).addKey("key1").addValue("value"));
 
-        RedisCommand<String, String, String> command2 = new Command<>(CommandType.GET, new StatusOutput<>(utf8StringCodec),
-                new CommandArgs<>(utf8StringCodec).addKey("key1"));
+        RedisCommand<String, String, String> command2 = new Command<>(CommandType.GET, new StatusOutput<>(StringCodec.UTF8),
+                new CommandArgs<>(StringCodec.UTF8).addKey("key1"));
 
-        RedisCommand<String, String, String> command3 = new Command<>(CommandType.SET, new StatusOutput<>(utf8StringCodec),
-                new CommandArgs<>(utf8StringCodec).addKey("other-key1").addValue("value"));
+        RedisCommand<String, String, String> command3 = new Command<>(CommandType.SET, new StatusOutput<>(StringCodec.UTF8),
+                new CommandArgs<>(StringCodec.UTF8).addKey("other-key1").addValue("value"));
 
         AsyncCommand<String, String, String> async1 = new AsyncCommand<>(command1);
         AsyncCommand<String, String, String> async2 = new AsyncCommand<>(command2);
         AsyncCommand<String, String, String> async3 = new AsyncCommand<>(command3);
         getStandaloneConnection().dispatch(Arrays.asList(async1, async2, async3));
 
-        assertThat(async1.get()).isEqualTo("OK");
-        assertThat(async2.get()).isEqualTo("value");
-        assertThat(async3.get()).isEqualTo("OK");
+        assertThat(Futures.get(async1.toCompletableFuture())).isEqualTo("OK");
+        assertThat(Futures.get(async2.toCompletableFuture())).isEqualTo("value");
+        assertThat(Futures.get(async3.toCompletableFuture())).isEqualTo("OK");
     }
 
     @Test
-    public void masterSlaveFireAndForget() throws Exception {
+    void masterSlaveFireAndForget() {
 
         RedisCommand<String, String, String> command = new Command<>(MyCommands.PING,
                 new StatusOutput<>(new Utf8StringCodec()), null);
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterUnitTests.java
similarity index 88%
rename from src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java
rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterUnitTests.java
index ba0f380b2f..ed2d44f16a 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterUnitTests.java
@@ -26,10 +26,12 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.StringCodec;
@@ -42,8 +44,9 @@
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class MasterSlaveChannelWriterTest {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class MasterSlaveChannelWriterUnitTests {
 
     @Mock
     private MasterSlaveConnectionProvider<String, String> connectionProvider;
@@ -55,7 +58,7 @@ public class MasterSlaveChannelWriterTest {
     private StatefulRedisConnection<String, String> connection;
 
     @Test
-    public void shouldReturnIntentForWriteCommand() {
+    void shouldReturnIntentForWriteCommand() {
 
         RedisCommand<String, String, String> set = new Command<>(CommandType.SET, null);
         RedisCommand<String, String, String> mset = new Command<>(CommandType.MSET, null);
@@ -68,14 +71,14 @@ public void shouldReturnIntentForWriteCommand() {
     }
 
     @Test
-    public void shouldReturnDefaultIntentForNoCommands() {
+    void shouldReturnDefaultIntentForNoCommands() {
 
         assertThat(MasterSlaveChannelWriter.getIntent(Collections.emptyList())).isEqualTo(
                 MasterSlaveConnectionProvider.Intent.WRITE);
     }
 
     @Test
-    public void shouldReturnIntentForReadCommand() {
+    void shouldReturnIntentForReadCommand() {
 
         RedisCommand<String, String, String> get = new Command<>(CommandType.GET, null);
         RedisCommand<String, String, String> mget = new Command<>(CommandType.MGET, null);
@@ -88,7 +91,7 @@ public void shouldReturnIntentForReadCommand() {
     }
 
     @Test
-    public void shouldReturnIntentForMixedCommands() {
+    void shouldReturnIntentForMixedCommands() {
 
         RedisCommand<String, String, String> set = new Command<>(CommandType.SET, null);
         RedisCommand<String, String, String> mget = new Command<>(CommandType.MGET, null);
@@ -101,7 +104,7 @@ public void shouldReturnIntentForMixedCommands() {
     }
 
     @Test
-    public void shouldBindTransactionsToMaster() {
+    void shouldBindTransactionsToMaster() {
 
         MasterSlaveChannelWriter writer = new MasterSlaveChannelWriter(connectionProvider, clientResources);
 
@@ -116,7 +119,7 @@ public void shouldBindTransactionsToMaster() {
     }
 
     @Test
-    public void shouldBindTransactionsToMasterInBatch() {
+    void shouldBindTransactionsToMasterInBatch() {
 
         MasterSlaveChannelWriter writer = new MasterSlaveChannelWriter(connectionProvider, clientResources);
 
@@ -132,7 +135,7 @@ public void shouldBindTransactionsToMasterInBatch() {
     }
 
     @Test
-    public void shouldDeriveIntentFromCommandTypeAfterTransaction() {
+    void shouldDeriveIntentFromCommandTypeAfterTransaction() {
 
         MasterSlaveChannelWriter writer = new MasterSlaveChannelWriter(connectionProvider, clientResources);
 
@@ -148,7 +151,7 @@ public void shouldDeriveIntentFromCommandTypeAfterTransaction() {
     }
 
     @Test
-    public void shouldDeriveIntentFromCommandTypeAfterDiscardedTransaction() {
+    void shouldDeriveIntentFromCommandTypeAfterDiscardedTransaction() {
 
         MasterSlaveChannelWriter writer = new MasterSlaveChannelWriter(connectionProvider, clientResources);
 
@@ -164,7 +167,7 @@ public void shouldDeriveIntentFromCommandTypeAfterDiscardedTransaction() {
     }
 
     @Test
-    public void shouldDeriveIntentFromCommandBatchTypeAfterDiscardedTransaction() {
+    void shouldDeriveIntentFromCommandBatchTypeAfterDiscardedTransaction() {
 
         MasterSlaveChannelWriter writer = new MasterSlaveChannelWriter(connectionProvider, clientResources);
 
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java
similarity index 80%
rename from src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java
rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java
index e9d31756ce..52047ec904 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java
@@ -25,11 +25,13 @@
 import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 import io.lettuce.core.ConnectionFuture;
 import io.lettuce.core.RedisChannelHandler;
@@ -43,10 +45,11 @@
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class MasterSlaveConnectionProviderTest {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class MasterSlaveConnectionProviderUnitTests {
 
-    public static final Utf8StringCodec CODEC = new Utf8StringCodec();
+    private static final Utf8StringCodec CODEC = new Utf8StringCodec();
 
     private MasterSlaveConnectionProvider<String, String> sut;
 
@@ -56,13 +59,13 @@ public class MasterSlaveConnectionProviderTest {
     @Mock(extraInterfaces = StatefulRedisConnection.class)
     RedisChannelHandler<String, String> channelHandlerMock;
 
-    StatefulRedisConnection<String, String> nodeConnectionMock;
+    private StatefulRedisConnection<String, String> nodeConnectionMock;
 
     @Mock
     RedisCommands<String, String> commandsMock;
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
 
         nodeConnectionMock = (StatefulRedisConnection) channelHandlerMock;
         sut = new MasterSlaveConnectionProvider<>(clientMock, CODEC, RedisURI.create("localhost", 1), Collections.emptyMap());
@@ -71,7 +74,7 @@ public void before() {
     }
 
     @Test
-    public void shouldCloseConnections() {
+    void shouldCloseConnections() {
 
         when(channelHandlerMock.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
 
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
index edd5eb1902..7c834564e5 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
@@ -15,8 +15,8 @@
  */
 package io.lettuce.core.masterslave;
 
-import static io.lettuce.core.TestSettings.port;
 import static io.lettuce.core.masterslave.MasterSlaveTest.slaveCall;
+import static io.lettuce.test.settings.TestSettings.port;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 
@@ -29,11 +29,15 @@
 import org.junit.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.core.*;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisConnectionException;
+import io.lettuce.core.RedisURI;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.sentinel.AbstractSentinelTest;
 import io.lettuce.core.sentinel.SentinelRule;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 import io.netty.channel.group.ChannelGroup;
 
 /**
@@ -53,12 +57,12 @@ public class MasterSlaveSentinelTest extends AbstractSentinelTest {
     private Pattern pattern = Pattern.compile("role:(\\w+)");
 
     @Before
-    public void before() throws Exception {
+    public void before() {
         sentinelRule.needMasterWithSlave(MASTER_ID, port(3), port(4));
     }
 
     @Test
-    public void testMasterSlaveSentinelBasic() throws Exception {
+    public void testMasterSlaveSentinelBasic() {
 
         RedisURI uri = RedisURI
                 .create("redis-sentinel://127.0.0.1:21379,127.0.0.1:22379,127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
@@ -73,7 +77,7 @@ public void testMasterSlaveSentinelBasic() throws Exception {
     }
 
     @Test
-    public void masterSlaveConnectionShouldSetClientName() throws Exception {
+    public void masterSlaveConnectionShouldSetClientName() {
 
         RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).withClientName("my-client").build();
 
@@ -88,7 +92,7 @@ public void masterSlaveConnectionShouldSetClientName() throws Exception {
     }
 
     @Test
-    public void testMasterSlaveSentinelWithTwoUnavailableSentinels() throws Exception {
+    public void testMasterSlaveSentinelWithTwoUnavailableSentinels() {
 
         RedisURI uri = RedisURI
                 .create("redis-sentinel://127.0.0.1:21379,127.0.0.1:22379,127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
@@ -103,7 +107,7 @@ public void testMasterSlaveSentinelWithTwoUnavailableSentinels() throws Exceptio
     }
 
     @Test
-    public void testMasterSlaveSentinelWithUnavailableSentinels() throws Exception {
+    public void testMasterSlaveSentinelWithUnavailableSentinels() {
 
         RedisURI uri = RedisURI.create("redis-sentinel://127.0.0.1:21379,127.0.0.1:21379?sentinelMasterId=mymaster&timeout=5s");
 
@@ -116,7 +120,7 @@ public void testMasterSlaveSentinelWithUnavailableSentinels() throws Exception {
     }
 
     @Test
-    public void testMasterSlaveSentinelConnectionCount() throws Exception {
+    public void testMasterSlaveSentinelConnectionCount() {
 
         ChannelGroup channels = (ChannelGroup) ReflectionTestUtils.getField(sentinelClient, "channels");
         int count = channels.size();
@@ -134,7 +138,7 @@ public void testMasterSlaveSentinelConnectionCount() throws Exception {
     }
 
     @Test
-    public void testMasterSlaveSentinelClosesSentinelConnections() throws Exception {
+    public void testMasterSlaveSentinelClosesSentinelConnections() {
 
         ChannelGroup channels = (ChannelGroup) ReflectionTestUtils.getField(sentinelClient, "channels");
         int count = channels.size();
@@ -150,7 +154,7 @@ public void testMasterSlaveSentinelClosesSentinelConnections() throws Exception
         assertThat(channels.size()).isEqualTo(count);
     }
 
-    protected void assertThatServerIs(String server, String expectation) {
+    private void assertThatServerIs(String server, String expectation) {
         Matcher matcher = pattern.matcher(server);
 
         assertThat(matcher.find()).isTrue();
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
index 1111c7b23d..76af93f79a 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
@@ -16,7 +16,8 @@
 package io.lettuce.core.masterslave;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.Collections;
 import java.util.List;
@@ -24,22 +25,27 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.core.*;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.core.models.role.RoleParser;
+import io.lettuce.test.Futures;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class MasterSlaveTest extends AbstractRedisClientTest {
+class MasterSlaveTest extends AbstractRedisClientTest {
 
     private RedisURI masterURI = RedisURI.Builder.redis(host, TestSettings.port(3)).withPassword(passwd)
             .withClientName("my-client").withDatabase(5).build();
@@ -51,8 +57,8 @@ public class MasterSlaveTest extends AbstractRedisClientTest {
     private RedisURI master;
     private RedisURI slave;
 
-    @Before
-    public void before() throws Exception {
+    @BeforeEach
+    void before() throws Exception {
 
         RedisURI node1 = RedisURI.Builder.redis(host, TestSettings.port(3)).withDatabase(2).build();
         RedisURI node2 = RedisURI.Builder.redis(host, TestSettings.port(4)).withDatabase(2).build();
@@ -71,8 +77,9 @@ public void before() throws Exception {
             master = node2;
             slave = node1;
         } else {
-            assumeTrue(String.format("Cannot run the test because I don't have a distinct master and slave but %s and %s",
-                    node1Instance, node2Instance), false);
+            assumeTrue(false, String.format(
+                    "Cannot run the test because I don't have a distinct master and slave but %s and %s", node1Instance,
+                    node2Instance));
         }
 
         connectionToNode1.configSet("requirepass", passwd);
@@ -87,18 +94,18 @@ public void before() throws Exception {
         connection.setReadFrom(ReadFrom.SLAVE);
     }
 
-    @After
-    public void after() throws Exception {
+    @AfterEach
+    void after() {
 
         if (connectionToNode1 != null) {
             connectionToNode1.configSet("requirepass", "");
-            connectionToNode1.configSet("masterauth", "").get(1, TimeUnit.SECONDS);
+            Futures.await(connectionToNode1.configSet("masterauth", ""));
             connectionToNode1.getStatefulConnection().close();
         }
 
         if (connectionToNode2 != null) {
             connectionToNode2.configSet("requirepass", "");
-            connectionToNode2.configSet("masterauth", "").get(1, TimeUnit.SECONDS);
+            Futures.await(connectionToNode2.configSet("masterauth", ""));
             connectionToNode2.getStatefulConnection().close();
         }
 
@@ -108,7 +115,7 @@ public void after() throws Exception {
     }
 
     @Test
-    public void testMasterSlaveReadFromMaster() throws Exception {
+    void testMasterSlaveReadFromMaster() {
 
         connection.setReadFrom(ReadFrom.MASTER);
         String server = connection.sync().info("server");
@@ -121,7 +128,7 @@ public void testMasterSlaveReadFromMaster() throws Exception {
     }
 
     @Test
-    public void testMasterSlaveReadFromSlave() throws Exception {
+    void testMasterSlaveReadFromSlave() {
 
         String server = connection.sync().info("server");
 
@@ -134,7 +141,7 @@ public void testMasterSlaveReadFromSlave() throws Exception {
     }
 
     @Test
-    public void testMasterSlaveReadWrite() throws Exception {
+    void testMasterSlaveReadWrite() {
 
         RedisCommands<String, String> redisCommands = connection.sync();
         redisCommands.set(key, value);
@@ -144,7 +151,7 @@ public void testMasterSlaveReadWrite() throws Exception {
     }
 
     @Test
-    public void testConnectToSlave() throws Exception {
+    void testConnectToSlave() {
 
         connection.close();
 
@@ -155,8 +162,8 @@ public void testConnectToSlave() throws Exception {
         sync.set(key, value);
     }
 
-    @Test(expected = RedisException.class)
-    public void noSlaveForRead() throws Exception {
+    @Test
+    void noSlaveForRead() {
 
         connection.setReadFrom(new ReadFrom() {
             @Override
@@ -165,11 +172,11 @@ public List<RedisNodeDescription> select(Nodes nodes) {
             }
         });
 
-        slaveCall(connection);
+        assertThatThrownBy(() -> slaveCall(connection)).isInstanceOf(RedisException.class);
     }
 
     @Test
-    public void masterSlaveConnectionShouldSetClientName() throws Exception {
+    void masterSlaveConnectionShouldSetClientName() {
 
         assertThat(connection.sync().clientGetname()).isEqualTo(masterURI.getClientName());
         connection.sync().quit();
@@ -179,7 +186,7 @@ public void masterSlaveConnectionShouldSetClientName() throws Exception {
     }
 
     @Test
-    public void testConnectionCount() throws Exception {
+    void testConnectionCount() {
 
         MasterSlaveConnectionProvider connectionProvider = getConnectionProvider();
 
@@ -190,7 +197,7 @@ public void testConnectionCount() throws Exception {
     }
 
     @Test
-    public void testReconfigureTopology() throws Exception {
+    void testReconfigureTopology() {
         MasterSlaveConnectionProvider connectionProvider = getConnectionProvider();
 
         slaveCall(connection);
@@ -200,11 +207,11 @@ public void testReconfigureTopology() throws Exception {
         assertThat(connectionProvider.getConnectionCount()).isEqualTo(0);
     }
 
-    protected static String slaveCall(StatefulRedisMasterSlaveConnection<String, String> connection) {
+    static String slaveCall(StatefulRedisMasterSlaveConnection<String, String> connection) {
         return connection.sync().info("replication");
     }
 
-    protected MasterSlaveConnectionProvider getConnectionProvider() {
+    MasterSlaveConnectionProvider getConnectionProvider() {
         MasterSlaveChannelWriter writer = connection.getChannelWriter();
         return writer.getMasterSlaveConnectionProvider();
     }
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java
similarity index 88%
rename from src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderTest.java
rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java
index 4455ff4a0c..fb8e493720 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java
@@ -16,22 +16,23 @@
 package io.lettuce.core.masterslave;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class MasterSlaveTopologyProviderTest {
+class MasterSlaveTopologyProviderUnitTests {
 
     private StatefulRedisConnection<String, String> connectionMock = mock(StatefulRedisConnection.class);
 
@@ -39,7 +40,7 @@ public class MasterSlaveTopologyProviderTest {
             RedisURI.Builder.redis(TestSettings.host(), TestSettings.port()).build());
 
     @Test
-    public void shouldParseMaster() throws Exception {
+    void shouldParseMaster() {
 
         String info = "# Replication\r\n" + "role:master\r\n" + "connected_slaves:1\r\n" + "master_repl_offset:56276\r\n"
                 + "repl_backlog_active:1\r\n";
@@ -55,7 +56,7 @@ public void shouldParseMaster() throws Exception {
     }
 
     @Test
-    public void shouldParseMasterAndSlave() throws Exception {
+    void shouldParseMasterAndSlave() {
 
         String info = "# Replication\r\n" + "role:slave\r\n" + "connected_slaves:1\r\n" + "master_host:127.0.0.1\r\n"
                 + "master_port:1234\r\n" + "master_repl_offset:56276\r\n" + "repl_backlog_active:1\r\n";
@@ -72,7 +73,7 @@ public void shouldParseMasterAndSlave() throws Exception {
     }
 
     @Test
-    public void shouldParseMasterHostname() throws Exception {
+    void shouldParseMasterHostname() {
 
         String info = "# Replication\r\n" + "role:slave\r\n" + "connected_slaves:1\r\n" + "master_host:my.Host-name.COM\r\n"
                 + "master_port:1234\r\n" + "master_repl_offset:56276\r\n" + "repl_backlog_active:1\r\n";
@@ -89,7 +90,7 @@ public void shouldParseMasterHostname() throws Exception {
     }
 
     @Test
-    public void shouldParseIPv6MasterAddress() throws Exception {
+    void shouldParseIPv6MasterAddress() {
 
         String info = "# Replication\r\n" + "role:slave\r\n" + "connected_slaves:1\r\n" + "master_host:::20f8:1400:0:0\r\n"
                 + "master_port:1234\r\n" + "master_repl_offset:56276\r\n" + "repl_backlog_active:1\r\n";
@@ -106,25 +107,25 @@ public void shouldParseIPv6MasterAddress() throws Exception {
         assertThat(master.getUri().getHost()).isEqualTo("::20f8:1400:0:0");
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void shouldFailWithoutRole() throws Exception {
+    @Test
+    void shouldFailWithoutRole() {
 
         String info = "# Replication\r\n" + "connected_slaves:1\r\n" + "master_repl_offset:56276\r\n"
                 + "repl_backlog_active:1\r\n";
 
-        sut.getNodesFromInfo(info);
+        assertThatThrownBy(() -> sut.getNodesFromInfo(info)).isInstanceOf(IllegalStateException.class);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void shouldFailWithInvalidRole() throws Exception {
+    @Test
+    void shouldFailWithInvalidRole() {
 
         String info = "# Replication\r\n" + "role:abc\r\n" + "master_repl_offset:56276\r\n" + "repl_backlog_active:1\r\n";
 
-        sut.getNodesFromInfo(info);
+        assertThatThrownBy(() -> sut.getNodesFromInfo(info)).isInstanceOf(IllegalStateException.class);
     }
 
     @Test
-    public void shouldParseSlaves() throws Exception {
+    void shouldParseSlaves() {
 
         String info = "# Replication\r\n" + "role:master\r\n"
                 + "slave0:ip=127.0.0.1,port=6483,state=online,offset=56276,lag=0\r\n"
@@ -148,7 +149,7 @@ public void shouldParseSlaves() throws Exception {
     }
 
     @Test
-    public void shouldParseIPv6SlaveAddress() throws Exception {
+    void shouldParseIPv6SlaveAddress() {
 
         String info = "# Replication\r\n" + "role:master\r\n"
                 + "slave0:ip=::20f8:1400:0:0,port=6483,state=online,offset=56276,lag=0\r\n"
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java
similarity index 85%
rename from src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshTest.java
rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java
index ea8842b543..574b02a75c 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java
@@ -25,12 +25,14 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -43,8 +45,9 @@
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class MasterSlaveTopologyRefreshTest {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class MasterSlaveTopologyRefreshUnitTests {
 
     private static final RedisMasterSlaveNode MASTER = new RedisMasterSlaveNode("localhost", 1, new RedisURI(),
             RedisInstance.Role.MASTER);
@@ -61,12 +64,12 @@ public class MasterSlaveTopologyRefreshTest {
     @Mock
     RedisAsyncCommands<String, String> async;
 
-    ScheduledThreadPoolExecutor executorService;
+    private ScheduledThreadPoolExecutor executorService;
 
-    TopologyProvider provider;
+    private TopologyProvider provider;
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
 
         executorService = new ScheduledThreadPoolExecutor(1, new DefaultThreadFactory(getClass().getSimpleName(), true));
         when(connection.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
@@ -82,13 +85,13 @@ public void before() {
         provider = () -> Arrays.asList(MASTER, SLAVE);
     }
 
-    @After
-    public void tearDown() {
+    @AfterEach
+    void tearDown() {
         executorService.shutdown();
     }
 
     @Test
-    public void shouldRetrieveTopology() {
+    void shouldRetrieveTopology() {
 
         MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(connectionFactory, executorService, provider);
 
@@ -106,7 +109,7 @@ public void shouldRetrieveTopology() {
     }
 
     @Test
-    public void shouldRetrieveTopologyWithFailedNode() {
+    void shouldRetrieveTopologyWithFailedNode() {
 
         MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(connectionFactory, executorService, provider);
 
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java
similarity index 92%
rename from src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsTest.java
rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java
index 5168bd1110..d8bf0594b4 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java
@@ -19,7 +19,7 @@
 
 import java.util.Arrays;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.models.role.RedisInstance;
@@ -27,10 +27,10 @@
 /**
  * @author Mark Paluch
  */
-public class MasterSlaveUtilsTest {
+class MasterSlaveUtilsUnitTests {
 
     @Test
-    public void isChangedShouldReturnFalse() throws Exception {
+    void isChangedShouldReturnFalse() {
 
         RedisMasterSlaveNode master = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 111),
                 RedisInstance.Role.MASTER);
@@ -50,7 +50,7 @@ public void isChangedShouldReturnFalse() throws Exception {
     }
 
     @Test
-    public void isChangedShouldReturnTrueBecauseSlaveIsGone() throws Exception {
+    void isChangedShouldReturnTrueBecauseSlaveIsGone() {
 
         RedisMasterSlaveNode master = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 111),
                 RedisInstance.Role.MASTER);
@@ -64,7 +64,7 @@ public void isChangedShouldReturnTrueBecauseSlaveIsGone() throws Exception {
     }
 
     @Test
-    public void isChangedShouldReturnTrueBecauseHostWasMigrated() throws Exception {
+    void isChangedShouldReturnTrueBecauseHostWasMigrated() {
 
         RedisMasterSlaveNode master = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 111),
                 RedisInstance.Role.MASTER);
@@ -83,7 +83,7 @@ public void isChangedShouldReturnTrueBecauseHostWasMigrated() throws Exception {
     }
 
     @Test
-    public void isChangedShouldReturnTrueBecauseRolesSwitched() throws Exception {
+    void isChangedShouldReturnTrueBecauseRolesSwitched() {
 
         RedisMasterSlaveNode master = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 111),
                 RedisInstance.Role.MASTER);
diff --git a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java
similarity index 91%
rename from src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
rename to src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java
index d2f7d8a50d..000a3fe1f2 100644
--- a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java
@@ -26,14 +26,16 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.ConnectionFuture;
@@ -55,8 +57,9 @@
  * @author Mark Paluch
  */
 @SuppressWarnings("unchecked")
-@RunWith(MockitoJUnitRunner.class)
-public class SentinelTopologyRefreshTest {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class SentinelTopologyRefreshUnitTests {
 
     private static final RedisURI host1 = RedisURI.create("localhost", 1234);
     private static final RedisURI host2 = RedisURI.create("localhost", 3456);
@@ -84,8 +87,8 @@ public class SentinelTopologyRefreshTest {
 
     private SentinelTopologyRefresh sut;
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
 
         when(redisClient.connectPubSubAsync(any(StringCodec.class), eq(host1))).thenReturn(
                 ConnectionFuture.completed(null, connection));
@@ -101,15 +104,15 @@ public void before() {
         sut = new SentinelTopologyRefresh(redisClient, "mymaster", Collections.singletonList(host1));
     }
 
-    @After
-    public void tearDown() {
+    @AfterEach
+    void tearDown() {
 
         verify(redisClient, never()).connect(any(), any());
         verify(redisClient, never()).connectPubSub(any(), any());
     }
 
     @Test
-    public void bind() {
+    void bind() {
 
         sut.bind(refreshRunnable);
 
@@ -118,7 +121,7 @@ public void bind() {
     }
 
     @Test
-    public void bindWithSecondSentinelFails() {
+    void bindWithSecondSentinelFails() {
 
         sut = new SentinelTopologyRefresh(redisClient, "mymaster", Arrays.asList(host1, host2));
 
@@ -134,7 +137,7 @@ public void bindWithSecondSentinelFails() {
     }
 
     @Test
-    public void bindWithSentinelRecovery() {
+    void bindWithSentinelRecovery() {
 
         StatefulRedisPubSubConnection<String, String> connection2 = mock(StatefulRedisPubSubConnection.class);
         RedisPubSubAsyncCommands<String, String> async2 = mock(RedisPubSubAsyncCommands.class);
@@ -173,7 +176,7 @@ public void bindWithSentinelRecovery() {
     }
 
     @Test
-    public void bindDuringClose() {
+    void bindDuringClose() {
 
         sut = new SentinelTopologyRefresh(redisClient, "mymaster", Arrays.asList(host1, host2));
 
@@ -200,7 +203,7 @@ public void bindDuringClose() {
     }
 
     @Test
-    public void close() {
+    void close() {
 
         when(connection.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
 
@@ -212,7 +215,7 @@ public void close() {
     }
 
     @Test
-    public void bindAfterClose() {
+    void bindAfterClose() {
 
         sut.close();
         sut.bind(refreshRunnable);
@@ -222,7 +225,7 @@ public void bindAfterClose() {
     }
 
     @Test
-    public void shouldNotProcessOtherEvents() {
+    void shouldNotProcessOtherEvents() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
@@ -235,7 +238,7 @@ public void shouldNotProcessOtherEvents() {
     }
 
     @Test
-    public void shouldProcessSlaveDown() {
+    void shouldProcessSlaveDown() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
@@ -248,7 +251,7 @@ public void shouldProcessSlaveDown() {
     }
 
     @Test
-    public void shouldProcessSlaveAdded() {
+    void shouldProcessSlaveAdded() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
@@ -261,7 +264,7 @@ public void shouldProcessSlaveAdded() {
     }
 
     @Test
-    public void shouldProcessSlaveBackUp() {
+    void shouldProcessSlaveBackUp() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
@@ -274,7 +277,7 @@ public void shouldProcessSlaveBackUp() {
     }
 
     @Test
-    public void shouldProcessElectedLeader() {
+    void shouldProcessElectedLeader() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
@@ -287,7 +290,7 @@ public void shouldProcessElectedLeader() {
     }
 
     @Test
-    public void shouldProcessSwitchMaster() {
+    void shouldProcessSwitchMaster() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
@@ -300,7 +303,7 @@ public void shouldProcessSwitchMaster() {
     }
 
     @Test
-    public void shouldProcessFixSlaveConfig() {
+    void shouldProcessFixSlaveConfig() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
@@ -313,7 +316,7 @@ public void shouldProcessFixSlaveConfig() {
     }
 
     @Test
-    public void shouldProcessConvertToSlave() {
+    void shouldProcessConvertToSlave() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
@@ -326,7 +329,7 @@ public void shouldProcessConvertToSlave() {
     }
 
     @Test
-    public void shouldProcessRoleChange() {
+    void shouldProcessRoleChange() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
@@ -339,7 +342,7 @@ public void shouldProcessRoleChange() {
     }
 
     @Test
-    public void shouldProcessFailoverEnd() {
+    void shouldProcessFailoverEnd() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
@@ -352,7 +355,7 @@ public void shouldProcessFailoverEnd() {
     }
 
     @Test
-    public void shouldProcessFailoverTimeout() {
+    void shouldProcessFailoverTimeout() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
@@ -365,7 +368,7 @@ public void shouldProcessFailoverTimeout() {
     }
 
     @Test
-    public void shouldExecuteOnceWithinATimeout() {
+    void shouldExecuteOnceWithinATimeout() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
@@ -379,7 +382,7 @@ public void shouldExecuteOnceWithinATimeout() {
     }
 
     @Test
-    public void shouldNotProcessIfExecutorIsShuttingDown() {
+    void shouldNotProcessIfExecutorIsShuttingDown() {
 
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
diff --git a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
index 9163575827..8e67be4b3a 100644
--- a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
@@ -16,7 +16,8 @@
 package io.lettuce.core.masterslave;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -24,21 +25,25 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.core.*;
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RoleParser;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class StaticMasterSlaveTest extends AbstractRedisClientTest {
+class StaticMasterSlaveTest extends AbstractRedisClientTest {
 
     private StatefulRedisMasterSlaveConnectionImpl<String, String> connection;
 
@@ -48,8 +53,8 @@ public class StaticMasterSlaveTest extends AbstractRedisClientTest {
     private RedisAsyncCommands<String, String> connectionToNode1;
     private RedisAsyncCommands<String, String> connectionToNode2;
 
-    @Before
-    public void before() throws Exception {
+    @BeforeEach
+    void before() throws Exception {
 
         RedisURI node1 = RedisURI.Builder.redis(host, TestSettings.port(3)).withClientName("my-client").withDatabase(2).build();
         RedisURI node2 = RedisURI.Builder.redis(host, TestSettings.port(4)).withClientName("my-client").withDatabase(2).build();
@@ -68,8 +73,9 @@ public void before() throws Exception {
             master = node2;
             slave = node1;
         } else {
-            assumeTrue(String.format("Cannot run the test because I don't have a distinct master and slave but %s and %s",
-                    node1Instance, node2Instance), false);
+            assumeTrue(false, String.format(
+                    "Cannot run the test because I don't have a distinct master and slave but %s and %s", node1Instance,
+                    node2Instance));
         }
 
         connectionToNode1.configSet("requirepass", passwd);
@@ -88,8 +94,8 @@ public void before() throws Exception {
         connection.setReadFrom(ReadFrom.SLAVE);
     }
 
-    @After
-    public void after() throws Exception {
+    @AfterEach
+    void after() throws Exception {
 
         if (connectionToNode1 != null) {
             connectionToNode1.configSet("requirepass", "");
@@ -109,7 +115,7 @@ public void after() throws Exception {
     }
 
     @Test
-    public void testMasterSlaveStandaloneBasic() throws Exception {
+    void testMasterSlaveStandaloneBasic() {
 
         String server = connection.sync().info("server");
 
@@ -122,7 +128,7 @@ public void testMasterSlaveStandaloneBasic() throws Exception {
     }
 
     @Test
-    public void testMasterSlaveReadWrite() throws Exception {
+    void testMasterSlaveReadWrite() {
 
         RedisCommands<String, String> redisCommands = connection.sync();
         redisCommands.set(key, value);
@@ -131,8 +137,8 @@ public void testMasterSlaveReadWrite() throws Exception {
         assertThat(redisCommands.get(key)).isEqualTo(value);
     }
 
-    @Test(expected = RedisException.class)
-    public void noSlaveForRead() throws Exception {
+    @Test
+    void noSlaveForRead() {
 
         connection.close();
 
@@ -140,11 +146,11 @@ public void noSlaveForRead() throws Exception {
                 Arrays.asList(master));
         connection.setReadFrom(ReadFrom.SLAVE);
 
-        slaveCall(connection);
+        assertThatThrownBy(() -> slaveCall(connection)).isInstanceOf(RedisException.class);
     }
 
     @Test
-    public void shouldWorkWithMasterOnly() throws Exception {
+    void shouldWorkWithMasterOnly() {
 
         connection.close();
 
@@ -156,7 +162,7 @@ public void shouldWorkWithMasterOnly() throws Exception {
     }
 
     @Test
-    public void shouldWorkWithSlaveOnly() throws Exception {
+    void shouldWorkWithSlaveOnly() {
 
         connection.close();
 
@@ -167,19 +173,19 @@ public void shouldWorkWithSlaveOnly() throws Exception {
         assertThat(connection.sync().info()).isNotEmpty();
     }
 
-    @Test(expected = RedisException.class)
-    public void noMasterForWrite() throws Exception {
+    @Test
+    void noMasterForWrite() {
 
         connection.close();
 
         connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, new Utf8StringCodec(),
                 Arrays.asList(slave));
 
-        connection.sync().set(key, value);
+        assertThatThrownBy(() -> connection.sync().set(key, value)).isInstanceOf(RedisException.class);
     }
 
     @Test
-    public void masterSlaveConnectionShouldSetClientName() throws Exception {
+    void masterSlaveConnectionShouldSetClientName() {
 
         assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
         connection.sync().quit();
@@ -189,7 +195,7 @@ public void masterSlaveConnectionShouldSetClientName() throws Exception {
     }
 
     @Test
-    public void testConnectionCount() throws Exception {
+    void testConnectionCount() {
 
         MasterSlaveConnectionProvider connectionProvider = getConnectionProvider();
 
@@ -203,7 +209,7 @@ public void testConnectionCount() throws Exception {
     }
 
     @Test
-    public void testReconfigureTopology() throws Exception {
+    void testReconfigureTopology() {
         MasterSlaveConnectionProvider connectionProvider = getConnectionProvider();
 
         slaveCall(connection);
@@ -213,11 +219,11 @@ public void testReconfigureTopology() throws Exception {
         assertThat(connectionProvider.getConnectionCount()).isEqualTo(0);
     }
 
-    protected static String slaveCall(StatefulRedisMasterSlaveConnection<String, String> connection) {
+    static String slaveCall(StatefulRedisMasterSlaveConnection<String, String> connection) {
         return connection.sync().info("replication");
     }
 
-    protected MasterSlaveConnectionProvider getConnectionProvider() {
+    MasterSlaveConnectionProvider getConnectionProvider() {
         MasterSlaveChannelWriter writer = connection.getChannelWriter();
         return writer.getMasterSlaveConnectionProvider();
     }
diff --git a/src/test/java/io/lettuce/core/metrics/CommandLatencyIdTest.java b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java
similarity index 88%
rename from src/test/java/io/lettuce/core/metrics/CommandLatencyIdTest.java
rename to src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java
index 4b4e1ab46a..082c0e2694 100644
--- a/src/test/java/io/lettuce/core/metrics/CommandLatencyIdTest.java
+++ b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.protocol.CommandKeyword;
 import io.netty.channel.local.LocalAddress;
@@ -25,17 +25,17 @@
 /**
  * @author Mark Paluch
  */
-public class CommandLatencyIdTest {
+class CommandLatencyIdUnitTests {
 
     private CommandLatencyId sut = CommandLatencyId.create(LocalAddress.ANY, new LocalAddress("me"), CommandKeyword.ADDR);
 
     @Test
-    public void testToString() throws Exception {
+    void testToString() {
         assertThat(sut.toString()).contains("local:any -> local:me");
     }
 
     @Test
-    public void testValues() throws Exception {
+    void testValues() {
         assertThat(sut.localAddress()).isEqualTo(LocalAddress.ANY);
         assertThat(sut.remoteAddress()).isEqualTo(new LocalAddress("me"));
     }
diff --git a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorUnitTests.java
similarity index 90%
rename from src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java
rename to src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorUnitTests.java
index 497ff3a4f7..7985da18cf 100644
--- a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorTest.java
+++ b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorUnitTests.java
@@ -21,9 +21,9 @@
 
 import java.util.Map;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.metrics.DefaultCommandLatencyCollector.PauseDetectorWrapper;
@@ -33,13 +33,13 @@
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class DefaultCommandLatencyCollectorTest {
+@ExtendWith(MockitoExtension.class)
+class DefaultCommandLatencyCollectorUnitTests {
 
     private DefaultCommandLatencyCollector sut;
 
     @Test
-    public void shutdown() {
+    void shutdown() {
 
         sut = new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create());
 
@@ -49,7 +49,7 @@ public void shutdown() {
     }
 
     @Test
-    public void simpleCreateShouldNotInitializePauseDetector() {
+    void simpleCreateShouldNotInitializePauseDetector() {
 
         sut = new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create());
         PauseDetectorWrapper wrapper = (PauseDetectorWrapper) ReflectionTestUtils.getField(sut, "pauseDetectorWrapper");
@@ -58,7 +58,7 @@ public void simpleCreateShouldNotInitializePauseDetector() {
     }
 
     @Test
-    public void latencyRecordShouldInitializePauseDetectorWrapper() {
+    void latencyRecordShouldInitializePauseDetectorWrapper() {
 
         sut = new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create());
 
@@ -74,7 +74,7 @@ public void latencyRecordShouldInitializePauseDetectorWrapper() {
     }
 
     @Test
-    public void shutdownShouldReleasePauseDetector() {
+    void shutdownShouldReleasePauseDetector() {
 
         sut = new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create());
         PauseDetectorWrapper wrapper = (PauseDetectorWrapper) ReflectionTestUtils.getField(sut, "pauseDetectorWrapper");
@@ -91,7 +91,7 @@ public void shutdownShouldReleasePauseDetector() {
     }
 
     @Test
-    public void verifyMetrics() {
+    void verifyMetrics() {
 
         sut = new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create());
 
@@ -125,7 +125,7 @@ public void verifyMetrics() {
     }
 
     @Test
-    public void verifyCummulativeMetrics() {
+    void verifyCummulativeMetrics() {
 
         sut = new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.builder()
                 .resetLatenciesAfterEvent(false).build());
diff --git a/src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java b/src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsUnitTests.java
similarity index 86%
rename from src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java
rename to src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsUnitTests.java
index d3ef00a9a9..c5318f0067 100644
--- a/src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsTest.java
+++ b/src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsUnitTests.java
@@ -19,15 +19,15 @@
 
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class DefaultDefaultCommandLatencyCollectorOptionsTest {
+class DefaultDefaultCommandLatencyCollectorOptionsUnitTests {
 
     @Test
-    public void testDefault() throws Exception {
+    void testDefault() {
 
         DefaultCommandLatencyCollectorOptions sut = DefaultCommandLatencyCollectorOptions.create();
 
@@ -36,7 +36,7 @@ public void testDefault() throws Exception {
     }
 
     @Test
-    public void testDisabled() throws Exception {
+    void testDisabled() {
 
         DefaultCommandLatencyCollectorOptions sut = DefaultCommandLatencyCollectorOptions.disabled();
 
@@ -44,7 +44,7 @@ public void testDisabled() throws Exception {
     }
 
     @Test
-    public void testBuilder() throws Exception {
+    void testBuilder() {
 
         DefaultCommandLatencyCollectorOptions sut = DefaultCommandLatencyCollectorOptions.builder()
                 .targetUnit(TimeUnit.HOURS).targetPercentiles(new double[] { 1, 2, 3 }).build();
diff --git a/src/test/java/io/lettuce/core/models/command/CommandDetailParserTest.java b/src/test/java/io/lettuce/core/models/command/CommandDetailParserUnitTests.java
similarity index 88%
rename from src/test/java/io/lettuce/core/models/command/CommandDetailParserTest.java
rename to src/test/java/io/lettuce/core/models/command/CommandDetailParserUnitTests.java
index 3aa9d3a0ca..de1e9f0251 100644
--- a/src/test/java/io/lettuce/core/models/command/CommandDetailParserTest.java
+++ b/src/test/java/io/lettuce/core/models/command/CommandDetailParserUnitTests.java
@@ -21,33 +21,36 @@
 import java.util.HashSet;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.internal.LettuceLists;
 
-public class CommandDetailParserTest {
+/**
+ * @author Mark Paluch
+ */
+class CommandDetailParserUnitTests {
 
     @Test
-    public void testMappings() throws Exception {
+    void testMappings() {
         assertThat(CommandDetailParser.FLAG_MAPPING).hasSameSizeAs(CommandDetail.Flag.values());
     }
 
     @Test
-    public void testEmptyList() throws Exception {
+    void testEmptyList() {
 
         List<CommandDetail> result = CommandDetailParser.parse(new ArrayList<>());
         assertThat(result).isEmpty();
     }
 
     @Test
-    public void testMalformedList() throws Exception {
+    void testMalformedList() {
         Object o = LettuceLists.newList("", "", "");
         List<CommandDetail> result = CommandDetailParser.parse(LettuceLists.newList(o));
         assertThat(result).isEmpty();
     }
 
     @Test
-    public void testParse() throws Exception {
+    void testParse() {
         Object o = LettuceLists.newList("get", "1", LettuceLists.newList("fast", "loading"), 1L, 2L, 3L);
         List<CommandDetail> result = CommandDetailParser.parse(LettuceLists.newList(o));
         assertThat(result).hasSize(1);
@@ -62,7 +65,7 @@ public void testParse() throws Exception {
     }
 
     @Test
-    public void testModel() throws Exception {
+    void testModel() {
         CommandDetail commandDetail = new CommandDetail();
         commandDetail.setArity(1);
         commandDetail.setFirstKeyPosition(2);
diff --git a/src/test/java/io/lettuce/core/models/role/RoleParserTest.java b/src/test/java/io/lettuce/core/models/role/RoleParserUnitTests.java
similarity index 82%
rename from src/test/java/io/lettuce/core/models/role/RoleParserTest.java
rename to src/test/java/io/lettuce/core/models/role/RoleParserUnitTests.java
index 5b3655a701..5ecd938358 100644
--- a/src/test/java/io/lettuce/core/models/role/RoleParserTest.java
+++ b/src/test/java/io/lettuce/core/models/role/RoleParserUnitTests.java
@@ -16,46 +16,49 @@
 package io.lettuce.core.models.role;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.internal.HostAndPort;
 import io.lettuce.core.internal.LettuceLists;
 
-public class RoleParserTest {
-    public static final long REPLICATION_OFFSET_1 = 3167038L;
-    public static final long REPLICATION_OFFSET_2 = 3167039L;
-    public static final String LOCALHOST = "127.0.0.1";
+/**
+ * @author Mark Paluch
+ */
+class RoleParserUnitTests {
+
+    private static final long REPLICATION_OFFSET_1 = 3167038L;
+    private static final long REPLICATION_OFFSET_2 = 3167039L;
+    private static final String LOCALHOST = "127.0.0.1";
 
     @Test
-    public void testMappings() throws Exception {
+    void testMappings() {
         assertThat(RoleParser.ROLE_MAPPING).hasSameSizeAs(RedisInstance.Role.values());
         assertThat(RoleParser.SLAVE_STATE_MAPPING).hasSameSizeAs(RedisSlaveInstance.State.values());
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void emptyList() throws Exception {
-        RoleParser.parse(new ArrayList<>());
-
+    @Test
+    void emptyList() {
+        assertThatThrownBy(() -> RoleParser.parse(new ArrayList<>())).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void invalidFirstElement() throws Exception {
-        RoleParser.parse(LettuceLists.newList(new Object()));
-
+    @Test
+    void invalidFirstElement() {
+        assertThatThrownBy(() -> RoleParser.parse(LettuceLists.newList(new Object()))).isInstanceOf(
+                IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void invalidRole() throws Exception {
-        RoleParser.parse(LettuceLists.newList("blubb"));
-
+    @Test
+    void invalidRole() {
+        assertThatThrownBy(() -> RoleParser.parse(LettuceLists.newList("blubb"))).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void master() throws Exception {
+    void master() {
 
         List<List<String>> slaves = LettuceLists.newList(LettuceLists.newList(LOCALHOST, "9001", "" + REPLICATION_OFFSET_2),
                 LettuceLists.newList(LOCALHOST, "9002", "3129543"));
@@ -83,7 +86,7 @@ public void master() throws Exception {
     }
 
     @Test
-    public void slave() throws Exception {
+    void slave() {
 
         List<?> input = LettuceLists.newList("slave", LOCALHOST, 9000L, "connected", REPLICATION_OFFSET_1);
 
@@ -102,7 +105,7 @@ public void slave() throws Exception {
     }
 
     @Test
-    public void sentinel() throws Exception {
+    void sentinel() {
 
         List<?> input = LettuceLists.newList("sentinel", LettuceLists.newList("resque-master", "html-fragments-master", "stats-master"));
 
@@ -120,7 +123,7 @@ public void sentinel() throws Exception {
     }
 
     @Test
-    public void sentinelWithoutMasters() throws Exception {
+    void sentinelWithoutMasters() {
 
         List<?> input = LettuceLists.newList("sentinel");
 
@@ -132,7 +135,7 @@ public void sentinelWithoutMasters() throws Exception {
     }
 
     @Test
-    public void sentinelMastersIsNotAList() throws Exception {
+    void sentinelMastersIsNotAList() {
 
         List<?> input = LettuceLists.newList("sentinel", "");
 
@@ -144,7 +147,7 @@ public void sentinelMastersIsNotAList() throws Exception {
     }
 
     @Test
-    public void testModelTest() throws Exception {
+    void testModelTest() {
 
         RedisMasterInstance master = new RedisMasterInstance();
         master.setReplicationOffset(1);
diff --git a/src/test/java/io/lettuce/core/models/stream/PendingParserTest.java b/src/test/java/io/lettuce/core/models/stream/PendingParserUnitTests.java
similarity index 92%
rename from src/test/java/io/lettuce/core/models/stream/PendingParserTest.java
rename to src/test/java/io/lettuce/core/models/stream/PendingParserUnitTests.java
index 1eeebdf183..6f7fc8c943 100644
--- a/src/test/java/io/lettuce/core/models/stream/PendingParserTest.java
+++ b/src/test/java/io/lettuce/core/models/stream/PendingParserUnitTests.java
@@ -22,17 +22,17 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.Range;
 
 /**
  * @author Mark Paluch
  */
-public class PendingParserTest {
+class PendingParserUnitTests {
 
     @Test
-    public void shouldParseXpendingWithRangeOutput() {
+    void shouldParseXpendingWithRangeOutput() {
 
         List<PendingMessage> result = PendingParser
                 .parseRange(Collections.singletonList(Arrays.asList("foo", "consumer", 1L,
@@ -50,7 +50,7 @@ public void shouldParseXpendingWithRangeOutput() {
     }
 
     @Test
-    public void shouldParseXpendingOutput() {
+    void shouldParseXpendingOutput() {
 
         PendingMessages result = PendingParser.parse(Arrays.asList(16L, "from", "to",
                 Collections.singletonList(Arrays.asList("consumer", 17L))));
diff --git a/src/test/java/io/lettuce/core/output/BooleanListOutputTest.java b/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java
similarity index 75%
rename from src/test/java/io/lettuce/core/output/BooleanListOutputTest.java
rename to src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java
index 2aa51258c8..aef93e94fc 100644
--- a/src/test/java/io/lettuce/core/output/BooleanListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java
@@ -16,27 +16,28 @@
 package io.lettuce.core.output;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.nio.ByteBuffer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
  * @author Mark Paluch
  */
-public class BooleanListOutputTest {
+class BooleanListOutputUnitTests {
 
     private BooleanListOutput<?, ?> sut = new BooleanListOutput<>(new Utf8StringCodec());
 
     @Test
-    public void defaultSubscriberIsSet() throws Exception {
+    void defaultSubscriberIsSet() {
         assertThat(sut.getSubscriber()).isNotNull().isInstanceOf(ListSubscriber.class);
     }
 
     @Test
-    public void commandOutputCorrectlyDecoded() throws Exception {
+    void commandOutputCorrectlyDecoded() {
 
         sut.multi(3);
         sut.set(1L);
@@ -46,8 +47,8 @@ public void commandOutputCorrectlyDecoded() throws Exception {
         assertThat(sut.get()).contains(true, false, false);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void setByteNotImplemented() throws Exception {
-        sut.set(ByteBuffer.wrap("4.567".getBytes()));
+    @Test
+    void setByteNotImplemented() {
+        assertThatThrownBy(() -> sut.set(ByteBuffer.wrap("4.567".getBytes()))).isInstanceOf(IllegalStateException.class);
     }
 }
diff --git a/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java
similarity index 79%
rename from src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java
rename to src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java
index 0bb23b4dda..bf5d30c686 100644
--- a/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java
@@ -16,10 +16,11 @@
 package io.lettuce.core.output;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.nio.ByteBuffer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.GeoCoordinates;
 import io.lettuce.core.codec.Utf8StringCodec;
@@ -27,17 +28,17 @@
 /**
  * @author Mark Paluch
  */
-public class GeoCoordinatesListOutputTest {
+class GeoCoordinatesListOutputUnitTests {
 
     private GeoCoordinatesListOutput<?, ?> sut = new GeoCoordinatesListOutput<>(new Utf8StringCodec());
 
-    @Test(expected = IllegalStateException.class)
-    public void setIntegerShouldFail() throws Exception {
-        sut.set(123L);
+    @Test
+    void setIntegerShouldFail() {
+        assertThatThrownBy(() -> sut.set(123L)).isInstanceOf(IllegalStateException. class);
     }
 
     @Test
-    public void commandOutputCorrectlyDecoded() {
+    void commandOutputCorrectlyDecoded() {
 
         sut.multi(2);
         sut.set(ByteBuffer.wrap("1.234".getBytes()));
diff --git a/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java
similarity index 79%
rename from src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java
rename to src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java
index 37ae8a7669..897da1a6dc 100644
--- a/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java
@@ -16,10 +16,11 @@
 package io.lettuce.core.output;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.nio.ByteBuffer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.GeoCoordinates;
 import io.lettuce.core.Value;
@@ -28,22 +29,22 @@
 /**
  * @author Mark Paluch
  */
-public class GeoCoordinatesValueListOutputTest {
+class GeoCoordinatesValueListOutputUnitTests {
 
     private GeoCoordinatesValueListOutput<?, ?> sut = new GeoCoordinatesValueListOutput<>(new Utf8StringCodec());
 
     @Test
-    public void defaultSubscriberIsSet() throws Exception {
+    void defaultSubscriberIsSet() {
         assertThat(sut.getSubscriber()).isNotNull().isInstanceOf(ListSubscriber.class);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void setIntegerShouldFail() throws Exception {
-        sut.set(123L);
+    @Test
+    void setIntegerShouldFail() {
+        assertThatThrownBy(() -> sut.set(123L)).isInstanceOf(IllegalStateException.class);
     }
 
     @Test
-    public void commandOutputCorrectlyDecoded() {
+    void commandOutputCorrectlyDecoded() {
 
         sut.multi(2);
         sut.set(ByteBuffer.wrap("1.234".getBytes()));
diff --git a/src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java b/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java
similarity index 88%
rename from src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java
rename to src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java
index c49f64a6bb..6aa1ba8049 100644
--- a/src/test/java/io/lettuce/core/output/GeoWithinListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java
@@ -19,7 +19,7 @@
 
 import java.nio.ByteBuffer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.GeoCoordinates;
 import io.lettuce.core.GeoWithin;
@@ -29,19 +29,19 @@
 /**
  * @author Mark Paluch
  */
-public class GeoWithinListOutputTest {
+class GeoWithinListOutputUnitTests {
 
     private GeoWithinListOutput<String, String> sut = new GeoWithinListOutput<>(new Utf8StringCodec(), false, false, false);
 
     @Test
-    public void defaultSubscriberIsSet() {
+    void defaultSubscriberIsSet() {
 
         sut.multi(1);
         assertThat(sut.getSubscriber()).isNotNull().isInstanceOf(ListSubscriber.class);
     }
 
     @Test
-    public void commandOutputKeyOnlyDecoded() {
+    void commandOutputKeyOnlyDecoded() {
 
         sut.multi(1);
         sut.set(ByteBuffer.wrap("key".getBytes()));
@@ -52,7 +52,7 @@ public void commandOutputKeyOnlyDecoded() {
     }
 
     @Test
-    public void commandOutputKeyAndDistanceDecoded() {
+    void commandOutputKeyAndDistanceDecoded() {
 
         sut = new GeoWithinListOutput<>(new Utf8StringCodec(), true, false, false);
 
@@ -65,7 +65,7 @@ public void commandOutputKeyAndDistanceDecoded() {
     }
 
     @Test
-    public void commandOutputKeyAndHashDecoded() {
+    void commandOutputKeyAndHashDecoded() {
 
         sut = new GeoWithinListOutput<>(new Utf8StringCodec(), false, true, false);
 
@@ -78,7 +78,7 @@ public void commandOutputKeyAndHashDecoded() {
     }
 
     @Test
-    public void commandOutputLongKeyAndHashDecoded() {
+    void commandOutputLongKeyAndHashDecoded() {
 
         GeoWithinListOutput<Long, Long> sut = new GeoWithinListOutput<>((RedisCodec) new Utf8StringCodec(), false, true, false);
 
@@ -91,7 +91,7 @@ public void commandOutputLongKeyAndHashDecoded() {
     }
 
     @Test
-    public void commandOutputKeyAndCoordinatesDecoded() {
+    void commandOutputKeyAndCoordinatesDecoded() {
 
         sut = new GeoWithinListOutput<>(new Utf8StringCodec(), false, false, true);
 
diff --git a/src/test/java/io/lettuce/core/output/ListOutputTest.java b/src/test/java/io/lettuce/core/output/ListOutputTest.java
deleted file mode 100644
index 96e2f49ec9..0000000000
--- a/src/test/java/io/lettuce/core/output/ListOutputTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.output;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-
-import io.lettuce.core.codec.Utf8StringCodec;
-
-/**
- * @author Mark Paluch
- */
-@RunWith(Parameterized.class)
-public class ListOutputTest {
-
-    @Parameter(0)
-    public CommandOutput<Object, Object, List<Object>> commandOutput;
-
-    @Parameter(1)
-    public StreamingOutput<?> streamingOutput;
-
-    @Parameter(2)
-    public byte[] valueBytes;
-
-    @Parameter(3)
-    public Object value;
-
-    @Parameters
-    public static Collection<Object[]> parameters() {
-
-        Utf8StringCodec codec = new Utf8StringCodec();
-
-        KeyListOutput<String, String> keyListOutput = new KeyListOutput<>(codec);
-        Object[] keyList = new Object[] { keyListOutput, keyListOutput, "hello world".getBytes(), "hello world" };
-
-        ValueListOutput<String, String> valueListOutput = new ValueListOutput<>(codec);
-        Object[] valueList = new Object[] { valueListOutput, valueListOutput, "hello world".getBytes(), "hello world" };
-
-        StringListOutput<String, String> stringListOutput = new StringListOutput<>(codec);
-        Object[] stringList = new Object[] { stringListOutput, stringListOutput, "hello world".getBytes(), "hello world" };
-
-        return Arrays.asList(keyList, valueList, stringList);
-
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void settingEmptySubscriberShouldFail() {
-        streamingOutput.setSubscriber(null);
-    }
-
-    @Test
-    public void defaultSubscriberIsSet() {
-        commandOutput.multi(1);
-        assertThat(streamingOutput.getSubscriber()).isNotNull().isInstanceOf(ListSubscriber.class);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void setIntegerShouldFail() {
-        commandOutput.set(123L);
-    }
-
-    @Test
-    public void setValueShouldConvert() {
-
-        commandOutput.multi(1);
-        commandOutput.set(ByteBuffer.wrap(valueBytes));
-
-        assertThat(commandOutput.get()).contains(value);
-    }
-}
diff --git a/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java
new file mode 100644
index 0000000000..4e69c0455c
--- /dev/null
+++ b/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.output;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import io.lettuce.core.codec.Utf8StringCodec;
+
+/**
+ * @author Mark Paluch
+ */
+class ListOutputUnitTests {
+
+    static Collection<Fixture> parameters() {
+
+        Utf8StringCodec codec = new Utf8StringCodec();
+
+        KeyListOutput<String, String> keyListOutput = new KeyListOutput<>(codec);
+        Fixture keyList = new Fixture(keyListOutput, keyListOutput, "hello world".getBytes(), "hello world");
+
+        ValueListOutput<String, String> valueListOutput = new ValueListOutput<>(codec);
+        Fixture valueList = new Fixture(valueListOutput, valueListOutput, "hello world".getBytes(), "hello world");
+
+        StringListOutput<String, String> stringListOutput = new StringListOutput<>(codec);
+        Fixture stringList = new Fixture(stringListOutput, stringListOutput, "hello world".getBytes(), "hello world");
+
+        return Arrays.asList(keyList, valueList, stringList);
+    }
+
+    @ParameterizedTest
+    @MethodSource("parameters")
+    void settingEmptySubscriberShouldFail(Fixture fixture) {
+        assertThatThrownBy(() -> fixture.streamingOutput.setSubscriber(null)).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @ParameterizedTest
+    @MethodSource("parameters")
+    void defaultSubscriberIsSet(Fixture fixture) {
+        fixture.commandOutput.multi(1);
+        assertThat(fixture.streamingOutput.getSubscriber()).isNotNull().isInstanceOf(ListSubscriber.class);
+    }
+
+    @ParameterizedTest
+    @MethodSource("parameters")
+    void setIntegerShouldFail(Fixture fixture) {
+        assertThatThrownBy(() -> fixture.commandOutput.set(123L)).isInstanceOf(IllegalStateException.class);
+    }
+
+    @ParameterizedTest
+    @MethodSource("parameters")
+    void setValueShouldConvert(Fixture fixture) {
+
+        fixture.commandOutput.multi(1);
+        fixture.commandOutput.set(ByteBuffer.wrap(fixture.valueBytes));
+
+        assertThat(fixture.commandOutput.get()).contains(fixture.value);
+    }
+
+    static class Fixture {
+
+        final CommandOutput<Object, Object, List<Object>> commandOutput;
+        final StreamingOutput<?> streamingOutput;
+        final byte[] valueBytes;
+        final Object value;
+
+        Fixture(CommandOutput<?, ?, ?> commandOutput, StreamingOutput<?> streamingOutput, byte[] valueBytes, Object value) {
+
+            this.commandOutput = (CommandOutput) commandOutput;
+            this.streamingOutput = streamingOutput;
+            this.valueBytes = valueBytes;
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return commandOutput.getClass().getSimpleName() + "/" + value;
+        }
+    }
+}
diff --git a/src/test/java/io/lettuce/core/output/MultiOutputTest.java b/src/test/java/io/lettuce/core/output/MultiOutputUnitTests.java
similarity index 92%
rename from src/test/java/io/lettuce/core/output/MultiOutputTest.java
rename to src/test/java/io/lettuce/core/output/MultiOutputUnitTests.java
index c04269f5b1..2affa7b96e 100644
--- a/src/test/java/io/lettuce/core/output/MultiOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/MultiOutputUnitTests.java
@@ -19,7 +19,7 @@
 
 import java.nio.ByteBuffer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.protocol.Command;
@@ -28,10 +28,10 @@
 /**
  * @author Mark Paluch
  */
-public class MultiOutputTest {
+class MultiOutputUnitTests {
 
     @Test
-    public void shouldCompleteCommand() {
+    void shouldCompleteCommand() {
 
         MultiOutput<String, String> output = new MultiOutput<>(StringCodec.UTF8);
         Command<String, String, String> command = new Command<>(CommandType.APPEND, new StatusOutput<>(StringCodec.UTF8));
@@ -46,7 +46,7 @@ public void shouldCompleteCommand() {
     }
 
     @Test
-    public void shouldReportErrorForCommand() {
+    void shouldReportErrorForCommand() {
 
         MultiOutput<String, String> output = new MultiOutput<>(StringCodec.UTF8);
         Command<String, String, String> command = new Command<>(CommandType.APPEND, new StatusOutput<>(StringCodec.UTF8));
@@ -62,7 +62,7 @@ public void shouldReportErrorForCommand() {
     }
 
     @Test
-    public void shouldFailMulti() {
+    void shouldFailMulti() {
 
         MultiOutput<String, String> output = new MultiOutput<>(StringCodec.UTF8);
         Command<String, String, String> command = new Command<>(CommandType.APPEND, new StatusOutput<>(StringCodec.UTF8));
diff --git a/src/test/java/io/lettuce/core/output/NestedMultiOutputTest.java b/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java
similarity index 76%
rename from src/test/java/io/lettuce/core/output/NestedMultiOutputTest.java
rename to src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java
index 97d79b1308..7a7aaead84 100644
--- a/src/test/java/io/lettuce/core/output/NestedMultiOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java
@@ -18,24 +18,20 @@
 import static io.lettuce.core.protocol.LettuceCharsets.buffer;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.core.codec.RedisCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.codec.StringCodec;
 
 /**
  * @author Mark Paluch
  */
-public class NestedMultiOutputTest {
-
-    private RedisCodec<String, String> codec = new Utf8StringCodec();
+class NestedMultiOutputUnitTests {
 
     @Test
-    public void nestedMultiError() throws Exception {
+    void nestedMultiError() {
 
-        NestedMultiOutput<String, String> output = new NestedMultiOutput<String, String>(codec);
+        NestedMultiOutput<String, String> output = new NestedMultiOutput<>(StringCodec.UTF8);
         output.setError(buffer("Oops!"));
         assertThat(output.getError()).isNotNull();
     }
-
 }
diff --git a/src/test/java/io/lettuce/core/output/ReplayOutputTest.java b/src/test/java/io/lettuce/core/output/ReplayOutputUnitTests.java
similarity index 91%
rename from src/test/java/io/lettuce/core/output/ReplayOutputTest.java
rename to src/test/java/io/lettuce/core/output/ReplayOutputUnitTests.java
index 9686d38348..5671225ff5 100644
--- a/src/test/java/io/lettuce/core/output/ReplayOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/ReplayOutputUnitTests.java
@@ -20,17 +20,17 @@
 import java.nio.ByteBuffer;
 import java.util.Collections;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.codec.StringCodec;
 
 /**
  * @author Mark Paluch
  */
-public class ReplayOutputTest {
+class ReplayOutputUnitTests {
 
     @Test
-    public void shouldReplaySimpleCompletion() {
+    void shouldReplaySimpleCompletion() {
 
         ReplayOutput<String, String> replay = new ReplayOutput<>();
         ValueOutput<String, String> target = new ValueOutput<>(StringCodec.ASCII);
@@ -45,7 +45,7 @@ public void shouldReplaySimpleCompletion() {
     }
 
     @Test
-    public void shouldReplayNestedCompletion() {
+    void shouldReplayNestedCompletion() {
 
         ReplayOutput<String, String> replay = new ReplayOutput<>();
         ArrayOutput<String, String> target = new ArrayOutput<>(StringCodec.ASCII);
@@ -67,7 +67,7 @@ public void shouldReplayNestedCompletion() {
     }
 
     @Test
-    public void shouldDecodeErrorResponse() {
+    void shouldDecodeErrorResponse() {
 
         ReplayOutput<String, String> replay = new ReplayOutput<>();
         ValueOutput<String, String> target = new ValueOutput<>(StringCodec.ASCII);
diff --git a/src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java b/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java
similarity index 79%
rename from src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java
rename to src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java
index 1391e89468..e579f0350d 100644
--- a/src/test/java/io/lettuce/core/output/ScoredValueListOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java
@@ -16,10 +16,11 @@
 package io.lettuce.core.output;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.nio.ByteBuffer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.ScoredValue;
 import io.lettuce.core.codec.Utf8StringCodec;
@@ -27,24 +28,24 @@
 /**
  * @author Mark Paluch
  */
-public class ScoredValueListOutputTest {
+class ScoredValueListOutputUnitTests {
 
     private ScoredValueListOutput<String, String> sut = new ScoredValueListOutput<>(new Utf8StringCodec());
 
     @Test
-    public void defaultSubscriberIsSet() {
+    void defaultSubscriberIsSet() {
 
         sut.multi(1);
         assertThat(sut.getSubscriber()).isNotNull().isInstanceOf(ListSubscriber.class);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void setIntegerShouldFail() {
-        sut.set(123L);
+    @Test
+    void setIntegerShouldFail() {
+        assertThatThrownBy(() -> sut.set(123L)).isInstanceOf(IllegalStateException. class);
     }
 
     @Test
-    public void commandOutputCorrectlyDecoded() {
+    void commandOutputCorrectlyDecoded() {
 
         sut.multi(1);
         sut.set(ByteBuffer.wrap("key".getBytes()));
diff --git a/src/test/java/io/lettuce/core/output/SocketAddressOutputTest.java b/src/test/java/io/lettuce/core/output/SocketAddressOutputUnitTests.java
similarity index 91%
rename from src/test/java/io/lettuce/core/output/SocketAddressOutputTest.java
rename to src/test/java/io/lettuce/core/output/SocketAddressOutputUnitTests.java
index 11a4963701..391fe6e25e 100644
--- a/src/test/java/io/lettuce/core/output/SocketAddressOutputTest.java
+++ b/src/test/java/io/lettuce/core/output/SocketAddressOutputUnitTests.java
@@ -20,17 +20,17 @@
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.codec.StringCodec;
 
 /**
  * @author Mark Paluch
  */
-public class SocketAddressOutputTest {
+class SocketAddressOutputUnitTests {
 
     @Test
-    public void shouldReportSocketAddress() {
+    void shouldReportSocketAddress() {
 
         SocketAddressOutput<String, String> output = new SocketAddressOutput<>(StringCodec.ASCII);
 
diff --git a/src/test/java/io/lettuce/core/protocol/AsyncCommandInternalsTest.java b/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
similarity index 55%
rename from src/test/java/io/lettuce/core/protocol/AsyncCommandInternalsTest.java
rename to src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
index e8ada0e7f7..e11763490c 100644
--- a/src/test/java/io/lettuce/core/protocol/AsyncCommandInternalsTest.java
+++ b/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
@@ -17,35 +17,40 @@
 
 import static io.lettuce.core.protocol.LettuceCharsets.buffer;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.*;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.CommandOutput;
 import io.lettuce.core.output.StatusOutput;
+import io.lettuce.test.Futures;
 
-public class AsyncCommandInternalsTest {
-    protected RedisCodec<String, String> codec = new Utf8StringCodec();
-    protected Command<String, String, String> internal;
-    protected AsyncCommand<String, String, String> sut;
+/**
+ * @author Mark Paluch
+ */
+public class AsyncCommandUnitTests {
+
+    private RedisCodec<String, String> codec = new Utf8StringCodec();
+    private Command<String, String, String> internal;
+    private AsyncCommand<String, String, String> sut;
 
-    @Before
-    public final void createCommand() throws Exception {
-        CommandOutput<String, String, String> output = new StatusOutput<String, String>(codec);
-        internal = new Command<String, String, String>(CommandType.INFO, output, null);
+    @BeforeEach
+    final void createCommand() {
+        CommandOutput<String, String, String> output = new StatusOutput<>(codec);
+        internal = new Command<>(CommandType.INFO, output, null);
         sut = new AsyncCommand<>(internal);
     }
 
     @Test
-    public void isCancelled() throws Exception {
+    void isCancelled() {
         assertThat(sut.isCancelled()).isFalse();
         assertThat(sut.cancel(true)).isTrue();
         assertThat(sut.isCancelled()).isTrue();
@@ -53,152 +58,154 @@ public void isCancelled() throws Exception {
     }
 
     @Test
-    public void isDone() throws Exception {
+    void isDone() {
         assertThat(sut.isDone()).isFalse();
         sut.complete();
         assertThat(sut.isDone()).isTrue();
     }
 
     @Test
-    public void awaitAllCompleted() throws Exception {
+    void awaitAllCompleted() {
         sut.complete();
         assertThat(LettuceFutures.awaitAll(5, TimeUnit.MILLISECONDS, sut)).isTrue();
     }
 
     @Test
-    public void awaitAll() throws Exception {
+    void awaitAll() {
         assertThat(LettuceFutures.awaitAll(-1, TimeUnit.NANOSECONDS, sut)).isFalse();
     }
 
-    @Test(expected = RedisCommandTimeoutException.class)
-    public void awaitNotCompleted() throws Exception {
-        LettuceFutures.awaitOrCancel(sut, 0, TimeUnit.NANOSECONDS);
+    @Test
+    void awaitNotCompleted() {
+        assertThatThrownBy(() -> LettuceFutures.awaitOrCancel(sut, 0, TimeUnit.NANOSECONDS)).isInstanceOf(
+                RedisCommandTimeoutException.class);
     }
 
-    @Test(expected = RedisException.class)
-    public void awaitWithExecutionException() throws Exception {
+    @Test
+    void awaitWithExecutionException() {
         sut.completeExceptionally(new RedisException("error"));
-        LettuceFutures.awaitOrCancel(sut, 1, TimeUnit.SECONDS);
+        assertThatThrownBy(() -> LettuceFutures.awaitOrCancel(sut, 1, TimeUnit.SECONDS)).isInstanceOf(RedisException.class);
     }
 
-    @Test(expected = CancellationException.class)
-    public void awaitWithCancelledCommand() throws Exception {
+    @Test
+    void awaitWithCancelledCommand() {
         sut.cancel();
-        LettuceFutures.awaitOrCancel(sut, 5, TimeUnit.SECONDS);
+        assertThatThrownBy(() -> LettuceFutures.awaitOrCancel(sut, 5, TimeUnit.SECONDS)).isInstanceOf(
+                CancellationException.class);
     }
 
-    @Test(expected = RedisException.class)
-    public void awaitAllWithExecutionException() throws Exception {
+    @Test
+    void awaitAllWithExecutionException() {
         sut.completeExceptionally(new RedisCommandExecutionException("error"));
 
-        assertThat(LettuceFutures.awaitAll(0, TimeUnit.SECONDS, sut));
+        assertThatThrownBy(() -> LettuceFutures.awaitAll(0, TimeUnit.SECONDS, sut)).isInstanceOf(RedisException.class);
     }
 
     @Test
-    public void getError() throws Exception {
+    void getError() {
         sut.getOutput().setError("error");
         assertThat(internal.getError()).isEqualTo("error");
     }
 
-    @Test(expected = ExecutionException.class)
-    public void getErrorAsync() throws Exception {
+    @Test
+    void getErrorAsync() {
         sut.getOutput().setError("error");
         sut.complete();
-        sut.get();
+        assertThat(sut).isCompletedExceptionally();
     }
 
-    @Test(expected = ExecutionException.class)
-    public void completeExceptionally() throws Exception {
+    @Test
+    void completeExceptionally() {
         sut.completeExceptionally(new RuntimeException("test"));
         assertThat(internal.getError()).isEqualTo("test");
 
-        sut.get();
+        assertThat(sut).isCompletedExceptionally();
     }
 
     @Test
-    public void asyncGet() throws Exception {
+    void asyncGet() {
         sut.getOutput().set(buffer("one"));
         sut.complete();
-        assertThat(sut.get()).isEqualTo("one");
+        assertThat(Futures.get(sut.toCompletableFuture())).isEqualTo("one");
         sut.getOutput().toString();
     }
 
     @Test
-    public void customKeyword() throws Exception {
+    void customKeyword() {
         sut = new AsyncCommand<>(
-                new Command<String, String, String>(MyKeywords.DUMMY, new StatusOutput<String, String>(codec), null));
+                new Command<>(MyKeywords.DUMMY, new StatusOutput<>(codec), null));
 
         assertThat(sut.toString()).contains(MyKeywords.DUMMY.name());
     }
 
     @Test
-    public void customKeywordWithArgs() throws Exception {
+    void customKeywordWithArgs() {
         sut = new AsyncCommand<>(
-                new Command<String, String, String>(MyKeywords.DUMMY, null, new CommandArgs<String, String>(codec)));
+                new Command<>(MyKeywords.DUMMY, null, new CommandArgs<>(codec)));
         sut.getArgs().add(MyKeywords.DUMMY);
         assertThat(sut.getArgs().toString()).contains(MyKeywords.DUMMY.name());
     }
 
     @Test
-    public void getWithTimeout() throws Exception {
+    void getWithTimeout() throws Exception {
         sut.getOutput().set(buffer("one"));
         sut.complete();
 
         assertThat(sut.get(0, TimeUnit.MILLISECONDS)).isEqualTo("one");
     }
 
-    @Test(expected = TimeoutException.class, timeout = 100)
-    public void getTimeout() throws Exception {
-        assertThat(sut.get(2, TimeUnit.MILLISECONDS)).isNull();
+    @Test
+    void getTimeout() {
+        assertThatThrownBy(() -> sut.get(2, TimeUnit.MILLISECONDS)).isInstanceOf(TimeoutException.class);
     }
 
-    @Test(timeout = 100)
-    public void awaitTimeout() throws Exception {
+    @Test
+    void awaitTimeout() {
         assertThat(sut.await(2, TimeUnit.MILLISECONDS)).isFalse();
     }
 
-    @Test(expected = InterruptedException.class, timeout = 100)
-    public void getInterrupted() throws Exception {
+    @Test
+    void getInterrupted() {
         Thread.currentThread().interrupt();
-        sut.get();
+        assertThatThrownBy(() -> sut.get()).isInstanceOf(InterruptedException.class);
     }
 
-    @Test(expected = InterruptedException.class, timeout = 100)
-    public void getInterrupted2() throws Exception {
+    @Test
+    void getInterrupted2() {
         Thread.currentThread().interrupt();
-        sut.get(5, TimeUnit.MILLISECONDS);
+        assertThatThrownBy(() -> sut.get(5, TimeUnit.MILLISECONDS)).isInstanceOf(InterruptedException. class);
     }
 
-    @Test(expected = RedisCommandInterruptedException.class, timeout = 100)
-    public void awaitInterrupted2() throws Exception {
+    @Test
+    void awaitInterrupted2() {
         Thread.currentThread().interrupt();
-        sut.await(5, TimeUnit.MILLISECONDS);
+        assertThatThrownBy(() -> sut.await(5, TimeUnit.MILLISECONDS)).isInstanceOf(RedisCommandInterruptedException. class);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void outputSubclassOverride1() {
+    @Test
+    void outputSubclassOverride1() {
         CommandOutput<String, String, String> output = new CommandOutput<String, String, String>(codec, null) {
             @Override
             public String get() throws RedisException {
                 return null;
             }
         };
-        output.set(null);
+        assertThatThrownBy(() -> output.set(null)).isInstanceOf(IllegalStateException. class);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void outputSubclassOverride2() {
+    @Test
+    void outputSubclassOverride2() {
         CommandOutput<String, String, String> output = new CommandOutput<String, String, String>(codec, null) {
             @Override
             public String get() throws RedisException {
                 return null;
             }
         };
-        output.set(0);
+        assertThatThrownBy(() -> output.set(0)).isInstanceOf(IllegalStateException. class);
     }
 
     @Test
-    public void sillyTestsForEmmaCoverage() throws Exception {
+    void sillyTestsForEmmaCoverage() {
         assertThat(CommandType.valueOf("APPEND")).isEqualTo(CommandType.APPEND);
         assertThat(CommandKeyword.valueOf("AFTER")).isEqualTo(CommandKeyword.AFTER);
     }
diff --git a/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java b/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java
similarity index 86%
rename from src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
rename to src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java
index 729b290b07..b59edb203c 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandArgsTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java
@@ -20,7 +20,7 @@
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.codec.ByteArrayCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
@@ -30,12 +30,12 @@
 /**
  * @author Mark Paluch
  */
-public class CommandArgsTest {
+class CommandArgsUnitTests {
 
     private Utf8StringCodec codec = new Utf8StringCodec();
 
     @Test
-    public void getFirstIntegerShouldReturnNull()  {
+    void getFirstIntegerShouldReturnNull() {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).add("foo");
 
@@ -43,7 +43,7 @@ public void getFirstIntegerShouldReturnNull()  {
     }
 
     @Test
-    public void getFirstIntegerShouldReturnFirstInteger()  {
+    void getFirstIntegerShouldReturnFirstInteger() {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).add(1L).add(127).add(128).add(129).add(0).add(-1);
 
@@ -51,7 +51,7 @@ public void getFirstIntegerShouldReturnFirstInteger()  {
     }
 
     @Test
-    public void getFirstIntegerShouldReturnFirstNegativeInteger()  {
+    void getFirstIntegerShouldReturnFirstNegativeInteger() {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).add(-1L).add(-127).add(-128).add(-129);
 
@@ -59,7 +59,7 @@ public void getFirstIntegerShouldReturnFirstNegativeInteger()  {
     }
 
     @Test
-    public void getFirstStringShouldReturnNull()  {
+    void getFirstStringShouldReturnNull() {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).add(1);
 
@@ -67,7 +67,7 @@ public void getFirstStringShouldReturnNull()  {
     }
 
     @Test
-    public void getFirstStringShouldReturnFirstString()  {
+    void getFirstStringShouldReturnFirstString() {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).add("one").add("two");
 
@@ -75,7 +75,7 @@ public void getFirstStringShouldReturnFirstString()  {
     }
 
     @Test
-    public void getFirstCharArrayShouldReturnCharArray()  {
+    void getFirstCharArrayShouldReturnCharArray() {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).add(1L).add("two".toCharArray());
 
@@ -83,7 +83,7 @@ public void getFirstCharArrayShouldReturnCharArray()  {
     }
 
     @Test
-    public void getFirstCharArrayShouldReturnNull()  {
+    void getFirstCharArrayShouldReturnNull() {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).add(1L);
 
@@ -91,7 +91,7 @@ public void getFirstCharArrayShouldReturnNull()  {
     }
 
     @Test
-    public void getFirstEncodedKeyShouldReturnNull()  {
+    void getFirstEncodedKeyShouldReturnNull() {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).add(1L);
 
@@ -99,7 +99,7 @@ public void getFirstEncodedKeyShouldReturnNull()  {
     }
 
     @Test
-    public void getFirstEncodedKeyShouldReturnFirstKey()  {
+    void getFirstEncodedKeyShouldReturnFirstKey() {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).addKey("one").addKey("two");
 
@@ -107,7 +107,7 @@ public void getFirstEncodedKeyShouldReturnFirstKey()  {
     }
 
     @Test
-    public void addValues()  {
+    void addValues() {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).addValues(Arrays.asList("1", "2"));
 
@@ -121,7 +121,7 @@ public void addValues()  {
     }
 
     @Test
-    public void addByte()  {
+    void addByte() {
 
         CommandArgs<String, String> args = new CommandArgs<>(codec).add("one".getBytes());
 
@@ -135,7 +135,7 @@ public void addByte()  {
     }
 
     @Test
-    public void addByteUsingByteCodec()  {
+    void addByteUsingByteCodec() {
 
         CommandArgs<byte[], byte[]> args = new CommandArgs<>(ByteArrayCodec.INSTANCE).add("one".getBytes());
 
@@ -149,7 +149,7 @@ public void addByteUsingByteCodec()  {
     }
 
     @Test
-    public void addValueUsingByteCodec()  {
+    void addValueUsingByteCodec() {
 
         CommandArgs<byte[], byte[]> args = new CommandArgs<>(ByteArrayCodec.INSTANCE).addValue("one".getBytes());
 
@@ -163,7 +163,7 @@ public void addValueUsingByteCodec()  {
     }
 
     @Test
-    public void addKeyUsingByteCodec()  {
+    void addKeyUsingByteCodec() {
 
         CommandArgs<byte[], byte[]> args = new CommandArgs<>(ByteArrayCodec.INSTANCE).addValue("one".getBytes());
 
diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
similarity index 83%
rename from src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
rename to src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
index c34bedd74f..20c42b9a7b 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
@@ -26,20 +26,21 @@
 import java.net.InetSocketAddress;
 import java.util.*;
 
-import io.lettuce.core.tracing.Tracing;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.config.LoggerConfig;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.ClientOptions;
@@ -49,14 +50,16 @@
 import io.lettuce.core.metrics.CommandLatencyCollector;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.tracing.Tracing;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.*;
 import io.netty.util.concurrent.ImmediateEventExecutor;
 
-@RunWith(MockitoJUnitRunner.class)
-public class CommandHandlerTest {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class CommandHandlerUnitTests {
 
     private Queue<RedisCommand<String, String, ?>> stack;
 
@@ -92,24 +95,24 @@ public class CommandHandlerTest {
     @Mock
     private CommandLatencyCollector latencyCollector;
 
-    @BeforeClass
-    public static void beforeClass() {
+    @BeforeAll
+    static void beforeClass() {
         LoggerContext ctx = (LoggerContext) LogManager.getContext();
         Configuration config = ctx.getConfiguration();
         LoggerConfig loggerConfig = config.getLoggerConfig(CommandHandler.class.getName());
         loggerConfig.setLevel(Level.ALL);
     }
 
-    @AfterClass
-    public static void afterClass() {
+    @AfterAll
+    static void afterClass() {
         LoggerContext ctx = (LoggerContext) LogManager.getContext();
         Configuration config = ctx.getConfiguration();
         LoggerConfig loggerConfig = config.getLoggerConfig(CommandHandler.class.getName());
         loggerConfig.setLevel(null);
     }
 
-    @Before
-    public void before() throws Exception {
+    @BeforeEach
+    void before() throws Exception {
 
         when(context.channel()).thenReturn(channel);
         when(context.alloc()).thenReturn(ByteBufAllocator.DEFAULT);
@@ -133,7 +136,7 @@ public void before() throws Exception {
     }
 
     @Test
-    public void testChannelActive() throws Exception {
+    void testChannelActive() throws Exception {
         sut.channelRegistered(context);
 
         sut.channelActive(context);
@@ -142,7 +145,7 @@ public void testChannelActive() throws Exception {
     }
 
     @Test
-    public void testExceptionChannelActive() throws Exception {
+    void testExceptionChannelActive() throws Exception {
         sut.setState(CommandHandler.LifecycleState.ACTIVE);
 
         sut.channelActive(context);
@@ -150,7 +153,7 @@ public void testExceptionChannelActive() throws Exception {
     }
 
     @Test
-    public void testIOExceptionChannelActive() throws Exception {
+    void testIOExceptionChannelActive() throws Exception {
         sut.setState(CommandHandler.LifecycleState.ACTIVE);
 
         sut.channelActive(context);
@@ -158,14 +161,14 @@ public void testIOExceptionChannelActive() throws Exception {
     }
 
     @Test
-    public void testExceptionChannelInactive() throws Exception {
+    void testExceptionChannelInactive() throws Exception {
         sut.setState(CommandHandler.LifecycleState.DISCONNECTED);
         sut.exceptionCaught(context, new Exception());
         verify(context, never()).fireExceptionCaught(any(Exception.class));
     }
 
     @Test
-    public void testExceptionWithQueue() throws Exception {
+    void testExceptionWithQueue() throws Exception {
         sut.setState(CommandHandler.LifecycleState.ACTIVE);
         stack.clear();
 
@@ -181,7 +184,7 @@ public void testExceptionWithQueue() throws Exception {
     }
 
     @Test
-    public void testExceptionWhenClosed() throws Exception {
+    void testExceptionWhenClosed() throws Exception {
 
         sut.setState(CommandHandler.LifecycleState.CLOSED);
 
@@ -190,70 +193,70 @@ public void testExceptionWhenClosed() throws Exception {
     }
 
     @Test
-    public void isConnectedShouldReportFalseForNOT_CONNECTED() throws Exception {
+    void isConnectedShouldReportFalseForNOT_CONNECTED() {
 
         sut.setState(CommandHandler.LifecycleState.NOT_CONNECTED);
         assertThat(sut.isConnected()).isFalse();
     }
 
     @Test
-    public void isConnectedShouldReportFalseForREGISTERED() throws Exception {
+    void isConnectedShouldReportFalseForREGISTERED() {
 
         sut.setState(CommandHandler.LifecycleState.REGISTERED);
         assertThat(sut.isConnected()).isFalse();
     }
 
     @Test
-    public void isConnectedShouldReportTrueForCONNECTED() throws Exception {
+    void isConnectedShouldReportTrueForCONNECTED() {
 
         sut.setState(CommandHandler.LifecycleState.CONNECTED);
         assertThat(sut.isConnected()).isTrue();
     }
 
     @Test
-    public void isConnectedShouldReportTrueForACTIVATING() throws Exception {
+    void isConnectedShouldReportTrueForACTIVATING() {
 
         sut.setState(CommandHandler.LifecycleState.ACTIVATING);
         assertThat(sut.isConnected()).isTrue();
     }
 
     @Test
-    public void isConnectedShouldReportTrueForACTIVE() throws Exception {
+    void isConnectedShouldReportTrueForACTIVE() {
 
         sut.setState(CommandHandler.LifecycleState.ACTIVE);
         assertThat(sut.isConnected()).isTrue();
     }
 
     @Test
-    public void isConnectedShouldReportFalseForDISCONNECTED() throws Exception {
+    void isConnectedShouldReportFalseForDISCONNECTED() {
 
         sut.setState(CommandHandler.LifecycleState.DISCONNECTED);
         assertThat(sut.isConnected()).isFalse();
     }
 
     @Test
-    public void isConnectedShouldReportFalseForDEACTIVATING() throws Exception {
+    void isConnectedShouldReportFalseForDEACTIVATING() {
 
         sut.setState(CommandHandler.LifecycleState.DEACTIVATING);
         assertThat(sut.isConnected()).isFalse();
     }
 
     @Test
-    public void isConnectedShouldReportFalseForDEACTIVATED() throws Exception {
+    void isConnectedShouldReportFalseForDEACTIVATED() {
 
         sut.setState(CommandHandler.LifecycleState.DEACTIVATED);
         assertThat(sut.isConnected()).isFalse();
     }
 
     @Test
-    public void isConnectedShouldReportFalseForCLOSED() throws Exception {
+    void isConnectedShouldReportFalseForCLOSED() {
 
         sut.setState(CommandHandler.LifecycleState.CLOSED);
         assertThat(sut.isConnected()).isFalse();
     }
 
     @Test
-    public void shouldNotWriteCancelledCommand() throws Exception {
+    void shouldNotWriteCancelledCommand() throws Exception {
 
         command.cancel();
         sut.write(context, command, promise);
@@ -265,7 +268,7 @@ public void shouldNotWriteCancelledCommand() throws Exception {
     }
 
     @Test
-    public void shouldNotWriteCancelledCommands() throws Exception {
+    void shouldNotWriteCancelledCommands() throws Exception {
 
         command.cancel();
         sut.write(context, Collections.singleton(command), promise);
@@ -277,7 +280,7 @@ public void shouldNotWriteCancelledCommands() throws Exception {
     }
 
     @Test
-    public void shouldCancelCommandOnQueueSingleFailure() throws Exception {
+    void shouldCancelCommandOnQueueSingleFailure() throws Exception {
 
         Command<String, String, String> commandMock = mock(Command.class);
 
@@ -297,7 +300,7 @@ public void shouldCancelCommandOnQueueSingleFailure() throws Exception {
     }
 
     @Test
-    public void shouldCancelCommandOnQueueBatchFailure() throws Exception {
+    void shouldCancelCommandOnQueueBatchFailure() throws Exception {
 
         Command<String, String, String> commandMock = mock(Command.class);
 
@@ -317,7 +320,7 @@ public void shouldCancelCommandOnQueueBatchFailure() throws Exception {
     }
 
     @Test
-    public void shouldFailOnDuplicateCommands() throws Exception {
+    void shouldFailOnDuplicateCommands() throws Exception {
 
         Command<String, String, String> commandMock = mock(Command.class);
 
@@ -329,7 +332,7 @@ public void shouldFailOnDuplicateCommands() throws Exception {
     }
 
     @Test
-    public void shouldWriteActiveCommands() throws Exception {
+    void shouldWriteActiveCommands() throws Exception {
 
         when(promise.isVoid()).thenReturn(true);
 
@@ -340,7 +343,7 @@ public void shouldWriteActiveCommands() throws Exception {
     }
 
     @Test
-    public void shouldNotWriteCancelledCommandBatch() throws Exception {
+    void shouldNotWriteCancelledCommandBatch() throws Exception {
 
         command.cancel();
         sut.write(context, Arrays.asList(command), promise);
@@ -350,7 +353,7 @@ public void shouldNotWriteCancelledCommandBatch() throws Exception {
     }
 
     @Test
-    public void shouldWriteSingleActiveCommandsInBatch() throws Exception {
+    void shouldWriteSingleActiveCommandsInBatch() throws Exception {
 
         List<Command<String, String, String>> commands = Arrays.asList(command);
         when(promise.isVoid()).thenReturn(true);
@@ -361,7 +364,7 @@ public void shouldWriteSingleActiveCommandsInBatch() throws Exception {
     }
 
     @Test
-    public void shouldWriteActiveCommandsInBatch() throws Exception {
+    void shouldWriteActiveCommandsInBatch() throws Exception {
 
         Command<String, String, String> anotherCommand = new Command<>(CommandType.APPEND,
                 new StatusOutput<>(StringCodec.UTF8), null);
@@ -376,7 +379,7 @@ public void shouldWriteActiveCommandsInBatch() throws Exception {
 
     @Test
     @SuppressWarnings("unchecked")
-    public void shouldWriteActiveCommandsInMixedBatch() throws Exception {
+    void shouldWriteActiveCommandsInMixedBatch() throws Exception {
 
         Command<String, String, String> command2 = new Command<>(CommandType.APPEND, new StatusOutput<>(StringCodec.UTF8), null);
         command.cancel();
@@ -393,7 +396,7 @@ public void shouldWriteActiveCommandsInMixedBatch() throws Exception {
     }
 
     @Test
-    public void shouldRecordCorrectFirstResponseLatency() throws Exception {
+    void shouldRecordCorrectFirstResponseLatency() throws Exception {
 
         ChannelPromise channelPromise = new DefaultChannelPromise(channel, ImmediateEventExecutor.INSTANCE);
         channelPromise.setSuccess();
@@ -414,7 +417,7 @@ public void shouldRecordCorrectFirstResponseLatency() throws Exception {
     }
 
     @Test
-    public void shouldIgnoreNonReadableBuffers() throws Exception {
+    void shouldIgnoreNonReadableBuffers() throws Exception {
 
         ByteBuf byteBufMock = mock(ByteBuf.class);
         when(byteBufMock.isReadable()).thenReturn(false);
diff --git a/src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java b/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java
similarity index 73%
rename from src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java
rename to src/test/java/io/lettuce/core/protocol/CommandUnitTests.java
index 24d29ca7b6..ff3d210840 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandInternalsTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java
@@ -17,9 +17,10 @@
 
 import static io.lettuce.core.protocol.LettuceCharsets.buffer;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.RedisCodec;
@@ -31,20 +32,20 @@
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class CommandInternalsTest {
+public class CommandUnitTests {
 
-    protected RedisCodec<String, String> codec = new Utf8StringCodec();
-    protected Command<String, String, String> sut;
+    private RedisCodec<String, String> codec = new Utf8StringCodec();
+    private Command<String, String, String> sut;
 
-    @Before
-    public void createCommand() {
+    @BeforeEach
+    void createCommand() {
 
-        CommandOutput<String, String, String> output = new StatusOutput<String, String>(codec);
+        CommandOutput<String, String, String> output = new StatusOutput<>(codec);
         sut = new Command<>(CommandType.INFO, output, null);
     }
 
     @Test
-    public void isCancelled() {
+    void isCancelled() {
         assertThat(sut.isCancelled()).isFalse();
         assertThat(sut.isDone()).isFalse();
 
@@ -57,7 +58,7 @@ public void isCancelled() {
     }
 
     @Test
-    public void isDone() {
+    void isDone() {
         assertThat(sut.isCancelled()).isFalse();
         assertThat(sut.isDone()).isFalse();
 
@@ -68,77 +69,77 @@ public void isDone() {
     }
 
     @Test
-    public void get() {
+    void get() {
         assertThat(sut.get()).isNull();
         sut.getOutput().set(buffer("one"));
         assertThat(sut.get()).isEqualTo("one");
     }
 
     @Test
-    public void getError() {
+    void getError() {
         sut.getOutput().setError("error");
         assertThat(sut.getError()).isEqualTo("error");
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void setOutputAfterCompleted() {
+    @Test
+    void setOutputAfterCompleted() {
         sut.complete();
-        sut.setOutput(new StatusOutput<>(codec));
+        assertThatThrownBy(() -> sut.setOutput(new StatusOutput<>(codec))).isInstanceOf(IllegalStateException.class);
     }
 
     @Test
-    public void testToString() {
+    void testToString() {
         assertThat(sut.toString()).contains("Command");
     }
 
     @Test
-    public void customKeyword() {
+    void customKeyword() {
 
-        sut = new Command<String, String, String>(MyKeywords.DUMMY, null, null);
-        sut.setOutput(new StatusOutput<String, String>(codec));
+        sut = new Command<>(MyKeywords.DUMMY, null, null);
+        sut.setOutput(new StatusOutput<>(codec));
 
         assertThat(sut.toString()).contains(MyKeywords.DUMMY.name());
     }
 
     @Test
-    public void customKeywordWithArgs() {
-        sut = new Command<String, String, String>(MyKeywords.DUMMY, null, new CommandArgs<String, String>(codec));
+    void customKeywordWithArgs() {
+        sut = new Command<>(MyKeywords.DUMMY, null, new CommandArgs<>(codec));
         sut.getArgs().add(MyKeywords.DUMMY);
         assertThat(sut.getArgs().toString()).contains(MyKeywords.DUMMY.name());
     }
 
     @Test
-    public void getWithTimeout() {
+    void getWithTimeout() {
         sut.getOutput().set(buffer("one"));
         sut.complete();
 
         assertThat(sut.get()).isEqualTo("one");
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void outputSubclassOverride1() {
+    @Test
+    void outputSubclassOverride1() {
         CommandOutput<String, String, String> output = new CommandOutput<String, String, String>(codec, null) {
             @Override
             public String get() throws RedisException {
                 return null;
             }
         };
-        output.set(null);
+        assertThatThrownBy(() -> output.set(null)).isInstanceOf(IllegalStateException.class);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void outputSubclassOverride2() {
+    @Test
+    void outputSubclassOverride2() {
         CommandOutput<String, String, String> output = new CommandOutput<String, String, String>(codec, null) {
             @Override
             public String get() throws RedisException {
                 return null;
             }
         };
-        output.set(0);
+        assertThatThrownBy(() -> output.set(0)).isInstanceOf(IllegalStateException.class);
     }
 
     @Test
-    public void sillyTestsForEmmaCoverage() {
+    void sillyTestsForEmmaCoverage() {
         assertThat(CommandType.valueOf("APPEND")).isEqualTo(CommandType.APPEND);
         assertThat(CommandKeyword.valueOf("AFTER")).isEqualTo(CommandKeyword.AFTER);
     }
diff --git a/src/test/java/io/lettuce/core/protocol/CommandWrapperTest.java b/src/test/java/io/lettuce/core/protocol/CommandWrapperUnitTests.java
similarity index 83%
rename from src/test/java/io/lettuce/core/protocol/CommandWrapperTest.java
rename to src/test/java/io/lettuce/core/protocol/CommandWrapperUnitTests.java
index 8d6dd4e9b3..879088dc8f 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandWrapperTest.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandWrapperUnitTests.java
@@ -19,8 +19,8 @@
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
@@ -30,20 +30,20 @@
 /**
  * @author Mark Paluch
  */
-public class CommandWrapperTest {
+class CommandWrapperUnitTests {
 
-    protected RedisCodec<String, String> codec = StringCodec.UTF8;
-    protected Command<String, String, String> sut;
+    private RedisCodec<String, String> codec = StringCodec.UTF8;
+    private Command<String, String, String> sut;
 
-    @Before
-    public final void createCommand() throws Exception {
+    @BeforeEach
+    final void createCommand() {
 
         CommandOutput<String, String, String> output = new StatusOutput<>(codec);
         sut = new Command<>(CommandType.INFO, output, null);
     }
 
     @Test
-    public void shouldAppendOnComplete() {
+    void shouldAppendOnComplete() {
 
         AtomicReference<Boolean> v1 = new AtomicReference<>();
         AtomicReference<Boolean> v2 = new AtomicReference<>();
diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
index d407d3a858..c75edfc9c8 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
@@ -16,24 +16,30 @@
 package io.lettuce.core.protocol;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.time.Duration;
-import java.util.concurrent.*;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import io.lettuce.ConnectionTestUtil;
-import io.lettuce.Wait;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.server.RandomResponseServer;
+import io.lettuce.test.ConnectionTestUtil;
+import io.lettuce.test.Futures;
+import io.lettuce.test.Wait;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class ConnectionFailureTest extends AbstractRedisClientTest {
+class ConnectionFailureTest extends AbstractRedisClientTest {
 
     private RedisURI defaultRedisUri = RedisURI.Builder.redis(TestSettings.host(), TestSettings.port()).build();
 
@@ -42,8 +48,8 @@ public class ConnectionFailureTest extends AbstractRedisClientTest {
      *
      * @throws Exception
      */
-    @Test(timeout = 10000)
-    public void pingBeforeConnectFails() throws Exception {
+    @Test
+    void pingBeforeConnectFails() throws Exception {
 
         client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
 
@@ -70,8 +76,8 @@ public void pingBeforeConnectFails() throws Exception {
      *
      * @throws Exception
      */
-    @Test(timeout = 12000)
-    public void pingBeforeConnectFailOnReconnect() throws Exception {
+    @Test
+    void pingBeforeConnectFailOnReconnect() throws Exception {
 
         ClientOptions clientOptions = ClientOptions.builder().pingBeforeActivateConnection(true)
                 .suspendReconnectOnProtocolFailure(true).build();
@@ -99,14 +105,9 @@ public void pingBeforeConnectFailOnReconnect() throws Exception {
 
             assertThat(connectionWatchdog.isListenOnChannelInactive()).isTrue();
 
-            try {
-                connection.info().get(5, TimeUnit.SECONDS);
-            } catch (ExecutionException e) {
-                assertThat(e).hasRootCauseExactlyInstanceOf(RedisException.class);
-                assertThat(e.getCause()).hasMessageStartingWith("Invalid first byte");
-            } catch (TimeoutException e) {
-                // happens once in a while...
-            }
+            assertThatThrownBy(() -> Futures.await(connection.info())).hasRootCauseInstanceOf(RedisException.class)
+                    .hasMessageContaining("Invalid first byte");
+
             connection.getStatefulConnection().close();
         } finally {
             ts.shutdown();
@@ -120,8 +121,8 @@ public void pingBeforeConnectFailOnReconnect() throws Exception {
      *
      * @throws Exception
      */
-    @Test(timeout = 120000)
-    public void pingBeforeConnectFailOnReconnectShouldSendEvents() throws Exception {
+    @Test
+    void pingBeforeConnectFailOnReconnectShouldSendEvents() throws Exception {
 
         client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).suspendReconnectOnProtocolFailure(false)
                 .build());
@@ -167,8 +168,8 @@ public void pingBeforeConnectFailOnReconnectShouldSendEvents() throws Exception
      *
      * @throws Exception
      */
-    @Test(timeout = 10000)
-    public void cancelCommandsOnReconnectFailure() throws Exception {
+    @Test
+    void cancelCommandsOnReconnectFailure() throws Exception {
 
         client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).cancelCommandsOnReconnectFailure(true)
                 .build());
@@ -203,24 +204,11 @@ public void cancelCommandsOnReconnectFailure() throws Exception {
             Thread.sleep(500);
             assertThat(connection.getStatefulConnection().isOpen()).isFalse();
 
-            try {
-                set1.get();
-            } catch (CancellationException e) {
-                assertThat(e).hasNoCause();
-            }
-
-            try {
-                set2.get();
-            } catch (CancellationException e) {
-                assertThat(e).hasNoCause();
-            }
-
-            try {
-                connection.info().get();
-            } catch (ExecutionException e) {
-                assertThat(e).hasRootCauseExactlyInstanceOf(RedisException.class);
-                assertThat(e.getCause()).hasMessageStartingWith("Invalid first byte");
-            }
+            assertThatThrownBy(set1::get).isInstanceOf(CancellationException.class).hasNoCause();
+            assertThatThrownBy(set2::get).isInstanceOf(CancellationException.class).hasNoCause();
+
+            assertThatThrownBy(() -> Futures.await(connection.info())).isInstanceOf(RedisException.class).hasMessageContaining(
+                    "Invalid first byte");
 
             connection.getStatefulConnection().close();
         } finally {
@@ -234,7 +222,7 @@ public void cancelCommandsOnReconnectFailure() throws Exception {
      * @throws Exception
      */
     @Test
-    public void closingDisconnectedConnectionShouldDisableConnectionWatchdog() throws Exception {
+    void closingDisconnectedConnectionShouldDisableConnectionWatchdog() throws Exception {
 
         client.setOptions(ClientOptions.create());
 
@@ -262,7 +250,7 @@ public void closingDisconnectedConnectionShouldDisableConnectionWatchdog() throw
         assertThat(connectionWatchdog.isListenOnChannelInactive()).isFalse();
     }
 
-    protected RandomResponseServer getRandomResponseServer() throws InterruptedException {
+    RandomResponseServer getRandomResponseServer() throws InterruptedException {
         RandomResponseServer ts = new RandomResponseServer();
         ts.initialize(TestSettings.nonexistentPort());
         return ts;
diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
similarity index 85%
rename from src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
rename to src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
index fcf26d4aef..2851f727c5 100644
--- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointTest.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
@@ -33,31 +33,37 @@
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.config.LoggerConfig;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import edu.umd.cs.mtc.MultithreadedTestCase;
 import edu.umd.cs.mtc.TestFramework;
-import io.lettuce.ConnectionTestUtil;
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.internal.LettuceFactories;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.resource.ClientResources;
+import io.lettuce.test.ConnectionTestUtil;
 import io.netty.channel.*;
 import io.netty.handler.codec.EncoderException;
 import io.netty.util.concurrent.ImmediateEventExecutor;
 
-@RunWith(MockitoJUnitRunner.class)
-public class DefaultEndpointTest {
+/**
+ * @author Mark Paluch
+ */
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class DefaultEndpointUnitTests {
 
     private Queue<RedisCommand<String, String, ?>> queue = LettuceFactories.newConcurrentQueue(1000);
 
@@ -80,24 +86,24 @@ public class DefaultEndpointTest {
 
     private ChannelPromise promise;
 
-    @BeforeClass
-    public static void beforeClass() {
+    @BeforeAll
+    static void beforeClass() {
         LoggerContext ctx = (LoggerContext) LogManager.getContext();
         Configuration config = ctx.getConfiguration();
         LoggerConfig loggerConfig = config.getLoggerConfig(CommandHandler.class.getName());
         loggerConfig.setLevel(Level.ALL);
     }
 
-    @AfterClass
-    public static void afterClass() {
+    @AfterAll
+    static void afterClass() {
         LoggerContext ctx = (LoggerContext) LogManager.getContext();
         Configuration config = ctx.getConfiguration();
         LoggerConfig loggerConfig = config.getLoggerConfig(CommandHandler.class.getName());
         loggerConfig.setLevel(null);
     }
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
 
         promise = new DefaultChannelPromise(channel);
         when(channel.writeAndFlush(any())).thenAnswer(invocation -> {
@@ -127,7 +133,7 @@ public void before() {
     }
 
     @Test
-    public void writeConnectedShouldWriteCommandToChannel() {
+    void writeConnectedShouldWriteCommandToChannel() {
 
         when(channel.isActive()).thenReturn(true);
 
@@ -139,7 +145,7 @@ public void writeConnectedShouldWriteCommandToChannel() {
     }
 
     @Test
-    public void writeDisconnectedShouldBufferCommands() {
+    void writeDisconnectedShouldBufferCommands() {
 
         sut.write(command);
 
@@ -149,7 +155,7 @@ public void writeDisconnectedShouldBufferCommands() {
     }
 
     @Test
-    public void notifyChannelActiveActivatesFacade() {
+    void notifyChannelActiveActivatesFacade() {
 
         sut.notifyChannelActive(channel);
 
@@ -157,7 +163,7 @@ public void notifyChannelActiveActivatesFacade() {
     }
 
     @Test
-    public void notifyChannelActiveArmsConnectionWatchdog() {
+    void notifyChannelActiveArmsConnectionWatchdog() {
 
         sut.registerConnectionWatchdog(connectionWatchdog);
 
@@ -167,7 +173,7 @@ public void notifyChannelActiveArmsConnectionWatchdog() {
     }
 
     @Test
-    public void notifyChannelInactiveDeactivatesFacade() {
+    void notifyChannelInactiveDeactivatesFacade() {
 
         sut.notifyChannelInactive(channel);
 
@@ -175,7 +181,7 @@ public void notifyChannelInactiveDeactivatesFacade() {
     }
 
     @Test
-    public void notifyExceptionShouldStoreException() {
+    void notifyExceptionShouldStoreException() {
 
         sut.notifyException(new IllegalStateException());
         sut.write(command);
@@ -184,7 +190,7 @@ public void notifyExceptionShouldStoreException() {
     }
 
     @Test
-    public void notifyChannelActiveClearsStoredException() {
+    void notifyChannelActiveClearsStoredException() {
 
         sut.notifyException(new IllegalStateException());
         sut.notifyChannelActive(channel);
@@ -194,7 +200,7 @@ public void notifyChannelActiveClearsStoredException() {
     }
 
     @Test
-    public void notifyDrainQueuedCommandsShouldBufferCommands() {
+    void notifyDrainQueuedCommandsShouldBufferCommands() {
 
         Queue<RedisCommand<?, ?, ?>> q = LettuceFactories.newConcurrentQueue(100);
         q.add(command);
@@ -206,7 +212,7 @@ public void notifyDrainQueuedCommandsShouldBufferCommands() {
     }
 
     @Test
-    public void notifyDrainQueuedCommandsShouldWriteCommands() {
+    void notifyDrainQueuedCommandsShouldWriteCommands() {
 
         when(channel.isActive()).thenReturn(true);
 
@@ -222,7 +228,7 @@ public void notifyDrainQueuedCommandsShouldWriteCommands() {
     }
 
     @Test
-    public void shouldCancelCommandsOnEncoderException() {
+    void shouldCancelCommandsOnEncoderException() {
 
         when(channel.isActive()).thenReturn(true);
         sut.notifyChannelActive(channel);
@@ -248,7 +254,7 @@ public void shouldCancelCommandsOnEncoderException() {
     }
 
     @Test
-    public void writeShouldRejectCommandsInDisconnectedState() {
+    void writeShouldRejectCommandsInDisconnectedState() {
 
         sut = new DefaultEndpoint(ClientOptions.builder() //
                 .disconnectedBehavior(ClientOptions.DisconnectedBehavior.REJECT_COMMANDS) //
@@ -263,7 +269,7 @@ public void writeShouldRejectCommandsInDisconnectedState() {
     }
 
     @Test
-    public void writeShouldRejectCommandsInClosedState() {
+    void writeShouldRejectCommandsInClosedState() {
 
         sut.close();
 
@@ -276,7 +282,7 @@ public void writeShouldRejectCommandsInClosedState() {
     }
 
     @Test
-    public void writeWithoutAutoReconnectShouldRejectCommandsInDisconnectedState() {
+    void writeWithoutAutoReconnectShouldRejectCommandsInDisconnectedState() {
 
         sut = new DefaultEndpoint(ClientOptions.builder() //
                 .autoReconnect(false) //
@@ -292,7 +298,7 @@ public void writeWithoutAutoReconnectShouldRejectCommandsInDisconnectedState() {
     }
 
     @Test
-    public void closeCleansUpResources() {
+    void closeCleansUpResources() {
 
         ChannelFuture future = mock(ChannelFuture.class);
         when(future.isSuccess()).thenReturn(true);
@@ -308,7 +314,7 @@ public void closeCleansUpResources() {
     }
 
     @Test
-    public void closeAllowsOnlyOneCall() {
+    void closeAllowsOnlyOneCall() {
 
         ChannelFuture future = mock(ChannelFuture.class);
         when(future.isSuccess()).thenReturn(true);
@@ -325,7 +331,7 @@ public void closeAllowsOnlyOneCall() {
     }
 
     @Test
-    public void retryListenerCompletesSuccessfullyAfterDeferredRequeue() {
+    void retryListenerCompletesSuccessfullyAfterDeferredRequeue() {
 
         DefaultEndpoint.RetryListener listener = DefaultEndpoint.RetryListener.newInstance(sut, command);
 
@@ -351,7 +357,7 @@ public void retryListenerCompletesSuccessfullyAfterDeferredRequeue() {
     }
 
     @Test
-    public void retryListenerDoesNotRetryCompletedCommands() {
+    void retryListenerDoesNotRetryCompletedCommands() {
 
         DefaultEndpoint.RetryListener listener = DefaultEndpoint.RetryListener.newInstance(sut, command);
 
@@ -366,7 +372,7 @@ public void retryListenerDoesNotRetryCompletedCommands() {
     }
 
     @Test
-    public void testMTCConcurrentConcurrentWrite() throws Throwable {
+    void testMTCConcurrentConcurrentWrite() throws Throwable {
         TestFramework.runOnce(new MTCConcurrentConcurrentWrite(command, clientResources));
     }
 
@@ -378,7 +384,7 @@ static class MTCConcurrentConcurrentWrite extends MultithreadedTestCase {
         private final Command<String, String, String> command;
         private TestableEndpoint handler;
 
-        public MTCConcurrentConcurrentWrite(Command<String, String, String> command, ClientResources clientResources) {
+        MTCConcurrentConcurrentWrite(Command<String, String, String> command, ClientResources clientResources) {
 
             this.command = command;
 
@@ -398,13 +404,13 @@ public MTCConcurrentConcurrentWrite(Command<String, String, String> command, Cli
             };
         }
 
-        public void thread1() throws InterruptedException {
+        public void thread1() {
 
             waitForTick(1);
             handler.write(command);
         }
 
-        public void thread2() throws InterruptedException {
+        public void thread2() {
 
             waitForTick(1);
             handler.write(command);
@@ -419,7 +425,7 @@ static class TestableEndpoint extends DefaultEndpoint {
          * @param clientOptions client options for this connection, must not be {@literal null}.
          * @param clientResources client resources for this connection, must not be {@literal null}.
          */
-        public TestableEndpoint(ClientOptions clientOptions, ClientResources clientResources) {
+        TestableEndpoint(ClientOptions clientOptions, ClientResources clientResources) {
             super(clientOptions, clientResources);
         }
     }
diff --git a/src/test/java/io/lettuce/core/protocol/StateMachineTest.java b/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
similarity index 75%
rename from src/test/java/io/lettuce/core/protocol/StateMachineTest.java
rename to src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
index 7cdae60c82..ee9897ca48 100644
--- a/src/test/java/io/lettuce/core/protocol/StateMachineTest.java
+++ b/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
@@ -17,6 +17,7 @@
 
 import static io.lettuce.core.protocol.RedisStateMachine.State;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.nio.charset.Charset;
 import java.util.Arrays;
@@ -27,10 +28,10 @@
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.config.LoggerConfig;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.RedisCodec;
@@ -43,14 +44,14 @@
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class StateMachineTest {
-    protected RedisCodec<String, String> codec = new Utf8StringCodec();
-    protected Charset charset = Charset.forName("UTF-8");
-    protected CommandOutput<String, String, String> output;
-    protected RedisStateMachine rsm;
+class StateMachineUnitTests {
+    private RedisCodec<String, String> codec = new Utf8StringCodec();
+    private Charset charset = Charset.forName("UTF-8");
+    private CommandOutput<String, String, String> output;
+    private RedisStateMachine rsm;
 
-    @BeforeClass
-    public static void beforeClass() {
+    @BeforeAll
+    static void beforeClass() {
 
         LoggerContext ctx = (LoggerContext) LogManager.getContext();
         Configuration config = ctx.getConfiguration();
@@ -58,49 +59,49 @@ public static void beforeClass() {
         loggerConfig.setLevel(Level.ALL);
     }
 
-    @AfterClass
-    public static void afterClass() {
+    @AfterAll
+    static void afterClass() {
         LoggerContext ctx = (LoggerContext) LogManager.getContext();
         Configuration config = ctx.getConfiguration();
         LoggerConfig loggerConfig = config.getLoggerConfig(RedisStateMachine.class.getName());
         loggerConfig.setLevel(null);
     }
 
-    @Before
-    public final void createStateMachine() throws Exception {
-        output = new StatusOutput<String, String>(codec);
+    @BeforeEach
+    final void createStateMachine() {
+        output = new StatusOutput<>(codec);
         rsm = new RedisStateMachine();
     }
 
     @Test
-    public void single() throws Exception {
+    void single() {
         assertThat(rsm.decode(buffer("+OK\r\n"), output)).isTrue();
         assertThat(output.get()).isEqualTo("OK");
     }
 
     @Test
-    public void error() throws Exception {
+    void error() {
         assertThat(rsm.decode(buffer("-ERR\r\n"), output)).isTrue();
         assertThat(output.getError()).isEqualTo("ERR");
     }
 
     @Test
-    public void errorWithoutLineBreak() throws Exception {
+    void errorWithoutLineBreak() {
         assertThat(rsm.decode(buffer("-ERR"), output)).isFalse();
         assertThat(rsm.decode(buffer("\r\n"), output)).isTrue();
         assertThat(output.getError()).isEqualTo("");
     }
 
     @Test
-    public void integer() throws Exception {
-        CommandOutput<String, String, Long> output = new IntegerOutput<String, String>(codec);
+    void integer() {
+        CommandOutput<String, String, Long> output = new IntegerOutput<>(codec);
         assertThat(rsm.decode(buffer(":1\r\n"), output)).isTrue();
         assertThat((long) output.get()).isEqualTo(1);
     }
 
     @Test
-    public void bulk() throws Exception {
-        CommandOutput<String, String, String> output = new ValueOutput<String, String>(codec);
+    void bulk() {
+        CommandOutput<String, String, String> output = new ValueOutput<>(codec);
         assertThat(rsm.decode(buffer("$-1\r\n"), output)).isTrue();
         assertThat(output.get()).isNull();
         assertThat(rsm.decode(buffer("$3\r\nfoo\r\n"), output)).isTrue();
@@ -108,16 +109,16 @@ public void bulk() throws Exception {
     }
 
     @Test
-    public void multi() throws Exception {
-        CommandOutput<String, String, List<String>> output = new ValueListOutput<String, String>(codec);
+    void multi() {
+        CommandOutput<String, String, List<String>> output = new ValueListOutput<>(codec);
         ByteBuf buffer = buffer("*2\r\n$-1\r\n$2\r\nok\r\n");
         assertThat(rsm.decode(buffer, output)).isTrue();
         assertThat(output.get()).isEqualTo(Arrays.asList(null, "ok"));
     }
 
     @Test
-    public void multiEmptyArray1() throws Exception {
-        CommandOutput<String, String, List<Object>> output = new NestedMultiOutput<String, String>(codec);
+    void multiEmptyArray1() {
+        CommandOutput<String, String, List<Object>> output = new NestedMultiOutput<>(codec);
         ByteBuf buffer = buffer("*2\r\n$3\r\nABC\r\n*0\r\n");
         assertThat(rsm.decode(buffer, output)).isTrue();
         assertThat(output.get().get(0)).isEqualTo("ABC");
@@ -126,8 +127,8 @@ public void multiEmptyArray1() throws Exception {
     }
 
     @Test
-    public void multiEmptyArray2() throws Exception {
-        CommandOutput<String, String, List<Object>> output = new NestedMultiOutput<String, String>(codec);
+    void multiEmptyArray2() {
+        CommandOutput<String, String, List<Object>> output = new NestedMultiOutput<>(codec);
         ByteBuf buffer = buffer("*2\r\n*0\r\n$3\r\nABC\r\n");
         assertThat(rsm.decode(buffer, output)).isTrue();
         assertThat(output.get().get(0)).isEqualTo(Arrays.asList());
@@ -136,8 +137,8 @@ public void multiEmptyArray2() throws Exception {
     }
 
     @Test
-    public void multiEmptyArray3() throws Exception {
-        CommandOutput<String, String, List<Object>> output = new NestedMultiOutput<String, String>(codec);
+    void multiEmptyArray3() {
+        CommandOutput<String, String, List<Object>> output = new NestedMultiOutput<>(codec);
         ByteBuf buffer = buffer("*2\r\n*2\r\n$2\r\nAB\r\n$2\r\nXY\r\n*0\r\n");
         assertThat(rsm.decode(buffer, output)).isTrue();
         assertThat(output.get().get(0)).isEqualTo(Arrays.asList("AB", "XY"));
@@ -146,7 +147,7 @@ public void multiEmptyArray3() throws Exception {
     }
 
     @Test
-    public void partialFirstLine() throws Exception {
+    void partialFirstLine() {
         assertThat(rsm.decode(buffer("+"), output)).isFalse();
         assertThat(rsm.decode(buffer("-"), output)).isFalse();
         assertThat(rsm.decode(buffer(":"), output)).isFalse();
@@ -154,17 +155,17 @@ public void partialFirstLine() throws Exception {
         assertThat(rsm.decode(buffer("*"), output)).isFalse();
     }
 
-    @Test(expected = RedisException.class)
-    public void invalidReplyType() throws Exception {
-        rsm.decode(buffer("="), output);
+    @Test
+    void invalidReplyType() {
+        assertThatThrownBy(() -> rsm.decode(buffer("="), output)).isInstanceOf(RedisException.class);
     }
 
     @Test
-    public void sillyTestsForEmmaCoverage() throws Exception {
+    void sillyTestsForEmmaCoverage() {
         assertThat(State.Type.valueOf("SINGLE")).isEqualTo(State.Type.SINGLE);
     }
 
-    protected ByteBuf buffer(String content) {
+    ByteBuf buffer(String content) {
         return Unpooled.copiedBuffer(content, charset);
     }
 }
diff --git a/src/test/java/io/lettuce/core/protocol/TransactionalCommandTest.java b/src/test/java/io/lettuce/core/protocol/TransactionalCommandUnitTests.java
similarity index 91%
rename from src/test/java/io/lettuce/core/protocol/TransactionalCommandTest.java
rename to src/test/java/io/lettuce/core/protocol/TransactionalCommandUnitTests.java
index 7d8cb3d707..52126ab8fd 100644
--- a/src/test/java/io/lettuce/core/protocol/TransactionalCommandTest.java
+++ b/src/test/java/io/lettuce/core/protocol/TransactionalCommandUnitTests.java
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.StringCodec;
@@ -26,10 +26,10 @@
 /**
  * @author Mark Paluch
  */
-public class TransactionalCommandTest {
+class TransactionalCommandUnitTests {
 
     @Test
-    public void shouldCompleteOnException() {
+    void shouldCompleteOnException() {
 
         RedisCommand<String, String, String> inner = new Command<>(CommandType.SET, new StatusOutput<>(StringCodec.UTF8));
 
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
similarity index 90%
rename from src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java
rename to src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
index e02ff6b050..5f36b86a2d 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
@@ -22,12 +22,12 @@
 
 import java.util.Queue;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.ClientOptions;
@@ -48,8 +48,8 @@
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class PubSubCommandHandlerTest {
+@ExtendWith(MockitoExtension.class)
+class PubSubCommandHandlerUnitTests {
 
     private Queue<RedisCommand<String, String, ?>> stack;
 
@@ -80,8 +80,8 @@ public class PubSubCommandHandlerTest {
     private PubSubEndpoint<String, String> endpoint;
 
     @SuppressWarnings("unchecked")
-    @Before
-    public void before() throws Exception {
+    @BeforeEach
+    void before() {
 
         when(channel.config()).thenReturn(channelConfig);
         when(context.alloc()).thenReturn(ByteBufAllocator.DEFAULT);
@@ -103,7 +103,7 @@ public void before() throws Exception {
     }
 
     @Test
-    public void shouldCompleteCommandExceptionallyOnOutputFailure() throws Exception {
+    void shouldCompleteCommandExceptionallyOnOutputFailure() throws Exception {
 
         sut.channelRegistered(context);
         sut.channelActive(context);
@@ -115,7 +115,7 @@ public void shouldCompleteCommandExceptionallyOnOutputFailure() throws Exception
     }
 
     @Test
-    public void shouldDecodeRegularCommand() throws Exception {
+    void shouldDecodeRegularCommand() throws Exception {
 
         sut.channelRegistered(context);
         sut.channelActive(context);
@@ -127,7 +127,7 @@ public void shouldDecodeRegularCommand() throws Exception {
     }
 
     @Test
-    public void shouldDecodeTwoCommands() throws Exception {
+    void shouldDecodeTwoCommands() throws Exception {
 
         Command<String, String, String> command1 = new Command<>(CommandType.APPEND, new StatusOutput<>(new Utf8StringCodec()),
                 null);
@@ -146,7 +146,7 @@ public void shouldDecodeTwoCommands() throws Exception {
     }
 
     @Test
-    public void shouldPropagatePubSubResponseToOutput() throws Exception {
+    void shouldPropagatePubSubResponseToOutput() throws Exception {
 
         Command<String, String, String> command1 = new Command<>(CommandType.APPEND, new StatusOutput<>(new Utf8StringCodec()),
                 null);
@@ -163,7 +163,7 @@ public void shouldPropagatePubSubResponseToOutput() throws Exception {
     }
 
     @Test
-    public void shouldPropagateInterleavedPubSubResponseToOutput() throws Exception {
+    void shouldPropagateInterleavedPubSubResponseToOutput() throws Exception {
 
         Command<String, String, String> command1 = new Command<>(CommandType.APPEND, new StatusOutput<>(new Utf8StringCodec()),
                 null);
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
index 856522170f..0b7e2c39a3 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
@@ -17,7 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.assertj.core.api.Fail.fail;
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.junit.Assert.assertThat;
 
@@ -27,22 +26,24 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.Wait;
 import io.lettuce.core.*;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.internal.LettuceFactories;
 import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
+import io.lettuce.test.Futures;
+import io.lettuce.test.Wait;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class PubSubCommandTest extends AbstractRedisClientTest implements RedisPubSubListener<String, String> {
+class PubSubCommandTest extends AbstractRedisClientTest implements RedisPubSubListener<String, String> {
     private RedisPubSubAsyncCommands<String, String> pubsub;
 
     private BlockingQueue<String> channels;
@@ -54,8 +55,8 @@ public class PubSubCommandTest extends AbstractRedisClientTest implements RedisP
     private String pattern = "channel*";
     private String message = "msg!";
 
-    @Before
-    public void openPubSubConnection() {
+    @BeforeEach
+    void openPubSubConnection() {
         pubsub = client.connectPubSub().async();
         pubsub.getStatefulConnection().addListener(this);
         channels = LettuceFactories.newBlockingQueue();
@@ -64,13 +65,13 @@ public void openPubSubConnection() {
         counts = LettuceFactories.newBlockingQueue();
     }
 
-    @After
-    public void closePubSubConnection() {
+    @AfterEach
+    void closePubSubConnection() {
         pubsub.getStatefulConnection().close();
     }
 
     @Test
-    public void auth() {
+    void auth() {
         new WithPasswordRequired() {
             @Override
             protected void run(RedisClient client) throws Exception {
@@ -85,7 +86,7 @@ protected void run(RedisClient client) throws Exception {
     }
 
     @Test
-    public void authWithReconnect() {
+    void authWithReconnect() {
 
         new WithPasswordRequired() {
             @Override
@@ -105,8 +106,8 @@ protected void run(RedisClient client) throws Exception {
         };
     }
 
-    @Test(timeout = 2000)
-    public void message() throws Exception {
+    @Test
+    void message() throws Exception {
         pubsub.subscribe(channel);
         assertThat(channels.take()).isEqualTo(channel);
 
@@ -115,8 +116,8 @@ public void message() throws Exception {
         assertThat(messages.take()).isEqualTo(message);
     }
 
-    @Test(timeout = 2000)
-    public void pipelinedMessage() throws Exception {
+    @Test
+    void pipelinedMessage() throws Exception {
         pubsub.subscribe(channel);
         assertThat(channels.take()).isEqualTo(channel);
         RedisAsyncCommands<String, String> connection = client.connect().async();
@@ -134,8 +135,8 @@ public void pipelinedMessage() throws Exception {
         connection.getStatefulConnection().close();
     }
 
-    @Test(timeout = 2000)
-    public void pmessage() throws Exception {
+    @Test
+    void pmessage() throws Exception {
         pubsub.psubscribe(pattern).await(1, TimeUnit.MINUTES);
         assertThat(patterns.take()).isEqualTo(pattern);
 
@@ -150,8 +151,8 @@ public void pmessage() throws Exception {
         assertThat(messages.take()).isEqualTo("msg 2!");
     }
 
-    @Test(timeout = 2000)
-    public void pipelinedSubscribe() throws Exception {
+    @Test
+    void pipelinedSubscribe() throws Exception {
 
         pubsub.setAutoFlushCommands(false);
         pubsub.subscribe(channel);
@@ -168,10 +169,10 @@ public void pipelinedSubscribe() throws Exception {
 
     }
 
-    @Test(timeout = 2000)
-    public void psubscribe() throws Exception {
+    @Test
+    void psubscribe() throws Exception {
         RedisFuture<Void> psubscribe = pubsub.psubscribe(pattern);
-        assertThat(psubscribe.get()).isNull();
+        assertThat(Futures.get(psubscribe)).isNull();
         assertThat(psubscribe.getError()).isNull();
         assertThat(psubscribe.isCancelled()).isFalse();
         assertThat(psubscribe.isDone()).isTrue();
@@ -180,8 +181,8 @@ public void psubscribe() throws Exception {
         assertThat((long) counts.take()).isEqualTo(1);
     }
 
-    @Test(timeout = 2000)
-    public void psubscribeWithListener() throws Exception {
+    @Test
+    void psubscribeWithListener() throws Exception {
         RedisFuture<Void> psubscribe = pubsub.psubscribe(pattern);
         final List<Object> listener = new ArrayList<>();
 
@@ -193,25 +194,22 @@ public void psubscribeWithListener() throws Exception {
         assertThat(listener).hasSize(1);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void pubsubEmptyChannels() {
-        pubsub.subscribe();
-        fail("Missing IllegalArgumentException: channels must not be empty");
+    @Test
+    void pubsubEmptyChannels() {
+        assertThatThrownBy(() -> pubsub.subscribe()).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void pubsubChannels() throws Exception {
-        RedisFuture<Void> future = pubsub.subscribe(channel);
-        future.get(1, TimeUnit.MINUTES);
+    void pubsubChannels() {
+        Futures.await(pubsub.subscribe(channel));
         List<String> result = redis.pubsubChannels();
         assertThat(result).contains(channel);
 
     }
 
     @Test
-    public void pubsubMultipleChannels() throws Exception {
-        RedisFuture<Void> future = pubsub.subscribe(channel, "channel1", "channel3");
-        future.get();
+    void pubsubMultipleChannels() {
+        Futures.await(pubsub.subscribe(channel, "channel1", "channel3"));
 
         List<String> result = redis.pubsubChannels();
         assertThat(result).contains(channel, "channel1", "channel3");
@@ -219,17 +217,16 @@ public void pubsubMultipleChannels() throws Exception {
     }
 
     @Test
-    public void pubsubChannelsWithArg() throws Exception {
-        pubsub.subscribe(channel).get();
+    void pubsubChannelsWithArg() {
+        Futures.await(pubsub.subscribe(channel));
         List<String> result = redis.pubsubChannels(pattern);
         assertThat(result, hasItem(channel));
     }
 
     @Test
-    public void pubsubNumsub() throws Exception {
+    void pubsubNumsub() {
 
-        pubsub.subscribe(channel);
-        Thread.sleep(100);
+        Futures.await(pubsub.subscribe(channel));
 
         Map<String, Long> result = redis.pubsubNumsub(channel);
         assertThat(result.size()).isGreaterThan(0);
@@ -237,37 +234,37 @@ public void pubsubNumsub() throws Exception {
     }
 
     @Test
-    public void pubsubNumpat() throws Exception {
+    void pubsubNumpat() {
 
-        pubsub.psubscribe(pattern).get();
+        Futures.await(pubsub.psubscribe(pattern));
         Long result = redis.pubsubNumpat();
         assertThat(result.longValue()).isGreaterThan(0); // Redis sometimes keeps old references
     }
 
     @Test
-    public void punsubscribe() throws Exception {
-        pubsub.punsubscribe(pattern).get();
+    void punsubscribe() throws Exception {
+        Futures.await(pubsub.punsubscribe(pattern));
         assertThat(patterns.take()).isEqualTo(pattern);
         assertThat((long) counts.take()).isEqualTo(0);
 
     }
 
-    @Test(timeout = 2000)
-    public void subscribe() throws Exception {
+    @Test
+    void subscribe() throws Exception {
         pubsub.subscribe(channel);
         assertThat(channels.take()).isEqualTo(channel);
         assertThat((long) counts.take()).isEqualTo(1);
     }
 
-    @Test(timeout = 2000)
-    public void unsubscribe() throws Exception {
-        pubsub.unsubscribe(channel).get();
+    @Test
+    void unsubscribe() throws Exception {
+        Futures.await(pubsub.unsubscribe(channel));
         assertThat(channels.take()).isEqualTo(channel);
         assertThat((long) counts.take()).isEqualTo(0);
 
         RedisFuture<Void> future = pubsub.unsubscribe();
 
-        assertThat(future.get()).isNull();
+        assertThat(Futures.get(future)).isNull();
         assertThat(future.getError()).isNull();
 
         assertThat(channels).isEmpty();
@@ -276,7 +273,7 @@ public void unsubscribe() throws Exception {
     }
 
     @Test
-    public void pubsubCloseOnClientShutdown() {
+    void pubsubCloseOnClientShutdown() {
 
         RedisClient redisClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port).build());
 
@@ -287,8 +284,8 @@ public void pubsubCloseOnClientShutdown() {
         assertThat(connection.isOpen()).isFalse();
     }
 
-    @Test(timeout = 2000)
-    public void utf8Channel() throws Exception {
+    @Test
+    void utf8Channel() throws Exception {
         String channel = "channelλ";
         String message = "αβγ";
 
@@ -300,8 +297,8 @@ public void utf8Channel() throws Exception {
         assertThat(messages.take()).isEqualTo(message);
     }
 
-    @Test(timeout = 10000)
-    public void resubscribeChannelsOnReconnect() throws Exception {
+    @Test
+    void resubscribeChannelsOnReconnect() throws Exception {
         pubsub.subscribe(channel);
         assertThat(channels.take()).isEqualTo(channel);
         assertThat((long) counts.take()).isEqualTo(1);
@@ -318,8 +315,8 @@ public void resubscribeChannelsOnReconnect() throws Exception {
         assertThat(messages.take()).isEqualTo(message);
     }
 
-    @Test(timeout = 10000)
-    public void resubscribePatternsOnReconnect() throws Exception {
+    @Test
+    void resubscribePatternsOnReconnect() throws Exception {
         pubsub.psubscribe(pattern);
         assertThat(patterns.take()).isEqualTo(pattern);
         assertThat((long) counts.take()).isEqualTo(1);
@@ -336,8 +333,8 @@ public void resubscribePatternsOnReconnect() throws Exception {
         assertThat(messages.take()).isEqualTo(message);
     }
 
-    @Test(timeout = 2000)
-    public void adapter() throws Exception {
+    @Test
+    void adapter() throws Exception {
         final BlockingQueue<Long> localCounts = LettuceFactories.newBlockingQueue();
 
         RedisPubSubAdapter<String, String> adapter = new RedisPubSubAdapter<String, String>() {
@@ -367,8 +364,8 @@ public void unsubscribed(String channel, long count) {
         assertThat((long) localCounts.take()).isEqualTo(0L);
     }
 
-    @Test(timeout = 2000)
-    public void removeListener() throws Exception {
+    @Test
+    void removeListener() throws Exception {
         pubsub.subscribe(channel);
         assertThat(channels.take()).isEqualTo(channel);
 
@@ -384,16 +381,17 @@ public void removeListener() throws Exception {
     }
 
     @Test
-    public void pingNotAllowedInSubscriptionState() throws Exception {
+    void pingNotAllowedInSubscriptionState() {
 
-        pubsub.subscribe(channel).get();
+        Futures.await(pubsub.subscribe(channel));
 
-        assertThatThrownBy(() -> pubsub.ping().get()).isInstanceOf(RedisException.class).hasMessageContaining("not allowed");
+        assertThatThrownBy(() -> Futures.get(pubsub.ping())).isInstanceOf(RedisException.class).hasMessageContaining(
+                "not allowed");
         pubsub.unsubscribe(channel);
 
         Wait.untilTrue(() -> channels.size() == 2).waitOrTimeout();
 
-        assertThat(pubsub.ping().get()).isEqualTo("PONG");
+        assertThat(Futures.get(pubsub.ping())).isEqualTo("PONG");
     }
 
     // RedisPubSubListener implementation
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
index 1267084d94..a89964e15e 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
@@ -16,7 +16,7 @@
 package io.lettuce.core.pubsub;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Fail.fail;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.time.Duration;
 import java.util.List;
@@ -24,19 +24,15 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
-import io.lettuce.Delay;
-import io.lettuce.TestClientResources;
-import io.lettuce.Wait;
 import io.lettuce.core.AbstractRedisClientTest;
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.internal.LettuceFactories;
@@ -44,11 +40,15 @@
 import io.lettuce.core.pubsub.api.reactive.PatternMessage;
 import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands;
 import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands;
+import io.lettuce.test.Delay;
+import io.lettuce.test.Wait;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
 
 /**
  * @author Mark Paluch
  */
-public class PubSubReactiveTest extends AbstractRedisClientTest implements RedisPubSubListener<String, String> {
+class PubSubReactiveTest extends AbstractRedisClientTest implements RedisPubSubListener<String, String> {
 
     private RedisPubSubReactiveCommands<String, String> pubsub;
     private RedisPubSubReactiveCommands<String, String> pubsub2;
@@ -62,8 +62,8 @@ public class PubSubReactiveTest extends AbstractRedisClientTest implements Redis
     private String pattern = "channel*";
     private String message = "msg!";
 
-    @Before
-    public void openPubSubConnection() {
+    @BeforeEach
+    void openPubSubConnection() {
 
         pubsub = client.connectPubSub().reactive();
         pubsub2 = client.connectPubSub().reactive();
@@ -74,14 +74,14 @@ public void openPubSubConnection() {
         counts = LettuceFactories.newBlockingQueue();
     }
 
-    @After
-    public void closePubSubConnection() {
+    @AfterEach
+    void closePubSubConnection() {
         pubsub.getStatefulConnection().close();
         pubsub2.getStatefulConnection().close();
     }
 
     @Test
-    public void observeChannels() throws Exception {
+    void observeChannels() throws Exception {
 
         block(pubsub.subscribe(channel));
 
@@ -107,7 +107,7 @@ public void observeChannels() throws Exception {
     }
 
     @Test
-    public void observeChannelsUnsubscribe() {
+    void observeChannelsUnsubscribe() {
 
         block(pubsub.subscribe(channel));
 
@@ -123,7 +123,7 @@ public void observeChannelsUnsubscribe() {
     }
 
     @Test
-    public void observePatterns() throws Exception {
+    void observePatterns() throws Exception {
 
         block(pubsub.psubscribe(pattern));
 
@@ -145,7 +145,7 @@ public void observePatterns() throws Exception {
     }
 
     @Test
-    public void observePatternsWithUnsubscribe() {
+    void observePatternsWithUnsubscribe() {
 
         block(pubsub.psubscribe(pattern));
 
@@ -170,8 +170,8 @@ public void observePatternsWithUnsubscribe() {
         assertThat(patternMessages).hasSize(3);
     }
 
-    @Test(timeout = 2000)
-    public void message() throws Exception {
+    @Test
+    void message() throws Exception {
 
         block(pubsub.subscribe(channel));
         assertThat(channels.take()).isEqualTo(channel);
@@ -181,8 +181,8 @@ public void message() throws Exception {
         assertThat(messages.take()).isEqualTo(message);
     }
 
-    @Test(timeout = 2000)
-    public void pmessage() throws Exception {
+    @Test
+    void pmessage() throws Exception {
 
         block(pubsub.psubscribe(pattern));
         assertThat(patterns.take()).isEqualTo(pattern);
@@ -198,8 +198,8 @@ public void pmessage() throws Exception {
         assertThat(messages.take()).isEqualTo("msg 2!");
     }
 
-    @Test(timeout = 2000)
-    public void psubscribe() throws Exception {
+    @Test
+    void psubscribe() throws Exception {
 
         block(pubsub.psubscribe(pattern));
 
@@ -207,15 +207,13 @@ public void psubscribe() throws Exception {
         assertThat((long) counts.take()).isEqualTo(1);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void pubsubEmptyChannels() {
-
-        pubsub.subscribe();
-        fail("Missing IllegalArgumentException: channels must not be empty");
+    @Test
+    void pubsubEmptyChannels() {
+        assertThatThrownBy(() -> pubsub.subscribe()).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void pubsubChannels() {
+    void pubsubChannels() {
 
         block(pubsub.subscribe(channel));
         List<String> result = block(pubsub2.pubsubChannels().collectList());
@@ -223,7 +221,7 @@ public void pubsubChannels() {
     }
 
     @Test
-    public void pubsubMultipleChannels() {
+    void pubsubMultipleChannels() {
 
         StepVerifier.create(pubsub.subscribe(channel, "channel1", "channel3")).verifyComplete();
 
@@ -232,7 +230,7 @@ public void pubsubMultipleChannels() {
     }
 
     @Test
-    public void pubsubChannelsWithArg() {
+    void pubsubChannelsWithArg() {
 
         StepVerifier.create(pubsub.subscribe(channel)).verifyComplete();
         Wait.untilTrue(() -> mono(pubsub2.pubsubChannels(pattern).filter(s -> channel.equals(s))) != null).waitOrTimeout();
@@ -242,7 +240,7 @@ public void pubsubChannelsWithArg() {
     }
 
     @Test
-    public void pubsubNumsub() {
+    void pubsubNumsub() {
 
         StepVerifier.create(pubsub.subscribe(channel)).verifyComplete();
 
@@ -254,7 +252,7 @@ public void pubsubNumsub() {
     }
 
     @Test
-    public void pubsubNumpat() {
+    void pubsubNumpat() {
 
         Wait.untilEquals(0L, () -> block(pubsub2.pubsubNumpat())).waitOrTimeout();
 
@@ -265,8 +263,8 @@ public void pubsubNumpat() {
         assertThat(result.longValue()).isGreaterThan(0);
     }
 
-    @Test(timeout = 2000)
-    public void punsubscribe() throws Exception {
+    @Test
+    void punsubscribe() throws Exception {
 
         StepVerifier.create(pubsub.punsubscribe(pattern)).verifyComplete();
         assertThat(patterns.take()).isEqualTo(pattern);
@@ -274,16 +272,16 @@ public void punsubscribe() throws Exception {
 
     }
 
-    @Test(timeout = 2000)
-    public void subscribe() throws Exception {
+    @Test
+    void subscribe() throws Exception {
 
         StepVerifier.create(pubsub.subscribe(channel)).verifyComplete();
         assertThat(channels.take()).isEqualTo(channel);
         assertThat((long) counts.take()).isGreaterThan(0);
     }
 
-    @Test(timeout = 2000)
-    public void unsubscribe() throws Exception {
+    @Test
+    void unsubscribe() throws Exception {
 
         StepVerifier.create(pubsub.unsubscribe(channel)).verifyComplete();
         assertThat(channels.take()).isEqualTo(channel);
@@ -297,7 +295,7 @@ public void unsubscribe() throws Exception {
     }
 
     @Test
-    public void pubsubCloseOnClientShutdown() {
+    void pubsubCloseOnClientShutdown() {
 
         RedisClient redisClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder.redis(host, port).build());
 
@@ -307,8 +305,8 @@ public void pubsubCloseOnClientShutdown() {
         assertThat(connection.isOpen()).isFalse();
     }
 
-    @Test(timeout = 2000)
-    public void utf8Channel() throws Exception {
+    @Test
+    void utf8Channel() throws Exception {
 
         String channel = "channelλ";
         String message = "αβγ";
@@ -321,8 +319,8 @@ public void utf8Channel() throws Exception {
         assertThat(messages.take()).isEqualTo(message);
     }
 
-    @Test(timeout = 2000)
-    public void resubscribeChannelsOnReconnect() throws Exception {
+    @Test
+    void resubscribeChannelsOnReconnect() throws Exception {
 
         StepVerifier.create(pubsub.subscribe(channel)).verifyComplete();
         assertThat(channels.take()).isEqualTo(channel);
@@ -339,8 +337,8 @@ public void resubscribeChannelsOnReconnect() throws Exception {
         assertThat(messages.take()).isEqualTo(message);
     }
 
-    @Test(timeout = 2000)
-    public void resubscribePatternsOnReconnect() throws Exception {
+    @Test
+    void resubscribePatternsOnReconnect() throws Exception {
 
         StepVerifier.create(pubsub.psubscribe(pattern)).verifyComplete();
         assertThat(patterns.take()).isEqualTo(pattern);
@@ -358,8 +356,8 @@ public void resubscribePatternsOnReconnect() throws Exception {
         assertThat(messages.take()).isEqualTo(message);
     }
 
-    @Test(timeout = 2000)
-    public void adapter() throws Exception {
+    @Test
+    void adapter() throws Exception {
 
         final BlockingQueue<Long> localCounts = LettuceFactories.newBlockingQueue();
 
@@ -390,8 +388,8 @@ public void unsubscribed(String channel, long count) {
         assertThat((long) localCounts.take()).isEqualTo(0L);
     }
 
-    @Test(timeout = 2000)
-    public void removeListener() throws Exception {
+    @Test
+    void removeListener() throws Exception {
 
         StepVerifier.create(pubsub.subscribe(channel)).verifyComplete();
         assertThat(channels.take()).isEqualTo(channel);
@@ -446,15 +444,15 @@ public void punsubscribed(String pattern, long count) {
         counts.add(count);
     }
 
-    protected <T> T block(Mono<T> mono) {
+    <T> T block(Mono<T> mono) {
         return mono.block();
     }
 
-    protected <T> T mono(Flux<T> flux) {
+    <T> T mono(Flux<T> flux) {
         return flux.next().block();
     }
 
-    protected <T> List<T> all(Flux<T> flux) {
+    <T> List<T> all(Flux<T> flux) {
         return flux.collectList().block();
     }
 }
diff --git a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
index 359d85051a..660ddf80b3 100644
--- a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
+++ b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
@@ -21,13 +21,13 @@
 import java.util.UUID;
 import java.util.function.Supplier;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.tck.PublisherVerification;
 import org.reactivestreams.tck.TestEnvironment;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
 
-import io.lettuce.TestClientResources;
+import io.lettuce.test.resource.TestClientResources;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -35,6 +35,9 @@
 import io.lettuce.core.output.ValueListOutput;
 import io.lettuce.core.protocol.Command;
 import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.core.TestRedisPublisher;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * Reactive Streams TCK for {@link RedisPublisher}.
@@ -51,14 +54,14 @@ public RedisPublisherVerification() {
         super(new TestEnvironment(1000));
     }
 
-    @BeforeClass
+    @BeforeAll
     private static void beforeClass() {
         client = RedisClient.create(TestClientResources.get(), RedisURI.create(TestSettings.host(), TestSettings.port()));
         connection = client.connect();
         connection.sync().flushall();
     }
 
-    @AfterClass
+    @AfterAll
     private static void afterClass() {
         connection.close();
         FastShutdown.shutdown(client);
diff --git a/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java b/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java
index fe59c69b23..55600c80e6 100644
--- a/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java
+++ b/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java
@@ -18,16 +18,18 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.tck.PublisherVerification;
 import org.reactivestreams.tck.TestEnvironment;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
 
-import io.lettuce.TestClientResources;
+import io.lettuce.test.resource.TestClientResources;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * Reactive Streams TCK for {@link ScanStream}.
@@ -45,14 +47,14 @@ public ScanStreamVerification() {
         super(new TestEnvironment(1000));
     }
 
-    @BeforeClass
+    @BeforeAll
     private static void beforeClass() {
         client = RedisClient.create(TestClientResources.get(), RedisURI.create(TestSettings.host(), TestSettings.port()));
         connection = client.connect();
         connection.sync().flushall();
     }
 
-    @AfterClass
+    @AfterAll
     private static void afterClass() {
         connection.close();
         FastShutdown.shutdown(client);
diff --git a/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
index 1235034e40..1bcab5870b 100644
--- a/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
@@ -16,17 +16,15 @@
 package io.lettuce.core.reliability;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.ConnectionTestUtil;
-import io.lettuce.Wait;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -34,6 +32,8 @@
 import io.lettuce.core.output.IntegerOutput;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
+import io.lettuce.test.ConnectionTestUtil;
+import io.lettuce.test.Wait;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.handler.codec.EncoderException;
@@ -42,13 +42,13 @@
 /**
  * @author Mark Paluch
  */
-public class AtLeastOnceTest extends AbstractRedisClientTest {
+class AtLeastOnceTest extends AbstractRedisClientTest {
 
-    protected final Utf8StringCodec CODEC = new Utf8StringCodec();
-    protected String key = "key";
+    private final Utf8StringCodec CODEC = new Utf8StringCodec();
+    private String key = "key";
 
-    @Before
-    public void before() throws Exception {
+    @BeforeEach
+    void before() {
         client.setOptions(ClientOptions.builder().autoReconnect(true).build());
 
         // needs to be increased on slow systems...perhaps...
@@ -61,7 +61,7 @@ public void before() throws Exception {
     }
 
     @Test
-    public void connectionIsConnectedAfterConnect() throws Exception {
+    void connectionIsConnectedAfterConnect() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
 
@@ -71,7 +71,7 @@ public void connectionIsConnectedAfterConnect() throws Exception {
     }
 
     @Test
-    public void reconnectIsActiveHandler() throws Exception {
+    void reconnectIsActiveHandler() {
 
         RedisCommands<String, String> connection = client.connect().sync();
 
@@ -84,7 +84,7 @@ public void reconnectIsActiveHandler() throws Exception {
     }
 
     @Test
-    public void basicOperations() throws Exception {
+    void basicOperations() {
 
         RedisCommands<String, String> connection = client.connect().sync();
 
@@ -95,7 +95,7 @@ public void basicOperations() throws Exception {
     }
 
     @Test
-    public void noBufferedCommandsAfterExecute() throws Exception {
+    void noBufferedCommandsAfterExecute() {
 
         RedisCommands<String, String> connection = client.connect().sync();
 
@@ -108,7 +108,7 @@ public void noBufferedCommandsAfterExecute() throws Exception {
     }
 
     @Test
-    public void commandIsExecutedOnce() throws Exception {
+    void commandIsExecutedOnce() {
 
         RedisCommands<String, String> connection = client.connect().sync();
 
@@ -126,7 +126,7 @@ public void commandIsExecutedOnce() throws Exception {
     }
 
     @Test
-    public void commandFailsWhenFailOnEncode() throws Exception {
+    void commandFailsWhenFailOnEncode() {
 
         RedisCommands<String, String> connection = client.connect().sync();
         RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection.getStatefulConnection());
@@ -162,7 +162,7 @@ public void encode(ByteBuf buf) {
     }
 
     @Test
-    public void commandNotFailedChannelClosesWhileFlush() throws Exception {
+    void commandNotFailedChannelClosesWhileFlush() {
 
         assumeTrue(Version.identify().get("netty-transport").artifactVersion().startsWith("4.0.2"));
 
@@ -204,7 +204,7 @@ public void commandNotFailedChannelClosesWhileFlush() throws Exception {
     }
 
     @Test
-    public void commandRetriedChannelClosesWhileFlush() throws Exception {
+    void commandRetriedChannelClosesWhileFlush() {
 
         assumeTrue(Version.identify().get("netty-transport").artifactVersion().startsWith("4.0.2"));
 
@@ -251,7 +251,7 @@ public void commandRetriedChannelClosesWhileFlush() throws Exception {
         verificationConnection.getStatefulConnection().close();
     }
 
-    protected AsyncCommand<String, String, Object> getBlockOnEncodeCommand(final CountDownLatch block) {
+    AsyncCommand<String, String, Object> getBlockOnEncodeCommand(final CountDownLatch block) {
         return new AsyncCommand<String, String, Object>(new Command<>(CommandType.INCR, new IntegerOutput(CODEC),
                 new CommandArgs<>(CODEC).addKey(key))) {
 
@@ -267,7 +267,7 @@ public void encode(ByteBuf buf) {
     }
 
     @Test
-    public void commandFailsDuringDecode() throws Exception {
+    void commandFailsDuringDecode() {
 
         RedisCommands<String, String> connection = client.connect().sync();
         RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection.getStatefulConnection());
@@ -293,7 +293,7 @@ public void commandFailsDuringDecode() throws Exception {
     }
 
     @Test
-    public void commandCancelledOverSyncAPIAfterConnectionIsDisconnected() throws Exception {
+    void commandCancelledOverSyncAPIAfterConnectionIsDisconnected() throws Exception {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> sync = connection.sync();
@@ -333,7 +333,7 @@ public void commandCancelledOverSyncAPIAfterConnectionIsDisconnected() throws Ex
     }
 
     @Test
-    public void retryAfterConnectionIsDisconnected() throws Exception {
+    void retryAfterConnectionIsDisconnected() throws Exception {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> verificationConnection = client.connect().sync();
diff --git a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
index 213cff302b..9ff368b544 100644
--- a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
@@ -15,25 +15,22 @@
  */
 package io.lettuce.core.reliability;
 
-import static io.lettuce.ConnectionTestUtil.getCommandBuffer;
-import static io.lettuce.ConnectionTestUtil.getStack;
+import static io.lettuce.test.ConnectionTestUtil.getCommandBuffer;
+import static io.lettuce.test.ConnectionTestUtil.getStack;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.time.Duration;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import io.lettuce.core.api.async.RedisAsyncCommands;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.ConnectionTestUtil;
-import io.lettuce.Delay;
-import io.lettuce.Wait;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.IntegerOutput;
@@ -42,6 +39,10 @@
 import io.lettuce.core.protocol.Command;
 import io.lettuce.core.protocol.CommandArgs;
 import io.lettuce.core.protocol.CommandType;
+import io.lettuce.test.ConnectionTestUtil;
+import io.lettuce.test.Delay;
+import io.lettuce.test.Futures;
+import io.lettuce.test.Wait;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.handler.codec.EncoderException;
@@ -51,13 +52,13 @@
  * @author Mark Paluch
  */
 @SuppressWarnings("rawtypes")
-public class AtMostOnceTest extends AbstractRedisClientTest {
+class AtMostOnceTest extends AbstractRedisClientTest {
 
-    protected final Utf8StringCodec CODEC = new Utf8StringCodec();
-    protected String key = "key";
+    private final Utf8StringCodec CODEC = new Utf8StringCodec();
+    private String key = "key";
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
         client.setOptions(ClientOptions.builder().autoReconnect(false).build());
 
         // needs to be increased on slow systems...perhaps...
@@ -70,7 +71,7 @@ public void before() {
     }
 
     @Test
-    public void connectionIsConnectedAfterConnect() {
+    void connectionIsConnectedAfterConnect() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
 
@@ -80,7 +81,7 @@ public void connectionIsConnectedAfterConnect() {
     }
 
     @Test
-    public void noReconnectHandler() {
+    void noReconnectHandler() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
 
@@ -90,7 +91,7 @@ public void noReconnectHandler() {
     }
 
     @Test
-    public void basicOperations() {
+    void basicOperations() {
 
         RedisCommands<String, String> connection = client.connect().sync();
 
@@ -101,7 +102,7 @@ public void basicOperations() {
     }
 
     @Test
-    public void noBufferedCommandsAfterExecute() {
+    void noBufferedCommandsAfterExecute() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> sync = connection.sync();
@@ -115,7 +116,7 @@ public void noBufferedCommandsAfterExecute() {
     }
 
     @Test
-    public void commandIsExecutedOnce() {
+    void commandIsExecutedOnce() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> sync = connection.sync();
@@ -134,7 +135,7 @@ public void commandIsExecutedOnce() {
     }
 
     @Test
-    public void commandNotExecutedFailsOnEncode() {
+    void commandNotExecutedFailsOnEncode() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> sync = client.connect().sync();
@@ -142,14 +143,14 @@ public void commandNotExecutedFailsOnEncode() {
 
         sync.set(key, "1");
         AsyncCommand<String, String, String> working = new AsyncCommand<>(new Command<String, String, String>(CommandType.INCR,
-                new IntegerOutput(CODEC), new CommandArgs<String, String>(CODEC).addKey(key)));
+                new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key)));
         channelWriter.write(working);
         assertThat(working.await(2, TimeUnit.SECONDS)).isTrue();
         assertThat(sync.get(key)).isEqualTo("2");
 
         AsyncCommand<String, String, Object> command = new AsyncCommand<String, String, Object>(
                 new Command<String, String, Object>(CommandType.INCR, new IntegerOutput(CODEC),
-                        new CommandArgs<String, String>(CODEC).addKey(key))) {
+                        new CommandArgs<>(CODEC).addKey(key))) {
 
             @Override
             public void encode(ByteBuf buf) {
@@ -177,7 +178,7 @@ public void encode(ByteBuf buf) {
     }
 
     @Test
-    public void commandNotExecutedChannelClosesWhileFlush() {
+    void commandNotExecutedChannelClosesWhileFlush() {
 
         assumeTrue(Version.identify().get("netty-transport").artifactVersion().startsWith("4.0.2"));
 
@@ -226,7 +227,7 @@ public void encode(ByteBuf buf) {
     }
 
     @Test
-    public void commandFailsDuringDecode() {
+    void commandFailsDuringDecode() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> sync = connection.sync();
@@ -251,7 +252,7 @@ public void commandFailsDuringDecode() {
     }
 
     @Test
-    public void noCommandsExecutedAfterConnectionIsDisconnected() {
+    void noCommandsExecutedAfterConnectionIsDisconnected() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         connection.sync().quit();
@@ -283,7 +284,7 @@ public void noCommandsExecutedAfterConnectionIsDisconnected() {
     }
 
     @Test
-    public void commandsCancelledOnDisconnect() {
+    void commandsCancelledOnDisconnect() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
 
@@ -297,7 +298,7 @@ public void commandsCancelledOnDisconnect() {
 
             connection.flushCommands();
 
-            incr.get(5, TimeUnit.SECONDS);
+            Futures.await(incr);
 
         } catch (Exception e) {
             assertThat(e).hasRootCauseInstanceOf(RedisException.class).hasMessageContaining("Connection disconnected");
diff --git a/src/test/java/io/lettuce/core/resource/ConstantDelayTest.java b/src/test/java/io/lettuce/core/resource/ConstantDelayUnitTests.java
similarity index 76%
rename from src/test/java/io/lettuce/core/resource/ConstantDelayTest.java
rename to src/test/java/io/lettuce/core/resource/ConstantDelayUnitTests.java
index 65aca26700..6b7c91d302 100644
--- a/src/test/java/io/lettuce/core/resource/ConstantDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/ConstantDelayUnitTests.java
@@ -16,24 +16,25 @@
 package io.lettuce.core.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class ConstantDelayTest {
+class ConstantDelayUnitTests {
 
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldNotCreateIfDelayIsNegative() throws Exception {
-        Delay.constant(-1, TimeUnit.MILLISECONDS);
+    @Test
+    void shouldNotCreateIfDelayIsNegative() {
+        assertThatThrownBy(() -> Delay.constant(-1, TimeUnit.MILLISECONDS)).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void shouldCreateZeroDelay() throws Exception {
+    void shouldCreateZeroDelay() {
 
         Delay delay = Delay.constant(0, TimeUnit.MILLISECONDS);
 
@@ -42,7 +43,7 @@ public void shouldCreateZeroDelay() throws Exception {
     }
 
     @Test
-    public void shouldCreateConstantDelay() throws Exception {
+    void shouldCreateConstantDelay() {
 
         Delay delay = Delay.constant(100, TimeUnit.MILLISECONDS);
 
diff --git a/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java b/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayUnitTests.java
similarity index 75%
rename from src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java
rename to src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayUnitTests.java
index 8ce89e21b9..96f6dc173f 100644
--- a/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayUnitTests.java
@@ -16,30 +16,33 @@
 package io.lettuce.core.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Jongyeol Choi
  * @author Mark Paluch
  */
-public class DecorrelatedJitterDelayTest {
+class DecorrelatedJitterDelayUnitTests {
 
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldNotCreateIfLowerBoundIsNegative() throws Exception {
-        Delay.decorrelatedJitter(-1, 100, 0, TimeUnit.MILLISECONDS);
+    @Test
+    void shouldNotCreateIfLowerBoundIsNegative() {
+        assertThatThrownBy(() -> Delay.decorrelatedJitter(-1, 100, 0, TimeUnit.MILLISECONDS)).isInstanceOf(
+                IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldNotCreateIfLowerBoundIsSameAsUpperBound() throws Exception {
-        Delay.decorrelatedJitter(100, 100, 1, TimeUnit.MILLISECONDS);
+    @Test
+    void shouldNotCreateIfLowerBoundIsSameAsUpperBound() {
+        assertThatThrownBy(() -> Delay.decorrelatedJitter(100, 100, 1, TimeUnit.MILLISECONDS)).isInstanceOf(
+                IllegalArgumentException.class);
     }
 
     @Test
-    public void negativeAttemptShouldReturnZero() throws Exception {
+    void negativeAttemptShouldReturnZero() {
 
         Delay delay = Delay.decorrelatedJitter().get();
 
@@ -47,7 +50,7 @@ public void negativeAttemptShouldReturnZero() throws Exception {
     }
 
     @Test
-    public void zeroShouldReturnZero() throws Exception {
+    void zeroShouldReturnZero() {
 
         Delay delay = Delay.decorrelatedJitter().get();
 
@@ -55,11 +58,10 @@ public void zeroShouldReturnZero() throws Exception {
     }
 
     @Test
-    public void testDefaultDelays() throws Exception {
+    void testDefaultDelays() {
 
         Delay delay = Delay.decorrelatedJitter().get();
 
-
         for (int i = 0; i < 1000; i++) {
             assertThat(delay.createDelay(1).toMillis()).isBetween(0L, 1L);
             assertThat(delay.createDelay(2).toMillis()).isBetween(0L, 3L);
diff --git a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
similarity index 87%
rename from src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java
rename to src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
index 6967fa41fb..2e464251e1 100644
--- a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesTest.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -23,14 +24,15 @@
 
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import reactor.test.StepVerifier;
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.event.Event;
 import io.lettuce.core.event.EventBus;
 import io.lettuce.core.metrics.CommandLatencyCollector;
 import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
+import io.lettuce.test.Futures;
+import io.lettuce.test.resource.FastShutdown;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.Timer;
 import io.netty.util.concurrent.EventExecutorGroup;
@@ -39,10 +41,10 @@
 /**
  * @author Mark Paluch
  */
-public class DefaultClientResourcesTest {
+class DefaultClientResourcesUnitTests {
 
     @Test
-    public void testDefaults() throws Exception {
+    void testDefaults() throws Exception {
 
         DefaultClientResources sut = DefaultClientResources.create();
 
@@ -67,7 +69,7 @@ public void testDefaults() throws Exception {
     }
 
     @Test
-    public void testBuilder() throws Exception {
+    void testBuilder() throws Exception {
 
         DefaultClientResources sut = DefaultClientResources.builder().ioThreadPoolSize(4).computationThreadPoolSize(4)
                 .commandLatencyCollectorOptions(DefaultCommandLatencyCollectorOptions.disabled()).build();
@@ -85,7 +87,7 @@ public void testBuilder() throws Exception {
     }
 
     @Test
-    public void testDnsResolver() {
+    void testDnsResolver() {
 
         DirContextDnsResolver dirContextDnsResolver = new DirContextDnsResolver("8.8.8.8");
 
@@ -95,7 +97,7 @@ public void testDnsResolver() {
     }
 
     @Test
-    public void testProvidedResources() throws Exception {
+    void testProvidedResources() {
 
         EventExecutorGroup executorMock = mock(EventExecutorGroup.class);
         EventLoopGroupProvider groupProviderMock = mock(EventLoopGroupProvider.class);
@@ -114,7 +116,7 @@ public void testProvidedResources() throws Exception {
         assertThat(sut.eventBus()).isSameAs(eventBusMock);
         assertThat(sut.nettyCustomizer()).isSameAs(nettyCustomizer);
 
-        assertThat(sut.shutdown().get()).isTrue();
+        assertThat(Futures.get(sut.shutdown())).isTrue();
 
         verifyZeroInteractions(executorMock);
         verifyZeroInteractions(groupProviderMock);
@@ -124,7 +126,7 @@ public void testProvidedResources() throws Exception {
     }
 
     @Test
-    public void mutateResources() throws Exception {
+    void mutateResources() {
 
         EventExecutorGroup executorMock = mock(EventExecutorGroup.class);
         EventLoopGroupProvider groupProviderMock = mock(EventLoopGroupProvider.class);
@@ -145,7 +147,7 @@ public void mutateResources() throws Exception {
         assertThat(copy.timer()).isSameAs(timerMock2).isNotSameAs(timerMock);
         assertThat(sut.eventBus()).isSameAs(eventBusMock);
 
-        assertThat(sut.shutdown().get()).isTrue();
+        assertThat(Futures.get(sut.shutdown())).isTrue();
 
         verifyZeroInteractions(executorMock);
         verifyZeroInteractions(groupProviderMock);
@@ -153,7 +155,7 @@ public void mutateResources() throws Exception {
     }
 
     @Test
-    public void testSmallPoolSize() throws Exception {
+    void testSmallPoolSize() {
 
         DefaultClientResources sut = DefaultClientResources.builder().ioThreadPoolSize(1).computationThreadPoolSize(1).build();
 
@@ -164,11 +166,11 @@ public void testSmallPoolSize() throws Exception {
         assertThat(eventLoopGroup.executorCount()).isEqualTo(3);
         assertThat(sut.ioThreadPoolSize()).isEqualTo(3);
 
-        assertThat(sut.shutdown(0, 0, TimeUnit.MILLISECONDS).get()).isTrue();
+        assertThat(Futures.get(sut.shutdown(0, 0, TimeUnit.MILLISECONDS))).isTrue();
     }
 
     @Test
-    public void testEventBus() throws Exception {
+    void testEventBus() {
 
         DefaultClientResources sut = DefaultClientResources.create();
 
@@ -177,17 +179,18 @@ public void testEventBus() throws Exception {
 
         StepVerifier.create(eventBus.get()).then(() -> eventBus.publish(event)).expectNext(event).thenCancel().verify();
 
-        assertThat(sut.shutdown(0, 0, TimeUnit.MILLISECONDS).get()).isTrue();
+        assertThat(Futures.get(sut.shutdown(0, 0, TimeUnit.MILLISECONDS))).isTrue();
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void delayInstanceShouldRejectStatefulDelay() throws Exception {
+    @Test
+    void delayInstanceShouldRejectStatefulDelay() {
 
-        DefaultClientResources.builder().reconnectDelay(Delay.decorrelatedJitter().get());
+        assertThatThrownBy(() -> DefaultClientResources.builder().reconnectDelay(Delay.decorrelatedJitter().get()))
+                .isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void reconnectDelayCreatesNewForStatefulDelays() throws Exception {
+    void reconnectDelayCreatesNewForStatefulDelays() {
 
         DefaultClientResources resources = DefaultClientResources.builder().reconnectDelay(Delay.decorrelatedJitter()).build();
 
@@ -200,7 +203,7 @@ public void reconnectDelayCreatesNewForStatefulDelays() throws Exception {
     }
 
     @Test
-    public void reconnectDelayReturnsSameInstanceForStatelessDelays() throws Exception {
+    void reconnectDelayReturnsSameInstanceForStatelessDelays() {
 
         DefaultClientResources resources = DefaultClientResources.builder().reconnectDelay(Delay.exponential()).build();
 
diff --git a/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderTest.java b/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java
similarity index 71%
rename from src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderTest.java
rename to src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java
index fd25e81656..ebf7e12ed6 100644
--- a/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderTest.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java
@@ -15,36 +15,40 @@
  */
 package io.lettuce.core.resource;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
+import io.lettuce.test.Futures;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.concurrent.Future;
 
 /**
  * @author Mark Paluch
  */
-public class DefaultEventLoopGroupProviderTest {
+class DefaultEventLoopGroupProviderUnitTests {
 
     @Test
-    public void shutdownTerminatedEventLoopGroup() throws Exception {
+    void shutdownTerminatedEventLoopGroup() {
         DefaultEventLoopGroupProvider sut = new DefaultEventLoopGroupProvider(1);
 
         NioEventLoopGroup eventLoopGroup = sut.allocate(NioEventLoopGroup.class);
 
         Future<Boolean> shutdown = sut.release(eventLoopGroup, 10, 10, TimeUnit.MILLISECONDS);
-        shutdown.get();
+        Futures.await(shutdown);
 
         Future<Boolean> shutdown2 = sut.release(eventLoopGroup, 10, 10, TimeUnit.MILLISECONDS);
-        shutdown2.get();
+        Futures.await(shutdown2);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void getAfterShutdown() throws Exception {
+    @Test
+    void getAfterShutdown() {
+
         DefaultEventLoopGroupProvider sut = new DefaultEventLoopGroupProvider(1);
 
-        sut.shutdown(10, 10, TimeUnit.MILLISECONDS).get();
-        sut.allocate(NioEventLoopGroup.class);
+        Futures.await(sut.shutdown(10, 10, TimeUnit.MILLISECONDS));
+        assertThatThrownBy(() -> sut.allocate(NioEventLoopGroup.class)).isInstanceOf(IllegalStateException.class);
     }
 }
diff --git a/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTest.java b/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java
similarity index 78%
rename from src/test/java/io/lettuce/core/resource/DirContextDnsResolverTest.java
rename to src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java
index 33eb52bf21..a0f17f3a29 100644
--- a/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTest.java
+++ b/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.resource;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 import java.net.Inet4Address;
@@ -24,26 +25,28 @@
 import java.util.Arrays;
 import java.util.Properties;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class DirContextDnsResolverTest {
 
-    DirContextDnsResolver resolver;
+class DirContextDnsResolverTests {
 
-    @Before
-    public void before() throws Exception {
+    private DirContextDnsResolver resolver;
+
+    @BeforeEach
+    void before() {
 
         System.getProperties().remove(DirContextDnsResolver.PREFER_IPV4_KEY);
         System.getProperties().remove(DirContextDnsResolver.PREFER_IPV6_KEY);
     }
 
-    @After
-    public void tearDown() throws Exception {
+    @AfterEach
+    void tearDown() throws Exception {
 
         if (resolver != null) {
             resolver.close();
@@ -51,30 +54,32 @@ public void tearDown() throws Exception {
     }
 
     @Test
-    public void shouldResolveDefault() throws Exception {
+    @Disabled("Requires guarding against IPv6 absence")
+    void shouldResolveDefault() throws Exception {
 
         resolver = new DirContextDnsResolver();
         InetAddress[] resolved = resolver.resolve("google.com");
 
-        assertThat(resolved.length).isGreaterThan(1);
+        assertThat(resolved.length).isGreaterThanOrEqualTo(2);
         assertThat(resolved[0]).isInstanceOf(Inet6Address.class);
         assertThat(resolved[0].getHostName()).isEqualTo("google.com");
         assertThat(resolved[resolved.length - 1]).isInstanceOf(Inet4Address.class);
     }
 
     @Test
-    public void shouldResolvePreferIpv4WithProperties() throws Exception {
+    void shouldResolvePreferIpv4WithProperties() throws Exception {
 
         resolver = new DirContextDnsResolver(true, false, new Properties());
 
         InetAddress[] resolved = resolver.resolve("google.com");
 
-        assertThat(resolved.length).isGreaterThan(1);
+        assertThat(resolved.length).isGreaterThanOrEqualTo(1);
         assertThat(resolved[0]).isInstanceOf(Inet4Address.class);
     }
 
     @Test
-    public void shouldResolveWithDnsServer() throws Exception {
+    @Disabled("Requires guarding against IPv6 absence")
+    void shouldResolveWithDnsServer() throws Exception {
 
         resolver = new DirContextDnsResolver(Arrays.asList("[2001:4860:4860::8888]", "8.8.8.8"));
 
@@ -84,7 +89,7 @@ public void shouldResolveWithDnsServer() throws Exception {
     }
 
     @Test
-    public void shouldPreferIpv4() throws Exception {
+    void shouldPreferIpv4() throws Exception {
 
         System.setProperty(DirContextDnsResolver.PREFER_IPV4_KEY, "true");
 
@@ -96,7 +101,7 @@ public void shouldPreferIpv4() throws Exception {
     }
 
     @Test
-    public void shouldPreferIpv4AndNotIpv6() throws Exception {
+    void shouldPreferIpv4AndNotIpv6() throws Exception {
 
         System.setProperty(DirContextDnsResolver.PREFER_IPV4_KEY, "true");
         System.setProperty(DirContextDnsResolver.PREFER_IPV6_KEY, "false");
@@ -109,7 +114,8 @@ public void shouldPreferIpv4AndNotIpv6() throws Exception {
     }
 
     @Test
-    public void shouldPreferIpv6AndNotIpv4() throws Exception {
+    @Disabled("Requires guarding against IPv6 absence")
+    void shouldPreferIpv6AndNotIpv4() throws Exception {
 
         System.setProperty(DirContextDnsResolver.PREFER_IPV4_KEY, "false");
         System.setProperty(DirContextDnsResolver.PREFER_IPV6_KEY, "true");
@@ -121,16 +127,16 @@ public void shouldPreferIpv6AndNotIpv4() throws Exception {
         assertThat(resolved[0]).isInstanceOf(Inet6Address.class);
     }
 
-    @Test(expected = UnknownHostException.class)
-    public void shouldFailWithUnknownHost() throws Exception {
+    @Test
+    void shouldFailWithUnknownHost() {
 
         resolver = new DirContextDnsResolver("8.8.8.8");
 
-        resolver.resolve("unknown-domain-name");
+        assertThatThrownBy(() -> resolver.resolve("unknown-domain-name")).isInstanceOf(UnknownHostException.class);
     }
 
     @Test
-    public void shouldResolveCname() throws Exception {
+    void shouldResolveCname() throws Exception {
 
         resolver = new DirContextDnsResolver();
         InetAddress[] resolved = resolver.resolve("www.github.io");
@@ -141,7 +147,7 @@ public void shouldResolveCname() throws Exception {
     }
 
     @Test
-    public void shouldResolveWithoutSubdomain() throws Exception {
+    void shouldResolveWithoutSubdomain() throws Exception {
 
         resolver = new DirContextDnsResolver();
         InetAddress[] resolved = resolver.resolve("paluch.biz");
@@ -158,7 +164,7 @@ public void shouldResolveWithoutSubdomain() throws Exception {
     }
 
     @Test
-    public void shouldWorkWithIpv4Address() throws Exception {
+    void shouldWorkWithIpv4Address() throws Exception {
 
         resolver = new DirContextDnsResolver();
         InetAddress[] resolved = resolver.resolve("127.0.0.1");
@@ -169,7 +175,7 @@ public void shouldWorkWithIpv4Address() throws Exception {
     }
 
     @Test
-    public void shouldWorkWithIpv6Addresses() throws Exception {
+    void shouldWorkWithIpv6Addresses() throws Exception {
 
         resolver = new DirContextDnsResolver();
         InetAddress[] resolved = resolver.resolve("::1");
diff --git a/src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java b/src/test/java/io/lettuce/core/resource/EqualJitterDelayUnitTests.java
similarity index 78%
rename from src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java
rename to src/test/java/io/lettuce/core/resource/EqualJitterDelayUnitTests.java
index e8c6aa6098..35b9096f3b 100644
--- a/src/test/java/io/lettuce/core/resource/EqualJitterDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/EqualJitterDelayUnitTests.java
@@ -16,30 +16,33 @@
 package io.lettuce.core.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Jongyeol Choi
  * @author Mark Paluch
  */
-public class EqualJitterDelayTest {
+class EqualJitterDelayUnitTests {
 
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldNotCreateIfLowerBoundIsNegative() throws Exception {
-        Delay.equalJitter(-1, 100, 1, TimeUnit.MILLISECONDS);
+    @Test
+    void shouldNotCreateIfLowerBoundIsNegative() {
+        assertThatThrownBy(() -> Delay.equalJitter(-1, 100, 1, TimeUnit.MILLISECONDS)).isInstanceOf(
+                IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldNotCreateIfLowerBoundIsSameAsUpperBound() throws Exception {
-        Delay.equalJitter(100, 100, 1, TimeUnit.MILLISECONDS);
+    @Test
+    void shouldNotCreateIfLowerBoundIsSameAsUpperBound() {
+        assertThatThrownBy(() -> Delay.equalJitter(100, 100, 1, TimeUnit.MILLISECONDS)).isInstanceOf(
+                IllegalArgumentException.class);
     }
 
     @Test
-    public void negativeAttemptShouldReturnZero() throws Exception {
+    void negativeAttemptShouldReturnZero() {
 
         Delay delay = Delay.equalJitter();
 
@@ -47,7 +50,7 @@ public void negativeAttemptShouldReturnZero() throws Exception {
     }
 
     @Test
-    public void zeroShouldReturnZero() throws Exception {
+    void zeroShouldReturnZero() {
 
         Delay delay = Delay.equalJitter();
 
@@ -55,7 +58,7 @@ public void zeroShouldReturnZero() throws Exception {
     }
 
     @Test
-    public void testDefaultDelays() throws Exception {
+    void testDefaultDelays() {
 
         Delay delay = Delay.equalJitter();
 
diff --git a/src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java b/src/test/java/io/lettuce/core/resource/ExponentialDelayUnitTests.java
similarity index 76%
rename from src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java
rename to src/test/java/io/lettuce/core/resource/ExponentialDelayUnitTests.java
index b25b7b5b62..c516187d41 100644
--- a/src/test/java/io/lettuce/core/resource/ExponentialDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/ExponentialDelayUnitTests.java
@@ -16,33 +16,37 @@
 package io.lettuce.core.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Paluch
  */
-public class ExponentialDelayTest {
+class ExponentialDelayUnitTests {
 
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldNotCreateIfLowerBoundIsNegative() throws Exception {
-        Delay.exponential(-1, 100, TimeUnit.MILLISECONDS, 10);
+    @Test
+    void shouldNotCreateIfLowerBoundIsNegative() {
+        assertThatThrownBy(() -> Delay.exponential(-1, 100, TimeUnit.MILLISECONDS, 10)).isInstanceOf(
+                IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldNotCreateIfLowerBoundIsSameAsUpperBound() throws Exception {
-        Delay.exponential(100, 100, TimeUnit.MILLISECONDS, 10);
+    @Test
+    void shouldNotCreateIfLowerBoundIsSameAsUpperBound() {
+        assertThatThrownBy(() -> Delay.exponential(100, 100, TimeUnit.MILLISECONDS, 10)).isInstanceOf(
+                IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldNotCreateIfPowerIsOne() throws Exception {
-        Delay.exponential(100, 1000, TimeUnit.MILLISECONDS, 1);
+    @Test
+    void shouldNotCreateIfPowerIsOne() {
+        assertThatThrownBy(() -> Delay.exponential(100, 1000, TimeUnit.MILLISECONDS, 1)).isInstanceOf(
+                IllegalArgumentException.class);
     }
 
     @Test
-    public void negativeAttemptShouldReturnZero() throws Exception {
+    void negativeAttemptShouldReturnZero() {
 
         Delay delay = Delay.exponential();
 
@@ -50,7 +54,7 @@ public void negativeAttemptShouldReturnZero() throws Exception {
     }
 
     @Test
-    public void zeroShouldReturnZero() throws Exception {
+    void zeroShouldReturnZero() {
 
         Delay delay = Delay.exponential();
 
@@ -58,7 +62,7 @@ public void zeroShouldReturnZero() throws Exception {
     }
 
     @Test
-    public void testDefaultDelays() throws Exception {
+    void testDefaultDelays() {
 
         Delay delay = Delay.exponential();
 
@@ -83,7 +87,7 @@ public void testDefaultDelays() throws Exception {
     }
 
     @Test
-    public void testPow10Delays() throws Exception {
+    void testPow10Delays() {
 
         Delay delay = Delay.exponential(100, 10000, TimeUnit.MILLISECONDS, 10);
 
diff --git a/src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java b/src/test/java/io/lettuce/core/resource/FullJitterDelayUnitTests.java
similarity index 79%
rename from src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java
rename to src/test/java/io/lettuce/core/resource/FullJitterDelayUnitTests.java
index c6d3105c46..7bc00ecfe1 100644
--- a/src/test/java/io/lettuce/core/resource/FullJitterDelayTest.java
+++ b/src/test/java/io/lettuce/core/resource/FullJitterDelayUnitTests.java
@@ -16,30 +16,33 @@
 package io.lettuce.core.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Jongyeol Choi
  * @author Mark Paluch
  */
-public class FullJitterDelayTest {
+class FullJitterDelayUnitTests {
 
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldNotCreateIfLowerBoundIsNegative() throws Exception {
-        Delay.fullJitter(-1, 100, 1, TimeUnit.MILLISECONDS);
+    @Test
+    void shouldNotCreateIfLowerBoundIsNegative() {
+        assertThatThrownBy(() -> Delay.fullJitter(-1, 100, 1, TimeUnit.MILLISECONDS)).isInstanceOf(
+                IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldNotCreateIfLowerBoundIsSameAsUpperBound() throws Exception {
-        Delay.fullJitter(100, 100, 1, TimeUnit.MILLISECONDS);
+    @Test
+    void shouldNotCreateIfLowerBoundIsSameAsUpperBound() {
+        assertThatThrownBy(() -> Delay.fullJitter(100, 100, 1, TimeUnit.MILLISECONDS)).isInstanceOf(
+                IllegalArgumentException.class);
     }
 
     @Test
-    public void negativeAttemptShouldReturnZero() throws Exception {
+    void negativeAttemptShouldReturnZero() {
 
         Delay delay = Delay.fullJitter();
 
@@ -47,7 +50,7 @@ public void negativeAttemptShouldReturnZero() throws Exception {
     }
 
     @Test
-    public void zeroShouldReturnZero() throws Exception {
+    void zeroShouldReturnZero() {
 
         Delay delay = Delay.fullJitter();
 
@@ -55,7 +58,7 @@ public void zeroShouldReturnZero() throws Exception {
     }
 
     @Test
-    public void testDefaultDelays() throws Exception {
+    void testDefaultDelays() {
 
         Delay delay = Delay.fullJitter();
 
diff --git a/src/test/java/io/lettuce/core/resource/FuturesTest.java b/src/test/java/io/lettuce/core/resource/FuturesUnitTests.java
similarity index 62%
rename from src/test/java/io/lettuce/core/resource/FuturesTest.java
rename to src/test/java/io/lettuce/core/resource/FuturesUnitTests.java
index 2485b971f7..c6f8db0e9b 100644
--- a/src/test/java/io/lettuce/core/resource/FuturesTest.java
+++ b/src/test/java/io/lettuce/core/resource/FuturesUnitTests.java
@@ -16,10 +16,11 @@
 package io.lettuce.core.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.Wait;
+import io.lettuce.test.Wait;
 import io.netty.util.concurrent.DefaultPromise;
 import io.netty.util.concurrent.GlobalEventExecutor;
 import io.netty.util.concurrent.ImmediateEventExecutor;
@@ -28,45 +29,50 @@
 /**
  * @author Mark Paluch
  */
-public class FuturesTest {
+class FuturesUnitTests {
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testPromise() {
-        new Futures.PromiseAggregator(null);
+    @Test
+    void testPromise() {
+        assertThatThrownBy(() -> new Futures.PromiseAggregator(null)).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void notArmed() {
-        Futures.PromiseAggregator<Boolean, Promise<Boolean>> sut = new Futures.PromiseAggregator<Boolean, Promise<Boolean>>(
+    @Test
+    void notArmed() {
+
+        Futures.PromiseAggregator<Boolean, Promise<Boolean>> sut = new Futures.PromiseAggregator<>(
                 new DefaultPromise<>(ImmediateEventExecutor.INSTANCE));
-        sut.add(new DefaultPromise<>(ImmediateEventExecutor.INSTANCE));
+        assertThatThrownBy(() -> sut.add(new DefaultPromise<>(ImmediateEventExecutor.INSTANCE))).isInstanceOf(
+                IllegalStateException.class);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void expectAfterArmed() {
-        Futures.PromiseAggregator<Boolean, Promise<Boolean>> sut = new Futures.PromiseAggregator<Boolean, Promise<Boolean>>(
+    @Test
+    void expectAfterArmed() {
+        Futures.PromiseAggregator<Boolean, Promise<Boolean>> sut = new Futures.PromiseAggregator<>(
                 new DefaultPromise<>(ImmediateEventExecutor.INSTANCE));
         sut.arm();
 
-        sut.expectMore(1);
+        assertThatThrownBy(() -> sut.expectMore(1)).isInstanceOf(IllegalStateException.class);
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void armTwice() {
-        Futures.PromiseAggregator<Boolean, Promise<Boolean>> sut = new Futures.PromiseAggregator<Boolean, Promise<Boolean>>(
+    @Test
+    void armTwice() {
+
+        Futures.PromiseAggregator<Boolean, Promise<Boolean>> sut = new Futures.PromiseAggregator<>(
                 new DefaultPromise<>(ImmediateEventExecutor.INSTANCE));
+
         sut.arm();
-        sut.arm();
+        assertThatThrownBy(sut::arm).isInstanceOf(IllegalStateException.class);
     }
 
     @Test
-    public void regularUse() {
-        final DefaultPromise<Boolean> target = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
+    void regularUse() {
+
+        DefaultPromise<Boolean> target = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
         Futures.PromiseAggregator<Boolean, Promise<Boolean>> sut = new Futures.PromiseAggregator<>(target);
 
         sut.expectMore(1);
         sut.arm();
-        DefaultPromise<Boolean> part = new DefaultPromise<Boolean>(GlobalEventExecutor.INSTANCE);
+        DefaultPromise<Boolean> part = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
         sut.add(part);
 
         assertThat(target.isDone()).isFalse();
diff --git a/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverTest.java b/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverUnitTests.java
similarity index 80%
rename from src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverTest.java
rename to src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverUnitTests.java
index 6fed88ad88..3e49e6ed78 100644
--- a/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverTest.java
+++ b/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverUnitTests.java
@@ -24,11 +24,13 @@
 import java.net.UnknownHostException;
 import java.util.function.Function;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.internal.HostAndPort;
@@ -36,19 +38,20 @@
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class MappingSocketAddressResolverTest {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class MappingSocketAddressResolverUnitTests {
 
     @Mock
     DnsResolver dnsResolver;
 
-    @Before
-    public void before() throws UnknownHostException {
+    @BeforeEach
+    void before() throws UnknownHostException {
         when(dnsResolver.resolve(anyString())).thenReturn(new InetAddress[0]);
     }
 
     @Test
-    public void shouldPassThruHostAndPort() {
+    void shouldPassThruHostAndPort() {
 
         RedisURI localhost = RedisURI.create("localhost", RedisURI.DEFAULT_REDIS_PORT);
         MappingSocketAddressResolver resolver = MappingSocketAddressResolver.create(dnsResolver, Function.identity());
@@ -60,7 +63,7 @@ public void shouldPassThruHostAndPort() {
     }
 
     @Test
-    public void shouldMapHostAndPort() {
+    void shouldMapHostAndPort() {
 
         RedisURI localhost = RedisURI.create("localhost", RedisURI.DEFAULT_REDIS_PORT);
         MappingSocketAddressResolver resolver = MappingSocketAddressResolver.create(dnsResolver,
diff --git a/src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java b/src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java
index 1c8c781848..dfbed96f1f 100644
--- a/src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java
@@ -15,21 +15,21 @@
  */
 package io.lettuce.core.sentinel;
 
-import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
 
-import io.lettuce.core.AbstractTest;
-import io.lettuce.core.FastShutdown;
 import io.lettuce.core.RedisClient;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
+import io.lettuce.test.resource.FastShutdown;
 
 /**
  * @author Mark Paluch
  */
-public abstract class AbstractSentinelTest extends AbstractTest {
+public abstract class AbstractSentinelTest extends TestSupport {
 
-    public static final String MASTER_ID = "mymaster";
+    protected static final String MASTER_ID = "mymaster";
 
     protected static RedisClient sentinelClient;
     protected RedisSentinelCommands<String, String> sentinel;
@@ -44,11 +44,10 @@ public void openConnection() throws Exception {
         sentinel = sentinelClient.connectSentinel().sync();
     }
 
-    @After
-    public void closeConnection() throws Exception {
+    @AfterEach
+    public void closeConnection() {
         if (sentinel != null) {
             sentinel.getStatefulConnection().close();
         }
     }
-
 }
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
index d6b8fb0732..d37605be79 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core.sentinel;
 
-import static io.lettuce.core.TestSettings.hostAddr;
+import static io.lettuce.test.settings.TestSettings.hostAddr;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
@@ -29,12 +29,16 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.Wait;
-import io.lettuce.core.*;
-import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisConnectionException;
+import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
+import io.lettuce.test.Wait;
+import io.lettuce.test.resource.DefaultRedisClient;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
@@ -150,14 +154,12 @@ public void getMaster() {
     }
 
     @Test
-    public void role() throws Exception {
+    public void role() {
 
-        RedisAsyncCommands<String, String> connection = sentinelClient.connect(RedisURI.Builder.redis(host, 26380).build())
-                .async();
+        RedisCommands<String, String> connection = sentinelClient.connect(RedisURI.Builder.redis(host, 26380).build()).sync();
         try {
 
-            RedisFuture<List<Object>> role = connection.role();
-            List<Object> objects = role.get();
+            List<Object> objects = connection.role();
 
             assertThat(objects).hasSize(2);
 
@@ -227,10 +229,15 @@ public void connectToRedisUsingSentinel() {
     }
 
     @Test
-    public void connectToRedisUsingSentinelWithReconnect() {
+    public void connectToRedisUsingSentinelWithReconnect() throws InterruptedException {
+
         RedisCommands<String, String> connect = sentinelClient.connect().sync();
+
         connect.ping();
         connect.quit();
+
+        Thread.sleep(50);
+        Wait.untilTrue(connect::isOpen).waitOrTimeout();
         connect.ping();
         connect.getStatefulConnection().close();
     }
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java
index 3e7ddbe0cc..4d01908a59 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java
@@ -22,18 +22,23 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import io.lettuce.TestClientResources;
-import io.lettuce.Wait;
-import io.lettuce.core.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.ByteArrayCodec;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
 import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
+import io.lettuce.test.Futures;
+import io.lettuce.test.Wait;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
@@ -43,13 +48,13 @@ public class SentinelConnectionTest extends AbstractSentinelTest {
     private StatefulRedisSentinelConnection<String, String> connection;
     private RedisSentinelAsyncCommands<String, String> sentinelAsync;
 
-    @BeforeClass
-    public static void setupClient() {
+    @BeforeAll
+    static void setupClient() {
         sentinelClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder
                 .sentinel(TestSettings.host(), MASTER_ID).build());
     }
 
-    @Before
+    @BeforeEach
     public void openConnection() {
         connection = sentinelClient.connectSentinel();
         sentinel = connection.sync();
@@ -57,17 +62,17 @@ public void openConnection() {
     }
 
     @Test
-    public void testAsync() throws Exception {
+    void testAsync() {
 
         RedisFuture<List<Map<String, String>>> future = sentinelAsync.masters();
 
-        assertThat(future.get()).isNotNull();
+        assertThat(Futures.get(future)).isNotNull();
         assertThat(future.isDone()).isTrue();
         assertThat(future.isCancelled()).isFalse();
     }
 
     @Test
-    public void testFuture() throws Exception {
+    void testFuture() throws Exception {
 
         RedisFuture<Map<String, String>> future = sentinelAsync.master("unknown master");
 
@@ -83,14 +88,14 @@ public void testFuture() throws Exception {
     }
 
     @Test
-    public void testStatefulConnection() {
+    void testStatefulConnection() {
 
         StatefulRedisSentinelConnection<String, String> statefulConnection = sentinel.getStatefulConnection();
         assertThat(statefulConnection).isSameAs(statefulConnection.async().getStatefulConnection());
     }
 
     @Test
-    public void testSyncConnection() {
+    void testSyncConnection() {
 
         StatefulRedisSentinelConnection<String, String> statefulConnection = sentinel.getStatefulConnection();
         RedisSentinelCommands<String, String> sync = statefulConnection.sync();
@@ -98,7 +103,7 @@ public void testSyncConnection() {
     }
 
     @Test
-    public void testSyncAsyncConversion() {
+    void testSyncAsyncConversion() {
 
         StatefulRedisSentinelConnection<String, String> statefulConnection = sentinel.getStatefulConnection();
         assertThat(statefulConnection.sync().getStatefulConnection()).isSameAs(statefulConnection);
@@ -106,7 +111,7 @@ public void testSyncAsyncConversion() {
     }
 
     @Test
-    public void testSyncClose() {
+    void testSyncClose() {
 
         StatefulRedisSentinelConnection<String, String> statefulConnection = sentinel.getStatefulConnection();
         statefulConnection.sync().getStatefulConnection().close();
@@ -118,7 +123,7 @@ public void testSyncClose() {
     }
 
     @Test
-    public void testAsyncClose() {
+    void testAsyncClose() {
         StatefulRedisSentinelConnection<String, String> statefulConnection = sentinel.getStatefulConnection();
         statefulConnection.async().getStatefulConnection().close();
 
@@ -129,7 +134,7 @@ public void testAsyncClose() {
     }
 
     @Test
-    public void connectToOneNode() {
+    void connectToOneNode() {
         RedisSentinelCommands<String, String> connection = sentinelClient.connectSentinel(
                 RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build()).sync();
         assertThat(connection.ping()).isEqualTo("PONG");
@@ -137,14 +142,14 @@ public void connectToOneNode() {
     }
 
     @Test
-    public void connectWithByteCodec() {
+    void connectWithByteCodec() {
         RedisSentinelCommands<byte[], byte[]> connection = sentinelClient.connectSentinel(new ByteArrayCodec()).sync();
         assertThat(connection.master(MASTER_ID.getBytes())).isNotNull();
         connection.getStatefulConnection().close();
     }
 
     @Test
-    public void sentinelConnectionPingBeforeConnectShouldDiscardPassword() {
+    void sentinelConnectionPingBeforeConnectShouldDiscardPassword() {
 
         RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).withPassword("hello-world").build();
 
@@ -159,7 +164,7 @@ public void sentinelConnectionPingBeforeConnectShouldDiscardPassword() {
     }
 
     @Test
-    public void sentinelConnectionShouldSetClientName() {
+    void sentinelConnectionShouldSetClientName() {
 
         RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).withClientName("my-client").build();
 
@@ -171,7 +176,7 @@ public void sentinelConnectionShouldSetClientName() {
     }
 
     @Test
-    public void sentinelManagedConnectionShouldSetClientName() {
+    void sentinelManagedConnectionShouldSetClientName() {
 
         RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).withClientName("my-client").build();
 
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelRule.java b/src/test/java/io/lettuce/core/sentinel/SentinelRule.java
index 565719deff..3e1c13dc79 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelRule.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelRule.java
@@ -28,15 +28,15 @@
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
-import io.lettuce.Wait;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RoleParser;
 import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
 import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
+import io.lettuce.test.Wait;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * Rule to simplify Redis Sentinel handling.
@@ -57,7 +57,7 @@ public class SentinelRule implements TestRule {
     private RedisClient redisClient;
     private final boolean flushBeforeTest;
     private Map<Integer, RedisSentinelCommands<String, String>> sentinelConnections = new HashMap<>();
-    protected Logger log = LogManager.getLogger(getClass());
+    private Logger log = LogManager.getLogger(getClass());
 
     /**
      *
@@ -82,7 +82,7 @@ public Statement apply(final Statement base, Description description) {
 
         final Statement before = new Statement() {
             @Override
-            public void evaluate() throws Exception {
+            public void evaluate() {
                 if (flushBeforeTest) {
                     flush();
                 }
@@ -105,7 +105,7 @@ public void evaluate() throws Throwable {
     /**
      * Flush Sentinel masters.
      */
-    public void flush() {
+    private void flush() {
         log.info("[Sentinel] Flushing masters of sentinels");
         for (RedisSentinelCommands<String, String> connection : sentinelConnections.values()) {
             List<Map<String, String>> masters = connection.masters();
@@ -145,7 +145,7 @@ public void needMasterWithSlave(String masterId, int... redisPorts) {
      *
      * @param masterId
      */
-    public void waitForConnectedSlaves(String masterId) {
+    private void waitForConnectedSlaves(String masterId) {
         log.info("[Sentinel] Waiting until master " + masterId + " has at least one connected slave");
         Wait.untilTrue(() -> hasConnectedSlaves(masterId)).during(seconds(20)).message("No slave found").waitOrTimeout();
         log.info("[Sentinel] Found a connected slave for master " + masterId);
@@ -208,7 +208,7 @@ public void monitor(final String key, String ip, int port, int quorum, boolean s
      * @param masterId
      * @return
      */
-    public boolean hasSlaves(String masterId) {
+    private boolean hasSlaves(String masterId) {
         try {
             for (RedisSentinelCommands<String, String> connection : sentinelConnections.values()) {
 
@@ -229,7 +229,7 @@ public boolean hasSlaves(String masterId) {
      * @param redisPorts
      * @return
      */
-    public boolean hasMaster(int... redisPorts) {
+    private boolean hasMaster(int... redisPorts) {
 
         Map<Integer, RedisCommands<String, String>> connections = new HashMap<>();
         for (int redisPort : redisPorts) {
@@ -257,7 +257,7 @@ public boolean hasMaster(int... redisPorts) {
      * @param masterId
      * @return
      */
-    public boolean hasConnectedSlaves(String masterId) {
+    private boolean hasConnectedSlaves(String masterId) {
         for (RedisSentinelCommands<String, String> connection : sentinelConnections.values()) {
             List<Map<String, String>> slaves = connection.slaves(masterId);
             for (Map<String, String> slave : slaves) {
@@ -297,7 +297,7 @@ public boolean hasConnectedSlaves(String masterId) {
      * @param redisPorts
      * @return
      */
-    public int setupMasterSlave(int... redisPorts) {
+    private int setupMasterSlave(int... redisPorts) {
 
         log.info("[Sentinel] Create a master with slaves on ports " + Arrays.toString(redisPorts));
         Map<Integer, RedisCommands<String, String>> connections = new HashMap<>();
@@ -339,7 +339,7 @@ public int setupMasterSlave(int... redisPorts) {
      * @param connections
      * @return
      */
-    public Integer getMasterPort(Map<Integer, RedisCommands<String, String>> connections) {
+    private Integer getMasterPort(Map<Integer, RedisCommands<String, String>> connections) {
 
         for (Map.Entry<Integer, RedisCommands<String, String>> entry : connections.entrySet()) {
 
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java
index ec5cb3aa53..204ce3eca2 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core.sentinel;
 
-import static io.lettuce.core.TestSettings.hostAddr;
+import static io.lettuce.test.settings.TestSettings.hostAddr;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.regex.Matcher;
@@ -26,12 +26,12 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import io.lettuce.TestClientResources;
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
@@ -59,7 +59,7 @@ public void openConnection() throws Exception {
     }
 
     @Test
-    public void clientGetSetname() throws Exception {
+    public void clientGetSetname() {
         assertThat(sentinel.clientGetname()).isNull();
         assertThat(sentinel.clientSetname("test")).isEqualTo("OK");
         assertThat(sentinel.clientGetname()).isEqualTo("test");
@@ -68,12 +68,12 @@ public void clientGetSetname() throws Exception {
     }
 
     @Test
-    public void clientPause() throws Exception {
+    public void clientPause() {
         assertThat(sentinel.clientPause(10)).isEqualTo("OK");
     }
 
     @Test
-    public void clientKill() throws Exception {
+    public void clientKill() {
         Pattern p = Pattern.compile(".*addr=([^ ]+).*");
         String clients = sentinel.clientList();
         Matcher m = p.matcher(clients);
@@ -83,7 +83,7 @@ public void clientKill() throws Exception {
     }
 
     @Test
-    public void clientKillExtended() throws Exception {
+    public void clientKillExtended() {
 
         RedisSentinelCommands<String, String> connection2 = sentinelClient.connectSentinel().sync();
         connection2.clientSetname("killme");
@@ -105,12 +105,12 @@ public void clientKillExtended() throws Exception {
     }
 
     @Test
-    public void clientList() throws Exception {
+    public void clientList() {
         assertThat(sentinel.clientList().contains("addr=")).isTrue();
     }
 
     @Test
-    public void info() throws Exception {
+    public void info() {
         assertThat(sentinel.info().contains("redis_version")).isTrue();
         assertThat(sentinel.info("server").contains("redis_version")).isTrue();
     }
diff --git a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
index 06994835f2..7235fff0f0 100644
--- a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
@@ -15,14 +15,14 @@
  */
 package io.lettuce.core.sentinel.reactive;
 
-import static io.lettuce.core.TestSettings.hostAddr;
+import static io.lettuce.test.settings.TestSettings.hostAddr;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.sentinel.SentinelCommandTest;
 import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
 import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
@@ -30,7 +30,7 @@
 public class SentinelReactiveCommandTest extends SentinelCommandTest {
 
     @Override
-    public void openConnection() throws Exception {
+    public void openConnection() {
 
         RedisSentinelAsyncCommands<String, String> async = sentinelClient.connectSentinel().async();
         RedisSentinelReactiveCommands<String, String> reactive = async.getStatefulConnection().reactive();
diff --git a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
index b5676c583c..e256092462 100644
--- a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
@@ -15,14 +15,14 @@
  */
 package io.lettuce.core.sentinel.reactive;
 
-import static io.lettuce.core.TestSettings.hostAddr;
+import static io.lettuce.test.settings.TestSettings.hostAddr;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.sentinel.SentinelServerCommandTest;
 import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
 import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands;
-import io.lettuce.util.ReactiveSyncInvocationHandler;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
@@ -30,7 +30,7 @@
 public class SentinelServerReactiveCommandTest extends SentinelServerCommandTest {
 
     @Override
-    public void openConnection() throws Exception {
+    public void openConnection() {
 
         RedisSentinelAsyncCommands<String, String> async = sentinelClient.connectSentinel().async();
         RedisSentinelReactiveCommands<String, String> reactive = async.getStatefulConnection().reactive();
diff --git a/src/test/java/io/lettuce/core/server/MockTcpServer.java b/src/test/java/io/lettuce/core/server/MockTcpServer.java
index 00c918aa4b..efe6be62a2 100644
--- a/src/test/java/io/lettuce/core/server/MockTcpServer.java
+++ b/src/test/java/io/lettuce/core/server/MockTcpServer.java
@@ -52,7 +52,7 @@ public void initialize(int port) throws InterruptedException {
         b.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class).option(ChannelOption.SO_BACKLOG, 100)
                 .childHandler(new ChannelInitializer<SocketChannel>() {
                     @Override
-                    public void initChannel(SocketChannel ch) throws Exception {
+                    public void initChannel(SocketChannel ch) {
                         ChannelPipeline p = ch.pipeline();
                         // p.addLast(new LoggingHandler(LogLevel.INFO));
 
diff --git a/src/test/java/io/lettuce/core/server/RandomServerHandler.java b/src/test/java/io/lettuce/core/server/RandomServerHandler.java
index 2d44b81ec7..9b7f7ffe42 100644
--- a/src/test/java/io/lettuce/core/server/RandomServerHandler.java
+++ b/src/test/java/io/lettuce/core/server/RandomServerHandler.java
@@ -25,7 +25,7 @@
 /**
  * Handler to generate random base64 data.
  */
-public class RandomServerHandler extends ChannelInboundHandlerAdapter {
+class RandomServerHandler extends ChannelInboundHandlerAdapter {
 
     private final int count;
 
diff --git a/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportTest.java b/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java
similarity index 79%
rename from src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportTest.java
rename to src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java
index 318e0e4b08..d9c378a4b2 100644
--- a/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportTest.java
+++ b/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java
@@ -23,12 +23,11 @@
 import java.util.concurrent.CompletableFuture;
 
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import io.lettuce.TestClientResources;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
@@ -36,33 +35,36 @@
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.StatefulRedisClusterConnectionImpl;
 import io.lettuce.core.codec.StringCodec;
+import io.lettuce.test.Futures;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
 import io.netty.channel.group.ChannelGroup;
 
 /**
  * @author Mark Paluch
  */
-public class AsyncConnectionPoolSupportTest extends AbstractTest {
+class AsyncConnectionPoolSupportIntegrationTests extends TestSupport {
 
     private static RedisClient client;
     private static Set<?> channels;
     private static RedisURI uri = RedisURI.Builder.redis(host, port).build();
 
-    @BeforeClass
-    public static void setupClient() {
+    @BeforeAll
+    static void setupClient() {
 
         client = RedisClient.create(TestClientResources.create(), uri);
         client.setOptions(ClientOptions.create());
         channels = (ChannelGroup) ReflectionTestUtils.getField(client, "channels");
     }
 
-    @AfterClass
-    public static void afterClass() {
+    @AfterAll
+    static void afterClass() {
         FastShutdown.shutdown(client);
         FastShutdown.shutdown(client.getResources());
     }
 
     @Test
-    public void asyncPoolShouldWorkWithWrappedConnections() {
+    void asyncPoolShouldWorkWithWrappedConnections() {
 
         BoundedAsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
                 () -> client.connectAsync(StringCodec.ASCII, uri), BoundedPoolConfig.create());
@@ -71,8 +73,8 @@ public void asyncPoolShouldWorkWithWrappedConnections() {
         borrowAndClose(pool);
         borrowAndCloseAsync(pool);
 
-        pool.release(pool.acquire().join().sync().getStatefulConnection()).join();
-        pool.release(pool.acquire().join().async().getStatefulConnection()).join();
+        Futures.await(pool.release(Futures.get(pool.acquire()).sync().getStatefulConnection()));
+        Futures.await(pool.release(Futures.get(pool.acquire()).async().getStatefulConnection()));
 
         assertThat(channels).hasSize(1);
 
@@ -82,7 +84,7 @@ public void asyncPoolShouldWorkWithWrappedConnections() {
     }
 
     @Test
-    public void asyncPoolShouldCloseConnectionsAboveMaxIdleSize() {
+    void asyncPoolShouldCloseConnectionsAboveMaxIdleSize() {
 
         GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
         poolConfig.setMaxIdle(2);
@@ -93,9 +95,9 @@ public void asyncPoolShouldCloseConnectionsAboveMaxIdleSize() {
         borrowAndReturn(pool);
         borrowAndClose(pool);
 
-        StatefulRedisConnection<String, String> c1 = pool.acquire().join();
-        StatefulRedisConnection<String, String> c2 = pool.acquire().join();
-        StatefulRedisConnection<String, String> c3 = pool.acquire().join();
+        StatefulRedisConnection<String, String> c1 = Futures.get(pool.acquire());
+        StatefulRedisConnection<String, String> c2 = Futures.get(pool.acquire());
+        StatefulRedisConnection<String, String> c3 = Futures.get(pool.acquire());
 
         assertThat(channels).hasSize(3);
 
@@ -109,14 +111,14 @@ public void asyncPoolShouldCloseConnectionsAboveMaxIdleSize() {
     }
 
     @Test
-    public void asyncPoolShouldWorkWithPlainConnections() {
+    void asyncPoolShouldWorkWithPlainConnections() {
 
         AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
                 () -> client.connectAsync(StringCodec.ASCII, uri), BoundedPoolConfig.create(), false);
 
         borrowAndReturn(pool);
 
-        StatefulRedisConnection<String, String> connection = pool.acquire().join();
+        StatefulRedisConnection<String, String> connection = Futures.get(pool.acquire());
         assertThat(Proxy.isProxyClass(connection.getClass())).isFalse();
         pool.release(connection);
 
@@ -124,12 +126,12 @@ public void asyncPoolShouldWorkWithPlainConnections() {
     }
 
     @Test
-    public void asyncPoolUsingWrappingShouldPropagateExceptionsCorrectly() {
+    void asyncPoolUsingWrappingShouldPropagateExceptionsCorrectly() {
 
         AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
                 () -> client.connectAsync(StringCodec.ASCII, uri), BoundedPoolConfig.create());
 
-        StatefulRedisConnection<String, String> connection = pool.acquire().join();
+        StatefulRedisConnection<String, String> connection = Futures.get(pool.acquire());
         RedisCommands<String, String> sync = connection.sync();
         sync.set(key, value);
 
@@ -145,12 +147,12 @@ public void asyncPoolUsingWrappingShouldPropagateExceptionsCorrectly() {
     }
 
     @Test
-    public void wrappedConnectionShouldUseWrappers() {
+    void wrappedConnectionShouldUseWrappers() {
 
         AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
                 () -> client.connectAsync(StringCodec.ASCII, uri), BoundedPoolConfig.create());
 
-        StatefulRedisConnection<String, String> connection = pool.acquire().join();
+        StatefulRedisConnection<String, String> connection = Futures.get(pool.acquire());
         RedisCommands<String, String> sync = connection.sync();
 
         assertThat(connection).isInstanceOf(StatefulRedisConnection.class).isNotInstanceOf(
@@ -169,12 +171,12 @@ public void wrappedConnectionShouldUseWrappers() {
     }
 
     @Test
-    public void wrappedObjectClosedAfterReturn() {
+    void wrappedObjectClosedAfterReturn() {
 
         AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
                 () -> client.connectAsync(StringCodec.ASCII, uri), BoundedPoolConfig.create(), true);
 
-        StatefulRedisConnection<String, String> connection = pool.acquire().join();
+        StatefulRedisConnection<String, String> connection = Futures.get(pool.acquire());
         RedisCommands<String, String> sync = connection.sync();
         sync.ping();
 
@@ -191,7 +193,7 @@ public void wrappedObjectClosedAfterReturn() {
     }
 
     @Test
-    public void shouldPropagateAsyncFlow() {
+    void shouldPropagateAsyncFlow() {
 
         AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
                 () -> client.connectAsync(StringCodec.ASCII, uri), BoundedPoolConfig.create());
@@ -200,7 +202,7 @@ public void shouldPropagateAsyncFlow() {
             return c.async().ping().whenComplete((s, throwable) -> pool.release(c));
         });
 
-        pingResponse.join();
+        Futures.await(pingResponse);
         assertThat(pingResponse).isCompletedWithValue("PONG");
 
         pool.close();
@@ -209,17 +211,17 @@ public void shouldPropagateAsyncFlow() {
     private void borrowAndReturn(AsyncPool<StatefulRedisConnection<String, String>> pool) {
 
         for (int i = 0; i < 10; i++) {
-            StatefulRedisConnection<String, String> connection = pool.acquire().join();
+            StatefulRedisConnection<String, String> connection = Futures.get(pool.acquire());
             RedisCommands<String, String> sync = connection.sync();
             sync.ping();
-            pool.release(connection).join();
+            Futures.await(pool.release(connection));
         }
     }
 
     private void borrowAndClose(AsyncPool<StatefulRedisConnection<String, String>> pool) {
 
         for (int i = 0; i < 10; i++) {
-            StatefulRedisConnection<String, String> connection = pool.acquire().join();
+            StatefulRedisConnection<String, String> connection = Futures.get(pool.acquire());
             RedisCommands<String, String> sync = connection.sync();
             sync.ping();
             connection.close();
@@ -229,10 +231,10 @@ private void borrowAndClose(AsyncPool<StatefulRedisConnection<String, String>> p
     private void borrowAndCloseAsync(AsyncPool<StatefulRedisConnection<String, String>> pool) {
 
         for (int i = 0; i < 10; i++) {
-            StatefulRedisConnection<String, String> connection = pool.acquire().join();
+            StatefulRedisConnection<String, String> connection = Futures.get(pool.acquire());
             RedisCommands<String, String> sync = connection.sync();
             sync.ping();
-            connection.closeAsync().join();
+            Futures.get(connection.closeAsync());
         }
     }
 }
diff --git a/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationTest.java b/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java
similarity index 85%
rename from src/test/java/io/lettuce/core/support/AsyncPoolWithValidationTest.java
rename to src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java
index f58b592d94..0ea3cd1b9d 100644
--- a/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationTest.java
+++ b/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java
@@ -27,25 +27,29 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 import io.lettuce.core.RedisException;
+import io.lettuce.test.Futures;
 
 /**
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class AsyncPoolWithValidationTest {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class AsyncPoolWithValidationUnitTests {
 
     @Mock
     AsyncObjectFactory<String> factory;
 
-    @Before
-    public void before() throws Exception {
+    @BeforeEach
+    void before() {
         when(factory.destroy(any())).thenReturn(CompletableFuture.completedFuture(null));
     }
 
@@ -56,7 +60,7 @@ private void mockCreation() {
     }
 
     @Test
-    public void objectCreationShouldFail() {
+    void objectCreationShouldFail() {
 
         when(factory.create()).thenReturn(failed(new RedisException("foo")));
 
@@ -72,7 +76,7 @@ public void objectCreationShouldFail() {
     }
 
     @Test
-    public void objectCreationFinishesAfterShutdown() {
+    void objectCreationFinishesAfterShutdown() {
 
         CompletableFuture<String> progress = new CompletableFuture<>();
 
@@ -105,7 +109,7 @@ public void objectCreationFinishesAfterShutdown() {
     }
 
     @Test
-    public void objectCreationCanceled() {
+    void objectCreationCanceled() {
 
         CompletableFuture<String> progress = new CompletableFuture<>();
 
@@ -126,7 +130,7 @@ public void objectCreationCanceled() {
     }
 
     @Test
-    public void shouldCreateObjectWithTestOnBorrowFailExceptionally() {
+    void shouldCreateObjectWithTestOnBorrowFailExceptionally() {
 
         mockCreation();
         when(factory.validate(any())).thenReturn(failed(new RedisException("foo")));
@@ -143,7 +147,7 @@ public void shouldCreateObjectWithTestOnBorrowFailExceptionally() {
     }
 
     @Test
-    public void shouldCreateObjectWithTestOnBorrowSuccess() {
+    void shouldCreateObjectWithTestOnBorrowSuccess() {
 
         mockCreation();
         when(factory.validate(any())).thenReturn(CompletableFuture.completedFuture(true));
@@ -160,7 +164,7 @@ public void shouldCreateObjectWithTestOnBorrowSuccess() {
     }
 
     @Test
-    public void shouldCreateObjectWithTestOnBorrowFailState() {
+    void shouldCreateObjectWithTestOnBorrowFailState() {
 
         mockCreation();
         when(factory.validate(any())).thenReturn(CompletableFuture.completedFuture(false));
@@ -177,7 +181,7 @@ public void shouldCreateObjectWithTestOnBorrowFailState() {
     }
 
     @Test
-    public void shouldCreateFailedObjectWithTestOnBorrowFail() {
+    void shouldCreateFailedObjectWithTestOnBorrowFail() {
 
         when(factory.create()).thenReturn(failed(new RedisException("foo")));
 
@@ -193,14 +197,14 @@ public void shouldCreateFailedObjectWithTestOnBorrowFail() {
     }
 
     @Test
-    public void shouldTestObjectOnBorrowSuccessfully() {
+    void shouldTestObjectOnBorrowSuccessfully() {
 
         mockCreation();
         when(factory.validate(any())).thenReturn(CompletableFuture.completedFuture(true));
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnAcquire().build());
 
-        pool.release(pool.acquire().join());
+        pool.release(Futures.get(pool.acquire()));
 
         assertThat(pool.getIdle()).isEqualTo(1);
         assertThat(pool.getObjectCount()).isEqualTo(1);
@@ -212,14 +216,14 @@ public void shouldTestObjectOnBorrowSuccessfully() {
     }
 
     @Test
-    public void shouldTestObjectOnBorrowFailState() {
+    void shouldTestObjectOnBorrowFailState() {
 
         mockCreation();
         when(factory.validate(any())).thenReturn(failed(new RedisException("foo")));
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnAcquire().build());
 
-        pool.release(pool.acquire().join());
+        pool.release(Futures.get(pool.acquire()));
 
         assertThat(pool.getIdle()).isEqualTo(1);
         assertThat(pool.getObjectCount()).isEqualTo(1);
@@ -235,14 +239,14 @@ public void shouldTestObjectOnBorrowFailState() {
     }
 
     @Test
-    public void shouldTestObjectOnBorrowFailExceptionally() {
+    void shouldTestObjectOnBorrowFailExceptionally() {
 
         mockCreation();
         when(factory.validate(any())).thenReturn(failed(new RedisException("foo")));
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnAcquire().build());
 
-        pool.release(pool.acquire().join());
+        pool.release(Futures.get(pool.acquire()));
 
         assertThat(pool.getIdle()).isEqualTo(1);
         assertThat(pool.getObjectCount()).isEqualTo(1);
@@ -258,14 +262,14 @@ public void shouldTestObjectOnBorrowFailExceptionally() {
     }
 
     @Test
-    public void shouldTestObjectOnReturnSuccessfully() {
+    void shouldTestObjectOnReturnSuccessfully() {
 
         mockCreation();
         when(factory.validate(any())).thenReturn(CompletableFuture.completedFuture(true));
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnRelease().build());
 
-        CompletableFuture<Void> release = pool.release(pool.acquire().join());
+        Futures.await(pool.release(Futures.get(pool.acquire())));
 
         assertThat(pool.getIdle()).isEqualTo(1);
         assertThat(pool.getObjectCount()).isEqualTo(1);
@@ -277,14 +281,14 @@ public void shouldTestObjectOnReturnSuccessfully() {
     }
 
     @Test
-    public void shouldTestObjectOnReturnFailState() {
+    void shouldTestObjectOnReturnFailState() {
 
         mockCreation();
         when(factory.validate(any())).thenReturn(failed(new RedisException("foo")));
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnRelease().build());
 
-        CompletableFuture<Void> release = pool.release(pool.acquire().join());
+        CompletableFuture<Void> release = pool.release(Futures.get(pool.acquire()));
 
         assertThat(pool.getIdle()).isZero();
         assertThat(pool.getObjectCount()).isZero();
@@ -294,14 +298,14 @@ public void shouldTestObjectOnReturnFailState() {
     }
 
     @Test
-    public void shouldTestObjectOnReturnFailExceptionally() {
+    void shouldTestObjectOnReturnFailExceptionally() {
 
         mockCreation();
         when(factory.validate(any())).thenReturn(failed(new RedisException("foo")));
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnRelease().build());
 
-        CompletableFuture<Void> release = pool.release(pool.acquire().join());
+        CompletableFuture<Void> release = pool.release(Futures.get(pool.acquire()));
 
         assertThat(pool.getIdle()).isZero();
         assertThat(pool.getObjectCount()).isZero();
@@ -311,7 +315,7 @@ public void shouldTestObjectOnReturnFailExceptionally() {
     }
 
     @Test
-    public void shouldRefillIdleObjects() {
+    void shouldRefillIdleObjects() {
 
         mockCreation();
 
@@ -329,7 +333,7 @@ public void shouldRefillIdleObjects() {
     }
 
     @Test
-    public void shouldDisposeIdleObjects() {
+    void shouldDisposeIdleObjects() {
 
         mockCreation();
 
@@ -338,7 +342,7 @@ public void shouldDisposeIdleObjects() {
 
         assertThat(pool.getIdle()).isEqualTo(5);
 
-        String object = pool.acquire().join();
+        String object = Futures.get(pool.acquire());
         pool.release(object);
 
         assertThat(pool.getIdle()).isEqualTo(5);
diff --git a/src/test/java/io/lettuce/core/support/BoundedAsyncPoolTest.java b/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java
similarity index 85%
rename from src/test/java/io/lettuce/core/support/BoundedAsyncPoolTest.java
rename to src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java
index bc356e3cd6..7bc69c79a8 100644
--- a/src/test/java/io/lettuce/core/support/BoundedAsyncPoolTest.java
+++ b/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java
@@ -22,15 +22,17 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import io.lettuce.test.Futures;
 
 /**
  * @author Mark Paluch
  */
-public class BoundedAsyncPoolTest {
+class BoundedAsyncPoolUnitTests {
 
-    AtomicInteger counter = new AtomicInteger();
-    List<String> destroyed = new ArrayList<>();
+    private AtomicInteger counter = new AtomicInteger();
+    private List<String> destroyed = new ArrayList<>();
 
     private AsyncObjectFactory<String> STRING_OBJECT_FACTORY = new AsyncObjectFactory<String>() {
         @Override
@@ -51,18 +53,18 @@ public CompletableFuture<Boolean> validate(String object) {
     };
 
     @Test
-    public void shouldCreateObject() {
+    void shouldCreateObject() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.create());
 
-        String object = pool.acquire().join();
+        String object = Futures.get(pool.acquire());
 
         assertThat(pool.getIdle()).isEqualTo(0);
         assertThat(object).isEqualTo("1");
     }
 
     @Test
-    public void shouldCreateMinIdleObject() {
+    void shouldCreateMinIdleObject() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.builder().minIdle(2)
                 .build());
@@ -72,35 +74,35 @@ public void shouldCreateMinIdleObject() {
     }
 
     @Test
-    public void shouldCreateMaintainMinIdleObject() {
+    void shouldCreateMaintainMinIdleObject() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.builder().minIdle(2)
                 .build());
 
-        pool.acquire().join();
+        Futures.await(pool.acquire());
 
         assertThat(pool.getIdle()).isEqualTo(2);
         assertThat(pool.getObjectCount()).isEqualTo(3);
     }
 
     @Test
-    public void shouldCreateMaintainMinMaxIdleObject() {
+    void shouldCreateMaintainMinMaxIdleObject() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.builder().minIdle(2)
                 .maxTotal(2).build());
 
-        pool.acquire().join();
+        Futures.await(pool.acquire());
 
         assertThat(pool.getIdle()).isEqualTo(1);
         assertThat(pool.getObjectCount()).isEqualTo(2);
     }
 
     @Test
-    public void shouldReturnObject() {
+    void shouldReturnObject() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.create());
 
-        String object = pool.acquire().join();
+        String object = Futures.get(pool.acquire());
         assertThat(pool.getObjectCount()).isEqualTo(1);
         pool.release(object);
 
@@ -108,25 +110,25 @@ public void shouldReturnObject() {
     }
 
     @Test
-    public void shouldReuseObjects() {
+    void shouldReuseObjects() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.create());
 
-        pool.release(pool.acquire().join());
+        pool.release(Futures.get(pool.acquire()));
 
-        assertThat(pool.acquire().join()).isEqualTo("1");
+        assertThat(Futures.get(pool.acquire())).isEqualTo("1");
         assertThat(pool.getIdle()).isEqualTo(0);
     }
 
     @Test
-    public void shouldDestroyIdle() {
+    void shouldDestroyIdle() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.builder().maxIdle(2)
                 .maxTotal(5).build());
 
         List<String> objects = new ArrayList<>();
         for (int i = 0; i < 3; i++) {
-            objects.add(pool.acquire().join());
+            objects.add(Futures.get(pool.acquire()));
         }
 
         for (int i = 0; i < 2; i++) {
@@ -143,15 +145,15 @@ public void shouldDestroyIdle() {
     }
 
     @Test
-    public void shouldExhaustPool() {
+    void shouldExhaustPool() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.builder().maxTotal(4)
                 .build());
 
-        String object1 = pool.acquire().join();
-        String object2 = pool.acquire().join();
-        String object3 = pool.acquire().join();
-        String object4 = pool.acquire().join();
+        String object1 = Futures.get(pool.acquire());
+        String object2 = Futures.get(pool.acquire());
+        String object3 = Futures.get(pool.acquire());
+        String object4 = Futures.get(pool.acquire());
 
         assertThat(pool.getIdle()).isZero();
         assertThat(pool.getObjectCount()).isEqualTo(4);
@@ -171,17 +173,17 @@ public void shouldExhaustPool() {
     }
 
     @Test
-    public void shouldClearPool() {
+    void shouldClearPool() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.builder().maxTotal(4)
                 .build());
 
         for (int i = 0; i < 20; i++) {
 
-            String object1 = pool.acquire().join();
-            String object2 = pool.acquire().join();
-            String object3 = pool.acquire().join();
-            String object4 = pool.acquire().join();
+            String object1 = Futures.get(pool.acquire());
+            String object2 = Futures.get(pool.acquire());
+            String object3 = Futures.get(pool.acquire());
+            String object4 = Futures.get(pool.acquire());
 
             assertThat(pool.acquire()).isCompletedExceptionally();
 
@@ -198,7 +200,7 @@ public void shouldClearPool() {
     }
 
     @Test
-    public void shouldExhaustPoolConcurrent() {
+    void shouldExhaustPoolConcurrent() {
 
         List<CompletableFuture<String>> progress = new ArrayList<>();
         AsyncObjectFactory<String> IN_PROGRESS = new AsyncObjectFactory<String>() {
@@ -245,7 +247,7 @@ public CompletableFuture<Boolean> validate(String object) {
     }
 
     @Test
-    public void shouldConcurrentlyFail() {
+    void shouldConcurrentlyFail() {
 
         List<CompletableFuture<String>> progress = new ArrayList<>();
         AsyncObjectFactory<String> IN_PROGRESS = new AsyncObjectFactory<String>() {
diff --git a/src/test/java/io/lettuce/core/support/CdiTest.java b/src/test/java/io/lettuce/core/support/CdiIntegrationTests.java
similarity index 70%
rename from src/test/java/io/lettuce/core/support/CdiTest.java
rename to src/test/java/io/lettuce/core/support/CdiIntegrationTests.java
index d04a71e2b8..e317e71b3c 100644
--- a/src/test/java/io/lettuce/core/support/CdiTest.java
+++ b/src/test/java/io/lettuce/core/support/CdiIntegrationTests.java
@@ -19,69 +19,68 @@
 import static org.mockito.Mockito.mock;
 
 import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.se.SeContainer;
+import javax.enterprise.inject.se.SeContainerInitializer;
 
-import org.apache.webbeans.cditest.CdiTestContainer;
-import org.apache.webbeans.cditest.CdiTestContainerLoader;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import io.lettuce.TestClientResources;
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.RedisConnectionStateListener;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
+import io.lettuce.test.resource.TestClientResources;
 
 /**
  * @author Mark Paluch
  * @since 3.0
  */
-public class CdiTest {
+class CdiIntegrationTests {
 
-    static CdiTestContainer container;
+    private static SeContainer container;
 
-    @BeforeClass
-    public static void setUp() throws Exception {
+    @BeforeAll
+    static void setUp() {
 
-        container = CdiTestContainerLoader.getCdiContainer();
-        container.bootContainer();
-        container.startApplicationScope();
+        container = SeContainerInitializer.newInstance() //
+                .disableDiscovery() //
+                .addPackages(CdiIntegrationTests.class) //
+                .initialize();
     }
 
-    @AfterClass
-    public static void afterClass() throws Exception {
-
-        container.stopApplicationScope();
-        container.shutdownContainer();
+    @AfterAll
+    static void afterClass() {
+        container.close();
     }
 
     @Produces
-    public RedisURI redisURI() {
+    RedisURI redisURI() {
         return RedisURI.Builder.redis(AbstractRedisClientTest.host, AbstractRedisClientTest.port).build();
     }
 
     @Produces
-    public ClientResources clientResources() {
+    ClientResources clientResources() {
         return TestClientResources.get();
     }
 
     @Produces
     @PersonDB
-    public ClientResources personClientResources() {
+    ClientResources personClientResources() {
         return DefaultClientResources.create();
     }
 
     @PersonDB
     @Produces
-    public RedisURI redisURIQualified() {
+    RedisURI redisURIQualified() {
         return RedisURI.Builder.redis(AbstractRedisClientTest.host, AbstractRedisClientTest.port + 1).build();
     }
 
     @Test
-    public void testInjection() {
+    void testInjection() {
 
-        InjectedClient injectedClient = container.getInstance(InjectedClient.class);
+        InjectedClient injectedClient = container.select(InjectedClient.class).get();
         assertThat(injectedClient.redisClient).isNotNull();
         assertThat(injectedClient.redisClusterClient).isNotNull();
 
diff --git a/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java
similarity index 91%
rename from src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java
rename to src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java
index d2151bd17b..f50edc1274 100644
--- a/src/test/java/io/lettuce/core/support/ConnectionPoolSupportTest.java
+++ b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java
@@ -25,13 +25,11 @@
 import org.apache.commons.pool2.impl.GenericObjectPool;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.apache.commons.pool2.impl.SoftReferenceObjectPool;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import io.lettuce.TestClientResources;
-import io.lettuce.Wait;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
@@ -48,31 +46,35 @@
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.masterslave.MasterSlave;
 import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection;
+import io.lettuce.test.Wait;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.settings.TestSettings;
 import io.netty.channel.group.ChannelGroup;
 
 /**
  * @author Mark Paluch
  */
-public class ConnectionPoolSupportTest extends AbstractTest {
+class ConnectionPoolSupportIntegrationTests extends TestSupport {
 
     private static RedisClient client;
     private static Set<?> channels;
 
-    @BeforeClass
-    public static void setupClient() {
+    @BeforeAll
+    static void setupClient() {
         client = RedisClient.create(TestClientResources.create(), RedisURI.Builder.redis(host, port).build());
         client.setOptions(ClientOptions.create());
         channels = (ChannelGroup) ReflectionTestUtils.getField(client, "channels");
     }
 
-    @AfterClass
-    public static void afterClass() {
+    @AfterAll
+    static void afterClass() {
         FastShutdown.shutdown(client);
         FastShutdown.shutdown(client.getResources());
     }
 
     @Test
-    public void genericPoolShouldWorkWithWrappedConnections() throws Exception {
+    void genericPoolShouldWorkWithWrappedConnections() throws Exception {
 
         GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
                 () -> client.connect(), new GenericObjectPoolConfig());
@@ -94,7 +96,7 @@ public void genericPoolShouldWorkWithWrappedConnections() throws Exception {
     }
 
     @Test
-    public void genericPoolShouldCloseConnectionsAboveMaxIdleSize() throws Exception {
+    void genericPoolShouldCloseConnectionsAboveMaxIdleSize() throws Exception {
 
         GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
         poolConfig.setMaxIdle(2);
@@ -126,7 +128,7 @@ public void genericPoolShouldCloseConnectionsAboveMaxIdleSize() throws Exception
     }
 
     @Test
-    public void genericPoolShouldWorkWithPlainConnections() throws Exception {
+    void genericPoolShouldWorkWithPlainConnections() throws Exception {
 
         GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
                 () -> client.connect(), new GenericObjectPoolConfig(), false);
@@ -141,7 +143,7 @@ public void genericPoolShouldWorkWithPlainConnections() throws Exception {
     }
 
     @Test
-    public void softReferencePoolShouldWorkWithPlainConnections() throws Exception {
+    void softReferencePoolShouldWorkWithPlainConnections() throws Exception {
 
         SoftReferenceObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
                 .createSoftReferenceObjectPool(() -> client.connect(), false);
@@ -157,7 +159,7 @@ public void softReferencePoolShouldWorkWithPlainConnections() throws Exception {
     }
 
     @Test
-    public void genericPoolUsingWrappingShouldPropagateExceptionsCorrectly() throws Exception {
+    void genericPoolUsingWrappingShouldPropagateExceptionsCorrectly() throws Exception {
 
         GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
                 () -> client.connect(), new GenericObjectPoolConfig());
@@ -178,7 +180,7 @@ public void genericPoolUsingWrappingShouldPropagateExceptionsCorrectly() throws
     }
 
     @Test
-    public void wrappedConnectionShouldUseWrappers() throws Exception {
+    void wrappedConnectionShouldUseWrappers() throws Exception {
 
         GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
                 () -> client.connect(), new GenericObjectPoolConfig());
@@ -202,7 +204,7 @@ public void wrappedConnectionShouldUseWrappers() throws Exception {
     }
 
     @Test
-    public void wrappedMasterSlaveConnectionShouldUseWrappers() throws Exception {
+    void wrappedMasterSlaveConnectionShouldUseWrappers() throws Exception {
 
         GenericObjectPool<StatefulRedisMasterSlaveConnection<String, String>> pool = ConnectionPoolSupport
                 .createGenericObjectPool(() -> MasterSlave.connect(client, new StringCodec(), RedisURI.create(host, port)),
@@ -226,7 +228,7 @@ public void wrappedMasterSlaveConnectionShouldUseWrappers() throws Exception {
     }
 
     @Test
-    public void wrappedClusterConnectionShouldUseWrappers() throws Exception {
+    void wrappedClusterConnectionShouldUseWrappers() throws Exception {
 
         RedisClusterClient redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.create(TestSettings.host(), 7379));
@@ -256,7 +258,7 @@ public void wrappedClusterConnectionShouldUseWrappers() throws Exception {
     }
 
     @Test
-    public void plainConnectionShouldNotUseWrappers() throws Exception {
+    void plainConnectionShouldNotUseWrappers() throws Exception {
 
         GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
                 () -> client.connect(), new GenericObjectPoolConfig(), false);
@@ -280,7 +282,7 @@ public void plainConnectionShouldNotUseWrappers() throws Exception {
     }
 
     @Test
-    public void softRefPoolShouldWorkWithWrappedConnections() throws Exception {
+    void softRefPoolShouldWorkWithWrappedConnections() throws Exception {
 
         SoftReferenceObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
                 .createSoftReferenceObjectPool(() -> client.connect());
@@ -301,7 +303,7 @@ public void softRefPoolShouldWorkWithWrappedConnections() throws Exception {
     }
 
     @Test
-    public void wrappedObjectClosedAfterReturn() throws Exception {
+    void wrappedObjectClosedAfterReturn() throws Exception {
 
         GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
                 () -> client.connect(), new GenericObjectPoolConfig(), true);
@@ -323,7 +325,7 @@ public void wrappedObjectClosedAfterReturn() throws Exception {
     }
 
     @Test
-    public void tryWithResourcesReturnsConnectionToPool() throws Exception {
+    void tryWithResourcesReturnsConnectionToPool() throws Exception {
 
         GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
                 () -> client.connect(), new GenericObjectPoolConfig());
@@ -348,7 +350,7 @@ public void tryWithResourcesReturnsConnectionToPool() throws Exception {
     }
 
     @Test
-    public void tryWithResourcesReturnsSoftRefConnectionToPool() throws Exception {
+    void tryWithResourcesReturnsSoftRefConnectionToPool() throws Exception {
 
         SoftReferenceObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport
                 .createSoftReferenceObjectPool(() -> client.connect());
diff --git a/src/test/java/io/lettuce/core/support/PersonDB.java b/src/test/java/io/lettuce/core/support/PersonDB.java
index 83da5fb39e..37b8bb3a27 100644
--- a/src/test/java/io/lettuce/core/support/PersonDB.java
+++ b/src/test/java/io/lettuce/core/support/PersonDB.java
@@ -26,6 +26,6 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Qualifier
-public @interface PersonDB {
+@interface PersonDB {
 
 }
diff --git a/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java b/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanUnitTests.java
similarity index 84%
rename from src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java
rename to src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanUnitTests.java
index 164435da9a..056f2c4c27 100644
--- a/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanTest.java
+++ b/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanUnitTests.java
@@ -16,38 +16,39 @@
 package io.lettuce.core.support;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.net.URI;
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisURI;
 
 /**
  * @author Mark Paluch
  */
-public class RedisClusterClientFactoryBeanTest {
+class RedisClusterClientFactoryBeanUnitTests {
 
     private RedisClusterClientFactoryBean sut = new RedisClusterClientFactoryBean();
 
-    @Test(expected = IllegalArgumentException.class)
-    public void invalidUri() throws Exception {
+    @Test
+    void invalidUri() {
 
         sut.setUri(URI.create("http://www.web.de"));
-        sut.afterPropertiesSet();
+        assertThatThrownBy(() -> sut.afterPropertiesSet()).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void sentinelUri() throws Exception {
+    @Test
+    void sentinelUri() {
 
         sut.setUri(URI.create(RedisURI.URI_SCHEME_REDIS_SENTINEL + "://www.web.de"));
-        sut.afterPropertiesSet();
+        assertThatThrownBy(() -> sut.afterPropertiesSet()).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void validUri() throws Exception {
+    void validUri() throws Exception {
 
         sut.setUri(URI.create(RedisURI.URI_SCHEME_REDIS + "://password@host"));
         sut.afterPropertiesSet();
@@ -58,7 +59,7 @@ public void validUri() throws Exception {
     }
 
     @Test
-    public void validUriPasswordOverride() throws Exception {
+    void validUriPasswordOverride() throws Exception {
 
         sut.setUri(URI.create(RedisURI.URI_SCHEME_REDIS + "://password@host"));
         sut.setPassword("thepassword");
@@ -71,7 +72,7 @@ public void validUriPasswordOverride() throws Exception {
     }
 
     @Test
-    public void multiNodeUri() throws Exception {
+    void multiNodeUri() throws Exception {
 
         sut.setUri(URI.create(RedisURI.URI_SCHEME_REDIS + "://password@host1,host2"));
         sut.afterPropertiesSet();
@@ -93,7 +94,7 @@ public void multiNodeUri() throws Exception {
     }
 
     @Test
-    public void multiNodeUriPasswordOverride() throws Exception {
+    void multiNodeUriPasswordOverride() throws Exception {
 
         sut.setUri(URI.create(RedisURI.URI_SCHEME_REDIS + "://password@host1,host2"));
         sut.setPassword("thepassword");
@@ -117,7 +118,7 @@ public void multiNodeUriPasswordOverride() throws Exception {
     }
 
     @Test
-    public void supportsSsl() throws Exception {
+    void supportsSsl() throws Exception {
 
         sut.setUri(URI.create(RedisURI.URI_SCHEME_REDIS_SECURE + "://password@host"));
         sut.afterPropertiesSet();
diff --git a/src/test/java/io/lettuce/core/support/SpringTest.java b/src/test/java/io/lettuce/core/support/SpringIntegrationTests.java
similarity index 90%
rename from src/test/java/io/lettuce/core/support/SpringTest.java
rename to src/test/java/io/lettuce/core/support/SpringIntegrationTests.java
index 3c27bdc545..bc50a75578 100644
--- a/src/test/java/io/lettuce/core/support/SpringTest.java
+++ b/src/test/java/io/lettuce/core/support/SpringIntegrationTests.java
@@ -22,7 +22,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.cluster.RedisClusterClient;
@@ -31,9 +31,9 @@
  * @author Mark Paluch
  * @since 3.0
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
-public class SpringTest {
+public class SpringIntegrationTests {
 
     @Autowired
     @Qualifier("RedisClient1")
@@ -56,7 +56,7 @@ public class SpringTest {
     private RedisClusterClient redisClusterClient2;
 
     @Test
-    public void testSpring() throws Exception {
+    public void testSpring() {
 
         assertThat(redisClient1).isNotNull();
         assertThat(redisClient2).isNotNull();
diff --git a/src/test/java/io/lettuce/core/tracing/BraveTracingTest.java b/src/test/java/io/lettuce/core/tracing/BraveTracingTest.java
index 6319015fbe..06c29a90d8 100644
--- a/src/test/java/io/lettuce/core/tracing/BraveTracingTest.java
+++ b/src/test/java/io/lettuce/core/tracing/BraveTracingTest.java
@@ -23,10 +23,10 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import reactor.test.StepVerifier;
 import zipkin2.Span;
@@ -35,27 +35,27 @@
 import brave.Tracing;
 import brave.propagation.CurrentTraceContext;
 import brave.propagation.TraceContext;
-import io.lettuce.Wait;
-import io.lettuce.core.AbstractTest;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
+import io.lettuce.test.Wait;
 import io.netty.channel.unix.DomainSocketAddress;
 
 /**
  * @author Mark Paluch
  */
-public class BraveTracingTest extends AbstractTest {
+class BraveTracingTest extends TestSupport {
 
     private static ClientResources clientResources;
     private static RedisClient client;
     private static Tracing clientTracing;
     private static Queue<Span> spans = new LinkedBlockingQueue<>();
 
-    @BeforeClass
-    public static void beforeClass() {
+    @BeforeAll
+    static void beforeClass() {
 
         clientTracing = Tracing.newBuilder().localServiceName("client")
                 .currentTraceContext(CurrentTraceContext.Default.create()).spanReporter(spans::add).build();
@@ -64,8 +64,8 @@ public static void beforeClass() {
         client = RedisClient.create(clientResources, RedisURI.Builder.redis(host, port).build());
     }
 
-    @Before
-    public void before() {
+    @BeforeEach
+    void before() {
 
         Tracer tracer = clientTracing.tracer();
         if (tracer.currentSpan() != null) {
@@ -75,15 +75,15 @@ public void before() {
         spans.clear();
     }
 
-    @AfterClass
-    public static void afterClass() {
+    @AfterAll
+    static void afterClass() {
 
         clientTracing.close();
         clientResources.shutdown(0, 0, TimeUnit.MILLISECONDS);
     }
 
     @Test
-    public void pingWithTrace() {
+    void pingWithTrace() {
 
         ScopedSpan foo = clientTracing.tracer().startScopedSpan("foo");
 
@@ -100,7 +100,7 @@ public void pingWithTrace() {
     }
 
     @Test
-    public void pingWithTraceShouldCatchErrors() {
+    void pingWithTraceShouldCatchErrors() {
 
         ScopedSpan foo = clientTracing.tracer().startScopedSpan("foo");
 
@@ -125,7 +125,7 @@ public void pingWithTraceShouldCatchErrors() {
     }
 
     @Test
-    public void reactivePing() {
+    void reactivePing() {
 
         StatefulRedisConnection<String, String> connect = client.connect();
         connect.reactive().ping().as(StepVerifier::create).expectNext("PONG").verifyComplete();
@@ -135,7 +135,7 @@ public void reactivePing() {
     }
 
     @Test
-    public void reactivePingWithTrace() {
+    void reactivePingWithTrace() {
 
         ScopedSpan trace = clientTracing.tracer().startScopedSpan("foo");
 
@@ -156,7 +156,7 @@ public void reactivePingWithTrace() {
     }
 
     @Test
-    public void reactiveGetAndSetWithTrace() {
+    void reactiveGetAndSetWithTrace() {
 
         ScopedSpan trace = clientTracing.tracer().startScopedSpan("foo");
 
@@ -179,7 +179,7 @@ public void reactiveGetAndSetWithTrace() {
     }
 
     @Test
-    public void reactiveGetAndSetWithTraceProvider() {
+    void reactiveGetAndSetWithTraceProvider() {
 
         brave.Span trace = clientTracing.tracer().newTrace();
 
@@ -204,7 +204,7 @@ public void reactiveGetAndSetWithTraceProvider() {
     }
 
     @Test
-    public void shouldReportSimpleServiceName() {
+    void shouldReportSimpleServiceName() {
 
         BraveTracing.BraveEndpoint endpoint = (BraveTracing.BraveEndpoint) clientResources.tracing().createEndpoint(
                 new DomainSocketAddress("foo"));
diff --git a/src/test/java/io/lettuce/examples/SpringExample.java b/src/test/java/io/lettuce/examples/SpringExample.java
index 63009fa9e1..70b3641fb1 100644
--- a/src/test/java/io/lettuce/examples/SpringExample.java
+++ b/src/test/java/io/lettuce/examples/SpringExample.java
@@ -44,5 +44,4 @@ public static void main(String[] args) {
 
         context.close();
     }
-
 }
diff --git a/src/test/java/io/lettuce/CanConnect.java b/src/test/java/io/lettuce/test/CanConnect.java
similarity index 92%
rename from src/test/java/io/lettuce/CanConnect.java
rename to src/test/java/io/lettuce/test/CanConnect.java
index ded1a28093..190ed751f8 100644
--- a/src/test/java/io/lettuce/CanConnect.java
+++ b/src/test/java/io/lettuce/test/CanConnect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce;
+package io.lettuce.test;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -44,7 +44,7 @@ public static boolean to(String host, int port) {
      * @param socketAddress
      * @return
      */
-    public static boolean to(SocketAddress socketAddress) {
+    private static boolean to(SocketAddress socketAddress) {
 
         try {
             Socket socket = new Socket();
diff --git a/src/test/java/io/lettuce/util/ConnectionDecoratingInvocationHandler.java b/src/test/java/io/lettuce/test/ConnectionDecoratingInvocationHandler.java
similarity index 91%
rename from src/test/java/io/lettuce/util/ConnectionDecoratingInvocationHandler.java
rename to src/test/java/io/lettuce/test/ConnectionDecoratingInvocationHandler.java
index 7dcc6271ee..69744707f5 100644
--- a/src/test/java/io/lettuce/util/ConnectionDecoratingInvocationHandler.java
+++ b/src/test/java/io/lettuce/test/ConnectionDecoratingInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.util;
+package io.lettuce.test;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
@@ -27,11 +27,11 @@
 /**
  * @author Mark Paluch
  */
-public class ConnectionDecoratingInvocationHandler extends AbstractInvocationHandler {
+class ConnectionDecoratingInvocationHandler extends AbstractInvocationHandler {
 
     private final Object target;
 
-    public ConnectionDecoratingInvocationHandler(Object target) {
+    ConnectionDecoratingInvocationHandler(Object target) {
         this.target = target;
     }
 
diff --git a/src/test/java/io/lettuce/ConnectionTestUtil.java b/src/test/java/io/lettuce/test/ConnectionTestUtil.java
similarity index 94%
rename from src/test/java/io/lettuce/ConnectionTestUtil.java
rename to src/test/java/io/lettuce/test/ConnectionTestUtil.java
index 1e593e1b70..9b0fc25a7c 100644
--- a/src/test/java/io/lettuce/ConnectionTestUtil.java
+++ b/src/test/java/io/lettuce/test/ConnectionTestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,18 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce;
+package io.lettuce.test;
 
+import java.lang.reflect.UndeclaredThrowableException;
 import java.util.Queue;
 
 import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.RedisChannelHandler;
 import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.RedisClient;
 import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.protocol.CommandHandler;
 import io.lettuce.core.protocol.ConnectionWatchdog;
 import io.lettuce.core.protocol.DefaultEndpoint;
+import io.lettuce.test.settings.TestSettings;
 import io.netty.channel.Channel;
 
 /**
diff --git a/src/test/java/io/lettuce/Delay.java b/src/test/java/io/lettuce/test/Delay.java
similarity index 92%
rename from src/test/java/io/lettuce/Delay.java
rename to src/test/java/io/lettuce/test/Delay.java
index ab7c445608..335aa342cf 100644
--- a/src/test/java/io/lettuce/Delay.java
+++ b/src/test/java/io/lettuce/test/Delay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce;
+package io.lettuce.test;
 
 import java.time.Duration;
 
diff --git a/src/test/java/io/lettuce/test/Futures.java b/src/test/java/io/lettuce/test/Futures.java
new file mode 100644
index 0000000000..364808b482
--- /dev/null
+++ b/src/test/java/io/lettuce/test/Futures.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.test;
+
+import java.lang.reflect.UndeclaredThrowableException;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.Future;
+
+import io.lettuce.core.LettuceFutures;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.cluster.api.async.AsyncExecutions;
+
+/**
+ * Utility methods to synchronize and create futures.
+ *
+ * @author Mark Paluch
+ */
+public class Futures {
+
+    private static final Duration TIMEOUT = Duration.ofSeconds(5);
+
+    /**
+     * Check if all {@code futures} are {@link Future#isDone() completed}.
+     *
+     * @param futures
+     * @return {@literal true} if all {@code futures} are {@link Future#isDone() completed}
+     */
+    public static boolean areAllCompleted(Collection<? extends Future<?>> futures) {
+
+        for (Future<?> future : futures) {
+            if (!future.isDone()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Await completion for all {@link Future} guarded by the global {@link #TIMEOUT}.
+     */
+    public static boolean await(Future<?> future) {
+
+        if (!LettuceFutures.awaitAll(TIMEOUT, future)) {
+            throw new IllegalStateException("Future timeout");
+        }
+
+        return true;
+    }
+
+    /**
+     * Await completion for all {@link AsyncExecutions}s guarded by the global {@link #TIMEOUT}.
+     *
+     * @param executions
+     */
+    public static boolean await(AsyncExecutions<?> executions) {
+        return awaitAll(Arrays.asList(executions.futures()));
+    }
+
+    /**
+     * Await completion for all {@link Future}s guarded by the global {@link #TIMEOUT}.
+     *
+     * @param futures
+     */
+    public static boolean awaitAll(Collection<? extends Future<?>> futures) {
+
+        if (!LettuceFutures.awaitAll(TIMEOUT, futures.toArray(new Future[0]))) {
+            throw new IllegalStateException("Future timeout");
+        }
+
+        return true;
+    }
+
+    /**
+     * Retrieve the value from the {@link Future} guarded by the global {@link #TIMEOUT}.
+     *
+     * @param future
+     * @param <T>
+     */
+    public static <T> T get(Future<T> future) {
+
+        if (!LettuceFutures.awaitAll(TIMEOUT, future)) {
+            throw new IllegalStateException("Future timeout");
+        }
+
+        try {
+            return future.get();
+        } catch (Exception e) {
+            throw new UndeclaredThrowableException(e);
+        }
+    }
+
+    /**
+     * Retrieve the value from the {@link CompletableFuture} guarded by the global {@link #TIMEOUT}.
+     *
+     * @param future
+     * @param <T>
+     */
+    public static <T> T get(CompletableFuture<T> future) {
+        return get((Future<T>) future);
+    }
+
+    /**
+     * Retrieve the value from the {@link CompletionStage} guarded by the global {@link #TIMEOUT}.
+     *
+     * @param completionStage
+     * @param <T>
+     */
+    public static <T> T get(CompletionStage<T> completionStage) {
+        return get(completionStage.toCompletableFuture());
+    }
+
+    /**
+     * Retrieve the value from the {@link RedisFuture} guarded by the global {@link #TIMEOUT}.
+     *
+     * @param future
+     * @param <T>
+     */
+    public static <T> T get(RedisFuture<T> future) {
+        return get(future.toCompletableFuture());
+    }
+
+}
diff --git a/src/test/java/io/lettuce/core/KeyValueStreamingAdapter.java b/src/test/java/io/lettuce/test/KeyValueStreamingAdapter.java
similarity index 93%
rename from src/test/java/io/lettuce/core/KeyValueStreamingAdapter.java
rename to src/test/java/io/lettuce/test/KeyValueStreamingAdapter.java
index f0f73eb011..629c20d937 100644
--- a/src/test/java/io/lettuce/core/KeyValueStreamingAdapter.java
+++ b/src/test/java/io/lettuce/test/KeyValueStreamingAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core;
+package io.lettuce.test;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/test/java/io/lettuce/KeysAndValues.java b/src/test/java/io/lettuce/test/KeysAndValues.java
similarity index 95%
rename from src/test/java/io/lettuce/KeysAndValues.java
rename to src/test/java/io/lettuce/test/KeysAndValues.java
index e9f80aac6d..08408dd00b 100644
--- a/src/test/java/io/lettuce/KeysAndValues.java
+++ b/src/test/java/io/lettuce/test/KeysAndValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce;
+package io.lettuce.test;
 
 import java.util.*;
 
diff --git a/src/test/java/io/lettuce/test/LettuceExtension.java b/src/test/java/io/lettuce/test/LettuceExtension.java
new file mode 100644
index 0000000000..16eee62894
--- /dev/null
+++ b/src/test/java/io/lettuce/test/LettuceExtension.java
@@ -0,0 +1,325 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.test;
+
+import java.io.Closeable;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Parameter;
+import java.lang.reflect.Type;
+import java.time.Duration;
+import java.util.*;
+import java.util.function.Supplier;
+
+import javax.enterprise.inject.New;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.extension.*;
+
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.dynamic.support.ResolvableType;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.test.resource.DefaultRedisClient;
+import io.lettuce.test.resource.DefaultRedisClusterClient;
+import io.lettuce.test.resource.TestClientResources;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+/**
+ * JUnit 5 {@link Extension} providing parameter resolution for connection resources and that reacts to callbacks.
+ *
+ * The following resource types are supported by this extension:
+ * <ul>
+ * <li>{@link ClientResources} (singleton)</li>
+ * <li>{@link RedisClient} (singleton)</li>
+ * <li>{@link RedisClusterClient} (singleton)</li>
+ * <li>{@link StatefulRedisConnection} (singleton and dedicated instances via {@code @New})</li>
+ * <li>{@link StatefulRedisPubSubConnection} (singleton and dedicated instances via {@code @New})</li>
+ * <li>{@link StatefulRedisClusterConnection} (singleton and dedicated instances via {@code @New})</li>
+ * </ul>
+ *
+ * Tests that want to use this extension need to annotate injection points with {@code @Inject}:
+ *
+ * <pre class="code">
+ * &#064;ExtendWith(LettuceExtension.class)
+ * public class CustomCommandTest {
+ *
+ *     private final RedisCommands&lt;String, String&gt; redis;
+ *
+ *     &#064;Inject
+ *     public CustomCommandTest(StatefulRedisConnection&lt;String, String&gt; connection) {
+ *         this.redis = connection.sync();
+ *     }
+ * }
+ * </pre>
+ *
+ * <h3>Resource lifecycle</h3>
+ *
+ * This extension allocates resources lazily and stores them in its {@link ExtensionContext}
+ * {@link org.junit.jupiter.api.extension.ExtensionContext.Store} for resuse across multiple tests. Client and
+ * {@link ClientResources} are allocated through{@link DefaultRedisClient} respective {@link TestClientResources} so shutdown is
+ * managed by the actual suppliers. Singleton connection resources are closed after the test class (test container) is finished.
+ * Newable connection resources are closed after the actual test is finished.
+ *
+ * <h3>Newable resources</h3> Some tests require a dedicated connection. These can be obtained by annotating the parameter with
+ * {@code @New}.
+ *
+ * @author Mark Paluch
+ * @since 5.1.1
+ * @see ParameterResolver
+ * @see Inject
+ * @see New
+ * @see BeforeEachCallback
+ * @see AfterEachCallback
+ * @see AfterAllCallback
+ */
+public class LettuceExtension implements ParameterResolver, BeforeEachCallback, AfterAllCallback, AfterEachCallback {
+
+    private final static InternalLogger LOGGER = InternalLoggerFactory.getInstance(LettuceExtension.class);
+
+    private final ExtensionContext.Namespace LETTUCE = ExtensionContext.Namespace.create("lettuce.parameters");
+
+    private final static Set<Class<?>> SUPPORTED_INJECTABLE_TYPES = new HashSet<>(Arrays.asList(StatefulRedisConnection.class,
+            StatefulRedisPubSubConnection.class, RedisClient.class, ClientResources.class,
+            StatefulRedisClusterConnection.class, RedisClusterClient.class));
+
+    private final static Set<Class<?>> CLOSE_AFTER_EACH = new HashSet<>(Arrays.asList(StatefulRedisConnection.class,
+            StatefulRedisPubSubConnection.class, StatefulRedisClusterConnection.class));
+
+    private final static List<Supplier<?>> SUPPLIERS = Arrays.asList(ClientResourcesSupplier.INSTANCE,
+            RedisClusterClientSupplier.INSTANCE, RedisClientSupplier.INSTANCE, StatefulRedisConnectionSupplier.INSTANCE,
+            StatefulRedisPubSubConnectionSupplier.INSTANCE, StatefulRedisClusterConnectionSupplier.INSTANCE);
+
+    @Override
+    public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
+            throws ParameterResolutionException {
+
+        if (SUPPORTED_INJECTABLE_TYPES.contains(parameterContext.getParameter().getType())) {
+
+            if (parameterContext.isAnnotated(Inject.class)
+                    || parameterContext.getDeclaringExecutable().isAnnotationPresent(Inject.class)) {
+                return true;
+            }
+
+            LOGGER.warn("Parameter type " + parameterContext.getParameter().getType()
+                    + " supported but injection target is not annotated with @Inject");
+        }
+
+        return false;
+    }
+
+    @Override
+    public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
+            throws ParameterResolutionException {
+
+        ExtensionContext.Store store = getStore(extensionContext);
+
+        Parameter parameter = parameterContext.getParameter();
+
+        if (parameterContext.isAnnotated(New.class)) {
+
+            Object instance = findSupplier(parameter.getParameterizedType()).get();
+
+            if (instance instanceof Closeable || instance instanceof AutoCloseable) {
+
+                CloseAfterTest closeables = store.getOrComputeIfAbsent(CloseAfterTest.class, it -> new CloseAfterTest(),
+                        CloseAfterTest.class);
+
+                closeables.add(closeables);
+            }
+
+            return instance;
+        }
+
+        return store.getOrComputeIfAbsent(parameter.getType(), it -> findSupplier(parameter.getParameterizedType()).get());
+    }
+
+    /**
+     * Attempt to resolve the {@code requestedResourceType}.
+     *
+     * @param extensionContext
+     * @param requestedResourceType
+     * @param <T>
+     * @return
+     */
+    public <T> T resolve(ExtensionContext extensionContext, Class<T> requestedResourceType) {
+
+        ExtensionContext.Store store = getStore(extensionContext);
+
+        return (T) store.getOrComputeIfAbsent(requestedResourceType, it -> findSupplier(requestedResourceType).get());
+    }
+
+    private ExtensionContext.Store getStore(ExtensionContext extensionContext) {
+        return extensionContext.getStore(LETTUCE);
+    }
+
+    @Override
+    public void afterAll(ExtensionContext context) {
+
+        ExtensionContext.Store store = getStore(context);
+
+        CLOSE_AFTER_EACH.forEach(it -> {
+
+            StatefulConnection connection = store.get(it, StatefulConnection.class);
+
+            if (connection != null) {
+                connection.close();
+                store.remove(StatefulRedisConnection.class);
+            }
+        });
+    }
+
+    @Override
+    public void beforeEach(ExtensionContext context) {
+
+        ExtensionContext.Store store = getStore(context);
+        StatefulRedisConnection connection = store.get(StatefulRedisConnection.class, StatefulRedisConnection.class);
+        StatefulRedisPubSubConnection pubsub = store.get(StatefulRedisPubSubConnection.class,
+                StatefulRedisPubSubConnection.class);
+
+        if (connection != null || pubsub != null) {
+            if (connection != null) {
+                connection.sync().flushall();
+            } else if (pubsub != null) {
+                pubsub.sync().flushall();
+            }
+        }
+    }
+
+    @Override
+    public void afterEach(ExtensionContext context) {
+
+        DefaultRedisClient.get().setOptions(ClientOptions.builder().build());
+        DefaultRedisClient.get().setDefaultTimeout(Duration.ofSeconds(60));
+
+        ExtensionContext.Store store = getStore(context);
+        CloseAfterTest closeables = store.get(CloseAfterTest.class, CloseAfterTest.class);
+
+        if (closeables != null) {
+
+            List<Object> copy = new ArrayList<>(closeables);
+
+            closeables.clear();
+
+            copy.forEach(it -> {
+                try {
+                    if (it instanceof Closeable) {
+                        ((Closeable) it).close();
+                    } else if (it instanceof AutoCloseable) {
+                        ((AutoCloseable) it).close();
+                    }
+                } catch (Exception e) {
+                    throw new IllegalStateException(e);
+                }
+            });
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Supplier<Object> findSupplier(Type type) {
+
+        ResolvableType requested = ResolvableType.forType(type);
+
+        Supplier<?> supplier = SUPPLIERS.stream().filter(it -> {
+
+            ResolvableType providedType = ResolvableType.forType(it.getClass()).as(Supplier.class).getGeneric(0);
+
+            if (requested.isAssignableFrom(providedType)) {
+                return true;
+            }
+            return false;
+        }).findFirst().orElseThrow(() -> new NoSuchElementException("Cannot find a factory for " + type));
+
+        return (Supplier) supplier;
+    }
+
+    @Target(ElementType.PARAMETER)
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface Connection {
+        boolean requiresNew() default false;
+    }
+
+    static class CloseAfterTest extends ArrayList<Object> {
+    }
+
+    enum ClientResourcesSupplier implements Supplier<ClientResources> {
+
+        INSTANCE;
+
+        @Override
+        public ClientResources get() {
+            return TestClientResources.get();
+        }
+    }
+
+    enum RedisClientSupplier implements Supplier<RedisClient> {
+
+        INSTANCE;
+
+        @Override
+        public RedisClient get() {
+            return DefaultRedisClient.get();
+        }
+    }
+
+    enum RedisClusterClientSupplier implements Supplier<RedisClusterClient> {
+
+        INSTANCE;
+
+        @Override
+        public RedisClusterClient get() {
+            return DefaultRedisClusterClient.get();
+        }
+    }
+
+    enum StatefulRedisConnectionSupplier implements Supplier<StatefulRedisConnection<String, String>> {
+
+        INSTANCE;
+
+        @Override
+        public StatefulRedisConnection<String, String> get() {
+            return RedisClientSupplier.INSTANCE.get().connect();
+        }
+    }
+
+    enum StatefulRedisPubSubConnectionSupplier implements Supplier<StatefulRedisPubSubConnection<String, String>> {
+
+        INSTANCE;
+
+        @Override
+        public StatefulRedisPubSubConnection<String, String> get() {
+            return RedisClientSupplier.INSTANCE.get().connectPubSub();
+        }
+    }
+
+    enum StatefulRedisClusterConnectionSupplier implements Supplier<StatefulRedisClusterConnection<String, String>> {
+
+        INSTANCE;
+
+        @Override
+        public StatefulRedisClusterConnection<String, String> get() {
+            return RedisClusterClientSupplier.INSTANCE.get().connect();
+        }
+    }
+}
diff --git a/src/test/java/io/lettuce/core/ListStreamingAdapter.java b/src/test/java/io/lettuce/test/ListStreamingAdapter.java
similarity index 93%
rename from src/test/java/io/lettuce/core/ListStreamingAdapter.java
rename to src/test/java/io/lettuce/test/ListStreamingAdapter.java
index 388cb3606c..a5b0b90d10 100644
--- a/src/test/java/io/lettuce/core/ListStreamingAdapter.java
+++ b/src/test/java/io/lettuce/test/ListStreamingAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core;
+package io.lettuce.test;
 
 import java.util.List;
 import java.util.Vector;
 
+import io.lettuce.core.ScoredValue;
 import io.lettuce.core.output.KeyStreamingChannel;
 import io.lettuce.core.output.ScoredValueStreamingChannel;
 import io.lettuce.core.output.ValueStreamingChannel;
diff --git a/src/test/java/io/lettuce/util/ReactiveSyncInvocationHandler.java b/src/test/java/io/lettuce/test/ReactiveSyncInvocationHandler.java
similarity index 96%
rename from src/test/java/io/lettuce/util/ReactiveSyncInvocationHandler.java
rename to src/test/java/io/lettuce/test/ReactiveSyncInvocationHandler.java
index abe1d07287..a506836244 100644
--- a/src/test/java/io/lettuce/util/ReactiveSyncInvocationHandler.java
+++ b/src/test/java/io/lettuce/test/ReactiveSyncInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.util;
+package io.lettuce.test;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -41,7 +41,7 @@ public class ReactiveSyncInvocationHandler<K, V> extends ConnectionDecoratingInv
 
     private final StatefulConnection<?, ?> connection;
 
-    public ReactiveSyncInvocationHandler(StatefulConnection<?, ?> connection, Object rxApi) {
+    private ReactiveSyncInvocationHandler(StatefulConnection<?, ?> connection, Object rxApi) {
         super(rxApi);
         this.connection = connection;
     }
diff --git a/src/test/java/io/lettuce/util/RoutingInvocationHandler.java b/src/test/java/io/lettuce/test/RoutingInvocationHandler.java
similarity index 94%
rename from src/test/java/io/lettuce/util/RoutingInvocationHandler.java
rename to src/test/java/io/lettuce/test/RoutingInvocationHandler.java
index e787f6998d..5f7209f5de 100644
--- a/src/test/java/io/lettuce/util/RoutingInvocationHandler.java
+++ b/src/test/java/io/lettuce/test/RoutingInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.util;
+package io.lettuce.test;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
diff --git a/src/test/java/io/lettuce/Sockets.java b/src/test/java/io/lettuce/test/Sockets.java
similarity index 93%
rename from src/test/java/io/lettuce/Sockets.java
rename to src/test/java/io/lettuce/test/Sockets.java
index fb04851d7d..e2d7450e1d 100644
--- a/src/test/java/io/lettuce/Sockets.java
+++ b/src/test/java/io/lettuce/test/Sockets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce;
+package io.lettuce.test;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/src/test/java/io/lettuce/Wait.java b/src/test/java/io/lettuce/test/Wait.java
similarity index 98%
rename from src/test/java/io/lettuce/Wait.java
rename to src/test/java/io/lettuce/test/Wait.java
index de8aa8ff9f..b1fe192525 100644
--- a/src/test/java/io/lettuce/Wait.java
+++ b/src/test/java/io/lettuce/test/Wait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce;
+package io.lettuce.test;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
@@ -157,7 +157,7 @@ public static <T> WaitBuilder<T> untilEquals(T expectation, Supplier<T> actualSu
     }
 
     @FunctionalInterface
-    public interface WaitCondition {
+    interface WaitCondition {
 
         boolean isSatisfied() throws Exception;
     }
@@ -165,7 +165,7 @@ public interface WaitCondition {
     @FunctionalInterface
     public interface VoidWaitCondition {
 
-        void test() throws Exception;
+        void test();
     }
 
     @FunctionalInterface
diff --git a/src/test/java/io/lettuce/test/WithPassword.java b/src/test/java/io/lettuce/test/WithPassword.java
new file mode 100644
index 0000000000..411380cf45
--- /dev/null
+++ b/src/test/java/io/lettuce/test/WithPassword.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.test;
+
+import java.lang.reflect.UndeclaredThrowableException;
+
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.settings.TestSettings;
+
+/**
+ * Utility to run a {@link ThrowingCallable callback function} while Redis is configured with a password.
+ *
+ * @author Mark Paluch
+ */
+public class WithPassword {
+
+    /**
+     * Run a {@link ThrowingCallable callback function} while Redis is configured with a password.
+     *
+     * @param client
+     * @param callable
+     */
+    public static void run(RedisClient client, ThrowingCallable callable) {
+
+        StatefulRedisConnection<String, String> connection = client.connect();
+        RedisCommands<String, String> commands = connection.sync();
+        try {
+            commands.configSet("requirepass", TestSettings.password());
+            commands.auth(TestSettings.password());
+
+            try {
+                callable.call();
+            } catch (RuntimeException e) {
+                throw e;
+            } catch (Throwable e) {
+                throw new UndeclaredThrowableException(e);
+            }
+        } finally {
+
+            commands.configSet("requirepass", "");
+            connection.close();
+        }
+    }
+
+    public interface ThrowingCallable {
+        void call() throws Throwable;
+    }
+}
diff --git a/src/test/java/io/lettuce/test/condition/EnabledOnCommand.java b/src/test/java/io/lettuce/test/condition/EnabledOnCommand.java
new file mode 100644
index 0000000000..888b4f96ab
--- /dev/null
+++ b/src/test/java/io/lettuce/test/condition/EnabledOnCommand.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.test.condition;
+
+import java.lang.annotation.*;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+/**
+ * {@code @EnabledOnCommand} is used to signal that the annotated test class or test method is only <em>enabled</em>if the
+ * specified command is available.
+ *
+ * <p/>
+ * When applied at the class level, all test methods within that class will be enabled .
+ */
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@ExtendWith(EnabledOnCommandCondition.class)
+public @interface EnabledOnCommand {
+
+    /**
+     * Name of the Redis command to be available.
+     *
+     * @return
+     */
+    String value();
+}
diff --git a/src/test/java/io/lettuce/test/condition/EnabledOnCommandCondition.java b/src/test/java/io/lettuce/test/condition/EnabledOnCommandCondition.java
new file mode 100644
index 0000000000..88744983c2
--- /dev/null
+++ b/src/test/java/io/lettuce/test/condition/EnabledOnCommandCondition.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.test.condition;
+
+import static org.junit.jupiter.api.extension.ConditionEvaluationResult.disabled;
+import static org.junit.jupiter.api.extension.ConditionEvaluationResult.enabled;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.platform.commons.util.AnnotationUtils;
+
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.core.api.StatefulRedisConnection;
+
+/**
+ * {@link ExecutionCondition} for {@link EnabledOnCommandCondition @EnabledOnCommand}.
+ *
+ * @see EnabledOnCommandCondition
+ */
+class EnabledOnCommandCondition implements ExecutionCondition {
+
+    private static final ConditionEvaluationResult ENABLED_BY_DEFAULT = enabled("@EnabledOnCommand is not present");
+
+    @Override
+    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+
+        Optional<EnabledOnCommand> optional = AnnotationUtils.findAnnotation(context.getElement(), EnabledOnCommand.class);
+
+        if (optional.isPresent()) {
+
+            String command = optional.get().value();
+
+            StatefulRedisConnection connection = new LettuceExtension().resolve(context, StatefulRedisConnection.class);
+
+            RedisConditions conditions = RedisConditions.of(connection);
+            boolean hasCommand = conditions.hasCommand(command);
+            return hasCommand ? enabled("Enabled on command " + command) : disabled("Disabled, command " + command
+                    + " not available on Redis version " + conditions.getRedisVersion());
+        }
+
+        return ENABLED_BY_DEFAULT;
+    }
+}
diff --git a/src/test/java/io/lettuce/RedisConditions.java b/src/test/java/io/lettuce/test/condition/RedisConditions.java
similarity index 90%
rename from src/test/java/io/lettuce/RedisConditions.java
rename to src/test/java/io/lettuce/test/condition/RedisConditions.java
index 090f9afdb2..e5cad0ac59 100644
--- a/src/test/java/io/lettuce/RedisConditions.java
+++ b/src/test/java/io/lettuce/test/condition/RedisConditions.java
@@ -1,4 +1,19 @@
-package io.lettuce;
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.test.condition;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -74,10 +89,17 @@ public static RedisConditions of(StatefulRedisClusterConnection<String, String>
      * @param commands must not be {@literal null}.
      * @return
      */
-    public static RedisConditions of(RedisCommands<String, String> commands) {
+    public static RedisConditions of(RedisClusterCommands<String, String> commands) {
         return new RedisConditions(commands);
     }
 
+    /**
+     * @return the Redis {@link Version}.
+     */
+    public Version getRedisVersion() {
+        return version;
+    }
+
     /**
      * @param command
      * @return {@literal true} if the command is present.
@@ -120,7 +142,7 @@ public static class Version implements Comparable<Version> {
          *
          * @param parts must not be {@literal null} or empty.
          */
-        public Version(int... parts) {
+        Version(int... parts) {
 
             Assert.notNull(parts, "Parts must not be null!");
             Assert.isTrue(parts.length > 0 && parts.length < 5, String.format("Invalid parts length. 0 < %s < 5", parts.length));
@@ -142,7 +164,7 @@ public Version(int... parts) {
          * @param version must not be {@literal null} or empty.
          * @return
          */
-        public static Version parse(String version) {
+        static Version parse(String version) {
 
             Assert.hasText(version, "Version must not be null o empty!");
 
@@ -181,7 +203,7 @@ public boolean isGreaterThan(Version version) {
          * @param version
          * @return
          */
-        public boolean isGreaterThanOrEqualTo(Version version) {
+        boolean isGreaterThanOrEqualTo(Version version) {
             return compareTo(version) >= 0;
         }
 
diff --git a/src/test/java/io/lettuce/core/DefaultRedisClient.java b/src/test/java/io/lettuce/test/resource/DefaultRedisClient.java
similarity index 80%
rename from src/test/java/io/lettuce/core/DefaultRedisClient.java
rename to src/test/java/io/lettuce/test/resource/DefaultRedisClient.java
index 3102426051..b926c4ec96 100644
--- a/src/test/java/io/lettuce/core/DefaultRedisClient.java
+++ b/src/test/java/io/lettuce/test/resource/DefaultRedisClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,20 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core;
+package io.lettuce.test.resource;
 
 import java.util.concurrent.TimeUnit;
 
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.test.settings.TestSettings;
+
 /**
  * @author Mark Paluch
  */
 public class DefaultRedisClient {
 
-    public final static DefaultRedisClient instance = new DefaultRedisClient();
+    private final static DefaultRedisClient instance = new DefaultRedisClient();
 
     private RedisClient redisClient;
 
-    public DefaultRedisClient() {
+    private DefaultRedisClient() {
         redisClient = RedisClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port()).build());
         Runtime.getRuntime().addShutdownHook(new Thread() {
             @Override
diff --git a/src/test/java/io/lettuce/test/resource/DefaultRedisClusterClient.java b/src/test/java/io/lettuce/test/resource/DefaultRedisClusterClient.java
new file mode 100644
index 0000000000..20a23de222
--- /dev/null
+++ b/src/test/java/io/lettuce/test/resource/DefaultRedisClusterClient.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.test.resource;
+
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.ClusterClientOptions;
+import io.lettuce.core.cluster.RedisClusterClient;
+import io.lettuce.test.settings.TestSettings;
+
+/**
+ * @author Mark Paluch
+ */
+public class DefaultRedisClusterClient {
+
+    private final static DefaultRedisClusterClient instance = new DefaultRedisClusterClient();
+
+    private RedisClusterClient redisClient;
+
+    private DefaultRedisClusterClient() {
+        redisClient = RedisClusterClient.create(RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900))
+                .withClientName("my-client").build());
+        Runtime.getRuntime().addShutdownHook(new Thread() {
+            @Override
+            public void run() {
+                FastShutdown.shutdown(redisClient);
+            }
+        });
+    }
+
+    /**
+     * Do not close the client.
+     *
+     * @return the default redis client for the tests.
+     */
+    public static RedisClusterClient get() {
+        instance.redisClient.setOptions(ClusterClientOptions.create());
+        return instance.redisClient;
+    }
+}
diff --git a/src/test/java/io/lettuce/core/FastShutdown.java b/src/test/java/io/lettuce/test/resource/FastShutdown.java
similarity index 90%
rename from src/test/java/io/lettuce/core/FastShutdown.java
rename to src/test/java/io/lettuce/test/resource/FastShutdown.java
index 5215f0ad01..4302f13691 100644
--- a/src/test/java/io/lettuce/core/FastShutdown.java
+++ b/src/test/java/io/lettuce/test/resource/FastShutdown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core;
+package io.lettuce.test.resource;
 
 import java.util.concurrent.TimeUnit;
 
+import io.lettuce.core.AbstractRedisClient;
 import io.lettuce.core.resource.ClientResources;
 
 /**
diff --git a/src/test/java/io/lettuce/TestClientResources.java b/src/test/java/io/lettuce/test/resource/TestClientResources.java
similarity index 89%
rename from src/test/java/io/lettuce/TestClientResources.java
rename to src/test/java/io/lettuce/test/resource/TestClientResources.java
index bab1c71807..678a6816a6 100644
--- a/src/test/java/io/lettuce/TestClientResources.java
+++ b/src/test/java/io/lettuce/test/resource/TestClientResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce;
+package io.lettuce.test.resource;
 
 import java.util.concurrent.TimeUnit;
 
-import io.lettuce.core.TestEventLoopGroupProvider;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
 
 /**
- * Client-Resources suitable for testing. Uses {@link io.lettuce.core.TestEventLoopGroupProvider} to preserve the event loop
+ * Client-Resources suitable for testing. Uses {@link TestEventLoopGroupProvider} to preserve the event loop
  * groups between tests. Every time a new {@link TestClientResources} instance is created, shutdown hook is added
  * {@link Runtime#addShutdownHook(Thread)}.
  *
diff --git a/src/test/java/io/lettuce/core/TestEventLoopGroupProvider.java b/src/test/java/io/lettuce/test/resource/TestEventLoopGroupProvider.java
similarity index 87%
rename from src/test/java/io/lettuce/core/TestEventLoopGroupProvider.java
rename to src/test/java/io/lettuce/test/resource/TestEventLoopGroupProvider.java
index 8a51245839..86f4b43f1a 100644
--- a/src/test/java/io/lettuce/core/TestEventLoopGroupProvider.java
+++ b/src/test/java/io/lettuce/test/resource/TestEventLoopGroupProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core;
+package io.lettuce.test.resource;
 
 import java.util.concurrent.TimeUnit;
 
@@ -30,7 +30,7 @@
  *
  * @author Mark Paluch
  */
-public class TestEventLoopGroupProvider extends DefaultEventLoopGroupProvider {
+class TestEventLoopGroupProvider extends DefaultEventLoopGroupProvider {
 
     public TestEventLoopGroupProvider() {
         super(10);
@@ -48,7 +48,7 @@ public void run() {
 
     @Override
     public Promise<Boolean> release(EventExecutorGroup eventLoopGroup, long quietPeriod, long timeout, TimeUnit unit) {
-        DefaultPromise<Boolean> result = new DefaultPromise<Boolean>(ImmediateEventExecutor.INSTANCE);
+        DefaultPromise<Boolean> result = new DefaultPromise<>(ImmediateEventExecutor.INSTANCE);
         result.setSuccess(true);
 
         return result;
diff --git a/src/test/java/io/lettuce/core/TestSettings.java b/src/test/java/io/lettuce/test/settings/TestSettings.java
similarity index 97%
rename from src/test/java/io/lettuce/core/TestSettings.java
rename to src/test/java/io/lettuce/test/settings/TestSettings.java
index c55cb30230..bb83ef8bb5 100644
--- a/src/test/java/io/lettuce/core/TestSettings.java
+++ b/src/test/java/io/lettuce/test/settings/TestSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core;
+package io.lettuce.test.settings;
 
 import java.net.Inet4Address;
 import java.net.InetAddress;
diff --git a/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
index 89ba87a1bf..f1659f9b4c 100644
--- a/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
@@ -24,6 +24,7 @@
 import reactor.core.publisher.Mono;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * Benchmark for {@link RedisClient}.
@@ -127,7 +128,7 @@ public void reactiveSet() {
 
     @Benchmark
     @OperationsPerInvocation(BATCH_SIZE)
-    public void reactiveSetBatch() throws Exception {
+    public void reactiveSetBatch() {
 
         for (int i = 0; i < BATCH_SIZE; i++) {
             monos[i] = connection.reactive().set(KEY, KEY);
@@ -138,7 +139,7 @@ public void reactiveSetBatch() throws Exception {
 
     @Benchmark
     @OperationsPerInvocation(BATCH_SIZE)
-    public void reactiveSetBatchFlush() throws Exception {
+    public void reactiveSetBatchFlush() {
 
         connection.setAutoFlushCommands(false);
 
diff --git a/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java b/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java
index d24029d981..7076a8b6a7 100644
--- a/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java
+++ b/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java
@@ -28,7 +28,7 @@
 /**
  * @author Mark Paluch
  */
-public class EmptyRedisClusterClient extends RedisClusterClient {
+class EmptyRedisClusterClient extends RedisClusterClient {
 
     public EmptyRedisClusterClient(RedisURI initialUri) {
         super(null, Collections.singleton(initialUri));
diff --git a/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
index ae192daede..c63dcc515a 100644
--- a/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
@@ -21,9 +21,9 @@
 import reactor.core.publisher.Mono;
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * Benchmark for {@link RedisClusterClient}.
@@ -114,7 +114,7 @@ public void reactiveSet() {
 
     @Benchmark
     @OperationsPerInvocation(BATCH_SIZE)
-    public void reactiveSetBatch() throws Exception {
+    public void reactiveSetBatch() {
 
         for (int i = 0; i < BATCH_SIZE; i++) {
             monos[i] = connection.reactive().set(KEY, KEY);
@@ -125,7 +125,7 @@ public void reactiveSetBatch() throws Exception {
 
     @Benchmark
     @OperationsPerInvocation(BATCH_SIZE)
-    public void reactiveSetBatchFlush() throws Exception {
+    public void reactiveSetBatchFlush() {
 
         connection.setAutoFlushCommands(false);
 
diff --git a/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java
index 67c94f6dad..aea94f9a0f 100644
--- a/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java
@@ -32,10 +32,10 @@
 @State(Scope.Benchmark)
 public class RedisClusterNodeBenchmark {
 
-    final static List<Integer> ALL_SLOTS = IntStream.range(0, SlotHash.SLOT_COUNT).boxed().collect(Collectors.toList());
-    final static List<Integer> LOWER_SLOTS = IntStream.range(0, 8192).boxed().collect(Collectors.toList());
+    private final static List<Integer> ALL_SLOTS = IntStream.range(0, SlotHash.SLOT_COUNT).boxed().collect(Collectors.toList());
+    private final static List<Integer> LOWER_SLOTS = IntStream.range(0, 8192).boxed().collect(Collectors.toList());
 
-    final static RedisClusterNode NODE = new RedisClusterNode(null, null, true, null, 0, 0, 0, ALL_SLOTS,
+    private final static RedisClusterNode NODE = new RedisClusterNode(null, null, true, null, 0, 0, 0, ALL_SLOTS,
             Collections.emptySet());
 
     @Benchmark
diff --git a/src/test/jmh/io/lettuce/core/codec/JmhMain.java b/src/test/jmh/io/lettuce/core/codec/JmhMain.java
index 05c165d854..9e8e1ea808 100644
--- a/src/test/jmh/io/lettuce/core/codec/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/codec/JmhMain.java
@@ -15,7 +15,6 @@
  */
 package io.lettuce.core.codec;
 
-import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 import org.openjdk.jmh.annotations.Mode;
@@ -32,7 +31,7 @@
  */
 public class JmhMain {
 
-    public static void main(String... args) throws IOException, RunnerException {
+    public static void main(String... args) throws RunnerException {
 
         runCommandBenchmark();
     }
diff --git a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java
index 2febeaa85c..1dbd4d54b6 100644
--- a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java
@@ -74,6 +74,7 @@ interface RegularCommands extends Commands {
     }
 
     @BatchSize(10)
+    private
     interface BatchCommands extends Commands {
 
         void set(String key, String value);
@@ -84,7 +85,7 @@ static class MockStatefulConnection extends EmptyStatefulRedisConnection {
         RedisCommands sync;
         RedisReactiveCommands reactive;
 
-        public MockStatefulConnection(RedisChannelWriter writer) {
+        MockStatefulConnection(RedisChannelWriter writer) {
             super(writer);
 
             sync = Mockito.mock(RedisCommands.class);
diff --git a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
index 5cc3e458a2..de6ba247aa 100644
--- a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
@@ -22,10 +22,10 @@
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSettings;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.ByteArrayCodec;
 import io.lettuce.core.dynamic.batch.BatchSize;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * Benchmark for commands executed through {@link StatefulRedisConnection}.
diff --git a/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java
index d23dfb9667..37bb6967a0 100644
--- a/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java
@@ -55,7 +55,7 @@ private static class ReturnValue implements MethodInterceptor {
 
         private final Object value;
 
-        public ReturnValue(Object value) {
+        ReturnValue(Object value) {
             this.value = value;
         }
 
@@ -70,7 +70,7 @@ private static class StringAppendingMethodInterceptor implements MethodIntercept
 
         private final String toAppend;
 
-        public StringAppendingMethodInterceptor(String toAppend) {
+        StringAppendingMethodInterceptor(String toAppend) {
             this.toAppend = toAppend;
         }
 
diff --git a/src/test/jmh/io/lettuce/core/output/JmhMain.java b/src/test/jmh/io/lettuce/core/output/JmhMain.java
index 06a09160a6..02ed30e558 100644
--- a/src/test/jmh/io/lettuce/core/output/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/output/JmhMain.java
@@ -15,7 +15,6 @@
  */
 package io.lettuce.core.output;
 
-import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 import org.openjdk.jmh.annotations.Mode;
@@ -32,7 +31,7 @@
  */
 public class JmhMain {
 
-    public static void main(String... args) throws IOException, RunnerException {
+    public static void main(String... args) throws RunnerException {
         runValueListOutputBenchmark();
     }
 
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java b/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
index a54baa8f7b..a2a56257b8 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
@@ -15,7 +15,6 @@
  */
 package io.lettuce.core.protocol;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
@@ -323,17 +322,17 @@ public ByteBuf getBytes(int i, ByteBuffer byteBuffer) {
     }
 
     @Override
-    public ByteBuf getBytes(int i, OutputStream outputStream, int i1) throws IOException {
+    public ByteBuf getBytes(int i, OutputStream outputStream, int i1) {
         return null;
     }
 
     @Override
-    public int getBytes(int i, GatheringByteChannel gatheringByteChannel, int i1) throws IOException {
+    public int getBytes(int i, GatheringByteChannel gatheringByteChannel, int i1) {
         return 0;
     }
 
     @Override
-    public int getBytes(int i, FileChannel fileChannel, long l, int i1) throws IOException {
+    public int getBytes(int i, FileChannel fileChannel, long l, int i1) {
         return 0;
     }
 
@@ -438,17 +437,17 @@ public ByteBuf setBytes(int i, ByteBuffer byteBuffer) {
     }
 
     @Override
-    public int setBytes(int i, InputStream inputStream, int i1) throws IOException {
+    public int setBytes(int i, InputStream inputStream, int i1) {
         return 0;
     }
 
     @Override
-    public int setBytes(int i, ScatteringByteChannel scatteringByteChannel, int i1) throws IOException {
+    public int setBytes(int i, ScatteringByteChannel scatteringByteChannel, int i1) {
         return 0;
     }
 
     @Override
-    public int setBytes(int i, FileChannel fileChannel, long l, int i1) throws IOException {
+    public int setBytes(int i, FileChannel fileChannel, long l, int i1) {
         return 0;
     }
 
@@ -608,12 +607,12 @@ public ByteBuf readBytes(ByteBuffer byteBuffer) {
     }
 
     @Override
-    public ByteBuf readBytes(OutputStream outputStream, int i) throws IOException {
+    public ByteBuf readBytes(OutputStream outputStream, int i) {
         return null;
     }
 
     @Override
-    public int readBytes(GatheringByteChannel gatheringByteChannel, int i) throws IOException {
+    public int readBytes(GatheringByteChannel gatheringByteChannel, int i) {
         return 0;
     }
 
@@ -623,7 +622,7 @@ public CharSequence readCharSequence(int i, Charset charset) {
     }
 
     @Override
-    public int readBytes(FileChannel fileChannel, long l, int i) throws IOException {
+    public int readBytes(FileChannel fileChannel, long l, int i) {
         return 0;
     }
 
@@ -728,17 +727,17 @@ public ByteBuf writeBytes(ByteBuffer byteBuffer) {
     }
 
     @Override
-    public int writeBytes(InputStream inputStream, int i) throws IOException {
+    public int writeBytes(InputStream inputStream, int i) {
         return 0;
     }
 
     @Override
-    public int writeBytes(ScatteringByteChannel scatteringByteChannel, int i) throws IOException {
+    public int writeBytes(ScatteringByteChannel scatteringByteChannel, int i) {
         return 0;
     }
 
     @Override
-    public int writeBytes(FileChannel fileChannel, long l, int i) throws IOException {
+    public int writeBytes(FileChannel fileChannel, long l, int i) {
         return 0;
     }
 
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyChannel.java b/src/test/jmh/io/lettuce/core/protocol/EmptyChannel.java
index 84ba64fdbb..5e98216f7a 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyChannel.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyChannel.java
@@ -10,7 +10,7 @@
 /**
  * @author Grzegorz Szpak
  */
-public class EmptyChannel implements Channel {
+class EmptyChannel implements Channel {
 
     private final static ChannelConfig CONFIG = new EmptyConfig();
 
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
index beb4d7d719..3503bc3c40 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
@@ -38,8 +38,8 @@
  */
 public class EmptyClientResources implements ClientResources {
 
-    public static final DefaultEventPublisherOptions PUBLISHER_OPTIONS = DefaultEventPublisherOptions.disabled();
-    public static final EmptyCommandLatencyCollector LATENCY_COLLECTOR = new EmptyCommandLatencyCollector();
+    private static final DefaultEventPublisherOptions PUBLISHER_OPTIONS = DefaultEventPublisherOptions.disabled();
+    private static final EmptyCommandLatencyCollector LATENCY_COLLECTOR = new EmptyCommandLatencyCollector();
     public static final EmptyClientResources INSTANCE = new EmptyClientResources();
 
     @Override
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyConfig.java b/src/test/jmh/io/lettuce/core/protocol/EmptyConfig.java
index 66f09fa0f7..abdc1c2b45 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyConfig.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyConfig.java
@@ -8,7 +8,7 @@
 /**
  * @author Grzegorz Szpak
  */
-public class EmptyConfig implements ChannelConfig {
+class EmptyConfig implements ChannelConfig {
 
     @Override
     public Map<ChannelOption<?>, Object> getOptions() {
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java b/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java
index 275a069478..1e73b88931 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java
@@ -15,9 +15,7 @@
  */
 package io.lettuce.core.protocol;
 
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
@@ -55,7 +53,7 @@ public ChannelFuture removeListeners(GenericFutureListener<? extends Future<? su
     }
 
     @Override
-    public ChannelFuture sync() throws InterruptedException {
+    public ChannelFuture sync() {
         return null;
     }
 
@@ -65,7 +63,7 @@ public ChannelFuture syncUninterruptibly() {
     }
 
     @Override
-    public ChannelFuture await() throws InterruptedException {
+    public ChannelFuture await() {
         return null;
     }
 
@@ -95,12 +93,12 @@ public Throwable cause() {
     }
 
     @Override
-    public boolean await(long timeout, TimeUnit unit) throws InterruptedException {
+    public boolean await(long timeout, TimeUnit unit) {
         return false;
     }
 
     @Override
-    public boolean await(long timeoutMillis) throws InterruptedException {
+    public boolean await(long timeoutMillis) {
         return false;
     }
 
@@ -135,12 +133,12 @@ public boolean isDone() {
     }
 
     @Override
-    public Void get() throws InterruptedException, ExecutionException {
+    public Void get() {
         return null;
     }
 
     @Override
-    public Void get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+    public Void get(long timeout, TimeUnit unit) {
         return null;
     }
 }
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java b/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
index 1e20a06108..fb7e039a02 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
@@ -15,9 +15,7 @@
  */
 package io.lettuce.core.protocol;
 
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelPromise;
@@ -113,7 +111,7 @@ public ChannelPromise removeListeners(GenericFutureListener<? extends Future<? s
     }
 
     @Override
-    public ChannelPromise sync() throws InterruptedException {
+    public ChannelPromise sync() {
         return null;
     }
 
@@ -123,7 +121,7 @@ public ChannelPromise syncUninterruptibly() {
     }
 
     @Override
-    public ChannelPromise await() throws InterruptedException {
+    public ChannelPromise await() {
         return null;
     }
 
@@ -143,12 +141,12 @@ public ChannelPromise unvoid() {
     }
 
     @Override
-    public boolean await(long timeout, TimeUnit unit) throws InterruptedException {
+    public boolean await(long timeout, TimeUnit unit) {
         return false;
     }
 
     @Override
-    public boolean await(long timeoutMillis) throws InterruptedException {
+    public boolean await(long timeoutMillis) {
         return false;
     }
 
@@ -183,12 +181,12 @@ public boolean isDone() {
     }
 
     @Override
-    public Void get() throws InterruptedException, ExecutionException {
+    public Void get() {
         return null;
     }
 
     @Override
-    public Void get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+    public Void get(long timeout, TimeUnit unit) {
         return null;
     }
 }
diff --git a/src/test/resources/io/lettuce/core/support/SpringTest-context.xml b/src/test/resources/io/lettuce/core/support/SpringIntegrationTests-context.xml
similarity index 95%
rename from src/test/resources/io/lettuce/core/support/SpringTest-context.xml
rename to src/test/resources/io/lettuce/core/support/SpringIntegrationTests-context.xml
index 058bccac2d..9264b08065 100644
--- a/src/test/resources/io/lettuce/core/support/SpringTest-context.xml
+++ b/src/test/resources/io/lettuce/core/support/SpringIntegrationTests-context.xml
@@ -3,7 +3,7 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="TestSettings" class="io.lettuce.core.TestSettings"></bean>
+    <bean id="TestSettings" class="io.lettuce.test.settings.TestSettings"></bean>
     <bean id="ClientResources"
           class="io.lettuce.core.support.ClientResourcesFactoryBean"></bean>
 

From 8daec0b836c11fd81e1a60a0d499935132539f62 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 22 Sep 2018 07:20:59 -0400
Subject: [PATCH 524/808] Cleanups #430

---
 .../core/AsyncConnectionIntegrationTests.java |  6 ++-
 .../lettuce/core/ClientIntegrationTests.java  | 21 +++++-----
 .../core/ClientOptionsIntegrationTests.java   |  8 ++--
 .../lettuce/core/ConnectionCommandTest.java   |  5 ++-
 .../core/RedisURIBuilderUnitTests.java        |  3 +-
 .../io/lettuce/core/SslIntegrationTests.java  | 17 ++++----
 .../java/io/lettuce/core/TestSupport.java     |  8 +---
 ... => ByteCodecClusterIntegrationTests.java} |  2 +-
 .../ClusterCommandIntegrationTests.java       |  6 ++-
 .../core/cluster/ClusterTestSettings.java     |  6 +++
 ...sterTopologyRefreshSchedulerUnitTests.java |  6 ++-
 .../NodeSelectionAsyncIntegrationTests.java   |  6 ++-
 .../RedisClusterClientIntegrationTests.java   |  9 ++--
 .../RedisClusterPasswordSecuredSslTest.java   | 20 ++++-----
 .../core/cluster/RedisClusterSetupTest.java   | 19 ++++-----
 .../RedisClusterStressScenariosTest.java      |  2 +-
 .../TopologyRefreshIntegrationTests.java      | 14 ++++---
 .../core/codec/CompressionCodecUnitTests.java |  2 +-
 .../protocol/CommandHandlerUnitTests.java     |  4 +-
 .../core/protocol/ConnectionFailureTest.java  |  8 ++--
 .../core/pubsub/PubSubCommandTest.java        |  8 ++--
 .../core/reliability/AtLeastOnceTest.java     | 10 +++--
 .../core/sentinel/SentinelCommandTest.java    |  6 ++-
 src/test/java/io/lettuce/test/Delay.java      |  8 ++++
 src/test/java/io/lettuce/test/Sockets.java    | 41 -------------------
 src/test/java/io/lettuce/test/Wait.java       |  2 +-
 .../io/lettuce/core/RedisClientBenchmark.java |  5 ++-
 27 files changed, 123 insertions(+), 129 deletions(-)
 rename src/test/java/io/lettuce/core/cluster/{ByteCodecClusterTest.java => ByteCodecClusterIntegrationTests.java} (95%)
 delete mode 100644 src/test/java/io/lettuce/test/Sockets.java

diff --git a/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java
index dd75e985d0..6dade817c9 100644
--- a/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java
@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Future;
@@ -29,6 +30,7 @@
 
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.test.Delay;
 import io.lettuce.test.Futures;
 import io.lettuce.test.LettuceExtension;
 
@@ -81,7 +83,7 @@ void watch() {
     }
 
     @Test
-    void futureListener() throws Exception {
+    void futureListener() {
 
         final List<Object> run = new ArrayList<>();
 
@@ -106,7 +108,7 @@ void futureListener() throws Exception {
         sort.thenRun(listener);
 
         Futures.await(sort);
-        Thread.sleep(100);
+        Delay.delay(Duration.ofMillis(100));
 
         assertThat(run).hasSize(1);
 
diff --git a/src/test/java/io/lettuce/core/ClientIntegrationTests.java b/src/test/java/io/lettuce/core/ClientIntegrationTests.java
index 0a11e73055..b56b7d122b 100644
--- a/src/test/java/io/lettuce/core/ClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientIntegrationTests.java
@@ -31,6 +31,7 @@
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.resource.ClientResources;
+import io.lettuce.test.Delay;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
 import io.lettuce.test.resource.FastShutdown;
@@ -90,18 +91,18 @@ void timeout() {
     }
 
     @Test
-    void reconnect() throws InterruptedException {
+    void reconnect() {
 
         redis.set(key, value);
 
         redis.quit();
-        Thread.sleep(100);
+        Delay.delay(Duration.ofMillis(100));
         assertThat(redis.get(key)).isEqualTo(value);
         redis.quit();
-        Thread.sleep(100);
+        Delay.delay(Duration.ofMillis(100));
         assertThat(redis.get(key)).isEqualTo(value);
         redis.quit();
-        Thread.sleep(100);
+        Delay.delay(Duration.ofMillis(100));
         assertThat(redis.get(key)).isEqualTo(value);
     }
 
@@ -168,7 +169,7 @@ void testExceptionWithCause() {
     }
 
     @Test
-    void reset() throws Exception {
+    void reset() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisAsyncCommands<String, String> async = connection.async();
@@ -180,7 +181,7 @@ void reset() throws Exception {
 
         RedisFuture<KeyValue<String, String>> eval = async.blpop(5, key);
 
-        Thread.sleep(500);
+        Delay.delay(Duration.ofMillis(500));
 
         assertThat(eval.isDone()).isFalse();
         assertThat(eval.isCancelled()).isFalse();
@@ -196,7 +197,7 @@ void reset() throws Exception {
     }
 
     @Test
-    void standaloneConnectionShouldSetClientName() throws Exception {
+    void standaloneConnectionShouldSetClientName() {
 
         RedisURI redisURI = RedisURI.create(host, port);
         redisURI.setClientName("my-client");
@@ -206,7 +207,7 @@ void standaloneConnectionShouldSetClientName() throws Exception {
         assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
 
         connection.sync().quit();
-        Thread.sleep(100);
+        Delay.delay(Duration.ofMillis(100));
         Wait.untilTrue(connection::isOpen).waitOrTimeout();
 
         assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
@@ -215,7 +216,7 @@ void standaloneConnectionShouldSetClientName() throws Exception {
     }
 
     @Test
-    void pubSubConnectionShouldSetClientName() throws Exception {
+    void pubSubConnectionShouldSetClientName() {
 
         RedisURI redisURI = RedisURI.create(host, port);
         redisURI.setClientName("my-client");
@@ -225,7 +226,7 @@ void pubSubConnectionShouldSetClientName() throws Exception {
         assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
 
         connection.sync().quit();
-        Thread.sleep(100);
+        Delay.delay(Duration.ofMillis(100));
         Wait.untilTrue(connection::isOpen).waitOrTimeout();
 
         assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
diff --git a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
index a61e0b56d7..574afdb006 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
@@ -296,7 +296,7 @@ void pingBeforeConnectTimeout() throws Exception {
 
         try (ServerSocket serverSocket = new ServerSocket(0)) {
 
-            RedisURI redisURI = RedisURI.builder().redis(TestSettings.host(), serverSocket.getLocalPort())
+            RedisURI redisURI = RedisURI.Builder.redis(TestSettings.host(), serverSocket.getLocalPort())
                     .withTimeout(500, TimeUnit.MILLISECONDS).build();
 
             try {
@@ -338,7 +338,7 @@ void pingBeforeConnectWithAuthenticationTimeout() {
 
                     try (ServerSocket serverSocket = new ServerSocket(0)) {
 
-                        RedisURI redisURI = RedisURI.builder().redis(TestSettings.host(), serverSocket.getLocalPort())
+                        RedisURI redisURI = RedisURI.Builder.redis(TestSettings.host(), serverSocket.getLocalPort())
                                 .withPassword(passwd).withTimeout(Duration.ofMillis(500)).build();
 
                         try {
@@ -379,7 +379,7 @@ void pingBeforeConnectWithAuthenticationFails() {
         WithPassword.run(client, () -> {
 
             client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
-            RedisURI redisURI = RedisURI.builder().redis(host, port).build();
+            RedisURI redisURI = RedisURI.Builder.redis(host, port).build();
 
             try {
                 client.connect(redisURI);
@@ -398,7 +398,7 @@ void pingBeforeConnectWithSslAndAuthenticationFails() {
                 () -> {
 
                     client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
-                    RedisURI redisURI = RedisURI.builder().redis(host, 6443).withVerifyPeer(false).withSsl(true).build();
+                    RedisURI redisURI = RedisURI.Builder.redis(host, 6443).withVerifyPeer(false).withSsl(true).build();
 
                     try {
                         client.connect(redisURI);
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandTest.java b/src/test/java/io/lettuce/core/ConnectionCommandTest.java
index e520173573..e20d5f2b9f 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandTest.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandTest.java
@@ -19,6 +19,8 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.fail;
 
+import java.time.Duration;
+
 import javax.inject.Inject;
 
 import org.junit.jupiter.api.Test;
@@ -28,6 +30,7 @@
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.Delay;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
 import io.lettuce.test.WithPassword;
@@ -108,7 +111,7 @@ void authReconnect() {
                 assertThat(connection.set(key, value)).isEqualTo("OK");
                 connection.quit();
 
-                Thread.sleep(100);
+            Delay.delay(Duration.ofMillis(100));
                 assertThat(connection.get(key)).isEqualTo(value);
 
             connection.getStatefulConnection().close();
diff --git a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
index 54fd95cd59..ae49ff45a3 100644
--- a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
@@ -38,7 +38,8 @@ void sentinel() {
 
     @Test
     void sentinelWithHostShouldFail() {
-        assertThatThrownBy(() -> RedisURI.builder().sentinel("localhost").withHost("localhost")).isInstanceOf(IllegalStateException. class);
+        assertThatThrownBy(() -> RedisURI.Builder.sentinel("localhost").withHost("localhost")).isInstanceOf(
+                IllegalStateException.class);
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/SslIntegrationTests.java b/src/test/java/io/lettuce/core/SslIntegrationTests.java
index f251357c8d..0598beb945 100644
--- a/src/test/java/io/lettuce/core/SslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/SslIntegrationTests.java
@@ -25,6 +25,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.cert.CertificateException;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
@@ -96,7 +97,7 @@ class SslIntegrationTests extends TestSupport {
     @BeforeAll
     static void beforeClass() {
 
-        assumeTrue(Sockets.isOpen(host(), sslPort()), "Assume that stunnel runs on port 6443");
+        assumeTrue(CanConnect.to(host(), sslPort()), "Assume that stunnel runs on port 6443");
         assertThat(TRUSTSTORE_FILE).exists();
     }
 
@@ -217,11 +218,11 @@ void pingBeforeActivate() {
     }
 
     @Test
-    void regularSslWithReconnect() throws Exception {
+    void regularSslWithReconnect() {
 
         RedisCommands<String, String> connection = redisClient.connect(URI_NO_VERIFY).sync();
         connection.quit();
-        Thread.sleep(200);
+        Delay.delay(Duration.ofMillis(200));
         assertThat(connection.ping()).isEqualTo("PONG");
         connection.getStatefulConnection().close();
     }
@@ -302,11 +303,11 @@ void masterSlavePingBeforeActivate() {
     }
 
     @Test
-    void masterSlaveSslWithReconnect() throws Exception {
+    void masterSlaveSslWithReconnect() {
         RedisCommands<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8,
                 MASTER_SLAVE_URIS_NO_VERIFY).sync();
         connection.quit();
-        Thread.sleep(200);
+        Delay.delay(Duration.ofMillis(200));
         assertThat(connection.ping()).isEqualTo("PONG");
         connection.getStatefulConnection().close();
     }
@@ -343,18 +344,18 @@ void masterSlaveSslWithAllInvalidHostsWillFail() {
     }
 
     @Test
-    void pubSubSsl() throws Exception {
+    void pubSubSsl() {
 
         RedisPubSubCommands<String, String> connection = redisClient.connectPubSub(URI_NO_VERIFY).sync();
         connection.subscribe("c1");
         connection.subscribe("c2");
-        Thread.sleep(200);
+        Delay.delay(Duration.ofMillis(200));
 
         RedisPubSubCommands<String, String> connection2 = redisClient.connectPubSub(URI_NO_VERIFY).sync();
 
         assertThat(connection2.pubsubChannels()).contains("c1", "c2");
         connection.quit();
-        Thread.sleep(200);
+        Delay.delay(Duration.ofMillis(200));
         Wait.untilTrue(connection::isOpen).waitOrTimeout();
         Wait.untilEquals(2, () -> connection2.pubsubChannels().size()).waitOrTimeout();
 
diff --git a/src/test/java/io/lettuce/core/TestSupport.java b/src/test/java/io/lettuce/core/TestSupport.java
index 26eed86e77..c17b2ee061 100644
--- a/src/test/java/io/lettuce/core/TestSupport.java
+++ b/src/test/java/io/lettuce/core/TestSupport.java
@@ -19,9 +19,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import io.lettuce.core.internal.LettuceSets;
 import io.lettuce.test.settings.TestSettings;
 
@@ -32,11 +29,10 @@ public abstract class TestSupport {
 
     public static final String host = TestSettings.hostAddr();
     public static final int port = TestSettings.port();
-    protected static final String passwd = TestSettings.password();
+    public static final String passwd = TestSettings.password();
 
-    protected Logger log = LogManager.getLogger(getClass());
     public static final String key = "key";
-    protected static final String value = "value";
+    public static final String value = "value";
 
     protected static List<String> list(String... args) {
         return Arrays.asList(args);
diff --git a/src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java b/src/test/java/io/lettuce/core/cluster/ByteCodecClusterIntegrationTests.java
similarity index 95%
rename from src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java
rename to src/test/java/io/lettuce/core/cluster/ByteCodecClusterIntegrationTests.java
index 4f5f26033b..1710d206dd 100644
--- a/src/test/java/io/lettuce/core/cluster/ByteCodecClusterTest.java
+++ b/src/test/java/io/lettuce/core/cluster/ByteCodecClusterIntegrationTests.java
@@ -31,7 +31,7 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-class ByteCodecClusterTest extends TestSupport {
+class ByteCodecClusterIntegrationTests extends TestSupport {
 
     @Test
     @Inject
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
index 43e08017cb..4f7a5a1871 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
@@ -18,6 +18,7 @@
 import static io.lettuce.core.cluster.ClusterTestUtil.getNodeId;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.Duration;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -37,6 +38,7 @@
 import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
 import io.lettuce.core.cluster.models.slots.ClusterSlotRange;
 import io.lettuce.core.cluster.models.slots.ClusterSlotsParser;
+import io.lettuce.test.Delay;
 import io.lettuce.test.Futures;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
@@ -242,13 +244,13 @@ void clusterSlaves() {
         assertThat(result.size()).isGreaterThan(0);
     }
 
-    private void prepareReadonlyTest(String key) throws InterruptedException {
+    private void prepareReadonlyTest(String key) {
 
         async.set(key, value);
 
         String resultB = Futures.get(async.get(key));
         assertThat(resultB).isEqualTo(value);
-        Thread.sleep(500); // give some time to replicate
+        Delay.delay(Duration.ofMillis(500)); // give some time to replicate
     }
 
     private static void waitUntilValueIsVisible(String key, RedisCommands<String, String> commands) {
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java b/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java
index 7c27ff417f..20f067e87f 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java
@@ -44,6 +44,12 @@ public abstract class ClusterTestSettings extends TestSupport {
     public static final String KEY_B = "b";
     public static final String KEY_D = "d";
 
+    /**
+     * Don't allow instances.
+     */
+    private ClusterTestSettings() {
+    }
+
     public static int[] createSlots(int from, int to) {
         int[] result = new int[to - from];
         int counter = 0;
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
index 1bff6c702e..952ca90a0d 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
@@ -21,6 +21,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -32,6 +33,7 @@
 import org.mockito.quality.Strictness;
 
 import io.lettuce.core.resource.ClientResources;
+import io.lettuce.test.Delay;
 import io.netty.util.concurrent.EventExecutorGroup;
 
 /**
@@ -202,7 +204,7 @@ void shouldNotTriggerRefreshOnFirstReconnect() {
     }
 
     @Test
-    void shouldRateLimitAdaptiveRequests() throws Exception {
+    void shouldRateLimitAdaptiveRequests() {
 
         ClusterTopologyRefreshOptions adaptiveTimeout = ClusterTopologyRefreshOptions.builder().enablePeriodicRefresh(false)
                 .enableAllAdaptiveRefreshTriggers().adaptiveRefreshTriggersTimeout(50, TimeUnit.MILLISECONDS).build();
@@ -216,7 +218,7 @@ void shouldRateLimitAdaptiveRequests() throws Exception {
             sut.onAskRedirection();
         }
 
-        Thread.sleep(100);
+        Delay.delay(Duration.ofMillis(100));
         sut.onAskRedirection();
 
         verify(eventExecutors, times(2)).submit(any(Runnable.class));
diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
index e2a0f9f863..cb3a058c3c 100644
--- a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
@@ -18,6 +18,7 @@
 import static io.lettuce.core.ScriptOutputType.STATUS;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
@@ -38,6 +39,7 @@
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.internal.LettuceSets;
+import io.lettuce.test.Delay;
 import io.lettuce.test.Futures;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
@@ -164,7 +166,7 @@ void testStaticNodeSelection() {
     }
 
     @Test
-    void testAsynchronicityOfMultiNodeExecution() throws InterruptedException {
+    void testAsynchronicityOfMultiNodeExecution() {
 
         StatefulRedisClusterConnection<String, String> connection2 = clusterClient.connect();
         RedisAdvancedClusterAsyncCommands<String, String> async2 = connection2.async();
@@ -178,7 +180,7 @@ void testAsynchronicityOfMultiNodeExecution() throws InterruptedException {
             assertThat(future.isDone()).isFalse();
             assertThat(future.isCancelled()).isFalse();
         }
-        Thread.sleep(200);
+        Delay.delay(Duration.ofMillis(200));
 
         AsyncExecutions<String> kill = commands.masters().commands().scriptKill();
         Futures.await(kill);
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
index 2e389e49c0..8aec366496 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
@@ -50,6 +50,7 @@
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.test.Delay;
 import io.lettuce.test.Futures;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
@@ -180,12 +181,12 @@ void shouldApplyTimeoutOnPubSubConnectionUsingCodec() {
     }
 
     @Test
-    void clusterConnectionShouldSetClientName() throws Exception {
+    void clusterConnectionShouldSetClientName() {
 
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
 
         assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
-        Thread.sleep(10);
+        Delay.delay(Duration.ofMillis(10));
         connection.sync().quit();
         Wait.untilTrue(connection::isOpen).waitOrTimeout();
         assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
@@ -198,12 +199,12 @@ void clusterConnectionShouldSetClientName() throws Exception {
     }
 
     @Test
-    void pubSubclusterConnectionShouldSetClientName() throws InterruptedException {
+    void pubSubclusterConnectionShouldSetClientName() {
 
         StatefulRedisClusterPubSubConnection<String, String> connection = clusterClient.connectPubSub();
 
         assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
-        Thread.sleep(10);
+        Delay.delay(Duration.ofMillis(10));
         connection.sync().quit();
         Wait.untilTrue(connection::isOpen).waitOrTimeout();
 
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
index 4aeafced13..f1c46ac966 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
@@ -35,7 +35,7 @@
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.sync.Executions;
 import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
-import io.lettuce.test.Sockets;
+import io.lettuce.test.CanConnect;
 import io.lettuce.test.resource.FastShutdown;
 import io.lettuce.test.resource.TestClientResources;
 
@@ -51,18 +51,18 @@ class RedisClusterPasswordSecuredSslTest extends TestSupport {
     private static final String SLOT_1_KEY = "8HMdi";
     private static final String SLOT_16352_KEY = "UyAa4KqoWgPGKa";
 
-    private static RedisURI redisURI = RedisURI.builder().redis(host(), CLUSTER_PORT_SSL_1).withPassword("foobared")
+    private static RedisURI redisURI = RedisURI.Builder.redis(host(), CLUSTER_PORT_SSL_1).withPassword("foobared")
             .withSsl(true).withVerifyPeer(false).build();
     private static RedisClusterClient redisClient = RedisClusterClient.create(TestClientResources.get(), redisURI);
 
     @BeforeEach
     void before() {
-        assumeTrue(Sockets.isOpen(host(), CLUSTER_PORT_SSL_1), "Assume that stunnel runs on port 7443");
-        assumeTrue(Sockets.isOpen(host(), CLUSTER_PORT_SSL_2), "Assume that stunnel runs on port 7444");
-        assumeTrue(Sockets.isOpen(host(), CLUSTER_PORT_SSL_3), "Assume that stunnel runs on port 7445");
-        assumeTrue(Sockets.isOpen(host(), 7479), "Assume that Redis runs on port 7479");
-        assumeTrue(Sockets.isOpen(host(), 7480), "Assume that Redis runs on port 7480");
-        assumeTrue(Sockets.isOpen(host(), 7481), "Assume that Redis runs on port 7481");
+        assumeTrue(CanConnect.to(host(), CLUSTER_PORT_SSL_1), "Assume that stunnel runs on port 7443");
+        assumeTrue(CanConnect.to(host(), CLUSTER_PORT_SSL_2), "Assume that stunnel runs on port 7444");
+        assumeTrue(CanConnect.to(host(), CLUSTER_PORT_SSL_3), "Assume that stunnel runs on port 7445");
+        assumeTrue(CanConnect.to(host(), 7479), "Assume that Redis runs on port 7479");
+        assumeTrue(CanConnect.to(host(), 7480), "Assume that Redis runs on port 7480");
+        assumeTrue(CanConnect.to(host(), 7481), "Assume that Redis runs on port 7481");
     }
 
     @AfterAll
@@ -136,7 +136,7 @@ void nodeSelectionApiShouldWork() {
     @Test
     void connectionWithoutPasswordShouldFail() {
 
-        RedisURI redisURI = RedisURI.builder().redis(host(), CLUSTER_PORT_SSL_1).withSsl(true).withVerifyPeer(false).build();
+        RedisURI redisURI = RedisURI.Builder.redis(host(), CLUSTER_PORT_SSL_1).withSsl(true).withVerifyPeer(false).build();
         RedisClusterClient redisClusterClient = RedisClusterClient.create(TestClientResources.get(), redisURI);
 
         try {
@@ -151,7 +151,7 @@ void connectionWithoutPasswordShouldFail() {
     @Test
     void connectionWithoutPasswordShouldFail2() {
 
-        RedisURI redisURI = RedisURI.builder().redis(host(), CLUSTER_PORT_SSL_1).withSsl(true).withVerifyPeer(false).build();
+        RedisURI redisURI = RedisURI.Builder.redis(host(), CLUSTER_PORT_SSL_1).withSsl(true).withVerifyPeer(false).build();
         RedisClusterClient redisClusterClient = RedisClusterClient.create(TestClientResources.get(), redisURI);
 
         try {
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
index da72285a95..4658768aac 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
@@ -25,7 +25,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
 import org.junit.*;
@@ -146,7 +145,7 @@ public void clusterForget() {
     }
 
     @Test
-    public void clusterDelSlots() throws Exception {
+    public void clusterDelSlots() {
 
         ClusterSetup.setup2Masters(clusterRule);
 
@@ -156,7 +155,7 @@ public void clusterDelSlots() throws Exception {
     }
 
     @Test
-    public void clusterSetSlots() throws Exception {
+    public void clusterSetSlots() {
 
         ClusterSetup.setup2Masters(clusterRule);
 
@@ -174,7 +173,7 @@ public void clusterSetSlots() throws Exception {
     }
 
     @Test
-    public void clusterSlotMigrationImport() throws Exception {
+    public void clusterSlotMigrationImport() {
 
         ClusterSetup.setup2Masters(clusterRule);
 
@@ -186,7 +185,7 @@ public void clusterSlotMigrationImport() throws Exception {
     }
 
     @Test
-    public void clusterTopologyRefresh() throws Exception {
+    public void clusterTopologyRefresh() {
 
         clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(PERIODIC_REFRESH_ENABLED).build());
         clusterClient.reloadPartitions();
@@ -247,7 +246,7 @@ public void changeTopologyWhileOperations() throws Exception {
     }
 
     @Test
-    public void slotMigrationShouldUseAsking() throws Exception {
+    public void slotMigrationShouldUseAsking() {
 
         ClusterSetup.setup2Masters(clusterRule);
 
@@ -382,7 +381,7 @@ public void expireStaleNodeIdConnections() throws Exception {
 
     }
 
-    private void assertRoutedExecution(RedisClusterAsyncCommands<String, String> clusterConnection) throws Exception {
+    private void assertRoutedExecution(RedisClusterAsyncCommands<String, String> clusterConnection) {
         assertExecuted(clusterConnection.set("A", "value")); // 6373
         assertExecuted(clusterConnection.set("t", "value")); // 15891
         assertExecuted(clusterConnection.set("p", "value")); // 16023
@@ -472,7 +471,7 @@ public void expireStaleHostAndPortConnections() throws Exception {
     }
 
     @Test
-    public void readFromSlaveTest() throws Exception {
+    public void readFromSlaveTest() {
 
         ClusterSetup.setup2Masters(clusterRule);
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
@@ -490,7 +489,7 @@ public void readFromSlaveTest() throws Exception {
     }
 
     @Test
-    public void readFromNearestTest() throws Exception {
+    public void readFromNearestTest() {
 
         ClusterSetup.setup2Masters(clusterRule);
         RedisAdvancedClusterCommands<String, String> clusterConnection = clusterClient.connect().sync();
@@ -531,7 +530,7 @@ private void suspendConnection(RedisClusterAsyncCommands<String, String> asyncCo
         Wait.untilTrue(() -> !asyncCommands.isOpen()).waitOrTimeout();
     }
 
-    private void shiftAllSlotsToNode1() throws InterruptedException, TimeoutException {
+    private void shiftAllSlotsToNode1() {
 
         redis1.clusterDelSlots(createSlots(12000, 16384));
         redis2.clusterDelSlots(createSlots(12000, 16384));
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
index bef557acf3..35bb900e07 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
@@ -73,7 +73,7 @@ public static void shutdownClient() {
     }
 
     @Before
-    public void before() throws Exception {
+    public void before() {
 
         ClusterSetup.setupMasterWithSlave(clusterRule);
 
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
index b5debc0964..36f27b6c0c 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.Duration;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Future;
@@ -49,6 +50,7 @@
 import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.test.Delay;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
 import io.lettuce.test.resource.FastShutdown;
@@ -207,7 +209,7 @@ void adaptiveTopologyUpdateOnDisconnectDefaultConnection() {
     }
 
     @Test
-    void adaptiveTopologyUpdateIsRateLimited() throws Exception {
+    void adaptiveTopologyUpdateIsRateLimited() {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.builder()//
                 .adaptiveRefreshTriggersTimeout(1, TimeUnit.HOURS)//
@@ -227,7 +229,7 @@ void adaptiveTopologyUpdateIsRateLimited() throws Exception {
         clusterClient.getPartitions().clear();
         clusterConnection.quit();
 
-        Thread.sleep(1000);
+        Delay.delay(Duration.ofMillis(1000));
 
         assertThat(clusterClient.getPartitions()).isEmpty();
 
@@ -235,7 +237,7 @@ void adaptiveTopologyUpdateIsRateLimited() throws Exception {
     }
 
     @Test
-    void adaptiveTopologyUpdatetUsesTimeout() throws Exception {
+    void adaptiveTopologyUpdatetUsesTimeout() {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.builder()//
                 .adaptiveRefreshTriggersTimeout(500, TimeUnit.MILLISECONDS)//
@@ -246,7 +248,7 @@ void adaptiveTopologyUpdatetUsesTimeout() throws Exception {
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
 
         clusterConnection.quit();
-        Thread.sleep(1000);
+        Delay.delay(Duration.ofMillis(1000));
 
         Wait.untilTrue(() -> {
             return !clusterClient.getPartitions().isEmpty();
@@ -263,7 +265,7 @@ void adaptiveTopologyUpdatetUsesTimeout() throws Exception {
     }
 
     @Test
-    void adaptiveTriggerDoesNotFireOnSingleReconnect() throws Exception {
+    void adaptiveTriggerDoesNotFireOnSingleReconnect() {
 
         ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.builder()//
                 .enableAllAdaptiveRefreshTriggers()//
@@ -274,7 +276,7 @@ void adaptiveTriggerDoesNotFireOnSingleReconnect() throws Exception {
         clusterClient.getPartitions().clear();
 
         clusterConnection.quit();
-        Thread.sleep(500);
+        Delay.delay(Duration.ofMillis(500));
 
         assertThat(clusterClient.getPartitions()).isEmpty();
         clusterConnection.getStatefulConnection().close();
diff --git a/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java b/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java
index 19adc9c57e..c05f4ec976 100644
--- a/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java
+++ b/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java
@@ -35,7 +35,7 @@ class CompressionCodecUnitTests {
     private String value = "value";
 
     @Test
-    void keyPassthroughTest() throws Exception {
+    void keyPassthroughTest() {
         RedisCodec<String, String> sut = CompressionCodec.valueCompressor(new Utf8StringCodec(),
                 CompressionCodec.CompressionType.GZIP);
         ByteBuffer byteBuffer = sut.encodeKey(value);
diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
index 20c42b9a7b..2e01e64f90 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.net.Inet4Address;
 import java.net.InetSocketAddress;
+import java.time.Duration;
 import java.util.*;
 
 import org.apache.logging.log4j.Level;
@@ -51,6 +52,7 @@
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.tracing.Tracing;
+import io.lettuce.test.Delay;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.Unpooled;
@@ -407,7 +409,7 @@ void shouldRecordCorrectFirstResponseLatency() throws Exception {
         LatencyMeteredCommand<String, String, String> wrapped = new LatencyMeteredCommand<>(command);
 
         sut.write(context, wrapped, channelPromise);
-        Thread.sleep(10);
+        Delay.delay(Duration.ofMillis(10));
 
         sut.channelRead(context, Unpooled.wrappedBuffer("*1\r\n+OK\r\n".getBytes()));
 
diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
index c75edfc9c8..57e97ea46e 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
@@ -32,6 +32,7 @@
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.server.RandomResponseServer;
 import io.lettuce.test.ConnectionTestUtil;
+import io.lettuce.test.Delay;
 import io.lettuce.test.Futures;
 import io.lettuce.test.Wait;
 import io.lettuce.test.settings.TestSettings;
@@ -201,7 +202,7 @@ void cancelCommandsOnReconnectFailure() throws Exception {
             assertThat(connection.getStatefulConnection().isOpen()).isFalse();
             connectionWatchdog.setReconnectSuspended(false);
             connectionWatchdog.run(0);
-            Thread.sleep(500);
+            Delay.delay(Duration.ofMillis(500));
             assertThat(connection.getStatefulConnection().isOpen()).isFalse();
 
             assertThatThrownBy(set1::get).isInstanceOf(CancellationException.class).hasNoCause();
@@ -219,10 +220,9 @@ void cancelCommandsOnReconnectFailure() throws Exception {
     /**
      * Expect to disable {@link ConnectionWatchdog} when closing a broken connection.
      *
-     * @throws Exception
      */
     @Test
-    void closingDisconnectedConnectionShouldDisableConnectionWatchdog() throws Exception {
+    void closingDisconnectedConnectionShouldDisableConnectionWatchdog() {
 
         client.setOptions(ClientOptions.create());
 
@@ -244,7 +244,7 @@ void closingDisconnectedConnectionShouldDisableConnectionWatchdog() throws Excep
         Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
 
         connection.close();
-        Thread.sleep(100);
+        Delay.delay(Duration.ofMillis(100));
 
         assertThat(connectionWatchdog.isReconnectSuspended()).isTrue();
         assertThat(connectionWatchdog.isListenOnChannelInactive()).isFalse();
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
index 0b7e2c39a3..310f6aa873 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
@@ -20,6 +20,7 @@
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.junit.Assert.assertThat;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -34,6 +35,7 @@
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.internal.LettuceFactories;
 import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
+import io.lettuce.test.Delay;
 import io.lettuce.test.Futures;
 import io.lettuce.test.Wait;
 import io.lettuce.test.resource.FastShutdown;
@@ -97,7 +99,7 @@ protected void run(RedisClient client) throws Exception {
                 connection.auth(passwd);
                 connection.quit();
 
-                Thread.sleep(100);
+                Delay.delay(Duration.ofMillis(100));
                 Wait.untilTrue(connection::isOpen).waitOrTimeout();
 
                 connection.subscribe(channel);
@@ -124,7 +126,7 @@ void pipelinedMessage() throws Exception {
 
         connection.setAutoFlushCommands(false);
         connection.publish(channel, message);
-        Thread.sleep(100);
+        Delay.delay(Duration.ofMillis(100));
 
         assertThat(channels).isEmpty();
         connection.flushCommands();
@@ -156,7 +158,7 @@ void pipelinedSubscribe() throws Exception {
 
         pubsub.setAutoFlushCommands(false);
         pubsub.subscribe(channel);
-        Thread.sleep(100);
+        Delay.delay(Duration.ofMillis(100));
         assertThat(channels).isEmpty();
         pubsub.flushCommands();
 
diff --git a/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
index 1bcab5870b..767cc40626 100644
--- a/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
@@ -18,6 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
+import java.time.Duration;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -33,6 +34,7 @@
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
 import io.lettuce.test.ConnectionTestUtil;
+import io.lettuce.test.Delay;
 import io.lettuce.test.Wait;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
@@ -293,7 +295,7 @@ void commandFailsDuringDecode() {
     }
 
     @Test
-    void commandCancelledOverSyncAPIAfterConnectionIsDisconnected() throws Exception {
+    void commandCancelledOverSyncAPIAfterConnectionIsDisconnected() {
 
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> sync = connection.sync();
@@ -323,7 +325,7 @@ void commandCancelledOverSyncAPIAfterConnectionIsDisconnected() throws Exception
 
         while (!ConnectionTestUtil.getCommandBuffer(connection).isEmpty()
                 || !ConnectionTestUtil.getDisconnectedBuffer(connection).isEmpty()) {
-            Thread.sleep(10);
+            Delay.delay(Duration.ofMillis(10));
         }
 
         assertThat(sync.get(key)).isEqualTo("1");
@@ -345,7 +347,7 @@ void retryAfterConnectionIsDisconnected() throws Exception {
 
         connection.async().quit();
         while (connection.isOpen()) {
-            Thread.sleep(100);
+            Delay.delay(Duration.ofMillis(100));
         }
 
         assertThat(connection.async().incr(key).await(1, TimeUnit.SECONDS)).isFalse();
@@ -360,7 +362,7 @@ void retryAfterConnectionIsDisconnected() throws Exception {
 
         while (!ConnectionTestUtil.getCommandBuffer(connection).isEmpty()
                 || !ConnectionTestUtil.getDisconnectedBuffer(connection).isEmpty()) {
-            Thread.sleep(10);
+            Delay.delay(Duration.ofMillis(10));
         }
 
         assertThat(connection.sync().get(key)).isEqualTo("2");
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
index d37605be79..dfbebf7781 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
@@ -21,6 +21,7 @@
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
+import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 
@@ -34,6 +35,7 @@
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
+import io.lettuce.test.Delay;
 import io.lettuce.test.Wait;
 import io.lettuce.test.resource.DefaultRedisClient;
 import io.lettuce.test.resource.FastShutdown;
@@ -229,14 +231,14 @@ public void connectToRedisUsingSentinel() {
     }
 
     @Test
-    public void connectToRedisUsingSentinelWithReconnect() throws InterruptedException {
+    public void connectToRedisUsingSentinelWithReconnect() {
 
         RedisCommands<String, String> connect = sentinelClient.connect().sync();
 
         connect.ping();
         connect.quit();
 
-        Thread.sleep(50);
+        Delay.delay(Duration.ofMillis(50));
         Wait.untilTrue(connect::isOpen).waitOrTimeout();
         connect.ping();
         connect.getStatefulConnection().close();
diff --git a/src/test/java/io/lettuce/test/Delay.java b/src/test/java/io/lettuce/test/Delay.java
index 335aa342cf..85eafc1c06 100644
--- a/src/test/java/io/lettuce/test/Delay.java
+++ b/src/test/java/io/lettuce/test/Delay.java
@@ -22,6 +22,14 @@
  */
 public class Delay {
 
+    private Delay() {
+    }
+
+    /**
+     * Sleep for the given {@link Duration}.
+     *
+     * @param duration
+     */
     public static void delay(Duration duration) {
 
         try {
diff --git a/src/test/java/io/lettuce/test/Sockets.java b/src/test/java/io/lettuce/test/Sockets.java
deleted file mode 100644
index e2d7450e1d..0000000000
--- a/src/test/java/io/lettuce/test/Sockets.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.test;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author Mark Paluch
- */
-public class Sockets {
-    public static boolean isOpen(String host, int port) {
-        Socket socket = new Socket();
-        try {
-            socket.connect(new InetSocketAddress(host, port), (int) TimeUnit.MILLISECONDS.convert(1, TimeUnit.SECONDS));
-            socket.close();
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    private Sockets() {
-        // unused
-    }
-}
diff --git a/src/test/java/io/lettuce/test/Wait.java b/src/test/java/io/lettuce/test/Wait.java
index b1fe192525..1aedb09791 100644
--- a/src/test/java/io/lettuce/test/Wait.java
+++ b/src/test/java/io/lettuce/test/Wait.java
@@ -171,7 +171,7 @@ public interface VoidWaitCondition {
     @FunctionalInterface
     public interface Supplier<T> {
 
-        T get() throws Exception;
+        T get();
     }
 
     public static class WaitBuilder<T> {
diff --git a/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
index f1659f9b4c..e16e7b6bb5 100644
--- a/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
@@ -24,6 +24,7 @@
 import reactor.core.publisher.Mono;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.test.Delay;
 import io.lettuce.test.settings.TestSettings;
 
 /**
@@ -155,12 +156,12 @@ public void reactiveSetBatchFlush() {
         }).blockLast();
     }
 
-    public static void main(String[] args) throws InterruptedException {
+    public static void main(String[] args) {
 
         RedisClientBenchmark b = new RedisClientBenchmark();
         b.setup();
 
-        Thread.sleep(10000);
+        Delay.delay(Duration.ofMillis(10000));
         while (true) {
             b.syncList();
         }

From e8dc678cf78892d9202475bcf5262ffbeb8827bd Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 22 Sep 2018 07:42:30 -0400
Subject: [PATCH 525/808] Fix JMH runner times

Reduce to 1s per iteration
---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index 2e6f08b09f..3aae25d4c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -650,6 +650,10 @@
                                         <argument>1</argument>
                                         <argument>-wi</argument>
                                         <argument>10</argument>
+                                        <argument>-w</argument>
+                                        <argument>1</argument>
+                                        <argument>-r</argument>
+                                        <argument>1</argument>
                                         <argument>-i</argument>
                                         <argument>10</argument>
                                         <argument>-bm</argument>

From b31cd7b757df3e6afcb9a4ddc52766b929060e8b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 22 Sep 2018 07:42:48 -0400
Subject: [PATCH 526/808] Warning cleanups #430

---
 .../core/AbstractRedisAsyncCommands.java      | 12 +++++------
 .../io/lettuce/core/AbstractRedisClient.java  |  4 ++--
 src/main/java/io/lettuce/core/KeyValue.java   |  1 +
 src/main/java/io/lettuce/core/Operators.java  |  4 ++--
 .../io/lettuce/core/RedisChannelHandler.java  |  2 ++
 .../io/lettuce/core/RedisCommandBuilder.java  |  4 ++--
 .../java/io/lettuce/core/RedisPublisher.java  |  3 +++
 src/main/java/io/lettuce/core/ScanStream.java |  3 +++
 .../io/lettuce/core/TransactionResult.java    |  1 +
 src/main/java/io/lettuce/core/Value.java      |  1 +
 .../ClusterDistributionChannelWriter.java     |  4 +++-
 .../core/cluster/PartitionException.java      |  1 +
 .../cluster/PartitionSelectorException.java   |  1 +
 .../core/cluster/PipelinedRedisFuture.java    |  2 +-
 .../cluster/UnknownPartitionException.java    |  1 +
 .../core/cluster/topology/Connections.java    |  3 ++-
 .../DefaultMethodParametersAccessor.java      |  8 ++++----
 .../internal/AsyncConnectionProvider.java     |  2 +-
 .../io/lettuce/core/internal/Futures.java     | 16 +++++++++++++++
 .../CompletableEventLatchSupport.java         |  7 +++++--
 .../lettuce/core/masterslave/Connections.java |  5 +++--
 .../masterslave/SentinelTopologyRefresh.java  |  3 ++-
 .../lettuce/core/protocol/AsyncCommand.java   |  1 +
 .../io/lettuce/core/protocol/CommandArgs.java |  8 ++++++--
 .../lettuce/core/protocol/CommandHandler.java | 12 +++++------
 .../core/protocol/DefaultEndpoint.java        |  9 +++++----
 .../core/pubsub/PubSubCommandHandler.java     |  2 +-
 .../support/AsyncConnectionPoolSupport.java   |  2 +-
 .../core/support/BoundedAsyncPool.java        |  2 +-
 .../support/CommonsPool2ConfigConverter.java  |  3 ++-
 .../core/support/ConnectionPoolSupport.java   |  4 ++--
 .../core/support/ConnectionWrapping.java      |  5 +++--
 .../core/cluster/RedisClusterSetupTest.java   |  3 ++-
 .../TopologyRefreshIntegrationTests.java      | 12 ++++-------
 ...ConnectionPoolSupportIntegrationTests.java | 20 +++++++++----------
 src/test/java/io/lettuce/test/Wait.java       |  7 +------
 36 files changed, 108 insertions(+), 70 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index ff21202bea..9604b0bba7 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -41,6 +41,7 @@
  * @author Will Glozer
  * @author Mark Paluch
  */
+@SuppressWarnings("unchecked")
 public abstract class AbstractRedisAsyncCommands<K, V> implements RedisHashAsyncCommands<K, V>, RedisKeyAsyncCommands<K, V>,
         RedisStringAsyncCommands<K, V>, RedisListAsyncCommands<K, V>, RedisSetAsyncCommands<K, V>,
         RedisSortedSetAsyncCommands<K, V>, RedisScriptingAsyncCommands<K, V>, RedisServerAsyncCommands<K, V>,
@@ -1040,14 +1041,12 @@ public RedisFuture<V> randomkey() {
 
     @Override
     public RedisFuture<String> readOnly() {
-        AsyncCommand<K, V, String> cmd = dispatch(commandBuilder.readOnly());
-        return cmd;
+        return dispatch(commandBuilder.readOnly());
     }
 
     @Override
     public RedisFuture<String> readWrite() {
-        AsyncCommand<K, V, String> cmd = dispatch(commandBuilder.readWrite());
-        return cmd;
+        return dispatch(commandBuilder.readWrite());
     }
 
     @Override
@@ -1218,6 +1217,7 @@ public void setTimeout(Duration timeout) {
         connection.setTimeout(timeout);
     }
 
+    @Deprecated
     public void setTimeout(long timeout, TimeUnit unit) {
         connection.setTimeout(timeout, unit);
     }
@@ -1632,7 +1632,7 @@ public RedisFuture<Long> zadd(K key, Object... scoresAndValues) {
 
     @Override
     public RedisFuture<Long> zadd(K key, ScoredValue<V>... scoredValues) {
-        return dispatch(commandBuilder.zadd(key, null, scoredValues));
+        return dispatch(commandBuilder.zadd(key, null, (Object[]) scoredValues));
     }
 
     @Override
@@ -1647,7 +1647,7 @@ public RedisFuture<Long> zadd(K key, ZAddArgs zAddArgs, Object... scoresAndValue
 
     @Override
     public RedisFuture<Long> zadd(K key, ZAddArgs zAddArgs, ScoredValue<V>... scoredValues) {
-        return dispatch(commandBuilder.zadd(key, zAddArgs, scoredValues));
+        return dispatch(commandBuilder.zadd(key, zAddArgs, (Object[]) scoredValues));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 0d11e598be..e871c291e9 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -15,7 +15,6 @@
  */
 package io.lettuce.core;
 
-import static java.util.concurrent.CompletableFuture.allOf;
 import static java.util.concurrent.CompletableFuture.completedFuture;
 
 import java.io.Closeable;
@@ -31,6 +30,7 @@
 import reactor.core.publisher.Mono;
 import io.lettuce.core.Transports.NativeTransports;
 import io.lettuce.core.internal.AsyncCloseable;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.ConnectionWatchdog;
 import io.lettuce.core.resource.ClientResources;
@@ -478,7 +478,7 @@ public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, Tim
                 }
             }
 
-            return allOf(closeFutures.toArray(new CompletableFuture[0]));
+            return Futures.allOf(closeFutures);
         }
 
         return completedFuture(null);
diff --git a/src/main/java/io/lettuce/core/KeyValue.java b/src/main/java/io/lettuce/core/KeyValue.java
index 8cb6e3f3b4..a943d5a484 100644
--- a/src/main/java/io/lettuce/core/KeyValue.java
+++ b/src/main/java/io/lettuce/core/KeyValue.java
@@ -28,6 +28,7 @@
  * @author Will Glozer
  * @author Mark Paluch
  */
+@SuppressWarnings("serial")
 public class KeyValue<K, V> extends Value<V> {
 
     private final K key;
diff --git a/src/main/java/io/lettuce/core/Operators.java b/src/main/java/io/lettuce/core/Operators.java
index 43aee50d8d..6f42927591 100644
--- a/src/main/java/io/lettuce/core/Operators.java
+++ b/src/main/java/io/lettuce/core/Operators.java
@@ -55,7 +55,7 @@ class Operators {
      */
     private static final String KEY_ON_OPERATOR_ERROR = "reactor.onOperatorError.local";
     private static final Field onOperatorErrorHook = findOnOperatorErrorHookField();
-    private static final Supplier queueSupplier = getQueueSupplier();
+    private static final Supplier<Queue<Object>> queueSupplier = getQueueSupplier();
 
     private static Field findOnOperatorErrorHookField() {
 
@@ -80,7 +80,7 @@ private static Field findOnOperatorErrorHookField() {
     private static Supplier<Queue<Object>> getQueueSupplier() {
 
         try {
-            return AccessController.doPrivileged((PrivilegedExceptionAction<Supplier>) () -> {
+            return AccessController.doPrivileged((PrivilegedExceptionAction<Supplier<Queue<Object>>>) () -> {
                 Method unbounded = Queues.class.getMethod("unbounded");
                 return (Supplier) unbounded.invoke(Queues.class);
             });
diff --git a/src/main/java/io/lettuce/core/RedisChannelHandler.java b/src/main/java/io/lettuce/core/RedisChannelHandler.java
index dab47b5a2b..e36f38247b 100644
--- a/src/main/java/io/lettuce/core/RedisChannelHandler.java
+++ b/src/main/java/io/lettuce/core/RedisChannelHandler.java
@@ -46,6 +46,8 @@
 public abstract class RedisChannelHandler<K, V> implements Closeable, ConnectionFacade {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(RedisChannelHandler.class);
+
+    @SuppressWarnings("rawtypes")
     private static final AtomicIntegerFieldUpdater<RedisChannelHandler> CLOSED = AtomicIntegerFieldUpdater.newUpdater(
             RedisChannelHandler.class, "closed");
 
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 5fa8e2feb8..ef73bb1c1d 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -2205,7 +2205,7 @@ public Command<K, V, List<Object>> xpending(K key, K group, Range<String> range,
             args.add(limit.getCount());
         }
 
-        return createCommand(XPENDING, new NestedMultiOutput(codec), args);
+        return createCommand(XPENDING, new NestedMultiOutput<>(codec), args);
     }
 
     public Command<K, V, List<Object>> xpending(K key, Consumer<K> consumer, Range<String> range, Limit limit) {
@@ -2228,7 +2228,7 @@ public Command<K, V, List<Object>> xpending(K key, Consumer<K> consumer, Range<S
 
         args.addKey(consumer.name);
 
-        return createCommand(XPENDING, new NestedMultiOutput(codec), args);
+        return createCommand(XPENDING, new NestedMultiOutput<>(codec), args);
     }
 
     public Command<K, V, List<StreamMessage<K, V>>> xrange(K key, Range<String> range, Limit limit) {
diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index da67ba390c..6e5926e0ff 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -134,12 +134,15 @@ static class RedisSubscription<T> extends StreamingOutput.Subscriber<T> implemen
         static final AtomicLongFieldUpdater<RedisSubscription> DEMAND = AtomicLongFieldUpdater.newUpdater(
                 RedisSubscription.class, "demand");
 
+        @SuppressWarnings({ "rawtypes", "unchecked" })
         static final AtomicReferenceFieldUpdater<RedisSubscription, State> STATE = AtomicReferenceFieldUpdater.newUpdater(
                 RedisSubscription.class, State.class, "state");
 
+        @SuppressWarnings({ "rawtypes", "unchecked" })
         static final AtomicReferenceFieldUpdater<RedisSubscription, CommandDispatch> COMMAND_DISPATCH = AtomicReferenceFieldUpdater
                 .newUpdater(RedisSubscription.class, CommandDispatch.class, "commandDispatch");
 
+        @SuppressWarnings({ "rawtypes", "unchecked" })
         static final AtomicIntegerFieldUpdater<RedisSubscription> COMPLETION = AtomicIntegerFieldUpdater.newUpdater(
                 RedisSubscription.class, "completion");
 
diff --git a/src/main/java/io/lettuce/core/ScanStream.java b/src/main/java/io/lettuce/core/ScanStream.java
index 087d48c929..68356ccaf6 100644
--- a/src/main/java/io/lettuce/core/ScanStream.java
+++ b/src/main/java/io/lettuce/core/ScanStream.java
@@ -256,9 +256,11 @@ private static <V, C extends ScanCursor> void scan(FluxSink<V> sink, Mono<C> ini
      */
     static class SubscriptionAdapter<T, C extends ScanCursor> implements Completable {
 
+        @SuppressWarnings("rawtypes")
         private static final AtomicReferenceFieldUpdater<SubscriptionAdapter, ScanSubscriber> SUBSCRIBER = AtomicReferenceFieldUpdater
                 .newUpdater(SubscriptionAdapter.class, ScanSubscriber.class, "currentSubscription");
 
+        @SuppressWarnings("rawtypes")
         private static final AtomicIntegerFieldUpdater<SubscriptionAdapter> STATUS = AtomicIntegerFieldUpdater.newUpdater(
                 SubscriptionAdapter.class, "status");
 
@@ -402,6 +404,7 @@ protected boolean terminate() {
      */
     static class ScanSubscriber<T, C extends ScanCursor> extends BaseSubscriber<C> {
 
+        @SuppressWarnings("rawtypes")
         private static final AtomicReferenceFieldUpdater<ScanSubscriber, ScanCursor> CURSOR = AtomicReferenceFieldUpdater
                 .newUpdater(ScanSubscriber.class, ScanCursor.class, "cursor");
 
diff --git a/src/main/java/io/lettuce/core/TransactionResult.java b/src/main/java/io/lettuce/core/TransactionResult.java
index ea1a36cd9d..2fc6bd230d 100644
--- a/src/main/java/io/lettuce/core/TransactionResult.java
+++ b/src/main/java/io/lettuce/core/TransactionResult.java
@@ -37,6 +37,7 @@ public interface TransactionResult extends Iterable<Object> {
      * @return {@literal true} if the transaction batch was discarded.
      * @deprecated use renamed method {@link #wasDiscarded()} as Redis has no notion of rollback.
      */
+    @Deprecated
     default boolean wasRolledBack() {
         return wasDiscarded();
     }
diff --git a/src/main/java/io/lettuce/core/Value.java b/src/main/java/io/lettuce/core/Value.java
index 4af59fd84e..483b5860f4 100644
--- a/src/main/java/io/lettuce/core/Value.java
+++ b/src/main/java/io/lettuce/core/Value.java
@@ -36,6 +36,7 @@
  * @param <V> Value type.
  * @author Mark Paluch
  */
+@SuppressWarnings("serial")
 public class Value<V> implements Serializable {
 
     private static final Value<Object> EMPTY = new Value<>(null);
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index 6a3a9328af..4fcc52e14c 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -26,6 +26,7 @@
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.ClusterConnectionProvider.Intent;
 import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.HostAndPort;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.*;
@@ -333,6 +334,7 @@ public void close() {
     }
 
     @Override
+    @SuppressWarnings("rawtypes")
     public CompletableFuture<Void> closeAsync() {
 
         if (closed) {
@@ -352,7 +354,7 @@ public CompletableFuture<Void> closeAsync() {
             clusterConnectionProvider = null;
         }
 
-        return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
+        return Futures.allOf(futures);
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionException.java b/src/main/java/io/lettuce/core/cluster/PartitionException.java
index b22d8dd0bb..9f7db781f0 100644
--- a/src/main/java/io/lettuce/core/cluster/PartitionException.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionException.java
@@ -23,6 +23,7 @@
  * @author Mark Paluch
  * @since 5.1
  */
+@SuppressWarnings("serial")
 public class PartitionException extends RedisException {
 
     /**
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionSelectorException.java b/src/main/java/io/lettuce/core/cluster/PartitionSelectorException.java
index 4383d1553d..8b02cf0419 100644
--- a/src/main/java/io/lettuce/core/cluster/PartitionSelectorException.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionSelectorException.java
@@ -23,6 +23,7 @@
  * @author Mark Paluch
  * @since 5.1
  */
+@SuppressWarnings("serial")
 public class PartitionSelectorException extends PartitionException {
 
     private final Partitions partitions;
diff --git a/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java b/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
index 96c6310510..83486076fa 100644
--- a/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
+++ b/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
@@ -47,7 +47,7 @@ public PipelinedRedisFuture(CompletionStage<V> completionStage, Function<V, V> c
 
     public PipelinedRedisFuture(Map<?, ? extends CompletionStage<?>> executions, Function<PipelinedRedisFuture<V>, V> converter) {
 
-        CompletableFuture.allOf(executions.values().toArray(new CompletableFuture<?>[executions.size()]))
+        CompletableFuture.allOf(executions.values().toArray(new CompletableFuture<?>[0]))
                 .thenRun(() -> complete(converter.apply(this))).exceptionally(throwable -> {
                     completeExceptionally(throwable);
                     return null;
diff --git a/src/main/java/io/lettuce/core/cluster/UnknownPartitionException.java b/src/main/java/io/lettuce/core/cluster/UnknownPartitionException.java
index 4822a2a885..0c5eda07c4 100644
--- a/src/main/java/io/lettuce/core/cluster/UnknownPartitionException.java
+++ b/src/main/java/io/lettuce/core/cluster/UnknownPartitionException.java
@@ -21,6 +21,7 @@
  * @author Mark Paluch
  * @since 5.1
  */
+@SuppressWarnings("serial")
 public class UnknownPartitionException extends PartitionException {
 
     /**
diff --git a/src/main/java/io/lettuce/core/cluster/topology/Connections.java b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
index ba6e4b205f..68943ccd27 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Connections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
@@ -21,6 +21,7 @@
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.Command;
 import io.lettuce.core.protocol.CommandArgs;
@@ -141,7 +142,7 @@ public void close() {
             }
         }
 
-        CompletableFuture.allOf(closeFutures.toArray(new CompletableFuture[0])).join();
+        Futures.allOf(closeFutures).join();
     }
 
     private boolean hasConnections() {
diff --git a/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
index 1dec92f915..8fe3be7083 100644
--- a/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
+++ b/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
@@ -38,7 +38,7 @@ class DefaultMethodParametersAccessor implements MethodParametersAccessor {
     private final Parameters<? extends Parameter> parameters;
     private final List<Object> values;
 
-    public DefaultMethodParametersAccessor(Parameters<? extends Parameter> parameters, Object... values) {
+    DefaultMethodParametersAccessor(Parameters<? extends Parameter> parameters, Object... values) {
 
         LettuceAssert.notNull(parameters, "Parameters must not be null");
         LettuceAssert.notNull(values, "Values must not be null");
@@ -86,7 +86,7 @@ public int resolveParameterIndex(String name) {
         throw new IllegalArgumentException(String.format("Cannot resolve named parameter %s", name));
     }
 
-    public Parameters getParameters() {
+    public Parameters<? extends Parameter> getParameters() {
         return parameters;
     }
 
@@ -107,7 +107,7 @@ public boolean isBindableNullValue(int index) {
     /**
      * Iterator class to allow traversing all bindable parameters inside the accessor.
      */
-    private static class BindableParameterIterator implements Iterator<Object> {
+    static class BindableParameterIterator implements Iterator<Object> {
 
         private final int bindableParameterCount;
         private final DefaultMethodParametersAccessor accessor;
@@ -119,7 +119,7 @@ private static class BindableParameterIterator implements Iterator<Object> {
          *
          * @param accessor must not be {@literal null}.
          */
-        public BindableParameterIterator(DefaultMethodParametersAccessor accessor) {
+        BindableParameterIterator(DefaultMethodParametersAccessor accessor) {
 
             LettuceAssert.notNull(accessor, "ParametersParameterAccessor must not be null!");
 
diff --git a/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java b/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
index ebf2256c29..d3790469ec 100644
--- a/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
@@ -162,7 +162,7 @@ public CompletableFuture<Void> close() {
             connections.remove(connectionKey);
         });
 
-        return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
+        return Futures.allOf(futures);
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/internal/Futures.java b/src/main/java/io/lettuce/core/internal/Futures.java
index 7154d1830a..05fc24f9c9 100644
--- a/src/main/java/io/lettuce/core/internal/Futures.java
+++ b/src/main/java/io/lettuce/core/internal/Futures.java
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.internal;
 
+import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
 
 import io.netty.channel.ChannelFuture;
@@ -32,6 +33,21 @@ private Futures() {
         // no instances allowed
     }
 
+    /**
+     * Create a composite {@link CompletableFuture} is composed from the given {@code futures}.
+     *
+     * @param futures must not be {@literal null}.
+     * @return the composed {@link CompletableFuture}.
+     * @since 5.1.1
+     */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public static CompletableFuture<Void> allOf(Collection<? extends CompletableFuture<?>> futures) {
+
+        LettuceAssert.notNull(futures, "Futures must not be null");
+
+        return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
+    }
+
     /**
      * Create a {@link CompletableFuture} that is completed exceptionally with {@code throwable}.
      *
diff --git a/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java b/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
index 5613de9b56..51c16d1b9c 100644
--- a/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
+++ b/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
@@ -30,10 +30,13 @@
  */
 abstract class CompletableEventLatchSupport<T, V> {
 
-    private final AtomicIntegerFieldUpdater<CompletableEventLatchSupport> NOTIFICATIONS_UPDATER = AtomicIntegerFieldUpdater
+    @SuppressWarnings("rawtypes")
+    private static final AtomicIntegerFieldUpdater<CompletableEventLatchSupport> NOTIFICATIONS_UPDATER = AtomicIntegerFieldUpdater
             .newUpdater(CompletableEventLatchSupport.class, "notifications");
 
-    private final AtomicIntegerFieldUpdater<CompletableEventLatchSupport> GATE_UPDATER = AtomicIntegerFieldUpdater.newUpdater(
+    @SuppressWarnings("rawtypes")
+    private static final AtomicIntegerFieldUpdater<CompletableEventLatchSupport> GATE_UPDATER = AtomicIntegerFieldUpdater
+            .newUpdater(
             CompletableEventLatchSupport.class, "gate");
 
     private static final int GATE_OPEN = 0;
diff --git a/src/main/java/io/lettuce/core/masterslave/Connections.java b/src/main/java/io/lettuce/core/masterslave/Connections.java
index 317941a89f..ed9960ffed 100644
--- a/src/main/java/io/lettuce/core/masterslave/Connections.java
+++ b/src/main/java/io/lettuce/core/masterslave/Connections.java
@@ -28,6 +28,7 @@
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.AsyncCloseable;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.Command;
@@ -144,7 +145,7 @@ public Requests requestPing() {
      */
     public CompletableFuture<Void> closeAsync() {
 
-        List<CompletableFuture> close = new ArrayList<>(this.connections.size());
+        List<CompletableFuture<?>> close = new ArrayList<>(this.connections.size());
         List<RedisURI> toRemove = new ArrayList<>(this.connections.size());
 
         this.closed = true;
@@ -159,6 +160,6 @@ public CompletableFuture<Void> closeAsync() {
             this.connections.remove(redisURI);
         }
 
-        return CompletableFuture.allOf(close.toArray(new CompletableFuture[0]));
+        return Futures.allOf(close);
     }
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
index f08aacc36a..ffe44416d5 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
@@ -29,6 +29,7 @@
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.AsyncCloseable;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceLists;
 import io.lettuce.core.protocol.LettuceCharsets;
 import io.lettuce.core.pubsub.RedisPubSubAdapter;
@@ -110,7 +111,7 @@ public CompletableFuture<Void> closeAsync() {
             pubSubConnections.remove(k);
         });
 
-        CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).whenComplete((aVoid, throwable) -> {
+        Futures.allOf(futures).whenComplete((aVoid, throwable) -> {
 
             if (throwable != null) {
                 closeFuture.completeExceptionally(throwable);
diff --git a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
index 542cc6f9c2..66453b685b 100644
--- a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
@@ -43,6 +43,7 @@
 public class AsyncCommand<K, V, T> extends CompletableFuture<T> implements RedisCommand<K, V, T>, RedisFuture<T>,
         CompleteableCommand<T>, DecoratedCommand<K, V, T> {
 
+    @SuppressWarnings("rawtypes")
     private static final AtomicIntegerFieldUpdater<AsyncCommand> COUNT_UPDATER = AtomicIntegerFieldUpdater.newUpdater(
             AsyncCommand.class, "count");
 
diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgs.java b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
index f2bf1c6748..614c0309f0 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandArgs.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
@@ -104,7 +104,8 @@ public CommandArgs<K, V> addKeys(Iterable<K> keys) {
      * @param keys must not be {@literal null}.
      * @return the command args.
      */
-    public CommandArgs<K, V> addKeys(K... keys) {
+    @SafeVarargs
+    public final CommandArgs<K, V> addKeys(K... keys) {
 
         LettuceAssert.notNull(keys, "Keys must not be null");
 
@@ -148,7 +149,8 @@ public CommandArgs<K, V> addValues(Iterable<V> values) {
      * @param values must not be {@literal null}.
      * @return the command args.
      */
-    public CommandArgs<K, V> addValues(V... values) {
+    @SafeVarargs
+    public final CommandArgs<K, V> addValues(V... values) {
 
         LettuceAssert.notNull(values, "Values must not be null");
 
@@ -644,6 +646,7 @@ static <K, V> KeyArgument<K, V> of(K key, RedisCodec<K, V> codec) {
             return new KeyArgument<>(key, codec);
         }
 
+        @SuppressWarnings("unchecked")
         @Override
         void encode(ByteBuf target) {
 
@@ -682,6 +685,7 @@ static <K, V> ValueArgument<K, V> of(V val, RedisCodec<K, V> codec) {
             return new ValueArgument<>(val, codec);
         }
 
+        @SuppressWarnings("unchecked")
         @Override
         void encode(ByteBuf target) {
 
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 23aca12d85..73b671a818 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -32,10 +32,9 @@
 import io.lettuce.core.internal.LettuceSets;
 import io.lettuce.core.output.CommandOutput;
 import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.tracing.TraceContext;
 import io.lettuce.core.tracing.Tracer;
 import io.lettuce.core.tracing.Tracing;
-import io.lettuce.core.tracing.TraceContext;
-import io.lettuce.core.tracing.TraceContextProvider;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.*;
 import io.netty.channel.local.LocalAddress;
@@ -378,7 +377,7 @@ private void writeSingleCommand(ChannelHandlerContext ctx, RedisCommand<?, ?, ?>
 
         if (tracingEnabled && command instanceof CompleteableCommand) {
 
-            TracedCommand provider = CommandWrapper.unwrap(command, TracedCommand.class);
+            TracedCommand<?, ?, ?> provider = CommandWrapper.unwrap(command, TracedCommand.class);
             Tracer tracer = clientResources.tracing().getTracerProvider().getTracer();
             TraceContext context = (provider == null ? clientResources.tracing().initialTraceContextProvider() : provider)
                     .getTraceContext();
@@ -875,7 +874,7 @@ protected AddToStack newObject(Handle<AddToStack> handle) {
         };
 
         private final Recycler.Handle<AddToStack> handle;
-        private ArrayDeque stack;
+        private ArrayDeque<Object> stack;
         private RedisCommand<?, ?, ?> command;
 
         AddToStack(Recycler.Handle<AddToStack> handle) {
@@ -889,11 +888,12 @@ protected AddToStack newObject(Handle<AddToStack> handle) {
          * @param command
          * @return
          */
-        static AddToStack newInstance(ArrayDeque stack, RedisCommand<?, ?, ?> command) {
+        @SuppressWarnings("unchecked")
+        static AddToStack newInstance(ArrayDeque<?> stack, RedisCommand<?, ?, ?> command) {
 
             AddToStack entry = RECYCLER.get();
 
-            entry.stack = stack;
+            entry.stack = (ArrayDeque<Object>) stack;
             entry.command = command;
 
             return entry;
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index ba14f841d5..c6461ce06c 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -929,8 +929,9 @@ private void potentiallyRequeueCommands(Channel channel, RedisCommand<?, ?, ?> s
             }
         }
 
-        @SuppressWarnings("unchecked")
-        private void requeueCommands(RedisCommand<?, ?, ?> sentCommand, Collection sentCommands, DefaultEndpoint endpoint) {
+        @SuppressWarnings({ "unchecked", "rawtypes" })
+        private void requeueCommands(RedisCommand<?, ?, ?> sentCommand,
+                Collection<? extends RedisCommand<?, ?, ?>> sentCommands, DefaultEndpoint endpoint) {
 
             if (sentCommand != null) {
                 try {
@@ -940,9 +941,9 @@ private void requeueCommands(RedisCommand<?, ?, ?> sentCommand, Collection sentC
                 }
             } else {
                 try {
-                    endpoint.write(sentCommands);
+                    endpoint.write((Collection) sentCommands);
                 } catch (Exception e) {
-                    for (RedisCommand<?, ?, ?> command : (Collection<RedisCommand>) sentCommands) {
+                    for (RedisCommand<?, ?, ?> command : sentCommands) {
                         command.completeExceptionally(e);
                     }
                 }
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
index d816f6d5da..cffeb4f88b 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
@@ -149,7 +149,7 @@ protected void complete(RedisCommand<?, ?, ?> command) {
      * @param replay
      * @return
      */
-    private static boolean isPubSubMessage(ResponseHeaderReplayOutput replay) {
+    private static boolean isPubSubMessage(ResponseHeaderReplayOutput<?, ?> replay) {
 
         if (replay == null) {
             return false;
diff --git a/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java
index 38001f09af..f9b6f4b88e 100644
--- a/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java
+++ b/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java
@@ -135,7 +135,7 @@ public CompletableFuture<Void> release(T object) {
             }
         };
 
-        poolRef.set(new AsyncPoolWrapper(pool));
+        poolRef.set(new AsyncPoolWrapper<>(pool));
 
         return pool;
     }
diff --git a/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java b/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java
index 4de5a4101a..fa9beadd26 100644
--- a/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java
+++ b/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java
@@ -354,7 +354,7 @@ public CompletableFuture<Void> clearAsync() {
             futures.add(factory.destroy(cached));
         }
 
-        return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
+        return Futures.allOf(futures);
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java b/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
index 5c8fe97c68..539ec73084 100644
--- a/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
+++ b/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
@@ -23,6 +23,7 @@
  * Utility class to adapt Commons Pool 2 configuration to {@link BoundedPoolConfig}.
  *
  * @author Mark Paluch
+ * @since 5.1
  */
 public class CommonsPool2ConfigConverter {
 
@@ -36,7 +37,7 @@ private CommonsPool2ConfigConverter() {
      * @param config must not be {@literal null}.
      * @return the converted {@link BoundedPoolConfig}.
      */
-    public static BoundedPoolConfig bounded(GenericObjectPoolConfig config) {
+    public static BoundedPoolConfig bounded(GenericObjectPoolConfig<?> config) {
 
         LettuceAssert.notNull(config, "GenericObjectPoolConfig must not be null");
 
diff --git a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
index 5a1d6fc7c2..e688ac7ad0 100644
--- a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
+++ b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
@@ -90,7 +90,7 @@ private ConnectionPoolSupport() {
      * @return the connection pool.
      */
     public static <T extends StatefulConnection<?, ?>> GenericObjectPool<T> createGenericObjectPool(
-            Supplier<T> connectionSupplier, GenericObjectPoolConfig config) {
+            Supplier<T> connectionSupplier, GenericObjectPoolConfig<T> config) {
         return createGenericObjectPool(connectionSupplier, config, true);
     }
 
@@ -107,7 +107,7 @@ private ConnectionPoolSupport() {
      */
     @SuppressWarnings("unchecked")
     public static <T extends StatefulConnection<?, ?>> GenericObjectPool<T> createGenericObjectPool(
-            Supplier<T> connectionSupplier, GenericObjectPoolConfig config, boolean wrapConnections) {
+            Supplier<T> connectionSupplier, GenericObjectPoolConfig<T> config, boolean wrapConnections) {
 
         LettuceAssert.notNull(connectionSupplier, "Connection supplier must not be null");
         LettuceAssert.notNull(config, "GenericObjectPoolConfig must not be null");
diff --git a/src/main/java/io/lettuce/core/support/ConnectionWrapping.java b/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
index 25a924598c..79a19f35b4 100644
--- a/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
+++ b/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
@@ -127,7 +127,7 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
             }
         }
 
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings({ "unchecked", "rawtypes" })
         private Object getInnerProxy(Method method, Object[] args) {
 
             try {
@@ -156,6 +156,7 @@ public T getConnection() {
      * @param <T> Connection type.
      * @since 4.3
      */
+    @SuppressWarnings("try")
     static class DelegateCloseToConnectionInvocationHandler<T extends AsyncCloseable & AutoCloseable> extends
             AbstractInvocationHandler {
 
@@ -183,7 +184,7 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
                     return null;
                 }
 
-                if (method.getName().equals("close")) {
+                if (method.getName().equals("closeAsync")) {
                     return proxiedConnection.closeAsync();
                 }
 
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
index 4658768aac..ad7fc15614 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
@@ -25,6 +25,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import org.junit.*;
@@ -539,7 +540,7 @@ private void shiftAllSlotsToNode1() {
 
         RedisClusterNode redis2Partition = getOwnPartition(redis2);
 
-        Wait.untilTrue(new Wait.Supplier<Boolean>() {
+        Wait.untilTrue(new Supplier<Boolean>() {
             @Override
             public Boolean get() {
                 Partitions partitions = ClusterPartitionParser.parse(redis1.clusterNodes());
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
index 36f27b6c0c..0809fd897b 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
@@ -229,7 +229,7 @@ void adaptiveTopologyUpdateIsRateLimited() {
         clusterClient.getPartitions().clear();
         clusterConnection.quit();
 
-        Delay.delay(Duration.ofMillis(1000));
+        Delay.delay(Duration.ofMillis(200));
 
         assertThat(clusterClient.getPartitions()).isEmpty();
 
@@ -248,7 +248,7 @@ void adaptiveTopologyUpdatetUsesTimeout() {
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
 
         clusterConnection.quit();
-        Delay.delay(Duration.ofMillis(1000));
+        Delay.delay(Duration.ofMillis(200));
 
         Wait.untilTrue(() -> {
             return !clusterClient.getPartitions().isEmpty();
@@ -308,12 +308,8 @@ void adaptiveTriggerOnMoveRedirection() {
 
         clusterConnection.set("b", value); // slot 3300
 
-        Wait.untilEquals(12000, new Wait.Supplier<Integer>() {
-            @Override
-            public Integer get() {
-                return clusterClient.getPartitions().getPartitionByNodeId(node1.getNodeId()).getSlots().size();
-            }
-        }).waitOrTimeout();
+        Wait.untilEquals(12000, () -> clusterClient.getPartitions().getPartitionByNodeId(node1.getNodeId()).getSlots().size())
+                .waitOrTimeout();
 
         assertThat(clusterClient.getPartitions().getPartitionByNodeId(node1.getNodeId()).getSlots()).hasSize(12000);
         assertThat(clusterClient.getPartitions().getPartitionByNodeId(node2.getNodeId()).getSlots()).hasSize(4384);
diff --git a/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java
index f50edc1274..1b5ab0429d 100644
--- a/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java
@@ -77,7 +77,7 @@ static void afterClass() {
     void genericPoolShouldWorkWithWrappedConnections() throws Exception {
 
         GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
-                () -> client.connect(), new GenericObjectPoolConfig());
+                () -> client.connect(), new GenericObjectPoolConfig<>());
 
         borrowAndReturn(pool);
         borrowAndClose(pool);
@@ -98,7 +98,7 @@ void genericPoolShouldWorkWithWrappedConnections() throws Exception {
     @Test
     void genericPoolShouldCloseConnectionsAboveMaxIdleSize() throws Exception {
 
-        GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
+        GenericObjectPoolConfig<StatefulRedisConnection<String, String>> poolConfig = new GenericObjectPoolConfig<>();
         poolConfig.setMaxIdle(2);
 
         GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
@@ -131,7 +131,7 @@ void genericPoolShouldCloseConnectionsAboveMaxIdleSize() throws Exception {
     void genericPoolShouldWorkWithPlainConnections() throws Exception {
 
         GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
-                () -> client.connect(), new GenericObjectPoolConfig(), false);
+                () -> client.connect(), new GenericObjectPoolConfig<>(), false);
 
         borrowAndReturn(pool);
 
@@ -162,7 +162,7 @@ void softReferencePoolShouldWorkWithPlainConnections() throws Exception {
     void genericPoolUsingWrappingShouldPropagateExceptionsCorrectly() throws Exception {
 
         GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
-                () -> client.connect(), new GenericObjectPoolConfig());
+                () -> client.connect(), new GenericObjectPoolConfig<>());
 
         StatefulRedisConnection<String, String> connection = pool.borrowObject();
         RedisCommands<String, String> sync = connection.sync();
@@ -183,7 +183,7 @@ void genericPoolUsingWrappingShouldPropagateExceptionsCorrectly() throws Excepti
     void wrappedConnectionShouldUseWrappers() throws Exception {
 
         GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
-                () -> client.connect(), new GenericObjectPoolConfig());
+                () -> client.connect(), new GenericObjectPoolConfig<>());
 
         StatefulRedisConnection<String, String> connection = pool.borrowObject();
         RedisCommands<String, String> sync = connection.sync();
@@ -208,7 +208,7 @@ void wrappedMasterSlaveConnectionShouldUseWrappers() throws Exception {
 
         GenericObjectPool<StatefulRedisMasterSlaveConnection<String, String>> pool = ConnectionPoolSupport
                 .createGenericObjectPool(() -> MasterSlave.connect(client, new StringCodec(), RedisURI.create(host, port)),
-                        new GenericObjectPoolConfig());
+                        new GenericObjectPoolConfig<>());
 
         StatefulRedisMasterSlaveConnection<String, String> connection = pool.borrowObject();
         RedisCommands<String, String> sync = connection.sync();
@@ -234,7 +234,7 @@ void wrappedClusterConnectionShouldUseWrappers() throws Exception {
                 RedisURI.create(TestSettings.host(), 7379));
 
         GenericObjectPool<StatefulRedisClusterConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
-                redisClusterClient::connect, new GenericObjectPoolConfig());
+                redisClusterClient::connect, new GenericObjectPoolConfig<>());
 
         StatefulRedisClusterConnection<String, String> connection = pool.borrowObject();
         RedisAdvancedClusterCommands<String, String> sync = connection.sync();
@@ -261,7 +261,7 @@ void wrappedClusterConnectionShouldUseWrappers() throws Exception {
     void plainConnectionShouldNotUseWrappers() throws Exception {
 
         GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
-                () -> client.connect(), new GenericObjectPoolConfig(), false);
+                () -> client.connect(), new GenericObjectPoolConfig<>(), false);
 
         StatefulRedisConnection<String, String> connection = pool.borrowObject();
         RedisCommands<String, String> sync = connection.sync();
@@ -306,7 +306,7 @@ void softRefPoolShouldWorkWithWrappedConnections() throws Exception {
     void wrappedObjectClosedAfterReturn() throws Exception {
 
         GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
-                () -> client.connect(), new GenericObjectPoolConfig(), true);
+                () -> client.connect(), new GenericObjectPoolConfig<>(), true);
 
         StatefulRedisConnection<String, String> connection = pool.borrowObject();
         RedisCommands<String, String> sync = connection.sync();
@@ -328,7 +328,7 @@ void wrappedObjectClosedAfterReturn() throws Exception {
     void tryWithResourcesReturnsConnectionToPool() throws Exception {
 
         GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
-                () -> client.connect(), new GenericObjectPoolConfig());
+                () -> client.connect(), new GenericObjectPoolConfig<>());
 
         StatefulRedisConnection<String, String> usedConnection = null;
         try (StatefulRedisConnection<String, String> connection = pool.borrowObject()) {
diff --git a/src/test/java/io/lettuce/test/Wait.java b/src/test/java/io/lettuce/test/Wait.java
index 1aedb09791..cf2776a49d 100644
--- a/src/test/java/io/lettuce/test/Wait.java
+++ b/src/test/java/io/lettuce/test/Wait.java
@@ -19,6 +19,7 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 
 import com.google.code.tempusfugit.temporal.Duration;
 import com.google.code.tempusfugit.temporal.Sleeper;
@@ -168,12 +169,6 @@ public interface VoidWaitCondition {
         void test();
     }
 
-    @FunctionalInterface
-    public interface Supplier<T> {
-
-        T get();
-    }
-
     public static class WaitBuilder<T> {
 
         private Duration duration = Duration.seconds(10);

From 6eaa85d5ca602e9e05ddf69e07ff365f9f4cf020 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 22 Sep 2018 15:34:47 -0400
Subject: [PATCH 527/808] Migrate Sentinel tests to JUnit 5 #430

---
 .../io/lettuce/core/ProtectedModeTests.java   |   2 +-
 ... => UnixDomainSocketIntegrationTests.java} |  32 +-
 .../TopologyRefreshIntegrationTests.java      |   2 +-
 ...RedisCommandsClusterIntegrationTests.java} |  50 +--
 ... MasterSlaveSentinelIntegrationTests.java} |  74 ++--
 .../core/protocol/ConnectionFailureTest.java  |   2 +-
 .../core/sentinel/AbstractSentinelTest.java   |  53 ---
 ...a => SentinelCommandIntegrationTests.java} | 151 +++-----
 ...> SentinelConnectionIntegrationTests.java} |  70 ++--
 .../lettuce/core/sentinel/SentinelRule.java   | 356 ------------------
 ...entinelServerCommandIntegrationTests.java} |  54 +--
 .../core/sentinel/SentinelTestSettings.java   |  33 ++
 .../reactive/SentinelReactiveCommandTest.java |  34 +-
 .../SentinelServerReactiveCommandTest.java    |  34 +-
 .../{core => test}/server/MockTcpServer.java  |   2 +-
 .../server/RandomResponseServer.java          |   2 +-
 .../server/RandomServerHandler.java           |   2 +-
 17 files changed, 256 insertions(+), 697 deletions(-)
 rename src/test/java/io/lettuce/core/{UnixDomainSocketTest.java => UnixDomainSocketIntegrationTests.java} (88%)
 rename src/test/java/io/lettuce/core/dynamic/{RedisCommandsClusterSyncTest.java => RedisCommandsClusterIntegrationTests.java} (66%)
 rename src/test/java/io/lettuce/core/masterslave/{MasterSlaveSentinelTest.java => MasterSlaveSentinelIntegrationTests.java} (66%)
 delete mode 100644 src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java
 rename src/test/java/io/lettuce/core/sentinel/{SentinelCommandTest.java => SentinelCommandIntegrationTests.java} (51%)
 rename src/test/java/io/lettuce/core/sentinel/{SentinelConnectionTest.java => SentinelConnectionIntegrationTests.java} (72%)
 delete mode 100644 src/test/java/io/lettuce/core/sentinel/SentinelRule.java
 rename src/test/java/io/lettuce/core/sentinel/{SentinelServerCommandTest.java => SentinelServerCommandIntegrationTests.java} (68%)
 create mode 100644 src/test/java/io/lettuce/core/sentinel/SentinelTestSettings.java
 rename src/test/java/io/lettuce/{core => test}/server/MockTcpServer.java (98%)
 rename src/test/java/io/lettuce/{core => test}/server/RandomResponseServer.java (96%)
 rename src/test/java/io/lettuce/{core => test}/server/RandomServerHandler.java (98%)

diff --git a/src/test/java/io/lettuce/core/ProtectedModeTests.java b/src/test/java/io/lettuce/core/ProtectedModeTests.java
index ea0fdedf28..5910f04d35 100644
--- a/src/test/java/io/lettuce/core/ProtectedModeTests.java
+++ b/src/test/java/io/lettuce/core/ProtectedModeTests.java
@@ -27,10 +27,10 @@
 import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.api.StatefulRedisConnection;
-import io.lettuce.core.server.MockTcpServer;
 import io.lettuce.test.Wait;
 import io.lettuce.test.resource.FastShutdown;
 import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.server.MockTcpServer;
 import io.lettuce.test.settings.TestSettings;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/src/test/java/io/lettuce/core/UnixDomainSocketTest.java b/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java
similarity index 88%
rename from src/test/java/io/lettuce/core/UnixDomainSocketTest.java
rename to src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java
index 61aea833e1..bb256baeab 100644
--- a/src/test/java/io/lettuce/core/UnixDomainSocketTest.java
+++ b/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java
@@ -25,14 +25,12 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.sentinel.SentinelRule;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 import io.lettuce.test.resource.FastShutdown;
 import io.lettuce.test.resource.TestClientResources;
@@ -42,31 +40,28 @@
 /**
  * @author Mark Paluch
  */
-public class UnixDomainSocketTest {
+class UnixDomainSocketIntegrationTests {
 
     private static final String MASTER_ID = "mymaster";
 
     private static RedisClient sentinelClient;
 
-    @Rule
-    public SentinelRule sentinelRule = new SentinelRule(sentinelClient, false, 26379, 26380);
-
     private Logger log = LogManager.getLogger(getClass());
     private String key = "key";
     private String value = "value";
 
-    @BeforeClass
-    public static void setupClient() {
+    @BeforeAll
+    static void setupClient() {
         sentinelClient = getRedisSentinelClient();
     }
 
-    @AfterClass
-    public static void shutdownClient() {
+    @AfterAll
+    static void shutdownClient() {
         FastShutdown.shutdown(sentinelClient);
     }
 
     @Test
-    public void standalone_RedisClientWithSocket() throws Exception {
+    void standalone_RedisClientWithSocket() throws Exception {
 
         assumeTestSupported();
 
@@ -82,7 +77,7 @@ public void standalone_RedisClientWithSocket() throws Exception {
     }
 
     @Test
-    public void standalone_ConnectToSocket() throws Exception {
+    void standalone_ConnectToSocket() throws Exception {
 
         assumeTestSupported();
 
@@ -99,7 +94,7 @@ public void standalone_ConnectToSocket() throws Exception {
     }
 
     @Test
-    public void sentinel_RedisClientWithSocket() throws Exception {
+    void sentinel_RedisClientWithSocket() throws Exception {
 
         assumeTestSupported();
 
@@ -124,7 +119,7 @@ public void sentinel_RedisClientWithSocket() throws Exception {
     }
 
     @Test
-    public void sentinel_ConnectToSocket() throws Exception {
+    void sentinel_ConnectToSocket() throws Exception {
 
         assumeTestSupported();
 
@@ -149,9 +144,8 @@ public void sentinel_ConnectToSocket() throws Exception {
     }
 
     @Test
-    public void sentinel_socket_and_inet() throws Exception {
+    void sentinel_socket_and_inet() throws Exception {
 
-        sentinelRule.waitForMaster(MASTER_ID);
         assumeTestSupported();
 
         RedisURI uri = new RedisURI();
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
index 0809fd897b..f656d3b2e8 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
@@ -248,7 +248,7 @@ void adaptiveTopologyUpdatetUsesTimeout() {
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
 
         clusterConnection.quit();
-        Delay.delay(Duration.ofMillis(200));
+        Delay.delay(Duration.ofMillis(700));
 
         Wait.untilTrue(() -> {
             return !clusterClient.getPartitions().isEmpty();
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java
similarity index 66%
rename from src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
rename to src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java
index 734e0db466..1816dd3ccc 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterSyncTest.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java
@@ -20,56 +20,30 @@
 import java.time.Duration;
 import java.util.List;
 
-import org.junit.*;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.core.RedisURI;
 import io.lettuce.core.TestSupport;
 import io.lettuce.core.Value;
-import io.lettuce.core.cluster.ClusterRule;
-import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.dynamic.annotation.Command;
 import io.lettuce.core.dynamic.domain.Timeout;
-import io.lettuce.core.internal.LettuceLists;
-import io.lettuce.test.resource.FastShutdown;
-import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Mark Paluch
  */
-public class RedisCommandsClusterSyncTest extends TestSupport {
-
-    private static final int port1 = 7379;
-    private static final int port2 = port1 + 1;
-    private static final int port3 = port1 + 2;
-    private static final int port4 = port1 + 3;
-
-    private static RedisClusterClient clusterClient;
-
-    @Rule
-    public ClusterRule clusterRule = new ClusterRule(clusterClient, port1, port2, port3, port4);
-
-    private StatefulRedisClusterConnection<String, String> connection;
+@ExtendWith(LettuceExtension.class)
+public class RedisCommandsClusterIntegrationTests extends TestSupport {
 
-    @BeforeClass
-    public static void setupClusterClient() {
-        clusterClient = RedisClusterClient.create(TestClientResources.get(),
-                LettuceLists.unmodifiableList(RedisURI.Builder.redis(host, port1).build()));
-    }
-
-    @AfterClass
-    public static void shutdownClusterClient() {
-        FastShutdown.shutdown(clusterClient);
-    }
-
-    @Before
-    public void before() {
-        connection = clusterClient.connect();
-    }
+    private final StatefulRedisClusterConnection<String, String> connection;
 
-    @After
-    public void tearDown() {
-        connection.close();
+    @Inject
+    public RedisCommandsClusterIntegrationTests(StatefulRedisClusterConnection<String, String> connection) {
+        this.connection = connection;
+        this.connection.sync().flushall();
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
similarity index 66%
rename from src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
rename to src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
index 7c834564e5..036e17d423 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
@@ -16,7 +16,6 @@
 package io.lettuce.core.masterslave;
 
 import static io.lettuce.core.masterslave.MasterSlaveTest.slaveCall;
-import static io.lettuce.test.settings.TestSettings.port;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 
@@ -24,49 +23,39 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import io.lettuce.core.ReadFrom;
-import io.lettuce.core.RedisClient;
-import io.lettuce.core.RedisConnectionException;
-import io.lettuce.core.RedisURI;
+import io.lettuce.core.*;
 import io.lettuce.core.codec.Utf8StringCodec;
-import io.lettuce.core.sentinel.AbstractSentinelTest;
-import io.lettuce.core.sentinel.SentinelRule;
-import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.core.sentinel.SentinelTestSettings;
+import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.settings.TestSettings;
 import io.netty.channel.group.ChannelGroup;
 
 /**
  * @author Mark Paluch
  */
-public class MasterSlaveSentinelTest extends AbstractSentinelTest {
-
-    static {
-        sentinelClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder
-                .sentinel(TestSettings.host(), MASTER_ID).build());
-    }
-
-    @Rule
-    public SentinelRule sentinelRule = new SentinelRule(sentinelClient, false, 26379, 26380);
+@ExtendWith(LettuceExtension.class)
+class MasterSlaveSentinelIntegrationTests extends TestSupport {
 
-    private RedisURI sentinelUri = RedisURI.Builder.sentinel(TestSettings.host(), 26379, MASTER_ID).build();
-    private Pattern pattern = Pattern.compile("role:(\\w+)");
+    private final Pattern pattern = Pattern.compile("role:(\\w+)");
+    private final RedisClient redisClient;
 
-    @Before
-    public void before() {
-        sentinelRule.needMasterWithSlave(MASTER_ID, port(3), port(4));
+    @Inject
+    MasterSlaveSentinelIntegrationTests(RedisClient redisClient) {
+        this.redisClient = redisClient;
     }
 
     @Test
-    public void testMasterSlaveSentinelBasic() {
+    void testMasterSlaveSentinelBasic() {
 
         RedisURI uri = RedisURI
                 .create("redis-sentinel://127.0.0.1:21379,127.0.0.1:22379,127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
-        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(sentinelClient,
+        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient,
                 new Utf8StringCodec(), uri);
 
         connection.setReadFrom(ReadFrom.MASTER);
@@ -77,11 +66,12 @@ public void testMasterSlaveSentinelBasic() {
     }
 
     @Test
-    public void masterSlaveConnectionShouldSetClientName() {
+    void masterSlaveConnectionShouldSetClientName() {
 
-        RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).withClientName("my-client").build();
+        RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), SentinelTestSettings.MASTER_ID)
+                .withClientName("my-client").build();
 
-        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(sentinelClient,
+        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient,
                 new Utf8StringCodec(), redisURI);
 
         assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
@@ -92,11 +82,11 @@ public void masterSlaveConnectionShouldSetClientName() {
     }
 
     @Test
-    public void testMasterSlaveSentinelWithTwoUnavailableSentinels() {
+    void testMasterSlaveSentinelWithTwoUnavailableSentinels() {
 
         RedisURI uri = RedisURI
                 .create("redis-sentinel://127.0.0.1:21379,127.0.0.1:22379,127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
-        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(sentinelClient,
+        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient,
                 new Utf8StringCodec(), uri);
 
         connection.setReadFrom(ReadFrom.MASTER);
@@ -107,12 +97,12 @@ public void testMasterSlaveSentinelWithTwoUnavailableSentinels() {
     }
 
     @Test
-    public void testMasterSlaveSentinelWithUnavailableSentinels() {
+    void testMasterSlaveSentinelWithUnavailableSentinels() {
 
         RedisURI uri = RedisURI.create("redis-sentinel://127.0.0.1:21379,127.0.0.1:21379?sentinelMasterId=mymaster&timeout=5s");
 
         try {
-            MasterSlave.connect(sentinelClient, new Utf8StringCodec(), uri);
+            MasterSlave.connect(redisClient, new Utf8StringCodec(), uri);
             fail("Missing RedisConnectionException");
         } catch (RedisConnectionException e) {
             assertThat(e.getCause()).hasRootCauseInstanceOf(IOException.class);
@@ -120,13 +110,13 @@ public void testMasterSlaveSentinelWithUnavailableSentinels() {
     }
 
     @Test
-    public void testMasterSlaveSentinelConnectionCount() {
+    void testMasterSlaveSentinelConnectionCount() {
 
-        ChannelGroup channels = (ChannelGroup) ReflectionTestUtils.getField(sentinelClient, "channels");
+        ChannelGroup channels = (ChannelGroup) ReflectionTestUtils.getField(redisClient, "channels");
         int count = channels.size();
 
-        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(sentinelClient,
-                new Utf8StringCodec(), sentinelUri);
+        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient, new Utf8StringCodec(),
+                SentinelTestSettings.SENTINEL_URI);
 
         connection.sync().ping();
         connection.setReadFrom(ReadFrom.SLAVE);
@@ -138,13 +128,13 @@ public void testMasterSlaveSentinelConnectionCount() {
     }
 
     @Test
-    public void testMasterSlaveSentinelClosesSentinelConnections() {
+    void testMasterSlaveSentinelClosesSentinelConnections() {
 
-        ChannelGroup channels = (ChannelGroup) ReflectionTestUtils.getField(sentinelClient, "channels");
+        ChannelGroup channels = (ChannelGroup) ReflectionTestUtils.getField(redisClient, "channels");
         int count = channels.size();
 
-        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(sentinelClient,
-                new Utf8StringCodec(), sentinelUri);
+        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient, new Utf8StringCodec(),
+                SentinelTestSettings.SENTINEL_URI);
 
         connection.sync().ping();
         connection.setReadFrom(ReadFrom.SLAVE);
diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
index 57e97ea46e..71e608e935 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
@@ -30,11 +30,11 @@
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
-import io.lettuce.core.server.RandomResponseServer;
 import io.lettuce.test.ConnectionTestUtil;
 import io.lettuce.test.Delay;
 import io.lettuce.test.Futures;
 import io.lettuce.test.Wait;
+import io.lettuce.test.server.RandomResponseServer;
 import io.lettuce.test.settings.TestSettings;
 
 /**
diff --git a/src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java b/src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java
deleted file mode 100644
index dfbed96f1f..0000000000
--- a/src/test/java/io/lettuce/core/sentinel/AbstractSentinelTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.sentinel;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.jupiter.api.AfterEach;
-
-import io.lettuce.core.RedisClient;
-import io.lettuce.core.TestSupport;
-import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
-import io.lettuce.test.resource.FastShutdown;
-
-/**
- * @author Mark Paluch
- */
-public abstract class AbstractSentinelTest extends TestSupport {
-
-    protected static final String MASTER_ID = "mymaster";
-
-    protected static RedisClient sentinelClient;
-    protected RedisSentinelCommands<String, String> sentinel;
-
-    @AfterClass
-    public static void shutdownClient() {
-        FastShutdown.shutdown(sentinelClient);
-    }
-
-    @Before
-    public void openConnection() throws Exception {
-        sentinel = sentinelClient.connectSentinel().sync();
-    }
-
-    @AfterEach
-    public void closeConnection() {
-        if (sentinel != null) {
-            sentinel.getStatefulConnection().close();
-        }
-    }
-}
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java
similarity index 51%
rename from src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
rename to src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java
index dfbebf7781..7784024cc0 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java
@@ -17,77 +17,83 @@
 
 import static io.lettuce.test.settings.TestSettings.hostAddr;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisConnectionException;
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
-import io.lettuce.test.Delay;
+import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
-import io.lettuce.test.resource.DefaultRedisClient;
-import io.lettuce.test.resource.FastShutdown;
-import io.lettuce.test.resource.TestClientResources;
 import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class SentinelCommandTest extends AbstractSentinelTest {
+@ExtendWith(LettuceExtension.class)
+public class SentinelCommandIntegrationTests extends TestSupport {
 
-    @Rule
-    public SentinelRule sentinelRule = new SentinelRule(sentinelClient, false, 26379, 26380);
+    private final RedisClient redisClient;
+    private StatefulRedisSentinelConnection<String, String> connection;
+    private RedisSentinelCommands<String, String> sentinel;
 
-    @BeforeClass
-    public static void setupClient() {
-        sentinelClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder
-                .sentinel(TestSettings.host(), MASTER_ID).build());
+    @Inject
+    public SentinelCommandIntegrationTests(RedisClient redisClient) {
+        this.redisClient = redisClient;
     }
 
-    @Before
-    public void openConnection() throws Exception {
-        super.openConnection();
+    @BeforeEach
+    void before() {
 
-        try {
-            sentinel.master(MASTER_ID);
-        } catch (Exception e) {
-            sentinelRule.monitor(MASTER_ID, hostAddr(), TestSettings.port(3), 1, true);
-        }
+        this.connection = this.redisClient.connectSentinel(SentinelTestSettings.SENTINEL_URI);
+        this.sentinel = getSyncConnection(this.connection);
+    }
+
+    protected RedisSentinelCommands<String, String> getSyncConnection(StatefulRedisSentinelConnection<String, String> connection) {
+        return connection.sync();
+    }
+
+    @AfterEach
+    void after() {
+        this.connection.close();
     }
 
     @Test
-    public void getMasterAddr() {
-        SocketAddress result = sentinel.getMasterAddrByName(MASTER_ID);
+    void getMasterAddr() {
+        SocketAddress result = sentinel.getMasterAddrByName(SentinelTestSettings.MASTER_ID);
         InetSocketAddress socketAddress = (InetSocketAddress) result;
         assertThat(socketAddress.getHostName()).contains(TestSettings.hostAddr());
     }
 
     @Test
-    public void getMasterAddrButNoMasterPresent() {
+    void getMasterAddrButNoMasterPresent() {
         InetSocketAddress socketAddress = (InetSocketAddress) sentinel.getMasterAddrByName("unknown");
         assertThat(socketAddress).isNull();
     }
 
     @Test
-    public void getMasterAddrByName() {
-        InetSocketAddress socketAddress = (InetSocketAddress) sentinel.getMasterAddrByName(MASTER_ID);
+    void getMasterAddrByName() {
+        InetSocketAddress socketAddress = (InetSocketAddress) sentinel.getMasterAddrByName(SentinelTestSettings.MASTER_ID);
         assertThat(socketAddress.getPort()).isBetween(6479, 6485);
     }
 
     @Test
-    public void masters() {
+    void masters() {
 
         List<Map<String, String>> result = sentinel.masters();
 
@@ -100,17 +106,17 @@ public void masters() {
     }
 
     @Test
-    public void sentinelConnectWith() {
+    void sentinelConnectWith() {
 
-        RedisClient client = RedisClient.create(TestClientResources.get(),
-                RedisURI.Builder.sentinel(TestSettings.host(), 1234, MASTER_ID).withSentinel(TestSettings.host()).build());
+        RedisURI uri = RedisURI.Builder.sentinel(TestSettings.host(), 1234, SentinelTestSettings.MASTER_ID)
+                .withSentinel(TestSettings.host()).build();
 
-        RedisSentinelCommands<String, String> sentinelConnection = client.connectSentinel().sync();
+        RedisSentinelCommands<String, String> sentinelConnection = this.redisClient.connectSentinel(uri).sync();
         assertThat(sentinelConnection.ping()).isEqualTo("PONG");
 
         sentinelConnection.getStatefulConnection().close();
 
-        RedisCommands<String, String> connection2 = client.connect().sync();
+        RedisCommands<String, String> connection2 = this.redisClient.connect(uri).sync();
         assertThat(connection2.ping()).isEqualTo("PONG");
         connection2.quit();
 
@@ -118,47 +124,29 @@ public void sentinelConnectWith() {
 
         assertThat(connection2.ping()).isEqualTo("PONG");
         connection2.getStatefulConnection().close();
-        FastShutdown.shutdown(client);
     }
 
     @Test
-    public void sentinelConnectWrongMaster() {
+    void sentinelConnectWrongMaster() {
 
-        RedisClient client = RedisClient.create(TestClientResources.get(),
-                RedisURI.Builder.sentinel(TestSettings.host(), 1234, "nonexistent").withSentinel(TestSettings.host()).build());
-        try {
-            client.connect();
-            fail("missing RedisConnectionException");
-        } catch (RedisConnectionException e) {
-        }
+        RedisURI nonexistent = RedisURI.Builder.sentinel(TestSettings.host(), 1234, "nonexistent")
+                .withSentinel(TestSettings.host()).build();
 
-        FastShutdown.shutdown(client);
+        assertThatThrownBy(() -> redisClient.connect(nonexistent)).isInstanceOf(RedisConnectionException.class);
     }
 
     @Test
-    public void sentinelConnect() {
+    void getMaster() {
 
-        RedisClient client = DefaultRedisClient.get();
-
-        RedisURI redisURI = RedisURI.Builder.redis(TestSettings.host(), TestSettings.port()).build();
-        RedisSentinelCommands<String, String> connection = client.connectSentinel(redisURI).sync();
-        assertThat(connection.ping()).isEqualTo("PONG");
-
-        connection.getStatefulConnection().close();
-    }
-
-    @Test
-    public void getMaster() {
-
-        Map<String, String> result = sentinel.master(MASTER_ID);
+        Map<String, String> result = sentinel.master(SentinelTestSettings.MASTER_ID);
         assertThat(result.get("ip")).isEqualTo(hostAddr()); // !! IPv4/IPv6
         assertThat(result).containsKey("role-reported");
     }
 
     @Test
-    public void role() {
+    void role() {
 
-        RedisCommands<String, String> connection = sentinelClient.connect(RedisURI.Builder.redis(host, 26380).build()).sync();
+        RedisCommands<String, String> connection = redisClient.connect(RedisURI.Builder.redis(host, 26380).build()).sync();
         try {
 
             List<Object> objects = connection.role();
@@ -166,29 +154,29 @@ public void role() {
             assertThat(objects).hasSize(2);
 
             assertThat(objects.get(0)).isEqualTo("sentinel");
-            assertThat(objects.get(1).toString()).isEqualTo("[" + MASTER_ID + "]");
+            assertThat(objects.get(1).toString()).isEqualTo("[" + SentinelTestSettings.MASTER_ID + "]");
         } finally {
             connection.getStatefulConnection().close();
         }
     }
 
     @Test
-    public void getSlaves() {
+    void getSlaves() {
 
-        List<Map<String, String>> result = sentinel.slaves(MASTER_ID);
+        List<Map<String, String>> result = sentinel.slaves(SentinelTestSettings.MASTER_ID);
         assertThat(result).hasSize(1);
         assertThat(result.get(0)).containsKey("port");
     }
 
     @Test
-    public void reset() {
+    void reset() {
 
         Long result = sentinel.reset("other");
         assertThat(result.intValue()).isEqualTo(0);
     }
 
     @Test
-    public void failover() {
+    void failover() {
 
         try {
             sentinel.failover("other");
@@ -198,7 +186,7 @@ public void failover() {
     }
 
     @Test
-    public void monitor() {
+    void monitor() {
 
         try {
             sentinel.remove("mymaster2");
@@ -210,37 +198,16 @@ public void monitor() {
     }
 
     @Test
-    public void ping() {
+    void ping() {
 
         String result = sentinel.ping();
         assertThat(result).isEqualTo("PONG");
     }
 
     @Test
-    public void set() {
+    void set() {
 
-        String result = sentinel.set(MASTER_ID, "down-after-milliseconds", "1000");
+        String result = sentinel.set(SentinelTestSettings.MASTER_ID, "down-after-milliseconds", "1000");
         assertThat(result).isEqualTo("OK");
     }
-
-    @Test
-    public void connectToRedisUsingSentinel() {
-        RedisCommands<String, String> connect = sentinelClient.connect().sync();
-        connect.ping();
-        connect.getStatefulConnection().close();
-    }
-
-    @Test
-    public void connectToRedisUsingSentinelWithReconnect() {
-
-        RedisCommands<String, String> connect = sentinelClient.connect().sync();
-
-        connect.ping();
-        connect.quit();
-
-        Delay.delay(Duration.ofMillis(50));
-        Wait.untilTrue(connect::isOpen).waitOrTimeout();
-        connect.ping();
-        connect.getStatefulConnection().close();
-    }
 }
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
similarity index 72%
rename from src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java
rename to src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
index 4d01908a59..cbdf251a1a 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
@@ -22,43 +22,55 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.junit.jupiter.api.BeforeAll;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.core.ClientOptions;
-import io.lettuce.core.RedisClient;
-import io.lettuce.core.RedisFuture;
-import io.lettuce.core.RedisURI;
+import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.ByteArrayCodec;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
 import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
 import io.lettuce.test.Futures;
+import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
-import io.lettuce.test.resource.TestClientResources;
 import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class SentinelConnectionTest extends AbstractSentinelTest {
+@ExtendWith(LettuceExtension.class)
+public class SentinelConnectionIntegrationTests extends TestSupport {
 
+    private final RedisClient redisClient;
     private StatefulRedisSentinelConnection<String, String> connection;
+    private RedisSentinelCommands<String, String> sentinel;
     private RedisSentinelAsyncCommands<String, String> sentinelAsync;
 
-    @BeforeAll
-    static void setupClient() {
-        sentinelClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder
-                .sentinel(TestSettings.host(), MASTER_ID).build());
+    @Inject
+    public SentinelConnectionIntegrationTests(RedisClient redisClient) {
+        this.redisClient = redisClient;
     }
 
     @BeforeEach
-    public void openConnection() {
-        connection = sentinelClient.connectSentinel();
-        sentinel = connection.sync();
-        sentinelAsync = connection.async();
+    void before() {
+
+        this.connection = this.redisClient.connectSentinel(SentinelTestSettings.SENTINEL_URI);
+        this.sentinel = getSyncConnection(this.connection);
+        this.sentinelAsync = this.connection.async();
+    }
+
+    protected RedisSentinelCommands<String, String> getSyncConnection(StatefulRedisSentinelConnection<String, String> connection) {
+        return connection.sync();
+    }
+
+    @AfterEach
+    void after() {
+        this.connection.close();
     }
 
     @Test
@@ -135,40 +147,43 @@ void testAsyncClose() {
 
     @Test
     void connectToOneNode() {
-        RedisSentinelCommands<String, String> connection = sentinelClient.connectSentinel(
-                RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).build()).sync();
+        RedisSentinelCommands<String, String> connection = redisClient.connectSentinel(SentinelTestSettings.SENTINEL_URI)
+                .sync();
         assertThat(connection.ping()).isEqualTo("PONG");
         connection.getStatefulConnection().close();
     }
 
     @Test
     void connectWithByteCodec() {
-        RedisSentinelCommands<byte[], byte[]> connection = sentinelClient.connectSentinel(new ByteArrayCodec()).sync();
-        assertThat(connection.master(MASTER_ID.getBytes())).isNotNull();
+        RedisSentinelCommands<byte[], byte[]> connection = redisClient.connectSentinel(new ByteArrayCodec(),
+                SentinelTestSettings.SENTINEL_URI).sync();
+        assertThat(connection.master(SentinelTestSettings.MASTER_ID.getBytes())).isNotNull();
         connection.getStatefulConnection().close();
     }
 
     @Test
     void sentinelConnectionPingBeforeConnectShouldDiscardPassword() {
 
-        RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).withPassword("hello-world").build();
+        RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), SentinelTestSettings.MASTER_ID)
+                .withPassword("hello-world").build();
 
-        sentinelClient.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
-        StatefulRedisSentinelConnection<String, String> connection = sentinelClient.connectSentinel(redisURI);
+        redisClient.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+        StatefulRedisSentinelConnection<String, String> connection = redisClient.connectSentinel(redisURI);
 
         assertThat(connection.sync().ping()).isEqualTo("PONG");
 
         connection.close();
 
-        sentinelClient.setOptions(ClientOptions.create());
+        redisClient.setOptions(ClientOptions.create());
     }
 
     @Test
     void sentinelConnectionShouldSetClientName() {
 
-        RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).withClientName("my-client").build();
+        RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), SentinelTestSettings.MASTER_ID)
+                .withClientName("my-client").build();
 
-        StatefulRedisSentinelConnection<String, String> connection = sentinelClient.connectSentinel(redisURI);
+        StatefulRedisSentinelConnection<String, String> connection = redisClient.connectSentinel(redisURI);
 
         assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
 
@@ -178,9 +193,10 @@ void sentinelConnectionShouldSetClientName() {
     @Test
     void sentinelManagedConnectionShouldSetClientName() {
 
-        RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), MASTER_ID).withClientName("my-client").build();
+        RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), SentinelTestSettings.MASTER_ID)
+                .withClientName("my-client").build();
 
-        StatefulRedisConnection<String, String> connection = sentinelClient.connect(redisURI);
+        StatefulRedisConnection<String, String> connection = redisClient.connect(redisURI);
 
         assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
 
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelRule.java b/src/test/java/io/lettuce/core/sentinel/SentinelRule.java
deleted file mode 100644
index 3e1c13dc79..0000000000
--- a/src/test/java/io/lettuce/core/sentinel/SentinelRule.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.sentinel;
-
-import static com.google.code.tempusfugit.temporal.Duration.seconds;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-import io.lettuce.core.RedisClient;
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.models.role.RedisInstance;
-import io.lettuce.core.models.role.RoleParser;
-import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
-import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
-import io.lettuce.test.Wait;
-import io.lettuce.test.settings.TestSettings;
-
-/**
- * Rule to simplify Redis Sentinel handling.
- *
- * This rule allows to:
- * <ul>
- * <li>Flush masters before test</li>
- * <li>Check for slave/alive slaves to a master</li>
- * <li>Wait for slave/alive slaves to a master</li>
- * <li>Find a master on a given set of ports</li>
- * <li>Setup a master/slave combination</li>
- * </ul>
- *
- * @author Mark Paluch
- */
-public class SentinelRule implements TestRule {
-
-    private RedisClient redisClient;
-    private final boolean flushBeforeTest;
-    private Map<Integer, RedisSentinelCommands<String, String>> sentinelConnections = new HashMap<>();
-    private Logger log = LogManager.getLogger(getClass());
-
-    /**
-     *
-     * @param redisClient
-     * @param flushBeforeTest
-     * @param sentinelPorts
-     */
-    public SentinelRule(RedisClient redisClient, boolean flushBeforeTest, int... sentinelPorts) {
-        this.redisClient = redisClient;
-        this.flushBeforeTest = flushBeforeTest;
-
-        log.info("[Sentinel] Connecting to sentinels: " + Arrays.toString(sentinelPorts));
-        for (int port : sentinelPorts) {
-            RedisSentinelAsyncCommands<String, String> connection = redisClient
-                    .connectSentinel(RedisURI.Builder.redis(TestSettings.host(), port).build()).async();
-            sentinelConnections.put(port, connection.getStatefulConnection().sync());
-        }
-    }
-
-    @Override
-    public Statement apply(final Statement base, Description description) {
-
-        final Statement before = new Statement() {
-            @Override
-            public void evaluate() {
-                if (flushBeforeTest) {
-                    flush();
-                }
-            }
-        };
-
-        return new Statement() {
-            @Override
-            public void evaluate() throws Throwable {
-                before.evaluate();
-                base.evaluate();
-
-                for (RedisSentinelCommands<String, String> commands : sentinelConnections.values()) {
-                    commands.getStatefulConnection().close();
-                }
-            }
-        };
-    }
-
-    /**
-     * Flush Sentinel masters.
-     */
-    private void flush() {
-        log.info("[Sentinel] Flushing masters of sentinels");
-        for (RedisSentinelCommands<String, String> connection : sentinelConnections.values()) {
-            List<Map<String, String>> masters = connection.masters();
-
-            for (Map<String, String> master : masters) {
-                connection.remove(master.get("name"));
-                connection.reset(master.get("name"));
-            }
-        }
-
-        for (Map.Entry<Integer, RedisSentinelCommands<String, String>> entry : sentinelConnections.entrySet()) {
-            Wait.untilTrue(() -> entry.getValue().masters().isEmpty())
-                    .message("Sentinel on " + entry.getKey() + " has still masters").waitOrTimeout();
-        }
-    }
-
-    /**
-     * Requires a master with a slave. If no master or slave is present, the rule flushes known masters and sets up a master
-     * with a slave.
-     *
-     * @param masterId
-     * @param redisPorts
-     */
-    public void needMasterWithSlave(String masterId, int... redisPorts) {
-
-        if (!hasSlaves(masterId) || !hasMaster(redisPorts)) {
-            flush();
-            int masterPort = setupMasterSlave(redisPorts);
-            monitor(masterId, TestSettings.hostAddr(), masterPort, 1, true);
-        }
-
-        waitForConnectedSlaves(masterId);
-    }
-
-    /**
-     * Wait until the master has a connected slave.
-     *
-     * @param masterId
-     */
-    private void waitForConnectedSlaves(String masterId) {
-        log.info("[Sentinel] Waiting until master " + masterId + " has at least one connected slave");
-        Wait.untilTrue(() -> hasConnectedSlaves(masterId)).during(seconds(20)).message("No slave found").waitOrTimeout();
-        log.info("[Sentinel] Found a connected slave for master " + masterId);
-    }
-
-    /**
-     * Wait until sentinel can provide an address for the master.
-     *
-     * @param masterId
-     */
-    public void waitForMaster(String masterId) {
-        log.info("[Sentinel] Waiting until master " + masterId + " can provide a socket address");
-        Wait.untilNoException(() -> {
-
-            for (RedisSentinelCommands<String, String> commands : sentinelConnections.values()) {
-                if (commands.getMasterAddrByName(masterId) == null) {
-                    throw new IllegalStateException("No address");
-                }
-            }
-
-        }).during(seconds(20)).message("Cannot provide an address for " + masterId).waitOrTimeout();
-        log.info("[Sentinel] Found master " + masterId);
-
-    }
-
-    /**
-     * Monitor a master and wait until all sentinels ACK'd by checking last-ping-reply
-     *
-     * @param key
-     * @param ip
-     * @param port
-     * @param quorum
-     */
-    public void monitor(final String key, String ip, int port, int quorum, boolean sync) {
-
-        log.info("[Sentinel] Monitoring master " + key + " (" + ip + ":" + port + ")");
-        for (RedisSentinelCommands<String, String> connection : sentinelConnections.values()) {
-            connection.monitor(key, ip, port, quorum);
-        }
-
-        if (sync) {
-            Wait.untilTrue(() -> {
-                for (RedisSentinelCommands<String, String> connection : sentinelConnections.values()) {
-                    Map<String, String> map = connection.master(key);
-                    String reply = map.get("last-ping-reply");
-                    if (reply == null || "0".equals(reply)) {
-                        return false;
-                    }
-                }
-                return true;
-            }).waitOrTimeout();
-
-            log.info("[Sentinel] Master " + key + " (" + ip + ":" + port + ") is monitored now");
-        }
-    }
-
-    /**
-     * Check if the master has slaves at all (no check for connection/alive).
-     *
-     * @param masterId
-     * @return
-     */
-    private boolean hasSlaves(String masterId) {
-        try {
-            for (RedisSentinelCommands<String, String> connection : sentinelConnections.values()) {
-
-                return !connection.slaves(masterId).isEmpty();
-            }
-        } catch (Exception e) {
-            if (e.getMessage().contains("No such master with that name")) {
-                return false;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if a master runs on any of the given ports.
-     *
-     * @param redisPorts
-     * @return
-     */
-    private boolean hasMaster(int... redisPorts) {
-
-        Map<Integer, RedisCommands<String, String>> connections = new HashMap<>();
-        for (int redisPort : redisPorts) {
-            connections.put(redisPort,
-                    redisClient.connect(RedisURI.Builder.redis(TestSettings.hostAddr(), redisPort).build()).sync());
-        }
-
-        try {
-            Integer masterPort = getMasterPort(connections);
-            if (masterPort != null) {
-                return true;
-            }
-        } finally {
-            for (RedisCommands<String, String> commands : connections.values()) {
-                commands.getStatefulConnection().close();
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if the master has connected slaves.
-     *
-     * @param masterId
-     * @return
-     */
-    private boolean hasConnectedSlaves(String masterId) {
-        for (RedisSentinelCommands<String, String> connection : sentinelConnections.values()) {
-            List<Map<String, String>> slaves = connection.slaves(masterId);
-            for (Map<String, String> slave : slaves) {
-
-                String masterLinkStatus = slave.get("master-link-status");
-                if (masterLinkStatus == null || !masterLinkStatus.contains("ok")) {
-                    continue;
-                }
-
-                String masterPort = slave.get("master-port");
-                if (masterPort == null || masterPort.contains("?")) {
-                    continue;
-                }
-
-                String roleReported = slave.get("role-reported");
-                if (roleReported == null || !roleReported.contains("slave")) {
-                    continue;
-                }
-
-                String flags = slave.get("flags");
-                if (flags == null || flags.contains("disconnected") || flags.contains("down") | !flags.contains("slave")) {
-                    continue;
-                }
-
-                return true;
-            }
-
-            return false;
-        }
-
-        return false;
-    }
-
-    /**
-     * Setup a master with one or more slaves (depending on port count).
-     *
-     * @param redisPorts
-     * @return
-     */
-    private int setupMasterSlave(int... redisPorts) {
-
-        log.info("[Sentinel] Create a master with slaves on ports " + Arrays.toString(redisPorts));
-        Map<Integer, RedisCommands<String, String>> connections = new HashMap<>();
-        for (int redisPort : redisPorts) {
-            connections.put(redisPort,
-                    redisClient.connect(RedisURI.Builder.redis(TestSettings.hostAddr(), redisPort).build()).sync());
-        }
-
-        for (RedisCommands<String, String> commands : connections.values()) {
-            commands.slaveofNoOne();
-        }
-
-        for (Map.Entry<Integer, RedisCommands<String, String>> entry : connections.entrySet()) {
-            if (entry.getKey().intValue() != redisPorts[0]) {
-                entry.getValue().slaveof(TestSettings.hostAddr(), redisPorts[0]);
-            }
-        }
-
-        try {
-
-            Wait.untilTrue(() -> getMasterPort(connections) != null).message("Cannot find master").waitOrTimeout();
-            Integer masterPort = getMasterPort(connections);
-            log.info("[Sentinel] Master on port " + masterPort);
-            if (masterPort != null) {
-                return masterPort;
-            }
-        } finally {
-            for (RedisCommands<String, String> commands : connections.values()) {
-                commands.getStatefulConnection().close();
-            }
-        }
-
-        throw new IllegalStateException("No master available on ports: " + connections.keySet());
-    }
-
-    /**
-     * Retrieve the port of the first found master.
-     *
-     * @param connections
-     * @return
-     */
-    private Integer getMasterPort(Map<Integer, RedisCommands<String, String>> connections) {
-
-        for (Map.Entry<Integer, RedisCommands<String, String>> entry : connections.entrySet()) {
-
-            List<Object> role = entry.getValue().role();
-
-            RedisInstance redisInstance = RoleParser.parse(role);
-            if (redisInstance.getRole() == RedisInstance.Role.MASTER) {
-                return entry.getKey();
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java
similarity index 68%
rename from src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java
rename to src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java
index 204ce3eca2..dcacaaa42a 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java
@@ -15,47 +15,56 @@
  */
 package io.lettuce.core.sentinel;
 
-import static io.lettuce.test.settings.TestSettings.hostAddr;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSupport;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
-import io.lettuce.test.resource.TestClientResources;
+import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class SentinelServerCommandTest extends AbstractSentinelTest {
+@ExtendWith(LettuceExtension.class)
+public class SentinelServerCommandIntegrationTests extends TestSupport {
 
-    @Rule
-    public SentinelRule sentinelRule = new SentinelRule(sentinelClient, false, 26379, 26380);
+    private final RedisClient redisClient;
+    private StatefulRedisSentinelConnection<String, String> connection;
+    private RedisSentinelCommands<String, String> sentinel;
 
-    @BeforeClass
-    public static void setupClient() {
-        sentinelClient = RedisClient.create(TestClientResources.get(), RedisURI.Builder
-                .sentinel(TestSettings.host(), MASTER_ID).build());
+    @Inject
+    public SentinelServerCommandIntegrationTests(RedisClient redisClient) {
+        this.redisClient = redisClient;
     }
 
-    @Before
-    public void openConnection() throws Exception {
-        super.openConnection();
+    @BeforeEach
+    void before() {
+
+        this.connection = this.redisClient.connectSentinel(SentinelTestSettings.SENTINEL_URI);
+        this.sentinel = getSyncConnection(this.connection);
+    }
+
+    protected RedisSentinelCommands<String, String> getSyncConnection(StatefulRedisSentinelConnection<String, String> connection) {
+        return connection.sync();
+    }
 
-        try {
-            sentinel.master(MASTER_ID);
-        } catch (Exception e) {
-            sentinelRule.monitor(MASTER_ID, hostAddr(), TestSettings.port(3), 1, true);
-        }
+    @AfterEach
+    void after() {
+        this.connection.close();
     }
 
     @Test
@@ -85,7 +94,8 @@ public void clientKill() {
     @Test
     public void clientKillExtended() {
 
-        RedisSentinelCommands<String, String> connection2 = sentinelClient.connectSentinel().sync();
+        RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), SentinelTestSettings.MASTER_ID).build();
+        RedisSentinelCommands<String, String> connection2 = redisClient.connectSentinel(redisURI).sync();
         connection2.clientSetname("killme");
 
         Pattern p = Pattern.compile("^.*addr=([^ ]+).*name=killme.*$", Pattern.MULTILINE | Pattern.DOTALL);
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelTestSettings.java b/src/test/java/io/lettuce/core/sentinel/SentinelTestSettings.java
new file mode 100644
index 0000000000..365e5f31ea
--- /dev/null
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelTestSettings.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.sentinel;
+
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSupport;
+import io.lettuce.test.settings.TestSettings;
+
+/**
+ * @author Mark Paluch
+ */
+public abstract class SentinelTestSettings extends TestSupport {
+
+    public static final RedisURI SENTINEL_URI = RedisURI.Builder.sentinel(TestSettings.host(), SentinelTestSettings.MASTER_ID)
+            .build();
+    public static final String MASTER_ID = "mymaster";
+
+    private SentinelTestSettings() {
+    }
+}
diff --git a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
index 7235fff0f0..dd232e1dc7 100644
--- a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
@@ -15,34 +15,26 @@
  */
 package io.lettuce.core.sentinel.reactive;
 
-import static io.lettuce.test.settings.TestSettings.hostAddr;
-import static org.assertj.core.api.Assertions.assertThat;
+import javax.inject.Inject;
 
-import io.lettuce.core.sentinel.SentinelCommandTest;
-import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
-import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.sentinel.SentinelCommandIntegrationTests;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
 import io.lettuce.test.ReactiveSyncInvocationHandler;
-import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class SentinelReactiveCommandTest extends SentinelCommandTest {
+public class SentinelReactiveCommandTest extends SentinelCommandIntegrationTests {
 
-    @Override
-    public void openConnection() {
-
-        RedisSentinelAsyncCommands<String, String> async = sentinelClient.connectSentinel().async();
-        RedisSentinelReactiveCommands<String, String> reactive = async.getStatefulConnection().reactive();
-        sentinel = ReactiveSyncInvocationHandler.sync(async.getStatefulConnection());
-
-        try {
-            sentinel.master(MASTER_ID);
-        } catch (Exception e) {
-            sentinelRule.monitor(MASTER_ID, hostAddr(), TestSettings.port(3), 1, true);
-        }
+    @Inject
+    public SentinelReactiveCommandTest(RedisClient redisClient) {
+        super(redisClient);
+    }
 
-        assertThat(reactive.isOpen()).isTrue();
-        assertThat(reactive.getStatefulConnection()).isSameAs(async.getStatefulConnection());
+    @Override
+    protected RedisSentinelCommands<String, String> getSyncConnection(StatefulRedisSentinelConnection<String, String> connection) {
+        return ReactiveSyncInvocationHandler.sync(connection);
     }
 }
diff --git a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
index e256092462..1ac9c11aff 100644
--- a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
@@ -15,34 +15,26 @@
  */
 package io.lettuce.core.sentinel.reactive;
 
-import static io.lettuce.test.settings.TestSettings.hostAddr;
-import static org.assertj.core.api.Assertions.assertThat;
+import javax.inject.Inject;
 
-import io.lettuce.core.sentinel.SentinelServerCommandTest;
-import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
-import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.sentinel.SentinelServerCommandIntegrationTests;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
 import io.lettuce.test.ReactiveSyncInvocationHandler;
-import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class SentinelServerReactiveCommandTest extends SentinelServerCommandTest {
+public class SentinelServerReactiveCommandTest extends SentinelServerCommandIntegrationTests {
 
-    @Override
-    public void openConnection() {
-
-        RedisSentinelAsyncCommands<String, String> async = sentinelClient.connectSentinel().async();
-        RedisSentinelReactiveCommands<String, String> reactive = async.getStatefulConnection().reactive();
-        sentinel = ReactiveSyncInvocationHandler.sync(async.getStatefulConnection());
-
-        try {
-            sentinel.master(MASTER_ID);
-        } catch (Exception e) {
-            sentinelRule.monitor(MASTER_ID, hostAddr(), TestSettings.port(3), 1, true);
-        }
+    @Inject
+    public SentinelServerReactiveCommandTest(RedisClient redisClient) {
+        super(redisClient);
+    }
 
-        assertThat(reactive.isOpen()).isTrue();
-        assertThat(reactive.getStatefulConnection()).isSameAs(async.getStatefulConnection());
+    @Override
+    protected RedisSentinelCommands<String, String> getSyncConnection(StatefulRedisSentinelConnection<String, String> connection) {
+        return ReactiveSyncInvocationHandler.sync(connection);
     }
 }
diff --git a/src/test/java/io/lettuce/core/server/MockTcpServer.java b/src/test/java/io/lettuce/test/server/MockTcpServer.java
similarity index 98%
rename from src/test/java/io/lettuce/core/server/MockTcpServer.java
rename to src/test/java/io/lettuce/test/server/MockTcpServer.java
index efe6be62a2..cd09c04127 100644
--- a/src/test/java/io/lettuce/core/server/MockTcpServer.java
+++ b/src/test/java/io/lettuce/test/server/MockTcpServer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.server;
+package io.lettuce.test.server;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/io/lettuce/core/server/RandomResponseServer.java b/src/test/java/io/lettuce/test/server/RandomResponseServer.java
similarity index 96%
rename from src/test/java/io/lettuce/core/server/RandomResponseServer.java
rename to src/test/java/io/lettuce/test/server/RandomResponseServer.java
index db143b7406..3a3d966d25 100644
--- a/src/test/java/io/lettuce/core/server/RandomResponseServer.java
+++ b/src/test/java/io/lettuce/test/server/RandomResponseServer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.server;
+package io.lettuce.test.server;
 
 /**
  * Tiny netty server to generate random base64 data on message reception.
diff --git a/src/test/java/io/lettuce/core/server/RandomServerHandler.java b/src/test/java/io/lettuce/test/server/RandomServerHandler.java
similarity index 98%
rename from src/test/java/io/lettuce/core/server/RandomServerHandler.java
rename to src/test/java/io/lettuce/test/server/RandomServerHandler.java
index 9b7f7ffe42..d96f9df141 100644
--- a/src/test/java/io/lettuce/core/server/RandomServerHandler.java
+++ b/src/test/java/io/lettuce/test/server/RandomServerHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.server;
+package io.lettuce.test.server;
 
 import java.util.Arrays;
 import java.util.Random;

From 3340c31de9201730560b1a7c6bfb1e245c7ecfe4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 22 Sep 2018 15:07:42 -0400
Subject: [PATCH 528/808] Reduce allocations in topology comparator #870

---
 .../cluster/topology/TopologyComparators.java | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
index 6cb6ccdffc..e28d27dcf8 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
@@ -25,7 +25,6 @@
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceLists;
-import io.lettuce.core.internal.LettuceSets;
 
 /**
  * Comparators for {@link RedisClusterNode} and {@link RedisURI}.
@@ -80,7 +79,7 @@ public static List<RedisClusterNode> sortByUri(Iterable<RedisClusterNode> cluste
         LettuceAssert.notNull(clusterNodes, "Cluster nodes must not be null");
 
         List<RedisClusterNode> ordered = LettuceLists.newList(clusterNodes);
-        Collections.sort(ordered, (o1, o2) -> RedisURIComparator.INSTANCE.compare(o1.getUri(), o2.getUri()));
+        ordered.sort((o1, o2) -> RedisURIComparator.INSTANCE.compare(o1.getUri(), o2.getUri()));
         return ordered;
     }
 
@@ -95,7 +94,7 @@ public static List<RedisClusterNode> sortByClientCount(Iterable<RedisClusterNode
         LettuceAssert.notNull(clusterNodes, "Cluster nodes must not be null");
 
         List<RedisClusterNode> ordered = LettuceLists.newList(clusterNodes);
-        Collections.sort(ordered, ClientCountComparator.INSTANCE);
+        ordered.sort(ClientCountComparator.INSTANCE);
         return ordered;
     }
 
@@ -108,7 +107,7 @@ public static List<RedisClusterNode> sortByClientCount(Iterable<RedisClusterNode
     public static List<RedisClusterNode> sortByLatency(Iterable<RedisClusterNode> clusterNodes) {
 
         List<RedisClusterNode> ordered = LettuceLists.newList(clusterNodes);
-        Collections.sort(ordered, LatencyComparator.INSTANCE);
+        ordered.sort(LatencyComparator.INSTANCE);
         return ordered;
     }
 
@@ -155,7 +154,7 @@ static boolean essentiallyEqualsTo(RedisClusterNode o1, RedisClusterNode o2) {
             return false;
         }
 
-        if (!LettuceSets.newHashSet(o1.getSlots()).equals(LettuceSets.newHashSet(o2.getSlots()))) {
+        if (o1.getSlots().size() != o2.getSlots().size() || !o1.getSlots().containsAll(o2.getSlots())) {
             return false;
         }
 
@@ -163,16 +162,12 @@ static boolean essentiallyEqualsTo(RedisClusterNode o1, RedisClusterNode o2) {
     }
 
     private static boolean sameFlags(RedisClusterNode base, RedisClusterNode other, RedisClusterNode.NodeFlag flag) {
+
         if (base.getFlags().contains(flag)) {
-            if (!other.getFlags().contains(flag)) {
-                return false;
-            }
-        } else {
-            if (other.getFlags().contains(flag)) {
-                return false;
-            }
+            return other.getFlags().contains(flag);
         }
-        return true;
+
+        return !other.getFlags().contains(flag);
     }
 
     static class PredefinedRedisClusterNodeComparator implements Comparator<RedisClusterNode> {

From 25b925a716131a6431bdb097431d053d75f122bc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 22 Sep 2018 19:04:33 -0400
Subject: [PATCH 529/808] Remove tempus fugit dependency #871

---
 pom.xml                                 |  7 ---
 src/test/java/io/lettuce/test/Wait.java | 79 +++++++++++++++++++++----
 2 files changed, 67 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3aae25d4c4..8af37c9740 100644
--- a/pom.xml
+++ b/pom.xml
@@ -313,13 +313,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.code.tempus-fugit</groupId>
-            <artifactId>tempus-fugit</artifactId>
-            <version>1.1</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-se</artifactId>
diff --git a/src/test/java/io/lettuce/test/Wait.java b/src/test/java/io/lettuce/test/Wait.java
index cf2776a49d..337940cfe1 100644
--- a/src/test/java/io/lettuce/test/Wait.java
+++ b/src/test/java/io/lettuce/test/Wait.java
@@ -15,17 +15,15 @@
  */
 package io.lettuce.test;
 
+import java.time.Clock;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
-import com.google.code.tempusfugit.temporal.Duration;
-import com.google.code.tempusfugit.temporal.Sleeper;
-import com.google.code.tempusfugit.temporal.ThreadSleep;
-import com.google.code.tempusfugit.temporal.Timeout;
-
 /**
  * Wait-Until helper.
  *
@@ -40,6 +38,7 @@ public class Wait {
      * @return
      */
     public static WaitBuilder<Boolean> untilTrue(Supplier<Boolean> supplier) {
+
         WaitBuilder<Boolean> wb = new WaitBuilder<>();
 
         wb.supplier = supplier;
@@ -55,6 +54,7 @@ public static WaitBuilder<Boolean> untilTrue(Supplier<Boolean> supplier) {
      * @return
      */
     public static WaitBuilder<?> untilNoException(VoidWaitCondition condition) {
+
         WaitBuilder<?> wb = new WaitBuilder<>();
         wb.waitCondition = () -> {
             try {
@@ -83,6 +83,7 @@ public static WaitBuilder<?> untilNoException(VoidWaitCondition condition) {
      * @return
      */
     public static <T> WaitBuilder<T> untilNotEquals(T expectation, Supplier<T> actualSupplier) {
+
         WaitBuilder<T> wb = new WaitBuilder<>();
 
         wb.supplier = actualSupplier;
@@ -125,6 +126,7 @@ public static <T> WaitBuilder<T> untilNotEquals(T expectation, Supplier<T> actua
      * @return
      */
     public static <T> WaitBuilder<T> untilEquals(T expectation, Supplier<T> actualSupplier) {
+
         WaitBuilder<T> wb = new WaitBuilder<>();
 
         wb.supplier = actualSupplier;
@@ -152,6 +154,7 @@ public static <T> WaitBuilder<T> untilEquals(T expectation, Supplier<T> actualSu
 
             return o.equals(expectation);
         };
+
         wb.messageFunction = o -> "Objects are not equal: " + expectation + " and " + o;
 
         return wb;
@@ -159,20 +162,42 @@ public static <T> WaitBuilder<T> untilEquals(T expectation, Supplier<T> actualSu
 
     @FunctionalInterface
     interface WaitCondition {
-
         boolean isSatisfied() throws Exception;
     }
 
     @FunctionalInterface
     public interface VoidWaitCondition {
-
         void test();
     }
 
+    @FunctionalInterface
+    public interface Sleeper {
+        void sleep() throws InterruptedException;
+    }
+
+    static class ThreadSleep implements Sleeper {
+
+        private final Duration period;
+
+        ThreadSleep(Duration period) {
+            this.period = period;
+        }
+
+        public void sleep() throws InterruptedException {
+            Thread.sleep(period.toMillis());
+        }
+    }
+
+    /**
+     * Builder to build a waiter/sleeper with a timeout. Make sure to call {@link #waitOrTimeout()} to block execution until the
+     * {@link WaitCondition} is met.
+     *
+     * @param <T>
+     */
     public static class WaitBuilder<T> {
 
-        private Duration duration = Duration.seconds(10);
-        private Sleeper sleeper = new ThreadSleep(Duration.millis(100));
+        private Duration duration = Duration.ofSeconds(10);
+        private Sleeper sleeper = new ThreadSleep(Duration.ofMillis(10));
         private Function<T, String> messageFunction;
         private Supplier<T> supplier;
         private Predicate<T> check;
@@ -188,6 +213,7 @@ public WaitBuilder<T> message(String message) {
             return this;
         }
 
+        @SuppressWarnings("unchecked")
         public void waitOrTimeout() {
 
             Waiter waiter = new Waiter();
@@ -201,10 +227,13 @@ public void waitOrTimeout() {
                 waiter.waitOrTimeout(supplier, check);
             }
         }
-
     }
 
+    /**
+     * Utility to await until a {@link WaitCondition} yields {@literal true}.
+     */
     private static class Waiter {
+
         private Duration duration;
         private Sleeper sleeper;
         private Function<Object, String> messageFunction;
@@ -212,7 +241,7 @@ private static class Waiter {
         private <T> void waitOrTimeout(Supplier<T> supplier, Predicate<T> check) {
 
             try {
-                if (!success(() -> check.test(supplier.get()), Timeout.timeout(duration))) {
+                if (!success(() -> check.test(supplier.get()), Timeout.create(duration))) {
                     if (messageFunction != null) {
                         throw new TimeoutException(messageFunction.apply(supplier.get()));
                     }
@@ -226,7 +255,7 @@ private <T> void waitOrTimeout(Supplier<T> supplier, Predicate<T> check) {
         private <T> void waitOrTimeout(WaitCondition waitCondition, Supplier<T> supplier) {
 
             try {
-                if (!success(waitCondition, Timeout.timeout(duration))) {
+                if (!success(waitCondition, Timeout.create(duration))) {
                     try {
                         if (messageFunction != null) {
                             throw new TimeoutException(messageFunction.apply(supplier.get()));
@@ -247,13 +276,39 @@ private <T> void waitOrTimeout(WaitCondition waitCondition, Supplier<T> supplier
         }
 
         private boolean success(WaitCondition condition, Timeout timeout) throws Exception {
+
             while (!timeout.hasExpired()) {
                 if (condition.isSatisfied()) {
                     return true;
                 }
                 sleeper.sleep();
             }
+
             return false;
         }
     }
+
+    static class Timeout {
+
+        private final static Clock clock = Clock.systemDefaultZone();
+        private final Instant timeout;
+
+        private Timeout(Instant timeout) {
+            this.timeout = timeout;
+        }
+
+        public static Timeout create(Duration duration) {
+
+            if (duration.isZero() || duration.isNegative()) {
+                throw new IllegalArgumentException("Duration must be positive");
+            }
+
+            Instant now = clock.instant();
+            return new Timeout(now.plus(duration));
+        }
+
+        boolean hasExpired() {
+            return clock.instant().isAfter(timeout);
+        }
+    }
 }

From af1dcad1028da5b51c4296255a2bb145cb207836 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 22 Sep 2018 19:05:33 -0400
Subject: [PATCH 530/808] Polishing #871

Align static final declarations, switch final static to static final.
---
 .../lettuce/core/PlainChannelInitializer.java |   2 +-
 src/main/java/io/lettuce/core/Range.java      |   2 +-
 .../ClusterDistributionChannelWriter.java     |   4 +-
 .../io/lettuce/core/dynamic/BatchTasks.java   |   2 +-
 .../codec/AnnotationRedisCodecResolver.java   |   6 +-
 .../core/dynamic/output/OutputRegistry.java   |   2 +-
 .../internal/AbstractInvocationHandler.java   |   2 +-
 .../internal/AsyncConnectionProvider.java     |   2 +-
 .../lettuce/core/internal/DefaultMethods.java |   2 +-
 .../lettuce/core/output/ListSubscriber.java   |   2 +-
 .../io/lettuce/core/protocol/Command.java     |   6 +-
 .../lettuce/core/protocol/CommandWrapper.java |   4 +-
 .../io/lettuce/apigenerator/Constants.java    |   6 +-
 ...=> ConnectionCommandIntegrationTests.java} |   6 +-
 .../core/PipeliningIntegrationTests.java      |   8 ++
 .../ReactiveConnectionIntegrationTests.java   |   9 +-
 ...activeStreamingOutputIntegrationTests.java |   8 ++
 .../core/RedisClientFactoryUnitTests.java     |   4 +-
 .../core/ScanIteratorIntegrationTests.java    |  10 +-
 ...t.java => ScanStreamIntegrationTests.java} |  12 +-
 ... => SyncAsyncApiConvergenceUnitTests.java} |   2 +-
 .../RedisClusterClientFactoryTests.java       |   4 +-
 .../RedisClusterClientIntegrationTests.java   |  14 +-
 ...erPasswordSecuredSslIntegrationTests.java} |   2 +-
 ...eactiveClusterClientIntegrationTests.java} |   8 +-
 .../cluster/ScanIteratorIntegrationTests.java |   7 +
 ...eactiveClusterClientIntegrationTests.java} |   7 +-
 ...CustomClusterCommandIntegrationTests.java} |  22 ++--
 ...=> GeoClusterCommandIntegrationTests.java} |  48 +------
 .../HashClusterCommandIntegrationTests.java   |  33 +++++
 .../commands/HashClusterCommandTest.java      |  63 ---------
 ...=> KeyClusterCommandIntegrationTests.java} |  48 +++----
 ...> ListClusterCommandIntegrationTests.java} |  44 ++-----
 ...StringClusterCommandIntegrationTests.java} |  44 ++-----
 ...lusterReactiveCommandIntegrationTests.java |  33 +++++
 .../HashClusterReactiveCommandTest.java       |  63 ---------
 .../KeyClusterReativeCommandTest.java         |  62 ---------
 ...usterReactiveCommandIntegrationTests.java} |  44 ++-----
 ...usterReactiveCommandIntegrationTests.java} |  48 ++-----
 .../ClusterTopologyRefreshUnitTests.java      |   2 +-
 ...t.java => BitCommandIntegrationTests.java} |  38 ++++--
 ...ava => CustomCommandIntegrationTests.java} |  12 +-
 ...t.java => GeoCommandIntegrationTests.java} |  32 +++--
 .../commands/HLLCommandIntegrationTests.java  | 124 ++++++++++++++++++
 .../lettuce/core/commands/HLLCommandTest.java | 105 ---------------
 ....java => HashCommandIntegrationTests.java} |  23 +++-
 ...t.java => KeyCommandIntegrationTests.java} |  23 +++-
 ....java => ListCommandIntegrationTests.java} |  30 ++++-
 ...va => NumericCommandIntegrationTests.java} |  26 +++-
 ... => ScriptingCommandIntegrationTests.java} |  28 +++-
 ...ava => ServerCommandIntegrationTests.java} |  35 +++--
 ...t.java => SetCommandIntegrationTests.java} |  23 +++-
 ....java => SortCommandIntegrationTests.java} |  26 +++-
 ... => SortedSetCommandIntegrationTests.java} |  23 +++-
 ...ava => StreamCommandIntegrationTests.java} |  23 +++-
 ...ava => StringCommandIntegrationTests.java} |  25 +++-
 ...> TransactionCommandIntegrationTests.java} |  34 ++++-
 ...> BitReactiveCommandIntegrationTests.java} |  22 ++--
 ...> GeoReactiveCommandIntegrationTests.java} |  19 ++-
 ...> HLLReactiveCommandIntegrationTests.java} |  14 +-
 ... HashReactiveCommandIntegrationTests.java} |  14 +-
 ...> KeyReactiveCommandIntegrationTests.java} |  14 +-
 .../ListReactiveCommandIntegrationTests.java  |  33 +++++
 ...umericReactiveCommandIntegrationTests.java |  33 +++++
 .../reactive/NumericReactiveCommandTest.java  |  31 -----
 ...iptingReactiveCommandIntegrationTests.java |  34 +++++
 .../ScriptingReactiveCommandTest.java         |  31 -----
 ...erverReactiveCommandIntegrationTests.java} |  23 ++--
 ...> SetReactiveCommandIntegrationTests.java} |  14 +-
 .../reactive/SetReactiveCommandTest.java      |  31 -----
 .../SortReactiveCommandIntegrationTests.java  |  33 +++++
 .../reactive/SortReactiveCommandTest.java     |  31 -----
 ...tedSetReactiveCommandIntegrationTests.java |  33 +++++
 .../SortedSetReactiveCommandTest.java         |  31 -----
 ...treamReactiveCommandIntegrationTests.java} |  14 +-
 ...tringReactiveCommandIntegrationTests.java} |  38 +++---
 ...ctionReactiveCommandIntegrationTests.java} |  49 +++----
 .../BitTxCommandIntegrationTests.java         |  33 +++++
 .../transactional/BitTxCommandTest.java       |  32 -----
 ...java => GeoTxCommandIntegrationTests.java} |  14 +-
 ...java => HLLTxCommandIntegrationTests.java} |  15 ++-
 ...ava => HashTxCommandIntegrationTests.java} |  14 +-
 ...java => KeyTxCommandIntegrationTests.java} |  14 +-
 ...ava => ListTxCommandIntegrationTests.java} |  14 +-
 ...java => SetTxCommandIntegrationTests.java} |  14 +-
 .../SortTxCommandIntegrationTests.java        |  32 +++++
 .../transactional/SortTxCommandTest.java      |  30 -----
 .../SortedSetTxCommandIntegrationTests.java   |  32 +++++
 .../transactional/SortedSetTxCommandTest.java |  30 -----
 .../StringTxCommandIntegrationTests.java      |  32 +++++
 .../transactional/StringTxCommandTest.java    |  30 -----
 ...RedisCommandsBatchingIntegrationTests.java |   6 +
 ...ctionEventsTriggeredIntegrationTests.java} |   2 +-
 ...ava => CustomCommandIntegrationTests.java} |   4 +-
 ...=> ConnectionFailureIntegrationTests.java} |  21 ++-
 ...java => BraveTracingIntegrationTests.java} |  12 +-
 .../java/io/lettuce/test/KeysAndValues.java   |   2 +-
 .../io/lettuce/test/LettuceExtension.java     |  80 +++++++----
 src/test/java/io/lettuce/test/Wait.java       |   2 +-
 .../test/condition/EnabledOnCommand.java      |   1 +
 .../test/resource/DefaultRedisClient.java     |   2 +-
 .../resource/DefaultRedisClusterClient.java   |   2 +-
 .../test/resource/TestClientResources.java    |   2 +-
 .../partitions/RedisClusterNodeBenchmark.java |   6 +-
 .../lettuce/core/protocol/EmptyChannel.java   |   2 +-
 .../lettuce/core/protocol/EmptyContext.java   |   2 +-
 106 files changed, 1251 insertions(+), 1100 deletions(-)
 rename src/test/java/io/lettuce/core/{ConnectionCommandTest.java => ConnectionCommandIntegrationTests.java} (95%)
 rename src/test/java/io/lettuce/core/{ScanStreamTest.java => ScanStreamIntegrationTests.java} (91%)
 rename src/test/java/io/lettuce/core/{SyncAsyncApiConvergenceTest.java => SyncAsyncApiConvergenceUnitTests.java} (98%)
 rename src/test/java/io/lettuce/core/cluster/{RedisClusterPasswordSecuredSslTest.java => RedisClusterPasswordSecuredSslIntegrationTests.java} (98%)
 rename src/test/java/io/lettuce/core/cluster/{RedisReactiveClusterClientTest.java => RedisReactiveClusterClientIntegrationTests.java} (94%)
 rename src/test/java/io/lettuce/core/cluster/{SingleThreadedReactiveClusterClientTest.java => SingleThreadedReactiveClusterClientIntegrationTests.java} (92%)
 rename src/test/java/io/lettuce/core/cluster/commands/{CustomClusterCommandTest.java => CustomClusterCommandIntegrationTests.java} (85%)
 rename src/test/java/io/lettuce/core/cluster/commands/{GeoClusterCommandTest.java => GeoClusterCommandIntegrationTests.java} (51%)
 create mode 100644 src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandIntegrationTests.java
 delete mode 100644 src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java
 rename src/test/java/io/lettuce/core/cluster/commands/{KeyClusterCommandTest.java => KeyClusterCommandIntegrationTests.java} (64%)
 rename src/test/java/io/lettuce/core/cluster/commands/{ListClusterCommandTest.java => ListClusterCommandIntegrationTests.java} (62%)
 rename src/test/java/io/lettuce/core/cluster/commands/{StringClusterCommandTest.java => StringClusterCommandIntegrationTests.java} (56%)
 create mode 100644 src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandIntegrationTests.java
 delete mode 100644 src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
 delete mode 100644 src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java
 rename src/test/java/io/lettuce/core/cluster/commands/reactive/{ListClusterReactiveCommandTest.java => ListClusterReactiveCommandIntegrationTests.java} (62%)
 rename src/test/java/io/lettuce/core/cluster/commands/reactive/{StringClusterReactiveCommandTest.java => StringClusterReactiveCommandIntegrationTests.java} (57%)
 rename src/test/java/io/lettuce/core/commands/{BitCommandTest.java => BitCommandIntegrationTests.java} (89%)
 rename src/test/java/io/lettuce/core/commands/{CustomCommandTest.java => CustomCommandIntegrationTests.java} (94%)
 rename src/test/java/io/lettuce/core/commands/{GeoCommandTest.java => GeoCommandIntegrationTests.java} (96%)
 create mode 100644 src/test/java/io/lettuce/core/commands/HLLCommandIntegrationTests.java
 delete mode 100644 src/test/java/io/lettuce/core/commands/HLLCommandTest.java
 rename src/test/java/io/lettuce/core/commands/{HashCommandTest.java => HashCommandIntegrationTests.java} (94%)
 rename src/test/java/io/lettuce/core/commands/{KeyCommandTest.java => KeyCommandIntegrationTests.java} (95%)
 rename src/test/java/io/lettuce/core/commands/{ListCommandTest.java => ListCommandIntegrationTests.java} (91%)
 rename src/test/java/io/lettuce/core/commands/{NumericCommandTest.java => NumericCommandIntegrationTests.java} (70%)
 rename src/test/java/io/lettuce/core/commands/{ScriptingCommandTest.java => ScriptingCommandIntegrationTests.java} (86%)
 rename src/test/java/io/lettuce/core/commands/{ServerCommandTest.java => ServerCommandIntegrationTests.java} (93%)
 rename src/test/java/io/lettuce/core/commands/{SetCommandTest.java => SetCommandIntegrationTests.java} (94%)
 rename src/test/java/io/lettuce/core/commands/{SortCommandTest.java => SortCommandIntegrationTests.java} (80%)
 rename src/test/java/io/lettuce/core/commands/{SortedSetCommandTest.java => SortedSetCommandIntegrationTests.java} (98%)
 rename src/test/java/io/lettuce/core/commands/{StreamCommandTest.java => StreamCommandIntegrationTests.java} (95%)
 rename src/test/java/io/lettuce/core/commands/{StringCommandTest.java => StringCommandIntegrationTests.java} (90%)
 rename src/test/java/io/lettuce/core/commands/{TransactionCommandTest.java => TransactionCommandIntegrationTests.java} (77%)
 rename src/test/java/io/lettuce/core/commands/reactive/{BitReactiveCommandTest.java => BitReactiveCommandIntegrationTests.java} (86%)
 rename src/test/java/io/lettuce/core/commands/reactive/{GeoReactiveCommandTest.java => GeoReactiveCommandIntegrationTests.java} (74%)
 rename src/test/java/io/lettuce/core/commands/reactive/{KeyReactiveCommandTest.java => HLLReactiveCommandIntegrationTests.java} (66%)
 rename src/test/java/io/lettuce/core/commands/reactive/{ListReactiveCommandTest.java => HashReactiveCommandIntegrationTests.java} (66%)
 rename src/test/java/io/lettuce/core/commands/reactive/{HashReactiveCommandTest.java => KeyReactiveCommandIntegrationTests.java} (66%)
 create mode 100644 src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandIntegrationTests.java
 create mode 100644 src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandIntegrationTests.java
 delete mode 100644 src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java
 create mode 100644 src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandIntegrationTests.java
 delete mode 100644 src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java
 rename src/test/java/io/lettuce/core/commands/reactive/{ServerReactiveCommandTest.java => ServerReactiveCommandIntegrationTests.java} (78%)
 rename src/test/java/io/lettuce/core/commands/reactive/{HLLReactiveCommandTest.java => SetReactiveCommandIntegrationTests.java} (66%)
 delete mode 100644 src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java
 create mode 100644 src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandIntegrationTests.java
 delete mode 100644 src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java
 create mode 100644 src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandIntegrationTests.java
 delete mode 100644 src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java
 rename src/test/java/io/lettuce/core/commands/reactive/{StreamReactiveCommandTest.java => StreamReactiveCommandIntegrationTests.java} (65%)
 rename src/test/java/io/lettuce/core/commands/reactive/{StringReactiveCommandTest.java => StringReactiveCommandIntegrationTests.java} (58%)
 rename src/test/java/io/lettuce/core/commands/reactive/{TransactionReactiveCommandTest.java => TransactionReactiveCommandIntegrationTests.java} (81%)
 create mode 100644 src/test/java/io/lettuce/core/commands/transactional/BitTxCommandIntegrationTests.java
 delete mode 100644 src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java
 rename src/test/java/io/lettuce/core/commands/transactional/{GeoTxCommandTest.java => GeoTxCommandIntegrationTests.java} (79%)
 rename src/test/java/io/lettuce/core/commands/transactional/{SetTxCommandTest.java => HLLTxCommandIntegrationTests.java} (65%)
 rename src/test/java/io/lettuce/core/commands/transactional/{HLLTxCommandTest.java => HashTxCommandIntegrationTests.java} (65%)
 rename src/test/java/io/lettuce/core/commands/transactional/{KeyTxCommandTest.java => KeyTxCommandIntegrationTests.java} (68%)
 rename src/test/java/io/lettuce/core/commands/transactional/{HashTxCommandTest.java => ListTxCommandIntegrationTests.java} (65%)
 rename src/test/java/io/lettuce/core/commands/transactional/{ListTxCommandTest.java => SetTxCommandIntegrationTests.java} (65%)
 create mode 100644 src/test/java/io/lettuce/core/commands/transactional/SortTxCommandIntegrationTests.java
 delete mode 100644 src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java
 create mode 100644 src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandIntegrationTests.java
 delete mode 100644 src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java
 create mode 100644 src/test/java/io/lettuce/core/commands/transactional/StringTxCommandIntegrationTests.java
 delete mode 100644 src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java
 rename src/test/java/io/lettuce/core/event/{ConnectionEventsTriggeredTest.java => ConnectionEventsTriggeredIntegrationTests.java} (96%)
 rename src/test/java/io/lettuce/core/masterslave/{CustomCommandTest.java => CustomCommandIntegrationTests.java} (98%)
 rename src/test/java/io/lettuce/core/protocol/{ConnectionFailureTest.java => ConnectionFailureIntegrationTests.java} (94%)
 rename src/test/java/io/lettuce/core/tracing/{BraveTracingTest.java => BraveTracingIntegrationTests.java} (93%)

diff --git a/src/main/java/io/lettuce/core/PlainChannelInitializer.java b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
index f27786b0f9..a1e42cd885 100644
--- a/src/main/java/io/lettuce/core/PlainChannelInitializer.java
+++ b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
@@ -40,7 +40,7 @@
  */
 class PlainChannelInitializer extends io.netty.channel.ChannelInitializer<Channel> implements RedisChannelInitializer {
 
-    final static Supplier<AsyncCommand<?, ?, ?>> NO_PING = () -> null;
+    static final Supplier<AsyncCommand<?, ?, ?>> NO_PING = () -> null;
 
     private final Supplier<List<ChannelHandler>> handlers;
     private final Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier;
diff --git a/src/main/java/io/lettuce/core/Range.java b/src/main/java/io/lettuce/core/Range.java
index 991545f522..9631a3a5ff 100644
--- a/src/main/java/io/lettuce/core/Range.java
+++ b/src/main/java/io/lettuce/core/Range.java
@@ -168,7 +168,7 @@ public String toString() {
      */
     public static class Boundary<T> {
 
-        private final static Boundary<?> UNBOUNDED = new Boundary<>(null, true);
+        private static final Boundary<?> UNBOUNDED = new Boundary<>(null, true);
 
         private final T value;
         private final boolean including;
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index 4fcc52e14c..b43fcbd9bf 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -428,8 +428,8 @@ static class SlotIntent {
 
         final int slotHash;
         final Intent intent;
-        private final static SlotIntent[] READ;
-        private final static SlotIntent[] WRITE;
+        private static final SlotIntent[] READ;
+        private static final SlotIntent[] WRITE;
 
         static {
             READ = new SlotIntent[SlotHash.SLOT_COUNT];
diff --git a/src/main/java/io/lettuce/core/dynamic/BatchTasks.java b/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
index d1ef6cc91e..599b51bcc8 100644
--- a/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
@@ -29,7 +29,7 @@
  */
 class BatchTasks implements Iterable<RedisCommand<?, ?, ?>> {
 
-    public final static BatchTasks EMPTY = new BatchTasks(Collections.emptyList());
+    public static final BatchTasks EMPTY = new BatchTasks(Collections.emptyList());
 
     private final List<RedisCommand<?, ?, ?>> futures;
 
diff --git a/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
index 6c841d8356..c63775e0e4 100644
--- a/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
@@ -226,9 +226,9 @@ public int compareTo(Voted<?> o) {
      */
     protected static class ParameterWrappers {
 
-        private final static Set<Class<?>> WRAPPERS = new HashSet<>();
-        private final static Set<Class<?>> WITH_KEY_TYPE = new HashSet<>();
-        private final static Set<Class<?>> WITH_VALUE_TYPE = new HashSet<>();
+        private static final Set<Class<?>> WRAPPERS = new HashSet<>();
+        private static final Set<Class<?>> WITH_KEY_TYPE = new HashSet<>();
+        private static final Set<Class<?>> WITH_VALUE_TYPE = new HashSet<>();
 
         static {
 
diff --git a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
index ebd08751cc..bcc7e92f0e 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
@@ -38,7 +38,7 @@
 @SuppressWarnings("rawtypes")
 public class OutputRegistry {
 
-    private final static Map<OutputType, CommandOutputFactory> BUILTIN = new LinkedHashMap<>();
+    private static final Map<OutputType, CommandOutputFactory> BUILTIN = new LinkedHashMap<>();
     private final Map<OutputType, CommandOutputFactory> registry = new LinkedHashMap<>();
 
     static {
diff --git a/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java b/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
index bebad6844e..bf5fd2ec21 100644
--- a/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
@@ -155,7 +155,7 @@ private static boolean isProxyOfSameInterfaces(Object arg, Class<?> proxyClass)
 
     protected static class MethodTranslator {
 
-        private final static WeakHashMap<Class<?>, MethodTranslator> TRANSLATOR_MAP = new WeakHashMap<>(32);
+        private static final WeakHashMap<Class<?>, MethodTranslator> TRANSLATOR_MAP = new WeakHashMap<>(32);
         private final Map<Method, Method> map;
 
         private MethodTranslator(Class<?> delegate, Class<?>... methodSources) {
diff --git a/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java b/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
index d3790469ec..f2db9ebc0d 100644
--- a/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
@@ -207,7 +207,7 @@ static class Sync<K, T extends AsyncCloseable, F extends CompletionStage<T>> {
         private static final int PHASE_CANCELED = 3;
 
         @SuppressWarnings({ "rawtypes", "unchecked" })
-        private final static AtomicIntegerFieldUpdater<Sync> PHASE = AtomicIntegerFieldUpdater.newUpdater(Sync.class, "phase");
+        private static final AtomicIntegerFieldUpdater<Sync> PHASE = AtomicIntegerFieldUpdater.newUpdater(Sync.class, "phase");
 
         // Updated with AtomicIntegerFieldUpdater
         @SuppressWarnings("unused")
diff --git a/src/main/java/io/lettuce/core/internal/DefaultMethods.java b/src/main/java/io/lettuce/core/internal/DefaultMethods.java
index 1b4b3ed694..197ea5475b 100644
--- a/src/main/java/io/lettuce/core/internal/DefaultMethods.java
+++ b/src/main/java/io/lettuce/core/internal/DefaultMethods.java
@@ -33,7 +33,7 @@
  */
 public class DefaultMethods {
 
-    private final static MethodHandleLookup methodHandleLookup = MethodHandleLookup.getMethodHandleLookup();
+    private static final MethodHandleLookup methodHandleLookup = MethodHandleLookup.getMethodHandleLookup();
 
     /**
      * Lookup a {@link MethodHandle} for a default {@link Method}.
diff --git a/src/main/java/io/lettuce/core/output/ListSubscriber.java b/src/main/java/io/lettuce/core/output/ListSubscriber.java
index dd9ba689a5..f75b62df1e 100644
--- a/src/main/java/io/lettuce/core/output/ListSubscriber.java
+++ b/src/main/java/io/lettuce/core/output/ListSubscriber.java
@@ -27,7 +27,7 @@
  */
 class ListSubscriber<T> extends Subscriber<T> {
 
-    private final static ListSubscriber<Object> INSTANCE = new ListSubscriber<>();
+    private static final ListSubscriber<Object> INSTANCE = new ListSubscriber<>();
 
     private ListSubscriber() {
     }
diff --git a/src/main/java/io/lettuce/core/protocol/Command.java b/src/main/java/io/lettuce/core/protocol/Command.java
index 37de0909f5..bafa846b38 100644
--- a/src/main/java/io/lettuce/core/protocol/Command.java
+++ b/src/main/java/io/lettuce/core/protocol/Command.java
@@ -32,9 +32,9 @@
  */
 public class Command<K, V, T> implements RedisCommand<K, V, T> {
 
-    protected final static byte ST_INITIAL = 0;
-    protected final static byte ST_COMPLETED = 1;
-    protected final static byte ST_CANCELLED = 2;
+    protected static final byte ST_INITIAL = 0;
+    protected static final byte ST_COMPLETED = 1;
+    protected static final byte ST_CANCELLED = 2;
 
     private final ProtocolKeyword type;
 
diff --git a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
index c821b69e79..a813dc27db 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
@@ -31,11 +31,11 @@
 public class CommandWrapper<K, V, T> implements RedisCommand<K, V, T>, CompleteableCommand<T>, DecoratedCommand<K, V, T> {
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    private final static AtomicReferenceFieldUpdater<CommandWrapper, Object[]> ONCOMPLETE = AtomicReferenceFieldUpdater
+    private static final AtomicReferenceFieldUpdater<CommandWrapper, Object[]> ONCOMPLETE = AtomicReferenceFieldUpdater
             .newUpdater(CommandWrapper.class, Object[].class, "onComplete");
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    private final static Object[] EMPTY = new Object[0];
+    private static final Object[] EMPTY = new Object[0];
 
     protected final RedisCommand<K, V, T> command;
 
diff --git a/src/test/java/io/lettuce/apigenerator/Constants.java b/src/test/java/io/lettuce/apigenerator/Constants.java
index 9dbe29d9fb..4ddf288851 100644
--- a/src/test/java/io/lettuce/apigenerator/Constants.java
+++ b/src/test/java/io/lettuce/apigenerator/Constants.java
@@ -22,11 +22,11 @@
  */
 class Constants {
 
-    public final static String[] TEMPLATE_NAMES = { "BaseRedisCommands", "RedisGeoCommands", "RedisHashCommands",
+    public static final String[] TEMPLATE_NAMES = { "BaseRedisCommands", "RedisGeoCommands", "RedisHashCommands",
             "RedisHLLCommands", "RedisKeyCommands", "RedisListCommands", "RedisScriptingCommands", "RedisSentinelCommands",
             "RedisServerCommands", "RedisSetCommands", "RedisSortedSetCommands", "RedisStreamCommands", "RedisStringCommands",
             "RedisTransactionalCommands" };
 
-    public final static File TEMPLATES = new File("src/main/templates");
-    public final static File SOURCES = new File("src/main/java");
+    public static final File TEMPLATES = new File("src/main/templates");
+    public static final File SOURCES = new File("src/main/java");
 }
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandTest.java b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
similarity index 95%
rename from src/test/java/io/lettuce/core/ConnectionCommandTest.java
rename to src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
index e20d5f2b9f..3e94cd0ae8 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandTest.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
@@ -40,16 +40,14 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-class ConnectionCommandTest extends TestSupport {
+class ConnectionCommandIntegrationTests extends TestSupport {
 
     private final RedisClient client;
-    private final StatefulRedisConnection<String, String> connection;
     private final RedisCommands<String, String> redis;
 
     @Inject
-    ConnectionCommandTest(RedisClient client, StatefulRedisConnection<String, String> connection) {
+    ConnectionCommandIntegrationTests(RedisClient client, StatefulRedisConnection<String, String> connection) {
         this.client = client;
-        this.connection = connection;
         this.redis = connection.sync();
     }
 
diff --git a/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java b/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java
index 8977bb4ce4..8b61e88bba 100644
--- a/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java
@@ -23,7 +23,9 @@
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -35,6 +37,7 @@
  */
 @SuppressWarnings("rawtypes")
 @ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class PipeliningIntegrationTests extends TestSupport {
 
     private final RedisClient client;
@@ -46,6 +49,11 @@ class PipeliningIntegrationTests extends TestSupport {
         this.connection = connection;
     }
 
+    @BeforeEach
+    void setUp() {
+        this.connection.async().flushall();
+    }
+
     @Test
     void basic() {
 
diff --git a/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
index e360112bd0..9887df8a03 100644
--- a/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
@@ -27,7 +27,9 @@
 import javax.enterprise.inject.New;
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
@@ -43,6 +45,7 @@
 import io.lettuce.test.Wait;
 
 @ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class ReactiveConnectionIntegrationTests extends TestSupport {
 
     private final StatefulRedisConnection<String, String> connection;
@@ -54,7 +57,11 @@ class ReactiveConnectionIntegrationTests extends TestSupport {
         this.connection = connection;
         this.redis = connection.sync();
         this.reactive = connection.reactive();
-        this.redis.flushall();
+    }
+
+    @BeforeEach
+    void setUp() {
+        this.connection.async().flushall();
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java b/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java
index 18d5abd2cb..80a9fad5e6 100644
--- a/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java
@@ -22,7 +22,9 @@
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import reactor.test.StepVerifier;
@@ -38,6 +40,7 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class ReactiveStreamingOutputIntegrationTests extends TestSupport {
 
     private final RedisCommands<String, String> redis;
@@ -49,6 +52,11 @@ class ReactiveStreamingOutputIntegrationTests extends TestSupport {
         this.reactive = connection.reactive();
     }
 
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
+
     @Test
     void keyListCommandShouldReturnAllElements() {
 
diff --git a/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java b/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java
index b0d5a8ddc1..df88f4ab02 100644
--- a/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java
@@ -29,8 +29,8 @@
  */
 class RedisClientFactoryUnitTests {
 
-    private final static String URI = "redis://" + TestSettings.host() + ":" + TestSettings.port();
-    private final static RedisURI REDIS_URI = RedisURI.create(URI);
+    private static final String URI = "redis://" + TestSettings.host() + ":" + TestSettings.port();
+    private static final RedisURI REDIS_URI = RedisURI.create(URI);
 
     @Test
     void plain() {
diff --git a/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java b/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java
index 1e0834c03e..2df78e0573 100644
--- a/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java
@@ -25,7 +25,9 @@
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -37,17 +39,21 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class ScanIteratorIntegrationTests extends TestSupport {
 
-    private final StatefulRedisConnection<String, String> connection;
     private final RedisCommands<String, String> redis;
 
     @Inject
     ScanIteratorIntegrationTests(StatefulRedisConnection<String, String> connection) {
-        this.connection = connection;
         this.redis = connection.sync();
     }
 
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
+
     @Test
     void scanShouldThrowNoSuchElementExceptionOnEmpty() {
 
diff --git a/src/test/java/io/lettuce/core/ScanStreamTest.java b/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java
similarity index 91%
rename from src/test/java/io/lettuce/core/ScanStreamTest.java
rename to src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java
index cdf9ac5053..36f15c5ae5 100644
--- a/src/test/java/io/lettuce/core/ScanStreamTest.java
+++ b/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java
@@ -20,7 +20,9 @@
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import reactor.core.publisher.Flux;
@@ -34,17 +36,23 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-class ScanStreamTest extends TestSupport {
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class ScanStreamIntegrationTests extends TestSupport {
 
     private final StatefulRedisConnection<String, String> connection;
     private final RedisCommands<String, String> redis;
 
     @Inject
-    ScanStreamTest(StatefulRedisConnection<String, String> connection) {
+    ScanStreamIntegrationTests(StatefulRedisConnection<String, String> connection) {
         this.connection = connection;
         this.redis = connection.sync();
     }
 
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
+
     @Test
     void shouldScanIteratively() {
 
diff --git a/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java b/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java
similarity index 98%
rename from src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java
rename to src/test/java/io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java
index ace8a313be..72dc3d34a6 100644
--- a/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java
+++ b/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java
@@ -32,7 +32,7 @@
  * @author Mark Paluch
  * @since 3.0
  */
-class SyncAsyncApiConvergenceTest {
+class SyncAsyncApiConvergenceUnitTests {
 
     @SuppressWarnings("rawtypes")
     private Class<RedisAsyncCommands> asyncClass = RedisAsyncCommands.class;
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java
index dfe68e2cab..18549090d1 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java
@@ -33,8 +33,8 @@
  */
 class RedisClusterClientFactoryTests {
 
-    private final static String URI = "redis://" + TestSettings.host() + ":" + TestSettings.port();
-    private final static RedisURI REDIS_URI = RedisURI.create(URI);
+    private static final String URI = "redis://" + TestSettings.host() + ":" + TestSettings.port();
+    private static final RedisURI REDIS_URI = RedisURI.create(URI);
     private static final List<RedisURI> REDIS_URIS = LettuceLists.newList(REDIS_URI);
 
     @Test
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
index 8aec366496..486c03e4c5 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
@@ -135,8 +135,6 @@ void statefulConnectionFromAsync() {
     @Test
     void shouldApplyTimeoutOnRegularConnection() {
 
-        clusterClient.setDefaultTimeout(1, TimeUnit.MINUTES);
-
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
 
         assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(1));
@@ -148,12 +146,12 @@ void shouldApplyTimeoutOnRegularConnection() {
     @Test
     void shouldApplyTimeoutOnRegularConnectionUsingCodec() {
 
-        clusterClient.setDefaultTimeout(1, TimeUnit.MINUTES);
+        clusterClient.setDefaultTimeout(2, TimeUnit.MINUTES);
 
         StatefulRedisClusterConnection<String, String> connection = clusterClient.connect(Utf8StringCodec.UTF8);
 
-        assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(1));
-        assertThat(connection.getConnection(host, ClusterTestSettings.port1).getTimeout()).isEqualTo(Duration.ofMinutes(1));
+        assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(2));
+        assertThat(connection.getConnection(host, ClusterTestSettings.port1).getTimeout()).isEqualTo(Duration.ofMinutes(2));
 
         connection.close();
     }
@@ -161,7 +159,7 @@ void shouldApplyTimeoutOnRegularConnectionUsingCodec() {
     @Test
     void shouldApplyTimeoutOnPubSubConnection() {
 
-        clusterClient.setDefaultTimeout(1, TimeUnit.MINUTES);
+        clusterClient.setDefaultTimeout(Duration.ofMinutes(1));
 
         StatefulRedisPubSubConnection<String, String> connection = clusterClient.connectPubSub();
 
@@ -172,8 +170,7 @@ void shouldApplyTimeoutOnPubSubConnection() {
     @Test
     void shouldApplyTimeoutOnPubSubConnectionUsingCodec() {
 
-        clusterClient.setDefaultTimeout(1, TimeUnit.MINUTES);
-
+        clusterClient.setDefaultTimeout(Duration.ofMinutes(1));
         StatefulRedisPubSubConnection<String, String> connection = clusterClient.connectPubSub(Utf8StringCodec.UTF8);
 
         assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(1));
@@ -262,7 +259,6 @@ void testClusteredOperations() {
         assertThat(connection.set(ClusterTestSettings.KEY_D, "myValue2")).isEqualTo("OK");
 
         connection.getStatefulConnection().close();
-
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java
similarity index 98%
rename from src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
rename to src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java
index f1c46ac966..51420fedb2 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java
@@ -42,7 +42,7 @@
 /**
  * @author Mark Paluch
  */
-class RedisClusterPasswordSecuredSslTest extends TestSupport {
+class RedisClusterPasswordSecuredSslIntegrationTests extends TestSupport {
 
     private static final int CLUSTER_PORT_SSL_1 = 7443;
     private static final int CLUSTER_PORT_SSL_2 = 7444;
diff --git a/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientIntegrationTests.java
similarity index 94%
rename from src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java
rename to src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientIntegrationTests.java
index b3d3efcfcf..2ff7bb19e5 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientIntegrationTests.java
@@ -36,13 +36,13 @@
  */
 @SuppressWarnings("unchecked")
 @ExtendWith(LettuceExtension.class)
-class RedisReactiveClusterClientTest extends TestSupport {
+class RedisReactiveClusterClientIntegrationTests extends TestSupport {
 
     private final RedisAdvancedClusterCommands<String, String> sync;
     private final RedisAdvancedClusterReactiveCommands<String, String> reactive;
 
     @Inject
-    RedisReactiveClusterClientTest(StatefulRedisClusterConnection<String, String> connection) {
+    RedisReactiveClusterClientIntegrationTests(StatefulRedisClusterConnection<String, String> connection) {
         this.sync = connection.sync();
         this.reactive = connection.reactive();
     }
@@ -60,6 +60,8 @@ void testClusterCommandRedirection() {
     @Test
     void getKeysInSlot() {
 
+        sync.flushall();
+
         sync.set(ClusterTestSettings.KEY_A, value);
         sync.set(ClusterTestSettings.KEY_B, value);
 
@@ -72,6 +74,8 @@ void getKeysInSlot() {
     @Test
     void countKeysInSlot() {
 
+        sync.flushall();
+
         sync.set(ClusterTestSettings.KEY_A, value);
         sync.set(ClusterTestSettings.KEY_B, value);
 
diff --git a/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
index ff29bfca64..04fd0ac424 100644
--- a/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
@@ -25,7 +25,9 @@
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.*;
@@ -38,6 +40,7 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class ScanIteratorIntegrationTests extends TestSupport {
 
     private final StatefulRedisClusterConnection<String, String> connection;
@@ -47,6 +50,10 @@ class ScanIteratorIntegrationTests extends TestSupport {
     ScanIteratorIntegrationTests(StatefulRedisClusterConnection<String, String> connection) {
         this.connection = connection;
         this.redis = connection.sync();
+    }
+
+    @BeforeEach
+    void setUp() {
         this.redis.flushall();
     }
 
diff --git a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientIntegrationTests.java
similarity index 92%
rename from src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java
rename to src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientIntegrationTests.java
index e51006695e..11330b1ca1 100644
--- a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientTest.java
+++ b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientIntegrationTests.java
@@ -28,12 +28,13 @@
 import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
 import io.lettuce.core.resource.DefaultClientResources;
 import io.lettuce.core.resource.DefaultEventLoopGroupProvider;
+import io.lettuce.test.resource.FastShutdown;
 import io.netty.util.concurrent.ImmediateEventExecutor;
 
 /**
  * @author Mark Paluch
  */
-class SingleThreadedReactiveClusterClientTest {
+class SingleThreadedReactiveClusterClientIntegrationTests {
 
     private RedisClusterClient client;
 
@@ -51,8 +52,8 @@ void before() {
     @AfterEach
     void tearDown() {
 
-        client.shutdown();
-        client.getResources().shutdown();
+        FastShutdown.shutdown(client);
+        FastShutdown.shutdown(client.getResources());
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java
similarity index 85%
rename from src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java
index 49cf7fff56..b79ebbe060 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java
@@ -31,7 +31,7 @@
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.commands.CustomCommandTest;
+import io.lettuce.core.commands.CustomCommandIntegrationTests;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
 import io.lettuce.test.Futures;
@@ -41,13 +41,13 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-class CustomClusterCommandTest extends TestSupport {
+class CustomClusterCommandIntegrationTests extends TestSupport {
 
     private final StatefulRedisClusterConnection<String, String> connection;
     private RedisAdvancedClusterCommands<String, String> redis;
 
     @Inject
-    CustomClusterCommandTest(StatefulRedisClusterConnection<String, String> connection) {
+    CustomClusterCommandIntegrationTests(StatefulRedisClusterConnection<String, String> connection) {
         this.connection = connection;
         this.redis = connection.sync();
         this.redis.flushall();
@@ -56,7 +56,7 @@ class CustomClusterCommandTest extends TestSupport {
     @Test
     void dispatchSet() {
 
-        String response = redis.dispatch(CustomCommandTest.MyCommands.SET, new StatusOutput<>(StringCodec.UTF8),
+        String response = redis.dispatch(CustomCommandIntegrationTests.MyCommands.SET, new StatusOutput<>(StringCodec.UTF8),
                 new CommandArgs<>(StringCodec.UTF8).addKey(key).addValue(value));
 
         assertThat(response).isEqualTo("OK");
@@ -65,7 +65,7 @@ void dispatchSet() {
     @Test
     void dispatchWithoutArgs() {
 
-        String response = redis.dispatch(CustomCommandTest.MyCommands.INFO, new StatusOutput<>(StringCodec.UTF8));
+        String response = redis.dispatch(CustomCommandIntegrationTests.MyCommands.INFO, new StatusOutput<>(StringCodec.UTF8));
 
         assertThat(response).contains("connected_clients");
     }
@@ -82,7 +82,8 @@ void dispatchShouldFailForWrongDataType() {
     @Test
     void clusterAsyncPing() {
 
-        RedisCommand<String, String, String> command = new Command<>(CustomCommandTest.MyCommands.PING, new StatusOutput<>(
+        RedisCommand<String, String, String> command = new Command<>(CustomCommandIntegrationTests.MyCommands.PING,
+                new StatusOutput<>(
                 StringCodec.UTF8), null);
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(command);
@@ -94,10 +95,12 @@ void clusterAsyncPing() {
     @Test
     void clusterAsyncBatchPing() {
 
-        RedisCommand<String, String, String> command1 = new Command<>(CustomCommandTest.MyCommands.PING, new StatusOutput<>(
+        RedisCommand<String, String, String> command1 = new Command<>(CustomCommandIntegrationTests.MyCommands.PING,
+                new StatusOutput<>(
                 StringCodec.UTF8), null);
 
-        RedisCommand<String, String, String> command2 = new Command<>(CustomCommandTest.MyCommands.PING, new StatusOutput<>(
+        RedisCommand<String, String, String> command2 = new Command<>(CustomCommandIntegrationTests.MyCommands.PING,
+                new StatusOutput<>(
                 StringCodec.UTF8), null);
 
         AsyncCommand<String, String, String> async1 = new AsyncCommand<>(command1);
@@ -133,7 +136,8 @@ void clusterAsyncBatchSet() {
     @Test
     void clusterFireAndForget() {
 
-        RedisCommand<String, String, String> command = new Command<>(CustomCommandTest.MyCommands.PING, new StatusOutput<>(
+        RedisCommand<String, String, String> command = new Command<>(CustomCommandIntegrationTests.MyCommands.PING,
+                new StatusOutput<>(
                 StringCodec.UTF8), null);
         connection.dispatch(command);
         assertThat(command.isCancelled()).isFalse();
diff --git a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandIntegrationTests.java
similarity index 51%
rename from src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandIntegrationTests.java
index e15094fbe0..be59dad6f2 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandIntegrationTests.java
@@ -15,58 +15,22 @@
  */
 package io.lettuce.core.cluster.commands;
 
-import static io.lettuce.core.cluster.ClusterTestUtil.flushDatabaseOfAllNodes;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import javax.inject.Inject;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.ClusterTestUtil;
-import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
-import io.lettuce.core.commands.GeoCommandTest;
-import io.lettuce.test.condition.RedisConditions;
-import io.lettuce.test.resource.FastShutdown;
-import io.lettuce.test.resource.TestClientResources;
-import io.lettuce.test.settings.TestSettings;
+import io.lettuce.core.commands.GeoCommandIntegrationTests;
 
 /**
  * @author Mark Paluch
  */
-public class GeoClusterCommandTest extends GeoCommandTest {
-    private static RedisClusterClient redisClusterClient;
-    private StatefulRedisClusterConnection<String, String> clusterConnection;
+class GeoClusterCommandIntegrationTests extends GeoCommandIntegrationTests {
 
-    @BeforeAll
-    public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
-                RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
-
-        try (StatefulRedisClusterConnection<String, String> connection = redisClusterClient.connect()) {
-            assumeTrue(RedisConditions.of(connection).hasCommand("GEOADD"));
-        }
-    }
-
-    @AfterAll
-    static void closeClient() {
-        FastShutdown.shutdown(redisClusterClient);
-    }
-
-    @BeforeEach
-    public void openConnection() {
-        redis = connect();
-        flushDatabaseOfAllNodes(clusterConnection);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    protected RedisCommands<String, String> connect() {
-        clusterConnection = redisClusterClient.connect();
-        return ClusterTestUtil.redisCommandsOverCluster(clusterConnection);
+    @Inject
+    GeoClusterCommandIntegrationTests(StatefulRedisClusterConnection<String, String> clusterConnection) {
+        super(ClusterTestUtil.redisCommandsOverCluster(clusterConnection));
     }
 
     @Disabled("MULTI not available on Redis Cluster")
diff --git a/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandIntegrationTests.java
new file mode 100644
index 0000000000..b4360c30d0
--- /dev/null
+++ b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandIntegrationTests.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster.commands;
+
+import javax.inject.Inject;
+
+import io.lettuce.core.cluster.ClusterTestUtil;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.commands.HashCommandIntegrationTests;
+
+/**
+ * @author Mark Paluch
+ */
+public class HashClusterCommandIntegrationTests extends HashCommandIntegrationTests {
+
+    @Inject
+    public HashClusterCommandIntegrationTests(StatefulRedisClusterConnection<String, String> connection) {
+        super(ClusterTestUtil.redisCommandsOverCluster(connection));
+    }
+}
diff --git a/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java
deleted file mode 100644
index 6bde123a33..0000000000
--- a/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.cluster.commands;
-
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.cluster.ClusterTestUtil;
-import io.lettuce.core.cluster.RedisClusterClient;
-import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
-import io.lettuce.core.commands.HashCommandTest;
-import io.lettuce.test.resource.FastShutdown;
-import io.lettuce.test.resource.TestClientResources;
-import io.lettuce.test.settings.TestSettings;
-
-/**
- * @author Mark Paluch
- */
-public class HashClusterCommandTest extends HashCommandTest {
-
-    private static RedisClusterClient redisClusterClient;
-    private StatefulRedisClusterConnection<String, String> clusterConnection;
-
-    @BeforeAll
-    public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(
-                TestClientResources.get(), RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
-    }
-
-    @AfterAll
-    static void closeClient() {
-        FastShutdown.shutdown(redisClusterClient);
-    }
-
-    @BeforeEach
-    public void openConnection() {
-        redis = connect();
-        ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    protected RedisCommands<String, String> connect() {
-        clusterConnection = redisClusterClient.connect();
-        return ClusterTestUtil.redisCommandsOverCluster(clusterConnection);
-    }
-}
diff --git a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandIntegrationTests.java
similarity index 64%
rename from src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandIntegrationTests.java
index f5c2db7044..3b75233664 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandIntegrationTests.java
@@ -17,52 +17,39 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import javax.inject.Inject;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.core.AbstractRedisClientTest;
-import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.ClusterTestUtil;
-import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.condition.EnabledOnCommand;
-import io.lettuce.test.resource.FastShutdown;
-import io.lettuce.test.resource.TestClientResources;
-import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class KeyClusterCommandTest extends AbstractRedisClientTest {
-
-    private static RedisClusterClient redisClusterClient;
-    private StatefulRedisClusterConnection<String, String> clusterConnection;
+@ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class KeyClusterCommandIntegrationTests extends TestSupport {
 
-    @BeforeAll
-    public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
-                RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
-    }
+    private final StatefulRedisClusterConnection<String, String> clusterConnection;
+    private final RedisCommands<String, String> redis;
 
-    @AfterAll
-    static void closeClient() {
-        FastShutdown.shutdown(redisClusterClient);
+    @Inject
+    KeyClusterCommandIntegrationTests(StatefulRedisClusterConnection<String, String> clusterConnection) {
+        this.clusterConnection = clusterConnection;
+        this.redis = ClusterTestUtil.redisCommandsOverCluster(clusterConnection);
     }
 
     @BeforeEach
-    public void openConnection() {
-        redis = connect();
-        ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    protected RedisCommands<String, String> connect() {
-        clusterConnection = redisClusterClient.connect();
-        return ClusterTestUtil.redisCommandsOverCluster(clusterConnection);
+    void setUp() {
+        this.redis.flushall();
     }
 
     @Test
@@ -113,5 +100,4 @@ void unlink() {
         assertThat(redis.unlink(key, "a", "b")).isEqualTo(3);
         assertThat(redis.exists(key)).isEqualTo(0);
     }
-
 }
diff --git a/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandIntegrationTests.java
similarity index 62%
rename from src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandIntegrationTests.java
index f7c84838ae..ffeb4b115e 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandIntegrationTests.java
@@ -17,51 +17,28 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
+import javax.inject.Inject;
+
 import org.junit.jupiter.api.Test;
 
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.ClusterTestUtil;
-import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
-import io.lettuce.core.commands.ListCommandTest;
-import io.lettuce.test.resource.FastShutdown;
-import io.lettuce.test.resource.TestClientResources;
-import io.lettuce.test.settings.TestSettings;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.core.commands.ListCommandIntegrationTests;
 
 /**
  * @author Mark Paluch
  */
-public class ListClusterCommandTest extends ListCommandTest {
-    private static RedisClusterClient redisClusterClient;
-    private StatefulRedisClusterConnection<String, String> clusterConnection;
-
-    @BeforeAll
-    public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(
-                TestClientResources.get(), RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
-    }
+class ListClusterCommandIntegrationTests extends ListCommandIntegrationTests {
 
-    @AfterAll
-    static void closeClient() {
-        FastShutdown.shutdown(redisClusterClient);
-    }
+    private final RedisClusterCommands<String, String> redis;
 
-    @BeforeEach
-    public void openConnection() {
-        redis = connect();
-        ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
+    @Inject
+    ListClusterCommandIntegrationTests(StatefulRedisClusterConnection<String, String> connection) {
+        super(ClusterTestUtil.redisCommandsOverCluster(connection));
+        this.redis = connection.sync();
     }
 
-    @Override
-    @SuppressWarnings("unchecked")
-    protected RedisCommands<String, String> connect() {
-        clusterConnection = redisClusterClient.connect();
-        return ClusterTestUtil.redisCommandsOverCluster(clusterConnection);
-    }
 
     // re-implementation because keys have to be on the same slot
     @Test
@@ -100,5 +77,4 @@ void rpoplpush() {
         assertThat(redis.lrange("UKPDHs8Zlp", 0, -1)).isEqualTo(list("1"));
         assertThat(redis.lrange("br7EPz9bbj", 0, -1)).isEqualTo(list("2", "3", "4"));
     }
-
 }
diff --git a/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandIntegrationTests.java
similarity index 56%
rename from src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandIntegrationTests.java
index dbcbd74917..19dfeee11a 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandIntegrationTests.java
@@ -20,51 +20,27 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
+import javax.inject.Inject;
+
 import org.junit.jupiter.api.Test;
 
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.ClusterTestUtil;
-import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
-import io.lettuce.core.commands.StringCommandTest;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.core.commands.StringCommandIntegrationTests;
 import io.lettuce.test.KeyValueStreamingAdapter;
-import io.lettuce.test.resource.FastShutdown;
-import io.lettuce.test.resource.TestClientResources;
-import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class StringClusterCommandTest extends StringCommandTest {
-    private static RedisClusterClient redisClusterClient;
-    private StatefulRedisClusterConnection<String, String> clusterConnection;
-
-    @BeforeAll
-    public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(
-                TestClientResources.get(), RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
-    }
+class StringClusterCommandIntegrationTests extends StringCommandIntegrationTests {
 
-    @AfterAll
-    static void closeClient() {
-        FastShutdown.shutdown(redisClusterClient);
-    }
-
-    @BeforeEach
-    public void openConnection() {
-        redis = connect();
-        ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
-    }
+    private final RedisClusterCommands<String, String> redis;
 
-    @Override
-    @SuppressWarnings("unchecked")
-    protected RedisCommands<String, String> connect() {
-        clusterConnection = redisClusterClient.connect();
-        return ClusterTestUtil.redisCommandsOverCluster(clusterConnection);
+    @Inject
+    StringClusterCommandIntegrationTests(StatefulRedisClusterConnection<String, String> connection) {
+        super(ClusterTestUtil.redisCommandsOverCluster(connection));
+        this.redis = connection.sync();
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandIntegrationTests.java
new file mode 100644
index 0000000000..c6031bb283
--- /dev/null
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandIntegrationTests.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster.commands.reactive;
+
+import javax.inject.Inject;
+
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.commands.HashCommandIntegrationTests;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
+
+/**
+ * @author Mark Paluch
+ */
+class HashClusterReactiveCommandIntegrationTests extends HashCommandIntegrationTests {
+
+    @Inject
+    HashClusterReactiveCommandIntegrationTests(StatefulRedisClusterConnection<String, String> connection) {
+        super(ReactiveSyncInvocationHandler.sync(connection));
+    }
+}
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
deleted file mode 100644
index 2ac1bc07c7..0000000000
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.cluster.commands.reactive;
-
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.cluster.ClusterTestUtil;
-import io.lettuce.core.cluster.RedisClusterClient;
-import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
-import io.lettuce.core.commands.HashCommandTest;
-import io.lettuce.test.ReactiveSyncInvocationHandler;
-import io.lettuce.test.resource.FastShutdown;
-import io.lettuce.test.resource.TestClientResources;
-import io.lettuce.test.settings.TestSettings;
-
-/**
- * @author Mark Paluch
- */
-public class HashClusterReactiveCommandTest extends HashCommandTest {
-
-    private static RedisClusterClient redisClusterClient;
-    private StatefulRedisClusterConnection<String, String> clusterConnection;
-
-    @BeforeAll
-    public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
-                RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
-    }
-
-    @AfterAll
-    static void closeClient() {
-        FastShutdown.shutdown(redisClusterClient);
-    }
-
-    @BeforeEach
-    public void openConnection() {
-        redis = connect();
-        ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
-    }
-
-    @Override
-    protected RedisCommands<String, String> connect() {
-        clusterConnection = redisClusterClient.connect();
-        return ReactiveSyncInvocationHandler.sync(redisClusterClient.connect());
-    }
-}
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java
deleted file mode 100644
index d2be833cc1..0000000000
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/KeyClusterReativeCommandTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.cluster.commands.reactive;
-
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.cluster.ClusterTestUtil;
-import io.lettuce.core.cluster.RedisClusterClient;
-import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
-import io.lettuce.core.cluster.commands.KeyClusterCommandTest;
-import io.lettuce.test.ReactiveSyncInvocationHandler;
-import io.lettuce.test.resource.FastShutdown;
-import io.lettuce.test.resource.TestClientResources;
-import io.lettuce.test.settings.TestSettings;
-
-/**
- * @author Mark Paluch
- */
-public class KeyClusterReativeCommandTest extends KeyClusterCommandTest {
-    private static RedisClusterClient redisClusterClient;
-    private StatefulRedisClusterConnection<String, String> clusterConnection;
-
-    @BeforeAll
-    public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
-                RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
-    }
-
-    @AfterAll
-    static void closeClient() {
-        FastShutdown.shutdown(redisClusterClient);
-    }
-
-    @BeforeEach
-    public void openConnection() {
-        redis = connect();
-        ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
-    }
-
-    protected RedisCommands<String, String> connect() {
-        clusterConnection = redisClusterClient.connect();
-        return ReactiveSyncInvocationHandler.sync(redisClusterClient.connect());
-    }
-
-}
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandIntegrationTests.java
similarity index 62%
rename from src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandIntegrationTests.java
index 8b0e2cae5e..e0638c587b 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandIntegrationTests.java
@@ -17,50 +17,26 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
+import javax.inject.Inject;
+
 import org.junit.jupiter.api.Test;
 
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.cluster.ClusterTestUtil;
-import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
-import io.lettuce.core.commands.ListCommandTest;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.core.commands.ListCommandIntegrationTests;
 import io.lettuce.test.ReactiveSyncInvocationHandler;
-import io.lettuce.test.resource.FastShutdown;
-import io.lettuce.test.resource.TestClientResources;
-import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class ListClusterReactiveCommandTest extends ListCommandTest {
-    private static RedisClusterClient redisClusterClient;
-    private StatefulRedisClusterConnection<String, String> clusterConnection;
-
-    @BeforeAll
-    public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
-                RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
-    }
+class ListClusterReactiveCommandIntegrationTests extends ListCommandIntegrationTests {
 
-    @AfterAll
-    static void closeClient() {
-        FastShutdown.shutdown(redisClusterClient);
-    }
-
-    @BeforeEach
-    public void openConnection() {
-        redis = connect();
-        ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
-    }
+    private final RedisClusterCommands<String, String> redis;
 
-    @Override
-    protected RedisCommands<String, String> connect() {
-        clusterConnection = redisClusterClient.connect();
-        return ReactiveSyncInvocationHandler.sync(redisClusterClient.connect());
+    @Inject
+    ListClusterReactiveCommandIntegrationTests(StatefulRedisClusterConnection<String, String> connection) {
+        super(ReactiveSyncInvocationHandler.sync(connection));
+        this.redis = ReactiveSyncInvocationHandler.sync(connection);
     }
 
     // re-implementation because keys have to be on the same slot
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandIntegrationTests.java
similarity index 57%
rename from src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandIntegrationTests.java
index c0860a9fc2..800d3b9a2c 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandIntegrationTests.java
@@ -20,54 +20,32 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
+import javax.inject.Inject;
+
 import org.junit.jupiter.api.Test;
 
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 import io.lettuce.core.KeyValue;
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.cluster.ClusterTestUtil;
-import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
-import io.lettuce.core.commands.StringCommandTest;
+import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
+import io.lettuce.core.commands.StringCommandIntegrationTests;
 import io.lettuce.test.ReactiveSyncInvocationHandler;
-import io.lettuce.test.resource.FastShutdown;
-import io.lettuce.test.resource.TestClientResources;
-import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-public class StringClusterReactiveCommandTest extends StringCommandTest {
-    private static RedisClusterClient redisClusterClient;
-    private StatefulRedisClusterConnection<String, String> clusterConnection;
-
-    @BeforeAll
-    public static void setupClient() {
-        redisClusterClient = RedisClusterClient.create(TestClientResources.get(),
-                RedisURI.Builder.redis(TestSettings.host(), TestSettings.port(900)).build());
-    }
+class StringClusterReactiveCommandIntegrationTests extends StringCommandIntegrationTests {
 
-    @AfterAll
-    static void closeClient() {
-        FastShutdown.shutdown(redisClusterClient);
-    }
-
-    @BeforeEach
-    public void openConnection() {
-        redis = connect();
-        ClusterTestUtil.flushDatabaseOfAllNodes(clusterConnection);
-    }
+    private final StatefulRedisClusterConnection<String, String> connection;
+    private final RedisClusterCommands<String, String> redis;
 
-    @Override
-    protected RedisCommands<String, String> connect() {
-        clusterConnection = redisClusterClient.connect();
-        return ReactiveSyncInvocationHandler.sync(redisClusterClient.connect());
+    @Inject
+    StringClusterReactiveCommandIntegrationTests(StatefulRedisClusterConnection<String, String> connection) {
+        super(ReactiveSyncInvocationHandler.sync(connection));
+        this.connection = connection;
+        this.redis = connection.sync();
     }
 
     @Test
@@ -90,7 +68,7 @@ void mget() {
         redis.set("key1", value);
         redis.set("key2", value);
 
-        RedisAdvancedClusterReactiveCommands<String, String> reactive = clusterConnection.reactive();
+        RedisAdvancedClusterReactiveCommands<String, String> reactive = connection.reactive();
 
         Flux<KeyValue<String, String>> mget = reactive.mget(key, "key1", "key2");
         StepVerifier.create(mget.next()).expectNext(KeyValue.just(key, value)).verifyComplete();
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
index 96af83ba75..e992868ef5 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
@@ -62,7 +62,7 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 class ClusterTopologyRefreshUnitTests {
 
-    private final static long COMMAND_TIMEOUT_NS = TimeUnit.MILLISECONDS.toNanos(10);
+    private static final long COMMAND_TIMEOUT_NS = TimeUnit.MILLISECONDS.toNanos(10);
 
     private static final String NODE_1_VIEW = "1 127.0.0.1:7380 master,myself - 0 1401258245007 2 disconnected 8000-11999\n"
             + "2 127.0.0.1:7381 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n";
diff --git a/src/test/java/io/lettuce/core/commands/BitCommandTest.java b/src/test/java/io/lettuce/core/commands/BitCommandIntegrationTests.java
similarity index 89%
rename from src/test/java/io/lettuce/core/commands/BitCommandTest.java
rename to src/test/java/io/lettuce/core/commands/BitCommandIntegrationTests.java
index 03583056eb..2c2d955b9c 100644
--- a/src/test/java/io/lettuce/core/commands/BitCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/BitCommandIntegrationTests.java
@@ -25,35 +25,49 @@
 
 import java.util.List;
 
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.BitFieldArgs;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.condition.EnabledOnCommand;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class BitCommandTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class BitCommandIntegrationTests extends TestSupport {
+
+    private final RedisClient client;
+    private final RedisCommands<String, String> redis;
 
     protected RedisCommands<String, String> bitstring;
 
-    @Override
-    public RedisCommands<String, String> connect() {
-        connectBitString();
-        return super.connect();
+    @Inject
+    protected BitCommandIntegrationTests(RedisClient client, RedisCommands<String, String> redis) {
+        this.client = client;
+        this.redis = redis;
     }
 
-    void connectBitString() {
-        bitstring = client.connect(new BitStringCodec()).sync();
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+        this.bitstring = client.connect(new BitStringCodec()).sync();
     }
 
-    @Override
-    public void closeConnection() throws Exception {
-        bitstring.getStatefulConnection().close();
-        super.closeConnection();
+    @AfterEach
+    void tearDown() {
+        this.bitstring.getStatefulConnection().close();
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/commands/CustomCommandTest.java b/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java
similarity index 94%
rename from src/test/java/io/lettuce/core/commands/CustomCommandTest.java
rename to src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java
index f22fd2f7b1..51a25b7084 100644
--- a/src/test/java/io/lettuce/core/commands/CustomCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java
@@ -23,7 +23,9 @@
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.RedisCommandExecutionException;
@@ -41,15 +43,21 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-public class CustomCommandTest extends TestSupport {
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class CustomCommandIntegrationTests extends TestSupport {
 
     private final RedisCommands<String, String> redis;
 
     @Inject
-    CustomCommandTest(StatefulRedisConnection<String, String> connection) {
+    CustomCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
         this.redis = connection.sync();
     }
 
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
+
     @Test
     void dispatchSet() {
 
diff --git a/src/test/java/io/lettuce/core/commands/GeoCommandTest.java b/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java
similarity index 96%
rename from src/test/java/io/lettuce/core/commands/GeoCommandTest.java
rename to src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java
index 68a3765317..66e7d64a96 100644
--- a/src/test/java/io/lettuce/core/commands/GeoCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java
@@ -23,27 +23,37 @@
 import java.util.List;
 import java.util.Set;
 
-import org.junit.jupiter.api.BeforeAll;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.*;
-import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.condition.EnabledOnCommand;
 import io.lettuce.test.condition.RedisConditions;
-import io.lettuce.test.resource.DefaultRedisClient;
 
 /**
  * @author Mark Paluch
  */
-public class GeoCommandTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+@EnabledOnCommand("GEOADD")
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class GeoCommandIntegrationTests extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
 
-    @BeforeAll
-    public static void setupClient() {
-        client = DefaultRedisClient.get();
-        client.setOptions(ClientOptions.create());
+    @Inject
+    protected GeoCommandIntegrationTests(RedisCommands<String, String> redis) {
+        this.redis = redis;
+    }
 
-        try (StatefulRedisConnection<String, String> connection = client.connect()) {
-            assumeTrue(RedisConditions.of(connection).hasCommand("GEOADD"));
-        }
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/commands/HLLCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/HLLCommandIntegrationTests.java
new file mode 100644
index 0000000000..78072d7ec5
--- /dev/null
+++ b/src/test/java/io/lettuce/core/commands/HLLCommandIntegrationTests.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.commands;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Fail.fail;
+
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.lettuce.core.TestSupport;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.LettuceExtension;
+
+/**
+ * @author Mark Paluch
+ */
+@ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class HLLCommandIntegrationTests extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    protected HLLCommandIntegrationTests(RedisCommands<String, String> redis) {
+        this.redis = redis;
+    }
+
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
+
+    @Test
+    void pfadd() {
+
+        assertThat(redis.pfadd(key, value, value)).isEqualTo(1);
+        assertThat(redis.pfadd(key, value, value)).isEqualTo(0);
+        assertThat(redis.pfadd(key, value)).isEqualTo(0);
+    }
+
+    @Test
+    void pfaddNoValues() {
+        assertThatThrownBy(() -> redis.pfadd(key)).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    void pfaddNullValues() {
+        try {
+            redis.pfadd(key, null);
+            fail("Missing IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+        }
+        try {
+            redis.pfadd(key, value, null);
+            fail("Missing IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+        }
+    }
+
+    @Test
+    void pfmerge() {
+        redis.pfadd(key, value);
+        redis.pfadd("key2", "value2");
+        redis.pfadd("key3", "value3");
+
+        assertThat(redis.pfmerge(key, "key2", "key3")).isEqualTo("OK");
+        assertThat(redis.pfcount(key)).isEqualTo(3);
+
+        redis.pfadd("key2660", "rand", "mat");
+        redis.pfadd("key7112", "mat", "perrin");
+
+        redis.pfmerge("key8885", "key2660", "key7112");
+
+        assertThat(redis.pfcount("key8885")).isEqualTo(3);
+    }
+
+    @Test
+    void pfmergeNoKeys() {
+        assertThatThrownBy(() -> redis.pfmerge(key)).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    void pfcount() {
+        redis.pfadd(key, value);
+        redis.pfadd("key2", "value2");
+        assertThat(redis.pfcount(key)).isEqualTo(1);
+        assertThat(redis.pfcount(key, "key2")).isEqualTo(2);
+    }
+
+    @Test
+    void pfcountNoKeys() {
+        assertThatThrownBy(() -> redis.pfcount()).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    void pfaddPfmergePfCount() {
+
+        redis.pfadd("key2660", "rand", "mat");
+        redis.pfadd("key7112", "mat", "perrin");
+
+        redis.pfmerge("key8885", "key2660", "key7112");
+
+        assertThat(redis.pfcount("key8885")).isEqualTo(3);
+    }
+}
diff --git a/src/test/java/io/lettuce/core/commands/HLLCommandTest.java b/src/test/java/io/lettuce/core/commands/HLLCommandTest.java
deleted file mode 100644
index 1ca6da85a5..0000000000
--- a/src/test/java/io/lettuce/core/commands/HLLCommandTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.commands;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.assertj.core.api.Fail.fail;
-
-import org.junit.jupiter.api.Test;
-
-import io.lettuce.core.AbstractRedisClientTest;
-import io.lettuce.core.api.sync.RedisHLLCommands;
-
-public class HLLCommandTest extends AbstractRedisClientTest {
-
-    private RedisHLLCommands<String, String> commands() {
-        return redis;
-    }
-
-    @Test
-    void pfadd() {
-
-        assertThat(commands().pfadd(key, value, value)).isEqualTo(1);
-        assertThat(commands().pfadd(key, value, value)).isEqualTo(0);
-        assertThat(commands().pfadd(key, value)).isEqualTo(0);
-    }
-
-    @Test
-    void pfaddNoValues() {
-        assertThatThrownBy(() -> commands().pfadd(key)).isInstanceOf(IllegalArgumentException.class);
-    }
-
-    @Test
-    void pfaddNullValues() {
-        try {
-            commands().pfadd(key, null);
-            fail("Missing IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-            commands().pfadd(key, value, null);
-            fail("Missing IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
-    }
-
-    @Test
-    void pfmerge() {
-        commands().pfadd(key, value);
-        commands().pfadd("key2", "value2");
-        commands().pfadd("key3", "value3");
-
-        assertThat(commands().pfmerge(key, "key2", "key3")).isEqualTo("OK");
-        assertThat(commands().pfcount(key)).isEqualTo(3);
-
-        commands().pfadd("key2660", "rand", "mat");
-        commands().pfadd("key7112", "mat", "perrin");
-
-        commands().pfmerge("key8885", "key2660", "key7112");
-
-        assertThat(commands().pfcount("key8885")).isEqualTo(3);
-    }
-
-    @Test
-    void pfmergeNoKeys() {
-        assertThatThrownBy(() -> commands().pfmerge(key)).isInstanceOf(IllegalArgumentException.class);
-    }
-
-    @Test
-    void pfcount() {
-        commands().pfadd(key, value);
-        commands().pfadd("key2", "value2");
-        assertThat(commands().pfcount(key)).isEqualTo(1);
-        assertThat(commands().pfcount(key, "key2")).isEqualTo(2);
-    }
-
-    @Test
-    void pfcountNoKeys() {
-        assertThatThrownBy(() -> commands().pfcount()).isInstanceOf(IllegalArgumentException.class);
-    }
-
-    @Test
-    void pfaddPfmergePfCount() {
-
-        commands().pfadd("key2660", "rand", "mat");
-        commands().pfadd("key7112", "mat", "perrin");
-
-        commands().pfmerge("key8885", "key2660", "key7112");
-
-        assertThat(commands().pfcount("key8885")).isEqualTo(3);
-    }
-}
diff --git a/src/test/java/io/lettuce/core/commands/HashCommandTest.java b/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java
similarity index 94%
rename from src/test/java/io/lettuce/core/commands/HashCommandTest.java
rename to src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java
index b60515d241..f51bb5a1ad 100644
--- a/src/test/java/io/lettuce/core/commands/HashCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java
@@ -23,10 +23,17 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.*;
+import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.test.KeyValueStreamingAdapter;
+import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.ListStreamingAdapter;
 import io.lettuce.test.condition.EnabledOnCommand;
 
@@ -34,7 +41,21 @@
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class HashCommandTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class HashCommandIntegrationTests extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    protected HashCommandIntegrationTests(RedisCommands<String, String> redis) {
+        this.redis = redis;
+    }
+
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
 
     @Test
     void hdel() {
diff --git a/src/test/java/io/lettuce/core/commands/KeyCommandTest.java b/src/test/java/io/lettuce/core/commands/KeyCommandIntegrationTests.java
similarity index 95%
rename from src/test/java/io/lettuce/core/commands/KeyCommandTest.java
rename to src/test/java/io/lettuce/core/commands/KeyCommandIntegrationTests.java
index 6e40de3375..925174696f 100644
--- a/src/test/java/io/lettuce/core/commands/KeyCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/KeyCommandIntegrationTests.java
@@ -22,9 +22,16 @@
 import java.time.Duration;
 import java.util.*;
 
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.*;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.ListStreamingAdapter;
 import io.lettuce.test.condition.EnabledOnCommand;
 
@@ -32,7 +39,21 @@
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class KeyCommandTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class KeyCommandIntegrationTests extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    protected KeyCommandIntegrationTests(RedisCommands<String, String> redis) {
+        this.redis = redis;
+    }
+
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
 
     @Test
     void del() {
diff --git a/src/test/java/io/lettuce/core/commands/ListCommandTest.java b/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java
similarity index 91%
rename from src/test/java/io/lettuce/core/commands/ListCommandTest.java
rename to src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java
index 75d5eb82e2..57259c42f9 100644
--- a/src/test/java/io/lettuce/core/commands/ListCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java
@@ -21,9 +21,16 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.TestSupport;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.ListStreamingAdapter;
 import io.lettuce.test.condition.RedisConditions;
 
@@ -31,7 +38,21 @@
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class ListCommandTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ListCommandIntegrationTests extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    protected ListCommandIntegrationTests(RedisCommands<String, String> redis) {
+        this.redis = redis;
+    }
+
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
 
     @Test
     void blpop() {
@@ -60,11 +81,6 @@ void brpoplpush() {
         assertThat(redis.lrange("two", 0, -1)).isEqualTo(list("2", "3", "4"));
     }
 
-    @Test
-    void brpoplpushTimeout() {
-        assertThat(redis.brpoplpush(1, "one", "two")).isNull();
-    }
-
     @Test
     void lindex() {
         assertThat(redis.lindex(key, 0)).isNull();
diff --git a/src/test/java/io/lettuce/core/commands/NumericCommandTest.java b/src/test/java/io/lettuce/core/commands/NumericCommandIntegrationTests.java
similarity index 70%
rename from src/test/java/io/lettuce/core/commands/NumericCommandTest.java
rename to src/test/java/io/lettuce/core/commands/NumericCommandIntegrationTests.java
index 7cfbc0f038..25dd26bf7b 100644
--- a/src/test/java/io/lettuce/core/commands/NumericCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/NumericCommandIntegrationTests.java
@@ -18,15 +18,37 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.offset;
 
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.TestSupport;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class NumericCommandTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class NumericCommandIntegrationTests extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    protected NumericCommandIntegrationTests(RedisCommands<String, String> redis) {
+        this.redis = redis;
+    }
+
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
+
     @Test
     void decr() {
         assertThat((long) redis.decr(key)).isEqualTo(-1);
diff --git a/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java b/src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java
similarity index 86%
rename from src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
rename to src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java
index f69623a97f..a2c8055d2d 100644
--- a/src/test/java/io/lettuce/core/commands/ScriptingCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java
@@ -23,20 +23,44 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import javax.inject.Inject;
+
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.RedisNoScriptException;
+import io.lettuce.core.TestSupport;
 import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class ScriptingCommandTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ScriptingCommandIntegrationTests extends TestSupport {
+
+    private final RedisClient client;
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    protected ScriptingCommandIntegrationTests(RedisClient client, RedisCommands<String, String> redis) {
+        this.client = client;
+        this.redis = redis;
+    }
+
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
 
     @AfterEach
     void tearDown() {
diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
similarity index 93%
rename from src/test/java/io/lettuce/core/commands/ServerCommandTest.java
rename to src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
index 8cffc6ef99..eed95d86d9 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
@@ -28,8 +28,13 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -39,6 +44,7 @@
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RoleParser;
 import io.lettuce.core.protocol.CommandType;
+import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
 import io.lettuce.test.condition.EnabledOnCommand;
 import io.lettuce.test.condition.RedisConditions;
@@ -48,7 +54,23 @@
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class ServerCommandTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ServerCommandIntegrationTests extends TestSupport {
+
+    private final RedisClient client;
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    protected ServerCommandIntegrationTests(RedisClient client, RedisCommands<String, String> redis) {
+        this.client = client;
+        this.redis = redis;
+    }
+
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
 
     @Test
     void bgrewriteaof() {
@@ -224,7 +246,7 @@ void debugCrashAndRecover() {
     void debugHtstats() {
         redis.set(key, value);
         String result = redis.debugHtstats(0);
-        assertThat(result).contains("table size");
+        assertThat(result).contains("Dictionary");
     }
 
     @Test
@@ -255,11 +277,6 @@ void debugSdslen() {
         assertThat(result).contains("key_sds_len");
     }
 
-    /**
-     * this test causes a stop of the redis. This means, you cannot repeat the test without restarting your redis.
-     *
-     * @
-     */
     @Test
     void flushall() {
         redis.set(key, value);
@@ -280,12 +297,8 @@ void flushallAsync() {
     @Test
     void flushdb() {
         redis.set(key, value);
-        redis.select(1);
-        redis.set(key, value + "X");
         assertThat(redis.flushdb()).isEqualTo("OK");
         assertThat(redis.get(key)).isNull();
-        redis.select(0);
-        assertThat(redis.get(key)).isEqualTo(value);
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/commands/SetCommandTest.java b/src/test/java/io/lettuce/core/commands/SetCommandIntegrationTests.java
similarity index 94%
rename from src/test/java/io/lettuce/core/commands/SetCommandTest.java
rename to src/test/java/io/lettuce/core/commands/SetCommandIntegrationTests.java
index 78d3741ba4..71dc8efd8c 100644
--- a/src/test/java/io/lettuce/core/commands/SetCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SetCommandIntegrationTests.java
@@ -24,9 +24,16 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.*;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.ListStreamingAdapter;
 import io.lettuce.test.condition.RedisConditions;
 
@@ -34,7 +41,21 @@
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class SetCommandTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class SetCommandIntegrationTests extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    protected SetCommandIntegrationTests(RedisCommands<String, String> redis) {
+        this.redis = redis;
+    }
+
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
 
     @Test
     void sadd() {
diff --git a/src/test/java/io/lettuce/core/commands/SortCommandTest.java b/src/test/java/io/lettuce/core/commands/SortCommandIntegrationTests.java
similarity index 80%
rename from src/test/java/io/lettuce/core/commands/SortCommandTest.java
rename to src/test/java/io/lettuce/core/commands/SortCommandIntegrationTests.java
index ca285baf96..20e351c06d 100644
--- a/src/test/java/io/lettuce/core/commands/SortCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SortCommandIntegrationTests.java
@@ -18,16 +18,38 @@
 import static io.lettuce.core.SortArgs.Builder.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.TestSupport;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.ListStreamingAdapter;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class SortCommandTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class SortCommandIntegrationTests extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    protected SortCommandIntegrationTests(RedisCommands<String, String> redis) {
+        this.redis = redis;
+    }
+
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
+
     @Test
     void sort() {
         redis.rpush(key, "3", "2", "1");
diff --git a/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java b/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
similarity index 98%
rename from src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
rename to src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
index b5fa9e9d28..f0e1a2183d 100644
--- a/src/test/java/io/lettuce/core/commands/SortedSetCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
@@ -29,10 +29,17 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.*;
 import io.lettuce.core.Range.Boundary;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.ListStreamingAdapter;
 import io.lettuce.test.condition.EnabledOnCommand;
 
@@ -40,7 +47,21 @@
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class SortedSetCommandTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class SortedSetCommandIntegrationTests extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    protected SortedSetCommandIntegrationTests(RedisCommands<String, String> redis) {
+        this.redis = redis;
+    }
+
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
 
     @Test
     void zadd() {
diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandTest.java b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
similarity index 95%
rename from src/test/java/io/lettuce/core/commands/StreamCommandTest.java
rename to src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
index 6122a7e833..689970cef1 100644
--- a/src/test/java/io/lettuce/core/commands/StreamCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
@@ -21,22 +21,43 @@
 import java.time.Instant;
 import java.util.*;
 
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.*;
 import io.lettuce.core.XReadArgs.StreamOffset;
+import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.models.stream.PendingMessage;
 import io.lettuce.core.models.stream.PendingParser;
 import io.lettuce.core.output.NestedMultiOutput;
 import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.condition.EnabledOnCommand;
 
 /**
  * @author Mark Paluch
  */
+@ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @EnabledOnCommand("XADD")
-public class StreamCommandTest extends AbstractRedisClientTest {
+public class StreamCommandIntegrationTests extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    protected StreamCommandIntegrationTests(RedisCommands<String, String> redis) {
+        this.redis = redis;
+    }
+
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
 
     @Test
     void xadd() {
diff --git a/src/test/java/io/lettuce/core/commands/StringCommandTest.java b/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java
similarity index 90%
rename from src/test/java/io/lettuce/core/commands/StringCommandTest.java
rename to src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java
index 65e9c5f7d8..1f980d119a 100644
--- a/src/test/java/io/lettuce/core/commands/StringCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java
@@ -26,18 +26,39 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.RedisException;
+import io.lettuce.core.TestSupport;
+import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.test.KeyValueStreamingAdapter;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class StringCommandTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class StringCommandIntegrationTests extends TestSupport {
+
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    protected StringCommandIntegrationTests(RedisCommands<String, String> redis) {
+        this.redis = redis;
+    }
+
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
 
     @Test
     void append() {
diff --git a/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java b/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java
similarity index 77%
rename from src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
rename to src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java
index de1e89ed12..d7adba8d6e 100644
--- a/src/test/java/io/lettuce/core/commands/TransactionCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java
@@ -18,19 +18,38 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.core.AbstractRedisClientTest;
-import io.lettuce.core.RedisCommandExecutionException;
-import io.lettuce.core.RedisException;
-import io.lettuce.core.TransactionResult;
+import io.lettuce.core.*;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.test.LettuceExtension;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
  */
-public class TransactionCommandTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class TransactionCommandIntegrationTests extends TestSupport {
+
+    private final RedisClient client;
+    private final RedisCommands<String, String> redis;
+
+    @Inject
+    protected TransactionCommandIntegrationTests(RedisClient client, RedisCommands<String, String> redis) {
+        this.client = client;
+        this.redis = redis;
+    }
+
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
 
     @Test
     void discard() {
@@ -118,7 +137,7 @@ void errorInMulti() {
 
     @Test
     void execWithoutMulti() {
-        assertThatThrownBy(() -> redis.exec()).isInstanceOf(RedisCommandExecutionException.class).hasMessageContaining(
+        assertThatThrownBy(redis::exec).isInstanceOf(RedisCommandExecutionException.class).hasMessageContaining(
                 "ERR EXEC without MULTI");
     }
 
@@ -126,7 +145,8 @@ void execWithoutMulti() {
     void multiCalledTwiceShouldFail() {
 
         redis.multi();
-        assertThatThrownBy(() -> redis.multi()).isInstanceOf(RedisCommandExecutionException.class).hasMessageContaining(
+        assertThatThrownBy(redis::multi).isInstanceOf(RedisCommandExecutionException.class).hasMessageContaining(
                 "ERR MULTI calls can not be nested");
+        redis.discard();
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandIntegrationTests.java
similarity index 86%
rename from src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandIntegrationTests.java
index abb22b8975..ef9facc8f4 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandIntegrationTests.java
@@ -21,32 +21,30 @@
 import static io.lettuce.core.BitFieldArgs.OverflowType.FAIL;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import javax.inject.Inject;
+
 import org.junit.jupiter.api.Test;
 
 import reactor.test.StepVerifier;
 import io.lettuce.core.BitFieldArgs;
+import io.lettuce.core.RedisClient;
 import io.lettuce.core.Value;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.reactive.RedisStringReactiveCommands;
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.BitCommandTest;
-import io.lettuce.core.commands.BitStringCodec;
+import io.lettuce.core.commands.BitCommandIntegrationTests;
 import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
  */
-public class BitReactiveCommandTest extends BitCommandTest {
+class BitReactiveCommandIntegrationTests extends BitCommandIntegrationTests {
 
     private RedisStringReactiveCommands<String, String> reactive;
 
-    @Override
-    public RedisCommands<String, String> connect() {
-        bitstring = ReactiveSyncInvocationHandler.sync(client.connect(new BitStringCodec()));
-
-        StatefulRedisConnection<String, String> connection = client.connect();
-        reactive = connection.reactive();
-        return ReactiveSyncInvocationHandler.sync(connection);
+    @Inject
+    BitReactiveCommandIntegrationTests(RedisClient client, StatefulRedisConnection<String, String> connection) {
+        super(client, ReactiveSyncInvocationHandler.sync(connection));
+        this.reactive = connection.reactive();
     }
 
     @Test
@@ -88,7 +86,7 @@ void bitfieldWithOffsetSet() {
 
         assertThat(bitstring.get(key)).isEqualTo("000000000000000010100000");
 
-        redis.del(key);
+        bitstring.del(key);
         StepVerifier.create(reactive.bitfield(key, BitFieldArgs.Builder.set(signed(8), offset(2), 5))).expectNextCount(1)
                 .verifyComplete();
         assertThat(bitstring.get(key)).isEqualTo("1000000000000010");
diff --git a/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandIntegrationTests.java
similarity index 74%
rename from src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandIntegrationTests.java
index 127cc19771..e07ae03dc3 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandIntegrationTests.java
@@ -18,30 +18,35 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.offset;
 
+import javax.inject.Inject;
+
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import reactor.test.StepVerifier;
+import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.reactive.RedisReactiveCommands;
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.GeoCommandTest;
+import io.lettuce.core.commands.GeoCommandIntegrationTests;
 import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
  */
-public class GeoReactiveCommandTest extends GeoCommandTest {
+class GeoReactiveCommandIntegrationTests extends GeoCommandIntegrationTests {
 
-    @Override
-    public RedisCommands<String, String> connect() {
-        return ReactiveSyncInvocationHandler.sync(client.connect());
+    private final StatefulRedisConnection<String, String> connection;
+
+    @Inject
+    GeoReactiveCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(ReactiveSyncInvocationHandler.sync(connection));
+        this.connection = connection;
     }
 
     @Test
     @Override
     public void geopos() {
 
-        RedisReactiveCommands<String, String> reactive = client.connect().reactive();
+        RedisReactiveCommands<String, String> reactive = connection.reactive();
 
         prepareGeo();
 
diff --git a/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandIntegrationTests.java
similarity index 66%
rename from src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandIntegrationTests.java
index 88f5dfebb3..2556582c59 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandIntegrationTests.java
@@ -15,17 +15,19 @@
  */
 package io.lettuce.core.commands.reactive;
 
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.KeyCommandTest;
+import javax.inject.Inject;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.HLLCommandIntegrationTests;
 import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
  */
-public class KeyReactiveCommandTest extends KeyCommandTest {
+class HLLReactiveCommandIntegrationTests extends HLLCommandIntegrationTests {
 
-    @Override
-    public RedisCommands<String, String> connect() {
-        return ReactiveSyncInvocationHandler.sync(client.connect());
+    @Inject
+    HLLReactiveCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(ReactiveSyncInvocationHandler.sync(connection));
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandIntegrationTests.java
similarity index 66%
rename from src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandIntegrationTests.java
index 57760d4015..41468d1c0c 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandIntegrationTests.java
@@ -15,17 +15,19 @@
  */
 package io.lettuce.core.commands.reactive;
 
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.ListCommandTest;
+import javax.inject.Inject;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.HashCommandIntegrationTests;
 import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
  */
-public class ListReactiveCommandTest extends ListCommandTest {
+class HashReactiveCommandIntegrationTests extends HashCommandIntegrationTests {
 
-    @Override
-    public RedisCommands<String, String> connect() {
-        return ReactiveSyncInvocationHandler.sync(client.connect());
+    @Inject
+    HashReactiveCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(ReactiveSyncInvocationHandler.sync(connection));
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandIntegrationTests.java
similarity index 66%
rename from src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandIntegrationTests.java
index 4e936bd14b..73b376f835 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandIntegrationTests.java
@@ -15,17 +15,19 @@
  */
 package io.lettuce.core.commands.reactive;
 
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.HashCommandTest;
+import javax.inject.Inject;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.KeyCommandIntegrationTests;
 import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
  */
-public class HashReactiveCommandTest extends HashCommandTest {
+class KeyReactiveCommandIntegrationTests extends KeyCommandIntegrationTests {
 
-    @Override
-    public RedisCommands<String, String> connect() {
-        return ReactiveSyncInvocationHandler.sync(client.connect());
+    @Inject
+    KeyReactiveCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(ReactiveSyncInvocationHandler.sync(connection));
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandIntegrationTests.java
new file mode 100644
index 0000000000..ecc317327b
--- /dev/null
+++ b/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandIntegrationTests.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.commands.reactive;
+
+import javax.inject.Inject;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.ListCommandIntegrationTests;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
+
+/**
+ * @author Mark Paluch
+ */
+class ListReactiveCommandIntegrationTests extends ListCommandIntegrationTests {
+
+    @Inject
+    ListReactiveCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(ReactiveSyncInvocationHandler.sync(connection));
+    }
+}
diff --git a/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandIntegrationTests.java
new file mode 100644
index 0000000000..41da7b6098
--- /dev/null
+++ b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandIntegrationTests.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.commands.reactive;
+
+import javax.inject.Inject;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.NumericCommandIntegrationTests;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
+
+/**
+ * @author Mark Paluch
+ */
+class NumericReactiveCommandIntegrationTests extends NumericCommandIntegrationTests {
+
+    @Inject
+    NumericReactiveCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(ReactiveSyncInvocationHandler.sync(connection));
+    }
+}
diff --git a/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java
deleted file mode 100644
index b58593cc58..0000000000
--- a/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.commands.reactive;
-
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.NumericCommandTest;
-import io.lettuce.test.ReactiveSyncInvocationHandler;
-
-/**
- * @author Mark Paluch
- */
-public class NumericReactiveCommandTest extends NumericCommandTest {
-
-    @Override
-    public RedisCommands<String, String> connect() {
-        return ReactiveSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandIntegrationTests.java
new file mode 100644
index 0000000000..8795fe2fe6
--- /dev/null
+++ b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandIntegrationTests.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.commands.reactive;
+
+import javax.inject.Inject;
+
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.ScriptingCommandIntegrationTests;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
+
+/**
+ * @author Mark Paluch
+ */
+class ScriptingReactiveCommandIntegrationTests extends ScriptingCommandIntegrationTests {
+
+    @Inject
+    ScriptingReactiveCommandIntegrationTests(RedisClient client, StatefulRedisConnection<String, String> connection) {
+        super(client, ReactiveSyncInvocationHandler.sync(connection));
+    }
+}
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java
deleted file mode 100644
index 5f813a0fbe..0000000000
--- a/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.commands.reactive;
-
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.ScriptingCommandTest;
-import io.lettuce.test.ReactiveSyncInvocationHandler;
-
-/**
- * @author Mark Paluch
- */
-public class ScriptingReactiveCommandTest extends ScriptingCommandTest {
-
-    @Override
-    public RedisCommands<String, String> connect() {
-        return ReactiveSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandIntegrationTests.java
similarity index 78%
rename from src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandIntegrationTests.java
index 3795577ce0..f84f1b2aaf 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandIntegrationTests.java
@@ -17,30 +17,27 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.jupiter.api.BeforeEach;
+import javax.inject.Inject;
+
 import org.junit.jupiter.api.Test;
 
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.reactive.RedisReactiveCommands;
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.ServerCommandTest;
+import io.lettuce.core.commands.ServerCommandIntegrationTests;
 import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
  */
-public class ServerReactiveCommandTest extends ServerCommandTest {
+class ServerReactiveCommandIntegrationTests extends ServerCommandIntegrationTests {
 
     private RedisReactiveCommands<String, String> reactive;
 
-    @BeforeEach
-    public void openConnection() throws Exception {
-        super.openConnection();
-        reactive = redis.getStatefulConnection().reactive();
-    }
-
-    @Override
-    public RedisCommands<String, String> connect() {
-        return ReactiveSyncInvocationHandler.sync(client.connect());
+    @Inject
+    ServerReactiveCommandIntegrationTests(RedisClient client, StatefulRedisConnection<String, String> connection) {
+        super(client, ReactiveSyncInvocationHandler.sync(connection));
+        this.reactive = connection.reactive();
     }
 
     /**
diff --git a/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandIntegrationTests.java
similarity index 66%
rename from src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandIntegrationTests.java
index 9097deb5b4..66429071b2 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandIntegrationTests.java
@@ -15,17 +15,19 @@
  */
 package io.lettuce.core.commands.reactive;
 
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.HLLCommandTest;
+import javax.inject.Inject;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.SetCommandIntegrationTests;
 import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
  */
-public class HLLReactiveCommandTest extends HLLCommandTest {
+class SetReactiveCommandIntegrationTests extends SetCommandIntegrationTests {
 
-    @Override
-    public RedisCommands<String, String> connect() {
-        return ReactiveSyncInvocationHandler.sync(client.connect());
+    @Inject
+    SetReactiveCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(ReactiveSyncInvocationHandler.sync(connection));
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java
deleted file mode 100644
index f72b4fc85e..0000000000
--- a/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.commands.reactive;
-
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.SetCommandTest;
-import io.lettuce.test.ReactiveSyncInvocationHandler;
-
-/**
- * @author Mark Paluch
- */
-public class SetReactiveCommandTest extends SetCommandTest {
-
-    @Override
-    public RedisCommands<String, String> connect() {
-        return ReactiveSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandIntegrationTests.java
new file mode 100644
index 0000000000..f554e2b23c
--- /dev/null
+++ b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandIntegrationTests.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.commands.reactive;
+
+import javax.inject.Inject;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.SortCommandIntegrationTests;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
+
+/**
+ * @author Mark Paluch
+ */
+class SortReactiveCommandIntegrationTests extends SortCommandIntegrationTests {
+
+    @Inject
+    SortReactiveCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(ReactiveSyncInvocationHandler.sync(connection));
+    }
+}
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java
deleted file mode 100644
index ec8ed19cc0..0000000000
--- a/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.commands.reactive;
-
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.SortCommandTest;
-import io.lettuce.test.ReactiveSyncInvocationHandler;
-
-/**
- * @author Mark Paluch
- */
-public class SortReactiveCommandTest extends SortCommandTest {
-
-    @Override
-    public RedisCommands<String, String> connect() {
-        return ReactiveSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandIntegrationTests.java
new file mode 100644
index 0000000000..9a00eb0daf
--- /dev/null
+++ b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandIntegrationTests.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.commands.reactive;
+
+import javax.inject.Inject;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.SortedSetCommandIntegrationTests;
+import io.lettuce.test.ReactiveSyncInvocationHandler;
+
+/**
+ * @author Mark Paluch
+ */
+class SortedSetReactiveCommandIntegrationTests extends SortedSetCommandIntegrationTests {
+
+    @Inject
+    SortedSetReactiveCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(ReactiveSyncInvocationHandler.sync(connection));
+    }
+}
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java
deleted file mode 100644
index 338091d814..0000000000
--- a/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.commands.reactive;
-
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.SortedSetCommandTest;
-import io.lettuce.test.ReactiveSyncInvocationHandler;
-
-/**
- * @author Mark Paluch
- */
-public class SortedSetReactiveCommandTest extends SortedSetCommandTest {
-
-    @Override
-    public RedisCommands<String, String> connect() {
-        return ReactiveSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandIntegrationTests.java
similarity index 65%
rename from src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandIntegrationTests.java
index 1b28fce9bf..28ee9c6bf8 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandIntegrationTests.java
@@ -15,17 +15,19 @@
  */
 package io.lettuce.core.commands.reactive;
 
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.StreamCommandTest;
+import javax.inject.Inject;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.StreamCommandIntegrationTests;
 import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
  */
-public class StreamReactiveCommandTest extends StreamCommandTest {
+class StreamReactiveCommandIntegrationTests extends StreamCommandIntegrationTests {
 
-    @Override
-    public RedisCommands<String, String> connect() {
-        return ReactiveSyncInvocationHandler.sync(client.connect());
+    @Inject
+    StreamReactiveCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(ReactiveSyncInvocationHandler.sync(connection));
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandIntegrationTests.java
similarity index 58%
rename from src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandIntegrationTests.java
index 59eb6b49be..205169f796 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandIntegrationTests.java
@@ -15,51 +15,51 @@
  */
 package io.lettuce.core.commands.reactive;
 
+import javax.inject.Inject;
+
 import org.junit.jupiter.api.Test;
 
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
 import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.StringCommandTest;
+import io.lettuce.core.commands.StringCommandIntegrationTests;
 import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
  */
-public class StringReactiveCommandTest extends StringCommandTest {
+class StringReactiveCommandIntegrationTests extends StringCommandIntegrationTests {
+
+    private final RedisCommands<String, String> redis;
+    private final RedisReactiveCommands<String, String> reactive;
 
-    @Override
-    public RedisCommands<String, String> connect() {
-        return ReactiveSyncInvocationHandler.sync(client.connect());
+    @Inject
+    StringReactiveCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(ReactiveSyncInvocationHandler.sync(connection));
+        this.redis = connection.sync();
+        this.reactive = connection.reactive();
     }
 
     @Test
     void mget() {
 
-        StatefulRedisConnection<String, String> connection = client.connect();
-
-        connection.sync().set(key, value);
-        connection.sync().set("key1", value);
-        connection.sync().set("key2", value);
+        redis.set(key, value);
+        redis.set("key1", value);
+        redis.set("key2", value);
 
-        Flux<KeyValue<String, String>> mget = connection.reactive().mget(key, "key1", "key2");
+        Flux<KeyValue<String, String>> mget = reactive.mget(key, "key1", "key2");
         StepVerifier.create(mget.next()).expectNext(KeyValue.just(key, value)).verifyComplete();
-
-        connection.close();
     }
 
     @Test
     void mgetEmpty() {
 
-        StatefulRedisConnection<String, String> connection = client.connect();
-
-        connection.sync().set(key, value);
+        redis.set(key, value);
 
-        Flux<KeyValue<String, String>> mget = connection.reactive().mget("unknown");
+        Flux<KeyValue<String, String>> mget = reactive.mget("unknown");
         StepVerifier.create(mget.next()).expectNext(KeyValue.empty("unknown")).verifyComplete();
-
-        connection.close();
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java
similarity index 81%
rename from src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
rename to src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java
index 321f27e411..8a1fad612c 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java
@@ -17,45 +17,34 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import javax.inject.Inject;
+
 import org.junit.jupiter.api.Test;
 
 import reactor.test.StepVerifier;
-import io.lettuce.core.ClientOptions;
 import io.lettuce.core.KeyValue;
+import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.reactive.RedisReactiveCommands;
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.TransactionCommandTest;
+import io.lettuce.core.commands.TransactionCommandIntegrationTests;
 import io.lettuce.test.ReactiveSyncInvocationHandler;
 
 /**
  * @author Mark Paluch
  */
-public class TransactionReactiveCommandTest extends TransactionCommandTest {
-
-    private RedisReactiveCommands<String, String> commands;
-
-    @Override
-    protected RedisCommands<String, String> connect() {
-        return ReactiveSyncInvocationHandler.sync(client.connect());
-    }
-
-    @BeforeEach
-    public void openConnection() {
-        client.setOptions(ClientOptions.builder().build());
-        redis = connect();
-        redis.flushall();
-        redis.flushdb();
-
-        commands = redis.getStatefulConnection().reactive();
-    }
-
-    @AfterEach
-    public void closeConnection() {
-        redis.getStatefulConnection().close();
+public class TransactionReactiveCommandIntegrationTests extends TransactionCommandIntegrationTests {
+
+    private final RedisClient client;
+    private final RedisReactiveCommands<String, String> commands;
+    private final StatefulRedisConnection<String, String> connection;
+
+    @Inject
+    public TransactionReactiveCommandIntegrationTests(RedisClient client, StatefulRedisConnection<String, String> connection) {
+        super(client, ReactiveSyncInvocationHandler.sync(connection));
+        this.client = client;
+        this.commands = connection.reactive();
+        this.connection = connection;
     }
 
     @Test
@@ -87,6 +76,8 @@ void watchRollback() {
             assertThat(actual).isNotNull();
             assertThat(actual.wasDiscarded()).isTrue();
         });
+
+        otherConnection.close();
     }
 
     @Test
@@ -94,7 +85,7 @@ void execSingular() {
 
         StepVerifier.create(commands.multi()).expectNext("OK").verifyComplete();
 
-        redis.set(key, value);
+        connection.sync().set(key, value);
 
         StepVerifier.create(commands.exec()).consumeNextWith(actual -> assertThat(actual).contains("OK")).verifyComplete();
         StepVerifier.create(commands.get(key)).expectNext(value).verifyComplete();
@@ -111,7 +102,7 @@ void errorInMulti() {
         StepVerifier.create(commands.exec()).consumeNextWith(actual -> {
 
             assertThat((String) actual.get(0)).isEqualTo("OK");
-            assertThat(actual.get(1) instanceof RedisException).isTrue();
+            assertThat((Object) actual.get(1)).isInstanceOf(RedisException.class);
             assertThat((String) actual.get(2)).isEqualTo(value);
         }).verifyComplete();
     }
diff --git a/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandIntegrationTests.java
new file mode 100644
index 0000000000..6c173b00c1
--- /dev/null
+++ b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandIntegrationTests.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.commands.transactional;
+
+import javax.inject.Inject;
+
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.BitCommandIntegrationTests;
+
+/**
+ * @author Mark Paluch
+ */
+class BitTxCommandIntegrationTests extends BitCommandIntegrationTests {
+
+    @Inject
+    BitTxCommandIntegrationTests(RedisClient client, StatefulRedisConnection<String, String> connection) {
+        super(client, TxSyncInvocationHandler.sync(connection));
+    }
+}
diff --git a/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java
deleted file mode 100644
index 0052294565..0000000000
--- a/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.commands.transactional;
-
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.BitCommandTest;
-import io.lettuce.core.commands.BitStringCodec;
-
-/**
- * @author Mark Paluch
- */
-public class BitTxCommandTest extends BitCommandTest {
-
-    @Override
-    public RedisCommands<String, String> connect() {
-        bitstring = TxSyncInvocationHandler.sync(client.connect(new BitStringCodec()));
-        return TxSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandIntegrationTests.java
similarity index 79%
rename from src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandIntegrationTests.java
index 1bc26d9b52..4f5e87a10e 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandIntegrationTests.java
@@ -15,19 +15,21 @@
  */
 package io.lettuce.core.commands.transactional;
 
+import javax.inject.Inject;
+
 import org.junit.jupiter.api.Disabled;
 
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.GeoCommandTest;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.GeoCommandIntegrationTests;
 
 /**
  * @author Mark Paluch
  */
-public class GeoTxCommandTest extends GeoCommandTest {
+class GeoTxCommandIntegrationTests extends GeoCommandIntegrationTests {
 
-    @Override
-    public RedisCommands<String, String> connect() {
-        return TxSyncInvocationHandler.sync(client.connect());
+    @Inject
+    GeoTxCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(TxSyncInvocationHandler.sync(connection));
     }
 
     @Disabled
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandIntegrationTests.java
similarity index 65%
rename from src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandIntegrationTests.java
index e55ffc2571..26d162ab3b 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandIntegrationTests.java
@@ -15,17 +15,18 @@
  */
 package io.lettuce.core.commands.transactional;
 
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.SetCommandTest;
+import javax.inject.Inject;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.HLLCommandIntegrationTests;
 
 /**
  * @author Mark Paluch
  */
-public class SetTxCommandTest extends SetCommandTest {
+class HLLTxCommandIntegrationTests extends HLLCommandIntegrationTests {
 
-    @Override
-    public RedisCommands<String, String> connect() {
-        return TxSyncInvocationHandler.sync(client.connect());
+    @Inject
+    HLLTxCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(TxSyncInvocationHandler.sync(connection));
     }
-
 }
diff --git a/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandIntegrationTests.java
similarity index 65%
rename from src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/transactional/HashTxCommandIntegrationTests.java
index d3c51a6ef6..4080daaee0 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandIntegrationTests.java
@@ -15,16 +15,18 @@
  */
 package io.lettuce.core.commands.transactional;
 
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.HLLCommandTest;
+import javax.inject.Inject;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.HashCommandIntegrationTests;
 
 /**
  * @author Mark Paluch
  */
-public class HLLTxCommandTest extends HLLCommandTest {
+class HashTxCommandIntegrationTests extends HashCommandIntegrationTests {
 
-    @Override
-    public RedisCommands<String, String> connect() {
-        return TxSyncInvocationHandler.sync(client.connect());
+    @Inject
+    HashTxCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(TxSyncInvocationHandler.sync(connection));
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandIntegrationTests.java
similarity index 68%
rename from src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandIntegrationTests.java
index 1c6824af70..404f8b02cf 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandIntegrationTests.java
@@ -15,19 +15,21 @@
  */
 package io.lettuce.core.commands.transactional;
 
+import javax.inject.Inject;
+
 import org.junit.jupiter.api.Disabled;
 
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.KeyCommandTest;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.KeyCommandIntegrationTests;
 
 /**
  * @author Mark Paluch
  */
-public class KeyTxCommandTest extends KeyCommandTest {
+public class KeyTxCommandIntegrationTests extends KeyCommandIntegrationTests {
 
-    @Override
-    public RedisCommands<String, String> connect() {
-        return TxSyncInvocationHandler.sync(client.connect());
+    @Inject
+    KeyTxCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(TxSyncInvocationHandler.sync(connection));
     }
 
     @Disabled
diff --git a/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandIntegrationTests.java
similarity index 65%
rename from src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/transactional/ListTxCommandIntegrationTests.java
index 568968bc2f..e1ab52159c 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandIntegrationTests.java
@@ -15,16 +15,18 @@
  */
 package io.lettuce.core.commands.transactional;
 
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.HashCommandTest;
+import javax.inject.Inject;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.ListCommandIntegrationTests;
 
 /**
  * @author Mark Paluch
  */
-public class HashTxCommandTest extends HashCommandTest {
+class ListTxCommandIntegrationTests extends ListCommandIntegrationTests {
 
-    @Override
-    public RedisCommands<String, String> connect() {
-        return TxSyncInvocationHandler.sync(client.connect());
+    @Inject
+    ListTxCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(TxSyncInvocationHandler.sync(connection));
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandIntegrationTests.java
similarity index 65%
rename from src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java
rename to src/test/java/io/lettuce/core/commands/transactional/SetTxCommandIntegrationTests.java
index dc99b1f90d..0c3fd1cbfa 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandTest.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandIntegrationTests.java
@@ -15,16 +15,18 @@
  */
 package io.lettuce.core.commands.transactional;
 
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.ListCommandTest;
+import javax.inject.Inject;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.SetCommandIntegrationTests;
 
 /**
  * @author Mark Paluch
  */
-public class ListTxCommandTest extends ListCommandTest {
+class SetTxCommandIntegrationTests extends SetCommandIntegrationTests {
 
-    @Override
-    public RedisCommands<String, String> connect() {
-        return TxSyncInvocationHandler.sync(client.connect());
+    @Inject
+    SetTxCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(TxSyncInvocationHandler.sync(connection));
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandIntegrationTests.java
new file mode 100644
index 0000000000..ad11ebf15d
--- /dev/null
+++ b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandIntegrationTests.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.commands.transactional;
+
+import javax.inject.Inject;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.SortCommandIntegrationTests;
+
+/**
+ * @author Mark Paluch
+ */
+class SortTxCommandIntegrationTests extends SortCommandIntegrationTests {
+
+    @Inject
+    SortTxCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(TxSyncInvocationHandler.sync(connection));
+    }
+}
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java
deleted file mode 100644
index 9ea67e5631..0000000000
--- a/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.commands.transactional;
-
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.SortCommandTest;
-
-/**
- * @author Mark Paluch
- */
-public class SortTxCommandTest extends SortCommandTest {
-
-    @Override
-    public RedisCommands<String, String> connect() {
-        return TxSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandIntegrationTests.java
new file mode 100644
index 0000000000..1ea88c364c
--- /dev/null
+++ b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandIntegrationTests.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.commands.transactional;
+
+import javax.inject.Inject;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.SortedSetCommandIntegrationTests;
+
+/**
+ * @author Mark Paluch
+ */
+class SortedSetTxCommandIntegrationTests extends SortedSetCommandIntegrationTests {
+
+    @Inject
+    SortedSetTxCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(TxSyncInvocationHandler.sync(connection));
+    }
+}
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java
deleted file mode 100644
index caa7f54044..0000000000
--- a/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.commands.transactional;
-
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.SortedSetCommandTest;
-
-/**
- * @author Mark Paluch
- */
-public class SortedSetTxCommandTest extends SortedSetCommandTest {
-
-    @Override
-    public RedisCommands<String, String> connect() {
-        return TxSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandIntegrationTests.java
new file mode 100644
index 0000000000..8e359295e5
--- /dev/null
+++ b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandIntegrationTests.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.commands.transactional;
+
+import javax.inject.Inject;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.commands.StringCommandIntegrationTests;
+
+/**
+ * @author Mark Paluch
+ */
+class StringTxCommandIntegrationTests extends StringCommandIntegrationTests {
+
+    @Inject
+    StringTxCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
+        super(TxSyncInvocationHandler.sync(connection));
+    }
+}
diff --git a/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java
deleted file mode 100644
index f60c2fac0d..0000000000
--- a/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2011-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.commands.transactional;
-
-import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.commands.StringCommandTest;
-
-/**
- * @author Mark Paluch
- */
-public class StringTxCommandTest extends StringCommandTest {
-
-    @Override
-    public RedisCommands<String, String> connect() {
-        return TxSyncInvocationHandler.sync(client.connect());
-    }
-}
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java
index e268149370..bbddf41d83 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java
@@ -22,6 +22,7 @@
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -52,6 +53,11 @@ class RedisCommandsBatchingIntegrationTests extends TestSupport {
         this.redis = connection.sync();
     }
 
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
+
     @Test
     void selectiveBatching() {
 
diff --git a/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java
similarity index 96%
rename from src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java
rename to src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java
index fed5cacb26..3c2cd6e8e8 100644
--- a/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredTest.java
+++ b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java
@@ -33,7 +33,7 @@
 /**
  * @author Mark Paluch
  */
-class ConnectionEventsTriggeredTest extends TestSupport {
+class ConnectionEventsTriggeredIntegrationTests extends TestSupport {
 
     @Test
     void testConnectionEvents() {
diff --git a/src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java b/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
similarity index 98%
rename from src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java
rename to src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
index 843c3077d8..535cbe303e 100644
--- a/src/test/java/io/lettuce/core/masterslave/CustomCommandTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
@@ -42,7 +42,7 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-public class CustomCommandTest extends TestSupport {
+class CustomCommandIntegrationTests extends TestSupport {
 
     private final RedisClient redisClient;
 
@@ -50,7 +50,7 @@ public class CustomCommandTest extends TestSupport {
     private RedisCommands<String, String> redis;
 
     @Inject
-    CustomCommandTest(RedisClient redisClient) {
+    CustomCommandIntegrationTests(RedisClient redisClient) {
         this.redisClient = redisClient;
     }
 
diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
similarity index 94%
rename from src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
rename to src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
index 71e608e935..dcf89a3128 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureTest.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
@@ -24,25 +24,34 @@
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.TimeUnit;
 
+import javax.inject.Inject;
+
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
-import io.lettuce.test.ConnectionTestUtil;
-import io.lettuce.test.Delay;
-import io.lettuce.test.Futures;
-import io.lettuce.test.Wait;
+import io.lettuce.test.*;
 import io.lettuce.test.server.RandomResponseServer;
 import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-class ConnectionFailureTest extends AbstractRedisClientTest {
+@ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class ConnectionFailureIntegrationTests extends TestSupport {
+
+    private final RedisClient client;
+    private final RedisURI defaultRedisUri = RedisURI.Builder.redis(TestSettings.host(), TestSettings.port()).build();
 
-    private RedisURI defaultRedisUri = RedisURI.Builder.redis(TestSettings.host(), TestSettings.port()).build();
+    @Inject
+    ConnectionFailureIntegrationTests(RedisClient client) {
+        this.client = client;
+    }
 
     /**
      * Expect to run into Invalid first byte exception instead of timeout.
diff --git a/src/test/java/io/lettuce/core/tracing/BraveTracingTest.java b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
similarity index 93%
rename from src/test/java/io/lettuce/core/tracing/BraveTracingTest.java
rename to src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
index 06c29a90d8..d3def21ae7 100644
--- a/src/test/java/io/lettuce/core/tracing/BraveTracingTest.java
+++ b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
@@ -47,7 +47,7 @@
 /**
  * @author Mark Paluch
  */
-class BraveTracingTest extends TestSupport {
+class BraveTracingIntegrationTests extends TestSupport {
 
     private static ClientResources clientResources;
     private static RedisClient client;
@@ -93,7 +93,7 @@ void pingWithTrace() {
 
         foo.finish();
 
-        List<Span> spans = new ArrayList<>(BraveTracingTest.spans);
+        List<Span> spans = new ArrayList<>(BraveTracingIntegrationTests.spans);
 
         assertThat(spans.get(0).name()).isEqualTo("ping");
         assertThat(spans.get(1).name()).isEqualTo("foo");
@@ -115,7 +115,7 @@ void pingWithTraceShouldCatchErrors() {
 
         foo.finish();
 
-        List<Span> spans = new ArrayList<>(BraveTracingTest.spans);
+        List<Span> spans = new ArrayList<>(BraveTracingIntegrationTests.spans);
 
         assertThat(spans.get(0).name()).isEqualTo("set");
         assertThat(spans.get(1).name()).isEqualTo("hgetall");
@@ -149,7 +149,7 @@ void reactivePingWithTrace() {
 
         trace.finish();
 
-        List<Span> spans = new ArrayList<>(BraveTracingTest.spans);
+        List<Span> spans = new ArrayList<>(BraveTracingIntegrationTests.spans);
 
         assertThat(spans.get(0).name()).isEqualTo("ping");
         assertThat(spans.get(1).name()).isEqualTo("foo");
@@ -171,7 +171,7 @@ void reactiveGetAndSetWithTrace() {
 
         trace.finish();
 
-        List<Span> spans = new ArrayList<>(BraveTracingTest.spans);
+        List<Span> spans = new ArrayList<>(BraveTracingIntegrationTests.spans);
 
         assertThat(spans.get(0).name()).isEqualTo("set");
         assertThat(spans.get(1).name()).isEqualTo("get");
@@ -197,7 +197,7 @@ void reactiveGetAndSetWithTraceProvider() {
 
         trace.finish();
 
-        List<Span> spans = new ArrayList<>(BraveTracingTest.spans);
+        List<Span> spans = new ArrayList<>(BraveTracingIntegrationTests.spans);
 
         assertThat(spans.get(0).name()).isEqualTo("set");
         assertThat(spans.get(1).name()).isEqualTo("get");
diff --git a/src/test/java/io/lettuce/test/KeysAndValues.java b/src/test/java/io/lettuce/test/KeysAndValues.java
index 08408dd00b..2b024d139b 100644
--- a/src/test/java/io/lettuce/test/KeysAndValues.java
+++ b/src/test/java/io/lettuce/test/KeysAndValues.java
@@ -42,7 +42,7 @@ public class KeysAndValues {
     /**
      * Number of entries.
      */
-    public final static int COUNT = 500;
+    public static final int COUNT = 500;
 
     static {
 
diff --git a/src/test/java/io/lettuce/test/LettuceExtension.java b/src/test/java/io/lettuce/test/LettuceExtension.java
index 16eee62894..fbd0d66cc6 100644
--- a/src/test/java/io/lettuce/test/LettuceExtension.java
+++ b/src/test/java/io/lettuce/test/LettuceExtension.java
@@ -24,6 +24,7 @@
 import java.lang.reflect.Type;
 import java.time.Duration;
 import java.util.*;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 import javax.enterprise.inject.New;
@@ -35,6 +36,7 @@
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.dynamic.support.ResolvableType;
@@ -94,23 +96,25 @@
  * @see AfterEachCallback
  * @see AfterAllCallback
  */
-public class LettuceExtension implements ParameterResolver, BeforeEachCallback, AfterAllCallback, AfterEachCallback {
+public class LettuceExtension implements ParameterResolver, AfterAllCallback, AfterEachCallback {
 
-    private final static InternalLogger LOGGER = InternalLoggerFactory.getInstance(LettuceExtension.class);
+    private static final InternalLogger LOGGER = InternalLoggerFactory.getInstance(LettuceExtension.class);
 
     private final ExtensionContext.Namespace LETTUCE = ExtensionContext.Namespace.create("lettuce.parameters");
 
-    private final static Set<Class<?>> SUPPORTED_INJECTABLE_TYPES = new HashSet<>(Arrays.asList(StatefulRedisConnection.class,
-            StatefulRedisPubSubConnection.class, RedisClient.class, ClientResources.class,
+    private static final Set<Class<?>> SUPPORTED_INJECTABLE_TYPES = new HashSet<>(Arrays.asList(StatefulRedisConnection.class,
+            StatefulRedisPubSubConnection.class, RedisCommands.class, RedisClient.class, ClientResources.class,
             StatefulRedisClusterConnection.class, RedisClusterClient.class));
 
-    private final static Set<Class<?>> CLOSE_AFTER_EACH = new HashSet<>(Arrays.asList(StatefulRedisConnection.class,
+    private static final Set<Class<?>> CLOSE_AFTER_EACH = new HashSet<>(Arrays.asList(StatefulRedisConnection.class,
             StatefulRedisPubSubConnection.class, StatefulRedisClusterConnection.class));
 
-    private final static List<Supplier<?>> SUPPLIERS = Arrays.asList(ClientResourcesSupplier.INSTANCE,
+    private static final List<Supplier<?>> SUPPLIERS = Arrays.asList(ClientResourcesSupplier.INSTANCE,
             RedisClusterClientSupplier.INSTANCE, RedisClientSupplier.INSTANCE, StatefulRedisConnectionSupplier.INSTANCE,
             StatefulRedisPubSubConnectionSupplier.INSTANCE, StatefulRedisClusterConnectionSupplier.INSTANCE);
 
+    private static final List<Function<?, ?>> RESOURCE_FUNCTIONS = Arrays.asList(RedisCommandsFunction.INSTANCE);
+
     @Override
     public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
             throws ParameterResolutionException {
@@ -137,9 +141,10 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 
         Parameter parameter = parameterContext.getParameter();
 
+        Type parameterizedType = parameter.getParameterizedType();
         if (parameterContext.isAnnotated(New.class)) {
 
-            Object instance = findSupplier(parameter.getParameterizedType()).get();
+            Object instance = doGetInstance(parameterizedType);
 
             if (instance instanceof Closeable || instance instanceof AutoCloseable) {
 
@@ -152,7 +157,14 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
             return instance;
         }
 
-        return store.getOrComputeIfAbsent(parameter.getType(), it -> findSupplier(parameter.getParameterizedType()).get());
+        return store.getOrComputeIfAbsent(parameter.getType(), it -> doGetInstance(parameterizedType));
+    }
+
+    private Object doGetInstance(Type parameterizedType) {
+
+        Optional<ResourceFunction> resourceFunction = findFunction(parameterizedType);
+        return resourceFunction.map(it -> it.function.apply(findSupplier(it.dependsOn.getType()).get())).orElseGet(
+                () -> findSupplier(parameterizedType).get());
     }
 
     /**
@@ -190,23 +202,6 @@ public void afterAll(ExtensionContext context) {
         });
     }
 
-    @Override
-    public void beforeEach(ExtensionContext context) {
-
-        ExtensionContext.Store store = getStore(context);
-        StatefulRedisConnection connection = store.get(StatefulRedisConnection.class, StatefulRedisConnection.class);
-        StatefulRedisPubSubConnection pubsub = store.get(StatefulRedisPubSubConnection.class,
-                StatefulRedisPubSubConnection.class);
-
-        if (connection != null || pubsub != null) {
-            if (connection != null) {
-                connection.sync().flushall();
-            } else if (pubsub != null) {
-                pubsub.sync().flushall();
-            }
-        }
-    }
-
     @Override
     public void afterEach(ExtensionContext context) {
 
@@ -254,6 +249,19 @@ private static Supplier<Object> findSupplier(Type type) {
         return (Supplier) supplier;
     }
 
+    private static Optional<ResourceFunction> findFunction(Type type) {
+
+        ResolvableType requested = ResolvableType.forType(type);
+
+        return RESOURCE_FUNCTIONS.stream().map(it -> {
+
+            ResolvableType dependsOn = ResolvableType.forType(it.getClass()).as(Function.class).getGeneric(0);
+            ResolvableType providedType = ResolvableType.forType(it.getClass()).as(Function.class).getGeneric(1);
+
+            return new ResourceFunction(dependsOn, providedType, it);
+        }).filter(it -> requested.isAssignableFrom(it.provides)).findFirst();
+    }
+
     @Target(ElementType.PARAMETER)
     @Retention(RetentionPolicy.RUNTIME)
     public @interface Connection {
@@ -263,6 +271,19 @@ private static Supplier<Object> findSupplier(Type type) {
     static class CloseAfterTest extends ArrayList<Object> {
     }
 
+    static class ResourceFunction {
+
+        final ResolvableType dependsOn;
+        final ResolvableType provides;
+        final Function<Object, Object> function;
+
+        public ResourceFunction(ResolvableType dependsOn, ResolvableType provides, Function<?, ?> function) {
+            this.dependsOn = dependsOn;
+            this.provides = provides;
+            this.function = (Function) function;
+        }
+    }
+
     enum ClientResourcesSupplier implements Supplier<ClientResources> {
 
         INSTANCE;
@@ -322,4 +343,13 @@ public StatefulRedisClusterConnection<String, String> get() {
             return RedisClusterClientSupplier.INSTANCE.get().connect();
         }
     }
+
+    enum RedisCommandsFunction implements Function<StatefulRedisConnection<String, String>, RedisCommands<String, String>> {
+        INSTANCE;
+
+        @Override
+        public RedisCommands<String, String> apply(StatefulRedisConnection<String, String> connection) {
+            return connection.sync();
+        }
+    }
 }
diff --git a/src/test/java/io/lettuce/test/Wait.java b/src/test/java/io/lettuce/test/Wait.java
index 337940cfe1..5d97f28e44 100644
--- a/src/test/java/io/lettuce/test/Wait.java
+++ b/src/test/java/io/lettuce/test/Wait.java
@@ -290,7 +290,7 @@ private boolean success(WaitCondition condition, Timeout timeout) throws Excepti
 
     static class Timeout {
 
-        private final static Clock clock = Clock.systemDefaultZone();
+        private static final Clock clock = Clock.systemDefaultZone();
         private final Instant timeout;
 
         private Timeout(Instant timeout) {
diff --git a/src/test/java/io/lettuce/test/condition/EnabledOnCommand.java b/src/test/java/io/lettuce/test/condition/EnabledOnCommand.java
index 888b4f96ab..f99021824f 100644
--- a/src/test/java/io/lettuce/test/condition/EnabledOnCommand.java
+++ b/src/test/java/io/lettuce/test/condition/EnabledOnCommand.java
@@ -28,6 +28,7 @@
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
+@Inherited
 @Documented
 @ExtendWith(EnabledOnCommandCondition.class)
 public @interface EnabledOnCommand {
diff --git a/src/test/java/io/lettuce/test/resource/DefaultRedisClient.java b/src/test/java/io/lettuce/test/resource/DefaultRedisClient.java
index b926c4ec96..1ad36a6b3d 100644
--- a/src/test/java/io/lettuce/test/resource/DefaultRedisClient.java
+++ b/src/test/java/io/lettuce/test/resource/DefaultRedisClient.java
@@ -26,7 +26,7 @@
  */
 public class DefaultRedisClient {
 
-    private final static DefaultRedisClient instance = new DefaultRedisClient();
+    private static final DefaultRedisClient instance = new DefaultRedisClient();
 
     private RedisClient redisClient;
 
diff --git a/src/test/java/io/lettuce/test/resource/DefaultRedisClusterClient.java b/src/test/java/io/lettuce/test/resource/DefaultRedisClusterClient.java
index 20a23de222..37a38513f4 100644
--- a/src/test/java/io/lettuce/test/resource/DefaultRedisClusterClient.java
+++ b/src/test/java/io/lettuce/test/resource/DefaultRedisClusterClient.java
@@ -25,7 +25,7 @@
  */
 public class DefaultRedisClusterClient {
 
-    private final static DefaultRedisClusterClient instance = new DefaultRedisClusterClient();
+    private static final DefaultRedisClusterClient instance = new DefaultRedisClusterClient();
 
     private RedisClusterClient redisClient;
 
diff --git a/src/test/java/io/lettuce/test/resource/TestClientResources.java b/src/test/java/io/lettuce/test/resource/TestClientResources.java
index 678a6816a6..2d81df2a99 100644
--- a/src/test/java/io/lettuce/test/resource/TestClientResources.java
+++ b/src/test/java/io/lettuce/test/resource/TestClientResources.java
@@ -29,7 +29,7 @@
  */
 public class TestClientResources {
 
-    private final static TestClientResources instance = new TestClientResources();
+    private static final TestClientResources instance = new TestClientResources();
     private ClientResources clientResources = create();
 
     /**
diff --git a/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java
index aea94f9a0f..7e6f7c6509 100644
--- a/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java
@@ -32,10 +32,10 @@
 @State(Scope.Benchmark)
 public class RedisClusterNodeBenchmark {
 
-    private final static List<Integer> ALL_SLOTS = IntStream.range(0, SlotHash.SLOT_COUNT).boxed().collect(Collectors.toList());
-    private final static List<Integer> LOWER_SLOTS = IntStream.range(0, 8192).boxed().collect(Collectors.toList());
+    private static final List<Integer> ALL_SLOTS = IntStream.range(0, SlotHash.SLOT_COUNT).boxed().collect(Collectors.toList());
+    private static final List<Integer> LOWER_SLOTS = IntStream.range(0, 8192).boxed().collect(Collectors.toList());
 
-    private final static RedisClusterNode NODE = new RedisClusterNode(null, null, true, null, 0, 0, 0, ALL_SLOTS,
+    private static final RedisClusterNode NODE = new RedisClusterNode(null, null, true, null, 0, 0, 0, ALL_SLOTS,
             Collections.emptySet());
 
     @Benchmark
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyChannel.java b/src/test/jmh/io/lettuce/core/protocol/EmptyChannel.java
index 5e98216f7a..8497ab25d0 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyChannel.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyChannel.java
@@ -12,7 +12,7 @@
  */
 class EmptyChannel implements Channel {
 
-    private final static ChannelConfig CONFIG = new EmptyConfig();
+    private static final ChannelConfig CONFIG = new EmptyConfig();
 
     @Override
     public ChannelId id() {
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java b/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
index e715171e0f..7034aa1c16 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
@@ -30,7 +30,7 @@
  */
 class EmptyContext implements ChannelHandlerContext {
 
-    private final static Channel CHANNEL = new EmptyChannel();
+    private static final Channel CHANNEL = new EmptyChannel();
 
     @Override
     public Channel channel() {

From 27a7a3a4b2ab7cc0291b6fdd411b3267cb6722af Mon Sep 17 00:00:00 2001
From: Daniel Albuquerque <dmartinsalbuqu@hotels.com>
Date: Tue, 25 Sep 2018 15:14:31 +0100
Subject: [PATCH 531/808] Ability to provide a custom service name for spans
 #865

Original pull request: #866
---
 RELEASE-NOTES.md                              |  2 +-
 .../io/lettuce/core/tracing/BraveTracing.java | 55 ++++++++++++++++---
 .../java/io/lettuce/core/tracing/Tracing.java | 42 ++++++++++++++
 .../tracing/BraveTracingIntegrationTests.java | 17 ++++++
 4 files changed, 108 insertions(+), 8 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 797a57d252..94d4399b7d 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -215,7 +215,7 @@ Usage example:
 ```java
 Tracing tracing = …;
 
-ClientResources clientResources = ClientResources.builder().tracing(BraveTracing.create(tracing)).build();
+ClientResources clientResources = ClientResources.builder().tracing(BraveTracing.builder(tracing).build()).build();
 
 RedisClient client = RedisClient.create(clientResources, redisUri);
 
diff --git a/src/main/java/io/lettuce/core/tracing/BraveTracing.java b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
index 9911baf374..eb2a8341a2 100644
--- a/src/main/java/io/lettuce/core/tracing/BraveTracing.java
+++ b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
@@ -52,17 +52,20 @@
 public class BraveTracing implements Tracing {
 
     private final BraveTracer tracer;
+    private final String serviceName;
 
     /**
      * Create a new {@link BraveTracing} instance.
      *
-     * @param tracer
+     * @param builder the {@link BraveTracing.Builder}.
      */
-    private BraveTracing(BraveTracer tracer) {
+    public BraveTracing(Builder builder) {
 
-        LettuceAssert.notNull(tracer, "Tracer must not be null");
+        LettuceAssert.notNull(builder.tracing, "Tracing must not be null");
+        LettuceAssert.notNull(builder.serviceName, "Service name must not be null");
 
-        this.tracer = tracer;
+        this.serviceName = builder.serviceName;
+        this.tracer = new BraveTracer(builder.tracing);
     }
 
     /**
@@ -72,7 +75,45 @@ private BraveTracing(BraveTracer tracer) {
      * @return the {@link BraveTracing}.
      */
     public static BraveTracing create(brave.Tracing tracing) {
-        return new BraveTracing(new BraveTracer(tracing));
+        return (BraveTracing) builder(tracing).build();
+    }
+
+    public static BraveTracing.Builder builder(brave.Tracing tracing) {
+        return new BraveTracing.Builder(tracing);
+    }
+
+    public static class Builder implements Tracing.Builder {
+
+        private String serviceName = "redis";
+        private brave.Tracing tracing;
+
+        private Builder() {
+        }
+
+        private Builder(brave.Tracing tracing) {
+            this.tracing = tracing;
+        }
+
+        /**
+         * Sets the name used in the {@link zipkin2.Endpoint}.
+         *
+         * @param serviceName the name for the {@link zipkin2.Endpoint}, must not be  {@literal null}.
+         * @return this
+         * @since 5.2
+         */
+        @Override
+        public Tracing.Builder serviceName(String serviceName) {
+            this.serviceName = serviceName;
+            return this;
+        }
+
+        /**
+         * @return a new instance of {@link BraveTracing}
+         */
+        @Override
+        public Tracing build() {
+            return new BraveTracing(this);
+        }
     }
 
     @Override
@@ -98,11 +139,11 @@ public Endpoint createEndpoint(SocketAddress socketAddress) {
         if (socketAddress instanceof InetSocketAddress) {
 
             InetSocketAddress inetSocketAddress = (InetSocketAddress) socketAddress;
-            return new BraveEndpoint(builder.serviceName("redis").ip(inetSocketAddress.getAddress())
+            return new BraveEndpoint(builder.serviceName(serviceName).ip(inetSocketAddress.getAddress())
                     .port(inetSocketAddress.getPort()).build());
         }
 
-        return new BraveEndpoint(builder.serviceName("redis").build());
+        return new BraveEndpoint(builder.serviceName(serviceName).build());
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/tracing/Tracing.java b/src/main/java/io/lettuce/core/tracing/Tracing.java
index 5ba662ea99..e24738be24 100644
--- a/src/main/java/io/lettuce/core/tracing/Tracing.java
+++ b/src/main/java/io/lettuce/core/tracing/Tracing.java
@@ -103,4 +103,46 @@ static Context withTraceContextProvider(TraceContextProvider supplier) {
      */
     interface Endpoint {
     }
+
+    /**
+     * Create a new {@link Tracing} using default settings.
+     *
+     * @return a new instance of a tracing.
+     * @since 5.2
+     */
+    static Tracing create(brave.Tracing tracing) {
+        return BraveTracing.builder(tracing).build();
+    }
+
+    /**
+     * Create a new {@link BraveTracing.Builder} using default settings.
+     *
+     * @return a new instance of a tracing builder.
+     * @since 5.2
+     */
+    static BraveTracing.Builder builder(brave.Tracing tracing) {
+        return BraveTracing.builder(tracing);
+    }
+
+    /**
+     * Builder for {@link Tracing}.
+     *
+     * @since 5.2
+     */
+    interface Builder {
+
+        /**
+         * Sets the name used in the {@link zipkin2.Endpoint}.
+         *
+         * @param serviceName the name for the {@link zipkin2.Endpoint}, must not be  {@literal null}.
+         * @return this
+         * @since 5.2
+         */
+        Builder serviceName(String serviceName);
+
+        /**
+         * @return a new instance of {@link BraveTracing}
+         */
+        Tracing build();
+    }
 }
diff --git a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
index d3def21ae7..c0908fa38a 100644
--- a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
@@ -214,4 +214,21 @@ void shouldReportSimpleServiceName() {
         assertThat(endpoint.endpoint.ipv4()).isNull();
         assertThat(endpoint.endpoint.ipv6()).isNull();
     }
+
+    @Test
+    public void shouldReportCustomServiceName() {
+
+        DefaultClientResources clientResourcesWithOverridenServiceName = DefaultClientResources.builder()
+                .tracing(BraveTracing.builder(clientTracing)
+                        .serviceName("custom-name-goes-here")
+                        .build())
+                .build();
+        BraveTracing.BraveEndpoint endpoint = (BraveTracing.BraveEndpoint) clientResourcesWithOverridenServiceName.tracing().createEndpoint(
+                new DomainSocketAddress("foo"));
+
+        assertThat(endpoint.endpoint.serviceName()).isEqualTo("custom-name-goes-here");
+        assertThat(endpoint.endpoint.port()).isNull();
+        assertThat(endpoint.endpoint.ipv4()).isNull();
+        assertThat(endpoint.endpoint.ipv6()).isNull();
+    }
 }

From fa4b04449d7c4545cbe2f27282661dddb9612795 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 1 Oct 2018 14:12:33 +0200
Subject: [PATCH 532/808] Polishing #866

Remove builder interface from Tracing to prevent implementation-specific dependencies. Move brave.Tracing dependency into builder configuration method to avoid builder constructor with args. Add customization hooks for Endpoint and Span types to apply further customizations.

Split BraveTracingIntegrationTests into unit and integration tests. Add author tag, reformat code.

Rollback release notes change as we do not change already released bits.
---
 RELEASE-NOTES.md                              |   2 +-
 .../io/lettuce/core/tracing/BraveTracing.java | 147 +++++++++++++++---
 .../java/io/lettuce/core/tracing/Tracing.java |  42 -----
 .../tracing/BraveTracingIntegrationTests.java |  30 ----
 .../core/tracing/BraveTracingUnitTests.java   | 121 ++++++++++++++
 5 files changed, 245 insertions(+), 97 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 94d4399b7d..797a57d252 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -215,7 +215,7 @@ Usage example:
 ```java
 Tracing tracing = …;
 
-ClientResources clientResources = ClientResources.builder().tracing(BraveTracing.builder(tracing).build()).build();
+ClientResources clientResources = ClientResources.builder().tracing(BraveTracing.create(tracing)).build();
 
 RedisClient client = RedisClient.create(clientResources, redisUri);
 
diff --git a/src/main/java/io/lettuce/core/tracing/BraveTracing.java b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
index eb2a8341a2..d479055c6e 100644
--- a/src/main/java/io/lettuce/core/tracing/BraveTracing.java
+++ b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
@@ -17,6 +17,7 @@
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
+import java.util.function.Consumer;
 
 import reactor.core.publisher.Mono;
 import brave.Span;
@@ -47,25 +48,26 @@
  * @see brave.Tracer
  * @see brave.Tracing#currentTracer()
  * @see BraveTraceContextProvider
+ * @see #builder()
  * @since 5.1
  */
 public class BraveTracing implements Tracing {
 
     private final BraveTracer tracer;
-    private final String serviceName;
+    private final BraveTracingOptions tracingOptions;
 
     /**
      * Create a new {@link BraveTracing} instance.
      *
      * @param builder the {@link BraveTracing.Builder}.
      */
-    public BraveTracing(Builder builder) {
+    private BraveTracing(Builder builder) {
 
         LettuceAssert.notNull(builder.tracing, "Tracing must not be null");
         LettuceAssert.notNull(builder.serviceName, "Service name must not be null");
 
-        this.serviceName = builder.serviceName;
-        this.tracer = new BraveTracer(builder.tracing);
+        this.tracingOptions = new BraveTracingOptions(builder.serviceName, builder.endpointCustomizer, builder.spanCustomizer);
+        this.tracer = new BraveTracer(builder.tracing, this.tracingOptions);
     }
 
     /**
@@ -75,43 +77,102 @@ public BraveTracing(Builder builder) {
      * @return the {@link BraveTracing}.
      */
     public static BraveTracing create(brave.Tracing tracing) {
-        return (BraveTracing) builder(tracing).build();
+        return builder().tracing(tracing).build();
     }
 
-    public static BraveTracing.Builder builder(brave.Tracing tracing) {
-        return new BraveTracing.Builder(tracing);
+    /**
+     * Create a new {@link Builder} to build {@link BraveTracing}.
+     *
+     * @return a new instance of {@link Builder}.
+     * @since 5.2
+     */
+    public static BraveTracing.Builder builder() {
+        return new BraveTracing.Builder();
     }
 
-    public static class Builder implements Tracing.Builder {
+    /**
+     * Builder for {@link BraveTracing}.
+     *
+     * @since 5.2
+     */
+    public static class Builder {
 
-        private String serviceName = "redis";
         private brave.Tracing tracing;
+        private String serviceName = "redis";
+        private Consumer<zipkin2.Endpoint.Builder> endpointCustomizer = it -> {
+        };
+        private Consumer<brave.Span> spanCustomizer = it -> {
+        };
 
         private Builder() {
         }
 
-        private Builder(brave.Tracing tracing) {
+        /**
+         * Sets the {@link Tracing}.
+         *
+         * @param tracing the Brave {@link brave.Tracing} object, must not be {@literal null}.
+         * @return {@code this} {@link Builder}.
+         */
+        public Builder tracing(brave.Tracing tracing) {
+
+            LettuceAssert.notNull(tracing, "Tracing must not be null!");
+
             this.tracing = tracing;
+            return this;
         }
 
         /**
          * Sets the name used in the {@link zipkin2.Endpoint}.
          *
-         * @param serviceName the name for the {@link zipkin2.Endpoint}, must not be  {@literal null}.
-         * @return this
-         * @since 5.2
+         * @param serviceName the name for the {@link zipkin2.Endpoint}, must not be {@literal null}.
+         * @return {@code this} {@link Builder}.
          */
-        @Override
-        public Tracing.Builder serviceName(String serviceName) {
+        public Builder serviceName(String serviceName) {
+
+            LettuceAssert.notEmpty(serviceName, "Service name must not be null!");
+
             this.serviceName = serviceName;
             return this;
         }
 
+        /**
+         * Sets an {@link zipkin2.Endpoint} customizer to customize the {@link zipkin2.Endpoint} through its
+         * {@link zipkin2.Endpoint.Builder}. The customizer is invoked before {@link zipkin2.Endpoint.Builder#build() building}
+         * the endpoint.
+         *
+         * @param endpointCustomizer must not be {@literal null}.
+         * @return {@code this} {@link Builder}.
+         */
+        public Builder endpointCustomizer(Consumer<zipkin2.Endpoint.Builder> endpointCustomizer) {
+
+            LettuceAssert.notNull(endpointCustomizer, "Endpoint customizer must not be null!");
+
+            this.endpointCustomizer = endpointCustomizer;
+            return this;
+        }
+
+        /**
+         * Sets an {@link brave.Span} customizer to customize the {@link brave.Span}. The customizer is invoked before
+         * {@link Span#finish()} finishing} the span.
+         *
+         * @param spanCustomizer must not be {@literal null}.
+         * @return {@code this} {@link Builder}.
+         */
+        public Builder spanCustomizer(Consumer<brave.Span> spanCustomizer) {
+
+            LettuceAssert.notNull(spanCustomizer, "Span customizer must not be null!");
+
+            this.spanCustomizer = spanCustomizer;
+            return this;
+        }
+
         /**
          * @return a new instance of {@link BraveTracing}
          */
-        @Override
-        public Tracing build() {
+        public BraveTracing build() {
+
+            LettuceAssert.notNull(this.tracing, "Brave Tracing must not be null!");
+
             return new BraveTracing(this);
         }
     }
@@ -134,16 +195,20 @@ public TraceContextProvider initialTraceContextProvider() {
     @Override
     public Endpoint createEndpoint(SocketAddress socketAddress) {
 
-        zipkin2.Endpoint.Builder builder = zipkin2.Endpoint.newBuilder();
+        zipkin2.Endpoint.Builder builder = zipkin2.Endpoint.newBuilder().serviceName(tracingOptions.serviceName);
 
         if (socketAddress instanceof InetSocketAddress) {
 
             InetSocketAddress inetSocketAddress = (InetSocketAddress) socketAddress;
-            return new BraveEndpoint(builder.serviceName(serviceName).ip(inetSocketAddress.getAddress())
-                    .port(inetSocketAddress.getPort()).build());
+            builder.ip(inetSocketAddress.getAddress()).port(inetSocketAddress.getPort());
+
+            tracingOptions.customizeEndpoint(builder);
+
+            return new BraveEndpoint(builder.build());
         }
 
-        return new BraveEndpoint(builder.serviceName(serviceName).build());
+        tracingOptions.customizeEndpoint(builder);
+        return new BraveEndpoint(builder.build());
     }
 
     /**
@@ -152,9 +217,11 @@ public Endpoint createEndpoint(SocketAddress socketAddress) {
     static class BraveTracer extends Tracer {
 
         private final brave.Tracing tracing;
+        private final BraveTracingOptions tracingOptions;
 
-        public BraveTracer(brave.Tracing tracing) {
+        BraveTracer(brave.Tracing tracing, BraveTracingOptions tracingOptions) {
             this.tracing = tracing;
+            this.tracingOptions = tracingOptions;
         }
 
         @Override
@@ -185,7 +252,7 @@ private Span postProcessSpan(brave.Span span) {
                 return NoOpTracing.NoOpSpan.INSTANCE;
             }
 
-            return new BraveSpan(span.kind(brave.Span.Kind.CLIENT));
+            return new BraveSpan(span.kind(brave.Span.Kind.CLIENT), this.tracingOptions);
         }
     }
 
@@ -195,9 +262,11 @@ private Span postProcessSpan(brave.Span span) {
     static class BraveSpan extends Tracer.Span {
 
         private final brave.Span span;
+        private final BraveTracingOptions tracingOptions;
 
-        BraveSpan(brave.Span span) {
+        BraveSpan(Span span, BraveTracingOptions tracingOptions) {
             this.span = span;
+            this.tracingOptions = tracingOptions;
         }
 
         @Override
@@ -250,6 +319,8 @@ public BraveSpan remoteEndpoint(Endpoint endpoint) {
 
         @Override
         public void finish() {
+
+            this.tracingOptions.customizeSpan(span);
             span.finish();
         }
 
@@ -319,4 +390,32 @@ public Mono<TraceContext> getTraceContextLater() {
                     });
         }
     }
+
+    /**
+     * Value object encapsulating tracing options.
+     *
+     * @author Mark Paluch
+     * @since 5.2
+     */
+    static class BraveTracingOptions {
+
+        private final String serviceName;
+        private final Consumer<zipkin2.Endpoint.Builder> endpointCustomizer;
+        private final Consumer<brave.Span> spanCustomizer;
+
+        BraveTracingOptions(String serviceName, Consumer<zipkin2.Endpoint.Builder> endpointCustomizer,
+                Consumer<Span> spanCustomizer) {
+            this.serviceName = serviceName;
+            this.endpointCustomizer = endpointCustomizer;
+            this.spanCustomizer = spanCustomizer;
+        }
+
+        void customizeEndpoint(zipkin2.Endpoint.Builder builder) {
+            this.endpointCustomizer.accept(builder);
+        }
+
+        void customizeSpan(brave.Span span) {
+            this.spanCustomizer.accept(span);
+        }
+    }
 }
diff --git a/src/main/java/io/lettuce/core/tracing/Tracing.java b/src/main/java/io/lettuce/core/tracing/Tracing.java
index e24738be24..5ba662ea99 100644
--- a/src/main/java/io/lettuce/core/tracing/Tracing.java
+++ b/src/main/java/io/lettuce/core/tracing/Tracing.java
@@ -103,46 +103,4 @@ static Context withTraceContextProvider(TraceContextProvider supplier) {
      */
     interface Endpoint {
     }
-
-    /**
-     * Create a new {@link Tracing} using default settings.
-     *
-     * @return a new instance of a tracing.
-     * @since 5.2
-     */
-    static Tracing create(brave.Tracing tracing) {
-        return BraveTracing.builder(tracing).build();
-    }
-
-    /**
-     * Create a new {@link BraveTracing.Builder} using default settings.
-     *
-     * @return a new instance of a tracing builder.
-     * @since 5.2
-     */
-    static BraveTracing.Builder builder(brave.Tracing tracing) {
-        return BraveTracing.builder(tracing);
-    }
-
-    /**
-     * Builder for {@link Tracing}.
-     *
-     * @since 5.2
-     */
-    interface Builder {
-
-        /**
-         * Sets the name used in the {@link zipkin2.Endpoint}.
-         *
-         * @param serviceName the name for the {@link zipkin2.Endpoint}, must not be  {@literal null}.
-         * @return this
-         * @since 5.2
-         */
-        Builder serviceName(String serviceName);
-
-        /**
-         * @return a new instance of {@link BraveTracing}
-         */
-        Tracing build();
-    }
 }
diff --git a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
index c0908fa38a..ed2fc7ae98 100644
--- a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
@@ -42,7 +42,6 @@
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
 import io.lettuce.test.Wait;
-import io.netty.channel.unix.DomainSocketAddress;
 
 /**
  * @author Mark Paluch
@@ -202,33 +201,4 @@ void reactiveGetAndSetWithTraceProvider() {
         assertThat(spans.get(0).name()).isEqualTo("set");
         assertThat(spans.get(1).name()).isEqualTo("get");
     }
-
-    @Test
-    void shouldReportSimpleServiceName() {
-
-        BraveTracing.BraveEndpoint endpoint = (BraveTracing.BraveEndpoint) clientResources.tracing().createEndpoint(
-                new DomainSocketAddress("foo"));
-
-        assertThat(endpoint.endpoint.serviceName()).isEqualTo("redis");
-        assertThat(endpoint.endpoint.port()).isNull();
-        assertThat(endpoint.endpoint.ipv4()).isNull();
-        assertThat(endpoint.endpoint.ipv6()).isNull();
-    }
-
-    @Test
-    public void shouldReportCustomServiceName() {
-
-        DefaultClientResources clientResourcesWithOverridenServiceName = DefaultClientResources.builder()
-                .tracing(BraveTracing.builder(clientTracing)
-                        .serviceName("custom-name-goes-here")
-                        .build())
-                .build();
-        BraveTracing.BraveEndpoint endpoint = (BraveTracing.BraveEndpoint) clientResourcesWithOverridenServiceName.tracing().createEndpoint(
-                new DomainSocketAddress("foo"));
-
-        assertThat(endpoint.endpoint.serviceName()).isEqualTo("custom-name-goes-here");
-        assertThat(endpoint.endpoint.port()).isNull();
-        assertThat(endpoint.endpoint.ipv4()).isNull();
-        assertThat(endpoint.endpoint.ipv6()).isNull();
-    }
 }
diff --git a/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java b/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java
new file mode 100644
index 0000000000..1045fa62d5
--- /dev/null
+++ b/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.tracing;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Queue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import zipkin2.Span;
+import brave.Tracer;
+import brave.Tracing;
+import brave.internal.recorder.MutableSpan;
+import brave.propagation.CurrentTraceContext;
+import io.lettuce.core.TestSupport;
+import io.netty.channel.unix.DomainSocketAddress;
+
+/**
+ * @author Mark Paluch
+ * @author Daniel Albuquerque
+ */
+class BraveTracingUnitTests extends TestSupport {
+
+    private static Tracing clientTracing;
+    private static Queue<Span> spans = new LinkedBlockingQueue<>();
+
+    @BeforeAll
+    static void beforeClass() {
+
+        clientTracing = Tracing.newBuilder().localServiceName("client")
+                .currentTraceContext(CurrentTraceContext.Default.create()).spanReporter(spans::add).build();
+    }
+
+    @BeforeEach
+    void before() {
+
+        Tracer tracer = clientTracing.tracer();
+        if (tracer.currentSpan() != null) {
+            clientTracing.tracer().currentSpan().abandon();
+        }
+
+        spans.clear();
+    }
+
+    @AfterAll
+    static void afterClass() {
+
+        clientTracing.close();
+    }
+
+    @Test
+    void shouldReportSimpleServiceName() {
+
+        BraveTracing tracing = BraveTracing.create(clientTracing);
+        BraveTracing.BraveEndpoint endpoint = (BraveTracing.BraveEndpoint) tracing
+                .createEndpoint(new DomainSocketAddress("foo"));
+
+        assertThat(endpoint.endpoint.serviceName()).isEqualTo("redis");
+        assertThat(endpoint.endpoint.port()).isNull();
+        assertThat(endpoint.endpoint.ipv4()).isNull();
+        assertThat(endpoint.endpoint.ipv6()).isNull();
+    }
+
+    @Test
+    void shouldReportCustomServiceName() {
+
+        BraveTracing tracing = BraveTracing.builder().tracing(clientTracing).serviceName("custom-name-goes-here").build();
+
+        BraveTracing.BraveEndpoint endpoint = (BraveTracing.BraveEndpoint) tracing
+                .createEndpoint(new DomainSocketAddress("foo"));
+
+        assertThat(endpoint.endpoint.serviceName()).isEqualTo("custom-name-goes-here");
+        assertThat(endpoint.endpoint.port()).isNull();
+        assertThat(endpoint.endpoint.ipv4()).isNull();
+        assertThat(endpoint.endpoint.ipv6()).isNull();
+    }
+
+    @Test
+    void shouldCustomizeEndpoint() {
+
+        BraveTracing tracing = BraveTracing.builder().tracing(clientTracing)
+                .endpointCustomizer(it -> it.serviceName("foo-bar")).build();
+        BraveTracing.BraveEndpoint endpoint = (BraveTracing.BraveEndpoint) tracing
+                .createEndpoint(new DomainSocketAddress("foo"));
+
+        assertThat(endpoint.endpoint.serviceName()).isEqualTo("foo-bar");
+    }
+
+    @Test
+    void shouldCustomizeSpan() {
+
+        BraveTracing tracing = BraveTracing.builder().tracing(clientTracing)
+                .spanCustomizer(it -> it.remoteServiceName("remote")).build();
+
+        BraveTracing.BraveSpan span = (BraveTracing.BraveSpan) tracing.getTracerProvider().getTracer().nextSpan();
+        span.finish();
+
+        MutableSpan braveSpan = (MutableSpan) ReflectionTestUtils.getField(span.getSpan(), "state");
+
+        assertThat(braveSpan.remoteServiceName()).isEqualTo("remote");
+    }
+}

From f6534601194c62b772661623a719aa381b20c8b3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 1 Oct 2018 15:01:59 +0200
Subject: [PATCH 533/808] Fix authentication on reconnect for subscribed
 Pub/Sub connections #868

Lettuce now checks whether the current connection has written a subscription command in addition to the registered channels/patterns. This allows a more meaningful checking of allowed commands so that regular commands can be written to the connection before resubscribing.

This change allows authentication again for connections that got reconnected and had previously subscriptions.
---
 .../lettuce/core/pubsub/PubSubEndpoint.java   | 56 +++++++++++++++++--
 .../core/pubsub/PubSubCommandTest.java        | 45 ++++++++++++---
 2 files changed, 87 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
index 77f0d45972..398f1e77c6 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.pubsub;
 
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -26,6 +27,7 @@
 import io.lettuce.core.protocol.DefaultEndpoint;
 import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.resource.ClientResources;
+import io.netty.channel.Channel;
 import io.netty.util.internal.ConcurrentSet;
 
 /**
@@ -34,9 +36,11 @@
 public class PubSubEndpoint<K, V> extends DefaultEndpoint {
 
     private static final Set<String> ALLOWED_COMMANDS_SUBSCRIBED;
+    private static final Set<String> SUBSCRIBE_COMMANDS;
     private final List<RedisPubSubListener<K, V>> listeners = new CopyOnWriteArrayList<>();
     private final Set<K> channels;
     private final Set<K> patterns;
+    private volatile boolean subscribeWritten = false;
 
     static {
 
@@ -47,6 +51,11 @@ public class PubSubEndpoint<K, V> extends DefaultEndpoint {
         ALLOWED_COMMANDS_SUBSCRIBED.add(CommandType.UNSUBSCRIBE.name());
         ALLOWED_COMMANDS_SUBSCRIBED.add(CommandType.PUNSUBSCRIBE.name());
         ALLOWED_COMMANDS_SUBSCRIBED.add(CommandType.QUIT.name());
+
+        SUBSCRIBE_COMMANDS = new HashSet<>(2, 1);
+
+        SUBSCRIBE_COMMANDS.add(CommandType.SUBSCRIBE.name());
+        SUBSCRIBE_COMMANDS.add(CommandType.PSUBSCRIBE.name());
     }
 
     /**
@@ -93,19 +102,56 @@ public Set<K> getPatterns() {
         return patterns;
     }
 
+    @Override
+    public void notifyChannelActive(Channel channel) {
+        subscribeWritten = false;
+        super.notifyChannelActive(channel);
+    }
+
     @Override
     public <K1, V1, T> RedisCommand<K1, V1, T> write(RedisCommand<K1, V1, T> command) {
 
-        if (!channels.isEmpty() || !patterns.isEmpty()) {
+        if (isSubscribed()) {
+            validateCommandAllowed(command);
+        }
+
+        if (!subscribeWritten && SUBSCRIBE_COMMANDS.contains(command.getType().name())) {
+            subscribeWritten = true;
+        }
+
+        return super.write(command);
+    }
 
-            if (!ALLOWED_COMMANDS_SUBSCRIBED.contains(command.getType().name())) {
+    @Override
+    public <K1, V1> Collection<RedisCommand<K1, V1, ?>> write(Collection<? extends RedisCommand<K1, V1, ?>> redisCommands) {
 
-                throw new RedisException(String.format("Command %s not allowed while subscribed. Allowed commands are: %s",
-                        command.getType().name(), ALLOWED_COMMANDS_SUBSCRIBED));
+        if (isSubscribed()) {
+            redisCommands.forEach(PubSubEndpoint::validateCommandAllowed);
+        }
+
+        if (!subscribeWritten) {
+            for (RedisCommand<K1, V1, ?> redisCommand : redisCommands) {
+                if (SUBSCRIBE_COMMANDS.contains(redisCommand.getType().name())) {
+                    subscribeWritten = true;
+                    break;
+                }
             }
         }
 
-        return super.write(command);
+        return super.write(redisCommands);
+    }
+
+    private static void validateCommandAllowed(RedisCommand<?, ?, ?> command) {
+
+        if (!ALLOWED_COMMANDS_SUBSCRIBED.contains(command.getType().name())) {
+
+            throw new RedisException(String.format("Command %s not allowed while subscribed. Allowed commands are: %s", command
+                    .getType().name(), ALLOWED_COMMANDS_SUBSCRIBED));
+        }
+    }
+
+    private boolean isSubscribed() {
+        return subscribeWritten && (!channels.isEmpty() || !patterns.isEmpty());
     }
 
     public void notifyMessage(PubSubOutput<K, V, V> output) {
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
index 310f6aa873..5843a2c742 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
@@ -26,6 +26,8 @@
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -46,6 +48,7 @@
  * @author Mark Paluch
  */
 class PubSubCommandTest extends AbstractRedisClientTest implements RedisPubSubListener<String, String> {
+
     private RedisPubSubAsyncCommands<String, String> pubsub;
 
     private BlockingQueue<String> channels;
@@ -59,17 +62,22 @@ class PubSubCommandTest extends AbstractRedisClientTest implements RedisPubSubLi
 
     @BeforeEach
     void openPubSubConnection() {
-        pubsub = client.connectPubSub().async();
-        pubsub.getStatefulConnection().addListener(this);
-        channels = LettuceFactories.newBlockingQueue();
-        patterns = LettuceFactories.newBlockingQueue();
-        messages = LettuceFactories.newBlockingQueue();
-        counts = LettuceFactories.newBlockingQueue();
+        try {
+            pubsub = client.connectPubSub().async();
+            pubsub.getStatefulConnection().addListener(this);
+        } finally {
+            channels = LettuceFactories.newBlockingQueue();
+            patterns = LettuceFactories.newBlockingQueue();
+            messages = LettuceFactories.newBlockingQueue();
+            counts = LettuceFactories.newBlockingQueue();
+        }
     }
 
     @AfterEach
     void closePubSubConnection() {
-        pubsub.getStatefulConnection().close();
+        if (pubsub != null) {
+            pubsub.getStatefulConnection().close();
+        }
     }
 
     @Test
@@ -94,20 +102,39 @@ void authWithReconnect() {
             @Override
             protected void run(RedisClient client) throws Exception {
 
+
                 RedisPubSubAsyncCommands<String, String> connection = client.connectPubSub().async();
                 connection.getStatefulConnection().addListener(PubSubCommandTest.this);
                 connection.auth(passwd);
-                connection.quit();
+                connection.clientSetname("authWithReconnect");
+                connection.subscribe(channel);
+
+                assertThat(channels.take()).isEqualTo(channel);
+
+                long id = findNamedClient("authWithReconnect");
+                redis.clientKill(KillArgs.Builder.id(id));
 
                 Delay.delay(Duration.ofMillis(100));
                 Wait.untilTrue(connection::isOpen).waitOrTimeout();
 
-                connection.subscribe(channel);
                 assertThat(channels.take()).isEqualTo(channel);
             }
         };
     }
 
+    private long findNamedClient(String name) {
+
+        Pattern pattern = Pattern.compile(".*id=(\\d+).*name=" + name + ".*", Pattern.MULTILINE);
+        String clients = redis.clientList();
+        Matcher matcher = pattern.matcher(clients);
+
+        if (!matcher.find()) {
+            throw new IllegalStateException("Cannot find PubSub client in: " + clients);
+        }
+
+        return Long.parseLong(matcher.group(1));
+    }
+
     @Test
     void message() throws Exception {
         pubsub.subscribe(channel);

From bd1b0438cb1cd63733114a9fecff0f3193023533 Mon Sep 17 00:00:00 2001
From: Jongyeol Choi <jongyeol.choi@linecorp.com>
Date: Mon, 1 Oct 2018 21:13:48 +0900
Subject: [PATCH 534/808] Command latency capture #874
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CommandHandler.addToStack(…) now adds the wrapped (with latency decorator) command to the protocol stack that allows capturing of latency metrics again. Previously, the non-wrapped command was added to the protocol stack.
---
 src/main/java/io/lettuce/core/protocol/CommandHandler.java    | 2 +-
 .../io/lettuce/core/protocol/CommandHandlerUnitTests.java     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 73b671a818..b5999fa8fb 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -465,7 +465,7 @@ private void addToStack(RedisCommand<?, ?, ?> command, ChannelPromise promise) {
             if (promise.isVoid()) {
                 stack.add(redisCommand);
             } else {
-                promise.addListener(AddToStack.newInstance(stack, command));
+                promise.addListener(AddToStack.newInstance(stack, redisCommand));
             }
         } catch (Exception e) {
             command.completeExceptionally(e);
diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
index 2e01e64f90..a2da540e4e 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
@@ -406,9 +406,7 @@ void shouldRecordCorrectFirstResponseLatency() throws Exception {
         sut.channelRegistered(context);
         sut.channelActive(context);
 
-        LatencyMeteredCommand<String, String, String> wrapped = new LatencyMeteredCommand<>(command);
-
-        sut.write(context, wrapped, channelPromise);
+        sut.write(context, command, channelPromise);
         Delay.delay(Duration.ofMillis(10));
 
         sut.channelRead(context, Unpooled.wrappedBuffer("*1\r\n+OK\r\n".getBytes()));

From 0a6c165a5303d64ccd7be88137db3f7b56377a33 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 2 Oct 2018 11:38:41 +0200
Subject: [PATCH 535/808] Polishing #874

Add author tags.
---
 .../io/lettuce/core/protocol/CommandHandlerUnitTests.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
index a2da540e4e..bdbdc637db 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
@@ -59,6 +59,10 @@
 import io.netty.channel.*;
 import io.netty.util.concurrent.ImmediateEventExecutor;
 
+/**
+ * @author Mark Paluch
+ * @author Jongyeol Choi
+ */
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
 class CommandHandlerUnitTests {

From f7c682fa464c99ffc9a8d4bf7eb881ecd5db58eb Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 4 Oct 2018 09:54:28 +0200
Subject: [PATCH 536/808] Fix test annotations in Reactive Streams TCK

Use again TestNG annotations instead of JUnit 5 ones.
---
 .../reactive/RedisPublisherVerification.java    | 17 +++++++++--------
 .../core/reactive/ScanStreamVerification.java   | 14 ++++++++------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
index 660ddf80b3..10b412da50 100644
--- a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
+++ b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
@@ -21,14 +21,15 @@
 import java.util.UUID;
 import java.util.function.Supplier;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.tck.PublisherVerification;
 import org.reactivestreams.tck.TestEnvironment;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 
-import io.lettuce.test.resource.TestClientResources;
-import io.lettuce.core.*;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestRedisPublisher;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.Utf8StringCodec;
@@ -36,11 +37,11 @@
 import io.lettuce.core.protocol.Command;
 import io.lettuce.core.protocol.CommandArgs;
 import io.lettuce.test.resource.FastShutdown;
-import io.lettuce.core.TestRedisPublisher;
+import io.lettuce.test.resource.TestClientResources;
 import io.lettuce.test.settings.TestSettings;
 
 /**
- * Reactive Streams TCK for {@link RedisPublisher}.
+ * Reactive Streams TCK for {@link io.lettuce.core.RedisPublisher}.
  *
  * @author Mark Paluch
  */
@@ -54,14 +55,14 @@ public RedisPublisherVerification() {
         super(new TestEnvironment(1000));
     }
 
-    @BeforeAll
+    @BeforeClass
     private static void beforeClass() {
         client = RedisClient.create(TestClientResources.get(), RedisURI.create(TestSettings.host(), TestSettings.port()));
         connection = client.connect();
         connection.sync().flushall();
     }
 
-    @AfterAll
+    @AfterClass
     private static void afterClass() {
         connection.close();
         FastShutdown.shutdown(client);
diff --git a/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java b/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java
index 55600c80e6..a64fed2fe7 100644
--- a/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java
+++ b/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java
@@ -18,17 +18,19 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.tck.PublisherVerification;
 import org.reactivestreams.tck.TestEnvironment;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 
-import io.lettuce.test.resource.TestClientResources;
-import io.lettuce.core.*;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.ScanStream;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.resource.TestClientResources;
 import io.lettuce.test.settings.TestSettings;
 
 /**
@@ -47,14 +49,14 @@ public ScanStreamVerification() {
         super(new TestEnvironment(1000));
     }
 
-    @BeforeAll
+    @BeforeClass
     private static void beforeClass() {
         client = RedisClient.create(TestClientResources.get(), RedisURI.create(TestSettings.host(), TestSettings.port()));
         connection = client.connect();
         connection.sync().flushall();
     }
 
-    @AfterAll
+    @AfterClass
     private static void afterClass() {
         connection.close();
         FastShutdown.shutdown(client);

From 799e8c081fba516bc54516163d82accc77abfdf2 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 7 Oct 2018 11:37:29 +0200
Subject: [PATCH 537/808] Switch to HTTPS in reference docs CSS #878

---
 src/main/asciidoc/stylesheets/golo.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/asciidoc/stylesheets/golo.css b/src/main/asciidoc/stylesheets/golo.css
index d767f003d5..781b2eee87 100644
--- a/src/main/asciidoc/stylesheets/golo.css
+++ b/src/main/asciidoc/stylesheets/golo.css
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 @import url('https://fonts.googleapis.com/css?family=Raleway:300:400:700');
-@import url(http://cdnjs.cloudflare.com/ajax/libs/semantic-ui/1.6.2/semantic.min.css);
+@import url(https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/1.6.2/semantic.min.css);
 
 
 #header .details br+span.author:before {
@@ -33,7 +33,7 @@
 /*! normalize.css v2.1.2 | MIT License | git.io/normalize */
 /* ========================================================================== HTML5 display definitions ========================================================================== */
 /** Correct `block` display not defined in IE 8/9. */
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.1/css/font-awesome.css);
+@import url(https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.1/css/font-awesome.css);
 
 article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary {
     display: block;

From d8d57a4f4e1b73d021cc48f290837f6280e53dd1 Mon Sep 17 00:00:00 2001
From: Larry Battle <larry.battle.tech@gmail.com>
Date: Sat, 6 Oct 2018 03:51:47 -0500
Subject: [PATCH 538/808] Refactor Makefile to simplify Redis checkout/download
 #877

Rewritten to (pseudo-code):

if( hasRedisGitDir ){
    gitResetBranch()
} else {
    downloadRedisGit()
}
checkoutAndPullBranch( REDIS )
---
 Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index bd240ba60b..c676759337 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+SHELL := /bin/bash
 PATH := ./work/redis-git/src:${PATH}
 ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 STUNNEL_BIN := $(shell which stunnel)
@@ -380,11 +381,9 @@ endif
 endif
 
 work/redis-git/src/redis-cli work/redis-git/src/redis-server:
-	[ ! -e work/redis-git ] && git clone https://github.com/antirez/redis.git work/redis-git && cd work/redis-git && git checkout $(REDIS) || true
-	$(eval REDIS_BRANCH = -v $(shell git -C work/redis-git branch --no-color | sed 's/\* //g'))
-	cd work/redis-git && git reset --hard || true
-	[ "$(REDIS)" != "$(REDIS_BRANCH)" ] && cd work/redis-git && git checkout $(REDIS) || true
-	[ "$(REDIS)" == "unstable" ] && cd work/redis-git && git fetch && git merge origin/unstable || true
+	[ -d "work/redis-git" ] && cd work/redis-git && git reset --hard || \
+	git clone https://github.com/antirez/redis.git work/redis-git
+	cd work/redis-git && git checkout -q $(REDIS) && git pull origin $(REDIS)
 	$(MAKE) -C work/redis-git clean
 	$(MAKE) -C work/redis-git -j4
 

From be033c36be99e0636e41bf0fce8f01c109447d3c Mon Sep 17 00:00:00 2001
From: Larry Battle <larry.battle.tech@gmail.com>
Date: Sat, 6 Oct 2018 00:13:02 -0500
Subject: [PATCH 539/808] Include hostPortString in HostAndPort error message
 #876

---
 src/main/java/io/lettuce/core/internal/HostAndPort.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/internal/HostAndPort.java b/src/main/java/io/lettuce/core/internal/HostAndPort.java
index 0b3519ba74..b34d21abdb 100644
--- a/src/main/java/io/lettuce/core/internal/HostAndPort.java
+++ b/src/main/java/io/lettuce/core/internal/HostAndPort.java
@@ -192,7 +192,7 @@ private static String[] getHostAndPortFromBracketedHost(String hostPortString) {
         int closeBracketIndex = hostPortString.lastIndexOf(']');
 
         LettuceAssert.isTrue(colonIndex > -1 && closeBracketIndex > colonIndex,
-                String.format("Invalid bracketed host/port: ", hostPortString));
+                String.format("Invalid bracketed host/port: %s", hostPortString));
 
         String host = hostPortString.substring(1, closeBracketIndex);
         if (closeBracketIndex + 1 == hostPortString.length()) {

From 5a175be98ffa4c92f24ebd85c90158f00ff91e3d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 8 Oct 2018 11:39:29 +0200
Subject: [PATCH 540/808] Polishing #876

Fix other formatted messages with arguments. Add author tag.
---
 src/main/java/io/lettuce/core/internal/HostAndPort.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/internal/HostAndPort.java b/src/main/java/io/lettuce/core/internal/HostAndPort.java
index b34d21abdb..da32b940c0 100644
--- a/src/main/java/io/lettuce/core/internal/HostAndPort.java
+++ b/src/main/java/io/lettuce/core/internal/HostAndPort.java
@@ -21,6 +21,7 @@
  * An immutable representation of a host and port.
  *
  * @author Mark Paluch
+ * @author Larry Battle
  * @since 4.2
  */
 public class HostAndPort {
@@ -91,11 +92,11 @@ public static HostAndPort parse(String hostPortString) {
         if (!LettuceStrings.isEmpty(portString)) {
             // Try to parse the whole port string as a number.
             // JDK7 accepts leading plus signs. We don't want to.
-            LettuceAssert.isTrue(!portString.startsWith("+"), String.format("Unparseable port number: %s", hostPortString));
+            LettuceAssert.isTrue(!portString.startsWith("+"), String.format("Cannot port number: %s", hostPortString));
             try {
                 port = Integer.parseInt(portString);
             } catch (NumberFormatException e) {
-                throw new IllegalArgumentException(String.format("Unparseable port number: %s" + hostPortString));
+                throw new IllegalArgumentException(String.format("Cannot parse port number: %s", hostPortString));
             }
             LettuceAssert.isTrue(isValidPort(port), String.format("Port number out of range: %s", hostPortString));
         }

From 3e3473eb250adeecb6b273e18f315f2dc2301af6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 8 Oct 2018 21:25:25 +0200
Subject: [PATCH 541/808] Consider value multiplicity in reactive output
 resolution #879

Lettuce now checks for the value multiplicity when resolving the actual output type for reactive Redis commands methods.

Previously, all reactive types were considered streaming ones which caused usage of a not applicable output type. So Mono<String> used KeyListOutput which propagated null values.
---
 .../core/dynamic/DeclaredCommandMethod.java   |  3 +-
 .../ReactiveCommandSegmentCommandFactory.java | 21 ++++---
 .../DeclaredCommandMethodUnitTests.java       |  4 +-
 ...CommandSegmentCommandFactoryUnitTests.java | 46 +++++++++------
 ...RedisCommandsReactiveIntegrationTests.java | 57 ++++++++++++++++++-
 ...CommandOutputFactoryResolverUnitTests.java | 34 ++++++++++-
 6 files changed, 134 insertions(+), 31 deletions(-)

diff --git a/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java b/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java
index 7540f73f3c..3d14f1e6fa 100644
--- a/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java
+++ b/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java
@@ -79,8 +79,7 @@ private DeclaredCommandMethod(Method method, ExecutionSpecificParameters paramet
 
         ResolvableType actualReturnType = this.returnType;
 
-        while (Future.class.isAssignableFrom(actualReturnType.getRawClass())
-                || ReactiveTypes.supports(actualReturnType.getRawClass())) {
+        while (Future.class.isAssignableFrom(actualReturnType.getRawClass())) {
             ResolvableType[] generics = actualReturnType.getGenerics();
 
             if (generics.length != 1) {
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java
index 1def7e6a4a..e4d4247be1 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java
@@ -31,7 +31,7 @@ class ReactiveCommandSegmentCommandFactory extends CommandSegmentCommandFactory
 
     private boolean streamingExecution;
 
-    public ReactiveCommandSegmentCommandFactory(CommandSegments commandSegments, CommandMethod commandMethod,
+    ReactiveCommandSegmentCommandFactory(CommandSegments commandSegments, CommandMethod commandMethod,
             RedisCodec<?, ?> redisCodec, CommandOutputFactoryResolver outputResolver) {
 
         super(commandSegments, commandMethod, redisCodec, outputResolver);
@@ -49,20 +49,27 @@ public ReactiveCommandSegmentCommandFactory(CommandSegments commandSegments, Com
     @Override
     protected CommandOutputFactory resolveCommandOutputFactory(OutputSelector outputSelector) {
 
-        CommandOutputFactory factory = getOutputResolver().resolveStreamingCommandOutput(outputSelector);
+        streamingExecution = ReactiveTypes.isMultiValueType(outputSelector.getOutputType().getRawClass());
 
-        if (factory != null) {
-            streamingExecution = true;
-            return factory;
+        OutputSelector componentType = new OutputSelector(outputSelector.getOutputType().getGeneric(0),
+                outputSelector.getRedisCodec());
+
+        if (streamingExecution) {
+
+            CommandOutputFactory streamingFactory = getOutputResolver().resolveStreamingCommandOutput(componentType);
+
+            if (streamingExecution && streamingFactory != null) {
+                return streamingFactory;
+            }
         }
 
-        return super.resolveCommandOutputFactory(outputSelector);
+        return super.resolveCommandOutputFactory(componentType);
     }
 
     /**
      * @return {@literal true} if the resolved {@link io.lettuce.core.output.CommandOutput} should use streaming.
      */
-    public boolean isStreamingExecution() {
+    boolean isStreamingExecution() {
         return streamingExecution;
     }
 }
diff --git a/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java b/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java
index 62bd8c97f8..e6729dad68 100644
--- a/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java
@@ -52,7 +52,7 @@ void shouldResolveFluxComponentType() throws Exception {
 
         CommandMethod commandMethod = DeclaredCommandMethod.create(getMethod("getFlux"));
 
-        assertThat(commandMethod.getActualReturnType().getRawClass()).isEqualTo(String.class);
+        assertThat(commandMethod.getActualReturnType().getRawClass()).isEqualTo(Flux.class);
         assertThat(commandMethod.getReturnType().getRawClass()).isEqualTo(Flux.class);
     }
 
@@ -60,7 +60,7 @@ private Method getMethod(String name) throws NoSuchMethodException {
         return MyInterface.class.getDeclaredMethod(name);
     }
 
-    private static interface MyInterface {
+    private interface MyInterface {
 
         String getString();
 
diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java b/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java
index fffc1d2b2d..ed4a15e090 100644
--- a/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java
@@ -17,25 +17,25 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.when;
 
 import java.lang.reflect.Method;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.reactivestreams.Publisher;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.dynamic.domain.Timeout;
-import io.lettuce.core.dynamic.output.CommandOutputFactory;
-import io.lettuce.core.dynamic.output.CommandOutputFactoryResolver;
+import io.lettuce.core.dynamic.output.CodecAwareOutputFactoryResolver;
+import io.lettuce.core.dynamic.output.OutputRegistry;
+import io.lettuce.core.dynamic.output.OutputRegistryCommandOutputFactoryResolver;
 import io.lettuce.core.dynamic.segment.AnnotationCommandSegmentFactory;
 import io.lettuce.core.dynamic.segment.CommandSegments;
 import io.lettuce.core.dynamic.support.ReflectionUtils;
+import io.lettuce.core.output.StreamingOutput;
 import io.lettuce.core.protocol.RedisCommand;
 
 /**
@@ -44,16 +44,8 @@
 @ExtendWith(MockitoExtension.class)
 class ReactiveCommandSegmentCommandFactoryUnitTests {
 
-    @Mock
-    private CommandOutputFactoryResolver outputFactoryResolver;
-
-    @Mock
-    private CommandOutputFactory commandOutputFactory;
-
-    @BeforeEach
-    void before() {
-        when(outputFactoryResolver.resolveCommandOutput(any())).thenReturn(commandOutputFactory);
-    }
+    private CodecAwareOutputFactoryResolver outputFactoryResolver = new CodecAwareOutputFactoryResolver(
+            new OutputRegistryCommandOutputFactoryResolver(new OutputRegistry()), StringCodec.UTF8);
 
     @Test
     void commandCreationWithTimeoutShouldFail() {
@@ -66,6 +58,22 @@ void commandCreationWithTimeoutShouldFail() {
         }
     }
 
+    @Test
+    void shouldResolveNonStreamingOutput() {
+
+        RedisCommand<?, ?, ?> command = createCommand("getOne", ReactiveWithTimeout.class, String.class);
+
+        assertThat(command.getOutput()).isNotInstanceOf(StreamingOutput.class);
+    }
+
+    @Test
+    void shouldResolveStreamingOutput() {
+
+        RedisCommand<?, ?, ?> command = createCommand("getMany", ReactiveWithTimeout.class, String.class);
+
+        assertThat(command.getOutput()).isInstanceOf(StreamingOutput.class);
+    }
+
     RedisCommand<?, ?, ?> createCommand(String methodName, Class<?> interfaceClass, Class<?>... parameterTypes) {
 
         Method method = ReflectionUtils.findMethod(interfaceClass, methodName, parameterTypes);
@@ -78,11 +86,15 @@ void commandCreationWithTimeoutShouldFail() {
         ReactiveCommandSegmentCommandFactory factory = new ReactiveCommandSegmentCommandFactory(commandSegments, commandMethod,
                 new StringCodec(), outputFactoryResolver);
 
-        return factory.createCommand(null);
+        return factory.createCommand(new Object[] { "foo" });
     }
 
     private static interface ReactiveWithTimeout {
 
         Publisher<String> get(String key, Timeout timeout);
+
+        Mono<String> getOne(String key);
+
+        Flux<String> getMany(String key);
     }
 }
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java
index 72ef977eee..2de91faf47 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java
@@ -17,6 +17,7 @@
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -27,6 +28,7 @@
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.dynamic.annotation.Command;
 import io.lettuce.test.LettuceExtension;
+import io.reactivex.Maybe;
 
 /**
  * @author Mark Paluch
@@ -41,6 +43,11 @@ class RedisCommandsReactiveIntegrationTests extends TestSupport {
         this.redis = connection.sync();
     }
 
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
+
     @Test
     void reactive() {
 
@@ -51,8 +58,56 @@ void reactive() {
         StepVerifier.create(api.setReactive(key, value)).expectNext("OK").verifyComplete();
     }
 
-    static interface MultipleExecutionModels extends Commands {
+    @Test
+    void shouldHandlePresentValue() {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
+
+        StepVerifier.create(api.setReactive(key, value)).expectNext("OK").verifyComplete();
+        StepVerifier.create(api.get(key)).expectNext(value).verifyComplete();
+    }
+
+    @Test
+    void shouldHandleAbsentValue() {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
+
+        StepVerifier.create(api.get("unknown")).verifyComplete();
+    }
+
+    @Test
+    void shouldHandlePresentValueRxJava() throws InterruptedException {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
+
+        StepVerifier.create(api.setReactive(key, value)).expectNext("OK").verifyComplete();
+        api.getRxJava(key).test().await().onSuccess(value);
+    }
+
+    @Test
+    void shouldHandleAbsentValueRxJava() throws InterruptedException {
+
+        RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
+
+        MultipleExecutionModels api = factory.getCommands(MultipleExecutionModels.class);
+
+        api.getRxJava(key).test().await().onSuccess(null);
+    }
+
+    interface MultipleExecutionModels extends Commands {
+
         @Command("SET")
         Mono<String> setReactive(String key, String value);
+
+        Mono<String> get(String key);
+
+        @Command("GET")
+        Maybe<String> getRxJava(String key);
     }
 }
diff --git a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java
index 9a2b41418a..d5c0d2f34c 100644
--- a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java
@@ -22,7 +22,10 @@
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
+import org.reactivestreams.Publisher;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import io.lettuce.core.GeoCoordinates;
 import io.lettuce.core.ScoredValue;
 import io.lettuce.core.Value;
@@ -46,6 +49,11 @@ void shouldResolveStringListOutput() {
         assertThat(getCommandOutput("stringIterable")).isInstanceOf(KeyListOutput.class);
     }
 
+    @Test
+    void shouldResolveStreamingStringListOutput() {
+        assertThat(getStreamingCommandOutput("stringFlux")).isInstanceOf(KeyListOutput.class);
+    }
+
     @Test
     void shouldResolveVoidOutput() {
 
@@ -53,6 +61,11 @@ void shouldResolveVoidOutput() {
         assertThat(getCommandOutput("voidWrapper")).isInstanceOf(VoidOutput.class);
     }
 
+    @Test
+    void shouldResolveKeyOutput() {
+        assertThat(getCommandOutput("stringMono")).isInstanceOf(KeyOutput.class);
+    }
+
     @Test
     void shouldResolveStringValueListOutput() {
 
@@ -143,23 +156,40 @@ void stringWildcardValueCollectionIsAssignableFromOutputs() {
     CommandOutput<?, ?, ?> getCommandOutput(String methodName) {
 
         OutputSelector outputSelector = getOutputSelector(methodName);
-        CommandOutputFactory factory = resolver.resolveCommandOutput(outputSelector);
+        CommandOutputFactory factory = resolver.resolveCommandOutput(Publisher.class.isAssignableFrom(outputSelector
+                .getOutputType().getRawClass()) ? unwrapReactiveType(outputSelector) : outputSelector);
+
+        return factory.create(new StringCodec());
+    }
+
+    CommandOutput<?, ?, ?> getStreamingCommandOutput(String methodName) {
+
+        OutputSelector outputSelector = getOutputSelector(methodName);
+        CommandOutputFactory factory = resolver.resolveStreamingCommandOutput(unwrapReactiveType(outputSelector));
 
         return factory.create(new StringCodec());
     }
 
+    private OutputSelector unwrapReactiveType(OutputSelector outputSelector) {
+        return new OutputSelector(outputSelector.getOutputType().getGeneric(0), outputSelector.getRedisCodec());
+    }
+
     private OutputSelector getOutputSelector(String methodName) {
 
         Method method = ReflectionUtils.findMethod(CommandMethods.class, methodName);
         return new OutputSelector(DeclaredCommandMethod.create(method).getActualReturnType(), StringCodec.UTF8);
     }
 
-    private static interface CommandMethods {
+    private interface CommandMethods {
 
         List<String> stringList();
 
         Iterable<String> stringIterable();
 
+        Mono<String> stringMono();
+
+        Flux<String> stringFlux();
+
         Collection<Value<String>> stringValueCollection();
 
         Collection<? extends Value<String>> stringWildcardValueCollection();

From a04648c065d15d55247648c5ec7ef780142b7a17 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 12 Oct 2018 16:58:25 +0200
Subject: [PATCH 542/808] Upgrade to Reactor Californium SR1 #883

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8af37c9740..162ed649c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <netty-version>4.1.29.Final</netty-version>
         <spring-version>4.3.19.RELEASE</spring-version>
-        <reactor-version>3.2.0.RELEASE</reactor-version>
+        <reactor-version>3.2.1.RELEASE</reactor-version>
         <brave-version>5.2.0</brave-version>
         <skipITs>true</skipITs>
     </properties>

From e595a5c21c5c3e9fa822c9728f310ec771fd49ee Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 12 Oct 2018 20:22:47 +0200
Subject: [PATCH 543/808] Post-release cleanups #884

---
 RELEASE-NOTES.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 797a57d252..0c7fb5c73b 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -26,8 +26,7 @@ Find the full change log at the end of this document that lists all 108 tickets.
 
 Thanks to all contributors who made Lettuce 5.1.0.RELEASE possible.
 
-Lettuce requires a minimum of Java 8 to build and run. It is tested continuously
-against the latest Redis source-build.
+Lettuce requires a minimum of Java 8 to build and run and is compatible with Java 11. It is tested continuously against the latest Redis source-build.
 
 If you need any support, meet Lettuce at
 

From 2b62f61e613ada9db69a778f9f79ad1551057ef8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 16 Oct 2018 16:27:47 +0200
Subject: [PATCH 544/808] Let AsyncExecutions implement CompletionStage #862

AsyncExecution now implements CompletionStage<List<T>> which allows synchronizing and collecting results over all individual executions. This change allows asynchronous transformation of the collected results.

AsyncExecutions also supports deferred collection of results by accepting a Collector and returning a CompletionStage with the collector applied.
---
 .../core/cluster/AsyncExecutionsImpl.java     | 262 +++++++++++++++++-
 .../cluster/api/async/AsyncExecutions.java    |  17 +-
 .../NodeSelectionAsyncIntegrationTests.java   |  39 +++
 3 files changed, 315 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
index 109b49009a..0c41a4daad 100644
--- a/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
@@ -18,6 +18,13 @@
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collector;
 
 import io.lettuce.core.cluster.api.async.AsyncExecutions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
@@ -27,10 +34,17 @@
  */
 class AsyncExecutionsImpl<T> implements AsyncExecutions<T> {
 
-    private Map<RedisClusterNode, CompletableFuture<T>> executions;
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    private static final AtomicReferenceFieldUpdater<AsyncExecutionsImpl<?>, CompletionStage> UPDATER = (AtomicReferenceFieldUpdater) AtomicReferenceFieldUpdater
+            .newUpdater(AsyncExecutionsImpl.class, CompletionStage.class, "publicStage");
+
+    private final Map<RedisClusterNode, CompletableFuture<T>> executions;
+
+    private volatile CompletionStage<List<T>> publicStage;
 
     @SuppressWarnings("unchecked")
     public AsyncExecutionsImpl(Map<RedisClusterNode, CompletionStage<? extends T>> executions) {
+
         Map<RedisClusterNode, CompletionStage<? extends T>> map = new HashMap<>(executions);
         this.executions = Collections.unmodifiableMap((Map) map);
     }
@@ -60,4 +74,250 @@ public CompletableFuture<T> get(RedisClusterNode redisClusterNode) {
     public CompletableFuture<T>[] futures() {
         return executions.values().toArray(new CompletableFuture[0]);
     }
+
+    @Override
+    public <R, A> CompletionStage<R> thenCollect(Collector<? super T, A, R> collector) {
+
+        return publicStage().thenApply(items -> {
+
+            A container = collector.supplier().get();
+
+            BiConsumer<A, ? super T> accumulator = collector.accumulator();
+            items.forEach(item -> accumulator.accept(container, item));
+
+            if (collector.characteristics().contains(Collector.Characteristics.IDENTITY_FINISH)) {
+                return (R) container;
+            }
+
+            return collector.finisher().apply(container);
+        });
+    }
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    private CompletionStage<List<T>> publicStage() {
+
+        CompletionStage stage = UPDATER.get(this);
+
+        if (stage == null) {
+            stage = createPublicStage(this.executions);
+            UPDATER.compareAndSet(this, null, stage);
+        }
+
+        return stage;
+    }
+
+    private CompletableFuture<List<T>> createPublicStage(Map<RedisClusterNode, CompletableFuture<T>> map) {
+
+        return CompletableFuture.allOf(map.values().toArray(new CompletableFuture[0])).thenApply(ignore -> {
+
+            List<T> results = new ArrayList<>(map.size());
+            for (CompletionStage<? extends T> value : map.values()) {
+                results.add(value.toCompletableFuture().join());
+            }
+
+            return results;
+        });
+    }
+
+    // --------------------------------
+    // delegate methods.
+    // --------------------------------
+
+    @Override
+    public <U> CompletionStage<U> thenApply(Function<? super List<T>, ? extends U> fn) {
+        return publicStage().thenApply(fn);
+    }
+
+    @Override
+    public <U> CompletionStage<U> thenApplyAsync(Function<? super List<T>, ? extends U> fn) {
+        return publicStage().thenApplyAsync(fn);
+    }
+
+    @Override
+    public <U> CompletionStage<U> thenApplyAsync(Function<? super List<T>, ? extends U> fn, Executor executor) {
+        return publicStage().thenApplyAsync(fn, executor);
+    }
+
+    @Override
+    public CompletionStage<Void> thenAccept(Consumer<? super List<T>> action) {
+        return publicStage().thenAccept(action);
+    }
+
+    @Override
+    public CompletionStage<Void> thenAcceptAsync(Consumer<? super List<T>> action) {
+        return publicStage().thenAcceptAsync(action);
+    }
+
+    @Override
+    public CompletionStage<Void> thenAcceptAsync(Consumer<? super List<T>> action, Executor executor) {
+        return publicStage().thenAcceptAsync(action, executor);
+    }
+
+    @Override
+    public CompletionStage<Void> thenRun(Runnable action) {
+        return publicStage().thenRun(action);
+    }
+
+    @Override
+    public CompletionStage<Void> thenRunAsync(Runnable action) {
+        return publicStage().thenRunAsync(action);
+    }
+
+    @Override
+    public CompletionStage<Void> thenRunAsync(Runnable action, Executor executor) {
+        return publicStage().thenRunAsync(action, executor);
+    }
+
+    @Override
+    public <U, V> CompletionStage<V> thenCombine(CompletionStage<? extends U> other,
+            BiFunction<? super List<T>, ? super U, ? extends V> fn) {
+        return publicStage().thenCombine(other, fn);
+    }
+
+    @Override
+    public <U, V> CompletionStage<V> thenCombineAsync(CompletionStage<? extends U> other,
+            BiFunction<? super List<T>, ? super U, ? extends V> fn) {
+        return publicStage().thenCombineAsync(other, fn);
+    }
+
+    @Override
+    public <U, V> CompletionStage<V> thenCombineAsync(CompletionStage<? extends U> other,
+            BiFunction<? super List<T>, ? super U, ? extends V> fn, Executor executor) {
+        return publicStage().thenCombineAsync(other, fn, executor);
+    }
+
+    @Override
+    public <U> CompletionStage<Void> thenAcceptBoth(CompletionStage<? extends U> other,
+            BiConsumer<? super List<T>, ? super U> action) {
+        return publicStage().thenAcceptBoth(other, action);
+    }
+
+    @Override
+    public <U> CompletionStage<Void> thenAcceptBothAsync(CompletionStage<? extends U> other,
+            BiConsumer<? super List<T>, ? super U> action) {
+        return publicStage().thenAcceptBothAsync(other, action);
+    }
+
+    @Override
+    public <U> CompletionStage<Void> thenAcceptBothAsync(CompletionStage<? extends U> other,
+            BiConsumer<? super List<T>, ? super U> action, Executor executor) {
+        return publicStage().thenAcceptBothAsync(other, action, executor);
+    }
+
+    @Override
+    public CompletionStage<Void> runAfterBoth(CompletionStage<?> other, Runnable action) {
+        return publicStage().runAfterBoth(other, action);
+    }
+
+    @Override
+    public CompletionStage<Void> runAfterBothAsync(CompletionStage<?> other, Runnable action) {
+        return publicStage().runAfterBothAsync(other, action);
+    }
+
+    @Override
+    public CompletionStage<Void> runAfterBothAsync(CompletionStage<?> other, Runnable action, Executor executor) {
+        return publicStage().runAfterBothAsync(other, action, executor);
+    }
+
+    @Override
+    public <U> CompletionStage<U> applyToEither(CompletionStage<? extends List<T>> other, Function<? super List<T>, U> fn) {
+        return publicStage().applyToEither(other, fn);
+    }
+
+    @Override
+    public <U> CompletionStage<U> applyToEitherAsync(CompletionStage<? extends List<T>> other, Function<? super List<T>, U> fn) {
+        return publicStage().applyToEitherAsync(other, fn);
+    }
+
+    @Override
+    public <U> CompletionStage<U> applyToEitherAsync(CompletionStage<? extends List<T>> other, Function<? super List<T>, U> fn,
+            Executor executor) {
+        return publicStage().applyToEitherAsync(other, fn, executor);
+    }
+
+    @Override
+    public CompletionStage<Void> acceptEither(CompletionStage<? extends List<T>> other, Consumer<? super List<T>> action) {
+        return publicStage().acceptEither(other, action);
+    }
+
+    @Override
+    public CompletionStage<Void> acceptEitherAsync(CompletionStage<? extends List<T>> other, Consumer<? super List<T>> action) {
+        return publicStage().acceptEitherAsync(other, action);
+    }
+
+    @Override
+    public CompletionStage<Void> acceptEitherAsync(CompletionStage<? extends List<T>> other, Consumer<? super List<T>> action,
+            Executor executor) {
+        return publicStage().acceptEitherAsync(other, action, executor);
+    }
+
+    @Override
+    public CompletionStage<Void> runAfterEither(CompletionStage<?> other, Runnable action) {
+        return publicStage().runAfterEither(other, action);
+    }
+
+    @Override
+    public CompletionStage<Void> runAfterEitherAsync(CompletionStage<?> other, Runnable action) {
+        return publicStage().runAfterEitherAsync(other, action);
+    }
+
+    @Override
+    public CompletionStage<Void> runAfterEitherAsync(CompletionStage<?> other, Runnable action, Executor executor) {
+        return publicStage().runAfterEitherAsync(other, action, executor);
+    }
+
+    @Override
+    public <U> CompletionStage<U> thenCompose(Function<? super List<T>, ? extends CompletionStage<U>> fn) {
+        return publicStage().thenCompose(fn);
+    }
+
+    @Override
+    public <U> CompletionStage<U> thenComposeAsync(Function<? super List<T>, ? extends CompletionStage<U>> fn) {
+        return publicStage().thenComposeAsync(fn);
+    }
+
+    @Override
+    public <U> CompletionStage<U> thenComposeAsync(Function<? super List<T>, ? extends CompletionStage<U>> fn, Executor executor) {
+        return publicStage().thenComposeAsync(fn, executor);
+    }
+
+    @Override
+    public CompletionStage<List<T>> exceptionally(Function<Throwable, ? extends List<T>> fn) {
+        return publicStage().exceptionally(fn);
+    }
+
+    @Override
+    public CompletionStage<List<T>> whenComplete(BiConsumer<? super List<T>, ? super Throwable> action) {
+        return publicStage().whenComplete(action);
+    }
+
+    @Override
+    public CompletionStage<List<T>> whenCompleteAsync(BiConsumer<? super List<T>, ? super Throwable> action) {
+        return publicStage().whenCompleteAsync(action);
+    }
+
+    @Override
+    public CompletionStage<List<T>> whenCompleteAsync(BiConsumer<? super List<T>, ? super Throwable> action, Executor executor) {
+        return publicStage().whenCompleteAsync(action, executor);
+    }
+
+    @Override
+    public <U> CompletionStage<U> handle(BiFunction<? super List<T>, Throwable, ? extends U> fn) {
+        return publicStage().handle(fn);
+    }
+
+    @Override
+    public <U> CompletionStage<U> handleAsync(BiFunction<? super List<T>, Throwable, ? extends U> fn) {
+        return publicStage().handleAsync(fn);
+    }
+
+    @Override
+    public <U> CompletionStage<U> handleAsync(BiFunction<? super List<T>, Throwable, ? extends U> fn, Executor executor) {
+        return publicStage().handleAsync(fn, executor);
+    }
+
+    @Override
+    public CompletableFuture<List<T>> toCompletableFuture() {
+        return publicStage().toCompletableFuture();
+    }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java b/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
index b61b4275d4..89831ffa2a 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
@@ -16,9 +16,11 @@
 package io.lettuce.core.cluster.api.async;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import java.util.stream.Collector;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
@@ -30,7 +32,7 @@
  * @author Mark Paluch
  * @since 4.0
  */
-public interface AsyncExecutions<T> extends Iterable<CompletableFuture<T>> {
+public interface AsyncExecutions<T> extends Iterable<CompletableFuture<T>>, CompletionStage<List<T>> {
 
     /**
      *
@@ -52,11 +54,22 @@ public interface AsyncExecutions<T> extends Iterable<CompletableFuture<T>> {
     CompletionStage<T> get(RedisClusterNode redisClusterNode);
 
     /**
-     *
      * @return array of futures.
      */
     CompletableFuture<T>[] futures();
 
+    /**
+     * Returns a new {@link CompletionStage} that, when this stage completes normally, is executed with this stage's results as
+     * the argument to the {@link Collector}.
+     *
+     * See the {@link CompletionStage} documentation for rules covering exceptional completion.
+     *
+     * @param collector the {@link Collector} to collect this stages results.
+     * @return the new {@link CompletionStage}.
+     * @see 5.2
+     */
+    <R, A> CompletionStage<R> thenCollect(Collector<? super T, A, R> collector);
+
     /**
      * @return a sequential {@code Stream} over the {@link CompletionStage CompletionStages} in this collection
      */
diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
index cb3a058c3c..4e290d7261 100644
--- a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
@@ -23,6 +23,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Future;
+import java.util.stream.Collector;
 
 import javax.inject.Inject;
 
@@ -84,6 +85,44 @@ void testMultiNodeOperations() {
         assertThat(result).isEqualTo(expectation);
     }
 
+    @Test
+    void testThenCollect() {
+
+        List<String> expectation = new ArrayList<>();
+        for (char c = 'a'; c < 'z'; c++) {
+            String key = new String(new char[] { c, c, c });
+            expectation.add(key);
+            Futures.await(commands.set(key, value));
+        }
+
+        Collector<List<String>, List<String>, List<String>> collector = Collector.of(ArrayList::new, List::addAll, (a, b) -> a,
+                it -> it);
+
+        CompletableFuture<List<String>> future = commands.masters().commands().keys("*").thenCollect(collector)
+                .toCompletableFuture();
+
+        Futures.await(future);
+        List<String> result = future.join();
+
+        assertThat(result).hasSize(expectation.size());
+
+        Collections.sort(expectation);
+        Collections.sort(result);
+
+        assertThat(result).isEqualTo(expectation);
+    }
+
+    @Test
+    void testCompletionStageTransformation() {
+
+        CompletableFuture<String> transformed = commands.masters().commands().ping()
+                .thenApply(it -> String.join(" ", it.toArray(new String[0]))).toCompletableFuture();
+
+        Futures.await(transformed);
+
+        assertThat(transformed.join()).isEqualTo("PONG PONG");
+    }
+
     @Test
     void testNodeSelectionCount() {
         assertThat(commands.all().size()).isEqualTo(4);

From 0df14413e32571d03f26c592f414ca9f3e7259ca Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 17 Oct 2018 22:18:54 +0200
Subject: [PATCH 545/808] Upgrade to Redis 5 GA #893

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 25161c4a6f..0cbfe0bb6d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ env:
   matrix:
     - REDIS=unstable
     - PROFILE=jmh
-    - REDIS=5.0-rc5
+    - REDIS=5.0
     - REDIS=4.0.11
     - REDIS=3.2.11
 

From c8e58b5e74a7e33c584a93de65e84d16242ad652 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 21 Oct 2018 21:35:05 +0200
Subject: [PATCH 546/808] Fix ClassCastException on
 RedisClusterClient.connectPubSub() with global timeouts enabled #895

---
 .../core/cluster/RedisClusterClient.java      | 12 +--
 .../ClusterClientOptionsIntegrationTests.java | 94 +++++++++++++++++++
 2 files changed, 100 insertions(+), 6 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/cluster/ClusterClientOptionsIntegrationTests.java

diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 3fd51fb4c6..fecf1b1507 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -644,17 +644,17 @@ private <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> con
         Mono<SocketAddress> socketAddressSupplier = getSocketAddressSupplier(TopologyComparators::sortByClientCount);
 
         PubSubClusterEndpoint<K, V> endpoint = new PubSubClusterEndpoint<K, V>(clientOptions, clientResources);
-
-        ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, endpoint,
-                clusterTopologyRefreshScheduler);
-        RedisChannelWriter writer = clusterWriter;
+        RedisChannelWriter writer = endpoint;
 
         if (CommandExpiryWriter.isSupported(clientOptions)) {
-            writer = new CommandExpiryWriter(clusterWriter, clientOptions, clientResources);
+            writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
         }
 
+        ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, writer,
+                clusterTopologyRefreshScheduler);
+
         StatefulRedisClusterPubSubConnectionImpl<K, V> connection = new StatefulRedisClusterPubSubConnectionImpl<>(endpoint,
-                writer, codec, timeout);
+                clusterWriter, codec, timeout);
 
         ClusterPubSubConnectionProvider<K, V> pooledClusterConnectionProvider = new ClusterPubSubConnectionProvider<>(this,
                 clusterWriter, codec, connection.getUpstreamListener(), clusterTopologyRefreshScheduler);
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsIntegrationTests.java
new file mode 100644
index 0000000000..4532dc2474
--- /dev/null
+++ b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsIntegrationTests.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.time.Duration;
+import java.util.concurrent.ExecutionException;
+
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.lettuce.core.RedisCommandTimeoutException;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.TestSupport;
+import io.lettuce.core.TimeoutOptions;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
+import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection;
+import io.lettuce.test.LettuceExtension;
+
+/**
+ * @author Mark Paluch
+ */
+@ExtendWith(LettuceExtension.class)
+class ClusterClientOptionsIntegrationTests extends TestSupport {
+
+    private final RedisClusterClient clusterClient;
+
+    @Inject
+    ClusterClientOptionsIntegrationTests(RedisClusterClient clusterClient) {
+        this.clusterClient = clusterClient;
+    }
+
+    @AfterEach
+    void tearDown() {
+        clusterClient.setOptions(ClusterClientOptions.create());
+    }
+
+    @Test
+    void shouldApplyTimeoutOptionsToClusterConnection() throws InterruptedException {
+
+        clusterClient.setOptions(ClusterClientOptions.builder().timeoutOptions(TimeoutOptions.enabled(Duration.ofMillis(100)))
+                .build());
+
+        try (StatefulRedisClusterConnection<String, String> connection = clusterClient.connect()) {
+
+            connection.setTimeout(Duration.ZERO);
+            connection.async().clientPause(300);
+
+            RedisFuture<String> future = connection.async().ping();
+
+            assertThatThrownBy(future::get).isInstanceOf(ExecutionException.class)
+                    .hasCauseInstanceOf(RedisCommandTimeoutException.class).hasMessageContaining("100 milli");
+        }
+
+        Thread.sleep(300);
+    }
+
+    @Test
+    void shouldApplyTimeoutOptionsToPubSubClusterConnection() throws InterruptedException {
+
+        clusterClient.setOptions(ClusterClientOptions.builder().timeoutOptions(TimeoutOptions.enabled(Duration.ofMillis(100)))
+                .build());
+
+        try (StatefulRedisClusterPubSubConnection<String, String> connection = clusterClient.connectPubSub()) {
+            connection.setTimeout(Duration.ofMillis(100));
+
+            connection.async().clientPause(300);
+
+            RedisFuture<String> future = connection.async().ping();
+
+            assertThatThrownBy(future::get).isInstanceOf(ExecutionException.class)
+                    .hasCauseInstanceOf(RedisCommandTimeoutException.class).hasMessageContaining("100 milli");
+        }
+
+        Thread.sleep(300);
+    }
+}

From 693b71ad5f534c6f24f4fa1a1922cee4f5ecdbf6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 25 Oct 2018 11:53:54 +0200
Subject: [PATCH 547/808] Fix ScanStream element emission #897

ScanSubscriber now reliably reports whether its elements were consumed (emitted) and SubscriptionAdapter's check about chunk completion considers now that a cursor might be not available yet because execution is in progress.

Previously, two concurrent processes (emission of cursor results, intermediate demand) cause a race condition that considered a cursor result fully consumed although consumption was not yet finished. Also, SubscriptionAdapter did not take into account that a cursor result might not yet be available and prematurely signalled completion.
---
 src/main/java/io/lettuce/core/ScanStream.java | 107 +++++++++---------
 .../core/ScanStreamIntegrationTests.java      |  28 ++++-
 2 files changed, 82 insertions(+), 53 deletions(-)

diff --git a/src/main/java/io/lettuce/core/ScanStream.java b/src/main/java/io/lettuce/core/ScanStream.java
index 68356ccaf6..79002e0362 100644
--- a/src/main/java/io/lettuce/core/ScanStream.java
+++ b/src/main/java/io/lettuce/core/ScanStream.java
@@ -15,10 +15,9 @@
  */
 package io.lettuce.core;
 
-import java.util.Iterator;
-import java.util.Optional;
-import java.util.Queue;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import java.util.function.Function;
 
@@ -136,13 +135,15 @@ private static <K, V> Flux<KeyValue<K, V>> hscan(RedisHashReactiveCommands<K, V>
 
             Mono<MapScanCursor<K, V>> res = scanArgs.map(it -> commands.hscan(key, it)).orElseGet(() -> commands.hscan(key));
 
-            scan(sink,
-                    res,
-                    c -> scanArgs.map(it -> commands.hscan(key, c, it)).orElseGet(() -> commands.hscan(key, c)), //
+            scan(sink, res, c -> scanArgs.map(it -> commands.hscan(key, c, it)).orElseGet(() -> commands.hscan(key, c)), //
                     c -> {
-                        Iterator<KeyValue<K, V>> iterator = c.getMap().entrySet().stream()
-                                .map(me -> KeyValue.fromNullable(me.getKey(), me.getValue())).iterator();
-                        return () -> iterator;
+
+                        List<KeyValue<K, V>> list = new ArrayList<>(c.getMap().size());
+
+                        for (Map.Entry<K, V> kvEntry : c.getMap().entrySet()) {
+                            list.add(KeyValue.fromNullable(kvEntry.getKey(), kvEntry.getValue()));
+                        }
+                        return list;
                     });
         });
 
@@ -243,7 +244,7 @@ private static <K, V> Flux<ScoredValue<V>> zscan(RedisSortedSetReactiveCommands<
     }
 
     private static <V, C extends ScanCursor> void scan(FluxSink<V> sink, Mono<C> initialCursor,
-            Function<ScanCursor, Mono<C>> scanFunction, Function<C, Iterable<V>> manyMapper) {
+            Function<ScanCursor, Mono<C>> scanFunction, Function<C, Collection<V>> manyMapper) {
 
         new SubscriptionAdapter<>(sink, initialCursor, scanFunction, manyMapper).register();
     }
@@ -280,17 +281,16 @@ static class SubscriptionAdapter<T, C extends ScanCursor> implements Completable
         private final Context context;
         private final Mono<C> initial;
         private final Function<ScanCursor, Mono<C>> scanFunction;
-        private final Function<C, Iterable<T>> manyMapper;
+        private final Function<C, Collection<T>> manyMapper;
 
         SubscriptionAdapter(FluxSink<T> sink, Mono<C> initial, Function<ScanCursor, Mono<C>> scanFunction,
-                Function<C, Iterable<T>> manyMapper) {
+                Function<C, Collection<T>> manyMapper) {
 
             this.sink = sink;
             this.context = sink.currentContext();
             this.initial = initial;
             this.scanFunction = scanFunction;
             this.manyMapper = manyMapper;
-
         }
 
         /**
@@ -307,8 +307,6 @@ void onDemand(long n) {
                 return;
             }
 
-            long demand = sink.requestedFromDownstream();
-
             ScanSubscriber<T, C> current = getCurrentSubscriber();
 
             if (current == null) {
@@ -327,8 +325,7 @@ void onDemand(long n) {
             }
 
             current.emitFromBuffer();
-
-            if (!current.exhausted || current.canceled || demand == 0) {
+            if (!current.isExhausted() || current.canceled || sink.requestedFromDownstream() == 0) {
                 return;
             }
 
@@ -358,24 +355,27 @@ private void canceled() {
         @Override
         public void chunkCompleted() {
 
-            if (!canceled) {
+            if (canceled) {
+                return;
+            }
 
-                ScanSubscriber<T, C> current = getCurrentSubscriber();
-                if (current != null) {
+            ScanSubscriber<T, C> current = getCurrentSubscriber();
+            if (current == null) {
+                return;
+            }
 
-                    ScanCursor cursor = current.getCursor();
+            ScanCursor cursor = current.getCursor();
 
-                    if (cursor != null) {
-                        if (!cursor.isFinished() || !current.exhausted) {
-                            onDemand(0);
-                            return;
-                        }
-                    }
-                }
+            if (cursor == null) {
+                return;
+            }
 
+            if (cursor.isFinished() && current.isExhausted()) {
                 if (terminate()) {
                     sink.complete();
                 }
+            } else {
+                onDemand(0);
             }
         }
 
@@ -408,20 +408,25 @@ static class ScanSubscriber<T, C extends ScanCursor> extends BaseSubscriber<C> {
         private static final AtomicReferenceFieldUpdater<ScanSubscriber, ScanCursor> CURSOR = AtomicReferenceFieldUpdater
                 .newUpdater(ScanSubscriber.class, ScanCursor.class, "cursor");
 
+        private static final AtomicLongFieldUpdater<ScanSubscriber> EMITTED = AtomicLongFieldUpdater.newUpdater(
+                ScanSubscriber.class, "emitted");
+
         private final Completable completable;
         private final FluxSink<T> sink;
         private final Queue<T> buffer = Operators.newQueue();
         private final Context context;
-        private final Function<C, Iterable<T>> manyMapper;
+        private final Function<C, Collection<T>> manyMapper;
 
-        volatile boolean exhausted = false;
         volatile boolean canceled;
-
         // see CURSOR
         @SuppressWarnings("unused")
         private volatile C cursor;
+        // see EMITTED
+        @SuppressWarnings("unused")
+        private volatile long emitted;
+        private volatile long cursorSize;
 
-        ScanSubscriber(Completable completable, FluxSink<T> sink, Context context, Function<C, Iterable<T>> manyMapper) {
+        ScanSubscriber(Completable completable, FluxSink<T> sink, Context context, Function<C, Collection<T>> manyMapper) {
             this.completable = completable;
             this.sink = sink;
             this.context = context;
@@ -441,9 +446,10 @@ protected void hookOnNext(C cursor) {
                 return;
             }
 
-            Iterable<T> iterable = manyMapper.apply(cursor);
+            Collection<T> items = manyMapper.apply(cursor);
+            cursorSize = items.size();
 
-            emitDirect(iterable);
+            emitDirect(items);
         }
 
         /**
@@ -457,29 +463,25 @@ void emitDirect(Iterable<T> iterable) {
             long demand = sink.requestedFromDownstream();
             long sent = 0;
 
-            if (demand > 0) {
-                for (T value : iterable) {
+            for (T value : iterable) {
 
-                    if (canceled) {
-                        break;
-                    }
+                if (canceled) {
+                    break;
+                }
 
-                    if (demand <= sent) {
-                        buffer.add(value);
-                        continue;
-                    }
+                if (demand <= sent) {
+                    buffer.add(value);
+                    continue;
+                }
 
-                    sent++;
+                sent++;
 
-                    next(value);
-                }
+                next(value);
             }
-
-            exhausted = buffer.isEmpty();
         }
 
         /**
-         * Buffer-based emission polling items from the buffer and emitting until the demand is satisified or the buffer is
+         * Buffer-based emission polling items from the buffer and emitting until the demand is satisfied or the buffer is
          * exhausted.
          */
         void emitFromBuffer() {
@@ -504,11 +506,10 @@ void emitFromBuffer() {
                     }
                 }
             }
-
-            exhausted = buffer.isEmpty();
         }
 
         private void next(T value) {
+            EMITTED.incrementAndGet(this);
             sink.next(value);
         }
 
@@ -530,6 +531,10 @@ protected void hookOnCancel() {
         public ScanCursor getCursor() {
             return CURSOR.get(this);
         }
+
+        public boolean isExhausted() {
+            return EMITTED.get(this) == cursorSize && getCursor() != null;
+        }
     }
 
     /**
diff --git a/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java b/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java
index 36f15c5ae5..0c8facc616 100644
--- a/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java
@@ -15,8 +15,10 @@
  */
 package io.lettuce.core;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
 
 import javax.inject.Inject;
 
@@ -92,7 +94,6 @@ void shouldSscanIteratively() {
 
         RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
 
-        AtomicInteger ai = new AtomicInteger();
         StepVerifier.create(ScanStream.sscan(reactive, key, ScanArgs.Builder.limit(200)), 0).thenRequest(250)
                 .expectNextCount(250).thenCancel().verify();
         StepVerifier.create(ScanStream.sscan(reactive, key).count()).expectNext(1000L).verifyComplete();
@@ -111,4 +112,27 @@ void shouldZscanIteratively() {
                 .verifyComplete();
         StepVerifier.create(ScanStream.zscan(reactive, key)).expectNextCount(1000).verifyComplete();
     }
+
+    @Test
+    void shouldCorrectlyEmitItemsWithConcurrentPoll() {
+
+        RedisReactiveCommands<String, String> commands = connection.reactive();
+
+        String sourceKey = "source";
+        String targetKey = "target";
+
+        IntStream.range(0, 10_000).forEach(num -> connection.async().hset(sourceKey, String.valueOf(num), String.valueOf(num)));
+
+        redis.del(targetKey);
+
+        ScanStream.hscan(commands, sourceKey).map(KeyValue::getValue) //
+                .map(Integer::parseInt) //
+                .filter(num -> num % 2 == 0) //
+                .concatMap(item -> commands.sadd(targetKey, String.valueOf(item))) //
+                .as(StepVerifier::create) //
+                .expectNextCount(5000) //
+                .verifyComplete();
+
+        assertThat(redis.scard(targetKey)).isEqualTo(5_000);
+    }
 }

From 240aea078f6d4a7cc494f660788cf398c321cd18 Mon Sep 17 00:00:00 2001
From: Larry Battle <larry.battle.tech@gmail.com>
Date: Thu, 25 Oct 2018 03:07:47 -0500
Subject: [PATCH 548/808] Fixed StackOverflow caused
 CommandLatencyCollectorOptions.builder() #899

---
 .../CommandLatencyCollectorOptions.java       |  2 +-
 ...mmandLatencyCollectorOptionsUnitTests.java | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java

diff --git a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
index ad81c81c2d..57e8a625db 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
@@ -51,7 +51,7 @@ static CommandLatencyCollectorOptions disabled() {
      * @since 5.1
      */
     static CommandLatencyCollectorOptions.Builder builder() {
-        return CommandLatencyCollectorOptions.builder();
+        return DefaultCommandLatencyCollectorOptions.builder();
     }
 
     /**
diff --git a/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java b/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java
new file mode 100644
index 0000000000..8994f3af55
--- /dev/null
+++ b/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.metrics;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class CommandLatencyCollectorOptionsUnitTests {
+
+    @Test()
+    void testBuilder() {
+
+        CommandLatencyCollectorOptions sut = CommandLatencyCollectorOptions.builder()
+                .targetUnit(TimeUnit.HOURS).targetPercentiles(new double[] { 1, 2, 3 }).build();
+
+        assertThat(sut.targetPercentiles()).hasSize(3);
+        assertThat(sut.targetUnit()).isEqualTo(TimeUnit.HOURS);
+    }
+}

From f6525298d7d55193c104ada43d3058a106642954 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 25 Oct 2018 12:27:27 +0200
Subject: [PATCH 549/808] Polishing #899

Add author tag. Rename previously wrong named test.
---
 .../CommandLatencyCollectorOptionsUnitTests.java      | 11 +++++++----
 ...faultCommandLatencyCollectorOptionsUnitTests.java} |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)
 rename src/test/java/io/lettuce/core/metrics/{DefaultDefaultCommandLatencyCollectorOptionsUnitTests.java => DefaultCommandLatencyCollectorOptionsUnitTests.java} (96%)

diff --git a/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java b/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java
index 8994f3af55..3e4f223967 100644
--- a/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,18 @@
  */
 package io.lettuce.core.metrics;
 
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.TimeUnit;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
 
+/**
+ * @author Larry Battle
+ */
 class CommandLatencyCollectorOptionsUnitTests {
 
-    @Test()
+    @Test
     void testBuilder() {
 
         CommandLatencyCollectorOptions sut = CommandLatencyCollectorOptions.builder()
diff --git a/src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsUnitTests.java b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptionsUnitTests.java
similarity index 96%
rename from src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsUnitTests.java
rename to src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptionsUnitTests.java
index c5318f0067..1b4a673f3c 100644
--- a/src/test/java/io/lettuce/core/metrics/DefaultDefaultCommandLatencyCollectorOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptionsUnitTests.java
@@ -24,7 +24,7 @@
 /**
  * @author Mark Paluch
  */
-class DefaultDefaultCommandLatencyCollectorOptionsUnitTests {
+class DefaultCommandLatencyCollectorOptionsUnitTests {
 
     @Test
     void testDefault() {

From 98bb27849aca579e48e51d3c180ff89beb6d6757 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 26 Oct 2018 10:45:24 +0200
Subject: [PATCH 550/808] Upgrade to RxJava 2.2.3 #901

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 162ed649c6..092dede63f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,7 +203,7 @@
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
-            <version>2.2.2</version>
+            <version>2.2.3</version>
             <optional>true</optional>
         </dependency>
 

From 1bc371b6df6dcb820eae70733768a4b92c69c333 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 26 Oct 2018 10:46:20 +0200
Subject: [PATCH 551/808] Upgrade to Spring Framework 4.3.20.RELEASE #902

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 092dede63f..ae88bcc86d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <netty-version>4.1.29.Final</netty-version>
-        <spring-version>4.3.19.RELEASE</spring-version>
+        <spring-version>4.3.20.RELEASE</spring-version>
         <reactor-version>3.2.1.RELEASE</reactor-version>
         <brave-version>5.2.0</brave-version>
         <skipITs>true</skipITs>

From cbd1aafb55aca9bd9875946fcd34bcb2f67566b8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 26 Oct 2018 10:48:52 +0200
Subject: [PATCH 552/808] Upgrade to netty 4.1.30.Final #903

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ae88bcc86d..072c446663 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
-        <netty-version>4.1.29.Final</netty-version>
+        <netty-version>4.1.30.Final</netty-version>
         <spring-version>4.3.20.RELEASE</spring-version>
         <reactor-version>3.2.1.RELEASE</reactor-version>
         <brave-version>5.2.0</brave-version>

From 6c99ea9f98a8b55d28745eba28cdb765f8f303fc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 26 Oct 2018 14:22:47 +0200
Subject: [PATCH 553/808] Upgrade to Reactor Core 3.2.2.RELEASE #904

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 072c446663..70293bfc4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <netty-version>4.1.30.Final</netty-version>
         <spring-version>4.3.20.RELEASE</spring-version>
-        <reactor-version>3.2.1.RELEASE</reactor-version>
+        <reactor-version>3.2.2.RELEASE</reactor-version>
         <brave-version>5.2.0</brave-version>
         <skipITs>true</skipITs>
     </properties>

From cda2842c76ed470c66dac890a2afeb1b807831d4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 7 Nov 2018 10:43:13 +0100
Subject: [PATCH 554/808] Deprecate StatefulConnection.reset() #907

Deprecating reset() method as we no longer require this functionality. Reset was introduced with Lettuce 3.1 where we did not have SSL support and external SSL tunneling was the only possibility to use SSL connections. External tunneling with strunnel could break and the only way to recover was resetting the protocol state.
---
 src/main/java/io/lettuce/core/RedisChannelHandler.java   | 4 +++-
 src/main/java/io/lettuce/core/RedisChannelWriter.java    | 9 +++++++--
 .../java/io/lettuce/core/api/StatefulConnection.java     | 7 ++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisChannelHandler.java b/src/main/java/io/lettuce/core/RedisChannelHandler.java
index e36f38247b..c94a067693 100644
--- a/src/main/java/io/lettuce/core/RedisChannelHandler.java
+++ b/src/main/java/io/lettuce/core/RedisChannelHandler.java
@@ -36,7 +36,7 @@
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
- * Abstract base for every redis connection. Provides basic connection functionality and tracks open resources.
+ * Abstract base for every Redis connection. Provides basic connection functionality and tracks open resources.
  *
  * @param <K> Key type.
  * @param <V> Value type.
@@ -289,6 +289,8 @@ public boolean isOpen() {
         return active;
     }
 
+    @Deprecated
+    @Override
     public void reset() {
         channelWriter.reset();
     }
diff --git a/src/main/java/io/lettuce/core/RedisChannelWriter.java b/src/main/java/io/lettuce/core/RedisChannelWriter.java
index 0c0636462c..7a2f96b668 100644
--- a/src/main/java/io/lettuce/core/RedisChannelWriter.java
+++ b/src/main/java/io/lettuce/core/RedisChannelWriter.java
@@ -66,9 +66,14 @@ public interface RedisChannelWriter extends Closeable, AsyncCloseable {
     CompletableFuture<Void> closeAsync();
 
     /**
-     * Reset the writer state. Queued commands will be canceled and the internal state will be reset. This is useful when the
-     * internal state machine gets out of sync with the connection.
+     * Reset the command state. Queued commands will be canceled and the internal state will be reset. This is useful when the
+     * internal state machine gets out of sync with the connection (e.g. errors during external SSL tunneling). Calling this
+     * method will reset the protocol state, therefore it is considered unsafe.
+     * 
+     * @deprecated since 5.2. This method is unsafe and can cause protocol offsets (i.e. Redis commands are completed with
+     *             previous command values).
      */
+    @Deprecated
     void reset();
 
     /**
diff --git a/src/main/java/io/lettuce/core/api/StatefulConnection.java b/src/main/java/io/lettuce/core/api/StatefulConnection.java
index 75aab220ba..96840f5d86 100644
--- a/src/main/java/io/lettuce/core/api/StatefulConnection.java
+++ b/src/main/java/io/lettuce/core/api/StatefulConnection.java
@@ -113,8 +113,13 @@ public interface StatefulConnection<K, V> extends AutoCloseable, AsyncCloseable
 
     /**
      * Reset the command state. Queued commands will be canceled and the internal state will be reset. This is useful when the
-     * internal state machine gets out of sync with the connection.
+     * internal state machine gets out of sync with the connection (e.g. errors during external SSL tunneling). Calling this
+     * method will reset the protocol state, therefore it is considered unsafe.
+     * 
+     * @deprecated since 5.2. This method is unsafe and can cause protocol offsets (i.e. Redis commands are completed with
+     *             previous command values).
      */
+    @Deprecated
     void reset();
 
     /**

From 011e17c4622469aa4a603bc44be7899bd776212a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 7 Nov 2018 11:27:20 +0100
Subject: [PATCH 555/808] Document MasterSlave connection failure behavior #894

---
 .../lettuce/core/masterslave/Connections.java |  2 +-
 .../lettuce/core/masterslave/MasterSlave.java | 20 +++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/lettuce/core/masterslave/Connections.java b/src/main/java/io/lettuce/core/masterslave/Connections.java
index ed9960ffed..798e175f27 100644
--- a/src/main/java/io/lettuce/core/masterslave/Connections.java
+++ b/src/main/java/io/lettuce/core/masterslave/Connections.java
@@ -97,7 +97,7 @@ protected void onEmit(Emission<Connections> emission) {
         if (getExpectedCount() != 0 && this.connections.isEmpty() && !this.exceptions.isEmpty()) {
 
             RedisConnectionException collector = new RedisConnectionException(
-                    "Unable to establish a connection to Redis Cluster");
+                    "Unable to establish a connection to Redis Master/Slave");
             this.exceptions.forEach(collector::addSuppressed);
 
             emission.error(collector);
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index 38323e730d..56e9399358 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -45,14 +45,14 @@
  * StatefulRedisMasterSlaveConnection&lt;String, String&gt; connection = MasterSlave.connect(client,
  *         RedisURI.create(&quot;redis://localhost&quot;), StringCodec.UTF8);
  * // ...
- *
+ * 
  * connection.close();
  * client.shutdown();
  * </pre>
  *
  * </p>
  * <h3>Topology Discovery</h3>
- * <p>
+ * <p />
  * Master-Slave topologies are either static or semi-static. Redis Standalone instances with attached slaves provide no
  * failover/HA mechanism. Redis Sentinel managed instances are controlled by Redis Sentinel and allow failover (which include
  * master promotion). The {@link MasterSlave} API supports both mechanisms. The topology is provided by a
@@ -70,14 +70,22 @@
  * {@code SENTINEL MASTER} and {@code SENTINEL SLAVES} output. Master/Slave failover is handled by lettuce.</li>
  * </ul>
  *
- * <p>
- * Topology Updates
- * </p>
+ * <h3>Topology Updates</h4>
  * <ul>
  * <li>Standalone Master/Slave: Performs a one-time topology lookup which remains static afterward</li>
  * <li>Redis Sentinel: Subscribes to all Sentinels and listens for Pub/Sub messages to trigger topology refreshing</li>
  * </ul>
- * </p>
+ * 
+ * <h3>Connection Fault-Tolerance</h3>
+ * Connecting to Master/Slave bears the possibility that individual nodes are not reachable. {@link MasterSlave} can still
+ * connect to a partially-available set of nodes.
+ * 
+ * <ul>
+ * <li>Redis Sentinel: At least one Sentinel must be reachable, the masterId must be registered and at least one host must be
+ * available (master or slave). Allows for runtime-recovery based on Sentinel Events.</li>
+ * <li>Static Setup (auto-discovery): The initial endpoint must be reachable. No recovery/reconfiguration during runtime.</li>
+ * <li>Static Setup (provided hosts): All endpoints must be reachable. No recovery/reconfiguration during runtime.</li>
+ * </ul>
  *
  * @author Mark Paluch
  * @since 4.1

From 90fcc6eb7b4cb4f890266b9b6d990799a99e1001 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 7 Nov 2018 15:09:33 +0100
Subject: [PATCH 556/808] Add equality check for subscribed pattern and channel
 names #911

Lettuce now stores pattern and channel names to which a connection is subscribed to with a comparison wrapper. This allows to compute hashCode and check for equality for built-in channel name types that do not support equals/hashCode for their actual content, in particular byte arrays.

Using byte[] for channel names prevented a proper equality check regarding the binary content and caused duplicates in the channel list. With every subscription, channel names were added in a quadraric amount at excessive memory cost.
---
 .../lettuce/core/pubsub/PubSubEndpoint.java   | 90 ++++++++++++++---
 .../StatefulRedisPubSubConnectionImpl.java    |  4 +-
 .../java/io/lettuce/core/ByteBufferCodec.java | 52 ++++++++++
 .../core/CustomCodecIntegrationTests.java     | 28 ------
 .../core/pubsub/PubSubEndpointUnitTests.java  | 98 +++++++++++++++++++
 5 files changed, 229 insertions(+), 43 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/ByteBufferCodec.java
 create mode 100644 src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java

diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
index 398f1e77c6..923fe51724 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
@@ -15,10 +15,7 @@
  */
 package io.lettuce.core.pubsub;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import io.lettuce.core.ClientOptions;
@@ -38,8 +35,8 @@ public class PubSubEndpoint<K, V> extends DefaultEndpoint {
     private static final Set<String> ALLOWED_COMMANDS_SUBSCRIBED;
     private static final Set<String> SUBSCRIBE_COMMANDS;
     private final List<RedisPubSubListener<K, V>> listeners = new CopyOnWriteArrayList<>();
-    private final Set<K> channels;
-    private final Set<K> patterns;
+    private final Set<Wrapper<K>> channels;
+    private final Set<Wrapper<K>> patterns;
     private volatile boolean subscribeWritten = false;
 
     static {
@@ -94,12 +91,20 @@ protected List<RedisPubSubListener<K, V>> getListeners() {
         return listeners;
     }
 
+    public boolean hasChannelSubscriptions() {
+        return !channels.isEmpty();
+    }
+
     public Set<K> getChannels() {
-        return channels;
+        return unwrap(this.channels);
+    }
+
+    public boolean hasPatternSubscriptions() {
+        return !patterns.isEmpty();
     }
 
     public Set<K> getPatterns() {
-        return patterns;
+        return unwrap(this.patterns);
     }
 
     @Override
@@ -151,7 +156,7 @@ private static void validateCommandAllowed(RedisCommand<?, ?, ?> command) {
     }
 
     private boolean isSubscribed() {
-        return subscribeWritten && (!channels.isEmpty() || !patterns.isEmpty());
+        return subscribeWritten && (hasChannelSubscriptions() || hasPatternSubscriptions());
     }
 
     public void notifyMessage(PubSubOutput<K, V, V> output) {
@@ -197,19 +202,78 @@ private void updateInternalState(PubSubOutput<K, V, V> output) {
         // update internal state
         switch (output.type()) {
             case psubscribe:
-                patterns.add(output.pattern());
+                patterns.add(new Wrapper<>(output.pattern()));
                 break;
             case punsubscribe:
-                patterns.remove(output.pattern());
+                patterns.remove(new Wrapper<>(output.pattern()));
                 break;
             case subscribe:
-                channels.add(output.channel());
+                channels.add(new Wrapper<>(output.channel()));
                 break;
             case unsubscribe:
-                channels.remove(output.channel());
+                channels.remove(new Wrapper<>(output.channel()));
                 break;
             default:
                 break;
         }
     }
+
+    private Set<K> unwrap(Set<Wrapper<K>> wrapped) {
+
+        Set<K> result = new LinkedHashSet<>(wrapped.size());
+
+        for (Wrapper<K> channel : wrapped) {
+            result.add(channel.name);
+        }
+
+        return result;
+    }
+
+    /**
+     * Comparison/equality wrapper with specific {@code byte[]} equals and hashCode implementations.
+     * 
+     * @param <K>
+     */
+    static class Wrapper<K> {
+
+        protected final K name;
+
+        public Wrapper(K name) {
+            this.name = name;
+        }
+
+        @Override
+        public int hashCode() {
+
+            if (name instanceof byte[]) {
+                return Arrays.hashCode((byte[]) name);
+            }
+            return name.hashCode();
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+
+            if (!(obj instanceof Wrapper)) {
+                return false;
+            }
+
+            Wrapper<K> that = (Wrapper<K>) obj;
+
+            if (name instanceof byte[] && that.name instanceof byte[]) {
+                return Arrays.equals((byte[]) name, (byte[]) that.name);
+            }
+
+            return name.equals(that.name);
+        }
+
+        @Override
+        public String toString() {
+            final StringBuffer sb = new StringBuffer();
+            sb.append(getClass().getSimpleName());
+            sb.append(" [name=").append(name);
+            sb.append(']');
+            return sb.toString();
+        }
+    }
 }
diff --git a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
index fd9d0d1b12..31eeecdfbf 100644
--- a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
@@ -120,11 +120,11 @@ protected List<RedisFuture<Void>> resubscribe() {
 
         List<RedisFuture<Void>> result = new ArrayList<>();
 
-        if (!endpoint.getChannels().isEmpty()) {
+        if (endpoint.hasChannelSubscriptions()) {
             result.add(async().subscribe(toArray(endpoint.getChannels())));
         }
 
-        if (!endpoint.getPatterns().isEmpty()) {
+        if (endpoint.hasPatternSubscriptions()) {
             result.add(async().psubscribe(toArray(endpoint.getPatterns())));
         }
 
diff --git a/src/test/java/io/lettuce/core/ByteBufferCodec.java b/src/test/java/io/lettuce/core/ByteBufferCodec.java
new file mode 100644
index 0000000000..89f704a992
--- /dev/null
+++ b/src/test/java/io/lettuce/core/ByteBufferCodec.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import java.nio.ByteBuffer;
+
+import io.lettuce.core.codec.RedisCodec;
+
+/**
+ * @author Mark Paluch
+ */
+public class ByteBufferCodec implements RedisCodec<ByteBuffer, ByteBuffer> {
+
+    @Override
+    public ByteBuffer decodeKey(ByteBuffer bytes) {
+
+        ByteBuffer decoupled = ByteBuffer.allocate(bytes.remaining());
+        decoupled.put(bytes);
+        return (ByteBuffer) decoupled.flip();
+    }
+
+    @Override
+    public ByteBuffer decodeValue(ByteBuffer bytes) {
+
+        ByteBuffer decoupled = ByteBuffer.allocate(bytes.remaining());
+        decoupled.put(bytes);
+        return (ByteBuffer) decoupled.flip();
+    }
+
+    @Override
+    public ByteBuffer encodeKey(ByteBuffer key) {
+        return key.asReadOnlyBuffer();
+    }
+
+    @Override
+    public ByteBuffer encodeValue(ByteBuffer value) {
+        return value.asReadOnlyBuffer();
+    }
+}
diff --git a/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java b/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
index 8a620b39cc..41cc9660f1 100644
--- a/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
@@ -170,32 +170,4 @@ public ByteBuffer encodeValue(Object value) {
         }
     }
 
-    class ByteBufferCodec implements RedisCodec<ByteBuffer, ByteBuffer> {
-
-        @Override
-        public ByteBuffer decodeKey(ByteBuffer bytes) {
-
-            ByteBuffer decoupled = ByteBuffer.allocate(bytes.remaining());
-            decoupled.put(bytes);
-            return (ByteBuffer) decoupled.flip();
-        }
-
-        @Override
-        public ByteBuffer decodeValue(ByteBuffer bytes) {
-
-            ByteBuffer decoupled = ByteBuffer.allocate(bytes.remaining());
-            decoupled.put(bytes);
-            return (ByteBuffer) decoupled.flip();
-        }
-
-        @Override
-        public ByteBuffer encodeKey(ByteBuffer key) {
-            return key.asReadOnlyBuffer();
-        }
-
-        @Override
-        public ByteBuffer encodeValue(ByteBuffer value) {
-            return value.asReadOnlyBuffer();
-        }
-    }
 }
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java b/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java
new file mode 100644
index 0000000000..2580dc4c9e
--- /dev/null
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.pubsub;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.nio.ByteBuffer;
+
+import org.junit.jupiter.api.Test;
+
+import io.lettuce.core.ByteBufferCodec;
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.codec.ByteArrayCodec;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.test.resource.TestClientResources;
+
+/**
+ * Unit tests for {@link PubSubEndpoint}.
+ * 
+ * @author Mark Paluch
+ */
+class PubSubEndpointUnitTests {
+
+    @Test
+    void shouldRetainUniqueChannelNames() {
+
+        PubSubEndpoint<String, String> sut = new PubSubEndpoint<>(ClientOptions.create(), TestClientResources.get());
+
+        sut.notifyMessage(createMessage("subscribe", "channel1", StringCodec.UTF8));
+        sut.notifyMessage(createMessage("subscribe", "channel1", StringCodec.UTF8));
+        sut.notifyMessage(createMessage("subscribe", "channel1", StringCodec.UTF8));
+        sut.notifyMessage(createMessage("subscribe", "channel2", StringCodec.UTF8));
+
+        assertThat(sut.getChannels()).hasSize(2).containsOnly("channel1", "channel2");
+    }
+
+    @Test
+    void shouldRetainUniqueBinaryChannelNames() {
+
+        PubSubEndpoint<byte[], byte[]> sut = new PubSubEndpoint<>(ClientOptions.create(), TestClientResources.get());
+
+        sut.notifyMessage(createMessage("subscribe", "channel1", ByteArrayCodec.INSTANCE));
+        sut.notifyMessage(createMessage("subscribe", "channel1", ByteArrayCodec.INSTANCE));
+        sut.notifyMessage(createMessage("subscribe", "channel1", ByteArrayCodec.INSTANCE));
+        sut.notifyMessage(createMessage("subscribe", "channel2", ByteArrayCodec.INSTANCE));
+
+        assertThat(sut.getChannels()).hasSize(2);
+    }
+
+    @Test
+    void shouldRetainUniqueByteBufferChannelNames() {
+
+        PubSubEndpoint<ByteBuffer, ByteBuffer> sut = new PubSubEndpoint<>(ClientOptions.create(), TestClientResources.get());
+
+        sut.notifyMessage(createMessage("subscribe", "channel1", new ByteBufferCodec()));
+        sut.notifyMessage(createMessage("subscribe", "channel1", new ByteBufferCodec()));
+        sut.notifyMessage(createMessage("subscribe", "channel1", new ByteBufferCodec()));
+        sut.notifyMessage(createMessage("subscribe", "channel2", new ByteBufferCodec()));
+
+        assertThat(sut.getChannels()).hasSize(2).containsOnly(ByteBuffer.wrap("channel1".getBytes()),
+                ByteBuffer.wrap("channel2".getBytes()));
+    }
+
+    @Test
+    void addsAndRemovesChannels() {
+
+        PubSubEndpoint<byte[], byte[]> sut = new PubSubEndpoint<>(ClientOptions.create(), TestClientResources.get());
+
+        sut.notifyMessage(createMessage("subscribe", "channel1", ByteArrayCodec.INSTANCE));
+        sut.notifyMessage(createMessage("unsubscribe", "channel1", ByteArrayCodec.INSTANCE));
+
+        assertThat(sut.getChannels()).isEmpty();
+    }
+
+    private static <K, V> PubSubOutput<K, V, V> createMessage(String action, String channel, RedisCodec<K, V> codec) {
+
+        PubSubOutput<K, V, V> output = new PubSubOutput<>(codec);
+
+        output.set(ByteBuffer.wrap(action.getBytes()));
+        output.set(ByteBuffer.wrap(channel.getBytes()));
+
+        return output;
+    }
+}

From 5586dccf752be28c71baa89a399d3f358ea1298a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 7 Nov 2018 15:35:00 +0100
Subject: [PATCH 557/808] Document how to include snapshot versions in Maven

---
 README.md | 58 ++++++++++++++-----------------------------------------
 1 file changed, 14 insertions(+), 44 deletions(-)

diff --git a/README.md b/README.md
index 19d49c15e4..699b265207 100644
--- a/README.md
+++ b/README.md
@@ -59,56 +59,26 @@ Example for Maven:
 </dependency>
 ```
 
-Shaded JAR-File (packaged dependencies  and relocated to the `io.lettuce.core` package to prevent version conflicts)
+If you'd rather like the latest snapshots of the upcoming major version, use our Maven snapshot repository and declare the appropriate dependency version.
 
 ```xml
 <dependency>
   <groupId>io.lettuce</groupId>
   <artifactId>lettuce-core</artifactId>
-  <version>x.y.z</version>
-  <classifier>shaded</classifier>
-  <exclusions>
-    <exclusion>
-      <groupId>io.projectreactor</groupId>
-      <artifactId>reactor-core</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>org.latencyutils</groupId>
-      <artifactId>LatencyUtils</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-handler</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport-native-epoll</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport-native-kqueue</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-pool2</artifactId>
-    </exclusion>
-  </exclusions>
+  <version>x.y.z.BUILD-SNAPSHOT</version>
 </dependency>
-```    
 
-or snapshots at https://oss.sonatype.org/content/repositories/snapshots/
+<repositories>
+  <repository>
+    <id>sonatype-snapshots</id>
+    <name>Sonatype Snapshot Repository</name>
+    <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+    <snapshots>
+      <enabled>true</enabled>
+    </snapshots>
+  </repository>
+</repositories>
+```
 
 Basic Usage
 -----------
@@ -198,7 +168,7 @@ For bugs, questions and discussions please use the [GitHub Issues](https://githu
 License
 -------
 
-* [Apache License 2.0] (http://www.apache.org/licenses/LICENSE-2.0)
+* [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0)
 * Fork of https://github.com/wg/lettuce
 
 Contributing

From d0398cc8036da626d1227184c8cd1e46075eeccf Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 7 Nov 2018 15:36:20 +0100
Subject: [PATCH 558/808] Polishing

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 699b265207..ddc180511c 100644
--- a/README.md
+++ b/README.md
@@ -143,7 +143,7 @@ Building
 -----------
 
 Lettuce is built with Apache Maven. The tests require multiple running Redis instances for different test cases which
-are configured using a ```Makefile```. All tests run against Redis branch 3.0
+are configured using a ```Makefile```. Tests run by default against Redis `unstable`.
 
 To build:
 

From ce632ff44520b3a1b5a7b555c185dd46a991a7c6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 12 Nov 2018 16:29:38 +0100
Subject: [PATCH 559/808] Add shutdown logging to client, ClientResources, and
 EventLoopGroupProvider #918

---
 .../java/io/lettuce/core/AbstractRedisClient.java |  2 ++
 .../core/resource/DefaultClientResources.java     |  2 ++
 .../resource/DefaultEventLoopGroupProvider.java   | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index e871c291e9..c1ca9af793 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -433,6 +433,8 @@ public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, Tim
 
         if (shutdown.compareAndSet(false, true)) {
 
+            logger.debug("Initiate shutdown ({}, {}, {})", quietPeriod, timeout, timeUnit);
+
             List<CompletableFuture<Void>> closeFutures = new ArrayList<>();
 
             while (!closeableResources.isEmpty()) {
diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index f7f487d086..0528188455 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -573,6 +573,8 @@ public Future<Boolean> shutdown() {
     @SuppressWarnings("unchecked")
     public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
 
+        logger.debug("Initiate shutdown ({}, {}, {})", quietPeriod, timeout, timeUnit);
+
         shutdownCalled = true;
         DefaultPromise<Boolean> overall = new DefaultPromise<Boolean>(GlobalEventExecutor.INSTANCE);
         DefaultPromise<Boolean> lastRelease = new DefaultPromise<Boolean>(GlobalEventExecutor.INSTANCE);
diff --git a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
index 12f3d416a8..898781d81d 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
@@ -59,7 +59,9 @@ public DefaultEventLoopGroupProvider(int numberOfThreads) {
 
     @Override
     public <T extends EventLoopGroup> T allocate(Class<T> type) {
+
         synchronized (this) {
+            logger.debug("Allocating executor {}", type.getName());
             return addReference(getOrCreate(type));
         }
     }
@@ -133,6 +135,8 @@ private <T extends EventLoopGroup> T getOrCreate(Class<T> type) {
      */
     public static <T extends EventExecutorGroup> EventExecutorGroup createEventLoopGroup(Class<T> type, int numberOfThreads) {
 
+        logger.debug("Creating executor {}", type.getName());
+
         if (DefaultEventExecutorGroup.class.equals(type)) {
             return new DefaultEventExecutorGroup(numberOfThreads, new DefaultThreadFactory("lettuce-eventExecutorLoop", true));
         }
@@ -155,6 +159,8 @@ public static <T extends EventExecutorGroup> EventExecutorGroup createEventLoopG
     @Override
     public Promise<Boolean> release(EventExecutorGroup eventLoopGroup, long quietPeriod, long timeout, TimeUnit unit) {
 
+        logger.debug("Release executor {}", eventLoopGroup);
+
         Class<?> key = getKey(release(eventLoopGroup));
 
         if ((key == null && eventLoopGroup.isShuttingDown()) || refCounter.containsKey(eventLoopGroup)) {
@@ -192,13 +198,16 @@ public int threadPoolSize() {
     @Override
     @SuppressWarnings("unchecked")
     public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
+
+        logger.debug("Initiate shutdown ({}, {}, {})", quietPeriod, timeout, timeUnit);
+
         shutdownCalled = true;
 
         Map<Class<? extends EventExecutorGroup>, EventExecutorGroup> copy = new HashMap<>(eventLoopGroups);
 
-        DefaultPromise<Boolean> overall = new DefaultPromise<Boolean>(GlobalEventExecutor.INSTANCE);
-        DefaultPromise<Boolean> lastRelease = new DefaultPromise<Boolean>(GlobalEventExecutor.INSTANCE);
-        Futures.PromiseAggregator<Boolean, Promise<Boolean>> aggregator = new Futures.PromiseAggregator<Boolean, Promise<Boolean>>(overall);
+        DefaultPromise<Boolean> overall = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
+        DefaultPromise<Boolean> lastRelease = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
+        Futures.PromiseAggregator<Boolean, Promise<Boolean>> aggregator = new Futures.PromiseAggregator<>(overall);
 
         aggregator.expectMore(1 + copy.size());
 

From 600a92343c3772067541f7d31ecbf9d9adcbd556 Mon Sep 17 00:00:00 2001
From: Daniel Albuquerque <dmartinsalbuqu@hotels.com>
Date: Thu, 15 Nov 2018 15:53:35 +0000
Subject: [PATCH 560/808] Add flag to disable reporting of span tags #920

---
 .../lettuce/core/protocol/CommandHandler.java |  4 ++-
 .../io/lettuce/core/tracing/BraveTracing.java | 21 +++++++++++
 .../io/lettuce/core/tracing/NoOpTracing.java  |  5 +++
 .../java/io/lettuce/core/tracing/Tracing.java |  5 +++
 .../tracing/BraveTracingIntegrationTests.java | 36 +++++++++++++++++++
 5 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index b5999fa8fb..31f68d3443 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -78,6 +78,7 @@ public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCom
     private final boolean debugEnabled = logger.isDebugEnabled();
     private final boolean latencyMetricsEnabled;
     private final boolean tracingEnabled;
+    private final boolean includeCommandArgsInSpanTags;
     private final boolean boundedQueues;
     private final BackpressureSource backpressureSource = new BackpressureSource();
 
@@ -111,6 +112,7 @@ public CommandHandler(ClientOptions clientOptions, ClientResources clientResourc
         Tracing tracing = clientResources.tracing();
 
         this.tracingEnabled = tracing.isEnabled();
+        this.includeCommandArgsInSpanTags = tracing.includeCommandArgsInSpanTags();
     }
 
     public Queue<RedisCommand<?, ?, ?>> getStack() {
@@ -385,7 +387,7 @@ private void writeSingleCommand(ChannelHandlerContext ctx, RedisCommand<?, ?, ?>
             Tracer.Span span = tracer.nextSpan(context);
             span.name(command.getType().name());
 
-            if (command.getArgs() != null) {
+            if (includeCommandArgsInSpanTags && command.getArgs() != null) {
                 span.tag("redis.args", command.getArgs().toCommandString());
             }
 
diff --git a/src/main/java/io/lettuce/core/tracing/BraveTracing.java b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
index d479055c6e..266ec3971d 100644
--- a/src/main/java/io/lettuce/core/tracing/BraveTracing.java
+++ b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
@@ -55,6 +55,7 @@ public class BraveTracing implements Tracing {
 
     private final BraveTracer tracer;
     private final BraveTracingOptions tracingOptions;
+    private final boolean includeCommandArgsInSpanTags;
 
     /**
      * Create a new {@link BraveTracing} instance.
@@ -68,6 +69,7 @@ private BraveTracing(Builder builder) {
 
         this.tracingOptions = new BraveTracingOptions(builder.serviceName, builder.endpointCustomizer, builder.spanCustomizer);
         this.tracer = new BraveTracer(builder.tracing, this.tracingOptions);
+        this.includeCommandArgsInSpanTags = builder.includeCommandArgsInSpanTags;
     }
 
     /**
@@ -103,6 +105,7 @@ public static class Builder {
         };
         private Consumer<brave.Span> spanCustomizer = it -> {
         };
+        private boolean includeCommandArgsInSpanTags = true;
 
         private Builder() {
         }
@@ -135,6 +138,19 @@ public Builder serviceName(String serviceName) {
             return this;
         }
 
+        /**
+         * Controls the inclusion of command arguments in {@link Span} tags.
+         * This is enabled by default.
+         *
+         * @param includeCommandArgsInSpanTags the flag to enable or disable the inclusion of command args in {@link Span} tags.
+         * @return {@code this} {@link Builder}.
+         */
+        public Builder includeCommandArgsInSpanTags(boolean includeCommandArgsInSpanTags) {
+
+            this.includeCommandArgsInSpanTags = includeCommandArgsInSpanTags;
+            return this;
+        }
+
         /**
          * Sets an {@link zipkin2.Endpoint} customizer to customize the {@link zipkin2.Endpoint} through its
          * {@link zipkin2.Endpoint.Builder}. The customizer is invoked before {@link zipkin2.Endpoint.Builder#build() building}
@@ -182,6 +198,11 @@ public boolean isEnabled() {
         return true;
     }
 
+    @Override
+    public boolean includeCommandArgsInSpanTags() {
+        return includeCommandArgsInSpanTags;
+    }
+
     @Override
     public TracerProvider getTracerProvider() {
         return () -> tracer;
diff --git a/src/main/java/io/lettuce/core/tracing/NoOpTracing.java b/src/main/java/io/lettuce/core/tracing/NoOpTracing.java
index dc671b1bb2..b8bbc95d64 100644
--- a/src/main/java/io/lettuce/core/tracing/NoOpTracing.java
+++ b/src/main/java/io/lettuce/core/tracing/NoOpTracing.java
@@ -55,6 +55,11 @@ public boolean isEnabled() {
         return false;
     }
 
+    @Override
+    public boolean includeCommandArgsInSpanTags() {
+        return false;
+    }
+
     @Override
     public Endpoint createEndpoint(SocketAddress socketAddress) {
         return NOOP_ENDPOINT;
diff --git a/src/main/java/io/lettuce/core/tracing/Tracing.java b/src/main/java/io/lettuce/core/tracing/Tracing.java
index 5ba662ea99..93e1cd8042 100644
--- a/src/main/java/io/lettuce/core/tracing/Tracing.java
+++ b/src/main/java/io/lettuce/core/tracing/Tracing.java
@@ -49,6 +49,11 @@ public interface Tracing {
      */
     boolean isEnabled();
 
+    /**
+     * @return {@literal true} if tags for {@link Tracer.Span}s should include the command arguments.
+     */
+    boolean includeCommandArgsInSpanTags();
+
     /**
      * Create an {@link Endpoint} given {@link SocketAddress}.
      *
diff --git a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
index ed2fc7ae98..69594a441b 100644
--- a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
@@ -173,7 +173,43 @@ void reactiveGetAndSetWithTrace() {
         List<Span> spans = new ArrayList<>(BraveTracingIntegrationTests.spans);
 
         assertThat(spans.get(0).name()).isEqualTo("set");
+        assertThat(spans.get(0).tags()).containsEntry("redis.args", "key<foo> value<bar>");
         assertThat(spans.get(1).name()).isEqualTo("get");
+        assertThat(spans.get(1).tags()).containsEntry("redis.args", "key<foo>");
+        assertThat(spans.get(2).name()).isEqualTo("foo");
+    }
+
+    @Test
+    void reactiveGetAndSetWithTraceWithCommandArgsExcludedFromTags() {
+
+        DefaultClientResources clientResources = DefaultClientResources.builder()
+                .tracing(BraveTracing.builder()
+                        .tracing(clientTracing)
+                        .includeCommandArgsInSpanTags(false)
+                        .build()
+                )
+                .build();
+        RedisClient client = RedisClient.create(clientResources, RedisURI.Builder.redis(host, port).build());
+
+        ScopedSpan trace = clientTracing.tracer().startScopedSpan("foo");
+
+        StatefulRedisConnection<String, String> connect = client.connect();
+        connect.reactive().set("foo", "bar") //
+                .then(connect.reactive().get("foo")) //
+                .subscriberContext(it -> it.put(TraceContext.class, trace.context())) //
+                .as(StepVerifier::create) //
+                .expectNext("bar").verifyComplete();
+
+        Wait.untilEquals(2, spans::size).waitOrTimeout();
+
+        trace.finish();
+
+        List<Span> spans = new ArrayList<>(BraveTracingIntegrationTests.spans);
+
+        assertThat(spans.get(0).name()).isEqualTo("set");
+        assertThat(spans.get(0).tags()).doesNotContainKey("redis.args");
+        assertThat(spans.get(1).name()).isEqualTo("get");
+        assertThat(spans.get(1).tags()).doesNotContainKey("redis.args");
         assertThat(spans.get(2).name()).isEqualTo("foo");
     }
 

From 83ffcae40ca5ff3d224e67f96a485ceca90e5fad Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 19 Nov 2018 20:39:36 +0100
Subject: [PATCH 561/808] Polishing #920
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add author and since tags. Add excludeCommandArgsFromSpanTags(…) builder method to reflect default nature of args inclusion in tracing.
---
 .../lettuce/core/protocol/CommandHandler.java |  1 +
 .../io/lettuce/core/tracing/BraveTracing.java | 13 +++-
 .../io/lettuce/core/tracing/NoOpTracing.java  |  1 +
 .../java/io/lettuce/core/tracing/Tracing.java |  6 +-
 .../tracing/BraveTracingIntegrationTests.java | 67 +++++++++----------
 5 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 31f68d3443..68a78bc26f 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -52,6 +52,7 @@
  * @author Mark Paluch
  * @author Jongyeol Choi
  * @author Grzegorz Szpak
+ * @author Daniel Albuquerque
  */
 public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCommands {
 
diff --git a/src/main/java/io/lettuce/core/tracing/BraveTracing.java b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
index 266ec3971d..0b4f5d2546 100644
--- a/src/main/java/io/lettuce/core/tracing/BraveTracing.java
+++ b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
@@ -45,6 +45,7 @@
  * If one of the context objects above is found, it's used to determine the parent context for the command {@link Span}.
  *
  * @author Mark Paluch
+ * @author Daniel Albuquerque
  * @see brave.Tracer
  * @see brave.Tracing#currentTracer()
  * @see BraveTraceContextProvider
@@ -139,8 +140,16 @@ public Builder serviceName(String serviceName) {
         }
 
         /**
-         * Controls the inclusion of command arguments in {@link Span} tags.
-         * This is enabled by default.
+         * Excludes command arguments from {@link Span} tags. Enabled by default.
+         *
+         * @return {@code this} {@link Builder}.
+         */
+        public Builder excludeCommandArgsFromSpanTags() {
+            return includeCommandArgsInSpanTags(false);
+        }
+
+        /**
+         * Controls the inclusion of command arguments in {@link Span} tags. Enabled by default.
          *
          * @param includeCommandArgsInSpanTags the flag to enable or disable the inclusion of command args in {@link Span} tags.
          * @return {@code this} {@link Builder}.
diff --git a/src/main/java/io/lettuce/core/tracing/NoOpTracing.java b/src/main/java/io/lettuce/core/tracing/NoOpTracing.java
index b8bbc95d64..9c6c5b1945 100644
--- a/src/main/java/io/lettuce/core/tracing/NoOpTracing.java
+++ b/src/main/java/io/lettuce/core/tracing/NoOpTracing.java
@@ -21,6 +21,7 @@
  * No-Op {@link Tracing} support that does not trace at all.
  *
  * @author Mark Paluch
+ * @author Daniel Albuquerque
  * @since 5.1
  */
 enum NoOpTracing implements Tracing, TraceContextProvider, TracerProvider {
diff --git a/src/main/java/io/lettuce/core/tracing/Tracing.java b/src/main/java/io/lettuce/core/tracing/Tracing.java
index 93e1cd8042..94517a7fd7 100644
--- a/src/main/java/io/lettuce/core/tracing/Tracing.java
+++ b/src/main/java/io/lettuce/core/tracing/Tracing.java
@@ -26,6 +26,7 @@
  * value objects to represent traces, spans and metadata in an dependency-agnostic manner.
  *
  * @author Mark Paluch
+ * @author Daniel Albuquerque
  * @since 5.1
  * @see TracerProvider
  * @see TraceContextProvider
@@ -45,12 +46,15 @@ public interface Tracing {
     /**
      * Returns {@literal true} if tracing is enabled.
      *
-     * @return {@literal true} if tracing DefaultClientResourcesTestis enabled.
+     * @return {@literal true} if tracing is enabled.
      */
     boolean isEnabled();
 
     /**
+     * Returns {@literal true} if tags for {@link Tracer.Span}s should include the command arguments.
+     *
      * @return {@literal true} if tags for {@link Tracer.Span}s should include the command arguments.
+     * @since 5.2
      */
     boolean includeCommandArgsInSpanTags();
 
diff --git a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
index 69594a441b..95eb2496e5 100644
--- a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
@@ -42,9 +42,13 @@
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
 import io.lettuce.test.Wait;
+import io.lettuce.test.resource.FastShutdown;
 
 /**
+ * Integration tests for {@link BraveTracing}.
+ *
  * @author Mark Paluch
+ * @author Daniel Albuquerque
  */
 class BraveTracingIntegrationTests extends TestSupport {
 
@@ -123,6 +127,35 @@ void pingWithTraceShouldCatchErrors() {
         assertThat(spans.get(2).name()).isEqualTo("foo");
     }
 
+    @Test
+    void getAndSetWithTraceWithCommandArgsExcludedFromTags() {
+
+        ClientResources clientResources = ClientResources.builder()
+                .tracing(BraveTracing.builder().tracing(clientTracing).excludeCommandArgsFromSpanTags().build()).build();
+        RedisClient client = RedisClient.create(clientResources, RedisURI.Builder.redis(host, port).build());
+
+        ScopedSpan trace = clientTracing.tracer().startScopedSpan("foo");
+
+        StatefulRedisConnection<String, String> connect = client.connect();
+        connect.sync().set("foo", "bar");
+        connect.sync().get("foo");
+
+        Wait.untilEquals(2, spans::size).waitOrTimeout();
+
+        trace.finish();
+
+        List<Span> spans = new ArrayList<>(BraveTracingIntegrationTests.spans);
+
+        assertThat(spans.get(0).name()).isEqualTo("set");
+        assertThat(spans.get(0).tags()).doesNotContainKey("redis.args");
+        assertThat(spans.get(1).name()).isEqualTo("get");
+        assertThat(spans.get(1).tags()).doesNotContainKey("redis.args");
+        assertThat(spans.get(2).name()).isEqualTo("foo");
+
+        FastShutdown.shutdown(client);
+        FastShutdown.shutdown(clientResources);
+    }
+
     @Test
     void reactivePing() {
 
@@ -179,40 +212,6 @@ void reactiveGetAndSetWithTrace() {
         assertThat(spans.get(2).name()).isEqualTo("foo");
     }
 
-    @Test
-    void reactiveGetAndSetWithTraceWithCommandArgsExcludedFromTags() {
-
-        DefaultClientResources clientResources = DefaultClientResources.builder()
-                .tracing(BraveTracing.builder()
-                        .tracing(clientTracing)
-                        .includeCommandArgsInSpanTags(false)
-                        .build()
-                )
-                .build();
-        RedisClient client = RedisClient.create(clientResources, RedisURI.Builder.redis(host, port).build());
-
-        ScopedSpan trace = clientTracing.tracer().startScopedSpan("foo");
-
-        StatefulRedisConnection<String, String> connect = client.connect();
-        connect.reactive().set("foo", "bar") //
-                .then(connect.reactive().get("foo")) //
-                .subscriberContext(it -> it.put(TraceContext.class, trace.context())) //
-                .as(StepVerifier::create) //
-                .expectNext("bar").verifyComplete();
-
-        Wait.untilEquals(2, spans::size).waitOrTimeout();
-
-        trace.finish();
-
-        List<Span> spans = new ArrayList<>(BraveTracingIntegrationTests.spans);
-
-        assertThat(spans.get(0).name()).isEqualTo("set");
-        assertThat(spans.get(0).tags()).doesNotContainKey("redis.args");
-        assertThat(spans.get(1).name()).isEqualTo("get");
-        assertThat(spans.get(1).tags()).doesNotContainKey("redis.args");
-        assertThat(spans.get(2).name()).isEqualTo("foo");
-    }
-
     @Test
     void reactiveGetAndSetWithTraceProvider() {
 

From 7f0c98aa5e90a79228e0603927a61da5cac49411 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 19 Nov 2018 21:10:24 +0100
Subject: [PATCH 562/808] =?UTF-8?q?Add=20support=20for=20XGROUP=20CREATE?=
 =?UTF-8?q?=20=E2=80=A6=20MKSTREAM=20#898?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/AbstractRedisAsyncCommands.java      |  7 +-
 .../core/AbstractRedisReactiveCommands.java   |  7 +-
 .../io/lettuce/core/RedisCommandBuilder.java  |  6 +-
 .../io/lettuce/core/XGroupCreateArgs.java     | 84 +++++++++++++++++++
 .../api/async/RedisStreamAsyncCommands.java   | 11 +++
 .../reactive/RedisStreamReactiveCommands.java | 11 +++
 .../core/api/sync/RedisStreamCommands.java    | 11 +++
 .../NodeSelectionStreamAsyncCommands.java     | 11 +++
 .../api/sync/NodeSelectionStreamCommands.java | 11 +++
 .../lettuce/core/api/RedisStreamCommands.java | 11 +++
 .../StreamCommandIntegrationTests.java        | 26 ++----
 11 files changed, 176 insertions(+), 20 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/XGroupCreateArgs.java

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 9604b0bba7..d4abfc6b02 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1521,7 +1521,12 @@ public RedisFuture<Long> xdel(K key, String... messageIds) {
 
     @Override
     public RedisFuture<String> xgroupCreate(XReadArgs.StreamOffset<K> offset, K group) {
-        return dispatch(commandBuilder.xgroupCreate(offset, group));
+        return dispatch(commandBuilder.xgroupCreate(offset, group, null));
+    }
+
+    @Override
+    public RedisFuture<String> xgroupCreate(XReadArgs.StreamOffset<K> offset, K group, XGroupCreateArgs args) {
+        return dispatch(commandBuilder.xgroupCreate(offset, group, args));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index bd918bd0b8..5adc70d4f5 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -1573,7 +1573,12 @@ public Mono<Long> xdel(K key, String... messageIds) {
 
     @Override
     public Mono<String> xgroupCreate(XReadArgs.StreamOffset<K> streamOffset, K group) {
-        return createMono(() -> commandBuilder.xgroupCreate(streamOffset, group));
+        return createMono(() -> commandBuilder.xgroupCreate(streamOffset, group, null));
+    }
+
+    @Override
+    public Mono<String> xgroupCreate(XReadArgs.StreamOffset<K> streamOffset, K group, XGroupCreateArgs args) {
+        return createMono(() -> commandBuilder.xgroupCreate(streamOffset, group, args));
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index ef73bb1c1d..8b250ea8ae 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -2140,13 +2140,17 @@ public Command<K, V, Long> xdel(K key, String[] messageIds) {
         return createCommand(XDEL, new IntegerOutput<>(codec), args);
     }
 
-    public Command<K, V, String> xgroupCreate(StreamOffset<K> offset, K group) {
+    public Command<K, V, String> xgroupCreate(StreamOffset<K> offset, K group, XGroupCreateArgs commandArgs) {
         LettuceAssert.notNull(offset, "StreamOffset " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(group, "Group " + MUST_NOT_BE_NULL);
 
         CommandArgs<K, V> args = new CommandArgs<>(codec).add(CREATE).addKey(offset.getName()).addKey(group)
                 .add(offset.getOffset());
 
+        if (commandArgs != null) {
+            commandArgs.build(args);
+        }
+
         return createCommand(XGROUP, new StatusOutput<>(codec), args);
     }
 
diff --git a/src/main/java/io/lettuce/core/XGroupCreateArgs.java b/src/main/java/io/lettuce/core/XGroupCreateArgs.java
new file mode 100644
index 0000000000..0f0b021825
--- /dev/null
+++ b/src/main/java/io/lettuce/core/XGroupCreateArgs.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import io.lettuce.core.protocol.CommandArgs;
+
+/**
+ * Argument list builder for the Redis <a href="http://redis.io/commands/xgroup">XGROUP</a> CREATE command. Static import the
+ * methods from {@link Builder} and call the methods: {@code mkstream(…)} .
+ * <p/>
+ * {@link XGroupCreateArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
+ *
+ * @author Mark Paluch
+ * @since 5.2
+ */
+public class XGroupCreateArgs {
+
+    private boolean mkstream;
+
+    /**
+     * Builder entry points for {@link XGroupCreateArgs}.
+     */
+    public static class Builder {
+
+        /**
+         * Utility constructor.
+         */
+        private Builder() {
+        }
+
+        /**
+         * Creates new {@link XGroupCreateArgs} and setting {@literal MKSTREAM}.
+         *
+         * @return new {@link XGroupCreateArgs} with {@literal MKSTREAM} set.
+         * @see XGroupCreateArgs#mkstream(boolean)
+         */
+        public static XGroupCreateArgs mkstream() {
+            return mkstream(true);
+        }
+
+        /**
+         * Creates new {@link XGroupCreateArgs} and setting {@literal MKSTREAM}.
+         *
+         * @param mkstream whether to apply {@literal MKSTREAM}.
+         * @return new {@link XGroupCreateArgs} with {@literal MKSTREAM} set.
+         * @see XGroupCreateArgs#mkstream(boolean)
+         */
+        public static XGroupCreateArgs mkstream(boolean mkstream) {
+            return new XGroupCreateArgs().mkstream(mkstream);
+        }
+    }
+
+    /**
+     * Make a stream if it does not exists.
+     *
+     * @param mkstream whether to apply {@literal MKSTREAM}
+     * @return {@code this}
+     */
+    public XGroupCreateArgs mkstream(boolean mkstream) {
+
+        this.mkstream = mkstream;
+        return this;
+    }
+
+    public <K, V> void build(CommandArgs<K, V> args) {
+
+        if (mkstream) {
+            args.add("MKSTREAM");
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
index b9df1b2493..1540a127d7 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
@@ -121,6 +121,17 @@ public interface RedisStreamAsyncCommands<K, V> {
      */
     RedisFuture<String> xgroupCreate(StreamOffset<K> streamOffset, K group);
 
+    /**
+     * Create a consumer group.
+     *
+     * @param streamOffset name of the stream containing the offset to set.
+     * @param group name of the consumer group.
+     * @param args
+     * @return simple-reply {@literal true} if successful.
+     * @since 5.2
+     */
+    RedisFuture<String> xgroupCreate(StreamOffset<K> streamOffset, K group, XGroupCreateArgs args);
+
     /**
      * Delete a consumer from a consumer group.
      *
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
index c3da1431a9..c774ff5463 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
@@ -122,6 +122,17 @@ public interface RedisStreamReactiveCommands<K, V> {
      */
     Mono<String> xgroupCreate(StreamOffset<K> streamOffset, K group);
 
+    /**
+     * Create a consumer group.
+     *
+     * @param streamOffset name of the stream containing the offset to set.
+     * @param group name of the consumer group.
+     * @param args
+     * @return simple-reply {@literal true} if successful.
+     * @since 5.2
+     */
+    Mono<String> xgroupCreate(StreamOffset<K> streamOffset, K group, XGroupCreateArgs args);
+
     /**
      * Delete a consumer from a consumer group.
      *
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
index d215bacac8..b67cf3855d 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
@@ -121,6 +121,17 @@ public interface RedisStreamCommands<K, V> {
      */
     String xgroupCreate(StreamOffset<K> streamOffset, K group);
 
+    /**
+     * Create a consumer group.
+     *
+     * @param streamOffset name of the stream containing the offset to set.
+     * @param group name of the consumer group.
+     * @param args
+     * @return simple-reply {@literal true} if successful.
+     * @since 5.2
+     */
+    String xgroupCreate(StreamOffset<K> streamOffset, K group, XGroupCreateArgs args);
+
     /**
      * Delete a consumer from a consumer group.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
index e03de55fb7..4cbe0e2c2b 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
@@ -121,6 +121,17 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      */
     AsyncExecutions<String> xgroupCreate(StreamOffset<K> streamOffset, K group);
 
+    /**
+     * Create a consumer group.
+     *
+     * @param streamOffset name of the stream containing the offset to set.
+     * @param group name of the consumer group.
+     * @param args
+     * @return simple-reply {@literal true} if successful.
+     * @since 5.2
+     */
+    AsyncExecutions<String> xgroupCreate(StreamOffset<K> streamOffset, K group, XGroupCreateArgs args);
+
     /**
      * Delete a consumer from a consumer group.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
index 9316a6be0a..cdca1cba4b 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
@@ -121,6 +121,17 @@ public interface NodeSelectionStreamCommands<K, V> {
      */
     Executions<String> xgroupCreate(StreamOffset<K> streamOffset, K group);
 
+    /**
+     * Create a consumer group.
+     *
+     * @param streamOffset name of the stream containing the offset to set.
+     * @param group name of the consumer group.
+     * @param args
+     * @return simple-reply {@literal true} if successful.
+     * @since 5.2
+     */
+    Executions<String> xgroupCreate(StreamOffset<K> streamOffset, K group, XGroupCreateArgs args);
+
     /**
      * Delete a consumer from a consumer group.
      *
diff --git a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
index cd3eafe1f6..09a482b748 100644
--- a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
@@ -120,6 +120,17 @@ public interface RedisStreamCommands<K, V> {
      */
     String xgroupCreate(StreamOffset<K> streamOffset, K group);
 
+    /**
+     * Create a consumer group.
+     *
+     * @param streamOffset name of the stream containing the offset to set.
+     * @param group name of the consumer group.
+     * @param args
+     * @return simple-reply {@literal true} if successful.
+     * @since 5.2
+     */
+    String xgroupCreate(StreamOffset<K> streamOffset, K group, XGroupCreateArgs args);
+
     /**
      * Delete a consumer from a consumer group.
      *
diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
index 689970cef1..48fc966dcf 100644
--- a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
@@ -237,14 +237,13 @@ void xreadTransactional() {
     @Test
     void xgroupCreate() {
 
-        redis.xadd(key, Collections.singletonMap("key", "value"));
-
-        assertThat(redis.xgroupCreate(StreamOffset.latest(key), "group")).isEqualTo("OK");
+        assertThat(redis.xgroupCreate(StreamOffset.latest(key), "group", XGroupCreateArgs.Builder.mkstream())).isEqualTo("OK");
 
         List<Object> groups = redis.dispatch(XINFO, new NestedMultiOutput<>(StringCodec.UTF8), new CommandArgs<>(
                 StringCodec.UTF8).add("GROUPS").add(key));
 
         assertThat(groups).isNotEmpty();
+        assertThat(redis.type(key)).isEqualTo("stream");
     }
 
     @Test
@@ -263,8 +262,7 @@ void xgroupread() {
     @Test
     void xpendingWithGroup() {
 
-        redis.xadd(key, Collections.singletonMap("key", "value"));
-        redis.xgroupCreate(StreamOffset.latest(key), "group");
+        redis.xgroupCreate(StreamOffset.latest(key), "group", XGroupCreateArgs.Builder.mkstream());
         String id = redis.xadd(key, Collections.singletonMap("key", "value"));
 
         redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.lastConsumed(key));
@@ -276,8 +274,7 @@ void xpendingWithGroup() {
     @Test
     void xpending() {
 
-        redis.xadd(key, Collections.singletonMap("key", "value"));
-        redis.xgroupCreate(StreamOffset.latest(key), "group");
+        redis.xgroupCreate(StreamOffset.latest(key), "group", XGroupCreateArgs.Builder.mkstream());
         String id = redis.xadd(key, Collections.singletonMap("key", "value"));
 
         redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.lastConsumed(key));
@@ -296,8 +293,7 @@ void xpending() {
     @Test
     void xack() {
 
-        redis.xadd(key, Collections.singletonMap("key", "value"));
-        redis.xgroupCreate(StreamOffset.latest(key), "group");
+        redis.xgroupCreate(StreamOffset.latest(key), "group", XGroupCreateArgs.Builder.mkstream());
         redis.xadd(key, Collections.singletonMap("key", "value"));
 
         List<StreamMessage<String, String>> messages = redis.xreadgroup(Consumer.from("group", "consumer1"),
@@ -313,8 +309,7 @@ void xack() {
     @Test
     void xclaim() {
 
-        redis.xadd(key, Collections.singletonMap("key", "value"));
-        redis.xgroupCreate(StreamOffset.latest(key), "group");
+        redis.xgroupCreate(StreamOffset.latest(key), "group", XGroupCreateArgs.Builder.mkstream());
         redis.xadd(key, Collections.singletonMap("key", "value"));
 
         List<StreamMessage<String, String>> messages = redis.xreadgroup(Consumer.from("group", "consumer1"),
@@ -355,8 +350,7 @@ void xclaimWithArgs() {
     @Test
     void xgroupDestroy() {
 
-        redis.xadd(key, Collections.singletonMap("key", "value"));
-        redis.xgroupCreate(StreamOffset.latest(key), "group");
+        redis.xgroupCreate(StreamOffset.latest(key), "group", XGroupCreateArgs.Builder.mkstream());
 
         assertThat(redis.xgroupDestroy(key, "group")).isTrue();
         assertThat(redis.xgroupDestroy(key, "group")).isFalse();
@@ -365,8 +359,7 @@ void xgroupDestroy() {
     @Test
     void xgroupDelconsumer() {
 
-        redis.xadd(key, Collections.singletonMap("key", "value"));
-        redis.xgroupCreate(StreamOffset.latest(key), "group");
+        redis.xgroupCreate(StreamOffset.latest(key), "group", XGroupCreateArgs.Builder.mkstream());
         redis.xadd(key, Collections.singletonMap("key", "value"));
         redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.lastConsumed(key));
 
@@ -377,8 +370,7 @@ void xgroupDelconsumer() {
     @Test
     void xgroupSetid() {
 
-        redis.xadd(key, Collections.singletonMap("key", "value"));
-        redis.xgroupCreate(StreamOffset.latest(key), "group");
+        redis.xgroupCreate(StreamOffset.latest(key), "group", XGroupCreateArgs.Builder.mkstream());
 
         assertThat(redis.xgroupSetid(StreamOffset.latest(key), "group")).isEqualTo("OK");
     }

From 5f27184e566063746b3c40748ad178a5732cfd29 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 19 Nov 2018 21:11:02 +0100
Subject: [PATCH 563/808] Polishing #898

Fix visibility for API generator as JUnit 4 requires public types. *sigh*.
---
 src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java   | 6 +++---
 .../apigenerator/CreateAsyncNodeSelectionClusterApi.java    | 6 +++---
 .../java/io/lettuce/apigenerator/CreateReactiveApi.java     | 6 +++---
 src/test/java/io/lettuce/apigenerator/CreateSyncApi.java    | 6 +++---
 .../apigenerator/CreateSyncNodeSelectionClusterApi.java     | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
index 008d57c987..ec3ffbf9fd 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
@@ -38,7 +38,7 @@
  * @author Mark Paluch
  */
 @RunWith(Parameterized.class)
-class CreateAsyncApi {
+public class CreateAsyncApi {
 
     private Set<String> KEEP_METHOD_RESULT_TYPE = LettuceSets.unmodifiableSet("shutdown", "debugOom", "debugSegfault",
             "digest", "close", "isOpen", "BaseRedisCommands.reset", "getStatefulConnection", "setAutoFlushCommands",
@@ -47,7 +47,7 @@ class CreateAsyncApi {
     private CompilationUnitFactory factory;
 
     @Parameterized.Parameters(name = "Create {0}")
-    static List<Object[]> arguments() {
+    public static List<Object[]> arguments() {
         List<Object[]> result = new ArrayList<>();
 
         for (String templateName : Constants.TEMPLATE_NAMES) {
@@ -108,7 +108,7 @@ Supplier<List<String>> importSupplier() {
     }
 
     @Test
-    void createInterface() throws Exception {
+    public void createInterface() throws Exception {
         factory.createInterface();
     }
 }
diff --git a/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
index 1e2fd23efd..25097ffd4b 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
@@ -39,7 +39,7 @@
  * @author Mark Paluch
  */
 @RunWith(Parameterized.class)
-class CreateAsyncNodeSelectionClusterApi {
+public class CreateAsyncNodeSelectionClusterApi {
 
     private Set<String> FILTER_METHODS = LettuceSets.unmodifiableSet("shutdown", "debugOom", "debugSegfault", "digest", "close",
             "isOpen", "BaseRedisCommands.reset", "readOnly", "readWrite", "setAutoFlushCommands", "flushCommands");
@@ -47,7 +47,7 @@ class CreateAsyncNodeSelectionClusterApi {
     private CompilationUnitFactory factory;
 
     @Parameterized.Parameters(name = "Create {0}")
-    static List<Object[]> arguments() {
+    public static List<Object[]> arguments() {
         List<Object[]> result = new ArrayList<>();
 
         for (String templateName : Constants.TEMPLATE_NAMES) {
@@ -114,7 +114,7 @@ Supplier<List<String>> importSupplier() {
     }
 
     @Test
-    void createInterface() throws Exception {
+    public void createInterface() throws Exception {
         factory.createInterface();
     }
 }
diff --git a/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
index 42eaa65229..c937077b73 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
@@ -37,7 +37,7 @@
  * @author Mark Paluch
  */
 @RunWith(Parameterized.class)
-class CreateReactiveApi {
+public class CreateReactiveApi {
 
     private static Set<String> KEEP_METHOD_RESULT_TYPE = LettuceSets.unmodifiableSet("digest", "close", "isOpen",
             "BaseRedisCommands.reset", "getStatefulConnection", "setAutoFlushCommands", "flushCommands");
@@ -60,7 +60,7 @@ class CreateReactiveApi {
     private CompilationUnitFactory factory;
 
     @Parameterized.Parameters(name = "Create {0}")
-    static List<Object[]> arguments() {
+    public static List<Object[]> arguments() {
         List<Object[]> result = new ArrayList<>();
 
         for (String templateName : Constants.TEMPLATE_NAMES) {
@@ -175,7 +175,7 @@ Supplier<List<String>> importSupplier() {
     }
 
     @Test
-    void createInterface() throws Exception {
+    public void createInterface() throws Exception {
         factory.createInterface();
     }
 }
diff --git a/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
index 9a0f738780..a7c1430a59 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
@@ -39,14 +39,14 @@
  * @author Mark Paluch
  */
 @RunWith(Parameterized.class)
-class CreateSyncApi {
+public class CreateSyncApi {
 
     private Set<String> FILTER_METHODS = LettuceSets.unmodifiableSet("setAutoFlushCommands", "flushCommands");
 
     private CompilationUnitFactory factory;
 
     @Parameterized.Parameters(name = "Create {0}")
-    static List<Object[]> arguments() {
+    public static List<Object[]> arguments() {
         List<Object[]> result = new ArrayList<>();
 
         for (String templateName : Constants.TEMPLATE_NAMES) {
@@ -114,7 +114,7 @@ Supplier<List<String>> importSupplier() {
     }
 
     @Test
-    void createInterface() throws Exception {
+    public void createInterface() throws Exception {
         factory.createInterface();
     }
 }
diff --git a/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
index cfa31c6f08..3147fbe82e 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
@@ -40,7 +40,7 @@
  * @author Mark Paluch
  */
 @RunWith(Parameterized.class)
-class CreateSyncNodeSelectionClusterApi {
+public class CreateSyncNodeSelectionClusterApi {
 
     private Set<String> FILTER_METHODS = LettuceSets.unmodifiableSet("shutdown", "debugOom", "debugSegfault", "digest",
             "close", "isOpen", "BaseRedisCommands.reset", "readOnly", "readWrite", "dispatch", "setAutoFlushCommands", "flushCommands");
@@ -48,7 +48,7 @@ class CreateSyncNodeSelectionClusterApi {
     private CompilationUnitFactory factory;
 
     @Parameterized.Parameters(name = "Create {0}")
-    static List<Object[]> arguments() {
+    public static List<Object[]> arguments() {
         List<Object[]> result = new ArrayList<>();
 
         for (String templateName : Constants.TEMPLATE_NAMES) {
@@ -127,7 +127,7 @@ Supplier<List<String>> importSupplier() {
     }
 
     @Test
-    void createInterface() throws Exception {
+    public void createInterface() throws Exception {
         factory.createInterface();
     }
 }

From ed8f349def88aa42d47de257e4d3b8974ade4bed Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 23 Nov 2018 16:26:33 +0100
Subject: [PATCH 564/808] Consider named/indexed parameters in
 DefaultCommandMethodVerifier #925

Lettuce now considers declared parameters when bound by using annotations. Previously, DefaultCommandMethodVerifier counted method arguments and bind markers as individual parameters which doubled the number of command args so command validation failed.
---
 .../dynamic/DefaultCommandMethodVerifier.java | 22 ++++++++++++++++-
 .../core/dynamic/segment/CommandSegment.java  | 24 +++++++++++++++++++
 ...DefaultCommandMethodVerifierUnitTests.java | 22 ++++++++++++-----
 .../RedisCommandsSyncIntegrationTests.java    |  2 +-
 4 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java b/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java
index dbce90457c..f722793c43 100644
--- a/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java
+++ b/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java
@@ -22,6 +22,7 @@
 
 import io.lettuce.core.*;
 import io.lettuce.core.dynamic.parameter.Parameter;
+import io.lettuce.core.dynamic.segment.CommandSegment;
 import io.lettuce.core.dynamic.segment.CommandSegments;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceLists;
@@ -113,7 +114,15 @@ private int calculateAvailableParameterCount(CommandSegments commandSegments, Li
 
         int count = commandSegments.size();
 
-        for (Parameter bindableParameter : bindableParameters) {
+        for (int i = 0; i < bindableParameters.size(); i++) {
+
+            Parameter bindableParameter = bindableParameters.get(i);
+
+            boolean consumed = isConsumed(commandSegments, bindableParameter);
+
+            if (consumed) {
+                continue;
+            }
 
             if (bindableParameter.isAssignableTo(KeyValue.class) || bindableParameter.isAssignableTo(ScoredValue.class)) {
                 count++;
@@ -133,6 +142,17 @@ private int calculateAvailableParameterCount(CommandSegments commandSegments, Li
         return count;
     }
 
+    private boolean isConsumed(CommandSegments commandSegments, Parameter bindableParameter) {
+
+        for (CommandSegment commandSegment : commandSegments) {
+            if (commandSegment.canConsume(bindableParameter)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private CommandMethodSyntaxException syntaxException(String commandName, CommandMethod commandMethod) {
 
         CommandMatches commandMatches = CommandMatches.forCommand(commandName, commandDetails);
diff --git a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java
index a4ad85e9df..67b5a07bd0 100644
--- a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.dynamic.segment;
 
 import io.lettuce.core.dynamic.parameter.MethodParametersAccessor;
+import io.lettuce.core.dynamic.parameter.Parameter;
 import io.lettuce.core.internal.LettuceAssert;
 
 /**
@@ -59,7 +60,15 @@ public static CommandSegment indexedParameter(int index) {
     public abstract String asString();
 
     /**
+     * Check whether this segment can consume the {@link Parameter} by applying parameter substitution.
      *
+     * @param parameter
+     * @return
+     * @since 5.1.3
+     */
+    public abstract boolean canConsume(Parameter parameter);
+
+    /**
      * @param parametersAccessor
      * @return
      */
@@ -90,6 +99,11 @@ public String asString() {
             return content;
         }
 
+        @Override
+        public boolean canConsume(Parameter parameter) {
+            return false;
+        }
+
         @Override
         public ArgumentContribution contribute(MethodParametersAccessor parametersAccessor) {
             return new ArgumentContribution(-1, asString());
@@ -112,6 +126,11 @@ public String asString() {
             return name;
         }
 
+        @Override
+        public boolean canConsume(Parameter parameter) {
+            return parameter.getName() != null && parameter.getName().equals(name);
+        }
+
         @Override
         public ArgumentContribution contribute(MethodParametersAccessor parametersAccessor) {
 
@@ -135,6 +154,11 @@ public String asString() {
             return Integer.toString(index);
         }
 
+        @Override
+        public boolean canConsume(Parameter parameter) {
+            return parameter.getParameterIndex() == index;
+        }
+
         @Override
         public ArgumentContribution contribute(MethodParametersAccessor parametersAccessor) {
             return new ArgumentContribution(index, parametersAccessor.getBindableValue(index));
diff --git a/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java b/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java
index 28ae3a8023..9804ef676b 100644
--- a/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java
@@ -19,14 +19,16 @@
 import static org.assertj.core.api.Fail.fail;
 
 import java.lang.reflect.Method;
-import java.util.Collections;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.GeoCoordinates;
 import io.lettuce.core.KeyValue;
-import io.lettuce.core.dynamic.segment.CommandSegment;
+import io.lettuce.core.dynamic.annotation.Command;
+import io.lettuce.core.dynamic.annotation.Param;
+import io.lettuce.core.dynamic.segment.AnnotationCommandSegmentFactory;
+import io.lettuce.core.dynamic.segment.CommandSegmentFactory;
 import io.lettuce.core.dynamic.segment.CommandSegments;
 import io.lettuce.core.dynamic.support.ReflectionUtils;
 import io.lettuce.core.internal.LettuceLists;
@@ -45,10 +47,11 @@ void before() {
         CommandDetail mget = new CommandDetail("mget", -2, null, 0, 0, 0);
         CommandDetail randomkey = new CommandDetail("randomkey", 1, null, 0, 0, 0);
         CommandDetail rpop = new CommandDetail("rpop", 2, null, 0, 0, 0);
+        CommandDetail lpop = new CommandDetail("lpop", 2, null, 0, 0, 0);
         CommandDetail set = new CommandDetail("set", 3, null, 0, 0, 0);
         CommandDetail geoadd = new CommandDetail("geoadd", -4, null, 0, 0, 0);
 
-        sut = new DefaultCommandMethodVerifier(LettuceLists.newList(mget, randomkey, rpop, set, geoadd));
+        sut = new DefaultCommandMethodVerifier(LettuceLists.newList(mget, randomkey, rpop, lpop, set, geoadd));
     }
 
     @Test
@@ -58,7 +61,7 @@ void misspelledName() {
             validateMethod("megt");
             fail("Missing CommandMethodSyntaxException");
         } catch (CommandMethodSyntaxException e) {
-            assertThat(e).hasMessageContaining("Command megt does not exist. Did you mean: MGET, SET?");
+            assertThat(e).hasMessageContaining("Command MEGT does not exist. Did you mean: MGET, SET?");
         }
     }
 
@@ -77,9 +80,10 @@ void tooFewAtLeastParameters() {
     @Test
     void shouldPassWithCorrectParameterCount() {
 
+        validateMethod("lpop", String.class);
+        validateMethod("rpop", String.class);
         validateMethod("mget", String.class);
         validateMethod("randomkey");
-        validateMethod("rpop", String.class);
         validateMethod("set", KeyValue.class);
         validateMethod("geoadd", String.class, String.class, GeoCoordinates.class);
     }
@@ -109,9 +113,11 @@ void methodDoesNotAcceptParameters() {
     private void validateMethod(String methodName, Class<?>... parameterTypes) {
 
         Method method = ReflectionUtils.findMethod(MyInterface.class, methodName, parameterTypes);
+        CommandSegmentFactory commandSegmentFactory = new AnnotationCommandSegmentFactory();
         CommandMethod commandMethod = DeclaredCommandMethod.create(method);
+        CommandSegments commandSegments = commandSegmentFactory.createCommandSegments(commandMethod);
 
-        sut.validate(new CommandSegments(Collections.singletonList(CommandSegment.constant(methodName))), commandMethod);
+        sut.validate(commandSegments, commandMethod);
     }
 
     private static interface MyInterface {
@@ -132,8 +138,12 @@ private static interface MyInterface {
 
         void randomkey(String key);
 
+        @Command("RPOP ?0")
         void rpop(String key);
 
+        @Command("LPOP :key")
+        void lpop(@Param("key") String key);
+
         void rpop(String key1, String key2);
     }
 }
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java
index 22d68650c0..b7fdfaf105 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java
@@ -119,7 +119,7 @@ default byte[] getAsBytes() {
             return getAsBytes("key");
         }
 
-        @Command("GET")
+        @Command("GET ?0")
         byte[] getAsBytes(String key);
 
         @Command("SET")

From 4f026e65d4ce1f829cf6f53bf28925f55d75d4fa Mon Sep 17 00:00:00 2001
From: gavincook <gavincook200@gmail.com>
Date: Thu, 8 Nov 2018 18:23:29 +0800
Subject: [PATCH 565/808] Allow configuration of discardReadBytes through
 ClientOptions.bufferUsageRatio #906

We now allow configuration of when ByteBuf.discardReadBytes() gets called. Memory freeing can be useful during decoding of large responses instead of waiting until decoding is finished.

Original pull request: #916
---
 .../java/io/lettuce/core/ClientOptions.java   | 38 ++++++++++++++++++-
 .../lettuce/core/protocol/CommandHandler.java | 18 +++++++--
 .../lettuce/core/ClientOptionsUnitTests.java  |  1 +
 .../protocol/CommandHandlerUnitTests.java     | 26 +++++++++++++
 4 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index 59761499f7..8a6a2f18c2 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -15,10 +15,10 @@
  */
 package io.lettuce.core;
 
-import java.io.Serializable;
-
 import io.lettuce.core.internal.LettuceAssert;
 
+import java.io.Serializable;
+
 /**
  * Client Options to control the behavior of {@link RedisClient}.
  *
@@ -36,6 +36,7 @@ public class ClientOptions implements Serializable {
     public static final SocketOptions DEFAULT_SOCKET_OPTIONS = SocketOptions.create();
     public static final SslOptions DEFAULT_SSL_OPTIONS = SslOptions.create();
     public static final TimeoutOptions DEFAULT_TIMEOUT_OPTIONS = TimeoutOptions.create();
+    public static final int DEFAULT_BUFFER_USAGE_RATIO = 3;
 
     private final boolean pingBeforeActivateConnection;
     private final boolean autoReconnect;
@@ -46,6 +47,7 @@ public class ClientOptions implements Serializable {
     private final SocketOptions socketOptions;
     private final SslOptions sslOptions;
     private final TimeoutOptions timeoutOptions;
+    private final int bufferUsageRatio;
     private final Builder builder;
 
     protected ClientOptions(Builder builder) {
@@ -58,6 +60,7 @@ protected ClientOptions(Builder builder) {
         this.socketOptions = builder.socketOptions;
         this.sslOptions = builder.sslOptions;
         this.timeoutOptions = builder.timeoutOptions;
+        this.bufferUsageRatio = builder.bufferUsageRatio;
         this.builder = builder;
     }
 
@@ -71,6 +74,7 @@ protected ClientOptions(ClientOptions original) {
         this.socketOptions = original.getSocketOptions();
         this.sslOptions = original.getSslOptions();
         this.timeoutOptions = original.getTimeoutOptions();
+        this.bufferUsageRatio = original.getBufferUsageRatio();
         this.builder = original.builder;
     }
 
@@ -116,6 +120,7 @@ public static class Builder {
         private SocketOptions socketOptions = DEFAULT_SOCKET_OPTIONS;
         private SslOptions sslOptions = DEFAULT_SSL_OPTIONS;
         private TimeoutOptions timeoutOptions = DEFAULT_TIMEOUT_OPTIONS;
+        private int bufferUsageRatio = DEFAULT_BUFFER_USAGE_RATIO;
 
         protected Builder() {
         }
@@ -238,6 +243,23 @@ public Builder timeoutOptions(TimeoutOptions timeoutOptions) {
             return this;
         }
 
+        /**
+         * Sets the buffer usage ratio to {@link io.lettuce.core.protocol.CommandHandler} for determine when to discard
+         * read bytes.See {@link #DEFAULT_BUFFER_USAGE_RATIO}.
+         *
+         * @param bufferUsageRatio must greater between 0 and 2^31-1
+         * @return {@code this}
+         * @since 5.2
+         */
+        public Builder bufferUsageRatio(int bufferUsageRatio) {
+            LettuceAssert.isTrue(bufferUsageRatio > 0 && bufferUsageRatio < Integer.MAX_VALUE,
+                    "BufferUsageRatio must grater than 0");
+            LettuceAssert.isTrue(bufferUsageRatio < Integer.MAX_VALUE,
+                    "BufferUsageRatio must less than " + Integer.MAX_VALUE);
+            this.bufferUsageRatio = bufferUsageRatio;
+            return this;
+        }
+
         /**
          * Create a new instance of {@link ClientOptions}.
          *
@@ -354,6 +376,18 @@ public TimeoutOptions getTimeoutOptions() {
         return timeoutOptions;
     }
 
+    /**
+     * Buffer usage ratio for {@link io.lettuce.core.protocol.CommandHandler}. Discard operation for read bytes occur
+     * When buffer usage reach {@code bufferUsageRatio / bufferUsageRatio + 1}. For example, sets 3 to bufferUsageRatio,
+     * means buffer usage reach 75 percentage, discard operation occur.
+     *
+     * @return the buffer usage ratio.
+     * @since 5.2
+     */
+    public int getBufferUsageRatio() {
+        return bufferUsageRatio;
+    }
+
     /**
      * Behavior of connections in disconnected state.
      */
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 68a78bc26f..211586aa2d 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -588,6 +588,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
 
             try {
                 if (!decode(ctx, buffer, command)) {
+                    discardReadBytesIfNecessary(buffer);
                     return;
                 }
             } catch (Exception e) {
@@ -614,9 +615,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
             afterDecode(ctx, command);
         }
 
-        if (buffer.refCnt() != 0) {
-            buffer.discardReadBytes();
-        }
+        discardReadBytesIfNecessary(buffer);
     }
 
     /**
@@ -840,6 +839,19 @@ private static long nanoTime() {
         return System.nanoTime();
     }
 
+    /**
+     * try discard read bytes when buffer usage reach {@code bufferUsageRatio / bufferUsageRatio + 1}
+     * @param buffer
+     */
+    private void discardReadBytesIfNecessary(ByteBuf buffer) {
+        int bufferUsageRatio = clientOptions.getBufferUsageRatio();
+        if ((float)buffer.writerIndex() / buffer.capacity() >= (float)bufferUsageRatio / (bufferUsageRatio + 1)) {
+            if (buffer.refCnt() != 0) {
+                buffer.discardReadBytes();
+            }
+        }
+    }
+
     public enum LifecycleState {
         NOT_CONNECTED, REGISTERED, CONNECTED, ACTIVATING, ACTIVE, DISCONNECTED, DEACTIVATING, DEACTIVATED, CLOSED,
     }
diff --git a/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java b/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
index e10a50ab83..febec7b9ec 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
@@ -45,5 +45,6 @@ void checkAssertions(ClientOptions sut) {
         assertThat(sut.isPingBeforeActivateConnection()).isEqualTo(false);
         assertThat(sut.isSuspendReconnectOnProtocolFailure()).isEqualTo(false);
         assertThat(sut.getDisconnectedBehavior()).isEqualTo(ClientOptions.DisconnectedBehavior.DEFAULT);
+        assertThat(sut.getBufferUsageRatio()).isEqualTo(ClientOptions.DEFAULT_BUFFER_USAGE_RATIO);
     }
 }
diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
index bdbdc637db..97cd7e557b 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
@@ -430,4 +430,30 @@ void shouldIgnoreNonReadableBuffers() throws Exception {
 
         verify(byteBufMock, never()).release();
     }
+
+    @Test
+    void shouldDiscardReadBytes() throws Exception {
+
+        ChannelPromise channelPromise = new DefaultChannelPromise(channel, ImmediateEventExecutor.INSTANCE);
+        channelPromise.setSuccess();
+        sut.channelRegistered(context);
+        sut.channelActive(context);
+        //set the command handler buffer capacity to 1024, make it easy to test
+        ReflectionTestUtils.setField(sut, "buffer", context.alloc().buffer(1024));
+        ByteBuf buffer = (ByteBuf) ReflectionTestUtils.getField(sut, "buffer");
+
+        //mock a multi reply, which will reach the buffer usage ratio
+        ByteBuf msg = context.alloc().buffer(1024);
+        while ((float)msg.writerIndex() / msg.capacity() <= (float)ClientOptions.DEFAULT_BUFFER_USAGE_RATIO / (
+                ClientOptions.DEFAULT_BUFFER_USAGE_RATIO + 1)) {
+            sut.write(context, command, channelPromise);
+            msg.writeBytes("*1\r\n+OK\r\n".getBytes());
+        }
+
+        sut.channelRead(context, msg);
+
+        assertThat(buffer.readerIndex() == 0);
+        assertThat(buffer.writerIndex() == 0);
+        sut.channelUnregistered(context);
+    }
 }

From 70d82c0f02b5bfd12f7367cd3736aa18f84bbac3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 23 Nov 2018 16:55:01 +0100
Subject: [PATCH 566/808] Polishing #906

Improve documentation. Add author tags. Precompute expected-to-discard buffer usage ratio instead of computing it on each discard. Add override to ClusterClientOptions Builder. Add and fix tests. Reformat code.

Original pull request: #916
---
 .../java/io/lettuce/core/ClientOptions.java   | 24 ++++----
 .../core/cluster/ClusterClientOptions.java    |  6 ++
 .../lettuce/core/protocol/CommandHandler.java | 21 ++++---
 .../protocol/CommandHandlerUnitTests.java     | 59 +++++++++++++++----
 4 files changed, 79 insertions(+), 31 deletions(-)

diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index 8a6a2f18c2..aebf233c36 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -15,14 +15,15 @@
  */
 package io.lettuce.core;
 
-import io.lettuce.core.internal.LettuceAssert;
-
 import java.io.Serializable;
 
+import io.lettuce.core.internal.LettuceAssert;
+
 /**
  * Client Options to control the behavior of {@link RedisClient}.
  *
  * @author Mark Paluch
+ * @author Gavin Cook
  */
 @SuppressWarnings("serial")
 public class ClientOptions implements Serializable {
@@ -244,18 +245,21 @@ public Builder timeoutOptions(TimeoutOptions timeoutOptions) {
         }
 
         /**
-         * Sets the buffer usage ratio to {@link io.lettuce.core.protocol.CommandHandler} for determine when to discard
-         * read bytes.See {@link #DEFAULT_BUFFER_USAGE_RATIO}.
+         * Buffer usage ratio for {@link io.lettuce.core.protocol.CommandHandler}. This ratio controls how often bytes are
+         * discarded during decoding. In particular, when buffer usage reaches {@code bufferUsageRatio / bufferUsageRatio + 1}.
+         * E.g. setting {@code bufferUsageRatio} to {@literal 3}, will discard read bytes once the buffer usage reaches 75
+         * percent. See {@link #DEFAULT_BUFFER_USAGE_RATIO}.
          *
-         * @param bufferUsageRatio must greater between 0 and 2^31-1
+         * @param bufferUsageRatio must greater between 0 and 2^31-1, typically a value between 1 and 10 representing 50% to
+         *        90%.
          * @return {@code this}
          * @since 5.2
          */
         public Builder bufferUsageRatio(int bufferUsageRatio) {
+
             LettuceAssert.isTrue(bufferUsageRatio > 0 && bufferUsageRatio < Integer.MAX_VALUE,
                     "BufferUsageRatio must grater than 0");
-            LettuceAssert.isTrue(bufferUsageRatio < Integer.MAX_VALUE,
-                    "BufferUsageRatio must less than " + Integer.MAX_VALUE);
+
             this.bufferUsageRatio = bufferUsageRatio;
             return this;
         }
@@ -377,9 +381,9 @@ public TimeoutOptions getTimeoutOptions() {
     }
 
     /**
-     * Buffer usage ratio for {@link io.lettuce.core.protocol.CommandHandler}. Discard operation for read bytes occur
-     * When buffer usage reach {@code bufferUsageRatio / bufferUsageRatio + 1}. For example, sets 3 to bufferUsageRatio,
-     * means buffer usage reach 75 percentage, discard operation occur.
+     * Buffer usage ratio for {@link io.lettuce.core.protocol.CommandHandler}. This ratio controls how often bytes are discarded
+     * during decoding. In particular, when buffer usage reaches {@code bufferUsageRatio / bufferUsageRatio + 1}. E.g. setting
+     * {@code bufferUsageRatio} to {@literal 3}, will discard read bytes once the buffer usage reaches 75 percent.
      *
      * @return the buffer usage ratio.
      * @since 5.2
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index b295d8d246..967200f299 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -203,6 +203,12 @@ public Builder timeoutOptions(TimeoutOptions timeoutOptions) {
             return this;
         }
 
+        @Override
+        public Builder bufferUsageRatio(int bufferUsageRatio) {
+            super.bufferUsageRatio(bufferUsageRatio);
+            return this;
+        }
+
         /**
          * Create a new instance of {@link ClusterClientOptions}
          *
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 211586aa2d..a34e6df570 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -53,6 +53,7 @@
  * @author Jongyeol Choi
  * @author Grzegorz Szpak
  * @author Daniel Albuquerque
+ * @author Gavin Cook
  */
 public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCommands {
 
@@ -80,6 +81,7 @@ public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCom
     private final boolean latencyMetricsEnabled;
     private final boolean tracingEnabled;
     private final boolean includeCommandArgsInSpanTags;
+    private final float discardReadBytesRatio;
     private final boolean boundedQueues;
     private final BackpressureSource backpressureSource = new BackpressureSource();
 
@@ -114,6 +116,9 @@ public CommandHandler(ClientOptions clientOptions, ClientResources clientResourc
 
         this.tracingEnabled = tracing.isEnabled();
         this.includeCommandArgsInSpanTags = tracing.includeCommandArgsInSpanTags();
+
+        float bufferUsageRatio = clientOptions.getBufferUsageRatio();
+        this.discardReadBytesRatio = bufferUsageRatio / (bufferUsageRatio + 1);
     }
 
     public Queue<RedisCommand<?, ?, ?>> getStack() {
@@ -368,8 +373,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
         }
     }
 
-    private void writeSingleCommand(ChannelHandlerContext ctx, RedisCommand<?, ?, ?> command, ChannelPromise promise)
- {
+    private void writeSingleCommand(ChannelHandlerContext ctx, RedisCommand<?, ?, ?> command, ChannelPromise promise) {
 
         if (!isWriteable(command)) {
             promise.trySuccess();
@@ -840,15 +844,16 @@ private static long nanoTime() {
     }
 
     /**
-     * try discard read bytes when buffer usage reach {@code bufferUsageRatio / bufferUsageRatio + 1}
+     * Try to discard read bytes when buffer usage reach a higher usage ratio.
+     *
      * @param buffer
      */
     private void discardReadBytesIfNecessary(ByteBuf buffer) {
-        int bufferUsageRatio = clientOptions.getBufferUsageRatio();
-        if ((float)buffer.writerIndex() / buffer.capacity() >= (float)bufferUsageRatio / (bufferUsageRatio + 1)) {
-            if (buffer.refCnt() != 0) {
-                buffer.discardReadBytes();
-            }
+
+        float usedRatio = (float) buffer.readerIndex() / buffer.capacity();
+
+        if (usedRatio >= discardReadBytesRatio && buffer.refCnt() != 0) {
+            buffer.discardReadBytes();
         }
     }
 
diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
index 97cd7e557b..e26c7f918e 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
@@ -62,6 +62,7 @@
 /**
  * @author Mark Paluch
  * @author Jongyeol Choi
+ * @author Gavin Cook
  */
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
@@ -431,29 +432,61 @@ void shouldIgnoreNonReadableBuffers() throws Exception {
         verify(byteBufMock, never()).release();
     }
 
+    @Test
+    void shouldNotDiscardReadBytes() throws Exception {
+
+        ChannelPromise channelPromise = new DefaultChannelPromise(channel, ImmediateEventExecutor.INSTANCE);
+        channelPromise.setSuccess();
+
+        sut.channelRegistered(context);
+        sut.channelActive(context);
+
+        sut.getStack().add(new Command<>(CommandType.PING, new StatusOutput<>(StringCodec.UTF8)));
+
+        // set the command handler buffer capacity to 30, make it easy to test
+        ByteBuf internalBuffer = context.alloc().buffer(30);
+        ReflectionTestUtils.setField(sut, "buffer", internalBuffer);
+
+        // mock a multi reply, which will reach the buffer usage ratio
+        ByteBuf msg = context.alloc().buffer(100);
+
+        msg.writeBytes("*1\r\n+OK\r\n".getBytes());
+
+        sut.channelRead(context, msg);
+
+        assertThat(internalBuffer.readerIndex()).isEqualTo(9);
+        assertThat(internalBuffer.writerIndex()).isEqualTo(9);
+        sut.channelUnregistered(context);
+    }
+
     @Test
     void shouldDiscardReadBytes() throws Exception {
 
         ChannelPromise channelPromise = new DefaultChannelPromise(channel, ImmediateEventExecutor.INSTANCE);
         channelPromise.setSuccess();
+
         sut.channelRegistered(context);
         sut.channelActive(context);
-        //set the command handler buffer capacity to 1024, make it easy to test
-        ReflectionTestUtils.setField(sut, "buffer", context.alloc().buffer(1024));
-        ByteBuf buffer = (ByteBuf) ReflectionTestUtils.getField(sut, "buffer");
-
-        //mock a multi reply, which will reach the buffer usage ratio
-        ByteBuf msg = context.alloc().buffer(1024);
-        while ((float)msg.writerIndex() / msg.capacity() <= (float)ClientOptions.DEFAULT_BUFFER_USAGE_RATIO / (
-                ClientOptions.DEFAULT_BUFFER_USAGE_RATIO + 1)) {
-            sut.write(context, command, channelPromise);
-            msg.writeBytes("*1\r\n+OK\r\n".getBytes());
-        }
+
+        sut.getStack().add(new Command<>(CommandType.PING, new StatusOutput<>(StringCodec.UTF8)));
+        sut.getStack().add(new Command<>(CommandType.PING, new StatusOutput<>(StringCodec.UTF8)));
+        sut.getStack().add(new Command<>(CommandType.PING, new StatusOutput<>(StringCodec.UTF8)));
+
+        // set the command handler buffer capacity to 30, make it easy to test
+        ByteBuf internalBuffer = context.alloc().buffer(30);
+        ReflectionTestUtils.setField(sut, "buffer", internalBuffer);
+
+        // mock a multi reply, which will reach the buffer usage ratio
+        ByteBuf msg = context.alloc().buffer(100);
+
+        msg.writeBytes("*1\r\n+OK\r\n".getBytes());
+        msg.writeBytes("*1\r\n+OK\r\n".getBytes());
+        msg.writeBytes("*1\r\n+OK\r\n".getBytes());
 
         sut.channelRead(context, msg);
 
-        assertThat(buffer.readerIndex() == 0);
-        assertThat(buffer.writerIndex() == 0);
+        assertThat(internalBuffer.readerIndex()).isEqualTo(0);
+        assertThat(internalBuffer.writerIndex()).isEqualTo(0);
         sut.channelUnregistered(context);
     }
 }

From c705fd43dbc2123decb2823272ac959fde3df5af Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 24 Nov 2018 13:27:48 +0100
Subject: [PATCH 567/808] Guard ToByteBufEncoder calls with try/finally #930

Lettuce now makes sure to properly release temporary buffers after encoding keys and values. This avoids memory leaks caused by encoding errors.
---
 .../io/lettuce/core/protocol/CommandArgs.java | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgs.java b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
index 614c0309f0..035d2d4e7f 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandArgs.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
@@ -654,10 +654,14 @@ void encode(ByteBuf target) {
 
                 ToByteBufEncoder<K, V> toByteBufEncoder = (ToByteBufEncoder<K, V>) codec;
                 ByteBuf temporaryBuffer = target.alloc().buffer(toByteBufEncoder.estimateSize(key) + 6);
-                toByteBufEncoder.encodeKey(key, temporaryBuffer);
 
-                ByteBufferArgument.writeByteBuf(target, temporaryBuffer);
-                temporaryBuffer.release();
+                try {
+
+                    toByteBufEncoder.encodeKey(key, temporaryBuffer);
+                    ByteBufferArgument.writeByteBuf(target, temporaryBuffer);
+                } finally {
+                    temporaryBuffer.release();
+                }
 
                 return;
             }
@@ -693,10 +697,13 @@ void encode(ByteBuf target) {
 
                 ToByteBufEncoder<K, V> toByteBufEncoder = (ToByteBufEncoder<K, V>) codec;
                 ByteBuf temporaryBuffer = target.alloc().buffer(toByteBufEncoder.estimateSize(val) + 6);
-                toByteBufEncoder.encodeValue(val, temporaryBuffer);
 
-                ByteBufferArgument.writeByteBuf(target, temporaryBuffer);
-                temporaryBuffer.release();
+                try {
+                    toByteBufEncoder.encodeValue(val, temporaryBuffer);
+                    ByteBufferArgument.writeByteBuf(target, temporaryBuffer);
+                } finally {
+                    temporaryBuffer.release();
+                }
 
                 return;
             }

From 91e7675883c3781119efa63e0f893923130d0b24 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 24 Nov 2018 13:59:56 +0100
Subject: [PATCH 568/808] Use Cluster write connections for read commands when
 using ReadFrom.MASTER #923

Lettuce now reuses master connections when ReadFrom is configured to MASTER (which is the default configuration). By reusing the master connection, we can reduce the number of used connections by up to 50% as we don't need an additional read connection while talking to the same node.
---
 .../cluster/PooledClusterConnectionProvider.java  |  3 ++-
 .../PooledClusterConnectionProviderUnitTests.java | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
index 96356f4643..96299c24ca 100644
--- a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
@@ -104,9 +104,10 @@ public CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(Inten
             logger.debug("getConnection(" + intent + ", " + slot + ")");
         }
 
-        if (intent == Intent.READ && readFrom != null) {
+        if (intent == Intent.READ && readFrom != null && readFrom != ReadFrom.MASTER) {
             return getReadConnection(slot);
         }
+
         return getWriteConnection(slot).toCompletableFuture();
     }
 
diff --git a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
index d3167bd331..0ed404f104 100644
--- a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
@@ -125,6 +125,21 @@ void shouldObtainConnection() {
         verifyNoMoreInteractions(connection);
     }
 
+    @Test
+    void shouldReuseMasterConnectionForReadFromMaster() {
+
+        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
+                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+
+        sut.setReadFrom(ReadFrom.MASTER);
+
+        StatefulRedisConnection<String, String> connection = sut.getConnection(Intent.READ, 1);
+
+        assertThat(connection).isSameAs(nodeConnectionMock);
+        verify(connection).setAutoFlushCommands(true);
+        verifyNoMoreInteractions(connection);
+    }
+
     @Test
     void shouldObtainConnectionReadFromSlave() {
 

From c99549b78a29594b9e9e48ab92f470cd94d0b92b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 24 Nov 2018 16:52:08 +0100
Subject: [PATCH 569/808] Emit event on reconnect failure #885

Lettuce now emits ReconnectFailedEvent if a reconnect attempt fails along the cause and the retry counter. This event allows detection of persistent reconnect failures.
---
 .../io/lettuce/core/ConnectionBuilder.java    |  3 +-
 .../connection/ReconnectFailedEvent.java      | 55 ++++++++++++++
 .../core/protocol/ConnectionWatchdog.java     | 26 +++++--
 .../core/protocol/ReconnectionHandler.java    | 17 ++++-
 .../ConnectionFailureIntegrationTests.java    | 72 +++++++++++++++++--
 5 files changed, 161 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/event/connection/ReconnectFailedEvent.java

diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index 35ec0513e7..99349379d7 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -111,7 +111,8 @@ protected ConnectionWatchdog createConnectionWatchdog() {
         LettuceAssert.assertState(socketAddressSupplier != null, "SocketAddressSupplier must be set for autoReconnect=true");
 
         ConnectionWatchdog watchdog = new ConnectionWatchdog(clientResources.reconnectDelay(), clientOptions, bootstrap, timer,
-                clientResources.eventExecutorGroup(), socketAddressSupplier, reconnectionListener, connection);
+                clientResources.eventExecutorGroup(), socketAddressSupplier, reconnectionListener, connection,
+                clientResources.eventBus());
 
         endpoint.registerConnectionWatchdog(watchdog);
 
diff --git a/src/main/java/io/lettuce/core/event/connection/ReconnectFailedEvent.java b/src/main/java/io/lettuce/core/event/connection/ReconnectFailedEvent.java
new file mode 100644
index 0000000000..1ee36c2e35
--- /dev/null
+++ b/src/main/java/io/lettuce/core/event/connection/ReconnectFailedEvent.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.event.connection;
+
+import java.net.SocketAddress;
+
+/**
+ * Event fired on failed reconnect caused either by I/O issues or during connection initialization.
+ *
+ * @author Mark Paluch
+ * @since 5.2
+ */
+public class ReconnectFailedEvent extends ConnectionEventSupport {
+
+    private final Throwable cause;
+    private final int attempt;
+
+    public ReconnectFailedEvent(SocketAddress local, SocketAddress remote, Throwable cause, int attempt) {
+        super(local, remote);
+        this.cause = cause;
+        this.attempt = attempt;
+    }
+
+    /**
+     * Returns the {@link Throwable} that describes the reconnect cause.
+     *
+     * @return the {@link Throwable} that describes the reconnect cause.
+     */
+    public Throwable getCause() {
+        return cause;
+    }
+
+    /**
+     * Returns the reconnect attempt counter for the connection. Zero-based counter, {@code 0} represents the first attempt. The
+     * counter is reset upon successful reconnect.
+     *
+     * @return the reconnect attempt counter for the connection. Zero-based counter, {@code 0} represents the first attempt.
+     */
+    public int getAttempt() {
+        return attempt;
+    }
+}
diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
index 07e1ecae60..f596efbae5 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
@@ -21,14 +21,18 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.ConnectionEvents;
+import io.lettuce.core.event.EventBus;
+import io.lettuce.core.event.connection.ReconnectFailedEvent;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.resource.Delay;
 import io.lettuce.core.resource.Delay.StatefulDelay;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.*;
 import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.local.LocalAddress;
 import io.netty.util.Timeout;
 import io.netty.util.Timer;
 import io.netty.util.concurrent.EventExecutorGroup;
@@ -55,6 +59,7 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
     private final ReconnectionHandler reconnectionHandler;
     private final ReconnectionListener reconnectionListener;
     private final Timer timer;
+    private final EventBus eventBus;
 
     private Channel channel;
     private SocketAddress remoteAddress;
@@ -79,10 +84,11 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
      * @param socketAddressSupplier the socket address supplier to obtain an address for reconnection, may be {@literal null}
      * @param reconnectionListener the reconnection listener, must not be {@literal null}
      * @param connectionFacade the connection facade, must not be {@literal null}
+     * @param eventBus Event bus to emit reconnect events.
      */
     public ConnectionWatchdog(Delay reconnectDelay, ClientOptions clientOptions, Bootstrap bootstrap, Timer timer,
             EventExecutorGroup reconnectWorkers, Mono<SocketAddress> socketAddressSupplier,
-            ReconnectionListener reconnectionListener, ConnectionFacade connectionFacade) {
+            ReconnectionListener reconnectionListener, ConnectionFacade connectionFacade, EventBus eventBus) {
 
         LettuceAssert.notNull(reconnectDelay, "Delay must not be null");
         LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
@@ -92,6 +98,7 @@ public ConnectionWatchdog(Delay reconnectDelay, ClientOptions clientOptions, Boo
         LettuceAssert.notNull(socketAddressSupplier, "SocketAddressSupplier must not be null");
         LettuceAssert.notNull(reconnectionListener, "ReconnectionListener must not be null");
         LettuceAssert.notNull(connectionFacade, "ConnectionFacade must not be null");
+        LettuceAssert.notNull(eventBus, "EventBus must not be null");
 
         this.reconnectDelay = reconnectDelay;
         this.bootstrap = bootstrap;
@@ -99,6 +106,7 @@ public ConnectionWatchdog(Delay reconnectDelay, ClientOptions clientOptions, Boo
         this.reconnectWorkers = reconnectWorkers;
         this.reconnectionListener = reconnectionListener;
         this.reconnectSchedulerSync = new AtomicBoolean(false);
+        this.eventBus = eventBus;
 
         Mono<SocketAddress> wrappedSocketAddressSupplier = socketAddressSupplier.doOnNext(addr -> remoteAddress = addr)
                 .onErrorResume(
@@ -283,7 +291,8 @@ public void run(int attempt) throws Exception {
             reconnectionListener.onReconnectAttempt(new ConnectionEvents.Reconnect(attempt));
             logger.log(infoLevel, "Reconnecting, last destination was {}", remoteAddress);
 
-            CompletableFuture<Channel> future = reconnectionHandler.reconnect();
+            Tuple2<CompletableFuture<Channel>, CompletableFuture<SocketAddress>> tuple = reconnectionHandler.reconnect();
+            CompletableFuture<Channel> future = tuple.getT1();
 
             future.whenComplete((c, t) -> {
 
@@ -297,12 +306,22 @@ public void run(int attempt) throws Exception {
                     logger.log(warnLevelToUse, "Cannot reconnect: {}", t.toString(), t);
                 }
 
+                CompletableFuture<SocketAddress> remoteAddressFuture = tuple.getT2();
+                SocketAddress remote = remoteAddress;
+                if (remoteAddressFuture.isDone() && !remoteAddressFuture.isCompletedExceptionally()
+                        && !remoteAddressFuture.isCancelled()) {
+                    remote = remoteAddressFuture.join();
+                }
+
+                eventBus.publish(new ReconnectFailedEvent(LocalAddress.ANY, remote, t, attempt));
+
                 if (!isReconnectSuspended()) {
                     scheduleReconnect();
                 }
             });
         } catch (Exception e) {
             logger.log(warnLevel, "Cannot reconnect: {}", e.toString());
+            eventBus.publish(new ReconnectFailedEvent(LocalAddress.ANY, remoteAddress, e, attempt));
         }
     }
 
@@ -367,8 +386,7 @@ private String logPrefix() {
             return logPrefix;
         }
 
-        String
-        buffer= "[" +ChannelLogDescriptor.logDescriptor(channel)+", last known addr="+remoteAddress+']';
+        String buffer = "[" + ChannelLogDescriptor.logDescriptor(channel) + ", last known addr=" + remoteAddress + ']';
         return logPrefix = buffer;
     }
 }
diff --git a/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
index 23cbda59c6..b8d8f5eec6 100644
--- a/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
@@ -21,6 +21,8 @@
 import java.util.concurrent.*;
 
 import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
+import reactor.util.function.Tuples;
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.RedisChannelInitializer;
 import io.lettuce.core.RedisCommandTimeoutException;
@@ -83,21 +85,30 @@ class ReconnectionHandler {
      *
      * @return reconnect {@link ChannelFuture}.
      */
-    protected CompletableFuture<Channel> reconnect() {
+    protected Tuple2<CompletableFuture<Channel>, CompletableFuture<SocketAddress>> reconnect() {
 
         CompletableFuture<Channel> future = new CompletableFuture<>();
+        CompletableFuture<SocketAddress> address = new CompletableFuture<>();
 
         socketAddressSupplier.subscribe(remoteAddress -> {
 
+            address.complete(remoteAddress);
+
             if (future.isCancelled()) {
                 return;
             }
 
             reconnect0(future, remoteAddress);
 
-        }, future::completeExceptionally);
+        }, ex -> {
+            if (!address.isDone()) {
+                address.completeExceptionally(ex);
+            }
+            future.completeExceptionally(ex);
+        });
 
-        return this.currentFuture = future;
+        this.currentFuture = future;
+        return Tuples.of(future, address);
     }
 
     private void reconnect0(CompletableFuture<Channel> result, SocketAddress remoteAddress) {
diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
index dcf89a3128..94abfd4fe3 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
@@ -18,11 +18,13 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import java.net.InetSocketAddress;
 import java.time.Duration;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.TimeUnit;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
@@ -34,9 +36,14 @@
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.event.Event;
+import io.lettuce.core.event.connection.ReconnectFailedEvent;
+import io.lettuce.core.resource.ClientResources;
 import io.lettuce.test.*;
+import io.lettuce.test.resource.FastShutdown;
 import io.lettuce.test.server.RandomResponseServer;
 import io.lettuce.test.settings.TestSettings;
+import io.netty.channel.local.LocalAddress;
 
 /**
  * @author Mark Paluch
@@ -226,6 +233,63 @@ void cancelCommandsOnReconnectFailure() throws Exception {
         }
     }
 
+    @Test
+    void emitEventOnReconnectFailure() throws Exception {
+
+        RandomResponseServer ts = getRandomResponseServer();
+        Queue<Event> queue = new ConcurrentLinkedQueue<>();
+        ClientResources clientResources = ClientResources.create();
+
+        RedisURI redisUri = RedisURI.create(defaultRedisUri.toURI());
+        RedisClient client = RedisClient.create(clientResources);
+
+        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+
+        try {
+            RedisAsyncCommandsImpl<String, String> connection = (RedisAsyncCommandsImpl<String, String>) client.connect(
+                    redisUri).async();
+            ConnectionWatchdog connectionWatchdog = ConnectionTestUtil
+                    .getConnectionWatchdog(connection.getStatefulConnection());
+
+            redisUri.setPort(TestSettings.nonexistentPort());
+
+            client.getResources().eventBus().get().subscribe(queue::add);
+
+            connection.quit();
+            Wait.untilTrue(() -> !connection.getStatefulConnection().isOpen()).waitOrTimeout();
+
+            connectionWatchdog.run(0);
+            Delay.delay(Duration.ofMillis(500));
+
+            connection.getStatefulConnection().close();
+
+            assertThat(queue).isNotEmpty();
+
+            List<ReconnectFailedEvent> failures = queue.stream().filter(ReconnectFailedEvent.class::isInstance)
+                    .map(ReconnectFailedEvent.class::cast).sorted(Comparator.comparingInt(ReconnectFailedEvent::getAttempt))
+                    .collect(Collectors.toList());
+
+            assertThat(failures.size()).isGreaterThanOrEqualTo(2);
+
+            ReconnectFailedEvent failure1 = failures.get(0);
+            assertThat(failure1.localAddress()).isEqualTo(LocalAddress.ANY);
+            assertThat(failure1.remoteAddress()).isInstanceOf(InetSocketAddress.class);
+            assertThat(failure1.getCause()).hasMessageContaining("Invalid first byte");
+            assertThat(failure1.getAttempt()).isZero();
+
+            ReconnectFailedEvent failure2 = failures.get(1);
+            assertThat(failure2.localAddress()).isEqualTo(LocalAddress.ANY);
+            assertThat(failure2.remoteAddress()).isInstanceOf(InetSocketAddress.class);
+            assertThat(failure2.getCause()).hasMessageContaining("Invalid first byte");
+            assertThat(failure2.getAttempt()).isOne();
+
+        } finally {
+            ts.shutdown();
+            FastShutdown.shutdown(client);
+            FastShutdown.shutdown(clientResources);
+        }
+    }
+
     /**
      * Expect to disable {@link ConnectionWatchdog} when closing a broken connection.
      *

From 523e036a804e4a316165dc9c23f6c07cfd017251 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 24 Nov 2018 16:54:54 +0100
Subject: [PATCH 570/808] Upgrade to Reactor Core 3.2.3.RELEASE #931

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 70293bfc4c..0c6e5eb15f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <netty-version>4.1.30.Final</netty-version>
         <spring-version>4.3.20.RELEASE</spring-version>
-        <reactor-version>3.2.2.RELEASE</reactor-version>
+        <reactor-version>3.2.3.RELEASE</reactor-version>
         <brave-version>5.2.0</brave-version>
         <skipITs>true</skipITs>
     </properties>

From e50d95c7a298bf45383c9269064d3a706486f655 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 24 Nov 2018 16:56:02 +0100
Subject: [PATCH 571/808] Upgrade to netty 4.1.31.Final #932

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0c6e5eb15f..f839011fe9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
-        <netty-version>4.1.30.Final</netty-version>
+        <netty-version>4.1.31.Final</netty-version>
         <spring-version>4.3.20.RELEASE</spring-version>
         <reactor-version>3.2.3.RELEASE</reactor-version>
         <brave-version>5.2.0</brave-version>

From 9d0c8322fee96f383dcee343454ce96992eff713 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 24 Nov 2018 16:57:28 +0100
Subject: [PATCH 572/808] Upgrade to RxJava 2.2.4 #933

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f839011fe9..8c30d8f157 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,7 +203,7 @@
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
-            <version>2.2.3</version>
+            <version>2.2.4</version>
             <optional>true</optional>
         </dependency>
 

From af7ece936a9c1eeee7be46df873ca9c91261d7c9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 24 Nov 2018 17:17:16 +0100
Subject: [PATCH 573/808] Polishing

Refactor CompressionCodec into utility class.
---
 src/main/java/io/lettuce/core/codec/CompressionCodec.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/codec/CompressionCodec.java b/src/main/java/io/lettuce/core/codec/CompressionCodec.java
index f1fafbe515..59f08b42d4 100644
--- a/src/main/java/io/lettuce/core/codec/CompressionCodec.java
+++ b/src/main/java/io/lettuce/core/codec/CompressionCodec.java
@@ -33,7 +33,10 @@
  *
  * @author Mark Paluch
  */
-public class CompressionCodec {
+public abstract class CompressionCodec {
+
+    private CompressionCodec() {
+    }
 
     /**
      * A {@link RedisCodec} that compresses values from a delegating {@link RedisCodec}.

From f6510390681e7ec9fb27a63c788167d5b47f46b4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 3 Dec 2018 09:28:07 +0100
Subject: [PATCH 574/808] =?UTF-8?q?Fix=20RedisTransactionalCommands.exec(?=
 =?UTF-8?q?=E2=80=A6)=20Javadoc=20#942?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/api/async/RedisTransactionalAsyncCommands.java       | 4 +++-
 .../core/api/reactive/RedisTransactionalReactiveCommands.java | 4 +++-
 .../io/lettuce/core/api/sync/RedisTransactionalCommands.java  | 4 +++-
 .../io/lettuce/core/api/RedisTransactionalCommands.java       | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
index d174f360f9..91c31a1644 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
@@ -41,7 +41,9 @@ public interface RedisTransactionalAsyncCommands<K, V> {
      *
      * @return List&lt;Object&gt; array-reply each element being the reply to each of the commands in the atomic transaction.
      *
-     *         When using {@code WATCH}, {@code EXEC} can return a
+     *         When using {@code WATCH}, {@code EXEC} can return a {@link TransactionResult#wasDiscarded discarded
+     *         TransactionResult}.
+     * @see TransactionResult#wasDiscarded
      */
     RedisFuture<TransactionResult> exec();
 
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
index 12ab08c1e6..5ea1c520c5 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
@@ -41,7 +41,9 @@ public interface RedisTransactionalReactiveCommands<K, V> {
      *
      * @return Object array-reply each element being the reply to each of the commands in the atomic transaction.
      *
-     *         When using {@code WATCH}, {@code EXEC} can return a
+     *         When using {@code WATCH}, {@code EXEC} can return a {@link TransactionResult#wasDiscarded discarded
+     *         TransactionResult}.
+     * @see TransactionResult#wasDiscarded
      */
     Mono<TransactionResult> exec();
 
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
index 6afc54ea4a..0353f48842 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
@@ -40,7 +40,9 @@ public interface RedisTransactionalCommands<K, V> {
      *
      * @return List&lt;Object&gt; array-reply each element being the reply to each of the commands in the atomic transaction.
      *
-     *         When using {@code WATCH}, {@code EXEC} can return a
+     *         When using {@code WATCH}, {@code EXEC} can return a {@link TransactionResult#wasDiscarded discarded
+     *         TransactionResult}.
+     * @see TransactionResult#wasDiscarded
      */
     TransactionResult exec();
 
diff --git a/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java b/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java
index 9f9c3b4e3f..5482cc137b 100644
--- a/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java
@@ -40,7 +40,9 @@ public interface RedisTransactionalCommands<K, V> {
      *
      * @return List&lt;Object&gt; array-reply each element being the reply to each of the commands in the atomic transaction.
      *
-     *         When using {@code WATCH}, {@code EXEC} can return a
+     *         When using {@code WATCH}, {@code EXEC} can return a {@link TransactionResult#wasDiscarded discarded
+     *         TransactionResult}.
+     * @see TransactionResult#wasDiscarded
      */
     TransactionResult exec();
 

From 1dc93bb0736278a18793f5c410b169e434104c3a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 3 Dec 2018 11:17:14 +0100
Subject: [PATCH 575/808] Upgrade to Maven Javadoc Plugin 3.0.2 snapshot #942

---
 pom.xml | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8c30d8f157..973e29ddec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -435,7 +436,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>3.0.2-SNAPSHOT</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -450,9 +451,8 @@
                             <header>Lettuce</header>
                             <stylesheetfile>src/main/javadoc/stylesheet.css</stylesheetfile>
                             <links>
-                                <link>http://netty.io/4.1/api/</link>
-                                <link>http://commons.apache.org/proper/commons-pool/api-2.4.2/</link>
-                                <link>http://docs.guava-libraries.googlecode.com/git/javadoc/</link>
+                                <link>https://netty.io/4.1/api/</link>
+                                <link>https://commons.apache.org/proper/commons-pool/api-2.4.2/</link>
                                 <link>http://reactivex.io/RxJava/1.x/javadoc/</link>
                                 <link>http://reactivex.io/RxJava/javadoc/</link>
                                 <link>https://projectreactor.io/docs/core/release/api/</link>
@@ -634,7 +634,7 @@
                                     <arguments>
                                         <argument>-Xmx2G</argument>
                                         <argument>-classpath</argument>
-                                        <classpath />
+                                        <classpath/>
                                         <argument>org.openjdk.jmh.Main</argument>
                                         <argument>.*</argument>
                                         <argument>-tu</argument>
@@ -709,7 +709,9 @@
                                 <phase>process-resources</phase>
                                 <configuration>
                                     <target>
-                                        <copy failonerror="false" file="${project.build.directory}/generated-docs/index.pdf" tofile="target/site/reference/pdf/lettuce-reference.pdf" />
+                                        <copy failonerror="false"
+                                              file="${project.build.directory}/generated-docs/index.pdf"
+                                              tofile="target/site/reference/pdf/lettuce-reference.pdf"/>
                                     </target>
                                 </configuration>
                                 <goals>
@@ -776,9 +778,9 @@
                                 <toclevels>3</toclevels>
                                 <numbered>true</numbered>
                                 <ext-doc>https://raw.githubusercontent.com/wiki/lettuce-io/lettuce-core/</ext-doc>
-                                <allow-uri-read />
-                                <docinfo />
-                                <toc2 />
+                                <allow-uri-read/>
+                                <docinfo/>
+                                <toc2/>
                                 <icons>font</icons>
                                 <source-highlighter>coderay</source-highlighter>
                             </attributes>
@@ -947,4 +949,14 @@
             </plugin>
         </plugins>
     </build>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>apache-snapshots</id>
+            <url>https://repository.apache.org/content/groups/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
 </project>

From 8664452f0f84949eedf8816ff566d28eb8df58fc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 3 Dec 2018 14:31:46 +0100
Subject: [PATCH 576/808] Allow usage of publishOn scheduler for reactive
 signal emission #905

Emission of data and completion signals using the reactive API can now use Lettuce's EventExecutorGroup instead of the I/O thread. Scheduler usage allows multiplexing of threads and early I/O thread release.

Using a single Redis connection in a reactive context can cause effectively single-threaded behavior as processing of downstream operators happens typically on the I/O thread. Compute-intensive processing consumes I/O thread capacity and results in performance decrease.
---
 .../core/AbstractRedisReactiveCommands.java   |  31 +-
 .../java/io/lettuce/core/ClientOptions.java   |  42 +++
 .../java/io/lettuce/core/RedisPublisher.java  | 264 +++++++++++++++++-
 .../core/cluster/ClusterClientOptions.java    |   6 +
 ...ctiveBackpressurePropagationUnitTests.java |   7 +-
 .../io/lettuce/core/TestRedisPublisher.java   |   5 +-
 6 files changed, 340 insertions(+), 15 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 5adc70d4f5..7f1c460ecc 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -37,6 +37,8 @@
 import io.lettuce.core.tracing.TraceContext;
 import io.lettuce.core.tracing.TraceContextProvider;
 import io.lettuce.core.tracing.Tracing;
+import io.netty.util.concurrent.EventExecutorGroup;
+import io.netty.util.concurrent.ImmediateEventExecutor;
 
 /**
  * A reactive and thread-safe API for a Redis connection.
@@ -52,11 +54,13 @@ public abstract class AbstractRedisReactiveCommands<K, V> implements RedisHashRe
         RedisServerReactiveCommands<K, V>, RedisHLLReactiveCommands<K, V>, BaseRedisReactiveCommands<K, V>,
         RedisTransactionalReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>, RedisClusterReactiveCommands<K, V> {
 
+    private final Object mutex = new Object();
     private final StatefulConnection<K, V> connection;
     private final RedisCodec<K, V> codec;
     private final RedisCommandBuilder<K, V> commandBuilder;
     private final ClientResources clientResources;
     private final boolean tracingEnabled;
+    private EventExecutorGroup scheduler;
 
     /**
      * Initialize a new instance.
@@ -72,6 +76,24 @@ public AbstractRedisReactiveCommands(StatefulConnection<K, V> connection, RedisC
         this.tracingEnabled = clientResources.tracing().isEnabled();
     }
 
+    private EventExecutorGroup getScheduler() {
+
+        if (this.scheduler != null) {
+            return this.scheduler;
+        }
+
+        synchronized (mutex) {
+
+            EventExecutorGroup scheduler = ImmediateEventExecutor.INSTANCE;
+
+            if (connection.getOptions().isPublishOnScheduler()) {
+                scheduler = connection.getResources().eventExecutorGroup();
+            }
+
+            return this.scheduler = scheduler;
+        }
+    }
+
     @Override
     public Mono<Long> append(K key, V value) {
         return createMono(() -> commandBuilder.append(key, value));
@@ -380,10 +402,10 @@ private <T> Flux<T> createFlux(Supplier<RedisCommand<K, V, T>> commandSupplier,
         if (tracingEnabled) {
 
             return withTraceContext().flatMapMany(
-                    it -> Flux.from(new RedisPublisher<>(decorate(commandSupplier, it), connection, dissolve)));
+                    it -> Flux.from(new RedisPublisher<>(decorate(commandSupplier, it), connection, dissolve, getScheduler())));
         }
 
-        return Flux.from(new RedisPublisher<>(commandSupplier, connection, dissolve));
+        return Flux.from(new RedisPublisher<>(commandSupplier, connection, dissolve, getScheduler()));
     }
 
     private Mono<TraceContext> withTraceContext() {
@@ -402,10 +424,11 @@ public <T> Mono<T> createMono(Supplier<RedisCommand<K, V, T>> commandSupplier) {
         if (tracingEnabled) {
 
             return withTraceContext().flatMap(
-                    it -> Mono.from(new RedisPublisher<>(decorate(commandSupplier, it), connection, false)));
+                    it -> Mono.from(new RedisPublisher<>(decorate(commandSupplier, it), connection, false, getScheduler()
+                            .next())));
         }
 
-        return Mono.from(new RedisPublisher<>(commandSupplier, connection, false));
+        return Mono.from(new RedisPublisher<>(commandSupplier, connection, false, getScheduler().next()));
     }
 
     private <T> Supplier<RedisCommand<K, V, T>> decorate(Supplier<RedisCommand<K, V, T>> commandSupplier,
diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index aebf233c36..bef3bb694f 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -18,6 +18,7 @@
 import java.io.Serializable;
 
 import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * Client Options to control the behavior of {@link RedisClient}.
@@ -31,6 +32,7 @@ public class ClientOptions implements Serializable {
     public static final boolean DEFAULT_PING_BEFORE_ACTIVATE_CONNECTION = false;
     public static final boolean DEFAULT_AUTO_RECONNECT = true;
     public static final boolean DEFAULT_CANCEL_CMD_RECONNECT_FAIL = false;
+    public static final boolean DEFAULT_PUBLISH_ON_SCHEDULER = false;
     public static final boolean DEFAULT_SUSPEND_RECONNECT_PROTO_FAIL = false;
     public static final int DEFAULT_REQUEST_QUEUE_SIZE = Integer.MAX_VALUE;
     public static final DisconnectedBehavior DEFAULT_DISCONNECTED_BEHAVIOR = DisconnectedBehavior.DEFAULT;
@@ -42,6 +44,7 @@ public class ClientOptions implements Serializable {
     private final boolean pingBeforeActivateConnection;
     private final boolean autoReconnect;
     private final boolean cancelCommandsOnReconnectFailure;
+    private final boolean publishOnScheduler;
     private final boolean suspendReconnectOnProtocolFailure;
     private final int requestQueueSize;
     private final DisconnectedBehavior disconnectedBehavior;
@@ -54,6 +57,7 @@ public class ClientOptions implements Serializable {
     protected ClientOptions(Builder builder) {
         this.pingBeforeActivateConnection = builder.pingBeforeActivateConnection;
         this.cancelCommandsOnReconnectFailure = builder.cancelCommandsOnReconnectFailure;
+        this.publishOnScheduler = builder.publishOnScheduler;
         this.autoReconnect = builder.autoReconnect;
         this.suspendReconnectOnProtocolFailure = builder.suspendReconnectOnProtocolFailure;
         this.requestQueueSize = builder.requestQueueSize;
@@ -69,6 +73,7 @@ protected ClientOptions(ClientOptions original) {
         this.pingBeforeActivateConnection = original.isPingBeforeActivateConnection();
         this.autoReconnect = original.isAutoReconnect();
         this.cancelCommandsOnReconnectFailure = original.isCancelCommandsOnReconnectFailure();
+        this.publishOnScheduler = original.isPublishOnScheduler();
         this.suspendReconnectOnProtocolFailure = original.isSuspendReconnectOnProtocolFailure();
         this.requestQueueSize = original.getRequestQueueSize();
         this.disconnectedBehavior = original.getDisconnectedBehavior();
@@ -115,6 +120,7 @@ public static class Builder {
         private boolean pingBeforeActivateConnection = DEFAULT_PING_BEFORE_ACTIVATE_CONNECTION;
         private boolean autoReconnect = DEFAULT_AUTO_RECONNECT;
         private boolean cancelCommandsOnReconnectFailure = DEFAULT_CANCEL_CMD_RECONNECT_FAIL;
+        private boolean publishOnScheduler = DEFAULT_PUBLISH_ON_SCHEDULER;
         private boolean suspendReconnectOnProtocolFailure = DEFAULT_SUSPEND_RECONNECT_PROTO_FAIL;
         private int requestQueueSize = DEFAULT_REQUEST_QUEUE_SIZE;
         private DisconnectedBehavior disconnectedBehavior = DEFAULT_DISCONNECTED_BEHAVIOR;
@@ -174,6 +180,26 @@ public Builder cancelCommandsOnReconnectFailure(boolean cancelCommandsOnReconnec
             return this;
         }
 
+        /**
+         * Use a dedicated {@link reactor.core.scheduler.Scheduler} to emit reactive data signals. Enabling this option can be
+         * useful for reactive sequences that require a significant amount of processing with a single/a few Redis connections.
+         * <p/>
+         * A single Redis connection operates on a single thread. Operations that require a significant amount of processing can
+         * lead to a single-threaded-like behavior for all consumers of the Redis connection. When enabled, data signals will be
+         * emitted using a different thread served by {@link ClientResources#eventExecutorGroup()}. Defaults to {@literal false}
+         * , see {@link #DEFAULT_PUBLISH_ON_SCHEDULER}.
+         *
+         * @param publishOnScheduler true/false
+         * @return {@code this}
+         * @since 5.2
+         * @see org.reactivestreams.Subscriber#onNext(Object)
+         * @see ClientResources#eventExecutorGroup()
+         */
+        public Builder publishOnScheduler(boolean publishOnScheduler) {
+            this.publishOnScheduler = publishOnScheduler;
+            return this;
+        }
+
         /**
          * Set the per-connection request queue size. The command invocation will lead to a {@link RedisException} if the queue
          * size is exceeded. Setting the {@code requestQueueSize} to a lower value will lead earlier to exceptions during
@@ -321,6 +347,22 @@ public boolean isCancelCommandsOnReconnectFailure() {
         return cancelCommandsOnReconnectFailure;
     }
 
+    /**
+     * Use a dedicated {@link reactor.core.scheduler.Scheduler} to emit reactive data signals. Enabling this option can be
+     * useful for reactive sequences that require a significant amount of processing with a single/a few Redis connections.
+     * <p/>
+     * A single Redis connection operates on a single thread. Operations that require a significant amount of processing can
+     * lead to a single-threaded-like behavior for all consumers of the Redis connection. When enabled, data signals will be
+     * emitted using a different thread served by {@link ClientResources#eventExecutorGroup()}. Defaults to {@literal false} ,
+     * see {@link #DEFAULT_PUBLISH_ON_SCHEDULER}.
+     *
+     * @return {@literal true} to use a dedicated {@link reactor.core.scheduler.Scheduler}
+     * @since 5.2
+     */
+    public boolean isPublishOnScheduler() {
+        return publishOnScheduler;
+    }
+
     /**
      * If this flag is {@literal true} the reconnect will be suspended on protocol errors. Protocol errors are errors while SSL
      * negotiation or when PING before connect fails.
diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index 6e5926e0ff..5146ce7617 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -18,6 +18,7 @@
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Queue;
+import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import java.util.concurrent.atomic.AtomicReference;
@@ -38,6 +39,8 @@
 import io.lettuce.core.protocol.CommandWrapper;
 import io.lettuce.core.protocol.DemandAware;
 import io.lettuce.core.protocol.RedisCommand;
+import io.netty.util.Recycler;
+import io.netty.util.concurrent.ImmediateEventExecutor;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -64,6 +67,7 @@ class RedisPublisher<K, V, T> implements Publisher<T> {
     private final AtomicReference<RedisCommand<K, V, T>> ref;
     private final StatefulConnection<K, V> connection;
     private final boolean dissolve;
+    private final Executor executor;
 
     /**
      * Creates a new {@link RedisPublisher} for a static command.
@@ -71,9 +75,11 @@ class RedisPublisher<K, V, T> implements Publisher<T> {
      * @param staticCommand static command, must not be {@literal null}.
      * @param connection the connection, must not be {@literal null}.
      * @param dissolve dissolve collections into particular elements.
+     * @param publishOn executor to use for publishOn signals.
      */
-    public RedisPublisher(RedisCommand<K, V, T> staticCommand, StatefulConnection<K, V> connection, boolean dissolve) {
-        this(() -> staticCommand, connection, dissolve);
+    public RedisPublisher(RedisCommand<K, V, T> staticCommand, StatefulConnection<K, V> connection, boolean dissolve,
+            Executor publishOn) {
+        this(() -> staticCommand, connection, dissolve, publishOn);
     }
 
     /**
@@ -82,15 +88,19 @@ public RedisPublisher(RedisCommand<K, V, T> staticCommand, StatefulConnection<K,
      * @param commandSupplier command supplier, must not be {@literal null}.
      * @param connection the connection, must not be {@literal null}.
      * @param dissolve dissolve collections into particular elements.
+     * @param publishOn executor to use for publishOn signals.
      */
-    public RedisPublisher(Supplier<RedisCommand<K, V, T>> commandSupplier, StatefulConnection<K, V> connection, boolean dissolve) {
+    public RedisPublisher(Supplier<RedisCommand<K, V, T>> commandSupplier, StatefulConnection<K, V> connection,
+            boolean dissolve, Executor publishOn) {
 
         LettuceAssert.notNull(commandSupplier, "CommandSupplier must not be null");
         LettuceAssert.notNull(connection, "StatefulConnection must not be null");
+        LettuceAssert.notNull(publishOn, "Executor must not be null");
 
         this.commandSupplier = commandSupplier;
         this.connection = connection;
         this.dissolve = dissolve;
+        this.executor = publishOn;
         this.ref = new AtomicReference<>(commandSupplier.get());
     }
 
@@ -112,7 +122,7 @@ public void subscribe(Subscriber<? super T> subscriber) {
             command = commandSupplier.get();
         }
 
-        RedisSubscription<T> redisSubscription = new RedisSubscription<>(connection, command, dissolve);
+        RedisSubscription<T> redisSubscription = new RedisSubscription<>(connection, command, dissolve, executor);
         redisSubscription.subscribe(subscriber);
     }
 
@@ -153,6 +163,7 @@ static class RedisSubscription<T> extends StreamingOutput.Subscriber<T> implemen
         final StatefulConnection<?, ?> connection;
         final RedisCommand<?, ?, T> command;
         final boolean dissolve;
+        private final Executor executor;
 
         // accessed via AtomicLongFieldUpdater
         @SuppressWarnings("unused")
@@ -166,17 +177,20 @@ static class RedisSubscription<T> extends StreamingOutput.Subscriber<T> implemen
 
         volatile boolean allDataRead = false;
 
-        volatile Subscriber<? super T> subscriber;
+        volatile RedisSubscriber<? super T> subscriber;
 
         @SuppressWarnings("unchecked")
-        RedisSubscription(StatefulConnection<?, ?> connection, RedisCommand<?, ?, T> command, boolean dissolve) {
+        RedisSubscription(StatefulConnection<?, ?> connection, RedisCommand<?, ?, T> command, boolean dissolve,
+                Executor executor) {
 
             LettuceAssert.notNull(connection, "Connection must not be null");
             LettuceAssert.notNull(command, "RedisCommand must not be null");
+            LettuceAssert.notNull(executor, "Executor must not be null");
 
             this.connection = connection;
             this.command = command;
             this.dissolve = dissolve;
+            this.executor = executor;
 
             if (command.getOutput() instanceof StreamingOutput<?>) {
                 StreamingOutput<T> streamingOutput = (StreamingOutput<T>) command.getOutput();
@@ -504,7 +518,7 @@ void subscribe(RedisSubscription<?> subscription, Subscriber<?> subscriber) {
 
                 if (subscription.changeState(this, NO_DEMAND)) {
 
-                    subscription.subscriber = (Subscriber) subscriber;
+                    subscription.subscriber = RedisSubscriber.create(subscriber, subscription.executor);
                     subscriber.onSubscribe(subscription);
                 } else {
                     throw new IllegalStateException(toString());
@@ -829,4 +843,240 @@ public void onNext(Collection<T> outputTarget, T t) {
             second.onNext(outputTarget, t);
         }
     }
+
+    /**
+     * Lettuce-specific interface.
+     *
+     * @param <T>
+     */
+    interface RedisSubscriber<T> extends CoreSubscriber<T> {
+
+        /**
+         * Create a new {@link RedisSubscriber}. Optimizes for immediate executor usage.
+         *
+         * @param delegate
+         * @param executor
+         * @param <T>
+         * @return
+         * @see ImmediateSubscriber
+         * @see PublishOnSubscriber
+         */
+        @SuppressWarnings({ "unchecked", "rawtypes" })
+        static <T> RedisSubscriber<T> create(Subscriber<?> delegate, Executor executor) {
+
+            if (executor == ImmediateEventExecutor.INSTANCE) {
+                return new ImmediateSubscriber(delegate);
+            }
+
+            return new PublishOnSubscriber(delegate, executor);
+        }
+    }
+
+    /**
+     * {@link RedisSubscriber} using immediate signal dispatch by calling directly {@link Subscriber} method.
+     *
+     * @param <T>
+     */
+    static class ImmediateSubscriber<T> implements RedisSubscriber<T> {
+
+        private final CoreSubscriber<T> delegate;
+
+        public ImmediateSubscriber(Subscriber<T> delegate) {
+            this.delegate = (CoreSubscriber) reactor.core.publisher.Operators.toCoreSubscriber(delegate);
+        }
+
+        @Override
+        public Context currentContext() {
+            return delegate.currentContext();
+        }
+
+        @Override
+        public void onSubscribe(Subscription s) {
+            delegate.onSubscribe(s);
+        }
+
+        @Override
+        public void onNext(T t) {
+            delegate.onNext(t);
+        }
+
+        @Override
+        public void onError(Throwable t) {
+            delegate.onError(t);
+        }
+
+        @Override
+        public void onComplete() {
+            delegate.onComplete();
+        }
+    }
+
+    /**
+     * {@link RedisSubscriber} dispatching subscriber signals on a {@link Executor}.
+     *
+     * @param <T>
+     */
+    static class PublishOnSubscriber<T> implements RedisSubscriber<T> {
+
+        private final CoreSubscriber<T> delegate;
+        private final Executor executor;
+
+        public PublishOnSubscriber(Subscriber<T> delegate, Executor executor) {
+            this.delegate = (CoreSubscriber) reactor.core.publisher.Operators.toCoreSubscriber(delegate);
+            this.executor = executor;
+        }
+
+        @Override
+        public Context currentContext() {
+            return delegate.currentContext();
+        }
+
+        @Override
+        public void onSubscribe(Subscription s) {
+            delegate.onSubscribe(s);
+        }
+
+        @Override
+        public void onNext(T t) {
+            executor.execute(OnNext.newInstance(t, delegate));
+        }
+
+        @Override
+        public void onError(Throwable t) {
+            executor.execute(OnComplete.newInstance(t, delegate));
+        }
+
+        @Override
+        public void onComplete() {
+            executor.execute(OnComplete.newInstance(delegate));
+        }
+    }
+
+    /**
+     * OnNext {@link Runnable}. This listener is pooled and must be {@link #recycle() recycled after usage}.
+     */
+    static class OnNext implements Runnable {
+
+        private static final Recycler<OnNext> RECYCLER = new Recycler<OnNext>() {
+            @Override
+            protected OnNext newObject(Handle<OnNext> handle) {
+                return new OnNext(handle);
+            }
+        };
+
+        private final Recycler.Handle<OnNext> handle;
+        private Object signal;
+        private Subscriber<Object> subscriber;
+
+        OnNext(Recycler.Handle<OnNext> handle) {
+            this.handle = handle;
+        }
+
+        /**
+         * Allocate a new instance.
+         *
+         * @return
+         * @see Subscriber#onNext(Object)
+         */
+        static OnNext newInstance(Object signal, Subscriber<?> subscriber) {
+
+            OnNext entry = RECYCLER.get();
+
+            entry.signal = signal;
+            entry.subscriber = (Subscriber) subscriber;
+
+            return entry;
+        }
+
+        @Override
+        public void run() {
+            try {
+                subscriber.onNext(signal);
+            } finally {
+                recycle();
+            }
+        }
+
+        private void recycle() {
+
+            this.signal = null;
+            this.subscriber = null;
+
+            handle.recycle(this);
+        }
+    }
+
+    /**
+     * OnComplete {@link Runnable}. This listener is pooled and must be {@link #recycle() recycled after usage}.
+     */
+    static class OnComplete implements Runnable {
+
+        private static final Recycler<OnComplete> RECYCLER = new Recycler<OnComplete>() {
+            @Override
+            protected OnComplete newObject(Handle<OnComplete> handle) {
+                return new OnComplete(handle);
+            }
+        };
+
+        private final Recycler.Handle<OnComplete> handle;
+        private Throwable signal;
+        private Subscriber<?> subscriber;
+
+        OnComplete(Recycler.Handle<OnComplete> handle) {
+            this.handle = handle;
+        }
+
+        /**
+         * Allocate a new instance.
+         *
+         * @return
+         * @see Subscriber#onError(Throwable)
+         */
+        static OnComplete newInstance(Throwable signal, Subscriber<?> subscriber) {
+
+            OnComplete entry = RECYCLER.get();
+
+            entry.signal = signal;
+            entry.subscriber = subscriber;
+
+            return entry;
+        }
+
+        /**
+         * Allocate a new instance.
+         *
+         * @return
+         * @see Subscriber#onComplete()
+         */
+        static OnComplete newInstance(Subscriber<?> subscriber) {
+
+            OnComplete entry = RECYCLER.get();
+
+            entry.signal = null;
+            entry.subscriber = subscriber;
+
+            return entry;
+        }
+
+        @Override
+        public void run() {
+            try {
+                if (signal != null) {
+                    subscriber.onError(signal);
+                } else {
+                    subscriber.onComplete();
+                }
+            } finally {
+                recycle();
+            }
+        }
+
+        private void recycle() {
+
+            this.signal = null;
+            this.subscriber = null;
+
+            handle.recycle(this);
+        }
+    }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index 967200f299..8e74315253 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -173,6 +173,12 @@ public Builder cancelCommandsOnReconnectFailure(boolean cancelCommandsOnReconnec
             return this;
         }
 
+        @Override
+        public ClientOptions.Builder publishOnScheduler(boolean publishOnScheduler) {
+            super.publishOnScheduler(publishOnScheduler);
+            return this;
+        }
+
         @Override
         public Builder requestQueueSize(int requestQueueSize) {
             super.requestQueueSize(requestQueueSize);
diff --git a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java
index 8b86cc6f91..07c2d2410d 100644
--- a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java
+++ b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java
@@ -41,6 +41,7 @@
 import io.netty.buffer.Unpooled;
 import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.channel.local.LocalAddress;
+import io.netty.util.concurrent.ImmediateEventExecutor;
 
 /**
  * @author Mark Paluch
@@ -86,7 +87,8 @@ void writeCommand() throws Exception {
 
         Command<String, String, List<String>> lrange = new Command<>(CommandType.LRANGE,
                 new ValueListOutput<>(StringCodec.UTF8));
-        RedisPublisher<String, String, String> publisher = new RedisPublisher<>((Command) lrange, statefulConnection, true);
+        RedisPublisher<String, String, String> publisher = new RedisPublisher<>((Command) lrange, statefulConnection, true,
+                ImmediateEventExecutor.INSTANCE);
 
         CountDownLatch pressureArrived = new CountDownLatch(1);
         CountDownLatch buildPressure = new CountDownLatch(1);
@@ -138,7 +140,8 @@ void writeCommandAndCancelInTheMiddle() throws Exception {
 
         Command<String, String, List<String>> lrange = new Command<>(CommandType.LRANGE,
                 new ValueListOutput<>(StringCodec.UTF8));
-        RedisPublisher<String, String, String> publisher = new RedisPublisher<>((Command) lrange, statefulConnection, true);
+        RedisPublisher<String, String, String> publisher = new RedisPublisher<>(lrange, statefulConnection, true,
+                ImmediateEventExecutor.INSTANCE);
 
         CountDownLatch pressureArrived = new CountDownLatch(1);
         CountDownLatch buildPressure = new CountDownLatch(1);
diff --git a/src/test/java/io/lettuce/core/TestRedisPublisher.java b/src/test/java/io/lettuce/core/TestRedisPublisher.java
index ee11412066..a28f0f3f7b 100644
--- a/src/test/java/io/lettuce/core/TestRedisPublisher.java
+++ b/src/test/java/io/lettuce/core/TestRedisPublisher.java
@@ -19,6 +19,7 @@
 
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.protocol.RedisCommand;
+import io.netty.util.concurrent.ImmediateEventExecutor;
 
 /**
  * @author Mark Paluch
@@ -26,11 +27,11 @@
 public class TestRedisPublisher<K, V, T> extends RedisPublisher<K, V, T> {
 
     public TestRedisPublisher(RedisCommand<K, V, T> staticCommand, StatefulConnection<K, V> connection, boolean dissolve) {
-        super(staticCommand, connection, dissolve);
+        super(staticCommand, connection, dissolve, ImmediateEventExecutor.INSTANCE);
     }
 
     public TestRedisPublisher(Supplier<RedisCommand<K, V, T>> redisCommandSupplier, StatefulConnection<K, V> connection,
             boolean dissolve) {
-        super(redisCommandSupplier, connection, dissolve);
+        super(redisCommandSupplier, connection, dissolve, ImmediateEventExecutor.INSTANCE);
     }
 }

From c98108dd7fbe9bee8702e468efff4b085a976374 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 1 Jan 2019 01:24:06 +0100
Subject: [PATCH 577/808] Extend year range to 2019 in license headers #950

---
 .../java/io/lettuce/core/AbstractRedisAsyncCommands.java  | 2 +-
 src/main/java/io/lettuce/core/AbstractRedisClient.java    | 2 +-
 .../io/lettuce/core/AbstractRedisReactiveCommands.java    | 2 +-
 src/main/java/io/lettuce/core/BitFieldArgs.java           | 2 +-
 src/main/java/io/lettuce/core/ChannelGroupListener.java   | 2 +-
 src/main/java/io/lettuce/core/ClientOptions.java          | 2 +-
 src/main/java/io/lettuce/core/CloseEvents.java            | 2 +-
 src/main/java/io/lettuce/core/CompositeArgument.java      | 2 +-
 src/main/java/io/lettuce/core/ConnectionBuilder.java      | 2 +-
 src/main/java/io/lettuce/core/ConnectionEventTrigger.java | 2 +-
 src/main/java/io/lettuce/core/ConnectionEvents.java       | 2 +-
 src/main/java/io/lettuce/core/ConnectionFuture.java       | 2 +-
 src/main/java/io/lettuce/core/ConnectionId.java           | 2 +-
 src/main/java/io/lettuce/core/ConnectionPoint.java        | 2 +-
 src/main/java/io/lettuce/core/Consumer.java               | 2 +-
 .../java/io/lettuce/core/DefaultConnectionFuture.java     | 2 +-
 src/main/java/io/lettuce/core/EpollProvider.java          | 2 +-
 src/main/java/io/lettuce/core/ExceptionFactory.java       | 2 +-
 .../java/io/lettuce/core/FutureSyncInvocationHandler.java | 2 +-
 src/main/java/io/lettuce/core/GeoArgs.java                | 2 +-
 src/main/java/io/lettuce/core/GeoCoordinates.java         | 2 +-
 src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java     | 2 +-
 src/main/java/io/lettuce/core/GeoWithin.java              | 2 +-
 src/main/java/io/lettuce/core/JavaRuntime.java            | 2 +-
 src/main/java/io/lettuce/core/KeyScanCursor.java          | 2 +-
 src/main/java/io/lettuce/core/KeyValue.java               | 2 +-
 src/main/java/io/lettuce/core/KillArgs.java               | 2 +-
 src/main/java/io/lettuce/core/KqueueProvider.java         | 2 +-
 src/main/java/io/lettuce/core/LettuceFutures.java         | 2 +-
 src/main/java/io/lettuce/core/LettuceStrings.java         | 2 +-
 src/main/java/io/lettuce/core/Limit.java                  | 2 +-
 src/main/java/io/lettuce/core/MapScanCursor.java          | 2 +-
 src/main/java/io/lettuce/core/MigrateArgs.java            | 2 +-
 src/main/java/io/lettuce/core/Operators.java              | 2 +-
 .../java/io/lettuce/core/PlainChannelInitializer.java     | 2 +-
 src/main/java/io/lettuce/core/Range.java                  | 2 +-
 src/main/java/io/lettuce/core/ReadFrom.java               | 2 +-
 src/main/java/io/lettuce/core/ReadFromImpl.java           | 2 +-
 src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java | 2 +-
 src/main/java/io/lettuce/core/RedisBusyException.java     | 2 +-
 src/main/java/io/lettuce/core/RedisChannelHandler.java    | 2 +-
 .../java/io/lettuce/core/RedisChannelInitializer.java     | 2 +-
 .../java/io/lettuce/core/RedisChannelInitializerImpl.java | 2 +-
 src/main/java/io/lettuce/core/RedisChannelWriter.java     | 4 ++--
 src/main/java/io/lettuce/core/RedisClient.java            | 2 +-
 src/main/java/io/lettuce/core/RedisCommandBuilder.java    | 2 +-
 .../io/lettuce/core/RedisCommandExecutionException.java   | 2 +-
 .../io/lettuce/core/RedisCommandInterruptedException.java | 2 +-
 .../io/lettuce/core/RedisCommandTimeoutException.java     | 2 +-
 .../java/io/lettuce/core/RedisConnectionException.java    | 2 +-
 .../java/io/lettuce/core/RedisConnectionStateAdapter.java | 2 +-
 .../io/lettuce/core/RedisConnectionStateListener.java     | 2 +-
 src/main/java/io/lettuce/core/RedisException.java         | 2 +-
 src/main/java/io/lettuce/core/RedisFuture.java            | 2 +-
 src/main/java/io/lettuce/core/RedisLoadingException.java  | 2 +-
 src/main/java/io/lettuce/core/RedisNoScriptException.java | 2 +-
 src/main/java/io/lettuce/core/RedisPublisher.java         | 2 +-
 .../java/io/lettuce/core/RedisReactiveCommandsImpl.java   | 2 +-
 src/main/java/io/lettuce/core/RedisURI.java               | 2 +-
 src/main/java/io/lettuce/core/RestoreArgs.java            | 2 +-
 src/main/java/io/lettuce/core/ScanArgs.java               | 2 +-
 src/main/java/io/lettuce/core/ScanCursor.java             | 2 +-
 src/main/java/io/lettuce/core/ScanIterator.java           | 2 +-
 src/main/java/io/lettuce/core/ScanStream.java             | 2 +-
 src/main/java/io/lettuce/core/ScoredValue.java            | 2 +-
 src/main/java/io/lettuce/core/ScoredValueScanCursor.java  | 2 +-
 src/main/java/io/lettuce/core/ScriptOutputType.java       | 2 +-
 src/main/java/io/lettuce/core/SetArgs.java                | 2 +-
 src/main/java/io/lettuce/core/SocketOptions.java          | 2 +-
 src/main/java/io/lettuce/core/SortArgs.java               | 2 +-
 src/main/java/io/lettuce/core/SslConnectionBuilder.java   | 2 +-
 src/main/java/io/lettuce/core/SslOptions.java             | 2 +-
 .../java/io/lettuce/core/StatefulRedisConnectionImpl.java | 2 +-
 src/main/java/io/lettuce/core/StreamMessage.java          | 2 +-
 src/main/java/io/lettuce/core/StreamScanCursor.java       | 2 +-
 src/main/java/io/lettuce/core/TimeoutOptions.java         | 2 +-
 src/main/java/io/lettuce/core/TransactionResult.java      | 2 +-
 src/main/java/io/lettuce/core/Transports.java             | 2 +-
 src/main/java/io/lettuce/core/UnblockType.java            | 2 +-
 src/main/java/io/lettuce/core/Value.java                  | 2 +-
 src/main/java/io/lettuce/core/ValueScanCursor.java        | 2 +-
 src/main/java/io/lettuce/core/XAddArgs.java               | 2 +-
 src/main/java/io/lettuce/core/XClaimArgs.java             | 2 +-
 src/main/java/io/lettuce/core/XGroupCreateArgs.java       | 2 +-
 src/main/java/io/lettuce/core/XReadArgs.java              | 2 +-
 src/main/java/io/lettuce/core/ZAddArgs.java               | 2 +-
 src/main/java/io/lettuce/core/ZStoreArgs.java             | 2 +-
 src/main/java/io/lettuce/core/api/StatefulConnection.java | 4 ++--
 .../java/io/lettuce/core/api/StatefulRedisConnection.java | 2 +-
 .../io/lettuce/core/api/async/BaseRedisAsyncCommands.java | 2 +-
 .../io/lettuce/core/api/async/RedisAsyncCommands.java     | 2 +-
 .../io/lettuce/core/api/async/RedisGeoAsyncCommands.java  | 2 +-
 .../io/lettuce/core/api/async/RedisHLLAsyncCommands.java  | 2 +-
 .../io/lettuce/core/api/async/RedisHashAsyncCommands.java | 2 +-
 .../io/lettuce/core/api/async/RedisKeyAsyncCommands.java  | 2 +-
 .../io/lettuce/core/api/async/RedisListAsyncCommands.java | 2 +-
 .../core/api/async/RedisScriptingAsyncCommands.java       | 2 +-
 .../lettuce/core/api/async/RedisServerAsyncCommands.java  | 2 +-
 .../io/lettuce/core/api/async/RedisSetAsyncCommands.java  | 2 +-
 .../core/api/async/RedisSortedSetAsyncCommands.java       | 2 +-
 .../lettuce/core/api/async/RedisStreamAsyncCommands.java  | 2 +-
 .../lettuce/core/api/async/RedisStringAsyncCommands.java  | 2 +-
 .../core/api/async/RedisTransactionalAsyncCommands.java   | 2 +-
 .../core/api/reactive/BaseRedisReactiveCommands.java      | 2 +-
 .../core/api/reactive/RedisGeoReactiveCommands.java       | 2 +-
 .../core/api/reactive/RedisHLLReactiveCommands.java       | 2 +-
 .../core/api/reactive/RedisHashReactiveCommands.java      | 2 +-
 .../core/api/reactive/RedisKeyReactiveCommands.java       | 2 +-
 .../core/api/reactive/RedisListReactiveCommands.java      | 2 +-
 .../lettuce/core/api/reactive/RedisReactiveCommands.java  | 2 +-
 .../core/api/reactive/RedisScriptingReactiveCommands.java | 2 +-
 .../core/api/reactive/RedisServerReactiveCommands.java    | 2 +-
 .../core/api/reactive/RedisSetReactiveCommands.java       | 2 +-
 .../core/api/reactive/RedisSortedSetReactiveCommands.java | 2 +-
 .../core/api/reactive/RedisStreamReactiveCommands.java    | 2 +-
 .../core/api/reactive/RedisStringReactiveCommands.java    | 2 +-
 .../api/reactive/RedisTransactionalReactiveCommands.java  | 2 +-
 .../java/io/lettuce/core/api/sync/BaseRedisCommands.java  | 2 +-
 src/main/java/io/lettuce/core/api/sync/RedisCommands.java | 2 +-
 .../java/io/lettuce/core/api/sync/RedisGeoCommands.java   | 2 +-
 .../java/io/lettuce/core/api/sync/RedisHLLCommands.java   | 2 +-
 .../java/io/lettuce/core/api/sync/RedisHashCommands.java  | 2 +-
 .../java/io/lettuce/core/api/sync/RedisKeyCommands.java   | 2 +-
 .../java/io/lettuce/core/api/sync/RedisListCommands.java  | 2 +-
 .../io/lettuce/core/api/sync/RedisScriptingCommands.java  | 2 +-
 .../io/lettuce/core/api/sync/RedisServerCommands.java     | 2 +-
 .../java/io/lettuce/core/api/sync/RedisSetCommands.java   | 2 +-
 .../io/lettuce/core/api/sync/RedisSortedSetCommands.java  | 2 +-
 .../io/lettuce/core/api/sync/RedisStreamCommands.java     | 2 +-
 .../io/lettuce/core/api/sync/RedisStringCommands.java     | 2 +-
 .../lettuce/core/api/sync/RedisTransactionalCommands.java | 2 +-
 .../cluster/AbstractClusterNodeConnectionFactory.java     | 2 +-
 .../io/lettuce/core/cluster/AbstractNodeSelection.java    | 2 +-
 .../core/cluster/AsyncClusterConnectionProvider.java      | 2 +-
 .../java/io/lettuce/core/cluster/AsyncExecutionsImpl.java | 2 +-
 .../io/lettuce/core/cluster/ClusterClientOptions.java     | 2 +-
 src/main/java/io/lettuce/core/cluster/ClusterCommand.java | 2 +-
 .../lettuce/core/cluster/ClusterConnectionProvider.java   | 2 +-
 .../core/cluster/ClusterDistributionChannelWriter.java    | 2 +-
 .../io/lettuce/core/cluster/ClusterEventListener.java     | 2 +-
 .../core/cluster/ClusterFutureSyncInvocationHandler.java  | 2 +-
 .../core/cluster/ClusterNodeConnectionFactory.java        | 2 +-
 .../java/io/lettuce/core/cluster/ClusterNodeEndpoint.java | 2 +-
 .../core/cluster/ClusterPubSubConnectionProvider.java     | 2 +-
 .../java/io/lettuce/core/cluster/ClusterScanSupport.java  | 2 +-
 .../core/cluster/ClusterTopologyRefreshOptions.java       | 2 +-
 .../core/cluster/ClusterTopologyRefreshScheduler.java     | 2 +-
 .../io/lettuce/core/cluster/DynamicNodeSelection.java     | 2 +-
 .../java/io/lettuce/core/cluster/MultiNodeExecution.java  | 2 +-
 .../core/cluster/NodeSelectionInvocationHandler.java      | 2 +-
 .../java/io/lettuce/core/cluster/PartitionAccessor.java   | 2 +-
 .../java/io/lettuce/core/cluster/PartitionException.java  | 2 +-
 .../lettuce/core/cluster/PartitionSelectorException.java  | 2 +-
 .../java/io/lettuce/core/cluster/PartitionsConsensus.java | 2 +-
 .../io/lettuce/core/cluster/PartitionsConsensusImpl.java  | 2 +-
 .../io/lettuce/core/cluster/PipelinedRedisFuture.java     | 2 +-
 .../core/cluster/PooledClusterConnectionProvider.java     | 2 +-
 .../io/lettuce/core/cluster/PubSubClusterEndpoint.java    | 2 +-
 .../io/lettuce/core/cluster/ReactiveExecutionsImpl.java   | 2 +-
 .../java/io/lettuce/core/cluster/ReadOnlyCommands.java    | 2 +-
 .../io/lettuce/core/cluster/ReconnectEventListener.java   | 2 +-
 .../cluster/RedisAdvancedClusterAsyncCommandsImpl.java    | 2 +-
 .../cluster/RedisAdvancedClusterReactiveCommandsImpl.java | 2 +-
 .../java/io/lettuce/core/cluster/RedisClusterClient.java  | 2 +-
 .../core/cluster/RedisClusterPubSubAsyncCommandsImpl.java | 2 +-
 .../cluster/RedisClusterPubSubReactiveCommandsImpl.java   | 2 +-
 .../java/io/lettuce/core/cluster/RedisClusterURIUtil.java | 2 +-
 src/main/java/io/lettuce/core/cluster/RedisState.java     | 2 +-
 src/main/java/io/lettuce/core/cluster/RoundRobin.java     | 2 +-
 .../core/cluster/RoundRobinSocketAddressSupplier.java     | 2 +-
 src/main/java/io/lettuce/core/cluster/SlotHash.java       | 2 +-
 .../core/cluster/StatefulRedisClusterConnectionImpl.java  | 2 +-
 .../cluster/StatefulRedisClusterPubSubConnectionImpl.java | 2 +-
 .../java/io/lettuce/core/cluster/StaticNodeSelection.java | 2 +-
 .../java/io/lettuce/core/cluster/SyncExecutionsImpl.java  | 2 +-
 .../lettuce/core/cluster/UnknownPartitionException.java   | 2 +-
 .../io/lettuce/core/cluster/api/NodeSelectionSupport.java | 2 +-
 .../core/cluster/api/StatefulRedisClusterConnection.java  | 2 +-
 .../lettuce/core/cluster/api/async/AsyncExecutions.java   | 2 +-
 .../core/cluster/api/async/AsyncNodeSelection.java        | 2 +-
 .../cluster/api/async/BaseNodeSelectionAsyncCommands.java | 2 +-
 .../cluster/api/async/NodeSelectionAsyncCommands.java     | 2 +-
 .../cluster/api/async/NodeSelectionGeoAsyncCommands.java  | 2 +-
 .../cluster/api/async/NodeSelectionHLLAsyncCommands.java  | 2 +-
 .../cluster/api/async/NodeSelectionHashAsyncCommands.java | 2 +-
 .../cluster/api/async/NodeSelectionKeyAsyncCommands.java  | 2 +-
 .../cluster/api/async/NodeSelectionListAsyncCommands.java | 2 +-
 .../api/async/NodeSelectionScriptingAsyncCommands.java    | 2 +-
 .../api/async/NodeSelectionServerAsyncCommands.java       | 2 +-
 .../cluster/api/async/NodeSelectionSetAsyncCommands.java  | 2 +-
 .../api/async/NodeSelectionSortedSetAsyncCommands.java    | 2 +-
 .../api/async/NodeSelectionStreamAsyncCommands.java       | 2 +-
 .../api/async/NodeSelectionStringAsyncCommands.java       | 2 +-
 .../api/async/RedisAdvancedClusterAsyncCommands.java      | 2 +-
 .../core/cluster/api/async/RedisClusterAsyncCommands.java | 2 +-
 .../core/cluster/api/reactive/ReactiveExecutions.java     | 2 +-
 .../reactive/RedisAdvancedClusterReactiveCommands.java    | 2 +-
 .../api/reactive/RedisClusterReactiveCommands.java        | 2 +-
 .../core/cluster/api/sync/BaseNodeSelectionCommands.java  | 2 +-
 .../java/io/lettuce/core/cluster/api/sync/Executions.java | 2 +-
 .../io/lettuce/core/cluster/api/sync/NodeSelection.java   | 2 +-
 .../core/cluster/api/sync/NodeSelectionCommands.java      | 2 +-
 .../core/cluster/api/sync/NodeSelectionGeoCommands.java   | 2 +-
 .../core/cluster/api/sync/NodeSelectionHLLCommands.java   | 2 +-
 .../core/cluster/api/sync/NodeSelectionHashCommands.java  | 2 +-
 .../core/cluster/api/sync/NodeSelectionKeyCommands.java   | 2 +-
 .../core/cluster/api/sync/NodeSelectionListCommands.java  | 2 +-
 .../cluster/api/sync/NodeSelectionScriptingCommands.java  | 2 +-
 .../cluster/api/sync/NodeSelectionServerCommands.java     | 2 +-
 .../core/cluster/api/sync/NodeSelectionSetCommands.java   | 2 +-
 .../cluster/api/sync/NodeSelectionSortedSetCommands.java  | 2 +-
 .../cluster/api/sync/NodeSelectionStreamCommands.java     | 2 +-
 .../cluster/api/sync/NodeSelectionStringCommands.java     | 2 +-
 .../cluster/api/sync/RedisAdvancedClusterCommands.java    | 2 +-
 .../core/cluster/api/sync/RedisClusterCommands.java       | 2 +-
 .../core/cluster/event/ClusterTopologyChangedEvent.java   | 2 +-
 .../cluster/models/partitions/ClusterPartitionParser.java | 2 +-
 .../core/cluster/models/partitions/Partitions.java        | 2 +-
 .../core/cluster/models/partitions/RedisClusterNode.java  | 2 +-
 .../core/cluster/models/slots/ClusterSlotRange.java       | 2 +-
 .../core/cluster/models/slots/ClusterSlotsParser.java     | 2 +-
 .../core/cluster/pubsub/RedisClusterPubSubAdapter.java    | 2 +-
 .../core/cluster/pubsub/RedisClusterPubSubListener.java   | 2 +-
 .../pubsub/StatefulRedisClusterPubSubConnection.java      | 2 +-
 .../api/async/NodeSelectionPubSubAsyncCommands.java       | 2 +-
 .../pubsub/api/async/PubSubAsyncNodeSelection.java        | 2 +-
 .../pubsub/api/async/RedisClusterPubSubAsyncCommands.java | 2 +-
 .../api/reactive/NodeSelectionPubSubReactiveCommands.java | 2 +-
 .../pubsub/api/reactive/PubSubReactiveNodeSelection.java  | 2 +-
 .../api/reactive/RedisClusterPubSubReactiveCommands.java  | 2 +-
 .../pubsub/api/sync/NodeSelectionPubSubCommands.java      | 2 +-
 .../core/cluster/pubsub/api/sync/PubSubNodeSelection.java | 2 +-
 .../pubsub/api/sync/RedisClusterPubSubCommands.java       | 2 +-
 .../lettuce/core/cluster/topology/AsyncConnections.java   | 2 +-
 .../core/cluster/topology/ClusterTopologyRefresh.java     | 2 +-
 .../io/lettuce/core/cluster/topology/Connections.java     | 2 +-
 .../core/cluster/topology/NodeConnectionFactory.java      | 2 +-
 .../lettuce/core/cluster/topology/NodeTopologyView.java   | 2 +-
 .../lettuce/core/cluster/topology/NodeTopologyViews.java  | 2 +-
 .../core/cluster/topology/RedisClusterNodeSnapshot.java   | 2 +-
 .../io/lettuce/core/cluster/topology/RefreshFutures.java  | 2 +-
 .../java/io/lettuce/core/cluster/topology/Requests.java   | 2 +-
 .../lettuce/core/cluster/topology/TimedAsyncCommand.java  | 2 +-
 .../core/cluster/topology/TopologyComparators.java        | 2 +-
 src/main/java/io/lettuce/core/codec/Base16.java           | 2 +-
 src/main/java/io/lettuce/core/codec/ByteArrayCodec.java   | 2 +-
 .../java/io/lettuce/core/codec/ByteBufferInputStream.java | 2 +-
 src/main/java/io/lettuce/core/codec/CRC16.java            | 2 +-
 src/main/java/io/lettuce/core/codec/CompressionCodec.java | 2 +-
 src/main/java/io/lettuce/core/codec/RedisCodec.java       | 2 +-
 src/main/java/io/lettuce/core/codec/StringCodec.java      | 2 +-
 src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java | 2 +-
 src/main/java/io/lettuce/core/codec/Utf8StringCodec.java  | 2 +-
 .../io/lettuce/core/dynamic/AsyncExecutableCommand.java   | 2 +-
 .../dynamic/AsyncExecutableCommandLookupStrategy.java     | 2 +-
 .../io/lettuce/core/dynamic/BatchExecutableCommand.java   | 2 +-
 .../dynamic/BatchExecutableCommandLookupStrategy.java     | 2 +-
 src/main/java/io/lettuce/core/dynamic/BatchTasks.java     | 2 +-
 src/main/java/io/lettuce/core/dynamic/Batcher.java        | 2 +-
 .../core/dynamic/CodecAwareMethodParametersAccessor.java  | 2 +-
 .../io/lettuce/core/dynamic/CommandCreationException.java | 2 +-
 src/main/java/io/lettuce/core/dynamic/CommandFactory.java | 2 +-
 .../io/lettuce/core/dynamic/CommandFactoryResolver.java   | 2 +-
 src/main/java/io/lettuce/core/dynamic/CommandMethod.java  | 2 +-
 .../core/dynamic/CommandMethodSyntaxException.java        | 2 +-
 .../io/lettuce/core/dynamic/CommandMethodVerifier.java    | 2 +-
 .../core/dynamic/CommandSegmentCommandFactory.java        | 2 +-
 src/main/java/io/lettuce/core/dynamic/Commands.java       | 2 +-
 .../java/io/lettuce/core/dynamic/ConversionService.java   | 2 +-
 .../java/io/lettuce/core/dynamic/ConvertingCommand.java   | 2 +-
 .../io/lettuce/core/dynamic/DeclaredCommandMethod.java    | 2 +-
 .../core/dynamic/DefaultCommandMethodVerifier.java        | 2 +-
 .../core/dynamic/DefaultMethodParametersAccessor.java     | 2 +-
 .../core/dynamic/DefaultRedisCommandsMetadata.java        | 2 +-
 .../java/io/lettuce/core/dynamic/ExecutableCommand.java   | 2 +-
 .../core/dynamic/ExecutableCommandLookupStrategy.java     | 2 +-
 .../dynamic/ExecutableCommandLookupStrategySupport.java   | 2 +-
 .../java/io/lettuce/core/dynamic/ParameterBinder.java     | 2 +-
 .../dynamic/ReactiveCommandSegmentCommandFactory.java     | 2 +-
 .../lettuce/core/dynamic/ReactiveExecutableCommand.java   | 2 +-
 .../dynamic/ReactiveExecutableCommandLookupStrategy.java  | 2 +-
 .../io/lettuce/core/dynamic/ReactiveTypeAdapters.java     | 2 +-
 src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java  | 2 +-
 .../java/io/lettuce/core/dynamic/RedisCommandFactory.java | 2 +-
 .../io/lettuce/core/dynamic/RedisCommandsMetadata.java    | 2 +-
 src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java  | 2 +-
 .../java/io/lettuce/core/dynamic/annotation/Command.java  | 2 +-
 .../io/lettuce/core/dynamic/annotation/CommandNaming.java | 2 +-
 src/main/java/io/lettuce/core/dynamic/annotation/Key.java | 2 +-
 .../java/io/lettuce/core/dynamic/annotation/Param.java    | 2 +-
 .../java/io/lettuce/core/dynamic/annotation/Value.java    | 2 +-
 .../io/lettuce/core/dynamic/batch/BatchException.java     | 2 +-
 .../java/io/lettuce/core/dynamic/batch/BatchExecutor.java | 2 +-
 .../java/io/lettuce/core/dynamic/batch/BatchSize.java     | 2 +-
 .../io/lettuce/core/dynamic/batch/CommandBatching.java    | 2 +-
 .../core/dynamic/codec/AnnotationRedisCodecResolver.java  | 2 +-
 .../io/lettuce/core/dynamic/codec/RedisCodecResolver.java | 2 +-
 src/main/java/io/lettuce/core/dynamic/domain/Timeout.java | 2 +-
 .../intercept/DefaultMethodInvokingInterceptor.java       | 2 +-
 .../core/dynamic/intercept/InvocationProxyFactory.java    | 2 +-
 .../core/dynamic/intercept/InvocationTargetProvider.java  | 2 +-
 .../lettuce/core/dynamic/intercept/MethodInterceptor.java | 2 +-
 .../core/dynamic/intercept/MethodInterceptorChain.java    | 2 +-
 .../lettuce/core/dynamic/intercept/MethodInvocation.java  | 2 +-
 .../dynamic/output/CodecAwareOutputFactoryResolver.java   | 2 +-
 .../lettuce/core/dynamic/output/CommandOutputFactory.java | 2 +-
 .../core/dynamic/output/CommandOutputFactoryResolver.java | 2 +-
 .../core/dynamic/output/CommandOutputResolverSupport.java | 2 +-
 .../io/lettuce/core/dynamic/output/OutputRegistry.java    | 2 +-
 .../OutputRegistryCommandOutputFactoryResolver.java       | 2 +-
 .../io/lettuce/core/dynamic/output/OutputSelector.java    | 2 +-
 .../java/io/lettuce/core/dynamic/output/OutputType.java   | 2 +-
 .../java/io/lettuce/core/dynamic/output/VoidOutput.java   | 2 +-
 .../dynamic/parameter/ExecutionSpecificParameters.java    | 2 +-
 .../core/dynamic/parameter/MethodParametersAccessor.java  | 2 +-
 .../java/io/lettuce/core/dynamic/parameter/Parameter.java | 2 +-
 .../io/lettuce/core/dynamic/parameter/Parameters.java     | 2 +-
 .../dynamic/segment/AnnotationCommandSegmentFactory.java  | 2 +-
 .../io/lettuce/core/dynamic/segment/CommandSegment.java   | 2 +-
 .../core/dynamic/segment/CommandSegmentFactory.java       | 2 +-
 .../io/lettuce/core/dynamic/segment/CommandSegments.java  | 2 +-
 .../support/AnnotationParameterNameDiscoverer.java        | 2 +-
 .../core/dynamic/support/ClassTypeInformation.java        | 2 +-
 .../dynamic/support/CompositeParameterNameDiscoverer.java | 2 +-
 .../core/dynamic/support/GenericArrayTypeInformation.java | 2 +-
 .../lettuce/core/dynamic/support/GenericTypeResolver.java | 2 +-
 .../io/lettuce/core/dynamic/support/MethodParameter.java  | 2 +-
 .../core/dynamic/support/ParameterNameDiscoverer.java     | 2 +-
 .../core/dynamic/support/ParametrizedTypeInformation.java | 2 +-
 .../dynamic/support/ParentTypeAwareTypeInformation.java   | 2 +-
 .../io/lettuce/core/dynamic/support/ReflectionUtils.java  | 2 +-
 .../io/lettuce/core/dynamic/support/ResolvableType.java   | 2 +-
 .../StandardReflectionParameterNameDiscoverer.java        | 2 +-
 .../io/lettuce/core/dynamic/support/TypeDiscoverer.java   | 2 +-
 .../io/lettuce/core/dynamic/support/TypeInformation.java  | 2 +-
 .../core/dynamic/support/TypeVariableTypeInformation.java | 2 +-
 .../java/io/lettuce/core/dynamic/support/TypeWrapper.java | 2 +-
 .../core/dynamic/support/WildcardTypeInformation.java     | 2 +-
 src/main/java/io/lettuce/core/event/DefaultEventBus.java  | 2 +-
 .../lettuce/core/event/DefaultEventPublisherOptions.java  | 2 +-
 src/main/java/io/lettuce/core/event/Event.java            | 2 +-
 src/main/java/io/lettuce/core/event/EventBus.java         | 2 +-
 .../java/io/lettuce/core/event/EventPublisherOptions.java | 2 +-
 .../io/lettuce/core/event/connection/ConnectedEvent.java  | 2 +-
 .../core/event/connection/ConnectionActivatedEvent.java   | 2 +-
 .../core/event/connection/ConnectionDeactivatedEvent.java | 2 +-
 .../io/lettuce/core/event/connection/ConnectionEvent.java | 2 +-
 .../core/event/connection/ConnectionEventSupport.java     | 2 +-
 .../lettuce/core/event/connection/DisconnectedEvent.java  | 2 +-
 .../core/event/connection/ReconnectFailedEvent.java       | 2 +-
 .../lettuce/core/event/metrics/CommandLatencyEvent.java   | 2 +-
 .../metrics/DefaultCommandLatencyEventPublisher.java      | 2 +-
 .../lettuce/core/event/metrics/MetricEventPublisher.java  | 2 +-
 .../lettuce/core/internal/AbstractInvocationHandler.java  | 2 +-
 .../java/io/lettuce/core/internal/AsyncCloseable.java     | 2 +-
 .../io/lettuce/core/internal/AsyncConnectionProvider.java | 2 +-
 .../java/io/lettuce/core/internal/DefaultMethods.java     | 2 +-
 src/main/java/io/lettuce/core/internal/Futures.java       | 2 +-
 src/main/java/io/lettuce/core/internal/HostAndPort.java   | 2 +-
 src/main/java/io/lettuce/core/internal/LettuceAssert.java | 2 +-
 .../java/io/lettuce/core/internal/LettuceClassUtils.java  | 2 +-
 .../java/io/lettuce/core/internal/LettuceFactories.java   | 2 +-
 src/main/java/io/lettuce/core/internal/LettuceLists.java  | 2 +-
 src/main/java/io/lettuce/core/internal/LettuceSets.java   | 2 +-
 .../java/io/lettuce/core/internal/TimeoutProvider.java    | 2 +-
 .../io/lettuce/core/masterslave/AsyncConnections.java     | 2 +-
 .../lettuce/core/masterslave/AutodiscoveryConnector.java  | 2 +-
 .../core/masterslave/CompletableEventLatchSupport.java    | 2 +-
 .../java/io/lettuce/core/masterslave/Connections.java     | 2 +-
 src/main/java/io/lettuce/core/masterslave/Exceptions.java | 2 +-
 .../java/io/lettuce/core/masterslave/MasterSlave.java     | 8 ++++----
 .../core/masterslave/MasterSlaveChannelWriter.java        | 2 +-
 .../core/masterslave/MasterSlaveConnectionProvider.java   | 2 +-
 .../io/lettuce/core/masterslave/MasterSlaveConnector.java | 2 +-
 .../core/masterslave/MasterSlaveTopologyProvider.java     | 2 +-
 .../core/masterslave/MasterSlaveTopologyRefresh.java      | 2 +-
 .../io/lettuce/core/masterslave/MasterSlaveUtils.java     | 2 +-
 .../lettuce/core/masterslave/NodeConnectionFactory.java   | 2 +-
 .../io/lettuce/core/masterslave/ReadOnlyCommands.java     | 2 +-
 .../masterslave/RedisClientNodeConnectionFactory.java     | 2 +-
 .../io/lettuce/core/masterslave/RedisMasterSlaveNode.java | 2 +-
 src/main/java/io/lettuce/core/masterslave/Requests.java   | 2 +-
 .../java/io/lettuce/core/masterslave/ResumeAfter.java     | 2 +-
 .../io/lettuce/core/masterslave/SentinelConnector.java    | 2 +-
 .../core/masterslave/SentinelTopologyProvider.java        | 2 +-
 .../lettuce/core/masterslave/SentinelTopologyRefresh.java | 2 +-
 .../masterslave/SentinelTopologyRefreshConnections.java   | 2 +-
 .../masterslave/StatefulRedisMasterSlaveConnection.java   | 2 +-
 .../StatefulRedisMasterSlaveConnectionImpl.java           | 2 +-
 .../core/masterslave/StaticMasterSlaveConnector.java      | 2 +-
 .../masterslave/StaticMasterSlaveTopologyProvider.java    | 2 +-
 .../io/lettuce/core/masterslave/TimedAsyncCommand.java    | 2 +-
 src/main/java/io/lettuce/core/masterslave/Timeout.java    | 2 +-
 .../io/lettuce/core/masterslave/TopologyComparators.java  | 2 +-
 .../io/lettuce/core/masterslave/TopologyProvider.java     | 2 +-
 .../io/lettuce/core/metrics/CommandLatencyCollector.java  | 2 +-
 .../core/metrics/CommandLatencyCollectorOptions.java      | 2 +-
 .../java/io/lettuce/core/metrics/CommandLatencyId.java    | 2 +-
 src/main/java/io/lettuce/core/metrics/CommandMetrics.java | 2 +-
 .../core/metrics/DefaultCommandLatencyCollector.java      | 2 +-
 .../metrics/DefaultCommandLatencyCollectorOptions.java    | 2 +-
 .../java/io/lettuce/core/metrics/MetricCollector.java     | 2 +-
 .../io/lettuce/core/models/command/CommandDetail.java     | 2 +-
 .../lettuce/core/models/command/CommandDetailParser.java  | 2 +-
 .../java/io/lettuce/core/models/role/RedisInstance.java   | 2 +-
 .../io/lettuce/core/models/role/RedisMasterInstance.java  | 2 +-
 .../io/lettuce/core/models/role/RedisNodeDescription.java | 2 +-
 .../lettuce/core/models/role/RedisSentinelInstance.java   | 2 +-
 .../io/lettuce/core/models/role/RedisSlaveInstance.java   | 2 +-
 .../io/lettuce/core/models/role/ReplicationPartner.java   | 2 +-
 src/main/java/io/lettuce/core/models/role/RoleParser.java | 2 +-
 .../java/io/lettuce/core/models/stream/PendingEntry.java  | 2 +-
 .../io/lettuce/core/models/stream/PendingMessage.java     | 2 +-
 .../io/lettuce/core/models/stream/PendingMessages.java    | 2 +-
 .../java/io/lettuce/core/models/stream/PendingParser.java | 2 +-
 .../java/io/lettuce/core/models/stream/package-info.java  | 2 +-
 src/main/java/io/lettuce/core/output/ArrayOutput.java     | 2 +-
 .../java/io/lettuce/core/output/BooleanListOutput.java    | 2 +-
 src/main/java/io/lettuce/core/output/BooleanOutput.java   | 2 +-
 src/main/java/io/lettuce/core/output/ByteArrayOutput.java | 2 +-
 src/main/java/io/lettuce/core/output/CommandOutput.java   | 2 +-
 src/main/java/io/lettuce/core/output/DateOutput.java      | 2 +-
 .../io/lettuce/core/output/DefaultTransactionResult.java  | 2 +-
 src/main/java/io/lettuce/core/output/DoubleOutput.java    | 2 +-
 .../io/lettuce/core/output/GeoCoordinatesListOutput.java  | 2 +-
 .../core/output/GeoCoordinatesValueListOutput.java        | 2 +-
 .../java/io/lettuce/core/output/GeoWithinListOutput.java  | 2 +-
 src/main/java/io/lettuce/core/output/IntegerOutput.java   | 2 +-
 src/main/java/io/lettuce/core/output/KeyListOutput.java   | 2 +-
 src/main/java/io/lettuce/core/output/KeyOutput.java       | 2 +-
 src/main/java/io/lettuce/core/output/KeyScanOutput.java   | 2 +-
 .../io/lettuce/core/output/KeyScanStreamingOutput.java    | 2 +-
 .../java/io/lettuce/core/output/KeyStreamingChannel.java  | 2 +-
 .../java/io/lettuce/core/output/KeyStreamingOutput.java   | 2 +-
 .../java/io/lettuce/core/output/KeyValueListOutput.java   | 2 +-
 src/main/java/io/lettuce/core/output/KeyValueOutput.java  | 2 +-
 .../lettuce/core/output/KeyValueScanStreamingOutput.java  | 2 +-
 .../io/lettuce/core/output/KeyValueScoredValueOutput.java | 2 +-
 .../io/lettuce/core/output/KeyValueStreamingChannel.java  | 2 +-
 .../io/lettuce/core/output/KeyValueStreamingOutput.java   | 2 +-
 .../java/io/lettuce/core/output/ListOfMapsOutput.java     | 2 +-
 src/main/java/io/lettuce/core/output/ListSubscriber.java  | 2 +-
 src/main/java/io/lettuce/core/output/MapOutput.java       | 2 +-
 src/main/java/io/lettuce/core/output/MapScanOutput.java   | 2 +-
 src/main/java/io/lettuce/core/output/MultiOutput.java     | 2 +-
 .../java/io/lettuce/core/output/NestedMultiOutput.java    | 2 +-
 src/main/java/io/lettuce/core/output/OutputFactory.java   | 2 +-
 src/main/java/io/lettuce/core/output/ReplayOutput.java    | 2 +-
 src/main/java/io/lettuce/core/output/ScanOutput.java      | 2 +-
 .../io/lettuce/core/output/ScoredValueListOutput.java     | 2 +-
 .../java/io/lettuce/core/output/ScoredValueOutput.java    | 2 +-
 .../io/lettuce/core/output/ScoredValueScanOutput.java     | 2 +-
 .../core/output/ScoredValueScanStreamingOutput.java       | 2 +-
 .../lettuce/core/output/ScoredValueStreamingChannel.java  | 2 +-
 .../lettuce/core/output/ScoredValueStreamingOutput.java   | 2 +-
 .../java/io/lettuce/core/output/SocketAddressOutput.java  | 2 +-
 src/main/java/io/lettuce/core/output/StatusOutput.java    | 2 +-
 .../io/lettuce/core/output/StreamMessageListOutput.java   | 2 +-
 .../java/io/lettuce/core/output/StreamReadOutput.java     | 2 +-
 .../java/io/lettuce/core/output/StreamingChannel.java     | 2 +-
 src/main/java/io/lettuce/core/output/StreamingOutput.java | 2 +-
 .../java/io/lettuce/core/output/StringListOutput.java     | 2 +-
 .../io/lettuce/core/output/StringValueListOutput.java     | 2 +-
 src/main/java/io/lettuce/core/output/ValueListOutput.java | 2 +-
 src/main/java/io/lettuce/core/output/ValueOutput.java     | 2 +-
 src/main/java/io/lettuce/core/output/ValueScanOutput.java | 2 +-
 .../io/lettuce/core/output/ValueScanStreamingOutput.java  | 2 +-
 src/main/java/io/lettuce/core/output/ValueSetOutput.java  | 2 +-
 .../io/lettuce/core/output/ValueStreamingChannel.java     | 2 +-
 .../java/io/lettuce/core/output/ValueStreamingOutput.java | 2 +-
 .../java/io/lettuce/core/output/ValueValueListOutput.java | 2 +-
 src/main/java/io/lettuce/core/protocol/AsyncCommand.java  | 2 +-
 .../io/lettuce/core/protocol/BaseRedisCommandBuilder.java | 2 +-
 .../io/lettuce/core/protocol/ChannelLogDescriptor.java    | 2 +-
 src/main/java/io/lettuce/core/protocol/Command.java       | 2 +-
 src/main/java/io/lettuce/core/protocol/CommandArgs.java   | 2 +-
 .../io/lettuce/core/protocol/CommandArgsAccessor.java     | 2 +-
 .../java/io/lettuce/core/protocol/CommandEncoder.java     | 2 +-
 .../io/lettuce/core/protocol/CommandExpiryWriter.java     | 2 +-
 .../java/io/lettuce/core/protocol/CommandHandler.java     | 2 +-
 .../java/io/lettuce/core/protocol/CommandKeyword.java     | 2 +-
 src/main/java/io/lettuce/core/protocol/CommandType.java   | 2 +-
 .../java/io/lettuce/core/protocol/CommandWrapper.java     | 2 +-
 .../io/lettuce/core/protocol/CompleteableCommand.java     | 2 +-
 .../java/io/lettuce/core/protocol/ConnectionFacade.java   | 2 +-
 .../java/io/lettuce/core/protocol/ConnectionWatchdog.java | 2 +-
 .../java/io/lettuce/core/protocol/DecoratedCommand.java   | 2 +-
 .../java/io/lettuce/core/protocol/DefaultEndpoint.java    | 2 +-
 src/main/java/io/lettuce/core/protocol/DemandAware.java   | 2 +-
 src/main/java/io/lettuce/core/protocol/Endpoint.java      | 2 +-
 .../java/io/lettuce/core/protocol/HasQueuedCommands.java  | 2 +-
 .../io/lettuce/core/protocol/LatencyMeteredCommand.java   | 2 +-
 .../java/io/lettuce/core/protocol/LettuceCharsets.java    | 2 +-
 .../io/lettuce/core/protocol/PristineFallbackCommand.java | 2 +-
 .../java/io/lettuce/core/protocol/ProtocolKeyword.java    | 2 +-
 .../io/lettuce/core/protocol/ReconnectionHandler.java     | 2 +-
 .../io/lettuce/core/protocol/ReconnectionListener.java    | 2 +-
 src/main/java/io/lettuce/core/protocol/RedisCommand.java  | 2 +-
 .../java/io/lettuce/core/protocol/RedisStateMachine.java  | 2 +-
 src/main/java/io/lettuce/core/protocol/SharedLock.java    | 2 +-
 src/main/java/io/lettuce/core/protocol/TracedCommand.java | 2 +-
 .../io/lettuce/core/protocol/TransactionalCommand.java    | 2 +-
 src/main/java/io/lettuce/core/protocol/WithLatency.java   | 2 +-
 .../java/io/lettuce/core/pubsub/PubSubCommandArgs.java    | 2 +-
 .../java/io/lettuce/core/pubsub/PubSubCommandBuilder.java | 2 +-
 .../java/io/lettuce/core/pubsub/PubSubCommandHandler.java | 2 +-
 src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java  | 4 ++--
 src/main/java/io/lettuce/core/pubsub/PubSubOutput.java    | 2 +-
 .../java/io/lettuce/core/pubsub/RedisPubSubAdapter.java   | 2 +-
 .../lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java | 2 +-
 .../java/io/lettuce/core/pubsub/RedisPubSubListener.java  | 2 +-
 .../core/pubsub/RedisPubSubReactiveCommandsImpl.java      | 2 +-
 .../core/pubsub/StatefulRedisPubSubConnection.java        | 2 +-
 .../core/pubsub/StatefulRedisPubSubConnectionImpl.java    | 2 +-
 .../core/pubsub/api/async/RedisPubSubAsyncCommands.java   | 2 +-
 .../lettuce/core/pubsub/api/reactive/ChannelMessage.java  | 2 +-
 .../lettuce/core/pubsub/api/reactive/PatternMessage.java  | 2 +-
 .../pubsub/api/reactive/RedisPubSubReactiveCommands.java  | 2 +-
 .../lettuce/core/pubsub/api/sync/RedisPubSubCommands.java | 2 +-
 .../java/io/lettuce/core/resource/ClientResources.java    | 2 +-
 src/main/java/io/lettuce/core/resource/ConstantDelay.java | 2 +-
 .../io/lettuce/core/resource/DecorrelatedJitterDelay.java | 2 +-
 .../io/lettuce/core/resource/DefaultClientResources.java  | 2 +-
 .../core/resource/DefaultEventLoopGroupProvider.java      | 2 +-
 .../io/lettuce/core/resource/DefaultNettyCustomizer.java  | 2 +-
 src/main/java/io/lettuce/core/resource/Delay.java         | 2 +-
 .../io/lettuce/core/resource/DirContextDnsResolver.java   | 2 +-
 src/main/java/io/lettuce/core/resource/DnsResolver.java   | 2 +-
 src/main/java/io/lettuce/core/resource/DnsResolvers.java  | 2 +-
 .../java/io/lettuce/core/resource/EqualJitterDelay.java   | 2 +-
 .../io/lettuce/core/resource/EventLoopGroupProvider.java  | 2 +-
 .../java/io/lettuce/core/resource/ExponentialDelay.java   | 2 +-
 .../java/io/lettuce/core/resource/FullJitterDelay.java    | 2 +-
 src/main/java/io/lettuce/core/resource/Futures.java       | 2 +-
 .../core/resource/MappingSocketAddressResolver.java       | 2 +-
 .../java/io/lettuce/core/resource/NettyCustomizer.java    | 2 +-
 .../io/lettuce/core/resource/SocketAddressResolver.java   | 2 +-
 .../core/sentinel/RedisSentinelAsyncCommandsImpl.java     | 2 +-
 .../core/sentinel/RedisSentinelReactiveCommandsImpl.java  | 2 +-
 .../io/lettuce/core/sentinel/SentinelCommandBuilder.java  | 2 +-
 .../sentinel/StatefulRedisSentinelConnectionImpl.java     | 2 +-
 .../sentinel/api/StatefulRedisSentinelConnection.java     | 2 +-
 .../sentinel/api/async/RedisSentinelAsyncCommands.java    | 2 +-
 .../api/reactive/RedisSentinelReactiveCommands.java       | 2 +-
 .../core/sentinel/api/sync/RedisSentinelCommands.java     | 2 +-
 .../java/io/lettuce/core/support/AbstractCdiBean.java     | 2 +-
 .../lettuce/core/support/AsyncConnectionPoolSupport.java  | 2 +-
 .../java/io/lettuce/core/support/AsyncObjectFactory.java  | 2 +-
 src/main/java/io/lettuce/core/support/AsyncPool.java      | 2 +-
 src/main/java/io/lettuce/core/support/BasePool.java       | 2 +-
 src/main/java/io/lettuce/core/support/BasePoolConfig.java | 2 +-
 .../java/io/lettuce/core/support/BoundedAsyncPool.java    | 2 +-
 .../java/io/lettuce/core/support/BoundedPoolConfig.java   | 2 +-
 .../lettuce/core/support/ClientResourcesFactoryBean.java  | 2 +-
 .../lettuce/core/support/CommonsPool2ConfigConverter.java | 2 +-
 .../io/lettuce/core/support/ConnectionPoolSupport.java    | 2 +-
 .../java/io/lettuce/core/support/ConnectionWrapping.java  | 2 +-
 .../java/io/lettuce/core/support/LettuceCdiExtension.java | 2 +-
 .../lettuce/core/support/LettuceFactoryBeanSupport.java   | 2 +-
 .../java/io/lettuce/core/support/RedisClientCdiBean.java  | 2 +-
 .../io/lettuce/core/support/RedisClientFactoryBean.java   | 2 +-
 .../lettuce/core/support/RedisClusterClientCdiBean.java   | 2 +-
 .../core/support/RedisClusterClientFactoryBean.java       | 2 +-
 src/main/java/io/lettuce/core/tracing/BraveTracing.java   | 2 +-
 src/main/java/io/lettuce/core/tracing/NoOpTracing.java    | 2 +-
 src/main/java/io/lettuce/core/tracing/TraceContext.java   | 2 +-
 .../io/lettuce/core/tracing/TraceContextProvider.java     | 2 +-
 src/main/java/io/lettuce/core/tracing/Tracer.java         | 2 +-
 src/main/java/io/lettuce/core/tracing/TracerProvider.java | 2 +-
 src/main/java/io/lettuce/core/tracing/Tracing.java        | 2 +-
 .../templates/io/lettuce/core/api/BaseRedisCommands.java  | 2 +-
 .../templates/io/lettuce/core/api/RedisGeoCommands.java   | 2 +-
 .../templates/io/lettuce/core/api/RedisHLLCommands.java   | 2 +-
 .../templates/io/lettuce/core/api/RedisHashCommands.java  | 2 +-
 .../templates/io/lettuce/core/api/RedisKeyCommands.java   | 2 +-
 .../templates/io/lettuce/core/api/RedisListCommands.java  | 2 +-
 .../io/lettuce/core/api/RedisScriptingCommands.java       | 2 +-
 .../io/lettuce/core/api/RedisSentinelCommands.java        | 2 +-
 .../io/lettuce/core/api/RedisServerCommands.java          | 2 +-
 .../templates/io/lettuce/core/api/RedisSetCommands.java   | 2 +-
 .../io/lettuce/core/api/RedisSortedSetCommands.java       | 2 +-
 .../io/lettuce/core/api/RedisStreamCommands.java          | 2 +-
 .../io/lettuce/core/api/RedisStringCommands.java          | 2 +-
 .../io/lettuce/core/api/RedisTransactionalCommands.java   | 2 +-
 .../biz/paluch/redis/extensibility/LettuceGeoDemo.java    | 2 +-
 .../paluch/redis/extensibility/MyExtendedRedisClient.java | 2 +-
 .../redis/extensibility/MyExtendedRedisClientTest.java    | 2 +-
 .../paluch/redis/extensibility/MyPubSubConnection.java    | 2 +-
 .../io/lettuce/apigenerator/CompilationUnitFactory.java   | 2 +-
 src/test/java/io/lettuce/apigenerator/Constants.java      | 2 +-
 src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java | 2 +-
 .../apigenerator/CreateAsyncNodeSelectionClusterApi.java  | 2 +-
 .../java/io/lettuce/apigenerator/CreateReactiveApi.java   | 2 +-
 src/test/java/io/lettuce/apigenerator/CreateSyncApi.java  | 2 +-
 .../apigenerator/CreateSyncNodeSelectionClusterApi.java   | 2 +-
 .../lettuce/apigenerator/GenerateCommandInterfaces.java   | 2 +-
 src/test/java/io/lettuce/category/SlowTests.java          | 2 +-
 src/test/java/io/lettuce/codec/CRC16UnitTests.java        | 2 +-
 .../java/io/lettuce/core/AbstractRedisClientTest.java     | 2 +-
 .../io/lettuce/core/AsyncConnectionIntegrationTests.java  | 2 +-
 src/test/java/io/lettuce/core/ByteBufferCodec.java        | 2 +-
 src/test/java/io/lettuce/core/ClientIntegrationTests.java | 2 +-
 .../io/lettuce/core/ClientMetricsIntegrationTests.java    | 2 +-
 .../io/lettuce/core/ClientOptionsIntegrationTests.java    | 2 +-
 src/test/java/io/lettuce/core/ClientOptionsUnitTests.java | 2 +-
 .../io/lettuce/core/ConnectMethodsIntegrationTests.java   | 2 +-
 .../lettuce/core/ConnectionCommandIntegrationTests.java   | 2 +-
 .../java/io/lettuce/core/ConnectionFutureUnitTests.java   | 2 +-
 .../java/io/lettuce/core/CustomCodecIntegrationTests.java | 2 +-
 .../java/io/lettuce/core/ExceptionFactoryUnitTests.java   | 2 +-
 src/test/java/io/lettuce/core/GeoModelUnitTests.java      | 2 +-
 src/test/java/io/lettuce/core/JavaRuntimeUnitTests.java   | 2 +-
 src/test/java/io/lettuce/core/KeyValueUnitTests.java      | 2 +-
 .../java/io/lettuce/core/LettuceFuturesUnitTests.java     | 2 +-
 src/test/java/io/lettuce/core/LimitUnitTests.java         | 2 +-
 .../java/io/lettuce/core/PipeliningIntegrationTests.java  | 2 +-
 src/test/java/io/lettuce/core/ProtectedModeTests.java     | 2 +-
 src/test/java/io/lettuce/core/RangeUnitTests.java         | 2 +-
 .../core/ReactiveBackpressurePropagationUnitTests.java    | 2 +-
 .../lettuce/core/ReactiveConnectionIntegrationTests.java  | 2 +-
 .../core/ReactiveStreamingOutputIntegrationTests.java     | 2 +-
 .../lettuce/core/RedisClientConnectIntegrationTests.java  | 2 +-
 .../io/lettuce/core/RedisClientFactoryBeanUnitTests.java  | 2 +-
 .../java/io/lettuce/core/RedisClientFactoryUnitTests.java | 2 +-
 .../java/io/lettuce/core/RedisClientIntegrationTests.java | 2 +-
 .../lettuce/core/RedisClientListenerIntegrationTests.java | 2 +-
 .../java/io/lettuce/core/RedisURIBuilderUnitTests.java    | 2 +-
 src/test/java/io/lettuce/core/RedisURIUnitTests.java      | 2 +-
 src/test/java/io/lettuce/core/ScanArgsUnitTests.java      | 2 +-
 src/test/java/io/lettuce/core/ScanCursorUnitTests.java    | 2 +-
 .../io/lettuce/core/ScanIteratorIntegrationTests.java     | 2 +-
 .../java/io/lettuce/core/ScanStreamIntegrationTests.java  | 2 +-
 .../java/io/lettuce/core/ScoredValueStreamingAdapter.java | 2 +-
 src/test/java/io/lettuce/core/ScoredValueUnitTests.java   | 2 +-
 .../io/lettuce/core/SocketOptionsIntegrationTests.java    | 2 +-
 src/test/java/io/lettuce/core/SocketOptionsUnitTests.java | 2 +-
 src/test/java/io/lettuce/core/SslIntegrationTests.java    | 2 +-
 .../io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java | 2 +-
 src/test/java/io/lettuce/core/TestRedisPublisher.java     | 2 +-
 src/test/java/io/lettuce/core/TestSupport.java            | 2 +-
 .../java/io/lettuce/core/TimeoutOptionsUnitTests.java     | 2 +-
 .../io/lettuce/core/UnixDomainSocketIntegrationTests.java | 2 +-
 .../io/lettuce/core/Utf8StringCodecIntegrationTests.java  | 2 +-
 src/test/java/io/lettuce/core/ValueUnitTests.java         | 2 +-
 src/test/java/io/lettuce/core/ZStoreArgsUnitTests.java    | 2 +-
 .../cluster/AdvancedClusterClientIntegrationTests.java    | 2 +-
 .../cluster/AdvancedClusterReactiveIntegrationTests.java  | 2 +-
 .../cluster/AsyncConnectionProviderIntegrationTests.java  | 2 +-
 .../core/cluster/ByteCodecClusterIntegrationTests.java    | 2 +-
 .../cluster/ClusterClientOptionsIntegrationTests.java     | 2 +-
 .../core/cluster/ClusterClientOptionsUnitTests.java       | 2 +-
 .../core/cluster/ClusterCommandIntegrationTests.java      | 2 +-
 .../io/lettuce/core/cluster/ClusterCommandUnitTests.java  | 2 +-
 .../ClusterDistributionChannelWriterUnitTests.java        | 2 +-
 .../core/cluster/ClusterNodeEndpointUnitTests.java        | 2 +-
 .../cluster/ClusterPartiallyDownIntegrationTests.java     | 2 +-
 .../cluster/ClusterReactiveCommandIntegrationTests.java   | 2 +-
 src/test/java/io/lettuce/core/cluster/ClusterRule.java    | 2 +-
 src/test/java/io/lettuce/core/cluster/ClusterSetup.java   | 2 +-
 .../java/io/lettuce/core/cluster/ClusterTestSettings.java | 2 +-
 .../java/io/lettuce/core/cluster/ClusterTestUtil.java     | 2 +-
 .../cluster/ClusterTopologyRefreshOptionsUnitTests.java   | 2 +-
 .../cluster/ClusterTopologyRefreshSchedulerUnitTests.java | 2 +-
 .../HealthyMajorityPartitionsConsensusUnitTests.java      | 2 +-
 .../KnownMajorityPartitionsConsensusUnitTests.java        | 2 +-
 .../core/cluster/NodeSelectionAsyncIntegrationTests.java  | 2 +-
 .../core/cluster/NodeSelectionSyncIntegrationTests.java   | 2 +-
 .../core/cluster/PartitionsConsensusTestSupport.java      | 2 +-
 .../core/cluster/PipelinedRedisFutureUnitTests.java       | 2 +-
 .../cluster/PooledClusterConnectionProviderUnitTests.java | 2 +-
 .../java/io/lettuce/core/cluster/ReadFromUnitTests.java   | 2 +-
 .../lettuce/core/cluster/ReadOnlyCommandsUnitTests.java   | 2 +-
 .../core/cluster/RedisClusterClientFactoryTests.java      | 2 +-
 .../core/cluster/RedisClusterClientIntegrationTests.java  | 2 +-
 .../RedisClusterPasswordSecuredSslIntegrationTests.java   | 2 +-
 .../cluster/RedisClusterReadFromIntegrationTests.java     | 2 +-
 .../io/lettuce/core/cluster/RedisClusterSetupTest.java    | 2 +-
 .../core/cluster/RedisClusterStressScenariosTest.java     | 2 +-
 .../core/cluster/RedisClusterURIUtilUnitTests.java        | 2 +-
 .../RedisReactiveClusterClientIntegrationTests.java       | 2 +-
 .../lettuce/core/cluster/RedisStateIntegrationTests.java  | 2 +-
 .../cluster/RoundRobinSocketAddressSupplierUnitTests.java | 2 +-
 .../core/cluster/ScanIteratorIntegrationTests.java        | 2 +-
 .../lettuce/core/cluster/ScanStreamIntegrationTests.java  | 2 +-
 ...ngleThreadedReactiveClusterClientIntegrationTests.java | 2 +-
 .../java/io/lettuce/core/cluster/SlotHashUnitTests.java   | 2 +-
 .../commands/CustomClusterCommandIntegrationTests.java    | 2 +-
 .../commands/GeoClusterCommandIntegrationTests.java       | 2 +-
 .../commands/HashClusterCommandIntegrationTests.java      | 2 +-
 .../commands/KeyClusterCommandIntegrationTests.java       | 2 +-
 .../commands/ListClusterCommandIntegrationTests.java      | 2 +-
 .../commands/StringClusterCommandIntegrationTests.java    | 2 +-
 .../HashClusterReactiveCommandIntegrationTests.java       | 2 +-
 .../ListClusterReactiveCommandIntegrationTests.java       | 2 +-
 .../StringClusterReactiveCommandIntegrationTests.java     | 2 +-
 .../partitions/ClusterPartitionParserUnitTests.java       | 2 +-
 .../cluster/models/partitions/PartitionsUnitTests.java    | 2 +-
 .../models/partitions/RedisClusterNodeUnitTests.java      | 2 +-
 .../cluster/models/slots/ClusterSlotsParserUnitTests.java | 2 +-
 .../RedisClusterPubSubConnectionIntegrationTests.java     | 2 +-
 .../cluster/topology/ClusterTopologyRefreshUnitTests.java | 2 +-
 .../core/cluster/topology/ConnectionsUnitTests.java       | 2 +-
 .../core/cluster/topology/NodeTopologyViewsUnitTests.java | 2 +-
 .../lettuce/core/cluster/topology/RequestsUnitTests.java  | 2 +-
 .../cluster/topology/TopologyComparatorsUnitTests.java    | 2 +-
 .../cluster/topology/TopologyRefreshIntegrationTests.java | 2 +-
 .../io/lettuce/core/codec/CompressionCodecUnitTests.java  | 2 +-
 .../java/io/lettuce/core/codec/StringCodecUnitTests.java  | 2 +-
 .../lettuce/core/commands/BitCommandIntegrationTests.java | 2 +-
 .../java/io/lettuce/core/commands/BitStringCodec.java     | 2 +-
 .../core/commands/CustomCommandIntegrationTests.java      | 2 +-
 .../lettuce/core/commands/GeoCommandIntegrationTests.java | 2 +-
 .../lettuce/core/commands/HLLCommandIntegrationTests.java | 2 +-
 .../core/commands/HashCommandIntegrationTests.java        | 2 +-
 .../lettuce/core/commands/KeyCommandIntegrationTests.java | 2 +-
 .../core/commands/ListCommandIntegrationTests.java        | 2 +-
 .../core/commands/NumericCommandIntegrationTests.java     | 2 +-
 .../RunOnlyOnceServerCommandIntegrationTests.java         | 2 +-
 .../core/commands/ScriptingCommandIntegrationTests.java   | 2 +-
 .../core/commands/ServerCommandIntegrationTests.java      | 2 +-
 .../lettuce/core/commands/SetCommandIntegrationTests.java | 2 +-
 .../core/commands/SortCommandIntegrationTests.java        | 2 +-
 .../core/commands/SortedSetCommandIntegrationTests.java   | 2 +-
 .../core/commands/StreamCommandIntegrationTests.java      | 2 +-
 .../core/commands/StringCommandIntegrationTests.java      | 2 +-
 .../core/commands/TransactionCommandIntegrationTests.java | 2 +-
 .../reactive/BitReactiveCommandIntegrationTests.java      | 2 +-
 .../reactive/CustomReactiveCommandIntegrationTests.java   | 2 +-
 .../reactive/GeoReactiveCommandIntegrationTests.java      | 2 +-
 .../reactive/HLLReactiveCommandIntegrationTests.java      | 2 +-
 .../reactive/HashReactiveCommandIntegrationTests.java     | 2 +-
 .../reactive/KeyReactiveCommandIntegrationTests.java      | 2 +-
 .../reactive/ListReactiveCommandIntegrationTests.java     | 2 +-
 .../reactive/NumericReactiveCommandIntegrationTests.java  | 2 +-
 .../ScriptingReactiveCommandIntegrationTests.java         | 2 +-
 .../reactive/ServerReactiveCommandIntegrationTests.java   | 2 +-
 .../reactive/SetReactiveCommandIntegrationTests.java      | 2 +-
 .../reactive/SortReactiveCommandIntegrationTests.java     | 2 +-
 .../SortedSetReactiveCommandIntegrationTests.java         | 2 +-
 .../reactive/StreamReactiveCommandIntegrationTests.java   | 2 +-
 .../reactive/StringReactiveCommandIntegrationTests.java   | 2 +-
 .../TransactionReactiveCommandIntegrationTests.java       | 2 +-
 .../transactional/BitTxCommandIntegrationTests.java       | 2 +-
 .../transactional/GeoTxCommandIntegrationTests.java       | 2 +-
 .../transactional/HLLTxCommandIntegrationTests.java       | 2 +-
 .../transactional/HashTxCommandIntegrationTests.java      | 2 +-
 .../transactional/KeyTxCommandIntegrationTests.java       | 2 +-
 .../transactional/ListTxCommandIntegrationTests.java      | 2 +-
 .../transactional/SetTxCommandIntegrationTests.java       | 2 +-
 .../transactional/SortTxCommandIntegrationTests.java      | 2 +-
 .../transactional/SortedSetTxCommandIntegrationTests.java | 2 +-
 .../transactional/StringTxCommandIntegrationTests.java    | 2 +-
 .../commands/transactional/TxSyncInvocationHandler.java   | 2 +-
 .../BatchExecutableCommandLookupStrategyUnitTests.java    | 2 +-
 .../dynamic/CommandSegmentCommandFactoryUnitTests.java    | 2 +-
 .../lettuce/core/dynamic/ConversionServiceUnitTests.java  | 2 +-
 .../core/dynamic/DeclaredCommandMethodUnitTests.java      | 2 +-
 .../dynamic/DefaultCommandMethodVerifierUnitTests.java    | 2 +-
 .../io/lettuce/core/dynamic/ParameterBinderUnitTests.java | 2 +-
 .../ReactiveCommandSegmentCommandFactoryUnitTests.java    | 2 +-
 .../core/dynamic/ReactiveTypeAdaptersUnitTests.java       | 2 +-
 .../dynamic/ReactiveTypeAdaptionIntegrationTests.java     | 2 +-
 .../core/dynamic/RedisCommandsAsyncIntegrationTests.java  | 2 +-
 .../dynamic/RedisCommandsBatchingIntegrationTests.java    | 2 +-
 .../dynamic/RedisCommandsClusterIntegrationTests.java     | 2 +-
 .../core/dynamic/RedisCommandsIntegrationTests.java       | 2 +-
 .../dynamic/RedisCommandsReactiveIntegrationTests.java    | 2 +-
 .../core/dynamic/RedisCommandsSyncIntegrationTests.java   | 2 +-
 .../io/lettuce/core/dynamic/SimpleBatcherUnitTests.java   | 2 +-
 .../codec/AnnotationRedisCodecResolverUnitTests.java      | 2 +-
 .../core/dynamic/codec/ParameterWrappersUnitTests.java    | 2 +-
 .../intercept/InvocationProxyFactoryUnitTests.java        | 2 +-
 .../dynamic/output/CodecAwareOutputResolverUnitTests.java | 2 +-
 ...tputRegistryCommandOutputFactoryResolverUnitTests.java | 2 +-
 .../core/dynamic/output/OutputRegistryUnitTests.java      | 2 +-
 .../segment/AnnotationCommandSegmentFactoryUnitTests.java | 2 +-
 .../support/ParametrizedTypeInformationUnitTests.java     | 2 +-
 .../dynamic/support/WildcardTypeInformationUnitTests.java | 2 +-
 .../event/ConnectionEventsTriggeredIntegrationTests.java  | 2 +-
 .../io/lettuce/core/event/DefaultEventBusUnitTests.java   | 2 +-
 .../core/event/DefaultEventPublisherOptionsUnitTests.java | 2 +-
 .../core/internal/AbstractInvocationHandlerUnitTests.java | 2 +-
 .../io/lettuce/core/internal/HostAndPortUnitTests.java    | 2 +-
 .../io/lettuce/core/masterslave/ConnectionsUnitTests.java | 2 +-
 .../core/masterslave/CustomCommandIntegrationTests.java   | 2 +-
 .../masterslave/MasterSlaveChannelWriterUnitTests.java    | 2 +-
 .../MasterSlaveConnectionProviderUnitTests.java           | 2 +-
 .../masterslave/MasterSlaveSentinelIntegrationTests.java  | 2 +-
 .../java/io/lettuce/core/masterslave/MasterSlaveTest.java | 2 +-
 .../masterslave/MasterSlaveTopologyProviderUnitTests.java | 2 +-
 .../masterslave/MasterSlaveTopologyRefreshUnitTests.java  | 2 +-
 .../core/masterslave/MasterSlaveUtilsUnitTests.java       | 2 +-
 .../masterslave/SentinelTopologyRefreshUnitTests.java     | 2 +-
 .../lettuce/core/masterslave/StaticMasterSlaveTest.java   | 2 +-
 .../metrics/CommandLatencyCollectorOptionsUnitTests.java  | 2 +-
 .../lettuce/core/metrics/CommandLatencyIdUnitTests.java   | 2 +-
 .../DefaultCommandLatencyCollectorOptionsUnitTests.java   | 2 +-
 .../metrics/DefaultCommandLatencyCollectorUnitTests.java  | 2 +-
 .../core/models/command/CommandDetailParserUnitTests.java | 2 +-
 .../io/lettuce/core/models/role/RoleParserUnitTests.java  | 2 +-
 .../core/models/stream/PendingParserUnitTests.java        | 2 +-
 .../lettuce/core/output/BooleanListOutputUnitTests.java   | 2 +-
 .../core/output/GeoCoordinatesListOutputUnitTests.java    | 2 +-
 .../output/GeoCoordinatesValueListOutputUnitTests.java    | 2 +-
 .../lettuce/core/output/GeoWithinListOutputUnitTests.java | 2 +-
 .../java/io/lettuce/core/output/ListOutputUnitTests.java  | 2 +-
 .../java/io/lettuce/core/output/MultiOutputUnitTests.java | 2 +-
 .../lettuce/core/output/NestedMultiOutputUnitTests.java   | 2 +-
 .../io/lettuce/core/output/ReplayOutputUnitTests.java     | 2 +-
 .../core/output/ScoredValueListOutputUnitTests.java       | 2 +-
 .../lettuce/core/output/SocketAddressOutputUnitTests.java | 2 +-
 .../io/lettuce/core/protocol/AsyncCommandUnitTests.java   | 2 +-
 .../io/lettuce/core/protocol/CommandArgsUnitTests.java    | 2 +-
 .../io/lettuce/core/protocol/CommandHandlerUnitTests.java | 2 +-
 .../java/io/lettuce/core/protocol/CommandUnitTests.java   | 2 +-
 .../io/lettuce/core/protocol/CommandWrapperUnitTests.java | 2 +-
 .../core/protocol/ConnectionFailureIntegrationTests.java  | 2 +-
 .../lettuce/core/protocol/DefaultEndpointUnitTests.java   | 2 +-
 .../io/lettuce/core/protocol/StateMachineUnitTests.java   | 2 +-
 .../core/protocol/TransactionalCommandUnitTests.java      | 2 +-
 .../core/pubsub/PubSubCommandHandlerUnitTests.java        | 2 +-
 .../java/io/lettuce/core/pubsub/PubSubCommandTest.java    | 2 +-
 .../io/lettuce/core/pubsub/PubSubEndpointUnitTests.java   | 4 ++--
 .../java/io/lettuce/core/pubsub/PubSubReactiveTest.java   | 2 +-
 .../lettuce/core/reactive/RedisPublisherVerification.java | 2 +-
 .../io/lettuce/core/reactive/ScanStreamVerification.java  | 2 +-
 .../java/io/lettuce/core/reliability/AtLeastOnceTest.java | 2 +-
 .../java/io/lettuce/core/reliability/AtMostOnceTest.java  | 2 +-
 .../io/lettuce/core/resource/ConstantDelayUnitTests.java  | 2 +-
 .../core/resource/DecorrelatedJitterDelayUnitTests.java   | 2 +-
 .../core/resource/DefaultClientResourcesUnitTests.java    | 2 +-
 .../resource/DefaultEventLoopGroupProviderUnitTests.java  | 2 +-
 .../lettuce/core/resource/DirContextDnsResolverTests.java | 2 +-
 .../lettuce/core/resource/EqualJitterDelayUnitTests.java  | 2 +-
 .../lettuce/core/resource/ExponentialDelayUnitTests.java  | 2 +-
 .../lettuce/core/resource/FullJitterDelayUnitTests.java   | 2 +-
 .../java/io/lettuce/core/resource/FuturesUnitTests.java   | 2 +-
 .../resource/MappingSocketAddressResolverUnitTests.java   | 2 +-
 .../core/sentinel/SentinelCommandIntegrationTests.java    | 2 +-
 .../core/sentinel/SentinelConnectionIntegrationTests.java | 2 +-
 .../sentinel/SentinelServerCommandIntegrationTests.java   | 2 +-
 .../io/lettuce/core/sentinel/SentinelTestSettings.java    | 2 +-
 .../sentinel/reactive/SentinelReactiveCommandTest.java    | 2 +-
 .../reactive/SentinelServerReactiveCommandTest.java       | 2 +-
 .../AsyncConnectionPoolSupportIntegrationTests.java       | 2 +-
 .../core/support/AsyncPoolWithValidationUnitTests.java    | 2 +-
 .../lettuce/core/support/BoundedAsyncPoolUnitTests.java   | 2 +-
 .../java/io/lettuce/core/support/CdiIntegrationTests.java | 2 +-
 .../support/ConnectionPoolSupportIntegrationTests.java    | 2 +-
 src/test/java/io/lettuce/core/support/InjectedClient.java | 2 +-
 src/test/java/io/lettuce/core/support/PersonDB.java       | 2 +-
 .../java/io/lettuce/core/support/PubSubTestListener.java  | 2 +-
 .../support/RedisClusterClientFactoryBeanUnitTests.java   | 2 +-
 .../io/lettuce/core/support/SpringIntegrationTests.java   | 2 +-
 .../core/tracing/BraveTracingIntegrationTests.java        | 2 +-
 .../io/lettuce/core/tracing/BraveTracingUnitTests.java    | 2 +-
 .../io/lettuce/examples/ConnectToElastiCacheMaster.java   | 2 +-
 .../ConnectToMasterSlaveUsingElastiCacheCluster.java      | 2 +-
 .../examples/ConnectToMasterSlaveUsingRedisSentinel.java  | 2 +-
 src/test/java/io/lettuce/examples/ConnectToRedis.java     | 2 +-
 .../java/io/lettuce/examples/ConnectToRedisCluster.java   | 2 +-
 .../io/lettuce/examples/ConnectToRedisClusterSSL.java     | 2 +-
 .../ConnectToRedisClusterWithTopologyRefreshing.java      | 2 +-
 src/test/java/io/lettuce/examples/ConnectToRedisSSL.java  | 2 +-
 .../examples/ConnectToRedisUsingRedisSentinel.java        | 2 +-
 src/test/java/io/lettuce/examples/MySpringBean.java       | 2 +-
 src/test/java/io/lettuce/examples/ReadWriteExample.java   | 2 +-
 src/test/java/io/lettuce/examples/SpringExample.java      | 2 +-
 src/test/java/io/lettuce/test/CanConnect.java             | 2 +-
 .../test/ConnectionDecoratingInvocationHandler.java       | 2 +-
 src/test/java/io/lettuce/test/ConnectionTestUtil.java     | 2 +-
 src/test/java/io/lettuce/test/Delay.java                  | 2 +-
 src/test/java/io/lettuce/test/Futures.java                | 2 +-
 .../java/io/lettuce/test/KeyValueStreamingAdapter.java    | 2 +-
 src/test/java/io/lettuce/test/KeysAndValues.java          | 2 +-
 src/test/java/io/lettuce/test/LettuceExtension.java       | 2 +-
 src/test/java/io/lettuce/test/ListStreamingAdapter.java   | 2 +-
 .../io/lettuce/test/ReactiveSyncInvocationHandler.java    | 2 +-
 .../java/io/lettuce/test/RoutingInvocationHandler.java    | 2 +-
 src/test/java/io/lettuce/test/Wait.java                   | 2 +-
 src/test/java/io/lettuce/test/WithPassword.java           | 2 +-
 .../java/io/lettuce/test/condition/EnabledOnCommand.java  | 2 +-
 .../lettuce/test/condition/EnabledOnCommandCondition.java | 2 +-
 .../java/io/lettuce/test/condition/RedisConditions.java   | 2 +-
 .../java/io/lettuce/test/resource/DefaultRedisClient.java | 2 +-
 .../lettuce/test/resource/DefaultRedisClusterClient.java  | 2 +-
 src/test/java/io/lettuce/test/resource/FastShutdown.java  | 2 +-
 .../io/lettuce/test/resource/TestClientResources.java     | 2 +-
 .../lettuce/test/resource/TestEventLoopGroupProvider.java | 2 +-
 src/test/java/io/lettuce/test/server/MockTcpServer.java   | 2 +-
 .../java/io/lettuce/test/server/RandomResponseServer.java | 2 +-
 .../java/io/lettuce/test/server/RandomServerHandler.java  | 2 +-
 src/test/java/io/lettuce/test/settings/TestSettings.java  | 2 +-
 src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java | 2 +-
 .../jmh/io/lettuce/core/EmptyStatefulRedisConnection.java | 2 +-
 src/test/jmh/io/lettuce/core/JmhMain.java                 | 2 +-
 src/test/jmh/io/lettuce/core/RedisClientBenchmark.java    | 2 +-
 .../ClusterDistributionChannelWriterBenchmark.java        | 2 +-
 .../io/lettuce/core/cluster/EmptyRedisClusterClient.java  | 2 +-
 src/test/jmh/io/lettuce/core/cluster/JmhMain.java         | 2 +-
 .../lettuce/core/cluster/RedisClusterClientBenchmark.java | 2 +-
 .../jmh/io/lettuce/core/cluster/SlotHashBenchmark.java    | 2 +-
 .../lettuce/core/cluster/models/partitions/JmhMain.java   | 2 +-
 .../models/partitions/RedisClusterNodeBenchmark.java      | 2 +-
 src/test/jmh/io/lettuce/core/codec/JmhMain.java           | 2 +-
 .../jmh/io/lettuce/core/codec/StringCodecBenchmark.java   | 2 +-
 .../io/lettuce/core/codec/Utf8StringCodecBenchmark.java   | 2 +-
 .../core/dynamic/RedisCommandFactoryBenchmark.java        | 2 +-
 .../io/lettuce/core/dynamic/RedisCommandsBenchmark.java   | 2 +-
 .../intercept/InvocationProxyFactoryBenchmark.java        | 2 +-
 src/test/jmh/io/lettuce/core/output/JmhMain.java          | 2 +-
 .../io/lettuce/core/output/ValueListOutputBenchmark.java  | 2 +-
 .../jmh/io/lettuce/core/protocol/CommandBenchmark.java    | 2 +-
 .../io/lettuce/core/protocol/CommandHandlerBenchmark.java | 2 +-
 src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java   | 2 +-
 .../io/lettuce/core/protocol/EmptyClientResources.java    | 2 +-
 src/test/jmh/io/lettuce/core/protocol/EmptyContext.java   | 2 +-
 src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java    | 2 +-
 src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java   | 2 +-
 src/test/jmh/io/lettuce/core/protocol/JmhMain.java        | 2 +-
 .../io/lettuce/core/protocol/RedisEndpointBenchmark.java  | 2 +-
 .../lettuce/core/protocol/RedisStateMachineBenchmark.java | 2 +-
 .../core/support/AsyncConnectionPoolBenchmark.java        | 2 +-
 .../core/support/GenericConnectionPoolBenchmark.java      | 2 +-
 src/test/jmh/io/lettuce/core/support/JmhMain.java         | 2 +-
 925 files changed, 932 insertions(+), 932 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index d4abfc6b02..e4df5546bc 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index c1ca9af793..b60f59c106 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 7f1c460ecc..0b3ecf261f 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/BitFieldArgs.java b/src/main/java/io/lettuce/core/BitFieldArgs.java
index 8e8bde4325..82388cc3cd 100644
--- a/src/main/java/io/lettuce/core/BitFieldArgs.java
+++ b/src/main/java/io/lettuce/core/BitFieldArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ChannelGroupListener.java b/src/main/java/io/lettuce/core/ChannelGroupListener.java
index bf09c6788b..84236302b5 100644
--- a/src/main/java/io/lettuce/core/ChannelGroupListener.java
+++ b/src/main/java/io/lettuce/core/ChannelGroupListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index bef3bb694f..2cb2e7715b 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/CloseEvents.java b/src/main/java/io/lettuce/core/CloseEvents.java
index 6f4f58419a..061061ff49 100644
--- a/src/main/java/io/lettuce/core/CloseEvents.java
+++ b/src/main/java/io/lettuce/core/CloseEvents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/CompositeArgument.java b/src/main/java/io/lettuce/core/CompositeArgument.java
index 124f12a75e..487ad8e07e 100644
--- a/src/main/java/io/lettuce/core/CompositeArgument.java
+++ b/src/main/java/io/lettuce/core/CompositeArgument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index 99349379d7..dc34b4d2c5 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ConnectionEventTrigger.java b/src/main/java/io/lettuce/core/ConnectionEventTrigger.java
index a78f6eb561..2a38b82abb 100644
--- a/src/main/java/io/lettuce/core/ConnectionEventTrigger.java
+++ b/src/main/java/io/lettuce/core/ConnectionEventTrigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ConnectionEvents.java b/src/main/java/io/lettuce/core/ConnectionEvents.java
index 1d6191545f..ce5acfbcc1 100644
--- a/src/main/java/io/lettuce/core/ConnectionEvents.java
+++ b/src/main/java/io/lettuce/core/ConnectionEvents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ConnectionFuture.java b/src/main/java/io/lettuce/core/ConnectionFuture.java
index 37f8a3a791..9c760e81d6 100644
--- a/src/main/java/io/lettuce/core/ConnectionFuture.java
+++ b/src/main/java/io/lettuce/core/ConnectionFuture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ConnectionId.java b/src/main/java/io/lettuce/core/ConnectionId.java
index 694e4c17ec..4db53705c4 100644
--- a/src/main/java/io/lettuce/core/ConnectionId.java
+++ b/src/main/java/io/lettuce/core/ConnectionId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ConnectionPoint.java b/src/main/java/io/lettuce/core/ConnectionPoint.java
index a7c1934563..7ee4e308af 100644
--- a/src/main/java/io/lettuce/core/ConnectionPoint.java
+++ b/src/main/java/io/lettuce/core/ConnectionPoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/Consumer.java b/src/main/java/io/lettuce/core/Consumer.java
index 2a80616d2f..13bfb9b491 100644
--- a/src/main/java/io/lettuce/core/Consumer.java
+++ b/src/main/java/io/lettuce/core/Consumer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/DefaultConnectionFuture.java b/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
index fd9cab4a90..039e1ed599 100644
--- a/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
+++ b/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/EpollProvider.java b/src/main/java/io/lettuce/core/EpollProvider.java
index 0f6c2b7419..52582edd7a 100644
--- a/src/main/java/io/lettuce/core/EpollProvider.java
+++ b/src/main/java/io/lettuce/core/EpollProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ExceptionFactory.java b/src/main/java/io/lettuce/core/ExceptionFactory.java
index 9b9326c03c..6976e364be 100644
--- a/src/main/java/io/lettuce/core/ExceptionFactory.java
+++ b/src/main/java/io/lettuce/core/ExceptionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
index d8393378fe..57a5bffaf2 100644
--- a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/GeoArgs.java b/src/main/java/io/lettuce/core/GeoArgs.java
index a834d490cb..c8ec6b01ed 100644
--- a/src/main/java/io/lettuce/core/GeoArgs.java
+++ b/src/main/java/io/lettuce/core/GeoArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/GeoCoordinates.java b/src/main/java/io/lettuce/core/GeoCoordinates.java
index a094871664..9d20904232 100644
--- a/src/main/java/io/lettuce/core/GeoCoordinates.java
+++ b/src/main/java/io/lettuce/core/GeoCoordinates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java b/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
index d6ad5a8520..8ce17e59a4 100644
--- a/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
+++ b/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/GeoWithin.java b/src/main/java/io/lettuce/core/GeoWithin.java
index 9540002c30..d6985a568f 100644
--- a/src/main/java/io/lettuce/core/GeoWithin.java
+++ b/src/main/java/io/lettuce/core/GeoWithin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/JavaRuntime.java b/src/main/java/io/lettuce/core/JavaRuntime.java
index 9136f4ea64..71dc119326 100644
--- a/src/main/java/io/lettuce/core/JavaRuntime.java
+++ b/src/main/java/io/lettuce/core/JavaRuntime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/KeyScanCursor.java b/src/main/java/io/lettuce/core/KeyScanCursor.java
index d6cba4df83..d41f695c8a 100644
--- a/src/main/java/io/lettuce/core/KeyScanCursor.java
+++ b/src/main/java/io/lettuce/core/KeyScanCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/KeyValue.java b/src/main/java/io/lettuce/core/KeyValue.java
index a943d5a484..f6e8bed99e 100644
--- a/src/main/java/io/lettuce/core/KeyValue.java
+++ b/src/main/java/io/lettuce/core/KeyValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/KillArgs.java b/src/main/java/io/lettuce/core/KillArgs.java
index 350f90a2f2..65b2827d7b 100644
--- a/src/main/java/io/lettuce/core/KillArgs.java
+++ b/src/main/java/io/lettuce/core/KillArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/KqueueProvider.java b/src/main/java/io/lettuce/core/KqueueProvider.java
index 85ce5c959c..26e9c2cdb5 100644
--- a/src/main/java/io/lettuce/core/KqueueProvider.java
+++ b/src/main/java/io/lettuce/core/KqueueProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/LettuceFutures.java b/src/main/java/io/lettuce/core/LettuceFutures.java
index a09f15e6a6..44f6f0ca33 100644
--- a/src/main/java/io/lettuce/core/LettuceFutures.java
+++ b/src/main/java/io/lettuce/core/LettuceFutures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/LettuceStrings.java b/src/main/java/io/lettuce/core/LettuceStrings.java
index ab36629564..64e5fa01d7 100644
--- a/src/main/java/io/lettuce/core/LettuceStrings.java
+++ b/src/main/java/io/lettuce/core/LettuceStrings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/Limit.java b/src/main/java/io/lettuce/core/Limit.java
index a2fac3fa6b..499708776c 100644
--- a/src/main/java/io/lettuce/core/Limit.java
+++ b/src/main/java/io/lettuce/core/Limit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/MapScanCursor.java b/src/main/java/io/lettuce/core/MapScanCursor.java
index 17e41b30fd..4285b3dc09 100644
--- a/src/main/java/io/lettuce/core/MapScanCursor.java
+++ b/src/main/java/io/lettuce/core/MapScanCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/MigrateArgs.java b/src/main/java/io/lettuce/core/MigrateArgs.java
index 6a32984929..4d157b6def 100644
--- a/src/main/java/io/lettuce/core/MigrateArgs.java
+++ b/src/main/java/io/lettuce/core/MigrateArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/Operators.java b/src/main/java/io/lettuce/core/Operators.java
index 6f42927591..034ac71633 100644
--- a/src/main/java/io/lettuce/core/Operators.java
+++ b/src/main/java/io/lettuce/core/Operators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/PlainChannelInitializer.java b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
index a1e42cd885..95847b3d03 100644
--- a/src/main/java/io/lettuce/core/PlainChannelInitializer.java
+++ b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/Range.java b/src/main/java/io/lettuce/core/Range.java
index 9631a3a5ff..3041dd7a91 100644
--- a/src/main/java/io/lettuce/core/Range.java
+++ b/src/main/java/io/lettuce/core/Range.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ReadFrom.java b/src/main/java/io/lettuce/core/ReadFrom.java
index 45c1c00690..bb18ccb851 100644
--- a/src/main/java/io/lettuce/core/ReadFrom.java
+++ b/src/main/java/io/lettuce/core/ReadFrom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ReadFromImpl.java b/src/main/java/io/lettuce/core/ReadFromImpl.java
index 7f42331280..a796659c25 100644
--- a/src/main/java/io/lettuce/core/ReadFromImpl.java
+++ b/src/main/java/io/lettuce/core/ReadFromImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java
index 9a9591fd8a..f520a9f563 100644
--- a/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisBusyException.java b/src/main/java/io/lettuce/core/RedisBusyException.java
index 907d3148a0..9151dc9122 100644
--- a/src/main/java/io/lettuce/core/RedisBusyException.java
+++ b/src/main/java/io/lettuce/core/RedisBusyException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisChannelHandler.java b/src/main/java/io/lettuce/core/RedisChannelHandler.java
index c94a067693..dc44ca8973 100644
--- a/src/main/java/io/lettuce/core/RedisChannelHandler.java
+++ b/src/main/java/io/lettuce/core/RedisChannelHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisChannelInitializer.java b/src/main/java/io/lettuce/core/RedisChannelInitializer.java
index 14b80aeac9..be576b2cde 100644
--- a/src/main/java/io/lettuce/core/RedisChannelInitializer.java
+++ b/src/main/java/io/lettuce/core/RedisChannelInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java b/src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java
index 0ca14e7f20..96c743df56 100644
--- a/src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java
+++ b/src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisChannelWriter.java b/src/main/java/io/lettuce/core/RedisChannelWriter.java
index 7a2f96b668..831fd712cf 100644
--- a/src/main/java/io/lettuce/core/RedisChannelWriter.java
+++ b/src/main/java/io/lettuce/core/RedisChannelWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,7 +69,7 @@ public interface RedisChannelWriter extends Closeable, AsyncCloseable {
      * Reset the command state. Queued commands will be canceled and the internal state will be reset. This is useful when the
      * internal state machine gets out of sync with the connection (e.g. errors during external SSL tunneling). Calling this
      * method will reset the protocol state, therefore it is considered unsafe.
-     * 
+     *
      * @deprecated since 5.2. This method is unsafe and can cause protocol offsets (i.e. Redis commands are completed with
      *             previous command values).
      */
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 2a46406770..21b3d71b4b 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 8b250ea8ae..0a898c1c1b 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisCommandExecutionException.java b/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
index 4af14f70cb..acf3ac7d69 100644
--- a/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java b/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java
index 02491e4d55..fa22353813 100644
--- a/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java b/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
index 8ba5483a15..e525e16f64 100644
--- a/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisConnectionException.java b/src/main/java/io/lettuce/core/RedisConnectionException.java
index 75e6eb161f..48e0dcbba5 100644
--- a/src/main/java/io/lettuce/core/RedisConnectionException.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java b/src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java
index fff7c64fcc..d76932f7a6 100644
--- a/src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisConnectionStateListener.java b/src/main/java/io/lettuce/core/RedisConnectionStateListener.java
index 326a28c109..fbb304ee9e 100644
--- a/src/main/java/io/lettuce/core/RedisConnectionStateListener.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionStateListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisException.java b/src/main/java/io/lettuce/core/RedisException.java
index a66932df8d..74b5964600 100644
--- a/src/main/java/io/lettuce/core/RedisException.java
+++ b/src/main/java/io/lettuce/core/RedisException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisFuture.java b/src/main/java/io/lettuce/core/RedisFuture.java
index 7b0c960a00..54e397b663 100644
--- a/src/main/java/io/lettuce/core/RedisFuture.java
+++ b/src/main/java/io/lettuce/core/RedisFuture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisLoadingException.java b/src/main/java/io/lettuce/core/RedisLoadingException.java
index 702c230c12..773fe8abe4 100644
--- a/src/main/java/io/lettuce/core/RedisLoadingException.java
+++ b/src/main/java/io/lettuce/core/RedisLoadingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisNoScriptException.java b/src/main/java/io/lettuce/core/RedisNoScriptException.java
index 3009360160..a2f7dc6754 100644
--- a/src/main/java/io/lettuce/core/RedisNoScriptException.java
+++ b/src/main/java/io/lettuce/core/RedisNoScriptException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index 5146ce7617..8e8f08863f 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
index 64b6544d1d..c3faecb591 100644
--- a/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index d974ef2b94..e5d34013e8 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/RestoreArgs.java b/src/main/java/io/lettuce/core/RestoreArgs.java
index a1a9a46a07..9f7fe2dcf2 100644
--- a/src/main/java/io/lettuce/core/RestoreArgs.java
+++ b/src/main/java/io/lettuce/core/RestoreArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ScanArgs.java b/src/main/java/io/lettuce/core/ScanArgs.java
index 0e60551043..f1624b1de0 100644
--- a/src/main/java/io/lettuce/core/ScanArgs.java
+++ b/src/main/java/io/lettuce/core/ScanArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ScanCursor.java b/src/main/java/io/lettuce/core/ScanCursor.java
index 8d88a72513..f24c0a2570 100644
--- a/src/main/java/io/lettuce/core/ScanCursor.java
+++ b/src/main/java/io/lettuce/core/ScanCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ScanIterator.java b/src/main/java/io/lettuce/core/ScanIterator.java
index 40b1ad2d5e..e5b4b596f2 100644
--- a/src/main/java/io/lettuce/core/ScanIterator.java
+++ b/src/main/java/io/lettuce/core/ScanIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ScanStream.java b/src/main/java/io/lettuce/core/ScanStream.java
index 79002e0362..1f3ba0948c 100644
--- a/src/main/java/io/lettuce/core/ScanStream.java
+++ b/src/main/java/io/lettuce/core/ScanStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ScoredValue.java b/src/main/java/io/lettuce/core/ScoredValue.java
index 98e0621e5e..6b9a7fc043 100644
--- a/src/main/java/io/lettuce/core/ScoredValue.java
+++ b/src/main/java/io/lettuce/core/ScoredValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ScoredValueScanCursor.java b/src/main/java/io/lettuce/core/ScoredValueScanCursor.java
index c0cab45302..23bfe24ad1 100644
--- a/src/main/java/io/lettuce/core/ScoredValueScanCursor.java
+++ b/src/main/java/io/lettuce/core/ScoredValueScanCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ScriptOutputType.java b/src/main/java/io/lettuce/core/ScriptOutputType.java
index 5a280c43ad..373a58cd26 100644
--- a/src/main/java/io/lettuce/core/ScriptOutputType.java
+++ b/src/main/java/io/lettuce/core/ScriptOutputType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/SetArgs.java b/src/main/java/io/lettuce/core/SetArgs.java
index 62aa180a9d..ad2458ef47 100644
--- a/src/main/java/io/lettuce/core/SetArgs.java
+++ b/src/main/java/io/lettuce/core/SetArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/SocketOptions.java b/src/main/java/io/lettuce/core/SocketOptions.java
index 62121c22a1..40a0fb7a3b 100644
--- a/src/main/java/io/lettuce/core/SocketOptions.java
+++ b/src/main/java/io/lettuce/core/SocketOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/SortArgs.java b/src/main/java/io/lettuce/core/SortArgs.java
index 6432c3ac2f..83854f0129 100644
--- a/src/main/java/io/lettuce/core/SortArgs.java
+++ b/src/main/java/io/lettuce/core/SortArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/SslConnectionBuilder.java b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
index 3923363e50..fa0652426c 100644
--- a/src/main/java/io/lettuce/core/SslConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/SslOptions.java b/src/main/java/io/lettuce/core/SslOptions.java
index 5c76cec316..f6f603e70d 100644
--- a/src/main/java/io/lettuce/core/SslOptions.java
+++ b/src/main/java/io/lettuce/core/SslOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
index ca6b27e43a..9df794d90e 100644
--- a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/StreamMessage.java b/src/main/java/io/lettuce/core/StreamMessage.java
index 2509410353..c4cd07d3db 100644
--- a/src/main/java/io/lettuce/core/StreamMessage.java
+++ b/src/main/java/io/lettuce/core/StreamMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/StreamScanCursor.java b/src/main/java/io/lettuce/core/StreamScanCursor.java
index cce32f04cd..68ed31e760 100644
--- a/src/main/java/io/lettuce/core/StreamScanCursor.java
+++ b/src/main/java/io/lettuce/core/StreamScanCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/TimeoutOptions.java b/src/main/java/io/lettuce/core/TimeoutOptions.java
index 7a93943d18..10aa300d94 100644
--- a/src/main/java/io/lettuce/core/TimeoutOptions.java
+++ b/src/main/java/io/lettuce/core/TimeoutOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/TransactionResult.java b/src/main/java/io/lettuce/core/TransactionResult.java
index 2fc6bd230d..a1adfddd7f 100644
--- a/src/main/java/io/lettuce/core/TransactionResult.java
+++ b/src/main/java/io/lettuce/core/TransactionResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/Transports.java b/src/main/java/io/lettuce/core/Transports.java
index bda26a196c..13f713d35a 100644
--- a/src/main/java/io/lettuce/core/Transports.java
+++ b/src/main/java/io/lettuce/core/Transports.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/UnblockType.java b/src/main/java/io/lettuce/core/UnblockType.java
index d96a256828..07cdfd18a2 100644
--- a/src/main/java/io/lettuce/core/UnblockType.java
+++ b/src/main/java/io/lettuce/core/UnblockType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/Value.java b/src/main/java/io/lettuce/core/Value.java
index 483b5860f4..371cc6c382 100644
--- a/src/main/java/io/lettuce/core/Value.java
+++ b/src/main/java/io/lettuce/core/Value.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ValueScanCursor.java b/src/main/java/io/lettuce/core/ValueScanCursor.java
index 19330b27fb..0f8c84578a 100644
--- a/src/main/java/io/lettuce/core/ValueScanCursor.java
+++ b/src/main/java/io/lettuce/core/ValueScanCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/XAddArgs.java b/src/main/java/io/lettuce/core/XAddArgs.java
index 8ea3a03c0d..a102df264f 100644
--- a/src/main/java/io/lettuce/core/XAddArgs.java
+++ b/src/main/java/io/lettuce/core/XAddArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/XClaimArgs.java b/src/main/java/io/lettuce/core/XClaimArgs.java
index f69a11d4de..0d9743ad6a 100644
--- a/src/main/java/io/lettuce/core/XClaimArgs.java
+++ b/src/main/java/io/lettuce/core/XClaimArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/XGroupCreateArgs.java b/src/main/java/io/lettuce/core/XGroupCreateArgs.java
index 0f0b021825..2f270ca412 100644
--- a/src/main/java/io/lettuce/core/XGroupCreateArgs.java
+++ b/src/main/java/io/lettuce/core/XGroupCreateArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/XReadArgs.java b/src/main/java/io/lettuce/core/XReadArgs.java
index a30e1a8d64..52104c3127 100644
--- a/src/main/java/io/lettuce/core/XReadArgs.java
+++ b/src/main/java/io/lettuce/core/XReadArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ZAddArgs.java b/src/main/java/io/lettuce/core/ZAddArgs.java
index a0069e3741..cae4dd4952 100644
--- a/src/main/java/io/lettuce/core/ZAddArgs.java
+++ b/src/main/java/io/lettuce/core/ZAddArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/ZStoreArgs.java b/src/main/java/io/lettuce/core/ZStoreArgs.java
index 4adeb7308c..df3b824b87 100644
--- a/src/main/java/io/lettuce/core/ZStoreArgs.java
+++ b/src/main/java/io/lettuce/core/ZStoreArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/StatefulConnection.java b/src/main/java/io/lettuce/core/api/StatefulConnection.java
index 96840f5d86..e1329934c0 100644
--- a/src/main/java/io/lettuce/core/api/StatefulConnection.java
+++ b/src/main/java/io/lettuce/core/api/StatefulConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -115,7 +115,7 @@ public interface StatefulConnection<K, V> extends AutoCloseable, AsyncCloseable
      * Reset the command state. Queued commands will be canceled and the internal state will be reset. This is useful when the
      * internal state machine gets out of sync with the connection (e.g. errors during external SSL tunneling). Calling this
      * method will reset the protocol state, therefore it is considered unsafe.
-     * 
+     *
      * @deprecated since 5.2. This method is unsafe and can cause protocol offsets (i.e. Redis commands are completed with
      *             previous command values).
      */
diff --git a/src/main/java/io/lettuce/core/api/StatefulRedisConnection.java b/src/main/java/io/lettuce/core/api/StatefulRedisConnection.java
index 7f88474578..51773460d1 100644
--- a/src/main/java/io/lettuce/core/api/StatefulRedisConnection.java
+++ b/src/main/java/io/lettuce/core/api/StatefulRedisConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
index cce1bb5e93..8b10f2fd4e 100644
--- a/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
index bb8b27c10f..46eb37a1f9 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java
index 5e7f2d1967..94ee875da1 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java
index a03270d62d..6e20872884 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
index 485cb714d5..19bde49298 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
index 9338647860..868edfc477 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java
index 895cb5009f..634e770ec8 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
index f6919105ce..ea65ec519d 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
index 1b82ad46cd..6912cde1bb 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java
index f4c617d74e..98f84f402f 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
index 2fd46ff808..648439b13f 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
index 1540a127d7..cd1e3d5a4e 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java
index b0a3333966..79b3712cb0 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
index 91c31a1644..81f659ec7b 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
index ac037ad270..f8470c75cf 100644
--- a/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java
index 8a2ba5ba26..1a979b5787 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java
index 1315e62da7..7914de9a70 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
index 47a287eefd..39a400bb80 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
index 856e994c0b..82f4502a50 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java
index 5264c1b5b2..828c15eeb1 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
index 70c5c8aee1..82df806bac 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
index dbd6b61f62..6d8f893fb9 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
index 0b1cda9e80..7b5c1ed928 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java
index 397cbeaa40..2fc4c32e1c 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
index bd695f2986..8e211f1468 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
index c774ff5463..81e488eca7 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java
index de443ca3cf..a3c139896c 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
index 5ea1c520c5..657e56c691 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java b/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
index 0dd29073a1..4041de994f 100644
--- a/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
index f93a46b29c..b8974dacac 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java
index a257b4d33a..156ec90a06 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java
index 54b5176d99..e5a1a881f3 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
index 61e696ca5c..573987ae9d 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
index 70420701ff..a2ec9330ba 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java
index f0008a8cb4..00dbf2b115 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
index ca67950999..8a69e902b6 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
index 4130b6663b..1af40db104 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java
index bf570ebf0a..4eb783c678 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
index d92c0afb41..789e36dbac 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
index b67cf3855d..a38841cf53 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java
index c32cbadd92..3380abfb61 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
index 0353f48842..635101cc36 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
index 70b29ba888..2fec9083f7 100644
--- a/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java b/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java
index 7a2d5ff52e..64a6f93de1 100644
--- a/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/AsyncClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/AsyncClusterConnectionProvider.java
index a580974f42..42e2f2f65b 100644
--- a/src/main/java/io/lettuce/core/cluster/AsyncClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/AsyncClusterConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
index 0c41a4daad..001c02591f 100644
--- a/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index 8e74315253..d1d8d33f88 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterCommand.java b/src/main/java/io/lettuce/core/cluster/ClusterCommand.java
index 156fcc28f9..c86f56a8a3 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterCommand.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
index 0b9d553ebd..ca6b5a5331 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index b43fcbd9bf..1110cb6520 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java b/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
index 1499afb922..89c9cc9fda 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
index 0a823aa08a..7c9955594c 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java
index ab3fa570af..26887dbcc0 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java b/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
index a11eedbc2e..970d51e2b6 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
index 691b2a6ebf..7f91cc1902 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 the original author or authors.
+ * Copyright 2015-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java b/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java
index ec030b17cd..76ab91d4cf 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
index da85599d70..5a82cb5304 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
index e036f57e45..98250ca331 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java b/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
index 41caf2cb23..2536a4bd48 100644
--- a/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java b/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
index bb1de36033..f9b1eb26c3 100644
--- a/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
+++ b/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
index 10c39b3747..4bfe1a1ccd 100644
--- a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java b/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java
index 2f2876373a..4fe5f29bbe 100644
--- a/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionException.java b/src/main/java/io/lettuce/core/cluster/PartitionException.java
index 9f7db781f0..8fa6a36e37 100644
--- a/src/main/java/io/lettuce/core/cluster/PartitionException.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionSelectorException.java b/src/main/java/io/lettuce/core/cluster/PartitionSelectorException.java
index 8b02cf0419..7dc7148f1d 100644
--- a/src/main/java/io/lettuce/core/cluster/PartitionSelectorException.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionSelectorException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java b/src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java
index 9e9f588c72..c23c57a43e 100644
--- a/src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java b/src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java
index 581a220657..7cc7939706 100644
--- a/src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java b/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
index 83486076fa..d0248a8958 100644
--- a/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
+++ b/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
index 96299c24ca..e6997f5d83 100644
--- a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java b/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java
index 87dd0d7f12..6573f66b30 100644
--- a/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java
+++ b/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
index 01e5275e71..4768518882 100644
--- a/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
index 2df5f65f1f..eec26f6fe3 100644
--- a/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java b/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java
index 4c138cec71..108de74be3 100644
--- a/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java
+++ b/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index b11c74276e..9a4d1c196a 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index f8cd0987f3..e24d02ac59 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index fecf1b1507..6f7954d6c3 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
index c593763d8d..977fec2d3e 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
index 76c93cba1d..d3c25073c1 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java b/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java
index 80911457fe..f7e4ffb494 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RedisState.java b/src/main/java/io/lettuce/core/cluster/RedisState.java
index 85702b9816..34ba42011f 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisState.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RoundRobin.java b/src/main/java/io/lettuce/core/cluster/RoundRobin.java
index 333687a249..90fa5d75a0 100644
--- a/src/main/java/io/lettuce/core/cluster/RoundRobin.java
+++ b/src/main/java/io/lettuce/core/cluster/RoundRobin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java b/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
index fdc5cd1dee..19cd4856f4 100644
--- a/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
+++ b/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/SlotHash.java b/src/main/java/io/lettuce/core/cluster/SlotHash.java
index 5350c2dd02..e788d5cd71 100644
--- a/src/main/java/io/lettuce/core/cluster/SlotHash.java
+++ b/src/main/java/io/lettuce/core/cluster/SlotHash.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
index c1b7196369..b8f59a8336 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
index 2def1ef8f9..6d1e083df9 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java b/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
index 9339997ebc..40e3c33b21 100644
--- a/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java
index 969fc7e73e..1396b09ab1 100644
--- a/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/UnknownPartitionException.java b/src/main/java/io/lettuce/core/cluster/UnknownPartitionException.java
index 0c5eda07c4..a5970c7439 100644
--- a/src/main/java/io/lettuce/core/cluster/UnknownPartitionException.java
+++ b/src/main/java/io/lettuce/core/cluster/UnknownPartitionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java b/src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java
index 8278efa9c7..9b192983d2 100644
--- a/src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java
+++ b/src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java b/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
index 94834aef05..e2df2a0184 100644
--- a/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
+++ b/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java b/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
index 89831ffa2a..a0848fa21a 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java b/src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java
index 1f7f6cb188..d4735dd4a1 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
index 651bc0434b..c31616bba0 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java
index 905e2fb0a1..7e02378711 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java
index 3d90816637..0b5d5a892a 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java
index a2e80654eb..bbab5bd798 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
index 2d7f903c3c..0b88c463d5 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
index 87671e76b5..83e925738c 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java
index 53b7bd38b8..4db95ffad9 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
index 5a389c548b..1232d12263 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
index a7070de1b7..6af9894974 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java
index 4ef84eb88a..b254c41500 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
index f81f793586..eb8e623745 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
index 4cbe0e2c2b..fd80dc5b19 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java
index 08524cf5c0..ff5061fb83 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
index 76cec87532..6b5905ea64 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
index 73f5762995..9a8ce99738 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java b/src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java
index 5cab71a9b1..213c10dc24 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
index 196f17a8ed..5e9bc10503 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
index eab623dffd..4357f42624 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
index f9d5015007..aeb52ebb76 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/Executions.java b/src/main/java/io/lettuce/core/cluster/api/sync/Executions.java
index b83595513e..929f889a51 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/Executions.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/Executions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java
index 7962b7da21..119e77f0a8 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java
index 0a2026c180..ff33a80c58 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java
index bf9aba8af9..7b5dbc3630 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java
index ee5f9783b1..d1aea1e6e5 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
index 6283b302b0..9a625c134b 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
index 0ce11bf22d..125c1594d7 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java
index 4ac50532f0..dc43ff597d 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
index d8bd4134b1..0e8cc1c8fa 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
index 38fefd0f61..393514cce4 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java
index 10be1f3ee5..d0edaec863 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
index bc082a0891..9f7460a9d3 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
index cdca1cba4b..401f27b474 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java
index 9901308131..e6619c5a89 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
index 39d5b9c64d..a7842f4545 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
index 6bb7b4e019..6a48668804 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java b/src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java
index dd4ae78fb4..6cee7c9693 100644
--- a/src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java
+++ b/src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java b/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
index 4af2934a97..3152ff046a 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
index a3cfb9e3aa..ecfdd8643b 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
index ebee0b16b7..a6570c9c39 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java
index a58471ef8a..132d0c1cfd 100644
--- a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java
+++ b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
index b7629c630e..62041f14f6 100644
--- a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
+++ b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java
index 65f412cd65..6e7fc50191 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java
index 1279230e6d..8034c696bd 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
index 632aaaf107..33da9f24a7 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
index f91b7ade31..5827ef7d73 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
index 1a1cf2808b..1564b21c99 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
index d9268922c6..db29495371 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
index 9585c8ae81..421e0f0c05 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
index a691d6db58..303bf96162 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
index 31889d8099..cb32be6125 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
index 2c4d3e39e9..e00c0ed5f1 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java
index fcce658b86..bee1503089 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
index 1096e02cf5..e44fde97f5 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java b/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
index fe3fb96412..acd6dcbb60 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
index b63d7fb617..fb9cb9efd9 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/Connections.java b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
index 68943ccd27..d770e2bd18 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Connections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java
index 2261e8053e..df8fae2bab 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
index b59096de74..0fd96926f9 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
index c65004fa3d..c399f365f3 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java b/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java
index 8debf6a75f..31f4a13a1e 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java b/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
index 103240ec40..38d6dff24d 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/Requests.java b/src/main/java/io/lettuce/core/cluster/topology/Requests.java
index 0adcdb1768..51b0163cec 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Requests.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Requests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java b/src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java
index 3705dab24f..94663f1c98 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
index e28d27dcf8..d583d9fd16 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/codec/Base16.java b/src/main/java/io/lettuce/core/codec/Base16.java
index 0d4c2adbab..96ed462d25 100644
--- a/src/main/java/io/lettuce/core/codec/Base16.java
+++ b/src/main/java/io/lettuce/core/codec/Base16.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java b/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
index cb9cd96e2f..75073daf85 100644
--- a/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
+++ b/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java b/src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java
index 148dda4263..9266b9895d 100644
--- a/src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java
+++ b/src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/codec/CRC16.java b/src/main/java/io/lettuce/core/codec/CRC16.java
index af1fddbf72..2ed3db1da2 100644
--- a/src/main/java/io/lettuce/core/codec/CRC16.java
+++ b/src/main/java/io/lettuce/core/codec/CRC16.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/codec/CompressionCodec.java b/src/main/java/io/lettuce/core/codec/CompressionCodec.java
index 59f08b42d4..269db5b36b 100644
--- a/src/main/java/io/lettuce/core/codec/CompressionCodec.java
+++ b/src/main/java/io/lettuce/core/codec/CompressionCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/codec/RedisCodec.java b/src/main/java/io/lettuce/core/codec/RedisCodec.java
index 63075c3d06..d432b3eecd 100644
--- a/src/main/java/io/lettuce/core/codec/RedisCodec.java
+++ b/src/main/java/io/lettuce/core/codec/RedisCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/codec/StringCodec.java b/src/main/java/io/lettuce/core/codec/StringCodec.java
index 6047465989..209f6c7d76 100644
--- a/src/main/java/io/lettuce/core/codec/StringCodec.java
+++ b/src/main/java/io/lettuce/core/codec/StringCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java b/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java
index 66c9cecbc3..83a73753a6 100644
--- a/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java
+++ b/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java b/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
index 0dc719a418..4539fff946 100644
--- a/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
+++ b/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
index 9ee557bdf7..3e37e4a40e 100644
--- a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java
index 2694ccbeea..33952d43f1 100644
--- a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
index dcef5b0c88..b870d057c9 100644
--- a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java
index 239643b3b2..f82fb1b610 100644
--- a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/BatchTasks.java b/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
index 599b51bcc8..ec77bca3e7 100644
--- a/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/Batcher.java b/src/main/java/io/lettuce/core/dynamic/Batcher.java
index f39bd27cd9..efca69b2b6 100644
--- a/src/main/java/io/lettuce/core/dynamic/Batcher.java
+++ b/src/main/java/io/lettuce/core/dynamic/Batcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java
index 3ee7566e85..ff7d2d0dfa 100644
--- a/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java
+++ b/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java b/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java
index e0620e7180..7d08709c5b 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandFactory.java b/src/main/java/io/lettuce/core/dynamic/CommandFactory.java
index 9cd92bf00a..698a74a5f7 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java
index 942a2d71ec..580d4bddd1 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandMethod.java b/src/main/java/io/lettuce/core/dynamic/CommandMethod.java
index 970d09c32e..50a35bd10a 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandMethod.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java b/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java
index 9e5e0ab4bc..74b2a99ad8 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java b/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java
index 55adbd4ea7..04711781f6 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java
index 8de65ead23..7f239514b7 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/Commands.java b/src/main/java/io/lettuce/core/dynamic/Commands.java
index 66d8ace9e5..0f587fa65e 100644
--- a/src/main/java/io/lettuce/core/dynamic/Commands.java
+++ b/src/main/java/io/lettuce/core/dynamic/Commands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ConversionService.java b/src/main/java/io/lettuce/core/dynamic/ConversionService.java
index 6c3aa5e6b3..fbc6f3a9b4 100644
--- a/src/main/java/io/lettuce/core/dynamic/ConversionService.java
+++ b/src/main/java/io/lettuce/core/dynamic/ConversionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java b/src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java
index 6fb7598a14..b6aba7796f 100644
--- a/src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java b/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java
index 3d14f1e6fa..f7dd2fb210 100644
--- a/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java
+++ b/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java b/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java
index f722793c43..aa563ecda4 100644
--- a/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java
+++ b/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
index 8fe3be7083..35cdf39b3b 100644
--- a/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
+++ b/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java b/src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java
index 6ede38549a..82e9a68f06 100644
--- a/src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java
+++ b/src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java
index 12cfd2e2e9..348e5f9b67 100644
--- a/src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java
index f0a65a269f..9a393f5f91 100644
--- a/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java
index 8e0cb67420..667494af6f 100644
--- a/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java
+++ b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java b/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
index 817720228a..699a87a289 100644
--- a/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
+++ b/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java
index e4d4247be1..025f47d416 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java
index cceaad9870..2b8009dc82 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java
index 3e4d57897f..8135734a5c 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java b/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java
index a9222de3d4..c2afbbb0e5 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java b/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java
index 6313c2b723..ae51b8f562 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
index f8da86fa1c..68cfcaa166 100644
--- a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java
index b70deb82c2..5d1df42032 100644
--- a/src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java
+++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java b/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java
index 0537ae442e..7db61a9948 100644
--- a/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java
+++ b/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/annotation/Command.java b/src/main/java/io/lettuce/core/dynamic/annotation/Command.java
index 95ce825acb..50d7650b66 100644
--- a/src/main/java/io/lettuce/core/dynamic/annotation/Command.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/Command.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java b/src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java
index 3a3663d5ba..94b783c759 100644
--- a/src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/annotation/Key.java b/src/main/java/io/lettuce/core/dynamic/annotation/Key.java
index a7fbe074fc..52f8bd7205 100644
--- a/src/main/java/io/lettuce/core/dynamic/annotation/Key.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/Key.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/annotation/Param.java b/src/main/java/io/lettuce/core/dynamic/annotation/Param.java
index f58692e9bf..18e27c45c3 100644
--- a/src/main/java/io/lettuce/core/dynamic/annotation/Param.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/Param.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/annotation/Value.java b/src/main/java/io/lettuce/core/dynamic/annotation/Value.java
index 10d47f59e3..72b7da8912 100644
--- a/src/main/java/io/lettuce/core/dynamic/annotation/Value.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/Value.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java b/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java
index a35862ff87..1531ed3b33 100644
--- a/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java b/src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java
index deb8a55def..5d70f72959 100644
--- a/src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java b/src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java
index 1929565a04..a491c5125f 100644
--- a/src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java b/src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java
index 0d9c2731b4..0a77a63b9c 100644
--- a/src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
index c63775e0e4..ebb1ee5d17 100644
--- a/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java b/src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java
index 36952183bc..2a21ec3b3f 100644
--- a/src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java b/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java
index e15363dce6..fa6d453674 100644
--- a/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java
+++ b/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvokingInterceptor.java b/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvokingInterceptor.java
index d90b2aa3fd..3b7010f184 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvokingInterceptor.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvokingInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
index 485d50e633..b8109b1bfb 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/InvocationTargetProvider.java b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationTargetProvider.java
index 6887f5f642..07a0d5cc56 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/InvocationTargetProvider.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationTargetProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java
index 36c4b0e62e..3623eef9df 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java
index 47cbd511f7..a3bdf9f56a 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java
index 7c007a9b0c..983a05ae1e 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java
index ac6818dc5f..4876e66b57 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java
index 159d199b2e..f018122705 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java
index 002427b1e3..26b8c71fd4 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java
index 04df1d7838..eabef9a452 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
index bcc7e92f0e..9394202f43 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
index 60e5f23b70..bd4ad0f188 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java b/src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java
index 86abf4bdec..8afc253560 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/OutputType.java b/src/main/java/io/lettuce/core/dynamic/output/OutputType.java
index d18e95a823..172756ce59 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/OutputType.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java b/src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java
index 71d740dbb5..597b6909d1 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java b/src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java
index 3d5e5bd5f2..a1aaa15289 100644
--- a/src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/parameter/MethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/parameter/MethodParametersAccessor.java
index edbb4f5e31..75f2cc433b 100644
--- a/src/main/java/io/lettuce/core/dynamic/parameter/MethodParametersAccessor.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/MethodParametersAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java b/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java
index b886368cb1..5a1fb26be6 100644
--- a/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java b/src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java
index 4ffc99dcc8..69c84c8e0e 100644
--- a/src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java b/src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java
index 6fef7d3ac1..bc2629756d 100644
--- a/src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java
index 67b5a07bd0..8202c24873 100644
--- a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java
index a2a45dcf12..96339c0ffe 100644
--- a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
index 5ca8d53fb8..62acff37bd 100644
--- a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java
index 1bad9dbb89..26b217cae9 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java
index d6490f1485..07a824f8ea 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java
index 815be28a80..b23ae48dd2 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java
index 876ad42b57..edd5b0a9fa 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java b/src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java
index 19cf256166..d15a48bd9a 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java b/src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java
index 505bda0686..c4e6bb746b 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java
index eeecab99d2..c1c0cb7bd9 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java
index 18c71b0caf..58d44b26b6 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java
index 817475e450..381111967d 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java b/src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java
index b2aa73aed5..7fafe370c7 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java b/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java
index ed0efe93b7..012697f429 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java
index fa1e4d9ce5..f9128f31e4 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java
index 575859e520..55e950d30c 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java
index eeb9d84fd6..00cca8a69b 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java
index 8ae64109f0..4dbf7f3863 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java b/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java
index 06e7a41abf..44a86856a0 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java
index 397bde3288..967286a917 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/DefaultEventBus.java b/src/main/java/io/lettuce/core/event/DefaultEventBus.java
index 7fdb900be9..1251f7d3a8 100644
--- a/src/main/java/io/lettuce/core/event/DefaultEventBus.java
+++ b/src/main/java/io/lettuce/core/event/DefaultEventBus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java b/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java
index 9fb799c5f3..dd94ed747e 100644
--- a/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java
+++ b/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/Event.java b/src/main/java/io/lettuce/core/event/Event.java
index 3e6af319ad..b6978090e4 100644
--- a/src/main/java/io/lettuce/core/event/Event.java
+++ b/src/main/java/io/lettuce/core/event/Event.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/EventBus.java b/src/main/java/io/lettuce/core/event/EventBus.java
index f43c33fb67..1ac6c6292d 100644
--- a/src/main/java/io/lettuce/core/event/EventBus.java
+++ b/src/main/java/io/lettuce/core/event/EventBus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/EventPublisherOptions.java b/src/main/java/io/lettuce/core/event/EventPublisherOptions.java
index 5c29979508..23ca2e3263 100644
--- a/src/main/java/io/lettuce/core/event/EventPublisherOptions.java
+++ b/src/main/java/io/lettuce/core/event/EventPublisherOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java
index a489bb4305..96b9a71751 100644
--- a/src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java
index 413f97198e..cc49efc443 100644
--- a/src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java
index 19c463be5c..fb4063203a 100644
--- a/src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java
index c863b0358b..155ffcaad4 100644
--- a/src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java b/src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java
index 99cfd1410c..eaf9dfd050 100644
--- a/src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java b/src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java
index 60b144cac7..65a20f1c1f 100644
--- a/src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/connection/ReconnectFailedEvent.java b/src/main/java/io/lettuce/core/event/connection/ReconnectFailedEvent.java
index 1ee36c2e35..d23f3ec935 100644
--- a/src/main/java/io/lettuce/core/event/connection/ReconnectFailedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ReconnectFailedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java b/src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java
index 092df5733b..2cc3b191a7 100644
--- a/src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java
+++ b/src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java b/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
index b6021c8905..7e061466a6 100644
--- a/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
+++ b/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java b/src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java
index 44eb49bfd2..827d0f655a 100644
--- a/src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java
+++ b/src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java b/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
index bf5fd2ec21..0601ebcb1d 100644
--- a/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/AsyncCloseable.java b/src/main/java/io/lettuce/core/internal/AsyncCloseable.java
index 746d404511..123296ceff 100644
--- a/src/main/java/io/lettuce/core/internal/AsyncCloseable.java
+++ b/src/main/java/io/lettuce/core/internal/AsyncCloseable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java b/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
index f2db9ebc0d..2d3d4a4f54 100644
--- a/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/DefaultMethods.java b/src/main/java/io/lettuce/core/internal/DefaultMethods.java
index 197ea5475b..0092d23ab1 100644
--- a/src/main/java/io/lettuce/core/internal/DefaultMethods.java
+++ b/src/main/java/io/lettuce/core/internal/DefaultMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/Futures.java b/src/main/java/io/lettuce/core/internal/Futures.java
index 05fc24f9c9..c4750df429 100644
--- a/src/main/java/io/lettuce/core/internal/Futures.java
+++ b/src/main/java/io/lettuce/core/internal/Futures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/HostAndPort.java b/src/main/java/io/lettuce/core/internal/HostAndPort.java
index da32b940c0..3f89f86d72 100644
--- a/src/main/java/io/lettuce/core/internal/HostAndPort.java
+++ b/src/main/java/io/lettuce/core/internal/HostAndPort.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/LettuceAssert.java b/src/main/java/io/lettuce/core/internal/LettuceAssert.java
index 0519ee8832..812d1a3463 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceAssert.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceAssert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/LettuceClassUtils.java b/src/main/java/io/lettuce/core/internal/LettuceClassUtils.java
index 7e725a7c85..120cc09967 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceClassUtils.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceClassUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/LettuceFactories.java b/src/main/java/io/lettuce/core/internal/LettuceFactories.java
index 8824bc6c27..31e768ee5d 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceFactories.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceFactories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/LettuceLists.java b/src/main/java/io/lettuce/core/internal/LettuceLists.java
index 5be065ba17..ec826398b2 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceLists.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceLists.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/LettuceSets.java b/src/main/java/io/lettuce/core/internal/LettuceSets.java
index 879c70693e..c653c6b504 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceSets.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceSets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/internal/TimeoutProvider.java b/src/main/java/io/lettuce/core/internal/TimeoutProvider.java
index 480d46c868..dfe9d99fd6 100644
--- a/src/main/java/io/lettuce/core/internal/TimeoutProvider.java
+++ b/src/main/java/io/lettuce/core/internal/TimeoutProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java b/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
index 228facf33d..04cc0f35ba 100644
--- a/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
+++ b/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java b/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
index 76e746a23e..aec7bd4da8 100644
--- a/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
+++ b/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java b/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
index 51c16d1b9c..6ff8f561c9 100644
--- a/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
+++ b/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/Connections.java b/src/main/java/io/lettuce/core/masterslave/Connections.java
index 798e175f27..e04939dbaa 100644
--- a/src/main/java/io/lettuce/core/masterslave/Connections.java
+++ b/src/main/java/io/lettuce/core/masterslave/Connections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/Exceptions.java b/src/main/java/io/lettuce/core/masterslave/Exceptions.java
index 0646920ee6..f747034cdd 100644
--- a/src/main/java/io/lettuce/core/masterslave/Exceptions.java
+++ b/src/main/java/io/lettuce/core/masterslave/Exceptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index 56e9399358..dd73666ec6 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@
  * StatefulRedisMasterSlaveConnection&lt;String, String&gt; connection = MasterSlave.connect(client,
  *         RedisURI.create(&quot;redis://localhost&quot;), StringCodec.UTF8);
  * // ...
- * 
+ *
  * connection.close();
  * client.shutdown();
  * </pre>
@@ -75,11 +75,11 @@
  * <li>Standalone Master/Slave: Performs a one-time topology lookup which remains static afterward</li>
  * <li>Redis Sentinel: Subscribes to all Sentinels and listens for Pub/Sub messages to trigger topology refreshing</li>
  * </ul>
- * 
+ *
  * <h3>Connection Fault-Tolerance</h3>
  * Connecting to Master/Slave bears the possibility that individual nodes are not reachable. {@link MasterSlave} can still
  * connect to a partially-available set of nodes.
- * 
+ *
  * <ul>
  * <li>Redis Sentinel: At least one Sentinel must be reachable, the masterId must be registered and at least one host must be
  * available (master or slave). Allows for runtime-recovery based on Sentinel Events.</li>
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
index fc0186b0b0..4c1972d3de 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
index 4b8bd72e1f..409404f7ab 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java
index 6c3c9d83f3..5c5dd6b954 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
index 3b082be691..beac934b16 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
index 09f28069a0..89f27d6512 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
index dc6181c1ca..170cce0130 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java b/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
index 65ca7762ce..700cb1a8a6 100644
--- a/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
index 584650a812..554100a21c 100644
--- a/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
+++ b/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java b/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java
index 95ff362da3..245fcebf1f 100644
--- a/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java b/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
index 3313d8dc6b..142385a333 100644
--- a/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
+++ b/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/Requests.java b/src/main/java/io/lettuce/core/masterslave/Requests.java
index 63e48f2af3..3bdbe5f5eb 100644
--- a/src/main/java/io/lettuce/core/masterslave/Requests.java
+++ b/src/main/java/io/lettuce/core/masterslave/Requests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java b/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
index c137f96454..a1cf466177 100644
--- a/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
+++ b/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java b/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
index cadf4208da..bf12bcaf16 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
index 0a50bd8d67..3c498acee2 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
index ffe44416d5..6309c5eaaf 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java
index e64b0cd771..0f22772d78 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
index ebde88eef6..a9cd6a89bc 100644
--- a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
+++ b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
index 762f52d1bb..0e91e425ca 100644
--- a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java
index 8f2676c920..47eafe3819 100644
--- a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java
+++ b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
index 618d60a74c..240c096d23 100644
--- a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java b/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java
index 669ae7cd05..af31e255a1 100644
--- a/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java
+++ b/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/Timeout.java b/src/main/java/io/lettuce/core/masterslave/Timeout.java
index 082cabe901..3af6668474 100644
--- a/src/main/java/io/lettuce/core/masterslave/Timeout.java
+++ b/src/main/java/io/lettuce/core/masterslave/Timeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java b/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java
index 24aeab0a97..8bc958a68d 100644
--- a/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java
+++ b/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
index 7cc7b27e7b..8abfcd8450 100644
--- a/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java
index cb70725258..b5175266ae 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
index 57e8a625db..815334459a 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
index 5ab03ade39..d313d491ef 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/metrics/CommandMetrics.java b/src/main/java/io/lettuce/core/metrics/CommandMetrics.java
index 2d836f1216..75db39f527 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandMetrics.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
index d3ca677155..bf4c319b96 100644
--- a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java
index 7500686902..233550e85a 100644
--- a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java
+++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/metrics/MetricCollector.java b/src/main/java/io/lettuce/core/metrics/MetricCollector.java
index eb9cb50c9e..aaaef8bb07 100644
--- a/src/main/java/io/lettuce/core/metrics/MetricCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/MetricCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/command/CommandDetail.java b/src/main/java/io/lettuce/core/models/command/CommandDetail.java
index ad1bae21f2..b86a732296 100644
--- a/src/main/java/io/lettuce/core/models/command/CommandDetail.java
+++ b/src/main/java/io/lettuce/core/models/command/CommandDetail.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java b/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
index f1d6fd0835..ecb1b7b853 100644
--- a/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
+++ b/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/role/RedisInstance.java b/src/main/java/io/lettuce/core/models/role/RedisInstance.java
index ac03cd573f..fad71f169f 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java b/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java
index 6ecde30baf..686e7f4833 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java b/src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java
index e2452d7f36..10102a6556 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java b/src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java
index e191618480..2a4c476eb4 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java b/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java
index ef26b6db37..30c96a36ad 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/role/ReplicationPartner.java b/src/main/java/io/lettuce/core/models/role/ReplicationPartner.java
index 0d32ad826f..6c7cacb0d6 100644
--- a/src/main/java/io/lettuce/core/models/role/ReplicationPartner.java
+++ b/src/main/java/io/lettuce/core/models/role/ReplicationPartner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/role/RoleParser.java b/src/main/java/io/lettuce/core/models/role/RoleParser.java
index 21d31457ba..c152159685 100644
--- a/src/main/java/io/lettuce/core/models/role/RoleParser.java
+++ b/src/main/java/io/lettuce/core/models/role/RoleParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/stream/PendingEntry.java b/src/main/java/io/lettuce/core/models/stream/PendingEntry.java
index 78c3446031..0b1882d9e1 100644
--- a/src/main/java/io/lettuce/core/models/stream/PendingEntry.java
+++ b/src/main/java/io/lettuce/core/models/stream/PendingEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/stream/PendingMessage.java b/src/main/java/io/lettuce/core/models/stream/PendingMessage.java
index 304204f7e7..f26491f456 100644
--- a/src/main/java/io/lettuce/core/models/stream/PendingMessage.java
+++ b/src/main/java/io/lettuce/core/models/stream/PendingMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/stream/PendingMessages.java b/src/main/java/io/lettuce/core/models/stream/PendingMessages.java
index ee02875321..733198f9ff 100644
--- a/src/main/java/io/lettuce/core/models/stream/PendingMessages.java
+++ b/src/main/java/io/lettuce/core/models/stream/PendingMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/stream/PendingParser.java b/src/main/java/io/lettuce/core/models/stream/PendingParser.java
index d862acad79..79233239da 100644
--- a/src/main/java/io/lettuce/core/models/stream/PendingParser.java
+++ b/src/main/java/io/lettuce/core/models/stream/PendingParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/models/stream/package-info.java b/src/main/java/io/lettuce/core/models/stream/package-info.java
index 587dad7151..fc988d5e1b 100644
--- a/src/main/java/io/lettuce/core/models/stream/package-info.java
+++ b/src/main/java/io/lettuce/core/models/stream/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ArrayOutput.java b/src/main/java/io/lettuce/core/output/ArrayOutput.java
index 6d9c3e8459..369f433798 100644
--- a/src/main/java/io/lettuce/core/output/ArrayOutput.java
+++ b/src/main/java/io/lettuce/core/output/ArrayOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/BooleanListOutput.java b/src/main/java/io/lettuce/core/output/BooleanListOutput.java
index 0eb422961e..3b04958db4 100644
--- a/src/main/java/io/lettuce/core/output/BooleanListOutput.java
+++ b/src/main/java/io/lettuce/core/output/BooleanListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/BooleanOutput.java b/src/main/java/io/lettuce/core/output/BooleanOutput.java
index 61b62de696..f97f24199f 100644
--- a/src/main/java/io/lettuce/core/output/BooleanOutput.java
+++ b/src/main/java/io/lettuce/core/output/BooleanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ByteArrayOutput.java b/src/main/java/io/lettuce/core/output/ByteArrayOutput.java
index 0f3a4f5c30..4b3aa1cb05 100644
--- a/src/main/java/io/lettuce/core/output/ByteArrayOutput.java
+++ b/src/main/java/io/lettuce/core/output/ByteArrayOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/CommandOutput.java b/src/main/java/io/lettuce/core/output/CommandOutput.java
index f8092c16fb..eeb08a71b5 100644
--- a/src/main/java/io/lettuce/core/output/CommandOutput.java
+++ b/src/main/java/io/lettuce/core/output/CommandOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/DateOutput.java b/src/main/java/io/lettuce/core/output/DateOutput.java
index 1a2ca218ae..52b9ec4424 100644
--- a/src/main/java/io/lettuce/core/output/DateOutput.java
+++ b/src/main/java/io/lettuce/core/output/DateOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java b/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java
index f9d6e52a50..3da0b76f61 100644
--- a/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java
+++ b/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/DoubleOutput.java b/src/main/java/io/lettuce/core/output/DoubleOutput.java
index f022b2efe4..008f2255a7 100644
--- a/src/main/java/io/lettuce/core/output/DoubleOutput.java
+++ b/src/main/java/io/lettuce/core/output/DoubleOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
index 8ed8ad3985..9005f24f8e 100644
--- a/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
index dab9293e4c..76e2939169 100644
--- a/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java b/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
index 2226e6b846..1f4ed02507 100644
--- a/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/IntegerOutput.java b/src/main/java/io/lettuce/core/output/IntegerOutput.java
index 4892a7dc99..faa32e687d 100644
--- a/src/main/java/io/lettuce/core/output/IntegerOutput.java
+++ b/src/main/java/io/lettuce/core/output/IntegerOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyListOutput.java b/src/main/java/io/lettuce/core/output/KeyListOutput.java
index 9bd05ffda2..78df504e79 100644
--- a/src/main/java/io/lettuce/core/output/KeyListOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyOutput.java b/src/main/java/io/lettuce/core/output/KeyOutput.java
index cb45114f31..45e2409d6f 100644
--- a/src/main/java/io/lettuce/core/output/KeyOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyScanOutput.java b/src/main/java/io/lettuce/core/output/KeyScanOutput.java
index 59b37c1bbc..e4f13ed4df 100644
--- a/src/main/java/io/lettuce/core/output/KeyScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyScanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java
index bcae5611bf..6e110d156f 100644
--- a/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyStreamingChannel.java b/src/main/java/io/lettuce/core/output/KeyStreamingChannel.java
index a3e9bc07f4..1b92de61a2 100644
--- a/src/main/java/io/lettuce/core/output/KeyStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/KeyStreamingChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java
index b6fbf05206..3aca782b8b 100644
--- a/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyValueListOutput.java b/src/main/java/io/lettuce/core/output/KeyValueListOutput.java
index 4207520da4..a72ec2868f 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyValueOutput.java b/src/main/java/io/lettuce/core/output/KeyValueOutput.java
index 72f3965079..7910c0bb8f 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java
index 946c2dc1d2..3e514b6d4b 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyValueScoredValueOutput.java b/src/main/java/io/lettuce/core/output/KeyValueScoredValueOutput.java
index d3ce478104..b15e79d412 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueScoredValueOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueScoredValueOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java
index e293446be7..d265c184c0 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java
index a261f40dac..18b6fe5ddc 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java b/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java
index 58c46cab65..3b91ea1301 100644
--- a/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java
+++ b/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ListSubscriber.java b/src/main/java/io/lettuce/core/output/ListSubscriber.java
index f75b62df1e..f49ef48f67 100644
--- a/src/main/java/io/lettuce/core/output/ListSubscriber.java
+++ b/src/main/java/io/lettuce/core/output/ListSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/MapOutput.java b/src/main/java/io/lettuce/core/output/MapOutput.java
index 230c90a592..76b123f80c 100644
--- a/src/main/java/io/lettuce/core/output/MapOutput.java
+++ b/src/main/java/io/lettuce/core/output/MapOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/MapScanOutput.java b/src/main/java/io/lettuce/core/output/MapScanOutput.java
index 263cfb1219..456b9fc7b5 100644
--- a/src/main/java/io/lettuce/core/output/MapScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/MapScanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/MultiOutput.java b/src/main/java/io/lettuce/core/output/MultiOutput.java
index 44d5ebb2e2..ab7fa86db2 100644
--- a/src/main/java/io/lettuce/core/output/MultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/MultiOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/NestedMultiOutput.java b/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
index 638cdb1a50..f430aafeb2 100644
--- a/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/OutputFactory.java b/src/main/java/io/lettuce/core/output/OutputFactory.java
index 90f4c57a63..f16d020821 100644
--- a/src/main/java/io/lettuce/core/output/OutputFactory.java
+++ b/src/main/java/io/lettuce/core/output/OutputFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ReplayOutput.java b/src/main/java/io/lettuce/core/output/ReplayOutput.java
index 15b5ab1baa..ef4288bec8 100644
--- a/src/main/java/io/lettuce/core/output/ReplayOutput.java
+++ b/src/main/java/io/lettuce/core/output/ReplayOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ScanOutput.java b/src/main/java/io/lettuce/core/output/ScanOutput.java
index eaf5d8d1a7..61825cd773 100644
--- a/src/main/java/io/lettuce/core/output/ScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
index 4e79bf4140..bc7a50bbb7 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueOutput.java
index 5651b79f16..b08dc602b5 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
index d512f22ad0..f755f4beaa 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
index 8dff0801b9..3f7a6e37c5 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java
index be7e4ee825..773e2a6549 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
index eb80b241c9..512126ccdf 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/SocketAddressOutput.java b/src/main/java/io/lettuce/core/output/SocketAddressOutput.java
index b6be26166f..927ab6754c 100644
--- a/src/main/java/io/lettuce/core/output/SocketAddressOutput.java
+++ b/src/main/java/io/lettuce/core/output/SocketAddressOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/StatusOutput.java b/src/main/java/io/lettuce/core/output/StatusOutput.java
index cac81dbdd0..bbe5b1503a 100644
--- a/src/main/java/io/lettuce/core/output/StatusOutput.java
+++ b/src/main/java/io/lettuce/core/output/StatusOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/StreamMessageListOutput.java b/src/main/java/io/lettuce/core/output/StreamMessageListOutput.java
index 9da9c8ebab..f774ecb8c4 100644
--- a/src/main/java/io/lettuce/core/output/StreamMessageListOutput.java
+++ b/src/main/java/io/lettuce/core/output/StreamMessageListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/StreamReadOutput.java b/src/main/java/io/lettuce/core/output/StreamReadOutput.java
index 4c1c5456af..831da82952 100644
--- a/src/main/java/io/lettuce/core/output/StreamReadOutput.java
+++ b/src/main/java/io/lettuce/core/output/StreamReadOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/StreamingChannel.java b/src/main/java/io/lettuce/core/output/StreamingChannel.java
index 17f8f02338..e8fcf659b3 100644
--- a/src/main/java/io/lettuce/core/output/StreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/StreamingChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/StreamingOutput.java b/src/main/java/io/lettuce/core/output/StreamingOutput.java
index ad15c83b59..ec4a266378 100644
--- a/src/main/java/io/lettuce/core/output/StreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/StreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/StringListOutput.java b/src/main/java/io/lettuce/core/output/StringListOutput.java
index d0073924e7..11226b5b42 100644
--- a/src/main/java/io/lettuce/core/output/StringListOutput.java
+++ b/src/main/java/io/lettuce/core/output/StringListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/StringValueListOutput.java b/src/main/java/io/lettuce/core/output/StringValueListOutput.java
index 015f112c5c..da3b3bb2db 100644
--- a/src/main/java/io/lettuce/core/output/StringValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/StringValueListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ValueListOutput.java b/src/main/java/io/lettuce/core/output/ValueListOutput.java
index 9d511ba75a..4589a01e02 100644
--- a/src/main/java/io/lettuce/core/output/ValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ValueOutput.java b/src/main/java/io/lettuce/core/output/ValueOutput.java
index ed38a3a551..c9db032112 100644
--- a/src/main/java/io/lettuce/core/output/ValueOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ValueScanOutput.java b/src/main/java/io/lettuce/core/output/ValueScanOutput.java
index b1bf2783e3..4c5d67540b 100644
--- a/src/main/java/io/lettuce/core/output/ValueScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueScanOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java
index 4388c91393..19e2a40818 100644
--- a/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ValueSetOutput.java b/src/main/java/io/lettuce/core/output/ValueSetOutput.java
index 327b04186b..f13d6b01e3 100644
--- a/src/main/java/io/lettuce/core/output/ValueSetOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueSetOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java
index 629126719a..d0c12f1ff5 100644
--- a/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java
index a149e2892b..8b599925d7 100644
--- a/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/output/ValueValueListOutput.java b/src/main/java/io/lettuce/core/output/ValueValueListOutput.java
index 1863ada71f..ce1992e3b1 100644
--- a/src/main/java/io/lettuce/core/output/ValueValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueValueListOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
index 66453b685b..6574e41334 100644
--- a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java b/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java
index 2e9d420f95..8f10833259 100644
--- a/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java b/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java
index bdcdd81bdd..58f1f19e6e 100644
--- a/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java
+++ b/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/Command.java b/src/main/java/io/lettuce/core/protocol/Command.java
index bafa846b38..31724c750b 100644
--- a/src/main/java/io/lettuce/core/protocol/Command.java
+++ b/src/main/java/io/lettuce/core/protocol/Command.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgs.java b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
index 035d2d4e7f..1e47ce3303 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandArgs.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java b/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
index b23ca995fc..07a934486d 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandEncoder.java b/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
index 2dbbc6dc2e..1a9323487c 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java b/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
index 754e771a9c..7c725cc2ba 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index a34e6df570..22e9d03feb 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
index bf05073ac7..8056d8e9a9 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandType.java b/src/main/java/io/lettuce/core/protocol/CommandType.java
index bde0e85d76..74c6dd9014 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandType.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
index a813dc27db..e9bd790eb2 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java b/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
index 3f1a660fe6..e96a95a983 100644
--- a/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionFacade.java b/src/main/java/io/lettuce/core/protocol/ConnectionFacade.java
index 3b81763a5f..78818a7d42 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionFacade.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
index f596efbae5..39203eb99a 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/DecoratedCommand.java b/src/main/java/io/lettuce/core/protocol/DecoratedCommand.java
index 3597588050..7a07e64240 100644
--- a/src/main/java/io/lettuce/core/protocol/DecoratedCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/DecoratedCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index c6461ce06c..8afd477743 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/DemandAware.java b/src/main/java/io/lettuce/core/protocol/DemandAware.java
index 280e1d8e7c..e4596d05b9 100644
--- a/src/main/java/io/lettuce/core/protocol/DemandAware.java
+++ b/src/main/java/io/lettuce/core/protocol/DemandAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/Endpoint.java b/src/main/java/io/lettuce/core/protocol/Endpoint.java
index 1afc3f5ece..ec419f6cc5 100644
--- a/src/main/java/io/lettuce/core/protocol/Endpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/Endpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java b/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java
index 328b108ef4..b1edac3249 100644
--- a/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java
+++ b/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/LatencyMeteredCommand.java b/src/main/java/io/lettuce/core/protocol/LatencyMeteredCommand.java
index 6241e78b7b..6af959d003 100644
--- a/src/main/java/io/lettuce/core/protocol/LatencyMeteredCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/LatencyMeteredCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java b/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java
index 4a5d78eb34..208b1b15c9 100644
--- a/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java
+++ b/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/PristineFallbackCommand.java b/src/main/java/io/lettuce/core/protocol/PristineFallbackCommand.java
index 3ac08d4e50..f1fc4dd8dc 100644
--- a/src/main/java/io/lettuce/core/protocol/PristineFallbackCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/PristineFallbackCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java b/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java
index 0c5daf31e8..930f160a23 100644
--- a/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java
+++ b/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
index b8d8f5eec6..4511e6cb79 100644
--- a/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java b/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java
index d13ead4043..91ac12f3d6 100644
--- a/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java
+++ b/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/RedisCommand.java b/src/main/java/io/lettuce/core/protocol/RedisCommand.java
index 7aed9628fe..5973574c3c 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index 6e6c2cf681..1148313cee 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/SharedLock.java b/src/main/java/io/lettuce/core/protocol/SharedLock.java
index d1d75abcf1..3f78c7819a 100644
--- a/src/main/java/io/lettuce/core/protocol/SharedLock.java
+++ b/src/main/java/io/lettuce/core/protocol/SharedLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/TracedCommand.java b/src/main/java/io/lettuce/core/protocol/TracedCommand.java
index e3ecc8e5de..6c2bd9233c 100644
--- a/src/main/java/io/lettuce/core/protocol/TracedCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/TracedCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java b/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java
index 685214eeeb..425fcb3319 100644
--- a/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/protocol/WithLatency.java b/src/main/java/io/lettuce/core/protocol/WithLatency.java
index 018fcd903b..4259086633 100644
--- a/src/main/java/io/lettuce/core/protocol/WithLatency.java
+++ b/src/main/java/io/lettuce/core/protocol/WithLatency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java
index 35ef3eb520..09122e350a 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java
index 030ff02b22..1dcaa6822c 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
index cffeb4f88b..cf137a15d8 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
index 923fe51724..b19849ccc1 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -231,7 +231,7 @@ private Set<K> unwrap(Set<Wrapper<K>> wrapped) {
 
     /**
      * Comparison/equality wrapper with specific {@code byte[]} equals and hashCode implementations.
-     * 
+     *
      * @param <K>
      */
     static class Wrapper<K> {
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java b/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
index d7e5c0159f..0ecbfe740c 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java
index 85d35e3a4b..36ff447ef0 100644
--- a/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java
index 380c5be1f9..306f28cf07 100644
--- a/src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java
index 1b77634bdb..9460640d56 100644
--- a/src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
index d63fbbf4e1..8ea075e6fc 100644
--- a/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java
index 7ce86e9739..2a2fc469a5 100644
--- a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java
+++ b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
index 31eeecdfbf..f15f081776 100644
--- a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java
index 52a68fad9e..c141212cf6 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java
index b4f3b82957..2884d0d214 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java
index a1155f7bbf..969aaae0e7 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java
index 1f78d96cb2..32dfb42c0b 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java b/src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java
index 5519e5bd2c..85b3b6a90c 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/ClientResources.java b/src/main/java/io/lettuce/core/resource/ClientResources.java
index 38dbadea83..9776d3bfa6 100644
--- a/src/main/java/io/lettuce/core/resource/ClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/ClientResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/ConstantDelay.java b/src/main/java/io/lettuce/core/resource/ConstantDelay.java
index f9142ccb28..2cd976d3f8 100644
--- a/src/main/java/io/lettuce/core/resource/ConstantDelay.java
+++ b/src/main/java/io/lettuce/core/resource/ConstantDelay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java b/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java
index 46bc88b4a3..ae4b605a72 100644
--- a/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java
+++ b/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index 0528188455..54fc14bc02 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
index 898781d81d..cf206acf26 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/DefaultNettyCustomizer.java b/src/main/java/io/lettuce/core/resource/DefaultNettyCustomizer.java
index 2bcce0b9fb..08a985bc11 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultNettyCustomizer.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultNettyCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/Delay.java b/src/main/java/io/lettuce/core/resource/Delay.java
index 7217d6585d..2126e4de52 100644
--- a/src/main/java/io/lettuce/core/resource/Delay.java
+++ b/src/main/java/io/lettuce/core/resource/Delay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java b/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java
index c20007fbd7..2e10e204fd 100644
--- a/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java
+++ b/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/DnsResolver.java b/src/main/java/io/lettuce/core/resource/DnsResolver.java
index c7f168eb58..21a3eb82c7 100644
--- a/src/main/java/io/lettuce/core/resource/DnsResolver.java
+++ b/src/main/java/io/lettuce/core/resource/DnsResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/DnsResolvers.java b/src/main/java/io/lettuce/core/resource/DnsResolvers.java
index da8f37c498..331ea54283 100644
--- a/src/main/java/io/lettuce/core/resource/DnsResolvers.java
+++ b/src/main/java/io/lettuce/core/resource/DnsResolvers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java b/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java
index c62c6e5ab2..aefd675563 100644
--- a/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java
+++ b/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java
index 772bc17f88..ce4610c47c 100644
--- a/src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java
+++ b/src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/ExponentialDelay.java b/src/main/java/io/lettuce/core/resource/ExponentialDelay.java
index ecfa995384..0b64b00cc0 100644
--- a/src/main/java/io/lettuce/core/resource/ExponentialDelay.java
+++ b/src/main/java/io/lettuce/core/resource/ExponentialDelay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/FullJitterDelay.java b/src/main/java/io/lettuce/core/resource/FullJitterDelay.java
index 2e40c988b6..068c132bb0 100644
--- a/src/main/java/io/lettuce/core/resource/FullJitterDelay.java
+++ b/src/main/java/io/lettuce/core/resource/FullJitterDelay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/Futures.java b/src/main/java/io/lettuce/core/resource/Futures.java
index c123fd69ce..ddd549b7d2 100644
--- a/src/main/java/io/lettuce/core/resource/Futures.java
+++ b/src/main/java/io/lettuce/core/resource/Futures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/MappingSocketAddressResolver.java b/src/main/java/io/lettuce/core/resource/MappingSocketAddressResolver.java
index 23855449be..21c3142ac2 100644
--- a/src/main/java/io/lettuce/core/resource/MappingSocketAddressResolver.java
+++ b/src/main/java/io/lettuce/core/resource/MappingSocketAddressResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/NettyCustomizer.java b/src/main/java/io/lettuce/core/resource/NettyCustomizer.java
index c79385f179..c6f4a12f20 100644
--- a/src/main/java/io/lettuce/core/resource/NettyCustomizer.java
+++ b/src/main/java/io/lettuce/core/resource/NettyCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java b/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
index a4f1db187b..80140a9c06 100644
--- a/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
+++ b/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
index a59b02bebe..954ce71a9e 100644
--- a/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
index 687fa0130c..2bbe0c1870 100644
--- a/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java b/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java
index ad3d44f7f5..3ec715aa85 100644
--- a/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
index 991504f316..d7ae64d367 100644
--- a/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java b/src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java
index f7adc71dfe..bd2efbdd7e 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java b/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
index 33471efde5..e399e80b5f 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java b/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
index 7466653e44..1f48772c19 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java b/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
index e477c507fa..f212190249 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/AbstractCdiBean.java b/src/main/java/io/lettuce/core/support/AbstractCdiBean.java
index be8cbf14da..cf08e4c7aa 100644
--- a/src/main/java/io/lettuce/core/support/AbstractCdiBean.java
+++ b/src/main/java/io/lettuce/core/support/AbstractCdiBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java
index f9b6f4b88e..b0885c0b5a 100644
--- a/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java
+++ b/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/AsyncObjectFactory.java b/src/main/java/io/lettuce/core/support/AsyncObjectFactory.java
index 92ea5ca979..afaa70bd8f 100644
--- a/src/main/java/io/lettuce/core/support/AsyncObjectFactory.java
+++ b/src/main/java/io/lettuce/core/support/AsyncObjectFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/AsyncPool.java b/src/main/java/io/lettuce/core/support/AsyncPool.java
index 53f88e3ce6..53e890f00a 100644
--- a/src/main/java/io/lettuce/core/support/AsyncPool.java
+++ b/src/main/java/io/lettuce/core/support/AsyncPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/BasePool.java b/src/main/java/io/lettuce/core/support/BasePool.java
index 4caf0f7be8..d8678a47ef 100644
--- a/src/main/java/io/lettuce/core/support/BasePool.java
+++ b/src/main/java/io/lettuce/core/support/BasePool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/BasePoolConfig.java b/src/main/java/io/lettuce/core/support/BasePoolConfig.java
index 8cb4b09c32..3554a933b4 100644
--- a/src/main/java/io/lettuce/core/support/BasePoolConfig.java
+++ b/src/main/java/io/lettuce/core/support/BasePoolConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java b/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java
index fa9beadd26..224f0283ac 100644
--- a/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java
+++ b/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java b/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java
index 3d6380e0b8..5cc3885252 100644
--- a/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java
+++ b/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java b/src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java
index 7ee47e7eb8..d9fb366a8f 100644
--- a/src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java
+++ b/src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java b/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
index 539ec73084..f4c328f73c 100644
--- a/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
+++ b/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
index e688ac7ad0..2ba82f5cd4 100644
--- a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
+++ b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/ConnectionWrapping.java b/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
index 79a19f35b4..5455e8320e 100644
--- a/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
+++ b/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java b/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
index 641037df65..b6f80479d1 100644
--- a/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
+++ b/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java b/src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java
index 33f8027172..d2e914a8dd 100644
--- a/src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java
+++ b/src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/RedisClientCdiBean.java b/src/main/java/io/lettuce/core/support/RedisClientCdiBean.java
index 6a527e3efb..635e77c3ff 100644
--- a/src/main/java/io/lettuce/core/support/RedisClientCdiBean.java
+++ b/src/main/java/io/lettuce/core/support/RedisClientCdiBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java b/src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java
index 3ec66d0933..44be6614c2 100644
--- a/src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java
+++ b/src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java b/src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java
index 561616d1a0..e9ad7445a7 100644
--- a/src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java
+++ b/src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java b/src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java
index 6094ef1f89..6d6af502c1 100644
--- a/src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java
+++ b/src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/tracing/BraveTracing.java b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
index 0b4f5d2546..186bfa7339 100644
--- a/src/main/java/io/lettuce/core/tracing/BraveTracing.java
+++ b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/tracing/NoOpTracing.java b/src/main/java/io/lettuce/core/tracing/NoOpTracing.java
index 9c6c5b1945..a1fc35a545 100644
--- a/src/main/java/io/lettuce/core/tracing/NoOpTracing.java
+++ b/src/main/java/io/lettuce/core/tracing/NoOpTracing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/tracing/TraceContext.java b/src/main/java/io/lettuce/core/tracing/TraceContext.java
index 1ace8eb83c..e3328da5ec 100644
--- a/src/main/java/io/lettuce/core/tracing/TraceContext.java
+++ b/src/main/java/io/lettuce/core/tracing/TraceContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/tracing/TraceContextProvider.java b/src/main/java/io/lettuce/core/tracing/TraceContextProvider.java
index 5143f5fe46..1344127e5d 100644
--- a/src/main/java/io/lettuce/core/tracing/TraceContextProvider.java
+++ b/src/main/java/io/lettuce/core/tracing/TraceContextProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/tracing/Tracer.java b/src/main/java/io/lettuce/core/tracing/Tracer.java
index a53f6e3397..16a197fe6e 100644
--- a/src/main/java/io/lettuce/core/tracing/Tracer.java
+++ b/src/main/java/io/lettuce/core/tracing/Tracer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/tracing/TracerProvider.java b/src/main/java/io/lettuce/core/tracing/TracerProvider.java
index a4c1681186..3895909960 100644
--- a/src/main/java/io/lettuce/core/tracing/TracerProvider.java
+++ b/src/main/java/io/lettuce/core/tracing/TracerProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/lettuce/core/tracing/Tracing.java b/src/main/java/io/lettuce/core/tracing/Tracing.java
index 94517a7fd7..d82517ef89 100644
--- a/src/main/java/io/lettuce/core/tracing/Tracing.java
+++ b/src/main/java/io/lettuce/core/tracing/Tracing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java b/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java
index d345fa2560..2b11cfce8b 100644
--- a/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java
+++ b/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisGeoCommands.java b/src/main/templates/io/lettuce/core/api/RedisGeoCommands.java
index 9bb9a3c01e..aa542e6843 100644
--- a/src/main/templates/io/lettuce/core/api/RedisGeoCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisGeoCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisHLLCommands.java b/src/main/templates/io/lettuce/core/api/RedisHLLCommands.java
index 524445667c..2158f430ee 100644
--- a/src/main/templates/io/lettuce/core/api/RedisHLLCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisHLLCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisHashCommands.java b/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
index cf07708dc2..7ef3aa5a34 100644
--- a/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java b/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
index 641a5d8d50..35cded19c8 100644
--- a/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisListCommands.java b/src/main/templates/io/lettuce/core/api/RedisListCommands.java
index bc5ef97e0b..e6b11ba40a 100644
--- a/src/main/templates/io/lettuce/core/api/RedisListCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisListCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java b/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java
index 5ce81231ed..6d6e03575f 100644
--- a/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java b/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java
index e1d467d679..602a90e966 100644
--- a/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
index 38e907f848..79a49e228e 100644
--- a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisSetCommands.java b/src/main/templates/io/lettuce/core/api/RedisSetCommands.java
index 2d2fd1c1af..16dcfbd0f8 100644
--- a/src/main/templates/io/lettuce/core/api/RedisSetCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java b/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
index 62fd89ebc1..e3a145aa20 100644
--- a/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
index 09a482b748..11696fef2e 100644
--- a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisStringCommands.java b/src/main/templates/io/lettuce/core/api/RedisStringCommands.java
index ff4c833e47..7b36caddab 100644
--- a/src/main/templates/io/lettuce/core/api/RedisStringCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisStringCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java b/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java
index 5482cc137b..2111683aab 100644
--- a/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
index abe3238f3a..ca778ae104 100644
--- a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
+++ b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
index 68825efc5f..9dc8c1a13c 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
index aa5ae46b08..e7b215929d 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
index acb3abd3a8..11970a7529 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java b/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
index 6c0ee1269d..22cb18b31d 100644
--- a/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
+++ b/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/apigenerator/Constants.java b/src/test/java/io/lettuce/apigenerator/Constants.java
index 4ddf288851..0f9bf1ac46 100644
--- a/src/test/java/io/lettuce/apigenerator/Constants.java
+++ b/src/test/java/io/lettuce/apigenerator/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
index ec3ffbf9fd..b2cea7d945 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
index 25097ffd4b..40153a254d 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
index c937077b73..0a87eeec9f 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
index a7c1430a59..57eb1c3b23 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
index 3147fbe82e..b3fdde90a3 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java b/src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java
index 1e8ccdf731..5f46c4d05d 100644
--- a/src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java
+++ b/src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/category/SlowTests.java b/src/test/java/io/lettuce/category/SlowTests.java
index 5bed2ef88d..fbf77bcd86 100644
--- a/src/test/java/io/lettuce/category/SlowTests.java
+++ b/src/test/java/io/lettuce/category/SlowTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/codec/CRC16UnitTests.java b/src/test/java/io/lettuce/codec/CRC16UnitTests.java
index ab2c8c5b11..655dfbe27c 100644
--- a/src/test/java/io/lettuce/codec/CRC16UnitTests.java
+++ b/src/test/java/io/lettuce/codec/CRC16UnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/AbstractRedisClientTest.java b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
index 491c9b8c82..47c2d48bfd 100644
--- a/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
+++ b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java
index 6dade817c9..0d60be66bb 100644
--- a/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ByteBufferCodec.java b/src/test/java/io/lettuce/core/ByteBufferCodec.java
index 89f704a992..4066a10e00 100644
--- a/src/test/java/io/lettuce/core/ByteBufferCodec.java
+++ b/src/test/java/io/lettuce/core/ByteBufferCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ClientIntegrationTests.java b/src/test/java/io/lettuce/core/ClientIntegrationTests.java
index b56b7d122b..b09f631454 100644
--- a/src/test/java/io/lettuce/core/ClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ClientMetricsIntegrationTests.java b/src/test/java/io/lettuce/core/ClientMetricsIntegrationTests.java
index 4d25ba238d..27a56da8e7 100644
--- a/src/test/java/io/lettuce/core/ClientMetricsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientMetricsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
index 574afdb006..146b0a9305 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java b/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
index febec7b9ec..fb0fcd5ffa 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ConnectMethodsIntegrationTests.java b/src/test/java/io/lettuce/core/ConnectMethodsIntegrationTests.java
index d9275969d9..ce197e5eef 100644
--- a/src/test/java/io/lettuce/core/ConnectMethodsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ConnectMethodsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
index 3e94cd0ae8..3d3a3eb3aa 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ConnectionFutureUnitTests.java b/src/test/java/io/lettuce/core/ConnectionFutureUnitTests.java
index 0a886f552c..656653e6f4 100644
--- a/src/test/java/io/lettuce/core/ConnectionFutureUnitTests.java
+++ b/src/test/java/io/lettuce/core/ConnectionFutureUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java b/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
index 41cc9660f1..aaaf1d8ec5 100644
--- a/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java b/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java
index 111da6db0c..fff8555b45 100644
--- a/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java
+++ b/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/GeoModelUnitTests.java b/src/test/java/io/lettuce/core/GeoModelUnitTests.java
index 363f458eb5..ada431b8e3 100644
--- a/src/test/java/io/lettuce/core/GeoModelUnitTests.java
+++ b/src/test/java/io/lettuce/core/GeoModelUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/JavaRuntimeUnitTests.java b/src/test/java/io/lettuce/core/JavaRuntimeUnitTests.java
index 1cc3b976dd..85c842ac9b 100644
--- a/src/test/java/io/lettuce/core/JavaRuntimeUnitTests.java
+++ b/src/test/java/io/lettuce/core/JavaRuntimeUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/KeyValueUnitTests.java b/src/test/java/io/lettuce/core/KeyValueUnitTests.java
index e73142f81d..97bea32959 100644
--- a/src/test/java/io/lettuce/core/KeyValueUnitTests.java
+++ b/src/test/java/io/lettuce/core/KeyValueUnitTests.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/LettuceFuturesUnitTests.java b/src/test/java/io/lettuce/core/LettuceFuturesUnitTests.java
index c67a35a4e1..f009efb4de 100644
--- a/src/test/java/io/lettuce/core/LettuceFuturesUnitTests.java
+++ b/src/test/java/io/lettuce/core/LettuceFuturesUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/LimitUnitTests.java b/src/test/java/io/lettuce/core/LimitUnitTests.java
index 07c25df068..c2fb6e9fae 100644
--- a/src/test/java/io/lettuce/core/LimitUnitTests.java
+++ b/src/test/java/io/lettuce/core/LimitUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java b/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java
index 8b61e88bba..b0dae44a32 100644
--- a/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ProtectedModeTests.java b/src/test/java/io/lettuce/core/ProtectedModeTests.java
index 5910f04d35..70684bc555 100644
--- a/src/test/java/io/lettuce/core/ProtectedModeTests.java
+++ b/src/test/java/io/lettuce/core/ProtectedModeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/RangeUnitTests.java b/src/test/java/io/lettuce/core/RangeUnitTests.java
index e3aaaef5df..808cd02206 100644
--- a/src/test/java/io/lettuce/core/RangeUnitTests.java
+++ b/src/test/java/io/lettuce/core/RangeUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java
index 07c2d2410d..9aff4b1864 100644
--- a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java
+++ b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
index 9887df8a03..2c3a487024 100644
--- a/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java b/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java
index 80a9fad5e6..c831e8cef5 100644
--- a/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java b/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java
index 949f8cb589..20db5be454 100644
--- a/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/RedisClientFactoryBeanUnitTests.java b/src/test/java/io/lettuce/core/RedisClientFactoryBeanUnitTests.java
index 45d97c7b72..a58aaa3835 100644
--- a/src/test/java/io/lettuce/core/RedisClientFactoryBeanUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisClientFactoryBeanUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java b/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java
index df88f4ab02..f434376426 100644
--- a/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java b/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java
index 29b1f34d4d..93a714cccc 100644
--- a/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/RedisClientListenerIntegrationTests.java b/src/test/java/io/lettuce/core/RedisClientListenerIntegrationTests.java
index 046c3b57e3..c6833c213b 100644
--- a/src/test/java/io/lettuce/core/RedisClientListenerIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/RedisClientListenerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
index ae49ff45a3..1b6c8975e0 100644
--- a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/RedisURIUnitTests.java b/src/test/java/io/lettuce/core/RedisURIUnitTests.java
index e9708962c0..ec1c74ef79 100644
--- a/src/test/java/io/lettuce/core/RedisURIUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisURIUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ScanArgsUnitTests.java b/src/test/java/io/lettuce/core/ScanArgsUnitTests.java
index 69d87d65ee..6d5814e120 100644
--- a/src/test/java/io/lettuce/core/ScanArgsUnitTests.java
+++ b/src/test/java/io/lettuce/core/ScanArgsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ScanCursorUnitTests.java b/src/test/java/io/lettuce/core/ScanCursorUnitTests.java
index 4c1e43ab2d..058308de00 100644
--- a/src/test/java/io/lettuce/core/ScanCursorUnitTests.java
+++ b/src/test/java/io/lettuce/core/ScanCursorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java b/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java
index 2df78e0573..b7c36f2e29 100644
--- a/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java b/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java
index 0c8facc616..9c9475f941 100644
--- a/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java b/src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java
index 9c03382779..cae4e34a7f 100644
--- a/src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java
+++ b/src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ScoredValueUnitTests.java b/src/test/java/io/lettuce/core/ScoredValueUnitTests.java
index 8fe56d7b1c..a2790c3919 100644
--- a/src/test/java/io/lettuce/core/ScoredValueUnitTests.java
+++ b/src/test/java/io/lettuce/core/ScoredValueUnitTests.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/SocketOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/SocketOptionsIntegrationTests.java
index 0daa07e6df..f0379f01af 100644
--- a/src/test/java/io/lettuce/core/SocketOptionsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/SocketOptionsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java b/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java
index 5da60a5d6c..4c3a028553 100644
--- a/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/SslIntegrationTests.java b/src/test/java/io/lettuce/core/SslIntegrationTests.java
index 0598beb945..b6215c7ad7 100644
--- a/src/test/java/io/lettuce/core/SslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/SslIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java b/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java
index 72dc3d34a6..5988c01898 100644
--- a/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java
+++ b/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/TestRedisPublisher.java b/src/test/java/io/lettuce/core/TestRedisPublisher.java
index a28f0f3f7b..7254f13420 100644
--- a/src/test/java/io/lettuce/core/TestRedisPublisher.java
+++ b/src/test/java/io/lettuce/core/TestRedisPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/TestSupport.java b/src/test/java/io/lettuce/core/TestSupport.java
index c17b2ee061..73bfcc5ad8 100644
--- a/src/test/java/io/lettuce/core/TestSupport.java
+++ b/src/test/java/io/lettuce/core/TestSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/TimeoutOptionsUnitTests.java b/src/test/java/io/lettuce/core/TimeoutOptionsUnitTests.java
index 3c9e56d056..1509d652e4 100644
--- a/src/test/java/io/lettuce/core/TimeoutOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/TimeoutOptionsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java b/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java
index bb256baeab..1a96def648 100644
--- a/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/Utf8StringCodecIntegrationTests.java b/src/test/java/io/lettuce/core/Utf8StringCodecIntegrationTests.java
index ab4261f4db..406a142c0a 100644
--- a/src/test/java/io/lettuce/core/Utf8StringCodecIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/Utf8StringCodecIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ValueUnitTests.java b/src/test/java/io/lettuce/core/ValueUnitTests.java
index fa26899191..992d0e579e 100644
--- a/src/test/java/io/lettuce/core/ValueUnitTests.java
+++ b/src/test/java/io/lettuce/core/ValueUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/ZStoreArgsUnitTests.java b/src/test/java/io/lettuce/core/ZStoreArgsUnitTests.java
index 4c228d4a3a..91e5cdc774 100644
--- a/src/test/java/io/lettuce/core/ZStoreArgsUnitTests.java
+++ b/src/test/java/io/lettuce/core/ZStoreArgsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java
index 6cc9e588e4..4ec4742bd8 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
index 2c36d0d12b..4b496dc601 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
index 44873856cd..01880ba83b 100644
--- a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ByteCodecClusterIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ByteCodecClusterIntegrationTests.java
index 1710d206dd..5d1489d17f 100644
--- a/src/test/java/io/lettuce/core/cluster/ByteCodecClusterIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ByteCodecClusterIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsIntegrationTests.java
index 4532dc2474..b46a6cb7ac 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
index 5cf621d920..b9ec99e7bd 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
index 4f7a5a1871..6632641b6b 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java
index 746d4d1a5e..49cce8808e 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java
index e6cbea89b4..4b09289d36 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
index 61a353f2ab..0ed878f0d9 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java
index 79c29fd532..4393c9c194 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandIntegrationTests.java
index 1cb45bbb26..9750962d37 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterRule.java b/src/test/java/io/lettuce/core/cluster/ClusterRule.java
index 3aab49a9af..902c66d8cc 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterRule.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterSetup.java b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
index 5edcf115fc..86b15ef433 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java b/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java
index 20f067e87f..269c6d47df 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java b/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java
index 6bfd7833ca..9ca039e0e0 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsUnitTests.java
index 027fbf0580..8788613026 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
index 952ca90a0d..f18606ba66 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusUnitTests.java b/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusUnitTests.java
index 87cc2f7353..0f80a2e17a 100644
--- a/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusUnitTests.java b/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusUnitTests.java
index 2b4bbaacde..4743a89724 100644
--- a/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
index 4e290d7261..676286da91 100644
--- a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
index be714e9f8b..81494166d9 100644
--- a/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java b/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java
index 899ebe5e94..d89741d280 100644
--- a/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java
+++ b/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java b/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java
index 74beac4db4..5f08160b21 100644
--- a/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
index 0ed404f104..6460ee4670 100644
--- a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java b/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
index 3b037ed383..14474dce63 100644
--- a/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java
index ce7b998ee7..d384dc32b0 100644
--- a/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java
index 18549090d1..f8e5aa2191 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
index 486c03e4c5..75163ab2f2 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java
index 51420fedb2..4586fe665b 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java
index 3c27388a22..7162312fe9 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
index ad7fc15614..6cecc0810e 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
index 35bb900e07..eba1bcd012 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilUnitTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilUnitTests.java
index a924ac5fdc..9cc07f1df0 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientIntegrationTests.java
index 2ff7bb19e5..43fd4cd25a 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java
index f4300433fd..ad749d3bcb 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java
index d10cba5f70..9e3d15f817 100644
--- a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
index 04fd0ac424..fdef446eb0 100644
--- a/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/ScanStreamIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ScanStreamIntegrationTests.java
index 5867b3826f..c669142ce5 100644
--- a/src/test/java/io/lettuce/core/cluster/ScanStreamIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ScanStreamIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientIntegrationTests.java
index 11330b1ca1..22391932e3 100644
--- a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/SlotHashUnitTests.java b/src/test/java/io/lettuce/core/cluster/SlotHashUnitTests.java
index b88938eb44..54a4d33670 100644
--- a/src/test/java/io/lettuce/core/cluster/SlotHashUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/SlotHashUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java
index b79ebbe060..198a3d19e6 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandIntegrationTests.java
index be59dad6f2..ee88cdf9d4 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandIntegrationTests.java
index b4360c30d0..f062e52dae 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandIntegrationTests.java
index 3b75233664..c4064c0b46 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandIntegrationTests.java
index ffeb4b115e..ea48c086a7 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandIntegrationTests.java
index 19dfeee11a..d188abff6d 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandIntegrationTests.java
index c6031bb283..13f0d3c573 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandIntegrationTests.java
index e0638c587b..0917e6a717 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandIntegrationTests.java
index 800d3b9a2c..ee76395b10 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParserUnitTests.java b/src/test/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParserUnitTests.java
index 922e60d2cb..2148c7b485 100644
--- a/src/test/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParserUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParserUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsUnitTests.java b/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsUnitTests.java
index 6346b45aed..699b1f444e 100644
--- a/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeUnitTests.java b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeUnitTests.java
index fb3d1fde9a..720c539d8a 100644
--- a/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java
index 1fd127982f..0463f7b47b 100644
--- a/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java
index 5640f829cb..9db537ab53 100644
--- a/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
index e992868ef5..8f3269f074 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ConnectionsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/ConnectionsUnitTests.java
index 9c605b6ee6..68bdddea7a 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ConnectionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ConnectionsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsUnitTests.java
index 244344181f..6f6df10b6c 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
index a5c7bb6111..a6a6886f8f 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
index 6338e986a2..018e573f38 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
index f656d3b2e8..08c08c91f9 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java b/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java
index c05f4ec976..ca9ecd0929 100644
--- a/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java
+++ b/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java b/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java
index 356e005a8e..b8ee1d7edb 100644
--- a/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java
+++ b/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/BitCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/BitCommandIntegrationTests.java
index 2c2d955b9c..a8505ab635 100644
--- a/src/test/java/io/lettuce/core/commands/BitCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/BitCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/BitStringCodec.java b/src/test/java/io/lettuce/core/commands/BitStringCodec.java
index 817d90fc4c..e919d6eae6 100644
--- a/src/test/java/io/lettuce/core/commands/BitStringCodec.java
+++ b/src/test/java/io/lettuce/core/commands/BitStringCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java
index 51a25b7084..8d0b20a18f 100644
--- a/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java
index 66e7d64a96..a1071a541d 100644
--- a/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/HLLCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/HLLCommandIntegrationTests.java
index 78072d7ec5..87f7ec0a4d 100644
--- a/src/test/java/io/lettuce/core/commands/HLLCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/HLLCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java
index f51bb5a1ad..64c3f50b5d 100644
--- a/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/KeyCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/KeyCommandIntegrationTests.java
index 925174696f..512d4314cd 100644
--- a/src/test/java/io/lettuce/core/commands/KeyCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/KeyCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java
index 57259c42f9..a3d93a46ca 100644
--- a/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/NumericCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/NumericCommandIntegrationTests.java
index 25dd26bf7b..dc00682ce8 100644
--- a/src/test/java/io/lettuce/core/commands/NumericCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/NumericCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandIntegrationTests.java
index e39061c571..beca068725 100644
--- a/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java
index a2c8055d2d..e72cea2826 100644
--- a/src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
index eed95d86d9..659db8b61a 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/SetCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/SetCommandIntegrationTests.java
index 71dc8efd8c..88a0a49658 100644
--- a/src/test/java/io/lettuce/core/commands/SetCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/SetCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/SortCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/SortCommandIntegrationTests.java
index 20e351c06d..d2a84aed6f 100644
--- a/src/test/java/io/lettuce/core/commands/SortCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/SortCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
index f0e1a2183d..000b8ec537 100644
--- a/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
index 48fc966dcf..f53e40e64d 100644
--- a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java
index 1f980d119a..8d102a02a1 100644
--- a/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java
index d7adba8d6e..5b5e287b9f 100644
--- a/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandIntegrationTests.java
index ef9facc8f4..d6f47414dc 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java
index 2809efdfa9..98c512a4a6 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandIntegrationTests.java
index e07ae03dc3..de80400718 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandIntegrationTests.java
index 2556582c59..cbd4525fd0 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandIntegrationTests.java
index 41468d1c0c..ece9facc15 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandIntegrationTests.java
index 73b376f835..ab5b71022c 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandIntegrationTests.java
index ecc317327b..bb8aa3917d 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandIntegrationTests.java
index 41da7b6098..6241d19bb0 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandIntegrationTests.java
index 8795fe2fe6..5b4fdcb6cc 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandIntegrationTests.java
index f84f1b2aaf..e0fb627134 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandIntegrationTests.java
index 66429071b2..9218854ff3 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandIntegrationTests.java
index f554e2b23c..0fdaffae30 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandIntegrationTests.java
index 9a00eb0daf..d14e023b80 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandIntegrationTests.java
index 28ee9c6bf8..fbe50e2822 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandIntegrationTests.java
index 205169f796..4a4b6af6cc 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java
index 8a1fad612c..8d09451a35 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandIntegrationTests.java
index 6c173b00c1..7b2b967928 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandIntegrationTests.java
index 4f5e87a10e..f4f79954fe 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandIntegrationTests.java
index 26d162ab3b..b236e1d019 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandIntegrationTests.java
index 4080daaee0..524a5772a6 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandIntegrationTests.java
index 404f8b02cf..32e16d962b 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandIntegrationTests.java
index e1ab52159c..618f3bb10f 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandIntegrationTests.java
index 0c3fd1cbfa..b56ad3aded 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandIntegrationTests.java
index ad11ebf15d..046dfe5040 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandIntegrationTests.java
index 1ea88c364c..f06195b5f0 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandIntegrationTests.java
index 8e359295e5..e323d04056 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java b/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java
index ab89795692..9e93ddd8b4 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyUnitTests.java b/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyUnitTests.java
index 7675c9a3f2..df48f64533 100644
--- a/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryUnitTests.java b/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryUnitTests.java
index 2c66042ee3..23f09f1e8a 100644
--- a/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/ConversionServiceUnitTests.java b/src/test/java/io/lettuce/core/dynamic/ConversionServiceUnitTests.java
index 565356f74e..87797b9a52 100644
--- a/src/test/java/io/lettuce/core/dynamic/ConversionServiceUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/ConversionServiceUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java b/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java
index e6729dad68..15a1d0ee8c 100644
--- a/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java b/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java
index 9804ef676b..a69aafc2d0 100644
--- a/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/ParameterBinderUnitTests.java b/src/test/java/io/lettuce/core/dynamic/ParameterBinderUnitTests.java
index d048ce8c94..4a3dc641f8 100644
--- a/src/test/java/io/lettuce/core/dynamic/ParameterBinderUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/ParameterBinderUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java b/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java
index ed4a15e090..bcaba86048 100644
--- a/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java
index de60ef8f1a..c66f953a71 100644
--- a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java
index 051b1feb36..6fc15074fe 100644
--- a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncIntegrationTests.java
index 5ba7258403..881bfc24d1 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java
index bbddf41d83..2f2b2e5e5d 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java
index 1816dd3ccc..a3940935ca 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java
index e5693b95eb..9824b66380 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java
index 2de91faf47..f96dcbba3c 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java
index b7fdfaf105..b0dab1120f 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/SimpleBatcherUnitTests.java b/src/test/java/io/lettuce/core/dynamic/SimpleBatcherUnitTests.java
index 44efddd02d..5297deab56 100644
--- a/src/test/java/io/lettuce/core/dynamic/SimpleBatcherUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/SimpleBatcherUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java
index 3eeb2cdcbc..35f399c8ed 100644
--- a/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersUnitTests.java b/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersUnitTests.java
index d5a98b9153..360e076f83 100644
--- a/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryUnitTests.java b/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryUnitTests.java
index 0b8da9a834..81a92396d6 100644
--- a/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverUnitTests.java b/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverUnitTests.java
index 16dc8361c5..86e069e542 100644
--- a/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java
index d5c0d2f34c..cfdba0859b 100644
--- a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryUnitTests.java b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryUnitTests.java
index f8148b8384..452b45e7a9 100644
--- a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryUnitTests.java b/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryUnitTests.java
index f9ae4151ed..a362587b46 100644
--- a/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationUnitTests.java b/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationUnitTests.java
index e3dcd841cb..e70d7c4fcc 100644
--- a/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationUnitTests.java b/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationUnitTests.java
index 5c0235bdf4..1c3099b33c 100644
--- a/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java
index 3c2cd6e8e8..503e986be1 100644
--- a/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java b/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java
index 5580ad588d..accc879022 100644
--- a/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java
+++ b/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsUnitTests.java b/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsUnitTests.java
index 8e1811e4ec..87067c9dc0 100644
--- a/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerUnitTests.java b/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerUnitTests.java
index 3c436ecf60..e4ea7e2777 100644
--- a/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/internal/HostAndPortUnitTests.java b/src/test/java/io/lettuce/core/internal/HostAndPortUnitTests.java
index 47a39d8ec5..f90922f200 100644
--- a/src/test/java/io/lettuce/core/internal/HostAndPortUnitTests.java
+++ b/src/test/java/io/lettuce/core/internal/HostAndPortUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/ConnectionsUnitTests.java b/src/test/java/io/lettuce/core/masterslave/ConnectionsUnitTests.java
index 2aba025856..b8f0d8ac5a 100644
--- a/src/test/java/io/lettuce/core/masterslave/ConnectionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/ConnectionsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java b/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
index 535cbe303e..f4d8ada3ed 100644
--- a/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterUnitTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterUnitTests.java
index ed2d44f16a..97355ba4c0 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java
index 52047ec904..cc9b052c96 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
index 036e17d423..2e71706ca2 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
index 76af93f79a..cf4d5f366a 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java
index fb8e493720..c932046b84 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java
index 574b02a75c..929c5d2106 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java
index d8bf0594b4..67e6765289 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java
index 000a3fe1f2..4620823951 100644
--- a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
index 8e67be4b3a..e81c4e9e88 100644
--- a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java b/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java
index 3e4f223967..7d7a79d4f9 100644
--- a/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java
index 082c0e2694..e04d3d6d68 100644
--- a/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java
+++ b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptionsUnitTests.java b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptionsUnitTests.java
index 1b4a673f3c..6743f24a6f 100644
--- a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptionsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorUnitTests.java b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorUnitTests.java
index 7985da18cf..2bb075178e 100644
--- a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorUnitTests.java
+++ b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/models/command/CommandDetailParserUnitTests.java b/src/test/java/io/lettuce/core/models/command/CommandDetailParserUnitTests.java
index de1e9f0251..56fe582b75 100644
--- a/src/test/java/io/lettuce/core/models/command/CommandDetailParserUnitTests.java
+++ b/src/test/java/io/lettuce/core/models/command/CommandDetailParserUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/models/role/RoleParserUnitTests.java b/src/test/java/io/lettuce/core/models/role/RoleParserUnitTests.java
index 5ecd938358..817e32bcb4 100644
--- a/src/test/java/io/lettuce/core/models/role/RoleParserUnitTests.java
+++ b/src/test/java/io/lettuce/core/models/role/RoleParserUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/models/stream/PendingParserUnitTests.java b/src/test/java/io/lettuce/core/models/stream/PendingParserUnitTests.java
index 6f7fc8c943..199b03c17f 100644
--- a/src/test/java/io/lettuce/core/models/stream/PendingParserUnitTests.java
+++ b/src/test/java/io/lettuce/core/models/stream/PendingParserUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java
index aef93e94fc..d1c20dcd4b 100644
--- a/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java
index bf5d30c686..c4b474a7c0 100644
--- a/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java
index 897da1a6dc..e7b8214fbc 100644
--- a/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java
index 6aa1ba8049..6139b7c0e5 100644
--- a/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java
index 4e69c0455c..cee91b53d5 100644
--- a/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/MultiOutputUnitTests.java b/src/test/java/io/lettuce/core/output/MultiOutputUnitTests.java
index 2affa7b96e..662d0c8b90 100644
--- a/src/test/java/io/lettuce/core/output/MultiOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/MultiOutputUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java b/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java
index 7a7aaead84..00a116857c 100644
--- a/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/ReplayOutputUnitTests.java b/src/test/java/io/lettuce/core/output/ReplayOutputUnitTests.java
index 5671225ff5..652e1d49d9 100644
--- a/src/test/java/io/lettuce/core/output/ReplayOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/ReplayOutputUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java
index e579f0350d..8b4b3a77f2 100644
--- a/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/output/SocketAddressOutputUnitTests.java b/src/test/java/io/lettuce/core/output/SocketAddressOutputUnitTests.java
index 391fe6e25e..b0744e7647 100644
--- a/src/test/java/io/lettuce/core/output/SocketAddressOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/SocketAddressOutputUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java b/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
index e11763490c..0fca7c5d3b 100644
--- a/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java
index b59edb203c..a19bdf1a39 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
index e26c7f918e..a3c2eae202 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java
index ff3d210840..14e77e475c 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/protocol/CommandWrapperUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandWrapperUnitTests.java
index 879088dc8f..78b2b52263 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandWrapperUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandWrapperUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
index 94abfd4fe3..2655db6cac 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
index 2851f727c5..63eb2d985e 100644
--- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java b/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
index ee9897ca48..7029a14559 100644
--- a/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/protocol/TransactionalCommandUnitTests.java b/src/test/java/io/lettuce/core/protocol/TransactionalCommandUnitTests.java
index 52126ab8fd..3f4496f4c6 100644
--- a/src/test/java/io/lettuce/core/protocol/TransactionalCommandUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/TransactionalCommandUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
index 5f36b86a2d..18bb076515 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
index 5843a2c742..8865c22da1 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java b/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java
index 2580dc4c9e..5559ce5537 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
 
 /**
  * Unit tests for {@link PubSubEndpoint}.
- * 
+ *
  * @author Mark Paluch
  */
 class PubSubEndpointUnitTests {
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
index a89964e15e..a9dcf9eb0d 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
index 10b412da50..8609250d64 100644
--- a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
+++ b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java b/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java
index a64fed2fe7..46347af6e0 100644
--- a/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java
+++ b/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
index 767cc40626..f12aa325e0 100644
--- a/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
index 9ff368b544..2038c99606 100644
--- a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/ConstantDelayUnitTests.java b/src/test/java/io/lettuce/core/resource/ConstantDelayUnitTests.java
index 6b7c91d302..6e2820c1ff 100644
--- a/src/test/java/io/lettuce/core/resource/ConstantDelayUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/ConstantDelayUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayUnitTests.java b/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayUnitTests.java
index 96f6dc173f..72c7a485ec 100644
--- a/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
index 2e464251e1..53479e3065 100644
--- a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java b/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java
index ebf7e12ed6..5ccc21eeaf 100644
--- a/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java b/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java
index a0f17f3a29..d2d4851add 100644
--- a/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java
+++ b/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/EqualJitterDelayUnitTests.java b/src/test/java/io/lettuce/core/resource/EqualJitterDelayUnitTests.java
index 35b9096f3b..b2b3c8337b 100644
--- a/src/test/java/io/lettuce/core/resource/EqualJitterDelayUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/EqualJitterDelayUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/ExponentialDelayUnitTests.java b/src/test/java/io/lettuce/core/resource/ExponentialDelayUnitTests.java
index c516187d41..9ea4dbea9e 100644
--- a/src/test/java/io/lettuce/core/resource/ExponentialDelayUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/ExponentialDelayUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/FullJitterDelayUnitTests.java b/src/test/java/io/lettuce/core/resource/FullJitterDelayUnitTests.java
index 7bc00ecfe1..693607ee0f 100644
--- a/src/test/java/io/lettuce/core/resource/FullJitterDelayUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/FullJitterDelayUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/FuturesUnitTests.java b/src/test/java/io/lettuce/core/resource/FuturesUnitTests.java
index c6f8db0e9b..34745b1d58 100644
--- a/src/test/java/io/lettuce/core/resource/FuturesUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/FuturesUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverUnitTests.java b/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverUnitTests.java
index 3e49e6ed78..0fc3e7da71 100644
--- a/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java
index 7784024cc0..df58556e4d 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
index cbdf251a1a..7be51d4a7b 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java
index dcacaaa42a..680dd4a1f0 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelTestSettings.java b/src/test/java/io/lettuce/core/sentinel/SentinelTestSettings.java
index 365e5f31ea..a82530a48c 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelTestSettings.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelTestSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
index dd232e1dc7..6c4a13b5b5 100644
--- a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
index 1ac9c11aff..da2b62fdcf 100644
--- a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java b/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java
index d9c378a4b2..a8f8497a4d 100644
--- a/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java b/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java
index 0ea3cd1b9d..bb53305bc8 100644
--- a/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java
+++ b/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java b/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java
index 7bc69c79a8..c37a64fc46 100644
--- a/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java
+++ b/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/CdiIntegrationTests.java b/src/test/java/io/lettuce/core/support/CdiIntegrationTests.java
index e317e71b3c..e373b6ca0b 100644
--- a/src/test/java/io/lettuce/core/support/CdiIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/support/CdiIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java
index 1b5ab0429d..f232b98525 100644
--- a/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/InjectedClient.java b/src/test/java/io/lettuce/core/support/InjectedClient.java
index e228756a32..421e6d00c8 100644
--- a/src/test/java/io/lettuce/core/support/InjectedClient.java
+++ b/src/test/java/io/lettuce/core/support/InjectedClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/PersonDB.java b/src/test/java/io/lettuce/core/support/PersonDB.java
index 37b8bb3a27..c6efb1877c 100644
--- a/src/test/java/io/lettuce/core/support/PersonDB.java
+++ b/src/test/java/io/lettuce/core/support/PersonDB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/PubSubTestListener.java b/src/test/java/io/lettuce/core/support/PubSubTestListener.java
index 2149e7a407..ed07adbbab 100644
--- a/src/test/java/io/lettuce/core/support/PubSubTestListener.java
+++ b/src/test/java/io/lettuce/core/support/PubSubTestListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanUnitTests.java b/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanUnitTests.java
index 056f2c4c27..68456c061c 100644
--- a/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanUnitTests.java
+++ b/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/support/SpringIntegrationTests.java b/src/test/java/io/lettuce/core/support/SpringIntegrationTests.java
index bc50a75578..67b01d91c2 100644
--- a/src/test/java/io/lettuce/core/support/SpringIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/support/SpringIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
index 95eb2496e5..4ddaea0fcd 100644
--- a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java b/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java
index 1045fa62d5..28a89ad3cc 100644
--- a/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java
+++ b/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java b/src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java
index e908209730..558884ed77 100644
--- a/src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java
+++ b/src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
index cfd0e5eb39..d901ac904f 100644
--- a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
+++ b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
index eaaecaeba4..2c018d30d7 100644
--- a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
+++ b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedis.java b/src/test/java/io/lettuce/examples/ConnectToRedis.java
index 21dd429d0a..ee4c43e1ae 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedis.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedis.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java b/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
index 26e07e8e34..60865c5129 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java b/src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java
index fd8683944a..a0f599a3f3 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java b/src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java
index 5c0f405eac..950a70e86e 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisSSL.java b/src/test/java/io/lettuce/examples/ConnectToRedisSSL.java
index d346df5701..a53db4d9d8 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisSSL.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisSSL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java b/src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java
index adef65f194..2519f2918e 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/MySpringBean.java b/src/test/java/io/lettuce/examples/MySpringBean.java
index 6924cdc2ef..a0fb3fd344 100644
--- a/src/test/java/io/lettuce/examples/MySpringBean.java
+++ b/src/test/java/io/lettuce/examples/MySpringBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/ReadWriteExample.java b/src/test/java/io/lettuce/examples/ReadWriteExample.java
index a0a3073bdf..ed0b73610a 100644
--- a/src/test/java/io/lettuce/examples/ReadWriteExample.java
+++ b/src/test/java/io/lettuce/examples/ReadWriteExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/examples/SpringExample.java b/src/test/java/io/lettuce/examples/SpringExample.java
index 70b3641fb1..fcdd3f7308 100644
--- a/src/test/java/io/lettuce/examples/SpringExample.java
+++ b/src/test/java/io/lettuce/examples/SpringExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/CanConnect.java b/src/test/java/io/lettuce/test/CanConnect.java
index 190ed751f8..8ea865a929 100644
--- a/src/test/java/io/lettuce/test/CanConnect.java
+++ b/src/test/java/io/lettuce/test/CanConnect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/ConnectionDecoratingInvocationHandler.java b/src/test/java/io/lettuce/test/ConnectionDecoratingInvocationHandler.java
index 69744707f5..b5bf661683 100644
--- a/src/test/java/io/lettuce/test/ConnectionDecoratingInvocationHandler.java
+++ b/src/test/java/io/lettuce/test/ConnectionDecoratingInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/ConnectionTestUtil.java b/src/test/java/io/lettuce/test/ConnectionTestUtil.java
index 9b0fc25a7c..4cf794923d 100644
--- a/src/test/java/io/lettuce/test/ConnectionTestUtil.java
+++ b/src/test/java/io/lettuce/test/ConnectionTestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/Delay.java b/src/test/java/io/lettuce/test/Delay.java
index 85eafc1c06..a64217bae1 100644
--- a/src/test/java/io/lettuce/test/Delay.java
+++ b/src/test/java/io/lettuce/test/Delay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/Futures.java b/src/test/java/io/lettuce/test/Futures.java
index 364808b482..333067ffdd 100644
--- a/src/test/java/io/lettuce/test/Futures.java
+++ b/src/test/java/io/lettuce/test/Futures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/KeyValueStreamingAdapter.java b/src/test/java/io/lettuce/test/KeyValueStreamingAdapter.java
index 629c20d937..9501b99147 100644
--- a/src/test/java/io/lettuce/test/KeyValueStreamingAdapter.java
+++ b/src/test/java/io/lettuce/test/KeyValueStreamingAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/KeysAndValues.java b/src/test/java/io/lettuce/test/KeysAndValues.java
index 2b024d139b..3cc2775217 100644
--- a/src/test/java/io/lettuce/test/KeysAndValues.java
+++ b/src/test/java/io/lettuce/test/KeysAndValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/LettuceExtension.java b/src/test/java/io/lettuce/test/LettuceExtension.java
index fbd0d66cc6..d6b4d34748 100644
--- a/src/test/java/io/lettuce/test/LettuceExtension.java
+++ b/src/test/java/io/lettuce/test/LettuceExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/ListStreamingAdapter.java b/src/test/java/io/lettuce/test/ListStreamingAdapter.java
index a5b0b90d10..47b109e529 100644
--- a/src/test/java/io/lettuce/test/ListStreamingAdapter.java
+++ b/src/test/java/io/lettuce/test/ListStreamingAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/ReactiveSyncInvocationHandler.java b/src/test/java/io/lettuce/test/ReactiveSyncInvocationHandler.java
index a506836244..75f30a9386 100644
--- a/src/test/java/io/lettuce/test/ReactiveSyncInvocationHandler.java
+++ b/src/test/java/io/lettuce/test/ReactiveSyncInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/RoutingInvocationHandler.java b/src/test/java/io/lettuce/test/RoutingInvocationHandler.java
index 5f7209f5de..3f4f08048d 100644
--- a/src/test/java/io/lettuce/test/RoutingInvocationHandler.java
+++ b/src/test/java/io/lettuce/test/RoutingInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/Wait.java b/src/test/java/io/lettuce/test/Wait.java
index 5d97f28e44..336b3c3546 100644
--- a/src/test/java/io/lettuce/test/Wait.java
+++ b/src/test/java/io/lettuce/test/Wait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/WithPassword.java b/src/test/java/io/lettuce/test/WithPassword.java
index 411380cf45..3084b3a69d 100644
--- a/src/test/java/io/lettuce/test/WithPassword.java
+++ b/src/test/java/io/lettuce/test/WithPassword.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/condition/EnabledOnCommand.java b/src/test/java/io/lettuce/test/condition/EnabledOnCommand.java
index f99021824f..00f6ff3d6f 100644
--- a/src/test/java/io/lettuce/test/condition/EnabledOnCommand.java
+++ b/src/test/java/io/lettuce/test/condition/EnabledOnCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/condition/EnabledOnCommandCondition.java b/src/test/java/io/lettuce/test/condition/EnabledOnCommandCondition.java
index 88744983c2..f447b8faec 100644
--- a/src/test/java/io/lettuce/test/condition/EnabledOnCommandCondition.java
+++ b/src/test/java/io/lettuce/test/condition/EnabledOnCommandCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/condition/RedisConditions.java b/src/test/java/io/lettuce/test/condition/RedisConditions.java
index e5cad0ac59..ddebff5404 100644
--- a/src/test/java/io/lettuce/test/condition/RedisConditions.java
+++ b/src/test/java/io/lettuce/test/condition/RedisConditions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/resource/DefaultRedisClient.java b/src/test/java/io/lettuce/test/resource/DefaultRedisClient.java
index 1ad36a6b3d..1eee4841fd 100644
--- a/src/test/java/io/lettuce/test/resource/DefaultRedisClient.java
+++ b/src/test/java/io/lettuce/test/resource/DefaultRedisClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/resource/DefaultRedisClusterClient.java b/src/test/java/io/lettuce/test/resource/DefaultRedisClusterClient.java
index 37a38513f4..dc67b9b49b 100644
--- a/src/test/java/io/lettuce/test/resource/DefaultRedisClusterClient.java
+++ b/src/test/java/io/lettuce/test/resource/DefaultRedisClusterClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/resource/FastShutdown.java b/src/test/java/io/lettuce/test/resource/FastShutdown.java
index 4302f13691..e31bcbdbd0 100644
--- a/src/test/java/io/lettuce/test/resource/FastShutdown.java
+++ b/src/test/java/io/lettuce/test/resource/FastShutdown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/resource/TestClientResources.java b/src/test/java/io/lettuce/test/resource/TestClientResources.java
index 2d81df2a99..4d1278ddfb 100644
--- a/src/test/java/io/lettuce/test/resource/TestClientResources.java
+++ b/src/test/java/io/lettuce/test/resource/TestClientResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/resource/TestEventLoopGroupProvider.java b/src/test/java/io/lettuce/test/resource/TestEventLoopGroupProvider.java
index 86f4b43f1a..e55e97b8d9 100644
--- a/src/test/java/io/lettuce/test/resource/TestEventLoopGroupProvider.java
+++ b/src/test/java/io/lettuce/test/resource/TestEventLoopGroupProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/server/MockTcpServer.java b/src/test/java/io/lettuce/test/server/MockTcpServer.java
index cd09c04127..5430075313 100644
--- a/src/test/java/io/lettuce/test/server/MockTcpServer.java
+++ b/src/test/java/io/lettuce/test/server/MockTcpServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/server/RandomResponseServer.java b/src/test/java/io/lettuce/test/server/RandomResponseServer.java
index 3a3d966d25..ffbbd02d7d 100644
--- a/src/test/java/io/lettuce/test/server/RandomResponseServer.java
+++ b/src/test/java/io/lettuce/test/server/RandomResponseServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/server/RandomServerHandler.java b/src/test/java/io/lettuce/test/server/RandomServerHandler.java
index d96f9df141..88f7c28df2 100644
--- a/src/test/java/io/lettuce/test/server/RandomServerHandler.java
+++ b/src/test/java/io/lettuce/test/server/RandomServerHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/lettuce/test/settings/TestSettings.java b/src/test/java/io/lettuce/test/settings/TestSettings.java
index bb83ef8bb5..754966117f 100644
--- a/src/test/java/io/lettuce/test/settings/TestSettings.java
+++ b/src/test/java/io/lettuce/test/settings/TestSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java b/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
index 82b3b763d8..4badd11498 100644
--- a/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
+++ b/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java b/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
index 3f239108c9..8695723db3 100644
--- a/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
+++ b/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/JmhMain.java b/src/test/jmh/io/lettuce/core/JmhMain.java
index 6e212b00a6..6033bb8227 100644
--- a/src/test/jmh/io/lettuce/core/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/JmhMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
index e16e7b6bb5..eea92858b4 100644
--- a/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
index 65e79bea3b..8015ce7f88 100644
--- a/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java b/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java
index 7076a8b6a7..e7f06a6fdb 100644
--- a/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java
+++ b/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/cluster/JmhMain.java b/src/test/jmh/io/lettuce/core/cluster/JmhMain.java
index d2e40f6226..ac35e1a02b 100644
--- a/src/test/jmh/io/lettuce/core/cluster/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/cluster/JmhMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
index c63dcc515a..7d1194128c 100644
--- a/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java
index e8663b2819..8f06d11469 100644
--- a/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/cluster/models/partitions/JmhMain.java b/src/test/jmh/io/lettuce/core/cluster/models/partitions/JmhMain.java
index 336a82b78e..c4a84b3f1b 100644
--- a/src/test/jmh/io/lettuce/core/cluster/models/partitions/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/cluster/models/partitions/JmhMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java
index 7e6f7c6509..8231390aed 100644
--- a/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/codec/JmhMain.java b/src/test/jmh/io/lettuce/core/codec/JmhMain.java
index 9e8e1ea808..8f9fb6f1e8 100644
--- a/src/test/jmh/io/lettuce/core/codec/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/codec/JmhMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java b/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java
index d2df982ebe..e522db3262 100644
--- a/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java b/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java
index 7e6acc2766..602d5c7c11 100644
--- a/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java
index 1dbd4d54b6..f4321913df 100644
--- a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
index de6ba247aa..c825a86958 100644
--- a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java
index 37bb6967a0..bb2587a4ba 100644
--- a/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/output/JmhMain.java b/src/test/jmh/io/lettuce/core/output/JmhMain.java
index 02ed30e558..12dfc11ad4 100644
--- a/src/test/jmh/io/lettuce/core/output/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/output/JmhMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/output/ValueListOutputBenchmark.java b/src/test/jmh/io/lettuce/core/output/ValueListOutputBenchmark.java
index 42b430edfa..1a866353ac 100644
--- a/src/test/jmh/io/lettuce/core/output/ValueListOutputBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/output/ValueListOutputBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
index 9747616661..6097756d47 100644
--- a/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
index ba0cc57302..6b1403edd8 100644
--- a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java b/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
index a2a56257b8..5d2e0a1b19 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
index 3503bc3c40..d8c54c5bf4 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java b/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
index 7034aa1c16..4669b5f6b4 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java b/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java
index 1e73b88931..5b645b94da 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java b/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
index fb7e039a02..bf8706bde2 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/JmhMain.java b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
index d30706119e..4da1c8b190 100644
--- a/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
index 59d80cf67c..a5ea0c7c6d 100644
--- a/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
index 81bed5103c..fceab004be 100644
--- a/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/support/AsyncConnectionPoolBenchmark.java b/src/test/jmh/io/lettuce/core/support/AsyncConnectionPoolBenchmark.java
index 298e2175dc..ac36391ce7 100644
--- a/src/test/jmh/io/lettuce/core/support/AsyncConnectionPoolBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/support/AsyncConnectionPoolBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/support/GenericConnectionPoolBenchmark.java b/src/test/jmh/io/lettuce/core/support/GenericConnectionPoolBenchmark.java
index a5c2ed9152..594cf0662f 100644
--- a/src/test/jmh/io/lettuce/core/support/GenericConnectionPoolBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/support/GenericConnectionPoolBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/jmh/io/lettuce/core/support/JmhMain.java b/src/test/jmh/io/lettuce/core/support/JmhMain.java
index ef210d6e96..caacd84e57 100644
--- a/src/test/jmh/io/lettuce/core/support/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/support/JmhMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 98821f59f043e0843ab3834960b0f9f8982e8743 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 19 Dec 2018 12:41:38 +0100
Subject: [PATCH 578/808] Fix Pub/Sub decoding of chunked out of band responses
 #936

PubSubCommandHandler now considers correctly chunked Pub/Sub messages if a previous chunk was used to decode an out of band response (message/pmessage) while a command was sent. Previously, decoding got stuck because the command was attempted to be decoded with the next chunk.
---
 .../core/pubsub/PubSubCommandHandler.java     |  12 ++
 .../io/lettuce/core/pubsub/PubSubOutput.java  |   8 ++
 .../pubsub/PubSubCommandHandlerUnitTests.java | 120 +++++++++++++++++-
 3 files changed, 134 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
index cf137a15d8..26fb20a5f0 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
@@ -83,6 +83,18 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
     @Override
     protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws InterruptedException {
 
+        if (output.type() != null && !output.isCompleted()) {
+
+            if (!super.decode(buffer, output)) {
+                return;
+            }
+
+            RedisCommand<?, ?, ?> peek = getStack().peek();
+            canComplete(peek);
+            endpoint.notifyMessage(output);
+            output = new PubSubOutput<>(codec);
+        }
+
         if (!getStack().isEmpty()) {
             super.decode(ctx, buffer);
         }
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java b/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
index 0ecbfe740c..cd2b959498 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
@@ -38,6 +38,7 @@ public enum Type {
     private K channel;
     private K pattern;
     private long count;
+    private boolean completed;
 
     public PubSubOutput(RedisCodec<K, V> codec) {
         super(codec, null);
@@ -89,6 +90,7 @@ private void handleOutput(ByteBuffer bytes) {
                     break;
                 }
                 output = (T) codec.decodeValue(bytes);
+                completed = true;
                 break;
             case psubscribe:
             case punsubscribe:
@@ -106,5 +108,11 @@ private void handleOutput(ByteBuffer bytes) {
     @Override
     public void set(long integer) {
         count = integer;
+        // count comes last in (p)(un)subscribe ack.
+        completed = true;
+    }
+
+    boolean isCompleted() {
+        return completed;
     }
 }
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
index 18bb076515..efefdd8028 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -28,6 +29,8 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.ClientOptions;
@@ -41,6 +44,7 @@
 import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.tracing.Tracing;
+import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.*;
@@ -49,6 +53,7 @@
  * @author Mark Paluch
  */
 @ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 class PubSubCommandHandlerUnitTests {
 
     private Queue<RedisCommand<String, String, ?>> stack;
@@ -109,7 +114,7 @@ void shouldCompleteCommandExceptionallyOnOutputFailure() throws Exception {
         sut.channelActive(context);
         stack.add(command);
 
-        sut.channelRead(context, Unpooled.wrappedBuffer(":1000\r\n".getBytes()));
+        sut.channelRead(context, responseBytes(":1000\r\n"));
 
         assertThat(ReflectionTestUtils.getField(command, "exception")).isInstanceOf(IllegalStateException.class);
     }
@@ -121,7 +126,7 @@ void shouldDecodeRegularCommand() throws Exception {
         sut.channelActive(context);
         stack.add(command);
 
-        sut.channelRead(context, Unpooled.wrappedBuffer("+OK\r\n".getBytes()));
+        sut.channelRead(context, responseBytes("+OK\r\n"));
 
         assertThat(command.get()).isEqualTo("OK");
     }
@@ -139,7 +144,7 @@ void shouldDecodeTwoCommands() throws Exception {
         stack.add(command1);
         stack.add(command2);
 
-        sut.channelRead(context, Unpooled.wrappedBuffer("+OK\r\n+YEAH\r\n".getBytes()));
+        sut.channelRead(context, responseBytes("+OK\r\n+YEAH\r\n"));
 
         assertThat(command1.get()).isEqualTo("OK");
         assertThat(command2.get()).isEqualTo("YEAH");
@@ -155,7 +160,7 @@ void shouldPropagatePubSubResponseToOutput() throws Exception {
         sut.channelActive(context);
         stack.add(command1);
 
-        sut.channelRead(context, Unpooled.wrappedBuffer("*3\r\n$7\r\nmessage\r\n$3\r\nfoo\r\n$3\r\nbar\r\n".getBytes()));
+        sut.channelRead(context, responseBytes("*3\r\n$7\r\nmessage\r\n$3\r\nfoo\r\n$3\r\nbar\r\n"));
 
         assertThat(command1.isDone()).isFalse();
 
@@ -175,8 +180,7 @@ void shouldPropagateInterleavedPubSubResponseToOutput() throws Exception {
         stack.add(command1);
         stack.add(command2);
 
-        sut.channelRead(context, Unpooled
-                .wrappedBuffer("+OK\r\n*4\r\n$8\r\npmessage\r\n$1\r\n*\r\n$3\r\nfoo\r\n$3\r\nbar\r\n+YEAH\r\n".getBytes()));
+        sut.channelRead(context, responseBytes("+OK\r\n*4\r\n$8\r\npmessage\r\n$1\r\n*\r\n$3\r\nfoo\r\n$3\r\nbar\r\n+YEAH\r\n"));
 
         assertThat(command1.get()).isEqualTo("OK");
         assertThat(command2.get()).isEqualTo("YEAH");
@@ -188,4 +192,108 @@ void shouldPropagateInterleavedPubSubResponseToOutput() throws Exception {
         assertThat(captor.getValue().channel()).isEqualTo("foo");
         assertThat(captor.getValue().get()).isEqualTo("bar");
     }
+
+    @Test
+    void shouldNotPropagatePartialPubSubResponseToOutput() throws Exception {
+
+        Command<String, String, String> command1 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(
+                new Utf8StringCodec()), null);
+        Command<String, String, String> command2 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(
+                new Utf8StringCodec()), null);
+
+        sut.channelRegistered(context);
+        sut.channelActive(context);
+        stack.add(command1);
+        stack.add(command2);
+
+        sut.channelRead(context, responseBytes("*3\r\n$9\r\nsubscribe\r\n$1\r\na\r\n:2\r\n*3\r\n$9\r\nsubscribe\r\n"));
+
+        assertThat(command1.isDone()).isTrue();
+        assertThat(command2.isDone()).isFalse();
+
+        assertThat(stack).hasSize(1);
+
+        ArgumentCaptor<PubSubOutput> captor = ArgumentCaptor.forClass(PubSubOutput.class);
+        verify(endpoint).notifyMessage(captor.capture());
+
+        assertThat(captor.getValue().channel()).isEqualTo("a");
+        assertThat(captor.getValue().count()).isEqualTo(2);
+    }
+
+    @Test
+    void shouldCompleteWithChunkedResponseOnStack() throws Exception {
+
+        Command<String, String, String> command1 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(
+                new Utf8StringCodec()), null);
+        Command<String, String, String> command2 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(
+                new Utf8StringCodec()), null);
+
+        sut.channelRegistered(context);
+        sut.channelActive(context);
+        stack.add(command1);
+        stack.add(command2);
+
+        sut.channelRead(context, responseBytes("*3\r\n$9\r\nsubscribe\r\n$1\r\na\r\n:2\r\n*3\r\n$9\r\nsubscribe\r\n"));
+        sut.channelRead(context, responseBytes("$1\r\nb\r\n:2\r\n"));
+
+        assertThat(command1.isDone()).isTrue();
+        assertThat(command2.isDone()).isTrue();
+
+        assertThat(stack).isEmpty();
+
+        ArgumentCaptor<PubSubOutput> captor = ArgumentCaptor.forClass(PubSubOutput.class);
+        verify(endpoint, times(2)).notifyMessage(captor.capture());
+
+        assertThat(captor.getAllValues().get(0).channel()).isEqualTo("a");
+        assertThat(captor.getAllValues().get(1).channel()).isEqualTo("b");
+    }
+
+    @Test
+    void shouldCompleteWithChunkedResponseOutOfBand() throws Exception {
+
+        sut.channelRegistered(context);
+        sut.channelActive(context);
+
+        sut.channelRead(context, responseBytes("*3\r\n$9\r\nsubscribe\r\n$1\r\na\r\n:2\r\n*3\r\n$9\r\nsubscribe\r\n"));
+        sut.channelRead(context, responseBytes("$1\r\nb\r\n:2\r\n"));
+
+        ArgumentCaptor<PubSubOutput> captor = ArgumentCaptor.forClass(PubSubOutput.class);
+        verify(endpoint, times(2)).notifyMessage(captor.capture());
+
+        assertThat(captor.getAllValues().get(0).channel()).isEqualTo("a");
+        assertThat(captor.getAllValues().get(1).channel()).isEqualTo("b");
+    }
+
+    @Test
+    void shouldCompleteWithChunkedResponseInterleavedSending() throws Exception {
+
+        Command<String, String, String> command1 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(
+                new Utf8StringCodec()), null);
+
+        sut.channelRegistered(context);
+        sut.channelActive(context);
+
+        sut.channelRegistered(context);
+        sut.channelActive(context);
+
+        sut.channelRead(context, responseBytes("*3\r\n$7\r\nmessage\r\n$3"));
+        stack.add(command1);
+        sut.channelRead(context, responseBytes("\r\nfoo\r\n$3\r\nbar\r\n"));
+        sut.channelRead(context, responseBytes("*3\r\n$9\r\nsubscribe\r\n$1\r\na\r\n:2"));
+        sut.channelRead(context, responseBytes("\r\n"));
+
+        assertThat(command1.isDone()).isTrue();
+        assertThat(stack).isEmpty();
+
+        ArgumentCaptor<PubSubOutput> captor = ArgumentCaptor.forClass(PubSubOutput.class);
+        verify(endpoint, times(2)).notifyMessage(captor.capture());
+
+        assertThat(captor.getAllValues().get(0).channel()).isEqualTo("foo");
+        assertThat(captor.getAllValues().get(0).get()).isEqualTo("bar");
+        assertThat(captor.getAllValues().get(1).channel()).isEqualTo("a");
+    }
+
+    private static ByteBuf responseBytes(String s) {
+        return Unpooled.wrappedBuffer(s.getBytes());
+    }
 }

From 337b017ff572307e5e62eee258f19e3fbae66a24 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 2 Jan 2019 11:09:12 +0100
Subject: [PATCH 579/808] Add adaptive refresh trigger for uncovered slots #672
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lettuce now listens to events raised from routing requests to uncovered slots. Command dispatch for read/write commands that terminates with PartitionSelectorException (Cannot determine a partition …) is now the trigger for uncovered slot events.

Uncovered slots can be a late indicator for a topology change in which a number of command fails before the topology is updated to recover operations.
---
 .../core/cluster/ClusterEventListener.java    | 10 ++++
 .../ClusterTopologyRefreshOptions.java        |  7 +++
 .../ClusterTopologyRefreshScheduler.java      |  9 ++++
 .../PooledClusterConnectionProvider.java      | 17 ++++---
 ...sterTopologyRefreshSchedulerUnitTests.java | 20 ++++++--
 ...ledClusterConnectionProviderUnitTests.java | 51 +++++++++++++++----
 6 files changed, 94 insertions(+), 20 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java b/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
index 89c9cc9fda..155d81f7e4 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
@@ -40,8 +40,18 @@ default void onMovedRedirection() {
     default void onReconnectAttempt(int attempt) {
     }
 
+    /**
+     * Event callback if a command should be routed to a slot that is not covered.
+     *
+     * @since 5.2
+     */
+    default void onUncoveredSlot(int slot) {
+    }
+
     /**
      * Event callback if a connection is attempted to an unknown node.
+     *
+     * @since 5.1
      */
     default void onUnknownNode() {
     }
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
index 5a82cb5304..d7a1105f29 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
@@ -426,6 +426,13 @@ public enum RefreshTrigger {
          */
         PERSISTENT_RECONNECTS,
 
+        /**
+         * Attempts to use a slot that is not covered by a known node.
+         *
+         * @since 5.2
+         */
+        UNCOVERED_SLOT,
+
         /**
          * Connection attempts to unknown nodes.
          *
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
index 98250ca331..2dca906bc2 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
@@ -136,8 +136,17 @@ public void onReconnectAttempt(int attempt) {
         }
     }
 
+    @Override
+    public void onUncoveredSlot(int slot) {
+
+        if (isEnabled(ClusterTopologyRefreshOptions.RefreshTrigger.UNCOVERED_SLOT)) {
+            indicateTopologyRefreshSignal();
+        }
+    }
+
     @Override
     public void onUnknownNode() {
+
         if (isEnabled(ClusterTopologyRefreshOptions.RefreshTrigger.UNKNOWN_NODE)) {
             indicateTopologyRefreshSignal();
         }
diff --git a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
index e6997f5d83..7c2dd5daab 100644
--- a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
@@ -33,6 +33,7 @@
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.internal.AsyncConnectionProvider;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.HostAndPort;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.models.role.RedisInstance;
@@ -121,7 +122,9 @@ private CompletableFuture<StatefulRedisConnection<K, V>> getWriteConnection(int
         if (writer == null) {
             RedisClusterNode partition = partitions.getPartitionBySlot(slot);
             if (partition == null) {
-                throw new PartitionSelectorException("Cannot determine a partition for slot " + slot + ".", partitions.clone());
+                clusterEventListener.onUncoveredSlot(slot);
+                return Futures.failed(new PartitionSelectorException("Cannot determine a partition for slot " + slot + ".",
+                        partitions.clone()));
             }
 
             // Use always host and port for slot-oriented operations. We don't want to get reconnected on a different
@@ -160,8 +163,9 @@ private CompletableFuture<StatefulRedisConnection<K, V>> getReadConnection(int s
 
             RedisClusterNode master = partitions.getPartitionBySlot(slot);
             if (master == null) {
-                throw new PartitionSelectorException(String.format("Cannot determine a partition to read for slot %d.", slot),
-                        partitions.clone());
+                clusterEventListener.onUncoveredSlot(slot);
+                return Futures.failed(new PartitionSelectorException(String.format(
+                        "Cannot determine a partition to read for slot %d.", slot), partitions.clone()));
             }
 
             List<RedisNodeDescription> candidates = getReadCandidates(master);
@@ -178,9 +182,10 @@ public Iterator<RedisNodeDescription> iterator() {
             });
 
             if (selection.isEmpty()) {
-                throw new PartitionSelectorException(String.format(
-                        "Cannot determine a partition to read for slot %d with setting %s.", slot, readFrom),
-                        partitions.clone());
+                clusterEventListener.onUncoveredSlot(slot);
+                return Futures.failed(new PartitionSelectorException(String.format(
+                        "Cannot determine a partition to read for slot %d with setting %s.", slot, readFrom), partitions
+                        .clone()));
             }
 
             readerCandidates = getReadFromConnections(selection);
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
index f18606ba66..b378869e35 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
@@ -45,11 +45,11 @@ class ClusterTopologyRefreshSchedulerUnitTests {
 
     private ClusterTopologyRefreshScheduler sut;
 
-    private ClusterTopologyRefreshOptions immediateRefresh = ClusterTopologyRefreshOptions.builder().enablePeriodicRefresh(1, TimeUnit.MILLISECONDS)
-            .enableAllAdaptiveRefreshTriggers().build();
+    private ClusterTopologyRefreshOptions immediateRefresh = ClusterTopologyRefreshOptions.builder()
+            .enablePeriodicRefresh(1, TimeUnit.MILLISECONDS).enableAllAdaptiveRefreshTriggers().build();
 
-    private ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder()
-            .topologyRefreshOptions(immediateRefresh).build();
+    private ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder().topologyRefreshOptions(immediateRefresh)
+            .build();
 
     @Mock
     private ClientResources clientResources;
@@ -179,6 +179,18 @@ void shouldTriggerRefreshOnReconnect() {
         verify(eventExecutors).submit(any(Runnable.class));
     }
 
+    @Test
+    void shouldTriggerRefreshOnUncoveredSlot() {
+
+        ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder().topologyRefreshOptions(immediateRefresh)
+                .build();
+
+        when(clusterClient.getClusterClientOptions()).thenReturn(clusterClientOptions);
+
+        sut.onUncoveredSlot(1234);
+        verify(eventExecutors).submit(any(Runnable.class));
+    }
+
     @Test
     void shouldTriggerRefreshOnUnknownNode() {
 
diff --git a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
index 6460ee4670..afc778a469 100644
--- a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
@@ -48,6 +48,7 @@
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.protocol.Command;
 import io.lettuce.core.protocol.CommandType;
@@ -146,8 +147,7 @@ void shouldObtainConnectionReadFromSlave() {
         when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
                 ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
-        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(
-                CommandType.READONLY, null, null));
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
         async.complete();
 
         when(asyncCommandsMock.readOnly()).thenReturn(async);
@@ -168,8 +168,7 @@ void shouldCloseConnectionOnConnectFailure() {
         when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
                 ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
-        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(
-                CommandType.READONLY, null, null));
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
         async.completeExceptionally(new RuntimeException());
 
         when(asyncCommandsMock.readOnly()).thenReturn(async);
@@ -193,8 +192,7 @@ void shouldRetryConnectionAttemptAfterConnectionAttemptWasBroken() {
         when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
                 ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
-        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(
-                CommandType.READONLY, null, null));
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
         async.completeExceptionally(new RuntimeException());
 
         when(asyncCommandsMock.readOnly()).thenReturn(async);
@@ -231,8 +229,7 @@ void shouldSelectSuccessfulConnectionIfOtherNodesFailed() {
         when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
                 ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
-        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(
-                CommandType.READONLY, null, null));
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
         async.complete("OK");
 
         when(asyncCommandsMock.readOnly()).thenReturn(async);
@@ -263,8 +260,7 @@ void shouldFailIfAllReadCandidateNodesFail() {
         when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
                 ConnectionFuture.from(socketAddressMock, failed2));
 
-        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(
-                CommandType.READONLY, null, null));
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
         async.complete("OK");
 
         sut.setReadFrom(ReadFrom.MASTER_PREFERRED);
@@ -281,6 +277,41 @@ void shouldFailIfAllReadCandidateNodesFail() {
         verify(clientMock).connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any());
     }
 
+    @Test
+    void shouldNotifyListerOnUncoveredWriteSlot() {
+
+        partitions.clear();
+
+        sut.getConnectionAsync(Intent.WRITE, 2);
+
+        verify(clusterEventListener).onUncoveredSlot(2);
+    }
+
+    @Test
+    void shouldNotifyListerOnUncoveredReadSlot() {
+
+        partitions.clear();
+
+        sut.getConnectionAsync(Intent.WRITE, 2);
+
+        verify(clusterEventListener).onUncoveredSlot(2);
+    }
+
+    @Test
+    void shouldNotifyListerOnUncoveredReadSlotAfterSelection() {
+
+        sut.setReadFrom(new ReadFrom() {
+            @Override
+            public List<RedisNodeDescription> select(Nodes nodes) {
+                return Collections.emptyList();
+            }
+        });
+
+        sut.getConnectionAsync(Intent.READ, 2);
+
+        verify(clusterEventListener).onUncoveredSlot(2);
+    }
+
     @Test
     void shouldCloseConnections() {
 

From 4d62d49a3818a1996f5282654745a202405715c2 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 2 Jan 2019 11:39:27 +0100
Subject: [PATCH 580/808] Introduce adaptive trigger event #952

Topology refresh scheduling by an adaptive trigger now emits a AdaptiveRefreshTriggeredEvent that allows applications to get notified about an adaptive refresh so application can track the state of the topology view and potentially register another topology update.
---
 .../ClusterTopologyRefreshScheduler.java      | 63 ++++++++++++++++---
 .../AdaptiveRefreshTriggeredEvent.java        | 54 ++++++++++++++++
 .../core/event/cluster/package-info.java      |  5 ++
 ...sterTopologyRefreshSchedulerUnitTests.java | 60 ++++++++++++++++++
 4 files changed, 172 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/event/cluster/AdaptiveRefreshTriggeredEvent.java
 create mode 100644 src/main/java/io/lettuce/core/event/cluster/package-info.java

diff --git a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
index 2dca906bc2..b3f7fbe44f 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
@@ -16,8 +16,10 @@
 package io.lettuce.core.cluster;
 
 import java.time.Duration;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.lettuce.core.event.cluster.AdaptiveRefreshTriggeredEvent;
 import io.lettuce.core.resource.ClientResources;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.internal.logging.InternalLogger;
@@ -61,19 +63,26 @@ public void run() {
         clientResources.eventExecutorGroup().submit(clusterTopologyRefreshTask);
     }
 
-    private void indicateTopologyRefreshSignal() {
+    private boolean indicateTopologyRefreshSignal() {
 
         logger.debug("ClusterTopologyRefreshScheduler.indicateTopologyRefreshSignal()");
 
         if (!acquireTimeout()) {
-            return;
+            return false;
         }
 
+        return scheduleRefresh();
+    }
+
+    private boolean scheduleRefresh() {
+
         if (isEventLoopActive() && redisClusterClient.getClusterClientOptions() != null) {
             clientResources.eventExecutorGroup().submit(clusterTopologyRefreshTask);
-        } else {
-            logger.debug("Adaptive ClusterTopologyRefresh is disabled");
+            return true;
         }
+
+        logger.debug("ClusterTopologyRefresh is disabled");
+        return false;
     }
 
     /**
@@ -81,7 +90,7 @@ private void indicateTopologyRefreshSignal() {
      *
      * @return false if the worker pool is terminating, shutdown or terminated
      */
-    protected boolean isEventLoopActive() {
+    private boolean isEventLoopActive() {
 
         EventExecutorGroup eventExecutors = clientResources.eventExecutorGroup();
         if (eventExecutors.isShuttingDown() || eventExecutors.isShutdown() || eventExecutors.isTerminated()) {
@@ -123,7 +132,9 @@ public void onAskRedirection() {
     public void onMovedRedirection() {
 
         if (isEnabled(ClusterTopologyRefreshOptions.RefreshTrigger.MOVED_REDIRECT)) {
-            indicateTopologyRefreshSignal();
+            if (indicateTopologyRefreshSignal()) {
+                emitAdaptiveRefreshScheduledEvent();
+            }
         }
     }
 
@@ -132,7 +143,9 @@ public void onReconnectAttempt(int attempt) {
 
         if (isEnabled(ClusterTopologyRefreshOptions.RefreshTrigger.PERSISTENT_RECONNECTS)
                 && attempt >= getClusterTopologyRefreshOptions().getRefreshTriggersReconnectAttempts()) {
-            indicateTopologyRefreshSignal();
+            if (indicateTopologyRefreshSignal()) {
+                emitAdaptiveRefreshScheduledEvent();
+            }
         }
     }
 
@@ -140,7 +153,9 @@ public void onReconnectAttempt(int attempt) {
     public void onUncoveredSlot(int slot) {
 
         if (isEnabled(ClusterTopologyRefreshOptions.RefreshTrigger.UNCOVERED_SLOT)) {
-            indicateTopologyRefreshSignal();
+            if (indicateTopologyRefreshSignal()) {
+                emitAdaptiveRefreshScheduledEvent();
+            }
         }
     }
 
@@ -148,10 +163,20 @@ public void onUncoveredSlot(int slot) {
     public void onUnknownNode() {
 
         if (isEnabled(ClusterTopologyRefreshOptions.RefreshTrigger.UNKNOWN_NODE)) {
-            indicateTopologyRefreshSignal();
+            if (indicateTopologyRefreshSignal()) {
+                emitAdaptiveRefreshScheduledEvent();
+            }
         }
     }
 
+    private void emitAdaptiveRefreshScheduledEvent() {
+
+        AdaptiveRefreshTriggeredEvent event = new AdaptiveRefreshTriggeredEvent(redisClusterClient::getPartitions,
+                this::scheduleRefresh);
+
+        clientResources.eventBus().publish(event);
+    }
+
     private ClusterTopologyRefreshOptions getClusterTopologyRefreshOptions() {
 
         ClusterClientOptions clusterClientOptions = redisClusterClient.getClusterClientOptions();
@@ -198,13 +223,31 @@ public long remaining() {
     private static class ClusterTopologyRefreshTask implements Runnable {
 
         private final RedisClusterClient redisClusterClient;
+        private final AtomicBoolean unique = new AtomicBoolean();
 
-        public ClusterTopologyRefreshTask(RedisClusterClient redisClusterClient) {
+        ClusterTopologyRefreshTask(RedisClusterClient redisClusterClient) {
             this.redisClusterClient = redisClusterClient;
         }
 
         public void run() {
 
+            if (unique.compareAndSet(false, true)) {
+                try {
+                    doRun();
+                } finally {
+                    unique.set(false);
+                }
+
+                return;
+            }
+
+            if (logger.isDebugEnabled()) {
+                logger.debug("ClusterTopologyRefreshTask already in progress");
+            }
+        }
+
+        void doRun() {
+
             if (logger.isDebugEnabled()) {
                 logger.debug("ClusterTopologyRefreshTask requesting partitions from {}",
                         redisClusterClient.getTopologyRefreshSource());
diff --git a/src/main/java/io/lettuce/core/event/cluster/AdaptiveRefreshTriggeredEvent.java b/src/main/java/io/lettuce/core/event/cluster/AdaptiveRefreshTriggeredEvent.java
new file mode 100644
index 0000000000..905a8f4c13
--- /dev/null
+++ b/src/main/java/io/lettuce/core/event/cluster/AdaptiveRefreshTriggeredEvent.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.event.cluster;
+
+import java.util.function.Supplier;
+
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.event.Event;
+
+/**
+ * Event when a topology refresh is about to start by an adaptive refresh trigger.
+ *
+ * @author Mark Paluch
+ * @since 5.2
+ */
+public class AdaptiveRefreshTriggeredEvent implements Event {
+
+    private Supplier<Partitions> partitionsSupplier;
+    private Runnable topologyRefreshScheduler;
+
+    public AdaptiveRefreshTriggeredEvent(Supplier<Partitions> partitionsSupplier, Runnable topologyRefreshScheduler) {
+        this.partitionsSupplier = partitionsSupplier;
+        this.topologyRefreshScheduler = topologyRefreshScheduler;
+    }
+
+    /**
+     * Schedules a new topology refresh. Refresh happens asynchronously.
+     */
+    public void scheduleRefresh() {
+        topologyRefreshScheduler.run();
+    }
+
+    /**
+     * Retrieve the currently known partitions.
+     *
+     * @return the currently known topology view. The view is mutable and changes over time.
+     */
+    public Partitions getPartitions() {
+        return partitionsSupplier.get();
+    }
+}
diff --git a/src/main/java/io/lettuce/core/event/cluster/package-info.java b/src/main/java/io/lettuce/core/event/cluster/package-info.java
new file mode 100644
index 0000000000..6c9aeda268
--- /dev/null
+++ b/src/main/java/io/lettuce/core/event/cluster/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Redis Cluster events.
+ */
+package io.lettuce.core.event.cluster;
+
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
index b378869e35..e9ca652a89 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.cluster;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -27,11 +28,15 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
 
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.event.EventBus;
+import io.lettuce.core.event.cluster.AdaptiveRefreshTriggeredEvent;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.test.Delay;
 import io.netty.util.concurrent.EventExecutorGroup;
@@ -60,9 +65,13 @@ class ClusterTopologyRefreshSchedulerUnitTests {
     @Mock
     private EventExecutorGroup eventExecutors;
 
+    @Mock
+    private EventBus eventBus;
+
     @BeforeEach
     void before() {
 
+        when(clientResources.eventBus()).thenReturn(eventBus);
         when(clientResources.eventExecutorGroup()).thenReturn(eventExecutors);
 
         sut = new ClusterTopologyRefreshScheduler(clusterClient, clientResources);
@@ -235,4 +244,55 @@ void shouldRateLimitAdaptiveRequests() {
 
         verify(eventExecutors, times(2)).submit(any(Runnable.class));
     }
+
+    @Test
+    void shouldEmitAdaptiveRefreshEventOnSchedule() {
+
+        ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder().topologyRefreshOptions(immediateRefresh)
+                .build();
+
+        when(clusterClient.getClusterClientOptions()).thenReturn(clusterClientOptions);
+
+        sut.onMovedRedirection();
+        verify(eventExecutors).submit(any(Runnable.class));
+        verify(eventBus).publish(any(AdaptiveRefreshTriggeredEvent.class));
+    }
+
+    @Test
+    void shouldScheduleRefreshViaAdaptiveRefreshTriggeredEvent() {
+
+        ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder().topologyRefreshOptions(immediateRefresh)
+                .build();
+        when(clusterClient.getClusterClientOptions()).thenReturn(clusterClientOptions);
+
+        sut.onMovedRedirection();
+
+        ArgumentCaptor<AdaptiveRefreshTriggeredEvent> captor = ArgumentCaptor.forClass(AdaptiveRefreshTriggeredEvent.class);
+        verify(eventBus).publish(captor.capture());
+
+        AdaptiveRefreshTriggeredEvent capture = captor.getValue();
+
+        capture.scheduleRefresh();
+        verify(eventExecutors, times(2)).submit(any(Runnable.class));
+    }
+
+    @Test
+    void shouldRetrievePartitionsViaAdaptiveRefreshTriggeredEvent() {
+
+        ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder().topologyRefreshOptions(immediateRefresh)
+                .build();
+        when(clusterClient.getClusterClientOptions()).thenReturn(clusterClientOptions);
+
+        sut.onMovedRedirection();
+
+        ArgumentCaptor<AdaptiveRefreshTriggeredEvent> captor = ArgumentCaptor.forClass(AdaptiveRefreshTriggeredEvent.class);
+        verify(eventBus).publish(captor.capture());
+
+        AdaptiveRefreshTriggeredEvent capture = captor.getValue();
+
+        Partitions partitions = new Partitions();
+        when(clusterClient.getPartitions()).thenReturn(partitions);
+
+        assertThat(capture.getPartitions()).isSameAs(partitions);
+    }
 }

From 3c7050ebd2b90cd74e3de804a7c4a274925dfe6b Mon Sep 17 00:00:00 2001
From: Zhang Jessey <zhangjessey@gmail.com>
Date: Wed, 26 Sep 2018 13:59:39 +0800
Subject: [PATCH 581/808] Add support for MEMORY USAGE command #853

Original pull request: #867.
---
 .../lettuce/core/AbstractRedisAsyncCommands.java  |  5 +++++
 .../core/AbstractRedisReactiveCommands.java       |  5 +++++
 .../java/io/lettuce/core/RedisCommandBuilder.java |  4 ++++
 .../core/api/async/RedisServerAsyncCommands.java  |  6 ++++++
 .../api/reactive/RedisServerReactiveCommands.java |  6 ++++++
 .../core/api/sync/RedisServerCommands.java        |  6 ++++++
 .../async/NodeSelectionServerAsyncCommands.java   |  6 ++++++
 .../api/sync/NodeSelectionServerCommands.java     |  6 ++++++
 .../io/lettuce/core/protocol/CommandKeyword.java  |  2 +-
 .../io/lettuce/core/protocol/CommandType.java     |  2 +-
 .../io/lettuce/core/api/RedisServerCommands.java  |  6 ++++++
 .../commands/ServerCommandIntegrationTests.java   | 15 +++++++++++++++
 12 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index e4df5546bc..4629bc4ce7 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -2153,4 +2153,9 @@ public RedisFuture<Long> zunionstore(K destination, K... keys) {
     public RedisFuture<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
         return dispatch(commandBuilder.zunionstore(destination, storeArgs, keys));
     }
+
+    @Override
+    public RedisFuture<Long> memoryUsage(K key){
+        return dispatch(commandBuilder.memoryUsage(key));
+    }
 }
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 0b3ecf261f..6db414cb43 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -2218,4 +2218,9 @@ public Mono<Long> zunionstore(K destination, K... keys) {
     public Mono<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
         return createMono(() -> commandBuilder.zunionstore(destination, storeArgs, keys));
     }
+
+    @Override
+    public Mono<Long> memoryUsage(K key){
+        return createMono(() -> commandBuilder.memoryUsage(key));
+    }
 }
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 0a898c1c1b..ac81ee05dc 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -3090,6 +3090,10 @@ Command<K, V, Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys)
         return createCommand(ZUNIONSTORE, new IntegerOutput<>(codec), args);
     }
 
+    Command<K, V, Long> memoryUsage(K key) {
+        return createCommand(MEMORY, new IntegerOutput<>(codec), new CommandArgs<>(codec).add(USAGE).add(key.toString()));
+    }
+
     private boolean allElementsInstanceOf(Object[] objects, Class<?> expectedAssignableType) {
 
         for (Object object : objects) {
diff --git a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
index 6912cde1bb..5efddda77f 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
@@ -353,4 +353,10 @@ public interface RedisServerAsyncCommands<K, V> {
      *         unix time in seconds. microseconds.
      */
     RedisFuture<List<V>> time();
+
+    /**
+     * get info about memory usage
+     * @return memory usage
+     */
+    RedisFuture<Long> memoryUsage(K key);
 }
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
index 7b5c1ed928..b961fc17c5 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
@@ -353,4 +353,10 @@ public interface RedisServerReactiveCommands<K, V> {
      *         unix time in seconds. microseconds.
      */
     Flux<V> time();
+
+    /**
+     * get info about memory usage
+     * @return memory usage
+     */
+    Mono<Long> memoryUsage(K key);
 }
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
index 1af40db104..4582612016 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
@@ -352,4 +352,10 @@ public interface RedisServerCommands<K, V> {
      *         unix time in seconds. microseconds.
      */
     List<V> time();
+
+    /**
+     * get info about memory usage
+     * @return memory usage
+     */
+    Long memoryUsage(K key);
 }
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
index 6af9894974..3ce9f3187a 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
@@ -331,4 +331,10 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
      *         unix time in seconds. microseconds.
      */
     AsyncExecutions<List<V>> time();
+
+    /**
+     * get info about memory usage
+     * @return memory usage
+     */
+    AsyncExecutions<Long> memoryUsage(K key);
 }
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
index 393514cce4..b6010bef20 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
@@ -331,4 +331,10 @@ public interface NodeSelectionServerCommands<K, V> {
      *         unix time in seconds. microseconds.
      */
     Executions<List<V>> time();
+
+    /**
+     * get info about memory usage
+     * @return memory usage
+     */
+    Executions<Long> memoryUsage(K key);
 }
diff --git a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
index 8056d8e9a9..1db6681f8d 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
@@ -39,7 +39,7 @@ public enum CommandKeyword implements ProtocolKeyword {
 
     MIGRATING, IMPORTING, SKIPME, SLAVES, STORE, SUM, SEGFAULT, UNBLOCK, WEIGHTS,
 
-    WITHSCORES, XOR;
+    WITHSCORES, XOR, USAGE;
 
     public final byte[] bytes;
 
diff --git a/src/main/java/io/lettuce/core/protocol/CommandType.java b/src/main/java/io/lettuce/core/protocol/CommandType.java
index 74c6dd9014..36567d25e5 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandType.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandType.java
@@ -28,7 +28,7 @@ public enum CommandType implements ProtocolKeyword {
 
     // Server
 
-    BGREWRITEAOF, BGSAVE, CLIENT, COMMAND, CONFIG, DBSIZE, DEBUG, FLUSHALL, FLUSHDB, INFO, MYID, LASTSAVE, ROLE, MONITOR, SAVE, SHUTDOWN, SLAVEOF, SLOWLOG, SYNC,
+    BGREWRITEAOF, BGSAVE, CLIENT, COMMAND, CONFIG, DBSIZE, DEBUG, FLUSHALL, FLUSHDB, INFO, MYID, LASTSAVE, ROLE, MONITOR, SAVE, SHUTDOWN, SLAVEOF, SLOWLOG, SYNC, MEMORY,
 
     // Keys
 
diff --git a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
index 79a49e228e..c929098e06 100644
--- a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
@@ -351,4 +351,10 @@ public interface RedisServerCommands<K, V> {
      *         unix time in seconds. microseconds.
      */
     List<V> time();
+
+    /**
+     * get info about memory usage
+     * @return memory usage
+     */
+    Long memoryUsage(K key);
 }
diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
index 659db8b61a..81191a0968 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
@@ -409,6 +409,21 @@ void swapdb() {
         assertThat(redis.get(key)).isEqualTo("value1");
     }
 
+    @Test
+    void memoryUsage() {
+
+        assumeTrue(RedisConditions.of(redis).hasVersionGreaterOrEqualsTo("4.0.0"));
+
+        redis.select(0);
+        redis.set("", "");
+        redis.set("foo", "bar");
+        Long dispatch1 = redis.memoryUsage("");
+        Long dispatch2 = redis.memoryUsage("foo");
+
+        assertThat(dispatch1).isNotNull().isPositive();
+        assertThat(dispatch2 - dispatch1).isNotNull().isPositive();
+    }
+
     private boolean noSaveInProgress() {
 
         String info = redis.info();

From 657ed8a966e0ecb305d8fd59f8b776bb3b9f9b8b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 2 Jan 2019 15:43:18 +0100
Subject: [PATCH 582/808] Polishing #853

Add author and since tags. Reorder method to align with alphabetical ordering. Simplify test.

Original pull request: #867.
---
 .../core/AbstractRedisAsyncCommands.java      | 10 +++----
 .../core/AbstractRedisReactiveCommands.java   | 10 +++----
 .../io/lettuce/core/RedisCommandBuilder.java  |  9 ++++---
 .../api/async/RedisServerAsyncCommands.java   | 16 +++++++-----
 .../reactive/RedisServerReactiveCommands.java | 16 +++++++-----
 .../core/api/sync/RedisServerCommands.java    | 16 +++++++-----
 .../NodeSelectionServerAsyncCommands.java     | 16 +++++++-----
 .../api/sync/NodeSelectionServerCommands.java | 16 +++++++-----
 .../lettuce/core/protocol/CommandKeyword.java |  1 +
 .../io/lettuce/core/protocol/CommandType.java |  1 +
 .../lettuce/core/api/RedisServerCommands.java | 16 +++++++-----
 .../ServerCommandIntegrationTests.java        | 26 ++++++++-----------
 12 files changed, 88 insertions(+), 65 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 4629bc4ce7..c56f5ab7ca 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -891,6 +891,11 @@ public RedisFuture<String> ltrim(K key, long start, long stop) {
         return dispatch(commandBuilder.ltrim(key, start, stop));
     }
 
+    @Override
+    public RedisFuture<Long> memoryUsage(K key) {
+        return dispatch(commandBuilder.memoryUsage(key));
+    }
+
     @Override
     public RedisFuture<List<KeyValue<K, V>>> mget(K... keys) {
         return dispatch(commandBuilder.mgetKeyValue(keys));
@@ -2153,9 +2158,4 @@ public RedisFuture<Long> zunionstore(K destination, K... keys) {
     public RedisFuture<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
         return dispatch(commandBuilder.zunionstore(destination, storeArgs, keys));
     }
-
-    @Override
-    public RedisFuture<Long> memoryUsage(K key){
-        return dispatch(commandBuilder.memoryUsage(key));
-    }
 }
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 6db414cb43..42bf55dcd6 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -955,6 +955,11 @@ public Mono<String> ltrim(K key, long start, long stop) {
         return createMono(() -> commandBuilder.ltrim(key, start, stop));
     }
 
+    @Override
+    public Mono<Long> memoryUsage(K key) {
+        return createMono(() -> commandBuilder.memoryUsage(key));
+    }
+
     @Override
     public Flux<KeyValue<K, V>> mget(K... keys) {
         return createDissolvingFlux(() -> commandBuilder.mgetKeyValue(keys));
@@ -2218,9 +2223,4 @@ public Mono<Long> zunionstore(K destination, K... keys) {
     public Mono<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
         return createMono(() -> commandBuilder.zunionstore(destination, storeArgs, keys));
     }
-
-    @Override
-    public Mono<Long> memoryUsage(K key){
-        return createMono(() -> commandBuilder.memoryUsage(key));
-    }
 }
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index ac81ee05dc..0c044bf0d0 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -34,6 +34,7 @@
  * @param <K>
  * @param <V>
  * @author Mark Paluch
+ * @author Zhang Jessey
  */
 @SuppressWarnings({ "unchecked", "varargs" })
 class RedisCommandBuilder<K, V> extends BaseRedisCommandBuilder<K, V> {
@@ -1189,6 +1190,10 @@ Command<K, V, String> ltrim(K key, long start, long stop) {
         return createCommand(LTRIM, new StatusOutput<>(codec), args);
     }
 
+    Command<K, V, Long> memoryUsage(K key) {
+        return createCommand(MEMORY, new IntegerOutput<>(codec), new CommandArgs<>(codec).add(USAGE).add(key.toString()));
+    }
+
     Command<K, V, List<V>> mget(K... keys) {
         notEmpty(keys);
 
@@ -3090,10 +3095,6 @@ Command<K, V, Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys)
         return createCommand(ZUNIONSTORE, new IntegerOutput<>(codec), args);
     }
 
-    Command<K, V, Long> memoryUsage(K key) {
-        return createCommand(MEMORY, new IntegerOutput<>(codec), new CommandArgs<>(codec).add(USAGE).add(key.toString()));
-    }
-
     private boolean allElementsInstanceOf(Object[] objects, Class<?> expectedAssignableType) {
 
         for (Object object : objects) {
diff --git a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
index 5efddda77f..95c667e672 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
@@ -177,6 +177,7 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Crash and recover
+     *
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
@@ -221,6 +222,7 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Restart the server gracefully.
+     *
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
@@ -284,6 +286,14 @@ public interface RedisServerAsyncCommands<K, V> {
      */
     RedisFuture<Date> lastsave();
 
+    /**
+     * Reports the number of bytes that a key and its value require to be stored in RAM.
+     *
+     * @return memory usage in bytes.
+     * @since 5.2
+     */
+    RedisFuture<Long> memoryUsage(K key);
+
     /**
      * Synchronously save the dataset to disk.
      *
@@ -353,10 +363,4 @@ public interface RedisServerAsyncCommands<K, V> {
      *         unix time in seconds. microseconds.
      */
     RedisFuture<List<V>> time();
-
-    /**
-     * get info about memory usage
-     * @return memory usage
-     */
-    RedisFuture<Long> memoryUsage(K key);
 }
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
index b961fc17c5..c95bc38813 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
@@ -177,6 +177,7 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Crash and recover
+     *
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
@@ -221,6 +222,7 @@ public interface RedisServerReactiveCommands<K, V> {
 
     /**
      * Restart the server gracefully.
+     *
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
@@ -284,6 +286,14 @@ public interface RedisServerReactiveCommands<K, V> {
      */
     Mono<Date> lastsave();
 
+    /**
+     * Reports the number of bytes that a key and its value require to be stored in RAM.
+     *
+     * @return memory usage in bytes.
+     * @since 5.2
+     */
+    Mono<Long> memoryUsage(K key);
+
     /**
      * Synchronously save the dataset to disk.
      *
@@ -353,10 +363,4 @@ public interface RedisServerReactiveCommands<K, V> {
      *         unix time in seconds. microseconds.
      */
     Flux<V> time();
-
-    /**
-     * get info about memory usage
-     * @return memory usage
-     */
-    Mono<Long> memoryUsage(K key);
 }
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
index 4582612016..528f022850 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
@@ -176,6 +176,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Crash and recover
+     *
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
@@ -220,6 +221,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Restart the server gracefully.
+     *
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
@@ -283,6 +285,14 @@ public interface RedisServerCommands<K, V> {
      */
     Date lastsave();
 
+    /**
+     * Reports the number of bytes that a key and its value require to be stored in RAM.
+     *
+     * @return memory usage in bytes.
+     * @since 5.2
+     */
+    Long memoryUsage(K key);
+
     /**
      * Synchronously save the dataset to disk.
      *
@@ -352,10 +362,4 @@ public interface RedisServerCommands<K, V> {
      *         unix time in seconds. microseconds.
      */
     List<V> time();
-
-    /**
-     * get info about memory usage
-     * @return memory usage
-     */
-    Long memoryUsage(K key);
 }
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
index 3ce9f3187a..61365639f9 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
@@ -176,6 +176,7 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Crash and recover
+     *
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
@@ -206,6 +207,7 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
 
     /**
      * Restart the server gracefully.
+     *
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
@@ -269,6 +271,14 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
      */
     AsyncExecutions<Date> lastsave();
 
+    /**
+     * Reports the number of bytes that a key and its value require to be stored in RAM.
+     *
+     * @return memory usage in bytes.
+     * @since 5.2
+     */
+    AsyncExecutions<Long> memoryUsage(K key);
+
     /**
      * Synchronously save the dataset to disk.
      *
@@ -331,10 +341,4 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
      *         unix time in seconds. microseconds.
      */
     AsyncExecutions<List<V>> time();
-
-    /**
-     * get info about memory usage
-     * @return memory usage
-     */
-    AsyncExecutions<Long> memoryUsage(K key);
 }
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
index b6010bef20..34c03ab1bc 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
@@ -176,6 +176,7 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Crash and recover
+     *
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
@@ -206,6 +207,7 @@ public interface NodeSelectionServerCommands<K, V> {
 
     /**
      * Restart the server gracefully.
+     *
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
@@ -269,6 +271,14 @@ public interface NodeSelectionServerCommands<K, V> {
      */
     Executions<Date> lastsave();
 
+    /**
+     * Reports the number of bytes that a key and its value require to be stored in RAM.
+     *
+     * @return memory usage in bytes.
+     * @since 5.2
+     */
+    Executions<Long> memoryUsage(K key);
+
     /**
      * Synchronously save the dataset to disk.
      *
@@ -331,10 +341,4 @@ public interface NodeSelectionServerCommands<K, V> {
      *         unix time in seconds. microseconds.
      */
     Executions<List<V>> time();
-
-    /**
-     * get info about memory usage
-     * @return memory usage
-     */
-    Executions<Long> memoryUsage(K key);
 }
diff --git a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
index 1db6681f8d..9c40598122 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
@@ -20,6 +20,7 @@
  *
  * @author Will Glozer
  * @author Mark Paluch
+ * @author Zhang Jessey
  */
 public enum CommandKeyword implements ProtocolKeyword {
 
diff --git a/src/main/java/io/lettuce/core/protocol/CommandType.java b/src/main/java/io/lettuce/core/protocol/CommandType.java
index 36567d25e5..5be32d7ca7 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandType.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandType.java
@@ -20,6 +20,7 @@
  *
  * @author Will Glozer
  * @author Mark Paluch
+ * @author Zhang Jessey
  */
 public enum CommandType implements ProtocolKeyword {
     // Connection
diff --git a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
index c929098e06..ef851da824 100644
--- a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
@@ -175,6 +175,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Crash and recover
+     * 
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
@@ -219,6 +220,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Restart the server gracefully.
+     * 
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
@@ -282,6 +284,14 @@ public interface RedisServerCommands<K, V> {
      */
     Date lastsave();
 
+    /**
+     * Reports the number of bytes that a key and its value require to be stored in RAM.
+     * 
+     * @return memory usage in bytes.
+     * @since 5.2
+     */
+    Long memoryUsage(K key);
+
     /**
      * Synchronously save the dataset to disk.
      *
@@ -351,10 +361,4 @@ public interface RedisServerCommands<K, V> {
      *         unix time in seconds. microseconds.
      */
     List<V> time();
-
-    /**
-     * get info about memory usage
-     * @return memory usage
-     */
-    Long memoryUsage(K key);
 }
diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
index 81191a0968..5c4b93e850 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
@@ -53,6 +53,7 @@
 /**
  * @author Will Glozer
  * @author Mark Paluch
+ * @author Zhang Jessey
  */
 @ExtendWith(LettuceExtension.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -327,6 +328,16 @@ void lastsave() {
         assertThat(start.compareTo(redis.lastsave()) <= 0).isTrue();
     }
 
+    @Test
+    @EnabledOnCommand("MEMORY")
+    void memoryUsage() {
+
+        redis.set("foo", "bar");
+        Long usedMemory = redis.memoryUsage("foo");
+
+        assertThat(usedMemory).isGreaterThanOrEqualTo(3);
+    }
+
     @Test
     void save() {
 
@@ -409,21 +420,6 @@ void swapdb() {
         assertThat(redis.get(key)).isEqualTo("value1");
     }
 
-    @Test
-    void memoryUsage() {
-
-        assumeTrue(RedisConditions.of(redis).hasVersionGreaterOrEqualsTo("4.0.0"));
-
-        redis.select(0);
-        redis.set("", "");
-        redis.set("foo", "bar");
-        Long dispatch1 = redis.memoryUsage("");
-        Long dispatch2 = redis.memoryUsage("foo");
-
-        assertThat(dispatch1).isNotNull().isPositive();
-        assertThat(dispatch2 - dispatch1).isNotNull().isPositive();
-    }
-
     private boolean noSaveInProgress() {
 
         String info = redis.info();

From bdf304bd308f300b7535b33b93db8f8472dd8f33 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 2 Jan 2019 16:50:23 +0100
Subject: [PATCH 583/808] Add support for order-insensitive ReadFrom #834

ReadFrom can now express whether it is order-sensitive or non-sensitive. This allows the using code to apply optimizations such as caching for order-sensitive implementation or randomization for non-sensitive implementations.

ReadFrom.ANY is an implementation that allows reads from any node without considering the actual node ordering.
---
 pom.xml                                       |   2 +-
 src/main/asciidoc/new-features.adoc           |   4 +
 .../core/OrderingReadFromAccessor.java        |  44 +++++++
 src/main/java/io/lettuce/core/ReadFrom.java   |  22 ++++
 .../java/io/lettuce/core/ReadFromImpl.java    | 109 ++++++++++++------
 .../PooledClusterConnectionProvider.java      |  67 +++++++++--
 .../MasterSlaveConnectionProvider.java        |  25 ++--
 ...ledClusterConnectionProviderUnitTests.java |  66 ++++++++++-
 8 files changed, 276 insertions(+), 63 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/OrderingReadFromAccessor.java

diff --git a/pom.xml b/pom.xml
index 973e29ddec..686c07e595 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.2.0.BUILD-SNAPSHOT</version>
+    <version>5.2.0.gh-834-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
diff --git a/src/main/asciidoc/new-features.adoc b/src/main/asciidoc/new-features.adoc
index 81599743a1..8a920c3bb5 100644
--- a/src/main/asciidoc/new-features.adoc
+++ b/src/main/asciidoc/new-features.adoc
@@ -1,6 +1,10 @@
 [[new-features]]
 = New & Noteworthy
 
+[[new-features.5-2-0]]
+== What's new in Lettuce 5.2
+* Allow randomization of read candidates using Redis Cluster
+
 [[new-features.5-1-0]]
 == What's new in Lettuce 5.1
 * Add support for `ZPOPMIN`, `ZPOPMAX`, `BZPOPMIN`, `BZPOPMAX` commands.
diff --git a/src/main/java/io/lettuce/core/OrderingReadFromAccessor.java b/src/main/java/io/lettuce/core/OrderingReadFromAccessor.java
new file mode 100644
index 0000000000..de05810cfb
--- /dev/null
+++ b/src/main/java/io/lettuce/core/OrderingReadFromAccessor.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+/**
+ * Accessor for {@link ReadFrom} ordering. Internal utility class.
+ * 
+ * @author Mark Paluch
+ * @since 5.2
+ */
+public abstract class OrderingReadFromAccessor {
+
+    /**
+     * Utility constructor.
+     */
+    private OrderingReadFromAccessor() {
+    }
+
+    /**
+     * Returns whether this {@link ReadFrom} requires ordering of the resulting
+     * {@link io.lettuce.core.models.role.RedisNodeDescription nodes}.
+     * 
+     * @return {@literal true} if code using {@link ReadFrom} should retain ordering or {@literal false} to allow reordering of
+     *         {@link io.lettuce.core.models.role.RedisNodeDescription nodes}.
+     * @since 5.2
+     * @see ReadFrom#isOrderSensitive()
+     */
+    public static boolean isOrderSensitive(ReadFrom readFrom) {
+        return readFrom.isOrderSensitive();
+    }
+}
diff --git a/src/main/java/io/lettuce/core/ReadFrom.java b/src/main/java/io/lettuce/core/ReadFrom.java
index bb18ccb851..020f508611 100644
--- a/src/main/java/io/lettuce/core/ReadFrom.java
+++ b/src/main/java/io/lettuce/core/ReadFrom.java
@@ -55,6 +55,13 @@ public abstract class ReadFrom {
      */
     public static final ReadFrom NEAREST = new ReadFromImpl.ReadFromNearest();
 
+    /**
+     * Setting to read from any node.
+     * 
+     * @since 5.2
+     */
+    public static final ReadFrom ANY = new ReadFromImpl.ReadFromAnyNode();
+
     /**
      * Chooses the nodes from the matching Redis nodes that match this read selector.
      *
@@ -63,6 +70,17 @@ public abstract class ReadFrom {
      */
     public abstract List<RedisNodeDescription> select(Nodes nodes);
 
+    /**
+     * Returns whether this {@link ReadFrom} requires ordering of the resulting {@link RedisNodeDescription nodes}.
+     * 
+     * @return {@literal true} if code using {@link ReadFrom} should retain ordering or {@literal false} to allow reordering of
+     *         {@link RedisNodeDescription nodes}.
+     * @since 5.2
+     */
+    boolean isOrderSensitive() {
+        return false;
+    }
+
     /**
      * Retrieve the {@link ReadFrom} preset by name.
      *
@@ -96,6 +114,10 @@ public static ReadFrom valueOf(String name) {
             return NEAREST;
         }
 
+        if (name.equalsIgnoreCase("any")) {
+            return ANY;
+        }
+
         throw new IllegalArgumentException("ReadFrom " + name + " not supported");
     }
 
diff --git a/src/main/java/io/lettuce/core/ReadFromImpl.java b/src/main/java/io/lettuce/core/ReadFromImpl.java
index a796659c25..98a10537c9 100644
--- a/src/main/java/io/lettuce/core/ReadFromImpl.java
+++ b/src/main/java/io/lettuce/core/ReadFromImpl.java
@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Predicate;
 
 import io.lettuce.core.internal.LettuceLists;
 import io.lettuce.core.models.role.RedisInstance;
@@ -31,6 +32,10 @@
  */
 class ReadFromImpl {
 
+    private static final Predicate<RedisNodeDescription> IS_MASTER = node -> node.getRole() == RedisInstance.Role.MASTER;
+
+    private static final Predicate<RedisNodeDescription> IS_SLAVE = node -> node.getRole() == RedisInstance.Role.SLAVE;
+
     /**
      * Read from master only.
      */
@@ -52,83 +57,111 @@ public List<RedisNodeDescription> select(Nodes nodes) {
     /**
      * Read from master and slaves. Prefer master reads and fall back to slaves if the master is not available.
      */
-    static final class ReadFromMasterPreferred extends ReadFrom {
+    static final class ReadFromMasterPreferred extends OrderedPredicateReadFromAdapter {
 
-        @Override
-        public List<RedisNodeDescription> select(Nodes nodes) {
+        ReadFromMasterPreferred() {
+            super(IS_MASTER, IS_SLAVE);
+        }
+    }
 
-            List<RedisNodeDescription> result = new ArrayList<>(nodes.getNodes().size());
+    /**
+     * Read from slave only.
+     */
+    static final class ReadFromSlave extends OrderedPredicateReadFromAdapter {
 
-            for (RedisNodeDescription node : nodes) {
-                if (node.getRole() == RedisInstance.Role.MASTER) {
-                    result.add(node);
-                }
-            }
+        ReadFromSlave() {
+            super(IS_SLAVE);
+        }
+    }
 
-            for (RedisNodeDescription node : nodes) {
-                if (node.getRole() == RedisInstance.Role.SLAVE) {
-                    result.add(node);
-                }
-            }
+    /**
+     * Read from master and slaves. Prefer slave reads and fall back to master if the no slave is not available.
+     */
+    static final class ReadFromSlavePreferred extends OrderedPredicateReadFromAdapter {
 
-            return result;
+        ReadFromSlavePreferred() {
+            super(IS_SLAVE, IS_MASTER);
         }
     }
 
     /**
-     * Read from slave only.
+     * Read from nearest node.
      */
-    static final class ReadFromSlave extends ReadFrom {
+    static final class ReadFromNearest extends ReadFrom {
 
         @Override
         public List<RedisNodeDescription> select(Nodes nodes) {
+            return nodes.getNodes();
+        }
 
-            List<RedisNodeDescription> result = new ArrayList<>(nodes.getNodes().size());
+        @Override
+        boolean isOrderSensitive() {
+            return true;
+        }
+    }
 
-            for (RedisNodeDescription node : nodes) {
-                if (node.getRole() == RedisInstance.Role.SLAVE) {
-                    result.add(node);
-                }
-            }
+    /**
+     * Read from any node.
+     */
+    static final class ReadFromAnyNode extends UnorderedPredicateReadFromAdapter {
 
-            return result;
+        public ReadFromAnyNode() {
+            super(x -> true);
         }
     }
 
     /**
-     * Read from master and slaves. Prefer slave reads and fall back to master if the no slave is not available.
+     * {@link Predicate}-based {@link ReadFrom} implementation.
+     * 
+     * @since 5.2
      */
-    static final class ReadFromSlavePreferred extends ReadFrom {
+    static class OrderedPredicateReadFromAdapter extends ReadFrom {
+
+        private final Predicate<RedisNodeDescription> predicates[];
+
+        @SafeVarargs
+        OrderedPredicateReadFromAdapter(Predicate<RedisNodeDescription>... predicates) {
+            this.predicates = predicates;
+        }
 
         @Override
         public List<RedisNodeDescription> select(Nodes nodes) {
 
             List<RedisNodeDescription> result = new ArrayList<>(nodes.getNodes().size());
 
-            for (RedisNodeDescription node : nodes) {
-                if (node.getRole() == RedisInstance.Role.SLAVE) {
-                    result.add(node);
-                }
-            }
+            for (Predicate<RedisNodeDescription> predicate : predicates) {
 
-            for (RedisNodeDescription node : nodes) {
-                if (node.getRole() == RedisInstance.Role.MASTER) {
-                    result.add(node);
+                for (RedisNodeDescription node : nodes) {
+                    if (predicate.test(node)) {
+                        result.add(node);
+                    }
                 }
             }
 
             return result;
         }
+
+        @Override
+        boolean isOrderSensitive() {
+            return true;
+        }
     }
 
     /**
-     * Read from nearest node.
+     * Unordered {@link Predicate}-based {@link ReadFrom} implementation.
+     * 
+     * @since 5.2
      */
-    static final class ReadFromNearest extends ReadFrom {
+    static class UnorderedPredicateReadFromAdapter extends OrderedPredicateReadFromAdapter {
+
+        @SafeVarargs
+        UnorderedPredicateReadFromAdapter(Predicate<RedisNodeDescription>... predicates) {
+            super(predicates);
+        }
 
         @Override
-        public List<RedisNodeDescription> select(Nodes nodes) {
-            return nodes.getNodes();
+        boolean isOrderSensitive() {
+            return false;
         }
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
index 7c2dd5daab..2c8a864e80 100644
--- a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
@@ -22,6 +22,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -196,17 +197,30 @@ public Iterator<RedisNodeDescription> iterator() {
 
         if (cached) {
 
-            return CompletableFuture.allOf(readerCandidates).thenCompose(v -> {
+            return CompletableFuture.allOf(readerCandidates).thenCompose(
+                    v -> {
 
-                for (CompletableFuture<StatefulRedisConnection<K, V>> candidate : selectedReaderCandidates) {
+                        boolean orderSensitive = isOrderSensitive(selectedReaderCandidates);
 
-                    if (candidate.join().isOpen()) {
-                        return candidate;
-                    }
-                }
+                        if (!orderSensitive) {
 
-                return selectedReaderCandidates[0];
-            });
+                            CompletableFuture<StatefulRedisConnection<K, V>> candidate = findRandomActiveConnection(
+                                    selectedReaderCandidates, Function.identity());
+
+                            if (candidate != null) {
+                                return candidate;
+                            }
+                        }
+
+                        for (CompletableFuture<StatefulRedisConnection<K, V>> candidate : selectedReaderCandidates) {
+
+                            if (candidate.join().isOpen()) {
+                                return candidate;
+                            }
+                        }
+
+                        return selectedReaderCandidates[0];
+                    });
         }
 
         CompletableFuture<StatefulRedisConnection<K, V>[]> filteredReaderCandidates = new CompletableFuture<>();
@@ -232,6 +246,8 @@ public Iterator<RedisNodeDescription> iterator() {
         return filteredReaderCandidates
                 .thenApply(statefulRedisConnections -> {
 
+                    boolean orderSensitive = isOrderSensitive(statefulRedisConnections);
+
                     CompletableFuture<StatefulRedisConnection<K, V>> toCache[] = new CompletableFuture[statefulRedisConnections.length];
 
                     for (int i = 0; i < toCache.length; i++) {
@@ -241,6 +257,16 @@ public Iterator<RedisNodeDescription> iterator() {
                         readers[slot] = toCache;
                     }
 
+                    if (!orderSensitive) {
+
+                        StatefulRedisConnection<K, V> candidate = findRandomActiveConnection(selectedReaderCandidates,
+                                CompletableFuture::join);
+
+                        if (candidate != null) {
+                            return candidate;
+                        }
+                    }
+
                     for (StatefulRedisConnection<K, V> candidate : statefulRedisConnections) {
                         if (candidate.isOpen()) {
                             return candidate;
@@ -251,6 +277,31 @@ public Iterator<RedisNodeDescription> iterator() {
                 });
     }
 
+    private boolean isOrderSensitive(Object[] connections) {
+        return OrderingReadFromAccessor.isOrderSensitive(readFrom) || connections.length == 1;
+    }
+
+    private static <T, E extends StatefulConnection<?, ?>> T findRandomActiveConnection(
+            CompletableFuture<E>[] selectedReaderCandidates, Function<CompletableFuture<E>, T> mappingFunction) {
+
+        // Perform up to two attempts for random nodes.
+        for (int i = 0; i < Math.min(2, selectedReaderCandidates.length); i++) {
+
+            int index = ThreadLocalRandom.current().nextInt(selectedReaderCandidates.length);
+            CompletableFuture<E> candidateFuture = selectedReaderCandidates[index];
+
+            if (candidateFuture.isDone() && !candidateFuture.isCompletedExceptionally()) {
+
+                E candidate = candidateFuture.join();
+
+                if (candidate.isOpen()) {
+                    return mappingFunction.apply(candidateFuture);
+                }
+            }
+        }
+        return null;
+    }
+
     private StatefulRedisConnection<K, V>[] getConnections(
             CompletableFuture<StatefulRedisConnection<K, V>>[] selectedReaderCandidates) {
 
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
index 409404f7ab..d7b42a9291 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
@@ -18,10 +18,7 @@
 import static io.lettuce.core.masterslave.MasterSlaveUtils.findNodeByHostAndPort;
 
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutionException;
+import java.util.concurrent.*;
 import java.util.function.Function;
 
 import reactor.core.publisher.Flux;
@@ -144,7 +141,14 @@ public Iterator<RedisNodeDescription> iterator() {
                     connections = connections.concatWith(Mono.fromFuture(getConnection(node)));
                 }
 
-                return connections.filter(StatefulConnection::isOpen).next().switchIfEmpty(connections.next()).toFuture();
+                if (OrderingReadFromAccessor.isOrderSensitive(readFrom) || selection.size() == 1) {
+                    return connections.filter(StatefulConnection::isOpen).next().switchIfEmpty(connections.next()).toFuture();
+                }
+
+                return connections.filter(StatefulConnection::isOpen).collectList().map(it -> {
+                    int index = ThreadLocalRandom.current().nextInt(it.size());
+                    return it.get(index);
+                }).switchIfEmpty(connections.next()).toFuture();
             } catch (RuntimeException e) {
                 throw Exceptions.bubble(e);
             }
@@ -318,11 +322,8 @@ class DefaultMasterSlaveNodeConnectionFactory implements
         @Override
         public ConnectionFuture<StatefulRedisConnection<K, V>> apply(ConnectionKey key) {
 
-            RedisURI.Builder builder = RedisURI.Builder
-                    .redis(key.host, key.port)
-                    .withSsl(initialRedisUri.isSsl())
-                    .withVerifyPeer(initialRedisUri.isVerifyPeer())
-                    .withStartTls(initialRedisUri.isStartTls());
+            RedisURI.Builder builder = RedisURI.Builder.redis(key.host, key.port).withSsl(initialRedisUri.isSsl())
+                    .withVerifyPeer(initialRedisUri.isVerifyPeer()).withStartTls(initialRedisUri.isStartTls());
 
             if (initialRedisUri.getPassword() != null && initialRedisUri.getPassword().length != 0) {
                 builder.withPassword(initialRedisUri.getPassword());
@@ -338,8 +339,8 @@ public ConnectionFuture<StatefulRedisConnection<K, V>> apply(ConnectionKey key)
 
             connectionFuture.thenAccept(connection -> {
                 synchronized (stateLock) {
-                connection.setAutoFlushCommands(autoFlushCommands);
-            }
+                    connection.setAutoFlushCommands(autoFlushCommands);
+                }
             });
 
             return connectionFuture;
diff --git a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
index afc778a469..2f914939d2 100644
--- a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
@@ -20,12 +20,10 @@
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 import java.net.SocketAddress;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -162,6 +160,66 @@ void shouldObtainConnectionReadFromSlave() {
         verify(connection).setAutoFlushCommands(true);
     }
 
+    @Test
+    void shouldRandomizeReadNode() {
+
+        StatefulRedisConnection<String, String> nodeConnectionMock2 = mock(StatefulRedisConnection.class);
+        when(nodeConnectionMock.isOpen()).thenReturn(true);
+        when(nodeConnectionMock2.isOpen()).thenReturn(true);
+
+        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
+                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+
+        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
+                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock2)));
+
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
+        async.complete();
+
+        when(asyncCommandsMock.readOnly()).thenReturn(async);
+        when(nodeConnectionMock2.async()).thenReturn(asyncCommandsMock);
+
+        sut.setReadFrom(ReadFrom.ANY);
+
+        List<StatefulRedisConnection<String, String>> readCandidates = new ArrayList<>();
+
+        for (int i = 0; i < 10; i++) {
+            readCandidates.add(sut.getConnection(Intent.READ, 1));
+        }
+
+        assertThat(readCandidates).contains(nodeConnectionMock, nodeConnectionMock2);
+    }
+
+    @Test
+    void shouldNotRandomizeReadNode() {
+
+        StatefulRedisConnection<String, String> nodeConnectionMock2 = mock(StatefulRedisConnection.class);
+        when(nodeConnectionMock.isOpen()).thenReturn(true);
+        when(nodeConnectionMock2.isOpen()).thenReturn(true);
+
+        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
+                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+
+        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
+                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock2)));
+
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
+        async.complete();
+
+        when(asyncCommandsMock.readOnly()).thenReturn(async);
+        when(nodeConnectionMock2.async()).thenReturn(asyncCommandsMock);
+
+        sut.setReadFrom(ReadFrom.SLAVE);
+
+        List<StatefulRedisConnection<String, String>> readCandidates = new ArrayList<>();
+
+        for (int i = 0; i < 10; i++) {
+            readCandidates.add(sut.getConnection(Intent.READ, 1));
+        }
+
+        assertThat(readCandidates).contains(nodeConnectionMock2).doesNotContain(nodeConnectionMock);
+    }
+
     @Test
     void shouldCloseConnectionOnConnectFailure() {
 

From 561a535b2941cf4188e50c0c26bb735d5cdb7b90 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 11 Jan 2019 11:48:25 +0100
Subject: [PATCH 584/808] Move ConcurrentHashMap.newKeySet() instead of Netty's
 ConcurrentSet #961

Netty has deprecated ConcurrentSet and so we're moving to the Java-provided alternative.
---
 src/main/java/io/lettuce/core/AbstractRedisClient.java      | 3 +--
 src/main/java/io/lettuce/core/CloseEvents.java              | 4 ++--
 src/main/java/io/lettuce/core/ConnectionEvents.java         | 4 ++--
 .../java/io/lettuce/core/dynamic/parameter/Parameter.java   | 3 +--
 .../core/masterslave/MasterSlaveConnectionProvider.java     | 3 +--
 src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java    | 6 +++---
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index b60f59c106..852813e839 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -44,7 +44,6 @@
 import io.netty.util.HashedWheelTimer;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.Future;
-import io.netty.util.internal.ConcurrentSet;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -71,7 +70,7 @@ public abstract class AbstractRedisClient {
 
     protected final Map<Class<? extends EventLoopGroup>, EventLoopGroup> eventLoopGroups = new ConcurrentHashMap<>(2);
     protected final ConnectionEvents connectionEvents = new ConnectionEvents();
-    protected final Set<Closeable> closeableResources = new ConcurrentSet<>();
+    protected final Set<Closeable> closeableResources = ConcurrentHashMap.newKeySet();
     protected final EventExecutorGroup genericWorkerPool;
     protected final HashedWheelTimer timer;
     protected final ChannelGroup channels;
diff --git a/src/main/java/io/lettuce/core/CloseEvents.java b/src/main/java/io/lettuce/core/CloseEvents.java
index 061061ff49..7e8546ddec 100644
--- a/src/main/java/io/lettuce/core/CloseEvents.java
+++ b/src/main/java/io/lettuce/core/CloseEvents.java
@@ -16,8 +16,8 @@
 package io.lettuce.core;
 
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
-import io.netty.util.internal.ConcurrentSet;
 
 /**
  * Close Events Facility. Can register/unregister CloseListener and fire a closed event to all registered listeners.
@@ -27,7 +27,7 @@
  */
 class CloseEvents {
 
-    private Set<CloseListener> listeners = new ConcurrentSet<CloseListener>();
+    private Set<CloseListener> listeners = ConcurrentHashMap.newKeySet();
 
     public void fireEventClosed(Object resource) {
         for (CloseListener listener : listeners) {
diff --git a/src/main/java/io/lettuce/core/ConnectionEvents.java b/src/main/java/io/lettuce/core/ConnectionEvents.java
index ce5acfbcc1..188ef4b61f 100644
--- a/src/main/java/io/lettuce/core/ConnectionEvents.java
+++ b/src/main/java/io/lettuce/core/ConnectionEvents.java
@@ -17,9 +17,9 @@
 
 import java.net.SocketAddress;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import io.lettuce.core.protocol.RedisCommand;
-import io.netty.util.internal.ConcurrentSet;
 
 /**
  * Close Events Facility. Can register/unregister CloseListener and fire a closed event to all registered listeners. This class
@@ -30,7 +30,7 @@
  */
 public class ConnectionEvents {
 
-    private final Set<RedisConnectionStateListener> listeners = new ConcurrentSet<>();
+    private final Set<RedisConnectionStateListener> listeners = ConcurrentHashMap.newKeySet();
 
     void fireEventRedisConnected(RedisChannelHandler<?, ?> connection, SocketAddress socketAddress) {
         for (RedisConnectionStateListener listener : listeners) {
diff --git a/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java b/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java
index 5a1fb26be6..25f431ea20 100644
--- a/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java
@@ -23,7 +23,6 @@
 import io.lettuce.core.dynamic.support.*;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceClassUtils;
-import io.netty.util.internal.ConcurrentSet;
 
 /**
  * Abstracts a method parameter and exposes access to type and parameter information.
@@ -42,7 +41,7 @@ public class Parameter {
     private final TypeInformation<?> typeInformation;
     private final MethodParameter methodParameter;
     private final Map<Class<? extends Annotation>, Annotation> annotationCache = new ConcurrentHashMap<>();
-    private final Set<Class<? extends Annotation>> absentCache = new ConcurrentSet<>();
+    private final Set<Class<? extends Annotation>> absentCache = ConcurrentHashMap.newKeySet();
     private final List<Annotation> annotations;
 
     public Parameter(Method method, int parameterIndex) {
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
index d7b42a9291..46a28e910a 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
@@ -31,7 +31,6 @@
 import io.lettuce.core.internal.AsyncConnectionProvider;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
-import io.netty.util.internal.ConcurrentSet;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -264,7 +263,7 @@ public void setAutoFlushCommands(boolean autoFlush) {
     @Deprecated
     protected Collection<StatefulRedisConnection<K, V>> allConnections() {
 
-        Set<StatefulRedisConnection<K, V>> set = new ConcurrentSet<>();
+        Set<StatefulRedisConnection<K, V>> set = ConcurrentHashMap.newKeySet();
         connectionProvider.forEach(set::add);
         return set;
     }
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
index b19849ccc1..a6eeda339a 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.pubsub;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import io.lettuce.core.ClientOptions;
@@ -25,7 +26,6 @@
 import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.resource.ClientResources;
 import io.netty.channel.Channel;
-import io.netty.util.internal.ConcurrentSet;
 
 /**
  * @author Mark Paluch
@@ -65,8 +65,8 @@ public PubSubEndpoint(ClientOptions clientOptions, ClientResources clientResourc
 
         super(clientOptions, clientResources);
 
-        this.channels = new ConcurrentSet<>();
-        this.patterns = new ConcurrentSet<>();
+        this.channels = ConcurrentHashMap.newKeySet();
+        this.patterns = ConcurrentHashMap.newKeySet();
     }
 
     /**

From cda462a445e9ae483aec2cd14f61e71f87eeca28 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 12 Jan 2019 16:43:46 +0100
Subject: [PATCH 585/808] Streamline communication sections in readme, issue
 templates and contribution guide #967

---
 .github/CONTRIBUTING.md                    | 29 ++++++++++++----------
 .github/ISSUE_TEMPLATE/Bug_report.md       | 12 ++++-----
 .github/ISSUE_TEMPLATE/Feature_request.md  |  2 +-
 .github/ISSUE_TEMPLATE/Support_question.md | 12 +++++----
 .github/PULL_REQUEST_TEMPLATE.md           |  1 +
 README.md                                  |  7 +++---
 RELEASE-NOTES.md                           |  7 +++---
 7 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 1d3a5ec364..9c50519f6d 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -4,12 +4,14 @@
  
  For the impatient, if you want to submit a quick pull request:
 
-* Make sure there is a ticket in GitHub issues.
-* Make sure you use the code formatters provided here and have them applied to your changes. Don’t submit any formatting related changes.
-* Make sure you submit test cases (unit or integration tests) that back your changes.
-* Try to reuse existing test sample code (domain classes). Try not to amend existing test cases but create new ones dedicated to the changes you’re making to the codebase. Try to test as locally as possible but potentially also add integration tests.
-
-When submitting code, please make every effort to follow existing conventions and style in order to keep the code as readable as possible.
+* Don't create a pull request upfront. Create a feature request ticket first so we can discuss your idea.
+* Upon agreeing the feature is a good fit for Lettuce, please:
+  * Make sure there is a ticket in GitHub issues.
+  * Make sure you use the code formatters provided here and have them applied to your changes. Don’t submit any formatting related changes.
+  * Make sure you submit test cases (unit or integration tests) that back your changes.
+  * Try to reuse existing test sample code (domain classes). Try not to amend existing test cases but create new ones dedicated to the changes you’re making to the codebase. Try to test as locally as possible but potentially also add integration tests.
+
+When submitting code, please make every effort to follow existing conventions and style in order to keep the code as readable as possible. Formatting changes create a lot of noise and reduce the likelyhood of merging the pull request.
 Formatting settings are provided for Eclipse in https://github.com/lettuce-io/lettuce-core/blob/master/formatting.xml
 
 ## Bugreports
@@ -18,10 +20,11 @@ If you report a bug, please ensure to specify the following:
 
 * Check GitHub issues whether someone else already filed a ticket. If not, then feel free to create another one.
 * Comments on closed tickets are typically a bad idea as there's little attention on closed tickets. Please create a new one.
-* Lettuce version (e.g. 3.2.Final)
-* Contextual information (what were you trying to do using Lettuce)
-* Simplest possible steps to reproduce
-   * JUnit tests to reproduce are great but not obligatory
+* Lettuce version (e.g. 3.2.Final).
+* Contextual information (what were you trying to do using Lettuce).
+* Simplest possible steps to reproduce:
+   * Ideally, a [Minimal, Complete, and Verifiable example](https://stackoverflow.com/help/mcve).
+   * JUnit tests to reproduce are great but not obligatory.
 
 ## Features
 
@@ -43,9 +46,9 @@ If you have a question, then check one of the following places first. Typically,
 
 **Communication**
 
-* Google Group: [lettuce-redis-client-users](https://groups.google.com/d/forum/lettuce-redis-client-users) or [lettuce-redis-client-users@googlegroups.com](mailto:lettuce-redis-client-users@googlegroups.com)
-* StackOverflow: [Questions about Lettuce](https://stackoverflow.com/questions/tagged/lettuce)
-* [![Join the chat at https://gitter.im/lettuce-io/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lettuce-io/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+* Google Group/Mailing List (General discussion, announcements and releases): [lettuce-redis-client-users](https://groups.google.com/d/forum/lettuce-redis-client-users) or [lettuce-redis-client-users@googlegroups.com](mailto:lettuce-redis-client-users@googlegroups.com)
+* Stack Overflow (Questions): [Questions about Lettuce](https://stackoverflow.com/questions/tagged/lettuce)
+* Gitter (General discussion): [![Join the chat at https://gitter.im/lettuce-io/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lettuce-io/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ## License
 
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index 01d3e66ce9..fc5dd9fa50 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -5,15 +5,15 @@ about: If something isn't working as expected 🤔.
 
 ## Bug Report
 
-<!-- First of all: Have you checked the docs https://github.com/lettuce-io/lettuce-core/wiki, GitHub issues, or StackOverflow whether someone else has already reported your issue? -->
+<!-- First of all: Have you checked the docs https://github.com/lettuce-io/lettuce-core/wiki, GitHub issues, or Stack Overflow whether someone else has already reported your issue? -->
 
 #### Current Behavior
 
-A clear and concise description of the behavior.
+<!-- A clear and concise description of the behavior.-->
 
 #### Input Code
 
-- Java/Kotlin/Scala/Groovy/… or Repo link if applicable:
+<!-- Java/Kotlin/Scala/Groovy/… or Repo link if applicable: -->
 
 ```java
 // your code here;
@@ -21,7 +21,7 @@ A clear and concise description of the behavior.
 
 #### Expected behavior/code
 
-A clear and concise description of what you expected to happen (or code).
+<!-- A clear and concise description of what you expected to happen (or code). -->
 
 #### Environment
 
@@ -30,8 +30,8 @@ A clear and concise description of what you expected to happen (or code).
 
 #### Possible Solution
 
-<!--- Only if you have suggestions on a fix for the bug -->
+<!-- Only if you have suggestions on a fix for the bug -->
 
 #### Additional context
 
-Add any other context about the problem here. Do not add code as screenshots.
+<!-- Add any other context about the problem here. Do not add code as screenshots. -->
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
index 35044fec5e..2a5972ba02 100644
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -5,7 +5,7 @@ about: I have a suggestion (and may want to implement it 🙂)!
 
 ## Feature Request
 
-<!-- First of all: Have you checked the docs https://github.com/lettuce-io/lettuce-core/wiki, GitHub issues, or StackOverflow whether someone else has already reported your issue? Maybe the feature already exists?-->
+<!-- First of all: Have you checked the docs https://github.com/lettuce-io/lettuce-core/wiki, GitHub issues, or Stack Overflow whether someone else has already reported your issue? Maybe the feature already exists?-->
 
 #### Is your feature request related to a problem? Please describe
 
diff --git a/.github/ISSUE_TEMPLATE/Support_question.md b/.github/ISSUE_TEMPLATE/Support_question.md
index cf43c06d07..5cb83ea004 100644
--- a/.github/ISSUE_TEMPLATE/Support_question.md
+++ b/.github/ISSUE_TEMPLATE/Support_question.md
@@ -1,18 +1,20 @@
 ---
-name: 🤗 Support Question
-about: If you have a question 💬, please check out Gitter or StackOverflow!
+name: Support Question
+about: If you have a question 💬, please check out Gitter, Stack Overflow, or post it to the mailing list! Do not post them here.
 ---
 
 We primarily use GitHub as an issue tracker; for usage and support questions, please check out these resources below. Thanks! 😁.
 
+Support questions will be closed immediately.
+
 ---
 
 * Reference documentation: https://lettuce.io/docs/
 * Wiki: https://github.com/lettuce-io/lettuce-core/wiki
 * Javadoc: https://lettuce.io/core/release/api/
-* Gitter Chat: https://gitter.im/lettuce-io/Lobby
-* Mailing list https://groups.google.com/d/forum/lettuce-redis-client-users or [lettuce-redis-client-users@googlegroups.com](mailto:lettuce-redis-client-users@googlegroups.com)
-* StackOverflow: https://stackoverflow.com/questions/tagged/lettuce
+* Gitter Chat (General discussion): https://gitter.im/lettuce-io/Lobby
+* Google Group/Mailing List (General discussion, announcements and releases): [https://groups.google.com/d/forum/lettuce-redis-client-users](https://groups.google.com/d/forum/lettuce-redis-client-users) or [lettuce-redis-client-users@googlegroups.com](mailto:lettuce-redis-client-users@googlegroups.com)
+* Stack Overflow (Questions): https://stackoverflow.com/questions/tagged/lettuce
 * Twitter: If it's just a quick question you can ping our Twitter: https://twitter.com/LettuceDriver
 * Also have a look at the readme for more information on how to get support:
   https://github.com/lettuce-io/lettuce-core/blob/master/README.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index bad9b46841..be6b012783 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,6 +4,7 @@ Thank you for proposing a pull request. This template will guide you through the
 Make sure that:
 
 - [ ] You have read the [contribution guidelines](https://github.com/lettuce-io/lettuce-core/blob/master/.github/CONTRIBUTING.md).
+- [ ] You have created a feature request first to discuss your contribution intent. Please reference the feature request ticket number in the pull request.
 - [ ] You use the code formatters provided [here](https://github.com/lettuce-io/lettuce-core/blob/master/formatting.xml) and have them applied to your changes. Don’t submit any formatting related changes.
 - [ ] You submit test cases (unit or integration tests) that back your changes.
 
diff --git a/README.md b/README.md
index ddc180511c..e52a7b78c4 100644
--- a/README.md
+++ b/README.md
@@ -28,10 +28,11 @@ See the [reference documentation](https://lettuce.io/docs/) and [Wiki](https://g
 Communication
 ---------------
 
-* Google Group: [lettuce-redis-client-users](https://groups.google.com/d/forum/lettuce-redis-client-users) or lettuce-redis-client-users@googlegroups.com
-* [![Join the chat at https://gitter.im/lettuce-io/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lettuce-io/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+* Google Group/Mailing List (General discussion, announcements and releases): [lettuce-redis-client-users](https://groups.google.com/d/forum/lettuce-redis-client-users) or lettuce-redis-client-users@googlegroups.com
+* Stack Overflow (Questions): [https://stackoverflow.com/questions/tagged/lettuce](https://stackoverflow.com/questions/tagged/lettuce)
+* Gitter (General discussion): [![Join the chat at https://gitter.im/lettuce-io/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lettuce-io/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 * Twitter: [@LettuceDriver](https://twitter.com/LettuceDriver)
-* [GitHub Issues](https://github.com/lettuce-io/lettuce-core/issues)
+* [GitHub Issues](https://github.com/lettuce-io/lettuce-core/issues) (Bug reports, feature requests)
 
 
 Documentation
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 0c7fb5c73b..3d6277344d 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -30,10 +30,11 @@ Lettuce requires a minimum of Java 8 to build and run and is compatible with Jav
 
 If you need any support, meet Lettuce at
 
-* Google Group: https://groups.google.com/d/forum/lettuce-redis-client-users
+* Google Group (General discussion, announcements and releases): https://groups.google.com/d/forum/lettuce-redis-client-users
 or lettuce-redis-client-users@googlegroups.com
-* Join the chat at https://gitter.im/lettuce-io/Lobby
-* GitHub Issues: https://github.com/lettuce-io/lettuce-core/issues
+* Stack Overflow (Questions): https://stackoverflow.com/questions/tagged/lettuce
+* Join the chat at https://gitter.im/lettuce-io/Lobby for general discussion
+* GitHub Issues (Bug reports, feature requests): https://github.com/lettuce-io/lettuce-core/issues
 * Documentation: https://lettuce.io/core/5.1.0.RELEASE/reference/
 * Javadoc: https://lettuce.io/core/5.1.0.RELEASE/api/
 

From 2d9067ce5adff687c03ddbb6c5af1431273a5ded Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 18 Jan 2019 14:57:23 +0100
Subject: [PATCH 586/808] =?UTF-8?q?Rename=20ReadFrom.SLAVE=E2=80=A6=20to?=
 =?UTF-8?q?=20ReadFrom.REPLICA=E2=80=A6,=20add=20MasterReplica=20package?=
 =?UTF-8?q?=20#845?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/io/lettuce/core/ReadFrom.java   |  41 +++-
 .../java/io/lettuce/core/ReadFromImpl.java    |  26 +--
 .../core/masterreplica/MasterReplica.java     | 172 ++++++++++++++++
 .../MasterReplicaConnectionWrapper.java       | 142 +++++++++++++
 .../StatefulRedisMasterReplicaConnection.java |  45 ++++
 .../core/masterreplica/package-info.java      |  20 ++
 .../lettuce/core/masterslave/MasterSlave.java |   2 +
 .../MasterSlaveConnectionProvider.java        |   2 +
 .../MasterSlaveTopologyProvider.java          |   5 +-
 .../masterslave/NodeConnectionFactory.java    |   2 +
 .../masterslave/SentinelTopologyProvider.java |   2 +
 .../StatefulRedisMasterSlaveConnection.java   |   3 +
 .../StaticMasterSlaveTopologyProvider.java    |   2 +
 .../core/masterslave/TopologyProvider.java    |   2 +
 .../core/masterslave/package-info.java        |   1 +
 ...ledClusterConnectionProviderUnitTests.java |   8 +-
 .../core/cluster/ReadFromUnitTests.java       |   8 +-
 .../RedisClusterReadFromIntegrationTests.java |   4 +-
 .../core/cluster/RedisClusterSetupTest.java   |   2 +-
 .../core/masterreplica/MasterReplicaTest.java | 190 +++++++++++++++++
 .../StaticMasterReplicaTest.java              | 194 ++++++++++++++++++
 .../MasterSlaveSentinelIntegrationTests.java  |   4 +-
 .../core/masterslave/MasterSlaveTest.java     |   4 +-
 .../masterslave/StaticMasterSlaveTest.java    |   6 +-
 24 files changed, 844 insertions(+), 43 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/masterreplica/MasterReplica.java
 create mode 100644 src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionWrapper.java
 create mode 100644 src/main/java/io/lettuce/core/masterreplica/StatefulRedisMasterReplicaConnection.java
 create mode 100644 src/main/java/io/lettuce/core/masterreplica/package-info.java
 create mode 100644 src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
 create mode 100644 src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java

diff --git a/src/main/java/io/lettuce/core/ReadFrom.java b/src/main/java/io/lettuce/core/ReadFrom.java
index 020f508611..43ee204b37 100644
--- a/src/main/java/io/lettuce/core/ReadFrom.java
+++ b/src/main/java/io/lettuce/core/ReadFrom.java
@@ -34,21 +34,40 @@ public abstract class ReadFrom {
     public static final ReadFrom MASTER = new ReadFromImpl.ReadFromMaster();
 
     /**
-     * Setting to read preferred from the master and fall back to a slave if the master is not available.
+     * Setting to read preferred from the master and fall back to a replica if the master is not available.
      */
     public static final ReadFrom MASTER_PREFERRED = new ReadFromImpl.ReadFromMasterPreferred();
 
     /**
-     * Setting to read preferred from slaves and fall back to master if no slave is not available.
+     * Setting to read preferred from replica and fall back to master if no replica is not available.
+     *
+     * @since 5.2
+     */
+    public static final ReadFrom REPLICA_PREFERRED = new ReadFromImpl.ReadFromReplicaPreferred();
+
+    /**
+     * Setting to read preferred from replicas and fall back to master if no replica is not available.
      *
      * @since 4.4
+     * @deprecated Renamed to {@link #REPLICA_PREFERRED}.
      */
-    public static final ReadFrom SLAVE_PREFERRED = new ReadFromImpl.ReadFromSlavePreferred();
+    @Deprecated
+    public static final ReadFrom SLAVE_PREFERRED = REPLICA_PREFERRED;
 
     /**
-     * Setting to read from the slave only.
+     * Setting to read from the replica only.
+     *
+     * @since 5.2
      */
-    public static final ReadFrom SLAVE = new ReadFromImpl.ReadFromSlave();
+    public static final ReadFrom REPLICA = new ReadFromImpl.ReadFromReplica();
+
+    /**
+     * Setting to read from the replica only.
+     *
+     * @deprecated renamed to {@link #REPLICA}.
+     */
+    @Deprecated
+    public static final ReadFrom SLAVE = REPLICA;
 
     /**
      * Setting to read from the nearest node.
@@ -57,7 +76,7 @@ public abstract class ReadFrom {
 
     /**
      * Setting to read from any node.
-     * 
+     *
      * @since 5.2
      */
     public static final ReadFrom ANY = new ReadFromImpl.ReadFromAnyNode();
@@ -72,7 +91,7 @@ public abstract class ReadFrom {
 
     /**
      * Returns whether this {@link ReadFrom} requires ordering of the resulting {@link RedisNodeDescription nodes}.
-     * 
+     *
      * @return {@literal true} if code using {@link ReadFrom} should retain ordering or {@literal false} to allow reordering of
      *         {@link RedisNodeDescription nodes}.
      * @since 5.2
@@ -102,12 +121,12 @@ public static ReadFrom valueOf(String name) {
             return MASTER_PREFERRED;
         }
 
-        if (name.equalsIgnoreCase("slave")) {
-            return SLAVE;
+        if (name.equalsIgnoreCase("slave") || name.equalsIgnoreCase("replica")) {
+            return REPLICA;
         }
 
-        if (name.equalsIgnoreCase("slavePreferred")) {
-            return SLAVE_PREFERRED;
+        if (name.equalsIgnoreCase("slavePreferred") || name.equalsIgnoreCase("replicaPreferred")) {
+            return REPLICA_PREFERRED;
         }
 
         if (name.equalsIgnoreCase("nearest")) {
diff --git a/src/main/java/io/lettuce/core/ReadFromImpl.java b/src/main/java/io/lettuce/core/ReadFromImpl.java
index 98a10537c9..67370b9961 100644
--- a/src/main/java/io/lettuce/core/ReadFromImpl.java
+++ b/src/main/java/io/lettuce/core/ReadFromImpl.java
@@ -34,7 +34,7 @@ class ReadFromImpl {
 
     private static final Predicate<RedisNodeDescription> IS_MASTER = node -> node.getRole() == RedisInstance.Role.MASTER;
 
-    private static final Predicate<RedisNodeDescription> IS_SLAVE = node -> node.getRole() == RedisInstance.Role.SLAVE;
+    private static final Predicate<RedisNodeDescription> IS_REPLICA = node -> node.getRole() == RedisInstance.Role.SLAVE;
 
     /**
      * Read from master only.
@@ -55,32 +55,32 @@ public List<RedisNodeDescription> select(Nodes nodes) {
     }
 
     /**
-     * Read from master and slaves. Prefer master reads and fall back to slaves if the master is not available.
+     * Read from master and replicas. Prefer master reads and fall back to replicas if the master is not available.
      */
     static final class ReadFromMasterPreferred extends OrderedPredicateReadFromAdapter {
 
         ReadFromMasterPreferred() {
-            super(IS_MASTER, IS_SLAVE);
+            super(IS_MASTER, IS_REPLICA);
         }
     }
 
     /**
-     * Read from slave only.
+     * Read from replica only.
      */
-    static final class ReadFromSlave extends OrderedPredicateReadFromAdapter {
+    static final class ReadFromReplica extends OrderedPredicateReadFromAdapter {
 
-        ReadFromSlave() {
-            super(IS_SLAVE);
+        ReadFromReplica() {
+            super(IS_REPLICA);
         }
     }
 
     /**
-     * Read from master and slaves. Prefer slave reads and fall back to master if the no slave is not available.
+     * Read from master and replicas. Prefer replica reads and fall back to master if the no replica is not available.
      */
-    static final class ReadFromSlavePreferred extends OrderedPredicateReadFromAdapter {
+    static final class ReadFromReplicaPreferred extends OrderedPredicateReadFromAdapter {
 
-        ReadFromSlavePreferred() {
-            super(IS_SLAVE, IS_MASTER);
+        ReadFromReplicaPreferred() {
+            super(IS_REPLICA, IS_MASTER);
         }
     }
 
@@ -112,7 +112,7 @@ public ReadFromAnyNode() {
 
     /**
      * {@link Predicate}-based {@link ReadFrom} implementation.
-     * 
+     *
      * @since 5.2
      */
     static class OrderedPredicateReadFromAdapter extends ReadFrom {
@@ -149,7 +149,7 @@ boolean isOrderSensitive() {
 
     /**
      * Unordered {@link Predicate}-based {@link ReadFrom} implementation.
-     * 
+     *
      * @since 5.2
      */
     static class UnorderedPredicateReadFromAdapter extends OrderedPredicateReadFromAdapter {
diff --git a/src/main/java/io/lettuce/core/masterreplica/MasterReplica.java b/src/main/java/io/lettuce/core/masterreplica/MasterReplica.java
new file mode 100644
index 0000000000..73ed07462f
--- /dev/null
+++ b/src/main/java/io/lettuce/core/masterreplica/MasterReplica.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterreplica;
+
+import java.util.concurrent.CompletableFuture;
+
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.masterslave.MasterSlave;
+
+/**
+ * Master-Replica connection API.
+ * <p>
+ * This API allows connections to Redis Master/Replica setups which run either in a static Master/Replica setup or are managed
+ * by Redis Sentinel. Master-Replica connections can discover topologies and select a source for read operations using
+ * {@link io.lettuce.core.ReadFrom}.
+ * </p>
+ * <p>
+ *
+ * Connections can be obtained by providing the {@link RedisClient}, a {@link RedisURI} and a {@link RedisCodec}.
+ *
+ * <pre class="code">
+ * RedisClient client = RedisClient.create();
+ * StatefulRedisMasterReplicaConnection&lt;String, String&gt; connection = MasterReplica.connect(client,
+ *         RedisURI.create(&quot;redis://localhost&quot;), StringCodec.UTF8);
+ * // ...
+ *
+ * connection.close();
+ * client.shutdown();
+ * </pre>
+ *
+ * </p>
+ * <h3>Topology Discovery</h3>
+ * <p />
+ * Master-Replica topologies are either static or semi-static. Redis Standalone instances with attached replicas provide no
+ * failover/HA mechanism. Redis Sentinel managed instances are controlled by Redis Sentinel and allow failover (which include
+ * master promotion). The {@link MasterReplica} API supports both mechanisms. The topology is provided by a
+ * {@link TopologyProvider}:
+ *
+ * <ul>
+ * <li>{@link MasterSlaveTopologyProvider}: Dynamic topology lookup using the {@code INFO REPLICATION} output. Replicas are
+ * listed as {@code replicaN=...} entries. The initial connection can either point to a master or a replica and the topology
+ * provider will discover nodes. The connection needs to be re-established outside of lettuce in a case of Master/Replica
+ * failover or topology changes.</li>
+ * <li>{@link StaticMasterSlaveTopologyProvider}: Topology is defined by the list of {@link RedisURI URIs} and the {@code ROLE}
+ * output. MasterReplica uses only the supplied nodes and won't discover additional nodes in the setup. The connection needs to
+ * be re-established outside of lettuce in a case of Master/Replica failover or topology changes.</li>
+ * <li>{@link SentinelTopologyProvider}: Dynamic topology lookup using the Redis Sentinel API. In particular,
+ * {@code SENTINEL MASTER} and {@code SENTINEL SLAVES} output. Master/Replica failover is handled by lettuce.</li>
+ * </ul>
+ *
+ * <h3>Topology Updates</h4>
+ * <ul>
+ * <li>Standalone Master/Replica: Performs a one-time topology lookup which remains static afterward</li>
+ * <li>Redis Sentinel: Subscribes to all Sentinels and listens for Pub/Sub messages to trigger topology refreshing</li>
+ * </ul>
+ *
+ * <h3>Connection Fault-Tolerance</h3>
+ * Connecting to Master/Replica bears the possibility that individual nodes are not reachable. {@link MasterReplica} can still
+ * connect to a partially-available set of nodes.
+ *
+ * <ul>
+ * <li>Redis Sentinel: At least one Sentinel must be reachable, the masterId must be registered and at least one host must be
+ * available (master or replica). Allows for runtime-recovery based on Sentinel Events.</li>
+ * <li>Static Setup (auto-discovery): The initial endpoint must be reachable. No recovery/reconfiguration during runtime.</li>
+ * <li>Static Setup (provided hosts): All endpoints must be reachable. No recovery/reconfiguration during runtime.</li>
+ * </ul>
+ *
+ * @author Mark Paluch
+ * @since 5.2
+ */
+public class MasterReplica {
+
+    /**
+     * Open a new connection to a Redis Master-Replica server/servers using the supplied {@link RedisURI} and the supplied
+     * {@link RedisCodec codec} to encode/decode keys.
+     * <p>
+     * This {@link MasterReplica} performs auto-discovery of nodes using either Redis Sentinel or Master/Replica. A
+     * {@link RedisURI} can point to either a master or a replica host.
+     * </p>
+     *
+     * @param redisClient the Redis client.
+     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}.
+     * @param redisURI the Redis server to connect to, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return a new connection.
+     */
+    public static <K, V> StatefulRedisMasterReplicaConnection<K, V> connect(RedisClient redisClient, RedisCodec<K, V> codec,
+            RedisURI redisURI) {
+
+        return new MasterReplicaConnectionWrapper<>(MasterSlave.connect(redisClient, codec, redisURI));
+    }
+
+    /**
+     * Open asynchronously a new connection to a Redis Master-Replica server/servers using the supplied {@link RedisURI} and the
+     * supplied {@link RedisCodec codec} to encode/decode keys.
+     * <p>
+     * This {@link MasterReplica} performs auto-discovery of nodes using either Redis Sentinel or Master/Replica. A
+     * {@link RedisURI} can point to either a master or a replica host.
+     * </p>
+     *
+     * @param redisClient the Redis client.
+     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}.
+     * @param redisURI the Redis server to connect to, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return {@link CompletableFuture} that is notified once the connect is finished.
+     * @since
+     */
+    public static <K, V> CompletableFuture<StatefulRedisMasterReplicaConnection<K, V>> connectAsync(RedisClient redisClient,
+            RedisCodec<K, V> codec, RedisURI redisURI) {
+        return MasterSlave.connectAsync(redisClient, codec, redisURI).thenApply(MasterReplicaConnectionWrapper::new);
+    }
+
+    /**
+     * Open a new connection to a Redis Master-Replica server/servers using the supplied {@link RedisURI} and the supplied
+     * {@link RedisCodec codec} to encode/decode keys.
+     * <p>
+     * This {@link MasterReplica} performs auto-discovery of nodes if the URI is a Redis Sentinel URI. Master/Replica URIs will
+     * be treated as static topology and no additional hosts are discovered in such case. Redis Standalone Master/Replica will
+     * discover the roles of the supplied {@link RedisURI URIs} and issue commands to the appropriate node.
+     * </p>
+     *
+     * @param redisClient the Redis client.
+     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}.
+     * @param redisURIs the Redis server to connect to, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return a new connection.
+     */
+    public static <K, V> StatefulRedisMasterReplicaConnection<K, V> connect(RedisClient redisClient, RedisCodec<K, V> codec,
+            Iterable<RedisURI> redisURIs) {
+        return new MasterReplicaConnectionWrapper<>(MasterSlave.connect(redisClient, codec, redisURIs));
+    }
+
+    /**
+     * Open asynchronously a new connection to a Redis Master-Replica server/servers using the supplied {@link RedisURI} and the
+     * supplied {@link RedisCodec codec} to encode/decode keys.
+     * <p>
+     * This {@link MasterReplica} performs auto-discovery of nodes if the URI is a Redis Sentinel URI. Master/Replica URIs will
+     * be treated as static topology and no additional hosts are discovered in such case. Redis Standalone Master/Replica will
+     * discover the roles of the supplied {@link RedisURI URIs} and issue commands to the appropriate node.
+     * </p>
+     *
+     * @param redisClient the Redis client.
+     * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}.
+     * @param redisURIs the Redis server to connect to, must not be {@literal null}.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return {@link CompletableFuture} that is notified once the connect is finished.
+     */
+    public static <K, V> CompletableFuture<StatefulRedisMasterReplicaConnection<K, V>> connectAsync(RedisClient redisClient,
+            RedisCodec<K, V> codec, Iterable<RedisURI> redisURIs) {
+
+        return MasterSlave.connectAsync(redisClient, codec, redisURIs).thenApply(MasterReplicaConnectionWrapper::new);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionWrapper.java b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionWrapper.java
new file mode 100644
index 0000000000..3420d07a5c
--- /dev/null
+++ b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionWrapper.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterreplica;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.reactive.RedisReactiveCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection;
+import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.resource.ClientResources;
+
+/**
+ * Connection wrapper for {@link StatefulRedisMasterSlaveConnection}.
+ *
+ * @author Mark Paluch
+ * @since 5.2
+ */
+class MasterReplicaConnectionWrapper<K, V> implements StatefulRedisMasterReplicaConnection<K, V> {
+
+    private final StatefulRedisMasterSlaveConnection<K, V> delegate;
+
+    public MasterReplicaConnectionWrapper(StatefulRedisMasterSlaveConnection<K, V> delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public void setReadFrom(ReadFrom readFrom) {
+        delegate.setReadFrom(readFrom);
+    }
+
+    @Override
+    public ReadFrom getReadFrom() {
+        return delegate.getReadFrom();
+    }
+
+    @Override
+    public boolean isMulti() {
+        return delegate.isMulti();
+    }
+
+    @Override
+    public RedisCommands<K, V> sync() {
+        return delegate.sync();
+    }
+
+    @Override
+    public RedisAsyncCommands<K, V> async() {
+        return delegate.async();
+    }
+
+    @Override
+    public RedisReactiveCommands<K, V> reactive() {
+        return delegate.reactive();
+    }
+
+    @Override
+    public void setTimeout(Duration timeout) {
+        delegate.setTimeout(timeout);
+    }
+
+    @Override
+    @Deprecated
+    public void setTimeout(long timeout, TimeUnit unit) {
+        delegate.setTimeout(timeout, unit);
+    }
+
+    @Override
+    public Duration getTimeout() {
+        return delegate.getTimeout();
+    }
+
+    @Override
+    public <T> RedisCommand<K, V, T> dispatch(RedisCommand<K, V, T> command) {
+        return delegate.dispatch(command);
+    }
+
+    @Override
+    public Collection<RedisCommand<K, V, ?>> dispatch(Collection<? extends RedisCommand<K, V, ?>> redisCommands) {
+        return delegate.dispatch(redisCommands);
+    }
+
+    @Override
+    public void close() {
+        delegate.close();
+    }
+
+    @Override
+    public CompletableFuture<Void> closeAsync() {
+        return delegate.closeAsync();
+    }
+
+    @Override
+    public boolean isOpen() {
+        return delegate.isOpen();
+    }
+
+    @Override
+    public ClientOptions getOptions() {
+        return delegate.getOptions();
+    }
+
+    @Override
+    public ClientResources getResources() {
+        return delegate.getResources();
+    }
+
+    @Override
+    @Deprecated
+    public void reset() {
+        delegate.reset();
+    }
+
+    @Override
+    public void setAutoFlushCommands(boolean autoFlush) {
+        delegate.setAutoFlushCommands(autoFlush);
+    }
+
+    @Override
+    public void flushCommands() {
+        delegate.flushCommands();
+    }
+}
diff --git a/src/main/java/io/lettuce/core/masterreplica/StatefulRedisMasterReplicaConnection.java b/src/main/java/io/lettuce/core/masterreplica/StatefulRedisMasterReplicaConnection.java
new file mode 100644
index 0000000000..572e5f8f01
--- /dev/null
+++ b/src/main/java/io/lettuce/core/masterreplica/StatefulRedisMasterReplicaConnection.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterreplica;
+
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection;
+
+/**
+ * Redis Master-Replica connection. The connection allows slave reads by setting {@link ReadFrom}.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ * @author Mark Paluch
+ * @since 4.1
+ */
+public interface StatefulRedisMasterReplicaConnection<K, V> extends StatefulRedisMasterSlaveConnection<K, V> {
+
+    /**
+     * Set from which nodes data is read. The setting is used as default for read operations on this connection. See the
+     * documentation for {@link ReadFrom} for more information.
+     *
+     * @param readFrom the read from setting, must not be {@literal null}
+     */
+    void setReadFrom(ReadFrom readFrom);
+
+    /**
+     * Gets the {@link ReadFrom} setting for this connection. Defaults to {@link ReadFrom#MASTER} if not set.
+     *
+     * @return the read from setting
+     */
+    ReadFrom getReadFrom();
+}
diff --git a/src/main/java/io/lettuce/core/masterreplica/package-info.java b/src/main/java/io/lettuce/core/masterreplica/package-info.java
new file mode 100644
index 0000000000..feec0f7600
--- /dev/null
+++ b/src/main/java/io/lettuce/core/masterreplica/package-info.java
@@ -0,0 +1,20 @@
+/**
+ * Client support for Redis Master/Replica setups. {@link io.lettuce.core.masterreplica.MasterReplica} supports self-managed,
+ * Redis Sentinel-managed, AWS ElastiCache and Azure Redis managed Master/Replica setups.
+ *
+ * Connections can be obtained by providing the {@link io.lettuce.core.RedisClient}, a {@link io.lettuce.core.RedisURI} and a {@link io.lettuce.core.codec.RedisCodec}.
+ *
+ * <pre class="code">
+ *
+ *   RedisClient client = RedisClient.create();
+ *   StatefulRedisMasterReplicaConnection<String, String> connection = MasterReplica.connect(client,
+ *                                                                      RedisURI.create("redis://localhost"),
+ *                                                                      StringCodec.UTF8);
+ *   // ...
+ *
+ *   connection.close();
+ *   client.shutdown();
+ * </pre>
+ */
+package io.lettuce.core.masterreplica;
+
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index dd73666ec6..1841f9431c 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -89,7 +89,9 @@
  *
  * @author Mark Paluch
  * @since 4.1
+ * @deprecated since 5.2, use {@link io.lettuce.core.masterreplica.MasterReplica}
  */
+@Deprecated
 public class MasterSlave {
 
     /**
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
index 46a28e910a..d6528a44cd 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
@@ -39,7 +39,9 @@
  *
  * @author Mark Paluch
  * @since 4.1
+ * @deprecated will be moved to {@code masterreplica} package with version 6.
  */
+@Deprecated
 public class MasterSlaveConnectionProvider<K, V> {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(MasterSlaveConnectionProvider.class);
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
index beac934b16..9d6a643656 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
@@ -37,11 +37,14 @@
  *
  * @author Mark Paluch
  * @since 4.1
+ * @deprecated will be moved to {@code masterreplica} package with version 6.
  */
+@Deprecated
 public class MasterSlaveTopologyProvider implements TopologyProvider {
 
     public static final Pattern ROLE_PATTERN = Pattern.compile("^role\\:([a-z]+)$", Pattern.MULTILINE);
-    public static final Pattern SLAVE_PATTERN = Pattern.compile("^slave(\\d+)\\:([a-zA-Z\\,\\=\\d\\.\\:]+)$", Pattern.MULTILINE);
+    public static final Pattern SLAVE_PATTERN = Pattern
+            .compile("^slave(\\d+)\\:([a-zA-Z\\,\\=\\d\\.\\:]+)$", Pattern.MULTILINE);
     public static final Pattern MASTER_HOST_PATTERN = Pattern.compile("^master_host\\:([a-zA-Z\\,\\=\\d\\.\\:\\-]+)$",
             Pattern.MULTILINE);
     public static final Pattern MASTER_PORT_PATTERN = Pattern.compile("^master_port\\:(\\d+)$", Pattern.MULTILINE);
diff --git a/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java b/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
index 700cb1a8a6..b07ef0f73b 100644
--- a/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
@@ -27,7 +27,9 @@
  *
  * @author Mark Paluch
  * @since 4.4
+ * @deprecated will be moved to {@code masterreplica} package with version 6.
  */
+@Deprecated
 public interface NodeConnectionFactory {
 
     /**
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
index 3c498acee2..fe04814d58 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
@@ -42,7 +42,9 @@
  *
  * @author Mark Paluch
  * @since 4.1
+ * @deprecated will be moved to {@code masterreplica} package with version 6.
  */
+@Deprecated
 public class SentinelTopologyProvider implements TopologyProvider {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(SentinelTopologyProvider.class);
diff --git a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
index a9cd6a89bc..9fe475a42b 100644
--- a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
+++ b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
@@ -25,7 +25,10 @@
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.1
+ * @deprecated since 5.2, use {@link io.lettuce.core.masterreplica.MasterReplica} and
+ *             {@link io.lettuce.core.masterreplica.StatefulRedisMasterReplicaConnection}.
  */
+@Deprecated
 public interface StatefulRedisMasterSlaveConnection<K, V> extends StatefulRedisConnection<K, V> {
 
     /**
diff --git a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
index 240c096d23..5c004f894e 100644
--- a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
@@ -40,7 +40,9 @@
  *
  * @author Mark Paluch
  * @author Adam McElwee
+ * @deprecated will be moved to {@code masterreplica} package with version 6.
  */
+@Deprecated
 public class StaticMasterSlaveTopologyProvider implements TopologyProvider {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(StaticMasterSlaveTopologyProvider.class);
diff --git a/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
index 8abfcd8450..bc5fb57968 100644
--- a/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
@@ -27,8 +27,10 @@
  *
  * @author Mark Paluch
  * @since 4.1
+ * @deprecated will be moved to {@code masterreplica} package with version 6.
  */
 @FunctionalInterface
+@Deprecated
 public interface TopologyProvider {
 
     /**
diff --git a/src/main/java/io/lettuce/core/masterslave/package-info.java b/src/main/java/io/lettuce/core/masterslave/package-info.java
index 8b70f6f791..23abb92baa 100644
--- a/src/main/java/io/lettuce/core/masterslave/package-info.java
+++ b/src/main/java/io/lettuce/core/masterslave/package-info.java
@@ -15,6 +15,7 @@
  *   connection.close();
  *   client.shutdown();
  * </pre>
+ * @deprecated will be moved to {@code masterreplica} package with version 6.
  */
 package io.lettuce.core.masterslave;
 
diff --git a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
index 2f914939d2..72d6ed7c53 100644
--- a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
@@ -150,7 +150,7 @@ void shouldObtainConnectionReadFromSlave() {
 
         when(asyncCommandsMock.readOnly()).thenReturn(async);
 
-        sut.setReadFrom(ReadFrom.SLAVE);
+        sut.setReadFrom(ReadFrom.REPLICA);
 
         StatefulRedisConnection<String, String> connection = sut.getConnection(Intent.READ, 1);
 
@@ -209,7 +209,7 @@ void shouldNotRandomizeReadNode() {
         when(asyncCommandsMock.readOnly()).thenReturn(async);
         when(nodeConnectionMock2.async()).thenReturn(asyncCommandsMock);
 
-        sut.setReadFrom(ReadFrom.SLAVE);
+        sut.setReadFrom(ReadFrom.REPLICA);
 
         List<StatefulRedisConnection<String, String>> readCandidates = new ArrayList<>();
 
@@ -231,7 +231,7 @@ void shouldCloseConnectionOnConnectFailure() {
 
         when(asyncCommandsMock.readOnly()).thenReturn(async);
 
-        sut.setReadFrom(ReadFrom.SLAVE);
+        sut.setReadFrom(ReadFrom.REPLICA);
 
         try {
             sut.getConnection(Intent.READ, 1);
@@ -255,7 +255,7 @@ void shouldRetryConnectionAttemptAfterConnectionAttemptWasBroken() {
 
         when(asyncCommandsMock.readOnly()).thenReturn(async);
 
-        sut.setReadFrom(ReadFrom.SLAVE);
+        sut.setReadFrom(ReadFrom.REPLICA);
 
         try {
             sut.getConnection(Intent.READ, 1);
diff --git a/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java b/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
index 14474dce63..41f41fae78 100644
--- a/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
@@ -67,13 +67,13 @@ void masterPreferred() {
 
     @Test
     void slave() {
-        List<RedisNodeDescription> result = ReadFrom.SLAVE.select(getNodes());
+        List<RedisNodeDescription> result = ReadFrom.REPLICA.select(getNodes());
         assertThat(result).hasSize(2).contains(nearest, slave);
     }
 
     @Test
     void slavePreferred() {
-        List<RedisNodeDescription> result = ReadFrom.SLAVE_PREFERRED.select(getNodes());
+        List<RedisNodeDescription> result = ReadFrom.REPLICA_PREFERRED.select(getNodes());
         assertThat(result).hasSize(3).containsExactly(nearest, slave, master);
     }
 
@@ -110,12 +110,12 @@ void valueOfMasterPreferred() {
 
     @Test
     void valueOfSlave() {
-        assertThat(ReadFrom.valueOf("slave")).isEqualTo(ReadFrom.SLAVE);
+        assertThat(ReadFrom.valueOf("slave")).isEqualTo(ReadFrom.REPLICA);
     }
 
     @Test
     void valueOfSlavePreferred() {
-        assertThat(ReadFrom.valueOf("slavePreferred")).isEqualTo(ReadFrom.SLAVE_PREFERRED);
+        assertThat(ReadFrom.valueOf("slavePreferred")).isEqualTo(ReadFrom.REPLICA_PREFERRED);
     }
 
     private ReadFrom.Nodes getNodes() {
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java
index 7162312fe9..18445a76b6 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java
@@ -83,7 +83,7 @@ void readWriteMasterPreferred() {
     @Test
     void readWriteSlave() {
 
-        connection.setReadFrom(ReadFrom.SLAVE);
+        connection.setReadFrom(ReadFrom.REPLICA);
 
         sync.set(key, "value1");
 
@@ -94,7 +94,7 @@ void readWriteSlave() {
     @Test
     void readWriteSlavePreferred() {
 
-        connection.setReadFrom(ReadFrom.SLAVE_PREFERRED);
+        connection.setReadFrom(ReadFrom.REPLICA_PREFERRED);
 
         sync.set(key, "value1");
 
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
index 6cecc0810e..87dc28e4f2 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
@@ -476,7 +476,7 @@ public void readFromSlaveTest() {
 
         ClusterSetup.setup2Masters(clusterRule);
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
-        clusterConnection.getStatefulConnection().setReadFrom(ReadFrom.SLAVE);
+        clusterConnection.getStatefulConnection().setReadFrom(ReadFrom.REPLICA);
 
         Futures.await(clusterConnection.set(key, value));
 
diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
new file mode 100644
index 0000000000..9a8e9a1864
--- /dev/null
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterreplica;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.models.role.RedisInstance;
+import io.lettuce.core.models.role.RedisNodeDescription;
+import io.lettuce.core.models.role.RoleParser;
+import io.lettuce.test.Futures;
+import io.lettuce.test.settings.TestSettings;
+
+/**
+ * @author Mark Paluch
+ */
+class MasterReplicaTest extends AbstractRedisClientTest {
+
+    private RedisURI masterURI = RedisURI.Builder.redis(host, TestSettings.port(3)).withPassword(passwd)
+            .withClientName("my-client").withDatabase(5).build();
+
+    private StatefulRedisMasterReplicaConnection<String, String> connection;
+    private RedisAsyncCommands<String, String> connectionToNode1;
+    private RedisAsyncCommands<String, String> connectionToNode2;
+
+    private RedisURI master;
+    private RedisURI replica;
+
+    @BeforeEach
+    void before() throws Exception {
+
+        RedisURI node1 = RedisURI.Builder.redis(host, TestSettings.port(3)).withDatabase(2).build();
+        RedisURI node2 = RedisURI.Builder.redis(host, TestSettings.port(4)).withDatabase(2).build();
+
+        connectionToNode1 = client.connect(node1).async();
+        connectionToNode2 = client.connect(node2).async();
+
+        RedisInstance node1Instance = RoleParser.parse(connectionToNode1.role().get(2, TimeUnit.SECONDS));
+        RedisInstance node2Instance = RoleParser.parse(connectionToNode2.role().get(2, TimeUnit.SECONDS));
+
+        if (node1Instance.getRole() == RedisInstance.Role.MASTER && node2Instance.getRole() == RedisInstance.Role.SLAVE) {
+            master = node1;
+            replica = node2;
+        } else if (node2Instance.getRole() == RedisInstance.Role.MASTER && node1Instance.getRole() == RedisInstance.Role.SLAVE) {
+            master = node2;
+            replica = node1;
+        } else {
+            assumeTrue(false, String.format(
+                    "Cannot run the test because I don't have a distinct master and replica but %s and %s", node1Instance,
+                    node2Instance));
+        }
+
+        connectionToNode1.configSet("requirepass", passwd);
+        connectionToNode1.configSet("masterauth", passwd);
+        connectionToNode1.auth(passwd);
+
+        connectionToNode2.configSet("requirepass", passwd);
+        connectionToNode2.configSet("masterauth", passwd);
+        connectionToNode2.auth(passwd);
+
+        connection = MasterReplica.connect(client, new Utf8StringCodec(), masterURI);
+        connection.setReadFrom(ReadFrom.REPLICA);
+    }
+
+    @AfterEach
+    void after() {
+
+        if (connectionToNode1 != null) {
+            connectionToNode1.configSet("requirepass", "");
+            Futures.await(connectionToNode1.configSet("masterauth", ""));
+            connectionToNode1.getStatefulConnection().close();
+        }
+
+        if (connectionToNode2 != null) {
+            connectionToNode2.configSet("requirepass", "");
+            Futures.await(connectionToNode2.configSet("masterauth", ""));
+            connectionToNode2.getStatefulConnection().close();
+        }
+
+        if (connection != null) {
+            connection.close();
+        }
+    }
+
+    @Test
+    void testMasterReplicaReadFromMaster() {
+
+        connection.setReadFrom(ReadFrom.MASTER);
+        String server = connection.sync().info("server");
+
+        Pattern pattern = Pattern.compile("tcp_port:(\\d+)");
+        Matcher matcher = pattern.matcher(server);
+
+        assertThat(matcher.find()).isTrue();
+        assertThat(matcher.group(1)).isEqualTo("" + master.getPort());
+    }
+
+    @Test
+    void testMasterReplicaReadFromReplica() {
+
+        String server = connection.sync().info("server");
+
+        Pattern pattern = Pattern.compile("tcp_port:(\\d+)");
+        Matcher matcher = pattern.matcher(server);
+
+        assertThat(matcher.find()).isTrue();
+        assertThat(matcher.group(1)).isEqualTo("" + replica.getPort());
+        assertThat(connection.getReadFrom()).isEqualTo(ReadFrom.REPLICA);
+    }
+
+    @Test
+    void testMasterReplicaReadWrite() {
+
+        RedisCommands<String, String> redisCommands = connection.sync();
+        redisCommands.set(key, value);
+        redisCommands.waitForReplication(1, 100);
+
+        assertThat(redisCommands.get(key)).isEqualTo(value);
+    }
+
+    @Test
+    void testConnectToReplica() {
+
+        connection.close();
+
+        RedisURI replicaUri = RedisURI.Builder.redis(host, TestSettings.port(4)).withPassword(passwd).build();
+        connection = MasterReplica.connect(client, new Utf8StringCodec(), replicaUri);
+
+        RedisCommands<String, String> sync = connection.sync();
+        sync.set(key, value);
+    }
+
+    @Test
+    void noReplicaForRead() {
+
+        connection.setReadFrom(new ReadFrom() {
+            @Override
+            public List<RedisNodeDescription> select(Nodes nodes) {
+                return Collections.emptyList();
+            }
+        });
+
+        assertThatThrownBy(() -> replicaCall(connection)).isInstanceOf(RedisException.class);
+    }
+
+    @Test
+    void masterReplicaConnectionShouldSetClientName() {
+
+        assertThat(connection.sync().clientGetname()).isEqualTo(masterURI.getClientName());
+        connection.sync().quit();
+        assertThat(connection.sync().clientGetname()).isEqualTo(masterURI.getClientName());
+
+        connection.close();
+    }
+
+    static String replicaCall(StatefulRedisMasterReplicaConnection<String, String> connection) {
+        return connection.sync().info("replication");
+    }
+}
diff --git a/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java b/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
new file mode 100644
index 0000000000..0f58a25dde
--- /dev/null
+++ b/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterreplica;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.lettuce.core.AbstractRedisClientTest;
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.RedisException;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.models.role.RedisInstance;
+import io.lettuce.core.models.role.RoleParser;
+import io.lettuce.test.settings.TestSettings;
+
+/**
+ * @author Mark Paluch
+ */
+class StaticMasterReplicaTest extends AbstractRedisClientTest {
+
+    private StatefulRedisMasterReplicaConnection<String, String> connection;
+
+    private RedisURI master;
+    private RedisURI slave;
+
+    private RedisAsyncCommands<String, String> connectionToNode1;
+    private RedisAsyncCommands<String, String> connectionToNode2;
+
+    @BeforeEach
+    void before() throws Exception {
+
+        RedisURI node1 = RedisURI.Builder.redis(host, TestSettings.port(3)).withClientName("my-client").withDatabase(2).build();
+        RedisURI node2 = RedisURI.Builder.redis(host, TestSettings.port(4)).withClientName("my-client").withDatabase(2).build();
+
+        connectionToNode1 = client.connect(node1).async();
+        connectionToNode2 = client.connect(node2).async();
+
+        RedisInstance node1Instance = RoleParser.parse(connectionToNode1.role().get(2, TimeUnit.SECONDS));
+        RedisInstance node2Instance = RoleParser.parse(connectionToNode2.role().get(2, TimeUnit.SECONDS));
+
+        if (node1Instance.getRole() == RedisInstance.Role.MASTER && node2Instance.getRole() == RedisInstance.Role.SLAVE) {
+            master = node1;
+            slave = node2;
+        } else if (node2Instance.getRole() == RedisInstance.Role.MASTER && node1Instance.getRole() == RedisInstance.Role.SLAVE) {
+            master = node2;
+            slave = node1;
+        } else {
+            assumeTrue(false, String.format(
+                    "Cannot run the test because I don't have a distinct master and slave but %s and %s", node1Instance,
+                    node2Instance));
+        }
+
+        connectionToNode1.configSet("requirepass", passwd);
+        connectionToNode1.configSet("masterauth", passwd);
+        connectionToNode1.auth(passwd);
+
+        connectionToNode2.configSet("requirepass", passwd);
+        connectionToNode2.configSet("masterauth", passwd);
+        connectionToNode2.auth(passwd);
+
+        node1.setPassword(passwd);
+        node2.setPassword(passwd);
+
+        connection = MasterReplica.connect(client, new Utf8StringCodec(), Arrays.asList(master, slave));
+        connection.setReadFrom(ReadFrom.REPLICA);
+    }
+
+    @AfterEach
+    void after() throws Exception {
+
+        if (connectionToNode1 != null) {
+            connectionToNode1.configSet("requirepass", "");
+            connectionToNode1.configSet("masterauth", "").get(1, TimeUnit.SECONDS);
+            connectionToNode1.getStatefulConnection().close();
+        }
+
+        if (connectionToNode2 != null) {
+            connectionToNode2.configSet("requirepass", "");
+            connectionToNode2.configSet("masterauth", "").get(1, TimeUnit.SECONDS);
+            connectionToNode2.getStatefulConnection().close();
+        }
+
+        if (connection != null) {
+            connection.close();
+        }
+    }
+
+    @Test
+    void testMasterReplicaStandaloneBasic() {
+
+        String server = connection.sync().info("server");
+
+        Pattern pattern = Pattern.compile("tcp_port:(\\d+)");
+        Matcher matcher = pattern.matcher(server);
+
+        assertThat(matcher.find()).isTrue();
+        assertThat(matcher.group(1)).isEqualTo("6483");
+        assertThat(connection.getReadFrom()).isEqualTo(ReadFrom.REPLICA);
+    }
+
+    @Test
+    void testMasterReplicaReadWrite() {
+
+        RedisCommands<String, String> redisCommands = connection.sync();
+        redisCommands.set(key, value);
+        redisCommands.waitForReplication(1, 100);
+
+        assertThat(redisCommands.get(key)).isEqualTo(value);
+    }
+
+    @Test
+    void noReplicaForRead() {
+
+        connection.close();
+
+        connection = MasterReplica.connect(client, new Utf8StringCodec(), Arrays.asList(master));
+        connection.setReadFrom(ReadFrom.REPLICA);
+
+        assertThatThrownBy(() -> replicaCall(connection)).isInstanceOf(RedisException.class);
+    }
+
+    @Test
+    void shouldWorkWithMasterOnly() {
+
+        connection.close();
+
+        connection = MasterReplica.connect(client, new Utf8StringCodec(), Arrays.asList(master));
+
+        connection.sync().set(key, value);
+        assertThat(connection.sync().get(key)).isEqualTo("value");
+    }
+
+    @Test
+    void shouldWorkWithReplicaOnly() {
+
+        connection.close();
+
+        connection = MasterReplica.connect(client, new Utf8StringCodec(), Arrays.asList(slave));
+        connection.setReadFrom(ReadFrom.MASTER_PREFERRED);
+
+        assertThat(connection.sync().info()).isNotEmpty();
+    }
+
+    @Test
+    void noMasterForWrite() {
+
+        connection.close();
+
+        connection = MasterReplica.connect(client, new Utf8StringCodec(), Arrays.asList(slave));
+
+        assertThatThrownBy(() -> connection.sync().set(key, value)).isInstanceOf(RedisException.class);
+    }
+
+    @Test
+    void masterReplicaConnectionShouldSetClientName() {
+
+        assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
+        connection.sync().quit();
+        assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
+
+        connection.close();
+    }
+
+    static String replicaCall(StatefulRedisMasterReplicaConnection<String, String> connection) {
+        return connection.sync().info("replication");
+    }
+
+}
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
index 2e71706ca2..bd53d69482 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
@@ -119,7 +119,7 @@ void testMasterSlaveSentinelConnectionCount() {
                 SentinelTestSettings.SENTINEL_URI);
 
         connection.sync().ping();
-        connection.setReadFrom(ReadFrom.SLAVE);
+        connection.setReadFrom(ReadFrom.REPLICA);
         slaveCall(connection);
 
         assertThat(channels.size()).isEqualTo(count + 2 /* connections */+ 1 /* sentinel connections */);
@@ -137,7 +137,7 @@ void testMasterSlaveSentinelClosesSentinelConnections() {
                 SentinelTestSettings.SENTINEL_URI);
 
         connection.sync().ping();
-        connection.setReadFrom(ReadFrom.SLAVE);
+        connection.setReadFrom(ReadFrom.REPLICA);
         slaveCall(connection);
         connection.close();
 
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
index cf4d5f366a..c55a900258 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
@@ -91,7 +91,7 @@ void before() throws Exception {
         connectionToNode2.auth(passwd);
 
         connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, new Utf8StringCodec(), masterURI);
-        connection.setReadFrom(ReadFrom.SLAVE);
+        connection.setReadFrom(ReadFrom.REPLICA);
     }
 
     @AfterEach
@@ -137,7 +137,7 @@ void testMasterSlaveReadFromSlave() {
 
         assertThat(matcher.find()).isTrue();
         assertThat(matcher.group(1)).isEqualTo("" + slave.getPort());
-        assertThat(connection.getReadFrom()).isEqualTo(ReadFrom.SLAVE);
+        assertThat(connection.getReadFrom()).isEqualTo(ReadFrom.REPLICA);
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
index e81c4e9e88..42d87bdda0 100644
--- a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
@@ -91,7 +91,7 @@ void before() throws Exception {
 
         connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, new Utf8StringCodec(),
                 Arrays.asList(master, slave));
-        connection.setReadFrom(ReadFrom.SLAVE);
+        connection.setReadFrom(ReadFrom.REPLICA);
     }
 
     @AfterEach
@@ -124,7 +124,7 @@ void testMasterSlaveStandaloneBasic() {
 
         assertThat(matcher.find()).isTrue();
         assertThat(matcher.group(1)).isEqualTo("6483");
-        assertThat(connection.getReadFrom()).isEqualTo(ReadFrom.SLAVE);
+        assertThat(connection.getReadFrom()).isEqualTo(ReadFrom.REPLICA);
     }
 
     @Test
@@ -144,7 +144,7 @@ void noSlaveForRead() {
 
         connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, new Utf8StringCodec(),
                 Arrays.asList(master));
-        connection.setReadFrom(ReadFrom.SLAVE);
+        connection.setReadFrom(ReadFrom.REPLICA);
 
         assertThatThrownBy(() -> slaveCall(connection)).isInstanceOf(RedisException.class);
     }

From 12d8a3f36bb201d1666fe4732a522c4eef40a0fc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 18 Jan 2019 15:27:10 +0100
Subject: [PATCH 587/808] Use replica terminology in variable names and tests
 #845

---
 .../api/async/RedisServerAsyncCommands.java   |  2 +-
 .../reactive/RedisServerReactiveCommands.java |  2 +-
 .../core/api/sync/RedisServerCommands.java    |  2 +-
 .../models/slots/ClusterSlotsParser.java      | 14 +++----
 .../core/models/role/RedisMasterInstance.java | 30 ++++++++-----
 .../core/models/role/RedisSlaveInstance.java  | 12 +++---
 .../lettuce/core/models/role/RoleParser.java  | 42 ++++++++++---------
 .../api/async/RedisSentinelAsyncCommands.java |  2 +-
 .../lettuce/core/api/RedisServerCommands.java |  8 ++--
 .../ClusterCommandIntegrationTests.java       | 12 +++---
 .../io/lettuce/core/cluster/ClusterSetup.java |  2 +-
 .../core/cluster/ClusterTestSettings.java     |  2 +-
 .../core/cluster/ReadFromUnitTests.java       | 16 +++----
 ...terPasswordSecuredSslIntegrationTests.java |  2 +-
 .../core/masterslave/MasterSlaveTest.java     | 10 ++---
 .../MasterSlaveTopologyProviderUnitTests.java | 12 +++---
 .../MasterSlaveTopologyRefreshUnitTests.java  |  4 +-
 .../MasterSlaveUtilsUnitTests.java            | 30 ++++++-------
 .../SentinelTopologyRefreshUnitTests.java     |  6 +--
 .../masterslave/StaticMasterSlaveTest.java    | 14 +++----
 20 files changed, 118 insertions(+), 106 deletions(-)

diff --git a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
index 95c667e672..ebea9f5a5d 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
@@ -309,7 +309,7 @@ public interface RedisServerAsyncCommands<K, V> {
     void shutdown(boolean save);
 
     /**
-     * Make the server a slave of another instance, or promote it as master.
+     * Make the server a replica of another instance, or promote it as master.
      *
      * @param host the host type: string
      * @param port the port type: string
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
index c95bc38813..ab52856682 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
@@ -309,7 +309,7 @@ public interface RedisServerReactiveCommands<K, V> {
     Mono<Void> shutdown(boolean save);
 
     /**
-     * Make the server a slave of another instance, or promote it as master.
+     * Make the server a replica of another instance, or promote it as master.
      *
      * @param host the host type: string
      * @param port the port type: string
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
index 528f022850..7b0c699369 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
@@ -308,7 +308,7 @@ public interface RedisServerCommands<K, V> {
     void shutdown(boolean save);
 
     /**
-     * Make the server a slave of another instance, or promote it as master.
+     * Make the server a replica of another instance, or promote it as master.
      *
      * @param host the host type: string
      * @param port the port type: string
diff --git a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
index 62041f14f6..1ffd42ead6 100644
--- a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
+++ b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
@@ -78,7 +78,7 @@ private static ClusterSlotRange parseRange(List<?> range, Map<String, RedisClust
         int to = Math.toIntExact(getLongFromIterator(iterator, 0));
         RedisClusterNode master = null;
 
-        List<RedisClusterNode> slaves = new ArrayList<>();
+        List<RedisClusterNode> replicas = new ArrayList<>();
         if (iterator.hasNext()) {
             master = getRedisClusterNode(iterator, nodeCache);
             if(master != null) {
@@ -90,15 +90,15 @@ private static ClusterSlotRange parseRange(List<?> range, Map<String, RedisClust
         }
 
         while (iterator.hasNext()) {
-            RedisClusterNode slave = getRedisClusterNode(iterator, nodeCache);
-            if (slave != null) {
-                slave.setSlaveOf(master.getNodeId());
-                slave.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.SLAVE));
-                slaves.add(slave);
+            RedisClusterNode replica = getRedisClusterNode(iterator, nodeCache);
+            if (replica != null) {
+                replica.setSlaveOf(master.getNodeId());
+                replica.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.SLAVE));
+                replicas.add(replica);
             }
         }
 
-        return new ClusterSlotRange(from, to, master, Collections.unmodifiableList(slaves));
+        return new ClusterSlotRange(from, to, master, Collections.unmodifiableList(replicas));
     }
 
     private static List<Integer> createSlots(int from, int to) {
diff --git a/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java b/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java
index 686e7f4833..4b581375c7 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java
@@ -31,7 +31,7 @@
 public class RedisMasterInstance implements RedisInstance, Serializable {
 
     private long replicationOffset;
-    private List<ReplicationPartner> slaves = Collections.emptyList();
+    private List<ReplicationPartner> replicas = Collections.emptyList();
 
     public RedisMasterInstance() {
     }
@@ -40,12 +40,12 @@ public RedisMasterInstance() {
      * Constructs a {@link RedisMasterInstance}
      *
      * @param replicationOffset the replication offset
-     * @param slaves list of slaves, must not be {@literal null} but may be empty
+     * @param replicas list of replicas, must not be {@literal null} but may be empty
      */
-    public RedisMasterInstance(long replicationOffset, List<ReplicationPartner> slaves) {
-        LettuceAssert.notNull(slaves, "Slaves must not be null");
+    public RedisMasterInstance(long replicationOffset, List<ReplicationPartner> replicas) {
+        LettuceAssert.notNull(replicas, "Replicas must not be null");
         this.replicationOffset = replicationOffset;
-        this.slaves = slaves;
+        this.replicas = replicas;
     }
 
     /**
@@ -61,17 +61,27 @@ public long getReplicationOffset() {
         return replicationOffset;
     }
 
+    @Deprecated
     public List<ReplicationPartner> getSlaves() {
-        return slaves;
+        return getReplicas();
+    }
+
+    public List<ReplicationPartner> getReplicas() {
+        return replicas;
     }
 
     public void setReplicationOffset(long replicationOffset) {
         this.replicationOffset = replicationOffset;
     }
 
-    public void setSlaves(List<ReplicationPartner> slaves) {
-        LettuceAssert.notNull(slaves, "Slaves must not be null");
-        this.slaves = slaves;
+    @Deprecated
+    public void setSlaves(List<ReplicationPartner> replicas) {
+        setReplicas(replicas);
+    }
+
+    public void setReplicas(List<ReplicationPartner> replicas) {
+        LettuceAssert.notNull(replicas, "Replicas must not be null");
+        this.replicas = replicas;
     }
 
     @Override
@@ -79,7 +89,7 @@ public String toString() {
         final StringBuilder sb = new StringBuilder();
         sb.append(getClass().getSimpleName());
         sb.append(" [replicationOffset=").append(replicationOffset);
-        sb.append(", slaves=").append(slaves);
+        sb.append(", replicas=").append(replicas);
         sb.append(']');
         return sb.toString();
     }
diff --git a/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java b/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java
index 30c96a36ad..f8f27a2b18 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java
@@ -20,7 +20,7 @@
 import io.lettuce.core.internal.LettuceAssert;
 
 /**
- * Redis slave instance.
+ * Redis replica instance.
  *
  * @author Mark Paluch
  * @since 3.0
@@ -37,7 +37,7 @@ public RedisSlaveInstance() {
      * Constructs a {@link RedisSlaveInstance}
      *
      * @param master master for the replication, must not be {@literal null}
-     * @param state slave state, must not be {@literal null}
+     * @param state replica state, must not be {@literal null}
      */
     RedisSlaveInstance(ReplicationPartner master, State state) {
         LettuceAssert.notNull(master, "Master must not be null");
@@ -82,7 +82,7 @@ public void setState(State state) {
     }
 
     /**
-     * State of the slave.
+     * State of the Replica.
      */
     public enum State {
         /**
@@ -91,17 +91,17 @@ public enum State {
         CONNECT,
 
         /**
-         * the slave-master connection is in progress.
+         * the replica-master connection is in progress.
          */
         CONNECTING,
 
         /**
-         * the master and slave are trying to perform the synchronization.
+         * the master and replica are trying to perform the synchronization.
          */
         SYNC,
 
         /**
-         * the slave is online.
+         * the replica is online.
          */
         CONNECTED;
     }
diff --git a/src/main/java/io/lettuce/core/models/role/RoleParser.java b/src/main/java/io/lettuce/core/models/role/RoleParser.java
index c152159685..2895a654bc 100644
--- a/src/main/java/io/lettuce/core/models/role/RoleParser.java
+++ b/src/main/java/io/lettuce/core/models/role/RoleParser.java
@@ -39,14 +39,14 @@ public class RoleParser {
 
         ROLE_MAPPING = Collections.unmodifiableMap(roleMap);
 
-        Map<String, RedisSlaveInstance.State> slaveStateMap = new HashMap<>();
-        slaveStateMap.put("connect", RedisSlaveInstance.State.CONNECT);
-        slaveStateMap.put("connected", RedisSlaveInstance.State.CONNECTED);
-        slaveStateMap.put("connecting",
+        Map<String, RedisSlaveInstance.State> replicas = new HashMap<>();
+        replicas.put("connect", RedisSlaveInstance.State.CONNECT);
+        replicas.put("connected", RedisSlaveInstance.State.CONNECTED);
+        replicas.put("connecting",
             RedisSlaveInstance.State.CONNECTING);
-        slaveStateMap.put("sync", RedisSlaveInstance.State.SYNC);
+        replicas.put("sync", RedisSlaveInstance.State.SYNC);
 
-        SLAVE_STATE_MAPPING = Collections.unmodifiableMap(slaveStateMap);
+        SLAVE_STATE_MAPPING = Collections.unmodifiableMap(replicas);
     }
 
     /**
@@ -74,7 +74,7 @@ public static RedisInstance parse(List<?> roleOutput) {
                 return parseMaster(roleOutput);
 
             case SLAVE:
-                return parseSlave(roleOutput);
+                return parseReplica(roleOutput);
 
             case SENTINEL:
                 return parseSentinel(roleOutput);
@@ -87,14 +87,14 @@ public static RedisInstance parse(List<?> roleOutput) {
     private static RedisInstance parseMaster(List<?> roleOutput) {
 
         long replicationOffset = getMasterReplicationOffset(roleOutput);
-        List<ReplicationPartner> slaves = getMasterSlaveReplicationPartners(roleOutput);
+        List<ReplicationPartner> replicas = getMasterReplicaReplicationPartners(roleOutput);
 
         RedisMasterInstance redisMasterInstanceRole = new RedisMasterInstance(replicationOffset,
-                Collections.unmodifiableList(slaves));
+                Collections.unmodifiableList(replicas));
         return redisMasterInstanceRole;
     }
 
-    private static RedisInstance parseSlave(List<?> roleOutput) {
+    private static RedisInstance parseReplica(List<?> roleOutput) {
 
         Iterator<?> iterator = roleOutput.iterator();
         iterator.next(); // skip first element
@@ -146,25 +146,27 @@ private static List<String> getMonitoredMasters(Iterator<?> iterator) {
         return monitoredMasters;
     }
 
-    private static List<ReplicationPartner> getMasterSlaveReplicationPartners(List<?> roleOutput) {
-        List<ReplicationPartner> slaves = new ArrayList<>();
+    private static List<ReplicationPartner> getMasterReplicaReplicationPartners(List<?> roleOutput) {
+
+        List<ReplicationPartner> replicas = new ArrayList<>();
         if (roleOutput.size() > 2 && roleOutput.get(2) instanceof Collection) {
-            Collection<?> slavesOutput = (Collection<?>) roleOutput.get(2);
+            Collection<?> segments = (Collection<?>) roleOutput.get(2);
 
-            for (Object slaveOutput : slavesOutput) {
-                if (!(slaveOutput instanceof Collection<?>)) {
+            for (Object output : segments) {
+                if (!(output instanceof Collection<?>)) {
                     continue;
                 }
 
-                ReplicationPartner replicationPartner = getMasterSlaveReplicationPartner((Collection<?>) slaveOutput);
-                slaves.add(replicationPartner);
+                ReplicationPartner replicationPartner = getMasterSlaveReplicationPartner((Collection<?>) output);
+                replicas.add(replicationPartner);
             }
         }
-        return slaves;
+        return replicas;
     }
 
-    private static ReplicationPartner getMasterSlaveReplicationPartner(Collection<?> slaveOutput) {
-        Iterator<?> iterator = slaveOutput.iterator();
+    private static ReplicationPartner getMasterSlaveReplicationPartner(Collection<?> segments) {
+
+        Iterator<?> iterator = segments.iterator();
 
         String ip = getStringFromIterator(iterator, "");
         long port = getLongFromIterator(iterator, 0);
diff --git a/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java b/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
index e399e80b5f..534290b789 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
@@ -58,7 +58,7 @@ public interface RedisSentinelAsyncCommands<K, V> {
     RedisFuture<Map<K, V>> master(K key);
 
     /**
-     * Provides a list of slaves for the master with the specified name.
+     * Provides a list of replicas for the master with the specified name.
      *
      * @param key the key
      * @return List&lt;Map&lt;K, V&gt;&gt;
diff --git a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
index ef851da824..6ff7bcae02 100644
--- a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
@@ -175,7 +175,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Crash and recover
-     * 
+     *
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
@@ -220,7 +220,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Restart the server gracefully.
-     * 
+     *
      * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
@@ -286,7 +286,7 @@ public interface RedisServerCommands<K, V> {
 
     /**
      * Reports the number of bytes that a key and its value require to be stored in RAM.
-     * 
+     *
      * @return memory usage in bytes.
      * @since 5.2
      */
@@ -307,7 +307,7 @@ public interface RedisServerCommands<K, V> {
     void shutdown(boolean save);
 
     /**
-     * Make the server a slave of another instance, or promote it as master.
+     * Make the server a replica of another instance, or promote it as master.
      *
      * @param host the host type: string
      * @param port the port type: string
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
index 6632641b6b..ce7c4f56fc 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
@@ -166,12 +166,12 @@ void testClusterSlots() {
     @Test
     void readOnly() throws Exception {
 
-        // cluster node 3 is a slave for key "b"
+        // cluster node 3 is a replica for key "b"
         String key = "b";
         assertThat(SlotHash.getSlot(key)).isEqualTo(3300);
         prepareReadonlyTest(key);
 
-        // assume cluster node 3 is a slave for the master 1
+        // assume cluster node 3 is a replica for the master 1
         RedisCommands<String, String> connect3 = client
                 .connect(RedisURI.Builder.redis(host, ClusterTestSettings.port3).build()).sync();
 
@@ -189,12 +189,12 @@ void readOnly() throws Exception {
     @Test
     void readOnlyWithReconnect() throws Exception {
 
-        // cluster node 3 is a slave for key "b"
+        // cluster node 3 is a replica for key "b"
         String key = "b";
         assertThat(SlotHash.getSlot(key)).isEqualTo(3300);
         prepareReadonlyTest(key);
 
-        // assume cluster node 3 is a slave for the master 1
+        // assume cluster node 3 is a replica for the master 1
         RedisCommands<String, String> connect3 = client
                 .connect(RedisURI.Builder.redis(host, ClusterTestSettings.port3).build()).sync();
 
@@ -209,12 +209,12 @@ void readOnlyWithReconnect() throws Exception {
     @Test
     void readOnlyReadWrite() throws Exception {
 
-        // cluster node 3 is a slave for key "b"
+        // cluster node 3 is a replica for key "b"
         String key = "b";
         assertThat(SlotHash.getSlot(key)).isEqualTo(3300);
         prepareReadonlyTest(key);
 
-        // assume cluster node 3 is a slave for the master 1
+        // assume cluster node 3 is a replica for the master 1
         final RedisCommands<String, String> connect3 = client.connect(
                 RedisURI.Builder.redis(host, ClusterTestSettings.port3).build()).sync();
 
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterSetup.java b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
index 86b15ef433..ccc8600a2e 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
@@ -86,7 +86,7 @@ public static void setup2Masters(ClusterRule clusterRule) {
 
     /**
      * Setup a cluster consisting of two members (see {@link ClusterTestSettings#port5} to {@link ClusterTestSettings#port6}).
-     * One master (0-16383) and one slave.
+     * One master (0-16383) and one replica.
      *
      * @param clusterRule
      */
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java b/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java
index 269c6d47df..3c7d8c24cd 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java
@@ -34,7 +34,7 @@ public abstract class ClusterTestSettings extends TestSupport {
     public static final int port3 = port1 + 2;
     public static final int port4 = port1 + 3;
 
-    // master+slave or master+master
+    // master+replica or master+master
     public static final int port5 = port1 + 4;
     public static final int port6 = port1 + 5;
 
diff --git a/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java b/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
index 41f41fae78..b85d2b2283 100644
--- a/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
@@ -39,18 +39,18 @@ class ReadFromUnitTests {
     private Partitions sut = new Partitions();
     private RedisClusterNode nearest = new RedisClusterNode();
     private RedisClusterNode master = new RedisClusterNode();
-    private RedisClusterNode slave = new RedisClusterNode();
+    private RedisClusterNode replica = new RedisClusterNode();
 
     @BeforeEach
     void before() {
 
         master.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.MASTER));
         nearest.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.SLAVE));
-        slave.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.SLAVE));
+        replica.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.SLAVE));
 
         sut.addPartition(nearest);
         sut.addPartition(master);
-        sut.addPartition(slave);
+        sut.addPartition(replica);
     }
 
     @Test
@@ -62,25 +62,25 @@ void master() {
     @Test
     void masterPreferred() {
         List<RedisNodeDescription> result = ReadFrom.MASTER_PREFERRED.select(getNodes());
-        assertThat(result).hasSize(3).containsExactly(master, nearest, slave);
+        assertThat(result).hasSize(3).containsExactly(master, nearest, replica);
     }
 
     @Test
-    void slave() {
+    void replica() {
         List<RedisNodeDescription> result = ReadFrom.REPLICA.select(getNodes());
-        assertThat(result).hasSize(2).contains(nearest, slave);
+        assertThat(result).hasSize(2).contains(nearest, replica);
     }
 
     @Test
     void slavePreferred() {
         List<RedisNodeDescription> result = ReadFrom.REPLICA_PREFERRED.select(getNodes());
-        assertThat(result).hasSize(3).containsExactly(nearest, slave, master);
+        assertThat(result).hasSize(3).containsExactly(nearest, replica, master);
     }
 
     @Test
     void nearest() {
         List<RedisNodeDescription> result = ReadFrom.NEAREST.select(getNodes());
-        assertThat(result).hasSize(3).containsExactly(nearest, master, slave);
+        assertThat(result).hasSize(3).containsExactly(nearest, master, replica);
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java
index 4586fe665b..b437a064a1 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java
@@ -110,7 +110,7 @@ void nodeConnectionsShouldWork() {
 
         StatefulRedisClusterConnection<String, String> connection = redisClient.connect();
 
-        // slave
+        // replica
         StatefulRedisConnection<String, String> node2Connection = connection.getConnection(hostAddr(), 7444);
 
         try {
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
index c55a900258..87e09b10ba 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
@@ -55,7 +55,7 @@ class MasterSlaveTest extends AbstractRedisClientTest {
     private RedisAsyncCommands<String, String> connectionToNode2;
 
     private RedisURI master;
-    private RedisURI slave;
+    private RedisURI replica;
 
     @BeforeEach
     void before() throws Exception {
@@ -71,14 +71,14 @@ void before() throws Exception {
 
         if (node1Instance.getRole() == RedisInstance.Role.MASTER && node2Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node1;
-            slave = node2;
+            replica = node2;
         } else if (node2Instance.getRole() == RedisInstance.Role.MASTER
                 && node1Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node2;
-            slave = node1;
+            replica = node1;
         } else {
             assumeTrue(false, String.format(
-                    "Cannot run the test because I don't have a distinct master and slave but %s and %s", node1Instance,
+                    "Cannot run the test because I don't have a distinct master and replica but %s and %s", node1Instance,
                     node2Instance));
         }
 
@@ -136,7 +136,7 @@ void testMasterSlaveReadFromSlave() {
         Matcher matcher = pattern.matcher(server);
 
         assertThat(matcher.find()).isTrue();
-        assertThat(matcher.group(1)).isEqualTo("" + slave.getPort());
+        assertThat(matcher.group(1)).isEqualTo("" + replica.getPort());
         assertThat(connection.getReadFrom()).isEqualTo(ReadFrom.REPLICA);
     }
 
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java
index c932046b84..5d52de0917 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java
@@ -64,8 +64,8 @@ void shouldParseMasterAndSlave() {
         List<RedisNodeDescription> result = sut.getNodesFromInfo(info);
         assertThat(result).hasSize(2);
 
-        RedisNodeDescription slave = result.get(0);
-        assertThat(slave.getRole()).isEqualTo(RedisInstance.Role.SLAVE);
+        RedisNodeDescription replica = result.get(0);
+        assertThat(replica.getRole()).isEqualTo(RedisInstance.Role.SLAVE);
 
         RedisNodeDescription master = result.get(1);
         assertThat(master.getRole()).isEqualTo(RedisInstance.Role.MASTER);
@@ -81,8 +81,8 @@ void shouldParseMasterHostname() {
         List<RedisNodeDescription> result = sut.getNodesFromInfo(info);
         assertThat(result).hasSize(2);
 
-        RedisNodeDescription slave = result.get(0);
-        assertThat(slave.getRole()).isEqualTo(RedisInstance.Role.SLAVE);
+        RedisNodeDescription replica = result.get(0);
+        assertThat(replica.getRole()).isEqualTo(RedisInstance.Role.SLAVE);
 
         RedisNodeDescription master = result.get(1);
         assertThat(master.getRole()).isEqualTo(RedisInstance.Role.MASTER);
@@ -99,8 +99,8 @@ void shouldParseIPv6MasterAddress() {
         assertThat(result).hasSize(2);
 
 
-        RedisNodeDescription slave = result.get(0);
-        assertThat(slave.getRole()).isEqualTo(RedisInstance.Role.SLAVE);
+        RedisNodeDescription replica = result.get(0);
+        assertThat(replica.getRole()).isEqualTo(RedisInstance.Role.SLAVE);
 
         RedisNodeDescription master = result.get(1);
         assertThat(master.getRole()).isEqualTo(RedisInstance.Role.MASTER);
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java
index 929c5d2106..bf5beea296 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java
@@ -96,9 +96,9 @@ void shouldRetrieveTopology() {
         MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(connectionFactory, executorService, provider);
 
         CompletableFuture<StatefulRedisConnection<String, String>> master = CompletableFuture.completedFuture(connection);
-        CompletableFuture<StatefulRedisConnection<String, String>> slave = CompletableFuture.completedFuture(connection);
+        CompletableFuture<StatefulRedisConnection<String, String>> replica = CompletableFuture.completedFuture(connection);
         when(connectionFactory.connectToNodeAsync(any(), any())).thenReturn((CompletableFuture) master,
-                (CompletableFuture) slave);
+                (CompletableFuture) replica);
 
         RedisURI redisURI = new RedisURI();
         redisURI.setTimeout(Duration.ofMillis(1));
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java
index 67e6765289..ab91b8f78f 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java
@@ -34,7 +34,7 @@ void isChangedShouldReturnFalse() {
 
         RedisMasterSlaveNode master = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 111),
                 RedisInstance.Role.MASTER);
-        RedisMasterSlaveNode slave = new RedisMasterSlaveNode("host", 234, RedisURI.create("host", 234),
+        RedisMasterSlaveNode replica = new RedisMasterSlaveNode("host", 234, RedisURI.create("host", 234),
                 RedisInstance.Role.SLAVE);
 
         RedisMasterSlaveNode newmaster = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 555),
@@ -42,11 +42,11 @@ void isChangedShouldReturnFalse() {
         RedisMasterSlaveNode newslave = new RedisMasterSlaveNode("host", 234, RedisURI.create("host", 666),
                 RedisInstance.Role.SLAVE);
 
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, slave), Arrays.asList(newmaster, newslave))).isFalse();
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(slave, master), Arrays.asList(newmaster, newslave))).isFalse();
+        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, replica), Arrays.asList(newmaster, newslave))).isFalse();
+        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(replica, master), Arrays.asList(newmaster, newslave))).isFalse();
 
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(newmaster, newslave), Arrays.asList(master, slave))).isFalse();
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(newmaster, newslave), Arrays.asList(slave, master))).isFalse();
+        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(newmaster, newslave), Arrays.asList(master, replica))).isFalse();
+        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(newmaster, newslave), Arrays.asList(replica, master))).isFalse();
     }
 
     @Test
@@ -54,13 +54,13 @@ void isChangedShouldReturnTrueBecauseSlaveIsGone() {
 
         RedisMasterSlaveNode master = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 111),
                 RedisInstance.Role.MASTER);
-        RedisMasterSlaveNode slave = new RedisMasterSlaveNode("host", 234, RedisURI.create("host", 234),
+        RedisMasterSlaveNode replica = new RedisMasterSlaveNode("host", 234, RedisURI.create("host", 234),
                 RedisInstance.Role.MASTER);
 
         RedisMasterSlaveNode newmaster = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 111),
                 RedisInstance.Role.MASTER);
 
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, slave), Arrays.asList(newmaster))).isTrue();
+        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, replica), Arrays.asList(newmaster))).isTrue();
     }
 
     @Test
@@ -68,7 +68,7 @@ void isChangedShouldReturnTrueBecauseHostWasMigrated() {
 
         RedisMasterSlaveNode master = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 111),
                 RedisInstance.Role.MASTER);
-        RedisMasterSlaveNode slave = new RedisMasterSlaveNode("host", 234, RedisURI.create("host", 234),
+        RedisMasterSlaveNode replica = new RedisMasterSlaveNode("host", 234, RedisURI.create("host", 234),
                 RedisInstance.Role.SLAVE);
 
         RedisMasterSlaveNode newmaster = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 555),
@@ -76,10 +76,10 @@ void isChangedShouldReturnTrueBecauseHostWasMigrated() {
         RedisMasterSlaveNode newslave = new RedisMasterSlaveNode("newhost", 234, RedisURI.create("newhost", 666),
                 RedisInstance.Role.SLAVE);
 
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, slave), Arrays.asList(newmaster, newslave))).isTrue();
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(slave, master), Arrays.asList(newmaster, newslave))).isTrue();
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(newmaster, newslave), Arrays.asList(master, slave))).isTrue();
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(newslave, newmaster), Arrays.asList(master, slave))).isTrue();
+        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, replica), Arrays.asList(newmaster, newslave))).isTrue();
+        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(replica, master), Arrays.asList(newmaster, newslave))).isTrue();
+        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(newmaster, newslave), Arrays.asList(master, replica))).isTrue();
+        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(newslave, newmaster), Arrays.asList(master, replica))).isTrue();
     }
 
     @Test
@@ -87,7 +87,7 @@ void isChangedShouldReturnTrueBecauseRolesSwitched() {
 
         RedisMasterSlaveNode master = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 111),
                 RedisInstance.Role.MASTER);
-        RedisMasterSlaveNode slave = new RedisMasterSlaveNode("host", 234, RedisURI.create("host", 234),
+        RedisMasterSlaveNode replica = new RedisMasterSlaveNode("host", 234, RedisURI.create("host", 234),
                 RedisInstance.Role.MASTER);
 
         RedisMasterSlaveNode newslave = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 111),
@@ -95,7 +95,7 @@ void isChangedShouldReturnTrueBecauseRolesSwitched() {
         RedisMasterSlaveNode newmaster = new RedisMasterSlaveNode("host", 234, RedisURI.create("host", 234),
                 RedisInstance.Role.MASTER);
 
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, slave), Arrays.asList(newmaster, newslave))).isTrue();
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, slave), Arrays.asList(newslave, newmaster))).isTrue();
+        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, replica), Arrays.asList(newmaster, newslave))).isTrue();
+        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, replica), Arrays.asList(newslave, newmaster))).isTrue();
     }
 }
diff --git a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java
index 4620823951..29c4e5880c 100644
--- a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java
@@ -243,7 +243,7 @@ void shouldProcessSlaveDown() {
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
 
-        adapter.message("*", "+sdown", "slave 127.0.0.1:6483 127.0.0.1 6483 @ mymaster 127.0.0.1 6482");
+        adapter.message("*", "+sdown", "replica 127.0.0.1:6483 127.0.0.1 6483 @ mymaster 127.0.0.1 6482");
 
         verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
         captor.getValue().run();
@@ -256,7 +256,7 @@ void shouldProcessSlaveAdded() {
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
 
-        adapter.message("*", "+slave", "slave 127.0.0.1:8483 127.0.0.1 8483 @ mymaster 127.0.0.1 6482");
+        adapter.message("*", "+slave", "replica 127.0.0.1:8483 127.0.0.1 8483 @ mymaster 127.0.0.1 6482");
 
         verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
         captor.getValue().run();
@@ -269,7 +269,7 @@ void shouldProcessSlaveBackUp() {
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
 
-        adapter.message("*", "-sdown", "slave 127.0.0.1:6483 127.0.0.1 6483 @ mymaster 127.0.0.1 6482");
+        adapter.message("*", "-sdown", "replica 127.0.0.1:6483 127.0.0.1 6483 @ mymaster 127.0.0.1 6482");
 
         verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
         captor.getValue().run();
diff --git a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
index 42d87bdda0..4d70f5308d 100644
--- a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
@@ -48,7 +48,7 @@ class StaticMasterSlaveTest extends AbstractRedisClientTest {
     private StatefulRedisMasterSlaveConnectionImpl<String, String> connection;
 
     private RedisURI master;
-    private RedisURI slave;
+    private RedisURI replica;
 
     private RedisAsyncCommands<String, String> connectionToNode1;
     private RedisAsyncCommands<String, String> connectionToNode2;
@@ -67,14 +67,14 @@ void before() throws Exception {
 
         if (node1Instance.getRole() == RedisInstance.Role.MASTER && node2Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node1;
-            slave = node2;
+            replica = node2;
         } else if (node2Instance.getRole() == RedisInstance.Role.MASTER
                 && node1Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node2;
-            slave = node1;
+            replica = node1;
         } else {
             assumeTrue(false, String.format(
-                    "Cannot run the test because I don't have a distinct master and slave but %s and %s", node1Instance,
+                    "Cannot run the test because I don't have a distinct master and replica but %s and %s", node1Instance,
                     node2Instance));
         }
 
@@ -90,7 +90,7 @@ void before() throws Exception {
         node2.setPassword(passwd);
 
         connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, new Utf8StringCodec(),
-                Arrays.asList(master, slave));
+                Arrays.asList(master, replica));
         connection.setReadFrom(ReadFrom.REPLICA);
     }
 
@@ -167,7 +167,7 @@ void shouldWorkWithSlaveOnly() {
         connection.close();
 
         connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, new Utf8StringCodec(),
-                Arrays.asList(slave));
+                Arrays.asList(replica));
         connection.setReadFrom(ReadFrom.MASTER_PREFERRED);
 
         assertThat(connection.sync().info()).isNotEmpty();
@@ -179,7 +179,7 @@ void noMasterForWrite() {
         connection.close();
 
         connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, new Utf8StringCodec(),
-                Arrays.asList(slave));
+                Arrays.asList(replica));
 
         assertThatThrownBy(() -> connection.sync().set(key, value)).isInstanceOf(RedisException.class);
     }

From d6cab2d8e123c581a4cfa63a32058e539fce524d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 18 Jan 2019 16:47:30 +0100
Subject: [PATCH 588/808] Upgrade to stunnel 5.50 #968

---
 .travis.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0cbfe0bb6d..22fbb08473 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,10 +16,10 @@ env:
 sudo: false
 
 before_install:
-  - if [[ ! -f stunnel.tar.gz ]]; then wget -O stunnel.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.33.tar.gz; fi
-  - if [[ ! -f ./stunnel-5.33/configure ]]; then tar -xzf stunnel.tar.gz; fi
-  - if [[ ! -f ./stunnel-5.33/src/stunnel ]]; then cd ./stunnel-5.33; ./configure; make; cd ..; fi
-  - export PATH="$PATH:$(pwd)/stunnel-5.33/src"
+  - if [[ ! -f downloads/stunnel-5.50.tar.gz ]]; then wget -O downloads/stunnel-5.50.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.50.tar.gz; fi
+  - if [[ ! -f ./stunnel-5.50/configure ]]; then tar -xzf downloads/stunnel-5.50.tar.gz; fi
+  - if [[ ! -f ./stunnel-5.50/src/stunnel ]]; then cd ./stunnel-5.50; ./configure; make; cd ..; fi
+  - export PATH="$PATH:$(pwd)/stunnel-5.50/src"
 
 install: make prepare ssl-keys
 
@@ -31,7 +31,8 @@ after_success:
 cache:
   directories:
     - '$HOME/.m2/repository'
-    - '$TRAVIS_BUILD_DIR/stunnel-5.33'
+    - '$TRAVIS_BUILD_DIR/downloads'
+    - '$TRAVIS_BUILD_DIR/stunnel-5.50'
 
 notifications:
   webhooks:

From 9cb5082f6c350c3f151015e3eaf79e45bd6e9f8c Mon Sep 17 00:00:00 2001
From: Tom Wieczorek <twz123@users.noreply.github.com>
Date: Tue, 22 Jan 2019 08:45:05 +0100
Subject: [PATCH 589/808] Fix typo in log message #970

---
 .../core/masterslave/StaticMasterSlaveTopologyProvider.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
index 5c004f894e..26aefc530e 100644
--- a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
@@ -87,7 +87,7 @@ public CompletableFuture<List<RedisNodeDescription>> getNodesAsync() {
 
                             if (nodeDescriptions.isEmpty()) {
                                 return Mono.error(new RedisConnectionException(String.format(
-                                        "Failed to connect to at leas one node in %s", redisURIs)));
+                                        "Failed to connect to at least one node in %s", redisURIs)));
                             }
 
                             return Mono.just(nodeDescriptions);

From 83a5afc9297e619186bc3cdc0383ac43ea3d24ec Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 28 Jan 2019 10:35:35 +0100
Subject: [PATCH 590/808] Fix snapshot version #843

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 686c07e595..973e29ddec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.2.0.gh-834-SNAPSHOT</version>
+    <version>5.2.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>

From 61f2ea363bbc5da8d6b2c5d331f8d98bed82cc75 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 28 Jan 2019 11:10:38 +0100
Subject: [PATCH 591/808] Do not require CLIENT LIST in cluster topology
 refresh #973

Topology refresh now no longer requires a successful completion of CLIENT LIST during the refresh. Errors can happen if the command is disabled.

Previously, an entire cluster node was disabled if the client list could not be retrieved and so the node was not considered in the routing table. Ignoring failed CLIENT LIST commands disables default connection load balancing that helped previously to use the cluster node with the least number of connections.
---
 .../core/cluster/topology/NodeTopologyView.java      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
index 0fd96926f9..20b07f67c4 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
@@ -56,7 +56,7 @@ class NodeTopologyView {
         this.redisURI = redisURI;
 
         this.partitions = ClusterPartitionParser.parse(clusterNodes);
-        this.connectedClients = getClients(clientList);
+        this.connectedClients = clientList != null ? getClients(clientList) : 0;
         this.clusterNodes = clusterNodes;
         this.clientList = clientList;
         this.latency = latency;
@@ -69,11 +69,19 @@ static NodeTopologyView from(RedisURI redisURI, Requests clusterNodesRequests, R
         TimedAsyncCommand<String, String, String> clients = clientListRequests.getRequest(redisURI);
 
         if (resultAvailable(nodes) && resultAvailable(clients)) {
-            return new NodeTopologyView(redisURI, nodes.get(), clients.get(), nodes.duration());
+            return new NodeTopologyView(redisURI, nodes.get(), optionallyGet(clients), nodes.duration());
         }
         return new NodeTopologyView(redisURI);
     }
 
+    private static <T> T optionallyGet(TimedAsyncCommand<?, ?, T> command) throws ExecutionException, InterruptedException {
+
+        if (command.isCompletedExceptionally()) {
+            return null;
+        }
+        return command.get();
+    }
+
     static boolean resultAvailable(RedisFuture<?> redisFuture) {
 
         if (redisFuture != null && redisFuture.isDone() && !redisFuture.isCancelled()) {

From e9fc0a345207e859328f651bef876234c839d4e1 Mon Sep 17 00:00:00 2001
From: Pine Mizune <pinemz@gmail.com>
Date: Wed, 6 Feb 2019 17:21:00 +0900
Subject: [PATCH 592/808] Update readme to reflect the current reactive API
 #974

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index e52a7b78c4..4bf16ad37d 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Supports advanced Redis features such as Sentinel, Cluster, Pipelining, Auto-Rec
 
 This version of Lettuce has been tested against the latest Redis source-build.
 
-* [synchronous](https://github.com/lettuce-io/lettuce-core/wiki/Basic-usage), [asynchronous](https://github.com/lettuce-io/lettuce-core/wiki/Asynchronous-API-%284.0%29) and [reactive](https://github.com/lettuce-io/lettuce-core/wiki/Reactive-API-%284.0%29) usage
+* [synchronous](https://github.com/lettuce-io/lettuce-core/wiki/Basic-usage), [asynchronous](https://github.com/lettuce-io/lettuce-core/wiki/Asynchronous-API-%284.0%29) and [reactive](https://github.com/lettuce-io/lettuce-core/wiki/Reactive-API-%285.0%29) usage
 * [Redis Sentinel](https://github.com/lettuce-io/lettuce-core/wiki/Redis-Sentinel)
 * [Redis Cluster](https://github.com/lettuce-io/lettuce-core/wiki/Redis-Cluster)
 * [SSL](https://github.com/lettuce-io/lettuce-core/wiki/SSL-Connections) and [Unix Domain Socket](https://github.com/lettuce-io/lettuce-core/wiki/Unix-Domain-Sockets) connections
@@ -121,15 +121,15 @@ Reactive API
 ```java
 StatefulRedisConnection<String, String> connection = client.connect();
 RedisStringReactiveCommands<String, String> reactive = connection.reactive();
-Observable<String> set = reactive.set("key", "value")
-Observable<String> get = reactive.get("key")
+Mono<String> set = reactive.set("key", "value");
+Mono<String> get = reactive.get("key");
 
 set.subscribe();
 
-get.toBlocking().single() == "value"
+get.block() == "value"
 ```
 
-See [Reactive API](https://github.com/lettuce-io/lettuce-core/wiki/Reactive-API-%284.0%29) for further details.
+See [Reactive API](https://github.com/lettuce-io/lettuce-core/wiki/Reactive-API-%285.0%29) for further details.
 
 Pub/Sub
 -------

From 34406283694acc997c9a4324cac38cf0aed4add5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 7 Feb 2019 13:46:25 +0100
Subject: [PATCH 593/808] Upgrade to Maven Javadoc Plugin 3.1.0-SNAPSHOT #942

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 973e29ddec..f504a33e37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -436,7 +436,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.0.2-SNAPSHOT</version>
+                        <version>3.1.0-SNAPSHOT</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>

From 52ee0dca68fb9bcd011c1574e3ea0150ca350eb6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 7 Feb 2019 14:33:55 +0100
Subject: [PATCH 594/808] Align replica wording in Redis Cluster components
 #845

Adapt replica wording by introducing replacement methods and deprecate existing ones. Update javadoc and test method names.
---
 .../core/cluster/PartitionAccessor.java       |  4 +-
 .../core/cluster/ReadOnlyCommands.java        |  2 +-
 .../NodeSelectionServerAsyncCommands.java     |  2 +-
 .../RedisAdvancedClusterAsyncCommands.java    | 48 ++++++++++++++-----
 .../api/async/RedisClusterAsyncCommands.java  | 16 +++----
 .../RedisClusterReactiveCommands.java         | 16 +++----
 .../api/sync/NodeSelectionServerCommands.java |  2 +-
 .../sync/RedisAdvancedClusterCommands.java    | 45 +++++++++++++----
 .../api/sync/RedisClusterCommands.java        | 16 +++----
 .../partitions/ClusterPartitionParser.java    | 17 ++++---
 .../cluster/models/partitions/Partitions.java |  2 +-
 .../models/partitions/RedisClusterNode.java   |  6 +--
 .../models/slots/ClusterSlotRange.java        | 28 +++++++----
 .../StatefulRedisClusterPubSubConnection.java |  2 +-
 .../RedisClusterPubSubAsyncCommands.java      | 38 ++++++++++++---
 .../RedisClusterPubSubReactiveCommands.java   | 38 ++++++++++++---
 .../api/sync/RedisClusterPubSubCommands.java  | 38 ++++++++++++---
 .../masterslave/AutodiscoveryConnector.java   |  2 +-
 .../lettuce/core/masterslave/MasterSlave.java |  6 +--
 .../MasterSlaveTopologyRefresh.java           |  2 +-
 .../RedisSentinelReactiveCommands.java        |  2 +-
 .../api/sync/RedisSentinelCommands.java       |  2 +-
 .../core/api/RedisSentinelCommands.java       |  2 +-
 ...vancedClusterReactiveIntegrationTests.java |  2 +-
 .../ClusterCommandIntegrationTests.java       | 14 +++---
 .../io/lettuce/core/cluster/ClusterSetup.java | 13 +----
 .../NodeSelectionAsyncIntegrationTests.java   | 12 ++---
 .../NodeSelectionSyncIntegrationTests.java    |  2 +-
 .../core/cluster/ReadFromUnitTests.java       |  2 +-
 .../RedisClusterReadFromIntegrationTests.java |  4 +-
 .../core/cluster/RedisClusterSetupTest.java   |  2 +-
 .../RedisClusterStressScenariosTest.java      |  2 +-
 .../slots/ClusterSlotsParserUnitTests.java    | 10 ++--
 .../TopologyComparatorsUnitTests.java         |  4 +-
 34 files changed, 269 insertions(+), 134 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java b/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java
index 4fe5f29bbe..6fe05da97c 100644
--- a/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java
@@ -39,12 +39,12 @@ List<RedisClusterNode> getMasters() {
         return get(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.MASTER));
     }
 
-    List<RedisClusterNode> getSlaves() {
+    List<RedisClusterNode> getReplicas() {
         return get(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
 
     }
 
-    List<RedisClusterNode> getSlaves(RedisClusterNode master) {
+    List<RedisClusterNode> getReplicas(RedisClusterNode master) {
         return get(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE)
                 && master.getNodeId().equals(redisClusterNode.getSlaveOf()));
     }
diff --git a/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
index eec26f6fe3..bbd7c57034 100644
--- a/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
@@ -62,7 +62,7 @@ enum CommandName {
         SUNION, TIME, TTL, TYPE, ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE, //
         ZRANGEBYLEX, ZRANGEBYSCORE, ZRANK, ZREVRANGE, ZREVRANGEBYLEX, ZREVRANGEBYSCORE, ZREVRANK, ZSCAN, ZSCORE, //
 
-        // Pub/Sub commands are no key-space commands so they are safe to execute on slave nodes
+        // Pub/Sub commands are no key-space commands so they are safe to execute on replica nodes
         PUBLISH, PUBSUB, PSUBSCRIBE, PUNSUBSCRIBE, SUBSCRIBE, UNSUBSCRIBE
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
index 61365639f9..0c3a6d6ccb 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
@@ -287,7 +287,7 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
     AsyncExecutions<String> save();
 
     /**
-     * Make the server a slave of another instance, or promote it as master.
+     * Make the server a replica of another instance, or promote it as master.
      *
      * @param host the host type: string
      * @param port the port type: string
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
index 6b5905ea64..dd70d9f22b 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
@@ -36,8 +36,7 @@
  * @author Mark Paluch
  * @since 4.0
  */
-public interface RedisAdvancedClusterAsyncCommands<K, V>
-        extends RedisClusterAsyncCommands<K, V> {
+public interface RedisAdvancedClusterAsyncCommands<K, V> extends RedisClusterAsyncCommands<K, V> {
 
     /**
      * Retrieve a connection to the specified cluster node using the nodeId. Host and port are looked up in the node list.
@@ -77,23 +76,49 @@ default AsyncNodeSelection<K, V> masters() {
     }
 
     /**
-     * Select all slaves.
+     * Select all replicas.
      *
-     * @return API with asynchronous executed commands on a selection of slave cluster nodes.
+     * @return API with asynchronous executed commands on a selection of replica cluster nodes.
+     * @deprecated since 5.2, use {@link #replicas()}
      */
+    @Deprecated
     default AsyncNodeSelection<K, V> slaves() {
         return readonly(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
     }
 
     /**
-     * Select all slaves.
+     * Select all replicas.
      *
      * @param predicate Predicate to filter nodes
-     * @return API with asynchronous executed commands on a selection of slave cluster nodes.
+     * @return API with asynchronous executed commands on a selection of replica cluster nodes.
+     * @deprecated use {@link #replicas(Predicate)}
      */
+    @Deprecated
     default AsyncNodeSelection<K, V> slaves(Predicate<RedisClusterNode> predicate) {
-        return readonly(
-                redisClusterNode -> predicate.test(redisClusterNode) && redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+        return readonly(redisClusterNode -> predicate.test(redisClusterNode)
+                && redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+    }
+
+    /**
+     * Select all replicas.
+     *
+     * @return API with asynchronous executed commands on a selection of replica cluster nodes.
+     * @since 5.2
+     */
+    default AsyncNodeSelection<K, V> replicas() {
+        return readonly(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.REPLICA));
+    }
+
+    /**
+     * Select all replicas.
+     *
+     * @param predicate Predicate to filter nodes
+     * @return API with asynchronous executed commands on a selection of replica cluster nodes.
+     * @since 5.2
+     */
+    default AsyncNodeSelection<K, V> replicas(Predicate<RedisClusterNode> predicate) {
+        return readonly(redisClusterNode -> predicate.test(redisClusterNode)
+                && redisClusterNode.is(RedisClusterNode.NodeFlag.REPLICA));
     }
 
     /**
@@ -106,8 +131,8 @@ default AsyncNodeSelection<K, V> all() {
     }
 
     /**
-     * Select slave nodes by a predicate and keeps a static selection. Slave connections operate in {@literal READONLY} mode.
-     * The set of nodes within the {@link NodeSelectionSupport} does not change when the cluster view changes.
+     * Select replica nodes by a predicate and keeps a static selection. Replica connections operate in {@literal READONLY}
+     * mode. The set of nodes within the {@link NodeSelectionSupport} does not change when the cluster view changes.
      *
      * @param predicate Predicate to filter nodes
      * @return API with asynchronous executed commands on a selection of cluster nodes matching {@code predicate}
@@ -152,7 +177,8 @@ default AsyncNodeSelection<K, V> all() {
     RedisFuture<Long> unlink(K... keys);
 
     /**
-     * Determine how many keys exist with pipelining. Cross-slot keys will result in multiple calls to the particular cluster nodes.
+     * Determine how many keys exist with pipelining. Cross-slot keys will result in multiple calls to the particular cluster
+     * nodes.
      *
      * @param keys the keys
      * @return Long integer-reply specifically: Number of existing keys
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
index 9a8ce99738..b1dffd5123 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
@@ -166,12 +166,12 @@ public interface RedisClusterAsyncCommands<K, V> extends BaseRedisAsyncCommands<
     RedisFuture<String> clusterNodes();
 
     /**
-     * List slaves for a certain node identified by its {@code nodeId}. Can be parsed using
+     * List replicas for a certain node identified by its {@code nodeId}. Can be parsed using
      * {@link io.lettuce.core.cluster.models.partitions.ClusterPartitionParser#parse}
      *
      * @param nodeId node id of the master node
-     * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as
-     *         {@link #clusterNodes()} but one line per slave.
+     * @return List&lt;String&gt; array-reply list of replicas. The command returns data in the same format as
+     *         {@link #clusterNodes()} but one line per replica.
      */
     RedisFuture<List<String>> clusterSlaves(String nodeId);
 
@@ -247,7 +247,7 @@ public interface RedisClusterAsyncCommands<K, V> extends BaseRedisAsyncCommands<
     RedisFuture<String> asking();
 
     /**
-     * Turn this node into a slave of the node with the id {@code nodeId}.
+     * Turn this node into a replica of the node with the id {@code nodeId}.
      *
      * @param nodeId master node id
      * @return String simple-string-reply
@@ -255,7 +255,7 @@ public interface RedisClusterAsyncCommands<K, V> extends BaseRedisAsyncCommands<
     RedisFuture<String> clusterReplicate(String nodeId);
 
     /**
-     * Failover a cluster node. Turns the currently connected node into a master and the master into its slave.
+     * Failover a cluster node. Turns the currently connected node into a master and the master into its replica.
      *
      * @param force do not coordinate with master if {@literal true}
      * @return String simple-string-reply
@@ -267,11 +267,11 @@ public interface RedisClusterAsyncCommands<K, V> extends BaseRedisAsyncCommands<
      * <ul>
      * <li>All other nodes are forgotten</li>
      * <li>All the assigned / open slots are released</li>
-     * <li>If the node is a slave, it turns into a master</li>
+     * <li>If the node is a replica, it turns into a master</li>
      * <li>Only for hard reset: a new Node ID is generated</li>
      * <li>Only for hard reset: currentEpoch and configEpoch are set to 0</li>
      * <li>The new configuration is saved and the cluster state updated</li>
-     * <li>If the node was a slave, the whole data set is flushed away</li>
+     * <li>If the node was a replica, the whole data set is flushed away</li>
      * </ul>
      *
      * @param hard {@literal true} for hard reset. Generates a new nodeId and currentEpoch/configEpoch are set to 0
@@ -287,7 +287,7 @@ public interface RedisClusterAsyncCommands<K, V> extends BaseRedisAsyncCommands<
     RedisFuture<String> clusterFlushslots();
 
     /**
-     * Tells a Redis cluster slave node that the client is ok reading possibly stale data and is not interested in running write
+     * Tells a Redis cluster replica node that the client is ok reading possibly stale data and is not interested in running write
      * queries.
      *
      * @return String simple-string-reply
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
index 4357f42624..f742c0aabb 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
@@ -167,12 +167,12 @@ public interface RedisClusterReactiveCommands<K, V> extends BaseRedisReactiveCom
     Mono<String> clusterNodes();
 
     /**
-     * List slaves for a certain node identified by its {@code nodeId}. Can be parsed using
+     * List replicas for a certain node identified by its {@code nodeId}. Can be parsed using
      * {@link io.lettuce.core.cluster.models.partitions.ClusterPartitionParser#parse}
      *
      * @param nodeId node id of the master node
-     * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as
-     *         {@link #clusterNodes()} but one line per slave.
+     * @return List&lt;String&gt; array-reply list of replicas. The command returns data in the same format as
+     *         {@link #clusterNodes()} but one line per replica.
      */
     Flux<String> clusterSlaves(String nodeId);
 
@@ -248,7 +248,7 @@ public interface RedisClusterReactiveCommands<K, V> extends BaseRedisReactiveCom
     Mono<String> asking();
 
     /**
-     * Turn this node into a slave of the node with the id {@code nodeId}.
+     * Turn this node into a replica of the node with the id {@code nodeId}.
      *
      * @param nodeId master node id
      * @return String simple-string-reply
@@ -256,7 +256,7 @@ public interface RedisClusterReactiveCommands<K, V> extends BaseRedisReactiveCom
     Mono<String> clusterReplicate(String nodeId);
 
     /**
-     * Failover a cluster node. Turns the currently connected node into a master and the master into its slave.
+     * Failover a cluster node. Turns the currently connected node into a master and the master into its replica.
      *
      * @param force do not coordinate with master if {@literal true}
      * @return String simple-string-reply
@@ -268,11 +268,11 @@ public interface RedisClusterReactiveCommands<K, V> extends BaseRedisReactiveCom
      * <ul>
      * <li>All other nodes are forgotten</li>
      * <li>All the assigned / open slots are released</li>
-     * <li>If the node is a slave, it turns into a master</li>
+     * <li>If the node is a replica, it turns into a master</li>
      * <li>Only for hard reset: a new Node ID is generated</li>
      * <li>Only for hard reset: currentEpoch and configEpoch are set to 0</li>
      * <li>The new configuration is saved and the cluster state updated</li>
-     * <li>If the node was a slave, the whole data set is flushed away</li>
+     * <li>If the node was a replica, the whole data set is flushed away</li>
      * </ul>
      *
      * @param hard {@literal true} for hard reset. Generates a new nodeId and currentEpoch/configEpoch are set to 0
@@ -288,7 +288,7 @@ public interface RedisClusterReactiveCommands<K, V> extends BaseRedisReactiveCom
     Mono<String> clusterFlushslots();
 
     /**
-     * Tells a Redis cluster slave node that the client is ok reading possibly stale data and is not interested in running write
+     * Tells a Redis cluster replica node that the client is ok reading possibly stale data and is not interested in running write
      * queries.
      *
      * @return String simple-string-reply
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
index 34c03ab1bc..7a7017dac6 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
@@ -287,7 +287,7 @@ public interface NodeSelectionServerCommands<K, V> {
     Executions<String> save();
 
     /**
-     * Make the server a slave of another instance, or promote it as master.
+     * Make the server a replica of another instance, or promote it as master.
      *
      * @param host the host type: string
      * @param port the port type: string
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
index a7842f4545..e7bebd2ae8 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
@@ -74,23 +74,49 @@ default NodeSelection<K, V> masters() {
     }
 
     /**
-     * Select all slaves.
+     * Select all replicas.
      *
-     * @return API with synchronous executed commands on a selection of slave cluster nodes.
+     * @return API with synchronous executed commands on a selection of replica cluster nodes.
+     * @deprecated since 5.2, use {@link #replicas()}
      */
+    @Deprecated
     default NodeSelection<K, V> slaves() {
         return readonly(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
     }
 
     /**
-     * Select all slaves.
+     * Select all replicas.
      *
      * @param predicate Predicate to filter nodes
-     * @return API with synchronous executed commands on a selection of slave cluster nodes.
+     * @return API with synchronous executed commands on a selection of replica cluster nodes.
+     * @deprecated since 5.2, use {@link #replicas(Predicate)}
      */
+    @Deprecated
     default NodeSelection<K, V> slaves(Predicate<RedisClusterNode> predicate) {
-        return readonly(
-                redisClusterNode -> predicate.test(redisClusterNode) && redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+        return readonly(redisClusterNode -> predicate.test(redisClusterNode)
+                && redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+    }
+
+    /**
+     * Select all replicas.
+     *
+     * @return API with synchronous executed commands on a selection of replica cluster nodes.
+     * @since 5.2
+     */
+    default NodeSelection<K, V> replicas() {
+        return readonly(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.REPLICA));
+    }
+
+    /**
+     * Select all replicas.
+     *
+     * @param predicate Predicate to filter nodes
+     * @return API with synchronous executed commands on a selection of replica cluster nodes.
+     * @since 5.2
+     */
+    default NodeSelection<K, V> replicas(Predicate<RedisClusterNode> predicate) {
+        return readonly(redisClusterNode -> predicate.test(redisClusterNode)
+                && redisClusterNode.is(RedisClusterNode.NodeFlag.REPLICA));
     }
 
     /**
@@ -103,8 +129,8 @@ default NodeSelection<K, V> all() {
     }
 
     /**
-     * Select slave nodes by a predicate and keeps a static selection. Slave connections operate in {@literal READONLY} mode.
-     * The set of nodes within the {@link NodeSelectionSupport} does not change when the cluster view changes.
+     * Select replica nodes by a predicate and keeps a static selection. Replica connections operate in {@literal READONLY}
+     * mode. The set of nodes within the {@link NodeSelectionSupport} does not change when the cluster view changes.
      *
      * @param predicate Predicate to filter nodes
      * @return API with synchronous executed commands on a selection of cluster nodes matching {@code predicate}
@@ -149,7 +175,8 @@ default NodeSelection<K, V> all() {
     Long unlink(K... keys);
 
     /**
-     * Determine how many keys exist with pipelining. Cross-slot keys will result in multiple calls to the particular cluster nodes.
+     * Determine how many keys exist with pipelining. Cross-slot keys will result in multiple calls to the particular cluster
+     * nodes.
      *
      * @param keys the keys
      * @return Long integer-reply specifically: Number of existing keys
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
index 6a48668804..cebceaedd7 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
@@ -163,12 +163,12 @@ public interface RedisClusterCommands<K, V> extends BaseRedisCommands<K, V>, Red
     String clusterNodes();
 
     /**
-     * List slaves for a certain node identified by its {@code nodeId}. Can be parsed using
+     * List replicas for a certain node identified by its {@code nodeId}. Can be parsed using
      * {@link io.lettuce.core.cluster.models.partitions.ClusterPartitionParser#parse}
      *
      * @param nodeId node id of the master node
-     * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as
-     *         {@link #clusterNodes()} but one line per slave.
+     * @return List&lt;String&gt; array-reply list of replicas. The command returns data in the same format as
+     *         {@link #clusterNodes()} but one line per replica.
      */
     List<String> clusterSlaves(String nodeId);
 
@@ -244,7 +244,7 @@ public interface RedisClusterCommands<K, V> extends BaseRedisCommands<K, V>, Red
     String asking();
 
     /**
-     * Turn this node into a slave of the node with the id {@code nodeId}.
+     * Turn this node into a replica of the node with the id {@code nodeId}.
      *
      * @param nodeId master node id
      * @return String simple-string-reply
@@ -252,7 +252,7 @@ public interface RedisClusterCommands<K, V> extends BaseRedisCommands<K, V>, Red
     String clusterReplicate(String nodeId);
 
     /**
-     * Failover a cluster node. Turns the currently connected node into a master and the master into its slave.
+     * Failover a cluster node. Turns the currently connected node into a master and the master into its replica.
      *
      * @param force do not coordinate with master if {@literal true}
      * @return String simple-string-reply
@@ -264,11 +264,11 @@ public interface RedisClusterCommands<K, V> extends BaseRedisCommands<K, V>, Red
      * <ul>
      * <li>All other nodes are forgotten</li>
      * <li>All the assigned / open slots are released</li>
-     * <li>If the node is a slave, it turns into a master</li>
+     * <li>If the node is a replica, it turns into a master</li>
      * <li>Only for hard reset: a new Node ID is generated</li>
      * <li>Only for hard reset: currentEpoch and configEpoch are set to 0</li>
      * <li>The new configuration is saved and the cluster state updated</li>
-     * <li>If the node was a slave, the whole data set is flushed away</li>
+     * <li>If the node was a replica, the whole data set is flushed away</li>
      * </ul>
      *
      * @param hard {@literal true} for hard reset. Generates a new nodeId and currentEpoch/configEpoch are set to 0
@@ -284,7 +284,7 @@ public interface RedisClusterCommands<K, V> extends BaseRedisCommands<K, V>, Red
     String clusterFlushslots();
 
     /**
-     * Tells a Redis cluster slave node that the client is ok reading possibly stale data and is not interested in running write
+     * Tells a Redis cluster replica node that the client is ok reading possibly stale data and is not interested in running write
      * queries.
      *
      * @return String simple-string-reply
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java b/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
index 3152ff046a..f174e35f60 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
@@ -49,6 +49,7 @@ public class ClusterPartitionParser {
         map.put("myself", RedisClusterNode.NodeFlag.MYSELF);
         map.put("master", RedisClusterNode.NodeFlag.MASTER);
         map.put("slave", RedisClusterNode.NodeFlag.SLAVE);
+        map.put("replica", RedisClusterNode.NodeFlag.REPLICA);
         map.put("fail?", RedisClusterNode.NodeFlag.EVENTUAL_FAIL);
         map.put("fail", RedisClusterNode.NodeFlag.FAIL);
         map.put("handshake", RedisClusterNode.NodeFlag.HANDSHAKE);
@@ -74,8 +75,7 @@ public static Partitions parse(String nodes) {
 
         try {
             List<RedisClusterNode> mappedNodes = TOKEN_PATTERN.splitAsStream(nodes).filter(s -> !s.isEmpty())
-                    .map(ClusterPartitionParser::parseNode)
-                    .collect(Collectors.toList());
+                    .map(ClusterPartitionParser::parseNode).collect(Collectors.toList());
             result.addAll(mappedNodes);
         } catch (Exception e) {
             throw new RedisException("Cannot parse " + nodes, e);
@@ -93,7 +93,7 @@ private static RedisClusterNode parseNode(String nodeInformation) {
         RedisURI uri = null;
 
         String hostAndPortPart = iterator.next();
-        if(hostAndPortPart.contains("@")) {
+        if (hostAndPortPart.contains("@")) {
             hostAndPortPart = hostAndPortPart.substring(0, hostAndPortPart.indexOf('@'));
         }
 
@@ -108,8 +108,8 @@ private static RedisClusterNode parseNode(String nodeInformation) {
 
         Set<RedisClusterNode.NodeFlag> nodeFlags = readFlags(flagStrings);
 
-        String slaveOfString = iterator.next(); // (nodeId or -)
-        String slaveOf = "-".equals(slaveOfString) ? null : slaveOfString;
+        String replicaOfString = iterator.next(); // (nodeId or -)
+        String replicaOf = "-".equals(replicaOfString) ? null : replicaOfString;
 
         long pingSentTs = getLongFromIterator(iterator, 0);
         long pongReceivedTs = getLongFromIterator(iterator, 0);
@@ -124,7 +124,7 @@ private static RedisClusterNode parseNode(String nodeInformation) {
         List<String> slotStrings = LettuceLists.newList(iterator); // slot, from-to [slot->-nodeID] [slot-<-nodeID]
         List<Integer> slots = readSlots(slotStrings);
 
-        RedisClusterNode partition = new RedisClusterNode(uri, nodeId, connected, slaveOf, pingSentTs, pongReceivedTs,
+        RedisClusterNode partition = new RedisClusterNode(uri, nodeId, connected, replicaOf, pingSentTs, pongReceivedTs,
                 configEpoch, slots, nodeFlags);
 
         return partition;
@@ -139,6 +139,11 @@ private static Set<RedisClusterNode.NodeFlag> readFlags(List<String> flagStrings
                 flags.add(FLAG_MAPPING.get(flagString));
             }
         }
+
+        if (flags.contains(RedisClusterNode.NodeFlag.SLAVE)) {
+            flags.add(RedisClusterNode.NodeFlag.REPLICA);
+        }
+
         return Collections.unmodifiableSet(flags);
     }
 
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
index ecfdd8643b..03842de8f9 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
@@ -38,7 +38,7 @@
  * {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag#SLAVE} state</li>
  * <li>Newly added or removed nodes to/from the Redis Cluster</li>
  * <li>Changes in {@link RedisClusterNode#getSlots()} responsibility</li>
- * <li>Changes to the {@link RedisClusterNode#getSlaveOf() slave replication source} (the master of a slave)</li>
+ * <li>Changes to the {@link RedisClusterNode#getSlaveOf() replication source} (the master of a replica)</li>
  * <li>Changes to the {@link RedisClusterNode#getUri()} () connection point}</li>
  * </ul>
  *
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
index a6570c9c39..eaa07f1595 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
@@ -26,8 +26,8 @@
 /**
  * Representation of a Redis Cluster node. A {@link RedisClusterNode} is identified by its {@code nodeId}.
  * <p/>
- * A {@link RedisClusterNode} can be a {@link #getRole() responsible master} or slave. Masters can be responsible for zero to
- * {@link io.lettuce.core.cluster.SlotHash#SLOT_COUNT 16384} slots. Each slave refers to exactly one {@link #getSlaveOf()
+ * A {@link RedisClusterNode} can be a {@link #getRole() responsible master} or replica. Masters can be responsible for zero to
+ * {@link io.lettuce.core.cluster.SlotHash#SLOT_COUNT 16384} slots. Each replica refers to exactly one {@link #getSlaveOf()
  * master}. Nodes can have different {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag flags} assigned.
  * <p/>
  * This class is mutable and not thread-safe if mutated by multiple threads concurrently.
@@ -358,6 +358,6 @@ public String toString() {
      * Redis Cluster node flags.
      */
     public enum NodeFlag {
-        NOFLAGS, MYSELF, SLAVE, MASTER, EVENTUAL_FAIL, FAIL, HANDSHAKE, NOADDR;
+        NOFLAGS, MYSELF, SLAVE, REPLICA, MASTER, EVENTUAL_FAIL, FAIL, HANDSHAKE, NOADDR;
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java
index 132d0c1cfd..05ab3ac770 100644
--- a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java
+++ b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java
@@ -27,7 +27,7 @@
 import io.lettuce.core.internal.LettuceAssert;
 
 /**
- * Represents a range of slots together with its master and slaves.
+ * Represents a range of slots together with its master and replicas.
  *
  * @author Mark Paluch
  * @since 3.0
@@ -39,7 +39,7 @@ public class ClusterSlotRange implements Serializable {
     private int to;
 
     private RedisClusterNode masterNode;
-    private List<RedisClusterNode> slaveNodes = Collections.emptyList();
+    private List<RedisClusterNode> replicaNodes = Collections.emptyList();
 
     public ClusterSlotRange() {
     }
@@ -50,17 +50,17 @@ public ClusterSlotRange() {
      * @param from from slot
      * @param to to slot
      * @param masterNode master for the slots, may be {@literal null}
-     * @param slaveNodes list of slaves must not be {@literal null} but may be empty
+     * @param replicaNodes list of replicas must not be {@literal null} but may be empty
      */
-    public ClusterSlotRange(int from, int to, RedisClusterNode masterNode, List<RedisClusterNode> slaveNodes) {
+    public ClusterSlotRange(int from, int to, RedisClusterNode masterNode, List<RedisClusterNode> replicaNodes) {
 
         LettuceAssert.notNull(masterNode, "MasterNode must not be null");
-        LettuceAssert.notNull(slaveNodes, "SlaveNodes must not be null");
+        LettuceAssert.notNull(replicaNodes, "ReplicaNodes must not be null");
 
         this.from = from;
         this.to = to;
         this.masterNode = masterNode;
-        this.slaveNodes = slaveNodes;
+        this.replicaNodes = replicaNodes;
     }
 
     private RedisClusterNode toRedisClusterNode(HostAndPort hostAndPort, String slaveOf, Set<RedisClusterNode.NodeFlag> flags) {
@@ -98,12 +98,22 @@ public void setMasterNode(RedisClusterNode masterNode) {
         this.masterNode = masterNode;
     }
 
+    @Deprecated
     public List<RedisClusterNode> getSlaveNodes() {
-        return slaveNodes;
+        return replicaNodes;
     }
 
+    @Deprecated
     public void setSlaveNodes(List<RedisClusterNode> slaveNodes) {
-        this.slaveNodes = slaveNodes;
+        this.replicaNodes = slaveNodes;
+    }
+
+    public List<RedisClusterNode> getReplicaNodes() {
+        return replicaNodes;
+    }
+
+    public void setReplicaNodes(List<RedisClusterNode> replicaNodes) {
+        this.replicaNodes = replicaNodes;
     }
 
     public void setFrom(int from) {
@@ -121,7 +131,7 @@ public String toString() {
         sb.append(" [from=").append(from);
         sb.append(", to=").append(to);
         sb.append(", masterNode=").append(masterNode);
-        sb.append(", slaveNodes=").append(slaveNodes);
+        sb.append(", replicaNodes=").append(replicaNodes);
         sb.append(']');
         return sb.toString();
     }
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
index 33da9f24a7..8a6579fbe6 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
@@ -63,7 +63,7 @@
  *  connection.addListener(…);
  *
  *  RedisClusterPubSubCommands<String, String> sync = connection.sync();
- *  sync.slaves().commands().psubscribe("__key*__:*");
+ *  sync.replicas().commands().psubscribe("__key*__:*");
  *     </code>
  * </pre>
  *
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
index db29495371..ecc9a10248 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
@@ -47,23 +47,49 @@ default PubSubAsyncNodeSelection<K, V> masters() {
     }
 
     /**
-     * Select all slaves.
+     * Select all replicas.
      *
-     * @return API with asynchronous executed commands on a selection of slave cluster nodes.
+     * @return API with asynchronous executed commands on a selection of replica cluster nodes.
+     * @deprecated since 5.2, use {@link #replicas()}
      */
     default PubSubAsyncNodeSelection<K, V> slaves() {
         return nodes(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
     }
 
     /**
-     * Select all slaves.
+     * Select all replicas.
      *
      * @param predicate Predicate to filter nodes
-     * @return API with asynchronous executed commands on a selection of slave cluster nodes.
+     * @return API with asynchronous executed commands on a selection of replica cluster nodes.
+     * @deprecated since 5.2, use {@link #replicas(Predicate)}
      */
+    @Deprecated
     default PubSubAsyncNodeSelection<K, V> slaves(Predicate<RedisClusterNode> predicate) {
-        return nodes(
-                redisClusterNode -> predicate.test(redisClusterNode) && redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+        return nodes(redisClusterNode -> predicate.test(redisClusterNode)
+                && redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+    }
+
+    /**
+     * Select all replicas.
+     *
+     * @return API with asynchronous executed commands on a selection of replica cluster nodes.
+     * @since 5.2
+     */
+    @Deprecated
+    default PubSubAsyncNodeSelection<K, V> replicas() {
+        return nodes(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.REPLICA));
+    }
+
+    /**
+     * Select all replicas.
+     *
+     * @param predicate Predicate to filter nodes
+     * @return API with asynchronous executed commands on a selection of replica cluster nodes.
+     * @since 5.2
+     */
+    default PubSubAsyncNodeSelection<K, V> replicas(Predicate<RedisClusterNode> predicate) {
+        return nodes(redisClusterNode -> predicate.test(redisClusterNode)
+                && redisClusterNode.is(RedisClusterNode.NodeFlag.REPLICA));
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
index cb32be6125..21a4354e24 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
@@ -47,23 +47,49 @@ default PubSubReactiveNodeSelection<K, V> masters() {
     }
 
     /**
-     * Select all slaves.
+     * Select all replicas.
      *
-     * @return API with asynchronous executed commands on a selection of slave cluster nodes.
+     * @return API with asynchronous executed commands on a selection of replica cluster nodes.
+     * @deprecated since 5.2, use {@link #replicas()}.
      */
+    @Deprecated
     default PubSubReactiveNodeSelection<K, V> slaves() {
         return nodes(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
     }
 
     /**
-     * Select all slaves.
+     * Select all replicas.
      *
      * @param predicate Predicate to filter nodes
-     * @return API with asynchronous executed commands on a selection of slave cluster nodes.
+     * @return API with asynchronous executed commands on a selection of replica cluster nodes.
+     * @deprecated since 5.2, use {@link #replicas()}.
      */
+    @Deprecated
     default PubSubReactiveNodeSelection<K, V> slaves(Predicate<RedisClusterNode> predicate) {
-        return nodes(
-                redisClusterNode -> predicate.test(redisClusterNode) && redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+        return nodes(redisClusterNode -> predicate.test(redisClusterNode)
+                && redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+    }
+
+    /**
+     * Select all replicas.
+     *
+     * @return API with asynchronous executed commands on a selection of replica cluster nodes.
+     * @since 5.2
+     */
+    default PubSubReactiveNodeSelection<K, V> replicas() {
+        return nodes(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.REPLICA));
+    }
+
+    /**
+     * Select all replicas.
+     *
+     * @param predicate Predicate to filter nodes
+     * @return API with asynchronous executed commands on a selection of replica cluster nodes.
+     * @since 5.2
+     */
+    default PubSubReactiveNodeSelection<K, V> replicas(Predicate<RedisClusterNode> predicate) {
+        return nodes(redisClusterNode -> predicate.test(redisClusterNode)
+                && redisClusterNode.is(RedisClusterNode.NodeFlag.REPLICA));
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
index e44fde97f5..92d57d6b63 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
@@ -47,23 +47,49 @@ default PubSubNodeSelection<K, V> masters() {
     }
 
     /**
-     * Select all slaves.
+     * Select all replicas.
      *
-     * @return API with asynchronous executed commands on a selection of slave cluster nodes.
+     * @return API with asynchronous executed commands on a selection of replica cluster nodes.
+     * @deprecated since 5.2, use {@link #replicas()}
      */
+    @Deprecated
     default PubSubNodeSelection<K, V> slaves() {
         return nodes(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
     }
 
     /**
-     * Select all slaves.
+     * Select all replicas.
      *
      * @param predicate Predicate to filter nodes
-     * @return API with asynchronous executed commands on a selection of slave cluster nodes.
+     * @return API with asynchronous executed commands on a selection of replica cluster nodes.
+     * @deprecated since 5.2, use {@link #replicas(Predicate)}
      */
+    @Deprecated
     default PubSubNodeSelection<K, V> slaves(Predicate<RedisClusterNode> predicate) {
-        return nodes(
-                redisClusterNode -> predicate.test(redisClusterNode) && redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+        return nodes(redisClusterNode -> predicate.test(redisClusterNode)
+                && redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+    }
+
+    /**
+     * Select all replicas.
+     *
+     * @return API with asynchronous executed commands on a selection of replica cluster nodes.
+     * @since 5.2
+     */
+    default PubSubNodeSelection<K, V> replicas() {
+        return nodes(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.REPLICA));
+    }
+
+    /**
+     * Select all replicas.
+     *
+     * @param predicate Predicate to filter nodes
+     * @return API with asynchronous executed commands on a selection of replica cluster nodes.
+     * @since 5.2
+     */
+    default PubSubNodeSelection<K, V> replicas(Predicate<RedisClusterNode> predicate) {
+        return nodes(redisClusterNode -> predicate.test(redisClusterNode)
+                && redisClusterNode.is(RedisClusterNode.NodeFlag.REPLICA));
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java b/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
index aec7bd4da8..5eb906d746 100644
--- a/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
+++ b/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
@@ -35,7 +35,7 @@
 import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
- * {@link MasterSlaveConnector} to connect unmanaged Redis Master/Slave with auto-discovering master and slave nodes from a
+ * {@link MasterSlaveConnector} to connect unmanaged Redis Master/Slave with auto-discovering master and replica nodes from a
  * single {@link RedisURI}.
  *
  * @author Mark Paluch
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index 1841f9431c..37b794e4ff 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -60,7 +60,7 @@
  *
  * <ul>
  * <li>{@link MasterSlaveTopologyProvider}: Dynamic topology lookup using the {@code INFO REPLICATION} output. Slaves are listed
- * as {@code slaveN=...} entries. The initial connection can either point to a master or a slave and the topology provider will
+ * as {@code slaveN=...} entries. The initial connection can either point to a master or a replica and the topology provider will
  * discover nodes. The connection needs to be re-established outside of lettuce in a case of Master/Slave failover or topology
  * changes.</li>
  * <li>{@link StaticMasterSlaveTopologyProvider}: Topology is defined by the list of {@link RedisURI URIs} and the {@code ROLE}
@@ -99,7 +99,7 @@ public class MasterSlave {
      * {@link RedisCodec codec} to encode/decode keys.
      * <p>
      * This {@link MasterSlave} performs auto-discovery of nodes using either Redis Sentinel or Master/Slave. A {@link RedisURI}
-     * can point to either a master or a slave host.
+     * can point to either a master or a replica host.
      * </p>
      *
      * @param redisClient the Redis client.
@@ -124,7 +124,7 @@ public static <K, V> StatefulRedisMasterSlaveConnection<K, V> connect(RedisClien
      * supplied {@link RedisCodec codec} to encode/decode keys.
      * <p>
      * This {@link MasterSlave} performs auto-discovery of nodes using either Redis Sentinel or Master/Slave. A {@link RedisURI}
-     * can point to either a master or a slave host.
+     * can point to either a master or a replica host.
      * </p>
      *
      * @param redisClient the Redis client.
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
index 89f27d6512..13e8cf8f22 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
@@ -59,7 +59,7 @@ class MasterSlaveTopologyRefresh {
     }
 
     /**
-     * Load master slave nodes. Result contains an ordered list of {@link RedisNodeDescription}s. The sort key is the latency.
+     * Load master replica nodes. Result contains an ordered list of {@link RedisNodeDescription}s. The sort key is the latency.
      * Nodes with lower latency come first.
      *
      * @param seed collection of {@link RedisURI}s
diff --git a/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java b/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
index 1f48772c19..b57be0d3a6 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
@@ -58,7 +58,7 @@ public interface RedisSentinelReactiveCommands<K, V> {
     Mono<Map<K, V>> master(K key);
 
     /**
-     * Provides a list of slaves for the master with the specified name.
+     * Provides a list of replicas for the master with the specified name.
      *
      * @param key the key
      * @return Map&lt;K, V&gt;
diff --git a/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java b/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
index f212190249..4165c49cb2 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
@@ -57,7 +57,7 @@ public interface RedisSentinelCommands<K, V> {
     Map<K, V> master(K key);
 
     /**
-     * Provides a list of slaves for the master with the specified name.
+     * Provides a list of replicas for the master with the specified name.
      *
      * @param key the key
      * @return List&lt;Map&lt;K, V&gt;&gt;
diff --git a/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java b/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java
index 602a90e966..82f22c8a6f 100644
--- a/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java
@@ -56,7 +56,7 @@ public interface RedisSentinelCommands<K, V> {
     Map<K, V> master(K key);
 
     /**
-     * Provides a list of slaves for the master with the specified name.
+     * Provides a list of replicas for the master with the specified name.
      *
      * @param key the key
      * @return List&lt;Map&lt;K, V&gt;&gt;
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
index 4b496dc601..e8c3b23c5e 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
@@ -306,7 +306,7 @@ void shutdown() {
     }
 
     @Test
-    void readFromSlaves() {
+    void readFromReplicas() {
 
         RedisClusterReactiveCommands<String, String> connection = commands.getConnection(ClusterTestSettings.host,
                 ClusterTestSettings.port4);
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
index ce7c4f56fc..278d3558d9 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
@@ -115,7 +115,7 @@ void testClusterNodesSync() {
     }
 
     @Test
-    void testClusterSlaves() {
+    void testClusterReplicas() {
 
         sync.set("b", value);
         RedisFuture<Long> replication = async.waitForReplication(1, 5);
@@ -178,12 +178,12 @@ void readOnly() throws Exception {
         assertThat(connect3.readOnly()).isEqualTo("OK");
         waitUntilValueIsVisible(key, connect3);
 
-        String resultBViewedBySlave = connect3.get("b");
-        assertThat(resultBViewedBySlave).isEqualTo(value);
+        String resultBViewedByReplica = connect3.get("b");
+        assertThat(resultBViewedByReplica).isEqualTo(value);
         connect3.quit();
 
-        resultBViewedBySlave = connect3.get("b");
-        assertThat(resultBViewedBySlave).isEqualTo(value);
+        resultBViewedByReplica = connect3.get("b");
+        assertThat(resultBViewedByReplica).isEqualTo(value);
     }
 
     @Test
@@ -202,8 +202,8 @@ void readOnlyWithReconnect() throws Exception {
         connect3.quit();
         waitUntilValueIsVisible(key, connect3);
 
-        String resultViewedBySlave = connect3.get("b");
-        assertThat(resultViewedBySlave).isEqualTo(value);
+        String resultViewedByReplica = connect3.get("b");
+        assertThat(resultViewedByReplica).isEqualTo(value);
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterSetup.java b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
index ccc8600a2e..c3613ea305 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
@@ -90,7 +90,7 @@ public static void setup2Masters(ClusterRule clusterRule) {
      *
      * @param clusterRule
      */
-    public static void setupMasterWithSlave(ClusterRule clusterRule) {
+    public static void setupMasterWithReplica(ClusterRule clusterRule) {
 
         clusterRule.clusterReset();
         clusterRule.meet(ClusterTestSettings.host, ClusterTestSettings.port5);
@@ -134,15 +134,4 @@ private static Stream<RedisClusterNode> partitionStream(ClusterRule clusterRule)
         return clusterRule.getClusterClient().getPartitions().getPartitions().stream();
     }
 
-    private static boolean is2Masters2Slaves(ClusterRule clusterRule) {
-        RedisClusterClient clusterClient = clusterRule.getClusterClient();
-
-        long slaves = clusterClient.getPartitions().stream()
-                .filter(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE)).count();
-        long masters = clusterClient.getPartitions().stream()
-                .filter(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.MASTER)).count();
-
-        return slaves == 2 && masters == 2;
-    }
-
 }
diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
index 676286da91..e1dae91104 100644
--- a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
@@ -237,10 +237,10 @@ void testAsynchronicityOfMultiNodeExecution() {
     }
 
     @Test
-    void testSlavesReadWrite() {
+    void testReplicaReadWrite() {
 
         AsyncNodeSelection<String, String> nodes = commands.nodes(redisClusterNode -> redisClusterNode.getFlags().contains(
-                RedisClusterNode.NodeFlag.SLAVE));
+                RedisClusterNode.NodeFlag.REPLICA));
 
         assertThat(nodes.size()).isEqualTo(2);
 
@@ -263,10 +263,10 @@ void testSlavesReadWrite() {
     }
 
     @Test
-    void testSlavesWithReadOnly() {
+    void testReplicasWithReadOnly() {
 
-        AsyncNodeSelection<String, String> nodes = commands.slaves(redisClusterNode -> redisClusterNode
-                .is(RedisClusterNode.NodeFlag.SLAVE));
+        AsyncNodeSelection<String, String> nodes = commands.replicas(redisClusterNode -> redisClusterNode
+                .is(RedisClusterNode.NodeFlag.REPLICA));
 
         assertThat(nodes.size()).isEqualTo(2);
 
@@ -299,7 +299,7 @@ static void waitForReplication(RedisAdvancedClusterAsyncCommands<String, String>
  {
 
         AsyncNodeSelection<String, String> selection = commands
-                .slaves(redisClusterNode -> redisClusterNode.getUri().getPort() == port);
+                .replicas(redisClusterNode -> redisClusterNode.getUri().getPort() == port);
         Wait.untilNotEquals(null, () -> {
             for (CompletableFuture<String> future : selection.commands().get(key).futures()) {
 
diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
index 81494166d9..4e6aa77b02 100644
--- a/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
@@ -181,7 +181,7 @@ void testAsynchronicityOfMultiNodeExecution() {
     }
 
     @Test
-    void testSlavesReadWrite() {
+    void testReplicasReadWrite() {
 
         NodeSelection<String, String> nodes = commands.nodes(redisClusterNode -> redisClusterNode.getFlags().contains(
                 RedisClusterNode.NodeFlag.SLAVE));
diff --git a/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java b/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
index b85d2b2283..24ca354392 100644
--- a/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
@@ -72,7 +72,7 @@ void replica() {
     }
 
     @Test
-    void slavePreferred() {
+    void replicaPreferred() {
         List<RedisNodeDescription> result = ReadFrom.REPLICA_PREFERRED.select(getNodes());
         assertThat(result).hasSize(3).containsExactly(nearest, replica, master);
     }
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java
index 18445a76b6..7a9aaa28de 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java
@@ -81,7 +81,7 @@ void readWriteMasterPreferred() {
     }
 
     @Test
-    void readWriteSlave() {
+    void readWriteReplica() {
 
         connection.setReadFrom(ReadFrom.REPLICA);
 
@@ -92,7 +92,7 @@ void readWriteSlave() {
     }
 
     @Test
-    void readWriteSlavePreferred() {
+    void readWriteReplicaPreferred() {
 
         connection.setReadFrom(ReadFrom.REPLICA_PREFERRED);
 
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
index 87dc28e4f2..a9ff7bf82e 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
@@ -472,7 +472,7 @@ public void expireStaleHostAndPortConnections() throws Exception {
     }
 
     @Test
-    public void readFromSlaveTest() {
+    public void readFromReplicaTest() {
 
         ClusterSetup.setup2Masters(clusterRule);
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
index eba1bcd012..b3311c2986 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
@@ -75,7 +75,7 @@ public static void shutdownClient() {
     @Before
     public void before() {
 
-        ClusterSetup.setupMasterWithSlave(clusterRule);
+        ClusterSetup.setupMasterWithReplica(clusterRule);
 
         redis5 = client.connect(RedisURI.Builder.redis(host, ClusterTestSettings.port5).build());
         redis6 = client.connect(RedisURI.Builder.redis(host, ClusterTestSettings.port6).build());
diff --git a/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java
index 0463f7b47b..c56b6b7392 100644
--- a/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java
@@ -59,7 +59,7 @@ void testParse() {
     }
 
     @Test
-    void testParseWithSlave() {
+    void testParseWithReplica() {
         List<?> list = Arrays.asList(LettuceLists.newList("100", "200", LettuceLists.newList("1", "2", "nodeId1"),
                 LettuceLists.newList("1", 2, "nodeId2")));
         List<ClusterSlotRange> result = ClusterSlotsParser.parse(list);
@@ -78,11 +78,11 @@ void testParseWithSlave() {
 
         assertThat(clusterSlotRange.getSlaveNodes()).hasSize(1);
 
-        RedisClusterNode slaveNode = clusterSlotRange.getSlaveNodes().get(0);
+        RedisClusterNode replica = clusterSlotRange.getReplicaNodes().get(0);
 
-        assertThat(slaveNode.getNodeId()).isEqualTo("nodeId2");
-        assertThat(slaveNode.getSlaveOf()).isEqualTo("nodeId1");
-        assertThat(slaveNode.getFlags()).contains(RedisClusterNode.NodeFlag.SLAVE);
+        assertThat(replica.getNodeId()).isEqualTo("nodeId2");
+        assertThat(replica.getSlaveOf()).isEqualTo("nodeId1");
+        assertThat(replica.getFlags()).contains(RedisClusterNode.NodeFlag.SLAVE);
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
index 018e573f38..21ced27a2e 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
@@ -296,7 +296,7 @@ void isChangedNodeIdChanged() {
     }
 
     @Test
-    void isChangedFlagsChangedSlaveToMaster() {
+    void isChangedFlagsChangedReplicaToMaster() {
         String nodes1 = "3d005a179da7d8dc1adae6409d47b39c369e992b 127.0.0.1:7380 slave - 0 1401258245007 2 disconnected 8000-11999\n"
                 + "c37ab8396be428403d4e55c0d317348be27ed973 127.0.0.1:7381 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n";
 
@@ -309,7 +309,7 @@ void isChangedFlagsChangedSlaveToMaster() {
     }
 
     @Test
-    void isChangedFlagsChangedMasterToSlave() {
+    void isChangedFlagsChangedMasterToReplica() {
         String nodes1 = "3d005a179da7d8dc1adae6409d47b39c369e992b 127.0.0.1:7380 master - 0 1401258245007 2 disconnected 8000-11999\n"
                 + "c37ab8396be428403d4e55c0d317348be27ed973 127.0.0.1:7381 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n";
 

From 57b02bf5d72a3e71b539d4cbba21b8eb25dac0e2 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 12 Feb 2019 08:54:44 +0100
Subject: [PATCH 595/808] Upgrade to netty 4.1.33.Final #976

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f504a33e37..7cfc0e1089 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
-        <netty-version>4.1.31.Final</netty-version>
+        <netty-version>4.1.33.Final</netty-version>
         <spring-version>4.3.20.RELEASE</spring-version>
         <reactor-version>3.2.3.RELEASE</reactor-version>
         <brave-version>5.2.0</brave-version>

From 63eff2905af26f80ac766a313990f50479112fa9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 12 Feb 2019 08:55:58 +0100
Subject: [PATCH 596/808] Upgrade to Reactor 3.2.6.RELEASE #975

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7cfc0e1089..a563f90bd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <netty-version>4.1.33.Final</netty-version>
         <spring-version>4.3.20.RELEASE</spring-version>
-        <reactor-version>3.2.3.RELEASE</reactor-version>
+        <reactor-version>3.2.6.RELEASE</reactor-version>
         <brave-version>5.2.0</brave-version>
         <skipITs>true</skipITs>
     </properties>

From 6eaf023db3c1388dd95d22e4374fce7be3bb1dc9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 12 Feb 2019 11:13:51 +0100
Subject: [PATCH 597/808] Upgrade to HdrHistogram 2.1.11 #978

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a563f90bd6..76f27334e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,7 +175,7 @@
         <dependency>
             <groupId>org.hdrhistogram</groupId>
             <artifactId>HdrHistogram</artifactId>
-            <version>2.1.10</version>
+            <version>2.1.11</version>
             <optional>true</optional>
         </dependency>
 

From 589a79955ce33f25868c528ea17b15509a9a059d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 12 Feb 2019 11:15:29 +0100
Subject: [PATCH 598/808] Upgrade to RxJava 2.2.6 #979

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 76f27334e9..75c234e1e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,7 +204,7 @@
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
-            <version>2.2.4</version>
+            <version>2.2.6</version>
             <optional>true</optional>
         </dependency>
 

From 171e2b98e0f08e92c140b29db51bf0cc092c9082 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 12 Feb 2019 11:19:34 +0100
Subject: [PATCH 599/808] Use JUnit BOM for dependency management and upgrade
 to JUnit 5.4.0 #980

---
 pom.xml | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 75c234e1e4..8865d42be8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,7 @@
         <spring-version>4.3.20.RELEASE</spring-version>
         <reactor-version>3.2.6.RELEASE</reactor-version>
         <brave-version>5.2.0</brave-version>
+        <junit-version>5.4.0</junit-version>
         <skipITs>true</skipITs>
     </properties>
 
@@ -100,6 +101,14 @@
                 <scope>import</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit-version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -275,14 +284,24 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.3.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.3.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -404,20 +423,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.3.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>5.3.1</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
     <profiles>

From dc93ebfccc34f9770d9c2751f8c48323e8eeb58a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 12 Feb 2019 11:22:21 +0100
Subject: [PATCH 600/808] Use logj42 BOM for dependency management and upgrade
 to 2.11.2 #981

---
 pom.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8865d42be8..a12d9c5301 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@
         <reactor-version>3.2.6.RELEASE</reactor-version>
         <brave-version>5.2.0</brave-version>
         <junit-version>5.4.0</junit-version>
+        <log4j2-version>2.11.2</log4j2-version>
         <skipITs>true</skipITs>
     </properties>
 
@@ -109,6 +110,14 @@
                 <scope>import</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j2-bom</artifactId>
+                <version>${log4j2-version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -364,14 +373,12 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.11.0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.11.0</version>
             <scope>test</scope>
         </dependency>
 

From 3588c9b9354060ec98e0945ca03afecbeae6d2f2 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 12 Feb 2019 11:41:13 +0100
Subject: [PATCH 601/808] Polishing

Order dependencies by name. Extract version properties.
---
 pom.xml | 231 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 123 insertions(+), 108 deletions(-)

diff --git a/pom.xml b/pom.xml
index a12d9c5301..83c28f2c2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,13 +58,19 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
-        <netty-version>4.1.33.Final</netty-version>
-        <spring-version>4.3.20.RELEASE</spring-version>
-        <reactor-version>3.2.6.RELEASE</reactor-version>
+
+        <assertj-core.version>3.11.1</assertj-core.version>
         <brave-version>5.2.0</brave-version>
         <junit-version>5.4.0</junit-version>
         <log4j2-version>2.11.2</log4j2-version>
+        <mockito.version>2.22.0</mockito.version>
+        <netty-version>4.1.33.Final</netty-version>
+        <reactor-version>3.2.6.RELEASE</reactor-version>
+        <reactive-streams-tck.version>1.0.0</reactive-streams-tck.version>
+        <slf4j.version>1.7.25</slf4j.version>
+        <spring-version>4.3.20.RELEASE</spring-version>
+
+        <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipITs>true</skipITs>
     </properties>
 
@@ -112,7 +118,7 @@
 
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j2-bom</artifactId>
+                <artifactId>log4j-bom</artifactId>
                 <version>${log4j2-version}</version>
                 <type>pom</type>
                 <scope>import</scope>
@@ -123,19 +129,16 @@
 
     <dependencies>
 
-        <!-- Start of Core Dependencies -->
+        <!-- Start of core dependencies -->
 
         <dependency>
-            <groupId>io.projectreactor</groupId>
-            <artifactId>reactor-core</artifactId>
-            <version>${reactor-version}</version>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
         </dependency>
 
-        <!-- Netty -->
-
         <dependency>
             <groupId>io.netty</groupId>
-            <artifactId>netty-common</artifactId>
+            <artifactId>netty-handler</artifactId>
         </dependency>
 
         <dependency>
@@ -144,45 +147,54 @@
         </dependency>
 
         <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-handler</artifactId>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core</artifactId>
+            <version>${reactor-version}</version>
         </dependency>
 
-        <!-- End of Core Dependencies -->
+        <!-- End of core dependencies -->
 
-        <!-- OS-native transports -->
+        <!-- Start of optional dependencies -->
 
         <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-transport-native-epoll</artifactId>
-            <classifier>linux-x86_64</classifier>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+            <version>2.6.0</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>io.netty</groupId>
-            <artifactId>netty-transport-native-kqueue</artifactId>
-            <classifier>osx-x86_64</classifier>
+            <artifactId>netty-tcnative</artifactId>
+            <version>1.1.33.Fork26</version>
+            <classifier>${os.detected.classifier}</classifier>
             <optional>true</optional>
         </dependency>
 
+        <!-- OS-native transports -->
+
         <dependency>
             <groupId>io.netty</groupId>
-            <artifactId>netty-tcnative</artifactId>
-            <version>1.1.33.Fork26</version>
-            <classifier>${os.detected.classifier}</classifier>
+            <artifactId>netty-transport-native-epoll</artifactId>
+            <classifier>linux-x86_64</classifier>
             <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-            <version>2.6.0</version>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-kqueue</artifactId>
+            <classifier>osx-x86_64</classifier>
             <optional>true</optional>
         </dependency>
 
         <!-- Metrics/Tracing -->
 
+        <dependency>
+            <groupId>io.zipkin.brave</groupId>
+            <artifactId>brave</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>org.latencyutils</groupId>
             <artifactId>LatencyUtils</artifactId>
@@ -197,12 +209,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>io.zipkin.brave</groupId>
-            <artifactId>brave</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <!-- Reactive Dependencies -->
 
         <dependency>
@@ -246,20 +252,15 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <scope>test</scope>
-        </dependency>
+        <!-- CDI -->
 
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <scope>test</scope>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <version>2.0</version>
+            <optional>true</optional>
         </dependency>
 
-        <!-- CDI -->
-
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
@@ -267,13 +268,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <version>2.0</version>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
@@ -281,95 +275,96 @@
             <optional>true</optional>
         </dependency>
 
+        <!-- End of optional dependencies -->
+
         <!-- Test -->
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>1.3</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.8</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
+            <groupId>com.github.javaparser</groupId>
+            <artifactId>javaparser-core</artifactId>
+            <version>3.6.3</version>
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
+        <!-- CDI -->
 
         <dependency>
-            <groupId>io.projectreactor</groupId>
-            <artifactId>reactor-test</artifactId>
-            <version>${reactor-version}</version>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-se</artifactId>
+            <version>2.0.6</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.googlecode.multithreadedtc</groupId>
-            <artifactId>multithreadedtc</artifactId>
-            <version>1.01</version>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>2.22.0</version>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
             <scope>test</scope>
         </dependency>
 
+        <!-- JUnit -->
+
         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-junit-jupiter</artifactId>
-            <version>2.22.0</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-se</artifactId>
-            <version>2.0.6</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>3.11.1</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
             <scope>test</scope>
         </dependency>
 
+        <!-- Logging -->
+
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
@@ -385,48 +380,68 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.7.25</version>
+            <version>${slf4j.version}</version>
             <scope>test</scope>
         </dependency>
 
+
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-expression</artifactId>
-            <version>${spring-version}</version>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.googlecode.multithreadedtc</groupId>
+            <artifactId>multithreadedtc</artifactId>
+            <version>1.01</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.reactivestreams</groupId>
             <artifactId>reactive-streams-tck</artifactId>
-            <version>1.0.0</version>
+            <version>${reactive-streams-tck.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <version>1.3</version>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <version>${reactor-version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.github.javaparser</groupId>
-            <artifactId>javaparser-core</artifactId>
-            <version>3.6.3</version>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.8</version>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
+            <version>${spring-version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -863,7 +878,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.0</version>
+                <version>${mockito.version}</version>
                 <configuration>
                     <systemProperties>
                         <io.netty.eventLoopThreads>4</io.netty.eventLoopThreads>
@@ -881,7 +896,7 @@
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>surefire-junit-platform</artifactId>
-                        <version>2.22.0</version>
+                        <version>${mockito.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -889,7 +904,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.22.0</version>
+                <version>${mockito.version}</version>
                 <configuration>
                     <systemProperties>
                         <io.netty.eventLoopThreads>4</io.netty.eventLoopThreads>
@@ -906,7 +921,7 @@
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>surefire-junit-platform</artifactId>
-                        <version>2.22.0</version>
+                        <version>${mockito.version}</version>
                     </dependency>
                 </dependencies>
 

From b1cb5a32e6e83e188bb3222ee0e2f2b5a0afd9d3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 15 Feb 2019 14:25:44 +0100
Subject: [PATCH 602/808] Upgrade to AssertJ 3.12.0 #983

---
 pom.xml                                                       | 2 +-
 .../core/resource/DefaultClientResourcesUnitTests.java        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 83c28f2c2c..ee66df0655 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <assertj-core.version>3.11.1</assertj-core.version>
+        <assertj-core.version>3.12.0</assertj-core.version>
         <brave-version>5.2.0</brave-version>
         <junit-version>5.4.0</junit-version>
         <log4j2-version>2.11.2</log4j2-version>
diff --git a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
index 53479e3065..79d167bb83 100644
--- a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
@@ -77,7 +77,7 @@ void testBuilder() throws Exception {
         EventExecutorGroup eventExecutors = sut.eventExecutorGroup();
         NioEventLoopGroup eventLoopGroup = sut.eventLoopGroupProvider().allocate(NioEventLoopGroup.class);
 
-        assertThat(eventExecutors.iterator()).hasSize(4);
+        assertThat(eventExecutors).hasSize(4);
         assertThat(eventLoopGroup.executorCount()).isEqualTo(4);
         assertThat(sut.ioThreadPoolSize()).isEqualTo(4);
         assertThat(sut.commandLatencyCollector()).isNotNull();
@@ -162,7 +162,7 @@ void testSmallPoolSize() {
         EventExecutorGroup eventExecutors = sut.eventExecutorGroup();
         NioEventLoopGroup eventLoopGroup = sut.eventLoopGroupProvider().allocate(NioEventLoopGroup.class);
 
-        assertThat(eventExecutors.iterator()).hasSize(3);
+        assertThat(eventExecutors).hasSize(3);
         assertThat(eventLoopGroup.executorCount()).isEqualTo(3);
         assertThat(sut.ioThreadPoolSize()).isEqualTo(3);
 

From 3ba2d7eb6eef4ef467bbaa274bf7f467ce20a4d2 Mon Sep 17 00:00:00 2001
From: Nikolai Perevozchikov <trueinsider@gmail.com>
Date: Wed, 27 Feb 2019 17:58:48 +0300
Subject: [PATCH 603/808] Fix out of order signals when published on another
 executor #986

We now use a single EventExecutor when emitting signals instead of submitting runnables to the EventExecutorGroup.
This change retains execution order and prevents race conditions of completion arrival before an actual data signal.

Original pull request: #987.
---
 .../core/AbstractRedisReactiveCommands.java   |  5 +++--
 .../ReactiveConnectionIntegrationTests.java   | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 42bf55dcd6..607a897574 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -402,10 +402,11 @@ private <T> Flux<T> createFlux(Supplier<RedisCommand<K, V, T>> commandSupplier,
         if (tracingEnabled) {
 
             return withTraceContext().flatMapMany(
-                    it -> Flux.from(new RedisPublisher<>(decorate(commandSupplier, it), connection, dissolve, getScheduler())));
+                    it -> Flux.from(new RedisPublisher<>(decorate(commandSupplier, it), connection, dissolve, getScheduler()
+                            .next())));
         }
 
-        return Flux.from(new RedisPublisher<>(commandSupplier, connection, dissolve, getScheduler()));
+        return Flux.from(new RedisPublisher<>(commandSupplier, connection, dissolve, getScheduler().next()));
     }
 
     private Mono<TraceContext> withTraceContext() {
diff --git a/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
index 2c3a487024..eb75549050 100644
--- a/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
@@ -16,6 +16,7 @@
 package io.lettuce.core;
 
 import static io.lettuce.core.ClientOptions.DisconnectedBehavior.REJECT_COMMANDS;
+import static io.lettuce.core.ScriptOutputType.INTEGER;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.Duration;
@@ -235,6 +236,24 @@ void subscribeWithDisconnectedClient(RedisClient client) {
         connection.close();
     }
 
+    @Test
+    @Inject
+    void publishOnSchedulerTest(RedisClient client) {
+
+        client.setOptions(ClientOptions.builder().publishOnScheduler(true).build());
+
+        RedisReactiveCommands<String, String> reactive = client.connect().reactive();
+
+        int counter = 0;
+        for (int i = 0; i < 1000; i++) {
+            if (reactive.eval("return 1", INTEGER).next().block() == null) counter++;
+        }
+
+        assertThat(counter).isZero();
+
+        reactive.getStatefulConnection().close();
+    }
+
     private static Subscriber<String> createSubscriberWithExceptionOnComplete() {
         return new Subscriber<String>() {
 

From f6b1edc542862faff6b7d20248c1847a3c902c04 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 27 Feb 2019 16:22:11 +0100
Subject: [PATCH 604/808] Polishing #986

Add author tags. Tiny reformatting.

Original pull request: #987.
---
 .../io/lettuce/core/AbstractRedisReactiveCommands.java    | 1 +
 .../lettuce/core/ReactiveConnectionIntegrationTests.java  | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 607a897574..5a0afd7f26 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -46,6 +46,7 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
+ * @author Nikolai Perevozchikov
  * @since 4.0
  */
 public abstract class AbstractRedisReactiveCommands<K, V> implements RedisHashReactiveCommands<K, V>,
diff --git a/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
index eb75549050..336d41c82e 100644
--- a/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
@@ -45,6 +45,10 @@
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
 
+/**
+ * @author Mark Paluch
+ * @author Nikolai Perevozchikov
+ */
 @ExtendWith(LettuceExtension.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class ReactiveConnectionIntegrationTests extends TestSupport {
@@ -246,7 +250,9 @@ void publishOnSchedulerTest(RedisClient client) {
 
         int counter = 0;
         for (int i = 0; i < 1000; i++) {
-            if (reactive.eval("return 1", INTEGER).next().block() == null) counter++;
+            if (reactive.eval("return 1", INTEGER).next().block() == null) {
+                counter++;
+            }
         }
 
         assertThat(counter).isZero();

From 0beab1f78d6bedbb523c17085f5bcdf217a8423e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 6 Mar 2019 11:03:29 +0100
Subject: [PATCH 605/808] Cancel ClusterTopologyRefreshTask in
 RedisClusterClient.shutdownAsync() #989

Move topology refresh cancellation into RedisClusterClient.shutdownAsync().

Also, add guards to ClusterTopologyRefresh to guard the execution against event loops that are being shut down.
---
 .../core/cluster/RedisClusterClient.java      | 10 +++---
 .../topology/ClusterTopologyRefresh.java      | 36 +++++++++++++++----
 .../ClusterTopologyRefreshUnitTests.java      | 29 +++++++++++----
 3 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 6f7954d6c3..e9f1d42e08 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -946,15 +946,17 @@ public ClientResources getResources() {
     }
 
     /**
-     * Shutdown this client and close all open connections. The client should be discarded after calling shutdown.
+     * Shutdown this client and close all open connections asynchronously. The client should be discarded after calling
+     * shutdown.
      *
      * @param quietPeriod the quiet period as described in the documentation
      * @param timeout the maximum amount of time to wait until the executor is shutdown regardless if a task was submitted
      *        during the quiet period
      * @param timeUnit the unit of {@code quietPeriod} and {@code timeout}
+     * @since 4.4
      */
     @Override
-    public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
+    public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, TimeUnit timeUnit) {
 
         if (clusterTopologyRefreshActivated.compareAndSet(true, false)) {
 
@@ -964,11 +966,11 @@ public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
                 scheduledFuture.cancel(false);
                 clusterTopologyRefreshFuture.set(null);
             } catch (Exception e) {
-                logger.debug("Could not unschedule Cluster topology refresh", e);
+                logger.debug("Could not cancel Cluster topology refresh", e);
             }
         }
 
-        super.shutdown(quietPeriod, timeout, timeUnit);
+        return super.shutdownAsync(quietPeriod, timeout, timeUnit);
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
index fb9cb9efd9..2c99428b24 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
@@ -30,6 +30,7 @@
 import io.lettuce.core.cluster.topology.TopologyComparators.SortAction;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.resource.ClientResources;
+import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -61,18 +62,26 @@ public ClusterTopologyRefresh(NodeConnectionFactory nodeConnectionFactory, Clien
      */
     public Map<RedisURI, Partitions> loadViews(Iterable<RedisURI> seed, boolean discovery) {
 
+        if (!isEventLoopActive()) {
+            return Collections.emptyMap();
+        }
+
         long commandTimeoutNs = getCommandTimeoutNs(seed);
 
         Connections connections = null;
         try {
             connections = getConnections(seed).get(commandTimeoutNs, TimeUnit.NANOSECONDS);
 
+            if (!isEventLoopActive()) {
+                return Collections.emptyMap();
+            }
+
             Requests requestedTopology = connections.requestTopology();
             Requests requestedClients = connections.requestClients();
 
             NodeTopologyViews nodeSpecificViews = getNodeSpecificViews(requestedTopology, requestedClients, commandTimeoutNs);
 
-            if (discovery) {
+            if (discovery && isEventLoopActive()) {
 
                 Set<RedisURI> allKnownUris = nodeSpecificViews.getClusterNodes();
                 Set<RedisURI> discoveredNodes = difference(allKnownUris, toSet(seed));
@@ -82,10 +91,12 @@ public Map<RedisURI, Partitions> loadViews(Iterable<RedisURI> seed, boolean disc
                             TimeUnit.NANOSECONDS);
                     connections = connections.mergeWith(discoveredConnections);
 
-                    requestedTopology = requestedTopology.mergeWith(discoveredConnections.requestTopology());
-                    requestedClients = requestedClients.mergeWith(discoveredConnections.requestClients());
+                    if (isEventLoopActive()) {
+                        requestedTopology = requestedTopology.mergeWith(discoveredConnections.requestTopology());
+                        requestedClients = requestedClients.mergeWith(discoveredConnections.requestClients());
 
-                    nodeSpecificViews = getNodeSpecificViews(requestedTopology, requestedClients, commandTimeoutNs);
+                        nodeSpecificViews = getNodeSpecificViews(requestedTopology, requestedClients, commandTimeoutNs);
+                    }
 
                     return nodeSpecificViews.toMap();
                 }
@@ -98,7 +109,11 @@ public Map<RedisURI, Partitions> loadViews(Iterable<RedisURI> seed, boolean disc
             throw new RedisCommandInterruptedException(e);
         } finally {
             if (connections != null) {
-                connections.close();
+                try {
+                    connections.close();
+                } catch (Exception e) {
+                    logger.debug("Cannot close ClusterTopologyRefresh connections", e);
+                }
             }
         }
     }
@@ -196,12 +211,12 @@ private static boolean validNode(RedisClusterNode redisClusterNode) {
     /*
      * Open connections where an address can be resolved.
      */
-    private AsyncConnections getConnections(Iterable<RedisURI> redisURIs) throws InterruptedException {
+    private AsyncConnections getConnections(Iterable<RedisURI> redisURIs) {
 
         AsyncConnections connections = new AsyncConnections();
 
         for (RedisURI redisURI : redisURIs) {
-            if (redisURI.getHost() == null || connections.connectedNodes().contains(redisURI)) {
+            if (redisURI.getHost() == null || connections.connectedNodes().contains(redisURI) || !isEventLoopActive()) {
                 continue;
             }
 
@@ -244,6 +259,13 @@ private AsyncConnections getConnections(Iterable<RedisURI> redisURIs) throws Int
         return connections;
     }
 
+    private boolean isEventLoopActive() {
+
+        EventExecutorGroup eventExecutors = clientResources.eventExecutorGroup();
+
+        return !eventExecutors.isShuttingDown();
+    }
+
     /**
      * Resolve a {@link RedisURI} from a map of cluster views by {@link Partitions} as key
      *
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
index 8f3269f074..2b68762a0b 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
@@ -17,10 +17,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import java.net.InetSocketAddress;
@@ -52,6 +53,7 @@
 import io.lettuce.core.resource.DnsResolvers;
 import io.lettuce.core.resource.SocketAddressResolver;
 import io.lettuce.test.settings.TestSettings;
+import io.netty.util.concurrent.EventExecutorGroup;
 
 /**
  * @author Mark Paluch
@@ -95,10 +97,14 @@ class ClusterTopologyRefreshUnitTests {
     @Mock
     private RedisAsyncCommands<String, String> asyncCommands2;
 
+    @Mock
+    private EventExecutorGroup eventExecutors;
+
     @BeforeEach
     void before() {
 
         when(clientResources.socketAddressResolver()).thenReturn(SocketAddressResolver.create(DnsResolvers.JVM_DEFAULT));
+        when(clientResources.eventExecutorGroup()).thenReturn(eventExecutors);
         when(connection1.async()).thenReturn(asyncCommands1);
         when(connection2.async()).thenReturn(asyncCommands2);
         when(connection1.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
@@ -164,6 +170,18 @@ void getNodeSpecificViewsNode1IsFasterThanNode2() throws Exception {
         }
     }
 
+    @Test
+    void shouldNotRequestTopologyIfExecutorShutsDown() {
+
+        when(eventExecutors.isShuttingDown()).thenReturn(true);
+
+        List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380), RedisURI.create("127.0.0.1", 7381));
+
+        sut.loadViews(seed, true);
+
+        verifyZeroInteractions(nodeConnectionFactory);
+    }
+
     @Test
     void partitionsReturnedAsReported() throws Exception {
 
@@ -335,9 +353,9 @@ void shouldCloseConnections() {
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380), RedisURI.create("127.0.0.1", 7381));
 
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
-            .thenReturn(completedFuture((StatefulRedisConnection) connection1));
+                .thenReturn(completedFuture((StatefulRedisConnection) connection1));
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
-            .thenReturn(completedFuture((StatefulRedisConnection) connection2));
+                .thenReturn(completedFuture((StatefulRedisConnection) connection2));
 
         sut.loadViews(seed, true);
 
@@ -464,7 +482,6 @@ private static <T> ConnectionFuture<T> completedWithException(Exception e) {
         CompletableFuture<T> future = new CompletableFuture<>();
         future.completeExceptionally(e);
 
-        return ConnectionFuture.from(InetSocketAddress.createUnresolved(TestSettings.host(), TestSettings.port()),
-                future);
+        return ConnectionFuture.from(InetSocketAddress.createUnresolved(TestSettings.host(), TestSettings.port()), future);
     }
 }

From 2311123faedf1dd1261f2a14f4e68d7700b49a39 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 6 Mar 2019 11:54:36 +0100
Subject: [PATCH 606/808] Upgrade to AssertJ 3.12.1 #991

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ee66df0655..3017fd853a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <assertj-core.version>3.12.0</assertj-core.version>
+        <assertj-core.version>3.12.1</assertj-core.version>
         <brave-version>5.2.0</brave-version>
         <junit-version>5.4.0</junit-version>
         <log4j2-version>2.11.2</log4j2-version>

From 20d87ca7c66627690917211ac43a89e942a8683c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 6 Mar 2019 12:03:22 +0100
Subject: [PATCH 607/808] Upgrade to Maven Javadoc Plugin 3.1.0 #942

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3017fd853a..af8077fa6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -463,7 +463,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.1.0-SNAPSHOT</version>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>

From 5141b8cb3e683137ab9e60e7ffdf693505aef3bb Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 10 Mar 2019 11:48:24 +0100
Subject: [PATCH 608/808] Return AsyncCommand object in AsyncExecutableCommand
 execution #994

Lettuce now returns the appropriate AsyncCommand object after dispatching a command to the ChannelWriter.
Previously, Lettuce returned the dispatch result object regardless whether the object was a future. If a method declared RedisFuture as result, this resulted in a ClassCastException.
---
 .../core/dynamic/AsyncExecutableCommand.java    |  9 ++++++++-
 .../RedisCommandsClusterIntegrationTests.java   | 17 ++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
index 3e37e4a40e..2af21f445f 100644
--- a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
@@ -59,7 +59,14 @@ protected Object dispatchCommand(Object[] arguments, RedisCommand<Object, Object
         AsyncCommand<Object, Object, Object> asyncCommand = new AsyncCommand<>(command);
 
         if (commandMethod.isFutureExecution()) {
-            return connection.dispatch(asyncCommand);
+
+            RedisCommand<Object, Object, Object> dispatched = connection.dispatch(asyncCommand);
+
+            if (dispatched instanceof AsyncCommand) {
+                return dispatched;
+            }
+
+            return asyncCommand;
         }
 
         connection.dispatch(asyncCommand);
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java
index a3940935ca..f5c452b267 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java
@@ -19,12 +19,14 @@
 
 import java.time.Duration;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 
 import javax.inject.Inject;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import io.lettuce.core.RedisFuture;
 import io.lettuce.core.TestSupport;
 import io.lettuce.core.Value;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
@@ -36,30 +38,31 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-public class RedisCommandsClusterIntegrationTests extends TestSupport {
+class RedisCommandsClusterIntegrationTests extends TestSupport {
 
     private final StatefulRedisClusterConnection<String, String> connection;
 
     @Inject
-    public RedisCommandsClusterIntegrationTests(StatefulRedisClusterConnection<String, String> connection) {
+    RedisCommandsClusterIntegrationTests(StatefulRedisClusterConnection<String, String> connection) {
         this.connection = connection;
         this.connection.sync().flushall();
     }
 
     @Test
-    public void sync() {
+    void future() throws ExecutionException, InterruptedException {
 
         RedisCommandFactory factory = new RedisCommandFactory(connection);
 
         SynchronousCommands api = factory.getCommands(SynchronousCommands.class);
 
         api.setSync(key, value, Timeout.create(Duration.ofSeconds(10)));
-        assertThat(api.get("key")).isEqualTo("value");
+
+        assertThat(api.get("key").get()).isEqualTo("value");
         assertThat(api.getAsBytes("key")).isEqualTo("value".getBytes());
     }
 
     @Test
-    public void shouldRouteBinaryKey() {
+    void shouldRouteBinaryKey() {
 
         connection.sync().set(key, value);
 
@@ -71,7 +74,7 @@ public void shouldRouteBinaryKey() {
     }
 
     @Test
-    public void mgetAsValues() {
+    void mgetAsValues() {
 
         connection.sync().set(key, value);
 
@@ -88,7 +91,7 @@ interface SynchronousCommands extends Commands {
 
         byte[] get(byte[] key);
 
-        String get(String key);
+        RedisFuture<String> get(String key);
 
         @Command("GET")
         byte[] getAsBytes(String key);

From 30cfd1d8837340e9f72c5970749e75c89f20c84d Mon Sep 17 00:00:00 2001
From: Poorva Gokhale <poorvasgokhale@gmail.com>
Date: Tue, 12 Mar 2019 16:05:03 +0530
Subject: [PATCH 609/808] Synchronize ClientResources shutdown with channel
 close completion #998

ClientResources are released after awaiting channel close completion to avoid event loop termination before the channels had a chance to get closed.

Co-authored-by: Pritam Kadam <kpritam@thoughtworks.com>
Original pull request: #1000.
---
 .../io/lettuce/core/AbstractRedisClient.java  | 82 +++++++++++--------
 1 file changed, 46 insertions(+), 36 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 852813e839..e0b913f76b 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -434,55 +434,65 @@ public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, Tim
 
             logger.debug("Initiate shutdown ({}, {}, {})", quietPeriod, timeout, timeUnit);
 
-            List<CompletableFuture<Void>> closeFutures = new ArrayList<>();
-
-            while (!closeableResources.isEmpty()) {
-                Closeable closeableResource = closeableResources.iterator().next();
+            return closeOtherResources().thenCompose((value) ->
+                    closeClientResources(quietPeriod, timeout, timeUnit)
+            );
+        }
 
-                if (closeableResource instanceof AsyncCloseable) {
+        return completedFuture(null);
+    }
 
-                    closeFutures.add(((AsyncCloseable) closeableResource).closeAsync());
-                } else {
-                    try {
-                        closeableResource.close();
-                    } catch (Exception e) {
-                        logger.debug("Exception on Close: " + e.getMessage(), e);
-                    }
-                }
-                closeableResources.remove(closeableResource);
-            }
+    private CompletableFuture<Void> closeOtherResources() {
+        List<CompletableFuture<Void>> closeFutures = new ArrayList<>();
 
-            for (Channel c : channels) {
+        while (!closeableResources.isEmpty()) {
+            Closeable closeableResource = closeableResources.iterator().next();
 
-                ChannelPipeline pipeline = c.pipeline();
+            if (closeableResource instanceof AsyncCloseable) {
 
-                ConnectionWatchdog commandHandler = pipeline.get(ConnectionWatchdog.class);
-                if (commandHandler != null) {
-                    commandHandler.setListenOnChannelInactive(false);
+                closeFutures.add(((AsyncCloseable) closeableResource).closeAsync());
+            } else {
+                try {
+                    closeableResource.close();
+                } catch (Exception e) {
+                    logger.debug("Exception on Close: " + e.getMessage(), e);
                 }
             }
+            closeableResources.remove(closeableResource);
+        }
 
-            try {
-                closeFutures.add(toCompletableFuture(channels.close()));
-            } catch (Exception e) {
-                logger.debug("Cannot close channels", e);
-            }
+        for (Channel c : channels) {
 
-            if (!sharedResources) {
-                Future<?> groupCloseFuture = clientResources.shutdown(quietPeriod, timeout, timeUnit);
-                closeFutures.add(toCompletableFuture(groupCloseFuture));
-            } else {
-                for (EventLoopGroup eventExecutors : eventLoopGroups.values()) {
-                    Future<?> groupCloseFuture = clientResources.eventLoopGroupProvider().release(eventExecutors, quietPeriod,
-                            timeout, timeUnit);
-                    closeFutures.add(toCompletableFuture(groupCloseFuture));
-                }
+            ChannelPipeline pipeline = c.pipeline();
+
+            ConnectionWatchdog commandHandler = pipeline.get(ConnectionWatchdog.class);
+            if (commandHandler != null) {
+                commandHandler.setListenOnChannelInactive(false);
             }
+        }
 
-            return Futures.allOf(closeFutures);
+        try {
+            closeFutures.add(toCompletableFuture(channels.close()));
+        } catch (Exception e) {
+            logger.debug("Cannot close channels", e);
         }
 
-        return completedFuture(null);
+        return Futures.allOf(closeFutures);
+    }
+
+    private CompletableFuture<Void> closeClientResources(long quietPeriod, long timeout, TimeUnit timeUnit) {
+        List<CompletableFuture<Void>> groupCloseFutures = new ArrayList<>();
+        if (!sharedResources) {
+            Future<?> groupCloseFuture = clientResources.shutdown(quietPeriod, timeout, timeUnit);
+            groupCloseFutures.add(toCompletableFuture(groupCloseFuture));
+        } else {
+            for (EventLoopGroup eventExecutors : eventLoopGroups.values()) {
+                Future<?> groupCloseFuture = clientResources.eventLoopGroupProvider().release(eventExecutors, quietPeriod,
+                        timeout, timeUnit);
+                groupCloseFutures.add(toCompletableFuture(groupCloseFuture));
+            }
+        }
+        return Futures.allOf(groupCloseFutures);
     }
 
     protected int getResourceCount() {

From f677da6583d4ccdcf6dd998873d3c45e4e808c25 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 14 Mar 2019 12:07:11 +0100
Subject: [PATCH 610/808] Polishing #998

Add author tags. Reformat. Add unit tests.

Original pull request: #1000
---
 .../io/lettuce/core/AbstractRedisClient.java  |  9 +-
 .../io/lettuce/core/RedisClientUnitTests.java | 99 +++++++++++++++++++
 2 files changed, 103 insertions(+), 5 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/RedisClientUnitTests.java

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index e0b913f76b..b9cb19c49a 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -60,6 +60,7 @@
  *
  * @author Mark Paluch
  * @author Jongyeol Choi
+ * @author Poorva Gokhale
  * @since 3.0
  * @see ClientResources
  */
@@ -433,16 +434,14 @@ public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, Tim
         if (shutdown.compareAndSet(false, true)) {
 
             logger.debug("Initiate shutdown ({}, {}, {})", quietPeriod, timeout, timeUnit);
-
-            return closeOtherResources().thenCompose((value) ->
-                    closeClientResources(quietPeriod, timeout, timeUnit)
-            );
+            return closeResources().thenCompose((value) -> closeClientResources(quietPeriod, timeout, timeUnit));
         }
 
         return completedFuture(null);
     }
 
-    private CompletableFuture<Void> closeOtherResources() {
+    private CompletableFuture<Void> closeResources() {
+
         List<CompletableFuture<Void>> closeFutures = new ArrayList<>();
 
         while (!closeableResources.isEmpty()) {
diff --git a/src/test/java/io/lettuce/core/RedisClientUnitTests.java b/src/test/java/io/lettuce/core/RedisClientUnitTests.java
new file mode 100644
index 0000000000..d00cf618bf
--- /dev/null
+++ b/src/test/java/io/lettuce/core/RedisClientUnitTests.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.Closeable;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import io.lettuce.core.internal.AsyncCloseable;
+import io.lettuce.core.resource.ClientResources;
+import io.netty.util.concurrent.ImmediateEventExecutor;
+
+/**
+ * Unit tests for {@link RedisClient}.
+ *
+ * @author Mark Paluch
+ */
+@SuppressWarnings("unchecked")
+@ExtendWith(MockitoExtension.class)
+class RedisClientUnitTests {
+
+    @Mock
+    ClientResources clientResources;
+
+    @Mock(extraInterfaces = Closeable.class)
+    AsyncCloseable asyncCloseable;
+
+    @Test
+    void shutdownShouldDeferResourcesShutdown() {
+
+        when(clientResources.eventExecutorGroup()).thenReturn(ImmediateEventExecutor.INSTANCE);
+
+        CompletableFuture<Void> completableFuture = new CompletableFuture<>();
+        when(asyncCloseable.closeAsync()).thenReturn(completableFuture);
+
+        RedisClient redisClient = RedisClient.create(clientResources, "redis://foo");
+        ReflectionTestUtils.setField(redisClient, "sharedResources", false);
+
+        Set<AsyncCloseable> closeableResources = (Set) ReflectionTestUtils.getField(redisClient, "closeableResources");
+        closeableResources.add(asyncCloseable);
+
+        CompletableFuture<Void> future = redisClient.shutdownAsync();
+
+        verify(asyncCloseable).closeAsync();
+        verify(clientResources, never()).shutdown(anyLong(), anyLong(), any());
+        assertThat(future).isNotDone();
+    }
+
+    @Test
+    void shutdownShutsDownResourcesAfterChannels() {
+
+        when(clientResources.eventExecutorGroup()).thenReturn(ImmediateEventExecutor.INSTANCE);
+
+        CompletableFuture<Void> completableFuture = new CompletableFuture<>();
+        when(asyncCloseable.closeAsync()).thenReturn(completableFuture);
+
+        RedisClient redisClient = RedisClient.create(clientResources, "redis://foo");
+        ReflectionTestUtils.setField(redisClient, "sharedResources", false);
+
+        Set<AsyncCloseable> closeableResources = (Set) ReflectionTestUtils.getField(redisClient, "closeableResources");
+        closeableResources.add(asyncCloseable);
+
+        CompletableFuture<Void> future = redisClient.shutdownAsync();
+
+        verify(asyncCloseable).closeAsync();
+        verify(clientResources, never()).shutdown(anyLong(), anyLong(), any());
+
+        completableFuture.complete(null);
+
+        verify(clientResources).shutdown(anyLong(), anyLong(), any());
+        assertThat(future).isDone();
+    }
+}

From 5d979d65ada0c5508f0666b664e811ddd49f7da4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 14 Mar 2019 12:44:16 +0100
Subject: [PATCH 611/808] Guard Pub/Sub callbacks against exceptions #997

Pub/Sub listener callbacks are now guarded against exceptions bubbling up into channel processing. Instead, exceptions are logged. Listener notification stops on the first exception.

These guards prevent exceptions interrupting the state update flow which could previously cause the state machine of decoding leave in an invalid state.
---
 .../core/pubsub/PubSubCommandHandler.java     | 20 ++++++++---
 .../lettuce/core/pubsub/PubSubEndpoint.java   |  9 ++++-
 .../pubsub/PubSubCommandHandlerUnitTests.java | 33 +++++++++++++++++++
 .../core/pubsub/PubSubEndpointUnitTests.java  | 29 ++++++++++++++++
 4 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
index 26fb20a5f0..8d2e25fc8f 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
@@ -30,6 +30,8 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
  * A netty {@link ChannelHandler} responsible for writing Redis Pub/Sub commands and reading the response stream from the
@@ -45,6 +47,8 @@
  */
 public class PubSubCommandHandler<K, V> extends CommandHandler {
 
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(PubSubCommandHandler.class);
+
     private final PubSubEndpoint<K, V> endpoint;
     private final RedisCodec<K, V> codec;
     private final Deque<ReplayOutput<K, V>> queue = new ArrayDeque<>();
@@ -91,7 +95,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
 
             RedisCommand<?, ?, ?> peek = getStack().peek();
             canComplete(peek);
-            endpoint.notifyMessage(output);
+            doNotifyMessage(output);
             output = new PubSubOutput<>(codec);
         }
 
@@ -103,7 +107,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
         while ((replay = queue.poll()) != null) {
 
             replay.replay(output);
-            endpoint.notifyMessage(output);
+            doNotifyMessage(output);
             output = new PubSubOutput<>(codec);
         }
 
@@ -113,7 +117,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Interrup
                 return;
             }
 
-            endpoint.notifyMessage(output);
+            doNotifyMessage(output);
             output = new PubSubOutput<>(codec);
         }
 
@@ -201,7 +205,15 @@ private static boolean isPubSubMessage(ResponseHeaderReplayOutput<?, ?> replay)
     protected void afterDecode(ChannelHandlerContext ctx, RedisCommand<?, ?, ?> command) {
 
         if (command.getOutput() instanceof PubSubOutput) {
-            endpoint.notifyMessage((PubSubOutput) command.getOutput());
+            doNotifyMessage((PubSubOutput) command.getOutput());
+        }
+    }
+
+    private void doNotifyMessage(PubSubOutput<K, V, V> output) {
+        try {
+            endpoint.notifyMessage(output);
+        } catch (Exception e) {
+            logger.error("Unexpected error occurred in PubSubEndpoint.notifyMessage", e);
         }
     }
 
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
index a6eeda339a..358205b7c4 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
@@ -26,12 +26,15 @@
 import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.resource.ClientResources;
 import io.netty.channel.Channel;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
  * @author Mark Paluch
  */
 public class PubSubEndpoint<K, V> extends DefaultEndpoint {
 
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(PubSubEndpoint.class);
     private static final Set<String> ALLOWED_COMMANDS_SUBSCRIBED;
     private static final Set<String> SUBSCRIBE_COMMANDS;
     private final List<RedisPubSubListener<K, V>> listeners = new CopyOnWriteArrayList<>();
@@ -167,7 +170,11 @@ public void notifyMessage(PubSubOutput<K, V, V> output) {
         }
 
         updateInternalState(output);
-        notifyListeners(output);
+        try {
+            notifyListeners(output);
+        } catch (Exception e) {
+            logger.error("Unexpected error occurred in RedisPubSubListener callback", e);
+        }
     }
 
     protected void notifyListeners(PubSubOutput<K, V, V> output) {
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
index efefdd8028..f25436b999 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -31,6 +32,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
+import org.mockito.stubbing.Answer;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.ClientOptions;
@@ -51,6 +53,7 @@
 
 /**
  * @author Mark Paluch
+ * @author Giridhar Kannan
  */
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
@@ -264,6 +267,36 @@ void shouldCompleteWithChunkedResponseOutOfBand() throws Exception {
         assertThat(captor.getAllValues().get(1).channel()).isEqualTo("b");
     }
 
+    @Test
+    void shouldCompleteUnsubscribe() throws Exception {
+
+        Command<String, String, String> subCmd = new Command<>(CommandType.SUBSCRIBE,
+                new PubSubOutput<>(new Utf8StringCodec()), null);
+        Command<String, String, String> unSubCmd = new Command<>(CommandType.UNSUBSCRIBE, new PubSubOutput<>(
+                new Utf8StringCodec()), null);
+
+        doAnswer((Answer<PubSubEndpoint<String, String>>) inv -> {
+            PubSubOutput<String, String, String> out = inv.getArgument(0);
+            if (out.type() == PubSubOutput.Type.message) {
+                throw new NullPointerException();
+            }
+            return endpoint;
+        }).when(endpoint).notifyMessage(any());
+
+        sut.channelRegistered(context);
+        sut.channelActive(context);
+
+        stack.add(subCmd);
+        stack.add(unSubCmd);
+        ByteBuf buf = responseBytes("*3\r\n$9\r\nsubscribe\r\n$10\r\ntest_sub_0\r\n:1\r\n"
+                + "*3\r\n$7\r\nmessage\r\n$10\r\ntest_sub_0\r\n$3\r\nabc\r\n"
+                + "*3\r\n$11\r\nunsubscribe\r\n$10\r\ntest_sub_0\r\n:0\r\n");
+        sut.channelRead(context, buf);
+        sut.channelRead(context, responseBytes("*3\r\n$7\r\nmessage\r\n$10\r\ntest_sub_1\r\n$3\r\nabc\r\n"));
+
+        assertThat(unSubCmd.isDone()).isTrue();
+    }
+
     @Test
     void shouldCompleteWithChunkedResponseInterleavedSending() throws Exception {
 
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java b/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java
index 5559ce5537..a39423a3d3 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java
@@ -18,6 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.nio.ByteBuffer;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.jupiter.api.Test;
 
@@ -86,6 +87,34 @@ void addsAndRemovesChannels() {
         assertThat(sut.getChannels()).isEmpty();
     }
 
+    @Test
+    void listenerNotificationShouldFailGracefully() {
+
+        PubSubEndpoint<byte[], byte[]> sut = new PubSubEndpoint<>(ClientOptions.create(), TestClientResources.get());
+
+        AtomicInteger notified = new AtomicInteger();
+
+        sut.addListener(new RedisPubSubAdapter<byte[], byte[]>() {
+            @Override
+            public void message(byte[] channel, byte[] message) {
+
+                notified.incrementAndGet();
+                throw new UnsupportedOperationException();
+            }
+        });
+
+        sut.addListener(new RedisPubSubAdapter<byte[], byte[]>() {
+            @Override
+            public void message(byte[] channel, byte[] message) {
+                notified.incrementAndGet();
+            }
+        });
+
+        sut.notifyMessage(createMessage("message", "channel1", ByteArrayCodec.INSTANCE));
+
+        assertThat(notified).hasValue(1);
+    }
+
     private static <K, V> PubSubOutput<K, V, V> createMessage(String action, String channel, RedisCodec<K, V> codec) {
 
         PubSubOutput<K, V, V> output = new PubSubOutput<>(codec);

From 89054be5d963ff4d4839237e93327c92d84549a3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 24 Nov 2018 19:14:59 +0100
Subject: [PATCH 612/808] Add CipherCodec #934

Lettuce now provides a CipherCodec that allows transparent data encryption and decryption for Redis values.

CipherCodec.CipherSupplier encrypt = (keyDescriptor) -> {

    Cipher cipher = Cipher.getInstance(transform);
    cipher.init(Cipher.DECRYPT_MODE, key, iv);
    return cipher;
};

CipherCodec.CipherSupplier decrypt = (keyDescriptor) -> {

    Cipher cipher = Cipher.getInstance(transform);
    cipher.init(Cipher.DECRYPT_MODE, key, iv);
    return cipher;
};

RedisCodec<String, String> crypto = CipherCodec.forValues(StringCodec.UTF8, encrypt, decrypt);
---
 .../io/lettuce/core/codec/CipherCodec.java    | 367 ++++++++++++++++++
 .../lettuce/core/codec/CompressionCodec.java  |   1 -
 .../core/CustomCodecIntegrationTests.java     |  39 +-
 .../core/codec/CipherCodecUnitTests.java      | 157 ++++++++
 4 files changed, 559 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/codec/CipherCodec.java
 create mode 100644 src/test/java/io/lettuce/core/codec/CipherCodecUnitTests.java

diff --git a/src/main/java/io/lettuce/core/codec/CipherCodec.java b/src/main/java/io/lettuce/core/codec/CipherCodec.java
new file mode 100644
index 0000000000..d9494fa31d
--- /dev/null
+++ b/src/main/java/io/lettuce/core/codec/CipherCodec.java
@@ -0,0 +1,367 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.codec;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.security.GeneralSecurityException;
+
+import javax.crypto.Cipher;
+
+import io.lettuce.core.internal.LettuceAssert;
+import io.netty.buffer.ByteBuf;
+
+/**
+ * A crypto {@link RedisCodec} that that allows transparent encryption/decryption of values. This codec uses {@link Cipher}
+ * instances provided by {@link CipherSupplier} to process encryption and decryption.
+ * <p/>
+ * This codec supports various keys by encoding the key name and used key version in the value that is stored in Redis.
+ * Decryption decodes the key name and requests a {@link Cipher} from {@link CipherSupplier} to decrypt values with an
+ * appropriate key/{@link Cipher}.
+ * <p/>
+ * This {@link RedisCodec codec} does not provide re-wrapping or key rotation features.
+ *
+ * @author Mark Paluch
+ * @since 5.2
+ * @see CipherSupplier
+ * @see KeyDescriptor
+ */
+public abstract class CipherCodec {
+
+    private CipherCodec() {
+    }
+
+    /**
+     * A {@link RedisCodec} that compresses values from a delegating {@link RedisCodec}.
+     *
+     * @param delegate codec used for key-value encoding/decoding, must not be {@literal null}.
+     * @param encrypt the {@link CipherSupplier} of encryption {@link Cipher} to use.
+     * @param decrypt the {@link CipherSupplier} of decryption {@link Cipher} to use.
+     * @param <K> Key type.
+     * @param <V> Value type.
+     * @return Cipher codec.
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public static <K, V> RedisCodec<K, V> forValues(RedisCodec<K, V> delegate, CipherSupplier encrypt, CipherSupplier decrypt) {
+        LettuceAssert.notNull(delegate, "RedisCodec must not be null");
+        LettuceAssert.notNull(encrypt, "Encryption Supplier must not be null");
+        LettuceAssert.notNull(decrypt, "Decryption Supplier must not be null");
+        return (RedisCodec) new CipherCodecWrapper((RedisCodec) delegate, encrypt, decrypt);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static class CipherCodecWrapper implements RedisCodec<Object, Object>, ToByteBufEncoder<Object, Object> {
+
+        private RedisCodec<Object, Object> delegate;
+        private CipherSupplier encrypt;
+        private CipherSupplier decrypt;
+
+        CipherCodecWrapper(RedisCodec<Object, Object> delegate, CipherSupplier encrypt, CipherSupplier decrypt) {
+
+            this.delegate = delegate;
+            this.encrypt = encrypt;
+            this.decrypt = decrypt;
+        }
+
+        @Override
+        public Object decodeKey(ByteBuffer bytes) {
+            return delegate.decodeKey(bytes);
+        }
+
+        @Override
+        public Object decodeValue(ByteBuffer bytes) {
+
+            KeyDescriptor keyDescriptor = KeyDescriptor.from(bytes);
+
+            try {
+                return delegate.decodeValue(doWithCipher(this.decrypt.get(keyDescriptor), bytes));
+            } catch (GeneralSecurityException e) {
+                throw new IllegalStateException(e);
+            }
+        }
+
+        @Override
+        public void encodeKey(Object key, ByteBuf target) {
+
+            if (delegate instanceof ToByteBufEncoder) {
+                ((ToByteBufEncoder) delegate).encodeKey(key, target);
+                return;
+            }
+
+            target.writeBytes(delegate.encodeKey(key));
+        }
+
+        @Override
+        public void encodeValue(Object value, ByteBuf target) {
+
+            ByteBuf serialized;
+            if (delegate instanceof ToByteBufEncoder) {
+                serialized = target.alloc().buffer(estimateSize(value));
+                ((ToByteBufEncoder) delegate).encodeKey(value, serialized);
+            } else {
+                ByteBuffer byteBuffer = delegate.encodeValue(value);
+                serialized = target.alloc().buffer(byteBuffer.remaining());
+                serialized.writeBytes(byteBuffer);
+            }
+
+            try {
+                KeyDescriptor keyDescriptor = this.encrypt.encryptionKey();
+                Cipher cipher = this.encrypt.get(keyDescriptor);
+
+                keyDescriptor.writeTo(target);
+                doWithCipher(cipher, serialized, target);
+            } catch (GeneralSecurityException e) {
+                throw new IllegalStateException(e);
+            } finally {
+                serialized.release();
+            }
+        }
+
+        @Override
+        public int estimateSize(Object keyOrValue) {
+
+            if (delegate instanceof ToByteBufEncoder) {
+                return ((ToByteBufEncoder) delegate).estimateSize(keyOrValue);
+            }
+
+            return /* blocksize */16 + /* avg key descriptor size */8;
+        }
+
+        @Override
+        public ByteBuffer encodeKey(Object key) {
+            return delegate.encodeKey(key);
+        }
+
+        @Override
+        public ByteBuffer encodeValue(Object value) {
+            try {
+
+                ByteBuffer serialized = delegate.encodeValue(value);
+                KeyDescriptor keyDescriptor = this.encrypt.encryptionKey();
+                Cipher cipher = this.encrypt.get(keyDescriptor);
+
+                ByteBuffer intermediate = ByteBuffer.allocate(cipher.getOutputSize(serialized.remaining() + 3
+                        + keyDescriptor.name.length + 10));
+
+                keyDescriptor.writeTo(intermediate);
+                intermediate.put(doWithCipher(cipher, serialized));
+                intermediate.flip();
+
+                return intermediate;
+            } catch (GeneralSecurityException e) {
+                throw new IllegalStateException(e);
+            }
+        }
+
+        private void doWithCipher(Cipher cipher, ByteBuf serialized, ByteBuf target) throws GeneralSecurityException {
+
+            ByteBuffer intermediate = ByteBuffer.allocate(cipher.getOutputSize(serialized.readableBytes()));
+
+            ByteBuffer buffer = serialized.nioBuffer();
+
+            cipher.update(buffer, intermediate);
+            cipher.doFinal(buffer, intermediate);
+
+            intermediate.flip();
+            target.writeBytes(intermediate);
+
+            serialized.readerIndex(serialized.writerIndex());
+        }
+
+        private ByteBuffer doWithCipher(Cipher cipher, ByteBuffer source) throws GeneralSecurityException {
+
+            byte[] encrypted = new byte[source.remaining()];
+            source.get(encrypted);
+
+            byte[] update = cipher.update(encrypted);
+            byte[] finalBytes = cipher.doFinal();
+
+            ByteBuffer buffer = ByteBuffer.allocate(update.length + finalBytes.length);
+            buffer.put(update).put(finalBytes).flip();
+
+            return buffer;
+        }
+    }
+
+    /**
+     * Represents a supplier of {@link Cipher}. Requires to return a new {@link Cipher} instance as ciphers are one-time use
+     * only.
+     */
+    @FunctionalInterface
+    public interface CipherSupplier {
+
+        /**
+         * Creates a new {@link Cipher}.
+         *
+         * @return a new {@link Cipher}.
+         * @throws GeneralSecurityException
+         * @param keyDescriptor the key to use for the returned {@link Cipher}.
+         */
+        Cipher get(KeyDescriptor keyDescriptor) throws GeneralSecurityException;
+
+        /**
+         * Returns the latest {@link KeyDescriptor} to use for encryption.
+         *
+         * @return the {@link KeyDescriptor} to use for encryption.
+         */
+        default KeyDescriptor encryptionKey() {
+            return KeyDescriptor.unnamed();
+        }
+    }
+
+    /**
+     * Descriptor to determine which crypto key to use. Allows versioning and usage of named keys. Key names must not contain
+     * dollar {@code $} or plus {@code +} characters as these characters are used within the message format to encode key name
+     * and key version.
+     */
+    public static class KeyDescriptor {
+
+        private static final KeyDescriptor UNNAMED = new KeyDescriptor("".getBytes(StandardCharsets.US_ASCII), 0);
+
+        private final byte[] name;
+        private final int version;
+
+        private KeyDescriptor(byte[] name, int version) {
+
+            for (byte b : name) {
+                if (b == '+' || b == '$') {
+                    throw new IllegalArgumentException(String.format(
+                            "Key name %s must not contain plus (+) or dollar ($) characters", new String(name)));
+                }
+            }
+            this.name = name;
+            this.version = version;
+        }
+
+        /**
+         * Returns the default {@link KeyDescriptor} that has no specified name.
+         *
+         * @return the default {@link KeyDescriptor}.
+         */
+        public static KeyDescriptor unnamed() {
+            return UNNAMED;
+        }
+
+        /**
+         * Create a named {@link KeyDescriptor} without version. Version defaults to zero.
+         *
+         * @param name the key name. Must not contain plus or dollar character.
+         * @return the {@link KeyDescriptor} for {@code name}.
+         */
+        public static KeyDescriptor create(String name) {
+            return create(name, 0);
+        }
+
+        /**
+         * Create a named and versioned {@link KeyDescriptor}.
+         *
+         * @param name the key name. Must not contain plus or dollar character.
+         * @param version the key version.
+         * @return the {@link KeyDescriptor} for {@code name}.
+         */
+        public static KeyDescriptor create(String name, int version) {
+            return create(name, version, Charset.defaultCharset());
+        }
+
+        /**
+         * Create a named and versioned {@link KeyDescriptor} using {@link Charset} to encode {@code name} to its binary
+         * representation.
+         *
+         * @param name the key name. Must not contain plus or dollar character.
+         * @param version the key version.
+         * @param charset must not be {@literal null}.
+         * @return the {@link KeyDescriptor} for {@code name}.
+         */
+        public static KeyDescriptor create(String name, int version, Charset charset) {
+
+            LettuceAssert.notNull(name, "Name must not be null");
+            LettuceAssert.notNull(charset, "Charset must not be null");
+
+            return new KeyDescriptor(name.getBytes(charset), version);
+        }
+
+        static KeyDescriptor from(ByteBuffer bytes) {
+
+            int end = -1;
+            int version = -1;
+
+            if (bytes.get() != '$') {
+                throw new IllegalArgumentException("Cannot extract KeyDescriptor. Malformed message header.");
+            }
+
+            for (int i = 0; i < bytes.remaining(); i++) {
+                if (bytes.get(bytes.position() + i) == '$') {
+                    end = bytes.position() + i;
+                    break;
+                }
+
+                if (bytes.get(bytes.position() + i) == '+') {
+                    version = bytes.position() + i;
+                }
+            }
+
+            if (end == -1 || version == -1) {
+                throw new IllegalArgumentException("Cannot extract KeyDescriptor");
+            }
+
+            byte[] name = new byte[version - 1];
+            bytes.get(name);
+            bytes.get();
+
+            byte[] versionBytes = new byte[end - version - 1];
+            bytes.get(versionBytes);
+            bytes.get(); // skip last char
+
+            return new KeyDescriptor(name, Integer.parseInt(new String(versionBytes)));
+        }
+
+        public int getVersion() {
+            return version;
+        }
+
+        /**
+         * Returns the key {@code name} by decoding name bytes using the {@link Charset#defaultCharset() default charset}.
+         *
+         * @return the key name.
+         */
+        public String getName() {
+            return getName(Charset.defaultCharset());
+        }
+
+        /**
+         * Returns the key {@code name} by decoding name bytes using the given {@link Charset}.
+         *
+         * @param charset the {@link Charset} to use to decode the key name, must not be {@literal null}.
+         * @return the key name.
+         */
+        public String getName(Charset charset) {
+
+            LettuceAssert.notNull(charset, "Charset must not be null");
+            return new String(name, charset);
+        }
+
+        void writeTo(ByteBuf target) {
+            target.writeByte('$').writeBytes(this.name).writeByte('+').writeBytes(Integer.toString(this.version).getBytes())
+                    .writeByte('$');
+        }
+
+        void writeTo(ByteBuffer target) {
+            target.put((byte) '$').put(this.name).put((byte) '+').put(Integer.toString(this.version).getBytes())
+                    .put((byte) '$');
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/codec/CompressionCodec.java b/src/main/java/io/lettuce/core/codec/CompressionCodec.java
index 269db5b36b..a912cff0a4 100644
--- a/src/main/java/io/lettuce/core/codec/CompressionCodec.java
+++ b/src/main/java/io/lettuce/core/codec/CompressionCodec.java
@@ -141,7 +141,6 @@ private ByteBuffer decompress(ByteBuffer source) throws IOException {
 
             return ByteBuffer.wrap(outputStream.toByteArray());
         }
-
     }
 
     /**
diff --git a/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java b/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
index aaaf1d8ec5..f9f445a1bb 100644
--- a/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
@@ -22,6 +22,9 @@
 import java.nio.charset.Charset;
 import java.util.List;
 
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
 import javax.inject.Inject;
 
 import org.junit.jupiter.api.Test;
@@ -30,9 +33,7 @@
 import reactor.test.StepVerifier;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.codec.ByteArrayCodec;
-import io.lettuce.core.codec.CompressionCodec;
-import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.*;
 import io.lettuce.test.LettuceExtension;
 
 /**
@@ -42,6 +43,25 @@
 @ExtendWith(LettuceExtension.class)
 class CustomCodecIntegrationTests extends TestSupport {
 
+    private final SecretKeySpec secretKey = new SecretKeySpec("1234567890123456".getBytes(), "AES");
+    private final IvParameterSpec iv = new IvParameterSpec("1234567890123456".getBytes());
+    // Creates a CryptoCipher instance with the transformation and properties.
+    private final String transform = "AES/CBC/PKCS5Padding";
+
+    CipherCodec.CipherSupplier encrypt = (CipherCodec.KeyDescriptor keyDescriptor) -> {
+
+        Cipher cipher = Cipher.getInstance(transform);
+        cipher.init(Cipher.ENCRYPT_MODE, secretKey, iv);
+        return cipher;
+    };
+
+    CipherCodec.CipherSupplier decrypt = (CipherCodec.KeyDescriptor keyDescriptor) -> {
+
+        Cipher cipher = Cipher.getInstance(transform);
+        cipher.init(Cipher.DECRYPT_MODE, secretKey, iv);
+        return cipher;
+    };
+
     private final RedisClient client;
 
     @Inject
@@ -95,6 +115,18 @@ void testGzipompressedJavaSerializer() {
         connection.getStatefulConnection().close();
     }
 
+    @Test
+    void testEncryptedCodec() {
+
+        RedisCommands<String, String> connection = client.connect(
+                CipherCodec.forValues(StringCodec.UTF8, encrypt, decrypt)).sync();
+
+        connection.set(key, "foobar");
+        assertThat(connection.get(key)).isEqualTo("foobar");
+
+        connection.getStatefulConnection().close();
+    }
+
     @Test
     void testByteCodec() {
         RedisCommands<byte[], byte[]> connection = client.connect(new ByteArrayCodec()).sync();
@@ -169,5 +201,4 @@ public ByteBuffer encodeValue(Object value) {
             }
         }
     }
-
 }
diff --git a/src/test/java/io/lettuce/core/codec/CipherCodecUnitTests.java b/src/test/java/io/lettuce/core/codec/CipherCodecUnitTests.java
new file mode 100644
index 0000000000..f817661744
--- /dev/null
+++ b/src/test/java/io/lettuce/core/codec/CipherCodecUnitTests.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.codec;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.security.GeneralSecurityException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+
+/**
+ * Unit tests for {@link CipherCodec}.
+ *
+ * @author Mark Paluch
+ */
+class CipherCodecUnitTests {
+
+    private final SecretKeySpec key = new SecretKeySpec("1234567890123456".getBytes(), "AES");
+    private final IvParameterSpec iv = new IvParameterSpec("1234567890123456".getBytes());
+    private final String transform = "AES/CBC/PKCS5Padding";
+
+    CipherCodec.CipherSupplier encrypt = new CipherCodec.CipherSupplier() {
+        @Override
+        public Cipher get(CipherCodec.KeyDescriptor keyDescriptor) throws GeneralSecurityException {
+
+            Cipher cipher = Cipher.getInstance(transform);
+            cipher.init(Cipher.ENCRYPT_MODE, key, iv);
+            return cipher;
+        }
+
+        @Override
+        public CipherCodec.KeyDescriptor encryptionKey() {
+            return CipherCodec.KeyDescriptor.create("foobar", 142);
+        }
+    };
+
+    CipherCodec.CipherSupplier decrypt = (CipherCodec.KeyDescriptor keyDescriptor) -> {
+
+        Cipher cipher = Cipher.getInstance(transform);
+        cipher.init(Cipher.DECRYPT_MODE, key, iv);
+        return cipher;
+    };
+
+    @ParameterizedTest
+    @MethodSource("cryptoTestValues")
+    void shouldEncryptValue(CryptoTestArgs testArgs) {
+
+        RedisCodec<String, String> crypto = CipherCodec.forValues(StringCodec.UTF8, encrypt, decrypt);
+
+        ByteBuffer encrypted = crypto.encodeValue(testArgs.content);
+        assertThat(encrypted).isNotEqualTo(ByteBuffer.wrap(testArgs.content.getBytes()));
+
+        assertThat(new String(encrypted.array())).startsWith("$foobar+142$");
+
+        String decrypted = crypto.decodeValue(encrypted);
+        assertThat(decrypted).isEqualTo(testArgs.content);
+        assertThat(StringCodec.UTF8.encodeValue(testArgs.content)).isEqualTo(ByteBuffer.wrap(testArgs.content.getBytes()));
+    }
+
+    @ParameterizedTest
+    @MethodSource("cryptoTestValues")
+    void shouldEncryptValueToByteBuf(CryptoTestArgs testArgs) {
+
+        RedisCodec<String, String> crypto = CipherCodec.forValues(StringCodec.UTF8, encrypt, decrypt);
+
+        ToByteBufEncoder<String, String> direct = (ToByteBufEncoder<String, String>) crypto;
+
+        ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
+        ByteBuf target = allocator.buffer();
+
+        direct.encodeValue(testArgs.content, target);
+
+        assertThat(target).isNotEqualTo(Unpooled.wrappedBuffer(testArgs.content.getBytes()));
+        assertThat(target.toString(0, 20, StandardCharsets.US_ASCII)).startsWith("$foobar+142$");
+
+        String result = crypto.decodeValue(target.nioBuffer());
+        assertThat(result).isEqualTo(testArgs.content);
+    }
+
+    static List<CryptoTestArgs> cryptoTestValues() {
+
+        StringBuilder hugeString = new StringBuilder();
+        for (int i = 0; i < 1000; i++) {
+            hugeString.append(UUID.randomUUID().toString());
+        }
+
+        return Arrays.asList(new CryptoTestArgs("foobar"), new CryptoTestArgs(hugeString.toString()));
+    }
+
+    @Test
+    void shouldDecryptValue() {
+
+        RedisCodec<String, String> crypto = CipherCodec.forValues(StringCodec.UTF8, encrypt, decrypt);
+
+        ByteBuffer encrypted = ByteBuffer.wrap(new byte[] { 36, 43, 48, 36, -99, -39, 126, -106, -7, -88, 118, -74, 42, 98,
+                117, 81, 37, -124, 26, -88 });// crypto.encodeValue("foobar");
+
+        String result = crypto.decodeValue(encrypted);
+        assertThat(result).isEqualTo("foobar");
+    }
+
+    @Test
+    void shouldRejectPlusAndDollarKeyNames() {
+
+        assertThatThrownBy(() -> CipherCodec.KeyDescriptor.create("my+key")).isInstanceOf(IllegalArgumentException.class);
+        assertThatThrownBy(() -> CipherCodec.KeyDescriptor.create("my$key")).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    static class CryptoTestArgs {
+
+        private final int size;
+        private final String content;
+
+        public CryptoTestArgs(String content) {
+            this.size = content.length();
+            this.content = content;
+        }
+
+        @Override
+        public String toString() {
+            final StringBuffer sb = new StringBuffer();
+            sb.append(getClass().getSimpleName());
+            sb.append(" [size=").append(size);
+            sb.append(']');
+            return sb.toString();
+        }
+    }
+}

From 8e21d2e8048f912e258931e01f8f3bf9e09306f7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 15 Mar 2019 10:04:43 +0100
Subject: [PATCH 613/808] Add support for Redis Sentinel authentication #1002

Redis now supports authentication against Redis Sentinel that was introduced with Redis 5.0.1. The password can be only set programmatically as
URI-based user-info applies to the actual Redis server.

RedisURI sentinelUrl = RedisURI.Builder.sentinel("host", 26379, "my-master", "some-password").build();
---
 .../java/io/lettuce/core/RedisClient.java     | 120 +++++++++++-------
 src/main/java/io/lettuce/core/RedisURI.java   |  91 +++++++++++--
 .../RedisSentinelAsyncCommandsImpl.java       |  24 +++-
 .../RedisSentinelReactiveCommandsImpl.java    |  24 ++++
 .../api/async/RedisSentinelAsyncCommands.java |  26 ++++
 .../RedisSentinelReactiveCommands.java        |  26 ++++
 .../api/sync/RedisSentinelCommands.java       |  26 ++++
 .../core/RedisURIBuilderUnitTests.java        |  55 ++++++--
 8 files changed, 323 insertions(+), 69 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 21b3d71b4b..3443b71413 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -21,9 +21,11 @@
 import java.net.SocketAddress;
 import java.time.Duration;
 import java.util.List;
+import java.util.Queue;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.function.Supplier;
 
 import reactor.core.publisher.Mono;
@@ -283,8 +285,7 @@ private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandalone
 
     @SuppressWarnings("unchecked")
     private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnectionImpl<K, V> connection,
-            RedisCodec<K, V> codec, Endpoint endpoint,
-            RedisURI redisURI, Supplier<CommandHandler> commandHandlerSupplier) {
+            RedisCodec<K, V> codec, Endpoint endpoint, RedisURI redisURI, Supplier<CommandHandler> commandHandlerSupplier) {
 
         ConnectionBuilder connectionBuilder;
         if (redisURI.isSsl()) {
@@ -432,8 +433,7 @@ private <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubS
         StatefulRedisPubSubConnectionImpl<K, V> connection = newStatefulRedisPubSubConnection(endpoint, writer, codec, timeout);
 
         ConnectionFuture<StatefulRedisPubSubConnection<K, V>> future = connectStatefulAsync(connection, codec, endpoint,
-                redisURI,
-                () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec, endpoint));
+                redisURI, () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec, endpoint));
 
         return future.whenComplete((conn, throwable) -> {
 
@@ -523,6 +523,59 @@ private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectS
         assertNotNull(codec);
         checkValidRedisURI(redisURI);
 
+        logger.debug("Trying to get a Redis Sentinel connection for one of: " + redisURI.getSentinels());
+
+        if (redisURI.getSentinels().isEmpty() && (isNotEmpty(redisURI.getHost()) || !isEmpty(redisURI.getSocket()))) {
+            return doConnectSentinelAsync(codec, redisURI.getClientName(), redisURI, timeout).toCompletableFuture();
+        }
+
+        List<RedisURI> sentinels = redisURI.getSentinels();
+        Queue<Throwable> exceptionCollector = new LinkedBlockingQueue<>();
+        validateUrisAreOfSameConnectionType(sentinels);
+
+        Mono<StatefulRedisSentinelConnection<K, V>> connectionLoop = null;
+
+        for (RedisURI uri : sentinels) {
+
+            String clientName = LettuceStrings.isNotEmpty(uri.getClientName()) ? uri.getClientName() : redisURI.getClientName();
+
+            Mono<StatefulRedisSentinelConnection<K, V>> connectionMono = Mono
+                    .defer(() -> Mono.fromCompletionStage(doConnectSentinelAsync(codec, clientName, uri, timeout)))
+                    .onErrorMap(CompletionException.class, Throwable::getCause)
+                    .onErrorMap(e -> new RedisConnectionException("Cannot connect Redis Sentinel at " + uri, e))
+                    .doOnError(exceptionCollector::add);
+
+            if (connectionLoop == null) {
+                connectionLoop = connectionMono;
+            } else {
+                connectionLoop = connectionLoop.onErrorResume(t -> connectionMono);
+            }
+        }
+
+        if (connectionLoop == null) {
+            return Mono.<StatefulRedisSentinelConnection<K, V>> error(
+                    new RedisConnectionException("Cannot connect to a Redis Sentinel: " + redisURI.getSentinels())).toFuture();
+        }
+
+        return connectionLoop.onErrorMap(
+                e -> {
+
+                    RedisConnectionException ex = new RedisConnectionException("Cannot connect to a Redis Sentinel: "
+                            + redisURI.getSentinels(), e);
+
+                    for (Throwable throwable : exceptionCollector) {
+                        if (e != throwable) {
+                            ex.addSuppressed(throwable);
+                        }
+                    }
+
+                    return ex;
+                }).toFuture();
+    }
+
+    private <K, V> ConnectionFuture<StatefulRedisSentinelConnection<K, V>> doConnectSentinelAsync(RedisCodec<K, V> codec,
+            String clientName, RedisURI redisURI, Duration timeout) {
+
         ConnectionBuilder connectionBuilder = ConnectionBuilder.connectionBuilder();
         connectionBuilder.clientOptions(ClientOptions.copyOf(getOptions()));
         connectionBuilder.clientResources(clientResources);
@@ -536,7 +589,7 @@ private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectS
 
         StatefulRedisSentinelConnectionImpl<K, V> connection = newStatefulRedisSentinelConnection(writer, codec, timeout);
 
-        logger.debug("Trying to get a Redis Sentinel connection for one of: " + redisURI.getSentinels());
+        logger.debug("Connecting to Redis Sentinel, address: " + redisURI);
 
         connectionBuilder.endpoint(endpoint).commandHandler(() -> new CommandHandler(clientOptions, clientResources, endpoint))
                 .connection(connection);
@@ -546,55 +599,32 @@ private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectS
             connectionBuilder.enablePingBeforeConnect();
         }
 
-        Mono<StatefulRedisSentinelConnection<K, V>> connect;
-        if (redisURI.getSentinels().isEmpty() && (isNotEmpty(redisURI.getHost()) || !isEmpty(redisURI.getSocket()))) {
-
-            channelType(connectionBuilder, redisURI);
-            connect = Mono.fromCompletionStage(initializeChannelAsync(connectionBuilder));
-        } else {
+        channelType(connectionBuilder, redisURI);
+        ConnectionFuture<?> sync = initializeChannelAsync(connectionBuilder);
 
-            List<RedisURI> sentinels = redisURI.getSentinels();
-            validateUrisAreOfSameConnectionType(sentinels);
+        if (!clientOptions.isPingBeforeActivateConnection() && hasPassword(redisURI)) {
 
-            Mono<StatefulRedisSentinelConnection<K, V>> connectionLoop = Mono.defer(() -> {
+            sync = sync.thenCompose(channelHandler -> {
 
-                RedisURI uri = sentinels.get(0);
-                channelType(connectionBuilder, uri);
-                return connectSentinel(connectionBuilder, uri);
+                CommandArgs<K, V> args = new CommandArgs<>(codec).add(redisURI.getPassword());
+                return connection.async().dispatch(CommandType.AUTH, new StatusOutput<>(codec), args).toCompletableFuture();
             });
-
-            for (int i = 1; i < sentinels.size(); i++) {
-
-                RedisURI uri = sentinels.get(i);
-                connectionLoop = connectionLoop.onErrorResume(t -> connectSentinel(connectionBuilder, uri));
-            }
-
-            connect = connectionLoop;
         }
 
-        if (LettuceStrings.isNotEmpty(redisURI.getClientName())) {
-            connect = connect.doOnNext(c -> connection.setClientName(redisURI.getClientName()));
+        if (LettuceStrings.isNotEmpty(clientName)) {
+            sync = sync.thenApply(channelHandler -> {
+                connection.setClientName(clientName);
+                return channelHandler;
+            });
         }
 
-        return connect.doOnError(e -> {
-
-            connection.close();
-            throw new RedisConnectionException("Cannot connect to a Redis Sentinel: " + redisURI.getSentinels(), e);
-        }).toFuture();
-    }
-
-    private <K, V> Mono<StatefulRedisSentinelConnection<K, V>> connectSentinel(ConnectionBuilder connectionBuilder, RedisURI uri) {
-
-        connectionBuilder.socketAddressSupplier(getSocketAddressSupplier(uri));
-        SocketAddress socketAddress = clientResources.socketAddressResolver().resolve(uri);
-        logger.debug("Connecting to Redis Sentinel, address: " + socketAddress);
+        return sync.thenApply(ignore -> (StatefulRedisSentinelConnection<K, V>) connection).whenComplete((ignore, e) -> {
 
-        Mono<StatefulRedisSentinelConnection<K, V>> connectionMono = Mono
-                .fromCompletionStage(initializeChannelAsync(connectionBuilder));
-
-        return connectionMono.onErrorMap(CompletionException.class, Throwable::getCause) //
-                .doOnError(t -> logger.warn("Cannot connect Redis Sentinel at " + uri + ": " + t.toString())) //
-                .onErrorMap(e -> new RedisConnectionException("Cannot connect Redis Sentinel at " + uri, e));
+            if (e != null) {
+                logger.warn("Cannot connect Redis Sentinel at " + redisURI + ": " + e.toString());
+                connection.close();
+            }
+        });
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index e5d34013e8..b053b66597 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -349,9 +349,19 @@ public char[] getPassword() {
      * @param password the password, must not be {@literal null}.
      */
     public void setPassword(String password) {
+        setPassword((CharSequence) password);
+    }
+
+    /**
+     * Sets the password. Use empty string to skip authentication.
+     *
+     * @param password the password, must not be {@literal null}.
+     * @since 5.2
+     */
+    public void setPassword(CharSequence password) {
 
         LettuceAssert.notNull(password, "Password must not be null");
-        this.password = password.toCharArray();
+        this.password = password.toString().toCharArray();
     }
 
     /**
@@ -958,11 +968,12 @@ public static class Builder {
         private int database;
         private String clientName;
         private char[] password;
+        private char[] sentinelPassword;
         private boolean ssl = false;
         private boolean verifyPeer = true;
         private boolean startTls = false;
         private Duration timeout = DEFAULT_TIMEOUT_DURATION;
-        private final List<HostAndPort> sentinels = new ArrayList<>();
+        private final List<RedisURI> sentinels = new ArrayList<>();
 
         private Builder() {
         }
@@ -971,7 +982,7 @@ private Builder() {
          * Set Redis socket. Creates a new builder.
          *
          * @param socket the host name
-         * @return New builder with Redis socket.
+         * @return new builder with Redis socket.
          */
         public static Builder socket(String socket) {
 
@@ -986,7 +997,7 @@ public static Builder socket(String socket) {
          * Set Redis host. Creates a new builder.
          *
          * @param host the host name
-         * @return New builder with Redis host/port.
+         * @return new builder with Redis host/port.
          */
         public static Builder redis(String host) {
             return redis(host, DEFAULT_REDIS_PORT);
@@ -997,7 +1008,7 @@ public static Builder redis(String host) {
          *
          * @param host the host name
          * @param port the port
-         * @return New builder with Redis host/port.
+         * @return new builder with Redis host/port.
          */
         public static Builder redis(String host, int port) {
 
@@ -1012,7 +1023,7 @@ public static Builder redis(String host, int port) {
          * Set Sentinel host. Creates a new builder.
          *
          * @param host the host name
-         * @return New builder with Sentinel host/port.
+         * @return new builder with Sentinel host/port.
          */
         public static Builder sentinel(String host) {
 
@@ -1027,7 +1038,7 @@ public static Builder sentinel(String host) {
          *
          * @param host the host name
          * @param port the port
-         * @return New builder with Sentinel host/port.
+         * @return new builder with Sentinel host/port.
          */
         public static Builder sentinel(String host, int port) {
 
@@ -1043,7 +1054,7 @@ public static Builder sentinel(String host, int port) {
          *
          * @param host the host name
          * @param masterId sentinel master id
-         * @return New builder with Sentinel host/port.
+         * @return new builder with Sentinel host/port.
          */
         public static Builder sentinel(String host, String masterId) {
             return sentinel(host, DEFAULT_SENTINEL_PORT, masterId);
@@ -1055,14 +1066,30 @@ public static Builder sentinel(String host, String masterId) {
          * @param host the host name
          * @param port the port
          * @param masterId sentinel master id
-         * @return New builder with Sentinel host/port.
+         * @return new builder with Sentinel host/port.
          */
         public static Builder sentinel(String host, int port, String masterId) {
+            return sentinel(host, port, masterId, null);
+        }
+
+        /**
+         * Set Sentinel host, port, master id and Sentinel authentication. Creates a new builder.
+         *
+         * @param host the host name
+         * @param port the port
+         * @param masterId sentinel master id
+         * @param password the Sentinel password (supported since Redis 5.0.1)
+         * @return new builder with Sentinel host/port.
+         */
+        public static Builder sentinel(String host, int port, String masterId, CharSequence password) {
 
             LettuceAssert.notEmpty(host, "Host must not be empty");
             LettuceAssert.isTrue(isValidPort(port), String.format("Port out of range: %s", port));
 
             Builder builder = RedisURI.builder();
+            if (password != null) {
+                builder.sentinelPassword = password.toString().toCharArray();
+            }
             return builder.withSentinelMasterId(masterId).withSentinel(host, port);
         }
 
@@ -1085,11 +1112,49 @@ public Builder withSentinel(String host) {
          */
         public Builder withSentinel(String host, int port) {
 
+            if (this.sentinelPassword != null) {
+                return withSentinel(host, port, new String(this.sentinelPassword));
+            }
+
+            return withSentinel(host, port, null);
+        }
+
+        /**
+         * Add a withSentinel host/port and Sentinel authentication to the existing builder.
+         *
+         * @param host the host name
+         * @param port the port
+         * @param password the Sentinel password (supported since Redis 5.0.1)
+         * @return the builder
+         * @since 5.2
+         */
+        public Builder withSentinel(String host, int port, CharSequence password) {
+
             LettuceAssert.assertState(this.host == null, "Cannot use with Redis mode.");
             LettuceAssert.notEmpty(host, "Host must not be empty");
             LettuceAssert.isTrue(isValidPort(port), String.format("Port out of range: %s", port));
 
-            sentinels.add(HostAndPort.of(host, port));
+            RedisURI redisURI = RedisURI.create(host, port);
+
+            if (password != null) {
+                redisURI.setPassword(password.toString());
+            }
+
+            return withSentinel(redisURI);
+        }
+
+        /**
+         * Add a withSentinel RedisURI to the existing builder.
+         *
+         * @param redisURI the sentinel URI
+         * @return the builder
+         * @since 5.2
+         */
+        public Builder withSentinel(RedisURI redisURI) {
+
+            LettuceAssert.notNull(redisURI, "Redis URI must not be null");
+
+            sentinels.add(redisURI);
             return this;
         }
 
@@ -1290,8 +1355,10 @@ public RedisURI build() {
 
             redisURI.setSentinelMasterId(sentinelMasterId);
 
-            for (HostAndPort sentinel : sentinels) {
-                redisURI.getSentinels().add(new RedisURI(sentinel.getHostText(), sentinel.getPort(), timeout));
+            for (RedisURI sentinel : sentinels) {
+
+                sentinel.setTimeout(timeout);
+                redisURI.getSentinels().add(sentinel);
             }
 
             redisURI.setSocket(socket);
diff --git a/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
index 954ce71a9e..d16c1e92f7 100644
--- a/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
@@ -23,8 +23,9 @@
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.codec.RedisCodec;
-import io.lettuce.core.protocol.AsyncCommand;
-import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.protocol.*;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
 
@@ -136,6 +137,25 @@ public RedisFuture<String> info(String section) {
         return dispatch(commandBuilder.info(section));
     }
 
+    @Override
+    public <T> RedisFuture<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output) {
+
+        LettuceAssert.notNull(type, "Command type must not be null");
+        LettuceAssert.notNull(output, "CommandOutput type must not be null");
+
+        return dispatch(new AsyncCommand<>(new Command<>(type, output)));
+    }
+
+    @Override
+    public <T> RedisFuture<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args) {
+
+        LettuceAssert.notNull(type, "Command type must not be null");
+        LettuceAssert.notNull(output, "CommandOutput type must not be null");
+        LettuceAssert.notNull(args, "CommandArgs type must not be null");
+
+        return dispatch(new AsyncCommand<>(new Command<>(type, output, args)));
+    }
+
     public <T> AsyncCommand<K, V, T> dispatch(RedisCommand<K, V, T> cmd) {
         return (AsyncCommand<K, V, T>) connection.dispatch(new AsyncCommand<>(cmd));
     }
diff --git a/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
index 2bbe0c1870..580fa5a027 100644
--- a/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
@@ -24,6 +24,11 @@
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.ProtocolKeyword;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 import io.lettuce.core.sentinel.api.reactive.RedisSentinelReactiveCommands;
 
@@ -135,6 +140,25 @@ public Mono<String> info(String section) {
         return createMono(() -> commandBuilder.info(section));
     }
 
+    @SuppressWarnings("unchecked")
+    public <T> Flux<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output) {
+
+        LettuceAssert.notNull(type, "Command type must not be null");
+        LettuceAssert.notNull(output, "CommandOutput type must not be null");
+
+        return (Flux) createFlux(() -> new Command<>(type, output));
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> Flux<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output, CommandArgs<K, V> args) {
+
+        LettuceAssert.notNull(type, "Command type must not be null");
+        LettuceAssert.notNull(output, "CommandOutput type must not be null");
+        LettuceAssert.notNull(args, "CommandArgs type must not be null");
+
+        return (Flux) createFlux(() -> new Command<>(type, output, args));
+    }
+
     @Override
     public void close() {
         getStatefulConnection().close();
diff --git a/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java b/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
index 534290b789..9eef575530 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
@@ -21,6 +21,9 @@
 
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.RedisFuture;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.ProtocolKeyword;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 
 /**
@@ -180,6 +183,29 @@ public interface RedisSentinelAsyncCommands<K, V> {
      */
     RedisFuture<String> ping();
 
+    /**
+     * Dispatch a command to the Redis Server. Please note the command output type must fit to the command response.
+     *
+     * @param type the command, must not be {@literal null}.
+     * @param output the command output, must not be {@literal null}.
+     * @param <T> response type
+     * @return the command response
+     * @since 5.2
+     */
+    <T> RedisFuture<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output);
+
+    /**
+     * Dispatch a command to the Redis Server. Please note the command output type must fit to the command response.
+     *
+     * @param type the command, must not be {@literal null}.
+     * @param output the command output, must not be {@literal null}.
+     * @param args the command arguments, must not be {@literal null}.
+     * @param <T> response type
+     * @return the command response
+     * @since 5.2
+     */
+    <T> RedisFuture<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args);
+
     /**
      * @return true if the connection is open (connected and not closed).
      */
diff --git a/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java b/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
index b57be0d3a6..011278e74a 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
@@ -21,6 +21,9 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import io.lettuce.core.KillArgs;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.ProtocolKeyword;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 
 /**
@@ -180,6 +183,29 @@ public interface RedisSentinelReactiveCommands<K, V> {
      */
     Mono<String> ping();
 
+    /**
+     * Dispatch a command to the Redis Server. Please note the command output type must fit to the command response.
+     *
+     * @param type the command, must not be {@literal null}.
+     * @param output the command output, must not be {@literal null}.
+     * @param <T> response type
+     * @return the command response
+     * @since 5.2
+     */
+    <T> Flux<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output);
+
+    /**
+     * Dispatch a command to the Redis Server. Please note the command output type must fit to the command response.
+     *
+     * @param type the command, must not be {@literal null}.
+     * @param output the command output, must not be {@literal null}.
+     * @param args the command arguments, must not be {@literal null}.
+     * @param <T> response type
+     * @return the command response
+     * @since 5.2
+     */
+    <T> Flux<T> dispatch(ProtocolKeyword type, CommandOutput<K, V, ?> output, CommandArgs<K, V> args);
+
     /**
      * @return true if the connection is open (connected and not closed).
      */
diff --git a/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java b/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
index 4165c49cb2..14c047b5e0 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
@@ -20,6 +20,9 @@
 import java.util.Map;
 
 import io.lettuce.core.KillArgs;
+import io.lettuce.core.output.CommandOutput;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.ProtocolKeyword;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 
 /**
@@ -179,6 +182,29 @@ public interface RedisSentinelCommands<K, V> {
      */
     String ping();
 
+    /**
+     * Dispatch a command to the Redis Server. Please note the command output type must fit to the command response.
+     *
+     * @param type the command, must not be {@literal null}.
+     * @param output the command output, must not be {@literal null}.
+     * @param <T> response type
+     * @return the command response
+     * @since 5.2
+     */
+    <T> T dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output);
+
+    /**
+     * Dispatch a command to the Redis Server. Please note the command output type must fit to the command response.
+     *
+     * @param type the command, must not be {@literal null}.
+     * @param output the command output, must not be {@literal null}.
+     * @param args the command arguments, must not be {@literal null}.
+     * @param <T> response type
+     * @return the command response
+     * @since 5.2
+     */
+    <T> T dispatch(ProtocolKeyword type, CommandOutput<K, V, T> output, CommandArgs<K, V> args);
+
     /**
      * @return true if the connection is open (connected and not closed).
      */
diff --git a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
index 1b6c8975e0..991e8b01bb 100644
--- a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
@@ -51,7 +51,7 @@ void sentinelWithPort() {
 
     @Test
     void shouldFailIfBuilderIsEmpty() {
-        assertThatThrownBy(() -> RedisURI.builder().build()).isInstanceOf(IllegalStateException. class);
+        assertThatThrownBy(() -> RedisURI.builder().build()).isInstanceOf(IllegalStateException.class);
     }
 
     @Test
@@ -82,12 +82,13 @@ void redisWithClientName() {
 
     @Test
     void redisHostAndPortWithInvalidPort() {
-        assertThatThrownBy(() -> RedisURI.Builder.redis("localhost", -1)).isInstanceOf(IllegalArgumentException. class);
+        assertThatThrownBy(() -> RedisURI.Builder.redis("localhost", -1)).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
     void redisWithInvalidPort() {
-        assertThatThrownBy(() -> RedisURI.Builder.redis("localhost").withPort(65536)).isInstanceOf(IllegalArgumentException. class);
+        assertThatThrownBy(() -> RedisURI.Builder.redis("localhost").withPort(65536)).isInstanceOf(
+                IllegalArgumentException.class);
     }
 
     @Test
@@ -168,37 +169,72 @@ void redisSentinelFromUrl() {
         RedisURI sentinel3 = result.getSentinels().get(2);
         assertThat(sentinel3.getPort()).isEqualTo(RedisURI.DEFAULT_SENTINEL_PORT);
         assertThat(sentinel3.getHost()).isEqualTo("host3");
+    }
+
+    @Test
+    void withAuthenticatedSentinel() {
+
+        RedisURI result = RedisURI.Builder.sentinel("host", 1234, "master", "foo").build();
+
+        RedisURI sentinel = result.getSentinels().get(0);
+        assertThat(new String(sentinel.getPassword())).isEqualTo("foo");
+    }
+
+    @Test
+    void withAuthenticatedSentinelUri() {
 
+        RedisURI sentinel = new RedisURI("host", 1234, Duration.ZERO);
+        sentinel.setPassword("bar");
+        RedisURI result = RedisURI.Builder.sentinel("host", 1234, "master").withSentinel(sentinel).build();
+
+        assertThat(result.getSentinels().get(0).getPassword()).isNull();
+        assertThat(new String(result.getSentinels().get(1).getPassword())).isEqualTo("bar");
+    }
+
+    @Test
+    void withAuthenticatedSentinelWithSentinel() {
+
+        RedisURI result = RedisURI.Builder.sentinel("host", 1234, "master", "foo").withSentinel("bar").build();
+
+        assertThat(new String(result.getSentinels().get(0).getPassword())).isEqualTo("foo");
+        assertThat(new String(result.getSentinels().get(1).getPassword())).isEqualTo("foo");
+
+        result = RedisURI.Builder.sentinel("host", 1234, "master", "foo").withSentinel("bar", 1234, "baz").build();
+
+        assertThat(new String(result.getSentinels().get(0).getPassword())).isEqualTo("foo");
+        assertThat(new String(result.getSentinels().get(1).getPassword())).isEqualTo("baz");
     }
 
     @Test
     void redisSentinelWithInvalidPort() {
-        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 65536)).isInstanceOf(IllegalArgumentException. class);
+        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 65536)).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
     void redisSentinelWithMasterIdAndInvalidPort() {
-        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 65536, "")).isInstanceOf(IllegalArgumentException. class);
+        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 65536, "")).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
     void redisSentinelWithNullMasterId() {
-        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 1, null)).isInstanceOf(IllegalArgumentException. class);
+        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 1, null)).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
     void redisSentinelWithSSLNotPossible() {
-        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 1, "master").withSsl(true)).isInstanceOf(IllegalStateException. class);
+        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 1, "master").withSsl(true)).isInstanceOf(
+                IllegalStateException.class);
     }
 
     @Test
     void redisSentinelWithTLSNotPossible() {
-        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 1, "master").withStartTls(true)).isInstanceOf(IllegalStateException. class);
+        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 1, "master").withStartTls(true)).isInstanceOf(
+                IllegalStateException.class);
     }
 
     @Test
     void invalidScheme() {
-        assertThatThrownBy(() -> RedisURI.create("http://www.web.de")).isInstanceOf(IllegalArgumentException. class);
+        assertThatThrownBy(() -> RedisURI.create("http://www.web.de")).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
@@ -226,5 +262,4 @@ void redisSocketWithPassword() throws IOException {
         assertThat(result.getPort()).isEqualTo(0);
         assertThat(result.isSsl()).isFalse();
     }
-
 }

From ee53b436681f4ed8122193536d8d2e91e3c98247 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 15 Mar 2019 10:17:25 +0100
Subject: [PATCH 614/808] Fix buffer underrun when re-using pooled buffers #934

---
 src/main/java/io/lettuce/core/codec/CipherCodec.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/codec/CipherCodec.java b/src/main/java/io/lettuce/core/codec/CipherCodec.java
index d9494fa31d..3c457c0580 100644
--- a/src/main/java/io/lettuce/core/codec/CipherCodec.java
+++ b/src/main/java/io/lettuce/core/codec/CipherCodec.java
@@ -303,14 +303,16 @@ static KeyDescriptor from(ByteBuffer bytes) {
                 throw new IllegalArgumentException("Cannot extract KeyDescriptor. Malformed message header.");
             }
 
+            int startPosition = bytes.position();
+
             for (int i = 0; i < bytes.remaining(); i++) {
                 if (bytes.get(bytes.position() + i) == '$') {
-                    end = bytes.position() + i;
+                    end = (bytes.position() - startPosition) + i;
                     break;
                 }
 
                 if (bytes.get(bytes.position() + i) == '+') {
-                    version = bytes.position() + i;
+                    version = (bytes.position() - startPosition) + i;
                 }
             }
 
@@ -318,7 +320,7 @@ static KeyDescriptor from(ByteBuffer bytes) {
                 throw new IllegalArgumentException("Cannot extract KeyDescriptor");
             }
 
-            byte[] name = new byte[version - 1];
+            byte[] name = new byte[version];
             bytes.get(name);
             bytes.get();
 

From 060f1ba3905deaec98d138a7503d5d6c3cdcdb2b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 21 Mar 2019 09:55:29 +0200
Subject: [PATCH 615/808] Improve mutators for ClientOptions,
 ClusterClientOptions, and ClientResources #1003

Mutators return decoupled builder instances and do not retain builder state across multiple created instances. Multiple creations do not longer affect each other.

ClientResources also now retains the shared object state across mutations if shared resources (timer, EventLoops) are not altered in the mutation builder.
---
 .../java/io/lettuce/core/ClientOptions.java   | 14 ++++--
 .../core/cluster/ClusterClientOptions.java    | 49 +++++++++++++++++--
 .../core/resource/DefaultClientResources.java | 43 ++++++++++++----
 .../lettuce/core/ClientOptionsUnitTests.java  |  8 ++-
 .../ClusterClientOptionsUnitTests.java        | 49 +++++++++++++++++--
 .../DefaultClientResourcesUnitTests.java      | 39 +++++++++++++++
 6 files changed, 180 insertions(+), 22 deletions(-)

diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index 2cb2e7715b..7ebd488ea5 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -52,7 +52,6 @@ public class ClientOptions implements Serializable {
     private final SslOptions sslOptions;
     private final TimeoutOptions timeoutOptions;
     private final int bufferUsageRatio;
-    private final Builder builder;
 
     protected ClientOptions(Builder builder) {
         this.pingBeforeActivateConnection = builder.pingBeforeActivateConnection;
@@ -66,7 +65,6 @@ protected ClientOptions(Builder builder) {
         this.sslOptions = builder.sslOptions;
         this.timeoutOptions = builder.timeoutOptions;
         this.bufferUsageRatio = builder.bufferUsageRatio;
-        this.builder = builder;
     }
 
     protected ClientOptions(ClientOptions original) {
@@ -81,7 +79,6 @@ protected ClientOptions(ClientOptions original) {
         this.sslOptions = original.getSslOptions();
         this.timeoutOptions = original.getTimeoutOptions();
         this.bufferUsageRatio = original.getBufferUsageRatio();
-        this.builder = original.builder;
     }
 
     /**
@@ -310,7 +307,16 @@ public ClientOptions build() {
      * @since 5.1
      */
     public ClientOptions.Builder mutate() {
-        return this.builder;
+        Builder builder = new Builder();
+
+        builder.autoReconnect(isAutoReconnect()).bufferUsageRatio(getBufferUsageRatio())
+                .cancelCommandsOnReconnectFailure(isCancelCommandsOnReconnectFailure())
+                .disconnectedBehavior(getDisconnectedBehavior()).publishOnScheduler(isPublishOnScheduler())
+                .pingBeforeActivateConnection(isPingBeforeActivateConnection()).requestQueueSize(getRequestQueueSize())
+                .socketOptions(getSocketOptions()).sslOptions(getSslOptions())
+                .suspendReconnectOnProtocolFailure(isSuspendReconnectOnProtocolFailure()).timeoutOptions(getTimeoutOptions());
+
+        return builder;
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index d1d8d33f88..e653dbd1b1 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -21,6 +21,7 @@
 import io.lettuce.core.SocketOptions;
 import io.lettuce.core.SslOptions;
 import io.lettuce.core.TimeoutOptions;
+import io.lettuce.core.internal.LettuceAssert;
 
 /**
  * Client Options to control the behavior of {@link RedisClusterClient}.
@@ -40,7 +41,6 @@ public class ClusterClientOptions extends ClientOptions {
     private final boolean validateClusterNodeMembership;
     private final int maxRedirects;
     private final ClusterTopologyRefreshOptions topologyRefreshOptions;
-    private final ClusterClientOptions.Builder builder;
 
     protected ClusterClientOptions(Builder builder) {
 
@@ -60,7 +60,6 @@ protected ClusterClientOptions(Builder builder) {
         }
 
         this.topologyRefreshOptions = refreshOptions;
-        this.builder = builder;
     }
 
     protected ClusterClientOptions(ClusterClientOptions original) {
@@ -70,7 +69,6 @@ protected ClusterClientOptions(ClusterClientOptions original) {
         this.validateClusterNodeMembership = original.validateClusterNodeMembership;
         this.maxRedirects = original.maxRedirects;
         this.topologyRefreshOptions = original.topologyRefreshOptions;
-        this.builder = original.builder;
     }
 
     /**
@@ -92,6 +90,35 @@ public static ClusterClientOptions.Builder builder() {
         return new ClusterClientOptions.Builder();
     }
 
+    /**
+     * Returns a new {@link ClusterClientOptions.Builder} initialized from {@link ClientOptions} to construct
+     * {@link ClusterClientOptions}.
+     *
+     * @return a new {@link ClusterClientOptions.Builder} to construct {@link ClusterClientOptions}.
+     * @since 5.1.6
+     */
+    public static ClusterClientOptions.Builder builder(ClientOptions clientOptions) {
+
+        LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
+
+        if (clientOptions instanceof ClusterClientOptions) {
+            return ((ClusterClientOptions) clientOptions).mutate();
+        }
+
+        Builder builder = new Builder();
+        builder.autoReconnect(clientOptions.isAutoReconnect()).bufferUsageRatio(clientOptions.getBufferUsageRatio())
+                .cancelCommandsOnReconnectFailure(clientOptions.isCancelCommandsOnReconnectFailure())
+                .disconnectedBehavior(clientOptions.getDisconnectedBehavior())
+                .publishOnScheduler(clientOptions.isPublishOnScheduler())
+                .pingBeforeActivateConnection(clientOptions.isPingBeforeActivateConnection())
+                .requestQueueSize(clientOptions.getRequestQueueSize()).socketOptions(clientOptions.getSocketOptions())
+                .sslOptions(clientOptions.getSslOptions())
+                .suspendReconnectOnProtocolFailure(clientOptions.isSuspendReconnectOnProtocolFailure())
+                .timeoutOptions(clientOptions.getTimeoutOptions());
+
+        return builder;
+    }
+
     /**
      * Create a new {@link ClusterClientOptions} using default settings.
      *
@@ -174,7 +201,7 @@ public Builder cancelCommandsOnReconnectFailure(boolean cancelCommandsOnReconnec
         }
 
         @Override
-        public ClientOptions.Builder publishOnScheduler(boolean publishOnScheduler) {
+        public Builder publishOnScheduler(boolean publishOnScheduler) {
             super.publishOnScheduler(publishOnScheduler);
             return this;
         }
@@ -235,7 +262,19 @@ public ClusterClientOptions build() {
      * @since 5.1
      */
     public ClusterClientOptions.Builder mutate() {
-        return this.builder;
+
+        Builder builder = new Builder();
+
+        builder.autoReconnect(isAutoReconnect()).bufferUsageRatio(getBufferUsageRatio())
+                .cancelCommandsOnReconnectFailure(isCancelCommandsOnReconnectFailure())
+                .disconnectedBehavior(getDisconnectedBehavior()).publishOnScheduler(isPublishOnScheduler())
+                .pingBeforeActivateConnection(isPingBeforeActivateConnection()).requestQueueSize(getRequestQueueSize())
+                .socketOptions(getSocketOptions()).sslOptions(getSslOptions())
+                .suspendReconnectOnProtocolFailure(isSuspendReconnectOnProtocolFailure()).timeoutOptions(getTimeoutOptions())
+                .validateClusterNodeMembership(isValidateClusterNodeMembership()).maxRedirects(getMaxRedirects())
+                .topologyRefreshOptions(getTopologyRefreshOptions());
+
+        return builder;
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index 54fc14bc02..ffbf7dadfa 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -127,14 +127,10 @@ public class DefaultClientResources implements ClientResources {
     private final NettyCustomizer nettyCustomizer;
     private final Tracing tracing;
 
-    private final Builder builder;
-
     private volatile boolean shutdownCalled = false;
 
     protected DefaultClientResources(Builder builder) {
 
-        this.builder = builder;
-
         if (builder.eventLoopGroupProvider == null) {
             int ioThreadPoolSize = builder.ioThreadPoolSize;
 
@@ -148,7 +144,7 @@ protected DefaultClientResources(Builder builder) {
             this.eventLoopGroupProvider = new DefaultEventLoopGroupProvider(ioThreadPoolSize);
 
         } else {
-            this.sharedEventLoopGroupProvider = true;
+            this.sharedEventLoopGroupProvider = builder.sharedEventLoopGroupProvider;
             this.eventLoopGroupProvider = builder.eventLoopGroupProvider;
         }
 
@@ -165,7 +161,7 @@ protected DefaultClientResources(Builder builder) {
                     computationThreadPoolSize);
             sharedEventExecutor = false;
         } else {
-            sharedEventExecutor = true;
+            sharedEventExecutor = builder.sharedEventExecutor;
             eventExecutorGroup = builder.eventExecutorGroup;
         }
 
@@ -174,7 +170,7 @@ protected DefaultClientResources(Builder builder) {
             sharedTimer = false;
         } else {
             timer = builder.timer;
-            sharedTimer = true;
+            sharedTimer = builder.sharedTimer;
         }
 
         if (builder.eventBus == null) {
@@ -198,7 +194,7 @@ protected DefaultClientResources(Builder builder) {
 
             sharedCommandLatencyCollector = false;
         } else {
-            sharedCommandLatencyCollector = true;
+            sharedCommandLatencyCollector = builder.sharedCommandLatencyCollector;
             commandLatencyCollector = builder.commandLatencyCollector;
         }
 
@@ -251,6 +247,11 @@ public static DefaultClientResources.Builder builder() {
      */
     public static class Builder implements ClientResources.Builder {
 
+        private boolean sharedEventLoopGroupProvider;
+        private boolean sharedEventExecutor;
+        private boolean sharedTimer;
+        private boolean sharedCommandLatencyCollector;
+
         private int ioThreadPoolSize = DEFAULT_IO_THREADS;
         private int computationThreadPoolSize = DEFAULT_COMPUTATION_THREADS;
         private EventExecutorGroup eventExecutorGroup;
@@ -299,6 +300,7 @@ public Builder eventLoopGroupProvider(EventLoopGroupProvider eventLoopGroupProvi
 
             LettuceAssert.notNull(eventLoopGroupProvider, "EventLoopGroupProvider must not be null");
 
+            this.sharedEventLoopGroupProvider = true;
             this.eventLoopGroupProvider = eventLoopGroupProvider;
             return this;
         }
@@ -333,6 +335,7 @@ public Builder eventExecutorGroup(EventExecutorGroup eventExecutorGroup) {
 
             LettuceAssert.notNull(eventExecutorGroup, "EventExecutorGroup must not be null");
 
+            this.sharedEventExecutor = true;
             this.eventExecutorGroup = eventExecutorGroup;
             return this;
         }
@@ -352,6 +355,7 @@ public Builder timer(Timer timer) {
 
             LettuceAssert.notNull(timer, "Timer must not be null");
 
+            this.sharedTimer = true;
             this.timer = timer;
             return this;
         }
@@ -414,6 +418,7 @@ public Builder commandLatencyCollector(CommandLatencyCollector commandLatencyCol
 
             LettuceAssert.notNull(commandLatencyCollector, "CommandLatencyCollector must not be null");
 
+            this.sharedCommandLatencyCollector = true;
             this.commandLatencyCollector = commandLatencyCollector;
             return this;
         }
@@ -531,6 +536,12 @@ public DefaultClientResources build() {
     /**
      * Returns a builder to create new {@link DefaultClientResources} whose settings are replicated from the current
      * {@link DefaultClientResources}.
+     * <p>
+     * Note: The resulting {@link DefaultClientResources} retains shared state for {@link Timer},
+     * {@link CommandLatencyCollector}, {@link EventExecutorGroup}, and {@link EventLoopGroupProvider} if these are left
+     * unchanged. Thus you need only to shut down the last created {@link ClientResources} instances. Shutdown affects any
+     * previously created {@link ClientResources}.
+     * </p>
      *
      * @return a {@link DefaultClientResources.Builder} to create new {@link DefaultClientResources} whose settings are
      *         replicated from the current {@link DefaultClientResources}.
@@ -539,7 +550,21 @@ public DefaultClientResources build() {
      */
     @Override
     public DefaultClientResources.Builder mutate() {
-        return this.builder;
+
+        Builder builder = new Builder();
+
+        builder.eventExecutorGroup(eventExecutorGroup()).timer(timer()).eventBus(eventBus())
+                .commandLatencyCollector(commandLatencyCollector())
+                .commandLatencyPublisherOptions(commandLatencyPublisherOptions()).dnsResolver(dnsResolver())
+                .socketAddressResolver(socketAddressResolver()).reconnectDelay(reconnectDelay)
+                .nettyCustomizer(nettyCustomizer()).tracing(tracing());
+
+        builder.sharedCommandLatencyCollector = sharedEventLoopGroupProvider;
+        builder.sharedEventExecutor = sharedEventExecutor;
+        builder.sharedEventLoopGroupProvider = sharedEventLoopGroupProvider;
+        builder.sharedTimer = sharedTimer;
+
+        return builder;
     }
 
     @Override
diff --git a/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java b/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
index fb0fcd5ffa..cbff7434e7 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
@@ -36,7 +36,13 @@ void testBuilder() {
 
     @Test
     void testCopy() {
-        checkAssertions(ClientOptions.copyOf(ClientOptions.builder().build()));
+
+        ClientOptions original = ClientOptions.builder().build();
+        ClientOptions copy = ClientOptions.copyOf(original);
+
+        checkAssertions(copy);
+
+        assertThat(original.mutate()).isNotSameAs(copy.mutate());
     }
 
     void checkAssertions(ClientOptions sut) {
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
index b9ec99e7bd..16780ca4eb 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
@@ -19,6 +19,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import io.lettuce.core.ClientOptions;
+
 /**
  * @author Mark Paluch
  */
@@ -27,9 +29,8 @@ class ClusterClientOptionsUnitTests {
     @Test
     void testCopy() {
 
-        ClusterClientOptions options = ClusterClientOptions.builder()
-                .autoReconnect(false).requestQueueSize(100).suspendReconnectOnProtocolFailure(true).maxRedirects(1234)
-                .validateClusterNodeMembership(false).build();
+        ClusterClientOptions options = ClusterClientOptions.builder().autoReconnect(false).requestQueueSize(100)
+                .suspendReconnectOnProtocolFailure(true).maxRedirects(1234).validateClusterNodeMembership(false).build();
 
         ClusterClientOptions copy = ClusterClientOptions.copyOf(options);
 
@@ -43,4 +44,46 @@ void testCopy() {
         assertThat(copy.isSuspendReconnectOnProtocolFailure()).isEqualTo(options.isSuspendReconnectOnProtocolFailure());
         assertThat(copy.getMaxRedirects()).isEqualTo(options.getMaxRedirects());
     }
+
+    @Test
+    void builderFromDefaultClientOptions() {
+
+        ClientOptions clientOptions = ClientOptions.builder().build();
+        ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder(clientOptions).build();
+
+        assertThat(clusterClientOptions.getDisconnectedBehavior()).isEqualTo(clusterClientOptions.getDisconnectedBehavior());
+        assertThat(clusterClientOptions.getSslOptions()).isEqualTo(clusterClientOptions.getSslOptions());
+        assertThat(clusterClientOptions.getTimeoutOptions()).isEqualTo(clusterClientOptions.getTimeoutOptions());
+        assertThat(clusterClientOptions.getRequestQueueSize()).isEqualTo(clusterClientOptions.getRequestQueueSize());
+        assertThat(clusterClientOptions.isAutoReconnect()).isEqualTo(clusterClientOptions.isAutoReconnect());
+        assertThat(clusterClientOptions.isCloseStaleConnections()).isEqualTo(clusterClientOptions.isCloseStaleConnections());
+        assertThat(clusterClientOptions.isCancelCommandsOnReconnectFailure()).isEqualTo(
+                clusterClientOptions.isCancelCommandsOnReconnectFailure());
+        assertThat(clusterClientOptions.isPingBeforeActivateConnection()).isEqualTo(
+                clusterClientOptions.isPingBeforeActivateConnection());
+        assertThat(clusterClientOptions.isPublishOnScheduler()).isEqualTo(clusterClientOptions.isPublishOnScheduler());
+        assertThat(clusterClientOptions.isSuspendReconnectOnProtocolFailure()).isEqualTo(
+                clusterClientOptions.isSuspendReconnectOnProtocolFailure());
+        assertThat(clusterClientOptions.mutate()).isNotNull();
+    }
+
+    @Test
+    void builderFromClusterClientOptions() {
+
+        ClusterClientOptions options = ClusterClientOptions.builder().maxRedirects(1234).validateClusterNodeMembership(false)
+                .build();
+
+        ClusterClientOptions copy = ClusterClientOptions.builder(options).build();
+
+        assertThat(copy.getRefreshPeriod()).isEqualTo(options.getRefreshPeriod());
+        assertThat(copy.isCloseStaleConnections()).isEqualTo(options.isCloseStaleConnections());
+        assertThat(copy.isRefreshClusterView()).isEqualTo(options.isRefreshClusterView());
+        assertThat(copy.isValidateClusterNodeMembership()).isEqualTo(options.isValidateClusterNodeMembership());
+        assertThat(copy.getRequestQueueSize()).isEqualTo(options.getRequestQueueSize());
+        assertThat(copy.isAutoReconnect()).isEqualTo(options.isAutoReconnect());
+        assertThat(copy.isCancelCommandsOnReconnectFailure()).isEqualTo(options.isCancelCommandsOnReconnectFailure());
+        assertThat(copy.isSuspendReconnectOnProtocolFailure()).isEqualTo(options.isSuspendReconnectOnProtocolFailure());
+        assertThat(copy.getMaxRedirects()).isEqualTo(options.getMaxRedirects());
+        assertThat(options.mutate()).isNotSameAs(copy.mutate());
+    }
 }
diff --git a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
index 79d167bb83..b8972f2b6e 100644
--- a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
@@ -25,6 +25,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import reactor.test.StepVerifier;
 import io.lettuce.core.event.Event;
@@ -34,6 +35,7 @@
 import io.lettuce.test.Futures;
 import io.lettuce.test.resource.FastShutdown;
 import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.util.HashedWheelTimer;
 import io.netty.util.Timer;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.Future;
@@ -214,4 +216,41 @@ void reconnectDelayReturnsSameInstanceForStatelessDelays() {
 
         FastShutdown.shutdown(resources);
     }
+
+    @Test
+    void considersSharedStateFromMutation() {
+
+        ClientResources clientResources = ClientResources.create();
+        HashedWheelTimer timer = (HashedWheelTimer) clientResources.timer();
+
+        assertThat(ReflectionTestUtils.getField(timer, "workerState")).isEqualTo(0);
+
+        ClientResources copy = clientResources.mutate().build();
+        assertThat(copy.timer()).isSameAs(timer);
+
+        copy.shutdown().awaitUninterruptibly();
+
+        assertThat(ReflectionTestUtils.getField(timer, "workerState")).isEqualTo(2);
+    }
+
+    @Test
+    void considersDecoupledSharedStateFromMutation() {
+
+        ClientResources clientResources = ClientResources.create();
+        HashedWheelTimer timer = (HashedWheelTimer) clientResources.timer();
+
+        assertThat(ReflectionTestUtils.getField(timer, "workerState")).isEqualTo(0);
+
+        ClientResources copy = clientResources.mutate().timer(new HashedWheelTimer()).build();
+        HashedWheelTimer copyTimer = (HashedWheelTimer) copy.timer();
+        assertThat(copy.timer()).isNotSameAs(timer);
+
+        copy.shutdown().awaitUninterruptibly();
+
+        assertThat(ReflectionTestUtils.getField(timer, "workerState")).isEqualTo(0);
+        assertThat(ReflectionTestUtils.getField(copyTimer, "workerState")).isEqualTo(0);
+
+        copyTimer.stop();
+        timer.stop();
+    }
 }

From 25d06694825df682feccada90d610824698473f7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 26 Mar 2019 15:23:48 +0100
Subject: [PATCH 616/808] Upgrade to Reactor Core 3.2.8.RELEASE #1006

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index af8077fa6b..6292eec001 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
         <log4j2-version>2.11.2</log4j2-version>
         <mockito.version>2.22.0</mockito.version>
         <netty-version>4.1.33.Final</netty-version>
-        <reactor-version>3.2.6.RELEASE</reactor-version>
+        <reactor-version>3.2.8.RELEASE</reactor-version>
         <reactive-streams-tck.version>1.0.0</reactive-streams-tck.version>
         <slf4j.version>1.7.25</slf4j.version>
         <spring-version>4.3.20.RELEASE</spring-version>

From 96995a9a7122f9f34e7181565d70f6ecc391033f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 11 Apr 2019 12:49:00 +0200
Subject: [PATCH 617/808] Use GitHub labels in issues

---
 .github/ISSUE_TEMPLATE/Bug_report.md       | 15 +++++++++++++++
 .github/ISSUE_TEMPLATE/Feature_request.md  |  1 +
 .github/ISSUE_TEMPLATE/Support_question.md |  1 +
 3 files changed, 17 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index fc5dd9fa50..05d29d5f01 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -1,6 +1,7 @@
 ---
 name: 🐛 Bug Report
 about: If something isn't working as expected 🤔.
+labels: 'type: bug', 'status: waiting-for-triage'
 ---
 
 ## Bug Report
@@ -11,14 +12,28 @@ about: If something isn't working as expected 🤔.
 
 <!-- A clear and concise description of the behavior.-->
 
+<details>
+<summary>Stack trace</summary>
+
+```java
+// your stack trace here;
+```
+
+</details>
+
 #### Input Code
 
 <!-- Java/Kotlin/Scala/Groovy/… or Repo link if applicable: -->
 
+<details>
+<summary>Input Code</summary>
+
 ```java
 // your code here;
 ```
 
+</details>
+
 #### Expected behavior/code
 
 <!-- A clear and concise description of what you expected to happen (or code). -->
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
index 2a5972ba02..945cba46ff 100644
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -1,6 +1,7 @@
 ---
 name: 🚀 Feature Request
 about: I have a suggestion (and may want to implement it 🙂)!
+labels: 'type: enhancement', 'status: waiting-for-triage'
 ---
 
 ## Feature Request
diff --git a/.github/ISSUE_TEMPLATE/Support_question.md b/.github/ISSUE_TEMPLATE/Support_question.md
index 5cb83ea004..7803d13054 100644
--- a/.github/ISSUE_TEMPLATE/Support_question.md
+++ b/.github/ISSUE_TEMPLATE/Support_question.md
@@ -1,6 +1,7 @@
 ---
 name: Support Question
 about: If you have a question 💬, please check out Gitter, Stack Overflow, or post it to the mailing list! Do not post them here.
+labels: 'for: stackoverflow'
 ---
 
 We primarily use GitHub as an issue tracker; for usage and support questions, please check out these resources below. Thanks! 😁.

From f2ef90cd7d0a7ec9f11b4b30c0d588033974e9d5 Mon Sep 17 00:00:00 2001
From: Alessandro <alessandro.simi@spaceapegames.com>
Date: Wed, 10 Apr 2019 10:36:32 +0100
Subject: [PATCH 618/808] =?UTF-8?q?Use=20slots.equals(=E2=80=A6)=20compari?=
 =?UTF-8?q?son=20in=20RedisClusterNode=20#1011?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We now use BitSet.equals() to compare slot sets of RedisClusterNode for an improved comparison performance.

Original pull request: #1013.
---
 .../models/partitions/RedisClusterNode.java   |  5 +++
 .../cluster/topology/TopologyComparators.java |  2 +-
 .../TopologyComparatorsUnitTests.java         | 33 ++++++++++++++++---
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
index eaa07f1595..dad4d12c20 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
@@ -255,6 +255,11 @@ private void setSlotBits(List<Integer> slots) {
         }
     }
 
+    public boolean hasSameSlotsOf(RedisClusterNode other) {
+        if (other == null) return false;
+        else return this.slots.equals(other.slots);
+    }
+
     public Set<NodeFlag> getFlags() {
         return flags;
     }
diff --git a/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
index d583d9fd16..45438943d1 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
@@ -154,7 +154,7 @@ static boolean essentiallyEqualsTo(RedisClusterNode o1, RedisClusterNode o2) {
             return false;
         }
 
-        if (o1.getSlots().size() != o2.getSlots().size() || !o1.getSlots().containsAll(o2.getSlots())) {
+        if (!o1.hasSameSlotsOf(o2)) {
             return false;
         }
 
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
index 21ced27a2e..f3753c4f80 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
@@ -20,10 +20,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.util.Lists.newArrayList;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import org.junit.jupiter.api.Test;
 
@@ -308,6 +305,34 @@ void isChangedFlagsChangedReplicaToMaster() {
         assertThat(isChanged(partitions1, partitions2)).isTrue();
     }
 
+    @Test
+    void aNodeShouldNotHaveSameSlotsIfOtherNodeIsNull() {
+        RedisClusterNode nodeA = createNode(3);
+        assertThat(nodeA.hasSameSlotsOf(null)).isFalse();
+    }
+
+    @Test
+    void nodesShouldHaveSameSlots() {
+        RedisClusterNode nodeA = createNode(1, 4, 36, 98);
+        RedisClusterNode nodeB = createNode(4, 36, 1, 98);
+        assertThat(nodeA.getSlots().containsAll(nodeB.getSlots())).isTrue();
+        assertThat(nodeA.hasSameSlotsOf(nodeB)).isTrue();
+    }
+
+    @Test
+    void nodesShouldNotHaveSameSlots() {
+        RedisClusterNode nodeA = createNode(1, 4, 36, 99);
+        RedisClusterNode nodeB = createNode(4, 36, 1, 100);
+        assertThat(nodeA.getSlots().containsAll(nodeB.getSlots())).isFalse();
+        assertThat(nodeA.hasSameSlotsOf(nodeB)).isFalse();
+    }
+
+    private RedisClusterNode createNode(Integer ... slots) {
+        RedisClusterNode node = new RedisClusterNode();
+        node.setSlots(Arrays.asList(slots));
+        return node;
+    }
+
     @Test
     void isChangedFlagsChangedMasterToReplica() {
         String nodes1 = "3d005a179da7d8dc1adae6409d47b39c369e992b 127.0.0.1:7380 master - 0 1401258245007 2 disconnected 8000-11999\n"

From 8b5846927a48dcca8e927705bdacce38b0f9d71d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 11 Apr 2019 13:08:20 +0200
Subject: [PATCH 619/808] Polishing #1011

Refactor nullability check as RedisClusterNode is expected to be never null. Add author tags.

Original pull request: #1013
---
 .../models/partitions/RedisClusterNode.java       | 11 ++++++++---
 .../cluster/topology/TopologyComparators.java     |  6 +++---
 .../topology/TopologyComparatorsUnitTests.java    | 15 ++++++---------
 .../core/resource/DirContextDnsResolverTests.java |  4 +++-
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
index dad4d12c20..e4615c61af 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
@@ -33,6 +33,7 @@
  * This class is mutable and not thread-safe if mutated by multiple threads concurrently.
  *
  * @author Mark Paluch
+ * @author Alessandro Simi
  * @since 3.0
  */
 @SuppressWarnings("serial")
@@ -255,9 +256,13 @@ private void setSlotBits(List<Integer> slots) {
         }
     }
 
-    public boolean hasSameSlotsOf(RedisClusterNode other) {
-        if (other == null) return false;
-        else return this.slots.equals(other.slots);
+    public boolean hasSameSlotsAs(RedisClusterNode other) {
+
+        if (this.slots == null || other.slots == null) {
+            return false;
+        }
+
+        return this.slots.equals(other.slots);
     }
 
     public Set<NodeFlag> getFlags() {
diff --git a/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
index 45438943d1..c837044e7d 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
@@ -30,6 +30,7 @@
  * Comparators for {@link RedisClusterNode} and {@link RedisURI}.
  *
  * @author Mark Paluch
+ * @author Alessandro Simi
  */
 public class TopologyComparators {
 
@@ -43,8 +44,7 @@ public class TopologyComparators {
      * @return List containing {@link RedisClusterNode}s ordered by {@code fixedOrder} and {@link RedisURI}
      * @see #sortByUri(Iterable)
      */
-    public static List<RedisClusterNode> predefinedSort(Iterable<RedisClusterNode> clusterNodes,
-            Iterable<RedisURI> fixedOrder) {
+    public static List<RedisClusterNode> predefinedSort(Iterable<RedisClusterNode> clusterNodes, Iterable<RedisURI> fixedOrder) {
 
         LettuceAssert.notNull(clusterNodes, "Cluster nodes must not be null");
         LettuceAssert.notNull(fixedOrder, "Fixed order must not be null");
@@ -154,7 +154,7 @@ static boolean essentiallyEqualsTo(RedisClusterNode o1, RedisClusterNode o2) {
             return false;
         }
 
-        if (!o1.hasSameSlotsOf(o2)) {
+        if (!o1.hasSameSlotsAs(o2)) {
             return false;
         }
 
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
index f3753c4f80..5bf1db803b 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
@@ -31,7 +31,10 @@
 import io.lettuce.core.internal.LettuceLists;
 
 /**
+ * Unit tests for {@link TopologyComparators}.
+ *
  * @author Mark Paluch
+ * @author Alessandro Simi
  */
 class TopologyComparatorsUnitTests {
 
@@ -305,18 +308,12 @@ void isChangedFlagsChangedReplicaToMaster() {
         assertThat(isChanged(partitions1, partitions2)).isTrue();
     }
 
-    @Test
-    void aNodeShouldNotHaveSameSlotsIfOtherNodeIsNull() {
-        RedisClusterNode nodeA = createNode(3);
-        assertThat(nodeA.hasSameSlotsOf(null)).isFalse();
-    }
-
     @Test
     void nodesShouldHaveSameSlots() {
         RedisClusterNode nodeA = createNode(1, 4, 36, 98);
         RedisClusterNode nodeB = createNode(4, 36, 1, 98);
         assertThat(nodeA.getSlots().containsAll(nodeB.getSlots())).isTrue();
-        assertThat(nodeA.hasSameSlotsOf(nodeB)).isTrue();
+        assertThat(nodeA.hasSameSlotsAs(nodeB)).isTrue();
     }
 
     @Test
@@ -324,10 +321,10 @@ void nodesShouldNotHaveSameSlots() {
         RedisClusterNode nodeA = createNode(1, 4, 36, 99);
         RedisClusterNode nodeB = createNode(4, 36, 1, 100);
         assertThat(nodeA.getSlots().containsAll(nodeB.getSlots())).isFalse();
-        assertThat(nodeA.hasSameSlotsOf(nodeB)).isFalse();
+        assertThat(nodeA.hasSameSlotsAs(nodeB)).isFalse();
     }
 
-    private RedisClusterNode createNode(Integer ... slots) {
+    private RedisClusterNode createNode(Integer... slots) {
         RedisClusterNode node = new RedisClusterNode();
         node.setSlots(Arrays.asList(slots));
         return node;
diff --git a/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java b/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java
index d2d4851add..55cde46aba 100644
--- a/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java
+++ b/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java
@@ -31,9 +31,11 @@
 import org.junit.jupiter.api.Test;
 
 /**
+ * Tests for {@link DirContextDnsResolver}.
+ *
  * @author Mark Paluch
  */
-
+@Disabled("Tests require an internet connection")
 class DirContextDnsResolverTests {
 
     private DirContextDnsResolver resolver;

From 212b8d20c5658efe0a602a80bcb5febb34590009 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 18 Apr 2019 15:33:12 +0200
Subject: [PATCH 620/808] Use GitHub labels in issues

---
 .github/ISSUE_TEMPLATE/Bug_report.md      | 2 +-
 .github/ISSUE_TEMPLATE/Feature_request.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index 05d29d5f01..8a7be54c99 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -1,7 +1,7 @@
 ---
 name: 🐛 Bug Report
 about: If something isn't working as expected 🤔.
-labels: 'type: bug', 'status: waiting-for-triage'
+labels: 'type: bug'
 ---
 
 ## Bug Report
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
index 945cba46ff..e8a75fd03c 100644
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -1,7 +1,7 @@
 ---
 name: 🚀 Feature Request
 about: I have a suggestion (and may want to implement it 🙂)!
-labels: 'type: enhancement', 'status: waiting-for-triage'
+labels: 'type: enhancement'
 ---
 
 ## Feature Request

From 30a1667bacafac7448d68990a8c44509bd188a26 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 18 Apr 2019 15:34:36 +0200
Subject: [PATCH 621/808] Upgrade to netty 4.1.35.Final #1017

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6292eec001..040990d776 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <junit-version>5.4.0</junit-version>
         <log4j2-version>2.11.2</log4j2-version>
         <mockito.version>2.22.0</mockito.version>
-        <netty-version>4.1.33.Final</netty-version>
+        <netty-version>4.1.35.Final</netty-version>
         <reactor-version>3.2.8.RELEASE</reactor-version>
         <reactive-streams-tck.version>1.0.0</reactive-streams-tck.version>
         <slf4j.version>1.7.25</slf4j.version>

From a44973e08f9e9fe0c24c15e4a3fb6a2966769962 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 18 Apr 2019 15:55:08 +0200
Subject: [PATCH 622/808] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4bf16ad37d..c683ffc8a3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-lettuce - Advanced Java Redis client
+<img src="https://avatars2.githubusercontent.com/u/25752188?v=4" width="80" height="80"> Lettuce - Advanced Java Redis client
 ===============================
 
 [![Build Status](https://travis-ci.org/lettuce-io/lettuce-core.svg)](https://travis-ci.org/lettuce-io/lettuce-core) [![codecov](https://codecov.io/gh/lettuce-io/lettuce-core/branch/master/graph/badge.svg)](https://codecov.io/gh/lettuce-io/lettuce-core)

From db3fe7d5b70da2309a1adeb4b488d4b408cab9b6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 18 Apr 2019 15:55:24 +0200
Subject: [PATCH 623/808] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c683ffc8a3..d71e75d269 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<img src="https://avatars2.githubusercontent.com/u/25752188?v=4" width="80" height="80"> Lettuce - Advanced Java Redis client
+<img src="https://avatars2.githubusercontent.com/u/25752188?v=4" width="50" height="50"> Lettuce - Advanced Java Redis client
 ===============================
 
 [![Build Status](https://travis-ci.org/lettuce-io/lettuce-core.svg)](https://travis-ci.org/lettuce-io/lettuce-core) [![codecov](https://codecov.io/gh/lettuce-io/lettuce-core/branch/master/graph/badge.svg)](https://codecov.io/gh/lettuce-io/lettuce-core)

From b6de74e384dea112e3656684ca3f50cdfd6c8e0d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 18 Apr 2019 15:57:12 +0200
Subject: [PATCH 624/808] =?UTF-8?q?Deprecate=20ClientOptions.pingBeforeAct?=
 =?UTF-8?q?ivateConnection(=E2=80=A6)=20#965?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With migrating towards RESP3 and the connection handshake we're going to remove PING before connection activation in Lettuce 6. Deprecating methods prior removal.
---
 src/main/java/io/lettuce/core/ClientOptions.java       |  6 ++++++
 src/main/java/io/lettuce/core/ConnectionBuilder.java   | 10 ++++++++++
 .../io/lettuce/core/cluster/ClusterClientOptions.java  |  1 +
 3 files changed, 17 insertions(+)

diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index 7ebd488ea5..bf75cbf6ac 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -135,7 +135,10 @@ protected Builder() {
          *
          * @param pingBeforeActivateConnection true/false
          * @return {@code this}
+         * @deprecated since 5.2. PING during connection handshake becomes mandatory with RESP3. This method will be removed
+         *             with Lettuce 6.
          */
+        @Deprecated
         public Builder pingBeforeActivateConnection(boolean pingBeforeActivateConnection) {
             this.pingBeforeActivateConnection = pingBeforeActivateConnection;
             return this;
@@ -325,7 +328,10 @@ public ClientOptions.Builder mutate() {
      * activated and enabled for use. If the check fails, the connect/reconnect is treated as failure.
      *
      * @return {@literal true} if {@literal PING} barrier is enabled.
+     * @deprecated since 5.2. PING during connection handshake becomes mandatory with RESP3. This method will be removed with
+     *             Lettuce 6.
      */
+    @Deprecated
     public boolean isPingBeforeActivateConnection() {
         return pingBeforeActivateConnection;
     }
diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index dc34b4d2c5..1cca1697e2 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -92,10 +92,20 @@ protected List<ChannelHandler> buildHandlers() {
         return handlers;
     }
 
+    /**
+     * @deprecated since 5.2. PING during connection handshake becomes mandatory with RESP3. This method will be removed with
+     *             Lettuce 6.
+     */
+    @Deprecated
     public void enablePingBeforeConnect() {
         pingCommandSupplier = PING_COMMAND_SUPPLIER;
     }
 
+    /**
+     * @deprecated since 5.2. PING during connection handshake becomes mandatory with RESP3. This method will be removed with
+     *             Lettuce 6.
+     */
+    @Deprecated
     public void enableAuthPingBeforeConnect() {
         pingCommandSupplier = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.auth(new String(password)));
     }
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index e653dbd1b1..efe49d9e5b 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -177,6 +177,7 @@ public Builder topologyRefreshOptions(ClusterTopologyRefreshOptions topologyRefr
         }
 
         @Override
+        @Deprecated
         public Builder pingBeforeActivateConnection(boolean pingBeforeActivateConnection) {
             super.pingBeforeActivateConnection(pingBeforeActivateConnection);
             return this;

From be1b9339bed129264cfb978af442c97546769bfe Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 12 May 2019 20:34:46 +0200
Subject: [PATCH 625/808] Migrate off TopicProcessor to EmitterProcessor #1032

---
 src/main/java/io/lettuce/core/event/DefaultEventBus.java    | 6 +++---
 .../io/lettuce/core/event/DefaultEventBusUnitTests.java     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/event/DefaultEventBus.java b/src/main/java/io/lettuce/core/event/DefaultEventBus.java
index 1251f7d3a8..1446a8b5de 100644
--- a/src/main/java/io/lettuce/core/event/DefaultEventBus.java
+++ b/src/main/java/io/lettuce/core/event/DefaultEventBus.java
@@ -15,8 +15,8 @@
  */
 package io.lettuce.core.event;
 
+import reactor.core.publisher.EmitterProcessor;
 import reactor.core.publisher.Flux;
-import reactor.core.publisher.TopicProcessor;
 import reactor.core.scheduler.Scheduler;
 
 /**
@@ -27,11 +27,11 @@
  */
 public class DefaultEventBus implements EventBus {
 
-    private final TopicProcessor<Event> bus;
+    private final EmitterProcessor<Event> bus;
     private final Scheduler scheduler;
 
     public DefaultEventBus(Scheduler scheduler) {
-        this.bus = TopicProcessor.create();
+        this.bus = EmitterProcessor.create();
         this.scheduler = scheduler;
     }
 
diff --git a/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java b/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java
index accc879022..1653441ee8 100644
--- a/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java
+++ b/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java
@@ -48,7 +48,7 @@ void publishToSubscriber() {
     @Test
     void publishToMultipleSubscribers() throws Exception {
 
-        EventBus sut = new DefaultEventBus(Schedulers.immediate());
+        EventBus sut = new DefaultEventBus(Schedulers.parallel());
 
         ArrayBlockingQueue<Event> arrayQueue = new ArrayBlockingQueue<>(5);
 

From 0827ec0c138e4458fc9f2704c9650cf2177edbe6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 12 May 2019 20:39:18 +0200
Subject: [PATCH 626/808] Upgrade to Brave 5.6.3 #1031

---
 pom.xml                                                         | 2 +-
 .../java/io/lettuce/core/tracing/BraveTracingUnitTests.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 040990d776..053e87d8f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <assertj-core.version>3.12.1</assertj-core.version>
-        <brave-version>5.2.0</brave-version>
+        <brave-version>5.6.3</brave-version>
         <junit-version>5.4.0</junit-version>
         <log4j2-version>2.11.2</log4j2-version>
         <mockito.version>2.22.0</mockito.version>
diff --git a/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java b/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java
index 28a89ad3cc..7f07c6f529 100644
--- a/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java
+++ b/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java
@@ -29,7 +29,7 @@
 import zipkin2.Span;
 import brave.Tracer;
 import brave.Tracing;
-import brave.internal.recorder.MutableSpan;
+import brave.handler.MutableSpan;
 import brave.propagation.CurrentTraceContext;
 import io.lettuce.core.TestSupport;
 import io.netty.channel.unix.DomainSocketAddress;

From e7c997f44ed3d9a2fe4b5e424b1fab1e0c130f82 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 12 May 2019 20:40:42 +0200
Subject: [PATCH 627/808] Upgrade to Netty 4.1.36.Final #1033

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 053e87d8f6..5a0b744671 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <junit-version>5.4.0</junit-version>
         <log4j2-version>2.11.2</log4j2-version>
         <mockito.version>2.22.0</mockito.version>
-        <netty-version>4.1.35.Final</netty-version>
+        <netty-version>4.1.36.Final</netty-version>
         <reactor-version>3.2.8.RELEASE</reactor-version>
         <reactive-streams-tck.version>1.0.0</reactive-streams-tck.version>
         <slf4j.version>1.7.25</slf4j.version>

From 2260ecc249adbfc4433a1508b8bd6af3008fa491 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 12 May 2019 20:41:45 +0200
Subject: [PATCH 628/808] Upgrade to JUnit 5.4.2 #1034

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5a0b744671..b7d57f0102 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
 
         <assertj-core.version>3.12.1</assertj-core.version>
         <brave-version>5.6.3</brave-version>
-        <junit-version>5.4.0</junit-version>
+        <junit-version>5.4.2</junit-version>
         <log4j2-version>2.11.2</log4j2-version>
         <mockito.version>2.22.0</mockito.version>
         <netty-version>4.1.36.Final</netty-version>

From 4f3c88e92d858afd2ed107125d44a99d240af8cf Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 12 May 2019 20:43:28 +0200
Subject: [PATCH 629/808] Upgrade to Mockito 2.27.0 #1035

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b7d57f0102..349e92acaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
         <brave-version>5.6.3</brave-version>
         <junit-version>5.4.2</junit-version>
         <log4j2-version>2.11.2</log4j2-version>
-        <mockito.version>2.22.0</mockito.version>
+        <mockito.version>2.27.0</mockito.version>
         <netty-version>4.1.36.Final</netty-version>
         <reactor-version>3.2.8.RELEASE</reactor-version>
         <reactive-streams-tck.version>1.0.0</reactive-streams-tck.version>

From edee8b39b3cd4c2c2e79b3cb3d17e604321cff3d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 12 May 2019 20:44:45 +0200
Subject: [PATCH 630/808] Upgrade to RxJava 2.2.8 #1036

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 349e92acaa..267ca86284 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,7 +228,7 @@
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
-            <version>2.2.6</version>
+            <version>2.2.8</version>
             <optional>true</optional>
         </dependency>
 

From c6ec06281e2bd9842bed1a9ac914d2195fab86d2 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 12 May 2019 20:50:07 +0200
Subject: [PATCH 631/808] Upgrade build plugin dependencies #1037

---
 pom.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 267ca86284..543e360388 100644
--- a/pom.xml
+++ b/pom.xml
@@ -515,7 +515,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>3.0.0</version>
+                        <version>3.1.1</version>
                         <executions>
                             <execution>
                                 <id>src</id>
@@ -551,7 +551,7 @@
                     <plugin>
                         <groupId>net.ju-n.maven.plugins</groupId>
                         <artifactId>checksum-maven-plugin</artifactId>
-                        <version>1.4</version>
+                        <version>1.8</version>
                         <configuration>
                             <algorithms>
                                 <algorithm>MD5</algorithm>
@@ -817,7 +817,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.1.1</version>
                         <executions>
                             <execution>
                                 <id>docs</id>
@@ -855,7 +855,7 @@
             <extension>
                 <groupId>kr.motd.maven</groupId>
                 <artifactId>os-maven-plugin</artifactId>
-                <version>1.6.0</version>
+                <version>1.6.2</version>
             </extension>
         </extensions>
 
@@ -864,7 +864,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.8.1</version>
                 <configuration>
                     <compilerArgument>-Xlint:all,-deprecation,-unchecked</compilerArgument>
                     <testCompilerArgument>-Xlint:none</testCompilerArgument>
@@ -878,7 +878,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${mockito.version}</version>
+                <version>2.22.2</version>
                 <configuration>
                     <systemProperties>
                         <io.netty.eventLoopThreads>4</io.netty.eventLoopThreads>
@@ -896,7 +896,7 @@
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>surefire-junit-platform</artifactId>
-                        <version>${mockito.version}</version>
+                        <version>2.22.2</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -904,7 +904,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>${mockito.version}</version>
+                <version>2.22.2</version>
                 <configuration>
                     <systemProperties>
                         <io.netty.eventLoopThreads>4</io.netty.eventLoopThreads>
@@ -921,7 +921,7 @@
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>surefire-junit-platform</artifactId>
-                        <version>${mockito.version}</version>
+                        <version>2.22.2</version>
                     </dependency>
                 </dependencies>
 
@@ -964,7 +964,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.2</version>
+                <version>0.8.4</version>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>

From 7f74a4d5db998d2a704ea2fcbda0483564730237 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 12 May 2019 21:13:15 +0200
Subject: [PATCH 632/808] Polishing #1032

---
 src/main/java/io/lettuce/core/event/DefaultEventBus.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/event/DefaultEventBus.java b/src/main/java/io/lettuce/core/event/DefaultEventBus.java
index 1446a8b5de..a9f90afded 100644
--- a/src/main/java/io/lettuce/core/event/DefaultEventBus.java
+++ b/src/main/java/io/lettuce/core/event/DefaultEventBus.java
@@ -42,6 +42,8 @@ public Flux<Event> get() {
 
     @Override
     public void publish(Event event) {
-        bus.onNext(event);
+        if (bus.hasDownstreams()) {
+            bus.onNext(event);
+        }
     }
 }

From 916688c3260835a3069e84c33405b09d855f0489 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 19 May 2019 14:28:23 +0200
Subject: [PATCH 633/808] Attach topology retrieval exceptions when Lettuce
 cannot retrieve a topology update #1024

We now fail earlier with an exception when topology retrieval has failed. We also attach individual failures as cause/suppressed exceptions to add context for error tracing.
---
 .../cluster/topology/AsyncConnections.java    | 13 +++--
 .../topology/ClusterTopologyRefresh.java      | 32 +++++++++++++
 .../cluster/topology/NodeTopologyViews.java   |  7 +++
 .../core/cluster/topology/RefreshFutures.java | 23 +++++++++
 .../ClusterPartiallyDownIntegrationTests.java |  2 +-
 .../RedisClusterClientIntegrationTests.java   | 12 +++++
 .../ClusterTopologyRefreshUnitTests.java      | 47 ++++++++++++++++---
 7 files changed, 126 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java b/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
index acd6dcbb60..eb3e8d9c29 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
@@ -81,9 +81,16 @@ public Connections get(long timeout, TimeUnit timeUnit) throws InterruptedExcept
 
         if (connections.isEmpty() && !sync.isEmpty() && !exceptions.isEmpty()) {
 
-            RedisConnectionException collector = new RedisConnectionException(
-                    "Unable to establish a connection to Redis Cluster");
-            exceptions.forEach(collector::addSuppressed);
+            RedisConnectionException collector = null;
+
+            for (Throwable exception : exceptions) {
+                if (collector == null) {
+                    collector = new RedisConnectionException("Unable to establish a connection to Redis Cluster at "
+                            + this.futures.keySet(), exception);
+                } else {
+                    collector.addSuppressed(exception);
+                }
+            }
 
             throw collector;
         }
diff --git a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
index 2c99428b24..0cf21c8825 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
@@ -98,10 +98,18 @@ public Map<RedisURI, Partitions> loadViews(Iterable<RedisURI> seed, boolean disc
                         nodeSpecificViews = getNodeSpecificViews(requestedTopology, requestedClients, commandTimeoutNs);
                     }
 
+                    if (nodeSpecificViews.isEmpty()) {
+                        tryFail(requestedTopology, seed);
+                    }
+
                     return nodeSpecificViews.toMap();
                 }
             }
 
+            if (nodeSpecificViews.isEmpty()) {
+                tryFail(requestedTopology, seed);
+            }
+
             return nodeSpecificViews.toMap();
         } catch (InterruptedException e) {
 
@@ -118,6 +126,30 @@ public Map<RedisURI, Partitions> loadViews(Iterable<RedisURI> seed, boolean disc
         }
     }
 
+    private void tryFail(Requests requestedTopology, Iterable<RedisURI> seed) {
+
+        RedisException exception = null;
+
+        for (RedisURI node : requestedTopology.nodes()) {
+
+            TimedAsyncCommand<String, String, String> request = requestedTopology.getRequest(node);
+            if (request != null && request.isCompletedExceptionally()) {
+
+                Throwable cause = RefreshFutures.getException(request);
+                if (exception == null) {
+                    exception = new RedisException("Cannot retrieve initial cluster partitions from initial URIs " + seed,
+                            cause);
+                } else if (cause != null) {
+                    exception.addSuppressed(cause);
+                }
+            }
+        }
+
+        if (exception != null) {
+            throw exception;
+        }
+    }
+
     private Set<RedisURI> toSet(Iterable<RedisURI> seed) {
         return StreamSupport.stream(seed.spliterator(), false).collect(Collectors.toCollection(HashSet::new));
     }
diff --git a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
index c399f365f3..c12f853edc 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
@@ -59,6 +59,13 @@ public Set<RedisURI> getClusterNodes() {
         return result;
     }
 
+    /**
+     * @return {@literal true} if no views are present.
+     */
+    public boolean isEmpty() {
+        return views.isEmpty();
+    }
+
     public Map<RedisURI, Partitions> toMap() {
 
         Map<RedisURI, Partitions> nodeSpecificViews = new TreeMap<>(TopologyComparators.RedisURIComparator.INSTANCE);
diff --git a/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java b/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
index 38d6dff24d..7b50329e25 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
@@ -16,9 +16,12 @@
 package io.lettuce.core.cluster.topology;
 
 import java.util.Collection;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
+import io.lettuce.core.RedisCommandInterruptedException;
+
 /**
  * @author Mark Paluch
  */
@@ -61,4 +64,24 @@ static long awaitAll(long timeout, TimeUnit timeUnit, Collection<? extends Futur
         }
         return waitTime;
     }
+
+    /**
+     * Retrieve the exception from a {@link Future}.
+     *
+     * @param future
+     * @return
+     * @since 5.1.7
+     */
+    static Throwable getException(Future<?> future) {
+
+        try {
+            future.get();
+        } catch (InterruptedException e) {
+            throw new RedisCommandInterruptedException(e);
+        } catch (ExecutionException e) {
+            return e.getCause();
+        }
+
+        return null;
+    }
 }
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java
index 4393c9c194..8fd12f4511 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java
@@ -111,7 +111,7 @@ void seedNodesAreOffline() {
             fail("Missing RedisException");
         } catch (RedisException e) {
             assertThat(e).hasCauseInstanceOf(RedisConnectionException.class);
-            assertThat(e.getCause()).hasMessage("Unable to establish a connection to Redis Cluster");
+            assertThat(e.getCause()).hasMessageStartingWith("Unable to establish a connection to Redis Cluster");
         }
     }
 
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
index 75163ab2f2..c03b4c0c80 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
@@ -393,6 +393,18 @@ void clusterAuth() {
         FastShutdown.shutdown(clusterClient);
     }
 
+    @Test
+    void partitionRetrievalShouldFail() {
+
+        RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(),
+                RedisURI.Builder.redis(TestSettings.host(), ClusterTestSettings.port7).build());
+
+        assertThatThrownBy(clusterClient::getPartitions).isInstanceOf(RedisException.class).hasRootCauseInstanceOf(
+                RedisCommandExecutionException.class);
+
+        FastShutdown.shutdown(clusterClient);
+    }
+
     @Test
     void clusterAuthPingBeforeConnect() {
 
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
index 2b68762a0b..624110d90b 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
@@ -16,13 +16,11 @@
 package io.lettuce.core.cluster.topology;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
@@ -291,8 +289,8 @@ void shouldFailIfNoNodeConnects() {
             sut.loadViews(seed, true);
             fail("Missing RedisConnectionException");
         } catch (Exception e) {
-            assertThat(e).hasNoCause().hasMessage("Unable to establish a connection to Redis Cluster");
-            assertThat(e.getSuppressed()).hasSize(2);
+            assertThat(e).hasMessageStartingWith("Unable to establish a connection to Redis Cluster");
+            assertThat(e.getSuppressed()).hasSize(1);
         }
 
         verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380)));
@@ -439,6 +437,43 @@ void discoveredAdditionalNodesShouldBeOrderedUsingLatency() {
                 .containsSequence(RedisURI.create("127.0.0.1", 7381), seed.get(0));
     }
 
+    @Test
+    void shouldPropagateCommandFailures() {
+
+        List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380), RedisURI.create("127.0.0.1", 7381));
+
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
+                .thenReturn(completedFuture((StatefulRedisConnection) connection1));
+        when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
+                .thenReturn(completedFuture((StatefulRedisConnection) connection2));
+
+        reset(connection1, connection2);
+
+        when(connection1.async()).thenReturn(asyncCommands1);
+        when(connection2.async()).thenReturn(asyncCommands2);
+        when(connection1.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
+        when(connection2.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
+
+        when(connection1.dispatch(any(RedisCommand.class))).thenAnswer(invocation -> {
+
+            TimedAsyncCommand command = invocation.getArgument(0);
+            command.completeExceptionally(new RedisException("AUTH"));
+            return command;
+        });
+
+        RedisException nestedException = new RedisException("AUTH");
+
+        when(connection2.dispatch(any(RedisCommand.class))).thenAnswer(invocation -> {
+
+            TimedAsyncCommand command = invocation.getArgument(0);
+            command.completeExceptionally(nestedException);
+            return command;
+        });
+
+        assertThatThrownBy(() -> sut.loadViews(seed, true)).isInstanceOf(RedisException.class)
+                .hasRootCauseInstanceOf(RedisException.class).hasSuppressedException(nestedException);
+    }
+
     Requests createClusterNodesRequests(int duration, String nodes) {
 
         RedisURI redisURI = RedisURI.create("redis://localhost:" + duration);

From e65ca76953d165c357eb5b02a3fa0bdc532d97c8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 19 May 2019 15:15:04 +0200
Subject: [PATCH 634/808] Add support for XINFO #996

---
 .../core/AbstractRedisAsyncCommands.java      | 15 +++++++++
 .../core/AbstractRedisReactiveCommands.java   | 15 +++++++++
 .../io/lettuce/core/RedisCommandBuilder.java  | 24 ++++++++++++++
 .../api/async/RedisStreamAsyncCommands.java   | 28 ++++++++++++++++
 .../reactive/RedisStreamReactiveCommands.java | 28 ++++++++++++++++
 .../core/api/sync/RedisStreamCommands.java    | 28 ++++++++++++++++
 .../NodeSelectionStreamAsyncCommands.java     | 28 ++++++++++++++++
 .../api/sync/NodeSelectionStreamCommands.java | 28 ++++++++++++++++
 .../lettuce/core/protocol/CommandKeyword.java |  6 ++--
 .../core/protocol/ProtocolKeyword.java        |  1 -
 .../lettuce/core/api/RedisStreamCommands.java | 28 ++++++++++++++++
 .../StreamCommandIntegrationTests.java        | 32 +++++++++++++++++++
 12 files changed, 257 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index c56f5ab7ca..22687e9df6 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1549,6 +1549,21 @@ public RedisFuture<String> xgroupSetid(XReadArgs.StreamOffset<K> offset, K group
         return dispatch(commandBuilder.xgroupSetid(offset, group));
     }
 
+    @Override
+    public RedisFuture<List<Object>> xinfoStream(K key) {
+        return dispatch(commandBuilder.xinfoStream(key));
+    }
+
+    @Override
+    public RedisFuture<List<Object>> xinfoGroups(K key) {
+        return dispatch(commandBuilder.xinfoGroups(key));
+    }
+
+    @Override
+    public RedisFuture<List<Object>> xinfoConsumers(K key, K group) {
+        return dispatch(commandBuilder.xinfoConsumers(key, group));
+    }
+
     @Override
     public RedisFuture<Long> xlen(K key) {
         return dispatch(commandBuilder.xlen(key));
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 5a0afd7f26..2dffd3d6ec 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -1626,6 +1626,21 @@ public Mono<String> xgroupSetid(XReadArgs.StreamOffset<K> streamOffset, K group)
         return createMono(() -> commandBuilder.xgroupSetid(streamOffset, group));
     }
 
+    @Override
+    public Flux<Object> xinfoStream(K key) {
+        return createDissolvingFlux(() -> commandBuilder.xinfoStream(key));
+    }
+
+    @Override
+    public Flux<Object> xinfoGroups(K key) {
+        return createDissolvingFlux(() -> commandBuilder.xinfoGroups(key));
+    }
+
+    @Override
+    public Flux<Object> xinfoConsumers(K key, K group) {
+        return createDissolvingFlux(() -> commandBuilder.xinfoConsumers(key, group));
+    }
+
     @Override
     public Mono<Long> xlen(K key) {
         return createMono(() -> commandBuilder.xlen(key));
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 0c044bf0d0..b5b8729763 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -2188,6 +2188,30 @@ public Command<K, V, String> xgroupSetid(StreamOffset<K> offset, K group) {
         return createCommand(XGROUP, new StatusOutput<>(codec), args);
     }
 
+    public Command<K, V, List<Object>> xinfoStream(K key) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(STREAM).addKey(key);
+
+        return createCommand(XINFO, new ArrayOutput<>(codec), args);
+    }
+
+    public Command<K, V, List<Object>> xinfoGroups(K key) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(GROUPS).addKey(key);
+
+        return createCommand(XINFO, new ArrayOutput<>(codec), args);
+    }
+
+    public Command<K, V, List<Object>> xinfoConsumers(K key, K group) {
+        notNullKey(key);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(CONSUMERS).addKey(key).addKey(group);
+
+        return createCommand(XINFO, new ArrayOutput<>(codec), args);
+    }
+
     public Command<K, V, Long> xlen(K key) {
         notNullKey(key);
 
diff --git a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
index cd1e3d5a4e..d781061732 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
@@ -159,6 +159,34 @@ public interface RedisStreamAsyncCommands<K, V> {
      */
     RedisFuture<String> xgroupSetid(StreamOffset<K> streamOffset, K group);
 
+    /**
+     * Retrieve information about the stream at {@code key}.
+     *
+     * @param key the stream key.
+     * @return List&lt;Object&gt; array-reply.
+     * @since 5.2
+     */
+    RedisFuture<List<Object>> xinfoStream(K key);
+
+    /**
+     * Retrieve information about the stream consumer groups at {@code key}.
+     *
+     * @param key the stream key.
+     * @return List&lt;Object&gt; array-reply.
+     * @since 5.2
+     */
+    RedisFuture<List<Object>> xinfoGroups(K key);
+
+    /**
+     * Retrieve information about consumer groups of group {@code group} and stream at {@code key}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @return List&lt;Object&gt; array-reply.
+     * @since 5.2
+     */
+    RedisFuture<List<Object>> xinfoConsumers(K key, K group);
+
     /**
      * Get the length of a steam.
      *
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
index 81e488eca7..9e19e6bb27 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
@@ -160,6 +160,34 @@ public interface RedisStreamReactiveCommands<K, V> {
      */
     Mono<String> xgroupSetid(StreamOffset<K> streamOffset, K group);
 
+    /**
+     * Retrieve information about the stream at {@code key}.
+     *
+     * @param key the stream key.
+     * @return Object array-reply.
+     * @since 5.2
+     */
+    Flux<Object> xinfoStream(K key);
+
+    /**
+     * Retrieve information about the stream consumer groups at {@code key}.
+     *
+     * @param key the stream key.
+     * @return Object array-reply.
+     * @since 5.2
+     */
+    Flux<Object> xinfoGroups(K key);
+
+    /**
+     * Retrieve information about consumer groups of group {@code group} and stream at {@code key}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @return Object array-reply.
+     * @since 5.2
+     */
+    Flux<Object> xinfoConsumers(K key, K group);
+
     /**
      * Get the length of a steam.
      *
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
index a38841cf53..19fc57e4bd 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
@@ -159,6 +159,34 @@ public interface RedisStreamCommands<K, V> {
      */
     String xgroupSetid(StreamOffset<K> streamOffset, K group);
 
+    /**
+     * Retrieve information about the stream at {@code key}.
+     *
+     * @param key the stream key.
+     * @return List&lt;Object&gt; array-reply.
+     * @since 5.2
+     */
+    List<Object> xinfoStream(K key);
+
+    /**
+     * Retrieve information about the stream consumer groups at {@code key}.
+     *
+     * @param key the stream key.
+     * @return List&lt;Object&gt; array-reply.
+     * @since 5.2
+     */
+    List<Object> xinfoGroups(K key);
+
+    /**
+     * Retrieve information about consumer groups of group {@code group} and stream at {@code key}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @return List&lt;Object&gt; array-reply.
+     * @since 5.2
+     */
+    List<Object> xinfoConsumers(K key, K group);
+
     /**
      * Get the length of a steam.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
index fd80dc5b19..14163613e4 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
@@ -159,6 +159,34 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      */
     AsyncExecutions<String> xgroupSetid(StreamOffset<K> streamOffset, K group);
 
+    /**
+     * Retrieve information about the stream at {@code key}.
+     *
+     * @param key the stream key.
+     * @return List&lt;Object&gt; array-reply.
+     * @since 5.2
+     */
+    AsyncExecutions<List<Object>> xinfoStream(K key);
+
+    /**
+     * Retrieve information about the stream consumer groups at {@code key}.
+     *
+     * @param key the stream key.
+     * @return List&lt;Object&gt; array-reply.
+     * @since 5.2
+     */
+    AsyncExecutions<List<Object>> xinfoGroups(K key);
+
+    /**
+     * Retrieve information about consumer groups of group {@code group} and stream at {@code key}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @return List&lt;Object&gt; array-reply.
+     * @since 5.2
+     */
+    AsyncExecutions<List<Object>> xinfoConsumers(K key, K group);
+
     /**
      * Get the length of a steam.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
index 401f27b474..b9b1a94b74 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
@@ -159,6 +159,34 @@ public interface NodeSelectionStreamCommands<K, V> {
      */
     Executions<String> xgroupSetid(StreamOffset<K> streamOffset, K group);
 
+    /**
+     * Retrieve information about the stream at {@code key}.
+     *
+     * @param key the stream key.
+     * @return List&lt;Object&gt; array-reply.
+     * @since 5.2
+     */
+    Executions<List<Object>> xinfoStream(K key);
+
+    /**
+     * Retrieve information about the stream consumer groups at {@code key}.
+     *
+     * @param key the stream key.
+     * @return List&lt;Object&gt; array-reply.
+     * @since 5.2
+     */
+    Executions<List<Object>> xinfoGroups(K key);
+
+    /**
+     * Retrieve information about consumer groups of group {@code group} and stream at {@code key}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @return List&lt;Object&gt; array-reply.
+     * @since 5.2
+     */
+    Executions<List<Object>> xinfoConsumers(K key, K group);
+
     /**
      * Get the length of a steam.
      *
diff --git a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
index 9c40598122..a30fd7140c 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
@@ -26,9 +26,9 @@ public enum CommandKeyword implements ProtocolKeyword {
 
     ADDR, ADDSLOTS, AFTER, AGGREGATE, ALPHA, AND, ASK, ASC, ASYNC, BEFORE, BLOCK, BUMPEPOCH,
 
-    BY, CHANNELS, COPY, COUNT, COUNTKEYSINSLOT, CREATE, DELSLOTS, DESC, SOFT, HARD, ENCODING,
+    BY, CHANNELS, COPY, COUNT, COUNTKEYSINSLOT, CONSUMERS, CREATE, DELSLOTS, DESC, SOFT, HARD, ENCODING,
 
-    FAILOVER, FORGET, FLUSH, FORCE, FLUSHSLOTS, GETNAME, GETKEYSINSLOT, GROUP, HTSTATS, ID, IDLE,
+    FAILOVER, FORGET, FLUSH, FORCE, FLUSHSLOTS, GETNAME, GETKEYSINSLOT, GROUP, GROUPS, HTSTATS, ID, IDLE,
 
     IDLETIME, JUSTID, KILL, KEYSLOT, LEN, LIMIT, LIST, LOAD, MATCH,
 
@@ -38,7 +38,7 @@ public enum CommandKeyword implements ProtocolKeyword {
 
     RESETSTAT, RESTART, RETRYCOUNT, REWRITE, SAVECONFIG, SDSLEN, SETNAME, SETSLOT, SLOTS, STABLE,
 
-    MIGRATING, IMPORTING, SKIPME, SLAVES, STORE, SUM, SEGFAULT, UNBLOCK, WEIGHTS,
+    MIGRATING, IMPORTING, SKIPME, SLAVES, STREAM, STORE, SUM, SEGFAULT, UNBLOCK, WEIGHTS,
 
     WITHSCORES, XOR, USAGE;
 
diff --git a/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java b/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java
index 930f160a23..a58dd0084f 100644
--- a/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java
+++ b/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java
@@ -25,7 +25,6 @@ public interface ProtocolKeyword {
     /**
      *
      * @return byte[] encoded representation.
-     *
      */
     byte[] getBytes();
 
diff --git a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
index 11696fef2e..2ff991754f 100644
--- a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
@@ -158,6 +158,34 @@ public interface RedisStreamCommands<K, V> {
      */
     String xgroupSetid(StreamOffset<K> streamOffset, K group);
 
+    /**
+     * Retrieve information about the stream at {@code key}.
+     *
+     * @param key the stream key.
+     * @return List&lt;Object&gt; array-reply.
+     * @since 5.2
+     */
+    List<Object> xinfoStream(K key);
+
+    /**
+     * Retrieve information about the stream consumer groups at {@code key}.
+     *
+     * @param key the stream key.
+     * @return List&lt;Object&gt; array-reply.
+     * @since 5.2
+     */
+    List<Object> xinfoGroups(K key);
+
+    /**
+     * Retrieve information about consumer groups of group {@code group} and stream at {@code key}.
+     *
+     * @param key the stream key.
+     * @param group name of the consumer group.
+     * @return List&lt;Object&gt; array-reply.
+     * @since 5.2
+     */
+    List<Object> xinfoConsumers(K key, K group);
+
     /**
      * Get the length of a steam.
      *
diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
index f53e40e64d..05b31e7eac 100644
--- a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
@@ -234,6 +234,38 @@ void xreadTransactional() {
         assertThat(secondMessage.getBody()).containsEntry("key4", "value4");
     }
 
+    @Test
+    void xinfoStream() {
+
+        redis.xadd(key, Collections.singletonMap("key1", "value1"));
+
+        List<Object> objects = redis.xinfoStream(key);
+
+        assertThat(objects).containsSequence("length", 1L);
+    }
+
+    @Test
+    void xinfoGroups() {
+
+        assertThat(redis.xgroupCreate(StreamOffset.latest(key), "group", XGroupCreateArgs.Builder.mkstream())).isEqualTo("OK");
+
+        List<Object> objects = redis.xinfoGroups(key);
+        assertThat((List<Object>) objects.get(0)).containsSequence("name", "group");
+    }
+
+    @Test
+    void xinfoConsumers() {
+
+        assertThat(redis.xgroupCreate(StreamOffset.from(key, "0-0"), "group", XGroupCreateArgs.Builder.mkstream())).isEqualTo(
+                "OK");
+        redis.xadd(key, Collections.singletonMap("key1", "value1"));
+
+        redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.lastConsumed(key));
+
+        List<Object> objects = redis.xinfoConsumers(key, "group");
+        assertThat((List<Object>) objects.get(0)).containsSequence("name", "consumer1");
+    }
+
     @Test
     void xgroupCreate() {
 

From 024facb05651652ba84faef4ad55ae1453bd92bf Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 19 May 2019 15:18:36 +0200
Subject: [PATCH 635/808] Polishing #1037

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 543e360388..3b0f0bc558 100644
--- a/pom.xml
+++ b/pom.xml
@@ -549,7 +549,7 @@
                     </plugin>
 
                     <plugin>
-                        <groupId>net.ju-n.maven.plugins</groupId>
+                        <groupId>net.nicoulaj.maven.plugins</groupId>
                         <artifactId>checksum-maven-plugin</artifactId>
                         <version>1.8</version>
                         <configuration>

From e2a567fe2ec0d8ab2baecd478277f36755f41ffa Mon Sep 17 00:00:00 2001
From: Per Lundberg <perlun@gmail.com>
Date: Tue, 4 Jun 2019 09:22:48 +0300
Subject: [PATCH 636/808] Fix missing "the" in RedisURI Javadoc #1049

---
 src/main/java/io/lettuce/core/RedisURI.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index b053b66597..5766041a7e 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -38,7 +38,7 @@
  * Redis URI. Contains connection details for the Redis/Sentinel connections. You can provide the database, client name,
  * password and timeouts within the RedisURI.
  *
- * You have following possibilities to create a {@link RedisURI}:
+ * You have the following possibilities to create a {@link RedisURI}:
  *
  * <ul>
  * <li>Use an URI:

From d7dd340c14aae7836a69f2e07186fdcda450f061 Mon Sep 17 00:00:00 2001
From: Raghava2016 <raghava.juvvaji@gmail.com>
Date: Tue, 4 Jun 2019 22:25:34 -0700
Subject: [PATCH 637/808] Fixed link in documentation #1050

Original pull request: #1051.
---
 src/main/asciidoc/overview.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/asciidoc/overview.asciidoc b/src/main/asciidoc/overview.asciidoc
index a585986a5a..fed5868d26 100644
--- a/src/main/asciidoc/overview.asciidoc
+++ b/src/main/asciidoc/overview.asciidoc
@@ -9,7 +9,7 @@ This section provides some basic introduction to Redis. The rest of the document
 
 [[overview.redis]]
 === Knowing Redis
-NoSQL stores have taken the storage world by storm. It is a vast domain with a plethora of solutions, terms and patterns (to make things worse even the term itself has multiple http://www.google.com/search?q=nosoql+acronym[meanings]). While some of the principles are common, it is crucial that the user is familiar to some degree with Redis. The best way to get acquainted to this solutions is to read their documentation and follow their documentation - it usually doesn't take more then 5-10 minutes to go through them and if you are coming from an RDMBS-only background many times these exercises can be an eye opener.
+NoSQL stores have taken the storage world by storm. It is a vast domain with a plethora of solutions, terms and patterns (to make things worse even the term itself has multiple http://www.google.com/search?q=nosql+acronym[meanings]). While some of the principles are common, it is crucial that the user is familiar to some degree with Redis. The best way to get acquainted to this solutions is to read their documentation and follow their documentation - it usually doesn't take more then 5-10 minutes to go through them and if you are coming from an RDMBS-only background many times these exercises can be an eye opener.
 
 The jumping off ground for learning about Redis is http://www.redis.io/[redis.io]. Here is a list of other useful resources:
 

From 83cec6975dd020e11589c038b79ca220a101f343 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 9 Jun 2019 15:43:46 +0200
Subject: [PATCH 638/808] Upgrade TravisCI build to Xenial/Java 11 #1056

---
 .travis.yml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 22fbb08473..a262e267dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,7 @@
-dist: trusty
+dist: xenial
 
 language: java
 
-jdk:
-  - oraclejdk8
-
 env:
   matrix:
     - REDIS=unstable
@@ -16,10 +13,10 @@ env:
 sudo: false
 
 before_install:
-  - if [[ ! -f downloads/stunnel-5.50.tar.gz ]]; then wget -O downloads/stunnel-5.50.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.50.tar.gz; fi
-  - if [[ ! -f ./stunnel-5.50/configure ]]; then tar -xzf downloads/stunnel-5.50.tar.gz; fi
-  - if [[ ! -f ./stunnel-5.50/src/stunnel ]]; then cd ./stunnel-5.50; ./configure; make; cd ..; fi
-  - export PATH="$PATH:$(pwd)/stunnel-5.50/src"
+  - if [[ ! -f downloads/stunnel-5.54.tar.gz ]]; then wget -O downloads/stunnel-5.54.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.54.tar.gz; fi
+  - if [[ ! -f ./stunnel-5.54/configure ]]; then tar -xzf downloads/stunnel-5.54.tar.gz; fi
+  - if [[ ! -f ./stunnel-5.54/src/stunnel ]]; then cd ./stunnel-5.54; ./configure; make; cd ..; fi
+  - export PATH="$PATH:$(pwd)/stunnel-5.54/src"
 
 install: make prepare ssl-keys
 
@@ -32,7 +29,7 @@ cache:
   directories:
     - '$HOME/.m2/repository'
     - '$TRAVIS_BUILD_DIR/downloads'
-    - '$TRAVIS_BUILD_DIR/stunnel-5.50'
+    - '$TRAVIS_BUILD_DIR/stunnel-5.54'
 
 notifications:
   webhooks:

From 91b77525c1a036a64de28447b5153997b2fdb0f0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 9 Jun 2019 15:58:41 +0200
Subject: [PATCH 639/808] Upgrade to jsr305 3.0.2 #1055

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3b0f0bc558..189312cc1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -271,7 +271,7 @@
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
-            <version>3.0.1</version>
+            <version>3.0.2</version>
             <optional>true</optional>
         </dependency>
 

From 2005e406bd0c34dba80f04a8d820a6c02bfa1f47 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 9 Jun 2019 15:58:56 +0200
Subject: [PATCH 640/808] Upgrade to RxJava 2.2.9 #1054

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 189312cc1c..5a1273200a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,7 +228,7 @@
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
-            <version>2.2.8</version>
+            <version>2.2.9</version>
             <optional>true</optional>
         </dependency>
 

From 0b6d6d84f15a6bbc37b193129fd5901e62effe8f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 15 Jun 2019 16:30:04 +0200
Subject: [PATCH 641/808] Support TLS connections in Sentinel mode #1048
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lettuce now supports TLS connections in Sentinel mode for:

1. Master lookup using a Sentinel URL
2. Master/Replica usage via MasterSlave/MasterReplica entry points

Lettuce also supports a new protocol scheme to enable TLS usage:

rediss-sentinel://<host>:<port>?sentinelMasterId=…

Enabling TLS enables encryption for all participating nodes (Sentinel and data nodes)
---
 Makefile                                      | 20 ++++
 src/main/asciidoc/new-features.adoc           |  1 +
 .../java/io/lettuce/core/RedisClient.java     | 97 ++++++++++++-------
 src/main/java/io/lettuce/core/RedisURI.java   | 47 ++++++---
 .../core/RedisURIBuilderUnitTests.java        | 27 +++---
 .../io/lettuce/core/RedisURIUnitTests.java    | 10 ++
 ...terReplicaSentinelSslIntegrationTests.java | 74 ++++++++++++++
 .../sentinel/SentinelSslIntegrationTests.java | 86 ++++++++++++++++
 8 files changed, 299 insertions(+), 63 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java
 create mode 100644 src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java

diff --git a/Makefile b/Makefile
index c676759337..628a3c33b6 100644
--- a/Makefile
+++ b/Makefile
@@ -262,6 +262,26 @@ work/stunnel.conf:
 	@echo accept = 127.0.0.1:7445 >> $@
 	@echo connect = 127.0.0.1:7481 >> $@
 
+	@echo [ssl-sentinel-1] >> $@
+	@echo accept = 127.0.0.1:26822 >> $@
+	@echo connect = 127.0.0.1:26379 >> $@
+
+	@echo [ssl-sentinel-2] >> $@
+	@echo accept = 127.0.0.1:26823 >> $@
+	@echo connect = 127.0.0.1:26380 >> $@
+
+	@echo [ssl-sentinel-3] >> $@
+	@echo accept = 127.0.0.1:26824 >> $@
+	@echo connect = 127.0.0.1:26381 >> $@
+
+	@echo [ssl-sentinel-master] >> $@
+	@echo accept = 127.0.0.1:6925 >> $@
+	@echo connect = 127.0.0.1:6482 >> $@
+
+	@echo [ssl-sentinel-slave] >> $@
+	@echo accept = 127.0.0.1:6926 >> $@
+	@echo connect = 127.0.0.1:6482 >> $@
+
 	@echo [stunnel-client-cert] >> $@
 	@echo accept = 127.0.0.1:6445 >> $@
 	@echo connect = 127.0.0.1:6479 >> $@
diff --git a/src/main/asciidoc/new-features.adoc b/src/main/asciidoc/new-features.adoc
index 8a920c3bb5..e066542d16 100644
--- a/src/main/asciidoc/new-features.adoc
+++ b/src/main/asciidoc/new-features.adoc
@@ -4,6 +4,7 @@
 [[new-features.5-2-0]]
 == What's new in Lettuce 5.2
 * Allow randomization of read candidates using Redis Cluster
+* SSL support for Redis Sentinel
 
 [[new-features.5-1-0]]
 == What's new in Lettuce 5.1
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 3443b71413..82e607d3d8 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -18,6 +18,7 @@
 import static io.lettuce.core.LettuceStrings.isEmpty;
 import static io.lettuce.core.LettuceStrings.isNotEmpty;
 
+import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.time.Duration;
 import java.util.List;
@@ -287,30 +288,8 @@ private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandalone
     private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnectionImpl<K, V> connection,
             RedisCodec<K, V> codec, Endpoint endpoint, RedisURI redisURI, Supplier<CommandHandler> commandHandlerSupplier) {
 
-        ConnectionBuilder connectionBuilder;
-        if (redisURI.isSsl()) {
-            SslConnectionBuilder sslConnectionBuilder = SslConnectionBuilder.sslConnectionBuilder();
-            sslConnectionBuilder.ssl(redisURI);
-            connectionBuilder = sslConnectionBuilder;
-        } else {
-            connectionBuilder = ConnectionBuilder.connectionBuilder();
-        }
-
+        ConnectionBuilder connectionBuilder = getConnectionBuilder(endpoint, redisURI, commandHandlerSupplier);
         connectionBuilder.connection(connection);
-        connectionBuilder.clientOptions(clientOptions);
-        connectionBuilder.clientResources(clientResources);
-        connectionBuilder.commandHandler(commandHandlerSupplier).endpoint(endpoint);
-
-        connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
-        channelType(connectionBuilder, redisURI);
-
-        if (clientOptions.isPingBeforeActivateConnection()) {
-            if (hasPassword(redisURI)) {
-                connectionBuilder.enableAuthPingBeforeConnect();
-            } else {
-                connectionBuilder.enablePingBeforeConnect();
-            }
-        }
 
         ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
         ConnectionFuture<?> sync = future;
@@ -343,6 +322,37 @@ private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnecti
         return sync.thenApply(channelHandler -> (S) connection);
     }
 
+    private <K, V> ConnectionBuilder getConnectionBuilder(Endpoint endpoint, RedisURI redisURI,
+            Supplier<CommandHandler> commandHandlerSupplier) {
+
+        ConnectionBuilder connectionBuilder;
+
+        if (redisURI.isSsl()) {
+            SslConnectionBuilder sslConnectionBuilder = SslConnectionBuilder.sslConnectionBuilder();
+            sslConnectionBuilder.ssl(redisURI);
+            connectionBuilder = sslConnectionBuilder;
+        } else {
+            connectionBuilder = ConnectionBuilder.connectionBuilder();
+        }
+
+        connectionBuilder.clientOptions(clientOptions);
+        connectionBuilder.clientResources(clientResources);
+        connectionBuilder.commandHandler(commandHandlerSupplier).endpoint(endpoint);
+
+        connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
+        channelType(connectionBuilder, redisURI);
+
+        if (clientOptions.isPingBeforeActivateConnection()) {
+            if (hasPassword(redisURI)) {
+                connectionBuilder.enableAuthPingBeforeConnect();
+            } else {
+                connectionBuilder.enablePingBeforeConnect();
+            }
+        }
+
+        return connectionBuilder;
+    }
+
     private static boolean hasPassword(RedisURI redisURI) {
         return redisURI.getPassword() != null && redisURI.getPassword().length != 0;
     }
@@ -576,10 +586,6 @@ private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectS
     private <K, V> ConnectionFuture<StatefulRedisSentinelConnection<K, V>> doConnectSentinelAsync(RedisCodec<K, V> codec,
             String clientName, RedisURI redisURI, Duration timeout) {
 
-        ConnectionBuilder connectionBuilder = ConnectionBuilder.connectionBuilder();
-        connectionBuilder.clientOptions(ClientOptions.copyOf(getOptions()));
-        connectionBuilder.clientResources(clientResources);
-
         DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions, clientResources);
         RedisChannelWriter writer = endpoint;
 
@@ -587,12 +593,14 @@ private <K, V> ConnectionFuture<StatefulRedisSentinelConnection<K, V>> doConnect
             writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
         }
 
+        ConnectionBuilder connectionBuilder = getConnectionBuilder(endpoint, redisURI, () -> new CommandHandler(clientOptions,
+                clientResources, endpoint));
+
         StatefulRedisSentinelConnectionImpl<K, V> connection = newStatefulRedisSentinelConnection(writer, codec, timeout);
 
         logger.debug("Connecting to Redis Sentinel, address: " + redisURI);
 
-        connectionBuilder.endpoint(endpoint).commandHandler(() -> new CommandHandler(clientOptions, clientResources, endpoint))
-                .connection(connection);
+        connectionBuilder.connection(connection);
         connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
 
         if (clientOptions.isPingBeforeActivateConnection()) {
@@ -766,14 +774,33 @@ private Mono<SocketAddress> getSocketAddressSupplier(RedisURI redisURI) {
 
     private Mono<SocketAddress> lookupRedis(RedisURI sentinelUri) {
 
-        Mono<StatefulRedisSentinelConnection<String, String>> connection = Mono.fromCompletionStage(connectSentinelAsync(
+        Mono<StatefulRedisSentinelConnection<String, String>> connection = Mono.fromCompletionStage(() -> connectSentinelAsync(
                 newStringStringCodec(), sentinelUri, timeout));
 
-        return connection.flatMap(c -> c.reactive() //
-                .getMasterAddrByName(sentinelUri.getSentinelMasterId()) //
-                .timeout(this.timeout) //
-                .flatMap(it -> Mono.fromCompletionStage(c.closeAsync()) //
-                        .then(Mono.just(it))));
+        return connection.flatMap(c -> {
+
+            String sentinelMasterId = sentinelUri.getSentinelMasterId();
+            return c.reactive()
+                    .getMasterAddrByName(sentinelMasterId)
+                    .map(it -> {
+
+                        if (it instanceof InetSocketAddress) {
+
+                            InetSocketAddress isa = (InetSocketAddress) it;
+                            SocketAddress resolved = clientResources.socketAddressResolver().resolve(
+                                    RedisURI.create(isa.getHostString(), isa.getPort()));
+
+                            logger.debug("Resolved Master {} SocketAddress {}:{} to {}", sentinelMasterId, isa.getHostString(),
+                                    isa.getPort(), resolved);
+
+                            return resolved;
+                        }
+
+                        return it;
+                    }).timeout(this.timeout) //
+                    .flatMap(it -> Mono.fromCompletionStage(c::closeAsync) //
+                            .thenReturn(it));
+        });
     }
 
     private static <T> ConnectionFuture<T> transformAsyncConnectionException(ConnectionFuture<T> future) {
diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 5766041a7e..1512ab7fd8 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -91,6 +91,7 @@
  * <li><b>rediss</b> Redis Standalone SSL</li>
  * <li><b>redis-socket</b> Redis Standalone Unix Domain Socket</li>
  * <li><b>redis-sentinel</b> Redis Sentinel</li>
+ * <li><b>rediss-sentinel</b> Redis Sentinel SSL</li>
  * </ul>
  *
  * <p>
@@ -119,6 +120,7 @@
 public class RedisURI implements Serializable, ConnectionPoint {
 
     public static final String URI_SCHEME_REDIS_SENTINEL = "redis-sentinel";
+    public static final String URI_SCHEME_REDIS_SENTINEL_SECURE = "rediss-sentinel";
     public static final String URI_SCHEME_REDIS = "redis";
     public static final String URI_SCHEME_REDIS_SECURE = "rediss";
     public static final String URI_SCHEME_REDIS_SECURE_ALT = "redis+ssl";
@@ -451,12 +453,13 @@ public boolean isSsl() {
     }
 
     /**
-     * Sets whether to use SSL model.
+     * Sets whether to use SSL. Sets SSL also for already configured Redis Sentinel nodes.
      *
      * @param ssl
      */
     public void setSsl(boolean ssl) {
         this.ssl = ssl;
+        this.sentinels.forEach(it -> it.setSsl(ssl));
     }
 
     /**
@@ -469,12 +472,14 @@ public boolean isVerifyPeer() {
     }
 
     /**
-     * Sets whether to verify peers when using {@link #isSsl() SSL}.
+     * Sets whether to verify peers when using {@link #isSsl() SSL}. Sets peer verification also for already configured Redis
+     * Sentinel nodes.
      *
      * @param verifyPeer {@literal true} to verify peers when using {@link #isSsl() SSL}.
      */
     public void setVerifyPeer(boolean verifyPeer) {
         this.verifyPeer = verifyPeer;
+        this.sentinels.forEach(it -> it.setVerifyPeer(verifyPeer));
     }
 
     /**
@@ -487,12 +492,13 @@ public boolean isStartTls() {
     }
 
     /**
-     * Returns whether StartTLS is enabled.
+     * Returns whether StartTLS is enabled. Sets StartTLS also for already configured Redis Sentinel nodes.
      *
      * @param startTls {@literal true} if StartTLS is enabled.
      */
     public void setStartTls(boolean startTls) {
         this.startTls = startTls;
+        this.sentinels.forEach(it -> it.setStartTls(startTls));
     }
 
     /**
@@ -527,7 +533,7 @@ private static RedisURI buildRedisUriFromUri(URI uri) {
         LettuceAssert.notNull(uri.getScheme(), "URI scheme must not be null");
 
         Builder builder;
-        if (uri.getScheme().equals(URI_SCHEME_REDIS_SENTINEL)) {
+        if (isSentinel(uri.getScheme())) {
             builder = configureSentinel(uri);
         } else {
             builder = configureStandalone(uri);
@@ -587,7 +593,7 @@ private static RedisURI buildRedisUriFromUri(URI uri) {
             }
         }
 
-        if (uri.getScheme().equals(URI_SCHEME_REDIS_SENTINEL)) {
+        if (isSentinel(uri.getScheme())) {
             LettuceAssert.notEmpty(builder.sentinelMasterId, "URI must contain the sentinelMasterId");
         }
 
@@ -653,7 +659,7 @@ private String getQueryString() {
 
     private String getPortPart(int port, String scheme) {
 
-        if (URI_SCHEME_REDIS_SENTINEL.equals(scheme) && port == DEFAULT_SENTINEL_PORT) {
+        if (isSentinel(scheme) && port == DEFAULT_SENTINEL_PORT) {
             return "";
         }
 
@@ -680,7 +686,11 @@ private String getScheme() {
         }
 
         if (host == null && !sentinels.isEmpty()) {
-            scheme = URI_SCHEME_REDIS_SENTINEL;
+            if (isSsl()) {
+                scheme = URI_SCHEME_REDIS_SENTINEL_SECURE;
+            } else {
+                scheme = URI_SCHEME_REDIS_SENTINEL;
+            }
         }
         return scheme;
     }
@@ -952,10 +962,18 @@ private static RedisURI.Builder configureSentinel(URI uri) {
             builder.withSentinelMasterId(masterId);
         }
 
+        if (uri.getScheme().equals(URI_SCHEME_REDIS_SENTINEL_SECURE)) {
+            builder.withSsl(true);
+        }
+
         LettuceAssert.notNull(builder, "Invalid URI, cannot get host part");
         return builder;
     }
 
+    private static boolean isSentinel(String scheme) {
+        return URI_SCHEME_REDIS_SENTINEL.equals(scheme) || URI_SCHEME_REDIS_SENTINEL_SECURE.equals(scheme);
+    }
+
     /**
      * Builder for Redis URI.
      */
@@ -1189,44 +1207,41 @@ public Builder withPort(int port) {
         }
 
         /**
-         * Adds ssl information to the builder. Does only affect Redis URI, cannot be used with Sentinel connections.
+         * Adds ssl information to the builder. Sets SSL also for already configured Redis Sentinel nodes.
          *
          * @param ssl {@literal true} if use SSL
          * @return the builder
          */
         public Builder withSsl(boolean ssl) {
 
-            LettuceAssert.assertState(this.host != null, "Host is null. Cannot use in Sentinel mode.");
-
             this.ssl = ssl;
+            this.sentinels.forEach(it -> it.setSsl(ssl));
             return this;
         }
 
         /**
-         * Enables/disables StartTLS when using SSL. Does only affect Redis URI, cannot be used with Sentinel connections.
+         * Enables/disables StartTLS when using SSL. Sets StartTLS also for already configured Redis Sentinel nodes.
          *
          * @param startTls {@literal true} if use StartTLS
          * @return the builder
          */
         public Builder withStartTls(boolean startTls) {
 
-            LettuceAssert.assertState(this.host != null, "Host is null. Cannot use in Sentinel mode.");
-
             this.startTls = startTls;
+            this.sentinels.forEach(it -> it.setStartTls(startTls));
             return this;
         }
 
         /**
-         * Enables/disables peer verification. Does only affect Redis URI, cannot be used with Sentinel connections.
+         * Enables/disables peer verification. Sets peer verification also for already configured Redis Sentinel nodes.
          *
          * @param verifyPeer {@literal true} to verify hosts when using SSL
          * @return the builder
          */
         public Builder withVerifyPeer(boolean verifyPeer) {
 
-            LettuceAssert.assertState(this.host != null, "Host is null. Cannot use in Sentinel mode.");
-
             this.verifyPeer = verifyPeer;
+            this.sentinels.forEach(it -> it.setVerifyPeer(verifyPeer));
             return this;
         }
 
diff --git a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
index 991e8b01bb..0c7f97aa63 100644
--- a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
@@ -25,6 +25,8 @@
 import org.junit.jupiter.api.Test;
 
 /**
+ * Unit tests for {@link RedisURI.Builder}.
+ *
  * @author Mark Paluch
  */
 class RedisURIBuilderUnitTests {
@@ -180,6 +182,19 @@ void withAuthenticatedSentinel() {
         assertThat(new String(sentinel.getPassword())).isEqualTo("foo");
     }
 
+    @Test
+    void withTlsSentinel() {
+
+        RedisURI result = RedisURI.Builder.sentinel("host", 1234, "master", "foo").withSsl(true).withStartTls(true)
+                .withVerifyPeer(false).build();
+
+        RedisURI sentinel = result.getSentinels().get(0);
+        assertThat(new String(sentinel.getPassword())).isEqualTo("foo");
+        assertThat(sentinel.isSsl()).isTrue();
+        assertThat(sentinel.isStartTls()).isTrue();
+        assertThat(sentinel.isVerifyPeer()).isFalse();
+    }
+
     @Test
     void withAuthenticatedSentinelUri() {
 
@@ -220,18 +235,6 @@ void redisSentinelWithNullMasterId() {
         assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 1, null)).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test
-    void redisSentinelWithSSLNotPossible() {
-        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 1, "master").withSsl(true)).isInstanceOf(
-                IllegalStateException.class);
-    }
-
-    @Test
-    void redisSentinelWithTLSNotPossible() {
-        assertThatThrownBy(() -> RedisURI.Builder.sentinel("a", 1, "master").withStartTls(true)).isInstanceOf(
-                IllegalStateException.class);
-    }
-
     @Test
     void invalidScheme() {
         assertThatThrownBy(() -> RedisURI.create("http://www.web.de")).isInstanceOf(IllegalArgumentException.class);
diff --git a/src/test/java/io/lettuce/core/RedisURIUnitTests.java b/src/test/java/io/lettuce/core/RedisURIUnitTests.java
index ec1c74ef79..ece987ace5 100644
--- a/src/test/java/io/lettuce/core/RedisURIUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisURIUnitTests.java
@@ -130,6 +130,16 @@ void sentinelUriTest() {
                 "redis-sentinel://auth@h1:222,h2,h3:1234?database=5&sentinelMasterId=masterId");
     }
 
+    @Test
+    void sentinelSecureUriTest() {
+
+        RedisURI redisURI = RedisURI.create("rediss-sentinel://auth@h1:222,h2,h3:1234/5?sentinelMasterId=masterId");
+        assertThat(redisURI.isSsl()).isTrue();
+
+        assertThat(redisURI.toURI().toString()).isEqualTo(
+                "rediss-sentinel://auth@h1:222,h2,h3:1234?database=5&sentinelMasterId=masterId");
+    }
+
     @Test
     void socketEqualsTest() {
 
diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java
new file mode 100644
index 0000000000..7349b1683b
--- /dev/null
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterreplica;
+
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.lettuce.core.ReadFrom;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSupport;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.HostAndPort;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.DnsResolver;
+import io.lettuce.core.resource.MappingSocketAddressResolver;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.settings.TestSettings;
+
+/**
+ * Integration test for Master/Replica using Redis Sentinel over SSL.
+ *
+ * @author Mark Paluch
+ */
+@ExtendWith(LettuceExtension.class)
+class MasterReplicaSentinelSslIntegrationTests extends TestSupport {
+
+    private final ClientResources clientResources;
+
+    @Inject
+    MasterReplicaSentinelSslIntegrationTests(ClientResources clientResources) {
+        this.clientResources = clientResources.mutate()
+                .socketAddressResolver(MappingSocketAddressResolver.create(DnsResolver.jvmDefault(), hostAndPort -> {
+
+                    return HostAndPort.of(hostAndPort.getHostText(), hostAndPort.getPort() + 443);
+                })).build();
+    }
+
+    @Test
+    void testMasterSlaveSentinelBasic() {
+
+        RedisClient client = RedisClient.create(clientResources);
+        RedisURI redisURI = RedisURI.create("rediss-sentinel://" + TestSettings.host() + ":26379?sentinelMasterId=mymaster");
+        redisURI.setVerifyPeer(false);
+        StatefulRedisMasterReplicaConnection<String, String> connection = MasterReplica.connect(client, StringCodec.UTF8,
+                redisURI);
+
+        connection.setReadFrom(ReadFrom.REPLICA);
+
+        connection.sync().set(key, value);
+        connection.sync().set(key, value);
+        connection.sync().get(key);
+
+        connection.close();
+
+        FastShutdown.shutdown(client);
+    }
+}
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java
new file mode 100644
index 0000000000..4b14f61254
--- /dev/null
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.sentinel;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TestSupport;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.internal.HostAndPort;
+import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.DnsResolver;
+import io.lettuce.core.resource.MappingSocketAddressResolver;
+import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.resource.FastShutdown;
+import io.lettuce.test.settings.TestSettings;
+
+/**
+ * Integration tests for Sentinel usage.
+ *
+ * @author Mark Paluch
+ */
+@ExtendWith(LettuceExtension.class)
+class SentinelSslIntegrationTests extends TestSupport {
+
+    private final ClientResources clientResources;
+
+    @Inject
+    SentinelSslIntegrationTests(ClientResources clientResources) {
+        this.clientResources = clientResources.mutate()
+                .socketAddressResolver(MappingSocketAddressResolver.create(DnsResolver.jvmDefault(), hostAndPort -> {
+
+                    return HostAndPort.of(hostAndPort.getHostText(), hostAndPort.getPort() + 443);
+                })).build();
+    }
+
+    @Test
+    void shouldConnectSentinelDirectly() {
+
+        RedisURI redisURI = RedisURI.create("rediss://" + TestSettings.host() + ":26379");
+        redisURI.setVerifyPeer(false);
+
+        RedisClient client = RedisClient.create(clientResources);
+        StatefulRedisSentinelConnection<String, String> connection = client.connectSentinel(redisURI);
+
+        assertThat(connection.sync().getMasterAddrByName("mymaster")).isNotNull();
+
+        connection.close();
+        FastShutdown.shutdown(client);
+    }
+
+    @Test
+    void shouldConnectToMasterUsingSentinel() {
+
+        RedisURI redisURI = RedisURI.create("rediss-sentinel://" + TestSettings.host() + ":26379?sentinelMasterId=mymaster");
+        redisURI.setVerifyPeer(false);
+
+        RedisClient client = RedisClient.create(clientResources);
+        StatefulRedisConnection<String, String> connection = client.connect(redisURI);
+
+        assertThat(connection.sync().ping()).isNotNull();
+
+        connection.close();
+        FastShutdown.shutdown(client);
+    }
+}

From ef7fd8619bda5a3ade29188ad02de8e1e33f66ce Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 15 Jun 2019 16:40:30 +0200
Subject: [PATCH 642/808] Update SSL settings for Java 11-based build #1062

---
 src/test/bash/create_certificates.sh                   | 2 +-
 src/test/java/io/lettuce/core/SslIntegrationTests.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/bash/create_certificates.sh b/src/test/bash/create_certificates.sh
index 616a70ab3c..be98469501 100755
--- a/src/test/bash/create_certificates.sh
+++ b/src/test/bash/create_certificates.sh
@@ -124,5 +124,5 @@ openssl pkcs12 -export -clcerts \
 ${KEYTOOL} -importcert -keystore ${TRUSTSTORE_FILE} -file ${CA_DIR}/certs/ca.cert.pem -noprompt -storepass changeit
 ${KEYTOOL} -importkeystore \
                               -srckeystore ${CA_DIR}/client.p12 -srcstoretype PKCS12 -srcstorepass changeit\
-                              -destkeystore ${KEYSTORE_FILE} -deststoretype JKS \
+                              -destkeystore ${KEYSTORE_FILE} -deststoretype PKCS12 \
                               -noprompt -storepass changeit
diff --git a/src/test/java/io/lettuce/core/SslIntegrationTests.java b/src/test/java/io/lettuce/core/SslIntegrationTests.java
index b6215c7ad7..855f9184d5 100644
--- a/src/test/java/io/lettuce/core/SslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/SslIntegrationTests.java
@@ -24,7 +24,7 @@
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.security.cert.CertificateException;
+import java.security.GeneralSecurityException;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
@@ -391,7 +391,7 @@ void pubSubSslAndBreakConnection() {
         RedisFuture<Void> defectFuture = connection.subscribe("foo");
 
         assertThatThrownBy(() -> Futures.await(defectFuture)).hasCauseInstanceOf(DecoderException.class)
-                .hasRootCauseInstanceOf(CertificateException.class);
+                .hasRootCauseInstanceOf(GeneralSecurityException.class);
 
         assertThat(defectFuture.toCompletableFuture()).isDone();
 

From 5c91baeefab1238a11000d1246799ed72f600404 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 15 Jun 2019 16:42:29 +0200
Subject: [PATCH 643/808] Upgrade to OpenWebBeans 2.0.11 #1062

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5a1273200a..dc55e0eaf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,7 +312,7 @@
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-se</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.11</version>
             <scope>test</scope>
         </dependency>
 

From 6b0752b448456f84bd24a3ee31439d4fc89c4516 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 26 Jun 2019 11:37:01 +0200
Subject: [PATCH 644/808] Reduce object allocations for assertions #1068

LettuceAssert now accepts message suppliers to defer message creation so e.g. String.format is invoked lazily.
---
 src/main/java/io/lettuce/core/RedisURI.java   |  12 +-
 src/main/java/io/lettuce/core/SslOptions.java |   8 +-
 .../AsyncExecutableCommandLookupStrategy.java |   2 +-
 .../BatchExecutableCommandLookupStrategy.java |   2 +-
 ...activeExecutableCommandLookupStrategy.java |   4 +-
 .../io/lettuce/core/internal/HostAndPort.java |  14 +--
 .../lettuce/core/internal/LettuceAssert.java  | 108 ++++++++++++++++++
 .../lettuce/core/models/role/RoleParser.java  |   2 +-
 8 files changed, 130 insertions(+), 22 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 1512ab7fd8..f4d682b91c 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -1031,7 +1031,7 @@ public static Builder redis(String host) {
         public static Builder redis(String host, int port) {
 
             LettuceAssert.notEmpty(host, "Host must not be empty");
-            LettuceAssert.isTrue(isValidPort(port), String.format("Port out of range: %s", port));
+            LettuceAssert.isTrue(isValidPort(port), () -> String.format("Port out of range: %s", port));
 
             Builder builder = RedisURI.builder();
             return builder.withHost(host).withPort(port);
@@ -1061,7 +1061,7 @@ public static Builder sentinel(String host) {
         public static Builder sentinel(String host, int port) {
 
             LettuceAssert.notEmpty(host, "Host must not be empty");
-            LettuceAssert.isTrue(isValidPort(port), String.format("Port out of range: %s", port));
+            LettuceAssert.isTrue(isValidPort(port), () -> String.format("Port out of range: %s", port));
 
             Builder builder = RedisURI.builder();
             return builder.withSentinel(host, port);
@@ -1102,7 +1102,7 @@ public static Builder sentinel(String host, int port, String masterId) {
         public static Builder sentinel(String host, int port, String masterId, CharSequence password) {
 
             LettuceAssert.notEmpty(host, "Host must not be empty");
-            LettuceAssert.isTrue(isValidPort(port), String.format("Port out of range: %s", port));
+            LettuceAssert.isTrue(isValidPort(port), () -> String.format("Port out of range: %s", port));
 
             Builder builder = RedisURI.builder();
             if (password != null) {
@@ -1150,7 +1150,7 @@ public Builder withSentinel(String host, int port, CharSequence password) {
 
             LettuceAssert.assertState(this.host == null, "Cannot use with Redis mode.");
             LettuceAssert.notEmpty(host, "Host must not be empty");
-            LettuceAssert.isTrue(isValidPort(port), String.format("Port out of range: %s", port));
+            LettuceAssert.isTrue(isValidPort(port), () -> String.format("Port out of range: %s", port));
 
             RedisURI redisURI = RedisURI.create(host, port);
 
@@ -1200,7 +1200,7 @@ public Builder withHost(String host) {
         public Builder withPort(int port) {
 
             LettuceAssert.assertState(this.host != null, "Host is null. Cannot use in Sentinel mode.");
-            LettuceAssert.isTrue(isValidPort(port), String.format("Port out of range: %s", port));
+            LettuceAssert.isTrue(isValidPort(port), () -> String.format("Port out of range: %s", port));
 
             this.port = port;
             return this;
@@ -1253,7 +1253,7 @@ public Builder withVerifyPeer(boolean verifyPeer) {
          */
         public Builder withDatabase(int database) {
 
-            LettuceAssert.isTrue(database >= 0, "Invalid database number: " + database);
+            LettuceAssert.isTrue(database >= 0, () -> "Invalid database number: " + database);
 
             this.database = database;
             return this;
diff --git a/src/main/java/io/lettuce/core/SslOptions.java b/src/main/java/io/lettuce/core/SslOptions.java
index f6f603e70d..e993848bfb 100644
--- a/src/main/java/io/lettuce/core/SslOptions.java
+++ b/src/main/java/io/lettuce/core/SslOptions.java
@@ -158,8 +158,8 @@ public Builder keystore(File keystore) {
         public Builder keystore(File keystore, char[] keystorePassword) {
 
             LettuceAssert.notNull(keystore, "Keystore must not be null");
-            LettuceAssert.isTrue(keystore.exists(), String.format("Keystore file %s does not exist", truststore));
-            LettuceAssert.isTrue(keystore.isFile(), String.format("Keystore file %s is not a file", truststore));
+            LettuceAssert.isTrue(keystore.exists(), () -> String.format("Keystore file %s does not exist", truststore));
+            LettuceAssert.isTrue(keystore.isFile(), () -> String.format("Keystore file %s is not a file", truststore));
 
             try {
                 return keystore(keystore.toURI().toURL(), keystorePassword);
@@ -230,8 +230,8 @@ public Builder truststore(File truststore) {
         public Builder truststore(File truststore, String truststorePassword) {
 
             LettuceAssert.notNull(truststore, "Truststore must not be null");
-            LettuceAssert.isTrue(truststore.exists(), String.format("Truststore file %s does not exist", truststore));
-            LettuceAssert.isTrue(truststore.isFile(), String.format("Truststore file %s is not a file", truststore));
+            LettuceAssert.isTrue(truststore.exists(), () -> String.format("Truststore file %s does not exist", truststore));
+            LettuceAssert.isTrue(truststore.isFile(), () -> String.format("Truststore file %s is not a file", truststore));
 
             try {
                 return truststore(truststore.toURI().toURL(), truststorePassword);
diff --git a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java
index 33952d43f1..95f5eebe14 100644
--- a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java
@@ -42,7 +42,7 @@ public AsyncExecutableCommandLookupStrategy(List<RedisCodec<?, ?>> redisCodecs,
     public ExecutableCommand resolveCommandMethod(CommandMethod method, RedisCommandsMetadata metadata) {
 
         LettuceAssert.isTrue(!method.isReactiveExecution(),
-                String.format("Command method %s not supported by this command lookup strategy", method));
+                () -> String.format("Command method %s not supported by this command lookup strategy", method));
 
         CommandFactory commandFactory = super.resolveCommandFactory(method, metadata);
 
diff --git a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java
index f82fb1b610..38b4fbbb8d 100644
--- a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java
@@ -60,7 +60,7 @@ private static boolean isForceFlush(CommandMethod method) {
     public ExecutableCommand resolveCommandMethod(CommandMethod method, RedisCommandsMetadata metadata) {
 
         LettuceAssert.isTrue(!method.isReactiveExecution(),
-                String.format("Command method %s not supported by this command lookup strategy", method));
+                () -> String.format("Command method %s not supported by this command lookup strategy", method));
 
         ExecutionSpecificParameters parameters = (ExecutionSpecificParameters) method.getParameters();
 
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java
index 8135734a5c..1a5b7747e2 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java
@@ -56,10 +56,10 @@ class ReactiveExecutableCommandLookupStrategy implements ExecutableCommandLookup
     public ExecutableCommand resolveCommandMethod(CommandMethod method, RedisCommandsMetadata commandsMetadata) {
 
         LettuceAssert.isTrue(!method.isBatchExecution(),
-                String.format("Command batching %s not supported with ReactiveExecutableCommandLookupStrategy", method));
+                () -> String.format("Command batching %s not supported with ReactiveExecutableCommandLookupStrategy", method));
 
         LettuceAssert.isTrue(method.isReactiveExecution(),
-                String.format("Command method %s not supported by ReactiveExecutableCommandLookupStrategy", method));
+                () -> String.format("Command method %s not supported by ReactiveExecutableCommandLookupStrategy", method));
 
         ReactiveCommandSegmentCommandFactory commandFactory = commandFactoryResolver.resolveRedisCommandFactory(method,
                 commandsMetadata);
diff --git a/src/main/java/io/lettuce/core/internal/HostAndPort.java b/src/main/java/io/lettuce/core/internal/HostAndPort.java
index 3f89f86d72..ff27e4d7e9 100644
--- a/src/main/java/io/lettuce/core/internal/HostAndPort.java
+++ b/src/main/java/io/lettuce/core/internal/HostAndPort.java
@@ -52,10 +52,10 @@ private HostAndPort(String hostText, int port) {
      */
     public static HostAndPort of(String host, int port) {
 
-        LettuceAssert.isTrue(isValidPort(port), String.format("Port out of range: %s", port));
+        LettuceAssert.isTrue(isValidPort(port), () -> String.format("Port out of range: %s", port));
 
         HostAndPort parsedHost = parse(host);
-        LettuceAssert.isTrue(!parsedHost.hasPort(), String.format("Host has a port: %s", host));
+        LettuceAssert.isTrue(!parsedHost.hasPort(), () -> String.format("Host has a port: %s", host));
         return new HostAndPort(host, port);
     }
 
@@ -92,13 +92,13 @@ public static HostAndPort parse(String hostPortString) {
         if (!LettuceStrings.isEmpty(portString)) {
             // Try to parse the whole port string as a number.
             // JDK7 accepts leading plus signs. We don't want to.
-            LettuceAssert.isTrue(!portString.startsWith("+"), String.format("Cannot port number: %s", hostPortString));
+            LettuceAssert.isTrue(!portString.startsWith("+"), () -> String.format("Cannot port number: %s", hostPortString));
             try {
                 port = Integer.parseInt(portString);
             } catch (NumberFormatException e) {
                 throw new IllegalArgumentException(String.format("Cannot parse port number: %s", hostPortString));
             }
-            LettuceAssert.isTrue(isValidPort(port), String.format("Port number out of range: %s", hostPortString));
+            LettuceAssert.isTrue(isValidPort(port), () -> String.format("Port number out of range: %s", hostPortString));
         }
 
         return new HostAndPort(host, port);
@@ -187,13 +187,13 @@ public int hashCode() {
     private static String[] getHostAndPortFromBracketedHost(String hostPortString) {
 
         LettuceAssert.isTrue(hostPortString.charAt(0) == '[',
-                String.format("Bracketed host-port string must start with a bracket: %s", hostPortString));
+                () -> String.format("Bracketed host-port string must start with a bracket: %s", hostPortString));
 
         int colonIndex = hostPortString.indexOf(':');
         int closeBracketIndex = hostPortString.lastIndexOf(']');
 
         LettuceAssert.isTrue(colonIndex > -1 && closeBracketIndex > colonIndex,
-                String.format("Invalid bracketed host/port: %s", hostPortString));
+                () -> String.format("Invalid bracketed host/port: %s", hostPortString));
 
         String host = hostPortString.substring(1, closeBracketIndex);
         if (closeBracketIndex + 1 == hostPortString.length()) {
@@ -204,7 +204,7 @@ private static String[] getHostAndPortFromBracketedHost(String hostPortString) {
                     "Only a colon may follow a close bracket: " + hostPortString);
             for (int i = closeBracketIndex + 2; i < hostPortString.length(); ++i) {
                 LettuceAssert.isTrue(Character.isDigit(hostPortString.charAt(i)),
-                        String.format("Port must be numeric: %s", hostPortString));
+                        () -> String.format("Port must be numeric: %s", hostPortString));
             }
             return new String[] { host, hostPortString.substring(closeBracketIndex + 2) };
         }
diff --git a/src/main/java/io/lettuce/core/internal/LettuceAssert.java b/src/main/java/io/lettuce/core/internal/LettuceAssert.java
index 812d1a3463..2990daf0fb 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceAssert.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceAssert.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.internal;
 
 import java.util.Collection;
+import java.util.function.Supplier;
 
 import io.lettuce.core.LettuceStrings;
 
@@ -46,6 +47,20 @@ public static void notEmpty(String string, String message) {
         }
     }
 
+    /**
+     * Assert that a string is not empty, it must not be {@code null} and it must not be empty.
+     *
+     * @param string the object to check
+     * @param messageSupplier the exception message supplier to use if the assertion fails
+     * @throws IllegalArgumentException if the object is {@code null} or the underlying string is empty
+     * @since 5.2.0
+     */
+    public static void notEmpty(String string, Supplier<String> messageSupplier) {
+        if (LettuceStrings.isEmpty(string)) {
+            throw new IllegalArgumentException(messageSupplier.get());
+        }
+    }
+
     /**
      * Assert that an object is not {@code null} .
      *
@@ -59,6 +74,20 @@ public static void notNull(Object object, String message) {
         }
     }
 
+    /**
+     * Assert that an object is not {@code null} .
+     *
+     * @param object the object to check
+     * @param messageSupplier the exception message supplier to use if the assertion fails
+     * @throws IllegalArgumentException if the object is {@code null}
+     * @since 5.2.0
+     */
+    public static void notNull(Object object, Supplier<String> messageSupplier) {
+        if (object == null) {
+            throw new IllegalArgumentException(messageSupplier.get());
+        }
+    }
+
     /**
      * Assert that an array has elements; that is, it must not be {@code null} and must have at least one element.
      *
@@ -72,6 +101,20 @@ public static void notEmpty(Object[] array, String message) {
         }
     }
 
+    /**
+     * Assert that an array has elements; that is, it must not be {@code null} and must have at least one element.
+     *
+     * @param array the array to check
+     * @param messageSupplier the exception message supplier to use if the assertion fails
+     * @throws IllegalArgumentException if the object array is {@code null} or has no elements
+     * @since 5.2.0
+     */
+    public static void notEmpty(Object[] array, Supplier<String> messageSupplier) {
+        if (array == null || array.length == 0) {
+            throw new IllegalArgumentException(messageSupplier.get());
+        }
+    }
+
     /**
      * Assert that an array has elements; that is, it must not be {@code null} and must have at least one element.
      *
@@ -102,6 +145,24 @@ public static void noNullElements(Object[] array, String message) {
         }
     }
 
+    /**
+     * Assert that an array has no null elements.
+     *
+     * @param array the array to check
+     * @param messageSupplier the exception message supplier to use if the assertion fails
+     * @throws IllegalArgumentException if the object array contains a {@code null} element
+     * @since 5.2.0
+     */
+    public static void noNullElements(Object[] array, Supplier<String> messageSupplier) {
+        if (array != null) {
+            for (Object element : array) {
+                if (element == null) {
+                    throw new IllegalArgumentException(messageSupplier.get());
+                }
+            }
+        }
+    }
+
     /**
      * Assert that a {@link java.util.Collection} has no null elements.
      *
@@ -119,6 +180,24 @@ public static void noNullElements(Collection<?> c, String message) {
         }
     }
 
+    /**
+     * Assert that a {@link java.util.Collection} has no null elements.
+     *
+     * @param c the collection to check
+     * @param messageSupplier the exception message supplier to use if the assertion fails
+     * @throws IllegalArgumentException if the {@link Collection} contains a {@code null} element
+     * @since 5.2.0
+     */
+    public static void noNullElements(Collection<?> c, Supplier<String> messageSupplier) {
+        if (c != null) {
+            for (Object element : c) {
+                if (element == null) {
+                    throw new IllegalArgumentException(messageSupplier.get());
+                }
+            }
+        }
+    }
+
     /**
      * Assert that {@code value} is {@literal true}.
      *
@@ -132,6 +211,20 @@ public static void isTrue(boolean value, String message) {
         }
     }
 
+    /**
+     * Assert that {@code value} is {@literal true}.
+     *
+     * @param value the value to check
+     * @param messageSupplier the exception message supplier to use if the assertion fails
+     * @throws IllegalArgumentException if the object array contains a {@code null} element
+     * @since 5.2.0
+     */
+    public static void isTrue(boolean value, Supplier<String> messageSupplier) {
+        if (!value) {
+            throw new IllegalArgumentException(messageSupplier.get());
+        }
+    }
+
     /**
      * Ensures the truth of an expression involving the state of the calling instance, but not involving any parameters to the
      * calling method.
@@ -145,4 +238,19 @@ public static void assertState(boolean condition, String message) {
             throw new IllegalStateException(message);
         }
     }
+
+    /**
+     * Ensures the truth of an expression involving the state of the calling instance, but not involving any parameters to the
+     * calling method.
+     *
+     * @param condition a boolean expression
+     * @param messageSupplier the exception message supplier to use if the assertion fails
+     * @throws IllegalStateException if {@code expression} is false
+     * @since 5.2.0
+     */
+    public static void assertState(boolean condition, Supplier<String> messageSupplier) {
+        if (!condition) {
+            throw new IllegalStateException(messageSupplier.get());
+        }
+    }
 }
diff --git a/src/main/java/io/lettuce/core/models/role/RoleParser.java b/src/main/java/io/lettuce/core/models/role/RoleParser.java
index 2895a654bc..2118f7befc 100644
--- a/src/main/java/io/lettuce/core/models/role/RoleParser.java
+++ b/src/main/java/io/lettuce/core/models/role/RoleParser.java
@@ -65,7 +65,7 @@ private RoleParser() {
     public static RedisInstance parse(List<?> roleOutput) {
         LettuceAssert.isTrue(roleOutput != null && !roleOutput.isEmpty(), "Empty role output");
         LettuceAssert.isTrue(roleOutput.get(0) instanceof String && ROLE_MAPPING.containsKey(roleOutput.get(0)),
-                "First role element must be a string (any of " + ROLE_MAPPING.keySet() + ")");
+                () -> "First role element must be a string (any of " + ROLE_MAPPING.keySet() + ")");
 
         RedisInstance.Role role = ROLE_MAPPING.get(roleOutput.get(0));
 

From 135b330ddcf611f6b3ad29e39cb239c670bed725 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 26 Jun 2019 11:35:51 +0200
Subject: [PATCH 645/808] Reduce object allocations in ClusterTopologyParsing
 #1069

Cluster topology refresh now has reduced object allocation overhead by using a bit set for initial parsing of slots.

Topology object iteration also uses loops again instead of Java 8 Stream API.
---
 .../partitions/ClusterPartitionParser.java    | 36 +++++++++-------
 .../cluster/models/partitions/Partitions.java |  4 +-
 .../models/partitions/RedisClusterNode.java   | 40 ++++++++++++++++++
 .../topology/ClusterTopologyRefresh.java      | 41 +++++++++++++------
 4 files changed, 91 insertions(+), 30 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java b/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
index f174e35f60..40fb501b57 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
@@ -16,12 +16,11 @@
 package io.lettuce.core.cluster.models.partitions;
 
 import java.util.*;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import io.lettuce.core.LettuceStrings;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.SlotHash;
 import io.lettuce.core.internal.HostAndPort;
 import io.lettuce.core.internal.LettuceLists;
 
@@ -37,9 +36,6 @@ public class ClusterPartitionParser {
 
     private static final String TOKEN_SLOT_IN_TRANSITION = "[";
     private static final char TOKEN_NODE_SEPARATOR = '\n';
-    private static final Pattern TOKEN_PATTERN = Pattern.compile(Character.toString(TOKEN_NODE_SEPARATOR));
-    private static final Pattern SPACE_PATTERN = Pattern.compile(" ");
-    private static final Pattern DASH_PATTERN = Pattern.compile("\\-");
     private static final Map<String, RedisClusterNode.NodeFlag> FLAG_MAPPING;
 
     static {
@@ -74,8 +70,18 @@ public static Partitions parse(String nodes) {
         Partitions result = new Partitions();
 
         try {
-            List<RedisClusterNode> mappedNodes = TOKEN_PATTERN.splitAsStream(nodes).filter(s -> !s.isEmpty())
-                    .map(ClusterPartitionParser::parseNode).collect(Collectors.toList());
+
+            String[] lines = nodes.split(Character.toString(TOKEN_NODE_SEPARATOR));
+            List<RedisClusterNode> mappedNodes = new ArrayList<>(lines.length);
+
+            for (String line : lines) {
+
+                if (line.isEmpty()) {
+                    continue;
+
+                }
+                mappedNodes.add(ClusterPartitionParser.parseNode(line));
+            }
             result.addAll(mappedNodes);
         } catch (Exception e) {
             throw new RedisException("Cannot parse " + nodes, e);
@@ -86,7 +92,7 @@ public static Partitions parse(String nodes) {
 
     private static RedisClusterNode parseNode(String nodeInformation) {
 
-        Iterator<String> iterator = SPACE_PATTERN.splitAsStream(nodeInformation).iterator();
+        Iterator<String> iterator = Arrays.asList(nodeInformation.split(" ")).iterator();
 
         String nodeId = iterator.next();
         boolean connected = false;
@@ -122,7 +128,7 @@ private static RedisClusterNode parseNode(String nodeInformation) {
         }
 
         List<String> slotStrings = LettuceLists.newList(iterator); // slot, from-to [slot->-nodeID] [slot-<-nodeID]
-        List<Integer> slots = readSlots(slotStrings);
+        BitSet slots = readSlots(slotStrings);
 
         RedisClusterNode partition = new RedisClusterNode(uri, nodeId, connected, replicaOf, pingSentTs, pongReceivedTs,
                 configEpoch, slots, nodeFlags);
@@ -147,9 +153,9 @@ private static Set<RedisClusterNode.NodeFlag> readFlags(List<String> flagStrings
         return Collections.unmodifiableSet(flags);
     }
 
-    private static List<Integer> readSlots(List<String> slotStrings) {
+    private static BitSet readSlots(List<String> slotStrings) {
 
-        List<Integer> slots = new ArrayList<>();
+        BitSet slots = new BitSet(SlotHash.SLOT_COUNT);
         for (String slotString : slotStrings) {
 
             if (slotString.startsWith(TOKEN_SLOT_IN_TRANSITION)) {
@@ -160,21 +166,21 @@ private static List<Integer> readSlots(List<String> slotStrings) {
 
             if (slotString.contains("-")) {
                 // slot range
-                Iterator<String> it = DASH_PATTERN.splitAsStream(slotString).iterator();
+                Iterator<String> it = Arrays.asList(slotString.split("\\-")).iterator();
                 int from = Integer.parseInt(it.next());
                 int to = Integer.parseInt(it.next());
 
                 for (int slot = from; slot <= to; slot++) {
-                    slots.add(slot);
+                    slots.set(slot);
 
                 }
                 continue;
             }
 
-            slots.add(Integer.parseInt(slotString));
+            slots.set(Integer.parseInt(slotString));
         }
 
-        return Collections.unmodifiableList(slots);
+        return slots;
     }
 
     private static long getLongFromIterator(Iterator<?> iterator, long defaultValue) {
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
index 03842de8f9..ba69e73bae 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
@@ -158,9 +158,7 @@ public void updateCache() {
             for (RedisClusterNode partition : partitions) {
 
                 readView.add(partition);
-                for (Integer integer : partition.getSlots()) {
-                    slotCache[integer.intValue()] = partition;
-                }
+                partition.forEachSlot(i -> slotCache[i] = partition);
             }
 
             this.slotCache = slotCache;
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
index e4615c61af..b12aa8d972 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
@@ -17,6 +17,7 @@
 
 import java.io.Serializable;
 import java.util.*;
+import java.util.function.IntConsumer;
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.SlotHash;
@@ -70,6 +71,23 @@ public RedisClusterNode(RedisURI uri, String nodeId, boolean connected, String s
         setFlags(flags);
     }
 
+    RedisClusterNode(RedisURI uri, String nodeId, boolean connected, String slaveOf, long pingSentTimestamp,
+            long pongReceivedTimestamp, long configEpoch, BitSet slots, Set<NodeFlag> flags) {
+
+        this.uri = uri;
+        this.nodeId = nodeId;
+        this.connected = connected;
+        this.slaveOf = slaveOf;
+        this.pingSentTimestamp = pingSentTimestamp;
+        this.pongReceivedTimestamp = pongReceivedTimestamp;
+        this.configEpoch = configEpoch;
+
+        this.slots = new BitSet(slots.length());
+        this.slots.or(slots);
+
+        setFlags(flags);
+    }
+
     public RedisClusterNode(RedisClusterNode redisClusterNode) {
 
         LettuceAssert.notNull(redisClusterNode, "RedisClusterNode must not be null");
@@ -225,6 +243,28 @@ public List<Integer> getSlots() {
         return slots;
     }
 
+    /**
+     * Performs the given action for each slot of this {@link RedisClusterNode} until all elements have been processed or the
+     * action throws an exception. Unless otherwise specified by the implementing class, actions are performed in the order of
+     * iteration (if an iteration order is specified). Exceptions thrown by the action are relayed to the caller.
+     *
+     * @param consumer
+     * @since 5.2
+     */
+    public void forEachSlot(IntConsumer consumer) {
+
+        if (slots == null || slots.isEmpty()) {
+            return;
+        }
+
+        for (int i = 0; i < this.slots.length(); i++) {
+
+            if (this.slots.get(i)) {
+                consumer.accept(i);
+            }
+        }
+    }
+
     /**
      * Sets the list of slots for which this {@link RedisClusterNode} is the
      * {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag#MASTER}. The list is empty if this node is not
diff --git a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
index 0cf21c8825..95fb57e366 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
@@ -184,19 +184,22 @@ NodeTopologyViews getNodeSpecificViews(Requests requestedTopology, Requests requ
                     node.addAlias(nodeUri);
                 }
 
-                List<RedisClusterNodeSnapshot> nodeWithStats = nodeTopologyView.getPartitions() //
-                        .stream() //
-                        .filter(ClusterTopologyRefresh::validNode) //
-                        .map(RedisClusterNodeSnapshot::new).collect(Collectors.toList());
+                List<RedisClusterNodeSnapshot> nodeWithStats = new ArrayList<>(nodeTopologyView.getPartitions().size());
 
-                nodeWithStats.stream() //
-                        .filter(partition -> partition.is(RedisClusterNode.NodeFlag.MYSELF)) //
-                        .forEach(partition -> {
+                for (RedisClusterNode partition : nodeTopologyView.getPartitions()) {
+
+                    if (validNode(partition)) {
+                        RedisClusterNodeSnapshot redisClusterNodeSnapshot = new RedisClusterNodeSnapshot(partition);
+                        nodeWithStats.add(redisClusterNodeSnapshot);
+
+                        if (partition.is(RedisClusterNode.NodeFlag.MYSELF)) {
 
                             // record latency for later partition ordering
-                                latencies.put(partition.getNodeId(), nodeTopologyView.getLatency());
-                                clientCountByNodeId.put(partition.getNodeId(), nodeTopologyView.getConnectedClients());
-                            });
+                            latencies.put(partition.getNodeId(), nodeTopologyView.getLatency());
+                            clientCountByNodeId.put(partition.getNodeId(), nodeTopologyView.getConnectedClients());
+                        }
+                    }
+                }
 
                 allNodes.addAll(nodeWithStats);
 
@@ -318,8 +321,22 @@ public RedisURI getViewedBy(Map<RedisURI, Partitions> map, Partitions partitions
 
     private static <E> Set<E> difference(Set<E> set1, Set<E> set2) {
 
-        Set<E> result = set1.stream().filter(e -> !set2.contains(e)).collect(Collectors.toSet());
-        result.addAll(set2.stream().filter(e -> !set1.contains(e)).collect(Collectors.toList()));
+        Set<E> result = new HashSet<>(set1.size());
+
+        for (E e1 : set1) {
+            if (!set2.contains(e1)) {
+                result.add(e1);
+            }
+        }
+
+        List<E> list = new ArrayList<>(set2.size());
+        for (E e : set2) {
+            if (!set1.contains(e)) {
+                list.add(e);
+            }
+        }
+
+        result.addAll(list);
 
         return result;
     }

From 096be50b195b373d29a4dafd5213ca53bbf2c813 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 6 Jul 2019 17:58:13 +0200
Subject: [PATCH 646/808] Unwrap RedisReactiveCommands prior to Reactive API
 usage #1075
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

RedisCommandFactory now unwraps the reactive API which can potentially be a proxy (e.g. when using connection pooling) so we get hold of the implementation to invoke properly createMono(…) and createFlux(…).
---
 .../core/dynamic/RedisCommandFactory.java     | 33 ++++++++---
 .../core/support/ConnectionWrapping.java      | 42 ++++++++++++--
 .../RedisCommandsIntegrationTests.java        | 55 +++++++++++++++++--
 3 files changed, 113 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
index 68cfcaa166..a133500a08 100644
--- a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
@@ -15,7 +15,9 @@
  */
 package io.lettuce.core.dynamic;
 
+import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
 import java.util.*;
 
 import io.lettuce.core.AbstractRedisReactiveCommands;
@@ -40,6 +42,7 @@
 import io.lettuce.core.models.command.CommandDetailParser;
 import io.lettuce.core.protocol.LettuceCharsets;
 import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.support.ConnectionWrapping;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -245,14 +248,7 @@ class CompositeCommandLookupStrategy implements ExecutableCommandLookupStrategy
 
             CommandMethodVerifier verifier = verifyCommandMethods ? commandMethodVerifier : CommandMethodVerifier.NONE;
 
-            AbstractRedisReactiveCommands reactive = null;
-            if (connection instanceof StatefulRedisConnection) {
-                reactive = (AbstractRedisReactiveCommands) ((StatefulRedisConnection) connection).reactive();
-            }
-
-            if (connection instanceof StatefulRedisClusterConnection) {
-                reactive = (AbstractRedisReactiveCommands) ((StatefulRedisClusterConnection) connection).reactive();
-            }
+            AbstractRedisReactiveCommands reactive = getReactiveCommands();
 
             LettuceAssert.isTrue(reactive != null, "Reactive commands is null");
 
@@ -263,6 +259,27 @@ class CompositeCommandLookupStrategy implements ExecutableCommandLookupStrategy
                     reactive);
         }
 
+        private AbstractRedisReactiveCommands getReactiveCommands() {
+
+            Object reactive = null;
+
+            if (connection instanceof StatefulRedisConnection) {
+                reactive = ((StatefulRedisConnection) connection).reactive();
+            }
+
+            if (connection instanceof StatefulRedisClusterConnection) {
+                reactive = ((StatefulRedisClusterConnection) connection).reactive();
+            }
+
+            if (Proxy.isProxyClass(reactive.getClass())) {
+
+                InvocationHandler invocationHandler = Proxy.getInvocationHandler(reactive);
+                reactive = ConnectionWrapping.unwrap(invocationHandler);
+            }
+
+            return (AbstractRedisReactiveCommands) reactive;
+        }
+
         @Override
         public ExecutableCommand resolveCommandMethod(CommandMethod method, RedisCommandsMetadata metadata) {
 
diff --git a/src/main/java/io/lettuce/core/support/ConnectionWrapping.java b/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
index 5455e8320e..e0fc4cb924 100644
--- a/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
+++ b/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
@@ -33,7 +33,22 @@
  * @author Mark Paluch
  * @since 5.1
  */
-class ConnectionWrapping {
+public class ConnectionWrapping {
+
+    /**
+     * Unwrap a potentially {@link Wrapper} object. Recurses across {@link Wrapper wrappers}
+     *
+     * @param object the potentially wrapped object.
+     * @return the {@code object} if it is not wrapped or the {@link Wrapper#unwrap() unwrapped} object.
+     */
+    public static Object unwrap(Object object) {
+
+        while (object instanceof Wrapper<?>) {
+            object = ((Wrapper<?>) object).unwrap();
+        }
+
+        return object;
+    }
 
     /**
      * Wrap a connection along its {@link Origin} reference.
@@ -66,7 +81,7 @@ static <T> T wrapConnection(T connection, Origin<T> pool) {
      * @param <T> Connection type.
      * @since 4.3
      */
-    static class ReturnObjectOnCloseInvocationHandler<T> extends AbstractInvocationHandler {
+    static class ReturnObjectOnCloseInvocationHandler<T> extends AbstractInvocationHandler implements Wrapper<T> {
 
         private T connection;
         private T proxiedConnection;
@@ -147,6 +162,11 @@ private Object getInnerProxy(Method method, Object[] args) {
         public T getConnection() {
             return connection;
         }
+
+        @Override
+        public T unwrap() {
+            return getConnection();
+        }
     }
 
     /**
@@ -158,7 +178,7 @@ public T getConnection() {
      */
     @SuppressWarnings("try")
     static class DelegateCloseToConnectionInvocationHandler<T extends AsyncCloseable & AutoCloseable> extends
-            AbstractInvocationHandler {
+            AbstractInvocationHandler implements Wrapper<Object> {
 
         private final T proxiedConnection;
         private final Object api;
@@ -169,7 +189,6 @@ static class DelegateCloseToConnectionInvocationHandler<T extends AsyncCloseable
             this.api = api;
         }
 
-        @SuppressWarnings("unchecked")
         @Override
         protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
 
@@ -194,6 +213,11 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
                 throw e.getTargetException();
             }
         }
+
+        @Override
+        public Object unwrap() {
+            return api;
+        }
     }
 
     /**
@@ -218,4 +242,14 @@ interface Origin<T> {
          */
         CompletableFuture<Void> returnObjectAsync(T o) throws Exception;
     }
+
+    /**
+     * Marker interface to indicate a wrapper.
+     *
+     * @param <T> Type of the wrapped object.
+     * @since 5.2
+     */
+    interface Wrapper<T> {
+        T unwrap();
+    }
 }
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java
index 9824b66380..9afe582182 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java
@@ -22,15 +22,25 @@
 
 import javax.inject.Inject;
 
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
+import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.RedisURI;
 import io.lettuce.core.TestSupport;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.support.AsyncConnectionPoolSupport;
+import io.lettuce.core.support.BoundedAsyncPool;
+import io.lettuce.core.support.BoundedPoolConfig;
+import io.lettuce.core.support.ConnectionPoolSupport;
 import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
@@ -38,10 +48,12 @@
 @ExtendWith(LettuceExtension.class)
 class RedisCommandsIntegrationTests extends TestSupport {
 
+    private final RedisClient client;
     private final RedisCommands<String, String> redis;
 
     @Inject
-    RedisCommandsIntegrationTests(StatefulRedisConnection<String, String> connection) {
+    RedisCommandsIntegrationTests(RedisClient client, StatefulRedisConnection<String, String> connection) {
+        this.client = client;
         this.redis = connection.sync();
     }
 
@@ -95,15 +107,48 @@ void verifierShouldCatchTooFewParametersDeclarations() {
         }
     }
 
-    private interface TooFewParameters extends Commands {
+    @Test
+    void shouldWorkWithPooledConnection() throws Exception {
 
-        String get();
+        GenericObjectPool<StatefulRedisConnection<String, String>> pool = ConnectionPoolSupport.createGenericObjectPool(
+                client::connect, new GenericObjectPoolConfig<>());
+
+        try (StatefulRedisConnection<String, String> connection = pool.borrowObject()) {
+
+            RedisCommandFactory factory = new RedisCommandFactory(connection);
+            SimpleCommands commands = factory.getCommands(SimpleCommands.class);
+            commands.get("foo");
+        }
 
+        pool.close();
     }
 
-    private interface WithTypo extends Commands {
+    @Test
+    void shouldWorkWithAsyncPooledConnection() {
 
-        String gat(String key);
+        BoundedAsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
+                () -> client.connectAsync(StringCodec.ASCII, RedisURI.create(TestSettings.host(), TestSettings.port())),
+                BoundedPoolConfig.create());
+
+        try (StatefulRedisConnection<String, String> connection = pool.acquire().join()) {
+
+            RedisCommandFactory factory = new RedisCommandFactory(connection);
+            SimpleCommands commands = factory.getCommands(SimpleCommands.class);
+            commands.get("foo");
+        }
+
+        pool.close();
+    }
 
+    private interface SimpleCommands extends Commands {
+        String get(String key);
+    }
+
+    private interface TooFewParameters extends Commands {
+        String get();
+    }
+
+    private interface WithTypo extends Commands {
+        String gat(String key);
     }
 }

From a5e2405ac8387e0498c4f4fb3b5a1eb81b4ce31c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 8 Jul 2019 20:40:21 +0200
Subject: [PATCH 647/808] =?UTF-8?q?Simplify=20Redis=E2=80=A6CommandsImpl?=
 =?UTF-8?q?=20to=20accept=20connection=20interfaces=20#1077?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We now accept the connection interface types when creating API facade objects instead of requiring the concrete implementation type.
---
 .../lettuce/core/RedisAsyncCommandsImpl.java  |  5 +-
 .../core/RedisReactiveCommandsImpl.java       |  5 +-
 ...RedisAdvancedClusterAsyncCommandsImpl.java | 62 ++++++++++-----
 ...isAdvancedClusterReactiveCommandsImpl.java | 79 ++++++++++++-------
 .../RedisClusterPubSubAsyncCommandsImpl.java  | 21 +++--
 ...edisClusterPubSubReactiveCommandsImpl.java | 21 +++--
 .../StatefulRedisClusterConnectionImpl.java   |  2 +-
 .../api/StatefulRedisClusterConnection.java   |  7 +-
 .../RedisPubSubReactiveCommandsImpl.java      |  5 +-
 .../RedisClusterStressScenariosTest.java      |  2 +-
 10 files changed, 136 insertions(+), 73 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java
index f520a9f563..89626447c1 100644
--- a/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java
@@ -27,8 +27,8 @@
  * @param <V> Value type.
  * @author Mark Paluch
  */
-public class RedisAsyncCommandsImpl<K, V> extends AbstractRedisAsyncCommands<K, V> implements RedisAsyncCommands<K, V>,
-        RedisClusterAsyncCommands<K, V> {
+public class RedisAsyncCommandsImpl<K, V> extends AbstractRedisAsyncCommands<K, V>
+        implements RedisAsyncCommands<K, V>, RedisClusterAsyncCommands<K, V> {
 
     /**
      * Initialize a new instance.
@@ -42,7 +42,6 @@ public RedisAsyncCommandsImpl(StatefulRedisConnection<K, V> connection, RedisCod
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public StatefulRedisConnection<K, V> getStatefulConnection() {
         return (StatefulRedisConnection<K, V>) super.getConnection();
     }
diff --git a/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
index c3faecb591..ddad69540b 100644
--- a/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
@@ -27,8 +27,8 @@
  * @param <V> Value type.
  * @author Mark Paluch
  */
-public class RedisReactiveCommandsImpl<K, V> extends AbstractRedisReactiveCommands<K, V> implements
-        RedisReactiveCommands<K, V>, RedisClusterReactiveCommands<K, V> {
+public class RedisReactiveCommandsImpl<K, V> extends AbstractRedisReactiveCommands<K, V>
+        implements RedisReactiveCommands<K, V>, RedisClusterReactiveCommands<K, V> {
 
     /**
      * Initialize a new instance.
@@ -42,7 +42,6 @@ public RedisReactiveCommandsImpl(StatefulRedisConnection<K, V> connection, Redis
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public StatefulRedisConnection<K, V> getStatefulConnection() {
         return (StatefulRedisConnection<K, V>) super.getConnection();
     }
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index 9a4d1c196a..3db79f3212 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -55,12 +55,14 @@
 /**
  * An advanced asynchronous and thread-safe API for a Redis Cluster connection.
  *
+ * @param <K> Key type.
+ * @param <V> Value type.
  * @author Mark Paluch
  * @since 3.3
  */
 @SuppressWarnings("unchecked")
-public class RedisAdvancedClusterAsyncCommandsImpl<K, V> extends AbstractRedisAsyncCommands<K, V> implements
-        RedisAdvancedClusterAsyncCommands<K, V> {
+public class RedisAdvancedClusterAsyncCommandsImpl<K, V> extends AbstractRedisAsyncCommands<K, V>
+        implements RedisAdvancedClusterAsyncCommands<K, V> {
 
     private final RedisCodec<K, V> codec;
 
@@ -69,12 +71,25 @@ public class RedisAdvancedClusterAsyncCommandsImpl<K, V> extends AbstractRedisAs
      *
      * @param connection the stateful connection
      * @param codec Codec used to encode/decode keys and values.
+     * @deprecated since 5.1, use {@link #RedisAdvancedClusterAsyncCommandsImpl(StatefulRedisClusterConnection, RedisCodec)}.
      */
+    @Deprecated
     public RedisAdvancedClusterAsyncCommandsImpl(StatefulRedisClusterConnectionImpl<K, V> connection, RedisCodec<K, V> codec) {
         super(connection, codec);
         this.codec = codec;
     }
 
+    /**
+     * Initialize a new connection.
+     *
+     * @param connection the stateful connection
+     * @param codec Codec used to encode/decode keys and values.
+     */
+    public RedisAdvancedClusterAsyncCommandsImpl(StatefulRedisClusterConnection<K, V> connection, RedisCodec<K, V> codec) {
+        super(connection, codec);
+        this.codec = codec;
+    }
+
     @Override
     public RedisFuture<String> clientSetname(K name) {
 
@@ -201,7 +216,7 @@ public RedisFuture<String> flushdb() {
     @Override
     public RedisFuture<Set<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
 
-        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+        if (hasRedisState() && getRedisState().hasCommand(CommandType.GEORADIUS_RO)) {
             return super.georadius_ro(key, longitude, latitude, distance, unit);
         }
 
@@ -212,7 +227,7 @@ public RedisFuture<Set<V>> georadius(K key, double longitude, double latitude, d
     public RedisFuture<List<GeoWithin<V>>> georadius(K key, double longitude, double latitude, double distance,
             GeoArgs.Unit unit, GeoArgs geoArgs) {
 
-        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+        if (hasRedisState() && getRedisState().hasCommand(CommandType.GEORADIUS_RO)) {
             return super.georadius_ro(key, longitude, latitude, distance, unit, geoArgs);
         }
 
@@ -222,7 +237,7 @@ public RedisFuture<List<GeoWithin<V>>> georadius(K key, double longitude, double
     @Override
     public RedisFuture<Set<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit) {
 
-        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUSBYMEMBER_RO)) {
+        if (hasRedisState() && getRedisState().hasCommand(CommandType.GEORADIUSBYMEMBER_RO)) {
             return super.georadiusbymember_ro(key, member, distance, unit);
         }
 
@@ -233,7 +248,7 @@ public RedisFuture<Set<V>> georadiusbymember(K key, V member, double distance, G
     public RedisFuture<List<GeoWithin<V>>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit,
             GeoArgs geoArgs) {
 
-        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUSBYMEMBER_RO)) {
+        if (hasRedisState() && getRedisState().hasCommand(CommandType.GEORADIUSBYMEMBER_RO)) {
             return super.georadiusbymember_ro(key, member, distance, unit, geoArgs);
         }
 
@@ -483,23 +498,18 @@ public RedisClusterAsyncCommands<K, V> getConnection(String host, int port) {
     }
 
     private CompletableFuture<RedisClusterAsyncCommands<K, V>> getConnectionAsync(String nodeId) {
-        return getConnectionProvider().<K, V> getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, nodeId).thenApply(
-                StatefulRedisConnection::async);
+        return getConnectionProvider().<K, V> getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, nodeId)
+                .thenApply(StatefulRedisConnection::async);
     }
 
     private CompletableFuture<RedisClusterAsyncCommands<K, V>> getConnectionAsync(String host, int port) {
-        return getConnectionProvider().<K, V> getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, host, port).thenApply(
-                StatefulRedisConnection::async);
+        return getConnectionProvider().<K, V> getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, host, port)
+                .thenApply(StatefulRedisConnection::async);
     }
 
     @Override
-    public StatefulRedisClusterConnectionImpl<K, V> getStatefulConnection() {
-        return (StatefulRedisClusterConnectionImpl<K, V>) super.getConnection();
-    }
-
-    protected AsyncClusterConnectionProvider getConnectionProvider() {
-        return (AsyncClusterConnectionProvider) getStatefulConnection().getClusterDistributionChannelWriter()
-                .getClusterConnectionProvider();
+    public StatefulRedisClusterConnection<K, V> getStatefulConnection() {
+        return (StatefulRedisClusterConnection<K, V>) super.getConnection();
     }
 
     @Override
@@ -534,8 +544,8 @@ protected AsyncNodeSelection<K, V> nodes(Predicate<RedisClusterNode> predicate,
 
         NodeSelectionInvocationHandler h = new NodeSelectionInvocationHandler((AbstractNodeSelection<?, ?, ?, ?>) selection,
                 RedisClusterAsyncCommands.class, ASYNC);
-        return (AsyncNodeSelection<K, V>) Proxy.newProxyInstance(NodeSelectionSupport.class.getClassLoader(), new Class<?>[] {
-                NodeSelectionAsyncCommands.class, AsyncNodeSelection.class }, h);
+        return (AsyncNodeSelection<K, V>) Proxy.newProxyInstance(NodeSelectionSupport.class.getClassLoader(),
+                new Class<?>[] { NodeSelectionAsyncCommands.class, AsyncNodeSelection.class }, h);
     }
 
     @Override
@@ -639,6 +649,20 @@ private RedisClusterAsyncCommands<K, V> findConnectionBySlot(int slot) {
         return null;
     }
 
+    private RedisState getRedisState() {
+        return ((StatefulRedisClusterConnectionImpl<K, V>) super.getConnection()).getState();
+    }
+
+    private boolean hasRedisState() {
+        return super.getConnection() instanceof StatefulRedisClusterConnectionImpl;
+    }
+
+    private AsyncClusterConnectionProvider getConnectionProvider() {
+
+        ClusterDistributionChannelWriter writer = (ClusterDistributionChannelWriter) getStatefulConnection().getChannelWriter();
+        return (AsyncClusterConnectionProvider) writer.getClusterConnectionProvider();
+    }
+
     /**
      * Perform a SCAN in the cluster.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index e24d02ac59..b117adc549 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -39,6 +39,7 @@
 import io.lettuce.core.api.reactive.RedisScriptingReactiveCommands;
 import io.lettuce.core.api.reactive.RedisServerReactiveCommands;
 import io.lettuce.core.cluster.ClusterConnectionProvider.Intent;
+import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.reactive.RedisAdvancedClusterReactiveCommands;
 import io.lettuce.core.cluster.api.reactive.RedisClusterReactiveCommands;
 import io.lettuce.core.cluster.models.partitions.Partitions;
@@ -51,11 +52,13 @@
 /**
  * An advanced reactive and thread-safe API to a Redis Cluster connection.
  *
+ * @param <K> Key type.
+ * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.0
  */
-public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedisReactiveCommands<K, V> implements
-        RedisAdvancedClusterReactiveCommands<K, V> {
+public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedisReactiveCommands<K, V>
+        implements RedisAdvancedClusterReactiveCommands<K, V> {
 
     private static final Predicate<RedisClusterNode> ALL_NODES = node -> true;
 
@@ -66,8 +69,22 @@ public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedi
      *
      * @param connection the stateful connection.
      * @param codec Codec used to encode/decode keys and values.
+     * @deprecated since 5.2, use {@link #RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnection, RedisCodec)}.
      */
-    public RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnectionImpl<K, V> connection, RedisCodec<K, V> codec) {
+    @Deprecated
+    public RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnectionImpl<K, V> connection,
+            RedisCodec<K, V> codec) {
+        super(connection, codec);
+        this.codec = codec;
+    }
+
+    /**
+     * Initialize a new connection.
+     *
+     * @param connection the stateful connection.
+     * @param codec Codec used to encode/decode keys and values.
+     */
+    public RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnection<K, V> connection, RedisCodec<K, V> codec) {
         super(connection, codec);
         this.codec = codec;
     }
@@ -191,7 +208,7 @@ public Mono<String> flushdb() {
     @Override
     public Flux<V> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
 
-        if (getStatefulConnection().getState().hasCommand(GEORADIUS_RO)) {
+        if (hasRedisState() && getRedisState().hasCommand(GEORADIUS_RO)) {
             return super.georadius_ro(key, longitude, latitude, distance, unit);
         }
 
@@ -202,7 +219,7 @@ public Flux<V> georadius(K key, double longitude, double latitude, double distan
     public Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit,
             GeoArgs geoArgs) {
 
-        if (getStatefulConnection().getState().hasCommand(GEORADIUS_RO)) {
+        if (hasRedisState() && getRedisState().hasCommand(GEORADIUS_RO)) {
             return super.georadius_ro(key, longitude, latitude, distance, unit, geoArgs);
         }
 
@@ -212,7 +229,7 @@ public Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, do
     @Override
     public Flux<V> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit) {
 
-        if (getStatefulConnection().getState().hasCommand(GEORADIUSBYMEMBER_RO)) {
+        if (hasRedisState() && getRedisState().hasCommand(GEORADIUSBYMEMBER_RO)) {
             return super.georadiusbymember_ro(key, member, distance, unit);
         }
 
@@ -222,7 +239,7 @@ public Flux<V> georadiusbymember(K key, V member, double distance, GeoArgs.Unit
     @Override
     public Flux<GeoWithin<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs) {
 
-        if (getStatefulConnection().getState().hasCommand(GEORADIUSBYMEMBER_RO)) {
+        if (hasRedisState() && getRedisState().hasCommand(GEORADIUSBYMEMBER_RO)) {
             return super.georadiusbymember_ro(key, member, distance, unit, geoArgs);
         }
 
@@ -409,19 +426,14 @@ public Mono<Long> unlink(Iterable<K> keys) {
         return Flux.merge(publishers).reduce((accu, next) -> accu + next);
     }
 
-    @Override
-    public StatefulRedisClusterConnectionImpl<K, V> getStatefulConnection() {
-        return (StatefulRedisClusterConnectionImpl<K, V>) super.getConnection();
-    }
-
     @Override
     public RedisClusterReactiveCommands<K, V> getConnection(String nodeId) {
         return getStatefulConnection().getConnection(nodeId).reactive();
     }
 
     private Mono<RedisClusterReactiveCommands<K, V>> getConnectionReactive(String nodeId) {
-        return getMono(getConnectionProvider().<K, V> getConnectionAsync(Intent.WRITE, nodeId)).map(
-                StatefulRedisConnection::reactive);
+        return getMono(getConnectionProvider().<K, V> getConnectionAsync(Intent.WRITE, nodeId))
+                .map(StatefulRedisConnection::reactive);
     }
 
     @Override
@@ -430,13 +442,13 @@ public RedisClusterReactiveCommands<K, V> getConnection(String host, int port) {
     }
 
     private Mono<RedisClusterReactiveCommands<K, V>> getConnectionReactive(String host, int port) {
-        return getMono(getConnectionProvider().<K, V> getConnectionAsync(Intent.WRITE, host, port)).map(
-                StatefulRedisConnection::reactive);
+        return getMono(getConnectionProvider().<K, V> getConnectionAsync(Intent.WRITE, host, port))
+                .map(StatefulRedisConnection::reactive);
     }
 
-    private AsyncClusterConnectionProvider getConnectionProvider() {
-        return (AsyncClusterConnectionProvider) getStatefulConnection().getClusterDistributionChannelWriter()
-                .getClusterConnectionProvider();
+    @Override
+    public StatefulRedisClusterConnection<K, V> getStatefulConnection() {
+        return (StatefulRedisClusterConnection<K, V>) super.getConnection();
     }
 
     @Override
@@ -490,7 +502,8 @@ private <T extends ScanCursor> Mono<T> clusterScan(ScanCursor cursor,
             BiFunction<RedisKeyReactiveCommands<K, V>, ScanCursor, Mono<T>> scanFunction,
             ClusterScanSupport.ScanCursorMapper<Mono<T>> resultMapper) {
 
-        return clusterScan(getStatefulConnection(), cursor, scanFunction, (ClusterScanSupport.ScanCursorMapper) resultMapper);
+        return clusterScan(getStatefulConnection(), getConnectionProvider(), cursor, scanFunction,
+                (ClusterScanSupport.ScanCursorMapper) resultMapper);
     }
 
     private <T> Flux<T> pipeliningWithMap(Map<K, V> map, Function<Map<K, V>, Flux<T>> function,
@@ -560,23 +573,35 @@ private Mono<RedisClusterReactiveCommands<K, V>> findConnectionBySlotReactive(in
         return Mono.error(new RedisException("No partition for slot " + slot));
     }
 
+    private RedisState getRedisState() {
+        return ((StatefulRedisClusterConnectionImpl<K, V>) super.getConnection()).getState();
+    }
+
+    private boolean hasRedisState() {
+        return super.getConnection() instanceof StatefulRedisClusterConnectionImpl;
+    }
+
+    private AsyncClusterConnectionProvider getConnectionProvider() {
+
+        ClusterDistributionChannelWriter writer = (ClusterDistributionChannelWriter) getStatefulConnection().getChannelWriter();
+        return (AsyncClusterConnectionProvider) writer.getClusterConnectionProvider();
+    }
+
     /**
      * Perform a SCAN in the cluster.
      *
      */
-    static <T extends ScanCursor, K, V> Mono<T> clusterScan(StatefulRedisClusterConnectionImpl<K, V> connection,
-            ScanCursor cursor, BiFunction<RedisKeyReactiveCommands<K, V>, ScanCursor, Mono<T>> scanFunction,
+    static <T extends ScanCursor, K, V> Mono<T> clusterScan(StatefulRedisClusterConnection<K, V> connection,
+            AsyncClusterConnectionProvider connectionProvider, ScanCursor cursor,
+            BiFunction<RedisKeyReactiveCommands<K, V>, ScanCursor, Mono<T>> scanFunction,
             ClusterScanSupport.ScanCursorMapper<Mono<T>> mapper) {
 
         List<String> nodeIds = ClusterScanSupport.getNodeIds(connection, cursor);
         String currentNodeId = ClusterScanSupport.getCurrentNodeId(cursor, nodeIds);
         ScanCursor continuationCursor = ClusterScanSupport.getContinuationCursor(cursor);
 
-        AsyncClusterConnectionProvider connectionProvider = (AsyncClusterConnectionProvider) connection
-                .getClusterDistributionChannelWriter().getClusterConnectionProvider();
-
-        Mono<T> scanCursor = getMono(connectionProvider.<K, V> getConnectionAsync(Intent.WRITE, currentNodeId)).flatMap(
-                conn -> scanFunction.apply(conn.reactive(), continuationCursor));
+        Mono<T> scanCursor = getMono(connectionProvider.<K, V> getConnectionAsync(Intent.WRITE, currentNodeId))
+                .flatMap(conn -> scanFunction.apply(conn.reactive(), continuationCursor));
         return mapper.map(nodeIds, currentNodeId, scanCursor);
     }
 
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
index 977fec2d3e..3c1ee740a0 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
@@ -41,10 +41,15 @@
 import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
 
 /**
+ * An asynchronous and thread-safe API for a Redis pub/sub connection.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
  * @author Mark Paluch
+ * @since 5.0
  */
-class RedisClusterPubSubAsyncCommandsImpl<K, V> extends RedisPubSubAsyncCommandsImpl<K, V> implements
-        RedisClusterPubSubAsyncCommands<K, V> {
+public class RedisClusterPubSubAsyncCommandsImpl<K, V> extends RedisPubSubAsyncCommandsImpl<K, V>
+        implements RedisClusterPubSubAsyncCommands<K, V> {
 
     /**
      * Initialize a new connection.
@@ -52,7 +57,7 @@ class RedisClusterPubSubAsyncCommandsImpl<K, V> extends RedisPubSubAsyncCommands
      * @param connection the connection .
      * @param codec Codec used to encode/decode keys and values.
      */
-    public RedisClusterPubSubAsyncCommandsImpl(StatefulRedisClusterPubSubConnection<K, V> connection, RedisCodec<K, V> codec) {
+    public RedisClusterPubSubAsyncCommandsImpl(StatefulRedisPubSubConnection<K, V> connection, RedisCodec<K, V> codec) {
         super(connection, codec);
     }
 
@@ -115,9 +120,9 @@ public PubSubAsyncNodeSelection<K, V> nodes(Predicate<RedisClusterNode> predicat
                 new Class<?>[] { NodeSelectionPubSubAsyncCommands.class, PubSubAsyncNodeSelection.class }, h);
     }
 
-    private static class StaticPubSubAsyncNodeSelection<K, V> extends
-            AbstractNodeSelection<RedisPubSubAsyncCommands<K, V>, NodeSelectionPubSubAsyncCommands<K, V>, K, V> implements
-            PubSubAsyncNodeSelection<K, V> {
+    private static class StaticPubSubAsyncNodeSelection<K, V>
+            extends AbstractNodeSelection<RedisPubSubAsyncCommands<K, V>, NodeSelectionPubSubAsyncCommands<K, V>, K, V>
+            implements PubSubAsyncNodeSelection<K, V> {
 
         private final List<RedisClusterNode> redisClusterNodes;
         private final ClusterDistributionChannelWriter writer;
@@ -146,8 +151,8 @@ protected CompletableFuture<StatefulRedisPubSubConnection<K, V>> getConnection(R
             RedisURI uri = redisClusterNode.getUri();
             AsyncClusterConnectionProvider async = (AsyncClusterConnectionProvider) writer.getClusterConnectionProvider();
 
-            return async.getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, uri.getHost(), uri.getPort()).thenApply(
-                    it -> (StatefulRedisPubSubConnection<K, V>) it);
+            return async.getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, uri.getHost(), uri.getPort())
+                    .thenApply(it -> (StatefulRedisPubSubConnection<K, V>) it);
         }
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
index d3c25073c1..458327a5f7 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
@@ -40,10 +40,15 @@
 import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands;
 
 /**
+ * A reactive and thread-safe API for a Redis pub/sub connection.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
  * @author Mark Paluch
+ * @since 5.0
  */
-class RedisClusterPubSubReactiveCommandsImpl<K, V> extends RedisPubSubReactiveCommandsImpl<K, V> implements
-        RedisClusterPubSubReactiveCommands<K, V> {
+public class RedisClusterPubSubReactiveCommandsImpl<K, V> extends RedisPubSubReactiveCommandsImpl<K, V>
+        implements RedisClusterPubSubReactiveCommands<K, V> {
 
     /**
      * Initialize a new connection.
@@ -51,7 +56,7 @@ class RedisClusterPubSubReactiveCommandsImpl<K, V> extends RedisPubSubReactiveCo
      * @param connection the connection.
      * @param codec Codec used to encode/decode keys and values.
      */
-    public RedisClusterPubSubReactiveCommandsImpl(StatefulRedisClusterPubSubConnection<K, V> connection, RedisCodec<K, V> codec) {
+    public RedisClusterPubSubReactiveCommandsImpl(StatefulRedisPubSubConnection<K, V> connection, RedisCodec<K, V> codec) {
         super(connection, codec);
     }
 
@@ -114,9 +119,9 @@ public PubSubReactiveNodeSelection<K, V> nodes(Predicate<RedisClusterNode> predi
                 new Class<?>[] { NodeSelectionPubSubReactiveCommands.class, PubSubReactiveNodeSelection.class }, h);
     }
 
-    private static class StaticPubSubReactiveNodeSelection<K, V> extends
-            AbstractNodeSelection<RedisPubSubReactiveCommands<K, V>, NodeSelectionPubSubReactiveCommands<K, V>, K, V> implements
-            PubSubReactiveNodeSelection<K, V> {
+    private static class StaticPubSubReactiveNodeSelection<K, V>
+            extends AbstractNodeSelection<RedisPubSubReactiveCommands<K, V>, NodeSelectionPubSubReactiveCommands<K, V>, K, V>
+            implements PubSubReactiveNodeSelection<K, V> {
 
         private final List<RedisClusterNode> redisClusterNodes;
         private final ClusterDistributionChannelWriter writer;
@@ -145,8 +150,8 @@ protected CompletableFuture<StatefulRedisPubSubConnection<K, V>> getConnection(R
 
             AsyncClusterConnectionProvider async = (AsyncClusterConnectionProvider) writer.getClusterConnectionProvider();
 
-            return async.getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, uri.getHost(), uri.getPort()).thenApply(
-                    it -> (StatefulRedisPubSubConnection<K, V>) it);
+            return async.getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, uri.getHost(), uri.getPort())
+                    .thenApply(it -> (StatefulRedisPubSubConnection<K, V>) it);
         }
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
index b8f59a8336..2acfafa6bb 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
@@ -170,7 +170,7 @@ public CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(Strin
         return provider.getConnectionAsync(ClusterConnectionProvider.Intent.WRITE, host, port);
     }
 
-    public ClusterDistributionChannelWriter getClusterDistributionChannelWriter() {
+    ClusterDistributionChannelWriter getClusterDistributionChannelWriter() {
         return (ClusterDistributionChannelWriter) super.getChannelWriter();
     }
 
diff --git a/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java b/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
index e2df2a0184..fdfc7274d1 100644
--- a/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
+++ b/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
@@ -18,6 +18,7 @@
 import java.util.concurrent.CompletableFuture;
 
 import io.lettuce.core.ReadFrom;
+import io.lettuce.core.RedisChannelWriter;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -148,8 +149,12 @@ public interface StatefulRedisClusterConnection<K, V> extends StatefulConnection
     ReadFrom getReadFrom();
 
     /**
-     *
      * @return Known partitions for this connection.
      */
     Partitions getPartitions();
+
+    /**
+     * @return the underlying {@link RedisChannelWriter}.
+     */
+    RedisChannelWriter getChannelWriter();
 }
diff --git a/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
index 8ea075e6fc..fed07db2b3 100644
--- a/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
@@ -32,9 +32,10 @@
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
+ * @since 5.0
  */
-public class RedisPubSubReactiveCommandsImpl<K, V> extends RedisReactiveCommandsImpl<K, V> implements
-        RedisPubSubReactiveCommands<K, V> {
+public class RedisPubSubReactiveCommandsImpl<K, V> extends RedisReactiveCommandsImpl<K, V>
+        implements RedisPubSubReactiveCommands<K, V> {
 
     private final PubSubCommandBuilder<K, V> commandBuilder;
 
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
index b3311c2986..4f7d5aa797 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
@@ -129,7 +129,7 @@ public void testClusterConnectionStability() {
         RedisAdvancedClusterAsyncCommandsImpl<String, String> connection = (RedisAdvancedClusterAsyncCommandsImpl<String, String>) clusterClient
                 .connect().async();
 
-        RedisChannelHandler<String, String> statefulConnection = connection.getStatefulConnection();
+        RedisChannelHandler<String, String> statefulConnection = (RedisChannelHandler) connection.getStatefulConnection();
 
         connection.set("a", "b");
         ClusterDistributionChannelWriter writer = (ClusterDistributionChannelWriter) statefulConnection.getChannelWriter();

From 86922f0417373d53cc3dbd0e0957278290ad440d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 29 Jul 2019 10:22:27 +0200
Subject: [PATCH 648/808] Use DirectProcessor in EventBus #1086
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lettuce now uses DirectProcessor as non-blocking event bus. DirectProcessor no longer blocks calling .next(…). Previously, EmitterProcessor used a blocking queue which blocked the caller if downstream consumers did not consume events in time.
---
 .../java/io/lettuce/core/event/DefaultEventBus.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/lettuce/core/event/DefaultEventBus.java b/src/main/java/io/lettuce/core/event/DefaultEventBus.java
index a9f90afded..3c93d8bf1b 100644
--- a/src/main/java/io/lettuce/core/event/DefaultEventBus.java
+++ b/src/main/java/io/lettuce/core/event/DefaultEventBus.java
@@ -15,8 +15,9 @@
  */
 package io.lettuce.core.event;
 
-import reactor.core.publisher.EmitterProcessor;
+import reactor.core.publisher.DirectProcessor;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.FluxSink;
 import reactor.core.scheduler.Scheduler;
 
 /**
@@ -27,11 +28,13 @@
  */
 public class DefaultEventBus implements EventBus {
 
-    private final EmitterProcessor<Event> bus;
+    private final DirectProcessor<Event> bus;
+    private final FluxSink<Event> sink;
     private final Scheduler scheduler;
 
     public DefaultEventBus(Scheduler scheduler) {
-        this.bus = EmitterProcessor.create();
+        this.bus = DirectProcessor.create();
+        this.sink = bus.sink();
         this.scheduler = scheduler;
     }
 
@@ -42,8 +45,6 @@ public Flux<Event> get() {
 
     @Override
     public void publish(Event event) {
-        if (bus.hasDownstreams()) {
-            bus.onNext(event);
-        }
+        sink.next(event);
     }
 }

From 8691f98d3cbf8581512ce34f916485047885878a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 29 Jul 2019 10:45:12 +0200
Subject: [PATCH 649/808] Fix RedisClusterNode slot comparison #1089

RedisClusterNode now correctly compares slot-less nodes. Previously two slot-less nodes where considered different although they should be considered equal.
---
 .../models/partitions/RedisClusterNode.java   | 25 +++++++++++++++++++
 .../TopologyComparatorsUnitTests.java         | 11 ++++++++
 2 files changed, 36 insertions(+)

diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
index b12aa8d972..6bd353a4e2 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
@@ -125,6 +125,11 @@ public static RedisClusterNode of(String nodeId) {
         return redisClusterNode;
     }
 
+    /**
+     * Clone {@code this} {@link RedisClusterNode}.
+     *
+     * @return a copy of {@code this} {@link RedisClusterNode}.
+     */
     @Override
     public RedisClusterNode clone() {
         return new RedisClusterNode(this);
@@ -225,6 +230,11 @@ public void setConfigEpoch(long configEpoch) {
         this.configEpoch = configEpoch;
     }
 
+    /**
+     * Return the slots as {@link List}. Note that this method creates a new {@link List} for each time it gets called.
+     *
+     * @return the slots as {@link List}.
+     */
     public List<Integer> getSlots() {
 
         if (slots == null || slots.isEmpty()) {
@@ -296,8 +306,18 @@ private void setSlotBits(List<Integer> slots) {
         }
     }
 
+    /**
+     * Return {@literal true} if {@link RedisClusterNode the other node} contains the same slots as {@code this node}.
+     *
+     * @param other the node to compare with.
+     * @return {@literal true} if {@link RedisClusterNode the other node} contains the same slots as {@code this node}.
+     */
     public boolean hasSameSlotsAs(RedisClusterNode other) {
 
+        if (this.slots == null && other.slots == null) {
+            return true;
+        }
+
         if (this.slots == null || other.slots == null) {
             return false;
         }
@@ -305,6 +325,11 @@ public boolean hasSameSlotsAs(RedisClusterNode other) {
         return this.slots.equals(other.slots);
     }
 
+    /**
+     * Return the {@link NodeFlag NodeFlags}.
+     *
+     * @return the {@link NodeFlag NodeFlags}.
+     */
     public Set<NodeFlag> getFlags() {
         return flags;
     }
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
index 5bf1db803b..0b370fcd06 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
@@ -308,6 +308,17 @@ void isChangedFlagsChangedReplicaToMaster() {
         assertThat(isChanged(partitions1, partitions2)).isTrue();
     }
 
+    @Test
+    void shouldConsiderNodesWithoutSlotsUnchanged() {
+
+        String nodes1 = "3d005a179da7d8dc1adae6409d47b39c369e992b 127.0.0.1:7380 slave - 0 1401258245007 2 disconnected\n"
+                + "c37ab8396be428403d4e55c0d317348be27ed973 127.0.0.1:7381 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n";
+
+        Partitions partitions1 = ClusterPartitionParser.parse(nodes1);
+        Partitions partitions2 = ClusterPartitionParser.parse(nodes1);
+        assertThat(isChanged(partitions1, partitions2)).isFalse();
+    }
+
     @Test
     void nodesShouldHaveSameSlots() {
         RedisClusterNode nodeA = createNode(1, 4, 36, 98);

From be002838a26d81f912bcba9c8df430fe51a7ad66 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 29 Jul 2019 10:45:25 +0200
Subject: [PATCH 650/808] Polishing #1089

---
 .../io/lettuce/core/cluster/RedisClusterClient.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index e9f1d42e08..621453f850 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -494,7 +494,7 @@ <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisC
             writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
         }
 
-        StatefulRedisConnectionImpl<K, V> connection = new StatefulRedisConnectionImpl<K, V>(writer, codec, timeout);
+        StatefulRedisConnectionImpl<K, V> connection = new StatefulRedisConnectionImpl<>(writer, codec, timeout);
 
         ConnectionFuture<StatefulRedisConnection<K, V>> connectionFuture = connectStatefulAsync(connection, codec, endpoint,
                 getFirstUri(), socketAddressSupplier, () -> new CommandHandler(clientOptions, clientResources, endpoint));
@@ -578,7 +578,7 @@ private <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectCl
 
         ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, writer,
                 clusterTopologyRefreshScheduler);
-        PooledClusterConnectionProvider<K, V> pooledClusterConnectionProvider = new PooledClusterConnectionProvider<K, V>(this,
+        PooledClusterConnectionProvider<K, V> pooledClusterConnectionProvider = new PooledClusterConnectionProvider<>(this,
                 clusterWriter, codec, clusterTopologyRefreshScheduler);
 
         clusterWriter.setClusterConnectionProvider(pooledClusterConnectionProvider);
@@ -643,7 +643,7 @@ private <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> con
 
         Mono<SocketAddress> socketAddressSupplier = getSocketAddressSupplier(TopologyComparators::sortByClientCount);
 
-        PubSubClusterEndpoint<K, V> endpoint = new PubSubClusterEndpoint<K, V>(clientOptions, clientResources);
+        PubSubClusterEndpoint<K, V> endpoint = new PubSubClusterEndpoint<>(clientOptions, clientResources);
         RedisChannelWriter writer = endpoint;
 
         if (CommandExpiryWriter.isSupported(clientOptions)) {
@@ -792,8 +792,8 @@ public void reloadPartitions() {
 
                 logger.debug("Using a new cluster topology");
 
-                List<RedisClusterNode> before = new ArrayList<RedisClusterNode>(getPartitions());
-                List<RedisClusterNode> after = new ArrayList<RedisClusterNode>(loadedPartitions);
+                List<RedisClusterNode> before = new ArrayList<>(getPartitions());
+                List<RedisClusterNode> after = new ArrayList<>(loadedPartitions);
 
                 getResources().eventBus().publish(new ClusterTopologyChangedEvent(before, after));
             }

From 6f770db103a012f237e718b4abcea4a11b98808c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 30 Jul 2019 10:36:33 +0200
Subject: [PATCH 651/808] Upgrade to netty 4.1.38.Final #1093

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dc55e0eaf6..777fcb3c1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <junit-version>5.4.2</junit-version>
         <log4j2-version>2.11.2</log4j2-version>
         <mockito.version>2.27.0</mockito.version>
-        <netty-version>4.1.36.Final</netty-version>
+        <netty-version>4.1.38.Final</netty-version>
         <reactor-version>3.2.8.RELEASE</reactor-version>
         <reactive-streams-tck.version>1.0.0</reactive-streams-tck.version>
         <slf4j.version>1.7.25</slf4j.version>

From c892b97ec5968e34828cfd317f0a8882f40ac844 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 30 Jul 2019 10:38:31 +0200
Subject: [PATCH 652/808] Upgrade to Mockito 3.0 #1095

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 777fcb3c1f..281ba3390e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
         <brave-version>5.6.3</brave-version>
         <junit-version>5.4.2</junit-version>
         <log4j2-version>2.11.2</log4j2-version>
-        <mockito.version>2.27.0</mockito.version>
+        <mockito.version>3.0.0</mockito.version>
         <netty-version>4.1.38.Final</netty-version>
         <reactor-version>3.2.8.RELEASE</reactor-version>
         <reactive-streams-tck.version>1.0.0</reactive-streams-tck.version>

From 3c5cfa52843aeef71be09fdc562b0f2cb995d91c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 30 Jul 2019 10:38:43 +0200
Subject: [PATCH 653/808] Upgrade to Reactor Core 3.2.11.RELEASE #1094

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 281ba3390e..eaff3b87fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
         <log4j2-version>2.11.2</log4j2-version>
         <mockito.version>3.0.0</mockito.version>
         <netty-version>4.1.38.Final</netty-version>
-        <reactor-version>3.2.8.RELEASE</reactor-version>
+        <reactor-version>3.2.11.RELEASE</reactor-version>
         <reactive-streams-tck.version>1.0.0</reactive-streams-tck.version>
         <slf4j.version>1.7.25</slf4j.version>
         <spring-version>4.3.20.RELEASE</spring-version>

From c02334c893c6185192aa7758565a4770ef24c90d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 30 Jul 2019 10:39:54 +0200
Subject: [PATCH 654/808] Upgrade to JUnit 5.5.1 #1096

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index eaff3b87fa..3ec0a86500 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
 
         <assertj-core.version>3.12.1</assertj-core.version>
         <brave-version>5.6.3</brave-version>
-        <junit-version>5.4.2</junit-version>
+        <junit-version>5.5.1</junit-version>
         <log4j2-version>2.11.2</log4j2-version>
         <mockito.version>3.0.0</mockito.version>
         <netty-version>4.1.38.Final</netty-version>

From 744598e6f2a9ed257145258a8bb2ac2e0a9b894d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 30 Jul 2019 10:40:28 +0200
Subject: [PATCH 655/808] Upgrade to Brave 5.6.9 #1097

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3ec0a86500..9a876c62d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <assertj-core.version>3.12.1</assertj-core.version>
-        <brave-version>5.6.3</brave-version>
+        <brave-version>5.6.9</brave-version>
         <junit-version>5.5.1</junit-version>
         <log4j2-version>2.11.2</log4j2-version>
         <mockito.version>3.0.0</mockito.version>

From 6b5861afc7a838235a399c8d5670fe6cb2611179 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 30 Jul 2019 10:53:13 +0200
Subject: [PATCH 656/808] Update plugin versions #1098

---
 pom.xml | 354 +++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 211 insertions(+), 143 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9a876c62d0..21333039ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -447,6 +447,217 @@
 
     </dependencies>
 
+    <build>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <extensions>
+            <extension>
+                <groupId>kr.motd.maven</groupId>
+                <artifactId>os-maven-plugin</artifactId>
+                <version>1.6.2</version>
+            </extension>
+        </extensions>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>3.1.1</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.8</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.8.1</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>1.6</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.1.1</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5.3</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.22.2</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.maven.surefire</groupId>
+                            <artifactId>surefire-junit-platform</artifactId>
+                            <version>2.22.2</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>2.22.2</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.maven.surefire</groupId>
+                            <artifactId>surefire-junit-platform</artifactId>
+                            <version>2.22.2</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>3.0.0</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>1.6.0</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>0.8.4</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>net.nicoulaj.maven.plugins</groupId>
+                    <artifactId>checksum-maven-plugin</artifactId>
+                    <version>1.8</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgument>-Xlint:all,-deprecation,-unchecked</compilerArgument>
+                    <testCompilerArgument>-Xlint:none</testCompilerArgument>
+                    <showWarnings>true</showWarnings>
+                    <showDeprecation>false</showDeprecation>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <io.netty.eventLoopThreads>4</io.netty.eventLoopThreads>
+                    </systemProperties>
+                    <includes>
+                        <include>**/*UnitTests</include>
+                        <include>**/*Tests</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/*Test</exclude>
+                        <exclude>**/*IntegrationTests</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <io.netty.eventLoopThreads>4</io.netty.eventLoopThreads>
+                    </systemProperties>
+                    <includes>
+                        <include>**/*IntegrationTests</include>
+                        <include>**/*Test</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/*UnitTests</exclude>
+                    </excludes>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>integration-test</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <configuration>
+                    <releaseProfiles>sonatype-oss-release,documentation</releaseProfiles>
+                    <goals>deploy</goals>
+                    <autoVersionSubmodules>true</autoVersionSubmodules>
+                    <tagNameFormat>@{project.version}</tagNameFormat>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
 
         <profile>
@@ -463,7 +674,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -500,7 +710,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -515,7 +724,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>3.1.1</version>
                         <executions>
                             <execution>
                                 <id>src</id>
@@ -551,7 +759,6 @@
                     <plugin>
                         <groupId>net.nicoulaj.maven.plugins</groupId>
                         <artifactId>checksum-maven-plugin</artifactId>
-                        <version>1.8</version>
                         <configuration>
                             <algorithms>
                                 <algorithm>MD5</algorithm>
@@ -628,7 +835,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>3.0.0</version>
                         <executions>
                             <execution>
                                 <id>add-source</id>
@@ -647,7 +853,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.6.0</version>
                         <executions>
                             <execution>
                                 <id>run-benchmarks</id>
@@ -728,7 +933,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.8</version>
                         <executions>
 
                             <execution>
@@ -817,7 +1021,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>3.1.1</version>
                         <executions>
                             <execution>
                                 <id>docs</id>
@@ -842,141 +1045,6 @@
 
     </profiles>
 
-    <build>
-
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <extensions>
-            <extension>
-                <groupId>kr.motd.maven</groupId>
-                <artifactId>os-maven-plugin</artifactId>
-                <version>1.6.2</version>
-            </extension>
-        </extensions>
-
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <compilerArgument>-Xlint:all,-deprecation,-unchecked</compilerArgument>
-                    <testCompilerArgument>-Xlint:none</testCompilerArgument>
-                    <showWarnings>true</showWarnings>
-                    <showDeprecation>false</showDeprecation>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-                <configuration>
-                    <systemProperties>
-                        <io.netty.eventLoopThreads>4</io.netty.eventLoopThreads>
-                    </systemProperties>
-                    <includes>
-                        <include>**/*UnitTests</include>
-                        <include>**/*Tests</include>
-                    </includes>
-                    <excludes>
-                        <exclude>**/*Test</exclude>
-                        <exclude>**/*IntegrationTests</exclude>
-                    </excludes>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit-platform</artifactId>
-                        <version>2.22.2</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.22.2</version>
-                <configuration>
-                    <systemProperties>
-                        <io.netty.eventLoopThreads>4</io.netty.eventLoopThreads>
-                    </systemProperties>
-                    <includes>
-                        <include>**/*IntegrationTests</include>
-                        <include>**/*Test</include>
-                    </includes>
-                    <excludes>
-                        <exclude>**/*UnitTests</exclude>
-                    </excludes>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit-platform</artifactId>
-                        <version>2.22.2</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>integration-test</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.3</version>
-                <configuration>
-                    <releaseProfiles>sonatype-oss-release,documentation</releaseProfiles>
-                    <goals>deploy</goals>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
-                    <tagNameFormat>@{project.version}</tagNameFormat>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.4</version>
-                <executions>
-                    <execution>
-                        <id>prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
     <pluginRepositories>
         <pluginRepository>
             <id>apache-snapshots</id>

From cb4acba0c31ba2a4fab951b0f9bdb10fdd822af3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 30 Jul 2019 10:55:34 +0200
Subject: [PATCH 657/808] Polishing #1098

---
 pom.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 21333039ca..63677aab76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1045,13 +1045,4 @@
 
     </profiles>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>apache-snapshots</id>
-            <url>https://repository.apache.org/content/groups/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
 </project>

From 59fde446a30e03232b92de9c8eb1f4dddb1c0282 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 30 Jul 2019 12:11:56 +0200
Subject: [PATCH 658/808] Upgrade to Commons Pool 2.7.0 #1099

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 63677aab76..471e36655a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
-            <version>2.6.0</version>
+            <version>2.7.0</version>
             <optional>true</optional>
         </dependency>
 

From ce8553de44a9801b16f9d2285e48267d1b1ee58b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 30 Jul 2019 13:52:21 +0200
Subject: [PATCH 659/808] Polishing #1100

---
 pom.xml                                                     | 3 ++-
 src/main/java/io/lettuce/core/BitFieldArgs.java             | 2 +-
 src/main/java/io/lettuce/core/ClientOptions.java            | 4 ++--
 src/main/java/io/lettuce/core/GeoArgs.java                  | 6 +++---
 src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java       | 2 +-
 src/main/java/io/lettuce/core/KillArgs.java                 | 2 +-
 src/main/java/io/lettuce/core/MigrateArgs.java              | 2 +-
 src/main/java/io/lettuce/core/Operators.java                | 2 +-
 src/main/java/io/lettuce/core/RestoreArgs.java              | 2 +-
 src/main/java/io/lettuce/core/ScanArgs.java                 | 2 +-
 src/main/java/io/lettuce/core/SetArgs.java                  | 2 +-
 src/main/java/io/lettuce/core/SocketOptions.java            | 4 ++--
 src/main/java/io/lettuce/core/SortArgs.java                 | 2 +-
 src/main/java/io/lettuce/core/XAddArgs.java                 | 2 +-
 src/main/java/io/lettuce/core/XClaimArgs.java               | 2 +-
 src/main/java/io/lettuce/core/XReadArgs.java                | 2 +-
 src/main/java/io/lettuce/core/ZAddArgs.java                 | 2 +-
 src/main/java/io/lettuce/core/ZStoreArgs.java               | 6 +++---
 .../io/lettuce/core/api/async/RedisServerAsyncCommands.java | 4 ----
 .../core/cluster/models/partitions/RedisClusterNode.java    | 4 ++--
 .../core/masterslave/CompletableEventLatchSupport.java      | 2 +-
 src/main/java/io/lettuce/core/masterslave/Connections.java  | 4 ++--
 src/main/java/io/lettuce/core/resource/ClientResources.java | 6 +++---
 .../io/lettuce/core/resource/DefaultClientResources.java    | 6 +++---
 src/main/java/io/lettuce/core/tracing/BraveTracing.java     | 2 +-
 25 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/pom.xml b/pom.xml
index 471e36655a..7dd296a445 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,6 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-        <tag>HEAD</tag>
     </scm>
 
     <dependencyManagement>
@@ -674,6 +673,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>3.1.1</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -724,6 +724,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
+                        <version>3.1.1</version>
                         <executions>
                             <execution>
                                 <id>src</id>
diff --git a/src/main/java/io/lettuce/core/BitFieldArgs.java b/src/main/java/io/lettuce/core/BitFieldArgs.java
index 82388cc3cd..3e1970bc8a 100644
--- a/src/main/java/io/lettuce/core/BitFieldArgs.java
+++ b/src/main/java/io/lettuce/core/BitFieldArgs.java
@@ -27,7 +27,7 @@
 
 /**
  * Argument list builder for the Redis <a href="http://redis.io/commands/bitfield">BITFIELD</a> command.
- * <p/>
+ * <p>
  * {@link BitFieldArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index bf75cbf6ac..60e515d362 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -183,7 +183,7 @@ public Builder cancelCommandsOnReconnectFailure(boolean cancelCommandsOnReconnec
         /**
          * Use a dedicated {@link reactor.core.scheduler.Scheduler} to emit reactive data signals. Enabling this option can be
          * useful for reactive sequences that require a significant amount of processing with a single/a few Redis connections.
-         * <p/>
+         * <p>
          * A single Redis connection operates on a single thread. Operations that require a significant amount of processing can
          * lead to a single-threaded-like behavior for all consumers of the Redis connection. When enabled, data signals will be
          * emitted using a different thread served by {@link ClientResources#eventExecutorGroup()}. Defaults to {@literal false}
@@ -362,7 +362,7 @@ public boolean isCancelCommandsOnReconnectFailure() {
     /**
      * Use a dedicated {@link reactor.core.scheduler.Scheduler} to emit reactive data signals. Enabling this option can be
      * useful for reactive sequences that require a significant amount of processing with a single/a few Redis connections.
-     * <p/>
+     * <p>
      * A single Redis connection operates on a single thread. Operations that require a significant amount of processing can
      * lead to a single-threaded-like behavior for all consumers of the Redis connection. When enabled, data signals will be
      * emitted using a different thread served by {@link ClientResources#eventExecutorGroup()}. Defaults to {@literal false} ,
diff --git a/src/main/java/io/lettuce/core/GeoArgs.java b/src/main/java/io/lettuce/core/GeoArgs.java
index c8ec6b01ed..a74afd9317 100644
--- a/src/main/java/io/lettuce/core/GeoArgs.java
+++ b/src/main/java/io/lettuce/core/GeoArgs.java
@@ -21,9 +21,9 @@
 
 /**
  *
- * Argument list builder for the Redis <a href="http://redis.io/commands/georadius">GEORADIUS</a> and <a
- * href="http://redis.io/commands/georadiusbymember">GEORADIUSBYMEMBER</a> commands.
- * <p/>
+ * Argument list builder for the Redis <a href="http://redis.io/commands/georadius">GEORADIUS</a> and
+ * <a href="http://redis.io/commands/georadiusbymember">GEORADIUSBYMEMBER</a> commands.
+ * <p>
  * {@link GeoArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
diff --git a/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java b/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
index 8ce17e59a4..4a397f8261 100644
--- a/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
+++ b/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
@@ -23,7 +23,7 @@
 /**
  * Argument list builder for the Redis <a href="http://redis.io/commands/georadius">GEORADIUS</a> command to store
  * {@literal GEORADIUS} results or {@literal GEORADIUS} distances in a sorted set.
- * <p/>
+ * <p>
  * {@link GeoRadiusStoreArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
diff --git a/src/main/java/io/lettuce/core/KillArgs.java b/src/main/java/io/lettuce/core/KillArgs.java
index 65b2827d7b..f5313dbb43 100644
--- a/src/main/java/io/lettuce/core/KillArgs.java
+++ b/src/main/java/io/lettuce/core/KillArgs.java
@@ -27,7 +27,7 @@
  *
  * Argument list builder for the Redis <a href="http://redis.io/commands/client-kill">CLIENT KILL</a> command. Static import the
  * methods from {@link Builder} and chain the method calls: {@code id(1).skipme()}.
- * <p/>
+ * <p>
  * {@link KillArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
diff --git a/src/main/java/io/lettuce/core/MigrateArgs.java b/src/main/java/io/lettuce/core/MigrateArgs.java
index 4d157b6def..d5726b1539 100644
--- a/src/main/java/io/lettuce/core/MigrateArgs.java
+++ b/src/main/java/io/lettuce/core/MigrateArgs.java
@@ -27,7 +27,7 @@
 /**
  * Argument list builder for the Redis <a href="http://redis.io/commands/migrate">MIGRATE</a> command. Static import the methods
  * from {@link Builder} and chain the method calls: {@code copy().auth("foobar")}.
- * <p/>
+ * <p>
  * {@link MigrateArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
diff --git a/src/main/java/io/lettuce/core/Operators.java b/src/main/java/io/lettuce/core/Operators.java
index 034ac71633..802f2503a4 100644
--- a/src/main/java/io/lettuce/core/Operators.java
+++ b/src/main/java/io/lettuce/core/Operators.java
@@ -39,7 +39,7 @@
 /**
  * Operator utilities to handle noop subscriptions, validate request size and to cap concurrent additive operations to
  * Long.MAX_VALUE, which is generic to {@link Subscription#request(long)} handling.
- * <p/>
+ * <p>
  * This class duplicates some methods from {@link reactor.core.publisher.Operators} to be independent from Reactor API changes.
  *
  * @author Mark Paluch
diff --git a/src/main/java/io/lettuce/core/RestoreArgs.java b/src/main/java/io/lettuce/core/RestoreArgs.java
index 9f7fe2dcf2..0a7931bacc 100644
--- a/src/main/java/io/lettuce/core/RestoreArgs.java
+++ b/src/main/java/io/lettuce/core/RestoreArgs.java
@@ -22,7 +22,7 @@
 /**
  * Argument list builder for the Redis <a href="http://redis.io/commands/restore">RESTORE</a> command. Static import the methods
  * from {@link RestoreArgs.Builder} and call the methods: {@code ttl(…)} .
- * <p/>
+ * <p>
  * {@link RestoreArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
diff --git a/src/main/java/io/lettuce/core/ScanArgs.java b/src/main/java/io/lettuce/core/ScanArgs.java
index f1624b1de0..1be78e2175 100644
--- a/src/main/java/io/lettuce/core/ScanArgs.java
+++ b/src/main/java/io/lettuce/core/ScanArgs.java
@@ -29,7 +29,7 @@
  * Argument list builder for the Redis scan commands ({@literal SCAN, HSCAN, SSCAN, ZSCAN}). Static import the methods from
  *
  * {@link Builder} and chain the method calls: {@code matches("weight_*").limit(0, 2)}.
- * <p/>
+ * <p>
  * {@link ScanArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
diff --git a/src/main/java/io/lettuce/core/SetArgs.java b/src/main/java/io/lettuce/core/SetArgs.java
index ad2458ef47..b3460831e8 100644
--- a/src/main/java/io/lettuce/core/SetArgs.java
+++ b/src/main/java/io/lettuce/core/SetArgs.java
@@ -20,7 +20,7 @@
 /**
  * Argument list builder for the Redis <a href="http://redis.io/commands/set">SET</a> command starting from Redis 2.6.12. Static
  * import the methods from {@link Builder} and chain the method calls: {@code ex(10).nx()}.
- * <p/>
+ * <p>
  * {@link SetArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Will Glozer
diff --git a/src/main/java/io/lettuce/core/SocketOptions.java b/src/main/java/io/lettuce/core/SocketOptions.java
index 40a0fb7a3b..88d4bc2999 100644
--- a/src/main/java/io/lettuce/core/SocketOptions.java
+++ b/src/main/java/io/lettuce/core/SocketOptions.java
@@ -144,7 +144,7 @@ public Builder keepAlive(boolean keepAlive) {
          * Sets whether to disable Nagle's algorithm. Defaults to {@literal false} (Nagle enabled). See
          * {@link #DEFAULT_SO_NO_DELAY}.
          *
-         * @param tcpNoDelay {@literal true} to disable Nagle's algorithm, {@link false} to enable Nagle's algorithm.
+         * @param tcpNoDelay {@literal true} to disable Nagle's algorithm, {@literal false} to enable Nagle's algorithm.
          * @return {@code this}
          * @see java.net.SocketOptions#TCP_NODELAY
          */
@@ -186,7 +186,7 @@ public boolean isKeepAlive() {
     /**
      * Returns whether to use TCP NoDelay.
      *
-     * @return {@literal true} to disable Nagle's algorithm, {@link false} to enable Nagle's algorithm.
+     * @return {@literal true} to disable Nagle's algorithm, {@literal false} to enable Nagle's algorithm.
      * @see java.net.SocketOptions#TCP_NODELAY
      */
     public boolean isTcpNoDelay() {
diff --git a/src/main/java/io/lettuce/core/SortArgs.java b/src/main/java/io/lettuce/core/SortArgs.java
index 83854f0129..eabb8eafd4 100644
--- a/src/main/java/io/lettuce/core/SortArgs.java
+++ b/src/main/java/io/lettuce/core/SortArgs.java
@@ -28,7 +28,7 @@
 /**
  * Argument list builder for the Redis <a href="http://redis.io/commands/sort">SORT</a> command. Static import the methods from
  * {@link Builder} and chain the method calls: {@code by("weight_*").desc().limit(0, 2)}.
- * <p/>
+ * <p>
  * {@link ScanArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Will Glozer
diff --git a/src/main/java/io/lettuce/core/XAddArgs.java b/src/main/java/io/lettuce/core/XAddArgs.java
index a102df264f..c4a36cf9e6 100644
--- a/src/main/java/io/lettuce/core/XAddArgs.java
+++ b/src/main/java/io/lettuce/core/XAddArgs.java
@@ -22,7 +22,7 @@
 /**
  * Argument list builder for the Redis <a href="http://redis.io/commands/xadd">XADD</a> command. Static import the methods from
  * {@link Builder} and call the methods: {@code maxlen(…)} .
- * <p/>
+ * <p>
  * {@link XAddArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
diff --git a/src/main/java/io/lettuce/core/XClaimArgs.java b/src/main/java/io/lettuce/core/XClaimArgs.java
index 0d9743ad6a..47ab109579 100644
--- a/src/main/java/io/lettuce/core/XClaimArgs.java
+++ b/src/main/java/io/lettuce/core/XClaimArgs.java
@@ -27,7 +27,7 @@
 /**
  * Argument list builder for the Redis <a href="http://redis.io/commands/xclaim">XCLAIM</a> command. Static import the methods
  * from {@link XClaimArgs.Builder} and call the methods: {@code minIdleTime(…)} .
- * <p/>
+ * <p>
  * {@link XClaimArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
diff --git a/src/main/java/io/lettuce/core/XReadArgs.java b/src/main/java/io/lettuce/core/XReadArgs.java
index 52104c3127..1ec9c35e9e 100644
--- a/src/main/java/io/lettuce/core/XReadArgs.java
+++ b/src/main/java/io/lettuce/core/XReadArgs.java
@@ -24,7 +24,7 @@
 /**
  * Argument list builder for the Redis <a href="http://redis.io/commands/xread">XREAD</a> and {@literal XREADGROUP} commands.
  * Static import the methods from {@link XReadArgs.Builder} and call the methods: {@code block(…)} .
- * <p/>
+ * <p>
  * {@link XReadArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
diff --git a/src/main/java/io/lettuce/core/ZAddArgs.java b/src/main/java/io/lettuce/core/ZAddArgs.java
index cae4dd4952..13ed74971c 100644
--- a/src/main/java/io/lettuce/core/ZAddArgs.java
+++ b/src/main/java/io/lettuce/core/ZAddArgs.java
@@ -20,7 +20,7 @@
 /**
  * Argument list builder for the improved Redis <a href="http://redis.io/commands/zadd">ZADD</a> command starting from Redis
  * 3.0.2. Static import the methods from {@link Builder} and call the methods: {@code xx()} or {@code nx()} .
- * <p/>
+ * <p>
  * {@link ZAddArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
diff --git a/src/main/java/io/lettuce/core/ZStoreArgs.java b/src/main/java/io/lettuce/core/ZStoreArgs.java
index df3b824b87..c4c69d043b 100644
--- a/src/main/java/io/lettuce/core/ZStoreArgs.java
+++ b/src/main/java/io/lettuce/core/ZStoreArgs.java
@@ -24,11 +24,11 @@
 import io.lettuce.core.protocol.CommandArgs;
 
 /**
- * Argument list builder for the Redis <a href="http://redis.io/commands/zunionstore">ZUNIONSTORE</a> and <a
- * href="http://redis.io/commands/zinterstore">ZINTERSTORE</a> commands. Static import the methods from {@link Builder} and
+ * Argument list builder for the Redis <a href="http://redis.io/commands/zunionstore">ZUNIONSTORE</a> and
+ * <a href="http://redis.io/commands/zinterstore">ZINTERSTORE</a> commands. Static import the methods from {@link Builder} and
  * chain the method calls: {@code weights(1, 2).max()}.
  *
- * <p/>
+ * <p>
  * {@link ZAddArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Will Glozer
diff --git a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
index ebea9f5a5d..84e6624211 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
@@ -201,15 +201,11 @@ public interface RedisServerAsyncCommands<K, V> {
 
     /**
      * Make the server crash: Out of memory.
-     *
-     * @return nothing, because the server crashes before returning.
      */
     void debugOom();
 
     /**
      * Make the server crash: Invalid pointer access.
-     *
-     * @return nothing, because the server crashes before returning.
      */
     void debugSegfault();
 
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
index 6bd353a4e2..174acff6da 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
@@ -26,11 +26,11 @@
 
 /**
  * Representation of a Redis Cluster node. A {@link RedisClusterNode} is identified by its {@code nodeId}.
- * <p/>
+ * <p>
  * A {@link RedisClusterNode} can be a {@link #getRole() responsible master} or replica. Masters can be responsible for zero to
  * {@link io.lettuce.core.cluster.SlotHash#SLOT_COUNT 16384} slots. Each replica refers to exactly one {@link #getSlaveOf()
  * master}. Nodes can have different {@link io.lettuce.core.cluster.models.partitions.RedisClusterNode.NodeFlag flags} assigned.
- * <p/>
+ * <p>
  * This class is mutable and not thread-safe if mutated by multiple threads concurrently.
  *
  * @author Mark Paluch
diff --git a/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java b/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
index 6ff8f561c9..22dd57f916 100644
--- a/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
+++ b/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
@@ -23,7 +23,7 @@
  * Completable latch support expecting an number of inbound events to trigger an outbound event signalled though a
  * {@link CompletionStage}. This latch is created by specifying a number of expected events of type {@code T} or exceptions and
  * synchronized through either a timeout or receiving the matching number of events.
- * <p/>
+ * <p>
  * Inbound events can be consumed through callback hook methods. Events arriving after synchronization are dropped.
  *
  * @author Mark Paluch
diff --git a/src/main/java/io/lettuce/core/masterslave/Connections.java b/src/main/java/io/lettuce/core/masterslave/Connections.java
index e04939dbaa..35426dac82 100644
--- a/src/main/java/io/lettuce/core/masterslave/Connections.java
+++ b/src/main/java/io/lettuce/core/masterslave/Connections.java
@@ -39,9 +39,9 @@
 /**
  * Connection collector with non-blocking synchronization. This synchronizer emits itself through a {@link Mono} as soon as it
  * gets synchronized via either receiving connects/exceptions from all connections or timing out.
- * <p/>
+ * <p>
  * It can be used only once via {@link #getOrTimeout(Duration, ScheduledExecutorService)}.
- * <p/>
+ * <p>
  * Synchronizer uses a gate to determine whether it was already emitted or awaiting incoming events (exceptions, successful
  * connects). Connections arriving after closing the gate are discarded.
  *
diff --git a/src/main/java/io/lettuce/core/resource/ClientResources.java b/src/main/java/io/lettuce/core/resource/ClientResources.java
index 9776d3bfa6..6697652199 100644
--- a/src/main/java/io/lettuce/core/resource/ClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/ClientResources.java
@@ -89,7 +89,7 @@ interface Builder {
          * Sets the {@link CommandLatencyCollectorOptions} that can that can be used across different instances of the
          * RedisClient. The options are only effective if no {@code commandLatencyCollector} is provided.
          *
-         * @param commandLatencyCollectorOptions the command latency collector options, must not be {@link null}.
+         * @param commandLatencyCollectorOptions the command latency collector options, must not be {@literal null}.
          * @return {@code this} {@link Builder}.
          */
         Builder commandLatencyCollectorOptions(CommandLatencyCollectorOptions commandLatencyCollectorOptions);
@@ -116,7 +116,7 @@ interface Builder {
          * Sets the {@link SocketAddressResolver} that is used to resolve {@link io.lettuce.core.RedisURI} to
          * {@link java.net.SocketAddress}. Defaults to {@link SocketAddressResolver} using the configured {@link DnsResolver}.
          *
-         * @param socketAddressResolver the socket address resolver, must not be {@link null}.
+         * @param socketAddressResolver the socket address resolver, must not be {@literal null}.
          * @return {@code this} {@link Builder}.
          * @since 5.1
          */
@@ -126,7 +126,7 @@ interface Builder {
          * Sets the {@link DnsResolver} that is used to resolve hostnames to {@link java.net.InetAddress}. Defaults to
          * {@link DnsResolvers#JVM_DEFAULT}
          *
-         * @param dnsResolver the DNS resolver, must not be {@link null}.
+         * @param dnsResolver the DNS resolver, must not be {@literal null}.
          * @return {@code this} {@link Builder}.
          * @since 4.3
          */
diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index ffbf7dadfa..7400ee3ea5 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -395,7 +395,7 @@ public Builder commandLatencyPublisherOptions(EventPublisherOptions commandLaten
          * Sets the {@link CommandLatencyCollectorOptions} that can that can be used across different instances of the
          * RedisClient. The options are only effective if no {@code commandLatencyCollector} is provided.
          *
-         * @param commandLatencyCollectorOptions the command latency collector options, must not be {@link null}.
+         * @param commandLatencyCollectorOptions the command latency collector options, must not be {@literal null}.
          * @return {@code this} {@link Builder}.
          */
         @Override
@@ -427,7 +427,7 @@ public Builder commandLatencyCollector(CommandLatencyCollector commandLatencyCol
          * Sets the {@link SocketAddressResolver} that is used to resolve {@link io.lettuce.core.RedisURI} to
          * {@link java.net.SocketAddress}. Defaults to {@link SocketAddressResolver} using the configured {@link DnsResolver}.
          *
-         * @param socketAddressResolver the socket address resolver, must not be {@link null}.
+         * @param socketAddressResolver the socket address resolver, must not be {@literal null}.
          * @return {@code this} {@link ClientResources.Builder}.
          * @since 5.1
          */
@@ -444,7 +444,7 @@ public ClientResources.Builder socketAddressResolver(SocketAddressResolver socke
          * Sets the {@link DnsResolver} that is used to resolve hostnames to {@link java.net.InetAddress}. Defaults to
          * {@link DnsResolvers#JVM_DEFAULT}
          *
-         * @param dnsResolver the DNS resolver, must not be {@link null}.
+         * @param dnsResolver the DNS resolver, must not be {@literal null}.
          * @return {@code this} {@link Builder}.
          * @since 4.3
          */
diff --git a/src/main/java/io/lettuce/core/tracing/BraveTracing.java b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
index 186bfa7339..698a0104ef 100644
--- a/src/main/java/io/lettuce/core/tracing/BraveTracing.java
+++ b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
@@ -32,7 +32,7 @@
  * {@link io.lettuce.core.tracing.Tracer.Span} to trace the actual command. A parent {@link brave.Span} is picked up for
  * imperative (synchronous/asynchronous) API usage from {@link brave.Tracing#currentTracer()}. The context is not propagated
  * across asynchronous call chains resulting from {@link java.util.concurrent.CompletionStage} chaining.
- * <p/>
+ * <p>
  * Reactive API usage leverages Reactor's {@link reactor.util.context.Context} so that subscribers can register one of the
  * following objects (using their {@link Class} as context key):
  *

From f2bf7b84b0babf2a8d26578c1758d0a2b0501070 Mon Sep 17 00:00:00 2001
From: Julien Ruaux <jruaux@users.noreply.github.com>
Date: Tue, 6 Aug 2019 17:22:35 -0700
Subject: [PATCH 660/808] Made ListSubscriber public #1103

Original pull request: #1102.
---
 src/main/java/io/lettuce/core/output/ListSubscriber.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/output/ListSubscriber.java b/src/main/java/io/lettuce/core/output/ListSubscriber.java
index f49ef48f67..2fccc56077 100644
--- a/src/main/java/io/lettuce/core/output/ListSubscriber.java
+++ b/src/main/java/io/lettuce/core/output/ListSubscriber.java
@@ -25,7 +25,7 @@
  * @author Mark Paluch
  * @since 4.2
  */
-class ListSubscriber<T> extends Subscriber<T> {
+public class ListSubscriber<T> extends Subscriber<T> {
 
     private static final ListSubscriber<Object> INSTANCE = new ListSubscriber<>();
 

From 294b378ff9133901e20242062784d4442264272a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 7 Aug 2019 08:13:40 +0200
Subject: [PATCH 661/808] Polishing #1103

Original pull request: #1102
---
 src/main/java/io/lettuce/core/output/ListSubscriber.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/output/ListSubscriber.java b/src/main/java/io/lettuce/core/output/ListSubscriber.java
index 2fccc56077..50267a6ced 100644
--- a/src/main/java/io/lettuce/core/output/ListSubscriber.java
+++ b/src/main/java/io/lettuce/core/output/ListSubscriber.java
@@ -20,9 +20,11 @@
 import io.lettuce.core.output.StreamingOutput.Subscriber;
 
 /**
- * Simple subscriber
+ * Simple subscriber feeding a {@link Collection} {@link #onNext(Collection, Object)}. Does not support {@link #onNext(Object)
+ * plain onNext}.
  *
  * @author Mark Paluch
+ * @author Julien Ruaux
  * @since 4.2
  */
 public class ListSubscriber<T> extends Subscriber<T> {

From 10bbfd98d8b7928efaf2c6221ab97be7a8064adc Mon Sep 17 00:00:00 2001
From: Dimitris Mandalidis <dimitris.mandalidis@gmail.com>
Date: Sat, 14 Sep 2019 12:24:42 +0300
Subject: [PATCH 662/808] Implement codec adapter #1122

- Supports using different codecs for keys and values

Original pull request: #1123.
---
 .../lettuce/core/codec/RedisCodecAdapter.java | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 src/main/java/io/lettuce/core/codec/RedisCodecAdapter.java

diff --git a/src/main/java/io/lettuce/core/codec/RedisCodecAdapter.java b/src/main/java/io/lettuce/core/codec/RedisCodecAdapter.java
new file mode 100644
index 0000000000..ea523b1d69
--- /dev/null
+++ b/src/main/java/io/lettuce/core/codec/RedisCodecAdapter.java
@@ -0,0 +1,71 @@
+package io.lettuce.core.codec;
+
+import java.nio.ByteBuffer;
+
+/*
+ * Copyright 2011-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * A {@link RedisCodecAdapter} combines different codecs to encode/decode key and value
+ * to the command output.
+ * 
+ * @author Dimitris Mandalidis
+ */
+public final class RedisCodecAdapter {
+
+    private RedisCodecAdapter() {}
+
+    /**
+     * Returns new {@link RedisCodec}
+     * @param <K> the type of the key
+     * @param <V> the type of the value
+     * @param keyCodec the codec to encode/decode the keys
+     * @param valueCodec the codec to encode/decode the values
+     * @return
+     */
+    public static <K, V> RedisCodec<K, V> of(RedisCodec<K, ?> keyCodec, RedisCodec<?, V> valueCodec) {
+        return new RedisCodecWrapper<K, V>(keyCodec, valueCodec);
+    }
+    
+    private static class RedisCodecWrapper<K, V> implements RedisCodec<K, V> {
+        private final RedisCodec<K, ?> keyCodec;
+        private final RedisCodec<?, V> valueCodec;
+        
+        RedisCodecWrapper(RedisCodec<K, ?> keyCodec, RedisCodec<?, V> valueCodec) {
+            this.keyCodec = keyCodec;
+            this.valueCodec = valueCodec;
+        }
+
+        @Override
+        public K decodeKey(ByteBuffer bytes) {
+            return keyCodec.decodeKey(bytes);
+        }
+
+        @Override
+        public V decodeValue(ByteBuffer bytes) {
+            return valueCodec.decodeValue(bytes);
+        }
+
+        @Override
+        public ByteBuffer encodeKey(K key) {
+            return keyCodec.encodeKey(key);
+        }
+
+        @Override
+        public ByteBuffer encodeValue(V value) {
+            return valueCodec.encodeValue(value);
+        }
+    }
+}

From 2c2615ad3898dffea05b712a74ce8c71f7f4ec5f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 19 Sep 2019 12:45:27 +0200
Subject: [PATCH 663/808] Polishing #1122
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rename wrapper type to ComposedRedisCodec. Introduce RedisCodec.of(…) factory method.

Add tests.

Original pull request: #1123.
---
 .../core/codec/ComposedRedisCodec.java        | 59 +++++++++++++++
 .../io/lettuce/core/codec/RedisCodec.java     | 16 +++++
 .../lettuce/core/codec/RedisCodecAdapter.java | 71 -------------------
 .../core/CustomCodecIntegrationTests.java     | 38 ++++++++--
 4 files changed, 106 insertions(+), 78 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/codec/ComposedRedisCodec.java
 delete mode 100644 src/main/java/io/lettuce/core/codec/RedisCodecAdapter.java

diff --git a/src/main/java/io/lettuce/core/codec/ComposedRedisCodec.java b/src/main/java/io/lettuce/core/codec/ComposedRedisCodec.java
new file mode 100644
index 0000000000..a9c61b0549
--- /dev/null
+++ b/src/main/java/io/lettuce/core/codec/ComposedRedisCodec.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.codec;
+
+import java.nio.ByteBuffer;
+
+import io.lettuce.core.internal.LettuceAssert;
+
+/**
+ * A {@link ComposedRedisCodec} combines two {@link RedisCodec cdecs} to encode/decode key and value to the command output.
+ *
+ * @author Dimitris Mandalidis
+ * @since 5.2
+ */
+class ComposedRedisCodec<K, V> implements RedisCodec<K, V> {
+
+    private final RedisCodec<K, ?> keyCodec;
+    private final RedisCodec<?, V> valueCodec;
+
+    ComposedRedisCodec(RedisCodec<K, ?> keyCodec, RedisCodec<?, V> valueCodec) {
+        LettuceAssert.notNull(keyCodec, "Key codec must not be null");
+        LettuceAssert.notNull(valueCodec, "Value codec must not be null");
+        this.keyCodec = keyCodec;
+        this.valueCodec = valueCodec;
+    }
+
+    @Override
+    public K decodeKey(ByteBuffer bytes) {
+        return keyCodec.decodeKey(bytes);
+    }
+
+    @Override
+    public V decodeValue(ByteBuffer bytes) {
+        return valueCodec.decodeValue(bytes);
+    }
+
+    @Override
+    public ByteBuffer encodeKey(K key) {
+        return keyCodec.encodeKey(key);
+    }
+
+    @Override
+    public ByteBuffer encodeValue(V value) {
+        return valueCodec.encodeValue(value);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/codec/RedisCodec.java b/src/main/java/io/lettuce/core/codec/RedisCodec.java
index d432b3eecd..46eca2193b 100644
--- a/src/main/java/io/lettuce/core/codec/RedisCodec.java
+++ b/src/main/java/io/lettuce/core/codec/RedisCodec.java
@@ -27,8 +27,24 @@
  *
  * @author Will Glozer
  * @author Mark Paluch
+ * @author Dimitris Mandalidis
  */
 public interface RedisCodec<K, V> {
+
+    /**
+     * Returns a composite {@link RedisCodec} that uses {@code keyCodec} for keys and {@code valueCodec} for values.
+     *
+     * @param <K> the type of the key
+     * @param <V> the type of the value
+     * @param keyCodec the codec to encode/decode the keys.
+     * @param valueCodec the codec to encode/decode the values.
+     * @return a composite {@link RedisCodec}.
+     * @since 5.2
+     */
+    static <K, V> RedisCodec<K, V> of(RedisCodec<K, ?> keyCodec, RedisCodec<?, V> valueCodec) {
+        return new ComposedRedisCodec<>(keyCodec, valueCodec);
+    }
+
     /**
      * Decode the key output by redis.
      *
diff --git a/src/main/java/io/lettuce/core/codec/RedisCodecAdapter.java b/src/main/java/io/lettuce/core/codec/RedisCodecAdapter.java
deleted file mode 100644
index ea523b1d69..0000000000
--- a/src/main/java/io/lettuce/core/codec/RedisCodecAdapter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package io.lettuce.core.codec;
-
-import java.nio.ByteBuffer;
-
-/*
- * Copyright 2011-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * A {@link RedisCodecAdapter} combines different codecs to encode/decode key and value
- * to the command output.
- * 
- * @author Dimitris Mandalidis
- */
-public final class RedisCodecAdapter {
-
-    private RedisCodecAdapter() {}
-
-    /**
-     * Returns new {@link RedisCodec}
-     * @param <K> the type of the key
-     * @param <V> the type of the value
-     * @param keyCodec the codec to encode/decode the keys
-     * @param valueCodec the codec to encode/decode the values
-     * @return
-     */
-    public static <K, V> RedisCodec<K, V> of(RedisCodec<K, ?> keyCodec, RedisCodec<?, V> valueCodec) {
-        return new RedisCodecWrapper<K, V>(keyCodec, valueCodec);
-    }
-    
-    private static class RedisCodecWrapper<K, V> implements RedisCodec<K, V> {
-        private final RedisCodec<K, ?> keyCodec;
-        private final RedisCodec<?, V> valueCodec;
-        
-        RedisCodecWrapper(RedisCodec<K, ?> keyCodec, RedisCodec<?, V> valueCodec) {
-            this.keyCodec = keyCodec;
-            this.valueCodec = valueCodec;
-        }
-
-        @Override
-        public K decodeKey(ByteBuffer bytes) {
-            return keyCodec.decodeKey(bytes);
-        }
-
-        @Override
-        public V decodeValue(ByteBuffer bytes) {
-            return valueCodec.decodeValue(bytes);
-        }
-
-        @Override
-        public ByteBuffer encodeKey(K key) {
-            return keyCodec.encodeKey(key);
-        }
-
-        @Override
-        public ByteBuffer encodeValue(V value) {
-            return valueCodec.encodeValue(value);
-        }
-    }
-}
diff --git a/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java b/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
index f9f445a1bb..4cbd80e7f7 100644
--- a/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
@@ -20,6 +20,7 @@
 import java.io.*;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 import javax.crypto.Cipher;
@@ -95,8 +96,10 @@ void testJavaSerializerReactive() {
 
     @Test
     void testDeflateCompressedJavaSerializer() {
-        RedisCommands<String, Object> connection = client.connect(
-                CompressionCodec.valueCompressor(new SerializedObjectCodec(), CompressionCodec.CompressionType.DEFLATE)).sync();
+        RedisCommands<String, Object> connection = client
+                .connect(
+                        CompressionCodec.valueCompressor(new SerializedObjectCodec(), CompressionCodec.CompressionType.DEFLATE))
+                .sync();
         List<String> list = list("one", "two");
         connection.set(key, list);
         assertThat(connection.get(key)).isEqualTo(list);
@@ -106,8 +109,9 @@ void testDeflateCompressedJavaSerializer() {
 
     @Test
     void testGzipompressedJavaSerializer() {
-        RedisCommands<String, Object> connection = client.connect(
-                CompressionCodec.valueCompressor(new SerializedObjectCodec(), CompressionCodec.CompressionType.GZIP)).sync();
+        RedisCommands<String, Object> connection = client
+                .connect(CompressionCodec.valueCompressor(new SerializedObjectCodec(), CompressionCodec.CompressionType.GZIP))
+                .sync();
         List<String> list = list("one", "two");
         connection.set(key, list);
         assertThat(connection.get(key)).isEqualTo(list);
@@ -118,8 +122,8 @@ void testGzipompressedJavaSerializer() {
     @Test
     void testEncryptedCodec() {
 
-        RedisCommands<String, String> connection = client.connect(
-                CipherCodec.forValues(StringCodec.UTF8, encrypt, decrypt)).sync();
+        RedisCommands<String, String> connection = client.connect(CipherCodec.forValues(StringCodec.UTF8, encrypt, decrypt))
+                .sync();
 
         connection.set(key, "foobar");
         assertThat(connection.get(key)).isEqualTo("foobar");
@@ -163,9 +167,25 @@ void testByteBufferCodec() {
         connection.getStatefulConnection().close();
     }
 
+    @Test
+    void testComposedCodec() {
+
+        RedisCodec<String, Object> composed = RedisCodec.of(StringCodec.ASCII, new SerializedObjectCodec());
+        RedisCommands<String, Object> connection = client.connect(composed).sync();
+
+        connection.set(key, new Person());
+
+        List<String> keys = connection.keys(key);
+        assertThat(keys).hasSize(1);
+
+        assertThat(connection.get(key)).isInstanceOf(Person.class);
+
+        connection.getStatefulConnection().close();
+    }
+
     class SerializedObjectCodec implements RedisCodec<String, Object> {
 
-        private Charset charset = Charset.forName("UTF-8");
+        private Charset charset = StandardCharsets.UTF_8;
 
         @Override
         public String decodeKey(ByteBuffer bytes) {
@@ -201,4 +221,8 @@ public ByteBuffer encodeValue(Object value) {
             }
         }
     }
+
+    static class Person implements Serializable {
+
+    }
 }

From c9df563794f2f6c70518a05d4c5b5668dde60918 Mon Sep 17 00:00:00 2001
From: xujs <xujs@gitlab.mamcharge.com>
Date: Wed, 18 Sep 2019 17:12:58 +0800
Subject: [PATCH 664/808] Use INFO CLIENTS for connected clients discovery in
 Redis Cluster #1126

Original pull request: #1127.
---
 .../core/cluster/topology/Connections.java    |  6 +++---
 .../cluster/topology/NodeTopologyView.java    |  8 ++++++-
 .../ClusterTopologyRefreshUnitTests.java      | 21 ++++++++++++++++++-
 .../cluster/topology/RequestsUnitTests.java   | 10 ++++-----
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/topology/Connections.java b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
index d770e2bd18..8fd5983253 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Connections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
@@ -104,7 +104,7 @@ public Requests requestTopology() {
     }
 
     /*
-     * Initiate {@code CLIENT LIST} on all connections and return the {@link Requests}.
+     * Initiate {@code INFO CLIENTS} on all connections and return the {@link Requests}.
      *
      * @return the {@link Requests}.
      */
@@ -115,8 +115,8 @@ public Requests requestClients() {
         synchronized (this.connections) {
             for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : this.connections.entrySet()) {
 
-                CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.LIST);
-                Command<String, String, String> command = new Command<>(CommandType.CLIENT,
+                CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.CLIENTS);
+                Command<String, String, String> command = new Command<>(CommandType.INFO,
                         new StatusOutput<>(StringCodec.UTF8), args);
                 TimedAsyncCommand<String, String, String> timedCommand = new TimedAsyncCommand<>(command);
 
diff --git a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
index 20b07f67c4..1f1094e7b9 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
@@ -92,7 +92,13 @@ static boolean resultAvailable(RedisFuture<?> redisFuture) {
     }
 
     private int getClients(String rawClientsOutput) {
-        return rawClientsOutput.trim().split("\\n").length;
+        String[] rows = rawClientsOutput.trim().split("\\n");
+        for(String row : rows){
+            if(row.startsWith("connected_clients")){
+                return Integer.parseInt(row.trim().split(":")[1]);
+            }
+        }
+        return 0;
     }
 
     long getLatency() {
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
index 624110d90b..1b5bcfbc16 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
@@ -121,6 +121,11 @@ void before() {
                 command.complete();
             }
 
+            if (command.getType() == CommandType.INFO) {
+                command.getOutput().set(ByteBuffer.wrap("# Clients\nconnected_clients:2\nclient_longest_output_list:0\nclient_biggest_input_buf:0\nblocked_clients:0".getBytes()));
+                command.complete();
+            }
+
             command.encodedAtNs = 10;
             command.completedAtNs = 50;
 
@@ -140,6 +145,11 @@ void before() {
                 command.complete();
             }
 
+            if (command.getType() == CommandType.INFO) {
+                command.getOutput().set(ByteBuffer.wrap("# Clients\nconnected_clients:2\nclient_longest_output_list:0\nclient_biggest_input_buf:0\nblocked_clients:0".getBytes()));
+                command.complete();
+            }
+
             command.encodedAtNs = 10;
             command.completedAtNs = 20;
 
@@ -149,6 +159,15 @@ void before() {
         sut = new ClusterTopologyRefresh(nodeConnectionFactory, clientResources);
     }
 
+    @Test
+    void getNodeTopologyView() throws Exception{
+        Requests requestedTopology = createClusterNodesRequests(1, NODE_1_VIEW);
+        Requests requestedClients = createClientListRequests(1, "# Clients\r\nconnected_clients:2438\r\nclient_longest_output_list:0\r\nclient_biggest_input_buf:0\r\nblocked_clients:0");
+        RedisURI redisURI = RedisURI.create("redis://localhost:1" );
+        NodeTopologyView nodeTopologyView = NodeTopologyView.from(redisURI, requestedTopology, requestedClients);
+        assertThat(nodeTopologyView.getConnectedClients()).isEqualTo(2438);
+    }
+
     @Test
     void getNodeSpecificViewsNode1IsFasterThanNode2() throws Exception {
 
@@ -220,7 +239,7 @@ void getNodeSpecificViewTestingNoAddrFilter() throws Exception {
                 + "n6 10.37.110.65:7000 master - 0 1452553663844 45 connected 0-3828 6788-7996 10000-10038 15000-16383";
 
         Requests clusterNodesRequests = createClusterNodesRequests(1, nodes1);
-        Requests clientRequests = createClientListRequests(1, "c1\nc2\n");
+        Requests clientRequests = createClientListRequests(1, "# Clients\r\nconnected_clients:2\r\nclient_longest_output_list:0\r\nclient_biggest_input_buf:0\r\nblocked_clients:0");
 
         NodeTopologyViews nodeSpecificViews = sut
                 .getNodeSpecificViews(clusterNodesRequests, clientRequests, COMMAND_TIMEOUT_NS);
diff --git a/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
index a6a6886f8f..a44b98d56a 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
@@ -42,17 +42,17 @@ void shouldCreateTopologyView() throws Exception {
         String clusterNodesOutput = "1 127.0.0.1:7380 master,myself - 0 1401258245007 2 disconnected 8000-11999\n";
         clusterNodesRequests.addRequest(redisURI, getCommand(clusterNodesOutput));
 
-        Requests clientListRequests = new Requests();
-        String clientListOutput = "id=2 addr=127.0.0.1:58919 fd=6 name= age=3 idle=0 flags=N db=0 sub=0 psub=0 multi=-1 qbuf=0 qbuf-free=32768 obl=0 oll=0 omem=0 events=r cmd=client\n";
-        clientListRequests.addRequest(redisURI, getCommand(clientListOutput));
+        Requests infoClientRequests = new Requests();
+        String infoClientOutput = "# Clients\r\nconnected_clients:1\r\nclient_longest_output_list:0\r\nclient_biggest_input_buf:0\r\nblocked_clients:0";
+        infoClientRequests.addRequest(redisURI, getCommand(infoClientOutput));
 
-        NodeTopologyView nodeTopologyView = NodeTopologyView.from(redisURI, clusterNodesRequests, clientListRequests);
+        NodeTopologyView nodeTopologyView = NodeTopologyView.from(redisURI, clusterNodesRequests, infoClientRequests);
 
         assertThat(nodeTopologyView.isAvailable()).isTrue();
         assertThat(nodeTopologyView.getConnectedClients()).isEqualTo(1);
         assertThat(nodeTopologyView.getPartitions()).hasSize(1);
         assertThat(nodeTopologyView.getClusterNodes()).isEqualTo(clusterNodesOutput);
-        assertThat(nodeTopologyView.getClientList()).isEqualTo(clientListOutput);
+        assertThat(nodeTopologyView.getClientList()).isEqualTo(infoClientOutput);
     }
 
     @Test

From ddfd84e1cda547f708d40435ff2c3fdf21fd6616 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 25 Sep 2019 13:59:52 +0200
Subject: [PATCH 665/808] Polishing #1126

Add author tags. Use regex to discover number of clients.

Original pull request: #1127.
---
 .../core/cluster/topology/Connections.java    | 10 ++---
 .../cluster/topology/NodeTopologyView.java    | 16 ++++---
 .../ClusterTopologyRefreshUnitTests.java      | 42 +++++++++++--------
 .../cluster/topology/RequestsUnitTests.java   | 14 +++----
 4 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/topology/Connections.java b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
index 8fd5983253..8725d1f8a0 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Connections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
@@ -31,6 +31,7 @@
 /**
  * @author Mark Paluch
  * @author Christian Weitendorf
+ * @author Xujs
  */
 class Connections {
 
@@ -91,8 +92,8 @@ public Requests requestTopology() {
             for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : this.connections.entrySet()) {
 
                 CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.NODES);
-                Command<String, String, String> command = new Command<>(CommandType.CLUSTER, new StatusOutput<>(
-                        StringCodec.UTF8), args);
+                Command<String, String, String> command = new Command<>(CommandType.CLUSTER,
+                        new StatusOutput<>(StringCodec.UTF8), args);
                 TimedAsyncCommand<String, String, String> timedCommand = new TimedAsyncCommand<>(command);
 
                 entry.getValue().dispatch(timedCommand);
@@ -115,9 +116,8 @@ public Requests requestClients() {
         synchronized (this.connections) {
             for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : this.connections.entrySet()) {
 
-                CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.CLIENTS);
-                Command<String, String, String> command = new Command<>(CommandType.INFO,
-                        new StatusOutput<>(StringCodec.UTF8), args);
+                Command<String, String, String> command = new Command<>(CommandType.INFO, new StatusOutput<>(StringCodec.UTF8),
+                        new CommandArgs<>(StringCodec.UTF8).add("CLIENTS"));
                 TimedAsyncCommand<String, String, String> timedCommand = new TimedAsyncCommand<>(command);
 
                 entry.getValue().dispatch(timedCommand);
diff --git a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
index 1f1094e7b9..1fa2cf1c30 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
@@ -16,6 +16,8 @@
 package io.lettuce.core.cluster.topology;
 
 import java.util.concurrent.ExecutionException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.RedisURI;
@@ -25,9 +27,11 @@
 
 /**
  * @author Mark Paluch
+ * @author Xujs
  */
 class NodeTopologyView {
 
+    private static final Pattern NUMBER = Pattern.compile("(\\d+)");
     private final boolean available;
     private final RedisURI redisURI;
 
@@ -39,7 +43,7 @@ class NodeTopologyView {
 
     private final String clientList;
 
-    NodeTopologyView(RedisURI redisURI) {
+    private NodeTopologyView(RedisURI redisURI) {
 
         this.available = false;
         this.redisURI = redisURI;
@@ -82,7 +86,7 @@ private static <T> T optionallyGet(TimedAsyncCommand<?, ?, T> command) throws Ex
         return command.get();
     }
 
-    static boolean resultAvailable(RedisFuture<?> redisFuture) {
+    private static boolean resultAvailable(RedisFuture<?> redisFuture) {
 
         if (redisFuture != null && redisFuture.isDone() && !redisFuture.isCancelled()) {
             return true;
@@ -93,9 +97,11 @@ static boolean resultAvailable(RedisFuture<?> redisFuture) {
 
     private int getClients(String rawClientsOutput) {
         String[] rows = rawClientsOutput.trim().split("\\n");
-        for(String row : rows){
-            if(row.startsWith("connected_clients")){
-                return Integer.parseInt(row.trim().split(":")[1]);
+        for (String row : rows) {
+
+            Matcher matcher = NUMBER.matcher(row);
+            if (matcher.find()) {
+                return Integer.parseInt(matcher.group(1));
             }
         }
         return 0;
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
index 1b5bcfbc16..79a8e63729 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
@@ -122,7 +122,9 @@ void before() {
             }
 
             if (command.getType() == CommandType.INFO) {
-                command.getOutput().set(ByteBuffer.wrap("# Clients\nconnected_clients:2\nclient_longest_output_list:0\nclient_biggest_input_buf:0\nblocked_clients:0".getBytes()));
+                command.getOutput().set(ByteBuffer.wrap(
+                        "# Clients\nconnected_clients:2\nclient_longest_output_list:0\nclient_biggest_input_buf:0\nblocked_clients:0"
+                                .getBytes()));
                 command.complete();
             }
 
@@ -146,7 +148,9 @@ void before() {
             }
 
             if (command.getType() == CommandType.INFO) {
-                command.getOutput().set(ByteBuffer.wrap("# Clients\nconnected_clients:2\nclient_longest_output_list:0\nclient_biggest_input_buf:0\nblocked_clients:0".getBytes()));
+                command.getOutput().set(ByteBuffer.wrap(
+                        "# Clients\nconnected_clients:2\nclient_longest_output_list:0\nclient_biggest_input_buf:0\nblocked_clients:0"
+                                .getBytes()));
                 command.complete();
             }
 
@@ -160,10 +164,11 @@ void before() {
     }
 
     @Test
-    void getNodeTopologyView() throws Exception{
+    void getNodeTopologyView() throws Exception {
         Requests requestedTopology = createClusterNodesRequests(1, NODE_1_VIEW);
-        Requests requestedClients = createClientListRequests(1, "# Clients\r\nconnected_clients:2438\r\nclient_longest_output_list:0\r\nclient_biggest_input_buf:0\r\nblocked_clients:0");
-        RedisURI redisURI = RedisURI.create("redis://localhost:1" );
+        Requests requestedClients = createClientListRequests(1,
+                "# Clients\r\nconnected_clients:2438\r\nclient_longest_output_list:0\r\nclient_biggest_input_buf:0\r\nblocked_clients:0");
+        RedisURI redisURI = RedisURI.create("redis://localhost:1");
         NodeTopologyView nodeTopologyView = NodeTopologyView.from(redisURI, requestedTopology, requestedClients);
         assertThat(nodeTopologyView.getConnectedClients()).isEqualTo(2438);
     }
@@ -239,10 +244,11 @@ void getNodeSpecificViewTestingNoAddrFilter() throws Exception {
                 + "n6 10.37.110.65:7000 master - 0 1452553663844 45 connected 0-3828 6788-7996 10000-10038 15000-16383";
 
         Requests clusterNodesRequests = createClusterNodesRequests(1, nodes1);
-        Requests clientRequests = createClientListRequests(1, "# Clients\r\nconnected_clients:2\r\nclient_longest_output_list:0\r\nclient_biggest_input_buf:0\r\nblocked_clients:0");
+        Requests clientRequests = createClientListRequests(1,
+                "# Clients\r\nconnected_clients:2\r\nclient_longest_output_list:0\r\nclient_biggest_input_buf:0\r\nblocked_clients:0");
 
-        NodeTopologyViews nodeSpecificViews = sut
-                .getNodeSpecificViews(clusterNodesRequests, clientRequests, COMMAND_TIMEOUT_NS);
+        NodeTopologyViews nodeSpecificViews = sut.getNodeSpecificViews(clusterNodesRequests, clientRequests,
+                COMMAND_TIMEOUT_NS);
 
         List<Partitions> values = new ArrayList<>(nodeSpecificViews.toMap().values());
 
@@ -267,8 +273,8 @@ void getNodeSpecificViewsNode2IsFasterThanNode1() throws Exception {
 
         Requests clientRequests = createClientListRequests(5, "c1\nc2\n").mergeWith(createClientListRequests(1, "c1\nc2\n"));
 
-        NodeTopologyViews nodeSpecificViews = sut
-                .getNodeSpecificViews(clusterNodesRequests, clientRequests, COMMAND_TIMEOUT_NS);
+        NodeTopologyViews nodeSpecificViews = sut.getNodeSpecificViews(clusterNodesRequests, clientRequests,
+                COMMAND_TIMEOUT_NS);
         List<Partitions> values = new ArrayList<>(nodeSpecificViews.toMap().values());
 
         assertThat(values).hasSize(2);
@@ -394,8 +400,8 @@ void undiscoveredAdditionalNodesShouldBeLastUsingClientCount() {
 
         List<RedisClusterNode> nodes = TopologyComparators.sortByClientCount(partitions);
 
-        assertThat(nodes).hasSize(2).extracting(RedisClusterNode::getUri)
-                .containsSequence(seed.get(0), RedisURI.create("127.0.0.1", 7381));
+        assertThat(nodes).hasSize(2).extracting(RedisClusterNode::getUri).containsSequence(seed.get(0),
+                RedisURI.create("127.0.0.1", 7381));
     }
 
     @Test
@@ -414,8 +420,8 @@ void discoveredAdditionalNodesShouldBeOrderedUsingClientCount() {
 
         List<RedisClusterNode> nodes = TopologyComparators.sortByClientCount(partitions);
 
-        assertThat(nodes).hasSize(2).extracting(RedisClusterNode::getUri)
-                .containsSequence(RedisURI.create("127.0.0.1", 7381), seed.get(0));
+        assertThat(nodes).hasSize(2).extracting(RedisClusterNode::getUri).containsSequence(RedisURI.create("127.0.0.1", 7381),
+                seed.get(0));
     }
 
     @Test
@@ -432,8 +438,8 @@ void undiscoveredAdditionalNodesShouldBeLastUsingLatency() {
 
         List<RedisClusterNode> nodes = TopologyComparators.sortByLatency(partitions);
 
-        assertThat(nodes).hasSize(2).extracting(RedisClusterNode::getUri)
-                .containsSequence(seed.get(0), RedisURI.create("127.0.0.1", 7381));
+        assertThat(nodes).hasSize(2).extracting(RedisClusterNode::getUri).containsSequence(seed.get(0),
+                RedisURI.create("127.0.0.1", 7381));
     }
 
     @Test
@@ -452,8 +458,8 @@ void discoveredAdditionalNodesShouldBeOrderedUsingLatency() {
 
         List<RedisClusterNode> nodes = TopologyComparators.sortByLatency(partitions);
 
-        assertThat(nodes).hasSize(2).extracting(RedisClusterNode::getUri)
-                .containsSequence(RedisURI.create("127.0.0.1", 7381), seed.get(0));
+        assertThat(nodes).hasSize(2).extracting(RedisClusterNode::getUri).containsSequence(RedisURI.create("127.0.0.1", 7381),
+                seed.get(0));
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
index a44b98d56a..4ad0da7762 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
@@ -30,6 +30,7 @@
 
 /**
  * @author Mark Paluch
+ * @author Xujs
  */
 class RequestsUnitTests {
 
@@ -43,13 +44,13 @@ void shouldCreateTopologyView() throws Exception {
         clusterNodesRequests.addRequest(redisURI, getCommand(clusterNodesOutput));
 
         Requests infoClientRequests = new Requests();
-        String infoClientOutput = "# Clients\r\nconnected_clients:1\r\nclient_longest_output_list:0\r\nclient_biggest_input_buf:0\r\nblocked_clients:0";
+        String infoClientOutput = "# Clients\r\nconnected_clients:100\r\nclient_longest_output_list:0\r\nclient_biggest_input_buf:0\r\nblocked_clients:0";
         infoClientRequests.addRequest(redisURI, getCommand(infoClientOutput));
 
         NodeTopologyView nodeTopologyView = NodeTopologyView.from(redisURI, clusterNodesRequests, infoClientRequests);
 
         assertThat(nodeTopologyView.isAvailable()).isTrue();
-        assertThat(nodeTopologyView.getConnectedClients()).isEqualTo(1);
+        assertThat(nodeTopologyView.getConnectedClients()).isEqualTo(100);
         assertThat(nodeTopologyView.getPartitions()).hasSize(1);
         assertThat(nodeTopologyView.getClusterNodes()).isEqualTo(clusterNodesOutput);
         assertThat(nodeTopologyView.getClientList()).isEqualTo(infoClientOutput);
@@ -79,8 +80,7 @@ void awaitShouldReturnAwaitedTime() throws Exception {
 
         RedisURI redisURI = RedisURI.create("localhost", 6379);
         Requests requests = new Requests();
-        Command<String, String, String> command = new Command<>(CommandType.TYPE,
-                new StatusOutput<>(new Utf8StringCodec()));
+        Command<String, String, String> command = new Command<>(CommandType.TYPE, new StatusOutput<>(new Utf8StringCodec()));
         TimedAsyncCommand timedAsyncCommand = new TimedAsyncCommand(command);
 
         requests.addRequest(redisURI, timedAsyncCommand);
@@ -93,8 +93,7 @@ void awaitShouldReturnAwaitedTimeIfNegative() throws Exception {
 
         RedisURI redisURI = RedisURI.create("localhost", 6379);
         Requests requests = new Requests();
-        Command<String, String, String> command = new Command<>(CommandType.TYPE,
-                new StatusOutput<>(new Utf8StringCodec()));
+        Command<String, String, String> command = new Command<>(CommandType.TYPE, new StatusOutput<>(new Utf8StringCodec()));
         TimedAsyncCommand timedAsyncCommand = new TimedAsyncCommand(command);
 
         requests.addRequest(redisURI, timedAsyncCommand);
@@ -104,8 +103,7 @@ void awaitShouldReturnAwaitedTimeIfNegative() throws Exception {
     }
 
     private TimedAsyncCommand getCommand(String response) {
-        Command<String, String, String> command = new Command<>(CommandType.TYPE,
-                new StatusOutput<>(new Utf8StringCodec()));
+        Command<String, String, String> command = new Command<>(CommandType.TYPE, new StatusOutput<>(new Utf8StringCodec()));
         TimedAsyncCommand timedAsyncCommand = new TimedAsyncCommand(command);
 
         command.getOutput().set(ByteBuffer.wrap(response.getBytes()));

From d1980bdb865591e8b7b3f886e74768641b14bb64 Mon Sep 17 00:00:00 2001
From: Evgeny Kharitonov <mors741@yandex-team.ru>
Date: Mon, 23 Sep 2019 23:07:58 +0300
Subject: [PATCH 666/808] Remove duplicated ConnectionWatchdog #1132

---
 src/main/java/io/lettuce/core/ConnectionBuilder.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index 1cca1697e2..c272876290 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -79,10 +79,6 @@ protected List<ChannelHandler> buildHandlers() {
         handlers.add(new CommandEncoder());
         handlers.add(commandHandlerSupplier.get());
 
-        if (clientOptions.isAutoReconnect()) {
-            handlers.add(createConnectionWatchdog());
-        }
-
         handlers.add(new ConnectionEventTrigger(connectionEvents, connection, clientResources.eventBus()));
 
         if (clientOptions.isAutoReconnect()) {

From f696bf061341df224b063916697b113346d2863b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 25 Sep 2019 14:17:54 +0200
Subject: [PATCH 667/808] Consider connect timeout in topology refresh in
 connect phase #1119

Lettuce now uses the connect timeout in addition to the command timeout when waiting for connections to become ready.
---
 .../core/cluster/RedisClusterClient.java      | 75 +++++++++----------
 .../topology/ClusterTopologyRefresh.java      | 11 +--
 .../ClusterTopologyRefreshUnitTests.java      | 25 ++++---
 3 files changed, 54 insertions(+), 57 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 621453f850..fbdcfb99c7 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -202,18 +202,18 @@ private static void assertSameOptions(Iterable<RedisURI> redisURIs) {
             }
 
             if (ssl.booleanValue() != redisURI.isSsl()) {
-                throw new IllegalArgumentException("RedisURI " + redisURI
-                        + " SSL is not consistent with the other seed URI SSL settings");
+                throw new IllegalArgumentException(
+                        "RedisURI " + redisURI + " SSL is not consistent with the other seed URI SSL settings");
             }
 
             if (startTls.booleanValue() != redisURI.isStartTls()) {
-                throw new IllegalArgumentException("RedisURI " + redisURI
-                        + " StartTLS is not consistent with the other seed URI StartTLS settings");
+                throw new IllegalArgumentException(
+                        "RedisURI " + redisURI + " StartTLS is not consistent with the other seed URI StartTLS settings");
             }
 
             if (verifyPeer.booleanValue() != redisURI.isVerifyPeer()) {
-                throw new IllegalArgumentException("RedisURI " + redisURI
-                        + " VerifyPeer is not consistent with the other seed URI VerifyPeer settings");
+                throw new IllegalArgumentException(
+                        "RedisURI " + redisURI + " VerifyPeer is not consistent with the other seed URI VerifyPeer settings");
             }
         }
     }
@@ -516,8 +516,8 @@ <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisC
      * @param <V> Value type
      * @return A new connection
      */
-    <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNodeAsync(RedisCodec<K, V> codec,
-            String nodeId, Mono<SocketAddress> socketAddressSupplier) {
+    <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNodeAsync(RedisCodec<K, V> codec, String nodeId,
+            Mono<SocketAddress> socketAddressSupplier) {
 
         assertNotNull(codec);
         assertNotEmpty(initialUris);
@@ -538,9 +538,8 @@ <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNode
                 timeout);
 
         ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectionFuture = connectStatefulAsync(connection, codec,
-                endpoint,
-                getFirstUri(), socketAddressSupplier, () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec,
-                        endpoint));
+                endpoint, getFirstUri(), socketAddressSupplier,
+                () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec, endpoint));
         return connectionFuture.whenComplete((conn, throwable) -> {
             if (throwable != null) {
                 connection.close();
@@ -591,29 +590,26 @@ private <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectCl
 
         Supplier<CommandHandler> commandHandlerSupplier = () -> new CommandHandler(clientOptions, clientResources, endpoint);
 
-        Mono<StatefulRedisClusterConnectionImpl<K, V>> connectionMono = Mono.defer(() -> connect(socketAddressSupplier,
- codec,
-                endpoint, connection, commandHandlerSupplier));
+        Mono<StatefulRedisClusterConnectionImpl<K, V>> connectionMono = Mono
+                .defer(() -> connect(socketAddressSupplier, codec, endpoint, connection, commandHandlerSupplier));
 
         for (int i = 1; i < getConnectionAttempts(); i++) {
-            connectionMono = connectionMono.onErrorResume(t -> connect(socketAddressSupplier, codec, endpoint, connection,
-                    commandHandlerSupplier));
+            connectionMono = connectionMono
+                    .onErrorResume(t -> connect(socketAddressSupplier, codec, endpoint, connection, commandHandlerSupplier));
         }
 
-        return connectionMono
-                .flatMap(c -> c.reactive().command().collectList() //
-                        .map(CommandDetailParser::parse) //
-                        .doOnNext(detail -> c.setState(new RedisState(detail))) //
-                                .doOnError(e -> c.setState(new RedisState(Collections.emptyList()))).then(Mono.just(c))
-                                .onErrorResume(RedisCommandExecutionException.class, e -> Mono.just(c)))
+        return connectionMono.flatMap(c -> c.reactive().command().collectList() //
+                .map(CommandDetailParser::parse) //
+                .doOnNext(detail -> c.setState(new RedisState(detail))) //
+                .doOnError(e -> c.setState(new RedisState(Collections.emptyList()))).then(Mono.just(c))
+                .onErrorResume(RedisCommandExecutionException.class, e -> Mono.just(c)))
                 .doOnNext(
                         c -> connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider))
                 .map(it -> (StatefulRedisClusterConnection<K, V>) it).toFuture();
     }
 
     private <T, K, V> Mono<T> connect(Mono<SocketAddress> socketAddressSupplier, RedisCodec<K, V> codec,
-            DefaultEndpoint endpoint,
-            RedisChannelHandler<K, V> connection, Supplier<CommandHandler> commandHandlerSupplier) {
+            DefaultEndpoint endpoint, RedisChannelHandler<K, V> connection, Supplier<CommandHandler> commandHandlerSupplier) {
 
         ConnectionFuture<T> future = connectStatefulAsync(connection, codec, endpoint, getFirstUri(), socketAddressSupplier,
                 commandHandlerSupplier);
@@ -665,20 +661,19 @@ private <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> con
         Supplier<CommandHandler> commandHandlerSupplier = () -> new PubSubCommandHandler<>(clientOptions, clientResources,
                 codec, endpoint);
 
-        Mono<StatefulRedisClusterPubSubConnectionImpl<K, V>> connectionMono = Mono.defer(() -> connect(socketAddressSupplier,
-                codec, endpoint, connection, commandHandlerSupplier));
+        Mono<StatefulRedisClusterPubSubConnectionImpl<K, V>> connectionMono = Mono
+                .defer(() -> connect(socketAddressSupplier, codec, endpoint, connection, commandHandlerSupplier));
 
         for (int i = 1; i < getConnectionAttempts(); i++) {
-            connectionMono = connectionMono.onErrorResume(t -> connect(socketAddressSupplier, codec, endpoint, connection,
-                    commandHandlerSupplier));
+            connectionMono = connectionMono
+                    .onErrorResume(t -> connect(socketAddressSupplier, codec, endpoint, connection, commandHandlerSupplier));
         }
 
-        return connectionMono
-                .flatMap(c -> c.reactive().command().collectList() //
-                        .map(CommandDetailParser::parse) //
-                                .doOnNext(detail -> c.setState(new RedisState(detail)))
-                                .doOnError(e -> c.setState(new RedisState(Collections.emptyList()))).then(Mono.just(c))
-                                .onErrorResume(RedisCommandExecutionException.class, e -> Mono.just(c)))
+        return connectionMono.flatMap(c -> c.reactive().command().collectList() //
+                .map(CommandDetailParser::parse) //
+                .doOnNext(detail -> c.setState(new RedisState(detail)))
+                .doOnError(e -> c.setState(new RedisState(Collections.emptyList()))).then(Mono.just(c))
+                .onErrorResume(RedisCommandExecutionException.class, e -> Mono.just(c)))
                 .doOnNext(
                         c -> connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider))
                 .map(it -> (StatefulRedisClusterPubSubConnection<K, V>) it).toFuture();
@@ -693,9 +688,8 @@ private int getConnectionAttempts() {
      * options.
      */
     private <K, V, T extends RedisChannelHandler<K, V>, S> ConnectionFuture<S> connectStatefulAsync(T connection,
-            RedisCodec<K, V> codec,
-            DefaultEndpoint endpoint, RedisURI connectionSettings, Mono<SocketAddress> socketAddressSupplier,
-            Supplier<CommandHandler> commandHandlerSupplier) {
+            RedisCodec<K, V> codec, DefaultEndpoint endpoint, RedisURI connectionSettings,
+            Mono<SocketAddress> socketAddressSupplier, Supplier<CommandHandler> commandHandlerSupplier) {
 
         ConnectionBuilder connectionBuilder = createConnectionBuilder(connection, endpoint, connectionSettings,
                 socketAddressSupplier, commandHandlerSupplier);
@@ -716,8 +710,8 @@ private <K, V, T extends RedisChannelHandler<K, V>, S> ConnectionFuture<S> conne
             sync = sync.thenCompose(channelHandler -> {
 
                 CommandArgs<K, V> args = new CommandArgs<>(codec).add(connectionSettings.getPassword());
-                AsyncCommand<K, V, String> command = new AsyncCommand<>(new Command<>(CommandType.AUTH, new StatusOutput<>(
-                        codec), args));
+                AsyncCommand<K, V, String> command = new AsyncCommand<>(
+                        new Command<>(CommandType.AUTH, new StatusOutput<>(codec), args));
 
                 if (connection instanceof StatefulRedisClusterConnectionImpl) {
                     ((StatefulRedisClusterConnectionImpl) connection).dispatch(command);
@@ -868,7 +862,8 @@ protected Partitions loadPartitions() {
 
     private Partitions doLoadPartitions(Iterable<RedisURI> topologyRefreshSource) {
 
-        Map<RedisURI, Partitions> partitions = refresh.loadViews(topologyRefreshSource, useDynamicRefreshSources());
+        Map<RedisURI, Partitions> partitions = refresh.loadViews(topologyRefreshSource,
+                getClusterClientOptions().getSocketOptions().getConnectTimeout(), useDynamicRefreshSources());
 
         if (partitions.isEmpty()) {
             throw new RedisException(getTopologyRefreshErrorMessage(topologyRefreshSource));
diff --git a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
index 95fb57e366..e0663c16d6 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.cluster.topology;
 
 import java.net.SocketAddress;
+import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -28,7 +29,7 @@
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.cluster.topology.TopologyComparators.SortAction;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.resource.ClientResources;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.internal.logging.InternalLogger;
@@ -41,7 +42,6 @@
  */
 public class ClusterTopologyRefresh {
 
-    static final Utf8StringCodec CODEC = new Utf8StringCodec();
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(ClusterTopologyRefresh.class);
 
     private final NodeConnectionFactory nodeConnectionFactory;
@@ -57,10 +57,11 @@ public ClusterTopologyRefresh(NodeConnectionFactory nodeConnectionFactory, Clien
      * an ordered list of {@link RedisClusterNode}s. The sort key is latency. Nodes with lower latency come first.
      *
      * @param seed collection of {@link RedisURI}s
+     * @param connectTimeout connect timeout
      * @param discovery {@literal true} to discover additional nodes
      * @return mapping between {@link RedisURI} and {@link Partitions}
      */
-    public Map<RedisURI, Partitions> loadViews(Iterable<RedisURI> seed, boolean discovery) {
+    public Map<RedisURI, Partitions> loadViews(Iterable<RedisURI> seed, Duration connectTimeout, boolean discovery) {
 
         if (!isEventLoopActive()) {
             return Collections.emptyMap();
@@ -70,7 +71,7 @@ public Map<RedisURI, Partitions> loadViews(Iterable<RedisURI> seed, boolean disc
 
         Connections connections = null;
         try {
-            connections = getConnections(seed).get(commandTimeoutNs, TimeUnit.NANOSECONDS);
+            connections = getConnections(seed).get(commandTimeoutNs + connectTimeout.toNanos(), TimeUnit.NANOSECONDS);
 
             if (!isEventLoopActive()) {
                 return Collections.emptyMap();
@@ -259,7 +260,7 @@ private AsyncConnections getConnections(Iterable<RedisURI> redisURIs) {
                 SocketAddress socketAddress = clientResources.socketAddressResolver().resolve(redisURI);
 
                 ConnectionFuture<StatefulRedisConnection<String, String>> connectionFuture = nodeConnectionFactory
-                        .connectToNodeAsync(CODEC, socketAddress);
+                        .connectToNodeAsync(StringCodec.UTF8, socketAddress);
 
                 CompletableFuture<StatefulRedisConnection<String, String>> sync = new CompletableFuture<>();
 
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
index 79a8e63729..71e7f699e2 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
@@ -24,6 +24,7 @@
 
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
+import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
@@ -199,7 +200,7 @@ void shouldNotRequestTopologyIfExecutorShutsDown() {
 
         List<RedisURI> seed = Arrays.asList(RedisURI.create("127.0.0.1", 7380), RedisURI.create("127.0.0.1", 7381));
 
-        sut.loadViews(seed, true);
+        sut.loadViews(seed, Duration.ofSeconds(1), true);
 
         verifyZeroInteractions(nodeConnectionFactory);
     }
@@ -294,7 +295,7 @@ void shouldAttemptToConnectOnlyOnce() {
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
                 .thenReturn(completedWithException(new RedisException("connection failed")));
 
-        sut.loadViews(seed, true);
+        sut.loadViews(seed, Duration.ofSeconds(1), true);
 
         verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380)));
         verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381)));
@@ -311,7 +312,7 @@ void shouldFailIfNoNodeConnects() {
                 .thenReturn(completedWithException(new RedisException("connection failed")));
 
         try {
-            sut.loadViews(seed, true);
+            sut.loadViews(seed, Duration.ofSeconds(1), true);
             fail("Missing RedisConnectionException");
         } catch (Exception e) {
             assertThat(e).hasMessageStartingWith("Unable to establish a connection to Redis Cluster");
@@ -332,7 +333,7 @@ void shouldShouldDiscoverNodes() {
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection2));
 
-        sut.loadViews(seed, true);
+        sut.loadViews(seed, Duration.ofSeconds(1), true);
 
         verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380)));
         verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381)));
@@ -346,7 +347,7 @@ void shouldShouldNotDiscoverNodes() {
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection1));
 
-        sut.loadViews(seed, false);
+        sut.loadViews(seed, Duration.ofSeconds(1), false);
 
         verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380)));
         verifyNoMoreInteractions(nodeConnectionFactory);
@@ -364,7 +365,7 @@ void shouldNotFailOnDuplicateSeedNodes() {
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection2));
 
-        sut.loadViews(seed, true);
+        sut.loadViews(seed, Duration.ofSeconds(1), true);
 
         verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380)));
         verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381)));
@@ -380,7 +381,7 @@ void shouldCloseConnections() {
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection2));
 
-        sut.loadViews(seed, true);
+        sut.loadViews(seed, Duration.ofSeconds(1), true);
 
         verify(connection1).closeAsync();
         verify(connection2).closeAsync();
@@ -394,7 +395,7 @@ void undiscoveredAdditionalNodesShouldBeLastUsingClientCount() {
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection1));
 
-        Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, false);
+        Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, Duration.ofSeconds(1), false);
 
         Partitions partitions = partitionsMap.values().iterator().next();
 
@@ -414,7 +415,7 @@ void discoveredAdditionalNodesShouldBeOrderedUsingClientCount() {
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection2));
 
-        Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, true);
+        Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, Duration.ofSeconds(1), true);
 
         Partitions partitions = partitionsMap.values().iterator().next();
 
@@ -432,7 +433,7 @@ void undiscoveredAdditionalNodesShouldBeLastUsingLatency() {
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection1));
 
-        Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, false);
+        Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, Duration.ofSeconds(1), false);
 
         Partitions partitions = partitionsMap.values().iterator().next();
 
@@ -452,7 +453,7 @@ void discoveredAdditionalNodesShouldBeOrderedUsingLatency() {
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection2));
 
-        Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, true);
+        Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, Duration.ofSeconds(1), true);
 
         Partitions partitions = partitionsMap.values().iterator().next();
 
@@ -495,7 +496,7 @@ void shouldPropagateCommandFailures() {
             return command;
         });
 
-        assertThatThrownBy(() -> sut.loadViews(seed, true)).isInstanceOf(RedisException.class)
+        assertThatThrownBy(() -> sut.loadViews(seed, Duration.ofSeconds(1), true)).isInstanceOf(RedisException.class)
                 .hasRootCauseInstanceOf(RedisException.class).hasSuppressedException(nestedException);
     }
 

From 98e88ad1d24e5d52addfcd23a7e1db707cb3c372 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 25 Sep 2019 14:19:49 +0200
Subject: [PATCH 668/808] Upgrade to Reactor Core 3.3 #1030

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7dd296a445..733540c683 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
         <log4j2-version>2.11.2</log4j2-version>
         <mockito.version>3.0.0</mockito.version>
         <netty-version>4.1.38.Final</netty-version>
-        <reactor-version>3.2.11.RELEASE</reactor-version>
+        <reactor-version>3.3.0.RELEASE</reactor-version>
         <reactive-streams-tck.version>1.0.0</reactive-streams-tck.version>
         <slf4j.version>1.7.25</slf4j.version>
         <spring-version>4.3.20.RELEASE</spring-version>

From 41425edd2c2537bd39bf05c189c914163b945495 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 25 Sep 2019 14:23:54 +0200
Subject: [PATCH 669/808] Upgrade to netty 4.1.42.Final #1131

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 733540c683..68ee82ee3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <junit-version>5.5.1</junit-version>
         <log4j2-version>2.11.2</log4j2-version>
         <mockito.version>3.0.0</mockito.version>
-        <netty-version>4.1.38.Final</netty-version>
+        <netty-version>4.1.42.Final</netty-version>
         <reactor-version>3.3.0.RELEASE</reactor-version>
         <reactive-streams-tck.version>1.0.0</reactive-streams-tck.version>
         <slf4j.version>1.7.25</slf4j.version>

From ecf1cf6c7df94a222612021e918abdcfeffb9634 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 25 Sep 2019 15:25:27 +0200
Subject: [PATCH 670/808] Add default manifest entries and automatic module
 name #1135

---
 pom.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pom.xml b/pom.xml
index 68ee82ee3e..1b3c1035b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -483,6 +483,12 @@
                     <version>3.8.1</version>
                 </plugin>
 
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.1.2</version>
+                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-gpg-plugin</artifactId>
@@ -574,6 +580,22 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                        <manifestEntries>
+                            <Automatic-Module-Name>lettuce.core</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

From 1614b8e96f6aff552f3429914db0e1822992e9fc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Sep 2019 09:49:52 +0200
Subject: [PATCH 671/808] Upgrade to Brave 5.7.0 #1136

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1b3c1035b4..d14559e144 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <assertj-core.version>3.12.1</assertj-core.version>
-        <brave-version>5.6.9</brave-version>
+        <brave-version>5.7.0</brave-version>
         <junit-version>5.5.1</junit-version>
         <log4j2-version>2.11.2</log4j2-version>
         <mockito.version>3.0.0</mockito.version>

From b027811fd69708db1c065a308896012ae6f05eec Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Sep 2019 09:50:42 +0200
Subject: [PATCH 672/808] Dependency upgrades #1136

---
 pom.xml                                                       | 4 ++--
 .../io/lettuce/core/cluster/RedisStateIntegrationTests.java   | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index d14559e144..dbd0a1a6ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,9 +59,9 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <assertj-core.version>3.12.1</assertj-core.version>
+        <assertj-core.version>3.13.2</assertj-core.version>
         <brave-version>5.7.0</brave-version>
-        <junit-version>5.5.1</junit-version>
+        <junit-version>5.5.2</junit-version>
         <log4j2-version>2.11.2</log4j2-version>
         <mockito.version>3.0.0</mockito.version>
         <netty-version>4.1.42.Final</netty-version>
diff --git a/src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java
index ad749d3bcb..302415441b 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java
@@ -17,7 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.Collection;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -52,9 +51,6 @@ void shouldDiscoverCommands() {
         List<CommandDetail> commandDetails = CommandDetailParser.parse(redis.command());
         RedisState state = new RedisState(commandDetails);
 
-        assertThat(state).extracting("availableCommands").flatExtracting(it -> (Collection<Object>) it)
-                .contains(CommandType.GEOADD).doesNotContain(UnknownCommand.FOO);
-
         assertThat(state.hasCommand(CommandType.GEOADD)).isTrue();
         assertThat(state.hasCommand(UnknownCommand.FOO)).isFalse();
     }

From c3c1020cfff15a7623005bb40c87c4e870f15019 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Sep 2019 10:44:05 +0200
Subject: [PATCH 673/808] Update changelog #1138

---
 RELEASE-NOTES.md                              | 463 ++++++------------
 .../io/lettuce/core/codec/CipherCodec.java    |  21 +-
 src/main/resources/META-INF/NOTICE            |   2 +-
 3 files changed, 176 insertions(+), 310 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 3d6277344d..76d6348026 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,350 +1,209 @@
-Lettuce 5.1.0 RELEASE NOTES
+Lettuce 5.2.0 RELEASE NOTES
 ===========================
 
-The Lettuce team is pleased to announce the Lettuce 5.1.0 release! 
-This release contains new features, bugfixes, and enhancements.
+The Lettuce team is pleased to announce the Lettuce 5.2.0 release! 
+This release contains new features, bug fixes, and enhancements.
  
 Most notable changes are:
 
-* Support for Redis Streams
-* Asynchronous pool implementation
-* `SCAN` streams, and initial 
-* Global command timeouts (disabled by default)
-* Asynchronous connect methods for Master/Replica and Sentinel
-* Brave (OpenZipkin) tracing support
-* Lettuce build is now Java 11 compatible
+* Sentinel refinements
+* Node randomization when reading from Redis Cluster nodes
+* Codec enhancements
+* Migrated tests to JUnit 5
 
-We started efforts to adapt improvements in Redis terminology about Master/Replica 
-with this release. This release ships documentation changes referring to the 
-existing API as Master/Replica where possible.
+Find the full changelog at the end of this document that lists all 110 tickets.
+Work for Lettuce 6, the next major release has already started. Lettuce 6 will support RESP3 and should ship in time for Redis 6.
 
-We will introduce with the upcoming releases support for the new API methods 
-(`REPLICAOF`) without breaking the public API. Expect breaking changes in a much 
-later release which gives plenty of time to upgrade. 
-
-Find the full change log at the end of this document that lists all 108 tickets.
-
-Thanks to all contributors who made Lettuce 5.1.0.RELEASE possible.
-
-Lettuce requires a minimum of Java 8 to build and run and is compatible with Java 11. It is tested continuously against the latest Redis source-build.
+Thanks to all contributors who made Lettuce 5.2.0.RELEASE possible.
+Lettuce requires a minimum of Java 8 to build and run and is compatible with Java 13. It is tested continuously against the latest Redis source-build.
 
 If you need any support, meet Lettuce at
 
-* Google Group (General discussion, announcements and releases): https://groups.google.com/d/forum/lettuce-redis-client-users
+* Google Group (General discussion, announcements, and releases): https://groups.google.com/d/forum/lettuce-redis-client-users
 or lettuce-redis-client-users@googlegroups.com
 * Stack Overflow (Questions): https://stackoverflow.com/questions/tagged/lettuce
 * Join the chat at https://gitter.im/lettuce-io/Lobby for general discussion
 * GitHub Issues (Bug reports, feature requests): https://github.com/lettuce-io/lettuce-core/issues
-* Documentation: https://lettuce.io/core/5.1.0.RELEASE/reference/
-* Javadoc: https://lettuce.io/core/5.1.0.RELEASE/api/
-
+* Documentation: https://lettuce.io/core/5.2.0.RELEASE/reference/
+* Javadoc: https://lettuce.io/core/5.2.0.RELEASE/api/
 
-New Exceptions for Redis Responses
+Sentinel refinements
 ----------------------------------
 
-This release introduces new Exception types for the following Redis responses:
-
-* `LOADING`: `RedisLoadingException`
-* `NOSCRIPT`: `RedisNoScriptException`
-* `BUSY`: `RedisBusyException`
-
-All exception types derive from `RedisCommandExecutionException` and do not 
-require changes in application code.
-
-
-Redis Streams
------------------------
-Redis 5.0 is going to ship with support for a Stream data structure. 
-A stream is a log of events that can be consumed sequentially. A Stream 
-message consists of an id and a body represented as hash (or `Map<K, V>`).
-
-Lettuce provides access to Stream commands through `RedisStreamCommands` supporting
-synchronous, asynchronous, and reactive execution models. All Stream commands
-are prefixed with `X` (`XADD`, `XREAD`, `XRANGE`).
-
-Stream messages are required to be polled. Polling can return either in a non-blocking
-way without a message if no message is available, or, in a blocking way.
-`XREAD` allows to specify a blocking duration in which the connection is blocked
-until either the timeout is exceeded or a Stream message arrives.
-
-The following example shows how to append and read messages from a Redis Stream:
-
-```java
-// Append a message to the stream
-String messageId = redis.xadd("my-stream", Collections.singletonMap("key", "value"));
-
-// Read a message
-List<StreamMessage<String, String>> messages = redis.xread(StreamOffset.from("my-stream", messageId));
-
-
-redis.xadd("my-stream", Collections.singletonMap("key", "value"));
-
-// Blocking read
-List<StreamMessage<String, String>> messages = redis.xread(XReadArgs.Builder.block(Duration.ofSeconds(2)), 
-                                                           StreamOffset.latest("my-stream"));
-```
-
-Redis Streams support the notion of consumer groups. A consumer group is a group of 
-one or more consumers that tracks the last consumed Stream message and allows 
-explicit acknowledgment of consumed messages. 
-
-```java
-// Setup stream, see https://github.com/antirez/redis/issues/4824
-redis.xadd("my-stream", Collections.singletonMap("key", "value"));
-
-// Create consumer group
-redis.xgroupCreate("my-stream", "my-group", "$");
-redis.xadd("my-stream", Collections.singletonMap("key", "value"));
-
-// Read stream messages in the context of a consumer
-List<StreamMessage<String, String>> messages = redis.xreadgroup(Consumer.from("my-stream", "consumer1"),
-                XReadArgs.Builder.noack(),
-                StreamOffset.lastConsumed(key));
-
-// process message
-
-…
+Since this release, Lettuce can connect to Redis Sentinel using secure sockets (SSL) and can authenticate against Sentinel using passwords.
+To use SSL, enable SSL usage on `RedisURI` the same way how it's done for Redis Standalone and Redis Cluster.
+Lettuce also introduced a new protocol scheme with `rediss-sentinel://`. Please note that enabling SSL enables encryption for both, Sentinel and data node communication.
 
-// Acknowledge message
-redis.xack(key, "group", messages.get(0).getId());
-```
-
-Scan Stream
------------
+Password authentication follows the same pattern. Setting a password on a Sentinel `RedisURI` enables password authentication for Sentinel and data nodes.
 
-Lettuce 5.1 ships with a reactive `SCAN` stream API that allows reactive and
-demand-aware usage of Redis' `SCAN` commands. `SCAN` is an interator-based command
-that requires multiple round-trips to Redis to scan the keyspace or 
-a particular data structure. Instead of calling `SCAN` from your application code, 
-you can use `ScanStream` as entrypoint to `SCAN`, `HSCAN`, `SSCAN`, and `ZSCAN` operations.
-`ScanStream` returns a `Flux` that can be consumed as a single stream without
-the need of continuing the actual iteration. That's covered by Lettuce for you.
-
-The `LIMIT` argument controls the batchsize. Demand (backpressure) is translated
-into cursor call. If you stop consuming the stream, no further `SCAN` calls are issued.
- 
-```java
-RedisReactiveCommands<String, String> reactive = redis.getStatefulConnection().reactive();
-
-Flux<String> keys = ScanStream.scan(reactive, ScanArgs.Builder.limit(200));
-```
+Read from random Redis Cluster node
+----------------------------------
 
-Asynchronous non-blocking Connection Pooling
---------------------------------------------
+Redis Cluster supports now node randomization to avoid excessive usage of individual nodes when reading from these. 
+`ReadFrom` now exposes a `isOrderSensitive()` method to indicate whether a `ReadFrom` setting is order-sensitive or whether respecting order isn't required.
+Custom `ReadFrom` implementations should consider this change. 
+`ReadFrom.ANY` is a newly introduced setting that allows reading from any node (master or a qualified replica) without an ordering preference if multiple replicas qualify for reading.
 
-Right now, applications that utilize connection pooling in combination with a 
-non-blocking API (asynchronous or reactive API users) are limited to Apache Commons Pool
-which is a blocking object pool implementation.
+Codec enhancements
+-----------------
 
-This release ships with non-blocking pooling support through `AsyncPool` that
-is obtained from `AsyncConnectionPoolSupport`. The pooling API allows for various
-implementations. As of Lettuce 5.1, a bounded pool is provided that allows 
-limiting and that signals pool exhaustion by emitting `NoSuchElementException`.
+As of this release, we ship two notable enhancements for codecs:
 
-The pooling API returns `CompletableFuture` instances to synchronize acquire and 
-release operations. `AsyncPool` does not require external dependencies and features
-an improved performance profile in comparison to Apache Commons Pool 2. 
-This non-blocking pooling API is not a replacement for the blocking pool 
-although it's possible that may provide a blocking layer that exports 
-the pooling functionality through `org.apache.commons.pool2.ObjectPool`. 
+* `CipherCodec` for transparent encryption and decryption of values.
+* Codec composition through `RedisCodec.of(…)` to set up a composed codec from a key and a value codec.
 
-The following example show how to use `AsyncPool`. 
+`CipherCodec` is created by using a delegate codec and `CipherSupplier` for encryption and decryption. Values are encoded first and then encrypted before values are written to Redis.
 
 ```java
-AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
-        () -> client.connectAsync(StringCodec.UTF8, uri),
-        BoundedPoolConfig.builder()
-                    .minIdle(4)
-                    .maxIdle(8)
-                    .maxTotal(16)
-                    .testOnAcquire()
-                    .build());
-
-// Acquire connection and do some work
-CompletableFuture<StatefulRedisConnection<String, String>> acquire = pool.acquire();
+SecretKeySpec key = …;
+CipherCodec.CipherSupplier encrypt = new CipherCodec.CipherSupplier() {
+    @Override
+    public Cipher get(CipherCodec.KeyDescriptor keyDescriptor) throws GeneralSecurityException {
 
-acquire.thenAccept(connection -> {
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        cipher.init(Cipher.DECRYPT_MODE, key);
+        return cipher;
+    }
+};
 
-    connection.async().set("key", "value").whenComplete((v, e) -> {
-        pool.release(connection);
-    });
-});
+CipherCodec.CipherSupplier decrypt = (CipherCodec.KeyDescriptor keyDescriptor) -> {
 
+    Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+    cipher.init(Cipher.DECRYPT_MODE, key);
+    return cipher;
+};
 
-// later
-CompletableFuture<Void> closeFuture = pool.closeAsync();
+RedisCodec<String, String> crypto = CipherCodec.forValues(StringCodec.UTF8, encrypt, decrypt);
 ```
 
-Global Command Timeouts
------------------------
-
-Lettuce can be used through various APIs. The most common one is the
-synchronous API which emulates blocking behavior on top of a reactive 
-and non-blocking driver. A natural aspect of blocking APIs are timeouts
-when it comes to I/O. Using the asynchronous or reactive API do not have
-timeouts as there was no active component that tracked command runtime durations.
+`CipherCodec` supports multiple keys to increment key versions and to decrypt values with older key versions. The code above is to illustrate how to construct `CipherCodec` and does not guarantee to outline a secure `Cipher` setup that meets your requirements.
 
-With Lettuce 5.1, you get the possibility to configure a global command timeout
-through `ClientOptions` and `TimeoutOptions` that can determine timeouts
-on a `RedisCommand` basis. This timeout applies on a command basis
-and completes commands with `RedisCommandTimeoutException`.  
-
-You can change the timeout on running connections through `RedisURI.setTimeout(…)`, 
-`RedisClient.setDefaultTimeout(…)`, and `StatefulConnection.setTimeout(…)` if
-`TimeoutOptions` are enabled - global command timeouts are disabled by default. 
+With `RedisCodec.of(…)`, applications can quickly compose a `RedisCodec` of already existing codecs instead of writing an entire codec from scratch. Codec composition is useful to use different codecs for key and value encoding:
 
 ```java
-TimeoutOptions timeoutOptions = TimeoutOptions.enabled(Duration.ofMinutes(1));
-
-ClientOptions.builder().timeoutOptions(timeoutOptions).build();
+RedisCodec<String, byte[]> composed = RedisCodec.of(StringCodec.ASCII, ByteArrayCodec.INSTANCE);
 ```
 
-Add tracing support using Brave (OpenZipkin)
---------------------------------------------
-
-Lettuce now supports command tracing using Brave. 
-Tracing can be configured through `ClientResources`. The parent span is propagated either 
-through `Tracing.currentTracer()` (synchronous/asynchronous usage) or 
-by registering a Brave Span in the Reactor context when using Reactive execution.
-
-Lettuce wraps Brave data models to support tracing in a vendor-agnostic way if 
-Brave is on the class path.
-
-Usage example:
-
-```java
-Tracing tracing = …;
-
-ClientResources clientResources = ClientResources.builder().tracing(BraveTracing.create(tracing)).build();
-
-RedisClient client = RedisClient.create(clientResources, redisUri);
-
-StatefulRedisConnection<String, String> connection = client.connect();
-
-connection.sync().get(…) // Tracing tries to obtain the current tracer from Tracing.currentTracer()
-
-connection.reactive().get(…) // Tracing tries to obtain the current tracer from Reactor's Context
-```
-
-A note on reactive Tracing: Reactive Tracing with Brave requires either a Span or a 
-TraceContext object to be available in Reactor's Context.
+Read more on Codecs at: https://github.com/lettuce-io/lettuce-core/wiki/Codecs
 
 Commands
---------
-* Add AUTH option to MIGRATE command #733
-* Add MASTER type to KillArgs #760
-* Add support for ZPOPMIN, ZPOPMAX, BZPOPMIN, BZPOPMAX commands #778
-* Add REPLACE option to RESTORE. #783 (Thanks to @christophstrobl)
-* Add XGROUP DESTROY #789
-* Add support for CLIENT UNBLOCK #812
-* Support for approximate trimming in XAddArgs #846
+------------
+* Add support for "MEMORY USAGE key [SAMPLES count]" #853 (Thanks to @darkaquarius)
+* Add support for XINFO #996 (Thanks to @Erzhoumu)
+* Add support for XGROUP CREATE … MKSTREAM #898 (Thanks to @wenerme)
 
 Enhancements
 ------------
-* Support for command timeouts (async, reactive) #435
-* Use object pooling for collections inside a single method and Command/CommandArgs with a small scope #459
-* Cancel commands after disconnect in at-most-once mode. #547
-* Add support for Redis streams #606
-* Introduce dedicated exceptions for NOSCRIPT and BUSY responses #620 (Thanks to @DaichiUeura)
-* Non-blocking connection pooling #631
-* Introduce fast-path publishing in RedisPublisher #637
-* Add reactive scanning #638
-* Asynchronous connection initialization #640
-* Create reusable abstraction for non-blocking and keyed connection provider #642
-* Expose asynchronous connect method for Master/Slave connections #643
-* Add SocketAddressOutput to directly parse SENTINEL get-master-addr-by-name output #644
-* Misleading wasRolledBack method #662 (Thanks to @graineri)
-* Read from random slave preferred #676 (Thanks to @petetanton)
-* Introduce exception to represent Redis LOADING response #682
-* Do not fail if COMMAND command fails on startup #685 (Thanks to @pujian1984)
-* Consider adding host/port mapper #689
-* CommandHandler.write() is O(N^2) #709 (Thanks to @gszpak)
-* Cluster topology lookup should not replaces self-node details with host and port from RedisURI when RedisURI is load balancer #712 (Thanks to @warrenzhu25)
-* Optimize Partitions/RedisClusterNode representation #715
-* Unnecessary copying of byteBuf in CommandHandler.decode() #725 (Thanks to @gszpak)
-* Add unknown node as trigger for adaptive refresh #732
-* Add tracing support using Brave (OpenZipkin) #782
-* Improve builders and resources with Java 8 default/static interface methods #791
-* ZSCAN match pattern encoding issue #792 (Thanks to @silvertype)
-* Accept brave.Tracing instead of brave.Tracer #798
-* Bind Master/Slave transactional commands to Master during an ongoing transaction #800
-* FutureSyncInvocationHandler the statement "command.get ()" in the handlerInvocation method is unnecessary #809 (Thanks to @zhangweidavid)
-* Fall back to initial seed nodes on topology refresh when dynamicRefreshSources is enabled #822 (Thanks to @stuartharper)
-* Assert Java 11 build compatibility #841
+* Make adaptive topology refresh better usable for failover/master-slave promotion changes #672 (Thanks to @mudasirale)
+* Allow randomization of read candidates using Redis Cluster #834 (Thanks to @nborole)
+* AsyncExecutions should implement CompletionStage #862
+* BraveTracing should support custom names for the service name #865 (Thanks to @worldtiki)
+* Emit Connection Error events #885 (Thanks to @squishypenguin)
+* Allow usage of publishOn scheduler for reactive signal emission #905
+* Optimize aggregation buffer cleanup in CommandHandler #906 (Thanks to @gavincook)
+* Add shutdown logging to client, ClientResources, and EventLoopGroupProvider #918
+* Add flag to disable reporting of span tags #920 (Thanks to @worldtiki)
+* Optimization: Use Cluster write connections for read commands when using ReadFrom.MASTER #923
+* ByteBuf.release() was not called before it's garbage-collected #930 (Thanks to @zhouzq)
+* Add cipher codec #934
+* Introduce adaptive trigger event #952
+* Deprecate PING on connect option #965
+* Do not require CLIENT LIST in cluster topology refresh #973 (Thanks to @bentharage)
+* Add support for Redis Sentinel authentication #1002 (Thanks to @ssouris)
+* Improve mutators for ClientOptions, ClusterClientOptions, and ClientResources #1003
+* TopologyComparators performance issue #1011 (Thanks to @alessandrosimi-sa)
+* Attach topology retrieval exceptions when Lettuce cannot retrieve a topology update #1024 (Thanks to @StillerRen)
+* Support TLS connections in Sentinel mode #1048 (Thanks to @ae6rt)
+* Reduce object allocations for assertions #1068
+* Reduce object allocations for Cluster topology parsing #1069
+* Support ByteArrayCodec only for values #1122 (Thanks to @dmandalidis)
+* lettuce#ClusterTopologyRefresh is too slow，because of “client list” #1126 (Thanks to @xjs1919)
 
 Fixes
 -----
-* PING responses are not decoded properly if Pub/Sub connection is subscribed #579
-* Lettuce doesn't fail early & cleanly with a host in protected mode #608 (Thanks to @exercitussolus)
-* CommandHandler.rebuildQueue() causes long locks #615 (Thanks to @nikolayspb)
-* Request queue size is not cleared on reconnect #616 (Thanks to @nikolayspb)
-* BITPOS should allow to just specify start. #623 (Thanks to @christophstrobl)
-* HMGET proxy not working as expected #627 (Thanks to @moores-expedia)
-* Consider binary arguments using command interfaces as keys using binary codecs #628
-* Command.isDone() not consistent with CompletableFuture.isDone() #629
-* Race condition in RedisPublisher DEMAND.request() and DEMAND.onDataAvailable() #634 (Thanks to @mayamoon)
-* RedisPublisher.request(-1) does not fail #635
-* Capture subscription state before logging in RedisPublisher #636
-* Provide Javadoc path for Project Reactor #641
-* Debug logging of ConnectionWatchdog has wrong prefix after reconnect. #645 (Thanks to @mlex)
-* Cannot close connection when refreshing topology #656 (Thanks to @dangtranhoang)
-* Weights param should be ignored if it is empty #657 (Thanks to @garfeildma)
-* MasterSlave getNodeSpecificViews NPE with sync API #659 (Thanks to @boughtonp)
-* RandomServerHandler can respond zero bytes #660
-* ConcurrentModificationException when connecting a RedisClusterClient #663 (Thanks to @blahblahasdf)
-* Switch RedisSubscription.subscriber to volatile #664
-* Recovered Sentinels in Master/Slave not reconnected #668
-* Handling dead Sentinel slaves #669 (Thanks to @vleushin)
-* Move SocketAddressResolver resolution back to calling thread #670
-* Support SLAVE_PREFERRED at valueOf method #671 (Thanks to @be-hase)
-* RedisCommandTimeoutException after two subsequent MULTI calls without executing the transaction #673 (Thanks to @destitutus)
-* Fix ConnectionWatchDog won't reconnect problem in edge case #679 (Thanks to @kojilin)
-* At least once mode keeps requeueing commands on non-recoverable errors #680 (Thanks to @mrvisser)
-* Retain ssl/tls config from seed uris in Master/Slave context #684 (Thanks to @acmcelwee)
-* NOAUTH after full queue and reconnect #691
-* RedisURI.create("localhost") causes NPE #694
-* Async connect methods report original cause #708
-* Mono returned by RedisPubSubReactiveCommands#subscribe does not return result #717 (Thanks to @ywtsang)
-* RuntimeExceptions thrown by implementations of RedisCodec do not fail TransactionCommands #719 (Thanks to @blahblahasdf)
-* Connection Leak in Cluster Topology Refresh #721 (Thanks to @cweitend)
-* Ensure Master/Slave topology refresh connections are closed #723
-* RedisPubSubAdapter.message() being called with wrong channel #724 (Thanks to @adimarco)
-* Batched commands may time out although data was received #729
-* DefaultEndpoint future listener recycle lose command context on requeue failures #734 (Thanks to @gszpak)
-* AsyncPool, AsyncConnectionPoolSupport are nowhere to be found #739 (Thanks to @fabienrenaud)
-* firstResponseLatency is always negative #740 (Thanks to @nickvollmar)
-* EXEC does not fail on EXECABORT #743 (Thanks to @dmandalidis)
-* Warning when refreshing topology #756 (Thanks to @theliro)
-* DefaultEndpoint.QUEUE_SIZE becomes out of sync, preventing command queueing #764 (Thanks to @nivekastoreth)
-* DefaultEndpoint contains System.out.println(…) #765
-* Do not retry completed commands through RetryListener #767
-* MULTI is dispatched to slave nodes using SLAVE readFrom #779 (Thanks to @Yipei)
-* Reduce service name in BraveTracing to just Redis #797
-* Javadoc mentions Delay.exponential() is capped at 30 milliseconds #799 (Thanks to @phxql)
-* Read From Slaves is not working #804 (Thanks to @EXPEbdodla)
-* GEORADIUS WITHCOORD returns wrong coordinate on multiple results #805 (Thanks to @dittos)
-* RedisClusterCommands does not extend RedisStreamCommands #821
-* smembers returns elements in non-deterministic order #823 (Thanks to @alezandr)
-* StackOverflowError on ScanStream.scan(…).subscribe() #824
-* ZINCRBY member should be value-typed #826 (Thanks to @fuyuanpai)
-* Lua script execution containing non-ascii characters fails #844 (Thanks to @wenzuowei110)
-* RedisState fails to resolve CommandType for known commands #851
+* Unable to reconnect Pub/Sub connection with authorization #868 (Thanks to @maestroua)
+* Reduce allocations in topology comparator #870
+* Fix recordCommandLatency to work properly #874 (Thanks to @jongyeol)
+* Bug: Include hostPortString in the error message #876 (Thanks to @LarryBattle)
+* Reference docs CSS prevents HTTPS usage #878
+* ReactiveCommandSegmentCommandFactory resolves StreamingOutput for all reactive types #879 (Thanks to @yozhag)
+* ClassCastException occurs when executing RedisClusterClient::connectPubSub with global timeout feature #895 (Thanks to @be-hase)
+* Flux that reads from a hash, processes elements and writes to a set, completes prematurely #897 (Thanks to @vkurland)
+* Fixed stackoverflow exception inside CommandLatencyCollectorOptions #899 (Thanks to @LarryBattle)
+* PubSubEndpoint.channels and patterns contain duplicate binary channel/pattern names #911 (Thanks to @lwiddershoven)
+* DefaultCommandMethodVerifier reports invalid parameter count #925 (Thanks to @GhaziTriki)
+* Chunked Pub/Sub message receive with interleaved command responses leaves commands uncompleted #936 (Thanks to @GavinTianYang)
+* Fix typo in log message #970 (Thanks to @twz123)
+* Result is lost when published on another executor #986 (Thanks to @trueinsider)
+* Cancel ClusterTopologyRefreshTask in RedisClusterClient.shutdownAsync() #989 (Thanks to @johnsiu)
+* ClassCastException occurs when using RedisCluster with custom-command-interface and Async API #994 (Thanks to @tamanugi)
+* Application-level exceptions in Pub/Sub notifications mess up pub sub decoding state and cause timeouts #997 (Thanks to @giridharkannan)
+* RedisClient.shutdown hangs because event loops terminate before connections are closed #998 (Thanks to @Poorva17)
+* "Knowing Redis" section in documentation has the wrong link for meanings.  #1050 (Thanks to @Raghaava)
+* ClassCastException occurs when using RedisCommandFactory with custom commands #1075 (Thanks to @mdebellefeuille)
+* EventLoop thread blocked by EmitterProcessor.onNext(…) causes timeouts #1086 (Thanks to @trishaarao79)
+* RedisClusterNode without slots is never considered having same slots as an equal object #1089 (Thanks to @y2klyf)
+* RedisClusterClient doesn't respect the SocketOptions connectTimeout #1119 (Thanks to @magnusandy)
+* Remove duplicated ConnectionWatchdog #1132 (Thanks to @mors741)
 
 Other
 -----
-* Upgrade to HdrHistogram 2.1.10 #653
-* Upgrade Redis versions on TravisCI #655
-* Upgrade to Log4j 2.11.0 #749
-* Extend documentation for argument objects #761
-* Upgrade to JavaParser 3.6.3 #769
-* Update What's new for Lettuce 5.1 in reference docs #777
-* Improve Javadoc of QUIT method #781
-* Upgrade to netty 4.1.29.Final #836
-* Upgrade to Reactor Bismuth-SR11 #838
-* Upgrade to Brave 5.2.0 #839
-* Upgrade to RxJava 2.2.2 #840
-* Upgrade to Commons Pool 2.6 #854
-* Upgrade to Mockito 2.22 #855
-* Upgrade to commons-lang3 3.8 #857
-* Upgrade to Spring Framework 4.3.19 #858
-* Upgrade to Reactor Californium #859
+* Migrate tests to JUnit 5 #430
+* Could not generate CGLIB subclass of class io.lettuce.core.support.ConnectionPoolSupport$1 #843 (Thanks to @peerit12)
+* Adapt to changed terminology for master/replica #845
+* Ability to provide a custom service name for spans #866 (Thanks to @worldtiki)
+* Remove tempusfugit dependency #871
+* Makefile refactor download redis #877 (Thanks to @LarryBattle)
+* Upgrade to Reactor Californium SR1 #883
+* Upgrade to Redis 5 GA #893
+* Document MasterSlave connection behavior on partial node failures #894 (Thanks to @jocull)
+* Upgrade to RxJava 2.2.3 #901
+* Upgrade to Spring Framework 4.3.20.RELEASE #902
+* Upgrade to netty 4.1.30.Final #903
+* Upgrade to Reactor Core 3.2.2.RELEASE #904
+* Deprecate StatefulConnection.reset() #907 (Thanks to @semberal)
+* Upgrade to Reactor Core 3.2.3.RELEASE #931
+* Upgrade to netty 4.1.31.Final #932
+* Upgrade to RxJava 2.2.4 #933
+* Javadoc is missing Javadoc links to Project Reactor types (Flux, Mono) #942
+* Extend year range for 2019 in license headers #950
+* Use ConcurrentHashMap.newKeySet() as replacement of Netty's ConcurrentSet #961
+* Streamline communication sections in readme, issue templates and contribution guide #967
+* Upgrade to stunnel 5.50 #968
+* Replace old reactive API docs #974 (Thanks to @pine)
+* Upgrade to Reactor 3.2.6.RELEASE #975
+* Upgrade to netty 4.1.33.Final #976
+* Upgrade to HdrHistogram 2.1.11 #978
+* Upgrade to RxJava 2.2.6 #979
+* Use JUnit BOM for dependency management and upgrade to JUnit 5.4.0 #980
+* Use logj42 BOM for dependency management and upgrade to 2.11.2 #981
+* Upgrade to AssertJ 3.12.0 #983
+* Upgrade to AssertJ 3.12.1 #991
+* Upgrade to Reactor Core 3.2.8.RELEASE #1006
+* Upgrade to netty 4.1.35.Final #1017
+* Upgrade to Reactor Core 3.3 #1030
+* Upgrade to Brave 5.6 #1031
+* Migrate off TopicProcessor to EmitterProcessor #1032
+* Upgrade to Netty 4.1.36.Final #1033
+* Upgrade to JUnit 5.4.2 #1034
+* Upgrade to Mockito 2.27.0 #1035
+* Upgrade to RxJava 2.2.8 #1036
+* Upgrade build plugin dependencies #1037
+* RedisURI: fix missing "the" in Javadoc #1049 (Thanks to @perlun)
+* Upgrade to RxJava 2.2.9 #1054
+* Upgrade to jsr305 3.0.2 #1055
+* Upgrade TravisCI build to Xenial/Java 11 #1056
+* Upgrade to OpenWebBeans 2.0.11 #1062
+* Simplify Redis…CommandsImpl to accept connection interfaces #1077
+* Upgrade to netty 4.1.38.Final #1093
+* Upgrade to Reactor Core 3.2.11.RELEASE #1094
+* Upgrade to Mockito 3.0 #1095
+* Upgrade to JUnit 5.5.1 #1096
+* Upgrade to Brave 5.6.9 #1097
+* Update plugin versions #1098
+* Upgrade to Commons Pool 2.7.0 #1099
+* Make ListSubscriber public #1103 (Thanks to @jruaux)
+* Upgrade to netty 4.1.42.Final #1131
+* Add default manifest entries and automatic module name #1135
+* Upgrade to Brave 5.7.0 #1136
+* Deprecate Utf8StringCodec in favor or StringCodec.UTF8 #1137
diff --git a/src/main/java/io/lettuce/core/codec/CipherCodec.java b/src/main/java/io/lettuce/core/codec/CipherCodec.java
index 3c457c0580..b599601b93 100644
--- a/src/main/java/io/lettuce/core/codec/CipherCodec.java
+++ b/src/main/java/io/lettuce/core/codec/CipherCodec.java
@@ -29,9 +29,16 @@
  * A crypto {@link RedisCodec} that that allows transparent encryption/decryption of values. This codec uses {@link Cipher}
  * instances provided by {@link CipherSupplier} to process encryption and decryption.
  * <p/>
- * This codec supports various keys by encoding the key name and used key version in the value that is stored in Redis.
- * Decryption decodes the key name and requests a {@link Cipher} from {@link CipherSupplier} to decrypt values with an
- * appropriate key/{@link Cipher}.
+ * This codec supports various encryption keys by encoding the key name and used key version in the value that is stored in
+ * Redis. The message format for encryption is:
+ *
+ * <pre class="code">
+ *     $&lt;key name&gt;+&lt;key version&gt;$&lt;cipher text&gt;
+ * </pre>
+ *
+ * Each value is prefixed with the key message that is enclosed with dollar ({@code $}) signs and using the plus sign
+ * ({@code +}) to denote the key version. Decryption decodes the key name and requests a {@link Cipher} from
+ * {@link CipherSupplier} to decrypt values with an appropriate key/{@link Cipher}.
  * <p/>
  * This {@link RedisCodec codec} does not provide re-wrapping or key rotation features.
  *
@@ -154,8 +161,8 @@ public ByteBuffer encodeValue(Object value) {
                 KeyDescriptor keyDescriptor = this.encrypt.encryptionKey();
                 Cipher cipher = this.encrypt.get(keyDescriptor);
 
-                ByteBuffer intermediate = ByteBuffer.allocate(cipher.getOutputSize(serialized.remaining() + 3
-                        + keyDescriptor.name.length + 10));
+                ByteBuffer intermediate = ByteBuffer
+                        .allocate(cipher.getOutputSize(serialized.remaining() + 3 + keyDescriptor.name.length + 10));
 
                 keyDescriptor.writeTo(intermediate);
                 intermediate.put(doWithCipher(cipher, serialized));
@@ -239,8 +246,8 @@ private KeyDescriptor(byte[] name, int version) {
 
             for (byte b : name) {
                 if (b == '+' || b == '$') {
-                    throw new IllegalArgumentException(String.format(
-                            "Key name %s must not contain plus (+) or dollar ($) characters", new String(name)));
+                    throw new IllegalArgumentException(
+                            String.format("Key name %s must not contain plus (+) or dollar ($) characters", new String(name)));
                 }
             }
             this.name = name;
diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE
index 1584506339..4b9400dee3 100644
--- a/src/main/resources/META-INF/NOTICE
+++ b/src/main/resources/META-INF/NOTICE
@@ -1,5 +1,5 @@
 Lettuce Java Redis Client ${version}
-Copyright (c) 2011-2017 Mark Paluch
+Copyright (c) 2011-2019 Mark Paluch
 
 This product is licensed to you under the Apache License, Version 2.0
 (the "License"). You may not use this product except in compliance with

From d4dc71a79298c613264a6d6d7461f29e69f8b157 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Sep 2019 10:46:47 +0200
Subject: [PATCH 674/808] Deprecate Utf8StringCodec in favor or
 StringCodec.UTF8 #1137

---
 .../io/lettuce/core/ConnectionBuilder.java    |  4 +-
 .../io/lettuce/core/RedisCommandBuilder.java  | 15 +++--
 .../lettuce/core/codec/Utf8StringCodec.java   |  2 +
 .../core/masterslave/MasterSlaveUtils.java    |  2 -
 .../masterslave/SentinelTopologyProvider.java |  7 +--
 .../core/protocol/LettuceCharsets.java        |  5 +-
 ...vancedClusterReactiveIntegrationTests.java |  3 +-
 .../core/cluster/ClusterCommandUnitTests.java |  3 +-
 .../cluster/ClusterNodeEndpointUnitTests.java |  3 +-
 ...ledClusterConnectionProviderUnitTests.java | 60 +++++++++++--------
 .../RedisClusterClientIntegrationTests.java   | 26 ++++----
 .../cluster/RedisStateIntegrationTests.java   |  1 +
 .../cluster/topology/RequestsUnitTests.java   |  8 +--
 .../core/codec/CompressionCodecUnitTests.java |  8 +--
 .../core/masterreplica/MasterReplicaTest.java |  5 +-
 .../StaticMasterReplicaTest.java              | 11 ++--
 .../CustomCommandIntegrationTests.java        |  4 +-
 ...asterSlaveConnectionProviderUnitTests.java | 10 ++--
 .../MasterSlaveSentinelIntegrationTests.java  | 13 ++--
 .../core/masterslave/MasterSlaveTest.java     |  5 +-
 .../masterslave/StaticMasterSlaveTest.java    | 11 ++--
 .../output/BooleanListOutputUnitTests.java    |  3 +-
 .../GeoCoordinatesListOutputUnitTests.java    |  3 +-
 ...eoCoordinatesValueListOutputUnitTests.java |  3 +-
 .../output/GeoWithinListOutputUnitTests.java  | 11 ++--
 .../core/output/ListOutputUnitTests.java      |  9 ++-
 .../ScoredValueListOutputUnitTests.java       |  3 +-
 .../core/protocol/AsyncCommandUnitTests.java  |  3 +-
 .../core/protocol/CommandArgsUnitTests.java   | 27 ++++-----
 .../core/protocol/CommandUnitTests.java       | 16 +++--
 .../protocol/DefaultEndpointUnitTests.java    |  3 +-
 .../core/protocol/StateMachineUnitTests.java  |  9 ++-
 .../pubsub/PubSubCommandHandlerUnitTests.java | 26 ++++----
 .../reactive/RedisPublisherVerification.java  |  6 +-
 .../core/reliability/AtLeastOnceTest.java     | 13 ++--
 .../core/reliability/AtMostOnceTest.java      | 15 +++--
 ...tToMasterSlaveUsingElastiCacheCluster.java |  3 +-
 ...onnectToMasterSlaveUsingRedisSentinel.java |  3 +-
 38 files changed, 192 insertions(+), 170 deletions(-)

diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index c272876290..f659d1571c 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -22,7 +22,7 @@
 import java.util.function.Supplier;
 
 import reactor.core.publisher.Mono;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.*;
 import io.lettuce.core.resource.ClientResources;
@@ -39,7 +39,7 @@
 public class ConnectionBuilder {
 
     private static final RedisCommandBuilder<String, String> INITIALIZING_CMD_BUILDER = new RedisCommandBuilder<>(
-            new Utf8StringCodec());
+            StringCodec.UTF8);
     private static final Supplier<AsyncCommand<?, ?, ?>> PING_COMMAND_SUPPLIER = () -> new AsyncCommand<>(
             INITIALIZING_CMD_BUILDER.ping());
 
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index b5b8729763..fa157ba6dc 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -25,6 +25,7 @@
 import io.lettuce.core.Range.Boundary;
 import io.lettuce.core.XReadArgs.StreamOffset;
 import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.output.*;
@@ -46,8 +47,6 @@ class RedisCommandBuilder<K, V> extends BaseRedisCommandBuilder<K, V> {
     private static final byte[] MINUS_BYTES = { '-' };
     private static final byte[] PLUS_BYTES = { '+' };
 
-    private final RedisCodec<String, String> STRING_CODEC = new Utf8StringCodec();
-
     RedisCommandBuilder(RedisCodec<K, V> codec) {
         super(codec);
     }
@@ -419,8 +418,8 @@ Command<K, V, List<Object>> clusterSlots() {
     }
 
     Command<K, V, List<Object>> command() {
-        CommandArgs<K, V> args = new CommandArgs<K, V>((RedisCodec) STRING_CODEC);
-        return createCommand(COMMAND, new ArrayOutput<K, V>((RedisCodec) STRING_CODEC), args);
+        CommandArgs<K, V> args = new CommandArgs<K, V>((RedisCodec) StringCodec.UTF8);
+        return createCommand(COMMAND, new ArrayOutput<K, V>((RedisCodec) StringCodec.UTF8), args);
     }
 
     Command<K, V, Long> commandCount() {
@@ -433,22 +432,22 @@ Command<K, V, List<Object>> commandInfo(String... commands) {
         LettuceAssert.notEmpty(commands, "Commands " + MUST_NOT_BE_EMPTY);
         LettuceAssert.noNullElements(commands, "Commands " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
 
-        CommandArgs<K, V> args = new CommandArgs<K, V>((RedisCodec) STRING_CODEC);
+        CommandArgs<K, V> args = new CommandArgs<K, V>((RedisCodec) StringCodec.UTF8);
         args.add(INFO);
 
         for (String command : commands) {
             args.add(command);
         }
 
-        return createCommand(COMMAND, new ArrayOutput<K, V>((RedisCodec) STRING_CODEC), args);
+        return createCommand(COMMAND, new ArrayOutput<K, V>((RedisCodec) StringCodec.UTF8), args);
     }
 
     Command<K, V, Map<String, String>> configGet(String parameter) {
         LettuceAssert.notNull(parameter, "Parameter " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(parameter, "Parameter " + MUST_NOT_BE_EMPTY);
 
-        CommandArgs<K, V> args = new CommandArgs<>((RedisCodec) STRING_CODEC).add(GET).add(parameter);
-        return createCommand(CONFIG, new MapOutput<>((RedisCodec) STRING_CODEC), args);
+        CommandArgs<K, V> args = new CommandArgs<>((RedisCodec) StringCodec.UTF8).add(GET).add(parameter);
+        return createCommand(CONFIG, new MapOutput<>((RedisCodec) StringCodec.UTF8), args);
     }
 
     Command<K, V, String> configResetstat() {
diff --git a/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java b/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
index 4539fff946..cdd49e7921 100644
--- a/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
+++ b/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
@@ -24,7 +24,9 @@
  * @author Mark Paluch
  * @see StringCodec
  * @see LettuceCharsets#UTF8
+ * @deprecated since 5.2, use {@link StringCodec#UTF8} instead.
  */
+@Deprecated
 public class Utf8StringCodec extends StringCodec implements RedisCodec<String, String> {
 
     /**
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
index 170cce0130..64cbd3d606 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
@@ -19,14 +19,12 @@
 import java.util.Comparator;
 
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
  * @author Mark Paluch
  */
 class MasterSlaveUtils {
-    static final Utf8StringCodec CODEC = new Utf8StringCodec();
 
     /**
      * Check if properties changed.
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
index fe04814d58..920074a5e9 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
@@ -15,8 +15,6 @@
  */
 package io.lettuce.core.masterslave;
 
-import static io.lettuce.core.masterslave.MasterSlaveUtils.CODEC;
-
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
@@ -25,6 +23,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import io.lettuce.core.codec.StringCodec;
 import reactor.core.publisher.Mono;
 import reactor.util.function.Tuple2;
 import io.lettuce.core.RedisClient;
@@ -90,8 +89,8 @@ public CompletableFuture<List<RedisNodeDescription>> getNodesAsync() {
 
         logger.debug("lookup topology for masterId {}", masterId);
 
-        Mono<StatefulRedisSentinelConnection<String, String>> connect = Mono.fromFuture(redisClient.connectSentinelAsync(CODEC,
-                sentinelUri));
+        Mono<StatefulRedisSentinelConnection<String, String>> connect = Mono
+                .fromFuture(redisClient.connectSentinelAsync(StringCodec.UTF8, sentinelUri));
 
         return connect.flatMap(this::getNodes).toFuture();
     }
diff --git a/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java b/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java
index 208b1b15c9..245b62c483 100644
--- a/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java
+++ b/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java
@@ -17,6 +17,7 @@
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 /**
  * {@link Charset}-related utilities.
@@ -28,12 +29,12 @@ public class LettuceCharsets {
     /**
      * US-ASCII charset.
      */
-    public static final Charset ASCII = Charset.forName("US-ASCII");
+    public static final Charset ASCII = StandardCharsets.US_ASCII;
 
     /**
      * UTF-8 charset.
      */
-    public static final Charset UTF8 = Charset.forName("UTF-8");
+    public static final Charset UTF8 = StandardCharsets.UTF_8;
 
     /**
      * Utility constructor.
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
index e8c3b23c5e..687a11cfe2 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
@@ -30,6 +30,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import io.lettuce.core.codec.StringCodec;
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 import io.lettuce.core.*;
@@ -114,7 +115,7 @@ void mgetCrossSlot() {
 
         msetCrossSlot();
 
-        Map<Integer, List<String>> partitioned = SlotHash.partition(new Utf8StringCodec(), KeysAndValues.KEYS);
+        Map<Integer, List<String>> partitioned = SlotHash.partition(StringCodec.UTF8, KeysAndValues.KEYS);
         assertThat(partitioned.size()).isGreaterThan(100);
 
         Flux<KeyValue<String, String>> flux = commands.mget(KeysAndValues.KEYS.toArray(new String[KeysAndValues.COUNT]));
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java
index 49cce8808e..faf758c347 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java
@@ -29,6 +29,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.AsyncCommand;
@@ -46,7 +47,7 @@ class ClusterCommandUnitTests {
 
     private ClusterCommand<String, String, String> sut;
     private Command<String, String, String> command = new Command<>(CommandType.TYPE,
-            new StatusOutput<>(new Utf8StringCodec()), null);
+            new StatusOutput<>(StringCodec.UTF8), null);
 
     @BeforeEach
     void before() {
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
index 0ed878f0d9..530525b724 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
@@ -33,6 +33,7 @@
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.RedisChannelWriter;
 import io.lettuce.core.RedisException;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.AsyncCommand;
@@ -49,7 +50,7 @@
 class ClusterNodeEndpointUnitTests {
 
     private AsyncCommand<String, String, String> command = new AsyncCommand<>(new Command<>(CommandType.APPEND,
-            new StatusOutput<>(new Utf8StringCodec()), null));
+            new StatusOutput<>(StringCodec.UTF8), null));
 
     private Queue<RedisCommand<String, String, ?>> disconnectedBuffer;
 
diff --git a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
index 72d6ed7c53..31102b453a 100644
--- a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
@@ -45,7 +45,7 @@
 import io.lettuce.core.cluster.ClusterConnectionProvider.Intent;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.protocol.Command;
@@ -59,8 +59,6 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 class PooledClusterConnectionProviderUnitTests {
 
-    private static final Utf8StringCodec CODEC = new Utf8StringCodec();
-
     private PooledClusterConnectionProvider<String, String> sut;
 
     @Mock
@@ -96,7 +94,7 @@ void before() {
 
         nodeConnectionMock = (StatefulRedisConnection) channelHandlerMock;
 
-        sut = new PooledClusterConnectionProvider<>(clientMock, writerMock, CODEC, clusterEventListener);
+        sut = new PooledClusterConnectionProvider<>(clientMock, writerMock, StringCodec.UTF8, clusterEventListener);
 
         List<Integer> slots1 = IntStream.range(0, 8192).boxed().collect(Collectors.toList());
         List<Integer> slots2 = IntStream.range(8192, SlotHash.SLOT_COUNT).boxed().collect(Collectors.toList());
@@ -114,7 +112,8 @@ void before() {
     @Test
     void shouldObtainConnection() {
 
-        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
+        when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:1"), any(), any()))
+                .thenReturn(
                 ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         StatefulRedisConnection<String, String> connection = sut.getConnection(Intent.READ, 1);
@@ -127,7 +126,8 @@ void shouldObtainConnection() {
     @Test
     void shouldReuseMasterConnectionForReadFromMaster() {
 
-        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
+        when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:1"), any(), any()))
+                .thenReturn(
                 ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         sut.setReadFrom(ReadFrom.MASTER);
@@ -142,7 +142,8 @@ void shouldReuseMasterConnectionForReadFromMaster() {
     @Test
     void shouldObtainConnectionReadFromSlave() {
 
-        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
+        when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any()))
+                .thenReturn(
                 ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
@@ -167,10 +168,12 @@ void shouldRandomizeReadNode() {
         when(nodeConnectionMock.isOpen()).thenReturn(true);
         when(nodeConnectionMock2.isOpen()).thenReturn(true);
 
-        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
+        when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:1"), any(), any()))
+                .thenReturn(
                 ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
-        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
+        when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any()))
+                .thenReturn(
                 ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock2)));
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
@@ -197,10 +200,12 @@ void shouldNotRandomizeReadNode() {
         when(nodeConnectionMock.isOpen()).thenReturn(true);
         when(nodeConnectionMock2.isOpen()).thenReturn(true);
 
-        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
+        when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:1"), any(), any()))
+                .thenReturn(
                 ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
-        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
+        when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any()))
+                .thenReturn(
                 ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock2)));
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
@@ -223,7 +228,8 @@ void shouldNotRandomizeReadNode() {
     @Test
     void shouldCloseConnectionOnConnectFailure() {
 
-        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
+        when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any()))
+                .thenReturn(
                 ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
@@ -241,13 +247,14 @@ void shouldCloseConnectionOnConnectFailure() {
         }
 
         verify(nodeConnectionMock).close();
-        verify(clientMock).connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any());
+        verify(clientMock).connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any());
     }
 
     @Test
     void shouldRetryConnectionAttemptAfterConnectionAttemptWasBroken() {
 
-        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
+        when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any()))
+                .thenReturn(
                 ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
@@ -272,7 +279,7 @@ void shouldRetryConnectionAttemptAfterConnectionAttemptWasBroken() {
 
         sut.getConnection(Intent.READ, 1);
 
-        verify(clientMock, times(2)).connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any());
+        verify(clientMock, times(2)).connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any());
     }
 
     @Test
@@ -281,10 +288,12 @@ void shouldSelectSuccessfulConnectionIfOtherNodesFailed() {
         CompletableFuture<StatefulRedisConnection<String, String>> failed = new CompletableFuture<>();
         failed.completeExceptionally(new IllegalStateException());
 
-        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
+        when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:1"), any(), any()))
+                .thenReturn(
                 ConnectionFuture.from(socketAddressMock, failed));
 
-        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
+        when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any()))
+                .thenReturn(
                 ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
@@ -299,8 +308,8 @@ void shouldSelectSuccessfulConnectionIfOtherNodesFailed() {
         // cache access
         assertThat(sut.getConnection(Intent.READ, 1)).isNotNull().isSameAs(nodeConnectionMock);
 
-        verify(clientMock).connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any());
-        verify(clientMock).connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any());
+        verify(clientMock).connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:1"), any(), any());
+        verify(clientMock).connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any());
     }
 
     @Test
@@ -312,10 +321,12 @@ void shouldFailIfAllReadCandidateNodesFail() {
         CompletableFuture<StatefulRedisConnection<String, String>> failed2 = new CompletableFuture<>();
         failed2.completeExceptionally(new IllegalStateException());
 
-        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
+        when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:1"), any(), any()))
+                .thenReturn(
                 ConnectionFuture.from(socketAddressMock, failed2));
 
-        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any())).thenReturn(
+        when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any()))
+                .thenReturn(
                 ConnectionFuture.from(socketAddressMock, failed2));
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
@@ -331,8 +342,8 @@ void shouldFailIfAllReadCandidateNodesFail() {
                     IllegalStateException.class);
         }
 
-        verify(clientMock).connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any());
-        verify(clientMock).connectToNodeAsync(eq(CODEC), eq("localhost:2"), any(), any());
+        verify(clientMock).connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:1"), any(), any());
+        verify(clientMock).connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any());
     }
 
     @Test
@@ -375,7 +386,8 @@ void shouldCloseConnections() {
 
         when(channelHandlerMock.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
 
-        when(clientMock.connectToNodeAsync(eq(CODEC), eq("localhost:1"), any(), any())).thenReturn(
+        when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:1"), any(), any()))
+                .thenReturn(
                 ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         StatefulRedisConnection<String, String> connection = sut.getConnection(Intent.READ, 1);
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
index c03b4c0c80..f56faa0cc6 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
@@ -47,7 +47,7 @@
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.test.Delay;
@@ -148,7 +148,7 @@ void shouldApplyTimeoutOnRegularConnectionUsingCodec() {
 
         clusterClient.setDefaultTimeout(2, TimeUnit.MINUTES);
 
-        StatefulRedisClusterConnection<String, String> connection = clusterClient.connect(Utf8StringCodec.UTF8);
+        StatefulRedisClusterConnection<String, String> connection = clusterClient.connect(StringCodec.UTF8);
 
         assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(2));
         assertThat(connection.getConnection(host, ClusterTestSettings.port1).getTimeout()).isEqualTo(Duration.ofMinutes(2));
@@ -171,7 +171,7 @@ void shouldApplyTimeoutOnPubSubConnection() {
     void shouldApplyTimeoutOnPubSubConnectionUsingCodec() {
 
         clusterClient.setDefaultTimeout(Duration.ofMinutes(1));
-        StatefulRedisPubSubConnection<String, String> connection = clusterClient.connectPubSub(Utf8StringCodec.UTF8);
+        StatefulRedisPubSubConnection<String, String> connection = clusterClient.connectPubSub(StringCodec.UTF8);
 
         assertThat(connection.getTimeout()).isEqualTo(Duration.ofMinutes(1));
         connection.close();
@@ -188,8 +188,8 @@ void clusterConnectionShouldSetClientName() {
         Wait.untilTrue(connection::isOpen).waitOrTimeout();
         assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
 
-        StatefulRedisConnection<String, String> nodeConnection = connection.getConnection(connection.getPartitions()
-                .getPartition(0).getNodeId());
+        StatefulRedisConnection<String, String> nodeConnection = connection
+                .getConnection(connection.getPartitions().getPartition(0).getNodeId());
         assertThat(nodeConnection.sync().clientGetname()).isEqualTo("my-client");
 
         connection.close();
@@ -207,8 +207,8 @@ void pubSubclusterConnectionShouldSetClientName() {
 
         assertThat(connection.sync().clientGetname()).isEqualTo("my-client");
 
-        StatefulRedisConnection<String, String> nodeConnection = connection.getConnection(connection.getPartitions()
-                .getPartition(0).getNodeId());
+        StatefulRedisConnection<String, String> nodeConnection = connection
+                .getConnection(connection.getPartitions().getPartition(0).getNodeId());
         assertThat(nodeConnection.sync().clientGetname()).isEqualTo("my-client");
 
         connection.close();
@@ -229,8 +229,8 @@ void reloadPartitionsWithDynamicSourcesFallsBackToInitialSeedNodes() {
 
         Partitions partitions = clusterClient.getPartitions();
         partitions.clear();
-        partitions.add(new RedisClusterNode(RedisURI.create("localhost", 1), "foo", false, null, 0, 0, 0, Collections
-                .emptyList(), Collections.emptySet()));
+        partitions.add(new RedisClusterNode(RedisURI.create("localhost", 1), "foo", false, null, 0, 0, 0,
+                Collections.emptyList(), Collections.emptySet()));
 
         Partitions reloaded = clusterClient.loadPartitions();
 
@@ -399,8 +399,8 @@ void partitionRetrievalShouldFail() {
         RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.Builder.redis(TestSettings.host(), ClusterTestSettings.port7).build());
 
-        assertThatThrownBy(clusterClient::getPartitions).isInstanceOf(RedisException.class).hasRootCauseInstanceOf(
-                RedisCommandExecutionException.class);
+        assertThatThrownBy(clusterClient::getPartitions).isInstanceOf(RedisException.class)
+                .hasRootCauseInstanceOf(RedisCommandExecutionException.class);
 
         FastShutdown.shutdown(clusterClient);
     }
@@ -463,8 +463,8 @@ void getClusterNodeConnection() {
 
         RedisClusterNode redis1Node = getOwnPartition(redissync2);
 
-        RedisClusterCommands<String, String> connection = sync
-                .getConnection(TestSettings.hostAddr(), ClusterTestSettings.port2);
+        RedisClusterCommands<String, String> connection = sync.getConnection(TestSettings.hostAddr(),
+                ClusterTestSettings.port2);
 
         String result = connection.clusterMyId();
         assertThat(result).isEqualTo(redis1Node.getNodeId());
diff --git a/src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java
index 302415441b..b9b90ec630 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java
@@ -48,6 +48,7 @@ public class RedisStateIntegrationTests {
     @Test
     void shouldDiscoverCommands() {
 
+
         List<CommandDetail> commandDetails = CommandDetailParser.parse(redis.command());
         RedisState state = new RedisState(commandDetails);
 
diff --git a/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
index 4ad0da7762..b846b7d543 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
@@ -23,7 +23,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.Command;
 import io.lettuce.core.protocol.CommandType;
@@ -80,7 +80,7 @@ void awaitShouldReturnAwaitedTime() throws Exception {
 
         RedisURI redisURI = RedisURI.create("localhost", 6379);
         Requests requests = new Requests();
-        Command<String, String, String> command = new Command<>(CommandType.TYPE, new StatusOutput<>(new Utf8StringCodec()));
+        Command<String, String, String> command = new Command<>(CommandType.TYPE, new StatusOutput<>(StringCodec.UTF8));
         TimedAsyncCommand timedAsyncCommand = new TimedAsyncCommand(command);
 
         requests.addRequest(redisURI, timedAsyncCommand);
@@ -93,7 +93,7 @@ void awaitShouldReturnAwaitedTimeIfNegative() throws Exception {
 
         RedisURI redisURI = RedisURI.create("localhost", 6379);
         Requests requests = new Requests();
-        Command<String, String, String> command = new Command<>(CommandType.TYPE, new StatusOutput<>(new Utf8StringCodec()));
+        Command<String, String, String> command = new Command<>(CommandType.TYPE, new StatusOutput<>(StringCodec.UTF8));
         TimedAsyncCommand timedAsyncCommand = new TimedAsyncCommand(command);
 
         requests.addRequest(redisURI, timedAsyncCommand);
@@ -103,7 +103,7 @@ void awaitShouldReturnAwaitedTimeIfNegative() throws Exception {
     }
 
     private TimedAsyncCommand getCommand(String response) {
-        Command<String, String, String> command = new Command<>(CommandType.TYPE, new StatusOutput<>(new Utf8StringCodec()));
+        Command<String, String, String> command = new Command<>(CommandType.TYPE, new StatusOutput<>(StringCodec.UTF8));
         TimedAsyncCommand timedAsyncCommand = new TimedAsyncCommand(command);
 
         command.getOutput().set(ByteBuffer.wrap(response.getBytes()));
diff --git a/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java b/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java
index ca9ecd0929..5a6155e073 100644
--- a/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java
+++ b/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java
@@ -36,7 +36,7 @@ class CompressionCodecUnitTests {
 
     @Test
     void keyPassthroughTest() {
-        RedisCodec<String, String> sut = CompressionCodec.valueCompressor(new Utf8StringCodec(),
+        RedisCodec<String, String> sut = CompressionCodec.valueCompressor(StringCodec.UTF8,
                 CompressionCodec.CompressionType.GZIP);
         ByteBuffer byteBuffer = sut.encodeKey(value);
         assertThat(toString(byteBuffer.duplicate())).isEqualTo(value);
@@ -47,7 +47,7 @@ void keyPassthroughTest() {
 
     @Test
     void gzipValueTest() {
-        RedisCodec<String, String> sut = CompressionCodec.valueCompressor(new Utf8StringCodec(),
+        RedisCodec<String, String> sut = CompressionCodec.valueCompressor(StringCodec.UTF8,
                 CompressionCodec.CompressionType.GZIP);
         ByteBuffer byteBuffer = sut.encodeValue(key);
         assertThat(toBytes(byteBuffer.duplicate())).isEqualTo(keyGzipBytes);
@@ -58,7 +58,7 @@ void gzipValueTest() {
 
     @Test
     void deflateValueTest() {
-        RedisCodec<String, String> sut = CompressionCodec.valueCompressor(new Utf8StringCodec(),
+        RedisCodec<String, String> sut = CompressionCodec.valueCompressor(StringCodec.UTF8,
                 CompressionCodec.CompressionType.DEFLATE);
         ByteBuffer byteBuffer = sut.encodeValue(key);
         assertThat(toBytes(byteBuffer.duplicate())).isEqualTo(keyDeflateBytes);
@@ -69,7 +69,7 @@ void deflateValueTest() {
 
     @Test
     void wrongCompressionTypeOnDecode() {
-        RedisCodec<String, String> sut = CompressionCodec.valueCompressor(new Utf8StringCodec(),
+        RedisCodec<String, String> sut = CompressionCodec.valueCompressor(StringCodec.UTF8,
                 CompressionCodec.CompressionType.DEFLATE);
 
         assertThatThrownBy(() -> sut.decodeValue(ByteBuffer.wrap(keyGzipBytes)))
diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
index 9a8e9a1864..30db6bfa0a 100644
--- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
@@ -35,6 +35,7 @@
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
@@ -89,7 +90,7 @@ void before() throws Exception {
         connectionToNode2.configSet("masterauth", passwd);
         connectionToNode2.auth(passwd);
 
-        connection = MasterReplica.connect(client, new Utf8StringCodec(), masterURI);
+        connection = MasterReplica.connect(client, StringCodec.UTF8, masterURI);
         connection.setReadFrom(ReadFrom.REPLICA);
     }
 
@@ -155,7 +156,7 @@ void testConnectToReplica() {
         connection.close();
 
         RedisURI replicaUri = RedisURI.Builder.redis(host, TestSettings.port(4)).withPassword(passwd).build();
-        connection = MasterReplica.connect(client, new Utf8StringCodec(), replicaUri);
+        connection = MasterReplica.connect(client, StringCodec.UTF8, replicaUri);
 
         RedisCommands<String, String> sync = connection.sync();
         sync.set(key, value);
diff --git a/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java b/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
index 0f58a25dde..cef8066885 100644
--- a/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
+++ b/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
@@ -34,6 +34,7 @@
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RoleParser;
@@ -87,7 +88,7 @@ void before() throws Exception {
         node1.setPassword(passwd);
         node2.setPassword(passwd);
 
-        connection = MasterReplica.connect(client, new Utf8StringCodec(), Arrays.asList(master, slave));
+        connection = MasterReplica.connect(client, StringCodec.UTF8, Arrays.asList(master, slave));
         connection.setReadFrom(ReadFrom.REPLICA);
     }
 
@@ -139,7 +140,7 @@ void noReplicaForRead() {
 
         connection.close();
 
-        connection = MasterReplica.connect(client, new Utf8StringCodec(), Arrays.asList(master));
+        connection = MasterReplica.connect(client, StringCodec.UTF8, Arrays.asList(master));
         connection.setReadFrom(ReadFrom.REPLICA);
 
         assertThatThrownBy(() -> replicaCall(connection)).isInstanceOf(RedisException.class);
@@ -150,7 +151,7 @@ void shouldWorkWithMasterOnly() {
 
         connection.close();
 
-        connection = MasterReplica.connect(client, new Utf8StringCodec(), Arrays.asList(master));
+        connection = MasterReplica.connect(client, StringCodec.UTF8, Arrays.asList(master));
 
         connection.sync().set(key, value);
         assertThat(connection.sync().get(key)).isEqualTo("value");
@@ -161,7 +162,7 @@ void shouldWorkWithReplicaOnly() {
 
         connection.close();
 
-        connection = MasterReplica.connect(client, new Utf8StringCodec(), Arrays.asList(slave));
+        connection = MasterReplica.connect(client, StringCodec.UTF8, Arrays.asList(slave));
         connection.setReadFrom(ReadFrom.MASTER_PREFERRED);
 
         assertThat(connection.sync().info()).isNotEmpty();
@@ -172,7 +173,7 @@ void noMasterForWrite() {
 
         connection.close();
 
-        connection = MasterReplica.connect(client, new Utf8StringCodec(), Arrays.asList(slave));
+        connection = MasterReplica.connect(client, StringCodec.UTF8, Arrays.asList(slave));
 
         assertThatThrownBy(() -> connection.sync().set(key, value)).isInstanceOf(RedisException.class);
     }
diff --git a/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java b/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
index f4d8ada3ed..772e97a19e 100644
--- a/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
@@ -111,7 +111,7 @@ void dispatchTransactions() {
     void masterSlaveAsyncPing() {
 
         RedisCommand<String, String, String> command = new Command<>(MyCommands.PING,
-                new StatusOutput<>(new Utf8StringCodec()), null);
+                new StatusOutput<>(StringCodec.UTF8), null);
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(command);
         getStandaloneConnection().dispatch(async);
@@ -145,7 +145,7 @@ void masterSlaveAsyncBatchPing() {
     void masterSlaveFireAndForget() {
 
         RedisCommand<String, String, String> command = new Command<>(MyCommands.PING,
-                new StatusOutput<>(new Utf8StringCodec()), null);
+                new StatusOutput<>(StringCodec.UTF8), null);
         getStandaloneConnection().dispatch(command);
         assertThat(command.isCancelled()).isFalse();
 
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java
index cc9b052c96..7f27ca781c 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java
@@ -39,7 +39,7 @@
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.models.role.RedisInstance;
 
 /**
@@ -49,8 +49,6 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 class MasterSlaveConnectionProviderUnitTests {
 
-    private static final Utf8StringCodec CODEC = new Utf8StringCodec();
-
     private MasterSlaveConnectionProvider<String, String> sut;
 
     @Mock
@@ -68,7 +66,8 @@ class MasterSlaveConnectionProviderUnitTests {
     void before() {
 
         nodeConnectionMock = (StatefulRedisConnection) channelHandlerMock;
-        sut = new MasterSlaveConnectionProvider<>(clientMock, CODEC, RedisURI.create("localhost", 1), Collections.emptyMap());
+        sut = new MasterSlaveConnectionProvider<>(clientMock, StringCodec.UTF8, RedisURI.create("localhost", 1),
+                Collections.emptyMap());
         sut.setKnownNodes(Arrays.asList(new RedisMasterSlaveNode("localhost", 1, RedisURI.create("localhost", 1),
                 RedisInstance.Role.MASTER)));
     }
@@ -78,7 +77,8 @@ void shouldCloseConnections() {
 
         when(channelHandlerMock.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
 
-        when(clientMock.connectAsync(eq(CODEC), any())).thenReturn(ConnectionFuture.completed(null, nodeConnectionMock));
+        when(clientMock.connectAsync(eq(StringCodec.UTF8), any()))
+                .thenReturn(ConnectionFuture.completed(null, nodeConnectionMock));
 
         StatefulRedisConnection<String, String> connection = sut.getConnection(MasterSlaveConnectionProvider.Intent.READ);
         assertThat(connection).isNotNull();
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
index bd53d69482..97ea9c5175 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
@@ -30,6 +30,7 @@
 import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.*;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.sentinel.SentinelTestSettings;
 import io.lettuce.test.LettuceExtension;
@@ -56,7 +57,7 @@ void testMasterSlaveSentinelBasic() {
         RedisURI uri = RedisURI
                 .create("redis-sentinel://127.0.0.1:21379,127.0.0.1:22379,127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
         StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient,
-                new Utf8StringCodec(), uri);
+                StringCodec.UTF8, uri);
 
         connection.setReadFrom(ReadFrom.MASTER);
         String server = slaveCall(connection);
@@ -72,7 +73,7 @@ void masterSlaveConnectionShouldSetClientName() {
                 .withClientName("my-client").build();
 
         StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient,
-                new Utf8StringCodec(), redisURI);
+                StringCodec.UTF8, redisURI);
 
         assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
         connection.sync().quit();
@@ -87,7 +88,7 @@ void testMasterSlaveSentinelWithTwoUnavailableSentinels() {
         RedisURI uri = RedisURI
                 .create("redis-sentinel://127.0.0.1:21379,127.0.0.1:22379,127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
         StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient,
-                new Utf8StringCodec(), uri);
+                StringCodec.UTF8, uri);
 
         connection.setReadFrom(ReadFrom.MASTER);
         String server = connection.sync().info("replication");
@@ -102,7 +103,7 @@ void testMasterSlaveSentinelWithUnavailableSentinels() {
         RedisURI uri = RedisURI.create("redis-sentinel://127.0.0.1:21379,127.0.0.1:21379?sentinelMasterId=mymaster&timeout=5s");
 
         try {
-            MasterSlave.connect(redisClient, new Utf8StringCodec(), uri);
+            MasterSlave.connect(redisClient, StringCodec.UTF8, uri);
             fail("Missing RedisConnectionException");
         } catch (RedisConnectionException e) {
             assertThat(e.getCause()).hasRootCauseInstanceOf(IOException.class);
@@ -115,7 +116,7 @@ void testMasterSlaveSentinelConnectionCount() {
         ChannelGroup channels = (ChannelGroup) ReflectionTestUtils.getField(redisClient, "channels");
         int count = channels.size();
 
-        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient, new Utf8StringCodec(),
+        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8,
                 SentinelTestSettings.SENTINEL_URI);
 
         connection.sync().ping();
@@ -133,7 +134,7 @@ void testMasterSlaveSentinelClosesSentinelConnections() {
         ChannelGroup channels = (ChannelGroup) ReflectionTestUtils.getField(redisClient, "channels");
         int count = channels.size();
 
-        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient, new Utf8StringCodec(),
+        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8,
                 SentinelTestSettings.SENTINEL_URI);
 
         connection.sync().ping();
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
index 87e09b10ba..2e48833c50 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
@@ -35,6 +35,7 @@
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
@@ -90,7 +91,7 @@ void before() throws Exception {
         connectionToNode2.configSet("masterauth", passwd);
         connectionToNode2.auth(passwd);
 
-        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, new Utf8StringCodec(), masterURI);
+        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8, masterURI);
         connection.setReadFrom(ReadFrom.REPLICA);
     }
 
@@ -156,7 +157,7 @@ void testConnectToSlave() {
         connection.close();
 
         RedisURI slaveUri = RedisURI.Builder.redis(host, TestSettings.port(4)).withPassword(passwd).build();
-        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, new Utf8StringCodec(), slaveUri);
+        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8, slaveUri);
 
         RedisCommands<String, String> sync = connection.sync();
         sync.set(key, value);
diff --git a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
index 4d70f5308d..5de40d3c74 100644
--- a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
@@ -35,6 +35,7 @@
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RoleParser;
@@ -89,7 +90,7 @@ void before() throws Exception {
         node1.setPassword(passwd);
         node2.setPassword(passwd);
 
-        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, new Utf8StringCodec(),
+        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8,
                 Arrays.asList(master, replica));
         connection.setReadFrom(ReadFrom.REPLICA);
     }
@@ -142,7 +143,7 @@ void noSlaveForRead() {
 
         connection.close();
 
-        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, new Utf8StringCodec(),
+        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8,
                 Arrays.asList(master));
         connection.setReadFrom(ReadFrom.REPLICA);
 
@@ -154,7 +155,7 @@ void shouldWorkWithMasterOnly() {
 
         connection.close();
 
-        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, new Utf8StringCodec(),
+        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8,
                 Arrays.asList(master));
 
         connection.sync().set(key, value);
@@ -166,7 +167,7 @@ void shouldWorkWithSlaveOnly() {
 
         connection.close();
 
-        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, new Utf8StringCodec(),
+        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8,
                 Arrays.asList(replica));
         connection.setReadFrom(ReadFrom.MASTER_PREFERRED);
 
@@ -178,7 +179,7 @@ void noMasterForWrite() {
 
         connection.close();
 
-        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, new Utf8StringCodec(),
+        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8,
                 Arrays.asList(replica));
 
         assertThatThrownBy(() -> connection.sync().set(key, value)).isInstanceOf(RedisException.class);
diff --git a/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java
index d1c20dcd4b..9ebd924570 100644
--- a/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java
@@ -22,6 +22,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
@@ -29,7 +30,7 @@
  */
 class BooleanListOutputUnitTests {
 
-    private BooleanListOutput<?, ?> sut = new BooleanListOutput<>(new Utf8StringCodec());
+    private BooleanListOutput<?, ?> sut = new BooleanListOutput<>(StringCodec.UTF8);
 
     @Test
     void defaultSubscriberIsSet() {
diff --git a/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java
index c4b474a7c0..d346c7a7c7 100644
--- a/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java
@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.GeoCoordinates;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
@@ -30,7 +31,7 @@
  */
 class GeoCoordinatesListOutputUnitTests {
 
-    private GeoCoordinatesListOutput<?, ?> sut = new GeoCoordinatesListOutput<>(new Utf8StringCodec());
+    private GeoCoordinatesListOutput<?, ?> sut = new GeoCoordinatesListOutput<>(StringCodec.UTF8);
 
     @Test
     void setIntegerShouldFail() {
diff --git a/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java
index e7b8214fbc..2369dfde62 100644
--- a/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java
@@ -24,6 +24,7 @@
 
 import io.lettuce.core.GeoCoordinates;
 import io.lettuce.core.Value;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
@@ -31,7 +32,7 @@
  */
 class GeoCoordinatesValueListOutputUnitTests {
 
-    private GeoCoordinatesValueListOutput<?, ?> sut = new GeoCoordinatesValueListOutput<>(new Utf8StringCodec());
+    private GeoCoordinatesValueListOutput<?, ?> sut = new GeoCoordinatesValueListOutput<>(StringCodec.UTF8);
 
     @Test
     void defaultSubscriberIsSet() {
diff --git a/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java
index 6139b7c0e5..b47dd4fa9f 100644
--- a/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java
@@ -24,6 +24,7 @@
 import io.lettuce.core.GeoCoordinates;
 import io.lettuce.core.GeoWithin;
 import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
@@ -31,7 +32,7 @@
  */
 class GeoWithinListOutputUnitTests {
 
-    private GeoWithinListOutput<String, String> sut = new GeoWithinListOutput<>(new Utf8StringCodec(), false, false, false);
+    private GeoWithinListOutput<String, String> sut = new GeoWithinListOutput<>(StringCodec.UTF8, false, false, false);
 
     @Test
     void defaultSubscriberIsSet() {
@@ -54,7 +55,7 @@ void commandOutputKeyOnlyDecoded() {
     @Test
     void commandOutputKeyAndDistanceDecoded() {
 
-        sut = new GeoWithinListOutput<>(new Utf8StringCodec(), true, false, false);
+        sut = new GeoWithinListOutput<>(StringCodec.UTF8, true, false, false);
 
         sut.multi(1);
         sut.set(ByteBuffer.wrap("key".getBytes()));
@@ -67,7 +68,7 @@ void commandOutputKeyAndDistanceDecoded() {
     @Test
     void commandOutputKeyAndHashDecoded() {
 
-        sut = new GeoWithinListOutput<>(new Utf8StringCodec(), false, true, false);
+        sut = new GeoWithinListOutput<>(StringCodec.UTF8, false, true, false);
 
         sut.multi(1);
         sut.set(ByteBuffer.wrap("key".getBytes()));
@@ -80,7 +81,7 @@ void commandOutputKeyAndHashDecoded() {
     @Test
     void commandOutputLongKeyAndHashDecoded() {
 
-        GeoWithinListOutput<Long, Long> sut = new GeoWithinListOutput<>((RedisCodec) new Utf8StringCodec(), false, true, false);
+        GeoWithinListOutput<Long, Long> sut = new GeoWithinListOutput<>((RedisCodec) StringCodec.UTF8, false, true, false);
 
         sut.multi(1);
         sut.set(1234);
@@ -93,7 +94,7 @@ void commandOutputLongKeyAndHashDecoded() {
     @Test
     void commandOutputKeyAndCoordinatesDecoded() {
 
-        sut = new GeoWithinListOutput<>(new Utf8StringCodec(), false, false, true);
+        sut = new GeoWithinListOutput<>(StringCodec.UTF8, false, false, true);
 
         sut.multi(1);
         sut.set(ByteBuffer.wrap("key".getBytes()));
diff --git a/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java
index cee91b53d5..a93b87b7e4 100644
--- a/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java
@@ -26,6 +26,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
@@ -35,15 +36,13 @@ class ListOutputUnitTests {
 
     static Collection<Fixture> parameters() {
 
-        Utf8StringCodec codec = new Utf8StringCodec();
-
-        KeyListOutput<String, String> keyListOutput = new KeyListOutput<>(codec);
+        KeyListOutput<String, String> keyListOutput = new KeyListOutput<>(StringCodec.UTF8);
         Fixture keyList = new Fixture(keyListOutput, keyListOutput, "hello world".getBytes(), "hello world");
 
-        ValueListOutput<String, String> valueListOutput = new ValueListOutput<>(codec);
+        ValueListOutput<String, String> valueListOutput = new ValueListOutput<>(StringCodec.UTF8);
         Fixture valueList = new Fixture(valueListOutput, valueListOutput, "hello world".getBytes(), "hello world");
 
-        StringListOutput<String, String> stringListOutput = new StringListOutput<>(codec);
+        StringListOutput<String, String> stringListOutput = new StringListOutput<>(StringCodec.UTF8);
         Fixture stringList = new Fixture(stringListOutput, stringListOutput, "hello world".getBytes(), "hello world");
 
         return Arrays.asList(keyList, valueList, stringList);
diff --git a/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java
index 8b4b3a77f2..61d768660c 100644
--- a/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java
@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.ScoredValue;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
@@ -30,7 +31,7 @@
  */
 class ScoredValueListOutputUnitTests {
 
-    private ScoredValueListOutput<String, String> sut = new ScoredValueListOutput<>(new Utf8StringCodec());
+    private ScoredValueListOutput<String, String> sut = new ScoredValueListOutput<>(StringCodec.UTF8);
 
     @Test
     void defaultSubscriberIsSet() {
diff --git a/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java b/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
index 0fca7c5d3b..f17472fffc 100644
--- a/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
@@ -28,6 +28,7 @@
 
 import io.lettuce.core.*;
 import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.CommandOutput;
 import io.lettuce.core.output.StatusOutput;
@@ -38,7 +39,7 @@
  */
 public class AsyncCommandUnitTests {
 
-    private RedisCodec<String, String> codec = new Utf8StringCodec();
+    private RedisCodec<String, String> codec = StringCodec.UTF8;
     private Command<String, String, String> internal;
     private AsyncCommand<String, String, String> sut;
 
diff --git a/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java
index a19bdf1a39..234db454b0 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java
@@ -23,7 +23,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.codec.ByteArrayCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
@@ -32,12 +32,10 @@
  */
 class CommandArgsUnitTests {
 
-    private Utf8StringCodec codec = new Utf8StringCodec();
-
     @Test
     void getFirstIntegerShouldReturnNull() {
 
-        CommandArgs<String, String> args = new CommandArgs<>(codec).add("foo");
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add("foo");
 
         assertThat(CommandArgsAccessor.getFirstInteger(args)).isNull();
     }
@@ -45,7 +43,8 @@ void getFirstIntegerShouldReturnNull() {
     @Test
     void getFirstIntegerShouldReturnFirstInteger() {
 
-        CommandArgs<String, String> args = new CommandArgs<>(codec).add(1L).add(127).add(128).add(129).add(0).add(-1);
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(1L).add(127).add(128).add(129).add(0)
+                .add(-1);
 
         assertThat(CommandArgsAccessor.getFirstInteger(args)).isEqualTo(1L);
     }
@@ -53,7 +52,7 @@ void getFirstIntegerShouldReturnFirstInteger() {
     @Test
     void getFirstIntegerShouldReturnFirstNegativeInteger() {
 
-        CommandArgs<String, String> args = new CommandArgs<>(codec).add(-1L).add(-127).add(-128).add(-129);
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(-1L).add(-127).add(-128).add(-129);
 
         assertThat(CommandArgsAccessor.getFirstInteger(args)).isEqualTo(-1L);
     }
@@ -61,7 +60,7 @@ void getFirstIntegerShouldReturnFirstNegativeInteger() {
     @Test
     void getFirstStringShouldReturnNull() {
 
-        CommandArgs<String, String> args = new CommandArgs<>(codec).add(1);
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(1);
 
         assertThat(CommandArgsAccessor.getFirstString(args)).isNull();
     }
@@ -69,7 +68,7 @@ void getFirstStringShouldReturnNull() {
     @Test
     void getFirstStringShouldReturnFirstString() {
 
-        CommandArgs<String, String> args = new CommandArgs<>(codec).add("one").add("two");
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add("one").add("two");
 
         assertThat(CommandArgsAccessor.getFirstString(args)).isEqualTo("one");
     }
@@ -77,7 +76,7 @@ void getFirstStringShouldReturnFirstString() {
     @Test
     void getFirstCharArrayShouldReturnCharArray() {
 
-        CommandArgs<String, String> args = new CommandArgs<>(codec).add(1L).add("two".toCharArray());
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(1L).add("two".toCharArray());
 
         assertThat(CommandArgsAccessor.getFirstCharArray(args)).isEqualTo("two".toCharArray());
     }
@@ -85,7 +84,7 @@ void getFirstCharArrayShouldReturnCharArray() {
     @Test
     void getFirstCharArrayShouldReturnNull() {
 
-        CommandArgs<String, String> args = new CommandArgs<>(codec).add(1L);
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(1L);
 
         assertThat(CommandArgsAccessor.getFirstCharArray(args)).isNull();
     }
@@ -93,7 +92,7 @@ void getFirstCharArrayShouldReturnNull() {
     @Test
     void getFirstEncodedKeyShouldReturnNull() {
 
-        CommandArgs<String, String> args = new CommandArgs<>(codec).add(1L);
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(1L);
 
         assertThat(CommandArgsAccessor.getFirstString(args)).isNull();
     }
@@ -101,7 +100,7 @@ void getFirstEncodedKeyShouldReturnNull() {
     @Test
     void getFirstEncodedKeyShouldReturnFirstKey() {
 
-        CommandArgs<String, String> args = new CommandArgs<>(codec).addKey("one").addKey("two");
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).addKey("one").addKey("two");
 
         assertThat(CommandArgsAccessor.encodeFirstKey(args)).isEqualTo(ByteBuffer.wrap("one".getBytes()));
     }
@@ -109,7 +108,7 @@ void getFirstEncodedKeyShouldReturnFirstKey() {
     @Test
     void addValues() {
 
-        CommandArgs<String, String> args = new CommandArgs<>(codec).addValues(Arrays.asList("1", "2"));
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).addValues(Arrays.asList("1", "2"));
 
         ByteBuf buffer = Unpooled.buffer();
         args.encode(buffer);
@@ -123,7 +122,7 @@ void addValues() {
     @Test
     void addByte() {
 
-        CommandArgs<String, String> args = new CommandArgs<>(codec).add("one".getBytes());
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add("one".getBytes());
 
         ByteBuf buffer = Unpooled.buffer();
         args.encode(buffer);
diff --git a/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java
index 14e77e475c..982afe00f9 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java
@@ -23,8 +23,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.RedisException;
-import io.lettuce.core.codec.RedisCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.CommandOutput;
 import io.lettuce.core.output.StatusOutput;
 
@@ -34,13 +33,12 @@
  */
 public class CommandUnitTests {
 
-    private RedisCodec<String, String> codec = new Utf8StringCodec();
     private Command<String, String, String> sut;
 
     @BeforeEach
     void createCommand() {
 
-        CommandOutput<String, String, String> output = new StatusOutput<>(codec);
+        CommandOutput<String, String, String> output = new StatusOutput<>(StringCodec.UTF8);
         sut = new Command<>(CommandType.INFO, output, null);
     }
 
@@ -84,7 +82,7 @@ void getError() {
     @Test
     void setOutputAfterCompleted() {
         sut.complete();
-        assertThatThrownBy(() -> sut.setOutput(new StatusOutput<>(codec))).isInstanceOf(IllegalStateException.class);
+        assertThatThrownBy(() -> sut.setOutput(new StatusOutput<>(StringCodec.UTF8))).isInstanceOf(IllegalStateException.class);
     }
 
     @Test
@@ -96,14 +94,14 @@ void testToString() {
     void customKeyword() {
 
         sut = new Command<>(MyKeywords.DUMMY, null, null);
-        sut.setOutput(new StatusOutput<>(codec));
+        sut.setOutput(new StatusOutput<>(StringCodec.UTF8));
 
         assertThat(sut.toString()).contains(MyKeywords.DUMMY.name());
     }
 
     @Test
     void customKeywordWithArgs() {
-        sut = new Command<>(MyKeywords.DUMMY, null, new CommandArgs<>(codec));
+        sut = new Command<>(MyKeywords.DUMMY, null, new CommandArgs<>(StringCodec.UTF8));
         sut.getArgs().add(MyKeywords.DUMMY);
         assertThat(sut.getArgs().toString()).contains(MyKeywords.DUMMY.name());
     }
@@ -118,7 +116,7 @@ void getWithTimeout() {
 
     @Test
     void outputSubclassOverride1() {
-        CommandOutput<String, String, String> output = new CommandOutput<String, String, String>(codec, null) {
+        CommandOutput<String, String, String> output = new CommandOutput<String, String, String>(StringCodec.UTF8, null) {
             @Override
             public String get() throws RedisException {
                 return null;
@@ -129,7 +127,7 @@ public String get() throws RedisException {
 
     @Test
     void outputSubclassOverride2() {
-        CommandOutput<String, String, String> output = new CommandOutput<String, String, String>(codec, null) {
+        CommandOutput<String, String, String> output = new CommandOutput<String, String, String>(StringCodec.UTF8, null) {
             @Override
             public String get() throws RedisException {
                 return null;
diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
index 63eb2d985e..f88c69b9ef 100644
--- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
@@ -49,6 +49,7 @@
 import edu.umd.cs.mtc.TestFramework;
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.RedisException;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.internal.LettuceFactories;
 import io.lettuce.core.output.StatusOutput;
@@ -70,7 +71,7 @@ class DefaultEndpointUnitTests {
     private DefaultEndpoint sut;
 
     private final Command<String, String, String> command = new Command<>(CommandType.APPEND, new StatusOutput<>(
-            new Utf8StringCodec()), null);
+            StringCodec.UTF8), null);
 
     @Mock
     private Channel channel;
diff --git a/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java b/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
index 7029a14559..8d74a51a0a 100644
--- a/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
@@ -19,7 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
 
@@ -35,7 +35,7 @@
 
 import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.RedisCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.*;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -45,8 +45,7 @@
  * @author Mark Paluch
  */
 class StateMachineUnitTests {
-    private RedisCodec<String, String> codec = new Utf8StringCodec();
-    private Charset charset = Charset.forName("UTF-8");
+    private RedisCodec<String, String> codec = StringCodec.UTF8;
     private CommandOutput<String, String, String> output;
     private RedisStateMachine rsm;
 
@@ -166,6 +165,6 @@ void sillyTestsForEmmaCoverage() {
     }
 
     ByteBuf buffer(String content) {
-        return Unpooled.copiedBuffer(content, charset);
+        return Unpooled.copiedBuffer(content, StandardCharsets.UTF_8);
     }
 }
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
index f25436b999..33a68864ee 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
@@ -64,7 +64,7 @@ class PubSubCommandHandlerUnitTests {
     private PubSubCommandHandler<String, String> sut;
 
     private final Command<String, String, String> command = new Command<>(CommandType.APPEND, new StatusOutput<>(
-            new Utf8StringCodec()), null);
+            StringCodec.UTF8), null);
 
     @Mock
     private ChannelHandlerContext context;
@@ -137,9 +137,9 @@ void shouldDecodeRegularCommand() throws Exception {
     @Test
     void shouldDecodeTwoCommands() throws Exception {
 
-        Command<String, String, String> command1 = new Command<>(CommandType.APPEND, new StatusOutput<>(new Utf8StringCodec()),
+        Command<String, String, String> command1 = new Command<>(CommandType.APPEND, new StatusOutput<>(StringCodec.UTF8),
                 null);
-        Command<String, String, String> command2 = new Command<>(CommandType.APPEND, new StatusOutput<>(new Utf8StringCodec()),
+        Command<String, String, String> command2 = new Command<>(CommandType.APPEND, new StatusOutput<>(StringCodec.UTF8),
                 null);
 
         sut.channelRegistered(context);
@@ -156,7 +156,7 @@ void shouldDecodeTwoCommands() throws Exception {
     @Test
     void shouldPropagatePubSubResponseToOutput() throws Exception {
 
-        Command<String, String, String> command1 = new Command<>(CommandType.APPEND, new StatusOutput<>(new Utf8StringCodec()),
+        Command<String, String, String> command1 = new Command<>(CommandType.APPEND, new StatusOutput<>(StringCodec.UTF8),
                 null);
 
         sut.channelRegistered(context);
@@ -173,9 +173,9 @@ void shouldPropagatePubSubResponseToOutput() throws Exception {
     @Test
     void shouldPropagateInterleavedPubSubResponseToOutput() throws Exception {
 
-        Command<String, String, String> command1 = new Command<>(CommandType.APPEND, new StatusOutput<>(new Utf8StringCodec()),
+        Command<String, String, String> command1 = new Command<>(CommandType.APPEND, new StatusOutput<>(StringCodec.UTF8),
                 null);
-        Command<String, String, String> command2 = new Command<>(CommandType.APPEND, new StatusOutput<>(new Utf8StringCodec()),
+        Command<String, String, String> command2 = new Command<>(CommandType.APPEND, new StatusOutput<>(StringCodec.UTF8),
                 null);
 
         sut.channelRegistered(context);
@@ -200,9 +200,9 @@ void shouldPropagateInterleavedPubSubResponseToOutput() throws Exception {
     void shouldNotPropagatePartialPubSubResponseToOutput() throws Exception {
 
         Command<String, String, String> command1 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(
-                new Utf8StringCodec()), null);
+                StringCodec.UTF8), null);
         Command<String, String, String> command2 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(
-                new Utf8StringCodec()), null);
+                StringCodec.UTF8), null);
 
         sut.channelRegistered(context);
         sut.channelActive(context);
@@ -227,9 +227,9 @@ void shouldNotPropagatePartialPubSubResponseToOutput() throws Exception {
     void shouldCompleteWithChunkedResponseOnStack() throws Exception {
 
         Command<String, String, String> command1 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(
-                new Utf8StringCodec()), null);
+                StringCodec.UTF8), null);
         Command<String, String, String> command2 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(
-                new Utf8StringCodec()), null);
+                StringCodec.UTF8), null);
 
         sut.channelRegistered(context);
         sut.channelActive(context);
@@ -271,9 +271,9 @@ void shouldCompleteWithChunkedResponseOutOfBand() throws Exception {
     void shouldCompleteUnsubscribe() throws Exception {
 
         Command<String, String, String> subCmd = new Command<>(CommandType.SUBSCRIBE,
-                new PubSubOutput<>(new Utf8StringCodec()), null);
+                new PubSubOutput<>(StringCodec.UTF8), null);
         Command<String, String, String> unSubCmd = new Command<>(CommandType.UNSUBSCRIBE, new PubSubOutput<>(
-                new Utf8StringCodec()), null);
+                StringCodec.UTF8), null);
 
         doAnswer((Answer<PubSubEndpoint<String, String>>) inv -> {
             PubSubOutput<String, String, String> out = inv.getArgument(0);
@@ -301,7 +301,7 @@ void shouldCompleteUnsubscribe() throws Exception {
     void shouldCompleteWithChunkedResponseInterleavedSending() throws Exception {
 
         Command<String, String, String> command1 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(
-                new Utf8StringCodec()), null);
+                StringCodec.UTF8), null);
 
         sut.channelRegistered(context);
         sut.channelActive(context);
diff --git a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
index 8609250d64..beea7bd82e 100644
--- a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
+++ b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
@@ -32,6 +32,7 @@
 import io.lettuce.core.TestRedisPublisher;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.ValueListOutput;
 import io.lettuce.core.protocol.Command;
@@ -47,7 +48,6 @@
  */
 public class RedisPublisherVerification extends PublisherVerification<String> {
 
-    private static final Utf8StringCodec CODEC = new Utf8StringCodec();
     private static RedisClient client;
     private static StatefulRedisConnection<String, String> connection;
 
@@ -85,8 +85,8 @@ public Publisher<String> createPublisher(long elements) {
         }
 
         Supplier<Command<String, String, List<String>>> supplier = () -> {
-            CommandArgs<String, String> args = new CommandArgs<>(CODEC).addKey(key).add(0).add(-1);
-            return new Command<>(LRANGE, new ValueListOutput<>(CODEC), args);
+            CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).addKey(key).add(0).add(-1);
+            return new Command<>(LRANGE, new ValueListOutput<>(StringCodec.UTF8), args);
         };
 
         return new TestRedisPublisher(supplier, connection, true);
diff --git a/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
index f12aa325e0..b78b4434e1 100644
--- a/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
@@ -29,7 +29,7 @@
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.IntegerOutput;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
@@ -46,7 +46,6 @@
  */
 class AtLeastOnceTest extends AbstractRedisClientTest {
 
-    private final Utf8StringCodec CODEC = new Utf8StringCodec();
     private String key = "key";
 
     @BeforeEach
@@ -136,13 +135,13 @@ void commandFailsWhenFailOnEncode() {
 
         connection.set(key, "1");
         AsyncCommand<String, String, String> working = new AsyncCommand<>(new Command<>(CommandType.INCR, new IntegerOutput(
-                CODEC), new CommandArgs<>(CODEC).addKey(key)));
+                StringCodec.UTF8), new CommandArgs<>(StringCodec.UTF8).addKey(key)));
         channelWriter.write(working);
         assertThat(working.await(2, TimeUnit.SECONDS)).isTrue();
         assertThat(connection.get(key)).isEqualTo("2");
 
         AsyncCommand<String, String, Object> command = new AsyncCommand(new Command<>(CommandType.INCR,
-                new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key))) {
+                new IntegerOutput(StringCodec.UTF8), new CommandArgs<>(StringCodec.UTF8).addKey(key))) {
 
             @Override
             public void encode(ByteBuf buf) {
@@ -254,8 +253,8 @@ void commandRetriedChannelClosesWhileFlush() {
     }
 
     AsyncCommand<String, String, Object> getBlockOnEncodeCommand(final CountDownLatch block) {
-        return new AsyncCommand<String, String, Object>(new Command<>(CommandType.INCR, new IntegerOutput(CODEC),
-                new CommandArgs<>(CODEC).addKey(key))) {
+        return new AsyncCommand<String, String, Object>(new Command<>(CommandType.INCR, new IntegerOutput(StringCodec.UTF8),
+                new CommandArgs<>(StringCodec.UTF8).addKey(key))) {
 
             @Override
             public void encode(ByteBuf buf) {
@@ -278,7 +277,7 @@ void commandFailsDuringDecode() {
         connection.set(key, "1");
 
         AsyncCommand<String, String, String> command = new AsyncCommand(new Command<>(CommandType.INCR, new StatusOutput<>(
-                CODEC), new CommandArgs<>(CODEC).addKey(key)));
+                StringCodec.UTF8), new CommandArgs<>(StringCodec.UTF8).addKey(key)));
 
         channelWriter.write(command);
 
diff --git a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
index 2038c99606..63d578b5ab 100644
--- a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
@@ -32,7 +32,7 @@
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.IntegerOutput;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.AsyncCommand;
@@ -54,7 +54,6 @@
 @SuppressWarnings("rawtypes")
 class AtMostOnceTest extends AbstractRedisClientTest {
 
-    private final Utf8StringCodec CODEC = new Utf8StringCodec();
     private String key = "key";
 
     @BeforeEach
@@ -143,14 +142,14 @@ void commandNotExecutedFailsOnEncode() {
 
         sync.set(key, "1");
         AsyncCommand<String, String, String> working = new AsyncCommand<>(new Command<String, String, String>(CommandType.INCR,
-                new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key)));
+                new IntegerOutput(StringCodec.UTF8), new CommandArgs<>(StringCodec.UTF8).addKey(key)));
         channelWriter.write(working);
         assertThat(working.await(2, TimeUnit.SECONDS)).isTrue();
         assertThat(sync.get(key)).isEqualTo("2");
 
         AsyncCommand<String, String, Object> command = new AsyncCommand<String, String, Object>(
-                new Command<String, String, Object>(CommandType.INCR, new IntegerOutput(CODEC),
-                        new CommandArgs<>(CODEC).addKey(key))) {
+                new Command<String, String, Object>(CommandType.INCR, new IntegerOutput(StringCodec.UTF8),
+                        new CommandArgs<>(StringCodec.UTF8).addKey(key))) {
 
             @Override
             public void encode(ByteBuf buf) {
@@ -193,7 +192,7 @@ void commandNotExecutedChannelClosesWhileFlush() {
         final CountDownLatch block = new CountDownLatch(1);
 
         AsyncCommand<String, String, Object> command = new AsyncCommand<String, String, Object>(new Command<>(CommandType.INCR,
-                new IntegerOutput(CODEC), new CommandArgs<>(CODEC).addKey(key))) {
+                new IntegerOutput(StringCodec.UTF8), new CommandArgs<>(StringCodec.UTF8).addKey(key))) {
 
             @Override
             public void encode(ByteBuf buf) {
@@ -236,8 +235,8 @@ void commandFailsDuringDecode() {
 
         sync.set(key, "1");
 
-        AsyncCommand<String, String, String> command = new AsyncCommand<>(new Command<>(CommandType.INCR, new StatusOutput<>(
-                CODEC), new CommandArgs<>(CODEC).addKey(key)));
+        AsyncCommand<String, String, String> command = new AsyncCommand<>(new Command<>(CommandType.INCR,
+                new StatusOutput<>(StringCodec.UTF8), new CommandArgs<>(StringCodec.UTF8).addKey(key)));
 
         channelWriter.write(command);
 
diff --git a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
index d901ac904f..6b6c41b200 100644
--- a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
+++ b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
@@ -21,6 +21,7 @@
 import io.lettuce.core.ReadFrom;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.masterslave.MasterSlave;
 import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection;
@@ -40,7 +41,7 @@ public static void main(String[] args) {
                 RedisURI.create("redis://host3"));
 
         StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave
-                .connect(redisClient, new Utf8StringCodec(), nodes);
+                .connect(redisClient, StringCodec.UTF8, nodes);
         connection.setReadFrom(ReadFrom.MASTER_PREFERRED);
 
         System.out.println("Connected to Redis");
diff --git a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
index 2c018d30d7..618baafe26 100644
--- a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
+++ b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
@@ -18,6 +18,7 @@
 import io.lettuce.core.ReadFrom;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.masterslave.MasterSlave;
 import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection;
@@ -31,7 +32,7 @@ public static void main(String[] args) {
         // Syntax: redis-sentinel://[password@]host[:port][,host2[:port2]][/databaseNumber]#sentinelMasterId
         RedisClient redisClient = RedisClient.create();
 
-        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient, new Utf8StringCodec(),
+        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8,
                 RedisURI.create("redis-sentinel://localhost:26379,localhost:26380/0#mymaster"));
         connection.setReadFrom(ReadFrom.MASTER_PREFERRED);
 

From b50f98a8b94013fb1106999a7af57befe4f47ac7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Sep 2019 11:05:23 +0200
Subject: [PATCH 675/808] Polishing #1138

Simplify assembly. Upgrade RS TCK to 1.0.3.
---
 pom.xml               | 22 ++++------------------
 src/assembly/bin.xml  |  9 ---------
 src/assembly/docs.xml |  2 +-
 src/assembly/src.xml  | 23 -----------------------
 4 files changed, 5 insertions(+), 51 deletions(-)
 delete mode 100644 src/assembly/src.xml

diff --git a/pom.xml b/pom.xml
index dbd0a1a6ef..bc0daa42d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
         <mockito.version>3.0.0</mockito.version>
         <netty-version>4.1.42.Final</netty-version>
         <reactor-version>3.3.0.RELEASE</reactor-version>
-        <reactive-streams-tck.version>1.0.0</reactive-streams-tck.version>
+        <reactive-streams-tck.version>1.0.3</reactive-streams-tck.version>
         <slf4j.version>1.7.25</slf4j.version>
         <spring-version>4.3.20.RELEASE</spring-version>
 
@@ -711,7 +711,7 @@
                             <stylesheetfile>src/main/javadoc/stylesheet.css</stylesheetfile>
                             <links>
                                 <link>https://netty.io/4.1/api/</link>
-                                <link>https://commons.apache.org/proper/commons-pool/api-2.4.2/</link>
+                                <link>https://commons.apache.org/proper/commons-pool/api-2.7.0/</link>
                                 <link>http://reactivex.io/RxJava/1.x/javadoc/</link>
                                 <link>http://reactivex.io/RxJava/javadoc/</link>
                                 <link>https://projectreactor.io/docs/core/release/api/</link>
@@ -748,20 +748,6 @@
                         <artifactId>maven-assembly-plugin</artifactId>
                         <version>3.1.1</version>
                         <executions>
-                            <execution>
-                                <id>src</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <attach>false</attach>
-                                </configuration>
-                            </execution>
                             <execution>
                                 <id>bin</id>
                                 <configuration>
@@ -979,12 +965,12 @@
                     <plugin>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctor-maven-plugin</artifactId>
-                        <version>1.5.6</version>
+                        <version>2.0.0-RC.1</version>
                         <dependencies>
                             <dependency>
                                 <groupId>org.asciidoctor</groupId>
                                 <artifactId>asciidoctorj-pdf</artifactId>
-                                <version>1.5.0-alpha.16</version>
+                                <version>1.5.0-beta.5</version>
                             </dependency>
                         </dependencies>
                         <executions>
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index 891bfdcf58..2365757bfb 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -14,19 +14,10 @@
             <includes>
                 <include>io.lettuce:lettuce-core:jar:${project.version}</include>
             </includes>
-            <outputDirectory></outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>true</useProjectArtifact>
             <useProjectAttachments>true</useProjectAttachments>
         </dependencySet>
-        <dependencySet>
-            <includes>
-                <include>io.netty:netty-transport-native-epoll</include>
-            </includes>
-            <scope>provided</scope>
-            <outputDirectory>dependencies</outputDirectory>
-            <unpack>false</unpack>
-        </dependencySet>
         <dependencySet>
             <includes>
                 <include>io.netty:*</include>
diff --git a/src/assembly/docs.xml b/src/assembly/docs.xml
index 9971aab3f3..60d345f53e 100644
--- a/src/assembly/docs.xml
+++ b/src/assembly/docs.xml
@@ -10,7 +10,7 @@
     <fileSets>
         <fileSet>
             <directory>${project.build.directory}/site/reference/html</directory>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory/>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
     </fileSets>
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
deleted file mode 100644
index 739ade2591..0000000000
--- a/src/assembly/src.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-
-    <id>src</id>
-    <formats>
-        <format>zip</format>
-        <format>tar.gz</format>
-    </formats>
-    <baseDirectory>${project.version}-${project.version}-src</baseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>src/main/java</directory>
-            <outputDirectory>/</outputDirectory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/resources</directory>
-            <outputDirectory>/</outputDirectory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-        </fileSet>
-    </fileSets>
-</assembly>
\ No newline at end of file

From 55ebef8b5c095869aecf8cea8eb9eb5da585badf Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Sep 2019 14:42:37 +0200
Subject: [PATCH 676/808] [maven-release-plugin] prepare release 5.2.0.RELEASE

---
 pom.xml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index bc0daa42d4..785349ab14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -10,7 +9,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.2.0.BUILD-SNAPSHOT</version>
+    <version>5.2.0.RELEASE</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -78,7 +77,8 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-    </scm>
+      <tag>5.2.0.RELEASE</tag>
+  </scm>
 
     <dependencyManagement>
         <dependencies>
@@ -875,7 +875,7 @@
                                     <arguments>
                                         <argument>-Xmx2G</argument>
                                         <argument>-classpath</argument>
-                                        <classpath/>
+                                        <classpath />
                                         <argument>org.openjdk.jmh.Main</argument>
                                         <argument>.*</argument>
                                         <argument>-tu</argument>
@@ -949,9 +949,7 @@
                                 <phase>process-resources</phase>
                                 <configuration>
                                     <target>
-                                        <copy failonerror="false"
-                                              file="${project.build.directory}/generated-docs/index.pdf"
-                                              tofile="target/site/reference/pdf/lettuce-reference.pdf"/>
+                                        <copy failonerror="false" file="${project.build.directory}/generated-docs/index.pdf" tofile="target/site/reference/pdf/lettuce-reference.pdf" />
                                     </target>
                                 </configuration>
                                 <goals>
@@ -1018,9 +1016,9 @@
                                 <toclevels>3</toclevels>
                                 <numbered>true</numbered>
                                 <ext-doc>https://raw.githubusercontent.com/wiki/lettuce-io/lettuce-core/</ext-doc>
-                                <allow-uri-read/>
-                                <docinfo/>
-                                <toc2/>
+                                <allow-uri-read />
+                                <docinfo />
+                                <toc2 />
                                 <icons>font</icons>
                                 <source-highlighter>coderay</source-highlighter>
                             </attributes>

From 2b572a31fe882275833c8e3c17146d65e4dda3e4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Sep 2019 14:42:45 +0200
Subject: [PATCH 677/808] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 785349ab14..afdd0e17b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>5.2.0.RELEASE</version>
+    <version>6.0.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -77,7 +77,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-      <tag>5.2.0.RELEASE</tag>
+      <tag>HEAD</tag>
   </scm>
 
     <dependencyManagement>

From 68f4201de153c94fa432d95ca7563dcf8ceb6edc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 16 Oct 2019 12:18:00 +0200
Subject: [PATCH 678/808] Polishing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Introduce null guards. Ensure Input/OutputStreams are closed. Add synchronized keyword to methods overriding synchronized methods. Add missing hashCode methods to types overriding equals(…).
---
 src/main/java/io/lettuce/core/RedisURI.java   |  5 +-
 .../models/slots/ClusterSlotsParser.java      | 12 ++--
 .../lettuce/core/codec/CompressionCodec.java  | 63 +++++++++++--------
 .../core/dynamic/RedisCommandFactory.java     |  5 +-
 .../core/dynamic/support/ResolvableType.java  | 15 +++--
 .../support/TypeVariableTypeInformation.java  |  9 ++-
 .../core/dynamic/support/TypeWrapper.java     |  4 +-
 .../core/support/ConnectionPoolSupport.java   |  4 +-
 8 files changed, 72 insertions(+), 45 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index f4d682b91c..509258eb88 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -909,6 +909,8 @@ private static Builder configureStandalone(URI uri) {
             }
         }
 
+        LettuceAssert.notNull(builder, "Invalid URI, cannot get host or socket part");
+
         if (URI_SCHEME_REDIS_SECURE.equals(uri.getScheme()) || URI_SCHEME_REDIS_SECURE_ALT.equals(uri.getScheme())) {
             builder.withSsl(true);
         }
@@ -958,6 +960,8 @@ private static RedisURI.Builder configureSentinel(URI uri) {
             }
         }
 
+        LettuceAssert.notNull(builder, "Invalid URI, cannot get host part");
+
         if (isNotEmpty(masterId)) {
             builder.withSentinelMasterId(masterId);
         }
@@ -966,7 +970,6 @@ private static RedisURI.Builder configureSentinel(URI uri) {
             builder.withSsl(true);
         }
 
-        LettuceAssert.notNull(builder, "Invalid URI, cannot get host part");
         return builder;
     }
 
diff --git a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
index 1ffd42ead6..82312aedaf 100644
--- a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
+++ b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
@@ -81,7 +81,7 @@ private static ClusterSlotRange parseRange(List<?> range, Map<String, RedisClust
         List<RedisClusterNode> replicas = new ArrayList<>();
         if (iterator.hasNext()) {
             master = getRedisClusterNode(iterator, nodeCache);
-            if(master != null) {
+            if (master != null) {
                 master.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.MASTER));
                 Set<Integer> slots = new TreeSet<>(master.getSlots());
                 slots.addAll(createSlots(from, to));
@@ -91,7 +91,7 @@ private static ClusterSlotRange parseRange(List<?> range, Map<String, RedisClust
 
         while (iterator.hasNext()) {
             RedisClusterNode replica = getRedisClusterNode(iterator, nodeCache);
-            if (replica != null) {
+            if (replica != null && master != null) {
                 replica.setSlaveOf(master.getNodeId());
                 replica.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.SLAVE));
                 replicas.add(replica);
@@ -123,21 +123,19 @@ private static RedisClusterNode getRedisClusterNode(Iterator<?> iterator, Map<St
             int port = Math.toIntExact(getLongFromIterator(hostAndPortIterator, 0));
             String nodeId;
 
-
             if (hostAndPortIterator.hasNext()) {
                 nodeId = (String) hostAndPortIterator.next();
 
                 redisClusterNode = nodeCache.get(nodeId);
-                if(redisClusterNode == null) {
+                if (redisClusterNode == null) {
                     redisClusterNode = createNode(host, port);
                     nodeCache.put(nodeId, redisClusterNode);
                     redisClusterNode.setNodeId(nodeId);
                 }
-            }
-            else {
+            } else {
                 String key = host + ":" + port;
                 redisClusterNode = nodeCache.get(key);
-                if(redisClusterNode == null) {
+                if (redisClusterNode == null) {
                     redisClusterNode = createNode(host, port);
                     nodeCache.put(key, redisClusterNode);
                 }
diff --git a/src/main/java/io/lettuce/core/codec/CompressionCodec.java b/src/main/java/io/lettuce/core/codec/CompressionCodec.java
index a912cff0a4..948d9e90c2 100644
--- a/src/main/java/io/lettuce/core/codec/CompressionCodec.java
+++ b/src/main/java/io/lettuce/core/codec/CompressionCodec.java
@@ -97,24 +97,30 @@ private ByteBuffer compress(ByteBuffer source) throws IOException {
                 return source;
             }
 
-            ByteBufferInputStream sourceStream = new ByteBufferInputStream(source);
             ByteArrayOutputStream outputStream = new ByteArrayOutputStream(source.remaining() / 2);
             OutputStream compressor = null;
-            if (compressionType == CompressionType.GZIP) {
-                compressor = new GZIPOutputStream(outputStream);
-            }
-
-            if (compressionType == CompressionType.DEFLATE) {
-                compressor = new DeflaterOutputStream(outputStream);
-            }
 
             try {
-                copy(sourceStream, compressor);
+                try (ByteBufferInputStream sourceStream = new ByteBufferInputStream(source)) {
+                    if (compressionType == CompressionType.GZIP) {
+                        compressor = new GZIPOutputStream(outputStream);
+                    }
+
+                    if (compressionType == CompressionType.DEFLATE) {
+                        compressor = new DeflaterOutputStream(outputStream);
+                    }
+                    copy(sourceStream, compressor);
+                } finally {
+
+                    if (compressor != null) {
+                        compressor.close();
+                    }
+                }
+
+                return ByteBuffer.wrap(outputStream.toByteArray());
             } finally {
-                compressor.close();
+                outputStream.close();
             }
-
-            return ByteBuffer.wrap(outputStream.toByteArray());
         }
 
         private ByteBuffer decompress(ByteBuffer source) throws IOException {
@@ -122,24 +128,31 @@ private ByteBuffer decompress(ByteBuffer source) throws IOException {
                 return source;
             }
 
-            ByteBufferInputStream sourceStream = new ByteBufferInputStream(source);
-            ByteArrayOutputStream outputStream = new ByteArrayOutputStream(source.remaining() * 2);
             InputStream decompressor = null;
-            if (compressionType == CompressionType.GZIP) {
-                decompressor = new GZIPInputStream(sourceStream);
-            }
-
-            if (compressionType == CompressionType.DEFLATE) {
-                decompressor = new InflaterInputStream(sourceStream);
-            }
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream(source.remaining() * 2);
 
             try {
-                copy(decompressor, outputStream);
+                try (ByteBufferInputStream sourceStream = new ByteBufferInputStream(source);) {
+
+                    if (compressionType == CompressionType.GZIP) {
+                        decompressor = new GZIPInputStream(sourceStream);
+                    }
+
+                    if (compressionType == CompressionType.DEFLATE) {
+                        decompressor = new InflaterInputStream(sourceStream);
+                    }
+
+                    copy(decompressor, outputStream);
+                } finally {
+                    if (decompressor != null) {
+                        decompressor.close();
+                    }
+                }
+
+                return ByteBuffer.wrap(outputStream.toByteArray());
             } finally {
-                decompressor.close();
+                outputStream.close();
             }
-
-            return ByteBuffer.wrap(outputStream.toByteArray());
         }
     }
 
diff --git a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
index a133500a08..9e1f28b8b1 100644
--- a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
@@ -271,7 +271,7 @@ private AbstractRedisReactiveCommands getReactiveCommands() {
                 reactive = ((StatefulRedisClusterConnection) connection).reactive();
             }
 
-            if (Proxy.isProxyClass(reactive.getClass())) {
+            if (reactive != null && Proxy.isProxyClass(reactive.getClass())) {
 
                 InvocationHandler invocationHandler = Proxy.getInvocationHandler(reactive);
                 reactive = ConnectionWrapping.unwrap(invocationHandler);
@@ -302,7 +302,8 @@ class BatchAwareCommandLookupStrategy implements ExecutableCommandLookupStrategy
         private Batcher batcher = Batcher.NONE;
         private BatchExecutableCommandLookupStrategy batchingStrategy;
 
-        public BatchAwareCommandLookupStrategy(ExecutableCommandLookupStrategy fallbackStrategy, RedisCommandsMetadata metadata) {
+        public BatchAwareCommandLookupStrategy(ExecutableCommandLookupStrategy fallbackStrategy,
+                RedisCommandsMetadata metadata) {
 
             this.fallbackStrategy = fallbackStrategy;
             this.verifier = verifyCommandMethods ? commandMethodVerifier : CommandMethodVerifier.NONE;
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java b/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java
index 012697f429..2c7e185564 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java
@@ -17,10 +17,7 @@
 
 import java.io.Serializable;
 import java.lang.reflect.*;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.IdentityHashMap;
-import java.util.Map;
+import java.util.*;
 
 import io.lettuce.core.LettuceStrings;
 import io.lettuce.core.dynamic.support.TypeWrapper.MethodParameterTypeProvider;
@@ -384,7 +381,7 @@ public ResolvableType getSuperType() {
     public ResolvableType[] getInterfaces() {
         Class<?> resolved = resolve();
         Object[] array = resolved.getGenericInterfaces();
-        if (resolved == null || (array == null || array.length == 0)) {
+        if (array == null || array.length == 0) {
             return EMPTY_TYPES_ARRAY;
         }
         if (this.interfaces == null) {
@@ -769,6 +766,14 @@ public boolean equals(Object other) {
         return true;
     }
 
+    @Override
+    public int hashCode() {
+        int result = Objects.hash(type, typeProvider, variableResolver, componentType, resolved, superType);
+        result = 31 * result + Arrays.hashCode(interfaces);
+        result = 31 * result + Arrays.hashCode(generics);
+        return result;
+    }
+
     /**
      * Adapts this {@link ResolvableType} to a {@link VariableResolver}.
      */
diff --git a/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java
index 4dbf7f3863..27e54dff41 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import io.lettuce.core.internal.LettuceAssert;
 
@@ -39,7 +40,8 @@ public class TypeVariableTypeInformation<T> extends ParentTypeAwareTypeInformati
      *
      * @param variable must not be {@literal null}
      * @param owningType must not be {@literal null}
-     * @param parent
+     * @param parent can be be {@literal null}
+     * @param typeVariableMap must not be {@literal null}
      */
     public TypeVariableTypeInformation(TypeVariable<?> variable, Type owningType, TypeDiscoverer<?> parent,
             Map<TypeVariable<?>, Type> typeVariableMap) {
@@ -117,6 +119,11 @@ public boolean equals(Object obj) {
         return getType().equals(that.getType());
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), variable, owningType);
+    }
+
     @Override
     public String toString() {
         return variable.getName();
diff --git a/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java b/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java
index 44a86856a0..ba99766be9 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java
@@ -209,9 +209,9 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
                 return this.provider;
             }
 
-            if (Type.class == method.getReturnType() && args == null) {
+            if (Type.class == method.getReturnType()) {
                 return forTypeProvider(new MethodInvokeTypeProvider(this.provider, method, -1));
-            } else if (Type[].class == method.getReturnType() && args == null) {
+            } else if (Type[].class == method.getReturnType()) {
                 Type[] result = new Type[((Type[]) method.invoke(this.provider.getType(), args)).length];
                 for (int i = 0; i < result.length; i++) {
                     result[i] = forTypeProvider(new MethodInvokeTypeProvider(this.provider, method, i));
diff --git a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
index 2ba82f5cd4..9d2ccf243d 100644
--- a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
+++ b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
@@ -171,13 +171,13 @@ public void returnObject(T obj) {
 
         SoftReferenceObjectPool<T> pool = new SoftReferenceObjectPool<T>(new RedisPooledObjectFactory<>(connectionSupplier)) {
             @Override
-            public T borrowObject() throws Exception {
+            public synchronized T borrowObject() throws Exception {
                 return wrapConnections ? ConnectionWrapping.wrapConnection(super.borrowObject(), poolRef.get()) : super
                         .borrowObject();
             }
 
             @Override
-            public void returnObject(T obj) throws Exception {
+            public synchronized void returnObject(T obj) throws Exception {
 
                 if (wrapConnections && obj instanceof HasTargetConnection) {
                     super.returnObject((T) ((HasTargetConnection) obj).getTargetConnection());

From 45138d7367bb9f40f42f2dffe478c9821e47d8e4 Mon Sep 17 00:00:00 2001
From: Manyanda Chitimbo <manyanda.chitimbo@gmail.com>
Date: Tue, 15 Oct 2019 19:07:52 +0200
Subject: [PATCH 679/808] Simplify the condition to invoke resolveCodec method
 in AnnotationRedisCodecResolver #1149

This adds a 'methodHasAtMostOneCodec' utility method to check whether a
CommandMethod has at most one codec

Original pull request: #1150.
---
 .../codec/AnnotationRedisCodecResolver.java   | 21 +++++++++++--------
 ...AnnotationRedisCodecResolverUnitTests.java | 11 ++++++++--
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
index ebb1ee5d17..5fa2a549b0 100644
--- a/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
@@ -33,9 +33,9 @@
  * determine a {@link RedisCodec} that is able to handle all involved types.
  *
  * @author Mark Paluch
- * @since 5.0
  * @see Key
  * @see Value
+ * @since 5.0
  */
 public class AnnotationRedisCodecResolver implements RedisCodecResolver {
 
@@ -71,18 +71,23 @@ public AnnotationRedisCodecResolver(List<RedisCodec<?, ?>> codecs) {
             return codecs.get(0);
         }
 
-        if ((keyTypes.size() == 1 && (valueTypes.isEmpty() || valueTypes.size() == 1))
-                || (valueTypes.size() == 1 && (keyTypes.isEmpty() || keyTypes.size() == 1))) {
-
-            RedisCodec<?, ?> codec = resolveCodec(keyTypes, valueTypes);
-            if (codec != null) {
-                return codec;
+        if (methodHasAtMostOneCodec(keyTypes, valueTypes)) {
+            RedisCodec<?, ?> resolvedCodec = resolveCodec(keyTypes, valueTypes);
+            if (resolvedCodec != null) {
+                return resolvedCodec;
             }
         }
 
         throw new IllegalStateException(String.format("Cannot resolve Codec for method %s", commandMethod.getMethod()));
     }
 
+    private boolean methodHasAtMostOneCodec(Set<Class<?>> keyTypes, Set<Class<?>> valueTypes) {
+        final int keyTypesSize = keyTypes.size();
+        final int valueTypesSize = valueTypes.size();
+
+        return keyTypesSize == 1 && valueTypesSize <= 1 || valueTypesSize == 1 && keyTypesSize <= 1;
+    }
+
     private Voted<RedisCodec<?, ?>> voteForTypeMajority(CommandMethod commandMethod) {
 
         List<Voted<RedisCodec<?, ?>>> votes = codecs.stream().map(redisCodec -> new Voted<RedisCodec<?, ?>>(redisCodec, 0))
@@ -139,12 +144,10 @@ private static void vote(List<Voted<RedisCodec<?, ?>>> votes, Parameter paramete
     }
 
     private RedisCodec<?, ?> resolveCodec(Set<Class<?>> keyTypes, Set<Class<?>> valueTypes) {
-
         Class<?> keyType = keyTypes.isEmpty() ? null : keyTypes.iterator().next();
         Class<?> valueType = valueTypes.isEmpty() ? null : valueTypes.iterator().next();
 
         for (RedisCodec<?, ?> codec : codecs) {
-
             ClassTypeInformation<?> typeInformation = ClassTypeInformation.from(codec.getClass());
             TypeInformation<?> keyTypeArgument = typeInformation.getTypeArgument(RedisCodec.class, 0);
             TypeInformation<?> valueTypeArgument = typeInformation.getTypeArgument(RedisCodec.class, 1);
diff --git a/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java
index 35f399c8ed..ffe51f61d0 100644
--- a/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java
@@ -89,12 +89,17 @@ void shouldResolveHintedByteArrayValue() {
     }
 
     @Test
-    void resolutionShouldFail() {
-
+    void resolutionOfMethodWithMixedTypesShouldFail() {
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "mixedTypes", String.class, byte[].class);
         assertThatThrownBy(() -> resolve(method)).isInstanceOf(IllegalStateException. class);
     }
 
+    @Test
+    void resolutionOfMethodWithMixedCodecsShouldFail() {
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, "mixedCodecs",  String.class, byte[].class, String.class);
+        assertThatThrownBy(() -> resolve(method)).isInstanceOf(IllegalStateException. class);
+    }
+
     @Test
     void shouldDiscoverCodecTypesFromWrappers() {
 
@@ -129,6 +134,8 @@ private static interface CommandMethods {
 
         String mixedTypes(@Key String key, @Value byte[] value);
 
+        String mixedCodecs(@Key String key1, @Key byte[] key2, @Value String value);
+
         String withWrappers(@Value Range<String> range, @Value io.lettuce.core.Value<Number> value);
 
         String withMap(Map<Integer, String> map);

From edcc5a9a310232140e46d3c097c3bad6e5119510 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 16 Oct 2019 20:59:49 +0200
Subject: [PATCH 680/808] Polishing #1149

Add author tags. Remove final from local variables. Extract atMostOne check into method.

Original pull request: #1150.
---
 .../dynamic/codec/AnnotationRedisCodecResolver.java  | 12 +++++-------
 .../codec/AnnotationRedisCodecResolverUnitTests.java | 10 +++++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
index 5fa2a549b0..94d9f87a04 100644
--- a/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
@@ -33,9 +33,10 @@
  * determine a {@link RedisCodec} that is able to handle all involved types.
  *
  * @author Mark Paluch
+ * @author Manyanda Chitimbo
+ * @since 5.0
  * @see Key
  * @see Value
- * @since 5.0
  */
 public class AnnotationRedisCodecResolver implements RedisCodecResolver {
 
@@ -71,7 +72,7 @@ public AnnotationRedisCodecResolver(List<RedisCodec<?, ?>> codecs) {
             return codecs.get(0);
         }
 
-        if (methodHasAtMostOneCodec(keyTypes, valueTypes)) {
+        if ((keyTypes.size() == 1 && hasAtMostOne(valueTypes)) || (valueTypes.size() == 1 && hasAtMostOne(keyTypes))) {
             RedisCodec<?, ?> resolvedCodec = resolveCodec(keyTypes, valueTypes);
             if (resolvedCodec != null) {
                 return resolvedCodec;
@@ -81,11 +82,8 @@ public AnnotationRedisCodecResolver(List<RedisCodec<?, ?>> codecs) {
         throw new IllegalStateException(String.format("Cannot resolve Codec for method %s", commandMethod.getMethod()));
     }
 
-    private boolean methodHasAtMostOneCodec(Set<Class<?>> keyTypes, Set<Class<?>> valueTypes) {
-        final int keyTypesSize = keyTypes.size();
-        final int valueTypesSize = valueTypes.size();
-
-        return keyTypesSize == 1 && valueTypesSize <= 1 || valueTypesSize == 1 && keyTypesSize <= 1;
+    private boolean hasAtMostOne(Collection<?> collection) {
+        return collection.size() <= 1;
     }
 
     private Voted<RedisCodec<?, ?>> voteForTypeMajority(CommandMethod commandMethod) {
diff --git a/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java
index ffe51f61d0..8a7f6ab946 100644
--- a/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java
@@ -37,7 +37,10 @@
 import io.lettuce.core.dynamic.support.ReflectionUtils;
 
 /**
+ * Unit tests for {@link AnnotationRedisCodecResolver}.
+ *
  * @author Mark Paluch
+ * @author Manyanda Chitimbo
  */
 class AnnotationRedisCodecResolverUnitTests {
 
@@ -91,13 +94,14 @@ void shouldResolveHintedByteArrayValue() {
     @Test
     void resolutionOfMethodWithMixedTypesShouldFail() {
         Method method = ReflectionUtils.findMethod(CommandMethods.class, "mixedTypes", String.class, byte[].class);
-        assertThatThrownBy(() -> resolve(method)).isInstanceOf(IllegalStateException. class);
+        assertThatThrownBy(() -> resolve(method)).isInstanceOf(IllegalStateException.class);
     }
 
     @Test
     void resolutionOfMethodWithMixedCodecsShouldFail() {
-        Method method = ReflectionUtils.findMethod(CommandMethods.class, "mixedCodecs",  String.class, byte[].class, String.class);
-        assertThatThrownBy(() -> resolve(method)).isInstanceOf(IllegalStateException. class);
+        Method method = ReflectionUtils.findMethod(CommandMethods.class, "mixedCodecs", String.class, byte[].class,
+                String.class);
+        assertThatThrownBy(() -> resolve(method)).isInstanceOf(IllegalStateException.class);
     }
 
     @Test

From 42490c2fc5a59efc065d7ca3721da4e5f688497c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 16 Oct 2019 21:06:50 +0200
Subject: [PATCH 681/808] Elevate visibility of ReadFrom.isOrderSensitive() to
 protected #1145

Exposing isOrderSensitive() to protected allows subclassing ReadFrom with order-sensitive/insensitive semantics.
---
 src/main/java/io/lettuce/core/ReadFrom.java     | 2 +-
 src/main/java/io/lettuce/core/ReadFromImpl.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/ReadFrom.java b/src/main/java/io/lettuce/core/ReadFrom.java
index 43ee204b37..87a6165259 100644
--- a/src/main/java/io/lettuce/core/ReadFrom.java
+++ b/src/main/java/io/lettuce/core/ReadFrom.java
@@ -96,7 +96,7 @@ public abstract class ReadFrom {
      *         {@link RedisNodeDescription nodes}.
      * @since 5.2
      */
-    boolean isOrderSensitive() {
+    protected boolean isOrderSensitive() {
         return false;
     }
 
diff --git a/src/main/java/io/lettuce/core/ReadFromImpl.java b/src/main/java/io/lettuce/core/ReadFromImpl.java
index 67370b9961..ac5aa9088f 100644
--- a/src/main/java/io/lettuce/core/ReadFromImpl.java
+++ b/src/main/java/io/lettuce/core/ReadFromImpl.java
@@ -95,7 +95,7 @@ public List<RedisNodeDescription> select(Nodes nodes) {
         }
 
         @Override
-        boolean isOrderSensitive() {
+        protected boolean isOrderSensitive() {
             return true;
         }
     }
@@ -142,7 +142,7 @@ public List<RedisNodeDescription> select(Nodes nodes) {
         }
 
         @Override
-        boolean isOrderSensitive() {
+        protected boolean isOrderSensitive() {
             return true;
         }
     }
@@ -160,7 +160,7 @@ static class UnorderedPredicateReadFromAdapter extends OrderedPredicateReadFromA
         }
 
         @Override
-        boolean isOrderSensitive() {
+        protected boolean isOrderSensitive() {
             return false;
         }
     }

From 5d00a3d1647716916c8e4f9033daab5e7245e521 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 16 Oct 2019 21:14:02 +0200
Subject: [PATCH 682/808] Consider ReadFrom.isOrderSensitive() in cluster scan
 command #1146

ReadFrom order sensitivity is now considered in Cluster SCAN for keys.
---
 .../lettuce/core/cluster/ClusterScanSupport.java   |  9 ++++++++-
 .../core/cluster/ScanIteratorIntegrationTests.java | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java b/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java
index 76ab91d4cf..b5b5a3e08c 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java
@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Function;
 
 import reactor.core.publisher.Mono;
@@ -158,7 +159,13 @@ public Iterator<RedisNodeDescription> iterator() {
                 });
 
                 if (!selection.isEmpty()) {
-                    RedisClusterNode selectedNode = (RedisClusterNode) selection.get(0);
+
+                    int indexToUse = 0;
+                    if (!OrderingReadFromAccessor.isOrderSensitive(connection.getReadFrom())) {
+                        indexToUse = ThreadLocalRandom.current().nextInt(selection.size());
+                    }
+
+                    RedisClusterNode selectedNode = (RedisClusterNode) selection.get(indexToUse);
                     nodeIds.add(selectedNode.getNodeId());
                     continue;
                 }
diff --git a/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
index fdef446eb0..130849db39 100644
--- a/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
@@ -49,6 +49,7 @@ class ScanIteratorIntegrationTests extends TestSupport {
     @Inject
     ScanIteratorIntegrationTests(StatefulRedisClusterConnection<String, String> connection) {
         this.connection = connection;
+        this.connection.setReadFrom(ReadFrom.MASTER);
         this.redis = connection.sync();
     }
 
@@ -103,6 +104,19 @@ void keysMultiPass() {
         assertThat(keys).containsAll(KeysAndValues.KEYS);
     }
 
+    @Test
+    void keysMultiPassFromAnyNode() {
+
+        redis.mset(KeysAndValues.MAP);
+        this.connection.setReadFrom(ReadFrom.ANY);
+
+        ScanIterator<String> scan = ScanIterator.scan(redis);
+
+        List<String> keys = scan.stream().collect(Collectors.toList());
+
+        assertThat(keys).containsAll(KeysAndValues.KEYS);
+    }
+
     @Test
     void hscanShouldThrowNoSuchElementExceptionOnEmpty() {
 

From 4bbf9da2745ccddbf6828da3c3104ffb12a24213 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 25 Oct 2019 13:05:49 +0200
Subject: [PATCH 683/808] Prefer drain-loop instead of recursion in
 RedisSubscription #1140
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

RedisSubscription.onDataAvailable(…) and RedisSubscription.read(…) now use a drain-loop instead of recursive reads for element emission.
Recursive emission is error prone if the response contains many response elements.

onDataAvailable(…) calls read(…) if there is demand and if data is available.
---
 .../java/io/lettuce/core/RedisPublisher.java  | 41 +++++++++++++------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index 8e8f08863f..722bde5474 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -566,12 +566,16 @@ void request(RedisSubscription<?> subscription, long n) {
             @Override
             void onDataAvailable(RedisSubscription<?> subscription) {
 
-                do {
+                while (subscription.hasDemand()) {
+
+                    if (subscription.state() == NO_DEMAND && !subscription.changeState(NO_DEMAND, DEMAND)) {
+                        return;
+                    }
 
                     if (!read(subscription)) {
                         return;
                     }
-                } while (subscription.hasDemand() && subscription.changeState(NO_DEMAND, this));
+                }
             }
 
             @Override
@@ -589,28 +593,41 @@ void request(RedisSubscription<?> subscription, long n) {
                 }
             }
 
+            /**
+             * @param subscription
+             * @return {@literal true} if the {@code read()} call was able to perform a read and whether this method should be
+             *         called again to emit remaining data.
+             */
             private boolean read(RedisSubscription<?> subscription) {
 
-                if (subscription.changeState(this, READING)) {
+                // concurrency/entry guard
+                if (!subscription.changeState(this, READING)) {
+                    return false;
+                }
+
+                boolean hasDemand = subscription.readAndPublish();
 
-                    boolean hasDemand = subscription.readAndPublish();
+                try {
 
-                    if (subscription.allDataRead && subscription.data.isEmpty()) {
-                        subscription.onAllDataRead();
-                        return true;
+                    if (subscription.data.isEmpty()) {
+
+                        if (subscription.allDataRead) {
+                            subscription.onAllDataRead();
+                        }
+
+                        return false;
                     }
 
+                    return true;
+                } finally {
+
+                    // concurrency/leave guard
                     if (hasDemand) {
                         subscription.changeState(READING, DEMAND);
-                        subscription.checkOnDataAvailable();
                     } else {
                         subscription.changeState(READING, NO_DEMAND);
                     }
-
-                    return true;
                 }
-
-                return false;
             }
         },
 

From 95630675c92def02a5b071bf99f46fb700c2858b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 25 Oct 2019 13:06:32 +0200
Subject: [PATCH 684/808] Polishing #1140

Increase test loop count for race condition detection. Fix ScanIteratorIntegrationTests.
---
 .../AdvancedClusterReactiveIntegrationTests.java     | 12 +++++-------
 .../core/cluster/ScanIteratorIntegrationTests.java   |  4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
index 687a11cfe2..49630a9773 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
@@ -30,7 +30,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.core.codec.StringCodec;
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 import io.lettuce.core.*;
@@ -41,7 +40,7 @@
 import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
 import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.test.*;
 import io.lettuce.test.condition.EnabledOnCommand;
 import io.netty.util.internal.ConcurrentSet;
@@ -249,7 +248,7 @@ void keysDoesNotRunIntoRaceConditions() {
 
         Futures.awaitAll(futures);
 
-        for (int i = 0; i < 100; i++) {
+        for (int i = 0; i < 1000; i++) {
             CompletableFuture<Long> future = commands.keys("*").count().toFuture();
             Futures.await(future);
         }
@@ -314,8 +313,7 @@ void readFromReplicas() {
         connection.readOnly().subscribe();
         commands.set(key, value).subscribe();
 
-        NodeSelectionAsyncIntegrationTests
-                .waitForReplication(commands.getStatefulConnection().async(), ClusterTestSettings.key,
+        NodeSelectionAsyncIntegrationTests.waitForReplication(commands.getStatefulConnection().async(), ClusterTestSettings.key,
                 ClusterTestSettings.port4);
 
         AtomicBoolean error = new AtomicBoolean();
@@ -415,8 +413,8 @@ void clusterScanStreamingWithArgs() {
             }
         } while (!scanCursor.isFinished());
 
-        assertThat(adapter.getList()).containsAll(
-                KeysAndValues.KEYS.stream().filter(k -> k.startsWith("a")).collect(Collectors.toList()));
+        assertThat(adapter.getList())
+                .containsAll(KeysAndValues.KEYS.stream().filter(k -> k.startsWith("a")).collect(Collectors.toList()));
     }
 
     private void writeKeysToTwoNodes() {
diff --git a/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
index 130849db39..ce585fb21f 100644
--- a/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
@@ -49,13 +49,14 @@ class ScanIteratorIntegrationTests extends TestSupport {
     @Inject
     ScanIteratorIntegrationTests(StatefulRedisClusterConnection<String, String> connection) {
         this.connection = connection;
-        this.connection.setReadFrom(ReadFrom.MASTER);
         this.redis = connection.sync();
+        this.connection.sync().flushall();
     }
 
     @BeforeEach
     void setUp() {
         this.redis.flushall();
+        this.connection.setReadFrom(ReadFrom.MASTER);
     }
 
     @Test
@@ -184,7 +185,6 @@ void sscanShouldThrowNoSuchElementExceptionOnEmpty() {
 
     @Test
     void setSinglePass() {
-
         redis.sadd(key, KeysAndValues.KEYS.toArray(new String[0]));
 
         ScanIterator<String> scan = ScanIterator.sscan(redis, key, ScanArgs.Builder.limit(50).match("key-11*"));

From 476fe3bb93f98dc173c2c15232a69594e0355eaa Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 25 Oct 2019 14:27:29 +0200
Subject: [PATCH 685/808] Improve error logging for unreachable nodes #1152

---
 .../topology/ClusterTopologyRefresh.java      | 22 ++++++----
 .../core/protocol/ConnectionWatchdog.java     | 40 +++++++++++--------
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
index e0663c16d6..0160dc0876 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
@@ -15,10 +15,12 @@
  */
 package io.lettuce.core.cluster.topology;
 
+import java.io.IOException;
 import java.net.SocketAddress;
 import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -268,18 +270,24 @@ private AsyncConnections getConnections(Iterable<RedisURI> redisURIs) {
 
                     if (throwable != null) {
 
-                        String message = String.format("Unable to connect to %s", socketAddress);
-                        if (throwable instanceof RedisConnectionException) {
+                        Throwable throwableToUse = throwable;
+                        if (throwable instanceof CompletionException) {
+                            throwableToUse = throwableToUse.getCause();
+                        }
+
+                        String message = String.format("Unable to connect to [%s]: %s", socketAddress,
+                                throwableToUse.getMessage() != null ? throwableToUse.getMessage() : throwableToUse.toString());
+                        if (throwableToUse instanceof RedisConnectionException || throwableToUse instanceof IOException) {
                             if (logger.isDebugEnabled()) {
-                                logger.debug(throwable.getMessage(), throwable);
+                                logger.debug(message, throwableToUse);
                             } else {
-                                logger.warn(throwable.getMessage());
+                                logger.warn(message);
                             }
                         } else {
-                            logger.warn(message, throwable);
+                            logger.warn(message, throwableToUse);
                         }
 
-                        sync.completeExceptionally(new RedisConnectionException(message, throwable));
+                        sync.completeExceptionally(new RedisConnectionException(message, throwableToUse));
                     } else {
                         connection.async().clientSetname("lettuce#ClusterTopologyRefresh");
                         sync.complete(connection);
@@ -288,7 +296,7 @@ private AsyncConnections getConnections(Iterable<RedisURI> redisURIs) {
 
                 connections.addConnection(redisURI, sync);
             } catch (RuntimeException e) {
-                logger.warn(String.format("Unable to connect to %s", redisURI), e);
+                logger.warn(String.format("Unable to connect to [%s]", redisURI), e);
             }
         }
 
diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
index 39203eb99a..42502548c0 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
@@ -109,19 +109,18 @@ public ConnectionWatchdog(Delay reconnectDelay, ClientOptions clientOptions, Boo
         this.eventBus = eventBus;
 
         Mono<SocketAddress> wrappedSocketAddressSupplier = socketAddressSupplier.doOnNext(addr -> remoteAddress = addr)
-                .onErrorResume(
-                        t -> {
+                .onErrorResume(t -> {
 
-                            if (logger.isDebugEnabled()) {
-                                logger.warn("Cannot retrieve current address from socketAddressSupplier: " + t.toString()
-                                        + ", reusing cached address " + remoteAddress, t);
-                            } else {
-                                logger.warn("Cannot retrieve current address from socketAddressSupplier: " + t.toString()
-                                        + ", reusing cached address " + remoteAddress);
-                            }
+                    if (logger.isDebugEnabled()) {
+                        logger.warn("Cannot retrieve current address from socketAddressSupplier: " + t.toString()
+                                + ", reusing cached address " + remoteAddress, t);
+                    } else {
+                        logger.warn("Cannot retrieve current address from socketAddressSupplier: " + t.toString()
+                                + ", reusing cached address " + remoteAddress);
+                    }
 
-                            return Mono.just(remoteAddress);
-                        });
+                    return Mono.just(remoteAddress);
+                });
 
         this.reconnectionHandler = new ReconnectionHandler(clientOptions, bootstrap, wrappedSocketAddressSupplier, timer,
                 reconnectWorkers, connectionFacade);
@@ -300,12 +299,6 @@ public void run(int attempt) throws Exception {
                     return;
                 }
 
-                if (ReconnectionHandler.isExecutionException(t)) {
-                    logger.log(warnLevelToUse, "Cannot reconnect: {}", t.toString());
-                } else {
-                    logger.log(warnLevelToUse, "Cannot reconnect: {}", t.toString(), t);
-                }
-
                 CompletableFuture<SocketAddress> remoteAddressFuture = tuple.getT2();
                 SocketAddress remote = remoteAddress;
                 if (remoteAddressFuture.isDone() && !remoteAddressFuture.isCompletedExceptionally()
@@ -313,6 +306,19 @@ public void run(int attempt) throws Exception {
                     remote = remoteAddressFuture.join();
                 }
 
+                String message = String.format("Cannot reconnect to [%s]: %s", remote,
+                        t.getMessage() != null ? t.getMessage() : t.toString());
+
+                if (ReconnectionHandler.isExecutionException(t)) {
+                    if (logger.isDebugEnabled()) {
+                        logger.debug(message, t);
+                    } else {
+                        logger.log(warnLevelToUse, message);
+                    }
+                } else {
+                    logger.log(warnLevelToUse, message, t);
+                }
+
                 eventBus.publish(new ReconnectFailedEvent(LocalAddress.ANY, remote, t, attempt));
 
                 if (!isReconnectSuspended()) {

From 7890d3b80b0897890ba54e4bbfe80c0137490fc7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 27 Oct 2019 17:19:56 +0100
Subject: [PATCH 686/808] Render Redis.toString() to a Redis URI #1040

---
 src/main/java/io/lettuce/core/RedisURI.java   | 43 +++++++------------
 .../io/lettuce/core/RedisURIUnitTests.java    | 29 +++++++------
 2 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 509258eb88..7042a95d3d 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -515,6 +515,10 @@ public List<RedisURI> getSentinels() {
      * @return URI based on the RedisURI
      */
     public URI toURI() {
+        return URI.create(createUriString());
+    }
+
+    private String createUriString() {
         String scheme = getScheme();
         String authority = getAuthority(scheme);
         String queryString = getQueryString();
@@ -523,8 +527,7 @@ public URI toURI() {
         if (!queryString.isEmpty()) {
             uri += "?" + queryString;
         }
-
-        return URI.create(uri);
+        return uri;
     }
 
     private static RedisURI buildRedisUriFromUri(URI uri) {
@@ -614,9 +617,13 @@ private String getAuthority(final String scheme) {
 
         if (sentinels.size() != 0) {
 
-            authority = sentinels.stream()
-                    .map(redisURI -> urlEncode(redisURI.getHost()) + getPortPart(redisURI.getPort(), scheme))
-                    .collect(Collectors.joining(","));
+            authority = sentinels.stream().map(redisURI -> {
+                if (LettuceStrings.isNotEmpty(redisURI.getSocket())) {
+                    return String.format("[Socket %s]", redisURI.getSocket());
+                }
+
+                return urlEncode(redisURI.getHost()) + getPortPart(redisURI.getPort(), scheme);
+            }).collect(Collectors.joining(","));
         }
 
         if (socket != null) {
@@ -711,7 +718,7 @@ private String toQueryParamUnit(TimeUnit unit) {
      * @param str
      * @return the URL-encoded string
      */
-    private String urlEncode(String str) {
+    private static String urlEncode(String str) {
         try {
             return URLEncoder.encode(str, LettuceCharsets.UTF8.name()).replaceAll("%2F", "/");
         } catch (UnsupportedEncodingException e) {
@@ -739,27 +746,7 @@ public SocketAddress getResolvedAddress() {
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-
-        sb.append(" [");
-
-        if (host != null) {
-            sb.append("host='").append(host).append('\'');
-            sb.append(", port=").append(port);
-        }
-
-        if (socket != null) {
-            sb.append("socket='").append(socket).append('\'');
-        }
-
-        if (sentinelMasterId != null) {
-            sb.append("sentinels=").append(getSentinels());
-            sb.append(", sentinelMasterId=").append(sentinelMasterId);
-        }
-
-        sb.append(']');
-        return sb.toString();
+        return createUriString();
     }
 
     @Override
@@ -941,7 +928,7 @@ private static RedisURI.Builder configureSentinel(URI uri) {
                 authority = authority.substring(authority.indexOf('@') + 1);
             }
 
-            String[] hosts = authority.split("\\,");
+            String[] hosts = authority.split(",");
             for (String host : hosts) {
                 HostAndPort hostAndPort = HostAndPort.parse(host);
                 if (builder == null) {
diff --git a/src/test/java/io/lettuce/core/RedisURIUnitTests.java b/src/test/java/io/lettuce/core/RedisURIUnitTests.java
index ece987ace5..875b10bf31 100644
--- a/src/test/java/io/lettuce/core/RedisURIUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisURIUnitTests.java
@@ -29,6 +29,8 @@
 import io.lettuce.core.internal.LettuceSets;
 
 /**
+ * Unit tests for {@link RedisURI}
+ *
  * @author Mark Paluch
  */
 class RedisURIUnitTests {
@@ -42,7 +44,7 @@ void equalsTest() {
 
         assertThat(redisURI1).isEqualTo(redisURI2);
         assertThat(redisURI1.hashCode()).isEqualTo(redisURI2.hashCode());
-        assertThat(redisURI1.toString()).contains("localhost").contains("1234");
+        assertThat(redisURI1).hasToString("redis://auth@localhost:1234?database=5");
 
         assertThat(redisURI3).isNotEqualTo(redisURI2);
         assertThat(redisURI3.hashCode()).isNotEqualTo(redisURI2.hashCode());
@@ -75,7 +77,8 @@ void mapUsage() {
     @Test
     void simpleUriTest() {
         RedisURI redisURI = RedisURI.create("redis://localhost:6379");
-        assertThat(redisURI.toURI().toString()).isEqualTo("redis://localhost");
+        assertThat(redisURI).hasToString("redis://localhost");
+        assertThat(redisURI).hasToString("redis://localhost");
     }
 
     @Test
@@ -86,19 +89,19 @@ void shouldThrowIllegalArgumentExceptionOnMalformedUri() {
     @Test
     void sslUriTest() {
         RedisURI redisURI = RedisURI.create("redis+ssl://localhost:6379");
-        assertThat(redisURI.toURI().toString()).isEqualTo("rediss://localhost:6379");
+        assertThat(redisURI).hasToString("rediss://localhost:6379");
     }
 
     @Test
     void tlsUriTest() {
         RedisURI redisURI = RedisURI.create("redis+tls://localhost:6379");
-        assertThat(redisURI.toURI().toString()).isEqualTo("redis+tls://localhost:6379");
+        assertThat(redisURI).hasToString("redis+tls://localhost:6379");
     }
 
     @Test
     void multipleClusterNodesTest() {
         RedisURI redisURI = RedisURI.create("redis+ssl://password@host1:6379,host2:6380");
-        assertThat(redisURI.toURI().toString()).isEqualTo("rediss://password@host1:6379,host2:6380");
+        assertThat(redisURI).hasToString("rediss://password@host1:6379,host2:6380");
     }
 
     @Test
@@ -126,7 +129,7 @@ void sentinelUriTest() {
         assertThat(redisURI.getSentinels().get(2).getPort()).isEqualTo(1234);
         assertThat(redisURI.getDatabase()).isEqualTo(5);
 
-        assertThat(redisURI.toURI().toString()).isEqualTo(
+        assertThat(redisURI).hasToString(
                 "redis-sentinel://auth@h1:222,h2,h3:1234?database=5&sentinelMasterId=masterId");
     }
 
@@ -136,7 +139,7 @@ void sentinelSecureUriTest() {
         RedisURI redisURI = RedisURI.create("rediss-sentinel://auth@h1:222,h2,h3:1234/5?sentinelMasterId=masterId");
         assertThat(redisURI.isSsl()).isTrue();
 
-        assertThat(redisURI.toURI().toString()).isEqualTo(
+        assertThat(redisURI).hasToString(
                 "rediss-sentinel://auth@h1:222,h2,h3:1234?database=5&sentinelMasterId=masterId");
     }
 
@@ -162,7 +165,7 @@ void socketUriTest() {
 
         assertThat(redisURI.getDatabase()).isEqualTo(2);
         assertThat(redisURI.getSocket()).isEqualTo("/var/tmp/other-socket");
-        assertThat(redisURI.toURI().toString()).isEqualTo("redis-socket:///var/tmp/other-socket?database=2");
+        assertThat(redisURI).hasToString("redis-socket:///var/tmp/other-socket?database=2");
     }
 
     @Test
@@ -172,7 +175,7 @@ void socketAltUriTest() {
 
         assertThat(redisURI.getDatabase()).isEqualTo(2);
         assertThat(redisURI.getSocket()).isEqualTo("/var/tmp/other-socket");
-        assertThat(redisURI.toURI().toString()).isEqualTo("redis-socket:///var/tmp/other-socket?database=2");
+        assertThat(redisURI).hasToString("redis-socket:///var/tmp/other-socket?database=2");
     }
 
     @Test
@@ -194,7 +197,7 @@ void timeoutParsingTest() {
                 RedisURI.DEFAULT_TIMEOUT_UNIT);
 
         RedisURI redisURI = RedisURI.create("redis://auth@localhost:1234/5?timeout=5000ms");
-        assertThat(redisURI.toURI().toString()).isEqualTo("redis://auth@localhost:1234?database=5&timeout=5s");
+        assertThat(redisURI).hasToString("redis://auth@localhost:1234?database=5&timeout=5s");
     }
 
     @Test
@@ -223,7 +226,7 @@ void databaseParsingTest() {
         RedisURI redisURI = RedisURI.create("redis://auth@localhost:1234/?database=21");
         assertThat(redisURI.getDatabase()).isEqualTo(21);
 
-        assertThat(redisURI.toURI().toString()).isEqualTo("redis://auth@localhost:1234?database=21");
+        assertThat(redisURI).hasToString("redis://auth@localhost:1234?database=21");
     }
 
     @Test
@@ -231,7 +234,7 @@ void clientNameParsingTest() {
         RedisURI redisURI = RedisURI.create("redis://auth@localhost:1234/?clientName=hello");
         assertThat(redisURI.getClientName()).isEqualTo("hello");
 
-        assertThat(redisURI.toURI().toString()).isEqualTo("redis://auth@localhost:1234?clientName=hello");
+        assertThat(redisURI).hasToString("redis://auth@localhost:1234?clientName=hello");
     }
 
     @Test
@@ -241,6 +244,6 @@ void parsingWithInvalidValuesTest() {
         assertThat(redisURI.getDatabase()).isEqualTo(0);
         assertThat(redisURI.getSentinelMasterId()).isNull();
 
-        assertThat(redisURI.toURI().toString()).isEqualTo("redis://host:1234");
+        assertThat(redisURI).hasToString("redis://host:1234");
     }
 }

From 606a6c022f9bf7d6e2549956433903e247154e62 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 27 Oct 2019 17:32:02 +0100
Subject: [PATCH 687/808] Encode database in RedisURI in path when possible
 #1155

---
 src/main/java/io/lettuce/core/RedisURI.java   | 29 ++++++++++++++-----
 .../io/lettuce/core/RedisURIUnitTests.java    | 15 +++++-----
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 7042a95d3d..d5ddfba2a3 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -510,12 +510,20 @@ public List<RedisURI> getSentinels() {
     }
 
     /**
-     * Creates an URI based on the RedisURI.
+     * Creates an URI based on the RedisURI if possible.
+     * <p>
+     * An URI an represent a Standalone address using host and port or socket addressing or a Redis Sentinel address using
+     * host/port. A Redis Sentinel URI with multiple nodes using Unix Domain Sockets cannot be rendered to a {@link URI}.
      *
-     * @return URI based on the RedisURI
+     * @return URI based on the RedisURI.
+     * @throws IllegalStateException if the URI cannot be rendered.
      */
     public URI toURI() {
-        return URI.create(createUriString());
+        try {
+            return URI.create(createUriString());
+        } catch (Exception e) {
+            throw new IllegalStateException("Cannot render URI for " + toString(), e);
+        }
     }
 
     private String createUriString() {
@@ -559,7 +567,7 @@ private static RedisURI buildRedisUriFromUri(URI uri) {
                     password = password.substring(index + 1);
                 }
             }
-            if (password != null && !password.equals("")) {
+            if (LettuceStrings.isNotEmpty(password)) {
                 builder.withPassword(password);
             }
         }
@@ -628,6 +636,10 @@ private String getAuthority(final String scheme) {
 
         if (socket != null) {
             authority = urlEncode(socket);
+        } else {
+            if (database != 0) {
+                authority += "/" + database;
+            }
         }
 
         if (password != null && password.length != 0) {
@@ -640,7 +652,7 @@ private String getQueryString() {
 
         List<String> queryPairs = new ArrayList<>();
 
-        if (database != 0) {
+        if (database != 0 && LettuceStrings.isNotEmpty(socket)) {
             queryPairs.add(PARAMETER_NAME_DATABASE + "=" + database);
         }
 
@@ -702,7 +714,7 @@ private String getScheme() {
         return scheme;
     }
 
-    private String toQueryParamUnit(TimeUnit unit) {
+    private static String toQueryParamUnit(TimeUnit unit) {
 
         for (Map.Entry<String, TimeUnit> entry : TIME_UNIT_MAP.entrySet()) {
             if (entry.getValue().equals(unit)) {
@@ -715,7 +727,7 @@ private String toQueryParamUnit(TimeUnit unit) {
     /**
      * URL encode the {@code str} without slash escaping {@code %2F}
      *
-     * @param str
+     * @param str the string to encode.
      * @return the URL-encoded string
      */
     private static String urlEncode(String str) {
@@ -744,6 +756,9 @@ public SocketAddress getResolvedAddress() {
         return new InetSocketAddress(host, port);
     }
 
+    /**
+     * @return the RedisURL in a URI-like form.
+     */
     @Override
     public String toString() {
         return createUriString();
diff --git a/src/test/java/io/lettuce/core/RedisURIUnitTests.java b/src/test/java/io/lettuce/core/RedisURIUnitTests.java
index 875b10bf31..eb5bebe9b5 100644
--- a/src/test/java/io/lettuce/core/RedisURIUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisURIUnitTests.java
@@ -44,7 +44,7 @@ void equalsTest() {
 
         assertThat(redisURI1).isEqualTo(redisURI2);
         assertThat(redisURI1.hashCode()).isEqualTo(redisURI2.hashCode());
-        assertThat(redisURI1).hasToString("redis://auth@localhost:1234?database=5");
+        assertThat(redisURI1).hasToString("redis://auth@localhost:1234/5");
 
         assertThat(redisURI3).isNotEqualTo(redisURI2);
         assertThat(redisURI3.hashCode()).isNotEqualTo(redisURI2.hashCode());
@@ -129,8 +129,7 @@ void sentinelUriTest() {
         assertThat(redisURI.getSentinels().get(2).getPort()).isEqualTo(1234);
         assertThat(redisURI.getDatabase()).isEqualTo(5);
 
-        assertThat(redisURI).hasToString(
-                "redis-sentinel://auth@h1:222,h2,h3:1234?database=5&sentinelMasterId=masterId");
+        assertThat(redisURI).hasToString("redis-sentinel://auth@h1:222,h2,h3:1234/5?sentinelMasterId=masterId");
     }
 
     @Test
@@ -139,8 +138,7 @@ void sentinelSecureUriTest() {
         RedisURI redisURI = RedisURI.create("rediss-sentinel://auth@h1:222,h2,h3:1234/5?sentinelMasterId=masterId");
         assertThat(redisURI.isSsl()).isTrue();
 
-        assertThat(redisURI).hasToString(
-                "rediss-sentinel://auth@h1:222,h2,h3:1234?database=5&sentinelMasterId=masterId");
+        assertThat(redisURI).hasToString("rediss-sentinel://auth@h1:222,h2,h3:1234/5?sentinelMasterId=masterId");
     }
 
     @Test
@@ -148,7 +146,7 @@ void socketEqualsTest() {
 
         RedisURI redisURI1 = RedisURI.create("redis-socket:///var/tmp/socket");
         RedisURI redisURI2 = RedisURI.create("redis-socket:///var/tmp/socket");
-        RedisURI redisURI3 = RedisURI.create("redis-socket:///var/tmp/other-socket?db=2");
+        RedisURI redisURI3 = RedisURI.create("redis-socket:///var/tmp/other-socket?database=2");
 
         assertThat(redisURI1).isEqualTo(redisURI2);
         assertThat(redisURI1.hashCode()).isEqualTo(redisURI2.hashCode());
@@ -156,6 +154,7 @@ void socketEqualsTest() {
 
         assertThat(redisURI3).isNotEqualTo(redisURI2);
         assertThat(redisURI3.hashCode()).isNotEqualTo(redisURI2.hashCode());
+        assertThat(redisURI3).hasToString("redis-socket:///var/tmp/other-socket?database=2");
     }
 
     @Test
@@ -197,7 +196,7 @@ void timeoutParsingTest() {
                 RedisURI.DEFAULT_TIMEOUT_UNIT);
 
         RedisURI redisURI = RedisURI.create("redis://auth@localhost:1234/5?timeout=5000ms");
-        assertThat(redisURI).hasToString("redis://auth@localhost:1234?database=5&timeout=5s");
+        assertThat(redisURI).hasToString("redis://auth@localhost:1234/5?timeout=5s");
     }
 
     @Test
@@ -226,7 +225,7 @@ void databaseParsingTest() {
         RedisURI redisURI = RedisURI.create("redis://auth@localhost:1234/?database=21");
         assertThat(redisURI.getDatabase()).isEqualTo(21);
 
-        assertThat(redisURI).hasToString("redis://auth@localhost:1234?database=21");
+        assertThat(redisURI).hasToString("redis://auth@localhost:1234/21");
     }
 
     @Test

From 426fb0cf0326e74f27aa4feacc7f8828ce1a9337 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 27 Oct 2019 17:46:39 +0100
Subject: [PATCH 688/808] Make RedisAsyncCommands.select() and auth() async
 #1118

---
 .../core/AbstractRedisAsyncCommands.java      | 28 ++++++------
 .../core/AbstractRedisReactiveCommands.java   |  2 +-
 .../io/lettuce/core/RedisCommandBuilder.java  | 43 +++++++++++--------
 .../core/StatefulRedisConnectionImpl.java     |  4 +-
 .../core/api/async/RedisAsyncCommands.java    |  4 +-
 .../api/reactive/RedisReactiveCommands.java   |  2 +-
 .../lettuce/core/api/sync/RedisCommands.java  |  2 +-
 .../StatefulRedisClusterConnectionImpl.java   |  2 +-
 .../api/async/RedisClusterAsyncCommands.java  |  2 +-
 .../RedisClusterReactiveCommands.java         |  2 +-
 .../api/sync/RedisClusterCommands.java        |  2 +-
 .../ConnectionCommandIntegrationTests.java    | 11 ++---
 12 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 22687e9df6..b26515cff0 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -75,14 +75,15 @@ public RedisFuture<String> asking() {
     }
 
     @Override
-    public String auth(String password) {
+    public RedisFuture<String> auth(CharSequence password) {
 
         LettuceAssert.notNull(password, "Password must not be null");
-        AsyncCommand<K, V, String> cmd = authAsync(password.toCharArray());
-        return LettuceFutures.awaitOrCancel(cmd, connection.getTimeout().toNanos(), TimeUnit.NANOSECONDS);
+        return dispatch(commandBuilder.auth(password));
     }
 
-    public AsyncCommand<K, V, String> authAsync(char[] password) {
+    public RedisFuture<String> auth(char[] password) {
+
+        LettuceAssert.notNull(password, "Password must not be null");
         return dispatch(commandBuilder.auth(password));
     }
 
@@ -1194,12 +1195,7 @@ public RedisFuture<Long> sdiffstore(K destination, K... keys) {
         return dispatch(commandBuilder.sdiffstore(destination, keys));
     }
 
-    public String select(int db) {
-        AsyncCommand<K, V, String> cmd = selectAsync(db);
-        return LettuceFutures.awaitOrCancel(cmd, connection.getTimeout().toNanos(), TimeUnit.NANOSECONDS);
-    }
-
-    protected AsyncCommand<K, V, String> selectAsync(int db) {
+    public RedisFuture<String> select(int db) {
         return dispatch(commandBuilder.select(db));
     }
 
@@ -1403,7 +1399,8 @@ public RedisFuture<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K k
     }
 
     @Override
-    public RedisFuture<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+    public RedisFuture<StreamScanCursor> sscan(ValueStreamingChannel<V> channel, K key, ScanCursor scanCursor,
+            ScanArgs scanArgs) {
         return dispatch(commandBuilder.sscanStreaming(channel, key, scanCursor, scanArgs));
     }
 
@@ -1848,7 +1845,8 @@ public RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key,
     }
 
     @Override
-    public RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range, Limit limit) {
+    public RedisFuture<Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
+            Limit limit) {
         return dispatch(commandBuilder.zrangebyscore(channel, key, range, limit));
     }
 
@@ -2065,12 +2063,14 @@ public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, Range
     }
 
     @Override
-    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset, long count) {
+    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, double max, double min, long offset,
+            long count) {
         return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
     }
 
     @Override
-    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset, long count) {
+    public RedisFuture<List<ScoredValue<V>>> zrevrangebyscoreWithScores(K key, String max, String min, long offset,
+            long count) {
         return dispatch(commandBuilder.zrevrangebyscoreWithScores(key, max, min, offset, count));
     }
 
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 2dffd3d6ec..3f08808def 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -106,7 +106,7 @@ public Mono<String> asking() {
     }
 
     @Override
-    public Mono<String> auth(String password) {
+    public Mono<String> auth(CharSequence password) {
         return createMono(() -> commandBuilder.auth(password));
     }
 
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index fa157ba6dc..3a4a4d962f 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -26,7 +26,6 @@
 import io.lettuce.core.XReadArgs.StreamOffset;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.output.*;
 import io.lettuce.core.protocol.*;
@@ -63,11 +62,15 @@ Command<K, V, String> asking() {
         return createCommand(ASKING, new StatusOutput<>(codec), args);
     }
 
-    Command<K, V, String> auth(String password) {
+    Command<K, V, String> auth(CharSequence password) {
         LettuceAssert.notNull(password, "Password " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(password, "Password " + MUST_NOT_BE_EMPTY);
 
-        return auth(password.toCharArray());
+        char[] chars = new char[password.length()];
+        for (int i = 0; i < password.length(); i++) {
+            chars[i] = password.charAt(i);
+        }
+        return auth(chars);
     }
 
     Command<K, V, String> auth(char[] password) {
@@ -676,10 +679,8 @@ Command<K, V, Long> geoadd(K key, Object[] lngLatMember) {
         LettuceAssert.notNull(lngLatMember, "LngLatMember " + MUST_NOT_BE_NULL);
         LettuceAssert.notEmpty(lngLatMember, "LngLatMember " + MUST_NOT_BE_EMPTY);
         LettuceAssert.noNullElements(lngLatMember, "LngLatMember " + MUST_NOT_CONTAIN_NULL_ELEMENTS);
-        LettuceAssert
-                .isTrue(lngLatMember.length % 3 == 0,
-                        "LngLatMember.length must be a multiple of 3 and contain a "
-                                + "sequence of longitude1, latitude1, member1, longitude2, latitude2, member2, ... longitudeN, latitudeN, memberN");
+        LettuceAssert.isTrue(lngLatMember.length % 3 == 0, "LngLatMember.length must be a multiple of 3 and contain a "
+                + "sequence of longitude1, latitude1, member1, longitude2, latitude2, member2, ... longitudeN, latitudeN, memberN");
 
         CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
 
@@ -753,8 +754,9 @@ Command<K, V, List<GeoWithin<V>>> georadius(CommandType commandType, K key, doub
         CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(longitude).add(latitude).add(distance).add(unit);
         geoArgs.build(args);
 
-        return createCommand(commandType, new GeoWithinListOutput<>(codec, geoArgs.isWithDistance(), geoArgs.isWithHash(),
-                geoArgs.isWithCoordinates()), args);
+        return createCommand(commandType,
+                new GeoWithinListOutput<>(codec, geoArgs.isWithDistance(), geoArgs.isWithHash(), geoArgs.isWithCoordinates()),
+                args);
     }
 
     Command<K, V, Long> georadius(K key, double longitude, double latitude, double distance, String unit,
@@ -794,8 +796,9 @@ Command<K, V, List<GeoWithin<V>>> georadiusbymember(CommandType commandType, K k
         CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addValue(member).add(distance).add(unit);
         geoArgs.build(args);
 
-        return createCommand(commandType, new GeoWithinListOutput<>(codec, geoArgs.isWithDistance(), geoArgs.isWithHash(),
-                geoArgs.isWithCoordinates()), args);
+        return createCommand(commandType,
+                new GeoWithinListOutput<>(codec, geoArgs.isWithDistance(), geoArgs.isWithHash(), geoArgs.isWithCoordinates()),
+                args);
     }
 
     Command<K, V, Long> georadiusbymember(K key, V member, double distance, String unit,
@@ -2664,11 +2667,13 @@ Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, Strin
         return createCommand(ZRANGEBYSCORE, new ValueStreamingOutput<>(codec, channel), args);
     }
 
-    Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset, long count) {
+    Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, double min, double max, long offset,
+            long count) {
         return zrangebyscore(channel, key, string(min), string(max), offset, count);
     }
 
-    Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset, long count) {
+    Command<K, V, Long> zrangebyscore(ValueStreamingChannel<V> channel, K key, String min, String max, long offset,
+            long count) {
         notNullKey(key);
         notNullMinMax(min, max);
         LettuceAssert.notNull(channel, "ScoredValueStreamingChannel " + MUST_NOT_BE_NULL);
@@ -3013,8 +3018,8 @@ Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> ch
         return createCommand(ZREVRANGEBYSCORE, new ScoredValueStreamingOutput<>(codec, channel), args);
     }
 
-    Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key,
-            Range<? extends Number> range, Limit limit) {
+    Command<K, V, Long> zrevrangebyscoreWithScores(ScoredValueStreamingChannel<V> channel, K key, Range<? extends Number> range,
+            Limit limit) {
         notNullKey(key);
         notNullRange(range);
         notNullLimit(limit);
@@ -3196,8 +3201,8 @@ private static String max(Range<? extends Number> range) {
 
         Boundary<? extends Number> upper = range.getUpper();
 
-        if (upper.getValue() == null || upper.getValue() instanceof Double
-                && upper.getValue().doubleValue() == Double.POSITIVE_INFINITY) {
+        if (upper.getValue() == null
+                || upper.getValue() instanceof Double && upper.getValue().doubleValue() == Double.POSITIVE_INFINITY) {
             return "+inf";
         }
 
@@ -3212,8 +3217,8 @@ private static String min(Range<? extends Number> range) {
 
         Boundary<? extends Number> lower = range.getLower();
 
-        if (lower.getValue() == null || lower.getValue() instanceof Double
-                && lower.getValue().doubleValue() == Double.NEGATIVE_INFINITY) {
+        if (lower.getValue() == null
+                || lower.getValue() instanceof Double && lower.getValue().doubleValue() == Double.NEGATIVE_INFINITY) {
             return "-inf";
         }
 
diff --git a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
index 9df794d90e..d14ce456c7 100644
--- a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
@@ -127,11 +127,11 @@ public void activated() {
         super.activated();
         // do not block in here, since the channel flow will be interrupted.
         if (password != null) {
-            async.authAsync(password);
+            async.auth(password);
         }
 
         if (db != 0) {
-            async.selectAsync(db);
+            async.select(db);
         }
 
         if (clientName != null) {
diff --git a/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
index 46eb37a1f9..05cf32a1a8 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
@@ -39,7 +39,7 @@ public interface RedisAsyncCommands<K, V> extends BaseRedisAsyncCommands<K, V>,
      * @param password the password
      * @return String simple-string-reply
      */
-    String auth(String password);
+    RedisFuture<String> auth(CharSequence password);
 
     /**
      * Change the selected database for the current connection.
@@ -47,7 +47,7 @@ public interface RedisAsyncCommands<K, V> extends BaseRedisAsyncCommands<K, V>,
      * @param db the database number
      * @return String simple-string-reply
      */
-    String select(int db);
+    RedisFuture<String> select(int db);
 
     /**
      * Swap two Redis databases, so that immediately all the clients connected to a given DB will see the data of the other DB,
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
index 82df806bac..742a839bc9 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
@@ -39,7 +39,7 @@ public interface RedisReactiveCommands<K, V> extends BaseRedisReactiveCommands<K
      * @param password the password
      * @return String simple-string-reply
      */
-    Mono<String> auth(String password);
+    Mono<String> auth(CharSequence password);
 
     /**
      * Change the selected database for the current connection.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
index b8974dacac..dda35a159d 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
@@ -38,7 +38,7 @@ public interface RedisCommands<K, V> extends BaseRedisCommands<K, V>, RedisClust
      * @param password the password
      * @return String simple-string-reply
      */
-    String auth(String password);
+    String auth(CharSequence password);
 
     /**
      * Change the selected database for the current Commands.
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
index 2acfafa6bb..a11b8d59c5 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
@@ -180,7 +180,7 @@ public void activated() {
         super.activated();
         // do not block in here, since the channel flow will be interrupted.
         if (password != null) {
-            async.authAsync(password);
+            async.auth(password);
         }
 
         if (clientName != null) {
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
index b1dffd5123..6e2b05edff 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
@@ -61,7 +61,7 @@ public interface RedisClusterAsyncCommands<K, V> extends BaseRedisAsyncCommands<
      * @param password the password
      * @return String simple-string-reply
      */
-    String auth(String password);
+    RedisFuture<String> auth(CharSequence password);
 
     /**
      * Generate a new config epoch, incrementing the current epoch, assign the new epoch to this node, WITHOUT any consensus and
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
index f742c0aabb..f3870368c3 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
@@ -62,7 +62,7 @@ public interface RedisClusterReactiveCommands<K, V> extends BaseRedisReactiveCom
      * @param password the password
      * @return String simple-string-reply
      */
-    Mono<String> auth(String password);
+    Mono<String> auth(CharSequence password);
 
     /**
      * Generate a new config epoch, incrementing the current epoch, assign the new epoch to this node, WITHOUT any consensus and
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
index cebceaedd7..8041a6e712 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
@@ -58,7 +58,7 @@ public interface RedisClusterCommands<K, V> extends BaseRedisCommands<K, V>, Red
      * @param password the password
      * @return String simple-string-reply
      */
-    String auth(String password);
+    String auth(CharSequence password);
 
     /**
      * Generate a new config epoch, incrementing the current epoch, assign the new epoch to this node, WITHOUT any consensus and
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
index 3d3a3eb3aa..42f9a50112 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
@@ -30,10 +30,7 @@
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.test.Delay;
-import io.lettuce.test.LettuceExtension;
-import io.lettuce.test.Wait;
-import io.lettuce.test.WithPassword;
+import io.lettuce.test.*;
 
 /**
  * @author Will Glozer
@@ -135,11 +132,10 @@ void getSetReconnect() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     void authInvalidPassword() {
         RedisAsyncCommands<String, String> async = client.connect().async();
         try {
-            async.auth("invalid");
+            Futures.await(async.auth("invalid"));
             fail("Authenticated with invalid password");
         } catch (RedisException e) {
             assertThat(e.getMessage()).isEqualTo("ERR Client sent AUTH, but no password is set");
@@ -151,11 +147,10 @@ void authInvalidPassword() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     void selectInvalid() {
         RedisAsyncCommands<String, String> async = client.connect().async();
         try {
-            async.select(1024);
+            Futures.await(async.select(1024));
             fail("Selected invalid db index");
         } catch (RedisException e) {
             assertThat(e.getMessage()).startsWith("ERR");

From a84cd1be7eb3a390850137796ffb39177062466d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 27 Oct 2019 17:50:12 +0100
Subject: [PATCH 689/808] Deprecate RedisURI.password(String) in favor of
 password(CharSequence) #1157

Requiring CharSequence is not prone for String caching if the password value is not backed by a String but rather a simple sequence of characters.
---
 src/main/java/io/lettuce/core/RedisURI.java   | 23 +++++++++++++++++++
 .../lettuce/core/internal/LettuceAssert.java  |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index d5ddfba2a3..8cb0b28590 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -349,7 +349,9 @@ public char[] getPassword() {
      * Sets the password. Use empty string to skip authentication.
      *
      * @param password the password, must not be {@literal null}.
+     * @deprecated since 6.0. Use {@link #setPassword(CharSequence)} or {@link #setPassword(char[])} avoid String caching.
      */
+    @Deprecated
     public void setPassword(String password) {
         setPassword((CharSequence) password);
     }
@@ -1283,7 +1285,9 @@ public Builder withClientName(String clientName) {
          *
          * @param password the password
          * @return the builder
+         * @deprecated since 6.0. Use {@link #withPassword(CharSequence)} or {@link #withPassword(char[])} avoid String caching.
          */
+        @Deprecated
         public Builder withPassword(String password) {
 
             LettuceAssert.notNull(password, "Password must not be null");
@@ -1291,6 +1295,25 @@ public Builder withPassword(String password) {
             return withPassword(password.toCharArray());
         }
 
+        /**
+         * Configures authentication.
+         *
+         * @param password the password
+         * @return the builder
+         * @since 6.0
+         */
+        public Builder withPassword(CharSequence password) {
+
+            LettuceAssert.notNull(password, "Password must not be null");
+
+            char[] chars = new char[password.length()];
+            for (int i = 0; i < password.length(); i++) {
+                chars[i] = password.charAt(0);
+            }
+
+            return withPassword(chars);
+        }
+
         /**
          * Configures authentication.
          *
diff --git a/src/main/java/io/lettuce/core/internal/LettuceAssert.java b/src/main/java/io/lettuce/core/internal/LettuceAssert.java
index 2990daf0fb..5ca99a34e9 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceAssert.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceAssert.java
@@ -41,7 +41,7 @@ private LettuceAssert() {
      * @param message the exception message to use if the assertion fails
      * @throws IllegalArgumentException if the object is {@code null} or the underlying string is empty
      */
-    public static void notEmpty(String string, String message) {
+    public static void notEmpty(CharSequence string, String message) {
         if (LettuceStrings.isEmpty(string)) {
             throw new IllegalArgumentException(message);
         }
@@ -55,7 +55,7 @@ public static void notEmpty(String string, String message) {
      * @throws IllegalArgumentException if the object is {@code null} or the underlying string is empty
      * @since 5.2.0
      */
-    public static void notEmpty(String string, Supplier<String> messageSupplier) {
+    public static void notEmpty(CharSequence string, Supplier<String> messageSupplier) {
         if (LettuceStrings.isEmpty(string)) {
             throw new IllegalArgumentException(messageSupplier.get());
         }

From c05dc0d18aabefc5a99ab2e33ce794e93cca8712 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 27 Oct 2019 18:10:29 +0100
Subject: [PATCH 690/808] Remove deprecated timeout methods accepting TimeUnit
 #1158

---
 .../core/AbstractRedisAsyncCommands.java      |  5 --
 .../core/AbstractRedisReactiveCommands.java   |  4 -
 .../io/lettuce/core/RedisChannelHandler.java  | 12 ---
 src/main/java/io/lettuce/core/RedisURI.java   | 83 +++++--------------
 .../lettuce/core/api/StatefulConnection.java  | 10 ---
 .../api/async/RedisClusterAsyncCommands.java  | 10 ---
 .../RedisClusterReactiveCommands.java         | 10 ---
 .../api/sync/RedisClusterCommands.java        | 10 ---
 .../MasterReplicaConnectionWrapper.java       |  6 --
 .../lettuce/core/ClientIntegrationTests.java  |  2 +-
 .../core/ClientOptionsIntegrationTests.java   |  2 +-
 .../io/lettuce/core/RedisURIUnitTests.java    |  3 +-
 .../NodeSelectionSyncIntegrationTests.java    |  3 +-
 .../commands/ListCommandIntegrationTests.java |  3 +-
 .../ConnectionFailureIntegrationTests.java    | 30 +++----
 .../core/EmptyStatefulRedisConnection.java    |  4 -
 16 files changed, 42 insertions(+), 155 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index b26515cff0..070cd49609 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1218,11 +1218,6 @@ public void setTimeout(Duration timeout) {
         connection.setTimeout(timeout);
     }
 
-    @Deprecated
-    public void setTimeout(long timeout, TimeUnit unit) {
-        connection.setTimeout(timeout, unit);
-    }
-
     @Override
     public RedisFuture<Long> setbit(K key, long offset, int value) {
         return dispatch(commandBuilder.setbit(key, offset, value));
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 3f08808def..4e6026b6a6 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -1299,10 +1299,6 @@ public void setTimeout(Duration timeout) {
         connection.setTimeout(timeout);
     }
 
-    public void setTimeout(long timeout, TimeUnit unit) {
-        connection.setTimeout(timeout, unit);
-    }
-
     @Override
     public Mono<Long> setbit(K key, long offset, int value) {
         return createMono(() -> commandBuilder.setbit(key, offset, value));
diff --git a/src/main/java/io/lettuce/core/RedisChannelHandler.java b/src/main/java/io/lettuce/core/RedisChannelHandler.java
index dc44ca8973..b1ae8fbe08 100644
--- a/src/main/java/io/lettuce/core/RedisChannelHandler.java
+++ b/src/main/java/io/lettuce/core/RedisChannelHandler.java
@@ -101,18 +101,6 @@ public void setTimeout(Duration timeout) {
         }
     }
 
-    /**
-     * Set the command timeout for this connection.
-     *
-     * @param timeout Command timeout.
-     * @param unit Unit of time for the timeout.
-     * @deprecated since 5.0, use {@link #setTimeout(Duration)}
-     */
-    @Deprecated
-    public void setTimeout(long timeout, TimeUnit unit) {
-        setTimeout(Duration.ofNanos(unit.toNanos(timeout)));
-    }
-
     /**
      * Close the connection (synchronous).
      */
diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 8cb0b28590..714fa66d44 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -26,7 +26,7 @@
 import java.net.URLEncoder;
 import java.time.Duration;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
+import java.util.function.LongFunction;
 import java.util.stream.Collectors;
 
 import io.lettuce.core.internal.HostAndPort;
@@ -54,7 +54,7 @@
  * more options.</li>
  * <li>Construct your own instance:
  * <p>
- * {@code new RedisURI("localhost", 6379, 60, TimeUnit.SECONDS);}
+ * {@code new RedisURI("localhost", 6379, Duration.ofSeconds(60));}
  * </p>
  * or
  * <p>
@@ -133,18 +133,18 @@ public class RedisURI implements Serializable, ConnectionPoint {
     public static final String PARAMETER_NAME_SENTINEL_MASTER_ID = "sentinelMasterId";
     public static final String PARAMETER_NAME_CLIENT_NAME = "clientName";
 
-    public static final Map<String, TimeUnit> TIME_UNIT_MAP;
+    public static final Map<String, LongFunction<Duration>> CONVERTER_MAP;
 
     static {
-        Map<String, TimeUnit> unitMap = new HashMap<String, TimeUnit>();
-        unitMap.put("ns", TimeUnit.NANOSECONDS);
-        unitMap.put("us", TimeUnit.MICROSECONDS);
-        unitMap.put("ms", TimeUnit.MILLISECONDS);
-        unitMap.put("s", TimeUnit.SECONDS);
-        unitMap.put("m", TimeUnit.MINUTES);
-        unitMap.put("h", TimeUnit.HOURS);
-        unitMap.put("d", TimeUnit.DAYS);
-        TIME_UNIT_MAP = Collections.unmodifiableMap(unitMap);
+        Map<String, LongFunction<Duration>> unitMap = new HashMap<>();
+        unitMap.put("ns", Duration::ofNanos);
+        unitMap.put("us", us -> Duration.ofNanos(us * 1000));
+        unitMap.put("ms", Duration::ofMillis);
+        unitMap.put("s", Duration::ofSeconds);
+        unitMap.put("m", Duration::ofMinutes);
+        unitMap.put("h", Duration::ofHours);
+        unitMap.put("d", Duration::ofDays);
+        CONVERTER_MAP = Collections.unmodifiableMap(unitMap);
     }
 
     /**
@@ -161,7 +161,6 @@ public class RedisURI implements Serializable, ConnectionPoint {
      * Default timeout: 60 sec
      */
     public static final long DEFAULT_TIMEOUT = 60;
-    public static final TimeUnit DEFAULT_TIMEOUT_UNIT = TimeUnit.SECONDS;
     public static final Duration DEFAULT_TIMEOUT_DURATION = Duration.ofSeconds(DEFAULT_TIMEOUT);
 
     private String host;
@@ -202,23 +201,6 @@ public RedisURI(String host, int port, Duration timeout) {
         setTimeout(timeout);
     }
 
-    /**
-     * Constructor with host/port and timeout.
-     *
-     * @param host the host
-     * @param port the port
-     * @param timeout timeout value
-     * @param unit unit of the timeout value
-     * @deprecated since 5.0, use {@link #RedisURI(String, int, Duration)}
-     */
-    @Deprecated
-    public RedisURI(String host, int port, long timeout, TimeUnit unit) {
-
-        setHost(host);
-        setPort(port);
-        setTimeout(Duration.ofNanos(unit.toNanos(timeout)));
-    }
-
     /**
      * Returns a new {@link RedisURI.Builder} to construct a {@link RedisURI}.
      *
@@ -669,9 +651,9 @@ private String getQueryString() {
         if (timeout.getSeconds() != DEFAULT_TIMEOUT) {
 
             if (timeout.getNano() == 0) {
-                queryPairs.add(PARAMETER_NAME_TIMEOUT + "=" + timeout.getSeconds() + toQueryParamUnit(TimeUnit.SECONDS));
+                queryPairs.add(PARAMETER_NAME_TIMEOUT + "=" + timeout.getSeconds() + "s");
             } else {
-                queryPairs.add(PARAMETER_NAME_TIMEOUT + "=" + timeout.toMillis() + toQueryParamUnit(TimeUnit.MILLISECONDS));
+                queryPairs.add(PARAMETER_NAME_TIMEOUT + "=" + timeout.toMillis() + "ns");
             }
         }
 
@@ -716,16 +698,6 @@ private String getScheme() {
         return scheme;
     }
 
-    private static String toQueryParamUnit(TimeUnit unit) {
-
-        for (Map.Entry<String, TimeUnit> entry : TIME_UNIT_MAP.entrySet()) {
-            if (entry.getValue().equals(unit)) {
-                return entry.getKey();
-            }
-        }
-        return "";
-    }
-
     /**
      * URL encode the {@code str} without slash escaping {@code %2F}
      *
@@ -815,7 +787,7 @@ private static void parseTimeout(Builder builder, String queryParam) {
 
         if (numbersEnd == 0) {
             if (timeoutString.startsWith("-")) {
-                builder.withTimeout(0, TimeUnit.MILLISECONDS);
+                builder.withTimeout(Duration.ZERO);
             } else {
                 // no-op, leave defaults
             }
@@ -825,12 +797,12 @@ private static void parseTimeout(Builder builder, String queryParam) {
             builder.withTimeout(Duration.ofMillis(timeoutValue));
 
             String suffix = timeoutString.substring(numbersEnd);
-            TimeUnit timeoutUnit = TIME_UNIT_MAP.get(suffix);
-            if (timeoutUnit == null) {
-                timeoutUnit = TimeUnit.MILLISECONDS;
+            LongFunction<Duration> converter = CONVERTER_MAP.get(suffix);
+            if (converter == null) {
+                converter = Duration::ofMillis;
             }
 
-            builder.withTimeout(timeoutValue, timeoutUnit);
+            builder.withTimeout(converter.apply(timeoutValue));
         }
     }
 
@@ -1344,23 +1316,6 @@ public Builder withTimeout(Duration timeout) {
             return this;
         }
 
-        /**
-         * Configures a timeout.
-         *
-         * @param timeout must be greater or equal 0.
-         * @param unit the timeout time unit.
-         * @return the builder
-         * @deprecated since 5.0, use {@link #withTimeout(Duration)}.
-         */
-        @Deprecated
-        public Builder withTimeout(long timeout, TimeUnit unit) {
-
-            LettuceAssert.notNull(unit, "TimeUnit must not be null");
-            LettuceAssert.isTrue(timeout >= 0, "Timeout must be greater or equal 0");
-
-            return withTimeout(Duration.ofNanos(unit.toNanos(timeout)));
-        }
-
         /**
          * Configures a sentinel master Id.
          *
diff --git a/src/main/java/io/lettuce/core/api/StatefulConnection.java b/src/main/java/io/lettuce/core/api/StatefulConnection.java
index e1329934c0..e95bf6d654 100644
--- a/src/main/java/io/lettuce/core/api/StatefulConnection.java
+++ b/src/main/java/io/lettuce/core/api/StatefulConnection.java
@@ -43,16 +43,6 @@ public interface StatefulConnection<K, V> extends AutoCloseable, AsyncCloseable
      */
     void setTimeout(Duration timeout);
 
-    /**
-     * Set the default command timeout for this connection.
-     *
-     * @param timeout Command timeout.
-     * @param unit Unit of time for the timeout.
-     * @deprecated since 5.0, use {@link #setTimeout(Duration)}
-     */
-    @Deprecated
-    void setTimeout(long timeout, TimeUnit unit);
-
     /**
      * @return the timeout.
      */
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
index 6e2b05edff..b6298e7f42 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
@@ -45,16 +45,6 @@ public interface RedisClusterAsyncCommands<K, V> extends BaseRedisAsyncCommands<
      */
     void setTimeout(Duration timeout);
 
-    /**
-     * Set the default timeout for operations.
-     *
-     * @param timeout the timeout value
-     * @param unit the unit of the timeout value
-     * @deprecated since 5.0, use {@link #setTimeout(Duration)}.
-     */
-    @Deprecated
-    void setTimeout(long timeout, TimeUnit unit);
-
     /**
      * Authenticate to the server.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
index f3870368c3..8d19250aba 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
@@ -46,16 +46,6 @@ public interface RedisClusterReactiveCommands<K, V> extends BaseRedisReactiveCom
      */
     void setTimeout(Duration timeout);
 
-    /**
-     * Set the default timeout for operations.
-     *
-     * @param timeout the timeout value
-     * @param unit the unit of the timeout value
-     * @deprecated since 5.0, use {@link #setTimeout(Duration)}.
-     */
-    @Deprecated
-    void setTimeout(long timeout, TimeUnit unit);
-
     /**
      * Authenticate to the server.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
index 8041a6e712..793ecc1f23 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
@@ -42,16 +42,6 @@ public interface RedisClusterCommands<K, V> extends BaseRedisCommands<K, V>, Red
      */
     void setTimeout(Duration timeout);
 
-    /**
-     * Set the default timeout for operations.
-     *
-     * @param timeout the timeout value
-     * @param unit the unit of the timeout value
-     * @deprecated since 5.0, use {@link #setTimeout(Duration)}.
-     */
-    @Deprecated
-    void setTimeout(long timeout, TimeUnit unit);
-
     /**
      * Authenticate to the server.
      *
diff --git a/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionWrapper.java b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionWrapper.java
index 3420d07a5c..420c163758 100644
--- a/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionWrapper.java
+++ b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionWrapper.java
@@ -78,12 +78,6 @@ public void setTimeout(Duration timeout) {
         delegate.setTimeout(timeout);
     }
 
-    @Override
-    @Deprecated
-    public void setTimeout(long timeout, TimeUnit unit) {
-        delegate.setTimeout(timeout, unit);
-    }
-
     @Override
     public Duration getTimeout() {
         return delegate.getTimeout();
diff --git a/src/test/java/io/lettuce/core/ClientIntegrationTests.java b/src/test/java/io/lettuce/core/ClientIntegrationTests.java
index b09f631454..f6a35b689a 100644
--- a/src/test/java/io/lettuce/core/ClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientIntegrationTests.java
@@ -83,7 +83,7 @@ void statefulConnectionFromReactive() {
     @Test
     void timeout() {
 
-        redis.setTimeout(0, TimeUnit.MICROSECONDS);
+        redis.setTimeout(Duration.ZERO);
         assertThatThrownBy(() -> redis.eval(" os.execute(\"sleep \" .. tonumber(1))", ScriptOutputType.STATUS)).isInstanceOf(
                 RedisCommandTimeoutException.class);
 
diff --git a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
index 146b0a9305..2868a19a65 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
@@ -297,7 +297,7 @@ void pingBeforeConnectTimeout() throws Exception {
         try (ServerSocket serverSocket = new ServerSocket(0)) {
 
             RedisURI redisURI = RedisURI.Builder.redis(TestSettings.host(), serverSocket.getLocalPort())
-                    .withTimeout(500, TimeUnit.MILLISECONDS).build();
+                    .withTimeout(Duration.ofMillis(500)).build();
 
             try {
                 client.connect(redisURI);
diff --git a/src/test/java/io/lettuce/core/RedisURIUnitTests.java b/src/test/java/io/lettuce/core/RedisURIUnitTests.java
index eb5bebe9b5..f742f519ee 100644
--- a/src/test/java/io/lettuce/core/RedisURIUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisURIUnitTests.java
@@ -192,8 +192,7 @@ void timeoutParsingTest() {
         checkUriTimeout("redis://auth@localhost:1234/5?timeout=-1", 0, TimeUnit.MILLISECONDS);
 
         RedisURI defaultUri = new RedisURI();
-        checkUriTimeout("redis://auth@localhost:1234/5?timeout=junk", defaultUri.getTimeout().getSeconds(),
-                RedisURI.DEFAULT_TIMEOUT_UNIT);
+        checkUriTimeout("redis://auth@localhost:1234/5?timeout=junk", defaultUri.getTimeout().getSeconds(), TimeUnit.SECONDS);
 
         RedisURI redisURI = RedisURI.create("redis://auth@localhost:1234/5?timeout=5000ms");
         assertThat(redisURI).hasToString("redis://auth@localhost:1234/5?timeout=5s");
diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
index 4e6aa77b02..57a51d7921 100644
--- a/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
@@ -19,6 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
 
+import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -165,7 +166,7 @@ void testAsynchronicityOfMultiNodeExecution() {
 
         RedisAdvancedClusterCommands<String, String> connection2 = clusterClient.connect().sync();
 
-        connection2.setTimeout(1, TimeUnit.SECONDS);
+        connection2.setTimeout(Duration.ofSeconds(1));
         NodeSelection<String, String> masters = connection2.masters();
         masters.commands().configSet("lua-time-limit", "10");
 
diff --git a/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java
index a3d93a46ca..8803ff5c47 100644
--- a/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java
@@ -18,6 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -62,7 +63,7 @@ void blpop() {
 
     @Test
     void blpopTimeout() {
-        redis.setTimeout(10, TimeUnit.SECONDS);
+        redis.setTimeout(Duration.ofSeconds(10));
         assertThat(redis.blpop(1, key)).isNull();
     }
 
diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
index 2655db6cac..efea0f92f0 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
@@ -23,7 +23,10 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Queue;
-import java.util.concurrent.*;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.LinkedBlockingDeque;
 import java.util.stream.Collectors;
 
 import javax.inject.Inject;
@@ -73,7 +76,7 @@ void pingBeforeConnectFails() throws Exception {
         RandomResponseServer ts = getRandomResponseServer();
 
         RedisURI redisUri = RedisURI.Builder.redis(TestSettings.host(), TestSettings.nonexistentPort())
-                .withTimeout(10, TimeUnit.MINUTES).build();
+                .withTimeout(Duration.ofMinutes(10)).build();
 
         try {
             client.connect(redisUri);
@@ -141,8 +144,8 @@ void pingBeforeConnectFailOnReconnect() throws Exception {
     @Test
     void pingBeforeConnectFailOnReconnectShouldSendEvents() throws Exception {
 
-        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).suspendReconnectOnProtocolFailure(false)
-                .build());
+        client.setOptions(
+                ClientOptions.builder().pingBeforeActivateConnection(true).suspendReconnectOnProtocolFailure(false).build());
 
         RandomResponseServer ts = getRandomResponseServer();
 
@@ -188,16 +191,16 @@ void pingBeforeConnectFailOnReconnectShouldSendEvents() throws Exception {
     @Test
     void cancelCommandsOnReconnectFailure() throws Exception {
 
-        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).cancelCommandsOnReconnectFailure(true)
-                .build());
+        client.setOptions(
+                ClientOptions.builder().pingBeforeActivateConnection(true).cancelCommandsOnReconnectFailure(true).build());
 
         RandomResponseServer ts = getRandomResponseServer();
 
         RedisURI redisUri = RedisURI.create(defaultRedisUri.toURI());
 
         try {
-            RedisAsyncCommandsImpl<String, String> connection = (RedisAsyncCommandsImpl<String, String>) client.connect(
-                    redisUri).async();
+            RedisAsyncCommandsImpl<String, String> connection = (RedisAsyncCommandsImpl<String, String>) client
+                    .connect(redisUri).async();
             ConnectionWatchdog connectionWatchdog = ConnectionTestUtil
                     .getConnectionWatchdog(connection.getStatefulConnection());
 
@@ -224,8 +227,8 @@ void cancelCommandsOnReconnectFailure() throws Exception {
             assertThatThrownBy(set1::get).isInstanceOf(CancellationException.class).hasNoCause();
             assertThatThrownBy(set2::get).isInstanceOf(CancellationException.class).hasNoCause();
 
-            assertThatThrownBy(() -> Futures.await(connection.info())).isInstanceOf(RedisException.class).hasMessageContaining(
-                    "Invalid first byte");
+            assertThatThrownBy(() -> Futures.await(connection.info())).isInstanceOf(RedisException.class)
+                    .hasMessageContaining("Invalid first byte");
 
             connection.getStatefulConnection().close();
         } finally {
@@ -246,8 +249,8 @@ void emitEventOnReconnectFailure() throws Exception {
         client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
 
         try {
-            RedisAsyncCommandsImpl<String, String> connection = (RedisAsyncCommandsImpl<String, String>) client.connect(
-                    redisUri).async();
+            RedisAsyncCommandsImpl<String, String> connection = (RedisAsyncCommandsImpl<String, String>) client
+                    .connect(redisUri).async();
             ConnectionWatchdog connectionWatchdog = ConnectionTestUtil
                     .getConnectionWatchdog(connection.getStatefulConnection());
 
@@ -292,14 +295,13 @@ void emitEventOnReconnectFailure() throws Exception {
 
     /**
      * Expect to disable {@link ConnectionWatchdog} when closing a broken connection.
-     *
      */
     @Test
     void closingDisconnectedConnectionShouldDisableConnectionWatchdog() {
 
         client.setOptions(ClientOptions.create());
 
-        RedisURI redisUri = RedisURI.Builder.redis(TestSettings.host(), TestSettings.port()).withTimeout(10, TimeUnit.MINUTES)
+        RedisURI redisUri = RedisURI.Builder.redis(TestSettings.host(), TestSettings.port()).withTimeout(Duration.ofMinutes(10))
                 .build();
 
         StatefulRedisConnection<String, String> connection = client.connect(redisUri);
diff --git a/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java b/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
index 8695723db3..bc4ec8ccce 100644
--- a/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
+++ b/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
@@ -58,10 +58,6 @@ public RedisReactiveCommands reactive() {
         return null;
     }
 
-    @Override
-    public void setTimeout(long timeout, TimeUnit unit) {
-    }
-
     @Override
     public void close() {
     }

From 8734e0ccf4b969b21ade1e6cb6e002edfe8b27ff Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 28 Oct 2019 13:29:30 +0100
Subject: [PATCH 691/808] Fix races in emission vs. request #1140

onNext now uses decrement instead of compareAndSet to avoid races with request(n) calls ensuring that all elements get emitted.
This allows simplification of readAndPublish() and eliminating another race where completion was potentially dropped.

Completion now also considers the guard through READING instead of completing from any state to protect against active drain loops.
---
 .../java/io/lettuce/core/RedisPublisher.java  | 133 +++++++-----------
 ...vancedClusterReactiveIntegrationTests.java |   1 +
 2 files changed, 53 insertions(+), 81 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index 722bde5474..1a70c950cd 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -18,8 +18,8 @@
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Queue;
+import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
@@ -32,6 +32,7 @@
 import reactor.core.CoreSubscriber;
 import reactor.core.Exceptions;
 import reactor.util.context.Context;
+import sun.rmi.runtime.Log;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.internal.LettuceAssert;
@@ -141,21 +142,17 @@ static class RedisSubscription<T> extends StreamingOutput.Subscriber<T> implemen
         static final int ST_COMPLETED = 1;
 
         @SuppressWarnings({ "rawtypes", "unchecked" })
-        static final AtomicLongFieldUpdater<RedisSubscription> DEMAND = AtomicLongFieldUpdater.newUpdater(
-                RedisSubscription.class, "demand");
+        static final AtomicLongFieldUpdater<RedisSubscription> DEMAND = AtomicLongFieldUpdater
+                .newUpdater(RedisSubscription.class, "demand");
 
         @SuppressWarnings({ "rawtypes", "unchecked" })
-        static final AtomicReferenceFieldUpdater<RedisSubscription, State> STATE = AtomicReferenceFieldUpdater.newUpdater(
-                RedisSubscription.class, State.class, "state");
+        static final AtomicReferenceFieldUpdater<RedisSubscription, State> STATE = AtomicReferenceFieldUpdater
+                .newUpdater(RedisSubscription.class, State.class, "state");
 
         @SuppressWarnings({ "rawtypes", "unchecked" })
         static final AtomicReferenceFieldUpdater<RedisSubscription, CommandDispatch> COMMAND_DISPATCH = AtomicReferenceFieldUpdater
                 .newUpdater(RedisSubscription.class, CommandDispatch.class, "commandDispatch");
 
-        @SuppressWarnings({ "rawtypes", "unchecked" })
-        static final AtomicIntegerFieldUpdater<RedisSubscription> COMPLETION = AtomicIntegerFieldUpdater.newUpdater(
-                RedisSubscription.class, "completion");
-
         private final SubscriptionCommand<?, ?, T> subscriptionCommand;
         private final boolean traceEnabled = LOG.isTraceEnabled();
 
@@ -164,6 +161,7 @@ static class RedisSubscription<T> extends StreamingOutput.Subscriber<T> implemen
         final RedisCommand<?, ?, T> command;
         final boolean dissolve;
         private final Executor executor;
+        final ArrayBlockingQueue<Log> logs = new ArrayBlockingQueue<>(1024 * 4);
 
         // accessed via AtomicLongFieldUpdater
         @SuppressWarnings("unused")
@@ -171,8 +169,6 @@ static class RedisSubscription<T> extends StreamingOutput.Subscriber<T> implemen
         @SuppressWarnings("unused")
         volatile State state = State.UNSUBSCRIBED;
         @SuppressWarnings("unused")
-        volatile int completion = ST_PROGRESS;
-        @SuppressWarnings("unused")
         volatile CommandDispatch commandDispatch = CommandDispatch.UNDISPATCHED;
 
         volatile boolean allDataRead = false;
@@ -274,13 +270,14 @@ public void onNext(T t) {
             }
 
             // Fast-path publishing, preserve ordering
-            if (state == State.DEMAND && data.isEmpty()) {
+            if (data.isEmpty() && state() == State.DEMAND) {
 
                 long initial = getDemand();
 
-                if (initial > 0 && DEMAND.compareAndSet(this, initial, initial - 1)) {
+                if (initial > 0) {
 
                     try {
+                        DEMAND.decrementAndGet(this);
                         this.subscriber.onNext(t);
                     } catch (Exception e) {
                         onError(e);
@@ -330,11 +327,12 @@ final void onAllDataRead() {
                 LOG.trace("{} onAllDataRead()", state);
             }
 
-            state.onAllDataRead(this);
+            allDataRead = true;
+            onDataAvailable();
         }
 
         /**
-         * Called by a listener interface to indicate that as error has occured.
+         * Called by a listener interface to indicate that as error has occurred.
          *
          * @param t the error
          */
@@ -370,15 +368,12 @@ boolean changeState(State oldState, State newState) {
             return STATE.compareAndSet(this, oldState, newState);
         }
 
-        public boolean complete() {
-
-            if (COMPLETION.compareAndSet(this, ST_PROGRESS, ST_COMPLETED)) {
-
-                STATE.set(this, State.COMPLETED);
-                return true;
-            }
+        boolean afterRead() {
+            return changeState(State.READING, getDemand() > 0 ? State.DEMAND : State.NO_DEMAND);
+        }
 
-            return false;
+        public boolean complete() {
+            return changeState(State.READING, State.COMPLETED);
         }
 
         void checkCommandDispatch() {
@@ -411,37 +406,20 @@ void potentiallyReadMore() {
         /**
          * Reads and publishes data from the input. Continues until either there is no more demand, or until there is no more
          * data to be read.
-         *
-         * @return {@literal true} if there is more demand, {@literal false} otherwise.
          */
-        boolean readAndPublish() {
+        void readAndPublish() {
 
             while (hasDemand()) {
 
-                long initial = getDemand();
-
-                if (!hasDemand(initial)) {
-                    return false;
-                }
-
                 T data = read();
 
                 if (data == null) {
-                    return hasDemand(initial);
+                    return;
                 }
 
-                boolean success = DEMAND.compareAndSet(this, initial, initial - 1);
-
-                if (success) {
-                    this.subscriber.onNext(data);
-                }
+                DEMAND.decrementAndGet(this);
+                this.subscriber.onNext(data);
             }
-
-            return false;
-        }
-
-        private static boolean hasDemand(long n) {
-            return n > 0;
         }
 
         RedisPublisher.State state() {
@@ -548,10 +526,7 @@ void request(RedisSubscription<?> subscription, long n) {
                     }
 
                     subscription.potentiallyReadMore();
-
-                    if (subscription.allDataRead) {
-                        onAllDataRead(subscription);
-                    }
+                    onDataAvailable(subscription);
                 } else {
                     onError(subscription, Exceptions.nullOrNegativeRequestException(n));
                 }
@@ -566,15 +541,15 @@ void request(RedisSubscription<?> subscription, long n) {
             @Override
             void onDataAvailable(RedisSubscription<?> subscription) {
 
-                while (subscription.hasDemand()) {
-
-                    if (subscription.state() == NO_DEMAND && !subscription.changeState(NO_DEMAND, DEMAND)) {
-                        return;
-                    }
+                try {
+                    do {
 
-                    if (!read(subscription)) {
-                        return;
-                    }
+                        if (!read(subscription)) {
+                            return;
+                        }
+                    } while (subscription.hasDemand());
+                } catch (Exception e) {
+                    subscription.onError(e);
                 }
             }
 
@@ -583,9 +558,7 @@ void request(RedisSubscription<?> subscription, long n) {
 
                 if (Operators.request(RedisSubscription.DEMAND, subscription, n)) {
 
-                    if (subscription.changeState(NO_DEMAND, DEMAND)) {
-                        read(subscription);
-                    }
+                    onDataAvailable(subscription);
 
                     subscription.potentiallyReadMore();
                 } else {
@@ -600,34 +573,32 @@ void request(RedisSubscription<?> subscription, long n) {
              */
             private boolean read(RedisSubscription<?> subscription) {
 
+                State state = subscription.state();
+
                 // concurrency/entry guard
-                if (!subscription.changeState(this, READING)) {
+                if (state == NO_DEMAND || state == DEMAND) {
+                    if (!subscription.changeState(state, READING)) {
+                        return false;
+                    }
+                } else {
                     return false;
                 }
 
-                boolean hasDemand = subscription.readAndPublish();
-
-                try {
-
-                    if (subscription.data.isEmpty()) {
+                subscription.readAndPublish();
 
-                        if (subscription.allDataRead) {
-                            subscription.onAllDataRead();
-                        }
+                if (subscription.allDataRead && subscription.data.isEmpty()) {
+                    state.onAllDataRead(subscription);
+                    return false;
+                }
 
-                        return false;
-                    }
+                // concurrency/leave guard
+                subscription.afterRead();
 
+                if (subscription.allDataRead || !subscription.data.isEmpty()) {
                     return true;
-                } finally {
-
-                    // concurrency/leave guard
-                    if (hasDemand) {
-                        subscription.changeState(READING, DEMAND);
-                    } else {
-                        subscription.changeState(READING, NO_DEMAND);
-                    }
                 }
+
+                return false;
             }
         },
 
@@ -695,8 +666,6 @@ void onDataAvailable(RedisSubscription<?> subscription) {
 
         void onAllDataRead(RedisSubscription<?> subscription) {
 
-            subscription.allDataRead = true;
-
             if (subscription.data.isEmpty() && subscription.complete()) {
 
                 readData(subscription);
@@ -711,13 +680,15 @@ void onAllDataRead(RedisSubscription<?> subscription) {
 
         void onError(RedisSubscription<?> subscription, Throwable t) {
 
-            if (subscription.changeState(this, COMPLETED)) {
+            State state;
+            while ((state = subscription.state()) != COMPLETED && subscription.changeState(state, COMPLETED)) {
 
                 readData(subscription);
 
                 Subscriber<?> subscriber = subscription.subscriber;
                 if (subscriber != null) {
                     subscriber.onError(t);
+                    return;
                 }
             }
         }
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
index 49630a9773..e51061ba3c 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
@@ -251,6 +251,7 @@ void keysDoesNotRunIntoRaceConditions() {
         for (int i = 0; i < 1000; i++) {
             CompletableFuture<Long> future = commands.keys("*").count().toFuture();
             Futures.await(future);
+            assertThat(future).isCompletedWithValue(1000L);
         }
     }
 

From 99787226fde8bb0fee5f1235df00d0940765f8e5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 29 Oct 2019 09:05:03 +0100
Subject: [PATCH 692/808] Upgrade to netty 4.1.43.Final #1161

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index afdd0e17b4..0e4507af93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
         <junit-version>5.5.2</junit-version>
         <log4j2-version>2.11.2</log4j2-version>
         <mockito.version>3.0.0</mockito.version>
-        <netty-version>4.1.42.Final</netty-version>
+        <netty-version>4.1.43.Final</netty-version>
         <reactor-version>3.3.0.RELEASE</reactor-version>
         <reactive-streams-tck.version>1.0.3</reactive-streams-tck.version>
         <slf4j.version>1.7.25</slf4j.version>

From 26d2b24cfeb38b93198eafca55be5baa95454b98 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 29 Oct 2019 09:06:51 +0100
Subject: [PATCH 693/808] Upgrade to RxJava 2.2.13 #1162

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0e4507af93..3720d44982 100644
--- a/pom.xml
+++ b/pom.xml
@@ -227,7 +227,7 @@
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
-            <version>2.2.9</version>
+            <version>2.2.13</version>
             <optional>true</optional>
         </dependency>
 

From 541d3d09c985df6c07e9452ad35b8be4bdf2e3fd Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 30 Oct 2019 10:13:50 +0100
Subject: [PATCH 694/808] =?UTF-8?q?Add=20ByteBuf.touch(=E2=80=A6)=20to=20a?=
 =?UTF-8?q?id=20buffer=20leak=20investigation=20#1164?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/io/lettuce/core/protocol/Command.java           | 1 +
 src/main/java/io/lettuce/core/protocol/CommandArgs.java       | 1 +
 src/main/java/io/lettuce/core/protocol/CommandEncoder.java    | 1 +
 src/main/java/io/lettuce/core/protocol/CommandHandler.java    | 2 ++
 src/main/java/io/lettuce/core/protocol/RedisStateMachine.java | 1 +
 5 files changed, 6 insertions(+)

diff --git a/src/main/java/io/lettuce/core/protocol/Command.java b/src/main/java/io/lettuce/core/protocol/Command.java
index 31724c750b..835b543de3 100644
--- a/src/main/java/io/lettuce/core/protocol/Command.java
+++ b/src/main/java/io/lettuce/core/protocol/Command.java
@@ -108,6 +108,7 @@ public void cancel() {
      */
     public void encode(ByteBuf buf) {
 
+        buf.touch("Command.encode(…)");
         buf.writeByte('*');
         CommandArgs.IntegerArgument.writeInteger(buf, 1 + (args != null ? args.count() : 0));
 
diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgs.java b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
index 1e47ce3303..876a616ee2 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandArgs.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
@@ -342,6 +342,7 @@ public ByteBuffer getFirstEncodedKey() {
      */
     public void encode(ByteBuf buf) {
 
+        buf.touch("CommandArgs.encode(…)");
         for (SingularArgument singularArgument : singularArguments) {
             singularArgument.encode(buf);
         }
diff --git a/src/main/java/io/lettuce/core/protocol/CommandEncoder.java b/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
index 1a9323487c..b25d564069 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
@@ -70,6 +70,7 @@ protected ByteBuf allocateBuffer(ChannelHandlerContext ctx, Object msg, boolean
     @SuppressWarnings("unchecked")
     protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception {
 
+        out.touch("CommandEncoder.encode(…)");
         if (msg instanceof RedisCommand) {
             RedisCommand<?, ?, ?> command = (RedisCommand<?, ?, ?>) msg;
             encode(ctx, out, command);
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 22e9d03feb..2a2cf88e94 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -533,6 +533,7 @@ private static boolean isWriteable(RedisCommand<?, ?, ?> command) {
     public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
 
         ByteBuf input = (ByteBuf) msg;
+        input.touch("CommandHandler.read(…)");
 
         if (!input.isReadable() || input.refCnt() == 0) {
             logger.warn("{} Input not readable {}, {}", logPrefix(), input.isReadable(), input.refCnt());
@@ -558,6 +559,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
                 logger.trace("{} Buffer: {}", logPrefix(), input.toString(Charset.defaultCharset()).trim());
             }
 
+            buffer.touch("CommandHandler.read(…)");
             buffer.writeBytes(input);
 
             decode(ctx, buffer);
diff --git a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index 1148313cee..9c96234b51 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -89,6 +89,7 @@ public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutp
         int length, end;
         ByteBuffer bytes;
 
+        buffer.touch("RedisStateMachine.decode(…)");
         if (debugEnabled) {
             logger.debug("Decode {}", command);
         }

From 03c7740308cf2f510913f188c132590d57ef8de4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 30 Oct 2019 12:21:04 +0100
Subject: [PATCH 695/808] =?UTF-8?q?Add=20warning=20log=20if=20MasterReplic?=
 =?UTF-8?q?a(=E2=80=A6,=20Iterable<RedisURI>)=20contains=20multiple=20Sent?=
 =?UTF-8?q?inel=20URIs=20#1165?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/masterreplica/MasterReplica.java     | 40 +++++++-----
 .../lettuce/core/masterslave/MasterSlave.java | 63 ++++++++++++-------
 2 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/src/main/java/io/lettuce/core/masterreplica/MasterReplica.java b/src/main/java/io/lettuce/core/masterreplica/MasterReplica.java
index 73ed07462f..659dc285a7 100644
--- a/src/main/java/io/lettuce/core/masterreplica/MasterReplica.java
+++ b/src/main/java/io/lettuce/core/masterreplica/MasterReplica.java
@@ -49,18 +49,19 @@
  * Master-Replica topologies are either static or semi-static. Redis Standalone instances with attached replicas provide no
  * failover/HA mechanism. Redis Sentinel managed instances are controlled by Redis Sentinel and allow failover (which include
  * master promotion). The {@link MasterReplica} API supports both mechanisms. The topology is provided by a
- * {@link TopologyProvider}:
+ * {@link io.lettuce.core.masterslave.TopologyProvider}:
  *
  * <ul>
- * <li>{@link MasterSlaveTopologyProvider}: Dynamic topology lookup using the {@code INFO REPLICATION} output. Replicas are
- * listed as {@code replicaN=...} entries. The initial connection can either point to a master or a replica and the topology
- * provider will discover nodes. The connection needs to be re-established outside of lettuce in a case of Master/Replica
- * failover or topology changes.</li>
- * <li>{@link StaticMasterSlaveTopologyProvider}: Topology is defined by the list of {@link RedisURI URIs} and the {@code ROLE}
- * output. MasterReplica uses only the supplied nodes and won't discover additional nodes in the setup. The connection needs to
- * be re-established outside of lettuce in a case of Master/Replica failover or topology changes.</li>
- * <li>{@link SentinelTopologyProvider}: Dynamic topology lookup using the Redis Sentinel API. In particular,
- * {@code SENTINEL MASTER} and {@code SENTINEL SLAVES} output. Master/Replica failover is handled by lettuce.</li>
+ * <li>{@link io.lettuce.core.masterslave.MasterSlaveTopologyProvider}: Dynamic topology lookup using the
+ * {@code INFO REPLICATION} output. Replicas are listed as {@code replicaN=...} entries. The initial connection can either point
+ * to a master or a replica and the topology provider will discover nodes. The connection needs to be re-established outside of
+ * lettuce in a case of Master/Replica failover or topology changes.</li>
+ * <li>{@link io.lettuce.core.masterslave.StaticMasterSlaveTopologyProvider}: Topology is defined by the list of {@link RedisURI
+ * URIs} and the {@code ROLE} output. MasterReplica uses only the supplied nodes and won't discover additional nodes in the
+ * setup. The connection needs to be re-established outside of lettuce in a case of Master/Replica failover or topology
+ * changes.</li>
+ * <li>{@link io.lettuce.core.masterslave.SentinelTopologyProvider}: Dynamic topology lookup using the Redis Sentinel API. In
+ * particular, {@code SENTINEL MASTER} and {@code SENTINEL SLAVES} output. Master/Replica failover is handled by lettuce.</li>
  * </ul>
  *
  * <h3>Topology Updates</h4>
@@ -69,9 +70,8 @@
  * <li>Redis Sentinel: Subscribes to all Sentinels and listens for Pub/Sub messages to trigger topology refreshing</li>
  * </ul>
  *
- * <h3>Connection Fault-Tolerance</h3>
- * Connecting to Master/Replica bears the possibility that individual nodes are not reachable. {@link MasterReplica} can still
- * connect to a partially-available set of nodes.
+ * <h3>Connection Fault-Tolerance</h3> Connecting to Master/Replica bears the possibility that individual nodes are not
+ * reachable. {@link MasterReplica} can still connect to a partially-available set of nodes.
  *
  * <ul>
  * <li>Redis Sentinel: At least one Sentinel must be reachable, the masterId must be registered and at least one host must be
@@ -135,10 +135,15 @@ public static <K, V> CompletableFuture<StatefulRedisMasterReplicaConnection<K, V
      * be treated as static topology and no additional hosts are discovered in such case. Redis Standalone Master/Replica will
      * discover the roles of the supplied {@link RedisURI URIs} and issue commands to the appropriate node.
      * </p>
+     * <p>
+     * When using Redis Sentinel, ensure that {@link Iterable redisURIs} contains only a single entry as only the first URI is
+     * considered. {@link RedisURI} pointing to multiple Sentinels can be configured through
+     * {@link RedisURI.Builder#withSentinel}.
+     * </p>
      *
      * @param redisClient the Redis client.
      * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}.
-     * @param redisURIs the Redis server to connect to, must not be {@literal null}.
+     * @param redisURIs the Redis server(s) to connect to, must not be {@literal null}.
      * @param <K> Key type.
      * @param <V> Value type.
      * @return a new connection.
@@ -156,10 +161,15 @@ public static <K, V> StatefulRedisMasterReplicaConnection<K, V> connect(RedisCli
      * be treated as static topology and no additional hosts are discovered in such case. Redis Standalone Master/Replica will
      * discover the roles of the supplied {@link RedisURI URIs} and issue commands to the appropriate node.
      * </p>
+     * <p>
+     * When using Redis Sentinel, ensure that {@link Iterable redisURIs} contains only a single entry as only the first URI is
+     * considered. {@link RedisURI} pointing to multiple Sentinels can be configured through
+     * {@link RedisURI.Builder#withSentinel}.
+     * </p>
      *
      * @param redisClient the Redis client.
      * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}.
-     * @param redisURIs the Redis server to connect to, must not be {@literal null}.
+     * @param redisURIs the Redis server(s) to connect to, must not be {@literal null}.
      * @param <K> Key type.
      * @param <V> Value type.
      * @return {@link CompletableFuture} that is notified once the connect is finished.
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index 37b794e4ff..7530966bef 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -28,6 +28,8 @@
 import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceLists;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
  * Master-Slave connection API.
@@ -60,9 +62,9 @@
  *
  * <ul>
  * <li>{@link MasterSlaveTopologyProvider}: Dynamic topology lookup using the {@code INFO REPLICATION} output. Slaves are listed
- * as {@code slaveN=...} entries. The initial connection can either point to a master or a replica and the topology provider will
- * discover nodes. The connection needs to be re-established outside of lettuce in a case of Master/Slave failover or topology
- * changes.</li>
+ * as {@code slaveN=...} entries. The initial connection can either point to a master or a replica and the topology provider
+ * will discover nodes. The connection needs to be re-established outside of lettuce in a case of Master/Slave failover or
+ * topology changes.</li>
  * <li>{@link StaticMasterSlaveTopologyProvider}: Topology is defined by the list of {@link RedisURI URIs} and the {@code ROLE}
  * output. MasterSlave uses only the supplied nodes and won't discover additional nodes in the setup. The connection needs to be
  * re-established outside of lettuce in a case of Master/Slave failover or topology changes.</li>
@@ -76,9 +78,8 @@
  * <li>Redis Sentinel: Subscribes to all Sentinels and listens for Pub/Sub messages to trigger topology refreshing</li>
  * </ul>
  *
- * <h3>Connection Fault-Tolerance</h3>
- * Connecting to Master/Slave bears the possibility that individual nodes are not reachable. {@link MasterSlave} can still
- * connect to a partially-available set of nodes.
+ * <h3>Connection Fault-Tolerance</h3> Connecting to Master/Slave bears the possibility that individual nodes are not reachable.
+ * {@link MasterSlave} can still connect to a partially-available set of nodes.
  *
  * <ul>
  * <li>Redis Sentinel: At least one Sentinel must be reachable, the masterId must be registered and at least one host must be
@@ -162,10 +163,15 @@ private static <K, V> CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>
      * treated as static topology and no additional hosts are discovered in such case. Redis Standalone Master/Slave will
      * discover the roles of the supplied {@link RedisURI URIs} and issue commands to the appropriate node.
      * </p>
+     * <p>
+     * When using Redis Sentinel, ensure that {@link Iterable redisURIs} contains only a single entry as only the first URI is
+     * considered. {@link RedisURI} pointing to multiple Sentinels can be configured through
+     * {@link RedisURI.Builder#withSentinel}.
+     * </p>
      *
      * @param redisClient the Redis client.
      * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}.
-     * @param redisURIs the Redis server to connect to, must not be {@literal null}.
+     * @param redisURIs the Redis server(s) to connect to, must not be {@literal null}.
      * @param <K> Key type.
      * @param <V> Value type.
      * @return a new connection.
@@ -183,10 +189,15 @@ public static <K, V> StatefulRedisMasterSlaveConnection<K, V> connect(RedisClien
      * treated as static topology and no additional hosts are discovered in such case. Redis Standalone Master/Slave will
      * discover the roles of the supplied {@link RedisURI URIs} and issue commands to the appropriate node.
      * </p>
+     * <p>
+     * When using Redis Sentinel, ensure that {@link Iterable redisURIs} contains only a single entry as only the first URI is
+     * considered. {@link RedisURI} pointing to multiple Sentinels can be configured through
+     * {@link RedisURI.Builder#withSentinel}.
+     * </p>
      *
      * @param redisClient the Redis client.
      * @param codec Use this codec to encode/decode keys and values, must not be {@literal null}.
-     * @param redisURIs the Redis server to connect to, must not be {@literal null}.
+     * @param redisURIs the Redis server(s) to connect to, must not be {@literal null}.
      * @param <K> Key type.
      * @param <V> Value type.
      * @return {@link CompletableFuture} that is notified once the connect is finished.
@@ -206,8 +217,16 @@ private static <K, V> CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>
         List<RedisURI> uriList = LettuceLists.newList(redisURIs);
         LettuceAssert.isTrue(!uriList.isEmpty(), "RedisURIs must not be empty");
 
-        if (isSentinel(uriList.get(0))) {
-            return new SentinelConnector<>(redisClient, codec, uriList.get(0)).connectAsync();
+        RedisURI first = uriList.get(0);
+        if (isSentinel(first)) {
+
+            if (uriList.size() > 1) {
+                InternalLogger logger = InternalLoggerFactory.getInstance(MasterSlave.class);
+                logger.warn(
+                        "RedisURIs contains multiple endpoints of which the first is configured for Sentinel usage. Using only the first URI [{}] without considering the remaining URIs. Make sure to include all Sentinel endpoints in a single RedisURI.",
+                        first);
+            }
+            return new SentinelConnector<>(redisClient, codec, first).connectAsync();
         }
 
         return new StaticMasterSlaveConnector<>(redisClient, codec, uriList).connectAsync();
@@ -253,21 +272,19 @@ private static <T> T getConnection(CompletableFuture<T> connectionFuture, Object
 
     private static <T> CompletableFuture<T> transformAsyncConnectionException(CompletionStage<T> future, Object context) {
 
-        return ConnectionFuture
-                .from(null, future.toCompletableFuture())
-                .thenCompose((v, e) -> {
+        return ConnectionFuture.from(null, future.toCompletableFuture()).thenCompose((v, e) -> {
 
-                    if (e != null) {
+            if (e != null) {
 
-                        // filter intermediate RedisConnectionException exceptions that bloat the stack trace
-                        if (e.getCause() instanceof RedisConnectionException
-                                && e.getCause().getCause() instanceof RedisConnectionException) {
-                            return Futures.failed(RedisConnectionException.create(context.toString(), e.getCause()));
-                        }
-                        return Futures.failed(RedisConnectionException.create(context.toString(), e));
-                    }
+                // filter intermediate RedisConnectionException exceptions that bloat the stack trace
+                if (e.getCause() instanceof RedisConnectionException
+                        && e.getCause().getCause() instanceof RedisConnectionException) {
+                    return Futures.failed(RedisConnectionException.create(context.toString(), e.getCause()));
+                }
+                return Futures.failed(RedisConnectionException.create(context.toString(), e));
+            }
 
-                    return CompletableFuture.completedFuture(v);
-                }).toCompletableFuture();
+            return CompletableFuture.completedFuture(v);
+        }).toCompletableFuture();
     }
 }

From ba70d19bb7eab5589e7ef7917868b8477f6f4d56 Mon Sep 17 00:00:00 2001
From: Ian Pojman <ian.pojman@here.com>
Date: Wed, 6 Nov 2019 10:40:46 -0600
Subject: [PATCH 696/808] Use String concatenation instead of String.format
 when forming BITFIELD args #1175

Original pull request: #1178.
---
 src/main/java/io/lettuce/core/BitFieldArgs.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/lettuce/core/BitFieldArgs.java b/src/main/java/io/lettuce/core/BitFieldArgs.java
index 3e1970bc8a..1c186a82ec 100644
--- a/src/main/java/io/lettuce/core/BitFieldArgs.java
+++ b/src/main/java/io/lettuce/core/BitFieldArgs.java
@@ -444,7 +444,7 @@ <K, V> void build(CommandArgs<K, V> args) {
             args.add(CommandType.SET).add(bitFieldType.asString());
 
             if (bitOffset) {
-                args.add(String.format("#%d", offset));
+                args.add("#"+offset);
             } else {
                 args.add(offset);
             }
@@ -478,7 +478,7 @@ <K, V> void build(CommandArgs<K, V> args) {
             args.add(CommandType.GET).add(bitFieldType.asString());
 
             if (bitOffset) {
-                args.add(String.format("#%d", offset));
+                args.add("#"+offset);
             } else {
                 args.add(offset);
             }
@@ -512,7 +512,7 @@ <K, V> void build(CommandArgs<K, V> args) {
             args.add(CommandType.INCRBY).add(bitFieldType.asString());
 
             if (bitOffset) {
-                args.add(String.format("#%d", offset));
+                args.add("#" + offset);
             } else {
                 args.add(offset);
             }
@@ -613,7 +613,7 @@ public int getBits() {
         }
 
         private String asString() {
-            return String.format("%s%d", (signed ? "i" : "u"), bits);
+            return (signed ? "i" : "u") + bits;
         }
 
         @Override
@@ -657,7 +657,7 @@ public int getOffset() {
 
         @Override
         public String toString() {
-            return String.format("%s%d", (multiplyByTypeWidth ? "#" : ""), offset);
+            return (multiplyByTypeWidth ? "#" : "") + offset;
         }
     }
 }

From caa274843ca1961756f37304192126f7e94c882c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 7 Nov 2019 16:24:05 +0100
Subject: [PATCH 697/808] Polishing #1175

Add author tag. Reformat code.

Original pull request: #1178.
---
 src/main/java/io/lettuce/core/BitFieldArgs.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/BitFieldArgs.java b/src/main/java/io/lettuce/core/BitFieldArgs.java
index 1c186a82ec..d63479e08e 100644
--- a/src/main/java/io/lettuce/core/BitFieldArgs.java
+++ b/src/main/java/io/lettuce/core/BitFieldArgs.java
@@ -31,6 +31,7 @@
  * {@link BitFieldArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
+ * @author Ian Pojman
  * @since 4.2
  */
 public class BitFieldArgs implements CompositeArgument {
@@ -444,7 +445,7 @@ <K, V> void build(CommandArgs<K, V> args) {
             args.add(CommandType.SET).add(bitFieldType.asString());
 
             if (bitOffset) {
-                args.add("#"+offset);
+                args.add("#" + offset);
             } else {
                 args.add(offset);
             }
@@ -478,7 +479,7 @@ <K, V> void build(CommandArgs<K, V> args) {
             args.add(CommandType.GET).add(bitFieldType.asString());
 
             if (bitOffset) {
-                args.add("#"+offset);
+                args.add("#" + offset);
             } else {
                 args.add(offset);
             }

From 9c583b961f745cbe611c595e1d4a0e447eabeaa3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 8 Nov 2019 16:38:43 +0100
Subject: [PATCH 698/808] Pass Allocator as RedisStateMachine constructor
 argument #1053

Use provided allocator instead of using a static reference to PooledByteBufAllocator.DEFAULT.
---
 .../lettuce/core/protocol/CommandHandler.java | 28 +++++++++++--------
 .../core/protocol/RedisStateMachine.java      |  7 +++--
 .../core/protocol/StateMachineUnitTests.java  | 13 +++++----
 .../protocol/RedisStateMachineBenchmark.java  |  3 +-
 4 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 2a2cf88e94..6e89eaa198 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -75,7 +75,6 @@ public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCom
     private final ArrayDeque<RedisCommand<?, ?, ?>> stack = new ArrayDeque<>();
     private final long commandHandlerId = COMMAND_HANDLER_COUNTER.incrementAndGet();
 
-    private final RedisStateMachine rsm = new RedisStateMachine();
     private final boolean traceEnabled = logger.isTraceEnabled();
     private final boolean debugEnabled = logger.isDebugEnabled();
     private final boolean latencyMetricsEnabled;
@@ -85,7 +84,8 @@ public class CommandHandler extends ChannelDuplexHandler implements HasQueuedCom
     private final boolean boundedQueues;
     private final BackpressureSource backpressureSource = new BackpressureSource();
 
-    Channel channel;
+    private RedisStateMachine rsm;
+    private Channel channel;
     private ByteBuf buffer;
     private LifecycleState lifecycleState = LifecycleState.NOT_CONNECTED;
     private String logPrefix;
@@ -165,6 +165,7 @@ public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
         setState(LifecycleState.REGISTERED);
 
         buffer = ctx.alloc().directBuffer(8192 * 8);
+        rsm = new RedisStateMachine(ctx.alloc());
         ctx.fireChannelRegistered();
     }
 
@@ -186,11 +187,12 @@ public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
 
         channel = null;
         buffer.release();
+        rsm.close();
+        rsm = null;
 
         reset();
 
         setState(LifecycleState.CLOSED);
-        rsm.close();
 
         ctx.fireChannelUnregistered();
     }
@@ -232,7 +234,8 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
             try {
                 command.completeExceptionally(cause);
             } catch (Exception ex) {
-                logger.warn("{} Unexpected exception during command completion exceptionally: {}", logPrefix, ex.toString(), ex);
+                logger.warn("{} Unexpected exception during command completion exceptionally: {}", logPrefix, ex.toString(),
+                        ex);
             }
         }
 
@@ -328,8 +331,6 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
             onProtectedMode(command.getOutput().getError());
         }
 
-        rsm.reset();
-
         if (debugEnabled) {
             logger.debug("{} channelInactive() done", logPrefix());
         }
@@ -429,8 +430,8 @@ private void writeBatch(ChannelHandlerContext ctx, Collection<RedisCommand<?, ?,
 
             if (isWriteable(command) && !deduplicated.add(command)) {
                 deduplicated.remove(command);
-                command.completeExceptionally(new RedisException(
-                        "Attempting to write duplicate command that is already enqueued: " + command));
+                command.completeExceptionally(
+                        new RedisException("Attempting to write duplicate command that is already enqueued: " + command));
             }
         }
 
@@ -779,13 +780,14 @@ protected void afterDecode(ChannelHandlerContext ctx, RedisCommand<?, ?, ?> comm
 
     private void recordLatency(WithLatency withLatency, ProtocolKeyword commandType) {
 
-        if (withLatency != null && clientResources.commandLatencyCollector().isEnabled() && channel != null && remote() != null) {
+        if (withLatency != null && clientResources.commandLatencyCollector().isEnabled() && channel != null
+                && remote() != null) {
 
             long firstResponseLatency = withLatency.getFirstResponse() - withLatency.getSent();
             long completionLatency = nanoTime() - withLatency.getSent();
 
-            clientResources.commandLatencyCollector().recordCommandLatency(local(), remote(), commandType,
-                    firstResponseLatency, completionLatency);
+            clientResources.commandLatencyCollector().recordCommandLatency(local(), remote(), commandType, firstResponseLatency,
+                    completionLatency);
         }
     }
 
@@ -813,7 +815,9 @@ private void reset() {
 
     private void resetInternals() {
 
-        rsm.reset();
+        if (rsm != null) {
+            rsm.reset();
+        }
 
         if (buffer.refCnt() > 0) {
             buffer.clear();
diff --git a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index 9c96234b51..9d017dc7f1 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -25,7 +25,7 @@
 import io.lettuce.core.RedisException;
 import io.lettuce.core.output.CommandOutput;
 import io.netty.buffer.ByteBuf;
-import io.netty.buffer.PooledByteBufAllocator;
+import io.netty.buffer.ByteBufAllocator;
 import io.netty.util.ByteProcessor;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -55,7 +55,7 @@ enum Type {
     private final State[] stack = new State[32];
     private final boolean debugEnabled = logger.isDebugEnabled();
     private final LongProcessor longProcessor = new LongProcessor();
-    private final ByteBuf responseElementBuffer = PooledByteBufAllocator.DEFAULT.directBuffer(1024);
+    private final ByteBuf responseElementBuffer;
     private final AtomicBoolean closed = new AtomicBoolean();
 
     private int stackElements;
@@ -63,7 +63,8 @@ enum Type {
     /**
      * Initialize a new instance.
      */
-    public RedisStateMachine() {
+    public RedisStateMachine(ByteBufAllocator alloc) {
+        this.responseElementBuffer = alloc.directBuffer(1024);
     }
 
     /**
diff --git a/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java b/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
index 8d74a51a0a..1ac24671b4 100644
--- a/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
@@ -28,16 +28,14 @@
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.config.LoggerConfig;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 
 import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.*;
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.Unpooled;
 
 /**
@@ -69,7 +67,12 @@ static void afterClass() {
     @BeforeEach
     final void createStateMachine() {
         output = new StatusOutput<>(codec);
-        rsm = new RedisStateMachine();
+        rsm = new RedisStateMachine(ByteBufAllocator.DEFAULT);
+    }
+
+    @AfterEach
+    void tearDown() {
+        rsm.close();
     }
 
     @Test
diff --git a/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
index fceab004be..0b9dad56f5 100644
--- a/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
@@ -23,6 +23,7 @@
 import io.lettuce.core.codec.ByteArrayCodec;
 import io.lettuce.core.output.ArrayOutput;
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.PooledByteBufAllocator;
 
 /**
@@ -59,7 +60,7 @@ public void set(long integer) {
 
     private ByteBuf masterBuffer;
 
-    private final RedisStateMachine stateMachine = new RedisStateMachine();
+    private final RedisStateMachine stateMachine = new RedisStateMachine(ByteBufAllocator.DEFAULT);
     private final byte[] payload = ("*3\r\n" + //
             "$4\r\n" + //
             "LLEN\r\n" + //

From 9115222c1496e005c1042743791d34a2e49e057d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 8 Nov 2019 16:50:27 +0100
Subject: [PATCH 699/808] Remove deprecated LettuceCharsets class #1156

Move off deprecated API in favor of StandardCharsets.
---
 .../java/io/lettuce/core/BitFieldArgs.java    |  4 +-
 .../java/io/lettuce/core/LettuceStrings.java  |  2 +
 src/main/java/io/lettuce/core/RedisURI.java   |  4 +-
 .../java/io/lettuce/core/UnblockType.java     |  5 +-
 .../io/lettuce/core/codec/StringCodec.java    | 10 +---
 .../lettuce/core/codec/Utf8StringCodec.java   |  6 +-
 .../core/dynamic/RedisCommandFactory.java     |  4 +-
 .../masterslave/SentinelTopologyRefresh.java  | 12 ++--
 .../io/lettuce/core/output/StatusOutput.java  |  5 +-
 .../io/lettuce/core/protocol/CommandArgs.java |  3 +-
 .../lettuce/core/protocol/CommandKeyword.java |  4 +-
 .../io/lettuce/core/protocol/CommandType.java |  4 +-
 .../core/protocol/LettuceCharsets.java        | 56 -------------------
 .../core/protocol/RedisStateMachine.java      |  4 +-
 .../core/cluster/ClusterCommandUnitTests.java |  5 +-
 .../cluster/ClusterNodeEndpointUnitTests.java |  5 +-
 .../core/codec/StringCodecUnitTests.java      | 18 +++---
 .../lettuce/core/commands/BitStringCodec.java |  4 +-
 .../core/masterreplica/MasterReplicaTest.java | 10 ++--
 .../StaticMasterReplicaTest.java              | 10 ++--
 .../CustomCommandIntegrationTests.java        | 22 ++++----
 .../MasterSlaveSentinelIntegrationTests.java  | 21 +++----
 .../core/masterslave/MasterSlaveTest.java     |  7 +--
 .../masterslave/StaticMasterSlaveTest.java    |  7 +--
 .../output/BooleanListOutputUnitTests.java    |  1 -
 .../GeoCoordinatesListOutputUnitTests.java    |  3 +-
 ...eoCoordinatesValueListOutputUnitTests.java |  1 -
 .../output/GeoWithinListOutputUnitTests.java  |  1 -
 .../core/output/ListOutputUnitTests.java      |  1 -
 .../output/NestedMultiOutputUnitTests.java    |  5 +-
 .../ScoredValueListOutputUnitTests.java       |  1 -
 .../core/protocol/AsyncCommandUnitTests.java  | 29 +++++-----
 .../core/protocol/CommandArgsUnitTests.java   | 11 ++--
 .../core/protocol/CommandUnitTests.java       |  7 ++-
 .../protocol/DefaultEndpointUnitTests.java    |  5 +-
 .../pubsub/PubSubCommandHandlerUnitTests.java | 40 ++++++-------
 .../reactive/RedisPublisherVerification.java  |  1 -
 ...tToMasterSlaveUsingElastiCacheCluster.java |  8 +--
 ...onnectToMasterSlaveUsingRedisSentinel.java |  1 -
 .../core/codec/StringCodecBenchmark.java      |  7 +--
 .../core/codec/Utf8StringCodecBenchmark.java  |  5 +-
 41 files changed, 142 insertions(+), 217 deletions(-)
 delete mode 100644 src/main/java/io/lettuce/core/protocol/LettuceCharsets.java

diff --git a/src/main/java/io/lettuce/core/BitFieldArgs.java b/src/main/java/io/lettuce/core/BitFieldArgs.java
index d63479e08e..df9927e8a7 100644
--- a/src/main/java/io/lettuce/core/BitFieldArgs.java
+++ b/src/main/java/io/lettuce/core/BitFieldArgs.java
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core;
 
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -22,7 +23,6 @@
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.CommandArgs;
 import io.lettuce.core.protocol.CommandType;
-import io.lettuce.core.protocol.LettuceCharsets;
 import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
@@ -566,7 +566,7 @@ public enum OverflowType implements ProtocolKeyword {
         public final byte[] bytes;
 
         OverflowType() {
-            bytes = name().getBytes(LettuceCharsets.ASCII);
+            bytes = name().getBytes(StandardCharsets.US_ASCII);
         }
 
         @Override
diff --git a/src/main/java/io/lettuce/core/LettuceStrings.java b/src/main/java/io/lettuce/core/LettuceStrings.java
index 64e5fa01d7..55be46e047 100644
--- a/src/main/java/io/lettuce/core/LettuceStrings.java
+++ b/src/main/java/io/lettuce/core/LettuceStrings.java
@@ -16,6 +16,8 @@
 package io.lettuce.core;
 
 import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Collection;
diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 714fa66d44..2db323d8f4 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -24,6 +24,7 @@
 import java.net.SocketAddress;
 import java.net.URI;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.*;
 import java.util.function.LongFunction;
@@ -32,7 +33,6 @@
 import io.lettuce.core.internal.HostAndPort;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceSets;
-import io.lettuce.core.protocol.LettuceCharsets;
 
 /**
  * Redis URI. Contains connection details for the Redis/Sentinel connections. You can provide the database, client name,
@@ -706,7 +706,7 @@ private String getScheme() {
      */
     private static String urlEncode(String str) {
         try {
-            return URLEncoder.encode(str, LettuceCharsets.UTF8.name()).replaceAll("%2F", "/");
+            return URLEncoder.encode(str, StandardCharsets.UTF_8.name()).replaceAll("%2F", "/");
         } catch (UnsupportedEncodingException e) {
             throw new IllegalStateException(e);
         }
diff --git a/src/main/java/io/lettuce/core/UnblockType.java b/src/main/java/io/lettuce/core/UnblockType.java
index 07cdfd18a2..cf21909e22 100644
--- a/src/main/java/io/lettuce/core/UnblockType.java
+++ b/src/main/java/io/lettuce/core/UnblockType.java
@@ -15,7 +15,8 @@
  */
 package io.lettuce.core;
 
-import io.lettuce.core.protocol.LettuceCharsets;
+import java.nio.charset.StandardCharsets;
+
 import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
@@ -31,7 +32,7 @@ public enum UnblockType implements ProtocolKeyword {
     private final byte[] bytes;
 
     UnblockType() {
-        bytes = name().getBytes(LettuceCharsets.ASCII);
+        bytes = name().getBytes(StandardCharsets.US_ASCII);
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/codec/StringCodec.java b/src/main/java/io/lettuce/core/codec/StringCodec.java
index 209f6c7d76..79707b54d0 100644
--- a/src/main/java/io/lettuce/core/codec/StringCodec.java
+++ b/src/main/java/io/lettuce/core/codec/StringCodec.java
@@ -17,13 +17,9 @@
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CoderResult;
+import java.nio.charset.*;
 
 import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.protocol.LettuceCharsets;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
@@ -38,8 +34,8 @@
  */
 public class StringCodec implements RedisCodec<String, String>, ToByteBufEncoder<String, String> {
 
-    public static final StringCodec UTF8 = new StringCodec(LettuceCharsets.UTF8);
-    public static final StringCodec ASCII = new StringCodec(LettuceCharsets.ASCII);
+    public static final StringCodec UTF8 = new StringCodec(StandardCharsets.UTF_8);
+    public static final StringCodec ASCII = new StringCodec(StandardCharsets.US_ASCII);
 
     private static final byte[] EMPTY = new byte[0];
 
diff --git a/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java b/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
index cdd49e7921..42d19e96f4 100644
--- a/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
+++ b/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
@@ -15,7 +15,7 @@
  */
 package io.lettuce.core.codec;
 
-import io.lettuce.core.protocol.LettuceCharsets;
+import java.nio.charset.StandardCharsets;
 
 /**
  * A {@link RedisCodec} that handles UTF-8 encoded keys and values.
@@ -23,7 +23,7 @@
  * @author Will Glozer
  * @author Mark Paluch
  * @see StringCodec
- * @see LettuceCharsets#UTF8
+ * @see StandardCharsets#UTF_8
  * @deprecated since 5.2, use {@link StringCodec#UTF8} instead.
  */
 @Deprecated
@@ -33,6 +33,6 @@ public class Utf8StringCodec extends StringCodec implements RedisCodec<String, S
      * Initialize a new instance that encodes and decodes strings using the UTF-8 charset;
      */
     public Utf8StringCodec() {
-        super(LettuceCharsets.UTF8);
+        super(StandardCharsets.UTF_8);
     }
 }
diff --git a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
index 9e1f28b8b1..59a13a76d8 100644
--- a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
@@ -18,6 +18,7 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 import io.lettuce.core.AbstractRedisReactiveCommands;
@@ -40,7 +41,6 @@
 import io.lettuce.core.internal.LettuceLists;
 import io.lettuce.core.models.command.CommandDetail;
 import io.lettuce.core.models.command.CommandDetailParser;
-import io.lettuce.core.protocol.LettuceCharsets;
 import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.support.ConnectionWrapping;
 import io.netty.util.internal.logging.InternalLogger;
@@ -108,7 +108,7 @@ public class RedisCommandFactory {
      * @param connection must not be {@literal null}.
      */
     public RedisCommandFactory(StatefulConnection<?, ?> connection) {
-        this(connection, LettuceLists.newList(new ByteArrayCodec(), new StringCodec(LettuceCharsets.UTF8)));
+        this(connection, LettuceLists.newList(new ByteArrayCodec(), new StringCodec(StandardCharsets.UTF_8)));
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
index 6309c5eaaf..3cbeece3b7 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.masterslave;
 
 import java.io.Closeable;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.*;
@@ -31,7 +32,6 @@
 import io.lettuce.core.internal.AsyncCloseable;
 import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceLists;
-import io.lettuce.core.protocol.LettuceCharsets;
 import io.lettuce.core.pubsub.RedisPubSubAdapter;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.netty.util.concurrent.EventExecutorGroup;
@@ -48,7 +48,7 @@
 class SentinelTopologyRefresh implements AsyncCloseable, Closeable {
 
     private static final InternalLogger LOG = InternalLoggerFactory.getInstance(SentinelTopologyRefresh.class);
-    private static final StringCodec CODEC = new StringCodec(LettuceCharsets.ASCII);
+    private static final StringCodec CODEC = new StringCodec(StandardCharsets.US_ASCII);
     private static final Set<String> PROCESSING_CHANNELS = new HashSet<>(
             Arrays.asList("failover-end", "failover-end-for-timeout"));
 
@@ -155,8 +155,8 @@ private CompletionStage<Void> initializeSentinels() {
 
         SentinelTopologyRefreshConnections collector = collectConnections(connectionFutures);
 
-        CompletionStage<SentinelTopologyRefreshConnections> completionStage = collector.getOrTimeout(timeout, redisClient
-                .getResources().eventExecutorGroup());
+        CompletionStage<SentinelTopologyRefreshConnections> completionStage = collector.getOrTimeout(timeout,
+                redisClient.getResources().eventExecutorGroup());
 
         return completionStage.whenComplete((aVoid, throwable) -> {
 
@@ -359,8 +359,8 @@ interface MessagePredicate extends BiPredicate<String, String> {
     private static class TopologyRefreshMessagePredicate implements MessagePredicate {
 
         private final String masterId;
-        private Set<String> TOPOLOGY_CHANGE_CHANNELS = new HashSet<>(Arrays.asList("+slave", "+sdown", "-sdown",
-                "fix-slave-config", "+convert-to-slave", "+role-change"));
+        private Set<String> TOPOLOGY_CHANGE_CHANNELS = new HashSet<>(
+                Arrays.asList("+slave", "+sdown", "-sdown", "fix-slave-config", "+convert-to-slave", "+role-change"));
 
         TopologyRefreshMessagePredicate(String masterId) {
             this.masterId = masterId;
diff --git a/src/main/java/io/lettuce/core/output/StatusOutput.java b/src/main/java/io/lettuce/core/output/StatusOutput.java
index bbe5b1503a..7889834d5e 100644
--- a/src/main/java/io/lettuce/core/output/StatusOutput.java
+++ b/src/main/java/io/lettuce/core/output/StatusOutput.java
@@ -15,9 +15,8 @@
  */
 package io.lettuce.core.output;
 
-import static io.lettuce.core.protocol.LettuceCharsets.buffer;
-
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 
 import io.lettuce.core.codec.RedisCodec;
 
@@ -30,7 +29,7 @@
  */
 public class StatusOutput<K, V> extends CommandOutput<K, V, String> {
 
-    private static final ByteBuffer OK = buffer("OK");
+    private static final ByteBuffer OK = StandardCharsets.US_ASCII.encode("OK");
 
     public StatusOutput(RedisCodec<K, V> codec) {
         super(codec, null);
diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgs.java b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
index 876a616ee2..24402e73aa 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandArgs.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.protocol;
 
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
@@ -47,7 +48,7 @@
  */
 public class CommandArgs<K, V> {
 
-    static final byte[] CRLF = "\r\n".getBytes(LettuceCharsets.ASCII);
+    static final byte[] CRLF = "\r\n".getBytes(StandardCharsets.US_ASCII);
 
     protected final RedisCodec<K, V> codec;
 
diff --git a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
index a30fd7140c..3dfc82b84f 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
@@ -15,6 +15,8 @@
  */
 package io.lettuce.core.protocol;
 
+import java.nio.charset.StandardCharsets;
+
 /**
  * Keyword modifiers for redis commands.
  *
@@ -45,7 +47,7 @@ public enum CommandKeyword implements ProtocolKeyword {
     public final byte[] bytes;
 
     private CommandKeyword() {
-        bytes = name().getBytes(LettuceCharsets.ASCII);
+        bytes = name().getBytes(StandardCharsets.US_ASCII);
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/protocol/CommandType.java b/src/main/java/io/lettuce/core/protocol/CommandType.java
index 5be32d7ca7..d788993fdd 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandType.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandType.java
@@ -15,6 +15,8 @@
  */
 package io.lettuce.core.protocol;
 
+import java.nio.charset.StandardCharsets;
+
 /**
  * Redis commands.
  *
@@ -102,7 +104,7 @@ public enum CommandType implements ProtocolKeyword {
     public final byte[] bytes;
 
     CommandType() {
-        bytes = name().getBytes(LettuceCharsets.ASCII);
+        bytes = name().getBytes(StandardCharsets.US_ASCII);
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java b/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java
deleted file mode 100644
index 245b62c483..0000000000
--- a/src/main/java/io/lettuce/core/protocol/LettuceCharsets.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2011-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.protocol;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-
-/**
- * {@link Charset}-related utilities.
- *
- * @author Will Glozer
- */
-public class LettuceCharsets {
-
-    /**
-     * US-ASCII charset.
-     */
-    public static final Charset ASCII = StandardCharsets.US_ASCII;
-
-    /**
-     * UTF-8 charset.
-     */
-    public static final Charset UTF8 = StandardCharsets.UTF_8;
-
-    /**
-     * Utility constructor.
-     */
-    private LettuceCharsets() {
-
-    }
-
-    /**
-     * Create a ByteBuffer from a string using ASCII encoding.
-     *
-     * @param s the string
-     * @return ByteBuffer
-     */
-    public static ByteBuffer buffer(String s) {
-        return ByteBuffer.wrap(s.getBytes(ASCII));
-    }
-
-}
diff --git a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index 9d017dc7f1..f30e9a9f64 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -15,10 +15,10 @@
  */
 package io.lettuce.core.protocol;
 
-import static io.lettuce.core.protocol.LettuceCharsets.buffer;
 import static io.lettuce.core.protocol.RedisStateMachine.State.Type.*;
 
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -41,7 +41,7 @@
 public class RedisStateMachine {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(RedisStateMachine.class);
-    private static final ByteBuffer QUEUED = buffer("QUEUED");
+    private static final ByteBuffer QUEUED = StandardCharsets.US_ASCII.encode("QUEUED");
 
     static class State {
         enum Type {
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java
index faf758c347..e3d7f9aa91 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java
@@ -30,7 +30,6 @@
 
 import io.lettuce.core.RedisChannelWriter;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.protocol.Command;
@@ -46,8 +45,8 @@ class ClusterCommandUnitTests {
     private RedisChannelWriter writerMock;
 
     private ClusterCommand<String, String, String> sut;
-    private Command<String, String, String> command = new Command<>(CommandType.TYPE,
-            new StatusOutput<>(StringCodec.UTF8), null);
+    private Command<String, String, String> command = new Command<>(CommandType.TYPE, new StatusOutput<>(StringCodec.UTF8),
+            null);
 
     @BeforeEach
     void before() {
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
index 530525b724..7760a4e8f1 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
@@ -34,7 +34,6 @@
 import io.lettuce.core.RedisChannelWriter;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.protocol.Command;
@@ -49,8 +48,8 @@
 @ExtendWith(MockitoExtension.class)
 class ClusterNodeEndpointUnitTests {
 
-    private AsyncCommand<String, String, String> command = new AsyncCommand<>(new Command<>(CommandType.APPEND,
-            new StatusOutput<>(StringCodec.UTF8), null));
+    private AsyncCommand<String, String, String> command = new AsyncCommand<>(
+            new Command<>(CommandType.APPEND, new StatusOutput<>(StringCodec.UTF8), null));
 
     private Queue<RedisCommand<String, String, ?>> disconnectedBuffer;
 
diff --git a/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java b/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java
index b8ee1d7edb..152675045e 100644
--- a/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java
+++ b/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java
@@ -22,7 +22,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import io.lettuce.core.protocol.LettuceCharsets;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
@@ -37,7 +36,7 @@ class StringCodecUnitTests {
     @Test
     void encodeUtf8Buf() {
 
-        StringCodec codec = new StringCodec(LettuceCharsets.UTF8);
+        StringCodec codec = new StringCodec(StandardCharsets.UTF_8);
 
         ByteBuf buffer = Unpooled.buffer(1234);
         codec.encode(teststring, buffer);
@@ -48,12 +47,12 @@ void encodeUtf8Buf() {
     @Test
     void encodeAsciiBuf() {
 
-        StringCodec codec = new StringCodec(LettuceCharsets.ASCII);
+        StringCodec codec = new StringCodec(StandardCharsets.US_ASCII);
 
         ByteBuf buffer = Unpooled.buffer(1234);
         codec.encode(teststringPlain, buffer);
 
-        assertThat(buffer.toString(LettuceCharsets.ASCII)).isEqualTo(teststringPlain);
+        assertThat(buffer.toString(StandardCharsets.US_ASCII)).isEqualTo(teststringPlain);
     }
 
     @Test
@@ -70,7 +69,7 @@ void encodeIso88591Buf() {
     @Test
     void encodeAndDecodeUtf8Buf() {
 
-        StringCodec codec = new StringCodec(LettuceCharsets.UTF8);
+        StringCodec codec = new StringCodec(StandardCharsets.UTF_8);
 
         ByteBuf buffer = Unpooled.buffer(1234);
         codec.encodeKey(teststring, buffer);
@@ -81,7 +80,7 @@ void encodeAndDecodeUtf8Buf() {
     @Test
     void encodeAndDecodeUtf8() {
 
-        StringCodec codec = new StringCodec(LettuceCharsets.UTF8);
+        StringCodec codec = new StringCodec(StandardCharsets.UTF_8);
         ByteBuffer byteBuffer = codec.encodeKey(teststring);
 
         assertThat(codec.decodeKey(byteBuffer)).isEqualTo(teststring);
@@ -90,7 +89,7 @@ void encodeAndDecodeUtf8() {
     @Test
     void encodeAndDecodeAsciiBuf() {
 
-        StringCodec codec = new StringCodec(LettuceCharsets.ASCII);
+        StringCodec codec = new StringCodec(StandardCharsets.US_ASCII);
 
         ByteBuf buffer = Unpooled.buffer(1234);
         codec.encode(teststringPlain, buffer);
@@ -112,8 +111,9 @@ void encodeAndDecodeIso88591Buf() {
     @Test
     void estimateSize() {
 
-        assertThat(new StringCodec(LettuceCharsets.UTF8).estimateSize(teststring)).isEqualTo((int) (teststring.length() * 1.1));
-        assertThat(new StringCodec(LettuceCharsets.ASCII).estimateSize(teststring)).isEqualTo(teststring.length());
+        assertThat(new StringCodec(StandardCharsets.UTF_8).estimateSize(teststring))
+                .isEqualTo((int) (teststring.length() * 1.1));
+        assertThat(new StringCodec(StandardCharsets.US_ASCII).estimateSize(teststring)).isEqualTo(teststring.length());
         assertThat(new StringCodec(StandardCharsets.ISO_8859_1).estimateSize(teststring)).isEqualTo(teststring.length());
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/BitStringCodec.java b/src/test/java/io/lettuce/core/commands/BitStringCodec.java
index e919d6eae6..06cc58bc3e 100644
--- a/src/test/java/io/lettuce/core/commands/BitStringCodec.java
+++ b/src/test/java/io/lettuce/core/commands/BitStringCodec.java
@@ -17,12 +17,12 @@
 
 import java.nio.ByteBuffer;
 
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.codec.StringCodec;
 
 /**
  * @author Mark Paluch
  */
-public class BitStringCodec extends Utf8StringCodec {
+public class BitStringCodec extends StringCodec {
 
     @Override
     public String decodeValue(ByteBuffer bytes) {
diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
index 30db6bfa0a..bf8673bd88 100644
--- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
@@ -36,7 +36,6 @@
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.core.models.role.RoleParser;
@@ -73,13 +72,14 @@ void before() throws Exception {
         if (node1Instance.getRole() == RedisInstance.Role.MASTER && node2Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node1;
             replica = node2;
-        } else if (node2Instance.getRole() == RedisInstance.Role.MASTER && node1Instance.getRole() == RedisInstance.Role.SLAVE) {
+        } else if (node2Instance.getRole() == RedisInstance.Role.MASTER
+                && node1Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node2;
             replica = node1;
         } else {
-            assumeTrue(false, String.format(
-                    "Cannot run the test because I don't have a distinct master and replica but %s and %s", node1Instance,
-                    node2Instance));
+            assumeTrue(false,
+                    String.format("Cannot run the test because I don't have a distinct master and replica but %s and %s",
+                            node1Instance, node2Instance));
         }
 
         connectionToNode1.configSet("requirepass", passwd);
diff --git a/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java b/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
index cef8066885..ea4c0db027 100644
--- a/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
+++ b/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
@@ -35,7 +35,6 @@
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RoleParser;
 import io.lettuce.test.settings.TestSettings;
@@ -68,13 +67,14 @@ void before() throws Exception {
         if (node1Instance.getRole() == RedisInstance.Role.MASTER && node2Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node1;
             slave = node2;
-        } else if (node2Instance.getRole() == RedisInstance.Role.MASTER && node1Instance.getRole() == RedisInstance.Role.SLAVE) {
+        } else if (node2Instance.getRole() == RedisInstance.Role.MASTER
+                && node1Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node2;
             slave = node1;
         } else {
-            assumeTrue(false, String.format(
-                    "Cannot run the test because I don't have a distinct master and slave but %s and %s", node1Instance,
-                    node2Instance));
+            assumeTrue(false,
+                    String.format("Cannot run the test because I don't have a distinct master and slave but %s and %s",
+                            node1Instance, node2Instance));
         }
 
         connectionToNode1.configSet("requirepass", passwd);
diff --git a/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java b/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
index 772e97a19e..dae1476d88 100644
--- a/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
@@ -32,7 +32,6 @@
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
 import io.lettuce.test.Futures;
@@ -71,8 +70,8 @@ void after() {
     @Test
     void dispatchSet() {
 
-        String response = redis.dispatch(MyCommands.SET, new StatusOutput<>(StringCodec.UTF8), new CommandArgs<>(
-                StringCodec.UTF8).addKey(key).addValue(value));
+        String response = redis.dispatch(MyCommands.SET, new StatusOutput<>(StringCodec.UTF8),
+                new CommandArgs<>(StringCodec.UTF8).addKey(key).addValue(value));
 
         assertThat(response).isEqualTo("OK");
     }
@@ -89,17 +88,16 @@ void dispatchWithoutArgs() {
     void dispatchShouldFailForWrongDataType() {
 
         redis.hset(key, key, value);
-        assertThatThrownBy(
-                () -> redis.dispatch(CommandType.GET, new StatusOutput<>(StringCodec.UTF8),
-                        new CommandArgs<>(StringCodec.UTF8).addKey(key))).isInstanceOf(RedisCommandExecutionException.class);
+        assertThatThrownBy(() -> redis.dispatch(CommandType.GET, new StatusOutput<>(StringCodec.UTF8),
+                new CommandArgs<>(StringCodec.UTF8).addKey(key))).isInstanceOf(RedisCommandExecutionException.class);
     }
 
     @Test
     void dispatchTransactions() {
 
         redis.multi();
-        String response = redis.dispatch(CommandType.SET, new StatusOutput<>(StringCodec.UTF8), new CommandArgs<>(
-                StringCodec.UTF8).addKey(key).addValue(value));
+        String response = redis.dispatch(CommandType.SET, new StatusOutput<>(StringCodec.UTF8),
+                new CommandArgs<>(StringCodec.UTF8).addKey(key).addValue(value));
 
         TransactionResult exec = redis.exec();
 
@@ -110,8 +108,8 @@ void dispatchTransactions() {
     @Test
     void masterSlaveAsyncPing() {
 
-        RedisCommand<String, String, String> command = new Command<>(MyCommands.PING,
-                new StatusOutput<>(StringCodec.UTF8), null);
+        RedisCommand<String, String, String> command = new Command<>(MyCommands.PING, new StatusOutput<>(StringCodec.UTF8),
+                null);
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(command);
         getStandaloneConnection().dispatch(async);
@@ -144,8 +142,8 @@ void masterSlaveAsyncBatchPing() {
     @Test
     void masterSlaveFireAndForget() {
 
-        RedisCommand<String, String, String> command = new Command<>(MyCommands.PING,
-                new StatusOutput<>(StringCodec.UTF8), null);
+        RedisCommand<String, String, String> command = new Command<>(MyCommands.PING, new StatusOutput<>(StringCodec.UTF8),
+                null);
         getStandaloneConnection().dispatch(command);
         assertThat(command.isCancelled()).isFalse();
 
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
index 97ea9c5175..a1ef370e2c 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
@@ -31,7 +31,6 @@
 
 import io.lettuce.core.*;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.sentinel.SentinelTestSettings;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.settings.TestSettings;
@@ -54,10 +53,9 @@ class MasterSlaveSentinelIntegrationTests extends TestSupport {
     @Test
     void testMasterSlaveSentinelBasic() {
 
-        RedisURI uri = RedisURI
-                .create("redis-sentinel://127.0.0.1:21379,127.0.0.1:22379,127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
-        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient,
-                StringCodec.UTF8, uri);
+        RedisURI uri = RedisURI.create(
+                "redis-sentinel://127.0.0.1:21379,127.0.0.1:22379,127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
+        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8, uri);
 
         connection.setReadFrom(ReadFrom.MASTER);
         String server = slaveCall(connection);
@@ -72,8 +70,8 @@ void masterSlaveConnectionShouldSetClientName() {
         RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), SentinelTestSettings.MASTER_ID)
                 .withClientName("my-client").build();
 
-        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient,
-                StringCodec.UTF8, redisURI);
+        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8,
+                redisURI);
 
         assertThat(connection.sync().clientGetname()).isEqualTo(redisURI.getClientName());
         connection.sync().quit();
@@ -85,10 +83,9 @@ void masterSlaveConnectionShouldSetClientName() {
     @Test
     void testMasterSlaveSentinelWithTwoUnavailableSentinels() {
 
-        RedisURI uri = RedisURI
-                .create("redis-sentinel://127.0.0.1:21379,127.0.0.1:22379,127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
-        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient,
-                StringCodec.UTF8, uri);
+        RedisURI uri = RedisURI.create(
+                "redis-sentinel://127.0.0.1:21379,127.0.0.1:22379,127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
+        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8, uri);
 
         connection.setReadFrom(ReadFrom.MASTER);
         String server = connection.sync().info("replication");
@@ -123,7 +120,7 @@ void testMasterSlaveSentinelConnectionCount() {
         connection.setReadFrom(ReadFrom.REPLICA);
         slaveCall(connection);
 
-        assertThat(channels.size()).isEqualTo(count + 2 /* connections */+ 1 /* sentinel connections */);
+        assertThat(channels.size()).isEqualTo(count + 2 /* connections */ + 1 /* sentinel connections */);
 
         connection.close();
     }
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
index 2e48833c50..28a592cbf3 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
@@ -36,7 +36,6 @@
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.core.models.role.RoleParser;
@@ -78,9 +77,9 @@ void before() throws Exception {
             master = node2;
             replica = node1;
         } else {
-            assumeTrue(false, String.format(
-                    "Cannot run the test because I don't have a distinct master and replica but %s and %s", node1Instance,
-                    node2Instance));
+            assumeTrue(false,
+                    String.format("Cannot run the test because I don't have a distinct master and replica but %s and %s",
+                            node1Instance, node2Instance));
         }
 
         connectionToNode1.configSet("requirepass", passwd);
diff --git a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
index 5de40d3c74..595f674f03 100644
--- a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
@@ -36,7 +36,6 @@
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RoleParser;
 import io.lettuce.test.settings.TestSettings;
@@ -74,9 +73,9 @@ void before() throws Exception {
             master = node2;
             replica = node1;
         } else {
-            assumeTrue(false, String.format(
-                    "Cannot run the test because I don't have a distinct master and replica but %s and %s", node1Instance,
-                    node2Instance));
+            assumeTrue(false,
+                    String.format("Cannot run the test because I don't have a distinct master and replica but %s and %s",
+                            node1Instance, node2Instance));
         }
 
         connectionToNode1.configSet("requirepass", passwd);
diff --git a/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java
index 9ebd924570..8b3e9245fc 100644
--- a/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java
@@ -23,7 +23,6 @@
 import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java
index d346c7a7c7..002285e7cd 100644
--- a/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java
@@ -24,7 +24,6 @@
 
 import io.lettuce.core.GeoCoordinates;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
  * @author Mark Paluch
@@ -35,7 +34,7 @@ class GeoCoordinatesListOutputUnitTests {
 
     @Test
     void setIntegerShouldFail() {
-        assertThatThrownBy(() -> sut.set(123L)).isInstanceOf(IllegalStateException. class);
+        assertThatThrownBy(() -> sut.set(123L)).isInstanceOf(IllegalStateException.class);
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java
index 2369dfde62..ee4117a556 100644
--- a/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java
@@ -25,7 +25,6 @@
 import io.lettuce.core.GeoCoordinates;
 import io.lettuce.core.Value;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java
index b47dd4fa9f..18670fef04 100644
--- a/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java
@@ -25,7 +25,6 @@
 import io.lettuce.core.GeoWithin;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java
index a93b87b7e4..20d4f4bb3c 100644
--- a/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java
@@ -27,7 +27,6 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java b/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java
index 00a116857c..e65fbb5138 100644
--- a/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java
@@ -15,9 +15,10 @@
  */
 package io.lettuce.core.output;
 
-import static io.lettuce.core.protocol.LettuceCharsets.buffer;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.nio.charset.StandardCharsets;
+
 import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.codec.StringCodec;
@@ -31,7 +32,7 @@ class NestedMultiOutputUnitTests {
     void nestedMultiError() {
 
         NestedMultiOutput<String, String> output = new NestedMultiOutput<>(StringCodec.UTF8);
-        output.setError(buffer("Oops!"));
+        output.setError(StandardCharsets.US_ASCII.encode("Oops!"));
         assertThat(output.getError()).isNotNull();
     }
 }
diff --git a/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java
index 61d768660c..f605767355 100644
--- a/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java
@@ -24,7 +24,6 @@
 
 import io.lettuce.core.ScoredValue;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 
 /**
  * @author Mark Paluch
diff --git a/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java b/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
index f17472fffc..cebf0a1a00 100644
--- a/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
@@ -15,10 +15,10 @@
  */
 package io.lettuce.core.protocol;
 
-import static io.lettuce.core.protocol.LettuceCharsets.buffer;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -29,7 +29,6 @@
 import io.lettuce.core.*;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.CommandOutput;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.test.Futures;
@@ -78,8 +77,8 @@ void awaitAll() {
 
     @Test
     void awaitNotCompleted() {
-        assertThatThrownBy(() -> LettuceFutures.awaitOrCancel(sut, 0, TimeUnit.NANOSECONDS)).isInstanceOf(
-                RedisCommandTimeoutException.class);
+        assertThatThrownBy(() -> LettuceFutures.awaitOrCancel(sut, 0, TimeUnit.NANOSECONDS))
+                .isInstanceOf(RedisCommandTimeoutException.class);
     }
 
     @Test
@@ -91,8 +90,8 @@ void awaitWithExecutionException() {
     @Test
     void awaitWithCancelledCommand() {
         sut.cancel();
-        assertThatThrownBy(() -> LettuceFutures.awaitOrCancel(sut, 5, TimeUnit.SECONDS)).isInstanceOf(
-                CancellationException.class);
+        assertThatThrownBy(() -> LettuceFutures.awaitOrCancel(sut, 5, TimeUnit.SECONDS))
+                .isInstanceOf(CancellationException.class);
     }
 
     @Test
@@ -125,7 +124,7 @@ void completeExceptionally() {
 
     @Test
     void asyncGet() {
-        sut.getOutput().set(buffer("one"));
+        sut.getOutput().set(StandardCharsets.US_ASCII.encode("one"));
         sut.complete();
         assertThat(Futures.get(sut.toCompletableFuture())).isEqualTo("one");
         sut.getOutput().toString();
@@ -133,23 +132,21 @@ void asyncGet() {
 
     @Test
     void customKeyword() {
-        sut = new AsyncCommand<>(
-                new Command<>(MyKeywords.DUMMY, new StatusOutput<>(codec), null));
+        sut = new AsyncCommand<>(new Command<>(MyKeywords.DUMMY, new StatusOutput<>(codec), null));
 
         assertThat(sut.toString()).contains(MyKeywords.DUMMY.name());
     }
 
     @Test
     void customKeywordWithArgs() {
-        sut = new AsyncCommand<>(
-                new Command<>(MyKeywords.DUMMY, null, new CommandArgs<>(codec)));
+        sut = new AsyncCommand<>(new Command<>(MyKeywords.DUMMY, null, new CommandArgs<>(codec)));
         sut.getArgs().add(MyKeywords.DUMMY);
         assertThat(sut.getArgs().toString()).contains(MyKeywords.DUMMY.name());
     }
 
     @Test
     void getWithTimeout() throws Exception {
-        sut.getOutput().set(buffer("one"));
+        sut.getOutput().set(StandardCharsets.US_ASCII.encode("one"));
         sut.complete();
 
         assertThat(sut.get(0, TimeUnit.MILLISECONDS)).isEqualTo("one");
@@ -174,13 +171,13 @@ void getInterrupted() {
     @Test
     void getInterrupted2() {
         Thread.currentThread().interrupt();
-        assertThatThrownBy(() -> sut.get(5, TimeUnit.MILLISECONDS)).isInstanceOf(InterruptedException. class);
+        assertThatThrownBy(() -> sut.get(5, TimeUnit.MILLISECONDS)).isInstanceOf(InterruptedException.class);
     }
 
     @Test
     void awaitInterrupted2() {
         Thread.currentThread().interrupt();
-        assertThatThrownBy(() -> sut.await(5, TimeUnit.MILLISECONDS)).isInstanceOf(RedisCommandInterruptedException. class);
+        assertThatThrownBy(() -> sut.await(5, TimeUnit.MILLISECONDS)).isInstanceOf(RedisCommandInterruptedException.class);
     }
 
     @Test
@@ -191,7 +188,7 @@ public String get() throws RedisException {
                 return null;
             }
         };
-        assertThatThrownBy(() -> output.set(null)).isInstanceOf(IllegalStateException. class);
+        assertThatThrownBy(() -> output.set(null)).isInstanceOf(IllegalStateException.class);
     }
 
     @Test
@@ -202,7 +199,7 @@ public String get() throws RedisException {
                 return null;
             }
         };
-        assertThatThrownBy(() -> output.set(0)).isInstanceOf(IllegalStateException. class);
+        assertThatThrownBy(() -> output.set(0)).isInstanceOf(IllegalStateException.class);
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java
index 234db454b0..e4c0252d6d 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java
@@ -18,6 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 import org.junit.jupiter.api.Test;
@@ -116,7 +117,7 @@ void addValues() {
         ByteBuf expected = Unpooled.buffer();
         expected.writeBytes(("$1\r\n" + "1\r\n" + "$1\r\n" + "2\r\n").getBytes());
 
-        assertThat(buffer.toString(LettuceCharsets.ASCII)).isEqualTo(expected.toString(LettuceCharsets.ASCII));
+        assertThat(buffer.toString(StandardCharsets.US_ASCII)).isEqualTo(expected.toString(StandardCharsets.US_ASCII));
     }
 
     @Test
@@ -130,7 +131,7 @@ void addByte() {
         ByteBuf expected = Unpooled.buffer();
         expected.writeBytes(("$3\r\n" + "one\r\n").getBytes());
 
-        assertThat(buffer.toString(LettuceCharsets.ASCII)).isEqualTo(expected.toString(LettuceCharsets.ASCII));
+        assertThat(buffer.toString(StandardCharsets.US_ASCII)).isEqualTo(expected.toString(StandardCharsets.US_ASCII));
     }
 
     @Test
@@ -144,7 +145,7 @@ void addByteUsingByteCodec() {
         ByteBuf expected = Unpooled.buffer();
         expected.writeBytes(("$3\r\n" + "one\r\n").getBytes());
 
-        assertThat(buffer.toString(LettuceCharsets.ASCII)).isEqualTo(expected.toString(LettuceCharsets.ASCII));
+        assertThat(buffer.toString(StandardCharsets.US_ASCII)).isEqualTo(expected.toString(StandardCharsets.US_ASCII));
     }
 
     @Test
@@ -158,7 +159,7 @@ void addValueUsingByteCodec() {
         ByteBuf expected = Unpooled.buffer();
         expected.writeBytes(("$3\r\n" + "one\r\n").getBytes());
 
-        assertThat(buffer.toString(LettuceCharsets.ASCII)).isEqualTo(expected.toString(LettuceCharsets.ASCII));
+        assertThat(buffer.toString(StandardCharsets.US_ASCII)).isEqualTo(expected.toString(StandardCharsets.US_ASCII));
     }
 
     @Test
@@ -172,6 +173,6 @@ void addKeyUsingByteCodec() {
         ByteBuf expected = Unpooled.buffer();
         expected.writeBytes(("$3\r\n" + "one\r\n").getBytes());
 
-        assertThat(buffer.toString(LettuceCharsets.ASCII)).isEqualTo(expected.toString(LettuceCharsets.ASCII));
+        assertThat(buffer.toString(StandardCharsets.US_ASCII)).isEqualTo(expected.toString(StandardCharsets.US_ASCII));
     }
 }
diff --git a/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java
index 982afe00f9..ddf4738eda 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java
@@ -15,10 +15,11 @@
  */
 package io.lettuce.core.protocol;
 
-import static io.lettuce.core.protocol.LettuceCharsets.buffer;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import java.nio.charset.StandardCharsets;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -69,7 +70,7 @@ void isDone() {
     @Test
     void get() {
         assertThat(sut.get()).isNull();
-        sut.getOutput().set(buffer("one"));
+        sut.getOutput().set(StandardCharsets.US_ASCII.encode("one"));
         assertThat(sut.get()).isEqualTo("one");
     }
 
@@ -108,7 +109,7 @@ void customKeywordWithArgs() {
 
     @Test
     void getWithTimeout() {
-        sut.getOutput().set(buffer("one"));
+        sut.getOutput().set(StandardCharsets.US_ASCII.encode("one"));
         sut.complete();
 
         assertThat(sut.get()).isEqualTo("one");
diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
index f88c69b9ef..ef6db6b422 100644
--- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
@@ -50,7 +50,6 @@
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.internal.LettuceFactories;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.resource.ClientResources;
@@ -70,8 +69,8 @@ class DefaultEndpointUnitTests {
 
     private DefaultEndpoint sut;
 
-    private final Command<String, String, String> command = new Command<>(CommandType.APPEND, new StatusOutput<>(
-            StringCodec.UTF8), null);
+    private final Command<String, String, String> command = new Command<>(CommandType.APPEND,
+            new StatusOutput<>(StringCodec.UTF8), null);
 
     @Mock
     private Channel channel;
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
index 33a68864ee..de97352ca9 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
@@ -37,7 +37,6 @@
 
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.metrics.DefaultCommandLatencyCollector;
 import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
 import io.lettuce.core.output.StatusOutput;
@@ -63,8 +62,8 @@ class PubSubCommandHandlerUnitTests {
 
     private PubSubCommandHandler<String, String> sut;
 
-    private final Command<String, String, String> command = new Command<>(CommandType.APPEND, new StatusOutput<>(
-            StringCodec.UTF8), null);
+    private final Command<String, String, String> command = new Command<>(CommandType.APPEND,
+            new StatusOutput<>(StringCodec.UTF8), null);
 
     @Mock
     private ChannelHandlerContext context;
@@ -102,8 +101,8 @@ void before() {
             return null;
         });
 
-        when(clientResources.commandLatencyCollector()).thenReturn(
-                new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create()));
+        when(clientResources.commandLatencyCollector())
+                .thenReturn(new DefaultCommandLatencyCollector(DefaultCommandLatencyCollectorOptions.create()));
         when(clientResources.tracing()).thenReturn(Tracing.disabled());
 
         sut = new PubSubCommandHandler<>(ClientOptions.create(), clientResources, StringCodec.UTF8, endpoint);
@@ -183,7 +182,8 @@ void shouldPropagateInterleavedPubSubResponseToOutput() throws Exception {
         stack.add(command1);
         stack.add(command2);
 
-        sut.channelRead(context, responseBytes("+OK\r\n*4\r\n$8\r\npmessage\r\n$1\r\n*\r\n$3\r\nfoo\r\n$3\r\nbar\r\n+YEAH\r\n"));
+        sut.channelRead(context,
+                responseBytes("+OK\r\n*4\r\n$8\r\npmessage\r\n$1\r\n*\r\n$3\r\nfoo\r\n$3\r\nbar\r\n+YEAH\r\n"));
 
         assertThat(command1.get()).isEqualTo("OK");
         assertThat(command2.get()).isEqualTo("YEAH");
@@ -199,10 +199,10 @@ void shouldPropagateInterleavedPubSubResponseToOutput() throws Exception {
     @Test
     void shouldNotPropagatePartialPubSubResponseToOutput() throws Exception {
 
-        Command<String, String, String> command1 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(
-                StringCodec.UTF8), null);
-        Command<String, String, String> command2 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(
-                StringCodec.UTF8), null);
+        Command<String, String, String> command1 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(StringCodec.UTF8),
+                null);
+        Command<String, String, String> command2 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(StringCodec.UTF8),
+                null);
 
         sut.channelRegistered(context);
         sut.channelActive(context);
@@ -226,10 +226,10 @@ void shouldNotPropagatePartialPubSubResponseToOutput() throws Exception {
     @Test
     void shouldCompleteWithChunkedResponseOnStack() throws Exception {
 
-        Command<String, String, String> command1 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(
-                StringCodec.UTF8), null);
-        Command<String, String, String> command2 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(
-                StringCodec.UTF8), null);
+        Command<String, String, String> command1 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(StringCodec.UTF8),
+                null);
+        Command<String, String, String> command2 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(StringCodec.UTF8),
+                null);
 
         sut.channelRegistered(context);
         sut.channelActive(context);
@@ -270,10 +270,10 @@ void shouldCompleteWithChunkedResponseOutOfBand() throws Exception {
     @Test
     void shouldCompleteUnsubscribe() throws Exception {
 
-        Command<String, String, String> subCmd = new Command<>(CommandType.SUBSCRIBE,
-                new PubSubOutput<>(StringCodec.UTF8), null);
-        Command<String, String, String> unSubCmd = new Command<>(CommandType.UNSUBSCRIBE, new PubSubOutput<>(
-                StringCodec.UTF8), null);
+        Command<String, String, String> subCmd = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(StringCodec.UTF8),
+                null);
+        Command<String, String, String> unSubCmd = new Command<>(CommandType.UNSUBSCRIBE, new PubSubOutput<>(StringCodec.UTF8),
+                null);
 
         doAnswer((Answer<PubSubEndpoint<String, String>>) inv -> {
             PubSubOutput<String, String, String> out = inv.getArgument(0);
@@ -300,8 +300,8 @@ void shouldCompleteUnsubscribe() throws Exception {
     @Test
     void shouldCompleteWithChunkedResponseInterleavedSending() throws Exception {
 
-        Command<String, String, String> command1 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(
-                StringCodec.UTF8), null);
+        Command<String, String, String> command1 = new Command<>(CommandType.SUBSCRIBE, new PubSubOutput<>(StringCodec.UTF8),
+                null);
 
         sut.channelRegistered(context);
         sut.channelActive(context);
diff --git a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
index beea7bd82e..47eaefdee7 100644
--- a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
+++ b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
@@ -33,7 +33,6 @@
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.ValueListOutput;
 import io.lettuce.core.protocol.Command;
 import io.lettuce.core.protocol.CommandArgs;
diff --git a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
index 6b6c41b200..53611e3d99 100644
--- a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
+++ b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
@@ -22,7 +22,6 @@
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.masterslave.MasterSlave;
 import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection;
 
@@ -36,12 +35,11 @@ public static void main(String[] args) {
         // Syntax: redis://[password@]host[:port][/databaseNumber]
         RedisClient redisClient = RedisClient.create();
 
-        List<RedisURI> nodes = Arrays.asList(RedisURI.create("redis://host1"),
-                RedisURI.create("redis://host2"),
+        List<RedisURI> nodes = Arrays.asList(RedisURI.create("redis://host1"), RedisURI.create("redis://host2"),
                 RedisURI.create("redis://host3"));
 
-        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave
-                .connect(redisClient, StringCodec.UTF8, nodes);
+        StatefulRedisMasterSlaveConnection<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8,
+                nodes);
         connection.setReadFrom(ReadFrom.MASTER_PREFERRED);
 
         System.out.println("Connected to Redis");
diff --git a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
index 618baafe26..d78d03145a 100644
--- a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
+++ b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
@@ -19,7 +19,6 @@
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.masterslave.MasterSlave;
 import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection;
 
diff --git a/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java b/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java
index e522db3262..3a99ea5151 100644
--- a/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java
@@ -24,7 +24,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.infra.Blackhole;
 
-import io.lettuce.core.protocol.LettuceCharsets;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
@@ -74,13 +73,13 @@ public void decodeUtf8Unpooled(Input input) {
     public static class Input {
 
         Blackhole blackhole;
-        StringCodec asciiCodec = new StringCodec(LettuceCharsets.ASCII);
-        StringCodec utf8Codec = new StringCodec(LettuceCharsets.UTF8);
+        StringCodec asciiCodec = new StringCodec(StandardCharsets.US_ASCII);
+        StringCodec utf8Codec = new StringCodec(StandardCharsets.UTF_8);
         StringCodec isoCodec = new StringCodec(StandardCharsets.ISO_8859_1);
 
         String teststring = "hello üäü~∑†®†ª€∂‚¶¢ Wørld";
         String teststringPlain = "hello uufadsfasdfadssdfadfs";
-        ByteBuffer input = ByteBuffer.wrap(teststring.getBytes(LettuceCharsets.UTF8));
+        ByteBuffer input = ByteBuffer.wrap(teststring.getBytes(StandardCharsets.UTF_8));
 
         ByteBuf byteBuf = Unpooled.buffer(512);
 
diff --git a/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java b/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java
index 602d5c7c11..f996e80ca5 100644
--- a/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.codec;
 
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
@@ -23,8 +24,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.infra.Blackhole;
 
-import io.lettuce.core.protocol.LettuceCharsets;
-
 /**
  * Benchmark for {@link Utf8StringCodec}.
  *
@@ -50,7 +49,7 @@ public static class Input {
         Utf8StringCodec codec = new Utf8StringCodec();
 
         String teststring = "hello üäü~∑†®†ª€∂‚¶¢ Wørld";
-        ByteBuffer input = ByteBuffer.wrap(teststring.getBytes(LettuceCharsets.UTF8));
+        ByteBuffer input = ByteBuffer.wrap(teststring.getBytes(StandardCharsets.UTF_8));
 
         @Setup
         public void setup(Blackhole bh) {

From 418bc1d3993a998f7fad66d5007aa1311594b997 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 9 Nov 2019 16:42:11 +0100
Subject: [PATCH 700/808] Consolidate Future utils #1039
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Moved functionality from LettuceFutures into internal.Futures and let LettuceFutures delegate to internal.Futures. Rename resource.Futures to PromiseAdapter and remove PromiseAggregator in favor of CompletableFuture.allOf(…).
---
 .../io/lettuce/core/AbstractRedisClient.java  |  47 ++--
 .../core/FutureSyncInvocationHandler.java     |   5 +-
 .../java/io/lettuce/core/LettuceFutures.java  |  70 +-----
 .../java/io/lettuce/core/RedisFuture.java     |   3 +-
 .../ClusterFutureSyncInvocationHandler.java   |  12 +-
 .../core/dynamic/AsyncExecutableCommand.java  |   4 +-
 .../core/dynamic/BatchExecutableCommand.java  |   3 +-
 .../io/lettuce/core/internal/Futures.java     | 204 ++++++++++++++++--
 .../core/resource/DefaultClientResources.java |  50 ++---
 .../DefaultEventLoopGroupProvider.java        |  36 ++--
 .../io/lettuce/core/resource/Futures.java     | 180 ----------------
 .../lettuce/core/resource/PromiseAdapter.java |  58 +++++
 .../core/AsyncConnectionIntegrationTests.java |  43 ++--
 .../core/ClientOptionsIntegrationTests.java   |  24 +--
 .../ConnectionCommandIntegrationTests.java    |   4 +-
 .../lettuce/core/LettuceFuturesUnitTests.java |   8 +-
 .../core/PipeliningIntegrationTests.java      |   5 +-
 .../RedisClientConnectIntegrationTests.java   |   8 +-
 .../core/RedisClientIntegrationTests.java     |   6 +-
 .../io/lettuce/core/SslIntegrationTests.java  |   4 +-
 ...AdvancedClusterClientIntegrationTests.java |  10 +-
 ...vancedClusterReactiveIntegrationTests.java |   6 +-
 ...yncConnectionProviderIntegrationTests.java |  22 +-
 .../ClusterCommandIntegrationTests.java       |  12 +-
 .../cluster/ClusterNodeEndpointUnitTests.java |   6 +-
 .../io/lettuce/core/cluster/ClusterSetup.java |   5 +-
 .../NodeSelectionAsyncIntegrationTests.java   |  34 +--
 .../PipelinedRedisFutureUnitTests.java        |   6 +-
 .../RedisClusterClientIntegrationTests.java   |  23 +-
 .../core/cluster/RedisClusterSetupTest.java   |  12 +-
 .../CustomClusterCommandIntegrationTests.java |  14 +-
 ...usterPubSubConnectionIntegrationTests.java |  10 +-
 .../CustomCommandIntegrationTests.java        |  14 +-
 ...RedisCommandsBatchingIntegrationTests.java |   8 +-
 .../core/masterreplica/MasterReplicaTest.java |   6 +-
 .../CustomCommandIntegrationTests.java        |  10 +-
 .../core/masterslave/MasterSlaveTest.java     |   6 +-
 .../core/protocol/AsyncCommandUnitTests.java  |  11 +-
 .../ConnectionFailureIntegrationTests.java    |   4 +-
 .../core/pubsub/PubSubCommandTest.java        |  27 +--
 .../core/reliability/AtMostOnceTest.java      |   4 +-
 .../DefaultClientResourcesUnitTests.java      |  10 +-
 ...efaultEventLoopGroupProviderUnitTests.java |   8 +-
 .../core/resource/FuturesUnitTests.java       |  86 --------
 .../SentinelConnectionIntegrationTests.java   |   4 +-
 ...ConnectionPoolSupportIntegrationTests.java |  32 +--
 .../AsyncPoolWithValidationUnitTests.java     |  16 +-
 .../support/BoundedAsyncPoolUnitTests.java    |  32 +--
 .../test/{Futures.java => TestFutures.java}   |  34 +--
 49 files changed, 561 insertions(+), 685 deletions(-)
 delete mode 100644 src/main/java/io/lettuce/core/resource/Futures.java
 create mode 100644 src/main/java/io/lettuce/core/resource/PromiseAdapter.java
 delete mode 100644 src/test/java/io/lettuce/core/resource/FuturesUnitTests.java
 rename src/test/java/io/lettuce/test/{Futures.java => TestFutures.java} (73%)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index b9cb19c49a..099fbdad7c 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -194,8 +194,8 @@ private synchronized EventLoopGroup getEventLoopGroup(ConnectionPoint connection
             Class<? extends EventLoopGroup> eventLoopGroupClass = NativeTransports.eventLoopGroupClass();
 
             if (!eventLoopGroups.containsKey(NativeTransports.eventLoopGroupClass())) {
-                eventLoopGroups
-                        .put(eventLoopGroupClass, clientResources.eventLoopGroupProvider().allocate(eventLoopGroupClass));
+                eventLoopGroups.put(eventLoopGroupClass,
+                        clientResources.eventLoopGroupProvider().allocate(eventLoopGroupClass));
             }
         }
 
@@ -294,8 +294,8 @@ protected <K, V, T extends RedisChannelHandler<K, V>> ConnectionFuture<T> initia
                     initializeChannelAsync0(connectionBuilder, channelReadyFuture, redisAddress);
                 }, channelReadyFuture::completeExceptionally);
 
-        return new DefaultConnectionFuture<>(socketAddressFuture, channelReadyFuture.thenApply(channel -> (T) connectionBuilder
-                .connection()));
+        return new DefaultConnectionFuture<>(socketAddressFuture,
+                channelReadyFuture.thenApply(channel -> (T) connectionBuilder.connection()));
     }
 
     private void initializeChannelAsync0(ConnectionBuilder connectionBuilder, CompletableFuture<Channel> channelReadyFuture,
@@ -348,8 +348,8 @@ private void initializeChannelAsync0(ConnectionBuilder connectionBuilder, Comple
                 if (throwable instanceof RedisConnectionException) {
                     failure = throwable;
                 } else if (throwable instanceof TimeoutException) {
-                    failure = new RedisConnectionException("Could not initialize channel within "
-                            + connectionBuilder.getTimeout(), throwable);
+                    failure = new RedisConnectionException(
+                            "Could not initialize channel within " + connectionBuilder.getTimeout(), throwable);
                 } else {
                     failure = throwable;
                 }
@@ -388,6 +388,7 @@ public void shutdown(Duration quietPeriod, Duration timeout) {
      */
     public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
 
+
         try {
             shutdownAsync(quietPeriod, timeout, timeUnit).get();
         } catch (RuntimeException e) {
@@ -442,7 +443,7 @@ public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, Tim
 
     private CompletableFuture<Void> closeResources() {
 
-        List<CompletableFuture<Void>> closeFutures = new ArrayList<>();
+        List<CompletionStage<Void>> closeFutures = new ArrayList<>();
 
         while (!closeableResources.isEmpty()) {
             Closeable closeableResource = closeableResources.iterator().next();
@@ -471,7 +472,7 @@ private CompletableFuture<Void> closeResources() {
         }
 
         try {
-            closeFutures.add(toCompletableFuture(channels.close()));
+            closeFutures.add(Futures.toCompletionStage(channels.close()));
         } catch (Exception e) {
             logger.debug("Cannot close channels", e);
         }
@@ -480,15 +481,15 @@ private CompletableFuture<Void> closeResources() {
     }
 
     private CompletableFuture<Void> closeClientResources(long quietPeriod, long timeout, TimeUnit timeUnit) {
-        List<CompletableFuture<Void>> groupCloseFutures = new ArrayList<>();
+        List<CompletionStage<?>> groupCloseFutures = new ArrayList<>();
         if (!sharedResources) {
             Future<?> groupCloseFuture = clientResources.shutdown(quietPeriod, timeout, timeUnit);
-            groupCloseFutures.add(toCompletableFuture(groupCloseFuture));
+            groupCloseFutures.add(Futures.toCompletionStage(groupCloseFuture));
         } else {
             for (EventLoopGroup eventExecutors : eventLoopGroups.values()) {
                 Future<?> groupCloseFuture = clientResources.eventLoopGroupProvider().release(eventExecutors, quietPeriod,
                         timeout, timeUnit);
-                groupCloseFutures.add(toCompletableFuture(groupCloseFuture));
+                groupCloseFutures.add(Futures.toCompletionStage(groupCloseFuture));
             }
         }
         return Futures.allOf(groupCloseFutures);
@@ -545,28 +546,4 @@ protected void setOptions(ClientOptions clientOptions) {
         LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
         this.clientOptions = clientOptions;
     }
-
-    private static CompletableFuture<Void> toCompletableFuture(Future<?> future) {
-
-        CompletableFuture<Void> promise = new CompletableFuture<>();
-
-        if (future.isDone() || future.isCancelled()) {
-            if (future.isSuccess()) {
-                promise.complete(null);
-            } else {
-                promise.completeExceptionally(future.cause());
-            }
-            return promise;
-        }
-
-        future.addListener(f -> {
-            if (f.isSuccess()) {
-                promise.complete(null);
-            } else {
-                promise.completeExceptionally(f.cause());
-            }
-        });
-
-        return promise;
-    }
 }
diff --git a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
index 57a5bffaf2..92bda10122 100644
--- a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
@@ -41,14 +41,13 @@ class FutureSyncInvocationHandler extends AbstractInvocationHandler {
 
     FutureSyncInvocationHandler(StatefulConnection<?, ?> connection, Object asyncApi, Class<?>[] interfaces) {
         this.connection = connection;
-        this.timeoutProvider = new TimeoutProvider(() -> connection.getOptions().getTimeoutOptions(), () -> connection
-                .getTimeout().toNanos());
+        this.timeoutProvider = new TimeoutProvider(() -> connection.getOptions().getTimeoutOptions(),
+                () -> connection.getTimeout().toNanos());
         this.asyncApi = asyncApi;
         this.translator = MethodTranslator.of(asyncApi.getClass(), interfaces);
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
 
         try {
diff --git a/src/main/java/io/lettuce/core/LettuceFutures.java b/src/main/java/io/lettuce/core/LettuceFutures.java
index 44f6f0ca33..a3f1a1faf3 100644
--- a/src/main/java/io/lettuce/core/LettuceFutures.java
+++ b/src/main/java/io/lettuce/core/LettuceFutures.java
@@ -16,10 +16,10 @@
 package io.lettuce.core;
 
 import java.time.Duration;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+
+import io.lettuce.core.internal.Futures;
 
 /**
  * Utility to {@link #awaitAll(long, TimeUnit, Future[])} futures until they are done and to synchronize future execution using
@@ -56,43 +56,7 @@ public static boolean awaitAll(Duration timeout, Future<?>... futures) {
      * @return {@literal true} if all futures complete in time, otherwise {@literal false}
      */
     public static boolean awaitAll(long timeout, TimeUnit unit, Future<?>... futures) {
-
-        try {
-            long nanos = unit.toNanos(timeout);
-            long time = System.nanoTime();
-
-            for (Future<?> f : futures) {
-
-                if (nanos < 0) {
-                    return false;
-                }
-
-                f.get(nanos, TimeUnit.NANOSECONDS);
-
-                long now = System.nanoTime();
-                nanos -= now - time;
-                time = now;
-            }
-
-            return true;
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (TimeoutException e) {
-            return false;
-        } catch (ExecutionException e) {
-
-            if (e.getCause() instanceof RedisCommandExecutionException) {
-                throw ExceptionFactory.createExecutionException(e.getCause().getMessage(), e.getCause());
-            }
-
-            throw new RedisException(e.getCause());
-        } catch (InterruptedException e) {
-
-            Thread.currentThread().interrupt();
-            throw new RedisCommandInterruptedException(e);
-        } catch (Exception e) {
-            throw ExceptionFactory.createExecutionException(null, e);
-        }
+        return Futures.awaitAll(timeout, unit, futures);
     }
 
     /**
@@ -107,33 +71,7 @@ public static boolean awaitAll(long timeout, TimeUnit unit, Future<?>... futures
      * @return Result of the command.
      */
     public static <T> T awaitOrCancel(RedisFuture<T> cmd, long timeout, TimeUnit unit) {
-
-        try {
-            if (!cmd.await(timeout, unit)) {
-                cmd.cancel(true);
-                throw ExceptionFactory.createTimeoutException(Duration.ofNanos(unit.toNanos(timeout)));
-            }
-            return cmd.get();
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (ExecutionException e) {
-
-            if (e.getCause() instanceof RedisCommandExecutionException) {
-                throw ExceptionFactory.createExecutionException(e.getCause().getMessage(), e.getCause());
-            }
-
-            if (e.getCause() instanceof RedisCommandTimeoutException) {
-                throw new RedisCommandTimeoutException(e.getCause());
-            }
-
-            throw new RedisException(e.getCause());
-        } catch (InterruptedException e) {
-
-            Thread.currentThread().interrupt();
-            throw new RedisCommandInterruptedException(e);
-        } catch (Exception e) {
-            throw ExceptionFactory.createExecutionException(null, e);
-        }
+        return Futures.awaitOrCancel(cmd, timeout, unit);
     }
 
 }
diff --git a/src/main/java/io/lettuce/core/RedisFuture.java b/src/main/java/io/lettuce/core/RedisFuture.java
index 54e397b663..c60bb007ac 100644
--- a/src/main/java/io/lettuce/core/RedisFuture.java
+++ b/src/main/java/io/lettuce/core/RedisFuture.java
@@ -30,8 +30,7 @@
 public interface RedisFuture<V> extends CompletionStage<V>, Future<V> {
 
     /**
-     *
-     * @return error text, if any error occured.
+     * @return error text, if any error occurred.
      */
     String getError();
 
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
index 7c9955594c..87cb0182ca 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
@@ -24,7 +24,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 
-import io.lettuce.core.LettuceFutures;
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -35,6 +34,7 @@
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.internal.AbstractInvocationHandler;
 import io.lettuce.core.internal.DefaultMethods;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.TimeoutProvider;
 import io.lettuce.core.protocol.RedisCommand;
 
@@ -65,8 +65,8 @@ class ClusterFutureSyncInvocationHandler<K, V> extends AbstractInvocationHandler
     ClusterFutureSyncInvocationHandler(StatefulConnection<K, V> connection, Class<?> asyncCommandsInterface,
             Class<?> nodeSelectionInterface, Class<?> nodeSelectionCommandsInterface, Object asyncApi) {
         this.connection = connection;
-        this.timeoutProvider = new TimeoutProvider(() -> connection.getOptions().getTimeoutOptions(), () -> connection
-                .getTimeout().toNanos());
+        this.timeoutProvider = new TimeoutProvider(() -> connection.getOptions().getTimeoutOptions(),
+                () -> connection.getTimeout().toNanos());
         this.asyncCommandsInterface = asyncCommandsInterface;
         this.nodeSelectionInterface = nodeSelectionInterface;
         this.nodeSelectionCommandsInterface = nodeSelectionCommandsInterface;
@@ -120,7 +120,7 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
                         return null;
                     }
                 }
-                return LettuceFutures.awaitOrCancel(command, getTimeoutNs(command), TimeUnit.NANOSECONDS);
+                return Futures.awaitOrCancel(command, getTimeoutNs(command), TimeUnit.NANOSECONDS);
             }
 
             return result;
@@ -192,8 +192,8 @@ protected Object nodes(Predicate<RedisClusterNode> predicate, ClusterConnectionP
 
         NodeSelectionInvocationHandler h = new NodeSelectionInvocationHandler((AbstractNodeSelection<?, ?, ?, ?>) selection,
                 asyncCommandsInterface, timeoutProvider);
-        return Proxy.newProxyInstance(NodeSelectionSupport.class.getClassLoader(), new Class<?>[] {
-                nodeSelectionCommandsInterface, nodeSelectionInterface }, h);
+        return Proxy.newProxyInstance(NodeSelectionSupport.class.getClassLoader(),
+                new Class<?>[] { nodeSelectionCommandsInterface, nodeSelectionInterface }, h);
     }
 
     private static MethodHandle lookupDefaultMethod(Method method) {
diff --git a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
index 2af21f445f..94babfe4ac 100644
--- a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
@@ -17,11 +17,13 @@
 
 import java.time.Duration;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 
 import io.lettuce.core.LettuceFutures;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.dynamic.domain.Timeout;
 import io.lettuce.core.dynamic.parameter.ExecutionSpecificParameters;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.protocol.RedisCommand;
 
@@ -85,7 +87,7 @@ protected Object dispatchCommand(Object[] arguments, RedisCommand<Object, Object
             }
         }
 
-        LettuceFutures.awaitAll(timeout, asyncCommand);
+        Futures.await(timeout, asyncCommand);
 
         return asyncCommand.get();
     }
diff --git a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
index b870d057c9..f94efa7a73 100644
--- a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
@@ -26,6 +26,7 @@
 import io.lettuce.core.dynamic.batch.BatchException;
 import io.lettuce.core.dynamic.batch.CommandBatching;
 import io.lettuce.core.dynamic.parameter.ExecutionSpecificParameters;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.protocol.RedisCommand;
 
@@ -90,7 +91,7 @@ protected static Object synchronize(BatchTasks batchTasks, StatefulConnection<Ob
         for (RedisCommand<?, ?, ?> batchTask : batchTasks) {
 
             try {
-                LettuceFutures.awaitAll(timeout, (RedisFuture) batchTask);
+                Futures.await(timeout, (RedisFuture) batchTask);
             } catch (Exception e) {
                 if (exception == null) {
                     failures = new ArrayList<>();
diff --git a/src/main/java/io/lettuce/core/internal/Futures.java b/src/main/java/io/lettuce/core/internal/Futures.java
index c4750df429..8270ab7635 100644
--- a/src/main/java/io/lettuce/core/internal/Futures.java
+++ b/src/main/java/io/lettuce/core/internal/Futures.java
@@ -15,9 +15,11 @@
  */
 package io.lettuce.core.internal;
 
+import java.time.Duration;
 import java.util.Collection;
-import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.*;
 
+import io.lettuce.core.*;
 import io.netty.channel.ChannelFuture;
 
 /**
@@ -34,18 +36,25 @@ private Futures() {
     }
 
     /**
-     * Create a composite {@link CompletableFuture} is composed from the given {@code futures}.
+     * Create a composite {@link CompletableFuture} is composed from the given {@code stages}.
      *
-     * @param futures must not be {@literal null}.
+     * @param stages must not be {@literal null}.
      * @return the composed {@link CompletableFuture}.
      * @since 5.1.1
      */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static CompletableFuture<Void> allOf(Collection<? extends CompletableFuture<?>> futures) {
+    @SuppressWarnings({ "rawtypes" })
+    public static CompletableFuture<Void> allOf(Collection<? extends CompletionStage<?>> stages) {
 
-        LettuceAssert.notNull(futures, "Futures must not be null");
+        LettuceAssert.notNull(stages, "Futures must not be null");
 
-        return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
+        CompletableFuture[] futures = new CompletableFuture[stages.size()];
+
+        int index = 0;
+        for (CompletionStage<?> stage : stages) {
+            futures[index++] = stage.toCompletableFuture();
+        }
+
+        return CompletableFuture.allOf(futures);
     }
 
     /**
@@ -69,26 +78,44 @@ public static <T> CompletableFuture<T> failed(Throwable throwable) {
      *
      * @param future the {@link ChannelFuture} to adapt.
      * @return the {@link CompletableFuture}.
+     * @since 6.0
      */
-    public static CompletableFuture<Void> from(ChannelFuture future) {
+    public static <V> CompletionStage<V> toCompletionStage(io.netty.util.concurrent.Future<V> future) {
 
-        LettuceAssert.notNull(future, "ChannelFuture must not be null");
+        LettuceAssert.notNull(future, "Future must not be null");
 
-        CompletableFuture<Void> result = new CompletableFuture<>();
-        adapt(future, result);
+        CompletableFuture<V> promise = new CompletableFuture<>();
+
+        if (future.isDone() || future.isCancelled()) {
+            if (future.isSuccess()) {
+                promise.complete(null);
+            } else {
+                promise.completeExceptionally(future.cause());
+            }
+            return promise;
+        }
+
+        future.addListener(f -> {
+            if (f.isSuccess()) {
+                promise.complete(null);
+            } else {
+                promise.completeExceptionally(f.cause());
+            }
+        });
 
-        return result;
+        return promise;
     }
 
     /**
-     * Adapt Netty's {@link ChannelFuture} emitting a {@link Void} result into a {@link CompletableFuture}.
+     * Adapt Netty's {@link io.netty.util.concurrent.Future} emitting a value result into a {@link CompletableFuture}.
      *
-     * @param future
-     * @return the {@link CompletableFuture}.
+     * @param source source {@link io.netty.util.concurrent.Future} emitting signals.
+     * @param target target {@link CompletableFuture}.
+     * @since 6.0
      */
-    public static void adapt(ChannelFuture future, CompletableFuture<Void> target) {
+    public static <V> void adapt(io.netty.util.concurrent.Future<V> source, CompletableFuture<V> target) {
 
-        future.addListener(f -> {
+        source.addListener(f -> {
             if (f.isSuccess()) {
                 target.complete(null);
             } else {
@@ -96,12 +123,147 @@ public static void adapt(ChannelFuture future, CompletableFuture<Void> target) {
             }
         });
 
-        if (future.isSuccess()) {
+        if (source.isSuccess()) {
             target.complete(null);
-        } else if (future.isCancelled()) {
+        } else if (source.isCancelled()) {
             target.cancel(false);
-        } else if (future.isDone() && !future.isSuccess()) {
-            target.completeExceptionally(future.cause());
+        } else if (source.isDone() && !source.isSuccess()) {
+            target.completeExceptionally(source.cause());
+        }
+    }
+
+    /**
+     * Wait until future is complete or the supplied timeout is reached.
+     *
+     * @param timeout Maximum time to wait for futures to complete.
+     * @param future Future to wait for.
+     * @return {@literal true} if future completes in time, otherwise {@literal false}
+     * @since 6.0
+     */
+    public static boolean await(Duration timeout, Future<?> future) {
+        return await(timeout.toNanos(), TimeUnit.NANOSECONDS, future);
+    }
+
+    /**
+     * Wait until future is complete or the supplied timeout is reached.
+     *
+     * @param timeout Maximum time to wait for futures to complete.
+     * @param unit Unit of time for the timeout.
+     * @param future Future to wait for.
+     * @return {@literal true} if future completes in time, otherwise {@literal false}
+     * @since 6.0
+     */
+    public static boolean await(long timeout, TimeUnit unit, Future<?> future) {
+
+        try {
+            long nanos = unit.toNanos(timeout);
+
+            if (nanos < 0) {
+                return false;
+            }
+
+            future.get(nanos, TimeUnit.NANOSECONDS);
+
+            return true;
+        } catch (TimeoutException e) {
+            return false;
+        } catch (Exception e) {
+            return handleException(e);
+        }
+    }
+
+    /**
+     * Wait until futures are complete or the supplied timeout is reached.
+     *
+     * @param timeout Maximum time to wait for futures to complete.
+     * @param futures Futures to wait for.
+     * @return {@literal true} if all futures complete in time, otherwise {@literal false}
+     * @since 6.0
+     */
+    public static boolean awaitAll(Duration timeout, Future<?>... futures) {
+        return awaitAll(timeout.toNanos(), TimeUnit.NANOSECONDS, futures);
+    }
+
+    /**
+     * Wait until futures are complete or the supplied timeout is reached.
+     *
+     * @param timeout Maximum time to wait for futures to complete.
+     * @param unit Unit of time for the timeout.
+     * @param futures Futures to wait for.
+     * @return {@literal true} if all futures complete in time, otherwise {@literal false}
+     */
+    public static boolean awaitAll(long timeout, TimeUnit unit, Future<?>... futures) {
+
+        try {
+            long nanos = unit.toNanos(timeout);
+            long time = System.nanoTime();
+
+            for (Future<?> f : futures) {
+
+                if (nanos < 0) {
+                    return false;
+                }
+
+                f.get(nanos, TimeUnit.NANOSECONDS);
+
+                long now = System.nanoTime();
+                nanos -= now - time;
+                time = now;
+            }
+
+            return true;
+        } catch (Exception e) {
+            return handleException(e);
         }
     }
+
+    /**
+     * Wait until futures are complete or the supplied timeout is reached. Commands are canceled if the timeout is reached but
+     * the command is not finished.
+     *
+     * @param cmd Command to wait for
+     * @param timeout Maximum time to wait for futures to complete
+     * @param unit Unit of time for the timeout
+     * @param <T> Result type
+     * @return Result of the command.
+     * @since 6.0
+     */
+    public static <T> T awaitOrCancel(RedisFuture<T> cmd, long timeout, TimeUnit unit) {
+
+        try {
+            if (!cmd.await(timeout, unit)) {
+                cmd.cancel(true);
+                throw ExceptionFactory.createTimeoutException(Duration.ofNanos(unit.toNanos(timeout)));
+            }
+            return cmd.get();
+        } catch (Exception e) {
+            return handleException(e);
+        }
+    }
+
+    private static <T> T handleException(Exception e) {
+
+        if (e instanceof RuntimeException) {
+            throw (RuntimeException) e;
+        }
+
+        if (e instanceof ExecutionException) {
+            if (e.getCause() instanceof RedisCommandExecutionException) {
+                throw ExceptionFactory.createExecutionException(e.getCause().getMessage(), e.getCause());
+            }
+
+            if (e.getCause() instanceof RedisCommandTimeoutException) {
+                throw new RedisCommandTimeoutException(e.getCause());
+            }
+
+            throw new RedisException(e.getCause());
+        }
+
+        if (e instanceof InterruptedException) {
+            Thread.currentThread().interrupt();
+            throw new RedisCommandInterruptedException(e);
+        }
+
+        throw ExceptionFactory.createExecutionException(null, e);
+    }
 }
diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index 7400ee3ea5..6ea8cce4e1 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -15,8 +15,9 @@
  */
 package io.lettuce.core.resource;
 
-import static io.lettuce.core.resource.Futures.toBooleanPromise;
-
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
@@ -27,6 +28,7 @@
 import io.lettuce.core.event.EventPublisherOptions;
 import io.lettuce.core.event.metrics.DefaultCommandLatencyEventPublisher;
 import io.lettuce.core.event.metrics.MetricEventPublisher;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceLists;
 import io.lettuce.core.metrics.CommandLatencyCollector;
@@ -98,10 +100,8 @@ public class DefaultClientResources implements ClientResources {
 
     static {
 
-        int threads = Math.max(
-                1,
-                SystemPropertyUtil.getInt("io.netty.eventLoopThreads",
-                        Math.max(MIN_IO_THREADS, Runtime.getRuntime().availableProcessors())));
+        int threads = Math.max(1, SystemPropertyUtil.getInt("io.netty.eventLoopThreads",
+                Math.max(MIN_IO_THREADS, Runtime.getRuntime().availableProcessors())));
 
         DEFAULT_IO_THREADS = threads;
         DEFAULT_COMPUTATION_THREADS = threads;
@@ -601,22 +601,8 @@ public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUni
         logger.debug("Initiate shutdown ({}, {}, {})", quietPeriod, timeout, timeUnit);
 
         shutdownCalled = true;
-        DefaultPromise<Boolean> overall = new DefaultPromise<Boolean>(GlobalEventExecutor.INSTANCE);
-        DefaultPromise<Boolean> lastRelease = new DefaultPromise<Boolean>(GlobalEventExecutor.INSTANCE);
-        Futures.PromiseAggregator<Boolean, Promise<Boolean>> aggregator = new Futures.PromiseAggregator<Boolean, Promise<Boolean>>(
-                overall);
-
-        aggregator.expectMore(1);
-
-        if (!sharedEventLoopGroupProvider) {
-            aggregator.expectMore(1);
-        }
-
-        if (!sharedEventExecutor) {
-            aggregator.expectMore(1);
-        }
-
-        aggregator.arm();
+        DefaultPromise<Boolean> overall = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
+        List<CompletionStage<?>> stages = new ArrayList<>();
 
         if (metricEventPublisher != null) {
             metricEventPublisher.shutdown();
@@ -628,26 +614,28 @@ public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUni
 
         if (!sharedEventLoopGroupProvider) {
             Future<Boolean> shutdown = eventLoopGroupProvider.shutdown(quietPeriod, timeout, timeUnit);
-            if (shutdown instanceof Promise) {
-                aggregator.add((Promise<Boolean>) shutdown);
-            } else {
-                aggregator.add(toBooleanPromise(shutdown));
-            }
+            stages.add(Futures.toCompletionStage(shutdown));
         }
 
         if (!sharedEventExecutor) {
             Future<?> shutdown = eventExecutorGroup.shutdownGracefully(quietPeriod, timeout, timeUnit);
-            aggregator.add(toBooleanPromise(shutdown));
+            stages.add(Futures.toCompletionStage(shutdown));
         }
 
         if (!sharedCommandLatencyCollector) {
             commandLatencyCollector.shutdown();
         }
 
-        aggregator.add(lastRelease);
-        lastRelease.setSuccess(null);
+        Futures.allOf(stages).whenComplete((ignore, throwable) -> {
+
+            if (throwable != null) {
+                overall.setFailure(throwable);
+            } else {
+                overall.setSuccess(true);
+            }
+        });
 
-        return toBooleanPromise(overall);
+        return overall;
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
index cf206acf26..3fe6e1587f 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
@@ -15,16 +15,20 @@
  */
 package io.lettuce.core.resource;
 
-import static io.lettuce.core.resource.Futures.toBooleanPromise;
+import static io.lettuce.core.resource.PromiseAdapter.toBooleanPromise;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
 import io.lettuce.core.EpollProvider;
 import io.lettuce.core.KqueueProvider;
+import io.lettuce.core.internal.Futures;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.concurrent.*;
@@ -164,7 +168,7 @@ public Promise<Boolean> release(EventExecutorGroup eventLoopGroup, long quietPer
         Class<?> key = getKey(release(eventLoopGroup));
 
         if ((key == null && eventLoopGroup.isShuttingDown()) || refCounter.containsKey(eventLoopGroup)) {
-            DefaultPromise<Boolean> promise = new DefaultPromise<Boolean>(GlobalEventExecutor.INSTANCE);
+            DefaultPromise<Boolean> promise = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
             promise.setSuccess(true);
             return promise;
         }
@@ -203,24 +207,26 @@ public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUni
 
         shutdownCalled = true;
 
-        Map<Class<? extends EventExecutorGroup>, EventExecutorGroup> copy = new HashMap<>(eventLoopGroups);
-
+        List<EventExecutorGroup> copy = new ArrayList<>(eventLoopGroups.values());
         DefaultPromise<Boolean> overall = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
-        DefaultPromise<Boolean> lastRelease = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
-        Futures.PromiseAggregator<Boolean, Promise<Boolean>> aggregator = new Futures.PromiseAggregator<>(overall);
-
-        aggregator.expectMore(1 + copy.size());
+        CompletableFuture[] futures = new CompletableFuture[copy.size()];
 
-        aggregator.arm();
+        for (int i = 0; i < copy.size(); i++) {
 
-        for (EventExecutorGroup executorGroup : copy.values()) {
-            Promise<Boolean> shutdown = toBooleanPromise(release(executorGroup, quietPeriod, timeout, timeUnit));
-            aggregator.add(shutdown);
+            EventExecutorGroup executorGroup = copy.get(i);
+            futures[i] = Futures.toCompletionStage(release(executorGroup, quietPeriod, timeout, timeUnit))
+                    .toCompletableFuture();
         }
 
-        aggregator.add(lastRelease);
-        lastRelease.setSuccess(null);
+        CompletableFuture.allOf(futures).whenComplete((ignore, throwable) -> {
+
+            if (throwable != null) {
+                overall.setFailure(throwable);
+            } else {
+                overall.setSuccess(true);
+            }
+        });
 
-        return toBooleanPromise(overall);
+        return overall;
     }
 }
diff --git a/src/main/java/io/lettuce/core/resource/Futures.java b/src/main/java/io/lettuce/core/resource/Futures.java
deleted file mode 100644
index ddd549b7d2..0000000000
--- a/src/main/java/io/lettuce/core/resource/Futures.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright 2011-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.resource;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import io.lettuce.core.internal.LettuceAssert;
-import io.netty.util.concurrent.*;
-
-/**
- * Utility class to support netty's future handling.
- *
- * @author Mark Paluch
- * @since 3.4
- */
-class Futures {
-
-    /**
-     * Create a promise that emits a {@code Boolean} value on completion of the {@code future}
-     *
-     * @param future the future.
-     * @return Promise emitting a {@code Boolean} value. {@literal true} if the {@code future} completed successfully, otherwise
-     *         the cause wil be transported.
-     */
-    static Promise<Boolean> toBooleanPromise(Future<?> future) {
-
-        DefaultPromise<Boolean> result = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
-
-        if (future.isDone() || future.isCancelled()) {
-            if (future.isSuccess()) {
-                result.setSuccess(true);
-            } else {
-                result.setFailure(future.cause());
-            }
-            return result;
-        }
-
-        future.addListener((GenericFutureListener<Future<Object>>) f -> {
-
-            if (f.isSuccess()) {
-                result.setSuccess(true);
-            } else {
-                result.setFailure(f.cause());
-            }
-        });
-        return result;
-    }
-
-    /**
-     * Promise aggregator that aggregates multiple promises into one {@link Promise}. The aggregator workflow is:
-     * <ol>
-     * <li>Create a new instance of {@link io.lettuce.core.resource.Futures.PromiseAggregator}</li>
-     * <li>Call {@link #expectMore(int)} until the number of expected futures is reached</li>
-     * <li>Arm the aggregator using {@link #arm()}</li>
-     * <li>Add the number of futures using {@link #add(Promise[])} until the expectation is met. The added futures can be either
-     * done or in progress.</li>
-     * <li>The {@code aggregatePromise} is released/finished as soon as the last future/promise completes</li>
-     *
-     * </ol>
-     *
-     * @param <V> Result value type
-     * @param <F> Future type
-     */
-    static class PromiseAggregator<V, F extends Future<V>> implements GenericFutureListener<F> {
-
-        private final Promise<?> aggregatePromise;
-        private Set<Promise<V>> pendingPromises;
-        private AtomicInteger expectedPromises = new AtomicInteger();
-        private AtomicInteger processedPromises = new AtomicInteger();
-        private boolean armed;
-
-        /**
-         * Creates a new instance.
-         *
-         * @param aggregatePromise the {@link Promise} to notify
-         */
-        public PromiseAggregator(Promise<V> aggregatePromise) {
-            LettuceAssert.notNull(aggregatePromise, "AggregatePromise must not be null");
-            this.aggregatePromise = aggregatePromise;
-        }
-
-        /**
-         * Add the number of {@code count} to the count of expected promises.
-         *
-         * @param count number of futures/promises, that is added to the overall expectation count.
-         * @throws IllegalStateException if the aggregator was armed
-         */
-        public void expectMore(int count) {
-            LettuceAssert.assertState(!armed, "Aggregator is armed and does not allow any further expectations");
-
-            expectedPromises.addAndGet(count);
-        }
-
-        /**
-         * Arm the aggregator to expect completion of the futures.
-         *
-         * @throws IllegalStateException if the aggregator was armed
-         */
-        public void arm() {
-            LettuceAssert.assertState(!armed, "Aggregator is already armed");
-            armed = true;
-        }
-
-        /**
-         * Add the given {@link Promise}s to the aggregator.
-         *
-         * @param promises the promises
-         * @throws IllegalStateException if the aggregator was not armed
-         */
-        @SafeVarargs
-        public final PromiseAggregator<V, F> add(Promise<V>... promises) {
-
-            LettuceAssert.notNull(promises, "Promises must not be null");
-            LettuceAssert.assertState(armed,
-                    "Aggregator is not armed and does not allow adding promises in that state. Call arm() first.");
-
-            if (promises.length == 0) {
-                return this;
-            }
-            synchronized (this) {
-                if (pendingPromises == null) {
-                    int size;
-                    if (promises.length > 1) {
-                        size = promises.length;
-                    } else {
-                        size = 2;
-                    }
-                    pendingPromises = new LinkedHashSet<>(size);
-                }
-                for (Promise<V> p : promises) {
-                    if (p == null) {
-                        continue;
-                    }
-                    pendingPromises.add(p);
-                    p.addListener(this);
-                }
-            }
-            return this;
-        }
-
-        @Override
-        public synchronized void operationComplete(F future) throws Exception {
-            if (pendingPromises == null) {
-                aggregatePromise.setSuccess(null);
-            } else {
-                pendingPromises.remove(future);
-                processedPromises.incrementAndGet();
-                if (!future.isSuccess()) {
-                    Throwable cause = future.cause();
-                    aggregatePromise.setFailure(cause);
-                    for (Promise<V> pendingFuture : pendingPromises) {
-                        pendingFuture.setFailure(cause);
-                    }
-                } else if (processedPromises.get() == expectedPromises.get()) {
-                    if (pendingPromises.isEmpty()) {
-                        aggregatePromise.setSuccess(null);
-                    } else {
-                        throw new IllegalStateException(
-                                "Processed promises == expected promises but pending promises is not empty. This should not have happened!");
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/main/java/io/lettuce/core/resource/PromiseAdapter.java b/src/main/java/io/lettuce/core/resource/PromiseAdapter.java
new file mode 100644
index 0000000000..7e6a349c7f
--- /dev/null
+++ b/src/main/java/io/lettuce/core/resource/PromiseAdapter.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2011-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.resource;
+
+import io.netty.util.concurrent.*;
+
+/**
+ * Utility class to support netty's future handling.
+ *
+ * @author Mark Paluch
+ * @since 3.4
+ */
+class PromiseAdapter {
+
+    /**
+     * Create a promise that emits a {@code Boolean} value on completion of the {@code future}
+     *
+     * @param future the future.
+     * @return Promise emitting a {@code Boolean} value. {@literal true} if the {@code future} completed successfully, otherwise
+     *         the cause wil be transported.
+     */
+    static Promise<Boolean> toBooleanPromise(Future<?> future) {
+
+        DefaultPromise<Boolean> result = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
+
+        if (future.isDone() || future.isCancelled()) {
+            if (future.isSuccess()) {
+                result.setSuccess(true);
+            } else {
+                result.setFailure(future.cause());
+            }
+            return result;
+        }
+
+        future.addListener((GenericFutureListener<Future<Object>>) f -> {
+
+            if (f.isSuccess()) {
+                result.setSuccess(true);
+            } else {
+                result.setFailure(f.cause());
+            }
+        });
+        return result;
+    }
+}
diff --git a/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java
index 0d60be66bb..14e81e87dd 100644
--- a/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java
@@ -30,9 +30,10 @@
 
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.test.Delay;
-import io.lettuce.test.Futures;
 import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.TestFutures;
 
 /**
  * @author Will Glozer
@@ -55,31 +56,31 @@ class AsyncConnectionIntegrationTests extends TestSupport {
 
     @Test
     void multi() {
-        assertThat(Futures.get(async.multi())).isEqualTo("OK");
+        assertThat(TestFutures.getOrTimeout(async.multi())).isEqualTo("OK");
         Future<String> set = async.set(key, value);
         Future<Long> rpush = async.rpush("list", "1", "2");
         Future<List<String>> lrange = async.lrange("list", 0, -1);
 
         assertThat(!set.isDone() && !rpush.isDone() && !rpush.isDone()).isTrue();
-        assertThat(Futures.get(async.exec())).contains("OK", 2L, list("1", "2"));
+        assertThat(TestFutures.getOrTimeout(async.exec())).contains("OK", 2L, list("1", "2"));
 
-        assertThat(Futures.get(set)).isEqualTo("OK");
-        assertThat(Futures.get(rpush)).isEqualTo(2L);
-        assertThat(Futures.get(lrange)).isEqualTo(list("1", "2"));
+        assertThat(TestFutures.getOrTimeout(set)).isEqualTo("OK");
+        assertThat(TestFutures.getOrTimeout(rpush)).isEqualTo(2L);
+        assertThat(TestFutures.getOrTimeout(lrange)).isEqualTo(list("1", "2"));
     }
 
     @Test
     void watch() {
-        assertThat(Futures.get(async.watch(key))).isEqualTo("OK");
+        assertThat(TestFutures.getOrTimeout(async.watch(key))).isEqualTo("OK");
 
         async.set(key, value + "X");
 
         async.multi();
         Future<String> set = async.set(key, value);
         Future<Long> append = async.append(key, "foo");
-        assertThat(Futures.get(async.exec())).isEmpty();
-        assertThat(Futures.get(set)).isNull();
-        assertThat(Futures.get(append)).isNull();
+        assertThat(TestFutures.getOrTimeout(async.exec())).isEmpty();
+        assertThat(TestFutures.getOrTimeout(set)).isNull();
+        assertThat(TestFutures.getOrTimeout(append)).isNull();
     }
 
     @Test
@@ -95,11 +96,11 @@ void futureListener() {
             futures.add(async.lpush(key, "" + i));
         }
 
-        Futures.awaitAll(futures);
+        TestFutures.awaitOrTimeout(futures);
 
         RedisAsyncCommands<String, String> connection = client.connect().async();
 
-        Long len = Futures.get(connection.llen(key));
+        Long len = TestFutures.getOrTimeout(connection.llen(key));
         assertThat(len.intValue()).isEqualTo(1000);
 
         RedisFuture<List<String>> sort = connection.sort(key);
@@ -107,7 +108,7 @@ void futureListener() {
 
         sort.thenRun(listener);
 
-        Futures.await(sort);
+        TestFutures.awaitOrTimeout(sort);
         Delay.delay(Duration.ofMillis(100));
 
         assertThat(run).hasSize(1);
@@ -130,7 +131,7 @@ public void run() {
         RedisAsyncCommands<String, String> connection = client.connect().async();
 
         RedisFuture<String> set = connection.set(key, value);
-        Futures.await(set);
+        TestFutures.awaitOrTimeout(set);
 
         set.thenRun(listener);
 
@@ -144,7 +145,7 @@ void discardCompletesFutures() {
         async.multi();
         Future<String> set = async.set(key, value);
         async.discard();
-        assertThat(Futures.get(set)).isNull();
+        assertThat(TestFutures.getOrTimeout(set)).isNull();
     }
 
     @Test
@@ -155,17 +156,17 @@ void awaitAll() {
         Future<String> get2 = async.get(key);
         Future<Long> append = async.append(key, value);
 
-        assertThat(LettuceFutures.awaitAll(1, TimeUnit.SECONDS, get1, set, get2, append)).isTrue();
+        assertThat(Futures.awaitAll(1, TimeUnit.SECONDS, get1, set, get2, append)).isTrue();
 
-        assertThat(Futures.get(get1)).isNull();
-        assertThat(Futures.get(set)).isEqualTo("OK");
-        assertThat(Futures.get(get2)).isEqualTo(value);
-        assertThat(Futures.get(append).longValue()).isEqualTo(value.length() * 2);
+        assertThat(TestFutures.getOrTimeout(get1)).isNull();
+        assertThat(TestFutures.getOrTimeout(set)).isEqualTo("OK");
+        assertThat(TestFutures.getOrTimeout(get2)).isEqualTo(value);
+        assertThat(TestFutures.getOrTimeout(append).longValue()).isEqualTo(value.length() * 2);
     }
 
     @Test
     void awaitAllTimeout() {
         Future<KeyValue<String, String>> blpop = async.blpop(1, key);
-        assertThat(LettuceFutures.awaitAll(1, TimeUnit.NANOSECONDS, blpop)).isFalse();
+        assertThat(Futures.await(1, TimeUnit.NANOSECONDS, blpop)).isFalse();
     }
 }
diff --git a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
index 2868a19a65..98fed693e5 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
@@ -43,7 +43,7 @@
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
 import io.lettuce.test.WithPassword;
@@ -178,7 +178,7 @@ private void testHitRequestQueueLimit(RedisAsyncCommands<String, String> connect
         watchdog.scheduleReconnect();
 
         for (RedisFuture<String> ping : pings) {
-            assertThat(Futures.get(ping)).isEqualTo("PONG");
+            assertThat(TestFutures.getOrTimeout(ping)).isEqualTo("PONG");
         }
 
         connection.getStatefulConnection().close();
@@ -212,10 +212,10 @@ void requestQueueSizeOvercommittedReconnect() {
         watchdog.scheduleReconnect();
 
         for (int i = 0; i < 10; i++) {
-            assertThat(Futures.get(pings.get(i))).isEqualTo("PONG");
+            assertThat(TestFutures.getOrTimeout(pings.get(i))).isEqualTo("PONG");
         }
 
-        assertThatThrownBy(() -> Futures.await(pings.get(10))).hasCauseInstanceOf(IllegalStateException.class)
+        assertThatThrownBy(() -> TestFutures.awaitOrTimeout(pings.get(10))).hasCauseInstanceOf(IllegalStateException.class)
                 .hasMessage("java.lang.IllegalStateException: Queue full");
 
         connection.close();
@@ -483,8 +483,8 @@ void pingBeforeConnectWithQueuedCommandsAndReconnect() throws Exception {
         ConnectionWatchdog connectionWatchdog = getConnectionWatchdog(redisConnection);
         connectionWatchdog.setReconnectSuspended(true);
 
-        Futures.await(channel.close());
-        Futures.await(sleep);
+        TestFutures.awaitOrTimeout(channel.close());
+        TestFutures.awaitOrTimeout(sleep);
 
         redisConnection.async().get(key).cancel(true);
 
@@ -495,8 +495,8 @@ void pingBeforeConnectWithQueuedCommandsAndReconnect() throws Exception {
         connectionWatchdog.setReconnectSuspended(false);
         connectionWatchdog.scheduleReconnect();
 
-        assertThat(Futures.get(getFuture1)).isEqualTo("value1");
-        assertThat(Futures.get(getFuture2)).isEqualTo("value2");
+        assertThat(TestFutures.getOrTimeout(getFuture1)).isEqualTo("value1");
+        assertThat(TestFutures.getOrTimeout(getFuture2)).isEqualTo("value2");
 
         controlConnection.close();
         redisConnection.close();
@@ -528,8 +528,8 @@ void authenticatedPingBeforeConnectWithQueuedCommandsAndReconnect() {
                     ConnectionWatchdog connectionWatchdog = getConnectionWatchdog(redisConnection);
                     connectionWatchdog.setReconnectSuspended(true);
 
-                    Futures.await(channel.close());
-                    Futures.await(sleep);
+                    TestFutures.awaitOrTimeout(channel.close());
+                    TestFutures.awaitOrTimeout(sleep);
 
                     redisConnection.async().get(key).cancel(true);
 
@@ -540,8 +540,8 @@ void authenticatedPingBeforeConnectWithQueuedCommandsAndReconnect() {
                     connectionWatchdog.setReconnectSuspended(false);
                     connectionWatchdog.scheduleReconnect();
 
-                    assertThat(Futures.get(getFuture1)).isEqualTo("value1");
-                    assertThat(Futures.get(getFuture2)).isEqualTo("value2");
+                    assertThat(TestFutures.getOrTimeout(getFuture1)).isEqualTo("value1");
+                    assertThat(TestFutures.getOrTimeout(getFuture2)).isEqualTo("value2");
 
                     controlConnection.close();
                     redisConnection.close();
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
index 42f9a50112..8dc2ca3b03 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
@@ -135,7 +135,7 @@ void getSetReconnect() {
     void authInvalidPassword() {
         RedisAsyncCommands<String, String> async = client.connect().async();
         try {
-            Futures.await(async.auth("invalid"));
+            TestFutures.awaitOrTimeout(async.auth("invalid"));
             fail("Authenticated with invalid password");
         } catch (RedisException e) {
             assertThat(e.getMessage()).isEqualTo("ERR Client sent AUTH, but no password is set");
@@ -150,7 +150,7 @@ void authInvalidPassword() {
     void selectInvalid() {
         RedisAsyncCommands<String, String> async = client.connect().async();
         try {
-            Futures.await(async.select(1024));
+            TestFutures.awaitOrTimeout(async.select(1024));
             fail("Selected invalid db index");
         } catch (RedisException e) {
             assertThat(e.getMessage()).startsWith("ERR");
diff --git a/src/test/java/io/lettuce/core/LettuceFuturesUnitTests.java b/src/test/java/io/lettuce/core/LettuceFuturesUnitTests.java
index f009efb4de..6c784d5dd2 100644
--- a/src/test/java/io/lettuce/core/LettuceFuturesUnitTests.java
+++ b/src/test/java/io/lettuce/core/LettuceFuturesUnitTests.java
@@ -25,6 +25,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import io.lettuce.core.internal.Futures;
+
 /**
  * @author Mark Paluch
  */
@@ -41,7 +43,7 @@ void awaitAllShouldThrowRedisCommandExecutionException() {
         CompletableFuture<String> f = new CompletableFuture<>();
         f.completeExceptionally(new RedisCommandExecutionException("error"));
 
-        assertThatThrownBy(() -> awaitAll(1, SECONDS, f)).isInstanceOf(RedisCommandExecutionException.class);
+        assertThatThrownBy(() -> Futures.await(1, SECONDS, f)).isInstanceOf(RedisCommandExecutionException.class);
     }
 
     @Test
@@ -50,7 +52,7 @@ void awaitAllShouldThrowRedisCommandInterruptedException() {
         CompletableFuture<String> f = new CompletableFuture<>();
         Thread.currentThread().interrupt();
 
-        assertThatThrownBy(() -> awaitAll(1, SECONDS, f)).isInstanceOf(RedisCommandInterruptedException.class);
+        assertThatThrownBy(() -> Futures.await(1, SECONDS, f)).isInstanceOf(RedisCommandInterruptedException.class);
     }
 
     @Test
@@ -60,7 +62,7 @@ void awaitAllShouldSetInterruptedBit() {
         Thread.currentThread().interrupt();
 
         try {
-            awaitAll(1, SECONDS, f);
+            Futures.await(1, SECONDS, f);
         } catch (Exception e) {
         }
 
diff --git a/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java b/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java
index b0dae44a32..c64ffe34c4 100644
--- a/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java
@@ -30,6 +30,7 @@
 
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.test.LettuceExtension;
 
 /**
@@ -67,7 +68,7 @@ void basic() {
 
         connection.flushCommands();
 
-        LettuceFutures.awaitAll(5, TimeUnit.SECONDS, futures.toArray(new RedisFuture[futures.size()]));
+        Futures.awaitAll(5, TimeUnit.SECONDS, futures.toArray(new RedisFuture[futures.size()]));
 
         verifyExecuted(iterations);
 
@@ -96,7 +97,7 @@ void setAutoFlushTrueDoesNotFlush() {
         verifyNotExecuted(iterations);
 
         connection.flushCommands();
-        boolean result = LettuceFutures.awaitAll(5, TimeUnit.SECONDS, futures.toArray(new RedisFuture[futures.size()]));
+        boolean result = Futures.awaitAll(5, TimeUnit.SECONDS, futures.toArray(new RedisFuture[futures.size()]));
         assertThat(result).isTrue();
 
         connection.close();
diff --git a/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java b/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java
index 20db5be454..9896556208 100644
--- a/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java
@@ -35,7 +35,7 @@
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
 
 /**
@@ -107,7 +107,7 @@ void connectCodecOwnUri() {
     void connectAsyncCodecOwnUri() {
         RedisURI redisURI = redis(host, port).build();
         ConnectionFuture<StatefulRedisConnection<String, String>> future = client.connectAsync(UTF8, redisURI);
-        StatefulRedisConnection<String, String> connection = Futures.get(future.toCompletableFuture());
+        StatefulRedisConnection<String, String> connection = TestFutures.getOrTimeout(future.toCompletableFuture());
         assertThat(connection.getTimeout()).isEqualTo(redisURI.getTimeout());
         connection.close();
     }
@@ -134,7 +134,7 @@ void shutdownSyncInRedisFutureTest() {
             redisClient.shutdown(0, 0, SECONDS); // deadlock expected.
             }).toCompletableFuture();
 
-        assertThatThrownBy(() -> Futures.await(f)).isInstanceOf(TimeoutException.class);
+        assertThatThrownBy(() -> TestFutures.awaitOrTimeout(f)).isInstanceOf(TimeoutException.class);
     }
 
     @Test
@@ -147,7 +147,7 @@ void shutdownAsyncInRedisFutureTest() {
             return redisClient.shutdownAsync(0, 0, SECONDS);
         }).toCompletableFuture();
 
-        Futures.await(f);
+        TestFutures.awaitOrTimeout(f);
     }
 
     /*
diff --git a/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java b/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java
index 93a714cccc..6de5d5f738 100644
--- a/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java
@@ -28,7 +28,7 @@
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
 import io.lettuce.core.resource.DefaultEventLoopGroupProvider;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.Wait;
 import io.lettuce.test.resource.FastShutdown;
 import io.lettuce.test.resource.TestClientResources;
@@ -119,7 +119,7 @@ void reuseClientConnections() throws Exception {
         // then
         connectAndClose(redisClient2);
 
-        Futures.await(clientResources.shutdown(0, 0, TimeUnit.MILLISECONDS));
+        TestFutures.awaitOrTimeout(clientResources.shutdown(0, 0, TimeUnit.MILLISECONDS));
 
         assertThat(eventLoopGroups).isEmpty();
         assertThat(executor.isShuttingDown()).isTrue();
@@ -152,7 +152,7 @@ void reuseClientConnectionsShutdownTwoClients() throws Exception {
         assertThat(clientResources.eventExecutorGroup().isShuttingDown()).isFalse();
 
         // cleanup
-        Futures.await(clientResources.shutdown(0, 0, TimeUnit.MILLISECONDS));
+        TestFutures.awaitOrTimeout(clientResources.shutdown(0, 0, TimeUnit.MILLISECONDS));
         assertThat(clientResources.eventExecutorGroup().isShuttingDown()).isTrue();
     }
 
diff --git a/src/test/java/io/lettuce/core/SslIntegrationTests.java b/src/test/java/io/lettuce/core/SslIntegrationTests.java
index 855f9184d5..7ac16a1799 100644
--- a/src/test/java/io/lettuce/core/SslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/SslIntegrationTests.java
@@ -380,7 +380,7 @@ void pubSubSslAndBreakConnection() {
 
         Wait.untilTrue(() -> connection2.pubsubChannels().containsAll(Arrays.asList("c1", "c2"))).waitOrTimeout();
 
-        Futures.await(connection.quit());
+        TestFutures.awaitOrTimeout(connection.quit());
 
         List<String> future = connection2.pubsubChannels();
         assertThat(future).doesNotContain("c1", "c2");
@@ -390,7 +390,7 @@ void pubSubSslAndBreakConnection() {
 
         RedisFuture<Void> defectFuture = connection.subscribe("foo");
 
-        assertThatThrownBy(() -> Futures.await(defectFuture)).hasCauseInstanceOf(DecoderException.class)
+        assertThatThrownBy(() -> TestFutures.awaitOrTimeout(defectFuture)).hasCauseInstanceOf(DecoderException.class)
                 .hasRootCauseInstanceOf(GeneralSecurityException.class);
 
         assertThat(defectFuture.toCompletableFuture()).isDone();
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java
index 4ec4742bd8..0c8e209fd7 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java
@@ -41,7 +41,7 @@
 import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.KeysAndValues;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.ListStreamingAdapter;
@@ -86,7 +86,7 @@ void nodeConnections() {
         for (RedisClusterNode redisClusterNode : clusterClient.getPartitions()) {
             RedisClusterAsyncCommands<String, String> nodeConnection = async.getConnection(redisClusterNode.getNodeId());
 
-            String myid = Futures.get(nodeConnection.clusterMyId());
+            String myid = TestFutures.getOrTimeout(nodeConnection.clusterMyId());
             assertThat(myid).isEqualTo(redisClusterNode.getNodeId());
         }
     }
@@ -228,7 +228,7 @@ void delRegular() {
         Long result = sync.unlink(key);
 
         assertThat(result).isEqualTo(1);
-        assertThat(Futures.get(async.get(key))).isNull();
+        assertThat(TestFutures.getOrTimeout(async.get(key))).isNull();
     }
 
     @Test
@@ -495,7 +495,7 @@ void pipelining(@New StatefulRedisClusterConnection<String, String> connectionUn
 
         RedisAdvancedClusterAsyncCommands<String, String> async = connectionUnderTest.async();
         // preheat the first connection
-        Futures.await(async.get(key(0)));
+        TestFutures.awaitOrTimeout(async.get(key(0)));
 
         int iterations = 1000;
         async.setAutoFlushCommands(false);
@@ -510,7 +510,7 @@ void pipelining(@New StatefulRedisClusterConnection<String, String> connectionUn
 
         async.flushCommands();
 
-        boolean result = Futures.awaitAll(futures);
+        boolean result = TestFutures.awaitOrTimeout(futures);
         assertThat(result).isTrue();
 
         for (int i = 0; i < iterations; i++) {
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
index e51061ba3c..45976d8a72 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
@@ -240,17 +240,17 @@ void keysDoesNotRunIntoRaceConditions() {
 
         List<RedisFuture<?>> futures = new ArrayList<>();
         RedisClusterAsyncCommands<String, String> async = commands.getStatefulConnection().async();
-        Futures.await(async.flushall());
+        TestFutures.awaitOrTimeout(async.flushall());
 
         for (int i = 0; i < 1000; i++) {
             futures.add(async.set("key-" + i, "value-" + i));
         }
 
-        Futures.awaitAll(futures);
+        TestFutures.awaitOrTimeout(futures);
 
         for (int i = 0; i < 1000; i++) {
             CompletableFuture<Long> future = commands.keys("*").count().toFuture();
-            Futures.await(future);
+            TestFutures.awaitOrTimeout(future);
             assertThat(future).isCompletedWithValue(1000L);
         }
     }
diff --git a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
index 01880ba83b..c533f6e3e3 100644
--- a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
@@ -45,7 +45,7 @@
 import io.lettuce.core.cluster.ClusterNodeConnectionFactory.ConnectionKey;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.AsyncConnectionProvider;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.settings.TestSettings;
 import io.netty.channel.ConnectTimeoutException;
@@ -101,10 +101,10 @@ void shouldCreateConnection() throws IOException {
 
         ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, TestSettings.host(),
                 TestSettings.port());
-        StatefulRedisConnection<String, String> connection = Futures
-                .get(sut.getConnection(connectionKey).toCompletableFuture());
+        StatefulRedisConnection<String, String> connection = TestFutures
+                .getOrTimeout(sut.getConnection(connectionKey).toCompletableFuture());
 
-        assertThat(Futures.get(sut.getConnection(connectionKey).toCompletableFuture())).isSameAs(connection);
+        assertThat(TestFutures.getOrTimeout(sut.getConnection(connectionKey).toCompletableFuture())).isSameAs(connection);
         sut.close();
         serverSocket.accept();
     }
@@ -117,7 +117,7 @@ void shouldMaintainConnectionCount() throws IOException {
 
         assertThat(sut.getConnectionCount()).isEqualTo(0);
 
-        Futures.await(sut.getConnection(connectionKey).toCompletableFuture());
+        TestFutures.awaitOrTimeout(sut.getConnection(connectionKey).toCompletableFuture());
 
         assertThat(sut.getConnectionCount()).isEqualTo(1);
         sut.close();
@@ -147,10 +147,10 @@ void shouldCloseConnections() throws IOException {
                 TestSettings.port());
 
         sut.getConnection(connectionKey);
-        Futures.await(sut.close());
+        TestFutures.awaitOrTimeout(sut.close());
 
         assertThat(sut.getConnectionCount()).isEqualTo(0);
-        Futures.await(sut.close());
+        TestFutures.awaitOrTimeout(sut.close());
 
         serverSocket.accept();
     }
@@ -169,12 +169,14 @@ void connectShouldFail() throws Exception {
 
         StopWatch stopWatch = new StopWatch();
 
-        assertThatThrownBy(() -> Futures.await(sut.getConnection(connectionKey))).hasCauseInstanceOf(
+        assertThatThrownBy(() -> TestFutures.awaitOrTimeout(sut.getConnection(connectionKey)))
+                .hasCauseInstanceOf(
                 ConnectTimeoutException.class);
 
         stopWatch.start();
 
-        assertThatThrownBy(() -> Futures.await(sut.getConnection(connectionKey))).hasCauseInstanceOf(
+        assertThatThrownBy(() -> TestFutures.awaitOrTimeout(sut.getConnection(connectionKey)))
+                .hasCauseInstanceOf(
                 ConnectTimeoutException.class);
 
         stopWatch.stop();
@@ -254,7 +256,7 @@ void shouldCloseAsync() throws Exception {
                         .toCompletableFuture();
 
                 connectInitiated.countDown();
-                StatefulRedisConnection<String, String> connection = Futures.get(future);
+                StatefulRedisConnection<String, String> connection = TestFutures.getOrTimeout(future);
                 createdConnection.complete(connection);
             } catch (Exception e) {
                 createdConnection.completeExceptionally(e);
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
index 278d3558d9..5fb874df72 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
@@ -39,7 +39,7 @@
 import io.lettuce.core.cluster.models.slots.ClusterSlotRange;
 import io.lettuce.core.cluster.models.slots.ClusterSlotsParser;
 import io.lettuce.test.Delay;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
 
@@ -76,7 +76,7 @@ void testClusterBumpEpoch() {
 
         RedisFuture<String> future = async.clusterBumpepoch();
 
-        String result = Futures.get(future);
+        String result = TestFutures.getOrTimeout(future);
 
         assertThat(result).matches("(BUMPED|STILL).*");
     }
@@ -119,7 +119,7 @@ void testClusterReplicas() {
 
         sync.set("b", value);
         RedisFuture<Long> replication = async.waitForReplication(1, 5);
-        assertThat(Futures.get(replication)).isGreaterThan(0L);
+        assertThat(TestFutures.getOrTimeout(replication)).isGreaterThan(0L);
     }
 
     @Test
@@ -134,13 +134,13 @@ void testReset() {
 
         StatefulRedisClusterConnection<String, String> clusterConnection = clusterClient.connect();
 
-        Futures.await(clusterConnection.async().set("a", "myValue1"));
+        TestFutures.awaitOrTimeout(clusterConnection.async().set("a", "myValue1"));
 
         clusterConnection.reset();
 
         RedisFuture<String> setA = clusterConnection.async().set("a", "myValue1");
 
-        assertThat(Futures.get(setA)).isEqualTo("OK");
+        assertThat(TestFutures.getOrTimeout(setA)).isEqualTo("OK");
         assertThat(setA.getError()).isNull();
 
         connection.close();
@@ -248,7 +248,7 @@ private void prepareReadonlyTest(String key) {
 
         async.set(key, value);
 
-        String resultB = Futures.get(async.get(key));
+        String resultB = TestFutures.getOrTimeout(async.get(key));
         assertThat(resultB).isEqualTo(value);
         Delay.delay(Duration.ofMillis(500)); // give some time to replicate
     }
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
index 7760a4e8f1..d37a7a9fa3 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
@@ -40,7 +40,7 @@
 import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.resource.ClientResources;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 
 /**
  * @author Mark Paluch
@@ -111,7 +111,7 @@ void closeWithQueuedCommandsFails() {
 
         assertThat(command.isDone()).isTrue();
 
-        assertThatThrownBy(() -> Futures.await(command)).isInstanceOf(RedisException.class);
+        assertThatThrownBy(() -> TestFutures.awaitOrTimeout(command)).isInstanceOf(RedisException.class);
     }
 
     @Test
@@ -152,7 +152,7 @@ void closeWithBufferedCommandsFails() {
 
         sut.close();
 
-        assertThatThrownBy(() -> Futures.await(command)).isInstanceOf(RedisException.class);
+        assertThatThrownBy(() -> TestFutures.awaitOrTimeout(command)).isInstanceOf(RedisException.class);
     }
 
     private void prepareNewEndpoint() {
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterSetup.java b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
index c3613ea305..c738aac9e2 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
@@ -23,7 +23,7 @@
 import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.Wait;
 import io.lettuce.test.settings.TestSettings;
 
@@ -110,7 +110,8 @@ public static void setupMasterWithReplica(ClusterRule clusterRule) {
 
         Wait.untilTrue(clusterRule::isStable).waitOrTimeout();
 
-        Futures.await(connection.getConnection(ClusterTestSettings.host, ClusterTestSettings.port6).clusterReplicate(
+        TestFutures.awaitOrTimeout(connection.getConnection(ClusterTestSettings.host, ClusterTestSettings.port6)
+                .clusterReplicate(
                 node1.clusterMyId()));
 
         clusterRule.getClusterClient().reloadPartitions();
diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
index e1dae91104..ac5fd4e8af 100644
--- a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
@@ -41,7 +41,7 @@
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.internal.LettuceSets;
 import io.lettuce.test.Delay;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
 
@@ -70,12 +70,12 @@ void testMultiNodeOperations() {
         for (char c = 'a'; c < 'z'; c++) {
             String key = new String(new char[] { c, c, c });
             expectation.add(key);
-            Futures.await(commands.set(key, value));
+            TestFutures.awaitOrTimeout(commands.set(key, value));
         }
 
         List<String> result = new Vector<>();
 
-        Futures.await(commands.masters().commands().keys(result::add, "*"));
+        TestFutures.awaitOrTimeout(commands.masters().commands().keys(result::add, "*"));
 
         assertThat(result).hasSize(expectation.size());
 
@@ -92,7 +92,7 @@ void testThenCollect() {
         for (char c = 'a'; c < 'z'; c++) {
             String key = new String(new char[] { c, c, c });
             expectation.add(key);
-            Futures.await(commands.set(key, value));
+            TestFutures.awaitOrTimeout(commands.set(key, value));
         }
 
         Collector<List<String>, List<String>, List<String>> collector = Collector.of(ArrayList::new, List::addAll, (a, b) -> a,
@@ -101,7 +101,7 @@ void testThenCollect() {
         CompletableFuture<List<String>> future = commands.masters().commands().keys("*").thenCollect(collector)
                 .toCompletableFuture();
 
-        Futures.await(future);
+        TestFutures.awaitOrTimeout(future);
         List<String> result = future.join();
 
         assertThat(result).hasSize(expectation.size());
@@ -118,7 +118,7 @@ void testCompletionStageTransformation() {
         CompletableFuture<String> transformed = commands.masters().commands().ping()
                 .thenApply(it -> String.join(" ", it.toArray(new String[0]))).toCompletableFuture();
 
-        Futures.await(transformed);
+        TestFutures.awaitOrTimeout(transformed);
 
         assertThat(transformed.join()).isEqualTo("PONG PONG");
     }
@@ -185,7 +185,7 @@ void testNodeSelectionAsyncPing() {
         AsyncExecutions<String> ping = onlyMe.commands().ping();
         CompletionStage<String> completionStage = ping.get(onlyMe.node(0));
 
-        assertThat(Futures.get(completionStage)).isEqualTo("PONG");
+        assertThat(TestFutures.getOrTimeout(completionStage)).isEqualTo("PONG");
     }
 
     @Test
@@ -211,7 +211,7 @@ void testAsynchronicityOfMultiNodeExecution() {
         RedisAdvancedClusterAsyncCommands<String, String> async2 = connection2.async();
 
         AsyncNodeSelection<String, String> masters = async2.masters();
-        Futures.await(masters.commands().configSet("lua-time-limit", "10"));
+        TestFutures.awaitOrTimeout(masters.commands().configSet("lua-time-limit", "10"));
 
         AsyncExecutions<Object> eval = masters.commands().eval("while true do end", STATUS, new String[0]);
 
@@ -222,13 +222,13 @@ void testAsynchronicityOfMultiNodeExecution() {
         Delay.delay(Duration.ofMillis(200));
 
         AsyncExecutions<String> kill = commands.masters().commands().scriptKill();
-        Futures.await(kill);
+        TestFutures.awaitOrTimeout(kill);
 
         for (CompletionStage<String> execution : kill) {
-            assertThat(Futures.get(execution)).isEqualTo("OK");
+            assertThat(TestFutures.getOrTimeout(execution)).isEqualTo("OK");
         }
 
-        Futures.await(CompletableFuture.allOf(eval.futures()).exceptionally(throwable -> null));
+        TestFutures.awaitOrTimeout(CompletableFuture.allOf(eval.futures()).exceptionally(throwable -> null));
         for (CompletableFuture<Object> future : eval.futures()) {
             assertThat(future.isDone()).isTrue();
         }
@@ -244,7 +244,7 @@ void testReplicaReadWrite() {
 
         assertThat(nodes.size()).isEqualTo(2);
 
-        Futures.await(commands.set(key, value));
+        TestFutures.awaitOrTimeout(commands.set(key, value));
 
         waitForReplication(key, ClusterTestSettings.port4);
 
@@ -257,7 +257,7 @@ void testReplicaReadWrite() {
             });
         });
 
-        Futures.await(CompletableFuture.allOf(keys.futures()).exceptionally(throwable -> null));
+        TestFutures.awaitOrTimeout(CompletableFuture.allOf(keys.futures()).exceptionally(throwable -> null));
 
         assertThat(t.size()).isGreaterThan(0);
     }
@@ -270,7 +270,7 @@ void testReplicasWithReadOnly() {
 
         assertThat(nodes.size()).isEqualTo(2);
 
-        Futures.await(commands.set(key, value));
+        TestFutures.awaitOrTimeout(commands.set(key, value));
         waitForReplication(key, ClusterTestSettings.port4);
 
         List<Throwable> t = new ArrayList<>();
@@ -284,7 +284,7 @@ void testReplicasWithReadOnly() {
             lcs.thenAccept(strings::add);
         });
 
-        Futures.await(CompletableFuture.allOf(keys.futures()).exceptionally(throwable -> null));
+        TestFutures.awaitOrTimeout(CompletableFuture.allOf(keys.futures()).exceptionally(throwable -> null));
         Wait.untilEquals(1, t::size).waitOrTimeout();
 
         assertThat(t).hasSize(1);
@@ -303,9 +303,9 @@ static void waitForReplication(RedisAdvancedClusterAsyncCommands<String, String>
         Wait.untilNotEquals(null, () -> {
             for (CompletableFuture<String> future : selection.commands().get(key).futures()) {
 
-                Futures.await(future);
+                TestFutures.awaitOrTimeout(future);
 
-                String result = Futures.get((Future<String>) future);
+                String result = TestFutures.getOrTimeout((Future<String>) future);
                 if (result != null) {
                     return result;
                 }
diff --git a/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java b/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java
index 5f08160b21..3f73ff9f2b 100644
--- a/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java
@@ -21,7 +21,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 
 /**
  * @author Mark Paluch
@@ -38,7 +38,7 @@ void testComplete() {
         sut = new PipelinedRedisFuture<>(new HashMap<>(), o -> other);
 
         sut.complete("");
-        assertThat(Futures.get(sut.toCompletableFuture())).isEqualTo(other);
+        assertThat(TestFutures.getOrTimeout(sut.toCompletableFuture())).isEqualTo(other);
         assertThat(sut.getError()).isNull();
     }
 
@@ -50,7 +50,7 @@ void testCompleteExceptionally() {
         sut = new PipelinedRedisFuture<>(new HashMap<>(), o -> other);
 
         sut.completeExceptionally(new Exception());
-        assertThat(Futures.get(sut.toCompletableFuture())).isEqualTo(other);
+        assertThat(TestFutures.getOrTimeout(sut.toCompletableFuture())).isEqualTo(other);
         assertThat(sut.getError()).isNull();
     }
 }
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
index f56faa0cc6..7ec12aaa86 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
@@ -51,7 +51,7 @@
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.test.Delay;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
 import io.lettuce.test.resource.FastShutdown;
@@ -249,7 +249,7 @@ void testClusteredOperations() {
 
         RedisFuture<String> resultMoved = redis1.async().set(ClusterTestSettings.KEY_A, value);
 
-        assertThatThrownBy(() -> Futures.await(resultMoved)).hasMessageContaining("MOVED 15495");
+        assertThatThrownBy(() -> TestFutures.awaitOrTimeout(resultMoved)).hasMessageContaining("MOVED 15495");
 
         clusterClient.reloadPartitions();
         RedisAdvancedClusterCommands<String, String> connection = clusterClient.connect().sync();
@@ -308,18 +308,18 @@ void testClusterRedirection() {
 
         assertThat(setB.toCompletableFuture()).isInstanceOf(AsyncCommand.class);
 
-        Futures.await(setB);
+        TestFutures.awaitOrTimeout(setB);
         assertThat(setB.getError()).isNull();
-        assertThat(Futures.get(setB)).isEqualTo("OK");
+        assertThat(TestFutures.getOrTimeout(setB)).isEqualTo("OK");
 
         // gets redirection to node 3
         RedisFuture<String> setA = connection.set(ClusterTestSettings.KEY_A, value);
 
         assertThat((CompletionStage) setA).isInstanceOf(AsyncCommand.class);
 
-        Futures.await(setA);
+        TestFutures.awaitOrTimeout(setA);
         assertThat(setA.getError()).isNull();
-        assertThat(Futures.get(setA)).isEqualTo("OK");
+        assertThat(TestFutures.getOrTimeout(setA)).isEqualTo("OK");
 
         connection.getStatefulConnection().close();
     }
@@ -379,7 +379,7 @@ void clusterAuth() {
         List<String> time = sync.time();
         assertThat(time).hasSize(2);
 
-        Futures.await(connection.async().quit());
+        TestFutures.awaitOrTimeout(connection.async().quit());
 
         Wait.untilTrue(connection::isOpen).waitOrTimeout();
 
@@ -418,7 +418,7 @@ void clusterAuthPingBeforeConnect() {
         List<String> time = sync.time();
         assertThat(time).hasSize(2);
 
-        Futures.await(connection.async().quit());
+        TestFutures.awaitOrTimeout(connection.async().quit());
 
         Wait.untilTrue(connection::isOpen).waitOrTimeout();
 
@@ -496,7 +496,8 @@ void testGetConnectionAsyncByNodeId() {
 
         RedisClusterNode partition = connection.getPartitions().getPartition(0);
 
-        StatefulRedisConnection<String, String> node = Futures.get(connection.getConnectionAsync(partition.getNodeId()));
+        StatefulRedisConnection<String, String> node = TestFutures
+                .getOrTimeout(connection.getConnectionAsync(partition.getNodeId()));
 
         assertThat(node.sync().ping()).isEqualTo("PONG");
     }
@@ -516,7 +517,7 @@ void testGetConnectionAsyncByHostAndPort() {
     void testStatefulConnection() {
         RedisAdvancedClusterAsyncCommands<String, String> async = connection.async();
 
-        assertThat(Futures.get(async.ping())).isEqualTo("PONG");
+        assertThat(TestFutures.getOrTimeout(async.ping())).isEqualTo("PONG");
     }
 
     @Test
@@ -541,7 +542,7 @@ void readOnlyOnCluster() {
         // commands are dispatched to a different connection, therefore it works for us.
         sync.set(ClusterTestSettings.KEY_B, value);
 
-        Futures.await(connection.async().quit());
+        TestFutures.awaitOrTimeout(connection.async().quit());
 
         assertThat(ReflectionTestUtils.getField(connection, "readOnly")).isEqualTo(Boolean.TRUE);
 
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
index a9ff7bf82e..717de99d0f 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
@@ -43,7 +43,7 @@
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.test.ConnectionTestUtil;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.Wait;
 import io.lettuce.test.resource.DefaultRedisClient;
 import io.lettuce.test.resource.FastShutdown;
@@ -292,7 +292,7 @@ public void disconnectedConnectionRejectTest() throws Exception {
 
         set.await(5, TimeUnit.SECONDS);
 
-        assertThatThrownBy(() -> Futures.await(set)).hasRootCauseInstanceOf(RedisException.class);
+        assertThatThrownBy(() -> TestFutures.awaitOrTimeout(set)).hasRootCauseInstanceOf(RedisException.class);
             clusterConnection.getStatefulConnection().close();
     }
 
@@ -338,7 +338,7 @@ public void atLeastOnceForgetNodeFailover() throws Exception {
         partitions.updateCache();
         clusterClient.updatePartitionsInConnections();
 
-        Wait.untilTrue(() -> Futures.areAllCompleted(futures)).waitOrTimeout();
+        Wait.untilTrue(() -> TestFutures.areAllDone(futures)).waitOrTimeout();
 
         assertRoutedExecution(clusterConnection);
 
@@ -478,7 +478,7 @@ public void readFromReplicaTest() {
         RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
         clusterConnection.getStatefulConnection().setReadFrom(ReadFrom.REPLICA);
 
-        Futures.await(clusterConnection.set(key, value));
+        TestFutures.awaitOrTimeout(clusterConnection.set(key, value));
 
         try {
             clusterConnection.get(key);
@@ -517,9 +517,9 @@ private RedisChannelHandler<String, String> getChannelHandler(
     }
 
     private void assertExecuted(RedisFuture<String> set) {
-        Futures.await(set);
+        TestFutures.awaitOrTimeout(set);
         assertThat(set.getError()).isNull();
-        assertThat(Futures.get(set)).isEqualTo("OK");
+        assertThat(TestFutures.getOrTimeout(set)).isEqualTo("OK");
     }
 
     private void suspendConnection(RedisClusterAsyncCommands<String, String> asyncCommands) {
diff --git a/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java
index 198a3d19e6..3e54159754 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java
@@ -34,7 +34,7 @@
 import io.lettuce.core.commands.CustomCommandIntegrationTests;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
 
 /**
@@ -89,7 +89,7 @@ void clusterAsyncPing() {
         AsyncCommand<String, String, String> async = new AsyncCommand<>(command);
         connection.dispatch(async);
 
-        assertThat(Futures.get((RedisFuture) async)).isEqualTo("PONG");
+        assertThat(TestFutures.getOrTimeout((RedisFuture) async)).isEqualTo("PONG");
     }
 
     @Test
@@ -107,8 +107,8 @@ void clusterAsyncBatchPing() {
         AsyncCommand<String, String, String> async2 = new AsyncCommand<>(command2);
         connection.dispatch(Arrays.asList(async1, async2));
 
-        assertThat(Futures.get(async1.toCompletableFuture())).isEqualTo("PONG");
-        assertThat(Futures.get(async2.toCompletableFuture())).isEqualTo("PONG");
+        assertThat(TestFutures.getOrTimeout(async1.toCompletableFuture())).isEqualTo("PONG");
+        assertThat(TestFutures.getOrTimeout(async2.toCompletableFuture())).isEqualTo("PONG");
     }
 
     @Test
@@ -128,9 +128,9 @@ void clusterAsyncBatchSet() {
         AsyncCommand<String, String, String> async3 = new AsyncCommand<>(command3);
         connection.dispatch(Arrays.asList(async1, async2, async3));
 
-        assertThat(Futures.get(async1.toCompletableFuture())).isEqualTo("OK");
-        assertThat(Futures.get(async2.toCompletableFuture())).isEqualTo("value");
-        assertThat(Futures.get(async3.toCompletableFuture())).isEqualTo("OK");
+        assertThat(TestFutures.getOrTimeout(async1.toCompletableFuture())).isEqualTo("OK");
+        assertThat(TestFutures.getOrTimeout(async2.toCompletableFuture())).isEqualTo("value");
+        assertThat(TestFutures.getOrTimeout(async3.toCompletableFuture())).isEqualTo("OK");
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java
index 9db537ab53..68c7328376 100644
--- a/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java
@@ -42,7 +42,7 @@
 import io.lettuce.core.cluster.pubsub.api.sync.PubSubNodeSelection;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.core.support.PubSubTestListener;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
 
 /**
@@ -156,7 +156,8 @@ void testGetConnectionAsyncByNodeId() {
 
         RedisClusterNode partition = pubSubConnection.getPartitions().getPartition(0);
 
-        StatefulRedisPubSubConnection<String, String> node = Futures.get(pubSubConnection.getConnectionAsync(partition
+        StatefulRedisPubSubConnection<String, String> node = TestFutures
+                .getOrTimeout(pubSubConnection.getConnectionAsync(partition
                 .getNodeId()));
 
         assertThat(node.sync().ping()).isEqualTo("PONG");
@@ -168,7 +169,8 @@ void testGetConnectionAsyncByHostAndPort() {
         RedisClusterNode partition = pubSubConnection.getPartitions().getPartition(0);
 
         RedisURI uri = partition.getUri();
-        StatefulRedisPubSubConnection<String, String> node = Futures.get(pubSubConnection.getConnectionAsync(uri.getHost(),
+        StatefulRedisPubSubConnection<String, String> node = TestFutures
+                .getOrTimeout(pubSubConnection.getConnectionAsync(uri.getHost(),
                 uri.getPort()));
 
         assertThat(node.sync().ping()).isEqualTo("PONG");
@@ -230,7 +232,7 @@ void testAsyncSubscription() throws Exception {
         PubSubAsyncNodeSelection<String, String> masters = pubSubConnection.async().masters();
         NodeSelectionPubSubAsyncCommands<String, String> commands = masters.commands();
 
-        Futures.await(commands.psubscribe("chann*"));
+        TestFutures.awaitOrTimeout(commands.psubscribe("chann*"));
 
         pubSubConnection2.sync().publish("channel", "message");
 
diff --git a/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java
index 8d0b20a18f..72b0b97d88 100644
--- a/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java
@@ -36,7 +36,7 @@
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
 
 /**
@@ -106,7 +106,7 @@ void standaloneAsyncPing() {
         AsyncCommand<String, String, String> async = new AsyncCommand<>(command);
         getStandaloneConnection().dispatch(async);
 
-        assertThat(Futures.get(async.toCompletableFuture())).isEqualTo("PONG");
+        assertThat(TestFutures.getOrTimeout(async.toCompletableFuture())).isEqualTo("PONG");
     }
 
     @Test
@@ -122,8 +122,8 @@ void standaloneAsyncBatchPing() {
         AsyncCommand<String, String, String> async2 = new AsyncCommand<>(command2);
         getStandaloneConnection().dispatch(Arrays.asList(async1, async2));
 
-        assertThat(Futures.get(async1.toCompletableFuture())).isEqualTo("PONG");
-        assertThat(Futures.get(async2.toCompletableFuture())).isEqualTo("PONG");
+        assertThat(TestFutures.getOrTimeout(async1.toCompletableFuture())).isEqualTo("PONG");
+        assertThat(TestFutures.getOrTimeout(async2.toCompletableFuture())).isEqualTo("PONG");
     }
 
     @Test
@@ -141,10 +141,10 @@ void standaloneAsyncBatchTransaction() {
         AsyncCommand<String, String, TransactionResult> async3 = new AsyncCommand<>(exec);
         getStandaloneConnection().dispatch(Arrays.asList(async1, async2, async3));
 
-        assertThat(Futures.get(async1.toCompletableFuture())).isEqualTo("OK");
-        assertThat(Futures.get(async2.toCompletableFuture())).isEqualTo("OK");
+        assertThat(TestFutures.getOrTimeout(async1.toCompletableFuture())).isEqualTo("OK");
+        assertThat(TestFutures.getOrTimeout(async2.toCompletableFuture())).isEqualTo("OK");
 
-        TransactionResult transactionResult = Futures.get(async3.toCompletableFuture());
+        TransactionResult transactionResult = TestFutures.getOrTimeout(async3.toCompletableFuture());
         assertThat(transactionResult.wasDiscarded()).isFalse();
         assertThat(transactionResult.<String> get(0)).isEqualTo("OK");
     }
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java
index 2f2b2e5e5d..d17fc9a0de 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java
@@ -26,7 +26,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.core.LettuceFutures;
 import io.lettuce.core.RedisCommandExecutionException;
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.TestSupport;
@@ -37,8 +36,9 @@
 import io.lettuce.core.dynamic.batch.BatchExecutor;
 import io.lettuce.core.dynamic.batch.BatchSize;
 import io.lettuce.core.dynamic.batch.CommandBatching;
-import io.lettuce.test.Futures;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.TestFutures;
 
 /**
  * @author Mark Paluch
@@ -158,7 +158,7 @@ void shouldExecuteBatchingAynchronously() {
         api.setAsync("k4", value);
 
         assertThat(redis.get("k1")).isNull();
-        assertThat(Futures.get(api.setAsync("k5", value))).isEqualTo("OK");
+        assertThat(TestFutures.getOrTimeout(api.setAsync("k5", value))).isEqualTo("OK");
 
         assertThat(redis.get("k1")).isEqualTo(value);
     }
@@ -184,7 +184,7 @@ void shouldHandleAsynchronousBatchErrors() throws Exception {
         assertThat(redis.get("k4")).isEqualTo(value);
 
         try {
-            LettuceFutures.awaitAll(1, TimeUnit.SECONDS, llen);
+            Futures.await(1, TimeUnit.SECONDS, llen);
             fail("Missing RedisCommandExecutionException");
         } catch (Exception e) {
             assertThat(e).isInstanceOf(RedisCommandExecutionException.class);
diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
index bf8673bd88..2ff73fef76 100644
--- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
@@ -39,7 +39,7 @@
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.core.models.role.RoleParser;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.settings.TestSettings;
 
 /**
@@ -99,13 +99,13 @@ void after() {
 
         if (connectionToNode1 != null) {
             connectionToNode1.configSet("requirepass", "");
-            Futures.await(connectionToNode1.configSet("masterauth", ""));
+            TestFutures.awaitOrTimeout(connectionToNode1.configSet("masterauth", ""));
             connectionToNode1.getStatefulConnection().close();
         }
 
         if (connectionToNode2 != null) {
             connectionToNode2.configSet("requirepass", "");
-            Futures.await(connectionToNode2.configSet("masterauth", ""));
+            TestFutures.awaitOrTimeout(connectionToNode2.configSet("masterauth", ""));
             connectionToNode2.getStatefulConnection().close();
         }
 
diff --git a/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java b/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
index dae1476d88..70b466f751 100644
--- a/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
@@ -34,7 +34,7 @@
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
 
 /**
@@ -114,7 +114,7 @@ void masterSlaveAsyncPing() {
         AsyncCommand<String, String, String> async = new AsyncCommand<>(command);
         getStandaloneConnection().dispatch(async);
 
-        assertThat(Futures.get(async.toCompletableFuture())).isEqualTo("PONG");
+        assertThat(TestFutures.getOrTimeout(async.toCompletableFuture())).isEqualTo("PONG");
     }
 
     @Test
@@ -134,9 +134,9 @@ void masterSlaveAsyncBatchPing() {
         AsyncCommand<String, String, String> async3 = new AsyncCommand<>(command3);
         getStandaloneConnection().dispatch(Arrays.asList(async1, async2, async3));
 
-        assertThat(Futures.get(async1.toCompletableFuture())).isEqualTo("OK");
-        assertThat(Futures.get(async2.toCompletableFuture())).isEqualTo("value");
-        assertThat(Futures.get(async3.toCompletableFuture())).isEqualTo("OK");
+        assertThat(TestFutures.getOrTimeout(async1.toCompletableFuture())).isEqualTo("OK");
+        assertThat(TestFutures.getOrTimeout(async2.toCompletableFuture())).isEqualTo("value");
+        assertThat(TestFutures.getOrTimeout(async3.toCompletableFuture())).isEqualTo("OK");
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
index 28a592cbf3..0262b83c5b 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
@@ -39,7 +39,7 @@
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.core.models.role.RoleParser;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.settings.TestSettings;
 
 /**
@@ -99,13 +99,13 @@ void after() {
 
         if (connectionToNode1 != null) {
             connectionToNode1.configSet("requirepass", "");
-            Futures.await(connectionToNode1.configSet("masterauth", ""));
+            TestFutures.awaitOrTimeout(connectionToNode1.configSet("masterauth", ""));
             connectionToNode1.getStatefulConnection().close();
         }
 
         if (connectionToNode2 != null) {
             connectionToNode2.configSet("requirepass", "");
-            Futures.await(connectionToNode2.configSet("masterauth", ""));
+            TestFutures.awaitOrTimeout(connectionToNode2.configSet("masterauth", ""));
             connectionToNode2.getStatefulConnection().close();
         }
 
diff --git a/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java b/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
index cebf0a1a00..6d3fa7322b 100644
--- a/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
@@ -29,9 +29,10 @@
 import io.lettuce.core.*;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.Futures;
 import io.lettuce.core.output.CommandOutput;
 import io.lettuce.core.output.StatusOutput;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 
 /**
  * @author Mark Paluch
@@ -67,12 +68,12 @@ void isDone() {
     @Test
     void awaitAllCompleted() {
         sut.complete();
-        assertThat(LettuceFutures.awaitAll(5, TimeUnit.MILLISECONDS, sut)).isTrue();
+        assertThat(Futures.await(5, TimeUnit.MILLISECONDS, sut)).isTrue();
     }
 
     @Test
     void awaitAll() {
-        assertThat(LettuceFutures.awaitAll(-1, TimeUnit.NANOSECONDS, sut)).isFalse();
+        assertThat(Futures.awaitAll(-1, TimeUnit.NANOSECONDS, sut)).isFalse();
     }
 
     @Test
@@ -98,7 +99,7 @@ void awaitWithCancelledCommand() {
     void awaitAllWithExecutionException() {
         sut.completeExceptionally(new RedisCommandExecutionException("error"));
 
-        assertThatThrownBy(() -> LettuceFutures.awaitAll(0, TimeUnit.SECONDS, sut)).isInstanceOf(RedisException.class);
+        assertThatThrownBy(() -> Futures.await(0, TimeUnit.SECONDS, sut)).isInstanceOf(RedisException.class);
     }
 
     @Test
@@ -126,7 +127,7 @@ void completeExceptionally() {
     void asyncGet() {
         sut.getOutput().set(StandardCharsets.US_ASCII.encode("one"));
         sut.complete();
-        assertThat(Futures.get(sut.toCompletableFuture())).isEqualTo("one");
+        assertThat(TestFutures.getOrTimeout(sut.toCompletableFuture())).isEqualTo("one");
         sut.getOutput().toString();
     }
 
diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
index efea0f92f0..dc8cf30180 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
@@ -125,7 +125,7 @@ void pingBeforeConnectFailOnReconnect() throws Exception {
 
             assertThat(connectionWatchdog.isListenOnChannelInactive()).isTrue();
 
-            assertThatThrownBy(() -> Futures.await(connection.info())).hasRootCauseInstanceOf(RedisException.class)
+            assertThatThrownBy(() -> TestFutures.awaitOrTimeout(connection.info())).hasRootCauseInstanceOf(RedisException.class)
                     .hasMessageContaining("Invalid first byte");
 
             connection.getStatefulConnection().close();
@@ -227,7 +227,7 @@ void cancelCommandsOnReconnectFailure() throws Exception {
             assertThatThrownBy(set1::get).isInstanceOf(CancellationException.class).hasNoCause();
             assertThatThrownBy(set2::get).isInstanceOf(CancellationException.class).hasNoCause();
 
-            assertThatThrownBy(() -> Futures.await(connection.info())).isInstanceOf(RedisException.class)
+            assertThatThrownBy(() -> TestFutures.awaitOrTimeout(connection.info())).isInstanceOf(RedisException.class)
                     .hasMessageContaining("Invalid first byte");
 
             connection.getStatefulConnection().close();
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
index 8865c22da1..28bf01f6fb 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
@@ -38,7 +38,7 @@
 import io.lettuce.core.internal.LettuceFactories;
 import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
 import io.lettuce.test.Delay;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.Wait;
 import io.lettuce.test.resource.FastShutdown;
 import io.lettuce.test.resource.TestClientResources;
@@ -201,7 +201,7 @@ void pipelinedSubscribe() throws Exception {
     @Test
     void psubscribe() throws Exception {
         RedisFuture<Void> psubscribe = pubsub.psubscribe(pattern);
-        assertThat(Futures.get(psubscribe)).isNull();
+        assertThat(TestFutures.getOrTimeout(psubscribe)).isNull();
         assertThat(psubscribe.getError()).isNull();
         assertThat(psubscribe.isCancelled()).isFalse();
         assertThat(psubscribe.isDone()).isTrue();
@@ -230,7 +230,7 @@ void pubsubEmptyChannels() {
 
     @Test
     void pubsubChannels() {
-        Futures.await(pubsub.subscribe(channel));
+        TestFutures.awaitOrTimeout(pubsub.subscribe(channel));
         List<String> result = redis.pubsubChannels();
         assertThat(result).contains(channel);
 
@@ -238,7 +238,7 @@ void pubsubChannels() {
 
     @Test
     void pubsubMultipleChannels() {
-        Futures.await(pubsub.subscribe(channel, "channel1", "channel3"));
+        TestFutures.awaitOrTimeout(pubsub.subscribe(channel, "channel1", "channel3"));
 
         List<String> result = redis.pubsubChannels();
         assertThat(result).contains(channel, "channel1", "channel3");
@@ -247,7 +247,7 @@ void pubsubMultipleChannels() {
 
     @Test
     void pubsubChannelsWithArg() {
-        Futures.await(pubsub.subscribe(channel));
+        TestFutures.awaitOrTimeout(pubsub.subscribe(channel));
         List<String> result = redis.pubsubChannels(pattern);
         assertThat(result, hasItem(channel));
     }
@@ -255,7 +255,7 @@ void pubsubChannelsWithArg() {
     @Test
     void pubsubNumsub() {
 
-        Futures.await(pubsub.subscribe(channel));
+        TestFutures.awaitOrTimeout(pubsub.subscribe(channel));
 
         Map<String, Long> result = redis.pubsubNumsub(channel);
         assertThat(result.size()).isGreaterThan(0);
@@ -265,14 +265,14 @@ void pubsubNumsub() {
     @Test
     void pubsubNumpat() {
 
-        Futures.await(pubsub.psubscribe(pattern));
+        TestFutures.awaitOrTimeout(pubsub.psubscribe(pattern));
         Long result = redis.pubsubNumpat();
         assertThat(result.longValue()).isGreaterThan(0); // Redis sometimes keeps old references
     }
 
     @Test
     void punsubscribe() throws Exception {
-        Futures.await(pubsub.punsubscribe(pattern));
+        TestFutures.awaitOrTimeout(pubsub.punsubscribe(pattern));
         assertThat(patterns.take()).isEqualTo(pattern);
         assertThat((long) counts.take()).isEqualTo(0);
 
@@ -287,13 +287,13 @@ void subscribe() throws Exception {
 
     @Test
     void unsubscribe() throws Exception {
-        Futures.await(pubsub.unsubscribe(channel));
+        TestFutures.awaitOrTimeout(pubsub.unsubscribe(channel));
         assertThat(channels.take()).isEqualTo(channel);
         assertThat((long) counts.take()).isEqualTo(0);
 
         RedisFuture<Void> future = pubsub.unsubscribe();
 
-        assertThat(Futures.get(future)).isNull();
+        assertThat(TestFutures.getOrTimeout(future)).isNull();
         assertThat(future.getError()).isNull();
 
         assertThat(channels).isEmpty();
@@ -412,15 +412,16 @@ void removeListener() throws Exception {
     @Test
     void pingNotAllowedInSubscriptionState() {
 
-        Futures.await(pubsub.subscribe(channel));
+        TestFutures.awaitOrTimeout(pubsub.subscribe(channel));
 
-        assertThatThrownBy(() -> Futures.get(pubsub.ping())).isInstanceOf(RedisException.class).hasMessageContaining(
+        assertThatThrownBy(() -> TestFutures.getOrTimeout(pubsub.ping())).isInstanceOf(RedisException.class)
+                .hasMessageContaining(
                 "not allowed");
         pubsub.unsubscribe(channel);
 
         Wait.untilTrue(() -> channels.size() == 2).waitOrTimeout();
 
-        assertThat(Futures.get(pubsub.ping())).isEqualTo("PONG");
+        assertThat(TestFutures.getOrTimeout(pubsub.ping())).isEqualTo("PONG");
     }
 
     // RedisPubSubListener implementation
diff --git a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
index 63d578b5ab..3229aeced3 100644
--- a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
@@ -41,7 +41,7 @@
 import io.lettuce.core.protocol.CommandType;
 import io.lettuce.test.ConnectionTestUtil;
 import io.lettuce.test.Delay;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.Wait;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
@@ -297,7 +297,7 @@ void commandsCancelledOnDisconnect() {
 
             connection.flushCommands();
 
-            Futures.await(incr);
+            TestFutures.awaitOrTimeout(incr);
 
         } catch (Exception e) {
             assertThat(e).hasRootCauseInstanceOf(RedisException.class).hasMessageContaining("Connection disconnected");
diff --git a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
index b8972f2b6e..28f81c70ec 100644
--- a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
@@ -32,7 +32,7 @@
 import io.lettuce.core.event.EventBus;
 import io.lettuce.core.metrics.CommandLatencyCollector;
 import io.lettuce.core.metrics.DefaultCommandLatencyCollectorOptions;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.resource.FastShutdown;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.HashedWheelTimer;
@@ -118,7 +118,7 @@ void testProvidedResources() {
         assertThat(sut.eventBus()).isSameAs(eventBusMock);
         assertThat(sut.nettyCustomizer()).isSameAs(nettyCustomizer);
 
-        assertThat(Futures.get(sut.shutdown())).isTrue();
+        assertThat(TestFutures.getOrTimeout(sut.shutdown())).isTrue();
 
         verifyZeroInteractions(executorMock);
         verifyZeroInteractions(groupProviderMock);
@@ -149,7 +149,7 @@ void mutateResources() {
         assertThat(copy.timer()).isSameAs(timerMock2).isNotSameAs(timerMock);
         assertThat(sut.eventBus()).isSameAs(eventBusMock);
 
-        assertThat(Futures.get(sut.shutdown())).isTrue();
+        assertThat(TestFutures.getOrTimeout(sut.shutdown())).isTrue();
 
         verifyZeroInteractions(executorMock);
         verifyZeroInteractions(groupProviderMock);
@@ -168,7 +168,7 @@ void testSmallPoolSize() {
         assertThat(eventLoopGroup.executorCount()).isEqualTo(3);
         assertThat(sut.ioThreadPoolSize()).isEqualTo(3);
 
-        assertThat(Futures.get(sut.shutdown(0, 0, TimeUnit.MILLISECONDS))).isTrue();
+        assertThat(TestFutures.getOrTimeout(sut.shutdown(0, 0, TimeUnit.MILLISECONDS))).isTrue();
     }
 
     @Test
@@ -181,7 +181,7 @@ void testEventBus() {
 
         StepVerifier.create(eventBus.get()).then(() -> eventBus.publish(event)).expectNext(event).thenCancel().verify();
 
-        assertThat(Futures.get(sut.shutdown(0, 0, TimeUnit.MILLISECONDS))).isTrue();
+        assertThat(TestFutures.getOrTimeout(sut.shutdown(0, 0, TimeUnit.MILLISECONDS))).isTrue();
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java b/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java
index 5ccc21eeaf..2827d74be8 100644
--- a/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java
@@ -21,7 +21,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.concurrent.Future;
 
@@ -37,10 +37,10 @@ void shutdownTerminatedEventLoopGroup() {
         NioEventLoopGroup eventLoopGroup = sut.allocate(NioEventLoopGroup.class);
 
         Future<Boolean> shutdown = sut.release(eventLoopGroup, 10, 10, TimeUnit.MILLISECONDS);
-        Futures.await(shutdown);
+        TestFutures.awaitOrTimeout(shutdown);
 
         Future<Boolean> shutdown2 = sut.release(eventLoopGroup, 10, 10, TimeUnit.MILLISECONDS);
-        Futures.await(shutdown2);
+        TestFutures.awaitOrTimeout(shutdown2);
     }
 
     @Test
@@ -48,7 +48,7 @@ void getAfterShutdown() {
 
         DefaultEventLoopGroupProvider sut = new DefaultEventLoopGroupProvider(1);
 
-        Futures.await(sut.shutdown(10, 10, TimeUnit.MILLISECONDS));
+        TestFutures.awaitOrTimeout(sut.shutdown(10, 10, TimeUnit.MILLISECONDS));
         assertThatThrownBy(() -> sut.allocate(NioEventLoopGroup.class)).isInstanceOf(IllegalStateException.class);
     }
 }
diff --git a/src/test/java/io/lettuce/core/resource/FuturesUnitTests.java b/src/test/java/io/lettuce/core/resource/FuturesUnitTests.java
deleted file mode 100644
index 34745b1d58..0000000000
--- a/src/test/java/io/lettuce/core/resource/FuturesUnitTests.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2011-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.resource;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import org.junit.jupiter.api.Test;
-
-import io.lettuce.test.Wait;
-import io.netty.util.concurrent.DefaultPromise;
-import io.netty.util.concurrent.GlobalEventExecutor;
-import io.netty.util.concurrent.ImmediateEventExecutor;
-import io.netty.util.concurrent.Promise;
-
-/**
- * @author Mark Paluch
- */
-class FuturesUnitTests {
-
-    @Test
-    void testPromise() {
-        assertThatThrownBy(() -> new Futures.PromiseAggregator(null)).isInstanceOf(IllegalArgumentException.class);
-    }
-
-    @Test
-    void notArmed() {
-
-        Futures.PromiseAggregator<Boolean, Promise<Boolean>> sut = new Futures.PromiseAggregator<>(
-                new DefaultPromise<>(ImmediateEventExecutor.INSTANCE));
-        assertThatThrownBy(() -> sut.add(new DefaultPromise<>(ImmediateEventExecutor.INSTANCE))).isInstanceOf(
-                IllegalStateException.class);
-    }
-
-    @Test
-    void expectAfterArmed() {
-        Futures.PromiseAggregator<Boolean, Promise<Boolean>> sut = new Futures.PromiseAggregator<>(
-                new DefaultPromise<>(ImmediateEventExecutor.INSTANCE));
-        sut.arm();
-
-        assertThatThrownBy(() -> sut.expectMore(1)).isInstanceOf(IllegalStateException.class);
-    }
-
-    @Test
-    void armTwice() {
-
-        Futures.PromiseAggregator<Boolean, Promise<Boolean>> sut = new Futures.PromiseAggregator<>(
-                new DefaultPromise<>(ImmediateEventExecutor.INSTANCE));
-
-        sut.arm();
-        assertThatThrownBy(sut::arm).isInstanceOf(IllegalStateException.class);
-    }
-
-    @Test
-    void regularUse() {
-
-        DefaultPromise<Boolean> target = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
-        Futures.PromiseAggregator<Boolean, Promise<Boolean>> sut = new Futures.PromiseAggregator<>(target);
-
-        sut.expectMore(1);
-        sut.arm();
-        DefaultPromise<Boolean> part = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
-        sut.add(part);
-
-        assertThat(target.isDone()).isFalse();
-
-        part.setSuccess(true);
-
-        Wait.untilTrue(target::isDone).waitOrTimeout();
-
-        assertThat(target.isDone()).isTrue();
-    }
-}
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
index 7be51d4a7b..c3257c55bc 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
@@ -35,7 +35,7 @@
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
 import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
 import io.lettuce.test.settings.TestSettings;
@@ -78,7 +78,7 @@ void testAsync() {
 
         RedisFuture<List<Map<String, String>>> future = sentinelAsync.masters();
 
-        assertThat(Futures.get(future)).isNotNull();
+        assertThat(TestFutures.getOrTimeout(future)).isNotNull();
         assertThat(future.isDone()).isTrue();
         assertThat(future.isCancelled()).isFalse();
     }
diff --git a/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java b/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java
index a8f8497a4d..83ee2cb758 100644
--- a/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java
@@ -35,7 +35,7 @@
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.StatefulRedisClusterConnectionImpl;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.resource.FastShutdown;
 import io.lettuce.test.resource.TestClientResources;
 import io.netty.channel.group.ChannelGroup;
@@ -73,8 +73,8 @@ void asyncPoolShouldWorkWithWrappedConnections() {
         borrowAndClose(pool);
         borrowAndCloseAsync(pool);
 
-        Futures.await(pool.release(Futures.get(pool.acquire()).sync().getStatefulConnection()));
-        Futures.await(pool.release(Futures.get(pool.acquire()).async().getStatefulConnection()));
+        TestFutures.awaitOrTimeout(pool.release(TestFutures.getOrTimeout(pool.acquire()).sync().getStatefulConnection()));
+        TestFutures.awaitOrTimeout(pool.release(TestFutures.getOrTimeout(pool.acquire()).async().getStatefulConnection()));
 
         assertThat(channels).hasSize(1);
 
@@ -95,9 +95,9 @@ void asyncPoolShouldCloseConnectionsAboveMaxIdleSize() {
         borrowAndReturn(pool);
         borrowAndClose(pool);
 
-        StatefulRedisConnection<String, String> c1 = Futures.get(pool.acquire());
-        StatefulRedisConnection<String, String> c2 = Futures.get(pool.acquire());
-        StatefulRedisConnection<String, String> c3 = Futures.get(pool.acquire());
+        StatefulRedisConnection<String, String> c1 = TestFutures.getOrTimeout(pool.acquire());
+        StatefulRedisConnection<String, String> c2 = TestFutures.getOrTimeout(pool.acquire());
+        StatefulRedisConnection<String, String> c3 = TestFutures.getOrTimeout(pool.acquire());
 
         assertThat(channels).hasSize(3);
 
@@ -118,7 +118,7 @@ void asyncPoolShouldWorkWithPlainConnections() {
 
         borrowAndReturn(pool);
 
-        StatefulRedisConnection<String, String> connection = Futures.get(pool.acquire());
+        StatefulRedisConnection<String, String> connection = TestFutures.getOrTimeout(pool.acquire());
         assertThat(Proxy.isProxyClass(connection.getClass())).isFalse();
         pool.release(connection);
 
@@ -131,7 +131,7 @@ void asyncPoolUsingWrappingShouldPropagateExceptionsCorrectly() {
         AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
                 () -> client.connectAsync(StringCodec.ASCII, uri), BoundedPoolConfig.create());
 
-        StatefulRedisConnection<String, String> connection = Futures.get(pool.acquire());
+        StatefulRedisConnection<String, String> connection = TestFutures.getOrTimeout(pool.acquire());
         RedisCommands<String, String> sync = connection.sync();
         sync.set(key, value);
 
@@ -152,7 +152,7 @@ void wrappedConnectionShouldUseWrappers() {
         AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
                 () -> client.connectAsync(StringCodec.ASCII, uri), BoundedPoolConfig.create());
 
-        StatefulRedisConnection<String, String> connection = Futures.get(pool.acquire());
+        StatefulRedisConnection<String, String> connection = TestFutures.getOrTimeout(pool.acquire());
         RedisCommands<String, String> sync = connection.sync();
 
         assertThat(connection).isInstanceOf(StatefulRedisConnection.class).isNotInstanceOf(
@@ -176,7 +176,7 @@ void wrappedObjectClosedAfterReturn() {
         AsyncPool<StatefulRedisConnection<String, String>> pool = AsyncConnectionPoolSupport.createBoundedObjectPool(
                 () -> client.connectAsync(StringCodec.ASCII, uri), BoundedPoolConfig.create(), true);
 
-        StatefulRedisConnection<String, String> connection = Futures.get(pool.acquire());
+        StatefulRedisConnection<String, String> connection = TestFutures.getOrTimeout(pool.acquire());
         RedisCommands<String, String> sync = connection.sync();
         sync.ping();
 
@@ -202,7 +202,7 @@ void shouldPropagateAsyncFlow() {
             return c.async().ping().whenComplete((s, throwable) -> pool.release(c));
         });
 
-        Futures.await(pingResponse);
+        TestFutures.awaitOrTimeout(pingResponse);
         assertThat(pingResponse).isCompletedWithValue("PONG");
 
         pool.close();
@@ -211,17 +211,17 @@ void shouldPropagateAsyncFlow() {
     private void borrowAndReturn(AsyncPool<StatefulRedisConnection<String, String>> pool) {
 
         for (int i = 0; i < 10; i++) {
-            StatefulRedisConnection<String, String> connection = Futures.get(pool.acquire());
+            StatefulRedisConnection<String, String> connection = TestFutures.getOrTimeout(pool.acquire());
             RedisCommands<String, String> sync = connection.sync();
             sync.ping();
-            Futures.await(pool.release(connection));
+            TestFutures.awaitOrTimeout(pool.release(connection));
         }
     }
 
     private void borrowAndClose(AsyncPool<StatefulRedisConnection<String, String>> pool) {
 
         for (int i = 0; i < 10; i++) {
-            StatefulRedisConnection<String, String> connection = Futures.get(pool.acquire());
+            StatefulRedisConnection<String, String> connection = TestFutures.getOrTimeout(pool.acquire());
             RedisCommands<String, String> sync = connection.sync();
             sync.ping();
             connection.close();
@@ -231,10 +231,10 @@ private void borrowAndClose(AsyncPool<StatefulRedisConnection<String, String>> p
     private void borrowAndCloseAsync(AsyncPool<StatefulRedisConnection<String, String>> pool) {
 
         for (int i = 0; i < 10; i++) {
-            StatefulRedisConnection<String, String> connection = Futures.get(pool.acquire());
+            StatefulRedisConnection<String, String> connection = TestFutures.getOrTimeout(pool.acquire());
             RedisCommands<String, String> sync = connection.sync();
             sync.ping();
-            Futures.get(connection.closeAsync());
+            TestFutures.getOrTimeout(connection.closeAsync());
         }
     }
 }
diff --git a/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java b/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java
index bb53305bc8..951809dcb2 100644
--- a/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java
+++ b/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java
@@ -36,7 +36,7 @@
 import org.mockito.quality.Strictness;
 
 import io.lettuce.core.RedisException;
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 
 /**
  * @author Mark Paluch
@@ -204,7 +204,7 @@ void shouldTestObjectOnBorrowSuccessfully() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnAcquire().build());
 
-        pool.release(Futures.get(pool.acquire()));
+        pool.release(TestFutures.getOrTimeout(pool.acquire()));
 
         assertThat(pool.getIdle()).isEqualTo(1);
         assertThat(pool.getObjectCount()).isEqualTo(1);
@@ -223,7 +223,7 @@ void shouldTestObjectOnBorrowFailState() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnAcquire().build());
 
-        pool.release(Futures.get(pool.acquire()));
+        pool.release(TestFutures.getOrTimeout(pool.acquire()));
 
         assertThat(pool.getIdle()).isEqualTo(1);
         assertThat(pool.getObjectCount()).isEqualTo(1);
@@ -246,7 +246,7 @@ void shouldTestObjectOnBorrowFailExceptionally() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnAcquire().build());
 
-        pool.release(Futures.get(pool.acquire()));
+        pool.release(TestFutures.getOrTimeout(pool.acquire()));
 
         assertThat(pool.getIdle()).isEqualTo(1);
         assertThat(pool.getObjectCount()).isEqualTo(1);
@@ -269,7 +269,7 @@ void shouldTestObjectOnReturnSuccessfully() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnRelease().build());
 
-        Futures.await(pool.release(Futures.get(pool.acquire())));
+        TestFutures.awaitOrTimeout(pool.release(TestFutures.getOrTimeout(pool.acquire())));
 
         assertThat(pool.getIdle()).isEqualTo(1);
         assertThat(pool.getObjectCount()).isEqualTo(1);
@@ -288,7 +288,7 @@ void shouldTestObjectOnReturnFailState() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnRelease().build());
 
-        CompletableFuture<Void> release = pool.release(Futures.get(pool.acquire()));
+        CompletableFuture<Void> release = pool.release(TestFutures.getOrTimeout(pool.acquire()));
 
         assertThat(pool.getIdle()).isZero();
         assertThat(pool.getObjectCount()).isZero();
@@ -305,7 +305,7 @@ void shouldTestObjectOnReturnFailExceptionally() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(factory, BoundedPoolConfig.builder().testOnRelease().build());
 
-        CompletableFuture<Void> release = pool.release(Futures.get(pool.acquire()));
+        CompletableFuture<Void> release = pool.release(TestFutures.getOrTimeout(pool.acquire()));
 
         assertThat(pool.getIdle()).isZero();
         assertThat(pool.getObjectCount()).isZero();
@@ -342,7 +342,7 @@ void shouldDisposeIdleObjects() {
 
         assertThat(pool.getIdle()).isEqualTo(5);
 
-        String object = Futures.get(pool.acquire());
+        String object = TestFutures.getOrTimeout(pool.acquire());
         pool.release(object);
 
         assertThat(pool.getIdle()).isEqualTo(5);
diff --git a/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java b/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java
index c37a64fc46..af3312fc9f 100644
--- a/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java
+++ b/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java
@@ -24,7 +24,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import io.lettuce.test.Futures;
+import io.lettuce.test.TestFutures;
 
 /**
  * @author Mark Paluch
@@ -57,7 +57,7 @@ void shouldCreateObject() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.create());
 
-        String object = Futures.get(pool.acquire());
+        String object = TestFutures.getOrTimeout(pool.acquire());
 
         assertThat(pool.getIdle()).isEqualTo(0);
         assertThat(object).isEqualTo("1");
@@ -79,7 +79,7 @@ void shouldCreateMaintainMinIdleObject() {
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.builder().minIdle(2)
                 .build());
 
-        Futures.await(pool.acquire());
+        TestFutures.awaitOrTimeout(pool.acquire());
 
         assertThat(pool.getIdle()).isEqualTo(2);
         assertThat(pool.getObjectCount()).isEqualTo(3);
@@ -91,7 +91,7 @@ void shouldCreateMaintainMinMaxIdleObject() {
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.builder().minIdle(2)
                 .maxTotal(2).build());
 
-        Futures.await(pool.acquire());
+        TestFutures.awaitOrTimeout(pool.acquire());
 
         assertThat(pool.getIdle()).isEqualTo(1);
         assertThat(pool.getObjectCount()).isEqualTo(2);
@@ -102,7 +102,7 @@ void shouldReturnObject() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.create());
 
-        String object = Futures.get(pool.acquire());
+        String object = TestFutures.getOrTimeout(pool.acquire());
         assertThat(pool.getObjectCount()).isEqualTo(1);
         pool.release(object);
 
@@ -114,9 +114,9 @@ void shouldReuseObjects() {
 
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.create());
 
-        pool.release(Futures.get(pool.acquire()));
+        pool.release(TestFutures.getOrTimeout(pool.acquire()));
 
-        assertThat(Futures.get(pool.acquire())).isEqualTo("1");
+        assertThat(TestFutures.getOrTimeout(pool.acquire())).isEqualTo("1");
         assertThat(pool.getIdle()).isEqualTo(0);
     }
 
@@ -128,7 +128,7 @@ void shouldDestroyIdle() {
 
         List<String> objects = new ArrayList<>();
         for (int i = 0; i < 3; i++) {
-            objects.add(Futures.get(pool.acquire()));
+            objects.add(TestFutures.getOrTimeout(pool.acquire()));
         }
 
         for (int i = 0; i < 2; i++) {
@@ -150,10 +150,10 @@ void shouldExhaustPool() {
         BoundedAsyncPool<String> pool = new BoundedAsyncPool<>(STRING_OBJECT_FACTORY, BoundedPoolConfig.builder().maxTotal(4)
                 .build());
 
-        String object1 = Futures.get(pool.acquire());
-        String object2 = Futures.get(pool.acquire());
-        String object3 = Futures.get(pool.acquire());
-        String object4 = Futures.get(pool.acquire());
+        String object1 = TestFutures.getOrTimeout(pool.acquire());
+        String object2 = TestFutures.getOrTimeout(pool.acquire());
+        String object3 = TestFutures.getOrTimeout(pool.acquire());
+        String object4 = TestFutures.getOrTimeout(pool.acquire());
 
         assertThat(pool.getIdle()).isZero();
         assertThat(pool.getObjectCount()).isEqualTo(4);
@@ -180,10 +180,10 @@ void shouldClearPool() {
 
         for (int i = 0; i < 20; i++) {
 
-            String object1 = Futures.get(pool.acquire());
-            String object2 = Futures.get(pool.acquire());
-            String object3 = Futures.get(pool.acquire());
-            String object4 = Futures.get(pool.acquire());
+            String object1 = TestFutures.getOrTimeout(pool.acquire());
+            String object2 = TestFutures.getOrTimeout(pool.acquire());
+            String object3 = TestFutures.getOrTimeout(pool.acquire());
+            String object4 = TestFutures.getOrTimeout(pool.acquire());
 
             assertThat(pool.acquire()).isCompletedExceptionally();
 
diff --git a/src/test/java/io/lettuce/test/Futures.java b/src/test/java/io/lettuce/test/TestFutures.java
similarity index 73%
rename from src/test/java/io/lettuce/test/Futures.java
rename to src/test/java/io/lettuce/test/TestFutures.java
index 333067ffdd..db31a22aa1 100644
--- a/src/test/java/io/lettuce/test/Futures.java
+++ b/src/test/java/io/lettuce/test/TestFutures.java
@@ -23,16 +23,16 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Future;
 
-import io.lettuce.core.LettuceFutures;
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.cluster.api.async.AsyncExecutions;
+import io.lettuce.core.internal.Futures;
 
 /**
  * Utility methods to synchronize and create futures.
  *
  * @author Mark Paluch
  */
-public class Futures {
+public class TestFutures {
 
     private static final Duration TIMEOUT = Duration.ofSeconds(5);
 
@@ -42,7 +42,7 @@ public class Futures {
      * @param futures
      * @return {@literal true} if all {@code futures} are {@link Future#isDone() completed}
      */
-    public static boolean areAllCompleted(Collection<? extends Future<?>> futures) {
+    public static boolean areAllDone(Collection<? extends Future<?>> futures) {
 
         for (Future<?> future : futures) {
             if (!future.isDone()) {
@@ -55,9 +55,9 @@ public static boolean areAllCompleted(Collection<? extends Future<?>> futures) {
     /**
      * Await completion for all {@link Future} guarded by the global {@link #TIMEOUT}.
      */
-    public static boolean await(Future<?> future) {
+    public static boolean awaitOrTimeout(Future<?> future) {
 
-        if (!LettuceFutures.awaitAll(TIMEOUT, future)) {
+        if (!Futures.awaitAll(TIMEOUT, future)) {
             throw new IllegalStateException("Future timeout");
         }
 
@@ -69,8 +69,8 @@ public static boolean await(Future<?> future) {
      *
      * @param executions
      */
-    public static boolean await(AsyncExecutions<?> executions) {
-        return awaitAll(Arrays.asList(executions.futures()));
+    public static boolean awaitOrTimeout(AsyncExecutions<?> executions) {
+        return awaitOrTimeout(Arrays.asList(executions.futures()));
     }
 
     /**
@@ -78,9 +78,9 @@ public static boolean await(AsyncExecutions<?> executions) {
      *
      * @param futures
      */
-    public static boolean awaitAll(Collection<? extends Future<?>> futures) {
+    public static boolean awaitOrTimeout(Collection<? extends Future<?>> futures) {
 
-        if (!LettuceFutures.awaitAll(TIMEOUT, futures.toArray(new Future[0]))) {
+        if (!io.lettuce.core.internal.Futures.awaitAll(TIMEOUT, futures.toArray(new Future[0]))) {
             throw new IllegalStateException("Future timeout");
         }
 
@@ -93,9 +93,9 @@ public static boolean awaitAll(Collection<? extends Future<?>> futures) {
      * @param future
      * @param <T>
      */
-    public static <T> T get(Future<T> future) {
+    public static <T> T getOrTimeout(Future<T> future) {
 
-        if (!LettuceFutures.awaitAll(TIMEOUT, future)) {
+        if (!Futures.await(TIMEOUT, future)) {
             throw new IllegalStateException("Future timeout");
         }
 
@@ -112,8 +112,8 @@ public static <T> T get(Future<T> future) {
      * @param future
      * @param <T>
      */
-    public static <T> T get(CompletableFuture<T> future) {
-        return get((Future<T>) future);
+    public static <T> T getOrTimeout(CompletableFuture<T> future) {
+        return getOrTimeout((Future<T>) future);
     }
 
     /**
@@ -122,8 +122,8 @@ public static <T> T get(CompletableFuture<T> future) {
      * @param completionStage
      * @param <T>
      */
-    public static <T> T get(CompletionStage<T> completionStage) {
-        return get(completionStage.toCompletableFuture());
+    public static <T> T getOrTimeout(CompletionStage<T> completionStage) {
+        return getOrTimeout(completionStage.toCompletableFuture());
     }
 
     /**
@@ -132,8 +132,8 @@ public static <T> T get(CompletionStage<T> completionStage) {
      * @param future
      * @param <T>
      */
-    public static <T> T get(RedisFuture<T> future) {
-        return get(future.toCompletableFuture());
+    public static <T> T getOrTimeout(RedisFuture<T> future) {
+        return getOrTimeout(future.toCompletableFuture());
     }
 
 }

From eee5706d53e413bc5669c387ee254f001476f8d5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 15 Nov 2019 11:01:12 +0100
Subject: [PATCH 701/808] Polishing

---
 src/main/java/io/lettuce/core/RedisClient.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 82e607d3d8..bb1118756d 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -838,7 +838,7 @@ private static void checkValidRedisURI(RedisURI redisURI) {
         } else {
 
             if (isEmpty(redisURI.getSentinelMasterId())) {
-                throw new IllegalArgumentException("TRedisURI for Redis Sentinel requires a masterId");
+                throw new IllegalArgumentException("RedisURI for Redis Sentinel requires a masterId");
             }
 
             for (RedisURI sentinel : redisURI.getSentinels()) {

From abeedcccd65511e48cf89c5c4d905458307d7d1c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 15 Nov 2019 11:01:52 +0100
Subject: [PATCH 702/808] Allow parsing of command details when running Redis 6

---
 .../io/lettuce/core/models/command/CommandDetailParser.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java b/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
index ecb1b7b853..6a24b1e4e9 100644
--- a/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
+++ b/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
@@ -76,7 +76,7 @@ public static List<CommandDetail> parse(List<?> commandOutput) {
             }
 
             Collection<?> collection = (Collection<?>) o;
-            if (collection.size() != COMMAND_INFO_SIZE) {
+            if (collection.size() < COMMAND_INFO_SIZE) {
                 continue;
             }
 

From 4ff9a07b22585b6ad4da078bd213a2b40e02d23b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Dec 2019 20:16:34 +0100
Subject: [PATCH 703/808] Translate negative Commons Pool limits to
 Integer.MAX_VALUE #1181

Lettuce now adapts negative pool limits for the async pool to Integer.MAX_VALUE when using GenericObjectPoolConfig to align with the behavior of Commons Pool 2.
---
 .../core/support/BoundedPoolConfig.java       |  6 +-
 .../support/CommonsPool2ConfigConverter.java  | 11 ++-
 .../CommonsPool2ConfigConverterUnitTests.java | 99 +++++++++++++++++++
 3 files changed, 109 insertions(+), 7 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/support/CommonsPool2ConfigConverterUnitTests.java

diff --git a/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java b/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java
index 5cc3885252..49d734185b 100644
--- a/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java
+++ b/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java
@@ -149,8 +149,7 @@ public Builder testOnRelease(boolean testOnRelease) {
 
         /**
          * Configures the maximum number of objects that can be allocated by the pool (checked out to clients, or idle awaiting
-         * checkout) at a given time. When negative, there is no limit to the number of objects that can be managed by the pool
-         * at one time.
+         * checkout) at a given time.
          *
          * @param maxTotal maximum number of objects that can be allocated by the pool.
          * @return {@code this} {@link Builder}.
@@ -179,8 +178,7 @@ public Builder maxIdle(int maxIdle) {
 
         /**
          * Configures the maximum number of objects that can be allocated by the pool (checked out to clients, or idle awaiting
-         * checkout) at a given time. When negative, there is no limit to the number of objects that can be managed by the pool
-         * at one time.
+         * checkout) at a given time.
          *
          * @param minIdle maximum number of objects that can be allocated by the pool.
          * @return {@code this} {@link Builder}.
diff --git a/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java b/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
index f4c328f73c..9919c16b29 100644
--- a/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
+++ b/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
@@ -41,8 +41,13 @@ public static BoundedPoolConfig bounded(GenericObjectPoolConfig<?> config) {
 
         LettuceAssert.notNull(config, "GenericObjectPoolConfig must not be null");
 
-        return BoundedPoolConfig.builder().maxTotal(config.getMaxTotal()).maxIdle(config.getMaxIdle())
-                .minIdle(config.getMinIdle()).testOnAcquire(config.getTestOnBorrow()).testOnCreate(config.getTestOnCreate())
-                .testOnRelease(config.getTestOnReturn()).build();
+        return BoundedPoolConfig.builder() //
+                .maxTotal(config.getMaxTotal() > 0 ? config.getMaxTotal() : Integer.MAX_VALUE)
+                .maxIdle(config.getMaxIdle() > 0 ? config.getMaxIdle() : Integer.MAX_VALUE) //
+                .minIdle(config.getMinIdle()) //
+                .testOnAcquire(config.getTestOnBorrow()) //
+                .testOnCreate(config.getTestOnCreate()) //
+                .testOnRelease(config.getTestOnReturn()) //
+                .build();
     }
 }
diff --git a/src/test/java/io/lettuce/core/support/CommonsPool2ConfigConverterUnitTests.java b/src/test/java/io/lettuce/core/support/CommonsPool2ConfigConverterUnitTests.java
new file mode 100644
index 0000000000..d4e63479da
--- /dev/null
+++ b/src/test/java/io/lettuce/core/support/CommonsPool2ConfigConverterUnitTests.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.support;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+import org.apache.commons.pool2.impl.BaseObjectPoolConfig;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link CommonsPool2ConfigConverter}.
+ *
+ * @author Mark Paluch
+ */
+class CommonsPool2ConfigConverterUnitTests {
+
+    @Test
+    void shouldAdaptConfiguration() {
+
+        GenericObjectPoolConfig<String> config = new GenericObjectPoolConfig<>();
+        config.setMinIdle(2);
+        config.setMaxIdle(12);
+        config.setMaxTotal(13);
+        config.setTestOnBorrow(true);
+        config.setTestOnReturn(true);
+        config.setTestOnCreate(true);
+
+        BoundedPoolConfig result = CommonsPool2ConfigConverter.bounded(config);
+
+        assertThat(result.getMinIdle()).isEqualTo(2);
+        assertThat(result.getMaxIdle()).isEqualTo(12);
+        assertThat(result.getMaxTotal()).isEqualTo(13);
+        assertThat(result.isTestOnAcquire()).isTrue();
+        assertThat(result.isTestOnCreate()).isTrue();
+        assertThat(result.isTestOnRelease()).isTrue();
+    }
+
+    @Test
+    void shouldConvertNegativeValuesToMaxSize() {
+
+        GenericObjectPoolConfig<String> config = new GenericObjectPoolConfig<>();
+        config.setMaxIdle(-1);
+        config.setMaxTotal(-1);
+
+        BoundedPoolConfig result = CommonsPool2ConfigConverter.bounded(config);
+
+        assertThat(result.getMaxIdle()).isEqualTo(Integer.MAX_VALUE);
+        assertThat(result.getMaxTotal()).isEqualTo(Integer.MAX_VALUE);
+    }
+
+    @Test
+    void shouldAdaptTestOnAcquire() {
+
+        booleanTester(true, BaseObjectPoolConfig::setTestOnBorrow, BasePoolConfig::isTestOnAcquire);
+        booleanTester(false, BaseObjectPoolConfig::setTestOnBorrow, BasePoolConfig::isTestOnAcquire);
+    }
+
+    @Test
+    void shouldAdaptTestOnCreate() {
+
+        booleanTester(true, BaseObjectPoolConfig::setTestOnCreate, BasePoolConfig::isTestOnCreate);
+        booleanTester(false, BaseObjectPoolConfig::setTestOnCreate, BasePoolConfig::isTestOnCreate);
+    }
+
+    @Test
+    void shouldAdaptTestOnRelease() {
+
+        booleanTester(true, BaseObjectPoolConfig::setTestOnReturn, BasePoolConfig::isTestOnRelease);
+        booleanTester(false, BaseObjectPoolConfig::setTestOnReturn, BasePoolConfig::isTestOnRelease);
+    }
+
+    static void booleanTester(boolean value, BiConsumer<GenericObjectPoolConfig<?>, Boolean> commonsConfigurer,
+            Function<BoundedPoolConfig, Boolean> targetExtractor) {
+
+        GenericObjectPoolConfig<String> config = new GenericObjectPoolConfig<>();
+
+        commonsConfigurer.accept(config, value);
+        BoundedPoolConfig result = CommonsPool2ConfigConverter.bounded(config);
+
+        assertThat(targetExtractor.apply(result)).isEqualTo(value);
+    }
+}

From 045bbc5f31747e7ea74f03e507666c13730469c1 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Dec 2019 11:27:41 +0100
Subject: [PATCH 704/808] Polishing

Fix typo. Remove superfluous allocation.
---
 src/main/java/io/lettuce/core/RedisPublisher.java           | 3 ---
 src/main/java/io/lettuce/core/resource/ClientResources.java | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index 1a70c950cd..9f5f49dd47 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -18,7 +18,6 @@
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Queue;
-import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import java.util.concurrent.atomic.AtomicReference;
@@ -32,7 +31,6 @@
 import reactor.core.CoreSubscriber;
 import reactor.core.Exceptions;
 import reactor.util.context.Context;
-import sun.rmi.runtime.Log;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.internal.LettuceAssert;
@@ -161,7 +159,6 @@ static class RedisSubscription<T> extends StreamingOutput.Subscriber<T> implemen
         final RedisCommand<?, ?, T> command;
         final boolean dissolve;
         private final Executor executor;
-        final ArrayBlockingQueue<Log> logs = new ArrayBlockingQueue<>(1024 * 4);
 
         // accessed via AtomicLongFieldUpdater
         @SuppressWarnings("unused")
diff --git a/src/main/java/io/lettuce/core/resource/ClientResources.java b/src/main/java/io/lettuce/core/resource/ClientResources.java
index 6697652199..5ccb6bd7a6 100644
--- a/src/main/java/io/lettuce/core/resource/ClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/ClientResources.java
@@ -231,7 +231,7 @@ interface Builder {
      * Returns a builder to create new {@link ClientResources} whose settings are replicated from the current
      * {@link ClientResources}.
      *
-     * @return a a {@link ClientResources.Builder} to create new {@link ClientResources} whose settings are replicated from the
+     * @return a {@link ClientResources.Builder} to create new {@link ClientResources} whose settings are replicated from the
      *         current {@link ClientResources}
      *
      * @since 5.1

From cb665e0ab8cc4bac02657a2f204fc2745e34fe51 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Dec 2019 11:27:28 +0100
Subject: [PATCH 705/808] Add mutate method to SocketOptions #1193

---
 .../java/io/lettuce/core/SocketOptions.java   | 20 +++++++++++++++
 .../lettuce/core/SocketOptionsUnitTests.java  | 25 ++++++++++++++++---
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/SocketOptions.java b/src/main/java/io/lettuce/core/SocketOptions.java
index 88d4bc2999..8505a0b45e 100644
--- a/src/main/java/io/lettuce/core/SocketOptions.java
+++ b/src/main/java/io/lettuce/core/SocketOptions.java
@@ -164,6 +164,26 @@ public SocketOptions build() {
         }
     }
 
+    /**
+     * Returns a builder to create new {@link SocketOptions} whose settings are replicated from the current
+     * {@link SocketOptions}.
+     *
+     * @return a {@link SocketOptions.Builder} to create new {@link SocketOptions} whose settings are replicated from the
+     *         current {@link SocketOptions}
+     *
+     * @since 5.3
+     */
+    public SocketOptions.Builder mutate() {
+
+        SocketOptions.Builder builder = builder();
+
+        builder.connectTimeout = this.getConnectTimeout();
+        builder.keepAlive = this.isKeepAlive();
+        builder.tcpNoDelay = this.isTcpNoDelay();
+
+        return builder;
+    }
+
     /**
      * Returns the connection timeout.
      *
diff --git a/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java b/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java
index 4c3a028553..8f1af010ec 100644
--- a/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java
@@ -23,6 +23,8 @@
 import org.junit.jupiter.api.Test;
 
 /**
+ * Unit tests for {@link SocketOptions}.
+ *
  * @author Mark Paluch
  */
 class SocketOptionsUnitTests {
@@ -38,19 +40,34 @@ void testBuilder() {
         SocketOptions sut = SocketOptions.builder().connectTimeout(1, TimeUnit.MINUTES).keepAlive(true).tcpNoDelay(true)
                 .build();
 
-        assertThat(sut.isKeepAlive()).isEqualTo(true);
-        assertThat(sut.isTcpNoDelay()).isEqualTo(true);
+        assertThat(sut.isKeepAlive()).isTrue();
+        assertThat(sut.isTcpNoDelay()).isTrue();
         assertThat(sut.getConnectTimeout()).isEqualTo(Duration.ofMinutes(1));
     }
 
+    @Test
+    void mutateShouldConfigureNewOptions() {
+
+        SocketOptions sut = SocketOptions.builder().connectTimeout(Duration.ofSeconds(1)).keepAlive(true).tcpNoDelay(true)
+                .build();
+
+        SocketOptions reconfigured = sut.mutate().tcpNoDelay(false).build();
+
+        assertThat(sut.isKeepAlive()).isTrue();
+        assertThat(sut.isTcpNoDelay()).isTrue();
+        assertThat(sut.getConnectTimeout()).isEqualTo(Duration.ofSeconds(1));
+
+        assertThat(reconfigured.isTcpNoDelay()).isFalse();
+    }
+
     @Test
     void testCopy() {
         checkAssertions(SocketOptions.copyOf(SocketOptions.builder().build()));
     }
 
     void checkAssertions(SocketOptions sut) {
-        assertThat(sut.isKeepAlive()).isEqualTo(false);
-        assertThat(sut.isTcpNoDelay()).isEqualTo(false);
+        assertThat(sut.isKeepAlive()).isFalse();
+        assertThat(sut.isTcpNoDelay()).isFalse();
         assertThat(sut.getConnectTimeout()).isEqualTo(Duration.ofSeconds(10));
     }
 }

From 061ed4cf3d7e0bd32174764ab56a6494afcdbc5f Mon Sep 17 00:00:00 2001
From: Amin Mohtashami <ammohtas@microsoft.com>
Date: Thu, 26 Dec 2019 11:36:23 +0100
Subject: [PATCH 706/808] Allow client to pick a specific TLS version for Redis
 connection #1167

SslOptions allows configuration of protocols and ciperSuites.
---
 .../io/lettuce/core/SslConnectionBuilder.java |  8 +++
 src/main/java/io/lettuce/core/SslOptions.java | 66 +++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/src/main/java/io/lettuce/core/SslConnectionBuilder.java b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
index fa0652426c..a13f0e14b4 100644
--- a/src/main/java/io/lettuce/core/SslConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
@@ -113,6 +113,14 @@ protected void initChannel(Channel channel) throws Exception {
 
             SSLParameters sslParams = new SSLParameters();
 
+            if (sslOptions.getProtocols() != null && sslOptions.getProtocols().length != 0) {
+                sslParams.setProtocols(sslOptions.getProtocols());
+            }
+
+            if (sslOptions.getCipherSuites() != null && sslOptions.getCipherSuites().length != 0) {
+                sslParams.setCipherSuites(sslOptions.getCipherSuites());
+            }
+
             SslContextBuilder sslContextBuilder = SslContextBuilder.forClient().sslProvider(sslOptions.getSslProvider());
             if (redisURI.isVerifyPeer()) {
                 sslParams.setEndpointIdentificationAlgorithm("HTTPS");
diff --git a/src/main/java/io/lettuce/core/SslOptions.java b/src/main/java/io/lettuce/core/SslOptions.java
index e993848bfb..2f19abd60f 100644
--- a/src/main/java/io/lettuce/core/SslOptions.java
+++ b/src/main/java/io/lettuce/core/SslOptions.java
@@ -39,6 +39,8 @@ public class SslOptions {
     private final char[] keystorePassword;
     private final URL truststore;
     private final char[] truststorePassword;
+    private final String[] protocols;
+    private final String[] cipherSuites;
 
     protected SslOptions(Builder builder) {
         this.sslProvider = builder.sslProvider;
@@ -46,6 +48,8 @@ protected SslOptions(Builder builder) {
         this.keystorePassword = builder.keystorePassword;
         this.truststore = builder.truststore;
         this.truststorePassword = builder.truststorePassword;
+        this.protocols = builder.protocols;
+        this.cipherSuites = builder.cipherSuites;
     }
 
     protected SslOptions(SslOptions original) {
@@ -54,6 +58,8 @@ protected SslOptions(SslOptions original) {
         this.keystorePassword = original.keystorePassword;
         this.truststore = original.getTruststore();
         this.truststorePassword = original.getTruststorePassword();
+        this.protocols = original.protocols;
+        this.cipherSuites = original.cipherSuites;
     }
 
     /**
@@ -94,6 +100,8 @@ public static class Builder {
         private char[] keystorePassword = new char[0];
         private URL truststore;
         private char[] truststorePassword = new char[0];
+        private String[] protocols = null;
+        private String[] cipherSuites = null;
 
         private Builder() {
         }
@@ -276,6 +284,50 @@ public Builder truststore(URL truststore, String truststorePassword) {
             return this;
         }
 
+        /**
+         * Sets the protocol used for the TCP connection established to Redis Server.
+         *
+         * @param String[] list of desired protocols to use.
+         * @return {@code this}
+         */
+        public Builder protocols(String[] protocols) {
+            this.protocols = protocols;
+            return this;
+        }
+
+        /**
+         * Sets only one protocol for the TCP connection
+         *
+         * @param String one protocol {"TLSv1.2", "TLSv1.1", "TLSv1"}
+         * @return [@code this}
+         */
+        public Builder protocols(String protocol) {
+            this.protocols = new String[] { protocol };
+            return this;
+        }
+
+        /**
+         * Sets the cipher suites for the TCP connection established to Redis Server.
+         *
+         * @param String[] list of desired cipher suites
+         * @return {@code this}
+         */
+        public Builder cipherSuites(String[] cipherSuites) {
+            this.cipherSuites = cipherSuites;
+            return this;
+        }
+
+        /**
+         * Sets only cipher suite for the TCP connection
+         *
+         * @param String one protocol
+         * @return [@code this}
+         */
+        public Builder cipherSuites(String cipherSuites) {
+            this.cipherSuites = new String[] { cipherSuites };
+            return this;
+        }
+
         /**
          * Create a new instance of {@link SslOptions}
          *
@@ -300,6 +352,20 @@ public URL getKeystore() {
         return keystore;
     }
 
+    /**
+     * @return the set of protocols
+     */
+    public String[] getProtocols() {
+        return protocols;
+    }
+
+    /**
+     * @return the set of cipher suites
+     */
+    public String[] getCipherSuites() {
+        return cipherSuites;
+    }
+
     /**
      * @return the password for the keystore. May be empty.
      */

From 7c78b7969b0568f7ab327d6efc28df4973e676c6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Dec 2019 11:26:53 +0100
Subject: [PATCH 707/808] Polishing #1167
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace String/String-array overloads with varargs method. Allow configuration of keys and certificates in PEM format. Move channel initialization into doInitialize(…) method.

Add author tags.
---
 .../lettuce/core/PlainChannelInitializer.java |   8 +-
 .../io/lettuce/core/SslConnectionBuilder.java |  78 +--
 src/main/java/io/lettuce/core/SslOptions.java | 556 +++++++++++++++---
 .../io/lettuce/core/SslIntegrationTests.java  |  39 +-
 .../io/lettuce/core/SslOptionsUnitTests.java  |  91 +++
 5 files changed, 621 insertions(+), 151 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/SslOptionsUnitTests.java

diff --git a/src/main/java/io/lettuce/core/PlainChannelInitializer.java b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
index 95847b3d03..965e2d491a 100644
--- a/src/main/java/io/lettuce/core/PlainChannelInitializer.java
+++ b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
@@ -59,6 +59,10 @@ class PlainChannelInitializer extends io.netty.channel.ChannelInitializer<Channe
 
     @Override
     protected void initChannel(Channel channel) throws Exception {
+        doInitialize(channel);
+    }
+
+    private void doInitialize(Channel channel) {
 
         if (channel.pipeline().get("channelActivator") == null) {
 
@@ -138,8 +142,8 @@ static void pingBeforeActivate(AsyncCommand<?, ?, ?> cmd, CompletableFuture<Bool
                 return;
             }
 
-            initializedFuture.completeExceptionally(ExceptionFactory.createTimeoutException(
-                    "Cannot initialize channel (PING before activate)", timeout));
+            initializedFuture.completeExceptionally(
+                    ExceptionFactory.createTimeoutException("Cannot initialize channel (PING before activate)", timeout));
         };
 
         Timeout timeoutHandle = clientResources.timer().newTimeout(t -> {
diff --git a/src/main/java/io/lettuce/core/SslConnectionBuilder.java b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
index a13f0e14b4..c1e806fad9 100644
--- a/src/main/java/io/lettuce/core/SslConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
@@ -20,18 +20,16 @@
 import static io.lettuce.core.PlainChannelInitializer.pingBeforeActivate;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
 import java.time.Duration;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
 
-import javax.net.ssl.*;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLParameters;
 
 import io.lettuce.core.event.connection.ConnectedEvent;
 import io.lettuce.core.event.connection.ConnectionActivatedEvent;
@@ -53,6 +51,7 @@
  * Connection builder for SSL connections. This class is part of the internal API.
  *
  * @author Mark Paluch
+ * @author Amin Mohtashami
  */
 public class SslConnectionBuilder extends ConnectionBuilder {
 
@@ -110,38 +109,20 @@ public SslChannelInitializer(Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier
 
         @Override
         protected void initChannel(Channel channel) throws Exception {
+            doInitialize(channel);
+        }
 
-            SSLParameters sslParams = new SSLParameters();
-
-            if (sslOptions.getProtocols() != null && sslOptions.getProtocols().length != 0) {
-                sslParams.setProtocols(sslOptions.getProtocols());
-            }
+        private void doInitialize(Channel channel) throws IOException, GeneralSecurityException {
 
-            if (sslOptions.getCipherSuites() != null && sslOptions.getCipherSuites().length != 0) {
-                sslParams.setCipherSuites(sslOptions.getCipherSuites());
-            }
+             SSLParameters sslParams = sslOptions.createSSLParameters();
+            SslContextBuilder sslContextBuilder = sslOptions.createSslContextBuilder();
 
-            SslContextBuilder sslContextBuilder = SslContextBuilder.forClient().sslProvider(sslOptions.getSslProvider());
             if (redisURI.isVerifyPeer()) {
                 sslParams.setEndpointIdentificationAlgorithm("HTTPS");
             } else {
                 sslContextBuilder.trustManager(InsecureTrustManagerFactory.INSTANCE);
             }
 
-            if (sslOptions.getKeystore() != null) {
-                try (InputStream is = sslOptions.getKeystore().openStream()) {
-                    sslContextBuilder.keyManager(createKeyManagerFactory(is,
-                            sslOptions.getKeystorePassword().length == 0 ? null : sslOptions.getKeystorePassword()));
-                }
-            }
-
-            if (sslOptions.getTruststore() != null) {
-                try (InputStream is = sslOptions.getTruststore().openStream()) {
-                    sslContextBuilder.trustManager(createTrustManagerFactory(is,
-                            sslOptions.getTruststorePassword().length == 0 ? null : sslOptions.getTruststorePassword()));
-                }
-            }
-
             SslContext sslContext = sslContextBuilder.build();
 
             SSLEngine sslEngine = sslContext.newEngine(channel.alloc(), redisURI.getHost(), redisURI.getPort());
@@ -181,8 +162,8 @@ public CompletableFuture<Boolean> channelInitialized() {
                     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
 
                         if (!initializedFuture.isDone()) {
-                            initializedFuture.completeExceptionally(new RedisConnectionException(
-                                    "Connection closed prematurely"));
+                            initializedFuture
+                                    .completeExceptionally(new RedisConnectionException("Connection closed prematurely"));
                         }
 
                         initializedFuture = new CompletableFuture<>();
@@ -245,40 +226,5 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
         public CompletableFuture<Boolean> channelInitialized() {
             return initializedFuture;
         }
-
-        private static KeyManagerFactory createKeyManagerFactory(InputStream inputStream, char[] storePassword)
-                throws GeneralSecurityException, IOException {
-
-            KeyStore keyStore = getKeyStore(inputStream, storePassword);
-
-            KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-            keyManagerFactory.init(keyStore, storePassword == null ? new char[0] : storePassword);
-
-            return keyManagerFactory;
-        }
-
-        private static KeyStore getKeyStore(InputStream inputStream, char[] storePassword) throws KeyStoreException,
-                IOException, NoSuchAlgorithmException, CertificateException {
-            KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-
-            try {
-                keyStore.load(inputStream, storePassword);
-            } finally {
-                inputStream.close();
-            }
-            return keyStore;
-        }
-
-        private static TrustManagerFactory createTrustManagerFactory(InputStream inputStream, char[] storePassword)
-                throws GeneralSecurityException, IOException {
-
-            KeyStore trustStore = getKeyStore(inputStream, storePassword);
-
-            TrustManagerFactory trustManagerFactory = TrustManagerFactory
-                    .getInstance(TrustManagerFactory.getDefaultAlgorithm());
-            trustManagerFactory.init(trustStore);
-
-            return trustManagerFactory;
-        }
     }
 }
diff --git a/src/main/java/io/lettuce/core/SslOptions.java b/src/main/java/io/lettuce/core/SslOptions.java
index 2f19abd60f..02a230e562 100644
--- a/src/main/java/io/lettuce/core/SslOptions.java
+++ b/src/main/java/io/lettuce/core/SslOptions.java
@@ -16,24 +16,40 @@
 package io.lettuce.core;
 
 import java.io.File;
-import java.net.MalformedURLException;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
 import java.util.Arrays;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLParameters;
+import javax.net.ssl.TrustManagerFactory;
 
 import io.lettuce.core.internal.LettuceAssert;
 import io.netty.handler.ssl.OpenSsl;
+import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.SslProvider;
 
 /**
  * Options to configure SSL options for the connections kept to Redis servers.
  *
  * @author Mark Paluch
+ * @author Amin Mohtashami
  * @since 4.3
  */
 public class SslOptions {
 
     public static final SslProvider DEFAULT_SSL_PROVIDER = SslProvider.JDK;
 
+    private final String keyStoreType;
     private final SslProvider sslProvider;
     private final URL keystore;
     private final char[] keystorePassword;
@@ -42,24 +58,44 @@ public class SslOptions {
     private final String[] protocols;
     private final String[] cipherSuites;
 
+    private final Consumer<SslContextBuilder> sslContextBuilderCustomizer;
+    private final Supplier<SSLParameters> sslParametersSupplier;
+
+    private final KeystoreAction keymanager;
+    private final KeystoreAction trustmanager;
+
     protected SslOptions(Builder builder) {
+        this.keyStoreType = builder.keyStoreType;
         this.sslProvider = builder.sslProvider;
         this.keystore = builder.keystore;
         this.keystorePassword = builder.keystorePassword;
         this.truststore = builder.truststore;
         this.truststorePassword = builder.truststorePassword;
+
         this.protocols = builder.protocols;
         this.cipherSuites = builder.cipherSuites;
+
+        this.sslContextBuilderCustomizer = builder.sslContextBuilderCustomizer;
+        this.sslParametersSupplier = builder.sslParametersSupplier;
+        this.keymanager = builder.keymanager;
+        this.trustmanager = builder.trustmanager;
     }
 
     protected SslOptions(SslOptions original) {
+        this.keyStoreType = original.keyStoreType;
         this.sslProvider = original.getSslProvider();
         this.keystore = original.keystore;
         this.keystorePassword = original.keystorePassword;
         this.truststore = original.getTruststore();
         this.truststorePassword = original.getTruststorePassword();
+
         this.protocols = original.protocols;
         this.cipherSuites = original.cipherSuites;
+
+        this.sslContextBuilderCustomizer = original.sslContextBuilderCustomizer;
+        this.sslParametersSupplier = original.sslParametersSupplier;
+        this.keymanager = original.keymanager;
+        this.trustmanager = original.trustmanager;
     }
 
     /**
@@ -96,16 +132,40 @@ public static SslOptions create() {
     public static class Builder {
 
         private SslProvider sslProvider = DEFAULT_SSL_PROVIDER;
+
+        private String keyStoreType;
         private URL keystore;
         private char[] keystorePassword = new char[0];
         private URL truststore;
         private char[] truststorePassword = new char[0];
         private String[] protocols = null;
         private String[] cipherSuites = null;
+        private Consumer<SslContextBuilder> sslContextBuilderCustomizer = contextBuilder -> {
+
+        };
+        private Supplier<SSLParameters> sslParametersSupplier = SSLParameters::new;
+
+        private KeystoreAction keymanager = KeystoreAction.NO_OP;
+        private KeystoreAction trustmanager = KeystoreAction.NO_OP;
 
         private Builder() {
         }
 
+        /**
+         * Sets the cipher suites to use.
+         *
+         * @param cipherSuites cipher suites to use.
+         * @return {@code this}
+         * @since 5.3
+         */
+        public Builder cipherSuites(String... cipherSuites) {
+
+            LettuceAssert.notNull(cipherSuites, "Cipher suites must not be null");
+
+            this.cipherSuites = cipherSuites;
+            return this;
+        }
+
         /**
          * Use the JDK SSL provider for SSL connections.
          *
@@ -116,8 +176,8 @@ public Builder jdkSslProvider() {
         }
 
         /**
-         * Use the OpenSSL provider for SSL connections. The OpenSSL provider requires the <a
-         * href="http://netty.io/wiki/forked-tomcat-native.html">{@code netty-tcnative}</a> dependency with the OpenSSL JNI
+         * Use the OpenSSL provider for SSL connections. The OpenSSL provider requires the
+         * <a href="http://netty.io/wiki/forked-tomcat-native.html">{@code netty-tcnative}</a> dependency with the OpenSSL JNI
          * binary.
          *
          * @return {@code this}
@@ -140,10 +200,24 @@ private Builder sslProvider(SslProvider sslProvider) {
             return this;
         }
 
+        /**
+         * Sets the KeyStore type. Defaults to {@link KeyStore#getDefaultType()} if not set.
+         *
+         * @param keyStoreType the keystore type to use, must not be {@literal null}.
+         * @return {@code this}
+         * @since 5.3
+         */
+        public Builder keyStoreType(String keyStoreType) {
+
+            LettuceAssert.notNull(keyStoreType, "KeyStoreType must not be null");
+            this.keyStoreType = keyStoreType;
+            return this;
+        }
+
         /**
          * Sets the Keystore file to load client certificates. The key store file must be supported by
-         * {@link java.security.KeyStore} which is {@code jks} by default. Keystores are reloaded on each connection attempt
-         * that allows to replace certificates during runtime.
+         * {@link java.security.KeyStore} which is {@link KeyStore#getDefaultType()} by default. The keystore is reloaded on
+         * each connection attempt that allows to replace certificates during runtime.
          *
          * @param keystore the keystore file, must not be {@literal null}.
          * @return {@code this}
@@ -154,9 +228,9 @@ public Builder keystore(File keystore) {
         }
 
         /**
-         * Sets the Keystore file to load client certificates. The key store file must be supported by
-         * {@link java.security.KeyStore} which is {@code jks} by default. Keystores are reloaded on each connection attempt
-         * that allows to replace certificates during runtime.
+         * Sets the Keystore file to load client certificates. The keystore file must be supported by
+         * {@link java.security.KeyStore} which is {@link KeyStore#getDefaultType()} by default. The keystore is reloaded on
+         * each connection attempt that allows to replace certificates during runtime.
          *
          * @param keystore the keystore file, must not be {@literal null}.
          * @param keystorePassword the keystore password. May be empty to omit password and the keystore integrity check.
@@ -167,35 +241,30 @@ public Builder keystore(File keystore, char[] keystorePassword) {
 
             LettuceAssert.notNull(keystore, "Keystore must not be null");
             LettuceAssert.isTrue(keystore.exists(), () -> String.format("Keystore file %s does not exist", truststore));
-            LettuceAssert.isTrue(keystore.isFile(), () -> String.format("Keystore file %s is not a file", truststore));
+            LettuceAssert.isTrue(keystore.isFile(), () -> String.format("Keystore %s is not a file", truststore));
 
-            try {
-                return keystore(keystore.toURI().toURL(), keystorePassword);
-            } catch (MalformedURLException e) {
-                throw new IllegalArgumentException(e);
-            }
+            return keystore(Resource.from(keystore), keystorePassword);
         }
 
         /**
-         * Sets the Keystore resource to load client certificates. The trust store file must be supported by
-         * {@link java.security.KeyStore} which is {@code jks} by default. Keystore are reloaded on each connection attempt that
-         * allows to replace certificates during runtime.
+         * Sets the Keystore resource to load client certificates. The keystore file must be supported by
+         * {@link java.security.KeyStore} which is {@link KeyStore#getDefaultType()} by default. The keystore is reloaded on
+         * each connection attempt that allows to replace certificates during runtime.
          *
-         * @param keystore the keystore file, must not be {@literal null}.
+         * @param keystore the keystore URL, must not be {@literal null}.
          * @return {@code this}
          * @since 4.4
          */
         public Builder keystore(URL keystore) {
-            return keystore(keystore, new char[0]);
+            return keystore(keystore, null);
         }
 
         /**
-         * Sets the Keystore resource to load client certificates. The trust store file must be supported by
-         * {@link java.security.KeyStore} which is {@code jks} by default. Keystores are reloaded on each connection attempt
-         * that allows to replace certificates during runtime.
+         * Sets the Keystore resource to load client certificates. The keystore file must be supported by
+         * {@link java.security.KeyStore} which is {@link KeyStore#getDefaultType()} by default. The keystore is reloaded on
+         * each connection attempt that allows to replace certificates during runtime.
          *
          * @param keystore the keystore file, must not be {@literal null}.
-         * @param keystorePassword the keystore password. May be empty to omit password and the keystore integrity check.
          * @return {@code this}
          * @since 4.4
          */
@@ -205,31 +274,134 @@ public Builder keystore(URL keystore, char[] keystorePassword) {
 
             this.keystore = keystore;
 
-            if (keystorePassword != null) {
-                this.keystorePassword = Arrays.copyOf(keystorePassword, keystorePassword.length);
-            } else {
-                this.keystorePassword = new char[0];
-            }
+            return keystore(Resource.from(keystore), keystorePassword);
+        }
 
-            return this;
+        /**
+         * Sets the key file and its certificate to use for client authentication. The key is reloaded on each connection
+         * attempt that allows to replace certificates during runtime.
+         *
+         * @param keyCertChainFile an X.509 certificate chain file in PEM format.
+         * @param keyFile a PKCS#8 private key file in PEM format.
+         * @param keyPassword the password of the {@code keyFile}, or {@literal null} if it's not password-protected.
+         * @return {@code this}
+         * @since 5.3
+         */
+        public Builder keyManager(File keyCertChainFile, File keyFile, char[] keyPassword) {
+
+            LettuceAssert.notNull(keyCertChainFile, "Key certificate file must not be null");
+            LettuceAssert.notNull(keyFile, "Key file must not be null");
+            LettuceAssert.isTrue(keyCertChainFile.exists(),
+                    () -> String.format("Key certificate file %s does not exist", keyCertChainFile));
+            LettuceAssert.isTrue(keyCertChainFile.isFile(),
+                    () -> String.format("Key certificate %s is not a file", keyCertChainFile));
+            LettuceAssert.isTrue(keyFile.exists(), () -> String.format("Key file %s does not exist", keyFile));
+            LettuceAssert.isTrue(keyFile.isFile(), () -> String.format("Key %s is not a file", keyFile));
+
+            return keyManager(Resource.from(keyCertChainFile), Resource.from(keyFile), keyPassword);
         }
 
         /**
-         * Sets the Truststore file to load trusted certificates. The trust store file must be supported by
-         * {@link java.security.KeyStore} which is {@code jks} by default. Truststores are reloaded on each connection attempt
+         * Sets the key and its certificate to use for client authentication. The key is reloaded on each connection attempt
          * that allows to replace certificates during runtime.
          *
+         * @param keyCertChain an {@link Resource} for a X.509 certificate chain in PEM format.
+         * @param key an {@link Resource} for a PKCS#8 private key in PEM format.
+         * @param keyPassword the password of the {@code keyFile}, or {@literal null} if it's not password-protected.
+         * @return {@code this}
+         * @since 5.3
+         * @see Resource
+         */
+        public Builder keyManager(Resource keyCertChain, Resource key, char[] keyPassword) {
+
+            LettuceAssert.notNull(keyCertChain, "KeyChain InputStreamProvider must not be null");
+            LettuceAssert.notNull(key, "Key InputStreamProvider must not be null");
+
+            char[] passwordToUse = getPassword(keyPassword);
+            this.keymanager = (builder, keyStoreType) -> {
+
+                try (InputStream keyCertChainIs = keyCertChain.get(); InputStream keyIs = key.get()) {
+                    builder.keyManager(keyCertChainIs, keyIs,
+                            passwordToUse == null || passwordToUse.length == 0 ? null : new String(passwordToUse));
+                }
+            };
+
+            return this;
+        }
+
+        /**
+         * Sets the {@link KeyManagerFactory}.
+         *
+         * @param keyManagerFactory the {@link KeyManagerFactory} to use.
+         * @return {@code this}
+         * @since 5.3
+         */
+        public Builder keyManager(KeyManagerFactory keyManagerFactory) {
+
+            LettuceAssert.notNull(keyManagerFactory, "KeyManagerFactory must not be null");
+
+            this.keymanager = (builder, keyStoreType) -> builder.keyManager(keyManagerFactory);
+
+            return this;
+        }
+
+        /**
+         * Sets the Java Keystore resource to load client certificates. The keystore file must be supported by
+         * {@link java.security.KeyStore} which is {@link KeyStore#getDefaultType()} by default. The keystore is reloaded on
+         * each connection attempt that allows to replace certificates during runtime.
+         *
+         * @param resource the provider that opens a {@link InputStream} to the keystore file, must not be {@literal null}.
+         * @param keystorePassword the keystore password. May be empty to omit password and the keystore integrity check.
+         * @return {@code this}
+         * @since 5.3
+         */
+        public Builder keystore(Resource resource, char[] keystorePassword) {
+
+            LettuceAssert.notNull(resource, "Keystore InputStreamProvider must not be null");
+
+            char[] keystorePasswordToUse = getPassword(keystorePassword);
+            this.keystorePassword = keystorePasswordToUse;
+            this.keymanager = (builder, keyStoreType) -> {
+
+                try (InputStream is = resource.get()) {
+                    builder.keyManager(createKeyManagerFactory(is, keystorePasswordToUse, keyStoreType));
+                }
+            };
+
+            return this;
+        }
+
+        /**
+         * Sets the protocol used for the connection established to Redis Server, such as {@code TLSv1.2, TLSv1.1, TLSv1}.
+         *
+         * @param protocols list of desired protocols to use.
+         * @return {@code this}
+         * @since 5.3
+         */
+        public Builder protocols(String... protocols) {
+
+            LettuceAssert.notNull(protocols, "Protocols  must not be null");
+
+            this.protocols = protocols;
+            return this;
+        }
+
+        /**
+         * Sets the Truststore file to load trusted certificates. The truststore file must be supported by
+         * {@link java.security.KeyStore} which is {@link KeyStore#getDefaultType()} by default. The truststore is reloaded on
+         * each connection attempt that allows to replace certificates during runtime.
+         *
          * @param truststore the truststore file, must not be {@literal null}.
          * @return {@code this}
          */
         public Builder truststore(File truststore) {
-            return truststore(truststore, "");
+            return truststore(truststore, null);
         }
 
         /**
-         * Sets the Truststore file to load trusted certificates. The trust store file must be supported by
-         * {@link java.security.KeyStore} which is {@code jks} by default. Truststores are reloaded on each connection attempt
-         * that allows to replace certificates during runtime.
+         * Sets the Truststore file to load trusted certificates. The truststore file must be supported by
+         * {@link java.security.KeyStore} which is {@link KeyStore#getDefaultType()} by default. The truststore is reloaded on
+         * each connection attempt that allows to replace certificates during runtime.
          *
          * @param truststore the truststore file, must not be {@literal null}.
          * @param truststorePassword the truststore password. May be empty to omit password and the truststore integrity check.
@@ -241,29 +413,25 @@ public Builder truststore(File truststore, String truststorePassword) {
             LettuceAssert.isTrue(truststore.exists(), () -> String.format("Truststore file %s does not exist", truststore));
             LettuceAssert.isTrue(truststore.isFile(), () -> String.format("Truststore file %s is not a file", truststore));
 
-            try {
-                return truststore(truststore.toURI().toURL(), truststorePassword);
-            } catch (MalformedURLException e) {
-                throw new IllegalArgumentException(e);
-            }
+            return truststore(Resource.from(truststore), getPassword(truststorePassword));
         }
 
         /**
-         * Sets the Truststore resource to load trusted certificates. The trust store file must be supported by
-         * {@link java.security.KeyStore} which is {@code jks} by default. Truststores are reloaded on each connection attempt
-         * that allows to replace certificates during runtime.
+         * Sets the Truststore resource to load trusted certificates. The truststore resource must be supported by
+         * {@link java.security.KeyStore} which is {@link KeyStore#getDefaultType()} by default. The truststore is reloaded on
+         * each connection attempt that allows to replace certificates during runtime.
          *
          * @param truststore the truststore file, must not be {@literal null}.
          * @return {@code this}
          */
         public Builder truststore(URL truststore) {
-            return truststore(truststore, "");
+            return truststore(truststore, null);
         }
 
         /**
-         * Sets the Truststore resource to load trusted certificates. The trust store file must be supported by
-         * {@link java.security.KeyStore} which is {@code jks} by default. Truststores are reloaded on each connection attempt
-         * that allows to replace certificates during runtime.
+         * Sets the Truststore resource to load trusted certificates. The truststore resource must be supported by
+         * {@link java.security.KeyStore} which is {@link KeyStore#getDefaultType()} by default. The truststore is reloaded on
+         * each connection attempt that allows to replace certificates during runtime.
          *
          * @param truststore the truststore file, must not be {@literal null}.
          * @param truststorePassword the truststore password. May be empty to omit password and the truststore integrity check.
@@ -275,56 +443,120 @@ public Builder truststore(URL truststore, String truststorePassword) {
 
             this.truststore = truststore;
 
-            if (LettuceStrings.isNotEmpty(truststorePassword)) {
-                this.truststorePassword = truststorePassword.toCharArray();
-            } else {
-                this.truststorePassword = new char[0];
-            }
+            return truststore(Resource.from(truststore), getPassword(truststorePassword));
+        }
+
+        /**
+         * Sets the certificate file to load trusted certificates. The file must provide X.509 certificates in PEM format.
+         * Certificates are reloaded on each connection attempt that allows to replace certificates during runtime.
+         *
+         * @param certCollection the X.509 certificate collection in PEM format.
+         * @return {@code this}
+         * @since 5.3
+         */
+        public Builder trustManager(File certCollection) {
+
+            LettuceAssert.notNull(certCollection, "Certificate collection must not be null");
+            LettuceAssert.isTrue(certCollection.exists(),
+                    () -> String.format("Certificate collection file %s does not exist", certCollection));
+            LettuceAssert.isTrue(certCollection.isFile(),
+                    () -> String.format("Certificate collection %s is not a file", certCollection));
+
+            return trustManager(Resource.from(certCollection));
+        }
+
+        /**
+         * Sets the certificate resource to load trusted certificates. The file must provide X.509 certificates in PEM format.
+         * Certificates are reloaded on each connection attempt that allows to replace certificates during runtime.
+         *
+         * @param certCollection the X.509 certificate collection in PEM format.
+         * @return {@code this}
+         * @since 5.3
+         */
+        public Builder trustManager(Resource certCollection) {
+
+            LettuceAssert.notNull(certCollection, "Truststore must not be null");
+
+            this.trustmanager = (builder, keyStoreType) -> {
+
+                try (InputStream is = certCollection.get()) {
+                    builder.trustManager(is);
+                }
+            };
 
             return this;
         }
 
         /**
-         * Sets the protocol used for the TCP connection established to Redis Server.
+         * Sets the {@link TrustManagerFactory}.
          *
-         * @param String[] list of desired protocols to use.
+         * @param trustManagerFactory the {@link TrustManagerFactory} to use.
          * @return {@code this}
+         * @since 5.3
          */
-        public Builder protocols(String[] protocols) {
-            this.protocols = protocols;
+        public Builder trustManager(TrustManagerFactory trustManagerFactory) {
+
+            LettuceAssert.notNull(trustManagerFactory, "TrustManagerFactory must not be null");
+
+            this.trustmanager = (builder, keyStoreType) -> {
+                builder.trustManager(trustManagerFactory);
+            };
+
             return this;
         }
 
         /**
-         * Sets only one protocol for the TCP connection
+         * Sets the Truststore resource to load trusted certificates. The truststore resource must be supported by
+         * {@link java.security.KeyStore} which is {@link KeyStore#getDefaultType()} by default. The truststore is reloaded on
+         * each connection attempt that allows to replace certificates during runtime.
          *
-         * @param String one protocol {"TLSv1.2", "TLSv1.1", "TLSv1"}
-         * @return [@code this}
+         * @param resource the provider that opens a {@link InputStream} to the keystore file, must not be {@literal null}.
+         * @param truststorePassword the truststore password. May be empty to omit password and the truststore integrity check.
+         * @return {@code this}
          */
-        public Builder protocols(String protocol) {
-            this.protocols = new String[] { protocol };
+        public Builder truststore(Resource resource, char[] truststorePassword) {
+
+            LettuceAssert.notNull(resource, "Truststore InputStreamProvider must not be null");
+
+            char[] passwordToUse = getPassword(truststorePassword);
+            this.truststorePassword = passwordToUse;
+            this.trustmanager = (builder, keyStoreType) -> {
+
+                try (InputStream is = resource.get()) {
+                    builder.trustManager(createTrustManagerFactory(is, passwordToUse, keyStoreType));
+                }
+            };
+
             return this;
         }
 
         /**
-         * Sets the cipher suites for the TCP connection established to Redis Server.
+         * Applies a {@link SslContextBuilder} customizer by calling {@link java.util.function.Consumer#accept(Object)}
          *
-         * @param String[] list of desired cipher suites
+         * @param contextBuilderCustomizer builder callback to customize the {@link SslContextBuilder}.
          * @return {@code this}
+         * @since 5.3
          */
-        public Builder cipherSuites(String[] cipherSuites) {
-            this.cipherSuites = cipherSuites;
+        public Builder sslContext(Consumer<SslContextBuilder> contextBuilderCustomizer) {
+
+            LettuceAssert.notNull(contextBuilderCustomizer, "SslContextBuilder customizer must not be null");
+
+            this.sslContextBuilderCustomizer = contextBuilderCustomizer;
             return this;
         }
 
         /**
-         * Sets only cipher suite for the TCP connection
+         * Configures a {@link Supplier} to create {@link SSLParameters}.
          *
-         * @param String one protocol
-         * @return [@code this}
+         * @param sslParametersSupplier {@link Supplier} for {@link SSLParameters}.
+         * @return {@code this}
+         * @since 5.3
          */
-        public Builder cipherSuites(String cipherSuites) {
-            this.cipherSuites = new String[] { cipherSuites };
+        public Builder sslParameters(Supplier<SSLParameters> sslParametersSupplier) {
+
+            LettuceAssert.notNull(sslParametersSupplier, "SSLParameters supplier must not be null");
+
+            this.sslParametersSupplier = sslParametersSupplier;
             return this;
         }
 
@@ -338,16 +570,97 @@ public SslOptions build() {
         }
     }
 
+    /**
+     * Creates a new {@link SslContextBuilder} object that is pre-configured with values from this {@link SslOptions} object.
+     *
+     * @return a new {@link SslContextBuilder}.
+     * @throws IOException thrown when loading the keystore or the truststore fails.
+     * @throws GeneralSecurityException thrown when loading the keystore or the truststore fails.
+     * @since 5.3
+     */
+    public SslContextBuilder createSslContextBuilder() throws IOException, GeneralSecurityException {
+
+        SslContextBuilder sslContextBuilder = SslContextBuilder.forClient().sslProvider(this.sslProvider)
+                .keyStoreType(keyStoreType);
+
+        if (protocols != null && protocols.length > 0) {
+            sslContextBuilder.protocols(protocols);
+        }
+
+        if (cipherSuites != null && cipherSuites.length > 0) {
+            sslContextBuilder.ciphers(Arrays.asList(cipherSuites));
+        }
+
+        keymanager.accept(sslContextBuilder, this.keyStoreType);
+        trustmanager.accept(sslContextBuilder, this.keyStoreType);
+        sslContextBuilderCustomizer.accept(sslContextBuilder);
+
+        return sslContextBuilder;
+    }
+
+    /**
+     * Creates a {@link SSLParameters} object that is pre-configured with values from this {@link SslOptions} object.
+     *
+     * @return a new a {@link SSLParameters} object.
+     * @since 5.3
+     */
+    public SSLParameters createSSLParameters() {
+
+        SSLParameters sslParams = sslParametersSupplier.get();
+
+        if (protocols != null && protocols.length > 0) {
+            sslParams.setProtocols(protocols);
+        }
+
+        if (cipherSuites != null && cipherSuites.length > 0) {
+            sslParams.setCipherSuites(cipherSuites);
+        }
+
+        return sslParams;
+    }
+
+    /**
+     * Returns a builder to create new {@link SslOptions} whose settings are replicated from the current {@link SslOptions}.
+     *
+     * @return a {@link SslOptions.Builder} to create new {@link SslOptions} whose settings are replicated from the current
+     *         {@link SslOptions}
+     *
+     * @since 5.3
+     */
+    public SslOptions.Builder mutate() {
+
+        Builder builder = builder();
+        builder.keyStoreType = this.keyStoreType;
+        builder.sslProvider = this.getSslProvider();
+        builder.keystore = this.keystore;
+        builder.keystorePassword = this.keystorePassword;
+        builder.truststore = this.getTruststore();
+        builder.truststorePassword = this.getTruststorePassword();
+
+        builder.protocols = this.protocols;
+        builder.cipherSuites = this.cipherSuites;
+
+        builder.sslContextBuilderCustomizer = this.sslContextBuilderCustomizer;
+        builder.sslParametersSupplier = this.sslParametersSupplier;
+        builder.keymanager = this.keymanager;
+        builder.trustmanager = this.trustmanager;
+
+        return builder;
+    }
+
     /**
      * @return the configured {@link SslProvider}.
      */
+    @Deprecated
     public SslProvider getSslProvider() {
         return sslProvider;
     }
 
     /**
      * @return the keystore {@link URL}.
+     * @deprecated since 5.3, {@link javax.net.ssl.KeyManager} is configured via {@link #createSslContextBuilder()}.
      */
+    @Deprecated
     public URL getKeystore() {
         return keystore;
     }
@@ -368,22 +681,125 @@ public String[] getCipherSuites() {
 
     /**
      * @return the password for the keystore. May be empty.
+     * @deprecated since 5.3, {@link javax.net.ssl.KeyManager} is configured via {@link #createSslContextBuilder()}.
      */
+    @Deprecated
     public char[] getKeystorePassword() {
         return Arrays.copyOf(keystorePassword, keystorePassword.length);
     }
 
     /**
      * @return the truststore {@link URL}.
+     * @deprecated since 5.3, {@link javax.net.ssl.TrustManager} is configured via {@link #createSslContextBuilder()}.
      */
+    @Deprecated
     public URL getTruststore() {
         return truststore;
     }
 
     /**
      * @return the password for the truststore. May be empty.
+     * @deprecated since 5.3, {@link javax.net.ssl.TrustManager} is configured via {@link #createSslContextBuilder()}.
      */
+    @Deprecated
     public char[] getTruststorePassword() {
         return Arrays.copyOf(truststorePassword, truststorePassword.length);
     }
+
+    private static KeyManagerFactory createKeyManagerFactory(InputStream inputStream, char[] storePassword, String keyStoreType)
+            throws GeneralSecurityException, IOException {
+
+        KeyStore keyStore = getKeyStore(inputStream, storePassword, keyStoreType);
+
+        KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        keyManagerFactory.init(keyStore, storePassword == null ? new char[0] : storePassword);
+
+        return keyManagerFactory;
+    }
+
+    private static KeyStore getKeyStore(InputStream inputStream, char[] storePassword, String keyStoreType)
+            throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException {
+
+        KeyStore keyStore = KeyStore
+                .getInstance(LettuceStrings.isEmpty(keyStoreType) ? KeyStore.getDefaultType() : keyStoreType);
+
+        try {
+            keyStore.load(inputStream, storePassword);
+        } finally {
+            inputStream.close();
+        }
+        return keyStore;
+    }
+
+    private static TrustManagerFactory createTrustManagerFactory(InputStream inputStream, char[] storePassword,
+            String keystoreType) throws GeneralSecurityException, IOException {
+
+        KeyStore trustStore = getKeyStore(inputStream, storePassword, keystoreType);
+
+        TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        trustManagerFactory.init(trustStore);
+
+        return trustManagerFactory;
+    }
+
+    private static char[] getPassword(String truststorePassword) {
+        return LettuceStrings.isNotEmpty(truststorePassword) ? truststorePassword.toCharArray() : null;
+    }
+
+    private static char[] getPassword(char[] chars) {
+        return chars != null ? Arrays.copyOf(chars, chars.length) : null;
+    }
+
+    @FunctionalInterface
+    interface KeystoreAction {
+
+        static KeystoreAction NO_OP = (builder, keyStoreType) -> {
+        };
+
+        void accept(SslContextBuilder sslContextBuilder, String keyStoreType) throws IOException, GeneralSecurityException;
+    }
+
+    /**
+     * Supplier for a {@link InputStream} representing a resource. The resulting {@link InputStream} must be closed by the
+     * calling code.
+     *
+     * @since 5.3
+     */
+    @FunctionalInterface
+    public interface Resource {
+
+        /**
+         * Create a {@link Resource} that obtains a {@link InputStream} from a {@link URL}.
+         *
+         * @param url the URL to obtain the {@link InputStream} from.
+         * @return a {@link Resource} that opens a connection to the URL and obtains the {@link InputStream} for it.
+         */
+        public static Resource from(URL url) {
+
+            LettuceAssert.notNull(url, "URL must not be null");
+
+            return () -> url.openConnection().getInputStream();
+        }
+
+        /**
+         * Create a {@link Resource} that obtains a {@link InputStream} from a {@link File}.
+         *
+         * @param file the File to obtain the {@link InputStream} from.
+         * @return a {@link Resource} that obtains the {@link FileInputStream} for the given {@link File}.
+         */
+        public static Resource from(File file) {
+
+            LettuceAssert.notNull(file, "File must not be null");
+
+            return () -> new FileInputStream(file);
+        }
+
+        /**
+         * Obtains the {@link InputStream}.
+         *
+         * @return the {@link InputStream}.
+         * @throws IOException
+         */
+        InputStream get() throws IOException;
+    }
 }
diff --git a/src/test/java/io/lettuce/core/SslIntegrationTests.java b/src/test/java/io/lettuce/core/SslIntegrationTests.java
index 7ac16a1799..c650a91b1e 100644
--- a/src/test/java/io/lettuce/core/SslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/SslIntegrationTests.java
@@ -61,6 +61,7 @@ class SslIntegrationTests extends TestSupport {
     private static final String KEYSTORE = "work/keystore.jks";
     private static final String TRUSTSTORE = "work/truststore.jks";
     private static final File TRUSTSTORE_FILE = new File(TRUSTSTORE);
+    private static final File CA_CERT_FILE = new File("work/ca/certs/ca.cert.pem");
     private static final int MASTER_SLAVE_BASE_PORT_OFFSET = 2000;
 
     private static final RedisURI URI_NO_VERIFY = sslURIBuilder(0) //
@@ -122,6 +123,17 @@ void standaloneWithJdkSsl() {
         verifyConnection(URI_VERIFY);
     }
 
+    @Test
+    void standaloneWithPemCert() {
+
+        SslOptions sslOptions = SslOptions.builder() //
+                .trustManager(CA_CERT_FILE) //
+                .build();
+        setOptions(sslOptions);
+
+        verifyConnection(URI_VERIFY);
+    }
+
     @Test
     void standaloneWithJdkSslUsingTruststoreUrl() throws Exception {
 
@@ -238,8 +250,8 @@ void sslWithVerificationWillFail() {
     @Test
     void masterSlaveWithSsl() {
 
-        RedisCommands<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8,
-                MASTER_SLAVE_URIS_NO_VERIFY).sync();
+        RedisCommands<String, String> connection = MasterSlave
+                .connect(redisClient, StringCodec.UTF8, MASTER_SLAVE_URIS_NO_VERIFY).sync();
         connection.set("key", "value");
         assertThat(connection.get("key")).isEqualTo("value");
         connection.getStatefulConnection().close();
@@ -278,8 +290,8 @@ void masterSlaveWithJdkSslUsingTruststoreUrlWithWrongPassword() throws Exception
                 .build();
         setOptions(sslOptions);
 
-        assertThatThrownBy(() -> verifyMasterSlaveConnection(MASTER_SLAVE_URIS_VERIFY)).isInstanceOf(
-                RedisConnectionException.class);
+        assertThatThrownBy(() -> verifyMasterSlaveConnection(MASTER_SLAVE_URIS_VERIFY))
+                .isInstanceOf(RedisConnectionException.class);
     }
 
     @Test
@@ -290,8 +302,8 @@ void masterSlaveWithJdkSslFailsWithWrongTruststore() {
                 .build();
         setOptions(sslOptions);
 
-        assertThatThrownBy(() -> verifyMasterSlaveConnection(MASTER_SLAVE_URIS_VERIFY)).isInstanceOf(
-                RedisConnectionException.class);
+        assertThatThrownBy(() -> verifyMasterSlaveConnection(MASTER_SLAVE_URIS_VERIFY))
+                .isInstanceOf(RedisConnectionException.class);
     }
 
     @Test
@@ -304,8 +316,8 @@ void masterSlavePingBeforeActivate() {
 
     @Test
     void masterSlaveSslWithReconnect() {
-        RedisCommands<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8,
-                MASTER_SLAVE_URIS_NO_VERIFY).sync();
+        RedisCommands<String, String> connection = MasterSlave
+                .connect(redisClient, StringCodec.UTF8, MASTER_SLAVE_URIS_NO_VERIFY).sync();
         connection.quit();
         Delay.delay(Duration.ofMillis(200));
         assertThat(connection.ping()).isEqualTo("PONG");
@@ -314,8 +326,8 @@ void masterSlaveSslWithReconnect() {
 
     @Test
     void masterSlaveSslWithVerificationWillFail() {
-        assertThatThrownBy(() -> MasterSlave.connect(redisClient, StringCodec.UTF8, MASTER_SLAVE_URIS_VERIFY)).isInstanceOf(
-                RedisConnectionException.class);
+        assertThatThrownBy(() -> MasterSlave.connect(redisClient, StringCodec.UTF8, MASTER_SLAVE_URIS_VERIFY))
+                .isInstanceOf(RedisConnectionException.class);
     }
 
     @Test
@@ -339,8 +351,8 @@ void masterSlaveSslWithAllInvalidHostsWillFail() {
                 .build();
         setOptions(sslOptions);
 
-        assertThatThrownBy(() -> verifyMasterSlaveConnection(MASTER_SLAVE_URIS_WITH_ALL_INVALID)).isInstanceOf(
-                RedisConnectionException.class);
+        assertThatThrownBy(() -> verifyMasterSlaveConnection(MASTER_SLAVE_URIS_WITH_ALL_INVALID))
+                .isInstanceOf(RedisConnectionException.class);
     }
 
     @Test
@@ -429,7 +441,8 @@ private void verifyConnection(RedisURI redisUri) {
 
     private void verifyMasterSlaveConnection(List<RedisURI> redisUris) {
 
-        try (StatefulRedisConnection<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8, redisUris)) {
+        try (StatefulRedisConnection<String, String> connection = MasterSlave.connect(redisClient, StringCodec.UTF8,
+                redisUris)) {
             connection.sync().ping();
         }
     }
diff --git a/src/test/java/io/lettuce/core/SslOptionsUnitTests.java b/src/test/java/io/lettuce/core/SslOptionsUnitTests.java
new file mode 100644
index 0000000000..4dae0ad37a
--- /dev/null
+++ b/src/test/java/io/lettuce/core/SslOptionsUnitTests.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Collections;
+
+import javax.net.ssl.SSLParameters;
+
+import org.junit.jupiter.api.Test;
+
+import io.netty.handler.ssl.SslContext;
+
+/**
+ * Unit tests for {@link SslOptions}.
+ *
+ * @author Mark Paluch
+ */
+class SslOptionsUnitTests {
+
+    @Test
+    void shouldCreateEmptySslOptions() throws Exception {
+
+        SslOptions options = SslOptions.builder().build();
+
+        assertThat(options.createSSLParameters()).isNotNull();
+        assertThat(options.createSslContextBuilder()).isNotNull();
+    }
+
+    @Test
+    void shouldConfigureCipherSuiteAndProtocol() {
+
+        SslOptions options = SslOptions.builder().cipherSuites("Foo", "Bar").protocols("TLSv1").build();
+
+        SSLParameters parameters = options.createSSLParameters();
+        assertThat(parameters.getCipherSuites()).contains("Foo", "Bar");
+        assertThat(parameters.getProtocols()).contains("TLSv1");
+    }
+
+    @Test
+    void shouldMutateOptions() {
+
+        SslOptions options = SslOptions.builder().cipherSuites("Foo", "Bar").protocols("TLSv1").build();
+
+        SslOptions reconfigured = options.mutate().protocols("Baz").build();
+
+        assertThat(options.createSSLParameters().getProtocols()).contains("TLSv1");
+        assertThat(reconfigured.createSSLParameters().getProtocols()).contains("Baz");
+    }
+
+    @Test
+    void shouldUseParameterSupplier() {
+
+        SslOptions options = SslOptions.builder().sslParameters(() -> {
+
+            SSLParameters parameters = new SSLParameters();
+            parameters.setNeedClientAuth(true);
+            return parameters;
+        }).build();
+
+        SSLParameters parameters = options.createSSLParameters();
+        assertThat(parameters.getNeedClientAuth()).isTrue();
+    }
+
+    @Test
+    void shouldApplyContextCustomizer() throws Exception {
+
+        SslOptions options = SslOptions.builder().sslContext(sslContextBuilder -> {
+
+            sslContextBuilder.ciphers(Collections.singletonList("TLS_RSA_WITH_AES_128_CBC_SHA"));
+
+        }).build();
+
+        SslContext context = options.createSslContextBuilder().build();
+        assertThat(context.cipherSuites()).containsOnly("TLS_RSA_WITH_AES_128_CBC_SHA");
+    }
+}

From 17cea5960d0f3a9ebf0d6bebaf669b26b18b6760 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 27 Dec 2019 16:53:53 +0100
Subject: [PATCH 708/808] Move SocketAddress resolution from RedisURI to
 SocketAddressResolver #1157

The SocketAddress is now resolved using SocketAddressResolver instead of RedisURI.getResolvedAddress() to resolve a package cycle and to remove dependencies to netty when working with a plain RedisURI object.

RedisURI.getResolvedAddress() is now removed.
---
 .../java/io/lettuce/core/EpollProvider.java   | 250 +---------------
 .../java/io/lettuce/core/KqueueProvider.java  | 268 +-----------------
 src/main/java/io/lettuce/core/RedisURI.java   |  24 +-
 src/main/java/io/lettuce/core/Transports.java |  27 +-
 .../DefaultEventLoopGroupProvider.java        |  20 +-
 .../lettuce/core/resource/EpollProvider.java  | 210 ++++++++++++++
 .../core/resource/EventLoopResources.java     |  71 +++++
 .../lettuce/core/resource/KqueueProvider.java | 210 ++++++++++++++
 .../MappingSocketAddressResolver.java         |   4 +-
 .../core/resource/SocketAddressResolver.java  |  16 +-
 ...ndRobinSocketAddressSupplierUnitTests.java |  49 ++--
 11 files changed, 562 insertions(+), 587 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/resource/EpollProvider.java
 create mode 100644 src/main/java/io/lettuce/core/resource/EventLoopResources.java
 create mode 100644 src/main/java/io/lettuce/core/resource/KqueueProvider.java

diff --git a/src/main/java/io/lettuce/core/EpollProvider.java b/src/main/java/io/lettuce/core/EpollProvider.java
index 52582edd7a..add2154b66 100644
--- a/src/main/java/io/lettuce/core/EpollProvider.java
+++ b/src/main/java/io/lettuce/core/EpollProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,263 +15,21 @@
  */
 package io.lettuce.core;
 
-import java.net.SocketAddress;
-import java.util.concurrent.ThreadFactory;
-
-import io.lettuce.core.internal.LettuceAssert;
-import io.netty.channel.Channel;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.epoll.Epoll;
-import io.netty.channel.epoll.EpollDomainSocketChannel;
-import io.netty.channel.epoll.EpollEventLoopGroup;
-import io.netty.channel.epoll.EpollSocketChannel;
-import io.netty.channel.unix.DomainSocketAddress;
-import io.netty.util.concurrent.EventExecutorGroup;
-import io.netty.util.internal.SystemPropertyUtil;
-import io.netty.util.internal.logging.InternalLogger;
-import io.netty.util.internal.logging.InternalLoggerFactory;
-
 /**
  * Wraps and provides Epoll classes. This is to protect the user from {@link ClassNotFoundException}'s caused by the absence of
  * the {@literal netty-transport-native-epoll} library during runtime. Internal API.
  *
  * @author Mark Paluch
  * @since 4.4
+ * @deprecated Use {@link io.lettuce.core.resource.EpollProvider} instead.
  */
+@Deprecated
 public class EpollProvider {
 
-    private static final InternalLogger logger = InternalLoggerFactory.getInstance(EpollProvider.class);
-
-    private static final String EPOLL_ENABLED_KEY = "io.lettuce.core.epoll";
-    private static final boolean EPOLL_ENABLED = Boolean.parseBoolean(SystemPropertyUtil.get(EPOLL_ENABLED_KEY, "true"));
-
-    private static final boolean EPOLL_AVAILABLE;
-    private static final EpollResources epollResources;
-
-    static {
-
-        boolean availability = false;
-        try {
-
-            Class.forName("io.netty.channel.epoll.Epoll");
-            availability = Epoll.isAvailable();
-        } catch (ClassNotFoundException e) {
-        }
-
-        EPOLL_AVAILABLE = availability;
-
-        if (EPOLL_AVAILABLE) {
-            logger.info("Starting with epoll library");
-            epollResources = AvailableEpollResources.INSTANCE;
-
-        } else {
-            logger.info("Starting without optional epoll library");
-            epollResources = UnavailableEpollResources.INSTANCE;
-        }
-    }
-
     /**
      * @return {@literal true} if epoll is available.
      */
     public static boolean isAvailable() {
-        return EPOLL_AVAILABLE && EPOLL_ENABLED;
-    }
-
-    /**
-     * Check whether the Epoll library is available on the class path.
-     *
-     * @throws IllegalStateException if the {@literal netty-transport-native-epoll} library is not available
-     */
-    static void checkForEpollLibrary() {
-
-        LettuceAssert.assertState(EPOLL_ENABLED,
-                String.format("epoll use is disabled via System properties (%s)", EPOLL_ENABLED_KEY));
-        LettuceAssert
-                .assertState(
-                        isAvailable(),
-                        "netty-transport-native-epoll is not available. Make sure netty-transport-native-epoll library on the class path and supported by your operating system.");
-    }
-
-    /**
-     * @param type must not be {@literal null}.
-     * @return {@literal true} if {@code type} is a {@link io.netty.channel.epoll.EpollEventLoopGroup}.
-     */
-    public static boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type) {
-        return epollResources.isEventLoopGroup(type);
-    }
-
-    /**
-     * Create a new {@link io.netty.channel.epoll.EpollEventLoopGroup}.
-     *
-     * @param nThreads
-     * @param threadFactory
-     * @return the {@link EventLoopGroup}.
-     */
-    public static EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
-        return epollResources.newEventLoopGroup(nThreads, threadFactory);
-    }
-
-    /**
-     * @return the {@link io.netty.channel.epoll.EpollDomainSocketChannel} class.
-     */
-    static Class<? extends Channel> domainSocketChannelClass() {
-        return epollResources.domainSocketChannelClass();
-    }
-
-    /**
-     * @return the {@link io.netty.channel.epoll.EpollSocketChannel} class.
-     */
-    static Class<? extends Channel> socketChannelClass() {
-        return epollResources.socketChannelClass();
-    }
-
-    /**
-     * @return the {@link io.netty.channel.epoll.EpollEventLoopGroup} class.
-     */
-    static Class<? extends EventLoopGroup> eventLoopGroupClass() {
-        return epollResources.eventLoopGroupClass();
-    }
-
-    static SocketAddress newSocketAddress(String socketPath) {
-        return epollResources.newSocketAddress(socketPath);
-    }
-
-    /**
-     * @author Mark Paluch
-     */
-    public interface EpollResources {
-
-        /**
-         * @param type must not be {@literal null}.
-         * @return {@literal true} if {@code type} is a {@link EpollEventLoopGroup}.
-         */
-        boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type);
-
-        /**
-         * Create a new {@link EpollEventLoopGroup}.
-         *
-         * @param nThreads
-         * @param threadFactory
-         * @return the {@link EventLoopGroup}.
-         */
-        EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory);
-
-        /**
-         * @return the {@link EpollDomainSocketChannel} class.
-         */
-        Class<? extends Channel> domainSocketChannelClass();
-
-        /**
-         * @return the {@link EpollSocketChannel} class.
-         */
-        Class<? extends Channel> socketChannelClass();
-
-        /**
-         * @return the {@link EpollEventLoopGroup} class.
-         */
-        Class<? extends EventLoopGroup> eventLoopGroupClass();
-
-        SocketAddress newSocketAddress(String socketPath);
-    }
-
-    /**
-     * {@link EpollResources} for unavailable EPoll.
-     */
-    enum UnavailableEpollResources implements EpollResources {
-
-        INSTANCE;
-
-        @Override
-        public Class<? extends Channel> domainSocketChannelClass() {
-
-            checkForEpollLibrary();
-            return null;
-        }
-
-        @Override
-        public Class<? extends EventLoopGroup> eventLoopGroupClass() {
-
-            checkForEpollLibrary();
-            return null;
-        }
-
-        @Override
-        public boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type) {
-
-            checkForEpollLibrary();
-            return false;
-        }
-
-        @Override
-        public EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
-
-            checkForEpollLibrary();
-            return null;
-        }
-
-        @Override
-        public SocketAddress newSocketAddress(String socketPath) {
-
-            checkForEpollLibrary();
-            return null;
-        }
-
-        @Override
-        public Class<? extends Channel> socketChannelClass() {
-
-            checkForEpollLibrary();
-            return null;
-        }
-    }
-
-    /**
-     * {@link EpollResources} for available Epoll.
-     */
-    enum AvailableEpollResources implements EpollResources {
-
-        INSTANCE;
-
-        @Override
-        public boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type) {
-
-            LettuceAssert.notNull(type, "EventLoopGroup type must not be null");
-
-            return type.equals(EpollEventLoopGroup.class);
-        }
-
-        @Override
-        public EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
-
-            checkForEpollLibrary();
-            return new EpollEventLoopGroup(nThreads, threadFactory);
-        }
-
-        @Override
-        public Class<? extends Channel> domainSocketChannelClass() {
-
-            checkForEpollLibrary();
-            return EpollDomainSocketChannel.class;
-        }
-
-        @Override
-        public Class<? extends Channel> socketChannelClass() {
-
-            checkForEpollLibrary();
-            return EpollSocketChannel.class;
-        }
-
-        @Override
-        public Class<? extends EventLoopGroup> eventLoopGroupClass() {
-
-            checkForEpollLibrary();
-            return EpollEventLoopGroup.class;
-        }
-
-        @Override
-        public SocketAddress newSocketAddress(String socketPath) {
-
-            checkForEpollLibrary();
-            return new DomainSocketAddress(socketPath);
-        }
+        return io.lettuce.core.resource.EpollProvider.isAvailable();
     }
 }
diff --git a/src/main/java/io/lettuce/core/KqueueProvider.java b/src/main/java/io/lettuce/core/KqueueProvider.java
index 26e9c2cdb5..3961ea2f77 100644
--- a/src/main/java/io/lettuce/core/KqueueProvider.java
+++ b/src/main/java/io/lettuce/core/KqueueProvider.java
@@ -15,284 +15,20 @@
  */
 package io.lettuce.core;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.net.SocketAddress;
-import java.util.concurrent.ThreadFactory;
-
-import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.internal.LettuceClassUtils;
-import io.netty.channel.Channel;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.unix.DomainSocketAddress;
-import io.netty.util.concurrent.EventExecutorGroup;
-import io.netty.util.internal.SystemPropertyUtil;
-import io.netty.util.internal.logging.InternalLogger;
-import io.netty.util.internal.logging.InternalLoggerFactory;
-
 /**
  * Wraps and provides kqueue classes. This is to protect the user from {@link ClassNotFoundException}'s caused by the absence of
  * the {@literal netty-transport-native-kqueue} library during runtime. Internal API.
  *
  * @author Mark Paluch
  * @since 4.4
+ * @deprecated since 6.0, use {@link io.lettuce.core.resource.KqueueProvider} instead.
  */
 public class KqueueProvider {
 
-    private static final InternalLogger logger = InternalLoggerFactory.getInstance(KqueueProvider.class);
-
-    private static final String KQUEUE_ENABLED_KEY = "io.lettuce.core.kqueue";
-    private static final boolean KQUEUE_ENABLED = Boolean.parseBoolean(SystemPropertyUtil.get(KQUEUE_ENABLED_KEY, "true"));
-
-    private static final boolean KQUEUE_AVAILABLE;
-    private static final KqueueResources KQUEUE_RESOURCES;
-
-    static {
-
-        boolean availability = false;
-        try {
-
-            Class<?> kqueue = Class.forName("io.netty.channel.kqueue.KQueue");
-
-            Method isAvailable = kqueue.getDeclaredMethod("isAvailable");
-
-            availability = (Boolean) isAvailable.invoke(null);
-        } catch (ReflectiveOperationException e) {
-        }
-
-        KQUEUE_AVAILABLE = availability;
-
-        if (KQUEUE_AVAILABLE) {
-            logger.info("Starting with kqueue library");
-            KQUEUE_RESOURCES = AvailableKqueueResources.INSTANCE;
-
-        } else {
-            logger.info("Starting without optional kqueue library");
-            KQUEUE_RESOURCES = UnavailableKqueueResources.INSTANCE;
-        }
-    }
-
     /**
      * @return {@literal true} if kqueue is available.
      */
     public static boolean isAvailable() {
-        return KQUEUE_AVAILABLE && KQUEUE_ENABLED;
-    }
-
-    /**
-     * Check whether the kqueue library is available on the class path.
-     *
-     * @throws IllegalStateException if the {@literal netty-transport-native-kqueue} library is not available
-     */
-    static void checkForKqueueLibrary() {
-
-        LettuceAssert.assertState(KQUEUE_ENABLED,
-                String.format("kqueue use is disabled via System properties (%s)", KQUEUE_ENABLED_KEY));
-        LettuceAssert
-                .assertState(
-                        isAvailable(),
-                        "netty-transport-native-kqueue is not available. Make sure netty-transport-native-kqueue library on the class path and supported by your operating system.");
-    }
-
-    /**
-     * @param type must not be {@literal null}.
-     * @return {@literal true} if {@code type} is a {@link io.netty.channel.kqueue.KQueueEventLoopGroup}.
-     */
-    public static boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type) {
-        return KQUEUE_RESOURCES.isEventLoopGroup(type);
-    }
-
-    /**
-     * Create a new {@link io.netty.channel.kqueue.KQueueEventLoopGroup}.
-     *
-     * @param nThreads
-     * @param threadFactory
-     * @return the {@link EventLoopGroup}.
-     */
-    public static EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
-        return KQUEUE_RESOURCES.newEventLoopGroup(nThreads, threadFactory);
-    }
-
-    /**
-     * @return the {@link io.netty.channel.kqueue.KQueueDomainSocketChannel} class.
-     */
-    static Class<? extends Channel> domainSocketChannelClass() {
-        return KQUEUE_RESOURCES.domainSocketChannelClass();
-    }
-
-    /**
-     * @return the {@link io.netty.channel.kqueue.KQueueSocketChannel} class.
-     */
-    static Class<? extends Channel> socketChannelClass() {
-        return KQUEUE_RESOURCES.socketChannelClass();
-    }
-
-    /**
-     * @return the {@link io.netty.channel.kqueue.KQueueEventLoopGroup} class.
-     */
-    static Class<? extends EventLoopGroup> eventLoopGroupClass() {
-        return KQUEUE_RESOURCES.eventLoopGroupClass();
-    }
-
-    static SocketAddress newSocketAddress(String socketPath) {
-        return KQUEUE_RESOURCES.newSocketAddress(socketPath);
-    }
-
-    /**
-     * @author Mark Paluch
-     */
-    public interface KqueueResources {
-
-        /**
-         * @param type must not be {@literal null}.
-         * @return {@literal true} if {@code type} is a {@link io.netty.channel.kqueue.KQueueEventLoopGroup}.
-         */
-        boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type);
-
-        /**
-         * Create a new {@link io.netty.channel.kqueue.KQueueEventLoopGroup}.
-         *
-         * @param nThreads
-         * @param threadFactory
-         * @return the {@link EventLoopGroup}.
-         */
-        EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory);
-
-        /**
-         * @return the {@link io.netty.channel.kqueue.KQueueDomainSocketChannel} class.
-         */
-        Class<? extends Channel> domainSocketChannelClass();
-
-        /**
-         * @return the {@link io.netty.channel.kqueue.KQueueSocketChannel} class.
-         */
-        Class<? extends Channel> socketChannelClass();
-
-        /**
-         * @return the {@link io.netty.channel.kqueue.KQueueEventLoopGroup} class.
-         */
-        Class<? extends EventLoopGroup> eventLoopGroupClass();
-
-        SocketAddress newSocketAddress(String socketPath);
-    }
-
-    /**
-     * {@link KqueueResources} for unavailable EPoll.
-     */
-    enum UnavailableKqueueResources implements KqueueResources {
-
-        INSTANCE;
-
-        @Override
-        public Class<? extends Channel> domainSocketChannelClass() {
-
-            checkForKqueueLibrary();
-            return null;
-        }
-
-        @Override
-        public Class<? extends EventLoopGroup> eventLoopGroupClass() {
-
-            checkForKqueueLibrary();
-            return null;
-        }
-
-        @Override
-        public boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type) {
-
-            checkForKqueueLibrary();
-            return false;
-        }
-
-        @Override
-        public EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
-
-            checkForKqueueLibrary();
-            return null;
-        }
-
-        @Override
-        public SocketAddress newSocketAddress(String socketPath) {
-
-            checkForKqueueLibrary();
-            return null;
-        }
-
-        @Override
-        public Class<? extends Channel> socketChannelClass() {
-
-            checkForKqueueLibrary();
-            return null;
-        }
-    }
-
-    /**
-     * {@link KqueueResources} for available kqueue.
-     */
-    enum AvailableKqueueResources implements KqueueResources {
-
-        INSTANCE;
-
-        @Override
-        public boolean isEventLoopGroup(Class<? extends EventExecutorGroup> type) {
-
-            LettuceAssert.notNull(type, "EventLoopGroup type must not be null");
-
-            return type.equals(eventLoopGroupClass());
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
-
-            checkForKqueueLibrary();
-
-            try {
-                Constructor<EventLoopGroup> constructor = (Constructor) eventLoopGroupClass().getDeclaredConstructor(
-                        Integer.TYPE, ThreadFactory.class);
-
-                return constructor.newInstance(nThreads, threadFactory);
-            } catch (ReflectiveOperationException e) {
-                throw new IllegalStateException("Cannot create KQueueEventLoopGroup");
-            }
-        }
-
-        @Override
-        public Class<? extends Channel> domainSocketChannelClass() {
-
-            checkForKqueueLibrary();
-            return forName("io.netty.channel.kqueue.KQueueDomainSocketChannel");
-        }
-
-        @Override
-        public Class<? extends Channel> socketChannelClass() {
-
-            checkForKqueueLibrary();
-            return forName("io.netty.channel.kqueue.KQueueSocketChannel");
-        }
-
-        @Override
-        public Class<? extends EventLoopGroup> eventLoopGroupClass() {
-
-            checkForKqueueLibrary();
-            return forName("io.netty.channel.kqueue.KQueueEventLoopGroup");
-        }
-
-        @Override
-        public SocketAddress newSocketAddress(String socketPath) {
-
-            checkForKqueueLibrary();
-            return new DomainSocketAddress(socketPath);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    static <T> Class<T> forName(String name) {
-
-        try {
-            return (Class) LettuceClassUtils.forName(name);
-        } catch (ClassNotFoundException e) {
-            throw new NoClassDefFoundError(name);
-        }
+        return io.lettuce.core.resource.KqueueProvider.isAvailable();
     }
 }
diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 2db323d8f4..2ee95191aa 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -20,8 +20,6 @@
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
 import java.net.URI;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -595,7 +593,7 @@ private static RedisURI buildRedisUriFromUri(URI uri) {
         return builder.build();
     }
 
-    private String getAuthority(final String scheme) {
+    private String getAuthority(String scheme) {
 
         String authority = null;
 
@@ -699,7 +697,7 @@ private String getScheme() {
     }
 
     /**
-     * URL encode the {@code str} without slash escaping {@code %2F}
+     * URL encode the {@code str} without slash escaping {@code %2F}.
      *
      * @param str the string to encode.
      * @return the URL-encoded string
@@ -712,24 +710,6 @@ private static String urlEncode(String str) {
         }
     }
 
-    /**
-     *
-     * @return the resolved {@link SocketAddress} based either on host/port or the socket.
-     */
-    public SocketAddress getResolvedAddress() {
-
-        if (getSocket() != null) {
-
-            if (KqueueProvider.isAvailable()) {
-                return KqueueProvider.newSocketAddress(getSocket());
-            }
-
-            return EpollProvider.newSocketAddress(getSocket());
-        }
-
-        return new InetSocketAddress(host, port);
-    }
-
     /**
      * @return the RedisURL in a URI-like form.
      */
diff --git a/src/main/java/io/lettuce/core/Transports.java b/src/main/java/io/lettuce/core/Transports.java
index 13f713d35a..74be39ba0a 100644
--- a/src/main/java/io/lettuce/core/Transports.java
+++ b/src/main/java/io/lettuce/core/Transports.java
@@ -16,6 +16,9 @@
 package io.lettuce.core;
 
 import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.resource.EpollProvider;
+import io.lettuce.core.resource.EventLoopResources;
+import io.lettuce.core.resource.KqueueProvider;
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -59,6 +62,9 @@ static Class<? extends Channel> socketChannelClass() {
      */
     static class NativeTransports {
 
+        static EventLoopResources RESOURCES = KqueueProvider.isAvailable() ? KqueueProvider.getResources()
+                : EpollProvider.getResources();
+
         /**
          * @return {@literal true} if a native transport is available.
          */
@@ -70,36 +76,21 @@ static boolean isSocketSupported() {
          * @return the native transport socket {@link Channel} class.
          */
         static Class<? extends Channel> socketChannelClass() {
-
-            if (KqueueProvider.isAvailable()) {
-                return KqueueProvider.socketChannelClass();
-            }
-
-            return EpollProvider.socketChannelClass();
+            return RESOURCES.socketChannelClass();
         }
 
         /**
          * @return the native transport domain socket {@link Channel} class.
          */
         static Class<? extends Channel> domainSocketChannelClass() {
-
-            if (KqueueProvider.isAvailable()) {
-                return KqueueProvider.domainSocketChannelClass();
-            }
-
-            return EpollProvider.domainSocketChannelClass();
+            return RESOURCES.domainSocketChannelClass();
         }
 
         /**
          * @return the native transport {@link EventLoopGroup} class.
          */
         static Class<? extends EventLoopGroup> eventLoopGroupClass() {
-
-            if (KqueueProvider.isAvailable()) {
-                return KqueueProvider.eventLoopGroupClass();
-            }
-
-            return EpollProvider.eventLoopGroupClass();
+            return RESOURCES.eventLoopGroupClass();
         }
 
         static void assertAvailable() {
diff --git a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
index 3fe6e1587f..6f84a4aee8 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
@@ -26,8 +26,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import io.lettuce.core.EpollProvider;
-import io.lettuce.core.KqueueProvider;
 import io.lettuce.core.internal.Futures;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -149,12 +147,22 @@ public static <T extends EventExecutorGroup> EventExecutorGroup createEventLoopG
             return new NioEventLoopGroup(numberOfThreads, new DefaultThreadFactory("lettuce-nioEventLoop", true));
         }
 
-        if (EpollProvider.isAvailable() && EpollProvider.isEventLoopGroup(type)) {
-            return EpollProvider.newEventLoopGroup(numberOfThreads, new DefaultThreadFactory("lettuce-epollEventLoop", true));
+        if (EpollProvider.isAvailable()) {
+
+            EventLoopResources resources = EpollProvider.getResources();
+
+            if (resources.matches(type)) {
+                return resources.newEventLoopGroup(numberOfThreads, new DefaultThreadFactory("lettuce-epollEventLoop", true));
+            }
         }
 
-        if (KqueueProvider.isAvailable() && KqueueProvider.isEventLoopGroup(type)) {
-            return KqueueProvider.newEventLoopGroup(numberOfThreads, new DefaultThreadFactory("lettuce-kqueueEventLoop", true));
+        if (KqueueProvider.isAvailable()) {
+
+            EventLoopResources resources = KqueueProvider.getResources();
+
+            if (resources.matches(type)) {
+                return resources.newEventLoopGroup(numberOfThreads, new DefaultThreadFactory("lettuce-kqueueEventLoop", true));
+            }
         }
 
         throw new IllegalArgumentException(String.format("Type %s not supported", type.getName()));
diff --git a/src/main/java/io/lettuce/core/resource/EpollProvider.java b/src/main/java/io/lettuce/core/resource/EpollProvider.java
new file mode 100644
index 0000000000..ce7f2bce1d
--- /dev/null
+++ b/src/main/java/io/lettuce/core/resource/EpollProvider.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.resource;
+
+import java.net.SocketAddress;
+import java.util.concurrent.ThreadFactory;
+
+import io.lettuce.core.internal.LettuceAssert;
+import io.netty.channel.Channel;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.epoll.Epoll;
+import io.netty.channel.epoll.EpollDomainSocketChannel;
+import io.netty.channel.epoll.EpollEventLoopGroup;
+import io.netty.channel.epoll.EpollSocketChannel;
+import io.netty.channel.unix.DomainSocketAddress;
+import io.netty.util.concurrent.EventExecutorGroup;
+import io.netty.util.internal.SystemPropertyUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+/**
+ * Wraps and provides Epoll classes. This is to protect the user from {@link ClassNotFoundException}'s caused by the absence of
+ * the {@literal netty-transport-native-epoll} library during runtime. Internal API.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public class EpollProvider {
+
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(EpollProvider.class);
+
+    private static final String EPOLL_ENABLED_KEY = "io.lettuce.core.epoll";
+    private static final boolean EPOLL_ENABLED = Boolean.parseBoolean(SystemPropertyUtil.get(EPOLL_ENABLED_KEY, "true"));
+
+    private static final boolean EPOLL_AVAILABLE;
+    private static final EventLoopResources EPOLL_RESOURCES;
+
+    static {
+
+        boolean availability;
+        try {
+            Class.forName("io.netty.channel.epoll.Epoll");
+            availability = Epoll.isAvailable();
+        } catch (ClassNotFoundException e) {
+            availability = false;
+        }
+
+        EPOLL_AVAILABLE = availability;
+
+        if (EPOLL_AVAILABLE) {
+            logger.info("Starting with epoll library");
+            EPOLL_RESOURCES = AvailableEpollResources.INSTANCE;
+
+        } else {
+            logger.info("Starting without optional epoll library");
+            EPOLL_RESOURCES = UnavailableEpollResources.INSTANCE;
+        }
+    }
+
+    /**
+     * @return {@literal true} if epoll is available.
+     */
+    public static boolean isAvailable() {
+        return EPOLL_AVAILABLE && EPOLL_ENABLED;
+    }
+
+    /**
+     * Check whether the Epoll library is available on the class path.
+     *
+     * @throws IllegalStateException if the {@literal netty-transport-native-epoll} library is not available
+     */
+    static void checkForEpollLibrary() {
+
+        LettuceAssert.assertState(EPOLL_ENABLED,
+                String.format("epoll use is disabled via System properties (%s)", EPOLL_ENABLED_KEY));
+        LettuceAssert.assertState(isAvailable(),
+                "netty-transport-native-epoll is not available. Make sure netty-transport-native-epoll library on the class path and supported by your operating system.");
+    }
+
+    /**
+     * Returns the {@link EventLoopResources} for epoll-backed transport. Check availability with {@link #isAvailable()} prior
+     * to obtaining the resources.
+     *
+     * @return the {@link EventLoopResources}. May be unavailable.
+     *
+     * @since 6.0
+     */
+    public static EventLoopResources getResources() {
+        return EPOLL_RESOURCES;
+    }
+
+    /**
+     * {@link EventLoopResources} for unavailable EPoll.
+     */
+    enum UnavailableEpollResources implements EventLoopResources {
+
+        INSTANCE;
+
+        @Override
+        public Class<? extends Channel> domainSocketChannelClass() {
+
+            checkForEpollLibrary();
+            return null;
+        }
+
+        @Override
+        public Class<? extends EventLoopGroup> eventLoopGroupClass() {
+
+            checkForEpollLibrary();
+            return null;
+        }
+
+        @Override
+        public boolean matches(Class<? extends EventExecutorGroup> type) {
+
+            checkForEpollLibrary();
+            return false;
+        }
+
+        @Override
+        public EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
+
+            checkForEpollLibrary();
+            return null;
+        }
+
+        @Override
+        public SocketAddress newSocketAddress(String socketPath) {
+
+            checkForEpollLibrary();
+            return null;
+        }
+
+        @Override
+        public Class<? extends Channel> socketChannelClass() {
+
+            checkForEpollLibrary();
+            return null;
+        }
+    }
+
+    /**
+     * {@link EventLoopResources} for available Epoll.
+     */
+    enum AvailableEpollResources implements EventLoopResources {
+
+        INSTANCE;
+
+        @Override
+        public boolean matches(Class<? extends EventExecutorGroup> type) {
+
+            LettuceAssert.notNull(type, "EventLoopGroup type must not be null");
+
+            return type.equals(EpollEventLoopGroup.class);
+        }
+
+        @Override
+        public EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
+
+            checkForEpollLibrary();
+
+            return new EpollEventLoopGroup(nThreads, threadFactory);
+        }
+
+        @Override
+        public Class<? extends Channel> domainSocketChannelClass() {
+
+            checkForEpollLibrary();
+
+            return EpollDomainSocketChannel.class;
+        }
+
+        @Override
+        public Class<? extends Channel> socketChannelClass() {
+
+            checkForEpollLibrary();
+
+            return EpollSocketChannel.class;
+        }
+
+        @Override
+        public Class<? extends EventLoopGroup> eventLoopGroupClass() {
+
+            checkForEpollLibrary();
+
+            return EpollEventLoopGroup.class;
+        }
+
+        @Override
+        public SocketAddress newSocketAddress(String socketPath) {
+
+            checkForEpollLibrary();
+
+            return new DomainSocketAddress(socketPath);
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/resource/EventLoopResources.java b/src/main/java/io/lettuce/core/resource/EventLoopResources.java
new file mode 100644
index 0000000000..2f386cef39
--- /dev/null
+++ b/src/main/java/io/lettuce/core/resource/EventLoopResources.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.resource;
+
+import java.net.SocketAddress;
+import java.util.concurrent.ThreadFactory;
+
+import io.netty.channel.Channel;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.epoll.EpollEventLoopGroup;
+import io.netty.util.concurrent.EventExecutorGroup;
+
+/**
+ * Interface to encapsulate EventLoopGroup resources.
+ *
+ * @author Mark Paluch
+ * @since 6.0
+ */
+public interface EventLoopResources {
+
+    /**
+     * Checks if the given {@code type} matches the underlying {@link EventExecutorGroup} type.
+     *
+     * @param type must not be {@literal null}.
+     * @return {@literal true} if {@code type} is a {@link EventExecutorGroup} of the underlying loop resources.
+     */
+    boolean matches(Class<? extends EventExecutorGroup> type);
+
+    /**
+     * Create a new {@link EpollEventLoopGroup}.
+     *
+     * @param nThreads number of threads.
+     * @param threadFactory the {@link ThreadFactory}.
+     * @return the {@link EventLoopGroup}.
+     */
+    EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory);
+
+    /**
+     * @return the Domain Socket {@link Channel} class.
+     */
+    Class<? extends Channel> domainSocketChannelClass();
+
+    /**
+     * @return the {@link Channel} class.
+     */
+    Class<? extends Channel> socketChannelClass();
+
+    /**
+     * @return the {@link EventLoopGroup} class.
+     */
+    Class<? extends EventLoopGroup> eventLoopGroupClass();
+
+    /**
+     * @param socketPath the socket file path.
+     * @return a domain socket address object.
+     */
+    SocketAddress newSocketAddress(String socketPath);
+}
diff --git a/src/main/java/io/lettuce/core/resource/KqueueProvider.java b/src/main/java/io/lettuce/core/resource/KqueueProvider.java
new file mode 100644
index 0000000000..843c1f531d
--- /dev/null
+++ b/src/main/java/io/lettuce/core/resource/KqueueProvider.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.resource;
+
+import java.net.SocketAddress;
+import java.util.concurrent.ThreadFactory;
+
+import io.lettuce.core.internal.LettuceAssert;
+import io.netty.channel.Channel;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.kqueue.KQueue;
+import io.netty.channel.kqueue.KQueueDomainSocketChannel;
+import io.netty.channel.kqueue.KQueueEventLoopGroup;
+import io.netty.channel.kqueue.KQueueSocketChannel;
+import io.netty.channel.unix.DomainSocketAddress;
+import io.netty.util.concurrent.EventExecutorGroup;
+import io.netty.util.internal.SystemPropertyUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+/**
+ * Wraps and provides kqueue classes. This is to protect the user from {@link ClassNotFoundException}'s caused by the absence of
+ * the {@literal netty-transport-native-kqueue} library during runtime. Internal API.
+ *
+ * @author Mark Paluch
+ * @since 4.4
+ */
+public class KqueueProvider {
+
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(KqueueProvider.class);
+
+    private static final String KQUEUE_ENABLED_KEY = "io.lettuce.core.kqueue";
+    private static final boolean KQUEUE_ENABLED = Boolean.parseBoolean(SystemPropertyUtil.get(KQUEUE_ENABLED_KEY, "true"));
+
+    private static final boolean KQUEUE_AVAILABLE;
+    private static final EventLoopResources KQUEUE_RESOURCES;
+
+    static {
+
+        boolean availability;
+        try {
+            Class.forName("io.netty.channel.kqueue.KQueue");
+            availability = KQueue.isAvailable();
+        } catch (ClassNotFoundException e) {
+            availability = false;
+        }
+
+        KQUEUE_AVAILABLE = availability;
+
+        if (KQUEUE_AVAILABLE) {
+            logger.debug("Starting with kqueue library");
+            KQUEUE_RESOURCES = AvailableKqueueResources.INSTANCE;
+
+        } else {
+            logger.debug("Starting without optional kqueue library");
+            KQUEUE_RESOURCES = UnavailableKqueueResources.INSTANCE;
+        }
+    }
+
+    /**
+     * @return {@literal true} if kqueue is available.
+     */
+    public static boolean isAvailable() {
+        return KQUEUE_AVAILABLE && KQUEUE_ENABLED;
+    }
+
+    /**
+     * Check whether the kqueue library is available on the class path.
+     *
+     * @throws IllegalStateException if the {@literal netty-transport-native-kqueue} library is not available
+     */
+    static void checkForKqueueLibrary() {
+
+        LettuceAssert.assertState(KQUEUE_ENABLED,
+                String.format("kqueue use is disabled via System properties (%s)", KQUEUE_ENABLED_KEY));
+        LettuceAssert.assertState(isAvailable(),
+                "netty-transport-native-kqueue is not available. Make sure netty-transport-native-kqueue library on the class path and supported by your operating system.");
+    }
+
+    /**
+     * Returns the {@link EventLoopResources} for kqueue-backed transport. Check availability with {@link #isAvailable()} prior
+     * to obtaining the resources.
+     *
+     * @return the {@link EventLoopResources}. May be unavailable.
+     *
+     * @since 6.0
+     */
+    public static EventLoopResources getResources() {
+        return KQUEUE_RESOURCES;
+    }
+
+    /**
+     * {@link EventLoopResources} for unavailable EPoll.
+     */
+    enum UnavailableKqueueResources implements EventLoopResources {
+
+        INSTANCE;
+
+        @Override
+        public Class<? extends Channel> domainSocketChannelClass() {
+
+            checkForKqueueLibrary();
+            return null;
+        }
+
+        @Override
+        public Class<? extends EventLoopGroup> eventLoopGroupClass() {
+
+            checkForKqueueLibrary();
+            return null;
+        }
+
+        @Override
+        public boolean matches(Class<? extends EventExecutorGroup> type) {
+
+            checkForKqueueLibrary();
+            return false;
+        }
+
+        @Override
+        public EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
+
+            checkForKqueueLibrary();
+            return null;
+        }
+
+        @Override
+        public SocketAddress newSocketAddress(String socketPath) {
+
+            checkForKqueueLibrary();
+            return null;
+        }
+
+        @Override
+        public Class<? extends Channel> socketChannelClass() {
+
+            checkForKqueueLibrary();
+            return null;
+        }
+    }
+
+    /**
+     * {@link EventLoopResources} for available kqueue.
+     */
+    enum AvailableKqueueResources implements EventLoopResources {
+
+        INSTANCE;
+
+        @Override
+        public boolean matches(Class<? extends EventExecutorGroup> type) {
+
+            LettuceAssert.notNull(type, "EventLoopGroup type must not be null");
+
+            return type.equals(eventLoopGroupClass());
+        }
+
+        @Override
+        public EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
+
+            checkForKqueueLibrary();
+
+            return new KQueueEventLoopGroup(nThreads, threadFactory);
+        }
+
+        @Override
+        public Class<? extends Channel> domainSocketChannelClass() {
+
+            checkForKqueueLibrary();
+
+            return KQueueDomainSocketChannel.class;
+        }
+
+        @Override
+        public Class<? extends Channel> socketChannelClass() {
+
+            checkForKqueueLibrary();
+
+            return KQueueSocketChannel.class;
+        }
+
+        @Override
+        public Class<? extends EventLoopGroup> eventLoopGroupClass() {
+
+            checkForKqueueLibrary();
+
+            return KQueueEventLoopGroup.class;
+        }
+
+        @Override
+        public SocketAddress newSocketAddress(String socketPath) {
+
+            checkForKqueueLibrary();
+
+            return new DomainSocketAddress(socketPath);
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/resource/MappingSocketAddressResolver.java b/src/main/java/io/lettuce/core/resource/MappingSocketAddressResolver.java
index 21c3142ac2..fb9ca3a4e8 100644
--- a/src/main/java/io/lettuce/core/resource/MappingSocketAddressResolver.java
+++ b/src/main/java/io/lettuce/core/resource/MappingSocketAddressResolver.java
@@ -68,7 +68,7 @@ public static MappingSocketAddressResolver create(DnsResolver dnsResolver,
     public SocketAddress resolve(RedisURI redisURI) {
 
         if (redisURI.getSocket() != null) {
-            return redisURI.getResolvedAddress();
+            return getDomainSocketAddress(redisURI);
         }
 
         HostAndPort hostAndPort = HostAndPort.of(redisURI.getHost(), redisURI.getPort());
@@ -81,7 +81,7 @@ public SocketAddress resolve(RedisURI redisURI) {
         try {
             return doResolve(mapped);
         } catch (UnknownHostException e) {
-            return redisURI.getResolvedAddress();
+            return new InetSocketAddress(redisURI.getHost(), redisURI.getPort());
         }
     }
 
diff --git a/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java b/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
index 80140a9c06..df705035ce 100644
--- a/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
+++ b/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
@@ -81,7 +81,7 @@ public SocketAddress resolve(RedisURI redisURI) {
     public static SocketAddress resolve(RedisURI redisURI, DnsResolver dnsResolver) {
 
         if (redisURI.getSocket() != null) {
-            return redisURI.getResolvedAddress();
+            return getDomainSocketAddress(redisURI);
         }
 
         try {
@@ -93,7 +93,19 @@ public static SocketAddress resolve(RedisURI redisURI, DnsResolver dnsResolver)
 
             return new InetSocketAddress(inetAddress[0], redisURI.getPort());
         } catch (UnknownHostException e) {
-            return redisURI.getResolvedAddress();
+            return new InetSocketAddress(redisURI.getHost(), redisURI.getPort());
         }
     }
+
+    static SocketAddress getDomainSocketAddress(RedisURI redisURI) {
+
+        if (KqueueProvider.isAvailable() || EpollProvider.isAvailable()) {
+            EventLoopResources resources = KqueueProvider.isAvailable() ? KqueueProvider.getResources()
+                    : EpollProvider.getResources();
+            return resources.newSocketAddress(redisURI.getSocket());
+        }
+
+        throw new IllegalStateException(
+                "No native transport available. Make sure that either netty's epoll or kqueue library is on the class path and supported by your operating system.");
+    }
 }
diff --git a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java
index 9e3d15f817..430f64e609 100644
--- a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java
@@ -18,11 +18,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+import java.net.InetSocketAddress;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -46,18 +46,17 @@ class RoundRobinSocketAddressSupplierUnitTests {
     private static RedisURI hap2 = new RedisURI("127.0.0.1", 2, Duration.ofSeconds(1));
     private static RedisURI hap3 = new RedisURI("127.0.0.1", 3, Duration.ofSeconds(1));
     private static RedisURI hap4 = new RedisURI("127.0.0.1", 4, Duration.ofSeconds(1));
+
+    private static InetSocketAddress addr1 = new InetSocketAddress(hap1.getHost(), hap1.getPort());
+    private static InetSocketAddress addr2 = new InetSocketAddress(hap2.getHost(), hap2.getPort());
+    private static InetSocketAddress addr3 = new InetSocketAddress(hap3.getHost(), hap3.getPort());
+    private static InetSocketAddress addr4 = new InetSocketAddress(hap4.getHost(), hap4.getPort());
+
     private static Partitions partitions;
 
     @Mock
     private ClientResources clientResourcesMock;
 
-    @BeforeAll
-    static void beforeClass() {
-
-        hap1.getResolvedAddress();
-        hap2.getResolvedAddress();
-        hap3.getResolvedAddress();
-    }
 
     @BeforeEach
     void before() {
@@ -78,12 +77,12 @@ void noOffset() {
         RoundRobinSocketAddressSupplier sut = new RoundRobinSocketAddressSupplier(partitions,
                 redisClusterNodes -> redisClusterNodes, clientResourcesMock);
 
-        assertThat(sut.get()).isEqualTo(hap1.getResolvedAddress());
-        assertThat(sut.get()).isEqualTo(hap2.getResolvedAddress());
-        assertThat(sut.get()).isEqualTo(hap3.getResolvedAddress());
-        assertThat(sut.get()).isEqualTo(hap1.getResolvedAddress());
+        assertThat(sut.get()).isEqualTo(addr1);
+        assertThat(sut.get()).isEqualTo(addr2);
+        assertThat(sut.get()).isEqualTo(addr3);
+        assertThat(sut.get()).isEqualTo(addr1);
 
-        assertThat(sut.get()).isNotEqualTo(hap3.getResolvedAddress());
+        assertThat(sut.get()).isNotEqualTo(addr3);
     }
 
     @Test
@@ -92,16 +91,16 @@ void partitionTableChangesNewNode() {
         RoundRobinSocketAddressSupplier sut = new RoundRobinSocketAddressSupplier(partitions,
                 redisClusterNodes -> redisClusterNodes, clientResourcesMock);
 
-        assertThat(sut.get()).isEqualTo(hap1.getResolvedAddress());
-        assertThat(sut.get()).isEqualTo(hap2.getResolvedAddress());
+        assertThat(sut.get()).isEqualTo(addr1);
+        assertThat(sut.get()).isEqualTo(addr2);
 
         partitions.add(new RedisClusterNode(hap4, "4", true, "", 0, 0, 0, new ArrayList<>(), new HashSet<>()));
 
-        assertThat(sut.get()).isEqualTo(hap1.getResolvedAddress());
-        assertThat(sut.get()).isEqualTo(hap2.getResolvedAddress());
-        assertThat(sut.get()).isEqualTo(hap3.getResolvedAddress());
-        assertThat(sut.get()).isEqualTo(hap4.getResolvedAddress());
-        assertThat(sut.get()).isEqualTo(hap1.getResolvedAddress());
+        assertThat(sut.get()).isEqualTo(addr1);
+        assertThat(sut.get()).isEqualTo(addr2);
+        assertThat(sut.get()).isEqualTo(addr3);
+        assertThat(sut.get()).isEqualTo(addr4);
+        assertThat(sut.get()).isEqualTo(addr1);
     }
 
     @Test
@@ -110,13 +109,13 @@ void partitionTableChangesNodeRemoved() {
         RoundRobinSocketAddressSupplier sut = new RoundRobinSocketAddressSupplier(partitions,
                 redisClusterNodes -> redisClusterNodes, clientResourcesMock);
 
-        assertThat(sut.get()).isEqualTo(hap1.getResolvedAddress());
-        assertThat(sut.get()).isEqualTo(hap2.getResolvedAddress());
+        assertThat(sut.get()).isEqualTo(addr1);
+        assertThat(sut.get()).isEqualTo(addr2);
 
         partitions.remove(partitions.getPartition(2));
 
-        assertThat(sut.get()).isEqualTo(hap1.getResolvedAddress());
-        assertThat(sut.get()).isEqualTo(hap2.getResolvedAddress());
-        assertThat(sut.get()).isEqualTo(hap1.getResolvedAddress());
+        assertThat(sut.get()).isEqualTo(addr1);
+        assertThat(sut.get()).isEqualTo(addr2);
+        assertThat(sut.get()).isEqualTo(addr1);
     }
 }

From 5ca5da273799dc524dc4403f22dd9e6f9b27234d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 27 Dec 2019 18:43:37 +0100
Subject: [PATCH 709/808] Adapt GEOHASH tests to 10 chars #1196

---
 .../commands/GeoCommandIntegrationTests.java  | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java
index a1071a541d..1d4bd36daa 100644
--- a/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java
@@ -286,7 +286,8 @@ void geohash() {
 
         List<Value<String>> geohash = redis.geohash(key, "Weinheim", "Bahn", "dunno");
 
-        assertThat(geohash).containsSequence(Value.just("u0y1v0kffz0"), Value.just("u0y1vhvuvm0"), Value.empty());
+        assertThat(geohash).filteredOn(Value::hasValue).extracting(Value::getValue).extracting(s -> s.substring(0, 10))
+                .containsOnly("u0y1v0kffz", "u0y1vhvuvm");
     }
 
     @Test
@@ -314,7 +315,8 @@ public void geohashInTransaction() {
 
         List<Value<String>> geohash = exec.get(1);
 
-        assertThat(geohash).containsSequence(Value.just("u0y1v0kffz0"), Value.just("u0y1vhvuvm0"), Value.empty());
+        assertThat(geohash).filteredOn(Value::hasValue).extracting(Value::getValue).extracting(s -> s.substring(0, 10))
+                .containsOnly("u0y1v0kffz", "u0y1vhvuvm");
     }
 
     @Test
@@ -337,8 +339,8 @@ void georadiusStoreWithCountAndSort() {
         prepareGeo();
 
         String resultKey = "38o54"; // yields in same slot as "key"
-        Long result = redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, new GeoRadiusStoreArgs<>().withCount(1)
-                .desc().withStore(resultKey));
+        Long result = redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km,
+                new GeoRadiusStoreArgs<>().withCount(1).desc().withStore(resultKey));
         assertThat(result).isEqualTo(1);
 
         List<ScoredValue<String>> results = redis.zrangeWithScores(resultKey, 0, -1);
@@ -366,8 +368,8 @@ void georadiusStoreDistWithCountAndSort() {
         prepareGeo();
 
         String resultKey = "38o54"; // yields in same slot as "key"
-        Long result = redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, new GeoRadiusStoreArgs<>().withCount(1)
-                .desc().withStoreDist("38o54"));
+        Long result = redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km,
+                new GeoRadiusStoreArgs<>().withCount(1).desc().withStoreDist("38o54"));
         assertThat(result).isEqualTo(1);
 
         List<ScoredValue<String>> dist = redis.zrangeWithScores(resultKey, 0, -1);
@@ -378,15 +380,15 @@ void georadiusStoreDistWithCountAndSort() {
 
     @Test
     void georadiusWithNullArgs() {
-        assertThatThrownBy(() -> redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, (GeoArgs) null)).isInstanceOf(
-                IllegalArgumentException.class);
+        assertThatThrownBy(() -> redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, (GeoArgs) null))
+                .isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
     void georadiusStoreWithNullArgs() {
         assertThatThrownBy(
                 () -> redis.georadius(key, 8.665351, 49.553302, 5, GeoArgs.Unit.km, (GeoRadiusStoreArgs<String>) null))
-                .isInstanceOf(IllegalArgumentException.class);
+                        .isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
@@ -407,8 +409,8 @@ void georadiusbymemberStoreDistWithCountAndSort() {
         prepareGeo();
 
         String resultKey = "38o54"; // yields in same slot as "key"
-        Long result = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km, new GeoRadiusStoreArgs<>().withCount(1).desc()
-                .withStoreDist("38o54"));
+        Long result = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km,
+                new GeoRadiusStoreArgs<>().withCount(1).desc().withStoreDist("38o54"));
         assertThat(result).isEqualTo(1);
 
         List<ScoredValue<String>> dist = redis.zrangeWithScores(resultKey, 0, -1);
@@ -422,8 +424,8 @@ void georadiusbymemberWithArgs() {
 
         prepareGeo();
 
-        List<GeoWithin<String>> empty = redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km, new GeoArgs().withHash()
-                .withCoordinates().withDistance().desc());
+        List<GeoWithin<String>> empty = redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km,
+                new GeoArgs().withHash().withCoordinates().withDistance().desc());
         assertThat(empty).isNotEmpty();
 
         List<GeoWithin<String>> withDistanceAndCoordinates = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km,
@@ -436,8 +438,8 @@ void georadiusbymemberWithArgs() {
         assertThat(weinheim.getDistance()).isNotNull();
         assertThat(weinheim.getCoordinates()).isNotNull();
 
-        List<GeoWithin<String>> withDistanceAndHash = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km, new GeoArgs()
-                .withDistance().withHash().desc());
+        List<GeoWithin<String>> withDistanceAndHash = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km,
+                new GeoArgs().withDistance().withHash().desc());
         assertThat(withDistanceAndHash).hasSize(2);
 
         GeoWithin<String> weinheimDistanceHash = withDistanceAndHash.get(0);
@@ -446,8 +448,8 @@ void georadiusbymemberWithArgs() {
         assertThat(weinheimDistanceHash.getDistance()).isNotNull();
         assertThat(weinheimDistanceHash.getCoordinates()).isNull();
 
-        List<GeoWithin<String>> withCoordinates = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km, new GeoArgs()
-                .withCoordinates().desc());
+        List<GeoWithin<String>> withCoordinates = redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km,
+                new GeoArgs().withCoordinates().desc());
         assertThat(withCoordinates).hasSize(2);
 
         GeoWithin<String> weinheimCoordinates = withCoordinates.get(0);
@@ -463,8 +465,8 @@ public void georadiusbymemberWithArgsInTransaction() {
         prepareGeo();
 
         redis.multi();
-        redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km, new GeoArgs().withHash().withCoordinates().withDistance()
-                .desc());
+        redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km,
+                new GeoArgs().withHash().withCoordinates().withDistance().desc());
         redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km, new GeoArgs().withCoordinates().withDistance().desc());
         redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km, new GeoArgs().withDistance().withHash().desc());
         redis.georadiusbymember(key, "Bahn", 5, GeoArgs.Unit.km, new GeoArgs().withCoordinates().desc());
@@ -504,8 +506,8 @@ public void georadiusbymemberWithArgsInTransaction() {
 
     @Test
     void georadiusbymemberWithNullArgs() {
-        assertThatThrownBy(() -> redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km, (GeoArgs) null)).isInstanceOf(
-                IllegalArgumentException.class);
+        assertThatThrownBy(() -> redis.georadiusbymember(key, "Bahn", 1, GeoArgs.Unit.km, (GeoArgs) null))
+                .isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test

From 872272c926106437ea77214b373d1d794604e3a9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 20 Apr 2019 18:54:37 +0200
Subject: [PATCH 710/808] Initial RESP3 support #964

---
 .../io/lettuce/core/AbstractRedisClient.java  |  32 +-
 .../java/io/lettuce/core/ClientOptions.java   |  43 +-
 .../io/lettuce/core/ConnectionBuilder.java    |  57 ++-
 .../java/io/lettuce/core/RedisClient.java     |  42 +-
 .../io/lettuce/core/RedisCommandBuilder.java  |  16 +
 src/main/java/io/lettuce/core/RedisURI.java   |  21 +
 .../core/cluster/ClusterClientOptions.java    |  10 +-
 .../core/cluster/RedisClusterClient.java      |  88 ++--
 .../models/command/CommandDetailParser.java   |   1 +
 .../io/lettuce/core/output/BooleanOutput.java |   5 +
 .../io/lettuce/core/output/CommandOutput.java |  73 +++
 .../io/lettuce/core/output/DoubleOutput.java  |   5 +
 .../lettuce/core/output/GenericMapOutput.java |  93 ++++
 .../core/output/GeoCoordinatesListOutput.java |  11 +-
 .../output/GeoCoordinatesValueListOutput.java |  11 +-
 .../core/output/GeoWithinListOutput.java      |  16 +-
 .../output/KeyValueScoredValueOutput.java     |  13 +-
 .../core/output/ScoredValueListOutput.java    |   8 +-
 .../core/output/ScoredValueOutput.java        |  11 +-
 .../core/output/ScoredValueScanOutput.java    |   7 +-
 .../ScoredValueScanStreamingOutput.java       |   8 +-
 .../output/ScoredValueStreamingOutput.java    |   8 +-
 .../lettuce/core/output/StreamReadOutput.java |   7 +-
 .../lettuce/core/output/ValueListOutput.java  |   6 +
 .../lettuce/core/output/ValueSetOutput.java   |   6 +
 .../protocol/BaseRedisCommandBuilder.java     |  18 +-
 .../io/lettuce/core/protocol/CommandType.java |   3 +-
 .../core/protocol/ProtocolVersion.java        |  44 ++
 .../core/protocol/RedisProtocolException.java |  31 ++
 .../core/protocol/RedisStateMachine.java      | 436 +++++++++++++++++-
 src/test/java/io/lettuce/RedisBug.java        |  33 ++
 .../core/ClientOptionsIntegrationTests.java   |  31 +-
 .../lettuce/core/ClientOptionsUnitTests.java  |   4 +-
 .../ConnectionCommandIntegrationTests.java    |  39 +-
 .../io/lettuce/core/ProtectedModeTests.java   |   4 +-
 .../io/lettuce/core/SslIntegrationTests.java  |  16 -
 .../ClusterClientOptionsUnitTests.java        |   8 +-
 .../RedisClusterClientIntegrationTests.java   |  24 -
 .../ServerCommandIntegrationTests.java        |   2 +
 .../SortedSetCommandIntegrationTests.java     |   2 +
 .../masterslave/StaticMasterSlaveTest.java    |   7 +-
 .../ConnectionFailureIntegrationTests.java    |  17 +-
 .../RedisStateMachineResp2UnitTests.java      | 190 ++++++++
 .../RedisStateMachineResp3UnitTests.java      | 226 +++++++++
 .../core/protocol/StateMachineUnitTests.java  |  17 +-
 .../SentinelConnectionIntegrationTests.java   |   4 +-
 .../test/condition/RedisConditions.java       |   5 +
 .../lettuce/test/settings/TestSettings.java   |   2 +-
 48 files changed, 1493 insertions(+), 268 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/output/GenericMapOutput.java
 create mode 100644 src/main/java/io/lettuce/core/protocol/ProtocolVersion.java
 create mode 100644 src/main/java/io/lettuce/core/protocol/RedisProtocolException.java
 create mode 100644 src/test/java/io/lettuce/RedisBug.java
 create mode 100644 src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java
 create mode 100644 src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 099fbdad7c..0cff16726a 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -33,6 +33,7 @@
 import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.ConnectionWatchdog;
+import io.lettuce.core.protocol.ProtocolVersion;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
 import io.netty.bootstrap.Bootstrap;
@@ -148,7 +149,8 @@ protected void connectionBuilder(Mono<SocketAddress> socketAddressSupplier, Conn
         redisBootstrap.option(ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 8 * 1024);
         redisBootstrap.option(ChannelOption.ALLOCATOR, BUF_ALLOCATOR);
 
-        SocketOptions socketOptions = getOptions().getSocketOptions();
+        ClientOptions clientOptions = getOptions();
+        SocketOptions socketOptions = clientOptions.getSocketOptions();
 
         redisBootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS,
                 Math.toIntExact(socketOptions.getConnectTimeout().toMillis()));
@@ -159,13 +161,39 @@ protected void connectionBuilder(Mono<SocketAddress> socketAddressSupplier, Conn
         }
 
         connectionBuilder.timeout(redisURI.getTimeout());
-        connectionBuilder.password(redisURI.getPassword());
+        connectionBuilder.clientName(redisURI.getClientName());
+
+        if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2) {
+
+            if (hasPassword(redisURI)) {
+                connectionBuilder.auth(redisURI.getPassword());
+                connectionBuilder.handshakeAuthResp2();
+            }
+        } else if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP3) {
+
+            if (hasPassword(redisURI)) {
+                if (LettuceStrings.isNotEmpty(redisURI.getUsername())) {
+                    connectionBuilder.auth(redisURI.getUsername(), redisURI.getPassword());
+
+                } else {
+                    connectionBuilder.auth("default", redisURI.getPassword());
+                }
+                connectionBuilder.handshakeAuthResp3();
+
+            } else {
+                connectionBuilder.handshakeResp3();
+            }
+        }
 
         connectionBuilder.bootstrap(redisBootstrap);
         connectionBuilder.channelGroup(channels).connectionEvents(connectionEvents).timer(timer);
         connectionBuilder.socketAddressSupplier(socketAddressSupplier);
     }
 
+    private boolean hasPassword(RedisURI connectionSettings) {
+        return connectionSettings.getPassword() != null && connectionSettings.getPassword().length != 0;
+    }
+
     protected void channelType(ConnectionBuilder connectionBuilder, ConnectionPoint connectionPoint) {
 
         LettuceAssert.notNull(connectionPoint, "ConnectionPoint must not be null");
diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index 60e515d362..63b04a4997 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -18,6 +18,7 @@
 import java.io.Serializable;
 
 import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.ProtocolVersion;
 import io.lettuce.core.resource.ClientResources;
 
 /**
@@ -29,7 +30,7 @@
 @SuppressWarnings("serial")
 public class ClientOptions implements Serializable {
 
-    public static final boolean DEFAULT_PING_BEFORE_ACTIVATE_CONNECTION = false;
+    public static final ProtocolVersion DEFAULT_PROTOCOL_VERSION = ProtocolVersion.newestSupported();
     public static final boolean DEFAULT_AUTO_RECONNECT = true;
     public static final boolean DEFAULT_CANCEL_CMD_RECONNECT_FAIL = false;
     public static final boolean DEFAULT_PUBLISH_ON_SCHEDULER = false;
@@ -41,7 +42,7 @@ public class ClientOptions implements Serializable {
     public static final TimeoutOptions DEFAULT_TIMEOUT_OPTIONS = TimeoutOptions.create();
     public static final int DEFAULT_BUFFER_USAGE_RATIO = 3;
 
-    private final boolean pingBeforeActivateConnection;
+    private final ProtocolVersion protocolVersion;
     private final boolean autoReconnect;
     private final boolean cancelCommandsOnReconnectFailure;
     private final boolean publishOnScheduler;
@@ -54,7 +55,7 @@ public class ClientOptions implements Serializable {
     private final int bufferUsageRatio;
 
     protected ClientOptions(Builder builder) {
-        this.pingBeforeActivateConnection = builder.pingBeforeActivateConnection;
+        this.protocolVersion = builder.protocolVersion;
         this.cancelCommandsOnReconnectFailure = builder.cancelCommandsOnReconnectFailure;
         this.publishOnScheduler = builder.publishOnScheduler;
         this.autoReconnect = builder.autoReconnect;
@@ -68,7 +69,7 @@ protected ClientOptions(Builder builder) {
     }
 
     protected ClientOptions(ClientOptions original) {
-        this.pingBeforeActivateConnection = original.isPingBeforeActivateConnection();
+        this.protocolVersion = original.getProtocolVersion();
         this.autoReconnect = original.isAutoReconnect();
         this.cancelCommandsOnReconnectFailure = original.isCancelCommandsOnReconnectFailure();
         this.publishOnScheduler = original.isPublishOnScheduler();
@@ -114,7 +115,7 @@ public static ClientOptions create() {
      */
     public static class Builder {
 
-        private boolean pingBeforeActivateConnection = DEFAULT_PING_BEFORE_ACTIVATE_CONNECTION;
+        private ProtocolVersion protocolVersion = DEFAULT_PROTOCOL_VERSION;
         private boolean autoReconnect = DEFAULT_AUTO_RECONNECT;
         private boolean cancelCommandsOnReconnectFailure = DEFAULT_CANCEL_CMD_RECONNECT_FAIL;
         private boolean publishOnScheduler = DEFAULT_PUBLISH_ON_SCHEDULER;
@@ -130,17 +131,17 @@ protected Builder() {
         }
 
         /**
-         * Sets the {@literal PING} before activate connection flag. Defaults to {@literal false}. See
-         * {@link #DEFAULT_PING_BEFORE_ACTIVATE_CONNECTION}.
+         * Sets the {@link ProtocolVersion} to use. Defaults to {@literal RESP3}. See {@link #DEFAULT_PROTOCOL_VERSION}.
          *
-         * @param pingBeforeActivateConnection true/false
+         * @param protocolVersion version to use.
          * @return {@code this}
-         * @deprecated since 5.2. PING during connection handshake becomes mandatory with RESP3. This method will be removed
-         *             with Lettuce 6.
+         * @since 6.0
+         * @see ProtocolVersion#newestSupported()
          */
-        @Deprecated
-        public Builder pingBeforeActivateConnection(boolean pingBeforeActivateConnection) {
-            this.pingBeforeActivateConnection = pingBeforeActivateConnection;
+        public Builder protocolVersion(ProtocolVersion protocolVersion) {
+
+            LettuceAssert.notNull(protocolVersion, "ProtocolVersion must not be null");
+            this.protocolVersion = protocolVersion;
             return this;
         }
 
@@ -315,25 +316,19 @@ public ClientOptions.Builder mutate() {
         builder.autoReconnect(isAutoReconnect()).bufferUsageRatio(getBufferUsageRatio())
                 .cancelCommandsOnReconnectFailure(isCancelCommandsOnReconnectFailure())
                 .disconnectedBehavior(getDisconnectedBehavior()).publishOnScheduler(isPublishOnScheduler())
-                .pingBeforeActivateConnection(isPingBeforeActivateConnection()).requestQueueSize(getRequestQueueSize())
-                .socketOptions(getSocketOptions()).sslOptions(getSslOptions())
+                .requestQueueSize(getRequestQueueSize()).socketOptions(getSocketOptions()).sslOptions(getSslOptions())
                 .suspendReconnectOnProtocolFailure(isSuspendReconnectOnProtocolFailure()).timeoutOptions(getTimeoutOptions());
 
         return builder;
     }
 
     /**
-     * Enables initial {@literal PING} barrier before any connection is usable. If {@literal true} (default is {@literal false}
-     * ), every connection and reconnect will issue a {@literal PING} command and awaits its response before the connection is
-     * activated and enabled for use. If the check fails, the connect/reconnect is treated as failure.
+     * Returns the {@link ProtocolVersion} to use.
      *
-     * @return {@literal true} if {@literal PING} barrier is enabled.
-     * @deprecated since 5.2. PING during connection handshake becomes mandatory with RESP3. This method will be removed with
-     *             Lettuce 6.
+     * @return the {@link ProtocolVersion} to use.
      */
-    @Deprecated
-    public boolean isPingBeforeActivateConnection() {
-        return pingBeforeActivateConnection;
+    public ProtocolVersion getProtocolVersion() {
+        return protocolVersion;
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index f659d1571c..bc2dc937cc 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -16,6 +16,9 @@
 package io.lettuce.core;
 
 import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
@@ -54,10 +57,12 @@ public class ConnectionBuilder {
     private ClientOptions clientOptions;
     private Duration timeout;
     private ClientResources clientResources;
+    private String username;
     private char[] password;
+    private String clientName;
     private ReconnectionListener reconnectionListener = ReconnectionListener.NO_OP;
     private ConnectionWatchdog connectionWatchdog;
-    private Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier = PlainChannelInitializer.NO_PING;
+    private Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier = ConnectionBuilder.PING_COMMAND_SUPPLIER;
 
     public static ConnectionBuilder connectionBuilder() {
         return new ConnectionBuilder();
@@ -88,22 +93,18 @@ protected List<ChannelHandler> buildHandlers() {
         return handlers;
     }
 
-    /**
-     * @deprecated since 5.2. PING during connection handshake becomes mandatory with RESP3. This method will be removed with
-     *             Lettuce 6.
-     */
-    @Deprecated
-    public void enablePingBeforeConnect() {
-        pingCommandSupplier = PING_COMMAND_SUPPLIER;
+    public void handshakeAuthResp2() {
+        pingCommandSupplier = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.auth(new String(password)));
     }
 
-    /**
-     * @deprecated since 5.2. PING during connection handshake becomes mandatory with RESP3. This method will be removed with
-     *             Lettuce 6.
-     */
-    @Deprecated
-    public void enableAuthPingBeforeConnect() {
-        pingCommandSupplier = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.auth(new String(password)));
+    public void handshakeAuthResp3() {
+        pingCommandSupplier = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.hello(3, this.username.getBytes(),
+                encode(this.password), this.clientName != null ? this.clientName.getBytes() : null));
+    }
+
+    public void handshakeResp3() {
+        pingCommandSupplier = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.hello(3, null, null,
+                this.clientName != null ? this.clientName.getBytes() : null));
     }
 
     protected ConnectionWatchdog createConnectionWatchdog() {
@@ -201,6 +202,23 @@ public ConnectionBuilder clientResources(ClientResources clientResources) {
         return this;
     }
 
+    public ConnectionBuilder clientName(String clientName) {
+        this.clientName = clientName;
+        return this;
+    }
+
+    public ConnectionBuilder auth(String username, char[] password) {
+        this.username = username;
+        this.password = password;
+        return this;
+    }
+
+    public ConnectionBuilder auth(char[] password) {
+        this.password = password;
+        return this;
+    }
+
+    @Deprecated
     public ConnectionBuilder password(char[] password) {
         this.password = password;
         return this;
@@ -233,4 +251,13 @@ public Endpoint endpoint() {
     Supplier<AsyncCommand<?, ?, ?>> getPingCommandSupplier() {
         return pingCommandSupplier;
     }
+
+    static byte[] encode(char[] chars) {
+
+        ByteBuffer encoded = Charset.defaultCharset().encode(CharBuffer.wrap(chars));
+        byte[] bytes = new byte[encoded.remaining()];
+        encoded.get(bytes);
+
+        return bytes;
+    }
 }
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index bb1118756d..35e171bf76 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -342,19 +342,26 @@ private <K, V> ConnectionBuilder getConnectionBuilder(Endpoint endpoint, RedisUR
         connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
         channelType(connectionBuilder, redisURI);
 
-        if (clientOptions.isPingBeforeActivateConnection()) {
-            if (hasPassword(redisURI)) {
-                connectionBuilder.enableAuthPingBeforeConnect();
-            } else {
-                connectionBuilder.enablePingBeforeConnect();
-            }
+        ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
+        ConnectionFuture<?> sync = future;
+
+        if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2 && LettuceStrings.isNotEmpty(redisURI.getClientName())) {
+            sync = sync.thenApply(channelHandler -> {
+                connection.setClientName(redisURI.getClientName());
+                return channelHandler;
+            });
         }
 
-        return connectionBuilder;
-    }
+        if (redisURI.getDatabase() != 0) {
 
-    private static boolean hasPassword(RedisURI redisURI) {
-        return redisURI.getPassword() != null && redisURI.getPassword().length != 0;
+            sync = sync.thenCompose(channelHandler -> {
+
+                CommandArgs<K, V> args = new CommandArgs<>(codec).add(redisURI.getDatabase());
+                return connection.async().dispatch(CommandType.SELECT, new StatusOutput<>(codec), args);
+            });
+        }
+
+        return sync.thenApply(channelHandler -> (S) connection);
     }
 
     /**
@@ -603,23 +610,10 @@ private <K, V> ConnectionFuture<StatefulRedisSentinelConnection<K, V>> doConnect
         connectionBuilder.connection(connection);
         connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
 
-        if (clientOptions.isPingBeforeActivateConnection()) {
-            connectionBuilder.enablePingBeforeConnect();
-        }
-
         channelType(connectionBuilder, redisURI);
         ConnectionFuture<?> sync = initializeChannelAsync(connectionBuilder);
 
-        if (!clientOptions.isPingBeforeActivateConnection() && hasPassword(redisURI)) {
-
-            sync = sync.thenCompose(channelHandler -> {
-
-                CommandArgs<K, V> args = new CommandArgs<>(codec).add(redisURI.getPassword());
-                return connection.async().dispatch(CommandType.AUTH, new StatusOutput<>(codec), args).toCompletableFuture();
-            });
-        }
-
-        if (LettuceStrings.isNotEmpty(clientName)) {
+        if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2 && LettuceStrings.isNotEmpty(clientName)) {
             sync = sync.thenApply(channelHandler -> {
                 connection.setClientName(clientName);
                 return channelHandler;
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 3a4a4d962f..d6a694c387 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -26,6 +26,7 @@
 import io.lettuce.core.XReadArgs.StreamOffset;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.output.*;
 import io.lettuce.core.protocol.*;
@@ -852,6 +853,21 @@ Command<K, V, Long> hdel(K key, K... fields) {
         return createCommand(HDEL, new IntegerOutput<>(codec), args);
     }
 
+    Command<String, String, Map<String, Object>> hello(int protocolVersion, byte[] user, byte password[], byte[] name) {
+
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.ASCII).add(protocolVersion);
+
+        if (user != null && password != null) {
+            args.add(AUTH).add(user).add(password);
+        }
+
+        if (name != null) {
+            args.add(SETNAME).add(name);
+        }
+
+        return new Command<>(HELLO, new GenericMapOutput<>(StringCodec.ASCII), args);
+    }
+
     Command<K, V, Boolean> hexists(K key, K field) {
         notNullKey(key);
         LettuceAssert.notNull(field, "Field " + MUST_NOT_BE_NULL);
diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 2ee95191aa..857873c133 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -167,6 +167,7 @@ public class RedisURI implements Serializable, ConnectionPoint {
     private int port;
     private int database;
     private String clientName;
+    private String username;
     private char[] password;
     private boolean ssl = false;
     private boolean verifyPeer = true;
@@ -316,6 +317,26 @@ public void setSocket(String socket) {
         this.socket = socket;
     }
 
+    /**
+     * Returns the username.
+     *
+     * @return the username
+     * @since 6.0
+     */
+    public String getUsername() {
+        return username;
+    }
+
+    /**
+     * Sets the username.
+     *
+     * @param username the username, must not be {@literal null}.
+     * @since 6.0
+     */
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
     /**
      * Returns the password.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index efe49d9e5b..f3bbb525ab 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -22,6 +22,7 @@
 import io.lettuce.core.SslOptions;
 import io.lettuce.core.TimeoutOptions;
 import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.protocol.ProtocolVersion;
 
 /**
  * Client Options to control the behavior of {@link RedisClusterClient}.
@@ -110,7 +111,7 @@ public static ClusterClientOptions.Builder builder(ClientOptions clientOptions)
                 .cancelCommandsOnReconnectFailure(clientOptions.isCancelCommandsOnReconnectFailure())
                 .disconnectedBehavior(clientOptions.getDisconnectedBehavior())
                 .publishOnScheduler(clientOptions.isPublishOnScheduler())
-                .pingBeforeActivateConnection(clientOptions.isPingBeforeActivateConnection())
+.protocolVersion(clientOptions.getProtocolVersion())
                 .requestQueueSize(clientOptions.getRequestQueueSize()).socketOptions(clientOptions.getSocketOptions())
                 .sslOptions(clientOptions.getSslOptions())
                 .suspendReconnectOnProtocolFailure(clientOptions.isSuspendReconnectOnProtocolFailure())
@@ -177,9 +178,8 @@ public Builder topologyRefreshOptions(ClusterTopologyRefreshOptions topologyRefr
         }
 
         @Override
-        @Deprecated
-        public Builder pingBeforeActivateConnection(boolean pingBeforeActivateConnection) {
-            super.pingBeforeActivateConnection(pingBeforeActivateConnection);
+        public Builder protocolVersion(ProtocolVersion protocolVersion) {
+            super.protocolVersion(protocolVersion);
             return this;
         }
 
@@ -269,7 +269,7 @@ public ClusterClientOptions.Builder mutate() {
         builder.autoReconnect(isAutoReconnect()).bufferUsageRatio(getBufferUsageRatio())
                 .cancelCommandsOnReconnectFailure(isCancelCommandsOnReconnectFailure())
                 .disconnectedBehavior(getDisconnectedBehavior()).publishOnScheduler(isPublishOnScheduler())
-                .pingBeforeActivateConnection(isPingBeforeActivateConnection()).requestQueueSize(getRequestQueueSize())
+                .protocolVersion(getProtocolVersion()).requestQueueSize(getRequestQueueSize())
                 .socketOptions(getSocketOptions()).sslOptions(getSslOptions())
                 .suspendReconnectOnProtocolFailure(isSuspendReconnectOnProtocolFailure()).timeoutOptions(getTimeoutOptions())
                 .validateClusterNodeMembership(isValidateClusterNodeMembership()).maxRedirects(getMaxRedirects())
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index fbdcfb99c7..b27727f879 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -50,8 +50,10 @@
 import io.lettuce.core.internal.LettuceLists;
 import io.lettuce.core.models.command.CommandDetailParser;
 import io.lettuce.core.output.KeyValueStreamingChannel;
-import io.lettuce.core.output.StatusOutput;
-import io.lettuce.core.protocol.*;
+import io.lettuce.core.protocol.CommandExpiryWriter;
+import io.lettuce.core.protocol.CommandHandler;
+import io.lettuce.core.protocol.DefaultEndpoint;
+import io.lettuce.core.protocol.ProtocolVersion;
 import io.lettuce.core.pubsub.PubSubCommandHandler;
 import io.lettuce.core.pubsub.PubSubEndpoint;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
@@ -539,7 +541,8 @@ <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNode
 
         ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectionFuture = connectStatefulAsync(connection, codec,
                 endpoint, getFirstUri(), socketAddressSupplier,
-                () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec, endpoint));
+                () -> new PubSubCommandHandler<>(clientOptions,
+                        clientResources, codec, endpoint));
         return connectionFuture.whenComplete((conn, throwable) -> {
             if (throwable != null) {
                 connection.close();
@@ -598,11 +601,16 @@ private <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectCl
                     .onErrorResume(t -> connect(socketAddressSupplier, codec, endpoint, connection, commandHandlerSupplier));
         }
 
-        return connectionMono.flatMap(c -> c.reactive().command().collectList() //
-                .map(CommandDetailParser::parse) //
-                .doOnNext(detail -> c.setState(new RedisState(detail))) //
-                .doOnError(e -> c.setState(new RedisState(Collections.emptyList()))).then(Mono.just(c))
-                .onErrorResume(RedisCommandExecutionException.class, e -> Mono.just(c)))
+        return connectionMono
+                .flatMap(
+                        c -> c.reactive().command().collectList()
+                                //
+                                .map(CommandDetailParser::parse)
+                                //
+                                .doOnNext(detail -> c.setState(new RedisState(detail)))
+                                //
+                                .doOnError(e -> c.setState(new RedisState(Collections.emptyList()))).then(Mono.just(c))
+                                .onErrorResume(RedisCommandExecutionException.class, e -> Mono.just(c)))
                 .doOnNext(
                         c -> connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider))
                 .map(it -> (StatefulRedisClusterConnection<K, V>) it).toFuture();
@@ -669,11 +677,17 @@ private <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> con
                     .onErrorResume(t -> connect(socketAddressSupplier, codec, endpoint, connection, commandHandlerSupplier));
         }
 
-        return connectionMono.flatMap(c -> c.reactive().command().collectList() //
-                .map(CommandDetailParser::parse) //
-                .doOnNext(detail -> c.setState(new RedisState(detail)))
-                .doOnError(e -> c.setState(new RedisState(Collections.emptyList()))).then(Mono.just(c))
-                .onErrorResume(RedisCommandExecutionException.class, e -> Mono.just(c)))
+        return connectionMono
+                .flatMap(
+                        c -> c.reactive()
+                                .command()
+                                .collectList()
+                                //
+                                .map(CommandDetailParser::parse)
+                                //
+                                .doOnNext(detail -> c.setState(new RedisState(detail)))
+                                .doOnError(e -> c.setState(new RedisState(Collections.emptyList()))).then(Mono.just(c))
+                                .onErrorResume(RedisCommandExecutionException.class, e -> Mono.just(c)))
                 .doOnNext(
                         c -> connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider))
                 .map(it -> (StatefulRedisClusterPubSubConnection<K, V>) it).toFuture();
@@ -694,39 +708,11 @@ private <K, V, T extends RedisChannelHandler<K, V>, S> ConnectionFuture<S> conne
         ConnectionBuilder connectionBuilder = createConnectionBuilder(connection, endpoint, connectionSettings,
                 socketAddressSupplier, commandHandlerSupplier);
 
-        if (clientOptions.isPingBeforeActivateConnection()) {
-            if (hasPassword(connectionSettings)) {
-                connectionBuilder.enableAuthPingBeforeConnect();
-            } else {
-                connectionBuilder.enablePingBeforeConnect();
-            }
-        }
-
         ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
         ConnectionFuture<?> sync = future;
 
-        if (!clientOptions.isPingBeforeActivateConnection() && hasPassword(connectionSettings)) {
-
-            sync = sync.thenCompose(channelHandler -> {
-
-                CommandArgs<K, V> args = new CommandArgs<>(codec).add(connectionSettings.getPassword());
-                AsyncCommand<K, V, String> command = new AsyncCommand<>(
-                        new Command<>(CommandType.AUTH, new StatusOutput<>(codec), args));
-
-                if (connection instanceof StatefulRedisClusterConnectionImpl) {
-                    ((StatefulRedisClusterConnectionImpl) connection).dispatch(command);
-                }
-
-                if (connection instanceof StatefulRedisConnectionImpl) {
-                    ((StatefulRedisConnectionImpl) connection).dispatch(command);
-                }
-
-                return command;
-            });
-
-        }
-
-        if (LettuceStrings.isNotEmpty(connectionSettings.getClientName())) {
+        if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2
+                && LettuceStrings.isNotEmpty(connectionSettings.getClientName())) {
             sync = sync.thenApply(channelHandler -> {
 
                 if (connection instanceof StatefulRedisClusterConnectionImpl) {
@@ -768,6 +754,22 @@ private <K, V> ConnectionBuilder createConnectionBuilder(RedisChannelHandler<K,
         connectionBuilder.commandHandler(commandHandlerSupplier);
         connectionBuilder(socketAddressSupplier, connectionBuilder, connectionSettings);
         channelType(connectionBuilder, connectionSettings);
+
+        if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2) {
+
+            if (hasPassword(connectionSettings)) {
+                connectionBuilder.auth(connectionSettings.getPassword());
+                connectionBuilder.handshakeAuthResp2();
+            }
+        } else if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP3) {
+
+            if (LettuceStrings.isNotEmpty(connectionSettings.getUsername())) {
+                connectionBuilder.auth(connectionSettings.getUsername(), connectionSettings.getPassword());
+                connectionBuilder.handshakeAuthResp3();
+            } else {
+                connectionBuilder.handshakeResp3();
+            }
+        }
         return connectionBuilder;
     }
 
diff --git a/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java b/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
index 6a24b1e4e9..b75eb14cb9 100644
--- a/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
+++ b/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
@@ -98,6 +98,7 @@ private static CommandDetail parseCommandDetail(Collection<?> collection) {
 
         Set<CommandDetail.Flag> parsedFlags = parseFlags(flags);
 
+        // TODO: Extract command grouping (ACL)
         return new CommandDetail(name, arity, parsedFlags, firstKey, lastKey, keyStepCount);
     }
 
diff --git a/src/main/java/io/lettuce/core/output/BooleanOutput.java b/src/main/java/io/lettuce/core/output/BooleanOutput.java
index f97f24199f..ca8ee0edb3 100644
--- a/src/main/java/io/lettuce/core/output/BooleanOutput.java
+++ b/src/main/java/io/lettuce/core/output/BooleanOutput.java
@@ -43,4 +43,9 @@ public void set(long integer) {
     public void set(ByteBuffer bytes) {
         output = (bytes != null) ? Boolean.TRUE : Boolean.FALSE;
     }
+
+    @Override
+    public void set(boolean value) {
+        output = value;
+    }
 }
diff --git a/src/main/java/io/lettuce/core/output/CommandOutput.java b/src/main/java/io/lettuce/core/output/CommandOutput.java
index eeb08a71b5..14927f7752 100644
--- a/src/main/java/io/lettuce/core/output/CommandOutput.java
+++ b/src/main/java/io/lettuce/core/output/CommandOutput.java
@@ -75,6 +75,17 @@ public void setSingle(ByteBuffer bytes) {
         set(bytes);
     }
 
+    /**
+     * Set the command output to a big number. Concrete {@link CommandOutput} implementations can override this method unless
+     * they only receive an integer value which cannot be null.
+     *
+     * @param bytes The command output, or null.
+     * @since 6.0/RESP 3
+     */
+    public void setBigNumber(ByteBuffer bytes) {
+        set(bytes);
+    }
+
     /**
      * Set the command output to a 64-bit signed integer. Concrete {@link CommandOutput} implementations must override this
      * method unless they only receive a byte array value.
@@ -85,6 +96,28 @@ public void set(long integer) {
         throw new IllegalStateException();
     }
 
+    /**
+     * Set the command output to a floating-point number. Concrete {@link CommandOutput} implementations must override this
+     * method unless they only receive a byte array value.
+     *
+     * @param number The command output.
+     * @since 6.0/RESP 3
+     */
+    public void set(double number) {
+        throw new IllegalStateException();
+    }
+
+    /**
+     * Set the command output to a boolean. Concrete {@link CommandOutput} implementations must override this method unless they
+     * only receive a byte array value.
+     *
+     * @param value The command output.
+     * @since 6.0/RESP 3
+     */
+    public void set(boolean value) {
+        throw new IllegalStateException();
+    }
+
     /**
      * Set command output to an error message from the server.
      *
@@ -161,4 +194,44 @@ public String toString() {
     public void multi(int count) {
 
     }
+
+    /**
+     * Mark the beginning of a multi sequence (array).
+     *
+     * @param count expected number of elements in this multi sequence.
+     * @since 6.0/RESP 3
+     */
+    public void multiArray(int count) {
+        multi(count);
+    }
+
+    /**
+     * Mark the beginning of a multi sequence (push-array).
+     *
+     * @param count expected number of elements in this multi sequence.
+     * @since 6.0/RESP 3
+     */
+    public void multiPush(int count) {
+        multi(count);
+    }
+
+    /**
+     * Mark the beginning of a multi sequence (map).
+     *
+     * @param count expected number of elements in this multi sequence.
+     * @since 6.0/RESP 3
+     */
+    public void multiMap(int count) {
+        multi(count * 2);
+    }
+
+    /**
+     * Mark the beginning of a set.
+     *
+     * @param count expected number of elements in this multi sequence.
+     * @since 6.0/RESP 3
+     */
+    public void multiSet(int count) {
+        multi(count);
+    }
 }
diff --git a/src/main/java/io/lettuce/core/output/DoubleOutput.java b/src/main/java/io/lettuce/core/output/DoubleOutput.java
index 008f2255a7..b8179abfb5 100644
--- a/src/main/java/io/lettuce/core/output/DoubleOutput.java
+++ b/src/main/java/io/lettuce/core/output/DoubleOutput.java
@@ -38,4 +38,9 @@ public DoubleOutput(RedisCodec<K, V> codec) {
     public void set(ByteBuffer bytes) {
         output = (bytes == null) ? null : parseDouble(decodeAscii(bytes));
     }
+
+    @Override
+    public void set(double number) {
+        output = number;
+    }
 }
diff --git a/src/main/java/io/lettuce/core/output/GenericMapOutput.java b/src/main/java/io/lettuce/core/output/GenericMapOutput.java
new file mode 100644
index 0000000000..7ffddfb0a9
--- /dev/null
+++ b/src/main/java/io/lettuce/core/output/GenericMapOutput.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.output;
+
+import java.nio.ByteBuffer;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import io.lettuce.core.codec.RedisCodec;
+
+/**
+ * {@link Map} of keys and objects output.
+ *
+ * @param <K> Key type.
+ * @param <V> Value type.
+ *
+ * @author Mark Paluch
+ * @since 6.0/RESP3
+ */
+public class GenericMapOutput<K, V> extends CommandOutput<K, V, Map<K, Object>> {
+
+    private K key;
+
+    public GenericMapOutput(RedisCodec<K, V> codec) {
+        super(codec, null);
+    }
+
+    @Override
+    public void set(ByteBuffer bytes) {
+
+        if (key == null) {
+            key = (bytes == null) ? null : codec.decodeKey(bytes);
+            return;
+        }
+
+        Object value = (bytes == null) ? null : codec.decodeValue(bytes);
+        output.put(key, value);
+        key = null;
+    }
+
+    @Override
+    public void setBigNumber(ByteBuffer bytes) {
+        set(bytes);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void set(long integer) {
+
+        if (key == null) {
+            key = (K) Long.valueOf(integer);
+            return;
+        }
+
+        V value = (V) Long.valueOf(integer);
+        output.put(key, value);
+        key = null;
+    }
+
+    @Override
+    public void set(double number) {
+
+        if (key == null) {
+            key = (K) Double.valueOf(number);
+            return;
+        }
+
+        Object value = Double.valueOf(number);
+        output.put(key, value);
+        key = null;
+    }
+
+    @Override
+    public void multi(int count) {
+
+        if (output == null) {
+            output = new LinkedHashMap<>(count / 2, 1);
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
index 9005f24f8e..95a08edd5b 100644
--- a/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
@@ -45,14 +45,19 @@ public GeoCoordinatesListOutput(RedisCodec<K, V> codec) {
     @Override
     public void set(ByteBuffer bytes) {
 
-        Double value = (bytes == null) ? 0 : parseDouble(decodeAscii(bytes));
+        double value = (bytes == null) ? 0 : parseDouble(decodeAscii(bytes));
+        set(value);
+    }
+
+    @Override
+    public void set(double number) {
 
         if (x == null) {
-            x = value;
+            x = number;
             return;
         }
 
-        subscriber.onNext(output, new GeoCoordinates(x, value));
+        subscriber.onNext(output, new GeoCoordinates(x, number));
         x = null;
     }
 
diff --git a/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
index 76e2939169..7b36f41f91 100644
--- a/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
@@ -46,14 +46,19 @@ public GeoCoordinatesValueListOutput(RedisCodec<K, V> codec) {
     @Override
     public void set(ByteBuffer bytes) {
 
-        Double value = (bytes == null) ? 0 : parseDouble(decodeAscii(bytes));
+        double value = (bytes == null) ? 0 : parseDouble(decodeAscii(bytes));
+        set(value);
+    }
+
+    @Override
+    public void set(double number) {
 
         if (x == null) {
-            x = value;
+            x = number;
             return;
         }
 
-        subscriber.onNext(output, Value.fromNullable(new GeoCoordinates(x, value)));
+        subscriber.onNext(output, Value.fromNullable(new GeoCoordinates(x, number)));
         x = null;
     }
 
diff --git a/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java b/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
index 1f4ed02507..9f857d624a 100644
--- a/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
@@ -73,21 +73,27 @@ public void set(ByteBuffer bytes) {
             return;
         }
 
-        Double value = (bytes == null) ? 0 : parseDouble(decodeAscii(bytes));
+        double value = (bytes == null) ? 0 : parseDouble(decodeAscii(bytes));
+        set(value);
+    }
+
+    @Override
+    public void set(double number) {
+
         if (withDistance) {
             if (distance == null) {
-                distance = value;
+                distance = number;
                 return;
             }
         }
+
         if (withCoordinates) {
             if (x == null) {
-                x = value;
+                x = number;
                 return;
             }
 
-            coordinates = new GeoCoordinates(x, value);
-            return;
+            coordinates = new GeoCoordinates(x, number);
         }
     }
 
diff --git a/src/main/java/io/lettuce/core/output/KeyValueScoredValueOutput.java b/src/main/java/io/lettuce/core/output/KeyValueScoredValueOutput.java
index b15e79d412..3e5195293d 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueScoredValueOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueScoredValueOutput.java
@@ -42,6 +42,10 @@ public KeyValueScoredValueOutput(RedisCodec<K, V> codec) {
     @Override
     public void set(ByteBuffer bytes) {
 
+        if (bytes == null) {
+            return;
+        }
+
         if (key == null) {
             key = codec.decodeKey(bytes);
             return;
@@ -54,9 +58,14 @@ public void set(ByteBuffer bytes) {
 
         double score = LettuceStrings.toDouble(decodeAscii(bytes));
 
-        output = KeyValue.just(key, ScoredValue.just(score, value));
+        set(score);
+    }
+
+    @Override
+    public void set(double number) {
+
+        output = KeyValue.just(key, ScoredValue.just(number, value));
         key = null;
         value = null;
     }
-
 }
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
index bc7a50bbb7..a9856cd21b 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
@@ -52,7 +52,13 @@ public void set(ByteBuffer bytes) {
         }
 
         double score = LettuceStrings.toDouble(decodeAscii(bytes));
-        subscriber.onNext(output, ScoredValue.fromNullable(score, value));
+        set(score);
+    }
+
+    @Override
+    public void set(double number) {
+
+        subscriber.onNext(output, ScoredValue.fromNullable(number, value));
         value = null;
     }
 
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueOutput.java
index b08dc602b5..79e51ad4ad 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueOutput.java
@@ -40,13 +40,22 @@ public ScoredValueOutput(RedisCodec<K, V> codec) {
     @Override
     public void set(ByteBuffer bytes) {
 
+        if (bytes == null) {
+            return;
+        }
+
         if (value == null) {
             value = codec.decodeValue(bytes);
             return;
         }
 
         double score = LettuceStrings.toDouble(decodeAscii(bytes));
-        output = ScoredValue.just(score, value);
+        set(score);
+    }
+
+    @Override
+    public void set(double number) {
+        output = ScoredValue.just(number, value);
         value = null;
     }
 }
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
index f755f4beaa..900470c0aa 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
@@ -46,7 +46,12 @@ protected void setOutput(ByteBuffer bytes) {
         }
 
         double score = LettuceStrings.toDouble(decodeAscii(bytes));
-        output.getValues().add(ScoredValue.fromNullable(score, value));
+        set(score);
+    }
+
+    @Override
+    public void set(double number) {
+        output.getValues().add(ScoredValue.fromNullable(number, value));
         value = null;
     }
 }
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
index 3f7a6e37c5..8fff1483b0 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
@@ -48,9 +48,13 @@ protected void setOutput(ByteBuffer bytes) {
         }
 
         double score = LettuceStrings.toDouble(decodeAscii(bytes));
-        channel.onValue(ScoredValue.fromNullable(score, value));
+        set(score);
+    }
+
+    @Override
+    public void set(double number) {
+        channel.onValue(ScoredValue.fromNullable(number, value));
         value = null;
         output.setCount(output.getCount() + 1);
     }
-
 }
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
index 512126ccdf..81a80e19e5 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
@@ -47,7 +47,13 @@ public void set(ByteBuffer bytes) {
         }
 
         double score = LettuceStrings.toDouble(decodeAscii(bytes));
-        channel.onValue(ScoredValue.fromNullable(score, value));
+        set(score);
+    }
+
+    @Override
+    public void set(double number) {
+
+        channel.onValue(ScoredValue.fromNullable(number, value));
         value = null;
         output = output.longValue() + 1;
     }
diff --git a/src/main/java/io/lettuce/core/output/StreamReadOutput.java b/src/main/java/io/lettuce/core/output/StreamReadOutput.java
index 831da82952..f643db6b49 100644
--- a/src/main/java/io/lettuce/core/output/StreamReadOutput.java
+++ b/src/main/java/io/lettuce/core/output/StreamReadOutput.java
@@ -82,12 +82,9 @@ public void multi(int count) {
     @Override
     public void complete(int depth) {
 
-        if (depth == 1) {
-            stream = null;
-        }
-
-        if (depth == 3) {
+        if (depth == 1 && body != null) {
             subscriber.onNext(output, new StreamMessage<>(stream, id, body));
+            stream = null;
             key = null;
             id = null;
             body = null;
diff --git a/src/main/java/io/lettuce/core/output/ValueListOutput.java b/src/main/java/io/lettuce/core/output/ValueListOutput.java
index 4589a01e02..5c1a41c882 100644
--- a/src/main/java/io/lettuce/core/output/ValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueListOutput.java
@@ -42,6 +42,12 @@ public ValueListOutput(RedisCodec<K, V> codec) {
 
     @Override
     public void set(ByteBuffer bytes) {
+
+        // RESP 3 behavior
+        if (bytes == null && !initialized) {
+            return;
+        }
+
         subscriber.onNext(output, bytes == null ? null : codec.decodeValue(bytes));
     }
 
diff --git a/src/main/java/io/lettuce/core/output/ValueSetOutput.java b/src/main/java/io/lettuce/core/output/ValueSetOutput.java
index f13d6b01e3..39f797818c 100644
--- a/src/main/java/io/lettuce/core/output/ValueSetOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueSetOutput.java
@@ -39,6 +39,12 @@ public ValueSetOutput(RedisCodec<K, V> codec) {
 
     @Override
     public void set(ByteBuffer bytes) {
+
+        // RESP 3 behavior
+        if (bytes == null && !initialized) {
+            return;
+        }
+
         output.add(bytes == null ? null : codec.decodeValue(bytes));
     }
 
diff --git a/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java b/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java
index 8f10833259..8ede9c93aa 100644
--- a/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java
@@ -37,37 +37,37 @@ protected <T> Command<K, V, T> createCommand(CommandType type, CommandOutput<K,
     }
 
     protected <T> Command<K, V, T> createCommand(CommandType type, CommandOutput<K, V, T> output, K key) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
         return createCommand(type, output, args);
     }
 
     protected <T> Command<K, V, T> createCommand(CommandType type, CommandOutput<K, V, T> output, K key, V value) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValue(value);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addValue(value);
         return createCommand(type, output, args);
     }
 
     protected <T> Command<K, V, T> createCommand(CommandType type, CommandOutput<K, V, T> output, K key, V[] values) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).addValues(values);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addValues(values);
         return createCommand(type, output, args);
     }
 
     protected <T> Command<K, V, T> createCommand(CommandType type, CommandOutput<K, V, T> output, CommandArgs<K, V> args) {
-        return new Command<K, V, T>(type, output, args);
+        return new Command<>(type, output, args);
     }
 
     @SuppressWarnings("unchecked")
     protected <T> CommandOutput<K, V, T> newScriptOutput(RedisCodec<K, V> codec, ScriptOutputType type) {
         switch (type) {
             case BOOLEAN:
-                return (CommandOutput<K, V, T>) new BooleanOutput<K, V>(codec);
+                return (CommandOutput<K, V, T>) new BooleanOutput<>(codec);
             case INTEGER:
-                return (CommandOutput<K, V, T>) new IntegerOutput<K, V>(codec);
+                return (CommandOutput<K, V, T>) new IntegerOutput<>(codec);
             case STATUS:
-                return (CommandOutput<K, V, T>) new StatusOutput<K, V>(codec);
+                return (CommandOutput<K, V, T>) new StatusOutput<>(codec);
             case MULTI:
-                return (CommandOutput<K, V, T>) new NestedMultiOutput<K, V>(codec);
+                return (CommandOutput<K, V, T>) new NestedMultiOutput<>(codec);
             case VALUE:
-                return (CommandOutput<K, V, T>) new ValueOutput<K, V>(codec);
+                return (CommandOutput<K, V, T>) new ValueOutput<>(codec);
             default:
                 throw new RedisException("Unsupported script output type");
         }
diff --git a/src/main/java/io/lettuce/core/protocol/CommandType.java b/src/main/java/io/lettuce/core/protocol/CommandType.java
index d788993fdd..b0f9b10cc7 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandType.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandType.java
@@ -25,9 +25,10 @@
  * @author Zhang Jessey
  */
 public enum CommandType implements ProtocolKeyword {
+
     // Connection
 
-    AUTH, ECHO, PING, QUIT, READONLY, READWRITE, SELECT, SWAPDB,
+    AUTH, ECHO, HELLO, PING, QUIT, READONLY, READWRITE, SELECT, SWAPDB,
 
     // Server
 
diff --git a/src/main/java/io/lettuce/core/protocol/ProtocolVersion.java b/src/main/java/io/lettuce/core/protocol/ProtocolVersion.java
new file mode 100644
index 0000000000..d7b2b8d113
--- /dev/null
+++ b/src/main/java/io/lettuce/core/protocol/ProtocolVersion.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.protocol;
+
+/**
+ * Versions of the native protocol supported by the driver.
+ *
+ * @author Mark Paluch
+ * @since 6.0
+ */
+public enum ProtocolVersion {
+
+    /**
+     * Redis 2 to Redis 5.
+     */
+    RESP2,
+
+    /**
+     * Redis 6.
+     */
+    RESP3;
+
+    /**
+     * Returns the newest supported protocol version.
+     *
+     * @return the newest supported protocol version.
+     */
+    public static ProtocolVersion newestSupported() {
+        return RESP3;
+    }
+}
diff --git a/src/main/java/io/lettuce/core/protocol/RedisProtocolException.java b/src/main/java/io/lettuce/core/protocol/RedisProtocolException.java
new file mode 100644
index 0000000000..063c04e46a
--- /dev/null
+++ b/src/main/java/io/lettuce/core/protocol/RedisProtocolException.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.protocol;
+
+import io.lettuce.core.RedisException;
+
+/**
+ * Exception thrown on Redis protocol failures.
+ *
+ * @author Mark Paluch
+ * @since 6.0
+ */
+public class RedisProtocolException extends RedisException {
+
+    public RedisProtocolException(String msg) {
+        super(msg);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index f30e9a9f64..e3bfe5d618 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -22,7 +22,6 @@
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import io.lettuce.core.RedisException;
 import io.lettuce.core.output.CommandOutput;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
@@ -32,7 +31,7 @@
 
 /**
  * State machine that decodes redis server responses encoded according to the <a href="http://redis.io/topics/protocol">Unified
- * Request Protocol (RESP)</a>.
+ * Request Protocol (RESP)</a>. Supports RESP2 and RESP3. Initialized with protocol discovery.
  *
  * @author Will Glozer
  * @author Mark Paluch
@@ -45,20 +44,142 @@ public class RedisStateMachine {
 
     static class State {
         enum Type {
-            SINGLE, ERROR, INTEGER, BULK, MULTI, BYTES
+
+            /**
+             * First byte: {@code +}.
+             */
+            SINGLE,
+
+            /**
+             * First byte: {@code +}.
+             */
+            ERROR,
+
+            /**
+             * First byte: {@code :}.
+             */
+            INTEGER,
+
+            /**
+             * First byte: {@code ,}.
+             *
+             * @since 6.0/RESP3
+             */
+            FLOAT,
+
+            /**
+             * First byte: {@code #}.
+             *
+             * @since 6.0/RESP3
+             */
+            BOOLEAN,
+
+            /**
+             * First byte: {@code !}.
+             *
+             * @since 6.0/RESP3
+             */
+            BULK_ERROR,
+
+            /**
+             *
+             * First byte: {@code =}.
+             *
+             * @since 6.0/RESP3
+             */
+            VERBATIM,
+
+            /**
+             * First byte: {@code (}.
+             *
+             * @since 6.0/RESP3
+             */
+            BIG_NUMBER,
+
+            /**
+             * First byte: {@code %}.
+             *
+             * @since 6.0/RESP3
+             * @see #HELLO_V3
+             */
+            MAP,
+
+            /**
+             * First byte: {@code ~}.
+             *
+             * @since 6.0/RESP3
+             * @see #MULTI
+             */
+            SET,
+
+            /**
+             * First byte: {@code |}.
+             *
+             * @since 6.0/RESP3
+             */
+            ATTRIBUTE,
+
+            /**
+             *
+             * First byte: {@code >}.
+             *
+             * @since 6.0/RESP3
+             * @see #MULTI
+             */
+            PUSH,
+
+            /**
+             * First byte: {@code @}.
+             *
+             * @since 6.0/RESP3
+             * @see #MAP
+             */
+            HELLO_V3,
+
+            /**
+             * First byte: {@code _}.
+             *
+             * @since 6.0/RESP3
+             */
+            NULL,
+
+            /**
+             * First byte: {@code $}.
+             */
+            BULK,
+
+            /**
+             * First byte: {@code *}.
+             *
+             * @see #SET
+             * @see #MAP
+             */
+            MULTI, BYTES
         }
 
         Type type = null;
         int count = -1;
+
+        @Override
+        public String toString() {
+            final StringBuffer sb = new StringBuffer();
+            sb.append(getClass().getSimpleName());
+            sb.append(" [type=").append(type);
+            sb.append(", count=").append(count);
+            sb.append(']');
+            return sb.toString();
+        }
     }
 
     private final State[] stack = new State[32];
     private final boolean debugEnabled = logger.isDebugEnabled();
-    private final LongProcessor longProcessor = new LongProcessor();
     private final ByteBuf responseElementBuffer;
     private final AtomicBoolean closed = new AtomicBoolean();
 
+    private Resp2LongProcessor longProcessor = new Resp2LongProcessor();
+    private ProtocolVersion protocolVersion = null;
     private int stackElements;
+    private int terminatorLength = 2; /* RESP2 CR+LF, RESP3 LF */
 
     /**
      * Initialize a new instance.
@@ -67,6 +188,28 @@ public RedisStateMachine(ByteBufAllocator alloc) {
         this.responseElementBuffer = alloc.directBuffer(1024);
     }
 
+    public boolean isDiscoverProtocol() {
+        return this.protocolVersion == null;
+    }
+
+    public ProtocolVersion getProtocolVersion() {
+        return protocolVersion;
+    }
+
+    public void setProtocolVersion(ProtocolVersion protocolVersion) {
+        this.protocolVersion = protocolVersion;
+
+        if (protocolVersion == ProtocolVersion.RESP2) {
+            this.longProcessor = new Resp2LongProcessor();
+            this.terminatorLength = 2;
+        }
+
+        if (protocolVersion == ProtocolVersion.RESP3) {
+            this.longProcessor = new Resp3LongProcessor();
+            this.terminatorLength = 1;
+        }
+    }
+
     /**
      * Decode a command using the input buffer.
      *
@@ -82,11 +225,12 @@ public boolean decode(ByteBuf buffer, CommandOutput<?, ?, ?> output) {
      * Attempt to decode a redis response and return a flag indicating whether a complete response was read.
      *
      * @param buffer Buffer containing data from the server.
-     * @param command the command itself
+     * @param command the command itself TODO: Change to Consumer<Throwable>
      * @param output Current command output.
      * @return true if a complete response was read.
      */
     public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutput<?, ?, ?> output) {
+
         int length, end;
         ByteBuffer bytes;
 
@@ -103,6 +247,8 @@ public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutp
             return isEmpty(stack);
         }
 
+        boolean resp3Indicator = false;
+
         loop:
 
         while (!isEmpty(stack)) {
@@ -113,6 +259,11 @@ public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutp
                     break;
                 }
                 state.type = readReplyType(buffer);
+
+                if (state.type == HELLO_V3 || state.type == MAP) {
+                    resp3Indicator = true;
+                }
+
                 buffer.markReaderIndex();
             }
 
@@ -126,12 +277,26 @@ public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutp
                         safeSetSingle(output, bytes, command);
                     }
                     break;
+
+                case BIG_NUMBER:
+                    if ((bytes = readLine(buffer)) == null) {
+                        break loop;
+                    }
+
+                    safeSetBigNumber(output, bytes, command);
+                    break;
                 case ERROR:
                     if ((bytes = readLine(buffer)) == null) {
                         break loop;
                     }
                     safeSetError(output, bytes, command);
                     break;
+                case NULL:
+                    if ((bytes = readLine(buffer)) == null) {
+                        break loop;
+                    }
+                    safeSet(output, null, command);
+                    break;
                 case INTEGER:
                     if ((end = findLineEnd(buffer)) == -1) {
                         break loop;
@@ -139,7 +304,22 @@ public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutp
                     long integer = readLong(buffer, buffer.readerIndex(), end);
                     safeSet(output, integer, command);
                     break;
+                case BOOLEAN:
+                    if ((end = findLineEnd(buffer)) == -1) {
+                        break loop;
+                    }
+                    boolean value = readBoolean(buffer);
+                    safeSet(output, value, command);
+                    break;
+                case FLOAT:
+                    if ((end = findLineEnd(buffer)) == -1) {
+                        break loop;
+                    }
+                    double f = readFloat(buffer, buffer.readerIndex(), end);
+                    safeSet(output, f, command);
+                    break;
                 case BULK:
+                case VERBATIM:
                     if ((end = findLineEnd(buffer)) == -1) {
                         break loop;
                     }
@@ -148,12 +328,31 @@ public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutp
                         safeSet(output, null, command);
                     } else {
                         state.type = BYTES;
-                        state.count = length + 2;
+                        state.count = length + this.terminatorLength;
+                        buffer.markReaderIndex();
+                        continue loop;
+                    }
+                    break;
+                case BULK_ERROR:
+                    if ((end = findLineEnd(buffer)) == -1) {
+                        break loop;
+                    }
+                    length = (int) readLong(buffer, buffer.readerIndex(), end);
+                    if (length == -1) {
+                        safeSetError(output, null, command);
+                    } else {
+                        state.type = BYTES;
+                        state.count = length + this.terminatorLength;
                         buffer.markReaderIndex();
                         continue loop;
                     }
                     break;
+                case HELLO_V3:
+                case PUSH:
                 case MULTI:
+                case SET:
+                case MAP:
+
                     if (state.count == -1) {
                         if ((end = findLineEnd(buffer)) == -1) {
                             break loop;
@@ -161,7 +360,20 @@ public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutp
                         length = (int) readLong(buffer, buffer.readerIndex(), end);
                         state.count = length;
                         buffer.markReaderIndex();
-                        safeMulti(output, state.count, command);
+
+                        switch (state.type) {
+                            case MULTI:
+                            case PUSH:
+                                safeMultiArray(output, state.count, command);
+                                break;
+                            case MAP:
+                                safeMultiMap(output, state.count, command);
+                                state.count = length * 2;
+                                break;
+                            case SET:
+                                safeMultiSet(output, state.count, command);
+                                break;
+                        }
                     }
 
                     if (state.count <= 0) {
@@ -172,14 +384,17 @@ public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutp
                     addFirst(stack, new State());
 
                     continue loop;
+
                 case BYTES:
                     if ((bytes = readBytes(buffer, state.count)) == null) {
                         break loop;
                     }
                     safeSet(output, bytes, command);
                     break;
+                case ATTRIBUTE:
+                    throw new RedisProtocolException("Not implemented");
                 default:
-                    throw new IllegalStateException("State " + state.type + " not supported");
+                    throw new RedisProtocolException("State " + state.type + " not supported");
             }
 
             buffer.markReaderIndex();
@@ -192,6 +407,11 @@ public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutp
             logger.debug("Decoded {}, empty stack: {}", command, isEmpty(stack));
         }
 
+        /*
+         * if (isDiscoverProtocol()) { if (resp3Indicator) { setProtocolVersion(ProtocolVersion.RESP3); } else {
+         * setProtocolVersion(ProtocolVersion.RESP2); } }
+         */
+
         return isEmpty(stack);
     }
 
@@ -215,11 +435,23 @@ public void close() {
     private int findLineEnd(ByteBuf buffer) {
 
         int index = buffer.forEachByte(ByteProcessor.FIND_LF);
-        return (index > 0 && buffer.getByte(index - 1) == '\r') ? index : -1;
+
+        if (getProtocolVersion() != ProtocolVersion.RESP3) {
+            return (index > 0 && buffer.getByte(index - 1) == '\r') ? index : -1;
+        }
+
+        return index;
     }
 
     private State.Type readReplyType(ByteBuf buffer) {
-        byte b = buffer.readByte();
+
+        State.Type type = getType(buffer.readerIndex(), buffer.readByte());
+
+        return type;
+    }
+
+    private State.Type getType(int index, byte b) {
+
         switch (b) {
             case '+':
                 return SINGLE;
@@ -227,12 +459,33 @@ private State.Type readReplyType(ByteBuf buffer) {
                 return ERROR;
             case ':':
                 return INTEGER;
+            case ',':
+                return FLOAT;
+            case '#':
+                return BOOLEAN;
+            case '=':
+                return VERBATIM;
+            case '(':
+                return BIG_NUMBER;
+            case '%':
+                return MAP;
+            case '~':
+                return SET;
+            case '|':
+                return ATTRIBUTE;
+            case '@':
+                return HELLO_V3;
             case '$':
                 return BULK;
             case '*':
                 return MULTI;
+            case '>':
+                return PUSH;
+            case '_':
+                return NULL;
             default:
-                throw new RedisException("Invalid first byte: " + Byte.toString(b));
+                throw new RedisProtocolException("Invalid first byte: " + b + " (" + new String(new byte[] { b }) + ")"
+                        + " at buffer index " + index + " decoding using " + getProtocolVersion());
         }
     }
 
@@ -240,15 +493,41 @@ private long readLong(ByteBuf buffer, int start, int end) {
         return longProcessor.getValue(buffer, start, end);
     }
 
+    private double readFloat(ByteBuf buffer, int start, int end) {
+
+        int valueLength = (end - start) - (this.terminatorLength - 1);
+        String value = buffer.toString(start, valueLength, StandardCharsets.US_ASCII);
+
+        buffer.skipBytes(valueLength + this.terminatorLength);
+
+        return Double.parseDouble(value);
+    }
+
+    private boolean readBoolean(ByteBuf buffer) {
+
+        byte b = buffer.readByte();
+        buffer.skipBytes(this.terminatorLength);
+
+        switch (b) {
+            case 't':
+                return true;
+            case 'f':
+                return false;
+        }
+
+        throw new RedisProtocolException("Unexpected BOOLEAN value: " + b);
+    }
+
     private ByteBuffer readLine(ByteBuf buffer) {
 
         ByteBuffer bytes = null;
         int end = findLineEnd(buffer);
 
         if (end > -1) {
+
             int start = buffer.readerIndex();
             responseElementBuffer.clear();
-            int size = end - start - 1;
+            int size = (end - start) - (this.terminatorLength - 1);
 
             if (responseElementBuffer.capacity() < size) {
                 responseElementBuffer.capacity(size);
@@ -271,7 +550,7 @@ private ByteBuffer readBytes(ByteBuf buffer, int count) {
         if (buffer.readableBytes() >= count) {
             responseElementBuffer.clear();
 
-            int size = count - 2;
+            int size = count - this.terminatorLength;
 
             if (responseElementBuffer.capacity() < size) {
                 responseElementBuffer.capacity(size);
@@ -279,7 +558,7 @@ private ByteBuffer readBytes(ByteBuf buffer, int count) {
             buffer.readBytes(responseElementBuffer, size);
 
             bytes = responseElementBuffer.internalNioBuffer(0, size);
-            buffer.readerIndex(buffer.readerIndex() + 2);
+            buffer.skipBytes(this.terminatorLength);
         }
         return bytes;
     }
@@ -346,17 +625,49 @@ private boolean isEmpty(State[] stack) {
         return stackElements == 0;
     }
 
+    /**
+     * Safely sets {@link CommandOutput#set(boolean)}. Completes a command exceptionally in case an exception occurs.
+     *
+     * @param output
+     * @param value
+     * @param command
+     */
+    protected void safeSet(CommandOutput<?, ?, ?> output, boolean value, RedisCommand<?, ?, ?> command) {
+
+        try {
+            output.set(value);
+        } catch (Exception e) {
+            command.completeExceptionally(e);
+        }
+    }
+
     /**
      * Safely sets {@link CommandOutput#set(long)}. Completes a command exceptionally in case an exception occurs.
      *
      * @param output
-     * @param integer
+     * @param number
+     * @param command
+     */
+    protected void safeSet(CommandOutput<?, ?, ?> output, long number, RedisCommand<?, ?, ?> command) {
+
+        try {
+            output.set(number);
+        } catch (Exception e) {
+            command.completeExceptionally(e);
+        }
+    }
+
+    /**
+     * Safely sets {@link CommandOutput#set(double)}. Completes a command exceptionally in case an exception occurs.
+     *
+     * @param output
+     * @param number
      * @param command
      */
-    protected void safeSet(CommandOutput<?, ?, ?> output, long integer, RedisCommand<?, ?, ?> command) {
+    protected void safeSet(CommandOutput<?, ?, ?> output, double number, RedisCommand<?, ?, ?> command) {
 
         try {
-            output.set(integer);
+            output.set(number);
         } catch (Exception e) {
             command.completeExceptionally(e);
         }
@@ -395,16 +706,80 @@ protected void safeSetSingle(CommandOutput<?, ?, ?> output, ByteBuffer bytes, Re
     }
 
     /**
-     * Safely sets {@link CommandOutput#multi(int)}. Completes a command exceptionally in case an exception occurs.
+     * Safely sets {@link CommandOutput#set(ByteBuffer)}. Completes a command exceptionally in case an exception occurs.
+     *
+     * @param output
+     * @param bytes
+     * @param command
+     */
+    protected void safeSetBigNumber(CommandOutput<?, ?, ?> output, ByteBuffer bytes, RedisCommand<?, ?, ?> command) {
+
+        try {
+            output.setBigNumber(bytes);
+        } catch (Exception e) {
+            command.completeExceptionally(e);
+        }
+    }
+
+    /**
+     * Safely sets {@link CommandOutput#multiArray(int)}. Completes a command exceptionally in case an exception occurs.
      *
      * @param output
      * @param count
      * @param command
      */
-    protected void safeMulti(CommandOutput<?, ?, ?> output, int count, RedisCommand<?, ?, ?> command) {
+    protected void safeMultiArray(CommandOutput<?, ?, ?> output, int count, RedisCommand<?, ?, ?> command) {
 
         try {
-            output.multi(count);
+            output.multiArray(count);
+        } catch (Exception e) {
+            command.completeExceptionally(e);
+        }
+    }
+
+    /**
+     * Safely sets {@link CommandOutput#multiPush(int)}. Completes a command exceptionally in case an exception occurs.
+     *
+     * @param output
+     * @param count
+     * @param command
+     */
+    protected void safeMultiPush(CommandOutput<?, ?, ?> output, int count, RedisCommand<?, ?, ?> command) {
+
+        try {
+            output.multiPush(count);
+        } catch (Exception e) {
+            command.completeExceptionally(e);
+        }
+    }
+
+    /**
+     * Safely sets {@link CommandOutput#multiSet(int)}. Completes a command exceptionally in case an exception occurs.
+     *
+     * @param output
+     * @param count
+     * @param command
+     */
+    protected void safeMultiSet(CommandOutput<?, ?, ?> output, int count, RedisCommand<?, ?, ?> command) {
+
+        try {
+            output.multiSet(count);
+        } catch (Exception e) {
+            command.completeExceptionally(e);
+        }
+    }
+
+    /**
+     * Safely sets {@link CommandOutput#multiMap(int)}. Completes a command exceptionally in case an exception occurs.
+     *
+     * @param output
+     * @param count
+     * @param command
+     */
+    protected void safeMultiMap(CommandOutput<?, ?, ?> output, int count, RedisCommand<?, ?, ?> command) {
+
+        try {
+            output.multiMap(count);
         } catch (Exception e) {
             command.completeExceptionally(e);
         }
@@ -427,7 +802,7 @@ protected void safeSetError(CommandOutput<?, ?, ?> output, ByteBuffer bytes, Red
     }
 
     @SuppressWarnings("unused")
-    static class LongProcessor implements ByteProcessor {
+    static class Resp2LongProcessor implements ByteProcessor {
 
         long result;
         boolean negative;
@@ -470,4 +845,23 @@ public boolean process(byte value) throws Exception {
             return true;
         }
     }
+
+    @SuppressWarnings("unused")
+    static class Resp3LongProcessor extends Resp2LongProcessor {
+
+        public long getValue(ByteBuf buffer, int start, int end) {
+
+            this.result = 0;
+            this.first = true;
+
+            buffer.forEachByte(start, end - start, this);
+
+            if (!this.negative) {
+                this.result = -this.result;
+            }
+            buffer.readerIndex(end + 1);
+
+            return this.result;
+        }
+    }
 }
diff --git a/src/test/java/io/lettuce/RedisBug.java b/src/test/java/io/lettuce/RedisBug.java
new file mode 100644
index 0000000000..c8ab2e005b
--- /dev/null
+++ b/src/test/java/io/lettuce/RedisBug.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce;
+
+import java.lang.annotation.*;
+
+import org.junit.jupiter.api.Disabled;
+
+/**
+ * Annotations for tests disabled due to a Redis bug.
+ *
+ * @author Mark Paluch
+ */
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Disabled("Redis Bug")
+public @interface RedisBug {
+    String value() default "";
+}
diff --git a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
index 98fed693e5..d11fc92c73 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
@@ -37,6 +37,7 @@
 
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
+import io.lettuce.RedisBug;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -54,6 +55,7 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
+@RedisBug("HELLO AUTH currently not working")
 class ClientOptionsIntegrationTests extends TestSupport {
 
     private final RedisClient client;
@@ -149,7 +151,7 @@ void testHitRequestQueueLimitReconnectWithUriAuthPingCommand() {
 
         WithPassword.run(client, () -> {
 
-            client.setOptions(ClientOptions.builder().requestQueueSize(10).pingBeforeActivateConnection(true).build());
+            client.setOptions(ClientOptions.builder().requestQueueSize(10).build());
 
             RedisURI redisURI = RedisURI.create(host, port);
             redisURI.setPassword(passwd);
@@ -215,8 +217,8 @@ void requestQueueSizeOvercommittedReconnect() {
             assertThat(TestFutures.getOrTimeout(pings.get(i))).isEqualTo("PONG");
         }
 
-        assertThatThrownBy(() -> TestFutures.awaitOrTimeout(pings.get(10))).hasCauseInstanceOf(IllegalStateException.class)
-                .hasMessage("java.lang.IllegalStateException: Queue full");
+        assertThatThrownBy(() -> TestFutures.awaitOrTimeout(pings.get(10))).hasCauseInstanceOf(IllegalStateException.class).hasMessage(
+                "java.lang.IllegalStateException: Queue full");
 
         connection.close();
     }
@@ -278,7 +280,6 @@ void disconnectedAcceptCommands() {
     void pingBeforeConnect(StatefulRedisConnection<String, String> sharedConnection) {
 
         sharedConnection.sync().set(key, value);
-        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
         RedisCommands<String, String> connection = client.connect().sync();
 
         try {
@@ -290,9 +291,7 @@ void pingBeforeConnect(StatefulRedisConnection<String, String> sharedConnection)
     }
 
     @Test
-    void pingBeforeConnectTimeout() throws Exception {
-
-        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+    void connectTimeout() throws Exception {
 
         try (ServerSocket serverSocket = new ServerSocket(0)) {
 
@@ -310,10 +309,9 @@ void pingBeforeConnectTimeout() throws Exception {
     }
 
     @Test
-    void pingBeforeConnectWithAuthentication() {
+    void connectWithAuthentication() {
 
         WithPassword.run(client, () -> {
-            client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
             RedisURI redisURI = RedisURI.Builder.redis(host, port).withPassword(passwd).build();
 
             RedisCommands<String, String> connection = client.connect(redisURI).sync();
@@ -328,14 +326,12 @@ void pingBeforeConnectWithAuthentication() {
     }
 
     @Test
-    void pingBeforeConnectWithAuthenticationTimeout() {
+    void authenticationTimeout() {
 
         WithPassword.run(
                 client,
                 () -> {
 
-                    client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
-
                     try (ServerSocket serverSocket = new ServerSocket(0)) {
 
                         RedisURI redisURI = RedisURI.Builder.redis(TestSettings.host(), serverSocket.getLocalPort())
@@ -353,11 +349,10 @@ void pingBeforeConnectWithAuthenticationTimeout() {
     }
 
     @Test
-    void pingBeforeConnectWithSslAndAuthentication() {
+    void sslAndAuthentication() {
 
         WithPassword.run(client, () -> {
 
-            client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
             RedisURI redisURI = RedisURI.Builder.redis(host, 6443).withPassword(passwd).withVerifyPeer(false).withSsl(true)
                     .build();
 
@@ -374,11 +369,10 @@ void pingBeforeConnectWithSslAndAuthentication() {
     }
 
     @Test
-    void pingBeforeConnectWithAuthenticationFails() {
+    void authenticationFails() {
 
         WithPassword.run(client, () -> {
 
-            client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
             RedisURI redisURI = RedisURI.Builder.redis(host, port).build();
 
             try {
@@ -397,7 +391,6 @@ void pingBeforeConnectWithSslAndAuthenticationFails() {
                 client,
                 () -> {
 
-                    client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
                     RedisURI redisURI = RedisURI.Builder.redis(host, 6443).withVerifyPeer(false).withSsl(true).build();
 
                     try {
@@ -467,8 +460,6 @@ void pingBeforeConnectWithQueuedCommandsAndReconnect() throws Exception {
 
         StatefulRedisConnection<String, String> controlConnection = client.connect();
 
-        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
-
         StatefulRedisConnection<String, String> redisConnection = client.connect(RedisURI.create("redis://localhost:6479/5"));
         redisConnection.async().set("key1", "value1");
         redisConnection.async().set("key2", "value2");
@@ -512,8 +503,6 @@ void authenticatedPingBeforeConnectWithQueuedCommandsAndReconnect() {
                     RedisURI redisURI = RedisURI.Builder.redis(host, port).withPassword(passwd).withDatabase(5).build();
                     StatefulRedisConnection<String, String> controlConnection = client.connect(redisURI);
 
-                    client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
-
                     StatefulRedisConnection<String, String> redisConnection = client.connect(redisURI);
                     redisConnection.async().set("key1", "value1");
                     redisConnection.async().set("key2", "value2");
diff --git a/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java b/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
index cbff7434e7..b06abc3d70 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
@@ -19,6 +19,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import io.lettuce.core.protocol.ProtocolVersion;
+
 /**
  * @author Mark Paluch
  */
@@ -48,7 +50,7 @@ void testCopy() {
     void checkAssertions(ClientOptions sut) {
         assertThat(sut.isAutoReconnect()).isEqualTo(true);
         assertThat(sut.isCancelCommandsOnReconnectFailure()).isEqualTo(false);
-        assertThat(sut.isPingBeforeActivateConnection()).isEqualTo(false);
+        assertThat(sut.getProtocolVersion()).isEqualTo(ProtocolVersion.RESP3);
         assertThat(sut.isSuspendReconnectOnProtocolFailure()).isEqualTo(false);
         assertThat(sut.getDisconnectedBehavior()).isEqualTo(ClientOptions.DisconnectedBehavior.DEFAULT);
         assertThat(sut.getBufferUsageRatio()).isEqualTo(ClientOptions.DEFAULT_BUFFER_USAGE_RATIO);
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
index 8dc2ca3b03..40e1a18cc7 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
@@ -23,10 +23,12 @@
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import io.lettuce.RedisBug;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -49,23 +51,24 @@ class ConnectionCommandIntegrationTests extends TestSupport {
     }
 
     @Test
+    @RedisBug("HELLO AUTH currently not working")
     void auth() {
 
         WithPassword.run(client, () -> {
             RedisCommands<String, String> connection = client.connect().sync();
-                try {
-                    connection.ping();
-                    fail("Server doesn't require authentication");
-                } catch (RedisException e) {
-                    assertThat(e.getMessage()).isEqualTo("NOAUTH Authentication required.");
-                    assertThat(connection.auth(passwd)).isEqualTo("OK");
-                    assertThat(connection.set(key, value)).isEqualTo("OK");
-                }
-
-                RedisURI redisURI = RedisURI.Builder.redis(host, port).withDatabase(2).withPassword(passwd).build();
-                RedisCommands<String, String> authConnection = client.connect(redisURI).sync();
-                authConnection.ping();
-                authConnection.getStatefulConnection().close();
+            try {
+                connection.ping();
+                fail("Server doesn't require authentication");
+            } catch (RedisException e) {
+                assertThat(e.getMessage()).isEqualTo("NOAUTH Authentication required.");
+                assertThat(connection.auth(passwd)).isEqualTo("OK");
+                assertThat(connection.set(key, value)).isEqualTo("OK");
+            }
+
+            RedisURI redisURI = RedisURI.Builder.redis(host, port).withDatabase(2).withPassword(passwd).build();
+            RedisCommands<String, String> authConnection = client.connect(redisURI).sync();
+            authConnection.ping();
+            authConnection.getStatefulConnection().close();
         });
 
     }
@@ -97,17 +100,17 @@ void authEmpty() {
         assertThatThrownBy(() -> redis.auth("")).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test
+    @Disabled("HELLO AUTH currently not working")
     void authReconnect() {
         WithPassword.run(client, () -> {
 
             RedisCommands<String, String> connection = client.connect().sync();
-                assertThat(connection.auth(passwd)).isEqualTo("OK");
-                assertThat(connection.set(key, value)).isEqualTo("OK");
-                connection.quit();
+            assertThat(connection.auth(passwd)).isEqualTo("OK");
+            assertThat(connection.set(key, value)).isEqualTo("OK");
+            connection.quit();
 
             Delay.delay(Duration.ofMillis(100));
-                assertThat(connection.get(key)).isEqualTo(value);
+            assertThat(connection.get(key)).isEqualTo(value);
 
             connection.getStatefulConnection().close();
         });
diff --git a/src/test/java/io/lettuce/core/ProtectedModeTests.java b/src/test/java/io/lettuce/core/ProtectedModeTests.java
index 70684bc555..3ae7dd8e8b 100644
--- a/src/test/java/io/lettuce/core/ProtectedModeTests.java
+++ b/src/test/java/io/lettuce/core/ProtectedModeTests.java
@@ -118,9 +118,9 @@ void regularClientFailsOnFirstCommandWithDelay() {
     }
 
     @Test
-    void pingBeforeConnectFailsOnPing() {
+    void connectFailsOnPing() {
 
-        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+        client.setOptions(ClientOptions.builder().build());
         assertThatThrownBy(() -> client.connect()).isInstanceOf(RedisConnectionException.class).hasCauseInstanceOf(
                 RedisConnectionException.class);
     }
diff --git a/src/test/java/io/lettuce/core/SslIntegrationTests.java b/src/test/java/io/lettuce/core/SslIntegrationTests.java
index c650a91b1e..09b23577e1 100644
--- a/src/test/java/io/lettuce/core/SslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/SslIntegrationTests.java
@@ -221,14 +221,6 @@ void standaloneWithOpenSslFailsWithWrongTruststore() {
         assertThatThrownBy(() -> verifyConnection(URI_VERIFY)).isInstanceOf(RedisConnectionException.class);
     }
 
-    @Test
-    void pingBeforeActivate() {
-
-        redisClient.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
-
-        verifyConnection(URI_NO_VERIFY);
-    }
-
     @Test
     void regularSslWithReconnect() {
 
@@ -306,14 +298,6 @@ void masterSlaveWithJdkSslFailsWithWrongTruststore() {
                 .isInstanceOf(RedisConnectionException.class);
     }
 
-    @Test
-    void masterSlavePingBeforeActivate() {
-
-        redisClient.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
-
-        verifyMasterSlaveConnection(MASTER_SLAVE_URIS_NO_VERIFY);
-    }
-
     @Test
     void masterSlaveSslWithReconnect() {
         RedisCommands<String, String> connection = MasterSlave
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
index 16780ca4eb..b4871106c7 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
@@ -20,6 +20,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.ClientOptions;
+import io.lettuce.core.protocol.ProtocolVersion;
 
 /**
  * @author Mark Paluch
@@ -30,10 +31,12 @@ class ClusterClientOptionsUnitTests {
     void testCopy() {
 
         ClusterClientOptions options = ClusterClientOptions.builder().autoReconnect(false).requestQueueSize(100)
-                .suspendReconnectOnProtocolFailure(true).maxRedirects(1234).validateClusterNodeMembership(false).build();
+                .suspendReconnectOnProtocolFailure(true).maxRedirects(1234).validateClusterNodeMembership(false)
+                .protocolVersion(ProtocolVersion.RESP2).build();
 
         ClusterClientOptions copy = ClusterClientOptions.copyOf(options);
 
+        assertThat(copy.getProtocolVersion()).isEqualTo(options.getProtocolVersion());
         assertThat(copy.getRefreshPeriod()).isEqualTo(options.getRefreshPeriod());
         assertThat(copy.isCloseStaleConnections()).isEqualTo(options.isCloseStaleConnections());
         assertThat(copy.isRefreshClusterView()).isEqualTo(options.isRefreshClusterView());
@@ -51,6 +54,7 @@ void builderFromDefaultClientOptions() {
         ClientOptions clientOptions = ClientOptions.builder().build();
         ClusterClientOptions clusterClientOptions = ClusterClientOptions.builder(clientOptions).build();
 
+        assertThat(clusterClientOptions.getProtocolVersion()).isEqualTo(clusterClientOptions.getProtocolVersion());
         assertThat(clusterClientOptions.getDisconnectedBehavior()).isEqualTo(clusterClientOptions.getDisconnectedBehavior());
         assertThat(clusterClientOptions.getSslOptions()).isEqualTo(clusterClientOptions.getSslOptions());
         assertThat(clusterClientOptions.getTimeoutOptions()).isEqualTo(clusterClientOptions.getTimeoutOptions());
@@ -59,8 +63,6 @@ void builderFromDefaultClientOptions() {
         assertThat(clusterClientOptions.isCloseStaleConnections()).isEqualTo(clusterClientOptions.isCloseStaleConnections());
         assertThat(clusterClientOptions.isCancelCommandsOnReconnectFailure()).isEqualTo(
                 clusterClientOptions.isCancelCommandsOnReconnectFailure());
-        assertThat(clusterClientOptions.isPingBeforeActivateConnection()).isEqualTo(
-                clusterClientOptions.isPingBeforeActivateConnection());
         assertThat(clusterClientOptions.isPublishOnScheduler()).isEqualTo(clusterClientOptions.isPublishOnScheduler());
         assertThat(clusterClientOptions.isSuspendReconnectOnProtocolFailure()).isEqualTo(
                 clusterClientOptions.isSuspendReconnectOnProtocolFailure());
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
index 7ec12aaa86..8b0853dfdd 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
@@ -405,30 +405,6 @@ void partitionRetrievalShouldFail() {
         FastShutdown.shutdown(clusterClient);
     }
 
-    @Test
-    void clusterAuthPingBeforeConnect() {
-
-        RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(),
-                RedisURI.Builder.redis(TestSettings.host(), ClusterTestSettings.port7).withPassword("foobared").build());
-        clusterClient.setOptions(ClusterClientOptions.builder().pingBeforeActivateConnection(true).build());
-
-        StatefulRedisClusterConnection<String, String> connection = clusterClient.connect();
-        RedisAdvancedClusterCommands<String, String> sync = connection.sync();
-
-        List<String> time = sync.time();
-        assertThat(time).hasSize(2);
-
-        TestFutures.awaitOrTimeout(connection.async().quit());
-
-        Wait.untilTrue(connection::isOpen).waitOrTimeout();
-
-        time = sync.time();
-        assertThat(time).hasSize(2);
-
-        connection.close();
-        FastShutdown.shutdown(clusterClient);
-    }
-
     @Test
     void clusterNeedsAuthButNotSupplied() {
 
diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
index 5c4b93e850..5e25ec2a9b 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
@@ -36,6 +36,7 @@
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import io.lettuce.RedisBug;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -89,6 +90,7 @@ void bgsave() {
     }
 
     @Test
+    @RedisBug("RESP error")
     void clientGetSetname() {
         assertThat(redis.clientGetname()).isNull();
         assertThat(redis.clientSetname("test")).isEqualTo("OK");
diff --git a/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
index 000b8ec537..beb0cc1621 100644
--- a/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
@@ -36,6 +36,7 @@
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import io.lettuce.RedisBug;
 import io.lettuce.core.*;
 import io.lettuce.core.Range.Boundary;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -343,6 +344,7 @@ void zrangebyscoreWithScores() {
     }
 
     @Test
+    @RedisBug("-inf is suffixed with NULL byte")
     @SuppressWarnings({ "unchecked" })
     void zrangebyscoreWithScoresInfinity() {
 
diff --git a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
index 595f674f03..d17f39e155 100644
--- a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
@@ -27,8 +27,10 @@
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import io.lettuce.RedisBug;
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.ReadFrom;
 import io.lettuce.core.RedisException;
@@ -43,6 +45,8 @@
 /**
  * @author Mark Paluch
  */
+@RedisBug("HELLO AUTH currently not working")
+@Disabled("Redis Bug")
 class StaticMasterSlaveTest extends AbstractRedisClientTest {
 
     private StatefulRedisMasterSlaveConnectionImpl<String, String> connection;
@@ -68,8 +72,7 @@ void before() throws Exception {
         if (node1Instance.getRole() == RedisInstance.Role.MASTER && node2Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node1;
             replica = node2;
-        } else if (node2Instance.getRole() == RedisInstance.Role.MASTER
-                && node1Instance.getRole() == RedisInstance.Role.SLAVE) {
+        } else if (node2Instance.getRole() == RedisInstance.Role.MASTER && node1Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node2;
             replica = node1;
         } else {
diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
index dc8cf30180..2dc88c85d9 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
@@ -69,9 +69,9 @@ class ConnectionFailureIntegrationTests extends TestSupport {
      * @throws Exception
      */
     @Test
-    void pingBeforeConnectFails() throws Exception {
+    void invalidFirstByte() throws Exception {
 
-        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+        client.setOptions(ClientOptions.builder().build());
 
         RandomResponseServer ts = getRandomResponseServer();
 
@@ -97,10 +97,9 @@ void pingBeforeConnectFails() throws Exception {
      * @throws Exception
      */
     @Test
-    void pingBeforeConnectFailOnReconnect() throws Exception {
+    void failOnReconnect() throws Exception {
 
-        ClientOptions clientOptions = ClientOptions.builder().pingBeforeActivateConnection(true)
-                .suspendReconnectOnProtocolFailure(true).build();
+        ClientOptions clientOptions = ClientOptions.builder().suspendReconnectOnProtocolFailure(true).build();
         client.setOptions(clientOptions);
 
         RandomResponseServer ts = getRandomResponseServer();
@@ -142,10 +141,10 @@ void pingBeforeConnectFailOnReconnect() throws Exception {
      * @throws Exception
      */
     @Test
-    void pingBeforeConnectFailOnReconnectShouldSendEvents() throws Exception {
+    void failOnReconnectShouldSendEvents() throws Exception {
 
         client.setOptions(
-                ClientOptions.builder().pingBeforeActivateConnection(true).suspendReconnectOnProtocolFailure(false).build());
+                ClientOptions.builder().suspendReconnectOnProtocolFailure(false).build());
 
         RandomResponseServer ts = getRandomResponseServer();
 
@@ -192,7 +191,7 @@ void pingBeforeConnectFailOnReconnectShouldSendEvents() throws Exception {
     void cancelCommandsOnReconnectFailure() throws Exception {
 
         client.setOptions(
-                ClientOptions.builder().pingBeforeActivateConnection(true).cancelCommandsOnReconnectFailure(true).build());
+                ClientOptions.builder().cancelCommandsOnReconnectFailure(true).build());
 
         RandomResponseServer ts = getRandomResponseServer();
 
@@ -246,7 +245,7 @@ void emitEventOnReconnectFailure() throws Exception {
         RedisURI redisUri = RedisURI.create(defaultRedisUri.toURI());
         RedisClient client = RedisClient.create(clientResources);
 
-        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+        client.setOptions(ClientOptions.builder().build());
 
         try {
             RedisAsyncCommandsImpl<String, String> connection = (RedisAsyncCommandsImpl<String, String>) client
diff --git a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java
new file mode 100644
index 0000000000..9df548b83d
--- /dev/null
+++ b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.protocol;
+
+import static io.lettuce.core.protocol.RedisStateMachine.State;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.lettuce.core.RedisException;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.output.*;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+/**
+ * Unit tests for {@link RedisStateMachine} using RESP2.
+ *
+ * @author Will Glozer
+ * @author Mark Paluch
+ */
+class RedisStateMachineResp2UnitTests {
+
+    private RedisCodec<String, String> codec = new Utf8StringCodec();
+    private Charset charset = Charset.forName("UTF-8");
+    private CommandOutput<String, String, String> output;
+    private RedisStateMachine rsm;
+
+    @BeforeAll
+    static void beforeClass() {
+
+        LoggerContext ctx = (LoggerContext) LogManager.getContext();
+        Configuration config = ctx.getConfiguration();
+        LoggerConfig loggerConfig = config.getLoggerConfig(RedisStateMachine.class.getName());
+        loggerConfig.setLevel(Level.ALL);
+    }
+
+    @AfterAll
+    static void afterClass() {
+
+        LoggerContext ctx = (LoggerContext) LogManager.getContext();
+        Configuration config = ctx.getConfiguration();
+        LoggerConfig loggerConfig = config.getLoggerConfig(RedisStateMachine.class.getName());
+        loggerConfig.setLevel(null);
+    }
+
+    @BeforeEach
+    final void createStateMachine() {
+        output = new StatusOutput<>(codec);
+        rsm = new RedisStateMachine();
+    }
+
+    @Test
+    void errorShouldSwitchToResp2Protocol() {
+        assertThat(rsm.decode(buffer("-ERR\r\n"), output)).isTrue();
+        assertThat(output.getError()).isEqualTo("ERR");
+        assertThat(rsm.isDiscoverProtocol()).isFalse();
+        assertThat(rsm.getProtocolVersion()).isEqualTo(ProtocolVersion.RESP2);
+    }
+
+    @Test
+    void helloShouldSwitchToResp3() {
+        assertThat(rsm.decode(buffer("@0\n"), output)).isTrue();
+        assertThat(rsm.isDiscoverProtocol()).isFalse();
+        assertThat(rsm.getProtocolVersion()).isEqualTo(ProtocolVersion.RESP3);
+    }
+
+    @Test
+    void single() {
+        assertThat(rsm.decode(buffer("+OK\r\n"), output)).isTrue();
+        assertThat(output.get()).isEqualTo("OK");
+    }
+
+    @Test
+    void error() {
+        assertThat(rsm.decode(buffer("-ERR\r\n"), output)).isTrue();
+        assertThat(output.getError()).isEqualTo("ERR");
+    }
+
+    @Test
+    void errorWithoutLineBreak() {
+        assertThat(rsm.decode(buffer("-ERR"), output)).isFalse();
+        assertThat(rsm.decode(buffer("\r\n"), output)).isTrue();
+        assertThat(output.getError()).isEqualTo("");
+    }
+
+    @Test
+    void integer() {
+        CommandOutput<String, String, Long> output = new IntegerOutput<>(codec);
+        assertThat(rsm.decode(buffer(":1\r\n"), output)).isTrue();
+        assertThat((long) output.get()).isEqualTo(1);
+    }
+
+    @Test
+    void bulk() {
+        CommandOutput<String, String, String> output = new ValueOutput<>(codec);
+        assertThat(rsm.decode(buffer("$-1\r\n"), output)).isTrue();
+        assertThat(output.get()).isNull();
+        assertThat(rsm.decode(buffer("$3\r\nfoo\r\n"), output)).isTrue();
+        assertThat(output.get()).isEqualTo("foo");
+    }
+
+    @Test
+    void multi() {
+        CommandOutput<String, String, List<String>> output = new ValueListOutput<>(codec);
+        ByteBuf buffer = buffer("*2\r\n$-1\r\n$2\r\nok\r\n");
+        assertThat(rsm.decode(buffer, output)).isTrue();
+        assertThat(output.get()).isEqualTo(Arrays.asList(null, "ok"));
+    }
+
+    @Test
+    void multiEmptyArray1() {
+        CommandOutput<String, String, List<Object>> output = new NestedMultiOutput<>(codec);
+        ByteBuf buffer = buffer("*2\r\n$3\r\nABC\r\n*0\r\n");
+        assertThat(rsm.decode(buffer, output)).isTrue();
+        assertThat(output.get().get(0)).isEqualTo("ABC");
+        assertThat(output.get().get(1)).isEqualTo(Arrays.asList());
+        assertThat(output.get().size()).isEqualTo(2);
+    }
+
+    @Test
+    void multiEmptyArray2() {
+        CommandOutput<String, String, List<Object>> output = new NestedMultiOutput<>(codec);
+        ByteBuf buffer = buffer("*2\r\n*0\r\n$3\r\nABC\r\n");
+        assertThat(rsm.decode(buffer, output)).isTrue();
+        assertThat(output.get().get(0)).isEqualTo(Arrays.asList());
+        assertThat(output.get().get(1)).isEqualTo("ABC");
+        assertThat(output.get().size()).isEqualTo(2);
+    }
+
+    @Test
+    void multiEmptyArray3() {
+        CommandOutput<String, String, List<Object>> output = new NestedMultiOutput<>(codec);
+        ByteBuf buffer = buffer("*2\r\n*2\r\n$2\r\nAB\r\n$2\r\nXY\r\n*0\r\n");
+        assertThat(rsm.decode(buffer, output)).isTrue();
+        assertThat(output.get().get(0)).isEqualTo(Arrays.asList("AB", "XY"));
+        assertThat(output.get().get(1)).isEqualTo(Arrays.asList());
+        assertThat(output.get().size()).isEqualTo(2);
+    }
+
+    @Test
+    void partialFirstLine() {
+        assertThat(rsm.decode(buffer("+"), output)).isFalse();
+        assertThat(rsm.decode(buffer("-"), output)).isFalse();
+        assertThat(rsm.decode(buffer(":"), output)).isFalse();
+        assertThat(rsm.decode(buffer("$"), output)).isFalse();
+        assertThat(rsm.decode(buffer("*"), output)).isFalse();
+    }
+
+    @Test
+    void invalidReplyType() {
+        assertThatThrownBy(() -> rsm.decode(buffer("?"), output)).isInstanceOf(RedisException.class);
+    }
+
+    @Test
+    void sillyTestsForEmmaCoverage() {
+        assertThat(State.Type.valueOf("SINGLE")).isEqualTo(State.Type.SINGLE);
+    }
+
+    ByteBuf buffer(String content) {
+        return Unpooled.copiedBuffer(content, charset);
+    }
+}
diff --git a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java
new file mode 100644
index 0000000000..8b7292801b
--- /dev/null
+++ b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.protocol;
+
+import static io.lettuce.core.protocol.RedisStateMachine.State;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.lettuce.core.RedisException;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.output.*;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+/**
+ * Unit tests for {@link RedisStateMachine} using RESP3.
+ *
+ * @author Mark Paluch
+ */
+class RedisStateMachineResp3UnitTests {
+
+    private RedisCodec<String, String> codec = new Utf8StringCodec();
+    private Charset charset = Charset.forName("UTF-8");
+    private CommandOutput<String, String, String> output;
+    private RedisStateMachine rsm;
+
+    @BeforeAll
+    static void beforeClass() {
+
+        LoggerContext ctx = (LoggerContext) LogManager.getContext();
+        Configuration config = ctx.getConfiguration();
+        LoggerConfig loggerConfig = config.getLoggerConfig(RedisStateMachine.class.getName());
+        loggerConfig.setLevel(Level.ALL);
+    }
+
+    @AfterAll
+    static void afterClass() {
+        LoggerContext ctx = (LoggerContext) LogManager.getContext();
+        Configuration config = ctx.getConfiguration();
+        LoggerConfig loggerConfig = config.getLoggerConfig(RedisStateMachine.class.getName());
+        loggerConfig.setLevel(null);
+    }
+
+    @BeforeEach
+    final void createStateMachine() {
+        output = new StatusOutput<>(codec);
+        rsm = new RedisStateMachine();
+        rsm.setProtocolVersion(ProtocolVersion.RESP3);
+    }
+
+    @Test
+    void single() {
+        assertThat(rsm.decode(buffer("+OK\n"), output)).isTrue();
+        assertThat(output.get()).isEqualTo("OK");
+    }
+
+    @Test
+    void error() {
+        assertThat(rsm.decode(buffer("-ERR\n"), output)).isTrue();
+        assertThat(output.getError()).isEqualTo("ERR");
+    }
+
+    @Test
+    void errorWithoutLineBreak() {
+        assertThat(rsm.decode(buffer("-ERR"), output)).isFalse();
+        assertThat(rsm.decode(buffer("\n"), output)).isTrue();
+        assertThat(output.getError()).isEqualTo("");
+    }
+
+    @Test
+    void integer() {
+        CommandOutput<String, String, Long> output = new IntegerOutput<>(codec);
+        assertThat(rsm.decode(buffer(":1\n"), output)).isTrue();
+        assertThat((long) output.get()).isEqualTo(1);
+    }
+
+    @Test
+    void floatNumber() {
+        CommandOutput<String, String, Double> output = new DoubleOutput<>(codec);
+        assertThat(rsm.decode(buffer(",12.345\n"), output)).isTrue();
+        assertThat(output.get()).isEqualTo(12.345);
+    }
+
+    @Test
+    void bigNumber() {
+        CommandOutput<String, String, String> output = new StatusOutput<>(codec);
+        assertThat(rsm.decode(buffer("(3492890328409238509324850943850943825024385\n"), output)).isTrue();
+        assertThat(output.get()).isEqualTo("3492890328409238509324850943850943825024385");
+    }
+
+    @Test
+    void booleanValue() {
+        CommandOutput<String, String, Boolean> output = new BooleanOutput<>(codec);
+        assertThat(rsm.decode(buffer("#t\n"), output)).isTrue();
+        assertThat(output.get()).isTrue();
+
+        output = new BooleanOutput<>(codec);
+        assertThat(rsm.decode(buffer("#f\n"), output)).isTrue();
+        assertThat(output.get()).isFalse();
+    }
+
+    @Test
+    void hello() {
+        CommandOutput<String, String, Map<String, Object>> output = new GenericMapOutput<>(codec);
+        assertThat(
+                rsm.decode(buffer("%7\n" + "$6\nserver\n$5\nredis\n" + "$7\nversion\n$11\n999.999.999\n" + "$5\nproto\n:3\n"
+                        + "$2\nid\n:184\n" + "$4\nmode\n$10\nstandalone\n" + "$4\nrole\n$6\nmaster\n" + "$7\nmodules\n*0\n"),
+                        output)).isTrue();
+        assertThat(output.get()).containsEntry("mode", "standalone");
+    }
+
+    @Test
+    void bulk() {
+        CommandOutput<String, String, String> output = new ValueOutput<>(codec);
+        assertThat(rsm.decode(buffer("$-1\n"), output)).isTrue();
+        assertThat(output.get()).isNull();
+        assertThat(rsm.decode(buffer("$3\nfoo\n"), output)).isTrue();
+        assertThat(output.get()).isEqualTo("foo");
+    }
+
+    @Test
+    void multi() {
+        CommandOutput<String, String, List<String>> output = new ValueListOutput<>(codec);
+        ByteBuf buffer = buffer("*2\n$-1\n$2\nok\n");
+        assertThat(rsm.decode(buffer, output)).isTrue();
+        assertThat(output.get()).isEqualTo(Arrays.asList(null, "ok"));
+    }
+
+    @Test
+    void multiSet() {
+        CommandOutput<String, String, List<String>> output = new ValueListOutput<>(codec);
+        ByteBuf buffer = buffer("~2\n$-1\n$2\nok\n");
+        assertThat(rsm.decode(buffer, output)).isTrue();
+        assertThat(output.get()).isEqualTo(Arrays.asList(null, "ok"));
+    }
+
+    @Test
+    void multiMap() {
+        CommandOutput<String, String, Map<String, Object>> output = new GenericMapOutput<>(codec);
+        ByteBuf buffer = buffer("%1\n$3\nfoo\n$2\nok\n");
+        assertThat(rsm.decode(buffer, output)).isTrue();
+        assertThat(output.get()).containsEntry("foo", "ok");
+    }
+
+    @Test
+    void multiEmptyArray1() {
+        CommandOutput<String, String, List<Object>> output = new NestedMultiOutput<>(codec);
+        ByteBuf buffer = buffer("*2\n$3\nABC\n*0\n");
+        assertThat(rsm.decode(buffer, output)).isTrue();
+        assertThat(output.get().get(0)).isEqualTo("ABC");
+        assertThat(output.get().get(1)).isEqualTo(Arrays.asList());
+        assertThat(output.get().size()).isEqualTo(2);
+    }
+
+    @Test
+    void multiEmptyArray2() {
+        CommandOutput<String, String, List<Object>> output = new NestedMultiOutput<>(codec);
+        ByteBuf buffer = buffer("*2\n*0\n$3\nABC\n");
+        assertThat(rsm.decode(buffer, output)).isTrue();
+        assertThat(output.get().get(0)).isEqualTo(Arrays.asList());
+        assertThat(output.get().get(1)).isEqualTo("ABC");
+        assertThat(output.get().size()).isEqualTo(2);
+    }
+
+    @Test
+    void multiEmptyArray3() {
+        CommandOutput<String, String, List<Object>> output = new NestedMultiOutput<>(codec);
+        ByteBuf buffer = buffer("*2\n*2\n$2\nAB\n$2\nXY\n*0\n");
+        assertThat(rsm.decode(buffer, output)).isTrue();
+        assertThat(output.get().get(0)).isEqualTo(Arrays.asList("AB", "XY"));
+        assertThat(output.get().get(1)).isEqualTo(Arrays.asList());
+        assertThat(output.get().size()).isEqualTo(2);
+    }
+
+    @Test
+    void partialFirstLine() {
+        assertThat(rsm.decode(buffer("+"), output)).isFalse();
+        assertThat(rsm.decode(buffer("-"), output)).isFalse();
+        assertThat(rsm.decode(buffer(":"), output)).isFalse();
+        assertThat(rsm.decode(buffer("$"), output)).isFalse();
+        assertThat(rsm.decode(buffer("*"), output)).isFalse();
+    }
+
+    @Test
+    void invalidReplyType() {
+        assertThatThrownBy(() -> rsm.decode(buffer("?"), output)).isInstanceOf(RedisException.class);
+    }
+
+    @Test
+    void sillyTestsForEmmaCoverage() {
+        assertThat(State.Type.valueOf("SINGLE")).isEqualTo(State.Type.SINGLE);
+    }
+
+    ByteBuf buffer(String content) {
+        return Unpooled.copiedBuffer(content, charset);
+    }
+}
diff --git a/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java b/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
index 1ac24671b4..e6bbc95127 100644
--- a/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
@@ -75,6 +75,21 @@ void tearDown() {
         rsm.close();
     }
 
+    @Test
+    void errorShouldSwitchToResp2Protocol() {
+        assertThat(rsm.decode(buffer("-ERR\r\n"), output)).isTrue();
+        assertThat(output.getError()).isEqualTo("ERR");
+        assertThat(rsm.isDiscoverProtocol()).isFalse();
+        assertThat(rsm.getProtocolVersion()).isEqualTo(ProtocolVersion.RESP2);
+    }
+
+    @Test
+    void helloShouldSwitchToResp3() {
+        assertThat(rsm.decode(buffer("@0\n"), output)).isTrue();
+        assertThat(rsm.isDiscoverProtocol()).isFalse();
+        assertThat(rsm.getProtocolVersion()).isEqualTo(ProtocolVersion.RESP3);
+    }
+
     @Test
     void single() {
         assertThat(rsm.decode(buffer("+OK\r\n"), output)).isTrue();
@@ -159,7 +174,7 @@ void partialFirstLine() {
 
     @Test
     void invalidReplyType() {
-        assertThatThrownBy(() -> rsm.decode(buffer("="), output)).isInstanceOf(RedisException.class);
+        assertThatThrownBy(() -> rsm.decode(buffer("?"), output)).isInstanceOf(RedisException.class);
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
index c3257c55bc..bf5cc7e6b8 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
@@ -162,12 +162,12 @@ void connectWithByteCodec() {
     }
 
     @Test
-    void sentinelConnectionPingBeforeConnectShouldDiscardPassword() {
+    void sentinelConnectionShouldDiscardPassword() {
 
         RedisURI redisURI = RedisURI.Builder.sentinel(TestSettings.host(), SentinelTestSettings.MASTER_ID)
                 .withPassword("hello-world").build();
 
-        redisClient.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+        redisClient.setOptions(ClientOptions.builder().build());
         StatefulRedisSentinelConnection<String, String> connection = redisClient.connectSentinel(redisURI);
 
         assertThat(connection.sync().ping()).isEqualTo("PONG");
diff --git a/src/test/java/io/lettuce/test/condition/RedisConditions.java b/src/test/java/io/lettuce/test/condition/RedisConditions.java
index ddebff5404..8d4b039c20 100644
--- a/src/test/java/io/lettuce/test/condition/RedisConditions.java
+++ b/src/test/java/io/lettuce/test/condition/RedisConditions.java
@@ -114,6 +114,11 @@ public boolean hasCommand(String command) {
      * @return {@literal true} if the command is present with the given arity.
      */
     public boolean hasCommandArity(String command, int arity) {
+
+        if (!hasCommand(command)) {
+            throw new IllegalStateException("Unknown command: " + command + " in " + commands);
+        }
+
         return commands.get(command.toUpperCase()) == arity;
     }
 
diff --git a/src/test/java/io/lettuce/test/settings/TestSettings.java b/src/test/java/io/lettuce/test/settings/TestSettings.java
index 754966117f..5abbab144d 100644
--- a/src/test/java/io/lettuce/test/settings/TestSettings.java
+++ b/src/test/java/io/lettuce/test/settings/TestSettings.java
@@ -77,7 +77,7 @@ public static String hostAddr() {
 
     /**
      *
-     * @return password of your redis instance. Defaults to {@literal passwd}. Can be overriden with
+     * @return password of your redis instance. Defaults to {@literal passwd}. Can be overridden with
      *         {@code -Dpassword=YourPassword}
      */
     public static String password() {

From 9e26ad320d2bb36d169391c73ce8df7210b0744a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 11 Jun 2019 13:30:40 +0200
Subject: [PATCH 711/808] Adapt to RESP3 changes #964

---
 .../core/protocol/RedisStateMachine.java      | 153 +++++++-----------
 .../RedisStateMachineResp2UnitTests.java      |  29 ++--
 .../RedisStateMachineResp3UnitTests.java      |  40 ++---
 .../core/protocol/StateMachineUnitTests.java  |   2 +-
 4 files changed, 97 insertions(+), 127 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index e3bfe5d618..35b8757ecc 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -41,6 +41,8 @@ public class RedisStateMachine {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(RedisStateMachine.class);
     private static final ByteBuffer QUEUED = StandardCharsets.US_ASCII.encode("QUEUED");
+    private static final int TERMINATOR_LENGTH = 2;
+    private static final int NOT_FOUND = -1;
 
     static class State {
         enum Type {
@@ -82,7 +84,6 @@ enum Type {
             BULK_ERROR,
 
             /**
-             *
              * First byte: {@code =}.
              *
              * @since 6.0/RESP3
@@ -99,16 +100,16 @@ enum Type {
             /**
              * First byte: {@code %}.
              *
-             * @since 6.0/RESP3
              * @see #HELLO_V3
+             * @since 6.0/RESP3
              */
             MAP,
 
             /**
              * First byte: {@code ~}.
              *
-             * @since 6.0/RESP3
              * @see #MULTI
+             * @since 6.0/RESP3
              */
             SET,
 
@@ -120,19 +121,18 @@ enum Type {
             ATTRIBUTE,
 
             /**
-             *
              * First byte: {@code >}.
              *
-             * @since 6.0/RESP3
              * @see #MULTI
+             * @since 6.0/RESP3
              */
             PUSH,
 
             /**
              * First byte: {@code @}.
              *
-             * @since 6.0/RESP3
              * @see #MAP
+             * @since 6.0/RESP3
              */
             HELLO_V3,
 
@@ -158,7 +158,7 @@ enum Type {
         }
 
         Type type = null;
-        int count = -1;
+        int count = NOT_FOUND;
 
         @Override
         public String toString() {
@@ -175,11 +175,10 @@ public String toString() {
     private final boolean debugEnabled = logger.isDebugEnabled();
     private final ByteBuf responseElementBuffer;
     private final AtomicBoolean closed = new AtomicBoolean();
+    private final Resp2LongProcessor longProcessor = new Resp2LongProcessor();
 
-    private Resp2LongProcessor longProcessor = new Resp2LongProcessor();
     private ProtocolVersion protocolVersion = null;
     private int stackElements;
-    private int terminatorLength = 2; /* RESP2 CR+LF, RESP3 LF */
 
     /**
      * Initialize a new instance.
@@ -198,16 +197,6 @@ public ProtocolVersion getProtocolVersion() {
 
     public void setProtocolVersion(ProtocolVersion protocolVersion) {
         this.protocolVersion = protocolVersion;
-
-        if (protocolVersion == ProtocolVersion.RESP2) {
-            this.longProcessor = new Resp2LongProcessor();
-            this.terminatorLength = 2;
-        }
-
-        if (protocolVersion == ProtocolVersion.RESP3) {
-            this.longProcessor = new Resp3LongProcessor();
-            this.terminatorLength = 1;
-        }
     }
 
     /**
@@ -298,21 +287,21 @@ public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutp
                     safeSet(output, null, command);
                     break;
                 case INTEGER:
-                    if ((end = findLineEnd(buffer)) == -1) {
+                    if ((end = findLineEnd(buffer)) == NOT_FOUND) {
                         break loop;
                     }
                     long integer = readLong(buffer, buffer.readerIndex(), end);
                     safeSet(output, integer, command);
                     break;
                 case BOOLEAN:
-                    if ((end = findLineEnd(buffer)) == -1) {
+                    if ((end = findLineEnd(buffer)) == NOT_FOUND) {
                         break loop;
                     }
                     boolean value = readBoolean(buffer);
                     safeSet(output, value, command);
                     break;
                 case FLOAT:
-                    if ((end = findLineEnd(buffer)) == -1) {
+                    if ((end = findLineEnd(buffer)) == NOT_FOUND) {
                         break loop;
                     }
                     double f = readFloat(buffer, buffer.readerIndex(), end);
@@ -320,29 +309,29 @@ public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutp
                     break;
                 case BULK:
                 case VERBATIM:
-                    if ((end = findLineEnd(buffer)) == -1) {
+                    if ((end = findLineEnd(buffer)) == NOT_FOUND) {
                         break loop;
                     }
                     length = (int) readLong(buffer, buffer.readerIndex(), end);
-                    if (length == -1) {
+                    if (length == NOT_FOUND) {
                         safeSet(output, null, command);
                     } else {
                         state.type = BYTES;
-                        state.count = length + this.terminatorLength;
+                        state.count = length + TERMINATOR_LENGTH;
                         buffer.markReaderIndex();
                         continue loop;
                     }
                     break;
                 case BULK_ERROR:
-                    if ((end = findLineEnd(buffer)) == -1) {
+                    if ((end = findLineEnd(buffer)) == NOT_FOUND) {
                         break loop;
                     }
                     length = (int) readLong(buffer, buffer.readerIndex(), end);
-                    if (length == -1) {
+                    if (length == NOT_FOUND) {
                         safeSetError(output, null, command);
                     } else {
                         state.type = BYTES;
-                        state.count = length + this.terminatorLength;
+                        state.count = length + TERMINATOR_LENGTH;
                         buffer.markReaderIndex();
                         continue loop;
                     }
@@ -353,8 +342,8 @@ public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutp
                 case SET:
                 case MAP:
 
-                    if (state.count == -1) {
-                        if ((end = findLineEnd(buffer)) == -1) {
+                    if (state.count == NOT_FOUND) {
+                        if ((end = findLineEnd(buffer)) == NOT_FOUND) {
                             break loop;
                         }
                         length = (int) readLong(buffer, buffer.readerIndex(), end);
@@ -407,10 +396,13 @@ public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutp
             logger.debug("Decoded {}, empty stack: {}", command, isEmpty(stack));
         }
 
-        /*
-         * if (isDiscoverProtocol()) { if (resp3Indicator) { setProtocolVersion(ProtocolVersion.RESP3); } else {
-         * setProtocolVersion(ProtocolVersion.RESP2); } }
-         */
+        if (isDiscoverProtocol()) {
+            if (resp3Indicator) {
+                setProtocolVersion(ProtocolVersion.RESP3);
+            } else {
+                setProtocolVersion(ProtocolVersion.RESP2);
+            }
+        }
 
         return isEmpty(stack);
     }
@@ -435,19 +427,11 @@ public void close() {
     private int findLineEnd(ByteBuf buffer) {
 
         int index = buffer.forEachByte(ByteProcessor.FIND_LF);
-
-        if (getProtocolVersion() != ProtocolVersion.RESP3) {
-            return (index > 0 && buffer.getByte(index - 1) == '\r') ? index : -1;
-        }
-
-        return index;
+        return (index > 0 && buffer.getByte(index - 1) == '\r') ? index - 1 : NOT_FOUND;
     }
 
     private State.Type readReplyType(ByteBuf buffer) {
-
-        State.Type type = getType(buffer.readerIndex(), buffer.readByte());
-
-        return type;
+        return getType(buffer.readerIndex(), buffer.readByte());
     }
 
     private State.Type getType(int index, byte b) {
@@ -495,10 +479,10 @@ private long readLong(ByteBuf buffer, int start, int end) {
 
     private double readFloat(ByteBuf buffer, int start, int end) {
 
-        int valueLength = (end - start) - (this.terminatorLength - 1);
+        int valueLength = end - start;
         String value = buffer.toString(start, valueLength, StandardCharsets.US_ASCII);
 
-        buffer.skipBytes(valueLength + this.terminatorLength);
+        buffer.skipBytes(valueLength + TERMINATOR_LENGTH);
 
         return Double.parseDouble(value);
     }
@@ -506,7 +490,7 @@ private double readFloat(ByteBuf buffer, int start, int end) {
     private boolean readBoolean(ByteBuf buffer) {
 
         byte b = buffer.readByte();
-        buffer.skipBytes(this.terminatorLength);
+        buffer.skipBytes(TERMINATOR_LENGTH);
 
         switch (b) {
             case 't':
@@ -523,43 +507,43 @@ private ByteBuffer readLine(ByteBuf buffer) {
         ByteBuffer bytes = null;
         int end = findLineEnd(buffer);
 
-        if (end > -1) {
-
-            int start = buffer.readerIndex();
-            responseElementBuffer.clear();
-            int size = (end - start) - (this.terminatorLength - 1);
+        if (end > NOT_FOUND) {
+            bytes = readBytes0(buffer, end - buffer.readerIndex());
 
-            if (responseElementBuffer.capacity() < size) {
-                responseElementBuffer.capacity(size);
-            }
-
-            buffer.readBytes(responseElementBuffer, size);
-
-            bytes = responseElementBuffer.internalNioBuffer(0, size);
-
-            buffer.readerIndex(end + 1);
+            buffer.skipBytes(TERMINATOR_LENGTH);
             buffer.markReaderIndex();
         }
+
         return bytes;
     }
 
     private ByteBuffer readBytes(ByteBuf buffer, int count) {
 
-        ByteBuffer bytes = null;
-
         if (buffer.readableBytes() >= count) {
-            responseElementBuffer.clear();
 
-            int size = count - this.terminatorLength;
+            ByteBuffer byteBuffer = readBytes0(buffer, count - TERMINATOR_LENGTH);
 
-            if (responseElementBuffer.capacity() < size) {
-                responseElementBuffer.capacity(size);
-            }
-            buffer.readBytes(responseElementBuffer, size);
+            buffer.skipBytes(TERMINATOR_LENGTH);
+            buffer.markReaderIndex();
+
+            return byteBuffer;
+        }
+
+        return null;
+    }
+
+    private ByteBuffer readBytes0(ByteBuf buffer, int count) {
 
-            bytes = responseElementBuffer.internalNioBuffer(0, size);
-            buffer.skipBytes(this.terminatorLength);
+        ByteBuffer bytes;
+        responseElementBuffer.clear();
+
+        if (responseElementBuffer.capacity() < count) {
+            responseElementBuffer.capacity(count);
         }
+
+        buffer.readBytes(responseElementBuffer, count);
+        bytes = responseElementBuffer.internalNioBuffer(0, count);
+
         return bytes;
     }
 
@@ -813,18 +797,20 @@ public long getValue(ByteBuf buffer, int start, int end) {
             this.result = 0;
             this.first = true;
 
-            buffer.forEachByte(start, end - start - 1, this);
+            int length = end - start;
+            buffer.forEachByte(start, length, this);
 
             if (!this.negative) {
                 this.result = -this.result;
             }
-            buffer.readerIndex(end + 1);
+
+            buffer.skipBytes(length + TERMINATOR_LENGTH);
 
             return this.result;
         }
 
         @Override
-        public boolean process(byte value) throws Exception {
+        public boolean process(byte value) {
 
             if (first) {
                 first = false;
@@ -845,23 +831,4 @@ public boolean process(byte value) throws Exception {
             return true;
         }
     }
-
-    @SuppressWarnings("unused")
-    static class Resp3LongProcessor extends Resp2LongProcessor {
-
-        public long getValue(ByteBuf buffer, int start, int end) {
-
-            this.result = 0;
-            this.first = true;
-
-            buffer.forEachByte(start, end - start, this);
-
-            if (!this.negative) {
-                this.result = -this.result;
-            }
-            buffer.readerIndex(end + 1);
-
-            return this.result;
-        }
-    }
 }
diff --git a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java
index 9df548b83d..4b53e3fb67 100644
--- a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java
@@ -21,6 +21,7 @@
 
 import java.nio.charset.Charset;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.logging.log4j.Level;
@@ -77,17 +78,9 @@ final void createStateMachine() {
         rsm = new RedisStateMachine();
     }
 
-    @Test
-    void errorShouldSwitchToResp2Protocol() {
-        assertThat(rsm.decode(buffer("-ERR\r\n"), output)).isTrue();
-        assertThat(output.getError()).isEqualTo("ERR");
-        assertThat(rsm.isDiscoverProtocol()).isFalse();
-        assertThat(rsm.getProtocolVersion()).isEqualTo(ProtocolVersion.RESP2);
-    }
-
     @Test
     void helloShouldSwitchToResp3() {
-        assertThat(rsm.decode(buffer("@0\n"), output)).isTrue();
+        assertThat(rsm.decode(buffer("@0\r\n"), output)).isTrue();
         assertThat(rsm.isDiscoverProtocol()).isFalse();
         assertThat(rsm.getProtocolVersion()).isEqualTo(ProtocolVersion.RESP3);
     }
@@ -100,8 +93,10 @@ void single() {
 
     @Test
     void error() {
-        assertThat(rsm.decode(buffer("-ERR\r\n"), output)).isTrue();
+        ByteBuf buffer = buffer("-ERR\r\n");
+        assertThat(rsm.decode(buffer, output)).isTrue();
         assertThat(output.getError()).isEqualTo("ERR");
+        assertThat(buffer.readerIndex()).isEqualTo(6);
     }
 
     @Test
@@ -114,17 +109,23 @@ void errorWithoutLineBreak() {
     @Test
     void integer() {
         CommandOutput<String, String, Long> output = new IntegerOutput<>(codec);
-        assertThat(rsm.decode(buffer(":1\r\n"), output)).isTrue();
+        ByteBuf buffer = buffer(":1\r\n");
+        assertThat(rsm.decode(buffer, output)).isTrue();
         assertThat((long) output.get()).isEqualTo(1);
+        assertThat(buffer.readerIndex()).isEqualTo(4);
     }
 
     @Test
     void bulk() {
         CommandOutput<String, String, String> output = new ValueOutput<>(codec);
-        assertThat(rsm.decode(buffer("$-1\r\n"), output)).isTrue();
+        ByteBuf buffer = buffer("$-1\r\n");
+        assertThat(rsm.decode(buffer, output)).isTrue();
+        assertThat(buffer.readerIndex()).isEqualTo(5);
         assertThat(output.get()).isNull();
-        assertThat(rsm.decode(buffer("$3\r\nfoo\r\n"), output)).isTrue();
+        buffer = buffer("$3\r\nfoo\r\n");
+        assertThat(rsm.decode(buffer, output)).isTrue();
         assertThat(output.get()).isEqualTo("foo");
+        assertThat(buffer.readerIndex()).isEqualTo(9);
     }
 
     @Test
@@ -161,7 +162,7 @@ void multiEmptyArray3() {
         ByteBuf buffer = buffer("*2\r\n*2\r\n$2\r\nAB\r\n$2\r\nXY\r\n*0\r\n");
         assertThat(rsm.decode(buffer, output)).isTrue();
         assertThat(output.get().get(0)).isEqualTo(Arrays.asList("AB", "XY"));
-        assertThat(output.get().get(1)).isEqualTo(Arrays.asList());
+        assertThat(output.get().get(1)).isEqualTo(Collections.emptyList());
         assertThat(output.get().size()).isEqualTo(2);
     }
 
diff --git a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java
index 8b7292801b..d1bad11811 100644
--- a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java
@@ -21,6 +21,7 @@
 
 import java.nio.charset.Charset;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -79,52 +80,52 @@ final void createStateMachine() {
 
     @Test
     void single() {
-        assertThat(rsm.decode(buffer("+OK\n"), output)).isTrue();
+        assertThat(rsm.decode(buffer("+OK\r\n"), output)).isTrue();
         assertThat(output.get()).isEqualTo("OK");
     }
 
     @Test
     void error() {
-        assertThat(rsm.decode(buffer("-ERR\n"), output)).isTrue();
+        assertThat(rsm.decode(buffer("-ERR\r\n"), output)).isTrue();
         assertThat(output.getError()).isEqualTo("ERR");
     }
 
     @Test
     void errorWithoutLineBreak() {
         assertThat(rsm.decode(buffer("-ERR"), output)).isFalse();
-        assertThat(rsm.decode(buffer("\n"), output)).isTrue();
+        assertThat(rsm.decode(buffer("\r\n"), output)).isTrue();
         assertThat(output.getError()).isEqualTo("");
     }
 
     @Test
     void integer() {
         CommandOutput<String, String, Long> output = new IntegerOutput<>(codec);
-        assertThat(rsm.decode(buffer(":1\n"), output)).isTrue();
+        assertThat(rsm.decode(buffer(":1\r\n"), output)).isTrue();
         assertThat((long) output.get()).isEqualTo(1);
     }
 
     @Test
     void floatNumber() {
         CommandOutput<String, String, Double> output = new DoubleOutput<>(codec);
-        assertThat(rsm.decode(buffer(",12.345\n"), output)).isTrue();
+        assertThat(rsm.decode(buffer(",12.345\r\n"), output)).isTrue();
         assertThat(output.get()).isEqualTo(12.345);
     }
 
     @Test
     void bigNumber() {
         CommandOutput<String, String, String> output = new StatusOutput<>(codec);
-        assertThat(rsm.decode(buffer("(3492890328409238509324850943850943825024385\n"), output)).isTrue();
+        assertThat(rsm.decode(buffer("(3492890328409238509324850943850943825024385\r\n"), output)).isTrue();
         assertThat(output.get()).isEqualTo("3492890328409238509324850943850943825024385");
     }
 
     @Test
     void booleanValue() {
         CommandOutput<String, String, Boolean> output = new BooleanOutput<>(codec);
-        assertThat(rsm.decode(buffer("#t\n"), output)).isTrue();
+        assertThat(rsm.decode(buffer("#t\r\n"), output)).isTrue();
         assertThat(output.get()).isTrue();
 
         output = new BooleanOutput<>(codec);
-        assertThat(rsm.decode(buffer("#f\n"), output)).isTrue();
+        assertThat(rsm.decode(buffer("#f\r\n"), output)).isTrue();
         assertThat(output.get()).isFalse();
     }
 
@@ -132,8 +133,9 @@ void booleanValue() {
     void hello() {
         CommandOutput<String, String, Map<String, Object>> output = new GenericMapOutput<>(codec);
         assertThat(
-                rsm.decode(buffer("%7\n" + "$6\nserver\n$5\nredis\n" + "$7\nversion\n$11\n999.999.999\n" + "$5\nproto\n:3\n"
-                        + "$2\nid\n:184\n" + "$4\nmode\n$10\nstandalone\n" + "$4\nrole\n$6\nmaster\n" + "$7\nmodules\n*0\n"),
+                rsm.decode(buffer("%7\r\n" + "$6\r\nserver\r\n$5\r\nredis\r\n" + "$7\r\nversion\r\n$11\r\n999.999.999\r\n"
+                        + "$5\r\nproto\r\n:3\r\n" + "$2\r\nid\r\n:184\r\n" + "$4\r\nmode\r\n$10\r\nstandalone\r\n"
+                        + "$4\r\nrole\r\n$6\r\nmaster\r\n" + "$7\r\nmodules\r\n*0\r\n"),
                         output)).isTrue();
         assertThat(output.get()).containsEntry("mode", "standalone");
     }
@@ -141,16 +143,16 @@ void hello() {
     @Test
     void bulk() {
         CommandOutput<String, String, String> output = new ValueOutput<>(codec);
-        assertThat(rsm.decode(buffer("$-1\n"), output)).isTrue();
+        assertThat(rsm.decode(buffer("$-1\r\n"), output)).isTrue();
         assertThat(output.get()).isNull();
-        assertThat(rsm.decode(buffer("$3\nfoo\n"), output)).isTrue();
+        assertThat(rsm.decode(buffer("$3\r\nfoo\r\n"), output)).isTrue();
         assertThat(output.get()).isEqualTo("foo");
     }
 
     @Test
     void multi() {
         CommandOutput<String, String, List<String>> output = new ValueListOutput<>(codec);
-        ByteBuf buffer = buffer("*2\n$-1\n$2\nok\n");
+        ByteBuf buffer = buffer("*2\r\n$-1\r\n$2\r\nok\r\n");
         assertThat(rsm.decode(buffer, output)).isTrue();
         assertThat(output.get()).isEqualTo(Arrays.asList(null, "ok"));
     }
@@ -158,7 +160,7 @@ void multi() {
     @Test
     void multiSet() {
         CommandOutput<String, String, List<String>> output = new ValueListOutput<>(codec);
-        ByteBuf buffer = buffer("~2\n$-1\n$2\nok\n");
+        ByteBuf buffer = buffer("~2\r\n$-1\r\n$2\r\nok\r\n");
         assertThat(rsm.decode(buffer, output)).isTrue();
         assertThat(output.get()).isEqualTo(Arrays.asList(null, "ok"));
     }
@@ -166,7 +168,7 @@ void multiSet() {
     @Test
     void multiMap() {
         CommandOutput<String, String, Map<String, Object>> output = new GenericMapOutput<>(codec);
-        ByteBuf buffer = buffer("%1\n$3\nfoo\n$2\nok\n");
+        ByteBuf buffer = buffer("%1\r\n$3\r\nfoo\r\n$2\r\nok\r\n");
         assertThat(rsm.decode(buffer, output)).isTrue();
         assertThat(output.get()).containsEntry("foo", "ok");
     }
@@ -174,7 +176,7 @@ void multiMap() {
     @Test
     void multiEmptyArray1() {
         CommandOutput<String, String, List<Object>> output = new NestedMultiOutput<>(codec);
-        ByteBuf buffer = buffer("*2\n$3\nABC\n*0\n");
+        ByteBuf buffer = buffer("*2\r\n$3\r\nABC\r\n*0\r\n");
         assertThat(rsm.decode(buffer, output)).isTrue();
         assertThat(output.get().get(0)).isEqualTo("ABC");
         assertThat(output.get().get(1)).isEqualTo(Arrays.asList());
@@ -184,7 +186,7 @@ void multiEmptyArray1() {
     @Test
     void multiEmptyArray2() {
         CommandOutput<String, String, List<Object>> output = new NestedMultiOutput<>(codec);
-        ByteBuf buffer = buffer("*2\n*0\n$3\nABC\n");
+        ByteBuf buffer = buffer("*2\r\n*0\r\n$3\r\nABC\r\n");
         assertThat(rsm.decode(buffer, output)).isTrue();
         assertThat(output.get().get(0)).isEqualTo(Arrays.asList());
         assertThat(output.get().get(1)).isEqualTo("ABC");
@@ -194,10 +196,10 @@ void multiEmptyArray2() {
     @Test
     void multiEmptyArray3() {
         CommandOutput<String, String, List<Object>> output = new NestedMultiOutput<>(codec);
-        ByteBuf buffer = buffer("*2\n*2\n$2\nAB\n$2\nXY\n*0\n");
+        ByteBuf buffer = buffer("*2\r\n*2\r\n$2\r\nAB\r\n$2\r\nXY\r\n*0\r\n");
         assertThat(rsm.decode(buffer, output)).isTrue();
         assertThat(output.get().get(0)).isEqualTo(Arrays.asList("AB", "XY"));
-        assertThat(output.get().get(1)).isEqualTo(Arrays.asList());
+        assertThat(output.get().get(1)).isEqualTo(Collections.emptyList());
         assertThat(output.get().size()).isEqualTo(2);
     }
 
diff --git a/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java b/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
index e6bbc95127..e96f0cc98a 100644
--- a/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
@@ -85,7 +85,7 @@ void errorShouldSwitchToResp2Protocol() {
 
     @Test
     void helloShouldSwitchToResp3() {
-        assertThat(rsm.decode(buffer("@0\n"), output)).isTrue();
+        assertThat(rsm.decode(buffer("@0\r\n"), output)).isTrue();
         assertThat(rsm.isDiscoverProtocol()).isFalse();
         assertThat(rsm.getProtocolVersion()).isEqualTo(ProtocolVersion.RESP3);
     }

From ee61acce1535b9c06509d89c9a0745a1d446e896 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 11 Jun 2019 22:31:40 +0200
Subject: [PATCH 712/808] Update Map and Geo outputs #964

---
 .../core/output/GeoCoordinatesListOutput.java |  5 +++
 .../output/GeoCoordinatesValueListOutput.java |  7 +++-
 .../io/lettuce/core/output/KeyListOutput.java |  5 +++
 .../io/lettuce/core/output/MapOutput.java     |  7 ++--
 .../io/lettuce/core/output/MultiOutput.java   | 34 +++++++++++++++++++
 .../TransactionCommandIntegrationTests.java   |  1 -
 6 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
index 95a08edd5b..8cb7d01f1b 100644
--- a/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
@@ -45,6 +45,11 @@ public GeoCoordinatesListOutput(RedisCodec<K, V> codec) {
     @Override
     public void set(ByteBuffer bytes) {
 
+        if (bytes == null) {
+            subscriber.onNext(output, null);
+            return;
+        }
+
         double value = (bytes == null) ? 0 : parseDouble(decodeAscii(bytes));
         set(value);
     }
diff --git a/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
index 7b36f41f91..7bf7f86c37 100644
--- a/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
@@ -46,7 +46,12 @@ public GeoCoordinatesValueListOutput(RedisCodec<K, V> codec) {
     @Override
     public void set(ByteBuffer bytes) {
 
-        double value = (bytes == null) ? 0 : parseDouble(decodeAscii(bytes));
+        if (bytes == null) {
+            subscriber.onNext(output, Value.empty());
+            return;
+        }
+
+        double value = parseDouble(decodeAscii(bytes));
         set(value);
     }
 
diff --git a/src/main/java/io/lettuce/core/output/KeyListOutput.java b/src/main/java/io/lettuce/core/output/KeyListOutput.java
index 78df504e79..6021a590c3 100644
--- a/src/main/java/io/lettuce/core/output/KeyListOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyListOutput.java
@@ -42,6 +42,11 @@ public KeyListOutput(RedisCodec<K, V> codec) {
 
     @Override
     public void set(ByteBuffer bytes) {
+
+        if (bytes == null) {
+            return;
+        }
+
         subscriber.onNext(output, bytes == null ? null : codec.decodeKey(bytes));
     }
 
diff --git a/src/main/java/io/lettuce/core/output/MapOutput.java b/src/main/java/io/lettuce/core/output/MapOutput.java
index 76b123f80c..668897526d 100644
--- a/src/main/java/io/lettuce/core/output/MapOutput.java
+++ b/src/main/java/io/lettuce/core/output/MapOutput.java
@@ -16,6 +16,7 @@
 package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -32,10 +33,11 @@
  */
 public class MapOutput<K, V> extends CommandOutput<K, V, Map<K, V>> {
 
+    private boolean initialized;
     private K key;
 
     public MapOutput(RedisCodec<K, V> codec) {
-        super(codec, null);
+        super(codec, Collections.emptyMap());
     }
 
     @Override
@@ -68,8 +70,9 @@ public void set(long integer) {
     @Override
     public void multi(int count) {
 
-        if (output == null) {
+        if (!initialized) {
             output = new LinkedHashMap<>(count / 2, 1);
+            initialized = true;
         }
     }
 }
diff --git a/src/main/java/io/lettuce/core/output/MultiOutput.java b/src/main/java/io/lettuce/core/output/MultiOutput.java
index ab7fa86db2..32b0e7cc2a 100644
--- a/src/main/java/io/lettuce/core/output/MultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/MultiOutput.java
@@ -39,6 +39,7 @@ public class MultiOutput<K, V> extends CommandOutput<K, V, TransactionResult> {
     private final Queue<RedisCommand<K, V, ?>> queue;
     private List<Object> responses = new ArrayList<>();
     private Boolean discarded;
+    private Integer multi;
 
     public MultiOutput(RedisCodec<K, V> codec) {
         super(codec, null);
@@ -63,8 +64,38 @@ public void set(long integer) {
         }
     }
 
+    @Override
+    public void setSingle(ByteBuffer bytes) {
+        RedisCommand<K, V, ?> command = queue.peek();
+        if (command != null && command.getOutput() != null) {
+            command.getOutput().setSingle(bytes);
+        }
+    }
+
+    @Override
+    public void setBigNumber(ByteBuffer bytes) {
+        RedisCommand<K, V, ?> command = queue.peek();
+        if (command != null && command.getOutput() != null) {
+            command.getOutput().setBigNumber(bytes);
+        }
+    }
+
+    @Override
+    public void set(double number) {
+        RedisCommand<K, V, ?> command = queue.peek();
+        if (command != null && command.getOutput() != null) {
+            command.getOutput().set(number);
+        }
+    }
+
     @Override
     public void set(ByteBuffer bytes) {
+
+        if (multi == null && bytes == null) {
+            discarded = true;
+            return;
+        }
+
         RedisCommand<K, V, ?> command = queue.peek();
         if (command != null && command.getOutput() != null) {
             command.getOutput().set(bytes);
@@ -74,6 +105,9 @@ public void set(ByteBuffer bytes) {
     @Override
     public void multi(int count) {
 
+        if (multi == null) {
+            multi = count;
+        }
         if (discarded == null) {
             discarded = count == -1;
         } else {
diff --git a/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java
index 5b5e287b9f..7b3535fd22 100644
--- a/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java
@@ -82,7 +82,6 @@ void watch() {
 
         assertThat(transactionResult.wasDiscarded()).isTrue();
         assertThat(transactionResult).isEmpty();
-
     }
 
     @Test

From f15c852e050f929c6018a503f6438eef2efe6219 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 12 Jun 2019 11:38:16 +0200
Subject: [PATCH 713/808] Polishing #964

---
 .../io/lettuce/core/AbstractRedisClient.java  |   1 -
 .../java/io/lettuce/core/RedisClient.java     | 119 ++++++------------
 .../core/cluster/RedisClusterClient.java      |  12 +-
 ...yncConnectionProviderIntegrationTests.java |  33 ++---
 .../RedisStateMachineResp2UnitTests.java      |  20 +--
 .../RedisStateMachineResp3UnitTests.java      |  19 +--
 6 files changed, 92 insertions(+), 112 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 0cff16726a..81935da9ac 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -174,7 +174,6 @@ protected void connectionBuilder(Mono<SocketAddress> socketAddressSupplier, Conn
             if (hasPassword(redisURI)) {
                 if (LettuceStrings.isNotEmpty(redisURI.getUsername())) {
                     connectionBuilder.auth(redisURI.getUsername(), redisURI.getPassword());
-
                 } else {
                     connectionBuilder.auth("default", redisURI.getPassword());
                 }
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 35e171bf76..175b74b63b 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -288,45 +288,7 @@ private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandalone
     private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnectionImpl<K, V> connection,
             RedisCodec<K, V> codec, Endpoint endpoint, RedisURI redisURI, Supplier<CommandHandler> commandHandlerSupplier) {
 
-        ConnectionBuilder connectionBuilder = getConnectionBuilder(endpoint, redisURI, commandHandlerSupplier);
-        connectionBuilder.connection(connection);
-
-        ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
-        ConnectionFuture<?> sync = future;
-
-        if (!clientOptions.isPingBeforeActivateConnection() && hasPassword(redisURI)) {
-
-            sync = sync.thenCompose(channelHandler -> {
-
-                CommandArgs<K, V> args = new CommandArgs<>(codec).add(redisURI.getPassword());
-                return connection.async().dispatch(CommandType.AUTH, new StatusOutput<>(codec), args);
-            });
-        }
-
-        if (LettuceStrings.isNotEmpty(redisURI.getClientName())) {
-            sync = sync.thenApply(channelHandler -> {
-                connection.setClientName(redisURI.getClientName());
-                return channelHandler;
-            });
-        }
-
-        if (redisURI.getDatabase() != 0) {
-
-            sync = sync.thenCompose(channelHandler -> {
-
-                CommandArgs<K, V> args = new CommandArgs<>(codec).add(redisURI.getDatabase());
-                return connection.async().dispatch(CommandType.SELECT, new StatusOutput<>(codec), args);
-            });
-        }
-
-        return sync.thenApply(channelHandler -> (S) connection);
-    }
-
-    private <K, V> ConnectionBuilder getConnectionBuilder(Endpoint endpoint, RedisURI redisURI,
-            Supplier<CommandHandler> commandHandlerSupplier) {
-
         ConnectionBuilder connectionBuilder;
-
         if (redisURI.isSsl()) {
             SslConnectionBuilder sslConnectionBuilder = SslConnectionBuilder.sslConnectionBuilder();
             sslConnectionBuilder.ssl(redisURI);
@@ -335,6 +297,7 @@ private <K, V> ConnectionBuilder getConnectionBuilder(Endpoint endpoint, RedisUR
             connectionBuilder = ConnectionBuilder.connectionBuilder();
         }
 
+        connectionBuilder.connection(connection);
         connectionBuilder.clientOptions(clientOptions);
         connectionBuilder.clientResources(clientResources);
         connectionBuilder.commandHandler(commandHandlerSupplier).endpoint(endpoint);
@@ -345,7 +308,8 @@ private <K, V> ConnectionBuilder getConnectionBuilder(Endpoint endpoint, RedisUR
         ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
         ConnectionFuture<?> sync = future;
 
-        if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2 && LettuceStrings.isNotEmpty(redisURI.getClientName())) {
+        if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2
+                && LettuceStrings.isNotEmpty(redisURI.getClientName())) {
             sync = sync.thenApply(channelHandler -> {
                 connection.setClientName(redisURI.getClientName());
                 return channelHandler;
@@ -557,7 +521,7 @@ private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectS
             String clientName = LettuceStrings.isNotEmpty(uri.getClientName()) ? uri.getClientName() : redisURI.getClientName();
 
             Mono<StatefulRedisSentinelConnection<K, V>> connectionMono = Mono
-                    .defer(() -> Mono.fromCompletionStage(doConnectSentinelAsync(codec, clientName, uri, timeout)))
+                    .fromCompletionStage(() -> doConnectSentinelAsync(codec, clientName, uri, timeout))
                     .onErrorMap(CompletionException.class, Throwable::getCause)
                     .onErrorMap(e -> new RedisConnectionException("Cannot connect Redis Sentinel at " + uri, e))
                     .doOnError(exceptionCollector::add);
@@ -570,29 +534,34 @@ private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectS
         }
 
         if (connectionLoop == null) {
-            return Mono.<StatefulRedisSentinelConnection<K, V>> error(
-                    new RedisConnectionException("Cannot connect to a Redis Sentinel: " + redisURI.getSentinels())).toFuture();
+            return Mono
+                    .<StatefulRedisSentinelConnection<K, V>> error(
+                            new RedisConnectionException("Cannot connect to a Redis Sentinel: " + redisURI.getSentinels()))
+                    .toFuture();
         }
 
-        return connectionLoop.onErrorMap(
-                e -> {
+        return connectionLoop.onErrorMap(e -> {
 
-                    RedisConnectionException ex = new RedisConnectionException("Cannot connect to a Redis Sentinel: "
-                            + redisURI.getSentinels(), e);
+            RedisConnectionException ex = new RedisConnectionException(
+                    "Cannot connect to a Redis Sentinel: " + redisURI.getSentinels(), e);
 
-                    for (Throwable throwable : exceptionCollector) {
-                        if (e != throwable) {
-                            ex.addSuppressed(throwable);
-                        }
-                    }
+            for (Throwable throwable : exceptionCollector) {
+                if (e != throwable) {
+                    ex.addSuppressed(throwable);
+                }
+            }
 
-                    return ex;
-                }).toFuture();
+            return ex;
+        }).toFuture();
     }
 
     private <K, V> ConnectionFuture<StatefulRedisSentinelConnection<K, V>> doConnectSentinelAsync(RedisCodec<K, V> codec,
             String clientName, RedisURI redisURI, Duration timeout) {
 
+        ConnectionBuilder connectionBuilder = ConnectionBuilder.connectionBuilder();
+        connectionBuilder.clientOptions(ClientOptions.copyOf(getOptions()));
+        connectionBuilder.clientResources(clientResources);
+
         DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions, clientResources);
         RedisChannelWriter writer = endpoint;
 
@@ -600,14 +569,12 @@ private <K, V> ConnectionFuture<StatefulRedisSentinelConnection<K, V>> doConnect
             writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
         }
 
-        ConnectionBuilder connectionBuilder = getConnectionBuilder(endpoint, redisURI, () -> new CommandHandler(clientOptions,
-                clientResources, endpoint));
-
         StatefulRedisSentinelConnectionImpl<K, V> connection = newStatefulRedisSentinelConnection(writer, codec, timeout);
 
         logger.debug("Connecting to Redis Sentinel, address: " + redisURI);
 
-        connectionBuilder.connection(connection);
+        connectionBuilder.endpoint(endpoint).commandHandler(() -> new CommandHandler(clientOptions, clientResources, endpoint))
+                .connection(connection);
         connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
 
         channelType(connectionBuilder, redisURI);
@@ -724,9 +691,8 @@ protected Mono<SocketAddress> getSocketAddress(RedisURI redisURI) {
             if (redisURI.getSentinelMasterId() != null && !redisURI.getSentinels().isEmpty()) {
                 logger.debug("Connecting to Redis using Sentinels {}, MasterId {}", redisURI.getSentinels(),
                         redisURI.getSentinelMasterId());
-                return lookupRedis(redisURI).switchIfEmpty(
-                        Mono.error(new RedisConnectionException("Cannot provide redisAddress using sentinel for masterId "
-                                + redisURI.getSentinelMasterId())));
+                return lookupRedis(redisURI).switchIfEmpty(Mono.error(new RedisConnectionException(
+                        "Cannot provide redisAddress using sentinel for masterId " + redisURI.getSentinelMasterId())));
 
             } else {
                 return Mono.fromCallable(() -> clientResources.socketAddressResolver().resolve((redisURI)));
@@ -768,30 +734,28 @@ private Mono<SocketAddress> getSocketAddressSupplier(RedisURI redisURI) {
 
     private Mono<SocketAddress> lookupRedis(RedisURI sentinelUri) {
 
-        Mono<StatefulRedisSentinelConnection<String, String>> connection = Mono.fromCompletionStage(() -> connectSentinelAsync(
-                newStringStringCodec(), sentinelUri, timeout));
+        Mono<StatefulRedisSentinelConnection<String, String>> connection = Mono
+                .fromCompletionStage(() -> connectSentinelAsync(newStringStringCodec(), sentinelUri, timeout));
 
         return connection.flatMap(c -> {
 
             String sentinelMasterId = sentinelUri.getSentinelMasterId();
-            return c.reactive()
-                    .getMasterAddrByName(sentinelMasterId)
-                    .map(it -> {
+            return c.reactive().getMasterAddrByName(sentinelMasterId).map(it -> {
 
-                        if (it instanceof InetSocketAddress) {
+                if (it instanceof InetSocketAddress) {
 
-                            InetSocketAddress isa = (InetSocketAddress) it;
-                            SocketAddress resolved = clientResources.socketAddressResolver().resolve(
-                                    RedisURI.create(isa.getHostString(), isa.getPort()));
+                    InetSocketAddress isa = (InetSocketAddress) it;
+                    SocketAddress resolved = clientResources.socketAddressResolver()
+                            .resolve(RedisURI.create(isa.getHostString(), isa.getPort()));
 
-                            logger.debug("Resolved Master {} SocketAddress {}:{} to {}", sentinelMasterId, isa.getHostString(),
-                                    isa.getPort(), resolved);
+                    logger.debug("Resolved Master {} SocketAddress {}:{} to {}", sentinelMasterId, isa.getHostString(),
+                            isa.getPort(), resolved);
 
-                            return resolved;
-                        }
+                    return resolved;
+                }
 
-                        return it;
-                    }).timeout(this.timeout) //
+                return it;
+            }).timeout(this.timeout) //
                     .flatMap(it -> Mono.fromCompletionStage(c::closeAsync) //
                             .thenReturn(it));
         });
@@ -856,9 +820,8 @@ private static void assertNotNull(ClientResources clientResources) {
     }
 
     private void checkForRedisURI() {
-        LettuceAssert
-                .assertState(this.redisURI != EMPTY_URI,
-                        "RedisURI is not available. Use RedisClient(Host), RedisClient(Host, Port) or RedisClient(RedisURI) to construct your client.");
+        LettuceAssert.assertState(this.redisURI != EMPTY_URI,
+                "RedisURI is not available. Use RedisClient(Host), RedisClient(Host, Port) or RedisClient(RedisURI) to construct your client.");
         checkValidRedisURI(this.redisURI);
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index b27727f879..2eb15a4757 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -763,13 +763,19 @@ private <K, V> ConnectionBuilder createConnectionBuilder(RedisChannelHandler<K,
             }
         } else if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP3) {
 
-            if (LettuceStrings.isNotEmpty(connectionSettings.getUsername())) {
-                connectionBuilder.auth(connectionSettings.getUsername(), connectionSettings.getPassword());
-                connectionBuilder.handshakeAuthResp3();
+            if (hasPassword(connectionSettings)) {
+                if (LettuceStrings.isNotEmpty(connectionSettings.getUsername())) {
+                    connectionBuilder.auth(connectionSettings.getUsername(), connectionSettings.getPassword());
+                    connectionBuilder.handshakeAuthResp3();
+                } else {
+                    connectionBuilder.auth("default", connectionSettings.getPassword());
+                    connectionBuilder.handshakeAuthResp3();
+                }
             } else {
                 connectionBuilder.handshakeResp3();
             }
         }
+
         return connectionBuilder;
     }
 
diff --git a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
index c533f6e3e3..122b78640d 100644
--- a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static org.assertj.core.api.Assumptions.assumeThat;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -45,6 +45,8 @@
 import io.lettuce.core.cluster.ClusterNodeConnectionFactory.ConnectionKey;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.AsyncConnectionProvider;
+import io.lettuce.core.protocol.ProtocolVersion;
+import io.lettuce.core.resource.ClientResources;
 import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.settings.TestSettings;
@@ -56,15 +58,16 @@
 @ExtendWith(LettuceExtension.class)
 class AsyncConnectionProviderIntegrationTests {
 
-    private final RedisClusterClient redisClient;
+    private final ClientResources resources;
+    private RedisClusterClient client;
     private ServerSocket serverSocket;
     private CountDownLatch connectInitiated = new CountDownLatch(1);
 
     private AsyncConnectionProvider<ConnectionKey, StatefulRedisConnection<String, String>, ConnectionFuture<StatefulRedisConnection<String, String>>> sut;
 
     @Inject
-    AsyncConnectionProviderIntegrationTests(RedisClusterClient redisClient) {
-        this.redisClient = redisClient;
+    AsyncConnectionProviderIntegrationTests(ClientResources resources) {
+        this.resources = resources;
     }
 
     @BeforeEach
@@ -72,17 +75,17 @@ void before() throws Exception {
 
         serverSocket = new ServerSocket(SocketUtils.findAvailableTcpPort(), 1);
 
-        sut = new AsyncConnectionProvider<>(
-                new AbstractClusterNodeConnectionFactory<String, String>(redisClient.getResources()) {
+        client = RedisClusterClient.create(resources, "redis://localhost");
+        client.setOptions(ClusterClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).build());
+        sut = new AsyncConnectionProvider<>(new AbstractClusterNodeConnectionFactory<String, String>(resources) {
             @Override
             public ConnectionFuture<StatefulRedisConnection<String, String>> apply(ConnectionKey connectionKey) {
 
                 RedisURI redisURI = RedisURI.create(TestSettings.host(), serverSocket.getLocalPort());
                 redisURI.setTimeout(Duration.ofSeconds(5));
 
-                ConnectionFuture<StatefulRedisConnection<String, String>> future = redisClient.connectToNodeAsync(
-                        StringCodec.UTF8, "", null,
-                        Mono.just(new InetSocketAddress(connectionKey.host, serverSocket.getLocalPort())));
+                ConnectionFuture<StatefulRedisConnection<String, String>> future = client.connectToNodeAsync(StringCodec.UTF8,
+                        "", null, Mono.just(new InetSocketAddress(connectionKey.host, serverSocket.getLocalPort())));
 
                 connectInitiated.countDown();
 
@@ -160,10 +163,10 @@ void connectShouldFail() throws Exception {
 
         Socket socket = new Socket(TestSettings.host(), serverSocket.getLocalPort());
 
-        ClusterClientOptions clientOptions = ClusterClientOptions.builder()
+        ClusterClientOptions clientOptions = ClusterClientOptions.builder().protocolVersion(ProtocolVersion.RESP2)
                 .socketOptions(SocketOptions.builder().connectTimeout(1, TimeUnit.SECONDS).build()).build();
 
-        redisClient.setOptions(clientOptions);
+        client.setOptions(clientOptions);
 
         ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "8.8.8.8", TestSettings.port());
 
@@ -193,10 +196,10 @@ void connectShouldFailConcurrently() throws Exception {
 
         Socket socket = new Socket(TestSettings.host(), serverSocket.getLocalPort());
 
-        ClusterClientOptions clientOptions = ClusterClientOptions.builder()
+        ClusterClientOptions clientOptions = ClusterClientOptions.builder().protocolVersion(ProtocolVersion.RESP2)
                 .socketOptions(SocketOptions.builder().connectTimeout(1, TimeUnit.SECONDS).build()).build();
 
-        redisClient.setOptions(clientOptions);
+        client.setOptions(clientOptions);
 
         ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, "8.8.8.8", TestSettings.port());
 
@@ -236,7 +239,7 @@ void connectShouldFailConcurrently() throws Exception {
     @Test
     void shouldCloseAsync() throws Exception {
 
-        assumeTrue(System.getProperty("os.name").toLowerCase().contains("mac"));
+        assumeThat(System.getProperty("os.name").toLowerCase()).contains("mac");
 
         Socket socket = new Socket("localhost", serverSocket.getLocalPort());
         CountDownLatch connectInitiated = new CountDownLatch(1);
@@ -244,7 +247,7 @@ void shouldCloseAsync() throws Exception {
         ClusterClientOptions clientOptions = ClusterClientOptions.builder()
                 .socketOptions(SocketOptions.builder().connectTimeout(1, TimeUnit.SECONDS).build()).build();
 
-        redisClient.setOptions(clientOptions);
+        client.setOptions(clientOptions);
 
         ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, TestSettings.host(),
                 TestSettings.port());
diff --git a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java
index 4b53e3fb67..ddcd6910b4 100644
--- a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java
@@ -20,6 +20,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -29,16 +30,14 @@
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.config.LoggerConfig;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 
 import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.RedisCodec;
-import io.lettuce.core.codec.Utf8StringCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.*;
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.Unpooled;
 
 /**
@@ -49,8 +48,8 @@
  */
 class RedisStateMachineResp2UnitTests {
 
-    private RedisCodec<String, String> codec = new Utf8StringCodec();
-    private Charset charset = Charset.forName("UTF-8");
+    private RedisCodec<String, String> codec = StringCodec.UTF8;
+    private Charset charset = StandardCharsets.UTF_8;
     private CommandOutput<String, String, String> output;
     private RedisStateMachine rsm;
 
@@ -75,7 +74,12 @@ static void afterClass() {
     @BeforeEach
     final void createStateMachine() {
         output = new StatusOutput<>(codec);
-        rsm = new RedisStateMachine();
+        rsm = new RedisStateMachine(ByteBufAllocator.DEFAULT);
+    }
+
+    @AfterEach
+    void tearDown() {
+        rsm.close();
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java
index d1bad11811..24c9dc6515 100644
--- a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java
@@ -20,6 +20,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -30,16 +31,15 @@
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.config.LoggerConfig;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 
 import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.codec.Utf8StringCodec;
 import io.lettuce.core.output.*;
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.Unpooled;
 
 /**
@@ -49,8 +49,8 @@
  */
 class RedisStateMachineResp3UnitTests {
 
-    private RedisCodec<String, String> codec = new Utf8StringCodec();
-    private Charset charset = Charset.forName("UTF-8");
+    private RedisCodec<String, String> codec = StringCodec.UTF8;
+    private Charset charset = StandardCharsets.UTF_8;
     private CommandOutput<String, String, String> output;
     private RedisStateMachine rsm;
 
@@ -74,10 +74,15 @@ static void afterClass() {
     @BeforeEach
     final void createStateMachine() {
         output = new StatusOutput<>(codec);
-        rsm = new RedisStateMachine();
+        rsm = new RedisStateMachine(ByteBufAllocator.DEFAULT);
         rsm.setProtocolVersion(ProtocolVersion.RESP3);
     }
 
+    @AfterEach
+    void tearDown() {
+        rsm.close();
+    }
+
     @Test
     void single() {
         assertThat(rsm.decode(buffer("+OK\r\n"), output)).isTrue();

From ed89bb393c7cd9cdc60ad30f0ce31058338bed86 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 10 Nov 2019 12:37:16 +0100
Subject: [PATCH 714/808] Adapt to RESP3 changes #964

---
 src/main/java/io/lettuce/core/RedisURI.java   | 23 +++++-
 .../io/lettuce/core/protocol/CommandType.java |  6 +-
 .../core/protocol/RedisStateMachine.java      | 12 ++-
 .../core/AuthenticationIntegrationTests.java  | 63 +++++++++++++++
 .../core/ClientOptionsIntegrationTests.java   |  4 +-
 .../ConnectionCommandIntegrationTests.java    | 13 +++-
 .../UnixDomainSocketIntegrationTests.java     |  4 +
 ...yncConnectionProviderIntegrationTests.java | 78 +------------------
 .../RedisClusterClientIntegrationTests.java   |  5 +-
 ...CustomReactiveCommandIntegrationTests.java |  1 +
 .../masterslave/StaticMasterSlaveTest.java    | 18 ++---
 11 files changed, 127 insertions(+), 100 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/AuthenticationIntegrationTests.java

diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 857873c133..756ef56e26 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -965,6 +965,7 @@ public static class Builder {
         private int port;
         private int database;
         private String clientName;
+        private String username;
         private char[] password;
         private char[] sentinelPassword;
         private boolean ssl = false;
@@ -1253,6 +1254,22 @@ public Builder withClientName(String clientName) {
             return this;
         }
 
+        /**
+         * Configures authentication.
+         *
+         * @param username the user name
+         * @param password the password name
+         * @return the builder
+         */
+        public Builder withAuthentication(String username, CharSequence password) {
+
+            LettuceAssert.notNull(username, "User name must not be null");
+            LettuceAssert.notNull(password, "Password must not be null");
+
+            this.username = username;
+            return withPassword(password);
+        }
+
         /**
          * Configures authentication.
          *
@@ -1281,7 +1298,7 @@ public Builder withPassword(CharSequence password) {
 
             char[] chars = new char[password.length()];
             for (int i = 0; i < password.length(); i++) {
-                chars[i] = password.charAt(0);
+                chars[i] = password.charAt(i);
             }
 
             return withPassword(chars);
@@ -1345,6 +1362,10 @@ public RedisURI build() {
             redisURI.setHost(host);
             redisURI.setPort(port);
 
+            if (username != null) {
+                redisURI.setUsername(username);
+            }
+
             if (password != null) {
                 redisURI.setPassword(password);
             }
diff --git a/src/main/java/io/lettuce/core/protocol/CommandType.java b/src/main/java/io/lettuce/core/protocol/CommandType.java
index b0f9b10cc7..080198d35c 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandType.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandType.java
@@ -26,9 +26,13 @@
  */
 public enum CommandType implements ProtocolKeyword {
 
+    // Authentication
+
+    ACL, AUTH,
+
     // Connection
 
-    AUTH, ECHO, HELLO, PING, QUIT, READONLY, READWRITE, SELECT, SWAPDB,
+    ECHO, HELLO, PING, QUIT, READONLY, READWRITE, SELECT, SWAPDB,
 
     // Server
 
diff --git a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index 35b8757ecc..c036bb99e3 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -88,7 +88,7 @@ enum Type {
              *
              * @since 6.0/RESP3
              */
-            VERBATIM,
+            VERBATIM, VERBATIM_STRING,
 
             /**
              * First byte: {@code (}.
@@ -316,7 +316,7 @@ public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutp
                     if (length == NOT_FOUND) {
                         safeSet(output, null, command);
                     } else {
-                        state.type = BYTES;
+                        state.type = state.type == VERBATIM ? VERBATIM_STRING : BYTES;
                         state.count = length + TERMINATOR_LENGTH;
                         buffer.markReaderIndex();
                         continue loop;
@@ -374,6 +374,14 @@ public boolean decode(ByteBuf buffer, RedisCommand<?, ?, ?> command, CommandOutp
 
                     continue loop;
 
+                case VERBATIM_STRING:
+                    if ((bytes = readBytes(buffer, state.count)) == null) {
+                        break loop;
+                    }
+                    // skip txt: and mkd:
+                    bytes.position(bytes.position() + 4);
+                    safeSet(output, bytes, command);
+                    break;
                 case BYTES:
                     if ((bytes = readBytes(buffer, state.count)) == null) {
                         break loop;
diff --git a/src/test/java/io/lettuce/core/AuthenticationIntegrationTests.java b/src/test/java/io/lettuce/core/AuthenticationIntegrationTests.java
new file mode 100644
index 0000000000..330dfd4ce8
--- /dev/null
+++ b/src/test/java/io/lettuce/core/AuthenticationIntegrationTests.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.settings.TestSettings;
+
+/**
+ * Integration test for authentication.
+ *
+ * @author Mark Paluch
+ */
+@ExtendWith(LettuceExtension.class)
+class AuthenticationIntegrationTests extends TestSupport {
+
+    @BeforeEach
+    @Inject
+    void setUp(StatefulRedisConnection<String, String> connection) {
+
+        connection.sync().dispatch(CommandType.ACL, new StatusOutput<>(StringCodec.UTF8),
+                new CommandArgs<>(StringCodec.UTF8).add("SETUSER").add("john").add("on").add(">foobared").add("-@all"));
+    }
+
+    @Test
+    @Inject
+    void authAsJohn(RedisClient client) {
+
+        RedisURI uri = RedisURI.builder().withHost(TestSettings.host()).withPort(TestSettings.port())
+                .withAuthentication("john", "foobared").build();
+
+        StatefulRedisConnection<String, String> connection = client.connect(uri);
+
+        assertThatThrownBy(() -> connection.sync().info()).hasMessageContaining("NOPERM");
+
+        connection.close();
+    }
+}
diff --git a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
index d11fc92c73..fc65b86e76 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
@@ -44,8 +44,8 @@
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
-import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.Wait;
 import io.lettuce.test.WithPassword;
 import io.lettuce.test.settings.TestSettings;
@@ -55,7 +55,7 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-@RedisBug("HELLO AUTH currently not working")
+@RedisBug("Cannot unset requirepass")
 class ClientOptionsIntegrationTests extends TestSupport {
 
     private final RedisClient client;
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
index 40e1a18cc7..c8168ac1c9 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
@@ -23,7 +23,6 @@
 
 import javax.inject.Inject;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -32,7 +31,9 @@
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.protocol.ProtocolVersion;
 import io.lettuce.test.*;
+import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Will Glozer
@@ -100,11 +101,15 @@ void authEmpty() {
         assertThatThrownBy(() -> redis.auth("")).isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Disabled("HELLO AUTH currently not working")
+    @Test
     void authReconnect() {
         WithPassword.run(client, () -> {
 
-            RedisCommands<String, String> connection = client.connect().sync();
+            RedisURI uri = RedisURI.builder().withHost(TestSettings.host()).withPort(TestSettings.port()).withPassword(passwd)
+                    .build();
+
+            client.setOptions(ClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).build());
+            RedisCommands<String, String> connection = client.connect(uri).sync();
             assertThat(connection.auth(passwd)).isEqualTo("OK");
             assertThat(connection.set(key, value)).isEqualTo("OK");
             connection.quit();
@@ -141,7 +146,7 @@ void authInvalidPassword() {
             TestFutures.awaitOrTimeout(async.auth("invalid"));
             fail("Authenticated with invalid password");
         } catch (RedisException e) {
-            assertThat(e.getMessage()).isEqualTo("ERR Client sent AUTH, but no password is set");
+            assertThat(e.getMessage()).startsWith("ERR").contains("AUTH");
             StatefulRedisConnection<String, String> statefulRedisCommands = async.getStatefulConnection();
             assertThat(ReflectionTestUtils.getField(statefulRedisCommands, "password")).isNull();
         } finally {
diff --git a/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java b/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java
index 1a96def648..ecc12a1db3 100644
--- a/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java
@@ -27,6 +27,7 @@
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -93,6 +94,7 @@ void standalone_ConnectToSocket() throws Exception {
         FastShutdown.shutdown(redisClient);
     }
 
+    @Disabled("https://github.com/antirez/redis/issues/6160")
     @Test
     void sentinel_RedisClientWithSocket() throws Exception {
 
@@ -118,6 +120,7 @@ void sentinel_RedisClientWithSocket() throws Exception {
         FastShutdown.shutdown(redisClient);
     }
 
+    @Disabled("https://github.com/antirez/redis/issues/6160")
     @Test
     void sentinel_ConnectToSocket() throws Exception {
 
@@ -143,6 +146,7 @@ void sentinel_ConnectToSocket() throws Exception {
         FastShutdown.shutdown(redisClient);
     }
 
+    @Disabled("https://github.com/antirez/redis/issues/6160")
     @Test
     void sentinel_socket_and_inet() throws Exception {
 
diff --git a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
index 122b78640d..0d0c075811 100644
--- a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
@@ -17,14 +17,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.assertj.core.api.Assumptions.assumeThat;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.time.Duration;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -47,8 +45,8 @@
 import io.lettuce.core.internal.AsyncConnectionProvider;
 import io.lettuce.core.protocol.ProtocolVersion;
 import io.lettuce.core.resource.ClientResources;
-import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.settings.TestSettings;
 import io.netty.channel.ConnectTimeoutException;
 
@@ -99,35 +97,6 @@ void after() throws Exception {
         serverSocket.close();
     }
 
-    @Test
-    void shouldCreateConnection() throws IOException {
-
-        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, TestSettings.host(),
-                TestSettings.port());
-        StatefulRedisConnection<String, String> connection = TestFutures
-                .getOrTimeout(sut.getConnection(connectionKey).toCompletableFuture());
-
-        assertThat(TestFutures.getOrTimeout(sut.getConnection(connectionKey).toCompletableFuture())).isSameAs(connection);
-        sut.close();
-        serverSocket.accept();
-    }
-
-    @Test
-    void shouldMaintainConnectionCount() throws IOException {
-
-        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, TestSettings.host(),
-                TestSettings.port());
-
-        assertThat(sut.getConnectionCount()).isEqualTo(0);
-
-        TestFutures.awaitOrTimeout(sut.getConnection(connectionKey).toCompletableFuture());
-
-        assertThat(sut.getConnectionCount()).isEqualTo(1);
-        sut.close();
-
-        serverSocket.accept();
-    }
-
     @Test
     void shouldCloseConnectionByKey() throws IOException {
 
@@ -235,49 +204,4 @@ void connectShouldFailConcurrently() throws Exception {
         sut.close();
         socket.close();
     }
-
-    @Test
-    void shouldCloseAsync() throws Exception {
-
-        assumeThat(System.getProperty("os.name").toLowerCase()).contains("mac");
-
-        Socket socket = new Socket("localhost", serverSocket.getLocalPort());
-        CountDownLatch connectInitiated = new CountDownLatch(1);
-
-        ClusterClientOptions clientOptions = ClusterClientOptions.builder()
-                .socketOptions(SocketOptions.builder().connectTimeout(1, TimeUnit.SECONDS).build()).build();
-
-        client.setOptions(clientOptions);
-
-        ConnectionKey connectionKey = new ConnectionKey(ClusterConnectionProvider.Intent.READ, TestSettings.host(),
-                TestSettings.port());
-
-        CompletableFuture<StatefulRedisConnection<String, String>> createdConnection = new CompletableFuture<>();
-        Thread t1 = new Thread(() -> {
-            try {
-                CompletableFuture<StatefulRedisConnection<String, String>> future = sut.getConnection(connectionKey)
-                        .toCompletableFuture();
-
-                connectInitiated.countDown();
-                StatefulRedisConnection<String, String> connection = TestFutures.getOrTimeout(future);
-                createdConnection.complete(connection);
-            } catch (Exception e) {
-                createdConnection.completeExceptionally(e);
-            }
-        });
-
-        t1.start();
-
-        connectInitiated.await();
-
-        sut.close();
-
-        serverSocket.accept();
-
-        StatefulRedisConnection<String, String> connection = createdConnection.join();
-
-        assertThat(connection.isOpen()).isFalse();
-
-        socket.close();
-    }
 }
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
index 8b0853dfdd..c4205b9418 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
@@ -51,8 +51,8 @@
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.test.Delay;
-import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.Wait;
 import io.lettuce.test.resource.FastShutdown;
 import io.lettuce.test.resource.TestClientResources;
@@ -386,9 +386,6 @@ void clusterAuth() {
         time = sync.time();
         assertThat(time).hasSize(2);
 
-        char[] password = (char[]) ReflectionTestUtils.getField(connection, "password");
-        assertThat(new String(password)).isEqualTo("foobared");
-
         connection.close();
         FastShutdown.shutdown(clusterClient);
     }
diff --git a/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java
index 98c512a4a6..631283f0b1 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java
@@ -44,6 +44,7 @@ class CustomReactiveCommandIntegrationTests extends TestSupport {
     @Inject
     CustomReactiveCommandIntegrationTests(StatefulRedisConnection<String, String> connection) {
         this.redis = connection.sync();
+        this.redis.flushdb();
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
index d17f39e155..8eee62bc0a 100644
--- a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
@@ -27,7 +27,6 @@
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import io.lettuce.RedisBug;
@@ -45,8 +44,7 @@
 /**
  * @author Mark Paluch
  */
-@RedisBug("HELLO AUTH currently not working")
-@Disabled("Redis Bug")
+@RedisBug("Cannot unset requirepass")
 class StaticMasterSlaveTest extends AbstractRedisClientTest {
 
     private StatefulRedisMasterSlaveConnectionImpl<String, String> connection;
@@ -89,8 +87,8 @@ void before() throws Exception {
         connectionToNode2.configSet("masterauth", passwd);
         connectionToNode2.auth(passwd);
 
-        node1.setPassword(passwd);
-        node2.setPassword(passwd);
+        master.setPassword(passwd);
+        replica.setPassword(passwd);
 
         connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8,
                 Arrays.asList(master, replica));
@@ -101,14 +99,16 @@ void before() throws Exception {
     void after() throws Exception {
 
         if (connectionToNode1 != null) {
-            connectionToNode1.configSet("requirepass", "");
-            connectionToNode1.configSet("masterauth", "").get(1, TimeUnit.SECONDS);
+            connectionToNode1.configSet("requirepass", null);
+            connectionToNode1.configSet("masterauth", null).get(1, TimeUnit.SECONDS);
+            connectionToNode1.configRewrite();
             connectionToNode1.getStatefulConnection().close();
         }
 
         if (connectionToNode2 != null) {
-            connectionToNode2.configSet("requirepass", "");
-            connectionToNode2.configSet("masterauth", "").get(1, TimeUnit.SECONDS);
+            connectionToNode2.configSet("requirepass", null);
+            connectionToNode2.configSet("masterauth", null).get(1, TimeUnit.SECONDS);
+            connectionToNode2.configRewrite();
             connectionToNode2.getStatefulConnection().close();
         }
 

From 68cfed60bb834c994f73ea03738e4fbc6e0c5745 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 10 Nov 2019 13:29:17 +0100
Subject: [PATCH 715/808] Reintroduce ping before activation, rename to
 handshake event #964

---
 .../io/lettuce/core/AbstractRedisClient.java  |  5 +-
 .../java/io/lettuce/core/ClientOptions.java   | 35 ++++++++++++++
 .../io/lettuce/core/ConnectionBuilder.java    | 33 +++++++++----
 .../io/lettuce/core/ConnectionEvents.java     |  4 +-
 .../lettuce/core/PlainChannelInitializer.java | 27 +++++------
 .../io/lettuce/core/SslConnectionBuilder.java | 20 ++++----
 .../core/cluster/RedisClusterClient.java      | 47 +++++++++----------
 .../lettuce/core/protocol/CommandHandler.java | 10 ++--
 .../ConnectionCommandIntegrationTests.java    |  9 ++--
 9 files changed, 115 insertions(+), 75 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 81935da9ac..d6973072b6 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -165,7 +165,9 @@ protected void connectionBuilder(Mono<SocketAddress> socketAddressSupplier, Conn
 
         if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2) {
 
-            if (hasPassword(redisURI)) {
+            connectionBuilder.pingBeforeConnect(clientOptions.isPingBeforeActivateConnection());
+
+            if (clientOptions.isPingBeforeActivateConnection() && hasPassword(redisURI)) {
                 connectionBuilder.auth(redisURI.getPassword());
                 connectionBuilder.handshakeAuthResp2();
             }
@@ -415,7 +417,6 @@ public void shutdown(Duration quietPeriod, Duration timeout) {
      */
     public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
 
-
         try {
             shutdownAsync(quietPeriod, timeout, timeUnit).get();
         } catch (RuntimeException e) {
diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index 63b04a4997..9d2e812dda 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -30,6 +30,7 @@
 @SuppressWarnings("serial")
 public class ClientOptions implements Serializable {
 
+    public static final boolean DEFAULT_PING_BEFORE_ACTIVATE_CONNECTION = true;
     public static final ProtocolVersion DEFAULT_PROTOCOL_VERSION = ProtocolVersion.newestSupported();
     public static final boolean DEFAULT_AUTO_RECONNECT = true;
     public static final boolean DEFAULT_CANCEL_CMD_RECONNECT_FAIL = false;
@@ -42,6 +43,7 @@ public class ClientOptions implements Serializable {
     public static final TimeoutOptions DEFAULT_TIMEOUT_OPTIONS = TimeoutOptions.create();
     public static final int DEFAULT_BUFFER_USAGE_RATIO = 3;
 
+    private final boolean pingBeforeActivateConnection;
     private final ProtocolVersion protocolVersion;
     private final boolean autoReconnect;
     private final boolean cancelCommandsOnReconnectFailure;
@@ -55,6 +57,7 @@ public class ClientOptions implements Serializable {
     private final int bufferUsageRatio;
 
     protected ClientOptions(Builder builder) {
+        this.pingBeforeActivateConnection = builder.pingBeforeActivateConnection;
         this.protocolVersion = builder.protocolVersion;
         this.cancelCommandsOnReconnectFailure = builder.cancelCommandsOnReconnectFailure;
         this.publishOnScheduler = builder.publishOnScheduler;
@@ -69,6 +72,7 @@ protected ClientOptions(Builder builder) {
     }
 
     protected ClientOptions(ClientOptions original) {
+        this.pingBeforeActivateConnection = original.isPingBeforeActivateConnection();
         this.protocolVersion = original.getProtocolVersion();
         this.autoReconnect = original.isAutoReconnect();
         this.cancelCommandsOnReconnectFailure = original.isCancelCommandsOnReconnectFailure();
@@ -115,6 +119,7 @@ public static ClientOptions create() {
      */
     public static class Builder {
 
+        private boolean pingBeforeActivateConnection = DEFAULT_PING_BEFORE_ACTIVATE_CONNECTION;
         private ProtocolVersion protocolVersion = DEFAULT_PROTOCOL_VERSION;
         private boolean autoReconnect = DEFAULT_AUTO_RECONNECT;
         private boolean cancelCommandsOnReconnectFailure = DEFAULT_CANCEL_CMD_RECONNECT_FAIL;
@@ -130,6 +135,21 @@ public static class Builder {
         protected Builder() {
         }
 
+        /**
+         * Sets the {@literal PING} before activate connection flag. Defaults to {@literal true}. See
+         * {@link #DEFAULT_PING_BEFORE_ACTIVATE_CONNECTION}. This option has no effect unless forcing to use the RESP 2 protocol
+         * version.
+         *
+         * @param pingBeforeActivateConnection true/false
+         * @return {@code this}
+         * @deprecated since 5.2. PING during connection handshake is mandatory with RESP3.
+         */
+        @Deprecated
+        public Builder pingBeforeActivateConnection(boolean pingBeforeActivateConnection) {
+            this.pingBeforeActivateConnection = pingBeforeActivateConnection;
+            return this;
+        }
+
         /**
          * Sets the {@link ProtocolVersion} to use. Defaults to {@literal RESP3}. See {@link #DEFAULT_PROTOCOL_VERSION}.
          *
@@ -316,12 +336,27 @@ public ClientOptions.Builder mutate() {
         builder.autoReconnect(isAutoReconnect()).bufferUsageRatio(getBufferUsageRatio())
                 .cancelCommandsOnReconnectFailure(isCancelCommandsOnReconnectFailure())
                 .disconnectedBehavior(getDisconnectedBehavior()).publishOnScheduler(isPublishOnScheduler())
+                .protocolVersion(getProtocolVersion()).pingBeforeActivateConnection(isPingBeforeActivateConnection())
                 .requestQueueSize(getRequestQueueSize()).socketOptions(getSocketOptions()).sslOptions(getSslOptions())
                 .suspendReconnectOnProtocolFailure(isSuspendReconnectOnProtocolFailure()).timeoutOptions(getTimeoutOptions());
 
         return builder;
     }
 
+    /**
+     * Enables initial {@literal PING} barrier before any connection is usable. If {@literal true} (default is {@literal true}
+     * ), every connection and reconnect will issue a {@literal PING} command and awaits its response before the connection is
+     * activated and enabled for use. If the check fails, the connect/reconnect is treated as failure. This option has no effect
+     * unless forcing to use the RESP 2 protocol version.
+     *
+     * @return {@literal true} if {@literal PING} barrier is enabled.
+     * @deprecated since 5.2. PING during connection handshake is mandatory with RESP3.
+     */
+    @Deprecated
+    public boolean isPingBeforeActivateConnection() {
+        return pingBeforeActivateConnection;
+    }
+
     /**
      * Returns the {@link ProtocolVersion} to use.
      *
diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index bc2dc937cc..10456e69a3 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -43,9 +43,12 @@ public class ConnectionBuilder {
 
     private static final RedisCommandBuilder<String, String> INITIALIZING_CMD_BUILDER = new RedisCommandBuilder<>(
             StringCodec.UTF8);
-    private static final Supplier<AsyncCommand<?, ?, ?>> PING_COMMAND_SUPPLIER = () -> new AsyncCommand<>(
+
+    private static final Supplier<AsyncCommand<?, ?, ?>> PING = () -> new AsyncCommand<>(
             INITIALIZING_CMD_BUILDER.ping());
 
+    private static final Supplier<AsyncCommand<?, ?, ?>> NO_PING = () -> null;
+
     private Mono<SocketAddress> socketAddressSupplier;
     private ConnectionEvents connectionEvents;
     private RedisChannelHandler<?, ?> connection;
@@ -62,12 +65,20 @@ public class ConnectionBuilder {
     private String clientName;
     private ReconnectionListener reconnectionListener = ReconnectionListener.NO_OP;
     private ConnectionWatchdog connectionWatchdog;
-    private Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier = ConnectionBuilder.PING_COMMAND_SUPPLIER;
+    private Supplier<AsyncCommand<?, ?, ?>> handshakeCommandSupplier = ConnectionBuilder.PING;
 
     public static ConnectionBuilder connectionBuilder() {
         return new ConnectionBuilder();
     }
 
+    /**
+     * @param handshakeCommandSupplier
+     * @return {@literal true} whether {@code PING}/{@code HELLO} handshake is enabled.
+     */
+    public static boolean isHandshakeEnabled(Supplier<AsyncCommand<?, ?, ?>> handshakeCommandSupplier) {
+        return handshakeCommandSupplier != NO_PING;
+    }
+
     protected List<ChannelHandler> buildHandlers() {
 
         LettuceAssert.assertState(channelGroup != null, "ChannelGroup must be set");
@@ -93,18 +104,22 @@ protected List<ChannelHandler> buildHandlers() {
         return handlers;
     }
 
+    public void pingBeforeConnect(boolean state) {
+        handshakeCommandSupplier = state ? PING : NO_PING;
+    }
+
     public void handshakeAuthResp2() {
-        pingCommandSupplier = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.auth(new String(password)));
+        handshakeCommandSupplier = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.auth(new String(password)));
     }
 
     public void handshakeAuthResp3() {
-        pingCommandSupplier = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.hello(3, this.username.getBytes(),
+        handshakeCommandSupplier = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.hello(3, this.username.getBytes(),
                 encode(this.password), this.clientName != null ? this.clientName.getBytes() : null));
     }
 
     public void handshakeResp3() {
-        pingCommandSupplier = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.hello(3, null, null,
-                this.clientName != null ? this.clientName.getBytes() : null));
+        handshakeCommandSupplier = () -> new AsyncCommand<>(
+                INITIALIZING_CMD_BUILDER.hello(3, null, null, this.clientName != null ? this.clientName.getBytes() : null));
     }
 
     protected ConnectionWatchdog createConnectionWatchdog() {
@@ -128,7 +143,7 @@ protected ConnectionWatchdog createConnectionWatchdog() {
     }
 
     public RedisChannelInitializer build() {
-        return new PlainChannelInitializer(pingCommandSupplier, this::buildHandlers, clientResources, timeout);
+        return new PlainChannelInitializer(handshakeCommandSupplier, this::buildHandlers, clientResources, timeout);
     }
 
     public ConnectionBuilder socketAddressSupplier(Mono<SocketAddress> socketAddressSupplier) {
@@ -248,8 +263,8 @@ public Endpoint endpoint() {
         return endpoint;
     }
 
-    Supplier<AsyncCommand<?, ?, ?>> getPingCommandSupplier() {
-        return pingCommandSupplier;
+    Supplier<AsyncCommand<?, ?, ?>> getHandshakeCommandSupplier() {
+        return handshakeCommandSupplier;
     }
 
     static byte[] encode(char[] chars) {
diff --git a/src/main/java/io/lettuce/core/ConnectionEvents.java b/src/main/java/io/lettuce/core/ConnectionEvents.java
index 188ef4b61f..e0356db7ba 100644
--- a/src/main/java/io/lettuce/core/ConnectionEvents.java
+++ b/src/main/java/io/lettuce/core/ConnectionEvents.java
@@ -73,11 +73,11 @@ public static class Activated {
     /**
      * Internal event when a channel is activated.
      */
-    public static class PingBeforeActivate {
+    public static class HandshakeEvent {
 
         private final RedisCommand<?, ?, ?> command;
 
-        public PingBeforeActivate(RedisCommand<?, ?, ?> command) {
+        public HandshakeEvent(RedisCommand<?, ?, ?> command) {
             this.command = command;
         }
 
diff --git a/src/main/java/io/lettuce/core/PlainChannelInitializer.java b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
index 965e2d491a..5b0e742d1e 100644
--- a/src/main/java/io/lettuce/core/PlainChannelInitializer.java
+++ b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
@@ -24,7 +24,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import io.lettuce.core.ConnectionEvents.PingBeforeActivate;
+import io.lettuce.core.ConnectionEvents.HandshakeEvent;
 import io.lettuce.core.event.connection.ConnectedEvent;
 import io.lettuce.core.event.connection.ConnectionActivatedEvent;
 import io.lettuce.core.event.connection.DisconnectedEvent;
@@ -40,18 +40,16 @@
  */
 class PlainChannelInitializer extends io.netty.channel.ChannelInitializer<Channel> implements RedisChannelInitializer {
 
-    static final Supplier<AsyncCommand<?, ?, ?>> NO_PING = () -> null;
-
     private final Supplier<List<ChannelHandler>> handlers;
-    private final Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier;
+    private final Supplier<AsyncCommand<?, ?, ?>> handshakeCommandSupplier;
     private final ClientResources clientResources;
     private final Duration timeout;
 
     private volatile CompletableFuture<Boolean> initializedFuture = new CompletableFuture<>();
 
-    PlainChannelInitializer(Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier, Supplier<List<ChannelHandler>> handlers,
+    PlainChannelInitializer(Supplier<AsyncCommand<?, ?, ?>> handshakeCommandSupplier, Supplier<List<ChannelHandler>> handlers,
             ClientResources clientResources, Duration timeout) {
-        this.pingCommandSupplier = pingCommandSupplier;
+        this.handshakeCommandSupplier = handshakeCommandSupplier;
         this.handlers = handlers;
         this.clientResources = clientResources;
         this.timeout = timeout;
@@ -68,7 +66,7 @@ private void doInitialize(Channel channel) {
 
             channel.pipeline().addLast("channelActivator", new RedisChannelInitializerImpl() {
 
-                private AsyncCommand<?, ?, ?> pingCommand;
+                private AsyncCommand<?, ?, ?> handshakeCommand;
 
                 @Override
                 public CompletableFuture<Boolean> channelInitialized() {
@@ -85,7 +83,7 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
                     }
 
                     initializedFuture = new CompletableFuture<>();
-                    pingCommand = null;
+                    handshakeCommand = null;
                     super.channelInactive(ctx);
                 }
 
@@ -106,9 +104,9 @@ public void channelActive(final ChannelHandlerContext ctx) throws Exception {
 
                     clientResources.eventBus().publish(new ConnectedEvent(local(ctx), remote(ctx)));
 
-                    if (pingCommandSupplier != NO_PING) {
-                        pingCommand = pingCommandSupplier.get();
-                        pingBeforeActivate(pingCommand, initializedFuture, ctx, clientResources, timeout);
+                    if (ConnectionBuilder.isHandshakeEnabled(handshakeCommandSupplier)) {
+                        handshakeCommand = handshakeCommandSupplier.get();
+                        sendHandshake(handshakeCommand, initializedFuture, ctx, clientResources, timeout);
                     } else {
                         super.channelActive(ctx);
                     }
@@ -131,10 +129,10 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
         clientResources.nettyCustomizer().afterChannelInitialized(channel);
     }
 
-    static void pingBeforeActivate(AsyncCommand<?, ?, ?> cmd, CompletableFuture<Boolean> initializedFuture,
+    static void sendHandshake(AsyncCommand<?, ?, ?> cmd, CompletableFuture<Boolean> initializedFuture,
             ChannelHandlerContext ctx, ClientResources clientResources, Duration timeout) throws Exception {
 
-        ctx.fireUserEventTriggered(new PingBeforeActivate(cmd));
+        ctx.fireUserEventTriggered(new HandshakeEvent(cmd));
 
         Runnable timeoutGuard = () -> {
 
@@ -143,7 +141,7 @@ static void pingBeforeActivate(AsyncCommand<?, ?, ?> cmd, CompletableFuture<Bool
             }
 
             initializedFuture.completeExceptionally(
-                    ExceptionFactory.createTimeoutException("Cannot initialize channel (PING before activate)", timeout));
+                    ExceptionFactory.createTimeoutException(String.format("Cannot initialize channel (Handshake %s)", cmd.getType().name()), timeout));
         };
 
         Timeout timeoutHandle = clientResources.timer().newTimeout(t -> {
@@ -167,7 +165,6 @@ static void pingBeforeActivate(AsyncCommand<?, ?, ?> cmd, CompletableFuture<Bool
                 initializedFuture.completeExceptionally(throwable);
             }
         });
-
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/SslConnectionBuilder.java b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
index c1e806fad9..9e74e6ee4c 100644
--- a/src/main/java/io/lettuce/core/SslConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
@@ -17,7 +17,7 @@
 
 import static io.lettuce.core.ConnectionEventTrigger.local;
 import static io.lettuce.core.ConnectionEventTrigger.remote;
-import static io.lettuce.core.PlainChannelInitializer.pingBeforeActivate;
+import static io.lettuce.core.PlainChannelInitializer.sendHandshake;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
@@ -77,7 +77,7 @@ protected List<ChannelHandler> buildHandlers() {
     @Override
     public RedisChannelInitializer build() {
 
-        return new SslChannelInitializer(getPingCommandSupplier(), this::buildHandlers, redisURI, clientResources(),
+        return new SslChannelInitializer(getHandshakeCommandSupplier(), this::buildHandlers, redisURI, clientResources(),
                 getTimeout(), clientOptions().getSslOptions());
     }
 
@@ -86,7 +86,7 @@ public RedisChannelInitializer build() {
      */
     static class SslChannelInitializer extends io.netty.channel.ChannelInitializer<Channel> implements RedisChannelInitializer {
 
-        private final Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier;
+        private final Supplier<AsyncCommand<?, ?, ?>> handshakeCommandSupplier;
         private final Supplier<List<ChannelHandler>> handlers;
         private final RedisURI redisURI;
         private final ClientResources clientResources;
@@ -95,11 +95,11 @@ static class SslChannelInitializer extends io.netty.channel.ChannelInitializer<C
 
         private volatile CompletableFuture<Boolean> initializedFuture = new CompletableFuture<>();
 
-        public SslChannelInitializer(Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier,
+        public SslChannelInitializer(Supplier<AsyncCommand<?, ?, ?>> handshakeCommandSupplier,
                 Supplier<List<ChannelHandler>> handlers, RedisURI redisURI, ClientResources clientResources, Duration timeout,
                 SslOptions sslOptions) {
 
-            this.pingCommandSupplier = pingCommandSupplier;
+            this.handshakeCommandSupplier = handshakeCommandSupplier;
             this.handlers = handlers;
             this.redisURI = redisURI;
             this.clientResources = clientResources;
@@ -151,7 +151,7 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
             if (channel.pipeline().get("channelActivator") == null) {
                 channel.pipeline().addLast("channelActivator", new RedisChannelInitializerImpl() {
 
-                    private AsyncCommand<?, ?, ?> pingCommand;
+                    private AsyncCommand<?, ?, ?> handshakeCommand;
 
                     @Override
                     public CompletableFuture<Boolean> channelInitialized() {
@@ -167,7 +167,7 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
                         }
 
                         initializedFuture = new CompletableFuture<>();
-                        pingCommand = null;
+                        handshakeCommand = null;
                         super.channelInactive(ctx);
                     }
 
@@ -184,9 +184,9 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
 
                             SslHandshakeCompletionEvent event = (SslHandshakeCompletionEvent) evt;
                             if (event.isSuccess()) {
-                                if (pingCommandSupplier != PlainChannelInitializer.NO_PING) {
-                                    pingCommand = pingCommandSupplier.get();
-                                    pingBeforeActivate(pingCommand, initializedFuture, ctx, clientResources, timeout);
+                                if (ConnectionBuilder.isHandshakeEnabled(handshakeCommandSupplier)) {
+                                    handshakeCommand = handshakeCommandSupplier.get();
+                                    sendHandshake(handshakeCommand, initializedFuture, ctx, clientResources, timeout);
                                 } else {
                                     ctx.fireChannelActive();
                                 }
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 2eb15a4757..2e45bb8f53 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -541,8 +541,7 @@ <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNode
 
         ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectionFuture = connectStatefulAsync(connection, codec,
                 endpoint, getFirstUri(), socketAddressSupplier,
-                () -> new PubSubCommandHandler<>(clientOptions,
-                        clientResources, codec, endpoint));
+                () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec, endpoint));
         return connectionFuture.whenComplete((conn, throwable) -> {
             if (throwable != null) {
                 connection.close();
@@ -601,16 +600,14 @@ private <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectCl
                     .onErrorResume(t -> connect(socketAddressSupplier, codec, endpoint, connection, commandHandlerSupplier));
         }
 
-        return connectionMono
-                .flatMap(
-                        c -> c.reactive().command().collectList()
-                                //
-                                .map(CommandDetailParser::parse)
-                                //
-                                .doOnNext(detail -> c.setState(new RedisState(detail)))
-                                //
-                                .doOnError(e -> c.setState(new RedisState(Collections.emptyList()))).then(Mono.just(c))
-                                .onErrorResume(RedisCommandExecutionException.class, e -> Mono.just(c)))
+        return connectionMono.flatMap(c -> c.reactive().command().collectList()
+                //
+                .map(CommandDetailParser::parse)
+                //
+                .doOnNext(detail -> c.setState(new RedisState(detail)))
+                //
+                .doOnError(e -> c.setState(new RedisState(Collections.emptyList()))).then(Mono.just(c))
+                .onErrorResume(RedisCommandExecutionException.class, e -> Mono.just(c)))
                 .doOnNext(
                         c -> connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider))
                 .map(it -> (StatefulRedisClusterConnection<K, V>) it).toFuture();
@@ -677,17 +674,13 @@ private <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> con
                     .onErrorResume(t -> connect(socketAddressSupplier, codec, endpoint, connection, commandHandlerSupplier));
         }
 
-        return connectionMono
-                .flatMap(
-                        c -> c.reactive()
-                                .command()
-                                .collectList()
-                                //
-                                .map(CommandDetailParser::parse)
-                                //
-                                .doOnNext(detail -> c.setState(new RedisState(detail)))
-                                .doOnError(e -> c.setState(new RedisState(Collections.emptyList()))).then(Mono.just(c))
-                                .onErrorResume(RedisCommandExecutionException.class, e -> Mono.just(c)))
+        return connectionMono.flatMap(c -> c.reactive().command().collectList()
+                //
+                .map(CommandDetailParser::parse)
+                //
+                .doOnNext(detail -> c.setState(new RedisState(detail)))
+                .doOnError(e -> c.setState(new RedisState(Collections.emptyList()))).then(Mono.just(c))
+                .onErrorResume(RedisCommandExecutionException.class, e -> Mono.just(c)))
                 .doOnNext(
                         c -> connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider))
                 .map(it -> (StatefulRedisClusterPubSubConnection<K, V>) it).toFuture();
@@ -757,20 +750,22 @@ private <K, V> ConnectionBuilder createConnectionBuilder(RedisChannelHandler<K,
 
         if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2) {
 
-            if (hasPassword(connectionSettings)) {
+            connectionBuilder.pingBeforeConnect(clientOptions.isPingBeforeActivateConnection());
+
+            if (clientOptions.isPingBeforeActivateConnection() && hasPassword(connectionSettings)) {
                 connectionBuilder.auth(connectionSettings.getPassword());
                 connectionBuilder.handshakeAuthResp2();
             }
+
         } else if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP3) {
 
             if (hasPassword(connectionSettings)) {
                 if (LettuceStrings.isNotEmpty(connectionSettings.getUsername())) {
                     connectionBuilder.auth(connectionSettings.getUsername(), connectionSettings.getPassword());
-                    connectionBuilder.handshakeAuthResp3();
                 } else {
                     connectionBuilder.auth("default", connectionSettings.getPassword());
-                    connectionBuilder.handshakeAuthResp3();
                 }
+                connectionBuilder.handshakeAuthResp3();
             } else {
                 connectionBuilder.handshakeResp3();
             }
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 6e89eaa198..3859ae6698 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -16,7 +16,7 @@
 package io.lettuce.core.protocol;
 
 import static io.lettuce.core.ConnectionEvents.Activated;
-import static io.lettuce.core.ConnectionEvents.PingBeforeActivate;
+import static io.lettuce.core.ConnectionEvents.HandshakeEvent;
 import static io.lettuce.core.ConnectionEvents.Reset;
 
 import java.io.IOException;
@@ -207,12 +207,12 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
             channel.config().setAutoRead(true);
         } else if (evt instanceof Reset) {
             reset();
-        } else if (evt instanceof PingBeforeActivate) {
+        } else if (evt instanceof HandshakeEvent) {
 
-            PingBeforeActivate pba = (PingBeforeActivate) evt;
+            HandshakeEvent handshake = (HandshakeEvent) evt;
 
-            stack.addFirst(pba.getCommand());
-            ctx.writeAndFlush(pba.getCommand());
+            stack.addFirst(handshake.getCommand());
+            ctx.writeAndFlush(handshake.getCommand());
             return;
         }
 
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
index c8168ac1c9..7955403f13 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
@@ -33,7 +33,6 @@
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.protocol.ProtocolVersion;
 import io.lettuce.test.*;
-import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Will Glozer
@@ -105,11 +104,9 @@ void authEmpty() {
     void authReconnect() {
         WithPassword.run(client, () -> {
 
-            RedisURI uri = RedisURI.builder().withHost(TestSettings.host()).withPort(TestSettings.port()).withPassword(passwd)
-                    .build();
-
-            client.setOptions(ClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).build());
-            RedisCommands<String, String> connection = client.connect(uri).sync();
+            client.setOptions(
+                    ClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).pingBeforeActivateConnection(false).build());
+            RedisCommands<String, String> connection = client.connect().sync();
             assertThat(connection.auth(passwd)).isEqualTo("OK");
             assertThat(connection.set(key, value)).isEqualTo("OK");
             connection.quit();

From 94108ac7d0d164140e8a457028ab613195a29637 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 27 Dec 2019 18:36:07 +0100
Subject: [PATCH 716/808] Reset ACL after WithPassword tests #964

---
 .../io/lettuce/core/AbstractRedisClient.java  |  27 +---
 .../io/lettuce/core/ConnectionBuilder.java    |  51 ++++++-
 .../java/io/lettuce/core/RedisClient.java     |  23 ++-
 .../core/cluster/RedisClusterClient.java      |  23 ---
 .../io/lettuce/core/output/ArrayOutput.java   |  13 +-
 .../lettuce/core/AbstractRedisClientTest.java |  24 ----
 .../core/ClientOptionsIntegrationTests.java   | 131 +++++++++---------
 .../ConnectionCommandIntegrationTests.java    |   4 +-
 .../core/pubsub/PubSubCommandTest.java        |  56 ++++----
 src/test/java/io/lettuce/test/CliParser.java  |  88 ++++++++++++
 .../java/io/lettuce/test/WithPassword.java    |  35 ++++-
 .../test/condition/RedisConditions.java       |   2 +-
 12 files changed, 283 insertions(+), 194 deletions(-)
 create mode 100644 src/test/java/io/lettuce/test/CliParser.java

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index d6973072b6..a456487905 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -33,7 +33,6 @@
 import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.ConnectionWatchdog;
-import io.lettuce.core.protocol.ProtocolVersion;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
 import io.netty.bootstrap.Bootstrap;
@@ -160,31 +159,7 @@ protected void connectionBuilder(Mono<SocketAddress> socketAddressSupplier, Conn
             redisBootstrap.option(ChannelOption.TCP_NODELAY, socketOptions.isTcpNoDelay());
         }
 
-        connectionBuilder.timeout(redisURI.getTimeout());
-        connectionBuilder.clientName(redisURI.getClientName());
-
-        if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2) {
-
-            connectionBuilder.pingBeforeConnect(clientOptions.isPingBeforeActivateConnection());
-
-            if (clientOptions.isPingBeforeActivateConnection() && hasPassword(redisURI)) {
-                connectionBuilder.auth(redisURI.getPassword());
-                connectionBuilder.handshakeAuthResp2();
-            }
-        } else if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP3) {
-
-            if (hasPassword(redisURI)) {
-                if (LettuceStrings.isNotEmpty(redisURI.getUsername())) {
-                    connectionBuilder.auth(redisURI.getUsername(), redisURI.getPassword());
-                } else {
-                    connectionBuilder.auth("default", redisURI.getPassword());
-                }
-                connectionBuilder.handshakeAuthResp3();
-
-            } else {
-                connectionBuilder.handshakeResp3();
-            }
-        }
+        connectionBuilder.apply(redisURI);
 
         connectionBuilder.bootstrap(redisBootstrap);
         connectionBuilder.channelGroup(channels).connectionEvents(connectionEvents).timer(timer);
diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index 10456e69a3..c6950d1ebf 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -44,8 +44,7 @@ public class ConnectionBuilder {
     private static final RedisCommandBuilder<String, String> INITIALIZING_CMD_BUILDER = new RedisCommandBuilder<>(
             StringCodec.UTF8);
 
-    private static final Supplier<AsyncCommand<?, ?, ?>> PING = () -> new AsyncCommand<>(
-            INITIALIZING_CMD_BUILDER.ping());
+    private static final Supplier<AsyncCommand<?, ?, ?>> PING = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.ping());
 
     private static final Supplier<AsyncCommand<?, ?, ?>> NO_PING = () -> null;
 
@@ -75,10 +74,44 @@ public static ConnectionBuilder connectionBuilder() {
      * @param handshakeCommandSupplier
      * @return {@literal true} whether {@code PING}/{@code HELLO} handshake is enabled.
      */
-    public static boolean isHandshakeEnabled(Supplier<AsyncCommand<?, ?, ?>> handshakeCommandSupplier) {
+    static boolean isHandshakeEnabled(Supplier<AsyncCommand<?, ?, ?>> handshakeCommandSupplier) {
         return handshakeCommandSupplier != NO_PING;
     }
 
+    /**
+     * Apply settings from {@link RedisURI}
+     *
+     * @param redisURI
+     */
+    public void apply(RedisURI redisURI) {
+
+        timeout(redisURI.getTimeout());
+        clientName(redisURI.getClientName());
+
+        if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2) {
+
+            pingBeforeConnect(clientOptions.isPingBeforeActivateConnection());
+
+            if (clientOptions.isPingBeforeActivateConnection() && hasPassword(redisURI)) {
+                auth(redisURI.getPassword());
+                handshakeAuthResp2();
+            }
+        } else if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP3) {
+
+            if (hasPassword(redisURI)) {
+                if (LettuceStrings.isNotEmpty(redisURI.getUsername())) {
+                    auth(redisURI.getUsername(), redisURI.getPassword());
+                } else {
+                    auth("default", redisURI.getPassword());
+                }
+                handshakeAuthResp3();
+
+            } else {
+                handshakeResp3();
+            }
+        }
+    }
+
     protected List<ChannelHandler> buildHandlers() {
 
         LettuceAssert.assertState(channelGroup != null, "ChannelGroup must be set");
@@ -104,20 +137,20 @@ protected List<ChannelHandler> buildHandlers() {
         return handlers;
     }
 
-    public void pingBeforeConnect(boolean state) {
+    void pingBeforeConnect(boolean state) {
         handshakeCommandSupplier = state ? PING : NO_PING;
     }
 
-    public void handshakeAuthResp2() {
+    void handshakeAuthResp2() {
         handshakeCommandSupplier = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.auth(new String(password)));
     }
 
-    public void handshakeAuthResp3() {
+    void handshakeAuthResp3() {
         handshakeCommandSupplier = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.hello(3, this.username.getBytes(),
                 encode(this.password), this.clientName != null ? this.clientName.getBytes() : null));
     }
 
-    public void handshakeResp3() {
+    void handshakeResp3() {
         handshakeCommandSupplier = () -> new AsyncCommand<>(
                 INITIALIZING_CMD_BUILDER.hello(3, null, null, this.clientName != null ? this.clientName.getBytes() : null));
     }
@@ -222,6 +255,10 @@ public ConnectionBuilder clientName(String clientName) {
         return this;
     }
 
+    boolean hasPassword(RedisURI connectionSettings) {
+        return connectionSettings.getPassword() != null && connectionSettings.getPassword().length != 0;
+    }
+
     public ConnectionBuilder auth(String username, char[] password) {
         this.username = username;
         this.password = password;
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 175b74b63b..19cea5737c 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -308,14 +308,23 @@ private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnecti
         ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
         ConnectionFuture<?> sync = future;
 
-        if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2
-                && LettuceStrings.isNotEmpty(redisURI.getClientName())) {
-            sync = sync.thenApply(channelHandler -> {
-                connection.setClientName(redisURI.getClientName());
-                return channelHandler;
-            });
-        }
+        if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2) {
+
+            if (!clientOptions.isPingBeforeActivateConnection() && connectionBuilder.hasPassword(redisURI)) {
+                sync = sync.thenCompose(channelHandler -> {
 
+                    CommandArgs<K, V> args = new CommandArgs<>(codec).add(redisURI.getPassword());
+                    return connection.async().dispatch(CommandType.AUTH, new StatusOutput<>(codec), args);
+                });
+            }
+
+            if (LettuceStrings.isNotEmpty(redisURI.getClientName())) {
+                sync = sync.thenApply(channelHandler -> {
+                    connection.setClientName(redisURI.getClientName());
+                    return channelHandler;
+                });
+            }
+        }
         if (redisURI.getDatabase() != 0) {
 
             sync = sync.thenCompose(channelHandler -> {
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 2e45bb8f53..16db9b4ed3 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -748,29 +748,6 @@ private <K, V> ConnectionBuilder createConnectionBuilder(RedisChannelHandler<K,
         connectionBuilder(socketAddressSupplier, connectionBuilder, connectionSettings);
         channelType(connectionBuilder, connectionSettings);
 
-        if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2) {
-
-            connectionBuilder.pingBeforeConnect(clientOptions.isPingBeforeActivateConnection());
-
-            if (clientOptions.isPingBeforeActivateConnection() && hasPassword(connectionSettings)) {
-                connectionBuilder.auth(connectionSettings.getPassword());
-                connectionBuilder.handshakeAuthResp2();
-            }
-
-        } else if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP3) {
-
-            if (hasPassword(connectionSettings)) {
-                if (LettuceStrings.isNotEmpty(connectionSettings.getUsername())) {
-                    connectionBuilder.auth(connectionSettings.getUsername(), connectionSettings.getPassword());
-                } else {
-                    connectionBuilder.auth("default", connectionSettings.getPassword());
-                }
-                connectionBuilder.handshakeAuthResp3();
-            } else {
-                connectionBuilder.handshakeResp3();
-            }
-        }
-
         return connectionBuilder;
     }
 
diff --git a/src/main/java/io/lettuce/core/output/ArrayOutput.java b/src/main/java/io/lettuce/core/output/ArrayOutput.java
index 369f433798..73d6b3454d 100644
--- a/src/main/java/io/lettuce/core/output/ArrayOutput.java
+++ b/src/main/java/io/lettuce/core/output/ArrayOutput.java
@@ -16,10 +16,7 @@
 package io.lettuce.core.output;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayDeque;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.List;
+import java.util.*;
 
 import io.lettuce.core.codec.RedisCodec;
 
@@ -43,6 +40,10 @@ public ArrayOutput(RedisCodec<K, V> codec) {
 
     @Override
     public void set(ByteBuffer bytes) {
+        if (!initialized) {
+            stack.push(new ArrayList<>());
+            initialized = true;
+        }
         if (bytes != null) {
             V value = codec.decodeValue(bytes);
             stack.peek().add(value);
@@ -51,6 +52,10 @@ public void set(ByteBuffer bytes) {
 
     @Override
     public void set(long integer) {
+        if (!initialized) {
+            stack.push(new ArrayList<>());
+            initialized = true;
+        }
         stack.peek().add(integer);
     }
 
diff --git a/src/test/java/io/lettuce/core/AbstractRedisClientTest.java b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
index 47c2d48bfd..f3b890d367 100644
--- a/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
+++ b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
@@ -21,7 +21,6 @@
 
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.test.resource.DefaultRedisClient;
-import io.lettuce.test.resource.FastShutdown;
 import io.lettuce.test.resource.TestClientResources;
 
 /**
@@ -78,27 +77,4 @@ public void closeConnection() throws Exception {
             redis.getStatefulConnection().close();
         }
     }
-
-    public abstract class WithPasswordRequired {
-        protected abstract void run(RedisClient client) throws Exception;
-
-        protected WithPasswordRequired() {
-            try {
-                redis.configSet("requirepass", passwd);
-                redis.auth(passwd);
-
-                RedisClient client = newRedisClient();
-                try {
-                    run(client);
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                } finally {
-                    FastShutdown.shutdown(client);
-                }
-            } finally {
-
-                redis.configSet("requirepass", "");
-            }
-        }
-    }
 }
diff --git a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
index fc65b86e76..9bc280b7a1 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
@@ -37,7 +37,6 @@
 
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
-import io.lettuce.RedisBug;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -55,7 +54,6 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-@RedisBug("Cannot unset requirepass")
 class ClientOptionsIntegrationTests extends TestSupport {
 
     private final RedisClient client;
@@ -124,7 +122,8 @@ void testHitRequestQueueLimitReconnectWithAuthCommand() {
 
         WithPassword.run(client, () -> {
 
-            client.setOptions(ClientOptions.builder().requestQueueSize(10).build());
+            client.setOptions(ClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).pingBeforeActivateConnection(false)
+                    .requestQueueSize(10).build());
 
             RedisAsyncCommands<String, String> connection = client.connect().async();
             connection.auth(passwd);
@@ -200,8 +199,8 @@ void requestQueueSizeOvercommittedReconnect() {
         List<RedisFuture<String>> pings = new ArrayList<>();
         for (int i = 0; i < 11; i++) {
 
-            AsyncCommand<String, String, String> command = new AsyncCommand<>(new Command<>(CommandType.PING,
-                    new StatusOutput<>(StringCodec.UTF8)));
+            AsyncCommand<String, String, String> command = new AsyncCommand<>(
+                    new Command<>(CommandType.PING, new StatusOutput<>(StringCodec.UTF8)));
             pings.add(command);
             buffer.add(command);
         }
@@ -217,8 +216,8 @@ void requestQueueSizeOvercommittedReconnect() {
             assertThat(TestFutures.getOrTimeout(pings.get(i))).isEqualTo("PONG");
         }
 
-        assertThatThrownBy(() -> TestFutures.awaitOrTimeout(pings.get(10))).hasCauseInstanceOf(IllegalStateException.class).hasMessage(
-                "java.lang.IllegalStateException: Queue full");
+        assertThatThrownBy(() -> TestFutures.awaitOrTimeout(pings.get(10))).hasCauseInstanceOf(IllegalStateException.class)
+                .hasMessage("java.lang.IllegalStateException: Queue full");
 
         connection.close();
     }
@@ -244,8 +243,8 @@ void disconnectedWithoutReconnect() {
     @Test
     void disconnectedRejectCommands() {
 
-        client.setOptions(ClientOptions.builder().disconnectedBehavior(ClientOptions.DisconnectedBehavior.REJECT_COMMANDS)
-                .build());
+        client.setOptions(
+                ClientOptions.builder().disconnectedBehavior(ClientOptions.DisconnectedBehavior.REJECT_COMMANDS).build());
 
         RedisAsyncCommands<String, String> connection = client.connect().async();
 
@@ -302,8 +301,8 @@ void connectTimeout() throws Exception {
                 client.connect(redisURI);
                 fail("Missing RedisConnectionException");
             } catch (RedisException e) {
-                assertThat(e).isInstanceOf(RedisConnectionException.class).hasRootCauseInstanceOf(
-                        RedisCommandTimeoutException.class);
+                assertThat(e).isInstanceOf(RedisConnectionException.class)
+                        .hasRootCauseInstanceOf(RedisCommandTimeoutException.class);
             }
         }
     }
@@ -328,24 +327,22 @@ void connectWithAuthentication() {
     @Test
     void authenticationTimeout() {
 
-        WithPassword.run(
-                client,
-                () -> {
+        WithPassword.run(client, () -> {
 
-                    try (ServerSocket serverSocket = new ServerSocket(0)) {
+            try (ServerSocket serverSocket = new ServerSocket(0)) {
 
-                        RedisURI redisURI = RedisURI.Builder.redis(TestSettings.host(), serverSocket.getLocalPort())
-                                .withPassword(passwd).withTimeout(Duration.ofMillis(500)).build();
+                RedisURI redisURI = RedisURI.Builder.redis(TestSettings.host(), serverSocket.getLocalPort())
+                        .withPassword(passwd).withTimeout(Duration.ofMillis(500)).build();
 
-                        try {
-                            client.connect(redisURI);
-                            fail("Missing RedisConnectionException");
-                        } catch (RedisException e) {
-                            assertThat(e).isInstanceOf(RedisConnectionException.class).hasRootCauseInstanceOf(
-                                    RedisCommandTimeoutException.class);
-                        }
-                    }
-                });
+                try {
+                    client.connect(redisURI);
+                    fail("Missing RedisConnectionException");
+                } catch (RedisException e) {
+                    assertThat(e).isInstanceOf(RedisConnectionException.class)
+                            .hasRootCauseInstanceOf(RedisCommandTimeoutException.class);
+                }
+            }
+        });
     }
 
     @Test
@@ -387,20 +384,18 @@ void authenticationFails() {
     @Test
     void pingBeforeConnectWithSslAndAuthenticationFails() {
 
-        WithPassword.run(
-                client,
-                () -> {
+        WithPassword.run(client, () -> {
 
-                    RedisURI redisURI = RedisURI.Builder.redis(host, 6443).withVerifyPeer(false).withSsl(true).build();
+            RedisURI redisURI = RedisURI.Builder.redis(host, 6443).withVerifyPeer(false).withSsl(true).build();
 
-                    try {
-                        client.connect(redisURI);
-                        fail("Missing RedisConnectionException");
-                    } catch (RedisException e) {
-                        assertThat(e).isInstanceOf(RedisConnectionException.class).hasRootCauseInstanceOf(
-                                RedisCommandExecutionException.class);
-                    }
-                });
+            try {
+                client.connect(redisURI);
+                fail("Missing RedisConnectionException");
+            } catch (RedisException e) {
+                assertThat(e).isInstanceOf(RedisConnectionException.class)
+                        .hasRootCauseInstanceOf(RedisCommandExecutionException.class);
+            }
+        });
     }
 
     @Test
@@ -464,9 +459,9 @@ void pingBeforeConnectWithQueuedCommandsAndReconnect() throws Exception {
         redisConnection.async().set("key1", "value1");
         redisConnection.async().set("key2", "value2");
 
-        RedisFuture<String> sleep = (RedisFuture<String>) controlConnection.dispatch(new AsyncCommand<>(new Command<>(
-                CommandType.DEBUG, new StatusOutput<>(StringCodec.UTF8), new CommandArgs<>(StringCodec.UTF8).add("SLEEP")
-                        .add(2))));
+        RedisFuture<String> sleep = (RedisFuture<String>) controlConnection
+                .dispatch(new AsyncCommand<>(new Command<>(CommandType.DEBUG, new StatusOutput<>(StringCodec.UTF8),
+                        new CommandArgs<>(StringCodec.UTF8).add("SLEEP").add(2))));
 
         sleep.await(100, TimeUnit.MILLISECONDS);
 
@@ -496,44 +491,42 @@ void pingBeforeConnectWithQueuedCommandsAndReconnect() throws Exception {
     @Test
     void authenticatedPingBeforeConnectWithQueuedCommandsAndReconnect() {
 
-        WithPassword.run(
-                client,
-                () -> {
+        WithPassword.run(client, () -> {
 
-                    RedisURI redisURI = RedisURI.Builder.redis(host, port).withPassword(passwd).withDatabase(5).build();
-                    StatefulRedisConnection<String, String> controlConnection = client.connect(redisURI);
+            RedisURI redisURI = RedisURI.Builder.redis(host, port).withPassword(passwd).withDatabase(5).build();
+            StatefulRedisConnection<String, String> controlConnection = client.connect(redisURI);
 
-                    StatefulRedisConnection<String, String> redisConnection = client.connect(redisURI);
-                    redisConnection.async().set("key1", "value1");
-                    redisConnection.async().set("key2", "value2");
+            StatefulRedisConnection<String, String> redisConnection = client.connect(redisURI);
+            redisConnection.async().set("key1", "value1");
+            redisConnection.async().set("key2", "value2");
 
-                    RedisFuture<String> sleep = (RedisFuture<String>) controlConnection.dispatch(new AsyncCommand<>(
-                            new Command<>(CommandType.DEBUG, new StatusOutput<>(StringCodec.UTF8), new CommandArgs<>(
-                                    StringCodec.UTF8).add("SLEEP").add(2))));
+            RedisFuture<String> sleep = (RedisFuture<String>) controlConnection
+                    .dispatch(new AsyncCommand<>(new Command<>(CommandType.DEBUG, new StatusOutput<>(StringCodec.UTF8),
+                            new CommandArgs<>(StringCodec.UTF8).add("SLEEP").add(2))));
 
-                    sleep.await(100, TimeUnit.MILLISECONDS);
+            sleep.await(100, TimeUnit.MILLISECONDS);
 
-                    Channel channel = getChannel(redisConnection);
-                    ConnectionWatchdog connectionWatchdog = getConnectionWatchdog(redisConnection);
-                    connectionWatchdog.setReconnectSuspended(true);
+            Channel channel = getChannel(redisConnection);
+            ConnectionWatchdog connectionWatchdog = getConnectionWatchdog(redisConnection);
+            connectionWatchdog.setReconnectSuspended(true);
 
-                    TestFutures.awaitOrTimeout(channel.close());
-                    TestFutures.awaitOrTimeout(sleep);
+            TestFutures.awaitOrTimeout(channel.close());
+            TestFutures.awaitOrTimeout(sleep);
 
-                    redisConnection.async().get(key).cancel(true);
+            redisConnection.async().get(key).cancel(true);
 
-                    RedisFuture<String> getFuture1 = redisConnection.async().get("key1");
-                    RedisFuture<String> getFuture2 = redisConnection.async().get("key2");
-                    getFuture1.await(100, TimeUnit.MILLISECONDS);
+            RedisFuture<String> getFuture1 = redisConnection.async().get("key1");
+            RedisFuture<String> getFuture2 = redisConnection.async().get("key2");
+            getFuture1.await(100, TimeUnit.MILLISECONDS);
 
-                    connectionWatchdog.setReconnectSuspended(false);
-                    connectionWatchdog.scheduleReconnect();
+            connectionWatchdog.setReconnectSuspended(false);
+            connectionWatchdog.scheduleReconnect();
 
-                    assertThat(TestFutures.getOrTimeout(getFuture1)).isEqualTo("value1");
-                    assertThat(TestFutures.getOrTimeout(getFuture2)).isEqualTo("value2");
+            assertThat(TestFutures.getOrTimeout(getFuture1)).isEqualTo("value1");
+            assertThat(TestFutures.getOrTimeout(getFuture2)).isEqualTo("value2");
 
-                    controlConnection.close();
-                    redisConnection.close();
-                });
+            controlConnection.close();
+            redisConnection.close();
+        });
     }
 }
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
index 7955403f13..0b8f9dd019 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
@@ -27,7 +27,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import io.lettuce.RedisBug;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -51,10 +50,11 @@ class ConnectionCommandIntegrationTests extends TestSupport {
     }
 
     @Test
-    @RedisBug("HELLO AUTH currently not working")
     void auth() {
 
         WithPassword.run(client, () -> {
+            client.setOptions(
+                    ClientOptions.builder().pingBeforeActivateConnection(false).protocolVersion(ProtocolVersion.RESP2).build());
             RedisCommands<String, String> connection = client.connect().sync();
             try {
                 connection.ping();
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
index 28bf01f6fb..b3fc8ae17b 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
@@ -36,10 +36,12 @@
 import io.lettuce.core.*;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.internal.LettuceFactories;
+import io.lettuce.core.protocol.ProtocolVersion;
 import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
 import io.lettuce.test.Delay;
 import io.lettuce.test.TestFutures;
 import io.lettuce.test.Wait;
+import io.lettuce.test.WithPassword;
 import io.lettuce.test.resource.FastShutdown;
 import io.lettuce.test.resource.TestClientResources;
 
@@ -82,44 +84,43 @@ void closePubSubConnection() {
 
     @Test
     void auth() {
-        new WithPasswordRequired() {
-            @Override
-            protected void run(RedisClient client) throws Exception {
-                RedisPubSubAsyncCommands<String, String> connection = client.connectPubSub().async();
-                connection.getStatefulConnection().addListener(PubSubCommandTest.this);
-                connection.auth(passwd);
+        WithPassword.run(client, () -> {
 
-                connection.subscribe(channel);
-                assertThat(channels.take()).isEqualTo(channel);
-            }
-        };
+            client.setOptions(
+                    ClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).pingBeforeActivateConnection(false).build());
+            RedisPubSubAsyncCommands<String, String> connection = client.connectPubSub().async();
+            connection.getStatefulConnection().addListener(PubSubCommandTest.this);
+            connection.auth(passwd);
+
+            connection.subscribe(channel);
+            assertThat(channels.take()).isEqualTo(channel);
+        });
     }
 
     @Test
     void authWithReconnect() {
 
-        new WithPasswordRequired() {
-            @Override
-            protected void run(RedisClient client) throws Exception {
+        WithPassword.run(client, () -> {
 
+            client.setOptions(
+                    ClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).pingBeforeActivateConnection(false).build());
 
-                RedisPubSubAsyncCommands<String, String> connection = client.connectPubSub().async();
-                connection.getStatefulConnection().addListener(PubSubCommandTest.this);
-                connection.auth(passwd);
-                connection.clientSetname("authWithReconnect");
-                connection.subscribe(channel);
+            RedisPubSubAsyncCommands<String, String> connection = client.connectPubSub().async();
+            connection.getStatefulConnection().addListener(PubSubCommandTest.this);
+            connection.auth(passwd);
+            connection.clientSetname("authWithReconnect");
+            connection.subscribe(channel);
 
-                assertThat(channels.take()).isEqualTo(channel);
+            assertThat(channels.take()).isEqualTo(channel);
 
-                long id = findNamedClient("authWithReconnect");
-                redis.clientKill(KillArgs.Builder.id(id));
+            long id = findNamedClient("authWithReconnect");
+            redis.clientKill(KillArgs.Builder.id(id));
 
-                Delay.delay(Duration.ofMillis(100));
-                Wait.untilTrue(connection::isOpen).waitOrTimeout();
+            Delay.delay(Duration.ofMillis(100));
+            Wait.untilTrue(connection::isOpen).waitOrTimeout();
 
-                assertThat(channels.take()).isEqualTo(channel);
-            }
-        };
+            assertThat(channels.take()).isEqualTo(channel);
+        });
     }
 
     private long findNamedClient(String name) {
@@ -415,8 +416,7 @@ void pingNotAllowedInSubscriptionState() {
         TestFutures.awaitOrTimeout(pubsub.subscribe(channel));
 
         assertThatThrownBy(() -> TestFutures.getOrTimeout(pubsub.ping())).isInstanceOf(RedisException.class)
-                .hasMessageContaining(
-                "not allowed");
+                .hasMessageContaining("not allowed");
         pubsub.unsubscribe(channel);
 
         Wait.untilTrue(() -> channels.size() == 2).waitOrTimeout();
diff --git a/src/test/java/io/lettuce/test/CliParser.java b/src/test/java/io/lettuce/test/CliParser.java
new file mode 100644
index 0000000000..6b94dd98c7
--- /dev/null
+++ b/src/test/java/io/lettuce/test/CliParser.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.test;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.output.ArrayOutput;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandArgs;
+import io.lettuce.core.protocol.ProtocolKeyword;
+
+/**
+ * Utility to parse a CLI command string such as {@code ACL SETUSER foo} into a {@link Command}.
+ *
+ * @author Mark Paluch
+ */
+public class CliParser {
+
+    /**
+     * Parse a CLI command string into a {@link Command}.
+     *
+     * @param command
+     * @return
+     */
+    public static Command<String, String, List<Object>> parse(String command) {
+
+        String[] parts = command.split(" ");
+        boolean quoted = false;
+
+        ProtocolKeyword type = null;
+        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8);
+
+        StringBuilder buffer = new StringBuilder();
+        for (int i = 0; i < parts.length; i++) {
+
+            String part = parts[i];
+
+            if (quoted && part.endsWith("\"")) {
+                buffer.append(part, 0, part.length() - 1);
+            } else if (part.startsWith("\"")) {
+                quoted = true;
+                buffer.append(buffer.append(part.substring(1)));
+            } else {
+                buffer.append(part);
+            }
+
+            if (quoted) {
+                continue;
+            }
+
+            if (type == null) {
+                String typeName = buffer.toString();
+                type = new ProtocolKeyword() {
+                    @Override
+                    public byte[] getBytes() {
+                        return name().getBytes(StandardCharsets.UTF_8);
+                    }
+
+                    @Override
+                    public String name() {
+                        return typeName;
+                    }
+                };
+            } else {
+                args.addKey(buffer.toString());
+            }
+
+            buffer.setLength(0);
+        }
+
+        return new Command<>(type, new ArrayOutput<>(StringCodec.UTF8), args);
+    }
+}
diff --git a/src/test/java/io/lettuce/test/WithPassword.java b/src/test/java/io/lettuce/test/WithPassword.java
index 3084b3a69d..1f7d70f7d9 100644
--- a/src/test/java/io/lettuce/test/WithPassword.java
+++ b/src/test/java/io/lettuce/test/WithPassword.java
@@ -16,10 +16,13 @@
 package io.lettuce.test;
 
 import java.lang.reflect.UndeclaredThrowableException;
+import java.util.List;
 
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.test.condition.RedisConditions;
 import io.lettuce.test.settings.TestSettings;
 
 /**
@@ -40,7 +43,7 @@ public static void run(RedisClient client, ThrowingCallable callable) {
         StatefulRedisConnection<String, String> connection = client.connect();
         RedisCommands<String, String> commands = connection.sync();
         try {
-            commands.configSet("requirepass", TestSettings.password());
+            enableAuthentication(commands);
             commands.auth(TestSettings.password());
 
             try {
@@ -51,12 +54,38 @@ public static void run(RedisClient client, ThrowingCallable callable) {
                 throw new UndeclaredThrowableException(e);
             }
         } finally {
-
-            commands.configSet("requirepass", "");
+            disableAuthentication(commands);
             connection.close();
         }
     }
 
+    /**
+     * Enable password authentication via {@code requirepass}.
+     *
+     * @param commands
+     */
+    public static void enableAuthentication(RedisCommands<String, String> commands) {
+        commands.configSet("requirepass", TestSettings.password());
+    }
+
+    /**
+     * Disable password authentication via {@code requirepass} and optionally the {@code ACL} command.
+     *
+     * @param commands
+     */
+    public static void disableAuthentication(RedisCommands<String, String> commands) {
+
+        RedisConditions conditions = RedisConditions.of(commands);
+
+        commands.configSet("requirepass", "");
+
+        if (conditions.hasCommand("ACL")) {
+
+            Command<String, String, List<Object>> command = CliParser.parse("acl setuser default nopass");
+            commands.dispatch(command.getType(), command.getOutput(), command.getArgs());
+        }
+    }
+
     public interface ThrowingCallable {
         void call() throws Throwable;
     }
diff --git a/src/test/java/io/lettuce/test/condition/RedisConditions.java b/src/test/java/io/lettuce/test/condition/RedisConditions.java
index 8d4b039c20..46de1058f9 100644
--- a/src/test/java/io/lettuce/test/condition/RedisConditions.java
+++ b/src/test/java/io/lettuce/test/condition/RedisConditions.java
@@ -169,7 +169,7 @@ public static class Version implements Comparable<Version> {
          * @param version must not be {@literal null} or empty.
          * @return
          */
-        static Version parse(String version) {
+        public static Version parse(String version) {
 
             Assert.hasText(version, "Version must not be null o empty!");
 

From 0c2c05c5e7f511d7c832106548482073964e59f8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 27 Dec 2019 18:36:32 +0100
Subject: [PATCH 717/808] Disable tests that fail because of Redis RESP3
 failures #964

---
 .../ServerCommandIntegrationTests.java        |  2 +-
 .../SortedSetCommandIntegrationTests.java     |  2 +-
 ...ectionEventsTriggeredIntegrationTests.java |  3 +-
 ...terReplicaSentinelSslIntegrationTests.java |  2 +
 .../core/masterreplica/MasterReplicaTest.java | 45 ++++++++--------
 .../StaticMasterReplicaTest.java              | 45 ++++++++--------
 .../CustomCommandIntegrationTests.java        |  4 +-
 .../MasterSlaveSentinelIntegrationTests.java  |  2 +
 .../core/masterslave/MasterSlaveTest.java     | 45 ++++++++--------
 .../masterslave/StaticMasterSlaveTest.java    | 54 +++++++++----------
 .../SentinelCommandIntegrationTests.java      |  2 +
 .../SentinelConnectionIntegrationTests.java   |  4 +-
 ...SentinelServerCommandIntegrationTests.java |  5 +-
 .../sentinel/SentinelSslIntegrationTests.java |  2 +
 .../reactive/SentinelReactiveCommandTest.java |  2 +
 .../SentinelServerReactiveCommandTest.java    |  5 +-
 16 files changed, 121 insertions(+), 103 deletions(-)

diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
index 5e25ec2a9b..964f36d714 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
@@ -90,7 +90,7 @@ void bgsave() {
     }
 
     @Test
-    @RedisBug("RESP error")
+    @RedisBug("https://github.com/antirez/redis/issues/6036")
     void clientGetSetname() {
         assertThat(redis.clientGetname()).isNull();
         assertThat(redis.clientSetname("test")).isEqualTo("OK");
diff --git a/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
index beb0cc1621..5b64e9132d 100644
--- a/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
@@ -344,7 +344,7 @@ void zrangebyscoreWithScores() {
     }
 
     @Test
-    @RedisBug("-inf is suffixed with NULL byte")
+    @RedisBug("-inf is suffixed with NULL byte, https://github.com/antirez/redis/issues/6037")
     @SuppressWarnings({ "unchecked" })
     void zrangebyscoreWithScoresInfinity() {
 
diff --git a/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java
index 503e986be1..799124fb26 100644
--- a/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java
@@ -28,6 +28,7 @@
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.TestSupport;
 import io.lettuce.core.event.connection.ConnectionEvent;
+import io.lettuce.test.resource.FastShutdown;
 import io.lettuce.test.resource.TestClientResources;
 
 /**
@@ -49,6 +50,6 @@ void testConnectionEvents() {
             assertThat(event.toString()).contains("->");
         }).expectNextCount(3).thenCancel().verify(Duration.of(5, ChronoUnit.SECONDS));
 
-        client.shutdown();
+        FastShutdown.shutdown(client);
     }
 }
diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java
index 7349b1683b..88e5530dee 100644
--- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java
@@ -20,6 +20,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import io.lettuce.RedisBug;
 import io.lettuce.core.ReadFrom;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
@@ -39,6 +40,7 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
+@RedisBug("https://github.com/antirez/redis/issues/6160")
 class MasterReplicaSentinelSslIntegrationTests extends TestSupport {
 
     private final ClientResources clientResources;
diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
index 2ff73fef76..40ef982761 100644
--- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
@@ -21,7 +21,6 @@
 
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -33,13 +32,12 @@
 import io.lettuce.core.ReadFrom;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.core.models.role.RoleParser;
-import io.lettuce.test.TestFutures;
+import io.lettuce.test.WithPassword;
 import io.lettuce.test.settings.TestSettings;
 
 /**
@@ -51,23 +49,24 @@ class MasterReplicaTest extends AbstractRedisClientTest {
             .withClientName("my-client").withDatabase(5).build();
 
     private StatefulRedisMasterReplicaConnection<String, String> connection;
-    private RedisAsyncCommands<String, String> connectionToNode1;
-    private RedisAsyncCommands<String, String> connectionToNode2;
 
     private RedisURI master;
     private RedisURI replica;
 
+    private RedisCommands<String, String> connection1;
+    private RedisCommands<String, String> connection2;
+
     @BeforeEach
     void before() throws Exception {
 
         RedisURI node1 = RedisURI.Builder.redis(host, TestSettings.port(3)).withDatabase(2).build();
         RedisURI node2 = RedisURI.Builder.redis(host, TestSettings.port(4)).withDatabase(2).build();
 
-        connectionToNode1 = client.connect(node1).async();
-        connectionToNode2 = client.connect(node2).async();
+        connection1 = client.connect(node1).sync();
+        connection2 = client.connect(node2).sync();
 
-        RedisInstance node1Instance = RoleParser.parse(connectionToNode1.role().get(2, TimeUnit.SECONDS));
-        RedisInstance node2Instance = RoleParser.parse(connectionToNode2.role().get(2, TimeUnit.SECONDS));
+        RedisInstance node1Instance = RoleParser.parse(this.connection1.role());
+        RedisInstance node2Instance = RoleParser.parse(this.connection2.role());
 
         if (node1Instance.getRole() == RedisInstance.Role.MASTER && node2Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node1;
@@ -82,13 +81,13 @@ void before() throws Exception {
                             node1Instance, node2Instance));
         }
 
-        connectionToNode1.configSet("requirepass", passwd);
-        connectionToNode1.configSet("masterauth", passwd);
-        connectionToNode1.auth(passwd);
+        WithPassword.enableAuthentication(this.connection1);
+        this.connection1.configSet("masterauth", passwd);
+        this.connection1.auth(passwd);
 
-        connectionToNode2.configSet("requirepass", passwd);
-        connectionToNode2.configSet("masterauth", passwd);
-        connectionToNode2.auth(passwd);
+        WithPassword.enableAuthentication(this.connection2);
+        this.connection2.configSet("masterauth", passwd);
+        this.connection2.auth(passwd);
 
         connection = MasterReplica.connect(client, StringCodec.UTF8, masterURI);
         connection.setReadFrom(ReadFrom.REPLICA);
@@ -97,16 +96,16 @@ void before() throws Exception {
     @AfterEach
     void after() {
 
-        if (connectionToNode1 != null) {
-            connectionToNode1.configSet("requirepass", "");
-            TestFutures.awaitOrTimeout(connectionToNode1.configSet("masterauth", ""));
-            connectionToNode1.getStatefulConnection().close();
+        if (connection1 != null) {
+            WithPassword.disableAuthentication(connection1);
+            connection1.configRewrite();
+            connection1.getStatefulConnection().close();
         }
 
-        if (connectionToNode2 != null) {
-            connectionToNode2.configSet("requirepass", "");
-            TestFutures.awaitOrTimeout(connectionToNode2.configSet("masterauth", ""));
-            connectionToNode2.getStatefulConnection().close();
+        if (connection2 != null) {
+            WithPassword.disableAuthentication(connection2);
+            connection2.configRewrite();
+            connection2.getStatefulConnection().close();
         }
 
         if (connection != null) {
diff --git a/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java b/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
index ea4c0db027..9069c8b8b0 100644
--- a/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
+++ b/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
@@ -20,7 +20,6 @@
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -32,11 +31,11 @@
 import io.lettuce.core.ReadFrom;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RoleParser;
+import io.lettuce.test.WithPassword;
 import io.lettuce.test.settings.TestSettings;
 
 /**
@@ -49,8 +48,8 @@ class StaticMasterReplicaTest extends AbstractRedisClientTest {
     private RedisURI master;
     private RedisURI slave;
 
-    private RedisAsyncCommands<String, String> connectionToNode1;
-    private RedisAsyncCommands<String, String> connectionToNode2;
+    private RedisCommands<String, String> connection1;
+    private RedisCommands<String, String> connection2;
 
     @BeforeEach
     void before() throws Exception {
@@ -58,11 +57,11 @@ void before() throws Exception {
         RedisURI node1 = RedisURI.Builder.redis(host, TestSettings.port(3)).withClientName("my-client").withDatabase(2).build();
         RedisURI node2 = RedisURI.Builder.redis(host, TestSettings.port(4)).withClientName("my-client").withDatabase(2).build();
 
-        connectionToNode1 = client.connect(node1).async();
-        connectionToNode2 = client.connect(node2).async();
+        connection1 = client.connect(node1).sync();
+        connection2 = client.connect(node2).sync();
 
-        RedisInstance node1Instance = RoleParser.parse(connectionToNode1.role().get(2, TimeUnit.SECONDS));
-        RedisInstance node2Instance = RoleParser.parse(connectionToNode2.role().get(2, TimeUnit.SECONDS));
+        RedisInstance node1Instance = RoleParser.parse(this.connection1.role());
+        RedisInstance node2Instance = RoleParser.parse(this.connection2.role());
 
         if (node1Instance.getRole() == RedisInstance.Role.MASTER && node2Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node1;
@@ -77,13 +76,13 @@ void before() throws Exception {
                             node1Instance, node2Instance));
         }
 
-        connectionToNode1.configSet("requirepass", passwd);
-        connectionToNode1.configSet("masterauth", passwd);
-        connectionToNode1.auth(passwd);
+        WithPassword.enableAuthentication(this.connection1);
+        this.connection1.configSet("masterauth", passwd);
+        this.connection1.auth(passwd);
 
-        connectionToNode2.configSet("requirepass", passwd);
-        connectionToNode2.configSet("masterauth", passwd);
-        connectionToNode2.auth(passwd);
+        WithPassword.enableAuthentication(this.connection2);
+        this.connection2.configSet("masterauth", passwd);
+        this.connection2.auth(passwd);
 
         node1.setPassword(passwd);
         node2.setPassword(passwd);
@@ -95,16 +94,18 @@ void before() throws Exception {
     @AfterEach
     void after() throws Exception {
 
-        if (connectionToNode1 != null) {
-            connectionToNode1.configSet("requirepass", "");
-            connectionToNode1.configSet("masterauth", "").get(1, TimeUnit.SECONDS);
-            connectionToNode1.getStatefulConnection().close();
+        if (connection1 != null) {
+            WithPassword.disableAuthentication(connection1);
+            connection1.configSet("masterauth", "");
+            connection1.configRewrite();
+            connection1.getStatefulConnection().close();
         }
 
-        if (connectionToNode2 != null) {
-            connectionToNode2.configSet("requirepass", "");
-            connectionToNode2.configSet("masterauth", "").get(1, TimeUnit.SECONDS);
-            connectionToNode2.getStatefulConnection().close();
+        if (connection2 != null) {
+            WithPassword.disableAuthentication(connection2);
+            connection2.configSet("masterauth", "");
+            connection2.configRewrite();
+            connection2.getStatefulConnection().close();
         }
 
         if (connection != null) {
diff --git a/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java b/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
index 70b466f751..d12008563a 100644
--- a/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
@@ -28,19 +28,21 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import io.lettuce.RedisBug;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
-import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.TestFutures;
 
 /**
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
+@RedisBug("https://github.com/antirez/redis/issues/6160")
 class CustomCommandIntegrationTests extends TestSupport {
 
     private final RedisClient redisClient;
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
index a1ef370e2c..36ce4909c6 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
@@ -29,6 +29,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import io.lettuce.RedisBug;
 import io.lettuce.core.*;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.sentinel.SentinelTestSettings;
@@ -40,6 +41,7 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
+@RedisBug("https://github.com/antirez/redis/issues/6160")
 class MasterSlaveSentinelIntegrationTests extends TestSupport {
 
     private final Pattern pattern = Pattern.compile("role:(\\w+)");
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
index 0262b83c5b..0b3972c476 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
@@ -21,7 +21,6 @@
 
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -33,13 +32,12 @@
 import io.lettuce.core.ReadFrom;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.core.models.role.RoleParser;
-import io.lettuce.test.TestFutures;
+import io.lettuce.test.WithPassword;
 import io.lettuce.test.settings.TestSettings;
 
 /**
@@ -51,23 +49,24 @@ class MasterSlaveTest extends AbstractRedisClientTest {
             .withClientName("my-client").withDatabase(5).build();
 
     private StatefulRedisMasterSlaveConnectionImpl<String, String> connection;
-    private RedisAsyncCommands<String, String> connectionToNode1;
-    private RedisAsyncCommands<String, String> connectionToNode2;
 
     private RedisURI master;
     private RedisURI replica;
 
+    private RedisCommands<String, String> connection1;
+    private RedisCommands<String, String> connection2;
+
     @BeforeEach
     void before() throws Exception {
 
         RedisURI node1 = RedisURI.Builder.redis(host, TestSettings.port(3)).withDatabase(2).build();
         RedisURI node2 = RedisURI.Builder.redis(host, TestSettings.port(4)).withDatabase(2).build();
 
-        connectionToNode1 = client.connect(node1).async();
-        connectionToNode2 = client.connect(node2).async();
+        this.connection1 = client.connect(node1).sync();
+        this.connection2 = client.connect(node2).sync();
 
-        RedisInstance node1Instance = RoleParser.parse(connectionToNode1.role().get(2, TimeUnit.SECONDS));
-        RedisInstance node2Instance = RoleParser.parse(connectionToNode2.role().get(2, TimeUnit.SECONDS));
+        RedisInstance node1Instance = RoleParser.parse(this.connection1.role());
+        RedisInstance node2Instance = RoleParser.parse(this.connection2.role());
 
         if (node1Instance.getRole() == RedisInstance.Role.MASTER && node2Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node1;
@@ -82,13 +81,13 @@ void before() throws Exception {
                             node1Instance, node2Instance));
         }
 
-        connectionToNode1.configSet("requirepass", passwd);
-        connectionToNode1.configSet("masterauth", passwd);
-        connectionToNode1.auth(passwd);
+        WithPassword.enableAuthentication(this.connection1);
+        this.connection1.configSet("masterauth", passwd);
+        this.connection1.auth(passwd);
 
-        connectionToNode2.configSet("requirepass", passwd);
-        connectionToNode2.configSet("masterauth", passwd);
-        connectionToNode2.auth(passwd);
+        WithPassword.enableAuthentication(this.connection2);
+        this.connection2.configSet("masterauth", passwd);
+        this.connection2.auth(passwd);
 
         connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8, masterURI);
         connection.setReadFrom(ReadFrom.REPLICA);
@@ -97,16 +96,16 @@ void before() throws Exception {
     @AfterEach
     void after() {
 
-        if (connectionToNode1 != null) {
-            connectionToNode1.configSet("requirepass", "");
-            TestFutures.awaitOrTimeout(connectionToNode1.configSet("masterauth", ""));
-            connectionToNode1.getStatefulConnection().close();
+        if (connection1 != null) {
+            WithPassword.disableAuthentication(connection1);
+            connection1.configRewrite();
+            connection1.getStatefulConnection().close();
         }
 
-        if (connectionToNode2 != null) {
-            connectionToNode2.configSet("requirepass", "");
-            TestFutures.awaitOrTimeout(connectionToNode2.configSet("masterauth", ""));
-            connectionToNode2.getStatefulConnection().close();
+        if (connection2 != null) {
+            WithPassword.disableAuthentication(connection2);
+            connection2.configRewrite();
+            connection2.getStatefulConnection().close();
         }
 
         if (connection != null) {
diff --git a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
index 8eee62bc0a..e04ae6e288 100644
--- a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
@@ -21,7 +21,6 @@
 
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -29,22 +28,20 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import io.lettuce.RedisBug;
 import io.lettuce.core.AbstractRedisClientTest;
 import io.lettuce.core.ReadFrom;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RoleParser;
+import io.lettuce.test.WithPassword;
 import io.lettuce.test.settings.TestSettings;
 
 /**
  * @author Mark Paluch
  */
-@RedisBug("Cannot unset requirepass")
 class StaticMasterSlaveTest extends AbstractRedisClientTest {
 
     private StatefulRedisMasterSlaveConnectionImpl<String, String> connection;
@@ -52,25 +49,26 @@ class StaticMasterSlaveTest extends AbstractRedisClientTest {
     private RedisURI master;
     private RedisURI replica;
 
-    private RedisAsyncCommands<String, String> connectionToNode1;
-    private RedisAsyncCommands<String, String> connectionToNode2;
+    private RedisCommands<String, String> connection1;
+    private RedisCommands<String, String> connection2;
 
     @BeforeEach
-    void before() throws Exception {
+    void before() {
 
         RedisURI node1 = RedisURI.Builder.redis(host, TestSettings.port(3)).withClientName("my-client").withDatabase(2).build();
         RedisURI node2 = RedisURI.Builder.redis(host, TestSettings.port(4)).withClientName("my-client").withDatabase(2).build();
 
-        connectionToNode1 = client.connect(node1).async();
-        connectionToNode2 = client.connect(node2).async();
+        this.connection1 = client.connect(node1).sync();
+        this.connection2 = client.connect(node2).sync();
 
-        RedisInstance node1Instance = RoleParser.parse(connectionToNode1.role().get(2, TimeUnit.SECONDS));
-        RedisInstance node2Instance = RoleParser.parse(connectionToNode2.role().get(2, TimeUnit.SECONDS));
+        RedisInstance node1Instance = RoleParser.parse(this.connection1.role());
+        RedisInstance node2Instance = RoleParser.parse(this.connection2.role());
 
         if (node1Instance.getRole() == RedisInstance.Role.MASTER && node2Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node1;
             replica = node2;
-        } else if (node2Instance.getRole() == RedisInstance.Role.MASTER && node1Instance.getRole() == RedisInstance.Role.SLAVE) {
+        } else if (node2Instance.getRole() == RedisInstance.Role.MASTER
+                && node1Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node2;
             replica = node1;
         } else {
@@ -79,13 +77,13 @@ void before() throws Exception {
                             node1Instance, node2Instance));
         }
 
-        connectionToNode1.configSet("requirepass", passwd);
-        connectionToNode1.configSet("masterauth", passwd);
-        connectionToNode1.auth(passwd);
+        WithPassword.enableAuthentication(this.connection1);
+        this.connection1.configSet("masterauth", passwd);
+        this.connection1.auth(passwd);
 
-        connectionToNode2.configSet("requirepass", passwd);
-        connectionToNode2.configSet("masterauth", passwd);
-        connectionToNode2.auth(passwd);
+        WithPassword.enableAuthentication(this.connection2);
+        this.connection2.configSet("masterauth", passwd);
+        this.connection2.auth(passwd);
 
         master.setPassword(passwd);
         replica.setPassword(passwd);
@@ -98,18 +96,18 @@ void before() throws Exception {
     @AfterEach
     void after() throws Exception {
 
-        if (connectionToNode1 != null) {
-            connectionToNode1.configSet("requirepass", null);
-            connectionToNode1.configSet("masterauth", null).get(1, TimeUnit.SECONDS);
-            connectionToNode1.configRewrite();
-            connectionToNode1.getStatefulConnection().close();
+        if (connection1 != null) {
+            WithPassword.disableAuthentication(connection1);
+            connection1.configSet("masterauth", "");
+            connection1.configRewrite();
+            connection1.getStatefulConnection().close();
         }
 
-        if (connectionToNode2 != null) {
-            connectionToNode2.configSet("requirepass", null);
-            connectionToNode2.configSet("masterauth", null).get(1, TimeUnit.SECONDS);
-            connectionToNode2.configRewrite();
-            connectionToNode2.getStatefulConnection().close();
+        if (connection2 != null) {
+            WithPassword.disableAuthentication(connection2);
+            connection2.configSet("masterauth", "");
+            connection2.configRewrite();
+            connection2.getStatefulConnection().close();
         }
 
         if (connection != null) {
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java
index df58556e4d..aeb37d3ea6 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java
@@ -31,6 +31,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import io.lettuce.RedisBug;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisConnectionException;
 import io.lettuce.core.RedisURI;
@@ -46,6 +47,7 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
+@RedisBug("https://github.com/antirez/redis/issues/6160")
 public class SentinelCommandIntegrationTests extends TestSupport {
 
     private final RedisClient redisClient;
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
index bf5cc7e6b8..c6e6d3434f 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
@@ -29,14 +29,15 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import io.lettuce.RedisBug;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.ByteArrayCodec;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
 import io.lettuce.core.sentinel.api.async.RedisSentinelAsyncCommands;
 import io.lettuce.core.sentinel.api.sync.RedisSentinelCommands;
-import io.lettuce.test.TestFutures;
 import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.TestFutures;
 import io.lettuce.test.Wait;
 import io.lettuce.test.settings.TestSettings;
 
@@ -44,6 +45,7 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
+@RedisBug("https://github.com/antirez/redis/issues/6160")
 public class SentinelConnectionIntegrationTests extends TestSupport {
 
     private final RedisClient redisClient;
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java
index 680dd4a1f0..6da67c4790 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java
@@ -27,6 +27,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import io.lettuce.RedisBug;
 import io.lettuce.core.KillArgs;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
@@ -40,6 +41,7 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
+@RedisBug("https://github.com/antirez/redis/issues/6160")
 public class SentinelServerCommandIntegrationTests extends TestSupport {
 
     private final RedisClient redisClient;
@@ -58,7 +60,8 @@ void before() {
         this.sentinel = getSyncConnection(this.connection);
     }
 
-    protected RedisSentinelCommands<String, String> getSyncConnection(StatefulRedisSentinelConnection<String, String> connection) {
+    protected RedisSentinelCommands<String, String> getSyncConnection(
+            StatefulRedisSentinelConnection<String, String> connection) {
         return connection.sync();
     }
 
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java
index 4b14f61254..a591827a39 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java
@@ -22,6 +22,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import io.lettuce.RedisBug;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.TestSupport;
@@ -41,6 +42,7 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
+@RedisBug("https://github.com/antirez/redis/issues/6160")
 class SentinelSslIntegrationTests extends TestSupport {
 
     private final ClientResources clientResources;
diff --git a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
index 6c4a13b5b5..a292b69c0e 100644
--- a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
@@ -17,6 +17,7 @@
 
 import javax.inject.Inject;
 
+import io.lettuce.RedisBug;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.sentinel.SentinelCommandIntegrationTests;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
@@ -26,6 +27,7 @@
 /**
  * @author Mark Paluch
  */
+@RedisBug("https://github.com/antirez/redis/issues/6160")
 public class SentinelReactiveCommandTest extends SentinelCommandIntegrationTests {
 
     @Inject
diff --git a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
index da2b62fdcf..1ee3baf498 100644
--- a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
@@ -17,6 +17,7 @@
 
 import javax.inject.Inject;
 
+import io.lettuce.RedisBug;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.sentinel.SentinelServerCommandIntegrationTests;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
@@ -26,6 +27,7 @@
 /**
  * @author Mark Paluch
  */
+@RedisBug("https://github.com/antirez/redis/issues/6160")
 public class SentinelServerReactiveCommandTest extends SentinelServerCommandIntegrationTests {
 
     @Inject
@@ -34,7 +36,8 @@ public SentinelServerReactiveCommandTest(RedisClient redisClient) {
     }
 
     @Override
-    protected RedisSentinelCommands<String, String> getSyncConnection(StatefulRedisSentinelConnection<String, String> connection) {
+    protected RedisSentinelCommands<String, String> getSyncConnection(
+            StatefulRedisSentinelConnection<String, String> connection) {
         return ReactiveSyncInvocationHandler.sync(connection);
     }
 }

From abbfdf69f1a71832fa2d4d90a2e010a876f3a9a6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 28 Dec 2019 16:36:17 +0100
Subject: [PATCH 718/808] Refactor connection activation to
 ConnectionInitializer #697

Connections are now initialized with a ConnectionInitializer that performs the Handshake and issues initialization commands after the handshake. The ConnectionState keeps track of the desired state and applies it on connect and reconnect. This change removes the need to track the state of each connection flag in each connection implementation and moves all flags into a single state object.

The initialization/handshake future is now also provided by RedisHandshakeHandler instead of living in various initializer types.

The handshake for SSL and plaintext connections became simpler and easier to find.

Centralizing the handshake is a pre-requisite for protocol version negotiation.
---
 .../io/lettuce/core/AbstractRedisClient.java  |  23 ++-
 .../io/lettuce/core/ChannelGroupListener.java |  15 +-
 .../io/lettuce/core/ConnectionBuilder.java    | 134 ++++----------
 .../lettuce/core/ConnectionEventTrigger.java  |   2 +
 .../io/lettuce/core/ConnectionEvents.java     |  24 ---
 .../java/io/lettuce/core/ConnectionState.java | 173 +++++++++++++++++
 .../lettuce/core/PlainChannelInitializer.java | 175 ------------------
 .../lettuce/core/RedisChannelInitializer.java |  34 ----
 .../core/RedisChannelInitializerImpl.java     |  26 ---
 .../java/io/lettuce/core/RedisClient.java     |  79 ++++----
 .../io/lettuce/core/RedisCommandBuilder.java  |   3 +-
 .../io/lettuce/core/SslConnectionBuilder.java | 129 +------------
 .../core/StatefulRedisConnectionImpl.java     |  52 ++----
 .../{RedisState.java => CommandSet.java}      |   6 +-
 ...RedisAdvancedClusterAsyncCommandsImpl.java |   4 +-
 ...isAdvancedClusterReactiveCommandsImpl.java |   4 +-
 .../core/cluster/RedisClusterClient.java      |  84 +++++----
 .../RedisClusterPubSubAsyncCommandsImpl.java  |   8 +-
 ...edisClusterPubSubReactiveCommandsImpl.java |   8 +-
 .../StatefulRedisClusterConnectionImpl.java   |  78 +++-----
 ...tefulRedisClusterPubSubConnectionImpl.java |  10 +-
 .../lettuce/core/protocol/CommandHandler.java |  36 ++--
 .../core/protocol/ConnectionInitializer.java  |  38 ++++
 .../core/protocol/ConnectionWatchdog.java     |  15 +-
 .../core/protocol/ReconnectionHandler.java    | 131 ++++---------
 .../core/protocol/RedisHandshakeHandler.java  | 157 ++++++++++++++++
 .../protocol/SslRedisHandshakeHandler.java    |  58 ++++++
 .../StatefulRedisSentinelConnectionImpl.java  |  27 ++-
 .../ConnectionCommandIntegrationTests.java    |  18 +-
 ...s.java => CommandSetIntegrationTests.java} |   7 +-
 .../RedisClusterClientIntegrationTests.java   |   5 +-
 .../protocol/CommandHandlerUnitTests.java     |  10 -
 .../pubsub/PubSubCommandHandlerUnitTests.java |   2 +-
 .../tracing/BraveTracingIntegrationTests.java |  46 ++---
 34 files changed, 740 insertions(+), 881 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/ConnectionState.java
 delete mode 100644 src/main/java/io/lettuce/core/PlainChannelInitializer.java
 delete mode 100644 src/main/java/io/lettuce/core/RedisChannelInitializer.java
 delete mode 100644 src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java
 rename src/main/java/io/lettuce/core/cluster/{RedisState.java => CommandSet.java} (94%)
 create mode 100644 src/main/java/io/lettuce/core/protocol/ConnectionInitializer.java
 create mode 100644 src/main/java/io/lettuce/core/protocol/RedisHandshakeHandler.java
 create mode 100644 src/main/java/io/lettuce/core/protocol/SslRedisHandshakeHandler.java
 rename src/test/java/io/lettuce/core/cluster/{RedisStateIntegrationTests.java => CommandSetIntegrationTests.java} (91%)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index a456487905..538ceedcd4 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -15,8 +15,6 @@
  */
 package io.lettuce.core;
 
-import static java.util.concurrent.CompletableFuture.completedFuture;
-
 import java.io.Closeable;
 import java.net.SocketAddress;
 import java.time.Duration;
@@ -33,6 +31,7 @@
 import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.ConnectionWatchdog;
+import io.lettuce.core.protocol.RedisHandshakeHandler;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
 import io.netty.bootstrap.Bootstrap;
@@ -166,10 +165,6 @@ protected void connectionBuilder(Mono<SocketAddress> socketAddressSupplier, Conn
         connectionBuilder.socketAddressSupplier(socketAddressSupplier);
     }
 
-    private boolean hasPassword(RedisURI connectionSettings) {
-        return connectionSettings.getPassword() != null && connectionSettings.getPassword().length != 0;
-    }
-
     protected void channelType(ConnectionBuilder connectionBuilder, ConnectionPoint connectionPoint) {
 
         LettuceAssert.notNull(connectionPoint, "ConnectionPoint must not be null");
@@ -309,18 +304,16 @@ private void initializeChannelAsync0(ConnectionBuilder connectionBuilder, Comple
 
         Bootstrap redisBootstrap = connectionBuilder.bootstrap();
 
-        RedisChannelInitializer initializer = connectionBuilder.build();
+        ChannelInitializer<Channel> initializer = connectionBuilder.build();
         redisBootstrap.handler(initializer);
 
         clientResources.nettyCustomizer().afterBootstrapInitialized(redisBootstrap);
-        CompletableFuture<Boolean> initFuture = initializer.channelInitialized();
         ChannelFuture connectFuture = redisBootstrap.connect(redisAddress);
 
         channelReadyFuture.whenComplete((c, t) -> {
 
             if (t instanceof CancellationException) {
                 connectFuture.cancel(true);
-                initFuture.cancel(true);
             }
         });
 
@@ -334,7 +327,14 @@ private void initializeChannelAsync0(ConnectionBuilder connectionBuilder, Comple
                 return;
             }
 
-            initFuture.whenComplete((success, throwable) -> {
+            RedisHandshakeHandler handshakeHandler = connectFuture.channel().pipeline().get(RedisHandshakeHandler.class);
+
+            if (handshakeHandler == null) {
+                channelReadyFuture.completeExceptionally(new IllegalStateException("RedisHandshakeHandler not registered"));
+                return;
+            }
+
+            handshakeHandler.channelInitialized().whenComplete((success, throwable) -> {
 
                 if (throwable == null) {
 
@@ -432,7 +432,6 @@ public CompletableFuture<Void> shutdownAsync() {
      * @param timeUnit the unit of {@code quietPeriod} and {@code timeout}
      * @since 4.4
      */
-    @SuppressWarnings("rawtypes")
     public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, TimeUnit timeUnit) {
 
         if (shutdown.compareAndSet(false, true)) {
@@ -441,7 +440,7 @@ public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, Tim
             return closeResources().thenCompose((value) -> closeClientResources(quietPeriod, timeout, timeUnit));
         }
 
-        return completedFuture(null);
+        return CompletableFuture.completedFuture(null);
     }
 
     private CompletableFuture<Void> closeResources() {
diff --git a/src/main/java/io/lettuce/core/ChannelGroupListener.java b/src/main/java/io/lettuce/core/ChannelGroupListener.java
index 84236302b5..f95c094f51 100644
--- a/src/main/java/io/lettuce/core/ChannelGroupListener.java
+++ b/src/main/java/io/lettuce/core/ChannelGroupListener.java
@@ -15,6 +15,12 @@
  */
 package io.lettuce.core;
 
+import static io.lettuce.core.ConnectionEventTrigger.local;
+import static io.lettuce.core.ConnectionEventTrigger.remote;
+
+import io.lettuce.core.event.EventBus;
+import io.lettuce.core.event.connection.ConnectedEvent;
+import io.lettuce.core.event.connection.DisconnectedEvent;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
@@ -25,23 +31,28 @@
  * ChannelGroup.
  *
  * @author Will Glozer
+ * @author Mark Paluch
  */
 class ChannelGroupListener extends ChannelInboundHandlerAdapter {
 
-    private ChannelGroup channels;
+    private final ChannelGroup channels;
+    private final EventBus eventBus;
 
-    public ChannelGroupListener(ChannelGroup channels) {
+    public ChannelGroupListener(ChannelGroup channels, EventBus eventBus) {
         this.channels = channels;
+        this.eventBus = eventBus;
     }
 
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        eventBus.publish(new ConnectedEvent(local(ctx), remote(ctx)));
         channels.add(ctx.channel());
         super.channelActive(ctx);
     }
 
     @Override
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        eventBus.publish(new DisconnectedEvent(local(ctx), remote(ctx)));
         channels.remove(ctx.channel());
         super.channelInactive(ctx);
     }
diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index c6950d1ebf..836e6d3692 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -16,21 +16,19 @@
 package io.lettuce.core;
 
 import java.net.SocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Supplier;
 
 import reactor.core.publisher.Mono;
-import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.*;
 import io.lettuce.core.resource.ClientResources;
 import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelInitializer;
 import io.netty.channel.group.ChannelGroup;
 import io.netty.util.Timer;
 
@@ -41,13 +39,6 @@
  */
 public class ConnectionBuilder {
 
-    private static final RedisCommandBuilder<String, String> INITIALIZING_CMD_BUILDER = new RedisCommandBuilder<>(
-            StringCodec.UTF8);
-
-    private static final Supplier<AsyncCommand<?, ?, ?>> PING = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.ping());
-
-    private static final Supplier<AsyncCommand<?, ?, ?>> NO_PING = () -> null;
-
     private Mono<SocketAddress> socketAddressSupplier;
     private ConnectionEvents connectionEvents;
     private RedisChannelHandler<?, ?> connection;
@@ -59,57 +50,21 @@ public class ConnectionBuilder {
     private ClientOptions clientOptions;
     private Duration timeout;
     private ClientResources clientResources;
-    private String username;
-    private char[] password;
-    private String clientName;
+    private ConnectionInitializer connectionInitializer;
     private ReconnectionListener reconnectionListener = ReconnectionListener.NO_OP;
     private ConnectionWatchdog connectionWatchdog;
-    private Supplier<AsyncCommand<?, ?, ?>> handshakeCommandSupplier = ConnectionBuilder.PING;
 
     public static ConnectionBuilder connectionBuilder() {
         return new ConnectionBuilder();
     }
 
-    /**
-     * @param handshakeCommandSupplier
-     * @return {@literal true} whether {@code PING}/{@code HELLO} handshake is enabled.
-     */
-    static boolean isHandshakeEnabled(Supplier<AsyncCommand<?, ?, ?>> handshakeCommandSupplier) {
-        return handshakeCommandSupplier != NO_PING;
-    }
-
     /**
      * Apply settings from {@link RedisURI}
      *
      * @param redisURI
      */
     public void apply(RedisURI redisURI) {
-
         timeout(redisURI.getTimeout());
-        clientName(redisURI.getClientName());
-
-        if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2) {
-
-            pingBeforeConnect(clientOptions.isPingBeforeActivateConnection());
-
-            if (clientOptions.isPingBeforeActivateConnection() && hasPassword(redisURI)) {
-                auth(redisURI.getPassword());
-                handshakeAuthResp2();
-            }
-        } else if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP3) {
-
-            if (hasPassword(redisURI)) {
-                if (LettuceStrings.isNotEmpty(redisURI.getUsername())) {
-                    auth(redisURI.getUsername(), redisURI.getPassword());
-                } else {
-                    auth("default", redisURI.getPassword());
-                }
-                handshakeAuthResp3();
-
-            } else {
-                handshakeResp3();
-            }
-        }
     }
 
     protected List<ChannelHandler> buildHandlers() {
@@ -119,13 +74,15 @@ protected List<ChannelHandler> buildHandlers() {
         LettuceAssert.assertState(connection != null, "Connection must be set");
         LettuceAssert.assertState(clientResources != null, "ClientResources must be set");
         LettuceAssert.assertState(endpoint != null, "Endpoint must be set");
+        LettuceAssert.assertState(connectionInitializer != null, "ConnectionInitializer must be set");
 
         List<ChannelHandler> handlers = new ArrayList<>();
 
         connection.setOptions(clientOptions);
 
-        handlers.add(new ChannelGroupListener(channelGroup));
+        handlers.add(new ChannelGroupListener(channelGroup, clientResources.eventBus()));
         handlers.add(new CommandEncoder());
+        handlers.add(getHandshakeHandler());
         handlers.add(commandHandlerSupplier.get());
 
         handlers.add(new ConnectionEventTrigger(connectionEvents, connection, clientResources.eventBus()));
@@ -137,22 +94,8 @@ protected List<ChannelHandler> buildHandlers() {
         return handlers;
     }
 
-    void pingBeforeConnect(boolean state) {
-        handshakeCommandSupplier = state ? PING : NO_PING;
-    }
-
-    void handshakeAuthResp2() {
-        handshakeCommandSupplier = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.auth(new String(password)));
-    }
-
-    void handshakeAuthResp3() {
-        handshakeCommandSupplier = () -> new AsyncCommand<>(INITIALIZING_CMD_BUILDER.hello(3, this.username.getBytes(),
-                encode(this.password), this.clientName != null ? this.clientName.getBytes() : null));
-    }
-
-    void handshakeResp3() {
-        handshakeCommandSupplier = () -> new AsyncCommand<>(
-                INITIALIZING_CMD_BUILDER.hello(3, null, null, this.clientName != null ? this.clientName.getBytes() : null));
+    protected ChannelHandler getHandshakeHandler() {
+        return new RedisHandshakeHandler(connectionInitializer, clientResources, timeout);
     }
 
     protected ConnectionWatchdog createConnectionWatchdog() {
@@ -175,8 +118,8 @@ protected ConnectionWatchdog createConnectionWatchdog() {
         return watchdog;
     }
 
-    public RedisChannelInitializer build() {
-        return new PlainChannelInitializer(handshakeCommandSupplier, this::buildHandlers, clientResources, timeout);
+    public ChannelInitializer<Channel> build() {
+        return new PlainChannelInitializer(this::buildHandlers, clientResources);
     }
 
     public ConnectionBuilder socketAddressSupplier(Mono<SocketAddress> socketAddressSupplier) {
@@ -250,29 +193,8 @@ public ConnectionBuilder clientResources(ClientResources clientResources) {
         return this;
     }
 
-    public ConnectionBuilder clientName(String clientName) {
-        this.clientName = clientName;
-        return this;
-    }
-
-    boolean hasPassword(RedisURI connectionSettings) {
-        return connectionSettings.getPassword() != null && connectionSettings.getPassword().length != 0;
-    }
-
-    public ConnectionBuilder auth(String username, char[] password) {
-        this.username = username;
-        this.password = password;
-        return this;
-    }
-
-    public ConnectionBuilder auth(char[] password) {
-        this.password = password;
-        return this;
-    }
-
-    @Deprecated
-    public ConnectionBuilder password(char[] password) {
-        this.password = password;
+    public ConnectionBuilder connectionInitializer(ConnectionInitializer connectionInitializer) {
+        this.connectionInitializer = connectionInitializer;
         return this;
     }
 
@@ -292,24 +214,32 @@ public ClientResources clientResources() {
         return clientResources;
     }
 
-    public char[] password() {
-        return password;
-    }
-
     public Endpoint endpoint() {
         return endpoint;
     }
 
-    Supplier<AsyncCommand<?, ?, ?>> getHandshakeCommandSupplier() {
-        return handshakeCommandSupplier;
-    }
+    static class PlainChannelInitializer extends ChannelInitializer<Channel> {
+
+        private final Supplier<List<ChannelHandler>> handlers;
+        private final ClientResources clientResources;
+
+        PlainChannelInitializer(Supplier<List<ChannelHandler>> handlers, ClientResources clientResources) {
+            this.handlers = handlers;
+            this.clientResources = clientResources;
+        }
 
-    static byte[] encode(char[] chars) {
+        @Override
+        protected void initChannel(Channel channel) {
+            doInitialize(channel);
+        }
 
-        ByteBuffer encoded = Charset.defaultCharset().encode(CharBuffer.wrap(chars));
-        byte[] bytes = new byte[encoded.remaining()];
-        encoded.get(bytes);
+        private void doInitialize(Channel channel) {
 
-        return bytes;
+            for (ChannelHandler handler : handlers.get()) {
+                channel.pipeline().addLast(handler);
+            }
+
+            clientResources.nettyCustomizer().afterChannelInitialized(channel);
+        }
     }
 }
diff --git a/src/main/java/io/lettuce/core/ConnectionEventTrigger.java b/src/main/java/io/lettuce/core/ConnectionEventTrigger.java
index 2a38b82abb..6bdd41fc2a 100644
--- a/src/main/java/io/lettuce/core/ConnectionEventTrigger.java
+++ b/src/main/java/io/lettuce/core/ConnectionEventTrigger.java
@@ -18,6 +18,7 @@
 import java.net.SocketAddress;
 
 import io.lettuce.core.event.EventBus;
+import io.lettuce.core.event.connection.ConnectionActivatedEvent;
 import io.lettuce.core.event.connection.ConnectionDeactivatedEvent;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
@@ -43,6 +44,7 @@ class ConnectionEventTrigger extends ChannelInboundHandlerAdapter {
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
         connectionEvents.fireEventRedisConnected(connection, ctx.channel().remoteAddress());
+        eventBus.publish(new ConnectionActivatedEvent(local(ctx), remote(ctx)));
         super.channelActive(ctx);
     }
 
diff --git a/src/main/java/io/lettuce/core/ConnectionEvents.java b/src/main/java/io/lettuce/core/ConnectionEvents.java
index e0356db7ba..53f8b5033e 100644
--- a/src/main/java/io/lettuce/core/ConnectionEvents.java
+++ b/src/main/java/io/lettuce/core/ConnectionEvents.java
@@ -19,8 +19,6 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import io.lettuce.core.protocol.RedisCommand;
-
 /**
  * Close Events Facility. Can register/unregister CloseListener and fire a closed event to all registered listeners. This class
  * is part of the internal API and may change without further notice.
@@ -64,28 +62,6 @@ public void removeListener(RedisConnectionStateListener listener) {
     public static class Reset {
     }
 
-    /**
-     * Internal event when a channel is activated.
-     */
-    public static class Activated {
-    }
-
-    /**
-     * Internal event when a channel is activated.
-     */
-    public static class HandshakeEvent {
-
-        private final RedisCommand<?, ?, ?> command;
-
-        public HandshakeEvent(RedisCommand<?, ?, ?> command) {
-            this.command = command;
-        }
-
-        public RedisCommand<?, ?, ?> getCommand() {
-            return command;
-        }
-    }
-
     /**
      * Internal event when a reconnect is initiated.
      */
diff --git a/src/main/java/io/lettuce/core/ConnectionState.java b/src/main/java/io/lettuce/core/ConnectionState.java
new file mode 100644
index 0000000000..e2cb65b91a
--- /dev/null
+++ b/src/main/java/io/lettuce/core/ConnectionState.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.protocol.*;
+import io.netty.channel.Channel;
+
+/**
+ * Internal connection state representing the requested {@link ProtocolVersion} and other options for connection initialization
+ * and connection state restoration. This class is part of the internal API.
+ *
+ * @author Mark Paluch
+ * @since 6.0
+ */
+public class ConnectionState implements ConnectionInitializer {
+
+    private final RedisCommandBuilder<String, String> commandBuilder = new RedisCommandBuilder<>(StringCodec.UTF8);
+
+    private ProtocolVersion requested;
+    private boolean pingOnConnect;
+
+    private volatile String username;
+    private volatile char[] password;
+    private volatile int db;
+    private volatile boolean readOnly;
+    private volatile String clientName;
+
+    public void setRequestedProtocolVersion(ProtocolVersion requested) {
+        this.requested = requested;
+    }
+
+    public void setPingOnConnect(boolean pingOnConnect) {
+        this.pingOnConnect = pingOnConnect;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public void setPassword(char[] password) {
+        this.password = password;
+    }
+
+    public void setDb(int db) {
+        this.db = db;
+    }
+
+    private boolean hasPassword() {
+        return this.password != null && this.password.length > 0;
+    }
+
+    public void setReadOnly(boolean readOnly) {
+        this.readOnly = readOnly;
+    }
+
+    public void setClientName(String clientName) {
+        this.clientName = clientName;
+    }
+
+    @Override
+    public CompletionStage<Void> initialize(Channel channel) {
+
+        CompletableFuture<?> handshake;
+
+        List<RedisCommand<?, ?, ?>> postHandshake = new ArrayList<>();
+
+        if (this.requested == ProtocolVersion.RESP2) {
+            handshake = initiateHandshakeResp2(channel);
+
+            if (this.clientName != null) {
+                postHandshake.add(this.commandBuilder.clientSetname(this.clientName));
+            }
+        } else if (this.requested == ProtocolVersion.RESP3) {
+            handshake = initiateHandshakeResp3(channel);
+        } else {
+            handshake = new CompletableFuture<>();
+            handshake.completeExceptionally(
+                    new RedisConnectionException("Protocol version" + this.requested + " not supported"));
+        }
+
+        if (this.db > 0) {
+            postHandshake.add(this.commandBuilder.select(this.db));
+        }
+
+        if (this.readOnly) {
+            postHandshake.add(this.commandBuilder.readOnly());
+        }
+
+        if (!postHandshake.isEmpty()) {
+
+            List<AsyncCommand<?, ?, ?>> commands = new ArrayList<>();
+
+            for (RedisCommand<?, ?, ?> redisCommand : postHandshake) {
+
+                AsyncCommand<?, ?, ?> async = new AsyncCommand<>(redisCommand);
+                handshake = handshake.thenCompose(o -> async);
+                commands.add(async);
+            }
+
+            channel.writeAndFlush(commands);
+        }
+
+        return handshake.thenRun(() -> {
+        });
+    }
+
+    /**
+     * Perform a RESP2 Handshake: Issue a {@code PING} or {@code AUTH}.
+     *
+     * @param channel
+     * @return
+     */
+    private CompletableFuture<?> initiateHandshakeResp2(Channel channel) {
+
+        if (hasPassword()) {
+            return dispatch(channel, this.commandBuilder.auth(this.password));
+        } else if (this.pingOnConnect) {
+            return dispatch(channel, this.commandBuilder.ping());
+        }
+
+        return CompletableFuture.completedFuture(null);
+    }
+
+    /**
+     * Perform a RESP3 Handshake: Issue a {@code HELLO}.
+     *
+     * @param channel
+     * @return
+     */
+    private CompletableFuture<Map<String, Object>> initiateHandshakeResp3(Channel channel) {
+
+        if (hasPassword()) {
+
+            return dispatch(channel, this.commandBuilder.hello(3,
+                    LettuceStrings.isNotEmpty(this.username) ? this.username : "default", this.password, this.clientName));
+        }
+
+        return dispatch(channel, this.commandBuilder.hello(3, null, null, this.clientName));
+    }
+
+    private <T> AsyncCommand<String, String, T> dispatch(Channel channel, Command<String, String, T> command) {
+
+        AsyncCommand<String, String, T> future = new AsyncCommand<>(command);
+
+        channel.writeAndFlush(future).addListener(writeFuture -> {
+
+            if (!writeFuture.isSuccess()) {
+                future.completeExceptionally(writeFuture.cause());
+            }
+        });
+        return future;
+    }
+}
diff --git a/src/main/java/io/lettuce/core/PlainChannelInitializer.java b/src/main/java/io/lettuce/core/PlainChannelInitializer.java
deleted file mode 100644
index 5b0e742d1e..0000000000
--- a/src/main/java/io/lettuce/core/PlainChannelInitializer.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright 2011-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core;
-
-import static io.lettuce.core.ConnectionEventTrigger.local;
-import static io.lettuce.core.ConnectionEventTrigger.remote;
-
-import java.time.Duration;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-
-import io.lettuce.core.ConnectionEvents.HandshakeEvent;
-import io.lettuce.core.event.connection.ConnectedEvent;
-import io.lettuce.core.event.connection.ConnectionActivatedEvent;
-import io.lettuce.core.event.connection.DisconnectedEvent;
-import io.lettuce.core.protocol.AsyncCommand;
-import io.lettuce.core.resource.ClientResources;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.util.Timeout;
-
-/**
- * @author Mark Paluch
- */
-class PlainChannelInitializer extends io.netty.channel.ChannelInitializer<Channel> implements RedisChannelInitializer {
-
-    private final Supplier<List<ChannelHandler>> handlers;
-    private final Supplier<AsyncCommand<?, ?, ?>> handshakeCommandSupplier;
-    private final ClientResources clientResources;
-    private final Duration timeout;
-
-    private volatile CompletableFuture<Boolean> initializedFuture = new CompletableFuture<>();
-
-    PlainChannelInitializer(Supplier<AsyncCommand<?, ?, ?>> handshakeCommandSupplier, Supplier<List<ChannelHandler>> handlers,
-            ClientResources clientResources, Duration timeout) {
-        this.handshakeCommandSupplier = handshakeCommandSupplier;
-        this.handlers = handlers;
-        this.clientResources = clientResources;
-        this.timeout = timeout;
-    }
-
-    @Override
-    protected void initChannel(Channel channel) throws Exception {
-        doInitialize(channel);
-    }
-
-    private void doInitialize(Channel channel) {
-
-        if (channel.pipeline().get("channelActivator") == null) {
-
-            channel.pipeline().addLast("channelActivator", new RedisChannelInitializerImpl() {
-
-                private AsyncCommand<?, ?, ?> handshakeCommand;
-
-                @Override
-                public CompletableFuture<Boolean> channelInitialized() {
-                    return initializedFuture;
-                }
-
-                @Override
-                public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-
-                    clientResources.eventBus().publish(new DisconnectedEvent(local(ctx), remote(ctx)));
-
-                    if (!initializedFuture.isDone()) {
-                        initializedFuture.completeExceptionally(new RedisConnectionException("Connection closed prematurely"));
-                    }
-
-                    initializedFuture = new CompletableFuture<>();
-                    handshakeCommand = null;
-                    super.channelInactive(ctx);
-                }
-
-                @Override
-                public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-
-                    if (evt instanceof ConnectionEvents.Activated) {
-                        if (!initializedFuture.isDone()) {
-                            initializedFuture.complete(true);
-                            clientResources.eventBus().publish(new ConnectionActivatedEvent(local(ctx), remote(ctx)));
-                        }
-                    }
-                    super.userEventTriggered(ctx, evt);
-                }
-
-                @Override
-                public void channelActive(final ChannelHandlerContext ctx) throws Exception {
-
-                    clientResources.eventBus().publish(new ConnectedEvent(local(ctx), remote(ctx)));
-
-                    if (ConnectionBuilder.isHandshakeEnabled(handshakeCommandSupplier)) {
-                        handshakeCommand = handshakeCommandSupplier.get();
-                        sendHandshake(handshakeCommand, initializedFuture, ctx, clientResources, timeout);
-                    } else {
-                        super.channelActive(ctx);
-                    }
-                }
-
-                @Override
-                public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-                    if (!initializedFuture.isDone()) {
-                        initializedFuture.completeExceptionally(cause);
-                    }
-                    super.exceptionCaught(ctx, cause);
-                }
-            });
-        }
-
-        for (ChannelHandler handler : handlers.get()) {
-            channel.pipeline().addLast(handler);
-        }
-
-        clientResources.nettyCustomizer().afterChannelInitialized(channel);
-    }
-
-    static void sendHandshake(AsyncCommand<?, ?, ?> cmd, CompletableFuture<Boolean> initializedFuture,
-            ChannelHandlerContext ctx, ClientResources clientResources, Duration timeout) throws Exception {
-
-        ctx.fireUserEventTriggered(new HandshakeEvent(cmd));
-
-        Runnable timeoutGuard = () -> {
-
-            if (cmd.isDone() || initializedFuture.isDone()) {
-                return;
-            }
-
-            initializedFuture.completeExceptionally(
-                    ExceptionFactory.createTimeoutException(String.format("Cannot initialize channel (Handshake %s)", cmd.getType().name()), timeout));
-        };
-
-        Timeout timeoutHandle = clientResources.timer().newTimeout(t -> {
-
-            if (clientResources.eventExecutorGroup().isShuttingDown()) {
-                timeoutGuard.run();
-                return;
-            }
-
-            clientResources.eventExecutorGroup().submit(timeoutGuard);
-        }, timeout.toNanos(), TimeUnit.NANOSECONDS);
-
-        cmd.whenComplete((o, throwable) -> {
-
-            timeoutHandle.cancel();
-
-            if (throwable == null) {
-                ctx.fireChannelActive();
-                initializedFuture.complete(true);
-            } else {
-                initializedFuture.completeExceptionally(throwable);
-            }
-        });
-    }
-
-    @Override
-    public CompletableFuture<Boolean> channelInitialized() {
-        return initializedFuture;
-    }
-
-}
diff --git a/src/main/java/io/lettuce/core/RedisChannelInitializer.java b/src/main/java/io/lettuce/core/RedisChannelInitializer.java
deleted file mode 100644
index be576b2cde..0000000000
--- a/src/main/java/io/lettuce/core/RedisChannelInitializer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2011-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core;
-
-import java.util.concurrent.CompletableFuture;
-
-import io.netty.channel.ChannelHandler;
-
-/**
- * Channel initializer to set up the transport before a Redis connection can be used. This is part of the internal API. This
- * class is part of the internal API.
- *
- * @author Mark Paluch
- */
-public interface RedisChannelInitializer extends ChannelHandler {
-
-    /**
-     * @return future to synchronize channel initialization. Returns a new future for every reconnect.
-     */
-    CompletableFuture<Boolean> channelInitialized();
-}
diff --git a/src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java b/src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java
deleted file mode 100644
index 96c743df56..0000000000
--- a/src/main/java/io/lettuce/core/RedisChannelInitializerImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2011-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core;
-
-import io.netty.channel.ChannelDuplexHandler;
-
-/**
- * Channel initializer to set up the transport before a Redis connection can be used. This class is part of the internal API.
- *
- * @author Mark Paluch
- */
-abstract class RedisChannelInitializerImpl extends ChannelDuplexHandler implements RedisChannelInitializer {
-}
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 19cea5737c..2fa64f3509 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -35,8 +35,10 @@
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.output.StatusOutput;
-import io.lettuce.core.protocol.*;
+import io.lettuce.core.protocol.CommandExpiryWriter;
+import io.lettuce.core.protocol.CommandHandler;
+import io.lettuce.core.protocol.DefaultEndpoint;
+import io.lettuce.core.protocol.Endpoint;
 import io.lettuce.core.pubsub.PubSubCommandHandler;
 import io.lettuce.core.pubsub.PubSubEndpoint;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
@@ -271,7 +273,7 @@ private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandalone
         }
 
         StatefulRedisConnectionImpl<K, V> connection = newStatefulRedisConnection(writer, codec, timeout);
-        ConnectionFuture<StatefulRedisConnection<K, V>> future = connectStatefulAsync(connection, codec, endpoint, redisURI,
+        ConnectionFuture<StatefulRedisConnection<K, V>> future = connectStatefulAsync(connection, endpoint, redisURI,
                 () -> new CommandHandler(clientOptions, clientResources, endpoint));
 
         future.whenComplete((channelHandler, throwable) -> {
@@ -285,8 +287,8 @@ private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandalone
     }
 
     @SuppressWarnings("unchecked")
-    private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnectionImpl<K, V> connection,
-            RedisCodec<K, V> codec, Endpoint endpoint, RedisURI redisURI, Supplier<CommandHandler> commandHandlerSupplier) {
+    private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnectionImpl<K, V> connection, Endpoint endpoint,
+            RedisURI redisURI, Supplier<CommandHandler> commandHandlerSupplier) {
 
         ConnectionBuilder connectionBuilder;
         if (redisURI.isSsl()) {
@@ -297,44 +299,23 @@ private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnecti
             connectionBuilder = ConnectionBuilder.connectionBuilder();
         }
 
+        ConnectionState state = connection.getConnectionState();
+
+        initializeConnectionState(redisURI, state);
+        state.setDb(redisURI.getDatabase());
+
         connectionBuilder.connection(connection);
         connectionBuilder.clientOptions(clientOptions);
         connectionBuilder.clientResources(clientResources);
         connectionBuilder.commandHandler(commandHandlerSupplier).endpoint(endpoint);
 
         connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
+        connectionBuilder.connectionInitializer(state);
         channelType(connectionBuilder, redisURI);
 
         ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
-        ConnectionFuture<?> sync = future;
-
-        if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2) {
-
-            if (!clientOptions.isPingBeforeActivateConnection() && connectionBuilder.hasPassword(redisURI)) {
-                sync = sync.thenCompose(channelHandler -> {
-
-                    CommandArgs<K, V> args = new CommandArgs<>(codec).add(redisURI.getPassword());
-                    return connection.async().dispatch(CommandType.AUTH, new StatusOutput<>(codec), args);
-                });
-            }
-
-            if (LettuceStrings.isNotEmpty(redisURI.getClientName())) {
-                sync = sync.thenApply(channelHandler -> {
-                    connection.setClientName(redisURI.getClientName());
-                    return channelHandler;
-                });
-            }
-        }
-        if (redisURI.getDatabase() != 0) {
-
-            sync = sync.thenCompose(channelHandler -> {
 
-                CommandArgs<K, V> args = new CommandArgs<>(codec).add(redisURI.getDatabase());
-                return connection.async().dispatch(CommandType.SELECT, new StatusOutput<>(codec), args);
-            });
-        }
-
-        return sync.thenApply(channelHandler -> (S) connection);
+        return future.thenApply(channelHandler -> (S) connection);
     }
 
     /**
@@ -422,8 +403,8 @@ private <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubS
 
         StatefulRedisPubSubConnectionImpl<K, V> connection = newStatefulRedisPubSubConnection(endpoint, writer, codec, timeout);
 
-        ConnectionFuture<StatefulRedisPubSubConnection<K, V>> future = connectStatefulAsync(connection, codec, endpoint,
-                redisURI, () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec, endpoint));
+        ConnectionFuture<StatefulRedisPubSubConnection<K, V>> future = connectStatefulAsync(connection, endpoint, redisURI,
+                () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec, endpoint));
 
         return future.whenComplete((conn, throwable) -> {
 
@@ -516,7 +497,7 @@ private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectS
         logger.debug("Trying to get a Redis Sentinel connection for one of: " + redisURI.getSentinels());
 
         if (redisURI.getSentinels().isEmpty() && (isNotEmpty(redisURI.getHost()) || !isEmpty(redisURI.getSocket()))) {
-            return doConnectSentinelAsync(codec, redisURI.getClientName(), redisURI, timeout).toCompletableFuture();
+            return doConnectSentinelAsync(codec, redisURI, timeout).toCompletableFuture();
         }
 
         List<RedisURI> sentinels = redisURI.getSentinels();
@@ -527,10 +508,8 @@ private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectS
 
         for (RedisURI uri : sentinels) {
 
-            String clientName = LettuceStrings.isNotEmpty(uri.getClientName()) ? uri.getClientName() : redisURI.getClientName();
-
             Mono<StatefulRedisSentinelConnection<K, V>> connectionMono = Mono
-                    .fromCompletionStage(() -> doConnectSentinelAsync(codec, clientName, uri, timeout))
+                    .fromCompletionStage(() -> doConnectSentinelAsync(codec, uri, timeout))
                     .onErrorMap(CompletionException.class, Throwable::getCause)
                     .onErrorMap(e -> new RedisConnectionException("Cannot connect Redis Sentinel at " + uri, e))
                     .doOnError(exceptionCollector::add);
@@ -565,7 +544,7 @@ private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectS
     }
 
     private <K, V> ConnectionFuture<StatefulRedisSentinelConnection<K, V>> doConnectSentinelAsync(RedisCodec<K, V> codec,
-            String clientName, RedisURI redisURI, Duration timeout) {
+            RedisURI redisURI, Duration timeout) {
 
         ConnectionBuilder connectionBuilder = ConnectionBuilder.connectionBuilder();
         connectionBuilder.clientOptions(ClientOptions.copyOf(getOptions()));
@@ -579,6 +558,10 @@ private <K, V> ConnectionFuture<StatefulRedisSentinelConnection<K, V>> doConnect
         }
 
         StatefulRedisSentinelConnectionImpl<K, V> connection = newStatefulRedisSentinelConnection(writer, codec, timeout);
+        ConnectionState connectionState = connection.getConnectionState();
+        connectionBuilder.connectionInitializer(connectionState);
+
+        initializeConnectionState(redisURI, connectionState);
 
         logger.debug("Connecting to Redis Sentinel, address: " + redisURI);
 
@@ -589,13 +572,6 @@ private <K, V> ConnectionFuture<StatefulRedisSentinelConnection<K, V>> doConnect
         channelType(connectionBuilder, redisURI);
         ConnectionFuture<?> sync = initializeChannelAsync(connectionBuilder);
 
-        if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2 && LettuceStrings.isNotEmpty(clientName)) {
-            sync = sync.thenApply(channelHandler -> {
-                connection.setClientName(clientName);
-                return channelHandler;
-            });
-        }
-
         return sync.thenApply(ignore -> (StatefulRedisSentinelConnection<K, V>) connection).whenComplete((ignore, e) -> {
 
             if (e != null) {
@@ -770,6 +746,15 @@ private Mono<SocketAddress> lookupRedis(RedisURI sentinelUri) {
         });
     }
 
+    private void initializeConnectionState(RedisURI redisURI, ConnectionState state) {
+
+        state.setRequestedProtocolVersion(clientOptions.getProtocolVersion());
+        state.setPingOnConnect(clientOptions.isPingBeforeActivateConnection());
+        state.setClientName(redisURI.getClientName());
+        state.setUsername(redisURI.getUsername());
+        state.setPassword(redisURI.getPassword());
+    }
+
     private static <T> ConnectionFuture<T> transformAsyncConnectionException(ConnectionFuture<T> future) {
 
         return future.thenCompose((v, e) -> {
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index d6a694c387..241755d381 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -26,7 +26,6 @@
 import io.lettuce.core.XReadArgs.StreamOffset;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.output.*;
 import io.lettuce.core.protocol.*;
@@ -853,7 +852,7 @@ Command<K, V, Long> hdel(K key, K... fields) {
         return createCommand(HDEL, new IntegerOutput<>(codec), args);
     }
 
-    Command<String, String, Map<String, Object>> hello(int protocolVersion, byte[] user, byte password[], byte[] name) {
+    Command<String, String, Map<String, Object>> hello(int protocolVersion, String user, char[] password, String name) {
 
         CommandArgs<String, String> args = new CommandArgs<>(StringCodec.ASCII).add(protocolVersion);
 
diff --git a/src/main/java/io/lettuce/core/SslConnectionBuilder.java b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
index 9e74e6ee4c..ba46439c46 100644
--- a/src/main/java/io/lettuce/core/SslConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
@@ -15,36 +15,22 @@
  */
 package io.lettuce.core;
 
-import static io.lettuce.core.ConnectionEventTrigger.local;
-import static io.lettuce.core.ConnectionEventTrigger.remote;
-import static io.lettuce.core.PlainChannelInitializer.sendHandshake;
-
 import java.io.IOException;
 import java.security.GeneralSecurityException;
-import java.time.Duration;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
 
 import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLHandshakeException;
 import javax.net.ssl.SSLParameters;
 
-import io.lettuce.core.event.connection.ConnectedEvent;
-import io.lettuce.core.event.connection.ConnectionActivatedEvent;
-import io.lettuce.core.event.connection.DisconnectedEvent;
 import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.resource.ClientResources;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInitializer;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.SslHandler;
-import io.netty.handler.ssl.SslHandshakeCompletionEvent;
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
 
 /**
@@ -75,35 +61,23 @@ protected List<ChannelHandler> buildHandlers() {
     }
 
     @Override
-    public RedisChannelInitializer build() {
-
-        return new SslChannelInitializer(getHandshakeCommandSupplier(), this::buildHandlers, redisURI, clientResources(),
-                getTimeout(), clientOptions().getSslOptions());
+    public ChannelInitializer<Channel> build() {
+        return new SslChannelInitializer(this::buildHandlers, redisURI, clientResources(), clientOptions().getSslOptions());
     }
 
-    /**
-     * @author Mark Paluch
-     */
-    static class SslChannelInitializer extends io.netty.channel.ChannelInitializer<Channel> implements RedisChannelInitializer {
+    static class SslChannelInitializer extends io.netty.channel.ChannelInitializer<Channel> {
 
-        private final Supplier<AsyncCommand<?, ?, ?>> handshakeCommandSupplier;
         private final Supplier<List<ChannelHandler>> handlers;
         private final RedisURI redisURI;
         private final ClientResources clientResources;
-        private final Duration timeout;
         private final SslOptions sslOptions;
 
-        private volatile CompletableFuture<Boolean> initializedFuture = new CompletableFuture<>();
-
-        public SslChannelInitializer(Supplier<AsyncCommand<?, ?, ?>> handshakeCommandSupplier,
-                Supplier<List<ChannelHandler>> handlers, RedisURI redisURI, ClientResources clientResources, Duration timeout,
-                SslOptions sslOptions) {
+        public SslChannelInitializer(Supplier<List<ChannelHandler>> handlers, RedisURI redisURI,
+                ClientResources clientResources, SslOptions sslOptions) {
 
-            this.handshakeCommandSupplier = handshakeCommandSupplier;
             this.handlers = handlers;
             this.redisURI = redisURI;
             this.clientResources = clientResources;
-            this.timeout = timeout;
             this.sslOptions = sslOptions;
         }
 
@@ -114,7 +88,7 @@ protected void initChannel(Channel channel) throws Exception {
 
         private void doInitialize(Channel channel) throws IOException, GeneralSecurityException {
 
-             SSLParameters sslParams = sslOptions.createSSLParameters();
+            SSLParameters sslParams = sslOptions.createSSLParameters();
             SslContextBuilder sslContextBuilder = sslOptions.createSslContextBuilder();
 
             if (redisURI.isVerifyPeer()) {
@@ -128,103 +102,14 @@ private void doInitialize(Channel channel) throws IOException, GeneralSecurityEx
             SSLEngine sslEngine = sslContext.newEngine(channel.alloc(), redisURI.getHost(), redisURI.getPort());
             sslEngine.setSSLParameters(sslParams);
 
-            if (channel.pipeline().get("first") == null) {
-                channel.pipeline().addFirst("first", new ChannelDuplexHandler() {
-
-                    @Override
-                    public void channelActive(ChannelHandlerContext ctx) throws Exception {
-                        clientResources.eventBus().publish(new ConnectedEvent(local(ctx), remote(ctx)));
-                        super.channelActive(ctx);
-                    }
-
-                    @Override
-                    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-                        clientResources.eventBus().publish(new DisconnectedEvent(local(ctx), remote(ctx)));
-                        super.channelInactive(ctx);
-                    }
-                });
-            }
-
             SslHandler sslHandler = new SslHandler(sslEngine, redisURI.isStartTls());
             channel.pipeline().addLast(sslHandler);
 
-            if (channel.pipeline().get("channelActivator") == null) {
-                channel.pipeline().addLast("channelActivator", new RedisChannelInitializerImpl() {
-
-                    private AsyncCommand<?, ?, ?> handshakeCommand;
-
-                    @Override
-                    public CompletableFuture<Boolean> channelInitialized() {
-                        return initializedFuture;
-                    }
-
-                    @Override
-                    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-
-                        if (!initializedFuture.isDone()) {
-                            initializedFuture
-                                    .completeExceptionally(new RedisConnectionException("Connection closed prematurely"));
-                        }
-
-                        initializedFuture = new CompletableFuture<>();
-                        handshakeCommand = null;
-                        super.channelInactive(ctx);
-                    }
-
-                    @Override
-                    public void channelActive(ChannelHandlerContext ctx) throws Exception {
-                        if (initializedFuture.isDone()) {
-                            super.channelActive(ctx);
-                        }
-                    }
-
-                    @Override
-                    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-                        if (evt instanceof SslHandshakeCompletionEvent && !initializedFuture.isDone()) {
-
-                            SslHandshakeCompletionEvent event = (SslHandshakeCompletionEvent) evt;
-                            if (event.isSuccess()) {
-                                if (ConnectionBuilder.isHandshakeEnabled(handshakeCommandSupplier)) {
-                                    handshakeCommand = handshakeCommandSupplier.get();
-                                    sendHandshake(handshakeCommand, initializedFuture, ctx, clientResources, timeout);
-                                } else {
-                                    ctx.fireChannelActive();
-                                }
-                            } else {
-                                initializedFuture.completeExceptionally(event.cause());
-                            }
-                        }
-
-                        if (evt instanceof ConnectionEvents.Activated) {
-                            if (!initializedFuture.isDone()) {
-                                initializedFuture.complete(true);
-                                clientResources.eventBus().publish(new ConnectionActivatedEvent(local(ctx), remote(ctx)));
-                            }
-                        }
-
-                        super.userEventTriggered(ctx, evt);
-                    }
-
-                    @Override
-                    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-                        if (cause instanceof SSLHandshakeException || cause.getCause() instanceof SSLException) {
-                            initializedFuture.completeExceptionally(cause);
-                        }
-                        super.exceptionCaught(ctx, cause);
-                    }
-                });
-            }
-
             for (ChannelHandler handler : handlers.get()) {
                 channel.pipeline().addLast(handler);
             }
 
             clientResources.nettyCustomizer().afterChannelInitialized(channel);
         }
-
-        @Override
-        public CompletableFuture<Boolean> channelInitialized() {
-            return initializedFuture;
-        }
     }
 }
diff --git a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
index d14ce456c7..7a588c4513 100644
--- a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
@@ -50,12 +50,9 @@ public class StatefulRedisConnectionImpl<K, V> extends RedisChannelHandler<K, V>
     protected final RedisCommands<K, V> sync;
     protected final RedisAsyncCommandsImpl<K, V> async;
     protected final RedisReactiveCommandsImpl<K, V> reactive;
+    private final ConnectionState state = new ConnectionState();
 
     protected MultiOutput<K, V> multi;
-    private char[] password;
-    private int db;
-    private boolean readOnly;
-    private String clientName;
 
     /**
      * Initialize a new connection.
@@ -121,28 +118,6 @@ public boolean isMulti() {
         return multi != null;
     }
 
-    @Override
-    public void activated() {
-
-        super.activated();
-        // do not block in here, since the channel flow will be interrupted.
-        if (password != null) {
-            async.auth(password);
-        }
-
-        if (db != 0) {
-            async.select(db);
-        }
-
-        if (clientName != null) {
-            setClientName(clientName);
-        }
-
-        if (readOnly) {
-            async.readOnly();
-        }
-    }
-
     @Override
     public <T> RedisCommand<K, V, T> dispatch(RedisCommand<K, V, T> command) {
 
@@ -185,12 +160,12 @@ protected <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> comm
                     char[] password = CommandArgsAccessor.getFirstCharArray(command.getArgs());
 
                     if (password != null) {
-                        this.password = password;
+                        state.setPassword(password);
                     } else {
 
                         String stringPassword = CommandArgsAccessor.getFirstString(command.getArgs());
                         if (stringPassword != null) {
-                            this.password = stringPassword.toCharArray();
+                            state.setPassword(stringPassword.toCharArray());
                         }
                     }
                 }
@@ -202,7 +177,7 @@ protected <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> comm
                 if ("OK".equals(status)) {
                     Long db = CommandArgsAccessor.getFirstInteger(command.getArgs());
                     if (db != null) {
-                        this.db = db.intValue();
+                        state.setDb(db.intValue());
                     }
                 }
             });
@@ -211,7 +186,7 @@ protected <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> comm
         if (local.getType().name().equals(READONLY.name())) {
             local = attachOnComplete(local, status -> {
                 if ("OK".equals(status)) {
-                    this.readOnly = true;
+                    state.setReadOnly(true);
                 }
             });
         }
@@ -219,7 +194,7 @@ protected <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> comm
         if (local.getType().name().equals(READWRITE.name())) {
             local = attachOnComplete(local, status -> {
                 if ("OK".equals(status)) {
-                    this.readOnly = false;
+                    state.setReadOnly(false);
                 }
             });
         }
@@ -256,13 +231,22 @@ private <T> RedisCommand<K, V, T> attachOnComplete(RedisCommand<K, V, T> command
         return command;
     }
 
+    /**
+     * @param clientName
+     * @deprecated since 6.0, use {@link RedisAsyncCommands#clientSetname(Object)}.
+     */
+    @Deprecated
     public void setClientName(String clientName) {
 
         CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.SETNAME).addValue(clientName);
-        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.CLIENT, new StatusOutput<>(
-                StringCodec.UTF8), args));
-        this.clientName = clientName;
+        AsyncCommand<String, String, String> async = new AsyncCommand<>(
+                new Command<>(CommandType.CLIENT, new StatusOutput<>(StringCodec.UTF8), args));
+        state.setClientName(clientName);
 
         dispatch((RedisCommand) async);
     }
+
+    public ConnectionState getConnectionState() {
+        return state;
+    }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/RedisState.java b/src/main/java/io/lettuce/core/cluster/CommandSet.java
similarity index 94%
rename from src/main/java/io/lettuce/core/cluster/RedisState.java
rename to src/main/java/io/lettuce/core/cluster/CommandSet.java
index 34ba42011f..21a4a4cee7 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisState.java
+++ b/src/main/java/io/lettuce/core/cluster/CommandSet.java
@@ -24,17 +24,17 @@
 /**
  * Value object representing the current Redis state regarding its commands.
  * <p>
- * {@link RedisState} caches command details and uses {@link CommandType}.
+ * {@link CommandSet} caches command details and uses {@link CommandType}.
  *
  * @author Mark Paluch
  * @since 4.4
  */
-class RedisState {
+class CommandSet {
 
     private final Map<String, CommandDetail> commands;
     private final EnumSet<CommandType> availableCommands = EnumSet.noneOf(CommandType.class);
 
-    public RedisState(Collection<CommandDetail> commands) {
+    public CommandSet(Collection<CommandDetail> commands) {
 
         Map<String, CommandDetail> map = new HashMap<>();
 
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index 3db79f3212..b1c74e398b 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -649,8 +649,8 @@ private RedisClusterAsyncCommands<K, V> findConnectionBySlot(int slot) {
         return null;
     }
 
-    private RedisState getRedisState() {
-        return ((StatefulRedisClusterConnectionImpl<K, V>) super.getConnection()).getState();
+    private CommandSet getRedisState() {
+        return ((StatefulRedisClusterConnectionImpl<K, V>) super.getConnection()).getCommandSet();
     }
 
     private boolean hasRedisState() {
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index b117adc549..3097b05034 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -573,8 +573,8 @@ private Mono<RedisClusterReactiveCommands<K, V>> findConnectionBySlotReactive(in
         return Mono.error(new RedisException("No partition for slot " + slot));
     }
 
-    private RedisState getRedisState() {
-        return ((StatefulRedisClusterConnectionImpl<K, V>) super.getConnection()).getState();
+    private CommandSet getRedisState() {
+        return ((StatefulRedisClusterConnectionImpl<K, V>) super.getConnection()).getCommandSet();
     }
 
     private boolean hasRedisState() {
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 16db9b4ed3..332f9a567c 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -53,7 +53,6 @@
 import io.lettuce.core.protocol.CommandExpiryWriter;
 import io.lettuce.core.protocol.CommandHandler;
 import io.lettuce.core.protocol.DefaultEndpoint;
-import io.lettuce.core.protocol.ProtocolVersion;
 import io.lettuce.core.pubsub.PubSubCommandHandler;
 import io.lettuce.core.pubsub.PubSubEndpoint;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
@@ -498,7 +497,7 @@ <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisC
 
         StatefulRedisConnectionImpl<K, V> connection = new StatefulRedisConnectionImpl<>(writer, codec, timeout);
 
-        ConnectionFuture<StatefulRedisConnection<K, V>> connectionFuture = connectStatefulAsync(connection, codec, endpoint,
+        ConnectionFuture<StatefulRedisConnection<K, V>> connectionFuture = connectStatefulAsync(connection, endpoint,
                 getFirstUri(), socketAddressSupplier, () -> new CommandHandler(clientOptions, clientResources, endpoint));
 
         return connectionFuture.whenComplete((conn, throwable) -> {
@@ -539,7 +538,7 @@ <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNode
         StatefulRedisPubSubConnectionImpl<K, V> connection = new StatefulRedisPubSubConnectionImpl<>(endpoint, writer, codec,
                 timeout);
 
-        ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectionFuture = connectStatefulAsync(connection, codec,
+        ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectionFuture = connectStatefulAsync(connection,
                 endpoint, getFirstUri(), socketAddressSupplier,
                 () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec, endpoint));
         return connectionFuture.whenComplete((conn, throwable) -> {
@@ -593,30 +592,39 @@ private <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectCl
         Supplier<CommandHandler> commandHandlerSupplier = () -> new CommandHandler(clientOptions, clientResources, endpoint);
 
         Mono<StatefulRedisClusterConnectionImpl<K, V>> connectionMono = Mono
-                .defer(() -> connect(socketAddressSupplier, codec, endpoint, connection, commandHandlerSupplier));
+                .defer(() -> connect(socketAddressSupplier, endpoint, connection, commandHandlerSupplier));
 
         for (int i = 1; i < getConnectionAttempts(); i++) {
             connectionMono = connectionMono
-                    .onErrorResume(t -> connect(socketAddressSupplier, codec, endpoint, connection, commandHandlerSupplier));
+                    .onErrorResume(t -> connect(socketAddressSupplier, endpoint, connection, commandHandlerSupplier));
         }
 
         return connectionMono.flatMap(c -> c.reactive().command().collectList()
                 //
                 .map(CommandDetailParser::parse)
                 //
-                .doOnNext(detail -> c.setState(new RedisState(detail)))
+                .doOnNext(detail -> c.setCommandSet(new CommandSet(detail)))
                 //
-                .doOnError(e -> c.setState(new RedisState(Collections.emptyList()))).then(Mono.just(c))
+                .doOnError(e -> c.setCommandSet(new CommandSet(Collections.emptyList()))).then(Mono.just(c))
                 .onErrorResume(RedisCommandExecutionException.class, e -> Mono.just(c)))
                 .doOnNext(
                         c -> connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider))
                 .map(it -> (StatefulRedisClusterConnection<K, V>) it).toFuture();
     }
 
-    private <T, K, V> Mono<T> connect(Mono<SocketAddress> socketAddressSupplier, RedisCodec<K, V> codec,
-            DefaultEndpoint endpoint, RedisChannelHandler<K, V> connection, Supplier<CommandHandler> commandHandlerSupplier) {
+    private <T, K, V> Mono<T> connect(Mono<SocketAddress> socketAddressSupplier, DefaultEndpoint endpoint,
+            StatefulRedisClusterConnectionImpl<K, V> connection, Supplier<CommandHandler> commandHandlerSupplier) {
 
-        ConnectionFuture<T> future = connectStatefulAsync(connection, codec, endpoint, getFirstUri(), socketAddressSupplier,
+        ConnectionFuture<T> future = connectStatefulAsync(connection, endpoint, getFirstUri(), socketAddressSupplier,
+                commandHandlerSupplier);
+
+        return Mono.fromCompletionStage(future).doOnError(t -> logger.warn(t.getMessage()));
+    }
+
+    private <T, K, V> Mono<T> connect(Mono<SocketAddress> socketAddressSupplier, DefaultEndpoint endpoint,
+            StatefulRedisConnectionImpl<K, V> connection, Supplier<CommandHandler> commandHandlerSupplier) {
+
+        ConnectionFuture<T> future = connectStatefulAsync(connection, endpoint, getFirstUri(), socketAddressSupplier,
                 commandHandlerSupplier);
 
         return Mono.fromCompletionStage(future).doOnError(t -> logger.warn(t.getMessage()));
@@ -667,19 +675,19 @@ private <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> con
                 codec, endpoint);
 
         Mono<StatefulRedisClusterPubSubConnectionImpl<K, V>> connectionMono = Mono
-                .defer(() -> connect(socketAddressSupplier, codec, endpoint, connection, commandHandlerSupplier));
+                .defer(() -> connect(socketAddressSupplier, endpoint, connection, commandHandlerSupplier));
 
         for (int i = 1; i < getConnectionAttempts(); i++) {
             connectionMono = connectionMono
-                    .onErrorResume(t -> connect(socketAddressSupplier, codec, endpoint, connection, commandHandlerSupplier));
+                    .onErrorResume(t -> connect(socketAddressSupplier, endpoint, connection, commandHandlerSupplier));
         }
 
         return connectionMono.flatMap(c -> c.reactive().command().collectList()
                 //
                 .map(CommandDetailParser::parse)
                 //
-                .doOnNext(detail -> c.setState(new RedisState(detail)))
-                .doOnError(e -> c.setState(new RedisState(Collections.emptyList()))).then(Mono.just(c))
+                .doOnNext(detail -> c.setCommandSet(new CommandSet(detail)))
+                .doOnError(e -> c.setCommandSet(new CommandSet(Collections.emptyList()))).then(Mono.just(c))
                 .onErrorResume(RedisCommandExecutionException.class, e -> Mono.just(c)))
                 .doOnNext(
                         c -> connection.registerCloseables(closeableResources, clusterWriter, pooledClusterConnectionProvider))
@@ -694,39 +702,37 @@ private int getConnectionAttempts() {
      * Initiates a channel connection considering {@link ClientOptions} initialization options, authentication and client name
      * options.
      */
-    private <K, V, T extends RedisChannelHandler<K, V>, S> ConnectionFuture<S> connectStatefulAsync(T connection,
-            RedisCodec<K, V> codec, DefaultEndpoint endpoint, RedisURI connectionSettings,
+    private <K, V, T extends StatefulRedisClusterConnectionImpl<K, V>, S> ConnectionFuture<S> connectStatefulAsync(T connection,
+            DefaultEndpoint endpoint, RedisURI connectionSettings,
             Mono<SocketAddress> socketAddressSupplier, Supplier<CommandHandler> commandHandlerSupplier) {
 
-        ConnectionBuilder connectionBuilder = createConnectionBuilder(connection, endpoint, connectionSettings,
+        ConnectionBuilder connectionBuilder = createConnectionBuilder(connection, connection.getConnectionState(), endpoint,
+                connectionSettings,
                 socketAddressSupplier, commandHandlerSupplier);
 
         ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
-        ConnectionFuture<?> sync = future;
 
-        if (clientOptions.getProtocolVersion() == ProtocolVersion.RESP2
-                && LettuceStrings.isNotEmpty(connectionSettings.getClientName())) {
-            sync = sync.thenApply(channelHandler -> {
+        return future.thenApply(channelHandler -> (S) connection);
+    }
 
-                if (connection instanceof StatefulRedisClusterConnectionImpl) {
-                    ((StatefulRedisClusterConnectionImpl) connection).setClientName(connectionSettings.getClientName());
-                }
+    /**
+     * Initiates a channel connection considering {@link ClientOptions} initialization options, authentication and client name
+     * options.
+     */
+    private <K, V, T extends StatefulRedisConnectionImpl<K, V>, S> ConnectionFuture<S> connectStatefulAsync(T connection,
+            DefaultEndpoint endpoint, RedisURI connectionSettings, Mono<SocketAddress> socketAddressSupplier,
+            Supplier<CommandHandler> commandHandlerSupplier) {
 
-                if (connection instanceof StatefulRedisConnectionImpl) {
-                    ((StatefulRedisConnectionImpl) connection).setClientName(connectionSettings.getClientName());
-                }
-                return channelHandler;
-            });
-        }
+        ConnectionBuilder connectionBuilder = createConnectionBuilder(connection, connection.getConnectionState(), endpoint,
+                connectionSettings, socketAddressSupplier, commandHandlerSupplier);
 
-        return sync.thenApply(channelHandler -> (S) connection);
-    }
+        ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
 
-    private boolean hasPassword(RedisURI connectionSettings) {
-        return connectionSettings.getPassword() != null && connectionSettings.getPassword().length != 0;
+        return future.thenApply(channelHandler -> (S) connection);
     }
 
-    private <K, V> ConnectionBuilder createConnectionBuilder(RedisChannelHandler<K, V> connection, DefaultEndpoint endpoint,
+    private <K, V> ConnectionBuilder createConnectionBuilder(RedisChannelHandler<K, V> connection, ConnectionState state,
+            DefaultEndpoint endpoint,
             RedisURI connectionSettings, Mono<SocketAddress> socketAddressSupplier,
             Supplier<CommandHandler> commandHandlerSupplier) {
 
@@ -739,10 +745,18 @@ private <K, V> ConnectionBuilder createConnectionBuilder(RedisChannelHandler<K,
             connectionBuilder = ConnectionBuilder.connectionBuilder();
         }
 
+        state.setRequestedProtocolVersion(clientOptions.getProtocolVersion());
+        state.setPingOnConnect(clientOptions.isPingBeforeActivateConnection());
+
+        state.setClientName(connectionSettings.getClientName());
+        state.setUsername(connectionSettings.getUsername());
+        state.setPassword(connectionSettings.getPassword());
+
         connectionBuilder.reconnectionListener(new ReconnectEventListener(clusterTopologyRefreshScheduler));
         connectionBuilder.clientOptions(clientOptions);
         connectionBuilder.connection(connection);
         connectionBuilder.clientResources(clientResources);
+        connectionBuilder.connectionInitializer(state);
         connectionBuilder.endpoint(endpoint);
         connectionBuilder.commandHandler(commandHandlerSupplier);
         connectionBuilder(socketAddressSupplier, connectionBuilder, connectionSettings);
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
index 3c1ee740a0..102c1c1f41 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
@@ -64,7 +64,7 @@ public RedisClusterPubSubAsyncCommandsImpl(StatefulRedisPubSubConnection<K, V> c
     @Override
     public RedisFuture<Set<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
 
-        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+        if (getStatefulConnection().getCommandSet().hasCommand(CommandType.GEORADIUS_RO)) {
             return super.georadius_ro(key, longitude, latitude, distance, unit);
         }
 
@@ -75,7 +75,7 @@ public RedisFuture<Set<V>> georadius(K key, double longitude, double latitude, d
     public RedisFuture<List<GeoWithin<V>>> georadius(K key, double longitude, double latitude, double distance,
             GeoArgs.Unit unit, GeoArgs geoArgs) {
 
-        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+        if (getStatefulConnection().getCommandSet().hasCommand(CommandType.GEORADIUS_RO)) {
             return super.georadius_ro(key, longitude, latitude, distance, unit, geoArgs);
         }
 
@@ -85,7 +85,7 @@ public RedisFuture<List<GeoWithin<V>>> georadius(K key, double longitude, double
     @Override
     public RedisFuture<Set<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit) {
 
-        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUSBYMEMBER_RO)) {
+        if (getStatefulConnection().getCommandSet().hasCommand(CommandType.GEORADIUSBYMEMBER_RO)) {
             return super.georadiusbymember_ro(key, member, distance, unit);
         }
 
@@ -96,7 +96,7 @@ public RedisFuture<Set<V>> georadiusbymember(K key, V member, double distance, G
     public RedisFuture<List<GeoWithin<V>>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit,
             GeoArgs geoArgs) {
 
-        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUSBYMEMBER_RO)) {
+        if (getStatefulConnection().getCommandSet().hasCommand(CommandType.GEORADIUSBYMEMBER_RO)) {
             return super.georadiusbymember_ro(key, member, distance, unit, geoArgs);
         }
 
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
index 458327a5f7..bf7c445f39 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
@@ -63,7 +63,7 @@ public RedisClusterPubSubReactiveCommandsImpl(StatefulRedisPubSubConnection<K, V
     @Override
     public Flux<V> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit) {
 
-        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+        if (getStatefulConnection().getCommandSet().hasCommand(CommandType.GEORADIUS_RO)) {
             return super.georadius_ro(key, longitude, latitude, distance, unit);
         }
 
@@ -74,7 +74,7 @@ public Flux<V> georadius(K key, double longitude, double latitude, double distan
     public Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, GeoArgs.Unit unit,
             GeoArgs geoArgs) {
 
-        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+        if (getStatefulConnection().getCommandSet().hasCommand(CommandType.GEORADIUS_RO)) {
             return super.georadius_ro(key, longitude, latitude, distance, unit, geoArgs);
         }
 
@@ -84,7 +84,7 @@ public Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, do
     @Override
     public Flux<V> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit) {
 
-        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+        if (getStatefulConnection().getCommandSet().hasCommand(CommandType.GEORADIUS_RO)) {
             return super.georadiusbymember_ro(key, member, distance, unit);
         }
 
@@ -94,7 +94,7 @@ public Flux<V> georadiusbymember(K key, V member, double distance, GeoArgs.Unit
     @Override
     public Flux<GeoWithin<V>> georadiusbymember(K key, V member, double distance, GeoArgs.Unit unit, GeoArgs geoArgs) {
 
-        if (getStatefulConnection().getState().hasCommand(CommandType.GEORADIUS_RO)) {
+        if (getStatefulConnection().getCommandSet().hasCommand(CommandType.GEORADIUS_RO)) {
             return super.georadiusbymember_ro(key, member, distance, unit, geoArgs);
         }
 
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
index a11b8d59c5..9bd8d4a365 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
@@ -40,10 +40,11 @@
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.codec.RedisCodec;
-import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.output.StatusOutput;
-import io.lettuce.core.protocol.*;
+import io.lettuce.core.protocol.CommandArgsAccessor;
+import io.lettuce.core.protocol.CompleteableCommand;
+import io.lettuce.core.protocol.ConnectionWatchdog;
+import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * A thread-safe connection to a Redis Cluster. Multiple threads may share one {@link StatefulRedisClusterConnectionImpl}
@@ -54,21 +55,18 @@
  * @author Mark Paluch
  * @since 4.0
  */
-public class StatefulRedisClusterConnectionImpl<K, V> extends RedisChannelHandler<K, V> implements
-        StatefulRedisClusterConnection<K, V> {
-
-    private Partitions partitions;
-
-    private char[] password;
-    private boolean readOnly;
-    private String clientName;
+public class StatefulRedisClusterConnectionImpl<K, V> extends RedisChannelHandler<K, V>
+        implements StatefulRedisClusterConnection<K, V> {
 
     protected final RedisCodec<K, V> codec;
     protected final RedisAdvancedClusterCommands<K, V> sync;
     protected final RedisAdvancedClusterAsyncCommandsImpl<K, V> async;
     protected final RedisAdvancedClusterReactiveCommandsImpl<K, V> reactive;
 
-    private volatile RedisState state;
+    private final ConnectionState connectionState = new ConnectionState();
+
+    private Partitions partitions;
+    private volatile CommandSet commandSet;
 
     /**
      * Initialize a new connection.
@@ -108,12 +106,12 @@ public RedisAdvancedClusterReactiveCommands<K, V> reactive() {
         return reactive;
     }
 
-    RedisState getState() {
-        return state;
+    CommandSet getCommandSet() {
+        return commandSet;
     }
 
-    void setState(RedisState state) {
-        this.state = state;
+    void setCommandSet(CommandSet commandSet) {
+        this.commandSet = commandSet;
     }
 
     private RedisURI lookup(String nodeId) {
@@ -135,8 +133,8 @@ public StatefulRedisConnection<K, V> getConnection(String nodeId) {
             throw new RedisException("NodeId " + nodeId + " does not belong to the cluster");
         }
 
-        return getClusterDistributionChannelWriter().getClusterConnectionProvider().getConnection(
-                ClusterConnectionProvider.Intent.WRITE, nodeId);
+        return getClusterDistributionChannelWriter().getClusterConnectionProvider()
+                .getConnection(ClusterConnectionProvider.Intent.WRITE, nodeId);
     }
 
     @Override
@@ -157,8 +155,8 @@ public CompletableFuture<StatefulRedisConnection<K, V>> getConnectionAsync(Strin
     @Override
     public StatefulRedisConnection<K, V> getConnection(String host, int port) {
 
-        return getClusterDistributionChannelWriter().getClusterConnectionProvider().getConnection(
-                ClusterConnectionProvider.Intent.WRITE, host, port);
+        return getClusterDistributionChannelWriter().getClusterConnectionProvider()
+                .getConnection(ClusterConnectionProvider.Intent.WRITE, host, port);
     }
 
     @Override
@@ -174,34 +172,6 @@ ClusterDistributionChannelWriter getClusterDistributionChannelWriter() {
         return (ClusterDistributionChannelWriter) super.getChannelWriter();
     }
 
-    @Override
-    public void activated() {
-
-        super.activated();
-        // do not block in here, since the channel flow will be interrupted.
-        if (password != null) {
-            async.auth(password);
-        }
-
-        if (clientName != null) {
-            setClientName(clientName);
-        }
-
-        if (readOnly) {
-            async.readOnly();
-        }
-    }
-
-    void setClientName(String clientName) {
-
-        CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.SETNAME).addValue(clientName);
-        AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.CLIENT, new StatusOutput<>(
-                StringCodec.UTF8), args));
-        this.clientName = clientName;
-
-        dispatch((RedisCommand) async);
-    }
-
     @Override
     public <T> RedisCommand<K, V, T> dispatch(RedisCommand<K, V, T> command) {
         return super.dispatch(preProcessCommand(command));
@@ -228,12 +198,12 @@ private <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> comman
                     char[] password = CommandArgsAccessor.getFirstCharArray(command.getArgs());
 
                     if (password != null) {
-                        this.password = password;
+                        this.connectionState.setPassword(password);
                     } else {
 
                         String stringPassword = CommandArgsAccessor.getFirstString(command.getArgs());
                         if (stringPassword != null) {
-                            this.password = stringPassword.toCharArray();
+                            this.connectionState.setPassword(stringPassword.toCharArray());
                         }
                     }
                 }
@@ -243,7 +213,7 @@ private <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> comman
         if (local.getType().name().equals(READONLY.name())) {
             local = attachOnComplete(local, status -> {
                 if (status.equals("OK")) {
-                    this.readOnly = true;
+                    this.connectionState.setReadOnly(true);
                 }
             });
         }
@@ -251,7 +221,7 @@ private <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> comman
         if (local.getType().name().equals(READWRITE.name())) {
             local = attachOnComplete(local, status -> {
                 if (status.equals("OK")) {
-                    this.readOnly = false;
+                    this.connectionState.setReadOnly(false);
                 }
             });
         }
@@ -286,4 +256,8 @@ public void setReadFrom(ReadFrom readFrom) {
     public ReadFrom getReadFrom() {
         return getClusterDistributionChannelWriter().getReadFrom();
     }
+
+    ConnectionState getConnectionState() {
+        return connectionState;
+    }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
index 6d1e083df9..602b05cec6 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
@@ -49,7 +49,7 @@ class StatefulRedisClusterPubSubConnectionImpl<K, V> extends StatefulRedisPubSub
 
     private final PubSubClusterEndpoint<K, V> endpoint;
     private volatile Partitions partitions;
-    private volatile RedisState state;
+    private volatile CommandSet commandSet;
 
     /**
      * Initialize a new connection.
@@ -104,12 +104,12 @@ protected RedisPubSubReactiveCommandsImpl<K, V> newRedisReactiveCommandsImpl() {
         return new RedisClusterPubSubReactiveCommandsImpl<K, V>(this, codec);
     }
 
-    RedisState getState() {
-        return state;
+    CommandSet getCommandSet() {
+        return commandSet;
     }
 
-    void setState(RedisState state) {
-        this.state = state;
+    void setCommandSet(CommandSet commandSet) {
+        this.commandSet = commandSet;
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 3859ae6698..a2379da932 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -15,8 +15,6 @@
  */
 package io.lettuce.core.protocol;
 
-import static io.lettuce.core.ConnectionEvents.Activated;
-import static io.lettuce.core.ConnectionEvents.HandshakeEvent;
 import static io.lettuce.core.ConnectionEvents.Reset;
 
 import java.io.IOException;
@@ -33,6 +31,7 @@
 import io.lettuce.core.output.CommandOutput;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.tracing.TraceContext;
+import io.lettuce.core.tracing.TraceContextProvider;
 import io.lettuce.core.tracing.Tracer;
 import io.lettuce.core.tracing.Tracing;
 import io.netty.buffer.ByteBuf;
@@ -162,6 +161,11 @@ public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
             logger.debug("{} channelRegistered()", logPrefix());
         }
 
+        tracedEndpoint = clientResources.tracing().createEndpoint(ctx.channel().remoteAddress());
+        logPrefix = null;
+        pristine = true;
+        fallbackCommand = null;
+
         setState(LifecycleState.REGISTERED);
 
         buffer = ctx.alloc().directBuffer(8192 * 8);
@@ -207,13 +211,6 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
             channel.config().setAutoRead(true);
         } else if (evt instanceof Reset) {
             reset();
-        } else if (evt instanceof HandshakeEvent) {
-
-            HandshakeEvent handshake = (HandshakeEvent) evt;
-
-            stack.addFirst(handshake.getCommand());
-            ctx.writeAndFlush(handshake.getCommand());
-            return;
         }
 
         super.userEventTriggered(ctx, evt);
@@ -265,11 +262,6 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
 
-        tracedEndpoint = clientResources.tracing().createEndpoint(ctx.channel().remoteAddress());
-        logPrefix = null;
-        pristine = true;
-        fallbackCommand = null;
-
         if (debugEnabled) {
             logger.debug("{} channelActive()", logPrefix());
         }
@@ -277,13 +269,8 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
         setState(LifecycleState.CONNECTED);
 
         endpoint.notifyChannelActive(ctx.channel());
-
         super.channelActive(ctx);
 
-        if (channel != null) {
-            channel.eventLoop().submit((Runnable) () -> channel.pipeline().fireUserEventTriggered(new Activated()));
-        }
-
         if (debugEnabled) {
             logger.debug("{} channelActive() done", logPrefix());
         }
@@ -385,10 +372,10 @@ private void writeSingleCommand(ChannelHandlerContext ctx, RedisCommand<?, ?, ?>
 
         if (tracingEnabled && command instanceof CompleteableCommand) {
 
-            TracedCommand<?, ?, ?> provider = CommandWrapper.unwrap(command, TracedCommand.class);
+            TracedCommand<?, ?, ?> traced = CommandWrapper.unwrap(command, TracedCommand.class);
+            TraceContextProvider provider = (traced == null ? clientResources.tracing().initialTraceContextProvider() : traced);
             Tracer tracer = clientResources.tracing().getTracerProvider().getTracer();
-            TraceContext context = (provider == null ? clientResources.tracing().initialTraceContextProvider() : provider)
-                    .getTraceContext();
+            TraceContext context = provider.getTraceContext();
 
             Tracer.Span span = tracer.nextSpan(context);
             span.name(command.getType().name());
@@ -399,7 +386,10 @@ private void writeSingleCommand(ChannelHandlerContext ctx, RedisCommand<?, ?, ?>
 
             span.remoteEndpoint(tracedEndpoint);
             span.start();
-            provider.setSpan(span);
+
+            if (traced != null) {
+                traced.setSpan(span);
+            }
 
             CompleteableCommand<?> completeableCommand = (CompleteableCommand<?>) command;
             completeableCommand.onComplete((o, throwable) -> {
diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionInitializer.java b/src/main/java/io/lettuce/core/protocol/ConnectionInitializer.java
new file mode 100644
index 0000000000..35dee02322
--- /dev/null
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionInitializer.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.protocol;
+
+import java.util.concurrent.CompletionStage;
+
+import io.netty.channel.Channel;
+
+/**
+ * Initialize a connection to prepare it for usage.
+ *
+ * @author Mark Paluch
+ * @since 6.0
+ */
+public interface ConnectionInitializer {
+
+    /**
+     * Initialize the connection for usage. This method is invoked after establishing the transport connection and before the
+     * connection is used for user-space commands.
+     *
+     * @param channel the {@link Channel} to initialize.
+     * @return the {@link CompletionStage} that completes once the channel is fully initialized.
+     */
+    CompletionStage<Void> initialize(Channel channel);
+}
diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
index 42502548c0..f45e15d7be 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
@@ -128,19 +128,6 @@ public ConnectionWatchdog(Delay reconnectDelay, ClientOptions clientOptions, Boo
         resetReconnectDelay();
     }
 
-    @Override
-    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
-
-        logger.debug("{} userEventTriggered(ctx, {})", logPrefix(), evt);
-
-        if (evt instanceof ConnectionEvents.Activated) {
-            attempts = 0;
-            resetReconnectDelay();
-        }
-
-        super.userEventTriggered(ctx, evt);
-    }
-
     void prepareClose() {
 
         setListenOnChannelInactive(false);
@@ -162,6 +149,8 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
         reconnectScheduleTimeout = null;
         logPrefix = null;
         remoteAddress = channel.remoteAddress();
+        attempts = 0;
+        resetReconnectDelay();
         logPrefix = null;
         logger.debug("{} channelActive()", logPrefix());
 
diff --git a/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
index 4511e6cb79..297526d9f2 100644
--- a/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
@@ -18,22 +18,21 @@
 import java.net.ConnectException;
 import java.net.SocketAddress;
 import java.util.Set;
-import java.util.concurrent.*;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeoutException;
 
 import reactor.core.publisher.Mono;
 import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
 import io.lettuce.core.ClientOptions;
-import io.lettuce.core.RedisChannelInitializer;
 import io.lettuce.core.RedisCommandTimeoutException;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceSets;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.ChannelPromise;
-import io.netty.util.Timeout;
 import io.netty.util.Timer;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -51,13 +50,8 @@ class ReconnectionHandler {
     private final ClientOptions clientOptions;
     private final Bootstrap bootstrap;
     private final Mono<SocketAddress> socketAddressSupplier;
-    private final Timer timer;
-    private final ExecutorService reconnectWorkers;
     private final ConnectionFacade connectionFacade;
 
-    private TimeUnit timeoutUnit = TimeUnit.SECONDS;
-    private long timeout = 60;
-
     private volatile CompletableFuture<Channel> currentFuture;
     private volatile boolean reconnectSuspended;
 
@@ -73,8 +67,6 @@ class ReconnectionHandler {
         this.socketAddressSupplier = socketAddressSupplier;
         this.bootstrap = bootstrap;
         this.clientOptions = clientOptions;
-        this.timer = timer;
-        this.reconnectWorkers = reconnectWorkers;
         this.connectionFacade = connectionFacade;
     }
 
@@ -114,7 +106,6 @@ protected Tuple2<CompletableFuture<Channel>, CompletableFuture<SocketAddress>> r
     private void reconnect0(CompletableFuture<Channel> result, SocketAddress remoteAddress) {
 
         ChannelFuture connectFuture = bootstrap.connect(remoteAddress);
-        ChannelPromise initFuture = connectFuture.channel().newPromise();
 
         logger.debug("Reconnecting to Redis at {}", remoteAddress);
 
@@ -122,103 +113,57 @@ private void reconnect0(CompletableFuture<Channel> result, SocketAddress remoteA
 
             if (t instanceof CancellationException) {
                 connectFuture.cancel(true);
-                initFuture.cancel(true);
-            }
-        });
-
-        initFuture.addListener((ChannelFuture it) -> {
-
-            if (it.cause() != null) {
-
-                connectFuture.cancel(true);
-                close(it.channel());
-                result.completeExceptionally(it.cause());
-            } else {
-                result.complete(connectFuture.channel());
             }
         });
 
-        connectFuture.addListener((ChannelFuture it) -> {
+        connectFuture.addListener(future -> {
 
-            if (it.cause() != null) {
-
-                initFuture.tryFailure(it.cause());
+            if (!future.isSuccess()) {
+                result.completeExceptionally(future.cause());
                 return;
             }
 
-            ChannelPipeline pipeline = it.channel().pipeline();
-            RedisChannelInitializer channelInitializer = pipeline.get(RedisChannelInitializer.class);
-
-            if (channelInitializer == null) {
+            RedisHandshakeHandler handshakeHandler = connectFuture.channel().pipeline().get(RedisHandshakeHandler.class);
 
-                initFuture.tryFailure(new IllegalStateException(
-                        "Reconnection attempt without a RedisChannelInitializer in the channel pipeline"));
+            if (handshakeHandler == null) {
+                result.completeExceptionally(new IllegalStateException("RedisHandshakeHandler not registered"));
                 return;
             }
 
-            channelInitializer.channelInitialized().whenComplete(
-                    (state, throwable) -> {
+            handshakeHandler.channelInitialized().whenComplete((success, throwable) -> {
 
-                        if (throwable != null) {
+                if (throwable != null) {
 
-                            if (isExecutionException(throwable)) {
-                                initFuture.tryFailure(throwable);
-                                return;
-                            }
+                    if (isExecutionException(throwable)) {
+                        result.completeExceptionally(throwable);
+                        return;
+                    }
 
-                            if (clientOptions.isCancelCommandsOnReconnectFailure()) {
-                                connectionFacade.reset();
-                            }
+                    if (clientOptions.isCancelCommandsOnReconnectFailure()) {
+                        connectionFacade.reset();
+                    }
 
-                            if (clientOptions.isSuspendReconnectOnProtocolFailure()) {
+                    if (clientOptions.isSuspendReconnectOnProtocolFailure()) {
 
-                                logger.error("Disabling autoReconnect due to initialization failure", throwable);
-                                setReconnectSuspended(true);
-                            }
+                        logger.error("Disabling autoReconnect due to initialization failure", throwable);
+                        setReconnectSuspended(true);
+                    }
 
-                            initFuture.tryFailure(throwable);
+                    result.completeExceptionally(throwable);
+                    return;
+                }
 
-                            return;
-                        }
+                if (logger.isDebugEnabled()) {
+                    logger.info("Reconnected to {}, Channel {}", remoteAddress,
+                            ChannelLogDescriptor.logDescriptor(connectFuture.channel()));
+                } else {
+                    logger.info("Reconnected to {}", remoteAddress);
+                }
 
-                        if (logger.isDebugEnabled()) {
-                            logger.info("Reconnected to {}, Channel {}", remoteAddress,
-                                    ChannelLogDescriptor.logDescriptor(it.channel()));
-                        } else {
-                            logger.info("Reconnected to {}", remoteAddress);
-                        }
+                result.complete(connectFuture.channel());
+            });
 
-                        initFuture.trySuccess();
-                    });
         });
-
-        Runnable timeoutAction = () -> {
-            initFuture.tryFailure(new TimeoutException(String.format("Reconnection attempt exceeded timeout of %d %s ",
-                    timeout, timeoutUnit)));
-        };
-
-        Timeout timeoutHandle = timer.newTimeout(it -> {
-
-            if (connectFuture.isDone() && initFuture.isDone()) {
-                return;
-            }
-
-            if (reconnectWorkers.isShutdown()) {
-                timeoutAction.run();
-                return;
-            }
-
-            reconnectWorkers.submit(timeoutAction);
-
-        }, this.timeout, timeoutUnit);
-
-        initFuture.addListener(it -> timeoutHandle.cancel());
-    }
-
-    private void close(Channel channel) {
-        if (channel != null) {
-            channel.close();
-        }
     }
 
     boolean isReconnectSuspended() {
@@ -229,14 +174,6 @@ void setReconnectSuspended(boolean reconnectSuspended) {
         this.reconnectSuspended = reconnectSuspended;
     }
 
-    long getTimeout() {
-        return timeout;
-    }
-
-    void setTimeout(long timeout) {
-        this.timeout = timeout;
-    }
-
     void prepareClose() {
 
         CompletableFuture<?> currentFuture = this.currentFuture;
diff --git a/src/main/java/io/lettuce/core/protocol/RedisHandshakeHandler.java b/src/main/java/io/lettuce/core/protocol/RedisHandshakeHandler.java
new file mode 100644
index 0000000000..773d55bf6e
--- /dev/null
+++ b/src/main/java/io/lettuce/core/protocol/RedisHandshakeHandler.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.protocol;
+
+import java.net.SocketAddress;
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
+
+import io.lettuce.core.ExceptionFactory;
+import io.lettuce.core.RedisConnectionException;
+import io.lettuce.core.resource.ClientResources;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.local.LocalAddress;
+import io.netty.util.Timeout;
+
+/**
+ * Handler to initialize a Redis Connection using a {@link ConnectionInitializer}.
+ *
+ * @author Mark Paluch
+ * @since 6.0
+ */
+public class RedisHandshakeHandler extends ChannelInboundHandlerAdapter {
+
+    private final ConnectionInitializer connectionInitializer;
+    private final ClientResources clientResources;
+    private final Duration initializeTimeout;
+
+    private final CompletableFuture<Void> handshakeFuture = new CompletableFuture<>();
+
+    public RedisHandshakeHandler(ConnectionInitializer connectionInitializer, ClientResources clientResources,
+            Duration initializeTimeout) {
+        this.connectionInitializer = connectionInitializer;
+        this.clientResources = clientResources;
+        this.initializeTimeout = initializeTimeout;
+    }
+
+    @Override
+    public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
+
+        Runnable timeoutGuard = () -> {
+
+            if (handshakeFuture.isDone()) {
+                return;
+            }
+
+            fail(ctx, ExceptionFactory.createTimeoutException("Connection initialization timed out", initializeTimeout));
+        };
+
+        Timeout timeoutHandle = clientResources.timer().newTimeout(t -> {
+
+            if (clientResources.eventExecutorGroup().isShuttingDown()) {
+                timeoutGuard.run();
+                return;
+            }
+
+            clientResources.eventExecutorGroup().submit(timeoutGuard);
+        }, initializeTimeout.toNanos(), TimeUnit.NANOSECONDS);
+
+        handshakeFuture.thenAccept(ignore -> {
+            timeoutHandle.cancel();
+        });
+
+        super.channelRegistered(ctx);
+    }
+
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+
+        if (!handshakeFuture.isDone()) {
+            fail(ctx, new RedisConnectionException("Connection closed prematurely"));
+        }
+
+        super.channelInactive(ctx);
+    }
+
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) {
+
+        CompletionStage<Void> future = connectionInitializer.initialize(ctx.channel());
+
+        future.whenComplete((ignore, throwable) -> {
+
+            if (throwable != null) {
+                fail(ctx, throwable);
+            } else {
+                ctx.fireChannelActive();
+                succeed();
+            }
+        });
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+
+        if (!handshakeFuture.isDone()) {
+            fail(ctx, cause);
+        }
+
+        super.exceptionCaught(ctx, cause);
+    }
+
+    /**
+     * Complete the handshake future successfully.
+     */
+    protected void succeed() {
+        handshakeFuture.complete(null);
+    }
+
+    /**
+     * Complete the handshake future with an error and close the channel..
+     */
+    protected void fail(ChannelHandlerContext ctx, Throwable cause) {
+
+        ctx.close().addListener(closeFuture -> {
+            handshakeFuture.completeExceptionally(cause);
+        });
+    }
+
+    /**
+     * @return future to synchronize channel initialization. Returns a new future for every reconnect.
+     */
+    public CompletionStage<Void> channelInitialized() {
+        return handshakeFuture;
+    }
+
+    static SocketAddress remote(ChannelHandlerContext ctx) {
+        if (ctx.channel() != null && ctx.channel().remoteAddress() != null) {
+            return ctx.channel().remoteAddress();
+        }
+        return new LocalAddress("unknown");
+    }
+
+    static SocketAddress local(ChannelHandlerContext ctx) {
+        Channel channel = ctx.channel();
+        if (channel != null && channel.localAddress() != null) {
+            return channel.localAddress();
+        }
+        return LocalAddress.ANY;
+    }
+}
diff --git a/src/main/java/io/lettuce/core/protocol/SslRedisHandshakeHandler.java b/src/main/java/io/lettuce/core/protocol/SslRedisHandshakeHandler.java
new file mode 100644
index 0000000000..2c2aeb7d5b
--- /dev/null
+++ b/src/main/java/io/lettuce/core/protocol/SslRedisHandshakeHandler.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.protocol;
+
+import java.time.Duration;
+
+import io.lettuce.core.resource.ClientResources;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.ssl.SslHandshakeCompletionEvent;
+
+/**
+ * Handler to initialize a secure Redis Connection using a {@link ConnectionInitializer}. Delays channel activation to after the
+ * SSL handshake.
+ *
+ * @author Mark Paluch
+ * @since 6.0
+ */
+public class SslRedisHandshakeHandler extends RedisHandshakeHandler {
+
+    public SslRedisHandshakeHandler(ConnectionInitializer connectionInitializer, ClientResources clientResources,
+            Duration initializeTimeout) {
+        super(connectionInitializer, clientResources, initializeTimeout);
+    }
+
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+
+        if (evt instanceof SslHandshakeCompletionEvent) {
+
+            SslHandshakeCompletionEvent event = (SslHandshakeCompletionEvent) evt;
+            if (event.isSuccess()) {
+                super.channelActive(ctx);
+            } else {
+                fail(ctx, event.cause());
+            }
+        }
+
+        super.userEventTriggered(ctx, evt);
+    }
+
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) {
+        // do not propagate channel active when using SSL.
+    }
+}
diff --git a/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
index d7ae64d367..5f882f2b4b 100644
--- a/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
@@ -18,6 +18,7 @@
 import java.time.Duration;
 import java.util.Collection;
 
+import io.lettuce.core.ConnectionState;
 import io.lettuce.core.RedisChannelHandler;
 import io.lettuce.core.RedisChannelWriter;
 import io.lettuce.core.codec.RedisCodec;
@@ -32,15 +33,15 @@
 /**
  * @author Mark Paluch
  */
-public class StatefulRedisSentinelConnectionImpl<K, V> extends RedisChannelHandler<K, V> implements
-        StatefulRedisSentinelConnection<K, V> {
+public class StatefulRedisSentinelConnectionImpl<K, V> extends RedisChannelHandler<K, V>
+        implements StatefulRedisSentinelConnection<K, V> {
 
     protected final RedisCodec<K, V> codec;
     protected final RedisSentinelCommands<K, V> sync;
     protected final RedisSentinelAsyncCommands<K, V> async;
     protected final RedisSentinelReactiveCommands<K, V> reactive;
 
-    private String clientName;
+    private final ConnectionState connectionState = new ConnectionState();
 
     public StatefulRedisSentinelConnectionImpl(RedisChannelWriter writer, RedisCodec<K, V> codec, Duration timeout) {
 
@@ -77,23 +78,21 @@ public RedisSentinelReactiveCommands<K, V> reactive() {
         return reactive;
     }
 
-    @Override
-    public void activated() {
-
-        super.activated();
-
-        if (clientName != null) {
-            setClientName(clientName);
-        }
-    }
-
+    /**
+     * @param clientName
+     * @deprecated since 6.0, use {@link RedisSentinelAsyncCommands#clientSetname(Object)}.
+     */
     public void setClientName(String clientName) {
 
         CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.SETNAME).addValue(clientName);
         AsyncCommand<String, String, String> async = new AsyncCommand<>(
                 new Command<>(CommandType.CLIENT, new StatusOutput<>(StringCodec.UTF8), args));
-        this.clientName = clientName;
+        connectionState.setClientName(clientName);
 
         dispatch((RedisCommand) async);
     }
+
+    public ConnectionState getConnectionState() {
+        return connectionState;
+    }
 }
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
index 0b8f9dd019..827d020b97 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
@@ -23,9 +23,9 @@
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
@@ -49,6 +49,11 @@ class ConnectionCommandIntegrationTests extends TestSupport {
         this.redis = connection.sync();
     }
 
+    @BeforeEach
+    void setUp() {
+        redis.flushall();
+    }
+
     @Test
     void auth() {
 
@@ -70,7 +75,6 @@ void auth() {
             authConnection.ping();
             authConnection.getStatefulConnection().close();
         });
-
     }
 
     @Test
@@ -144,8 +148,9 @@ void authInvalidPassword() {
             fail("Authenticated with invalid password");
         } catch (RedisException e) {
             assertThat(e.getMessage()).startsWith("ERR").contains("AUTH");
-            StatefulRedisConnection<String, String> statefulRedisCommands = async.getStatefulConnection();
-            assertThat(ReflectionTestUtils.getField(statefulRedisCommands, "password")).isNull();
+            StatefulRedisConnectionImpl<String, String> statefulRedisCommands = (StatefulRedisConnectionImpl) async
+                    .getStatefulConnection();
+            assertThat(statefulRedisCommands.getConnectionState()).extracting("password").isNull();
         } finally {
             async.getStatefulConnection().close();
         }
@@ -159,8 +164,9 @@ void selectInvalid() {
             fail("Selected invalid db index");
         } catch (RedisException e) {
             assertThat(e.getMessage()).startsWith("ERR");
-            StatefulRedisConnection<String, String> statefulRedisCommands = async.getStatefulConnection();
-            assertThat(ReflectionTestUtils.getField(statefulRedisCommands, "db")).isEqualTo(0);
+            StatefulRedisConnectionImpl<String, String> statefulRedisCommands = (StatefulRedisConnectionImpl) async
+                    .getStatefulConnection();
+            assertThat(statefulRedisCommands.getConnectionState()).extracting("db").isEqualTo(0);
         } finally {
             async.getStatefulConnection().close();
         }
diff --git a/src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/CommandSetIntegrationTests.java
similarity index 91%
rename from src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java
rename to src/test/java/io/lettuce/core/cluster/CommandSetIntegrationTests.java
index b9b90ec630..96186ad4ac 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisStateIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/CommandSetIntegrationTests.java
@@ -36,21 +36,20 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-public class RedisStateIntegrationTests {
+public class CommandSetIntegrationTests {
 
     private final RedisCommands<String, String> redis;
 
     @Inject
-    RedisStateIntegrationTests(StatefulRedisConnection<String, String> connection) {
+    CommandSetIntegrationTests(StatefulRedisConnection<String, String> connection) {
         this.redis = connection.sync();
     }
 
     @Test
     void shouldDiscoverCommands() {
 
-
         List<CommandDetail> commandDetails = CommandDetailParser.parse(redis.command());
-        RedisState state = new RedisState(commandDetails);
+        CommandSet state = new CommandSet(commandDetails);
 
         assertThat(state.hasCommand(CommandType.GEOADD)).isTrue();
         assertThat(state.hasCommand(UnknownCommand.FOO)).isFalse();
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
index c4205b9418..84706cf8d3 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
@@ -35,7 +35,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -517,11 +516,11 @@ void readOnlyOnCluster() {
 
         TestFutures.awaitOrTimeout(connection.async().quit());
 
-        assertThat(ReflectionTestUtils.getField(connection, "readOnly")).isEqualTo(Boolean.TRUE);
+        assertThat(connection).extracting("connectionState").extracting("readOnly").isEqualTo(Boolean.TRUE);
 
         sync.readWrite();
 
-        assertThat(ReflectionTestUtils.getField(connection, "readOnly")).isEqualTo(Boolean.FALSE);
+        assertThat(connection).extracting("connectionState").extracting("readOnly").isEqualTo(Boolean.FALSE);
         RedisClusterClient clusterClient = RedisClusterClient.create(TestClientResources.get(),
                 RedisURI.Builder.redis(host, 40400).build());
         try {
diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
index a3c2eae202..24c82e0f67 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
@@ -45,7 +45,6 @@
 import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.ClientOptions;
-import io.lettuce.core.ConnectionEvents;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.metrics.CommandLatencyCollector;
@@ -142,15 +141,6 @@ void before() throws Exception {
         stack = (Queue) ReflectionTestUtils.getField(sut, "stack");
     }
 
-    @Test
-    void testChannelActive() throws Exception {
-        sut.channelRegistered(context);
-
-        sut.channelActive(context);
-
-        verify(pipeline).fireUserEventTriggered(any(ConnectionEvents.Activated.class));
-    }
-
     @Test
     void testExceptionChannelActive() throws Exception {
         sut.setState(CommandHandler.LifecycleState.ACTIVE);
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
index de97352ca9..288bd3a9ee 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
@@ -278,7 +278,7 @@ void shouldCompleteUnsubscribe() throws Exception {
         doAnswer((Answer<PubSubEndpoint<String, String>>) inv -> {
             PubSubOutput<String, String, String> out = inv.getArgument(0);
             if (out.type() == PubSubOutput.Type.message) {
-                throw new NullPointerException();
+                throw new NullPointerException("Expected exception");
             }
             return endpoint;
         }).when(endpoint).notifyMessage(any());
diff --git a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
index 4ddaea0fcd..6f6977a030 100644
--- a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
@@ -98,8 +98,8 @@ void pingWithTrace() {
 
         List<Span> spans = new ArrayList<>(BraveTracingIntegrationTests.spans);
 
-        assertThat(spans.get(0).name()).isEqualTo("ping");
-        assertThat(spans.get(1).name()).isEqualTo("foo");
+        assertThat(spans.get(0).name()).isEqualTo("hello");
+        assertThat(spans.get(1).name()).isEqualTo("ping");
     }
 
     @Test
@@ -114,17 +114,17 @@ void pingWithTraceShouldCatchErrors() {
         } catch (Exception e) {
         }
 
-        Wait.untilEquals(2, spans::size).waitOrTimeout();
+        Wait.untilTrue(() -> spans.size() > 2).waitOrTimeout();
 
         foo.finish();
 
         List<Span> spans = new ArrayList<>(BraveTracingIntegrationTests.spans);
 
-        assertThat(spans.get(0).name()).isEqualTo("set");
-        assertThat(spans.get(1).name()).isEqualTo("hgetall");
-        assertThat(spans.get(1).tags()).containsEntry("error",
+        assertThat(spans.get(1).name()).isEqualTo("set");
+        assertThat(spans.get(2).name()).isEqualTo("hgetall");
+        assertThat(spans.get(2).tags()).containsEntry("error",
                 "WRONGTYPE Operation against a key holding the wrong kind of value");
-        assertThat(spans.get(2).name()).isEqualTo("foo");
+        assertThat(spans.get(3).name()).isEqualTo("foo");
     }
 
     @Test
@@ -140,17 +140,17 @@ void getAndSetWithTraceWithCommandArgsExcludedFromTags() {
         connect.sync().set("foo", "bar");
         connect.sync().get("foo");
 
-        Wait.untilEquals(2, spans::size).waitOrTimeout();
+        Wait.untilTrue(() -> spans.size() > 2).waitOrTimeout();
 
         trace.finish();
 
         List<Span> spans = new ArrayList<>(BraveTracingIntegrationTests.spans);
 
-        assertThat(spans.get(0).name()).isEqualTo("set");
-        assertThat(spans.get(0).tags()).doesNotContainKey("redis.args");
-        assertThat(spans.get(1).name()).isEqualTo("get");
+        assertThat(spans.get(1).name()).isEqualTo("set");
         assertThat(spans.get(1).tags()).doesNotContainKey("redis.args");
-        assertThat(spans.get(2).name()).isEqualTo("foo");
+        assertThat(spans.get(2).name()).isEqualTo("get");
+        assertThat(spans.get(2).tags()).doesNotContainKey("redis.args");
+        assertThat(spans.get(3).name()).isEqualTo("foo");
 
         FastShutdown.shutdown(client);
         FastShutdown.shutdown(clientResources);
@@ -183,8 +183,8 @@ void reactivePingWithTrace() {
 
         List<Span> spans = new ArrayList<>(BraveTracingIntegrationTests.spans);
 
-        assertThat(spans.get(0).name()).isEqualTo("ping");
-        assertThat(spans.get(1).name()).isEqualTo("foo");
+        assertThat(spans.get(1).name()).isEqualTo("ping");
+        assertThat(spans.get(2).name()).isEqualTo("foo");
     }
 
     @Test
@@ -199,17 +199,17 @@ void reactiveGetAndSetWithTrace() {
                 .as(StepVerifier::create) //
                 .expectNext("bar").verifyComplete();
 
-        Wait.untilEquals(2, spans::size).waitOrTimeout();
+        Wait.untilTrue(() -> spans.size() > 2).waitOrTimeout();
 
         trace.finish();
 
         List<Span> spans = new ArrayList<>(BraveTracingIntegrationTests.spans);
 
-        assertThat(spans.get(0).name()).isEqualTo("set");
-        assertThat(spans.get(0).tags()).containsEntry("redis.args", "key<foo> value<bar>");
-        assertThat(spans.get(1).name()).isEqualTo("get");
-        assertThat(spans.get(1).tags()).containsEntry("redis.args", "key<foo>");
-        assertThat(spans.get(2).name()).isEqualTo("foo");
+        assertThat(spans.get(1).name()).isEqualTo("set");
+        assertThat(spans.get(1).tags()).containsEntry("redis.args", "key<foo> value<bar>");
+        assertThat(spans.get(2).name()).isEqualTo("get");
+        assertThat(spans.get(2).tags()).containsEntry("redis.args", "key<foo>");
+        assertThat(spans.get(3).name()).isEqualTo("foo");
     }
 
     @Test
@@ -227,13 +227,13 @@ void reactiveGetAndSetWithTraceProvider() {
                 .as(StepVerifier::create) //
                 .expectNext("bar").verifyComplete();
 
-        Wait.untilEquals(2, spans::size).waitOrTimeout();
+        Wait.untilTrue(() -> spans.size() > 2).waitOrTimeout();
 
         trace.finish();
 
         List<Span> spans = new ArrayList<>(BraveTracingIntegrationTests.spans);
 
-        assertThat(spans.get(0).name()).isEqualTo("set");
-        assertThat(spans.get(1).name()).isEqualTo("get");
+        assertThat(spans.get(1).name()).isEqualTo("set");
+        assertThat(spans.get(2).name()).isEqualTo("get");
     }
 }

From 702081bca3d8add5fe546e1d2d7e7175d986ce34 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 28 Dec 2019 17:35:20 +0100
Subject: [PATCH 719/808] Add handshake to fallback to RESP2 if HELLO command
 is unknown #964

---
 .../java/io/lettuce/core/ClientOptions.java   |  19 ++-
 .../java/io/lettuce/core/ConnectionState.java | 134 +++++++++++++-----
 .../java/io/lettuce/core/RedisClient.java     |   2 +-
 .../core/cluster/ClusterClientOptions.java    |   4 +-
 .../core/cluster/RedisClusterClient.java      |   2 +-
 .../core/protocol/RedisHandshakeHandler.java  |  17 ---
 .../core/AuthenticationIntegrationTests.java  |   2 +
 .../core/masterreplica/MasterReplicaTest.java |   4 +-
 .../StaticMasterReplicaTest.java              |   4 +-
 .../core/masterslave/MasterSlaveTest.java     |   4 +-
 .../masterslave/StaticMasterSlaveTest.java    |   4 +-
 .../core/pubsub/PubSubCommandTest.java        |   1 +
 .../tracing/BraveTracingIntegrationTests.java |  11 +-
 13 files changed, 136 insertions(+), 72 deletions(-)

diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index 9d2e812dda..90329e8740 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -73,7 +73,7 @@ protected ClientOptions(Builder builder) {
 
     protected ClientOptions(ClientOptions original) {
         this.pingBeforeActivateConnection = original.isPingBeforeActivateConnection();
-        this.protocolVersion = original.getProtocolVersion();
+        this.protocolVersion = original.getConfiguredProtocolVersion();
         this.autoReconnect = original.isAutoReconnect();
         this.cancelCommandsOnReconnectFailure = original.isCancelCommandsOnReconnectFailure();
         this.publishOnScheduler = original.isPublishOnScheduler();
@@ -120,7 +120,7 @@ public static ClientOptions create() {
     public static class Builder {
 
         private boolean pingBeforeActivateConnection = DEFAULT_PING_BEFORE_ACTIVATE_CONNECTION;
-        private ProtocolVersion protocolVersion = DEFAULT_PROTOCOL_VERSION;
+        private ProtocolVersion protocolVersion;
         private boolean autoReconnect = DEFAULT_AUTO_RECONNECT;
         private boolean cancelCommandsOnReconnectFailure = DEFAULT_CANCEL_CMD_RECONNECT_FAIL;
         private boolean publishOnScheduler = DEFAULT_PUBLISH_ON_SCHEDULER;
@@ -160,7 +160,6 @@ public Builder pingBeforeActivateConnection(boolean pingBeforeActivateConnection
          */
         public Builder protocolVersion(ProtocolVersion protocolVersion) {
 
-            LettuceAssert.notNull(protocolVersion, "ProtocolVersion must not be null");
             this.protocolVersion = protocolVersion;
             return this;
         }
@@ -336,7 +335,7 @@ public ClientOptions.Builder mutate() {
         builder.autoReconnect(isAutoReconnect()).bufferUsageRatio(getBufferUsageRatio())
                 .cancelCommandsOnReconnectFailure(isCancelCommandsOnReconnectFailure())
                 .disconnectedBehavior(getDisconnectedBehavior()).publishOnScheduler(isPublishOnScheduler())
-                .protocolVersion(getProtocolVersion()).pingBeforeActivateConnection(isPingBeforeActivateConnection())
+                .protocolVersion(getConfiguredProtocolVersion()).pingBeforeActivateConnection(isPingBeforeActivateConnection())
                 .requestQueueSize(getRequestQueueSize()).socketOptions(getSocketOptions()).sslOptions(getSslOptions())
                 .suspendReconnectOnProtocolFailure(isSuspendReconnectOnProtocolFailure()).timeoutOptions(getTimeoutOptions());
 
@@ -363,6 +362,18 @@ public boolean isPingBeforeActivateConnection() {
      * @return the {@link ProtocolVersion} to use.
      */
     public ProtocolVersion getProtocolVersion() {
+
+        ProtocolVersion protocolVersion = getConfiguredProtocolVersion();
+        return protocolVersion == null ? DEFAULT_PROTOCOL_VERSION : protocolVersion;
+    }
+
+    /**
+     * Returns the configured {@link ProtocolVersion}. May return {@code null} if unconfigured.
+     *
+     * @return the {@link ProtocolVersion} to use. May be {@code null}.
+     * @since 6.0
+     */
+    public ProtocolVersion getConfiguredProtocolVersion() {
         return protocolVersion;
     }
 
diff --git a/src/main/java/io/lettuce/core/ConnectionState.java b/src/main/java/io/lettuce/core/ConnectionState.java
index e2cb65b91a..62aeb55eb4 100644
--- a/src/main/java/io/lettuce/core/ConnectionState.java
+++ b/src/main/java/io/lettuce/core/ConnectionState.java
@@ -22,7 +22,11 @@
 import java.util.concurrent.CompletionStage;
 
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.protocol.*;
+import io.lettuce.core.internal.Futures;
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.ConnectionInitializer;
+import io.lettuce.core.protocol.ProtocolVersion;
 import io.netty.channel.Channel;
 
 /**
@@ -36,9 +40,10 @@ public class ConnectionState implements ConnectionInitializer {
 
     private final RedisCommandBuilder<String, String> commandBuilder = new RedisCommandBuilder<>(StringCodec.UTF8);
 
-    private ProtocolVersion requested;
+    private ProtocolVersion requestedProtocolVersion;
     private boolean pingOnConnect;
 
+    private volatile ProtocolVersion negotiatedProtocolVersion;
     private volatile String username;
     private volatile char[] password;
     private volatile int db;
@@ -46,7 +51,7 @@ public class ConnectionState implements ConnectionInitializer {
     private volatile String clientName;
 
     public void setRequestedProtocolVersion(ProtocolVersion requested) {
-        this.requested = requested;
+        this.requestedProtocolVersion = requested;
     }
 
     public void setPingOnConnect(boolean pingOnConnect) {
@@ -77,53 +82,81 @@ public void setClientName(String clientName) {
         this.clientName = clientName;
     }
 
+    /**
+     * @return the requested {@link ProtocolVersion}. May be {@literal null} if not configured.
+     */
+    public ProtocolVersion getRequestedProtocolVersion() {
+        return requestedProtocolVersion;
+    }
+
+    /**
+     * @return the negotiated {@link ProtocolVersion} once the handshake is done.
+     */
+    public ProtocolVersion getNegotiatedProtocolVersion() {
+        return negotiatedProtocolVersion;
+    }
+
     @Override
     public CompletionStage<Void> initialize(Channel channel) {
 
         CompletableFuture<?> handshake;
 
-        List<RedisCommand<?, ?, ?>> postHandshake = new ArrayList<>();
-
-        if (this.requested == ProtocolVersion.RESP2) {
-            handshake = initiateHandshakeResp2(channel);
-
-            if (this.clientName != null) {
-                postHandshake.add(this.commandBuilder.clientSetname(this.clientName));
-            }
-        } else if (this.requested == ProtocolVersion.RESP3) {
-            handshake = initiateHandshakeResp3(channel);
+        if (this.requestedProtocolVersion == ProtocolVersion.RESP2) {
+            handshake = initializeResp2(channel);
+            negotiatedProtocolVersion = ProtocolVersion.RESP2;
+        } else if (this.requestedProtocolVersion == ProtocolVersion.RESP3) {
+            handshake = initializeResp3(channel);
+        } else if (this.requestedProtocolVersion == null) {
+            handshake = tryHandshakeResp3(channel);
         } else {
-            handshake = new CompletableFuture<>();
-            handshake.completeExceptionally(
-                    new RedisConnectionException("Protocol version" + this.requested + " not supported"));
-        }
-
-        if (this.db > 0) {
-            postHandshake.add(this.commandBuilder.select(this.db));
+            handshake = Futures.failed(
+                    new RedisConnectionException("Protocol version" + this.requestedProtocolVersion + " not supported"));
         }
 
-        if (this.readOnly) {
-            postHandshake.add(this.commandBuilder.readOnly());
-        }
+        return handshake.thenCompose(ignore -> applyPostHandshake(channel, getNegotiatedProtocolVersion()));
+    }
 
-        if (!postHandshake.isEmpty()) {
+    private CompletableFuture<?> tryHandshakeResp3(Channel channel) {
 
-            List<AsyncCommand<?, ?, ?>> commands = new ArrayList<>();
+        CompletableFuture<?> handshake = new CompletableFuture<>();
+        AsyncCommand<String, String, Map<String, Object>> hello = initiateHandshakeResp3(channel);
 
-            for (RedisCommand<?, ?, ?> redisCommand : postHandshake) {
+        hello.whenComplete((settings, throwable) -> {
 
-                AsyncCommand<?, ?, ?> async = new AsyncCommand<>(redisCommand);
-                handshake = handshake.thenCompose(o -> async);
-                commands.add(async);
+            if (throwable != null) {
+                if (isUnknownCommand(hello.getError())) {
+                    fallbackToResp2(channel, handshake);
+                } else {
+                    handshake.completeExceptionally(throwable);
+                }
+            } else {
+                handshake.complete(null);
             }
+        });
 
-            channel.writeAndFlush(commands);
-        }
+        return handshake;
+    }
+
+    private void fallbackToResp2(Channel channel, CompletableFuture<?> handshake) {
 
-        return handshake.thenRun(() -> {
+        initializeResp2(channel).whenComplete((o, nested) -> {
+
+            if (nested != null) {
+                handshake.completeExceptionally(nested);
+            } else {
+                handshake.complete(null);
+            }
         });
     }
 
+    private CompletableFuture<?> initializeResp2(Channel channel) {
+        return initiateHandshakeResp2(channel).thenRun(() -> negotiatedProtocolVersion = ProtocolVersion.RESP2);
+    }
+
+    private CompletableFuture<Void> initializeResp3(Channel channel) {
+        return initiateHandshakeResp3(channel).thenRun(() -> negotiatedProtocolVersion = ProtocolVersion.RESP3);
+    }
+
     /**
      * Perform a RESP2 Handshake: Issue a {@code PING} or {@code AUTH}.
      *
@@ -147,7 +180,7 @@ private CompletableFuture<?> initiateHandshakeResp2(Channel channel) {
      * @param channel
      * @return
      */
-    private CompletableFuture<Map<String, Object>> initiateHandshakeResp3(Channel channel) {
+    private AsyncCommand<String, String, Map<String, Object>> initiateHandshakeResp3(Channel channel) {
 
         if (hasPassword()) {
 
@@ -158,6 +191,35 @@ private CompletableFuture<Map<String, Object>> initiateHandshakeResp3(Channel ch
         return dispatch(channel, this.commandBuilder.hello(3, null, null, this.clientName));
     }
 
+    private CompletableFuture<Void> applyPostHandshake(Channel channel, ProtocolVersion negotiatedProtocolVersion) {
+
+        List<AsyncCommand<?, ?, ?>> postHandshake = new ArrayList<>();
+
+        if (this.clientName != null && negotiatedProtocolVersion == ProtocolVersion.RESP2) {
+            postHandshake.add(new AsyncCommand<>(this.commandBuilder.clientSetname(this.clientName)));
+        }
+
+        if (this.db > 0) {
+            postHandshake.add(new AsyncCommand<>(this.commandBuilder.select(this.db)));
+        }
+
+        if (this.readOnly) {
+            postHandshake.add(new AsyncCommand<>(this.commandBuilder.readOnly()));
+        }
+
+        if (postHandshake.isEmpty()) {
+            return CompletableFuture.completedFuture(null);
+        }
+
+        return dispatch(channel, postHandshake);
+    }
+
+    private CompletableFuture<Void> dispatch(Channel channel, List<AsyncCommand<?, ?, ?>> commands) {
+
+        CompletionStage<Void> writeFuture = Futures.toCompletionStage(channel.writeAndFlush(commands));
+        return CompletableFuture.allOf(Futures.allOf(commands), writeFuture.toCompletableFuture());
+    }
+
     private <T> AsyncCommand<String, String, T> dispatch(Channel channel, Command<String, String, T> command) {
 
         AsyncCommand<String, String, T> future = new AsyncCommand<>(command);
@@ -168,6 +230,12 @@ private <T> AsyncCommand<String, String, T> dispatch(Channel channel, Command<St
                 future.completeExceptionally(writeFuture.cause());
             }
         });
+
         return future;
     }
+
+    private static boolean isUnknownCommand(String error) {
+        return LettuceStrings.isNotEmpty(error) && error.startsWith("ERR unknown command");
+    }
+
 }
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 2fa64f3509..a081a4a692 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -748,7 +748,7 @@ private Mono<SocketAddress> lookupRedis(RedisURI sentinelUri) {
 
     private void initializeConnectionState(RedisURI redisURI, ConnectionState state) {
 
-        state.setRequestedProtocolVersion(clientOptions.getProtocolVersion());
+        state.setRequestedProtocolVersion(clientOptions.getConfiguredProtocolVersion());
         state.setPingOnConnect(clientOptions.isPingBeforeActivateConnection());
         state.setClientName(redisURI.getClientName());
         state.setUsername(redisURI.getUsername());
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index f3bbb525ab..b3732c6f7e 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -111,7 +111,7 @@ public static ClusterClientOptions.Builder builder(ClientOptions clientOptions)
                 .cancelCommandsOnReconnectFailure(clientOptions.isCancelCommandsOnReconnectFailure())
                 .disconnectedBehavior(clientOptions.getDisconnectedBehavior())
                 .publishOnScheduler(clientOptions.isPublishOnScheduler())
-.protocolVersion(clientOptions.getProtocolVersion())
+                .protocolVersion(clientOptions.getConfiguredProtocolVersion())
                 .requestQueueSize(clientOptions.getRequestQueueSize()).socketOptions(clientOptions.getSocketOptions())
                 .sslOptions(clientOptions.getSslOptions())
                 .suspendReconnectOnProtocolFailure(clientOptions.isSuspendReconnectOnProtocolFailure())
@@ -269,7 +269,7 @@ public ClusterClientOptions.Builder mutate() {
         builder.autoReconnect(isAutoReconnect()).bufferUsageRatio(getBufferUsageRatio())
                 .cancelCommandsOnReconnectFailure(isCancelCommandsOnReconnectFailure())
                 .disconnectedBehavior(getDisconnectedBehavior()).publishOnScheduler(isPublishOnScheduler())
-                .protocolVersion(getProtocolVersion()).requestQueueSize(getRequestQueueSize())
+                .protocolVersion(getConfiguredProtocolVersion()).requestQueueSize(getRequestQueueSize())
                 .socketOptions(getSocketOptions()).sslOptions(getSslOptions())
                 .suspendReconnectOnProtocolFailure(isSuspendReconnectOnProtocolFailure()).timeoutOptions(getTimeoutOptions())
                 .validateClusterNodeMembership(isValidateClusterNodeMembership()).maxRedirects(getMaxRedirects())
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 332f9a567c..748a2954c5 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -745,7 +745,7 @@ private <K, V> ConnectionBuilder createConnectionBuilder(RedisChannelHandler<K,
             connectionBuilder = ConnectionBuilder.connectionBuilder();
         }
 
-        state.setRequestedProtocolVersion(clientOptions.getProtocolVersion());
+        state.setRequestedProtocolVersion(clientOptions.getConfiguredProtocolVersion());
         state.setPingOnConnect(clientOptions.isPingBeforeActivateConnection());
 
         state.setClientName(connectionSettings.getClientName());
diff --git a/src/main/java/io/lettuce/core/protocol/RedisHandshakeHandler.java b/src/main/java/io/lettuce/core/protocol/RedisHandshakeHandler.java
index 773d55bf6e..cbe99c0a14 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisHandshakeHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisHandshakeHandler.java
@@ -15,7 +15,6 @@
  */
 package io.lettuce.core.protocol;
 
-import java.net.SocketAddress;
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
@@ -24,10 +23,8 @@
 import io.lettuce.core.ExceptionFactory;
 import io.lettuce.core.RedisConnectionException;
 import io.lettuce.core.resource.ClientResources;
-import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.channel.local.LocalAddress;
 import io.netty.util.Timeout;
 
 /**
@@ -140,18 +137,4 @@ public CompletionStage<Void> channelInitialized() {
         return handshakeFuture;
     }
 
-    static SocketAddress remote(ChannelHandlerContext ctx) {
-        if (ctx.channel() != null && ctx.channel().remoteAddress() != null) {
-            return ctx.channel().remoteAddress();
-        }
-        return new LocalAddress("unknown");
-    }
-
-    static SocketAddress local(ChannelHandlerContext ctx) {
-        Channel channel = ctx.channel();
-        if (channel != null && channel.localAddress() != null) {
-            return channel.localAddress();
-        }
-        return LocalAddress.ANY;
-    }
 }
diff --git a/src/test/java/io/lettuce/core/AuthenticationIntegrationTests.java b/src/test/java/io/lettuce/core/AuthenticationIntegrationTests.java
index 330dfd4ce8..1cf27834d0 100644
--- a/src/test/java/io/lettuce/core/AuthenticationIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/AuthenticationIntegrationTests.java
@@ -29,6 +29,7 @@
 import io.lettuce.core.protocol.CommandArgs;
 import io.lettuce.core.protocol.CommandType;
 import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.condition.EnabledOnCommand;
 import io.lettuce.test.settings.TestSettings;
 
 /**
@@ -37,6 +38,7 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
+@EnabledOnCommand("ACL")
 class AuthenticationIntegrationTests extends TestSupport {
 
     @BeforeEach
diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
index 40ef982761..f5305b6336 100644
--- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
@@ -82,12 +82,12 @@ void before() throws Exception {
         }
 
         WithPassword.enableAuthentication(this.connection1);
-        this.connection1.configSet("masterauth", passwd);
         this.connection1.auth(passwd);
+        this.connection1.configSet("masterauth", passwd);
 
         WithPassword.enableAuthentication(this.connection2);
-        this.connection2.configSet("masterauth", passwd);
         this.connection2.auth(passwd);
+        this.connection2.configSet("masterauth", passwd);
 
         connection = MasterReplica.connect(client, StringCodec.UTF8, masterURI);
         connection.setReadFrom(ReadFrom.REPLICA);
diff --git a/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java b/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
index 9069c8b8b0..8beab65ca0 100644
--- a/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
+++ b/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
@@ -77,12 +77,12 @@ void before() throws Exception {
         }
 
         WithPassword.enableAuthentication(this.connection1);
-        this.connection1.configSet("masterauth", passwd);
         this.connection1.auth(passwd);
+        this.connection1.configSet("masterauth", passwd);
 
         WithPassword.enableAuthentication(this.connection2);
-        this.connection2.configSet("masterauth", passwd);
         this.connection2.auth(passwd);
+        this.connection2.configSet("masterauth", passwd);
 
         node1.setPassword(passwd);
         node2.setPassword(passwd);
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
index 0b3972c476..89c8f67fea 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
@@ -82,12 +82,12 @@ void before() throws Exception {
         }
 
         WithPassword.enableAuthentication(this.connection1);
-        this.connection1.configSet("masterauth", passwd);
         this.connection1.auth(passwd);
+        this.connection1.configSet("masterauth", passwd);
 
         WithPassword.enableAuthentication(this.connection2);
-        this.connection2.configSet("masterauth", passwd);
         this.connection2.auth(passwd);
+        this.connection2.configSet("masterauth", passwd);
 
         connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8, masterURI);
         connection.setReadFrom(ReadFrom.REPLICA);
diff --git a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
index e04ae6e288..ccb3c26afb 100644
--- a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
@@ -78,12 +78,12 @@ void before() {
         }
 
         WithPassword.enableAuthentication(this.connection1);
-        this.connection1.configSet("masterauth", passwd);
         this.connection1.auth(passwd);
+        this.connection1.configSet("masterauth", passwd);
 
         WithPassword.enableAuthentication(this.connection2);
-        this.connection2.configSet("masterauth", passwd);
         this.connection2.auth(passwd);
+        this.connection2.configSet("masterauth", passwd);
 
         master.setPassword(passwd);
         replica.setPassword(passwd);
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
index b3fc8ae17b..407de36c80 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
@@ -113,6 +113,7 @@ void authWithReconnect() {
 
             assertThat(channels.take()).isEqualTo(channel);
 
+            redis.auth(passwd);
             long id = findNamedClient("authWithReconnect");
             redis.clientKill(KillArgs.Builder.id(id));
 
diff --git a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
index 6f6977a030..25db18975f 100644
--- a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
@@ -42,6 +42,7 @@
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
 import io.lettuce.test.Wait;
+import io.lettuce.test.condition.EnabledOnCommand;
 import io.lettuce.test.resource.FastShutdown;
 
 /**
@@ -50,6 +51,7 @@
  * @author Mark Paluch
  * @author Daniel Albuquerque
  */
+@EnabledOnCommand("HELLO")
 class BraveTracingIntegrationTests extends TestSupport {
 
     private static ClientResources clientResources;
@@ -218,12 +220,9 @@ void reactiveGetAndSetWithTraceProvider() {
         brave.Span trace = clientTracing.tracer().newTrace();
 
         StatefulRedisConnection<String, String> connect = client.connect();
-        connect.reactive()
-                .set("foo", "bar")
-                .then(connect.reactive().get("foo"))
-                .subscriberContext(
-                        io.lettuce.core.tracing.Tracing.withTraceContextProvider(() -> BraveTracing.BraveTraceContext
-                                .create(trace.context()))) //
+        connect.reactive().set("foo", "bar").then(connect.reactive().get("foo"))
+                .subscriberContext(io.lettuce.core.tracing.Tracing
+                        .withTraceContextProvider(() -> BraveTracing.BraveTraceContext.create(trace.context()))) //
                 .as(StepVerifier::create) //
                 .expectNext("bar").verifyComplete();
 

From dab292eb27bd652ea6a0dda138e9d35a6f015604 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 28 Dec 2019 18:17:37 +0100
Subject: [PATCH 720/808] Refactor ConnectionState into state and
 RedisHandshake #964

---
 .../io/lettuce/core/AbstractRedisClient.java  |   5 +
 .../java/io/lettuce/core/ConnectionState.java | 259 +++++++-----------
 .../java/io/lettuce/core/RedisClient.java     |  20 +-
 .../java/io/lettuce/core/RedisHandshake.java  | 228 +++++++++++++++
 .../core/cluster/RedisClusterClient.java      |  25 +-
 .../StatefulRedisClusterConnectionImpl.java   |  20 +-
 .../StatefulRedisSentinelConnectionImpl.java  |   9 +-
 7 files changed, 375 insertions(+), 191 deletions(-)
 create mode 100644 src/main/java/io/lettuce/core/RedisHandshake.java

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 538ceedcd4..d3fc17ccdb 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -548,4 +548,9 @@ protected void setOptions(ClientOptions clientOptions) {
         LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
         this.clientOptions = clientOptions;
     }
+
+    protected RedisHandshake createHandshake(ConnectionState state) {
+        return new RedisHandshake(clientOptions.getConfiguredProtocolVersion(), clientOptions.isPingBeforeActivateConnection(),
+                state);
+    }
 }
diff --git a/src/main/java/io/lettuce/core/ConnectionState.java b/src/main/java/io/lettuce/core/ConnectionState.java
index 62aeb55eb4..5091de8356 100644
--- a/src/main/java/io/lettuce/core/ConnectionState.java
+++ b/src/main/java/io/lettuce/core/ConnectionState.java
@@ -15,227 +15,168 @@
  */
 package io.lettuce.core;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-
-import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.internal.Futures;
-import io.lettuce.core.protocol.AsyncCommand;
-import io.lettuce.core.protocol.Command;
-import io.lettuce.core.protocol.ConnectionInitializer;
 import io.lettuce.core.protocol.ProtocolVersion;
-import io.netty.channel.Channel;
 
 /**
- * Internal connection state representing the requested {@link ProtocolVersion} and other options for connection initialization
+ * Internal connection state representing the negotiated {@link ProtocolVersion} and other options for connection initialization
  * and connection state restoration. This class is part of the internal API.
  *
  * @author Mark Paluch
  * @since 6.0
  */
-public class ConnectionState implements ConnectionInitializer {
+public class ConnectionState {
 
-    private final RedisCommandBuilder<String, String> commandBuilder = new RedisCommandBuilder<>(StringCodec.UTF8);
+    private volatile HandshakeResponse handshakeResponse;
 
-    private ProtocolVersion requestedProtocolVersion;
-    private boolean pingOnConnect;
-
-    private volatile ProtocolVersion negotiatedProtocolVersion;
     private volatile String username;
     private volatile char[] password;
     private volatile int db;
     private volatile boolean readOnly;
     private volatile String clientName;
 
-    public void setRequestedProtocolVersion(ProtocolVersion requested) {
-        this.requestedProtocolVersion = requested;
-    }
-
-    public void setPingOnConnect(boolean pingOnConnect) {
-        this.pingOnConnect = pingOnConnect;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public void setPassword(char[] password) {
-        this.password = password;
-    }
+    /**
+     * Applies settings from {@link RedisURI}.
+     *
+     * @param redisURI the URI to apply the client name and authentication.
+     */
+    public void apply(RedisURI redisURI) {
 
-    public void setDb(int db) {
-        this.db = db;
+        setClientName(redisURI.getClientName());
+        setUsername(redisURI.getUsername());
+        setPassword(redisURI.getPassword());
     }
 
-    private boolean hasPassword() {
-        return this.password != null && this.password.length > 0;
+    /**
+     * Returns the negotiated {@link ProtocolVersion}.
+     *
+     * @return the negotiated {@link ProtocolVersion} once the connection is established.
+     */
+    public ProtocolVersion getNegotiatedProtocolVersion() {
+        return handshakeResponse != null ? handshakeResponse.getNegotiatedProtocolVersion() : null;
     }
 
-    public void setReadOnly(boolean readOnly) {
-        this.readOnly = readOnly;
+    /**
+     * Returns the client connection id. Only available when using {@link ProtocolVersion#RESP3}.
+     *
+     * @return the client connection id. Can be {@literal null} if Redis uses RESP2.
+     */
+    public Long getConnectionId() {
+        return handshakeResponse != null ? handshakeResponse.getConnectionId() : null;
     }
 
-    public void setClientName(String clientName) {
-        this.clientName = clientName;
+    /**
+     * Returns the Redis server version. Only available when using {@link ProtocolVersion#RESP3}.
+     *
+     * @return the Redis server version.
+     */
+    public String getRedisVersion() {
+        return handshakeResponse != null ? handshakeResponse.getRedisVersion() : null;
     }
 
     /**
-     * @return the requested {@link ProtocolVersion}. May be {@literal null} if not configured.
+     * Returns the Redis server mode. Only available when using {@link ProtocolVersion#RESP3}.
+     *
+     * @return the Redis server mode.
      */
-    public ProtocolVersion getRequestedProtocolVersion() {
-        return requestedProtocolVersion;
+    public String getMode() {
+        return handshakeResponse != null ? handshakeResponse.getMode() : null;
     }
 
     /**
-     * @return the negotiated {@link ProtocolVersion} once the handshake is done.
+     * Returns the Redis server role. Only available when using {@link ProtocolVersion#RESP3}.
+     *
+     * @return the Redis server role.
      */
-    public ProtocolVersion getNegotiatedProtocolVersion() {
-        return negotiatedProtocolVersion;
+    public String getRole() {
+        return handshakeResponse != null ? handshakeResponse.getRole() : null;
     }
 
-    @Override
-    public CompletionStage<Void> initialize(Channel channel) {
-
-        CompletableFuture<?> handshake;
-
-        if (this.requestedProtocolVersion == ProtocolVersion.RESP2) {
-            handshake = initializeResp2(channel);
-            negotiatedProtocolVersion = ProtocolVersion.RESP2;
-        } else if (this.requestedProtocolVersion == ProtocolVersion.RESP3) {
-            handshake = initializeResp3(channel);
-        } else if (this.requestedProtocolVersion == null) {
-            handshake = tryHandshakeResp3(channel);
-        } else {
-            handshake = Futures.failed(
-                    new RedisConnectionException("Protocol version" + this.requestedProtocolVersion + " not supported"));
-        }
-
-        return handshake.thenCompose(ignore -> applyPostHandshake(channel, getNegotiatedProtocolVersion()));
+    void setHandshakeResponse(HandshakeResponse handshakeResponse) {
+        this.handshakeResponse = handshakeResponse;
     }
 
-    private CompletableFuture<?> tryHandshakeResp3(Channel channel) {
-
-        CompletableFuture<?> handshake = new CompletableFuture<>();
-        AsyncCommand<String, String, Map<String, Object>> hello = initiateHandshakeResp3(channel);
-
-        hello.whenComplete((settings, throwable) -> {
+    void setUsername(String username) {
+        this.username = username;
+    }
 
-            if (throwable != null) {
-                if (isUnknownCommand(hello.getError())) {
-                    fallbackToResp2(channel, handshake);
-                } else {
-                    handshake.completeExceptionally(throwable);
-                }
-            } else {
-                handshake.complete(null);
-            }
-        });
+    String getUsername() {
+        return username;
+    }
 
-        return handshake;
+    protected void setPassword(char[] password) {
+        this.password = password;
     }
 
-    private void fallbackToResp2(Channel channel, CompletableFuture<?> handshake) {
+    char[] getPassword() {
+        return password;
+    }
 
-        initializeResp2(channel).whenComplete((o, nested) -> {
+    boolean hasPassword() {
+        return this.password != null && this.password.length > 0;
+    }
 
-            if (nested != null) {
-                handshake.completeExceptionally(nested);
-            } else {
-                handshake.complete(null);
-            }
-        });
+    protected void setDb(int db) {
+        this.db = db;
     }
 
-    private CompletableFuture<?> initializeResp2(Channel channel) {
-        return initiateHandshakeResp2(channel).thenRun(() -> negotiatedProtocolVersion = ProtocolVersion.RESP2);
+    int getDb() {
+        return db;
     }
 
-    private CompletableFuture<Void> initializeResp3(Channel channel) {
-        return initiateHandshakeResp3(channel).thenRun(() -> negotiatedProtocolVersion = ProtocolVersion.RESP3);
+    protected void setReadOnly(boolean readOnly) {
+        this.readOnly = readOnly;
     }
 
-    /**
-     * Perform a RESP2 Handshake: Issue a {@code PING} or {@code AUTH}.
-     *
-     * @param channel
-     * @return
-     */
-    private CompletableFuture<?> initiateHandshakeResp2(Channel channel) {
+    boolean isReadOnly() {
+        return readOnly;
+    }
 
-        if (hasPassword()) {
-            return dispatch(channel, this.commandBuilder.auth(this.password));
-        } else if (this.pingOnConnect) {
-            return dispatch(channel, this.commandBuilder.ping());
-        }
+    protected void setClientName(String clientName) {
+        this.clientName = clientName;
+    }
 
-        return CompletableFuture.completedFuture(null);
+    String getClientName() {
+        return clientName;
     }
 
     /**
-     * Perform a RESP3 Handshake: Issue a {@code HELLO}.
-     *
-     * @param channel
-     * @return
+     * HELLO Handshake response.
      */
-    private AsyncCommand<String, String, Map<String, Object>> initiateHandshakeResp3(Channel channel) {
-
-        if (hasPassword()) {
-
-            return dispatch(channel, this.commandBuilder.hello(3,
-                    LettuceStrings.isNotEmpty(this.username) ? this.username : "default", this.password, this.clientName));
+    static class HandshakeResponse {
+
+        private final ProtocolVersion negotiatedProtocolVersion;
+        private final Long connectionId;
+        private final String redisVersion;
+        private final String mode;
+        private final String role;
+
+        public HandshakeResponse(ProtocolVersion negotiatedProtocolVersion, Long connectionId, String redisVersion, String mode,
+                String role) {
+            this.negotiatedProtocolVersion = negotiatedProtocolVersion;
+            this.connectionId = connectionId;
+            this.redisVersion = redisVersion;
+            this.role = role;
+            this.mode = mode;
         }
 
-        return dispatch(channel, this.commandBuilder.hello(3, null, null, this.clientName));
-    }
-
-    private CompletableFuture<Void> applyPostHandshake(Channel channel, ProtocolVersion negotiatedProtocolVersion) {
-
-        List<AsyncCommand<?, ?, ?>> postHandshake = new ArrayList<>();
-
-        if (this.clientName != null && negotiatedProtocolVersion == ProtocolVersion.RESP2) {
-            postHandshake.add(new AsyncCommand<>(this.commandBuilder.clientSetname(this.clientName)));
+        public ProtocolVersion getNegotiatedProtocolVersion() {
+            return negotiatedProtocolVersion;
         }
 
-        if (this.db > 0) {
-            postHandshake.add(new AsyncCommand<>(this.commandBuilder.select(this.db)));
+        public Long getConnectionId() {
+            return connectionId;
         }
 
-        if (this.readOnly) {
-            postHandshake.add(new AsyncCommand<>(this.commandBuilder.readOnly()));
+        public String getRedisVersion() {
+            return redisVersion;
         }
 
-        if (postHandshake.isEmpty()) {
-            return CompletableFuture.completedFuture(null);
+        public String getMode() {
+            return mode;
         }
 
-        return dispatch(channel, postHandshake);
-    }
-
-    private CompletableFuture<Void> dispatch(Channel channel, List<AsyncCommand<?, ?, ?>> commands) {
-
-        CompletionStage<Void> writeFuture = Futures.toCompletionStage(channel.writeAndFlush(commands));
-        return CompletableFuture.allOf(Futures.allOf(commands), writeFuture.toCompletableFuture());
-    }
-
-    private <T> AsyncCommand<String, String, T> dispatch(Channel channel, Command<String, String, T> command) {
-
-        AsyncCommand<String, String, T> future = new AsyncCommand<>(command);
-
-        channel.writeAndFlush(future).addListener(writeFuture -> {
-
-            if (!writeFuture.isSuccess()) {
-                future.completeExceptionally(writeFuture.cause());
-            }
-        });
-
-        return future;
-    }
-
-    private static boolean isUnknownCommand(String error) {
-        return LettuceStrings.isNotEmpty(error) && error.startsWith("ERR unknown command");
+        public String getRole() {
+            return role;
+        }
     }
-
 }
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index a081a4a692..08a3ab4cdd 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -300,8 +300,7 @@ private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnecti
         }
 
         ConnectionState state = connection.getConnectionState();
-
-        initializeConnectionState(redisURI, state);
+        state.apply(redisURI);
         state.setDb(redisURI.getDatabase());
 
         connectionBuilder.connection(connection);
@@ -310,7 +309,7 @@ private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnecti
         connectionBuilder.commandHandler(commandHandlerSupplier).endpoint(endpoint);
 
         connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
-        connectionBuilder.connectionInitializer(state);
+        connectionBuilder.connectionInitializer(createHandshake(state));
         channelType(connectionBuilder, redisURI);
 
         ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
@@ -558,10 +557,10 @@ private <K, V> ConnectionFuture<StatefulRedisSentinelConnection<K, V>> doConnect
         }
 
         StatefulRedisSentinelConnectionImpl<K, V> connection = newStatefulRedisSentinelConnection(writer, codec, timeout);
-        ConnectionState connectionState = connection.getConnectionState();
-        connectionBuilder.connectionInitializer(connectionState);
+        ConnectionState state = connection.getConnectionState();
 
-        initializeConnectionState(redisURI, connectionState);
+        state.apply(redisURI);
+        connectionBuilder.connectionInitializer(createHandshake(state));
 
         logger.debug("Connecting to Redis Sentinel, address: " + redisURI);
 
@@ -746,15 +745,6 @@ private Mono<SocketAddress> lookupRedis(RedisURI sentinelUri) {
         });
     }
 
-    private void initializeConnectionState(RedisURI redisURI, ConnectionState state) {
-
-        state.setRequestedProtocolVersion(clientOptions.getConfiguredProtocolVersion());
-        state.setPingOnConnect(clientOptions.isPingBeforeActivateConnection());
-        state.setClientName(redisURI.getClientName());
-        state.setUsername(redisURI.getUsername());
-        state.setPassword(redisURI.getPassword());
-    }
-
     private static <T> ConnectionFuture<T> transformAsyncConnectionException(ConnectionFuture<T> future) {
 
         return future.thenCompose((v, e) -> {
diff --git a/src/main/java/io/lettuce/core/RedisHandshake.java b/src/main/java/io/lettuce/core/RedisHandshake.java
new file mode 100644
index 0000000000..72c7c3ab4e
--- /dev/null
+++ b/src/main/java/io/lettuce/core/RedisHandshake.java
@@ -0,0 +1,228 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.Futures;
+import io.lettuce.core.protocol.AsyncCommand;
+import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.ConnectionInitializer;
+import io.lettuce.core.protocol.ProtocolVersion;
+import io.netty.channel.Channel;
+
+/**
+ * Redis RESP2/RESP3 handshake using the configured {@link ProtocolVersion} and other options for connection initialization and
+ * connection state restoration. This class is part of the internal API.
+ *
+ * @author Mark Paluch
+ * @since 6.0
+ */
+class RedisHandshake implements ConnectionInitializer {
+
+    private final RedisCommandBuilder<String, String> commandBuilder = new RedisCommandBuilder<>(StringCodec.UTF8);
+
+    private final ProtocolVersion requestedProtocolVersion;
+    private final boolean pingOnConnect;
+    private final ConnectionState connectionState;
+
+    private volatile ProtocolVersion negotiatedProtocolVersion;
+
+    RedisHandshake(ProtocolVersion requestedProtocolVersion, boolean pingOnConnect, ConnectionState connectionState) {
+
+        this.requestedProtocolVersion = requestedProtocolVersion;
+        this.pingOnConnect = pingOnConnect;
+        this.connectionState = connectionState;
+    }
+
+    /**
+     * @return the requested {@link ProtocolVersion}. May be {@literal null} if not configured.
+     */
+    public ProtocolVersion getRequestedProtocolVersion() {
+        return requestedProtocolVersion;
+    }
+
+    /**
+     * @return the negotiated {@link ProtocolVersion} once the handshake is done.
+     */
+    public ProtocolVersion getNegotiatedProtocolVersion() {
+        return negotiatedProtocolVersion;
+    }
+
+    @Override
+    public CompletionStage<Void> initialize(Channel channel) {
+
+        CompletableFuture<?> handshake;
+
+        if (this.requestedProtocolVersion == ProtocolVersion.RESP2) {
+            handshake = initializeResp2(channel);
+            negotiatedProtocolVersion = ProtocolVersion.RESP2;
+        } else if (this.requestedProtocolVersion == ProtocolVersion.RESP3) {
+            handshake = initializeResp3(channel);
+        } else if (this.requestedProtocolVersion == null) {
+            handshake = tryHandshakeResp3(channel);
+        } else {
+            handshake = Futures.failed(
+                    new RedisConnectionException("Protocol version" + this.requestedProtocolVersion + " not supported"));
+        }
+
+        return handshake.thenCompose(ignore -> applyPostHandshake(channel, getNegotiatedProtocolVersion()));
+    }
+
+    private CompletableFuture<?> tryHandshakeResp3(Channel channel) {
+
+        CompletableFuture<?> handshake = new CompletableFuture<>();
+        AsyncCommand<String, String, Map<String, Object>> hello = initiateHandshakeResp3(channel);
+
+        hello.whenComplete((settings, throwable) -> {
+
+            if (throwable != null) {
+                if (isUnknownCommand(hello.getError())) {
+                    fallbackToResp2(channel, handshake);
+                } else {
+                    handshake.completeExceptionally(throwable);
+                }
+            } else {
+                handshake.complete(null);
+            }
+        });
+
+        return handshake;
+    }
+
+    private void fallbackToResp2(Channel channel, CompletableFuture<?> handshake) {
+
+        initializeResp2(channel).whenComplete((o, nested) -> {
+
+            if (nested != null) {
+                handshake.completeExceptionally(nested);
+            } else {
+                handshake.complete(null);
+            }
+        });
+    }
+
+    private CompletableFuture<?> initializeResp2(Channel channel) {
+        return initiateHandshakeResp2(channel).thenRun(() -> {
+            negotiatedProtocolVersion = ProtocolVersion.RESP2;
+
+            connectionState.setHandshakeResponse(
+                    new ConnectionState.HandshakeResponse(negotiatedProtocolVersion, null, null, null, null));
+        });
+    }
+
+    private CompletableFuture<Void> initializeResp3(Channel channel) {
+        return initiateHandshakeResp3(channel).thenAccept(response -> {
+
+            Long id = (Long) response.get("id");
+            String mode = (String) response.get("mode");
+            String version = (String) response.get("version");
+            String role = (String) response.get("role");
+
+            negotiatedProtocolVersion = ProtocolVersion.RESP3;
+
+            connectionState.setHandshakeResponse(
+                    new ConnectionState.HandshakeResponse(negotiatedProtocolVersion, id, version, mode, role));
+        });
+    }
+
+    /**
+     * Perform a RESP2 Handshake: Issue a {@code PING} or {@code AUTH}.
+     *
+     * @param channel
+     * @return
+     */
+    private CompletableFuture<?> initiateHandshakeResp2(Channel channel) {
+
+        if (connectionState.hasPassword()) {
+            return dispatch(channel, this.commandBuilder.auth(connectionState.getPassword()));
+        } else if (this.pingOnConnect) {
+            return dispatch(channel, this.commandBuilder.ping());
+        }
+
+        return CompletableFuture.completedFuture(null);
+    }
+
+    /**
+     * Perform a RESP3 Handshake: Issue a {@code HELLO}.
+     *
+     * @param channel
+     * @return
+     */
+    private AsyncCommand<String, String, Map<String, Object>> initiateHandshakeResp3(Channel channel) {
+
+        if (connectionState.hasPassword()) {
+
+            return dispatch(channel, this.commandBuilder.hello(3,
+                    LettuceStrings.isNotEmpty(connectionState.getUsername()) ? connectionState.getUsername() : "default",
+                    connectionState.getPassword(), connectionState.getClientName()));
+        }
+
+        return dispatch(channel, this.commandBuilder.hello(3, null, null, connectionState.getClientName()));
+    }
+
+    private CompletableFuture<Void> applyPostHandshake(Channel channel, ProtocolVersion negotiatedProtocolVersion) {
+
+        List<AsyncCommand<?, ?, ?>> postHandshake = new ArrayList<>();
+
+        if (connectionState.getClientName() != null && negotiatedProtocolVersion == ProtocolVersion.RESP2) {
+            postHandshake.add(new AsyncCommand<>(this.commandBuilder.clientSetname(connectionState.getClientName())));
+        }
+
+        if (connectionState.getDb() > 0) {
+            postHandshake.add(new AsyncCommand<>(this.commandBuilder.select(connectionState.getDb())));
+        }
+
+        if (connectionState.isReadOnly()) {
+            postHandshake.add(new AsyncCommand<>(this.commandBuilder.readOnly()));
+        }
+
+        if (postHandshake.isEmpty()) {
+            return CompletableFuture.completedFuture(null);
+        }
+
+        return dispatch(channel, postHandshake);
+    }
+
+    private CompletableFuture<Void> dispatch(Channel channel, List<AsyncCommand<?, ?, ?>> commands) {
+
+        CompletionStage<Void> writeFuture = Futures.toCompletionStage(channel.writeAndFlush(commands));
+        return CompletableFuture.allOf(Futures.allOf(commands), writeFuture.toCompletableFuture());
+    }
+
+    private <T> AsyncCommand<String, String, T> dispatch(Channel channel, Command<String, String, T> command) {
+
+        AsyncCommand<String, String, T> future = new AsyncCommand<>(command);
+
+        channel.writeAndFlush(future).addListener(writeFuture -> {
+
+            if (!writeFuture.isSuccess()) {
+                future.completeExceptionally(writeFuture.cause());
+            }
+        });
+
+        return future;
+    }
+
+    private static boolean isUnknownCommand(String error) {
+        return LettuceStrings.isNotEmpty(error) && error.startsWith("ERR unknown command");
+    }
+}
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 748a2954c5..30d334b210 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -538,8 +538,8 @@ <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNode
         StatefulRedisPubSubConnectionImpl<K, V> connection = new StatefulRedisPubSubConnectionImpl<>(endpoint, writer, codec,
                 timeout);
 
-        ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectionFuture = connectStatefulAsync(connection,
-                endpoint, getFirstUri(), socketAddressSupplier,
+        ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectionFuture = connectStatefulAsync(connection, endpoint,
+                getFirstUri(), socketAddressSupplier,
                 () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec, endpoint));
         return connectionFuture.whenComplete((conn, throwable) -> {
             if (throwable != null) {
@@ -702,13 +702,13 @@ private int getConnectionAttempts() {
      * Initiates a channel connection considering {@link ClientOptions} initialization options, authentication and client name
      * options.
      */
+    @SuppressWarnings("unchecked")
     private <K, V, T extends StatefulRedisClusterConnectionImpl<K, V>, S> ConnectionFuture<S> connectStatefulAsync(T connection,
-            DefaultEndpoint endpoint, RedisURI connectionSettings,
-            Mono<SocketAddress> socketAddressSupplier, Supplier<CommandHandler> commandHandlerSupplier) {
+            DefaultEndpoint endpoint, RedisURI connectionSettings, Mono<SocketAddress> socketAddressSupplier,
+            Supplier<CommandHandler> commandHandlerSupplier) {
 
         ConnectionBuilder connectionBuilder = createConnectionBuilder(connection, connection.getConnectionState(), endpoint,
-                connectionSettings,
-                socketAddressSupplier, commandHandlerSupplier);
+                connectionSettings, socketAddressSupplier, commandHandlerSupplier);
 
         ConnectionFuture<RedisChannelHandler<K, V>> future = initializeChannelAsync(connectionBuilder);
 
@@ -719,6 +719,7 @@ private <K, V, T extends StatefulRedisClusterConnectionImpl<K, V>, S> Connection
      * Initiates a channel connection considering {@link ClientOptions} initialization options, authentication and client name
      * options.
      */
+    @SuppressWarnings("unchecked")
     private <K, V, T extends StatefulRedisConnectionImpl<K, V>, S> ConnectionFuture<S> connectStatefulAsync(T connection,
             DefaultEndpoint endpoint, RedisURI connectionSettings, Mono<SocketAddress> socketAddressSupplier,
             Supplier<CommandHandler> commandHandlerSupplier) {
@@ -732,8 +733,7 @@ private <K, V, T extends StatefulRedisConnectionImpl<K, V>, S> ConnectionFuture<
     }
 
     private <K, V> ConnectionBuilder createConnectionBuilder(RedisChannelHandler<K, V> connection, ConnectionState state,
-            DefaultEndpoint endpoint,
-            RedisURI connectionSettings, Mono<SocketAddress> socketAddressSupplier,
+            DefaultEndpoint endpoint, RedisURI connectionSettings, Mono<SocketAddress> socketAddressSupplier,
             Supplier<CommandHandler> commandHandlerSupplier) {
 
         ConnectionBuilder connectionBuilder;
@@ -745,18 +745,13 @@ private <K, V> ConnectionBuilder createConnectionBuilder(RedisChannelHandler<K,
             connectionBuilder = ConnectionBuilder.connectionBuilder();
         }
 
-        state.setRequestedProtocolVersion(clientOptions.getConfiguredProtocolVersion());
-        state.setPingOnConnect(clientOptions.isPingBeforeActivateConnection());
-
-        state.setClientName(connectionSettings.getClientName());
-        state.setUsername(connectionSettings.getUsername());
-        state.setPassword(connectionSettings.getPassword());
+        state.apply(connectionSettings);
+        connectionBuilder.connectionInitializer(createHandshake(state));
 
         connectionBuilder.reconnectionListener(new ReconnectEventListener(clusterTopologyRefreshScheduler));
         connectionBuilder.clientOptions(clientOptions);
         connectionBuilder.connection(connection);
         connectionBuilder.clientResources(clientResources);
-        connectionBuilder.connectionInitializer(state);
         connectionBuilder.endpoint(endpoint);
         connectionBuilder.commandHandler(commandHandlerSupplier);
         connectionBuilder(socketAddressSupplier, connectionBuilder, connectionSettings);
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
index 9bd8d4a365..9ab05d0220 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
@@ -63,7 +63,7 @@ public class StatefulRedisClusterConnectionImpl<K, V> extends RedisChannelHandle
     protected final RedisAdvancedClusterAsyncCommandsImpl<K, V> async;
     protected final RedisAdvancedClusterReactiveCommandsImpl<K, V> reactive;
 
-    private final ConnectionState connectionState = new ConnectionState();
+    private final ClusterConnectionState connectionState = new ClusterConnectionState();
 
     private Partitions partitions;
     private volatile CommandSet commandSet;
@@ -260,4 +260,22 @@ public ReadFrom getReadFrom() {
     ConnectionState getConnectionState() {
         return connectionState;
     }
+
+    static class ClusterConnectionState extends ConnectionState {
+
+        @Override
+        protected void setPassword(char[] password) {
+            super.setPassword(password);
+        }
+
+        @Override
+        protected void setDb(int db) {
+            super.setDb(db);
+        }
+
+        @Override
+        protected void setReadOnly(boolean readOnly) {
+            super.setReadOnly(readOnly);
+        }
+    }
 }
diff --git a/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
index 5f882f2b4b..a1c4f2f53a 100644
--- a/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
@@ -41,7 +41,7 @@ public class StatefulRedisSentinelConnectionImpl<K, V> extends RedisChannelHandl
     protected final RedisSentinelAsyncCommands<K, V> async;
     protected final RedisSentinelReactiveCommands<K, V> reactive;
 
-    private final ConnectionState connectionState = new ConnectionState();
+    private final SentinelConnectionState connectionState = new SentinelConnectionState();
 
     public StatefulRedisSentinelConnectionImpl(RedisChannelWriter writer, RedisCodec<K, V> codec, Duration timeout) {
 
@@ -95,4 +95,11 @@ public void setClientName(String clientName) {
     public ConnectionState getConnectionState() {
         return connectionState;
     }
+
+    static class SentinelConnectionState extends ConnectionState {
+        @Override
+        protected void setClientName(String clientName) {
+            super.setClientName(clientName);
+        }
+    }
 }

From 55571c5c0b5397395a6ec7d8ec9cd23cc6fe44dd Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 29 Dec 2019 17:24:48 +0100
Subject: [PATCH 721/808] Enable test for CLIENT SETNAME after Redis fix #964

---
 .../io/lettuce/core/commands/ServerCommandIntegrationTests.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
index 964f36d714..5c4b93e850 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
@@ -36,7 +36,6 @@
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.RedisBug;
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -90,7 +89,6 @@ void bgsave() {
     }
 
     @Test
-    @RedisBug("https://github.com/antirez/redis/issues/6036")
     void clientGetSetname() {
         assertThat(redis.clientGetname()).isNull();
         assertThat(redis.clientSetname("test")).isEqualTo("OK");

From 39563e5491881763118c21bb8b6b3ae5d06659ad Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sun, 29 Dec 2019 17:31:26 +0100
Subject: [PATCH 722/808] Use correct parser for double responses #964

---
 .../core/protocol/RedisStateMachine.java      |  3 +-
 .../SortedSetCommandIntegrationTests.java     | 96 +++++++++----------
 2 files changed, 48 insertions(+), 51 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index c036bb99e3..9b1b01965c 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import io.lettuce.core.LettuceStrings;
 import io.lettuce.core.output.CommandOutput;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
@@ -492,7 +493,7 @@ private double readFloat(ByteBuf buffer, int start, int end) {
 
         buffer.skipBytes(valueLength + TERMINATOR_LENGTH);
 
-        return Double.parseDouble(value);
+        return LettuceStrings.toDouble(value);
     }
 
     private boolean readBoolean(ByteBuf buffer) {
diff --git a/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
index 5b64e9132d..718b8b76d7 100644
--- a/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
@@ -36,7 +36,6 @@
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.lettuce.RedisBug;
 import io.lettuce.core.*;
 import io.lettuce.core.Range.Boundary;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -103,8 +102,8 @@ void zaddWrongArguments() {
 
     @Test
     void zaddnxWrongArguments() {
-        assertThatThrownBy(() -> redis.zadd(key, ZAddArgs.Builder.nx(), new Object[] { 2.0, "b", 3.0 })).isInstanceOf(
-                IllegalArgumentException.class);
+        assertThatThrownBy(() -> redis.zadd(key, ZAddArgs.Builder.nx(), new Object[] { 2.0, "b", 3.0 }))
+                .isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
@@ -288,8 +287,8 @@ void zrangebyscore() {
         assertThat(redis.zrangebyscore(key, "-inf", "+inf", 2, 2)).isEqualTo(list("c", "d"));
 
         assertThat(redis.zrangebyscore(key, Range.create(2.0, 3.0))).isEqualTo(list("b", "c"));
-        assertThat(redis.zrangebyscore(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(
-                list("b", "c"));
+        assertThat(redis.zrangebyscore(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0))))
+                .isEqualTo(list("b", "c"));
         assertThat(redis.zrangebyscore(key, Range.unbounded())).isEqualTo(list("a", "b", "c", "d"));
         assertThat(redis.zrangebyscore(key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(list("b", "c", "d"));
         assertThat(redis.zrangebyscore(key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(list("c", "d"));
@@ -324,27 +323,26 @@ void zrangebyscoreWithScores() {
 
         assertThat(redis.zrangebyscoreWithScores(key, 2.0, 3.0)).isEqualTo(svlist(sv(2.0, "b"), sv(3.0, "c")));
         assertThat(redis.zrangebyscoreWithScores(key, "(1.0", "(4.0")).isEqualTo(svlist(sv(2.0, "b"), sv(3.0, "c")));
-        assertThat(redis.zrangebyscoreWithScores(key, NEGATIVE_INFINITY, POSITIVE_INFINITY)).isEqualTo(
-                svlist(sv(1.0, "a"), sv(2.0, "b"), sv(3.0, "c"), sv(4.0, "d")));
-        assertThat(redis.zrangebyscoreWithScores(key, "-inf", "+inf")).isEqualTo(
-                svlist(sv(1.0, "a"), sv(2.0, "b"), sv(3.0, "c"), sv(4.0, "d")));
-        assertThat(redis.zrangebyscoreWithScores(key, 0.0, 4.0, 1, 3)).isEqualTo(
-                svlist(sv(2.0, "b"), sv(3.0, "c"), sv(4.0, "d")));
+        assertThat(redis.zrangebyscoreWithScores(key, NEGATIVE_INFINITY, POSITIVE_INFINITY))
+                .isEqualTo(svlist(sv(1.0, "a"), sv(2.0, "b"), sv(3.0, "c"), sv(4.0, "d")));
+        assertThat(redis.zrangebyscoreWithScores(key, "-inf", "+inf"))
+                .isEqualTo(svlist(sv(1.0, "a"), sv(2.0, "b"), sv(3.0, "c"), sv(4.0, "d")));
+        assertThat(redis.zrangebyscoreWithScores(key, 0.0, 4.0, 1, 3))
+                .isEqualTo(svlist(sv(2.0, "b"), sv(3.0, "c"), sv(4.0, "d")));
         assertThat(redis.zrangebyscoreWithScores(key, "-inf", "+inf", 2, 2)).isEqualTo(svlist(sv(3.0, "c"), sv(4.0, "d")));
 
         assertThat(redis.zrangebyscoreWithScores(key, Range.create(2.0, 3.0))).isEqualTo(svlist(sv(2.0, "b"), sv(3.0, "c")));
-        assertThat(redis.zrangebyscoreWithScores(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(
-                svlist(sv(2.0, "b"), sv(3.0, "c")));
-        assertThat(redis.zrangebyscoreWithScores(key, Range.unbounded())).isEqualTo(
-                svlist(sv(1.0, "a"), sv(2.0, "b"), sv(3.0, "c"), sv(4.0, "d")));
-        assertThat(redis.zrangebyscoreWithScores(key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(
-                svlist(sv(2.0, "b"), sv(3.0, "c"), sv(4.0, "d")));
-        assertThat(redis.zrangebyscoreWithScores(key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(
-                svlist(sv(3.0, "c"), sv(4.0, "d")));
+        assertThat(redis.zrangebyscoreWithScores(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0))))
+                .isEqualTo(svlist(sv(2.0, "b"), sv(3.0, "c")));
+        assertThat(redis.zrangebyscoreWithScores(key, Range.unbounded()))
+                .isEqualTo(svlist(sv(1.0, "a"), sv(2.0, "b"), sv(3.0, "c"), sv(4.0, "d")));
+        assertThat(redis.zrangebyscoreWithScores(key, Range.create(0.0, 4.0), Limit.create(1, 3)))
+                .isEqualTo(svlist(sv(2.0, "b"), sv(3.0, "c"), sv(4.0, "d")));
+        assertThat(redis.zrangebyscoreWithScores(key, Range.unbounded(), Limit.create(2, 2)))
+                .isEqualTo(svlist(sv(3.0, "c"), sv(4.0, "d")));
     }
 
     @Test
-    @RedisBug("-inf is suffixed with NULL byte, https://github.com/antirez/redis/issues/6037")
     @SuppressWarnings({ "unchecked" })
     void zrangebyscoreWithScoresInfinity() {
 
@@ -375,12 +373,11 @@ void zrangebyscoreWithScoresStreaming() {
         assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key, "-inf", "+inf", 2, 2).longValue()).isEqualTo(2);
 
         assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key, Range.create(2.0, 3.0))).isEqualTo(2);
-        assertThat(
-                redis.zrangebyscoreWithScores(streamingAdapter, key,
-                        Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(2);
+        assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key,
+                Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(2);
         assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key, Range.unbounded())).isEqualTo(4);
-        assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(
-                3);
+        assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key, Range.create(0.0, 4.0), Limit.create(1, 3)))
+                .isEqualTo(3);
         assertThat(redis.zrangebyscoreWithScores(streamingAdapter, key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(2);
 
     }
@@ -473,8 +470,8 @@ void zrevrangebylex() {
 
         assertThat(redis.zrevrangebylex(key, Range.unbounded())).hasSize(100);
         assertThat(redis.zrevrangebylex(key, Range.create("value", "zzz"))).hasSize(100);
-        assertThat(redis.zrevrangebylex(key, Range.from(including("value98"), including("value99")))).containsSequence(
-                "value99", "value98");
+        assertThat(redis.zrevrangebylex(key, Range.from(including("value98"), including("value99"))))
+                .containsSequence("value99", "value98");
         assertThat(redis.zrevrangebylex(key, Range.from(including("value99"), Boundary.unbounded()))).hasSize(1);
         assertThat(redis.zrevrangebylex(key, Range.from(Boundary.excluding("value99"), Boundary.unbounded()))).hasSize(0);
     }
@@ -492,8 +489,8 @@ void zrevrangebyscore() {
         assertThat(redis.zrevrangebyscore(key, "+inf", "-inf", 2, 2)).isEqualTo(list("b", "a"));
 
         assertThat(redis.zrevrangebyscore(key, Range.create(2.0, 3.0))).isEqualTo(list("c", "b"));
-        assertThat(redis.zrevrangebyscore(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))).isEqualTo(
-                list("c", "b"));
+        assertThat(redis.zrevrangebyscore(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0))))
+                .isEqualTo(list("c", "b"));
         assertThat(redis.zrevrangebyscore(key, Range.unbounded())).isEqualTo(list("d", "c", "b", "a"));
         assertThat(redis.zrevrangebyscore(key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(list("c", "b", "a"));
         assertThat(redis.zrevrangebyscore(key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(list("b", "a"));
@@ -506,23 +503,23 @@ void zrevrangebyscoreWithScores() {
 
         assertThat(redis.zrevrangebyscoreWithScores(key, 3.0, 2.0)).isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b")));
         assertThat(redis.zrevrangebyscoreWithScores(key, "(4.0", "(1.0")).isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b")));
-        assertThat(redis.zrevrangebyscoreWithScores(key, POSITIVE_INFINITY, NEGATIVE_INFINITY)).isEqualTo(
-                svlist(sv(4.0, "d"), sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
-        assertThat(redis.zrevrangebyscoreWithScores(key, "+inf", "-inf")).isEqualTo(
-                svlist(sv(4.0, "d"), sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
-        assertThat(redis.zrevrangebyscoreWithScores(key, 4.0, 0.0, 1, 3)).isEqualTo(
-                svlist(sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
+        assertThat(redis.zrevrangebyscoreWithScores(key, POSITIVE_INFINITY, NEGATIVE_INFINITY))
+                .isEqualTo(svlist(sv(4.0, "d"), sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
+        assertThat(redis.zrevrangebyscoreWithScores(key, "+inf", "-inf"))
+                .isEqualTo(svlist(sv(4.0, "d"), sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
+        assertThat(redis.zrevrangebyscoreWithScores(key, 4.0, 0.0, 1, 3))
+                .isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
         assertThat(redis.zrevrangebyscoreWithScores(key, "+inf", "-inf", 2, 2)).isEqualTo(svlist(sv(2.0, "b"), sv(1.0, "a")));
 
         assertThat(redis.zrevrangebyscoreWithScores(key, Range.create(2.0, 3.0))).isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b")));
         assertThat(redis.zrevrangebyscoreWithScores(key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0))))
                 .isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b")));
-        assertThat(redis.zrevrangebyscoreWithScores(key, Range.unbounded())).isEqualTo(
-                svlist(sv(4.0, "d"), sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
-        assertThat(redis.zrevrangebyscoreWithScores(key, Range.create(0.0, 4.0), Limit.create(1, 3))).isEqualTo(
-                svlist(sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
-        assertThat(redis.zrevrangebyscoreWithScores(key, Range.unbounded(), Limit.create(2, 2))).isEqualTo(
-                svlist(sv(2.0, "b"), sv(1.0, "a")));
+        assertThat(redis.zrevrangebyscoreWithScores(key, Range.unbounded()))
+                .isEqualTo(svlist(sv(4.0, "d"), sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
+        assertThat(redis.zrevrangebyscoreWithScores(key, Range.create(0.0, 4.0), Limit.create(1, 3)))
+                .isEqualTo(svlist(sv(3.0, "c"), sv(2.0, "b"), sv(1.0, "a")));
+        assertThat(redis.zrevrangebyscoreWithScores(key, Range.unbounded(), Limit.create(2, 2)))
+                .isEqualTo(svlist(sv(2.0, "b"), sv(1.0, "a")));
     }
 
     @Test
@@ -539,14 +536,13 @@ void zrevrangebyscoreStreaming() {
         assertThat(redis.zrevrangebyscore(streamingAdapter, key, "+inf", "-inf", 2, 2).longValue()).isEqualTo(2);
 
         assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.create(2.0, 3.0)).longValue()).isEqualTo(2);
-        assertThat(
-                redis.zrevrangebyscore(streamingAdapter, key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))
-                        .longValue()).isEqualTo(2);
+        assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))
+                .longValue()).isEqualTo(2);
         assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.unbounded()).longValue()).isEqualTo(4);
         assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.create(0.0, 4.0), Limit.create(1, 3)).longValue())
                 .isEqualTo(3);
-        assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.unbounded(), Limit.create(2, 2)).longValue()).isEqualTo(
-                2);
+        assertThat(redis.zrevrangebyscore(streamingAdapter, key, Range.unbounded(), Limit.create(2, 2)).longValue())
+                .isEqualTo(2);
     }
 
     @Test
@@ -564,13 +560,13 @@ void zrevrangebyscoreWithScoresStreaming() {
         assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, "+inf", "-inf", 2, 2)).isEqualTo(2);
 
         assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, Range.create(2.0, 3.0)).longValue()).isEqualTo(2);
-        assertThat(
-                redis.zrevrangebyscoreWithScores(streamingAdapter, key,
-                        Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0))).longValue()).isEqualTo(2);
+        assertThat(redis
+                .zrevrangebyscoreWithScores(streamingAdapter, key, Range.from(Boundary.excluding(1.0), Boundary.excluding(4.0)))
+                .longValue()).isEqualTo(2);
         assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, Range.unbounded()).longValue()).isEqualTo(4);
         assertThat(
                 redis.zrevrangebyscoreWithScores(streamingAdapter, key, Range.create(0.0, 4.0), Limit.create(1, 3)).longValue())
-                .isEqualTo(3);
+                        .isEqualTo(3);
         assertThat(redis.zrevrangebyscoreWithScores(streamingAdapter, key, Range.unbounded(), Limit.create(2, 2)).longValue())
                 .isEqualTo(2);
     }

From 1e334f68aaa3cbd6a021e0b699c85a450551f42d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 1 Jan 2020 18:55:32 +0100
Subject: [PATCH 723/808] Update license headers to 2020

---
 .github/CONTRIBUTING.md                              |  2 +-
 README.md                                            |  2 +-
 pom.xml                                              |  2 +-
 src/main/asciidoc/stylesheets/golo.css               |  4 ++--
 .../io/lettuce/core/AbstractRedisAsyncCommands.java  |  4 ++--
 .../java/io/lettuce/core/AbstractRedisClient.java    |  4 ++--
 .../lettuce/core/AbstractRedisReactiveCommands.java  |  4 ++--
 src/main/java/io/lettuce/core/BitFieldArgs.java      |  4 ++--
 .../java/io/lettuce/core/ChannelGroupListener.java   |  4 ++--
 src/main/java/io/lettuce/core/ClientOptions.java     |  4 ++--
 src/main/java/io/lettuce/core/CloseEvents.java       |  4 ++--
 src/main/java/io/lettuce/core/CompositeArgument.java |  4 ++--
 src/main/java/io/lettuce/core/ConnectionBuilder.java |  4 ++--
 .../java/io/lettuce/core/ConnectionEventTrigger.java |  4 ++--
 src/main/java/io/lettuce/core/ConnectionEvents.java  |  4 ++--
 src/main/java/io/lettuce/core/ConnectionFuture.java  |  4 ++--
 src/main/java/io/lettuce/core/ConnectionId.java      |  4 ++--
 src/main/java/io/lettuce/core/ConnectionPoint.java   |  4 ++--
 src/main/java/io/lettuce/core/ConnectionState.java   |  4 ++--
 src/main/java/io/lettuce/core/Consumer.java          |  4 ++--
 .../io/lettuce/core/DefaultConnectionFuture.java     |  4 ++--
 src/main/java/io/lettuce/core/EpollProvider.java     |  4 ++--
 src/main/java/io/lettuce/core/ExceptionFactory.java  |  4 ++--
 .../io/lettuce/core/FutureSyncInvocationHandler.java |  4 ++--
 src/main/java/io/lettuce/core/GeoArgs.java           |  4 ++--
 src/main/java/io/lettuce/core/GeoCoordinates.java    |  4 ++--
 .../java/io/lettuce/core/GeoRadiusStoreArgs.java     |  4 ++--
 src/main/java/io/lettuce/core/GeoWithin.java         |  4 ++--
 src/main/java/io/lettuce/core/JavaRuntime.java       |  4 ++--
 src/main/java/io/lettuce/core/KeyScanCursor.java     |  4 ++--
 src/main/java/io/lettuce/core/KeyValue.java          |  4 ++--
 src/main/java/io/lettuce/core/KillArgs.java          |  4 ++--
 src/main/java/io/lettuce/core/KqueueProvider.java    |  4 ++--
 src/main/java/io/lettuce/core/LettuceFutures.java    |  4 ++--
 src/main/java/io/lettuce/core/LettuceStrings.java    |  4 ++--
 src/main/java/io/lettuce/core/Limit.java             |  4 ++--
 src/main/java/io/lettuce/core/MapScanCursor.java     |  4 ++--
 src/main/java/io/lettuce/core/MigrateArgs.java       |  4 ++--
 src/main/java/io/lettuce/core/Operators.java         |  4 ++--
 .../io/lettuce/core/OrderingReadFromAccessor.java    |  8 ++++----
 src/main/java/io/lettuce/core/Range.java             |  4 ++--
 src/main/java/io/lettuce/core/ReadFrom.java          |  4 ++--
 src/main/java/io/lettuce/core/ReadFromImpl.java      |  4 ++--
 .../java/io/lettuce/core/RedisAsyncCommandsImpl.java |  4 ++--
 .../java/io/lettuce/core/RedisBusyException.java     |  4 ++--
 .../java/io/lettuce/core/RedisChannelHandler.java    |  4 ++--
 .../java/io/lettuce/core/RedisChannelWriter.java     |  4 ++--
 src/main/java/io/lettuce/core/RedisClient.java       |  4 ++--
 .../java/io/lettuce/core/RedisCommandBuilder.java    |  4 ++--
 .../lettuce/core/RedisCommandExecutionException.java |  4 ++--
 .../core/RedisCommandInterruptedException.java       |  4 ++--
 .../lettuce/core/RedisCommandTimeoutException.java   |  4 ++--
 .../io/lettuce/core/RedisConnectionException.java    |  4 ++--
 .../io/lettuce/core/RedisConnectionStateAdapter.java |  4 ++--
 .../lettuce/core/RedisConnectionStateListener.java   |  4 ++--
 src/main/java/io/lettuce/core/RedisException.java    |  4 ++--
 src/main/java/io/lettuce/core/RedisFuture.java       |  4 ++--
 src/main/java/io/lettuce/core/RedisHandshake.java    |  4 ++--
 .../java/io/lettuce/core/RedisLoadingException.java  |  4 ++--
 .../java/io/lettuce/core/RedisNoScriptException.java |  4 ++--
 src/main/java/io/lettuce/core/RedisPublisher.java    |  4 ++--
 .../io/lettuce/core/RedisReactiveCommandsImpl.java   |  4 ++--
 src/main/java/io/lettuce/core/RedisURI.java          |  4 ++--
 src/main/java/io/lettuce/core/RestoreArgs.java       |  4 ++--
 src/main/java/io/lettuce/core/ScanArgs.java          |  4 ++--
 src/main/java/io/lettuce/core/ScanCursor.java        |  4 ++--
 src/main/java/io/lettuce/core/ScanIterator.java      |  4 ++--
 src/main/java/io/lettuce/core/ScanStream.java        |  4 ++--
 src/main/java/io/lettuce/core/ScoredValue.java       |  4 ++--
 .../java/io/lettuce/core/ScoredValueScanCursor.java  |  4 ++--
 src/main/java/io/lettuce/core/ScriptOutputType.java  |  4 ++--
 src/main/java/io/lettuce/core/SetArgs.java           |  4 ++--
 src/main/java/io/lettuce/core/SocketOptions.java     |  4 ++--
 src/main/java/io/lettuce/core/SortArgs.java          |  4 ++--
 .../java/io/lettuce/core/SslConnectionBuilder.java   |  4 ++--
 src/main/java/io/lettuce/core/SslOptions.java        |  4 ++--
 .../io/lettuce/core/StatefulRedisConnectionImpl.java |  4 ++--
 src/main/java/io/lettuce/core/StreamMessage.java     |  4 ++--
 src/main/java/io/lettuce/core/StreamScanCursor.java  |  4 ++--
 src/main/java/io/lettuce/core/TimeoutOptions.java    |  4 ++--
 src/main/java/io/lettuce/core/TransactionResult.java |  4 ++--
 src/main/java/io/lettuce/core/Transports.java        |  4 ++--
 src/main/java/io/lettuce/core/UnblockType.java       |  4 ++--
 src/main/java/io/lettuce/core/Value.java             |  4 ++--
 src/main/java/io/lettuce/core/ValueScanCursor.java   |  4 ++--
 src/main/java/io/lettuce/core/XAddArgs.java          |  4 ++--
 src/main/java/io/lettuce/core/XClaimArgs.java        |  4 ++--
 src/main/java/io/lettuce/core/XGroupCreateArgs.java  |  4 ++--
 src/main/java/io/lettuce/core/XReadArgs.java         |  4 ++--
 src/main/java/io/lettuce/core/ZAddArgs.java          |  4 ++--
 src/main/java/io/lettuce/core/ZStoreArgs.java        |  4 ++--
 .../java/io/lettuce/core/api/StatefulConnection.java |  4 ++--
 .../io/lettuce/core/api/StatefulRedisConnection.java |  4 ++--
 .../core/api/async/BaseRedisAsyncCommands.java       |  4 ++--
 .../lettuce/core/api/async/RedisAsyncCommands.java   |  4 ++--
 .../core/api/async/RedisGeoAsyncCommands.java        |  4 ++--
 .../core/api/async/RedisHLLAsyncCommands.java        |  4 ++--
 .../core/api/async/RedisHashAsyncCommands.java       |  4 ++--
 .../core/api/async/RedisKeyAsyncCommands.java        |  4 ++--
 .../core/api/async/RedisListAsyncCommands.java       |  4 ++--
 .../core/api/async/RedisScriptingAsyncCommands.java  |  4 ++--
 .../core/api/async/RedisServerAsyncCommands.java     |  4 ++--
 .../core/api/async/RedisSetAsyncCommands.java        |  4 ++--
 .../core/api/async/RedisSortedSetAsyncCommands.java  |  4 ++--
 .../core/api/async/RedisStreamAsyncCommands.java     |  4 ++--
 .../core/api/async/RedisStringAsyncCommands.java     |  4 ++--
 .../api/async/RedisTransactionalAsyncCommands.java   |  4 ++--
 .../core/api/reactive/BaseRedisReactiveCommands.java |  4 ++--
 .../core/api/reactive/RedisGeoReactiveCommands.java  |  4 ++--
 .../core/api/reactive/RedisHLLReactiveCommands.java  |  4 ++--
 .../core/api/reactive/RedisHashReactiveCommands.java |  4 ++--
 .../core/api/reactive/RedisKeyReactiveCommands.java  |  4 ++--
 .../core/api/reactive/RedisListReactiveCommands.java |  4 ++--
 .../core/api/reactive/RedisReactiveCommands.java     |  4 ++--
 .../api/reactive/RedisScriptingReactiveCommands.java |  4 ++--
 .../api/reactive/RedisServerReactiveCommands.java    |  4 ++--
 .../core/api/reactive/RedisSetReactiveCommands.java  |  4 ++--
 .../api/reactive/RedisSortedSetReactiveCommands.java |  4 ++--
 .../api/reactive/RedisStreamReactiveCommands.java    |  4 ++--
 .../api/reactive/RedisStringReactiveCommands.java    |  4 ++--
 .../reactive/RedisTransactionalReactiveCommands.java |  4 ++--
 .../io/lettuce/core/api/sync/BaseRedisCommands.java  |  4 ++--
 .../java/io/lettuce/core/api/sync/RedisCommands.java |  4 ++--
 .../io/lettuce/core/api/sync/RedisGeoCommands.java   |  4 ++--
 .../io/lettuce/core/api/sync/RedisHLLCommands.java   |  4 ++--
 .../io/lettuce/core/api/sync/RedisHashCommands.java  |  4 ++--
 .../io/lettuce/core/api/sync/RedisKeyCommands.java   |  4 ++--
 .../io/lettuce/core/api/sync/RedisListCommands.java  |  4 ++--
 .../core/api/sync/RedisScriptingCommands.java        |  4 ++--
 .../lettuce/core/api/sync/RedisServerCommands.java   |  4 ++--
 .../io/lettuce/core/api/sync/RedisSetCommands.java   |  4 ++--
 .../core/api/sync/RedisSortedSetCommands.java        |  4 ++--
 .../lettuce/core/api/sync/RedisStreamCommands.java   |  4 ++--
 .../lettuce/core/api/sync/RedisStringCommands.java   |  4 ++--
 .../core/api/sync/RedisTransactionalCommands.java    |  4 ++--
 .../AbstractClusterNodeConnectionFactory.java        |  4 ++--
 .../lettuce/core/cluster/AbstractNodeSelection.java  |  4 ++--
 .../core/cluster/AsyncClusterConnectionProvider.java |  4 ++--
 .../io/lettuce/core/cluster/AsyncExecutionsImpl.java |  4 ++--
 .../lettuce/core/cluster/ClusterClientOptions.java   |  4 ++--
 .../java/io/lettuce/core/cluster/ClusterCommand.java |  4 ++--
 .../core/cluster/ClusterConnectionProvider.java      |  4 ++--
 .../cluster/ClusterDistributionChannelWriter.java    |  4 ++--
 .../lettuce/core/cluster/ClusterEventListener.java   |  4 ++--
 .../cluster/ClusterFutureSyncInvocationHandler.java  |  4 ++--
 .../core/cluster/ClusterNodeConnectionFactory.java   |  4 ++--
 .../io/lettuce/core/cluster/ClusterNodeEndpoint.java |  4 ++--
 .../cluster/ClusterPubSubConnectionProvider.java     |  4 ++--
 .../io/lettuce/core/cluster/ClusterScanSupport.java  |  4 ++--
 .../core/cluster/ClusterTopologyRefreshOptions.java  |  4 ++--
 .../cluster/ClusterTopologyRefreshScheduler.java     |  4 ++--
 .../java/io/lettuce/core/cluster/CommandSet.java     |  4 ++--
 .../lettuce/core/cluster/DynamicNodeSelection.java   |  4 ++--
 .../io/lettuce/core/cluster/MultiNodeExecution.java  |  4 ++--
 .../core/cluster/NodeSelectionInvocationHandler.java |  4 ++--
 .../io/lettuce/core/cluster/PartitionAccessor.java   |  4 ++--
 .../io/lettuce/core/cluster/PartitionException.java  |  4 ++--
 .../core/cluster/PartitionSelectorException.java     |  4 ++--
 .../io/lettuce/core/cluster/PartitionsConsensus.java |  4 ++--
 .../core/cluster/PartitionsConsensusImpl.java        |  4 ++--
 .../lettuce/core/cluster/PipelinedRedisFuture.java   |  4 ++--
 .../cluster/PooledClusterConnectionProvider.java     |  4 ++--
 .../lettuce/core/cluster/PubSubClusterEndpoint.java  |  4 ++--
 .../lettuce/core/cluster/ReactiveExecutionsImpl.java |  4 ++--
 .../io/lettuce/core/cluster/ReadOnlyCommands.java    |  4 ++--
 .../lettuce/core/cluster/ReconnectEventListener.java |  4 ++--
 .../RedisAdvancedClusterAsyncCommandsImpl.java       |  4 ++--
 .../RedisAdvancedClusterReactiveCommandsImpl.java    |  4 ++--
 .../io/lettuce/core/cluster/RedisClusterClient.java  |  4 ++--
 .../cluster/RedisClusterPubSubAsyncCommandsImpl.java |  4 ++--
 .../RedisClusterPubSubReactiveCommandsImpl.java      |  4 ++--
 .../io/lettuce/core/cluster/RedisClusterURIUtil.java |  4 ++--
 .../java/io/lettuce/core/cluster/RoundRobin.java     |  4 ++--
 .../cluster/RoundRobinSocketAddressSupplier.java     |  4 ++--
 src/main/java/io/lettuce/core/cluster/SlotHash.java  |  4 ++--
 .../cluster/StatefulRedisClusterConnectionImpl.java  |  4 ++--
 .../StatefulRedisClusterPubSubConnectionImpl.java    |  4 ++--
 .../io/lettuce/core/cluster/StaticNodeSelection.java |  4 ++--
 .../io/lettuce/core/cluster/SyncExecutionsImpl.java  |  4 ++--
 .../core/cluster/UnknownPartitionException.java      |  4 ++--
 .../core/cluster/api/NodeSelectionSupport.java       |  4 ++--
 .../cluster/api/StatefulRedisClusterConnection.java  |  4 ++--
 .../core/cluster/api/async/AsyncExecutions.java      |  4 ++--
 .../core/cluster/api/async/AsyncNodeSelection.java   |  4 ++--
 .../api/async/BaseNodeSelectionAsyncCommands.java    |  4 ++--
 .../api/async/NodeSelectionAsyncCommands.java        |  4 ++--
 .../api/async/NodeSelectionGeoAsyncCommands.java     |  4 ++--
 .../api/async/NodeSelectionHLLAsyncCommands.java     |  4 ++--
 .../api/async/NodeSelectionHashAsyncCommands.java    |  4 ++--
 .../api/async/NodeSelectionKeyAsyncCommands.java     |  4 ++--
 .../api/async/NodeSelectionListAsyncCommands.java    |  4 ++--
 .../async/NodeSelectionScriptingAsyncCommands.java   |  4 ++--
 .../api/async/NodeSelectionServerAsyncCommands.java  |  4 ++--
 .../api/async/NodeSelectionSetAsyncCommands.java     |  4 ++--
 .../async/NodeSelectionSortedSetAsyncCommands.java   |  4 ++--
 .../api/async/NodeSelectionStreamAsyncCommands.java  |  4 ++--
 .../api/async/NodeSelectionStringAsyncCommands.java  |  4 ++--
 .../api/async/RedisAdvancedClusterAsyncCommands.java |  4 ++--
 .../cluster/api/async/RedisClusterAsyncCommands.java |  4 ++--
 .../cluster/api/reactive/ReactiveExecutions.java     |  4 ++--
 .../RedisAdvancedClusterReactiveCommands.java        |  4 ++--
 .../api/reactive/RedisClusterReactiveCommands.java   |  4 ++--
 .../cluster/api/sync/BaseNodeSelectionCommands.java  |  4 ++--
 .../io/lettuce/core/cluster/api/sync/Executions.java |  4 ++--
 .../lettuce/core/cluster/api/sync/NodeSelection.java |  4 ++--
 .../core/cluster/api/sync/NodeSelectionCommands.java |  4 ++--
 .../cluster/api/sync/NodeSelectionGeoCommands.java   |  4 ++--
 .../cluster/api/sync/NodeSelectionHLLCommands.java   |  4 ++--
 .../cluster/api/sync/NodeSelectionHashCommands.java  |  4 ++--
 .../cluster/api/sync/NodeSelectionKeyCommands.java   |  4 ++--
 .../cluster/api/sync/NodeSelectionListCommands.java  |  4 ++--
 .../api/sync/NodeSelectionScriptingCommands.java     |  4 ++--
 .../api/sync/NodeSelectionServerCommands.java        |  4 ++--
 .../cluster/api/sync/NodeSelectionSetCommands.java   |  4 ++--
 .../api/sync/NodeSelectionSortedSetCommands.java     |  4 ++--
 .../api/sync/NodeSelectionStreamCommands.java        |  4 ++--
 .../api/sync/NodeSelectionStringCommands.java        |  4 ++--
 .../api/sync/RedisAdvancedClusterCommands.java       |  4 ++--
 .../core/cluster/api/sync/RedisClusterCommands.java  |  4 ++--
 .../cluster/event/ClusterTopologyChangedEvent.java   |  4 ++--
 .../models/partitions/ClusterPartitionParser.java    |  4 ++--
 .../core/cluster/models/partitions/Partitions.java   |  4 ++--
 .../cluster/models/partitions/RedisClusterNode.java  |  4 ++--
 .../core/cluster/models/slots/ClusterSlotRange.java  |  4 ++--
 .../cluster/models/slots/ClusterSlotsParser.java     |  4 ++--
 .../cluster/pubsub/RedisClusterPubSubAdapter.java    |  4 ++--
 .../cluster/pubsub/RedisClusterPubSubListener.java   |  4 ++--
 .../pubsub/StatefulRedisClusterPubSubConnection.java |  4 ++--
 .../api/async/NodeSelectionPubSubAsyncCommands.java  |  4 ++--
 .../pubsub/api/async/PubSubAsyncNodeSelection.java   |  4 ++--
 .../api/async/RedisClusterPubSubAsyncCommands.java   |  4 ++--
 .../NodeSelectionPubSubReactiveCommands.java         |  4 ++--
 .../api/reactive/PubSubReactiveNodeSelection.java    |  4 ++--
 .../reactive/RedisClusterPubSubReactiveCommands.java |  4 ++--
 .../pubsub/api/sync/NodeSelectionPubSubCommands.java |  4 ++--
 .../cluster/pubsub/api/sync/PubSubNodeSelection.java |  4 ++--
 .../pubsub/api/sync/RedisClusterPubSubCommands.java  |  4 ++--
 .../core/cluster/topology/AsyncConnections.java      |  4 ++--
 .../cluster/topology/ClusterTopologyRefresh.java     |  4 ++--
 .../lettuce/core/cluster/topology/Connections.java   |  4 ++--
 .../core/cluster/topology/NodeConnectionFactory.java |  4 ++--
 .../core/cluster/topology/NodeTopologyView.java      |  4 ++--
 .../core/cluster/topology/NodeTopologyViews.java     |  4 ++--
 .../cluster/topology/RedisClusterNodeSnapshot.java   |  4 ++--
 .../core/cluster/topology/RefreshFutures.java        |  4 ++--
 .../io/lettuce/core/cluster/topology/Requests.java   |  4 ++--
 .../core/cluster/topology/TimedAsyncCommand.java     |  4 ++--
 .../core/cluster/topology/TopologyComparators.java   |  4 ++--
 src/main/java/io/lettuce/core/codec/Base16.java      |  4 ++--
 .../java/io/lettuce/core/codec/ByteArrayCodec.java   |  4 ++--
 .../io/lettuce/core/codec/ByteBufferInputStream.java |  4 ++--
 src/main/java/io/lettuce/core/codec/CRC16.java       |  6 +++---
 src/main/java/io/lettuce/core/codec/CipherCodec.java |  4 ++--
 .../io/lettuce/core/codec/ComposedRedisCodec.java    |  4 ++--
 .../java/io/lettuce/core/codec/CompressionCodec.java |  4 ++--
 src/main/java/io/lettuce/core/codec/RedisCodec.java  |  4 ++--
 src/main/java/io/lettuce/core/codec/StringCodec.java |  4 ++--
 .../java/io/lettuce/core/codec/ToByteBufEncoder.java |  4 ++--
 .../java/io/lettuce/core/codec/Utf8StringCodec.java  |  4 ++--
 .../lettuce/core/dynamic/AsyncExecutableCommand.java |  4 ++--
 .../AsyncExecutableCommandLookupStrategy.java        |  4 ++--
 .../lettuce/core/dynamic/BatchExecutableCommand.java |  4 ++--
 .../BatchExecutableCommandLookupStrategy.java        |  4 ++--
 .../java/io/lettuce/core/dynamic/BatchTasks.java     |  4 ++--
 src/main/java/io/lettuce/core/dynamic/Batcher.java   |  4 ++--
 .../dynamic/CodecAwareMethodParametersAccessor.java  |  4 ++--
 .../core/dynamic/CommandCreationException.java       |  4 ++--
 .../java/io/lettuce/core/dynamic/CommandFactory.java |  4 ++--
 .../lettuce/core/dynamic/CommandFactoryResolver.java |  4 ++--
 .../java/io/lettuce/core/dynamic/CommandMethod.java  |  4 ++--
 .../core/dynamic/CommandMethodSyntaxException.java   |  4 ++--
 .../lettuce/core/dynamic/CommandMethodVerifier.java  |  4 ++--
 .../core/dynamic/CommandSegmentCommandFactory.java   |  4 ++--
 src/main/java/io/lettuce/core/dynamic/Commands.java  |  4 ++--
 .../io/lettuce/core/dynamic/ConversionService.java   |  4 ++--
 .../io/lettuce/core/dynamic/ConvertingCommand.java   |  4 ++--
 .../lettuce/core/dynamic/DeclaredCommandMethod.java  |  4 ++--
 .../core/dynamic/DefaultCommandMethodVerifier.java   |  4 ++--
 .../dynamic/DefaultMethodParametersAccessor.java     |  4 ++--
 .../core/dynamic/DefaultRedisCommandsMetadata.java   |  4 ++--
 .../io/lettuce/core/dynamic/ExecutableCommand.java   |  4 ++--
 .../dynamic/ExecutableCommandLookupStrategy.java     |  4 ++--
 .../ExecutableCommandLookupStrategySupport.java      |  4 ++--
 .../io/lettuce/core/dynamic/ParameterBinder.java     |  4 ++--
 .../ReactiveCommandSegmentCommandFactory.java        |  4 ++--
 .../core/dynamic/ReactiveExecutableCommand.java      |  4 ++--
 .../ReactiveExecutableCommandLookupStrategy.java     |  4 ++--
 .../lettuce/core/dynamic/ReactiveTypeAdapters.java   |  4 ++--
 .../java/io/lettuce/core/dynamic/ReactiveTypes.java  |  4 ++--
 .../io/lettuce/core/dynamic/RedisCommandFactory.java |  4 ++--
 .../lettuce/core/dynamic/RedisCommandsMetadata.java  |  4 ++--
 .../java/io/lettuce/core/dynamic/SimpleBatcher.java  |  4 ++--
 .../io/lettuce/core/dynamic/annotation/Command.java  |  4 ++--
 .../core/dynamic/annotation/CommandNaming.java       |  4 ++--
 .../java/io/lettuce/core/dynamic/annotation/Key.java |  4 ++--
 .../io/lettuce/core/dynamic/annotation/Param.java    |  4 ++--
 .../io/lettuce/core/dynamic/annotation/Value.java    |  4 ++--
 .../lettuce/core/dynamic/batch/BatchException.java   |  4 ++--
 .../io/lettuce/core/dynamic/batch/BatchExecutor.java |  4 ++--
 .../io/lettuce/core/dynamic/batch/BatchSize.java     |  4 ++--
 .../lettuce/core/dynamic/batch/CommandBatching.java  |  4 ++--
 .../dynamic/codec/AnnotationRedisCodecResolver.java  |  4 ++--
 .../core/dynamic/codec/RedisCodecResolver.java       |  4 ++--
 .../java/io/lettuce/core/dynamic/domain/Timeout.java |  4 ++--
 .../intercept/DefaultMethodInvokingInterceptor.java  |  4 ++--
 .../dynamic/intercept/InvocationProxyFactory.java    |  4 ++--
 .../dynamic/intercept/InvocationTargetProvider.java  |  4 ++--
 .../core/dynamic/intercept/MethodInterceptor.java    |  4 ++--
 .../dynamic/intercept/MethodInterceptorChain.java    |  4 ++--
 .../core/dynamic/intercept/MethodInvocation.java     |  4 ++--
 .../output/CodecAwareOutputFactoryResolver.java      |  4 ++--
 .../core/dynamic/output/CommandOutputFactory.java    |  4 ++--
 .../dynamic/output/CommandOutputFactoryResolver.java |  4 ++--
 .../dynamic/output/CommandOutputResolverSupport.java |  4 ++--
 .../lettuce/core/dynamic/output/OutputRegistry.java  |  4 ++--
 .../OutputRegistryCommandOutputFactoryResolver.java  |  4 ++--
 .../lettuce/core/dynamic/output/OutputSelector.java  |  4 ++--
 .../io/lettuce/core/dynamic/output/OutputType.java   |  4 ++--
 .../io/lettuce/core/dynamic/output/VoidOutput.java   |  4 ++--
 .../parameter/ExecutionSpecificParameters.java       |  4 ++--
 .../dynamic/parameter/MethodParametersAccessor.java  |  4 ++--
 .../io/lettuce/core/dynamic/parameter/Parameter.java |  4 ++--
 .../lettuce/core/dynamic/parameter/Parameters.java   |  4 ++--
 .../segment/AnnotationCommandSegmentFactory.java     |  4 ++--
 .../lettuce/core/dynamic/segment/CommandSegment.java |  4 ++--
 .../core/dynamic/segment/CommandSegmentFactory.java  |  4 ++--
 .../core/dynamic/segment/CommandSegments.java        |  4 ++--
 .../support/AnnotationParameterNameDiscoverer.java   |  4 ++--
 .../core/dynamic/support/ClassTypeInformation.java   |  4 ++--
 .../support/CompositeParameterNameDiscoverer.java    |  4 ++--
 .../dynamic/support/GenericArrayTypeInformation.java |  4 ++--
 .../core/dynamic/support/GenericTypeResolver.java    |  4 ++--
 .../core/dynamic/support/MethodParameter.java        |  4 ++--
 .../dynamic/support/ParameterNameDiscoverer.java     |  4 ++--
 .../dynamic/support/ParametrizedTypeInformation.java |  4 ++--
 .../support/ParentTypeAwareTypeInformation.java      |  4 ++--
 .../core/dynamic/support/ReflectionUtils.java        |  4 ++--
 .../lettuce/core/dynamic/support/ResolvableType.java |  4 ++--
 .../StandardReflectionParameterNameDiscoverer.java   |  4 ++--
 .../lettuce/core/dynamic/support/TypeDiscoverer.java |  4 ++--
 .../core/dynamic/support/TypeInformation.java        |  4 ++--
 .../dynamic/support/TypeVariableTypeInformation.java |  4 ++--
 .../io/lettuce/core/dynamic/support/TypeWrapper.java |  4 ++--
 .../dynamic/support/WildcardTypeInformation.java     |  4 ++--
 .../java/io/lettuce/core/event/DefaultEventBus.java  |  4 ++--
 .../core/event/DefaultEventPublisherOptions.java     |  4 ++--
 src/main/java/io/lettuce/core/event/Event.java       |  4 ++--
 src/main/java/io/lettuce/core/event/EventBus.java    |  4 ++--
 .../io/lettuce/core/event/EventPublisherOptions.java |  4 ++--
 .../event/cluster/AdaptiveRefreshTriggeredEvent.java |  4 ++--
 .../core/event/connection/ConnectedEvent.java        |  4 ++--
 .../event/connection/ConnectionActivatedEvent.java   |  4 ++--
 .../event/connection/ConnectionDeactivatedEvent.java |  4 ++--
 .../core/event/connection/ConnectionEvent.java       |  4 ++--
 .../event/connection/ConnectionEventSupport.java     |  4 ++--
 .../core/event/connection/DisconnectedEvent.java     |  4 ++--
 .../core/event/connection/ReconnectFailedEvent.java  |  4 ++--
 .../core/event/metrics/CommandLatencyEvent.java      |  4 ++--
 .../metrics/DefaultCommandLatencyEventPublisher.java |  4 ++--
 .../core/event/metrics/MetricEventPublisher.java     |  4 ++--
 .../core/internal/AbstractInvocationHandler.java     |  4 ++--
 .../io/lettuce/core/internal/AsyncCloseable.java     |  4 ++--
 .../core/internal/AsyncConnectionProvider.java       |  4 ++--
 .../io/lettuce/core/internal/DefaultMethods.java     |  4 ++--
 src/main/java/io/lettuce/core/internal/Futures.java  |  4 ++--
 .../java/io/lettuce/core/internal/HostAndPort.java   |  4 ++--
 .../java/io/lettuce/core/internal/LettuceAssert.java |  4 ++--
 .../io/lettuce/core/internal/LettuceClassUtils.java  |  4 ++--
 .../io/lettuce/core/internal/LettuceFactories.java   |  4 ++--
 .../java/io/lettuce/core/internal/LettuceLists.java  |  4 ++--
 .../java/io/lettuce/core/internal/LettuceSets.java   |  4 ++--
 .../io/lettuce/core/internal/TimeoutProvider.java    |  4 ++--
 .../io/lettuce/core/masterreplica/MasterReplica.java |  4 ++--
 .../MasterReplicaConnectionWrapper.java              |  4 ++--
 .../StatefulRedisMasterReplicaConnection.java        |  4 ++--
 .../lettuce/core/masterslave/AsyncConnections.java   |  4 ++--
 .../core/masterslave/AutodiscoveryConnector.java     |  4 ++--
 .../masterslave/CompletableEventLatchSupport.java    |  4 ++--
 .../io/lettuce/core/masterslave/Connections.java     |  4 ++--
 .../java/io/lettuce/core/masterslave/Exceptions.java |  4 ++--
 .../io/lettuce/core/masterslave/MasterSlave.java     |  4 ++--
 .../core/masterslave/MasterSlaveChannelWriter.java   |  4 ++--
 .../masterslave/MasterSlaveConnectionProvider.java   |  4 ++--
 .../core/masterslave/MasterSlaveConnector.java       |  4 ++--
 .../masterslave/MasterSlaveTopologyProvider.java     |  4 ++--
 .../core/masterslave/MasterSlaveTopologyRefresh.java |  4 ++--
 .../lettuce/core/masterslave/MasterSlaveUtils.java   |  4 ++--
 .../core/masterslave/NodeConnectionFactory.java      |  4 ++--
 .../lettuce/core/masterslave/ReadOnlyCommands.java   |  4 ++--
 .../RedisClientNodeConnectionFactory.java            |  4 ++--
 .../core/masterslave/RedisMasterSlaveNode.java       |  4 ++--
 .../java/io/lettuce/core/masterslave/Requests.java   |  4 ++--
 .../io/lettuce/core/masterslave/ResumeAfter.java     |  4 ++--
 .../lettuce/core/masterslave/SentinelConnector.java  |  4 ++--
 .../core/masterslave/SentinelTopologyProvider.java   |  4 ++--
 .../core/masterslave/SentinelTopologyRefresh.java    |  4 ++--
 .../SentinelTopologyRefreshConnections.java          |  4 ++--
 .../StatefulRedisMasterSlaveConnection.java          |  4 ++--
 .../StatefulRedisMasterSlaveConnectionImpl.java      |  4 ++--
 .../core/masterslave/StaticMasterSlaveConnector.java |  4 ++--
 .../StaticMasterSlaveTopologyProvider.java           |  4 ++--
 .../lettuce/core/masterslave/TimedAsyncCommand.java  |  4 ++--
 .../java/io/lettuce/core/masterslave/Timeout.java    |  4 ++--
 .../core/masterslave/TopologyComparators.java        |  4 ++--
 .../lettuce/core/masterslave/TopologyProvider.java   |  4 ++--
 .../core/metrics/CommandLatencyCollector.java        |  4 ++--
 .../core/metrics/CommandLatencyCollectorOptions.java |  4 ++--
 .../io/lettuce/core/metrics/CommandLatencyId.java    |  4 ++--
 .../java/io/lettuce/core/metrics/CommandMetrics.java |  4 ++--
 .../core/metrics/DefaultCommandLatencyCollector.java |  4 ++--
 .../DefaultCommandLatencyCollectorOptions.java       |  4 ++--
 .../io/lettuce/core/metrics/MetricCollector.java     |  4 ++--
 .../lettuce/core/models/command/CommandDetail.java   |  4 ++--
 .../core/models/command/CommandDetailParser.java     |  4 ++--
 .../io/lettuce/core/models/role/RedisInstance.java   |  4 ++--
 .../core/models/role/RedisMasterInstance.java        |  4 ++--
 .../core/models/role/RedisNodeDescription.java       |  4 ++--
 .../core/models/role/RedisSentinelInstance.java      |  4 ++--
 .../lettuce/core/models/role/RedisSlaveInstance.java |  4 ++--
 .../lettuce/core/models/role/ReplicationPartner.java |  4 ++--
 .../java/io/lettuce/core/models/role/RoleParser.java |  4 ++--
 .../io/lettuce/core/models/stream/PendingEntry.java  |  4 ++--
 .../lettuce/core/models/stream/PendingMessage.java   |  4 ++--
 .../lettuce/core/models/stream/PendingMessages.java  |  4 ++--
 .../io/lettuce/core/models/stream/PendingParser.java |  4 ++--
 .../io/lettuce/core/models/stream/package-info.java  |  4 ++--
 .../java/io/lettuce/core/output/ArrayOutput.java     |  4 ++--
 .../io/lettuce/core/output/BooleanListOutput.java    |  4 ++--
 .../java/io/lettuce/core/output/BooleanOutput.java   |  4 ++--
 .../java/io/lettuce/core/output/ByteArrayOutput.java |  4 ++--
 .../java/io/lettuce/core/output/CommandOutput.java   |  4 ++--
 src/main/java/io/lettuce/core/output/DateOutput.java |  4 ++--
 .../core/output/DefaultTransactionResult.java        |  4 ++--
 .../java/io/lettuce/core/output/DoubleOutput.java    |  4 ++--
 .../io/lettuce/core/output/GenericMapOutput.java     |  4 ++--
 .../core/output/GeoCoordinatesListOutput.java        |  4 ++--
 .../core/output/GeoCoordinatesValueListOutput.java   |  4 ++--
 .../io/lettuce/core/output/GeoWithinListOutput.java  |  4 ++--
 .../java/io/lettuce/core/output/IntegerOutput.java   |  4 ++--
 .../java/io/lettuce/core/output/KeyListOutput.java   |  4 ++--
 src/main/java/io/lettuce/core/output/KeyOutput.java  |  4 ++--
 .../java/io/lettuce/core/output/KeyScanOutput.java   |  4 ++--
 .../lettuce/core/output/KeyScanStreamingOutput.java  |  4 ++--
 .../io/lettuce/core/output/KeyStreamingChannel.java  |  4 ++--
 .../io/lettuce/core/output/KeyStreamingOutput.java   |  4 ++--
 .../io/lettuce/core/output/KeyValueListOutput.java   |  4 ++--
 .../java/io/lettuce/core/output/KeyValueOutput.java  |  4 ++--
 .../core/output/KeyValueScanStreamingOutput.java     |  4 ++--
 .../core/output/KeyValueScoredValueOutput.java       |  4 ++--
 .../core/output/KeyValueStreamingChannel.java        |  4 ++--
 .../lettuce/core/output/KeyValueStreamingOutput.java |  4 ++--
 .../io/lettuce/core/output/ListOfMapsOutput.java     |  4 ++--
 .../java/io/lettuce/core/output/ListSubscriber.java  |  4 ++--
 src/main/java/io/lettuce/core/output/MapOutput.java  |  4 ++--
 .../java/io/lettuce/core/output/MapScanOutput.java   |  4 ++--
 .../java/io/lettuce/core/output/MultiOutput.java     |  4 ++--
 .../io/lettuce/core/output/NestedMultiOutput.java    |  4 ++--
 .../java/io/lettuce/core/output/OutputFactory.java   |  4 ++--
 .../java/io/lettuce/core/output/ReplayOutput.java    |  4 ++--
 src/main/java/io/lettuce/core/output/ScanOutput.java |  4 ++--
 .../lettuce/core/output/ScoredValueListOutput.java   |  4 ++--
 .../io/lettuce/core/output/ScoredValueOutput.java    |  4 ++--
 .../lettuce/core/output/ScoredValueScanOutput.java   |  4 ++--
 .../core/output/ScoredValueScanStreamingOutput.java  |  4 ++--
 .../core/output/ScoredValueStreamingChannel.java     |  4 ++--
 .../core/output/ScoredValueStreamingOutput.java      |  4 ++--
 .../io/lettuce/core/output/SocketAddressOutput.java  |  4 ++--
 .../java/io/lettuce/core/output/StatusOutput.java    |  4 ++--
 .../lettuce/core/output/StreamMessageListOutput.java |  4 ++--
 .../io/lettuce/core/output/StreamReadOutput.java     |  4 ++--
 .../io/lettuce/core/output/StreamingChannel.java     |  4 ++--
 .../java/io/lettuce/core/output/StreamingOutput.java |  4 ++--
 .../io/lettuce/core/output/StringListOutput.java     |  4 ++--
 .../lettuce/core/output/StringValueListOutput.java   |  4 ++--
 .../java/io/lettuce/core/output/ValueListOutput.java |  4 ++--
 .../java/io/lettuce/core/output/ValueOutput.java     |  4 ++--
 .../java/io/lettuce/core/output/ValueScanOutput.java |  4 ++--
 .../core/output/ValueScanStreamingOutput.java        |  4 ++--
 .../java/io/lettuce/core/output/ValueSetOutput.java  |  4 ++--
 .../lettuce/core/output/ValueStreamingChannel.java   |  4 ++--
 .../io/lettuce/core/output/ValueStreamingOutput.java |  4 ++--
 .../io/lettuce/core/output/ValueValueListOutput.java |  4 ++--
 .../java/io/lettuce/core/protocol/AsyncCommand.java  |  4 ++--
 .../core/protocol/BaseRedisCommandBuilder.java       |  4 ++--
 .../lettuce/core/protocol/ChannelLogDescriptor.java  |  4 ++--
 src/main/java/io/lettuce/core/protocol/Command.java  |  4 ++--
 .../java/io/lettuce/core/protocol/CommandArgs.java   |  4 ++--
 .../lettuce/core/protocol/CommandArgsAccessor.java   |  4 ++--
 .../io/lettuce/core/protocol/CommandEncoder.java     |  4 ++--
 .../lettuce/core/protocol/CommandExpiryWriter.java   |  4 ++--
 .../io/lettuce/core/protocol/CommandHandler.java     |  4 ++--
 .../io/lettuce/core/protocol/CommandKeyword.java     |  4 ++--
 .../java/io/lettuce/core/protocol/CommandType.java   |  4 ++--
 .../io/lettuce/core/protocol/CommandWrapper.java     |  4 ++--
 .../lettuce/core/protocol/CompleteableCommand.java   |  4 ++--
 .../io/lettuce/core/protocol/ConnectionFacade.java   |  4 ++--
 .../lettuce/core/protocol/ConnectionInitializer.java |  4 ++--
 .../io/lettuce/core/protocol/ConnectionWatchdog.java |  4 ++--
 .../io/lettuce/core/protocol/DecoratedCommand.java   |  4 ++--
 .../io/lettuce/core/protocol/DefaultEndpoint.java    |  4 ++--
 .../java/io/lettuce/core/protocol/DemandAware.java   |  4 ++--
 src/main/java/io/lettuce/core/protocol/Endpoint.java |  4 ++--
 .../io/lettuce/core/protocol/HasQueuedCommands.java  |  4 ++--
 .../lettuce/core/protocol/LatencyMeteredCommand.java |  4 ++--
 .../core/protocol/PristineFallbackCommand.java       |  4 ++--
 .../io/lettuce/core/protocol/ProtocolKeyword.java    |  4 ++--
 .../io/lettuce/core/protocol/ProtocolVersion.java    |  4 ++--
 .../lettuce/core/protocol/ReconnectionHandler.java   |  4 ++--
 .../lettuce/core/protocol/ReconnectionListener.java  |  4 ++--
 .../java/io/lettuce/core/protocol/RedisCommand.java  |  4 ++--
 .../lettuce/core/protocol/RedisHandshakeHandler.java |  4 ++--
 .../core/protocol/RedisProtocolException.java        |  4 ++--
 .../io/lettuce/core/protocol/RedisStateMachine.java  |  4 ++--
 .../java/io/lettuce/core/protocol/SharedLock.java    |  4 ++--
 .../core/protocol/SslRedisHandshakeHandler.java      |  4 ++--
 .../java/io/lettuce/core/protocol/TracedCommand.java |  4 ++--
 .../lettuce/core/protocol/TransactionalCommand.java  |  4 ++--
 .../java/io/lettuce/core/protocol/WithLatency.java   |  4 ++--
 .../io/lettuce/core/pubsub/PubSubCommandArgs.java    |  4 ++--
 .../io/lettuce/core/pubsub/PubSubCommandBuilder.java |  4 ++--
 .../io/lettuce/core/pubsub/PubSubCommandHandler.java |  4 ++--
 .../java/io/lettuce/core/pubsub/PubSubEndpoint.java  |  4 ++--
 .../java/io/lettuce/core/pubsub/PubSubOutput.java    |  4 ++--
 .../io/lettuce/core/pubsub/RedisPubSubAdapter.java   |  4 ++--
 .../core/pubsub/RedisPubSubAsyncCommandsImpl.java    |  4 ++--
 .../io/lettuce/core/pubsub/RedisPubSubListener.java  |  4 ++--
 .../core/pubsub/RedisPubSubReactiveCommandsImpl.java |  4 ++--
 .../core/pubsub/StatefulRedisPubSubConnection.java   |  4 ++--
 .../pubsub/StatefulRedisPubSubConnectionImpl.java    |  4 ++--
 .../pubsub/api/async/RedisPubSubAsyncCommands.java   |  4 ++--
 .../core/pubsub/api/reactive/ChannelMessage.java     |  4 ++--
 .../core/pubsub/api/reactive/PatternMessage.java     |  4 ++--
 .../api/reactive/RedisPubSubReactiveCommands.java    |  4 ++--
 .../core/pubsub/api/sync/RedisPubSubCommands.java    |  4 ++--
 .../io/lettuce/core/resource/ClientResources.java    |  4 ++--
 .../java/io/lettuce/core/resource/ConstantDelay.java |  4 ++--
 .../core/resource/DecorrelatedJitterDelay.java       |  4 ++--
 .../core/resource/DefaultClientResources.java        |  4 ++--
 .../core/resource/DefaultEventLoopGroupProvider.java |  4 ++--
 .../core/resource/DefaultNettyCustomizer.java        |  4 ++--
 src/main/java/io/lettuce/core/resource/Delay.java    |  4 ++--
 .../lettuce/core/resource/DirContextDnsResolver.java |  4 ++--
 .../java/io/lettuce/core/resource/DnsResolver.java   |  4 ++--
 .../java/io/lettuce/core/resource/DnsResolvers.java  |  4 ++--
 .../java/io/lettuce/core/resource/EpollProvider.java |  4 ++--
 .../io/lettuce/core/resource/EqualJitterDelay.java   |  4 ++--
 .../core/resource/EventLoopGroupProvider.java        |  4 ++--
 .../io/lettuce/core/resource/EventLoopResources.java |  4 ++--
 .../io/lettuce/core/resource/ExponentialDelay.java   |  4 ++--
 .../io/lettuce/core/resource/FullJitterDelay.java    |  4 ++--
 .../io/lettuce/core/resource/KqueueProvider.java     |  4 ++--
 .../core/resource/MappingSocketAddressResolver.java  |  4 ++--
 .../io/lettuce/core/resource/NettyCustomizer.java    |  4 ++--
 .../io/lettuce/core/resource/PromiseAdapter.java     |  4 ++--
 .../lettuce/core/resource/SocketAddressResolver.java |  4 ++--
 .../sentinel/RedisSentinelAsyncCommandsImpl.java     |  4 ++--
 .../sentinel/RedisSentinelReactiveCommandsImpl.java  |  4 ++--
 .../core/sentinel/SentinelCommandBuilder.java        |  4 ++--
 .../StatefulRedisSentinelConnectionImpl.java         |  4 ++--
 .../api/StatefulRedisSentinelConnection.java         |  4 ++--
 .../api/async/RedisSentinelAsyncCommands.java        |  4 ++--
 .../api/reactive/RedisSentinelReactiveCommands.java  |  4 ++--
 .../sentinel/api/sync/RedisSentinelCommands.java     |  4 ++--
 .../io/lettuce/core/support/AbstractCdiBean.java     |  4 ++--
 .../core/support/AsyncConnectionPoolSupport.java     |  4 ++--
 .../io/lettuce/core/support/AsyncObjectFactory.java  |  4 ++--
 src/main/java/io/lettuce/core/support/AsyncPool.java |  4 ++--
 src/main/java/io/lettuce/core/support/BasePool.java  |  4 ++--
 .../java/io/lettuce/core/support/BasePoolConfig.java |  4 ++--
 .../io/lettuce/core/support/BoundedAsyncPool.java    |  4 ++--
 .../io/lettuce/core/support/BoundedPoolConfig.java   |  4 ++--
 .../core/support/ClientResourcesFactoryBean.java     |  4 ++--
 .../core/support/CommonsPool2ConfigConverter.java    |  4 ++--
 .../lettuce/core/support/ConnectionPoolSupport.java  |  4 ++--
 .../io/lettuce/core/support/ConnectionWrapping.java  |  4 ++--
 .../io/lettuce/core/support/LettuceCdiExtension.java |  4 ++--
 .../core/support/LettuceFactoryBeanSupport.java      |  4 ++--
 .../io/lettuce/core/support/RedisClientCdiBean.java  |  4 ++--
 .../lettuce/core/support/RedisClientFactoryBean.java |  4 ++--
 .../core/support/RedisClusterClientCdiBean.java      |  4 ++--
 .../core/support/RedisClusterClientFactoryBean.java  |  4 ++--
 .../java/io/lettuce/core/tracing/BraveTracing.java   |  4 ++--
 .../java/io/lettuce/core/tracing/NoOpTracing.java    |  4 ++--
 .../java/io/lettuce/core/tracing/TraceContext.java   |  4 ++--
 .../lettuce/core/tracing/TraceContextProvider.java   |  4 ++--
 src/main/java/io/lettuce/core/tracing/Tracer.java    |  4 ++--
 .../java/io/lettuce/core/tracing/TracerProvider.java |  4 ++--
 src/main/java/io/lettuce/core/tracing/Tracing.java   |  4 ++--
 src/main/javadoc/stylesheet.css                      |  4 ++--
 src/main/resources/META-INF/LICENSE                  |  2 +-
 src/main/resources/META-INF/NOTICE                   |  2 +-
 .../io/lettuce/core/api/BaseRedisCommands.java       |  4 ++--
 .../io/lettuce/core/api/RedisGeoCommands.java        |  4 ++--
 .../io/lettuce/core/api/RedisHLLCommands.java        |  4 ++--
 .../io/lettuce/core/api/RedisHashCommands.java       |  4 ++--
 .../io/lettuce/core/api/RedisKeyCommands.java        |  4 ++--
 .../io/lettuce/core/api/RedisListCommands.java       |  4 ++--
 .../io/lettuce/core/api/RedisScriptingCommands.java  |  4 ++--
 .../io/lettuce/core/api/RedisSentinelCommands.java   |  4 ++--
 .../io/lettuce/core/api/RedisServerCommands.java     |  4 ++--
 .../io/lettuce/core/api/RedisSetCommands.java        |  4 ++--
 .../io/lettuce/core/api/RedisSortedSetCommands.java  |  4 ++--
 .../io/lettuce/core/api/RedisStreamCommands.java     |  4 ++--
 .../io/lettuce/core/api/RedisStringCommands.java     |  4 ++--
 .../lettuce/core/api/RedisTransactionalCommands.java |  4 ++--
 src/test/bash/create_certificates.sh                 |  4 ++--
 .../paluch/redis/extensibility/LettuceGeoDemo.java   |  4 ++--
 .../redis/extensibility/MyExtendedRedisClient.java   |  4 ++--
 .../extensibility/MyExtendedRedisClientTest.java     |  4 ++--
 .../redis/extensibility/MyPubSubConnection.java      |  4 ++--
 src/test/java/io/lettuce/RedisBug.java               |  4 ++--
 .../lettuce/apigenerator/CompilationUnitFactory.java |  4 ++--
 src/test/java/io/lettuce/apigenerator/Constants.java |  4 ++--
 .../java/io/lettuce/apigenerator/CreateAsyncApi.java |  4 ++--
 .../CreateAsyncNodeSelectionClusterApi.java          |  4 ++--
 .../io/lettuce/apigenerator/CreateReactiveApi.java   |  4 ++--
 .../java/io/lettuce/apigenerator/CreateSyncApi.java  |  4 ++--
 .../CreateSyncNodeSelectionClusterApi.java           |  4 ++--
 .../apigenerator/GenerateCommandInterfaces.java      |  4 ++--
 src/test/java/io/lettuce/category/SlowTests.java     |  4 ++--
 src/test/java/io/lettuce/codec/CRC16UnitTests.java   |  4 ++--
 .../io/lettuce/core/AbstractRedisClientTest.java     |  4 ++--
 .../core/AsyncConnectionIntegrationTests.java        |  4 ++--
 .../lettuce/core/AuthenticationIntegrationTests.java |  4 ++--
 src/test/java/io/lettuce/core/ByteBufferCodec.java   |  4 ++--
 .../java/io/lettuce/core/ClientIntegrationTests.java |  4 ++--
 .../lettuce/core/ClientMetricsIntegrationTests.java  |  4 ++--
 .../lettuce/core/ClientOptionsIntegrationTests.java  |  4 ++--
 .../java/io/lettuce/core/ClientOptionsUnitTests.java |  4 ++--
 .../lettuce/core/ConnectMethodsIntegrationTests.java |  4 ++--
 .../core/ConnectionCommandIntegrationTests.java      |  4 ++--
 .../io/lettuce/core/ConnectionFutureUnitTests.java   |  4 ++--
 .../io/lettuce/core/CustomCodecIntegrationTests.java |  4 ++--
 .../io/lettuce/core/ExceptionFactoryUnitTests.java   |  4 ++--
 src/test/java/io/lettuce/core/GeoModelUnitTests.java |  4 ++--
 .../java/io/lettuce/core/JavaRuntimeUnitTests.java   |  4 ++--
 src/test/java/io/lettuce/core/KeyValueUnitTests.java |  4 ++--
 .../io/lettuce/core/LettuceFuturesUnitTests.java     |  4 ++--
 src/test/java/io/lettuce/core/LimitUnitTests.java    |  4 ++--
 .../io/lettuce/core/PipeliningIntegrationTests.java  |  4 ++--
 .../java/io/lettuce/core/ProtectedModeTests.java     |  4 ++--
 src/test/java/io/lettuce/core/RangeUnitTests.java    |  4 ++--
 .../ReactiveBackpressurePropagationUnitTests.java    |  4 ++--
 .../core/ReactiveConnectionIntegrationTests.java     |  4 ++--
 .../ReactiveStreamingOutputIntegrationTests.java     |  4 ++--
 .../core/RedisClientConnectIntegrationTests.java     |  4 ++--
 .../core/RedisClientFactoryBeanUnitTests.java        |  4 ++--
 .../io/lettuce/core/RedisClientFactoryUnitTests.java |  4 ++--
 .../io/lettuce/core/RedisClientIntegrationTests.java |  4 ++--
 .../core/RedisClientListenerIntegrationTests.java    |  4 ++--
 .../java/io/lettuce/core/RedisClientUnitTests.java   |  4 ++--
 .../io/lettuce/core/RedisURIBuilderUnitTests.java    |  4 ++--
 src/test/java/io/lettuce/core/RedisURIUnitTests.java |  4 ++--
 src/test/java/io/lettuce/core/ScanArgsUnitTests.java |  4 ++--
 .../java/io/lettuce/core/ScanCursorUnitTests.java    |  4 ++--
 .../lettuce/core/ScanIteratorIntegrationTests.java   |  4 ++--
 .../io/lettuce/core/ScanStreamIntegrationTests.java  |  4 ++--
 .../io/lettuce/core/ScoredValueStreamingAdapter.java |  4 ++--
 .../java/io/lettuce/core/ScoredValueUnitTests.java   |  4 ++--
 .../lettuce/core/SocketOptionsIntegrationTests.java  |  4 ++--
 .../java/io/lettuce/core/SocketOptionsUnitTests.java |  4 ++--
 .../java/io/lettuce/core/SslIntegrationTests.java    |  4 ++--
 .../java/io/lettuce/core/SslOptionsUnitTests.java    |  4 ++--
 .../core/SyncAsyncApiConvergenceUnitTests.java       |  4 ++--
 .../java/io/lettuce/core/TestRedisPublisher.java     |  4 ++--
 src/test/java/io/lettuce/core/TestSupport.java       |  4 ++--
 .../io/lettuce/core/TimeoutOptionsUnitTests.java     |  4 ++--
 .../core/UnixDomainSocketIntegrationTests.java       |  4 ++--
 .../core/Utf8StringCodecIntegrationTests.java        |  4 ++--
 src/test/java/io/lettuce/core/ValueUnitTests.java    |  4 ++--
 .../java/io/lettuce/core/ZStoreArgsUnitTests.java    |  4 ++--
 .../AdvancedClusterClientIntegrationTests.java       |  4 ++--
 .../AdvancedClusterReactiveIntegrationTests.java     |  4 ++--
 .../AsyncConnectionProviderIntegrationTests.java     |  4 ++--
 .../cluster/ByteCodecClusterIntegrationTests.java    |  4 ++--
 .../ClusterClientOptionsIntegrationTests.java        |  4 ++--
 .../core/cluster/ClusterClientOptionsUnitTests.java  |  4 ++--
 .../core/cluster/ClusterCommandIntegrationTests.java |  4 ++--
 .../core/cluster/ClusterCommandUnitTests.java        | 10 +++++-----
 .../ClusterDistributionChannelWriterUnitTests.java   | 12 ++++++------
 .../core/cluster/ClusterNodeEndpointUnitTests.java   |  4 ++--
 .../ClusterPartiallyDownIntegrationTests.java        |  4 ++--
 .../ClusterReactiveCommandIntegrationTests.java      |  4 ++--
 .../java/io/lettuce/core/cluster/ClusterRule.java    |  4 ++--
 .../java/io/lettuce/core/cluster/ClusterSetup.java   |  4 ++--
 .../io/lettuce/core/cluster/ClusterTestSettings.java |  4 ++--
 .../io/lettuce/core/cluster/ClusterTestUtil.java     |  4 ++--
 .../ClusterTopologyRefreshOptionsUnitTests.java      |  4 ++--
 .../ClusterTopologyRefreshSchedulerUnitTests.java    |  4 ++--
 .../core/cluster/CommandSetIntegrationTests.java     |  4 ++--
 .../HealthyMajorityPartitionsConsensusUnitTests.java |  4 ++--
 .../KnownMajorityPartitionsConsensusUnitTests.java   |  4 ++--
 .../cluster/NodeSelectionAsyncIntegrationTests.java  |  4 ++--
 .../cluster/NodeSelectionSyncIntegrationTests.java   |  4 ++--
 .../core/cluster/PartitionsConsensusTestSupport.java |  6 +++---
 .../core/cluster/PipelinedRedisFutureUnitTests.java  |  4 ++--
 .../PooledClusterConnectionProviderUnitTests.java    |  4 ++--
 .../io/lettuce/core/cluster/ReadFromUnitTests.java   |  4 ++--
 .../core/cluster/ReadOnlyCommandsUnitTests.java      |  4 ++--
 .../core/cluster/RedisClusterClientFactoryTests.java |  4 ++--
 .../cluster/RedisClusterClientIntegrationTests.java  |  6 +++---
 ...disClusterPasswordSecuredSslIntegrationTests.java |  4 ++--
 .../RedisClusterReadFromIntegrationTests.java        |  4 ++--
 .../lettuce/core/cluster/RedisClusterSetupTest.java  |  4 ++--
 .../cluster/RedisClusterStressScenariosTest.java     |  4 ++--
 .../core/cluster/RedisClusterURIUtilUnitTests.java   |  4 ++--
 .../RedisReactiveClusterClientIntegrationTests.java  |  4 ++--
 .../RoundRobinSocketAddressSupplierUnitTests.java    |  4 ++--
 .../core/cluster/ScanIteratorIntegrationTests.java   |  4 ++--
 .../core/cluster/ScanStreamIntegrationTests.java     |  4 ++--
 ...hreadedReactiveClusterClientIntegrationTests.java |  4 ++--
 .../io/lettuce/core/cluster/SlotHashUnitTests.java   |  4 ++--
 .../CustomClusterCommandIntegrationTests.java        |  4 ++--
 .../commands/GeoClusterCommandIntegrationTests.java  |  4 ++--
 .../commands/HashClusterCommandIntegrationTests.java |  4 ++--
 .../commands/KeyClusterCommandIntegrationTests.java  |  4 ++--
 .../commands/ListClusterCommandIntegrationTests.java |  4 ++--
 .../StringClusterCommandIntegrationTests.java        |  4 ++--
 .../HashClusterReactiveCommandIntegrationTests.java  |  4 ++--
 .../ListClusterReactiveCommandIntegrationTests.java  |  4 ++--
 ...StringClusterReactiveCommandIntegrationTests.java |  4 ++--
 .../partitions/ClusterPartitionParserUnitTests.java  |  4 ++--
 .../models/partitions/PartitionsUnitTests.java       |  4 ++--
 .../models/partitions/RedisClusterNodeUnitTests.java |  4 ++--
 .../models/slots/ClusterSlotsParserUnitTests.java    |  4 ++--
 ...RedisClusterPubSubConnectionIntegrationTests.java |  4 ++--
 .../topology/ClusterTopologyRefreshUnitTests.java    |  4 ++--
 .../core/cluster/topology/ConnectionsUnitTests.java  |  4 ++--
 .../cluster/topology/NodeTopologyViewsUnitTests.java |  4 ++--
 .../core/cluster/topology/RequestsUnitTests.java     |  4 ++--
 .../topology/TopologyComparatorsUnitTests.java       |  4 ++--
 .../topology/TopologyRefreshIntegrationTests.java    |  4 ++--
 .../io/lettuce/core/codec/CipherCodecUnitTests.java  |  4 ++--
 .../core/codec/CompressionCodecUnitTests.java        |  4 ++--
 .../io/lettuce/core/codec/StringCodecUnitTests.java  |  4 ++--
 .../core/commands/BitCommandIntegrationTests.java    |  4 ++--
 .../io/lettuce/core/commands/BitStringCodec.java     |  4 ++--
 .../core/commands/CustomCommandIntegrationTests.java |  4 ++--
 .../core/commands/GeoCommandIntegrationTests.java    |  4 ++--
 .../core/commands/HLLCommandIntegrationTests.java    |  4 ++--
 .../core/commands/HashCommandIntegrationTests.java   |  4 ++--
 .../core/commands/KeyCommandIntegrationTests.java    |  4 ++--
 .../core/commands/ListCommandIntegrationTests.java   |  4 ++--
 .../commands/NumericCommandIntegrationTests.java     |  4 ++--
 .../RunOnlyOnceServerCommandIntegrationTests.java    |  4 ++--
 .../commands/ScriptingCommandIntegrationTests.java   |  4 ++--
 .../core/commands/ServerCommandIntegrationTests.java |  4 ++--
 .../core/commands/SetCommandIntegrationTests.java    |  4 ++--
 .../core/commands/SortCommandIntegrationTests.java   |  4 ++--
 .../commands/SortedSetCommandIntegrationTests.java   |  4 ++--
 .../core/commands/StreamCommandIntegrationTests.java |  4 ++--
 .../core/commands/StringCommandIntegrationTests.java |  4 ++--
 .../commands/TransactionCommandIntegrationTests.java |  4 ++--
 .../reactive/BitReactiveCommandIntegrationTests.java |  4 ++--
 .../CustomReactiveCommandIntegrationTests.java       |  4 ++--
 .../reactive/GeoReactiveCommandIntegrationTests.java |  4 ++--
 .../reactive/HLLReactiveCommandIntegrationTests.java |  4 ++--
 .../HashReactiveCommandIntegrationTests.java         |  4 ++--
 .../reactive/KeyReactiveCommandIntegrationTests.java |  4 ++--
 .../ListReactiveCommandIntegrationTests.java         |  4 ++--
 .../NumericReactiveCommandIntegrationTests.java      |  4 ++--
 .../ScriptingReactiveCommandIntegrationTests.java    |  4 ++--
 .../ServerReactiveCommandIntegrationTests.java       |  4 ++--
 .../reactive/SetReactiveCommandIntegrationTests.java |  4 ++--
 .../SortReactiveCommandIntegrationTests.java         |  4 ++--
 .../SortedSetReactiveCommandIntegrationTests.java    |  4 ++--
 .../StreamReactiveCommandIntegrationTests.java       |  4 ++--
 .../StringReactiveCommandIntegrationTests.java       |  4 ++--
 .../TransactionReactiveCommandIntegrationTests.java  |  4 ++--
 .../transactional/BitTxCommandIntegrationTests.java  |  4 ++--
 .../transactional/GeoTxCommandIntegrationTests.java  |  4 ++--
 .../transactional/HLLTxCommandIntegrationTests.java  |  4 ++--
 .../transactional/HashTxCommandIntegrationTests.java |  4 ++--
 .../transactional/KeyTxCommandIntegrationTests.java  |  4 ++--
 .../transactional/ListTxCommandIntegrationTests.java |  4 ++--
 .../transactional/SetTxCommandIntegrationTests.java  |  4 ++--
 .../transactional/SortTxCommandIntegrationTests.java |  4 ++--
 .../SortedSetTxCommandIntegrationTests.java          |  4 ++--
 .../StringTxCommandIntegrationTests.java             |  4 ++--
 .../transactional/TxSyncInvocationHandler.java       |  4 ++--
 ...atchExecutableCommandLookupStrategyUnitTests.java |  4 ++--
 .../CommandSegmentCommandFactoryUnitTests.java       |  4 ++--
 .../core/dynamic/ConversionServiceUnitTests.java     |  4 ++--
 .../core/dynamic/DeclaredCommandMethodUnitTests.java |  4 ++--
 .../DefaultCommandMethodVerifierUnitTests.java       |  4 ++--
 .../core/dynamic/ParameterBinderUnitTests.java       |  4 ++--
 ...eactiveCommandSegmentCommandFactoryUnitTests.java |  4 ++--
 .../core/dynamic/ReactiveTypeAdaptersUnitTests.java  |  4 ++--
 .../ReactiveTypeAdaptionIntegrationTests.java        |  4 ++--
 .../dynamic/RedisCommandsAsyncIntegrationTests.java  |  4 ++--
 .../RedisCommandsBatchingIntegrationTests.java       |  4 ++--
 .../RedisCommandsClusterIntegrationTests.java        |  4 ++--
 .../core/dynamic/RedisCommandsIntegrationTests.java  |  4 ++--
 .../RedisCommandsReactiveIntegrationTests.java       |  4 ++--
 .../dynamic/RedisCommandsSyncIntegrationTests.java   |  4 ++--
 .../lettuce/core/dynamic/SimpleBatcherUnitTests.java |  4 ++--
 .../codec/AnnotationRedisCodecResolverUnitTests.java |  4 ++--
 .../dynamic/codec/ParameterWrappersUnitTests.java    |  4 ++--
 .../intercept/InvocationProxyFactoryUnitTests.java   |  4 ++--
 .../output/CodecAwareOutputResolverUnitTests.java    |  4 ++--
 ...egistryCommandOutputFactoryResolverUnitTests.java |  4 ++--
 .../core/dynamic/output/OutputRegistryUnitTests.java |  4 ++--
 .../AnnotationCommandSegmentFactoryUnitTests.java    |  4 ++--
 .../ParametrizedTypeInformationUnitTests.java        |  4 ++--
 .../support/WildcardTypeInformationUnitTests.java    |  4 ++--
 .../ConnectionEventsTriggeredIntegrationTests.java   |  4 ++--
 .../lettuce/core/event/DefaultEventBusUnitTests.java |  4 ++--
 .../event/DefaultEventPublisherOptionsUnitTests.java |  4 ++--
 .../internal/AbstractInvocationHandlerUnitTests.java |  4 ++--
 .../lettuce/core/internal/HostAndPortUnitTests.java  |  4 ++--
 .../MasterReplicaSentinelSslIntegrationTests.java    |  4 ++--
 .../core/masterreplica/MasterReplicaTest.java        |  4 ++--
 .../core/masterreplica/StaticMasterReplicaTest.java  |  4 ++--
 .../core/masterslave/ConnectionsUnitTests.java       |  4 ++--
 .../masterslave/CustomCommandIntegrationTests.java   |  4 ++--
 .../MasterSlaveChannelWriterUnitTests.java           |  4 ++--
 .../MasterSlaveConnectionProviderUnitTests.java      |  4 ++--
 .../MasterSlaveSentinelIntegrationTests.java         |  4 ++--
 .../io/lettuce/core/masterslave/MasterSlaveTest.java |  4 ++--
 .../MasterSlaveTopologyProviderUnitTests.java        |  4 ++--
 .../MasterSlaveTopologyRefreshUnitTests.java         |  4 ++--
 .../core/masterslave/MasterSlaveUtilsUnitTests.java  |  4 ++--
 .../SentinelTopologyRefreshUnitTests.java            | 10 +++++-----
 .../core/masterslave/StaticMasterSlaveTest.java      |  4 ++--
 .../CommandLatencyCollectorOptionsUnitTests.java     |  4 ++--
 .../core/metrics/CommandLatencyIdUnitTests.java      |  4 ++--
 ...faultCommandLatencyCollectorOptionsUnitTests.java |  4 ++--
 .../DefaultCommandLatencyCollectorUnitTests.java     |  4 ++--
 .../models/command/CommandDetailParserUnitTests.java |  4 ++--
 .../core/models/role/RoleParserUnitTests.java        |  4 ++--
 .../core/models/stream/PendingParserUnitTests.java   |  4 ++--
 .../core/output/BooleanListOutputUnitTests.java      |  4 ++--
 .../output/GeoCoordinatesListOutputUnitTests.java    |  4 ++--
 .../GeoCoordinatesValueListOutputUnitTests.java      |  4 ++--
 .../core/output/GeoWithinListOutputUnitTests.java    |  4 ++--
 .../io/lettuce/core/output/ListOutputUnitTests.java  |  4 ++--
 .../io/lettuce/core/output/MultiOutputUnitTests.java |  4 ++--
 .../core/output/NestedMultiOutputUnitTests.java      |  4 ++--
 .../lettuce/core/output/ReplayOutputUnitTests.java   |  4 ++--
 .../core/output/ScoredValueListOutputUnitTests.java  |  4 ++--
 .../core/output/SocketAddressOutputUnitTests.java    |  4 ++--
 .../lettuce/core/protocol/AsyncCommandUnitTests.java |  4 ++--
 .../lettuce/core/protocol/CommandArgsUnitTests.java  |  4 ++--
 .../core/protocol/CommandHandlerUnitTests.java       |  4 ++--
 .../io/lettuce/core/protocol/CommandUnitTests.java   |  4 ++--
 .../core/protocol/CommandWrapperUnitTests.java       |  4 ++--
 .../protocol/ConnectionFailureIntegrationTests.java  |  4 ++--
 .../core/protocol/DefaultEndpointUnitTests.java      |  4 ++--
 .../protocol/RedisStateMachineResp2UnitTests.java    |  4 ++--
 .../protocol/RedisStateMachineResp3UnitTests.java    |  4 ++--
 .../lettuce/core/protocol/StateMachineUnitTests.java |  4 ++--
 .../core/protocol/TransactionalCommandUnitTests.java |  4 ++--
 .../core/pubsub/PubSubCommandHandlerUnitTests.java   |  4 ++--
 .../io/lettuce/core/pubsub/PubSubCommandTest.java    |  4 ++--
 .../lettuce/core/pubsub/PubSubEndpointUnitTests.java |  4 ++--
 .../io/lettuce/core/pubsub/PubSubReactiveTest.java   |  4 ++--
 .../core/reactive/RedisPublisherVerification.java    |  4 ++--
 .../core/reactive/ScanStreamVerification.java        |  6 +++---
 .../io/lettuce/core/reliability/AtLeastOnceTest.java |  4 ++--
 .../io/lettuce/core/reliability/AtMostOnceTest.java  |  4 ++--
 .../core/resource/ConstantDelayUnitTests.java        |  4 ++--
 .../resource/DecorrelatedJitterDelayUnitTests.java   |  4 ++--
 .../resource/DefaultClientResourcesUnitTests.java    |  4 ++--
 .../DefaultEventLoopGroupProviderUnitTests.java      |  4 ++--
 .../core/resource/DirContextDnsResolverTests.java    |  4 ++--
 .../core/resource/EqualJitterDelayUnitTests.java     |  4 ++--
 .../core/resource/ExponentialDelayUnitTests.java     |  4 ++--
 .../core/resource/FullJitterDelayUnitTests.java      |  4 ++--
 .../MappingSocketAddressResolverUnitTests.java       |  4 ++--
 .../sentinel/SentinelCommandIntegrationTests.java    |  4 ++--
 .../sentinel/SentinelConnectionIntegrationTests.java |  4 ++--
 .../SentinelServerCommandIntegrationTests.java       |  4 ++--
 .../core/sentinel/SentinelSslIntegrationTests.java   |  4 ++--
 .../lettuce/core/sentinel/SentinelTestSettings.java  |  4 ++--
 .../reactive/SentinelReactiveCommandTest.java        |  4 ++--
 .../reactive/SentinelServerReactiveCommandTest.java  |  4 ++--
 .../AsyncConnectionPoolSupportIntegrationTests.java  |  4 ++--
 .../support/AsyncPoolWithValidationUnitTests.java    |  4 ++--
 .../core/support/BoundedAsyncPoolUnitTests.java      |  4 ++--
 .../io/lettuce/core/support/CdiIntegrationTests.java |  4 ++--
 .../CommonsPool2ConfigConverterUnitTests.java        |  4 ++--
 .../ConnectionPoolSupportIntegrationTests.java       |  4 ++--
 .../java/io/lettuce/core/support/InjectedClient.java |  4 ++--
 src/test/java/io/lettuce/core/support/PersonDB.java  |  4 ++--
 .../io/lettuce/core/support/PubSubTestListener.java  |  4 ++--
 .../RedisClusterClientFactoryBeanUnitTests.java      |  4 ++--
 .../lettuce/core/support/SpringIntegrationTests.java |  4 ++--
 .../core/tracing/BraveTracingIntegrationTests.java   |  4 ++--
 .../lettuce/core/tracing/BraveTracingUnitTests.java  |  4 ++--
 .../lettuce/examples/ConnectToElastiCacheMaster.java |  4 ++--
 .../ConnectToMasterSlaveUsingElastiCacheCluster.java |  4 ++--
 .../ConnectToMasterSlaveUsingRedisSentinel.java      |  4 ++--
 .../java/io/lettuce/examples/ConnectToRedis.java     |  4 ++--
 .../io/lettuce/examples/ConnectToRedisCluster.java   |  4 ++--
 .../lettuce/examples/ConnectToRedisClusterSSL.java   |  4 ++--
 .../ConnectToRedisClusterWithTopologyRefreshing.java |  4 ++--
 .../java/io/lettuce/examples/ConnectToRedisSSL.java  |  4 ++--
 .../examples/ConnectToRedisUsingRedisSentinel.java   |  4 ++--
 src/test/java/io/lettuce/examples/MySpringBean.java  |  4 ++--
 .../java/io/lettuce/examples/ReadWriteExample.java   |  4 ++--
 src/test/java/io/lettuce/examples/SpringExample.java |  4 ++--
 src/test/java/io/lettuce/test/CanConnect.java        |  4 ++--
 src/test/java/io/lettuce/test/CliParser.java         |  4 ++--
 .../test/ConnectionDecoratingInvocationHandler.java  |  4 ++--
 .../java/io/lettuce/test/ConnectionTestUtil.java     |  4 ++--
 src/test/java/io/lettuce/test/Delay.java             |  4 ++--
 .../io/lettuce/test/KeyValueStreamingAdapter.java    |  4 ++--
 src/test/java/io/lettuce/test/KeysAndValues.java     |  4 ++--
 src/test/java/io/lettuce/test/LettuceExtension.java  |  4 ++--
 .../java/io/lettuce/test/ListStreamingAdapter.java   |  4 ++--
 .../lettuce/test/ReactiveSyncInvocationHandler.java  |  4 ++--
 .../io/lettuce/test/RoutingInvocationHandler.java    |  4 ++--
 src/test/java/io/lettuce/test/TestFutures.java       |  4 ++--
 src/test/java/io/lettuce/test/Wait.java              |  4 ++--
 src/test/java/io/lettuce/test/WithPassword.java      |  4 ++--
 .../io/lettuce/test/condition/EnabledOnCommand.java  |  4 ++--
 .../test/condition/EnabledOnCommandCondition.java    |  4 ++--
 .../io/lettuce/test/condition/RedisConditions.java   |  4 ++--
 .../io/lettuce/test/resource/DefaultRedisClient.java |  4 ++--
 .../test/resource/DefaultRedisClusterClient.java     |  4 ++--
 .../java/io/lettuce/test/resource/FastShutdown.java  |  4 ++--
 .../lettuce/test/resource/TestClientResources.java   |  4 ++--
 .../test/resource/TestEventLoopGroupProvider.java    |  4 ++--
 .../java/io/lettuce/test/server/MockTcpServer.java   |  4 ++--
 .../io/lettuce/test/server/RandomResponseServer.java |  4 ++--
 .../io/lettuce/test/server/RandomServerHandler.java  |  4 ++--
 .../java/io/lettuce/test/settings/TestSettings.java  |  4 ++--
 .../jmh/io/lettuce/core/EmptyRedisChannelWriter.java |  4 ++--
 .../lettuce/core/EmptyStatefulRedisConnection.java   |  4 ++--
 src/test/jmh/io/lettuce/core/JmhMain.java            |  4 ++--
 .../jmh/io/lettuce/core/RedisClientBenchmark.java    |  4 ++--
 .../ClusterDistributionChannelWriterBenchmark.java   |  4 ++--
 .../core/cluster/EmptyRedisClusterClient.java        |  4 ++--
 src/test/jmh/io/lettuce/core/cluster/JmhMain.java    |  4 ++--
 .../core/cluster/RedisClusterClientBenchmark.java    |  4 ++--
 .../io/lettuce/core/cluster/SlotHashBenchmark.java   |  4 ++--
 .../core/cluster/models/partitions/JmhMain.java      |  4 ++--
 .../models/partitions/RedisClusterNodeBenchmark.java |  4 ++--
 src/test/jmh/io/lettuce/core/codec/JmhMain.java      |  4 ++--
 .../io/lettuce/core/codec/StringCodecBenchmark.java  |  4 ++--
 .../lettuce/core/codec/Utf8StringCodecBenchmark.java |  4 ++--
 .../core/dynamic/RedisCommandFactoryBenchmark.java   |  4 ++--
 .../lettuce/core/dynamic/RedisCommandsBenchmark.java |  4 ++--
 .../intercept/InvocationProxyFactoryBenchmark.java   |  4 ++--
 src/test/jmh/io/lettuce/core/output/JmhMain.java     |  4 ++--
 .../core/output/ValueListOutputBenchmark.java        |  4 ++--
 .../io/lettuce/core/protocol/CommandBenchmark.java   |  4 ++--
 .../core/protocol/CommandHandlerBenchmark.java       |  4 ++--
 .../jmh/io/lettuce/core/protocol/EmptyByteBuf.java   |  4 ++--
 .../lettuce/core/protocol/EmptyClientResources.java  |  4 ++--
 .../jmh/io/lettuce/core/protocol/EmptyContext.java   |  4 ++--
 .../jmh/io/lettuce/core/protocol/EmptyFuture.java    |  4 ++--
 .../jmh/io/lettuce/core/protocol/EmptyPromise.java   |  4 ++--
 src/test/jmh/io/lettuce/core/protocol/JmhMain.java   |  4 ++--
 .../core/protocol/RedisEndpointBenchmark.java        |  4 ++--
 .../core/protocol/RedisStateMachineBenchmark.java    |  4 ++--
 .../core/support/AsyncConnectionPoolBenchmark.java   |  4 ++--
 .../core/support/GenericConnectionPoolBenchmark.java |  4 ++--
 src/test/jmh/io/lettuce/core/support/JmhMain.java    |  4 ++--
 959 files changed, 1929 insertions(+), 1929 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 9c50519f6d..2886102315 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -52,6 +52,6 @@ If you have a question, then check one of the following places first. Typically,
 
 ## License
 
-By contributing your code, you agree to license your contribution under the terms of [Apache License 2.0] (http://www.apache.org/licenses/LICENSE-2.0).
+By contributing your code, you agree to license your contribution under the terms of [Apache License 2.0] (https://www.apache.org/licenses/LICENSE-2.0).
 
 All files are released with the Apache 2.0 license.
diff --git a/README.md b/README.md
index d71e75d269..8b09171649 100644
--- a/README.md
+++ b/README.md
@@ -169,7 +169,7 @@ For bugs, questions and discussions please use the [GitHub Issues](https://githu
 License
 -------
 
-* [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0)
+* [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0)
 * Fork of https://github.com/wg/lettuce
 
 Contributing
diff --git a/pom.xml b/pom.xml
index 3720d44982..0a1428cfc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
             <distribution>repo</distribution>
         </license>
     </licenses>
diff --git a/src/main/asciidoc/stylesheets/golo.css b/src/main/asciidoc/stylesheets/golo.css
index 781b2eee87..5114f5e871 100644
--- a/src/main/asciidoc/stylesheets/golo.css
+++ b/src/main/asciidoc/stylesheets/golo.css
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 070cd49609..9e5a47033c 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index d3fc17ccdb..5ed539a476 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 4e6026b6a6..e904088d77 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/BitFieldArgs.java b/src/main/java/io/lettuce/core/BitFieldArgs.java
index df9927e8a7..9c17fdb31b 100644
--- a/src/main/java/io/lettuce/core/BitFieldArgs.java
+++ b/src/main/java/io/lettuce/core/BitFieldArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ChannelGroupListener.java b/src/main/java/io/lettuce/core/ChannelGroupListener.java
index f95c094f51..f12eea1fe4 100644
--- a/src/main/java/io/lettuce/core/ChannelGroupListener.java
+++ b/src/main/java/io/lettuce/core/ChannelGroupListener.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index 90329e8740..3882c338c6 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/CloseEvents.java b/src/main/java/io/lettuce/core/CloseEvents.java
index 7e8546ddec..c56b03589c 100644
--- a/src/main/java/io/lettuce/core/CloseEvents.java
+++ b/src/main/java/io/lettuce/core/CloseEvents.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/CompositeArgument.java b/src/main/java/io/lettuce/core/CompositeArgument.java
index 487ad8e07e..70e9d0f28a 100644
--- a/src/main/java/io/lettuce/core/CompositeArgument.java
+++ b/src/main/java/io/lettuce/core/CompositeArgument.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index 836e6d3692..0125997d08 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ConnectionEventTrigger.java b/src/main/java/io/lettuce/core/ConnectionEventTrigger.java
index 6bdd41fc2a..274f61d723 100644
--- a/src/main/java/io/lettuce/core/ConnectionEventTrigger.java
+++ b/src/main/java/io/lettuce/core/ConnectionEventTrigger.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ConnectionEvents.java b/src/main/java/io/lettuce/core/ConnectionEvents.java
index 53f8b5033e..b1ceae2449 100644
--- a/src/main/java/io/lettuce/core/ConnectionEvents.java
+++ b/src/main/java/io/lettuce/core/ConnectionEvents.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ConnectionFuture.java b/src/main/java/io/lettuce/core/ConnectionFuture.java
index 9c760e81d6..f9f7ec1397 100644
--- a/src/main/java/io/lettuce/core/ConnectionFuture.java
+++ b/src/main/java/io/lettuce/core/ConnectionFuture.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ConnectionId.java b/src/main/java/io/lettuce/core/ConnectionId.java
index 4db53705c4..5107217708 100644
--- a/src/main/java/io/lettuce/core/ConnectionId.java
+++ b/src/main/java/io/lettuce/core/ConnectionId.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ConnectionPoint.java b/src/main/java/io/lettuce/core/ConnectionPoint.java
index 7ee4e308af..65acdb58a6 100644
--- a/src/main/java/io/lettuce/core/ConnectionPoint.java
+++ b/src/main/java/io/lettuce/core/ConnectionPoint.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ConnectionState.java b/src/main/java/io/lettuce/core/ConnectionState.java
index 5091de8356..ece09da4c8 100644
--- a/src/main/java/io/lettuce/core/ConnectionState.java
+++ b/src/main/java/io/lettuce/core/ConnectionState.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/Consumer.java b/src/main/java/io/lettuce/core/Consumer.java
index 13bfb9b491..1e8d57234d 100644
--- a/src/main/java/io/lettuce/core/Consumer.java
+++ b/src/main/java/io/lettuce/core/Consumer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/DefaultConnectionFuture.java b/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
index 039e1ed599..39c8c16c99 100644
--- a/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
+++ b/src/main/java/io/lettuce/core/DefaultConnectionFuture.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/EpollProvider.java b/src/main/java/io/lettuce/core/EpollProvider.java
index add2154b66..b5b7193dd0 100644
--- a/src/main/java/io/lettuce/core/EpollProvider.java
+++ b/src/main/java/io/lettuce/core/EpollProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ExceptionFactory.java b/src/main/java/io/lettuce/core/ExceptionFactory.java
index 6976e364be..67d5622724 100644
--- a/src/main/java/io/lettuce/core/ExceptionFactory.java
+++ b/src/main/java/io/lettuce/core/ExceptionFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
index 92bda10122..783cc99437 100644
--- a/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/FutureSyncInvocationHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/GeoArgs.java b/src/main/java/io/lettuce/core/GeoArgs.java
index a74afd9317..138b9e09ee 100644
--- a/src/main/java/io/lettuce/core/GeoArgs.java
+++ b/src/main/java/io/lettuce/core/GeoArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/GeoCoordinates.java b/src/main/java/io/lettuce/core/GeoCoordinates.java
index 9d20904232..15070928d5 100644
--- a/src/main/java/io/lettuce/core/GeoCoordinates.java
+++ b/src/main/java/io/lettuce/core/GeoCoordinates.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java b/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
index 4a397f8261..3a6769b2e2 100644
--- a/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
+++ b/src/main/java/io/lettuce/core/GeoRadiusStoreArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/GeoWithin.java b/src/main/java/io/lettuce/core/GeoWithin.java
index d6985a568f..2bb3ab69b2 100644
--- a/src/main/java/io/lettuce/core/GeoWithin.java
+++ b/src/main/java/io/lettuce/core/GeoWithin.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/JavaRuntime.java b/src/main/java/io/lettuce/core/JavaRuntime.java
index 71dc119326..a17a4edb01 100644
--- a/src/main/java/io/lettuce/core/JavaRuntime.java
+++ b/src/main/java/io/lettuce/core/JavaRuntime.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/KeyScanCursor.java b/src/main/java/io/lettuce/core/KeyScanCursor.java
index d41f695c8a..f898dd602a 100644
--- a/src/main/java/io/lettuce/core/KeyScanCursor.java
+++ b/src/main/java/io/lettuce/core/KeyScanCursor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/KeyValue.java b/src/main/java/io/lettuce/core/KeyValue.java
index f6e8bed99e..696bd852e9 100644
--- a/src/main/java/io/lettuce/core/KeyValue.java
+++ b/src/main/java/io/lettuce/core/KeyValue.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/KillArgs.java b/src/main/java/io/lettuce/core/KillArgs.java
index f5313dbb43..52d71b60af 100644
--- a/src/main/java/io/lettuce/core/KillArgs.java
+++ b/src/main/java/io/lettuce/core/KillArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/KqueueProvider.java b/src/main/java/io/lettuce/core/KqueueProvider.java
index 3961ea2f77..28fa67ef88 100644
--- a/src/main/java/io/lettuce/core/KqueueProvider.java
+++ b/src/main/java/io/lettuce/core/KqueueProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/LettuceFutures.java b/src/main/java/io/lettuce/core/LettuceFutures.java
index a3f1a1faf3..5f8c3e481f 100644
--- a/src/main/java/io/lettuce/core/LettuceFutures.java
+++ b/src/main/java/io/lettuce/core/LettuceFutures.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/LettuceStrings.java b/src/main/java/io/lettuce/core/LettuceStrings.java
index 55be46e047..a0434660e1 100644
--- a/src/main/java/io/lettuce/core/LettuceStrings.java
+++ b/src/main/java/io/lettuce/core/LettuceStrings.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/Limit.java b/src/main/java/io/lettuce/core/Limit.java
index 499708776c..8d235a8c3b 100644
--- a/src/main/java/io/lettuce/core/Limit.java
+++ b/src/main/java/io/lettuce/core/Limit.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/MapScanCursor.java b/src/main/java/io/lettuce/core/MapScanCursor.java
index 4285b3dc09..837da26349 100644
--- a/src/main/java/io/lettuce/core/MapScanCursor.java
+++ b/src/main/java/io/lettuce/core/MapScanCursor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/MigrateArgs.java b/src/main/java/io/lettuce/core/MigrateArgs.java
index d5726b1539..2286ea9fba 100644
--- a/src/main/java/io/lettuce/core/MigrateArgs.java
+++ b/src/main/java/io/lettuce/core/MigrateArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/Operators.java b/src/main/java/io/lettuce/core/Operators.java
index 802f2503a4..88295f95da 100644
--- a/src/main/java/io/lettuce/core/Operators.java
+++ b/src/main/java/io/lettuce/core/Operators.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/OrderingReadFromAccessor.java b/src/main/java/io/lettuce/core/OrderingReadFromAccessor.java
index de05810cfb..08c793c53f 100644
--- a/src/main/java/io/lettuce/core/OrderingReadFromAccessor.java
+++ b/src/main/java/io/lettuce/core/OrderingReadFromAccessor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,7 @@
 
 /**
  * Accessor for {@link ReadFrom} ordering. Internal utility class.
- * 
+ *
  * @author Mark Paluch
  * @since 5.2
  */
@@ -32,7 +32,7 @@ private OrderingReadFromAccessor() {
     /**
      * Returns whether this {@link ReadFrom} requires ordering of the resulting
      * {@link io.lettuce.core.models.role.RedisNodeDescription nodes}.
-     * 
+     *
      * @return {@literal true} if code using {@link ReadFrom} should retain ordering or {@literal false} to allow reordering of
      *         {@link io.lettuce.core.models.role.RedisNodeDescription nodes}.
      * @since 5.2
diff --git a/src/main/java/io/lettuce/core/Range.java b/src/main/java/io/lettuce/core/Range.java
index 3041dd7a91..bef71c2176 100644
--- a/src/main/java/io/lettuce/core/Range.java
+++ b/src/main/java/io/lettuce/core/Range.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ReadFrom.java b/src/main/java/io/lettuce/core/ReadFrom.java
index 87a6165259..81a084acb6 100644
--- a/src/main/java/io/lettuce/core/ReadFrom.java
+++ b/src/main/java/io/lettuce/core/ReadFrom.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ReadFromImpl.java b/src/main/java/io/lettuce/core/ReadFromImpl.java
index ac5aa9088f..dde460282f 100644
--- a/src/main/java/io/lettuce/core/ReadFromImpl.java
+++ b/src/main/java/io/lettuce/core/ReadFromImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java
index 89626447c1..4d3b4882a1 100644
--- a/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisBusyException.java b/src/main/java/io/lettuce/core/RedisBusyException.java
index 9151dc9122..4893706919 100644
--- a/src/main/java/io/lettuce/core/RedisBusyException.java
+++ b/src/main/java/io/lettuce/core/RedisBusyException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisChannelHandler.java b/src/main/java/io/lettuce/core/RedisChannelHandler.java
index b1ae8fbe08..3fdcb910ef 100644
--- a/src/main/java/io/lettuce/core/RedisChannelHandler.java
+++ b/src/main/java/io/lettuce/core/RedisChannelHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisChannelWriter.java b/src/main/java/io/lettuce/core/RedisChannelWriter.java
index 831fd712cf..f464e0ed37 100644
--- a/src/main/java/io/lettuce/core/RedisChannelWriter.java
+++ b/src/main/java/io/lettuce/core/RedisChannelWriter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 08a3ab4cdd..aae42bdda5 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 241755d381..20f9d3df16 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisCommandExecutionException.java b/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
index acf3ac7d69..23b3fd5f9f 100644
--- a/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandExecutionException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java b/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java
index fa22353813..fddd622430 100644
--- a/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandInterruptedException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java b/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
index e525e16f64..0c6dee4ba4 100644
--- a/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
+++ b/src/main/java/io/lettuce/core/RedisCommandTimeoutException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisConnectionException.java b/src/main/java/io/lettuce/core/RedisConnectionException.java
index 48e0dcbba5..a0f3457040 100644
--- a/src/main/java/io/lettuce/core/RedisConnectionException.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java b/src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java
index d76932f7a6..bf3e26a569 100644
--- a/src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionStateAdapter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisConnectionStateListener.java b/src/main/java/io/lettuce/core/RedisConnectionStateListener.java
index fbb304ee9e..7ba22ddd77 100644
--- a/src/main/java/io/lettuce/core/RedisConnectionStateListener.java
+++ b/src/main/java/io/lettuce/core/RedisConnectionStateListener.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisException.java b/src/main/java/io/lettuce/core/RedisException.java
index 74b5964600..3cdef2212a 100644
--- a/src/main/java/io/lettuce/core/RedisException.java
+++ b/src/main/java/io/lettuce/core/RedisException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisFuture.java b/src/main/java/io/lettuce/core/RedisFuture.java
index c60bb007ac..4cee8bc443 100644
--- a/src/main/java/io/lettuce/core/RedisFuture.java
+++ b/src/main/java/io/lettuce/core/RedisFuture.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisHandshake.java b/src/main/java/io/lettuce/core/RedisHandshake.java
index 72c7c3ab4e..2d802ee467 100644
--- a/src/main/java/io/lettuce/core/RedisHandshake.java
+++ b/src/main/java/io/lettuce/core/RedisHandshake.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisLoadingException.java b/src/main/java/io/lettuce/core/RedisLoadingException.java
index 773fe8abe4..d9ad1cc092 100644
--- a/src/main/java/io/lettuce/core/RedisLoadingException.java
+++ b/src/main/java/io/lettuce/core/RedisLoadingException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisNoScriptException.java b/src/main/java/io/lettuce/core/RedisNoScriptException.java
index a2f7dc6754..95f2b89784 100644
--- a/src/main/java/io/lettuce/core/RedisNoScriptException.java
+++ b/src/main/java/io/lettuce/core/RedisNoScriptException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index 9f5f49dd47..108718f048 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
index ddad69540b..d48dd7c5d1 100644
--- a/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 756ef56e26..2affd54a4f 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/RestoreArgs.java b/src/main/java/io/lettuce/core/RestoreArgs.java
index 0a7931bacc..aa4dcd929f 100644
--- a/src/main/java/io/lettuce/core/RestoreArgs.java
+++ b/src/main/java/io/lettuce/core/RestoreArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ScanArgs.java b/src/main/java/io/lettuce/core/ScanArgs.java
index 1be78e2175..e98517510d 100644
--- a/src/main/java/io/lettuce/core/ScanArgs.java
+++ b/src/main/java/io/lettuce/core/ScanArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ScanCursor.java b/src/main/java/io/lettuce/core/ScanCursor.java
index f24c0a2570..769ed2862e 100644
--- a/src/main/java/io/lettuce/core/ScanCursor.java
+++ b/src/main/java/io/lettuce/core/ScanCursor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ScanIterator.java b/src/main/java/io/lettuce/core/ScanIterator.java
index e5b4b596f2..b650ec7fee 100644
--- a/src/main/java/io/lettuce/core/ScanIterator.java
+++ b/src/main/java/io/lettuce/core/ScanIterator.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ScanStream.java b/src/main/java/io/lettuce/core/ScanStream.java
index 1f3ba0948c..8629a12ee3 100644
--- a/src/main/java/io/lettuce/core/ScanStream.java
+++ b/src/main/java/io/lettuce/core/ScanStream.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ScoredValue.java b/src/main/java/io/lettuce/core/ScoredValue.java
index 6b9a7fc043..6aa5c1b464 100644
--- a/src/main/java/io/lettuce/core/ScoredValue.java
+++ b/src/main/java/io/lettuce/core/ScoredValue.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ScoredValueScanCursor.java b/src/main/java/io/lettuce/core/ScoredValueScanCursor.java
index 23bfe24ad1..8503986136 100644
--- a/src/main/java/io/lettuce/core/ScoredValueScanCursor.java
+++ b/src/main/java/io/lettuce/core/ScoredValueScanCursor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ScriptOutputType.java b/src/main/java/io/lettuce/core/ScriptOutputType.java
index 373a58cd26..8b390cc29e 100644
--- a/src/main/java/io/lettuce/core/ScriptOutputType.java
+++ b/src/main/java/io/lettuce/core/ScriptOutputType.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/SetArgs.java b/src/main/java/io/lettuce/core/SetArgs.java
index b3460831e8..651a0aca83 100644
--- a/src/main/java/io/lettuce/core/SetArgs.java
+++ b/src/main/java/io/lettuce/core/SetArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/SocketOptions.java b/src/main/java/io/lettuce/core/SocketOptions.java
index 8505a0b45e..a8d19e55f2 100644
--- a/src/main/java/io/lettuce/core/SocketOptions.java
+++ b/src/main/java/io/lettuce/core/SocketOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/SortArgs.java b/src/main/java/io/lettuce/core/SortArgs.java
index eabb8eafd4..9c0ea7d88a 100644
--- a/src/main/java/io/lettuce/core/SortArgs.java
+++ b/src/main/java/io/lettuce/core/SortArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/SslConnectionBuilder.java b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
index ba46439c46..ebdb4deb51 100644
--- a/src/main/java/io/lettuce/core/SslConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/SslOptions.java b/src/main/java/io/lettuce/core/SslOptions.java
index 02a230e562..470b8aec64 100644
--- a/src/main/java/io/lettuce/core/SslOptions.java
+++ b/src/main/java/io/lettuce/core/SslOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
index 7a588c4513..20a3dbcc2c 100644
--- a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/StreamMessage.java b/src/main/java/io/lettuce/core/StreamMessage.java
index c4cd07d3db..3c38e22728 100644
--- a/src/main/java/io/lettuce/core/StreamMessage.java
+++ b/src/main/java/io/lettuce/core/StreamMessage.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/StreamScanCursor.java b/src/main/java/io/lettuce/core/StreamScanCursor.java
index 68ed31e760..8ba69ac21d 100644
--- a/src/main/java/io/lettuce/core/StreamScanCursor.java
+++ b/src/main/java/io/lettuce/core/StreamScanCursor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/TimeoutOptions.java b/src/main/java/io/lettuce/core/TimeoutOptions.java
index 10aa300d94..cd0fdad981 100644
--- a/src/main/java/io/lettuce/core/TimeoutOptions.java
+++ b/src/main/java/io/lettuce/core/TimeoutOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/TransactionResult.java b/src/main/java/io/lettuce/core/TransactionResult.java
index a1adfddd7f..ffa3022836 100644
--- a/src/main/java/io/lettuce/core/TransactionResult.java
+++ b/src/main/java/io/lettuce/core/TransactionResult.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/Transports.java b/src/main/java/io/lettuce/core/Transports.java
index 74be39ba0a..f8b11429f6 100644
--- a/src/main/java/io/lettuce/core/Transports.java
+++ b/src/main/java/io/lettuce/core/Transports.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/UnblockType.java b/src/main/java/io/lettuce/core/UnblockType.java
index cf21909e22..7950f601e5 100644
--- a/src/main/java/io/lettuce/core/UnblockType.java
+++ b/src/main/java/io/lettuce/core/UnblockType.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/Value.java b/src/main/java/io/lettuce/core/Value.java
index 371cc6c382..b8775bbbf5 100644
--- a/src/main/java/io/lettuce/core/Value.java
+++ b/src/main/java/io/lettuce/core/Value.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ValueScanCursor.java b/src/main/java/io/lettuce/core/ValueScanCursor.java
index 0f8c84578a..e42fb81442 100644
--- a/src/main/java/io/lettuce/core/ValueScanCursor.java
+++ b/src/main/java/io/lettuce/core/ValueScanCursor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/XAddArgs.java b/src/main/java/io/lettuce/core/XAddArgs.java
index c4a36cf9e6..09a5a4e079 100644
--- a/src/main/java/io/lettuce/core/XAddArgs.java
+++ b/src/main/java/io/lettuce/core/XAddArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/XClaimArgs.java b/src/main/java/io/lettuce/core/XClaimArgs.java
index 47ab109579..7c7f1137ab 100644
--- a/src/main/java/io/lettuce/core/XClaimArgs.java
+++ b/src/main/java/io/lettuce/core/XClaimArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/XGroupCreateArgs.java b/src/main/java/io/lettuce/core/XGroupCreateArgs.java
index 2f270ca412..81b879f406 100644
--- a/src/main/java/io/lettuce/core/XGroupCreateArgs.java
+++ b/src/main/java/io/lettuce/core/XGroupCreateArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/XReadArgs.java b/src/main/java/io/lettuce/core/XReadArgs.java
index 1ec9c35e9e..dfb36df29c 100644
--- a/src/main/java/io/lettuce/core/XReadArgs.java
+++ b/src/main/java/io/lettuce/core/XReadArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ZAddArgs.java b/src/main/java/io/lettuce/core/ZAddArgs.java
index 13ed74971c..54e9bb84bc 100644
--- a/src/main/java/io/lettuce/core/ZAddArgs.java
+++ b/src/main/java/io/lettuce/core/ZAddArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/ZStoreArgs.java b/src/main/java/io/lettuce/core/ZStoreArgs.java
index c4c69d043b..4dac84588d 100644
--- a/src/main/java/io/lettuce/core/ZStoreArgs.java
+++ b/src/main/java/io/lettuce/core/ZStoreArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/StatefulConnection.java b/src/main/java/io/lettuce/core/api/StatefulConnection.java
index e95bf6d654..2b70739de5 100644
--- a/src/main/java/io/lettuce/core/api/StatefulConnection.java
+++ b/src/main/java/io/lettuce/core/api/StatefulConnection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/StatefulRedisConnection.java b/src/main/java/io/lettuce/core/api/StatefulRedisConnection.java
index 51773460d1..3e7b58e3f9 100644
--- a/src/main/java/io/lettuce/core/api/StatefulRedisConnection.java
+++ b/src/main/java/io/lettuce/core/api/StatefulRedisConnection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
index 8b10f2fd4e..4ff28a879f 100644
--- a/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/BaseRedisAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
index 05cf32a1a8..c877319dc4 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java
index 94ee875da1..0be326d565 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisGeoAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java
index 6e20872884..b93ca3a807 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisHLLAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
index 19bde49298..693a213fb5 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
index 868edfc477..db9fbd682f 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java
index 634e770ec8..1b77c9dc7c 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisListAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
index ea65ec519d..b8b9529ae3 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
index 84e6624211..a1517f923b 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java
index 98f84f402f..fa1d00e896 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisSetAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
index 648439b13f..ee7a6e7641 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisSortedSetAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
index d781061732..35020cd938 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java
index 79b3712cb0..8daee16124 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisStringAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
index 81f659ec7b..3146c38b7c 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisTransactionalAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
index f8470c75cf..ad272cd271 100644
--- a/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/BaseRedisReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java
index 1a979b5787..e9244e9aad 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisGeoReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java
index 7914de9a70..8d8d6eea62 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisHLLReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
index 39a400bb80..8b60f8cb8f 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
index 82f4502a50..d12b5a60aa 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java
index 828c15eeb1..bc4eaffae9 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisListReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
index 742a839bc9..b67a040971 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
index 6d8f893fb9..edf7d9cba2 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
index ab52856682..d83c9794ff 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java
index 2fc4c32e1c..0dbe038a67 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisSetReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
index 8e211f1468..6e12c0dbda 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisSortedSetReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
index 9e19e6bb27..33d1ab6851 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java
index a3c139896c..718d12cee6 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisStringReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
index 657e56c691..6259c70fb1 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisTransactionalReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java b/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
index 4041de994f..651a2a893a 100644
--- a/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/BaseRedisCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
index dda35a159d..d092054071 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java
index 156ec90a06..f36ee30b10 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisGeoCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java
index e5a1a881f3..4a73f28dc8 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisHLLCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
index 573987ae9d..11a3e9d5c8 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
index a2ec9330ba..6003e7e412 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java
index 00dbf2b115..c2977dfb49 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisListCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
index 8a69e902b6..9559aa869d 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
index 7b0c699369..fb06b490f1 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java
index 4eb783c678..29837eb91c 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisSetCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
index 789e36dbac..f87a38dae1 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisSortedSetCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
index 19fc57e4bd..406e7b543d 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java
index 3380abfb61..b176d07273 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisStringCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
index 635101cc36..9e84d052a8 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisTransactionalCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
index 2fec9083f7..d4a0fb1300 100644
--- a/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/cluster/AbstractClusterNodeConnectionFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java b/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java
index 64a6f93de1..b8126d38d2 100644
--- a/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/AbstractNodeSelection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/AsyncClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/AsyncClusterConnectionProvider.java
index 42e2f2f65b..72d5956dc9 100644
--- a/src/main/java/io/lettuce/core/cluster/AsyncClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/AsyncClusterConnectionProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
index 001c02591f..8c73c39394 100644
--- a/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index b3732c6f7e..a87c4aec56 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterCommand.java b/src/main/java/io/lettuce/core/cluster/ClusterCommand.java
index c86f56a8a3..ff2ecb0712 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterCommand.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
index ca6b5a5331..84e8b3e32a 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterConnectionProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index 1110cb6520..00b721f820 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java b/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
index 155d81f7e4..1161a6cb64 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterEventListener.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
index 87cb0182ca..3d779276bc 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterFutureSyncInvocationHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java
index 26887dbcc0..7b82412be3 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterNodeConnectionFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java b/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
index 970d51e2b6..d030eb21cb 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterNodeEndpoint.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
index 7f91cc1902..1f20ff3e41 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterPubSubConnectionProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java b/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java
index b5b5a3e08c..4d6c0fabdc 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterScanSupport.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
index d7a1105f29..6deb3bba8f 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
index b3f7fbe44f..a7373e1943 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/CommandSet.java b/src/main/java/io/lettuce/core/cluster/CommandSet.java
index 21a4a4cee7..d4ead66271 100644
--- a/src/main/java/io/lettuce/core/cluster/CommandSet.java
+++ b/src/main/java/io/lettuce/core/cluster/CommandSet.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java b/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
index 2536a4bd48..7b0087a86d 100644
--- a/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java b/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
index f9b1eb26c3..9081262596 100644
--- a/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
+++ b/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
index 4bfe1a1ccd..221cc1d0a2 100644
--- a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java b/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java
index 6fe05da97c..3664e21a4e 100644
--- a/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionAccessor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionException.java b/src/main/java/io/lettuce/core/cluster/PartitionException.java
index 8fa6a36e37..66c1065738 100644
--- a/src/main/java/io/lettuce/core/cluster/PartitionException.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionSelectorException.java b/src/main/java/io/lettuce/core/cluster/PartitionSelectorException.java
index 7dc7148f1d..e8c7dec59a 100644
--- a/src/main/java/io/lettuce/core/cluster/PartitionSelectorException.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionSelectorException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java b/src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java
index c23c57a43e..b4f9d28a7b 100644
--- a/src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionsConsensus.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java b/src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java
index 7cc7939706..5a05d767c3 100644
--- a/src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/PartitionsConsensusImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java b/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
index d0248a8958..eff0d18967 100644
--- a/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
+++ b/src/main/java/io/lettuce/core/cluster/PipelinedRedisFuture.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
index 2c8a864e80..1efcfb8a3d 100644
--- a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java b/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java
index 6573f66b30..0b4f881b44 100644
--- a/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java
+++ b/src/main/java/io/lettuce/core/cluster/PubSubClusterEndpoint.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
index 4768518882..dc8afdc44c 100644
--- a/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/ReactiveExecutionsImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
index bbd7c57034..7eddc21180 100644
--- a/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java b/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java
index 108de74be3..6d28a45195 100644
--- a/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java
+++ b/src/main/java/io/lettuce/core/cluster/ReconnectEventListener.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index b1c74e398b..1c8c032332 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index 3097b05034..341ba5f63d 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 30d334b210..e810052265 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
index 102c1c1f41..1a3b1e2c38 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
index bf7c445f39..8afa7fe51e 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java b/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java
index f7e4ffb494..4ccdf3e8a3 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterURIUtil.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/RoundRobin.java b/src/main/java/io/lettuce/core/cluster/RoundRobin.java
index 90fa5d75a0..883c2ad972 100644
--- a/src/main/java/io/lettuce/core/cluster/RoundRobin.java
+++ b/src/main/java/io/lettuce/core/cluster/RoundRobin.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java b/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
index 19cd4856f4..0fe228930e 100644
--- a/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
+++ b/src/main/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplier.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/SlotHash.java b/src/main/java/io/lettuce/core/cluster/SlotHash.java
index e788d5cd71..b475c01035 100644
--- a/src/main/java/io/lettuce/core/cluster/SlotHash.java
+++ b/src/main/java/io/lettuce/core/cluster/SlotHash.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
index 9ab05d0220..8e4c60a3d8 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
index 602b05cec6..1ab7710995 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java b/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
index 40e3c33b21..f3e2dddb40 100644
--- a/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java
index 1396b09ab1..38c42caae7 100644
--- a/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/SyncExecutionsImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/UnknownPartitionException.java b/src/main/java/io/lettuce/core/cluster/UnknownPartitionException.java
index a5970c7439..30cf9235dd 100644
--- a/src/main/java/io/lettuce/core/cluster/UnknownPartitionException.java
+++ b/src/main/java/io/lettuce/core/cluster/UnknownPartitionException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java b/src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java
index 9b192983d2..5f704c2158 100644
--- a/src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java
+++ b/src/main/java/io/lettuce/core/cluster/api/NodeSelectionSupport.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java b/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
index fdfc7274d1..c81eeef717 100644
--- a/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
+++ b/src/main/java/io/lettuce/core/cluster/api/StatefulRedisClusterConnection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java b/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
index a0848fa21a..f6d36b4278 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/AsyncExecutions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java b/src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java
index d4735dd4a1..edb08d7842 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/AsyncNodeSelection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
index c31616bba0..62256f0b89 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/BaseNodeSelectionAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java
index 7e02378711..4f2b6f533a 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java
index 0b5d5a892a..d14b0e8852 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionGeoAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java
index bbab5bd798..cc652a05fd 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHLLAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
index 0b88c463d5..c60d85294a 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
index 83e925738c..ac88efaf1c 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java
index 4db95ffad9..c8ae954211 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionListAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
index 1232d12263..201148a1a9 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
index 0c3a6d6ccb..c7ab0bb2eb 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java
index b254c41500..7b2211f630 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSetAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
index eb8e623745..bc8efc95db 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionSortedSetAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
index 14163613e4..24af2a23b4 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java
index ff5061fb83..00114bd641 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStringAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
index dd70d9f22b..6be3d87a6e 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
index b6298e7f42..ba4085b7ff 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java b/src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java
index 213c10dc24..20c2a4edde 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/ReactiveExecutions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
index 5e9bc10503..53ed5fffa8 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
index 8d19250aba..b0c617eee3 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
index aeb52ebb76..dd945539f7 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/BaseNodeSelectionCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/Executions.java b/src/main/java/io/lettuce/core/cluster/api/sync/Executions.java
index 929f889a51..7f70e012bf 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/Executions.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/Executions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java
index 119e77f0a8..39b89614b6 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java
index ff33a80c58..f7ac54704e 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java
index 7b5dbc3630..41a06190e8 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionGeoCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java
index d1aea1e6e5..6421d0a19c 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHLLCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
index 9a625c134b..3ac4203576 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
index 125c1594d7..221a8e2366 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java
index dc43ff597d..18cda20d3f 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionListCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
index 0e8cc1c8fa..1b4b8ff163 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
index 7a7017dac6..e111d2cab5 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java
index d0edaec863..d222788047 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSetCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
index 9f7460a9d3..9f65f9456a 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionSortedSetCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
index b9b1a94b74..7e098d232d 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java
index e6619c5a89..3e0e9b437e 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStringCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
index e7bebd2ae8..bf56a2f536 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
index 793ecc1f23..eb3a0eb379 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java b/src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java
index 6cee7c9693..80b8932610 100644
--- a/src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java
+++ b/src/main/java/io/lettuce/core/cluster/event/ClusterTopologyChangedEvent.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java b/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
index 40fb501b57..84e4b244d9 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParser.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
index ba69e73bae..04a74fe0e8 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/Partitions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
index 174acff6da..43d0ce00eb 100644
--- a/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
+++ b/src/main/java/io/lettuce/core/cluster/models/partitions/RedisClusterNode.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java
index 05ab3ac770..78f4ecab76 100644
--- a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java
+++ b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotRange.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
index 82312aedaf..0eab7dc25d 100644
--- a/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
+++ b/src/main/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParser.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java
index 6e7fc50191..afb21c1831 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubAdapter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java
index 8034c696bd..890da24de0 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
index 8a6579fbe6..69f48d1261 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
index 5827ef7d73..d489ef4484 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/NodeSelectionPubSubAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
index 1564b21c99..06b446c36c 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/PubSubAsyncNodeSelection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
index ecc9a10248..35b3a87b65 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
index 421e0f0c05..fa872bc430 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/NodeSelectionPubSubReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
index 303bf96162..b4d2b21beb 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/PubSubReactiveNodeSelection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
index 21a4354e24..372228e2a1 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/reactive/RedisClusterPubSubReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
index e00c0ed5f1..b0c37ad649 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/NodeSelectionPubSubCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java
index bee1503089..a043f131f8 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/PubSubNodeSelection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
index 92d57d6b63..e37d30cc43 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/sync/RedisClusterPubSubCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java b/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
index eb3e8d9c29..3ed06dafcb 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
index 0160dc0876..f7bf222b85 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/topology/Connections.java b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
index 8725d1f8a0..507cf4cd93 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Connections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java b/src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java
index df8fae2bab..d17165aab7 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeConnectionFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
index 1fa2cf1c30..1bf536e675 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
index c12f853edc..b95840f705 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyViews.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java b/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java
index 31f4a13a1e..6cf643477e 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/RedisClusterNodeSnapshot.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java b/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
index 7b50329e25..4f04d2a42d 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/topology/Requests.java b/src/main/java/io/lettuce/core/cluster/topology/Requests.java
index 51b0163cec..29ae138d02 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Requests.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Requests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java b/src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java
index 94663f1c98..82f3ccc2f3 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/TimedAsyncCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
index c837044e7d..ae96dbd72c 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/codec/Base16.java b/src/main/java/io/lettuce/core/codec/Base16.java
index 96ed462d25..ac315c1445 100644
--- a/src/main/java/io/lettuce/core/codec/Base16.java
+++ b/src/main/java/io/lettuce/core/codec/Base16.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java b/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
index 75073daf85..24d90f6352 100644
--- a/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
+++ b/src/main/java/io/lettuce/core/codec/ByteArrayCodec.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java b/src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java
index 9266b9895d..b61d10b199 100644
--- a/src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java
+++ b/src/main/java/io/lettuce/core/codec/ByteBufferInputStream.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/codec/CRC16.java b/src/main/java/io/lettuce/core/codec/CRC16.java
index 2ed3db1da2..f927e1580a 100644
--- a/src/main/java/io/lettuce/core/codec/CRC16.java
+++ b/src/main/java/io/lettuce/core/codec/CRC16.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,7 +22,7 @@
  *         <ul>
  *         <li>Name: XMODEM (also known as ZMODEM or CRC-16/ACORN)</li>
  *         <li>Width: 16 bit</li>
- *         <li>Poly: 1021 (That is actually x16 + x12 + x5 + 1)</li>
+ *         <li>Poly: 1021-2020 (That is actually x16 + x12 + x5 + 1)</li>
  *         <li>Initialization: 0000</li>
  *         <li>Reflect Input byte: False</li>
  *         <li>Reflect Output CRC: False</li>
diff --git a/src/main/java/io/lettuce/core/codec/CipherCodec.java b/src/main/java/io/lettuce/core/codec/CipherCodec.java
index b599601b93..089e68c256 100644
--- a/src/main/java/io/lettuce/core/codec/CipherCodec.java
+++ b/src/main/java/io/lettuce/core/codec/CipherCodec.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/codec/ComposedRedisCodec.java b/src/main/java/io/lettuce/core/codec/ComposedRedisCodec.java
index a9c61b0549..5a50ce5ab8 100644
--- a/src/main/java/io/lettuce/core/codec/ComposedRedisCodec.java
+++ b/src/main/java/io/lettuce/core/codec/ComposedRedisCodec.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/codec/CompressionCodec.java b/src/main/java/io/lettuce/core/codec/CompressionCodec.java
index 948d9e90c2..2e752b2b69 100644
--- a/src/main/java/io/lettuce/core/codec/CompressionCodec.java
+++ b/src/main/java/io/lettuce/core/codec/CompressionCodec.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/codec/RedisCodec.java b/src/main/java/io/lettuce/core/codec/RedisCodec.java
index 46eca2193b..8bef466de8 100644
--- a/src/main/java/io/lettuce/core/codec/RedisCodec.java
+++ b/src/main/java/io/lettuce/core/codec/RedisCodec.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/codec/StringCodec.java b/src/main/java/io/lettuce/core/codec/StringCodec.java
index 79707b54d0..573e595d86 100644
--- a/src/main/java/io/lettuce/core/codec/StringCodec.java
+++ b/src/main/java/io/lettuce/core/codec/StringCodec.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java b/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java
index 83a73753a6..5ddc795faa 100644
--- a/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java
+++ b/src/main/java/io/lettuce/core/codec/ToByteBufEncoder.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java b/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
index 42d19e96f4..aafdc8373e 100644
--- a/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
+++ b/src/main/java/io/lettuce/core/codec/Utf8StringCodec.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
index 94babfe4ac..584c1d8d81 100644
--- a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java
index 95f5eebe14..8293554f49 100644
--- a/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/AsyncExecutableCommandLookupStrategy.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
index f94efa7a73..bdcb567671 100644
--- a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java
index 38b4fbbb8d..5702e63264 100644
--- a/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategy.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/BatchTasks.java b/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
index ec77bca3e7..c4ea2c6696 100644
--- a/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
+++ b/src/main/java/io/lettuce/core/dynamic/BatchTasks.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/Batcher.java b/src/main/java/io/lettuce/core/dynamic/Batcher.java
index efca69b2b6..89ebdedf5f 100644
--- a/src/main/java/io/lettuce/core/dynamic/Batcher.java
+++ b/src/main/java/io/lettuce/core/dynamic/Batcher.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java
index ff7d2d0dfa..c87ffc8eeb 100644
--- a/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java
+++ b/src/main/java/io/lettuce/core/dynamic/CodecAwareMethodParametersAccessor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java b/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java
index 7d08709c5b..659ac8ef1d 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandCreationException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandFactory.java b/src/main/java/io/lettuce/core/dynamic/CommandFactory.java
index 698a74a5f7..0999c79402 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java
index 580d4bddd1..1cdc6d5769 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandFactoryResolver.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandMethod.java b/src/main/java/io/lettuce/core/dynamic/CommandMethod.java
index 50a35bd10a..7793ecd87d 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandMethod.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandMethod.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java b/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java
index 74b2a99ad8..03cf60b4df 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandMethodSyntaxException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java b/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java
index 04711781f6..7e2988512b 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandMethodVerifier.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java
index 7f239514b7..3c64cd3a13 100644
--- a/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/CommandSegmentCommandFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/Commands.java b/src/main/java/io/lettuce/core/dynamic/Commands.java
index 0f587fa65e..10d6151b4e 100644
--- a/src/main/java/io/lettuce/core/dynamic/Commands.java
+++ b/src/main/java/io/lettuce/core/dynamic/Commands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/ConversionService.java b/src/main/java/io/lettuce/core/dynamic/ConversionService.java
index fbc6f3a9b4..e1318a3691 100644
--- a/src/main/java/io/lettuce/core/dynamic/ConversionService.java
+++ b/src/main/java/io/lettuce/core/dynamic/ConversionService.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java b/src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java
index b6aba7796f..ae709f0d68 100644
--- a/src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/ConvertingCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java b/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java
index f7dd2fb210..64b9533cab 100644
--- a/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java
+++ b/src/main/java/io/lettuce/core/dynamic/DeclaredCommandMethod.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java b/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java
index aa563ecda4..a01b7a2ece 100644
--- a/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java
+++ b/src/main/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifier.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
index 35cdf39b3b..2ae5bdcde6 100644
--- a/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
+++ b/src/main/java/io/lettuce/core/dynamic/DefaultMethodParametersAccessor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java b/src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java
index 82e9a68f06..260d077ccb 100644
--- a/src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java
+++ b/src/main/java/io/lettuce/core/dynamic/DefaultRedisCommandsMetadata.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java
index 348e5f9b67..52893757e9 100644
--- a/src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/ExecutableCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java
index 9a393f5f91..80901cb8e9 100644
--- a/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategy.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java
index 667494af6f..d4061f3619 100644
--- a/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java
+++ b/src/main/java/io/lettuce/core/dynamic/ExecutableCommandLookupStrategySupport.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java b/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
index 699a87a289..6a26d3eea6 100644
--- a/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
+++ b/src/main/java/io/lettuce/core/dynamic/ParameterBinder.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java
index 025f47d416..3d75e121ec 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java
index 2b8009dc82..190d7962c5 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java
index 1a5b7747e2..070f79b863 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveExecutableCommandLookupStrategy.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java b/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java
index c2afbbb0e5..2ff20e5552 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java b/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java
index ae51b8f562..e5ba23e099 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
index 59a13a76d8..ff862228eb 100644
--- a/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java b/src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java
index 5d1df42032..a41c2564a5 100644
--- a/src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java
+++ b/src/main/java/io/lettuce/core/dynamic/RedisCommandsMetadata.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java b/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java
index 7db61a9948..71515bb30f 100644
--- a/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java
+++ b/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/annotation/Command.java b/src/main/java/io/lettuce/core/dynamic/annotation/Command.java
index 50d7650b66..d56916c3c1 100644
--- a/src/main/java/io/lettuce/core/dynamic/annotation/Command.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/Command.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java b/src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java
index 94b783c759..6420d978bf 100644
--- a/src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/CommandNaming.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/annotation/Key.java b/src/main/java/io/lettuce/core/dynamic/annotation/Key.java
index 52f8bd7205..1f6754c4c0 100644
--- a/src/main/java/io/lettuce/core/dynamic/annotation/Key.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/Key.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/annotation/Param.java b/src/main/java/io/lettuce/core/dynamic/annotation/Param.java
index 18e27c45c3..a73e9ca6ef 100644
--- a/src/main/java/io/lettuce/core/dynamic/annotation/Param.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/Param.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/annotation/Value.java b/src/main/java/io/lettuce/core/dynamic/annotation/Value.java
index 72b7da8912..ff3896ff8d 100644
--- a/src/main/java/io/lettuce/core/dynamic/annotation/Value.java
+++ b/src/main/java/io/lettuce/core/dynamic/annotation/Value.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java b/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java
index 1531ed3b33..893b953bcd 100644
--- a/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/BatchException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java b/src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java
index 5d70f72959..521103d86d 100644
--- a/src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/BatchExecutor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java b/src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java
index a491c5125f..28d7b83eba 100644
--- a/src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/BatchSize.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java b/src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java
index 0a77a63b9c..98779bd452 100644
--- a/src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java
+++ b/src/main/java/io/lettuce/core/dynamic/batch/CommandBatching.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
index 94d9f87a04..7414146360 100644
--- a/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java b/src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java
index 2a21ec3b3f..8acf9b1aea 100644
--- a/src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/codec/RedisCodecResolver.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java b/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java
index fa6d453674..9250358bd7 100644
--- a/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java
+++ b/src/main/java/io/lettuce/core/dynamic/domain/Timeout.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvokingInterceptor.java b/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvokingInterceptor.java
index 3b7010f184..bf5ff43a67 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvokingInterceptor.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/DefaultMethodInvokingInterceptor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
index b8109b1bfb..abc0d1ceac 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/InvocationTargetProvider.java b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationTargetProvider.java
index 07a0d5cc56..22e8197f16 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/InvocationTargetProvider.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/InvocationTargetProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java
index 3623eef9df..bf01838248 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java
index a3bdf9f56a..47432cfb47 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInterceptorChain.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java
index 983a05ae1e..e8733e063d 100644
--- a/src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java
+++ b/src/main/java/io/lettuce/core/dynamic/intercept/MethodInvocation.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java
index 4876e66b57..0ec3ad1bbe 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CodecAwareOutputFactoryResolver.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java
index f018122705..2c33ccd653 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java
index 26b8c71fd4..d5cdb9682d 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputFactoryResolver.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java
index eabef9a452..dcdb59426c 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/CommandOutputResolverSupport.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
index 9394202f43..9e55a2a340 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
index bd4ad0f188..c9a00e0e30 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolver.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java b/src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java
index 8afc253560..ee2fccac54 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputSelector.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/output/OutputType.java b/src/main/java/io/lettuce/core/dynamic/output/OutputType.java
index 172756ce59..36b5133c03 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/OutputType.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/OutputType.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java b/src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java
index 597b6909d1..540752a051 100644
--- a/src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java
+++ b/src/main/java/io/lettuce/core/dynamic/output/VoidOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java b/src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java
index a1aaa15289..123c8cc7a8 100644
--- a/src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/ExecutionSpecificParameters.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/parameter/MethodParametersAccessor.java b/src/main/java/io/lettuce/core/dynamic/parameter/MethodParametersAccessor.java
index 75f2cc433b..986f8b466f 100644
--- a/src/main/java/io/lettuce/core/dynamic/parameter/MethodParametersAccessor.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/MethodParametersAccessor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java b/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java
index 25f431ea20..e046fc7e75 100644
--- a/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/Parameter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java b/src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java
index 69c84c8e0e..cc62151e58 100644
--- a/src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java
+++ b/src/main/java/io/lettuce/core/dynamic/parameter/Parameters.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java b/src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java
index bc2629756d..7cf1033506 100644
--- a/src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java
index 8202c24873..89b57253db 100644
--- a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegment.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java
index 96339c0ffe..f9b102a3a5 100644
--- a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegmentFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
index 62acff37bd..115b36b6e8 100644
--- a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java
index 26b217cae9..74ba016771 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/AnnotationParameterNameDiscoverer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java
index 07a824f8ea..f369813986 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ClassTypeInformation.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java
index b23ae48dd2..50a85fa5d3 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/CompositeParameterNameDiscoverer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java
index edd5b0a9fa..14db534bcf 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/GenericArrayTypeInformation.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java b/src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java
index d15a48bd9a..060fb0c875 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/GenericTypeResolver.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java b/src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java
index c4e6bb746b..406f6cad51 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/MethodParameter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java
index c1c0cb7bd9..94ffeb9ded 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ParameterNameDiscoverer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java
index 58d44b26b6..d14b044e5f 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformation.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java
index 381111967d..7ee70fd634 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ParentTypeAwareTypeInformation.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java b/src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java
index 7fafe370c7..bd6c345b62 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ReflectionUtils.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java b/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java
index 2c7e185564..de2e3ebbd3 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/ResolvableType.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java
index f9128f31e4..359a4cade1 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/StandardReflectionParameterNameDiscoverer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java b/src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java
index 55e950d30c..efa0616de5 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeDiscoverer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java
index 00cca8a69b..6bb1d531ad 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeInformation.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java
index 27e54dff41..47873dc70f 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeVariableTypeInformation.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java b/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java
index ba99766be9..814c8bb9e9 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/TypeWrapper.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java b/src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java
index 967286a917..2d88a59b1c 100644
--- a/src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java
+++ b/src/main/java/io/lettuce/core/dynamic/support/WildcardTypeInformation.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/event/DefaultEventBus.java b/src/main/java/io/lettuce/core/event/DefaultEventBus.java
index 3c93d8bf1b..82f7cb25bc 100644
--- a/src/main/java/io/lettuce/core/event/DefaultEventBus.java
+++ b/src/main/java/io/lettuce/core/event/DefaultEventBus.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java b/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java
index dd94ed747e..6e8a3e3818 100644
--- a/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java
+++ b/src/main/java/io/lettuce/core/event/DefaultEventPublisherOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/event/Event.java b/src/main/java/io/lettuce/core/event/Event.java
index b6978090e4..f4d638f82d 100644
--- a/src/main/java/io/lettuce/core/event/Event.java
+++ b/src/main/java/io/lettuce/core/event/Event.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/event/EventBus.java b/src/main/java/io/lettuce/core/event/EventBus.java
index 1ac6c6292d..7508d266d2 100644
--- a/src/main/java/io/lettuce/core/event/EventBus.java
+++ b/src/main/java/io/lettuce/core/event/EventBus.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/event/EventPublisherOptions.java b/src/main/java/io/lettuce/core/event/EventPublisherOptions.java
index 23ca2e3263..11113b7fcb 100644
--- a/src/main/java/io/lettuce/core/event/EventPublisherOptions.java
+++ b/src/main/java/io/lettuce/core/event/EventPublisherOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/event/cluster/AdaptiveRefreshTriggeredEvent.java b/src/main/java/io/lettuce/core/event/cluster/AdaptiveRefreshTriggeredEvent.java
index 905a8f4c13..679bc4c492 100644
--- a/src/main/java/io/lettuce/core/event/cluster/AdaptiveRefreshTriggeredEvent.java
+++ b/src/main/java/io/lettuce/core/event/cluster/AdaptiveRefreshTriggeredEvent.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java
index 96b9a71751..ebcec11539 100644
--- a/src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectedEvent.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java
index cc49efc443..0bfd0da57d 100644
--- a/src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectionActivatedEvent.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java
index fb4063203a..3aa522aa5a 100644
--- a/src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectionDeactivatedEvent.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java b/src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java
index 155ffcaad4..be388cbf9c 100644
--- a/src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectionEvent.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java b/src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java
index eaf9dfd050..a19156286e 100644
--- a/src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java
+++ b/src/main/java/io/lettuce/core/event/connection/ConnectionEventSupport.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java b/src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java
index 65a20f1c1f..314a83cc71 100644
--- a/src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/DisconnectedEvent.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/event/connection/ReconnectFailedEvent.java b/src/main/java/io/lettuce/core/event/connection/ReconnectFailedEvent.java
index d23f3ec935..d77d6362cb 100644
--- a/src/main/java/io/lettuce/core/event/connection/ReconnectFailedEvent.java
+++ b/src/main/java/io/lettuce/core/event/connection/ReconnectFailedEvent.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java b/src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java
index 2cc3b191a7..d76ccbe009 100644
--- a/src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java
+++ b/src/main/java/io/lettuce/core/event/metrics/CommandLatencyEvent.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java b/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
index 7e061466a6..e7c4200953 100644
--- a/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
+++ b/src/main/java/io/lettuce/core/event/metrics/DefaultCommandLatencyEventPublisher.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java b/src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java
index 827d0f655a..a3bfa6771b 100644
--- a/src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java
+++ b/src/main/java/io/lettuce/core/event/metrics/MetricEventPublisher.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java b/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
index 0601ebcb1d..6ce5062255 100644
--- a/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/internal/AsyncCloseable.java b/src/main/java/io/lettuce/core/internal/AsyncCloseable.java
index 123296ceff..f067056f8d 100644
--- a/src/main/java/io/lettuce/core/internal/AsyncCloseable.java
+++ b/src/main/java/io/lettuce/core/internal/AsyncCloseable.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java b/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
index 2d3d4a4f54..8d573a98e4 100644
--- a/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/internal/DefaultMethods.java b/src/main/java/io/lettuce/core/internal/DefaultMethods.java
index 0092d23ab1..70e89ec197 100644
--- a/src/main/java/io/lettuce/core/internal/DefaultMethods.java
+++ b/src/main/java/io/lettuce/core/internal/DefaultMethods.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/internal/Futures.java b/src/main/java/io/lettuce/core/internal/Futures.java
index 8270ab7635..c8abd1afa3 100644
--- a/src/main/java/io/lettuce/core/internal/Futures.java
+++ b/src/main/java/io/lettuce/core/internal/Futures.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/internal/HostAndPort.java b/src/main/java/io/lettuce/core/internal/HostAndPort.java
index ff27e4d7e9..6941651d62 100644
--- a/src/main/java/io/lettuce/core/internal/HostAndPort.java
+++ b/src/main/java/io/lettuce/core/internal/HostAndPort.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/internal/LettuceAssert.java b/src/main/java/io/lettuce/core/internal/LettuceAssert.java
index 5ca99a34e9..435dedead4 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceAssert.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceAssert.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/internal/LettuceClassUtils.java b/src/main/java/io/lettuce/core/internal/LettuceClassUtils.java
index 120cc09967..9a75501761 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceClassUtils.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceClassUtils.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/internal/LettuceFactories.java b/src/main/java/io/lettuce/core/internal/LettuceFactories.java
index 31e768ee5d..65679a7eec 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceFactories.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceFactories.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/internal/LettuceLists.java b/src/main/java/io/lettuce/core/internal/LettuceLists.java
index ec826398b2..684b564dbe 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceLists.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceLists.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/internal/LettuceSets.java b/src/main/java/io/lettuce/core/internal/LettuceSets.java
index c653c6b504..42dcb9c13d 100644
--- a/src/main/java/io/lettuce/core/internal/LettuceSets.java
+++ b/src/main/java/io/lettuce/core/internal/LettuceSets.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/internal/TimeoutProvider.java b/src/main/java/io/lettuce/core/internal/TimeoutProvider.java
index dfe9d99fd6..1400a14476 100644
--- a/src/main/java/io/lettuce/core/internal/TimeoutProvider.java
+++ b/src/main/java/io/lettuce/core/internal/TimeoutProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterreplica/MasterReplica.java b/src/main/java/io/lettuce/core/masterreplica/MasterReplica.java
index 659dc285a7..daf3e5405f 100644
--- a/src/main/java/io/lettuce/core/masterreplica/MasterReplica.java
+++ b/src/main/java/io/lettuce/core/masterreplica/MasterReplica.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionWrapper.java b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionWrapper.java
index 420c163758..1f18fb08ec 100644
--- a/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionWrapper.java
+++ b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionWrapper.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterreplica/StatefulRedisMasterReplicaConnection.java b/src/main/java/io/lettuce/core/masterreplica/StatefulRedisMasterReplicaConnection.java
index 572e5f8f01..7e33772517 100644
--- a/src/main/java/io/lettuce/core/masterreplica/StatefulRedisMasterReplicaConnection.java
+++ b/src/main/java/io/lettuce/core/masterreplica/StatefulRedisMasterReplicaConnection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java b/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
index 04cc0f35ba..63a6ee65cb 100644
--- a/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
+++ b/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java b/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
index 5eb906d746..4034fb1dab 100644
--- a/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
+++ b/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java b/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
index 22dd57f916..64a5e39b93 100644
--- a/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
+++ b/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/Connections.java b/src/main/java/io/lettuce/core/masterslave/Connections.java
index 35426dac82..7c34d75d9a 100644
--- a/src/main/java/io/lettuce/core/masterslave/Connections.java
+++ b/src/main/java/io/lettuce/core/masterslave/Connections.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/Exceptions.java b/src/main/java/io/lettuce/core/masterslave/Exceptions.java
index f747034cdd..482910ca50 100644
--- a/src/main/java/io/lettuce/core/masterslave/Exceptions.java
+++ b/src/main/java/io/lettuce/core/masterslave/Exceptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index 7530966bef..a993249805 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
index 4c1972d3de..8aeca57102 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
index d6528a44cd..dfd3c298bd 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java
index 5c5dd6b954..5e70190926 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
index 9d6a643656..25d1687aa1 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
index 13e8cf8f22..f9781faf2e 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
index 64cbd3d606..f3148981be 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java b/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
index b07ef0f73b..9fd8531a32 100644
--- a/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
index 554100a21c..7e1f582535 100644
--- a/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
+++ b/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java b/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java
index 245fcebf1f..a567ebb2a0 100644
--- a/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java b/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
index 142385a333..22b90e68fb 100644
--- a/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
+++ b/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/Requests.java b/src/main/java/io/lettuce/core/masterslave/Requests.java
index 3bdbe5f5eb..9ac1d86ebb 100644
--- a/src/main/java/io/lettuce/core/masterslave/Requests.java
+++ b/src/main/java/io/lettuce/core/masterslave/Requests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java b/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
index a1cf466177..8ea5f75968 100644
--- a/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
+++ b/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java b/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
index bf12bcaf16..b6d5315aa8 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
index 920074a5e9..8204cc431c 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
index 3cbeece3b7..5c429f3ddb 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java
index 0f22772d78..22593808ba 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java
+++ b/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
index 9fe475a42b..ab590a933e 100644
--- a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
+++ b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
index 0e91e425ca..0e7692a05a 100644
--- a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java
index 47eafe3819..13aa8afbcd 100644
--- a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java
+++ b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
index 26aefc530e..83401577f7 100644
--- a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java b/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java
index af31e255a1..40d6cd475e 100644
--- a/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java
+++ b/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/Timeout.java b/src/main/java/io/lettuce/core/masterslave/Timeout.java
index 3af6668474..bf8841ff6e 100644
--- a/src/main/java/io/lettuce/core/masterslave/Timeout.java
+++ b/src/main/java/io/lettuce/core/masterslave/Timeout.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java b/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java
index 8bc958a68d..b95e915ac3 100644
--- a/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java
+++ b/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java b/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
index bc5fb57968..a51aa5fda2 100644
--- a/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java
index b5175266ae..062d0455fa 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollector.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
index 815334459a..2d7c8afe53 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
index d313d491ef..34571ef3c4 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/metrics/CommandMetrics.java b/src/main/java/io/lettuce/core/metrics/CommandMetrics.java
index 75db39f527..957a76b47b 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandMetrics.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandMetrics.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
index bf4c319b96..829cf44b07 100644
--- a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java
index 233550e85a..cd9ce2c838 100644
--- a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java
+++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/metrics/MetricCollector.java b/src/main/java/io/lettuce/core/metrics/MetricCollector.java
index aaaef8bb07..bdea377c21 100644
--- a/src/main/java/io/lettuce/core/metrics/MetricCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/MetricCollector.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/models/command/CommandDetail.java b/src/main/java/io/lettuce/core/models/command/CommandDetail.java
index b86a732296..8ca8c96115 100644
--- a/src/main/java/io/lettuce/core/models/command/CommandDetail.java
+++ b/src/main/java/io/lettuce/core/models/command/CommandDetail.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java b/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
index b75eb14cb9..609326bf52 100644
--- a/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
+++ b/src/main/java/io/lettuce/core/models/command/CommandDetailParser.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/models/role/RedisInstance.java b/src/main/java/io/lettuce/core/models/role/RedisInstance.java
index fad71f169f..debfbc05b7 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisInstance.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java b/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java
index 4b581375c7..fce08375fc 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisMasterInstance.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java b/src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java
index 10102a6556..47b4228c2a 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisNodeDescription.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java b/src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java
index 2a4c476eb4..c5afc106dc 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisSentinelInstance.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java b/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java
index f8f27a2b18..b3f193774f 100644
--- a/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java
+++ b/src/main/java/io/lettuce/core/models/role/RedisSlaveInstance.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/models/role/ReplicationPartner.java b/src/main/java/io/lettuce/core/models/role/ReplicationPartner.java
index 6c7cacb0d6..431fae3749 100644
--- a/src/main/java/io/lettuce/core/models/role/ReplicationPartner.java
+++ b/src/main/java/io/lettuce/core/models/role/ReplicationPartner.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/models/role/RoleParser.java b/src/main/java/io/lettuce/core/models/role/RoleParser.java
index 2118f7befc..de2c3399a3 100644
--- a/src/main/java/io/lettuce/core/models/role/RoleParser.java
+++ b/src/main/java/io/lettuce/core/models/role/RoleParser.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/models/stream/PendingEntry.java b/src/main/java/io/lettuce/core/models/stream/PendingEntry.java
index 0b1882d9e1..7ede83bdc4 100644
--- a/src/main/java/io/lettuce/core/models/stream/PendingEntry.java
+++ b/src/main/java/io/lettuce/core/models/stream/PendingEntry.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/models/stream/PendingMessage.java b/src/main/java/io/lettuce/core/models/stream/PendingMessage.java
index f26491f456..4b9093aa81 100644
--- a/src/main/java/io/lettuce/core/models/stream/PendingMessage.java
+++ b/src/main/java/io/lettuce/core/models/stream/PendingMessage.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/models/stream/PendingMessages.java b/src/main/java/io/lettuce/core/models/stream/PendingMessages.java
index 733198f9ff..fc6e32803b 100644
--- a/src/main/java/io/lettuce/core/models/stream/PendingMessages.java
+++ b/src/main/java/io/lettuce/core/models/stream/PendingMessages.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/models/stream/PendingParser.java b/src/main/java/io/lettuce/core/models/stream/PendingParser.java
index 79233239da..ac25c2c89b 100644
--- a/src/main/java/io/lettuce/core/models/stream/PendingParser.java
+++ b/src/main/java/io/lettuce/core/models/stream/PendingParser.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/models/stream/package-info.java b/src/main/java/io/lettuce/core/models/stream/package-info.java
index fc988d5e1b..c830a764e6 100644
--- a/src/main/java/io/lettuce/core/models/stream/package-info.java
+++ b/src/main/java/io/lettuce/core/models/stream/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ArrayOutput.java b/src/main/java/io/lettuce/core/output/ArrayOutput.java
index 73d6b3454d..6e38489e17 100644
--- a/src/main/java/io/lettuce/core/output/ArrayOutput.java
+++ b/src/main/java/io/lettuce/core/output/ArrayOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/BooleanListOutput.java b/src/main/java/io/lettuce/core/output/BooleanListOutput.java
index 3b04958db4..a91f640256 100644
--- a/src/main/java/io/lettuce/core/output/BooleanListOutput.java
+++ b/src/main/java/io/lettuce/core/output/BooleanListOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/BooleanOutput.java b/src/main/java/io/lettuce/core/output/BooleanOutput.java
index ca8ee0edb3..383c16b7a5 100644
--- a/src/main/java/io/lettuce/core/output/BooleanOutput.java
+++ b/src/main/java/io/lettuce/core/output/BooleanOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ByteArrayOutput.java b/src/main/java/io/lettuce/core/output/ByteArrayOutput.java
index 4b3aa1cb05..ef18aa8708 100644
--- a/src/main/java/io/lettuce/core/output/ByteArrayOutput.java
+++ b/src/main/java/io/lettuce/core/output/ByteArrayOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/CommandOutput.java b/src/main/java/io/lettuce/core/output/CommandOutput.java
index 14927f7752..b17a45d26c 100644
--- a/src/main/java/io/lettuce/core/output/CommandOutput.java
+++ b/src/main/java/io/lettuce/core/output/CommandOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/DateOutput.java b/src/main/java/io/lettuce/core/output/DateOutput.java
index 52b9ec4424..19b404e713 100644
--- a/src/main/java/io/lettuce/core/output/DateOutput.java
+++ b/src/main/java/io/lettuce/core/output/DateOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java b/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java
index 3da0b76f61..74e3bb6bcc 100644
--- a/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java
+++ b/src/main/java/io/lettuce/core/output/DefaultTransactionResult.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/DoubleOutput.java b/src/main/java/io/lettuce/core/output/DoubleOutput.java
index b8179abfb5..2a4052d67e 100644
--- a/src/main/java/io/lettuce/core/output/DoubleOutput.java
+++ b/src/main/java/io/lettuce/core/output/DoubleOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/GenericMapOutput.java b/src/main/java/io/lettuce/core/output/GenericMapOutput.java
index 7ffddfb0a9..39fb1dbf59 100644
--- a/src/main/java/io/lettuce/core/output/GenericMapOutput.java
+++ b/src/main/java/io/lettuce/core/output/GenericMapOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
index 8cb7d01f1b..e0aa799dcb 100644
--- a/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesListOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java b/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
index 7bf7f86c37..86857b1293 100644
--- a/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoCoordinatesValueListOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java b/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
index 9f857d624a..bd897486b6 100644
--- a/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
+++ b/src/main/java/io/lettuce/core/output/GeoWithinListOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/IntegerOutput.java b/src/main/java/io/lettuce/core/output/IntegerOutput.java
index faa32e687d..47c315c60b 100644
--- a/src/main/java/io/lettuce/core/output/IntegerOutput.java
+++ b/src/main/java/io/lettuce/core/output/IntegerOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/KeyListOutput.java b/src/main/java/io/lettuce/core/output/KeyListOutput.java
index 6021a590c3..2fd8177207 100644
--- a/src/main/java/io/lettuce/core/output/KeyListOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyListOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/KeyOutput.java b/src/main/java/io/lettuce/core/output/KeyOutput.java
index 45e2409d6f..c1667e590d 100644
--- a/src/main/java/io/lettuce/core/output/KeyOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/KeyScanOutput.java b/src/main/java/io/lettuce/core/output/KeyScanOutput.java
index e4f13ed4df..80d705cc54 100644
--- a/src/main/java/io/lettuce/core/output/KeyScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyScanOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java
index 6e110d156f..c2cd408283 100644
--- a/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyScanStreamingOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/KeyStreamingChannel.java b/src/main/java/io/lettuce/core/output/KeyStreamingChannel.java
index 1b92de61a2..3c024b3c80 100644
--- a/src/main/java/io/lettuce/core/output/KeyStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/KeyStreamingChannel.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java
index 3aca782b8b..61ac5978f1 100644
--- a/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyStreamingOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/KeyValueListOutput.java b/src/main/java/io/lettuce/core/output/KeyValueListOutput.java
index a72ec2868f..4151798037 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueListOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/KeyValueOutput.java b/src/main/java/io/lettuce/core/output/KeyValueOutput.java
index 7910c0bb8f..3c40ad1e71 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java
index 3e514b6d4b..34bd6fdf6b 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueScanStreamingOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/KeyValueScoredValueOutput.java b/src/main/java/io/lettuce/core/output/KeyValueScoredValueOutput.java
index 3e5195293d..c04a01207f 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueScoredValueOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueScoredValueOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java
index d265c184c0..301c6d6faa 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueStreamingChannel.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java
index 18b6fe5ddc..188bc342d3 100644
--- a/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/KeyValueStreamingOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java b/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java
index 3b91ea1301..b7bb7c6654 100644
--- a/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java
+++ b/src/main/java/io/lettuce/core/output/ListOfMapsOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ListSubscriber.java b/src/main/java/io/lettuce/core/output/ListSubscriber.java
index 50267a6ced..fa7fb8e4bc 100644
--- a/src/main/java/io/lettuce/core/output/ListSubscriber.java
+++ b/src/main/java/io/lettuce/core/output/ListSubscriber.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/MapOutput.java b/src/main/java/io/lettuce/core/output/MapOutput.java
index 668897526d..21a2b10b08 100644
--- a/src/main/java/io/lettuce/core/output/MapOutput.java
+++ b/src/main/java/io/lettuce/core/output/MapOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/MapScanOutput.java b/src/main/java/io/lettuce/core/output/MapScanOutput.java
index 456b9fc7b5..d4a8916ac1 100644
--- a/src/main/java/io/lettuce/core/output/MapScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/MapScanOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/MultiOutput.java b/src/main/java/io/lettuce/core/output/MultiOutput.java
index 32b0e7cc2a..b9a9d9f2bd 100644
--- a/src/main/java/io/lettuce/core/output/MultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/MultiOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/NestedMultiOutput.java b/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
index f430aafeb2..878b32ecff 100644
--- a/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/NestedMultiOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/OutputFactory.java b/src/main/java/io/lettuce/core/output/OutputFactory.java
index f16d020821..8aa0f73151 100644
--- a/src/main/java/io/lettuce/core/output/OutputFactory.java
+++ b/src/main/java/io/lettuce/core/output/OutputFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ReplayOutput.java b/src/main/java/io/lettuce/core/output/ReplayOutput.java
index ef4288bec8..6728adcbf4 100644
--- a/src/main/java/io/lettuce/core/output/ReplayOutput.java
+++ b/src/main/java/io/lettuce/core/output/ReplayOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ScanOutput.java b/src/main/java/io/lettuce/core/output/ScanOutput.java
index 61825cd773..cb3fa98862 100644
--- a/src/main/java/io/lettuce/core/output/ScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScanOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
index a9856cd21b..1850bfc7c4 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueListOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueOutput.java
index 79e51ad4ad..2e2a0669bb 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
index 900470c0aa..017933211f 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueScanOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
index 8fff1483b0..71b71e7ea3 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueScanStreamingOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java
index 773e2a6549..4f3f1ef693 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueStreamingChannel.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
index 81a80e19e5..a8a3b1b520 100644
--- a/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ScoredValueStreamingOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/SocketAddressOutput.java b/src/main/java/io/lettuce/core/output/SocketAddressOutput.java
index 927ab6754c..f3a646e5b4 100644
--- a/src/main/java/io/lettuce/core/output/SocketAddressOutput.java
+++ b/src/main/java/io/lettuce/core/output/SocketAddressOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/StatusOutput.java b/src/main/java/io/lettuce/core/output/StatusOutput.java
index 7889834d5e..67355c3e64 100644
--- a/src/main/java/io/lettuce/core/output/StatusOutput.java
+++ b/src/main/java/io/lettuce/core/output/StatusOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/StreamMessageListOutput.java b/src/main/java/io/lettuce/core/output/StreamMessageListOutput.java
index f774ecb8c4..31e5db4134 100644
--- a/src/main/java/io/lettuce/core/output/StreamMessageListOutput.java
+++ b/src/main/java/io/lettuce/core/output/StreamMessageListOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/StreamReadOutput.java b/src/main/java/io/lettuce/core/output/StreamReadOutput.java
index f643db6b49..64a81a5574 100644
--- a/src/main/java/io/lettuce/core/output/StreamReadOutput.java
+++ b/src/main/java/io/lettuce/core/output/StreamReadOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/StreamingChannel.java b/src/main/java/io/lettuce/core/output/StreamingChannel.java
index e8fcf659b3..50ab99ece3 100644
--- a/src/main/java/io/lettuce/core/output/StreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/StreamingChannel.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/StreamingOutput.java b/src/main/java/io/lettuce/core/output/StreamingOutput.java
index ec4a266378..90a9648201 100644
--- a/src/main/java/io/lettuce/core/output/StreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/StreamingOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/StringListOutput.java b/src/main/java/io/lettuce/core/output/StringListOutput.java
index 11226b5b42..16eb04a92c 100644
--- a/src/main/java/io/lettuce/core/output/StringListOutput.java
+++ b/src/main/java/io/lettuce/core/output/StringListOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/StringValueListOutput.java b/src/main/java/io/lettuce/core/output/StringValueListOutput.java
index da3b3bb2db..e0dcef4219 100644
--- a/src/main/java/io/lettuce/core/output/StringValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/StringValueListOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ValueListOutput.java b/src/main/java/io/lettuce/core/output/ValueListOutput.java
index 5c1a41c882..df93be431d 100644
--- a/src/main/java/io/lettuce/core/output/ValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueListOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ValueOutput.java b/src/main/java/io/lettuce/core/output/ValueOutput.java
index c9db032112..8fb5be2e61 100644
--- a/src/main/java/io/lettuce/core/output/ValueOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ValueScanOutput.java b/src/main/java/io/lettuce/core/output/ValueScanOutput.java
index 4c5d67540b..45725f3470 100644
--- a/src/main/java/io/lettuce/core/output/ValueScanOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueScanOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java b/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java
index 19e2a40818..fdbe7f7907 100644
--- a/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueScanStreamingOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ValueSetOutput.java b/src/main/java/io/lettuce/core/output/ValueSetOutput.java
index 39f797818c..6a7c258669 100644
--- a/src/main/java/io/lettuce/core/output/ValueSetOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueSetOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java b/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java
index d0c12f1ff5..871ae25d3d 100644
--- a/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java
+++ b/src/main/java/io/lettuce/core/output/ValueStreamingChannel.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java b/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java
index 8b599925d7..ffe32e776f 100644
--- a/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueStreamingOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/output/ValueValueListOutput.java b/src/main/java/io/lettuce/core/output/ValueValueListOutput.java
index ce1992e3b1..6605b48808 100644
--- a/src/main/java/io/lettuce/core/output/ValueValueListOutput.java
+++ b/src/main/java/io/lettuce/core/output/ValueValueListOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
index 6574e41334..97fe4bd006 100644
--- a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java b/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java
index 8ede9c93aa..4ce02df074 100644
--- a/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/protocol/BaseRedisCommandBuilder.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java b/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java
index 58f1f19e6e..a2cd8f0612 100644
--- a/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java
+++ b/src/main/java/io/lettuce/core/protocol/ChannelLogDescriptor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/Command.java b/src/main/java/io/lettuce/core/protocol/Command.java
index 835b543de3..807118ef2b 100644
--- a/src/main/java/io/lettuce/core/protocol/Command.java
+++ b/src/main/java/io/lettuce/core/protocol/Command.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgs.java b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
index 24402e73aa..4c233e04eb 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandArgs.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java b/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
index 07a934486d..f510fc1e5a 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/CommandEncoder.java b/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
index b25d564069..c067265956 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java b/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
index 7c725cc2ba..6da70fe569 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index a2379da932..57496cce8f 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
index 3dfc82b84f..4ac0f596a7 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/CommandType.java b/src/main/java/io/lettuce/core/protocol/CommandType.java
index 080198d35c..d0c87f3b3c 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandType.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandType.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
index e9bd790eb2..e9da312b81 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandWrapper.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java b/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
index e96a95a983..ad57fd0401 100644
--- a/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/CompleteableCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionFacade.java b/src/main/java/io/lettuce/core/protocol/ConnectionFacade.java
index 78818a7d42..9e9ea88dc0 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionFacade.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionFacade.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionInitializer.java b/src/main/java/io/lettuce/core/protocol/ConnectionInitializer.java
index 35dee02322..3ca04024fd 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionInitializer.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionInitializer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
index f45e15d7be..e7bc5f9274 100644
--- a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
+++ b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/DecoratedCommand.java b/src/main/java/io/lettuce/core/protocol/DecoratedCommand.java
index 7a07e64240..228b345a1d 100644
--- a/src/main/java/io/lettuce/core/protocol/DecoratedCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/DecoratedCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index 8afd477743..5183e3d314 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/DemandAware.java b/src/main/java/io/lettuce/core/protocol/DemandAware.java
index e4596d05b9..8befd98630 100644
--- a/src/main/java/io/lettuce/core/protocol/DemandAware.java
+++ b/src/main/java/io/lettuce/core/protocol/DemandAware.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/Endpoint.java b/src/main/java/io/lettuce/core/protocol/Endpoint.java
index ec419f6cc5..ea03ba8780 100644
--- a/src/main/java/io/lettuce/core/protocol/Endpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/Endpoint.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java b/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java
index b1edac3249..6db4327481 100644
--- a/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java
+++ b/src/main/java/io/lettuce/core/protocol/HasQueuedCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/LatencyMeteredCommand.java b/src/main/java/io/lettuce/core/protocol/LatencyMeteredCommand.java
index 6af959d003..543652640f 100644
--- a/src/main/java/io/lettuce/core/protocol/LatencyMeteredCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/LatencyMeteredCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/PristineFallbackCommand.java b/src/main/java/io/lettuce/core/protocol/PristineFallbackCommand.java
index f1fc4dd8dc..ce1ff5b32f 100644
--- a/src/main/java/io/lettuce/core/protocol/PristineFallbackCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/PristineFallbackCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java b/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java
index a58dd0084f..67467c90d0 100644
--- a/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java
+++ b/src/main/java/io/lettuce/core/protocol/ProtocolKeyword.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/ProtocolVersion.java b/src/main/java/io/lettuce/core/protocol/ProtocolVersion.java
index d7b2b8d113..49b8cdb9bd 100644
--- a/src/main/java/io/lettuce/core/protocol/ProtocolVersion.java
+++ b/src/main/java/io/lettuce/core/protocol/ProtocolVersion.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
index 297526d9f2..985e9ace88 100644
--- a/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/ReconnectionHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java b/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java
index 91ac12f3d6..4eacf03c58 100644
--- a/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java
+++ b/src/main/java/io/lettuce/core/protocol/ReconnectionListener.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/RedisCommand.java b/src/main/java/io/lettuce/core/protocol/RedisCommand.java
index 5973574c3c..00987e9f6f 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/RedisHandshakeHandler.java b/src/main/java/io/lettuce/core/protocol/RedisHandshakeHandler.java
index cbe99c0a14..c32fe85189 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisHandshakeHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisHandshakeHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/RedisProtocolException.java b/src/main/java/io/lettuce/core/protocol/RedisProtocolException.java
index 063c04e46a..801717a278 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisProtocolException.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisProtocolException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index 9b1b01965c..128aea780a 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/SharedLock.java b/src/main/java/io/lettuce/core/protocol/SharedLock.java
index 3f78c7819a..e22caefdb8 100644
--- a/src/main/java/io/lettuce/core/protocol/SharedLock.java
+++ b/src/main/java/io/lettuce/core/protocol/SharedLock.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/SslRedisHandshakeHandler.java b/src/main/java/io/lettuce/core/protocol/SslRedisHandshakeHandler.java
index 2c2aeb7d5b..1250d3b73f 100644
--- a/src/main/java/io/lettuce/core/protocol/SslRedisHandshakeHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/SslRedisHandshakeHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/TracedCommand.java b/src/main/java/io/lettuce/core/protocol/TracedCommand.java
index 6c2bd9233c..84f8bad469 100644
--- a/src/main/java/io/lettuce/core/protocol/TracedCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/TracedCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java b/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java
index 425fcb3319..80f152b2e7 100644
--- a/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/TransactionalCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/protocol/WithLatency.java b/src/main/java/io/lettuce/core/protocol/WithLatency.java
index 4259086633..c286e8d4bb 100644
--- a/src/main/java/io/lettuce/core/protocol/WithLatency.java
+++ b/src/main/java/io/lettuce/core/protocol/WithLatency.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java
index 09122e350a..6218423332 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java
index 1dcaa6822c..a2b4f0e882 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
index 8d2e25fc8f..461ee00f55 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubCommandHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
index 358205b7c4..02a1acfdcc 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java b/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
index cd2b959498..e02ba83ae3 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubOutput.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java
index 36ff447ef0..397f69b9c2 100644
--- a/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java
index 306f28cf07..64f42f2f9b 100644
--- a/src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAsyncCommandsImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java
index 9460640d56..006d7c33b6 100644
--- a/src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubListener.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
index fed07db2b3..e0f02303a1 100644
--- a/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/RedisPubSubReactiveCommandsImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java
index 2a2fc469a5..803014f61d 100644
--- a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java
+++ b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
index f15f081776..a68dab1e40 100644
--- a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java
index c141212cf6..df787d5712 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/async/RedisPubSubAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java
index 2884d0d214..311e408292 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/ChannelMessage.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java
index 969aaae0e7..51297e455c 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/PatternMessage.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java b/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java
index 32dfb42c0b..c9f67eb329 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/reactive/RedisPubSubReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java b/src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java
index 85b3b6a90c..d025015e9c 100644
--- a/src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java
+++ b/src/main/java/io/lettuce/core/pubsub/api/sync/RedisPubSubCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/ClientResources.java b/src/main/java/io/lettuce/core/resource/ClientResources.java
index 5ccb6bd7a6..802bd17b01 100644
--- a/src/main/java/io/lettuce/core/resource/ClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/ClientResources.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/ConstantDelay.java b/src/main/java/io/lettuce/core/resource/ConstantDelay.java
index 2cd976d3f8..3400d0c013 100644
--- a/src/main/java/io/lettuce/core/resource/ConstantDelay.java
+++ b/src/main/java/io/lettuce/core/resource/ConstantDelay.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java b/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java
index ae4b605a72..a4462ceb44 100644
--- a/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java
+++ b/src/main/java/io/lettuce/core/resource/DecorrelatedJitterDelay.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index 6ea8cce4e1..49395ade0c 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
index 6f84a4aee8..31ab9fe2a1 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/DefaultNettyCustomizer.java b/src/main/java/io/lettuce/core/resource/DefaultNettyCustomizer.java
index 08a985bc11..37ab6b7b31 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultNettyCustomizer.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultNettyCustomizer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/Delay.java b/src/main/java/io/lettuce/core/resource/Delay.java
index 2126e4de52..b1fb14ec8a 100644
--- a/src/main/java/io/lettuce/core/resource/Delay.java
+++ b/src/main/java/io/lettuce/core/resource/Delay.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java b/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java
index 2e10e204fd..231c496589 100644
--- a/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java
+++ b/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/DnsResolver.java b/src/main/java/io/lettuce/core/resource/DnsResolver.java
index 21a3eb82c7..4754fab90f 100644
--- a/src/main/java/io/lettuce/core/resource/DnsResolver.java
+++ b/src/main/java/io/lettuce/core/resource/DnsResolver.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/DnsResolvers.java b/src/main/java/io/lettuce/core/resource/DnsResolvers.java
index 331ea54283..efc898ad18 100644
--- a/src/main/java/io/lettuce/core/resource/DnsResolvers.java
+++ b/src/main/java/io/lettuce/core/resource/DnsResolvers.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/EpollProvider.java b/src/main/java/io/lettuce/core/resource/EpollProvider.java
index ce7f2bce1d..64f87d0bbe 100644
--- a/src/main/java/io/lettuce/core/resource/EpollProvider.java
+++ b/src/main/java/io/lettuce/core/resource/EpollProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java b/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java
index aefd675563..2b82250769 100644
--- a/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java
+++ b/src/main/java/io/lettuce/core/resource/EqualJitterDelay.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java
index ce4610c47c..374d9c390b 100644
--- a/src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java
+++ b/src/main/java/io/lettuce/core/resource/EventLoopGroupProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/EventLoopResources.java b/src/main/java/io/lettuce/core/resource/EventLoopResources.java
index 2f386cef39..a12400e4d6 100644
--- a/src/main/java/io/lettuce/core/resource/EventLoopResources.java
+++ b/src/main/java/io/lettuce/core/resource/EventLoopResources.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/ExponentialDelay.java b/src/main/java/io/lettuce/core/resource/ExponentialDelay.java
index 0b64b00cc0..f67fd66bdf 100644
--- a/src/main/java/io/lettuce/core/resource/ExponentialDelay.java
+++ b/src/main/java/io/lettuce/core/resource/ExponentialDelay.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/FullJitterDelay.java b/src/main/java/io/lettuce/core/resource/FullJitterDelay.java
index 068c132bb0..5235871fd6 100644
--- a/src/main/java/io/lettuce/core/resource/FullJitterDelay.java
+++ b/src/main/java/io/lettuce/core/resource/FullJitterDelay.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/KqueueProvider.java b/src/main/java/io/lettuce/core/resource/KqueueProvider.java
index 843c1f531d..5ef17018e1 100644
--- a/src/main/java/io/lettuce/core/resource/KqueueProvider.java
+++ b/src/main/java/io/lettuce/core/resource/KqueueProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/MappingSocketAddressResolver.java b/src/main/java/io/lettuce/core/resource/MappingSocketAddressResolver.java
index fb9ca3a4e8..8e5dc64fd0 100644
--- a/src/main/java/io/lettuce/core/resource/MappingSocketAddressResolver.java
+++ b/src/main/java/io/lettuce/core/resource/MappingSocketAddressResolver.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/NettyCustomizer.java b/src/main/java/io/lettuce/core/resource/NettyCustomizer.java
index c6f4a12f20..ca8be1f757 100644
--- a/src/main/java/io/lettuce/core/resource/NettyCustomizer.java
+++ b/src/main/java/io/lettuce/core/resource/NettyCustomizer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/PromiseAdapter.java b/src/main/java/io/lettuce/core/resource/PromiseAdapter.java
index 7e6a349c7f..d99bd5b4f8 100644
--- a/src/main/java/io/lettuce/core/resource/PromiseAdapter.java
+++ b/src/main/java/io/lettuce/core/resource/PromiseAdapter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java b/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
index df705035ce..f35df4d717 100644
--- a/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
+++ b/src/main/java/io/lettuce/core/resource/SocketAddressResolver.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
index d16c1e92f7..e699d5d3eb 100644
--- a/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/RedisSentinelAsyncCommandsImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
index 580fa5a027..794f6e1882 100644
--- a/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/RedisSentinelReactiveCommandsImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java b/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java
index 3ec715aa85..908dc586b0 100644
--- a/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/sentinel/SentinelCommandBuilder.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
index a1c4f2f53a..a35e0a6bf8 100644
--- a/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java b/src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java
index bd2efbdd7e..fb1f3cdbf8 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/StatefulRedisSentinelConnection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java b/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
index 9eef575530..4a6ebd1f73 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/async/RedisSentinelAsyncCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java b/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
index 011278e74a..51f98ef55f 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/reactive/RedisSentinelReactiveCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java b/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
index 14c047b5e0..50d40aa9e4 100644
--- a/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
+++ b/src/main/java/io/lettuce/core/sentinel/api/sync/RedisSentinelCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/AbstractCdiBean.java b/src/main/java/io/lettuce/core/support/AbstractCdiBean.java
index cf08e4c7aa..0b9326c4f2 100644
--- a/src/main/java/io/lettuce/core/support/AbstractCdiBean.java
+++ b/src/main/java/io/lettuce/core/support/AbstractCdiBean.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java
index b0885c0b5a..bcab04d0b1 100644
--- a/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java
+++ b/src/main/java/io/lettuce/core/support/AsyncConnectionPoolSupport.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/AsyncObjectFactory.java b/src/main/java/io/lettuce/core/support/AsyncObjectFactory.java
index afaa70bd8f..3738693061 100644
--- a/src/main/java/io/lettuce/core/support/AsyncObjectFactory.java
+++ b/src/main/java/io/lettuce/core/support/AsyncObjectFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/AsyncPool.java b/src/main/java/io/lettuce/core/support/AsyncPool.java
index 53e890f00a..8ceccfc164 100644
--- a/src/main/java/io/lettuce/core/support/AsyncPool.java
+++ b/src/main/java/io/lettuce/core/support/AsyncPool.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/BasePool.java b/src/main/java/io/lettuce/core/support/BasePool.java
index d8678a47ef..bb7536af1a 100644
--- a/src/main/java/io/lettuce/core/support/BasePool.java
+++ b/src/main/java/io/lettuce/core/support/BasePool.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/BasePoolConfig.java b/src/main/java/io/lettuce/core/support/BasePoolConfig.java
index 3554a933b4..09c39a69c0 100644
--- a/src/main/java/io/lettuce/core/support/BasePoolConfig.java
+++ b/src/main/java/io/lettuce/core/support/BasePoolConfig.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java b/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java
index 224f0283ac..1485295103 100644
--- a/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java
+++ b/src/main/java/io/lettuce/core/support/BoundedAsyncPool.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java b/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java
index 49d734185b..eb87ca0c6b 100644
--- a/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java
+++ b/src/main/java/io/lettuce/core/support/BoundedPoolConfig.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java b/src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java
index d9fb366a8f..67ad01cb24 100644
--- a/src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java
+++ b/src/main/java/io/lettuce/core/support/ClientResourcesFactoryBean.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java b/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
index 9919c16b29..bb08f46572 100644
--- a/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
+++ b/src/main/java/io/lettuce/core/support/CommonsPool2ConfigConverter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
index 9d2ccf243d..c8087b6e1c 100644
--- a/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
+++ b/src/main/java/io/lettuce/core/support/ConnectionPoolSupport.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/ConnectionWrapping.java b/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
index e0fc4cb924..700e01ed27 100644
--- a/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
+++ b/src/main/java/io/lettuce/core/support/ConnectionWrapping.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java b/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
index b6f80479d1..a9ec032ab6 100644
--- a/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
+++ b/src/main/java/io/lettuce/core/support/LettuceCdiExtension.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java b/src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java
index d2e914a8dd..761aa726fc 100644
--- a/src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java
+++ b/src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/RedisClientCdiBean.java b/src/main/java/io/lettuce/core/support/RedisClientCdiBean.java
index 635e77c3ff..f2f06e8f98 100644
--- a/src/main/java/io/lettuce/core/support/RedisClientCdiBean.java
+++ b/src/main/java/io/lettuce/core/support/RedisClientCdiBean.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java b/src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java
index 44be6614c2..4c0cf9571a 100644
--- a/src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java
+++ b/src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java b/src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java
index e9ad7445a7..60b43f89d0 100644
--- a/src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java
+++ b/src/main/java/io/lettuce/core/support/RedisClusterClientCdiBean.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java b/src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java
index 6d6af502c1..041d62129b 100644
--- a/src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java
+++ b/src/main/java/io/lettuce/core/support/RedisClusterClientFactoryBean.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/tracing/BraveTracing.java b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
index 698a0104ef..fdaef48adf 100644
--- a/src/main/java/io/lettuce/core/tracing/BraveTracing.java
+++ b/src/main/java/io/lettuce/core/tracing/BraveTracing.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/tracing/NoOpTracing.java b/src/main/java/io/lettuce/core/tracing/NoOpTracing.java
index a1fc35a545..21fdc73885 100644
--- a/src/main/java/io/lettuce/core/tracing/NoOpTracing.java
+++ b/src/main/java/io/lettuce/core/tracing/NoOpTracing.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/tracing/TraceContext.java b/src/main/java/io/lettuce/core/tracing/TraceContext.java
index e3328da5ec..6e4accdf01 100644
--- a/src/main/java/io/lettuce/core/tracing/TraceContext.java
+++ b/src/main/java/io/lettuce/core/tracing/TraceContext.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/tracing/TraceContextProvider.java b/src/main/java/io/lettuce/core/tracing/TraceContextProvider.java
index 1344127e5d..9367682402 100644
--- a/src/main/java/io/lettuce/core/tracing/TraceContextProvider.java
+++ b/src/main/java/io/lettuce/core/tracing/TraceContextProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/tracing/Tracer.java b/src/main/java/io/lettuce/core/tracing/Tracer.java
index 16a197fe6e..780a43aaf7 100644
--- a/src/main/java/io/lettuce/core/tracing/Tracer.java
+++ b/src/main/java/io/lettuce/core/tracing/Tracer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/tracing/TracerProvider.java b/src/main/java/io/lettuce/core/tracing/TracerProvider.java
index 3895909960..30316de649 100644
--- a/src/main/java/io/lettuce/core/tracing/TracerProvider.java
+++ b/src/main/java/io/lettuce/core/tracing/TracerProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/lettuce/core/tracing/Tracing.java b/src/main/java/io/lettuce/core/tracing/Tracing.java
index d82517ef89..4e2e9298fa 100644
--- a/src/main/java/io/lettuce/core/tracing/Tracing.java
+++ b/src/main/java/io/lettuce/core/tracing/Tracing.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/javadoc/stylesheet.css b/src/main/javadoc/stylesheet.css
index 57fb64b57e..140baede56 100644
--- a/src/main/javadoc/stylesheet.css
+++ b/src/main/javadoc/stylesheet.css
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/resources/META-INF/LICENSE b/src/main/resources/META-INF/LICENSE
index d645695673..ff9ad4530f 100644
--- a/src/main/resources/META-INF/LICENSE
+++ b/src/main/resources/META-INF/LICENSE
@@ -193,7 +193,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE
index 4b9400dee3..ffffbcdf64 100644
--- a/src/main/resources/META-INF/NOTICE
+++ b/src/main/resources/META-INF/NOTICE
@@ -1,5 +1,5 @@
 Lettuce Java Redis Client ${version}
-Copyright (c) 2011-2019 Mark Paluch
+Copyright (c) 2011-2020 Mark Paluch
 
 This product is licensed to you under the Apache License, Version 2.0
 (the "License"). You may not use this product except in compliance with
diff --git a/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java b/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java
index 2b11cfce8b..d713c556e8 100644
--- a/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java
+++ b/src/main/templates/io/lettuce/core/api/BaseRedisCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/templates/io/lettuce/core/api/RedisGeoCommands.java b/src/main/templates/io/lettuce/core/api/RedisGeoCommands.java
index aa542e6843..eb42826b66 100644
--- a/src/main/templates/io/lettuce/core/api/RedisGeoCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisGeoCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/templates/io/lettuce/core/api/RedisHLLCommands.java b/src/main/templates/io/lettuce/core/api/RedisHLLCommands.java
index 2158f430ee..1a5b936a9d 100644
--- a/src/main/templates/io/lettuce/core/api/RedisHLLCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisHLLCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/templates/io/lettuce/core/api/RedisHashCommands.java b/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
index 7ef3aa5a34..10e911a0a0 100644
--- a/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java b/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
index 35cded19c8..0cb6caa23a 100644
--- a/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/templates/io/lettuce/core/api/RedisListCommands.java b/src/main/templates/io/lettuce/core/api/RedisListCommands.java
index e6b11ba40a..0192a06b93 100644
--- a/src/main/templates/io/lettuce/core/api/RedisListCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisListCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java b/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java
index 6d6e03575f..8d65220675 100644
--- a/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java b/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java
index 82f22c8a6f..de698f2e76 100644
--- a/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisSentinelCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
index 6ff7bcae02..b395fc1637 100644
--- a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/templates/io/lettuce/core/api/RedisSetCommands.java b/src/main/templates/io/lettuce/core/api/RedisSetCommands.java
index 16dcfbd0f8..6920620fb1 100644
--- a/src/main/templates/io/lettuce/core/api/RedisSetCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisSetCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java b/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
index e3a145aa20..2b392b21fd 100644
--- a/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisSortedSetCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
index 2ff991754f..a594f2b20d 100644
--- a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/templates/io/lettuce/core/api/RedisStringCommands.java b/src/main/templates/io/lettuce/core/api/RedisStringCommands.java
index 7b36caddab..72d22fe338 100644
--- a/src/main/templates/io/lettuce/core/api/RedisStringCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisStringCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java b/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java
index 2111683aab..5926758ef3 100644
--- a/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisTransactionalCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/bash/create_certificates.sh b/src/test/bash/create_certificates.sh
index be98469501..32ec0cf993 100755
--- a/src/test/bash/create_certificates.sh
+++ b/src/test/bash/create_certificates.sh
@@ -44,13 +44,13 @@ chmod 400 ${CA_DIR}/private/ca.key.pem
 echo "[INFO] Generating CA certificate"
 openssl req -config ${DIR}/openssl.cnf \
       -key ${CA_DIR}/private/ca.key.pem \
-      -new -x509 -days 7300 -sha256 -extensions v3_ca \
+      -new -x509 -days 7300-2020 -sha256 -extensions v3_ca \
       -out ${CA_DIR}/certs/ca.cert.pem \
       -passin pass:changeit \
       -subj "/C=NN/ST=Unknown/L=Unknown/O=lettuce/CN=CA Certificate"
 
 echo "[INFO] Prepare CA database"
-echo 1000 > ${CA_DIR}/serial
+echo 1000-2020 > ${CA_DIR}/serial
 touch ${CA_DIR}/index.txt
 
 function generateKey {
diff --git a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
index ca778ae104..8a026da45d 100644
--- a/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
+++ b/src/test/java/biz/paluch/redis/extensibility/LettuceGeoDemo.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
index 9dc8c1a13c..345fbbd1c6 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClient.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
index e7b215929d..a596784d1b 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyExtendedRedisClientTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
index 11970a7529..7187a1df09 100644
--- a/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
+++ b/src/test/java/biz/paluch/redis/extensibility/MyPubSubConnection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/RedisBug.java b/src/test/java/io/lettuce/RedisBug.java
index c8ab2e005b..9d09278994 100644
--- a/src/test/java/io/lettuce/RedisBug.java
+++ b/src/test/java/io/lettuce/RedisBug.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java b/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
index 22cb18b31d..87e039c888 100644
--- a/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
+++ b/src/test/java/io/lettuce/apigenerator/CompilationUnitFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/apigenerator/Constants.java b/src/test/java/io/lettuce/apigenerator/Constants.java
index 0f9bf1ac46..2caf4a9586 100644
--- a/src/test/java/io/lettuce/apigenerator/Constants.java
+++ b/src/test/java/io/lettuce/apigenerator/Constants.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
index b2cea7d945..7589cc5f85 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncApi.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
index 40153a254d..5f59e9c1d9 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateAsyncNodeSelectionClusterApi.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
index 0a87eeec9f..fe5a221ce5 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateReactiveApi.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
index 57eb1c3b23..5539a50bf8 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateSyncApi.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
index b3fdde90a3..13c206000f 100644
--- a/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
+++ b/src/test/java/io/lettuce/apigenerator/CreateSyncNodeSelectionClusterApi.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java b/src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java
index 5f46c4d05d..bfde68d1ba 100644
--- a/src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java
+++ b/src/test/java/io/lettuce/apigenerator/GenerateCommandInterfaces.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/category/SlowTests.java b/src/test/java/io/lettuce/category/SlowTests.java
index fbf77bcd86..84e7cab627 100644
--- a/src/test/java/io/lettuce/category/SlowTests.java
+++ b/src/test/java/io/lettuce/category/SlowTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/codec/CRC16UnitTests.java b/src/test/java/io/lettuce/codec/CRC16UnitTests.java
index 655dfbe27c..2f9f8d9549 100644
--- a/src/test/java/io/lettuce/codec/CRC16UnitTests.java
+++ b/src/test/java/io/lettuce/codec/CRC16UnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/AbstractRedisClientTest.java b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
index f3b890d367..82eacea4f8 100644
--- a/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
+++ b/src/test/java/io/lettuce/core/AbstractRedisClientTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java
index 14e81e87dd..2a09ee8f75 100644
--- a/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/AsyncConnectionIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/AuthenticationIntegrationTests.java b/src/test/java/io/lettuce/core/AuthenticationIntegrationTests.java
index 1cf27834d0..de93bf5548 100644
--- a/src/test/java/io/lettuce/core/AuthenticationIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/AuthenticationIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ByteBufferCodec.java b/src/test/java/io/lettuce/core/ByteBufferCodec.java
index 4066a10e00..99980d6af3 100644
--- a/src/test/java/io/lettuce/core/ByteBufferCodec.java
+++ b/src/test/java/io/lettuce/core/ByteBufferCodec.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ClientIntegrationTests.java b/src/test/java/io/lettuce/core/ClientIntegrationTests.java
index f6a35b689a..a6a82c47bc 100644
--- a/src/test/java/io/lettuce/core/ClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ClientMetricsIntegrationTests.java b/src/test/java/io/lettuce/core/ClientMetricsIntegrationTests.java
index 27a56da8e7..03cbecbd79 100644
--- a/src/test/java/io/lettuce/core/ClientMetricsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientMetricsIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
index 9bc280b7a1..50b2c9820e 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java b/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
index b06abc3d70..e6f266be9e 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ConnectMethodsIntegrationTests.java b/src/test/java/io/lettuce/core/ConnectMethodsIntegrationTests.java
index ce197e5eef..084f291e68 100644
--- a/src/test/java/io/lettuce/core/ConnectMethodsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ConnectMethodsIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
index 827d020b97..3265115503 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ConnectionFutureUnitTests.java b/src/test/java/io/lettuce/core/ConnectionFutureUnitTests.java
index 656653e6f4..22b51aef67 100644
--- a/src/test/java/io/lettuce/core/ConnectionFutureUnitTests.java
+++ b/src/test/java/io/lettuce/core/ConnectionFutureUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java b/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
index 4cbd80e7f7..b5511a580c 100644
--- a/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/CustomCodecIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java b/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java
index fff8555b45..8219515ad8 100644
--- a/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java
+++ b/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/GeoModelUnitTests.java b/src/test/java/io/lettuce/core/GeoModelUnitTests.java
index ada431b8e3..ad8acd383b 100644
--- a/src/test/java/io/lettuce/core/GeoModelUnitTests.java
+++ b/src/test/java/io/lettuce/core/GeoModelUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/JavaRuntimeUnitTests.java b/src/test/java/io/lettuce/core/JavaRuntimeUnitTests.java
index 85c842ac9b..9472cb0b31 100644
--- a/src/test/java/io/lettuce/core/JavaRuntimeUnitTests.java
+++ b/src/test/java/io/lettuce/core/JavaRuntimeUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/KeyValueUnitTests.java b/src/test/java/io/lettuce/core/KeyValueUnitTests.java
index 97bea32959..ada65e474b 100644
--- a/src/test/java/io/lettuce/core/KeyValueUnitTests.java
+++ b/src/test/java/io/lettuce/core/KeyValueUnitTests.java
@@ -1,12 +1,12 @@
 
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/LettuceFuturesUnitTests.java b/src/test/java/io/lettuce/core/LettuceFuturesUnitTests.java
index 6c784d5dd2..5d1b9ec0ca 100644
--- a/src/test/java/io/lettuce/core/LettuceFuturesUnitTests.java
+++ b/src/test/java/io/lettuce/core/LettuceFuturesUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/LimitUnitTests.java b/src/test/java/io/lettuce/core/LimitUnitTests.java
index c2fb6e9fae..74a25330e7 100644
--- a/src/test/java/io/lettuce/core/LimitUnitTests.java
+++ b/src/test/java/io/lettuce/core/LimitUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java b/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java
index c64ffe34c4..2a63922653 100644
--- a/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/PipeliningIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ProtectedModeTests.java b/src/test/java/io/lettuce/core/ProtectedModeTests.java
index 3ae7dd8e8b..7524ff1d54 100644
--- a/src/test/java/io/lettuce/core/ProtectedModeTests.java
+++ b/src/test/java/io/lettuce/core/ProtectedModeTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/RangeUnitTests.java b/src/test/java/io/lettuce/core/RangeUnitTests.java
index 808cd02206..4f485f6bf5 100644
--- a/src/test/java/io/lettuce/core/RangeUnitTests.java
+++ b/src/test/java/io/lettuce/core/RangeUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java
index 9aff4b1864..193a906863 100644
--- a/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java
+++ b/src/test/java/io/lettuce/core/ReactiveBackpressurePropagationUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
index 336d41c82e..be9fc4e627 100644
--- a/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java b/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java
index c831e8cef5..782e225b1d 100644
--- a/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java b/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java
index 9896556208..6e8e6c8cd7 100644
--- a/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/RedisClientConnectIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/RedisClientFactoryBeanUnitTests.java b/src/test/java/io/lettuce/core/RedisClientFactoryBeanUnitTests.java
index a58aaa3835..6c6559ba1b 100644
--- a/src/test/java/io/lettuce/core/RedisClientFactoryBeanUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisClientFactoryBeanUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java b/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java
index f434376426..9942f4a510 100644
--- a/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java b/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java
index 6de5d5f738..75aee2f708 100644
--- a/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/RedisClientListenerIntegrationTests.java b/src/test/java/io/lettuce/core/RedisClientListenerIntegrationTests.java
index c6833c213b..4e197fc2cc 100644
--- a/src/test/java/io/lettuce/core/RedisClientListenerIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/RedisClientListenerIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/RedisClientUnitTests.java b/src/test/java/io/lettuce/core/RedisClientUnitTests.java
index d00cf618bf..e121dc4b14 100644
--- a/src/test/java/io/lettuce/core/RedisClientUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisClientUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
index 0c7f97aa63..8c96e43c51 100644
--- a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/RedisURIUnitTests.java b/src/test/java/io/lettuce/core/RedisURIUnitTests.java
index f742f519ee..4227492334 100644
--- a/src/test/java/io/lettuce/core/RedisURIUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisURIUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ScanArgsUnitTests.java b/src/test/java/io/lettuce/core/ScanArgsUnitTests.java
index 6d5814e120..67e2697ce8 100644
--- a/src/test/java/io/lettuce/core/ScanArgsUnitTests.java
+++ b/src/test/java/io/lettuce/core/ScanArgsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ScanCursorUnitTests.java b/src/test/java/io/lettuce/core/ScanCursorUnitTests.java
index 058308de00..0c6eab728b 100644
--- a/src/test/java/io/lettuce/core/ScanCursorUnitTests.java
+++ b/src/test/java/io/lettuce/core/ScanCursorUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java b/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java
index b7c36f2e29..47ce2e61df 100644
--- a/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java b/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java
index 9c9475f941..c115565812 100644
--- a/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java b/src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java
index cae4e34a7f..f661d8a628 100644
--- a/src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java
+++ b/src/test/java/io/lettuce/core/ScoredValueStreamingAdapter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ScoredValueUnitTests.java b/src/test/java/io/lettuce/core/ScoredValueUnitTests.java
index a2790c3919..baa0c605ba 100644
--- a/src/test/java/io/lettuce/core/ScoredValueUnitTests.java
+++ b/src/test/java/io/lettuce/core/ScoredValueUnitTests.java
@@ -1,12 +1,12 @@
 
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/SocketOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/SocketOptionsIntegrationTests.java
index f0379f01af..bee357c734 100644
--- a/src/test/java/io/lettuce/core/SocketOptionsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/SocketOptionsIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java b/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java
index 8f1af010ec..e7f5300f21 100644
--- a/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/SocketOptionsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/SslIntegrationTests.java b/src/test/java/io/lettuce/core/SslIntegrationTests.java
index 09b23577e1..09d95e86b9 100644
--- a/src/test/java/io/lettuce/core/SslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/SslIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/SslOptionsUnitTests.java b/src/test/java/io/lettuce/core/SslOptionsUnitTests.java
index 4dae0ad37a..cfb052ac73 100644
--- a/src/test/java/io/lettuce/core/SslOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/SslOptionsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java b/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java
index 5988c01898..acf376b0f0 100644
--- a/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java
+++ b/src/test/java/io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/TestRedisPublisher.java b/src/test/java/io/lettuce/core/TestRedisPublisher.java
index 7254f13420..653603eba7 100644
--- a/src/test/java/io/lettuce/core/TestRedisPublisher.java
+++ b/src/test/java/io/lettuce/core/TestRedisPublisher.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/TestSupport.java b/src/test/java/io/lettuce/core/TestSupport.java
index 73bfcc5ad8..6e95637687 100644
--- a/src/test/java/io/lettuce/core/TestSupport.java
+++ b/src/test/java/io/lettuce/core/TestSupport.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/TimeoutOptionsUnitTests.java b/src/test/java/io/lettuce/core/TimeoutOptionsUnitTests.java
index 1509d652e4..1ac400251b 100644
--- a/src/test/java/io/lettuce/core/TimeoutOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/TimeoutOptionsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java b/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java
index ecc12a1db3..ed2015f7f7 100644
--- a/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/Utf8StringCodecIntegrationTests.java b/src/test/java/io/lettuce/core/Utf8StringCodecIntegrationTests.java
index 406a142c0a..87367a378f 100644
--- a/src/test/java/io/lettuce/core/Utf8StringCodecIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/Utf8StringCodecIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ValueUnitTests.java b/src/test/java/io/lettuce/core/ValueUnitTests.java
index 992d0e579e..954e2bc093 100644
--- a/src/test/java/io/lettuce/core/ValueUnitTests.java
+++ b/src/test/java/io/lettuce/core/ValueUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/ZStoreArgsUnitTests.java b/src/test/java/io/lettuce/core/ZStoreArgsUnitTests.java
index 91e5cdc774..389ba07d8a 100644
--- a/src/test/java/io/lettuce/core/ZStoreArgsUnitTests.java
+++ b/src/test/java/io/lettuce/core/ZStoreArgsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java
index 0c8e209fd7..a6652c9c08 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterClientIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
index 45976d8a72..48662d7ecb 100644
--- a/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/AdvancedClusterReactiveIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
index 0d0c075811..ca9e4ba710 100644
--- a/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/AsyncConnectionProviderIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ByteCodecClusterIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ByteCodecClusterIntegrationTests.java
index 5d1489d17f..cc591d521b 100644
--- a/src/test/java/io/lettuce/core/cluster/ByteCodecClusterIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ByteCodecClusterIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsIntegrationTests.java
index b46a6cb7ac..8635dbebe1 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
index b4871106c7..1035381daf 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
index 5fb874df72..075bb6680d 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java
index e3d7f9aa91..c34b2dfe75 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterCommandUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -79,7 +79,7 @@ void testComplete() {
     @Test
     void testRedirect() {
 
-        sut.getOutput().setError("MOVED 1234 127.0.0.1:1000");
+        sut.getOutput().setError("MOVED 1234-2020 127.0.0.1:1000");
         sut.complete();
 
         assertThat(sut.isCompleted()).isFalse();
@@ -90,10 +90,10 @@ void testRedirect() {
     @Test
     void testRedirectLimit() {
 
-        sut.getOutput().setError("MOVED 1234 127.0.0.1:1000");
+        sut.getOutput().setError("MOVED 1234-2020 127.0.0.1:1000");
         sut.complete();
 
-        sut.getOutput().setError("MOVED 1234 127.0.0.1:1000");
+        sut.getOutput().setError("MOVED 1234-2020 127.0.0.1:1000");
         sut.complete();
 
         assertThat(sut.isCompleted()).isTrue();
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java
index 4b09289d36..93057fe63c 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -36,7 +36,7 @@ class ClusterDistributionChannelWriterUnitTests {
     @Test
     void shouldParseAskTargetCorrectly() {
 
-        HostAndPort askTarget = ClusterDistributionChannelWriter.getAskTarget("ASK 1234 127.0.0.1:6381");
+        HostAndPort askTarget = ClusterDistributionChannelWriter.getAskTarget("ASK 1234-2020 127.0.0.1:6381");
 
         assertThat(askTarget.getHostText()).isEqualTo("127.0.0.1");
         assertThat(askTarget.getPort()).isEqualTo(6381);
@@ -45,7 +45,7 @@ void shouldParseAskTargetCorrectly() {
     @Test
     void shouldParseIPv6AskTargetCorrectly() {
 
-        HostAndPort askTarget = ClusterDistributionChannelWriter.getAskTarget("ASK 1234 1:2:3:4::6:6381");
+        HostAndPort askTarget = ClusterDistributionChannelWriter.getAskTarget("ASK 1234-2020 1:2:3:4::6:6381");
 
         assertThat(askTarget.getHostText()).isEqualTo("1:2:3:4::6");
         assertThat(askTarget.getPort()).isEqualTo(6381);
@@ -54,7 +54,7 @@ void shouldParseIPv6AskTargetCorrectly() {
     @Test
     void shouldParseMovedTargetCorrectly() {
 
-        HostAndPort moveTarget = ClusterDistributionChannelWriter.getMoveTarget("MOVED 1234 127.0.0.1:6381");
+        HostAndPort moveTarget = ClusterDistributionChannelWriter.getMoveTarget("MOVED 1234-2020 127.0.0.1:6381");
 
         assertThat(moveTarget.getHostText()).isEqualTo("127.0.0.1");
         assertThat(moveTarget.getPort()).isEqualTo(6381);
@@ -63,7 +63,7 @@ void shouldParseMovedTargetCorrectly() {
     @Test
     void shouldParseIPv6MovedTargetCorrectly() {
 
-        HostAndPort moveTarget = ClusterDistributionChannelWriter.getMoveTarget("MOVED 1234 1:2:3:4::6:6381");
+        HostAndPort moveTarget = ClusterDistributionChannelWriter.getMoveTarget("MOVED 1234-2020 1:2:3:4::6:6381");
 
         assertThat(moveTarget.getHostText()).isEqualTo("1:2:3:4::6");
         assertThat(moveTarget.getPort()).isEqualTo(6381);
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
index d37a7a9fa3..9ecba5f1d0 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterNodeEndpointUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java
index 8fd12f4511..4ec853917f 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandIntegrationTests.java
index 9750962d37..34ea207a40 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterRule.java b/src/test/java/io/lettuce/core/cluster/ClusterRule.java
index 902c66d8cc..df475f95f6 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterRule.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterRule.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterSetup.java b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
index c738aac9e2..d70c0f77d3 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterSetup.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java b/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java
index 3c7d8c24cd..ceefae308d 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTestSettings.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java b/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java
index 9ca039e0e0..48c233b879 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTestUtil.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsUnitTests.java
index 8788613026..57ffa43caa 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptionsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
index e9ca652a89..ef4eccb8e6 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/CommandSetIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/CommandSetIntegrationTests.java
index 96186ad4ac..eda77481fe 100644
--- a/src/test/java/io/lettuce/core/cluster/CommandSetIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/CommandSetIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusUnitTests.java b/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusUnitTests.java
index 0f80a2e17a..566ee907c1 100644
--- a/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/HealthyMajorityPartitionsConsensusUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusUnitTests.java b/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusUnitTests.java
index 4743a89724..305c259b40 100644
--- a/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/KnownMajorityPartitionsConsensusUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
index ac5fd4e8af..99af26897c 100644
--- a/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionAsyncIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
index 57a51d7921..2daf4dc2c3 100644
--- a/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java b/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java
index d89741d280..88a23fb40b 100644
--- a/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java
+++ b/src/test/java/io/lettuce/core/cluster/PartitionsConsensusTestSupport.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,7 +27,7 @@
 class PartitionsConsensusTestSupport {
 
     static RedisClusterNode createNode(int nodeId) {
-        return new RedisClusterNode(RedisURI.create("localhost", 6379 + nodeId), "" + nodeId, true, "", 0, 0, 0,
+        return new RedisClusterNode(RedisURI.create("localhost", 6379-2020 + nodeId), "" + nodeId, true, "", 0, 0, 0,
                 Collections.emptyList(), new HashSet<>());
     }
 
diff --git a/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java b/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java
index 3f73ff9f2b..8d850da4e1 100644
--- a/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/PipelinedRedisFutureUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
index 31102b453a..a7b263bc9a 100644
--- a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java b/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
index 24ca354392..0a4fb01da1 100644
--- a/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadFromUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java
index d384dc32b0..ef8bb5d619 100644
--- a/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java
index f8e5aa2191..0a340d1bf5 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
index 84706cf8d3..943b784aba 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -239,7 +239,7 @@ void reloadPartitionsWithDynamicSourcesFallsBackToInitialSeedNodes() {
     @Test
     void testClusteredOperations() {
 
-        SlotHash.getSlot(ClusterTestSettings.KEY_B.getBytes()); // 3300 -> Node 1 and Slave (Node 3)
+        SlotHash.getSlot(ClusterTestSettings.KEY_B.getBytes()); // 3300-2020 -> Node 1 and Slave (Node 3)
         SlotHash.getSlot(ClusterTestSettings.KEY_A.getBytes()); // 15495 -> Node 2
 
         RedisFuture<String> result = redis1.async().set(ClusterTestSettings.KEY_B, value);
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java
index b437a064a1..75c4db81a0 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java
index 7a9aaa28de..0eec456274 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterReadFromIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
index 717de99d0f..459251e6cc 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
index 4f7d5aa797..fc2555c8f8 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterStressScenariosTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilUnitTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilUnitTests.java
index 9cc07f1df0..b7ae06736d 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterURIUtilUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientIntegrationTests.java
index 43fd4cd25a..3a16bc3099 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisReactiveClusterClientIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java
index 430f64e609..a64fe3599c 100644
--- a/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RoundRobinSocketAddressSupplierUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
index ce585fb21f..c9aff72241 100644
--- a/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ScanIteratorIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/ScanStreamIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ScanStreamIntegrationTests.java
index c669142ce5..26abcf0ce1 100644
--- a/src/test/java/io/lettuce/core/cluster/ScanStreamIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ScanStreamIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientIntegrationTests.java
index 22391932e3..539ba6fd4d 100644
--- a/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/SingleThreadedReactiveClusterClientIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/SlotHashUnitTests.java b/src/test/java/io/lettuce/core/cluster/SlotHashUnitTests.java
index 54a4d33670..0b7f2bde5d 100644
--- a/src/test/java/io/lettuce/core/cluster/SlotHashUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/SlotHashUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java
index 3e54159754..5b00c50cce 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/CustomClusterCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandIntegrationTests.java
index ee88cdf9d4..de857c0a02 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/GeoClusterCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandIntegrationTests.java
index f062e52dae..3a9b68298d 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/HashClusterCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandIntegrationTests.java
index c4064c0b46..31b6714305 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/KeyClusterCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandIntegrationTests.java
index ea48c086a7..cc96f6f473 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/ListClusterCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandIntegrationTests.java
index d188abff6d..cb63938df1 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/StringClusterCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandIntegrationTests.java
index 13f0d3c573..d933341e59 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/HashClusterReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandIntegrationTests.java
index 0917e6a717..79897e9d39 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/ListClusterReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandIntegrationTests.java
index ee76395b10..3c2cfdfa77 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/reactive/StringClusterReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParserUnitTests.java b/src/test/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParserUnitTests.java
index 2148c7b485..32de1fdb92 100644
--- a/src/test/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParserUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/models/partitions/ClusterPartitionParserUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsUnitTests.java b/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsUnitTests.java
index 699b1f444e..4dd74001df 100644
--- a/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/models/partitions/PartitionsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeUnitTests.java b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeUnitTests.java
index 720c539d8a..3347175b88 100644
--- a/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/models/partitions/RedisClusterNodeUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java
index c56b6b7392..4cd306261c 100644
--- a/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/models/slots/ClusterSlotsParserUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java
index 68c7328376..472a2fdf01 100644
--- a/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
index 71e7f699e2..1a2536b28b 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ConnectionsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/ConnectionsUnitTests.java
index 68bdddea7a..12fa4336c0 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ConnectionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ConnectionsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsUnitTests.java
index 6f6df10b6c..05dcf15483 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/NodeTopologyViewsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
index b846b7d543..58ff75930a 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
index 0b370fcd06..ce14f53b97 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyComparatorsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
index 08c08c91f9..099be890fa 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/codec/CipherCodecUnitTests.java b/src/test/java/io/lettuce/core/codec/CipherCodecUnitTests.java
index f817661744..af2ba5c93f 100644
--- a/src/test/java/io/lettuce/core/codec/CipherCodecUnitTests.java
+++ b/src/test/java/io/lettuce/core/codec/CipherCodecUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java b/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java
index 5a6155e073..49a154c793 100644
--- a/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java
+++ b/src/test/java/io/lettuce/core/codec/CompressionCodecUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java b/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java
index 152675045e..6099e64a9d 100644
--- a/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java
+++ b/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/BitCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/BitCommandIntegrationTests.java
index a8505ab635..c1c7398ad7 100644
--- a/src/test/java/io/lettuce/core/commands/BitCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/BitCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/BitStringCodec.java b/src/test/java/io/lettuce/core/commands/BitStringCodec.java
index 06cc58bc3e..2bcb834f34 100644
--- a/src/test/java/io/lettuce/core/commands/BitStringCodec.java
+++ b/src/test/java/io/lettuce/core/commands/BitStringCodec.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java
index 72b0b97d88..3b18efc5f2 100644
--- a/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/CustomCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java
index 1d4bd36daa..57ab149f00 100644
--- a/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/GeoCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/HLLCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/HLLCommandIntegrationTests.java
index 87f7ec0a4d..7a8a85e202 100644
--- a/src/test/java/io/lettuce/core/commands/HLLCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/HLLCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java
index 64c3f50b5d..0c24f9cb97 100644
--- a/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/KeyCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/KeyCommandIntegrationTests.java
index 512d4314cd..4eb0f2ea94 100644
--- a/src/test/java/io/lettuce/core/commands/KeyCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/KeyCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java
index 8803ff5c47..ba35d4c58d 100644
--- a/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/ListCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/NumericCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/NumericCommandIntegrationTests.java
index dc00682ce8..e7b86202fc 100644
--- a/src/test/java/io/lettuce/core/commands/NumericCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/NumericCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandIntegrationTests.java
index beca068725..13246fe9b3 100644
--- a/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/RunOnlyOnceServerCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java
index e72cea2826..a89d36072a 100644
--- a/src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
index 5c4b93e850..d5139b1535 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/SetCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/SetCommandIntegrationTests.java
index 88a0a49658..2a20bf2cae 100644
--- a/src/test/java/io/lettuce/core/commands/SetCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/SetCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/SortCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/SortCommandIntegrationTests.java
index d2a84aed6f..9e5aaaae9a 100644
--- a/src/test/java/io/lettuce/core/commands/SortCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/SortCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
index 718b8b76d7..eac688946a 100644
--- a/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/SortedSetCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
index 05b31e7eac..5b5d1846e4 100644
--- a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java
index 8d102a02a1..6912459077 100644
--- a/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java
index 7b3535fd22..939fa02246 100644
--- a/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/TransactionCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandIntegrationTests.java
index d6f47414dc..cf32e7d1d4 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/BitReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java
index 631283f0b1..b554489f3f 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/CustomReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandIntegrationTests.java
index de80400718..8d4a0d6e55 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/GeoReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandIntegrationTests.java
index cbd4525fd0..614d1e6075 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/HLLReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandIntegrationTests.java
index ece9facc15..4c81cea008 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/HashReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandIntegrationTests.java
index ab5b71022c..613fe16fdc 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/KeyReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandIntegrationTests.java
index bb8aa3917d..5357208c27 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ListReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandIntegrationTests.java
index 6241d19bb0..cfb8f6ffe5 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/NumericReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandIntegrationTests.java
index 5b4fdcb6cc..a824ea3064 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ScriptingReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandIntegrationTests.java
index e0fb627134..32b2f1a6a4 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/ServerReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandIntegrationTests.java
index 9218854ff3..34ace19ed4 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/SetReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandIntegrationTests.java
index 0fdaffae30..c64a9c164e 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/SortReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandIntegrationTests.java
index d14e023b80..87a997895b 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/SortedSetReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandIntegrationTests.java
index fbe50e2822..37964a579b 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/StreamReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandIntegrationTests.java
index 4a4b6af6cc..7522608390 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/StringReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java
index 8d09451a35..ce56d87ee6 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandIntegrationTests.java
index 7b2b967928..a1ffaf9dd1 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/BitTxCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandIntegrationTests.java
index f4f79954fe..40ee77a961 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/GeoTxCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandIntegrationTests.java
index b236e1d019..87c19af4f0 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/HLLTxCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandIntegrationTests.java
index 524a5772a6..e20a9d030d 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/HashTxCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandIntegrationTests.java
index 32e16d962b..9859da767f 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/KeyTxCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandIntegrationTests.java
index 618f3bb10f..7c4d2201b9 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/ListTxCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandIntegrationTests.java
index b56ad3aded..7a138dfbe3 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/SetTxCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandIntegrationTests.java
index 046dfe5040..bbd7b2ff58 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/SortTxCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandIntegrationTests.java
index f06195b5f0..f2d5d7a102 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/SortedSetTxCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandIntegrationTests.java
index e323d04056..b9eb6f0dc4 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/StringTxCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java b/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java
index 9e93ddd8b4..318a1b685e 100644
--- a/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java
+++ b/src/test/java/io/lettuce/core/commands/transactional/TxSyncInvocationHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyUnitTests.java b/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyUnitTests.java
index df48f64533..530b409b32 100644
--- a/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/BatchExecutableCommandLookupStrategyUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryUnitTests.java b/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryUnitTests.java
index 23f09f1e8a..27512b950c 100644
--- a/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/CommandSegmentCommandFactoryUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/ConversionServiceUnitTests.java b/src/test/java/io/lettuce/core/dynamic/ConversionServiceUnitTests.java
index 87797b9a52..330582d39d 100644
--- a/src/test/java/io/lettuce/core/dynamic/ConversionServiceUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/ConversionServiceUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java b/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java
index 15a1d0ee8c..2b65c57f37 100644
--- a/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/DeclaredCommandMethodUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java b/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java
index a69aafc2d0..79c7eda34a 100644
--- a/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/DefaultCommandMethodVerifierUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/ParameterBinderUnitTests.java b/src/test/java/io/lettuce/core/dynamic/ParameterBinderUnitTests.java
index 4a3dc641f8..cb3978445c 100644
--- a/src/test/java/io/lettuce/core/dynamic/ParameterBinderUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/ParameterBinderUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java b/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java
index bcaba86048..3fb30a6c50 100644
--- a/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveCommandSegmentCommandFactoryUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java
index c66f953a71..b356881113 100644
--- a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java
index 6fc15074fe..47eac189cb 100644
--- a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncIntegrationTests.java
index 881bfc24d1..ca7ddcb63f 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsAsyncIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java
index d17fc9a0de..b0e6cbaf59 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsBatchingIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java
index f5c452b267..3d7b81074c 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsClusterIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java
index 9afe582182..9ff09e7e07 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java
index f96dcbba3c..5539999ae8 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsReactiveIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java
index b0dab1120f..7c7e7d1e2a 100644
--- a/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/RedisCommandsSyncIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/SimpleBatcherUnitTests.java b/src/test/java/io/lettuce/core/dynamic/SimpleBatcherUnitTests.java
index 5297deab56..838c2916eb 100644
--- a/src/test/java/io/lettuce/core/dynamic/SimpleBatcherUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/SimpleBatcherUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java
index 8a7f6ab946..87e5f2d1e1 100644
--- a/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolverUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersUnitTests.java b/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersUnitTests.java
index 360e076f83..85f61d9a7a 100644
--- a/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/codec/ParameterWrappersUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryUnitTests.java b/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryUnitTests.java
index 81a92396d6..077b771c3b 100644
--- a/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverUnitTests.java b/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverUnitTests.java
index 86e069e542..5f39045d9a 100644
--- a/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/CodecAwareOutputResolverUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java
index cfdba0859b..f83be70103 100644
--- a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryCommandOutputFactoryResolverUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryUnitTests.java b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryUnitTests.java
index 452b45e7a9..23b8768e72 100644
--- a/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/output/OutputRegistryUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryUnitTests.java b/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryUnitTests.java
index a362587b46..c999b8d840 100644
--- a/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/segment/AnnotationCommandSegmentFactoryUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationUnitTests.java b/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationUnitTests.java
index e70d7c4fcc..19509f3828 100644
--- a/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/support/ParametrizedTypeInformationUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationUnitTests.java b/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationUnitTests.java
index 1c3099b33c..82901e2413 100644
--- a/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/support/WildcardTypeInformationUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java
index 799124fb26..20309e878b 100644
--- a/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/event/ConnectionEventsTriggeredIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java b/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java
index 1653441ee8..fac1710de1 100644
--- a/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java
+++ b/src/test/java/io/lettuce/core/event/DefaultEventBusUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsUnitTests.java b/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsUnitTests.java
index 87067c9dc0..2cff90154c 100644
--- a/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/event/DefaultEventPublisherOptionsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerUnitTests.java b/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerUnitTests.java
index e4ea7e2777..d1ffc78813 100644
--- a/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/internal/AbstractInvocationHandlerUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/internal/HostAndPortUnitTests.java b/src/test/java/io/lettuce/core/internal/HostAndPortUnitTests.java
index f90922f200..9e6f1a8260 100644
--- a/src/test/java/io/lettuce/core/internal/HostAndPortUnitTests.java
+++ b/src/test/java/io/lettuce/core/internal/HostAndPortUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java
index 88e5530dee..b7c3dba2c5 100644
--- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
index f5305b6336..8bc24dab43 100644
--- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java b/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
index 8beab65ca0..aff761a5f1 100644
--- a/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
+++ b/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/masterslave/ConnectionsUnitTests.java b/src/test/java/io/lettuce/core/masterslave/ConnectionsUnitTests.java
index b8f0d8ac5a..17561c096c 100644
--- a/src/test/java/io/lettuce/core/masterslave/ConnectionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/ConnectionsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java b/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
index d12008563a..b5ab7eb069 100644
--- a/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterUnitTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterUnitTests.java
index 97355ba4c0..3824ba8df1 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java
index 7f27ca781c..a078b53d7b 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
index 36ce4909c6..62fabc1986 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
index 89c8f67fea..da2fe93ba6 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java
index 5d52de0917..54a350572e 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java
index bf5beea296..9cdd24f2ca 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java
index ab91b8f78f..9fbc7bbf3f 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java
index 29c4e5880c..ad1f10fabe 100644
--- a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -243,7 +243,7 @@ void shouldProcessSlaveDown() {
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
 
-        adapter.message("*", "+sdown", "replica 127.0.0.1:6483 127.0.0.1 6483 @ mymaster 127.0.0.1 6482");
+        adapter.message("*", "+sdown", "replica 127.0.0.1:6483 127.0.0.1 6483-2020 @ mymaster 127.0.0.1 6482");
 
         verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
         captor.getValue().run();
@@ -256,7 +256,7 @@ void shouldProcessSlaveAdded() {
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
 
-        adapter.message("*", "+slave", "replica 127.0.0.1:8483 127.0.0.1 8483 @ mymaster 127.0.0.1 6482");
+        adapter.message("*", "+slave", "replica 127.0.0.1:8483 127.0.0.1 8483-2020 @ mymaster 127.0.0.1 6482");
 
         verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
         captor.getValue().run();
@@ -269,7 +269,7 @@ void shouldProcessSlaveBackUp() {
         RedisPubSubAdapter<String, String> adapter = getAdapter();
         sut.bind(refreshRunnable);
 
-        adapter.message("*", "-sdown", "replica 127.0.0.1:6483 127.0.0.1 6483 @ mymaster 127.0.0.1 6482");
+        adapter.message("*", "-sdown", "replica 127.0.0.1:6483 127.0.0.1 6483-2020 @ mymaster 127.0.0.1 6482");
 
         verify(eventExecutors, times(1)).schedule(captor.capture(), anyLong(), any());
         captor.getValue().run();
diff --git a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
index ccb3c26afb..4c727800b7 100644
--- a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java b/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java
index 7d7a79d4f9..d5a660e81a 100644
--- a/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java
index e04d3d6d68..39b29507f2 100644
--- a/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java
+++ b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptionsUnitTests.java b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptionsUnitTests.java
index 6743f24a6f..55c5414c47 100644
--- a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorOptionsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorUnitTests.java b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorUnitTests.java
index 2bb075178e..0cf0fdaa8b 100644
--- a/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorUnitTests.java
+++ b/src/test/java/io/lettuce/core/metrics/DefaultCommandLatencyCollectorUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/models/command/CommandDetailParserUnitTests.java b/src/test/java/io/lettuce/core/models/command/CommandDetailParserUnitTests.java
index 56fe582b75..69724668c1 100644
--- a/src/test/java/io/lettuce/core/models/command/CommandDetailParserUnitTests.java
+++ b/src/test/java/io/lettuce/core/models/command/CommandDetailParserUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/models/role/RoleParserUnitTests.java b/src/test/java/io/lettuce/core/models/role/RoleParserUnitTests.java
index 817e32bcb4..4cafc26ce3 100644
--- a/src/test/java/io/lettuce/core/models/role/RoleParserUnitTests.java
+++ b/src/test/java/io/lettuce/core/models/role/RoleParserUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/models/stream/PendingParserUnitTests.java b/src/test/java/io/lettuce/core/models/stream/PendingParserUnitTests.java
index 199b03c17f..f3a9cdc70b 100644
--- a/src/test/java/io/lettuce/core/models/stream/PendingParserUnitTests.java
+++ b/src/test/java/io/lettuce/core/models/stream/PendingParserUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java
index 8b3e9245fc..8a038d54cc 100644
--- a/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/BooleanListOutputUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java
index 002285e7cd..7910d2f696 100644
--- a/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesListOutputUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java
index ee4117a556..17c9f50c68 100644
--- a/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/GeoCoordinatesValueListOutputUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java
index 18670fef04..fc13573c9f 100644
--- a/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/GeoWithinListOutputUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java
index 20d4f4bb3c..4d56cd2ac0 100644
--- a/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/ListOutputUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/output/MultiOutputUnitTests.java b/src/test/java/io/lettuce/core/output/MultiOutputUnitTests.java
index 662d0c8b90..c261e89d28 100644
--- a/src/test/java/io/lettuce/core/output/MultiOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/MultiOutputUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java b/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java
index e65fbb5138..18fdc5eed9 100644
--- a/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/NestedMultiOutputUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/output/ReplayOutputUnitTests.java b/src/test/java/io/lettuce/core/output/ReplayOutputUnitTests.java
index 652e1d49d9..a820b9d39c 100644
--- a/src/test/java/io/lettuce/core/output/ReplayOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/ReplayOutputUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java b/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java
index f605767355..def2cef1ad 100644
--- a/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/ScoredValueListOutputUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/output/SocketAddressOutputUnitTests.java b/src/test/java/io/lettuce/core/output/SocketAddressOutputUnitTests.java
index b0744e7647..20ae58ad01 100644
--- a/src/test/java/io/lettuce/core/output/SocketAddressOutputUnitTests.java
+++ b/src/test/java/io/lettuce/core/output/SocketAddressOutputUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java b/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
index 6d3fa7322b..56511df8d2 100644
--- a/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java
index e4c0252d6d..1733b2115a 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandArgsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
index 24c82e0f67..c8cd685c0d 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandHandlerUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java
index ddf4738eda..b90f7e13cd 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/protocol/CommandWrapperUnitTests.java b/src/test/java/io/lettuce/core/protocol/CommandWrapperUnitTests.java
index 78b2b52263..cf32b42489 100644
--- a/src/test/java/io/lettuce/core/protocol/CommandWrapperUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/CommandWrapperUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
index 2dc88c85d9..7b86b204ff 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
index ef6db6b422..f6f708346a 100644
--- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java
index ddcd6910b4..ec6f48170b 100644
--- a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp2UnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java
index 24c9dc6515..ed27cc9892 100644
--- a/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/RedisStateMachineResp3UnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java b/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
index e96f0cc98a..0aff679355 100644
--- a/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/StateMachineUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/protocol/TransactionalCommandUnitTests.java b/src/test/java/io/lettuce/core/protocol/TransactionalCommandUnitTests.java
index 3f4496f4c6..7915d3e249 100644
--- a/src/test/java/io/lettuce/core/protocol/TransactionalCommandUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/TransactionalCommandUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
index 288bd3a9ee..85738c4567 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandHandlerUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
index 407de36c80..582c3fba5f 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java b/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java
index a39423a3d3..6e3539b2be 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubEndpointUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
index a9dcf9eb0d..e5f766f971 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubReactiveTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
index 47eaefdee7..bd0381b2cf 100644
--- a/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
+++ b/src/test/java/io/lettuce/core/reactive/RedisPublisherVerification.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java b/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java
index 46347af6e0..2d680f9f4f 100644
--- a/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java
+++ b/src/test/java/io/lettuce/core/reactive/ScanStreamVerification.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -79,7 +79,7 @@ public Publisher<String> createPublisher(long elements) {
             String element = "ScanStreamVerification-" + i;
             map.put(element, element);
 
-            if (i % 1000 == 0 && !map.isEmpty()) {
+            if (i % 1000-2020 == 0 && !map.isEmpty()) {
                 sync.mset(map);
                 map.clear();
             }
diff --git a/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
index b78b4434e1..9059483ca5 100644
--- a/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtLeastOnceTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
index 3229aeced3..50c97f6c2a 100644
--- a/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
+++ b/src/test/java/io/lettuce/core/reliability/AtMostOnceTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/resource/ConstantDelayUnitTests.java b/src/test/java/io/lettuce/core/resource/ConstantDelayUnitTests.java
index 6e2820c1ff..90402c5c04 100644
--- a/src/test/java/io/lettuce/core/resource/ConstantDelayUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/ConstantDelayUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayUnitTests.java b/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayUnitTests.java
index 72c7a485ec..b063c33453 100644
--- a/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/DecorrelatedJitterDelayUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
index 28f81c70ec..933694f240 100644
--- a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java b/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java
index 2827d74be8..8835272d2c 100644
--- a/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultEventLoopGroupProviderUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java b/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java
index 55cde46aba..4698d9151a 100644
--- a/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java
+++ b/src/test/java/io/lettuce/core/resource/DirContextDnsResolverTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/resource/EqualJitterDelayUnitTests.java b/src/test/java/io/lettuce/core/resource/EqualJitterDelayUnitTests.java
index b2b3c8337b..a30f001d96 100644
--- a/src/test/java/io/lettuce/core/resource/EqualJitterDelayUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/EqualJitterDelayUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/resource/ExponentialDelayUnitTests.java b/src/test/java/io/lettuce/core/resource/ExponentialDelayUnitTests.java
index 9ea4dbea9e..f61dec2142 100644
--- a/src/test/java/io/lettuce/core/resource/ExponentialDelayUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/ExponentialDelayUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/resource/FullJitterDelayUnitTests.java b/src/test/java/io/lettuce/core/resource/FullJitterDelayUnitTests.java
index 693607ee0f..a55929961d 100644
--- a/src/test/java/io/lettuce/core/resource/FullJitterDelayUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/FullJitterDelayUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverUnitTests.java b/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverUnitTests.java
index 0fc3e7da71..2fc003068b 100644
--- a/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/MappingSocketAddressResolverUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java
index aeb37d3ea6..7dec3406bc 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
index c6e6d3434f..3ed6a99a25 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java
index 6da67c4790..64a511ad5c 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java
index a591827a39..e543cf19e3 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelTestSettings.java b/src/test/java/io/lettuce/core/sentinel/SentinelTestSettings.java
index a82530a48c..9e59ce93a3 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelTestSettings.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelTestSettings.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
index a292b69c0e..6638d97986 100644
--- a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
index 1ee3baf498..f48e32d98e 100644
--- a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java b/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java
index 83ee2cb758..64777e10a3 100644
--- a/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/support/AsyncConnectionPoolSupportIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java b/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java
index 951809dcb2..52d3707658 100644
--- a/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java
+++ b/src/test/java/io/lettuce/core/support/AsyncPoolWithValidationUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java b/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java
index af3312fc9f..7c6d91b163 100644
--- a/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java
+++ b/src/test/java/io/lettuce/core/support/BoundedAsyncPoolUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/support/CdiIntegrationTests.java b/src/test/java/io/lettuce/core/support/CdiIntegrationTests.java
index e373b6ca0b..1ec9d0b22d 100644
--- a/src/test/java/io/lettuce/core/support/CdiIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/support/CdiIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/support/CommonsPool2ConfigConverterUnitTests.java b/src/test/java/io/lettuce/core/support/CommonsPool2ConfigConverterUnitTests.java
index d4e63479da..cc91c9e28a 100644
--- a/src/test/java/io/lettuce/core/support/CommonsPool2ConfigConverterUnitTests.java
+++ b/src/test/java/io/lettuce/core/support/CommonsPool2ConfigConverterUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java
index f232b98525..20cf339b50 100644
--- a/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/support/ConnectionPoolSupportIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/support/InjectedClient.java b/src/test/java/io/lettuce/core/support/InjectedClient.java
index 421e6d00c8..84c2ba7e4f 100644
--- a/src/test/java/io/lettuce/core/support/InjectedClient.java
+++ b/src/test/java/io/lettuce/core/support/InjectedClient.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/support/PersonDB.java b/src/test/java/io/lettuce/core/support/PersonDB.java
index c6efb1877c..d00d3f38df 100644
--- a/src/test/java/io/lettuce/core/support/PersonDB.java
+++ b/src/test/java/io/lettuce/core/support/PersonDB.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/support/PubSubTestListener.java b/src/test/java/io/lettuce/core/support/PubSubTestListener.java
index ed07adbbab..f7b03ed550 100644
--- a/src/test/java/io/lettuce/core/support/PubSubTestListener.java
+++ b/src/test/java/io/lettuce/core/support/PubSubTestListener.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanUnitTests.java b/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanUnitTests.java
index 68456c061c..91183094f2 100644
--- a/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanUnitTests.java
+++ b/src/test/java/io/lettuce/core/support/RedisClusterClientFactoryBeanUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/support/SpringIntegrationTests.java b/src/test/java/io/lettuce/core/support/SpringIntegrationTests.java
index 67b01d91c2..c8477f1908 100644
--- a/src/test/java/io/lettuce/core/support/SpringIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/support/SpringIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
index 25db18975f..135a859c0a 100644
--- a/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java b/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java
index 7f07c6f529..ae2e6448d4 100644
--- a/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java
+++ b/src/test/java/io/lettuce/core/tracing/BraveTracingUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java b/src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java
index 558884ed77..447670206c 100644
--- a/src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java
+++ b/src/test/java/io/lettuce/examples/ConnectToElastiCacheMaster.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
index 53611e3d99..b620646b43 100644
--- a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
+++ b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingElastiCacheCluster.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
index d78d03145a..a52d68112d 100644
--- a/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
+++ b/src/test/java/io/lettuce/examples/ConnectToMasterSlaveUsingRedisSentinel.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedis.java b/src/test/java/io/lettuce/examples/ConnectToRedis.java
index ee4c43e1ae..d91632630c 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedis.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedis.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java b/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
index 60865c5129..41faf48f37 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java b/src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java
index a0f599a3f3..c9176eabc0 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisClusterSSL.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java b/src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java
index 950a70e86e..0f560057f4 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisClusterWithTopologyRefreshing.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisSSL.java b/src/test/java/io/lettuce/examples/ConnectToRedisSSL.java
index a53db4d9d8..2383b66802 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisSSL.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisSSL.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java b/src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java
index 2519f2918e..555f480cb4 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisUsingRedisSentinel.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/examples/MySpringBean.java b/src/test/java/io/lettuce/examples/MySpringBean.java
index a0fb3fd344..b7ad7f2dc2 100644
--- a/src/test/java/io/lettuce/examples/MySpringBean.java
+++ b/src/test/java/io/lettuce/examples/MySpringBean.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/examples/ReadWriteExample.java b/src/test/java/io/lettuce/examples/ReadWriteExample.java
index ed0b73610a..b502bcf58b 100644
--- a/src/test/java/io/lettuce/examples/ReadWriteExample.java
+++ b/src/test/java/io/lettuce/examples/ReadWriteExample.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/examples/SpringExample.java b/src/test/java/io/lettuce/examples/SpringExample.java
index fcdd3f7308..599d1bf017 100644
--- a/src/test/java/io/lettuce/examples/SpringExample.java
+++ b/src/test/java/io/lettuce/examples/SpringExample.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/CanConnect.java b/src/test/java/io/lettuce/test/CanConnect.java
index 8ea865a929..34fecbcfce 100644
--- a/src/test/java/io/lettuce/test/CanConnect.java
+++ b/src/test/java/io/lettuce/test/CanConnect.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/CliParser.java b/src/test/java/io/lettuce/test/CliParser.java
index 6b94dd98c7..0c6ae3cb0f 100644
--- a/src/test/java/io/lettuce/test/CliParser.java
+++ b/src/test/java/io/lettuce/test/CliParser.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/ConnectionDecoratingInvocationHandler.java b/src/test/java/io/lettuce/test/ConnectionDecoratingInvocationHandler.java
index b5bf661683..3b04197d8e 100644
--- a/src/test/java/io/lettuce/test/ConnectionDecoratingInvocationHandler.java
+++ b/src/test/java/io/lettuce/test/ConnectionDecoratingInvocationHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/ConnectionTestUtil.java b/src/test/java/io/lettuce/test/ConnectionTestUtil.java
index 4cf794923d..eac6fba457 100644
--- a/src/test/java/io/lettuce/test/ConnectionTestUtil.java
+++ b/src/test/java/io/lettuce/test/ConnectionTestUtil.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/Delay.java b/src/test/java/io/lettuce/test/Delay.java
index a64217bae1..54512b0f9d 100644
--- a/src/test/java/io/lettuce/test/Delay.java
+++ b/src/test/java/io/lettuce/test/Delay.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/KeyValueStreamingAdapter.java b/src/test/java/io/lettuce/test/KeyValueStreamingAdapter.java
index 9501b99147..8873073c83 100644
--- a/src/test/java/io/lettuce/test/KeyValueStreamingAdapter.java
+++ b/src/test/java/io/lettuce/test/KeyValueStreamingAdapter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/KeysAndValues.java b/src/test/java/io/lettuce/test/KeysAndValues.java
index 3cc2775217..71f2779af1 100644
--- a/src/test/java/io/lettuce/test/KeysAndValues.java
+++ b/src/test/java/io/lettuce/test/KeysAndValues.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/LettuceExtension.java b/src/test/java/io/lettuce/test/LettuceExtension.java
index d6b4d34748..8dc6198d2c 100644
--- a/src/test/java/io/lettuce/test/LettuceExtension.java
+++ b/src/test/java/io/lettuce/test/LettuceExtension.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/ListStreamingAdapter.java b/src/test/java/io/lettuce/test/ListStreamingAdapter.java
index 47b109e529..09490bd0fd 100644
--- a/src/test/java/io/lettuce/test/ListStreamingAdapter.java
+++ b/src/test/java/io/lettuce/test/ListStreamingAdapter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/ReactiveSyncInvocationHandler.java b/src/test/java/io/lettuce/test/ReactiveSyncInvocationHandler.java
index 75f30a9386..481fc73a00 100644
--- a/src/test/java/io/lettuce/test/ReactiveSyncInvocationHandler.java
+++ b/src/test/java/io/lettuce/test/ReactiveSyncInvocationHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/RoutingInvocationHandler.java b/src/test/java/io/lettuce/test/RoutingInvocationHandler.java
index 3f4f08048d..1f9e370a78 100644
--- a/src/test/java/io/lettuce/test/RoutingInvocationHandler.java
+++ b/src/test/java/io/lettuce/test/RoutingInvocationHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/TestFutures.java b/src/test/java/io/lettuce/test/TestFutures.java
index db31a22aa1..ddf7fe06cb 100644
--- a/src/test/java/io/lettuce/test/TestFutures.java
+++ b/src/test/java/io/lettuce/test/TestFutures.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/Wait.java b/src/test/java/io/lettuce/test/Wait.java
index 336b3c3546..e584dc5720 100644
--- a/src/test/java/io/lettuce/test/Wait.java
+++ b/src/test/java/io/lettuce/test/Wait.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/WithPassword.java b/src/test/java/io/lettuce/test/WithPassword.java
index 1f7d70f7d9..ed5d4e06c9 100644
--- a/src/test/java/io/lettuce/test/WithPassword.java
+++ b/src/test/java/io/lettuce/test/WithPassword.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/condition/EnabledOnCommand.java b/src/test/java/io/lettuce/test/condition/EnabledOnCommand.java
index 00f6ff3d6f..b4271eeaff 100644
--- a/src/test/java/io/lettuce/test/condition/EnabledOnCommand.java
+++ b/src/test/java/io/lettuce/test/condition/EnabledOnCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/condition/EnabledOnCommandCondition.java b/src/test/java/io/lettuce/test/condition/EnabledOnCommandCondition.java
index f447b8faec..46b3911bbd 100644
--- a/src/test/java/io/lettuce/test/condition/EnabledOnCommandCondition.java
+++ b/src/test/java/io/lettuce/test/condition/EnabledOnCommandCondition.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/condition/RedisConditions.java b/src/test/java/io/lettuce/test/condition/RedisConditions.java
index 46de1058f9..106e46aa3c 100644
--- a/src/test/java/io/lettuce/test/condition/RedisConditions.java
+++ b/src/test/java/io/lettuce/test/condition/RedisConditions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/resource/DefaultRedisClient.java b/src/test/java/io/lettuce/test/resource/DefaultRedisClient.java
index 1eee4841fd..8feefc245e 100644
--- a/src/test/java/io/lettuce/test/resource/DefaultRedisClient.java
+++ b/src/test/java/io/lettuce/test/resource/DefaultRedisClient.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/resource/DefaultRedisClusterClient.java b/src/test/java/io/lettuce/test/resource/DefaultRedisClusterClient.java
index dc67b9b49b..ec2f65bd9d 100644
--- a/src/test/java/io/lettuce/test/resource/DefaultRedisClusterClient.java
+++ b/src/test/java/io/lettuce/test/resource/DefaultRedisClusterClient.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/resource/FastShutdown.java b/src/test/java/io/lettuce/test/resource/FastShutdown.java
index e31bcbdbd0..6fa8fd5b24 100644
--- a/src/test/java/io/lettuce/test/resource/FastShutdown.java
+++ b/src/test/java/io/lettuce/test/resource/FastShutdown.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/resource/TestClientResources.java b/src/test/java/io/lettuce/test/resource/TestClientResources.java
index 4d1278ddfb..fd79341384 100644
--- a/src/test/java/io/lettuce/test/resource/TestClientResources.java
+++ b/src/test/java/io/lettuce/test/resource/TestClientResources.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/resource/TestEventLoopGroupProvider.java b/src/test/java/io/lettuce/test/resource/TestEventLoopGroupProvider.java
index e55e97b8d9..d0e510edad 100644
--- a/src/test/java/io/lettuce/test/resource/TestEventLoopGroupProvider.java
+++ b/src/test/java/io/lettuce/test/resource/TestEventLoopGroupProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/server/MockTcpServer.java b/src/test/java/io/lettuce/test/server/MockTcpServer.java
index 5430075313..1d4374eaba 100644
--- a/src/test/java/io/lettuce/test/server/MockTcpServer.java
+++ b/src/test/java/io/lettuce/test/server/MockTcpServer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/server/RandomResponseServer.java b/src/test/java/io/lettuce/test/server/RandomResponseServer.java
index ffbbd02d7d..cc2f3f673d 100644
--- a/src/test/java/io/lettuce/test/server/RandomResponseServer.java
+++ b/src/test/java/io/lettuce/test/server/RandomResponseServer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/server/RandomServerHandler.java b/src/test/java/io/lettuce/test/server/RandomServerHandler.java
index 88f7c28df2..260840ee70 100644
--- a/src/test/java/io/lettuce/test/server/RandomServerHandler.java
+++ b/src/test/java/io/lettuce/test/server/RandomServerHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/lettuce/test/settings/TestSettings.java b/src/test/java/io/lettuce/test/settings/TestSettings.java
index 5abbab144d..b6d3757a17 100644
--- a/src/test/java/io/lettuce/test/settings/TestSettings.java
+++ b/src/test/java/io/lettuce/test/settings/TestSettings.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java b/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
index 4badd11498..03d769ab81 100644
--- a/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
+++ b/src/test/jmh/io/lettuce/core/EmptyRedisChannelWriter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java b/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
index bc4ec8ccce..9bb64fc630 100644
--- a/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
+++ b/src/test/jmh/io/lettuce/core/EmptyStatefulRedisConnection.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/JmhMain.java b/src/test/jmh/io/lettuce/core/JmhMain.java
index 6033bb8227..88e2021f72 100644
--- a/src/test/jmh/io/lettuce/core/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/JmhMain.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
index eea92858b4..3954d6c6b1 100644
--- a/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/RedisClientBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
index 8015ce7f88..0afc8a5d87 100644
--- a/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/ClusterDistributionChannelWriterBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java b/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java
index e7f06a6fdb..bcc8971fb3 100644
--- a/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java
+++ b/src/test/jmh/io/lettuce/core/cluster/EmptyRedisClusterClient.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/cluster/JmhMain.java b/src/test/jmh/io/lettuce/core/cluster/JmhMain.java
index ac35e1a02b..dc865a6135 100644
--- a/src/test/jmh/io/lettuce/core/cluster/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/cluster/JmhMain.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
index 7d1194128c..263d2da62e 100644
--- a/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/RedisClusterClientBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java
index 8f06d11469..b312a1475a 100644
--- a/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/SlotHashBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/cluster/models/partitions/JmhMain.java b/src/test/jmh/io/lettuce/core/cluster/models/partitions/JmhMain.java
index c4a84b3f1b..52f98e54e8 100644
--- a/src/test/jmh/io/lettuce/core/cluster/models/partitions/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/cluster/models/partitions/JmhMain.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java b/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java
index 8231390aed..96898c6928 100644
--- a/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/cluster/models/partitions/RedisClusterNodeBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/codec/JmhMain.java b/src/test/jmh/io/lettuce/core/codec/JmhMain.java
index 8f9fb6f1e8..bba4ac44e7 100644
--- a/src/test/jmh/io/lettuce/core/codec/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/codec/JmhMain.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java b/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java
index 3a99ea5151..eac6791298 100644
--- a/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/codec/StringCodecBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java b/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java
index f996e80ca5..ed64784097 100644
--- a/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/codec/Utf8StringCodecBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java
index f4321913df..9e1e21bfc3 100644
--- a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandFactoryBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
index c825a86958..a565bc9aed 100644
--- a/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/dynamic/RedisCommandsBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java b/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java
index bb2587a4ba..7ff8ce7673 100644
--- a/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/dynamic/intercept/InvocationProxyFactoryBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/output/JmhMain.java b/src/test/jmh/io/lettuce/core/output/JmhMain.java
index 12dfc11ad4..7355c16064 100644
--- a/src/test/jmh/io/lettuce/core/output/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/output/JmhMain.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/output/ValueListOutputBenchmark.java b/src/test/jmh/io/lettuce/core/output/ValueListOutputBenchmark.java
index 1a866353ac..86eae7e3f1 100644
--- a/src/test/jmh/io/lettuce/core/output/ValueListOutputBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/output/ValueListOutputBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
index 6097756d47..d078d33ae5 100644
--- a/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
index 6b1403edd8..5df0d810df 100644
--- a/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/CommandHandlerBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java b/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
index 5d2e0a1b19..a905893dbd 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyByteBuf.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
index d8c54c5bf4..833a0aa8a1 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyClientResources.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java b/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
index 4669b5f6b4..142604fdcf 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyContext.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java b/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java
index 5b645b94da..3587f2177e 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyFuture.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java b/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
index bf8706bde2..5435ef84ae 100644
--- a/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
+++ b/src/test/jmh/io/lettuce/core/protocol/EmptyPromise.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/protocol/JmhMain.java b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
index 4da1c8b190..66d4104142 100644
--- a/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/protocol/JmhMain.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
index a5ea0c7c6d..c1a3e4a0cc 100644
--- a/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/RedisEndpointBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java b/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
index 0b9dad56f5..ce24710201 100644
--- a/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/protocol/RedisStateMachineBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/support/AsyncConnectionPoolBenchmark.java b/src/test/jmh/io/lettuce/core/support/AsyncConnectionPoolBenchmark.java
index ac36391ce7..6c53abddbb 100644
--- a/src/test/jmh/io/lettuce/core/support/AsyncConnectionPoolBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/support/AsyncConnectionPoolBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/support/GenericConnectionPoolBenchmark.java b/src/test/jmh/io/lettuce/core/support/GenericConnectionPoolBenchmark.java
index 594cf0662f..56c31c8fde 100644
--- a/src/test/jmh/io/lettuce/core/support/GenericConnectionPoolBenchmark.java
+++ b/src/test/jmh/io/lettuce/core/support/GenericConnectionPoolBenchmark.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/jmh/io/lettuce/core/support/JmhMain.java b/src/test/jmh/io/lettuce/core/support/JmhMain.java
index caacd84e57..4b80bd8a50 100644
--- a/src/test/jmh/io/lettuce/core/support/JmhMain.java
+++ b/src/test/jmh/io/lettuce/core/support/JmhMain.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

From b4e98d1140885a77c04682da69ffc3b22af15aa5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 4 Jan 2020 14:27:12 +0100
Subject: [PATCH 724/808] Migrate Master/Replica implementation to
 masterreplica package #1199

MasterReplica contains now the implementation and support classes to establish replication connections. Master/Slave contains only delegation stubs to preserve backward compatibility.
---
 .../AsyncConnections.java                     |   8 +-
 .../AutodiscoveryConnector.java               |  31 ++--
 .../CompletableEventLatchSupport.java         |   6 +-
 .../Connections.java                          |  10 +-
 .../Exceptions.java                           |   6 +-
 .../core/masterreplica/MasterReplica.java     | 139 +++++++++++++++---
 .../MasterReplicaChannelWriter.java}          |  41 +++---
 .../MasterReplicaConnectionProvider.java}     |  38 +++--
 .../MasterReplicaConnector.java}              |  14 +-
 .../MasterReplicaTopologyProvider.java}       |  36 +++--
 .../MasterReplicaTopologyRefresh.java}        |  34 ++---
 .../MasterReplicaUtils.java}                  |   9 +-
 .../NodeConnectionFactory.java                |  10 +-
 .../ReadOnlyCommands.java                     |   6 +-
 .../RedisClientNodeConnectionFactory.java     |   6 +-
 .../RedisMasterReplicaNode.java}              |  23 ++-
 .../Requests.java                             |  14 +-
 .../ResumeAfter.java                          |   6 +-
 .../SentinelConnector.java                    |  31 ++--
 .../SentinelTopologyProvider.java             |  18 +--
 .../SentinelTopologyRefresh.java              |   8 +-
 .../SentinelTopologyRefreshConnections.java   |   6 +-
 .../StatefulRedisMasterReplicaConnection.java |   6 +-
 ...efulRedisMasterReplicaConnectionImpl.java} |  17 +--
 .../StaticMasterReplicaConnector.java}        |  32 ++--
 .../StaticMasterReplicaTopologyProvider.java} |  35 ++---
 .../TimedAsyncCommand.java                    |   6 +-
 .../Timeout.java                              |   6 +-
 .../TopologyComparators.java                  |   6 +-
 .../TopologyProvider.java                     |  14 +-
 .../lettuce/core/masterslave/MasterSlave.java | 131 ++---------------
 .../MasterSlaveConnectionWrapper.java}        |  11 +-
 .../StatefulRedisMasterSlaveConnection.java   |   4 +-
 .../ConnectionsUnitTests.java                 |   7 +-
 .../CustomCommandIntegrationTests.java        |  15 +-
 .../MasterReplicaChannelWriterUnitTests.java} |  84 +++++------
 ...erReplicaConnectionProviderUnitTests.java} |  17 ++-
 ...terReplicaSentinelSslIntegrationTests.java |   2 +-
 ...sterReplicaTopologyProviderUnitTests.java} |  35 ++---
 ...asterReplicaTopologyRefreshUnitTests.java} |  16 +-
 .../MasterReplicaUtilsUnitTests.java          | 101 +++++++++++++
 .../SentinelTopologyRefreshUnitTests.java     |   7 +-
 .../StaticMasterReplicaTest.java              |  48 ++++--
 .../MasterSlaveSentinelIntegrationTests.java  |   6 +-
 .../core/masterslave/MasterSlaveTest.java     |  32 +---
 .../MasterSlaveUtilsUnitTests.java            | 101 -------------
 .../masterslave/StaticMasterSlaveTest.java    |  47 +-----
 47 files changed, 621 insertions(+), 665 deletions(-)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/AsyncConnections.java (92%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/AutodiscoveryConnector.java (80%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/CompletableEventLatchSupport.java (97%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/Connections.java (96%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/Exceptions.java (92%)
 rename src/main/java/io/lettuce/core/{masterslave/MasterSlaveChannelWriter.java => masterreplica/MasterReplicaChannelWriter.java} (85%)
 rename src/main/java/io/lettuce/core/{masterslave/MasterSlaveConnectionProvider.java => masterreplica/MasterReplicaConnectionProvider.java} (88%)
 rename src/main/java/io/lettuce/core/{masterslave/MasterSlaveConnector.java => masterreplica/MasterReplicaConnector.java} (68%)
 rename src/main/java/io/lettuce/core/{masterslave/MasterSlaveTopologyProvider.java => masterreplica/MasterReplicaTopologyProvider.java} (82%)
 rename src/main/java/io/lettuce/core/{masterslave/MasterSlaveTopologyRefresh.java => masterreplica/MasterReplicaTopologyRefresh.java} (81%)
 rename src/main/java/io/lettuce/core/{masterslave/MasterSlaveUtils.java => masterreplica/MasterReplicaUtils.java} (95%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/NodeConnectionFactory.java (82%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/ReadOnlyCommands.java (94%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/RedisClientNodeConnectionFactory.java (89%)
 rename src/main/java/io/lettuce/core/{masterslave/RedisMasterSlaveNode.java => masterreplica/RedisMasterReplicaNode.java} (74%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/Requests.java (86%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/ResumeAfter.java (94%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/SentinelConnector.java (74%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/SentinelTopologyProvider.java (90%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/SentinelTopologyRefresh.java (98%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/SentinelTopologyRefreshConnections.java (93%)
 rename src/main/java/io/lettuce/core/{masterslave/StatefulRedisMasterSlaveConnectionImpl.java => masterreplica/StatefulRedisMasterReplicaConnectionImpl.java} (68%)
 rename src/main/java/io/lettuce/core/{masterslave/StaticMasterSlaveConnector.java => masterreplica/StaticMasterReplicaConnector.java} (58%)
 rename src/main/java/io/lettuce/core/{masterslave/StaticMasterSlaveTopologyProvider.java => masterreplica/StaticMasterReplicaTopologyProvider.java} (75%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/TimedAsyncCommand.java (91%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/Timeout.java (88%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/TopologyComparators.java (95%)
 rename src/main/java/io/lettuce/core/{masterslave => masterreplica}/TopologyProvider.java (75%)
 rename src/main/java/io/lettuce/core/{masterreplica/MasterReplicaConnectionWrapper.java => masterslave/MasterSlaveConnectionWrapper.java} (88%)
 rename src/test/java/io/lettuce/core/{masterslave => masterreplica}/ConnectionsUnitTests.java (90%)
 rename src/test/java/io/lettuce/core/{masterslave => masterreplica}/CustomCommandIntegrationTests.java (93%)
 rename src/test/java/io/lettuce/core/{masterslave/MasterSlaveChannelWriterUnitTests.java => masterreplica/MasterReplicaChannelWriterUnitTests.java} (54%)
 rename src/test/java/io/lettuce/core/{masterslave/MasterSlaveConnectionProviderUnitTests.java => masterreplica/MasterReplicaConnectionProviderUnitTests.java} (82%)
 rename src/test/java/io/lettuce/core/{masterslave/MasterSlaveTopologyProviderUnitTests.java => masterreplica/MasterReplicaTopologyProviderUnitTests.java} (82%)
 rename src/test/java/io/lettuce/core/{masterslave/MasterSlaveTopologyRefreshUnitTests.java => masterreplica/MasterReplicaTopologyRefreshUnitTests.java} (85%)
 create mode 100644 src/test/java/io/lettuce/core/masterreplica/MasterReplicaUtilsUnitTests.java
 rename src/test/java/io/lettuce/core/{masterslave => masterreplica}/SentinelTopologyRefreshUnitTests.java (98%)
 delete mode 100644 src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java

diff --git a/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java b/src/main/java/io/lettuce/core/masterreplica/AsyncConnections.java
similarity index 92%
rename from src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
rename to src/main/java/io/lettuce/core/masterreplica/AsyncConnections.java
index 63a6ee65cb..697696a342 100644
--- a/src/main/java/io/lettuce/core/masterslave/AsyncConnections.java
+++ b/src/main/java/io/lettuce/core/masterreplica/AsyncConnections.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.time.Duration;
 import java.util.List;
@@ -34,7 +34,7 @@
 class AsyncConnections {
 
     private final Map<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> connections = new TreeMap<>(
-            MasterSlaveUtils.RedisURIComparator.INSTANCE);
+            MasterReplicaUtils.RedisURIComparator.INSTANCE);
     private final List<RedisNodeDescription> nodeList;
 
     AsyncConnections(List<RedisNodeDescription> nodeList) {
diff --git a/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java b/src/main/java/io/lettuce/core/masterreplica/AutodiscoveryConnector.java
similarity index 80%
rename from src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
rename to src/main/java/io/lettuce/core/masterreplica/AutodiscoveryConnector.java
index 4034fb1dab..20e9e7a699 100644
--- a/src/main/java/io/lettuce/core/masterslave/AutodiscoveryConnector.java
+++ b/src/main/java/io/lettuce/core/masterreplica/AutodiscoveryConnector.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.List;
 import java.util.Map;
@@ -35,13 +35,13 @@
 import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
- * {@link MasterSlaveConnector} to connect unmanaged Redis Master/Slave with auto-discovering master and replica nodes from a
- * single {@link RedisURI}.
+ * {@link MasterReplicaConnector} to connect unmanaged Redis Master/Replica with auto-discovering master and replica nodes from
+ * a single {@link RedisURI}.
  *
  * @author Mark Paluch
  * @since 5.1
  */
-class AutodiscoveryConnector<K, V> implements MasterSlaveConnector<K, V> {
+class AutodiscoveryConnector<K, V> implements MasterReplicaConnector<K, V> {
 
     private final RedisClient redisClient;
     private final RedisCodec<K, V> codec;
@@ -56,17 +56,17 @@ class AutodiscoveryConnector<K, V> implements MasterSlaveConnector<K, V> {
     }
 
     @Override
-    public CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsync() {
+    public CompletableFuture<StatefulRedisMasterReplicaConnection<K, V>> connectAsync() {
 
         ConnectionFuture<StatefulRedisConnection<K, V>> initialConnection = redisClient.connectAsync(codec, redisURI);
-        Mono<StatefulRedisMasterSlaveConnection<K, V>> connect = Mono
+        Mono<StatefulRedisMasterReplicaConnection<K, V>> connect = Mono
                 .fromCompletionStage(initialConnection)
                 .flatMap(
                         nodeConnection -> {
 
                             initialConnections.put(redisURI, nodeConnection);
 
-                            TopologyProvider topologyProvider = new MasterSlaveTopologyProvider(nodeConnection, redisURI);
+                            TopologyProvider topologyProvider = new MasterReplicaTopologyProvider(nodeConnection, redisURI);
 
                             return Mono.fromCompletionStage(topologyProvider.getNodesAsync()).flatMap(
                                     nodes -> getMasterConnectionAndUri(nodes, Tuples.of(redisURI, nodeConnection), codec));
@@ -107,14 +107,14 @@ private Mono<Tuple2<RedisURI, StatefulRedisConnection<K, V>>> getMasterConnectio
     }
 
     @SuppressWarnings("unchecked")
-    private Mono<StatefulRedisMasterSlaveConnection<K, V>> initializeConnection(RedisCodec<K, V> codec,
+    private Mono<StatefulRedisMasterReplicaConnection<K, V>> initializeConnection(RedisCodec<K, V> codec,
             Tuple2<RedisURI, StatefulRedisConnection<K, V>> connectionAndUri) {
 
-        MasterSlaveTopologyProvider topologyProvider = new MasterSlaveTopologyProvider(connectionAndUri.getT2(),
+        MasterReplicaTopologyProvider topologyProvider = new MasterReplicaTopologyProvider(connectionAndUri.getT2(),
                 connectionAndUri.getT1());
 
-        MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(redisClient, topologyProvider);
-        MasterSlaveConnectionProvider<K, V> connectionProvider = new MasterSlaveConnectionProvider<>(redisClient, codec,
+        MasterReplicaTopologyRefresh refresh = new MasterReplicaTopologyRefresh(redisClient, topologyProvider);
+        MasterReplicaConnectionProvider<K, V> connectionProvider = new MasterReplicaConnectionProvider<>(redisClient, codec,
                 redisURI, (Map) initialConnections);
 
         Mono<List<RedisNodeDescription>> refreshFuture = refresh.getNodes(redisURI);
@@ -123,10 +123,11 @@ private Mono<StatefulRedisMasterSlaveConnection<K, V>> initializeConnection(Redi
 
             connectionProvider.setKnownNodes(nodes);
 
-            MasterSlaveChannelWriter channelWriter = new MasterSlaveChannelWriter(connectionProvider, redisClient
+            MasterReplicaChannelWriter channelWriter = new MasterReplicaChannelWriter(connectionProvider,
+                    redisClient
                     .getResources());
 
-            StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(
+            StatefulRedisMasterReplicaConnectionImpl<K, V> connection = new StatefulRedisMasterReplicaConnectionImpl<>(
                     channelWriter, codec, redisURI.getTimeout());
 
             connection.setOptions(redisClient.getOptions());
diff --git a/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java b/src/main/java/io/lettuce/core/masterreplica/CompletableEventLatchSupport.java
similarity index 97%
rename from src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
rename to src/main/java/io/lettuce/core/masterreplica/CompletableEventLatchSupport.java
index 64a5e39b93..c17dda09b4 100644
--- a/src/main/java/io/lettuce/core/masterslave/CompletableEventLatchSupport.java
+++ b/src/main/java/io/lettuce/core/masterreplica/CompletableEventLatchSupport.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.time.Duration;
 import java.util.concurrent.*;
diff --git a/src/main/java/io/lettuce/core/masterslave/Connections.java b/src/main/java/io/lettuce/core/masterreplica/Connections.java
similarity index 96%
rename from src/main/java/io/lettuce/core/masterslave/Connections.java
rename to src/main/java/io/lettuce/core/masterreplica/Connections.java
index 7c34d75d9a..8334253ad6 100644
--- a/src/main/java/io/lettuce/core/masterslave/Connections.java
+++ b/src/main/java/io/lettuce/core/masterreplica/Connections.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.time.Duration;
 import java.util.*;
@@ -51,7 +51,7 @@ class Connections extends CompletableEventLatchSupport<Tuple2<RedisURI, Stateful
         implements AsyncCloseable {
 
     private final Map<RedisURI, StatefulRedisConnection<String, String>> connections = new TreeMap<>(
-            MasterSlaveUtils.RedisURIComparator.INSTANCE);
+            MasterReplicaUtils.RedisURIComparator.INSTANCE);
 
     private final List<Throwable> exceptions = new CopyOnWriteArrayList<>();
     private final List<RedisNodeDescription> nodes;
@@ -97,7 +97,7 @@ protected void onEmit(Emission<Connections> emission) {
         if (getExpectedCount() != 0 && this.connections.isEmpty() && !this.exceptions.isEmpty()) {
 
             RedisConnectionException collector = new RedisConnectionException(
-                    "Unable to establish a connection to Redis Master/Slave");
+                    "Unable to establish a connection to Redis Master/Replica");
             this.exceptions.forEach(collector::addSuppressed);
 
             emission.error(collector);
diff --git a/src/main/java/io/lettuce/core/masterslave/Exceptions.java b/src/main/java/io/lettuce/core/masterreplica/Exceptions.java
similarity index 92%
rename from src/main/java/io/lettuce/core/masterslave/Exceptions.java
rename to src/main/java/io/lettuce/core/masterreplica/Exceptions.java
index 482910ca50..1ec3231d1f 100644
--- a/src/main/java/io/lettuce/core/masterslave/Exceptions.java
+++ b/src/main/java/io/lettuce/core/masterreplica/Exceptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
diff --git a/src/main/java/io/lettuce/core/masterreplica/MasterReplica.java b/src/main/java/io/lettuce/core/masterreplica/MasterReplica.java
index daf3e5405f..72b8900ce9 100644
--- a/src/main/java/io/lettuce/core/masterreplica/MasterReplica.java
+++ b/src/main/java/io/lettuce/core/masterreplica/MasterReplica.java
@@ -15,12 +15,21 @@
  */
 package io.lettuce.core.masterreplica;
 
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
 
+import io.lettuce.core.ConnectionFuture;
 import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisConnectionException;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.codec.RedisCodec;
-import io.lettuce.core.masterslave.MasterSlave;
+import io.lettuce.core.internal.Futures;
+import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.LettuceLists;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
  * Master-Replica connection API.
@@ -49,19 +58,18 @@
  * Master-Replica topologies are either static or semi-static. Redis Standalone instances with attached replicas provide no
  * failover/HA mechanism. Redis Sentinel managed instances are controlled by Redis Sentinel and allow failover (which include
  * master promotion). The {@link MasterReplica} API supports both mechanisms. The topology is provided by a
- * {@link io.lettuce.core.masterslave.TopologyProvider}:
+ * {@link TopologyProvider}:
  *
  * <ul>
- * <li>{@link io.lettuce.core.masterslave.MasterSlaveTopologyProvider}: Dynamic topology lookup using the
- * {@code INFO REPLICATION} output. Replicas are listed as {@code replicaN=...} entries. The initial connection can either point
- * to a master or a replica and the topology provider will discover nodes. The connection needs to be re-established outside of
- * lettuce in a case of Master/Replica failover or topology changes.</li>
- * <li>{@link io.lettuce.core.masterslave.StaticMasterSlaveTopologyProvider}: Topology is defined by the list of {@link RedisURI
- * URIs} and the {@code ROLE} output. MasterReplica uses only the supplied nodes and won't discover additional nodes in the
- * setup. The connection needs to be re-established outside of lettuce in a case of Master/Replica failover or topology
- * changes.</li>
- * <li>{@link io.lettuce.core.masterslave.SentinelTopologyProvider}: Dynamic topology lookup using the Redis Sentinel API. In
- * particular, {@code SENTINEL MASTER} and {@code SENTINEL SLAVES} output. Master/Replica failover is handled by lettuce.</li>
+ * <li>{@link MasterReplicaTopologyProvider}: Dynamic topology lookup using the {@code INFO REPLICATION} output. Replicas are
+ * listed as {@code replicaN=...} entries. The initial connection can either point to a master or a replica and the topology
+ * provider will discover nodes. The connection needs to be re-established outside of lettuce in a case of Master/Replica
+ * failover or topology changes.</li>
+ * <li>{@link StaticMasterReplicaTopologyProvider}: Topology is defined by the list of {@link RedisURI URIs} and the
+ * {@code ROLE} output. MasterReplica uses only the supplied nodes and won't discover additional nodes in the setup. The
+ * connection needs to be re-established outside of lettuce in a case of Master/Replica failover or topology changes.</li>
+ * <li>{@link SentinelTopologyProvider}: Dynamic topology lookup using the Redis Sentinel API. In particular,
+ * {@code SENTINEL MASTER} and {@code SENTINEL SLAVES} output. Master/Replica failover is handled by lettuce.</li>
  * </ul>
  *
  * <h3>Topology Updates</h4>
@@ -102,8 +110,7 @@ public class MasterReplica {
      */
     public static <K, V> StatefulRedisMasterReplicaConnection<K, V> connect(RedisClient redisClient, RedisCodec<K, V> codec,
             RedisURI redisURI) {
-
-        return new MasterReplicaConnectionWrapper<>(MasterSlave.connect(redisClient, codec, redisURI));
+        return getConnection(connectAsyncSentinelOrAutodiscovery(redisClient, codec, redisURI), redisURI);
     }
 
     /**
@@ -120,11 +127,25 @@ public static <K, V> StatefulRedisMasterReplicaConnection<K, V> connect(RedisCli
      * @param <K> Key type.
      * @param <V> Value type.
      * @return {@link CompletableFuture} that is notified once the connect is finished.
-     * @since
+     * @since 6.0
      */
     public static <K, V> CompletableFuture<StatefulRedisMasterReplicaConnection<K, V>> connectAsync(RedisClient redisClient,
             RedisCodec<K, V> codec, RedisURI redisURI) {
-        return MasterSlave.connectAsync(redisClient, codec, redisURI).thenApply(MasterReplicaConnectionWrapper::new);
+        return transformAsyncConnectionException(connectAsyncSentinelOrAutodiscovery(redisClient, codec, redisURI), redisURI);
+    }
+
+    private static <K, V> CompletableFuture<StatefulRedisMasterReplicaConnection<K, V>> connectAsyncSentinelOrAutodiscovery(
+            RedisClient redisClient, RedisCodec<K, V> codec, RedisURI redisURI) {
+
+        LettuceAssert.notNull(redisClient, "RedisClient must not be null");
+        LettuceAssert.notNull(codec, "RedisCodec must not be null");
+        LettuceAssert.notNull(redisURI, "RedisURI must not be null");
+
+        if (isSentinel(redisURI)) {
+            return new SentinelConnector<>(redisClient, codec, redisURI).connectAsync();
+        }
+
+        return new AutodiscoveryConnector<>(redisClient, codec, redisURI).connectAsync();
     }
 
     /**
@@ -147,10 +168,11 @@ public static <K, V> CompletableFuture<StatefulRedisMasterReplicaConnection<K, V
      * @param <K> Key type.
      * @param <V> Value type.
      * @return a new connection.
+     * @since 6.0
      */
     public static <K, V> StatefulRedisMasterReplicaConnection<K, V> connect(RedisClient redisClient, RedisCodec<K, V> codec,
             Iterable<RedisURI> redisURIs) {
-        return new MasterReplicaConnectionWrapper<>(MasterSlave.connect(redisClient, codec, redisURIs));
+        return getConnection(connectAsyncSentinelOrStaticSetup(redisClient, codec, redisURIs), redisURIs);
     }
 
     /**
@@ -173,10 +195,91 @@ public static <K, V> StatefulRedisMasterReplicaConnection<K, V> connect(RedisCli
      * @param <K> Key type.
      * @param <V> Value type.
      * @return {@link CompletableFuture} that is notified once the connect is finished.
+     * @since 6.0
      */
     public static <K, V> CompletableFuture<StatefulRedisMasterReplicaConnection<K, V>> connectAsync(RedisClient redisClient,
             RedisCodec<K, V> codec, Iterable<RedisURI> redisURIs) {
+        return transformAsyncConnectionException(connectAsyncSentinelOrStaticSetup(redisClient, codec, redisURIs), redisURIs);
+    }
+
+    private static <K, V> CompletableFuture<StatefulRedisMasterReplicaConnection<K, V>> connectAsyncSentinelOrStaticSetup(
+            RedisClient redisClient, RedisCodec<K, V> codec, Iterable<RedisURI> redisURIs) {
+
+        LettuceAssert.notNull(redisClient, "RedisClient must not be null");
+        LettuceAssert.notNull(codec, "RedisCodec must not be null");
+        LettuceAssert.notNull(redisURIs, "RedisURIs must not be null");
+
+        List<RedisURI> uriList = LettuceLists.newList(redisURIs);
+        LettuceAssert.isTrue(!uriList.isEmpty(), "RedisURIs must not be empty");
+
+        RedisURI first = uriList.get(0);
+        if (isSentinel(first)) {
+
+            if (uriList.size() > 1) {
+                InternalLogger logger = InternalLoggerFactory.getInstance(MasterReplica.class);
+                logger.warn(
+                        "RedisURIs contains multiple endpoints of which the first is configured for Sentinel usage. Using only the first URI [{}] without considering the remaining URIs. Make sure to include all Sentinel endpoints in a single RedisURI.",
+                        first);
+            }
+            return new SentinelConnector<>(redisClient, codec, first).connectAsync();
+        }
+
+        return new StaticMasterReplicaConnector<>(redisClient, codec, uriList).connectAsync();
+    }
+
+    private static boolean isSentinel(RedisURI redisURI) {
+        return !redisURI.getSentinels().isEmpty();
+    }
+
+    /**
+     * Retrieve the connection from {@link ConnectionFuture}. Performs a blocking {@link ConnectionFuture#get()} to synchronize
+     * the channel/connection initialization. Any exception is rethrown as {@link RedisConnectionException}.
+     *
+     * @param connectionFuture must not be null.
+     * @param context context information (single RedisURI, multiple URIs), used as connection target in the reported exception.
+     * @param <T> Connection type.
+     * @return the connection.
+     * @throws RedisConnectionException in case of connection failures.
+     */
+    private static <T> T getConnection(CompletableFuture<T> connectionFuture, Object context) {
+
+        try {
+            return connectionFuture.get();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw RedisConnectionException.create(context.toString(), e);
+        } catch (Exception e) {
+
+            if (e instanceof ExecutionException) {
+
+                // filter intermediate RedisConnectionException exceptions that bloat the stack trace
+                if (e.getCause() instanceof RedisConnectionException
+                        && e.getCause().getCause() instanceof RedisConnectionException) {
+                    throw RedisConnectionException.create(context.toString(), e.getCause().getCause());
+                }
+
+                throw RedisConnectionException.create(context.toString(), e.getCause());
+            }
+
+            throw RedisConnectionException.create(context.toString(), e);
+        }
+    }
+
+    private static <T> CompletableFuture<T> transformAsyncConnectionException(CompletionStage<T> future, Object context) {
+
+        return ConnectionFuture.from(null, future.toCompletableFuture()).thenCompose((v, e) -> {
+
+            if (e != null) {
+
+                // filter intermediate RedisConnectionException exceptions that bloat the stack trace
+                if (e.getCause() instanceof RedisConnectionException
+                        && e.getCause().getCause() instanceof RedisConnectionException) {
+                    return Futures.failed(RedisConnectionException.create(context.toString(), e.getCause()));
+                }
+                return Futures.failed(RedisConnectionException.create(context.toString(), e));
+            }
 
-        return MasterSlave.connectAsync(redisClient, codec, redisURIs).thenApply(MasterReplicaConnectionWrapper::new);
+            return CompletableFuture.completedFuture(v);
+        }).toCompletableFuture();
     }
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaChannelWriter.java
similarity index 85%
rename from src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
rename to src/main/java/io/lettuce/core/masterreplica/MasterReplicaChannelWriter.java
index 8aeca57102..aefbd2a063 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveChannelWriter.java
+++ b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaChannelWriter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
@@ -23,7 +23,7 @@
 import io.lettuce.core.RedisException;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent;
+import io.lettuce.core.masterreplica.MasterReplicaConnectionProvider.Intent;
 import io.lettuce.core.protocol.ConnectionFacade;
 import io.lettuce.core.protocol.ProtocolKeyword;
 import io.lettuce.core.protocol.RedisCommand;
@@ -34,16 +34,17 @@
  *
  * @author Mark Paluch
  */
-class MasterSlaveChannelWriter implements RedisChannelWriter {
+class MasterReplicaChannelWriter implements RedisChannelWriter {
 
-    private MasterSlaveConnectionProvider<?, ?> masterSlaveConnectionProvider;
+    private MasterReplicaConnectionProvider<?, ?> masterReplicaConnectionProvider;
     private final ClientResources clientResources;
 
     private boolean closed = false;
     private boolean inTransaction;
 
-    MasterSlaveChannelWriter(MasterSlaveConnectionProvider<?, ?> masterSlaveConnectionProvider, ClientResources clientResources) {
-        this.masterSlaveConnectionProvider = masterSlaveConnectionProvider;
+    MasterReplicaChannelWriter(MasterReplicaConnectionProvider<?, ?> masterReplicaConnectionProvider,
+            ClientResources clientResources) {
+        this.masterReplicaConnectionProvider = masterReplicaConnectionProvider;
         this.clientResources = clientResources;
     }
 
@@ -62,7 +63,7 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         }
 
         Intent intent = inTransaction ? Intent.WRITE : getIntent(command.getType());
-        CompletableFuture<StatefulRedisConnection<K, V>> future = (CompletableFuture) masterSlaveConnectionProvider
+        CompletableFuture<StatefulRedisConnection<K, V>> future = (CompletableFuture) masterReplicaConnectionProvider
                 .getConnectionAsync(intent);
 
         if (isEndTransaction(command.getType())) {
@@ -115,7 +116,7 @@ private static <K, V> void writeCommand(RedisCommand<K, V, ?> command, StatefulR
         // Currently: Retain order
         Intent intent = inTransaction ? Intent.WRITE : getIntent(commands);
 
-        CompletableFuture<StatefulRedisConnection<K, V>> future = (CompletableFuture) masterSlaveConnectionProvider
+        CompletableFuture<StatefulRedisConnection<K, V>> future = (CompletableFuture) masterReplicaConnectionProvider
                 .getConnectionAsync(intent);
 
         for (RedisCommand<K, V, ?> command : commands) {
@@ -204,9 +205,9 @@ public CompletableFuture<Void> closeAsync() {
 
         CompletableFuture<Void> future = null;
 
-        if (masterSlaveConnectionProvider != null) {
-            future = masterSlaveConnectionProvider.closeAsync();
-            masterSlaveConnectionProvider = null;
+        if (masterReplicaConnectionProvider != null) {
+            future = masterReplicaConnectionProvider.closeAsync();
+            masterReplicaConnectionProvider = null;
         }
 
         if (future == null) {
@@ -216,8 +217,8 @@ public CompletableFuture<Void> closeAsync() {
         return future;
     }
 
-    MasterSlaveConnectionProvider<?, ?> getMasterSlaveConnectionProvider() {
-        return masterSlaveConnectionProvider;
+    MasterReplicaConnectionProvider<?, ?> getMasterReplicaConnectionProvider() {
+        return masterReplicaConnectionProvider;
     }
 
     @Override
@@ -231,17 +232,17 @@ public ClientResources getClientResources() {
 
     @Override
     public void setAutoFlushCommands(boolean autoFlush) {
-        masterSlaveConnectionProvider.setAutoFlushCommands(autoFlush);
+        masterReplicaConnectionProvider.setAutoFlushCommands(autoFlush);
     }
 
     @Override
     public void flushCommands() {
-        masterSlaveConnectionProvider.flushCommands();
+        masterReplicaConnectionProvider.flushCommands();
     }
 
     @Override
     public void reset() {
-        masterSlaveConnectionProvider.reset();
+        masterReplicaConnectionProvider.reset();
     }
 
     /**
@@ -251,7 +252,7 @@ public void reset() {
      * @param readFrom the read from setting, must not be {@literal null}
      */
     public void setReadFrom(ReadFrom readFrom) {
-        masterSlaveConnectionProvider.setReadFrom(readFrom);
+        masterReplicaConnectionProvider.setReadFrom(readFrom);
     }
 
     /**
@@ -260,7 +261,7 @@ public void setReadFrom(ReadFrom readFrom) {
      * @return the read from setting
      */
     public ReadFrom getReadFrom() {
-        return masterSlaveConnectionProvider.getReadFrom();
+        return masterReplicaConnectionProvider.getReadFrom();
     }
 
     private static boolean isSuccessfullyCompleted(CompletableFuture<?> connectFuture) {
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionProvider.java
similarity index 88%
rename from src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
rename to src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionProvider.java
index dfd3c298bd..56157807fd 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
-import static io.lettuce.core.masterslave.MasterSlaveUtils.findNodeByHostAndPort;
+import static io.lettuce.core.masterreplica.MasterReplicaUtils.findNodeByHostAndPort;
 
 import java.util.*;
 import java.util.concurrent.*;
@@ -35,16 +35,14 @@
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
- * Connection provider for master/slave setups. The connection provider
+ * Connection provider for master/replica setups. The connection provider
  *
  * @author Mark Paluch
  * @since 4.1
- * @deprecated will be moved to {@code masterreplica} package with version 6.
  */
-@Deprecated
-public class MasterSlaveConnectionProvider<K, V> {
+class MasterReplicaConnectionProvider<K, V> {
 
-    private static final InternalLogger logger = InternalLoggerFactory.getInstance(MasterSlaveConnectionProvider.class);
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(MasterReplicaConnectionProvider.class);
     private final boolean debugEnabled = logger.isDebugEnabled();
 
     private final RedisURI initialRedisUri;
@@ -56,12 +54,12 @@ public class MasterSlaveConnectionProvider<K, V> {
     private final Object stateLock = new Object();
     private ReadFrom readFrom;
 
-    MasterSlaveConnectionProvider(RedisClient redisClient, RedisCodec<K, V> redisCodec, RedisURI initialRedisUri,
+    MasterReplicaConnectionProvider(RedisClient redisClient, RedisCodec<K, V> redisCodec, RedisURI initialRedisUri,
             Map<RedisURI, StatefulRedisConnection<K, V>> initialConnections) {
 
         this.initialRedisUri = initialRedisUri;
 
-        Function<ConnectionKey, CompletionStage<StatefulRedisConnection<K, V>>> connectionFactory = new DefaultMasterSlaveNodeConnectionFactory(
+        Function<ConnectionKey, CompletionStage<StatefulRedisConnection<K, V>>> connectionFactory = new DefaultConnectionFactory(
                 redisClient, redisCodec);
 
         this.connectionProvider = new AsyncConnectionProvider<>(connectionFactory);
@@ -72,9 +70,8 @@ public class MasterSlaveConnectionProvider<K, V> {
     }
 
     /**
-     * Retrieve a {@link StatefulRedisConnection} by the intent.
-     * {@link io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent#WRITE} intentions use the master connection,
-     * {@link io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent#READ} intentions lookup one or more read
+     * Retrieve a {@link StatefulRedisConnection} by the intent. {@link MasterReplicaConnectionProvider.Intent#WRITE} intentions
+     * use the master connection, {@link MasterReplicaConnectionProvider.Intent#READ} intentions lookup one or more read
      * candidates using the {@link ReadFrom} setting.
      *
      * @param intent command intent
@@ -101,9 +98,8 @@ public StatefulRedisConnection<K, V> getConnection(Intent intent) {
     }
 
     /**
-     * Retrieve a {@link StatefulRedisConnection} by the intent.
-     * {@link io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent#WRITE} intentions use the master connection,
-     * {@link io.lettuce.core.masterslave.MasterSlaveConnectionProvider.Intent#READ} intentions lookup one or more read
+     * Retrieve a {@link StatefulRedisConnection} by the intent. {@link MasterReplicaConnectionProvider.Intent#WRITE} intentions
+     * use the master connection, {@link MasterReplicaConnectionProvider.Intent#READ} intentions lookup one or more read
      * candidates using the {@link ReadFrom} setting.
      *
      * @param intent command intent
@@ -186,7 +182,8 @@ private Set<ConnectionKey> getStaleConnectionKeys() {
 
         for (ConnectionKey connectionKey : map.keySet()) {
 
-            if (connectionKey.host != null && findNodeByHostAndPort(knownNodes, connectionKey.host, connectionKey.port) != null) {
+            if (connectionKey.host != null
+                    && findNodeByHostAndPort(knownNodes, connectionKey.host, connectionKey.port) != null) {
                 continue;
             }
             stale.add(connectionKey);
@@ -309,13 +306,12 @@ public RedisNodeDescription getMaster() {
         throw new RedisException(String.format("Master is currently unknown: %s", knownNodes));
     }
 
-    class DefaultMasterSlaveNodeConnectionFactory implements
-            Function<ConnectionKey, CompletionStage<StatefulRedisConnection<K, V>>> {
+    class DefaultConnectionFactory implements Function<ConnectionKey, CompletionStage<StatefulRedisConnection<K, V>>> {
 
         private final RedisClient redisClient;
         private final RedisCodec<K, V> redisCodec;
 
-        DefaultMasterSlaveNodeConnectionFactory(RedisClient redisClient, RedisCodec<K, V> redisCodec) {
+        DefaultConnectionFactory(RedisClient redisClient, RedisCodec<K, V> redisCodec) {
             this.redisClient = redisClient;
             this.redisCodec = redisCodec;
         }
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnector.java
similarity index 68%
rename from src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java
rename to src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnector.java
index 5e70190926..cb39a12ebb 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnector.java
+++ b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnector.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,24 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.concurrent.CompletableFuture;
 
 import io.lettuce.core.codec.RedisCodec;
 
 /**
- * Interface declaring an asynchronous connect method to connect a Master/Slave setup.
+ * Interface declaring an asynchronous connect method to connect a Master/Replica setup.
  *
  * @author Mark Paluch
  * @since 5.1
  */
-interface MasterSlaveConnector<K, V> {
+interface MasterReplicaConnector<K, V> {
 
     /**
-     * Asynchronously connect to a Master/Slave setup given {@link RedisCodec}.
+     * Asynchronously connect to a Master/Replica setup given {@link RedisCodec}.
      *
      * @return Future that is notified about the connection progress.
      */
-    CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsync();
+    CompletableFuture<StatefulRedisMasterReplicaConnection<K, V>> connectAsync();
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaTopologyProvider.java
similarity index 82%
rename from src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
rename to src/main/java/io/lettuce/core/masterreplica/MasterReplicaTopologyProvider.java
index 25d1687aa1..31898a0547 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaTopologyProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,37 +32,35 @@
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
- * Topology provider using Redis Standalone and the {@code INFO REPLICATION} output. Slaves are listed as {@code slaveN=...}
+ * Topology provider using Redis Standalone and the {@code INFO REPLICATION} output. Replicas are listed as {@code slaveN=...}
  * entries.
  *
  * @author Mark Paluch
  * @since 4.1
- * @deprecated will be moved to {@code masterreplica} package with version 6.
  */
-@Deprecated
-public class MasterSlaveTopologyProvider implements TopologyProvider {
+class MasterReplicaTopologyProvider implements TopologyProvider {
 
     public static final Pattern ROLE_PATTERN = Pattern.compile("^role\\:([a-z]+)$", Pattern.MULTILINE);
-    public static final Pattern SLAVE_PATTERN = Pattern
-            .compile("^slave(\\d+)\\:([a-zA-Z\\,\\=\\d\\.\\:]+)$", Pattern.MULTILINE);
+    public static final Pattern SLAVE_PATTERN = Pattern.compile("^slave(\\d+)\\:([a-zA-Z\\,\\=\\d\\.\\:]+)$",
+            Pattern.MULTILINE);
     public static final Pattern MASTER_HOST_PATTERN = Pattern.compile("^master_host\\:([a-zA-Z\\,\\=\\d\\.\\:\\-]+)$",
             Pattern.MULTILINE);
     public static final Pattern MASTER_PORT_PATTERN = Pattern.compile("^master_port\\:(\\d+)$", Pattern.MULTILINE);
     public static final Pattern IP_PATTERN = Pattern.compile("ip\\=([a-zA-Z\\d\\.\\:]+)");
     public static final Pattern PORT_PATTERN = Pattern.compile("port\\=([\\d]+)");
 
-    private static final InternalLogger logger = InternalLoggerFactory.getInstance(MasterSlaveTopologyProvider.class);
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(MasterReplicaTopologyProvider.class);
 
     private final StatefulRedisConnection<?, ?> connection;
     private final RedisURI redisURI;
 
     /**
-     * Creates a new {@link MasterSlaveTopologyProvider}.
+     * Creates a new {@link MasterReplicaTopologyProvider}.
      *
      * @param connection must not be {@literal null}
      * @param redisURI must not be {@literal null}
      */
-    public MasterSlaveTopologyProvider(StatefulRedisConnection<?, ?> connection, RedisURI redisURI) {
+    public MasterReplicaTopologyProvider(StatefulRedisConnection<?, ?> connection, RedisURI redisURI) {
 
         LettuceAssert.notNull(connection, "Redis Connection must not be null");
         LettuceAssert.notNull(redisURI, "RedisURI must not be null");
@@ -107,7 +105,7 @@ protected List<RedisNodeDescription> getNodesFromInfo(String info) {
         result.add(currentNodeDescription);
 
         if (currentNodeDescription.getRole() == RedisInstance.Role.MASTER) {
-            result.addAll(getSlavesFromInfo(info));
+            result.addAll(getReplicasFromInfo(info));
         } else {
             result.add(getMasterFromInfo(info));
         }
@@ -126,9 +124,9 @@ private RedisNodeDescription getCurrentNodeDescription(String info) {
         return getRedisNodeDescription(matcher);
     }
 
-    private List<RedisNodeDescription> getSlavesFromInfo(String info) {
+    private List<RedisNodeDescription> getReplicasFromInfo(String info) {
 
-        List<RedisNodeDescription> slaves = new ArrayList<>();
+        List<RedisNodeDescription> replicas = new ArrayList<>();
 
         Matcher matcher = SLAVE_PATTERN.matcher(info);
         while (matcher.find()) {
@@ -137,10 +135,10 @@ private List<RedisNodeDescription> getSlavesFromInfo(String info) {
             String ip = getNested(IP_PATTERN, group, 1);
             String port = getNested(PORT_PATTERN, group, 1);
 
-            slaves.add(new RedisMasterSlaveNode(ip, Integer.parseInt(port), redisURI, RedisInstance.Role.SLAVE));
+            replicas.add(new RedisMasterReplicaNode(ip, Integer.parseInt(port), redisURI, RedisInstance.Role.SLAVE));
         }
 
-        return slaves;
+        return replicas;
     }
 
     private RedisNodeDescription getMasterFromInfo(String info) {
@@ -158,7 +156,7 @@ private RedisNodeDescription getMasterFromInfo(String info) {
         String host = masterHostMatcher.group(1);
         int port = Integer.parseInt(masterPortMatcher.group(1));
 
-        return new RedisMasterSlaveNode(host, port, redisURI, RedisInstance.Role.MASTER);
+        return new RedisMasterReplicaNode(host, port, redisURI, RedisInstance.Role.MASTER);
     }
 
     private String getNested(Pattern pattern, String string, int group) {
@@ -190,7 +188,7 @@ private RedisNodeDescription getRedisNodeDescription(Matcher matcher) {
                     + RedisInstance.Role.SLAVE);
         }
 
-        return new RedisMasterSlaveNode(redisURI.getHost(), redisURI.getPort(), redisURI, role);
+        return new RedisMasterReplicaNode(redisURI.getHost(), redisURI.getPort(), redisURI, role);
     }
 
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaTopologyRefresh.java
similarity index 81%
rename from src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
rename to src/main/java/io/lettuce/core/masterreplica/MasterReplicaTopologyRefresh.java
index f9781faf2e..a0b6478f75 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaTopologyRefresh.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -33,24 +33,24 @@
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
- * Utility to refresh the Master-Slave topology view based on {@link RedisNodeDescription}.
+ * Utility to refresh the Master-Replica topology view based on {@link RedisNodeDescription}.
  *
  * @author Mark Paluch
  */
-class MasterSlaveTopologyRefresh {
+class MasterReplicaTopologyRefresh {
 
-    private static final InternalLogger logger = InternalLoggerFactory.getInstance(MasterSlaveTopologyRefresh.class);
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(MasterReplicaTopologyRefresh.class);
     private static final StringCodec CODEC = StringCodec.UTF8;
 
     private final NodeConnectionFactory nodeConnectionFactory;
     private final TopologyProvider topologyProvider;
     private ScheduledExecutorService eventExecutors;
 
-    MasterSlaveTopologyRefresh(RedisClient client, TopologyProvider topologyProvider) {
+    MasterReplicaTopologyRefresh(RedisClient client, TopologyProvider topologyProvider) {
         this(new RedisClientNodeConnectionFactory(client), client.getResources().eventExecutorGroup(), topologyProvider);
     }
 
-    MasterSlaveTopologyRefresh(NodeConnectionFactory nodeConnectionFactory, ScheduledExecutorService eventExecutors,
+    MasterReplicaTopologyRefresh(NodeConnectionFactory nodeConnectionFactory, ScheduledExecutorService eventExecutors,
             TopologyProvider topologyProvider) {
 
         this.nodeConnectionFactory = nodeConnectionFactory;
@@ -73,19 +73,17 @@ public Mono<List<RedisNodeDescription>> getNodes(RedisURI seed) {
             addPasswordIfNeeded(nodes, seed);
         });
 
-        return initialNodes
-                .map(this::getConnections)
+        return initialNodes.map(this::getConnections)
                 .flatMap(asyncConnections -> asyncConnections.asMono(seed.getTimeout(), eventExecutors))
-                .flatMap(
-                        connections -> {
+                .flatMap(connections -> {
 
-                            Requests requests = connections.requestPing();
+                    Requests requests = connections.requestPing();
 
-                            CompletionStage<List<RedisNodeDescription>> nodes = requests.getOrTimeout(seed.getTimeout(),
-                                    eventExecutors);
+                    CompletionStage<List<RedisNodeDescription>> nodes = requests.getOrTimeout(seed.getTimeout(),
+                            eventExecutors);
 
-                            return Mono.fromCompletionStage(nodes).flatMap(it -> ResumeAfter.close(connections).thenEmit(it));
-                        });
+                    return Mono.fromCompletionStage(nodes).flatMap(it -> ResumeAfter.close(connections).thenEmit(it));
+                });
     }
 
     /*
@@ -122,7 +120,7 @@ private AsyncConnections getConnections(Iterable<RedisNodeDescription> nodes) {
 
                         sync.completeExceptionally(new RedisConnectionException(message, throwable));
                     } else {
-                        connection.async().clientSetname("lettuce#MasterSlaveTopologyRefresh");
+                        connection.async().clientSetname("lettuce#MasterReplicaTopologyRefresh");
                         sync.complete(connection);
                     }
                 });
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaUtils.java
similarity index 95%
rename from src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
rename to src/main/java/io/lettuce/core/masterreplica/MasterReplicaUtils.java
index f3148981be..3eab3d4dc0 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlaveUtils.java
+++ b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaUtils.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.Collection;
 import java.util.Comparator;
@@ -24,7 +24,7 @@
 /**
  * @author Mark Paluch
  */
-class MasterSlaveUtils {
+class MasterReplicaUtils {
 
     /**
      * Check if properties changed.
@@ -124,5 +124,4 @@ public int compare(RedisURI o1, RedisURI o2) {
             return h1.compareToIgnoreCase(h2);
         }
     }
-
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java b/src/main/java/io/lettuce/core/masterreplica/NodeConnectionFactory.java
similarity index 82%
rename from src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
rename to src/main/java/io/lettuce/core/masterreplica/NodeConnectionFactory.java
index 9fd8531a32..dbccc07ee6 100644
--- a/src/main/java/io/lettuce/core/masterslave/NodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/masterreplica/NodeConnectionFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.net.SocketAddress;
 import java.util.concurrent.CompletableFuture;
@@ -27,10 +27,8 @@
  *
  * @author Mark Paluch
  * @since 4.4
- * @deprecated will be moved to {@code masterreplica} package with version 6.
  */
-@Deprecated
-public interface NodeConnectionFactory {
+interface NodeConnectionFactory {
 
     /**
      * Connects to a {@link SocketAddress} with the given {@link RedisCodec} asynchronously.
diff --git a/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/masterreplica/ReadOnlyCommands.java
similarity index 94%
rename from src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
rename to src/main/java/io/lettuce/core/masterreplica/ReadOnlyCommands.java
index 7e1f582535..380542cd93 100644
--- a/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
+++ b/src/main/java/io/lettuce/core/masterreplica/ReadOnlyCommands.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.Collections;
 import java.util.EnumSet;
diff --git a/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java b/src/main/java/io/lettuce/core/masterreplica/RedisClientNodeConnectionFactory.java
similarity index 89%
rename from src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java
rename to src/main/java/io/lettuce/core/masterreplica/RedisClientNodeConnectionFactory.java
index a567ebb2a0..fad4393e24 100644
--- a/src/main/java/io/lettuce/core/masterslave/RedisClientNodeConnectionFactory.java
+++ b/src/main/java/io/lettuce/core/masterreplica/RedisClientNodeConnectionFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.concurrent.CompletableFuture;
 
diff --git a/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java b/src/main/java/io/lettuce/core/masterreplica/RedisMasterReplicaNode.java
similarity index 74%
rename from src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
rename to src/main/java/io/lettuce/core/masterreplica/RedisMasterReplicaNode.java
index 22b90e68fb..f67725baa9 100644
--- a/src/main/java/io/lettuce/core/masterslave/RedisMasterSlaveNode.java
+++ b/src/main/java/io/lettuce/core/masterreplica/RedisMasterReplicaNode.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,31 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
- * A node within a Redis Master-Slave setup.
+ * A node within a Redis Master-Replica setup.
  *
  * @author Mark Paluch
  * @author Adam McElwee
  */
-class RedisMasterSlaveNode implements RedisNodeDescription {
+class RedisMasterReplicaNode implements RedisNodeDescription {
 
     private final RedisURI redisURI;
     private final Role role;
 
-    RedisMasterSlaveNode(String host, int port, RedisURI seed, Role role) {
+    RedisMasterReplicaNode(String host, int port, RedisURI seed, Role role) {
 
-        RedisURI.Builder builder = RedisURI.Builder
-                .redis(host, port)
-                .withSsl(seed.isSsl())
-                .withVerifyPeer(seed.isVerifyPeer())
+        RedisURI.Builder builder = RedisURI.Builder.redis(host, port).withSsl(seed.isSsl()).withVerifyPeer(seed.isVerifyPeer())
                 .withStartTls(seed.isStartTls());
         if (seed.getPassword() != null && seed.getPassword().length != 0) {
-            builder.withPassword(new String(seed.getPassword()));
+            builder.withPassword(seed.getPassword());
         }
 
         if (seed.getClientName() != null) {
@@ -64,10 +61,10 @@ public Role getRole() {
     public boolean equals(Object o) {
         if (this == o)
             return true;
-        if (!(o instanceof RedisMasterSlaveNode))
+        if (!(o instanceof RedisMasterReplicaNode))
             return false;
 
-        RedisMasterSlaveNode that = (RedisMasterSlaveNode) o;
+        RedisMasterReplicaNode that = (RedisMasterReplicaNode) o;
 
         if (!redisURI.equals(that.redisURI))
             return false;
diff --git a/src/main/java/io/lettuce/core/masterslave/Requests.java b/src/main/java/io/lettuce/core/masterreplica/Requests.java
similarity index 86%
rename from src/main/java/io/lettuce/core/masterslave/Requests.java
rename to src/main/java/io/lettuce/core/masterreplica/Requests.java
index 9ac1d86ebb..c29772e16a 100644
--- a/src/main/java/io/lettuce/core/masterslave/Requests.java
+++ b/src/main/java/io/lettuce/core/masterreplica/Requests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
-import static io.lettuce.core.masterslave.MasterSlaveUtils.findNodeByUri;
-import static io.lettuce.core.masterslave.TopologyComparators.LatencyComparator;
+import static io.lettuce.core.masterreplica.MasterReplicaUtils.findNodeByUri;
+import static io.lettuce.core.masterreplica.TopologyComparators.LatencyComparator;
 
 import java.util.*;
 
 import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.masterslave.TopologyComparators.SortAction;
+import io.lettuce.core.masterreplica.TopologyComparators.SortAction;
 import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
@@ -35,7 +35,7 @@ class Requests extends
         CompletableEventLatchSupport<Tuple2<RedisURI, TimedAsyncCommand<String, String, String>>, List<RedisNodeDescription>> {
 
     private final Map<RedisURI, TimedAsyncCommand<String, String, String>> rawViews = new TreeMap<>(
-            MasterSlaveUtils.RedisURIComparator.INSTANCE);
+            MasterReplicaUtils.RedisURIComparator.INSTANCE);
     private final List<RedisNodeDescription> nodes;
 
     public Requests(int expectedCount, List<RedisNodeDescription> nodes) {
diff --git a/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java b/src/main/java/io/lettuce/core/masterreplica/ResumeAfter.java
similarity index 94%
rename from src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
rename to src/main/java/io/lettuce/core/masterreplica/ResumeAfter.java
index 8ea5f75968..fa86d677d6 100644
--- a/src/main/java/io/lettuce/core/masterslave/ResumeAfter.java
+++ b/src/main/java/io/lettuce/core/masterreplica/ResumeAfter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java b/src/main/java/io/lettuce/core/masterreplica/SentinelConnector.java
similarity index 74%
rename from src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
rename to src/main/java/io/lettuce/core/masterreplica/SentinelConnector.java
index b6d5315aa8..f0b86f56d9 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelConnector.java
+++ b/src/main/java/io/lettuce/core/masterreplica/SentinelConnector.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.Collections;
 import java.util.List;
@@ -31,12 +31,12 @@
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
- * {@link MasterSlaveConnector} to connect a Sentinel-managed Master/Slave setup using a Sentinel {@link RedisURI}.
+ * {@link MasterReplicaConnector} to connect a Sentinel-managed Master/Replica setup using a Sentinel {@link RedisURI}.
  *
  * @author Mark Paluch
  * @since 5.1
  */
-class SentinelConnector<K, V> implements MasterSlaveConnector<K, V> {
+class SentinelConnector<K, V> implements MasterReplicaConnector<K, V> {
 
     private static final InternalLogger LOG = InternalLoggerFactory.getInstance(SentinelConnector.class);
 
@@ -51,14 +51,14 @@ class SentinelConnector<K, V> implements MasterSlaveConnector<K, V> {
     }
 
     @Override
-    public CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsync() {
+    public CompletableFuture<StatefulRedisMasterReplicaConnection<K, V>> connectAsync() {
 
         TopologyProvider topologyProvider = new SentinelTopologyProvider(redisURI.getSentinelMasterId(), redisClient, redisURI);
         SentinelTopologyRefresh sentinelTopologyRefresh = new SentinelTopologyRefresh(redisClient,
                 redisURI.getSentinelMasterId(), redisURI.getSentinels());
 
-        MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(redisClient, topologyProvider);
-        MasterSlaveConnectionProvider<K, V> connectionProvider = new MasterSlaveConnectionProvider<>(redisClient, codec,
+        MasterReplicaTopologyRefresh refresh = new MasterReplicaTopologyRefresh(redisClient, topologyProvider);
+        MasterReplicaConnectionProvider<K, V> connectionProvider = new MasterReplicaConnectionProvider<>(redisClient, codec,
                 redisURI, Collections.emptyMap());
 
         Runnable runnable = getTopologyRefreshRunnable(refresh, connectionProvider);
@@ -73,13 +73,14 @@ public CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsync(
         }).onErrorMap(ExecutionException.class, Throwable::getCause).toFuture();
     }
 
-    private Mono<StatefulRedisMasterSlaveConnection<K, V>> initializeConnection(RedisCodec<K, V> codec,
-            SentinelTopologyRefresh sentinelTopologyRefresh, MasterSlaveConnectionProvider<K, V> connectionProvider,
+    private Mono<StatefulRedisMasterReplicaConnection<K, V>> initializeConnection(RedisCodec<K, V> codec,
+            SentinelTopologyRefresh sentinelTopologyRefresh, MasterReplicaConnectionProvider<K, V> connectionProvider,
             Runnable runnable, List<RedisNodeDescription> nodes) {
 
         connectionProvider.setKnownNodes(nodes);
 
-        MasterSlaveChannelWriter channelWriter = new MasterSlaveChannelWriter(connectionProvider, redisClient.getResources()) {
+        MasterReplicaChannelWriter channelWriter = new MasterReplicaChannelWriter(connectionProvider,
+                redisClient.getResources()) {
 
             @Override
             public CompletableFuture<Void> closeAsync() {
@@ -87,8 +88,8 @@ public CompletableFuture<Void> closeAsync() {
             }
         };
 
-        StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(channelWriter,
-                codec, redisURI.getTimeout());
+        StatefulRedisMasterReplicaConnectionImpl<K, V> connection = new StatefulRedisMasterReplicaConnectionImpl<>(
+                channelWriter, codec, redisURI.getTimeout());
         connection.setOptions(redisClient.getOptions());
 
         CompletionStage<Void> bind = sentinelTopologyRefresh.bind(runnable);
@@ -98,8 +99,8 @@ public CompletableFuture<Void> closeAsync() {
         }).then(Mono.just(connection));
     }
 
-    private Runnable getTopologyRefreshRunnable(MasterSlaveTopologyRefresh refresh,
-            MasterSlaveConnectionProvider<K, V> connectionProvider) {
+    private Runnable getTopologyRefreshRunnable(MasterReplicaTopologyRefresh refresh,
+            MasterReplicaConnectionProvider<K, V> connectionProvider) {
 
         return () -> {
             try {
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java b/src/main/java/io/lettuce/core/masterreplica/SentinelTopologyProvider.java
similarity index 90%
rename from src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
rename to src/main/java/io/lettuce/core/masterreplica/SentinelTopologyProvider.java
index 8204cc431c..19b8aed063 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterreplica/SentinelTopologyProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -23,11 +23,11 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import io.lettuce.core.codec.StringCodec;
 import reactor.core.publisher.Mono;
 import reactor.util.function.Tuple2;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
@@ -41,10 +41,8 @@
  *
  * @author Mark Paluch
  * @since 4.1
- * @deprecated will be moved to {@code masterreplica} package with version 6.
  */
-@Deprecated
-public class SentinelTopologyProvider implements TopologyProvider {
+class SentinelTopologyProvider implements TopologyProvider {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(SentinelTopologyProvider.class);
 
@@ -99,12 +97,12 @@ protected Mono<List<RedisNodeDescription>> getNodes(StatefulRedisSentinelConnect
 
         RedisSentinelReactiveCommands<String, String> reactive = connection.reactive();
 
-        Mono<Tuple2<Map<String, String>, List<Map<String, String>>>> masterAndSlaves = reactive.master(masterId)
+        Mono<Tuple2<Map<String, String>, List<Map<String, String>>>> masterAndReplicas = reactive.master(masterId)
                 .zipWith(reactive.slaves(masterId).collectList()).timeout(this.timeout).flatMap(tuple -> {
                     return ResumeAfter.close(connection).thenEmit(tuple);
                 }).doOnError(e -> connection.closeAsync());
 
-        return masterAndSlaves.map(tuple -> {
+        return masterAndReplicas.map(tuple -> {
 
             List<RedisNodeDescription> result = new ArrayList<>();
 
@@ -131,7 +129,7 @@ private RedisNodeDescription toNode(Map<String, String> map, RedisInstance.Role
 
         String ip = map.get("ip");
         String port = map.get("port");
-        return new RedisMasterSlaveNode(ip, Integer.parseInt(port), sentinelUri, role);
+        return new RedisMasterReplicaNode(ip, Integer.parseInt(port), sentinelUri, role);
     }
 
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java b/src/main/java/io/lettuce/core/masterreplica/SentinelTopologyRefresh.java
similarity index 98%
rename from src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
rename to src/main/java/io/lettuce/core/masterreplica/SentinelTopologyRefresh.java
index 5c429f3ddb..d87ec75e5f 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/masterreplica/SentinelTopologyRefresh.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.io.Closeable;
 import java.nio.charset.StandardCharsets;
@@ -40,7 +40,7 @@
 
 /**
  * Sentinel Pub/Sub listener-enabled topology refresh. This refresh triggers topology updates if Redis topology changes
- * (monitored master/slaves) or the Sentinel availability changes.
+ * (monitored master/replicas) or the Sentinel availability changes.
  *
  * @author Mark Paluch
  * @since 4.2
diff --git a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java b/src/main/java/io/lettuce/core/masterreplica/SentinelTopologyRefreshConnections.java
similarity index 93%
rename from src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java
rename to src/main/java/io/lettuce/core/masterreplica/SentinelTopologyRefreshConnections.java
index 22593808ba..8236957459 100644
--- a/src/main/java/io/lettuce/core/masterslave/SentinelTopologyRefreshConnections.java
+++ b/src/main/java/io/lettuce/core/masterreplica/SentinelTopologyRefreshConnections.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
diff --git a/src/main/java/io/lettuce/core/masterreplica/StatefulRedisMasterReplicaConnection.java b/src/main/java/io/lettuce/core/masterreplica/StatefulRedisMasterReplicaConnection.java
index 7e33772517..0e2d817126 100644
--- a/src/main/java/io/lettuce/core/masterreplica/StatefulRedisMasterReplicaConnection.java
+++ b/src/main/java/io/lettuce/core/masterreplica/StatefulRedisMasterReplicaConnection.java
@@ -16,17 +16,17 @@
 package io.lettuce.core.masterreplica;
 
 import io.lettuce.core.ReadFrom;
-import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
 
 /**
- * Redis Master-Replica connection. The connection allows slave reads by setting {@link ReadFrom}.
+ * Redis Master-Replica connection. The connection allows replica reads by setting {@link ReadFrom}.
  *
  * @param <K> Key type.
  * @param <V> Value type.
  * @author Mark Paluch
  * @since 4.1
  */
-public interface StatefulRedisMasterReplicaConnection<K, V> extends StatefulRedisMasterSlaveConnection<K, V> {
+public interface StatefulRedisMasterReplicaConnection<K, V> extends StatefulRedisConnection<K, V> {
 
     /**
      * Set from which nodes data is read. The setting is used as default for read operations on this connection. See the
diff --git a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java b/src/main/java/io/lettuce/core/masterreplica/StatefulRedisMasterReplicaConnectionImpl.java
similarity index 68%
rename from src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
rename to src/main/java/io/lettuce/core/masterreplica/StatefulRedisMasterReplicaConnectionImpl.java
index 0e7692a05a..256ddfd77a 100644
--- a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/masterreplica/StatefulRedisMasterReplicaConnectionImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.time.Duration;
 
@@ -24,8 +24,8 @@
 /**
  * @author Mark Paluch
  */
-class StatefulRedisMasterSlaveConnectionImpl<K, V> extends StatefulRedisConnectionImpl<K, V> implements
-        StatefulRedisMasterSlaveConnection<K, V> {
+class StatefulRedisMasterReplicaConnectionImpl<K, V> extends StatefulRedisConnectionImpl<K, V>
+        implements StatefulRedisMasterReplicaConnection<K, V> {
 
     /**
      * Initialize a new connection.
@@ -34,8 +34,7 @@ class StatefulRedisMasterSlaveConnectionImpl<K, V> extends StatefulRedisConnecti
      * @param codec Codec used to encode/decode keys and values.
      * @param timeout Maximum time to wait for a response.
      */
-    StatefulRedisMasterSlaveConnectionImpl(MasterSlaveChannelWriter writer, RedisCodec<K, V> codec,
-            Duration timeout) {
+    StatefulRedisMasterReplicaConnectionImpl(MasterReplicaChannelWriter writer, RedisCodec<K, V> codec, Duration timeout) {
         super(writer, codec, timeout);
     }
 
@@ -50,7 +49,7 @@ public ReadFrom getReadFrom() {
     }
 
     @Override
-    public MasterSlaveChannelWriter getChannelWriter() {
-        return (MasterSlaveChannelWriter) super.getChannelWriter();
+    public MasterReplicaChannelWriter getChannelWriter() {
+        return (MasterReplicaChannelWriter) super.getChannelWriter();
     }
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java b/src/main/java/io/lettuce/core/masterreplica/StaticMasterReplicaConnector.java
similarity index 58%
rename from src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java
rename to src/main/java/io/lettuce/core/masterreplica/StaticMasterReplicaConnector.java
index 13aa8afbcd..f288980c9d 100644
--- a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveConnector.java
+++ b/src/main/java/io/lettuce/core/masterreplica/StaticMasterReplicaConnector.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.HashMap;
 import java.util.List;
@@ -30,35 +30,35 @@
 import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
- * {@link MasterSlaveConnector} to connect to a static declared Master/Slave setup providing a fixed array of {@link RedisURI}.
- * This connector determines roles and remains using only the provided endpoints.
+ * {@link MasterReplicaConnector} to connect to a static declared Master/Replica setup providing a fixed array of
+ * {@link RedisURI}. This connector determines roles and remains using only the provided endpoints.
  *
  * @author Mark Paluch
  * @since 5.1
  */
-class StaticMasterSlaveConnector<K, V> implements MasterSlaveConnector<K, V> {
+class StaticMasterReplicaConnector<K, V> implements MasterReplicaConnector<K, V> {
 
     private final RedisClient redisClient;
     private final RedisCodec<K, V> codec;
     private final Iterable<RedisURI> redisURIs;
 
-    StaticMasterSlaveConnector(RedisClient redisClient, RedisCodec<K, V> codec, Iterable<RedisURI> redisURIs) {
+    StaticMasterReplicaConnector(RedisClient redisClient, RedisCodec<K, V> codec, Iterable<RedisURI> redisURIs) {
         this.redisClient = redisClient;
         this.codec = codec;
         this.redisURIs = redisURIs;
     }
 
     @Override
-    public CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsync() {
+    public CompletableFuture<StatefulRedisMasterReplicaConnection<K, V>> connectAsync() {
 
         Map<RedisURI, StatefulRedisConnection<K, V>> initialConnections = new HashMap<>();
 
-        TopologyProvider topologyProvider = new StaticMasterSlaveTopologyProvider(redisClient, redisURIs);
+        TopologyProvider topologyProvider = new StaticMasterReplicaTopologyProvider(redisClient, redisURIs);
 
         RedisURI seedNode = redisURIs.iterator().next();
 
-        MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(redisClient, topologyProvider);
-        MasterSlaveConnectionProvider<K, V> connectionProvider = new MasterSlaveConnectionProvider<>(redisClient, codec,
+        MasterReplicaTopologyRefresh refresh = new MasterReplicaTopologyRefresh(redisClient, topologyProvider);
+        MasterReplicaConnectionProvider<K, V> connectionProvider = new MasterReplicaConnectionProvider<>(redisClient, codec,
                 seedNode, initialConnections);
 
         return refresh.getNodes(seedNode).flatMap(nodes -> {
@@ -71,14 +71,16 @@ public CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsync(
         }).onErrorMap(ExecutionException.class, Throwable::getCause).toFuture();
     }
 
-    private Mono<StatefulRedisMasterSlaveConnection<K, V>> initializeConnection(RedisCodec<K, V> codec, RedisURI seedNode,
-            MasterSlaveConnectionProvider<K, V> connectionProvider, List<RedisNodeDescription> nodes) {
+    private Mono<StatefulRedisMasterReplicaConnection<K, V>> initializeConnection(RedisCodec<K, V> codec, RedisURI seedNode,
+            MasterReplicaConnectionProvider<K, V> connectionProvider, List<RedisNodeDescription> nodes) {
 
         connectionProvider.setKnownNodes(nodes);
 
-        MasterSlaveChannelWriter channelWriter = new MasterSlaveChannelWriter(connectionProvider, redisClient.getResources());
+        MasterReplicaChannelWriter channelWriter = new MasterReplicaChannelWriter(connectionProvider,
+                redisClient.getResources());
 
-        StatefulRedisMasterSlaveConnectionImpl<K, V> connection = new StatefulRedisMasterSlaveConnectionImpl<>(channelWriter,
+        StatefulRedisMasterReplicaConnectionImpl<K, V> connection = new StatefulRedisMasterReplicaConnectionImpl<>(
+                channelWriter,
                 codec, seedNode.getTimeout());
         connection.setOptions(redisClient.getOptions());
 
diff --git a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java b/src/main/java/io/lettuce/core/masterreplica/StaticMasterReplicaTopologyProvider.java
similarity index 75%
rename from src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
rename to src/main/java/io/lettuce/core/masterreplica/StaticMasterReplicaTopologyProvider.java
index 83401577f7..68a73d4759 100644
--- a/src/main/java/io/lettuce/core/masterslave/StaticMasterSlaveTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterreplica/StaticMasterReplicaTopologyProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -40,17 +40,15 @@
  *
  * @author Mark Paluch
  * @author Adam McElwee
- * @deprecated will be moved to {@code masterreplica} package with version 6.
  */
-@Deprecated
-public class StaticMasterSlaveTopologyProvider implements TopologyProvider {
+class StaticMasterReplicaTopologyProvider implements TopologyProvider {
 
-    private static final InternalLogger logger = InternalLoggerFactory.getInstance(StaticMasterSlaveTopologyProvider.class);
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(StaticMasterReplicaTopologyProvider.class);
 
     private final RedisClient redisClient;
     private final Iterable<RedisURI> redisURIs;
 
-    public StaticMasterSlaveTopologyProvider(RedisClient redisClient, Iterable<RedisURI> redisURIs) {
+    public StaticMasterReplicaTopologyProvider(RedisClient redisClient, Iterable<RedisURI> redisURIs) {
 
         LettuceAssert.notNull(redisClient, "RedisClient must not be null");
         LettuceAssert.notNull(redisURIs, "RedisURIs must not be null");
@@ -79,19 +77,16 @@ public CompletableFuture<List<RedisNodeDescription>> getNodesAsync() {
         List<StatefulRedisConnection<String, String>> connections = new CopyOnWriteArrayList<>();
 
         Flux<RedisURI> uris = Flux.fromIterable(redisURIs);
-        Mono<List<RedisNodeDescription>> nodes = uris
-                .flatMap(uri -> getNodeDescription(connections, uri))
-                .collectList()
-                .flatMap(
-                        (nodeDescriptions) -> {
+        Mono<List<RedisNodeDescription>> nodes = uris.flatMap(uri -> getNodeDescription(connections, uri)).collectList()
+                .flatMap((nodeDescriptions) -> {
 
-                            if (nodeDescriptions.isEmpty()) {
-                                return Mono.error(new RedisConnectionException(String.format(
-                                        "Failed to connect to at least one node in %s", redisURIs)));
-                            }
+                    if (nodeDescriptions.isEmpty()) {
+                        return Mono.error(new RedisConnectionException(
+                                String.format("Failed to connect to at least one node in %s", redisURIs)));
+                    }
 
-                            return Mono.just(nodeDescriptions);
-                        });
+                    return Mono.just(nodeDescriptions);
+                });
 
         return nodes.toFuture();
     }
@@ -120,6 +115,6 @@ private static Mono<RedisNodeDescription> getNodeDescription(RedisURI uri,
             StatefulRedisConnection<String, String> connection) {
 
         return connection.reactive().role().collectList().map(RoleParser::parse)
-                .map(it -> new RedisMasterSlaveNode(uri.getHost(), uri.getPort(), uri, it.getRole()));
+                .map(it -> new RedisMasterReplicaNode(uri.getHost(), uri.getPort(), uri, it.getRole()));
     }
 }
diff --git a/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java b/src/main/java/io/lettuce/core/masterreplica/TimedAsyncCommand.java
similarity index 91%
rename from src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java
rename to src/main/java/io/lettuce/core/masterreplica/TimedAsyncCommand.java
index 40d6cd475e..1e81136536 100644
--- a/src/main/java/io/lettuce/core/masterslave/TimedAsyncCommand.java
+++ b/src/main/java/io/lettuce/core/masterreplica/TimedAsyncCommand.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.protocol.RedisCommand;
diff --git a/src/main/java/io/lettuce/core/masterslave/Timeout.java b/src/main/java/io/lettuce/core/masterreplica/Timeout.java
similarity index 88%
rename from src/main/java/io/lettuce/core/masterslave/Timeout.java
rename to src/main/java/io/lettuce/core/masterreplica/Timeout.java
index bf8841ff6e..ab2c42cab4 100644
--- a/src/main/java/io/lettuce/core/masterslave/Timeout.java
+++ b/src/main/java/io/lettuce/core/masterreplica/Timeout.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java b/src/main/java/io/lettuce/core/masterreplica/TopologyComparators.java
similarity index 95%
rename from src/main/java/io/lettuce/core/masterslave/TopologyComparators.java
rename to src/main/java/io/lettuce/core/masterreplica/TopologyComparators.java
index b95e915ac3..19c0db344e 100644
--- a/src/main/java/io/lettuce/core/masterslave/TopologyComparators.java
+++ b/src/main/java/io/lettuce/core/masterreplica/TopologyComparators.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java b/src/main/java/io/lettuce/core/masterreplica/TopologyProvider.java
similarity index 75%
rename from src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
rename to src/main/java/io/lettuce/core/masterreplica/TopologyProvider.java
index a51aa5fda2..952f9259dc 100644
--- a/src/main/java/io/lettuce/core/masterslave/TopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterreplica/TopologyProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -22,16 +22,14 @@
 import io.lettuce.core.models.role.RedisNodeDescription;
 
 /**
- * Topology provider for Master-Slave topology discovery during runtime. Implementors of this interface return an unordered list
- * of {@link RedisNodeDescription} instances.
+ * Topology provider for Master-Replica topology discovery during runtime. Implementors of this interface return an unordered
+ * list of {@link RedisNodeDescription} instances.
  *
  * @author Mark Paluch
  * @since 4.1
- * @deprecated will be moved to {@code masterreplica} package with version 6.
  */
 @FunctionalInterface
-@Deprecated
-public interface TopologyProvider {
+interface TopologyProvider {
 
     /**
      * Lookup nodes within the topology.
diff --git a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
index a993249805..3055c57920 100644
--- a/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlave.java
@@ -15,21 +15,13 @@
  */
 package io.lettuce.core.masterslave;
 
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ExecutionException;
 
-import io.lettuce.core.ConnectionFuture;
 import io.lettuce.core.RedisClient;
-import io.lettuce.core.RedisConnectionException;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.codec.RedisCodec;
-import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.internal.LettuceLists;
-import io.netty.util.internal.logging.InternalLogger;
-import io.netty.util.internal.logging.InternalLoggerFactory;
+import io.lettuce.core.masterreplica.MasterReplica;
 
 /**
  * Master-Slave connection API.
@@ -58,17 +50,17 @@
  * Master-Slave topologies are either static or semi-static. Redis Standalone instances with attached slaves provide no
  * failover/HA mechanism. Redis Sentinel managed instances are controlled by Redis Sentinel and allow failover (which include
  * master promotion). The {@link MasterSlave} API supports both mechanisms. The topology is provided by a
- * {@link TopologyProvider}:
+ * {@code TopologyProvider}:
  *
  * <ul>
- * <li>{@link MasterSlaveTopologyProvider}: Dynamic topology lookup using the {@code INFO REPLICATION} output. Slaves are listed
- * as {@code slaveN=...} entries. The initial connection can either point to a master or a replica and the topology provider
- * will discover nodes. The connection needs to be re-established outside of lettuce in a case of Master/Slave failover or
- * topology changes.</li>
- * <li>{@link StaticMasterSlaveTopologyProvider}: Topology is defined by the list of {@link RedisURI URIs} and the {@code ROLE}
- * output. MasterSlave uses only the supplied nodes and won't discover additional nodes in the setup. The connection needs to be
- * re-established outside of lettuce in a case of Master/Slave failover or topology changes.</li>
- * <li>{@link SentinelTopologyProvider}: Dynamic topology lookup using the Redis Sentinel API. In particular,
+ * <li>{@code MasterReplicaTopologyProvider}: Dynamic topology lookup using the {@code INFO REPLICATION} output. Slaves are
+ * listed as {@code slaveN=...} entries. The initial connection can either point to a master or a replica and the topology
+ * provider will discover nodes. The connection needs to be re-established outside of lettuce in a case of Master/Slave failover
+ * or topology changes.</li>
+ * <li>{@code StaticMasterReplicaTopologyProvider}: Topology is defined by the list of {@link RedisURI URIs} and the
+ * {@code ROLE} output. MasterSlave uses only the supplied nodes and won't discover additional nodes in the setup. The
+ * connection needs to be re-established outside of lettuce in a case of Master/Slave failover or topology changes.</li>
+ * <li>{@code SentinelTopologyProvider}: Dynamic topology lookup using the Redis Sentinel API. In particular,
  * {@code SENTINEL MASTER} and {@code SENTINEL SLAVES} output. Master/Slave failover is handled by lettuce.</li>
  * </ul>
  *
@@ -117,7 +109,7 @@ public static <K, V> StatefulRedisMasterSlaveConnection<K, V> connect(RedisClien
         LettuceAssert.notNull(codec, "RedisCodec must not be null");
         LettuceAssert.notNull(redisURI, "RedisURI must not be null");
 
-        return getConnection(connectAsyncSentinelOrAutodiscovery(redisClient, codec, redisURI), redisURI);
+        return new MasterSlaveConnectionWrapper<>(MasterReplica.connect(redisClient, codec, redisURI));
     }
 
     /**
@@ -138,21 +130,7 @@ public static <K, V> StatefulRedisMasterSlaveConnection<K, V> connect(RedisClien
      */
     public static <K, V> CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsync(RedisClient redisClient,
             RedisCodec<K, V> codec, RedisURI redisURI) {
-        return transformAsyncConnectionException(connectAsyncSentinelOrAutodiscovery(redisClient, codec, redisURI), redisURI);
-    }
-
-    private static <K, V> CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsyncSentinelOrAutodiscovery(
-            RedisClient redisClient, RedisCodec<K, V> codec, RedisURI redisURI) {
-
-        LettuceAssert.notNull(redisClient, "RedisClient must not be null");
-        LettuceAssert.notNull(codec, "RedisCodec must not be null");
-        LettuceAssert.notNull(redisURI, "RedisURI must not be null");
-
-        if (isSentinel(redisURI)) {
-            return new SentinelConnector<>(redisClient, codec, redisURI).connectAsync();
-        }
-
-        return new AutodiscoveryConnector<>(redisClient, codec, redisURI).connectAsync();
+        return MasterReplica.connectAsync(redisClient, codec, redisURI).thenApply(MasterSlaveConnectionWrapper::new);
     }
 
     /**
@@ -178,7 +156,7 @@ private static <K, V> CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>
      */
     public static <K, V> StatefulRedisMasterSlaveConnection<K, V> connect(RedisClient redisClient, RedisCodec<K, V> codec,
             Iterable<RedisURI> redisURIs) {
-        return getConnection(connectAsyncSentinelOrStaticSetup(redisClient, codec, redisURIs), redisURIs);
+        return new MasterSlaveConnectionWrapper<>(MasterReplica.connect(redisClient, codec, redisURIs));
     }
 
     /**
@@ -204,87 +182,6 @@ public static <K, V> StatefulRedisMasterSlaveConnection<K, V> connect(RedisClien
      */
     public static <K, V> CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsync(RedisClient redisClient,
             RedisCodec<K, V> codec, Iterable<RedisURI> redisURIs) {
-        return transformAsyncConnectionException(connectAsyncSentinelOrStaticSetup(redisClient, codec, redisURIs), redisURIs);
-    }
-
-    private static <K, V> CompletableFuture<StatefulRedisMasterSlaveConnection<K, V>> connectAsyncSentinelOrStaticSetup(
-            RedisClient redisClient, RedisCodec<K, V> codec, Iterable<RedisURI> redisURIs) {
-
-        LettuceAssert.notNull(redisClient, "RedisClient must not be null");
-        LettuceAssert.notNull(codec, "RedisCodec must not be null");
-        LettuceAssert.notNull(redisURIs, "RedisURIs must not be null");
-
-        List<RedisURI> uriList = LettuceLists.newList(redisURIs);
-        LettuceAssert.isTrue(!uriList.isEmpty(), "RedisURIs must not be empty");
-
-        RedisURI first = uriList.get(0);
-        if (isSentinel(first)) {
-
-            if (uriList.size() > 1) {
-                InternalLogger logger = InternalLoggerFactory.getInstance(MasterSlave.class);
-                logger.warn(
-                        "RedisURIs contains multiple endpoints of which the first is configured for Sentinel usage. Using only the first URI [{}] without considering the remaining URIs. Make sure to include all Sentinel endpoints in a single RedisURI.",
-                        first);
-            }
-            return new SentinelConnector<>(redisClient, codec, first).connectAsync();
-        }
-
-        return new StaticMasterSlaveConnector<>(redisClient, codec, uriList).connectAsync();
-    }
-
-    private static boolean isSentinel(RedisURI redisURI) {
-        return !redisURI.getSentinels().isEmpty();
-    }
-
-    /**
-     * Retrieve the connection from {@link ConnectionFuture}. Performs a blocking {@link ConnectionFuture#get()} to synchronize
-     * the channel/connection initialization. Any exception is rethrown as {@link RedisConnectionException}.
-     *
-     * @param connectionFuture must not be null.
-     * @param context context information (single RedisURI, multiple URIs), used as connection target in the reported exception.
-     * @param <T> Connection type.
-     * @return the connection.
-     * @throws RedisConnectionException in case of connection failures.
-     */
-    private static <T> T getConnection(CompletableFuture<T> connectionFuture, Object context) {
-
-        try {
-            return connectionFuture.get();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw RedisConnectionException.create(context.toString(), e);
-        } catch (Exception e) {
-
-            if (e instanceof ExecutionException) {
-
-                // filter intermediate RedisConnectionException exceptions that bloat the stack trace
-                if (e.getCause() instanceof RedisConnectionException
-                        && e.getCause().getCause() instanceof RedisConnectionException) {
-                    throw RedisConnectionException.create(context.toString(), e.getCause().getCause());
-                }
-
-                throw RedisConnectionException.create(context.toString(), e.getCause());
-            }
-
-            throw RedisConnectionException.create(context.toString(), e);
-        }
-    }
-
-    private static <T> CompletableFuture<T> transformAsyncConnectionException(CompletionStage<T> future, Object context) {
-
-        return ConnectionFuture.from(null, future.toCompletableFuture()).thenCompose((v, e) -> {
-
-            if (e != null) {
-
-                // filter intermediate RedisConnectionException exceptions that bloat the stack trace
-                if (e.getCause() instanceof RedisConnectionException
-                        && e.getCause().getCause() instanceof RedisConnectionException) {
-                    return Futures.failed(RedisConnectionException.create(context.toString(), e.getCause()));
-                }
-                return Futures.failed(RedisConnectionException.create(context.toString(), e));
-            }
-
-            return CompletableFuture.completedFuture(v);
-        }).toCompletableFuture();
+        return MasterReplica.connectAsync(redisClient, codec, redisURIs).thenApply(MasterSlaveConnectionWrapper::new);
     }
 }
diff --git a/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionWrapper.java b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionWrapper.java
similarity index 88%
rename from src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionWrapper.java
rename to src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionWrapper.java
index 1f18fb08ec..afcd3c5388 100644
--- a/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionWrapper.java
+++ b/src/main/java/io/lettuce/core/masterslave/MasterSlaveConnectionWrapper.java
@@ -13,19 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterreplica;
+package io.lettuce.core.masterslave;
 
 import java.time.Duration;
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
 
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.ReadFrom;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.api.reactive.RedisReactiveCommands;
 import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection;
+import io.lettuce.core.masterreplica.StatefulRedisMasterReplicaConnection;
 import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.resource.ClientResources;
 
@@ -35,11 +34,11 @@
  * @author Mark Paluch
  * @since 5.2
  */
-class MasterReplicaConnectionWrapper<K, V> implements StatefulRedisMasterReplicaConnection<K, V> {
+class MasterSlaveConnectionWrapper<K, V> implements StatefulRedisMasterSlaveConnection<K, V> {
 
-    private final StatefulRedisMasterSlaveConnection<K, V> delegate;
+    private final StatefulRedisMasterReplicaConnection<K, V> delegate;
 
-    public MasterReplicaConnectionWrapper(StatefulRedisMasterSlaveConnection<K, V> delegate) {
+    public MasterSlaveConnectionWrapper(StatefulRedisMasterReplicaConnection<K, V> delegate) {
         this.delegate = delegate;
     }
 
diff --git a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
index ab590a933e..5c430c4c8c 100644
--- a/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
+++ b/src/main/java/io/lettuce/core/masterslave/StatefulRedisMasterSlaveConnection.java
@@ -16,7 +16,7 @@
 package io.lettuce.core.masterslave;
 
 import io.lettuce.core.ReadFrom;
-import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.masterreplica.StatefulRedisMasterReplicaConnection;
 
 /**
  * Redis Master-Slave connection. The connection allows slave reads by setting {@link ReadFrom}.
@@ -29,7 +29,7 @@
  *             {@link io.lettuce.core.masterreplica.StatefulRedisMasterReplicaConnection}.
  */
 @Deprecated
-public interface StatefulRedisMasterSlaveConnection<K, V> extends StatefulRedisConnection<K, V> {
+public interface StatefulRedisMasterSlaveConnection<K, V> extends StatefulRedisMasterReplicaConnection<K, V> {
 
     /**
      * Set from which nodes data is read. The setting is used as default for read operations on this connection. See the
diff --git a/src/test/java/io/lettuce/core/masterslave/ConnectionsUnitTests.java b/src/test/java/io/lettuce/core/masterreplica/ConnectionsUnitTests.java
similarity index 90%
rename from src/test/java/io/lettuce/core/masterslave/ConnectionsUnitTests.java
rename to src/test/java/io/lettuce/core/masterreplica/ConnectionsUnitTests.java
index 17561c096c..e257c55d75 100644
--- a/src/test/java/io/lettuce/core/masterslave/ConnectionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterreplica/ConnectionsUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2018-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
@@ -30,6 +30,7 @@
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
 
+import io.lettuce.core.masterreplica.Connections;
 import reactor.util.function.Tuples;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
diff --git a/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java b/src/test/java/io/lettuce/core/masterreplica/CustomCommandIntegrationTests.java
similarity index 93%
rename from src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
rename to src/test/java/io/lettuce/core/masterreplica/CustomCommandIntegrationTests.java
index b5ab7eb069..0563efd7c1 100644
--- a/src/test/java/io/lettuce/core/masterslave/CustomCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterreplica/CustomCommandIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -33,6 +33,7 @@
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.masterslave.MasterSlave;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.*;
 import io.lettuce.test.LettuceExtension;
@@ -59,7 +60,7 @@ class CustomCommandIntegrationTests extends TestSupport {
     void before() {
 
         RedisURI uri = RedisURI.create("redis-sentinel://127.0.0.1:26379?sentinelMasterId=mymaster&timeout=5s");
-        connection = MasterSlave.connect(redisClient, StringCodec.UTF8, uri);
+        connection = MasterReplica.connect(redisClient, StringCodec.UTF8, uri);
         redis = connection.sync();
         redis.flushall();
     }
@@ -108,7 +109,7 @@ void dispatchTransactions() {
     }
 
     @Test
-    void masterSlaveAsyncPing() {
+    void masterReplicaAsyncPing() {
 
         RedisCommand<String, String, String> command = new Command<>(MyCommands.PING, new StatusOutput<>(StringCodec.UTF8),
                 null);
@@ -120,7 +121,7 @@ void masterSlaveAsyncPing() {
     }
 
     @Test
-    void masterSlaveAsyncBatchPing() {
+    void masterReplicaAsyncBatchPing() {
 
         RedisCommand<String, String, String> command1 = new Command<>(CommandType.SET, new StatusOutput<>(StringCodec.UTF8),
                 new CommandArgs<>(StringCodec.UTF8).addKey("key1").addValue("value"));
@@ -142,7 +143,7 @@ void masterSlaveAsyncBatchPing() {
     }
 
     @Test
-    void masterSlaveFireAndForget() {
+    void masterReplicaFireAndForget() {
 
         RedisCommand<String, String, String> command = new Command<>(MyCommands.PING, new StatusOutput<>(StringCodec.UTF8),
                 null);
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterUnitTests.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaChannelWriterUnitTests.java
similarity index 54%
rename from src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterUnitTests.java
rename to src/test/java/io/lettuce/core/masterreplica/MasterReplicaChannelWriterUnitTests.java
index 3824ba8df1..dc20eea32c 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveChannelWriterUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaChannelWriterUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -46,10 +46,10 @@
  */
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
-class MasterSlaveChannelWriterUnitTests {
+class MasterReplicaChannelWriterUnitTests {
 
     @Mock
-    private MasterSlaveConnectionProvider<String, String> connectionProvider;
+    private MasterReplicaConnectionProvider<String, String> connectionProvider;
 
     @Mock
     private ClientResources clientResources;
@@ -63,18 +63,18 @@ void shouldReturnIntentForWriteCommand() {
         RedisCommand<String, String, String> set = new Command<>(CommandType.SET, null);
         RedisCommand<String, String, String> mset = new Command<>(CommandType.MSET, null);
 
-        assertThat(MasterSlaveChannelWriter.getIntent(Arrays.asList(set, mset))).isEqualTo(
-                MasterSlaveConnectionProvider.Intent.WRITE);
+        assertThat(MasterReplicaChannelWriter.getIntent(Arrays.asList(set, mset)))
+                .isEqualTo(MasterReplicaConnectionProvider.Intent.WRITE);
 
-        assertThat(MasterSlaveChannelWriter.getIntent(Collections.singletonList(set))).isEqualTo(
-                MasterSlaveConnectionProvider.Intent.WRITE);
+        assertThat(MasterReplicaChannelWriter.getIntent(Collections.singletonList(set)))
+                .isEqualTo(MasterReplicaConnectionProvider.Intent.WRITE);
     }
 
     @Test
     void shouldReturnDefaultIntentForNoCommands() {
 
-        assertThat(MasterSlaveChannelWriter.getIntent(Collections.emptyList())).isEqualTo(
-                MasterSlaveConnectionProvider.Intent.WRITE);
+        assertThat(MasterReplicaChannelWriter.getIntent(Collections.emptyList()))
+                .isEqualTo(MasterReplicaConnectionProvider.Intent.WRITE);
     }
 
     @Test
@@ -83,11 +83,11 @@ void shouldReturnIntentForReadCommand() {
         RedisCommand<String, String, String> get = new Command<>(CommandType.GET, null);
         RedisCommand<String, String, String> mget = new Command<>(CommandType.MGET, null);
 
-        assertThat(MasterSlaveChannelWriter.getIntent(Arrays.asList(get, mget))).isEqualTo(
-                MasterSlaveConnectionProvider.Intent.READ);
+        assertThat(MasterReplicaChannelWriter.getIntent(Arrays.asList(get, mget)))
+                .isEqualTo(MasterReplicaConnectionProvider.Intent.READ);
 
-        assertThat(MasterSlaveChannelWriter.getIntent(Collections.singletonList(get))).isEqualTo(
-                MasterSlaveConnectionProvider.Intent.READ);
+        assertThat(MasterReplicaChannelWriter.getIntent(Collections.singletonList(get)))
+                .isEqualTo(MasterReplicaConnectionProvider.Intent.READ);
     }
 
     @Test
@@ -96,83 +96,83 @@ void shouldReturnIntentForMixedCommands() {
         RedisCommand<String, String, String> set = new Command<>(CommandType.SET, null);
         RedisCommand<String, String, String> mget = new Command<>(CommandType.MGET, null);
 
-        assertThat(MasterSlaveChannelWriter.getIntent(Arrays.asList(set, mget))).isEqualTo(
-                MasterSlaveConnectionProvider.Intent.WRITE);
+        assertThat(MasterReplicaChannelWriter.getIntent(Arrays.asList(set, mget)))
+                .isEqualTo(MasterReplicaConnectionProvider.Intent.WRITE);
 
-        assertThat(MasterSlaveChannelWriter.getIntent(Collections.singletonList(set))).isEqualTo(
-                MasterSlaveConnectionProvider.Intent.WRITE);
+        assertThat(MasterReplicaChannelWriter.getIntent(Collections.singletonList(set)))
+                .isEqualTo(MasterReplicaConnectionProvider.Intent.WRITE);
     }
 
     @Test
     void shouldBindTransactionsToMaster() {
 
-        MasterSlaveChannelWriter writer = new MasterSlaveChannelWriter(connectionProvider, clientResources);
+        MasterReplicaChannelWriter writer = new MasterReplicaChannelWriter(connectionProvider, clientResources);
 
-        when(connectionProvider.getConnectionAsync(any(MasterSlaveConnectionProvider.Intent.class))).thenReturn(
-                CompletableFuture.completedFuture(connection));
+        when(connectionProvider.getConnectionAsync(any(MasterReplicaConnectionProvider.Intent.class)))
+                .thenReturn(CompletableFuture.completedFuture(connection));
 
         writer.write(mockCommand(CommandType.MULTI));
         writer.write(mockCommand(CommandType.GET));
         writer.write(mockCommand(CommandType.EXEC));
 
-        verify(connectionProvider, times(3)).getConnectionAsync(MasterSlaveConnectionProvider.Intent.WRITE);
+        verify(connectionProvider, times(3)).getConnectionAsync(MasterReplicaConnectionProvider.Intent.WRITE);
     }
 
     @Test
     void shouldBindTransactionsToMasterInBatch() {
 
-        MasterSlaveChannelWriter writer = new MasterSlaveChannelWriter(connectionProvider, clientResources);
+        MasterReplicaChannelWriter writer = new MasterReplicaChannelWriter(connectionProvider, clientResources);
 
-        when(connectionProvider.getConnectionAsync(any(MasterSlaveConnectionProvider.Intent.class))).thenReturn(
-                CompletableFuture.completedFuture(connection));
+        when(connectionProvider.getConnectionAsync(any(MasterReplicaConnectionProvider.Intent.class)))
+                .thenReturn(CompletableFuture.completedFuture(connection));
 
         List<Command<String, String, String>> commands = Arrays.asList(mockCommand(CommandType.MULTI),
                 mockCommand(CommandType.GET), mockCommand(CommandType.EXEC));
 
         writer.write(commands);
 
-        verify(connectionProvider).getConnectionAsync(MasterSlaveConnectionProvider.Intent.WRITE);
+        verify(connectionProvider).getConnectionAsync(MasterReplicaConnectionProvider.Intent.WRITE);
     }
 
     @Test
     void shouldDeriveIntentFromCommandTypeAfterTransaction() {
 
-        MasterSlaveChannelWriter writer = new MasterSlaveChannelWriter(connectionProvider, clientResources);
+        MasterReplicaChannelWriter writer = new MasterReplicaChannelWriter(connectionProvider, clientResources);
 
-        when(connectionProvider.getConnectionAsync(any(MasterSlaveConnectionProvider.Intent.class))).thenReturn(
-                CompletableFuture.completedFuture(connection));
+        when(connectionProvider.getConnectionAsync(any(MasterReplicaConnectionProvider.Intent.class)))
+                .thenReturn(CompletableFuture.completedFuture(connection));
 
         writer.write(mockCommand(CommandType.MULTI));
         writer.write(mockCommand(CommandType.EXEC));
         writer.write(mockCommand(CommandType.GET));
 
-        verify(connectionProvider, times(2)).getConnectionAsync(MasterSlaveConnectionProvider.Intent.WRITE);
-        verify(connectionProvider).getConnectionAsync(MasterSlaveConnectionProvider.Intent.READ);
+        verify(connectionProvider, times(2)).getConnectionAsync(MasterReplicaConnectionProvider.Intent.WRITE);
+        verify(connectionProvider).getConnectionAsync(MasterReplicaConnectionProvider.Intent.READ);
     }
 
     @Test
     void shouldDeriveIntentFromCommandTypeAfterDiscardedTransaction() {
 
-        MasterSlaveChannelWriter writer = new MasterSlaveChannelWriter(connectionProvider, clientResources);
+        MasterReplicaChannelWriter writer = new MasterReplicaChannelWriter(connectionProvider, clientResources);
 
-        when(connectionProvider.getConnectionAsync(any(MasterSlaveConnectionProvider.Intent.class))).thenReturn(
-                CompletableFuture.completedFuture(connection));
+        when(connectionProvider.getConnectionAsync(any(MasterReplicaConnectionProvider.Intent.class)))
+                .thenReturn(CompletableFuture.completedFuture(connection));
 
         writer.write(mockCommand(CommandType.MULTI));
         writer.write(mockCommand(CommandType.DISCARD));
         writer.write(mockCommand(CommandType.GET));
 
-        verify(connectionProvider, times(2)).getConnectionAsync(MasterSlaveConnectionProvider.Intent.WRITE);
-        verify(connectionProvider).getConnectionAsync(MasterSlaveConnectionProvider.Intent.READ);
+        verify(connectionProvider, times(2)).getConnectionAsync(MasterReplicaConnectionProvider.Intent.WRITE);
+        verify(connectionProvider).getConnectionAsync(MasterReplicaConnectionProvider.Intent.READ);
     }
 
     @Test
     void shouldDeriveIntentFromCommandBatchTypeAfterDiscardedTransaction() {
 
-        MasterSlaveChannelWriter writer = new MasterSlaveChannelWriter(connectionProvider, clientResources);
+        MasterReplicaChannelWriter writer = new MasterReplicaChannelWriter(connectionProvider, clientResources);
 
-        when(connectionProvider.getConnectionAsync(any(MasterSlaveConnectionProvider.Intent.class))).thenReturn(
-                CompletableFuture.completedFuture(connection));
+        when(connectionProvider.getConnectionAsync(any(MasterReplicaConnectionProvider.Intent.class)))
+                .thenReturn(CompletableFuture.completedFuture(connection));
 
         List<Command<String, String, String>> commands = Arrays.asList(mockCommand(CommandType.MULTI),
                 mockCommand(CommandType.EXEC));
@@ -180,8 +180,8 @@ void shouldDeriveIntentFromCommandBatchTypeAfterDiscardedTransaction() {
         writer.write(commands);
         writer.write(Collections.singletonList(mockCommand(CommandType.GET)));
 
-        verify(connectionProvider).getConnectionAsync(MasterSlaveConnectionProvider.Intent.WRITE);
-        verify(connectionProvider).getConnectionAsync(MasterSlaveConnectionProvider.Intent.READ);
+        verify(connectionProvider).getConnectionAsync(MasterReplicaConnectionProvider.Intent.WRITE);
+        verify(connectionProvider).getConnectionAsync(MasterReplicaConnectionProvider.Intent.READ);
     }
 
     private static Command<String, String, String> mockCommand(CommandType multi) {
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaConnectionProviderUnitTests.java
similarity index 82%
rename from src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java
rename to src/test/java/io/lettuce/core/masterreplica/MasterReplicaConnectionProviderUnitTests.java
index a078b53d7b..84e9651c44 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveConnectionProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaConnectionProviderUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
@@ -47,9 +47,9 @@
  */
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
-class MasterSlaveConnectionProviderUnitTests {
+class MasterReplicaConnectionProviderUnitTests {
 
-    private MasterSlaveConnectionProvider<String, String> sut;
+    private MasterReplicaConnectionProvider<String, String> sut;
 
     @Mock
     RedisClient clientMock;
@@ -66,9 +66,10 @@ class MasterSlaveConnectionProviderUnitTests {
     void before() {
 
         nodeConnectionMock = (StatefulRedisConnection) channelHandlerMock;
-        sut = new MasterSlaveConnectionProvider<>(clientMock, StringCodec.UTF8, RedisURI.create("localhost", 1),
+        sut = new MasterReplicaConnectionProvider<>(clientMock, StringCodec.UTF8, RedisURI.create("localhost", 1),
                 Collections.emptyMap());
-        sut.setKnownNodes(Arrays.asList(new RedisMasterSlaveNode("localhost", 1, RedisURI.create("localhost", 1),
+        sut.setKnownNodes(Arrays.asList(
+                new RedisMasterReplicaNode("localhost", 1, RedisURI.create("localhost", 1),
                 RedisInstance.Role.MASTER)));
     }
 
@@ -80,7 +81,7 @@ void shouldCloseConnections() {
         when(clientMock.connectAsync(eq(StringCodec.UTF8), any()))
                 .thenReturn(ConnectionFuture.completed(null, nodeConnectionMock));
 
-        StatefulRedisConnection<String, String> connection = sut.getConnection(MasterSlaveConnectionProvider.Intent.READ);
+        StatefulRedisConnection<String, String> connection = sut.getConnection(MasterReplicaConnectionProvider.Intent.READ);
         assertThat(connection).isNotNull();
 
         sut.close();
diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java
index b7c3dba2c5..950459fcbd 100644
--- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java
@@ -55,7 +55,7 @@ class MasterReplicaSentinelSslIntegrationTests extends TestSupport {
     }
 
     @Test
-    void testMasterSlaveSentinelBasic() {
+    void testMasterReplicaSentinelBasic() {
 
         RedisClient client = RedisClient.create(clientResources);
         RedisURI redisURI = RedisURI.create("rediss-sentinel://" + TestSettings.host() + ":26379?sentinelMasterId=mymaster");
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTopologyProviderUnitTests.java
similarity index 82%
rename from src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java
rename to src/test/java/io/lettuce/core/masterreplica/MasterReplicaTopologyProviderUnitTests.java
index 54a350572e..860c6b6f36 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTopologyProviderUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -25,6 +25,7 @@
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.masterreplica.MasterReplicaTopologyProvider;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.lettuce.test.settings.TestSettings;
@@ -32,11 +33,11 @@
 /**
  * @author Mark Paluch
  */
-class MasterSlaveTopologyProviderUnitTests {
+class MasterReplicaTopologyProviderUnitTests {
 
     private StatefulRedisConnection<String, String> connectionMock = mock(StatefulRedisConnection.class);
 
-    private MasterSlaveTopologyProvider sut = new MasterSlaveTopologyProvider(connectionMock,
+    private MasterReplicaTopologyProvider sut = new MasterReplicaTopologyProvider(connectionMock,
             RedisURI.Builder.redis(TestSettings.host(), TestSettings.port()).build());
 
     @Test
@@ -135,17 +136,17 @@ void shouldParseSlaves() {
         List<RedisNodeDescription> result = sut.getNodesFromInfo(info);
         assertThat(result).hasSize(3);
 
-        RedisNodeDescription slave1 = result.get(1);
+        RedisNodeDescription replica1 = result.get(1);
 
-        assertThat(slave1.getRole()).isEqualTo(RedisInstance.Role.SLAVE);
-        assertThat(slave1.getUri().getHost()).isEqualTo("127.0.0.1");
-        assertThat(slave1.getUri().getPort()).isEqualTo(6483);
+        assertThat(replica1.getRole()).isEqualTo(RedisInstance.Role.SLAVE);
+        assertThat(replica1.getUri().getHost()).isEqualTo("127.0.0.1");
+        assertThat(replica1.getUri().getPort()).isEqualTo(6483);
 
-        RedisNodeDescription slave2 = result.get(2);
+        RedisNodeDescription replica2 = result.get(2);
 
-        assertThat(slave2.getRole()).isEqualTo(RedisInstance.Role.SLAVE);
-        assertThat(slave2.getUri().getHost()).isEqualTo("127.0.0.1");
-        assertThat(slave2.getUri().getPort()).isEqualTo(6484);
+        assertThat(replica2.getRole()).isEqualTo(RedisInstance.Role.SLAVE);
+        assertThat(replica2.getUri().getHost()).isEqualTo("127.0.0.1");
+        assertThat(replica2.getUri().getPort()).isEqualTo(6484);
     }
 
     @Test
@@ -159,10 +160,10 @@ void shouldParseIPv6SlaveAddress() {
         List<RedisNodeDescription> result = sut.getNodesFromInfo(info);
         assertThat(result).hasSize(2);
 
-        RedisNodeDescription slave1 = result.get(1);
+        RedisNodeDescription replica1 = result.get(1);
 
-        assertThat(slave1.getRole()).isEqualTo(RedisInstance.Role.SLAVE);
-        assertThat(slave1.getUri().getHost()).isEqualTo("::20f8:1400:0:0");
-        assertThat(slave1.getUri().getPort()).isEqualTo(6483);
+        assertThat(replica1.getRole()).isEqualTo(RedisInstance.Role.SLAVE);
+        assertThat(replica1.getUri().getHost()).isEqualTo("::20f8:1400:0:0");
+        assertThat(replica1.getUri().getPort()).isEqualTo(6483);
     }
 }
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTopologyRefreshUnitTests.java
similarity index 85%
rename from src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java
rename to src/test/java/io/lettuce/core/masterreplica/MasterReplicaTopologyRefreshUnitTests.java
index 9cdd24f2ca..78f0b2fa38 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaTopologyRefreshUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -47,12 +47,12 @@
  */
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
-class MasterSlaveTopologyRefreshUnitTests {
+class MasterReplicaTopologyRefreshUnitTests {
 
-    private static final RedisMasterSlaveNode MASTER = new RedisMasterSlaveNode("localhost", 1, new RedisURI(),
+    private static final RedisMasterReplicaNode MASTER = new RedisMasterReplicaNode("localhost", 1, new RedisURI(),
             RedisInstance.Role.MASTER);
 
-    private static final RedisMasterSlaveNode SLAVE = new RedisMasterSlaveNode("localhost", 2, new RedisURI(),
+    private static final RedisMasterReplicaNode SLAVE = new RedisMasterReplicaNode("localhost", 2, new RedisURI(),
             RedisInstance.Role.SLAVE);
 
     @Mock
@@ -93,7 +93,7 @@ void tearDown() {
     @Test
     void shouldRetrieveTopology() {
 
-        MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(connectionFactory, executorService, provider);
+        MasterReplicaTopologyRefresh refresh = new MasterReplicaTopologyRefresh(connectionFactory, executorService, provider);
 
         CompletableFuture<StatefulRedisConnection<String, String>> master = CompletableFuture.completedFuture(connection);
         CompletableFuture<StatefulRedisConnection<String, String>> replica = CompletableFuture.completedFuture(connection);
@@ -111,7 +111,7 @@ void shouldRetrieveTopology() {
     @Test
     void shouldRetrieveTopologyWithFailedNode() {
 
-        MasterSlaveTopologyRefresh refresh = new MasterSlaveTopologyRefresh(connectionFactory, executorService, provider);
+        MasterReplicaTopologyRefresh refresh = new MasterReplicaTopologyRefresh(connectionFactory, executorService, provider);
 
         CompletableFuture<StatefulRedisConnection<String, String>> connected = CompletableFuture.completedFuture(connection);
         CompletableFuture<StatefulRedisConnection<String, String>> pending = new CompletableFuture<>();
diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaUtilsUnitTests.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaUtilsUnitTests.java
new file mode 100644
index 0000000000..5374181c09
--- /dev/null
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaUtilsUnitTests.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.masterreplica;
+
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.models.role.RedisInstance;
+
+/**
+ * @author Mark Paluch
+ */
+class MasterReplicaUtilsUnitTests {
+
+    @Test
+    void isChangedShouldReturnFalse() {
+
+        RedisMasterReplicaNode master = new RedisMasterReplicaNode("host", 1234, RedisURI.create("host", 111),
+                RedisInstance.Role.MASTER);
+        RedisMasterReplicaNode replica = new RedisMasterReplicaNode("host", 234, RedisURI.create("host", 234),
+                RedisInstance.Role.SLAVE);
+
+        RedisMasterReplicaNode newmaster = new RedisMasterReplicaNode("host", 1234, RedisURI.create("host", 555),
+                RedisInstance.Role.MASTER);
+        RedisMasterReplicaNode newslave = new RedisMasterReplicaNode("host", 234, RedisURI.create("host", 666),
+                RedisInstance.Role.SLAVE);
+
+        assertThat(MasterReplicaUtils.isChanged(Arrays.asList(master, replica), Arrays.asList(newmaster, newslave))).isFalse();
+        assertThat(MasterReplicaUtils.isChanged(Arrays.asList(replica, master), Arrays.asList(newmaster, newslave))).isFalse();
+
+        assertThat(MasterReplicaUtils.isChanged(Arrays.asList(newmaster, newslave), Arrays.asList(master, replica))).isFalse();
+        assertThat(MasterReplicaUtils.isChanged(Arrays.asList(newmaster, newslave), Arrays.asList(replica, master))).isFalse();
+    }
+
+    @Test
+    void isChangedShouldReturnTrueBecauseSlaveIsGone() {
+
+        RedisMasterReplicaNode master = new RedisMasterReplicaNode("host", 1234, RedisURI.create("host", 111),
+                RedisInstance.Role.MASTER);
+        RedisMasterReplicaNode replica = new RedisMasterReplicaNode("host", 234, RedisURI.create("host", 234),
+                RedisInstance.Role.MASTER);
+
+        RedisMasterReplicaNode newmaster = new RedisMasterReplicaNode("host", 1234, RedisURI.create("host", 111),
+                RedisInstance.Role.MASTER);
+
+        assertThat(MasterReplicaUtils.isChanged(Arrays.asList(master, replica), Arrays.asList(newmaster))).isTrue();
+    }
+
+    @Test
+    void isChangedShouldReturnTrueBecauseHostWasMigrated() {
+
+        RedisMasterReplicaNode master = new RedisMasterReplicaNode("host", 1234, RedisURI.create("host", 111),
+                RedisInstance.Role.MASTER);
+        RedisMasterReplicaNode replica = new RedisMasterReplicaNode("host", 234, RedisURI.create("host", 234),
+                RedisInstance.Role.SLAVE);
+
+        RedisMasterReplicaNode newmaster = new RedisMasterReplicaNode("host", 1234, RedisURI.create("host", 555),
+                RedisInstance.Role.MASTER);
+        RedisMasterReplicaNode newslave = new RedisMasterReplicaNode("newhost", 234, RedisURI.create("newhost", 666),
+                RedisInstance.Role.SLAVE);
+
+        assertThat(MasterReplicaUtils.isChanged(Arrays.asList(master, replica), Arrays.asList(newmaster, newslave))).isTrue();
+        assertThat(MasterReplicaUtils.isChanged(Arrays.asList(replica, master), Arrays.asList(newmaster, newslave))).isTrue();
+        assertThat(MasterReplicaUtils.isChanged(Arrays.asList(newmaster, newslave), Arrays.asList(master, replica))).isTrue();
+        assertThat(MasterReplicaUtils.isChanged(Arrays.asList(newslave, newmaster), Arrays.asList(master, replica))).isTrue();
+    }
+
+    @Test
+    void isChangedShouldReturnTrueBecauseRolesSwitched() {
+
+        RedisMasterReplicaNode master = new RedisMasterReplicaNode("host", 1234, RedisURI.create("host", 111),
+                RedisInstance.Role.MASTER);
+        RedisMasterReplicaNode replica = new RedisMasterReplicaNode("host", 234, RedisURI.create("host", 234),
+                RedisInstance.Role.MASTER);
+
+        RedisMasterReplicaNode newslave = new RedisMasterReplicaNode("host", 1234, RedisURI.create("host", 111),
+                RedisInstance.Role.SLAVE);
+        RedisMasterReplicaNode newmaster = new RedisMasterReplicaNode("host", 234, RedisURI.create("host", 234),
+                RedisInstance.Role.MASTER);
+
+        assertThat(MasterReplicaUtils.isChanged(Arrays.asList(master, replica), Arrays.asList(newmaster, newslave))).isTrue();
+        assertThat(MasterReplicaUtils.isChanged(Arrays.asList(master, replica), Arrays.asList(newslave, newmaster))).isTrue();
+    }
+}
diff --git a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/masterreplica/SentinelTopologyRefreshUnitTests.java
similarity index 98%
rename from src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java
rename to src/test/java/io/lettuce/core/masterreplica/SentinelTopologyRefreshUnitTests.java
index ad1f10fabe..01851fc49a 100644
--- a/src/test/java/io/lettuce/core/masterslave/SentinelTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/masterreplica/SentinelTopologyRefreshUnitTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core.masterslave;
+package io.lettuce.core.masterreplica;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
@@ -44,6 +44,7 @@
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.Futures;
+import io.lettuce.core.masterreplica.SentinelTopologyRefresh;
 import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.protocol.Command;
 import io.lettuce.core.protocol.CommandType;
diff --git a/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java b/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
index aff761a5f1..a741c9cefc 100644
--- a/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
+++ b/src/test/java/io/lettuce/core/masterreplica/StaticMasterReplicaTest.java
@@ -20,6 +20,7 @@
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -46,7 +47,7 @@ class StaticMasterReplicaTest extends AbstractRedisClientTest {
     private StatefulRedisMasterReplicaConnection<String, String> connection;
 
     private RedisURI master;
-    private RedisURI slave;
+    private RedisURI replica;
 
     private RedisCommands<String, String> connection1;
     private RedisCommands<String, String> connection2;
@@ -65,14 +66,14 @@ void before() throws Exception {
 
         if (node1Instance.getRole() == RedisInstance.Role.MASTER && node2Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node1;
-            slave = node2;
+            replica = node2;
         } else if (node2Instance.getRole() == RedisInstance.Role.MASTER
                 && node1Instance.getRole() == RedisInstance.Role.SLAVE) {
             master = node2;
-            slave = node1;
+            replica = node1;
         } else {
             assumeTrue(false,
-                    String.format("Cannot run the test because I don't have a distinct master and slave but %s and %s",
+                    String.format("Cannot run the test because I don't have a distinct master and replica but %s and %s",
                             node1Instance, node2Instance));
         }
 
@@ -87,7 +88,7 @@ void before() throws Exception {
         node1.setPassword(passwd);
         node2.setPassword(passwd);
 
-        connection = MasterReplica.connect(client, StringCodec.UTF8, Arrays.asList(master, slave));
+        connection = MasterReplica.connect(client, StringCodec.UTF8, Arrays.asList(master, replica));
         connection.setReadFrom(ReadFrom.REPLICA);
     }
 
@@ -141,7 +142,7 @@ void noReplicaForRead() {
 
         connection.close();
 
-        connection = MasterReplica.connect(client, StringCodec.UTF8, Arrays.asList(master));
+        connection = MasterReplica.connect(client, StringCodec.UTF8, Collections.singletonList(master));
         connection.setReadFrom(ReadFrom.REPLICA);
 
         assertThatThrownBy(() -> replicaCall(connection)).isInstanceOf(RedisException.class);
@@ -152,7 +153,7 @@ void shouldWorkWithMasterOnly() {
 
         connection.close();
 
-        connection = MasterReplica.connect(client, StringCodec.UTF8, Arrays.asList(master));
+        connection = MasterReplica.connect(client, StringCodec.UTF8, Collections.singletonList(master));
 
         connection.sync().set(key, value);
         assertThat(connection.sync().get(key)).isEqualTo("value");
@@ -163,7 +164,7 @@ void shouldWorkWithReplicaOnly() {
 
         connection.close();
 
-        connection = MasterReplica.connect(client, StringCodec.UTF8, Arrays.asList(slave));
+        connection = MasterReplica.connect(client, StringCodec.UTF8, Collections.singletonList(replica));
         connection.setReadFrom(ReadFrom.MASTER_PREFERRED);
 
         assertThat(connection.sync().info()).isNotEmpty();
@@ -174,7 +175,7 @@ void noMasterForWrite() {
 
         connection.close();
 
-        connection = MasterReplica.connect(client, StringCodec.UTF8, Arrays.asList(slave));
+        connection = MasterReplica.connect(client, StringCodec.UTF8, Collections.singletonList(replica));
 
         assertThatThrownBy(() -> connection.sync().set(key, value)).isInstanceOf(RedisException.class);
     }
@@ -193,4 +194,33 @@ static String replicaCall(StatefulRedisMasterReplicaConnection<String, String> c
         return connection.sync().info("replication");
     }
 
+    @Test
+    void testConnectionCount() {
+
+        MasterReplicaConnectionProvider connectionProvider = getConnectionProvider();
+
+        assertThat(connectionProvider.getConnectionCount()).isEqualTo(0);
+        replicaCall(connection);
+
+        assertThat(connectionProvider.getConnectionCount()).isEqualTo(1);
+
+        connection.sync().set(key, value);
+        assertThat(connectionProvider.getConnectionCount()).isEqualTo(2);
+    }
+
+    @Test
+    void testReconfigureTopology() {
+        MasterReplicaConnectionProvider connectionProvider = getConnectionProvider();
+
+        replicaCall(connection);
+
+        connectionProvider.setKnownNodes(Collections.emptyList());
+
+        assertThat(connectionProvider.getConnectionCount()).isEqualTo(0);
+    }
+
+    MasterReplicaConnectionProvider getConnectionProvider() {
+        MasterReplicaChannelWriter writer = ((StatefulRedisMasterReplicaConnectionImpl) connection).getChannelWriter();
+        return writer.getMasterReplicaConnectionProvider();
+    }
 }
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
index 62fabc1986..4e1ec5e8f1 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -32,6 +32,8 @@
 import io.lettuce.RedisBug;
 import io.lettuce.core.*;
 import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.masterslave.MasterSlave;
+import io.lettuce.core.masterslave.StatefulRedisMasterSlaveConnection;
 import io.lettuce.core.sentinel.SentinelTestSettings;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.settings.TestSettings;
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
index da2fe93ba6..9a7e22118f 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveTest.java
@@ -48,7 +48,7 @@ class MasterSlaveTest extends AbstractRedisClientTest {
     private RedisURI masterURI = RedisURI.Builder.redis(host, TestSettings.port(3)).withPassword(passwd)
             .withClientName("my-client").withDatabase(5).build();
 
-    private StatefulRedisMasterSlaveConnectionImpl<String, String> connection;
+    private StatefulRedisMasterSlaveConnection<String, String> connection;
 
     private RedisURI master;
     private RedisURI replica;
@@ -89,7 +89,7 @@ void before() throws Exception {
         this.connection2.auth(passwd);
         this.connection2.configSet("masterauth", passwd);
 
-        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8, masterURI);
+        connection = MasterSlave.connect(client, StringCodec.UTF8, masterURI);
         connection.setReadFrom(ReadFrom.REPLICA);
     }
 
@@ -155,7 +155,7 @@ void testConnectToSlave() {
         connection.close();
 
         RedisURI slaveUri = RedisURI.Builder.redis(host, TestSettings.port(4)).withPassword(passwd).build();
-        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8, slaveUri);
+        connection = MasterSlave.connect(client, StringCodec.UTF8, slaveUri);
 
         RedisCommands<String, String> sync = connection.sync();
         sync.set(key, value);
@@ -184,34 +184,8 @@ void masterSlaveConnectionShouldSetClientName() {
         connection.close();
     }
 
-    @Test
-    void testConnectionCount() {
-
-        MasterSlaveConnectionProvider connectionProvider = getConnectionProvider();
-
-        assertThat(connectionProvider.getConnectionCount()).isEqualTo(1);
-        slaveCall(connection);
-
-        assertThat(connectionProvider.getConnectionCount()).isEqualTo(2);
-    }
-
-    @Test
-    void testReconfigureTopology() {
-        MasterSlaveConnectionProvider connectionProvider = getConnectionProvider();
-
-        slaveCall(connection);
-
-        connectionProvider.setKnownNodes(Collections.emptyList());
-
-        assertThat(connectionProvider.getConnectionCount()).isEqualTo(0);
-    }
-
     static String slaveCall(StatefulRedisMasterSlaveConnection<String, String> connection) {
         return connection.sync().info("replication");
     }
 
-    MasterSlaveConnectionProvider getConnectionProvider() {
-        MasterSlaveChannelWriter writer = connection.getChannelWriter();
-        return writer.getMasterSlaveConnectionProvider();
-    }
 }
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java
deleted file mode 100644
index 9fbc7bbf3f..0000000000
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveUtilsUnitTests.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2011-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.masterslave;
-
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-
-import java.util.Arrays;
-
-import org.junit.jupiter.api.Test;
-
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.models.role.RedisInstance;
-
-/**
- * @author Mark Paluch
- */
-class MasterSlaveUtilsUnitTests {
-
-    @Test
-    void isChangedShouldReturnFalse() {
-
-        RedisMasterSlaveNode master = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 111),
-                RedisInstance.Role.MASTER);
-        RedisMasterSlaveNode replica = new RedisMasterSlaveNode("host", 234, RedisURI.create("host", 234),
-                RedisInstance.Role.SLAVE);
-
-        RedisMasterSlaveNode newmaster = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 555),
-                RedisInstance.Role.MASTER);
-        RedisMasterSlaveNode newslave = new RedisMasterSlaveNode("host", 234, RedisURI.create("host", 666),
-                RedisInstance.Role.SLAVE);
-
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, replica), Arrays.asList(newmaster, newslave))).isFalse();
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(replica, master), Arrays.asList(newmaster, newslave))).isFalse();
-
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(newmaster, newslave), Arrays.asList(master, replica))).isFalse();
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(newmaster, newslave), Arrays.asList(replica, master))).isFalse();
-    }
-
-    @Test
-    void isChangedShouldReturnTrueBecauseSlaveIsGone() {
-
-        RedisMasterSlaveNode master = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 111),
-                RedisInstance.Role.MASTER);
-        RedisMasterSlaveNode replica = new RedisMasterSlaveNode("host", 234, RedisURI.create("host", 234),
-                RedisInstance.Role.MASTER);
-
-        RedisMasterSlaveNode newmaster = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 111),
-                RedisInstance.Role.MASTER);
-
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, replica), Arrays.asList(newmaster))).isTrue();
-    }
-
-    @Test
-    void isChangedShouldReturnTrueBecauseHostWasMigrated() {
-
-        RedisMasterSlaveNode master = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 111),
-                RedisInstance.Role.MASTER);
-        RedisMasterSlaveNode replica = new RedisMasterSlaveNode("host", 234, RedisURI.create("host", 234),
-                RedisInstance.Role.SLAVE);
-
-        RedisMasterSlaveNode newmaster = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 555),
-                RedisInstance.Role.MASTER);
-        RedisMasterSlaveNode newslave = new RedisMasterSlaveNode("newhost", 234, RedisURI.create("newhost", 666),
-                RedisInstance.Role.SLAVE);
-
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, replica), Arrays.asList(newmaster, newslave))).isTrue();
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(replica, master), Arrays.asList(newmaster, newslave))).isTrue();
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(newmaster, newslave), Arrays.asList(master, replica))).isTrue();
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(newslave, newmaster), Arrays.asList(master, replica))).isTrue();
-    }
-
-    @Test
-    void isChangedShouldReturnTrueBecauseRolesSwitched() {
-
-        RedisMasterSlaveNode master = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 111),
-                RedisInstance.Role.MASTER);
-        RedisMasterSlaveNode replica = new RedisMasterSlaveNode("host", 234, RedisURI.create("host", 234),
-                RedisInstance.Role.MASTER);
-
-        RedisMasterSlaveNode newslave = new RedisMasterSlaveNode("host", 1234, RedisURI.create("host", 111),
-                RedisInstance.Role.SLAVE);
-        RedisMasterSlaveNode newmaster = new RedisMasterSlaveNode("host", 234, RedisURI.create("host", 234),
-                RedisInstance.Role.MASTER);
-
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, replica), Arrays.asList(newmaster, newslave))).isTrue();
-        assertThat(MasterSlaveUtils.isChanged(Arrays.asList(master, replica), Arrays.asList(newslave, newmaster))).isTrue();
-    }
-}
diff --git a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
index 4c727800b7..8a9f83bcd4 100644
--- a/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
+++ b/src/test/java/io/lettuce/core/masterslave/StaticMasterSlaveTest.java
@@ -20,7 +20,6 @@
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -44,7 +43,7 @@
  */
 class StaticMasterSlaveTest extends AbstractRedisClientTest {
 
-    private StatefulRedisMasterSlaveConnectionImpl<String, String> connection;
+    private StatefulRedisMasterSlaveConnection<String, String> connection;
 
     private RedisURI master;
     private RedisURI replica;
@@ -88,8 +87,7 @@ void before() {
         master.setPassword(passwd);
         replica.setPassword(passwd);
 
-        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8,
-                Arrays.asList(master, replica));
+        connection = MasterSlave.connect(client, StringCodec.UTF8, Arrays.asList(master, replica));
         connection.setReadFrom(ReadFrom.REPLICA);
     }
 
@@ -143,8 +141,7 @@ void noSlaveForRead() {
 
         connection.close();
 
-        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8,
-                Arrays.asList(master));
+        connection = MasterSlave.connect(client, StringCodec.UTF8, Arrays.asList(master));
         connection.setReadFrom(ReadFrom.REPLICA);
 
         assertThatThrownBy(() -> slaveCall(connection)).isInstanceOf(RedisException.class);
@@ -155,8 +152,7 @@ void shouldWorkWithMasterOnly() {
 
         connection.close();
 
-        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8,
-                Arrays.asList(master));
+        connection = MasterSlave.connect(client, StringCodec.UTF8, Arrays.asList(master));
 
         connection.sync().set(key, value);
         assertThat(connection.sync().get(key)).isEqualTo("value");
@@ -167,8 +163,7 @@ void shouldWorkWithSlaveOnly() {
 
         connection.close();
 
-        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8,
-                Arrays.asList(replica));
+        connection = MasterSlave.connect(client, StringCodec.UTF8, Arrays.asList(replica));
         connection.setReadFrom(ReadFrom.MASTER_PREFERRED);
 
         assertThat(connection.sync().info()).isNotEmpty();
@@ -179,8 +174,7 @@ void noMasterForWrite() {
 
         connection.close();
 
-        connection = (StatefulRedisMasterSlaveConnectionImpl) MasterSlave.connect(client, StringCodec.UTF8,
-                Arrays.asList(replica));
+        connection = MasterSlave.connect(client, StringCodec.UTF8, Arrays.asList(replica));
 
         assertThatThrownBy(() -> connection.sync().set(key, value)).isInstanceOf(RedisException.class);
     }
@@ -195,37 +189,8 @@ void masterSlaveConnectionShouldSetClientName() {
         connection.close();
     }
 
-    @Test
-    void testConnectionCount() {
-
-        MasterSlaveConnectionProvider connectionProvider = getConnectionProvider();
-
-        assertThat(connectionProvider.getConnectionCount()).isEqualTo(0);
-        slaveCall(connection);
-
-        assertThat(connectionProvider.getConnectionCount()).isEqualTo(1);
-
-        connection.sync().set(key, value);
-        assertThat(connectionProvider.getConnectionCount()).isEqualTo(2);
-    }
-
-    @Test
-    void testReconfigureTopology() {
-        MasterSlaveConnectionProvider connectionProvider = getConnectionProvider();
-
-        slaveCall(connection);
-
-        connectionProvider.setKnownNodes(Collections.emptyList());
-
-        assertThat(connectionProvider.getConnectionCount()).isEqualTo(0);
-    }
-
     static String slaveCall(StatefulRedisMasterSlaveConnection<String, String> connection) {
         return connection.sync().info("replication");
     }
 
-    MasterSlaveConnectionProvider getConnectionProvider() {
-        MasterSlaveChannelWriter writer = connection.getChannelWriter();
-        return writer.getMasterSlaveConnectionProvider();
-    }
 }

From 72149ed2fc57a67e861776aa28812b2a52da201e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 4 Jan 2020 20:28:50 +0100
Subject: [PATCH 725/808] Polishing

---
 Makefile | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 628a3c33b6..61a9e1d36e 100644
--- a/Makefile
+++ b/Makefile
@@ -49,24 +49,24 @@ vars currentEpoch 3 lastVoteEpoch 0
 endef
 
 define REDIS_CLUSTER_CONFIG_SSL_1
-27f88788f03a86296b7d860152f4ae24ee59c8c9 127.0.0.1:7479@17479 myself,master - 0 1434887920102 1 connected 0-10000
-1c541b6daf98719769e6aacf338a7d81f108a180 127.0.0.1:7480@17480 slave 27f88788f03a86296b7d860152f4ae24ee59c8c9 0 1434887920102 3 connected
-2c07344ffa94ede5ea57a2367f190af6144c1adb 127.0.0.1:7481@17481 master  - 0 0 2 connected 10001-16384
-vars currentEpoch 3 lastVoteEpoch 0
+cf2354ef19ee813a962350b51438314aebce1fe2 127.0.0.1:7479@17479 myself,master - 0 1578163609000 0 connected 1-10000
+cac8e053dd6f85fab470be57d29dcbac2a4b85c4 127.0.0.1:7480@17480 slave cf2354ef19ee813a962350b51438314aebce1fe2 0 1578163609301 1 connected
+6554e5b1b158dccd4b1d9ca294a3e46a2d3e556d 127.0.0.1:7481@17481 master - 0 1578163609301 2 connected 10001-16383
+vars currentEpoch 2 lastVoteEpoch 0
 endef
 
 define REDIS_CLUSTER_CONFIG_SSL_2
-27f88788f03a86296b7d860152f4ae24ee59c8c9 127.0.0.1:7479@17479 master - 0 1434887920102 1 connected 0-10000
-1c541b6daf98719769e6aacf338a7d81f108a180 127.0.0.1:7480@17480 myself,slave 27f88788f03a86296b7d860152f4ae24ee59c8c9 0 1434887920102 3 connected
-2c07344ffa94ede5ea57a2367f190af6144c1adb 127.0.0.1:7481@17481 master  - 0 0 2 connected 10001-16384
-vars currentEpoch 3 lastVoteEpoch 0
+cf2354ef19ee813a962350b51438314aebce1fe2 127.0.0.1:7479@17479 master - 0 1578163609245 0 connected  1-10000
+cac8e053dd6f85fab470be57d29dcbac2a4b85c4 127.0.0.1:7480@17480 myself,slave cf2354ef19ee813a962350b51438314aebce1fe2 0 1578163609000 1 connected
+6554e5b1b158dccd4b1d9ca294a3e46a2d3e556d 127.0.0.1:7481@17481 master - 0 1578163609245 2 connected 10001-16383
+vars currentEpoch 2 lastVoteEpoch 0
 endef
 
 define REDIS_CLUSTER_CONFIG_SSL_3
-27f88788f03a86296b7d860152f4ae24ee59c8c9 127.0.0.1:7479@17479 master - 0 1434887920102 1 connected 0-10000
-1c541b6daf98719769e6aacf338a7d81f108a180 127.0.0.1:7480@17480 slave 27f88788f03a86296b7d860152f4ae24ee59c8c9 0 1434887920102 3 connected
-2c07344ffa94ede5ea57a2367f190af6144c1adb 127.0.0.1:7481@17481 myself,master  - 0 0 2 connected 10001-16384
-vars currentEpoch 3 lastVoteEpoch 0
+cac8e053dd6f85fab470be57d29dcbac2a4b85c4 127.0.0.1:7480@17480 slave cf2354ef19ee813a962350b51438314aebce1fe2 0 1578163609279 1 connected
+cf2354ef19ee813a962350b51438314aebce1fe2 127.0.0.1:7479@17479 master - 0 1578163609279 0 connected 1-10000
+6554e5b1b158dccd4b1d9ca294a3e46a2d3e556d 127.0.0.1:7481@17481 myself,master - 0 1578163609000 2 connected 10001-16383
+vars currentEpoch 2 lastVoteEpoch 0
 endef
 
 

From 0c1e3716ec60f753f63b6fbfce53ab1caf90435c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 11 Jan 2020 11:56:26 +0100
Subject: [PATCH 726/808] Fix false hits of license header upgrade

---
 src/test/bash/create_certificates.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/bash/create_certificates.sh b/src/test/bash/create_certificates.sh
index 32ec0cf993..be98469501 100755
--- a/src/test/bash/create_certificates.sh
+++ b/src/test/bash/create_certificates.sh
@@ -44,13 +44,13 @@ chmod 400 ${CA_DIR}/private/ca.key.pem
 echo "[INFO] Generating CA certificate"
 openssl req -config ${DIR}/openssl.cnf \
       -key ${CA_DIR}/private/ca.key.pem \
-      -new -x509 -days 7300-2020 -sha256 -extensions v3_ca \
+      -new -x509 -days 7300 -sha256 -extensions v3_ca \
       -out ${CA_DIR}/certs/ca.cert.pem \
       -passin pass:changeit \
       -subj "/C=NN/ST=Unknown/L=Unknown/O=lettuce/CN=CA Certificate"
 
 echo "[INFO] Prepare CA database"
-echo 1000-2020 > ${CA_DIR}/serial
+echo 1000 > ${CA_DIR}/serial
 touch ${CA_DIR}/index.txt
 
 function generateKey {

From d74d2a997a0401520fcd8df75dc2797024bbe8e3 Mon Sep 17 00:00:00 2001
From: Kostiantyn Shchepanovskyi <schepanovsky@gmail.com>
Date: Mon, 13 Jan 2020 10:21:28 +0200
Subject: [PATCH 727/808] Fix RedisURIBuilderUnitTests failing on Windows OS
 #1204

Add @DisabledOnOs(OS.WINDOWS) to two tests - `redisSocket` and
`redisSocketWithPassword` that fail in Windows:

```
java.lang.IllegalArgumentException: Illegal character in authority at index 15: redis-socket://C:\Users\konstantinsh\IdeaProjects\lettuce-core\work\socket-6479

	at java.base/java.net.URI.create(URI.java:883)
	at io.lettuce.core.RedisURI.create(RedisURI.java:233)
```

Tests are disabled on Windows as socket connections are not supposed
to be used on OS other that Unix.
---
 src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
index 8c96e43c51..9275104cc8 100644
--- a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
@@ -23,6 +23,9 @@
 import java.time.Duration;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 /**
  * Unit tests for {@link RedisURI.Builder}.
@@ -241,6 +244,7 @@ void invalidScheme() {
     }
 
     @Test
+    @DisabledOnOs(OS.WINDOWS)
     void redisSocket() throws IOException {
         File file = new File("work/socket-6479").getCanonicalFile();
         RedisURI result = RedisURI.create(RedisURI.URI_SCHEME_REDIS_SOCKET + "://" + file.getCanonicalPath());
@@ -254,6 +258,7 @@ void redisSocket() throws IOException {
     }
 
     @Test
+    @DisabledOnOs(OS.WINDOWS)
     void redisSocketWithPassword() throws IOException {
         File file = new File("work/socket-6479").getCanonicalFile();
         RedisURI result = RedisURI.create(RedisURI.URI_SCHEME_REDIS_SOCKET + "://password@" + file.getCanonicalPath());

From 0289f02860d172a34c145a89e674714815c60843 Mon Sep 17 00:00:00 2001
From: kerr <hepin1989@gmail.com>
Date: Mon, 13 Jan 2020 16:22:51 +0800
Subject: [PATCH 728/808] Provide a default port to RedisURI's Builder instead
 of 0 #1205

---
 src/main/java/io/lettuce/core/RedisURI.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 2affd54a4f..20226ae9d4 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -962,7 +962,7 @@ public static class Builder {
         private String host;
         private String socket;
         private String sentinelMasterId;
-        private int port;
+        private int port = DEFAULT_REDIS_PORT;
         private int database;
         private String clientName;
         private String username;

From b193839f7bd7e99d5f648d8136e355b770969851 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 13 Jan 2020 09:28:14 +0100
Subject: [PATCH 729/808] Polishing #1205

Fix tests.
---
 .../java/io/lettuce/core/RedisURIBuilderUnitTests.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
index 9275104cc8..268cd2201e 100644
--- a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
@@ -150,7 +150,7 @@ void redisSentinelFromUrl() {
 
         assertThat(result.getSentinels()).hasSize(1);
         assertThat(result.getHost()).isNull();
-        assertThat(result.getPort()).isEqualTo(0);
+        assertThat(result.getPort()).isEqualTo(RedisURI.DEFAULT_REDIS_PORT);
         assertThat(result.getPassword()).isEqualTo("password".toCharArray());
         assertThat(result.getSentinelMasterId()).isEqualTo("master");
         assertThat(result.toString()).contains("master");
@@ -159,7 +159,7 @@ void redisSentinelFromUrl() {
 
         assertThat(result.getSentinels()).hasSize(3);
         assertThat(result.getHost()).isNull();
-        assertThat(result.getPort()).isEqualTo(0);
+        assertThat(result.getPort()).isEqualTo(RedisURI.DEFAULT_REDIS_PORT);
         assertThat(result.getPassword()).isEqualTo("password".toCharArray());
         assertThat(result.getSentinelMasterId()).isEqualTo("master");
 
@@ -253,7 +253,7 @@ void redisSocket() throws IOException {
         assertThat(result.getSentinels()).isEmpty();
         assertThat(result.getPassword()).isNull();
         assertThat(result.getHost()).isNull();
-        assertThat(result.getPort()).isEqualTo(0);
+        assertThat(result.getPort()).isEqualTo(RedisURI.DEFAULT_REDIS_PORT);
         assertThat(result.isSsl()).isFalse();
     }
 
@@ -267,7 +267,7 @@ void redisSocketWithPassword() throws IOException {
         assertThat(result.getSentinels()).isEmpty();
         assertThat(result.getPassword()).isEqualTo("password".toCharArray());
         assertThat(result.getHost()).isNull();
-        assertThat(result.getPort()).isEqualTo(0);
+        assertThat(result.getPort()).isEqualTo(RedisURI.DEFAULT_REDIS_PORT);
         assertThat(result.isSsl()).isFalse();
     }
 }

From 1fed2f8e018de59b48b9108ea0a18782cde225f0 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 13 Jan 2020 09:48:45 +0100
Subject: [PATCH 730/808] Pub/Sub resubscribe failures on connection activation
 #1201

Lettuce now logs failures of asynchronously fired commands during connection activation.
---
 .../pubsub/StatefulRedisPubSubConnectionImpl.java | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
index a68dab1e40..684e97f3fd 100644
--- a/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/pubsub/StatefulRedisPubSubConnectionImpl.java
@@ -22,6 +22,7 @@
 import java.util.List;
 
 import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.RedisCommandExecutionException;
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.StatefulRedisConnectionImpl;
 import io.lettuce.core.codec.RedisCodec;
@@ -29,6 +30,7 @@
 import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
 import io.lettuce.core.pubsub.api.reactive.RedisPubSubReactiveCommands;
 import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands;
+import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
  * An thread-safe pub/sub connection to a Redis server. Multiple threads may share one {@link StatefulRedisPubSubConnectionImpl}
@@ -40,8 +42,8 @@
  * @param <V> Value type.
  * @author Mark Paluch
  */
-public class StatefulRedisPubSubConnectionImpl<K, V> extends StatefulRedisConnectionImpl<K, V> implements
-        StatefulRedisPubSubConnection<K, V> {
+public class StatefulRedisPubSubConnectionImpl<K, V> extends StatefulRedisConnectionImpl<K, V>
+        implements StatefulRedisPubSubConnection<K, V> {
 
     private final PubSubEndpoint<K, V> endpoint;
 
@@ -141,6 +143,13 @@ private <T> T[] toArray(Collection<T> c) {
     @Override
     public void activated() {
         super.activated();
-        resubscribe();
+        for (RedisFuture<Void> command : resubscribe()) {
+            command.exceptionally(throwable -> {
+                if (throwable instanceof RedisCommandExecutionException) {
+                    InternalLoggerFactory.getInstance(getClass()).warn("Re-subscribe failed: " + command.getError());
+                }
+                return null;
+            });
+        }
     }
 }

From a22864e8f843e02b03c9e0e1c0e07ab1a9364998 Mon Sep 17 00:00:00 2001
From: Jude Pereira <judebpereira@gmail.com>
Date: Wed, 15 Jan 2020 19:17:08 +0100
Subject: [PATCH 731/808] Update documentation for pub/sub to listen on the
 stateful connection object #1207

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8b09171649..5e6bf25472 100644
--- a/README.md
+++ b/README.md
@@ -136,7 +136,7 @@ Pub/Sub
 
 ```java
 RedisPubSubCommands<String, String> connection = client.connectPubSub().sync();
-connection.addListener(new RedisPubSubListener<String, String>() { ... })
+connection.getStatefulConnection().addListener(new RedisPubSubListener<String, String>() { ... })
 connection.subscribe("channel")
 ```
 

From 8a1a22e68130ad6f5ce2f16d47198e7afcf26387 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 15 Jan 2020 22:34:42 +0100
Subject: [PATCH 732/808] Use hostname and port from SocketAddress for peer
 verification #1209

Lettuce now uses the InetSocketAddress.hostString to verify the SSL host and for SNI instead of using the RedisURI. When using Redis Sentinel, the URI host was null and the port was zero which caused failures during the SSL handshake.
---
 Makefile                                      | 23 ++-----
 .../io/lettuce/core/AbstractRedisClient.java  |  2 +-
 .../io/lettuce/core/ConnectionBuilder.java    |  2 +-
 .../io/lettuce/core/SslConnectionBuilder.java | 61 +++++++++++++------
 src/test/bash/create_certificates.sh          |  9 ++-
 src/test/bash/openssl.cnf                     |  3 +-
 .../sentinel/SentinelSslIntegrationTests.java | 26 ++++++--
 7 files changed, 78 insertions(+), 48 deletions(-)

diff --git a/Makefile b/Makefile
index 61a9e1d36e..05534af4a2 100644
--- a/Makefile
+++ b/Makefile
@@ -230,8 +230,8 @@ cluster-start: work/cluster-node-7379.pid work/cluster-node-7380.pid work/cluste
 work/stunnel.conf:
 	@mkdir -p $(@D)
 
-	@echo cert=$(ROOT_DIR)/work/ca/certs/foo-host.cert.pem >> $@
-	@echo key=$(ROOT_DIR)/work/ca/private/foo-host.decrypted.key.pem >> $@
+	@echo cert=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
+	@echo key=$(ROOT_DIR)/work/ca/private/localhost.decrypted.key.pem >> $@
 	@echo capath=$(ROOT_DIR)/work/ca/certs/ca.cert.pem >> $@
 	@echo cafile=$(ROOT_DIR)/work/ca/certs/ca.cert.pem >> $@
 	@echo delay=yes >> $@
@@ -242,13 +242,11 @@ work/stunnel.conf:
 	@echo accept = 127.0.0.1:6443 >> $@
 	@echo connect = 127.0.0.1:6479 >> $@
 
-	@echo [stunnel-2] >> $@
+	@echo [foo-host] >> $@
 	@echo accept = 127.0.0.1:6444 >> $@
 	@echo connect = 127.0.0.1:6479 >> $@
-	@echo cert=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
-	@echo key=$(ROOT_DIR)/work/ca/private/localhost.decrypted.key.pem >> $@
-	@echo capath=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
-	@echo cafile=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
+	@echo cert=$(ROOT_DIR)/work/ca/certs/foo-host.cert.pem >> $@
+	@echo key=$(ROOT_DIR)/work/ca/private/foo-host.decrypted.key.pem >> $@
 
 	@echo [ssl-cluster-node-1] >> $@
 	@echo accept = 127.0.0.1:7443 >> $@
@@ -285,26 +283,15 @@ work/stunnel.conf:
 	@echo [stunnel-client-cert] >> $@
 	@echo accept = 127.0.0.1:6445 >> $@
 	@echo connect = 127.0.0.1:6479 >> $@
-	@echo cert=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
-	@echo key=$(ROOT_DIR)/work/ca/private/localhost.decrypted.key.pem >> $@
-	@echo cafile=$(ROOT_DIR)/work/ca/certs/ca.cert.pem >> $@
 	@echo verify=2 >> $@
 
 	@echo [stunnel-master-slave-node-1] >> $@
 	@echo accept = 127.0.0.1:8443 >> $@
 	@echo connect = 127.0.0.1:6482 >> $@
-	@echo cert=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
-	@echo key=$(ROOT_DIR)/work/ca/private/localhost.decrypted.key.pem >> $@
-	@echo capath=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
-	@echo cafile=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
 
 	@echo [stunnel-master-slave-node-2] >> $@
 	@echo accept = 127.0.0.1:8444 >> $@
 	@echo connect = 127.0.0.1:6483 >> $@
-	@echo cert=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
-	@echo key=$(ROOT_DIR)/work/ca/private/localhost.decrypted.key.pem >> $@
-	@echo capath=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
-	@echo cafile=$(ROOT_DIR)/work/ca/certs/localhost.cert.pem >> $@
 
 work/stunnel.pid: work/stunnel.conf ssl-keys
 	which stunnel4 >/dev/null 2>&1 && stunnel4 $(ROOT_DIR)/work/stunnel.conf || stunnel $(ROOT_DIR)/work/stunnel.conf
diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 5ed539a476..6789ffc08e 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -304,7 +304,7 @@ private void initializeChannelAsync0(ConnectionBuilder connectionBuilder, Comple
 
         Bootstrap redisBootstrap = connectionBuilder.bootstrap();
 
-        ChannelInitializer<Channel> initializer = connectionBuilder.build();
+        ChannelInitializer<Channel> initializer = connectionBuilder.build(redisAddress);
         redisBootstrap.handler(initializer);
 
         clientResources.nettyCustomizer().afterBootstrapInitialized(redisBootstrap);
diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index 0125997d08..297aea2f30 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -118,7 +118,7 @@ protected ConnectionWatchdog createConnectionWatchdog() {
         return watchdog;
     }
 
-    public ChannelInitializer<Channel> build() {
+    public ChannelInitializer<Channel> build(SocketAddress socketAddress) {
         return new PlainChannelInitializer(this::buildHandlers, clientResources);
     }
 
diff --git a/src/main/java/io/lettuce/core/SslConnectionBuilder.java b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
index ebdb4deb51..388ffc6bbf 100644
--- a/src/main/java/io/lettuce/core/SslConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/SslConnectionBuilder.java
@@ -16,6 +16,8 @@
 package io.lettuce.core;
 
 import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import java.security.GeneralSecurityException;
 import java.util.List;
 import java.util.function.Supplier;
@@ -23,8 +25,10 @@
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
 
+import io.lettuce.core.internal.HostAndPort;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.resource.ClientResources;
+import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelInitializer;
@@ -61,37 +65,63 @@ protected List<ChannelHandler> buildHandlers() {
     }
 
     @Override
-    public ChannelInitializer<Channel> build() {
-        return new SslChannelInitializer(this::buildHandlers, redisURI, clientResources(), clientOptions().getSslOptions());
+    public ChannelInitializer<Channel> build(SocketAddress socketAddress) {
+        return new SslChannelInitializer(this::buildHandlers, toHostAndPort(socketAddress), redisURI.isVerifyPeer(),
+                redisURI.isStartTls(), clientResources(), clientOptions().getSslOptions());
+    }
+
+    static HostAndPort toHostAndPort(SocketAddress socketAddress) {
+
+        if (socketAddress instanceof InetSocketAddress) {
+
+            InetSocketAddress isa = (InetSocketAddress) socketAddress;
+
+            return HostAndPort.of(isa.getHostString(), isa.getPort());
+        }
+
+        return null;
     }
 
     static class SslChannelInitializer extends io.netty.channel.ChannelInitializer<Channel> {
 
         private final Supplier<List<ChannelHandler>> handlers;
-        private final RedisURI redisURI;
+        private final HostAndPort hostAndPort;
+        private final boolean verifyPeer;
+        private final boolean startTls;
         private final ClientResources clientResources;
         private final SslOptions sslOptions;
 
-        public SslChannelInitializer(Supplier<List<ChannelHandler>> handlers, RedisURI redisURI,
-                ClientResources clientResources, SslOptions sslOptions) {
+        public SslChannelInitializer(Supplier<List<ChannelHandler>> handlers, HostAndPort hostAndPort, boolean verifyPeer,
+                boolean startTls, ClientResources clientResources, SslOptions sslOptions) {
 
             this.handlers = handlers;
-            this.redisURI = redisURI;
+            this.hostAndPort = hostAndPort;
+            this.verifyPeer = verifyPeer;
+            this.startTls = startTls;
             this.clientResources = clientResources;
             this.sslOptions = sslOptions;
         }
 
         @Override
         protected void initChannel(Channel channel) throws Exception {
-            doInitialize(channel);
+
+            SSLEngine sslEngine = initializeSSLEngine(channel.alloc());
+            SslHandler sslHandler = new SslHandler(sslEngine, startTls);
+            channel.pipeline().addLast(sslHandler);
+
+            for (ChannelHandler handler : handlers.get()) {
+                channel.pipeline().addLast(handler);
+            }
+
+            clientResources.nettyCustomizer().afterChannelInitialized(channel);
         }
 
-        private void doInitialize(Channel channel) throws IOException, GeneralSecurityException {
+        private SSLEngine initializeSSLEngine(ByteBufAllocator alloc) throws IOException, GeneralSecurityException {
 
             SSLParameters sslParams = sslOptions.createSSLParameters();
             SslContextBuilder sslContextBuilder = sslOptions.createSslContextBuilder();
 
-            if (redisURI.isVerifyPeer()) {
+            if (verifyPeer) {
                 sslParams.setEndpointIdentificationAlgorithm("HTTPS");
             } else {
                 sslContextBuilder.trustManager(InsecureTrustManagerFactory.INSTANCE);
@@ -99,17 +129,12 @@ private void doInitialize(Channel channel) throws IOException, GeneralSecurityEx
 
             SslContext sslContext = sslContextBuilder.build();
 
-            SSLEngine sslEngine = sslContext.newEngine(channel.alloc(), redisURI.getHost(), redisURI.getPort());
+            SSLEngine sslEngine = hostAndPort != null
+                    ? sslContext.newEngine(alloc, hostAndPort.getHostText(), hostAndPort.getPort())
+                    : sslContext.newEngine(alloc);
             sslEngine.setSSLParameters(sslParams);
 
-            SslHandler sslHandler = new SslHandler(sslEngine, redisURI.isStartTls());
-            channel.pipeline().addLast(sslHandler);
-
-            for (ChannelHandler handler : handlers.get()) {
-                channel.pipeline().addLast(handler);
-            }
-
-            clientResources.nettyCustomizer().afterChannelInitialized(channel);
+            return sslEngine;
         }
     }
 }
diff --git a/src/test/bash/create_certificates.sh b/src/test/bash/create_certificates.sh
index be98469501..28db1eb517 100755
--- a/src/test/bash/create_certificates.sh
+++ b/src/test/bash/create_certificates.sh
@@ -56,6 +56,7 @@ touch ${CA_DIR}/index.txt
 function generateKey {
 
     host=$1
+    ip=$2
 
     echo "[INFO] Generating server private key"
     openssl genrsa -aes256 \
@@ -70,7 +71,9 @@ function generateKey {
     chmod 400 ${CA_DIR}/private/${host}.decrypted.key.pem
 
     echo "[INFO] Generating server certificate request"
-    openssl req -config ${DIR}/openssl.cnf \
+    openssl req -config <(cat ${DIR}/openssl.cnf \
+        <(printf "\n[SAN]\nsubjectAltName=DNS:${host},IP:${ip}")) \
+          -reqexts SAN \
           -key ${CA_DIR}/private/${host}.key.pem \
           -passin pass:changeit \
           -new -sha256 -out ${CA_DIR}/csr/${host}.csr.pem \
@@ -85,8 +88,8 @@ function generateKey {
           -out ${CA_DIR}/certs/${host}.cert.pem
 }
 
-generateKey "localhost"
-generateKey "foo-host"
+generateKey "localhost" "127.0.0.1"
+generateKey "foo-host" "1.2.3.4"
 
 echo "[INFO] Generating client auth private key"
 openssl genrsa -aes256 \
diff --git a/src/test/bash/openssl.cnf b/src/test/bash/openssl.cnf
index fdf9064d8e..721bd488db 100644
--- a/src/test/bash/openssl.cnf
+++ b/src/test/bash/openssl.cnf
@@ -30,6 +30,7 @@ cert_opt          = ca_default
 default_days      = 375
 preserve          = no
 policy            = policy_strict
+copy_extensions   = copy
 
 [ policy_strict ]
 # The root CA should only sign intermediate certificates that match.
@@ -103,4 +104,4 @@ nsComment = "OpenSSL Generated Server Certificate"
 subjectKeyIdentifier = hash
 authorityKeyIdentifier = keyid,issuer:always
 keyUsage = critical, digitalSignature, keyEncipherment
-extendedKeyUsage = serverAuth
\ No newline at end of file
+extendedKeyUsage = serverAuth
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java
index e543cf19e3..a9be5c5885 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java
@@ -15,23 +15,27 @@
  */
 package io.lettuce.core.sentinel;
 
+import static io.lettuce.test.settings.TestSettings.sslPort;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+import java.io.File;
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.RedisBug;
-import io.lettuce.core.RedisClient;
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSupport;
+import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.internal.HostAndPort;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DnsResolver;
 import io.lettuce.core.resource.MappingSocketAddressResolver;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
+import io.lettuce.test.CanConnect;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.resource.FastShutdown;
 import io.lettuce.test.settings.TestSettings;
@@ -45,6 +49,8 @@
 @RedisBug("https://github.com/antirez/redis/issues/6160")
 class SentinelSslIntegrationTests extends TestSupport {
 
+    private static final File TRUSTSTORE_FILE = new File("work/truststore.jks");
+
     private final ClientResources clientResources;
 
     @Inject
@@ -56,10 +62,16 @@ class SentinelSslIntegrationTests extends TestSupport {
                 })).build();
     }
 
+    @BeforeAll
+    static void beforeAll() {
+        assumeTrue(CanConnect.to(TestSettings.host(), sslPort()), "Assume that stunnel runs on port 6443");
+        assertThat(TRUSTSTORE_FILE).exists();
+    }
+
     @Test
     void shouldConnectSentinelDirectly() {
 
-        RedisURI redisURI = RedisURI.create("rediss://" + TestSettings.host() + ":26379");
+        RedisURI redisURI = RedisURI.create("rediss://" + TestSettings.host() + ":" + RedisURI.DEFAULT_SENTINEL_PORT);
         redisURI.setVerifyPeer(false);
 
         RedisClient client = RedisClient.create(clientResources);
@@ -74,10 +86,12 @@ void shouldConnectSentinelDirectly() {
     @Test
     void shouldConnectToMasterUsingSentinel() {
 
-        RedisURI redisURI = RedisURI.create("rediss-sentinel://" + TestSettings.host() + ":26379?sentinelMasterId=mymaster");
-        redisURI.setVerifyPeer(false);
+        RedisURI redisURI = RedisURI.create("rediss-sentinel://" + TestSettings.host() + ":" + RedisURI.DEFAULT_SENTINEL_PORT
+                + "?sentinelMasterId=mymaster");
+        SslOptions options = SslOptions.builder().truststore(TRUSTSTORE_FILE).build();
 
         RedisClient client = RedisClient.create(clientResources);
+        client.setOptions(ClientOptions.builder().sslOptions(options).build());
         StatefulRedisConnection<String, String> connection = client.connect(redisURI);
 
         assertThat(connection.sync().ping()).isNotNull();

From f02c35386e3cd92cb544bb0cadaa87be4d89af9a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 15 Jan 2020 22:36:02 +0100
Subject: [PATCH 733/808] Polishing #1209

Simplify SSL tests. Refactor SSLEngine initialization into its own method.
---
 .../io/lettuce/core/SslIntegrationTests.java  | 64 ++++---------------
 1 file changed, 14 insertions(+), 50 deletions(-)

diff --git a/src/test/java/io/lettuce/core/SslIntegrationTests.java b/src/test/java/io/lettuce/core/SslIntegrationTests.java
index 09d95e86b9..1ff865df9e 100644
--- a/src/test/java/io/lettuce/core/SslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/SslIntegrationTests.java
@@ -15,7 +15,6 @@
  */
 package io.lettuce.core;
 
-import static io.lettuce.test.settings.TestSettings.host;
 import static io.lettuce.test.settings.TestSettings.sslPort;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -24,9 +23,7 @@
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.security.GeneralSecurityException;
 import java.time.Duration;
-import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -37,16 +34,17 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.test.util.ReflectionTestUtils;
 
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.masterslave.MasterSlave;
-import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
 import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands;
-import io.lettuce.test.*;
-import io.netty.handler.codec.DecoderException;
+import io.lettuce.test.CanConnect;
+import io.lettuce.test.Delay;
+import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.Wait;
+import io.lettuce.test.settings.TestSettings;
 import io.netty.handler.ssl.OpenSsl;
 
 /**
@@ -64,12 +62,12 @@ class SslIntegrationTests extends TestSupport {
     private static final File CA_CERT_FILE = new File("work/ca/certs/ca.cert.pem");
     private static final int MASTER_SLAVE_BASE_PORT_OFFSET = 2000;
 
-    private static final RedisURI URI_NO_VERIFY = sslURIBuilder(0) //
-            .withVerifyPeer(false) //
+    private static final RedisURI URI_VERIFY = sslURIBuilder(0) //
+            .withVerifyPeer(true) //
             .build();
 
-    private static final RedisURI URI_VERIFY = sslURIBuilder(1) //
-            .withVerifyPeer(true) //
+    private static final RedisURI URI_NO_VERIFY = sslURIBuilder(1) //
+            .withVerifyPeer(false) //
             .build();
 
     private static final RedisURI URI_CLIENT_CERT_AUTH = sslURIBuilder(2) //
@@ -98,7 +96,7 @@ class SslIntegrationTests extends TestSupport {
     @BeforeAll
     static void beforeClass() {
 
-        assumeTrue(CanConnect.to(host(), sslPort()), "Assume that stunnel runs on port 6443");
+        assumeTrue(CanConnect.to(TestSettings.host(), sslPort()), "Assume that stunnel runs on port 6443");
         assertThat(TRUSTSTORE_FILE).exists();
     }
 
@@ -234,7 +232,7 @@ void regularSslWithReconnect() {
     @Test
     void sslWithVerificationWillFail() {
 
-        RedisURI redisUri = RedisURI.create("rediss://" + host() + ":" + sslPort());
+        RedisURI redisUri = RedisURI.create("rediss://" + TestSettings.host() + ":" + sslPort());
 
         assertThatThrownBy(() -> redisClient.connect(redisUri).sync()).isInstanceOf(RedisConnectionException.class);
     }
@@ -361,50 +359,16 @@ void pubSubSsl() {
         connection2.getStatefulConnection().close();
     }
 
-    @Test
-    void pubSubSslAndBreakConnection() {
-
-        RedisURI redisURI = RedisURI.Builder.redis(host(), sslPort()).withSsl(true).withVerifyPeer(false).build();
-        redisClient.setOptions(ClientOptions.builder().suspendReconnectOnProtocolFailure(true).build());
-
-        RedisPubSubAsyncCommands<String, String> connection = redisClient.connectPubSub(redisURI).async();
-        RedisPubSubCommands<String, String> connection2 = redisClient.connectPubSub(redisURI).sync();
-
-        redisURI.setVerifyPeer(true);
-        connection.subscribe("c1");
-        connection.subscribe("c2");
-
-        Wait.untilTrue(() -> connection2.pubsubChannels().containsAll(Arrays.asList("c1", "c2"))).waitOrTimeout();
-
-        TestFutures.awaitOrTimeout(connection.quit());
-
-        List<String> future = connection2.pubsubChannels();
-        assertThat(future).doesNotContain("c1", "c2");
-
-        RedisChannelWriter channelWriter = ConnectionTestUtil.getChannelWriter(connection.getStatefulConnection());
-        Wait.untilNotEquals(null, () -> ReflectionTestUtils.getField(channelWriter, "connectionError")).waitOrTimeout();
-
-        RedisFuture<Void> defectFuture = connection.subscribe("foo");
-
-        assertThatThrownBy(() -> TestFutures.awaitOrTimeout(defectFuture)).hasCauseInstanceOf(DecoderException.class)
-                .hasRootCauseInstanceOf(GeneralSecurityException.class);
-
-        assertThat(defectFuture.toCompletableFuture()).isDone();
-
-        connection.getStatefulConnection().close();
-        connection2.getStatefulConnection().close();
-    }
-
     private static RedisURI.Builder sslURIBuilder(int portOffset) {
-        return RedisURI.Builder.redis(host(), sslPort(portOffset)).withSsl(true);
+        return RedisURI.Builder.redis(TestSettings.host(), sslPort(portOffset)).withSsl(true);
     }
 
     private static List<RedisURI> sslUris(IntStream masterSlaveOffsets,
             Function<RedisURI.Builder, RedisURI.Builder> builderCustomizer) {
 
         return masterSlaveOffsets.map(it -> it + MASTER_SLAVE_BASE_PORT_OFFSET)
-                .mapToObj(offset -> RedisURI.Builder.redis(host(), sslPort(offset)).withSsl(true)).map(builderCustomizer)
-                .map(RedisURI.Builder::build).collect(Collectors.toList());
+                .mapToObj(offset -> RedisURI.Builder.redis(TestSettings.host(), sslPort(offset)).withSsl(true))
+                .map(builderCustomizer).map(RedisURI.Builder::build).collect(Collectors.toList());
     }
 
     private URL truststoreURL() throws MalformedURLException {

From 7ddef9c23e2ceb51a3dbc0255d9c1c2a855b192d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 15 Jan 2020 22:55:25 +0100
Subject: [PATCH 734/808] Polishing #1209

Fix cluster slots setup.
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 05534af4a2..dfe1ddcee9 100644
--- a/Makefile
+++ b/Makefile
@@ -49,14 +49,14 @@ vars currentEpoch 3 lastVoteEpoch 0
 endef
 
 define REDIS_CLUSTER_CONFIG_SSL_1
-cf2354ef19ee813a962350b51438314aebce1fe2 127.0.0.1:7479@17479 myself,master - 0 1578163609000 0 connected 1-10000
+cf2354ef19ee813a962350b51438314aebce1fe2 127.0.0.1:7479@17479 myself,master - 0 1578163609000 0 connected 0-10000
 cac8e053dd6f85fab470be57d29dcbac2a4b85c4 127.0.0.1:7480@17480 slave cf2354ef19ee813a962350b51438314aebce1fe2 0 1578163609301 1 connected
 6554e5b1b158dccd4b1d9ca294a3e46a2d3e556d 127.0.0.1:7481@17481 master - 0 1578163609301 2 connected 10001-16383
 vars currentEpoch 2 lastVoteEpoch 0
 endef
 
 define REDIS_CLUSTER_CONFIG_SSL_2
-cf2354ef19ee813a962350b51438314aebce1fe2 127.0.0.1:7479@17479 master - 0 1578163609245 0 connected  1-10000
+cf2354ef19ee813a962350b51438314aebce1fe2 127.0.0.1:7479@17479 master - 0 1578163609245 0 connected  0-10000
 cac8e053dd6f85fab470be57d29dcbac2a4b85c4 127.0.0.1:7480@17480 myself,slave cf2354ef19ee813a962350b51438314aebce1fe2 0 1578163609000 1 connected
 6554e5b1b158dccd4b1d9ca294a3e46a2d3e556d 127.0.0.1:7481@17481 master - 0 1578163609245 2 connected 10001-16383
 vars currentEpoch 2 lastVoteEpoch 0
@@ -64,7 +64,7 @@ endef
 
 define REDIS_CLUSTER_CONFIG_SSL_3
 cac8e053dd6f85fab470be57d29dcbac2a4b85c4 127.0.0.1:7480@17480 slave cf2354ef19ee813a962350b51438314aebce1fe2 0 1578163609279 1 connected
-cf2354ef19ee813a962350b51438314aebce1fe2 127.0.0.1:7479@17479 master - 0 1578163609279 0 connected 1-10000
+cf2354ef19ee813a962350b51438314aebce1fe2 127.0.0.1:7479@17479 master - 0 1578163609279 0 connected 0-10000
 6554e5b1b158dccd4b1d9ca294a3e46a2d3e556d 127.0.0.1:7481@17481 myself,master - 0 1578163609000 2 connected 10001-16383
 vars currentEpoch 2 lastVoteEpoch 0
 endef

From 68e55fb554a1c3c9651f496ab66945412504bbbc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 21 Jan 2020 16:37:25 +0100
Subject: [PATCH 735/808] Use String command representation in
 CommandLatencyId.equals/hashCode #1210

We now use the String representation of a command for equality and hashCode computation.
---
 .../core/metrics/CommandLatencyId.java        |  8 +++--
 .../metrics/CommandLatencyIdUnitTests.java    | 34 +++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
index 34571ef3c4..be4f2ea41c 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyId.java
@@ -33,6 +33,7 @@ public class CommandLatencyId implements Serializable, Comparable<CommandLatency
     private final SocketAddress localAddress;
     private final SocketAddress remoteAddress;
     private final ProtocolKeyword commandType;
+    private final String commandName;
 
     protected CommandLatencyId(SocketAddress localAddress, SocketAddress remoteAddress, ProtocolKeyword commandType) {
         LettuceAssert.notNull(localAddress, "LocalAddress must not be null");
@@ -42,6 +43,7 @@ protected CommandLatencyId(SocketAddress localAddress, SocketAddress remoteAddre
         this.localAddress = localAddress;
         this.remoteAddress = remoteAddress;
         this.commandType = commandType;
+        this.commandName = commandType.name();
     }
 
     /**
@@ -96,14 +98,14 @@ public boolean equals(Object o) {
             return false;
         if (!remoteAddress.equals(that.remoteAddress))
             return false;
-        return commandType.equals(that.commandType);
+        return commandName.equals(that.commandName);
     }
 
     @Override
     public int hashCode() {
         int result = localAddress.hashCode();
         result = 31 * result + remoteAddress.hashCode();
-        result = 31 * result + commandType.hashCode();
+        result = 31 * result + commandName.hashCode();
         return result;
     }
 
@@ -124,7 +126,7 @@ public int compareTo(CommandLatencyId o) {
             return localResult;
         }
 
-        return commandType.toString().compareTo(o.commandType.toString());
+        return commandName.compareTo(o.commandName);
     }
 
     @Override
diff --git a/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java
index 39b29507f2..d6305a7fe7 100644
--- a/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java
+++ b/src/test/java/io/lettuce/core/metrics/CommandLatencyIdUnitTests.java
@@ -20,9 +20,12 @@
 import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.protocol.CommandKeyword;
+import io.lettuce.core.protocol.ProtocolKeyword;
 import io.netty.channel.local.LocalAddress;
 
 /**
+ * Unit tests for {@link CommandLatencyId}.
+ *
  * @author Mark Paluch
  */
 class CommandLatencyIdUnitTests {
@@ -39,4 +42,35 @@ void testValues() {
         assertThat(sut.localAddress()).isEqualTo(LocalAddress.ANY);
         assertThat(sut.remoteAddress()).isEqualTo(new LocalAddress("me"));
     }
+
+    @Test
+    void testEquality() {
+        assertThat(sut).isEqualTo(CommandLatencyId.create(LocalAddress.ANY, new LocalAddress("me"), new MyCommand("ADDR")));
+        assertThat(sut).isNotEqualTo(CommandLatencyId.create(LocalAddress.ANY, new LocalAddress("me"), new MyCommand("FOO")));
+    }
+
+    @Test
+    void testHashCode() {
+        assertThat(sut)
+                .hasSameHashCodeAs(CommandLatencyId.create(LocalAddress.ANY, new LocalAddress("me"), new MyCommand("ADDR")));
+    }
+
+    static class MyCommand implements ProtocolKeyword {
+
+        final String name;
+
+        public MyCommand(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public byte[] getBytes() {
+            return name.getBytes();
+        }
+
+        @Override
+        public String name() {
+            return name;
+        }
+    }
 }

From 637139272624746df40910621407e62c72a5b6a3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 31 Jan 2020 11:46:10 +0100
Subject: [PATCH 736/808] Add equals/hashCode to StringCommandType #1211

---
 .../core/dynamic/segment/CommandSegments.java | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
index 115b36b6e8..bf1fad9d42 100644
--- a/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
+++ b/src/main/java/io/lettuce/core/dynamic/segment/CommandSegments.java
@@ -43,8 +43,8 @@ public CommandSegments(List<CommandSegment> segments) {
 
         LettuceAssert.isTrue(!segments.isEmpty(), "Command segments must not be empty");
 
-        this.segments = segments.size() > 1 ? Collections.unmodifiableList(segments.subList(1, segments.size())) : Collections
-                .emptyList();
+        this.segments = segments.size() > 1 ? Collections.unmodifiableList(segments.subList(1, segments.size()))
+                : Collections.emptyList();
         this.commandType = potentiallyResolveCommand(segments.get(0).asString());
     }
 
@@ -102,6 +102,23 @@ public String name() {
         public String toString() {
             return name();
         }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o)
+                return true;
+            if (!(o instanceof StringCommandType))
+                return false;
+
+            StringCommandType that = (StringCommandType) o;
+
+            return commandType.equals(that.commandType);
+        }
+
+        @Override
+        public int hashCode() {
+            return commandType.hashCode();
+        }
     }
 
     @Override

From 9667bb5cbfa6aa7ae293dd989676cdd5a6359a78 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 31 Jan 2020 11:48:37 +0100
Subject: [PATCH 737/808] Un-deprecate
 ClientOptions.pingBeforeActivateConnection #1208

pingBeforeActivateConnection turns out to be useful when using RESP2 in cases where the connection authentication should be delayed. Another case is when the PING should be used as auth PING to test whether a reconnect was successful.

Related ticket: #1201.
---
 src/main/java/io/lettuce/core/ClientOptions.java       |  6 +-----
 .../io/lettuce/core/cluster/ClusterClientOptions.java  | 10 ++++++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index 3882c338c6..6f8a20bf1d 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -142,9 +142,7 @@ protected Builder() {
          *
          * @param pingBeforeActivateConnection true/false
          * @return {@code this}
-         * @deprecated since 5.2. PING during connection handshake is mandatory with RESP3.
          */
-        @Deprecated
         public Builder pingBeforeActivateConnection(boolean pingBeforeActivateConnection) {
             this.pingBeforeActivateConnection = pingBeforeActivateConnection;
             return this;
@@ -335,7 +333,7 @@ public ClientOptions.Builder mutate() {
         builder.autoReconnect(isAutoReconnect()).bufferUsageRatio(getBufferUsageRatio())
                 .cancelCommandsOnReconnectFailure(isCancelCommandsOnReconnectFailure())
                 .disconnectedBehavior(getDisconnectedBehavior()).publishOnScheduler(isPublishOnScheduler())
-                .protocolVersion(getConfiguredProtocolVersion()).pingBeforeActivateConnection(isPingBeforeActivateConnection())
+                .pingBeforeActivateConnection(isPingBeforeActivateConnection()).protocolVersion(getConfiguredProtocolVersion())
                 .requestQueueSize(getRequestQueueSize()).socketOptions(getSocketOptions()).sslOptions(getSslOptions())
                 .suspendReconnectOnProtocolFailure(isSuspendReconnectOnProtocolFailure()).timeoutOptions(getTimeoutOptions());
 
@@ -349,9 +347,7 @@ public ClientOptions.Builder mutate() {
      * unless forcing to use the RESP 2 protocol version.
      *
      * @return {@literal true} if {@literal PING} barrier is enabled.
-     * @deprecated since 5.2. PING during connection handshake is mandatory with RESP3.
      */
-    @Deprecated
     public boolean isPingBeforeActivateConnection() {
         return pingBeforeActivateConnection;
     }
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index a87c4aec56..1c42cc0d5f 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -177,6 +177,12 @@ public Builder topologyRefreshOptions(ClusterTopologyRefreshOptions topologyRefr
             return this;
         }
 
+        @Override
+        public Builder pingBeforeActivateConnection(boolean pingBeforeActivateConnection) {
+            super.pingBeforeActivateConnection(pingBeforeActivateConnection);
+            return this;
+        }
+
         @Override
         public Builder protocolVersion(ProtocolVersion protocolVersion) {
             super.protocolVersion(protocolVersion);
@@ -269,8 +275,8 @@ public ClusterClientOptions.Builder mutate() {
         builder.autoReconnect(isAutoReconnect()).bufferUsageRatio(getBufferUsageRatio())
                 .cancelCommandsOnReconnectFailure(isCancelCommandsOnReconnectFailure())
                 .disconnectedBehavior(getDisconnectedBehavior()).publishOnScheduler(isPublishOnScheduler())
-                .protocolVersion(getConfiguredProtocolVersion()).requestQueueSize(getRequestQueueSize())
-                .socketOptions(getSocketOptions()).sslOptions(getSslOptions())
+                .pingBeforeActivateConnection(isPingBeforeActivateConnection()).protocolVersion(getConfiguredProtocolVersion())
+                .requestQueueSize(getRequestQueueSize()).socketOptions(getSocketOptions()).sslOptions(getSslOptions())
                 .suspendReconnectOnProtocolFailure(isSuspendReconnectOnProtocolFailure()).timeoutOptions(getTimeoutOptions())
                 .validateClusterNodeMembership(isValidateClusterNodeMembership()).maxRedirects(getMaxRedirects())
                 .topologyRefreshOptions(getTopologyRefreshOptions());

From 7d623d3dc829e06f328d7bb7200fa4b7ef268a5d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 31 Jan 2020 12:07:42 +0100
Subject: [PATCH 738/808] Improve documentation for
 AbstractRedisClient.shutdown #1212

---
 .../io/lettuce/core/AbstractRedisClient.java  | 53 ++++++++++++-------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index 6789ffc08e..b1a602e658 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -363,32 +363,42 @@ private void initializeChannelAsync0(ConnectionBuilder connectionBuilder, Comple
     }
 
     /**
-     * Shutdown this client and close all open connections. The client should be discarded after calling shutdown. The shutdown
-     * has no quiet time and a timeout of 2 seconds.
+     * Shutdown this client and close all open connections once this method is called. Once all connections are closed, the
+     * associated {@link ClientResources} are shut down/released gracefully considering quiet time and the shutdown timeout. The
+     * client should be discarded after calling shutdown. The shutdown is executed without quiet time and a timeout of 2
+     * {@link TimeUnit#SECONDS}.
+     *
+     * @see EventExecutorGroup#shutdownGracefully(long, long, TimeUnit)
      */
     public void shutdown() {
         shutdown(0, 2, TimeUnit.SECONDS);
     }
 
     /**
-     * Shutdown this client and close all open connections. The client should be discarded after calling shutdown.
+     * Shutdown this client and close all open connections once this method is called. Once all connections are closed, the
+     * associated {@link ClientResources} are shut down/released gracefully considering quiet time and the shutdown timeout. The
+     * client should be discarded after calling shutdown.
      *
-     * @param quietPeriod the quiet period as described in the documentation
-     * @param timeout the maximum amount of time to wait until the executor is shutdown regardless if a task was submitted
-     *        during the quiet period
+     * @param quietPeriod the quiet period to allow the executor gracefully shut down.
+     * @param timeout the maximum amount of time to wait until the backing executor is shutdown regardless if a task was
+     *        submitted during the quiet period.
      * @since 5.0
+     * @see EventExecutorGroup#shutdownGracefully(long, long, TimeUnit)
      */
     public void shutdown(Duration quietPeriod, Duration timeout) {
         shutdown(quietPeriod.toNanos(), timeout.toNanos(), TimeUnit.NANOSECONDS);
     }
 
     /**
-     * Shutdown this client and close all open connections. The client should be discarded after calling shutdown.
+     * Shutdown this client and close all open connections once this method is called. Once all connections are closed, the
+     * associated {@link ClientResources} are shut down/released gracefully considering quiet time and the shutdown timeout. The
+     * client should be discarded after calling shutdown.
      *
-     * @param quietPeriod the quiet period as described in the documentation
-     * @param timeout the maximum amount of time to wait until the executor is shutdown regardless if a task was submitted
-     *        during the quiet period
-     * @param timeUnit the unit of {@code quietPeriod} and {@code timeout}
+     * @param quietPeriod the quiet period to allow the executor gracefully shut down.
+     * @param timeout the maximum amount of time to wait until the backing executor is shutdown regardless if a task was
+     *        submitted during the quiet period.
+     * @param timeUnit the unit of {@code quietPeriod} and {@code timeout}.
+     * @see EventExecutorGroup#shutdownGracefully(long, long, TimeUnit)
      */
     public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
 
@@ -413,24 +423,29 @@ public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
     }
 
     /**
-     * Shutdown this client and close all open connections asynchronously. The client should be discarded after calling
-     * shutdown. The shutdown has 2 secs quiet time and a timeout of 15 secs.
+     * Shutdown this client and close all open connections asynchronously. Once all connections are closed, the associated
+     * {@link ClientResources} are shut down/released gracefully considering quiet time and the shutdown timeout. The client
+     * should be discarded after calling shutdown. The shutdown has 2 {@link TimeUnit#SECONDS} quiet time and a timeout of 15
+     * {@link TimeUnit#SECONDS}.
      *
      * @since 4.4
+     * @see EventExecutorGroup#shutdownGracefully(long, long, TimeUnit)
      */
     public CompletableFuture<Void> shutdownAsync() {
         return shutdownAsync(2, 15, TimeUnit.SECONDS);
     }
 
     /**
-     * Shutdown this client and close all open connections asynchronously. The client should be discarded after calling
-     * shutdown.
+     * Shutdown this client and close all open connections asynchronously. Once all connections are closed, the associated
+     * {@link ClientResources} are shut down/released gracefully considering quiet time and the shutdown timeout. The client
+     * should be discarded after calling shutdown.
      *
-     * @param quietPeriod the quiet period as described in the documentation
-     * @param timeout the maximum amount of time to wait until the executor is shutdown regardless if a task was submitted
-     *        during the quiet period
-     * @param timeUnit the unit of {@code quietPeriod} and {@code timeout}
+     * @param quietPeriod the quiet period to allow the executor gracefully shut down.
+     * @param timeout the maximum amount of time to wait until the backing executor is shutdown regardless if a task was
+     *        submitted during the quiet period.
+     * @param timeUnit the unit of {@code quietPeriod} and {@code timeout}.
      * @since 4.4
+     * @see EventExecutorGroup#shutdownGracefully(long, long, TimeUnit)
      */
     public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, TimeUnit timeUnit) {
 

From 974dd70b0dd965b78a80b66c98b3e6b52e47fd39 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 31 Jan 2020 12:10:53 +0100
Subject: [PATCH 739/808] Use consistently a shutdown timeout of 2 seconds in
 all AbstractRedisClient.shutdown methods #1214

---
 src/main/java/io/lettuce/core/AbstractRedisClient.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index b1a602e658..b5145188db 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -425,14 +425,14 @@ public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
     /**
      * Shutdown this client and close all open connections asynchronously. Once all connections are closed, the associated
      * {@link ClientResources} are shut down/released gracefully considering quiet time and the shutdown timeout. The client
-     * should be discarded after calling shutdown. The shutdown has 2 {@link TimeUnit#SECONDS} quiet time and a timeout of 15
+     * should be discarded after calling shutdown. The shutdown is executed without quiet time and a timeout of 2
      * {@link TimeUnit#SECONDS}.
      *
      * @since 4.4
      * @see EventExecutorGroup#shutdownGracefully(long, long, TimeUnit)
      */
     public CompletableFuture<Void> shutdownAsync() {
-        return shutdownAsync(2, 15, TimeUnit.SECONDS);
+        return shutdownAsync(0, 2, TimeUnit.SECONDS);
     }
 
     /**

From f73b8103ec61d06f9cae238649049b763c9f14ca Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 6 Feb 2020 14:20:58 +0100
Subject: [PATCH 740/808] Fix StreamMessage parsing for XREAD #1216

StreamReadOutput now correctly retains the stream key after parsing a StreamMessage.
---
 .../lettuce/core/output/StreamReadOutput.java |  28 ++-
 .../StreamCommandIntegrationTests.java        |  51 +++--
 .../output/StreamReadOutputUnitTests.java     | 193 ++++++++++++++++++
 3 files changed, 255 insertions(+), 17 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/output/StreamReadOutputUnitTests.java

diff --git a/src/main/java/io/lettuce/core/output/StreamReadOutput.java b/src/main/java/io/lettuce/core/output/StreamReadOutput.java
index 64a81a5574..9c147d1df6 100644
--- a/src/main/java/io/lettuce/core/output/StreamReadOutput.java
+++ b/src/main/java/io/lettuce/core/output/StreamReadOutput.java
@@ -29,11 +29,12 @@
  * @author Mark Paluch
  * @since 5.1
  */
-public class StreamReadOutput<K, V> extends CommandOutput<K, V, List<StreamMessage<K, V>>> implements
-        StreamingOutput<StreamMessage<K, V>> {
+public class StreamReadOutput<K, V> extends CommandOutput<K, V, List<StreamMessage<K, V>>>
+        implements StreamingOutput<StreamMessage<K, V>> {
 
     private boolean initialized;
     private Subscriber<StreamMessage<K, V>> subscriber;
+    private boolean skipStreamKeyReset = false;
     private K stream;
     private K key;
     private String id;
@@ -48,7 +49,12 @@ public StreamReadOutput(RedisCodec<K, V> codec) {
     public void set(ByteBuffer bytes) {
 
         if (stream == null) {
+            if (bytes == null) {
+                return;
+            }
+
             stream = codec.decodeKey(bytes);
+            skipStreamKeyReset = true;
             return;
         }
 
@@ -82,12 +88,24 @@ public void multi(int count) {
     @Override
     public void complete(int depth) {
 
-        if (depth == 1 && body != null) {
+        if (depth == 3 && body != null) {
             subscriber.onNext(output, new StreamMessage<>(stream, id, body));
-            stream = null;
             key = null;
-            id = null;
             body = null;
+            id = null;
+        }
+
+        // RESP2/RESP3 compat
+        if (depth == 2 && skipStreamKeyReset) {
+            skipStreamKeyReset = false;
+        }
+
+        if (depth == 1) {
+            if (skipStreamKeyReset) {
+                skipStreamKeyReset = false;
+            } else {
+                stream = null;
+            }
         }
     }
 
diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
index 5b5d1846e4..66234ac24c 100644
--- a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
@@ -181,27 +181,54 @@ void xrevrange() {
     }
 
     @Test
-    void xread() {
+    void xreadSingleStream() {
+
+        redis.xadd("stream-1", Collections.singletonMap("key1", "value1"));
+        redis.xadd("stream-1", Collections.singletonMap("key2", "value2"));
+
+        List<StreamMessage<String, String>> messages = redis.xread(XReadArgs.Builder.count(2),
+                StreamOffset.from("stream-1", "0-0"));
+
+        assertThat(messages).hasSize(2);
+        StreamMessage<String, String> firstMessage = messages.get(0);
+
+        assertThat(firstMessage.getStream()).isEqualTo("stream-1");
+        assertThat(firstMessage.getBody()).hasSize(1).containsEntry("key1", "value1");
+
+        StreamMessage<String, String> nextMessage = messages.get(1);
+
+        assertThat(nextMessage.getStream()).isEqualTo("stream-1");
+        assertThat(nextMessage.getBody()).hasSize(1).containsEntry("key2", "value2");
+    }
+
+    @Test
+    void xreadMultipleStreams() {
+
+        Map<String, String> biggerBody = new LinkedHashMap<>();
+        biggerBody.put("key4", "value4");
+        biggerBody.put("key5", "value5");
 
         String initial1 = redis.xadd("stream-1", Collections.singletonMap("key1", "value1"));
         String initial2 = redis.xadd("stream-2", Collections.singletonMap("key2", "value2"));
         String message1 = redis.xadd("stream-1", Collections.singletonMap("key3", "value3"));
-        String message2 = redis.xadd("stream-2", Collections.singletonMap("key4", "value4"));
+        String message2 = redis.xadd("stream-2", biggerBody);
+
+        List<StreamMessage<String, String>> messages = redis.xread(StreamOffset.from("stream-1", "0-0"),
+                StreamOffset.from("stream-2", "0-0"));
 
-        List<StreamMessage<String, String>> messages = redis.xread(StreamOffset.from("stream-1", initial1),
-                StreamOffset.from("stream-2", initial2));
+        assertThat(messages).hasSize(4);
 
         StreamMessage<String, String> firstMessage = messages.get(0);
 
-        assertThat(firstMessage.getId()).isEqualTo(message1);
+        assertThat(firstMessage.getId()).isEqualTo(initial1);
         assertThat(firstMessage.getStream()).isEqualTo("stream-1");
-        assertThat(firstMessage.getBody()).containsEntry("key3", "value3");
+        assertThat(firstMessage.getBody()).hasSize(1).containsEntry("key1", "value1");
 
-        StreamMessage<String, String> secondMessage = messages.get(1);
+        StreamMessage<String, String> secondMessage = messages.get(3);
 
         assertThat(secondMessage.getId()).isEqualTo(message2);
         assertThat(secondMessage.getStream()).isEqualTo("stream-2");
-        assertThat(secondMessage.getBody()).containsEntry("key4", "value4");
+        assertThat(secondMessage.getBody()).hasSize(2).containsEntry("key4", "value4");
     }
 
     @Test
@@ -256,8 +283,8 @@ void xinfoGroups() {
     @Test
     void xinfoConsumers() {
 
-        assertThat(redis.xgroupCreate(StreamOffset.from(key, "0-0"), "group", XGroupCreateArgs.Builder.mkstream())).isEqualTo(
-                "OK");
+        assertThat(redis.xgroupCreate(StreamOffset.from(key, "0-0"), "group", XGroupCreateArgs.Builder.mkstream()))
+                .isEqualTo("OK");
         redis.xadd(key, Collections.singletonMap("key1", "value1"));
 
         redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.lastConsumed(key));
@@ -271,8 +298,8 @@ void xgroupCreate() {
 
         assertThat(redis.xgroupCreate(StreamOffset.latest(key), "group", XGroupCreateArgs.Builder.mkstream())).isEqualTo("OK");
 
-        List<Object> groups = redis.dispatch(XINFO, new NestedMultiOutput<>(StringCodec.UTF8), new CommandArgs<>(
-                StringCodec.UTF8).add("GROUPS").add(key));
+        List<Object> groups = redis.dispatch(XINFO, new NestedMultiOutput<>(StringCodec.UTF8),
+                new CommandArgs<>(StringCodec.UTF8).add("GROUPS").add(key));
 
         assertThat(groups).isNotEmpty();
         assertThat(redis.type(key)).isEqualTo("stream");
diff --git a/src/test/java/io/lettuce/core/output/StreamReadOutputUnitTests.java b/src/test/java/io/lettuce/core/output/StreamReadOutputUnitTests.java
new file mode 100644
index 0000000000..d476daae13
--- /dev/null
+++ b/src/test/java/io/lettuce/core/output/StreamReadOutputUnitTests.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.output;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.nio.ByteBuffer;
+
+import org.junit.jupiter.api.Test;
+
+import io.lettuce.core.StreamMessage;
+import io.lettuce.core.codec.StringCodec;
+
+/**
+ * Unit tests for {@link StreamReadOutput}.
+ *
+ * @author Mark Paluch
+ */
+class StreamReadOutputUnitTests {
+
+    private StreamReadOutput<String, String> sut = new StreamReadOutput<>(StringCodec.UTF8);
+
+    @Test
+    void shouldDecodeSingleEntryMessage() {
+
+        sut.multi(2);
+        sut.set(ByteBuffer.wrap("stream-key".getBytes()));
+        sut.complete(1);
+        sut.multi(1);
+        sut.multi(2);
+        sut.set(ByteBuffer.wrap("1234-12".getBytes()));
+        sut.complete(3);
+        sut.multi(2);
+        sut.set(ByteBuffer.wrap("key".getBytes()));
+        sut.complete(4);
+        sut.set(ByteBuffer.wrap("value".getBytes()));
+        sut.complete(4);
+        sut.complete(3);
+        sut.complete(2);
+        sut.complete(1);
+        sut.complete(0);
+
+        assertThat(sut.get()).hasSize(1);
+        StreamMessage<String, String> streamMessage = sut.get().get(0);
+
+        assertThat(streamMessage.getId()).isEqualTo("1234-12");
+        assertThat(streamMessage.getStream()).isEqualTo("stream-key");
+        assertThat(streamMessage.getBody()).hasSize(1).containsEntry("key", "value");
+    }
+
+    @Test
+    void shouldDecodeMultiEntryMessage() {
+
+        sut.multi(2);
+        sut.set(ByteBuffer.wrap("stream-key".getBytes()));
+        sut.complete(1);
+        sut.multi(1);
+        sut.multi(2);
+        sut.set(ByteBuffer.wrap("1234-12".getBytes()));
+        sut.complete(3);
+        sut.multi(4);
+        sut.set(ByteBuffer.wrap("key1".getBytes()));
+        sut.complete(4);
+        sut.set(ByteBuffer.wrap("value1".getBytes()));
+        sut.complete(4);
+        sut.set(ByteBuffer.wrap("key2".getBytes()));
+        sut.complete(4);
+        sut.set(ByteBuffer.wrap("value2".getBytes()));
+        sut.complete(4);
+        sut.complete(3);
+        sut.complete(2);
+        sut.complete(1);
+        sut.complete(0);
+
+        assertThat(sut.get()).hasSize(1);
+        StreamMessage<String, String> streamMessage = sut.get().get(0);
+
+        assertThat(streamMessage.getId()).isEqualTo("1234-12");
+        assertThat(streamMessage.getStream()).isEqualTo("stream-key");
+        assertThat(streamMessage.getBody()).hasSize(2).containsEntry("key1", "value1").containsEntry("key2", "value2");
+    }
+
+    @Test
+    void shouldDecodeTwoSingleEntryMessage() {
+
+        sut.multi(2);
+        sut.set(ByteBuffer.wrap("stream-key".getBytes()));
+        sut.complete(1);
+        sut.multi(2);
+
+        sut.multi(2);
+        sut.set(ByteBuffer.wrap("1234-11".getBytes()));
+        sut.complete(3);
+        sut.multi(2);
+        sut.set(ByteBuffer.wrap("key1".getBytes()));
+        sut.complete(4);
+        sut.set(ByteBuffer.wrap("value1".getBytes()));
+        sut.complete(4);
+        sut.complete(3);
+        sut.complete(2);
+
+        sut.multi(2);
+        sut.set(ByteBuffer.wrap("1234-22".getBytes()));
+        sut.complete(3);
+        sut.multi(2);
+        sut.set(ByteBuffer.wrap("key2".getBytes()));
+        sut.complete(4);
+        sut.set(ByteBuffer.wrap("value2".getBytes()));
+        sut.complete(4);
+        sut.complete(3);
+        sut.complete(2);
+
+        sut.complete(1);
+        sut.complete(0);
+
+        assertThat(sut.get()).hasSize(2);
+        StreamMessage<String, String> streamMessage1 = sut.get().get(0);
+
+        assertThat(streamMessage1.getId()).isEqualTo("1234-11");
+        assertThat(streamMessage1.getStream()).isEqualTo("stream-key");
+        assertThat(streamMessage1.getBody()).hasSize(1).containsEntry("key1", "value1");
+
+        StreamMessage<String, String> streamMessage2 = sut.get().get(1);
+
+        assertThat(streamMessage2.getId()).isEqualTo("1234-22");
+        assertThat(streamMessage2.getStream()).isEqualTo("stream-key");
+        assertThat(streamMessage2.getBody()).hasSize(1).containsEntry("key2", "value2");
+    }
+
+    @Test
+    void shouldDecodeFromTwoStreams() {
+
+        sut.multi(4);
+
+        sut.set(ByteBuffer.wrap("stream1".getBytes()));
+        sut.complete(1);
+        sut.multi(1);
+        sut.multi(2);
+        sut.set(ByteBuffer.wrap("1234-11".getBytes()));
+        sut.complete(3);
+        sut.multi(2);
+        sut.set(ByteBuffer.wrap("key1".getBytes()));
+        sut.complete(4);
+        sut.set(ByteBuffer.wrap("value1".getBytes()));
+        sut.complete(4);
+        sut.complete(3);
+        sut.complete(2);
+        sut.complete(1);
+
+        sut.set(ByteBuffer.wrap("stream2".getBytes()));
+        sut.complete(1);
+        sut.multi(1);
+        sut.multi(2);
+        sut.set(ByteBuffer.wrap("1234-22".getBytes()));
+        sut.complete(3);
+        sut.multi(2);
+        sut.set(ByteBuffer.wrap("key2".getBytes()));
+        sut.complete(4);
+        sut.set(ByteBuffer.wrap("value2".getBytes()));
+        sut.complete(4);
+        sut.complete(3);
+        sut.complete(2);
+        sut.complete(1);
+
+        sut.complete(0);
+
+        assertThat(sut.get()).hasSize(2);
+        StreamMessage<String, String> streamMessage1 = sut.get().get(0);
+
+        assertThat(streamMessage1.getId()).isEqualTo("1234-11");
+        assertThat(streamMessage1.getStream()).isEqualTo("stream1");
+        assertThat(streamMessage1.getBody()).hasSize(1).containsEntry("key1", "value1");
+
+        StreamMessage<String, String> streamMessage2 = sut.get().get(1);
+
+        assertThat(streamMessage2.getId()).isEqualTo("1234-22");
+        assertThat(streamMessage2.getStream()).isEqualTo("stream2");
+        assertThat(streamMessage2.getBody()).hasSize(1).containsEntry("key2", "value2");
+    }
+}

From bd2f18cca059f33f30ad3bde2b76c15d8beeb591 Mon Sep 17 00:00:00 2001
From: Hodur Heidarsson <hheidarsson@ripple.com>
Date: Fri, 7 Feb 2020 14:29:10 +0000
Subject: [PATCH 741/808] Add support for variadic hset invocation #1217

Original pull request: #1220.
---
 .../io/lettuce/core/AbstractRedisAsyncCommands.java  |  5 +++++
 .../lettuce/core/AbstractRedisReactiveCommands.java  |  5 +++++
 .../java/io/lettuce/core/RedisCommandBuilder.java    |  9 +++++++++
 .../core/api/async/RedisHashAsyncCommands.java       |  9 +++++++++
 .../core/api/reactive/RedisHashReactiveCommands.java |  9 +++++++++
 .../io/lettuce/core/api/sync/RedisHashCommands.java  |  9 +++++++++
 .../api/async/NodeSelectionHashAsyncCommands.java    |  9 +++++++++
 .../cluster/api/sync/NodeSelectionHashCommands.java  |  9 +++++++++
 .../io/lettuce/core/api/RedisHashCommands.java       |  9 +++++++++
 .../core/commands/HashCommandIntegrationTests.java   | 12 ++++++++++++
 10 files changed, 85 insertions(+)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 9e5a47033c..7008e10d0d 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -772,6 +772,11 @@ public RedisFuture<Boolean> hset(K key, K field, V value) {
         return dispatch(commandBuilder.hset(key, field, value));
     }
 
+    @Override
+    public RedisFuture<Long> hset(K key, Map<K, V> map) {
+        return dispatch(commandBuilder.hset(key, map));
+    }
+
     @Override
     public RedisFuture<Boolean> hsetnx(K key, K field, V value) {
         return dispatch(commandBuilder.hsetnx(key, field, value));
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index e904088d77..0f994d4e80 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -837,6 +837,11 @@ public Mono<Boolean> hset(K key, K field, V value) {
         return createMono(() -> commandBuilder.hset(key, field, value));
     }
 
+    @Override
+    public Mono<Long> hset(K key, Map<K, V> map) {
+        return createMono(() -> commandBuilder.hset(key, map));
+    }
+
     @Override
     public Mono<Boolean> hsetnx(K key, K field, V value) {
         return createMono(() -> commandBuilder.hsetnx(key, field, value));
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 20f9d3df16..a51d0f8e27 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -1051,6 +1051,15 @@ Command<K, V, Boolean> hset(K key, K field, V value) {
         return createCommand(HSET, new BooleanOutput<>(codec), args);
     }
 
+    Command<K, V, Long> hset(K key, Map<K, V> map) {
+        notNullKey(key);
+        LettuceAssert.notNull(map, "Map " + MUST_NOT_BE_NULL);
+        LettuceAssert.isTrue(!map.isEmpty(), "Map " + MUST_NOT_BE_EMPTY);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).add(map);
+        return createCommand(HSET, new IntegerOutput<>(codec), args);
+    }
+
     Command<K, V, Boolean> hsetnx(K key, K field, V value) {
         notNullKey(key);
         LettuceAssert.notNull(field, "Field " + MUST_NOT_BE_NULL);
diff --git a/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
index 693a213fb5..a39c29f249 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
@@ -249,6 +249,15 @@ public interface RedisHashAsyncCommands<K, V> {
      */
     RedisFuture<Boolean> hset(K key, K field, V value);
 
+    /**
+     * Set multiple hash fields to multiple values.
+     *
+     * @param key the key of the hash
+     * @param map the field/value pairs to update
+     * @return Long integer-reply: the number of fields that were added.
+     */
+    RedisFuture<Long> hset(K key, Map<K, V> map);
+
     /**
      * Set the value of a hash field, only if the field does not exist.
      *
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
index 8b60f8cb8f..14edb4525b 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
@@ -250,6 +250,15 @@ public interface RedisHashReactiveCommands<K, V> {
      */
     Mono<Boolean> hset(K key, K field, V value);
 
+    /**
+     * Set multiple hash fields to multiple values.
+     *
+     * @param key the key of the hash
+     * @param map the field/value pairs to update
+     * @return Long integer-reply: the number of fields that were added.
+     */
+    Mono<Long> hset(K key, Map<K, V> map);
+
     /**
      * Set the value of a hash field, only if the field does not exist.
      *
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
index 11a3e9d5c8..b7f09e8b72 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
@@ -249,6 +249,15 @@ public interface RedisHashCommands<K, V> {
      */
     Boolean hset(K key, K field, V value);
 
+    /**
+     * Set multiple hash fields to multiple values.
+     *
+     * @param key the key of the hash
+     * @param map the field/value pairs to update
+     * @return Long integer-reply: the number of fields that were added.
+     */
+    Long hset(K key, Map<K, V> map);
+
     /**
      * Set the value of a hash field, only if the field does not exist.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
index c60d85294a..e21ea4016d 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
@@ -249,6 +249,15 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
      */
     AsyncExecutions<Boolean> hset(K key, K field, V value);
 
+    /**
+     * Set multiple hash fields to multiple values.
+     *
+     * @param key the key of the hash
+     * @param map the field/value pairs to update
+     * @return Long integer-reply: the number of fields that were added.
+     */
+    AsyncExecutions<Long> hset(K key, Map<K, V> map);
+
     /**
      * Set the value of a hash field, only if the field does not exist.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
index 3ac4203576..87593c6808 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
@@ -249,6 +249,15 @@ public interface NodeSelectionHashCommands<K, V> {
      */
     Executions<Boolean> hset(K key, K field, V value);
 
+    /**
+     * Set multiple hash fields to multiple values.
+     *
+     * @param key the key of the hash
+     * @param map the field/value pairs to update
+     * @return Long integer-reply: the number of fields that were added.
+     */
+    Executions<Long> hset(K key, Map<K, V> map);
+
     /**
      * Set the value of a hash field, only if the field does not exist.
      *
diff --git a/src/main/templates/io/lettuce/core/api/RedisHashCommands.java b/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
index 10e911a0a0..2e1a773650 100644
--- a/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
@@ -248,6 +248,15 @@ public interface RedisHashCommands<K, V> {
      */
     Boolean hset(K key, K field, V value);
 
+    /**
+     * Set multiple hash fields to multiple values.
+     *
+     * @param key the key of the hash
+     * @param map the field/value pairs to update
+     * @return Long integer-reply: the number of fields that were added.
+     */
+    Long hset(K key, Map<K, V> map);
+
     /**
      * Set the value of a hash field, only if the field does not exist.
      *
diff --git a/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java
index 0c24f9cb97..f02987ca48 100644
--- a/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java
@@ -223,6 +223,18 @@ void hset() {
         assertThat(redis.hset(key, "one", "1")).isFalse();
     }
 
+    @Test
+    void hsetMap() {
+        Map<String, String> hash = new LinkedHashMap<>();
+        hash.put("two", "2");
+        hash.put("three", "3");
+        assertThat(redis.hset(key, hash)).isEqualTo(2);
+
+        hash.put("two", "second");
+        assertThat(redis.hset(key, hash)).isEqualTo(0);
+        assertThat(redis.hget(key, "two")).isEqualTo("second");
+    }
+
     @Test
     void hsetnx() {
         redis.hset(key, "one", "1");

From 6f2493e0075d7801334b3f21c81da66bdbf02a9d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 10 Feb 2020 09:19:03 +0100
Subject: [PATCH 742/808] Polishing #1217

Add since and author tags. Guard tests for appropriate Redis version.

Original pull request: #1220.
---
 .../io/lettuce/core/api/async/RedisHashAsyncCommands.java     | 1 +
 .../lettuce/core/api/reactive/RedisHashReactiveCommands.java  | 1 +
 src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java | 1 +
 .../cluster/api/async/NodeSelectionHashAsyncCommands.java     | 1 +
 .../core/cluster/api/sync/NodeSelectionHashCommands.java      | 1 +
 src/main/templates/io/lettuce/core/api/RedisHashCommands.java | 1 +
 .../io/lettuce/core/commands/HashCommandIntegrationTests.java | 4 ++++
 7 files changed, 10 insertions(+)

diff --git a/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
index a39c29f249..4f0aa562e1 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java
@@ -255,6 +255,7 @@ public interface RedisHashAsyncCommands<K, V> {
      * @param key the key of the hash
      * @param map the field/value pairs to update
      * @return Long integer-reply: the number of fields that were added.
+     * @since 5.3
      */
     RedisFuture<Long> hset(K key, Map<K, V> map);
 
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
index 14edb4525b..187a8249be 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisHashReactiveCommands.java
@@ -256,6 +256,7 @@ public interface RedisHashReactiveCommands<K, V> {
      * @param key the key of the hash
      * @param map the field/value pairs to update
      * @return Long integer-reply: the number of fields that were added.
+     * @since 5.3
      */
     Mono<Long> hset(K key, Map<K, V> map);
 
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
index b7f09e8b72..562c3479b2 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisHashCommands.java
@@ -255,6 +255,7 @@ public interface RedisHashCommands<K, V> {
      * @param key the key of the hash
      * @param map the field/value pairs to update
      * @return Long integer-reply: the number of fields that were added.
+     * @since 5.3
      */
     Long hset(K key, Map<K, V> map);
 
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
index e21ea4016d..41a6ee1d2c 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionHashAsyncCommands.java
@@ -255,6 +255,7 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
      * @param key the key of the hash
      * @param map the field/value pairs to update
      * @return Long integer-reply: the number of fields that were added.
+     * @since 5.3
      */
     AsyncExecutions<Long> hset(K key, Map<K, V> map);
 
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
index 87593c6808..57dea1cc7f 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionHashCommands.java
@@ -255,6 +255,7 @@ public interface NodeSelectionHashCommands<K, V> {
      * @param key the key of the hash
      * @param map the field/value pairs to update
      * @return Long integer-reply: the number of fields that were added.
+     * @since 5.3
      */
     Executions<Long> hset(K key, Map<K, V> map);
 
diff --git a/src/main/templates/io/lettuce/core/api/RedisHashCommands.java b/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
index 2e1a773650..2229401998 100644
--- a/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisHashCommands.java
@@ -254,6 +254,7 @@ public interface RedisHashCommands<K, V> {
      * @param key the key of the hash
      * @param map the field/value pairs to update
      * @return Long integer-reply: the number of fields that were added.
+     * @since 5.3
      */
     Long hset(K key, Map<K, V> map);
 
diff --git a/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java
index f02987ca48..43e2e02b9c 100644
--- a/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java
@@ -38,8 +38,11 @@
 import io.lettuce.test.condition.EnabledOnCommand;
 
 /**
+ * Integration tests for {@link io.lettuce.core.api.sync.RedisHashCommands}.
+ *
  * @author Will Glozer
  * @author Mark Paluch
+ * @author Hodur Heidarsson
  */
 @ExtendWith(LettuceExtension.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -224,6 +227,7 @@ void hset() {
     }
 
     @Test
+    @EnabledOnCommand("UNLINK") // version guard for Redis 4
     void hsetMap() {
         Map<String, String> hash = new LinkedHashMap<>();
         hash.put("two", "2");

From 481d41f9076ef8d078ea594fe6fede117411c802 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 10 Feb 2020 10:09:58 +0100
Subject: [PATCH 743/808] Atomically send ASKING and redirected command #1218

When encountering an ASK redirect, Lettuce now sends atomically both commands, ASKING and the redirected command, to avoid race conditions due to interleaved commands.
---
 .../ClusterDistributionChannelWriter.java     | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index 00b721f820..0c759d00e9 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -26,10 +26,12 @@
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.ClusterConnectionProvider.Intent;
 import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.HostAndPort;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.*;
+import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.resource.ClientResources;
 
 /**
@@ -126,8 +128,8 @@ private <K, V, T> RedisCommand<K, V, T> doWrite(RedisCommand<K, V, T> command) {
                 if (isSuccessfullyCompleted(connectFuture)) {
                     writeCommand(commandToSend, false, connectFuture.join(), null);
                 } else {
-                    connectFuture.whenComplete((connection, throwable) -> writeCommand(commandToSend, false, connection,
-                            throwable));
+                    connectFuture
+                            .whenComplete((connection, throwable) -> writeCommand(commandToSend, false, connection, throwable));
                 }
 
                 return commandToSend;
@@ -165,7 +167,7 @@ private static <K, V> void writeCommand(RedisCommand<K, V, ?> command, boolean a
         try {
 
             if (asking) { // set asking bit
-                connection.async().asking();
+                writeCommands(Arrays.asList(asking(), command), ((RedisChannelHandler<K, V>) connection).getChannelWriter());
             }
 
             writeCommand(command, ((RedisChannelHandler<K, V>) connection).getChannelWriter());
@@ -174,6 +176,10 @@ private static <K, V> void writeCommand(RedisCommand<K, V, ?> command, boolean a
         }
     }
 
+    private static <V, K> RedisCommand<K, V, ?> asking() {
+        return new Command(CommandType.ASKING, new StatusOutput<>(StringCodec.ASCII), new CommandArgs<>(StringCodec.ASCII));
+    }
+
     private static <K, V> void writeCommand(RedisCommand<K, V, ?> command, RedisChannelWriter writer) {
 
         try {
@@ -183,6 +189,15 @@ private static <K, V> void writeCommand(RedisCommand<K, V, ?> command, RedisChan
         }
     }
 
+    private static <K, V> void writeCommands(Collection<RedisCommand<K, V, ?>> commands, RedisChannelWriter writer) {
+
+        try {
+            getWriterToUse(writer).write(commands);
+        } catch (Exception e) {
+            commands.forEach(command -> command.completeExceptionally(e));
+        }
+    }
+
     private static RedisChannelWriter getWriterToUse(RedisChannelWriter writer) {
 
         RedisChannelWriter writerToUse = writer;
@@ -237,8 +252,8 @@ private static RedisChannelWriter getWriterToUse(RedisChannelWriter writer) {
         for (Map.Entry<SlotIntent, List<ClusterCommand<K, V, ?>>> entry : partitions.entrySet()) {
 
             SlotIntent slotIntent = entry.getKey();
-            RedisChannelHandler<K, V> connection = (RedisChannelHandler<K, V>) clusterConnectionProvider.getConnection(
-                    slotIntent.intent, slotIntent.slotHash);
+            RedisChannelHandler<K, V> connection = (RedisChannelHandler<K, V>) clusterConnectionProvider
+                    .getConnection(slotIntent.intent, slotIntent.slotHash);
 
             RedisChannelWriter channelWriter = connection.getChannelWriter();
             if (channelWriter instanceof ClusterDistributionChannelWriter) {
@@ -302,8 +317,8 @@ private static Intent getIntent(ProtocolKeyword type) {
     static HostAndPort getMoveTarget(String errorMessage) {
 
         LettuceAssert.notEmpty(errorMessage, "ErrorMessage must not be empty");
-        LettuceAssert.isTrue(errorMessage.startsWith(CommandKeyword.MOVED.name()), "ErrorMessage must start with "
-                + CommandKeyword.MOVED);
+        LettuceAssert.isTrue(errorMessage.startsWith(CommandKeyword.MOVED.name()),
+                "ErrorMessage must start with " + CommandKeyword.MOVED);
 
         String[] movedMessageParts = errorMessage.split(" ");
         LettuceAssert.isTrue(movedMessageParts.length >= 3, "ErrorMessage must consist of 3 tokens (" + errorMessage + ")");
@@ -314,8 +329,8 @@ static HostAndPort getMoveTarget(String errorMessage) {
     static HostAndPort getAskTarget(String errorMessage) {
 
         LettuceAssert.notEmpty(errorMessage, "ErrorMessage must not be empty");
-        LettuceAssert.isTrue(errorMessage.startsWith(CommandKeyword.ASK.name()), "ErrorMessage must start with "
-                + CommandKeyword.ASK);
+        LettuceAssert.isTrue(errorMessage.startsWith(CommandKeyword.ASK.name()),
+                "ErrorMessage must start with " + CommandKeyword.ASK);
 
         String[] movedMessageParts = errorMessage.split(" ");
         LettuceAssert.isTrue(movedMessageParts.length >= 3, "ErrorMessage must consist of 3 tokens (" + errorMessage + ")");

From 3983e78fe5ed751d4bf0b5122079e2c7cad5c62a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 11 Feb 2020 10:01:47 +0100
Subject: [PATCH 744/808] Upgrade dependencies #1224

* AssertJ 3.15.0
* Brave 5.9.4
* JUnit 5.6.0
* Log4j 2.13.0
* Mockito 3.2.4
* Netty 4.1.45.Final
* Reactor 3.3.2.RELEASE
* Spring 4.3.26.RELEASE
---
 pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0a1428cfc3..9ac8c8563c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,16 +58,16 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <assertj-core.version>3.13.2</assertj-core.version>
-        <brave-version>5.7.0</brave-version>
-        <junit-version>5.5.2</junit-version>
-        <log4j2-version>2.11.2</log4j2-version>
-        <mockito.version>3.0.0</mockito.version>
-        <netty-version>4.1.43.Final</netty-version>
-        <reactor-version>3.3.0.RELEASE</reactor-version>
+        <assertj-core.version>3.15.0</assertj-core.version>
+        <brave-version>5.9.4</brave-version>
+        <junit-version>5.6.0</junit-version>
+        <log4j2-version>2.13.0</log4j2-version>
+        <mockito.version>3.2.4</mockito.version>
+        <netty-version>4.1.45.Final</netty-version>
+        <reactor-version>3.3.2.RELEASE</reactor-version>
         <reactive-streams-tck.version>1.0.3</reactive-streams-tck.version>
         <slf4j.version>1.7.25</slf4j.version>
-        <spring-version>4.3.20.RELEASE</spring-version>
+        <spring-version>4.3.26.RELEASE</spring-version>
 
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipITs>true</skipITs>

From 9b34282b3db78b190b2726799307e6efb7e732d8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 11 Feb 2020 10:12:32 +0100
Subject: [PATCH 745/808] Use netty configuration defaults for heap/direct
 buffer allocation #1223

Lettuce now respects PlatformDependent.directBufferPreferred() when allocating buffers so buffers are either all direct or heap buffers.
---
 src/main/java/io/lettuce/core/protocol/CommandEncoder.java    | 3 ++-
 src/main/java/io/lettuce/core/protocol/CommandHandler.java    | 2 +-
 src/main/java/io/lettuce/core/protocol/RedisStateMachine.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/protocol/CommandEncoder.java b/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
index c067265956..08810d7420 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandEncoder.java
@@ -24,6 +24,7 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.EncoderException;
 import io.netty.handler.codec.MessageToByteEncoder;
+import io.netty.util.internal.PlatformDependent;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -40,7 +41,7 @@ public class CommandEncoder extends MessageToByteEncoder<Object> {
     private final boolean debugEnabled = logger.isDebugEnabled();
 
     public CommandEncoder() {
-        this(true);
+        this(PlatformDependent.directBufferPreferred());
     }
 
     public CommandEncoder(boolean preferDirect) {
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
index 57496cce8f..97f6fadf76 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -168,7 +168,7 @@ public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
 
         setState(LifecycleState.REGISTERED);
 
-        buffer = ctx.alloc().directBuffer(8192 * 8);
+        buffer = ctx.alloc().buffer(8192 * 8);
         rsm = new RedisStateMachine(ctx.alloc());
         ctx.fireChannelRegistered();
     }
diff --git a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
index 128aea780a..4528a2b9fa 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisStateMachine.java
@@ -185,7 +185,7 @@ public String toString() {
      * Initialize a new instance.
      */
     public RedisStateMachine(ByteBufAllocator alloc) {
-        this.responseElementBuffer = alloc.directBuffer(1024);
+        this.responseElementBuffer = alloc.buffer(1024);
     }
 
     public boolean isDiscoverProtocol() {

From b48e0872904a5d80b72e07d3464b37976441e53b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 11 Feb 2020 11:31:13 +0100
Subject: [PATCH 746/808] Upgrade dependencies #1225

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9ac8c8563c..7edec1e2e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -554,7 +554,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.4</version>
+                    <version>0.8.5</version>
                 </plugin>
 
                 <plugin>

From c8ce24c8487cac7a04c352f17875e7c023e9804e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 11 Feb 2020 11:40:50 +0100
Subject: [PATCH 747/808] Polishing #1222

---
 src/main/java/io/lettuce/core/GeoCoordinates.java     |  2 +-
 src/main/java/io/lettuce/core/RedisURI.java           | 11 ++++++-----
 .../core/cluster/ClusterTopologyRefreshOptions.java   |  2 +-
 .../pubsub/StatefulRedisClusterPubSubConnection.java  |  8 ++++----
 .../lettuce/core/resource/DirContextDnsResolver.java  |  4 ++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/java/io/lettuce/core/GeoCoordinates.java b/src/main/java/io/lettuce/core/GeoCoordinates.java
index 15070928d5..134dd4f08f 100644
--- a/src/main/java/io/lettuce/core/GeoCoordinates.java
+++ b/src/main/java/io/lettuce/core/GeoCoordinates.java
@@ -47,7 +47,7 @@ public GeoCoordinates(Number x, Number y) {
      *
      * @param x the longitude, must not be {@literal null}.
      * @param y the latitude, must not be {@literal null}.
-     * @return {@literal {@link GeoCoordinates}.
+     * @return {@link GeoCoordinates}.
      */
     public static GeoCoordinates create(Number x, Number y) {
         return new GeoCoordinates(x, y);
diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 20226ae9d4..4e260d1861 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -66,20 +66,21 @@
  *
  * <b>Redis Standalone</b> <blockquote> <i>redis</i><b>{@code ://}</b>[<i>password@</i>]<i>host</i> [<b>{@code :} </b>
  * <i>port</i>][<b>{@code /}</b><i>database</i>][<b>{@code ?}</b> [<i>timeout=timeout</i>[<i>d|h|m|s|ms|us|ns</i>]] [
- * <i>&database=database</i>] [<i>&clientName=clientName</i>]] </blockquote>
+ * <i>&amp;database=database</i>] [<i>&amp;clientName=clientName</i>]] </blockquote>
  *
  * <b>Redis Standalone (SSL)</b> <blockquote> <i>rediss</i><b>{@code ://}</b>[<i>password@</i>]<i>host</i> [<b>{@code :} </b>
  * <i>port</i>][<b>{@code /}</b><i>database</i>][<b>{@code ?}</b> [<i>timeout=timeout</i>[<i>d|h|m|s|ms|us|ns</i>]] [
- * <i>&database=database</i>] [<i>&clientName=clientName</i>]] </blockquote>
+ * <i>&amp;database=database</i>] [<i>&amp;clientName=clientName</i>]] </blockquote>
  *
  * Redis Standalone (Unix Domain Sockets)</b> <blockquote> <i>redis-socket</i><b>{@code ://} </b>[<i>password@</i>]<i>path</i>[
- * <b>{@code ?}</b>[<i>timeout=timeout</i>[<i>d|h|m|s|ms|us|ns</i>]][<i>&database=database</i>] [<i>&clientName=clientName</i>]]
- * </blockquote>
+ * <b>{@code ?}</b>[<i>timeout=timeout</i>[<i>d|h|m|s|ms|us|ns</i>]][<i>&amp;database=database</i>]
+ * [<i>&amp;clientName=clientName</i>]] </blockquote>
  *
  * <b>Redis Sentinel</b> <blockquote> <i>redis-sentinel</i><b>{@code ://}</b>[<i>password@</i>]<i>host1</i> [<b>{@code :} </b>
  * <i>port1</i>][, <i>host2</i> [<b>{@code :}</b><i>port2</i>]][, <i>hostN</i> [<b>{@code :}</b><i>portN</i>]][<b>{@code /} </b>
  * <i>database</i>][<b>{@code ?} </b>[<i>timeout=timeout</i>[<i>d|h|m|s|ms|us|ns</i>]] [
- * <i>&sentinelMasterId=sentinelMasterId</i>] [<i>&database=database</i>] [<i>&clientName=clientName</i>]] </blockquote>
+ * <i>&amp;sentinelMasterId=sentinelMasterId</i>] [<i>&amp;database=database</i>] [<i>&amp;clientName=clientName</i>]]
+ * </blockquote>
  *
  * <p>
  * <b>Schemes</b>
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
index 6deb3bba8f..665ff1b4ca 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshOptions.java
@@ -368,7 +368,7 @@ public boolean isCloseStaleConnections() {
      * to {@literal false}, only the initial seed nodes will be used as sources for topology discovery and the number of clients
      * will be obtained only for the initial seed nodes. This can be useful when using Redis Cluster with many nodes.
      *
-     * @return {@link true} if dynamic refresh sources are enabled
+     * @return {@literal true} if dynamic refresh sources are enabled
      */
     public boolean useDynamicRefreshSources() {
         return dynamicRefreshSources;
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
index 69f48d1261..d95f4c37fe 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/StatefulRedisClusterPubSubConnection.java
@@ -37,10 +37,10 @@
  * subscription.
  *
  * <pre class="code">
- *  StatefulRedisClusterPubSubConnection<String, String> connection = clusterClient.connectPubSub();
+ *  StatefulRedisClusterPubSubConnection&lt;String, String&gt; connection = clusterClient.connectPubSub();
  *  connection.addListener(…);
  *
- *  RedisClusterPubSubCommands<String, String> sync = connection.sync();
+ *  RedisClusterPubSubCommands&lt;String, String&gt; sync = connection.sync();
  *  sync.subscribe("channel");
  *  sync.publish("channel", "message");
  * </pre>
@@ -59,10 +59,10 @@
  *
  * <pre>
  *     <code>
- *  StatefulRedisClusterPubSubConnection<String, String> connection = clusterClient.connectPubSub();
+ *  StatefulRedisClusterPubSubConnection&lt;String, String&gt; connection = clusterClient.connectPubSub();
  *  connection.addListener(…);
  *
- *  RedisClusterPubSubCommands<String, String> sync = connection.sync();
+ *  RedisClusterPubSubCommands&lt;String, String&gt; sync = connection.sync();
  *  sync.replicas().commands().psubscribe("__key*__:*");
  *     </code>
  * </pre>
diff --git a/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java b/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java
index 231c496589..24c1a98a40 100644
--- a/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java
+++ b/src/main/java/io/lettuce/core/resource/DirContextDnsResolver.java
@@ -37,7 +37,7 @@
 import io.lettuce.core.internal.LettuceAssert;
 
 /**
- * DNS Resolver based on Java's {@link com.sun.jndi.dns.DnsContextFactory}. This resolver resolves hostnames to IPv4 and IPv6
+ * DNS Resolver based on Java's {@code com.sun.jndi.dns.DnsContextFactory}. This resolver resolves hostnames to IPv4 and IPv6
  * addresses using {@code A}, {@code AAAA} and {@code CNAME} records. Java IP stack preferences are read from system properties
  * and taken into account when resolving names.
  * <p>
@@ -152,7 +152,7 @@ public void close() throws IOException {
      * Perform hostname to address resolution.
      *
      * @param host the hostname, must not be empty or {@literal null}.
-     * @return array of one or more {@link InetAddress adresses}
+     * @return array of one or more {@link InetAddress addresses}
      * @throws UnknownHostException
      */
     @Override

From 265f9ecb41599fc28008d641ccba75957dc47f23 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 19 Feb 2020 10:31:06 +0100
Subject: [PATCH 748/808] Update project documentation

Add code of conduct. Improve contribution guide.
---
 .github/CODE_OF_CONDUCT.md | 44 ++++++++++++++++++++++++++++++++++++++
 .github/CONTRIBUTING.md    | 37 ++++++++++++++++++++++++++------
 2 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 .github/CODE_OF_CONDUCT.md

diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000..0953611722
--- /dev/null
+++ b/.github/CODE_OF_CONDUCT.md
@@ -0,0 +1,44 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open
+and welcoming community, we pledge to respect all people who contribute through reporting
+issues, posting feature requests, updating documentation, submitting pull requests or
+patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for
+everyone, regardless of level of experience, gender, gender identity and expression,
+sexual orientation, disability, personal appearance, body size, race, ethnicity, age,
+religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic addresses,
+  without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments,
+commits, code, wiki edits, issues, and other contributions that are not aligned to this
+Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors
+that they deem inappropriate, threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to fairly and
+consistently applying these principles to every aspect of managing this project. Project
+maintainers who do not follow or enforce the Code of Conduct may be permanently removed
+from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces when an
+individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
+contacting a project maintainer at lettuce-redis-client-users@googlegroups.com. All complaints will
+be reviewed and investigated and will result in a response that is deemed necessary and
+appropriate to the circumstances. Maintainers are obligated to maintain confidentiality
+with regard to the reporter of an incident.
+
+This Code of Conduct is adapted from the
+[Contributor Covenant](https://contributor-covenant.org), version 1.3.0, available at
+[contributor-covenant.org/version/1/3/0/](https://contributor-covenant.org/version/1/3/0/).
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 2886102315..814158f34f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,10 +1,25 @@
 # Contributing to Lettuce
 
+Lettuce is released under the Apache 2.0 license. If you would like to contribute something, or simply want to hack on the code this document should help you get started.
+
+## Code of Conduct
+
+This project adheres to the Contributor Covenant [code of
+conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to lettuce-redis-client-users@googlegroups.com.
+
+## Using GitHub Issues
+
+We use GitHub issues to track bugs and enhancements. If you have a general usage question please ask on [Stack Overflow](https://stackoverflow.com). 
+The Lettuce team and the broader community monitor the [`lettuce`](https://stackoverflow.com/tags/lettuce) tag.
+
+If you are reporting a bug, please help to speed up problem diagnosis by providing as much information as possible. 
+Ideally, that would include a small sample project that reproduces the problem.
+
 ## Quickstart
  
- For the impatient, if you want to submit a quick pull request:
+For the impatient, if you want to submit a quick pull request:
 
-* Don't create a pull request upfront. Create a feature request ticket first so we can discuss your idea.
+* Don't create a pull request upfront. Create a feature request ticket first, so we can discuss your idea.
 * Upon agreeing the feature is a good fit for Lettuce, please:
   * Make sure there is a ticket in GitHub issues.
   * Make sure you use the code formatters provided here and have them applied to your changes. Don’t submit any formatting related changes.
@@ -36,7 +51,7 @@ If you want to request a feature, please ensure to specify the following:
 
 ## Questions
 
-If you have a question, then check one of the following places first. Typically, forums, chats, and mailing lists are the best place to ask your question as you can expect to get an answer faster there:
+If you have a question, then check one of the following places first as GitHub issues are for bugs and feature requests. Typically, forums, chats, and mailing lists are the best place to ask your question as you can expect to get an answer faster there:
 
 **Checkout the docs**
 
@@ -50,8 +65,18 @@ If you have a question, then check one of the following places first. Typically,
 * Stack Overflow (Questions): [Questions about Lettuce](https://stackoverflow.com/questions/tagged/lettuce)
 * Gitter (General discussion): [![Join the chat at https://gitter.im/lettuce-io/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lettuce-io/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-## License
+### Building from Source
+
+Lettuce source can be built from the command line using Maven on JDK 1.8 or above.
+
+The project can be built from the root directory using the standard Maven command:
+
+```bash
+	$ mvn clean test
+```
 
-By contributing your code, you agree to license your contribution under the terms of [Apache License 2.0] (https://www.apache.org/licenses/LICENSE-2.0).
+You can run a full build including integration tests using the `make` command:
 
-All files are released with the Apache 2.0 license.
+```bash
+	$ make test
+```

From 8a10a96b7618b632ded687d7265d426692847d22 Mon Sep 17 00:00:00 2001
From: dengliming <liming.d.pro@gmail.com>
Date: Fri, 14 Feb 2020 23:41:45 +0800
Subject: [PATCH 749/808] Add support for client id command #1197

Original pull request: #1230.
---
 .../java/io/lettuce/core/AbstractRedisAsyncCommands.java   | 5 +++++
 .../io/lettuce/core/AbstractRedisReactiveCommands.java     | 5 +++++
 src/main/java/io/lettuce/core/RedisCommandBuilder.java     | 5 +++++
 .../lettuce/core/api/async/RedisServerAsyncCommands.java   | 7 +++++++
 .../core/api/reactive/RedisServerReactiveCommands.java     | 7 +++++++
 .../java/io/lettuce/core/api/sync/RedisServerCommands.java | 7 +++++++
 .../api/async/NodeSelectionServerAsyncCommands.java        | 7 +++++++
 .../core/cluster/api/sync/NodeSelectionServerCommands.java | 7 +++++++
 .../templates/io/lettuce/core/api/RedisServerCommands.java | 7 +++++++
 .../core/commands/ServerCommandIntegrationTests.java       | 5 +++++
 10 files changed, 62 insertions(+)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 7008e10d0d..4f0af96fbc 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -182,6 +182,11 @@ public RedisFuture<String> clientList() {
         return dispatch(commandBuilder.clientList());
     }
 
+    @Override
+    public RedisFuture<Long> clientId() {
+        return dispatch(commandBuilder.clientId());
+    }
+
     @Override
     public RedisFuture<String> clientPause(long timeout) {
         return dispatch(commandBuilder.clientPause(timeout));
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 0f994d4e80..9a29955d1c 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -205,6 +205,11 @@ public Mono<String> clientList() {
         return createMono(commandBuilder::clientList);
     }
 
+    @Override
+    public Mono<Long> clientId() {
+        return createMono(commandBuilder::clientId);
+    }
+
     @Override
     public Mono<String> clientPause(long timeout) {
         return createMono(() -> commandBuilder.clientPause(timeout));
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index a51d0f8e27..c006a334a6 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -237,6 +237,11 @@ Command<K, V, String> clientList() {
         return createCommand(CLIENT, new StatusOutput<>(codec), args);
     }
 
+    Command<K, V, Long> clientId() {
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(ID);
+        return createCommand(CLIENT, new IntegerOutput<>(codec), args);
+    }
+
     Command<K, V, String> clientPause(long timeout) {
         CommandArgs<K, V> args = new CommandArgs<>(codec).add(PAUSE).add(timeout);
         return createCommand(CLIENT, new StatusOutput<>(codec), args);
diff --git a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
index a1517f923b..7b26e6a436 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
@@ -106,6 +106,13 @@ public interface RedisServerAsyncCommands<K, V> {
      */
     RedisFuture<String> clientList();
 
+    /**
+     * Get the id of the current connection.
+     *
+     * @return Long The command just returns the ID of the current connection. Every connection ID has certain guarantees
+     */
+    RedisFuture<Long> clientId();
+
     /**
      * Returns an array reply of details about all Redis commands.
      *
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
index d83c9794ff..3a07478043 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
@@ -106,6 +106,13 @@ public interface RedisServerReactiveCommands<K, V> {
      */
     Mono<String> clientList();
 
+    /**
+     * Get the id of the current connection.
+     *
+     * @return Long The command just returns the ID of the current connection. Every connection ID has certain guarantees
+     */
+    Mono<Long> clientId();
+
     /**
      * Returns an array reply of details about all Redis commands.
      *
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
index fb06b490f1..8c44ff6367 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
@@ -105,6 +105,13 @@ public interface RedisServerCommands<K, V> {
      */
     String clientList();
 
+    /**
+     * Get the id of the current connection.
+     *
+     * @return Long The command just returns the ID of the current connection. Every connection ID has certain guarantees
+     */
+    Long clientId();
+
     /**
      * Returns an array reply of details about all Redis commands.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
index c7ab0bb2eb..466c474760 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
@@ -105,6 +105,13 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
      */
     AsyncExecutions<String> clientList();
 
+    /**
+     * Get the id of the current connection.
+     *
+     * @return Long The command just returns the ID of the current connection. Every connection ID has certain guarantees
+     */
+    AsyncExecutions<Long> clientId();
+
     /**
      * Returns an array reply of details about all Redis commands.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
index e111d2cab5..f988663931 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
@@ -105,6 +105,13 @@ public interface NodeSelectionServerCommands<K, V> {
      */
     Executions<String> clientList();
 
+    /**
+     * Get the id of the current connection.
+     *
+     * @return Long The command just returns the ID of the current connection. Every connection ID has certain guarantees
+     */
+    Executions<Long> clientId();
+
     /**
      * Returns an array reply of details about all Redis commands.
      *
diff --git a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
index b395fc1637..2eb4e9bc7c 100644
--- a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
@@ -104,6 +104,13 @@ public interface RedisServerCommands<K, V> {
      */
     String clientList();
 
+    /**
+     * Get the id of the current connection.
+     *
+     * @return Long The command just returns the ID of the current connection. Every connection ID has certain guarantees
+     */
+    Long clientId();
+
     /**
      * Returns an array reply of details about all Redis commands.
      *
diff --git a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
index d5139b1535..e02f2cc9a1 100644
--- a/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/ServerCommandIntegrationTests.java
@@ -167,6 +167,11 @@ void clientUnblock() throws InterruptedException {
         assertThat(blocked.getError()).contains("UNBLOCKED client unblocked");
     }
 
+    @Test
+    void clientId() {
+        assertThat(redis.clientId()).isNotNull();
+    }
+
     @Test
     void commandCount() {
         assertThat(redis.commandCount()).isGreaterThan(100);

From 7ed615ff0767d517645f0a91d4b9bb0523305b65 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 21 Feb 2020 10:31:50 +0100
Subject: [PATCH 750/808] Polishing #1197

Tweak documentation. Add since tags.

Original pull request: #1230.
---
 .../io/lettuce/core/api/async/RedisServerAsyncCommands.java    | 3 ++-
 .../lettuce/core/api/reactive/RedisServerReactiveCommands.java | 3 ++-
 .../java/io/lettuce/core/api/sync/RedisServerCommands.java     | 3 ++-
 .../cluster/api/async/NodeSelectionServerAsyncCommands.java    | 3 ++-
 .../core/cluster/api/sync/NodeSelectionServerCommands.java     | 3 ++-
 .../templates/io/lettuce/core/api/RedisServerCommands.java     | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
index 7b26e6a436..3e790a4d6f 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisServerAsyncCommands.java
@@ -109,7 +109,8 @@ public interface RedisServerAsyncCommands<K, V> {
     /**
      * Get the id of the current connection.
      *
-     * @return Long The command just returns the ID of the current connection. Every connection ID has certain guarantees
+     * @return Long The command just returns the ID of the current connection.
+     * @since 5.3
      */
     RedisFuture<Long> clientId();
 
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
index 3a07478043..cb645b4a01 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisServerReactiveCommands.java
@@ -109,7 +109,8 @@ public interface RedisServerReactiveCommands<K, V> {
     /**
      * Get the id of the current connection.
      *
-     * @return Long The command just returns the ID of the current connection. Every connection ID has certain guarantees
+     * @return Long The command just returns the ID of the current connection.
+     * @since 5.3
      */
     Mono<Long> clientId();
 
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
index 8c44ff6367..3254ddbf0b 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisServerCommands.java
@@ -108,7 +108,8 @@ public interface RedisServerCommands<K, V> {
     /**
      * Get the id of the current connection.
      *
-     * @return Long The command just returns the ID of the current connection. Every connection ID has certain guarantees
+     * @return Long The command just returns the ID of the current connection.
+     * @since 5.3
      */
     Long clientId();
 
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
index 466c474760..9f6c2b8333 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionServerAsyncCommands.java
@@ -108,7 +108,8 @@ public interface NodeSelectionServerAsyncCommands<K, V> {
     /**
      * Get the id of the current connection.
      *
-     * @return Long The command just returns the ID of the current connection. Every connection ID has certain guarantees
+     * @return Long The command just returns the ID of the current connection.
+     * @since 5.3
      */
     AsyncExecutions<Long> clientId();
 
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
index f988663931..2d718a060f 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionServerCommands.java
@@ -108,7 +108,8 @@ public interface NodeSelectionServerCommands<K, V> {
     /**
      * Get the id of the current connection.
      *
-     * @return Long The command just returns the ID of the current connection. Every connection ID has certain guarantees
+     * @return Long The command just returns the ID of the current connection.
+     * @since 5.3
      */
     Executions<Long> clientId();
 
diff --git a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
index 2eb4e9bc7c..a09797ff6e 100644
--- a/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisServerCommands.java
@@ -107,7 +107,8 @@ public interface RedisServerCommands<K, V> {
     /**
      * Get the id of the current connection.
      *
-     * @return Long The command just returns the ID of the current connection. Every connection ID has certain guarantees
+     * @return Long The command just returns the ID of the current connection.
+     * @since 5.3
      */
     Long clientId();
 

From 6970214e4126287c0a447b2ccc00f1692978cd6e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 21 Feb 2020 10:40:05 +0100
Subject: [PATCH 751/808] Improve RedisURI documentation for sentinel
 authentication #1232

---
 src/main/java/io/lettuce/core/RedisURI.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 4e260d1861..62e7327a01 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -83,6 +83,11 @@
  * </blockquote>
  *
  * <p>
+ * Note: When using Redis Sentinel, the password from the URI applies to the data nodes only. Sentinel authentication must be
+ * configured for each {@link #getSentinels() sentinel node}.
+ * </p>
+ *
+ * <p>
  * <b>Schemes</b>
  * </p>
  * <ul>

From c1a2d551ac2d3df1e58c6f1a86c5d3d7eddefe65 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 21 Feb 2020 10:53:09 +0100
Subject: [PATCH 752/808] Add support for KEEPTTL with SET #1234

---
 src/main/java/io/lettuce/core/SetArgs.java    | 28 +++++++++++++++++++
 .../StringCommandIntegrationTests.java        | 17 ++++++++---
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/SetArgs.java b/src/main/java/io/lettuce/core/SetArgs.java
index 651a0aca83..d29d23a2ca 100644
--- a/src/main/java/io/lettuce/core/SetArgs.java
+++ b/src/main/java/io/lettuce/core/SetArgs.java
@@ -33,6 +33,7 @@ public class SetArgs implements CompositeArgument {
     private Long px;
     private boolean nx = false;
     private boolean xx = false;
+    private boolean keepttl = false;
 
     /**
      * Builder entry points for {@link SetArgs}.
@@ -86,6 +87,17 @@ public static SetArgs nx() {
         public static SetArgs xx() {
             return new SetArgs().xx();
         }
+
+        /**
+         * Creates new {@link SetArgs} and enabling {@literal KEEPTTL}.
+         *
+         * @return new {@link SetArgs} with {@literal KEEPTTL} enabled.
+         * @see SetArgs#keepttl()
+         * @since 5.3
+         */
+        public static SetArgs keepttl() {
+            return new SetArgs().keepttl();
+        }
     }
 
     /**
@@ -123,6 +135,18 @@ public SetArgs nx() {
         return this;
     }
 
+    /**
+     * Set the value and retain the existing TTL.
+     *
+     * @return {@code this} {@link SetArgs}.
+     * @since 5.3
+     */
+    public SetArgs keepttl() {
+
+        this.keepttl = true;
+        return this;
+    }
+
     /**
      * Only set the key if it already exists.
      *
@@ -151,5 +175,9 @@ public <K, V> void build(CommandArgs<K, V> args) {
         if (xx) {
             args.add("XX");
         }
+
+        if (keepttl) {
+            args.add("KEEPTTL");
+        }
     }
 }
diff --git a/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java
index 6912459077..fd2020c67e 100644
--- a/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/StringCommandIntegrationTests.java
@@ -15,10 +15,7 @@
  */
 package io.lettuce.core.commands;
 
-import static io.lettuce.core.SetArgs.Builder.ex;
-import static io.lettuce.core.SetArgs.Builder.nx;
-import static io.lettuce.core.SetArgs.Builder.px;
-import static io.lettuce.core.SetArgs.Builder.xx;
+import static io.lettuce.core.SetArgs.Builder.*;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
@@ -39,6 +36,7 @@
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.test.KeyValueStreamingAdapter;
 import io.lettuce.test.LettuceExtension;
+import io.lettuce.test.condition.EnabledOnCommand;
 
 /**
  * @author Will Glozer
@@ -170,6 +168,17 @@ void set() {
         assertThat(redis.ttl(key) >= 19).isTrue();
     }
 
+    @Test
+    @EnabledOnCommand("ACL") // Redis 6.0 guard
+    void setKeepTTL() {
+
+        redis.set(key, value, ex(10));
+
+        assertThat(redis.set(key, "value2", keepttl())).isEqualTo("OK");
+        assertThat(redis.get(key)).isEqualTo("value2");
+        assertThat(redis.ttl(key) >= 1).isTrue();
+    }
+
     @Test
     void setNegativeEX() {
         assertThatThrownBy(() -> redis.set(key, value, ex(-10))).isInstanceOf(RedisException. class);

From 527f0a6ecb73e6a6910b264c758cf1695f691150 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 21 Feb 2020 11:07:58 +0100
Subject: [PATCH 753/808] Support JUSTID flag of XCLAIM command #1233

We now support XClaimArgs.justid() that requests just the message id without returning the body.
---
 .../java/io/lettuce/core/StreamMessage.java   |  3 ++
 src/main/java/io/lettuce/core/XClaimArgs.java | 30 +++++++++++++++++++
 .../api/async/RedisStreamAsyncCommands.java   |  3 ++
 .../reactive/RedisStreamReactiveCommands.java |  3 ++
 .../core/api/sync/RedisStreamCommands.java    |  3 ++
 .../NodeSelectionStreamAsyncCommands.java     |  3 ++
 .../api/sync/NodeSelectionStreamCommands.java |  3 ++
 .../lettuce/core/api/RedisStreamCommands.java |  8 ++++-
 .../StreamCommandIntegrationTests.java        | 22 ++++++++++++++
 9 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/StreamMessage.java b/src/main/java/io/lettuce/core/StreamMessage.java
index 3c38e22728..aa35ed66fe 100644
--- a/src/main/java/io/lettuce/core/StreamMessage.java
+++ b/src/main/java/io/lettuce/core/StreamMessage.java
@@ -52,6 +52,9 @@ public String getId() {
         return id;
     }
 
+    /**
+     * @return the message body. Can be {@literal null} for commands that do not return the message body.
+     */
     public Map<K, V> getBody() {
         return body;
     }
diff --git a/src/main/java/io/lettuce/core/XClaimArgs.java b/src/main/java/io/lettuce/core/XClaimArgs.java
index 7c7f1137ab..d7af24e863 100644
--- a/src/main/java/io/lettuce/core/XClaimArgs.java
+++ b/src/main/java/io/lettuce/core/XClaimArgs.java
@@ -40,6 +40,7 @@ public class XClaimArgs {
     private Long time;
     private Long retrycount;
     private boolean force;
+    private boolean justid;
 
     /**
      * Builder entry points for {@link XAddArgs}.
@@ -52,6 +53,18 @@ public static class Builder {
         private Builder() {
         }
 
+        /**
+         * Creates new {@link XClaimArgs} and set the {@code JUSTID} flag to return just the message id and do not increment the
+         * retry counter. The message body is not returned when calling {@code XCLAIM}.
+         *
+         * @return new {@link XClaimArgs} with min idle time set.
+         * @see XClaimArgs#justid()
+         * @since 5.3
+         */
+        public static XClaimArgs justid() {
+            return new XClaimArgs().justid();
+        }
+
         public static XClaimArgs minIdleTime(long milliseconds) {
             return new XClaimArgs().minIdleTime(milliseconds);
         }
@@ -70,6 +83,19 @@ public static XClaimArgs minIdleTime(Duration minIdleTime) {
         }
     }
 
+    /**
+     * Set the {@code JUSTID} flag to return just the message id and do not increment the retry counter. The message body is not
+     * returned when calling {@code XCLAIM}.
+     *
+     * @return {@code this}.
+     * @since 5.3
+     */
+    public XClaimArgs justid() {
+
+        this.justid = true;
+        return this;
+    }
+
     /**
      * Return only messages that are idle for at least {@code milliseconds}.
      *
@@ -206,5 +232,9 @@ public <K, V> void build(CommandArgs<K, V> args) {
         if (force) {
             args.add(CommandKeyword.FORCE);
         }
+
+        if (justid) {
+            args.add(CommandKeyword.JUSTID);
+        }
     }
 }
diff --git a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
index 35020cd938..00af2dec7d 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
@@ -93,6 +93,9 @@ public interface RedisStreamAsyncCommands<K, V> {
 
     /**
      * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     * <p>
+     * Note that setting the {@code JUSTID} flag (calling this method with {@link XClaimArgs#justid()}) suppresses the message
+     * bode and {@link StreamMessage#getBody()} is {@code null}.
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
index 33d1ab6851..76c22a7704 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
@@ -94,6 +94,9 @@ public interface RedisStreamReactiveCommands<K, V> {
 
     /**
      * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     * <p>
+     * Note that setting the {@code JUSTID} flag (calling this method with {@link XClaimArgs#justid()}) suppresses the message
+     * bode and {@link StreamMessage#getBody()} is {@code null}.
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
index 406e7b543d..428d95e64b 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
@@ -93,6 +93,9 @@ public interface RedisStreamCommands<K, V> {
 
     /**
      * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     * <p>
+     * Note that setting the {@code JUSTID} flag (calling this method with {@link XClaimArgs#justid()}) suppresses the message
+     * bode and {@link StreamMessage#getBody()} is {@code null}.
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
index 24af2a23b4..865288853e 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
@@ -93,6 +93,9 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
 
     /**
      * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     * <p>
+     * Note that setting the {@code JUSTID} flag (calling this method with {@link XClaimArgs#justid()}) suppresses the message
+     * bode and {@link StreamMessage#getBody()} is {@code null}.
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
index 7e098d232d..eb0f2d5f5b 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
@@ -93,6 +93,9 @@ public interface NodeSelectionStreamCommands<K, V> {
 
     /**
      * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     * <p>
+     * Note that setting the {@code JUSTID} flag (calling this method with {@link XClaimArgs#justid()}) suppresses the message
+     * bode and {@link StreamMessage#getBody()} is {@code null}.
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
diff --git a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
index a594f2b20d..387f2aeb4b 100644
--- a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
@@ -18,7 +18,10 @@
 import java.util.List;
 import java.util.Map;
 
-import io.lettuce.core.*;
+import io.lettuce.core.Limit;
+import io.lettuce.core.Range;
+import io.lettuce.core.StreamMessage;
+import io.lettuce.core.XClaimArgs;
 import io.lettuce.core.XReadArgs.StreamOffset;
 
 /**
@@ -92,6 +95,9 @@ public interface RedisStreamCommands<K, V> {
 
     /**
      * Gets ownership of one or multiple messages in the Pending Entries List of a given stream consumer group.
+     * <p>
+     * Note that setting the {@code JUSTID} flag (calling this method with {@link XClaimArgs#justid()}) suppresses the message
+     * bode and {@link StreamMessage#getBody()} is {@code null}.
      *
      * @param key the stream key.
      * @param consumer consumer identified by group name and consumer key.
diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
index 66234ac24c..a20b376113 100644
--- a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
@@ -406,6 +406,28 @@ void xclaimWithArgs() {
         assertThat(message.getMsSinceLastDelivery()).isBetween(50000L, 80000L);
     }
 
+    @Test
+    void xclaimJustId() {
+
+        String id1 = redis.xadd(key, Collections.singletonMap("key", "value"));
+        redis.xgroupCreate(StreamOffset.latest(key), "group");
+        String id2 = redis.xadd(key, Collections.singletonMap("key", "value"));
+        String id3 = redis.xadd(key, Collections.singletonMap("key", "value"));
+
+        redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.lastConsumed(key));
+
+        List<StreamMessage<String, String>> claimedMessages = redis.xclaim(key, Consumer.from("group", "consumer2"),
+                XClaimArgs.Builder.justid(), id1, id2, id3);
+
+        assertThat(claimedMessages).hasSize(2);
+
+        StreamMessage<String, String> message = claimedMessages.get(0);
+
+        assertThat(message.getBody()).isNull();
+        assertThat(message.getStream()).isEqualTo("key");
+        assertThat(message.getId()).isEqualTo(id2);
+    }
+
     @Test
     void xgroupDestroy() {
 

From 578a16b30b37cb88b156ae9f9d1e5a66a72aa1d2 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 21 Feb 2020 13:50:22 +0100
Subject: [PATCH 754/808] Refactor script content argument types to String and
 byte[] instead of V (value type) #1010

Scripting commands come now with two overloads that accept scripts in their String and binary representation. Previously, Lettuce accepted a mixed set of types, predominantly Strings which were converted using platform-default encoding. The script encoding is configurable via ClientOptions.
---
 .../core/AbstractRedisAsyncCommands.java      | 35 ++++++-
 .../core/AbstractRedisReactiveCommands.java   | 93 ++++++++++++-------
 .../java/io/lettuce/core/ClientOptions.java   | 39 +++++++-
 .../io/lettuce/core/RedisCommandBuilder.java  | 14 ++-
 .../async/RedisScriptingAsyncCommands.java    | 52 ++++++++++-
 .../RedisScriptingReactiveCommands.java       | 52 ++++++++++-
 .../core/api/sync/RedisScriptingCommands.java | 52 ++++++++++-
 .../core/cluster/ClusterClientOptions.java    | 16 +++-
 ...RedisAdvancedClusterAsyncCommandsImpl.java |  2 +-
 ...isAdvancedClusterReactiveCommandsImpl.java |  2 +-
 .../NodeSelectionScriptingAsyncCommands.java  | 40 +++++++-
 .../RedisAdvancedClusterAsyncCommands.java    | 12 ++-
 .../RedisAdvancedClusterReactiveCommands.java | 12 ++-
 .../sync/NodeSelectionScriptingCommands.java  | 40 +++++++-
 .../core/api/RedisScriptingCommands.java      | 53 ++++++++++-
 .../lettuce/core/ClientOptionsUnitTests.java  | 12 ++-
 .../ClusterClientOptionsUnitTests.java        | 17 +++-
 17 files changed, 464 insertions(+), 79 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 4f0af96fbc..45ac299640 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -17,6 +17,7 @@
 
 import static io.lettuce.core.protocol.CommandType.*;
 
+import java.nio.charset.Charset;
 import java.time.Duration;
 import java.util.Date;
 import java.util.List;
@@ -49,7 +50,6 @@ public abstract class AbstractRedisAsyncCommands<K, V> implements RedisHashAsync
         RedisGeoAsyncCommands<K, V>, RedisClusterAsyncCommands<K, V> {
 
     private final StatefulConnection<K, V> connection;
-    private final RedisCodec<K, V> codec;
     private final RedisCommandBuilder<K, V> commandBuilder;
 
     /**
@@ -60,7 +60,6 @@ public abstract class AbstractRedisAsyncCommands<K, V> implements RedisHashAsync
      */
     public AbstractRedisAsyncCommands(StatefulConnection<K, V> connection, RedisCodec<K, V> codec) {
         this.connection = connection;
-        this.codec = codec;
         this.commandBuilder = new RedisCommandBuilder<>(codec);
     }
 
@@ -432,8 +431,13 @@ public RedisFuture<Long> del(Iterable<K> keys) {
     }
 
     @Override
-    public String digest(V script) {
-        return LettuceStrings.digest(codec.encodeValue(script));
+    public String digest(String script) {
+        return digest(encodeScript(script));
+    }
+
+    @Override
+    public String digest(byte[] script) {
+        return LettuceStrings.digest(script);
     }
 
     @Override
@@ -490,12 +494,22 @@ public RedisFuture<V> echo(V msg) {
     @Override
     @SuppressWarnings("unchecked")
     public <T> RedisFuture<T> eval(String script, ScriptOutputType type, K... keys) {
+        return eval(encodeScript(script), type, keys);
+    }
+
+    @Override
+    public <T> RedisFuture<T> eval(byte[] script, ScriptOutputType type, K... keys) {
         return (RedisFuture<T>) dispatch(commandBuilder.eval(script, type, keys));
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public <T> RedisFuture<T> eval(String script, ScriptOutputType type, K[] keys, V... values) {
+        return eval(encodeScript(script), type, keys, values);
+    }
+
+    @Override
+    public <T> RedisFuture<T> eval(byte[] script, ScriptOutputType type, K[] keys, V... values) {
         return (RedisFuture<T>) dispatch(commandBuilder.eval(script, type, keys, values));
     }
 
@@ -1186,7 +1200,12 @@ public RedisFuture<String> scriptKill() {
     }
 
     @Override
-    public RedisFuture<String> scriptLoad(V script) {
+    public RedisFuture<String> scriptLoad(String script) {
+        return scriptLoad(encodeScript(script));
+    }
+
+    @Override
+    public RedisFuture<String> scriptLoad(byte[] script) {
         return dispatch(commandBuilder.scriptLoad(script));
     }
 
@@ -2178,4 +2197,10 @@ public RedisFuture<Long> zunionstore(K destination, K... keys) {
     public RedisFuture<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
         return dispatch(commandBuilder.zunionstore(destination, storeArgs, keys));
     }
+
+    private byte[] encodeScript(String script) {
+        LettuceAssert.notNull(script, "Lua script must not be null");
+        LettuceAssert.notEmpty(script, "Lua script must not be empty");
+        return script.getBytes(getConnection().getOptions().getScriptCharset());
+    }
 }
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 9a29955d1c..3aeb450c7a 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -17,10 +17,10 @@
 
 import static io.lettuce.core.protocol.CommandType.*;
 
+import java.nio.charset.Charset;
 import java.time.Duration;
 import java.util.Date;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
 import reactor.core.publisher.Flux;
@@ -57,10 +57,10 @@ public abstract class AbstractRedisReactiveCommands<K, V> implements RedisHashRe
 
     private final Object mutex = new Object();
     private final StatefulConnection<K, V> connection;
-    private final RedisCodec<K, V> codec;
     private final RedisCommandBuilder<K, V> commandBuilder;
     private final ClientResources clientResources;
     private final boolean tracingEnabled;
+
     private EventExecutorGroup scheduler;
 
     /**
@@ -71,7 +71,6 @@ public abstract class AbstractRedisReactiveCommands<K, V> implements RedisHashRe
      */
     public AbstractRedisReactiveCommands(StatefulConnection<K, V> connection, RedisCodec<K, V> codec) {
         this.connection = connection;
-        this.codec = codec;
         this.commandBuilder = new RedisCommandBuilder<>(codec);
         this.clientResources = connection.getResources();
         this.tracingEnabled = clientResources.tracing().isEnabled();
@@ -407,9 +406,8 @@ private <T> Flux<T> createFlux(Supplier<RedisCommand<K, V, T>> commandSupplier,
 
         if (tracingEnabled) {
 
-            return withTraceContext().flatMapMany(
-                    it -> Flux.from(new RedisPublisher<>(decorate(commandSupplier, it), connection, dissolve, getScheduler()
-                            .next())));
+            return withTraceContext().flatMapMany(it -> Flux
+                    .from(new RedisPublisher<>(decorate(commandSupplier, it), connection, dissolve, getScheduler().next())));
         }
 
         return Flux.from(new RedisPublisher<>(commandSupplier, connection, dissolve, getScheduler().next()));
@@ -430,9 +428,8 @@ public <T> Mono<T> createMono(Supplier<RedisCommand<K, V, T>> commandSupplier) {
 
         if (tracingEnabled) {
 
-            return withTraceContext().flatMap(
-                    it -> Mono.from(new RedisPublisher<>(decorate(commandSupplier, it), connection, false, getScheduler()
-                            .next())));
+            return withTraceContext().flatMap(it -> Mono
+                    .from(new RedisPublisher<>(decorate(commandSupplier, it), connection, false, getScheduler().next())));
         }
 
         return Mono.from(new RedisPublisher<>(commandSupplier, connection, false, getScheduler().next()));
@@ -508,8 +505,13 @@ public Mono<Long> del(Iterable<K> keys) {
     }
 
     @Override
-    public String digest(V script) {
-        return LettuceStrings.digest(codec.encodeValue(script));
+    public String digest(String script) {
+        return digest(encodeScript(script));
+    }
+
+    @Override
+    public String digest(byte[] script) {
+        return LettuceStrings.digest(script);
     }
 
     @Override
@@ -549,12 +551,24 @@ public Mono<V> echo(V msg) {
     @Override
     @SuppressWarnings("unchecked")
     public <T> Flux<T> eval(String script, ScriptOutputType type, K... keys) {
+        return eval(encodeScript(script), type, keys);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> Flux<T> eval(byte[] script, ScriptOutputType type, K... keys) {
         return (Flux<T>) createFlux(() -> commandBuilder.eval(script, type, keys));
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public <T> Flux<T> eval(String script, ScriptOutputType type, K[] keys, V... values) {
+        return eval(encodeScript(script), type, keys, values);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> Flux<T> eval(byte[] script, ScriptOutputType type, K[] keys, V... values) {
         return (Flux<T>) createFlux(() -> commandBuilder.eval(script, type, keys, values));
     }
 
@@ -660,8 +674,8 @@ public Flux<V> georadius(K key, double longitude, double latitude, double distan
 
     @Override
     public Flux<GeoWithin<V>> georadius(K key, double longitude, double latitude, double distance, Unit unit, GeoArgs geoArgs) {
-        return createDissolvingFlux(() -> commandBuilder.georadius(GEORADIUS, key, longitude, latitude, distance, unit.name(),
-                geoArgs));
+        return createDissolvingFlux(
+                () -> commandBuilder.georadius(GEORADIUS, key, longitude, latitude, distance, unit.name(), geoArgs));
     }
 
     @Override
@@ -671,26 +685,26 @@ public Mono<Long> georadius(K key, double longitude, double latitude, double dis
     }
 
     protected Flux<V> georadius_ro(K key, double longitude, double latitude, double distance, Unit unit) {
-        return createDissolvingFlux(() -> commandBuilder.georadius(GEORADIUS_RO, key, longitude, latitude, distance,
-                unit.name()));
+        return createDissolvingFlux(
+                () -> commandBuilder.georadius(GEORADIUS_RO, key, longitude, latitude, distance, unit.name()));
     }
 
     protected Flux<GeoWithin<V>> georadius_ro(K key, double longitude, double latitude, double distance, Unit unit,
             GeoArgs geoArgs) {
-        return createDissolvingFlux(() -> commandBuilder.georadius(GEORADIUS_RO, key, longitude, latitude, distance,
-                unit.name(), geoArgs));
+        return createDissolvingFlux(
+                () -> commandBuilder.georadius(GEORADIUS_RO, key, longitude, latitude, distance, unit.name(), geoArgs));
     }
 
     @Override
     public Flux<V> georadiusbymember(K key, V member, double distance, Unit unit) {
-        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER, key, member, distance,
-                unit.name()));
+        return createDissolvingFlux(
+                () -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER, key, member, distance, unit.name()));
     }
 
     @Override
     public Flux<GeoWithin<V>> georadiusbymember(K key, V member, double distance, Unit unit, GeoArgs geoArgs) {
-        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER, key, member, distance,
-                unit.name(), geoArgs));
+        return createDissolvingFlux(
+                () -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER, key, member, distance, unit.name(), geoArgs));
     }
 
     @Override
@@ -699,13 +713,13 @@ public Mono<Long> georadiusbymember(K key, V member, double distance, Unit unit,
     }
 
     protected Flux<V> georadiusbymember_ro(K key, V member, double distance, Unit unit) {
-        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER_RO, key, member, distance,
-                unit.name()));
+        return createDissolvingFlux(
+                () -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER_RO, key, member, distance, unit.name()));
     }
 
     protected Flux<GeoWithin<V>> georadiusbymember_ro(K key, V member, double distance, Unit unit, GeoArgs geoArgs) {
-        return createDissolvingFlux(() -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER_RO, key, member, distance,
-                unit.name(), geoArgs));
+        return createDissolvingFlux(
+                () -> commandBuilder.georadiusbymember(GEORADIUSBYMEMBER_RO, key, member, distance, unit.name(), geoArgs));
     }
 
     @Override
@@ -828,7 +842,8 @@ public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K ke
     }
 
     @Override
-    public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+    public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor,
+            ScanArgs scanArgs) {
         return createMono(() -> commandBuilder.hscanStreaming(channel, key, scanCursor, scanArgs));
     }
 
@@ -1267,7 +1282,12 @@ public Mono<String> scriptKill() {
     }
 
     @Override
-    public Mono<String> scriptLoad(V script) {
+    public Mono<String> scriptLoad(String script) {
+        return scriptLoad(encodeScript(script));
+    }
+
+    @Override
+    public Mono<String> scriptLoad(byte[] script) {
         return createMono(() -> commandBuilder.scriptLoad(script));
     }
 
@@ -1593,8 +1613,8 @@ public Mono<String> xadd(K key, XAddArgs args, Object... keysAndValues) {
 
     @Override
     public Flux<StreamMessage<K, V>> xclaim(K key, Consumer<K> consumer, long minIdleTime, String... messageIds) {
-        return createDissolvingFlux(() -> commandBuilder.xclaim(key, consumer, XClaimArgs.Builder.minIdleTime(minIdleTime),
-                messageIds));
+        return createDissolvingFlux(
+                () -> commandBuilder.xclaim(key, consumer, XClaimArgs.Builder.minIdleTime(minIdleTime), messageIds));
     }
 
     @Override
@@ -2110,12 +2130,14 @@ public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, Rang
     }
 
     @Override
-    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset, long count) {
+    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, double max, double min, long offset,
+            long count) {
         return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
     }
 
     @Override
-    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset, long count) {
+    public Mono<Long> zrevrangebyscore(ValueStreamingChannel<V> channel, K key, String max, String min, long offset,
+            long count) {
         return createMono(() -> commandBuilder.zrevrangebyscore(channel, key, max, min, offset, count));
     }
 
@@ -2223,7 +2245,8 @@ public Mono<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K ke
     }
 
     @Override
-    public Mono<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor, ScanArgs scanArgs) {
+    public Mono<StreamScanCursor> zscan(ScoredValueStreamingChannel<V> channel, K key, ScanCursor scanCursor,
+            ScanArgs scanArgs) {
         return createMono(() -> commandBuilder.zscanStreaming(channel, key, scanCursor, scanArgs));
     }
 
@@ -2246,4 +2269,10 @@ public Mono<Long> zunionstore(K destination, K... keys) {
     public Mono<Long> zunionstore(K destination, ZStoreArgs storeArgs, K... keys) {
         return createMono(() -> commandBuilder.zunionstore(destination, storeArgs, keys));
     }
+
+    private byte[] encodeScript(String script) {
+        LettuceAssert.notNull(script, "Lua script must not be null");
+        LettuceAssert.notEmpty(script, "Lua script must not be empty");
+        return script.getBytes(getConnection().getOptions().getScriptCharset());
+    }
 }
diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
index 6f8a20bf1d..811428c7a7 100644
--- a/src/main/java/io/lettuce/core/ClientOptions.java
+++ b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -16,6 +16,8 @@
 package io.lettuce.core;
 
 import java.io.Serializable;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.ProtocolVersion;
@@ -38,6 +40,7 @@ public class ClientOptions implements Serializable {
     public static final boolean DEFAULT_SUSPEND_RECONNECT_PROTO_FAIL = false;
     public static final int DEFAULT_REQUEST_QUEUE_SIZE = Integer.MAX_VALUE;
     public static final DisconnectedBehavior DEFAULT_DISCONNECTED_BEHAVIOR = DisconnectedBehavior.DEFAULT;
+    public static final Charset DEFAULT_SCRIPT_CHARSET = StandardCharsets.UTF_8;
     public static final SocketOptions DEFAULT_SOCKET_OPTIONS = SocketOptions.create();
     public static final SslOptions DEFAULT_SSL_OPTIONS = SslOptions.create();
     public static final TimeoutOptions DEFAULT_TIMEOUT_OPTIONS = TimeoutOptions.create();
@@ -51,6 +54,7 @@ public class ClientOptions implements Serializable {
     private final boolean suspendReconnectOnProtocolFailure;
     private final int requestQueueSize;
     private final DisconnectedBehavior disconnectedBehavior;
+    private final Charset scriptCharset;
     private final SocketOptions socketOptions;
     private final SslOptions sslOptions;
     private final TimeoutOptions timeoutOptions;
@@ -65,6 +69,7 @@ protected ClientOptions(Builder builder) {
         this.suspendReconnectOnProtocolFailure = builder.suspendReconnectOnProtocolFailure;
         this.requestQueueSize = builder.requestQueueSize;
         this.disconnectedBehavior = builder.disconnectedBehavior;
+        this.scriptCharset = builder.scriptCharset;
         this.socketOptions = builder.socketOptions;
         this.sslOptions = builder.sslOptions;
         this.timeoutOptions = builder.timeoutOptions;
@@ -80,6 +85,7 @@ protected ClientOptions(ClientOptions original) {
         this.suspendReconnectOnProtocolFailure = original.isSuspendReconnectOnProtocolFailure();
         this.requestQueueSize = original.getRequestQueueSize();
         this.disconnectedBehavior = original.getDisconnectedBehavior();
+        this.scriptCharset = original.getScriptCharset();
         this.socketOptions = original.getSocketOptions();
         this.sslOptions = original.getSslOptions();
         this.timeoutOptions = original.getTimeoutOptions();
@@ -127,6 +133,7 @@ public static class Builder {
         private boolean suspendReconnectOnProtocolFailure = DEFAULT_SUSPEND_RECONNECT_PROTO_FAIL;
         private int requestQueueSize = DEFAULT_REQUEST_QUEUE_SIZE;
         private DisconnectedBehavior disconnectedBehavior = DEFAULT_DISCONNECTED_BEHAVIOR;
+        private Charset scriptCharset = DEFAULT_SCRIPT_CHARSET;
         private SocketOptions socketOptions = DEFAULT_SOCKET_OPTIONS;
         private SslOptions sslOptions = DEFAULT_SSL_OPTIONS;
         private TimeoutOptions timeoutOptions = DEFAULT_TIMEOUT_OPTIONS;
@@ -247,6 +254,21 @@ public Builder disconnectedBehavior(DisconnectedBehavior disconnectedBehavior) {
             return this;
         }
 
+        /**
+         * Sets the Lua script {@link Charset} to use to encode {@link String scripts} to {@code byte[]}. Defaults to
+         * {@link StandardCharsets#UTF_8}. See {@link #DEFAULT_SCRIPT_CHARSET}.
+         *
+         * @param scriptCharset must not be {@literal null}.
+         * @return {@code this}
+         * @since 6.0
+         */
+        public Builder scriptCharset(Charset scriptCharset) {
+
+            LettuceAssert.notNull(scriptCharset, "ScriptCharset must not be null");
+            this.scriptCharset = scriptCharset;
+            return this;
+        }
+
         /**
          * Sets the low-level {@link SocketOptions} for the connections kept to Redis servers. See
          * {@link #DEFAULT_SOCKET_OPTIONS}.
@@ -332,9 +354,10 @@ public ClientOptions.Builder mutate() {
 
         builder.autoReconnect(isAutoReconnect()).bufferUsageRatio(getBufferUsageRatio())
                 .cancelCommandsOnReconnectFailure(isCancelCommandsOnReconnectFailure())
-                .disconnectedBehavior(getDisconnectedBehavior()).publishOnScheduler(isPublishOnScheduler())
-                .pingBeforeActivateConnection(isPingBeforeActivateConnection()).protocolVersion(getConfiguredProtocolVersion())
-                .requestQueueSize(getRequestQueueSize()).socketOptions(getSocketOptions()).sslOptions(getSslOptions())
+                .disconnectedBehavior(getDisconnectedBehavior()).scriptCharset(getScriptCharset())
+                .publishOnScheduler(isPublishOnScheduler()).pingBeforeActivateConnection(isPingBeforeActivateConnection())
+                .protocolVersion(getConfiguredProtocolVersion()).requestQueueSize(getRequestQueueSize())
+                .socketOptions(getSocketOptions()).sslOptions(getSslOptions())
                 .suspendReconnectOnProtocolFailure(isSuspendReconnectOnProtocolFailure()).timeoutOptions(getTimeoutOptions());
 
         return builder;
@@ -443,6 +466,16 @@ public DisconnectedBehavior getDisconnectedBehavior() {
         return disconnectedBehavior;
     }
 
+    /**
+     * Returns the Lua script {@link Charset}.
+     *
+     * @return the script {@link Charset}.
+     * @since 6.0
+     */
+    public Charset getScriptCharset() {
+        return scriptCharset;
+    }
+
     /**
      * Returns the {@link SocketOptions}.
      *
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index c006a334a6..f885544366 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -573,27 +573,25 @@ Command<K, V, V> echo(V msg) {
         return createCommand(ECHO, new ValueOutput<>(codec), args);
     }
 
-    <T> Command<K, V, T> eval(String script, ScriptOutputType type, K... keys) {
+    <T> Command<K, V, T> eval(byte[] script, ScriptOutputType type, K... keys) {
         LettuceAssert.notNull(script, "Script " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(script, "Script " + MUST_NOT_BE_EMPTY);
         LettuceAssert.notNull(type, "ScriptOutputType " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
 
         CommandArgs<K, V> args = new CommandArgs<>(codec);
-        args.add(script.getBytes()).add(keys.length).addKeys(keys);
+        args.add(script).add(keys.length).addKeys(keys);
         CommandOutput<K, V, T> output = newScriptOutput(codec, type);
         return createCommand(EVAL, output, args);
     }
 
-    <T> Command<K, V, T> eval(String script, ScriptOutputType type, K[] keys, V... values) {
+    <T> Command<K, V, T> eval(byte[] script, ScriptOutputType type, K[] keys, V... values) {
         LettuceAssert.notNull(script, "Script " + MUST_NOT_BE_NULL);
-        LettuceAssert.notEmpty(script, "Script " + MUST_NOT_BE_EMPTY);
         LettuceAssert.notNull(type, "ScriptOutputType " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(keys, "Keys " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(values, "Values " + MUST_NOT_BE_NULL);
 
         CommandArgs<K, V> args = new CommandArgs<>(codec);
-        args.add(script.getBytes()).add(keys.length).addKeys(keys).addValues(values);
+        args.add(script).add(keys.length).addKeys(keys).addValues(values);
         CommandOutput<K, V, T> output = newScriptOutput(codec, type);
         return createCommand(EVAL, output, args);
     }
@@ -1675,10 +1673,10 @@ Command<K, V, String> scriptKill() {
         return createCommand(SCRIPT, new StatusOutput<>(codec), args);
     }
 
-    Command<K, V, String> scriptLoad(V script) {
+    Command<K, V, String> scriptLoad(byte[] script) {
         LettuceAssert.notNull(script, "Script " + MUST_NOT_BE_NULL);
 
-        CommandArgs<K, V> args = new CommandArgs<>(codec).add(LOAD).addValue(script);
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(LOAD).add(script);
         return createCommand(SCRIPT, new StatusOutput<>(codec), args);
     }
 
diff --git a/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
index b8b9529ae3..33cb40c596 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
@@ -21,7 +21,8 @@
 import io.lettuce.core.ScriptOutputType;
 
 /**
- * Asynchronous executed commands for Scripting.
+ * Asynchronous executed commands for Scripting. {@link java.lang.String Lua scripts} are encoded by using the configured
+ * {@link io.lettuce.core.ClientOptions#getScriptCharset() charset}.
  *
  * @param <K> Key type.
  * @param <V> Value type.
@@ -42,6 +43,18 @@ public interface RedisScriptingAsyncCommands<K, V> {
      */
     <T> RedisFuture<T> eval(String script, ScriptOutputType type, K... keys);
 
+    /**
+     * Execute a Lua script server side.
+     *
+     * @param script Lua 5.1 script.
+     * @param type output type
+     * @param keys key names
+     * @param <T> expected return type
+     * @return script result
+     * @since 6.0
+     */
+    <T> RedisFuture<T> eval(byte[] script, ScriptOutputType type, K... keys);
+
     /**
      * Execute a Lua script server side.
      *
@@ -54,6 +67,19 @@ public interface RedisScriptingAsyncCommands<K, V> {
      */
     <T> RedisFuture<T> eval(String script, ScriptOutputType type, K[] keys, V... values);
 
+    /**
+     * Execute a Lua script server side.
+     *
+     * @param script Lua 5.1 script.
+     * @param type the type
+     * @param keys the keys
+     * @param values the values
+     * @param <T> expected return type
+     * @return script result
+     * @since 6.0
+     */
+    <T> RedisFuture<T> eval(byte[] script, ScriptOutputType type, K[] keys, V... values);
+
     /**
      * Evaluates a script cached on the server side by its SHA1 digest
      *
@@ -106,14 +132,34 @@ public interface RedisScriptingAsyncCommands<K, V> {
      *
      * @param script script content
      * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     * @since 6.0
+     */
+    RedisFuture<String> scriptLoad(String script);
+
+    /**
+     * Load the specified Lua script into the script cache.
+     *
+     * @param script script content
+     * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     * @since 6.0
+     */
+    RedisFuture<String> scriptLoad(byte[] script);
+
+    /**
+     * Create a SHA1 digest from a Lua script.
+     *
+     * @param script script content
+     * @return the SHA1 value
+     * @since 6.0
      */
-    RedisFuture<String> scriptLoad(V script);
+    String digest(String script);
 
     /**
      * Create a SHA1 digest from a Lua script.
      *
      * @param script script content
      * @return the SHA1 value
+     * @since 6.0
      */
-    String digest(V script);
+    String digest(byte[] script);
 }
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
index edf7d9cba2..d9a1b92893 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
@@ -20,7 +20,8 @@
 import io.lettuce.core.ScriptOutputType;
 
 /**
- * Reactive executed commands for Scripting.
+ * Reactive executed commands for Scripting. {@link java.lang.String Lua scripts} are encoded by using the configured
+ * {@link io.lettuce.core.ClientOptions#getScriptCharset() charset}.
  *
  * @param <K> Key type.
  * @param <V> Value type.
@@ -41,6 +42,18 @@ public interface RedisScriptingReactiveCommands<K, V> {
      */
     <T> Flux<T> eval(String script, ScriptOutputType type, K... keys);
 
+    /**
+     * Execute a Lua script server side.
+     *
+     * @param script Lua 5.1 script.
+     * @param type output type
+     * @param keys key names
+     * @param <T> expected return type
+     * @return script result
+     * @since 6.0
+     */
+    <T> Flux<T> eval(byte[] script, ScriptOutputType type, K... keys);
+
     /**
      * Execute a Lua script server side.
      *
@@ -53,6 +66,19 @@ public interface RedisScriptingReactiveCommands<K, V> {
      */
     <T> Flux<T> eval(String script, ScriptOutputType type, K[] keys, V... values);
 
+    /**
+     * Execute a Lua script server side.
+     *
+     * @param script Lua 5.1 script.
+     * @param type the type
+     * @param keys the keys
+     * @param values the values
+     * @param <T> expected return type
+     * @return script result
+     * @since 6.0
+     */
+    <T> Flux<T> eval(byte[] script, ScriptOutputType type, K[] keys, V... values);
+
     /**
      * Evaluates a script cached on the server side by its SHA1 digest
      *
@@ -105,14 +131,34 @@ public interface RedisScriptingReactiveCommands<K, V> {
      *
      * @param script script content
      * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     * @since 6.0
+     */
+    Mono<String> scriptLoad(String script);
+
+    /**
+     * Load the specified Lua script into the script cache.
+     *
+     * @param script script content
+     * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     * @since 6.0
+     */
+    Mono<String> scriptLoad(byte[] script);
+
+    /**
+     * Create a SHA1 digest from a Lua script.
+     *
+     * @param script script content
+     * @return the SHA1 value
+     * @since 6.0
      */
-    Mono<String> scriptLoad(V script);
+    String digest(String script);
 
     /**
      * Create a SHA1 digest from a Lua script.
      *
      * @param script script content
      * @return the SHA1 value
+     * @since 6.0
      */
-    String digest(V script);
+    String digest(byte[] script);
 }
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
index 9559aa869d..9a3b974823 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
@@ -20,7 +20,8 @@
 import io.lettuce.core.ScriptOutputType;
 
 /**
- * Synchronous executed commands for Scripting.
+ * Synchronous executed commands for Scripting. {@link java.lang.String Lua scripts} are encoded by using the configured
+ * {@link io.lettuce.core.ClientOptions#getScriptCharset() charset}.
  *
  * @param <K> Key type.
  * @param <V> Value type.
@@ -41,6 +42,18 @@ public interface RedisScriptingCommands<K, V> {
      */
     <T> T eval(String script, ScriptOutputType type, K... keys);
 
+    /**
+     * Execute a Lua script server side.
+     *
+     * @param script Lua 5.1 script.
+     * @param type output type
+     * @param keys key names
+     * @param <T> expected return type
+     * @return script result
+     * @since 6.0
+     */
+    <T> T eval(byte[] script, ScriptOutputType type, K... keys);
+
     /**
      * Execute a Lua script server side.
      *
@@ -53,6 +66,19 @@ public interface RedisScriptingCommands<K, V> {
      */
     <T> T eval(String script, ScriptOutputType type, K[] keys, V... values);
 
+    /**
+     * Execute a Lua script server side.
+     *
+     * @param script Lua 5.1 script.
+     * @param type the type
+     * @param keys the keys
+     * @param values the values
+     * @param <T> expected return type
+     * @return script result
+     * @since 6.0
+     */
+    <T> T eval(byte[] script, ScriptOutputType type, K[] keys, V... values);
+
     /**
      * Evaluates a script cached on the server side by its SHA1 digest
      *
@@ -105,14 +131,34 @@ public interface RedisScriptingCommands<K, V> {
      *
      * @param script script content
      * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     * @since 6.0
+     */
+    String scriptLoad(String script);
+
+    /**
+     * Load the specified Lua script into the script cache.
+     *
+     * @param script script content
+     * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     * @since 6.0
+     */
+    String scriptLoad(byte[] script);
+
+    /**
+     * Create a SHA1 digest from a Lua script.
+     *
+     * @param script script content
+     * @return the SHA1 value
+     * @since 6.0
      */
-    String scriptLoad(V script);
+    String digest(String script);
 
     /**
      * Create a SHA1 digest from a Lua script.
      *
      * @param script script content
      * @return the SHA1 value
+     * @since 6.0
      */
-    String digest(V script);
+    String digest(byte[] script);
 }
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
index 1c42cc0d5f..300626ca4e 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterClientOptions.java
@@ -15,6 +15,7 @@
  */
 package io.lettuce.core.cluster;
 
+import java.nio.charset.Charset;
 import java.time.Duration;
 
 import io.lettuce.core.ClientOptions;
@@ -109,7 +110,7 @@ public static ClusterClientOptions.Builder builder(ClientOptions clientOptions)
         Builder builder = new Builder();
         builder.autoReconnect(clientOptions.isAutoReconnect()).bufferUsageRatio(clientOptions.getBufferUsageRatio())
                 .cancelCommandsOnReconnectFailure(clientOptions.isCancelCommandsOnReconnectFailure())
-                .disconnectedBehavior(clientOptions.getDisconnectedBehavior())
+                .disconnectedBehavior(clientOptions.getDisconnectedBehavior()).scriptCharset(clientOptions.getScriptCharset())
                 .publishOnScheduler(clientOptions.isPublishOnScheduler())
                 .protocolVersion(clientOptions.getConfiguredProtocolVersion())
                 .requestQueueSize(clientOptions.getRequestQueueSize()).socketOptions(clientOptions.getSocketOptions())
@@ -225,6 +226,12 @@ public Builder disconnectedBehavior(DisconnectedBehavior disconnectedBehavior) {
             return this;
         }
 
+        @Override
+        public Builder scriptCharset(Charset scriptCharset) {
+            super.scriptCharset(scriptCharset);
+            return this;
+        }
+
         @Override
         public Builder socketOptions(SocketOptions socketOptions) {
             super.socketOptions(socketOptions);
@@ -274,9 +281,10 @@ public ClusterClientOptions.Builder mutate() {
 
         builder.autoReconnect(isAutoReconnect()).bufferUsageRatio(getBufferUsageRatio())
                 .cancelCommandsOnReconnectFailure(isCancelCommandsOnReconnectFailure())
-                .disconnectedBehavior(getDisconnectedBehavior()).publishOnScheduler(isPublishOnScheduler())
-                .pingBeforeActivateConnection(isPingBeforeActivateConnection()).protocolVersion(getConfiguredProtocolVersion())
-                .requestQueueSize(getRequestQueueSize()).socketOptions(getSocketOptions()).sslOptions(getSslOptions())
+                .disconnectedBehavior(getDisconnectedBehavior()).scriptCharset(getScriptCharset())
+                .publishOnScheduler(isPublishOnScheduler()).pingBeforeActivateConnection(isPingBeforeActivateConnection())
+                .protocolVersion(getConfiguredProtocolVersion()).requestQueueSize(getRequestQueueSize())
+                .socketOptions(getSocketOptions()).sslOptions(getSslOptions())
                 .suspendReconnectOnProtocolFailure(isSuspendReconnectOnProtocolFailure()).timeoutOptions(getTimeoutOptions())
                 .validateClusterNodeMembership(isValidateClusterNodeMembership()).maxRedirects(getMaxRedirects())
                 .topologyRefreshOptions(getTopologyRefreshOptions());
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index 1c8c032332..244d11d3e5 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -421,7 +421,7 @@ public RedisFuture<String> scriptKill() {
     }
 
     @Override
-    public RedisFuture<String> scriptLoad(V script) {
+    public RedisFuture<String> scriptLoad(byte[] script) {
 
         Map<String, CompletableFuture<String>> executions = executeOnNodes(cmd -> cmd.scriptLoad(script),
                 redisClusterNode -> true);
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index 341ba5f63d..88f2addf78 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -369,7 +369,7 @@ public Mono<String> scriptKill() {
     }
 
     @Override
-    public Mono<String> scriptLoad(V script) {
+    public Mono<String> scriptLoad(byte[] script) {
         Map<String, Publisher<String>> publishers = executeOnNodes((commands) -> commands.scriptLoad(script), ALL_NODES);
         return Flux.merge(publishers.values()).last();
     }
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
index 201148a1a9..e10759e907 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
@@ -20,7 +20,8 @@
 import io.lettuce.core.ScriptOutputType;
 
 /**
- * Asynchronous executed commands on a node selection for Scripting.
+ * Asynchronous executed commands on a node selection for Scripting. {@link java.lang.String Lua scripts} are encoded by using
+ * the configured {@link io.lettuce.core.ClientOptions#getScriptCharset() charset}.
  *
  * @param <K> Key type.
  * @param <V> Value type.
@@ -41,6 +42,18 @@ public interface NodeSelectionScriptingAsyncCommands<K, V> {
      */
     <T> AsyncExecutions<T> eval(String script, ScriptOutputType type, K... keys);
 
+    /**
+     * Execute a Lua script server side.
+     *
+     * @param script Lua 5.1 script.
+     * @param type output type
+     * @param keys key names
+     * @param <T> expected return type
+     * @return script result
+     * @since 6.0
+     */
+    <T> AsyncExecutions<T> eval(byte[] script, ScriptOutputType type, K... keys);
+
     /**
      * Execute a Lua script server side.
      *
@@ -53,6 +66,19 @@ public interface NodeSelectionScriptingAsyncCommands<K, V> {
      */
     <T> AsyncExecutions<T> eval(String script, ScriptOutputType type, K[] keys, V... values);
 
+    /**
+     * Execute a Lua script server side.
+     *
+     * @param script Lua 5.1 script.
+     * @param type the type
+     * @param keys the keys
+     * @param values the values
+     * @param <T> expected return type
+     * @return script result
+     * @since 6.0
+     */
+    <T> AsyncExecutions<T> eval(byte[] script, ScriptOutputType type, K[] keys, V... values);
+
     /**
      * Evaluates a script cached on the server side by its SHA1 digest
      *
@@ -105,6 +131,16 @@ public interface NodeSelectionScriptingAsyncCommands<K, V> {
      *
      * @param script script content
      * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     * @since 6.0
+     */
+    AsyncExecutions<String> scriptLoad(String script);
+
+    /**
+     * Load the specified Lua script into the script cache.
+     *
+     * @param script script content
+     * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     * @since 6.0
      */
-    AsyncExecutions<String> scriptLoad(V script);
+    AsyncExecutions<String> scriptLoad(byte[] script);
 }
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
index 6be3d87a6e..f0bbecb01e 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
@@ -298,8 +298,18 @@ default AsyncNodeSelection<K, V> all() {
      *
      * @param script script content
      * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     * @since 6.0
      */
-    RedisFuture<String> scriptLoad(V script);
+    RedisFuture<String> scriptLoad(String script);
+
+    /**
+     * Load the specified Lua script into the script cache on all cluster nodes.
+     *
+     * @param script script content
+     * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     * @since 6.0
+     */
+    RedisFuture<String> scriptLoad(byte[] script);
 
     /**
      * Synchronously save the dataset to disk and then shut down all nodes of the cluster.
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
index 53ed5fffa8..0be3d7811e 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
@@ -204,8 +204,18 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
      *
      * @param script script content
      * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     * @since 6.0
      */
-    Mono<String> scriptLoad(V script);
+    Mono<String> scriptLoad(String script);
+
+    /**
+     * Load the specified Lua script into the script cache on all cluster nodes.
+     *
+     * @param script script content
+     * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     * @since 6.0
+     */
+    Mono<String> scriptLoad(byte[] script);
 
     /**
      * Synchronously save the dataset to disk and then shut down all nodes of the cluster.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
index 1b4b8ff163..a3f40922c6 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
@@ -20,7 +20,8 @@
 import io.lettuce.core.ScriptOutputType;
 
 /**
- * Synchronous executed commands on a node selection for Scripting.
+ * Synchronous executed commands on a node selection for Scripting. {@link java.lang.String Lua scripts} are encoded by using
+ * the configured {@link io.lettuce.core.ClientOptions#getScriptCharset() charset}.
  *
  * @param <K> Key type.
  * @param <V> Value type.
@@ -41,6 +42,18 @@ public interface NodeSelectionScriptingCommands<K, V> {
      */
     <T> Executions<T> eval(String script, ScriptOutputType type, K... keys);
 
+    /**
+     * Execute a Lua script server side.
+     *
+     * @param script Lua 5.1 script.
+     * @param type output type
+     * @param keys key names
+     * @param <T> expected return type
+     * @return script result
+     * @since 6.0
+     */
+    <T> Executions<T> eval(byte[] script, ScriptOutputType type, K... keys);
+
     /**
      * Execute a Lua script server side.
      *
@@ -53,6 +66,19 @@ public interface NodeSelectionScriptingCommands<K, V> {
      */
     <T> Executions<T> eval(String script, ScriptOutputType type, K[] keys, V... values);
 
+    /**
+     * Execute a Lua script server side.
+     *
+     * @param script Lua 5.1 script.
+     * @param type the type
+     * @param keys the keys
+     * @param values the values
+     * @param <T> expected return type
+     * @return script result
+     * @since 6.0
+     */
+    <T> Executions<T> eval(byte[] script, ScriptOutputType type, K[] keys, V... values);
+
     /**
      * Evaluates a script cached on the server side by its SHA1 digest
      *
@@ -105,6 +131,16 @@ public interface NodeSelectionScriptingCommands<K, V> {
      *
      * @param script script content
      * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     * @since 6.0
+     */
+    Executions<String> scriptLoad(String script);
+
+    /**
+     * Load the specified Lua script into the script cache.
+     *
+     * @param script script content
+     * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     * @since 6.0
      */
-    Executions<String> scriptLoad(V script);
+    Executions<String> scriptLoad(byte[] script);
 }
diff --git a/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java b/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java
index 8d65220675..3cefd9ecdf 100644
--- a/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java
@@ -20,7 +20,8 @@
 import io.lettuce.core.ScriptOutputType;
 
 /**
- * ${intent} for Scripting.
+ * ${intent} for Scripting. {@link java.lang.String Lua scripts} are encoded by using the configured
+ * {@link io.lettuce.core.ClientOptions#getScriptCharset() charset}.
  *
  * @param <K> Key type.
  * @param <V> Value type.
@@ -28,6 +29,7 @@
  * @since 4.0
  */
 public interface RedisScriptingCommands<K, V> {
+
     /**
      * Execute a Lua script server side.
      *
@@ -39,6 +41,18 @@ public interface RedisScriptingCommands<K, V> {
      */
     <T> T eval(String script, ScriptOutputType type, K... keys);
 
+    /**
+     * Execute a Lua script server side.
+     *
+     * @param script Lua 5.1 script.
+     * @param type output type
+     * @param keys key names
+     * @param <T> expected return type
+     * @return script result
+     * @since 6.0
+     */
+    <T> T eval(byte[] script, ScriptOutputType type, K... keys);
+
     /**
      * Execute a Lua script server side.
      *
@@ -51,6 +65,19 @@ public interface RedisScriptingCommands<K, V> {
      */
     <T> T eval(String script, ScriptOutputType type, K[] keys, V... values);
 
+    /**
+     * Execute a Lua script server side.
+     *
+     * @param script Lua 5.1 script.
+     * @param type the type
+     * @param keys the keys
+     * @param values the values
+     * @param <T> expected return type
+     * @return script result
+     * @since 6.0
+     */
+    <T> T eval(byte[] script, ScriptOutputType type, K[] keys, V... values);
+
     /**
      * Evaluates a script cached on the server side by its SHA1 digest
      *
@@ -103,14 +130,34 @@ public interface RedisScriptingCommands<K, V> {
      *
      * @param script script content
      * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     * @since 6.0
+     */
+    String scriptLoad(String script);
+
+    /**
+     * Load the specified Lua script into the script cache.
+     *
+     * @param script script content
+     * @return String bulk-string-reply This command returns the SHA1 digest of the script added into the script cache.
+     * @since 6.0
+     */
+    String scriptLoad(byte[] script);
+
+    /**
+     * Create a SHA1 digest from a Lua script.
+     *
+     * @param script script content
+     * @return the SHA1 value
+     * @since 6.0
      */
-    String scriptLoad(V script);
+    String digest(String script);
 
     /**
      * Create a SHA1 digest from a Lua script.
      *
      * @param script script content
      * @return the SHA1 value
+     * @since 6.0
      */
-    String digest(V script);
+    String digest(byte[] script);
 }
diff --git a/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java b/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
index e6f266be9e..b322f29ca2 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsUnitTests.java
@@ -21,7 +21,11 @@
 
 import io.lettuce.core.protocol.ProtocolVersion;
 
+import java.nio.charset.StandardCharsets;
+
 /**
+ * Unit tests for {@link ClientOptions}.
+ *
  * @author Mark Paluch
  */
 class ClientOptionsUnitTests {
@@ -33,16 +37,20 @@ void testNew() {
 
     @Test
     void testBuilder() {
-        checkAssertions(ClientOptions.builder().build());
+        ClientOptions options = ClientOptions.builder().scriptCharset(StandardCharsets.US_ASCII).build();
+        checkAssertions(options);
+        assertThat(options.getScriptCharset()).isEqualTo(StandardCharsets.US_ASCII);
     }
 
     @Test
     void testCopy() {
 
-        ClientOptions original = ClientOptions.builder().build();
+        ClientOptions original = ClientOptions.builder().scriptCharset(StandardCharsets.US_ASCII).build();
         ClientOptions copy = ClientOptions.copyOf(original);
 
         checkAssertions(copy);
+        assertThat(copy.getScriptCharset()).isEqualTo(StandardCharsets.US_ASCII);
+        assertThat(copy.mutate().build().getScriptCharset()).isEqualTo(StandardCharsets.US_ASCII);
 
         assertThat(original.mutate()).isNotSameAs(copy.mutate());
     }
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
index 1035381daf..0ba2f9e661 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterClientOptionsUnitTests.java
@@ -17,12 +17,16 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.nio.charset.StandardCharsets;
+
 import org.junit.jupiter.api.Test;
 
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.protocol.ProtocolVersion;
 
 /**
+ * Unit tests for {@link ClusterClientOptions}.
+ *
  * @author Mark Paluch
  */
 class ClusterClientOptionsUnitTests {
@@ -46,6 +50,7 @@ void testCopy() {
         assertThat(copy.isCancelCommandsOnReconnectFailure()).isEqualTo(options.isCancelCommandsOnReconnectFailure());
         assertThat(copy.isSuspendReconnectOnProtocolFailure()).isEqualTo(options.isSuspendReconnectOnProtocolFailure());
         assertThat(copy.getMaxRedirects()).isEqualTo(options.getMaxRedirects());
+        assertThat(copy.getScriptCharset()).isEqualTo(StandardCharsets.UTF_8);
     }
 
     @Test
@@ -61,11 +66,12 @@ void builderFromDefaultClientOptions() {
         assertThat(clusterClientOptions.getRequestQueueSize()).isEqualTo(clusterClientOptions.getRequestQueueSize());
         assertThat(clusterClientOptions.isAutoReconnect()).isEqualTo(clusterClientOptions.isAutoReconnect());
         assertThat(clusterClientOptions.isCloseStaleConnections()).isEqualTo(clusterClientOptions.isCloseStaleConnections());
-        assertThat(clusterClientOptions.isCancelCommandsOnReconnectFailure()).isEqualTo(
-                clusterClientOptions.isCancelCommandsOnReconnectFailure());
+        assertThat(clusterClientOptions.isCancelCommandsOnReconnectFailure())
+                .isEqualTo(clusterClientOptions.isCancelCommandsOnReconnectFailure());
         assertThat(clusterClientOptions.isPublishOnScheduler()).isEqualTo(clusterClientOptions.isPublishOnScheduler());
-        assertThat(clusterClientOptions.isSuspendReconnectOnProtocolFailure()).isEqualTo(
-                clusterClientOptions.isSuspendReconnectOnProtocolFailure());
+        assertThat(clusterClientOptions.isSuspendReconnectOnProtocolFailure())
+                .isEqualTo(clusterClientOptions.isSuspendReconnectOnProtocolFailure());
+        assertThat(clusterClientOptions.getScriptCharset()).isEqualTo(clusterClientOptions.getScriptCharset());
         assertThat(clusterClientOptions.mutate()).isNotNull();
     }
 
@@ -73,7 +79,7 @@ void builderFromDefaultClientOptions() {
     void builderFromClusterClientOptions() {
 
         ClusterClientOptions options = ClusterClientOptions.builder().maxRedirects(1234).validateClusterNodeMembership(false)
-                .build();
+                .scriptCharset(StandardCharsets.US_ASCII).build();
 
         ClusterClientOptions copy = ClusterClientOptions.builder(options).build();
 
@@ -86,6 +92,7 @@ void builderFromClusterClientOptions() {
         assertThat(copy.isCancelCommandsOnReconnectFailure()).isEqualTo(options.isCancelCommandsOnReconnectFailure());
         assertThat(copy.isSuspendReconnectOnProtocolFailure()).isEqualTo(options.isSuspendReconnectOnProtocolFailure());
         assertThat(copy.getMaxRedirects()).isEqualTo(options.getMaxRedirects());
+        assertThat(copy.getScriptCharset()).isEqualTo(options.getScriptCharset());
         assertThat(options.mutate()).isNotSameAs(copy.mutate());
     }
 }

From e4ec4f30d82ad28b60773cb9039e9f4032eed3f9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 21 Feb 2020 14:12:02 +0100
Subject: [PATCH 755/808] Refactor thrown exceptions during dispatch to command
 completion failures #617

Exceptions that were used to signal a full queue or prohibited commands are now no longer thrown but used to complete a command exceptionally. This approach friendlier to users of asynchronous/reactive APIs as the command outcome aligns with the programming model for error handling.
---
 .../ClusterDistributionChannelWriter.java     |  9 ++--
 .../core/protocol/DefaultEndpoint.java        | 42 ++++++++++++-------
 .../lettuce/core/pubsub/PubSubEndpoint.java   | 42 +++++++++++++++----
 .../core/ClientOptionsIntegrationTests.java   | 23 +++++-----
 .../protocol/DefaultEndpointUnitTests.java    | 26 +++---------
 5 files changed, 84 insertions(+), 58 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index 0c759d00e9..dc68a5c0f2 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -30,8 +30,8 @@
 import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.HostAndPort;
 import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.protocol.*;
 import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.*;
 import io.lettuce.core.resource.ClientResources;
 
 /**
@@ -70,7 +70,8 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         LettuceAssert.notNull(command, "Command must not be null");
 
         if (closed) {
-            throw new RedisException("Connection is closed");
+            command.completeExceptionally(new RedisException("Connection is closed"));
+            return command;
         }
 
         return doWrite(command);
@@ -215,7 +216,9 @@ private static RedisChannelWriter getWriterToUse(RedisChannelWriter writer) {
         LettuceAssert.notNull(commands, "Commands must not be null");
 
         if (closed) {
-            throw new RedisException("Connection is closed");
+
+            commands.forEach(it -> it.completeExceptionally(new RedisException("Connection is closed")));
+            return (Collection<RedisCommand<K, V, ?>>) commands;
         }
 
         List<ClusterCommand<K, V, ?>> clusterCommands = new ArrayList<>(commands.size());
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index 5183e3d314..cd55eea559 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -51,11 +51,11 @@ public class DefaultEndpoint implements RedisChannelWriter, Endpoint {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(DefaultEndpoint.class);
     private static final AtomicLong ENDPOINT_COUNTER = new AtomicLong();
-    private static final AtomicIntegerFieldUpdater<DefaultEndpoint> QUEUE_SIZE = AtomicIntegerFieldUpdater.newUpdater(
-            DefaultEndpoint.class, "queueSize");
+    private static final AtomicIntegerFieldUpdater<DefaultEndpoint> QUEUE_SIZE = AtomicIntegerFieldUpdater
+            .newUpdater(DefaultEndpoint.class, "queueSize");
 
-    private static final AtomicIntegerFieldUpdater<DefaultEndpoint> STATUS = AtomicIntegerFieldUpdater.newUpdater(
-            DefaultEndpoint.class, "status");
+    private static final AtomicIntegerFieldUpdater<DefaultEndpoint> STATUS = AtomicIntegerFieldUpdater
+            .newUpdater(DefaultEndpoint.class, "status");
 
     private static final int ST_OPEN = 0;
     private static final int ST_CLOSED = 1;
@@ -131,11 +131,15 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
 
         LettuceAssert.notNull(command, "Command must not be null");
 
+        RedisException validation = validateWrite(1);
+        if (validation != null) {
+            command.completeExceptionally(validation);
+            return command;
+        }
+
         try {
             sharedLock.incrementWriters();
 
-            validateWrite(1);
-
             if (autoFlushCommands) {
 
                 if (isConnected()) {
@@ -163,11 +167,16 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
 
         LettuceAssert.notNull(commands, "Commands must not be null");
 
+        RedisException validation = validateWrite(commands.size());
+
+        if (validation != null) {
+            commands.forEach(it -> it.completeExceptionally(validation));
+            return (Collection<RedisCommand<K, V, ?>>) commands;
+        }
+
         try {
             sharedLock.incrementWriters();
 
-            validateWrite(commands.size());
-
             if (autoFlushCommands) {
 
                 if (isConnected()) {
@@ -189,10 +198,10 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         return (Collection<RedisCommand<K, V, ?>>) commands;
     }
 
-    private void validateWrite(int commands) {
+    private RedisException validateWrite(int commands) {
 
         if (isClosed()) {
-            throw new RedisException("Connection is closed");
+            return new RedisException("Connection is closed");
         }
 
         if (usesBoundedQueues()) {
@@ -200,24 +209,26 @@ private void validateWrite(int commands) {
             boolean connected = isConnected();
 
             if (QUEUE_SIZE.get(this) + commands > clientOptions.getRequestQueueSize()) {
-                throw new RedisException("Request queue size exceeded: " + clientOptions.getRequestQueueSize()
+                return new RedisException("Request queue size exceeded: " + clientOptions.getRequestQueueSize()
                         + ". Commands are not accepted until the queue size drops.");
             }
 
             if (!connected && disconnectedBuffer.size() + commands > clientOptions.getRequestQueueSize()) {
-                throw new RedisException("Request queue size exceeded: " + clientOptions.getRequestQueueSize()
+                return new RedisException("Request queue size exceeded: " + clientOptions.getRequestQueueSize()
                         + ". Commands are not accepted until the queue size drops.");
             }
 
             if (connected && commandBuffer.size() + commands > clientOptions.getRequestQueueSize()) {
-                throw new RedisException("Command buffer size exceeded: " + clientOptions.getRequestQueueSize()
+                return new RedisException("Command buffer size exceeded: " + clientOptions.getRequestQueueSize()
                         + ". Commands are not accepted until the queue size drops.");
             }
         }
 
         if (!isConnected() && rejectCommandsWhileDisconnected) {
-            throw new RedisException("Currently not connected. Commands are rejected.");
+            return new RedisException("Currently not connected. Commands are rejected.");
         }
+
+        return null;
     }
 
     private boolean usesBoundedQueues() {
@@ -576,7 +587,8 @@ public void notifyDrainQueuedCommands(HasQueuedCommands queuedCommands) {
         } else if (reliability == Reliability.AT_MOST_ONCE && rejectCommandsWhileDisconnected) {
 
             RedisException disconnected = new RedisException("Connection disconnected");
-            cancelCommands(disconnected.getMessage(), queuedCommands.drainQueue(), it -> it.completeExceptionally(disconnected));
+            cancelCommands(disconnected.getMessage(), queuedCommands.drainQueue(),
+                    it -> it.completeExceptionally(disconnected));
             cancelCommands(disconnected.getMessage(), drainCommands(), it -> it.completeExceptionally(disconnected));
             return;
         }
diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
index 02a1acfdcc..e027d9fa1c 100644
--- a/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
+++ b/src/main/java/io/lettuce/core/pubsub/PubSubEndpoint.java
@@ -119,8 +119,9 @@ public void notifyChannelActive(Channel channel) {
     @Override
     public <K1, V1, T> RedisCommand<K1, V1, T> write(RedisCommand<K1, V1, T> command) {
 
-        if (isSubscribed()) {
-            validateCommandAllowed(command);
+        if (isSubscribed() && !isAllowed(command)) {
+            rejectCommand(command);
+            return command;
         }
 
         if (!subscribeWritten && SUBSCRIBE_COMMANDS.contains(command.getType().name())) {
@@ -134,11 +135,15 @@ public <K1, V1, T> RedisCommand<K1, V1, T> write(RedisCommand<K1, V1, T> command
     public <K1, V1> Collection<RedisCommand<K1, V1, ?>> write(Collection<? extends RedisCommand<K1, V1, ?>> redisCommands) {
 
         if (isSubscribed()) {
-            redisCommands.forEach(PubSubEndpoint::validateCommandAllowed);
+
+            if (containsViolatingCommands(redisCommands)) {
+                rejectCommands(redisCommands);
+                return (Collection<RedisCommand<K1, V1, ?>>) redisCommands;
+            }
         }
 
         if (!subscribeWritten) {
-            for (RedisCommand<K1, V1, ?> redisCommand : redisCommands) {
+            for (RedisCommand<?, ?, ?> redisCommand : redisCommands) {
                 if (SUBSCRIBE_COMMANDS.contains(redisCommand.getType().name())) {
                     subscribeWritten = true;
                     break;
@@ -149,13 +154,34 @@ public <K1, V1, T> RedisCommand<K1, V1, T> write(RedisCommand<K1, V1, T> command
         return super.write(redisCommands);
     }
 
-    private static void validateCommandAllowed(RedisCommand<?, ?, ?> command) {
+    protected void rejectCommand(RedisCommand<?, ?, ?> command) {
+        command.completeExceptionally(
+                new RedisException(String.format("Command %s not allowed while subscribed. Allowed commands are: %s",
+                        command.getType().name(), ALLOWED_COMMANDS_SUBSCRIBED)));
+    }
+
+    protected void rejectCommands(Collection<? extends RedisCommand<?, ?, ?>> redisCommands) {
+        for (RedisCommand<?, ?, ?> command : redisCommands) {
+            command.completeExceptionally(
+                    new RedisException(String.format("Command %s not allowed while subscribed. Allowed commands are: %s",
+                            command.getType().name(), ALLOWED_COMMANDS_SUBSCRIBED)));
+        }
+    }
+
+    protected boolean containsViolatingCommands(Collection<? extends RedisCommand<?, ?, ?>> redisCommands) {
 
-        if (!ALLOWED_COMMANDS_SUBSCRIBED.contains(command.getType().name())) {
+        for (RedisCommand<?, ?, ?> redisCommand : redisCommands) {
 
-            throw new RedisException(String.format("Command %s not allowed while subscribed. Allowed commands are: %s", command
-                    .getType().name(), ALLOWED_COMMANDS_SUBSCRIBED));
+            if (!isAllowed(redisCommand)) {
+                return true;
+            }
         }
+
+        return false;
+    }
+
+    private static boolean isAllowed(RedisCommand<?, ?, ?> command) {
+        return ALLOWED_COMMANDS_SUBSCRIBED.contains(command.getType().name());
     }
 
     private boolean isSubscribed() {
diff --git a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
index 50b2c9820e..ae558982f9 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
@@ -51,6 +51,8 @@
 import io.netty.channel.Channel;
 
 /**
+ * Integration tests for effects configured via {@link ClientOptions}.
+ *
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
@@ -87,25 +89,22 @@ void requestQueueSize() {
 
         client.setOptions(ClientOptions.builder().requestQueueSize(10).build());
 
-        RedisAsyncCommands<String, String> connection = client.connect().async();
-        getConnectionWatchdog(connection.getStatefulConnection()).setListenOnChannelInactive(false);
+        StatefulRedisConnection<String, String> connection = client.connect();
+        getConnectionWatchdog(connection).setListenOnChannelInactive(false);
 
-        connection.quit();
+        connection.async().quit();
 
-        Wait.untilTrue(() -> !connection.getStatefulConnection().isOpen()).waitOrTimeout();
+        Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
 
         for (int i = 0; i < 10; i++) {
-            connection.ping();
+            connection.async().ping();
         }
 
-        try {
-            connection.ping();
-            fail("missing RedisException");
-        } catch (RedisException e) {
-            assertThat(e).hasMessageContaining("Request queue size exceeded");
-        }
+        assertThatThrownBy(() -> connection.async().ping().toCompletableFuture().join())
+                .hasMessageContaining("Request queue size exceeded");
+        assertThatThrownBy(() -> connection.sync().ping()).hasMessageContaining("Request queue size exceeded");
 
-        connection.getStatefulConnection().close();
+        connection.close();
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
index f6f708346a..83c93f50bb 100644
--- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
@@ -16,7 +16,6 @@
 package io.lettuce.core.protocol;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -224,7 +223,6 @@ void notifyDrainQueuedCommandsShouldWriteCommands() {
 
         verify(channel).write(command);
         verify(channel).flush();
-
     }
 
     @Test
@@ -260,12 +258,8 @@ void writeShouldRejectCommandsInDisconnectedState() {
                 .disconnectedBehavior(ClientOptions.DisconnectedBehavior.REJECT_COMMANDS) //
                 .build(), clientResources);
 
-        try {
-            sut.write(command);
-            fail("Missing RedisException");
-        } catch (RedisException e) {
-            assertThat(e).hasMessageContaining("Commands are rejected");
-        }
+        sut.write(command);
+        assertThat(command.exception).hasMessageContaining("Commands are rejected");
     }
 
     @Test
@@ -273,12 +267,8 @@ void writeShouldRejectCommandsInClosedState() {
 
         sut.close();
 
-        try {
-            sut.write(command);
-            fail("Missing RedisException");
-        } catch (RedisException e) {
-            assertThat(e).hasMessageContaining("Connection is closed");
-        }
+        sut.write(command);
+        assertThat(command.exception).hasMessageContaining("Connection is closed");
     }
 
     @Test
@@ -289,12 +279,8 @@ void writeWithoutAutoReconnectShouldRejectCommandsInDisconnectedState() {
                 .disconnectedBehavior(ClientOptions.DisconnectedBehavior.DEFAULT) //
                 .build(), clientResources);
 
-        try {
-            sut.write(command);
-            fail("Missing RedisException");
-        } catch (RedisException e) {
-            assertThat(e).hasMessageContaining("Commands are rejected");
-        }
+        sut.write(command);
+        assertThat(command.exception).hasMessageContaining("Commands are rejected");
     }
 
     @Test

From 3ec6223e73b74aa4b2e9caf72ed708d149b3f7f1 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 25 Feb 2020 13:12:09 +0100
Subject: [PATCH 756/808] Add support for RxJava 3 #1235

We now support RxJava 3 types with dynamic command interfaces.
---
 pom.xml                                       |   7 +
 .../core/dynamic/ReactiveTypeAdapters.java    | 298 ++++++++++++++++++
 .../lettuce/core/dynamic/ReactiveTypes.java   |  21 +-
 .../ReactiveTypeAdaptersUnitTests.java        | 103 ++++++
 .../ReactiveTypeAdaptionIntegrationTests.java |  45 +++
 5 files changed, 472 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7edec1e2e4..f1e2d49354 100644
--- a/pom.xml
+++ b/pom.xml
@@ -231,6 +231,13 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>io.reactivex.rxjava3</groupId>
+            <artifactId>rxjava</artifactId>
+            <version>3.0.0</version>
+            <optional>true</optional>
+        </dependency>
+
         <!-- Spring -->
 
         <dependency>
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java b/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java
index 2ff20e5552..f7f13f86a0 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveTypeAdapters.java
@@ -91,6 +91,31 @@ static void registerIn(ConversionService conversionService) {
                 conversionService.addConverter(RxJava2MaybeToFluxAdapter.INSTANCE);
             }
 
+            if (ReactiveTypes.isAvailable(ReactiveLibrary.RXJAVA3)) {
+
+                conversionService.addConverter(PublisherToRxJava3CompletableAdapter.INSTANCE);
+                conversionService.addConverter(RxJava3CompletableToPublisherAdapter.INSTANCE);
+                conversionService.addConverter(RxJava3CompletableToMonoAdapter.INSTANCE);
+
+                conversionService.addConverter(PublisherToRxJava3SingleAdapter.INSTANCE);
+                conversionService.addConverter(RxJava3SingleToPublisherAdapter.INSTANCE);
+                conversionService.addConverter(RxJava3SingleToMonoAdapter.INSTANCE);
+                conversionService.addConverter(RxJava3SingleToFluxAdapter.INSTANCE);
+
+                conversionService.addConverter(PublisherToRxJava3ObservableAdapter.INSTANCE);
+                conversionService.addConverter(RxJava3ObservableToPublisherAdapter.INSTANCE);
+                conversionService.addConverter(RxJava3ObservableToMonoAdapter.INSTANCE);
+                conversionService.addConverter(RxJava3ObservableToFluxAdapter.INSTANCE);
+
+                conversionService.addConverter(PublisherToRxJava3FlowableAdapter.INSTANCE);
+                conversionService.addConverter(RxJava3FlowableToPublisherAdapter.INSTANCE);
+
+                conversionService.addConverter(PublisherToRxJava3MaybeAdapter.INSTANCE);
+                conversionService.addConverter(RxJava3MaybeToPublisherAdapter.INSTANCE);
+                conversionService.addConverter(RxJava3MaybeToMonoAdapter.INSTANCE);
+                conversionService.addConverter(RxJava3MaybeToFluxAdapter.INSTANCE);
+            }
+
             conversionService.addConverter(PublisherToMonoAdapter.INSTANCE);
             conversionService.addConverter(PublisherToFluxAdapter.INSTANCE);
 
@@ -104,6 +129,12 @@ static void registerIn(ConversionService conversionService) {
                 conversionService.addConverter(RxJava2ObservableToSingleAdapter.INSTANCE);
                 conversionService.addConverter(RxJava2ObservableToMaybeAdapter.INSTANCE);
             }
+
+            if (ReactiveTypes.isAvailable(ReactiveLibrary.RXJAVA3)) {
+                conversionService.addConverter(RxJava3SingleToObservableAdapter.INSTANCE);
+                conversionService.addConverter(RxJava3ObservableToSingleAdapter.INSTANCE);
+                conversionService.addConverter(RxJava3ObservableToMaybeAdapter.INSTANCE);
+            }
         }
     }
 
@@ -573,4 +604,271 @@ public io.reactivex.Observable<?> apply(io.reactivex.Single<?> source) {
             return source.toObservable();
         }
     }
+
+    // -------------------------------------------------------------------------
+    // RxJava 3 adapters
+    // -------------------------------------------------------------------------
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Publisher} to {@link io.reactivex.Single}.
+     */
+    public enum PublisherToRxJava3SingleAdapter implements Function<Publisher<?>, io.reactivex.rxjava3.core.Single<?>> {
+
+        INSTANCE;
+
+        @Override
+        public io.reactivex.rxjava3.core.Single<?> apply(Publisher<?> source) {
+            return io.reactivex.rxjava3.core.Single.fromPublisher(source);
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Publisher} to {@link io.reactivex.Completable}.
+     */
+    public enum PublisherToRxJava3CompletableAdapter implements Function<Publisher<?>, io.reactivex.rxjava3.core.Completable> {
+
+        INSTANCE;
+
+        @Override
+        public io.reactivex.rxjava3.core.Completable apply(Publisher<?> source) {
+            return io.reactivex.rxjava3.core.Completable.fromPublisher(source);
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Publisher} to {@link io.reactivex.rxjava3.core.Observable}.
+     */
+    public enum PublisherToRxJava3ObservableAdapter implements Function<Publisher<?>, io.reactivex.rxjava3.core.Observable<?>> {
+
+        INSTANCE;
+
+        @Override
+        public io.reactivex.rxjava3.core.Observable<?> apply(Publisher<?> source) {
+            return io.reactivex.rxjava3.core.Observable.fromPublisher(source);
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.rxjava3.core.Single} to {@link Publisher}.
+     */
+    public enum RxJava3SingleToPublisherAdapter implements Function<io.reactivex.rxjava3.core.Single<?>, Publisher<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Publisher<?> apply(io.reactivex.rxjava3.core.Single<?> source) {
+            return source.toFlowable();
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.rxjava3.core.Single} to {@link Mono}.
+     */
+    public enum RxJava3SingleToMonoAdapter implements Function<io.reactivex.rxjava3.core.Single<?>, Mono<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Mono<?> apply(io.reactivex.rxjava3.core.Single<?> source) {
+            return Mono.from(source.toFlowable());
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.rxjava3.core.Single} to {@link Publisher}.
+     */
+    public enum RxJava3SingleToFluxAdapter implements Function<io.reactivex.rxjava3.core.Single<?>, Flux<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Flux<?> apply(io.reactivex.rxjava3.core.Single<?> source) {
+            return Flux.from(source.toFlowable());
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.rxjava3.core.Completable} to {@link Publisher}.
+     */
+    public enum RxJava3CompletableToPublisherAdapter implements Function<io.reactivex.rxjava3.core.Completable, Publisher<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Publisher<?> apply(io.reactivex.rxjava3.core.Completable source) {
+            return source.toFlowable();
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.rxjava3.core.Completable} to {@link Mono}.
+     */
+    public enum RxJava3CompletableToMonoAdapter implements Function<io.reactivex.rxjava3.core.Completable, Mono<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Mono<?> apply(io.reactivex.rxjava3.core.Completable source) {
+            return Mono.from(RxJava3CompletableToPublisherAdapter.INSTANCE.apply(source));
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt an {@link io.reactivex.rxjava3.core.Observable} to {@link Publisher}.
+     */
+    public enum RxJava3ObservableToPublisherAdapter implements Function<io.reactivex.rxjava3.core.Observable<?>, Publisher<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Publisher<?> apply(io.reactivex.rxjava3.core.Observable<?> source) {
+            return source.toFlowable(io.reactivex.rxjava3.core.BackpressureStrategy.BUFFER);
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.rxjava3.core.Observable} to {@link Mono}.
+     */
+    public enum RxJava3ObservableToMonoAdapter implements Function<io.reactivex.rxjava3.core.Observable<?>, Mono<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Mono<?> apply(io.reactivex.rxjava3.core.Observable<?> source) {
+            return Mono.from(source.toFlowable(io.reactivex.rxjava3.core.BackpressureStrategy.BUFFER));
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.rxjava3.core.Observable} to {@link Flux}.
+     */
+    public enum RxJava3ObservableToFluxAdapter implements Function<io.reactivex.rxjava3.core.Observable<?>, Flux<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Flux<?> apply(io.reactivex.rxjava3.core.Observable<?> source) {
+            return Flux.from(source.toFlowable(io.reactivex.rxjava3.core.BackpressureStrategy.BUFFER));
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Publisher} to {@link io.reactivex.rxjava3.core.Flowable}.
+     */
+    public enum PublisherToRxJava3FlowableAdapter implements Function<Publisher<?>, io.reactivex.rxjava3.core.Flowable<?>> {
+
+        INSTANCE;
+
+        @Override
+        public io.reactivex.rxjava3.core.Flowable<?> apply(Publisher<?> source) {
+            return io.reactivex.rxjava3.core.Flowable.fromPublisher(source);
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.rxjava3.core.Flowable} to {@link Publisher}.
+     */
+    public enum RxJava3FlowableToPublisherAdapter implements Function<io.reactivex.rxjava3.core.Flowable<?>, Publisher<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Publisher<?> apply(io.reactivex.rxjava3.core.Flowable<?> source) {
+            return source;
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Publisher} to {@link io.reactivex.rxjava3.core.Flowable}.
+     */
+    public enum PublisherToRxJava3MaybeAdapter implements Function<Publisher<?>, io.reactivex.rxjava3.core.Maybe<?>> {
+
+        INSTANCE;
+
+        @Override
+        public io.reactivex.rxjava3.core.Maybe<?> apply(Publisher<?> source) {
+            return io.reactivex.rxjava3.core.Flowable.fromPublisher(source).singleElement();
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.rxjava3.core.Maybe} to {@link Publisher}.
+     */
+    public enum RxJava3MaybeToPublisherAdapter implements Function<io.reactivex.rxjava3.core.Maybe<?>, Publisher<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Publisher<?> apply(io.reactivex.rxjava3.core.Maybe<?> source) {
+            return source.toFlowable();
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.rxjava3.core.Maybe} to {@link Mono}.
+     */
+    public enum RxJava3MaybeToMonoAdapter implements Function<io.reactivex.rxjava3.core.Maybe<?>, Mono<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Mono<?> apply(io.reactivex.rxjava3.core.Maybe<?> source) {
+            return Mono.from(source.toFlowable());
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link io.reactivex.rxjava3.core.Maybe} to {@link Flux}.
+     */
+    public enum RxJava3MaybeToFluxAdapter implements Function<io.reactivex.rxjava3.core.Maybe<?>, Flux<?>> {
+
+        INSTANCE;
+
+        @Override
+        public Flux<?> apply(io.reactivex.rxjava3.core.Maybe<?> source) {
+            return Flux.from(source.toFlowable());
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Observable} to {@link Single}.
+     */
+    public enum RxJava3ObservableToSingleAdapter
+            implements Function<io.reactivex.rxjava3.core.Observable<?>, io.reactivex.rxjava3.core.Single<?>> {
+
+        INSTANCE;
+
+        @Override
+        public io.reactivex.rxjava3.core.Single<?> apply(io.reactivex.rxjava3.core.Observable<?> source) {
+            return source.singleOrError();
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Observable} to {@link Maybe}.
+     */
+    public enum RxJava3ObservableToMaybeAdapter
+            implements Function<io.reactivex.rxjava3.core.Observable<?>, io.reactivex.rxjava3.core.Maybe<?>> {
+
+        INSTANCE;
+
+        @Override
+        public io.reactivex.rxjava3.core.Maybe<?> apply(io.reactivex.rxjava3.core.Observable<?> source) {
+            return source.singleElement();
+        }
+    }
+
+    /**
+     * An adapter {@link Function} to adopt a {@link Single} to {@link Single}.
+     */
+    public enum RxJava3SingleToObservableAdapter
+            implements Function<io.reactivex.rxjava3.core.Single<?>, io.reactivex.rxjava3.core.Observable<?>> {
+
+        INSTANCE;
+
+        @Override
+        public io.reactivex.rxjava3.core.Observable<?> apply(io.reactivex.rxjava3.core.Single<?> source) {
+            return source.toObservable();
+        }
+    }
 }
diff --git a/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java b/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java
index e5ba23e099..ba09d7f7da 100644
--- a/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java
+++ b/src/main/java/io/lettuce/core/dynamic/ReactiveTypes.java
@@ -47,6 +47,11 @@
  * @see io.reactivex.Observable
  * @see io.reactivex.Completable
  * @see io.reactivex.Flowable
+ * @see io.reactivex.rxjava3.core.Single
+ * @see io.reactivex.rxjava3.core.Maybe
+ * @see io.reactivex.rxjava3.core.Observable
+ * @see io.reactivex.rxjava3.core.Completable
+ * @see io.reactivex.rxjava3.core.Flowable
  * @see Mono
  * @see Flux
  */
@@ -55,6 +60,7 @@ class ReactiveTypes {
     private static final boolean PROJECT_REACTOR_PRESENT = LettuceClassUtils.isPresent("reactor.core.publisher.Mono");
     private static final boolean RXJAVA1_PRESENT = LettuceClassUtils.isPresent("rx.Completable");
     private static final boolean RXJAVA2_PRESENT = LettuceClassUtils.isPresent("io.reactivex.Flowable");
+    private static final boolean RXJAVA3_PRESENT = LettuceClassUtils.isPresent("io.reactivex.rxjava3.core.Flowable");
 
     private static final Map<Class<?>, Descriptor> REACTIVE_WRAPPERS;
 
@@ -78,6 +84,15 @@ class ReactiveTypes {
             reactiveWrappers.put(io.reactivex.Observable.class, new Descriptor(true, true, false));
         }
 
+        if (RXJAVA3_PRESENT) {
+
+            reactiveWrappers.put(io.reactivex.rxjava3.core.Single.class, new Descriptor(false, true, false));
+            reactiveWrappers.put(io.reactivex.rxjava3.core.Maybe.class, new Descriptor(false, true, false));
+            reactiveWrappers.put(io.reactivex.rxjava3.core.Completable.class, new Descriptor(false, true, true));
+            reactiveWrappers.put(io.reactivex.rxjava3.core.Flowable.class, new Descriptor(true, true, false));
+            reactiveWrappers.put(io.reactivex.rxjava3.core.Observable.class, new Descriptor(true, true, false));
+        }
+
         if (PROJECT_REACTOR_PRESENT) {
 
             reactiveWrappers.put(Mono.class, new Descriptor(false, true, false));
@@ -96,7 +111,7 @@ class ReactiveTypes {
      */
     public static boolean isAvailable() {
         return isAvailable(ReactiveLibrary.PROJECT_REACTOR) || isAvailable(ReactiveLibrary.RXJAVA1)
-                || isAvailable(ReactiveLibrary.RXJAVA2);
+                || isAvailable(ReactiveLibrary.RXJAVA2) || isAvailable(ReactiveLibrary.RXJAVA3);
     }
 
     /**
@@ -116,6 +131,8 @@ public static boolean isAvailable(ReactiveLibrary reactiveLibrary) {
                 return RXJAVA1_PRESENT;
             case RXJAVA2:
                 return RXJAVA2_PRESENT;
+            case RXJAVA3:
+                return RXJAVA3_PRESENT;
         }
 
         throw new IllegalArgumentException(String.format("ReactiveLibrary %s not supported", reactiveLibrary));
@@ -222,7 +239,7 @@ private static Optional<Descriptor> findDescriptor(Class<?> rhsType) {
      * @author Mark Paluch
      */
     enum ReactiveLibrary {
-        PROJECT_REACTOR, RXJAVA1, RXJAVA2;
+        PROJECT_REACTOR, RXJAVA1, RXJAVA2, RXJAVA3;
     }
 
     public static class Descriptor {
diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java
index b356881113..21c1953264 100644
--- a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptersUnitTests.java
@@ -27,6 +27,8 @@
 import io.reactivex.Maybe;
 
 /**
+ * Unit tests for {@link ReactiveTypeAdapters} via {@link ConversionService}.
+ *
  * @author Mark Paluch
  */
 class ReactiveTypeAdaptersUnitTests {
@@ -150,6 +152,107 @@ void toWrapperShouldConvertRxJava2ObservableToPublisher() {
         assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Publisher.class);
     }
 
+    @Test
+    void toWrapperShouldConvertMonoToRxJava3Single() {
+
+        Mono<String> foo = Mono.just("foo");
+        assertThat(conversionService.convert(foo, io.reactivex.rxjava3.core.Single.class))
+                .isInstanceOf(io.reactivex.rxjava3.core.Single.class);
+    }
+
+    @Test
+    void toWrapperShouldConvertRxJava3SingleToMono() {
+
+        io.reactivex.rxjava3.core.Single<String> foo = io.reactivex.rxjava3.core.Single.just("foo");
+        assertThat(conversionService.convert(foo, Mono.class)).isInstanceOf(Mono.class);
+    }
+
+    @Test
+    void toWrapperShouldConvertRxJava3SingleToPublisher() {
+
+        io.reactivex.rxjava3.core.Single<String> foo = io.reactivex.rxjava3.core.Single.just("foo");
+        assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Publisher.class);
+    }
+
+    @Test
+    void toWrapperShouldConvertRxJava3MaybeToMono() {
+
+        io.reactivex.rxjava3.core.Maybe<String> foo = io.reactivex.rxjava3.core.Maybe.just("foo");
+        assertThat(conversionService.convert(foo, Mono.class)).isInstanceOf(Mono.class);
+    }
+
+    @Test
+    void toWrapperShouldConvertRxJava3MaybeToFlux() {
+
+        io.reactivex.rxjava3.core.Maybe<String> foo = io.reactivex.rxjava3.core.Maybe.just("foo");
+        assertThat(conversionService.convert(foo, Flux.class)).isInstanceOf(Flux.class);
+    }
+
+    @Test
+    void toWrapperShouldConvertRxJava3MaybeToPublisher() {
+
+        io.reactivex.rxjava3.core.Maybe<String> foo = io.reactivex.rxjava3.core.Maybe.just("foo");
+        assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Publisher.class);
+    }
+
+    @Test
+    void toWrapperShouldConvertRxJava3FlowableToMono() {
+
+        io.reactivex.rxjava3.core.Flowable<String> foo = io.reactivex.rxjava3.core.Flowable.just("foo");
+        assertThat(conversionService.convert(foo, Mono.class)).isInstanceOf(Mono.class);
+    }
+
+    @Test
+    void toWrapperShouldConvertRxJava3FlowableToFlux() {
+
+        io.reactivex.rxjava3.core.Flowable<String> foo = io.reactivex.rxjava3.core.Flowable.just("foo");
+        assertThat(conversionService.convert(foo, Flux.class)).isInstanceOf(Flux.class);
+    }
+
+    @Test
+    void toWrapperShouldCastRxJava3FlowableToPublisher() {
+
+        io.reactivex.rxjava3.core.Flowable<String> foo = io.reactivex.rxjava3.core.Flowable.just("foo");
+        assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Publisher.class);
+    }
+
+    @Test
+    void toWrapperShouldConvertRxJava3ObservableToMono() {
+
+        io.reactivex.rxjava3.core.Observable<String> foo = io.reactivex.rxjava3.core.Observable.just("foo");
+        assertThat(conversionService.convert(foo, Mono.class)).isInstanceOf(Mono.class);
+    }
+
+    @Test
+    void toWrapperShouldConvertRxJava3ObservableToFlux() {
+
+        io.reactivex.rxjava3.core.Observable<String> foo = io.reactivex.rxjava3.core.Observable.just("foo");
+        assertThat(conversionService.convert(foo, Flux.class)).isInstanceOf(Flux.class);
+    }
+
+    @Test
+    void toWrapperShouldConvertRxJava3ObservableToSingle() {
+
+        io.reactivex.rxjava3.core.Observable<String> foo = io.reactivex.rxjava3.core.Observable.just("foo");
+        assertThat(conversionService.convert(foo, io.reactivex.rxjava3.core.Single.class))
+                .isInstanceOf(io.reactivex.rxjava3.core.Single.class);
+    }
+
+    @Test
+    void toWrapperShouldConvertRxJava3ObservableToMaybe() {
+
+        io.reactivex.rxjava3.core.Observable<String> foo = io.reactivex.rxjava3.core.Observable.empty();
+        assertThat(conversionService.convert(foo, io.reactivex.rxjava3.core.Maybe.class))
+                .isInstanceOf(io.reactivex.rxjava3.core.Maybe.class);
+    }
+
+    @Test
+    void toWrapperShouldConvertRxJava3ObservableToPublisher() {
+
+        io.reactivex.rxjava3.core.Observable<String> foo = io.reactivex.rxjava3.core.Observable.just("foo");
+        assertThat(conversionService.convert(foo, Publisher.class)).isInstanceOf(Publisher.class);
+    }
+
     @Test
     void toWrapperShouldConvertMonoToFlux() {
 
diff --git a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java
index 47eac189cb..48039614be 100644
--- a/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/dynamic/ReactiveTypeAdaptionIntegrationTests.java
@@ -41,6 +41,7 @@ class ReactiveTypeAdaptionIntegrationTests extends TestSupport {
 
     private final RxJava1Types rxjava1;
     private final RxJava2Types rxjava2;
+    private final RxJava3Types rxjava3;
 
     @Inject
     ReactiveTypeAdaptionIntegrationTests(StatefulRedisConnection<String, String> connection) {
@@ -50,6 +51,7 @@ class ReactiveTypeAdaptionIntegrationTests extends TestSupport {
         RedisCommandFactory factory = new RedisCommandFactory(redis.getStatefulConnection());
         this.rxjava1 = factory.getCommands(RxJava1Types.class);
         this.rxjava2 = factory.getCommands(RxJava2Types.class);
+        this.rxjava3 = factory.getCommands(RxJava3Types.class);
     }
 
     @BeforeEach
@@ -99,6 +101,34 @@ void rxJava2Flowable() throws InterruptedException {
         flowable.test().await().assertResult(value).assertComplete();
     }
 
+    @Test
+    void rxJava3Single() throws InterruptedException {
+
+        io.reactivex.rxjava3.core.Single<String> single = rxjava3.getRxJava3Single(key);
+        single.test().await().assertResult(value).assertComplete();
+    }
+
+    @Test
+    void rxJava3Maybe() throws InterruptedException {
+
+        io.reactivex.rxjava3.core.Maybe<String> maybe = rxjava3.getRxJava3Maybe(key);
+        maybe.test().await().assertResult(value).assertComplete();
+    }
+
+    @Test
+    void rxJava3Observable() throws InterruptedException {
+
+        io.reactivex.rxjava3.core.Observable<String> observable = rxjava3.getRxJava3Observable(key);
+        observable.test().await().assertResult(value).assertComplete();
+    }
+
+    @Test
+    void rxJava3Flowable() throws InterruptedException {
+
+        io.reactivex.rxjava3.core.Flowable<String> flowable = rxjava3.getRxJava3Flowable(key);
+        flowable.test().await().assertResult(value).assertComplete();
+    }
+
     static interface RxJava1Types extends Commands {
 
         @Command("GET")
@@ -122,4 +152,19 @@ static interface RxJava2Types extends Commands {
         @Command("GET")
         io.reactivex.Flowable<String> getRxJava2Flowable(String key);
     }
+
+    static interface RxJava3Types extends Commands {
+
+        @Command("GET")
+        io.reactivex.rxjava3.core.Single<String> getRxJava3Single(String key);
+
+        @Command("GET")
+        io.reactivex.rxjava3.core.Maybe<String> getRxJava3Maybe(String key);
+
+        @Command("GET")
+        io.reactivex.rxjava3.core.Observable<String> getRxJava3Observable(String key);
+
+        @Command("GET")
+        io.reactivex.rxjava3.core.Flowable<String> getRxJava3Flowable(String key);
+    }
 }

From efb0b6c49b5a9b66bc4bd88c5961d64cb9d52556 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 10 Mar 2020 09:20:14 +0100
Subject: [PATCH 757/808] Reduce log level to DEBUG for native library logging
 #1238

---
 src/main/java/io/lettuce/core/resource/EpollProvider.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/resource/EpollProvider.java b/src/main/java/io/lettuce/core/resource/EpollProvider.java
index 64f87d0bbe..4c9cce4f8a 100644
--- a/src/main/java/io/lettuce/core/resource/EpollProvider.java
+++ b/src/main/java/io/lettuce/core/resource/EpollProvider.java
@@ -61,11 +61,11 @@ public class EpollProvider {
         EPOLL_AVAILABLE = availability;
 
         if (EPOLL_AVAILABLE) {
-            logger.info("Starting with epoll library");
+            logger.debug("Starting with epoll library");
             EPOLL_RESOURCES = AvailableEpollResources.INSTANCE;
 
         } else {
-            logger.info("Starting without optional epoll library");
+            logger.debug("Starting without optional epoll library");
             EPOLL_RESOURCES = UnavailableEpollResources.INSTANCE;
         }
     }

From 4b602e72f395bbad984d9402eb1694de7acfaf71 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 13 Mar 2020 10:01:59 +0100
Subject: [PATCH 758/808] Refactor cluster topology refresh to non-blocking
 operations #1107

The cluster topology refresh now no longer uses a blocking task to obtain the topology but uses a non-blocking sequence of futures to connect to nodes, request client and topology details and to return results.

Previously, topology refresh was partially asynchronous by connecting to all nodes and sending commands in parallel. The synchronization to await all connections and command completion was blocking which kept a carrier thread busy until the refresh task completed.

The side effect of keeping a worker thread busy was that command expiry and other work got delayed until the topology refresh released the thread.
---
 .../io/lettuce/core/ExceptionFactory.java     |   2 +-
 .../ClusterTopologyRefreshScheduler.java      | 207 ++++---
 .../core/cluster/RedisClusterClient.java      | 256 +++++----
 .../cluster/topology/AsyncConnections.java    | 122 -----
 .../topology/ClusterTopologyRefresh.java      | 333 +-----------
 .../core/cluster/topology/Connections.java    | 125 ++---
 .../DefaultClusterTopologyRefresh.java        | 506 ++++++++++++++++++
 .../cluster/topology/NodeTopologyView.java    |  10 +-
 .../core/cluster/topology/RefreshFutures.java |  87 ---
 .../core/cluster/topology/Requests.java       |  13 +-
 .../cluster/topology/TopologyComparators.java |   7 +-
 .../ClusterPartiallyDownIntegrationTests.java |   5 +-
 ...sterTopologyRefreshSchedulerUnitTests.java |  14 +-
 .../RedisClusterClientIntegrationTests.java   |   2 +-
 ...terPasswordSecuredSslIntegrationTests.java |  15 +-
 .../ClusterTopologyRefreshUnitTests.java      |  62 ++-
 .../topology/ConnectionsUnitTests.java        |  79 ---
 .../cluster/topology/RequestsUnitTests.java   |  27 -
 .../TopologyRefreshIntegrationTests.java      |  30 --
 19 files changed, 910 insertions(+), 992 deletions(-)
 delete mode 100644 src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
 create mode 100644 src/main/java/io/lettuce/core/cluster/topology/DefaultClusterTopologyRefresh.java
 delete mode 100644 src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
 delete mode 100644 src/test/java/io/lettuce/core/cluster/topology/ConnectionsUnitTests.java

diff --git a/src/main/java/io/lettuce/core/ExceptionFactory.java b/src/main/java/io/lettuce/core/ExceptionFactory.java
index 67d5622724..35ee425ddb 100644
--- a/src/main/java/io/lettuce/core/ExceptionFactory.java
+++ b/src/main/java/io/lettuce/core/ExceptionFactory.java
@@ -63,7 +63,7 @@ public static RedisCommandTimeoutException createTimeoutException(String message
                 String.format("%s. Command timed out after %s", message, formatTimeout(timeout)));
     }
 
-    static String formatTimeout(Duration duration) {
+    public static String formatTimeout(Duration duration) {
 
         if (duration.isZero()) {
             return "no timeout";
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
index a7373e1943..3f341533a9 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
@@ -16,16 +16,24 @@
 package io.lettuce.core.cluster;
 
 import java.time.Duration;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
 
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.event.cluster.AdaptiveRefreshTriggeredEvent;
 import io.lettuce.core.resource.ClientResources;
 import io.netty.util.concurrent.EventExecutorGroup;
+import io.netty.util.concurrent.ScheduledFuture;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
+ * Scheduler utility to schedule and initiate cluster topology refresh.
+ *
  * @author Mark Paluch
  */
 class ClusterTopologyRefreshScheduler implements Runnable, ClusterEventListener {
@@ -33,91 +41,77 @@ class ClusterTopologyRefreshScheduler implements Runnable, ClusterEventListener
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(ClusterTopologyRefreshScheduler.class);
     private static final ClusterTopologyRefreshOptions FALLBACK_OPTIONS = ClusterTopologyRefreshOptions.create();
 
-    private final RedisClusterClient redisClusterClient;
+    private final Supplier<ClusterClientOptions> clientOptions;
+    private final Supplier<Partitions> partitions;
     private final ClientResources clientResources;
     private final ClusterTopologyRefreshTask clusterTopologyRefreshTask;
     private final AtomicReference<Timeout> timeoutRef = new AtomicReference<>();
 
-    ClusterTopologyRefreshScheduler(RedisClusterClient redisClusterClient, ClientResources clientResources) {
+    private final AtomicBoolean clusterTopologyRefreshActivated = new AtomicBoolean(false);
+    private final AtomicReference<ScheduledFuture<?>> clusterTopologyRefreshFuture = new AtomicReference<>();
+    private final EventExecutorGroup genericWorkerPool;
+
+    ClusterTopologyRefreshScheduler(Supplier<ClusterClientOptions> clientOptions, Supplier<Partitions> partitions,
+            Supplier<CompletionStage<?>> refreshTopology, ClientResources clientResources) {
 
-        this.redisClusterClient = redisClusterClient;
+        this.clientOptions = clientOptions;
+        this.partitions = partitions;
         this.clientResources = clientResources;
-        this.clusterTopologyRefreshTask = new ClusterTopologyRefreshTask(redisClusterClient);
+        this.genericWorkerPool = this.clientResources.eventExecutorGroup();
+        this.clusterTopologyRefreshTask = new ClusterTopologyRefreshTask(refreshTopology);
     }
 
-    @Override
-    public void run() {
+    protected void activateTopologyRefreshIfNeeded() {
 
-        logger.debug("ClusterTopologyRefreshScheduler.run()");
+        ClusterClientOptions options = clientOptions.get();
+        ClusterTopologyRefreshOptions topologyRefreshOptions = options.getTopologyRefreshOptions();
 
-        if (isEventLoopActive() && redisClusterClient.getClusterClientOptions() != null) {
-            if (!redisClusterClient.getClusterClientOptions().isRefreshClusterView()) {
-                logger.debug("Periodic ClusterTopologyRefresh is disabled");
-                return;
-            }
-        } else {
-            logger.debug("Periodic ClusterTopologyRefresh is disabled");
+        if (!topologyRefreshOptions.isPeriodicRefreshEnabled() || clusterTopologyRefreshActivated.get()) {
             return;
         }
 
-        clientResources.eventExecutorGroup().submit(clusterTopologyRefreshTask);
-    }
-
-    private boolean indicateTopologyRefreshSignal() {
-
-        logger.debug("ClusterTopologyRefreshScheduler.indicateTopologyRefreshSignal()");
-
-        if (!acquireTimeout()) {
-            return false;
-        }
-
-        return scheduleRefresh();
-    }
-
-    private boolean scheduleRefresh() {
-
-        if (isEventLoopActive() && redisClusterClient.getClusterClientOptions() != null) {
-            clientResources.eventExecutorGroup().submit(clusterTopologyRefreshTask);
-            return true;
+        if (clusterTopologyRefreshActivated.compareAndSet(false, true)) {
+            ScheduledFuture<?> scheduledFuture = genericWorkerPool.scheduleAtFixedRate(this,
+                    options.getRefreshPeriod().toNanos(), options.getRefreshPeriod().toNanos(), TimeUnit.NANOSECONDS);
+            clusterTopologyRefreshFuture.set(scheduledFuture);
         }
-
-        logger.debug("ClusterTopologyRefresh is disabled");
-        return false;
     }
 
     /**
-     * Check if the {@link EventExecutorGroup} is active
-     *
-     * @return false if the worker pool is terminating, shutdown or terminated
+     * Disable periodic topology refresh.
      */
-    private boolean isEventLoopActive() {
-
-        EventExecutorGroup eventExecutors = clientResources.eventExecutorGroup();
-        if (eventExecutors.isShuttingDown() || eventExecutors.isShutdown() || eventExecutors.isTerminated()) {
-            return false;
-        }
+    public void shutdown() {
 
-        return true;
-    }
-
-    private boolean acquireTimeout() {
+        if (clusterTopologyRefreshActivated.compareAndSet(true, false)) {
 
-        Timeout existingTimeout = timeoutRef.get();
+            ScheduledFuture<?> scheduledFuture = clusterTopologyRefreshFuture.get();
 
-        if (existingTimeout != null) {
-            if (!existingTimeout.isExpired()) {
-                return false;
+            try {
+                scheduledFuture.cancel(false);
+                clusterTopologyRefreshFuture.set(null);
+            } catch (Exception e) {
+                logger.debug("Could not cancel Cluster topology refresh", e);
             }
         }
+    }
 
-        ClusterTopologyRefreshOptions refreshOptions = getClusterTopologyRefreshOptions();
-        Timeout timeout = new Timeout(refreshOptions.getAdaptiveRefreshTimeout());
+    @Override
+    public void run() {
 
-        if (timeoutRef.compareAndSet(existingTimeout, timeout)) {
-            return true;
+        logger.debug("ClusterTopologyRefreshScheduler.run()");
+
+        if (isEventLoopActive()) {
+
+            if (!clientOptions.get().isRefreshClusterView()) {
+                logger.debug("Periodic ClusterTopologyRefresh is disabled");
+                return;
+            }
+        } else {
+            logger.debug("Periodic ClusterTopologyRefresh is disabled");
+            return;
         }
 
-        return false;
+        clientResources.eventExecutorGroup().submit(clusterTopologyRefreshTask);
     }
 
     @Override
@@ -171,18 +165,74 @@ public void onUnknownNode() {
 
     private void emitAdaptiveRefreshScheduledEvent() {
 
-        AdaptiveRefreshTriggeredEvent event = new AdaptiveRefreshTriggeredEvent(redisClusterClient::getPartitions,
-                this::scheduleRefresh);
+        AdaptiveRefreshTriggeredEvent event = new AdaptiveRefreshTriggeredEvent(partitions, this::scheduleRefresh);
 
         clientResources.eventBus().publish(event);
     }
 
+    private boolean indicateTopologyRefreshSignal() {
+
+        logger.debug("ClusterTopologyRefreshScheduler.indicateTopologyRefreshSignal()");
+
+        if (!acquireTimeout()) {
+            return false;
+        }
+
+        return scheduleRefresh();
+    }
+
+    private boolean scheduleRefresh() {
+
+        if (isEventLoopActive()) {
+            clientResources.eventExecutorGroup().submit(clusterTopologyRefreshTask);
+            return true;
+        }
+
+        logger.debug("ClusterTopologyRefresh is disabled");
+        return false;
+    }
+
+    /**
+     * Check if the {@link EventExecutorGroup} is active
+     *
+     * @return false if the worker pool is terminating, shutdown or terminated
+     */
+    private boolean isEventLoopActive() {
+
+        EventExecutorGroup eventExecutors = clientResources.eventExecutorGroup();
+        if (eventExecutors.isShuttingDown() || eventExecutors.isShutdown() || eventExecutors.isTerminated()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean acquireTimeout() {
+
+        Timeout existingTimeout = timeoutRef.get();
+
+        if (existingTimeout != null) {
+            if (!existingTimeout.isExpired()) {
+                return false;
+            }
+        }
+
+        ClusterTopologyRefreshOptions refreshOptions = getClusterTopologyRefreshOptions();
+        Timeout timeout = new Timeout(refreshOptions.getAdaptiveRefreshTimeout());
+
+        if (timeoutRef.compareAndSet(existingTimeout, timeout)) {
+            return true;
+        }
+
+        return false;
+    }
+
     private ClusterTopologyRefreshOptions getClusterTopologyRefreshOptions() {
 
-        ClusterClientOptions clusterClientOptions = redisClusterClient.getClusterClientOptions();
+        ClientOptions clientOptions = this.clientOptions.get();
 
-        if (clusterClientOptions != null) {
-            return clusterClientOptions.getTopologyRefreshOptions();
+        if (clientOptions instanceof ClusterClientOptions) {
+            return ((ClusterClientOptions) clientOptions).getTopologyRefreshOptions();
         }
 
         return FALLBACK_OPTIONS;
@@ -220,24 +270,19 @@ public long remaining() {
         }
     }
 
-    private static class ClusterTopologyRefreshTask implements Runnable {
+    private static class ClusterTopologyRefreshTask extends AtomicBoolean implements Runnable {
 
-        private final RedisClusterClient redisClusterClient;
-        private final AtomicBoolean unique = new AtomicBoolean();
+        private static final long serialVersionUID = -1337731371220365694L;
+        private final Supplier<CompletionStage<?>> reloadTopologyAsync;
 
-        ClusterTopologyRefreshTask(RedisClusterClient redisClusterClient) {
-            this.redisClusterClient = redisClusterClient;
+        ClusterTopologyRefreshTask(Supplier<CompletionStage<?>> reloadTopologyAsync) {
+            this.reloadTopologyAsync = reloadTopologyAsync;
         }
 
         public void run() {
 
-            if (unique.compareAndSet(false, true)) {
-                try {
-                    doRun();
-                } finally {
-                    unique.set(false);
-                }
-
+            if (compareAndSet(false, true)) {
+                doRun();
                 return;
             }
 
@@ -249,11 +294,17 @@ public void run() {
         void doRun() {
 
             if (logger.isDebugEnabled()) {
-                logger.debug("ClusterTopologyRefreshTask requesting partitions from {}",
-                        redisClusterClient.getTopologyRefreshSource());
+                logger.debug("ClusterTopologyRefreshTask requesting partitions");
             }
             try {
-                redisClusterClient.reloadPartitions();
+                reloadTopologyAsync.get().whenComplete((ignore, throwable) -> {
+
+                    if (throwable != null) {
+                        logger.warn("Cannot refresh Redis Cluster topology", throwable);
+                    }
+
+                    set(false);
+                });
             } catch (Exception e) {
                 logger.warn("Cannot refresh Redis Cluster topology", e);
             }
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index e810052265..5038b30648 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -19,11 +19,7 @@
 import java.net.SocketAddress;
 import java.net.URI;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.*;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -58,7 +54,6 @@
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnectionImpl;
 import io.lettuce.core.resource.ClientResources;
-import io.netty.util.concurrent.ScheduledFuture;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -142,15 +137,13 @@ public class RedisClusterClient extends AbstractRedisClient {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(RedisClusterClient.class);
 
-    protected final AtomicBoolean clusterTopologyRefreshActivated = new AtomicBoolean(false);
-    protected final AtomicReference<ScheduledFuture<?>> clusterTopologyRefreshFuture = new AtomicReference<>();
-
-    private final ClusterTopologyRefresh refresh = new ClusterTopologyRefresh(new NodeConnectionFactoryImpl(), getResources());
-    private final ClusterTopologyRefreshScheduler clusterTopologyRefreshScheduler = new ClusterTopologyRefreshScheduler(this,
+    private final ClusterTopologyRefresh refresh = ClusterTopologyRefresh.create(new NodeConnectionFactoryImpl(),
             getResources());
+    private final ClusterTopologyRefreshScheduler topologyRefreshScheduler = new ClusterTopologyRefreshScheduler(
+            this::getClusterClientOptions, this::getPartitions, this::refreshPartitionsAsync, getResources());
     private final Iterable<RedisURI> initialUris;
 
-    private Partitions partitions;
+    private volatile Partitions partitions;
 
     /**
      * Non-private constructor to make {@link RedisClusterClient} proxyable.
@@ -181,7 +174,7 @@ protected RedisClusterClient(ClientResources clientResources, Iterable<RedisURI>
         this.initialUris = Collections.unmodifiableList(LettuceLists.newList(redisURIs));
 
         setDefaultTimeout(getFirstUri().getTimeout());
-        setOptions(ClusterClientOptions.builder().build());
+        setOptions(ClusterClientOptions.create());
     }
 
     private static void assertSameOptions(Iterable<RedisURI> redisURIs) {
@@ -339,12 +332,9 @@ public StatefulRedisClusterConnection<String, String> connect() {
      * @param <V> Value type
      * @return A new stateful Redis Cluster connection
      */
-    @SuppressWarnings("unchecked")
     public <K, V> StatefulRedisClusterConnection<K, V> connect(RedisCodec<K, V> codec) {
 
-        if (partitions == null) {
-            initializePartitions();
-        }
+        assertInitialPartitions();
 
         return getConnection(connectClusterAsync(codec));
     }
@@ -370,7 +360,6 @@ public <K, V> StatefulRedisClusterConnection<K, V> connect(RedisCodec<K, V> code
      * @return a {@link CompletableFuture} that is notified with the connection progress.
      * @since 5.1
      */
-    @SuppressWarnings("unchecked")
     public <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectAsync(RedisCodec<K, V> codec) {
         return transformAsyncConnectionException(connectClusterAsync(codec), getInitialUris());
     }
@@ -413,12 +402,9 @@ public StatefulRedisClusterPubSubConnection<String, String> connectPubSub() {
      * @param <V> Value type
      * @return A new stateful Redis Cluster connection
      */
-    @SuppressWarnings("unchecked")
     public <K, V> StatefulRedisClusterPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec) {
 
-        if (partitions == null) {
-            initializePartitions();
-        }
+        assertInitialPartitions();
 
         return getConnection(connectClusterPubSubAsync(codec));
     }
@@ -444,7 +430,6 @@ public <K, V> StatefulRedisClusterPubSubConnection<K, V> connectPubSub(RedisCode
      * @return a {@link CompletableFuture} that is notified with the connection progress.
      * @since 5.1
      */
-    @SuppressWarnings("unchecked")
     public <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> connectPubSubAsync(RedisCodec<K, V> codec) {
         return transformAsyncConnectionException(connectClusterPubSubAsync(codec), getInitialUris());
     }
@@ -563,7 +548,7 @@ private <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectCl
                     "Partitions not initialized. Initialize via RedisClusterClient.getPartitions()."));
         }
 
-        activateTopologyRefreshIfNeeded();
+        topologyRefreshScheduler.activateTopologyRefreshIfNeeded();
 
         logger.debug("connectCluster(" + initialUris + ")");
 
@@ -577,9 +562,9 @@ private <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectCl
         }
 
         ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, writer,
-                clusterTopologyRefreshScheduler);
+                topologyRefreshScheduler);
         PooledClusterConnectionProvider<K, V> pooledClusterConnectionProvider = new PooledClusterConnectionProvider<>(this,
-                clusterWriter, codec, clusterTopologyRefreshScheduler);
+                clusterWriter, codec, topologyRefreshScheduler);
 
         clusterWriter.setClusterConnectionProvider(pooledClusterConnectionProvider);
 
@@ -646,7 +631,7 @@ private <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> con
                     "Partitions not initialized. Initialize via RedisClusterClient.getPartitions()."));
         }
 
-        activateTopologyRefreshIfNeeded();
+        topologyRefreshScheduler.activateTopologyRefreshIfNeeded();
 
         logger.debug("connectClusterPubSub(" + initialUris + ")");
 
@@ -660,13 +645,13 @@ private <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> con
         }
 
         ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, writer,
-                clusterTopologyRefreshScheduler);
+                topologyRefreshScheduler);
 
         StatefulRedisClusterPubSubConnectionImpl<K, V> connection = new StatefulRedisClusterPubSubConnectionImpl<>(endpoint,
                 clusterWriter, codec, timeout);
 
         ClusterPubSubConnectionProvider<K, V> pooledClusterConnectionProvider = new ClusterPubSubConnectionProvider<>(this,
-                clusterWriter, codec, connection.getUpstreamListener(), clusterTopologyRefreshScheduler);
+                clusterWriter, codec, connection.getUpstreamListener(), topologyRefreshScheduler);
 
         clusterWriter.setClusterConnectionProvider(pooledClusterConnectionProvider);
         connection.setPartitions(partitions);
@@ -748,7 +733,7 @@ private <K, V> ConnectionBuilder createConnectionBuilder(RedisChannelHandler<K,
         state.apply(connectionSettings);
         connectionBuilder.connectionInitializer(createHandshake(state));
 
-        connectionBuilder.reconnectionListener(new ReconnectEventListener(clusterTopologyRefreshScheduler));
+        connectionBuilder.reconnectionListener(new ReconnectEventListener(topologyRefreshScheduler));
         connectionBuilder.clientOptions(clientOptions);
         connectionBuilder.connection(connection);
         connectionBuilder.clientResources(clientResources);
@@ -761,16 +746,38 @@ private <K, V> ConnectionBuilder createConnectionBuilder(RedisChannelHandler<K,
     }
 
     /**
-     * Reload partitions and re-initialize the distribution table.
+     * Refresh partitions and re-initialize the routing table.
+     *
+     * @deprecated since 6.0. Renamed to {@link #refreshPartitions()}.
      */
+    @Deprecated
     public void reloadPartitions() {
+        refreshPartitions();
+    }
+
+    /**
+     * Refresh partitions and re-initialize the routing table.
+     *
+     * @since 6.0
+     */
+    public void refreshPartitions() {
+        get(refreshPartitionsAsync().toCompletableFuture(), e -> new RedisException("Cannot reload Redis Cluster topology", e));
+    }
+
+    /**
+     * Asynchronously reload partitions and re-initialize the distribution table.
+     *
+     * @return a {@link CompletionStage} that signals completion.
+     * @since 6.0
+     */
+    public CompletionStage<Void> refreshPartitionsAsync() {
 
         if (partitions == null) {
-            initializePartitions();
-            partitions.updateCache();
-        } else {
+            return initializePartitions().thenAccept(Partitions::updateCache);
+        }
+
+        return loadPartitionsAsync().thenAccept(loadedPartitions -> {
 
-            Partitions loadedPartitions = loadPartitions();
             if (TopologyComparators.isChanged(getPartitions(), loadedPartitions)) {
 
                 logger.debug("Using a new cluster topology");
@@ -782,9 +789,8 @@ public void reloadPartitions() {
             }
 
             this.partitions.reload(loadedPartitions.getPartitions());
-        }
-
-        updatePartitionsInConnections();
+            updatePartitionsInConnections();
+        });
     }
 
     protected void updatePartitionsInConnections() {
@@ -798,8 +804,15 @@ protected void updatePartitionsInConnections() {
         });
     }
 
-    protected void initializePartitions() {
-        this.partitions = loadPartitions();
+    protected CompletableFuture<Partitions> initializePartitions() {
+        return loadPartitionsAsync().thenApply(it -> this.partitions = it);
+    }
+
+    private void assertInitialPartitions() {
+        if (partitions == null) {
+            get(initializePartitions(),
+                    e -> new RedisConnectionException("Unable to establish a connection to Redis Cluster", e));
+        }
     }
 
     /**
@@ -809,7 +822,7 @@ protected void initializePartitions() {
      */
     public Partitions getPartitions() {
         if (partitions == null) {
-            initializePartitions();
+            get(initializePartitions(), e -> new RedisException("Cannot obtain initial Redis Cluster topology", e));
         }
         return partitions;
     }
@@ -820,61 +833,120 @@ public Partitions getPartitions() {
      * @return Partitions
      */
     protected Partitions loadPartitions() {
+        return get(loadPartitionsAsync(), Function.identity());
+    }
+
+    private static <T> T get(CompletableFuture<T> future, Function<RedisException, RedisException> mapper) {
+        try {
+            return future.get();
+        } catch (ExecutionException e) {
+
+            if (e.getCause() instanceof RedisException) {
+                throw mapper.apply((RedisException) e.getCause());
+            }
+
+            throw new RedisException(e.getCause());
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RedisCommandInterruptedException(e);
+        }
+    }
+
+    /**
+     * Retrieve partitions. Nodes within {@link Partitions} are ordered by latency. Lower latency nodes come first.
+     *
+     * @return future that emits {@link Partitions} upon a successful topology lookup.
+     * @since 6.0
+     */
+    protected CompletableFuture<Partitions> loadPartitionsAsync() {
 
         Iterable<RedisURI> topologyRefreshSource = getTopologyRefreshSource();
+        CompletableFuture<Partitions> future = new CompletableFuture<>();
 
-        try {
-            return doLoadPartitions(topologyRefreshSource);
-        } catch (RedisException e) {
+        fetchPartitions(topologyRefreshSource).whenComplete((nodes, throwable) -> {
+
+            if (throwable == null) {
+                future.complete(nodes);
+                return;
+            }
 
             // Attempt recovery using initial seed nodes
             if (useDynamicRefreshSources() && topologyRefreshSource != initialUris) {
 
-                try {
-                    return doLoadPartitions(initialUris);
-                } catch (RedisConnectionException e2) {
+                fetchPartitions(initialUris).whenComplete((nextNodes, nextThrowable) -> {
 
-                    RedisException exception = new RedisException(getTopologyRefreshErrorMessage(initialUris), e2);
-                    exception.addSuppressed(e);
+                    if (nextThrowable != null) {
+                        Throwable exception = unwrap(nextThrowable);
+                        exception.addSuppressed(unwrap(throwable));
 
-                    throw exception;
-                }
+                        future.completeExceptionally(exception);
+                    } else {
+                        future.complete(nextNodes);
+                    }
+                });
+            } else {
+                future.completeExceptionally(unwrap(throwable));
             }
+        });
 
-            if (e.getClass().equals(RedisException.class)) {
-                throw e;
-            }
+        return future;
+    }
+
+    private static Throwable unwrap(Throwable throwable) {
+
+        Throwable ex = throwable;
 
-            throw new RedisException(getTopologyRefreshErrorMessage(topologyRefreshSource), e);
+        while (ex instanceof CompletionException || ex instanceof ExecutionException) {
+            ex = ex.getCause();
         }
+
+        return ex;
     }
 
-    private Partitions doLoadPartitions(Iterable<RedisURI> topologyRefreshSource) {
+    private CompletionStage<Partitions> fetchPartitions(Iterable<RedisURI> topologyRefreshSource) {
 
-        Map<RedisURI, Partitions> partitions = refresh.loadViews(topologyRefreshSource,
+        CompletionStage<Map<RedisURI, Partitions>> topology = refresh.loadViews(topologyRefreshSource,
                 getClusterClientOptions().getSocketOptions().getConnectTimeout(), useDynamicRefreshSources());
 
-        if (partitions.isEmpty()) {
-            throw new RedisException(getTopologyRefreshErrorMessage(topologyRefreshSource));
-        }
+        return topology.thenApply(partitions -> {
+
+            if (partitions.isEmpty()) {
+                throw new RedisException(String.format("Cannot retrieve initial cluster partitions from initial URIs %s",
+                        topologyRefreshSource));
+            }
 
-        Partitions loadedPartitions = determinePartitions(this.partitions, partitions);
-        RedisURI viewedBy = refresh.getViewedBy(partitions, loadedPartitions);
+            Partitions loadedPartitions = determinePartitions(this.partitions, partitions);
+            RedisURI viewedBy = getViewedBy(partitions, loadedPartitions);
 
-        for (RedisClusterNode partition : loadedPartitions) {
-            if (viewedBy != null) {
-                RedisURI uri = partition.getUri();
-                RedisClusterURIUtil.applyUriConnectionSettings(viewedBy, uri);
+            for (RedisClusterNode partition : loadedPartitions) {
+                if (viewedBy != null) {
+                    RedisURI uri = partition.getUri();
+                    RedisClusterURIUtil.applyUriConnectionSettings(viewedBy, uri);
+                }
             }
-        }
 
-        activateTopologyRefreshIfNeeded();
+            topologyRefreshScheduler.activateTopologyRefreshIfNeeded();
 
-        return loadedPartitions;
+            return loadedPartitions;
+        });
     }
 
-    private static String getTopologyRefreshErrorMessage(Iterable<RedisURI> topologyRefreshSource) {
-        return "Cannot retrieve initial cluster partitions from initial URIs " + topologyRefreshSource;
+    /**
+     * Resolve a {@link RedisURI} from a map of cluster views by {@link Partitions} as key
+     *
+     * @param map the map
+     * @param partitions the key
+     * @return a {@link RedisURI} or null
+     */
+    private static RedisURI getViewedBy(Map<RedisURI, Partitions> map, Partitions partitions) {
+
+        for (Map.Entry<RedisURI, Partitions> entry : map.entrySet()) {
+            if (entry.getValue() == partitions) {
+                return entry.getKey();
+            }
+        }
+
+        return null;
     }
 
     /**
@@ -893,24 +965,6 @@ protected Partitions determinePartitions(Partitions current, Map<RedisURI, Parti
         return PartitionsConsensus.KNOWN_MAJORITY.getPartitions(current, topologyViews);
     }
 
-    private void activateTopologyRefreshIfNeeded() {
-
-        if (getOptions() instanceof ClusterClientOptions) {
-            ClusterClientOptions options = (ClusterClientOptions) getOptions();
-            ClusterTopologyRefreshOptions topologyRefreshOptions = options.getTopologyRefreshOptions();
-
-            if (!topologyRefreshOptions.isPeriodicRefreshEnabled() || clusterTopologyRefreshActivated.get()) {
-                return;
-            }
-
-            if (clusterTopologyRefreshActivated.compareAndSet(false, true)) {
-                ScheduledFuture<?> scheduledFuture = genericWorkerPool.scheduleAtFixedRate(clusterTopologyRefreshScheduler,
-                        options.getRefreshPeriod().toNanos(), options.getRefreshPeriod().toNanos(), TimeUnit.NANOSECONDS);
-                clusterTopologyRefreshFuture.set(scheduledFuture);
-            }
-        }
-    }
-
     /**
      * Sets the new cluster topology. The partitions are not applied to existing connections.
      *
@@ -942,17 +996,7 @@ public ClientResources getResources() {
     @Override
     public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, TimeUnit timeUnit) {
 
-        if (clusterTopologyRefreshActivated.compareAndSet(true, false)) {
-
-            ScheduledFuture<?> scheduledFuture = clusterTopologyRefreshFuture.get();
-
-            try {
-                scheduledFuture.cancel(false);
-                clusterTopologyRefreshFuture.set(null);
-            } catch (Exception e) {
-                logger.debug("Could not cancel Cluster topology refresh", e);
-            }
-        }
+        topologyRefreshScheduler.shutdown();
 
         return super.shutdownAsync(quietPeriod, timeout, timeUnit);
     }
@@ -1087,12 +1131,9 @@ protected Iterable<RedisURI> getTopologyRefreshSource() {
      */
     protected boolean useDynamicRefreshSources() {
 
-        if (getClusterClientOptions() != null) {
-            ClusterTopologyRefreshOptions topologyRefreshOptions = getClusterClientOptions().getTopologyRefreshOptions();
+        ClusterTopologyRefreshOptions topologyRefreshOptions = getClusterClientOptions().getTopologyRefreshOptions();
 
-            return topologyRefreshOptions.useDynamicRefreshSources();
-        }
-        return true;
+        return topologyRefreshOptions.useDynamicRefreshSources();
     }
 
     /**
@@ -1106,10 +1147,7 @@ protected RedisCodec<String, String> newStringStringCodec() {
     }
 
     ClusterClientOptions getClusterClientOptions() {
-        if (getOptions() instanceof ClusterClientOptions) {
-            return (ClusterClientOptions) getOptions();
-        }
-        return null;
+        return (ClusterClientOptions) getOptions();
     }
 
     boolean expireStaleConnections() {
diff --git a/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java b/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
deleted file mode 100644
index 3ed06dafcb..0000000000
--- a/src/main/java/io/lettuce/core/cluster/topology/AsyncConnections.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2016-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.cluster.topology;
-
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import io.lettuce.core.RedisConnectionException;
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.StatefulRedisConnection;
-
-/**
- * @author Mark Paluch
- */
-class AsyncConnections {
-
-    private final Map<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> futures = new TreeMap<>(
-            TopologyComparators.RedisURIComparator.INSTANCE);
-
-    public AsyncConnections() {
-    }
-
-    /**
-     * Add a connection for a {@link RedisURI}
-     *
-     * @param redisURI
-     * @param connection
-     */
-    public void addConnection(RedisURI redisURI, CompletableFuture<StatefulRedisConnection<String, String>> connection) {
-        futures.put(redisURI, connection);
-    }
-
-    /**
-     * @return a set of {@link RedisURI} for which {@link Connections} has a connection.
-     */
-    public Set<RedisURI> connectedNodes() {
-        return futures.keySet();
-    }
-
-    /**
-     * @return the {@link Connections}.
-     * @throws RedisConnectionException if no connection could be established.
-     */
-    public Connections get(long timeout, TimeUnit timeUnit) throws InterruptedException {
-
-        Connections connections = new Connections();
-        List<Throwable> exceptions = new CopyOnWriteArrayList<>();
-        List<Future<?>> sync = new ArrayList<>(this.futures.size());
-
-        for (Map.Entry<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> entry : this.futures.entrySet()) {
-
-            CompletableFuture<StatefulRedisConnection<String, String>> future = entry.getValue();
-
-            sync.add(future.whenComplete((connection, throwable) -> {
-
-                if (throwable != null) {
-                    exceptions.add(throwable);
-                } else {
-                    connections.addConnection(entry.getKey(), connection);
-                }
-            }));
-        }
-
-        RefreshFutures.awaitAll(timeout, timeUnit, sync);
-
-        if (connections.isEmpty() && !sync.isEmpty() && !exceptions.isEmpty()) {
-
-            RedisConnectionException collector = null;
-
-            for (Throwable exception : exceptions) {
-                if (collector == null) {
-                    collector = new RedisConnectionException("Unable to establish a connection to Redis Cluster at "
-                            + this.futures.keySet(), exception);
-                } else {
-                    collector.addSuppressed(exception);
-                }
-            }
-
-            throw collector;
-        }
-
-        return connections;
-    }
-
-    /**
-     * @return the {@link Connections}.
-     */
-    public Connections optionalGet(long timeout, TimeUnit timeUnit) throws InterruptedException {
-
-        Connections connections = new Connections();
-        List<Future<?>> sync = new ArrayList<>(this.futures.size());
-
-        for (Map.Entry<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> entry : this.futures.entrySet()) {
-
-            CompletableFuture<StatefulRedisConnection<String, String>> future = entry.getValue();
-
-            sync.add(future.thenAccept((connection) -> {
-                connections.addConnection(entry.getKey(), connection);
-            }));
-        }
-
-        RefreshFutures.awaitAll(timeout, timeUnit, sync);
-
-        return connections;
-    }
-}
diff --git a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
index f7bf222b85..4ce29b290a 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/ClusterTopologyRefresh.java
@@ -15,47 +15,35 @@
  */
 package io.lettuce.core.cluster.topology;
 
-import java.io.IOException;
-import java.net.SocketAddress;
 import java.time.Duration;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
+import java.util.Map;
+import java.util.concurrent.CompletionStage;
 
-import io.lettuce.core.*;
-import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
-import io.lettuce.core.cluster.topology.TopologyComparators.SortAction;
-import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.resource.ClientResources;
-import io.netty.util.concurrent.EventExecutorGroup;
-import io.netty.util.internal.logging.InternalLogger;
-import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
  * Utility to refresh the cluster topology view based on {@link Partitions}.
  *
  * @author Mark Paluch
  */
-public class ClusterTopologyRefresh {
+public interface ClusterTopologyRefresh {
 
-    private static final InternalLogger logger = InternalLoggerFactory.getInstance(ClusterTopologyRefresh.class);
-
-    private final NodeConnectionFactory nodeConnectionFactory;
-    private final ClientResources clientResources;
-
-    public ClusterTopologyRefresh(NodeConnectionFactory nodeConnectionFactory, ClientResources clientResources) {
-        this.nodeConnectionFactory = nodeConnectionFactory;
-        this.clientResources = clientResources;
+    /**
+     * Create a new {@link ClusterTopologyRefresh} instance.
+     *
+     * @param nodeConnectionFactory
+     * @param clientResources
+     * @return
+     */
+    static ClusterTopologyRefresh create(NodeConnectionFactory nodeConnectionFactory, ClientResources clientResources) {
+        return new DefaultClusterTopologyRefresh(nodeConnectionFactory, clientResources);
     }
 
     /**
-     * Load partition views from a collection of {@link RedisURI}s and return the view per {@link RedisURI}. Partitions contain
+     * Load topology views from a collection of {@link RedisURI}s and return the view per {@link RedisURI}. Partitions contain
      * an ordered list of {@link RedisClusterNode}s. The sort key is latency. Nodes with lower latency come first.
      *
      * @param seed collection of {@link RedisURI}s
@@ -63,296 +51,5 @@ public ClusterTopologyRefresh(NodeConnectionFactory nodeConnectionFactory, Clien
      * @param discovery {@literal true} to discover additional nodes
      * @return mapping between {@link RedisURI} and {@link Partitions}
      */
-    public Map<RedisURI, Partitions> loadViews(Iterable<RedisURI> seed, Duration connectTimeout, boolean discovery) {
-
-        if (!isEventLoopActive()) {
-            return Collections.emptyMap();
-        }
-
-        long commandTimeoutNs = getCommandTimeoutNs(seed);
-
-        Connections connections = null;
-        try {
-            connections = getConnections(seed).get(commandTimeoutNs + connectTimeout.toNanos(), TimeUnit.NANOSECONDS);
-
-            if (!isEventLoopActive()) {
-                return Collections.emptyMap();
-            }
-
-            Requests requestedTopology = connections.requestTopology();
-            Requests requestedClients = connections.requestClients();
-
-            NodeTopologyViews nodeSpecificViews = getNodeSpecificViews(requestedTopology, requestedClients, commandTimeoutNs);
-
-            if (discovery && isEventLoopActive()) {
-
-                Set<RedisURI> allKnownUris = nodeSpecificViews.getClusterNodes();
-                Set<RedisURI> discoveredNodes = difference(allKnownUris, toSet(seed));
-
-                if (!discoveredNodes.isEmpty()) {
-                    Connections discoveredConnections = getConnections(discoveredNodes).optionalGet(commandTimeoutNs,
-                            TimeUnit.NANOSECONDS);
-                    connections = connections.mergeWith(discoveredConnections);
-
-                    if (isEventLoopActive()) {
-                        requestedTopology = requestedTopology.mergeWith(discoveredConnections.requestTopology());
-                        requestedClients = requestedClients.mergeWith(discoveredConnections.requestClients());
-
-                        nodeSpecificViews = getNodeSpecificViews(requestedTopology, requestedClients, commandTimeoutNs);
-                    }
-
-                    if (nodeSpecificViews.isEmpty()) {
-                        tryFail(requestedTopology, seed);
-                    }
-
-                    return nodeSpecificViews.toMap();
-                }
-            }
-
-            if (nodeSpecificViews.isEmpty()) {
-                tryFail(requestedTopology, seed);
-            }
-
-            return nodeSpecificViews.toMap();
-        } catch (InterruptedException e) {
-
-            Thread.currentThread().interrupt();
-            throw new RedisCommandInterruptedException(e);
-        } finally {
-            if (connections != null) {
-                try {
-                    connections.close();
-                } catch (Exception e) {
-                    logger.debug("Cannot close ClusterTopologyRefresh connections", e);
-                }
-            }
-        }
-    }
-
-    private void tryFail(Requests requestedTopology, Iterable<RedisURI> seed) {
-
-        RedisException exception = null;
-
-        for (RedisURI node : requestedTopology.nodes()) {
-
-            TimedAsyncCommand<String, String, String> request = requestedTopology.getRequest(node);
-            if (request != null && request.isCompletedExceptionally()) {
-
-                Throwable cause = RefreshFutures.getException(request);
-                if (exception == null) {
-                    exception = new RedisException("Cannot retrieve initial cluster partitions from initial URIs " + seed,
-                            cause);
-                } else if (cause != null) {
-                    exception.addSuppressed(cause);
-                }
-            }
-        }
-
-        if (exception != null) {
-            throw exception;
-        }
-    }
-
-    private Set<RedisURI> toSet(Iterable<RedisURI> seed) {
-        return StreamSupport.stream(seed.spliterator(), false).collect(Collectors.toCollection(HashSet::new));
-    }
-
-    NodeTopologyViews getNodeSpecificViews(Requests requestedTopology, Requests requestedClients, long commandTimeoutNs)
-            throws InterruptedException {
-
-        List<RedisClusterNodeSnapshot> allNodes = new ArrayList<>();
-
-        Map<String, Long> latencies = new HashMap<>();
-        Map<String, Integer> clientCountByNodeId = new HashMap<>();
-
-        long waitTime = requestedTopology.await(commandTimeoutNs, TimeUnit.NANOSECONDS);
-        requestedClients.await(commandTimeoutNs - waitTime, TimeUnit.NANOSECONDS);
-
-        Set<RedisURI> nodes = requestedTopology.nodes();
-
-        List<NodeTopologyView> views = new ArrayList<>();
-        for (RedisURI nodeUri : nodes) {
-
-            try {
-                NodeTopologyView nodeTopologyView = NodeTopologyView.from(nodeUri, requestedTopology, requestedClients);
-
-                if (!nodeTopologyView.isAvailable()) {
-                    continue;
-                }
-
-                RedisClusterNode node = nodeTopologyView.getOwnPartition();
-                if (node.getUri() == null) {
-                    node.setUri(nodeUri);
-                } else {
-                    node.addAlias(nodeUri);
-                }
-
-                List<RedisClusterNodeSnapshot> nodeWithStats = new ArrayList<>(nodeTopologyView.getPartitions().size());
-
-                for (RedisClusterNode partition : nodeTopologyView.getPartitions()) {
-
-                    if (validNode(partition)) {
-                        RedisClusterNodeSnapshot redisClusterNodeSnapshot = new RedisClusterNodeSnapshot(partition);
-                        nodeWithStats.add(redisClusterNodeSnapshot);
-
-                        if (partition.is(RedisClusterNode.NodeFlag.MYSELF)) {
-
-                            // record latency for later partition ordering
-                            latencies.put(partition.getNodeId(), nodeTopologyView.getLatency());
-                            clientCountByNodeId.put(partition.getNodeId(), nodeTopologyView.getConnectedClients());
-                        }
-                    }
-                }
-
-                allNodes.addAll(nodeWithStats);
-
-                Partitions partitions = new Partitions();
-                partitions.addAll(nodeWithStats);
-
-                nodeTopologyView.setPartitions(partitions);
-
-                views.add(nodeTopologyView);
-            } catch (ExecutionException e) {
-                logger.warn(String.format("Cannot retrieve partition view from %s, error: %s", nodeUri, e));
-            }
-        }
-
-        for (RedisClusterNodeSnapshot node : allNodes) {
-            node.setConnectedClients(clientCountByNodeId.get(node.getNodeId()));
-            node.setLatencyNs(latencies.get(node.getNodeId()));
-        }
-
-        SortAction sortAction = SortAction.getSortAction();
-        for (NodeTopologyView view : views) {
-
-            sortAction.sort(view.getPartitions());
-            view.getPartitions().updateCache();
-        }
-
-        return new NodeTopologyViews(views);
-    }
-
-    private static boolean validNode(RedisClusterNode redisClusterNode) {
-
-        if (redisClusterNode.is(RedisClusterNode.NodeFlag.NOADDR)) {
-            return false;
-        }
-
-        if (redisClusterNode.getUri() == null || redisClusterNode.getUri().getPort() == 0
-                || LettuceStrings.isEmpty(redisClusterNode.getUri().getHost())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /*
-     * Open connections where an address can be resolved.
-     */
-    private AsyncConnections getConnections(Iterable<RedisURI> redisURIs) {
-
-        AsyncConnections connections = new AsyncConnections();
-
-        for (RedisURI redisURI : redisURIs) {
-            if (redisURI.getHost() == null || connections.connectedNodes().contains(redisURI) || !isEventLoopActive()) {
-                continue;
-            }
-
-            try {
-                SocketAddress socketAddress = clientResources.socketAddressResolver().resolve(redisURI);
-
-                ConnectionFuture<StatefulRedisConnection<String, String>> connectionFuture = nodeConnectionFactory
-                        .connectToNodeAsync(StringCodec.UTF8, socketAddress);
-
-                CompletableFuture<StatefulRedisConnection<String, String>> sync = new CompletableFuture<>();
-
-                connectionFuture.whenComplete((connection, throwable) -> {
-
-                    if (throwable != null) {
-
-                        Throwable throwableToUse = throwable;
-                        if (throwable instanceof CompletionException) {
-                            throwableToUse = throwableToUse.getCause();
-                        }
-
-                        String message = String.format("Unable to connect to [%s]: %s", socketAddress,
-                                throwableToUse.getMessage() != null ? throwableToUse.getMessage() : throwableToUse.toString());
-                        if (throwableToUse instanceof RedisConnectionException || throwableToUse instanceof IOException) {
-                            if (logger.isDebugEnabled()) {
-                                logger.debug(message, throwableToUse);
-                            } else {
-                                logger.warn(message);
-                            }
-                        } else {
-                            logger.warn(message, throwableToUse);
-                        }
-
-                        sync.completeExceptionally(new RedisConnectionException(message, throwableToUse));
-                    } else {
-                        connection.async().clientSetname("lettuce#ClusterTopologyRefresh");
-                        sync.complete(connection);
-                    }
-                });
-
-                connections.addConnection(redisURI, sync);
-            } catch (RuntimeException e) {
-                logger.warn(String.format("Unable to connect to [%s]", redisURI), e);
-            }
-        }
-
-        return connections;
-    }
-
-    private boolean isEventLoopActive() {
-
-        EventExecutorGroup eventExecutors = clientResources.eventExecutorGroup();
-
-        return !eventExecutors.isShuttingDown();
-    }
-
-    /**
-     * Resolve a {@link RedisURI} from a map of cluster views by {@link Partitions} as key
-     *
-     * @param map the map
-     * @param partitions the key
-     * @return a {@link RedisURI} or null
-     */
-    public RedisURI getViewedBy(Map<RedisURI, Partitions> map, Partitions partitions) {
-
-        for (Map.Entry<RedisURI, Partitions> entry : map.entrySet()) {
-            if (entry.getValue() == partitions) {
-                return entry.getKey();
-            }
-        }
-
-        return null;
-    }
-
-    private static <E> Set<E> difference(Set<E> set1, Set<E> set2) {
-
-        Set<E> result = new HashSet<>(set1.size());
-
-        for (E e1 : set1) {
-            if (!set2.contains(e1)) {
-                result.add(e1);
-            }
-        }
-
-        List<E> list = new ArrayList<>(set2.size());
-        for (E e : set2) {
-            if (!set1.contains(e)) {
-                list.add(e);
-            }
-        }
-
-        result.addAll(list);
-
-        return result;
-    }
-
-    private long getCommandTimeoutNs(Iterable<RedisURI> redisURIs) {
-
-        RedisURI redisURI = redisURIs.iterator().next();
-        return redisURI.getTimeout().toNanos();
-    }
+    CompletionStage<Map<RedisURI, Partitions>> loadViews(Iterable<RedisURI> seed, Duration connectTimeout, boolean discovery);
 }
diff --git a/src/main/java/io/lettuce/core/cluster/topology/Connections.java b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
index 507cf4cd93..5d6a348314 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Connections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
@@ -15,18 +15,21 @@
  */
 package io.lettuce.core.cluster.topology;
 
+import java.time.Duration;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 
+import io.lettuce.core.ExceptionFactory;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.internal.Futures;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.Command;
 import io.lettuce.core.protocol.CommandArgs;
 import io.lettuce.core.protocol.CommandKeyword;
 import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.resource.ClientResources;
 
 /**
  * @author Mark Paluch
@@ -35,14 +38,12 @@
  */
 class Connections {
 
+    private final ClientResources clientResources;
     private final Map<RedisURI, StatefulRedisConnection<String, String>> connections;
     private volatile boolean closed = false;
 
-    public Connections() {
-        connections = new TreeMap<>(TopologyComparators.RedisURIComparator.INSTANCE);
-    }
-
-    private Connections(Map<RedisURI, StatefulRedisConnection<String, String>> connections) {
+    public Connections(ClientResources clientResources, Map<RedisURI, StatefulRedisConnection<String, String>> connections) {
+        this.clientResources = clientResources;
         this.connections = connections;
     }
 
@@ -84,41 +85,51 @@ public boolean isEmpty() {
      *
      * @return the {@link Requests}.
      */
-    public Requests requestTopology() {
+    public Requests requestTopology(long timeout, TimeUnit timeUnit) {
 
-        Requests requests = new Requests();
+        return doRequest(() -> {
 
-        synchronized (this.connections) {
-            for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : this.connections.entrySet()) {
+            CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.NODES);
+            Command<String, String, String> command = new Command<>(CommandType.CLUSTER, new StatusOutput<>(StringCodec.UTF8),
+                    args);
+            return new TimedAsyncCommand<>(command);
+        }, timeout, timeUnit);
+    }
 
-                CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.NODES);
-                Command<String, String, String> command = new Command<>(CommandType.CLUSTER,
-                        new StatusOutput<>(StringCodec.UTF8), args);
-                TimedAsyncCommand<String, String, String> timedCommand = new TimedAsyncCommand<>(command);
+    /*
+     * Initiate {@code INFO CLIENTS} on all connections and return the {@link Requests}.
+     *
+     * @return the {@link Requests}.
+     */
+    public Requests requestClients(long timeout, TimeUnit timeUnit) {
 
-                entry.getValue().dispatch(timedCommand);
-                requests.addRequest(entry.getKey(), timedCommand);
-            }
-        }
+        return doRequest(() -> {
 
-        return requests;
+            Command<String, String, String> command = new Command<>(CommandType.INFO, new StatusOutput<>(StringCodec.UTF8),
+                    new CommandArgs<>(StringCodec.UTF8).add("CLIENTS"));
+            return new TimedAsyncCommand<>(command);
+        }, timeout, timeUnit);
     }
 
     /*
-     * Initiate {@code INFO CLIENTS} on all connections and return the {@link Requests}.
+     * Initiate {@code CLUSTER NODES} on all connections and return the {@link Requests}.
      *
      * @return the {@link Requests}.
      */
-    public Requests requestClients() {
+    private Requests doRequest(Supplier<TimedAsyncCommand<String, String, String>> commandFactory, long timeout,
+            TimeUnit timeUnit) {
 
         Requests requests = new Requests();
+        Duration timeoutDuration = Duration.ofNanos(timeUnit.toNanos(timeout));
 
         synchronized (this.connections) {
             for (Map.Entry<RedisURI, StatefulRedisConnection<String, String>> entry : this.connections.entrySet()) {
 
-                Command<String, String, String> command = new Command<>(CommandType.INFO, new StatusOutput<>(StringCodec.UTF8),
-                        new CommandArgs<>(StringCodec.UTF8).add("CLIENTS"));
-                TimedAsyncCommand<String, String, String> timedCommand = new TimedAsyncCommand<>(command);
+                TimedAsyncCommand<String, String, String> timedCommand = commandFactory.get();
+
+                clientResources.timer().newTimeout(it -> {
+                    timedCommand.completeExceptionally(ExceptionFactory.createTimeoutException(timeoutDuration));
+                }, timeout, timeUnit);
 
                 entry.getValue().dispatch(timedCommand);
                 requests.addRequest(entry.getKey(), timedCommand);
@@ -128,68 +139,16 @@ public Requests requestClients() {
         return requests;
     }
 
-    /**
-     * Close all connections.
-     */
-    public void close() {
-
-        this.closed = true;
+    public Connections retainAll(Set<RedisURI> connectionsToRetain) {
 
-        List<CompletableFuture<?>> closeFutures = new ArrayList<>();
-        while (hasConnections()) {
-            for (StatefulRedisConnection<String, String> connection : drainConnections()) {
-                closeFutures.add(connection.closeAsync());
-            }
-        }
-
-        Futures.allOf(closeFutures).join();
-    }
-
-    private boolean hasConnections() {
-
-        synchronized (this.connections) {
-            return !this.connections.isEmpty();
-        }
-    }
-
-    private Collection<StatefulRedisConnection<String, String>> drainConnections() {
-
-        Map<RedisURI, StatefulRedisConnection<String, String>> drainedConnections;
-
-        synchronized (this.connections) {
-
-            drainedConnections = new HashMap<>(this.connections);
-            drainedConnections.forEach((k, v) -> {
-                this.connections.remove(k);
-            });
-        }
-
-        return drainedConnections.values();
-    }
-
-    /**
-     * Merges this and {@code discoveredConnections} into a new {@link Connections} instance. This instance is marked as closed
-     * to prevent lingering connections.
-     *
-     * @param discoveredConnections
-     * @return
-     */
-    public Connections mergeWith(Connections discoveredConnections) {
-
-        Map<RedisURI, StatefulRedisConnection<String, String>> result = new TreeMap<>(
-                TopologyComparators.RedisURIComparator.INSTANCE);
-
-        this.closed = true;
-        discoveredConnections.closed = true;
-
-        synchronized (this.connections) {
-            synchronized (discoveredConnections.connections) {
+        Set<RedisURI> keys = new LinkedHashSet<>(connections.keySet());
 
-                result.putAll(this.connections);
-                result.putAll(discoveredConnections.connections);
+        for (RedisURI key : keys) {
+            if (!connectionsToRetain.contains(key)) {
+                this.connections.remove(key);
             }
         }
 
-        return new Connections(result);
+        return this;
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/topology/DefaultClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/DefaultClusterTopologyRefresh.java
new file mode 100644
index 0000000000..5f36ba0b85
--- /dev/null
+++ b/src/main/java/io/lettuce/core/cluster/topology/DefaultClusterTopologyRefresh.java
@@ -0,0 +1,506 @@
+/*
+ * Copyright 2011-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.cluster.topology;
+
+import java.io.IOException;
+import java.net.SocketAddress;
+import java.time.Duration;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+import io.lettuce.core.*;
+import io.lettuce.core.api.StatefulConnection;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.cluster.models.partitions.Partitions;
+import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
+import io.lettuce.core.cluster.topology.TopologyComparators.SortAction;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.Futures;
+import io.lettuce.core.resource.ClientResources;
+import io.netty.util.Timeout;
+import io.netty.util.concurrent.EventExecutorGroup;
+import io.netty.util.internal.SystemPropertyUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+/**
+ * Utility to refresh the cluster topology view based on {@link Partitions}.
+ *
+ * @author Mark Paluch
+ */
+class DefaultClusterTopologyRefresh implements ClusterTopologyRefresh {
+
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(DefaultClusterTopologyRefresh.class);
+
+    private final NodeConnectionFactory nodeConnectionFactory;
+    private final ClientResources clientResources;
+
+    public DefaultClusterTopologyRefresh(NodeConnectionFactory nodeConnectionFactory, ClientResources clientResources) {
+        this.nodeConnectionFactory = nodeConnectionFactory;
+        this.clientResources = clientResources;
+    }
+
+    /**
+     * Load partition views from a collection of {@link RedisURI}s and return the view per {@link RedisURI}. Partitions contain
+     * an ordered list of {@link RedisClusterNode}s. The sort key is latency. Nodes with lower latency come first.
+     *
+     * @param seed collection of {@link RedisURI}s
+     * @param connectTimeout connect timeout
+     * @param discovery {@literal true} to discover additional nodes
+     * @return mapping between {@link RedisURI} and {@link Partitions}
+     */
+    public CompletionStage<Map<RedisURI, Partitions>> loadViews(Iterable<RedisURI> seed, Duration connectTimeout,
+            boolean discovery) {
+
+        if (!isEventLoopActive()) {
+            return CompletableFuture.completedFuture(Collections.emptyMap());
+        }
+
+        long commandTimeoutNs = getCommandTimeoutNs(seed);
+        ConnectionTracker tracker = new ConnectionTracker();
+        long connectionTimeout = commandTimeoutNs + connectTimeout.toNanos();
+        openConnections(tracker, seed, connectionTimeout, TimeUnit.NANOSECONDS);
+
+        CompletableFuture<NodeTopologyViews> composition = tracker.whenComplete(map -> {
+            return new Connections(clientResources, map);
+        }).thenCompose(connections -> {
+
+            Requests requestedTopology = connections.requestTopology(commandTimeoutNs, TimeUnit.NANOSECONDS);
+            Requests requestedClients = connections.requestClients(commandTimeoutNs, TimeUnit.NANOSECONDS);
+            return CompletableFuture.allOf(requestedTopology.allCompleted(), requestedClients.allCompleted())
+                    .thenCompose(ignore -> {
+
+                        NodeTopologyViews views = getNodeSpecificViews(requestedTopology, requestedClients);
+
+                        if (discovery && isEventLoopActive()) {
+
+                            Set<RedisURI> allKnownUris = views.getClusterNodes();
+                            Set<RedisURI> discoveredNodes = difference(allKnownUris, toSet(seed));
+
+                            if (discoveredNodes.isEmpty()) {
+                                return CompletableFuture.completedFuture(views);
+                            }
+
+                            openConnections(tracker, discoveredNodes, connectionTimeout, TimeUnit.NANOSECONDS);
+
+                            return tracker.whenComplete(map -> {
+                                return new Connections(clientResources, map).retainAll(discoveredNodes);
+                            }).thenCompose(newConnections -> {
+
+                                Requests additionalTopology = newConnections
+                                        .requestTopology(commandTimeoutNs, TimeUnit.NANOSECONDS).mergeWith(requestedTopology);
+                                Requests additionalClients = newConnections
+                                        .requestClients(commandTimeoutNs, TimeUnit.NANOSECONDS).mergeWith(requestedClients);
+                                return CompletableFuture
+                                        .allOf(additionalTopology.allCompleted(), additionalClients.allCompleted())
+                                        .thenApply(ignore2 -> {
+
+                                            return getNodeSpecificViews(additionalTopology, additionalClients);
+                                        });
+                            });
+                        }
+
+                        return CompletableFuture.completedFuture(views);
+                    }).whenComplete((ignore, throwable) -> {
+
+                        if (throwable != null) {
+                            try {
+                                tracker.close();
+                            } catch (Exception e) {
+                                logger.debug("Cannot close ClusterTopologyRefresh connections", e);
+                            }
+                        }
+                    }).thenCompose((it) -> tracker.close().thenApply(ignore -> it)).thenCompose(it -> {
+
+                        if (it.isEmpty()) {
+                            Exception exception = tryFail(requestedTopology, tracker, seed);
+                            return Futures.failed(exception);
+                        }
+
+                        return CompletableFuture.completedFuture(it);
+                    });
+        });
+
+        return composition.thenApply(NodeTopologyViews::toMap);
+    }
+
+    private Exception tryFail(Requests requestedTopology, ConnectionTracker tracker, Iterable<RedisURI> seed) {
+
+        Map<RedisURI, String> failures = new LinkedHashMap<>();
+        CannotRetrieveClusterPartitions exception = new CannotRetrieveClusterPartitions(seed, failures);
+
+        for (RedisURI node : requestedTopology.nodes()) {
+
+            TimedAsyncCommand<String, String, String> request = requestedTopology.getRequest(node);
+            if (request == null || !request.isCompletedExceptionally()) {
+                continue;
+            }
+
+            Throwable cause = getException(request);
+            if (cause != null) {
+                failures.put(node, getExceptionDetail(cause));
+                exception.addSuppressed(cause);
+            }
+        }
+
+        for (Map.Entry<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> entry : tracker.connections
+                .entrySet()) {
+
+            CompletableFuture<StatefulRedisConnection<String, String>> future = entry.getValue();
+
+            if (!future.isDone() || !future.isCompletedExceptionally()) {
+                continue;
+            }
+
+            try {
+                future.join();
+            } catch (CompletionException e) {
+
+                Throwable cause = e.getCause();
+                if (cause != null) {
+                    failures.put(entry.getKey(), getExceptionDetail(cause));
+                    exception.addSuppressed(cause);
+                }
+            }
+        }
+
+        return exception;
+    }
+
+    private static String getExceptionDetail(Throwable exception) {
+
+        if (exception instanceof RedisConnectionException && exception.getCause() instanceof IOException) {
+            exception = exception.getCause();
+        }
+
+        return LettuceStrings.isNotEmpty(exception.getMessage()) ? exception.getMessage() : exception.toString();
+    }
+
+    private Set<RedisURI> toSet(Iterable<RedisURI> seed) {
+        return StreamSupport.stream(seed.spliterator(), false).collect(Collectors.toCollection(HashSet::new));
+    }
+
+    NodeTopologyViews getNodeSpecificViews(Requests requestedTopology, Requests requestedClients) {
+
+        List<RedisClusterNodeSnapshot> allNodes = new ArrayList<>();
+
+        Map<String, Long> latencies = new HashMap<>();
+        Map<String, Integer> clientCountByNodeId = new HashMap<>();
+
+        Set<RedisURI> nodes = requestedTopology.nodes();
+
+        List<NodeTopologyView> views = new ArrayList<>();
+        for (RedisURI nodeUri : nodes) {
+
+            try {
+                NodeTopologyView nodeTopologyView = NodeTopologyView.from(nodeUri, requestedTopology, requestedClients);
+
+                if (!nodeTopologyView.isAvailable()) {
+                    continue;
+                }
+
+                RedisClusterNode node = nodeTopologyView.getOwnPartition();
+                if (node.getUri() == null) {
+                    node.setUri(nodeUri);
+                } else {
+                    node.addAlias(nodeUri);
+                }
+
+                List<RedisClusterNodeSnapshot> nodeWithStats = new ArrayList<>(nodeTopologyView.getPartitions().size());
+
+                for (RedisClusterNode partition : nodeTopologyView.getPartitions()) {
+
+                    if (validNode(partition)) {
+                        RedisClusterNodeSnapshot redisClusterNodeSnapshot = new RedisClusterNodeSnapshot(partition);
+                        nodeWithStats.add(redisClusterNodeSnapshot);
+
+                        if (partition.is(RedisClusterNode.NodeFlag.MYSELF)) {
+
+                            // record latency for later partition ordering
+                            latencies.put(partition.getNodeId(), nodeTopologyView.getLatency());
+                            clientCountByNodeId.put(partition.getNodeId(), nodeTopologyView.getConnectedClients());
+                        }
+                    }
+                }
+
+                allNodes.addAll(nodeWithStats);
+
+                Partitions partitions = new Partitions();
+                partitions.addAll(nodeWithStats);
+
+                nodeTopologyView.setPartitions(partitions);
+
+                views.add(nodeTopologyView);
+            } catch (CompletionException e) {
+                logger.warn(String.format("Cannot retrieve partition view from %s, error: %s", nodeUri, e));
+            }
+        }
+
+        for (RedisClusterNodeSnapshot node : allNodes) {
+            node.setConnectedClients(clientCountByNodeId.get(node.getNodeId()));
+            node.setLatencyNs(latencies.get(node.getNodeId()));
+        }
+
+        SortAction sortAction = SortAction.getSortAction();
+        for (NodeTopologyView view : views) {
+
+            sortAction.sort(view.getPartitions());
+            view.getPartitions().updateCache();
+        }
+
+        return new NodeTopologyViews(views);
+    }
+
+    private static boolean validNode(RedisClusterNode redisClusterNode) {
+
+        if (redisClusterNode.is(RedisClusterNode.NodeFlag.NOADDR)) {
+            return false;
+        }
+
+        if (redisClusterNode.getUri() == null || redisClusterNode.getUri().getPort() == 0
+                || LettuceStrings.isEmpty(redisClusterNode.getUri().getHost())) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /*
+     * Open connections where an address can be resolved.
+     */
+    private void openConnections(ConnectionTracker tracker, Iterable<RedisURI> redisURIs, long timeout, TimeUnit timeUnit) {
+
+        for (RedisURI redisURI : redisURIs) {
+
+            if (redisURI.getHost() == null || tracker.contains(redisURI) || !isEventLoopActive()) {
+                continue;
+            }
+
+            try {
+                SocketAddress socketAddress = clientResources.socketAddressResolver().resolve(redisURI);
+
+                ConnectionFuture<StatefulRedisConnection<String, String>> connectionFuture = nodeConnectionFactory
+                        .connectToNodeAsync(StringCodec.UTF8, socketAddress);
+
+                // Note: timeout skew due to potential socket address resolution and connection work possible.
+
+                CompletableFuture<StatefulRedisConnection<String, String>> sync = new CompletableFuture<>();
+                Timeout cancelTimeout = clientResources.timer().newTimeout(it -> {
+
+                    String message = String.format("Unable to connect to [%s]: Timeout after %s", socketAddress,
+                            ExceptionFactory.formatTimeout(Duration.ofNanos(timeUnit.toNanos(timeout))));
+                    sync.completeExceptionally(new RedisConnectionException(message));
+                }, timeout, timeUnit);
+
+                connectionFuture.whenComplete((connection, throwable) -> {
+
+                    cancelTimeout.cancel();
+
+                    if (throwable != null) {
+
+                        Throwable throwableToUse = throwable;
+                        if (throwable instanceof CompletionException) {
+                            throwableToUse = throwableToUse.getCause();
+                        }
+
+                        String message = String.format("Unable to connect to [%s]: %s", socketAddress,
+                                throwableToUse.getMessage() != null ? throwableToUse.getMessage() : throwableToUse.toString());
+                        if (throwableToUse instanceof RedisConnectionException || throwableToUse instanceof IOException) {
+                            if (logger.isDebugEnabled()) {
+                                logger.debug(message, throwableToUse);
+                            } else {
+                                logger.warn(message);
+                            }
+                        } else {
+                            logger.warn(message, throwableToUse);
+                        }
+
+                        sync.completeExceptionally(new RedisConnectionException(message, throwableToUse));
+                    } else {
+                        connection.async().clientSetname("lettuce#ClusterTopologyRefresh");
+
+                        // avoid leaking resources
+                        if (!sync.complete(connection)) {
+                            connection.close();
+                        }
+                    }
+                });
+
+                tracker.addConnection(redisURI, sync);
+            } catch (RuntimeException e) {
+                logger.warn(String.format("Unable to connect to [%s]", redisURI), e);
+            }
+        }
+    }
+
+    private boolean isEventLoopActive() {
+
+        EventExecutorGroup eventExecutors = clientResources.eventExecutorGroup();
+
+        return !eventExecutors.isShuttingDown();
+    }
+
+    private static <E> Set<E> difference(Set<E> set1, Set<E> set2) {
+
+        Set<E> result = new HashSet<>(set1.size());
+
+        for (E e1 : set1) {
+            if (!set2.contains(e1)) {
+                result.add(e1);
+            }
+        }
+
+        List<E> list = new ArrayList<>(set2.size());
+        for (E e : set2) {
+            if (!set1.contains(e)) {
+                list.add(e);
+            }
+        }
+
+        result.addAll(list);
+
+        return result;
+    }
+
+    private static long getCommandTimeoutNs(Iterable<RedisURI> redisURIs) {
+
+        RedisURI redisURI = redisURIs.iterator().next();
+        return redisURI.getTimeout().toNanos();
+    }
+
+    /**
+     * Retrieve the exception from a {@link Future}.
+     *
+     * @param future
+     * @return
+     */
+    private static Throwable getException(Future<?> future) {
+
+        try {
+            future.get();
+        } catch (InterruptedException e) {
+            throw new RedisCommandInterruptedException(e);
+        } catch (ExecutionException e) {
+            return e.getCause();
+        }
+
+        return null;
+    }
+
+    static class ConnectionTracker {
+
+        private Map<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> connections = new LinkedHashMap<>();
+
+        public void addConnection(RedisURI uri, CompletableFuture<StatefulRedisConnection<String, String>> future) {
+            connections.put(uri, future);
+        }
+
+        public CompletableFuture<Void> close() {
+
+            CompletableFuture[] futures = connections.values().stream()
+                    .map(it -> it.thenCompose(StatefulConnection::closeAsync).exceptionally(ignore -> null))
+                    .toArray(CompletableFuture[]::new);
+
+            return CompletableFuture.allOf(futures);
+        }
+
+        public boolean contains(RedisURI uri) {
+            return connections.containsKey(uri);
+        }
+
+        public <T> CompletableFuture<T> whenComplete(
+                Function<? super Map<RedisURI, StatefulRedisConnection<String, String>>, ? extends T> mappingFunction) {
+
+            int expectedCount = connections.size();
+            AtomicInteger latch = new AtomicInteger();
+            CompletableFuture<T> continuation = new CompletableFuture<>();
+
+            for (Map.Entry<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> entry : connections
+                    .entrySet()) {
+
+                CompletableFuture<StatefulRedisConnection<String, String>> future = entry.getValue();
+
+                future.whenComplete((it, ex) -> {
+
+                    if (latch.incrementAndGet() == expectedCount) {
+
+                        try {
+                            continuation.complete(mappingFunction.apply(collectConnections()));
+                        } catch (RuntimeException e) {
+                            continuation.completeExceptionally(e);
+                        }
+                    }
+                });
+            }
+
+            return continuation;
+        }
+
+        protected Map<RedisURI, StatefulRedisConnection<String, String>> collectConnections() {
+
+            Map<RedisURI, StatefulRedisConnection<String, String>> activeConnections = new LinkedHashMap<>();
+
+            for (Map.Entry<RedisURI, CompletableFuture<StatefulRedisConnection<String, String>>> entry : connections
+                    .entrySet()) {
+
+                CompletableFuture<StatefulRedisConnection<String, String>> future = entry.getValue();
+                if (future.isDone() && !future.isCompletedExceptionally()) {
+                    activeConnections.put(entry.getKey(), future.join());
+                }
+            }
+            return activeConnections;
+        }
+    }
+
+    static class CannotRetrieveClusterPartitions extends RedisException {
+
+        private final Map<RedisURI, String> failure;
+
+        public CannotRetrieveClusterPartitions(Iterable<RedisURI> seedNodes, Map<RedisURI, String> failure) {
+            super(String.format("Cannot retrieve cluster partitions from %s", seedNodes));
+            this.failure = failure;
+        }
+
+        @Override
+        public String getMessage() {
+
+            StringJoiner joiner = new StringJoiner(SystemPropertyUtil.get("line.separator", "\n"));
+
+            if (!failure.isEmpty()) {
+
+                joiner.add(super.getMessage()).add("");
+                joiner.add("Details:");
+
+                for (Map.Entry<RedisURI, String> entry : failure.entrySet()) {
+                    joiner.add(String.format("\t[%s]: %s", entry.getKey(), entry.getValue()));
+                }
+
+                joiner.add("");
+            }
+
+            return joiner.toString();
+        }
+
+        @Override
+        public synchronized Throwable fillInStackTrace() {
+            return this;
+        }
+    }
+}
diff --git a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
index 1bf536e675..53fa5f4665 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/NodeTopologyView.java
@@ -15,7 +15,6 @@
  */
 package io.lettuce.core.cluster.topology;
 
-import java.util.concurrent.ExecutionException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -66,24 +65,23 @@ private NodeTopologyView(RedisURI redisURI) {
         this.latency = latency;
     }
 
-    static NodeTopologyView from(RedisURI redisURI, Requests clusterNodesRequests, Requests clientListRequests)
-            throws ExecutionException, InterruptedException {
+    static NodeTopologyView from(RedisURI redisURI, Requests clusterNodesRequests, Requests clientListRequests) {
 
         TimedAsyncCommand<String, String, String> nodes = clusterNodesRequests.getRequest(redisURI);
         TimedAsyncCommand<String, String, String> clients = clientListRequests.getRequest(redisURI);
 
         if (resultAvailable(nodes) && resultAvailable(clients)) {
-            return new NodeTopologyView(redisURI, nodes.get(), optionallyGet(clients), nodes.duration());
+            return new NodeTopologyView(redisURI, nodes.join(), optionallyGet(clients), nodes.duration());
         }
         return new NodeTopologyView(redisURI);
     }
 
-    private static <T> T optionallyGet(TimedAsyncCommand<?, ?, T> command) throws ExecutionException, InterruptedException {
+    private static <T> T optionallyGet(TimedAsyncCommand<?, ?, T> command) {
 
         if (command.isCompletedExceptionally()) {
             return null;
         }
-        return command.get();
+        return command.join();
     }
 
     private static boolean resultAvailable(RedisFuture<?> redisFuture) {
diff --git a/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java b/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
deleted file mode 100644
index 4f04d2a42d..0000000000
--- a/src/main/java/io/lettuce/core/cluster/topology/RefreshFutures.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2016-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.cluster.topology;
-
-import java.util.Collection;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import io.lettuce.core.RedisCommandInterruptedException;
-
-/**
- * @author Mark Paluch
- */
-class RefreshFutures {
-
-    /**
-     * Await for either future completion or to reach the timeout. Successful/exceptional future completion is not substantial.
-     *
-     * @param timeout the timeout value.
-     * @param timeUnit timeout unit.
-     * @param futures {@link Collection} of {@literal Future}s.
-     * @return time awaited in {@link TimeUnit#NANOSECONDS}.
-     * @throws InterruptedException
-     */
-    static long awaitAll(long timeout, TimeUnit timeUnit, Collection<? extends Future<?>> futures) throws InterruptedException {
-
-        long waitTime = 0;
-
-        for (Future<?> future : futures) {
-
-            long timeoutLeft = timeUnit.toNanos(timeout) - waitTime;
-
-            if (timeoutLeft <= 0) {
-                break;
-            }
-
-            long startWait = System.nanoTime();
-
-            try {
-                future.get(timeoutLeft, TimeUnit.NANOSECONDS);
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                throw e;
-            } catch (Exception e) {
-                continue;
-            } finally {
-                waitTime += System.nanoTime() - startWait;
-            }
-
-        }
-        return waitTime;
-    }
-
-    /**
-     * Retrieve the exception from a {@link Future}.
-     *
-     * @param future
-     * @return
-     * @since 5.1.7
-     */
-    static Throwable getException(Future<?> future) {
-
-        try {
-            future.get();
-        } catch (InterruptedException e) {
-            throw new RedisCommandInterruptedException(e);
-        } catch (ExecutionException e) {
-            return e.getCause();
-        }
-
-        return null;
-    }
-}
diff --git a/src/main/java/io/lettuce/core/cluster/topology/Requests.java b/src/main/java/io/lettuce/core/cluster/topology/Requests.java
index 29ae138d02..7c860f9c07 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Requests.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Requests.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 import io.lettuce.core.RedisURI;
 
@@ -43,8 +43,15 @@ protected void addRequest(RedisURI redisURI, TimedAsyncCommand<String, String, S
         rawViews.put(redisURI, command);
     }
 
-    protected long await(long timeout, TimeUnit timeUnit) throws InterruptedException {
-        return RefreshFutures.awaitAll(timeout, timeUnit, rawViews.values());
+    /**
+     * Returns a marker future that completes when all of the futures in this {@link Requests} complete. The marker never fails
+     * exceptionally but signals completion only.
+     *
+     * @return
+     */
+    public CompletableFuture<Void> allCompleted() {
+        return CompletableFuture.allOf(rawViews.values().stream().map(it -> it.exceptionally(throwable -> "ignore"))
+                .toArray(CompletableFuture[]::new));
     }
 
     protected Set<RedisURI> nodes() {
diff --git a/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
index ae96dbd72c..f11e8a710b 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/TopologyComparators.java
@@ -44,7 +44,8 @@ public class TopologyComparators {
      * @return List containing {@link RedisClusterNode}s ordered by {@code fixedOrder} and {@link RedisURI}
      * @see #sortByUri(Iterable)
      */
-    public static List<RedisClusterNode> predefinedSort(Iterable<RedisClusterNode> clusterNodes, Iterable<RedisURI> fixedOrder) {
+    public static List<RedisClusterNode> predefinedSort(Iterable<RedisClusterNode> clusterNodes,
+            Iterable<RedisURI> fixedOrder) {
 
         LettuceAssert.notNull(clusterNodes, "Cluster nodes must not be null");
         LettuceAssert.notNull(fixedOrder, "Fixed order must not be null");
@@ -60,8 +61,8 @@ public static List<RedisClusterNode> predefinedSort(Iterable<RedisClusterNode> c
                 .filter(redisClusterNode -> !fixedOrderList.contains(redisClusterNode.getUri()))//
                 .collect(Collectors.toList());
 
-        Collections.sort(withOrderSpecification, new PredefinedRedisClusterNodeComparator(fixedOrderList));
-        Collections.sort(withoutSpecification, (o1, o2) -> RedisURIComparator.INSTANCE.compare(o1.getUri(), o2.getUri()));
+        withOrderSpecification.sort(new PredefinedRedisClusterNodeComparator(fixedOrderList));
+        withoutSpecification.sort((o1, o2) -> RedisURIComparator.INSTANCE.compare(o1.getUri(), o2.getUri()));
 
         withOrderSpecification.addAll(withoutSpecification);
 
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java
index 4ec853917f..0ba124f71b 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterPartiallyDownIntegrationTests.java
@@ -110,8 +110,9 @@ void seedNodesAreOffline() {
             redisClusterClient.connect();
             fail("Missing RedisException");
         } catch (RedisException e) {
-            assertThat(e).hasCauseInstanceOf(RedisConnectionException.class);
-            assertThat(e.getCause()).hasMessageStartingWith("Unable to establish a connection to Redis Cluster");
+
+            assertThat(e).isInstanceOf(RedisConnectionException.class)
+                    .hasMessageStartingWith("Unable to establish a connection to Redis Cluster");
         }
     }
 
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
index ef4eccb8e6..60b1ee475d 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterTopologyRefreshSchedulerUnitTests.java
@@ -42,6 +42,8 @@
 import io.netty.util.concurrent.EventExecutorGroup;
 
 /**
+ * Unit test for {@link ClusterTopologyRefreshScheduler}.
+ *
  * @author Mark Paluch
  */
 @ExtendWith(MockitoExtension.class)
@@ -74,7 +76,8 @@ void before() {
         when(clientResources.eventBus()).thenReturn(eventBus);
         when(clientResources.eventExecutorGroup()).thenReturn(eventExecutors);
 
-        sut = new ClusterTopologyRefreshScheduler(clusterClient, clientResources);
+        sut = new ClusterTopologyRefreshScheduler(clusterClient::getClusterClientOptions, clusterClient::getPartitions,
+                clusterClient::refreshPartitionsAsync, clientResources);
     }
 
     @Test
@@ -98,14 +101,7 @@ void runnableShouldCallPartitionRefresh() {
 
         sut.run();
 
-        verify(clusterClient).reloadPartitions();
-    }
-
-    @Test
-    void shouldNotSubmitIfOptionsNotSet() {
-
-        sut.run();
-        verify(eventExecutors, never()).submit(any(Runnable.class));
+        verify(clusterClient).refreshPartitionsAsync();
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
index 943b784aba..0a2edc96ee 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterClientIntegrationTests.java
@@ -396,7 +396,7 @@ void partitionRetrievalShouldFail() {
                 RedisURI.Builder.redis(TestSettings.host(), ClusterTestSettings.port7).build());
 
         assertThatThrownBy(clusterClient::getPartitions).isInstanceOf(RedisException.class)
-                .hasRootCauseInstanceOf(RedisCommandExecutionException.class);
+                .hasMessageContaining("Cannot obtain initial Redis Cluster topology");
 
         FastShutdown.shutdown(clusterClient);
     }
diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java
index 75c4db81a0..11e0b76a70 100644
--- a/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/RedisClusterPasswordSecuredSslIntegrationTests.java
@@ -27,10 +27,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import io.lettuce.core.RedisCommandExecutionException;
-import io.lettuce.core.RedisException;
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSupport;
+import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.sync.Executions;
@@ -51,8 +48,8 @@ class RedisClusterPasswordSecuredSslIntegrationTests extends TestSupport {
     private static final String SLOT_1_KEY = "8HMdi";
     private static final String SLOT_16352_KEY = "UyAa4KqoWgPGKa";
 
-    private static RedisURI redisURI = RedisURI.Builder.redis(host(), CLUSTER_PORT_SSL_1).withPassword("foobared")
-            .withSsl(true).withVerifyPeer(false).build();
+    private static RedisURI redisURI = RedisURI.Builder.redis(host(), CLUSTER_PORT_SSL_1).withPassword("foobared").withSsl(true)
+            .withVerifyPeer(false).build();
     private static RedisClusterClient redisClient = RedisClusterClient.create(TestClientResources.get(), redisURI);
 
     @BeforeEach
@@ -142,7 +139,7 @@ void connectionWithoutPasswordShouldFail() {
         try {
             redisClusterClient.reloadPartitions();
         } catch (RedisException e) {
-            assertThat(e).hasMessageContaining("Cannot retrieve initial cluster");
+            assertThat(e).hasMessageContaining("Cannot reload Redis Cluster topology");
         } finally {
             FastShutdown.shutdown(redisClusterClient);
         }
@@ -156,8 +153,8 @@ void connectionWithoutPasswordShouldFail2() {
 
         try {
             redisClusterClient.connect();
-        } catch (RedisException e) {
-            assertThat(e).hasMessageContaining("Cannot retrieve initial cluster");
+        } catch (RedisConnectionException e) {
+            assertThat(e).hasMessageContaining("Unable to establish a connection to Redis Cluster");
         } finally {
             FastShutdown.shutdown(redisClusterClient);
         }
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
index 1a2536b28b..1900c1bb33 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/ClusterTopologyRefreshUnitTests.java
@@ -16,7 +16,6 @@
 package io.lettuce.core.cluster.topology;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -27,6 +26,8 @@
 import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -52,6 +53,7 @@
 import io.lettuce.core.resource.DnsResolvers;
 import io.lettuce.core.resource.SocketAddressResolver;
 import io.lettuce.test.settings.TestSettings;
+import io.netty.util.Timeout;
 import io.netty.util.concurrent.EventExecutorGroup;
 
 /**
@@ -63,14 +65,12 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 class ClusterTopologyRefreshUnitTests {
 
-    private static final long COMMAND_TIMEOUT_NS = TimeUnit.MILLISECONDS.toNanos(10);
-
     private static final String NODE_1_VIEW = "1 127.0.0.1:7380 master,myself - 0 1401258245007 2 disconnected 8000-11999\n"
             + "2 127.0.0.1:7381 master - 111 1401258245007 222 connected 7000 12000 12002-16383\n";
     private static final String NODE_2_VIEW = "1 127.0.0.1:7380 master - 0 1401258245007 2 disconnected 8000-11999\n"
             + "2 127.0.0.1:7381 master,myself - 111 1401258245007 222 connected 7000 12000 12002-16383\n";
 
-    private ClusterTopologyRefresh sut;
+    private DefaultClusterTopologyRefresh sut;
 
     @Mock
     private RedisClusterClient client;
@@ -102,6 +102,9 @@ class ClusterTopologyRefreshUnitTests {
     @BeforeEach
     void before() {
 
+        io.netty.util.Timer timer = mock(io.netty.util.Timer.class);
+        when(timer.newTimeout(any(), anyLong(), any())).thenReturn(mock(Timeout.class));
+        when(clientResources.timer()).thenReturn(timer);
         when(clientResources.socketAddressResolver()).thenReturn(SocketAddressResolver.create(DnsResolvers.JVM_DEFAULT));
         when(clientResources.eventExecutorGroup()).thenReturn(eventExecutors);
         when(connection1.async()).thenReturn(asyncCommands1);
@@ -161,7 +164,7 @@ void before() {
             return command;
         });
 
-        sut = new ClusterTopologyRefresh(nodeConnectionFactory, clientResources);
+        sut = new DefaultClusterTopologyRefresh(nodeConnectionFactory, clientResources);
     }
 
     @Test
@@ -182,7 +185,7 @@ void getNodeSpecificViewsNode1IsFasterThanNode2() throws Exception {
 
         Requests clientRequests = createClientListRequests(1, "c1\nc2\n").mergeWith(createClientListRequests(2, "c1\nc2\n"));
 
-        NodeTopologyViews nodeSpecificViews = sut.getNodeSpecificViews(requests, clientRequests, COMMAND_TIMEOUT_NS);
+        NodeTopologyViews nodeSpecificViews = sut.getNodeSpecificViews(requests, clientRequests);
 
         Collection<Partitions> values = nodeSpecificViews.toMap().values();
 
@@ -220,7 +223,7 @@ void partitionsReturnedAsReported() throws Exception {
 
         Requests clientRequests = createClientListRequests(1, "c1\nc2\n").mergeWith(createClientListRequests(2, "c1\nc2\n"));
 
-        NodeTopologyViews nodeSpecificViews = sut.getNodeSpecificViews(requests, clientRequests, COMMAND_TIMEOUT_NS);
+        NodeTopologyViews nodeSpecificViews = sut.getNodeSpecificViews(requests, clientRequests);
 
         Collection<Partitions> values = nodeSpecificViews.toMap().values();
 
@@ -248,8 +251,7 @@ void getNodeSpecificViewTestingNoAddrFilter() throws Exception {
         Requests clientRequests = createClientListRequests(1,
                 "# Clients\r\nconnected_clients:2\r\nclient_longest_output_list:0\r\nclient_biggest_input_buf:0\r\nblocked_clients:0");
 
-        NodeTopologyViews nodeSpecificViews = sut.getNodeSpecificViews(clusterNodesRequests, clientRequests,
-                COMMAND_TIMEOUT_NS);
+        NodeTopologyViews nodeSpecificViews = sut.getNodeSpecificViews(clusterNodesRequests, clientRequests);
 
         List<Partitions> values = new ArrayList<>(nodeSpecificViews.toMap().values());
 
@@ -274,8 +276,7 @@ void getNodeSpecificViewsNode2IsFasterThanNode1() throws Exception {
 
         Requests clientRequests = createClientListRequests(5, "c1\nc2\n").mergeWith(createClientListRequests(1, "c1\nc2\n"));
 
-        NodeTopologyViews nodeSpecificViews = sut.getNodeSpecificViews(clusterNodesRequests, clientRequests,
-                COMMAND_TIMEOUT_NS);
+        NodeTopologyViews nodeSpecificViews = sut.getNodeSpecificViews(clusterNodesRequests, clientRequests);
         List<Partitions> values = new ArrayList<>(nodeSpecificViews.toMap().values());
 
         assertThat(values).hasSize(2);
@@ -312,11 +313,12 @@ void shouldFailIfNoNodeConnects() {
                 .thenReturn(completedWithException(new RedisException("connection failed")));
 
         try {
-            sut.loadViews(seed, Duration.ofSeconds(1), true);
+            sut.loadViews(seed, Duration.ofSeconds(1), true).toCompletableFuture().join();
             fail("Missing RedisConnectionException");
         } catch (Exception e) {
-            assertThat(e).hasMessageStartingWith("Unable to establish a connection to Redis Cluster");
-            assertThat(e.getSuppressed()).hasSize(1);
+
+            assertThat(e.getCause()).hasMessageStartingWith("Cannot retrieve cluster partitions from ");
+            assertThat(e.getCause().getSuppressed()).hasSize(2);
         }
 
         verify(nodeConnectionFactory).connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380)));
@@ -395,7 +397,8 @@ void undiscoveredAdditionalNodesShouldBeLastUsingClientCount() {
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection1));
 
-        Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, Duration.ofSeconds(1), false);
+        Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, Duration.ofSeconds(1), false).toCompletableFuture()
+                .join();
 
         Partitions partitions = partitionsMap.values().iterator().next();
 
@@ -415,7 +418,7 @@ void discoveredAdditionalNodesShouldBeOrderedUsingClientCount() {
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection2));
 
-        Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, Duration.ofSeconds(1), true);
+        Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, Duration.ofSeconds(1), true).toCompletableFuture().join();
 
         Partitions partitions = partitionsMap.values().iterator().next();
 
@@ -433,7 +436,8 @@ void undiscoveredAdditionalNodesShouldBeLastUsingLatency() {
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7380))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection1));
 
-        Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, Duration.ofSeconds(1), false);
+        Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, Duration.ofSeconds(1), false).toCompletableFuture()
+                .join();
 
         Partitions partitions = partitionsMap.values().iterator().next();
 
@@ -453,7 +457,7 @@ void discoveredAdditionalNodesShouldBeOrderedUsingLatency() {
         when(nodeConnectionFactory.connectToNodeAsync(any(RedisCodec.class), eq(new InetSocketAddress("127.0.0.1", 7381))))
                 .thenReturn(completedFuture((StatefulRedisConnection) connection2));
 
-        Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, Duration.ofSeconds(1), true);
+        Map<RedisURI, Partitions> partitionsMap = sut.loadViews(seed, Duration.ofSeconds(1), true).toCompletableFuture().join();
 
         Partitions partitions = partitionsMap.values().iterator().next();
 
@@ -487,7 +491,7 @@ void shouldPropagateCommandFailures() {
             return command;
         });
 
-        RedisException nestedException = new RedisException("AUTH");
+        RedisException nestedException = new RedisException("NESTED");
 
         when(connection2.dispatch(any(RedisCommand.class))).thenAnswer(invocation -> {
 
@@ -496,17 +500,25 @@ void shouldPropagateCommandFailures() {
             return command;
         });
 
-        assertThatThrownBy(() -> sut.loadViews(seed, Duration.ofSeconds(1), true)).isInstanceOf(RedisException.class)
-                .hasRootCauseInstanceOf(RedisException.class).hasSuppressedException(nestedException);
+        CompletionStage<Map<RedisURI, Partitions>> actual = sut.loadViews(seed, Duration.ofSeconds(1), true);
+        assertThat(actual).isCompletedExceptionally();
+
+        try {
+            actual.toCompletableFuture().join();
+            fail("Missing CompletionException");
+        } catch (CompletionException e) {
+
+            assertThat(e.getCause()).hasSuppressedException(nestedException);
+        }
     }
 
     Requests createClusterNodesRequests(int duration, String nodes) {
 
         RedisURI redisURI = RedisURI.create("redis://localhost:" + duration);
-        Connections connections = new Connections();
+        Connections connections = new Connections(clientResources, new HashMap<>());
         connections.addConnection(redisURI, connection);
 
-        Requests requests = connections.requestTopology();
+        Requests requests = connections.requestTopology(100, TimeUnit.SECONDS);
         TimedAsyncCommand<String, String, String> command = requests.getRequest(redisURI);
 
         command.getOutput().set(ByteBuffer.wrap(nodes.getBytes()));
@@ -520,10 +532,10 @@ Requests createClusterNodesRequests(int duration, String nodes) {
     Requests createClientListRequests(int duration, String response) {
 
         RedisURI redisURI = RedisURI.create("redis://localhost:" + duration);
-        Connections connections = new Connections();
+        Connections connections = new Connections(clientResources, new HashMap<>());
         connections.addConnection(redisURI, connection);
 
-        Requests requests = connections.requestTopology();
+        Requests requests = connections.requestTopology(100, TimeUnit.SECONDS);
         TimedAsyncCommand<String, String, String> command = requests.getRequest(redisURI);
 
         command.getOutput().set(ByteBuffer.wrap(response.getBytes()));
diff --git a/src/test/java/io/lettuce/core/cluster/topology/ConnectionsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/ConnectionsUnitTests.java
deleted file mode 100644
index 12fa4336c0..0000000000
--- a/src/test/java/io/lettuce/core/cluster/topology/ConnectionsUnitTests.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2018-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.cluster.topology;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import java.util.concurrent.CompletableFuture;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.mockito.junit.jupiter.MockitoSettings;
-import org.mockito.quality.Strictness;
-
-import io.lettuce.core.RedisURI;
-import io.lettuce.core.api.StatefulRedisConnection;
-
-/**
- * @author Christian Weitendorf
- * @author Mark Paluch
- */
-@ExtendWith(MockitoExtension.class)
-@MockitoSettings(strictness = Strictness.LENIENT)
-class ConnectionsUnitTests {
-
-    @Mock
-    private StatefulRedisConnection<String, String> connection1;
-
-    @Mock
-    private StatefulRedisConnection<String, String> connection2;
-
-    @BeforeEach
-    void before() {
-
-        when(connection1.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
-        when(connection2.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
-    }
-
-    @Test
-    void shouldCloseAllConnections() {
-
-        Connections sut = new Connections();
-        sut.addConnection(RedisURI.create("127.0.0.1", 7380), connection1);
-        sut.addConnection(RedisURI.create("127.0.0.1", 7381), connection2);
-
-        sut.close();
-
-        verify(connection1).closeAsync();
-        verify(connection2).closeAsync();
-    }
-
-    @Test
-    void shouldCloseAllConnectionsAfterCloseSignal() {
-
-        Connections sut = new Connections();
-        sut.close();
-        verifyZeroInteractions(connection1);
-
-        sut.addConnection(RedisURI.create("127.0.0.1", 7381), connection1);
-        verify(connection1).closeAsync();
-    }
-}
diff --git a/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java b/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
index 58ff75930a..a33da4c4ac 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/RequestsUnitTests.java
@@ -75,33 +75,6 @@ void shouldCreateTopologyViewWithoutClientCount() throws Exception {
         assertThat(nodeTopologyView.getClusterNodes()).isNull();
     }
 
-    @Test
-    void awaitShouldReturnAwaitedTime() throws Exception {
-
-        RedisURI redisURI = RedisURI.create("localhost", 6379);
-        Requests requests = new Requests();
-        Command<String, String, String> command = new Command<>(CommandType.TYPE, new StatusOutput<>(StringCodec.UTF8));
-        TimedAsyncCommand timedAsyncCommand = new TimedAsyncCommand(command);
-
-        requests.addRequest(redisURI, timedAsyncCommand);
-
-        assertThat(requests.await(100, TimeUnit.MILLISECONDS)).isGreaterThan(TimeUnit.MILLISECONDS.toNanos(90));
-    }
-
-    @Test
-    void awaitShouldReturnAwaitedTimeIfNegative() throws Exception {
-
-        RedisURI redisURI = RedisURI.create("localhost", 6379);
-        Requests requests = new Requests();
-        Command<String, String, String> command = new Command<>(CommandType.TYPE, new StatusOutput<>(StringCodec.UTF8));
-        TimedAsyncCommand timedAsyncCommand = new TimedAsyncCommand(command);
-
-        requests.addRequest(redisURI, timedAsyncCommand);
-
-        assertThat(requests.await(-1, TimeUnit.MILLISECONDS)).isEqualTo(0);
-
-    }
-
     private TimedAsyncCommand getCommand(String response) {
         Command<String, String, String> command = new Command<>(CommandType.TYPE, new StatusOutput<>(StringCodec.UTF8));
         TimedAsyncCommand timedAsyncCommand = new TimedAsyncCommand(command);
diff --git a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
index 099be890fa..bd15113f07 100644
--- a/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/topology/TopologyRefreshIntegrationTests.java
@@ -94,36 +94,6 @@ void closeConnection() {
         FastShutdown.shutdown(clusterClient);
     }
 
-    @Test
-    void shouldUnsubscribeTopologyRefresh() {
-
-        ClusterTopologyRefreshOptions topologyRefreshOptions = ClusterTopologyRefreshOptions.builder()
-                .enablePeriodicRefresh(true) //
-                .build();
-        clusterClient.setOptions(ClusterClientOptions.builder().topologyRefreshOptions(topologyRefreshOptions).build());
-
-        RedisAdvancedClusterAsyncCommands<String, String> clusterConnection = clusterClient.connect().async();
-
-        AtomicBoolean clusterTopologyRefreshActivated = (AtomicBoolean) ReflectionTestUtils.getField(clusterClient,
-                "clusterTopologyRefreshActivated");
-
-        AtomicReference<ScheduledFuture<?>> clusterTopologyRefreshFuture = (AtomicReference) ReflectionTestUtils.getField(
-                clusterClient, "clusterTopologyRefreshFuture");
-
-        assertThat(clusterTopologyRefreshActivated.get()).isTrue();
-        assertThat((Future) clusterTopologyRefreshFuture.get()).isNotNull();
-
-        ScheduledFuture<?> scheduledFuture = clusterTopologyRefreshFuture.get();
-
-        clusterConnection.getStatefulConnection().close();
-
-        FastShutdown.shutdown(clusterClient);
-
-        assertThat(clusterTopologyRefreshActivated.get()).isFalse();
-        assertThat((Future) clusterTopologyRefreshFuture.get()).isNull();
-        assertThat(scheduledFuture.isCancelled()).isTrue();
-    }
-
     @Test
     void changeTopologyWhileOperations() {
 

From 87dc833949b7466fa76fd0ba6e417cd3574b8530 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 13 Mar 2020 10:34:44 +0100
Subject: [PATCH 759/808] Reduce visibility of fields in AbstractRedisClient
 #1241

We now have better encapsulation in AbstractRedisClient. Subclasses use proper accessors and field access is greatly reduced.
---
 .../io/lettuce/core/AbstractRedisClient.java  | 159 +++++++------
 .../io/lettuce/core/ConnectionBuilder.java    |  10 +-
 .../java/io/lettuce/core/RedisClient.java     |  67 +++---
 .../core/cluster/RedisClusterClient.java      | 215 +++++++++---------
 4 files changed, 223 insertions(+), 228 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index b5145188db..d794d968ab 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -35,12 +35,11 @@
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
 import io.netty.bootstrap.Bootstrap;
-import io.netty.buffer.PooledByteBufAllocator;
+import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.*;
 import io.netty.channel.group.ChannelGroup;
 import io.netty.channel.group.DefaultChannelGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.util.HashedWheelTimer;
 import io.netty.util.concurrent.EventExecutorGroup;
 import io.netty.util.concurrent.Future;
 import io.netty.util.internal.logging.InternalLogger;
@@ -65,24 +64,20 @@
  */
 public abstract class AbstractRedisClient {
 
-    protected static final PooledByteBufAllocator BUF_ALLOCATOR = PooledByteBufAllocator.DEFAULT;
-    protected static final InternalLogger logger = InternalLoggerFactory.getInstance(RedisClient.class);
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(AbstractRedisClient.class);
 
-    protected final Map<Class<? extends EventLoopGroup>, EventLoopGroup> eventLoopGroups = new ConcurrentHashMap<>(2);
     protected final ConnectionEvents connectionEvents = new ConnectionEvents();
     protected final Set<Closeable> closeableResources = ConcurrentHashMap.newKeySet();
-    protected final EventExecutorGroup genericWorkerPool;
-    protected final HashedWheelTimer timer;
     protected final ChannelGroup channels;
-    protected final ClientResources clientResources;
-
-    protected volatile ClientOptions clientOptions = ClientOptions.builder().build();
-
-    protected Duration timeout = RedisURI.DEFAULT_TIMEOUT_DURATION;
 
+    private final ClientResources clientResources;
+    private final Map<Class<? extends EventLoopGroup>, EventLoopGroup> eventLoopGroups = new ConcurrentHashMap<>(2);
     private final boolean sharedResources;
     private final AtomicBoolean shutdown = new AtomicBoolean();
 
+    private volatile ClientOptions clientOptions = ClientOptions.create();
+    private volatile Duration defaultTimeout = RedisURI.DEFAULT_TIMEOUT_DURATION;
+
     /**
      * Create a new instance with client resources.
      *
@@ -92,16 +87,27 @@ public abstract class AbstractRedisClient {
     protected AbstractRedisClient(ClientResources clientResources) {
 
         if (clientResources == null) {
-            sharedResources = false;
+            this.sharedResources = false;
             this.clientResources = DefaultClientResources.create();
         } else {
-            sharedResources = true;
+            this.sharedResources = true;
             this.clientResources = clientResources;
         }
 
-        genericWorkerPool = this.clientResources.eventExecutorGroup();
-        channels = new DefaultChannelGroup(genericWorkerPool.next());
-        timer = (HashedWheelTimer) this.clientResources.timer();
+        this.channels = new DefaultChannelGroup(this.clientResources.eventExecutorGroup().next());
+    }
+
+    protected int getChannelCount() {
+        return channels.size();
+    }
+
+    /**
+     * Returns the default {@link Duration timeout} for commands.
+     *
+     * @return the default {@link Duration timeout} for commands.
+     */
+    public Duration getDefaultTimeout() {
+        return defaultTimeout;
     }
 
     /**
@@ -116,7 +122,7 @@ public void setDefaultTimeout(Duration timeout) {
         LettuceAssert.notNull(timeout, "Timeout duration must not be null");
         LettuceAssert.isTrue(!timeout.isNegative(), "Timeout duration must be greater or equal to zero");
 
-        this.timeout = timeout;
+        this.defaultTimeout = timeout;
     }
 
     /**
@@ -132,6 +138,65 @@ public void setDefaultTimeout(long timeout, TimeUnit unit) {
         setDefaultTimeout(Duration.ofNanos(unit.toNanos(timeout)));
     }
 
+    /**
+     * Returns the {@link ClientOptions} which are valid for that client. Connections inherit the current options at the moment
+     * the connection is created. Changes to options will not affect existing connections.
+     *
+     * @return the {@link ClientOptions} for this client
+     */
+    public ClientOptions getOptions() {
+        return clientOptions;
+    }
+
+    /**
+     * Set the {@link ClientOptions} for the client.
+     *
+     * @param clientOptions client options for the client and connections that are created after setting the options
+     */
+    protected void setOptions(ClientOptions clientOptions) {
+        LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
+        this.clientOptions = clientOptions;
+    }
+
+    /**
+     * Returns the {@link ClientResources} which are used with that client.
+     *
+     * @return the {@link ClientResources} for this client.
+     * @since 6.0
+     *
+     */
+    public ClientResources getResources() {
+        return clientResources;
+    }
+
+    protected int getResourceCount() {
+        return closeableResources.size();
+    }
+
+    /**
+     * Add a listener for the RedisConnectionState. The listener is notified every time a connect/disconnect/IO exception
+     * happens. The listeners are not bound to a specific connection, so every time a connection event happens on any
+     * connection, the listener will be notified. The corresponding netty channel handler (async connection) is passed on the
+     * event.
+     *
+     * @param listener must not be {@literal null}
+     */
+    public void addListener(RedisConnectionStateListener listener) {
+        LettuceAssert.notNull(listener, "RedisConnectionStateListener must not be null");
+        connectionEvents.addListener(listener);
+    }
+
+    /**
+     * Removes a listener.
+     *
+     * @param listener must not be {@literal null}
+     */
+    public void removeListener(RedisConnectionStateListener listener) {
+
+        LettuceAssert.notNull(listener, "RedisConnectionStateListener must not be null");
+        connectionEvents.removeListener(listener);
+    }
+
     /**
      * Populate connection builder with necessary resources.
      *
@@ -143,9 +208,7 @@ protected void connectionBuilder(Mono<SocketAddress> socketAddressSupplier, Conn
             RedisURI redisURI) {
 
         Bootstrap redisBootstrap = new Bootstrap();
-        redisBootstrap.option(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, 32 * 1024);
-        redisBootstrap.option(ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 8 * 1024);
-        redisBootstrap.option(ChannelOption.ALLOCATOR, BUF_ALLOCATOR);
+        redisBootstrap.option(ChannelOption.ALLOCATOR, ByteBufAllocator.DEFAULT);
 
         ClientOptions clientOptions = getOptions();
         SocketOptions socketOptions = clientOptions.getSocketOptions();
@@ -161,7 +224,7 @@ protected void connectionBuilder(Mono<SocketAddress> socketAddressSupplier, Conn
         connectionBuilder.apply(redisURI);
 
         connectionBuilder.bootstrap(redisBootstrap);
-        connectionBuilder.channelGroup(channels).connectionEvents(connectionEvents).timer(timer);
+        connectionBuilder.channelGroup(channels).connectionEvents(connectionEvents);
         connectionBuilder.socketAddressSupplier(socketAddressSupplier);
     }
 
@@ -512,58 +575,6 @@ private CompletableFuture<Void> closeClientResources(long quietPeriod, long time
         return Futures.allOf(groupCloseFutures);
     }
 
-    protected int getResourceCount() {
-        return closeableResources.size();
-    }
-
-    protected int getChannelCount() {
-        return channels.size();
-    }
-
-    /**
-     * Add a listener for the RedisConnectionState. The listener is notified every time a connect/disconnect/IO exception
-     * happens. The listeners are not bound to a specific connection, so every time a connection event happens on any
-     * connection, the listener will be notified. The corresponding netty channel handler (async connection) is passed on the
-     * event.
-     *
-     * @param listener must not be {@literal null}
-     */
-    public void addListener(RedisConnectionStateListener listener) {
-        LettuceAssert.notNull(listener, "RedisConnectionStateListener must not be null");
-        connectionEvents.addListener(listener);
-    }
-
-    /**
-     * Removes a listener.
-     *
-     * @param listener must not be {@literal null}
-     */
-    public void removeListener(RedisConnectionStateListener listener) {
-
-        LettuceAssert.notNull(listener, "RedisConnectionStateListener must not be null");
-        connectionEvents.removeListener(listener);
-    }
-
-    /**
-     * Returns the {@link ClientOptions} which are valid for that client. Connections inherit the current options at the moment
-     * the connection is created. Changes to options will not affect existing connections.
-     *
-     * @return the {@link ClientOptions} for this client
-     */
-    public ClientOptions getOptions() {
-        return clientOptions;
-    }
-
-    /**
-     * Set the {@link ClientOptions} for the client.
-     *
-     * @param clientOptions client options for the client and connections that are created after setting the options
-     */
-    protected void setOptions(ClientOptions clientOptions) {
-        LettuceAssert.notNull(clientOptions, "ClientOptions must not be null");
-        this.clientOptions = clientOptions;
-    }
-
     protected RedisHandshake createHandshake(ConnectionState state) {
         return new RedisHandshake(clientOptions.getConfiguredProtocolVersion(), clientOptions.isPingBeforeActivateConnection(),
                 state);
diff --git a/src/main/java/io/lettuce/core/ConnectionBuilder.java b/src/main/java/io/lettuce/core/ConnectionBuilder.java
index 297aea2f30..5b48868b3b 100644
--- a/src/main/java/io/lettuce/core/ConnectionBuilder.java
+++ b/src/main/java/io/lettuce/core/ConnectionBuilder.java
@@ -45,7 +45,6 @@ public class ConnectionBuilder {
     private Endpoint endpoint;
     private Supplier<CommandHandler> commandHandlerSupplier;
     private ChannelGroup channelGroup;
-    private Timer timer;
     private Bootstrap bootstrap;
     private ClientOptions clientOptions;
     private Duration timeout;
@@ -105,10 +104,10 @@ protected ConnectionWatchdog createConnectionWatchdog() {
         }
 
         LettuceAssert.assertState(bootstrap != null, "Bootstrap must be set for autoReconnect=true");
-        LettuceAssert.assertState(timer != null, "Timer must be set for autoReconnect=true");
         LettuceAssert.assertState(socketAddressSupplier != null, "SocketAddressSupplier must be set for autoReconnect=true");
 
-        ConnectionWatchdog watchdog = new ConnectionWatchdog(clientResources.reconnectDelay(), clientOptions, bootstrap, timer,
+        ConnectionWatchdog watchdog = new ConnectionWatchdog(clientResources.reconnectDelay(), clientOptions, bootstrap,
+                clientResources.timer(),
                 clientResources.eventExecutorGroup(), socketAddressSupplier, reconnectionListener, connection,
                 clientResources.eventBus());
 
@@ -173,11 +172,6 @@ public ConnectionBuilder commandHandler(Supplier<CommandHandler> supplier) {
         return this;
     }
 
-    public ConnectionBuilder timer(Timer timer) {
-        this.timer = timer;
-        return this;
-    }
-
     public ConnectionBuilder bootstrap(Bootstrap bootstrap) {
         this.bootstrap = bootstrap;
         return this;
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index aae42bdda5..9b80eac787 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -46,6 +46,8 @@
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.sentinel.StatefulRedisSentinelConnectionImpl;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
 
 /**
  * A scalable and thread-safe <a href="http://redis.io/">Redis</a> client supporting synchronous, asynchronous and reactive
@@ -60,9 +62,9 @@
  * <li>Redis Sentinel, Master connections</li>
  * </ul>
  *
- * Redis Cluster is used through {@link io.lettuce.core.cluster.RedisClusterClient}. Master/Slave connections through
- * {@link io.lettuce.core.masterslave.MasterSlave} provide connections to Redis Master/Slave setups which run either in a static
- * Master/Slave setup or are managed by Redis Sentinel.
+ * Redis Cluster is used through {@link io.lettuce.core.cluster.RedisClusterClient}. Master/Replica connections through
+ * {@link io.lettuce.core.masterreplica.MasterReplica} provide connections to Redis Master/Replica setups which run either in a
+ * static Master/Replica setup or are managed by Redis Sentinel.
  * <p>
  * {@link RedisClient} is an expensive resource. It holds a set of netty's {@link io.netty.channel.EventLoopGroup}'s that use
  * multiple threads. Reuse this instance as much as possible or share a {@link ClientResources} instance amongst multiple client
@@ -78,11 +80,13 @@
  * @see RedisCodec
  * @see ClientOptions
  * @see ClientResources
- * @see io.lettuce.core.masterslave.MasterSlave
+ * @see io.lettuce.core.masterreplica.MasterReplica
  * @see io.lettuce.core.cluster.RedisClusterClient
  */
 public class RedisClient extends AbstractRedisClient {
 
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(RedisClient.class);
+
     private static final RedisURI EMPTY_URI = new RedisURI();
 
     private final RedisURI redisURI;
@@ -206,7 +210,7 @@ public <K, V> StatefulRedisConnection<K, V> connect(RedisCodec<K, V> codec) {
 
         checkForRedisURI();
 
-        return getConnection(connectStandaloneAsync(codec, this.redisURI, timeout));
+        return getConnection(connectStandaloneAsync(codec, this.redisURI, getDefaultTimeout()));
     }
 
     /**
@@ -265,16 +269,16 @@ private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandalone
 
         logger.debug("Trying to get a Redis connection for: " + redisURI);
 
-        DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions, clientResources);
+        DefaultEndpoint endpoint = new DefaultEndpoint(getOptions(), getResources());
         RedisChannelWriter writer = endpoint;
 
-        if (CommandExpiryWriter.isSupported(clientOptions)) {
-            writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
+        if (CommandExpiryWriter.isSupported(getOptions())) {
+            writer = new CommandExpiryWriter(writer, getOptions(), getResources());
         }
 
         StatefulRedisConnectionImpl<K, V> connection = newStatefulRedisConnection(writer, codec, timeout);
         ConnectionFuture<StatefulRedisConnection<K, V>> future = connectStatefulAsync(connection, endpoint, redisURI,
-                () -> new CommandHandler(clientOptions, clientResources, endpoint));
+                () -> new CommandHandler(getOptions(), getResources(), endpoint));
 
         future.whenComplete((channelHandler, throwable) -> {
 
@@ -304,8 +308,8 @@ private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnecti
         state.setDb(redisURI.getDatabase());
 
         connectionBuilder.connection(connection);
-        connectionBuilder.clientOptions(clientOptions);
-        connectionBuilder.clientResources(clientResources);
+        connectionBuilder.clientOptions(getOptions());
+        connectionBuilder.clientResources(getResources());
         connectionBuilder.commandHandler(commandHandlerSupplier).endpoint(endpoint);
 
         connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
@@ -323,7 +327,7 @@ private <K, V, S> ConnectionFuture<S> connectStatefulAsync(StatefulRedisConnecti
      * @return A new stateful pub/sub connection
      */
     public StatefulRedisPubSubConnection<String, String> connectPubSub() {
-        return getConnection(connectPubSubAsync(newStringStringCodec(), redisURI, timeout));
+        return getConnection(connectPubSubAsync(newStringStringCodec(), redisURI, getDefaultTimeout()));
     }
 
     /**
@@ -350,7 +354,7 @@ public StatefulRedisPubSubConnection<String, String> connectPubSub(RedisURI redi
      */
     public <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec) {
         checkForRedisURI();
-        return getConnection(connectPubSubAsync(codec, redisURI, timeout));
+        return getConnection(connectPubSubAsync(codec, redisURI, getDefaultTimeout()));
     }
 
     /**
@@ -393,17 +397,17 @@ private <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubS
         assertNotNull(codec);
         checkValidRedisURI(redisURI);
 
-        PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<>(clientOptions, clientResources);
+        PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<>(getOptions(), getResources());
         RedisChannelWriter writer = endpoint;
 
-        if (CommandExpiryWriter.isSupported(clientOptions)) {
-            writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
+        if (CommandExpiryWriter.isSupported(getOptions())) {
+            writer = new CommandExpiryWriter(writer, getOptions(), getResources());
         }
 
         StatefulRedisPubSubConnectionImpl<K, V> connection = newStatefulRedisPubSubConnection(endpoint, writer, codec, timeout);
 
         ConnectionFuture<StatefulRedisPubSubConnection<K, V>> future = connectStatefulAsync(connection, endpoint, redisURI,
-                () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec, endpoint));
+                () -> new PubSubCommandHandler<>(getOptions(), getResources(), codec, endpoint));
 
         return future.whenComplete((conn, throwable) -> {
 
@@ -433,7 +437,7 @@ public StatefulRedisSentinelConnection<String, String> connectSentinel() {
      */
     public <K, V> StatefulRedisSentinelConnection<K, V> connectSentinel(RedisCodec<K, V> codec) {
         checkForRedisURI();
-        return getConnection(connectSentinelAsync(codec, redisURI, timeout));
+        return getConnection(connectSentinelAsync(codec, redisURI, getDefaultTimeout()));
     }
 
     /**
@@ -547,13 +551,13 @@ private <K, V> ConnectionFuture<StatefulRedisSentinelConnection<K, V>> doConnect
 
         ConnectionBuilder connectionBuilder = ConnectionBuilder.connectionBuilder();
         connectionBuilder.clientOptions(ClientOptions.copyOf(getOptions()));
-        connectionBuilder.clientResources(clientResources);
+        connectionBuilder.clientResources(getResources());
 
-        DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions, clientResources);
+        DefaultEndpoint endpoint = new DefaultEndpoint(getOptions(), getResources());
         RedisChannelWriter writer = endpoint;
 
-        if (CommandExpiryWriter.isSupported(clientOptions)) {
-            writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
+        if (CommandExpiryWriter.isSupported(getOptions())) {
+            writer = new CommandExpiryWriter(writer, getOptions(), getResources());
         }
 
         StatefulRedisSentinelConnectionImpl<K, V> connection = newStatefulRedisSentinelConnection(writer, codec, timeout);
@@ -564,7 +568,7 @@ private <K, V> ConnectionFuture<StatefulRedisSentinelConnection<K, V>> doConnect
 
         logger.debug("Connecting to Redis Sentinel, address: " + redisURI);
 
-        connectionBuilder.endpoint(endpoint).commandHandler(() -> new CommandHandler(clientOptions, clientResources, endpoint))
+        connectionBuilder.endpoint(endpoint).commandHandler(() -> new CommandHandler(getOptions(), getResources(), endpoint))
                 .connection(connection);
         connectionBuilder(getSocketAddressSupplier(redisURI), connectionBuilder, redisURI);
 
@@ -591,15 +595,6 @@ public void setOptions(ClientOptions clientOptions) {
         super.setOptions(clientOptions);
     }
 
-    /**
-     * Returns the {@link ClientResources} which are used with that client.
-     *
-     * @return the {@link ClientResources} for this client
-     */
-    public ClientResources getResources() {
-        return clientResources;
-    }
-
     // -------------------------------------------------------------------------
     // Implementation hooks and helper methods
     // -------------------------------------------------------------------------
@@ -679,7 +674,7 @@ protected Mono<SocketAddress> getSocketAddress(RedisURI redisURI) {
                         "Cannot provide redisAddress using sentinel for masterId " + redisURI.getSentinelMasterId())));
 
             } else {
-                return Mono.fromCallable(() -> clientResources.socketAddressResolver().resolve((redisURI)));
+                return Mono.fromCallable(() -> getResources().socketAddressResolver().resolve((redisURI)));
             }
         });
     }
@@ -718,6 +713,8 @@ private Mono<SocketAddress> getSocketAddressSupplier(RedisURI redisURI) {
 
     private Mono<SocketAddress> lookupRedis(RedisURI sentinelUri) {
 
+        Duration timeout = getDefaultTimeout();
+
         Mono<StatefulRedisSentinelConnection<String, String>> connection = Mono
                 .fromCompletionStage(() -> connectSentinelAsync(newStringStringCodec(), sentinelUri, timeout));
 
@@ -729,7 +726,7 @@ private Mono<SocketAddress> lookupRedis(RedisURI sentinelUri) {
                 if (it instanceof InetSocketAddress) {
 
                     InetSocketAddress isa = (InetSocketAddress) it;
-                    SocketAddress resolved = clientResources.socketAddressResolver()
+                    SocketAddress resolved = getResources().socketAddressResolver()
                             .resolve(RedisURI.create(isa.getHostString(), isa.getPort()));
 
                     logger.debug("Resolved Master {} SocketAddress {}:{} to {}", sentinelMasterId, isa.getHostString(),
@@ -739,7 +736,7 @@ private Mono<SocketAddress> lookupRedis(RedisURI sentinelUri) {
                 }
 
                 return it;
-            }).timeout(this.timeout) //
+            }).timeout(timeout) //
                     .flatMap(it -> Mono.fromCompletionStage(c::closeAsync) //
                             .thenReturn(it));
         });
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 5038b30648..6667afa750 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -295,6 +295,52 @@ public static RedisClusterClient create(ClientResources clientResources, Iterabl
         return new RedisClusterClient(clientResources, redisURIs);
     }
 
+    /**
+     * Set the {@link ClusterClientOptions} for the client.
+     *
+     * @param clientOptions client options for the client and connections that are created after setting the options
+     */
+    public void setOptions(ClusterClientOptions clientOptions) {
+        super.setOptions(clientOptions);
+    }
+
+    /**
+     * Retrieve the cluster view. Partitions are shared amongst all connections opened by this client instance.
+     *
+     * @return the partitions.
+     */
+    public Partitions getPartitions() {
+        if (partitions == null) {
+            get(initializePartitions(), e -> new RedisException("Cannot obtain initial Redis Cluster topology", e));
+        }
+        return partitions;
+    }
+
+    /**
+     * Returns the seed {@link RedisURI} for the topology refreshing. This method is called before each topology refresh to
+     * provide an {@link Iterable} of {@link RedisURI} that is used to perform the next topology refresh.
+     * <p>
+     * Subclasses of {@link RedisClusterClient} may override that method.
+     *
+     * @return {@link Iterable} of {@link RedisURI} for the next topology refresh.
+     */
+    protected Iterable<RedisURI> getTopologyRefreshSource() {
+
+        boolean initialSeedNodes = !useDynamicRefreshSources();
+
+        Iterable<RedisURI> seed;
+        if (initialSeedNodes || partitions == null || partitions.isEmpty()) {
+            seed = this.initialUris;
+        } else {
+            List<RedisURI> uris = new ArrayList<>();
+            for (RedisClusterNode partition : TopologyComparators.sortByUri(partitions)) {
+                uris.add(partition.getUri());
+            }
+            seed = uris;
+        }
+        return seed;
+    }
+
     /**
      * Connect to a Redis Cluster and treat keys and values as UTF-8 strings.
      * <p>
@@ -472,18 +518,19 @@ <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisC
         assertNotEmpty(initialUris);
         LettuceAssert.notNull(socketAddressSupplier, "SocketAddressSupplier must not be null");
 
-        ClusterNodeEndpoint endpoint = new ClusterNodeEndpoint(clientOptions, getResources(), clusterWriter);
+        ClusterNodeEndpoint endpoint = new ClusterNodeEndpoint(getClusterClientOptions(), getResources(), clusterWriter);
 
         RedisChannelWriter writer = endpoint;
 
-        if (CommandExpiryWriter.isSupported(clientOptions)) {
-            writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
+        if (CommandExpiryWriter.isSupported(getClusterClientOptions())) {
+            writer = new CommandExpiryWriter(writer, getClusterClientOptions(), getResources());
         }
 
-        StatefulRedisConnectionImpl<K, V> connection = new StatefulRedisConnectionImpl<>(writer, codec, timeout);
+        StatefulRedisConnectionImpl<K, V> connection = new StatefulRedisConnectionImpl<>(writer, codec, getDefaultTimeout());
 
         ConnectionFuture<StatefulRedisConnection<K, V>> connectionFuture = connectStatefulAsync(connection, endpoint,
-                getFirstUri(), socketAddressSupplier, () -> new CommandHandler(clientOptions, clientResources, endpoint));
+                getFirstUri(), socketAddressSupplier,
+                () -> new CommandHandler(getClusterClientOptions(), getResources(), endpoint));
 
         return connectionFuture.whenComplete((conn, throwable) -> {
             if (throwable != null) {
@@ -512,20 +559,20 @@ <K, V> ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectPubSubToNode
 
         logger.debug("connectPubSubToNode(" + nodeId + ")");
 
-        PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<>(clientOptions, clientResources);
+        PubSubEndpoint<K, V> endpoint = new PubSubEndpoint<>(getClusterClientOptions(), getResources());
 
         RedisChannelWriter writer = endpoint;
 
-        if (CommandExpiryWriter.isSupported(clientOptions)) {
-            writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
+        if (CommandExpiryWriter.isSupported(getClusterClientOptions())) {
+            writer = new CommandExpiryWriter(writer, getClusterClientOptions(), getResources());
         }
 
         StatefulRedisPubSubConnectionImpl<K, V> connection = new StatefulRedisPubSubConnectionImpl<>(endpoint, writer, codec,
-                timeout);
+                getDefaultTimeout());
 
         ConnectionFuture<StatefulRedisPubSubConnection<K, V>> connectionFuture = connectStatefulAsync(connection, endpoint,
                 getFirstUri(), socketAddressSupplier,
-                () -> new PubSubCommandHandler<>(clientOptions, clientResources, codec, endpoint));
+                () -> new PubSubCommandHandler<>(getClusterClientOptions(), getResources(), codec, endpoint));
         return connectionFuture.whenComplete((conn, throwable) -> {
             if (throwable != null) {
                 connection.close();
@@ -554,14 +601,14 @@ private <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectCl
 
         Mono<SocketAddress> socketAddressSupplier = getSocketAddressSupplier(TopologyComparators::sortByClientCount);
 
-        DefaultEndpoint endpoint = new DefaultEndpoint(clientOptions, clientResources);
+        DefaultEndpoint endpoint = new DefaultEndpoint(getClusterClientOptions(), getResources());
         RedisChannelWriter writer = endpoint;
 
-        if (CommandExpiryWriter.isSupported(clientOptions)) {
-            writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
+        if (CommandExpiryWriter.isSupported(getClusterClientOptions())) {
+            writer = new CommandExpiryWriter(writer, getClusterClientOptions(), getResources());
         }
 
-        ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, writer,
+        ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(getClusterClientOptions(), writer,
                 topologyRefreshScheduler);
         PooledClusterConnectionProvider<K, V> pooledClusterConnectionProvider = new PooledClusterConnectionProvider<>(this,
                 clusterWriter, codec, topologyRefreshScheduler);
@@ -569,12 +616,13 @@ private <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectCl
         clusterWriter.setClusterConnectionProvider(pooledClusterConnectionProvider);
 
         StatefulRedisClusterConnectionImpl<K, V> connection = new StatefulRedisClusterConnectionImpl<>(clusterWriter, codec,
-                timeout);
+                getDefaultTimeout());
 
         connection.setReadFrom(ReadFrom.MASTER);
         connection.setPartitions(partitions);
 
-        Supplier<CommandHandler> commandHandlerSupplier = () -> new CommandHandler(clientOptions, clientResources, endpoint);
+        Supplier<CommandHandler> commandHandlerSupplier = () -> new CommandHandler(getClusterClientOptions(), getResources(),
+                endpoint);
 
         Mono<StatefulRedisClusterConnectionImpl<K, V>> connectionMono = Mono
                 .defer(() -> connect(socketAddressSupplier, endpoint, connection, commandHandlerSupplier));
@@ -637,18 +685,18 @@ private <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> con
 
         Mono<SocketAddress> socketAddressSupplier = getSocketAddressSupplier(TopologyComparators::sortByClientCount);
 
-        PubSubClusterEndpoint<K, V> endpoint = new PubSubClusterEndpoint<>(clientOptions, clientResources);
+        PubSubClusterEndpoint<K, V> endpoint = new PubSubClusterEndpoint<>(getClusterClientOptions(), getResources());
         RedisChannelWriter writer = endpoint;
 
-        if (CommandExpiryWriter.isSupported(clientOptions)) {
-            writer = new CommandExpiryWriter(writer, clientOptions, clientResources);
+        if (CommandExpiryWriter.isSupported(getClusterClientOptions())) {
+            writer = new CommandExpiryWriter(writer, getClusterClientOptions(), getResources());
         }
 
-        ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(clientOptions, writer,
+        ClusterDistributionChannelWriter clusterWriter = new ClusterDistributionChannelWriter(getClusterClientOptions(), writer,
                 topologyRefreshScheduler);
 
         StatefulRedisClusterPubSubConnectionImpl<K, V> connection = new StatefulRedisClusterPubSubConnectionImpl<>(endpoint,
-                clusterWriter, codec, timeout);
+                clusterWriter, codec, getDefaultTimeout());
 
         ClusterPubSubConnectionProvider<K, V> pooledClusterConnectionProvider = new ClusterPubSubConnectionProvider<>(this,
                 clusterWriter, codec, connection.getUpstreamListener(), topologyRefreshScheduler);
@@ -656,8 +704,8 @@ private <K, V> CompletableFuture<StatefulRedisClusterPubSubConnection<K, V>> con
         clusterWriter.setClusterConnectionProvider(pooledClusterConnectionProvider);
         connection.setPartitions(partitions);
 
-        Supplier<CommandHandler> commandHandlerSupplier = () -> new PubSubCommandHandler<>(clientOptions, clientResources,
-                codec, endpoint);
+        Supplier<CommandHandler> commandHandlerSupplier = () -> new PubSubCommandHandler<>(getClusterClientOptions(),
+                getResources(), codec, endpoint);
 
         Mono<StatefulRedisClusterPubSubConnectionImpl<K, V>> connectionMono = Mono
                 .defer(() -> connect(socketAddressSupplier, endpoint, connection, commandHandlerSupplier));
@@ -734,9 +782,9 @@ private <K, V> ConnectionBuilder createConnectionBuilder(RedisChannelHandler<K,
         connectionBuilder.connectionInitializer(createHandshake(state));
 
         connectionBuilder.reconnectionListener(new ReconnectEventListener(topologyRefreshScheduler));
-        connectionBuilder.clientOptions(clientOptions);
+        connectionBuilder.clientOptions(getClusterClientOptions());
         connectionBuilder.connection(connection);
-        connectionBuilder.clientResources(clientResources);
+        connectionBuilder.clientResources(getResources());
         connectionBuilder.endpoint(endpoint);
         connectionBuilder.commandHandler(commandHandlerSupplier);
         connectionBuilder(socketAddressSupplier, connectionBuilder, connectionSettings);
@@ -815,18 +863,6 @@ private void assertInitialPartitions() {
         }
     }
 
-    /**
-     * Retrieve the cluster view. Partitions are shared amongst all connections opened by this client instance.
-     *
-     * @return the partitions.
-     */
-    public Partitions getPartitions() {
-        if (partitions == null) {
-            get(initializePartitions(), e -> new RedisException("Cannot obtain initial Redis Cluster topology", e));
-        }
-        return partitions;
-    }
-
     /**
      * Retrieve partitions. Nodes within {@link Partitions} are ordered by latency. Lower latency nodes come first.
      *
@@ -892,17 +928,6 @@ protected CompletableFuture<Partitions> loadPartitionsAsync() {
         return future;
     }
 
-    private static Throwable unwrap(Throwable throwable) {
-
-        Throwable ex = throwable;
-
-        while (ex instanceof CompletionException || ex instanceof ExecutionException) {
-            ex = ex.getCause();
-        }
-
-        return ex;
-    }
-
     private CompletionStage<Partitions> fetchPartitions(Iterable<RedisURI> topologyRefreshSource) {
 
         CompletionStage<Map<RedisURI, Partitions>> topology = refresh.loadViews(topologyRefreshSource,
@@ -931,24 +956,6 @@ private CompletionStage<Partitions> fetchPartitions(Iterable<RedisURI> topologyR
         });
     }
 
-    /**
-     * Resolve a {@link RedisURI} from a map of cluster views by {@link Partitions} as key
-     *
-     * @param map the map
-     * @param partitions the key
-     * @return a {@link RedisURI} or null
-     */
-    private static RedisURI getViewedBy(Map<RedisURI, Partitions> map, Partitions partitions) {
-
-        for (Map.Entry<RedisURI, Partitions> entry : map.entrySet()) {
-            if (entry.getValue() == partitions) {
-                return entry.getKey();
-            }
-        }
-
-        return null;
-    }
-
     /**
      * Determines a {@link Partitions topology view} based on the current and the obtain topology views.
      *
@@ -974,15 +981,6 @@ public void setPartitions(Partitions partitions) {
         this.partitions = partitions;
     }
 
-    /**
-     * Returns the {@link ClientResources} which are used with that client.
-     *
-     * @return the {@link ClientResources} for this client
-     */
-    public ClientResources getResources() {
-        return clientResources;
-    }
-
     /**
      * Shutdown this client and close all open connections asynchronously. The client should be discarded after calling
      * shutdown.
@@ -1001,15 +999,6 @@ public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, Tim
         return super.shutdownAsync(quietPeriod, timeout, timeUnit);
     }
 
-    /**
-     * Set the {@link ClusterClientOptions} for the client.
-     *
-     * @param clientOptions client options for the client and connections that are created after setting the options
-     */
-    public void setOptions(ClusterClientOptions clientOptions) {
-        super.setOptions(clientOptions);
-    }
-
     // -------------------------------------------------------------------------
     // Implementation hooks and helper methods
     // -------------------------------------------------------------------------
@@ -1037,13 +1026,13 @@ protected Mono<SocketAddress> getSocketAddressSupplier(Function<Partitions, Coll
         LettuceAssert.notNull(sortFunction, "Sort function must not be null");
 
         final RoundRobinSocketAddressSupplier socketAddressSupplier = new RoundRobinSocketAddressSupplier(partitions,
-                sortFunction, clientResources);
+                sortFunction, getResources());
 
         return Mono.defer(() -> {
 
             if (partitions.isEmpty()) {
                 return Mono.fromCallable(() -> {
-                    SocketAddress socketAddress = clientResources.socketAddressResolver().resolve(getFirstUri());
+                    SocketAddress socketAddress = getResources().socketAddressResolver().resolve(getFirstUri());
                     logger.debug("Resolved SocketAddress {} using {}", socketAddress, getFirstUri());
                     return socketAddress;
                 });
@@ -1095,31 +1084,6 @@ protected <T extends Closeable> void forEachCloseable(Predicate<? super Closeabl
         }
     }
 
-    /**
-     * Returns the seed {@link RedisURI} for the topology refreshing. This method is called before each topology refresh to
-     * provide an {@link Iterable} of {@link RedisURI} that is used to perform the next topology refresh.
-     * <p>
-     * Subclasses of {@link RedisClusterClient} may override that method.
-     *
-     * @return {@link Iterable} of {@link RedisURI} for the next topology refresh.
-     */
-    protected Iterable<RedisURI> getTopologyRefreshSource() {
-
-        boolean initialSeedNodes = !useDynamicRefreshSources();
-
-        Iterable<RedisURI> seed;
-        if (initialSeedNodes || partitions == null || partitions.isEmpty()) {
-            seed = this.initialUris;
-        } else {
-            List<RedisURI> uris = new ArrayList<>();
-            for (RedisClusterNode partition : TopologyComparators.sortByUri(partitions)) {
-                uris.add(partition.getUri());
-            }
-            seed = uris;
-        }
-        return seed;
-    }
-
     /**
      * Returns {@literal true} if {@link ClusterTopologyRefreshOptions#useDynamicRefreshSources() dynamic refresh sources} are
      * enabled.
@@ -1146,6 +1110,35 @@ protected RedisCodec<String, String> newStringStringCodec() {
         return StringCodec.UTF8;
     }
 
+    /**
+     * Resolve a {@link RedisURI} from a map of cluster views by {@link Partitions} as key
+     *
+     * @param map the map
+     * @param partitions the key
+     * @return a {@link RedisURI} or null
+     */
+    private static RedisURI getViewedBy(Map<RedisURI, Partitions> map, Partitions partitions) {
+
+        for (Map.Entry<RedisURI, Partitions> entry : map.entrySet()) {
+            if (entry.getValue() == partitions) {
+                return entry.getKey();
+            }
+        }
+
+        return null;
+    }
+
+    private static Throwable unwrap(Throwable throwable) {
+
+        Throwable ex = throwable;
+
+        while (ex instanceof CompletionException || ex instanceof ExecutionException) {
+            ex = ex.getCause();
+        }
+
+        return ex;
+    }
+
     ClusterClientOptions getClusterClientOptions() {
         return (ClusterClientOptions) getOptions();
     }

From a2530194355094de176d9e6cbf5ea35342b9b886 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Fri, 13 Mar 2020 10:56:02 +0100
Subject: [PATCH 760/808] Fix return type of randomkey #1240

The return type of randomkey now uses the key type. Previously the return value was declared as value type.
---
 .../io/lettuce/core/AbstractRedisAsyncCommands.java  |  2 +-
 .../lettuce/core/AbstractRedisReactiveCommands.java  |  2 +-
 .../java/io/lettuce/core/RedisCommandBuilder.java    |  4 ++--
 .../core/api/async/RedisKeyAsyncCommands.java        |  4 ++--
 .../core/api/reactive/RedisKeyReactiveCommands.java  |  4 ++--
 .../io/lettuce/core/api/sync/RedisKeyCommands.java   |  4 ++--
 .../RedisAdvancedClusterAsyncCommandsImpl.java       |  4 ++--
 .../RedisAdvancedClusterReactiveCommandsImpl.java    |  2 +-
 .../api/async/NodeSelectionKeyAsyncCommands.java     |  4 ++--
 .../api/async/RedisAdvancedClusterAsyncCommands.java |  4 ++--
 .../RedisAdvancedClusterReactiveCommands.java        |  4 ++--
 .../cluster/api/sync/NodeSelectionKeyCommands.java   |  4 ++--
 .../api/sync/RedisAdvancedClusterCommands.java       | 12 ++++++------
 .../io/lettuce/core/api/RedisKeyCommands.java        |  4 ++--
 14 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 45ac299640..dda5d71ab7 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -1065,7 +1065,7 @@ public RedisFuture<String> quit() {
     }
 
     @Override
-    public RedisFuture<V> randomkey() {
+    public RedisFuture<K> randomkey() {
         return dispatch(commandBuilder.randomkey());
     }
 
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 3aeb450c7a..2a95dfc314 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -1147,7 +1147,7 @@ public Mono<String> quit() {
     }
 
     @Override
-    public Mono<V> randomkey() {
+    public Mono<K> randomkey() {
         return createMono(commandBuilder::randomkey);
     }
 
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index f885544366..72e47e0623 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -1494,8 +1494,8 @@ Command<K, V, String> quit() {
         return createCommand(QUIT, new StatusOutput<>(codec));
     }
 
-    Command<K, V, V> randomkey() {
-        return createCommand(RANDOMKEY, new ValueOutput<>(codec));
+    Command<K, V, K> randomkey() {
+        return createCommand(RANDOMKEY, new KeyOutput<>(codec));
     }
 
     Command<K, V, String> readOnly() {
diff --git a/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
index db9fbd682f..8550b6b6a6 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
@@ -235,9 +235,9 @@ public interface RedisKeyAsyncCommands<K, V> {
     /**
      * Return a random key from the keyspace.
      *
-     * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
+     * @return K bulk-string-reply the random key, or {@literal null} when the database is empty.
      */
-    RedisFuture<V> randomkey();
+    RedisFuture<K> randomkey();
 
     /**
      * Rename a key.
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
index d12b5a60aa..0078c708c1 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisKeyReactiveCommands.java
@@ -236,9 +236,9 @@ public interface RedisKeyReactiveCommands<K, V> {
     /**
      * Return a random key from the keyspace.
      *
-     * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
+     * @return K bulk-string-reply the random key, or {@literal null} when the database is empty.
      */
-    Mono<V> randomkey();
+    Mono<K> randomkey();
 
     /**
      * Rename a key.
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
index 6003e7e412..609964f9eb 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisKeyCommands.java
@@ -235,9 +235,9 @@ public interface RedisKeyCommands<K, V> {
     /**
      * Return a random key from the keyspace.
      *
-     * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
+     * @return K bulk-string-reply the random key, or {@literal null} when the database is empty.
      */
-    V randomkey();
+    K randomkey();
 
     /**
      * Rename a key.
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
index 244d11d3e5..7f96928d86 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -392,13 +392,13 @@ public RedisFuture<Boolean> msetnx(Map<K, V> map) {
     }
 
     @Override
-    public RedisFuture<V> randomkey() {
+    public RedisFuture<K> randomkey() {
 
         Partitions partitions = getStatefulConnection().getPartitions();
         int index = ThreadLocalRandom.current().nextInt(partitions.size());
         RedisClusterNode partition = partitions.getPartition(index);
 
-        CompletableFuture<V> future = getConnectionAsync(partition.getUri().getHost(), partition.getUri().getPort())
+        CompletableFuture<K> future = getConnectionAsync(partition.getUri().getHost(), partition.getUri().getPort())
                 .thenCompose(RedisKeyAsyncCommands::randomkey);
 
         return new PipelinedRedisFuture<>(future);
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
index 88f2addf78..bcadbd85c1 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java
@@ -347,7 +347,7 @@ public Mono<String> mset(Map<K, V> map) {
     }
 
     @Override
-    public Mono<V> randomkey() {
+    public Mono<K> randomkey() {
 
         Partitions partitions = getStatefulConnection().getPartitions();
         int index = ThreadLocalRandom.current().nextInt(partitions.size());
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
index ac88efaf1c..635c6adeb8 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionKeyAsyncCommands.java
@@ -235,9 +235,9 @@ public interface NodeSelectionKeyAsyncCommands<K, V> {
     /**
      * Return a random key from the keyspace.
      *
-     * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
+     * @return K bulk-string-reply the random key, or {@literal null} when the database is empty.
      */
-    AsyncExecutions<V> randomkey();
+    AsyncExecutions<K> randomkey();
 
     /**
      * Rename a key.
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
index f0bbecb01e..48720453ea 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisAdvancedClusterAsyncCommands.java
@@ -272,10 +272,10 @@ default AsyncNodeSelection<K, V> all() {
     /**
      * Return a random key from the keyspace on a random master.
      *
-     * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
+     * @return K bulk-string-reply the random key, or {@literal null} when the database is empty.
      * @see RedisKeyAsyncCommands#randomkey()
      */
-    RedisFuture<V> randomkey();
+    RedisFuture<K> randomkey();
 
     /**
      * Remove all the scripts from the script cache on all cluster nodes.
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
index 0be3d7811e..f1299232f5 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisAdvancedClusterReactiveCommands.java
@@ -178,10 +178,10 @@ public interface RedisAdvancedClusterReactiveCommands<K, V> extends RedisCluster
     /**
      * Return a random key from the keyspace on a random master.
      *
-     * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
+     * @return K bulk-string-reply the random key, or a {@link Mono} that completes empty when the database is empty.
      * @see RedisKeyReactiveCommands#randomkey()
      */
-    Mono<V> randomkey();
+    Mono<K> randomkey();
 
     /**
      * Remove all the scripts from the script cache on all cluster nodes.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
index 221a8e2366..27ee2a7bfc 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionKeyCommands.java
@@ -235,9 +235,9 @@ public interface NodeSelectionKeyCommands<K, V> {
     /**
      * Return a random key from the keyspace.
      *
-     * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
+     * @return K bulk-string-reply the random key, or {@literal null} when the database is empty.
      */
-    Executions<V> randomkey();
+    Executions<K> randomkey();
 
     /**
      * Rename a key.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
index bf56a2f536..65b180cee3 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisAdvancedClusterCommands.java
@@ -93,8 +93,8 @@ default NodeSelection<K, V> slaves() {
      */
     @Deprecated
     default NodeSelection<K, V> slaves(Predicate<RedisClusterNode> predicate) {
-        return readonly(redisClusterNode -> predicate.test(redisClusterNode)
-                && redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
+        return readonly(
+                redisClusterNode -> predicate.test(redisClusterNode) && redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
     }
 
     /**
@@ -115,8 +115,8 @@ default NodeSelection<K, V> replicas() {
      * @since 5.2
      */
     default NodeSelection<K, V> replicas(Predicate<RedisClusterNode> predicate) {
-        return readonly(redisClusterNode -> predicate.test(redisClusterNode)
-                && redisClusterNode.is(RedisClusterNode.NodeFlag.REPLICA));
+        return readonly(
+                redisClusterNode -> predicate.test(redisClusterNode) && redisClusterNode.is(RedisClusterNode.NodeFlag.REPLICA));
     }
 
     /**
@@ -270,10 +270,10 @@ default NodeSelection<K, V> all() {
     /**
      * Return a random key from the keyspace on a random master.
      *
-     * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
+     * @return K bulk-string-reply the random key, or {@literal null} when the database is empty.
      * @see RedisKeyCommands#randomkey()
      */
-    V randomkey();
+    K randomkey();
 
     /**
      * Remove all the scripts from the script cache on all cluster nodes.
diff --git a/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java b/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
index 0cb6caa23a..7051ee116f 100644
--- a/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
+++ b/src/main/templates/io/lettuce/core/api/RedisKeyCommands.java
@@ -234,9 +234,9 @@ public interface RedisKeyCommands<K, V> {
     /**
      * Return a random key from the keyspace.
      *
-     * @return V bulk-string-reply the random key, or {@literal null} when the database is empty.
+     * @return K bulk-string-reply the random key, or {@literal null} when the database is empty.
      */
-    V randomkey();
+    K randomkey();
 
     /**
      * Rename a key.

From efed1c6f65b22bdc665b9555b70900119751c48d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 19 Mar 2020 11:18:47 +0100
Subject: [PATCH 761/808] Update issue templates

---
 .github/ISSUE_TEMPLATE/Support_question.md | 21 ---------------------
 .github/ISSUE_TEMPLATE/config.yml          |  4 ++++
 2 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/Support_question.md
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

diff --git a/.github/ISSUE_TEMPLATE/Support_question.md b/.github/ISSUE_TEMPLATE/Support_question.md
deleted file mode 100644
index 7803d13054..0000000000
--- a/.github/ISSUE_TEMPLATE/Support_question.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: Support Question
-about: If you have a question 💬, please check out Gitter, Stack Overflow, or post it to the mailing list! Do not post them here.
-labels: 'for: stackoverflow'
----
-
-We primarily use GitHub as an issue tracker; for usage and support questions, please check out these resources below. Thanks! 😁.
-
-Support questions will be closed immediately.
-
----
-
-* Reference documentation: https://lettuce.io/docs/
-* Wiki: https://github.com/lettuce-io/lettuce-core/wiki
-* Javadoc: https://lettuce.io/core/release/api/
-* Gitter Chat (General discussion): https://gitter.im/lettuce-io/Lobby
-* Google Group/Mailing List (General discussion, announcements and releases): [https://groups.google.com/d/forum/lettuce-redis-client-users](https://groups.google.com/d/forum/lettuce-redis-client-users) or [lettuce-redis-client-users@googlegroups.com](mailto:lettuce-redis-client-users@googlegroups.com)
-* Stack Overflow (Questions): https://stackoverflow.com/questions/tagged/lettuce
-* Twitter: If it's just a quick question you can ping our Twitter: https://twitter.com/LettuceDriver
-* Also have a look at the readme for more information on how to get support:
-  https://github.com/lettuce-io/lettuce-core/blob/master/README.md
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..7f4b5ba46b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,4 @@
+contact_links:
+  - name: Questions
+    url: https://gitter.im/lettuce-io/Lobby
+    about: Please ask questions on Gitter or StackOverflow.

From dedb57ee807388af8e3ef333cf733df79432cfab Mon Sep 17 00:00:00 2001
From: Mingyuan <my.wu@outlook.com>
Date: Sun, 22 Mar 2020 00:33:32 +0800
Subject: [PATCH 762/808] Upgrade netty to 4.1.47.Final #1239

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f1e2d49354..08edc8aae0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
         <junit-version>5.6.0</junit-version>
         <log4j2-version>2.13.0</log4j2-version>
         <mockito.version>3.2.4</mockito.version>
-        <netty-version>4.1.45.Final</netty-version>
+        <netty-version>4.1.47.Final</netty-version>
         <reactor-version>3.3.2.RELEASE</reactor-version>
         <reactive-streams-tck.version>1.0.3</reactive-streams-tck.version>
         <slf4j.version>1.7.25</slf4j.version>

From 71632e3196ff67a635fe34254466c75e124985c9 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Sat, 21 Mar 2020 01:57:26 +0200
Subject: [PATCH 763/808] Retrieve username from URI when RedisURI is built
 from URL #1242

---
 src/main/java/io/lettuce/core/RedisURI.java           | 11 ++++++++++-
 .../io/lettuce/core/RedisURIBuilderUnitTests.java     |  4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 62e7327a01..3716595351 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -567,17 +567,23 @@ private static RedisURI buildRedisUriFromUri(URI uri) {
 
         if (isNotEmpty(userInfo)) {
             String password = userInfo;
+            String username = null;
             if (password.startsWith(":")) {
                 password = password.substring(1);
             } else {
 
                 int index = password.indexOf(':');
                 if (index > 0) {
+                    username = password.substring(0, index);
                     password = password.substring(index + 1);
                 }
             }
             if (LettuceStrings.isNotEmpty(password)) {
-                builder.withPassword(password);
+                if(username == null) { 
+                  builder.withPassword(password);
+                } else {
+                  builder.withAuthentication(username, password);
+                }
             }
         }
 
@@ -654,6 +660,9 @@ private String getAuthority(String scheme) {
         if (password != null && password.length != 0) {
             authority = urlEncode(new String(password)) + "@" + authority;
         }
+        if (username != null) {
+            authority = urlEncode(username) + ":" + authority;
+        }
         return authority;
     }
 
diff --git a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
index 268cd2201e..a4f1994191 100644
--- a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
@@ -112,15 +112,18 @@ void redisFromUrl() {
     void redisFromUrlNoPassword() {
         RedisURI redisURI = RedisURI.create("redis://localhost:1234/5");
         assertThat(redisURI.getPassword()).isNull();
+        assertThat(redisURI.getUsername()).isNull();
 
         redisURI = RedisURI.create("redis://h:@localhost.com:14589");
         assertThat(redisURI.getPassword()).isNull();
+        assertThat(redisURI.getUsername()).isNull();
     }
 
     @Test
     void redisFromUrlPassword() {
         RedisURI redisURI = RedisURI.create("redis://h:password@localhost.com:14589");
         assertThat(redisURI.getPassword()).isEqualTo("password".toCharArray());
+        assertThat(redisURI.getUsername()).isEqualTo("h");
     }
 
     @Test
@@ -141,6 +144,7 @@ void redisSslFromUrl() {
         assertThat(result.getHost()).isEqualTo("localhost");
         assertThat(result.getPort()).isEqualTo(RedisURI.DEFAULT_REDIS_PORT);
         assertThat(result.getPassword()).isEqualTo("password".toCharArray());
+        assertThat(result.getUsername()).isNull();
         assertThat(result.isSsl()).isTrue();
     }
 

From 904447abc1a3317783e84f64e015f1503db2af81 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 21 Mar 2020 17:39:29 +0100
Subject: [PATCH 764/808] Polishing #1242

Add author tags. Reformat code.
---
 src/main/java/io/lettuce/core/RedisURI.java                | 7 ++++---
 .../java/io/lettuce/core/RedisURIBuilderUnitTests.java     | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 3716595351..240244e48d 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -118,6 +118,7 @@
  * RedisURI supports Redis Standalone, Redis Sentinel and Redis Cluster with plain, SSL, TLS and unix domain socket connections.
  *
  * @author Mark Paluch
+ * @author Guy Korland
  * @since 3.0
  */
 @SuppressWarnings("serial")
@@ -579,10 +580,10 @@ private static RedisURI buildRedisUriFromUri(URI uri) {
                 }
             }
             if (LettuceStrings.isNotEmpty(password)) {
-                if(username == null) { 
-                  builder.withPassword(password);
+                if (username == null) {
+                    builder.withPassword(password);
                 } else {
-                  builder.withAuthentication(username, password);
+                    builder.withAuthentication(username, password);
                 }
             }
         }
diff --git a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
index a4f1994191..d6695434af 100644
--- a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
@@ -31,6 +31,7 @@
  * Unit tests for {@link RedisURI.Builder}.
  *
  * @author Mark Paluch
+ * @author Guy Korland
  */
 class RedisURIBuilderUnitTests {
 

From 2be8108b541167a4f8e553417a9d800de8b8ea27 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Mar 2020 19:39:20 +0100
Subject: [PATCH 765/808] Extend build config to build against multiple Java
 versions #1247

---
 .travis.yml | 50 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a262e267dd..59381116cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,43 @@
 dist: xenial
 
-language: java
+os: linux
 
-env:
-  matrix:
-    - REDIS=unstable
-    - PROFILE=jmh
-    - REDIS=5.0
-    - REDIS=4.0.11
-    - REDIS=3.2.11
+language: java
 
-sudo: false
+jobs:
+  include:
+    - jdk: openjdk8
+      env:
+        - JDK='OpenJDK 8'
+        - REDIS=unstable
+    - jdk: openjdk8
+      env:
+        - JDK='OpenJDK 8'
+        - REDIS=jmh
+    - jdk: openjdk8
+      env:
+        - JDK='OpenJDK 8'
+        - REDIS=5.0.8
+    - jdk: openjdk8
+      env:
+        - JDK='OpenJDK 8'
+        - REDIS=4.0.14
+    - jdk: openjdk8
+      env:
+        - JDK='OpenJDK 8'
+        - REDIS=3.2.13
+    - jdk: openjdk11
+      env: JDK='OpenJDK 11'
+    - env: JDK='OpenJDK 12'
+      before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 12
+    - env: JDK='OpenJDK 13'
+      before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 13
+    - env: JDK='OpenJDK 14'
+      before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 14
+    - env: JDK='OpenJDK EA'
+      before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh
+  allow_failures:
+    - env: JDK='OpenJDK EA'
 
 before_install:
   - if [[ ! -f downloads/stunnel-5.54.tar.gz ]]; then wget -O downloads/stunnel-5.54.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.54.tar.gz; fi
@@ -28,8 +55,8 @@ after_success:
 cache:
   directories:
     - '$HOME/.m2/repository'
-    - '$TRAVIS_BUILD_DIR/downloads'
-    - '$TRAVIS_BUILD_DIR/stunnel-5.54'
+    - 'downloads'
+    - 'stunnel-5.54'
 
 notifications:
   webhooks:
@@ -37,4 +64,3 @@ notifications:
       - https://webhooks.gitter.im/e/7c2a962829d225c47a31
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false

From 9ac43f3182a73e5dcf973fb8eb4587980d2c864b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 26 Mar 2020 19:44:49 +0100
Subject: [PATCH 766/808] Upgrade to stunnel 5.56 #1246

---
 .travis.yml | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 59381116cd..c268cad67e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,19 +13,23 @@ jobs:
     - jdk: openjdk8
       env:
         - JDK='OpenJDK 8'
-        - REDIS=jmh
+        - PROFILE=jmh
     - jdk: openjdk8
       env:
         - JDK='OpenJDK 8'
-        - REDIS=5.0.8
+        - REDIS=6.0
     - jdk: openjdk8
       env:
         - JDK='OpenJDK 8'
-        - REDIS=4.0.14
+        - REDIS=5.0
     - jdk: openjdk8
       env:
         - JDK='OpenJDK 8'
-        - REDIS=3.2.13
+        - REDIS=4.0
+    - jdk: openjdk8
+      env:
+        - JDK='OpenJDK 8'
+        - REDIS=3.2
     - jdk: openjdk11
       env: JDK='OpenJDK 11'
     - env: JDK='OpenJDK 12'
@@ -39,13 +43,12 @@ jobs:
   allow_failures:
     - env: JDK='OpenJDK EA'
 
-before_install:
-  - if [[ ! -f downloads/stunnel-5.54.tar.gz ]]; then wget -O downloads/stunnel-5.54.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.54.tar.gz; fi
-  - if [[ ! -f ./stunnel-5.54/configure ]]; then tar -xzf downloads/stunnel-5.54.tar.gz; fi
-  - if [[ ! -f ./stunnel-5.54/src/stunnel ]]; then cd ./stunnel-5.54; ./configure; make; cd ..; fi
-  - export PATH="$PATH:$(pwd)/stunnel-5.54/src"
-
-install: make prepare ssl-keys
+install:
+  - if [[ ! -f downloads/stunnel-5.56.tar.gz ]]; then wget -O downloads/stunnel-5.56.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.56.tar.gz; fi
+  - if [[ ! -f ./stunnel-5.56/configure ]]; then tar -xzf downloads/stunnel-5.56.tar.gz; fi
+  - if [[ ! -f ./stunnel-5.56/src/stunnel ]]; then cd ./stunnel-5.56; ./configure; make; cd ..; fi
+  - export PATH="$PATH:$(pwd)/stunnel-5.56/src"
+  - make prepare ssl-keys
 
 script: make test-coverage PROFILE=${PROFILE:-ci}
 
@@ -56,7 +59,7 @@ cache:
   directories:
     - '$HOME/.m2/repository'
     - 'downloads'
-    - 'stunnel-5.54'
+    - 'stunnel-5.56'
 
 notifications:
   webhooks:

From 5f4dde5b477bed7b7dd213877febf5cbc060fd8b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 1 Apr 2020 09:22:37 +0200
Subject: [PATCH 767/808] Use read-only view when consuming Partitions #1252

The node-selection API now uses the read-only view instead of the mutable partitions view when consuming the topology view.
---
 src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java | 2 +-
 .../core/cluster/RedisClusterPubSubAsyncCommandsImpl.java       | 2 +-
 .../core/cluster/RedisClusterPubSubReactiveCommandsImpl.java    | 2 +-
 src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java b/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
index 7b0087a86d..1a33a072a3 100644
--- a/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/DynamicNodeSelection.java
@@ -66,6 +66,6 @@ protected CompletableFuture<API> getApi(RedisClusterNode redisClusterNode) {
 
     @Override
     protected List<RedisClusterNode> nodes() {
-        return writer.getPartitions().getPartitions().stream().filter(selector).collect(Collectors.toList());
+        return writer.getPartitions().stream().filter(selector).collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
index 1a3b1e2c38..959e30ef35 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubAsyncCommandsImpl.java
@@ -131,7 +131,7 @@ private static class StaticPubSubAsyncNodeSelection<K, V>
         public StaticPubSubAsyncNodeSelection(StatefulRedisClusterPubSubConnection<K, V> globalConnection,
                 Predicate<RedisClusterNode> selector) {
 
-            this.redisClusterNodes = globalConnection.getPartitions().getPartitions().stream().filter(selector)
+            this.redisClusterNodes = globalConnection.getPartitions().stream().filter(selector)
                     .collect(Collectors.toList());
             writer = ((StatefulRedisClusterPubSubConnectionImpl) globalConnection).getClusterDistributionChannelWriter();
         }
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
index 8afa7fe51e..218b538270 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterPubSubReactiveCommandsImpl.java
@@ -130,7 +130,7 @@ private static class StaticPubSubReactiveNodeSelection<K, V>
         public StaticPubSubReactiveNodeSelection(StatefulRedisClusterPubSubConnection<K, V> globalConnection,
                 Predicate<RedisClusterNode> selector) {
 
-            this.redisClusterNodes = globalConnection.getPartitions().getPartitions().stream().filter(selector)
+            this.redisClusterNodes = globalConnection.getPartitions().stream().filter(selector)
                     .collect(Collectors.toList());
             writer = ((StatefulRedisClusterPubSubConnectionImpl) globalConnection).getClusterDistributionChannelWriter();
         }
diff --git a/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java b/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
index f3e2dddb40..b3c6f5c0d7 100644
--- a/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
+++ b/src/main/java/io/lettuce/core/cluster/StaticNodeSelection.java
@@ -48,7 +48,7 @@ public StaticNodeSelection(ClusterDistributionChannelWriter writer, Predicate<Re
         this.intent = intent;
         this.apiExtractor = apiExtractor;
 
-        this.redisClusterNodes = writer.getPartitions().getPartitions().stream().filter(selector).collect(Collectors.toList());
+        this.redisClusterNodes = writer.getPartitions().stream().filter(selector).collect(Collectors.toList());
     }
 
     @Override

From 2e508bc5ed863c1e502027a97a4f3ac1da48d54d Mon Sep 17 00:00:00 2001
From: Tugdual Grall <tugdual@gmail.com>
Date: Sun, 29 Mar 2020 07:27:45 +0200
Subject: [PATCH 768/808] Add auth command support for username and password
 #1202

Original pull request: #1249.
---
 .../core/AbstractRedisAsyncCommands.java      | 13 ++++
 .../core/AbstractRedisReactiveCommands.java   |  5 ++
 .../java/io/lettuce/core/ConnectionState.java |  4 +
 .../java/io/lettuce/core/MigrateArgs.java     |  1 +
 .../io/lettuce/core/RedisCommandBuilder.java  | 23 ++++++
 .../java/io/lettuce/core/RedisHandshake.java  |  5 +-
 .../core/api/async/RedisAsyncCommands.java    |  9 +++
 .../api/reactive/RedisReactiveCommands.java   |  9 +++
 .../lettuce/core/api/sync/RedisCommands.java  |  9 +++
 .../api/async/RedisClusterAsyncCommands.java  |  9 +++
 .../RedisClusterReactiveCommands.java         |  9 +++
 .../api/sync/RedisClusterCommands.java        |  9 +++
 .../core/ClientOptionsIntegrationTests.java   | 14 ++++
 .../ConnectionCommandIntegrationTests.java    | 74 ++++++++++++++++++-
 .../ReactiveConnectionIntegrationTests.java   | 11 +++
 .../java/io/lettuce/core/TestSupport.java     |  4 +
 .../core/pubsub/PubSubCommandTest.java        | 17 ++++-
 .../io/lettuce/examples/ConnectToRedis.java   |  1 +
 .../examples/ConnectToRedisCluster.java       |  1 +
 .../java/io/lettuce/test/WithPassword.java    | 26 ++++++-
 .../lettuce/test/settings/TestSettings.java   | 27 +++++++
 21 files changed, 274 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index dda5d71ab7..94cd215614 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -86,6 +86,19 @@ public RedisFuture<String> auth(char[] password) {
         return dispatch(commandBuilder.auth(password));
     }
 
+    @Override
+    public RedisFuture<String> auth(String username, CharSequence password) {
+        LettuceAssert.notNull(username, "Username must not be null");
+        LettuceAssert.notNull(password, "Password must not be null");
+        return dispatch(commandBuilder.auth(username, password));
+    }
+
+    public RedisFuture<String> auth(String username, char[] password) {
+        LettuceAssert.notNull(username, "Username must not be null");
+        LettuceAssert.notNull(password, "Password must not be null");
+        return dispatch(commandBuilder.auth(username, password));
+    }
+
     @Override
     public RedisFuture<String> bgrewriteaof() {
         return dispatch(commandBuilder.bgrewriteaof());
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 2a95dfc314..54dae38b2f 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -109,6 +109,11 @@ public Mono<String> auth(CharSequence password) {
         return createMono(() -> commandBuilder.auth(password));
     }
 
+    @Override
+    public Mono<String> auth(String username, CharSequence password) {
+        return createMono(() -> commandBuilder.auth(username, password));
+    }
+
     @Override
     public Mono<String> bgrewriteaof() {
         return createMono(commandBuilder::bgrewriteaof);
diff --git a/src/main/java/io/lettuce/core/ConnectionState.java b/src/main/java/io/lettuce/core/ConnectionState.java
index ece09da4c8..25bfc06d41 100644
--- a/src/main/java/io/lettuce/core/ConnectionState.java
+++ b/src/main/java/io/lettuce/core/ConnectionState.java
@@ -115,6 +115,10 @@ boolean hasPassword() {
         return this.password != null && this.password.length > 0;
     }
 
+    boolean hasUsername() {
+        return this.username != null && !this.username.isEmpty();
+    }
+
     protected void setDb(int db) {
         this.db = db;
     }
diff --git a/src/main/java/io/lettuce/core/MigrateArgs.java b/src/main/java/io/lettuce/core/MigrateArgs.java
index 2286ea9fba..8d284bf217 100644
--- a/src/main/java/io/lettuce/core/MigrateArgs.java
+++ b/src/main/java/io/lettuce/core/MigrateArgs.java
@@ -112,6 +112,7 @@ public static <K> MigrateArgs<K> keys(Iterable<K> keys) {
          * @see MigrateArgs#auth(CharSequence)
          */
         public static <K> MigrateArgs<K> auth(CharSequence password) {
+            // TODO : implement auth(username,password) when https://github.com/antirez/redis/pull/7035 is fixed
             return new MigrateArgs<K>().auth(password);
         }
 
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 72e47e0623..9055ccbcef 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -81,6 +81,29 @@ Command<K, V, String> auth(char[] password) {
         return createCommand(AUTH, new StatusOutput<>(codec), args);
     }
 
+    Command<K, V, String> auth(String username, CharSequence password) {
+        LettuceAssert.notNull(username, "Username " + MUST_NOT_BE_NULL);
+        LettuceAssert.isTrue(!username.isEmpty(), "Username " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.notNull(password, "Password " + MUST_NOT_BE_NULL);
+        LettuceAssert.notEmpty(password, "Password " + MUST_NOT_BE_EMPTY);
+
+        char[] chars = new char[password.length()];
+        for (int i = 0; i < password.length(); i++) {
+            chars[i] = password.charAt(i);
+        }
+        return auth(username,chars);
+    }
+
+    Command<K, V, String> auth(String username, char[] password) {
+        LettuceAssert.notNull(username, "Username " + MUST_NOT_BE_NULL);
+        LettuceAssert.isTrue(!username.isEmpty(), "Username " + MUST_NOT_BE_EMPTY);
+        LettuceAssert.notNull(password, "Password " + MUST_NOT_BE_NULL);
+        LettuceAssert.isTrue(password.length > 0, "Password " + MUST_NOT_BE_EMPTY);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(username).add(password);
+        return createCommand(AUTH, new StatusOutput<>(codec), args);
+    }
+
     Command<K, V, String> bgrewriteaof() {
         return createCommand(BGREWRITEAOF, new StatusOutput<>(codec));
     }
diff --git a/src/main/java/io/lettuce/core/RedisHandshake.java b/src/main/java/io/lettuce/core/RedisHandshake.java
index 2d802ee467..1b96a4eac3 100644
--- a/src/main/java/io/lettuce/core/RedisHandshake.java
+++ b/src/main/java/io/lettuce/core/RedisHandshake.java
@@ -151,8 +151,9 @@ private CompletableFuture<Void> initializeResp3(Channel channel) {
      * @return
      */
     private CompletableFuture<?> initiateHandshakeResp2(Channel channel) {
-
-        if (connectionState.hasPassword()) {
+        if (connectionState.hasUsername()) {
+            return dispatch(channel, this.commandBuilder.auth(connectionState.getUsername() ,connectionState.getPassword()));
+        } else if (connectionState.hasPassword()) {
             return dispatch(channel, this.commandBuilder.auth(connectionState.getPassword()));
         } else if (this.pingOnConnect) {
             return dispatch(channel, this.commandBuilder.ping());
diff --git a/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
index c877319dc4..a2abc70caf 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
@@ -41,6 +41,15 @@ public interface RedisAsyncCommands<K, V> extends BaseRedisAsyncCommands<K, V>,
      */
     RedisFuture<String> auth(CharSequence password);
 
+    /**
+     * Authenticate to the server.
+     *
+     * @param username the username
+     * @param password the password
+     * @return String simple-string-reply
+     */
+    RedisFuture<String> auth(String username, CharSequence password);
+
     /**
      * Change the selected database for the current connection.
      *
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
index b67a040971..1f31717b1a 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
@@ -41,6 +41,15 @@ public interface RedisReactiveCommands<K, V> extends BaseRedisReactiveCommands<K
      */
     Mono<String> auth(CharSequence password);
 
+    /**
+     * Authenticate to the server.
+     *
+     * @param username the username
+     * @param password the password
+     * @return String simple-string-reply
+     */
+    Mono<String> auth(String username, CharSequence password);
+
     /**
      * Change the selected database for the current connection.
      *
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
index d092054071..25885a8e17 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
@@ -32,6 +32,15 @@ public interface RedisCommands<K, V> extends BaseRedisCommands<K, V>, RedisClust
         RedisScriptingCommands<K, V>, RedisServerCommands<K, V>, RedisSetCommands<K, V>, RedisSortedSetCommands<K, V>,
         RedisStreamCommands<K, V>, RedisStringCommands<K, V>, RedisTransactionalCommands<K, V> {
 
+    /**
+     * Authenticate to the server with username and password.
+     *
+     * @param username the username
+     * @param password the password
+     * @return String simple-string-reply
+     */
+    String auth(String username, CharSequence password);
+
     /**
      * Authenticate to the server.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
index ba4085b7ff..49b4d39a55 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
@@ -53,6 +53,15 @@ public interface RedisClusterAsyncCommands<K, V> extends BaseRedisAsyncCommands<
      */
     RedisFuture<String> auth(CharSequence password);
 
+    /**
+     * Authenticate to the server.
+     *
+     * @param username the username
+     * @param password the password
+     * @return String simple-string-reply
+     */
+    RedisFuture<String> auth(String username, CharSequence password);
+
     /**
      * Generate a new config epoch, incrementing the current epoch, assign the new epoch to this node, WITHOUT any consensus and
      * persist the configuration on disk before sending packets with the new configuration.
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
index b0c617eee3..db7bf8dd39 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
@@ -54,6 +54,15 @@ public interface RedisClusterReactiveCommands<K, V> extends BaseRedisReactiveCom
      */
     Mono<String> auth(CharSequence password);
 
+    /**
+     * Authenticate to the server.
+     *
+     * @param username the username
+     * @param password the password
+     * @return String simple-string-reply
+     */
+    Mono<String> auth(String username, CharSequence password);
+
     /**
      * Generate a new config epoch, incrementing the current epoch, assign the new epoch to this node, WITHOUT any consensus and
      * persist the configuration on disk before sending packets with the new configuration.
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
index eb3a0eb379..2994fd390a 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
@@ -50,6 +50,15 @@ public interface RedisClusterCommands<K, V> extends BaseRedisCommands<K, V>, Red
      */
     String auth(CharSequence password);
 
+    /**
+     * Authenticate to the server.
+     *
+     * @param username the username
+     * @param password the password
+     * @return String simple-string-reply
+     */
+    String auth(String username, CharSequence password);
+
     /**
      * Generate a new config epoch, incrementing the current epoch, assign the new epoch to this node, WITHOUT any consensus and
      * persist the configuration on disk before sending packets with the new configuration.
diff --git a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
index ae558982f9..45bf5fadae 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
@@ -130,6 +130,20 @@ void testHitRequestQueueLimitReconnectWithAuthCommand() {
         });
     }
 
+    @Test
+    void testHitRequestQueueLimitReconnectWithAuthUsernamePasswordCommand() {
+
+        WithPassword.run(client, () -> {
+
+            client.setOptions(ClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).pingBeforeActivateConnection(false)
+                    .requestQueueSize(10).build());
+
+            RedisAsyncCommands<String, String> connection = client.connect().async();
+            connection.auth(username, passwd);
+            testHitRequestQueueLimit(connection);
+        });
+    }
+
     @Test
     void testHitRequestQueueLimitReconnectWithUriAuth() {
 
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
index 3265115503..27ae88be39 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
@@ -15,14 +15,17 @@
  */
 package io.lettuce.core;
 
+import static junit.framework.TestCase.assertNotNull;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.fail;
 
 import java.time.Duration;
+import java.util.concurrent.Future;
 
 import javax.inject.Inject;
 
+import io.lettuce.core.protocol.RedisCommand;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -68,6 +71,17 @@ void auth() {
                 assertThat(e.getMessage()).isEqualTo("NOAUTH Authentication required.");
                 assertThat(connection.auth(passwd)).isEqualTo("OK");
                 assertThat(connection.set(key, value)).isEqualTo("OK");
+
+                // Aut with the same user & password (default)
+                assertThat(connection.auth(username, passwd)).isEqualTo("OK");
+                assertThat(connection.set(key, value)).isEqualTo("OK");
+
+                // Switch to another user
+                assertThat(connection.auth(sampleUsername, samplePasswd)).isEqualTo("OK");
+                assertThat(connection.set("cached:demo", value)).isEqualTo("OK");
+                assertThatThrownBy(() -> connection.get(key)).isInstanceOf(RedisCommandExecutionException.class);
+                assertThat(connection.del("cached:demo")).isEqualTo(1);
+
             }
 
             RedisURI redisURI = RedisURI.Builder.redis(host, port).withDatabase(2).withPassword(passwd).build();
@@ -77,6 +91,26 @@ void auth() {
         });
     }
 
+    @Test
+    void resp2HandShakeWithUsernamePassword() {
+        RedisURI redisURI = RedisURI.Builder.redis(host, port).withAuthentication(username,passwd).build();
+        RedisClient clientResp2 = RedisClient.create(redisURI);
+        clientResp2.setOptions(
+                ClientOptions.builder().pingBeforeActivateConnection(false).protocolVersion(ProtocolVersion.RESP2).build());
+        RedisCommands<String, String> connTestResp2 = null;
+        try {
+            connTestResp2 = clientResp2.connect().sync();
+            assertThat(redis.ping()).isEqualTo("PONG");
+        } catch (Exception e) {
+        } finally {
+            assertNotNull(connTestResp2);
+            if (connTestResp2 != null) {
+                connTestResp2.getStatefulConnection().close();
+            }
+        }
+        clientResp2.shutdown();
+    }
+
     @Test
     void echo() {
         assertThat(redis.echo("hello")).isEqualTo("hello");
@@ -97,11 +131,13 @@ void select() {
     @Test
     void authNull() {
         assertThatThrownBy(() -> redis.auth(null)).isInstanceOf(IllegalArgumentException.class);
+        assertThatThrownBy(() -> redis.auth(null,"x")).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
     void authEmpty() {
         assertThatThrownBy(() -> redis.auth("")).isInstanceOf(IllegalArgumentException.class);
+        assertThatThrownBy(() -> redis.auth("","x")).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
@@ -118,6 +154,14 @@ void authReconnect() {
             Delay.delay(Duration.ofMillis(100));
             assertThat(connection.get(key)).isEqualTo(value);
 
+            // reconnect with username/password
+            assertThat(connection.auth(username, passwd)).isEqualTo("OK");
+            assertThat(connection.set(key, value)).isEqualTo("OK");
+            connection.quit();
+
+            Delay.delay(Duration.ofMillis(100));
+            assertThat(connection.get(key)).isEqualTo(value);
+
             connection.getStatefulConnection().close();
         });
     }
@@ -157,7 +201,35 @@ void authInvalidPassword() {
     }
 
     @Test
-    void selectInvalid() {
+    void authInvalidUsernamePassword() {
+
+        WithPassword.run(client, () -> {
+            client.setOptions(
+                    ClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).pingBeforeActivateConnection(false).build());
+            RedisCommands<String, String> connection = client.connect().sync();
+            assertThat(connection.auth(username, passwd)).isEqualTo("OK");
+            assertThatThrownBy(() -> connection.auth( username,"invalid")).hasMessage("WRONGPASS invalid username-password pair");
+            assertThat(connection.auth(sampleUsername, samplePasswd)).isEqualTo("OK");
+            assertThatThrownBy(() -> connection.auth( sampleUsername,"invalid")).hasMessage("WRONGPASS invalid username-password pair");
+            connection.getStatefulConnection().close();
+
+        });
+    }
+
+    @Test
+    void authInvalidDefaultPasswordNoACL() {
+        RedisAsyncCommands<String, String> async = client.connect().async();
+        // When the database is not secured the AUTH default invalid command returns OK
+        try {
+            Future<String> auth = async.auth(username, "invalid");
+            assertThat(TestFutures.getOrTimeout(auth)).isEqualTo("OK");
+        } finally {
+            async.getStatefulConnection().close();
+        }
+    }
+
+    @Test
+    void authInvalidUsernamePasswordNoACL() {
         RedisAsyncCommands<String, String> async = client.connect().async();
         try {
             TestFutures.awaitOrTimeout(async.select(1024));
diff --git a/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
index be9fc4e627..5266151620 100644
--- a/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
@@ -28,6 +28,7 @@
 import javax.enterprise.inject.New;
 import javax.inject.Inject;
 
+import io.lettuce.test.WithPassword;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -203,6 +204,16 @@ void transactional(RedisClient client) throws Exception {
     @Test
     void auth() {
         StepVerifier.create(reactive.auth("error")).expectError().verify();
+        StepVerifier.create(reactive.auth(username, "error")).expectNext("OK").verifyComplete();
+
+        WithPassword.enableAuthentication(  this.connection.sync());
+
+        StepVerifier.create(reactive.auth(username, "error")).expectError().verify();
+
+        StepVerifier.create(reactive.auth(sampleUsername,  samplePasswd)).expectNext("OK").verifyComplete();
+        StepVerifier.create(reactive.auth(sampleUsername,  "error")).expectError().verify();
+
+        WithPassword.disableAuthentication(  this.connection.sync());
     }
 
     @Test
diff --git a/src/test/java/io/lettuce/core/TestSupport.java b/src/test/java/io/lettuce/core/TestSupport.java
index 6e95637687..410ffcda8a 100644
--- a/src/test/java/io/lettuce/core/TestSupport.java
+++ b/src/test/java/io/lettuce/core/TestSupport.java
@@ -29,8 +29,12 @@ public abstract class TestSupport {
 
     public static final String host = TestSettings.hostAddr();
     public static final int port = TestSettings.port();
+    public static final String username = TestSettings.username();
     public static final String passwd = TestSettings.password();
 
+    public static final String sampleUsername = TestSettings.sampleUsername();
+    public static final String samplePasswd = TestSettings.samplePassword();
+
     public static final String key = "key";
     public static final String value = "value";
 
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
index 582c3fba5f..54f6442838 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
@@ -97,6 +97,21 @@ void auth() {
         });
     }
 
+    @Test
+    void authWithUsername() {
+        WithPassword.run(client, () -> {
+
+            client.setOptions(
+                    ClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).pingBeforeActivateConnection(false).build());
+            RedisPubSubAsyncCommands<String, String> connection = client.connectPubSub().async();
+            connection.getStatefulConnection().addListener(PubSubCommandTest.this);
+            connection.auth(username,passwd);
+
+            connection.subscribe(channel);
+            assertThat(channels.take()).isEqualTo(channel);
+        });
+    }
+
     @Test
     void authWithReconnect() {
 
@@ -113,7 +128,7 @@ void authWithReconnect() {
 
             assertThat(channels.take()).isEqualTo(channel);
 
-            redis.auth(passwd);
+            redis.auth(username, passwd);
             long id = findNamedClient("authWithReconnect");
             redis.clientKill(KillArgs.Builder.id(id));
 
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedis.java b/src/test/java/io/lettuce/examples/ConnectToRedis.java
index d91632630c..8cd6e73f73 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedis.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedis.java
@@ -26,6 +26,7 @@ public class ConnectToRedis {
     public static void main(String[] args) {
 
         // Syntax: redis://[password@]host[:port][/databaseNumber]
+        // Syntax: redis://[username:password@]host[:port][/databaseNumber]
         RedisClient redisClient = RedisClient.create("redis://password@localhost:6379/0");
         StatefulRedisConnection<String, String> connection = redisClient.connect();
 
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java b/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
index 41faf48f37..59e7ce93a2 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
@@ -26,6 +26,7 @@ public class ConnectToRedisCluster {
     public static void main(String[] args) {
 
         // Syntax: redis://[password@]host[:port]
+        // Syntax: redis://[username:password@]host[:port]
         RedisClusterClient redisClient = RedisClusterClient.create("redis://password@localhost:7379");
 
         StatefulRedisClusterConnection<String, String> connection = redisClient.connect();
diff --git a/src/test/java/io/lettuce/test/WithPassword.java b/src/test/java/io/lettuce/test/WithPassword.java
index ed5d4e06c9..94e70bac11 100644
--- a/src/test/java/io/lettuce/test/WithPassword.java
+++ b/src/test/java/io/lettuce/test/WithPassword.java
@@ -17,11 +17,18 @@
 
 import java.lang.reflect.UndeclaredThrowableException;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.output.StatusOutput;
+import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandType;
+import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.test.condition.RedisConditions;
 import io.lettuce.test.settings.TestSettings;
 
@@ -32,6 +39,9 @@
  */
 public class WithPassword {
 
+    private boolean hasACLCommand = false;
+
+
     /**
      * Run a {@link ThrowingCallable callback function} while Redis is configured with a password.
      *
@@ -65,7 +75,17 @@ public static void run(RedisClient client, ThrowingCallable callable) {
      * @param commands
      */
     public static void enableAuthentication(RedisCommands<String, String> commands) {
+
+        RedisConditions conditions = RedisConditions.of(commands);
+
         commands.configSet("requirepass", TestSettings.password());
+
+        // If ACL is supported let's create a test user
+        if (conditions.hasCommand("ACL")) {
+            Command<String, String, List<Object>> command = CliParser.parse(
+                    "ACL SETUSER "+ TestSettings.sampleUsername() +" on >"+ TestSettings.samplePassword() +" ~cached:* +@all");
+            commands.dispatch(command.getType(), command.getOutput(), command.getArgs());
+        }
     }
 
     /**
@@ -76,12 +96,14 @@ public static void enableAuthentication(RedisCommands<String, String> commands)
     public static void disableAuthentication(RedisCommands<String, String> commands) {
 
         RedisConditions conditions = RedisConditions.of(commands);
-
+        commands.auth(TestSettings.password()); // reauthenticate as default user before disabling it
         commands.configSet("requirepass", "");
 
         if (conditions.hasCommand("ACL")) {
+            Command<String, String, List<Object>> command = CliParser.parse("ACL DELUSER "+ TestSettings.sampleUsername());
+            commands.dispatch(command.getType(), command.getOutput(), command.getArgs());
 
-            Command<String, String, List<Object>> command = CliParser.parse("acl setuser default nopass");
+            command = CliParser.parse("acl setuser default nopass");
             commands.dispatch(command.getType(), command.getOutput(), command.getArgs());
         }
     }
diff --git a/src/test/java/io/lettuce/test/settings/TestSettings.java b/src/test/java/io/lettuce/test/settings/TestSettings.java
index b6d3757a17..33f81123a9 100644
--- a/src/test/java/io/lettuce/test/settings/TestSettings.java
+++ b/src/test/java/io/lettuce/test/settings/TestSettings.java
@@ -75,6 +75,15 @@ public static String hostAddr() {
         }
     }
 
+
+    /**
+     *
+     * @return default username of your redis instance.
+     */
+    public static String username() {
+        return "default";
+    }
+
     /**
      *
      * @return password of your redis instance. Defaults to {@literal passwd}. Can be overridden with
@@ -84,6 +93,24 @@ public static String password() {
         return System.getProperty("password", "passwd");
     }
 
+    /**
+     *
+     * @return password of a second user your redis instance. Defaults to {@literal lettuceTest}. Can be overridden with
+     *         {@code --Dsample.username=SampleUsername}
+     */
+    public static String sampleUsername() {
+        return System.getProperty("sample.username", "lettuceTest");
+    }
+
+    /**
+     *
+     * @return password of a second user of your redis instance. Defaults to {@literal lettuceTestPasswd}. Can be overridden with
+     *         {@code -Dsample.password=SamplePassword}
+     */
+    public static String samplePassword() {
+        return System.getProperty("sample.password", "lettuceTestPasswd");
+    }
+
     /**
      *
      * @return port of your redis instance. Defaults to {@literal 6479}. Can be overriden with {@code -Dport=1234}

From c32a1b4fa06ce279d3267f0ed78681dee195ccc8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 1 Apr 2020 11:01:52 +0200
Subject: [PATCH 769/808] Polishing #1202
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add author and since tags, tweak Javadoc.
Memoize auth(…) with username for reconnect and re-authentication.

Split tests into tests that require Redis 6 and those that do not require Redis 6 to guard these against older/newer Redis versions.

Original pull request: #1249
---
 .../core/AbstractRedisAsyncCommands.java      |   1 +
 .../core/AbstractRedisReactiveCommands.java   |   1 +
 .../java/io/lettuce/core/ConnectionState.java |  24 ++++-
 .../io/lettuce/core/RedisCommandBuilder.java  |   1 +
 .../java/io/lettuce/core/RedisHandshake.java  |   4 +-
 src/main/java/io/lettuce/core/RedisURI.java   |  19 ++--
 .../core/StatefulRedisConnectionImpl.java     |  13 ++-
 .../core/api/async/RedisAsyncCommands.java    |   3 +-
 .../api/reactive/RedisReactiveCommands.java   |   3 +-
 .../lettuce/core/api/sync/RedisCommands.java  |  11 +-
 .../StatefulRedisClusterConnectionImpl.java   |  18 ++--
 .../api/async/RedisClusterAsyncCommands.java  |   3 +-
 .../RedisClusterReactiveCommands.java         |   3 +-
 .../api/sync/RedisClusterCommands.java        |   3 +-
 .../core/protocol/CommandArgsAccessor.java    |  50 ++++++++-
 .../core/ClientOptionsIntegrationTests.java   |   2 +
 .../ConnectionCommandIntegrationTests.java    | 102 +++++++++++++-----
 .../ReactiveConnectionIntegrationTests.java   |  43 +++++---
 .../java/io/lettuce/core/TestSupport.java     |   5 +-
 .../core/pubsub/PubSubCommandTest.java        |  38 ++++++-
 .../io/lettuce/examples/ConnectToRedis.java   |   1 +
 .../examples/ConnectToRedisCluster.java       |   1 +
 .../java/io/lettuce/test/WithPassword.java    |  18 +---
 .../lettuce/test/settings/TestSettings.java   |  22 ++--
 24 files changed, 284 insertions(+), 105 deletions(-)

diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
index 94cd215614..46b80db0d4 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -41,6 +41,7 @@
  * @param <V> Value type.
  * @author Will Glozer
  * @author Mark Paluch
+ * @author Tugdual Grall
  */
 @SuppressWarnings("unchecked")
 public abstract class AbstractRedisAsyncCommands<K, V> implements RedisHashAsyncCommands<K, V>, RedisKeyAsyncCommands<K, V>,
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
index 54dae38b2f..c341d96c94 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -47,6 +47,7 @@
  * @param <V> Value type.
  * @author Mark Paluch
  * @author Nikolai Perevozchikov
+ * @author Tugdual Grall
  * @since 4.0
  */
 public abstract class AbstractRedisReactiveCommands<K, V> implements RedisHashReactiveCommands<K, V>,
diff --git a/src/main/java/io/lettuce/core/ConnectionState.java b/src/main/java/io/lettuce/core/ConnectionState.java
index 25bfc06d41..90df2aa46c 100644
--- a/src/main/java/io/lettuce/core/ConnectionState.java
+++ b/src/main/java/io/lettuce/core/ConnectionState.java
@@ -15,6 +15,8 @@
  */
 package io.lettuce.core;
 
+import java.util.List;
+
 import io.lettuce.core.protocol.ProtocolVersion;
 
 /**
@@ -95,7 +97,27 @@ void setHandshakeResponse(HandshakeResponse handshakeResponse) {
         this.handshakeResponse = handshakeResponse;
     }
 
-    void setUsername(String username) {
+    /**
+     * Sets username/password state based on the argument count from an {@code AUTH} command.
+     *
+     * @param args
+     */
+    protected void setUserNamePassword(List<char[]> args) {
+
+        if (args.isEmpty()) {
+            return;
+        }
+
+        if (args.size() > 1) {
+            setUsername(new String(args.get(0)));
+            setPassword(args.get(1));
+        } else {
+            setUsername(null);
+            setPassword(args.get(0));
+        }
+    }
+
+    protected void setUsername(String username) {
         this.username = username;
     }
 
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 9055ccbcef..4c2753db29 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -35,6 +35,7 @@
  * @param <V>
  * @author Mark Paluch
  * @author Zhang Jessey
+ * @author Tugdual Grall
  */
 @SuppressWarnings({ "unchecked", "varargs" })
 class RedisCommandBuilder<K, V> extends BaseRedisCommandBuilder<K, V> {
diff --git a/src/main/java/io/lettuce/core/RedisHandshake.java b/src/main/java/io/lettuce/core/RedisHandshake.java
index 1b96a4eac3..b449355de7 100644
--- a/src/main/java/io/lettuce/core/RedisHandshake.java
+++ b/src/main/java/io/lettuce/core/RedisHandshake.java
@@ -34,6 +34,7 @@
  * connection state restoration. This class is part of the internal API.
  *
  * @author Mark Paluch
+ * @author Tugdual Grall
  * @since 6.0
  */
 class RedisHandshake implements ConnectionInitializer {
@@ -151,8 +152,9 @@ private CompletableFuture<Void> initializeResp3(Channel channel) {
      * @return
      */
     private CompletableFuture<?> initiateHandshakeResp2(Channel channel) {
+
         if (connectionState.hasUsername()) {
-            return dispatch(channel, this.commandBuilder.auth(connectionState.getUsername() ,connectionState.getPassword()));
+            return dispatch(channel, this.commandBuilder.auth(connectionState.getUsername(), connectionState.getPassword()));
         } else if (connectionState.hasPassword()) {
             return dispatch(channel, this.commandBuilder.auth(connectionState.getPassword()));
         } else if (this.pingOnConnect) {
diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 240244e48d..842206ffb6 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -64,19 +64,23 @@
  *
  * <h3>URI syntax</h3>
  *
- * <b>Redis Standalone</b> <blockquote> <i>redis</i><b>{@code ://}</b>[<i>password@</i>]<i>host</i> [<b>{@code :} </b>
- * <i>port</i>][<b>{@code /}</b><i>database</i>][<b>{@code ?}</b> [<i>timeout=timeout</i>[<i>d|h|m|s|ms|us|ns</i>]] [
- * <i>&amp;database=database</i>] [<i>&amp;clientName=clientName</i>]] </blockquote>
+ * <b>Redis Standalone</b> <blockquote> <i>redis</i><b>{@code ://}</b>[[<i>username</i>{@code :}]<i>password@</i>]<i>host</i>
+ * [<b>{@code :} </b> <i>port</i>][<b>{@code /}</b><i>database</i>][<b>{@code ?}</b>
+ * [<i>timeout=timeout</i>[<i>d|h|m|s|ms|us|ns</i>]] [ <i>&amp;database=database</i>] [<i>&amp;clientName=clientName</i>]]
+ * </blockquote>
  *
- * <b>Redis Standalone (SSL)</b> <blockquote> <i>rediss</i><b>{@code ://}</b>[<i>password@</i>]<i>host</i> [<b>{@code :} </b>
+ * <b>Redis Standalone (SSL)</b> <blockquote>
+ * <i>rediss</i><b>{@code ://}</b>[[<i>username</i>{@code :}]<i>password@</i>]<i>host</i> [<b>{@code :} </b>
  * <i>port</i>][<b>{@code /}</b><i>database</i>][<b>{@code ?}</b> [<i>timeout=timeout</i>[<i>d|h|m|s|ms|us|ns</i>]] [
  * <i>&amp;database=database</i>] [<i>&amp;clientName=clientName</i>]] </blockquote>
  *
- * Redis Standalone (Unix Domain Sockets)</b> <blockquote> <i>redis-socket</i><b>{@code ://} </b>[<i>password@</i>]<i>path</i>[
+ * Redis Standalone (Unix Domain Sockets)</b> <blockquote> <i>redis-socket</i><b>{@code ://}
+ * </b>[[<i>username</i>{@code :}]<i>password@</i>]<i>path</i>[
  * <b>{@code ?}</b>[<i>timeout=timeout</i>[<i>d|h|m|s|ms|us|ns</i>]][<i>&amp;database=database</i>]
  * [<i>&amp;clientName=clientName</i>]] </blockquote>
  *
- * <b>Redis Sentinel</b> <blockquote> <i>redis-sentinel</i><b>{@code ://}</b>[<i>password@</i>]<i>host1</i> [<b>{@code :} </b>
+ * <b>Redis Sentinel</b> <blockquote>
+ * <i>redis-sentinel</i><b>{@code ://}</b>[[<i>username</i>{@code :}]<i>password@</i>]<i>host1</i> [<b>{@code :} </b>
  * <i>port1</i>][, <i>host2</i> [<b>{@code :}</b><i>port2</i>]][, <i>hostN</i> [<b>{@code :}</b><i>portN</i>]][<b>{@code /} </b>
  * <i>database</i>][<b>{@code ?} </b>[<i>timeout=timeout</i>[<i>d|h|m|s|ms|us|ns</i>]] [
  * <i>&amp;sentinelMasterId=sentinelMasterId</i>] [<i>&amp;database=database</i>] [<i>&amp;clientName=clientName</i>]]
@@ -86,6 +90,9 @@
  * Note: When using Redis Sentinel, the password from the URI applies to the data nodes only. Sentinel authentication must be
  * configured for each {@link #getSentinels() sentinel node}.
  * </p>
+ * <p>
+ * Note:Usernames are supported as of Redis 6.
+ * </p>
  *
  * <p>
  * <b>Schemes</b>
diff --git a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
index 20a3dbcc2c..5f79e8d421 100644
--- a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
@@ -22,6 +22,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
@@ -157,16 +158,14 @@ protected <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> comm
             local = attachOnComplete(local, status -> {
                 if ("OK".equals(status)) {
 
-                    char[] password = CommandArgsAccessor.getFirstCharArray(command.getArgs());
+                    List<char[]> args = CommandArgsAccessor.getCharArrayArguments(command.getArgs());
 
-                    if (password != null) {
-                        state.setPassword(password);
+                    if (!args.isEmpty()) {
+                        state.setUserNamePassword(args);
                     } else {
 
-                        String stringPassword = CommandArgsAccessor.getFirstString(command.getArgs());
-                        if (stringPassword != null) {
-                            state.setPassword(stringPassword.toCharArray());
-                        }
+                        List<String> strings = CommandArgsAccessor.getStringArguments(command.getArgs());
+                        state.setUserNamePassword(strings.stream().map(String::toCharArray).collect(Collectors.toList()));
                     }
                 }
             });
diff --git a/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
index a2abc70caf..0ff16b257f 100644
--- a/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java
@@ -42,11 +42,12 @@ public interface RedisAsyncCommands<K, V> extends BaseRedisAsyncCommands<K, V>,
     RedisFuture<String> auth(CharSequence password);
 
     /**
-     * Authenticate to the server.
+     * Authenticate to the server with username and password. Requires Redis 6 or newer.
      *
      * @param username the username
      * @param password the password
      * @return String simple-string-reply
+     * @since 6.0
      */
     RedisFuture<String> auth(String username, CharSequence password);
 
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
index 1f31717b1a..0c999add37 100644
--- a/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java
@@ -42,11 +42,12 @@ public interface RedisReactiveCommands<K, V> extends BaseRedisReactiveCommands<K
     Mono<String> auth(CharSequence password);
 
     /**
-     * Authenticate to the server.
+     * Authenticate to the server with username and password. Requires Redis 6 or newer.
      *
      * @param username the username
      * @param password the password
      * @return String simple-string-reply
+     * @since 6.0
      */
     Mono<String> auth(String username, CharSequence password);
 
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
index 25885a8e17..5c5113efd7 100644
--- a/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
+++ b/src/main/java/io/lettuce/core/api/sync/RedisCommands.java
@@ -33,21 +33,22 @@ public interface RedisCommands<K, V> extends BaseRedisCommands<K, V>, RedisClust
         RedisStreamCommands<K, V>, RedisStringCommands<K, V>, RedisTransactionalCommands<K, V> {
 
     /**
-     * Authenticate to the server with username and password.
+     * Authenticate to the server.
      *
-     * @param username the username
      * @param password the password
      * @return String simple-string-reply
      */
-    String auth(String username, CharSequence password);
+    String auth(CharSequence password);
 
     /**
-     * Authenticate to the server.
+     * Authenticate to the server with username and password. Requires Redis 6 or newer.
      *
+     * @param username the username
      * @param password the password
      * @return String simple-string-reply
+     * @since 6.0
      */
-    String auth(CharSequence password);
+    String auth(String username, CharSequence password);
 
     /**
      * Change the selected database for the current Commands.
diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
index 8e4c60a3d8..dac67f5b9f 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterConnectionImpl.java
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -195,16 +196,15 @@ private <T> RedisCommand<K, V, T> preProcessCommand(RedisCommand<K, V, T> comman
         if (local.getType().name().equals(AUTH.name())) {
             local = attachOnComplete(local, status -> {
                 if (status.equals("OK")) {
-                    char[] password = CommandArgsAccessor.getFirstCharArray(command.getArgs());
+                    List<char[]> args = CommandArgsAccessor.getCharArrayArguments(command.getArgs());
 
-                    if (password != null) {
-                        this.connectionState.setPassword(password);
+                    if (!args.isEmpty()) {
+                        this.connectionState.setUserNamePassword(args);
                     } else {
 
-                        String stringPassword = CommandArgsAccessor.getFirstString(command.getArgs());
-                        if (stringPassword != null) {
-                            this.connectionState.setPassword(stringPassword.toCharArray());
-                        }
+                        List<String> stringArgs = CommandArgsAccessor.getStringArguments(command.getArgs());
+                        this.connectionState
+                                .setUserNamePassword(stringArgs.stream().map(String::toCharArray).collect(Collectors.toList()));
                     }
                 }
             });
@@ -264,8 +264,8 @@ ConnectionState getConnectionState() {
     static class ClusterConnectionState extends ConnectionState {
 
         @Override
-        protected void setPassword(char[] password) {
-            super.setPassword(password);
+        protected void setUserNamePassword(List<char[]> args) {
+            super.setUserNamePassword(args);
         }
 
         @Override
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
index 49b4d39a55..9a99156f27 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
@@ -54,11 +54,12 @@ public interface RedisClusterAsyncCommands<K, V> extends BaseRedisAsyncCommands<
     RedisFuture<String> auth(CharSequence password);
 
     /**
-     * Authenticate to the server.
+     * Authenticate to the server with username and password. Requires Redis 6 or newer.
      *
      * @param username the username
      * @param password the password
      * @return String simple-string-reply
+     * @since 6.0
      */
     RedisFuture<String> auth(String username, CharSequence password);
 
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
index db7bf8dd39..8ba83de011 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
@@ -55,11 +55,12 @@ public interface RedisClusterReactiveCommands<K, V> extends BaseRedisReactiveCom
     Mono<String> auth(CharSequence password);
 
     /**
-     * Authenticate to the server.
+     * Authenticate to the server with username and password. Requires Redis 6 or newer.
      *
      * @param username the username
      * @param password the password
      * @return String simple-string-reply
+     * @since 6.0
      */
     Mono<String> auth(String username, CharSequence password);
 
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
index 2994fd390a..68fe1209ec 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
@@ -51,11 +51,12 @@ public interface RedisClusterCommands<K, V> extends BaseRedisCommands<K, V>, Red
     String auth(CharSequence password);
 
     /**
-     * Authenticate to the server.
+     * Authenticate to the server with username and password. Requires Redis 6 or newer.
      *
      * @param username the username
      * @param password the password
      * @return String simple-string-reply
+     * @since 6.0
      */
     String auth(String username, CharSequence password);
 
diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java b/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
index f510fc1e5a..f278eb6406 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandArgsAccessor.java
@@ -16,6 +16,8 @@
 package io.lettuce.core.protocol;
 
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
 
 import io.lettuce.core.protocol.CommandArgs.CharArrayArgument;
 import io.lettuce.core.protocol.CommandArgs.SingularArgument;
@@ -69,7 +71,7 @@ public static <K, V> String getFirstString(CommandArgs<K, V> commandArgs) {
     }
 
     /**
-     * Get the first {@link char}-array argument.
+     * Get the first {@code char[]}-array argument.
      *
      * @param commandArgs must not be null.
      * @return the first {@link String} argument or {@literal null}.
@@ -87,6 +89,52 @@ public static <K, V> char[] getFirstCharArray(CommandArgs<K, V> commandArgs) {
         return null;
     }
 
+    /**
+     * Get the all {@link String} arguments.
+     *
+     * @param commandArgs must not be null.
+     * @return the first {@link String} argument or {@literal null}.
+     * @since 6.0
+     */
+    public static <K, V> List<String> getStringArguments(CommandArgs<K, V> commandArgs) {
+
+        List<String> args = new ArrayList<>();
+
+        for (SingularArgument singularArgument : commandArgs.singularArguments) {
+
+            if (singularArgument instanceof StringArgument) {
+                args.add(((StringArgument) singularArgument).val);
+            }
+        }
+
+        return args;
+    }
+
+    /**
+     * Get the all {@code char[]} arguments.
+     *
+     * @param commandArgs must not be null.
+     * @return the first {@link String} argument or {@literal null}.
+     * @since 6.0
+     */
+    public static <K, V> List<char[]> getCharArrayArguments(CommandArgs<K, V> commandArgs) {
+
+        List<char[]> args = new ArrayList<>();
+
+        for (SingularArgument singularArgument : commandArgs.singularArguments) {
+
+            if (singularArgument instanceof CharArrayArgument) {
+                args.add(((CharArrayArgument) singularArgument).val);
+            }
+
+            if (singularArgument instanceof StringArgument) {
+                args.add(((StringArgument) singularArgument).val.toCharArray());
+            }
+        }
+
+        return args;
+    }
+
     /**
      * Get the first {@link Long integer} argument.
      *
diff --git a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
index 45bf5fadae..17ba804ba4 100644
--- a/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientOptionsIntegrationTests.java
@@ -35,6 +35,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import io.lettuce.test.condition.EnabledOnCommand;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -131,6 +132,7 @@ void testHitRequestQueueLimitReconnectWithAuthCommand() {
     }
 
     @Test
+    @EnabledOnCommand("ACL")
     void testHitRequestQueueLimitReconnectWithAuthUsernamePasswordCommand() {
 
         WithPassword.run(client, () -> {
diff --git a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
index 27ae88be39..c56bb5d93b 100644
--- a/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java
@@ -25,7 +25,6 @@
 
 import javax.inject.Inject;
 
-import io.lettuce.core.protocol.RedisCommand;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -35,10 +34,12 @@
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.protocol.ProtocolVersion;
 import io.lettuce.test.*;
+import io.lettuce.test.condition.EnabledOnCommand;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
+ * @author Tugdual Grall
  */
 @ExtendWith(LettuceExtension.class)
 class ConnectionCommandIntegrationTests extends TestSupport {
@@ -64,25 +65,44 @@ void auth() {
             client.setOptions(
                     ClientOptions.builder().pingBeforeActivateConnection(false).protocolVersion(ProtocolVersion.RESP2).build());
             RedisCommands<String, String> connection = client.connect().sync();
-            try {
-                connection.ping();
-                fail("Server doesn't require authentication");
-            } catch (RedisException e) {
-                assertThat(e.getMessage()).isEqualTo("NOAUTH Authentication required.");
-                assertThat(connection.auth(passwd)).isEqualTo("OK");
-                assertThat(connection.set(key, value)).isEqualTo("OK");
-
-                // Aut with the same user & password (default)
-                assertThat(connection.auth(username, passwd)).isEqualTo("OK");
-                assertThat(connection.set(key, value)).isEqualTo("OK");
-
-                // Switch to another user
-                assertThat(connection.auth(sampleUsername, samplePasswd)).isEqualTo("OK");
-                assertThat(connection.set("cached:demo", value)).isEqualTo("OK");
-                assertThatThrownBy(() -> connection.get(key)).isInstanceOf(RedisCommandExecutionException.class);
-                assertThat(connection.del("cached:demo")).isEqualTo(1);
 
-            }
+            assertThatThrownBy(connection::ping).isInstanceOf(RedisException.class)
+                    .hasMessageContaining("NOAUTH Authentication required");
+
+            assertThat(connection.auth(passwd)).isEqualTo("OK");
+            assertThat(connection.set(key, value)).isEqualTo("OK");
+
+            RedisURI redisURI = RedisURI.Builder.redis(host, port).withDatabase(2).withPassword(passwd).build();
+            RedisCommands<String, String> authConnection = client.connect(redisURI).sync();
+            authConnection.ping();
+            authConnection.getStatefulConnection().close();
+        });
+    }
+
+    @Test
+    @EnabledOnCommand("ACL")
+    void authWithUsername() {
+
+        WithPassword.run(client, () -> {
+            client.setOptions(
+                    ClientOptions.builder().pingBeforeActivateConnection(false).protocolVersion(ProtocolVersion.RESP2).build());
+            RedisCommands<String, String> connection = client.connect().sync();
+
+            assertThatThrownBy(connection::ping).isInstanceOf(RedisException.class)
+                    .hasMessageContaining("NOAUTH Authentication required");
+
+            assertThat(connection.auth(passwd)).isEqualTo("OK");
+            assertThat(connection.set(key, value)).isEqualTo("OK");
+
+            // Aut with the same user & password (default)
+            assertThat(connection.auth(username, passwd)).isEqualTo("OK");
+            assertThat(connection.set(key, value)).isEqualTo("OK");
+
+            // Switch to another user
+            assertThat(connection.auth(aclUsername, aclPasswd)).isEqualTo("OK");
+            assertThat(connection.set("cached:demo", value)).isEqualTo("OK");
+            assertThatThrownBy(() -> connection.get(key)).isInstanceOf(RedisCommandExecutionException.class);
+            assertThat(connection.del("cached:demo")).isEqualTo(1);
 
             RedisURI redisURI = RedisURI.Builder.redis(host, port).withDatabase(2).withPassword(passwd).build();
             RedisCommands<String, String> authConnection = client.connect(redisURI).sync();
@@ -92,12 +112,15 @@ void auth() {
     }
 
     @Test
+    @EnabledOnCommand("ACL")
     void resp2HandShakeWithUsernamePassword() {
-        RedisURI redisURI = RedisURI.Builder.redis(host, port).withAuthentication(username,passwd).build();
+
+        RedisURI redisURI = RedisURI.Builder.redis(host, port).withAuthentication(username, passwd).build();
         RedisClient clientResp2 = RedisClient.create(redisURI);
         clientResp2.setOptions(
                 ClientOptions.builder().pingBeforeActivateConnection(false).protocolVersion(ProtocolVersion.RESP2).build());
         RedisCommands<String, String> connTestResp2 = null;
+
         try {
             connTestResp2 = clientResp2.connect().sync();
             assertThat(redis.ping()).isEqualTo("PONG");
@@ -131,17 +154,36 @@ void select() {
     @Test
     void authNull() {
         assertThatThrownBy(() -> redis.auth(null)).isInstanceOf(IllegalArgumentException.class);
-        assertThatThrownBy(() -> redis.auth(null,"x")).isInstanceOf(IllegalArgumentException.class);
+        assertThatThrownBy(() -> redis.auth(null, "x")).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
     void authEmpty() {
         assertThatThrownBy(() -> redis.auth("")).isInstanceOf(IllegalArgumentException.class);
-        assertThatThrownBy(() -> redis.auth("","x")).isInstanceOf(IllegalArgumentException.class);
+        assertThatThrownBy(() -> redis.auth("", "x")).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
     void authReconnect() {
+        WithPassword.run(client, () -> {
+
+            client.setOptions(
+                    ClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).pingBeforeActivateConnection(false).build());
+            RedisCommands<String, String> connection = client.connect().sync();
+            assertThat(connection.auth(passwd)).isEqualTo("OK");
+            assertThat(connection.set(key, value)).isEqualTo("OK");
+            connection.quit();
+
+            Delay.delay(Duration.ofMillis(100));
+            assertThat(connection.get(key)).isEqualTo(value);
+
+            connection.getStatefulConnection().close();
+        });
+    }
+
+    @Test
+    @EnabledOnCommand("ACL")
+    void authReconnectRedis6() {
         WithPassword.run(client, () -> {
 
             client.setOptions(
@@ -201,22 +243,30 @@ void authInvalidPassword() {
     }
 
     @Test
+    @EnabledOnCommand("ACL")
     void authInvalidUsernamePassword() {
 
         WithPassword.run(client, () -> {
             client.setOptions(
                     ClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).pingBeforeActivateConnection(false).build());
             RedisCommands<String, String> connection = client.connect().sync();
+
             assertThat(connection.auth(username, passwd)).isEqualTo("OK");
-            assertThatThrownBy(() -> connection.auth( username,"invalid")).hasMessage("WRONGPASS invalid username-password pair");
-            assertThat(connection.auth(sampleUsername, samplePasswd)).isEqualTo("OK");
-            assertThatThrownBy(() -> connection.auth( sampleUsername,"invalid")).hasMessage("WRONGPASS invalid username-password pair");
-            connection.getStatefulConnection().close();
 
+            assertThatThrownBy(() -> connection.auth(username, "invalid"))
+                    .hasMessage("WRONGPASS invalid username-password pair");
+
+            assertThat(connection.auth(aclUsername, aclPasswd)).isEqualTo("OK");
+
+            assertThatThrownBy(() -> connection.auth(aclUsername, "invalid"))
+                    .hasMessage("WRONGPASS invalid username-password pair");
+
+            connection.getStatefulConnection().close();
         });
     }
 
     @Test
+    @EnabledOnCommand("ACL")
     void authInvalidDefaultPasswordNoACL() {
         RedisAsyncCommands<String, String> async = client.connect().async();
         // When the database is not secured the AUTH default invalid command returns OK
diff --git a/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
index 5266151620..b7fae489c0 100644
--- a/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java
@@ -28,7 +28,6 @@
 import javax.enterprise.inject.New;
 import javax.inject.Inject;
 
-import io.lettuce.test.WithPassword;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -45,10 +44,13 @@
 import io.lettuce.test.Delay;
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.Wait;
+import io.lettuce.test.WithPassword;
+import io.lettuce.test.condition.EnabledOnCommand;
 
 /**
  * @author Mark Paluch
  * @author Nikolai Perevozchikov
+ * @author Tugdual Grall
  */
 @ExtendWith(LettuceExtension.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -203,17 +205,31 @@ void transactional(RedisClient client) throws Exception {
 
     @Test
     void auth() {
-        StepVerifier.create(reactive.auth("error")).expectError().verify();
-        StepVerifier.create(reactive.auth(username, "error")).expectNext("OK").verifyComplete();
+        WithPassword.enableAuthentication(this.connection.sync());
+
+        try {
+            StepVerifier.create(reactive.auth("error")).expectError().verify();
+        } finally {
+            WithPassword.disableAuthentication(this.connection.sync());
+        }
+    }
+
+    @Test
+    @EnabledOnCommand("ACL")
+    void authWithUsername() {
 
-        WithPassword.enableAuthentication(  this.connection.sync());
+        try {
 
-        StepVerifier.create(reactive.auth(username, "error")).expectError().verify();
+            StepVerifier.create(reactive.auth(username, "error")).expectNext("OK").verifyComplete();
 
-        StepVerifier.create(reactive.auth(sampleUsername,  samplePasswd)).expectNext("OK").verifyComplete();
-        StepVerifier.create(reactive.auth(sampleUsername,  "error")).expectError().verify();
+            WithPassword.enableAuthentication(this.connection.sync());
 
-        WithPassword.disableAuthentication(  this.connection.sync());
+            StepVerifier.create(reactive.auth(username, "error")).expectError().verify();
+            StepVerifier.create(reactive.auth(aclUsername, aclPasswd)).expectNext("OK").verifyComplete();
+            StepVerifier.create(reactive.auth(aclUsername, "error")).expectError().verify();
+        } finally {
+            WithPassword.disableAuthentication(this.connection.sync());
+        }
     }
 
     @Test
@@ -239,14 +255,11 @@ void subscribeWithDisconnectedClient(RedisClient client) {
         connection.async().quit();
         Wait.untilTrue(() -> !connection.isOpen()).waitOrTimeout();
 
-        StepVerifier
-                .create(connection.reactive().ping())
-                .consumeErrorWith(
-                        throwable -> {
-                            assertThat(throwable).isInstanceOf(RedisException.class).hasMessageContaining(
-                                    "not connected. Commands are rejected");
+        StepVerifier.create(connection.reactive().ping()).consumeErrorWith(throwable -> {
+            assertThat(throwable).isInstanceOf(RedisException.class)
+                    .hasMessageContaining("not connected. Commands are rejected");
 
-                        }).verify();
+        }).verify();
 
         connection.close();
     }
diff --git a/src/test/java/io/lettuce/core/TestSupport.java b/src/test/java/io/lettuce/core/TestSupport.java
index 410ffcda8a..61cdb7b1c5 100644
--- a/src/test/java/io/lettuce/core/TestSupport.java
+++ b/src/test/java/io/lettuce/core/TestSupport.java
@@ -24,6 +24,7 @@
 
 /**
  * @author Mark Paluch
+ * @author Tugdual Grall
  */
 public abstract class TestSupport {
 
@@ -32,8 +33,8 @@ public abstract class TestSupport {
     public static final String username = TestSettings.username();
     public static final String passwd = TestSettings.password();
 
-    public static final String sampleUsername = TestSettings.sampleUsername();
-    public static final String samplePasswd = TestSettings.samplePassword();
+    public static final String aclUsername = TestSettings.aclUsername();
+    public static final String aclPasswd = TestSettings.aclPassword();
 
     public static final String key = "key";
     public static final String value = "value";
diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
index 54f6442838..bc83302d3e 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
@@ -42,12 +42,14 @@
 import io.lettuce.test.TestFutures;
 import io.lettuce.test.Wait;
 import io.lettuce.test.WithPassword;
+import io.lettuce.test.condition.EnabledOnCommand;
 import io.lettuce.test.resource.FastShutdown;
 import io.lettuce.test.resource.TestClientResources;
 
 /**
  * @author Will Glozer
  * @author Mark Paluch
+ * @author Tugdual Grall
  */
 class PubSubCommandTest extends AbstractRedisClientTest implements RedisPubSubListener<String, String> {
 
@@ -98,6 +100,7 @@ void auth() {
     }
 
     @Test
+    @EnabledOnCommand("ACL")
     void authWithUsername() {
         WithPassword.run(client, () -> {
 
@@ -105,7 +108,7 @@ void authWithUsername() {
                     ClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).pingBeforeActivateConnection(false).build());
             RedisPubSubAsyncCommands<String, String> connection = client.connectPubSub().async();
             connection.getStatefulConnection().addListener(PubSubCommandTest.this);
-            connection.auth(username,passwd);
+            connection.auth(username, passwd);
 
             connection.subscribe(channel);
             assertThat(channels.take()).isEqualTo(channel);
@@ -123,13 +126,42 @@ void authWithReconnect() {
             RedisPubSubAsyncCommands<String, String> connection = client.connectPubSub().async();
             connection.getStatefulConnection().addListener(PubSubCommandTest.this);
             connection.auth(passwd);
+
             connection.clientSetname("authWithReconnect");
-            connection.subscribe(channel);
+            connection.subscribe(channel).get();
 
             assertThat(channels.take()).isEqualTo(channel);
 
-            redis.auth(username, passwd);
             long id = findNamedClient("authWithReconnect");
+            redis.auth(passwd);
+            redis.clientKill(KillArgs.Builder.id(id));
+
+            Delay.delay(Duration.ofMillis(100));
+            Wait.untilTrue(connection::isOpen).waitOrTimeout();
+
+            assertThat(channels.take()).isEqualTo(channel);
+        });
+    }
+
+    @Test
+    @EnabledOnCommand("ACL")
+    void authWithUsernameAndReconnect() {
+
+        WithPassword.run(client, () -> {
+
+            client.setOptions(
+                    ClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).pingBeforeActivateConnection(false).build());
+
+            RedisPubSubAsyncCommands<String, String> connection = client.connectPubSub().async();
+            connection.getStatefulConnection().addListener(PubSubCommandTest.this);
+            connection.auth(username, passwd);
+            connection.clientSetname("authWithReconnect");
+            connection.subscribe(channel).get();
+
+            assertThat(channels.take()).isEqualTo(channel);
+
+            long id = findNamedClient("authWithReconnect");
+            redis.auth(username, passwd);
             redis.clientKill(KillArgs.Builder.id(id));
 
             Delay.delay(Duration.ofMillis(100));
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedis.java b/src/test/java/io/lettuce/examples/ConnectToRedis.java
index 8cd6e73f73..744fcaf466 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedis.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedis.java
@@ -20,6 +20,7 @@
 
 /**
  * @author Mark Paluch
+ * @author Tugdual Grall
  */
 public class ConnectToRedis {
 
diff --git a/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java b/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
index 59e7ce93a2..41cec7d01d 100644
--- a/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
+++ b/src/test/java/io/lettuce/examples/ConnectToRedisCluster.java
@@ -20,6 +20,7 @@
 
 /**
  * @author Mark Paluch
+ * @author Tugdual Grall
  */
 public class ConnectToRedisCluster {
 
diff --git a/src/test/java/io/lettuce/test/WithPassword.java b/src/test/java/io/lettuce/test/WithPassword.java
index 94e70bac11..d51b986735 100644
--- a/src/test/java/io/lettuce/test/WithPassword.java
+++ b/src/test/java/io/lettuce/test/WithPassword.java
@@ -17,18 +17,11 @@
 
 import java.lang.reflect.UndeclaredThrowableException;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
 
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
-import io.lettuce.core.codec.StringCodec;
-import io.lettuce.core.output.StatusOutput;
-import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.protocol.Command;
-import io.lettuce.core.protocol.CommandType;
-import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.test.condition.RedisConditions;
 import io.lettuce.test.settings.TestSettings;
 
@@ -36,12 +29,10 @@
  * Utility to run a {@link ThrowingCallable callback function} while Redis is configured with a password.
  *
  * @author Mark Paluch
+ * @author Tugdual Grall
  */
 public class WithPassword {
 
-    private boolean hasACLCommand = false;
-
-
     /**
      * Run a {@link ThrowingCallable callback function} while Redis is configured with a password.
      *
@@ -83,7 +74,7 @@ public static void enableAuthentication(RedisCommands<String, String> commands)
         // If ACL is supported let's create a test user
         if (conditions.hasCommand("ACL")) {
             Command<String, String, List<Object>> command = CliParser.parse(
-                    "ACL SETUSER "+ TestSettings.sampleUsername() +" on >"+ TestSettings.samplePassword() +" ~cached:* +@all");
+                    "ACL SETUSER " + TestSettings.aclUsername() + " on >" + TestSettings.aclPassword() + " ~cached:* +@all");
             commands.dispatch(command.getType(), command.getOutput(), command.getArgs());
         }
     }
@@ -95,12 +86,13 @@ public static void enableAuthentication(RedisCommands<String, String> commands)
      */
     public static void disableAuthentication(RedisCommands<String, String> commands) {
 
-        RedisConditions conditions = RedisConditions.of(commands);
         commands.auth(TestSettings.password()); // reauthenticate as default user before disabling it
+
+        RedisConditions conditions = RedisConditions.of(commands);
         commands.configSet("requirepass", "");
 
         if (conditions.hasCommand("ACL")) {
-            Command<String, String, List<Object>> command = CliParser.parse("ACL DELUSER "+ TestSettings.sampleUsername());
+            Command<String, String, List<Object>> command = CliParser.parse("ACL DELUSER " + TestSettings.aclUsername());
             commands.dispatch(command.getType(), command.getOutput(), command.getArgs());
 
             command = CliParser.parse("acl setuser default nopass");
diff --git a/src/test/java/io/lettuce/test/settings/TestSettings.java b/src/test/java/io/lettuce/test/settings/TestSettings.java
index 33f81123a9..e240a97528 100644
--- a/src/test/java/io/lettuce/test/settings/TestSettings.java
+++ b/src/test/java/io/lettuce/test/settings/TestSettings.java
@@ -23,10 +23,11 @@
  * This class provides settings used while testing. You can override these using system properties.
  *
  * @author Mark Paluch
+ * @author Tugdual Grall
  */
 public class TestSettings {
-    private TestSettings() {
 
+    private TestSettings() {
     }
 
     /**
@@ -75,7 +76,6 @@ public static String hostAddr() {
         }
     }
 
-
     /**
      *
      * @return default username of your redis instance.
@@ -96,19 +96,19 @@ public static String password() {
     /**
      *
      * @return password of a second user your redis instance. Defaults to {@literal lettuceTest}. Can be overridden with
-     *         {@code --Dsample.username=SampleUsername}
+     *         {@code -Dacl.username=SampleUsername}
      */
-    public static String sampleUsername() {
-        return System.getProperty("sample.username", "lettuceTest");
+    public static String aclUsername() {
+        return System.getProperty("acl.username", "lettuceTest");
     }
 
     /**
      *
-     * @return password of a second user of your redis instance. Defaults to {@literal lettuceTestPasswd}. Can be overridden with
-     *         {@code -Dsample.password=SamplePassword}
+     * @return password of a second user of your redis instance. Defaults to {@literal lettuceTestPasswd}. Can be overridden
+     *         with {@code -Dacl.password=SamplePassword}
      */
-    public static String samplePassword() {
-        return System.getProperty("sample.password", "lettuceTestPasswd");
+    public static String aclPassword() {
+        return System.getProperty("acl.password", "lettuceTestPasswd");
     }
 
     /**
@@ -116,7 +116,7 @@ public static String samplePassword() {
      * @return port of your redis instance. Defaults to {@literal 6479}. Can be overriden with {@code -Dport=1234}
      */
     public static int port() {
-        return Integer.valueOf(System.getProperty("port", "6479"));
+        return Integer.parseInt(System.getProperty("port", "6479"));
     }
 
     /**
@@ -124,7 +124,7 @@ public static int port() {
      * @return sslport of your redis instance. Defaults to {@literal 6443}. Can be overriden with {@code -Dsslport=1234}
      */
     public static int sslPort() {
-        return Integer.valueOf(System.getProperty("sslport", "6443"));
+        return Integer.parseInt(System.getProperty("sslport", "6443"));
     }
 
     /**

From 0bb981d2facbe200e100066443589ca1fb9d125c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 2 Apr 2020 09:12:55 +0200
Subject: [PATCH 770/808] Polishing #1255

Reformat code.
---
 src/main/java/io/lettuce/core/RedisClient.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 9b80eac787..28ee21ab0f 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -737,7 +737,14 @@ private Mono<SocketAddress> lookupRedis(RedisURI sentinelUri) {
 
                 return it;
             }).timeout(timeout) //
-                    .flatMap(it -> Mono.fromCompletionStage(c::closeAsync) //
+                    .onErrorResume(e -> {
+
+                        RedisCommandTimeoutException ex = ExceptionFactory
+                                .createTimeoutException("Cannot obtain master using SENTINEL MASTER", timeout);
+                        ex.addSuppressed(e);
+
+                        return Mono.fromCompletionStage(c::closeAsync).then(Mono.error(ex));
+                    }).flatMap(it -> Mono.fromCompletionStage(c::closeAsync) //
                             .thenReturn(it));
         });
     }

From 78cba4d30f2cd28e0eed669c221e897adbf54b50 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 2 Apr 2020 09:39:55 +0200
Subject: [PATCH 771/808] Do not re-issue activation commands #1255

Commands issued during connection activation (re-authentication, database re-selection, re-subscribe) are no longer replayed if the connection gets disconnected while the commands didn't complete yet.
---
 ...tefulRedisClusterPubSubConnectionImpl.java | 20 +++---
 .../core/protocol/DefaultEndpoint.java        | 69 ++++++++++++++++++-
 .../protocol/DefaultEndpointUnitTests.java    | 68 ++++++++++++++++--
 3 files changed, 140 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
index 1ab7710995..96704a7253 100644
--- a/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/StatefulRedisClusterPubSubConnectionImpl.java
@@ -18,12 +18,10 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
 import java.time.Duration;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-import io.lettuce.core.AbstractRedisClient;
-import io.lettuce.core.RedisChannelWriter;
-import io.lettuce.core.RedisException;
-import io.lettuce.core.RedisURI;
+import io.lettuce.core.*;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.cluster.pubsub.RedisClusterPubSubListener;
@@ -44,8 +42,8 @@
 /**
  * @author Mark Paluch
  */
-class StatefulRedisClusterPubSubConnectionImpl<K, V> extends StatefulRedisPubSubConnectionImpl<K, V> implements
-        StatefulRedisClusterPubSubConnection<K, V> {
+class StatefulRedisClusterPubSubConnectionImpl<K, V> extends StatefulRedisPubSubConnectionImpl<K, V>
+        implements StatefulRedisClusterPubSubConnection<K, V> {
 
     private final PubSubClusterEndpoint<K, V> endpoint;
     private volatile Partitions partitions;
@@ -85,8 +83,8 @@ public RedisClusterPubSubCommands<K, V> sync() {
     @Override
     protected RedisPubSubCommands<K, V> newRedisSyncCommandsImpl() {
 
-        return (RedisPubSubCommands) Proxy.newProxyInstance(AbstractRedisClient.class.getClassLoader(), new Class<?>[] {
-                RedisClusterPubSubCommands.class, RedisPubSubCommands.class }, syncInvocationHandler());
+        return (RedisPubSubCommands) Proxy.newProxyInstance(AbstractRedisClient.class.getClassLoader(),
+                new Class<?>[] { RedisClusterPubSubCommands.class, RedisPubSubCommands.class }, syncInvocationHandler());
     }
 
     private InvocationHandler syncInvocationHandler() {
@@ -113,9 +111,11 @@ void setCommandSet(CommandSet commandSet) {
     }
 
     @Override
-    public void activated() {
-        super.activated();
+    protected List<RedisFuture<Void>> resubscribe() {
+
         async().clusterMyId().thenAccept(nodeId -> endpoint.setClusterNode(partitions.getPartitionByNodeId(nodeId)));
+
+        return super.resubscribe();
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
index cd55eea559..a08c37080f 100644
--- a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
+++ b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -77,6 +77,7 @@ public class DefaultEndpoint implements RedisChannelWriter, Endpoint {
 
     private String logPrefix;
     private boolean autoFlushCommands = true;
+    private boolean inActivation = false;
 
     private ConnectionWatchdog connectionWatchdog;
     private ConnectionFacade connectionFacade;
@@ -140,6 +141,10 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         try {
             sharedLock.incrementWriters();
 
+            if (inActivation) {
+                command = processActivationCommand(command);
+            }
+
             if (autoFlushCommands) {
 
                 if (isConnected()) {
@@ -177,6 +182,10 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         try {
             sharedLock.incrementWriters();
 
+            if (inActivation) {
+                commands = processActivationCommands(commands);
+            }
+
             if (autoFlushCommands) {
 
                 if (isConnected()) {
@@ -198,6 +207,32 @@ public <K, V, T> RedisCommand<K, V, T> write(RedisCommand<K, V, T> command) {
         return (Collection<RedisCommand<K, V, ?>>) commands;
     }
 
+    private <K, V, T> RedisCommand<K, V, T> processActivationCommand(RedisCommand<K, V, T> command) {
+
+        if (!ActivationCommand.isActivationCommand(command)) {
+            return new ActivationCommand<>(command);
+        }
+
+        return command;
+    }
+
+    private <K, V> Collection<RedisCommand<K, V, ?>> processActivationCommands(
+            Collection<? extends RedisCommand<K, V, ?>> commands) {
+
+        Collection<RedisCommand<K, V, ?>> commandsToReturn = new ArrayList<>(commands.size());
+
+        for (RedisCommand<K, V, ?> command : commands) {
+
+            if (!ActivationCommand.isActivationCommand(command)) {
+                command = new ActivationCommand<>(command);
+            }
+
+            commandsToReturn.add(command);
+        }
+
+        return commandsToReturn;
+    }
+
     private RedisException validateWrite(int commands) {
 
         if (isClosed()) {
@@ -387,7 +422,12 @@ public void notifyChannelActive(Channel channel) {
                     logger.debug("{} activating endpoint", logPrefix());
                 }
 
-                connectionFacade.activated();
+                try {
+                    inActivation = true;
+                    connectionFacade.activated();
+                } finally {
+                    inActivation = false;
+                }
 
                 flushCommands(disconnectedBuffer);
             } catch (Exception e) {
@@ -469,7 +509,7 @@ private void flushCommands(Queue<RedisCommand<?, ?, ?>> queue) {
             List<RedisCommand<?, ?, ?>> commands = sharedLock.doExclusive(() -> {
 
                 if (queue.isEmpty()) {
-                    return Collections.<RedisCommand<?, ?, ?>> emptyList();
+                    return Collections.emptyList();
                 }
 
                 return drainCommands(queue);
@@ -669,7 +709,7 @@ protected <T> T doExclusive(Supplier<T> supplier) {
         RedisCommand<?, ?, ?> cmd;
         while ((cmd = source.poll()) != null) {
 
-            if (!cmd.isDone()) {
+            if (!cmd.isDone() && !ActivationCommand.isActivationCommand(cmd)) {
                 target.add(cmd);
             }
         }
@@ -976,4 +1016,27 @@ private enum Reliability {
         AT_MOST_ONCE, AT_LEAST_ONCE
     }
 
+    static class ActivationCommand<K, V, T> extends CommandWrapper<K, V, T> {
+
+        public ActivationCommand(RedisCommand<K, V, T> command) {
+            super(command);
+        }
+
+        public static boolean isActivationCommand(RedisCommand<?, ?, ?> command) {
+
+            if (command instanceof ActivationCommand) {
+                return true;
+            }
+
+            while (command instanceof CommandWrapper) {
+                command = ((CommandWrapper<?, ?, ?>) command).getDelegate();
+
+                if (command instanceof ActivationCommand) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
 }
diff --git a/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java b/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
index 83c93f50bb..f817906a0a 100644
--- a/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/DefaultEndpointUnitTests.java
@@ -17,13 +17,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 import java.nio.channels.ClosedChannelException;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Queue;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -357,6 +355,68 @@ void retryListenerDoesNotRetryCompletedCommands() {
         verify(channel, never()).writeAndFlush(command);
     }
 
+    @Test
+    void shouldWrapActivationCommands() {
+
+        when(channel.isActive()).thenReturn(true);
+        doAnswer(i -> {
+
+            sut.write(new Command<>(CommandType.AUTH, new StatusOutput<>(StringCodec.UTF8)));
+            sut.write(Collections.singletonList(new Command<>(CommandType.SELECT, new StatusOutput<>(StringCodec.UTF8))));
+            return null;
+        }).when(connectionFacade).activated();
+
+        sut.notifyChannelActive(channel);
+
+        DefaultChannelPromise promise = new DefaultChannelPromise(channel, ImmediateEventExecutor.INSTANCE);
+
+        when(channel.writeAndFlush(any())).thenAnswer(invocation -> {
+            if (invocation.getArguments()[0] instanceof RedisCommand) {
+                queue.add((RedisCommand) invocation.getArguments()[0]);
+            }
+
+            if (invocation.getArguments()[0] instanceof Collection) {
+                queue.addAll((Collection) invocation.getArguments()[0]);
+            }
+            return promise;
+        });
+
+        assertThat(queue).hasSize(2).hasOnlyElementsOfTypes(DefaultEndpoint.ActivationCommand.class);
+    }
+
+    @Test
+    void shouldNotReplayActivationCommands() {
+
+        when(channel.isActive()).thenReturn(true);
+        ConnectionTestUtil.getDisconnectedBuffer(sut).add(new DefaultEndpoint.ActivationCommand<>(
+                new Command<>(CommandType.SELECT, new StatusOutput<>(StringCodec.UTF8))));
+        ConnectionTestUtil.getDisconnectedBuffer(sut).add(new LatencyMeteredCommand<>(new DefaultEndpoint.ActivationCommand<>(
+                new Command<>(CommandType.SUBSCRIBE, new StatusOutput<>(StringCodec.UTF8)))));
+
+        doAnswer(i -> {
+
+            sut.write(new Command<>(CommandType.AUTH, new StatusOutput<>(StringCodec.UTF8)));
+            return null;
+        }).when(connectionFacade).activated();
+
+        sut.notifyChannelActive(channel);
+
+        DefaultChannelPromise promise = new DefaultChannelPromise(channel, ImmediateEventExecutor.INSTANCE);
+
+        when(channel.writeAndFlush(any())).thenAnswer(invocation -> {
+            if (invocation.getArguments()[0] instanceof RedisCommand) {
+                queue.add((RedisCommand) invocation.getArguments()[0]);
+            }
+
+            if (invocation.getArguments()[0] instanceof Collection) {
+                queue.addAll((Collection) invocation.getArguments()[0]);
+            }
+            return promise;
+        });
+
+        assertThat(queue).hasSize(1).extracting(RedisCommand::getType).containsOnly(CommandType.AUTH);
+    }
+
     @Test
     void testMTCConcurrentConcurrentWrite() throws Throwable {
         TestFramework.runOnce(new MTCConcurrentConcurrentWrite(command, clientResources));

From a2be65aecf1ea47440d0ad536d96fd67e82cc4c4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 2 Apr 2020 09:48:02 +0200
Subject: [PATCH 772/808] Polishing #1202

Fix test.
---
 src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
index bc83302d3e..5c8b163cb9 100644
--- a/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
+++ b/src/test/java/io/lettuce/core/pubsub/PubSubCommandTest.java
@@ -132,8 +132,8 @@ void authWithReconnect() {
 
             assertThat(channels.take()).isEqualTo(channel);
 
-            long id = findNamedClient("authWithReconnect");
             redis.auth(passwd);
+            long id = findNamedClient("authWithReconnect");
             redis.clientKill(KillArgs.Builder.id(id));
 
             Delay.delay(Duration.ofMillis(100));
@@ -347,7 +347,6 @@ void unsubscribe() throws Exception {
 
         assertThat(channels).isEmpty();
         assertThat(patterns).isEmpty();
-
     }
 
     @Test

From 3741d63ca7f4d6d6b7661949f241b21335962787 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 2 Apr 2020 10:56:25 +0200
Subject: [PATCH 773/808] Upgrade dependencies #1259

---
 .flattened-pom.xml | 187 +++++++++++++++++++++++++++++++++++++++++++++
 pom.xml            |  80 +++++++++++--------
 2 files changed, 237 insertions(+), 30 deletions(-)
 create mode 100644 .flattened-pom.xml

diff --git a/.flattened-pom.xml b/.flattened-pom.xml
new file mode 100644
index 0000000000..23eef902c9
--- /dev/null
+++ b/.flattened-pom.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>io.lettuce</groupId>
+  <artifactId>lettuce-core</artifactId>
+  <version>5.3.0.BUILD-SNAPSHOT</version>
+  <name>Lettuce</name>
+  <description>Advanced and thread-safe Java Redis client for synchronous, asynchronous, and
+        reactive usage. Supports Cluster, Sentinel, Pipelining, Auto-Reconnect, Codecs
+        and much more.</description>
+  <url>http://github.com/lettuce-io/lettuce-core</url>
+  <organization>
+    <name>lettuce.io</name>
+    <url>https://lettuce.io</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>mp911de</id>
+      <name>Mark Paluch</name>
+    </developer>
+    <developer>
+      <id>will</id>
+      <name>Will Glozer</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
+    <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
+    <url>http://github.com/lettuce-io/lettuce-core</url>
+  </scm>
+  <issueManagement>
+    <system>Github</system>
+    <url>https://github.com/lettuce-io/lettuce-core/issues</url>
+  </issueManagement>
+  <ciManagement>
+    <system>Travis CI</system>
+    <url>https://travis-ci.org/lettuce-io/lettuce-core</url>
+  </ciManagement>
+  <dependencies>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+      <version>4.1.48.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-handler</artifactId>
+      <version>4.1.48.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+      <version>4.1.48.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.projectreactor</groupId>
+      <artifactId>reactor-core</artifactId>
+      <version>3.3.4.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-pool2</artifactId>
+      <version>2.8.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-tcnative</artifactId>
+      <version>1.1.33.Fork26</version>
+      <classifier>osx-x86_64</classifier>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport-native-epoll</artifactId>
+      <version>4.1.48.Final</version>
+      <classifier>linux-x86_64</classifier>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport-native-kqueue</artifactId>
+      <version>4.1.48.Final</version>
+      <classifier>osx-x86_64</classifier>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.zipkin.brave</groupId>
+      <artifactId>brave</artifactId>
+      <version>5.10.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.latencyutils</groupId>
+      <artifactId>LatencyUtils</artifactId>
+      <version>2.0.3</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.hdrhistogram</groupId>
+      <artifactId>HdrHistogram</artifactId>
+      <version>2.1.12</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.reactivex</groupId>
+      <artifactId>rxjava</artifactId>
+      <version>1.3.8</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.reactivex</groupId>
+      <artifactId>rxjava-reactive-streams</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.reactivex.rxjava2</groupId>
+      <artifactId>rxjava</artifactId>
+      <version>2.2.19</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.3.26.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.3.26.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.enterprise</groupId>
+      <artifactId>cdi-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>3.0.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/pom.xml b/pom.xml
index 08edc8aae0..e2921463db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,21 +56,35 @@
     </developers>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
         <assertj-core.version>3.15.0</assertj-core.version>
-        <brave-version>5.9.4</brave-version>
-        <junit-version>5.6.0</junit-version>
-        <log4j2-version>2.13.0</log4j2-version>
-        <mockito.version>3.2.4</mockito.version>
-        <netty-version>4.1.47.Final</netty-version>
-        <reactor-version>3.3.2.RELEASE</reactor-version>
+        <cdi-api.version>2.0</cdi-api.version>
+        <brave.version>5.10.2</brave.version>
+        <commons-lang3.version>3.10</commons-lang3.version>
+        <commons-pool.version>2.8.0</commons-pool.version>
+        <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
+        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
+        <junit4.version>4.13</junit4.version>
+        <junit5.version>5.6.1</junit5.version>
+        <hamcrest-library.version>2.2</hamcrest-library.version>
+        <hdr-histogram-version>2.1.12</hdr-histogram-version>
+        <latencyutils.version>2.0.3</latencyutils.version>
+        <log4j2-version>2.13.1</log4j2-version>
+        <mockito.version>3.3.3</mockito.version>
+        <netty.version>4.1.48.Final</netty.version>
+        <openwebbeans.version>2.0.16</openwebbeans.version>
+        <reactor.version>3.3.4.RELEASE</reactor.version>
+        <rxjava.version>1.3.8</rxjava.version>
+        <rxjava-reactive-streams.version>1.2.1</rxjava-reactive-streams.version>
+        <rxjava2.version>2.2.19</rxjava2.version>
+        <rxjava3.version>3.0.1</rxjava3.version>
         <reactive-streams-tck.version>1.0.3</reactive-streams-tck.version>
         <slf4j.version>1.7.25</slf4j.version>
-        <spring-version>4.3.26.RELEASE</spring-version>
+        <spring.version>4.3.26.RELEASE</spring.version>
 
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipITs>true</skipITs>
+
     </properties>
 
     <scm>
@@ -86,7 +100,7 @@
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-bom</artifactId>
-                <version>${netty-version}</version>
+                <version>${netty.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -94,7 +108,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-framework-bom</artifactId>
-                <version>${spring-version}</version>
+                <version>${spring.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -102,7 +116,7 @@
             <dependency>
                 <groupId>io.zipkin.brave</groupId>
                 <artifactId>brave-bom</artifactId>
-                <version>${brave-version}</version>
+                <version>${brave.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -110,7 +124,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>${junit-version}</version>
+                <version>${junit5.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -148,7 +162,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>${reactor-version}</version>
+            <version>${reactor.version}</version>
         </dependency>
 
         <!-- End of core dependencies -->
@@ -158,7 +172,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
-            <version>2.7.0</version>
+            <version>${commons-pool.version}</version>
             <optional>true</optional>
         </dependency>
 
@@ -197,14 +211,14 @@
         <dependency>
             <groupId>org.latencyutils</groupId>
             <artifactId>LatencyUtils</artifactId>
-            <version>2.0.3</version>
+            <version>${latencyutils.version}</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.hdrhistogram</groupId>
             <artifactId>HdrHistogram</artifactId>
-            <version>2.1.11</version>
+            <version>${hdr-histogram-version}</version>
             <optional>true</optional>
         </dependency>
 
@@ -213,28 +227,28 @@
         <dependency>
             <groupId>io.reactivex</groupId>
             <artifactId>rxjava</artifactId>
-            <version>1.3.8</version>
+            <version>${rxjava.version}</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>io.reactivex</groupId>
             <artifactId>rxjava-reactive-streams</artifactId>
-            <version>1.2.1</version>
+            <version>${rxjava-reactive-streams.version}</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
-            <version>2.2.13</version>
+            <version>${rxjava2.version}</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>io.reactivex.rxjava3</groupId>
             <artifactId>rxjava</artifactId>
-            <version>3.0.0</version>
+            <version>${rxjava3.version}</version>
             <optional>true</optional>
         </dependency>
 
@@ -263,7 +277,7 @@
         <dependency>
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
-            <version>2.0</version>
+            <version>${cdi-api.version}</version>
             <optional>true</optional>
         </dependency>
 
@@ -295,14 +309,14 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>1.3</version>
+            <version>${hamcrest-library.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.8</version>
+            <version>${commons-lang3.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -318,21 +332,21 @@
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-se</artifactId>
-            <version>2.0.11</version>
+            <version>${openwebbeans.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
+            <version>${javax.annotation-api.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -341,7 +355,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>${junit4.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -422,7 +436,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
-            <version>${reactor-version}</version>
+            <version>${reactor.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -447,7 +461,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-expression</artifactId>
-            <version>${spring-version}</version>
+            <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -472,6 +486,12 @@
 
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>flatten-maven-plugin</artifactId>
+                    <version>1.2.1</version>
+                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>

From e8411b0d9af34dffc79b9e823f11636e062c30e6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 2 Apr 2020 10:42:14 +0200
Subject: [PATCH 774/808] Replace outdated Sonatype parent POM with plugin
 definitions #1258

---
 .gitignore |  7 +----
 pom.xml    | 85 +++++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 63 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index b1c53c7797..76866d2b7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 target/
 *.rdb
 *.aof
-
 -
 atlassian-ide-plugin.xml
 *.iml
@@ -14,8 +13,4 @@ work/
 .settings
 dependency-reduced-pom.xml
 .idea
-.vagrant
-Vagrantfile
-CluTest.java
-
-CluTest.java
+.flattened-pom.xml
diff --git a/pom.xml b/pom.xml
index e2921463db..0742b8850e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>9</version>
-    </parent>
-
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
     <version>6.0.0.BUILD-SNAPSHOT</version>
@@ -45,14 +40,14 @@
     </issueManagement>
 
     <developers>
-        <developer>
-            <id>will</id>
-            <name>Will Glozer</name>
-        </developer>
         <developer>
             <id>mp911de</id>
             <name>Mark Paluch</name>
         </developer>
+        <developer>
+            <id>will</id>
+            <name>Will Glozer</name>
+        </developer>
     </developers>
 
     <properties>
@@ -94,6 +89,19 @@
       <tag>HEAD</tag>
   </scm>
 
+    <distributionManagement>
+        <snapshotRepository>
+            <id>sonatype-nexus-snapshots</id>
+            <name>Sonatype Nexus Snapshots</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+        </snapshotRepository>
+        <repository>
+            <id>sonatype-nexus-staging</id>
+            <name>Nexus Release Repository</name>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+
     <dependencyManagement>
         <dependencies>
 
@@ -495,7 +503,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.2.0</version>
                 </plugin>
 
                 <plugin>
@@ -513,7 +521,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.2.0</version>
                 </plugin>
 
                 <plugin>
@@ -525,7 +533,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.2.0</version>
                 </plugin>
 
                 <plugin>
@@ -563,13 +571,13 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.2.1</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.0</version>
                 </plugin>
 
                 <plugin>
@@ -594,6 +602,37 @@
 
         <plugins>
 
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                        <configuration>
+                            <updatePomFile>true</updatePomFile>
+                            <flattenMode>oss</flattenMode>
+                            <pomElements>
+                                <distributionManagement>remove</distributionManagement>
+                                <properties>remove</properties>
+                                <repositories>remove</repositories>
+                                <profiles>remove</profiles>
+                            </pomElements>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>flatten-clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -722,7 +761,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.1.1</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -773,7 +811,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>3.1.1</version>
                         <executions>
                             <execution>
                                 <id>bin</id>
@@ -902,7 +939,7 @@
                                     <arguments>
                                         <argument>-Xmx2G</argument>
                                         <argument>-classpath</argument>
-                                        <classpath />
+                                        <classpath/>
                                         <argument>org.openjdk.jmh.Main</argument>
                                         <argument>.*</argument>
                                         <argument>-tu</argument>
@@ -976,7 +1013,9 @@
                                 <phase>process-resources</phase>
                                 <configuration>
                                     <target>
-                                        <copy failonerror="false" file="${project.build.directory}/generated-docs/index.pdf" tofile="target/site/reference/pdf/lettuce-reference.pdf" />
+                                        <copy failonerror="false"
+                                              file="${project.build.directory}/generated-docs/index.pdf"
+                                              tofile="target/site/reference/pdf/lettuce-reference.pdf"/>
                                     </target>
                                 </configuration>
                                 <goals>
@@ -1043,9 +1082,9 @@
                                 <toclevels>3</toclevels>
                                 <numbered>true</numbered>
                                 <ext-doc>https://raw.githubusercontent.com/wiki/lettuce-io/lettuce-core/</ext-doc>
-                                <allow-uri-read />
-                                <docinfo />
-                                <toc2 />
+                                <allow-uri-read/>
+                                <docinfo/>
+                                <toc2/>
                                 <icons>font</icons>
                                 <source-highlighter>coderay</source-highlighter>
                             </attributes>

From d30ec4c2bbbbe7044e0d677a8dd20ff7a8011494 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 6 Apr 2020 10:50:38 +0200
Subject: [PATCH 775/808] Fix infinite command timeout #1260

Zero-timeouts are now correctly considered to not time out commands. Previously, zero timeouts mapped either to the default timeout or immediately lead to a timeout.
---
 .../java/io/lettuce/core/LettuceFutures.java  |  1 -
 src/main/java/io/lettuce/core/RedisURI.java   |  2 +-
 .../java/io/lettuce/core/TimeoutOptions.java  |  3 +-
 .../lettuce/core/api/StatefulConnection.java  |  2 +-
 .../NodeSelectionInvocationHandler.java       | 36 +++++-----
 .../api/async/RedisClusterAsyncCommands.java  |  2 +-
 .../RedisClusterReactiveCommands.java         |  2 +-
 .../api/sync/RedisClusterCommands.java        | 14 ++--
 .../io/lettuce/core/internal/Futures.java     | 28 +++++---
 .../core/internal/TimeoutProvider.java        | 12 ++--
 .../lettuce/core/ClientIntegrationTests.java  | 13 ++--
 .../internal/TimeoutProviderUnitTests.java    | 68 +++++++++++++++++++
 .../core/protocol/AsyncCommandUnitTests.java  | 20 ++++--
 13 files changed, 147 insertions(+), 56 deletions(-)
 create mode 100644 src/test/java/io/lettuce/core/internal/TimeoutProviderUnitTests.java

diff --git a/src/main/java/io/lettuce/core/LettuceFutures.java b/src/main/java/io/lettuce/core/LettuceFutures.java
index 5f8c3e481f..cdb47838f7 100644
--- a/src/main/java/io/lettuce/core/LettuceFutures.java
+++ b/src/main/java/io/lettuce/core/LettuceFutures.java
@@ -73,5 +73,4 @@ public static boolean awaitAll(long timeout, TimeUnit unit, Future<?>... futures
     public static <T> T awaitOrCancel(RedisFuture<T> cmd, long timeout, TimeUnit unit) {
         return Futures.awaitOrCancel(cmd, timeout, unit);
     }
-
 }
diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 842206ffb6..21417cf905 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -406,7 +406,7 @@ public Duration getTimeout() {
     }
 
     /**
-     * Sets the command timeout for synchronous command execution.
+     * Sets the command timeout for synchronous command execution. A zero timeout value indicates to not time out.
      *
      * @param timeout the command timeout for synchronous command execution.
      * @since 5.0
diff --git a/src/main/java/io/lettuce/core/TimeoutOptions.java b/src/main/java/io/lettuce/core/TimeoutOptions.java
index cd0fdad981..3dec488aa5 100644
--- a/src/main/java/io/lettuce/core/TimeoutOptions.java
+++ b/src/main/java/io/lettuce/core/TimeoutOptions.java
@@ -240,7 +240,8 @@ public static abstract class TimeoutSource {
          * required but a connect did not finish yet.
          *
          * @param command can be {@literal null}.
-         * @return the timeout value. Values less or equal to zero do not timeout the command.
+         * @return the timeout value. Zero disables the timeout. A value of {@code -1} applies the default timeout configured on
+         *         the connection.
          */
         public abstract long getTimeout(RedisCommand<?, ?, ?> command);
 
diff --git a/src/main/java/io/lettuce/core/api/StatefulConnection.java b/src/main/java/io/lettuce/core/api/StatefulConnection.java
index 2b70739de5..5d90c91686 100644
--- a/src/main/java/io/lettuce/core/api/StatefulConnection.java
+++ b/src/main/java/io/lettuce/core/api/StatefulConnection.java
@@ -36,7 +36,7 @@
 public interface StatefulConnection<K, V> extends AutoCloseable, AsyncCloseable {
 
     /**
-     * Set the default command timeout for this connection.
+     * Set the default command timeout for this connection. A zero timeout value indicates to not time out.
      *
      * @param timeout Command timeout.
      * @since 5.0
diff --git a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
index 221cc1d0a2..7315c61f8b 100644
--- a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
@@ -123,8 +123,8 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
 
                     try {
 
-                        Object resultValue = targetMethod.invoke(
-                                executionModel == ExecutionModel.REACTIVE ? it.reactive() : it.async(), args);
+                        Object resultValue = targetMethod
+                                .invoke(executionModel == ExecutionModel.REACTIVE ? it.reactive() : it.async(), args);
 
                         if (timeoutProvider != null && resultValue instanceof RedisCommand && timeout.get() == 0) {
                             timeout.set(timeoutProvider.getTimeoutNs((RedisCommand) resultValue));
@@ -158,8 +158,8 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
     }
 
     @SuppressWarnings("unchecked")
-    private Object getExecutions(Map<RedisClusterNode, Object> executions, long timeoutNs) throws ExecutionException,
-            InterruptedException {
+    private Object getExecutions(Map<RedisClusterNode, Object> executions, long timeoutNs)
+            throws ExecutionException, InterruptedException {
 
         if (executionModel == ExecutionModel.REACTIVE) {
             Map<RedisClusterNode, CompletionStage<? extends Publisher<?>>> reactiveExecutions = (Map) executions;
@@ -170,7 +170,7 @@ private Object getExecutions(Map<RedisClusterNode, Object> executions, long time
 
         if (executionModel == ExecutionModel.SYNC) {
 
-            long timeoutToUse = timeoutNs > 0 ? timeoutNs : timeoutProvider.getTimeoutNs(null);
+            long timeoutToUse = timeoutNs >= 0 ? timeoutNs : timeoutProvider.getTimeoutNs(null);
 
             if (!awaitAll(timeoutToUse, TimeUnit.NANOSECONDS, asyncExecutions.values())) {
                 throw createTimeoutException(asyncExecutions, Duration.ofNanos(timeoutToUse));
@@ -195,19 +195,23 @@ private static boolean awaitAll(long timeout, TimeUnit unit, Collection<Completi
             long time = System.nanoTime();
 
             for (CompletionStage<?> f : futures) {
-                if (nanos < 0) {
-                    return false;
-                }
-                try {
-                    f.toCompletableFuture().get(nanos, TimeUnit.NANOSECONDS);
-                } catch (ExecutionException e) {
-                    // ignore
+
+                if (nanos == 0) {
+                    f.toCompletableFuture().get();
+                } else {
+                    if (nanos < 0) {
+                        return false;
+                    }
+                    try {
+                        f.toCompletableFuture().get(nanos, TimeUnit.NANOSECONDS);
+                    } catch (ExecutionException e) {
+                        // ignore
+                    }
+                    long now = System.nanoTime();
+                    nanos -= now - time;
+                    time = now;
                 }
-                long now = System.nanoTime();
-                nanos -= now - time;
-                time = now;
             }
-
             complete = true;
         } catch (TimeoutException e) {
             complete = false;
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
index 9a99156f27..33d909ad60 100644
--- a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
@@ -38,7 +38,7 @@ public interface RedisClusterAsyncCommands<K, V> extends BaseRedisAsyncCommands<
         RedisSortedSetAsyncCommands<K, V>, RedisStreamAsyncCommands<K, V>, RedisStringAsyncCommands<K, V> {
 
     /**
-     * Set the default timeout for operations.
+     * Set the default timeout for operations. A zero timeout value indicates to not time out.
      *
      * @param timeout the timeout value
      * @since 5.0
diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
index 8ba83de011..2747e0259c 100644
--- a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
@@ -39,7 +39,7 @@ public interface RedisClusterReactiveCommands<K, V> extends BaseRedisReactiveCom
         RedisStringReactiveCommands<K, V> {
 
     /**
-     * Set the default timeout for operations.
+     * Set the default timeout for operations. A zero timeout value indicates to not time out.
      *
      * @param timeout the timeout value
      * @since 5.0
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
index 68fe1209ec..0313e3a205 100644
--- a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
@@ -29,13 +29,13 @@
  * @author Mark Paluch
  * @since 4.0
  */
-public interface RedisClusterCommands<K, V> extends BaseRedisCommands<K, V>, RedisGeoCommands<K, V>, RedisHashCommands<K, V>,
-        RedisHLLCommands<K, V>, RedisKeyCommands<K, V>, RedisListCommands<K, V>, RedisScriptingCommands<K, V>,
-        RedisServerCommands<K, V>, RedisSetCommands<K, V>, RedisSortedSetCommands<K, V>, RedisStreamCommands<K, V>,
-        RedisStringCommands<K, V> {
+public interface RedisClusterCommands<K, V>
+        extends BaseRedisCommands<K, V>, RedisGeoCommands<K, V>, RedisHashCommands<K, V>, RedisHLLCommands<K, V>,
+        RedisKeyCommands<K, V>, RedisListCommands<K, V>, RedisScriptingCommands<K, V>, RedisServerCommands<K, V>,
+        RedisSetCommands<K, V>, RedisSortedSetCommands<K, V>, RedisStreamCommands<K, V>, RedisStringCommands<K, V> {
 
     /**
-     * Set the default timeout for operations.
+     * Set the default timeout for operations. A zero timeout value indicates to not time out.
      *
      * @param timeout the timeout value
      * @since 5.0
@@ -284,8 +284,8 @@ public interface RedisClusterCommands<K, V> extends BaseRedisCommands<K, V>, Red
     String clusterFlushslots();
 
     /**
-     * Tells a Redis cluster replica node that the client is ok reading possibly stale data and is not interested in running write
-     * queries.
+     * Tells a Redis cluster replica node that the client is ok reading possibly stale data and is not interested in running
+     * write queries.
      *
      * @return String simple-string-reply
      */
diff --git a/src/main/java/io/lettuce/core/internal/Futures.java b/src/main/java/io/lettuce/core/internal/Futures.java
index c8abd1afa3..dcc2f7cb86 100644
--- a/src/main/java/io/lettuce/core/internal/Futures.java
+++ b/src/main/java/io/lettuce/core/internal/Futures.java
@@ -162,7 +162,11 @@ public static boolean await(long timeout, TimeUnit unit, Future<?> future) {
                 return false;
             }
 
-            future.get(nanos, TimeUnit.NANOSECONDS);
+            if (nanos == 0) {
+                future.get();
+            } else {
+                future.get(nanos, TimeUnit.NANOSECONDS);
+            }
 
             return true;
         } catch (TimeoutException e) {
@@ -200,18 +204,24 @@ public static boolean awaitAll(long timeout, TimeUnit unit, Future<?>... futures
 
             for (Future<?> f : futures) {
 
-                if (nanos < 0) {
-                    return false;
-                }
+                if (timeout <= 0) {
+                    f.get();
+                } else {
+                    if (nanos < 0) {
+                        return false;
+                    }
 
-                f.get(nanos, TimeUnit.NANOSECONDS);
+                    f.get(nanos, TimeUnit.NANOSECONDS);
 
-                long now = System.nanoTime();
-                nanos -= now - time;
-                time = now;
+                    long now = System.nanoTime();
+                    nanos -= now - time;
+                    time = now;
+                }
             }
 
             return true;
+        } catch (TimeoutException e) {
+            return false;
         } catch (Exception e) {
             return handleException(e);
         }
@@ -231,7 +241,7 @@ public static boolean awaitAll(long timeout, TimeUnit unit, Future<?>... futures
     public static <T> T awaitOrCancel(RedisFuture<T> cmd, long timeout, TimeUnit unit) {
 
         try {
-            if (!cmd.await(timeout, unit)) {
+            if (timeout > 0 && !cmd.await(timeout, unit)) {
                 cmd.cancel(true);
                 throw ExceptionFactory.createTimeoutException(Duration.ofNanos(unit.toNanos(timeout)));
             }
diff --git a/src/main/java/io/lettuce/core/internal/TimeoutProvider.java b/src/main/java/io/lettuce/core/internal/TimeoutProvider.java
index 1400a14476..bf83d7228d 100644
--- a/src/main/java/io/lettuce/core/internal/TimeoutProvider.java
+++ b/src/main/java/io/lettuce/core/internal/TimeoutProvider.java
@@ -39,18 +39,18 @@ public class TimeoutProvider {
 
     /**
      * Creates a new {@link TimeoutProvider} given {@link TimeoutOptions supplier} and {@link LongSupplier default timeout
-     * supplier}.
+     * supplier in nano seconds}.
      *
      * @param timeoutOptionsSupplier must not be {@literal null}.
-     * @param defaultTimeoutSupplier must not be {@literal null}.
+     * @param defaultTimeoutNsSupplier must not be {@literal null}.
      */
-    public TimeoutProvider(Supplier<TimeoutOptions> timeoutOptionsSupplier, LongSupplier defaultTimeoutSupplier) {
+    public TimeoutProvider(Supplier<TimeoutOptions> timeoutOptionsSupplier, LongSupplier defaultTimeoutNsSupplier) {
 
         LettuceAssert.notNull(timeoutOptionsSupplier, "TimeoutOptionsSupplier must not be null");
-        LettuceAssert.notNull(defaultTimeoutSupplier, "Default TimeoutSupplier must not be null");
+        LettuceAssert.notNull(defaultTimeoutNsSupplier, "Default TimeoutSupplier must not be null");
 
         this.timeoutOptionsSupplier = timeoutOptionsSupplier;
-        this.defaultTimeoutSupplier = defaultTimeoutSupplier;
+        this.defaultTimeoutSupplier = defaultTimeoutNsSupplier;
     }
 
     /**
@@ -72,7 +72,7 @@ public long getTimeoutNs(RedisCommand<?, ?, ?> command) {
             timeoutNs = state.timeoutSource.getTimeUnit().toNanos(state.timeoutSource.getTimeout(command));
         }
 
-        return timeoutNs > 0 ? timeoutNs : defaultTimeoutSupplier.getAsLong();
+        return timeoutNs >= 0 ? timeoutNs : defaultTimeoutSupplier.getAsLong();
     }
 
     static class State {
diff --git a/src/test/java/io/lettuce/core/ClientIntegrationTests.java b/src/test/java/io/lettuce/core/ClientIntegrationTests.java
index a6a82c47bc..c466a211ab 100644
--- a/src/test/java/io/lettuce/core/ClientIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/ClientIntegrationTests.java
@@ -83,9 +83,8 @@ void statefulConnectionFromReactive() {
     @Test
     void timeout() {
 
-        redis.setTimeout(Duration.ZERO);
-        assertThatThrownBy(() -> redis.eval(" os.execute(\"sleep \" .. tonumber(1))", ScriptOutputType.STATUS)).isInstanceOf(
-                RedisCommandTimeoutException.class);
+        redis.setTimeout(Duration.ofNanos(100));
+        assertThatThrownBy(() -> redis.blpop(1, "unknown")).isInstanceOf(RedisCommandTimeoutException.class);
 
         redis.setTimeout(Duration.ofSeconds(60));
     }
@@ -123,8 +122,8 @@ void connectFailure(ClientResources clientResources) {
 
         RedisClient client = RedisClient.create(clientResources, "redis://invalid");
 
-        assertThatThrownBy(client::connect).isInstanceOf(RedisConnectionException.class).hasMessageContaining(
-                "Unable to connect");
+        assertThatThrownBy(client::connect).isInstanceOf(RedisConnectionException.class)
+                .hasMessageContaining("Unable to connect");
 
         FastShutdown.shutdown(client);
     }
@@ -135,8 +134,8 @@ void connectPubSubFailure(ClientResources clientResources) {
 
         RedisClient client = RedisClient.create(clientResources, "redis://invalid");
 
-        assertThatThrownBy(client::connectPubSub).isInstanceOf(RedisConnectionException.class).hasMessageContaining(
-                "Unable to connect");
+        assertThatThrownBy(client::connectPubSub).isInstanceOf(RedisConnectionException.class)
+                .hasMessageContaining("Unable to connect");
         FastShutdown.shutdown(client);
     }
 
diff --git a/src/test/java/io/lettuce/core/internal/TimeoutProviderUnitTests.java b/src/test/java/io/lettuce/core/internal/TimeoutProviderUnitTests.java
new file mode 100644
index 0000000000..7e6fc5ba03
--- /dev/null
+++ b/src/test/java/io/lettuce/core/internal/TimeoutProviderUnitTests.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Test;
+
+import io.lettuce.core.TimeoutOptions;
+import io.lettuce.core.protocol.RedisCommand;
+
+/**
+ * Unit tests for {@link TimeoutProvider}.
+ *
+ * @author Mark Paluch
+ */
+class TimeoutProviderUnitTests {
+
+    @Test
+    void shouldReturnConfiguredTimeout() {
+
+        TimeoutProvider provider = new TimeoutProvider(() -> TimeoutOptions.enabled(Duration.ofSeconds(10)),
+                () -> TimeUnit.SECONDS.toNanos(100));
+
+        long timeout = provider.getTimeoutNs(mock(RedisCommand.class));
+
+        assertThat(timeout).isEqualTo(Duration.ofSeconds(10).toNanos());
+    }
+
+    @Test
+    void shouldReturnDefaultTimeout() {
+
+        TimeoutProvider provider = new TimeoutProvider(() -> TimeoutOptions.enabled(Duration.ofSeconds(-1)),
+                () -> TimeUnit.SECONDS.toNanos(100));
+
+        long timeout = provider.getTimeoutNs(mock(RedisCommand.class));
+
+        assertThat(timeout).isEqualTo(Duration.ofSeconds(100).toNanos());
+    }
+
+    @Test
+    void shouldReturnNoTimeout() {
+
+        TimeoutProvider provider = new TimeoutProvider(() -> TimeoutOptions.enabled(Duration.ZERO),
+                () -> TimeUnit.SECONDS.toNanos(100));
+
+        long timeout = provider.getTimeoutNs(mock(RedisCommand.class));
+
+        assertThat(timeout).isEqualTo(0);
+    }
+}
diff --git a/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java b/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
index 56511df8d2..20b665cab3 100644
--- a/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
+++ b/src/test/java/io/lettuce/core/protocol/AsyncCommandUnitTests.java
@@ -26,7 +26,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import io.lettuce.core.*;
+import io.lettuce.core.LettuceFutures;
+import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.RedisCommandInterruptedException;
+import io.lettuce.core.RedisException;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.Futures;
@@ -35,6 +38,8 @@
 import io.lettuce.test.TestFutures;
 
 /**
+ * Unit tests for {@link AsyncCommand}.
+ *
  * @author Mark Paluch
  */
 public class AsyncCommandUnitTests {
@@ -68,18 +73,23 @@ void isDone() {
     @Test
     void awaitAllCompleted() {
         sut.complete();
+        assertThat(LettuceFutures.awaitAll(-1, TimeUnit.MILLISECONDS, sut)).isTrue();
+        assertThat(LettuceFutures.awaitAll(0, TimeUnit.MILLISECONDS, sut)).isTrue();
         assertThat(Futures.await(5, TimeUnit.MILLISECONDS, sut)).isTrue();
     }
 
     @Test
     void awaitAll() {
-        assertThat(Futures.awaitAll(-1, TimeUnit.NANOSECONDS, sut)).isFalse();
+        assertThat(Futures.awaitAll(1, TimeUnit.NANOSECONDS, sut)).isFalse();
     }
 
     @Test
-    void awaitNotCompleted() {
-        assertThatThrownBy(() -> LettuceFutures.awaitOrCancel(sut, 0, TimeUnit.NANOSECONDS))
-                .isInstanceOf(RedisCommandTimeoutException.class);
+    void awaitReturnsCompleted() {
+        sut.getOutput().set(StandardCharsets.US_ASCII.encode("one"));
+        sut.complete();
+        assertThat(LettuceFutures.awaitOrCancel(sut, -1, TimeUnit.NANOSECONDS)).isEqualTo("one");
+        assertThat(LettuceFutures.awaitOrCancel(sut, 0, TimeUnit.NANOSECONDS)).isEqualTo("one");
+        assertThat(LettuceFutures.awaitOrCancel(sut, 1, TimeUnit.NANOSECONDS)).isEqualTo("one");
     }
 
     @Test

From 96916457639cbafeffbe7602af0f001434bd802f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 6 Apr 2020 10:50:57 +0200
Subject: [PATCH 776/808] Upgrade to RxJava 3.0.2 #1261

---
 .flattened-pom.xml | 187 ---------------------------------------------
 pom.xml            |   2 +-
 2 files changed, 1 insertion(+), 188 deletions(-)
 delete mode 100644 .flattened-pom.xml

diff --git a/.flattened-pom.xml b/.flattened-pom.xml
deleted file mode 100644
index 23eef902c9..0000000000
--- a/.flattened-pom.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>io.lettuce</groupId>
-  <artifactId>lettuce-core</artifactId>
-  <version>5.3.0.BUILD-SNAPSHOT</version>
-  <name>Lettuce</name>
-  <description>Advanced and thread-safe Java Redis client for synchronous, asynchronous, and
-        reactive usage. Supports Cluster, Sentinel, Pipelining, Auto-Reconnect, Codecs
-        and much more.</description>
-  <url>http://github.com/lettuce-io/lettuce-core</url>
-  <organization>
-    <name>lettuce.io</name>
-    <url>https://lettuce.io</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <id>mp911de</id>
-      <name>Mark Paluch</name>
-    </developer>
-    <developer>
-      <id>will</id>
-      <name>Will Glozer</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
-    <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
-    <url>http://github.com/lettuce-io/lettuce-core</url>
-  </scm>
-  <issueManagement>
-    <system>Github</system>
-    <url>https://github.com/lettuce-io/lettuce-core/issues</url>
-  </issueManagement>
-  <ciManagement>
-    <system>Travis CI</system>
-    <url>https://travis-ci.org/lettuce-io/lettuce-core</url>
-  </ciManagement>
-  <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-      <version>4.1.48.Final</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-handler</artifactId>
-      <version>4.1.48.Final</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-      <version>4.1.48.Final</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.projectreactor</groupId>
-      <artifactId>reactor-core</artifactId>
-      <version>3.3.4.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-pool2</artifactId>
-      <version>2.8.0</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative</artifactId>
-      <version>1.1.33.Fork26</version>
-      <classifier>osx-x86_64</classifier>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport-native-epoll</artifactId>
-      <version>4.1.48.Final</version>
-      <classifier>linux-x86_64</classifier>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport-native-kqueue</artifactId>
-      <version>4.1.48.Final</version>
-      <classifier>osx-x86_64</classifier>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.zipkin.brave</groupId>
-      <artifactId>brave</artifactId>
-      <version>5.10.2</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.latencyutils</groupId>
-      <artifactId>LatencyUtils</artifactId>
-      <version>2.0.3</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.hdrhistogram</groupId>
-      <artifactId>HdrHistogram</artifactId>
-      <version>2.1.12</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.reactivex</groupId>
-      <artifactId>rxjava</artifactId>
-      <version>1.3.8</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.reactivex</groupId>
-      <artifactId>rxjava-reactive-streams</artifactId>
-      <version>1.2.1</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.reactivex.rxjava2</groupId>
-      <artifactId>rxjava</artifactId>
-      <version>2.2.19</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <version>4.3.26.RELEASE</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
-        </exclusion>
-      </exclusions>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>4.3.26.RELEASE</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>javax.enterprise</groupId>
-      <artifactId>cdi-api</artifactId>
-      <version>2.0</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <version>1</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>3.0.2</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/pom.xml b/pom.xml
index 0742b8850e..d3438d56b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
         <rxjava.version>1.3.8</rxjava.version>
         <rxjava-reactive-streams.version>1.2.1</rxjava-reactive-streams.version>
         <rxjava2.version>2.2.19</rxjava2.version>
-        <rxjava3.version>3.0.1</rxjava3.version>
+        <rxjava3.version>3.0.2</rxjava3.version>
         <reactive-streams-tck.version>1.0.3</reactive-streams-tck.version>
         <slf4j.version>1.7.25</slf4j.version>
         <spring.version>4.3.26.RELEASE</spring.version>

From 82ddb31b62e2dccb754afb52e8acc0cd842f29df Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 14 Apr 2020 22:41:10 +0200
Subject: [PATCH 777/808] Add test for connection handshake failures #1262

---
 .../ConnectionFailureIntegrationTests.java    | 79 ++++++++++++++++++-
 1 file changed, 75 insertions(+), 4 deletions(-)

diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
index 7b86b204ff..5110a5da9e 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
@@ -17,16 +17,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.fail;
 
 import java.net.InetSocketAddress;
 import java.time.Duration;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Queue;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 import javax.inject.Inject;
@@ -42,10 +41,12 @@
 import io.lettuce.core.event.Event;
 import io.lettuce.core.event.connection.ReconnectFailedEvent;
 import io.lettuce.core.resource.ClientResources;
+import io.lettuce.core.resource.NettyCustomizer;
 import io.lettuce.test.*;
 import io.lettuce.test.resource.FastShutdown;
 import io.lettuce.test.server.RandomResponseServer;
 import io.lettuce.test.settings.TestSettings;
+import io.netty.channel.Channel;
 import io.netty.channel.local.LocalAddress;
 
 /**
@@ -292,6 +293,76 @@ void emitEventOnReconnectFailure() throws Exception {
         }
     }
 
+    @Test
+    void pingOnConnectFailureShouldCloseConnection() throws Exception {
+
+        AtomicReference<Channel> ref = new AtomicReference<>();
+        ClientResources clientResources = ClientResources.builder().nettyCustomizer(new NettyCustomizer() {
+            @Override
+            public void afterChannelInitialized(Channel channel) {
+                ref.set(channel);
+            }
+        }).build();
+
+        // Cluster node with auth
+        RedisURI redisUri = RedisURI.create(TestSettings.host(), 7385);
+        RedisClient client = RedisClient.create(clientResources);
+
+        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+
+        try {
+            client.connect(redisUri);
+            fail("Missing Exception");
+        } catch (Exception e) {
+            assertThat(ref.get().isOpen()).isFalse();
+            assertThat(ref.get().isRegistered()).isFalse();
+        } finally {
+            FastShutdown.shutdown(client);
+            FastShutdown.shutdown(clientResources);
+        }
+    }
+
+    @Test
+    void pingOnConnectFailureShouldCloseConnectionOnReconnect() throws Exception {
+
+        BlockingQueue<Channel> ref = new LinkedBlockingQueue<>();
+        ClientResources clientResources = ClientResources.builder().nettyCustomizer(new NettyCustomizer() {
+            @Override
+            public void afterChannelInitialized(Channel channel) {
+                ref.add(channel);
+            }
+        }).build();
+
+        RedisURI redisUri = RedisURI.create(TestSettings.host(), TestSettings.port());
+        RedisClient client = RedisClient.create(clientResources, redisUri);
+        client.setOptions(ClientOptions.builder().pingBeforeActivateConnection(true).build());
+
+        StatefulRedisConnection<String, String> connection = client.connect();
+
+        ConnectionWatchdog connectionWatchdog = ConnectionTestUtil.getConnectionWatchdog(connection);
+        connectionWatchdog.setListenOnChannelInactive(false);
+        connection.async().quit();
+
+        // Cluster node with auth
+        redisUri.setPort(7385);
+
+        connectionWatchdog.setListenOnChannelInactive(true);
+        connectionWatchdog.scheduleReconnect();
+
+        Wait.untilTrue(() -> ref.size() > 1).waitOrTimeout();
+
+        redisUri.setPort(TestSettings.port());
+
+        Channel initial = ref.take();
+        assertThat(initial.isOpen()).isFalse();
+
+        Channel reconnect = ref.take();
+        assertThat(reconnect.isOpen()).isFalse();
+
+        FastShutdown.shutdown(client);
+        FastShutdown.shutdown(clientResources);
+    }
+
     /**
      * Expect to disable {@link ConnectionWatchdog} when closing a broken connection.
      */

From 8f45d03af2bd85d5f04a1a8e7421f2b8a689a96c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 15 Apr 2020 10:30:21 +0200
Subject: [PATCH 778/808] Prepare release notes #1268

---
 RELEASE-NOTES.md | 294 ++++++++++++++++++++---------------------------
 1 file changed, 125 insertions(+), 169 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 76d6348026..1f6859a26c 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,21 +1,21 @@
-Lettuce 5.2.0 RELEASE NOTES
+Lettuce 6.0.0 M1 RELEASE NOTES
 ===========================
 
-The Lettuce team is pleased to announce the Lettuce 5.2.0 release! 
-This release contains new features, bug fixes, and enhancements.
- 
-Most notable changes are:
+The Lettuce team is delighted to announce the availability of the first Lettuce 6 milestone.
 
-* Sentinel refinements
-* Node randomization when reading from Redis Cluster nodes
-* Codec enhancements
-* Migrated tests to JUnit 5
+Lettuce 6 aligns with Redis 6 in terms of API and protocol changes. Both protocols, RESP and RESP3 are supported side-by-side defaulting to RESP.
 
-Find the full changelog at the end of this document that lists all 110 tickets.
-Work for Lettuce 6, the next major release has already started. Lettuce 6 will support RESP3 and should ship in time for Redis 6.
+Most notable changes that ship with this release are
 
-Thanks to all contributors who made Lettuce 5.2.0.RELEASE possible.
-Lettuce requires a minimum of Java 8 to build and run and is compatible with Java 13. It is tested continuously against the latest Redis source-build.
+* RESP3 support
+* ACL Authentication with username/password
+* Asynchronous Cluster Topology Refresh
+* API cleanups/Breaking Changes
+
+We're working towards the next milestone and looking at further Redis 6 features such as client-side caching how these can be incorporated into Lettuce. The release date of Lettuce 6 depends on Redis 6 availability. 
+
+Thanks to all contributors who made Lettuce 6.0.0.M1 possible.
+Lettuce requires a minimum of Java 8 to build and run and is compatible with Java 14. It is tested continuously against the latest Redis source-build.
 
 If you need any support, meet Lettuce at
 
@@ -24,186 +24,142 @@ or lettuce-redis-client-users@googlegroups.com
 * Stack Overflow (Questions): https://stackoverflow.com/questions/tagged/lettuce
 * Join the chat at https://gitter.im/lettuce-io/Lobby for general discussion
 * GitHub Issues (Bug reports, feature requests): https://github.com/lettuce-io/lettuce-core/issues
-* Documentation: https://lettuce.io/core/5.2.0.RELEASE/reference/
-* Javadoc: https://lettuce.io/core/5.2.0.RELEASE/api/
-
-Sentinel refinements
-----------------------------------
+* Documentation: https://lettuce.io/core/6.0.0.M1/reference/
+* Javadoc: https://lettuce.io/core/6.0.0.M1/api/
 
-Since this release, Lettuce can connect to Redis Sentinel using secure sockets (SSL) and can authenticate against Sentinel using passwords.
-To use SSL, enable SSL usage on `RedisURI` the same way how it's done for Redis Standalone and Redis Cluster.
-Lettuce also introduced a new protocol scheme with `rediss-sentinel://`. Please note that enabling SSL enables encryption for both, Sentinel and data node communication.
+RESP3 Support
+-------------
 
-Password authentication follows the same pattern. Setting a password on a Sentinel `RedisURI` enables password authentication for Sentinel and data nodes.
+Redis 6 ships with support for a new protocol version. RESP3 brings support for additional data types to distinguish better between responses. The following response types were introduced with RESP3:
 
-Read from random Redis Cluster node
-----------------------------------
+* Null: a single `null` value replacing RESP v2 `*-1` and `$-1` null values.
+* Double: a floating-point number.
+* Boolean: `true` or `false`.
+* Blob error: binary-safe error code and message.
+* Verbatim string: a binary-safe string that is typically used as user message without any escaping or filtering.
+* Map: an ordered collection of key-value pairs. Keys and values can be any other RESP3 type.
+* Set: an unordered collection of N other types.
+* Attribute: Like the Map type, but the client should keep reading the reply ignoring the attribute type, and return it to the client as additional information.
+* Push: Out-of-band data.
+* Streamed strings: A large response using chunked transfer.
+* Hello: Like the Map type, but is sent only when the connection between the client and the server is established, in order to welcome the client with different information like the name of the server, its version, and so forth.
+* Big number: a large number non-representable by the Number type
 
-Redis Cluster supports now node randomization to avoid excessive usage of individual nodes when reading from these. 
-`ReadFrom` now exposes a `isOrderSensitive()` method to indicate whether a `ReadFrom` setting is order-sensitive or whether respecting order isn't required.
-Custom `ReadFrom` implementations should consider this change. 
-`ReadFrom.ANY` is a newly introduced setting that allows reading from any node (master or a qualified replica) without an ordering preference if multiple replicas qualify for reading.
+Lettuce supports all response types except attributes. Push messages are only supported for Pub/Sub messages.
+Newly established connections default to RESP2 to avoid issues with Redis parts that do not properly support RESP3 yet (such as Redis Sentinel). These are known issues and to be addressed by future Redis releases.
 
-Codec enhancements
------------------
+The protocol version can be changed through `ClientOptions`:
 
-As of this release, we ship two notable enhancements for codecs:
+```java
+ClientOptions options = ClientOptions.builder().protocolVersion(ProtocolVersion.RESP3).build();
+```
 
-* `CipherCodec` for transparent encryption and decryption of values.
-* Codec composition through `RedisCodec.of(…)` to set up a composed codec from a key and a value codec.
+Future versions are going to discover the protocol version as part of the connection handshake and use the newest available protocol version.
 
-`CipherCodec` is created by using a delegate codec and `CipherSupplier` for encryption and decryption. Values are encoded first and then encrypted before values are written to Redis.
+ACL Authentication
+------------------
 
-```java
-SecretKeySpec key = …;
-CipherCodec.CipherSupplier encrypt = new CipherCodec.CipherSupplier() {
-    @Override
-    public Cipher get(CipherCodec.KeyDescriptor keyDescriptor) throws GeneralSecurityException {
+Redis 6 supports authentication using username and password. Lettuce's `RedisURI` adapts to this change by allowing to specify a username:
 
-        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
-        cipher.init(Cipher.DECRYPT_MODE, key);
-        return cipher;
-    }
-};
+`redis://username:password@host:port/database`
 
-CipherCodec.CipherSupplier decrypt = (CipherCodec.KeyDescriptor keyDescriptor) -> {
+Using RESP3 or PING on connect authenticates the connection during the handshake phase. Already connected connections may switch the user context by issuing an `AUTH` command with username and password:
 
-    Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
-    cipher.init(Cipher.DECRYPT_MODE, key);
-    return cipher;
-};
-
-RedisCodec<String, String> crypto = CipherCodec.forValues(StringCodec.UTF8, encrypt, decrypt);
+```java
+StatefulRedisConnection<String, String> connection = client.connect();
+RedisCommands<String, String> commands = connection.sync();
+commands.auth("username", "password");
 ```
 
-`CipherCodec` supports multiple keys to increment key versions and to decrypt values with older key versions. The code above is to illustrate how to construct `CipherCodec` and does not guarantee to outline a secure `Cipher` setup that meets your requirements.
+Asynchronous Cluster Topology Refresh
+-------------------------------------
 
-With `RedisCodec.of(…)`, applications can quickly compose a `RedisCodec` of already existing codecs instead of writing an entire codec from scratch. Codec composition is useful to use different codecs for key and value encoding:
+Cluster Topology Refresh was in Lettuce 4 and 5 a blocking and fully synchronous task that required a worker thread. A side-effect of the topology refresh was that command timeouts could be delayed as the worker thread pool was used for timeout tasks and the topology refresh. Lettuce 6 ships with a fully non-blocking topology refresh mechanism which is basically a reimplementation of the previous refresh mechanism but using non-blocking components instead.
 
-```java
-RedisCodec<String, byte[]> composed = RedisCodec.of(StringCodec.ASCII, ByteArrayCodec.INSTANCE);
-```
+API cleanups/Breaking Changes
+-----------------------------
 
-Read more on Codecs at: https://github.com/lettuce-io/lettuce-core/wiki/Codecs
+With this release, we took the opportunity to introduce a series of changes that put the API into a cleaner shape. 
 
-Commands
-------------
-* Add support for "MEMORY USAGE key [SAMPLES count]" #853 (Thanks to @darkaquarius)
-* Add support for XINFO #996 (Thanks to @Erzhoumu)
-* Add support for XGROUP CREATE … MKSTREAM #898 (Thanks to @wenerme)
+* Script Commands: `eval`, `digest`, `scriptLoad` methods now only accept `String` and `byte[]` argument types. Previously `digest` and `scriptLoad` accepted the script contents as Codec value type which caused issues especially when marshalling values using JSON or Java Serialization. The script charset can be configured via `ClientOptions` (`ClientOptions.builder().scriptCharset(StandardCharsets.US_ASCII).build();`), defaulting to UTF-8.
+* Connection: Removal of deprecated timeout methods accepting `TimeUnit`. Use methods accepting `Duration` instead.
+* Async Commands: `RedisAsyncCommands.select(…)` and `.auth(…)` methods return now futures instead if being blocking methods.
+* Asynchronous API Usage: Connection and Queue failures now no longer throw an exception but properly associate the failure with the Future handle.
+* Master/Replica API: Move implementation classes from `io.lettuce.core.masterslave` to `io.lettuce.core.masterreplica` package.
+* Internal: Removal of the internal `LettuceCharsets` utility class.
+* Internal: Reduced visibility of several `protected` fields in `AbstractRedisClient` (`eventLoopGroups`, `genericWorkerPool`, `timer`, `clientResources`, `clientOptions`, `defaultTimeout`).
+* Internal: Consolidation of Future synchronization utilities (`LettuceFutures`, `RefreshFutures`, `Futures`).
 
 Enhancements
 ------------
-* Make adaptive topology refresh better usable for failover/master-slave promotion changes #672 (Thanks to @mudasirale)
-* Allow randomization of read candidates using Redis Cluster #834 (Thanks to @nborole)
-* AsyncExecutions should implement CompletionStage #862
-* BraveTracing should support custom names for the service name #865 (Thanks to @worldtiki)
-* Emit Connection Error events #885 (Thanks to @squishypenguin)
-* Allow usage of publishOn scheduler for reactive signal emission #905
-* Optimize aggregation buffer cleanup in CommandHandler #906 (Thanks to @gavincook)
-* Add shutdown logging to client, ClientResources, and EventLoopGroupProvider #918
-* Add flag to disable reporting of span tags #920 (Thanks to @worldtiki)
-* Optimization: Use Cluster write connections for read commands when using ReadFrom.MASTER #923
-* ByteBuf.release() was not called before it's garbage-collected #930 (Thanks to @zhouzq)
-* Add cipher codec #934
-* Introduce adaptive trigger event #952
-* Deprecate PING on connect option #965
-* Do not require CLIENT LIST in cluster topology refresh #973 (Thanks to @bentharage)
-* Add support for Redis Sentinel authentication #1002 (Thanks to @ssouris)
-* Improve mutators for ClientOptions, ClusterClientOptions, and ClientResources #1003
-* TopologyComparators performance issue #1011 (Thanks to @alessandrosimi-sa)
-* Attach topology retrieval exceptions when Lettuce cannot retrieve a topology update #1024 (Thanks to @StillerRen)
-* Support TLS connections in Sentinel mode #1048 (Thanks to @ae6rt)
-* Reduce object allocations for assertions #1068
-* Reduce object allocations for Cluster topology parsing #1069
-* Support ByteArrayCodec only for values #1122 (Thanks to @dmandalidis)
-* lettuce#ClusterTopologyRefresh is too slow，because of “client list” #1126 (Thanks to @xjs1919)
+* Use channel thread to enqueue commands #617
+* Redesign connection activation #697
+* Add support for RESP3 #964
+* Consolidate Future utils #1039
+* Make RedisAsyncCommands.select() and auth() async #1118 (Thanks to @ikkyuland)
+* Allow client to pick a specific TLS version and introduce PEM-based configuration #1167 (Thanks to @amohtashami12307)
+* Optimization of BITFIELD args generation #1175 (Thanks to @ianpojman)
+* Add mutate() to SocketOptions #1193
+* Add CLIENT ID command #1197
+* Lettuce not able to reconnect automatically to SSL+authenticated ElastiCache node #1201 (Thanks to @chadlwilson)
+* Add support for AUTH with user + password introduced in Redis 6 #1202 (Thanks to @tgrall)
+* HMSET deprecated in version 4.0.0 #1217 (Thanks to @hodur)
+* Allow selection of Heap or Direct buffers for CommandHandler.buffer #1223 (Thanks to @dantheperson)
+* Support JUSTID flag of XCLAIM command #1233 (Thanks to @christophstrobl)
+* Add support for KEEPTTL with SET #1234
+* Add support for RxJava 3 #1235
+* Retrieve username from URI when RedisURI is built from URL #1242 (Thanks to @gkorland)
 
 Fixes
 -----
-* Unable to reconnect Pub/Sub connection with authorization #868 (Thanks to @maestroua)
-* Reduce allocations in topology comparator #870
-* Fix recordCommandLatency to work properly #874 (Thanks to @jongyeol)
-* Bug: Include hostPortString in the error message #876 (Thanks to @LarryBattle)
-* Reference docs CSS prevents HTTPS usage #878
-* ReactiveCommandSegmentCommandFactory resolves StreamingOutput for all reactive types #879 (Thanks to @yozhag)
-* ClassCastException occurs when executing RedisClusterClient::connectPubSub with global timeout feature #895 (Thanks to @be-hase)
-* Flux that reads from a hash, processes elements and writes to a set, completes prematurely #897 (Thanks to @vkurland)
-* Fixed stackoverflow exception inside CommandLatencyCollectorOptions #899 (Thanks to @LarryBattle)
-* PubSubEndpoint.channels and patterns contain duplicate binary channel/pattern names #911 (Thanks to @lwiddershoven)
-* DefaultCommandMethodVerifier reports invalid parameter count #925 (Thanks to @GhaziTriki)
-* Chunked Pub/Sub message receive with interleaved command responses leaves commands uncompleted #936 (Thanks to @GavinTianYang)
-* Fix typo in log message #970 (Thanks to @twz123)
-* Result is lost when published on another executor #986 (Thanks to @trueinsider)
-* Cancel ClusterTopologyRefreshTask in RedisClusterClient.shutdownAsync() #989 (Thanks to @johnsiu)
-* ClassCastException occurs when using RedisCluster with custom-command-interface and Async API #994 (Thanks to @tamanugi)
-* Application-level exceptions in Pub/Sub notifications mess up pub sub decoding state and cause timeouts #997 (Thanks to @giridharkannan)
-* RedisClient.shutdown hangs because event loops terminate before connections are closed #998 (Thanks to @Poorva17)
-* "Knowing Redis" section in documentation has the wrong link for meanings.  #1050 (Thanks to @Raghaava)
-* ClassCastException occurs when using RedisCommandFactory with custom commands #1075 (Thanks to @mdebellefeuille)
-* EventLoop thread blocked by EmitterProcessor.onNext(…) causes timeouts #1086 (Thanks to @trishaarao79)
-* RedisClusterNode without slots is never considered having same slots as an equal object #1089 (Thanks to @y2klyf)
-* RedisClusterClient doesn't respect the SocketOptions connectTimeout #1119 (Thanks to @magnusandy)
-* Remove duplicated ConnectionWatchdog #1132 (Thanks to @mors741)
+* Commands Timeout ignored/not working during refresh #1107 (Thanks to @pendula95)
+* StackOverflowError in RedisPublisher #1140 (Thanks to @csunwold)
+* Incorrect access on io.lettuce.core.ReadFrom.isOrderSensitive() #1145 (Thanks to @orclev)
+* Consider ReadFrom.isOrderSensitive() in cluster scan command #1146
+* Improve log message for nodes that cannot be reached during reconnect/topology refresh #1152 (Thanks to @drewcsillag)
+* BoundedAsyncPool doesn't work with a negative maxTotal #1181 (Thanks to @sguillope)
+* TLS setup fails to a master reported by sentinel #1209 (Thanks to @ae6rt)
+* Lettuce metrics creates lots of long arrays, and gives out of memory error.  #1210 (Thanks to @omjego)
+* CommandSegments.StringCommandType does not implement hashCode()/equals() #1211
+* Unclear documentation about quiet time for RedisClient#shutdown  #1212 (Thanks to @LychakGalina)
+* StreamReadOutput in Lettuce 6 creates body entries containing the stream id #1216
+* Write race condition while migrating/importing a slot #1218 (Thanks to @phyok)
+* randomkey return V not K #1240 (Thanks to @hosunrise)
+* ConcurrentModificationException iterating over partitions #1252 (Thanks to @johnny-costanzo)
+* Replayed activation commands may fail because of their execution sequence #1255 (Thanks to @robertvazan)
+* Fix infinite command timeout #1260
+* Connection leak using pingBeforeActivateConnection when PING fails? #1262 (Thanks to @johnny-costanzo)
 
 Other
 -----
-* Migrate tests to JUnit 5 #430
-* Could not generate CGLIB subclass of class io.lettuce.core.support.ConnectionPoolSupport$1 #843 (Thanks to @peerit12)
-* Adapt to changed terminology for master/replica #845
-* Ability to provide a custom service name for spans #866 (Thanks to @worldtiki)
-* Remove tempusfugit dependency #871
-* Makefile refactor download redis #877 (Thanks to @LarryBattle)
-* Upgrade to Reactor Californium SR1 #883
-* Upgrade to Redis 5 GA #893
-* Document MasterSlave connection behavior on partial node failures #894 (Thanks to @jocull)
-* Upgrade to RxJava 2.2.3 #901
-* Upgrade to Spring Framework 4.3.20.RELEASE #902
-* Upgrade to netty 4.1.30.Final #903
-* Upgrade to Reactor Core 3.2.2.RELEASE #904
-* Deprecate StatefulConnection.reset() #907 (Thanks to @semberal)
-* Upgrade to Reactor Core 3.2.3.RELEASE #931
-* Upgrade to netty 4.1.31.Final #932
-* Upgrade to RxJava 2.2.4 #933
-* Javadoc is missing Javadoc links to Project Reactor types (Flux, Mono) #942
-* Extend year range for 2019 in license headers #950
-* Use ConcurrentHashMap.newKeySet() as replacement of Netty's ConcurrentSet #961
-* Streamline communication sections in readme, issue templates and contribution guide #967
-* Upgrade to stunnel 5.50 #968
-* Replace old reactive API docs #974 (Thanks to @pine)
-* Upgrade to Reactor 3.2.6.RELEASE #975
-* Upgrade to netty 4.1.33.Final #976
-* Upgrade to HdrHistogram 2.1.11 #978
-* Upgrade to RxJava 2.2.6 #979
-* Use JUnit BOM for dependency management and upgrade to JUnit 5.4.0 #980
-* Use logj42 BOM for dependency management and upgrade to 2.11.2 #981
-* Upgrade to AssertJ 3.12.0 #983
-* Upgrade to AssertJ 3.12.1 #991
-* Upgrade to Reactor Core 3.2.8.RELEASE #1006
-* Upgrade to netty 4.1.35.Final #1017
-* Upgrade to Reactor Core 3.3 #1030
-* Upgrade to Brave 5.6 #1031
-* Migrate off TopicProcessor to EmitterProcessor #1032
-* Upgrade to Netty 4.1.36.Final #1033
-* Upgrade to JUnit 5.4.2 #1034
-* Upgrade to Mockito 2.27.0 #1035
-* Upgrade to RxJava 2.2.8 #1036
-* Upgrade build plugin dependencies #1037
-* RedisURI: fix missing "the" in Javadoc #1049 (Thanks to @perlun)
-* Upgrade to RxJava 2.2.9 #1054
-* Upgrade to jsr305 3.0.2 #1055
-* Upgrade TravisCI build to Xenial/Java 11 #1056
-* Upgrade to OpenWebBeans 2.0.11 #1062
-* Simplify Redis…CommandsImpl to accept connection interfaces #1077
-* Upgrade to netty 4.1.38.Final #1093
-* Upgrade to Reactor Core 3.2.11.RELEASE #1094
-* Upgrade to Mockito 3.0 #1095
-* Upgrade to JUnit 5.5.1 #1096
-* Upgrade to Brave 5.6.9 #1097
-* Update plugin versions #1098
-* Upgrade to Commons Pool 2.7.0 #1099
-* Make ListSubscriber public #1103 (Thanks to @jruaux)
-* Upgrade to netty 4.1.42.Final #1131
-* Add default manifest entries and automatic module name #1135
-* Upgrade to Brave 5.7.0 #1136
-* Deprecate Utf8StringCodec in favor or StringCodec.UTF8 #1137
+* Refactor script content argument types to String and byte[] instead of V (value type) #1010 (Thanks to @danielsomekh)
+* Render Redis.toString() to a Redis URI #1040
+* Pass Allocator as RedisStateMachine constructor argument #1053
+* Simplify condition to invoke "resolveCodec" method in AnnotationRedisCodecResolver #1149 (Thanks to @machi1990)
+* Encode database in RedisURI in path when possible #1155
+* Remove LettuceCharsets #1156
+* Move SocketAddress resolution from RedisURI to SocketAddressResolver #1157
+* Remove deprecated timeout methods accepting TimeUnit #1158
+* Upgrade to netty 4.1.43.Final #1161
+* Upgrade to RxJava 2.2.13 #1162
+* Add ByteBuf.touch(…) to aid buffer leak investigation #1164
+* Add warning log if MasterReplica(…, Iterable<RedisURI>) contains multiple Sentinel URIs #1165
+* Adapt GEOHASH tests to 10 chars #1196
+* Migrate Master/Replica support to the appropriate package #1199
+* Disable RedisURIBuilderUnitTests failing on Windows OS #1204 (Thanks to @kshchepanovskyi)
+* Provide a default port(DEFAULT_REDIS_PORT) to RedisURI's Builder inst… #1205 (Thanks to @hepin1989)
+* Update code for pub/sub to listen on the stateful connection object. #1207 (Thanks to @judepereira)
+* Un-deprecate ClientOptions.pingBeforeActivateConnection #1208
+* Use consistently a shutdown timeout of 2 seconds in all AbstractRedisClient.shutdown methods #1214
+* Release Lettuce 5.2.2.RELEASE #1222
+* Upgrade dependencies #1224
+* Upgrade dependencies #1225
+* RedisURI class does not parse password when using redis-sentinel #1232 (Thanks to @kyrogue)
+* Reduce log level to DEBUG for native library logging #1238 (Thanks to @DevJoey)
+* upgrade netty to 4.1.47.Final #1239 (Thanks to @m1ngyuan)
+* Reduce visibility of fields in AbstractRedisClient #1241
+* Upgrade to stunnel 5.56 #1246
+* Add build profiles for multiple Java versions #1247
+* Replace outdated Sonatype parent POM with plugin definitions #1258
+* Upgrade dependencies #1259
+* Upgrade to RxJava 3.0.2 #1261

From 78a8ce9ffed85ae6143067e5f1b77acf7bb61971 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 16 Apr 2020 20:59:10 +0200
Subject: [PATCH 779/808] Enable Sentinel integration tests #1266

---
 .../lettuce/core/UnixDomainSocketIntegrationTests.java   | 3 ---
 .../masterreplica/CustomCommandIntegrationTests.java     | 1 -
 .../MasterReplicaSentinelSslIntegrationTests.java        | 1 -
 .../masterslave/MasterSlaveSentinelIntegrationTests.java | 1 -
 .../core/sentinel/SentinelCommandIntegrationTests.java   | 1 -
 .../sentinel/SentinelConnectionIntegrationTests.java     | 1 -
 .../sentinel/SentinelServerCommandIntegrationTests.java  | 1 -
 .../core/sentinel/SentinelSslIntegrationTests.java       | 1 -
 .../sentinel/reactive/SentinelReactiveCommandTest.java   | 1 -
 .../reactive/SentinelServerReactiveCommandTest.java      | 2 --
 src/test/resources/log4j2-test.xml                       | 9 ++-------
 11 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java b/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java
index ed2015f7f7..be7a7d0ac1 100644
--- a/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/UnixDomainSocketIntegrationTests.java
@@ -94,7 +94,6 @@ void standalone_ConnectToSocket() throws Exception {
         FastShutdown.shutdown(redisClient);
     }
 
-    @Disabled("https://github.com/antirez/redis/issues/6160")
     @Test
     void sentinel_RedisClientWithSocket() throws Exception {
 
@@ -120,7 +119,6 @@ void sentinel_RedisClientWithSocket() throws Exception {
         FastShutdown.shutdown(redisClient);
     }
 
-    @Disabled("https://github.com/antirez/redis/issues/6160")
     @Test
     void sentinel_ConnectToSocket() throws Exception {
 
@@ -146,7 +144,6 @@ void sentinel_ConnectToSocket() throws Exception {
         FastShutdown.shutdown(redisClient);
     }
 
-    @Disabled("https://github.com/antirez/redis/issues/6160")
     @Test
     void sentinel_socket_and_inet() throws Exception {
 
diff --git a/src/test/java/io/lettuce/core/masterreplica/CustomCommandIntegrationTests.java b/src/test/java/io/lettuce/core/masterreplica/CustomCommandIntegrationTests.java
index 0563efd7c1..9f3eb462d7 100644
--- a/src/test/java/io/lettuce/core/masterreplica/CustomCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterreplica/CustomCommandIntegrationTests.java
@@ -43,7 +43,6 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-@RedisBug("https://github.com/antirez/redis/issues/6160")
 class CustomCommandIntegrationTests extends TestSupport {
 
     private final RedisClient redisClient;
diff --git a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java
index 950459fcbd..c739db6d3e 100644
--- a/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterreplica/MasterReplicaSentinelSslIntegrationTests.java
@@ -40,7 +40,6 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-@RedisBug("https://github.com/antirez/redis/issues/6160")
 class MasterReplicaSentinelSslIntegrationTests extends TestSupport {
 
     private final ClientResources clientResources;
diff --git a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
index 4e1ec5e8f1..8503120cf4 100644
--- a/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/masterslave/MasterSlaveSentinelIntegrationTests.java
@@ -43,7 +43,6 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-@RedisBug("https://github.com/antirez/redis/issues/6160")
 class MasterSlaveSentinelIntegrationTests extends TestSupport {
 
     private final Pattern pattern = Pattern.compile("role:(\\w+)");
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java
index 7dec3406bc..c8ef77a33d 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelCommandIntegrationTests.java
@@ -47,7 +47,6 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-@RedisBug("https://github.com/antirez/redis/issues/6160")
 public class SentinelCommandIntegrationTests extends TestSupport {
 
     private final RedisClient redisClient;
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
index 3ed6a99a25..21936437b7 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelConnectionIntegrationTests.java
@@ -45,7 +45,6 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-@RedisBug("https://github.com/antirez/redis/issues/6160")
 public class SentinelConnectionIntegrationTests extends TestSupport {
 
     private final RedisClient redisClient;
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java
index 64a511ad5c..206d03c094 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelServerCommandIntegrationTests.java
@@ -41,7 +41,6 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-@RedisBug("https://github.com/antirez/redis/issues/6160")
 public class SentinelServerCommandIntegrationTests extends TestSupport {
 
     private final RedisClient redisClient;
diff --git a/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java b/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java
index a9be5c5885..4ac52592d0 100644
--- a/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/sentinel/SentinelSslIntegrationTests.java
@@ -46,7 +46,6 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-@RedisBug("https://github.com/antirez/redis/issues/6160")
 class SentinelSslIntegrationTests extends TestSupport {
 
     private static final File TRUSTSTORE_FILE = new File("work/truststore.jks");
diff --git a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
index 6638d97986..5566974f15 100644
--- a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelReactiveCommandTest.java
@@ -27,7 +27,6 @@
 /**
  * @author Mark Paluch
  */
-@RedisBug("https://github.com/antirez/redis/issues/6160")
 public class SentinelReactiveCommandTest extends SentinelCommandIntegrationTests {
 
     @Inject
diff --git a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
index f48e32d98e..804c61e091 100644
--- a/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
+++ b/src/test/java/io/lettuce/core/sentinel/reactive/SentinelServerReactiveCommandTest.java
@@ -17,7 +17,6 @@
 
 import javax.inject.Inject;
 
-import io.lettuce.RedisBug;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.sentinel.SentinelServerCommandIntegrationTests;
 import io.lettuce.core.sentinel.api.StatefulRedisSentinelConnection;
@@ -27,7 +26,6 @@
 /**
  * @author Mark Paluch
  */
-@RedisBug("https://github.com/antirez/redis/issues/6160")
 public class SentinelServerReactiveCommandTest extends SentinelServerCommandIntegrationTests {
 
     @Inject
diff --git a/src/test/resources/log4j2-test.xml b/src/test/resources/log4j2-test.xml
index 34425b8f28..7969c32138 100644
--- a/src/test/resources/log4j2-test.xml
+++ b/src/test/resources/log4j2-test.xml
@@ -3,21 +3,16 @@
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
             <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} [%-5p] [%t] %m (%c{1}:%L)%n"/>
-            <ThresholdFilter level="FATAL"/>
         </Console>
 
         <File name="File" fileName="target/lettuce.log" bufferedIO="true">
             <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} [%-5p] [%t] %m (%c{1}:%L)%n"/>
-            <ThresholdFilter level="FATAL"/>
         </File>
     </Appenders>
 
     <Loggers>
-        <Logger name="io.netty" level="INFO"/>
-        <Logger name="io.lettuce.core" level="INFO"/>
-        <Logger name="io.lettuce.core.cluster" level="INFO"/>
-        <Logger name="io.lettuce.core.protocol" level="INFO"/>
-        <Root level="INFO">
+        <Logger name="io.lettuce.core.protocol" level="FATAL"/>
+        <Root level="FATAL">
             <AppenderRef ref="Console"/>
             <AppenderRef ref="File"/>
         </Root>

From 2c2f608ef8336d4fae426673135c4ff490426066 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 16 Apr 2020 20:59:27 +0200
Subject: [PATCH 780/808] Fix SSL and client name propagation for Redis
 Sentinel #1266

---
 .../java/io/lettuce/core/RedisClient.java     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index 28ee21ab0f..d24528630e 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -500,7 +500,7 @@ private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectS
         logger.debug("Trying to get a Redis Sentinel connection for one of: " + redisURI.getSentinels());
 
         if (redisURI.getSentinels().isEmpty() && (isNotEmpty(redisURI.getHost()) || !isEmpty(redisURI.getSocket()))) {
-            return doConnectSentinelAsync(codec, redisURI, timeout).toCompletableFuture();
+            return doConnectSentinelAsync(codec, redisURI, timeout, redisURI.getClientName()).toCompletableFuture();
         }
 
         List<RedisURI> sentinels = redisURI.getSentinels();
@@ -512,7 +512,7 @@ private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectS
         for (RedisURI uri : sentinels) {
 
             Mono<StatefulRedisSentinelConnection<K, V>> connectionMono = Mono
-                    .fromCompletionStage(() -> doConnectSentinelAsync(codec, uri, timeout))
+                    .fromCompletionStage(() -> doConnectSentinelAsync(codec, uri, timeout, redisURI.getClientName()))
                     .onErrorMap(CompletionException.class, Throwable::getCause)
                     .onErrorMap(e -> new RedisConnectionException("Cannot connect Redis Sentinel at " + uri, e))
                     .doOnError(exceptionCollector::add);
@@ -547,9 +547,16 @@ private <K, V> CompletableFuture<StatefulRedisSentinelConnection<K, V>> connectS
     }
 
     private <K, V> ConnectionFuture<StatefulRedisSentinelConnection<K, V>> doConnectSentinelAsync(RedisCodec<K, V> codec,
-            RedisURI redisURI, Duration timeout) {
+            RedisURI redisURI, Duration timeout, String clientName) {
 
-        ConnectionBuilder connectionBuilder = ConnectionBuilder.connectionBuilder();
+        ConnectionBuilder connectionBuilder;
+        if (redisURI.isSsl()) {
+            SslConnectionBuilder sslConnectionBuilder = SslConnectionBuilder.sslConnectionBuilder();
+            sslConnectionBuilder.ssl(redisURI);
+            connectionBuilder = sslConnectionBuilder;
+        } else {
+            connectionBuilder = ConnectionBuilder.connectionBuilder();
+        }
         connectionBuilder.clientOptions(ClientOptions.copyOf(getOptions()));
         connectionBuilder.clientResources(getResources());
 
@@ -564,6 +571,10 @@ private <K, V> ConnectionFuture<StatefulRedisSentinelConnection<K, V>> doConnect
         ConnectionState state = connection.getConnectionState();
 
         state.apply(redisURI);
+        if (LettuceStrings.isEmpty(state.getClientName())) {
+            state.setClientName(clientName);
+        }
+
         connectionBuilder.connectionInitializer(createHandshake(state));
 
         logger.debug("Connecting to Redis Sentinel, address: " + redisURI);

From 7fbf9cb8a30060bd6a9f27f7728e6706c800caf3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 23 Apr 2020 15:43:48 +0200
Subject: [PATCH 781/808] Enable Stream commands for read-only routing #1271

XINFO, XLEN, XPENDING, XRANGE, XREVRANGE, and XREAD can now be issued to replicas.
---
 src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java   | 4 +++-
 .../java/io/lettuce/core/masterreplica/ReadOnlyCommands.java  | 4 +++-
 .../io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
index 7eddc21180..5bb32db0c5 100644
--- a/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
@@ -59,7 +59,9 @@ enum CommandName {
         HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, PFCOUNT, PTTL, //
         RANDOMKEY, READWRITE, SCAN, SCARD, SCRIPT, //
         SDIFF, SINTER, SISMEMBER, SMEMBERS, SRANDMEMBER, SSCAN, STRLEN, //
-        SUNION, TIME, TTL, TYPE, ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE, //
+        SUNION, TIME, TTL, TYPE, //
+        XINFO, XLEN, XPENDING, XRANGE, XREVRANGE, XREAD, //
+        ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE, //
         ZRANGEBYLEX, ZRANGEBYSCORE, ZRANK, ZREVRANGE, ZREVRANGEBYLEX, ZREVRANGEBYSCORE, ZREVRANK, ZSCAN, ZSCORE, //
 
         // Pub/Sub commands are no key-space commands so they are safe to execute on replica nodes
diff --git a/src/main/java/io/lettuce/core/masterreplica/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/masterreplica/ReadOnlyCommands.java
index 380542cd93..eaecd0d793 100644
--- a/src/main/java/io/lettuce/core/masterreplica/ReadOnlyCommands.java
+++ b/src/main/java/io/lettuce/core/masterreplica/ReadOnlyCommands.java
@@ -59,7 +59,9 @@ enum CommandName {
         HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, PFCOUNT, PTTL, //
         RANDOMKEY, READWRITE, SCAN, SCARD, SCRIPT, //
         SDIFF, SINTER, SISMEMBER, SMEMBERS, SRANDMEMBER, SSCAN, STRLEN, //
-        SUNION, TIME, TTL, TYPE, ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE, //
+        SUNION, TIME, TTL, TYPE, //
+        XINFO, XLEN, XPENDING, XRANGE, XREVRANGE, XREAD, //
+        ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE, //
         ZRANGEBYLEX, ZRANGEBYSCORE, ZRANK, ZREVRANGE, ZREVRANGEBYLEX, ZREVRANGEBYSCORE, ZREVRANK, ZSCAN, ZSCORE,
     }
 }
diff --git a/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java
index ef8bb5d619..545e46aa55 100644
--- a/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java
@@ -29,7 +29,7 @@ class ReadOnlyCommandsUnitTests {
 
     @Test
     void testCount() {
-        assertThat(ReadOnlyCommands.getReadOnlyCommands()).hasSize(70);
+        assertThat(ReadOnlyCommands.getReadOnlyCommands()).hasSize(76);
     }
 
     @Test

From 4375f2ea772c9741530d5c157f066b3aeae6c441 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 23 Apr 2020 15:45:56 +0200
Subject: [PATCH 782/808] Polishing #1271

Forward-port of GEO read-only commands.
---
 src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java   | 2 +-
 .../io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
index 5bb32db0c5..579860c9df 100644
--- a/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
@@ -54,7 +54,7 @@ public static Set<CommandType> getReadOnlyCommands() {
 
     enum CommandName {
         ASKING, BITCOUNT, BITPOS, CLIENT, COMMAND, DUMP, ECHO, EVAL, EVALSHA, EXISTS, //
-        GEODIST, GEOPOS, GEORADIUS, GEORADIUSBYMEMBER, GEOHASH, GET, GETBIT, //
+        GEODIST, GEOPOS, GEORADIUS, GEORADIUS_RO, GEORADIUSBYMEMBER, GEORADIUSBYMEMBER_RO, GEOHASH, GET, GETBIT, //
         GETRANGE, HEXISTS, HGET, HGETALL, HKEYS, HLEN, HMGET, HSCAN, HSTRLEN, //
         HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, PFCOUNT, PTTL, //
         RANDOMKEY, READWRITE, SCAN, SCARD, SCRIPT, //
diff --git a/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java
index 545e46aa55..453307908b 100644
--- a/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsUnitTests.java
@@ -23,13 +23,15 @@
 import io.lettuce.core.protocol.ProtocolKeyword;
 
 /**
+ * Tests for {@link ReadOnlyCommands}.
+ * 
  * @author Mark Paluch
  */
 class ReadOnlyCommandsUnitTests {
 
     @Test
     void testCount() {
-        assertThat(ReadOnlyCommands.getReadOnlyCommands()).hasSize(76);
+        assertThat(ReadOnlyCommands.getReadOnlyCommands()).hasSize(78);
     }
 
     @Test

From c6fe4eedb26745d1c0036a078f25ca8d6c979478 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 23 Apr 2020 15:51:10 +0200
Subject: [PATCH 783/808] Remove Java 11 from build matrix

Because it contains a stupid compiler bug that was fixed only in later versions.
---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c268cad67e..3b53e9645a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,8 +30,6 @@ jobs:
       env:
         - JDK='OpenJDK 8'
         - REDIS=3.2
-    - jdk: openjdk11
-      env: JDK='OpenJDK 11'
     - env: JDK='OpenJDK 12'
       before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 12
     - env: JDK='OpenJDK 13'

From c2d073a113fcdfe1d95a5791d9a71c550e5abd35 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 27 Apr 2020 09:48:27 +0200
Subject: [PATCH 784/808] Refactor PauseDetector retrieval #1269
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We now eagerly attempt to obtain a PauseDetector instance to avoid additional locks leading to cyclic locks by using computeIfAbsent(…).

DefaultPauseDetectorWrapper.release/retain methods now ensure that these methods cannot be called concurrently and getPauseDetector() uses now a busy-spin instead of Thread.sleep(…).
---
 .../DefaultCommandLatencyCollector.java       | 121 +++++++++++-------
 1 file changed, 74 insertions(+), 47 deletions(-)

diff --git a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
index 829cf44b07..a7191ee3f3 100644
--- a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
@@ -27,13 +27,13 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
-import java.util.function.Function;
 
 import org.HdrHistogram.Histogram;
 import org.LatencyUtils.LatencyStats;
 import org.LatencyUtils.PauseDetector;
 import org.LatencyUtils.SimplePauseDetector;
 
+import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.metrics.CommandMetrics.CommandLatency;
 import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.protocol.ProtocolKeyword;
@@ -60,33 +60,19 @@ public class DefaultCommandLatencyCollector implements CommandLatencyCollector {
 
     private final CommandLatencyCollectorOptions options;
 
-    // Updated via PAUSE_DETECTOR_UPDATER
-    private volatile PauseDetectorWrapper pauseDetectorWrapper;
-
     private final AtomicReference<Map<CommandLatencyId, Latencies>> latencyMetricsRef = new AtomicReference<>(
             createNewLatencyMap());
 
+    // Updated via PAUSE_DETECTOR_UPDATER
+    private volatile PauseDetectorWrapper pauseDetectorWrapper;
+
     private volatile boolean stopped;
-    private final Function<CommandLatencyId, Latencies> createLatencies;
 
     public DefaultCommandLatencyCollector(CommandLatencyCollectorOptions options) {
 
-        this.options = options;
-        this.createLatencies = id -> {
-
-            if (PAUSE_DETECTOR_UPDATER.get(this) == null) {
-                if (PAUSE_DETECTOR_UPDATER.compareAndSet(this, null, GLOBAL_PAUSE_DETECTOR)) {
-                    PAUSE_DETECTOR_UPDATER.get(this).retain();
-                }
-            }
-            PauseDetector pauseDetector = ((DefaultPauseDetectorWrapper) PAUSE_DETECTOR_UPDATER.get(this)).getPauseDetector();
-
-            if (options.resetLatenciesAfterEvent()) {
-                return new Latencies(pauseDetector);
-            }
+        LettuceAssert.notNull(options, "CommandLatencyCollectorOptions must not be null");
 
-            return new CummulativeLatencies(pauseDetector);
-        };
+        this.options = options;
     }
 
     /**
@@ -105,7 +91,21 @@ public void recordCommandLatency(SocketAddress local, SocketAddress remote, Prot
             return;
         }
 
-        Latencies latencies = latencyMetricsRef.get().computeIfAbsent(createId(local, remote, commandType), createLatencies);
+        if (PAUSE_DETECTOR_UPDATER.get(this) == null) {
+            if (PAUSE_DETECTOR_UPDATER.compareAndSet(this, null, GLOBAL_PAUSE_DETECTOR)) {
+                PAUSE_DETECTOR_UPDATER.get(this).retain();
+            }
+        }
+        PauseDetector pauseDetector = ((DefaultPauseDetectorWrapper) PAUSE_DETECTOR_UPDATER.get(this)).getPauseDetector();
+
+        Latencies latencies = latencyMetricsRef.get().computeIfAbsent(createId(local, remote, commandType), id -> {
+
+            if (options.resetLatenciesAfterEvent()) {
+                return new Latencies(pauseDetector);
+            }
+
+            return new CummulativeLatencies(pauseDetector);
+        });
 
         latencies.firstResponse.recordLatency(rangify(firstResponseLatency));
         latencies.completion.recordLatency(rangify(completionLatency));
@@ -191,13 +191,13 @@ private CommandLatency getMetric(Histogram histogram) {
         Map<Double, Long> percentiles = getPercentiles(histogram);
 
         TimeUnit timeUnit = options.targetUnit();
-        return new CommandLatency(timeUnit.convert(histogram.getMinValue(), TimeUnit.NANOSECONDS), timeUnit.convert(
-                histogram.getMaxValue(), TimeUnit.NANOSECONDS), percentiles);
+        return new CommandLatency(timeUnit.convert(histogram.getMinValue(), TimeUnit.NANOSECONDS),
+                timeUnit.convert(histogram.getMaxValue(), TimeUnit.NANOSECONDS), percentiles);
     }
 
     private Map<Double, Long> getPercentiles(Histogram histogram) {
 
-        Map<Double, Long> percentiles = new TreeMap<Double, Long>();
+        Map<Double, Long> percentiles = new TreeMap<>();
         for (double targetPercentile : options.targetPercentiles()) {
             percentiles.put(targetPercentile,
                     options.targetUnit().convert(histogram.getValueAtPercentile(targetPercentile), TimeUnit.NANOSECONDS));
@@ -345,57 +345,84 @@ static class DefaultPauseDetectorWrapper implements PauseDetectorWrapper {
         private static final AtomicLong instanceCounter = new AtomicLong();
 
         private final AtomicLong counter = new AtomicLong();
+        private final Object mutex = new Object();
 
         private volatile PauseDetector pauseDetector;
+        private volatile Thread shutdownHook;
 
         /**
-         * Creates or initializes a {@link PauseDetector} instance.
-         *
+         * Obtain the current {@link PauseDetector}. Requires a call to {@link #retain()} first.
+         * 
          * @return
          */
-        PauseDetector getPauseDetector() {
+        public PauseDetector getPauseDetector() {
 
-            while (pauseDetector == null) {
+            for (;;) {
 
-                try {
-                    Thread.sleep(1);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    return pauseDetector;
+                if (pauseDetector != null) {
+                    break;
                 }
             }
 
             return pauseDetector;
         }
 
+        /**
+         * Creates or initializes a {@link PauseDetector} instance after incrementing the usage counter to one. Should be
+         * {@link #release() released} once it is no longer in use.
+         */
         public void retain() {
 
             if (counter.incrementAndGet() == 1) {
 
-                if (instanceCounter.getAndIncrement() > 0) {
-                    InternalLogger instance = InternalLoggerFactory.getInstance(getClass());
-                    instance.info("Initialized PauseDetectorWrapper more than once.");
-                }
+                // Avoid concurrent calls to retain/release
+                synchronized (mutex) {
+
+                    if (instanceCounter.getAndIncrement() > 0) {
+                        InternalLogger instance = InternalLoggerFactory.getInstance(getClass());
+                        instance.info("Initialized PauseDetectorWrapper more than once.");
+                    }
 
-                pauseDetector = new SimplePauseDetector(TimeUnit.MILLISECONDS.toNanos(10), TimeUnit.MILLISECONDS.toNanos(10), 3);
-                Runtime.getRuntime().addShutdownHook(new Thread("ShutdownHook for SimplePauseDetector") {
-                    @Override
-                    public void run() {
-                        if (pauseDetector != null) {
+                    PauseDetector pauseDetector = new SimplePauseDetector(TimeUnit.MILLISECONDS.toNanos(10),
+                            TimeUnit.MILLISECONDS.toNanos(10), 3);
+
+                    shutdownHook = new Thread("ShutdownHook for SimplePauseDetector") {
+                        @Override
+                        public void run() {
                             pauseDetector.shutdown();
                         }
-                    }
-                });
+                    };
+
+                    this.pauseDetector = pauseDetector;
+                    Runtime.getRuntime().addShutdownHook(shutdownHook);
+                }
             }
         }
 
+        /**
+         * Decrements the usage counter. When reaching {@code 0}, the {@link PauseDetector} instance is released.
+         */
         public void release() {
 
             if (counter.decrementAndGet() == 0) {
 
-                instanceCounter.decrementAndGet();
-                pauseDetector.shutdown();
-                pauseDetector = null;
+                // Avoid concurrent calls to retain/release
+                synchronized (mutex) {
+
+                    instanceCounter.decrementAndGet();
+
+                    pauseDetector.shutdown();
+                    pauseDetector = null;
+
+                    try {
+                        Runtime.getRuntime().removeShutdownHook(shutdownHook);
+                    } catch (IllegalStateException e) {
+                        // Do not prevent shutdown
+                        // java.lang.IllegalStateException: Shutdown in progress
+                    }
+
+                    shutdownHook = null;
+                }
             }
         }
     }

From 290f8273dcff06b875925b5dce41846be8fad26f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 27 Apr 2020 09:57:39 +0200
Subject: [PATCH 785/808] Polishing

Correctly bubble InterruptedExceptions
---
 .../core/cluster/NodeSelectionInvocationHandler.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
index 7315c61f8b..5b407cd55c 100644
--- a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
@@ -25,10 +25,7 @@
 
 import org.reactivestreams.Publisher;
 
-import io.lettuce.core.ExceptionFactory;
-import io.lettuce.core.RedisCommandExecutionException;
-import io.lettuce.core.RedisCommandInterruptedException;
-import io.lettuce.core.RedisCommandTimeoutException;
+import io.lettuce.core.*;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.api.NodeSelectionSupport;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
@@ -215,6 +212,11 @@ private static boolean awaitAll(long timeout, TimeUnit unit, Collection<Completi
             complete = true;
         } catch (TimeoutException e) {
             complete = false;
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RedisCommandInterruptedException(e);
+        } catch (ExecutionException e) {
+            throw new RedisException(e.getCause());
         } catch (Exception e) {
             throw new RedisCommandInterruptedException(e);
         }

From bfaafc3baca4ea66f73fed88fb904de42ad5eede Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 27 Apr 2020 11:07:19 +0200
Subject: [PATCH 786/808] Consolidate exception translation and bubbling #1275

Exceptions are unwrapped now in a single utility. Future synchronization properly creates exception wrappers to associate the local stack trace with the exception.
---
 .../io/lettuce/core/AbstractRedisClient.java  |  30 +----
 .../java/io/lettuce/core/RedisClient.java     |   1 +
 .../java/io/lettuce/core/RedisPublisher.java  |   1 +
 .../core/cluster/MultiNodeExecution.java      |  35 +++---
 .../NodeSelectionInvocationHandler.java       |  14 +--
 .../PooledClusterConnectionProvider.java      |  19 +--
 .../core/cluster/RedisClusterClient.java      |  30 ++---
 .../core/cluster/topology/Connections.java    |   2 +-
 .../DefaultClusterTopologyRefresh.java        |  13 +-
 .../core/{ => internal}/ExceptionFactory.java |  12 +-
 .../io/lettuce/core/internal/Exceptions.java  | 111 ++++++++++++++++++
 .../io/lettuce/core/internal/Futures.java     |  34 +-----
 .../core/masterreplica/Exceptions.java        |  60 ----------
 .../MasterReplicaConnectionProvider.java      |  17 ++-
 .../MasterReplicaTopologyProvider.java        |   1 +
 .../SentinelTopologyProvider.java             |   1 +
 .../StaticMasterReplicaTopologyProvider.java  |   1 +
 .../io/lettuce/core/output/MultiOutput.java   |   2 +-
 .../lettuce/core/protocol/AsyncCommand.java   |   2 +-
 .../core/protocol/CommandExpiryWriter.java    |   2 +-
 .../core/protocol/RedisHandshakeHandler.java  |   2 +-
 .../core/ExceptionFactoryUnitTests.java       |   2 +
 ...ledClusterConnectionProviderUnitTests.java |  44 +++----
 23 files changed, 202 insertions(+), 234 deletions(-)
 rename src/main/java/io/lettuce/core/{ => internal}/ExceptionFactory.java (95%)
 create mode 100644 src/main/java/io/lettuce/core/internal/Exceptions.java
 delete mode 100644 src/main/java/io/lettuce/core/masterreplica/Exceptions.java

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
index d794d968ab..e631606866 100644
--- a/src/main/java/io/lettuce/core/AbstractRedisClient.java
+++ b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -28,6 +28,7 @@
 import reactor.core.publisher.Mono;
 import io.lettuce.core.Transports.NativeTransports;
 import io.lettuce.core.internal.AsyncCloseable;
+import io.lettuce.core.internal.Exceptions;
 import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.ConnectionWatchdog;
@@ -291,12 +292,7 @@ protected <T> T getConnection(ConnectionFuture<T> connectionFuture) {
             Thread.currentThread().interrupt();
             throw RedisConnectionException.create(connectionFuture.getRemoteAddress(), e);
         } catch (Exception e) {
-
-            if (e instanceof ExecutionException) {
-                throw RedisConnectionException.create(connectionFuture.getRemoteAddress(), e.getCause());
-            }
-
-            throw RedisConnectionException.create(connectionFuture.getRemoteAddress(), e);
+            throw RedisConnectionException.create(connectionFuture.getRemoteAddress(), Exceptions.unwrap(e));
         }
     }
 
@@ -318,12 +314,7 @@ protected <T> T getConnection(CompletableFuture<T> connectionFuture) {
             Thread.currentThread().interrupt();
             throw RedisConnectionException.create(e);
         } catch (Exception e) {
-
-            if (e instanceof ExecutionException) {
-                throw RedisConnectionException.create(e.getCause());
-            }
-
-            throw RedisConnectionException.create(e);
+            throw RedisConnectionException.create(Exceptions.unwrap(e));
         }
     }
 
@@ -467,21 +458,8 @@ public void shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
 
         try {
             shutdownAsync(quietPeriod, timeout, timeUnit).get();
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (ExecutionException e) {
-
-            if (e.getCause() instanceof RedisCommandExecutionException) {
-                throw ExceptionFactory.createExecutionException(e.getCause().getMessage(), e.getCause());
-            }
-
-            throw new RedisException(e.getCause());
-        } catch (InterruptedException e) {
-
-            Thread.currentThread().interrupt();
-            throw new RedisCommandInterruptedException(e);
         } catch (Exception e) {
-            throw ExceptionFactory.createExecutionException(null, e);
+            throw Exceptions.bubble(e);
         }
     }
 
diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
index d24528630e..618f43c1d2 100644
--- a/src/main/java/io/lettuce/core/RedisClient.java
+++ b/src/main/java/io/lettuce/core/RedisClient.java
@@ -29,6 +29,7 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.function.Supplier;
 
+import io.lettuce.core.internal.ExceptionFactory;
 import reactor.core.publisher.Mono;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.RedisCodec;
diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
index 108718f048..b7bb6eea9b 100644
--- a/src/main/java/io/lettuce/core/RedisPublisher.java
+++ b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -28,6 +28,7 @@
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 
+import io.lettuce.core.internal.ExceptionFactory;
 import reactor.core.CoreSubscriber;
 import reactor.core.Exceptions;
 import reactor.util.context.Context;
diff --git a/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java b/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
index 9081262596..87ef643947 100644
--- a/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
+++ b/src/main/java/io/lettuce/core/cluster/MultiNodeExecution.java
@@ -22,8 +22,8 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import io.lettuce.core.RedisCommandInterruptedException;
-import io.lettuce.core.RedisException;
 import io.lettuce.core.RedisFuture;
+import io.lettuce.core.internal.Exceptions;
 
 /**
  * Utility to perform and synchronize command executions on multiple cluster nodes.
@@ -35,11 +35,8 @@ class MultiNodeExecution {
     static <T> T execute(Callable<T> function) {
         try {
             return function.call();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new RedisCommandInterruptedException(e);
         } catch (Exception e) {
-            throw new RedisException(e);
+            throw Exceptions.bubble(e);
         }
     }
 
@@ -75,14 +72,14 @@ protected static <T> RedisFuture<T> firstOfAsync(Map<?, ? extends CompletionStag
 
         return new PipelinedRedisFuture<>(executions, objectPipelinedRedisFuture -> {
             // make sure, that all futures are executed before returning the result.
-                for (CompletionStage<T> future : executions.values()) {
-                    execute(() -> future.toCompletableFuture().get());
-                }
-                for (CompletionStage<T> future : executions.values()) {
-                    return execute(() -> future.toCompletableFuture().get());
-                }
-                return null;
-            });
+            for (CompletionStage<T> future : executions.values()) {
+                execute(() -> future.toCompletableFuture().get());
+            }
+            for (CompletionStage<T> future : executions.values()) {
+                return execute(() -> future.toCompletableFuture().get());
+            }
+            return null;
+        });
     }
 
     /**
@@ -96,12 +93,12 @@ static <T> RedisFuture<T> lastOfAsync(Map<?, ? extends CompletionStage<T>> execu
 
         return new PipelinedRedisFuture<>(executions, objectPipelinedRedisFuture -> {
             // make sure, that all futures are executed before returning the result.
-                T result = null;
-                for (CompletionStage<T> future : executions.values()) {
-                    result = execute(() -> future.toCompletableFuture().get());
-                }
-                return result;
-            });
+            T result = null;
+            for (CompletionStage<T> future : executions.values()) {
+                result = execute(() -> future.toCompletableFuture().get());
+            }
+            return result;
+        });
     }
 
     /**
diff --git a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
index 5b407cd55c..20ea689307 100644
--- a/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
+++ b/src/main/java/io/lettuce/core/cluster/NodeSelectionInvocationHandler.java
@@ -25,13 +25,12 @@
 
 import org.reactivestreams.Publisher;
 
-import io.lettuce.core.*;
+import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.RedisCommandTimeoutException;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.api.NodeSelectionSupport;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
-import io.lettuce.core.internal.AbstractInvocationHandler;
-import io.lettuce.core.internal.LettuceAssert;
-import io.lettuce.core.internal.TimeoutProvider;
+import io.lettuce.core.internal.*;
 import io.lettuce.core.protocol.RedisCommand;
 
 /**
@@ -212,13 +211,8 @@ private static boolean awaitAll(long timeout, TimeUnit unit, Collection<Completi
             complete = true;
         } catch (TimeoutException e) {
             complete = false;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new RedisCommandInterruptedException(e);
-        } catch (ExecutionException e) {
-            throw new RedisException(e.getCause());
         } catch (Exception e) {
-            throw new RedisCommandInterruptedException(e);
+            throw Exceptions.bubble(e);
         }
 
         return complete;
diff --git a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
index 1efcfb8a3d..4e9f119551 100644
--- a/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/cluster/PooledClusterConnectionProvider.java
@@ -33,10 +33,7 @@
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.codec.RedisCodec;
-import io.lettuce.core.internal.AsyncConnectionProvider;
-import io.lettuce.core.internal.Futures;
-import io.lettuce.core.internal.HostAndPort;
-import io.lettuce.core.internal.LettuceAssert;
+import io.lettuce.core.internal.*;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.netty.util.internal.logging.InternalLogger;
@@ -87,15 +84,8 @@ public StatefulRedisConnection<K, V> getConnection(Intent intent, int slot) {
 
         try {
             return getConnectionAsync(intent, slot).get();
-        } catch (RedisException e) {
-            throw e;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new RedisCommandInterruptedException(e);
-        } catch (ExecutionException e) {
-            throw new RedisException(e.getCause());
-        } catch (RuntimeException e) {
-            throw new RedisException(e);
+        } catch (Exception e) {
+            throw Exceptions.bubble(e);
         }
     }
 
@@ -381,7 +371,8 @@ protected ConnectionFuture<StatefulRedisConnection<K, V>> getConnectionAsync(Con
 
             if (throwable != null) {
 
-                result.completeExceptionally(RedisConnectionException.create(connectionFuture.getRemoteAddress(), throwable));
+                result.completeExceptionally(
+                        RedisConnectionException.create(connectionFuture.getRemoteAddress(), Exceptions.bubble(throwable)));
             } else {
                 result.complete(connection);
             }
diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
index 6667afa750..340d5ab28b 100644
--- a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
+++ b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -19,7 +19,10 @@
 import java.net.SocketAddress;
 import java.net.URI;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -41,6 +44,7 @@
 import io.lettuce.core.cluster.topology.TopologyComparators;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.Exceptions;
 import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceLists;
@@ -881,10 +885,9 @@ private static <T> T get(CompletableFuture<T> future, Function<RedisException, R
                 throw mapper.apply((RedisException) e.getCause());
             }
 
-            throw new RedisException(e.getCause());
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new RedisCommandInterruptedException(e);
+            throw Exceptions.bubble(e);
+        } catch (Exception e) {
+            throw Exceptions.bubble(e);
         }
     }
 
@@ -912,8 +915,8 @@ protected CompletableFuture<Partitions> loadPartitionsAsync() {
                 fetchPartitions(initialUris).whenComplete((nextNodes, nextThrowable) -> {
 
                     if (nextThrowable != null) {
-                        Throwable exception = unwrap(nextThrowable);
-                        exception.addSuppressed(unwrap(throwable));
+                        Throwable exception = Exceptions.unwrap(nextThrowable);
+                        exception.addSuppressed(Exceptions.unwrap(throwable));
 
                         future.completeExceptionally(exception);
                     } else {
@@ -921,7 +924,7 @@ protected CompletableFuture<Partitions> loadPartitionsAsync() {
                     }
                 });
             } else {
-                future.completeExceptionally(unwrap(throwable));
+                future.completeExceptionally(Exceptions.unwrap(throwable));
             }
         });
 
@@ -1128,17 +1131,6 @@ private static RedisURI getViewedBy(Map<RedisURI, Partitions> map, Partitions pa
         return null;
     }
 
-    private static Throwable unwrap(Throwable throwable) {
-
-        Throwable ex = throwable;
-
-        while (ex instanceof CompletionException || ex instanceof ExecutionException) {
-            ex = ex.getCause();
-        }
-
-        return ex;
-    }
-
     ClusterClientOptions getClusterClientOptions() {
         return (ClusterClientOptions) getOptions();
     }
diff --git a/src/main/java/io/lettuce/core/cluster/topology/Connections.java b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
index 5d6a348314..bb94288a84 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/Connections.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/Connections.java
@@ -20,7 +20,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import io.lettuce.core.ExceptionFactory;
+import io.lettuce.core.internal.ExceptionFactory;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.codec.StringCodec;
diff --git a/src/main/java/io/lettuce/core/cluster/topology/DefaultClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/DefaultClusterTopologyRefresh.java
index 5f36ba0b85..1b35483991 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/DefaultClusterTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/DefaultClusterTopologyRefresh.java
@@ -32,6 +32,8 @@
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.cluster.topology.TopologyComparators.SortAction;
 import io.lettuce.core.codec.StringCodec;
+import io.lettuce.core.internal.ExceptionFactory;
+import io.lettuce.core.internal.Exceptions;
 import io.lettuce.core.internal.Futures;
 import io.lettuce.core.resource.ClientResources;
 import io.netty.util.Timeout;
@@ -315,10 +317,7 @@ private void openConnections(ConnectionTracker tracker, Iterable<RedisURI> redis
 
                     if (throwable != null) {
 
-                        Throwable throwableToUse = throwable;
-                        if (throwable instanceof CompletionException) {
-                            throwableToUse = throwableToUse.getCause();
-                        }
+                        Throwable throwableToUse = Exceptions.unwrap(throwable);
 
                         String message = String.format("Unable to connect to [%s]: %s", socketAddress,
                                 throwableToUse.getMessage() != null ? throwableToUse.getMessage() : throwableToUse.toString());
@@ -395,10 +394,8 @@ private static Throwable getException(Future<?> future) {
 
         try {
             future.get();
-        } catch (InterruptedException e) {
-            throw new RedisCommandInterruptedException(e);
-        } catch (ExecutionException e) {
-            return e.getCause();
+        } catch (Exception e) {
+            return Exceptions.bubble(e);
         }
 
         return null;
diff --git a/src/main/java/io/lettuce/core/ExceptionFactory.java b/src/main/java/io/lettuce/core/internal/ExceptionFactory.java
similarity index 95%
rename from src/main/java/io/lettuce/core/ExceptionFactory.java
rename to src/main/java/io/lettuce/core/internal/ExceptionFactory.java
index 35ee425ddb..3f69699990 100644
--- a/src/main/java/io/lettuce/core/ExceptionFactory.java
+++ b/src/main/java/io/lettuce/core/internal/ExceptionFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lettuce.core;
+package io.lettuce.core.internal;
+
+import io.lettuce.core.*;
 
 import java.time.Duration;
 import java.time.LocalTime;
@@ -132,8 +134,8 @@ public static RedisCommandExecutionException createExecutionException(String mes
                 return cause != null ? new RedisLoadingException(message, cause) : new RedisLoadingException(message);
             }
 
-            return cause != null ? new RedisCommandExecutionException(message, cause) : new RedisCommandExecutionException(
-                    message);
+            return cause != null ? new RedisCommandExecutionException(message, cause)
+                    : new RedisCommandExecutionException(message);
         }
 
         return new RedisCommandExecutionException(cause);
diff --git a/src/main/java/io/lettuce/core/internal/Exceptions.java b/src/main/java/io/lettuce/core/internal/Exceptions.java
new file mode 100644
index 0000000000..85138fbdb5
--- /dev/null
+++ b/src/main/java/io/lettuce/core/internal/Exceptions.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.internal;
+
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeoutException;
+
+import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.RedisCommandInterruptedException;
+import io.lettuce.core.RedisCommandTimeoutException;
+import io.lettuce.core.RedisException;
+
+/**
+ * Exception handling and utils to operate on.
+ *
+ * @author Mark Paluch
+ * @since 6.0
+ */
+public class Exceptions {
+
+    /**
+     * Unwrap the exception if the given {@link Throwable} is a {@link ExecutionException} or {@link CompletionException}.
+     *
+     * @param t the root cause
+     * @return the unwrapped {@link Throwable#getCause() cause} or the actual {@link Throwable}.
+     */
+    public static Throwable unwrap(Throwable t) {
+
+        if (t instanceof ExecutionException || t instanceof CompletionException) {
+            return t.getCause();
+        }
+
+        return t;
+    }
+
+    /**
+     * Prepare an unchecked {@link RuntimeException} that will bubble upstream if thrown by an operator.
+     *
+     * @param t the root cause
+     * @return an unchecked exception that should choose bubbling up over error callback path.
+     */
+    public static RuntimeException bubble(Throwable t) {
+
+        Throwable throwableToUse = unwrap(t);
+
+        if (throwableToUse instanceof TimeoutException) {
+            return new RedisCommandTimeoutException(throwableToUse);
+        }
+
+        if (throwableToUse instanceof InterruptedException) {
+
+            Thread.currentThread().interrupt();
+            return new RedisCommandInterruptedException(throwableToUse);
+        }
+
+        if (throwableToUse instanceof RedisCommandExecutionException) {
+            return ExceptionFactory.createExecutionException(throwableToUse.getMessage(), throwableToUse);
+        }
+
+        if (throwableToUse instanceof RedisException) {
+            return (RedisException) throwableToUse;
+        }
+
+        if (throwableToUse instanceof RuntimeException) {
+            return (RuntimeException) throwableToUse;
+        }
+
+        return new RedisException(throwableToUse);
+    }
+
+    /**
+     * Prepare an unchecked {@link RuntimeException} that will bubble upstream for synchronization usage (i.e. on calling
+     * {@link Future#get()}).
+     *
+     * @param t the root cause
+     * @return an unchecked exception that should choose bubbling up over error callback path.
+     */
+    public static RuntimeException fromSynchronization(Throwable t) {
+
+        Throwable throwableToUse = unwrap(t);
+
+        if (throwableToUse instanceof RedisCommandTimeoutException) {
+            return new RedisCommandTimeoutException(throwableToUse);
+        }
+
+        if (throwableToUse instanceof RedisCommandExecutionException) {
+            return bubble(throwableToUse);
+        }
+
+        if (throwableToUse instanceof RuntimeException) {
+            return new RedisException(throwableToUse);
+        }
+
+        return bubble(throwableToUse);
+    }
+}
diff --git a/src/main/java/io/lettuce/core/internal/Futures.java b/src/main/java/io/lettuce/core/internal/Futures.java
index dcc2f7cb86..b074d89eb0 100644
--- a/src/main/java/io/lettuce/core/internal/Futures.java
+++ b/src/main/java/io/lettuce/core/internal/Futures.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.concurrent.*;
 
-import io.lettuce.core.*;
+import io.lettuce.core.RedisFuture;
 import io.netty.channel.ChannelFuture;
 
 /**
@@ -172,7 +172,7 @@ public static boolean await(long timeout, TimeUnit unit, Future<?> future) {
         } catch (TimeoutException e) {
             return false;
         } catch (Exception e) {
-            return handleException(e);
+            throw Exceptions.fromSynchronization(e);
         }
     }
 
@@ -223,7 +223,7 @@ public static boolean awaitAll(long timeout, TimeUnit unit, Future<?>... futures
         } catch (TimeoutException e) {
             return false;
         } catch (Exception e) {
-            return handleException(e);
+            throw Exceptions.fromSynchronization(e);
         }
     }
 
@@ -247,33 +247,7 @@ public static <T> T awaitOrCancel(RedisFuture<T> cmd, long timeout, TimeUnit uni
             }
             return cmd.get();
         } catch (Exception e) {
-            return handleException(e);
+            throw Exceptions.bubble(e);
         }
     }
-
-    private static <T> T handleException(Exception e) {
-
-        if (e instanceof RuntimeException) {
-            throw (RuntimeException) e;
-        }
-
-        if (e instanceof ExecutionException) {
-            if (e.getCause() instanceof RedisCommandExecutionException) {
-                throw ExceptionFactory.createExecutionException(e.getCause().getMessage(), e.getCause());
-            }
-
-            if (e.getCause() instanceof RedisCommandTimeoutException) {
-                throw new RedisCommandTimeoutException(e.getCause());
-            }
-
-            throw new RedisException(e.getCause());
-        }
-
-        if (e instanceof InterruptedException) {
-            Thread.currentThread().interrupt();
-            throw new RedisCommandInterruptedException(e);
-        }
-
-        throw ExceptionFactory.createExecutionException(null, e);
-    }
 }
diff --git a/src/main/java/io/lettuce/core/masterreplica/Exceptions.java b/src/main/java/io/lettuce/core/masterreplica/Exceptions.java
deleted file mode 100644
index 1ec3231d1f..0000000000
--- a/src/main/java/io/lettuce/core/masterreplica/Exceptions.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.lettuce.core.masterreplica;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
-
-import io.lettuce.core.RedisCommandInterruptedException;
-import io.lettuce.core.RedisCommandTimeoutException;
-import io.lettuce.core.RedisException;
-
-/**
- * Exception handling and utils to operate on.
- *
- * @author Mark Paluch
- */
-class Exceptions {
-
-    /**
-     * Prepare an unchecked {@link RuntimeException} that will bubble upstream if thrown by an operator.
-     *
-     * @param t the root cause
-     * @return an unchecked exception that should choose bubbling up over error callback path.
-     */
-    public static RuntimeException bubble(Throwable t) {
-
-        if (t instanceof ExecutionException) {
-            return bubble(t.getCause());
-        }
-
-        if (t instanceof TimeoutException) {
-            return new RedisCommandTimeoutException(t);
-        }
-
-        if (t instanceof InterruptedException) {
-
-            Thread.currentThread().interrupt();
-            return new RedisCommandInterruptedException(t);
-        }
-
-        if (t instanceof RedisException) {
-            return (RedisException) t;
-        }
-
-        return new RedisException(t);
-    }
-}
diff --git a/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionProvider.java b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionProvider.java
index 56157807fd..b3e39cffae 100644
--- a/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaConnectionProvider.java
@@ -18,7 +18,10 @@
 import static io.lettuce.core.masterreplica.MasterReplicaUtils.findNodeByHostAndPort;
 
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Function;
 
 import reactor.core.publisher.Flux;
@@ -29,6 +32,7 @@
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.internal.AsyncConnectionProvider;
+import io.lettuce.core.internal.Exceptions;
 import io.lettuce.core.models.role.RedisInstance;
 import io.lettuce.core.models.role.RedisNodeDescription;
 import io.netty.util.internal.logging.InternalLogger;
@@ -85,15 +89,8 @@ public StatefulRedisConnection<K, V> getConnection(Intent intent) {
 
         try {
             return getConnectionAsync(intent).get();
-        } catch (RedisException e) {
-            throw e;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new RedisCommandInterruptedException(e);
-        } catch (ExecutionException e) {
-            throw new RedisException(e.getCause());
-        } catch (RuntimeException e) {
-            throw new RedisException(e);
+        } catch (Exception e) {
+            throw Exceptions.bubble(e);
         }
     }
 
diff --git a/src/main/java/io/lettuce/core/masterreplica/MasterReplicaTopologyProvider.java b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaTopologyProvider.java
index 31898a0547..fa7018acfc 100644
--- a/src/main/java/io/lettuce/core/masterreplica/MasterReplicaTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterreplica/MasterReplicaTopologyProvider.java
@@ -21,6 +21,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import io.lettuce.core.internal.Exceptions;
 import reactor.core.publisher.Mono;
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.RedisURI;
diff --git a/src/main/java/io/lettuce/core/masterreplica/SentinelTopologyProvider.java b/src/main/java/io/lettuce/core/masterreplica/SentinelTopologyProvider.java
index 19b8aed063..42c5f282c6 100644
--- a/src/main/java/io/lettuce/core/masterreplica/SentinelTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterreplica/SentinelTopologyProvider.java
@@ -23,6 +23,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import io.lettuce.core.internal.Exceptions;
 import reactor.core.publisher.Mono;
 import reactor.util.function.Tuple2;
 import io.lettuce.core.RedisClient;
diff --git a/src/main/java/io/lettuce/core/masterreplica/StaticMasterReplicaTopologyProvider.java b/src/main/java/io/lettuce/core/masterreplica/StaticMasterReplicaTopologyProvider.java
index 68a73d4759..930a26ee92 100644
--- a/src/main/java/io/lettuce/core/masterreplica/StaticMasterReplicaTopologyProvider.java
+++ b/src/main/java/io/lettuce/core/masterreplica/StaticMasterReplicaTopologyProvider.java
@@ -20,6 +20,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 
+import io.lettuce.core.internal.Exceptions;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import io.lettuce.core.RedisClient;
diff --git a/src/main/java/io/lettuce/core/output/MultiOutput.java b/src/main/java/io/lettuce/core/output/MultiOutput.java
index b9a9d9f2bd..f0cfc1efd7 100644
--- a/src/main/java/io/lettuce/core/output/MultiOutput.java
+++ b/src/main/java/io/lettuce/core/output/MultiOutput.java
@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.Queue;
 
-import io.lettuce.core.ExceptionFactory;
+import io.lettuce.core.internal.ExceptionFactory;
 import io.lettuce.core.TransactionResult;
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.internal.LettuceFactories;
diff --git a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
index 97fe4bd006..5c7700e761 100644
--- a/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
+++ b/src/main/java/io/lettuce/core/protocol/AsyncCommand.java
@@ -23,7 +23,7 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
-import io.lettuce.core.ExceptionFactory;
+import io.lettuce.core.internal.ExceptionFactory;
 import io.lettuce.core.RedisCommandInterruptedException;
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.internal.LettuceAssert;
diff --git a/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java b/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
index 6da70fe569..680971ecac 100644
--- a/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
+++ b/src/main/java/io/lettuce/core/protocol/CommandExpiryWriter.java
@@ -25,7 +25,7 @@
 import java.util.concurrent.TimeUnit;
 
 import io.lettuce.core.ClientOptions;
-import io.lettuce.core.ExceptionFactory;
+import io.lettuce.core.internal.ExceptionFactory;
 import io.lettuce.core.RedisChannelWriter;
 import io.lettuce.core.TimeoutOptions;
 import io.lettuce.core.internal.LettuceAssert;
diff --git a/src/main/java/io/lettuce/core/protocol/RedisHandshakeHandler.java b/src/main/java/io/lettuce/core/protocol/RedisHandshakeHandler.java
index c32fe85189..89cd61bf7e 100644
--- a/src/main/java/io/lettuce/core/protocol/RedisHandshakeHandler.java
+++ b/src/main/java/io/lettuce/core/protocol/RedisHandshakeHandler.java
@@ -20,7 +20,7 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 
-import io.lettuce.core.ExceptionFactory;
+import io.lettuce.core.internal.ExceptionFactory;
 import io.lettuce.core.RedisConnectionException;
 import io.lettuce.core.resource.ClientResources;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java b/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java
index 8219515ad8..ce3e9026cd 100644
--- a/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java
+++ b/src/test/java/io/lettuce/core/ExceptionFactoryUnitTests.java
@@ -15,6 +15,8 @@
  */
 package io.lettuce.core;
 
+import io.lettuce.core.internal.ExceptionFactory;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.Duration;
diff --git a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
index a7b263bc9a..6221b98b9a 100644
--- a/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/PooledClusterConnectionProviderUnitTests.java
@@ -143,8 +143,7 @@ void shouldReuseMasterConnectionForReadFromMaster() {
     void shouldObtainConnectionReadFromSlave() {
 
         when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any()))
-                .thenReturn(
-                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+                .thenReturn(ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
         async.complete();
@@ -169,12 +168,10 @@ void shouldRandomizeReadNode() {
         when(nodeConnectionMock2.isOpen()).thenReturn(true);
 
         when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:1"), any(), any()))
-                .thenReturn(
-                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+                .thenReturn(ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any()))
-                .thenReturn(
-                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock2)));
+                .thenReturn(ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock2)));
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
         async.complete();
@@ -201,12 +198,10 @@ void shouldNotRandomizeReadNode() {
         when(nodeConnectionMock2.isOpen()).thenReturn(true);
 
         when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:1"), any(), any()))
-                .thenReturn(
-                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+                .thenReturn(ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any()))
-                .thenReturn(
-                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock2)));
+                .thenReturn(ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock2)));
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
         async.complete();
@@ -229,8 +224,7 @@ void shouldNotRandomizeReadNode() {
     void shouldCloseConnectionOnConnectFailure() {
 
         when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any()))
-                .thenReturn(
-                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+                .thenReturn(ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
         async.completeExceptionally(new RuntimeException());
@@ -254,8 +248,7 @@ void shouldCloseConnectionOnConnectFailure() {
     void shouldRetryConnectionAttemptAfterConnectionAttemptWasBroken() {
 
         when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any()))
-                .thenReturn(
-                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+                .thenReturn(ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
         async.completeExceptionally(new RuntimeException());
@@ -289,12 +282,10 @@ void shouldSelectSuccessfulConnectionIfOtherNodesFailed() {
         failed.completeExceptionally(new IllegalStateException());
 
         when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:1"), any(), any()))
-                .thenReturn(
-                ConnectionFuture.from(socketAddressMock, failed));
+                .thenReturn(ConnectionFuture.from(socketAddressMock, failed));
 
         when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any()))
-                .thenReturn(
-                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+                .thenReturn(ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
         async.complete("OK");
@@ -322,12 +313,10 @@ void shouldFailIfAllReadCandidateNodesFail() {
         failed2.completeExceptionally(new IllegalStateException());
 
         when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:1"), any(), any()))
-                .thenReturn(
-                ConnectionFuture.from(socketAddressMock, failed2));
+                .thenReturn(ConnectionFuture.from(socketAddressMock, failed2));
 
         when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:2"), any(), any()))
-                .thenReturn(
-                ConnectionFuture.from(socketAddressMock, failed2));
+                .thenReturn(ConnectionFuture.from(socketAddressMock, failed2));
 
         AsyncCommand<String, String, String> async = new AsyncCommand<>(new Command<>(CommandType.READONLY, null, null));
         async.complete("OK");
@@ -338,8 +327,8 @@ void shouldFailIfAllReadCandidateNodesFail() {
             sut.getConnection(Intent.READ, 1);
             fail("Missing RedisException");
         } catch (RedisException e) {
-            assertThat(e).hasCauseInstanceOf(RedisConnectionException.class).hasRootCauseExactlyInstanceOf(
-                    IllegalStateException.class);
+            assertThat(e).isInstanceOf(RedisConnectionException.class)
+                    .hasRootCauseExactlyInstanceOf(IllegalStateException.class);
         }
 
         verify(clientMock).connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:1"), any(), any());
@@ -387,8 +376,7 @@ void shouldCloseConnections() {
         when(channelHandlerMock.closeAsync()).thenReturn(CompletableFuture.completedFuture(null));
 
         when(clientMock.connectToNodeAsync(eq(StringCodec.UTF8), eq("localhost:1"), any(), any()))
-                .thenReturn(
-                ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
+                .thenReturn(ConnectionFuture.from(socketAddressMock, CompletableFuture.completedFuture(nodeConnectionMock)));
 
         StatefulRedisConnection<String, String> connection = sut.getConnection(Intent.READ, 1);
         assertThat(connection).isNotNull();
@@ -409,8 +397,8 @@ void shouldRejectConnectionsToUnknownNodeId() {
     @Test
     void shouldRejectConnectionsToUnknownNodeHostAndPort() {
 
-        assertThatThrownBy(() -> sut.getConnection(Intent.READ, "localhost", 1234)).isInstanceOf(
-                UnknownPartitionException.class);
+        assertThatThrownBy(() -> sut.getConnection(Intent.READ, "localhost", 1234))
+                .isInstanceOf(UnknownPartitionException.class);
 
         verify(clusterEventListener).onUnknownNode();
     }

From a0bea2cc6dc3d768da8d6a6a1ff014fff701e562 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 27 Apr 2020 11:39:32 +0200
Subject: [PATCH 787/808] Reduce min thread count to 2 #1278

Reduce thread count as the number of blocking tasks was reduced in the past releases.
---
 RELEASE-NOTES.md                                            | 1 +
 .../io/lettuce/core/resource/DefaultClientResources.java    | 4 ++--
 .../core/resource/DefaultClientResourcesUnitTests.java      | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 1f6859a26c..fbaeb31a23 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -163,3 +163,4 @@ Other
 * Replace outdated Sonatype parent POM with plugin definitions #1258
 * Upgrade dependencies #1259
 * Upgrade to RxJava 3.0.2 #1261
+* Reduce min thread count to 2 #1278
diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index 49395ade0c..79add3a552 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -78,12 +78,12 @@ public class DefaultClientResources implements ClientResources {
     /**
      * Minimum number of I/O threads.
      */
-    public static final int MIN_IO_THREADS = 3;
+    public static final int MIN_IO_THREADS = 2;
 
     /**
      * Minimum number of computation threads.
      */
-    public static final int MIN_COMPUTATION_THREADS = 3;
+    public static final int MIN_COMPUTATION_THREADS = 2;
 
     public static final int DEFAULT_IO_THREADS;
     public static final int DEFAULT_COMPUTATION_THREADS;
diff --git a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
index 933694f240..3fc5a71b48 100644
--- a/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
+++ b/src/test/java/io/lettuce/core/resource/DefaultClientResourcesUnitTests.java
@@ -164,9 +164,9 @@ void testSmallPoolSize() {
         EventExecutorGroup eventExecutors = sut.eventExecutorGroup();
         NioEventLoopGroup eventLoopGroup = sut.eventLoopGroupProvider().allocate(NioEventLoopGroup.class);
 
-        assertThat(eventExecutors).hasSize(3);
-        assertThat(eventLoopGroup.executorCount()).isEqualTo(3);
-        assertThat(sut.ioThreadPoolSize()).isEqualTo(3);
+        assertThat(eventExecutors).hasSize(2);
+        assertThat(eventLoopGroup.executorCount()).isEqualTo(2);
+        assertThat(sut.ioThreadPoolSize()).isEqualTo(2);
 
         assertThat(TestFutures.getOrTimeout(sut.shutdown(0, 0, TimeUnit.MILLISECONDS))).isTrue();
     }

From fb5bcfd7bef0329281c49f6ae91822bf993d9c8c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 27 Apr 2020 11:42:10 +0200
Subject: [PATCH 788/808] Introduce ThreadFactoryProvider to
 DefaultEventLoopGroupProvider for easier customization #1243

We now allow customization of the ThreadFactory when using DefaultEventLoopGroupProvider.
---
 .../DefaultEventLoopGroupProvider.java        | 87 ++++++++++++++++---
 1 file changed, 77 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
index 31ab9fe2a1..f05290bad6 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
@@ -21,15 +21,14 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 
 import io.lettuce.core.internal.Futures;
+import io.lettuce.core.internal.LettuceAssert;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.concurrent.*;
+import io.netty.util.concurrent.Future;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -47,6 +46,7 @@ public class DefaultEventLoopGroupProvider implements EventLoopGroupProvider {
     private final Map<ExecutorService, Long> refCounter = new ConcurrentHashMap<>(2);
 
     private final int numberOfThreads;
+    private final ThreadFactoryProvider threadFactoryProvider;
 
     private volatile boolean shutdownCalled = false;
 
@@ -56,7 +56,23 @@ public class DefaultEventLoopGroupProvider implements EventLoopGroupProvider {
      * @param numberOfThreads number of threads (pool size)
      */
     public DefaultEventLoopGroupProvider(int numberOfThreads) {
+        this(numberOfThreads, DefaultThreadFactoryProvider.INSTANCE);
+    }
+
+    /**
+     * Creates a new instance of {@link DefaultEventLoopGroupProvider}.
+     *
+     * @param numberOfThreads number of threads (pool size)
+     * @param threadFactoryProvider provides access to {@link ThreadFactory}.
+     * @since 6.0
+     */
+    public DefaultEventLoopGroupProvider(int numberOfThreads, ThreadFactoryProvider threadFactoryProvider) {
+
+        LettuceAssert.isTrue(numberOfThreads > 0, "Number of threads must be greater than zero");
+        LettuceAssert.notNull(threadFactoryProvider, "ThreadFactoryProvider must not be null");
+
         this.numberOfThreads = numberOfThreads;
+        this.threadFactoryProvider = threadFactoryProvider;
     }
 
     @Override
@@ -115,18 +131,19 @@ private <T extends EventLoopGroup> T getOrCreate(Class<T> type) {
         }
 
         if (!eventLoopGroups.containsKey(type)) {
-            eventLoopGroups.put(type, createEventLoopGroup(type, numberOfThreads));
+            eventLoopGroups.put(type, createEventLoopGroup(type, numberOfThreads, threadFactoryProvider));
         }
 
         return (T) eventLoopGroups.get(type);
     }
 
     /**
-     * Create an instance of a {@link EventExecutorGroup}. Supported types are:
+     * Create an instance of a {@link EventExecutorGroup} using the default {@link ThreadFactoryProvider}. Supported types are:
      * <ul>
      * <li>DefaultEventExecutorGroup</li>
      * <li>NioEventLoopGroup</li>
      * <li>EpollEventLoopGroup</li>
+     * <li>KqueueEventLoopGroup</li>
      * </ul>
      *
      * @param type the type
@@ -136,15 +153,37 @@ private <T extends EventLoopGroup> T getOrCreate(Class<T> type) {
      * @throws IllegalArgumentException if the {@code type} is not supported.
      */
     public static <T extends EventExecutorGroup> EventExecutorGroup createEventLoopGroup(Class<T> type, int numberOfThreads) {
+        return createEventLoopGroup(type, numberOfThreads, DefaultThreadFactoryProvider.INSTANCE);
+    }
+
+    /**
+     * Create an instance of a {@link EventExecutorGroup}. Supported types are:
+     * <ul>
+     * <li>DefaultEventExecutorGroup</li>
+     * <li>NioEventLoopGroup</li>
+     * <li>EpollEventLoopGroup</li>
+     * <li>KqueueEventLoopGroup</li>
+     * </ul>
+     *
+     * @param type the type
+     * @param numberOfThreads the number of threads to use for the {@link EventExecutorGroup}
+     * @param <T> type parameter
+     * @return a new instance of a {@link EventExecutorGroup}
+     * @throws IllegalArgumentException if the {@code type} is not supported.
+     * @since 5.3
+     */
+    private static <T extends EventExecutorGroup> EventExecutorGroup createEventLoopGroup(Class<T> type, int numberOfThreads,
+            ThreadFactoryProvider factoryProvider) {
 
         logger.debug("Creating executor {}", type.getName());
 
         if (DefaultEventExecutorGroup.class.equals(type)) {
-            return new DefaultEventExecutorGroup(numberOfThreads, new DefaultThreadFactory("lettuce-eventExecutorLoop", true));
+            return new DefaultEventExecutorGroup(numberOfThreads,
+                    factoryProvider.getThreadFactory("lettuce-eventExecutorLoop"));
         }
 
         if (NioEventLoopGroup.class.equals(type)) {
-            return new NioEventLoopGroup(numberOfThreads, new DefaultThreadFactory("lettuce-nioEventLoop", true));
+            return new NioEventLoopGroup(numberOfThreads, factoryProvider.getThreadFactory("lettuce-nioEventLoop"));
         }
 
         if (EpollProvider.isAvailable()) {
@@ -152,7 +191,7 @@ public static <T extends EventExecutorGroup> EventExecutorGroup createEventLoopG
             EventLoopResources resources = EpollProvider.getResources();
 
             if (resources.matches(type)) {
-                return resources.newEventLoopGroup(numberOfThreads, new DefaultThreadFactory("lettuce-epollEventLoop", true));
+                return resources.newEventLoopGroup(numberOfThreads, factoryProvider.getThreadFactory("lettuce-epollEventLoop"));
             }
         }
 
@@ -161,7 +200,8 @@ public static <T extends EventExecutorGroup> EventExecutorGroup createEventLoopG
             EventLoopResources resources = KqueueProvider.getResources();
 
             if (resources.matches(type)) {
-                return resources.newEventLoopGroup(numberOfThreads, new DefaultThreadFactory("lettuce-kqueueEventLoop", true));
+                return resources.newEventLoopGroup(numberOfThreads,
+                        factoryProvider.getThreadFactory("lettuce-kqueueEventLoop"));
             }
         }
 
@@ -237,4 +277,31 @@ public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUni
 
         return overall;
     }
+
+    /**
+     * Interface to provide a custom {@link java.util.concurrent.ThreadFactory}. Implementations are asked through
+     * {@link #getThreadFactory(String)} to provide a thread factory for a given pool name.
+     * 
+     * @since 6.0
+     */
+    public interface ThreadFactoryProvider {
+
+        /**
+         * Return a {@link ThreadFactory} for the given {@code poolName}.
+         * 
+         * @param poolName a descriptive pool name. Typically used as prefix for thread names.
+         * @return the {@link ThreadFactory}.
+         */
+        ThreadFactory getThreadFactory(String poolName);
+    }
+
+    enum DefaultThreadFactoryProvider implements ThreadFactoryProvider {
+
+        INSTANCE;
+
+        @Override
+        public ThreadFactory getThreadFactory(String poolName) {
+            return new DefaultThreadFactory(poolName, true);
+        }
+    }
 }

From 9407baa62b4d83f5d9fd5181004b4d59ed185829 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 27 Apr 2020 11:51:07 +0200
Subject: [PATCH 789/808] Polishing

---
 .../NodeSelectionSyncIntegrationTests.java    | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
index 2daf4dc2c3..d268de6ab5 100644
--- a/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/NodeSelectionSyncIntegrationTests.java
@@ -21,7 +21,6 @@
 
 import java.time.Duration;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
 
@@ -88,15 +87,15 @@ void testNodeSelectionCount() {
         assertThat(commands.slaves().size()).isEqualTo(2);
         assertThat(commands.masters().size()).isEqualTo(2);
 
-        assertThat(commands.nodes(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.MYSELF)).size()).isEqualTo(
-                1);
+        assertThat(commands.nodes(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.MYSELF)).size())
+                .isEqualTo(1);
     }
 
     @Test
     void testNodeSelection() {
 
-        NodeSelection<String, String> onlyMe = commands.nodes(redisClusterNode -> redisClusterNode.getFlags().contains(
-                RedisClusterNode.NodeFlag.MYSELF));
+        NodeSelection<String, String> onlyMe = commands
+                .nodes(redisClusterNode -> redisClusterNode.getFlags().contains(RedisClusterNode.NodeFlag.MYSELF));
         Map<RedisClusterNode, RedisCommands<String, String>> map = onlyMe.asMap();
 
         assertThat(map).hasSize(1);
@@ -114,10 +113,11 @@ void testNodeSelection() {
     void testDynamicNodeSelection() {
 
         Partitions partitions = commands.getStatefulConnection().getPartitions();
-        partitions.forEach(redisClusterNode -> redisClusterNode.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.MASTER)));
+        partitions.forEach(
+                redisClusterNode -> redisClusterNode.setFlags(Collections.singleton(RedisClusterNode.NodeFlag.MASTER)));
 
-        NodeSelection<String, String> selection = commands.nodes(
-                redisClusterNode -> redisClusterNode.getFlags().contains(RedisClusterNode.NodeFlag.MYSELF), true);
+        NodeSelection<String, String> selection = commands
+                .nodes(redisClusterNode -> redisClusterNode.getFlags().contains(RedisClusterNode.NodeFlag.MYSELF), true);
 
         assertThat(selection.asMap()).hasSize(0);
         partitions.getPartition(0)
@@ -134,8 +134,8 @@ void testDynamicNodeSelection() {
     @Test
     void testNodeSelectionPing() {
 
-        NodeSelection<String, String> onlyMe = commands.nodes(redisClusterNode -> redisClusterNode.getFlags().contains(
-                RedisClusterNode.NodeFlag.MYSELF));
+        NodeSelection<String, String> onlyMe = commands
+                .nodes(redisClusterNode -> redisClusterNode.getFlags().contains(RedisClusterNode.NodeFlag.MYSELF));
         Map<RedisClusterNode, RedisCommands<String, String>> map = onlyMe.asMap();
 
         assertThat(map).hasSize(1);
@@ -148,8 +148,8 @@ void testNodeSelectionPing() {
     @Test
     void testStaticNodeSelection() {
 
-        NodeSelection<String, String> selection = commands.nodes(
-                redisClusterNode -> redisClusterNode.getFlags().contains(RedisClusterNode.NodeFlag.MYSELF), false);
+        NodeSelection<String, String> selection = commands
+                .nodes(redisClusterNode -> redisClusterNode.getFlags().contains(RedisClusterNode.NodeFlag.MYSELF), false);
 
         assertThat(selection.asMap()).hasSize(1);
 
@@ -184,8 +184,8 @@ void testAsynchronicityOfMultiNodeExecution() {
     @Test
     void testReplicasReadWrite() {
 
-        NodeSelection<String, String> nodes = commands.nodes(redisClusterNode -> redisClusterNode.getFlags().contains(
-                RedisClusterNode.NodeFlag.SLAVE));
+        NodeSelection<String, String> nodes = commands
+                .nodes(redisClusterNode -> redisClusterNode.getFlags().contains(RedisClusterNode.NodeFlag.SLAVE));
 
         assertThat(nodes.size()).isEqualTo(2);
 
@@ -197,7 +197,11 @@ void testReplicasReadWrite() {
             nodes.commands().get(key);
             fail("Missing RedisCommandExecutionException: MOVED");
         } catch (RedisCommandExecutionException e) {
-            assertThat(e.getSuppressed().length).isGreaterThan(0);
+            if (e.getMessage().startsWith("MOVED")) {
+                assertThat(e.getSuppressed()).isEmpty();
+            } else {
+                assertThat(e.getSuppressed()).isNotEmpty();
+            }
         }
     }
 
@@ -208,8 +212,9 @@ void testSlavesWithReadOnly() {
         Optional<RedisClusterNode> master = clusterClient.getPartitions().getPartitions().stream()
                 .filter(redisClusterNode -> redisClusterNode.hasSlot(slot)).findFirst();
 
-        NodeSelection<String, String> nodes = commands.slaves(redisClusterNode -> redisClusterNode
-                .is(RedisClusterNode.NodeFlag.SLAVE) && redisClusterNode.getSlaveOf().equals(master.get().getNodeId()));
+        NodeSelection<String, String> nodes = commands
+                .slaves(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE)
+                        && redisClusterNode.getSlaveOf().equals(master.get().getNodeId()));
 
         assertThat(nodes.size()).isEqualTo(1);
 
@@ -224,8 +229,7 @@ void waitForReplication(String key, int port) {
         waitForReplication(commands, key, port);
     }
 
-    static void waitForReplication(RedisAdvancedClusterCommands<String, String> commands, String key, int port)
- {
+    static void waitForReplication(RedisAdvancedClusterCommands<String, String> commands, String key, int port) {
 
         NodeSelection<String, String> selection = commands
                 .slaves(redisClusterNode -> redisClusterNode.getUri().getPort() == port);

From c8fcee8fd4b2681cd05d6544a5570d5d191d3f81 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 27 Apr 2020 13:24:50 +0200
Subject: [PATCH 790/808] Upgrade to Reactor Core 3.3.5 #1276

---
 RELEASE-NOTES.md | 1 +
 pom.xml          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index fbaeb31a23..885cfcdcbb 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -163,4 +163,5 @@ Other
 * Replace outdated Sonatype parent POM with plugin definitions #1258
 * Upgrade dependencies #1259
 * Upgrade to RxJava 3.0.2 #1261
+* Upgrade to Reactor Core 3.3.5 #1276
 * Reduce min thread count to 2 #1278
diff --git a/pom.xml b/pom.xml
index d3438d56b5..aab78fd0db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
         <mockito.version>3.3.3</mockito.version>
         <netty.version>4.1.48.Final</netty.version>
         <openwebbeans.version>2.0.16</openwebbeans.version>
-        <reactor.version>3.3.4.RELEASE</reactor.version>
+        <reactor.version>3.3.5.RELEASE</reactor.version>
         <rxjava.version>1.3.8</rxjava.version>
         <rxjava-reactive-streams.version>1.2.1</rxjava-reactive-streams.version>
         <rxjava2.version>2.2.19</rxjava2.version>

From 0459471be4612a3225898c3d19dd5cceaaed1625 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 27 Apr 2020 13:28:13 +0200
Subject: [PATCH 791/808] Upgrade dependencies #1277

* Brave 5.10.2 -> 5.11.2
* Log4j 2.13.1 -> 2.13.2
* Netty 4.1.48.Final -> 4.1.49.Final
---
 RELEASE-NOTES.md | 7 +------
 pom.xml          | 6 +++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 885cfcdcbb..c2ecdb5c8f 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -140,7 +140,6 @@ Other
 * Remove LettuceCharsets #1156
 * Move SocketAddress resolution from RedisURI to SocketAddressResolver #1157
 * Remove deprecated timeout methods accepting TimeUnit #1158
-* Upgrade to netty 4.1.43.Final #1161
 * Upgrade to RxJava 2.2.13 #1162
 * Add ByteBuf.touch(…) to aid buffer leak investigation #1164
 * Add warning log if MasterReplica(…, Iterable<RedisURI>) contains multiple Sentinel URIs #1165
@@ -151,17 +150,13 @@ Other
 * Update code for pub/sub to listen on the stateful connection object. #1207 (Thanks to @judepereira)
 * Un-deprecate ClientOptions.pingBeforeActivateConnection #1208
 * Use consistently a shutdown timeout of 2 seconds in all AbstractRedisClient.shutdown methods #1214
-* Release Lettuce 5.2.2.RELEASE #1222
-* Upgrade dependencies #1224
-* Upgrade dependencies #1225
+* Upgrade dependencies (netty to 4.1.49.Final) #1161, #1224, #1225, #1239, #1259
 * RedisURI class does not parse password when using redis-sentinel #1232 (Thanks to @kyrogue)
 * Reduce log level to DEBUG for native library logging #1238 (Thanks to @DevJoey)
-* upgrade netty to 4.1.47.Final #1239 (Thanks to @m1ngyuan)
 * Reduce visibility of fields in AbstractRedisClient #1241
 * Upgrade to stunnel 5.56 #1246
 * Add build profiles for multiple Java versions #1247
 * Replace outdated Sonatype parent POM with plugin definitions #1258
-* Upgrade dependencies #1259
 * Upgrade to RxJava 3.0.2 #1261
 * Upgrade to Reactor Core 3.3.5 #1276
 * Reduce min thread count to 2 #1278
diff --git a/pom.xml b/pom.xml
index aab78fd0db..6b528daf00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     <properties>
         <assertj-core.version>3.15.0</assertj-core.version>
         <cdi-api.version>2.0</cdi-api.version>
-        <brave.version>5.10.2</brave.version>
+        <brave.version>5.11.2</brave.version>
         <commons-lang3.version>3.10</commons-lang3.version>
         <commons-pool.version>2.8.0</commons-pool.version>
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
@@ -63,9 +63,9 @@
         <hamcrest-library.version>2.2</hamcrest-library.version>
         <hdr-histogram-version>2.1.12</hdr-histogram-version>
         <latencyutils.version>2.0.3</latencyutils.version>
-        <log4j2-version>2.13.1</log4j2-version>
+        <log4j2-version>2.13.2</log4j2-version>
         <mockito.version>3.3.3</mockito.version>
-        <netty.version>4.1.48.Final</netty.version>
+        <netty.version>4.1.49.Final</netty.version>
         <openwebbeans.version>2.0.16</openwebbeans.version>
         <reactor.version>3.3.5.RELEASE</reactor.version>
         <rxjava.version>1.3.8</rxjava.version>

From 6b83b7cbd7552adba4ddf4759394dcedfe99fe2d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 27 Apr 2020 13:31:01 +0200
Subject: [PATCH 792/808] Update changelog #1268

---
 RELEASE-NOTES.md | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index c2ecdb5c8f..186a83ec4b 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -46,12 +46,11 @@ Redis 6 ships with support for a new protocol version. RESP3 brings support for
 * Big number: a large number non-representable by the Number type
 
 Lettuce supports all response types except attributes. Push messages are only supported for Pub/Sub messages.
-Newly established connections default to RESP2 to avoid issues with Redis parts that do not properly support RESP3 yet (such as Redis Sentinel). These are known issues and to be addressed by future Redis releases.
 
-The protocol version can be changed through `ClientOptions`:
+The protocol version can be changed through `ClientOptions` which disables protocol discovery:
 
 ```java
-ClientOptions options = ClientOptions.builder().protocolVersion(ProtocolVersion.RESP3).build();
+ClientOptions options = ClientOptions.builder().protocolVersion(ProtocolVersion.RESP2).build();
 ```
 
 Future versions are going to discover the protocol version as part of the connection handshake and use the newest available protocol version.
@@ -109,6 +108,7 @@ Enhancements
 * Add support for KEEPTTL with SET #1234
 * Add support for RxJava 3 #1235
 * Retrieve username from URI when RedisURI is built from URL #1242 (Thanks to @gkorland)
+* Introduce ThreadFactoryProvider to DefaultEventLoopGroupProvider for easier customization #1243 (Thanks to @apilling6317)
 
 Fixes
 -----
@@ -128,7 +128,9 @@ Fixes
 * ConcurrentModificationException iterating over partitions #1252 (Thanks to @johnny-costanzo)
 * Replayed activation commands may fail because of their execution sequence #1255 (Thanks to @robertvazan)
 * Fix infinite command timeout #1260
-* Connection leak using pingBeforeActivateConnection when PING fails? #1262 (Thanks to @johnny-costanzo)
+* Connection leak using pingBeforeActivateConnection when PING fails #1262 (Thanks to @johnny-costanzo)
+* Lettuce blocked when connecting to Redis #1269 (Thanks to @jbyjby1)
+* Stream commands are not considered for ReadOnly routing #1271 (Thanks to @redviper)
 
 Other
 -----
@@ -146,7 +148,7 @@ Other
 * Adapt GEOHASH tests to 10 chars #1196
 * Migrate Master/Replica support to the appropriate package #1199
 * Disable RedisURIBuilderUnitTests failing on Windows OS #1204 (Thanks to @kshchepanovskyi)
-* Provide a default port(DEFAULT_REDIS_PORT) to RedisURI's Builder inst… #1205 (Thanks to @hepin1989)
+* Provide a default port(DEFAULT_REDIS_PORT) to RedisURI's Builder #1205 (Thanks to @hepin1989)
 * Update code for pub/sub to listen on the stateful connection object. #1207 (Thanks to @judepereira)
 * Un-deprecate ClientOptions.pingBeforeActivateConnection #1208
 * Use consistently a shutdown timeout of 2 seconds in all AbstractRedisClient.shutdown methods #1214
@@ -158,5 +160,6 @@ Other
 * Add build profiles for multiple Java versions #1247
 * Replace outdated Sonatype parent POM with plugin definitions #1258
 * Upgrade to RxJava 3.0.2 #1261
-* Upgrade to Reactor Core 3.3.5 #1276
+* Enable Sentinel tests after Redis fixes RESP3 handshake #1266
+* Consolidate exception translation and bubbling #1275
 * Reduce min thread count to 2 #1278

From 7d7a19d102f25f65bfd58e81accb46470a3da847 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 27 Apr 2020 13:48:29 +0200
Subject: [PATCH 793/808] Update reference documentation #1268

---
 RELEASE-NOTES.md                    |  2 +-
 src/main/asciidoc/new-features.adoc | 27 +++++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 186a83ec4b..3f94f5ec51 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,5 +1,5 @@
 Lettuce 6.0.0 M1 RELEASE NOTES
-===========================
+==============================
 
 The Lettuce team is delighted to announce the availability of the first Lettuce 6 milestone.
 
diff --git a/src/main/asciidoc/new-features.adoc b/src/main/asciidoc/new-features.adoc
index e066542d16..e26e4cf222 100644
--- a/src/main/asciidoc/new-features.adoc
+++ b/src/main/asciidoc/new-features.adoc
@@ -1,13 +1,35 @@
 [[new-features]]
 = New & Noteworthy
 
+[[new-features.6-0-0]]
+== What's new in Lettuce 6.0
+
+* Support for RESP3 usage with Redis 6 along with RESP2/RESP3 handshake and protocol version discovery.
+* ACL authentication using username and password or password-only authentication.
+* Cluster topology refresh is now non-blocking.
+* RxJava 3 support.
+* Refined Scripting API accepting the Lua script either as `byte[]` or `String`.
+* Connection and Queue failures now no longer throw an exception but properly associate the failure with the Future handle.
+* Removal of deprecated API including timeout methods accepting `TimeUnit`.
+Use methods accepting `Duration` instead.
+* Lots of internal refinements.
+
+[[new-features.5-3-0]]
+== What's new in Lettuce 5.3
+
+* Improved SSL configuration supporting Cipher suite selection and PEM-encoded certificates.
+* Fixed method signature for `randomkey()`.
+* Un-deprecated `ClientOptions.pingBeforeActivateConnection` to allow connection verification during connection handshake.
+
 [[new-features.5-2-0]]
 == What's new in Lettuce 5.2
-* Allow randomization of read candidates using Redis Cluster
-* SSL support for Redis Sentinel
+
+* Allow randomization of read candidates using Redis Cluster.
+* SSL support for Redis Sentinel.
 
 [[new-features.5-1-0]]
 == What's new in Lettuce 5.1
+
 * Add support for `ZPOPMIN`, `ZPOPMAX`, `BZPOPMIN`, `BZPOPMAX` commands.
 * Add support for Redis Command Tracing through Brave, see <<client-resources>>.
 * Add support for https://redis.io/topics/streams-intro[Redis Streams].
@@ -23,6 +45,7 @@
 
 [[new-features.5-0-0]]
 == What's new in Lettuce 5.0
+
 * New artifact coordinates: `io.lettuce:lettuce-core` and packages moved from `com.lambdaworks.redis` to `io.lettuce.core`.
 * <<reactive-api,Reactive API>> now Reactive Streams-based using https://projectreactor.io/[Project Reactor].
 * <<redis-command-interfaces,Redis Command Interfaces>> supporting dynamic command invocation and Redis Modules.

From 497a6902c04efd38acda05694df9feb97c9991bc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 27 Apr 2020 13:54:41 +0200
Subject: [PATCH 794/808] [maven-release-plugin] prepare release 6.0.0.M1

---
 pom.xml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6b528daf00..86e617ec79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>6.0.0.BUILD-SNAPSHOT</version>
+    <version>6.0.0.M1</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -86,7 +85,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-      <tag>HEAD</tag>
+      <tag>6.0.0.M1</tag>
   </scm>
 
     <distributionManagement>
@@ -939,7 +938,7 @@
                                     <arguments>
                                         <argument>-Xmx2G</argument>
                                         <argument>-classpath</argument>
-                                        <classpath/>
+                                        <classpath />
                                         <argument>org.openjdk.jmh.Main</argument>
                                         <argument>.*</argument>
                                         <argument>-tu</argument>
@@ -1013,9 +1012,7 @@
                                 <phase>process-resources</phase>
                                 <configuration>
                                     <target>
-                                        <copy failonerror="false"
-                                              file="${project.build.directory}/generated-docs/index.pdf"
-                                              tofile="target/site/reference/pdf/lettuce-reference.pdf"/>
+                                        <copy failonerror="false" file="${project.build.directory}/generated-docs/index.pdf" tofile="target/site/reference/pdf/lettuce-reference.pdf" />
                                     </target>
                                 </configuration>
                                 <goals>
@@ -1082,9 +1079,9 @@
                                 <toclevels>3</toclevels>
                                 <numbered>true</numbered>
                                 <ext-doc>https://raw.githubusercontent.com/wiki/lettuce-io/lettuce-core/</ext-doc>
-                                <allow-uri-read/>
-                                <docinfo/>
-                                <toc2/>
+                                <allow-uri-read />
+                                <docinfo />
+                                <toc2 />
                                 <icons>font</icons>
                                 <source-highlighter>coderay</source-highlighter>
                             </attributes>

From bd72456e0b4f9f20bdbc84c09761bcf98777a5b4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 27 Apr 2020 13:54:50 +0200
Subject: [PATCH 795/808] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 86e617ec79..3a97e1c3c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>io.lettuce</groupId>
     <artifactId>lettuce-core</artifactId>
-    <version>6.0.0.M1</version>
+    <version>6.0.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Lettuce</name>
@@ -85,7 +85,7 @@
         <connection>scm:git:https://github.com/lettuce-io/lettuce-core.git</connection>
         <developerConnection>scm:git:https://github.com/lettuce-io/lettuce-core.git</developerConnection>
         <url>http://github.com/lettuce-io/lettuce-core</url>
-      <tag>6.0.0.M1</tag>
+      <tag>HEAD</tag>
   </scm>
 
     <distributionManagement>

From 53c62689e984a1aabd5e5332577ba34386db50d1 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 5 May 2020 15:34:50 +0200
Subject: [PATCH 796/808] Replace io.lettuce.core.resource.Futures utility with
 Netty's PromiseCombiner #1283

---
 .../core/resource/DefaultClientResources.java | 23 +++-------
 .../DefaultEventLoopGroupProvider.java        | 44 +++++++------------
 .../ConnectionFailureIntegrationTests.java    |  1 +
 3 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index 79add3a552..f9ba3955f1 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -15,9 +15,6 @@
  */
 package io.lettuce.core.resource;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
@@ -28,7 +25,6 @@
 import io.lettuce.core.event.EventPublisherOptions;
 import io.lettuce.core.event.metrics.DefaultCommandLatencyEventPublisher;
 import io.lettuce.core.event.metrics.MetricEventPublisher;
-import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.internal.LettuceLists;
 import io.lettuce.core.metrics.CommandLatencyCollector;
@@ -601,8 +597,8 @@ public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUni
         logger.debug("Initiate shutdown ({}, {}, {})", quietPeriod, timeout, timeUnit);
 
         shutdownCalled = true;
-        DefaultPromise<Boolean> overall = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
-        List<CompletionStage<?>> stages = new ArrayList<>();
+        DefaultPromise<Void> voidPromise = new DefaultPromise<>(ImmediateEventExecutor.INSTANCE);
+        PromiseCombiner aggregator = new PromiseCombiner(ImmediateEventExecutor.INSTANCE);
 
         if (metricEventPublisher != null) {
             metricEventPublisher.shutdown();
@@ -614,28 +610,21 @@ public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUni
 
         if (!sharedEventLoopGroupProvider) {
             Future<Boolean> shutdown = eventLoopGroupProvider.shutdown(quietPeriod, timeout, timeUnit);
-            stages.add(Futures.toCompletionStage(shutdown));
+            aggregator.add(shutdown);
         }
 
         if (!sharedEventExecutor) {
             Future<?> shutdown = eventExecutorGroup.shutdownGracefully(quietPeriod, timeout, timeUnit);
-            stages.add(Futures.toCompletionStage(shutdown));
+            aggregator.add(shutdown);
         }
 
         if (!sharedCommandLatencyCollector) {
             commandLatencyCollector.shutdown();
         }
 
-        Futures.allOf(stages).whenComplete((ignore, throwable) -> {
+        aggregator.finish(voidPromise);
 
-            if (throwable != null) {
-                overall.setFailure(throwable);
-            } else {
-                overall.setSuccess(true);
-            }
-        });
-
-        return overall;
+        return PromiseAdapter.toBooleanPromise(voidPromise);
     }
 
     @Override
diff --git a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
index f05290bad6..bd8306a757 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
@@ -17,18 +17,17 @@
 
 import static io.lettuce.core.resource.PromiseAdapter.toBooleanPromise;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 
-import io.lettuce.core.internal.Futures;
 import io.lettuce.core.internal.LettuceAssert;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.concurrent.*;
-import io.netty.util.concurrent.Future;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -210,23 +209,24 @@ private static <T extends EventExecutorGroup> EventExecutorGroup createEventLoop
 
     @Override
     public Promise<Boolean> release(EventExecutorGroup eventLoopGroup, long quietPeriod, long timeout, TimeUnit unit) {
+        return toBooleanPromise(doRelease(eventLoopGroup, quietPeriod, timeout, unit));
+    }
+
+    private Future<?> doRelease(EventExecutorGroup eventLoopGroup, long quietPeriod, long timeout, TimeUnit unit) {
 
         logger.debug("Release executor {}", eventLoopGroup);
 
         Class<?> key = getKey(release(eventLoopGroup));
 
         if ((key == null && eventLoopGroup.isShuttingDown()) || refCounter.containsKey(eventLoopGroup)) {
-            DefaultPromise<Boolean> promise = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
-            promise.setSuccess(true);
-            return promise;
+            return new SucceededFuture<>(ImmediateEventExecutor.INSTANCE, true);
         }
 
         if (key != null) {
             eventLoopGroups.remove(key);
         }
 
-        Future<?> shutdownFuture = eventLoopGroup.shutdownGracefully(quietPeriod, timeout, unit);
-        return toBooleanPromise(shutdownFuture);
+        return eventLoopGroup.shutdownGracefully(quietPeriod, timeout, unit);
     }
 
     private Class<?> getKey(EventExecutorGroup eventLoopGroup) {
@@ -248,34 +248,24 @@ public int threadPoolSize() {
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
 
         logger.debug("Initiate shutdown ({}, {}, {})", quietPeriod, timeout, timeUnit);
 
         shutdownCalled = true;
 
-        List<EventExecutorGroup> copy = new ArrayList<>(eventLoopGroups.values());
-        DefaultPromise<Boolean> overall = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
-        CompletableFuture[] futures = new CompletableFuture[copy.size()];
+        Map<Class<? extends EventExecutorGroup>, EventExecutorGroup> copy = new HashMap<>(eventLoopGroups);
 
-        for (int i = 0; i < copy.size(); i++) {
+        DefaultPromise<Void> overall = new DefaultPromise<>(ImmediateEventExecutor.INSTANCE);
+        PromiseCombiner combiner = new PromiseCombiner(ImmediateEventExecutor.INSTANCE);
 
-            EventExecutorGroup executorGroup = copy.get(i);
-            futures[i] = Futures.toCompletionStage(release(executorGroup, quietPeriod, timeout, timeUnit))
-                    .toCompletableFuture();
+        for (EventExecutorGroup executorGroup : copy.values()) {
+            combiner.add(doRelease(executorGroup, quietPeriod, timeout, timeUnit));
         }
 
-        CompletableFuture.allOf(futures).whenComplete((ignore, throwable) -> {
-
-            if (throwable != null) {
-                overall.setFailure(throwable);
-            } else {
-                overall.setSuccess(true);
-            }
-        });
+        combiner.finish(overall);
 
-        return overall;
+        return PromiseAdapter.toBooleanPromise(overall);
     }
 
     /**
diff --git a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
index 5110a5da9e..ff6da796f5 100644
--- a/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/protocol/ConnectionFailureIntegrationTests.java
@@ -357,6 +357,7 @@ public void afterChannelInitialized(Channel channel) {
         assertThat(initial.isOpen()).isFalse();
 
         Channel reconnect = ref.take();
+        Wait.untilTrue(() -> !reconnect.isOpen()).waitOrTimeout();
         assertThat(reconnect.isOpen()).isFalse();
 
         FastShutdown.shutdown(client);

From 83d45aaf5ae3973d0444216ba9d57a5a22763541 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Tue, 5 May 2020 15:43:39 +0200
Subject: [PATCH 797/808] Add customization hook for EventLoopGroup creation
 #1273

---
 .../resource/DefaultEventLoopGroupProvider.java | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
index bd8306a757..3fc8e3e97d 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
@@ -130,12 +130,27 @@ private <T extends EventLoopGroup> T getOrCreate(Class<T> type) {
         }
 
         if (!eventLoopGroups.containsKey(type)) {
-            eventLoopGroups.put(type, createEventLoopGroup(type, numberOfThreads, threadFactoryProvider));
+            eventLoopGroups.put(type, doCreateEventLoopGroup(type, numberOfThreads, threadFactoryProvider));
         }
 
         return (T) eventLoopGroups.get(type);
     }
 
+    /**
+     * Customization hook for {@link EventLoopGroup} creation.
+     * 
+     * @param <T>
+     * @param type requested event loop group type.
+     * @param numberOfThreads number of threads to create.
+     * @param threadFactoryProvider provider for {@link ThreadFactory}.
+     * @return
+     * @since 6.0
+     */
+    protected <T extends EventLoopGroup> EventExecutorGroup doCreateEventLoopGroup(Class<T> type, int numberOfThreads,
+            ThreadFactoryProvider threadFactoryProvider) {
+        return createEventLoopGroup(type, numberOfThreads, threadFactoryProvider);
+    }
+
     /**
      * Create an instance of a {@link EventExecutorGroup} using the default {@link ThreadFactoryProvider}. Supported types are:
      * <ul>

From 1a06733d853fb2ac9ef0b1dbb7d625a0baa86a52 Mon Sep 17 00:00:00 2001
From: koisyu <koisyu@gmail.com>
Date: Thu, 4 Jun 2020 16:45:50 +0900
Subject: [PATCH 798/808] Fix command duplication on asking #1304

When ASK redirect is executed, command is executed twice. So it was modified to remove duplicates.
---
 .../ClusterDistributionChannelWriter.java     |  4 +-
 ...terDistributionChannelWriterUnitTests.java | 95 ++++++++++++++++++-
 2 files changed, 96 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
index dc68a5c0f2..25e709bc41 100644
--- a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
+++ b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -169,9 +169,9 @@ private static <K, V> void writeCommand(RedisCommand<K, V, ?> command, boolean a
 
             if (asking) { // set asking bit
                 writeCommands(Arrays.asList(asking(), command), ((RedisChannelHandler<K, V>) connection).getChannelWriter());
+            } else {
+                writeCommand(command, ((RedisChannelHandler<K, V>) connection).getChannelWriter());
             }
-
-            writeCommand(command, ((RedisChannelHandler<K, V>) connection).getChannelWriter());
         } catch (Exception e) {
             command.completeExceptionally(e);
         }
diff --git a/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java
index 93057fe63c..0481f56609 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java
@@ -16,23 +16,70 @@
 package io.lettuce.core.cluster;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.concurrent.CompletableFuture;
 
 import org.junit.jupiter.api.Test;
-
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentMatchers;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.RedisChannelWriter;
+import io.lettuce.core.StatefulRedisConnectionImpl;
+import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.cluster.ClusterConnectionProvider.Intent;
+import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.HostAndPort;
+import io.lettuce.core.output.ValueOutput;
+import io.lettuce.core.protocol.AsyncCommand;
 import io.lettuce.core.protocol.Command;
+import io.lettuce.core.protocol.CommandArgs;
 import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.protocol.RedisCommand;
 
 /**
  * @author Mark Paluch
  */
+@ExtendWith(MockitoExtension.class)
 class ClusterDistributionChannelWriterUnitTests {
 
+    @Mock
+    private ClientOptions clientOptions;
+
+    @Mock
+    private RedisChannelWriter defaultWriter;
+
+    @Mock
+    private ClusterEventListener clusterEventListener;
+
+    @Mock
+    private StatefulRedisConnectionImpl<String, String> connection;
+
+    @Mock
+    private ClusterNodeEndpoint clusterNodeEndpoint;
+
+    @Mock
+    private CompletableFuture<StatefulRedisConnection<String, String>> connectFuture;
+
+    @Mock
+    private PooledClusterConnectionProvider pooledClusterConnectionProvider;
+
+    @InjectMocks
+    private ClusterDistributionChannelWriter clusterDistributionChannelWriter;
+
     @Test
     void shouldParseAskTargetCorrectly() {
 
@@ -107,4 +154,50 @@ void shouldReturnIntentForMixedCommands() {
 
         assertThat(ClusterDistributionChannelWriter.getIntent(Collections.singletonList(set))).isEqualTo(Intent.WRITE);
     }
+
+    @Test
+    void shouldWriteCommandListWhenAsking() {
+        verifyWriteCommandCountWhenRedirecting(false);
+    }
+
+    @Test
+    void shouldWriteOneCommandWhenMoved() {
+        verifyWriteCommandCountWhenRedirecting(true);
+    }
+
+    private void verifyWriteCommandCountWhenRedirecting(boolean isMoved) {
+        final String outputError;
+        if (isMoved) {
+            // MOVED
+            outputError = "MOVED 1234 127.0.0.1:6379";
+        } else {
+            // ASK
+            outputError = "ASK 1234 127.0.0.1:6379";
+        }
+
+        CommandArgs<String, String> commandArgs = new CommandArgs<>(StringCodec.UTF8).addKey("KEY");
+        ValueOutput<String, String> valueOutput = new ValueOutput<>(StringCodec.UTF8);
+        Command<String, String, String> command = new Command<>(CommandType.GET, valueOutput, commandArgs);
+        AsyncCommand<String, String, String> asyncCommand = new AsyncCommand<>(command);
+        ClusterCommand<String, String, String> clusterCommand = new ClusterCommand<>(asyncCommand,
+            defaultWriter, 2);
+        clusterCommand.getOutput().setError(outputError);
+        clusterDistributionChannelWriter.setClusterConnectionProvider(pooledClusterConnectionProvider);
+
+        when(connectFuture.isDone()).thenReturn(true);
+        when(connectFuture.isCompletedExceptionally()).thenReturn(false);
+        when(connectFuture.join()).thenReturn(connection);
+        when(pooledClusterConnectionProvider.getConnectionAsync(any(Intent.class), anyString(), anyInt()))
+            .thenReturn(connectFuture);
+        when(connection.getChannelWriter()).thenReturn(clusterNodeEndpoint);
+
+        clusterDistributionChannelWriter.write(clusterCommand);
+        if (isMoved) {
+            verify(clusterNodeEndpoint, never()).write(anyList());
+            verify(clusterNodeEndpoint, times(1)).write(ArgumentMatchers.<RedisCommand<String, String, String>>any());
+        } else {
+            verify(clusterNodeEndpoint, times(1)).write(anyList());
+            verify(clusterNodeEndpoint, never()).write(ArgumentMatchers.<RedisCommand<String, String, String>>any());
+        }
+    }
 }

From c50d8d5ade271bb0f385458b50358701366ae6a4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 8 Jun 2020 09:01:09 +0200
Subject: [PATCH 799/808] Polishing #1304

Reformat code. Tweak Javadoc. Add author tag.
---
 ...terDistributionChannelWriterUnitTests.java | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java
index 0481f56609..e7564ee1c1 100644
--- a/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java
+++ b/src/test/java/io/lettuce/core/cluster/ClusterDistributionChannelWriterUnitTests.java
@@ -36,7 +36,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import io.lettuce.core.ClientOptions;
 import io.lettuce.core.RedisChannelWriter;
 import io.lettuce.core.StatefulRedisConnectionImpl;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -44,21 +43,17 @@
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.HostAndPort;
 import io.lettuce.core.output.ValueOutput;
-import io.lettuce.core.protocol.AsyncCommand;
-import io.lettuce.core.protocol.Command;
-import io.lettuce.core.protocol.CommandArgs;
-import io.lettuce.core.protocol.CommandType;
-import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.protocol.*;
 
 /**
+ * Unit tests for {@link ClusterDistributionChannelWriter}.
+ *
  * @author Mark Paluch
+ * @author koisyu
  */
 @ExtendWith(MockitoExtension.class)
 class ClusterDistributionChannelWriterUnitTests {
 
-    @Mock
-    private ClientOptions clientOptions;
-
     @Mock
     private RedisChannelWriter defaultWriter;
 
@@ -166,21 +161,14 @@ void shouldWriteOneCommandWhenMoved() {
     }
 
     private void verifyWriteCommandCountWhenRedirecting(boolean isMoved) {
-        final String outputError;
-        if (isMoved) {
-            // MOVED
-            outputError = "MOVED 1234 127.0.0.1:6379";
-        } else {
-            // ASK
-            outputError = "ASK 1234 127.0.0.1:6379";
-        }
+
+        String outputError = isMoved ? "MOVED 1234 127.0.0.1:6379" : "ASK 1234 127.0.0.1:6379";
 
         CommandArgs<String, String> commandArgs = new CommandArgs<>(StringCodec.UTF8).addKey("KEY");
         ValueOutput<String, String> valueOutput = new ValueOutput<>(StringCodec.UTF8);
         Command<String, String, String> command = new Command<>(CommandType.GET, valueOutput, commandArgs);
         AsyncCommand<String, String, String> asyncCommand = new AsyncCommand<>(command);
-        ClusterCommand<String, String, String> clusterCommand = new ClusterCommand<>(asyncCommand,
-            defaultWriter, 2);
+        ClusterCommand<String, String, String> clusterCommand = new ClusterCommand<>(asyncCommand, defaultWriter, 2);
         clusterCommand.getOutput().setError(outputError);
         clusterDistributionChannelWriter.setClusterConnectionProvider(pooledClusterConnectionProvider);
 
@@ -188,16 +176,17 @@ private void verifyWriteCommandCountWhenRedirecting(boolean isMoved) {
         when(connectFuture.isCompletedExceptionally()).thenReturn(false);
         when(connectFuture.join()).thenReturn(connection);
         when(pooledClusterConnectionProvider.getConnectionAsync(any(Intent.class), anyString(), anyInt()))
-            .thenReturn(connectFuture);
+                .thenReturn(connectFuture);
         when(connection.getChannelWriter()).thenReturn(clusterNodeEndpoint);
 
         clusterDistributionChannelWriter.write(clusterCommand);
+
         if (isMoved) {
             verify(clusterNodeEndpoint, never()).write(anyList());
-            verify(clusterNodeEndpoint, times(1)).write(ArgumentMatchers.<RedisCommand<String, String, String>>any());
+            verify(clusterNodeEndpoint, times(1)).write(ArgumentMatchers.<RedisCommand<String, String, String>> any());
         } else {
             verify(clusterNodeEndpoint, times(1)).write(anyList());
-            verify(clusterNodeEndpoint, never()).write(ArgumentMatchers.<RedisCommand<String, String, String>>any());
+            verify(clusterNodeEndpoint, never()).write(ArgumentMatchers.<RedisCommand<String, String, String>> any());
         }
     }
 }

From cde07e5ad9d87e28846b8698470ac53e225e6bd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=9B=E4=BF=8A?= <gejun123456@gmail.com>
Date: Thu, 7 May 2020 09:33:52 +0800
Subject: [PATCH 800/808] =?UTF-8?q?Add=20charset=20option=20to=20ScanArgs.?=
 =?UTF-8?q?match(=E2=80=A6)=20#1285?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/io/lettuce/core/ScanArgs.java | 24 ++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/ScanArgs.java b/src/main/java/io/lettuce/core/ScanArgs.java
index e98517510d..5644b2d04c 100644
--- a/src/main/java/io/lettuce/core/ScanArgs.java
+++ b/src/main/java/io/lettuce/core/ScanArgs.java
@@ -19,6 +19,7 @@
 import static io.lettuce.core.protocol.CommandKeyword.MATCH;
 
 import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
 import io.lettuce.core.codec.StringCodec;
@@ -39,6 +40,7 @@ public class ScanArgs implements CompositeArgument {
 
     private Long count;
     private String match;
+    private Charset charset;
 
     /**
      * Builder entry points for {@link ScanArgs}.
@@ -88,6 +90,22 @@ public ScanArgs match(String match) {
         return this;
     }
 
+    /**
+     * Set the match filter.
+     *
+     * @param match the filter, must not be {@literal null}.
+     * @param charset the charset for match, must not be {@literal null}.
+     * @return {@literal this} {@link ScanArgs}.
+     */
+    public ScanArgs match(String match, Charset charset) {
+
+        LettuceAssert.notNull(match, "Match must not be null");
+        LettuceAssert.notNull(charset, "Charset must not be null");
+        this.match = match;
+        this.charset = charset;
+        return this;
+    }
+
     /**
      * Limit the scan by count
      *
@@ -103,7 +121,11 @@ public ScanArgs limit(long count) {
     public <K, V> void build(CommandArgs<K, V> args) {
 
         if (match != null) {
-            args.add(MATCH).add(match.getBytes(StandardCharsets.UTF_8));
+            if(charset==null) {
+                args.add(MATCH).add(match.getBytes(StandardCharsets.UTF_8));
+            } else {
+                args.add(MATCH).add(match.getBytes(charset));
+            }
         }
 
         if (count != null) {

From 679b187a68d7c7e2fbb0586cc3dabf5255bff602 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 8 Jun 2020 09:08:43 +0200
Subject: [PATCH 801/808] Polishing #1285
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reformat code. Forward existing match(…) implementation to new method. Add since and author tags.
---
 src/main/java/io/lettuce/core/ScanArgs.java | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/lettuce/core/ScanArgs.java b/src/main/java/io/lettuce/core/ScanArgs.java
index 5644b2d04c..66ee28c429 100644
--- a/src/main/java/io/lettuce/core/ScanArgs.java
+++ b/src/main/java/io/lettuce/core/ScanArgs.java
@@ -18,11 +18,9 @@
 import static io.lettuce.core.protocol.CommandKeyword.COUNT;
 import static io.lettuce.core.protocol.CommandKeyword.MATCH;
 
-import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
-import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.internal.LettuceAssert;
 import io.lettuce.core.protocol.CommandArgs;
 
@@ -34,6 +32,7 @@
  * {@link ScanArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
  * @author Mark Paluch
+ * @author Ge Jun
  * @since 3.0
  */
 public class ScanArgs implements CompositeArgument {
@@ -77,30 +76,28 @@ public static ScanArgs matches(String matches) {
     }
 
     /**
-     * Set the match filter.
+     * Set the match filter. Uses {@link StandardCharsets#UTF_8 UTF-8} to encode {@code match}.
      *
      * @param match the filter, must not be {@literal null}.
      * @return {@literal this} {@link ScanArgs}.
      */
     public ScanArgs match(String match) {
-
-        LettuceAssert.notNull(match, "Match must not be null");
-
-        this.match = match;
-        return this;
+        return match(match, StandardCharsets.UTF_8);
     }
 
     /**
-     * Set the match filter.
+     * Set the match filter along the given {@link Charset}.
      *
      * @param match the filter, must not be {@literal null}.
      * @param charset the charset for match, must not be {@literal null}.
      * @return {@literal this} {@link ScanArgs}.
+     * @since 6.0
      */
     public ScanArgs match(String match, Charset charset) {
 
         LettuceAssert.notNull(match, "Match must not be null");
         LettuceAssert.notNull(charset, "Charset must not be null");
+
         this.match = match;
         this.charset = charset;
         return this;
@@ -121,11 +118,7 @@ public ScanArgs limit(long count) {
     public <K, V> void build(CommandArgs<K, V> args) {
 
         if (match != null) {
-            if(charset==null) {
-                args.add(MATCH).add(match.getBytes(StandardCharsets.UTF_8));
-            } else {
-                args.add(MATCH).add(match.getBytes(charset));
-            }
+            args.add(MATCH).add(match.getBytes(charset));
         }
 
         if (count != null) {

From f8d2b8bb6a9d1528affc7d35a4c7ec98ea500421 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 8 Jun 2020 09:33:13 +0200
Subject: [PATCH 802/808] =?UTF-8?q?Add=20guards=20to=20catch=20null=20argu?=
 =?UTF-8?q?ments=20in=20AsyncConnectionProvider.forEach(=E2=80=A6)=20#1301?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lettuce/core/internal/AsyncConnectionProvider.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java b/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
index 8d573a98e4..73457603ae 100644
--- a/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
+++ b/src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java
@@ -187,7 +187,14 @@ public void close(K key) {
      * @param action the action.
      */
     public void forEach(Consumer<? super T> action) {
-        connections.values().forEach(sync -> sync.doWithConnection(action));
+
+        LettuceAssert.notNull(action, "Action must not be null!");
+
+        connections.values().forEach(sync -> {
+            if (sync != null) {
+                sync.doWithConnection(action);
+            }
+        });
     }
 
     /**

From 562fec2c9c55848613b877b9e785510559238a55 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 8 Jun 2020 09:42:00 +0200
Subject: [PATCH 803/808] Refactor PauseDetectorWrapper retrieval #1300

Previously, PauseDetectorWrapper was initialized once and a later loop attempted to retrieve the PauseDetector assuming that the previous code would had initialized the PauseDetector.

Due to concurrency it is possible that the PauseDetector instance is being released while another thread wants to obtain the PauseDetector. This gap could lead to infinite loops as the instance is never allocated. The refactored code include now the initialization so concurrent initialization/release are now properly guarded.
---
 .../DefaultCommandLatencyCollector.java       | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
index a7191ee3f3..d2def86cf6 100644
--- a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
+++ b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
@@ -91,20 +91,25 @@ public void recordCommandLatency(SocketAddress local, SocketAddress remote, Prot
             return;
         }
 
-        if (PAUSE_DETECTOR_UPDATER.get(this) == null) {
-            if (PAUSE_DETECTOR_UPDATER.compareAndSet(this, null, GLOBAL_PAUSE_DETECTOR)) {
-                PAUSE_DETECTOR_UPDATER.get(this).retain();
+        PauseDetector pauseDetector;
+
+        do {
+            if (PAUSE_DETECTOR_UPDATER.get(this) == null) {
+                if (PAUSE_DETECTOR_UPDATER.compareAndSet(this, null, GLOBAL_PAUSE_DETECTOR)) {
+                    PAUSE_DETECTOR_UPDATER.get(this).retain();
+                }
             }
-        }
-        PauseDetector pauseDetector = ((DefaultPauseDetectorWrapper) PAUSE_DETECTOR_UPDATER.get(this)).getPauseDetector();
+            pauseDetector = ((DefaultPauseDetectorWrapper) PAUSE_DETECTOR_UPDATER.get(this)).getPauseDetector();
+        } while (pauseDetector == null);
 
+        PauseDetector pauseDetectorToUse = pauseDetector;
         Latencies latencies = latencyMetricsRef.get().computeIfAbsent(createId(local, remote, commandType), id -> {
 
             if (options.resetLatenciesAfterEvent()) {
-                return new Latencies(pauseDetector);
+                return new Latencies(pauseDetectorToUse);
             }
 
-            return new CummulativeLatencies(pauseDetector);
+            return new CummulativeLatencies(pauseDetectorToUse);
         });
 
         latencies.firstResponse.recordLatency(rangify(firstResponseLatency));
@@ -352,18 +357,10 @@ static class DefaultPauseDetectorWrapper implements PauseDetectorWrapper {
 
         /**
          * Obtain the current {@link PauseDetector}. Requires a call to {@link #retain()} first.
-         * 
+         *
          * @return
          */
         public PauseDetector getPauseDetector() {
-
-            for (;;) {
-
-                if (pauseDetector != null) {
-                    break;
-                }
-            }
-
             return pauseDetector;
         }
 

From e4d6b913e85b7e0d15779a7770ad738176ab5cac Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 8 Jun 2020 11:40:46 +0200
Subject: [PATCH 804/808] Fix syntax error on xpending with unlimited count
 #1302

xpending with Range and Limit aims for a range format of the XPENDING command output. Previously, calling this method without Limit appended just the consumer name which is not a valid combination for that command. We now apply a synthetic limit of Long.MAX_VALUE to obtain the range format to avoid format changes or syntax errors.
---
 .../io/lettuce/core/RedisCommandBuilder.java  | 11 ++--------
 .../StreamCommandIntegrationTests.java        | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
index 4c2753db29..85f224cdb4 100644
--- a/src/main/java/io/lettuce/core/RedisCommandBuilder.java
+++ b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -2302,16 +2302,9 @@ public Command<K, V, List<Object>> xpending(K key, Consumer<K> consumer, Range<S
 
         CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key).addKey(consumer.group);
 
-        if (limit.isLimited() || !range.getLower().equals(Boundary.unbounded())
-                || !range.getUpper().equals(Boundary.unbounded())) {
-            args.add(getLowerValue(range)).add(getUpperValue(range));
-
-            if (!limit.isLimited()) {
-                throw new IllegalArgumentException("Limit must be set using Range queries with XPENDING");
-            }
-            args.add(limit.getCount());
-        }
+        args.add(getLowerValue(range)).add(getUpperValue(range));
 
+        args.add(limit.isLimited() ? limit.getCount() : Long.MAX_VALUE);
         args.addKey(consumer.name);
 
         return createCommand(XPENDING, new NestedMultiOutput<>(codec), args);
diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
index a20b376113..f02e7db2e8 100644
--- a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
@@ -33,6 +33,7 @@
 import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.codec.StringCodec;
 import io.lettuce.core.models.stream.PendingMessage;
+import io.lettuce.core.models.stream.PendingMessages;
 import io.lettuce.core.models.stream.PendingParser;
 import io.lettuce.core.output.NestedMultiOutput;
 import io.lettuce.core.protocol.CommandArgs;
@@ -349,6 +350,26 @@ void xpending() {
         assertThat(message.getRedeliveryCount()).isEqualTo(1);
     }
 
+    @Test
+    void xpendingUnlimited() {
+
+        redis.xgroupCreate(StreamOffset.latest(key), "group", XGroupCreateArgs.Builder.mkstream());
+        String id = redis.xadd(key, Collections.singletonMap("key", "value"));
+
+        redis.xreadgroup(Consumer.from("group", "consumer1"), StreamOffset.lastConsumed(key));
+
+        List<Object> pendingEntries = redis.xpending(key, Consumer.from("group", "consumer1"), Range.unbounded(),
+                Limit.unlimited());
+
+        List<PendingMessage> pendingMessages = PendingParser.parseRange(pendingEntries);
+        assertThat(pendingMessages).hasSize(1);
+
+        PendingMessage message = pendingMessages.get(0);
+        assertThat(message.getId()).isEqualTo(id);
+        assertThat(message.getConsumer()).isEqualTo("consumer1");
+        assertThat(message.getRedeliveryCount()).isEqualTo(1);
+    }
+
     @Test
     void xack() {
 

From 2a28d6fc1aef9504cfba9ef02e68f88b72cb27e7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 8 Jun 2020 12:12:32 +0200
Subject: [PATCH 805/808] Upgrade dependencies #1305

* AssertJ 3.15.0 -> 3.16.1
* CDI API 2.0 -> 2.0.SP1
* JUnit 5.6.1 -> 5.6.2
* Log4j 2.13.2 -> 2.13.3
* Netty 4.1.49.Final -> 4.1.50.Final
* RxJava 3.0.2 -> 3.0.4
---
 pom.xml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3a97e1c3c5..24f21dfbb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,27 +50,27 @@
     </developers>
 
     <properties>
-        <assertj-core.version>3.15.0</assertj-core.version>
-        <cdi-api.version>2.0</cdi-api.version>
+        <assertj-core.version>3.16.1</assertj-core.version>
+        <cdi-api.version>2.0.SP1</cdi-api.version>
         <brave.version>5.11.2</brave.version>
         <commons-lang3.version>3.10</commons-lang3.version>
         <commons-pool.version>2.8.0</commons-pool.version>
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <junit4.version>4.13</junit4.version>
-        <junit5.version>5.6.1</junit5.version>
+        <junit5.version>5.6.2</junit5.version>
         <hamcrest-library.version>2.2</hamcrest-library.version>
         <hdr-histogram-version>2.1.12</hdr-histogram-version>
         <latencyutils.version>2.0.3</latencyutils.version>
-        <log4j2-version>2.13.2</log4j2-version>
+        <log4j2-version>2.13.3</log4j2-version>
         <mockito.version>3.3.3</mockito.version>
-        <netty.version>4.1.49.Final</netty.version>
+        <netty.version>4.1.50.Final</netty.version>
         <openwebbeans.version>2.0.16</openwebbeans.version>
         <reactor.version>3.3.5.RELEASE</reactor.version>
         <rxjava.version>1.3.8</rxjava.version>
         <rxjava-reactive-streams.version>1.2.1</rxjava-reactive-streams.version>
         <rxjava2.version>2.2.19</rxjava2.version>
-        <rxjava3.version>3.0.2</rxjava3.version>
+        <rxjava3.version>3.0.4</rxjava3.version>
         <reactive-streams-tck.version>1.0.3</reactive-streams-tck.version>
         <slf4j.version>1.7.25</slf4j.version>
         <spring.version>4.3.26.RELEASE</spring.version>
@@ -186,7 +186,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative</artifactId>
-            <version>1.1.33.Fork26</version>
+            <version>2.0.30.Final</version>
             <classifier>${os.detected.classifier}</classifier>
             <optional>true</optional>
         </dependency>
@@ -496,13 +496,13 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>flatten-maven-plugin</artifactId>
-                    <version>1.2.1</version>
+                    <version>1.2.2</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.0</version>
                 </plugin>
 
                 <plugin>
@@ -544,12 +544,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.2</version>
+                    <version>3.0.0-M4</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.maven.surefire</groupId>
                             <artifactId>surefire-junit-platform</artifactId>
-                            <version>2.22.2</version>
+                            <version>3.0.0-M4</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -557,12 +557,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.22.2</version>
+                    <version>3.0.0-M4</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.maven.surefire</groupId>
                             <artifactId>surefire-junit-platform</artifactId>
-                            <version>2.22.2</version>
+                            <version>3.0.0-M4</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -582,7 +582,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.6.0</version>
+                    <version>3.0.0</version>
                 </plugin>
 
                 <plugin>
@@ -594,7 +594,7 @@
                 <plugin>
                     <groupId>net.nicoulaj.maven.plugins</groupId>
                     <artifactId>checksum-maven-plugin</artifactId>
-                    <version>1.8</version>
+                    <version>1.9</version>
                 </plugin>
             </plugins>
         </pluginManagement>

From c0467615cf394db0a151a39136fbb3a2c4f0f763 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 8 Jun 2020 12:12:45 +0200
Subject: [PATCH 806/808] Polishing

Fix compiler warnings
---
 src/main/java/io/lettuce/core/KqueueProvider.java               | 1 +
 src/main/java/io/lettuce/core/ScanStream.java                   | 1 +
 src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java  | 1 +
 .../pubsub/api/async/RedisClusterPubSubAsyncCommands.java       | 1 +
 .../core/cluster/topology/DefaultClusterTopologyRefresh.java    | 2 ++
 .../core/sentinel/StatefulRedisSentinelConnectionImpl.java      | 1 +
 6 files changed, 7 insertions(+)

diff --git a/src/main/java/io/lettuce/core/KqueueProvider.java b/src/main/java/io/lettuce/core/KqueueProvider.java
index 28fa67ef88..9d96fce58f 100644
--- a/src/main/java/io/lettuce/core/KqueueProvider.java
+++ b/src/main/java/io/lettuce/core/KqueueProvider.java
@@ -23,6 +23,7 @@
  * @since 4.4
  * @deprecated since 6.0, use {@link io.lettuce.core.resource.KqueueProvider} instead.
  */
+@Deprecated
 public class KqueueProvider {
 
     /**
diff --git a/src/main/java/io/lettuce/core/ScanStream.java b/src/main/java/io/lettuce/core/ScanStream.java
index 8629a12ee3..28a5dc9536 100644
--- a/src/main/java/io/lettuce/core/ScanStream.java
+++ b/src/main/java/io/lettuce/core/ScanStream.java
@@ -408,6 +408,7 @@ static class ScanSubscriber<T, C extends ScanCursor> extends BaseSubscriber<C> {
         private static final AtomicReferenceFieldUpdater<ScanSubscriber, ScanCursor> CURSOR = AtomicReferenceFieldUpdater
                 .newUpdater(ScanSubscriber.class, ScanCursor.class, "cursor");
 
+        @SuppressWarnings("rawtypes")
         private static final AtomicLongFieldUpdater<ScanSubscriber> EMITTED = AtomicLongFieldUpdater.newUpdater(
                 ScanSubscriber.class, "emitted");
 
diff --git a/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
index 8c73c39394..143f34e73f 100644
--- a/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
+++ b/src/main/java/io/lettuce/core/cluster/AsyncExecutionsImpl.java
@@ -106,6 +106,7 @@ private CompletionStage<List<T>> publicStage() {
         return stage;
     }
 
+    @SuppressWarnings("rawtypes")
     private CompletableFuture<List<T>> createPublicStage(Map<RedisClusterNode, CompletableFuture<T>> map) {
 
         return CompletableFuture.allOf(map.values().toArray(new CompletableFuture[0])).thenApply(ignore -> {
diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
index 35b3a87b65..f7a28ec250 100644
--- a/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
+++ b/src/main/java/io/lettuce/core/cluster/pubsub/api/async/RedisClusterPubSubAsyncCommands.java
@@ -52,6 +52,7 @@ default PubSubAsyncNodeSelection<K, V> masters() {
      * @return API with asynchronous executed commands on a selection of replica cluster nodes.
      * @deprecated since 5.2, use {@link #replicas()}
      */
+    @Deprecated
     default PubSubAsyncNodeSelection<K, V> slaves() {
         return nodes(redisClusterNode -> redisClusterNode.is(RedisClusterNode.NodeFlag.SLAVE));
     }
diff --git a/src/main/java/io/lettuce/core/cluster/topology/DefaultClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/DefaultClusterTopologyRefresh.java
index 1b35483991..43e79e1eca 100644
--- a/src/main/java/io/lettuce/core/cluster/topology/DefaultClusterTopologyRefresh.java
+++ b/src/main/java/io/lettuce/core/cluster/topology/DefaultClusterTopologyRefresh.java
@@ -409,6 +409,7 @@ public void addConnection(RedisURI uri, CompletableFuture<StatefulRedisConnectio
             connections.put(uri, future);
         }
 
+        @SuppressWarnings("rawtypes")
         public CompletableFuture<Void> close() {
 
             CompletableFuture[] futures = connections.values().stream()
@@ -466,6 +467,7 @@ protected Map<RedisURI, StatefulRedisConnection<String, String>> collectConnecti
         }
     }
 
+    @SuppressWarnings("serial")
     static class CannotRetrieveClusterPartitions extends RedisException {
 
         private final Map<RedisURI, String> failure;
diff --git a/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
index a35e0a6bf8..695d4fe144 100644
--- a/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/sentinel/StatefulRedisSentinelConnectionImpl.java
@@ -82,6 +82,7 @@ public RedisSentinelReactiveCommands<K, V> reactive() {
      * @param clientName
      * @deprecated since 6.0, use {@link RedisSentinelAsyncCommands#clientSetname(Object)}.
      */
+    @Deprecated
     public void setClientName(String clientName) {
 
         CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8).add(CommandKeyword.SETNAME).addValue(clientName);

From bd68320265bc6451518ea3f7b35c0eca3a5c6516 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 8 Jun 2020 13:56:03 +0200
Subject: [PATCH 807/808] Upgrade to Reactor Core 3.3.6.RELEASE #1305

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 24f21dfbb7..b5cd481738 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
         <mockito.version>3.3.3</mockito.version>
         <netty.version>4.1.50.Final</netty.version>
         <openwebbeans.version>2.0.16</openwebbeans.version>
-        <reactor.version>3.3.5.RELEASE</reactor.version>
+        <reactor.version>3.3.6.RELEASE</reactor.version>
         <rxjava.version>1.3.8</rxjava.version>
         <rxjava-reactive-streams.version>1.2.1</rxjava-reactive-streams.version>
         <rxjava2.version>2.2.19</rxjava2.version>

From eb48cbdcd1f5fc3aa98359d9b37a2fde2024b520 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Mon, 8 Jun 2020 15:42:49 +0200
Subject: [PATCH 808/808] Add FAQ section to reference docs #1307

---
 src/main/asciidoc/advanced-usage.asciidoc | 4 ++--
 src/main/asciidoc/faq.asciidoc            | 5 +++++
 src/main/asciidoc/index.asciidoc          | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 src/main/asciidoc/faq.asciidoc

diff --git a/src/main/asciidoc/advanced-usage.asciidoc b/src/main/asciidoc/advanced-usage.asciidoc
index 35529297bd..1b46f997a4 100644
--- a/src/main/asciidoc/advanced-usage.asciidoc
+++ b/src/main/asciidoc/advanced-usage.asciidoc
@@ -1,6 +1,6 @@
 :auto-reconnect-link: <<client-options,auto-reconnection>>
-:client-options-link: <<client-resources>>
-:client-resources-link: <<client-options>>
+:client-options-link: <<client-options>>
+:client-resources-link: <<client-resources>>
 
 :custom-commands-command-output-link: <<custom-commands.outputs>>
 :custom-commands-command-exec-model-link: <<custom-commands.synchronous-asynchronous-and-reactive,Custom commands>>
diff --git a/src/main/asciidoc/faq.asciidoc b/src/main/asciidoc/faq.asciidoc
new file mode 100644
index 0000000000..1793a75438
--- /dev/null
+++ b/src/main/asciidoc/faq.asciidoc
@@ -0,0 +1,5 @@
+:client-options-link: <<client-options>>
+
+[[faq]]
+== Frequently Asked Questions
+include::{ext-doc}/Frequently-Asked-Questions.asciidoc[leveloffset=+1]
diff --git a/src/main/asciidoc/index.asciidoc b/src/main/asciidoc/index.asciidoc
index 21b5dae156..d469f672fa 100644
--- a/src/main/asciidoc/index.asciidoc
+++ b/src/main/asciidoc/index.asciidoc
@@ -30,3 +30,4 @@ include::advanced-usage.asciidoc[]
 
 include::integration-extension.asciidoc[]
 
+include::faq.asciidoc[]